From 84ac23d87df5e37d4ce32a542433d3b9c99066b9 Mon Sep 17 00:00:00 2001
From: Adam <adacrowd@amazon.com>
Date: Wed, 11 Dec 2024 15:32:09 -0800
Subject: [PATCH] Migrate dependent goformation module to a local fork (#8081)

Migrate goformation module to a local fork
---
 .golangci.yml                                 |     76 +-
 ATTRIBUTIONS.md                               |     22 -
 go.mod                                        |      5 +-
 go.sum                                        |      2 -
 goformation/.gitignore                        |      4 +
 goformation/AUTHORS.md                        |     35 +
 goformation/CHANGELOG.md                      |    397 +
 goformation/CODE_OF_CONDUCT.md                |     46 +
 goformation/CONTRIBUTING.md                   |    204 +
 goformation/LICENSE                           |    201 +
 goformation/LOGO.md                           |     10 +
 goformation/NOTICE                            |      2 +
 goformation/README.md                         |    249 +
 goformation/cloudformation/README.md          |      5 +
 .../aws-accessanalyzer-analyzer.go            |    124 +
 ...aws-accessanalyzer-analyzer_archiverule.go |     42 +
 .../aws-accessanalyzer-analyzer_filter.go     |     57 +
 .../acmpca/aws-acmpca-certificate.go          |    138 +
 .../aws-acmpca-certificate_apipassthrough.go  |     40 +
 .../aws-acmpca-certificate_edipartyname.go    |     42 +
 ...aws-acmpca-certificate_extendedkeyusage.go |     42 +
 .../aws-acmpca-certificate_extensions.go      |     50 +
 .../aws-acmpca-certificate_generalname.go     |     72 +
 .../acmpca/aws-acmpca-certificate_keyusage.go |     77 +
 .../aws-acmpca-certificate_othername.go       |     42 +
 ...ws-acmpca-certificate_policyinformation.go |     42 +
 ...-acmpca-certificate_policyqualifierinfo.go |     42 +
 .../aws-acmpca-certificate_qualifier.go       |     37 +
 .../acmpca/aws-acmpca-certificate_subject.go  |    102 +
 .../acmpca/aws-acmpca-certificate_validity.go |     42 +
 .../acmpca/aws-acmpca-certificateauthority.go |    144 +
 ...-certificateauthority_accessdescription.go |     40 +
 ...cmpca-certificateauthority_accessmethod.go |     42 +
 ...a-certificateauthority_crlconfiguration.go |     57 +
 ...mpca-certificateauthority_csrextensions.go |     40 +
 ...cmpca-certificateauthority_edipartyname.go |     42 +
 ...acmpca-certificateauthority_generalname.go |     72 +
 ...ws-acmpca-certificateauthority_keyusage.go |     77 +
 ...-certificateauthority_ocspconfiguration.go |     42 +
 ...s-acmpca-certificateauthority_othername.go |     42 +
 ...ficateauthority_revocationconfiguration.go |     40 +
 ...aws-acmpca-certificateauthority_subject.go |    102 +
 ...s-acmpca-certificateauthorityactivation.go |    123 +
 .../acmpca/aws-acmpca-permission.go           |    123 +
 goformation/cloudformation/all.go             |  21693 +++
 .../amazonmq/aws-amazonmq-broker.go           |    193 +
 .../aws-amazonmq-broker_configurationid.go    |     42 +
 .../aws-amazonmq-broker_encryptionoptions.go  |     42 +
 .../aws-amazonmq-broker_ldapservermetadata.go |     87 +
 .../amazonmq/aws-amazonmq-broker_loglist.go   |     42 +
 .../aws-amazonmq-broker_maintenancewindow.go  |     47 +
 .../amazonmq/aws-amazonmq-broker_tagsentry.go |     42 +
 .../amazonmq/aws-amazonmq-broker_user.go      |     52 +
 .../amazonmq/aws-amazonmq-configuration.go    |    138 +
 .../aws-amazonmq-configuration_tagsentry.go   |     42 +
 .../aws-amazonmq-configurationassociation.go  |    113 +
 ...onfigurationassociation_configurationid.go |     42 +
 .../cloudformation/amplify/aws-amplify-app.go |    174 +
 ...ws-amplify-app_autobranchcreationconfig.go |     82 +
 .../aws-amplify-app_basicauthconfig.go        |     47 +
 .../amplify/aws-amplify-app_customrule.go     |     52 +
 .../aws-amplify-app_environmentvariable.go    |     42 +
 .../amplify/aws-amplify-branch.go             |    164 +
 .../aws-amplify-branch_basicauthconfig.go     |     47 +
 .../aws-amplify-branch_environmentvariable.go |     42 +
 .../amplify/aws-amplify-domain.go             |    133 +
 .../aws-amplify-domain_subdomainsetting.go    |     42 +
 .../aws-amplifyuibuilder-component.go         |    153 +
 ...mponent_componentbindingpropertiesvalue.go |     47 +
 ...mponentbindingpropertiesvalueproperties.go |     67 +
 ...plifyuibuilder-component_componentchild.go |     52 +
 ...er-component_componentconditionproperty.go |     62 +
 ...er-component_componentdataconfiguration.go |     52 +
 ...yuibuilder-component_componentoverrides.go |     30 +
 ...ilder-component_componentoverridesvalue.go |     30 +
 ...uibuilder-component_componentproperties.go |     30 +
 ...fyuibuilder-component_componentproperty.go |     97 +
 ...nent_componentpropertybindingproperties.go |     42 +
 ...ifyuibuilder-component_componentvariant.go |     40 +
 ...uilder-component_componentvariantvalues.go |     30 +
 ...amplifyuibuilder-component_formbindings.go |     30 +
 ...ws-amplifyuibuilder-component_predicate.go |     57 +
 ...amplifyuibuilder-component_sortproperty.go |     42 +
 .../aws-amplifyuibuilder-theme.go             |    123 +
 .../aws-amplifyuibuilder-theme_themevalue.go  |     42 +
 .../aws-amplifyuibuilder-theme_themevalues.go |     42 +
 .../apigateway/aws-apigateway-account.go      |    108 +
 .../apigateway/aws-apigateway-apikey.go       |    144 +
 .../aws-apigateway-apikey_stagekey.go         |     42 +
 .../apigateway/aws-apigateway-authorizer.go   |    153 +
 .../aws-apigateway-basepathmapping.go         |    123 +
 .../aws-apigateway-clientcertificate.go       |    114 +
 .../apigateway/aws-apigateway-deployment.go   |    128 +
 ...-apigateway-deployment_accesslogsetting.go |     42 +
 ...aws-apigateway-deployment_canarysetting.go |     47 +
 ...way-deployment_deploymentcanarysettings.go |     47 +
 ...aws-apigateway-deployment_methodsetting.go |     82 +
 ...-apigateway-deployment_stagedescription.go |    128 +
 .../aws-apigateway-documentationpart.go       |    118 +
 ...s-apigateway-documentationpart_location.go |     57 +
 .../aws-apigateway-documentationversion.go    |    118 +
 .../apigateway/aws-apigateway-domainname.go   |    144 +
 ...ateway-domainname_endpointconfiguration.go |     37 +
 ...eway-domainname_mutualtlsauthentication.go |     42 +
 .../aws-apigateway-gatewayresponse.go         |    128 +
 .../apigateway/aws-apigateway-method.go       |    168 +
 .../aws-apigateway-method_integration.go      |    102 +
 ...s-apigateway-method_integrationresponse.go |     57 +
 .../aws-apigateway-method_methodresponse.go   |     47 +
 .../apigateway/aws-apigateway-model.go        |    128 +
 .../aws-apigateway-requestvalidator.go        |    123 +
 .../apigateway/aws-apigateway-resource.go     |    118 +
 .../apigateway/aws-apigateway-restapi.go      |    179 +
 ...pigateway-restapi_endpointconfiguration.go |     42 +
 .../aws-apigateway-restapi_s3location.go      |     52 +
 .../apigateway/aws-apigateway-stage.go        |    174 +
 .../aws-apigateway-stage_accesslogsetting.go  |     42 +
 .../aws-apigateway-stage_canarysetting.go     |     52 +
 .../aws-apigateway-stage_methodsetting.go     |     82 +
 .../apigateway/aws-apigateway-usageplan.go    |    134 +
 .../aws-apigateway-usageplan_apistage.go      |     47 +
 .../aws-apigateway-usageplan_quotasettings.go |     47 +
 ...s-apigateway-usageplan_throttlesettings.go |     42 +
 .../apigateway/aws-apigateway-usageplankey.go |    118 +
 .../apigateway/aws-apigateway-vpclink.go      |    124 +
 .../apigatewayv2/aws-apigatewayv2-api.go      |    188 +
 .../aws-apigatewayv2-api_bodys3location.go    |     52 +
 .../apigatewayv2/aws-apigatewayv2-api_cors.go |     62 +
 ...apigatewayv2-apigatewaymanagedoverrides.go |    123 +
 ...tewaymanagedoverrides_accesslogsettings.go |     42 +
 ...aymanagedoverrides_integrationoverrides.go |     52 +
 ...igatewaymanagedoverrides_routeoverrides.go |     57 +
 ...pigatewaymanagedoverrides_routesettings.go |     57 +
 ...igatewaymanagedoverrides_stageoverrides.go |     62 +
 .../aws-apigatewayv2-apimapping.go            |    123 +
 .../aws-apigatewayv2-authorizer.go            |    158 +
 ...pigatewayv2-authorizer_jwtconfiguration.go |     42 +
 .../aws-apigatewayv2-deployment.go            |    118 +
 .../aws-apigatewayv2-domainname.go            |    123 +
 ...ayv2-domainname_domainnameconfiguration.go |     57 +
 ...ayv2-domainname_mutualtlsauthentication.go |     42 +
 .../aws-apigatewayv2-integration.go           |    193 +
 ...gatewayv2-integration_responseparameter.go |     42 +
 ...wayv2-integration_responseparameterlist.go |     35 +
 .../aws-apigatewayv2-integration_tlsconfig.go |     37 +
 .../aws-apigatewayv2-integrationresponse.go   |    138 +
 .../apigatewayv2/aws-apigatewayv2-model.go    |    128 +
 .../apigatewayv2/aws-apigatewayv2-route.go    |    163 +
 ...apigatewayv2-route_parameterconstraints.go |     37 +
 .../aws-apigatewayv2-routeresponse.go         |    133 +
 ...ayv2-routeresponse_parameterconstraints.go |     37 +
 .../apigatewayv2/aws-apigatewayv2-stage.go    |    163 +
 ...ws-apigatewayv2-stage_accesslogsettings.go |     42 +
 .../aws-apigatewayv2-stage_routesettings.go   |     57 +
 .../apigatewayv2/aws-apigatewayv2-vpclink.go  |    123 +
 .../appconfig/aws-appconfig-application.go    |    118 +
 .../aws-appconfig-application_tags.go         |     42 +
 .../aws-appconfig-configurationprofile.go     |    143 +
 ...aws-appconfig-configurationprofile_tags.go |     42 +
 ...pconfig-configurationprofile_validators.go |     42 +
 .../appconfig/aws-appconfig-deployment.go     |    138 +
 .../aws-appconfig-deployment_tags.go          |     42 +
 .../aws-appconfig-deploymentstrategy.go       |    143 +
 .../aws-appconfig-deploymentstrategy_tags.go  |     42 +
 .../appconfig/aws-appconfig-environment.go    |    128 +
 .../aws-appconfig-environment_monitors.go     |     42 +
 .../aws-appconfig-environment_tags.go         |     42 +
 ...ws-appconfig-hostedconfigurationversion.go |    133 +
 .../appflow/aws-appflow-connectorprofile.go   |    128 +
 ...le_amplitudeconnectorprofilecredentials.go |     42 +
 ...-connectorprofile_connectoroauthrequest.go |     42 +
 ...connectorprofile_connectorprofileconfig.go |     40 +
 ...ctorprofile_connectorprofilecredentials.go |    110 +
 ...ectorprofile_connectorprofileproperties.go |     90 +
 ...file_datadogconnectorprofilecredentials.go |     42 +
 ...ofile_datadogconnectorprofileproperties.go |     37 +
 ...le_dynatraceconnectorprofilecredentials.go |     37 +
 ...ile_dynatraceconnectorprofileproperties.go |     37 +
 ...gleanalyticsconnectorprofilecredentials.go |     57 +
 ...e_infornexusconnectorprofilecredentials.go |     52 +
 ...le_infornexusconnectorprofileproperties.go |     37 +
 ...file_marketoconnectorprofilecredentials.go |     52 +
 ...ofile_marketoconnectorprofileproperties.go |     37 +
 ...ppflow-connectorprofile_oauthproperties.go |     47 +
 ...ile_redshiftconnectorprofilecredentials.go |     42 +
 ...file_redshiftconnectorprofileproperties.go |     52 +
 ...e_salesforceconnectorprofilecredentials.go |     52 +
 ...le_salesforceconnectorprofileproperties.go |     42 +
 ...ile_sapodataconnectorprofilecredentials.go |     40 +
 ...file_sapodataconnectorprofileproperties.go |     67 +
 ...e_servicenowconnectorprofilecredentials.go |     42 +
 ...le_servicenowconnectorprofileproperties.go |     37 +
 ...ile_singularconnectorprofilecredentials.go |     37 +
 ...rofile_slackconnectorprofilecredentials.go |     52 +
 ...profile_slackconnectorprofileproperties.go |     37 +
 ...le_snowflakeconnectorprofilecredentials.go |     42 +
 ...ile_snowflakeconnectorprofileproperties.go |     67 +
 ...e_trendmicroconnectorprofilecredentials.go |     37 +
 ...rofile_veevaconnectorprofilecredentials.go |     42 +
 ...profile_veevaconnectorprofileproperties.go |     37 +
 ...file_zendeskconnectorprofilecredentials.go |     52 +
 ...ofile_zendeskconnectorprofileproperties.go |     37 +
 .../appflow/aws-appflow-flow.go               |    144 +
 .../aws-appflow-flow_aggregationconfig.go     |     37 +
 ...-appflow-flow_amplitudesourceproperties.go |     37 +
 .../aws-appflow-flow_connectoroperator.go     |    107 +
 ...ws-appflow-flow_datadogsourceproperties.go |     37 +
 ...low-flow_destinationconnectorproperties.go |     70 +
 .../aws-appflow-flow_destinationflowconfig.go |     47 +
 ...-appflow-flow_dynatracesourceproperties.go |     37 +
 .../aws-appflow-flow_errorhandlingconfig.go   |     47 +
 ...w-flow_eventbridgedestinationproperties.go |     42 +
 ...ow-flow_googleanalyticssourceproperties.go |     37 +
 .../aws-appflow-flow_incrementalpullconfig.go |     37 +
 ...appflow-flow_infornexussourceproperties.go |     37 +
 ...low_lookoutmetricsdestinationproperties.go |     37 +
 ...ws-appflow-flow_marketosourceproperties.go |     37 +
 .../appflow/aws-appflow-flow_prefixconfig.go  |     42 +
 ...flow-flow_redshiftdestinationproperties.go |     52 +
 ...ws-appflow-flow_s3destinationproperties.go |     47 +
 .../aws-appflow-flow_s3inputformatconfig.go   |     37 +
 .../aws-appflow-flow_s3outputformatconfig.go  |     47 +
 .../aws-appflow-flow_s3sourceproperties.go    |     47 +
 ...ow-flow_salesforcedestinationproperties.go |     52 +
 ...appflow-flow_salesforcesourceproperties.go |     47 +
 ...s-appflow-flow_sapodatasourceproperties.go |     37 +
 ...appflow-flow_scheduledtriggerproperties.go |     62 +
 ...appflow-flow_servicenowsourceproperties.go |     37 +
 ...s-appflow-flow_singularsourceproperties.go |     37 +
 .../aws-appflow-flow_slacksourceproperties.go |     37 +
 ...low-flow_snowflakedestinationproperties.go |     52 +
 ...-appflow-flow_sourceconnectorproperties.go |    105 +
 .../aws-appflow-flow_sourceflowconfig.go      |     52 +
 .../appflow/aws-appflow-flow_task.go          |     57 +
 .../aws-appflow-flow_taskpropertiesobject.go  |     42 +
 ...appflow-flow_trendmicrosourceproperties.go |     37 +
 .../appflow/aws-appflow-flow_triggerconfig.go |     42 +
 ...flow-flow_upsolverdestinationproperties.go |     47 +
 ...pflow-flow_upsolvers3outputformatconfig.go |     47 +
 .../aws-appflow-flow_veevasourceproperties.go |     57 +
 ...pflow-flow_zendeskdestinationproperties.go |     52 +
 ...ws-appflow-flow_zendesksourceproperties.go |     37 +
 .../aws-appintegrations-eventintegration.go   |    129 +
 ...tegrations-eventintegration_eventfilter.go |     37 +
 ...integration_eventintegrationassociation.go |     57 +
 ...pintegrations-eventintegration_metadata.go |     42 +
 ...s-applicationautoscaling-scalabletarget.go |    143 +
 ...ing-scalabletarget_scalabletargetaction.go |     42 +
 ...oscaling-scalabletarget_scheduledaction.go |     62 +
 ...toscaling-scalabletarget_suspendedstate.go |     47 +
 ...ws-applicationautoscaling-scalingpolicy.go |    143 +
 ...ingpolicy_customizedmetricspecification.go |     57 +
 ...toscaling-scalingpolicy_metricdimension.go |     42 +
 ...ingpolicy_predefinedmetricspecification.go |     42 +
 ...utoscaling-scalingpolicy_stepadjustment.go |     47 +
 ...ngpolicy_stepscalingpolicyconfiguration.go |     57 +
 ...argettrackingscalingpolicyconfiguration.go |     62 +
 .../aws-applicationinsights-application.go    |    149 +
 ...s-applicationinsights-application_alarm.go |     42 +
 ...icationinsights-application_alarmmetric.go |     37 +
 ...ghts-application_componentconfiguration.go |     40 +
 ...-application_componentmonitoringsetting.go |     62 +
 ...sights-application_configurationdetails.go |     55 +
 ...ioninsights-application_customcomponent.go |     42 +
 ...ights-application_jmxprometheusexporter.go |     47 +
 ...aws-applicationinsights-application_log.go |     57 +
 ...licationinsights-application_logpattern.go |     47 +
 ...ationinsights-application_logpatternset.go |     42 +
 ...cation_subcomponentconfigurationdetails.go |     45 +
 ...plication_subcomponenttypeconfiguration.go |     42 +
 ...cationinsights-application_windowsevent.go |     52 +
 .../appmesh/aws-appmesh-gatewayroute.go       |    134 +
 ...-gatewayroute_gatewayroutehostnamematch.go |     42 +
 ...atewayroute_gatewayroutehostnamerewrite.go |     37 +
 ...-gatewayroute_gatewayroutemetadatamatch.go |     57 +
 ...esh-gatewayroute_gatewayrouterangematch.go |     42 +
 ...s-appmesh-gatewayroute_gatewayroutespec.go |     52 +
 ...appmesh-gatewayroute_gatewayroutetarget.go |     35 +
 ...gatewayroute_gatewayroutevirtualservice.go |     37 +
 ...s-appmesh-gatewayroute_grpcgatewayroute.go |     40 +
 ...esh-gatewayroute_grpcgatewayrouteaction.go |     40 +
 ...mesh-gatewayroute_grpcgatewayroutematch.go |     47 +
 ...h-gatewayroute_grpcgatewayroutemetadata.go |     47 +
 ...sh-gatewayroute_grpcgatewayrouterewrite.go |     35 +
 ...s-appmesh-gatewayroute_httpgatewayroute.go |     40 +
 ...esh-gatewayroute_httpgatewayrouteaction.go |     40 +
 ...esh-gatewayroute_httpgatewayrouteheader.go |     47 +
 ...atewayroute_httpgatewayrouteheadermatch.go |     57 +
 ...mesh-gatewayroute_httpgatewayroutematch.go |     62 +
 ...atewayroute_httpgatewayroutepathrewrite.go |     37 +
 ...ewayroute_httpgatewayrouteprefixrewrite.go |     42 +
 ...sh-gatewayroute_httpgatewayrouterewrite.go |     45 +
 .../aws-appmesh-gatewayroute_httppathmatch.go |     42 +
 ...sh-gatewayroute_httpqueryparametermatch.go |     37 +
 ...aws-appmesh-gatewayroute_queryparameter.go |     42 +
 .../appmesh/aws-appmesh-mesh.go               |    119 +
 .../appmesh/aws-appmesh-mesh_egressfilter.go  |     37 +
 .../appmesh/aws-appmesh-mesh_meshspec.go      |     35 +
 .../appmesh/aws-appmesh-route.go              |    134 +
 .../appmesh/aws-appmesh-route_duration.go     |     42 +
 .../aws-appmesh-route_grpcretrypolicy.go      |     57 +
 .../appmesh/aws-appmesh-route_grpcroute.go    |     50 +
 .../aws-appmesh-route_grpcrouteaction.go      |     35 +
 .../aws-appmesh-route_grpcroutematch.go       |     47 +
 .../aws-appmesh-route_grpcroutemetadata.go    |     47 +
 ...mesh-route_grpcroutemetadatamatchmethod.go |     57 +
 .../appmesh/aws-appmesh-route_grpctimeout.go  |     40 +
 .../aws-appmesh-route_headermatchmethod.go    |     57 +
 .../aws-appmesh-route_httppathmatch.go        |     42 +
 ...s-appmesh-route_httpqueryparametermatch.go |     37 +
 .../aws-appmesh-route_httpretrypolicy.go      |     52 +
 .../appmesh/aws-appmesh-route_httproute.go    |     50 +
 .../aws-appmesh-route_httprouteaction.go      |     35 +
 .../aws-appmesh-route_httprouteheader.go      |     47 +
 .../aws-appmesh-route_httproutematch.go       |     62 +
 .../appmesh/aws-appmesh-route_httptimeout.go  |     40 +
 .../appmesh/aws-appmesh-route_matchrange.go   |     42 +
 .../aws-appmesh-route_queryparameter.go       |     42 +
 .../appmesh/aws-appmesh-route_routespec.go    |     57 +
 .../appmesh/aws-appmesh-route_tcproute.go     |     40 +
 .../aws-appmesh-route_tcprouteaction.go       |     35 +
 .../appmesh/aws-appmesh-route_tcptimeout.go   |     35 +
 .../aws-appmesh-route_weightedtarget.go       |     42 +
 .../appmesh/aws-appmesh-virtualgateway.go     |    129 +
 ...lgateway_subjectalternativenamematchers.go |     37 +
 ...-virtualgateway_subjectalternativenames.go |     35 +
 ...-virtualgateway_virtualgatewayaccesslog.go |     35 +
 ...algateway_virtualgatewaybackenddefaults.go |     35 +
 ...rtualgateway_virtualgatewayclientpolicy.go |     35 +
 ...algateway_virtualgatewayclientpolicytls.go |     52 +
 ...eway_virtualgatewayclienttlscertificate.go |     40 +
 ...ualgateway_virtualgatewayconnectionpool.go |     45 +
 ...tualgateway_virtualgatewayfileaccesslog.go |     37 +
 ...ateway_virtualgatewaygrpcconnectionpool.go |     37 +
 ...gateway_virtualgatewayhealthcheckpolicy.go |     67 +
 ...teway_virtualgatewayhttp2connectionpool.go |     37 +
 ...ateway_virtualgatewayhttpconnectionpool.go |     42 +
 ...h-virtualgateway_virtualgatewaylistener.go |     50 +
 ...irtualgateway_virtualgatewaylistenertls.go |     47 +
 ...virtualgatewaylistenertlsacmcertificate.go |     37 +
 ...ay_virtualgatewaylistenertlscertificate.go |     45 +
 ...irtualgatewaylistenertlsfilecertificate.go |     42 +
 ...virtualgatewaylistenertlssdscertificate.go |     37 +
 ...tualgatewaylistenertlsvalidationcontext.go |     40 +
 ...atewaylistenertlsvalidationcontexttrust.go |     40 +
 ...sh-virtualgateway_virtualgatewaylogging.go |     35 +
 ...irtualgateway_virtualgatewayportmapping.go |     42 +
 ...pmesh-virtualgateway_virtualgatewayspec.go |     45 +
 ...eway_virtualgatewaytlsvalidationcontext.go |     40 +
 ...tualgatewaytlsvalidationcontextacmtrust.go |     37 +
 ...ualgatewaytlsvalidationcontextfiletrust.go |     37 +
 ...tualgatewaytlsvalidationcontextsdstrust.go |     37 +
 ...virtualgatewaytlsvalidationcontexttrust.go |     45 +
 .../appmesh/aws-appmesh-virtualnode.go        |    129 +
 .../aws-appmesh-virtualnode_accesslog.go      |     35 +
 ...irtualnode_awscloudmapinstanceattribute.go |     42 +
 ...virtualnode_awscloudmapservicediscovery.go |     47 +
 .../aws-appmesh-virtualnode_backend.go        |     35 +
 ...aws-appmesh-virtualnode_backenddefaults.go |     35 +
 .../aws-appmesh-virtualnode_clientpolicy.go   |     35 +
 ...aws-appmesh-virtualnode_clientpolicytls.go |     52 +
 ...ppmesh-virtualnode_clienttlscertificate.go |     40 +
 ...appmesh-virtualnode_dnsservicediscovery.go |     42 +
 .../aws-appmesh-virtualnode_duration.go       |     42 +
 .../aws-appmesh-virtualnode_fileaccesslog.go  |     37 +
 .../aws-appmesh-virtualnode_grpctimeout.go    |     40 +
 .../aws-appmesh-virtualnode_healthcheck.go    |     67 +
 .../aws-appmesh-virtualnode_httptimeout.go    |     40 +
 .../aws-appmesh-virtualnode_listener.go       |     60 +
 ...aws-appmesh-virtualnode_listenertimeout.go |     50 +
 .../aws-appmesh-virtualnode_listenertls.go    |     47 +
 ...h-virtualnode_listenertlsacmcertificate.go |     37 +
 ...mesh-virtualnode_listenertlscertificate.go |     45 +
 ...-virtualnode_listenertlsfilecertificate.go |     42 +
 ...h-virtualnode_listenertlssdscertificate.go |     37 +
 ...irtualnode_listenertlsvalidationcontext.go |     40 +
 ...lnode_listenertlsvalidationcontexttrust.go |     40 +
 .../aws-appmesh-virtualnode_logging.go        |     35 +
 ...ws-appmesh-virtualnode_outlierdetection.go |     52 +
 .../aws-appmesh-virtualnode_portmapping.go    |     42 +
 ...ws-appmesh-virtualnode_servicediscovery.go |     40 +
 ...tualnode_subjectalternativenamematchers.go |     37 +
 ...esh-virtualnode_subjectalternativenames.go |     35 +
 .../aws-appmesh-virtualnode_tcptimeout.go     |     35 +
 ...ppmesh-virtualnode_tlsvalidationcontext.go |     40 +
 ...irtualnode_tlsvalidationcontextacmtrust.go |     37 +
 ...rtualnode_tlsvalidationcontextfiletrust.go |     37 +
 ...irtualnode_tlsvalidationcontextsdstrust.go |     37 +
 ...h-virtualnode_tlsvalidationcontexttrust.go |     45 +
 ...h-virtualnode_virtualnodeconnectionpool.go |     50 +
 ...rtualnode_virtualnodegrpcconnectionpool.go |     37 +
 ...tualnode_virtualnodehttp2connectionpool.go |     37 +
 ...rtualnode_virtualnodehttpconnectionpool.go |     42 +
 ...aws-appmesh-virtualnode_virtualnodespec.go |     55 +
 ...irtualnode_virtualnodetcpconnectionpool.go |     37 +
 ...pmesh-virtualnode_virtualservicebackend.go |     42 +
 .../appmesh/aws-appmesh-virtualrouter.go      |    129 +
 .../aws-appmesh-virtualrouter_portmapping.go  |     42 +
 ...esh-virtualrouter_virtualrouterlistener.go |     35 +
 ...appmesh-virtualrouter_virtualrouterspec.go |     35 +
 .../appmesh/aws-appmesh-virtualservice.go     |    129 +
 ...rtualservice_virtualnodeserviceprovider.go |     37 +
 ...ualservice_virtualrouterserviceprovider.go |     37 +
 ...h-virtualservice_virtualserviceprovider.go |     40 +
 ...pmesh-virtualservice_virtualservicespec.go |     35 +
 .../apprunner/aws-apprunner-service.go        |    139 +
 ...ner-service_authenticationconfiguration.go |     42 +
 ...aws-apprunner-service_codeconfiguration.go |     42 +
 ...prunner-service_codeconfigurationvalues.go |     57 +
 .../aws-apprunner-service_coderepository.go   |     47 +
 ...prunner-service_encryptionconfiguration.go |     37 +
 ...runner-service_healthcheckconfiguration.go |     62 +
 ...ws-apprunner-service_imageconfiguration.go |     47 +
 .../aws-apprunner-service_imagerepository.go  |     47 +
 ...apprunner-service_instanceconfiguration.go |     47 +
 .../aws-apprunner-service_keyvaluepair.go     |     42 +
 ...aws-apprunner-service_sourcecodeversion.go |     42 +
 ...s-apprunner-service_sourceconfiguration.go |     52 +
 .../appstream/aws-appstream-appblock.go       |    134 +
 .../aws-appstream-appblock_s3location.go      |     42 +
 .../aws-appstream-appblock_scriptdetails.go   |     52 +
 .../appstream/aws-appstream-application.go    |    164 +
 .../aws-appstream-application_s3location.go   |     42 +
 ...s-appstream-applicationfleetassociation.go |    113 +
 .../aws-appstream-directoryconfig.go          |    118 +
 ...rectoryconfig_serviceaccountcredentials.go |     42 +
 .../appstream/aws-appstream-fleet.go          |    204 +
 .../aws-appstream-fleet_computecapacity.go    |     37 +
 .../aws-appstream-fleet_domainjoininfo.go     |     42 +
 .../aws-appstream-fleet_vpcconfig.go          |     42 +
 .../appstream/aws-appstream-imagebuilder.go   |    169 +
 ...s-appstream-imagebuilder_accessendpoint.go |     42 +
 ...s-appstream-imagebuilder_domainjoininfo.go |     42 +
 .../aws-appstream-imagebuilder_vpcconfig.go   |     42 +
 .../appstream/aws-appstream-stack.go          |    169 +
 .../aws-appstream-stack_accessendpoint.go     |     42 +
 ...aws-appstream-stack_applicationsettings.go |     42 +
 .../aws-appstream-stack_storageconnector.go   |     47 +
 .../aws-appstream-stack_usersetting.go        |     42 +
 .../aws-appstream-stackfleetassociation.go    |    113 +
 .../aws-appstream-stackuserassociation.go     |    123 +
 .../appstream/aws-appstream-user.go           |    128 +
 .../appsync/aws-appsync-apicache.go           |    133 +
 .../appsync/aws-appsync-apikey.go             |    123 +
 .../appsync/aws-appsync-datasource.go         |    158 +
 ...-appsync-datasource_authorizationconfig.go |     42 +
 .../aws-appsync-datasource_awsiamconfig.go    |     42 +
 .../aws-appsync-datasource_deltasyncconfig.go |     47 +
 .../aws-appsync-datasource_dynamodbconfig.go  |     57 +
 ...-appsync-datasource_elasticsearchconfig.go |     42 +
 .../aws-appsync-datasource_httpconfig.go      |     42 +
 .../aws-appsync-datasource_lambdaconfig.go    |     37 +
 ...sync-datasource_opensearchserviceconfig.go |     42 +
 ...ppsync-datasource_rdshttpendpointconfig.go |     57 +
 ...ync-datasource_relationaldatabaseconfig.go |     42 +
 .../aws-appsync-functionconfiguration.go      |    153 +
 ...nfiguration_lambdaconflicthandlerconfig.go |     37 +
 ...ppsync-functionconfiguration_syncconfig.go |     47 +
 .../appsync/aws-appsync-graphqlapi.go         |    148 +
 ...hqlapi_additionalauthenticationprovider.go |     52 +
 ...qlapi_additionalauthenticationproviders.go |     30 +
 ...ppsync-graphqlapi_cognitouserpoolconfig.go |     47 +
 ...psync-graphqlapi_lambdaauthorizerconfig.go |     47 +
 .../aws-appsync-graphqlapi_logconfig.go       |     47 +
 ...-appsync-graphqlapi_openidconnectconfig.go |     52 +
 .../appsync/aws-appsync-graphqlapi_tags.go    |     30 +
 .../aws-appsync-graphqlapi_userpoolconfig.go  |     52 +
 .../appsync/aws-appsync-graphqlschema.go      |    118 +
 .../appsync/aws-appsync-resolver.go           |    163 +
 .../aws-appsync-resolver_cachingconfig.go     |     42 +
 ...nc-resolver_lambdaconflicthandlerconfig.go |     37 +
 .../aws-appsync-resolver_pipelineconfig.go    |     37 +
 .../aws-appsync-resolver_syncconfig.go        |     47 +
 .../aps/aws-aps-rulegroupsnamespace.go        |    124 +
 .../cloudformation/aps/aws-aps-workspace.go   |    119 +
 .../cloudformation/ask/alexa-ask-skill.go     |    118 +
 ...a-ask-skill_authenticationconfiguration.go |     47 +
 .../ask/alexa-ask-skill_overrides.go          |     35 +
 .../ask/alexa-ask-skill_skillpackage.go       |     57 +
 .../athena/aws-athena-datacatalog.go          |    129 +
 .../athena/aws-athena-datacatalog_tags.go     |     36 +
 .../athena/aws-athena-namedquery.go           |    128 +
 .../athena/aws-athena-preparedstatement.go    |    123 +
 .../athena/aws-athena-workgroup.go            |    139 +
 ...thena-workgroup_encryptionconfiguration.go |     42 +
 .../aws-athena-workgroup_engineversion.go     |     42 +
 ...ws-athena-workgroup_resultconfiguration.go |     42 +
 ...na-workgroup_resultconfigurationupdates.go |     52 +
 .../athena/aws-athena-workgroup_tags.go       |     36 +
 ...athena-workgroup_workgroupconfiguration.go |     62 +
 ...workgroup_workgroupconfigurationupdates.go |     67 +
 .../aws-auditmanager-assessment.go            |    149 +
 ...assessment_assessmentreportsdestination.go |     42 +
 .../aws-auditmanager-assessment_awsaccount.go |     47 +
 .../aws-auditmanager-assessment_awsservice.go |     37 +
 .../aws-auditmanager-assessment_delegation.go |     87 +
 .../aws-auditmanager-assessment_role.go       |     42 +
 .../aws-auditmanager-assessment_scope.go      |     40 +
 .../aws-autoscaling-autoscalinggroup.go       |    258 +
 ...utoscalinggroup_acceleratorcountrequest.go |     42 +
 ...ggroup_acceleratortotalmemorymibrequest.go |     42 +
 ...nggroup_baselineebsbandwidthmbpsrequest.go |     42 +
 ...g-autoscalinggroup_instancerequirements.go |    137 +
 ...-autoscalinggroup_instancesdistribution.go |     62 +
 ...scaling-autoscalinggroup_launchtemplate.go |     40 +
 ...utoscalinggroup_launchtemplateoverrides.go |     52 +
 ...calinggroup_launchtemplatespecification.go |     47 +
 ...scalinggroup_lifecyclehookspecification.go |     67 +
 ...utoscalinggroup_memorygibpervcpurequest.go |     42 +
 ...aling-autoscalinggroup_memorymibrequest.go |     42 +
 ...ling-autoscalinggroup_metricscollection.go |     42 +
 ...g-autoscalinggroup_mixedinstancespolicy.go |     40 +
 ...alinggroup_networkinterfacecountrequest.go |     42 +
 ...oscalinggroup_notificationconfiguration.go |     42 +
 ...utoscaling-autoscalinggroup_tagproperty.go |     47 +
 ...scalinggroup_totallocalstoragegbrequest.go |     42 +
 ...aling-autoscalinggroup_vcpucountrequest.go |     42 +
 .../aws-autoscaling-launchconfiguration.go    |    198 +
 ...scaling-launchconfiguration_blockdevice.go |     67 +
 ...-launchconfiguration_blockdevicemapping.go |     52 +
 ...ling-launchconfiguration_metadataoption.go |     47 +
 ...ing-launchconfiguration_metadataoptions.go |     47 +
 .../aws-autoscaling-lifecyclehook.go          |    143 +
 .../aws-autoscaling-scalingpolicy.go          |    158 +
 ...ingpolicy_customizedmetricspecification.go |     57 +
 ...toscaling-scalingpolicy_metricdimension.go |     42 +
 ...ingpolicy_predefinedmetricspecification.go |     42 +
 ...ngpolicy_predictivescalingconfiguration.go |     57 +
 ...cy_predictivescalingmetricspecification.go |     52 +
 ...y_predictivescalingpredefinedloadmetric.go |     42 +
 ...y_predictivescalingpredefinedmetricpair.go |     42 +
 ...redictivescalingpredefinedscalingmetric.go |     42 +
 ...utoscaling-scalingpolicy_stepadjustment.go |     47 +
 ...alingpolicy_targettrackingconfiguration.go |     52 +
 .../aws-autoscaling-scheduledaction.go        |    143 +
 .../autoscaling/aws-autoscaling-warmpool.go   |    123 +
 .../aws-autoscalingplans-scalingplan.go       |    111 +
 ...lingplans-scalingplan_applicationsource.go |     42 +
 ...gplan_customizedloadmetricspecification.go |     57 +
 ...an_customizedscalingmetricspecification.go |     57 +
 ...calingplans-scalingplan_metricdimension.go |     42 +
 ...gplan_predefinedloadmetricspecification.go |     42 +
 ...an_predefinedscalingmetricspecification.go |     42 +
 ...ingplans-scalingplan_scalinginstruction.go |    102 +
 ...-autoscalingplans-scalingplan_tagfilter.go |     42 +
 ...scalingplan_targettrackingconfiguration.go |     67 +
 .../backup/aws-backup-backupplan.go           |    113 +
 ...pplan_advancedbackupsettingresourcetype.go |     42 +
 ...ackup-backupplan_backupplanresourcetype.go |     47 +
 ...ackup-backupplan_backupruleresourcetype.go |     77 +
 ...ackup-backupplan_copyactionresourcetype.go |     42 +
 ...backup-backupplan_lifecycleresourcetype.go |     42 +
 .../backup/aws-backup-backupselection.go      |    113 +
 ...upselection_backupselectionresourcetype.go |     62 +
 ...p-backupselection_conditionresourcetype.go |     47 +
 .../backup/aws-backup-backupvault.go          |    133 +
 ...ackup-backupvault_lockconfigurationtype.go |     47 +
 ...ckup-backupvault_notificationobjecttype.go |     42 +
 .../backup/aws-backup-framework.go            |    124 +
 ...-backup-framework_controlinputparameter.go |     42 +
 .../aws-backup-framework_frameworkcontrol.go  |     47 +
 .../backup/aws-backup-reportplan.go           |    129 +
 .../batch/aws-batch-computeenvironment.go     |    138 +
 ...tch-computeenvironment_computeresources.go |    117 +
 ...mputeenvironment_ec2configurationobject.go |     42 +
 ...environment_launchtemplatespecification.go |     47 +
 .../batch/aws-batch-jobdefinition.go          |    158 +
 ...batch-jobdefinition_authorizationconfig.go |     42 +
 ...batch-jobdefinition_containerproperties.go |    132 +
 .../batch/aws-batch-jobdefinition_device.go   |     47 +
 ...ch-jobdefinition_efsvolumeconfiguration.go |     57 +
 .../aws-batch-jobdefinition_environment.go    |     42 +
 .../aws-batch-jobdefinition_evaluateonexit.go |     52 +
 ...definition_fargateplatformconfiguration.go |     37 +
 ...aws-batch-jobdefinition_linuxparameters.go |     62 +
 ...ws-batch-jobdefinition_logconfiguration.go |     47 +
 .../aws-batch-jobdefinition_mountpoints.go    |     47 +
 ...atch-jobdefinition_networkconfiguration.go |     37 +
 .../aws-batch-jobdefinition_nodeproperties.go |     47 +
 ...s-batch-jobdefinition_noderangeproperty.go |     42 +
 ...batch-jobdefinition_resourcerequirement.go |     42 +
 .../aws-batch-jobdefinition_retrystrategy.go  |     42 +
 .../batch/aws-batch-jobdefinition_secret.go   |     42 +
 .../batch/aws-batch-jobdefinition_timeout.go  |     37 +
 .../batch/aws-batch-jobdefinition_tmpfs.go    |     47 +
 .../batch/aws-batch-jobdefinition_ulimit.go   |     47 +
 .../batch/aws-batch-jobdefinition_volumes.go  |     47 +
 .../aws-batch-jobdefinition_volumeshost.go    |     37 +
 .../batch/aws-batch-jobqueue.go               |    133 +
 ...-batch-jobqueue_computeenvironmentorder.go |     42 +
 .../batch/aws-batch-schedulingpolicy.go       |    118 +
 ...-batch-schedulingpolicy_fairsharepolicy.go |     47 +
 ...-batch-schedulingpolicy_shareattributes.go |     42 +
 .../budgets/aws-budgets-budget.go             |    111 +
 .../budgets/aws-budgets-budget_budgetdata.go  |     72 +
 .../budgets/aws-budgets-budget_costtypes.go   |     87 +
 .../aws-budgets-budget_notification.go        |     52 +
 ...gets-budget_notificationwithsubscribers.go |     40 +
 .../budgets/aws-budgets-budget_spend.go       |     42 +
 .../budgets/aws-budgets-budget_subscriber.go  |     42 +
 .../budgets/aws-budgets-budget_timeperiod.go  |     42 +
 .../budgets/aws-budgets-budgetsaction.go      |    143 +
 ...s-budgets-budgetsaction_actionthreshold.go |     42 +
 .../aws-budgets-budgetsaction_definition.go   |     45 +
 ...dgets-budgetsaction_iamactiondefinition.go |     52 +
 ...dgets-budgetsaction_scpactiondefinition.go |     42 +
 ...dgets-budgetsaction_ssmactiondefinition.go |     47 +
 .../aws-budgets-budgetsaction_subscriber.go   |     42 +
 .../cassandra/aws-cassandra-keyspace.go       |    114 +
 .../cassandra/aws-cassandra-table.go          |    154 +
 .../aws-cassandra-table_billingmode.go        |     42 +
 ...aws-cassandra-table_clusteringkeycolumn.go |     42 +
 .../cassandra/aws-cassandra-table_column.go   |     42 +
 ...cassandra-table_encryptionspecification.go |     42 +
 ...s-cassandra-table_provisionedthroughput.go |     42 +
 .../ce/aws-ce-anomalymonitor.go               |    123 +
 .../ce/aws-ce-anomalysubscription.go          |    128 +
 .../aws-ce-anomalysubscription_subscriber.go  |     47 +
 .../cloudformation/ce/aws-ce-costcategory.go  |    128 +
 .../aws-certificatemanager-account.go         |    106 +
 ...nager-account_expiryeventsconfiguration.go |     37 +
 .../aws-certificatemanager-certificate.go     |    139 +
 ...ager-certificate_domainvalidationoption.go |     47 +
 .../aws-chatbot-slackchannelconfiguration.go  |    143 +
 .../cloud9/aws-cloud9-environmentec2.go       |    154 +
 .../aws-cloud9-environmentec2_repository.go   |     42 +
 .../aws-cloudformation-customresource.go      |    108 +
 .../aws-cloudformation-macro.go               |    128 +
 ...aws-cloudformation-moduledefaultversion.go |    118 +
 .../aws-cloudformation-moduleversion.go       |    113 +
 .../aws-cloudformation-publictypeversion.go   |    128 +
 .../aws-cloudformation-publisher.go           |    113 +
 ...s-cloudformation-resourcedefaultversion.go |    118 +
 .../aws-cloudformation-resourceversion.go     |    123 +
 ...formation-resourceversion_loggingconfig.go |     42 +
 .../aws-cloudformation-stack.go               |    128 +
 .../aws-cloudformation-stackset.go            |    178 +
 ...-cloudformation-stackset_autodeployment.go |     42 +
 ...oudformation-stackset_deploymenttargets.go |     42 +
 ...formation-stackset_operationpreferences.go |     62 +
 .../aws-cloudformation-stackset_parameter.go  |     42 +
 ...-cloudformation-stackset_stackinstances.go |     47 +
 .../aws-cloudformation-typeactivation.go      |    153 +
 ...dformation-typeactivation_loggingconfig.go |     42 +
 .../aws-cloudformation-waitcondition.go       |    131 +
 .../aws-cloudformation-waitconditionhandle.go |    101 +
 .../cloudformation/cloudformation/tag.go      |     42 +
 .../cloudformation_suite_test.go              |     13 +
 .../cloudfront/aws-cloudfront-cachepolicy.go  |    106 +
 ...loudfront-cachepolicy_cachepolicyconfig.go |     62 +
 ...ws-cloudfront-cachepolicy_cookiesconfig.go |     42 +
 ...ws-cloudfront-cachepolicy_headersconfig.go |     42 +
 ...arametersincachekeyandforwardedtoorigin.go |     57 +
 ...oudfront-cachepolicy_querystringsconfig.go |     42 +
 ...oudfront-cloudfrontoriginaccessidentity.go |    106 +
 ...ty_cloudfrontoriginaccessidentityconfig.go |     37 +
 .../cloudfront/aws-cloudfront-distribution.go |    112 +
 ...s-cloudfront-distribution_cachebehavior.go |    132 +
 .../aws-cloudfront-distribution_cookies.go    |     42 +
 ...dfront-distribution_customerrorresponse.go |     52 +
 ...udfront-distribution_customoriginconfig.go |     62 +
 ...front-distribution_defaultcachebehavior.go |    127 +
 ...udfront-distribution_distributionconfig.go |    127 +
 ...cloudfront-distribution_forwardedvalues.go |     52 +
 ...dfront-distribution_functionassociation.go |     42 +
 ...-cloudfront-distribution_georestriction.go |     42 +
 ...-distribution_lambdafunctionassociation.go |     47 +
 ...udfront-distribution_legacycustomorigin.go |     57 +
 ...-cloudfront-distribution_legacys3origin.go |     42 +
 .../aws-cloudfront-distribution_logging.go    |     47 +
 .../aws-cloudfront-distribution_origin.go     |     77 +
 ...udfront-distribution_origincustomheader.go |     42 +
 ...aws-cloudfront-distribution_origingroup.go |     47 +
 ...istribution_origingroupfailovercriteria.go |     35 +
 ...oudfront-distribution_origingroupmember.go |     37 +
 ...udfront-distribution_origingroupmembers.go |     42 +
 ...ws-cloudfront-distribution_origingroups.go |     42 +
 ...ws-cloudfront-distribution_originshield.go |     42 +
 ...ws-cloudfront-distribution_restrictions.go |     35 +
 ...-cloudfront-distribution_s3originconfig.go |     37 +
 ...aws-cloudfront-distribution_statuscodes.go |     42 +
 ...oudfront-distribution_viewercertificate.go |     57 +
 .../cloudfront/aws-cloudfront-function.go     |    123 +
 .../aws-cloudfront-function_functionconfig.go |     42 +
 ...ws-cloudfront-function_functionmetadata.go |     37 +
 .../cloudfront/aws-cloudfront-keygroup.go     |    106 +
 .../aws-cloudfront-keygroup_keygroupconfig.go |     47 +
 .../aws-cloudfront-originrequestpolicy.go     |    106 +
 ...front-originrequestpolicy_cookiesconfig.go |     42 +
 ...front-originrequestpolicy_headersconfig.go |     42 +
 ...requestpolicy_originrequestpolicyconfig.go |     57 +
 ...-originrequestpolicy_querystringsconfig.go |     42 +
 .../cloudfront/aws-cloudfront-publickey.go    |    106 +
 ...ws-cloudfront-publickey_publickeyconfig.go |     52 +
 .../aws-cloudfront-realtimelogconfig.go       |    123 +
 ...s-cloudfront-realtimelogconfig_endpoint.go |     42 +
 ...t-realtimelogconfig_kinesisstreamconfig.go |     42 +
 .../aws-cloudfront-responseheaderspolicy.go   |    106 +
 ...headerspolicy_accesscontrolallowheaders.go |     37 +
 ...headerspolicy_accesscontrolallowmethods.go |     37 +
 ...headerspolicy_accesscontrolalloworigins.go |     37 +
 ...eaderspolicy_accesscontrolexposeheaders.go |     37 +
 ...onseheaderspolicy_contentsecuritypolicy.go |     42 +
 ...esponseheaderspolicy_contenttypeoptions.go |     37 +
 ...dfront-responseheaderspolicy_corsconfig.go |     67 +
 ...ront-responseheaderspolicy_customheader.go |     47 +
 ...sponseheaderspolicy_customheadersconfig.go |     35 +
 ...ront-responseheaderspolicy_frameoptions.go |     42 +
 ...nt-responseheaderspolicy_referrerpolicy.go |     42 +
 ...aderspolicy_responseheaderspolicyconfig.go |     57 +
 ...onseheaderspolicy_securityheadersconfig.go |     60 +
 ...seheaderspolicy_stricttransportsecurity.go |     52 +
 ...ont-responseheaderspolicy_xssprotection.go |     52 +
 .../aws-cloudfront-streamingdistribution.go   |    112 +
 ...loudfront-streamingdistribution_logging.go |     47 +
 ...oudfront-streamingdistribution_s3origin.go |     42 +
 ...istribution_streamingdistributionconfig.go |     67 +
 ...nt-streamingdistribution_trustedsigners.go |     42 +
 .../cloudtrail/aws-cloudtrail-trail.go        |    179 +
 .../aws-cloudtrail-trail_dataresource.go      |     42 +
 .../aws-cloudtrail-trail_eventselector.go     |     52 +
 .../aws-cloudtrail-trail_insightselector.go   |     37 +
 .../cloudwatch/aws-cloudwatch-alarm.go        |    208 +
 .../aws-cloudwatch-alarm_dimension.go         |     42 +
 .../cloudwatch/aws-cloudwatch-alarm_metric.go |     47 +
 .../aws-cloudwatch-alarm_metricdataquery.go   |     67 +
 .../aws-cloudwatch-alarm_metricstat.go        |     52 +
 .../aws-cloudwatch-anomalydetector.go         |    138 +
 ...loudwatch-anomalydetector_configuration.go |     42 +
 ...ws-cloudwatch-anomalydetector_dimension.go |     42 +
 .../aws-cloudwatch-anomalydetector_metric.go  |     47 +
 ...watch-anomalydetector_metricdataqueries.go |     30 +
 ...udwatch-anomalydetector_metricdataquery.go |     67 +
 ...omalydetector_metricmathanomalydetector.go |     35 +
 ...s-cloudwatch-anomalydetector_metricstat.go |     52 +
 .../aws-cloudwatch-anomalydetector_range.go   |     42 +
 ...alydetector_singlemetricanomalydetector.go |     52 +
 .../aws-cloudwatch-compositealarm.go          |    138 +
 .../cloudwatch/aws-cloudwatch-dashboard.go    |    113 +
 .../cloudwatch/aws-cloudwatch-insightrule.go  |    123 +
 .../aws-cloudwatch-insightrule_tags.go        |     30 +
 .../cloudwatch/aws-cloudwatch-metricstream.go |    139 +
 ...udwatch-metricstream_metricstreamfilter.go |     37 +
 .../codeartifact/aws-codeartifact-domain.go   |    124 +
 .../aws-codeartifact-repository.go            |    144 +
 .../codebuild/aws-codebuild-project.go        |    224 +
 .../aws-codebuild-project_artifacts.go        |     77 +
 ...aws-codebuild-project_batchrestrictions.go |     42 +
 ...aws-codebuild-project_buildstatusconfig.go |     42 +
 ...-codebuild-project_cloudwatchlogsconfig.go |     47 +
 .../aws-codebuild-project_environment.go      |     72 +
 ...s-codebuild-project_environmentvariable.go |     47 +
 .../aws-codebuild-project_filtergroup.go      |     30 +
 ...s-codebuild-project_gitsubmodulesconfig.go |     37 +
 .../aws-codebuild-project_logsconfig.go       |     40 +
 ...debuild-project_projectbuildbatchconfig.go |     57 +
 .../aws-codebuild-project_projectcache.go     |     47 +
 ...build-project_projectfilesystemlocation.go |     57 +
 ...-codebuild-project_projectsourceversion.go |     42 +
 .../aws-codebuild-project_projecttriggers.go  |     47 +
 ...ws-codebuild-project_registrycredential.go |     42 +
 .../aws-codebuild-project_s3logsconfig.go     |     47 +
 .../codebuild/aws-codebuild-project_source.go |     82 +
 .../aws-codebuild-project_sourceauth.go       |     42 +
 .../aws-codebuild-project_vpcconfig.go        |     47 +
 .../aws-codebuild-project_webhookfilter.go    |     47 +
 .../codebuild/aws-codebuild-reportgroup.go    |    129 +
 ...odebuild-reportgroup_reportexportconfig.go |     42 +
 ...ebuild-reportgroup_s3reportexportconfig.go |     62 +
 .../aws-codebuild-sourcecredential.go         |    123 +
 .../codecommit/aws-codecommit-repository.go   |    129 +
 .../aws-codecommit-repository_code.go         |     42 +
 ...codecommit-repository_repositorytrigger.go |     57 +
 .../aws-codecommit-repository_s3.go           |     47 +
 .../codedeploy/aws-codedeploy-application.go  |    119 +
 .../aws-codedeploy-deploymentconfig.go        |    123 +
 ...oy-deploymentconfig_minimumhealthyhosts.go |     42 +
 ...deploy-deploymentconfig_timebasedcanary.go |     42 +
 ...deploy-deploymentconfig_timebasedlinear.go |     42 +
 ...y-deploymentconfig_trafficroutingconfig.go |     47 +
 .../aws-codedeploy-deploymentgroup.go         |    188 +
 .../aws-codedeploy-deploymentgroup_alarm.go   |     37 +
 ...ploy-deploymentgroup_alarmconfiguration.go |     47 +
 ...ploymentgroup_autorollbackconfiguration.go |     42 +
 ...tgroup_bluegreendeploymentconfiguration.go |     45 +
 ...mentgroup_blueinstanceterminationoption.go |     42 +
 ...s-codedeploy-deploymentgroup_deployment.go |     47 +
 ...y-deploymentgroup_deploymentreadyoption.go |     42 +
 ...edeploy-deploymentgroup_deploymentstyle.go |     42 +
 ...codedeploy-deploymentgroup_ec2tagfilter.go |     47 +
 ...ws-codedeploy-deploymentgroup_ec2tagset.go |     35 +
 ...loy-deploymentgroup_ec2tagsetlistobject.go |     35 +
 ...s-codedeploy-deploymentgroup_ecsservice.go |     42 +
 .../aws-codedeploy-deploymentgroup_elbinfo.go |     37 +
 ...dedeploy-deploymentgroup_githublocation.go |     42 +
 ...ymentgroup_greenfleetprovisioningoption.go |     37 +
 ...deploy-deploymentgroup_loadbalancerinfo.go |     40 +
 ...deploy-deploymentgroup_onpremisestagset.go |     35 +
 ...loymentgroup_onpremisestagsetlistobject.go |     35 +
 ...deploy-deploymentgroup_revisionlocation.go |     47 +
 ...s-codedeploy-deploymentgroup_s3location.go |     57 +
 ...ws-codedeploy-deploymentgroup_tagfilter.go |     47 +
 ...edeploy-deploymentgroup_targetgroupinfo.go |     37 +
 ...odedeploy-deploymentgroup_triggerconfig.go |     47 +
 .../aws-codeguruprofiler-profilinggroup.go    |    129 +
 ...codeguruprofiler-profilinggroup_channel.go |     42 +
 ...-codegurureviewer-repositoryassociation.go |    134 +
 .../aws-codepipeline-customactiontype.go      |    144 +
 ...peline-customactiontype_artifactdetails.go |     42 +
 ...ustomactiontype_configurationproperties.go |     67 +
 ...-codepipeline-customactiontype_settings.go |     52 +
 .../codepipeline/aws-codepipeline-pipeline.go |    144 +
 ...codepipeline-pipeline_actiondeclaration.go |     77 +
 .../aws-codepipeline-pipeline_actiontypeid.go |     52 +
 ...aws-codepipeline-pipeline_artifactstore.go |     47 +
 ...-codepipeline-pipeline_artifactstoremap.go |     42 +
 ...odepipeline-pipeline_blockerdeclaration.go |     42 +
 ...aws-codepipeline-pipeline_encryptionkey.go |     42 +
 ...aws-codepipeline-pipeline_inputartifact.go |     37 +
 ...ws-codepipeline-pipeline_outputartifact.go |     37 +
 ...-codepipeline-pipeline_stagedeclaration.go |     47 +
 ...s-codepipeline-pipeline_stagetransition.go |     42 +
 .../codepipeline/aws-codepipeline-webhook.go  |    143 +
 ...peline-webhook_webhookauthconfiguration.go |     42 +
 ...-codepipeline-webhook_webhookfilterrule.go |     42 +
 .../codestar/aws-codestar-githubrepository.go |    143 +
 .../aws-codestar-githubrepository_code.go     |     35 +
 .../aws-codestar-githubrepository_s3.go       |     47 +
 .../aws-codestarconnections-connection.go     |    124 +
 ...-codestarnotifications-notificationrule.go |    153 +
 ...arnotifications-notificationrule_target.go |     42 +
 .../cognito/aws-cognito-identitypool.go       |    158 +
 ...to-identitypool_cognitoidentityprovider.go |     47 +
 ...aws-cognito-identitypool_cognitostreams.go |     47 +
 .../aws-cognito-identitypool_pushsync.go      |     42 +
 .../aws-cognito-identitypoolroleattachment.go |    118 +
 ...-identitypoolroleattachment_mappingrule.go |     52 +
 ...-identitypoolroleattachment_rolemapping.go |     52 +
 ...olroleattachment_rulesconfigurationtype.go |     35 +
 .../cognito/aws-cognito-userpool.go           |    213 +
 ...cognito-userpool_accountrecoverysetting.go |     35 +
 ...-cognito-userpool_admincreateuserconfig.go |     47 +
 .../aws-cognito-userpool_customemailsender.go |     42 +
 .../aws-cognito-userpool_customsmssender.go   |     42 +
 ...ws-cognito-userpool_deviceconfiguration.go |     42 +
 ...aws-cognito-userpool_emailconfiguration.go |     57 +
 ...-cognito-userpool_invitemessagetemplate.go |     47 +
 .../aws-cognito-userpool_lambdaconfig.go      |     97 +
 ...ito-userpool_numberattributeconstraints.go |     42 +
 .../aws-cognito-userpool_passwordpolicy.go    |     62 +
 .../cognito/aws-cognito-userpool_policies.go  |     35 +
 .../aws-cognito-userpool_recoveryoption.go    |     42 +
 .../aws-cognito-userpool_schemaattribute.go   |     67 +
 .../aws-cognito-userpool_smsconfiguration.go  |     42 +
 ...ito-userpool_stringattributeconstraints.go |     42 +
 ...-cognito-userpool_usernameconfiguration.go |     37 +
 .../aws-cognito-userpool_userpooladdons.go    |     37 +
 ...to-userpool_verificationmessagetemplate.go |     62 +
 .../cognito/aws-cognito-userpoolclient.go     |    203 +
 ...o-userpoolclient_analyticsconfiguration.go |     57 +
 ...gnito-userpoolclient_tokenvalidityunits.go |     47 +
 .../cognito/aws-cognito-userpooldomain.go     |    118 +
 ...o-userpooldomain_customdomainconfigtype.go |     37 +
 .../cognito/aws-cognito-userpoolgroup.go      |    128 +
 .../aws-cognito-userpoolidentityprovider.go   |    133 +
 .../aws-cognito-userpoolresourceserver.go     |    123 +
 ...lresourceserver_resourceserverscopetype.go |     42 +
 ...ito-userpoolriskconfigurationattachment.go |    128 +
 ...onattachment_accounttakeoveractionstype.go |     45 +
 ...ionattachment_accounttakeoveractiontype.go |     42 +
 ...nt_accounttakeoverriskconfigurationtype.go |     40 +
 ...hment_compromisedcredentialsactionstype.go |     37 +
 ...romisedcredentialsriskconfigurationtype.go |     42 +
 ...ationattachment_notifyconfigurationtype.go |     62 +
 ...configurationattachment_notifyemailtype.go |     47 +
 ...tachment_riskexceptionconfigurationtype.go |     42 +
 ...gnito-userpooluicustomizationattachment.go |    118 +
 .../cognito/aws-cognito-userpooluser.go       |    143 +
 .../aws-cognito-userpooluser_attributetype.go |     42 +
 ...s-cognito-userpoolusertogroupattachment.go |    118 +
 .../aws-config-aggregationauthorization.go    |    119 +
 .../config/aws-config-configrule.go           |    133 +
 .../config/aws-config-configrule_scope.go     |     52 +
 .../config/aws-config-configrule_source.go    |     47 +
 .../aws-config-configrule_sourcedetail.go     |     47 +
 .../aws-config-configurationaggregator.go     |    124 +
 ...tionaggregator_accountaggregationsource.go |     47 +
 ...ggregator_organizationaggregationsource.go |     47 +
 .../aws-config-configurationrecorder.go       |    118 +
 ...ig-configurationrecorder_recordinggroup.go |     47 +
 .../config/aws-config-conformancepack.go      |    133 +
 ...mancepack_conformancepackinputparameter.go |     42 +
 .../config/aws-config-deliverychannel.go      |    133 +
 ...hannel_configsnapshotdeliveryproperties.go |     37 +
 .../aws-config-organizationconfigrule.go      |    123 +
 ...nfigrule_organizationcustomrulemetadata.go |     77 +
 ...figrule_organizationmanagedrulemetadata.go |     72 +
 .../aws-config-organizationconformancepack.go |    138 +
 ...mancepack_conformancepackinputparameter.go |     42 +
 .../aws-config-remediationconfiguration.go    |    153 +
 ...ediationconfiguration_executioncontrols.go |     35 +
 ...configuration_remediationparametervalue.go |     40 +
 ...-remediationconfiguration_resourcevalue.go |     37 +
 ...ig-remediationconfiguration_ssmcontrols.go |     42 +
 ...ig-remediationconfiguration_staticvalue.go |     37 +
 .../config/aws-config-storedquery.go          |    124 +
 .../connect/aws-connect-contactflow.go        |    139 +
 .../connect/aws-connect-contactflowmodule.go  |    134 +
 .../connect/aws-connect-hoursofoperation.go   |    134 +
 ...hoursofoperation_hoursofoperationconfig.go |     47 +
 ...rsofoperation_hoursofoperationtimeslice.go |     42 +
 .../connect/aws-connect-quickconnect.go       |    129 +
 ...ckconnect_phonenumberquickconnectconfig.go |     37 +
 ...ct-quickconnect_queuequickconnectconfig.go |     42 +
 ...connect-quickconnect_quickconnectconfig.go |     52 +
 ...ect-quickconnect_userquickconnectconfig.go |     42 +
 .../connect/aws-connect-user.go               |    154 +
 .../aws-connect-user_useridentityinfo.go      |     47 +
 .../aws-connect-user_userphoneconfig.go       |     52 +
 .../connect/aws-connect-userhierarchygroup.go |    118 +
 .../cur/aws-cur-reportdefinition.go           |    163 +
 goformation/cloudformation/custom_resource.go |     87 +
 .../aws-customerprofiles-domain.go            |    129 +
 .../aws-customerprofiles-integration.go       |    129 +
 ...rprofiles-integration_connectoroperator.go |     57 +
 ...omerprofiles-integration_flowdefinition.go |     62 +
 ...files-integration_incrementalpullconfig.go |     37 +
 ...les-integration_marketosourceproperties.go |     37 +
 ...profiles-integration_s3sourceproperties.go |     42 +
 ...-integration_salesforcesourceproperties.go |     47 +
 ...-integration_scheduledtriggerproperties.go |     67 +
 ...-integration_servicenowsourceproperties.go |     37 +
 ...s-integration_sourceconnectorproperties.go |     55 +
 ...erprofiles-integration_sourceflowconfig.go |     52 +
 .../aws-customerprofiles-integration_task.go  |     57 +
 ...rprofiles-integration_taskpropertiesmap.go |     42 +
 ...tomerprofiles-integration_triggerconfig.go |     42 +
 ...rprofiles-integration_triggerproperties.go |     35 +
 ...les-integration_zendesksourceproperties.go |     37 +
 .../aws-customerprofiles-objecttype.go        |    154 +
 ...ws-customerprofiles-objecttype_fieldmap.go |     42 +
 .../aws-customerprofiles-objecttype_keymap.go |     42 +
 ...omerprofiles-objecttype_objecttypefield.go |     47 +
 ...stomerprofiles-objecttype_objecttypekey.go |     42 +
 .../databrew/aws-databrew-dataset.go          |    134 +
 .../aws-databrew-dataset_csvoptions.go        |     42 +
 ...atabrew-dataset_databaseinputdefinition.go |     52 +
 ...brew-dataset_datacataloginputdefinition.go |     52 +
 .../aws-databrew-dataset_datasetparameter.go  |     57 +
 .../aws-databrew-dataset_datetimeoptions.go   |     47 +
 .../aws-databrew-dataset_exceloptions.go      |     47 +
 .../aws-databrew-dataset_fileslimit.go        |     47 +
 .../aws-databrew-dataset_filterexpression.go  |     42 +
 .../aws-databrew-dataset_filtervalue.go       |     42 +
 .../aws-databrew-dataset_formatoptions.go     |     45 +
 .../databrew/aws-databrew-dataset_input.go    |     50 +
 .../aws-databrew-dataset_jsonoptions.go       |     37 +
 .../databrew/aws-databrew-dataset_metadata.go |     37 +
 .../aws-databrew-dataset_pathoptions.go       |     45 +
 .../aws-databrew-dataset_pathparameter.go     |     42 +
 .../aws-databrew-dataset_s3location.go        |     42 +
 .../databrew/aws-databrew-job.go              |    204 +
 .../aws-databrew-job_allowedstatistics.go     |     37 +
 .../aws-databrew-job_columnselector.go        |     42 +
 ...abrew-job_columnstatisticsconfiguration.go |     40 +
 .../aws-databrew-job_csvoutputoptions.go      |     37 +
 .../aws-databrew-job_databaseoutput.go        |     47 +
 ...databrew-job_databasetableoutputoptions.go |     42 +
 .../aws-databrew-job_datacatalogoutput.go     |     62 +
 ...atabrew-job_entitydetectorconfiguration.go |     42 +
 .../databrew/aws-databrew-job_jobsample.go    |     42 +
 .../databrew/aws-databrew-job_output.go       |     62 +
 .../aws-databrew-job_outputformatoptions.go   |     35 +
 .../aws-databrew-job_outputlocation.go        |     42 +
 .../databrew/aws-databrew-job_parametermap.go |     30 +
 .../aws-databrew-job_profileconfiguration.go  |     50 +
 .../databrew/aws-databrew-job_recipe.go       |     42 +
 .../databrew/aws-databrew-job_s3location.go   |     42 +
 .../aws-databrew-job_s3tableoutputoptions.go  |     35 +
 .../aws-databrew-job_statisticoverride.go     |     42 +
 ...ws-databrew-job_statisticsconfiguration.go |     42 +
 ...ws-databrew-job_validationconfiguration.go |     42 +
 .../databrew/aws-databrew-project.go          |    134 +
 .../databrew/aws-databrew-project_sample.go   |     42 +
 .../databrew/aws-databrew-recipe.go           |    124 +
 .../databrew/aws-databrew-recipe_action.go    |     42 +
 ...aws-databrew-recipe_conditionexpression.go |     47 +
 ...abrew-recipe_datacataloginputdefinition.go |     52 +
 .../aws-databrew-recipe_parametermap.go       |     30 +
 .../aws-databrew-recipe_recipeparameters.go   |    537 +
 .../aws-databrew-recipe_recipestep.go         |     40 +
 .../aws-databrew-recipe_s3location.go         |     42 +
 .../aws-databrew-recipe_secondaryinput.go     |     40 +
 .../databrew/aws-databrew-ruleset.go          |    129 +
 .../aws-databrew-ruleset_columnselector.go    |     42 +
 .../databrew/aws-databrew-ruleset_rule.go     |     62 +
 .../aws-databrew-ruleset_substitutionvalue.go |     42 +
 .../aws-databrew-ruleset_threshold.go         |     47 +
 .../databrew/aws-databrew-schedule.go         |    124 +
 .../datapipeline/aws-datapipeline-pipeline.go |    138 +
 .../aws-datapipeline-pipeline_field.go        |     47 +
 ...atapipeline-pipeline_parameterattribute.go |     42 +
 ...s-datapipeline-pipeline_parameterobject.go |     42 +
 ...ws-datapipeline-pipeline_parametervalue.go |     42 +
 ...ws-datapipeline-pipeline_pipelineobject.go |     47 +
 .../aws-datapipeline-pipeline_pipelinetag.go  |     42 +
 .../datasync/aws-datasync-agent.go            |    134 +
 .../datasync/aws-datasync-locationefs.go      |    124 +
 .../aws-datasync-locationefs_ec2config.go     |     42 +
 .../aws-datasync-locationfsxwindows.go        |    139 +
 .../datasync/aws-datasync-locationhdfs.go     |    169 +
 .../aws-datasync-locationhdfs_namenode.go     |     42 +
 ...-datasync-locationhdfs_qopconfiguration.go |     42 +
 .../datasync/aws-datasync-locationnfs.go      |    129 +
 .../aws-datasync-locationnfs_mountoptions.go  |     37 +
 .../aws-datasync-locationnfs_onpremconfig.go  |     37 +
 .../aws-datasync-locationobjectstorage.go     |    149 +
 .../datasync/aws-datasync-locations3.go       |    129 +
 .../aws-datasync-locations3_s3config.go       |     37 +
 .../datasync/aws-datasync-locationsmb.go      |    144 +
 .../aws-datasync-locationsmb_mountoptions.go  |     37 +
 .../datasync/aws-datasync-task.go             |    149 +
 .../datasync/aws-datasync-task_filterrule.go  |     42 +
 .../datasync/aws-datasync-task_options.go     |    102 +
 .../aws-datasync-task_taskschedule.go         |     37 +
 .../cloudformation/dax/aws-dax-cluster.go     |    173 +
 .../dax/aws-dax-cluster_ssespecification.go   |     37 +
 .../dax/aws-dax-parametergroup.go             |    118 +
 .../cloudformation/dax/aws-dax-subnetgroup.go |    118 +
 .../detective/aws-detective-graph.go          |    107 +
 .../aws-detective-memberinvitation.go         |    128 +
 .../aws-devopsguru-notificationchannel.go     |    106 +
 ...cationchannel_notificationchannelconfig.go |     35 +
 ...ru-notificationchannel_snschannelconfig.go |     37 +
 .../aws-devopsguru-resourcecollection.go      |    106 +
 ...llection_cloudformationcollectionfilter.go |     37 +
 ...urcecollection_resourcecollectionfilter.go |     35 +
 .../aws-directoryservice-microsoftad.go       |    138 +
 ...irectoryservice-microsoftad_vpcsettings.go |     42 +
 .../aws-directoryservice-simplead.go          |    143 +
 ...s-directoryservice-simplead_vpcsettings.go |     42 +
 .../dlm/aws-dlm-lifecyclepolicy.go            |    129 +
 .../dlm/aws-dlm-lifecyclepolicy_action.go     |     42 +
 .../dlm/aws-dlm-lifecyclepolicy_createrule.go |     57 +
 ...m-lifecyclepolicy_crossregioncopyaction.go |     47 +
 ...yclepolicy_crossregioncopydeprecaterule.go |     42 +
 ...fecyclepolicy_crossregioncopyretainrule.go |     42 +
 ...dlm-lifecyclepolicy_crossregioncopyrule.go |     67 +
 .../aws-dlm-lifecyclepolicy_deprecaterule.go  |     47 +
 ...lifecyclepolicy_encryptionconfiguration.go |     42 +
 ...aws-dlm-lifecyclepolicy_eventparameters.go |     47 +
 .../aws-dlm-lifecyclepolicy_eventsource.go    |     42 +
 ...aws-dlm-lifecyclepolicy_fastrestorerule.go |     52 +
 .../dlm/aws-dlm-lifecyclepolicy_parameters.go |     42 +
 .../aws-dlm-lifecyclepolicy_policydetails.go  |     73 +
 .../dlm/aws-dlm-lifecyclepolicy_retainrule.go |     47 +
 .../dlm/aws-dlm-lifecyclepolicy_schedule.go   |     83 +
 .../dlm/aws-dlm-lifecyclepolicy_sharerule.go  |     47 +
 .../cloudformation/dms/aws-dms-certificate.go |    118 +
 .../cloudformation/dms/aws-dms-endpoint.go    |    254 +
 .../dms/aws-dms-endpoint_docdbsettings.go     |     42 +
 .../dms/aws-dms-endpoint_dynamodbsettings.go  |     37 +
 .../aws-dms-endpoint_elasticsearchsettings.go |     52 +
 .../dms/aws-dms-endpoint_ibmdb2settings.go    |     42 +
 .../dms/aws-dms-endpoint_kafkasettings.go     |    107 +
 .../dms/aws-dms-endpoint_kinesissettings.go   |     77 +
 ...dms-endpoint_microsoftsqlserversettings.go |     42 +
 .../dms/aws-dms-endpoint_mongodbsettings.go   |     97 +
 .../dms/aws-dms-endpoint_mysqlsettings.go     |     42 +
 .../dms/aws-dms-endpoint_neptunesettings.go   |     67 +
 .../dms/aws-dms-endpoint_oraclesettings.go    |     52 +
 .../aws-dms-endpoint_postgresqlsettings.go    |     42 +
 .../dms/aws-dms-endpoint_redissettings.go     |     67 +
 .../dms/aws-dms-endpoint_redshiftsettings.go  |     42 +
 .../dms/aws-dms-endpoint_s3settings.go        |     67 +
 .../dms/aws-dms-endpoint_sybasesettings.go    |     42 +
 .../dms/aws-dms-eventsubscription.go          |    139 +
 .../dms/aws-dms-replicationinstance.go        |    179 +
 .../dms/aws-dms-replicationsubnetgroup.go     |    124 +
 .../dms/aws-dms-replicationtask.go            |    169 +
 .../docdb/aws-docdb-dbcluster.go              |    194 +
 .../aws-docdb-dbclusterparametergroup.go      |    129 +
 .../docdb/aws-docdb-dbinstance.go             |    139 +
 .../docdb/aws-docdb-dbsubnetgroup.go          |    124 +
 .../dynamodb/aws-dynamodb-globaltable.go      |    158 +
 ...ynamodb-globaltable_attributedefinition.go |     42 +
 ...globaltable_capacityautoscalingsettings.go |     52 +
 ...ltable_contributorinsightsspecification.go |     37 +
 ...namodb-globaltable_globalsecondaryindex.go |     52 +
 .../aws-dynamodb-globaltable_keyschema.go     |     42 +
 ...ynamodb-globaltable_localsecondaryindex.go |     47 +
 ...ltable_pointintimerecoveryspecification.go |     37 +
 .../aws-dynamodb-globaltable_projection.go    |     42 +
 ...table_readprovisionedthroughputsettings.go |     42 +
 ...eplicaglobalsecondaryindexspecification.go |     47 +
 ...namodb-globaltable_replicaspecification.go |     68 +
 ...odb-globaltable_replicassespecification.go |     37 +
 ...s-dynamodb-globaltable_ssespecification.go |     42 +
 ...ynamodb-globaltable_streamspecification.go |     37 +
 ...argettrackingscalingpolicyconfiguration.go |     52 +
 ...odb-globaltable_timetolivespecification.go |     42 +
 ...able_writeprovisionedthroughputsettings.go |     35 +
 .../dynamodb/aws-dynamodb-table.go            |    179 +
 .../aws-dynamodb-table_attributedefinition.go |     42 +
 ...-table_contributorinsightsspecification.go |     37 +
 ...aws-dynamodb-table_globalsecondaryindex.go |     57 +
 .../dynamodb/aws-dynamodb-table_keyschema.go  |     42 +
 ...namodb-table_kinesisstreamspecification.go |     37 +
 .../aws-dynamodb-table_localsecondaryindex.go |     47 +
 ...-table_pointintimerecoveryspecification.go |     37 +
 .../dynamodb/aws-dynamodb-table_projection.go |     42 +
 ...ws-dynamodb-table_provisionedthroughput.go |     42 +
 .../aws-dynamodb-table_ssespecification.go    |     47 +
 .../aws-dynamodb-table_streamspecification.go |     37 +
 ...-dynamodb-table_timetolivespecification.go |     42 +
 .../ec2/aws-ec2-capacityreservation.go        |    168 +
 ...c2-capacityreservation_tagspecification.go |     43 +
 .../ec2/aws-ec2-capacityreservationfleet.go   |    148 +
 ...ervationfleet_instancetypespecification.go |     67 +
 ...pacityreservationfleet_tagspecification.go |     43 +
 .../ec2/aws-ec2-carriergateway.go             |    114 +
 .../ec2/aws-ec2-carriergateway_tags.go        |     36 +
 .../ec2/aws-ec2-clientvpnauthorizationrule.go |    128 +
 .../ec2/aws-ec2-clientvpnendpoint.go          |    173 +
 ...dpoint_certificateauthenticationrequest.go |     37 +
 ...vpnendpoint_clientauthenticationrequest.go |     52 +
 ...-clientvpnendpoint_clientconnectoptions.go |     42 +
 ...-clientvpnendpoint_connectionlogoptions.go |     47 +
 ...t_directoryserviceauthenticationrequest.go |     37 +
 ...endpoint_federatedauthenticationrequest.go |     42 +
 ...-ec2-clientvpnendpoint_tagspecification.go |     43 +
 .../ec2/aws-ec2-clientvpnroute.go             |    123 +
 ...s-ec2-clientvpntargetnetworkassociation.go |    113 +
 .../ec2/aws-ec2-customergateway.go            |    124 +
 .../cloudformation/ec2/aws-ec2-dhcpoptions.go |    134 +
 .../cloudformation/ec2/aws-ec2-ec2fleet.go    |    163 +
 ...ws-ec2-ec2fleet_acceleratorcountrequest.go |     42 +
 ...2fleet_acceleratortotalmemorymibrequest.go |     42 +
 ...c2fleet_baselineebsbandwidthmbpsrequest.go |     42 +
 .../ec2/aws-ec2-ec2fleet_capacityrebalance.go |     42 +
 ...fleet_capacityreservationoptionsrequest.go |     37 +
 ...2fleet_fleetlaunchtemplateconfigrequest.go |     40 +
 ...eet_fleetlaunchtemplateoverridesrequest.go |     72 +
 ...fleetlaunchtemplatespecificationrequest.go |     47 +
 ...c2-ec2fleet_instancerequirementsrequest.go |    137 +
 .../aws-ec2-ec2fleet_maintenancestrategies.go |     35 +
 ...ws-ec2-ec2fleet_memorygibpervcpurequest.go |     42 +
 .../ec2/aws-ec2-ec2fleet_memorymibrequest.go  |     42 +
 ...2-ec2fleet_networkinterfacecountrequest.go |     42 +
 ...aws-ec2-ec2fleet_ondemandoptionsrequest.go |     62 +
 .../ec2/aws-ec2-ec2fleet_placement.go         |     72 +
 .../aws-ec2-ec2fleet_spotoptionsrequest.go    |     72 +
 .../ec2/aws-ec2-ec2fleet_tagspecification.go  |     43 +
 ...leet_targetcapacityspecificationrequest.go |     57 +
 ...ec2-ec2fleet_totallocalstoragegbrequest.go |     42 +
 .../aws-ec2-ec2fleet_vcpucountrangerequest.go |     42 +
 .../ec2/aws-ec2-egressonlyinternetgateway.go  |    108 +
 goformation/cloudformation/ec2/aws-ec2-eip.go |    124 +
 .../ec2/aws-ec2-eipassociation.go             |    128 +
 ...c2-enclavecertificateiamroleassociation.go |    113 +
 .../cloudformation/ec2/aws-ec2-flowlog.go     |    154 +
 .../aws-ec2-gatewayroutetableassociation.go   |    113 +
 .../cloudformation/ec2/aws-ec2-host.go        |    123 +
 .../cloudformation/ec2/aws-ec2-instance.go    |    312 +
 .../aws-ec2-instance_associationparameter.go  |     42 +
 .../aws-ec2-instance_blockdevicemapping.go    |     52 +
 .../ec2/aws-ec2-instance_cpuoptions.go        |     42 +
 .../aws-ec2-instance_creditspecification.go   |     37 +
 .../ec2/aws-ec2-instance_ebs.go               |     67 +
 ...ws-ec2-instance_elasticgpuspecification.go |     37 +
 ...c2-instance_elasticinferenceaccelerator.go |     42 +
 .../ec2/aws-ec2-instance_enclaveoptions.go    |     37 +
 .../aws-ec2-instance_hibernationoptions.go    |     37 +
 .../aws-ec2-instance_instanceipv6address.go   |     37 +
 ...c2-instance_launchtemplatespecification.go |     47 +
 .../aws-ec2-instance_licensespecification.go  |     37 +
 .../ec2/aws-ec2-instance_networkinterface.go  |     92 +
 .../ec2/aws-ec2-instance_nodevice.go          |     30 +
 ...-instance_privateipaddressspecification.go |     42 +
 .../ec2/aws-ec2-instance_ssmassociation.go    |     42 +
 .../ec2/aws-ec2-instance_volume.go            |     42 +
 .../ec2/aws-ec2-internetgateway.go            |    107 +
 .../cloudformation/ec2/aws-ec2-ipam.go        |    119 +
 .../ec2/aws-ec2-ipam_ipamoperatingregion.go   |     37 +
 .../ec2/aws-ec2-ipamallocation.go             |    123 +
 .../cloudformation/ec2/aws-ec2-ipampool.go    |    169 +
 .../ec2/aws-ec2-ipampool_provisionedcidr.go   |     37 +
 .../cloudformation/ec2/aws-ec2-ipamscope.go   |    124 +
 .../ec2/aws-ec2-launchtemplate.go             |    118 +
 ...aws-ec2-launchtemplate_acceleratorcount.go |     42 +
 ...aunchtemplate_acceleratortotalmemorymib.go |     42 +
 ...launchtemplate_baselineebsbandwidthmbps.go |     42 +
 ...s-ec2-launchtemplate_blockdevicemapping.go |     52 +
 ...mplate_capacityreservationspecification.go |     42 +
 ...aunchtemplate_capacityreservationtarget.go |     42 +
 .../ec2/aws-ec2-launchtemplate_cpuoptions.go  |     42 +
 ...-ec2-launchtemplate_creditspecification.go |     37 +
 .../ec2/aws-ec2-launchtemplate_ebs.go         |     72 +
 ...-launchtemplate_elasticgpuspecification.go |     37 +
 .../aws-ec2-launchtemplate_enclaveoptions.go  |     37 +
 ...s-ec2-launchtemplate_hibernationoptions.go |     37 +
 ...s-ec2-launchtemplate_iaminstanceprofile.go |     42 +
 ...c2-launchtemplate_instancemarketoptions.go |     42 +
 .../ec2/aws-ec2-launchtemplate_ipv6add.go     |     37 +
 ...s-ec2-launchtemplate_launchtemplatedata.go |    167 +
 ...unchtemplateelasticinferenceaccelerator.go |     42 +
 ...template_launchtemplatetagspecification.go |     43 +
 ...ec2-launchtemplate_licensespecification.go |     37 +
 ...aws-ec2-launchtemplate_memorygibpervcpu.go |     42 +
 .../ec2/aws-ec2-launchtemplate_memorymib.go   |     42 +
 .../aws-ec2-launchtemplate_metadataoptions.go |     52 +
 .../ec2/aws-ec2-launchtemplate_monitoring.go  |     37 +
 ...aws-ec2-launchtemplate_networkinterface.go |    107 +
 ...c2-launchtemplate_networkinterfacecount.go |     42 +
 .../ec2/aws-ec2-launchtemplate_placement.go   |     72 +
 .../aws-ec2-launchtemplate_privateipadd.go    |     42 +
 .../ec2/aws-ec2-launchtemplate_spotoptions.go |     57 +
 ...aws-ec2-launchtemplate_tagspecification.go |     43 +
 ...-ec2-launchtemplate_totallocalstoragegb.go |     42 +
 .../ec2/aws-ec2-launchtemplate_vcpucount.go   |     42 +
 .../ec2/aws-ec2-localgatewayroute.go          |    118 +
 ...c2-localgatewayroutetablevpcassociation.go |    119 +
 ...calgatewayroutetablevpcassociation_tags.go |     36 +
 .../cloudformation/ec2/aws-ec2-natgateway.go  |    124 +
 .../cloudformation/ec2/aws-ec2-networkacl.go  |    114 +
 .../ec2/aws-ec2-networkaclentry.go            |    148 +
 .../ec2/aws-ec2-networkaclentry_icmp.go       |     42 +
 .../ec2/aws-ec2-networkaclentry_portrange.go  |     42 +
 .../ec2/aws-ec2-networkinsightsanalysis.go    |    119 +
 ...tworkinsightsanalysis_alternatepathhint.go |     42 +
 ...networkinsightsanalysis_analysisaclrule.go |     62 +
 ...tworkinsightsanalysis_analysiscomponent.go |     42 +
 ...tsanalysis_analysisloadbalancerlistener.go |     42 +
 ...ghtsanalysis_analysisloadbalancertarget.go |     52 +
 ...rkinsightsanalysis_analysispacketheader.go |     57 +
 ...nsightsanalysis_analysisroutetableroute.go |     82 +
 ...ightsanalysis_analysissecuritygrouprule.go |     62 +
 ...ec2-networkinsightsanalysis_explanation.go |    257 +
 ...2-networkinsightsanalysis_pathcomponent.go |     87 +
 ...s-ec2-networkinsightsanalysis_portrange.go |     42 +
 .../ec2/aws-ec2-networkinsightspath.go        |    139 +
 .../ec2/aws-ec2-networkinterface.go           |    159 +
 ...c2-networkinterface_instanceipv6address.go |     37 +
 ...interface_privateipaddressspecification.go |     42 +
 .../ec2/aws-ec2-networkinterfaceattachment.go |    123 +
 .../ec2/aws-ec2-networkinterfacepermission.go |    118 +
 .../ec2/aws-ec2-placementgroup.go             |    108 +
 .../cloudformation/ec2/aws-ec2-prefixlist.go  |    129 +
 .../ec2/aws-ec2-prefixlist_entry.go           |     42 +
 .../cloudformation/ec2/aws-ec2-route.go       |    168 +
 .../cloudformation/ec2/aws-ec2-routetable.go  |    114 +
 .../ec2/aws-ec2-securitygroup.go              |    134 +
 .../ec2/aws-ec2-securitygroup_egress.go       |     72 +
 .../ec2/aws-ec2-securitygroup_ingress.go      |     82 +
 .../ec2/aws-ec2-securitygroupegress.go        |    148 +
 .../ec2/aws-ec2-securitygroupingress.go       |    163 +
 .../cloudformation/ec2/aws-ec2-spotfleet.go   |    106 +
 ...s-ec2-spotfleet_acceleratorcountrequest.go |     42 +
 ...tfleet_acceleratortotalmemorymibrequest.go |     42 +
 ...otfleet_baselineebsbandwidthmbpsrequest.go |     42 +
 .../aws-ec2-spotfleet_blockdevicemapping.go   |     52 +
 .../aws-ec2-spotfleet_classicloadbalancer.go  |     37 +
 ...c2-spotfleet_classicloadbalancersconfig.go |     35 +
 .../ec2/aws-ec2-spotfleet_ebsblockdevice.go   |     62 +
 ...tfleet_fleetlaunchtemplatespecification.go |     47 +
 .../ec2/aws-ec2-spotfleet_groupidentifier.go  |     37 +
 ...otfleet_iaminstanceprofilespecification.go |     37 +
 .../aws-ec2-spotfleet_instanceipv6address.go  |     37 +
 ...t_instancenetworkinterfacespecification.go |     87 +
 ...2-spotfleet_instancerequirementsrequest.go |    137 +
 .../aws-ec2-spotfleet_launchtemplateconfig.go |     40 +
 ...s-ec2-spotfleet_launchtemplateoverrides.go |     62 +
 .../aws-ec2-spotfleet_loadbalancersconfig.go  |     40 +
 ...s-ec2-spotfleet_memorygibpervcpurequest.go |     42 +
 .../ec2/aws-ec2-spotfleet_memorymibrequest.go |     42 +
 ...-spotfleet_networkinterfacecountrequest.go |     42 +
 ...spotfleet_privateipaddressspecification.go |     42 +
 ...aws-ec2-spotfleet_spotcapacityrebalance.go |     42 +
 ...-spotfleet_spotfleetlaunchspecification.go |    122 +
 .../aws-ec2-spotfleet_spotfleetmonitoring.go  |     37 +
 ...c2-spotfleet_spotfleetrequestconfigdata.go |    142 +
 ...ec2-spotfleet_spotfleettagspecification.go |     43 +
 ...ec2-spotfleet_spotmaintenancestrategies.go |     35 +
 .../ec2/aws-ec2-spotfleet_spotplacement.go    |     47 +
 .../ec2/aws-ec2-spotfleet_targetgroup.go      |     37 +
 .../aws-ec2-spotfleet_targetgroupsconfig.go   |     35 +
 ...c2-spotfleet_totallocalstoragegbrequest.go |     42 +
 ...aws-ec2-spotfleet_vcpucountrangerequest.go |     42 +
 .../cloudformation/ec2/aws-ec2-subnet.go      |    164 +
 ...c2-subnet_privatednsnameoptionsonlaunch.go |     47 +
 .../ec2/aws-ec2-subnetcidrblock.go            |    113 +
 .../aws-ec2-subnetnetworkaclassociation.go    |    113 +
 .../aws-ec2-subnetroutetableassociation.go    |    113 +
 .../ec2/aws-ec2-trafficmirrorfilter.go        |    119 +
 .../ec2/aws-ec2-trafficmirrorfilterrule.go    |    153 +
 ...mirrorfilterrule_trafficmirrorportrange.go |     42 +
 .../ec2/aws-ec2-trafficmirrorsession.go       |    144 +
 .../ec2/aws-ec2-trafficmirrortarget.go        |    124 +
 .../ec2/aws-ec2-transitgateway.go             |    164 +
 .../ec2/aws-ec2-transitgatewayattachment.go   |    124 +
 .../ec2/aws-ec2-transitgatewayconnect.go      |    119 +
 ...wayconnect_transitgatewayconnectoptions.go |     37 +
 .../aws-ec2-transitgatewaymulticastdomain.go  |    119 +
 ...ransitgatewaymulticastdomainassociation.go |    118 +
 ...-ec2-transitgatewaymulticastgroupmember.go |    118 +
 ...-ec2-transitgatewaymulticastgroupsource.go |    118 +
 ...aws-ec2-transitgatewaypeeringattachment.go |    134 +
 ..._transitgatewaypeeringattachmentoptions.go |     37 +
 .../ec2/aws-ec2-transitgatewayroute.go        |    123 +
 .../ec2/aws-ec2-transitgatewayroutetable.go   |    114 +
 ...ec2-transitgatewayroutetableassociation.go |    113 +
 ...ec2-transitgatewayroutetablepropagation.go |    113 +
 .../aws-ec2-transitgatewayvpcattachment.go    |    139 +
 .../cloudformation/ec2/aws-ec2-volume.go      |    164 +
 .../ec2/aws-ec2-volumeattachment.go           |    118 +
 goformation/cloudformation/ec2/aws-ec2-vpc.go |    129 +
 .../ec2/aws-ec2-vpccidrblock.go               |    128 +
 .../ec2/aws-ec2-vpcdhcpoptionsassociation.go  |    113 +
 .../cloudformation/ec2/aws-ec2-vpcendpoint.go |    143 +
 ...s-ec2-vpcendpointconnectionnotification.go |    123 +
 .../ec2/aws-ec2-vpcendpointservice.go         |    118 +
 .../aws-ec2-vpcendpointservicepermissions.go  |    113 +
 .../ec2/aws-ec2-vpcgatewayattachment.go       |    118 +
 .../ec2/aws-ec2-vpcpeeringconnection.go       |    134 +
 .../ec2/aws-ec2-vpnconnection.go              |    139 +
 ...onnection_vpntunneloptionsspecification.go |     42 +
 .../ec2/aws-ec2-vpnconnectionroute.go         |    113 +
 .../cloudformation/ec2/aws-ec2-vpngateway.go  |    119 +
 .../ec2/aws-ec2-vpngatewayroutepropagation.go |    113 +
 .../ecr/aws-ecr-publicrepository.go           |    124 +
 .../ecr/aws-ecr-registrypolicy.go             |    106 +
 .../ecr/aws-ecr-replicationconfiguration.go   |    106 +
 ...nconfiguration_replicationconfiguration.go |     35 +
 ...ionconfiguration_replicationdestination.go |     42 +
 ...eplicationconfiguration_replicationrule.go |     40 +
 ...plicationconfiguration_repositoryfilter.go |     42 +
 .../cloudformation/ecr/aws-ecr-repository.go  |    139 +
 ...-ecr-repository_encryptionconfiguration.go |     42 +
 ...r-repository_imagescanningconfiguration.go |     37 +
 .../ecr/aws-ecr-repository_lifecyclepolicy.go |     42 +
 .../ecs/aws-ecs-capacityprovider.go           |    119 +
 ...pacityprovider_autoscalinggroupprovider.go |     47 +
 ...aws-ecs-capacityprovider_managedscaling.go |     57 +
 .../cloudformation/ecs/aws-ecs-cluster.go     |    134 +
 ...cs-cluster_capacityproviderstrategyitem.go |     47 +
 .../aws-ecs-cluster_clusterconfiguration.go   |     35 +
 .../ecs/aws-ecs-cluster_clustersettings.go    |     42 +
 ...ecs-cluster_executecommandconfiguration.go |     47 +
 ...-cluster_executecommandlogconfiguration.go |     57 +
 ...ecs-clustercapacityproviderassociations.go |    118 +
 ...erassociations_capacityproviderstrategy.go |     47 +
 .../ecs/aws-ecs-primarytaskset.go             |    118 +
 .../cloudformation/ecs/aws-ecs-service.go     |    209 +
 .../aws-ecs-service_awsvpcconfiguration.go    |     47 +
 ...cs-service_capacityproviderstrategyitem.go |     47 +
 ...ws-ecs-service_deploymentcircuitbreaker.go |     42 +
 ...aws-ecs-service_deploymentconfiguration.go |     47 +
 .../aws-ecs-service_deploymentcontroller.go   |     37 +
 .../ecs/aws-ecs-service_loadbalancer.go       |     52 +
 .../aws-ecs-service_networkconfiguration.go   |     35 +
 .../aws-ecs-service_placementconstraint.go    |     42 +
 .../ecs/aws-ecs-service_placementstrategy.go  |     42 +
 .../ecs/aws-ecs-service_serviceregistry.go    |     52 +
 .../ecs/aws-ecs-taskdefinition.go             |    189 +
 ...-ecs-taskdefinition_authorizationconfig.go |     42 +
 ...-ecs-taskdefinition_containerdefinition.go |    227 +
 ...-ecs-taskdefinition_containerdependency.go |     42 +
 .../ecs/aws-ecs-taskdefinition_device.go      |     47 +
 ...askdefinition_dockervolumeconfiguration.go |     57 +
 ...s-taskdefinition_efsvolumeconfiguration.go |     57 +
 .../aws-ecs-taskdefinition_environmentfile.go |     42 +
 ...aws-ecs-taskdefinition_ephemeralstorage.go |     37 +
 ...cs-taskdefinition_firelensconfiguration.go |     42 +
 .../ecs/aws-ecs-taskdefinition_healthcheck.go |     57 +
 .../ecs/aws-ecs-taskdefinition_hostentry.go   |     42 +
 ...ecs-taskdefinition_hostvolumeproperties.go |     37 +
 ...ecs-taskdefinition_inferenceaccelerator.go |     42 +
 ...s-ecs-taskdefinition_kernelcapabilities.go |     42 +
 .../aws-ecs-taskdefinition_keyvaluepair.go    |     42 +
 .../aws-ecs-taskdefinition_linuxparameters.go |     67 +
 ...aws-ecs-taskdefinition_logconfiguration.go |     47 +
 .../ecs/aws-ecs-taskdefinition_mountpoint.go  |     47 +
 .../ecs/aws-ecs-taskdefinition_portmapping.go |     47 +
 ...s-ecs-taskdefinition_proxyconfiguration.go |     47 +
 ...cs-taskdefinition_repositorycredentials.go |     37 +
 ...-ecs-taskdefinition_resourcerequirement.go |     42 +
 .../aws-ecs-taskdefinition_runtimeplatform.go |     42 +
 .../ecs/aws-ecs-taskdefinition_secret.go      |     42 +
 .../aws-ecs-taskdefinition_systemcontrol.go   |     42 +
 ...ition_taskdefinitionplacementconstraint.go |     42 +
 .../ecs/aws-ecs-taskdefinition_tmpfs.go       |     47 +
 .../ecs/aws-ecs-taskdefinition_ulimit.go      |     47 +
 .../ecs/aws-ecs-taskdefinition_volume.go      |     52 +
 .../ecs/aws-ecs-taskdefinition_volumefrom.go  |     42 +
 .../cloudformation/ecs/aws-ecs-taskset.go     |    153 +
 .../aws-ecs-taskset_awsvpcconfiguration.go    |     47 +
 .../ecs/aws-ecs-taskset_loadbalancer.go       |     52 +
 .../aws-ecs-taskset_networkconfiguration.go   |     35 +
 .../ecs/aws-ecs-taskset_scale.go              |     42 +
 .../ecs/aws-ecs-taskset_serviceregistry.go    |     52 +
 .../cloudformation/efs/aws-efs-accesspoint.go |    128 +
 .../efs/aws-efs-accesspoint_accesspointtag.go |     42 +
 .../efs/aws-efs-accesspoint_creationinfo.go   |     47 +
 .../efs/aws-efs-accesspoint_posixuser.go      |     47 +
 .../efs/aws-efs-accesspoint_rootdirectory.go  |     42 +
 .../cloudformation/efs/aws-efs-filesystem.go  |    158 +
 .../efs/aws-efs-filesystem_backuppolicy.go    |     37 +
 ...aws-efs-filesystem_elasticfilesystemtag.go |     42 +
 .../efs/aws-efs-filesystem_lifecyclepolicy.go |     42 +
 .../cloudformation/efs/aws-efs-mounttarget.go |    123 +
 .../eks/aws-eks-access-config.go              |     21 +
 .../eks/aws-eks-access-entry.go               |    119 +
 .../eks/aws-eks-access-entry_access_scope.go  |     20 +
 .../eks/aws-eks-access-entry_policy.go        |     33 +
 .../cloudformation/eks/aws-eks-addon.go       |    134 +
 .../cloudformation/eks/aws-eks-cluster.go     |    164 +
 .../eks/aws-eks-cluster_clusterlogging.go     |     35 +
 .../eks/aws-eks-cluster_compute_config.go     |     37 +
 .../aws-eks-cluster_controlplaneplacement.go  |     37 +
 .../aws-eks-cluster_elastic_loadbalancing.go  |     31 +
 .../eks/aws-eks-cluster_encryptionconfig.go   |     42 +
 ...aws-eks-cluster_kubernetesnetworkconfig.go |     49 +
 .../eks/aws-eks-cluster_logging.go            |     35 +
 .../eks/aws-eks-cluster_loggingtypeconfig.go  |     37 +
 .../eks/aws-eks-cluster_outpostconfig.go      |     47 +
 .../eks/aws-eks-cluster_provider.go           |     37 +
 .../eks/aws-eks-cluster_remotenetworks.go     |     17 +
 .../eks/aws-eks-cluster_resourcesvpcconfig.go |     57 +
 .../eks/aws-eks-cluster_storage_config.go     |     55 +
 .../eks/aws-eks-cluster_zonal-shift.go        |     31 +
 .../eks/aws-eks-fargateprofile.go             |    134 +
 .../eks/aws-eks-fargateprofile_label.go       |     42 +
 .../eks/aws-eks-fargateprofile_selector.go    |     42 +
 .../eks/aws-eks-identityproviderconfig.go     |    129 +
 ...oviderconfig_oidcidentityproviderconfig.go |     67 +
 ...ks-identityproviderconfig_requiredclaim.go |     42 +
 .../cloudformation/eks/aws-eks-nodegroup.go   |    193 +
 ...s-nodegroup_launchtemplatespecification.go |     47 +
 .../eks/aws-eks-nodegroup_remoteaccess.go     |     42 +
 .../eks/aws-eks-nodegroup_scalingconfig.go    |     47 +
 .../eks/aws-eks-nodegroup_taint.go            |     47 +
 .../eks/aws-eks-nodegroup_taints.go           |     12 +
 .../eks/aws-eks-nodegroup_updateconfig.go     |     42 +
 .../aws-elasticache-cachecluster.go           |    214 +
 ...luster_cloudwatchlogsdestinationdetails.go |     37 +
 ...ticache-cachecluster_destinationdetails.go |     40 +
 ...uster_kinesisfirehosedestinationdetails.go |     37 +
 ...cluster_logdeliveryconfigurationrequest.go |     52 +
 .../aws-elasticache-globalreplicationgroup.go |    148 +
 ...ationgroup_globalreplicationgroupmember.go |     47 +
 ...lreplicationgroup_regionalconfiguration.go |     47 +
 ...eplicationgroup_reshardingconfiguration.go |     42 +
 .../aws-elasticache-parametergroup.go         |    124 +
 .../aws-elasticache-replicationgroup.go       |    279 +
 ...ngroup_cloudwatchlogsdestinationdetails.go |     37 +
 ...che-replicationgroup_destinationdetails.go |     40 +
 ...group_kinesisfirehosedestinationdetails.go |     37 +
 ...ongroup_logdeliveryconfigurationrequest.go |     52 +
 ...replicationgroup_nodegroupconfiguration.go |     57 +
 .../aws-elasticache-securitygroup.go          |    114 +
 .../aws-elasticache-securitygroupingress.go   |    118 +
 .../aws-elasticache-subnetgroup.go            |    124 +
 .../elasticache/aws-elasticache-user.go       |    133 +
 .../elasticache/aws-elasticache-usergroup.go  |    118 +
 .../aws-elasticbeanstalk-application.go       |    118 +
 ...tion_applicationresourcelifecycleconfig.go |     42 +
 ...ation_applicationversionlifecycleconfig.go |     40 +
 ...elasticbeanstalk-application_maxagerule.go |     47 +
 ...asticbeanstalk-application_maxcountrule.go |     47 +
 ...aws-elasticbeanstalk-applicationversion.go |    118 +
 ...anstalk-applicationversion_sourcebundle.go |     42 +
 ...-elasticbeanstalk-configurationtemplate.go |    138 +
 ...tiontemplate_configurationoptionsetting.go |     52 +
 ...nfigurationtemplate_sourceconfiguration.go |     42 +
 .../aws-elasticbeanstalk-environment.go       |    164 +
 ...sticbeanstalk-environment_optionsetting.go |     52 +
 .../aws-elasticbeanstalk-environment_tier.go  |     47 +
 .../aws-elasticloadbalancing-loadbalancer.go  |    184 +
 ...ancing-loadbalancer_accessloggingpolicy.go |     52 +
 ...-loadbalancer_appcookiestickinesspolicy.go |     42 +
 ...g-loadbalancer_connectiondrainingpolicy.go |     42 +
 ...lancing-loadbalancer_connectionsettings.go |     37 +
 ...cloadbalancing-loadbalancer_healthcheck.go |     57 +
 ...g-loadbalancer_lbcookiestickinesspolicy.go |     42 +
 ...ticloadbalancing-loadbalancer_listeners.go |     62 +
 ...sticloadbalancing-loadbalancer_policies.go |     57 +
 .../aws-elasticloadbalancingv2-listener.go    |    138 +
 ...-elasticloadbalancingv2-listener_action.go |     72 +
 ...ngv2-listener_authenticatecognitoconfig.go |     72 +
 ...ncingv2-listener_authenticateoidcconfig.go |     87 +
 ...ticloadbalancingv2-listener_certificate.go |     37 +
 ...alancingv2-listener_fixedresponseconfig.go |     47 +
 ...cloadbalancingv2-listener_forwardconfig.go |     40 +
 ...loadbalancingv2-listener_redirectconfig.go |     62 +
 ...v2-listener_targetgroupstickinessconfig.go |     42 +
 ...adbalancingv2-listener_targetgrouptuple.go |     42 +
 ...sticloadbalancingv2-listenercertificate.go |    113 +
 ...ncingv2-listenercertificate_certificate.go |     37 +
 ...aws-elasticloadbalancingv2-listenerrule.go |    123 +
 ...sticloadbalancingv2-listenerrule_action.go |     72 +
 ...-listenerrule_authenticatecognitoconfig.go |     72 +
 ...gv2-listenerrule_authenticateoidcconfig.go |     92 +
 ...cingv2-listenerrule_fixedresponseconfig.go |     47 +
 ...dbalancingv2-listenerrule_forwardconfig.go |     40 +
 ...lancingv2-listenerrule_hostheaderconfig.go |     37 +
 ...lancingv2-listenerrule_httpheaderconfig.go |     42 +
 ...v2-listenerrule_httprequestmethodconfig.go |     37 +
 ...ancingv2-listenerrule_pathpatternconfig.go |     37 +
 ...ancingv2-listenerrule_querystringconfig.go |     35 +
 ...cingv2-listenerrule_querystringkeyvalue.go |     42 +
 ...balancingv2-listenerrule_redirectconfig.go |     62 +
 ...dbalancingv2-listenerrule_rulecondition.go |     72 +
 ...balancingv2-listenerrule_sourceipconfig.go |     37 +
 ...istenerrule_targetgroupstickinessconfig.go |     42 +
 ...lancingv2-listenerrule_targetgrouptuple.go |     42 +
 ...aws-elasticloadbalancingv2-loadbalancer.go |    149 +
 ...ngv2-loadbalancer_loadbalancerattribute.go |     42 +
 ...dbalancingv2-loadbalancer_subnetmapping.go |     52 +
 .../aws-elasticloadbalancingv2-targetgroup.go |    199 +
 ...sticloadbalancingv2-targetgroup_matcher.go |     42 +
 ...lancingv2-targetgroup_targetdescription.go |     47 +
 ...cingv2-targetgroup_targetgroupattribute.go |     42 +
 .../elasticsearch/aws-elasticsearch-domain.go |    179 +
 ...rch-domain_advancedsecurityoptionsinput.go |     47 +
 ...aws-elasticsearch-domain_cognitooptions.go |     52 +
 ...elasticsearch-domain_coldstorageoptions.go |     37 +
 ...sticsearch-domain_domainendpointoptions.go |     57 +
 .../aws-elasticsearch-domain_ebsoptions.go    |     52 +
 ...earch-domain_elasticsearchclusterconfig.go |     87 +
 ...icsearch-domain_encryptionatrestoptions.go |     42 +
 ...lasticsearch-domain_logpublishingoption.go |     42 +
 ...-elasticsearch-domain_masteruseroptions.go |     47 +
 ...arch-domain_nodetonodeencryptionoptions.go |     37 +
 ...ws-elasticsearch-domain_snapshotoptions.go |     37 +
 .../aws-elasticsearch-domain_vpcoptions.go    |     42 +
 ...lasticsearch-domain_zoneawarenessconfig.go |     37 +
 .../cloudformation/emr/aws-emr-cluster.go     |    214 +
 .../emr/aws-emr-cluster_application.go        |     52 +
 .../emr/aws-emr-cluster_autoscalingpolicy.go  |     40 +
 .../aws-emr-cluster_bootstrapactionconfig.go  |     42 +
 ...s-emr-cluster_cloudwatchalarmdefinition.go |     77 +
 .../emr/aws-emr-cluster_computelimits.go      |     57 +
 .../emr/aws-emr-cluster_configuration.go      |     47 +
 .../aws-emr-cluster_ebsblockdeviceconfig.go   |     42 +
 .../emr/aws-emr-cluster_ebsconfiguration.go   |     42 +
 .../aws-emr-cluster_hadoopjarstepconfig.go    |     52 +
 .../aws-emr-cluster_instancefleetconfig.go    |     57 +
 ...instancefleetprovisioningspecifications.go |     40 +
 .../aws-emr-cluster_instancegroupconfig.go    |     77 +
 .../emr/aws-emr-cluster_instancetypeconfig.go |     67 +
 .../aws-emr-cluster_jobflowinstancesconfig.go |    112 +
 .../emr/aws-emr-cluster_kerberosattributes.go |     57 +
 .../emr/aws-emr-cluster_keyvalue.go           |     42 +
 .../aws-emr-cluster_managedscalingpolicy.go   |     35 +
 .../emr/aws-emr-cluster_metricdimension.go    |     42 +
 ...uster_ondemandprovisioningspecification.go |     37 +
 .../emr/aws-emr-cluster_placementtype.go      |     37 +
 .../emr/aws-emr-cluster_scalingaction.go      |     42 +
 .../emr/aws-emr-cluster_scalingconstraints.go |     42 +
 .../emr/aws-emr-cluster_scalingrule.go        |     52 +
 .../emr/aws-emr-cluster_scalingtrigger.go     |     35 +
 ...emr-cluster_scriptbootstrapactionconfig.go |     42 +
 ...luster_simplescalingpolicyconfiguration.go |     47 +
 ...r-cluster_spotprovisioningspecification.go |     52 +
 .../emr/aws-emr-cluster_stepconfig.go         |     47 +
 .../aws-emr-cluster_volumespecification.go    |     47 +
 .../emr/aws-emr-instancefleetconfig.go        |    138 +
 ...s-emr-instancefleetconfig_configuration.go |     47 +
 ...nstancefleetconfig_ebsblockdeviceconfig.go |     42 +
 ...mr-instancefleetconfig_ebsconfiguration.go |     42 +
 ...instancefleetprovisioningspecifications.go |     40 +
 ...-instancefleetconfig_instancetypeconfig.go |     67 +
 ...onfig_ondemandprovisioningspecification.go |     37 +
 ...eetconfig_spotprovisioningspecification.go |     52 +
 ...instancefleetconfig_volumespecification.go |     47 +
 .../emr/aws-emr-instancegroupconfig.go        |    158 +
 ...r-instancegroupconfig_autoscalingpolicy.go |     40 +
 ...cegroupconfig_cloudwatchalarmdefinition.go |     77 +
 ...s-emr-instancegroupconfig_configuration.go |     47 +
 ...nstancegroupconfig_ebsblockdeviceconfig.go |     42 +
 ...mr-instancegroupconfig_ebsconfiguration.go |     42 +
 ...emr-instancegroupconfig_metricdimension.go |     42 +
 ...s-emr-instancegroupconfig_scalingaction.go |     42 +
 ...-instancegroupconfig_scalingconstraints.go |     42 +
 ...aws-emr-instancegroupconfig_scalingrule.go |     52 +
 ...-emr-instancegroupconfig_scalingtrigger.go |     35 +
 ...config_simplescalingpolicyconfiguration.go |     47 +
 ...instancegroupconfig_volumespecification.go |     47 +
 .../emr/aws-emr-securityconfiguration.go      |    113 +
 .../cloudformation/emr/aws-emr-step.go        |    123 +
 .../emr/aws-emr-step_hadoopjarstepconfig.go   |     52 +
 .../emr/aws-emr-step_keyvalue.go              |     42 +
 .../cloudformation/emr/aws-emr-studio.go      |    169 +
 .../emr/aws-emr-studiosessionmapping.go       |    123 +
 .../aws-emrcontainers-virtualcluster.go       |    119 +
 ...containers-virtualcluster_containerinfo.go |     35 +
 ...ainers-virtualcluster_containerprovider.go |     47 +
 ...ws-emrcontainers-virtualcluster_eksinfo.go |     37 +
 .../events/aws-events-apidestination.go       |    133 +
 .../events/aws-events-archive.go              |    128 +
 .../events/aws-events-connection.go           |    123 +
 .../events/aws-events-eventbus.go             |    113 +
 .../events/aws-events-eventbuspolicy.go       |    133 +
 .../aws-events-eventbuspolicy_condition.go    |     47 +
 .../cloudformation/events/aws-events-rule.go  |    143 +
 .../aws-events-rule_awsvpcconfiguration.go    |     47 +
 .../aws-events-rule_batcharrayproperties.go   |     37 +
 .../events/aws-events-rule_batchparameters.go |     52 +
 .../aws-events-rule_batchretrystrategy.go     |     37 +
 ...vents-rule_capacityproviderstrategyitem.go |     47 +
 .../aws-events-rule_deadletterconfig.go       |     37 +
 .../events/aws-events-rule_ecsparameters.go   |    103 +
 .../events/aws-events-rule_httpparameters.go  |     47 +
 .../aws-events-rule_inputtransformer.go       |     42 +
 .../aws-events-rule_kinesisparameters.go      |     37 +
 .../aws-events-rule_networkconfiguration.go   |     35 +
 .../aws-events-rule_placementconstraint.go    |     42 +
 .../aws-events-rule_placementstrategy.go      |     42 +
 .../aws-events-rule_redshiftdataparameters.go |     62 +
 .../events/aws-events-rule_retrypolicy.go     |     42 +
 .../aws-events-rule_runcommandparameters.go   |     35 +
 .../aws-events-rule_runcommandtarget.go       |     42 +
 .../events/aws-events-rule_sqsparameters.go   |     37 +
 .../events/aws-events-rule_tag.go             |     42 +
 .../events/aws-events-rule_target.go          |    107 +
 .../aws-eventschemas-discoverer.go            |    123 +
 .../aws-eventschemas-discoverer_tagsentry.go  |     42 +
 .../eventschemas/aws-eventschemas-registry.go |    118 +
 .../aws-eventschemas-registry_tagsentry.go    |     42 +
 .../aws-eventschemas-registrypolicy.go        |    118 +
 .../eventschemas/aws-eventschemas-schema.go   |    133 +
 .../aws-eventschemas-schema_tagsentry.go      |     42 +
 .../evidently/aws-evidently-experiment.go     |    149 +
 ...s-evidently-experiment_metricgoalobject.go |     62 +
 ...idently-experiment_onlineabconfigobject.go |     42 +
 ...ws-evidently-experiment_treatmentobject.go |     52 +
 ...-evidently-experiment_treatmenttoweight.go |     42 +
 .../evidently/aws-evidently-feature.go        |    144 +
 .../aws-evidently-feature_entityoverride.go   |     42 +
 .../aws-evidently-feature_variationobject.go  |     57 +
 .../evidently/aws-evidently-launch.go         |    144 +
 .../aws-evidently-launch_grouptoweight.go     |     42 +
 .../aws-evidently-launch_launchgroupobject.go |     52 +
 ...evidently-launch_metricdefinitionobject.go |     57 +
 .../aws-evidently-launch_stepconfig.go        |     42 +
 .../evidently/aws-evidently-project.go        |    124 +
 ...ws-evidently-project_datadeliveryobject.go |     42 +
 .../aws-evidently-project_s3destination.go    |     42 +
 .../finspace/aws-finspace-environment.go      |    138 +
 ...nspace-environment_federationparameters.go |     62 +
 ...inspace-environment_superuserparameters.go |     47 +
 .../fis/aws-fis-experimenttemplate.go         |    133 +
 ...rimenttemplate_experimenttemplateaction.go |     57 +
 ...emplate_experimenttemplatestopcondition.go |     42 +
 ...rimenttemplate_experimenttemplatetarget.go |     57 +
 ...template_experimenttemplatetargetfilter.go |     42 +
 .../fms/aws-fms-notificationchannel.go        |    113 +
 .../cloudformation/fms/aws-fms-policy.go      |    163 +
 .../fms/aws-fms-policy_iemap.go               |     42 +
 .../fms/aws-fms-policy_policytag.go           |     42 +
 .../fms/aws-fms-policy_resourcetag.go         |     42 +
 .../aws-frauddetector-detector.go             |    144 +
 .../aws-frauddetector-detector_entitytype.go  |     68 +
 .../aws-frauddetector-detector_eventtype.go   |     83 +
 ...ws-frauddetector-detector_eventvariable.go |     88 +
 .../aws-frauddetector-detector_label.go       |     68 +
 .../aws-frauddetector-detector_model.go       |     37 +
 .../aws-frauddetector-detector_outcome.go     |     68 +
 .../aws-frauddetector-detector_rule.go        |     88 +
 .../aws-frauddetector-entitytype.go           |    119 +
 .../aws-frauddetector-eventtype.go            |    134 +
 .../aws-frauddetector-eventtype_entitytype.go |     68 +
 ...s-frauddetector-eventtype_eventvariable.go |     88 +
 .../aws-frauddetector-eventtype_label.go      |     68 +
 .../frauddetector/aws-frauddetector-label.go  |    119 +
 .../aws-frauddetector-outcome.go              |    119 +
 .../aws-frauddetector-variable.go             |    139 +
 .../cloudformation/fsx/aws-fsx-filesystem.go  |    169 +
 ...ws-fsx-filesystem_auditlogconfiguration.go |     47 +
 ...aws-fsx-filesystem_clientconfigurations.go |     42 +
 ...ws-fsx-filesystem_diskiopsconfiguration.go |     42 +
 .../aws-fsx-filesystem_lustreconfiguration.go |     92 +
 .../fsx/aws-fsx-filesystem_nfsexports.go      |     35 +
 .../aws-fsx-filesystem_ontapconfiguration.go  |     82 +
 ...aws-fsx-filesystem_openzfsconfiguration.go |     77 +
 ...-fsx-filesystem_rootvolumeconfiguration.go |     57 +
 ...selfmanagedactivedirectoryconfiguration.go |     62 +
 .../aws-fsx-filesystem_userandgroupquotas.go  |     47 +
 ...aws-fsx-filesystem_windowsconfiguration.go |     87 +
 .../gamelift/aws-gamelift-alias.go            |    118 +
 .../aws-gamelift-alias_routingstrategy.go     |     47 +
 .../gamelift/aws-gamelift-build.go            |    123 +
 .../gamelift/aws-gamelift-build_s3location.go |     52 +
 .../gamelift/aws-gamelift-fleet.go            |    198 +
 ...gamelift-fleet_certificateconfiguration.go |     37 +
 .../aws-gamelift-fleet_ippermission.go        |     52 +
 .../aws-gamelift-fleet_locationcapacity.go    |     47 +
 ...ws-gamelift-fleet_locationconfiguration.go |     42 +
 ...elift-fleet_resourcecreationlimitpolicy.go |     42 +
 ...aws-gamelift-fleet_runtimeconfiguration.go |     47 +
 .../aws-gamelift-fleet_serverprocess.go       |     47 +
 .../gamelift/aws-gamelift-gameservergroup.go  |    164 +
 ...elift-gameservergroup_autoscalingpolicy.go |     42 +
 ...lift-gameservergroup_instancedefinition.go |     42 +
 ...ift-gameservergroup_instancedefinitions.go |     35 +
 ...gamelift-gameservergroup_launchtemplate.go |     47 +
 .../aws-gamelift-gameservergroup_tags.go      |     36 +
 ...servergroup_targettrackingconfiguration.go |     37 +
 ...aws-gamelift-gameservergroup_vpcsubnets.go |     37 +
 .../gamelift/aws-gamelift-gamesessionqueue.go |    143 +
 ...s-gamelift-gamesessionqueue_destination.go |     37 +
 ...ft-gamesessionqueue_filterconfiguration.go |     37 +
 ...ft-gamesessionqueue_playerlatencypolicy.go |     42 +
 ...-gamesessionqueue_priorityconfiguration.go |     42 +
 .../aws-gamelift-matchmakingconfiguration.go  |    173 +
 ...t-matchmakingconfiguration_gameproperty.go |     42 +
 .../aws-gamelift-matchmakingruleset.go        |    113 +
 .../gamelift/aws-gamelift-script.go           |    118 +
 .../aws-gamelift-script_s3location.go         |     52 +
 .../aws-globalaccelerator-accelerator.go      |    129 +
 .../aws-globalaccelerator-endpointgroup.go    |    153 +
 ...tor-endpointgroup_endpointconfiguration.go |     47 +
 ...laccelerator-endpointgroup_portoverride.go |     42 +
 .../aws-globalaccelerator-listener.go         |    123 +
 ...ws-globalaccelerator-listener_portrange.go |     42 +
 .../glue/aws-glue-classifier.go               |    121 +
 .../glue/aws-glue-classifier_csvclassifier.go |     67 +
 .../aws-glue-classifier_grokclassifier.go     |     52 +
 .../aws-glue-classifier_jsonclassifier.go     |     42 +
 .../glue/aws-glue-classifier_xmlclassifier.go |     47 +
 .../glue/aws-glue-connection.go               |    113 +
 .../aws-glue-connection_connectioninput.go    |     62 +
 ...nnection_physicalconnectionrequirements.go |     47 +
 .../cloudformation/glue/aws-glue-crawler.go   |    168 +
 .../glue/aws-glue-crawler_catalogtarget.go    |     42 +
 .../glue/aws-glue-crawler_dynamodbtarget.go   |     37 +
 .../glue/aws-glue-crawler_jdbctarget.go       |     47 +
 .../glue/aws-glue-crawler_recrawlpolicy.go    |     37 +
 .../glue/aws-glue-crawler_s3target.go         |     47 +
 .../glue/aws-glue-crawler_schedule.go         |     37 +
 .../aws-glue-crawler_schemachangepolicy.go    |     42 +
 .../glue/aws-glue-crawler_targets.go          |     50 +
 .../cloudformation/glue/aws-glue-database.go  |    113 +
 .../aws-glue-database_databaseidentifier.go   |     42 +
 .../glue/aws-glue-database_databaseinput.go   |     62 +
 .../aws-glue-database_datalakeprincipal.go    |     37 +
 .../aws-glue-database_principalprivileges.go  |     42 +
 .../aws-glue-datacatalogencryptionsettings.go |    113 +
 ...onsettings_connectionpasswordencryption.go |     42 +
 ...nsettings_datacatalogencryptionsettings.go |     40 +
 ...alogencryptionsettings_encryptionatrest.go |     42 +
 .../glue/aws-glue-devendpoint.go              |    178 +
 .../cloudformation/glue/aws-glue-job.go       |    193 +
 .../glue/aws-glue-job_connectionslist.go      |     37 +
 .../glue/aws-glue-job_executionproperty.go    |     37 +
 .../glue/aws-glue-job_jobcommand.go           |     47 +
 .../glue/aws-glue-job_notificationproperty.go |     37 +
 .../glue/aws-glue-mltransform.go              |    168 +
 ...-glue-mltransform_findmatchesparameters.go |     52 +
 .../glue/aws-glue-mltransform_gluetables.go   |     52 +
 .../aws-glue-mltransform_inputrecordtables.go |     35 +
 ...s-glue-mltransform_mluserdataencryption.go |     42 +
 ...ws-glue-mltransform_transformencryption.go |     42 +
 ...ws-glue-mltransform_transformparameters.go |     42 +
 .../cloudformation/glue/aws-glue-partition.go |    123 +
 .../glue/aws-glue-partition_column.go         |     47 +
 .../glue/aws-glue-partition_order.go          |     42 +
 .../glue/aws-glue-partition_partitioninput.go |     47 +
 .../glue/aws-glue-partition_schemaid.go       |     47 +
 .../aws-glue-partition_schemareference.go     |     47 +
 .../glue/aws-glue-partition_serdeinfo.go      |     47 +
 .../glue/aws-glue-partition_skewedinfo.go     |     47 +
 .../aws-glue-partition_storagedescriptor.go   |     97 +
 .../cloudformation/glue/aws-glue-registry.go  |    119 +
 .../cloudformation/glue/aws-glue-schema.go    |    144 +
 .../glue/aws-glue-schema_registry.go          |     42 +
 .../glue/aws-glue-schema_schemaversion.go     |     42 +
 .../glue/aws-glue-schemaversion.go            |    113 +
 .../glue/aws-glue-schemaversion_schema.go     |     47 +
 .../glue/aws-glue-schemaversionmetadata.go    |    118 +
 .../glue/aws-glue-securityconfiguration.go    |    113 +
 ...urityconfiguration_cloudwatchencryption.go |     42 +
 ...tyconfiguration_encryptionconfiguration.go |     45 +
 ...ityconfiguration_jobbookmarksencryption.go |     42 +
 ...glue-securityconfiguration_s3encryption.go |     42 +
 ...lue-securityconfiguration_s3encryptions.go |     30 +
 .../cloudformation/glue/aws-glue-table.go     |    118 +
 .../glue/aws-glue-table_column.go             |     47 +
 .../glue/aws-glue-table_order.go              |     42 +
 .../glue/aws-glue-table_schemaid.go           |     47 +
 .../glue/aws-glue-table_schemareference.go    |     47 +
 .../glue/aws-glue-table_serdeinfo.go          |     47 +
 .../glue/aws-glue-table_skewedinfo.go         |     47 +
 .../glue/aws-glue-table_storagedescriptor.go  |     97 +
 .../glue/aws-glue-table_tableidentifier.go    |     47 +
 .../glue/aws-glue-table_tableinput.go         |     87 +
 .../cloudformation/glue/aws-glue-trigger.go   |    148 +
 .../glue/aws-glue-trigger_action.go           |     62 +
 .../glue/aws-glue-trigger_condition.go        |     57 +
 .../aws-glue-trigger_notificationproperty.go  |     37 +
 .../glue/aws-glue-trigger_predicate.go        |     42 +
 .../cloudformation/glue/aws-glue-workflow.go  |    123 +
 .../aws-greengrass-connectordefinition.go     |    118 +
 ...reengrass-connectordefinition_connector.go |     47 +
 ...ordefinition_connectordefinitionversion.go |     35 +
 ...s-greengrass-connectordefinitionversion.go |    113 +
 ...ss-connectordefinitionversion_connector.go |     47 +
 .../aws-greengrass-coredefinition.go          |    118 +
 .../aws-greengrass-coredefinition_core.go     |     52 +
 ...ss-coredefinition_coredefinitionversion.go |     35 +
 .../aws-greengrass-coredefinitionversion.go   |    113 +
 ...s-greengrass-coredefinitionversion_core.go |     52 +
 .../aws-greengrass-devicedefinition.go        |    118 +
 .../aws-greengrass-devicedefinition_device.go |     52 +
 ...evicedefinition_devicedefinitionversion.go |     35 +
 .../aws-greengrass-devicedefinitionversion.go |    113 +
 ...eengrass-devicedefinitionversion_device.go |     52 +
 .../aws-greengrass-functiondefinition.go      |    118 +
 ...ngrass-functiondefinition_defaultconfig.go |     35 +
 ...eengrass-functiondefinition_environment.go |     52 +
 ...greengrass-functiondefinition_execution.go |     42 +
 ...-greengrass-functiondefinition_function.go |     47 +
 ...unctiondefinition_functionconfiguration.go |     67 +
 ...iondefinition_functiondefinitionversion.go |     40 +
 ...functiondefinition_resourceaccesspolicy.go |     42 +
 ...aws-greengrass-functiondefinition_runas.go |     42 +
 ...ws-greengrass-functiondefinitionversion.go |    118 +
 ...functiondefinitionversion_defaultconfig.go |     35 +
 ...s-functiondefinitionversion_environment.go |     52 +
 ...ass-functiondefinitionversion_execution.go |     42 +
 ...rass-functiondefinitionversion_function.go |     47 +
 ...definitionversion_functionconfiguration.go |     67 +
 ...ndefinitionversion_resourceaccesspolicy.go |     42 +
 ...engrass-functiondefinitionversion_runas.go |     42 +
 .../greengrass/aws-greengrass-group.go        |    123 +
 .../aws-greengrass-group_groupversion.go      |     67 +
 .../greengrass/aws-greengrass-groupversion.go |    143 +
 .../aws-greengrass-loggerdefinition.go        |    118 +
 .../aws-greengrass-loggerdefinition_logger.go |     57 +
 ...oggerdefinition_loggerdefinitionversion.go |     35 +
 .../aws-greengrass-loggerdefinitionversion.go |    113 +
 ...eengrass-loggerdefinitionversion_logger.go |     57 +
 .../aws-greengrass-resourcedefinition.go      |    118 +
 ...ss-resourcedefinition_groupownersetting.go |     42 +
 ...ourcedefinition_localdeviceresourcedata.go |     42 +
 ...ourcedefinition_localvolumeresourcedata.go |     47 +
 ...esourcedefinition_resourcedatacontainer.go |     55 +
 ...rcedefinition_resourcedefinitionversion.go |     35 +
 ...definition_resourcedownloadownersetting.go |     42 +
 ...ass-resourcedefinition_resourceinstance.go |     47 +
 ...tion_s3machinelearningmodelresourcedata.go |     47 +
 ...gemakermachinelearningmodelresourcedata.go |     47 +
 ...nition_secretsmanagersecretresourcedata.go |     42 +
 ...ws-greengrass-resourcedefinitionversion.go |    113 +
 ...urcedefinitionversion_groupownersetting.go |     42 +
 ...finitionversion_localdeviceresourcedata.go |     42 +
 ...finitionversion_localvolumeresourcedata.go |     47 +
 ...definitionversion_resourcedatacontainer.go |     55 +
 ...ionversion_resourcedownloadownersetting.go |     42 +
 ...ourcedefinitionversion_resourceinstance.go |     47 +
 ...sion_s3machinelearningmodelresourcedata.go |     47 +
 ...gemakermachinelearningmodelresourcedata.go |     47 +
 ...ersion_secretsmanagersecretresourcedata.go |     42 +
 .../aws-greengrass-subscriptiondefinition.go  |    118 +
 ...ass-subscriptiondefinition_subscription.go |     52 +
 ...efinition_subscriptiondefinitionversion.go |     35 +
 ...reengrass-subscriptiondefinitionversion.go |    113 +
 ...scriptiondefinitionversion_subscription.go |     52 +
 .../aws-greengrassv2-componentversion.go      |    118 +
 ...tversion_componentdependencyrequirement.go |     42 +
 ...ssv2-componentversion_componentplatform.go |     42 +
 ...-componentversion_lambdacontainerparams.go |     52 +
 ...ssv2-componentversion_lambdadevicemount.go |     47 +
 ...ssv2-componentversion_lambdaeventsource.go |     42 +
 ...ponentversion_lambdaexecutionparameters.go |     87 +
 ...onentversion_lambdafunctionrecipesource.go |     62 +
 ...mponentversion_lambdalinuxprocessparams.go |     42 +
 ...ssv2-componentversion_lambdavolumemount.go |     52 +
 .../groundstation/aws-groundstation-config.go |    119 +
 ...undstation-config_antennadownlinkconfig.go |     35 +
 ...config_antennadownlinkdemoddecodeconfig.go |     45 +
 ...roundstation-config_antennauplinkconfig.go |     47 +
 .../aws-groundstation-config_configdata.go    |     65 +
 ...ndstation-config_dataflowendpointconfig.go |     42 +
 .../aws-groundstation-config_decodeconfig.go  |     37 +
 ...groundstation-config_demodulationconfig.go |     37 +
 .../aws-groundstation-config_eirp.go          |     42 +
 .../aws-groundstation-config_frequency.go     |     42 +
 ...groundstation-config_frequencybandwidth.go |     42 +
 ...-groundstation-config_s3recordingconfig.go |     47 +
 ...aws-groundstation-config_spectrumconfig.go |     47 +
 ...aws-groundstation-config_trackingconfig.go |     37 +
 ...s-groundstation-config_uplinkechoconfig.go |     42 +
 ...oundstation-config_uplinkspectrumconfig.go |     42 +
 ...aws-groundstation-dataflowendpointgroup.go |    112 +
 ...-dataflowendpointgroup_dataflowendpoint.go |     47 +
 ...n-dataflowendpointgroup_endpointdetails.go |     40 +
 ...n-dataflowendpointgroup_securitydetails.go |     47 +
 ...ion-dataflowendpointgroup_socketaddress.go |     42 +
 .../aws-groundstation-missionprofile.go       |    139 +
 ...oundstation-missionprofile_dataflowedge.go |     42 +
 .../guardduty/aws-guardduty-detector.go       |    118 +
 ...ty-detector_cfndatasourceconfigurations.go |     35 +
 ...ardduty-detector_cfns3logsconfiguration.go |     37 +
 .../guardduty/aws-guardduty-filter.go         |    133 +
 .../aws-guardduty-filter_condition.go         |     57 +
 .../aws-guardduty-filter_findingcriteria.go   |     40 +
 .../guardduty/aws-guardduty-ipset.go          |    128 +
 .../guardduty/aws-guardduty-master.go         |    118 +
 .../guardduty/aws-guardduty-member.go         |    133 +
 .../guardduty/aws-guardduty-threatintelset.go |    128 +
 .../aws-healthlake-fhirdatastore.go           |    129 +
 ...hlake-fhirdatastore_kmsencryptionconfig.go |     42 +
 ...lthlake-fhirdatastore_preloaddataconfig.go |     37 +
 ...althlake-fhirdatastore_sseconfiguration.go |     35 +
 .../cloudformation/iam/aws-iam-accesskey.go   |    118 +
 .../cloudformation/iam/aws-iam-group.go       |    123 +
 .../iam/aws-iam-group_policy.go               |     42 +
 .../iam/aws-iam-instanceprofile.go            |    118 +
 .../iam/aws-iam-managedpolicy.go              |    138 +
 .../iam/aws-iam-oidcprovider.go               |    124 +
 .../cloudformation/iam/aws-iam-policy.go      |    128 +
 .../cloudformation/iam/aws-iam-role.go        |    149 +
 .../cloudformation/iam/aws-iam-role_policy.go |     42 +
 .../iam/aws-iam-samlprovider.go               |    119 +
 .../iam/aws-iam-servercertificate.go          |    134 +
 .../iam/aws-iam-servicelinkedrole.go          |    118 +
 .../cloudformation/iam/aws-iam-user.go        |    144 +
 .../iam/aws-iam-user_loginprofile.go          |     42 +
 .../cloudformation/iam/aws-iam-user_policy.go |     42 +
 .../iam/aws-iam-usertogroupaddition.go        |    113 +
 .../iam/aws-iam-virtualmfadevice.go           |    124 +
 .../aws-imagebuilder-component.go             |    153 +
 .../aws-imagebuilder-containerrecipe.go       |    178 +
 ...-containerrecipe_componentconfiguration.go |     37 +
 ...ipe_ebsinstanceblockdevicespecification.go |     72 +
 ...tainerrecipe_instanceblockdevicemapping.go |     52 +
 ...r-containerrecipe_instanceconfiguration.go |     42 +
 ...ntainerrecipe_targetcontainerrepository.go |     42 +
 ...-imagebuilder-distributionconfiguration.go |    123 +
 ...-distributionconfiguration_distribution.go |     57 +
 ...nfiguration_launchtemplateconfiguration.go |     47 +
 .../imagebuilder/aws-imagebuilder-image.go    |    138 +
 ...gebuilder-image_imagetestsconfiguration.go |     42 +
 .../aws-imagebuilder-imagepipeline.go         |    158 +
 ...r-imagepipeline_imagetestsconfiguration.go |     42 +
 ...aws-imagebuilder-imagepipeline_schedule.go |     42 +
 .../aws-imagebuilder-imagerecipe.go           |    148 +
 ...erecipe_additionalinstanceconfiguration.go |     42 +
 ...lder-imagerecipe_componentconfiguration.go |     42 +
 ...ebuilder-imagerecipe_componentparameter.go |     42 +
 ...ipe_ebsinstanceblockdevicespecification.go |     72 +
 ...-imagerecipe_instanceblockdevicemapping.go |     52 +
 ...builder-imagerecipe_systemsmanageragent.go |     37 +
 ...magebuilder-infrastructureconfiguration.go |    168 +
 ...reconfiguration_instancemetadataoptions.go |     42 +
 ...der-infrastructureconfiguration_logging.go |     35 +
 ...lder-infrastructureconfiguration_s3logs.go |     42 +
 .../aws-inspector-assessmenttarget.go         |    113 +
 .../aws-inspector-assessmenttemplate.go       |    129 +
 .../inspector/aws-inspector-resourcegroup.go  |    107 +
 goformation/cloudformation/intrinsics.go      |    244 +
 goformation/cloudformation/intrinsics_test.go |    132 +
 .../iot/aws-iot-accountauditconfiguration.go  |    123 +
 ...itconfiguration_auditcheckconfiguration.go |     37 +
 ...tconfiguration_auditcheckconfigurations.go |    100 +
 ...itconfiguration_auditnotificationtarget.go |     47 +
 ...n_auditnotificationtargetconfigurations.go |     35 +
 .../cloudformation/iot/aws-iot-authorizer.go  |    139 +
 .../iot/aws-iot-authorizer_tags.go            |     35 +
 ...s-iot-authorizer_tokensigningpublickeys.go |     30 +
 .../cloudformation/iot/aws-iot-certificate.go |    128 +
 .../iot/aws-iot-custommetric.go               |    124 +
 .../cloudformation/iot/aws-iot-dimension.go   |    124 +
 .../iot/aws-iot-domainconfiguration.go        |    144 +
 ...ot-domainconfiguration_authorizerconfig.go |     42 +
 ...nconfiguration_servercertificatesummary.go |     47 +
 .../iot/aws-iot-domainconfiguration_tags.go   |     35 +
 .../cloudformation/iot/aws-iot-fleetmetric.go |    154 +
 .../aws-iot-fleetmetric_aggregationtype.go    |     42 +
 .../cloudformation/iot/aws-iot-jobtemplate.go |    154 +
 .../cloudformation/iot/aws-iot-logging.go     |    118 +
 .../iot/aws-iot-mitigationaction.go           |    124 +
 .../aws-iot-mitigationaction_actionparams.go  |     60 +
 ...ationaction_addthingstothinggroupparams.go |     42 +
 ...mitigationaction_enableiotloggingparams.go |     42 +
 ...igationaction_publishfindingtosnsparams.go |     37 +
 ...ction_replacedefaultpolicyversionparams.go |     37 +
 ...igationaction_updatecacertificateparams.go |     37 +
 ...ionaction_updatedevicecertificateparams.go |     37 +
 .../cloudformation/iot/aws-iot-policy.go      |    113 +
 .../iot/aws-iot-policyprincipalattachment.go  |    113 +
 .../iot/aws-iot-provisioningtemplate.go       |    139 +
 ...t-provisioningtemplate_provisioninghook.go |     42 +
 .../iot/aws-iot-provisioningtemplate_tags.go  |     35 +
 .../iot/aws-iot-resourcespecificlogging.go    |    118 +
 .../iot/aws-iot-scheduledaudit.go             |    134 +
 .../iot/aws-iot-securityprofile.go            |    139 +
 .../aws-iot-securityprofile_alerttarget.go    |     42 +
 .../iot/aws-iot-securityprofile_behavior.go   |     57 +
 ...ws-iot-securityprofile_behaviorcriteria.go |     67 +
 ...yprofile_machinelearningdetectionconfig.go |     37 +
 ...aws-iot-securityprofile_metricdimension.go |     42 +
 .../aws-iot-securityprofile_metrictoretain.go |     42 +
 .../aws-iot-securityprofile_metricvalue.go    |     62 +
 ...ot-securityprofile_statisticalthreshold.go |     37 +
 .../cloudformation/iot/aws-iot-thing.go       |    113 +
 .../iot/aws-iot-thing_attributepayload.go     |     37 +
 .../iot/aws-iot-thingprincipalattachment.go   |    113 +
 .../cloudformation/iot/aws-iot-topicrule.go   |    119 +
 .../iot/aws-iot-topicrule_action.go           |    135 +
 ...ws-iot-topicrule_assetpropertytimestamp.go |     42 +
 .../aws-iot-topicrule_assetpropertyvalue.go   |     47 +
 .../aws-iot-topicrule_assetpropertyvariant.go |     52 +
 ...aws-iot-topicrule_cloudwatchalarmaction.go |     52 +
 .../aws-iot-topicrule_cloudwatchlogsaction.go |     42 +
 ...ws-iot-topicrule_cloudwatchmetricaction.go |     62 +
 .../iot/aws-iot-topicrule_dynamodbaction.go   |     77 +
 .../iot/aws-iot-topicrule_dynamodbv2action.go |     42 +
 .../aws-iot-topicrule_elasticsearchaction.go  |     57 +
 .../iot/aws-iot-topicrule_firehoseaction.go   |     52 +
 .../iot/aws-iot-topicrule_httpaction.go       |     52 +
 .../iot/aws-iot-topicrule_httpactionheader.go |     42 +
 .../aws-iot-topicrule_httpauthorization.go    |     35 +
 .../aws-iot-topicrule_iotanalyticsaction.go   |     47 +
 .../iot/aws-iot-topicrule_ioteventsaction.go  |     52 +
 .../aws-iot-topicrule_iotsitewiseaction.go    |     42 +
 .../iot/aws-iot-topicrule_kafkaaction.go      |     57 +
 .../iot/aws-iot-topicrule_kinesisaction.go    |     47 +
 .../iot/aws-iot-topicrule_lambdaaction.go     |     37 +
 .../iot/aws-iot-topicrule_opensearchaction.go |     57 +
 ...ot-topicrule_putassetpropertyvalueentry.go |     57 +
 .../iot/aws-iot-topicrule_putiteminput.go     |     37 +
 .../iot/aws-iot-topicrule_republishaction.go  |     47 +
 .../iot/aws-iot-topicrule_s3action.go         |     52 +
 .../aws-iot-topicrule_sigv4authorization.go   |     47 +
 .../iot/aws-iot-topicrule_snsaction.go        |     47 +
 .../iot/aws-iot-topicrule_sqsaction.go        |     47 +
 .../aws-iot-topicrule_stepfunctionsaction.go  |     47 +
 .../iot/aws-iot-topicrule_timestreamaction.go |     62 +
 .../aws-iot-topicrule_timestreamdimension.go  |     42 +
 .../aws-iot-topicrule_timestreamtimestamp.go  |     42 +
 .../iot/aws-iot-topicrule_topicrulepayload.go |     62 +
 .../iot/aws-iot-topicruledestination.go       |    118 +
 ...ledestination_httpurldestinationsummary.go |     37 +
 ...uledestination_vpcdestinationproperties.go |     52 +
 .../iot1click/aws-iot1click-device.go         |    113 +
 .../iot1click/aws-iot1click-placement.go      |    123 +
 .../iot1click/aws-iot1click-project.go        |    118 +
 .../aws-iot1click-project_devicetemplate.go   |     42 +
 ...aws-iot1click-project_placementtemplate.go |     40 +
 .../iotanalytics/aws-iotanalytics-channel.go  |    124 +
 ...aws-iotanalytics-channel_channelstorage.go |     40 +
 ...-iotanalytics-channel_customermanageds3.go |     47 +
 ...ws-iotanalytics-channel_retentionperiod.go |     42 +
 ...s-iotanalytics-channel_servicemanageds3.go |     30 +
 .../iotanalytics/aws-iotanalytics-dataset.go  |    144 +
 .../aws-iotanalytics-dataset_action.go        |     47 +
 ...ws-iotanalytics-dataset_containeraction.go |     52 +
 ...tics-dataset_datasetcontentdeliveryrule.go |     42 +
 ...t_datasetcontentdeliveryruledestination.go |     40 +
 ...tics-dataset_datasetcontentversionvalue.go |     37 +
 .../aws-iotanalytics-dataset_deltatime.go     |     42 +
 ...set_deltatimesessionwindowconfiguration.go |     37 +
 .../aws-iotanalytics-dataset_filter.go        |     35 +
 ...-iotanalytics-dataset_glueconfiguration.go |     42 +
 ...taset_ioteventsdestinationconfiguration.go |     42 +
 .../aws-iotanalytics-dataset_latedatarule.go  |     42 +
 ...ytics-dataset_latedataruleconfiguration.go |     35 +
 ...iotanalytics-dataset_outputfileurivalue.go |     37 +
 .../aws-iotanalytics-dataset_queryaction.go   |     42 +
 ...analytics-dataset_resourceconfiguration.go |     42 +
 ...ws-iotanalytics-dataset_retentionperiod.go |     42 +
 ...tics-dataset_s3destinationconfiguration.go |     52 +
 .../aws-iotanalytics-dataset_schedule.go      |     37 +
 .../aws-iotanalytics-dataset_trigger.go       |     40 +
 ...-iotanalytics-dataset_triggeringdataset.go |     37 +
 .../aws-iotanalytics-dataset_variable.go      |     57 +
 ...alytics-dataset_versioningconfiguration.go |     42 +
 .../aws-iotanalytics-datastore.go             |    134 +
 .../aws-iotanalytics-datastore_column.go      |     42 +
 ...otanalytics-datastore_customermanageds3.go |     47 +
 ...tics-datastore_customermanageds3storage.go |     42 +
 ...tanalytics-datastore_datastorepartition.go |     40 +
 ...analytics-datastore_datastorepartitions.go |     35 +
 ...iotanalytics-datastore_datastorestorage.go |     45 +
 ...ytics-datastore_fileformatconfiguration.go |     40 +
 ...-datastore_iotsitewisemultilayerstorage.go |     35 +
 ...otanalytics-datastore_jsonconfiguration.go |     30 +
 ...nalytics-datastore_parquetconfiguration.go |     35 +
 .../aws-iotanalytics-datastore_partition.go   |     37 +
 ...-iotanalytics-datastore_retentionperiod.go |     42 +
 ...iotanalytics-datastore_schemadefinition.go |     35 +
 ...iotanalytics-datastore_servicemanageds3.go |     30 +
 ...tanalytics-datastore_timestamppartition.go |     42 +
 .../iotanalytics/aws-iotanalytics-pipeline.go |    119 +
 .../aws-iotanalytics-pipeline_activity.go     |     80 +
 ...aws-iotanalytics-pipeline_addattributes.go |     47 +
 .../aws-iotanalytics-pipeline_channel.go      |     47 +
 .../aws-iotanalytics-pipeline_datastore.go    |     42 +
 ...analytics-pipeline_deviceregistryenrich.go |     57 +
 ...otanalytics-pipeline_deviceshadowenrich.go |     57 +
 .../aws-iotanalytics-pipeline_filter.go       |     47 +
 .../aws-iotanalytics-pipeline_lambda.go       |     52 +
 .../aws-iotanalytics-pipeline_math.go         |     52 +
 ...-iotanalytics-pipeline_removeattributes.go |     47 +
 ...-iotanalytics-pipeline_selectattributes.go |     47 +
 ...ws-iotcoredeviceadvisor-suitedefinition.go |    112 +
 .../iotevents/aws-iotevents-detectormodel.go  |    139 +
 .../aws-iotevents-detectormodel_action.go     |     95 +
 ...ts-detectormodel_assetpropertytimestamp.go |     42 +
 ...events-detectormodel_assetpropertyvalue.go |     47 +
 ...ents-detectormodel_assetpropertyvariant.go |     52 +
 .../aws-iotevents-detectormodel_cleartimer.go |     37 +
 ...s-detectormodel_detectormodeldefinition.go |     42 +
 .../aws-iotevents-detectormodel_dynamodb.go   |     82 +
 .../aws-iotevents-detectormodel_dynamodbv2.go |     42 +
 .../aws-iotevents-detectormodel_event.go      |     47 +
 .../aws-iotevents-detectormodel_firehose.go   |     47 +
 .../aws-iotevents-detectormodel_iotevents.go  |     42 +
 ...aws-iotevents-detectormodel_iotsitewise.go |     57 +
 ...iotevents-detectormodel_iottopicpublish.go |     42 +
 .../aws-iotevents-detectormodel_lambda.go     |     42 +
 .../aws-iotevents-detectormodel_onenter.go    |     35 +
 .../aws-iotevents-detectormodel_onexit.go     |     35 +
 .../aws-iotevents-detectormodel_oninput.go    |     40 +
 .../aws-iotevents-detectormodel_payload.go    |     42 +
 .../aws-iotevents-detectormodel_resettimer.go |     37 +
 .../aws-iotevents-detectormodel_settimer.go   |     47 +
 ...aws-iotevents-detectormodel_setvariable.go |     42 +
 .../aws-iotevents-detectormodel_sns.go        |     42 +
 .../aws-iotevents-detectormodel_sqs.go        |     47 +
 .../aws-iotevents-detectormodel_state.go      |     52 +
 ...iotevents-detectormodel_transitionevent.go |     52 +
 .../iotevents/aws-iotevents-input.go          |    124 +
 .../aws-iotevents-input_attribute.go          |     37 +
 .../aws-iotevents-input_inputdefinition.go    |     35 +
 .../aws-iotfleethub-application.go            |    124 +
 .../aws-iotsitewise-accesspolicy.go           |    118 +
 ...ewise-accesspolicy_accesspolicyidentity.go |     45 +
 ...ewise-accesspolicy_accesspolicyresource.go |     40 +
 .../aws-iotsitewise-accesspolicy_iamrole.go   |     37 +
 .../aws-iotsitewise-accesspolicy_iamuser.go   |     37 +
 .../aws-iotsitewise-accesspolicy_portal.go    |     37 +
 .../aws-iotsitewise-accesspolicy_project.go   |     37 +
 .../aws-iotsitewise-accesspolicy_user.go      |     37 +
 .../iotsitewise/aws-iotsitewise-asset.go      |    129 +
 .../aws-iotsitewise-asset_assethierarchy.go   |     42 +
 .../aws-iotsitewise-asset_assetproperty.go    |     47 +
 .../iotsitewise/aws-iotsitewise-assetmodel.go |    134 +
 ...ise-assetmodel_assetmodelcompositemodel.go |     52 +
 ...sitewise-assetmodel_assetmodelhierarchy.go |     47 +
 ...tsitewise-assetmodel_assetmodelproperty.go |     62 +
 .../aws-iotsitewise-assetmodel_attribute.go   |     37 +
 ...tsitewise-assetmodel_expressionvariable.go |     42 +
 .../aws-iotsitewise-assetmodel_metric.go      |     47 +
 ...aws-iotsitewise-assetmodel_metricwindow.go |     35 +
 ...aws-iotsitewise-assetmodel_propertytype.go |     52 +
 .../aws-iotsitewise-assetmodel_transform.go   |     42 +
 ...s-iotsitewise-assetmodel_tumblingwindow.go |     42 +
 ...ws-iotsitewise-assetmodel_variablevalue.go |     42 +
 .../iotsitewise/aws-iotsitewise-dashboard.go  |    129 +
 .../iotsitewise/aws-iotsitewise-gateway.go    |    124 +
 ...tewise-gateway_gatewaycapabilitysummary.go |     42 +
 ...aws-iotsitewise-gateway_gatewayplatform.go |     35 +
 .../aws-iotsitewise-gateway_greengrass.go     |     37 +
 .../iotsitewise/aws-iotsitewise-portal.go     |    144 +
 .../iotsitewise/aws-iotsitewise-project.go    |    129 +
 .../aws-iotthingsgraph-flowtemplate.go        |    113 +
 ...gsgraph-flowtemplate_definitiondocument.go |     42 +
 .../aws-iotwireless-destination.go            |    134 +
 .../aws-iotwireless-deviceprofile.go          |    119 +
 ...less-deviceprofile_lorawandeviceprofile.go |    102 +
 .../iotwireless/aws-iotwireless-fuotatask.go  |    154 +
 .../aws-iotwireless-fuotatask_lorawan.go      |     42 +
 .../aws-iotwireless-multicastgroup.go         |    134 +
 .../aws-iotwireless-multicastgroup_lorawan.go |     52 +
 .../aws-iotwireless-partneraccount.go         |    139 +
 ...less-partneraccount_sidewalkaccountinfo.go |     37 +
 ...ss-partneraccount_sidewalkupdateaccount.go |     37 +
 .../aws-iotwireless-serviceprofile.go         |    119 +
 ...ss-serviceprofile_lorawanserviceprofile.go |    127 +
 .../aws-iotwireless-taskdefinition.go         |    134 +
 ...ss-taskdefinition_lorawangatewayversion.go |     47 +
 ...finition_lorawanupdategatewaytaskcreate.go |     52 +
 ...efinition_lorawanupdategatewaytaskentry.go |     40 +
 ...inition_updatewirelessgatewaytaskcreate.go |     47 +
 .../aws-iotwireless-wirelessdevice.go         |    144 +
 .../aws-iotwireless-wirelessdevice_abpv10x.go |     42 +
 .../aws-iotwireless-wirelessdevice_abpv11.go  |     42 +
 ...otwireless-wirelessdevice_lorawandevice.go |     67 +
 ...aws-iotwireless-wirelessdevice_otaav10x.go |     42 +
 .../aws-iotwireless-wirelessdevice_otaav11.go |     47 +
 ...eless-wirelessdevice_sessionkeysabpv10x.go |     42 +
 ...reless-wirelessdevice_sessionkeysabpv11.go |     52 +
 .../aws-iotwireless-wirelessgateway.go        |    134 +
 ...wireless-wirelessgateway_lorawangateway.go |     42 +
 .../cloudformation/ivs/aws-ivs-channel.go     |    134 +
 .../ivs/aws-ivs-playbackkeypair.go            |    119 +
 .../ivs/aws-ivs-recordingconfiguration.go     |    119 +
 ...gconfiguration_destinationconfiguration.go |     35 +
 ...onfiguration_s3destinationconfiguration.go |     37 +
 .../cloudformation/ivs/aws-ivs-streamkey.go   |    114 +
 .../kendra/aws-kendra-datasource.go           |    144 +
 ...tasource_accesscontrollistconfiguration.go |     37 +
 .../aws-kendra-datasource_aclconfiguration.go |     37 +
 ...endra-datasource_changedetectingcolumns.go |     37 +
 ...s-kendra-datasource_columnconfiguration.go |     57 +
 ...ource_confluenceattachmentconfiguration.go |     42 +
 ...confluenceattachmenttoindexfieldmapping.go |     47 +
 ...-datasource_confluenceblogconfiguration.go |     35 +
 ...ource_confluenceblogtoindexfieldmapping.go |     47 +
 ...ndra-datasource_confluenceconfiguration.go |     82 +
 ...-datasource_confluencepageconfiguration.go |     35 +
 ...ource_confluencepagetoindexfieldmapping.go |     47 +
 ...datasource_confluencespaceconfiguration.go |     57 +
 ...urce_confluencespacetoindexfieldmapping.go |     47 +
 ...ndra-datasource_connectionconfiguration.go |     57 +
 ...kendra-datasource_databaseconfiguration.go |     62 +
 ...ndra-datasource_datasourceconfiguration.go |     80 +
 ...e_datasourceinclusionsexclusionsstrings.go |     37 +
 ...atasource_datasourcetoindexfieldmapping.go |     47 +
 ...ource_datasourcetoindexfieldmappinglist.go |     35 +
 ...a-datasource_datasourcevpcconfiguration.go |     42 +
 ...tasource_documentsmetadataconfiguration.go |     37 +
 ...dra-datasource_googledriveconfiguration.go |     67 +
 ...kendra-datasource_onedriveconfiguration.go |     67 +
 .../aws-kendra-datasource_onedriveuserlist.go |     37 +
 .../aws-kendra-datasource_onedriveusers.go    |     42 +
 ...ws-kendra-datasource_proxyconfiguration.go |     47 +
 ...ra-datasource_s3datasourceconfiguration.go |     62 +
 .../kendra/aws-kendra-datasource_s3path.go    |     42 +
 ...urce_salesforcechatterfeedconfiguration.go |     52 +
 ...salesforcechatterfeedincludefiltertypes.go |     37 +
 ...ndra-datasource_salesforceconfiguration.go |     77 +
 ...customknowledgearticletypeconfiguration.go |     52 +
 ...omknowledgearticletypeconfigurationlist.go |     35 +
 ...salesforceknowledgearticleconfiguration.go |     47 +
 ...rce_salesforceknowledgearticlestatelist.go |     37 +
 ...andardknowledgearticletypeconfiguration.go |     47 +
 ...cestandardobjectattachmentconfiguration.go |     42 +
 ...e_salesforcestandardobjectconfiguration.go |     52 +
 ...lesforcestandardobjectconfigurationlist.go |     35 +
 ...ndra-datasource_servicenowconfiguration.go |     62 +
 ...servicenowknowledgearticleconfiguration.go |     67 +
 ...e_servicenowservicecatalogconfiguration.go |     62 +
 ...ndra-datasource_sharepointconfiguration.go |     92 +
 .../aws-kendra-datasource_sqlconfiguration.go |     37 +
 .../kendra/aws-kendra-datasource_taglist.go   |     36 +
 ...e_webcrawlerauthenticationconfiguration.go |     35 +
 ...atasource_webcrawlerbasicauthentication.go |     47 +
 ...ndra-datasource_webcrawlerconfiguration.go |     77 +
 ...tasource_webcrawlerseedurlconfiguration.go |     42 +
 ...asource_webcrawlersitemapsconfiguration.go |     37 +
 .../aws-kendra-datasource_webcrawlerurls.go   |     40 +
 ...kendra-datasource_workdocsconfiguration.go |     62 +
 .../cloudformation/kendra/aws-kendra-faq.go   |    139 +
 .../kendra/aws-kendra-faq_s3path.go           |     42 +
 .../kendra/aws-kendra-faq_taglist.go          |     36 +
 .../cloudformation/kendra/aws-kendra-index.go |    154 +
 ...kendra-index_capacityunitsconfiguration.go |     42 +
 ...dra-index_documentmetadataconfiguration.go |     52 +
 ...index_documentmetadataconfigurationlist.go |     35 +
 ...kendra-index_jsontokentypeconfiguration.go |     42 +
 ...-kendra-index_jwttokentypeconfiguration.go |     67 +
 .../kendra/aws-kendra-index_relevance.go      |     57 +
 .../kendra/aws-kendra-index_search.go         |     52 +
 ...index_serversideencryptionconfiguration.go |     37 +
 .../kendra/aws-kendra-index_taglist.go        |     36 +
 ...aws-kendra-index_usertokenconfiguration.go |     40 +
 .../aws-kendra-index_valueimportanceitem.go   |     42 +
 .../aws-kendra-index_valueimportanceitems.go  |     35 +
 .../kinesis/aws-kinesis-stream.go             |    129 +
 .../aws-kinesis-stream_streamencryption.go    |     42 +
 .../kinesis/aws-kinesis-streamconsumer.go     |    113 +
 .../aws-kinesisanalytics-application.go       |    123 +
 ...lytics-application_csvmappingparameters.go |     42 +
 .../aws-kinesisanalytics-application_input.go |     62 +
 ...lytics-application_inputlambdaprocessor.go |     42 +
 ...sanalytics-application_inputparallelism.go |     37 +
 ...pplication_inputprocessingconfiguration.go |     35 +
 ...inesisanalytics-application_inputschema.go |     47 +
 ...ytics-application_jsonmappingparameters.go |     37 +
 ...lytics-application_kinesisfirehoseinput.go |     42 +
 ...alytics-application_kinesisstreamsinput.go |     42 +
 ...analytics-application_mappingparameters.go |     40 +
 ...nesisanalytics-application_recordcolumn.go |     47 +
 ...nesisanalytics-application_recordformat.go |     42 +
 .../aws-kinesisanalytics-applicationoutput.go |    113 +
 ...ics-applicationoutput_destinationschema.go |     37 +
 ...applicationoutput_kinesisfirehoseoutput.go |     42 +
 ...-applicationoutput_kinesisstreamsoutput.go |     42 +
 ...nalytics-applicationoutput_lambdaoutput.go |     42 +
 ...nesisanalytics-applicationoutput_output.go |     57 +
 ...nalytics-applicationreferencedatasource.go |    113 +
 ...eferencedatasource_csvmappingparameters.go |     42 +
 ...ferencedatasource_jsonmappingparameters.go |     37 +
 ...onreferencedatasource_mappingparameters.go |     40 +
 ...icationreferencedatasource_recordcolumn.go |     47 +
 ...icationreferencedatasource_recordformat.go |     42 +
 ...referencedatasource_referencedatasource.go |     47 +
 ...tionreferencedatasource_referenceschema.go |     47 +
 ...ferencedatasource_s3referencedatasource.go |     47 +
 .../aws-kinesisanalyticsv2-application.go     |    139 +
 ...pplication_applicationcodeconfiguration.go |     42 +
 ...v2-application_applicationconfiguration.go |     60 +
 ...cation_applicationsnapshotconfiguration.go |     37 +
 ...ticsv2-application_catalogconfiguration.go |     35 +
 ...sv2-application_checkpointconfiguration.go |     52 +
 ...esisanalyticsv2-application_codecontent.go |     47 +
 ...ticsv2-application_csvmappingparameters.go |     42 +
 ...application_customartifactconfiguration.go |     47 +
 ...pplication_customartifactsconfiguration.go |     30 +
 ...cation_deployasapplicationconfiguration.go |     35 +
 ...icsv2-application_environmentproperties.go |     35 +
 ...plication_flinkapplicationconfiguration.go |     45 +
 ...pplication_gluedatacatalogconfiguration.go |     37 +
 ...ws-kinesisanalyticsv2-application_input.go |     62 +
 ...ticsv2-application_inputlambdaprocessor.go |     37 +
 ...nalyticsv2-application_inputparallelism.go |     37 +
 ...pplication_inputprocessingconfiguration.go |     35 +
 ...esisanalyticsv2-application_inputschema.go |     47 +
 ...icsv2-application_jsonmappingparameters.go |     37 +
 ...ticsv2-application_kinesisfirehoseinput.go |     37 +
 ...yticsv2-application_kinesisstreamsinput.go |     37 +
 ...alyticsv2-application_mappingparameters.go |     40 +
 ...sanalyticsv2-application_mavenreference.go |     47 +
 ...sv2-application_monitoringconfiguration.go |     47 +
 ...v2-application_parallelismconfiguration.go |     52 +
 ...isanalyticsv2-application_propertygroup.go |     42 +
 ...sisanalyticsv2-application_recordcolumn.go |     47 +
 ...sisanalyticsv2-application_recordformat.go |     42 +
 ...icsv2-application_s3contentbaselocation.go |     42 +
 ...alyticsv2-application_s3contentlocation.go |     47 +
 ...application_sqlapplicationconfiguration.go |     35 +
 ...cation_zeppelinapplicationconfiguration.go |     50 +
 ...ication_zeppelinmonitoringconfiguration.go |     37 +
 ...csv2-applicationcloudwatchloggingoption.go |    113 +
 ...chloggingoption_cloudwatchloggingoption.go |     37 +
 ...ws-kinesisanalyticsv2-applicationoutput.go |    113 +
 ...sv2-applicationoutput_destinationschema.go |     37 +
 ...applicationoutput_kinesisfirehoseoutput.go |     37 +
 ...-applicationoutput_kinesisstreamsoutput.go |     37 +
 ...lyticsv2-applicationoutput_lambdaoutput.go |     37 +
 ...sisanalyticsv2-applicationoutput_output.go |     57 +
 ...lyticsv2-applicationreferencedatasource.go |    113 +
 ...eferencedatasource_csvmappingparameters.go |     42 +
 ...ferencedatasource_jsonmappingparameters.go |     37 +
 ...onreferencedatasource_mappingparameters.go |     40 +
 ...icationreferencedatasource_recordcolumn.go |     47 +
 ...icationreferencedatasource_recordformat.go |     42 +
 ...referencedatasource_referencedatasource.go |     47 +
 ...tionreferencedatasource_referenceschema.go |     47 +
 ...ferencedatasource_s3referencedatasource.go |     42 +
 .../aws-kinesisfirehose-deliverystream.go     |    164 +
 ...m_amazonopensearchservicebufferinghints.go |     42 +
 ...ensearchservicedestinationconfiguration.go |     97 +
 ...eam_amazonopensearchserviceretryoptions.go |     37 +
 ...sfirehose-deliverystream_bufferinghints.go |     42 +
 ...deliverystream_cloudwatchloggingoptions.go |     47 +
 ...esisfirehose-deliverystream_copycommand.go |     47 +
 ...tream_dataformatconversionconfiguration.go |     52 +
 ...iverystreamencryptionconfigurationinput.go |     42 +
 ...sisfirehose-deliverystream_deserializer.go |     40 +
 ...stream_dynamicpartitioningconfiguration.go |     42 +
 ...iverystream_elasticsearchbufferinghints.go |     42 +
 ...m_elasticsearchdestinationconfiguration.go |     97 +
 ...eliverystream_elasticsearchretryoptions.go |     37 +
 ...-deliverystream_encryptionconfiguration.go |     42 +
 ...ream_extendeds3destinationconfiguration.go |     97 +
 ...isfirehose-deliverystream_hivejsonserde.go |     37 +
 ...iverystream_httpendpointcommonattribute.go |     42 +
 ...eliverystream_httpendpointconfiguration.go |     47 +
 ...am_httpendpointdestinationconfiguration.go |     77 +
 ...stream_httpendpointrequestconfiguration.go |     42 +
 ...deliverystream_inputformatconfiguration.go |     35 +
 ...stream_kinesisstreamsourceconfiguration.go |     42 +
 ...hose-deliverystream_kmsencryptionconfig.go |     37 +
 ...sfirehose-deliverystream_openxjsonserde.go |     47 +
 ...kinesisfirehose-deliverystream_orcserde.go |     82 +
 ...eliverystream_outputformatconfiguration.go |     35 +
 ...sisfirehose-deliverystream_parquetserde.go |     62 +
 ...-deliverystream_processingconfiguration.go |     42 +
 ...inesisfirehose-deliverystream_processor.go |     42 +
 ...ehose-deliverystream_processorparameter.go |     42 +
 ...stream_redshiftdestinationconfiguration.go |     87 +
 ...ose-deliverystream_redshiftretryoptions.go |     37 +
 ...sisfirehose-deliverystream_retryoptions.go |     37 +
 ...liverystream_s3destinationconfiguration.go |     72 +
 ...hose-deliverystream_schemaconfiguration.go |     62 +
 ...nesisfirehose-deliverystream_serializer.go |     40 +
 ...rystream_splunkdestinationconfiguration.go |     77 +
 ...ehose-deliverystream_splunkretryoptions.go |     37 +
 ...irehose-deliverystream_vpcconfiguration.go |     47 +
 .../cloudformation/kms/aws-kms-alias.go       |    113 +
 goformation/cloudformation/kms/aws-kms-key.go |    149 +
 .../cloudformation/kms/aws-kms-replicakey.go  |    134 +
 .../aws-lakeformation-datalakesettings.go     |    113 +
 ...s-lakeformation-datalakesettings_admins.go |     30 +
 ...tion-datalakesettings_datalakeprincipal.go |     37 +
 .../aws-lakeformation-permissions.go          |    123 +
 ...akeformation-permissions_columnwildcard.go |     37 +
 ...eformation-permissions_databaseresource.go |     42 +
 ...formation-permissions_datalakeprincipal.go |     37 +
 ...mation-permissions_datalocationresource.go |     42 +
 .../aws-lakeformation-permissions_resource.go |     50 +
 ...lakeformation-permissions_tableresource.go |     52 +
 ...lakeformation-permissions_tablewildcard.go |     30 +
 ...on-permissions_tablewithcolumnsresource.go |     57 +
 .../aws-lakeformation-resource.go             |    118 +
 .../cloudformation/lambda/aws-lambda-alias.go |    143 +
 ...-lambda-alias_aliasroutingconfiguration.go |     35 +
 ...ias_provisionedconcurrencyconfiguration.go |     37 +
 .../lambda/aws-lambda-alias_versionweight.go  |     42 +
 .../lambda/aws-lambda-codesigningconfig.go    |    118 +
 ...bda-codesigningconfig_allowedpublishers.go |     37 +
 ...a-codesigningconfig_codesigningpolicies.go |     37 +
 .../lambda/aws-lambda-eventinvokeconfig.go    |    128 +
 ...bda-eventinvokeconfig_destinationconfig.go |     40 +
 .../aws-lambda-eventinvokeconfig_onfailure.go |     37 +
 .../aws-lambda-eventinvokeconfig_onsuccess.go |     37 +
 .../lambda/aws-lambda-eventsourcemapping.go   |    198 +
 ...da-eventsourcemapping_destinationconfig.go |     35 +
 ...aws-lambda-eventsourcemapping_endpoints.go |     37 +
 ...aws-lambda-eventsourcemapping_onfailure.go |     37 +
 ...entsourcemapping_selfmanagedeventsource.go |     35 +
 ...sourcemapping_sourceaccessconfiguration.go |     42 +
 .../lambda/aws-lambda-function.go             |    209 +
 .../lambda/aws-lambda-function_code.go        |     57 +
 .../aws-lambda-function_deadletterconfig.go   |     37 +
 .../lambda/aws-lambda-function_environment.go |     37 +
 .../aws-lambda-function_filesystemconfig.go   |     42 +
 .../lambda/aws-lambda-function_imageconfig.go |     47 +
 .../aws-lambda-function_tracingconfig.go      |     37 +
 .../lambda/aws-lambda-function_vpcconfig.go   |     42 +
 .../lambda/aws-lambda-layerversion.go         |    133 +
 .../lambda/aws-lambda-layerversion_content.go |     47 +
 .../aws-lambda-layerversionpermission.go      |    123 +
 .../lambda/aws-lambda-permission.go           |    133 +
 .../lambda/aws-lambda-version.go              |    123 +
 ...ion_provisionedconcurrencyconfiguration.go |     37 +
 .../aws-licensemanager-grant.go               |    133 +
 .../aws-licensemanager-license.go             |    158 +
 ...ensemanager-license_borrowconfiguration.go |     42 +
 ...anager-license_consumptionconfiguration.go |     47 +
 .../aws-licensemanager-license_entitlement.go |     62 +
 .../aws-licensemanager-license_issuerdata.go  |     42 +
 .../aws-licensemanager-license_metadata.go    |     42 +
 ...anager-license_provisionalconfiguration.go |     37 +
 ...censemanager-license_validitydateformat.go |     42 +
 .../lightsail/aws-lightsail-database.go       |    179 +
 ...il-database_relationaldatabaseparameter.go |     72 +
 .../lightsail/aws-lightsail-disk.go           |    129 +
 .../lightsail/aws-lightsail-disk_addon.go     |     47 +
 .../aws-lightsail-disk_autosnapshotaddon.go   |     37 +
 .../lightsail/aws-lightsail-instance.go       |    154 +
 .../lightsail/aws-lightsail-instance_addon.go |     47 +
 ...ws-lightsail-instance_autosnapshotaddon.go |     37 +
 .../lightsail/aws-lightsail-instance_disk.go  |     67 +
 .../aws-lightsail-instance_hardware.go        |     47 +
 .../aws-lightsail-instance_location.go        |     42 +
 .../aws-lightsail-instance_monthlytransfer.go |     37 +
 .../aws-lightsail-instance_networking.go      |     40 +
 .../lightsail/aws-lightsail-instance_port.go  |     82 +
 .../lightsail/aws-lightsail-instance_state.go |     42 +
 .../lightsail/aws-lightsail-staticip.go       |    113 +
 .../aws-location-geofencecollection.go        |    128 +
 .../location/aws-location-map.go              |    123 +
 .../aws-location-map_mapconfiguration.go      |     37 +
 .../location/aws-location-placeindex.go       |    128 +
 ...tion-placeindex_datasourceconfiguration.go |     37 +
 .../location/aws-location-routecalculator.go  |    123 +
 .../location/aws-location-tracker.go          |    133 +
 .../location/aws-location-trackerconsumer.go  |    113 +
 .../logs/aws-logs-destination.go              |    123 +
 .../cloudformation/logs/aws-logs-loggroup.go  |    124 +
 .../cloudformation/logs/aws-logs-logstream.go |    113 +
 .../logs/aws-logs-metricfilter.go             |    118 +
 ...-logs-metricfilter_metrictransformation.go |     52 +
 .../logs/aws-logs-querydefinition.go          |    118 +
 .../logs/aws-logs-resourcepolicy.go           |    113 +
 .../logs/aws-logs-subscriptionfilter.go       |    123 +
 ...aws-lookoutequipment-inferencescheduler.go |    149 +
 .../aws-lookoutmetrics-alert.go               |    128 +
 .../aws-lookoutmetrics-alert_action.go        |     40 +
 ...ookoutmetrics-alert_lambdaconfiguration.go |     42 +
 ...s-lookoutmetrics-alert_snsconfiguration.go |     42 +
 .../aws-lookoutmetrics-anomalydetector.go     |    128 +
 ...s-anomalydetector_anomalydetectorconfig.go |     37 +
 ...utmetrics-anomalydetector_appflowconfig.go |     42 +
 ...etrics-anomalydetector_cloudwatchconfig.go |     37 +
 ...ics-anomalydetector_csvformatdescriptor.go |     62 +
 ...cs-anomalydetector_fileformatdescriptor.go |     40 +
 ...cs-anomalydetector_jsonformatdescriptor.go |     42 +
 ...s-lookoutmetrics-anomalydetector_metric.go |     47 +
 ...ookoutmetrics-anomalydetector_metricset.go |     77 +
 ...outmetrics-anomalydetector_metricsource.go |     55 +
 ...metrics-anomalydetector_rdssourceconfig.go |     72 +
 ...cs-anomalydetector_redshiftsourceconfig.go |     72 +
 ...tmetrics-anomalydetector_s3sourceconfig.go |     52 +
 ...metrics-anomalydetector_timestampcolumn.go |     42 +
 ...etrics-anomalydetector_vpcconfiguration.go |     42 +
 .../aws-lookoutvision-project.go              |    108 +
 .../macie/aws-macie-customdataidentifier.go   |    133 +
 .../macie/aws-macie-findingsfilter.go         |    128 +
 .../aws-macie-findingsfilter_criterion.go     |     30 +
 ...ws-macie-findingsfilter_findingcriteria.go |     35 +
 ...e-findingsfilter_findingsfilterlistitem.go |     42 +
 .../cloudformation/macie/aws-macie-session.go |    113 +
 .../aws-managedblockchain-member.go           |    123 +
 ...ockchain-member_approvalthresholdpolicy.go |     47 +
 ...edblockchain-member_memberconfiguration.go |     47 +
 ...kchain-member_memberfabricconfiguration.go |     42 +
 ...ain-member_memberframeworkconfiguration.go |     35 +
 ...dblockchain-member_networkconfiguration.go |     62 +
 ...chain-member_networkfabricconfiguration.go |     37 +
 ...in-member_networkframeworkconfiguration.go |     35 +
 ...s-managedblockchain-member_votingpolicy.go |     35 +
 .../aws-managedblockchain-node.go             |    118 +
 ...anagedblockchain-node_nodeconfiguration.go |     42 +
 .../mediaconnect/aws-mediaconnect-flow.go     |    123 +
 .../aws-mediaconnect-flow_encryption.go       |     77 +
 .../aws-mediaconnect-flow_failoverconfig.go   |     42 +
 .../aws-mediaconnect-flow_source.go           |    107 +
 .../aws-mediaconnect-flowentitlement.go       |    138 +
 ...mediaconnect-flowentitlement_encryption.go |     77 +
 .../aws-mediaconnect-flowoutput.go            |    173 +
 .../aws-mediaconnect-flowoutput_encryption.go |     52 +
 ...nnect-flowoutput_vpcinterfaceattachment.go |     37 +
 .../aws-mediaconnect-flowsource.go            |    163 +
 .../aws-mediaconnect-flowsource_encryption.go |     77 +
 .../aws-mediaconnect-flowvpcinterface.go      |    128 +
 .../aws-mediaconvert-jobtemplate.go           |    153 +
 ...onvert-jobtemplate_accelerationsettings.go |     37 +
 ...mediaconvert-jobtemplate_hopdestination.go |     47 +
 .../mediaconvert/aws-mediaconvert-preset.go   |    128 +
 .../mediaconvert/aws-mediaconvert-queue.go    |    128 +
 .../medialive/aws-medialive-channel.go        |    158 +
 .../aws-medialive-channel_aacsettings.go      |     77 +
 .../aws-medialive-channel_ac3settings.go      |     67 +
 ...dialive-channel_ancillarysourcesettings.go |     37 +
 ...ws-medialive-channel_archivecdnsettings.go |     35 +
 ...ialive-channel_archivecontainersettings.go |     40 +
 ...-medialive-channel_archivegroupsettings.go |     47 +
 ...medialive-channel_archiveoutputsettings.go |     47 +
 ...aws-medialive-channel_archives3settings.go |     37 +
 ...dialive-channel_aribdestinationsettings.go |     30 +
 ...ws-medialive-channel_aribsourcesettings.go |     30 +
 ...s-medialive-channel_audiochannelmapping.go |     42 +
 ...ws-medialive-channel_audiocodecsettings.go |     60 +
 .../aws-medialive-channel_audiodescription.go |     87 +
 ...live-channel_audiohlsrenditionselection.go |     42 +
 ...edialive-channel_audiolanguageselection.go |     42 +
 ...live-channel_audionormalizationsettings.go |     47 +
 ...-medialive-channel_audioonlyhlssettings.go |     52 +
 ...aws-medialive-channel_audiopidselection.go |     37 +
 .../aws-medialive-channel_audioselector.go    |     42 +
 ...medialive-channel_audioselectorsettings.go |     50 +
 ...ve-channel_audiosilencefailoversettings.go |     42 +
 .../aws-medialive-channel_audiotrack.go       |     37 +
 ...s-medialive-channel_audiotrackselection.go |     35 +
 ...edialive-channel_audiowatermarksettings.go |     35 +
 ...-channel_automaticinputfailoversettings.go |     52 +
 .../aws-medialive-channel_availblanking.go    |     42 +
 ...ws-medialive-channel_availconfiguration.go |     35 +
 .../aws-medialive-channel_availsettings.go    |     40 +
 .../aws-medialive-channel_blackoutslate.go    |     57 +
 ...alive-channel_burnindestinationsettings.go |    117 +
 ...ws-medialive-channel_captiondescription.go |     57 +
 ...live-channel_captiondestinationsettings.go |     95 +
 ...edialive-channel_captionlanguagemapping.go |     47 +
 .../aws-medialive-channel_captionrectangle.go |     52 +
 .../aws-medialive-channel_captionselector.go  |     47 +
 ...dialive-channel_captionselectorsettings.go |     65 +
 ...medialive-channel_cdiinputspecification.go |     37 +
 ...e-channel_colorspacepassthroughsettings.go |     30 +
 .../aws-medialive-channel_dvbnitsettings.go   |     47 +
 .../aws-medialive-channel_dvbsdtsettings.go   |     52 +
 ...alive-channel_dvbsubdestinationsettings.go |    117 +
 ...-medialive-channel_dvbsubsourcesettings.go |     42 +
 .../aws-medialive-channel_dvbtdtsettings.go   |     37 +
 .../aws-medialive-channel_eac3settings.go     |    132 +
 ...alive-channel_ebuttddestinationsettings.go |     52 +
 ...ive-channel_embeddeddestinationsettings.go |     30 +
 ...l_embeddedplusscte20destinationsettings.go |     30 +
 ...edialive-channel_embeddedsourcesettings.go |     52 +
 .../aws-medialive-channel_encodersettings.go  |     90 +
 ...aws-medialive-channel_failovercondition.go |     35 +
 ...alive-channel_failoverconditionsettings.go |     45 +
 ...ws-medialive-channel_featureactivations.go |     37 +
 ...aws-medialive-channel_fecoutputsettings.go |     47 +
 .../aws-medialive-channel_fmp4hlssettings.go  |     47 +
 ...dialive-channel_framecapturecdnsettings.go |     35 +
 ...alive-channel_framecapturegroupsettings.go |     40 +
 ...dialive-channel_framecapturehlssettings.go |     30 +
 ...live-channel_framecaptureoutputsettings.go |     37 +
 ...edialive-channel_framecaptures3settings.go |     37 +
 ...-medialive-channel_framecapturesettings.go |     42 +
 ...s-medialive-channel_globalconfiguration.go |     62 +
 ...edialive-channel_h264colorspacesettings.go |     45 +
 ...ws-medialive-channel_h264filtersettings.go |     35 +
 .../aws-medialive-channel_h264settings.go     |    237 +
 ...edialive-channel_h265colorspacesettings.go |     50 +
 ...ws-medialive-channel_h265filtersettings.go |     35 +
 .../aws-medialive-channel_h265settings.go     |    177 +
 .../aws-medialive-channel_hdr10settings.go    |     42 +
 ...aws-medialive-channel_hlsakamaisettings.go |     67 +
 ...s-medialive-channel_hlsbasicputsettings.go |     52 +
 .../aws-medialive-channel_hlscdnsettings.go   |     55 +
 .../aws-medialive-channel_hlsgroupsettings.go |    242 +
 .../aws-medialive-channel_hlsinputsettings.go |     57 +
 ...medialive-channel_hlsmediastoresettings.go |     57 +
 ...aws-medialive-channel_hlsoutputsettings.go |     52 +
 .../aws-medialive-channel_hlss3settings.go    |     37 +
 .../aws-medialive-channel_hlssettings.go      |     50 +
 ...aws-medialive-channel_hlswebdavsettings.go |     57 +
 ...live-channel_htmlmotiongraphicssettings.go |     30 +
 .../aws-medialive-channel_inputattachment.go  |     52 +
 ...aws-medialive-channel_inputchannellevel.go |     42 +
 .../aws-medialive-channel_inputlocation.go    |     47 +
 ...aws-medialive-channel_inputlossbehavior.go |     57 +
 ...alive-channel_inputlossfailoversettings.go |     37 +
 .../aws-medialive-channel_inputsettings.go    |     82 +
 ...ws-medialive-channel_inputspecification.go |     47 +
 ...s-medialive-channel_keyprovidersettings.go |     35 +
 .../aws-medialive-channel_m2tssettings.go     |    267 +
 .../aws-medialive-channel_m3u8settings.go     |    117 +
 ...alive-channel_mediapackagegroupsettings.go |     35 +
 ...l_mediapackageoutputdestinationsettings.go |     37 +
 ...live-channel_mediapackageoutputsettings.go |     30 +
 ...ive-channel_motiongraphicsconfiguration.go |     42 +
 ...edialive-channel_motiongraphicssettings.go |     35 +
 .../aws-medialive-channel_mp2settings.go      |     47 +
 ...s-medialive-channel_mpeg2filtersettings.go |     35 +
 .../aws-medialive-channel_mpeg2settings.go    |    112 +
 ...medialive-channel_mssmoothgroupsettings.go |    127 +
 ...edialive-channel_mssmoothoutputsettings.go |     42 +
 ...edialive-channel_multiplexgroupsettings.go |     30 +
 ...dialive-channel_multiplexoutputsettings.go |     35 +
 ...tiplexprogramchanneldestinationsettings.go |     42 +
 ...-medialive-channel_networkinputsettings.go |     42 +
 .../aws-medialive-channel_nielsencbet.go      |     47 +
 ...-medialive-channel_nielsenconfiguration.go |     42 +
 .../aws-medialive-channel_nielsennaesiinw.go  |     42 +
 ...alive-channel_nielsenwatermarkssettings.go |     47 +
 .../medialive/aws-medialive-channel_output.go |     57 +
 ...aws-medialive-channel_outputdestination.go |     52 +
 ...alive-channel_outputdestinationsettings.go |     52 +
 .../aws-medialive-channel_outputgroup.go      |     47 +
 ...s-medialive-channel_outputgroupsettings.go |     70 +
 ...aws-medialive-channel_outputlocationref.go |     37 +
 .../aws-medialive-channel_outputsettings.go   |     70 +
 ...s-medialive-channel_passthroughsettings.go |     30 +
 .../aws-medialive-channel_rawsettings.go      |     30 +
 .../aws-medialive-channel_rec601settings.go   |     30 +
 .../aws-medialive-channel_rec709settings.go   |     30 +
 .../aws-medialive-channel_remixsettings.go    |     47 +
 ...nnel_rtmpcaptioninfodestinationsettings.go |     30 +
 ...aws-medialive-channel_rtmpgroupsettings.go |     67 +
 ...ws-medialive-channel_rtmpoutputsettings.go |     52 +
 ...l_scte20plusembeddeddestinationsettings.go |     30 +
 ...-medialive-channel_scte20sourcesettings.go |     42 +
 ...alive-channel_scte27destinationsettings.go |     30 +
 ...-medialive-channel_scte27sourcesettings.go |     42 +
 ...ws-medialive-channel_scte35spliceinsert.go |     47 +
 ...-medialive-channel_scte35timesignalapos.go |     47 +
 ...live-channel_smptettdestinationsettings.go |     30 +
 ...s-medialive-channel_standardhlssettings.go |     42 +
 ...aws-medialive-channel_statickeysettings.go |     42 +
 ...ive-channel_teletextdestinationsettings.go |     30 +
 ...edialive-channel_teletextsourcesettings.go |     42 +
 ...edialive-channel_temporalfiltersettings.go |     42 +
 .../aws-medialive-channel_timecodeconfig.go   |     42 +
 ...dialive-channel_ttmldestinationsettings.go |     37 +
 ...-medialive-channel_udpcontainersettings.go |     35 +
 .../aws-medialive-channel_udpgroupsettings.go |     47 +
 ...aws-medialive-channel_udpoutputsettings.go |     52 +
 ...live-channel_videoblackfailoversettings.go |     42 +
 ...ws-medialive-channel_videocodecsettings.go |     50 +
 .../aws-medialive-channel_videodescription.go |     67 +
 .../aws-medialive-channel_videoselector.go    |     52 +
 ...channel_videoselectorcolorspacesettings.go |     35 +
 .../aws-medialive-channel_videoselectorpid.go |     37 +
 ...edialive-channel_videoselectorprogramid.go |     37 +
 ...medialive-channel_videoselectorsettings.go |     40 +
 ...aws-medialive-channel_vpcoutputsettings.go |     47 +
 .../aws-medialive-channel_wavsettings.go      |     47 +
 ...alive-channel_webvttdestinationsettings.go |     37 +
 .../medialive/aws-medialive-input.go          |    153 +
 ...medialive-input_inputdestinationrequest.go |     37 +
 .../aws-medialive-input_inputdevicerequest.go |     37 +
 ...aws-medialive-input_inputdevicesettings.go |     37 +
 .../aws-medialive-input_inputsourcerequest.go |     47 +
 .../aws-medialive-input_inputvpcrequest.go    |     42 +
 ...medialive-input_mediaconnectflowrequest.go |     37 +
 .../aws-medialive-inputsecuritygroup.go       |    111 +
 ...putsecuritygroup_inputwhitelistrulecidr.go |     37 +
 .../mediapackage/aws-mediapackage-asset.go    |    134 +
 .../aws-mediapackage-asset_egressendpoint.go  |     42 +
 .../mediapackage/aws-mediapackage-channel.go  |    129 +
 .../aws-mediapackage-channel_hlsingest.go     |     35 +
 ...aws-mediapackage-channel_ingestendpoint.go |     52 +
 ...s-mediapackage-channel_logconfiguration.go |     37 +
 .../aws-mediapackage-originendpoint.go        |    174 +
 ...-mediapackage-originendpoint_adtriggers.go |     35 +
 ...diapackage-originendpoint_authorization.go |     42 +
 ...iapackage-originendpoint_cmafencryption.go |     47 +
 ...mediapackage-originendpoint_cmafpackage.go |     57 +
 ...iapackage-originendpoint_dashencryption.go |     42 +
 ...mediapackage-originendpoint_dashpackage.go |    107 +
 ...diapackage-originendpoint_hlsencryption.go |     57 +
 ...mediapackage-originendpoint_hlsmanifest.go |     82 +
 ...-mediapackage-originendpoint_hlspackage.go |     87 +
 ...diapackage-originendpoint_mssencryption.go |     35 +
 ...-mediapackage-originendpoint_msspackage.go |     52 +
 ...package-originendpoint_spekekeyprovider.go |     57 +
 ...apackage-originendpoint_streamselection.go |     47 +
 ...aws-mediapackage-packagingconfiguration.go |    139 +
 ...e-packagingconfiguration_cmafencryption.go |     35 +
 ...kage-packagingconfiguration_cmafpackage.go |     52 +
 ...e-packagingconfiguration_dashencryption.go |     35 +
 ...age-packagingconfiguration_dashmanifest.go |     57 +
 ...kage-packagingconfiguration_dashpackage.go |     62 +
 ...ge-packagingconfiguration_hlsencryption.go |     47 +
 ...kage-packagingconfiguration_hlsmanifest.go |     62 +
 ...ckage-packagingconfiguration_hlspackage.go |     52 +
 ...ge-packagingconfiguration_mssencryption.go |     35 +
 ...kage-packagingconfiguration_mssmanifest.go |     42 +
 ...ckage-packagingconfiguration_msspackage.go |     47 +
 ...packagingconfiguration_spekekeyprovider.go |     47 +
 ...-packagingconfiguration_streamselection.go |     47 +
 .../aws-mediapackage-packaginggroup.go        |    124 +
 ...diapackage-packaginggroup_authorization.go |     42 +
 ...package-packaginggroup_logconfiguration.go |     37 +
 .../mediastore/aws-mediastore-container.go    |    139 +
 .../aws-mediastore-container_corsrule.go      |     57 +
 .../aws-mediastore-container_metricpolicy.go  |     42 +
 ...s-mediastore-container_metricpolicyrule.go |     42 +
 .../memorydb/aws-memorydb-acl.go              |    119 +
 .../memorydb/aws-memorydb-cluster.go          |    219 +
 .../memorydb/aws-memorydb-cluster_endpoint.go |     42 +
 .../memorydb/aws-memorydb-parametergroup.go   |    129 +
 .../memorydb/aws-memorydb-subnetgroup.go      |    124 +
 .../memorydb/aws-memorydb-user.go             |    124 +
 .../cloudformation/msk/aws-msk-cluster.go     |    158 +
 .../msk/aws-msk-cluster_brokerlogs.go         |     45 +
 .../aws-msk-cluster_brokernodegroupinfo.go    |     62 +
 .../aws-msk-cluster_clientauthentication.go   |     45 +
 .../msk/aws-msk-cluster_cloudwatchlogs.go     |     42 +
 .../msk/aws-msk-cluster_configurationinfo.go  |     42 +
 .../msk/aws-msk-cluster_connectivityinfo.go   |     35 +
 .../msk/aws-msk-cluster_ebsstorageinfo.go     |     37 +
 .../msk/aws-msk-cluster_encryptionatrest.go   |     37 +
 .../msk/aws-msk-cluster_encryptioninfo.go     |     40 +
 .../aws-msk-cluster_encryptionintransit.go    |     42 +
 .../msk/aws-msk-cluster_firehose.go           |     42 +
 .../cloudformation/msk/aws-msk-cluster_iam.go |     37 +
 .../msk/aws-msk-cluster_jmxexporter.go        |     37 +
 .../msk/aws-msk-cluster_logginginfo.go        |     35 +
 .../msk/aws-msk-cluster_nodeexporter.go       |     37 +
 .../msk/aws-msk-cluster_openmonitoring.go     |     35 +
 .../msk/aws-msk-cluster_prometheus.go         |     40 +
 .../msk/aws-msk-cluster_publicaccess.go       |     37 +
 .../cloudformation/msk/aws-msk-cluster_s3.go  |     47 +
 .../msk/aws-msk-cluster_sasl.go               |     40 +
 .../msk/aws-msk-cluster_scram.go              |     37 +
 .../msk/aws-msk-cluster_storageinfo.go        |     35 +
 .../cloudformation/msk/aws-msk-cluster_tls.go |     42 +
 .../msk/aws-msk-cluster_unauthenticated.go    |     37 +
 .../mwaa/aws-mwaa-environment.go              |    203 +
 ...s-mwaa-environment_loggingconfiguration.go |     55 +
 ...-environment_moduleloggingconfiguration.go |     47 +
 ...s-mwaa-environment_networkconfiguration.go |     42 +
 .../neptune/aws-neptune-dbcluster.go          |    214 +
 .../aws-neptune-dbcluster_dbclusterrole.go    |     42 +
 .../aws-neptune-dbclusterparametergroup.go    |    129 +
 .../neptune/aws-neptune-dbinstance.go         |    159 +
 .../neptune/aws-neptune-dbparametergroup.go   |    129 +
 .../neptune/aws-neptune-dbsubnetgroup.go      |    124 +
 .../aws-networkfirewall-firewall.go           |    149 +
 ...-networkfirewall-firewall_subnetmapping.go |     37 +
 .../aws-networkfirewall-firewallpolicy.go     |    124 +
 ...irewall-firewallpolicy_actiondefinition.go |     35 +
 ...orkfirewall-firewallpolicy_customaction.go |     42 +
 ...etworkfirewall-firewallpolicy_dimension.go |     37 +
 ...kfirewall-firewallpolicy_firewallpolicy.go |     67 +
 ...wall-firewallpolicy_publishmetricaction.go |     35 +
 ...ll-firewallpolicy_statefulengineoptions.go |     37 +
 ...rewallpolicy_statefulrulegroupreference.go |     42 +
 ...ewallpolicy_statelessrulegroupreference.go |     42 +
 ...ws-networkfirewall-loggingconfiguration.go |    118 +
 ...ggingconfiguration_logdestinationconfig.go |     47 +
 ...ggingconfiguration_loggingconfiguration.go |     35 +
 .../aws-networkfirewall-rulegroup.go          |    134 +
 ...workfirewall-rulegroup_actiondefinition.go |     35 +
 .../aws-networkfirewall-rulegroup_address.go  |     37 +
 ...-networkfirewall-rulegroup_customaction.go |     42 +
 ...aws-networkfirewall-rulegroup_dimension.go |     37 +
 .../aws-networkfirewall-rulegroup_header.go   |     62 +
 .../aws-networkfirewall-rulegroup_ipset.go    |     37 +
 ...tworkfirewall-rulegroup_matchattributes.go |     62 +
 ...aws-networkfirewall-rulegroup_portrange.go |     42 +
 .../aws-networkfirewall-rulegroup_portset.go  |     37 +
 ...kfirewall-rulegroup_publishmetricaction.go |     35 +
 ...etworkfirewall-rulegroup_ruledefinition.go |     42 +
 ...aws-networkfirewall-rulegroup_rulegroup.go |     45 +
 ...ws-networkfirewall-rulegroup_ruleoption.go |     42 +
 ...s-networkfirewall-rulegroup_rulessource.go |     52 +
 ...tworkfirewall-rulegroup_rulessourcelist.go |     47 +
 ...networkfirewall-rulegroup_rulevariables.go |     40 +
 ...-networkfirewall-rulegroup_statefulrule.go |     47 +
 ...kfirewall-rulegroup_statefulruleoptions.go |     37 +
 ...networkfirewall-rulegroup_statelessrule.go |     42 +
 ...ulegroup_statelessrulesandcustomactions.go |     40 +
 ...-networkfirewall-rulegroup_tcpflagfield.go |     42 +
 ...tworkmanager-customergatewayassociation.go |    123 +
 .../aws-networkmanager-device.go              |    149 +
 .../aws-networkmanager-device_location.go     |     47 +
 .../aws-networkmanager-globalnetwork.go       |    114 +
 .../networkmanager/aws-networkmanager-link.go |    139 +
 .../aws-networkmanager-link_bandwidth.go      |     42 +
 .../aws-networkmanager-linkassociation.go     |    118 +
 .../networkmanager/aws-networkmanager-site.go |    124 +
 .../aws-networkmanager-site_location.go       |     47 +
 ...tworkmanager-transitgatewayregistration.go |    113 +
 .../aws-nimblestudio-launchprofile.go         |    143 +
 ...tudio-launchprofile_streamconfiguration.go |     52 +
 .../aws-nimblestudio-streamingimage.go        |    128 +
 .../nimblestudio/aws-nimblestudio-studio.go   |    133 +
 ...io-studio_studioencryptionconfiguration.go |     42 +
 .../aws-nimblestudio-studiocomponent.go       |    153 +
 ...ponent_activedirectorycomputerattribute.go |     42 +
 ...ocomponent_activedirectoryconfiguration.go |     47 +
 ...tudiocomponent_computefarmconfiguration.go |     42 +
 ...iocomponent_licenseserviceconfiguration.go |     37 +
 ...studiocomponent_scriptparameterkeyvalue.go |     42 +
 ...component_sharedfilesystemconfiguration.go |     57 +
 ...ocomponent_studiocomponentconfiguration.go |     50 +
 ...ent_studiocomponentinitializationscript.go |     52 +
 .../aws-opensearchservice-domain.go           |    179 +
 ...ice-domain_advancedsecurityoptionsinput.go |     47 +
 ...-opensearchservice-domain_clusterconfig.go |     82 +
 ...opensearchservice-domain_cognitooptions.go |     52 +
 ...rchservice-domain_domainendpointoptions.go |     57 +
 ...aws-opensearchservice-domain_ebsoptions.go |     52 +
 ...hservice-domain_encryptionatrestoptions.go |     42 +
 ...earchservice-domain_logpublishingoption.go |     42 +
 ...nsearchservice-domain_masteruseroptions.go |     47 +
 ...vice-domain_nodetonodeencryptionoptions.go |     37 +
 ...pensearchservice-domain_snapshotoptions.go |     37 +
 ...aws-opensearchservice-domain_vpcoptions.go |     42 +
 ...earchservice-domain_zoneawarenessconfig.go |     37 +
 .../opsworks/aws-opsworks-app.go              |    163 +
 .../opsworks/aws-opsworks-app_datasource.go   |     47 +
 .../aws-opsworks-app_environmentvariable.go   |     47 +
 .../opsworks/aws-opsworks-app_source.go       |     62 +
 .../aws-opsworks-app_sslconfiguration.go      |     47 +
 ...-opsworks-elasticloadbalancerattachment.go |    113 +
 .../opsworks/aws-opsworks-instance.go         |    208 +
 ...ws-opsworks-instance_blockdevicemapping.go |     52 +
 .../aws-opsworks-instance_ebsblockdevice.go   |     57 +
 ...-opsworks-instance_timebasedautoscaling.go |     67 +
 .../opsworks/aws-opsworks-layer.go            |    199 +
 ...ws-opsworks-layer_autoscalingthresholds.go |     62 +
 ...works-layer_lifecycleeventconfiguration.go |     35 +
 ...aws-opsworks-layer_loadbasedautoscaling.go |     47 +
 .../opsworks/aws-opsworks-layer_recipes.go    |     57 +
 ...sworks-layer_shutdowneventconfiguration.go |     42 +
 .../aws-opsworks-layer_volumeconfiguration.go |     67 +
 .../opsworks/aws-opsworks-stack.go            |    229 +
 .../aws-opsworks-stack_chefconfiguration.go   |     42 +
 .../opsworks/aws-opsworks-stack_elasticip.go  |     42 +
 .../aws-opsworks-stack_rdsdbinstance.go       |     47 +
 .../opsworks/aws-opsworks-stack_source.go     |     62 +
 ...psworks-stack_stackconfigurationmanager.go |     42 +
 .../opsworks/aws-opsworks-userprofile.go      |    123 +
 .../opsworks/aws-opsworks-volume.go           |    123 +
 .../opsworkscm/aws-opsworkscm-server.go       |    209 +
 .../aws-opsworkscm-server_engineattribute.go  |     42 +
 .../aws-panorama-applicationinstance.go       |    154 +
 ...cationinstance_manifestoverridespayload.go |     37 +
 ...ama-applicationinstance_manifestpayload.go |     37 +
 .../panorama/aws-panorama-package.go          |    114 +
 .../panorama/aws-panorama-packageversion.go   |    133 +
 .../pinpoint/aws-pinpoint-admchannel.go       |    123 +
 .../pinpoint/aws-pinpoint-apnschannel.go      |    148 +
 .../aws-pinpoint-apnssandboxchannel.go        |    148 +
 .../pinpoint/aws-pinpoint-apnsvoipchannel.go  |    148 +
 .../aws-pinpoint-apnsvoipsandboxchannel.go    |    148 +
 .../pinpoint/aws-pinpoint-app.go              |    113 +
 .../aws-pinpoint-applicationsettings.go       |    128 +
 ...npoint-applicationsettings_campaignhook.go |     47 +
 ...aws-pinpoint-applicationsettings_limits.go |     52 +
 ...-pinpoint-applicationsettings_quiettime.go |     42 +
 .../pinpoint/aws-pinpoint-baiduchannel.go     |    123 +
 .../pinpoint/aws-pinpoint-campaign.go         |    183 +
 ...ws-pinpoint-campaign_attributedimension.go |     42 +
 ...-pinpoint-campaign_campaignemailmessage.go |     52 +
 ...s-pinpoint-campaign_campaigneventfilter.go |     42 +
 .../aws-pinpoint-campaign_campaignhook.go     |     47 +
 ...-pinpoint-campaign_campaigninappmessage.go |     47 +
 ...ws-pinpoint-campaign_campaignsmsmessage.go |     62 +
 ...int-campaign_defaultbuttonconfiguration.go |     62 +
 .../aws-pinpoint-campaign_eventdimensions.go  |     45 +
 ...inpoint-campaign_inappmessagebodyconfig.go |     47 +
 ...ws-pinpoint-campaign_inappmessagebutton.go |     50 +
 ...s-pinpoint-campaign_inappmessagecontent.go |     62 +
 ...point-campaign_inappmessageheaderconfig.go |     47 +
 .../pinpoint/aws-pinpoint-campaign_limits.go  |     57 +
 .../pinpoint/aws-pinpoint-campaign_message.go |     92 +
 ...-pinpoint-campaign_messageconfiguration.go |     70 +
 .../aws-pinpoint-campaign_metricdimension.go  |     42 +
 ...nt-campaign_overridebuttonconfiguration.go |     42 +
 .../aws-pinpoint-campaign_quiettime.go        |     42 +
 .../aws-pinpoint-campaign_schedule.go         |     67 +
 .../aws-pinpoint-campaign_setdimension.go     |     42 +
 ...inpoint-campaign_writetreatmentresource.go |     57 +
 .../pinpoint/aws-pinpoint-emailchannel.go     |    133 +
 .../pinpoint/aws-pinpoint-emailtemplate.go    |    138 +
 .../pinpoint/aws-pinpoint-eventstream.go      |    118 +
 .../pinpoint/aws-pinpoint-gcmchannel.go       |    118 +
 .../pinpoint/aws-pinpoint-inapptemplate.go    |    133 +
 .../aws-pinpoint-inapptemplate_bodyconfig.go  |     47 +
 ...aws-pinpoint-inapptemplate_buttonconfig.go |     50 +
 ...napptemplate_defaultbuttonconfiguration.go |     62 +
 ...aws-pinpoint-inapptemplate_headerconfig.go |     47 +
 ...point-inapptemplate_inappmessagecontent.go |     62 +
 ...apptemplate_overridebuttonconfiguration.go |     42 +
 .../pinpoint/aws-pinpoint-pushtemplate.go     |    148 +
 ...emplate_androidpushnotificationtemplate.go |     72 +
 ...shtemplate_apnspushnotificationtemplate.go |     62 +
 ...emplate_defaultpushnotificationtemplate.go |     57 +
 .../pinpoint/aws-pinpoint-segment.go          |    128 +
 ...aws-pinpoint-segment_attributedimension.go |     42 +
 .../pinpoint/aws-pinpoint-segment_behavior.go |     35 +
 .../aws-pinpoint-segment_coordinates.go       |     42 +
 .../aws-pinpoint-segment_demographic.go       |     60 +
 .../pinpoint/aws-pinpoint-segment_gpspoint.go |     42 +
 .../pinpoint/aws-pinpoint-segment_groups.go   |     52 +
 .../pinpoint/aws-pinpoint-segment_location.go |     40 +
 .../pinpoint/aws-pinpoint-segment_recency.go  |     42 +
 .../aws-pinpoint-segment_segmentdimensions.go |     60 +
 .../aws-pinpoint-segment_segmentgroups.go     |     42 +
 .../aws-pinpoint-segment_setdimension.go      |     42 +
 .../aws-pinpoint-segment_sourcesegments.go    |     42 +
 .../pinpoint/aws-pinpoint-smschannel.go       |    123 +
 .../pinpoint/aws-pinpoint-smstemplate.go      |    128 +
 .../pinpoint/aws-pinpoint-voicechannel.go     |    113 +
 .../aws-pinpointemail-configurationset.go     |    133 +
 ...temail-configurationset_deliveryoptions.go |     37 +
 ...mail-configurationset_reputationoptions.go |     37 +
 ...ntemail-configurationset_sendingoptions.go |     37 +
 ...aws-pinpointemail-configurationset_tags.go |     42 +
 ...temail-configurationset_trackingoptions.go |     37 +
 ...temail-configurationseteventdestination.go |    118 +
 ...teventdestination_cloudwatchdestination.go |     35 +
 ...eventdestination_dimensionconfiguration.go |     47 +
 ...ionseteventdestination_eventdestination.go |     62 +
 ...tdestination_kinesisfirehosedestination.go |     42 +
 ...seteventdestination_pinpointdestination.go |     37 +
 ...ationseteventdestination_snsdestination.go |     37 +
 .../aws-pinpointemail-dedicatedippool.go      |    113 +
 .../aws-pinpointemail-dedicatedippool_tags.go |     42 +
 .../aws-pinpointemail-identity.go             |    128 +
 ...npointemail-identity_mailfromattributes.go |     42 +
 .../aws-pinpointemail-identity_tags.go        |     42 +
 .../cloudformation/policies/policies.go       |    118 +
 goformation/cloudformation/policies_test.go   |    257 +
 .../cloudformation/qldb/aws-qldb-ledger.go    |    129 +
 .../cloudformation/qldb/aws-qldb-stream.go    |    139 +
 .../aws-qldb-stream_kinesisconfiguration.go   |     42 +
 .../quicksight/aws-quicksight-analysis.go     |    149 +
 .../aws-quicksight-analysis_analysiserror.go  |     42 +
 ...uicksight-analysis_analysissourceentity.go |     35 +
 ...cksight-analysis_analysissourcetemplate.go |     42 +
 ...ws-quicksight-analysis_datasetreference.go |     42 +
 ...s-quicksight-analysis_datetimeparameter.go |     42 +
 ...ws-quicksight-analysis_decimalparameter.go |     42 +
 ...ws-quicksight-analysis_integerparameter.go |     42 +
 .../aws-quicksight-analysis_parameters.go     |     50 +
 ...-quicksight-analysis_resourcepermission.go |     42 +
 .../aws-quicksight-analysis_sheet.go          |     42 +
 ...aws-quicksight-analysis_stringparameter.go |     42 +
 .../quicksight/aws-quicksight-dashboard.go    |    154 +
 ...icksight-dashboard_adhocfilteringoption.go |     37 +
 ...sight-dashboard_dashboardpublishoptions.go |     45 +
 ...cksight-dashboard_dashboardsourceentity.go |     35 +
 ...sight-dashboard_dashboardsourcetemplate.go |     42 +
 ...s-quicksight-dashboard_datasetreference.go |     42 +
 ...-quicksight-dashboard_datetimeparameter.go |     42 +
 ...s-quicksight-dashboard_decimalparameter.go |     42 +
 ...-quicksight-dashboard_exporttocsvoption.go |     37 +
 ...s-quicksight-dashboard_integerparameter.go |     42 +
 .../aws-quicksight-dashboard_parameters.go    |     50 +
 ...quicksight-dashboard_resourcepermission.go |     42 +
 ...uicksight-dashboard_sheetcontrolsoption.go |     37 +
 ...ws-quicksight-dashboard_stringparameter.go |     42 +
 .../quicksight/aws-quicksight-dataset.go      |    169 +
 ...aws-quicksight-dataset_calculatedcolumn.go |     47 +
 ...cksight-dataset_castcolumntypeoperation.go |     47 +
 ...ws-quicksight-dataset_columndescription.go |     37 +
 .../aws-quicksight-dataset_columngroup.go     |     35 +
 ...sight-dataset_columnlevelpermissionrule.go |     42 +
 .../aws-quicksight-dataset_columntag.go       |     42 +
 ...icksight-dataset_createcolumnsoperation.go |     35 +
 .../aws-quicksight-dataset_customsql.go       |     52 +
 .../aws-quicksight-dataset_fieldfolder.go     |     42 +
 .../aws-quicksight-dataset_filteroperation.go |     37 +
 ...uicksight-dataset_geospatialcolumngroup.go |     47 +
 ...-quicksight-dataset_ingestionwaitpolicy.go |     42 +
 .../aws-quicksight-dataset_inputcolumn.go     |     42 +
 .../aws-quicksight-dataset_joininstruction.go |     62 +
 ...ws-quicksight-dataset_joinkeyproperties.go |     37 +
 .../aws-quicksight-dataset_logicaltable.go    |     47 +
 ...s-quicksight-dataset_logicaltablesource.go |     42 +
 .../aws-quicksight-dataset_outputcolumn.go    |     47 +
 .../aws-quicksight-dataset_physicaltable.go   |     45 +
 ...aws-quicksight-dataset_projectoperation.go |     37 +
 .../aws-quicksight-dataset_relationaltable.go |     57 +
 ...uicksight-dataset_renamecolumnoperation.go |     42 +
 ...s-quicksight-dataset_resourcepermission.go |     42 +
 ...sight-dataset_rowlevelpermissiondataset.go |     52 +
 .../aws-quicksight-dataset_s3source.go        |     47 +
 ...s-quicksight-dataset_tagcolumnoperation.go |     42 +
 ...s-quicksight-dataset_transformoperation.go |     60 +
 .../aws-quicksight-dataset_uploadsettings.go  |     57 +
 .../quicksight/aws-quicksight-datasource.go   |    164 +
 ...atasource_amazonelasticsearchparameters.go |     37 +
 ...t-datasource_amazonopensearchparameters.go |     37 +
 ...-quicksight-datasource_athenaparameters.go |     37 +
 ...-quicksight-datasource_auroraparameters.go |     47 +
 ...t-datasource_aurorapostgresqlparameters.go |     47 +
 ...ws-quicksight-datasource_credentialpair.go |     47 +
 ...ksight-datasource_datasourcecredentials.go |     42 +
 ...icksight-datasource_datasourceerrorinfo.go |     42 +
 ...cksight-datasource_datasourceparameters.go |    115 +
 ...cksight-datasource_manifestfilelocation.go |     42 +
 ...quicksight-datasource_mariadbparameters.go |     47 +
 ...s-quicksight-datasource_mysqlparameters.go |     47 +
 ...-quicksight-datasource_oracleparameters.go |     47 +
 ...cksight-datasource_postgresqlparameters.go |     47 +
 ...-quicksight-datasource_prestoparameters.go |     47 +
 ...aws-quicksight-datasource_rdsparameters.go |     42 +
 ...uicksight-datasource_redshiftparameters.go |     52 +
 ...uicksight-datasource_resourcepermission.go |     42 +
 .../aws-quicksight-datasource_s3parameters.go |     35 +
 ...icksight-datasource_snowflakeparameters.go |     47 +
 ...s-quicksight-datasource_sparkparameters.go |     42 +
 ...icksight-datasource_sqlserverparameters.go |     47 +
 ...aws-quicksight-datasource_sslproperties.go |     37 +
 ...uicksight-datasource_teradataparameters.go |     47 +
 ...ight-datasource_vpcconnectionproperties.go |     37 +
 .../quicksight/aws-quicksight-template.go     |    139 +
 ...ws-quicksight-template_datasetreference.go |     42 +
 ...-quicksight-template_resourcepermission.go |     42 +
 ...cksight-template_templatesourceanalysis.go |     42 +
 ...uicksight-template_templatesourceentity.go |     40 +
 ...cksight-template_templatesourcetemplate.go |     37 +
 .../quicksight/aws-quicksight-theme.go        |    144 +
 .../aws-quicksight-theme_borderstyle.go       |     37 +
 .../aws-quicksight-theme_datacolorpalette.go  |     47 +
 .../quicksight/aws-quicksight-theme_font.go   |     37 +
 .../aws-quicksight-theme_gutterstyle.go       |     37 +
 .../aws-quicksight-theme_marginstyle.go       |     37 +
 ...aws-quicksight-theme_resourcepermission.go |     42 +
 .../aws-quicksight-theme_sheetstyle.go        |     40 +
 ...aws-quicksight-theme_themeconfiguration.go |     50 +
 .../aws-quicksight-theme_tilelayoutstyle.go   |     40 +
 .../aws-quicksight-theme_tilestyle.go         |     35 +
 .../aws-quicksight-theme_typography.go        |     35 +
 .../aws-quicksight-theme_uicolorpalette.go    |    112 +
 .../ram/aws-ram-resourceshare.go              |    134 +
 .../cloudformation/rds/aws-rds-dbcluster.go   |    269 +
 .../rds/aws-rds-dbcluster_dbclusterrole.go    |     42 +
 .../aws-rds-dbcluster_scalingconfiguration.go |     52 +
 .../rds/aws-rds-dbclusterparametergroup.go    |    124 +
 .../cloudformation/rds/aws-rds-dbinstance.go  |    364 +
 .../rds/aws-rds-dbinstance_dbinstancerole.go  |     42 +
 .../aws-rds-dbinstance_processorfeature.go    |     42 +
 .../rds/aws-rds-dbparametergroup.go           |    124 +
 .../cloudformation/rds/aws-rds-dbproxy.go     |    153 +
 .../rds/aws-rds-dbproxy_authformat.go         |     57 +
 .../rds/aws-rds-dbproxy_tagformat.go          |     42 +
 .../rds/aws-rds-dbproxyendpoint.go            |    133 +
 .../rds/aws-rds-dbproxyendpoint_tagformat.go  |     42 +
 .../rds/aws-rds-dbproxytargetgroup.go         |    128 +
 ...p_connectionpoolconfigurationinfoformat.go |     57 +
 .../rds/aws-rds-dbsecuritygroup.go            |    124 +
 .../rds/aws-rds-dbsecuritygroup_ingress.go    |     52 +
 .../rds/aws-rds-dbsecuritygroupingress.go     |    128 +
 .../rds/aws-rds-dbsubnetgroup.go              |    124 +
 .../rds/aws-rds-eventsubscription.go          |    128 +
 .../rds/aws-rds-globalcluster.go              |    133 +
 .../cloudformation/rds/aws-rds-optiongroup.go |    129 +
 ...aws-rds-optiongroup_optionconfiguration.go |     62 +
 .../rds/aws-rds-optiongroup_optionsetting.go  |     42 +
 .../redshift/aws-redshift-cluster.go          |    339 +
 .../redshift/aws-redshift-cluster_endpoint.go |     42 +
 .../aws-redshift-cluster_loggingproperties.go |     42 +
 .../aws-redshift-clusterparametergroup.go     |    124 +
 ...edshift-clusterparametergroup_parameter.go |     42 +
 .../aws-redshift-clustersecuritygroup.go      |    114 +
 ...ws-redshift-clustersecuritygroupingress.go |    123 +
 .../aws-redshift-clustersubnetgroup.go        |    119 +
 .../redshift/aws-redshift-endpointaccess.go   |    128 +
 ...edshift-endpointaccess_vpcsecuritygroup.go |     42 +
 .../aws-redshift-endpointauthorization.go     |    123 +
 .../aws-redshift-eventsubscription.go         |    144 +
 .../redshift/aws-redshift-scheduledaction.go  |    143 +
 ...ift-scheduledaction_pauseclustermessage.go |     37 +
 ...ft-scheduledaction_resizeclustermessage.go |     57 +
 ...ft-scheduledaction_resumeclustermessage.go |     37 +
 ...ift-scheduledaction_scheduledactiontype.go |     45 +
 .../aws-refactorspaces-application.go         |    134 +
 ...spaces-application_apigatewayproxyinput.go |     42 +
 .../aws-refactorspaces-environment.go         |    124 +
 .../aws-refactorspaces-route.go               |    134 +
 ...-refactorspaces-route_uripathrouteinput.go |     52 +
 .../aws-refactorspaces-service.go             |    149 +
 ...actorspaces-service_lambdaendpointinput.go |     37 +
 ...refactorspaces-service_urlendpointinput.go |     42 +
 .../rekognition/aws-rekognition-project.go    |    108 +
 .../resiliencehub/aws-resiliencehub-app.go    |    133 +
 ...ws-resiliencehub-app_physicalresourceid.go |     52 +
 .../aws-resiliencehub-app_resourcemapping.go  |     52 +
 .../aws-resiliencehub-resiliencypolicy.go     |    133 +
 ...iencehub-resiliencypolicy_failurepolicy.go |     42 +
 .../aws-resourcegroups-group.go               |    134 +
 ...-resourcegroups-group_configurationitem.go |     42 +
 ...urcegroups-group_configurationparameter.go |     42 +
 .../aws-resourcegroups-group_query.go         |     47 +
 .../aws-resourcegroups-group_resourcequery.go |     42 +
 .../aws-resourcegroups-group_tagfilter.go     |     42 +
 .../robomaker/aws-robomaker-fleet.go          |    113 +
 .../robomaker/aws-robomaker-robot.go          |    128 +
 .../aws-robomaker-robotapplication.go         |    128 +
 ...ker-robotapplication_robotsoftwaresuite.go |     42 +
 ...robomaker-robotapplication_sourceconfig.go |     47 +
 .../aws-robomaker-robotapplicationversion.go  |    113 +
 .../aws-robomaker-simulationapplication.go    |    143 +
 ...r-simulationapplication_renderingengine.go |     42 +
 ...imulationapplication_robotsoftwaresuite.go |     42 +
 ...tionapplication_simulationsoftwaresuite.go |     42 +
 ...aker-simulationapplication_sourceconfig.go |     47 +
 ...-robomaker-simulationapplicationversion.go |    113 +
 .../rolesanywhere/aws-rolesanywhere-crl.go    |    138 +
 .../aws-rolesanywhere-profile.go              |    159 +
 .../aws-rolesanywhere-trustanchor.go          |    140 +
 ...nywhere-trustanchor_notificationsetting.go |     52 +
 .../aws-rolesanywhere-trustanchor_source.go   |     42 +
 ...ws-rolesanywhere-trustanchor_sourcedata.go |     42 +
 .../route53/aws-route53-dnssec.go             |    108 +
 .../route53/aws-route53-healthcheck.go        |    111 +
 ...aws-route53-healthcheck_alarmidentifier.go |     42 +
 ...s-route53-healthcheck_healthcheckconfig.go |    112 +
 .../aws-route53-healthcheck_healthchecktag.go |     42 +
 .../route53/aws-route53-hostedzone.go         |    128 +
 ...aws-route53-hostedzone_hostedzoneconfig.go |     37 +
 .../aws-route53-hostedzone_hostedzonetag.go   |     42 +
 ...s-route53-hostedzone_queryloggingconfig.go |     37 +
 .../route53/aws-route53-hostedzone_vpc.go     |     42 +
 .../route53/aws-route53-keysigningkey.go      |    123 +
 .../route53/aws-route53-recordset.go          |    178 +
 .../aws-route53-recordset_aliastarget.go      |     47 +
 .../aws-route53-recordset_geolocation.go      |     47 +
 .../route53/aws-route53-recordsetgroup.go     |    123 +
 .../aws-route53-recordsetgroup_aliastarget.go |     47 +
 .../aws-route53-recordsetgroup_geolocation.go |     47 +
 .../aws-route53-recordsetgroup_recordset.go   |    107 +
 .../aws-route53recoverycontrol-cluster.go     |    114 +
 ...recoverycontrol-cluster_clusterendpoint.go |     42 +
 ...aws-route53recoverycontrol-controlpanel.go |    119 +
 ...s-route53recoverycontrol-routingcontrol.go |    118 +
 .../aws-route53recoverycontrol-safetyrule.go  |    134 +
 ...ecoverycontrol-safetyrule_assertionrule.go |     42 +
 ...53recoverycontrol-safetyrule_gatingrule.go |     47 +
 ...53recoverycontrol-safetyrule_ruleconfig.go |     47 +
 .../aws-route53recoveryreadiness-cell.go      |    119 +
 ...route53recoveryreadiness-readinesscheck.go |    119 +
 ...-route53recoveryreadiness-recoverygroup.go |    119 +
 ...ws-route53recoveryreadiness-resourceset.go |    124 +
 ...readiness-resourceset_dnstargetresource.go |     57 +
 ...coveryreadiness-resourceset_nlbresource.go |     37 +
 ...readiness-resourceset_r53resourcerecord.go |     42 +
 ...3recoveryreadiness-resourceset_resource.go |     52 +
 ...eryreadiness-resourceset_targetresource.go |     40 +
 .../aws-route53resolver-firewalldomainlist.go |    124 +
 .../aws-route53resolver-firewallrulegroup.go  |    119 +
 ...resolver-firewallrulegroup_firewallrule.go |     67 +
 ...53resolver-firewallrulegroupassociation.go |    134 +
 .../aws-route53resolver-resolverconfig.go     |    113 +
 ...ws-route53resolver-resolverdnssecconfig.go |    108 +
 .../aws-route53resolver-resolverendpoint.go   |    129 +
 ...olver-resolverendpoint_ipaddressrequest.go |     42 +
 ...te53resolver-resolverqueryloggingconfig.go |    113 +
 ...r-resolverqueryloggingconfigassociation.go |    113 +
 .../aws-route53resolver-resolverrule.go       |    134 +
 ...te53resolver-resolverrule_targetaddress.go |     42 +
 ...route53resolver-resolverruleassociation.go |    118 +
 .../cloudformation/rum/aws-rum-appmonitor.go  |    129 +
 ...-rum-appmonitor_appmonitorconfiguration.go |     77 +
 .../cloudformation/s3/aws-s3-accesspoint.go   |    133 +
 ...esspoint_publicaccessblockconfiguration.go |     52 +
 .../s3/aws-s3-accesspoint_vpcconfiguration.go |     37 +
 .../cloudformation/s3/aws-s3-bucket.go        |    204 +
 ...3-bucket_abortincompletemultipartupload.go |     37 +
 .../aws-s3-bucket_accelerateconfiguration.go  |     37 +
 .../aws-s3-bucket_accesscontroltranslation.go |     37 +
 .../aws-s3-bucket_analyticsconfiguration.go   |     52 +
 .../s3/aws-s3-bucket_bucketencryption.go      |     35 +
 .../s3/aws-s3-bucket_corsconfiguration.go     |     35 +
 .../s3/aws-s3-bucket_corsrule.go              |     62 +
 .../s3/aws-s3-bucket_dataexport.go            |     42 +
 .../s3/aws-s3-bucket_defaultretention.go      |     47 +
 .../aws-s3-bucket_deletemarkerreplication.go  |     37 +
 .../s3/aws-s3-bucket_destination.go           |     52 +
 .../aws-s3-bucket_encryptionconfiguration.go  |     37 +
 .../aws-s3-bucket_eventbridgeconfiguration.go |     37 +
 .../s3/aws-s3-bucket_filterrule.go            |     42 +
 ...-bucket_intelligenttieringconfiguration.go |     57 +
 .../aws-s3-bucket_inventoryconfiguration.go   |     67 +
 .../s3/aws-s3-bucket_lambdaconfiguration.go   |     47 +
 .../aws-s3-bucket_lifecycleconfiguration.go   |     35 +
 .../s3/aws-s3-bucket_loggingconfiguration.go  |     42 +
 .../s3/aws-s3-bucket_metrics.go               |     42 +
 .../s3/aws-s3-bucket_metricsconfiguration.go  |     52 +
 ...s-s3-bucket_noncurrentversionexpiration.go |     42 +
 ...s-s3-bucket_noncurrentversiontransition.go |     47 +
 ...aws-s3-bucket_notificationconfiguration.go |     50 +
 .../s3/aws-s3-bucket_notificationfilter.go    |     35 +
 .../aws-s3-bucket_objectlockconfiguration.go  |     42 +
 .../s3/aws-s3-bucket_objectlockrule.go        |     35 +
 .../s3/aws-s3-bucket_ownershipcontrols.go     |     35 +
 .../s3/aws-s3-bucket_ownershipcontrolsrule.go |     37 +
 ...3-bucket_publicaccessblockconfiguration.go |     52 +
 .../s3/aws-s3-bucket_queueconfiguration.go    |     47 +
 .../s3/aws-s3-bucket_redirectallrequeststo.go |     42 +
 .../s3/aws-s3-bucket_redirectrule.go          |     57 +
 .../s3/aws-s3-bucket_replicamodifications.go  |     37 +
 .../aws-s3-bucket_replicationconfiguration.go |     42 +
 .../aws-s3-bucket_replicationdestination.go   |     67 +
 .../s3/aws-s3-bucket_replicationrule.go       |     72 +
 ...ws-s3-bucket_replicationruleandoperator.go |     42 +
 .../s3/aws-s3-bucket_replicationrulefilter.go |     47 +
 .../s3/aws-s3-bucket_replicationtime.go       |     42 +
 .../s3/aws-s3-bucket_replicationtimevalue.go  |     37 +
 .../s3/aws-s3-bucket_routingrule.go           |     40 +
 .../s3/aws-s3-bucket_routingrulecondition.go  |     42 +
 .../cloudformation/s3/aws-s3-bucket_rule.go   |    112 +
 .../s3/aws-s3-bucket_s3keyfilter.go           |     35 +
 ...s3-bucket_serversideencryptionbydefault.go |     42 +
 .../aws-s3-bucket_serversideencryptionrule.go |     42 +
 .../aws-s3-bucket_sourceselectioncriteria.go  |     40 +
 .../aws-s3-bucket_ssekmsencryptedobjects.go   |     37 +
 .../s3/aws-s3-bucket_storageclassanalysis.go  |     35 +
 .../s3/aws-s3-bucket_tagfilter.go             |     42 +
 .../s3/aws-s3-bucket_tiering.go               |     42 +
 .../s3/aws-s3-bucket_topicconfiguration.go    |     47 +
 .../s3/aws-s3-bucket_transition.go            |     47 +
 .../aws-s3-bucket_versioningconfiguration.go  |     37 +
 .../s3/aws-s3-bucket_websiteconfiguration.go  |     52 +
 .../cloudformation/s3/aws-s3-bucketpolicy.go  |    113 +
 .../s3/aws-s3-multiregionaccesspoint.go       |    118 +
 ...esspoint_publicaccessblockconfiguration.go |     52 +
 .../aws-s3-multiregionaccesspoint_region.go   |     37 +
 .../s3/aws-s3-multiregionaccesspointpolicy.go |    113 +
 .../cloudformation/s3/aws-s3-storagelens.go   |    112 +
 .../s3/aws-s3-storagelens_accountlevel.go     |     40 +
 .../s3/aws-s3-storagelens_activitymetrics.go  |     37 +
 .../s3/aws-s3-storagelens_awsorg.go           |     37 +
 .../s3/aws-s3-storagelens_bucketlevel.go      |     40 +
 .../aws-s3-storagelens_bucketsandregions.go   |     42 +
 .../aws-s3-storagelens_cloudwatchmetrics.go   |     37 +
 .../s3/aws-s3-storagelens_dataexport.go       |     40 +
 .../s3/aws-s3-storagelens_encryption.go       |     30 +
 .../s3/aws-s3-storagelens_prefixlevel.go      |     35 +
 ...3-storagelens_prefixlevelstoragemetrics.go |     42 +
 .../aws-s3-storagelens_s3bucketdestination.go |     62 +
 .../aws-s3-storagelens_selectioncriteria.go   |     47 +
 ...s3-storagelens_storagelensconfiguration.go |     72 +
 .../aws-s3objectlambda-accesspoint.go         |    113 +
 ...a-accesspoint_objectlambdaconfiguration.go |     52 +
 ...accesspoint_transformationconfiguration.go |     42 +
 .../aws-s3objectlambda-accesspointpolicy.go   |    113 +
 .../s3outposts/aws-s3outposts-accesspoint.go  |    123 +
 ...s3outposts-accesspoint_vpcconfiguration.go |     37 +
 .../s3outposts/aws-s3outposts-bucket.go       |    124 +
 ...s-bucket_abortincompletemultipartupload.go |     37 +
 ...3outposts-bucket_lifecycleconfiguration.go |     35 +
 .../s3outposts/aws-s3outposts-bucket_rule.go  |     62 +
 .../s3outposts/aws-s3outposts-bucketpolicy.go |    113 +
 .../s3outposts/aws-s3outposts-endpoint.go     |    128 +
 ...ws-s3outposts-endpoint_networkinterface.go |     37 +
 .../sagemaker/aws-sagemaker-app.go            |    134 +
 .../aws-sagemaker-app_resourcespec.go         |     47 +
 .../sagemaker/aws-sagemaker-appimageconfig.go |    119 +
 ...gemaker-appimageconfig_filesystemconfig.go |     47 +
 ...appimageconfig_kernelgatewayimageconfig.go |     40 +
 ...aws-sagemaker-appimageconfig_kernelspec.go |     42 +
 .../sagemaker/aws-sagemaker-coderepository.go |    119 +
 .../aws-sagemaker-coderepository_gitconfig.go |     47 +
 .../aws-sagemaker-dataqualityjobdefinition.go |    154 +
 ...-dataqualityjobdefinition_clusterconfig.go |     52 +
 ...ualityjobdefinition_constraintsresource.go |     37 +
 ...bdefinition_dataqualityappspecification.go |     62 +
 ...jobdefinition_dataqualitybaselineconfig.go |     47 +
 ...ualityjobdefinition_dataqualityjobinput.go |     35 +
 ...-dataqualityjobdefinition_endpointinput.go |     52 +
 ...taqualityjobdefinition_monitoringoutput.go |     35 +
 ...ityjobdefinition_monitoringoutputconfig.go |     42 +
 ...ualityjobdefinition_monitoringresources.go |     35 +
 ...-dataqualityjobdefinition_networkconfig.go |     47 +
 ...maker-dataqualityjobdefinition_s3output.go |     47 +
 ...qualityjobdefinition_statisticsresource.go |     37 +
 ...aqualityjobdefinition_stoppingcondition.go |     37 +
 ...aker-dataqualityjobdefinition_vpcconfig.go |     42 +
 .../sagemaker/aws-sagemaker-device.go         |    119 +
 .../sagemaker/aws-sagemaker-device_device.go  |     47 +
 .../sagemaker/aws-sagemaker-devicefleet.go    |    129 +
 ...-sagemaker-devicefleet_edgeoutputconfig.go |     42 +
 .../sagemaker/aws-sagemaker-domain.go         |    144 +
 .../aws-sagemaker-domain_customimage.go       |     47 +
 ...gemaker-domain_jupyterserverappsettings.go |     35 +
 ...gemaker-domain_kernelgatewayappsettings.go |     40 +
 .../aws-sagemaker-domain_resourcespec.go      |     47 +
 .../aws-sagemaker-domain_sharingsettings.go   |     47 +
 .../aws-sagemaker-domain_usersettings.go      |     57 +
 .../sagemaker/aws-sagemaker-endpoint.go       |    139 +
 .../sagemaker/aws-sagemaker-endpoint_alarm.go |     37 +
 ...s-sagemaker-endpoint_autorollbackconfig.go |     35 +
 ...agemaker-endpoint_bluegreenupdatepolicy.go |     47 +
 .../aws-sagemaker-endpoint_capacitysize.go    |     42 +
 ...aws-sagemaker-endpoint_deploymentconfig.go |     40 +
 ...sagemaker-endpoint_trafficroutingconfig.go |     52 +
 .../aws-sagemaker-endpoint_variantproperty.go |     37 +
 .../sagemaker/aws-sagemaker-endpointconfig.go |    134 +
 ...dpointconfig_asyncinferenceclientconfig.go |     37 +
 ...ker-endpointconfig_asyncinferenceconfig.go |     40 +
 ...config_asyncinferencenotificationconfig.go |     42 +
 ...dpointconfig_asyncinferenceoutputconfig.go |     47 +
 ...endpointconfig_capturecontenttypeheader.go |     42 +
 ...-sagemaker-endpointconfig_captureoption.go |     37 +
 ...emaker-endpointconfig_datacaptureconfig.go |     62 +
 ...emaker-endpointconfig_productionvariant.go |     67 +
 ...gemaker-endpointconfig_serverlessconfig.go |     42 +
 .../sagemaker/aws-sagemaker-featuregroup.go   |    149 +
 ...agemaker-featuregroup_featuredefinition.go |     42 +
 .../sagemaker/aws-sagemaker-image.go          |    129 +
 .../sagemaker/aws-sagemaker-imageversion.go   |    113 +
 .../sagemaker/aws-sagemaker-model.go          |    144 +
 ...aws-sagemaker-model_containerdefinition.go |     77 +
 .../aws-sagemaker-model_imageconfig.go        |     42 +
 ...agemaker-model_inferenceexecutionconfig.go |     37 +
 .../aws-sagemaker-model_multimodelconfig.go   |     37 +
 ...ws-sagemaker-model_repositoryauthconfig.go |     37 +
 .../aws-sagemaker-model_vpcconfig.go          |     42 +
 .../aws-sagemaker-modelbiasjobdefinition.go   |    154 +
 ...er-modelbiasjobdefinition_clusterconfig.go |     52 +
 ...elbiasjobdefinition_constraintsresource.go |     37 +
 ...er-modelbiasjobdefinition_endpointinput.go |     82 +
 ...jobdefinition_modelbiasappspecification.go |     47 +
 ...asjobdefinition_modelbiasbaselineconfig.go |     42 +
 ...odelbiasjobdefinition_modelbiasjobinput.go |     40 +
 ...definition_monitoringgroundtruths3input.go |     37 +
 ...modelbiasjobdefinition_monitoringoutput.go |     35 +
 ...iasjobdefinition_monitoringoutputconfig.go |     42 +
 ...elbiasjobdefinition_monitoringresources.go |     35 +
 ...er-modelbiasjobdefinition_networkconfig.go |     47 +
 ...gemaker-modelbiasjobdefinition_s3output.go |     47 +
 ...odelbiasjobdefinition_stoppingcondition.go |     37 +
 ...emaker-modelbiasjobdefinition_vpcconfig.go |     42 +
 ...emaker-modelexplainabilityjobdefinition.go |    154 +
 ...plainabilityjobdefinition_clusterconfig.go |     52 +
 ...bilityjobdefinition_constraintsresource.go |     37 +
 ...plainabilityjobdefinition_endpointinput.go |     67 +
 ...ion_modelexplainabilityappspecification.go |     47 +
 ...ition_modelexplainabilitybaselineconfig.go |     42 +
 ...bdefinition_modelexplainabilityjobinput.go |     35 +
 ...inabilityjobdefinition_monitoringoutput.go |     35 +
 ...ityjobdefinition_monitoringoutputconfig.go |     42 +
 ...bilityjobdefinition_monitoringresources.go |     35 +
 ...plainabilityjobdefinition_networkconfig.go |     47 +
 ...delexplainabilityjobdefinition_s3output.go |     47 +
 ...nabilityjobdefinition_stoppingcondition.go |     37 +
 ...elexplainabilityjobdefinition_vpcconfig.go |     42 +
 .../aws-sagemaker-modelpackagegroup.go        |    124 +
 ...aws-sagemaker-modelqualityjobdefinition.go |    154 +
 ...modelqualityjobdefinition_clusterconfig.go |     52 +
 ...ualityjobdefinition_constraintsresource.go |     37 +
 ...modelqualityjobdefinition_endpointinput.go |     77 +
 ...definition_modelqualityappspecification.go |     67 +
 ...obdefinition_modelqualitybaselineconfig.go |     42 +
 ...alityjobdefinition_modelqualityjobinput.go |     40 +
 ...definition_monitoringgroundtruths3input.go |     37 +
 ...elqualityjobdefinition_monitoringoutput.go |     35 +
 ...ityjobdefinition_monitoringoutputconfig.go |     42 +
 ...ualityjobdefinition_monitoringresources.go |     35 +
 ...modelqualityjobdefinition_networkconfig.go |     47 +
 ...aker-modelqualityjobdefinition_s3output.go |     47 +
 ...lqualityjobdefinition_stoppingcondition.go |     37 +
 ...ker-modelqualityjobdefinition_vpcconfig.go |     42 +
 .../aws-sagemaker-monitoringschedule.go       |    139 +
 ...maker-monitoringschedule_baselineconfig.go |     40 +
 ...emaker-monitoringschedule_clusterconfig.go |     52 +
 ...-monitoringschedule_constraintsresource.go |     37 +
 ...emaker-monitoringschedule_endpointinput.go |     52 +
 ...agemaker-monitoringschedule_environment.go |     30 +
 ...ringschedule_monitoringappspecification.go |     57 +
 ...ringschedule_monitoringexecutionsummary.go |     72 +
 ...aker-monitoringschedule_monitoringinput.go |     35 +
 ...ker-monitoringschedule_monitoringinputs.go |     35 +
 ...itoringschedule_monitoringjobdefinition.go |     77 +
 ...ker-monitoringschedule_monitoringoutput.go |     35 +
 ...nitoringschedule_monitoringoutputconfig.go |     42 +
 ...-monitoringschedule_monitoringresources.go |     35 +
 ...toringschedule_monitoringscheduleconfig.go |     52 +
 ...emaker-monitoringschedule_networkconfig.go |     47 +
 ...s-sagemaker-monitoringschedule_s3output.go |     47 +
 ...maker-monitoringschedule_scheduleconfig.go |     37 +
 ...r-monitoringschedule_statisticsresource.go |     37 +
 ...er-monitoringschedule_stoppingcondition.go |     37 +
 ...-sagemaker-monitoringschedule_vpcconfig.go |     42 +
 .../aws-sagemaker-notebookinstance.go         |    179 +
 ...gemaker-notebookinstancelifecycleconfig.go |    118 +
 ...cleconfig_notebookinstancelifecyclehook.go |     37 +
 .../sagemaker/aws-sagemaker-pipeline.go       |    134 +
 .../sagemaker/aws-sagemaker-project.go        |    124 +
 .../sagemaker/aws-sagemaker-userprofile.go    |    134 +
 .../aws-sagemaker-userprofile_customimage.go  |     47 +
 ...er-userprofile_jupyterserverappsettings.go |     35 +
 ...er-userprofile_kernelgatewayappsettings.go |     40 +
 .../aws-sagemaker-userprofile_resourcespec.go |     47 +
 ...s-sagemaker-userprofile_sharingsettings.go |     47 +
 .../aws-sagemaker-userprofile_usersettings.go |     57 +
 .../sagemaker/aws-sagemaker-workteam.go       |    129 +
 ...emaker-workteam_cognitomemberdefinition.go |     47 +
 ...aws-sagemaker-workteam_memberdefinition.go |     35 +
 ...aker-workteam_notificationconfiguration.go |     37 +
 .../cloudformation/sdb/aws-sdb-domain.go      |    108 +
 .../aws-secretsmanager-resourcepolicy.go      |    118 +
 .../aws-secretsmanager-rotationschedule.go    |    123 +
 ...r-rotationschedule_hostedrotationlambda.go |     77 +
 ...smanager-rotationschedule_rotationrules.go |     37 +
 .../aws-secretsmanager-secret.go              |    139 +
 ...retsmanager-secret_generatesecretstring.go |     82 +
 ...aws-secretsmanager-secret_replicaregion.go |     42 +
 ...s-secretsmanager-secrettargetattachment.go |    118 +
 .../securityhub/aws-securityhub-hub.go        |    106 +
 .../cloudformation/serverless/api_cors.go     |     69 +
 .../serverless/api_definitionuri.go           |     69 +
 .../serverless/application_location.go        |     69 +
 .../serverless/aws-serverless-api.go          |    178 +
 .../aws-serverless-api_accesslogsetting.go    |     42 +
 .../serverless/aws-serverless-api_auth.go     |     42 +
 .../aws-serverless-api_corsconfiguration.go   |     57 +
 .../aws-serverless-api_s3location.go          |     47 +
 .../serverless/aws-serverless-application.go  |    128 +
 ...verless-application_applicationlocation.go |     42 +
 .../serverless/aws-serverless-function.go     |    213 +
 ...aws-serverless-function_alexaskillevent.go |     37 +
 .../aws-serverless-function_apievent.go       |     47 +
 .../aws-serverless-function_bucketsampt.go    |     37 +
 ...erverless-function_cloudwatcheventevent.go |     47 +
 ...serverless-function_cloudwatchlogsevent.go |     42 +
 ...aws-serverless-function_collectionsampt.go |     37 +
 ...aws-serverless-function_deadletterqueue.go |     42 +
 ...erverless-function_deploymentpreference.go |     57 +
 ...s-serverless-function_destinationconfig.go |     35 +
 .../aws-serverless-function_domainsampt.go    |     37 +
 .../aws-serverless-function_dynamodbevent.go  |     82 +
 .../aws-serverless-function_emptysampt.go     |     30 +
 ...erverless-function_eventbridgeruleevent.go |     52 +
 .../aws-serverless-function_eventsource.go    |     42 +
 ...ws-serverless-function_filesystemconfig.go |     42 +
 ...serverless-function_functionenvironment.go |     37 +
 .../aws-serverless-function_functionsampt.go  |     37 +
 ...s-serverless-function_iampolicydocument.go |     35 +
 .../aws-serverless-function_identitysampt.go  |     37 +
 .../aws-serverless-function_iotruleevent.go   |     42 +
 .../aws-serverless-function_keysampt.go       |     37 +
 .../aws-serverless-function_kinesisevent.go   |     52 +
 .../aws-serverless-function_loggroupsampt.go  |     37 +
 .../aws-serverless-function_onfailure.go      |     42 +
 .../aws-serverless-function_queuesampt.go     |     37 +
 .../aws-serverless-function_s3event.go        |     47 +
 .../aws-serverless-function_s3keyfilter.go    |     35 +
 ...aws-serverless-function_s3keyfilterrule.go |     42 +
 .../aws-serverless-function_s3location.go     |     47 +
 ...erverless-function_s3notificationfilter.go |     35 +
 ...s-serverless-function_sampolicytemplate.go |    180 +
 .../aws-serverless-function_scheduleevent.go  |     42 +
 .../aws-serverless-function_snsevent.go       |     37 +
 .../aws-serverless-function_sqsevent.go       |     47 +
 ...s-serverless-function_statemachinesampt.go |     37 +
 .../aws-serverless-function_streamsampt.go    |     37 +
 .../aws-serverless-function_tablesampt.go     |     37 +
 ...ws-serverless-function_tablestreamsampt.go |     42 +
 .../aws-serverless-function_topicsampt.go     |     37 +
 .../aws-serverless-function_vpcconfig.go      |     42 +
 .../serverless/aws-serverless-layerversion.go |    133 +
 .../serverless/aws-serverless-simpletable.go  |    128 +
 .../aws-serverless-simpletable_primarykey.go  |     42 +
 ...rless-simpletable_provisionedthroughput.go |     42 +
 ...serverless-simpletable_ssespecification.go |     37 +
 .../serverless/aws-serverless-statemachine.go |    153 +
 .../aws-serverless-statemachine_apievent.go   |     47 +
 ...rless-statemachine_cloudwatcheventevent.go |     52 +
 ...ess-statemachine_cloudwatchlogsloggroup.go |     37 +
 ...rless-statemachine_eventbridgeruleevent.go |     52 +
 ...aws-serverless-statemachine_eventsource.go |     42 +
 ...s-serverless-statemachine_functionsampt.go |     37 +
 ...rverless-statemachine_iampolicydocument.go |     35 +
 ...-serverless-statemachine_logdestination.go |     35 +
 ...rless-statemachine_loggingconfiguration.go |     47 +
 .../aws-serverless-statemachine_s3location.go |     47 +
 ...rverless-statemachine_sampolicytemplate.go |     40 +
 ...s-serverless-statemachine_scheduleevent.go |     42 +
 ...rverless-statemachine_statemachinesampt.go |     37 +
 .../serverless/function_codeuri.go            |     69 +
 .../serverless/function_events.go             |     80 +
 .../serverless/function_policies.go           |    103 +
 .../serverless/function_properties.go         |    132 +
 .../serverless/statemachine_definitionuri.go  |     69 +
 .../serverless/statemachine_policies.go       |    103 +
 .../serverless/statemachine_properties.go     |     76 +
 ...s-servicecatalog-acceptedportfolioshare.go |    113 +
 ...ws-servicecatalog-cloudformationproduct.go |    159 +
 ...nproduct_provisioningartifactproperties.go |     52 +
 ...atalog-cloudformationprovisionedproduct.go |    164 +
 ...rovisionedproduct_provisioningparameter.go |     42 +
 ...visionedproduct_provisioningpreferences.go |     67 +
 ...icecatalog-launchnotificationconstraint.go |    128 +
 ...aws-servicecatalog-launchroleconstraint.go |    133 +
 ...servicecatalog-launchtemplateconstraint.go |    128 +
 .../aws-servicecatalog-portfolio.go           |    129 +
 ...cecatalog-portfolioprincipalassociation.go |    123 +
 ...vicecatalog-portfolioproductassociation.go |    123 +
 .../aws-servicecatalog-portfolioshare.go      |    123 +
 ...servicecatalog-resourceupdateconstraint.go |    128 +
 .../aws-servicecatalog-serviceaction.go       |    128 +
 ...talog-serviceaction_definitionparameter.go |     42 +
 ...servicecatalog-serviceactionassociation.go |    118 +
 .../aws-servicecatalog-stacksetconstraint.go  |    148 +
 .../aws-servicecatalog-tagoption.go           |    118 +
 ...aws-servicecatalog-tagoptionassociation.go |    113 +
 ...s-servicecatalogappregistry-application.go |    118 +
 ...ervicecatalogappregistry-attributegroup.go |    123 +
 ...ogappregistry-attributegroupassociation.go |    113 +
 ...ecatalogappregistry-resourceassociation.go |    118 +
 .../aws-servicediscovery-httpnamespace.go     |    119 +
 .../aws-servicediscovery-instance.go          |    118 +
 ...ws-servicediscovery-privatednsnamespace.go |    129 +
 ...nsnamespace_privatednspropertiesmutable.go |     35 +
 ...iscovery-privatednsnamespace_properties.go |     35 +
 ...ervicediscovery-privatednsnamespace_soa.go |     37 +
 ...aws-servicediscovery-publicdnsnamespace.go |    124 +
 ...discovery-publicdnsnamespace_properties.go |     35 +
 ...dnsnamespace_publicdnspropertiesmutable.go |     35 +
 ...servicediscovery-publicdnsnamespace_soa.go |     37 +
 .../aws-servicediscovery-service.go           |    144 +
 .../aws-servicediscovery-service_dnsconfig.go |     47 +
 .../aws-servicediscovery-service_dnsrecord.go |     42 +
 ...vicediscovery-service_healthcheckconfig.go |     47 +
 ...scovery-service_healthcheckcustomconfig.go |     37 +
 .../ses/aws-ses-configurationset.go           |    108 +
 ...ws-ses-configurationseteventdestination.go |    113 +
 ...teventdestination_cloudwatchdestination.go |     35 +
 ...eventdestination_dimensionconfiguration.go |     47 +
 ...ionseteventdestination_eventdestination.go |     57 +
 ...tdestination_kinesisfirehosedestination.go |     42 +
 .../cloudformation/ses/aws-ses-contactlist.go |    124 +
 .../ses/aws-ses-contactlist_topic.go          |     52 +
 .../ses/aws-ses-receiptfilter.go              |    106 +
 .../ses/aws-ses-receiptfilter_filter.go       |     42 +
 .../ses/aws-ses-receiptfilter_ipfilter.go     |     42 +
 .../cloudformation/ses/aws-ses-receiptrule.go |    118 +
 .../ses/aws-ses-receiptrule_action.go         |     65 +
 .../aws-ses-receiptrule_addheaderaction.go    |     42 +
 .../ses/aws-ses-receiptrule_bounceaction.go   |     57 +
 .../ses/aws-ses-receiptrule_lambdaaction.go   |     47 +
 .../ses/aws-ses-receiptrule_rule.go           |     62 +
 .../ses/aws-ses-receiptrule_s3action.go       |     52 +
 .../ses/aws-ses-receiptrule_snsaction.go      |     42 +
 .../ses/aws-ses-receiptrule_stopaction.go     |     42 +
 .../ses/aws-ses-receiptrule_workmailaction.go |     42 +
 .../ses/aws-ses-receiptruleset.go             |    108 +
 .../cloudformation/ses/aws-ses-template.go    |    106 +
 .../ses/aws-ses-template_template.go          |     52 +
 .../signer/aws-signer-profilepermission.go    |    128 +
 .../signer/aws-signer-signingprofile.go       |    119 +
 ...-signingprofile_signaturevalidityperiod.go |     42 +
 .../sns/aws-sns-subscription.go               |    148 +
 .../cloudformation/sns/aws-sns-topic.go       |    139 +
 .../sns/aws-sns-topic_subscription.go         |     42 +
 .../cloudformation/sns/aws-sns-topicpolicy.go |    113 +
 .../cloudformation/sqs/aws-sqs-queue.go       |    179 +
 .../cloudformation/sqs/aws-sqs-queuepolicy.go |    113 +
 .../cloudformation/ssm/aws-ssm-association.go |    183 +
 ...ation_instanceassociationoutputlocation.go |     35 +
 .../aws-ssm-association_parametervalues.go    |     37 +
 .../aws-ssm-association_s3outputlocation.go   |     47 +
 .../ssm/aws-ssm-association_target.go         |     42 +
 .../cloudformation/ssm/aws-ssm-document.go    |    149 +
 .../ssm/aws-ssm-document_attachmentssource.go |     47 +
 .../ssm/aws-ssm-document_documentrequires.go  |     42 +
 .../ssm/aws-ssm-maintenancewindow.go          |    159 +
 .../ssm/aws-ssm-maintenancewindowtarget.go    |    133 +
 ...aws-ssm-maintenancewindowtarget_targets.go |     42 +
 .../ssm/aws-ssm-maintenancewindowtask.go      |    173 +
 ...s-ssm-maintenancewindowtask_logginginfo.go |     47 +
 ...k_maintenancewindowautomationparameters.go |     42 +
 ...wtask_maintenancewindowlambdaparameters.go |     47 +
 ...k_maintenancewindowruncommandparameters.go |     77 +
 ...aintenancewindowstepfunctionsparameters.go |     42 +
 ...aintenancewindowtask_notificationconfig.go |     47 +
 .../aws-ssm-maintenancewindowtask_target.go   |     42 +
 ...ancewindowtask_taskinvocationparameters.go |     50 +
 .../cloudformation/ssm/aws-ssm-parameter.go   |    148 +
 .../ssm/aws-ssm-patchbaseline.go              |    169 +
 .../ssm/aws-ssm-patchbaseline_patchfilter.go  |     42 +
 .../aws-ssm-patchbaseline_patchfiltergroup.go |     35 +
 .../ssm/aws-ssm-patchbaseline_patchsource.go  |     47 +
 .../aws-ssm-patchbaseline_patchstringdate.go  |     30 +
 .../ssm/aws-ssm-patchbaseline_rule.go         |     57 +
 .../ssm/aws-ssm-patchbaseline_rulegroup.go    |     35 +
 .../ssm/aws-ssm-resourcedatasync.go           |    148 +
 ...resourcedatasync_awsorganizationssource.go |     42 +
 .../aws-ssm-resourcedatasync_s3destination.go |     57 +
 .../aws-ssm-resourcedatasync_syncsource.go    |     52 +
 .../ssmcontacts/aws-ssmcontacts-contact.go    |    123 +
 ...s-ssmcontacts-contact_channeltargetinfo.go |     42 +
 ...s-ssmcontacts-contact_contacttargetinfo.go |     42 +
 .../aws-ssmcontacts-contact_stage.go          |     42 +
 .../aws-ssmcontacts-contact_targets.go        |     40 +
 .../aws-ssmcontacts-contactchannel.go         |    128 +
 .../aws-ssmincidents-replicationset.go        |    113 +
 ...ents-replicationset_regionconfiguration.go |     37 +
 ...idents-replicationset_replicationregion.go |     42 +
 .../aws-ssmincidents-responseplan.go          |    139 +
 .../aws-ssmincidents-responseplan_action.go   |     35 +
 ...s-ssmincidents-responseplan_chatchannel.go |     37 +
 ...incidents-responseplan_incidenttemplate.go |     57 +
 ...nts-responseplan_notificationtargetitem.go |     37 +
 ...ssmincidents-responseplan_ssmautomation.go |     57 +
 ...-ssmincidents-responseplan_ssmparameter.go |     42 +
 .../cloudformation/sso/aws-sso-assignment.go  |    133 +
 ...anceaccesscontrolattributeconfiguration.go |    113 +
 ...uteconfiguration_accesscontrolattribute.go |     42 +
 ...nfiguration_accesscontrolattributevalue.go |     37 +
 .../sso/aws-sso-permissionset.go              |    144 +
 .../aws-stepfunctions-activity.go             |    113 +
 .../aws-stepfunctions-activity_tagsentry.go   |     42 +
 .../aws-stepfunctions-statemachine.go         |    153 +
 ...ons-statemachine_cloudwatchlogsloggroup.go |     37 +
 ...s-stepfunctions-statemachine_definition.go |     30 +
 ...ns-statemachine_definitionsubstitutions.go |     30 +
 ...epfunctions-statemachine_logdestination.go |     35 +
 ...tions-statemachine_loggingconfiguration.go |     47 +
 ...s-stepfunctions-statemachine_s3location.go |     47 +
 ...ws-stepfunctions-statemachine_tagsentry.go |     42 +
 ...tions-statemachine_tracingconfiguration.go |     37 +
 .../synthetics/aws-synthetics-canary.go       |    174 +
 .../aws-synthetics-canary_artifactconfig.go   |     35 +
 .../aws-synthetics-canary_basescreenshot.go   |     42 +
 .../synthetics/aws-synthetics-canary_code.go  |     57 +
 .../aws-synthetics-canary_runconfig.go        |     52 +
 .../aws-synthetics-canary_s3encryption.go     |     42 +
 .../aws-synthetics-canary_schedule.go         |     42 +
 .../aws-synthetics-canary_visualreference.go  |     42 +
 .../aws-synthetics-canary_vpcconfig.go        |     47 +
 goformation/cloudformation/template.go        |    200 +
 .../timestream/aws-timestream-database.go     |    119 +
 .../aws-timestream-scheduledquery.go          |    154 +
 ...estream-scheduledquery_dimensionmapping.go |     42 +
 ...scheduledquery_errorreportconfiguration.go |     35 +
 ...ream-scheduledquery_mixedmeasuremapping.go |     57 +
 ...duledquery_multimeasureattributemapping.go |     47 +
 ...eam-scheduledquery_multimeasuremappings.go |     42 +
 ...cheduledquery_notificationconfiguration.go |     35 +
 ...mestream-scheduledquery_s3configuration.go |     47 +
 ...am-scheduledquery_scheduleconfiguration.go |     37 +
 ...estream-scheduledquery_snsconfiguration.go |     37 +
 ...ream-scheduledquery_targetconfiguration.go |     35 +
 ...-scheduledquery_timestreamconfiguration.go |     67 +
 .../timestream/aws-timestream-table.go        |    124 +
 .../transfer/aws-transfer-server.go           |    164 +
 .../aws-transfer-server_endpointdetails.go    |     57 +
 ...transfer-server_identityproviderdetails.go |     52 +
 .../transfer/aws-transfer-server_protocol.go  |     30 +
 .../aws-transfer-server_protocoldetails.go    |     37 +
 .../aws-transfer-server_securitygroupid.go    |     30 +
 .../aws-transfer-server_workflowdetail.go     |     42 +
 .../aws-transfer-server_workflowdetails.go    |     35 +
 .../transfer/aws-transfer-user.go             |    154 +
 ...aws-transfer-user_homedirectorymapentry.go |     42 +
 .../aws-transfer-user_posixprofile.go         |     47 +
 .../aws-transfer-user_sshpublickey.go         |     30 +
 .../transfer/aws-transfer-workflow.go         |    124 +
 .../aws-transfer-workflow_workflowstep.go     |     57 +
 .../cloudformation/types/intrinsics.go        |    299 +
 goformation/cloudformation/types/types.go     |    194 +
 goformation/cloudformation/utils/utils.go     |     37 +
 .../waf/aws-waf-bytematchset.go               |    113 +
 .../aws-waf-bytematchset_bytematchtuple.go    |     57 +
 .../waf/aws-waf-bytematchset_fieldtomatch.go  |     42 +
 .../cloudformation/waf/aws-waf-ipset.go       |    113 +
 .../waf/aws-waf-ipset_ipsetdescriptor.go      |     42 +
 .../cloudformation/waf/aws-waf-rule.go        |    118 +
 .../waf/aws-waf-rule_predicate.go             |     47 +
 .../waf/aws-waf-sizeconstraintset.go          |    113 +
 .../aws-waf-sizeconstraintset_fieldtomatch.go |     42 +
 ...ws-waf-sizeconstraintset_sizeconstraint.go |     52 +
 .../waf/aws-waf-sqlinjectionmatchset.go       |    113 +
 ...s-waf-sqlinjectionmatchset_fieldtomatch.go |     42 +
 ...njectionmatchset_sqlinjectionmatchtuple.go |     42 +
 .../cloudformation/waf/aws-waf-webacl.go      |    123 +
 .../waf/aws-waf-webacl_activatedrule.go       |     47 +
 .../waf/aws-waf-webacl_wafaction.go           |     37 +
 .../cloudformation/waf/aws-waf-xssmatchset.go |    113 +
 .../waf/aws-waf-xssmatchset_fieldtomatch.go   |     42 +
 .../waf/aws-waf-xssmatchset_xssmatchtuple.go  |     42 +
 .../aws-wafregional-bytematchset.go           |    113 +
 ...wafregional-bytematchset_bytematchtuple.go |     57 +
 ...s-wafregional-bytematchset_fieldtomatch.go |     42 +
 .../aws-wafregional-geomatchset.go            |    113 +
 ...regional-geomatchset_geomatchconstraint.go |     42 +
 .../wafregional/aws-wafregional-ipset.go      |    113 +
 .../aws-wafregional-ipset_ipsetdescriptor.go  |     42 +
 .../aws-wafregional-ratebasedrule.go          |    128 +
 ...aws-wafregional-ratebasedrule_predicate.go |     47 +
 .../aws-wafregional-regexpatternset.go        |    113 +
 .../wafregional/aws-wafregional-rule.go       |    118 +
 .../aws-wafregional-rule_predicate.go         |     47 +
 .../aws-wafregional-sizeconstraintset.go      |    113 +
 ...regional-sizeconstraintset_fieldtomatch.go |     42 +
 ...gional-sizeconstraintset_sizeconstraint.go |     52 +
 .../aws-wafregional-sqlinjectionmatchset.go   |    113 +
 ...ional-sqlinjectionmatchset_fieldtomatch.go |     42 +
 ...njectionmatchset_sqlinjectionmatchtuple.go |     42 +
 .../wafregional/aws-wafregional-webacl.go     |    123 +
 .../aws-wafregional-webacl_action.go          |     37 +
 .../aws-wafregional-webacl_rule.go            |     47 +
 .../aws-wafregional-webaclassociation.go      |    113 +
 .../aws-wafregional-xssmatchset.go            |    113 +
 ...ws-wafregional-xssmatchset_fieldtomatch.go |     42 +
 ...s-wafregional-xssmatchset_xssmatchtuple.go |     42 +
 .../cloudformation/wafv2/aws-wafv2-ipset.go   |    134 +
 .../wafv2/aws-wafv2-loggingconfiguration.go   |    123 +
 ...wafv2-loggingconfiguration_fieldtomatch.go |     55 +
 .../wafv2/aws-wafv2-regexpatternset.go        |    129 +
 .../wafv2/aws-wafv2-rulegroup.go              |    144 +
 .../wafv2/aws-wafv2-rulegroup_andstatement.go |     35 +
 .../aws-wafv2-rulegroup_andstatementone.go    |     35 +
 .../aws-wafv2-rulegroup_andstatementtwo.go    |     35 +
 .../aws-wafv2-rulegroup_bytematchstatement.go |     57 +
 .../aws-wafv2-rulegroup_customresponsebody.go |     42 +
 .../wafv2/aws-wafv2-rulegroup_fieldtomatch.go |     70 +
 ...afv2-rulegroup_forwardedipconfiguration.go |     42 +
 .../aws-wafv2-rulegroup_geomatchstatement.go  |     42 +
 ...rulegroup_ipsetforwardedipconfiguration.go |     47 +
 ...wafv2-rulegroup_ipsetreferencestatement.go |     42 +
 .../wafv2/aws-wafv2-rulegroup_jsonbody.go     |     47 +
 .../aws-wafv2-rulegroup_jsonmatchpattern.go   |     42 +
 .../wafv2/aws-wafv2-rulegroup_label.go        |     37 +
 ...aws-wafv2-rulegroup_labelmatchstatement.go |     42 +
 .../wafv2/aws-wafv2-rulegroup_labelsummary.go |     37 +
 .../wafv2/aws-wafv2-rulegroup_notstatement.go |     35 +
 .../aws-wafv2-rulegroup_notstatementone.go    |     35 +
 .../aws-wafv2-rulegroup_notstatementtwo.go    |     35 +
 .../wafv2/aws-wafv2-rulegroup_orstatement.go  |     35 +
 .../aws-wafv2-rulegroup_orstatementone.go     |     35 +
 .../aws-wafv2-rulegroup_orstatementtwo.go     |     35 +
 .../aws-wafv2-rulegroup_ratebasedstatement.go |     52 +
 ...s-wafv2-rulegroup_ratebasedstatementone.go |     52 +
 ...s-wafv2-rulegroup_ratebasedstatementtwo.go |     52 +
 ...group_regexpatternsetreferencestatement.go |     47 +
 .../wafv2/aws-wafv2-rulegroup_rule.go         |     62 +
 .../wafv2/aws-wafv2-rulegroup_ruleaction.go   |     45 +
 ...wafv2-rulegroup_sizeconstraintstatement.go |     52 +
 .../aws-wafv2-rulegroup_sqlimatchstatement.go |     40 +
 .../wafv2/aws-wafv2-rulegroup_statement.go    |     90 +
 .../wafv2/aws-wafv2-rulegroup_statementone.go |     85 +
 .../aws-wafv2-rulegroup_statementthree.go     |     65 +
 .../wafv2/aws-wafv2-rulegroup_statementtwo.go |     85 +
 .../aws-wafv2-rulegroup_texttransformation.go |     42 +
 .../aws-wafv2-rulegroup_visibilityconfig.go   |     47 +
 .../aws-wafv2-rulegroup_xssmatchstatement.go  |     40 +
 .../cloudformation/wafv2/aws-wafv2-webacl.go  |    144 +
 .../wafv2/aws-wafv2-webacl_allowaction.go     |     35 +
 .../wafv2/aws-wafv2-webacl_andstatement.go    |     35 +
 .../wafv2/aws-wafv2-webacl_andstatementone.go |     35 +
 .../wafv2/aws-wafv2-webacl_andstatementtwo.go |     35 +
 .../wafv2/aws-wafv2-webacl_blockaction.go     |     35 +
 .../aws-wafv2-webacl_bytematchstatement.go    |     57 +
 .../wafv2/aws-wafv2-webacl_countaction.go     |     35 +
 .../aws-wafv2-webacl_customhttpheader.go      |     42 +
 .../aws-wafv2-webacl_customrequesthandling.go |     35 +
 .../wafv2/aws-wafv2-webacl_customresponse.go  |     47 +
 .../aws-wafv2-webacl_customresponsebody.go    |     42 +
 .../wafv2/aws-wafv2-webacl_defaultaction.go   |     40 +
 .../wafv2/aws-wafv2-webacl_excludedrule.go    |     37 +
 .../wafv2/aws-wafv2-webacl_fieldtomatch.go    |     70 +
 ...s-wafv2-webacl_forwardedipconfiguration.go |     42 +
 .../aws-wafv2-webacl_geomatchstatement.go     |     42 +
 ...v2-webacl_ipsetforwardedipconfiguration.go |     47 +
 ...ws-wafv2-webacl_ipsetreferencestatement.go |     42 +
 .../wafv2/aws-wafv2-webacl_jsonbody.go        |     47 +
 .../aws-wafv2-webacl_jsonmatchpattern.go      |     42 +
 .../wafv2/aws-wafv2-webacl_label.go           |     37 +
 .../aws-wafv2-webacl_labelmatchstatement.go   |     42 +
 ...-wafv2-webacl_managedrulegroupstatement.go |     57 +
 .../wafv2/aws-wafv2-webacl_notstatement.go    |     35 +
 .../wafv2/aws-wafv2-webacl_notstatementone.go |     35 +
 .../wafv2/aws-wafv2-webacl_notstatementtwo.go |     35 +
 .../wafv2/aws-wafv2-webacl_orstatement.go     |     35 +
 .../wafv2/aws-wafv2-webacl_orstatementone.go  |     35 +
 .../wafv2/aws-wafv2-webacl_orstatementtwo.go  |     35 +
 .../wafv2/aws-wafv2-webacl_overrideaction.go  |     40 +
 .../aws-wafv2-webacl_ratebasedstatement.go    |     52 +
 .../aws-wafv2-webacl_ratebasedstatementone.go |     52 +
 .../aws-wafv2-webacl_ratebasedstatementtwo.go |     52 +
 ...ebacl_regexpatternsetreferencestatement.go |     47 +
 .../wafv2/aws-wafv2-webacl_rule.go            |     67 +
 .../wafv2/aws-wafv2-webacl_ruleaction.go      |     45 +
 ...afv2-webacl_rulegroupreferencestatement.go |     42 +
 ...ws-wafv2-webacl_sizeconstraintstatement.go |     52 +
 .../aws-wafv2-webacl_sqlimatchstatement.go    |     40 +
 .../wafv2/aws-wafv2-webacl_statement.go       |    100 +
 .../wafv2/aws-wafv2-webacl_statementone.go    |     95 +
 .../wafv2/aws-wafv2-webacl_statementthree.go  |     75 +
 .../wafv2/aws-wafv2-webacl_statementtwo.go    |     95 +
 .../aws-wafv2-webacl_texttransformation.go    |     42 +
 .../aws-wafv2-webacl_visibilityconfig.go      |     47 +
 .../aws-wafv2-webacl_xssmatchstatement.go     |     40 +
 .../wafv2/aws-wafv2-webaclassociation.go      |    113 +
 .../wisdom/aws-wisdom-assistant.go            |    129 +
 ...stant_serversideencryptionconfiguration.go |     37 +
 .../wisdom/aws-wisdom-assistantassociation.go |    124 +
 ...om-assistantassociation_associationdata.go |     37 +
 .../wisdom/aws-wisdom-knowledgebase.go        |    139 +
 ...wledgebase_appintegrationsconfiguration.go |     42 +
 ...om-knowledgebase_renderingconfiguration.go |     37 +
 ...ebase_serversideencryptionconfiguration.go |     37 +
 ...isdom-knowledgebase_sourceconfiguration.go |     35 +
 .../aws-workspaces-connectionalias.go         |    114 +
 ...nectionalias_connectionaliasassociation.go |     52 +
 .../workspaces/aws-workspaces-workspace.go    |    144 +
 ...orkspaces-workspace_workspaceproperties.go |     57 +
 .../cloudformation/xray/aws-xray-group.go     |    123 +
 .../aws-xray-group_insightsconfiguration.go   |     42 +
 .../xray/aws-xray-samplingrule.go             |    128 +
 .../aws-xray-samplingrule_samplingrule.go     |     97 +
 ...ws-xray-samplingrule_samplingrulerecord.go |     47 +
 ...ws-xray-samplingrule_samplingruleupdate.go |     92 +
 goformation/example/go-to-yaml/main.go        |     45 +
 goformation/example/yaml-to-go/main.go        |     37 +
 goformation/example/yaml-to-go/template.yaml  |      7 +
 goformation/generate/create-pull-request.sh   |     88 +
 goformation/generate/generate.go              |    525 +
 goformation/generate/generate.sh              |     14 +
 goformation/generate/generate_suite_test.go   |     13 +
 goformation/generate/main.go                  |     42 +
 goformation/generate/naming.go                |     70 +
 goformation/generate/property.go              |    349 +
 goformation/generate/property_test.go         |    192 +
 goformation/generate/resource.go              |     81 +
 goformation/generate/resource_test.go         |    229 +
 goformation/generate/sam-2016-10-31.json      |   1706 +
 goformation/generate/spec.go                  |     37 +
 goformation/generate/templates/all.template   |     40 +
 .../templates/polymorphic-property.template   |    118 +
 .../generate/templates/resource.template      |    142 +
 .../templates/schema-property.template        |     94 +
 .../templates/schema-resource.template        |     76 +
 .../generate/templates/schema.template        |    205 +
 goformation/go.mod                            |     25 +
 goformation/go.sum                            |     87 +
 goformation/goformation.go                    |     77 +
 goformation/goformation_schema_test.go        |    187 +
 goformation/goformation_suite_test.go         |     13 +
 goformation/goformation_test.go               |   1228 +
 goformation/intrinsics/intrinsics.go          |     40 +
 .../intrinsics/intrinsics_suite_test.go       |     13 +
 goformation/intrinsics/tags.go                |     47 +
 goformation/schema/README.md                  |      5 +
 goformation/schema/cloudformation.go          | 124432 ++++++++++++++
 goformation/schema/cloudformation.schema.json | 124429 ++++++++++++++
 goformation/schema/sam.go                     | 126243 +++++++++++++++
 goformation/schema/sam.schema.json            | 126240 ++++++++++++++
 goformation/static/logo.png                   |    Bin 0 -> 195275 bytes
 goformation/test.go                           |      1 +
 .../invalid-sam-template-no-transform.json    |     14 +
 .../invalid-sam-template-wrong-transform.json |     15 +
 .../invalid-template-additional-property.json |     26 +
 ...template-additional-resource-property.json |     26 +
 ...id-template-empty-resource-properties.json |     23 +
 ...nvalid-template-invalid-resource-name.json |     12 +
 ...template-invalid-resource-subproperty.json |     20 +
 ...-template-missing-resource-properties.json |     22 +
 ...nvalid-template-missing-resource-type.json |     24 +
 .../invalid-template-missing-resources.json   |      4 +
 ...template-subproperty-missing-property.json |     24 +
 ...nvalid-template-unknown-resource-type.json |     25 +
 ...template-unknown-subproperty-property.json |     26 +
 goformation/test/json/resource-with-tags.json |     32 +
 goformation/test/json/valid-sam-template.json |     28 +
 .../valid-template-resource-attributes.json   |     54 +
 .../test/json/valid-template-with-fns.json    |     36 +
 goformation/test/json/valid-template.json     |     25 +
 goformation/test/yaml/api-swagger-plain.yaml  |   1111 +
 ...less-api-string-or-cors-configuration.yaml |     38 +
 .../test/yaml/aws-serverless-api-swagger.yaml |   1038 +
 goformation/test/yaml/aws-serverless-api.yaml |     75 +
 .../aws-serverless-function-2016-10-31.yaml   |     40 +
 .../aws-serverless-function-api-event.yaml    |     53 +
 .../aws-serverless-function-env-vars.yaml     |    104 +
 ...erless-function-string-or-s3-location.yaml |     25 +
 .../test/yaml/aws-serverless-simpletable.yaml |     16 +
 goformation/test/yaml/codestar/java.yml       |     41 +
 goformation/test/yaml/codestar/nodejs.yml     |     25 +
 goformation/test/yaml/codestar/python.yml     |     30 +
 goformation/test/yaml/custom-resource.yaml    |      8 +
 goformation/test/yaml/output_section.yaml     |     14 +
 .../sam-official-samples/alexa_skill/index.js |     33 +
 .../alexa_skill/template.yaml                 |     15 +
 .../api-swagger-intrinsic.yaml                |   1038 +
 .../api-swagger-plain.yaml                    |   1111 +
 .../sam-official-samples/api_backend/index.js |     87 +
 .../api_backend/template.yaml                 |     54 +
 .../api_swagger_cors/index.js                 |      8 +
 .../api_swagger_cors/swagger.yaml             |    105 +
 .../api_swagger_cors/template.yaml            |     46 +
 .../codestar-node4.3.yaml                     |     25 +
 .../encryption_proxy/README.MD                |     48 +
 .../encryption_proxy/decryption.py            |     49 +
 .../encryption_proxy/encryption.py            |     53 +
 .../encryption_proxy/template.yaml            |    104 +
 .../yaml/sam-official-samples/function.yaml   |     29 +
 .../sam-official-samples/hello_world/index.js |      6 +
 .../hello_world/template.yaml                 |     17 +
 .../inline_swagger/index.js                   |      6 +
 .../inline_swagger/template.yaml              |     41 +
 .../sam-official-samples/iot_backend/index.js |     30 +
 .../iot_backend/template.yaml                 |     29 +
 .../s3_processor/index.js                     |     26 +
 .../s3_processor/template.yaml                |     24 +
 .../sam-official-samples/schedule/index.js    |      7 +
 .../schedule/template.yaml                    |     15 +
 .../stream_processor/index.js                 |     11 +
 .../stream_processor/template.yaml            |     21 +
 .../sam-official-samples/templates/basic.yaml |     13 +
 .../templates/intrinsic.yaml                  |     29 +
 .../sam-official-samples/templates/wrong.yaml |     12 +
 goformation/test/yaml/transform-multiple.yaml |     11 +
 goformation/test/yaml/transform-single.yaml   |      9 +
 .../no-resources-section.yaml                 |      2 +
 .../test/yaml/yaml-intrinsic-tags.yaml        |     15 +
 pkg/actions/nodegroup/upgrade.go              |     10 +-
 pkg/automode/cluster_role_manager.go          |      2 +-
 pkg/cfn/builder/access_entry.go               |      4 +-
 pkg/cfn/builder/api.go                        |      7 +-
 pkg/cfn/builder/auto_mode.go                  |      7 +-
 pkg/cfn/builder/block_device_mapping.go       |      4 +-
 pkg/cfn/builder/builder_suite_test.go         |      3 +-
 pkg/cfn/builder/cloudwatch_logging.go         |      4 +-
 pkg/cfn/builder/cluster.go                    |     10 +-
 pkg/cfn/builder/export_test.go                |      2 +-
 pkg/cfn/builder/fargate.go                    |      5 +-
 pkg/cfn/builder/iam.go                        |      6 +-
 pkg/cfn/builder/iam_helper.go                 |      7 +-
 pkg/cfn/builder/karpenter.go                  |     11 +-
 pkg/cfn/builder/managed_launch_template.go    |      6 +-
 .../builder/managed_launch_template_test.go   |      4 +-
 pkg/cfn/builder/managed_nodegroup.go          |      7 +-
 .../managed_nodegroup_ami_type_test.go        |      4 +-
 pkg/cfn/builder/managed_nodegroup_test.go     |      7 +-
 pkg/cfn/builder/network_interfaces.go         |      4 +-
 pkg/cfn/builder/nodegroup.go                  |     10 +-
 pkg/cfn/builder/nodegroup_subnets_test.go     |      2 +-
 pkg/cfn/builder/nodegroup_test.go             |      3 +-
 pkg/cfn/builder/outputs.go                    |      3 +-
 pkg/cfn/builder/partition.go                  |      2 +-
 pkg/cfn/builder/statement.go                  |      2 +-
 pkg/cfn/builder/vpc.go                        |      6 +-
 pkg/cfn/builder/vpc_endpoint.go               |      4 +-
 pkg/cfn/builder/vpc_endpoint_test.go          |      4 +-
 pkg/cfn/builder/vpc_existing.go               |      3 +-
 pkg/cfn/builder/vpc_existing_test.go          |      3 +-
 pkg/cfn/builder/vpc_ipv4.go                   |      6 +-
 pkg/cfn/builder/vpc_ipv4_test.go              |      3 +-
 pkg/cfn/builder/vpc_ipv6.go                   |      6 +-
 pkg/cfn/manager/compat.go                     |      3 +-
 pkg/cfn/manager/template.go                   |      3 +-
 pkg/cfn/outputs/api.go                        |      5 +-
 pkg/cfn/template/iam_helpers.go               |      3 +-
 pkg/vpc/fakes/fake_vpc_importer.go            |      2 +-
 pkg/vpc/importer.go                           |      2 +-
 pkg/vpc/importer_test.go                      |      3 +-
 3998 files changed, 794536 insertions(+), 135 deletions(-)
 create mode 100644 goformation/.gitignore
 create mode 100644 goformation/AUTHORS.md
 create mode 100644 goformation/CHANGELOG.md
 create mode 100644 goformation/CODE_OF_CONDUCT.md
 create mode 100644 goformation/CONTRIBUTING.md
 create mode 100644 goformation/LICENSE
 create mode 100644 goformation/LOGO.md
 create mode 100644 goformation/NOTICE
 create mode 100644 goformation/README.md
 create mode 100644 goformation/cloudformation/README.md
 create mode 100644 goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer.go
 create mode 100644 goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_archiverule.go
 create mode 100644 goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_filter.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificate.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificate_apipassthrough.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificate_edipartyname.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificate_extendedkeyusage.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificate_extensions.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificate_generalname.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificate_keyusage.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificate_othername.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificate_policyinformation.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificate_policyqualifierinfo.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificate_qualifier.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificate_subject.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificate_validity.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificateauthority.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_accessdescription.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_accessmethod.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_crlconfiguration.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_csrextensions.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_edipartyname.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_generalname.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_keyusage.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_ocspconfiguration.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_othername.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_revocationconfiguration.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_subject.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-certificateauthorityactivation.go
 create mode 100644 goformation/cloudformation/acmpca/aws-acmpca-permission.go
 create mode 100644 goformation/cloudformation/all.go
 create mode 100644 goformation/cloudformation/amazonmq/aws-amazonmq-broker.go
 create mode 100644 goformation/cloudformation/amazonmq/aws-amazonmq-broker_configurationid.go
 create mode 100644 goformation/cloudformation/amazonmq/aws-amazonmq-broker_encryptionoptions.go
 create mode 100644 goformation/cloudformation/amazonmq/aws-amazonmq-broker_ldapservermetadata.go
 create mode 100644 goformation/cloudformation/amazonmq/aws-amazonmq-broker_loglist.go
 create mode 100644 goformation/cloudformation/amazonmq/aws-amazonmq-broker_maintenancewindow.go
 create mode 100644 goformation/cloudformation/amazonmq/aws-amazonmq-broker_tagsentry.go
 create mode 100644 goformation/cloudformation/amazonmq/aws-amazonmq-broker_user.go
 create mode 100644 goformation/cloudformation/amazonmq/aws-amazonmq-configuration.go
 create mode 100644 goformation/cloudformation/amazonmq/aws-amazonmq-configuration_tagsentry.go
 create mode 100644 goformation/cloudformation/amazonmq/aws-amazonmq-configurationassociation.go
 create mode 100644 goformation/cloudformation/amazonmq/aws-amazonmq-configurationassociation_configurationid.go
 create mode 100644 goformation/cloudformation/amplify/aws-amplify-app.go
 create mode 100644 goformation/cloudformation/amplify/aws-amplify-app_autobranchcreationconfig.go
 create mode 100644 goformation/cloudformation/amplify/aws-amplify-app_basicauthconfig.go
 create mode 100644 goformation/cloudformation/amplify/aws-amplify-app_customrule.go
 create mode 100644 goformation/cloudformation/amplify/aws-amplify-app_environmentvariable.go
 create mode 100644 goformation/cloudformation/amplify/aws-amplify-branch.go
 create mode 100644 goformation/cloudformation/amplify/aws-amplify-branch_basicauthconfig.go
 create mode 100644 goformation/cloudformation/amplify/aws-amplify-branch_environmentvariable.go
 create mode 100644 goformation/cloudformation/amplify/aws-amplify-domain.go
 create mode 100644 goformation/cloudformation/amplify/aws-amplify-domain_subdomainsetting.go
 create mode 100644 goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component.go
 create mode 100644 goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalue.go
 create mode 100644 goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalueproperties.go
 create mode 100644 goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentchild.go
 create mode 100644 goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentconditionproperty.go
 create mode 100644 goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentdataconfiguration.go
 create mode 100644 goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverrides.go
 create mode 100644 goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverridesvalue.go
 create mode 100644 goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperties.go
 create mode 100644 goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperty.go
 create mode 100644 goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentpropertybindingproperties.go
 create mode 100644 goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariant.go
 create mode 100644 goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariantvalues.go
 create mode 100644 goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_formbindings.go
 create mode 100644 goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_predicate.go
 create mode 100644 goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_sortproperty.go
 create mode 100644 goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme.go
 create mode 100644 goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalue.go
 create mode 100644 goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalues.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-account.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-apikey.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-apikey_stagekey.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-authorizer.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-basepathmapping.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-clientcertificate.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-deployment.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-deployment_accesslogsetting.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-deployment_canarysetting.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-deployment_deploymentcanarysettings.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-deployment_methodsetting.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-deployment_stagedescription.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-documentationpart.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-documentationpart_location.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-documentationversion.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-domainname.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-domainname_endpointconfiguration.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-domainname_mutualtlsauthentication.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-gatewayresponse.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-method.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-method_integration.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-method_integrationresponse.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-method_methodresponse.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-model.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-requestvalidator.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-resource.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-restapi.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-restapi_endpointconfiguration.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-restapi_s3location.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-stage.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-stage_accesslogsetting.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-stage_canarysetting.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-stage_methodsetting.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-usageplan.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-usageplan_apistage.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-usageplan_quotasettings.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-usageplan_throttlesettings.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-usageplankey.go
 create mode 100644 goformation/cloudformation/apigateway/aws-apigateway-vpclink.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api_bodys3location.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api_cors.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_accesslogsettings.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_integrationoverrides.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routeoverrides.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routesettings.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_stageoverrides.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apimapping.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer_jwtconfiguration.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-deployment.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_domainnameconfiguration.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_mutualtlsauthentication.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameter.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameterlist.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_tlsconfig.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integrationresponse.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-model.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-route.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-route_parameterconstraints.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse_parameterconstraints.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage_accesslogsettings.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage_routesettings.go
 create mode 100644 goformation/cloudformation/apigatewayv2/aws-apigatewayv2-vpclink.go
 create mode 100644 goformation/cloudformation/appconfig/aws-appconfig-application.go
 create mode 100644 goformation/cloudformation/appconfig/aws-appconfig-application_tags.go
 create mode 100644 goformation/cloudformation/appconfig/aws-appconfig-configurationprofile.go
 create mode 100644 goformation/cloudformation/appconfig/aws-appconfig-configurationprofile_tags.go
 create mode 100644 goformation/cloudformation/appconfig/aws-appconfig-configurationprofile_validators.go
 create mode 100644 goformation/cloudformation/appconfig/aws-appconfig-deployment.go
 create mode 100644 goformation/cloudformation/appconfig/aws-appconfig-deployment_tags.go
 create mode 100644 goformation/cloudformation/appconfig/aws-appconfig-deploymentstrategy.go
 create mode 100644 goformation/cloudformation/appconfig/aws-appconfig-deploymentstrategy_tags.go
 create mode 100644 goformation/cloudformation/appconfig/aws-appconfig-environment.go
 create mode 100644 goformation/cloudformation/appconfig/aws-appconfig-environment_monitors.go
 create mode 100644 goformation/cloudformation/appconfig/aws-appconfig-environment_tags.go
 create mode 100644 goformation/cloudformation/appconfig/aws-appconfig-hostedconfigurationversion.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_amplitudeconnectorprofilecredentials.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectoroauthrequest.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileconfig.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofilecredentials.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofilecredentials.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofileproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofilecredentials.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofileproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_googleanalyticsconnectorprofilecredentials.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofilecredentials.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofileproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofilecredentials.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofileproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_oauthproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofilecredentials.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofileproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofilecredentials.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofileproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofilecredentials.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofileproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofilecredentials.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofileproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_singularconnectorprofilecredentials.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofilecredentials.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofileproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofilecredentials.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofileproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_trendmicroconnectorprofilecredentials.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofilecredentials.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofileproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofilecredentials.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofileproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_aggregationconfig.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_amplitudesourceproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_connectoroperator.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_datadogsourceproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_destinationconnectorproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_destinationflowconfig.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_dynatracesourceproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_errorhandlingconfig.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_eventbridgedestinationproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_googleanalyticssourceproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_incrementalpullconfig.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_infornexussourceproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_lookoutmetricsdestinationproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_marketosourceproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_prefixconfig.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_redshiftdestinationproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_s3destinationproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_s3inputformatconfig.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_s3outputformatconfig.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_s3sourceproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_salesforcedestinationproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_salesforcesourceproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_sapodatasourceproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_scheduledtriggerproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_servicenowsourceproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_singularsourceproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_slacksourceproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_snowflakedestinationproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_sourceconnectorproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_sourceflowconfig.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_task.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_taskpropertiesobject.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_trendmicrosourceproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_triggerconfig.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_upsolverdestinationproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_upsolvers3outputformatconfig.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_veevasourceproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_zendeskdestinationproperties.go
 create mode 100644 goformation/cloudformation/appflow/aws-appflow-flow_zendesksourceproperties.go
 create mode 100644 goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration.go
 create mode 100644 goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventfilter.go
 create mode 100644 goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventintegrationassociation.go
 create mode 100644 goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_metadata.go
 create mode 100644 goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget.go
 create mode 100644 goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scalabletargetaction.go
 create mode 100644 goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scheduledaction.go
 create mode 100644 goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_suspendedstate.go
 create mode 100644 goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy.go
 create mode 100644 goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_customizedmetricspecification.go
 create mode 100644 goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_metricdimension.go
 create mode 100644 goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_predefinedmetricspecification.go
 create mode 100644 goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepadjustment.go
 create mode 100644 goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepscalingpolicyconfiguration.go
 create mode 100644 goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_targettrackingscalingpolicyconfiguration.go
 create mode 100644 goformation/cloudformation/applicationinsights/aws-applicationinsights-application.go
 create mode 100644 goformation/cloudformation/applicationinsights/aws-applicationinsights-application_alarm.go
 create mode 100644 goformation/cloudformation/applicationinsights/aws-applicationinsights-application_alarmmetric.go
 create mode 100644 goformation/cloudformation/applicationinsights/aws-applicationinsights-application_componentconfiguration.go
 create mode 100644 goformation/cloudformation/applicationinsights/aws-applicationinsights-application_componentmonitoringsetting.go
 create mode 100644 goformation/cloudformation/applicationinsights/aws-applicationinsights-application_configurationdetails.go
 create mode 100644 goformation/cloudformation/applicationinsights/aws-applicationinsights-application_customcomponent.go
 create mode 100644 goformation/cloudformation/applicationinsights/aws-applicationinsights-application_jmxprometheusexporter.go
 create mode 100644 goformation/cloudformation/applicationinsights/aws-applicationinsights-application_log.go
 create mode 100644 goformation/cloudformation/applicationinsights/aws-applicationinsights-application_logpattern.go
 create mode 100644 goformation/cloudformation/applicationinsights/aws-applicationinsights-application_logpatternset.go
 create mode 100644 goformation/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponentconfigurationdetails.go
 create mode 100644 goformation/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponenttypeconfiguration.go
 create mode 100644 goformation/cloudformation/applicationinsights/aws-applicationinsights-application_windowsevent.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamematch.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamerewrite.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutemetadatamatch.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayrouterangematch.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutespec.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutetarget.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutevirtualservice.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroute.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouteaction.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutematch.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutemetadata.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouterewrite.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroute.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteaction.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheader.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheadermatch.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutematch.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutepathrewrite.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteprefixrewrite.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouterewrite.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httppathmatch.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpqueryparametermatch.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_queryparameter.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-mesh.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-mesh_egressfilter.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-mesh_meshspec.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_duration.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_grpcretrypolicy.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_grpcroute.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_grpcrouteaction.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutematch.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadata.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadatamatchmethod.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_grpctimeout.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_headermatchmethod.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_httppathmatch.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_httpqueryparametermatch.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_httpretrypolicy.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_httproute.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_httprouteaction.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_httprouteheader.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_httproutematch.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_httptimeout.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_matchrange.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_queryparameter.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_routespec.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_tcproute.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_tcprouteaction.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_tcptimeout.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-route_weightedtarget.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenamematchers.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenames.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayaccesslog.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaybackenddefaults.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicy.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicytls.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclienttlscertificate.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayconnectionpool.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayfileaccesslog.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaygrpcconnectionpool.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhealthcheckpolicy.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttp2connectionpool.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttpconnectionpool.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistener.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertls.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsacmcertificate.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlscertificate.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsfilecertificate.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlssdscertificate.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontext.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontexttrust.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylogging.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayportmapping.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayspec.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontext.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextacmtrust.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextfiletrust.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextsdstrust.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontexttrust.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_accesslog.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapinstanceattribute.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapservicediscovery.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_backend.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_backenddefaults.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicy.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicytls.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clienttlscertificate.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_dnsservicediscovery.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_duration.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_fileaccesslog.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_grpctimeout.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_healthcheck.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_httptimeout.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listener.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertimeout.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertls.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsacmcertificate.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlscertificate.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsfilecertificate.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlssdscertificate.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontext.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontexttrust.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_logging.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_outlierdetection.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_portmapping.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_servicediscovery.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenamematchers.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenames.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tcptimeout.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontext.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextacmtrust.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextfiletrust.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextsdstrust.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontexttrust.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodeconnectionpool.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodegrpcconnectionpool.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttp2connectionpool.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttpconnectionpool.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodespec.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodetcpconnectionpool.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualservicebackend.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualrouter.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_portmapping.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterlistener.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterspec.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualservice.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualnodeserviceprovider.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualrouterserviceprovider.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualserviceprovider.go
 create mode 100644 goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualservicespec.go
 create mode 100644 goformation/cloudformation/apprunner/aws-apprunner-service.go
 create mode 100644 goformation/cloudformation/apprunner/aws-apprunner-service_authenticationconfiguration.go
 create mode 100644 goformation/cloudformation/apprunner/aws-apprunner-service_codeconfiguration.go
 create mode 100644 goformation/cloudformation/apprunner/aws-apprunner-service_codeconfigurationvalues.go
 create mode 100644 goformation/cloudformation/apprunner/aws-apprunner-service_coderepository.go
 create mode 100644 goformation/cloudformation/apprunner/aws-apprunner-service_encryptionconfiguration.go
 create mode 100644 goformation/cloudformation/apprunner/aws-apprunner-service_healthcheckconfiguration.go
 create mode 100644 goformation/cloudformation/apprunner/aws-apprunner-service_imageconfiguration.go
 create mode 100644 goformation/cloudformation/apprunner/aws-apprunner-service_imagerepository.go
 create mode 100644 goformation/cloudformation/apprunner/aws-apprunner-service_instanceconfiguration.go
 create mode 100644 goformation/cloudformation/apprunner/aws-apprunner-service_keyvaluepair.go
 create mode 100644 goformation/cloudformation/apprunner/aws-apprunner-service_sourcecodeversion.go
 create mode 100644 goformation/cloudformation/apprunner/aws-apprunner-service_sourceconfiguration.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-appblock.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-appblock_s3location.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-appblock_scriptdetails.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-application.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-application_s3location.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-applicationfleetassociation.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-directoryconfig.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-directoryconfig_serviceaccountcredentials.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-fleet.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-fleet_computecapacity.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-fleet_domainjoininfo.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-fleet_vpcconfig.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-imagebuilder.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-imagebuilder_accessendpoint.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-imagebuilder_domainjoininfo.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-imagebuilder_vpcconfig.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-stack.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-stack_accessendpoint.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-stack_applicationsettings.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-stack_storageconnector.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-stack_usersetting.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-stackfleetassociation.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-stackuserassociation.go
 create mode 100644 goformation/cloudformation/appstream/aws-appstream-user.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-apicache.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-apikey.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-datasource.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-datasource_authorizationconfig.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-datasource_awsiamconfig.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-datasource_deltasyncconfig.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-datasource_dynamodbconfig.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-datasource_elasticsearchconfig.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-datasource_httpconfig.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-datasource_lambdaconfig.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-datasource_opensearchserviceconfig.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-datasource_rdshttpendpointconfig.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-datasource_relationaldatabaseconfig.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-functionconfiguration.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-functionconfiguration_lambdaconflicthandlerconfig.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-functionconfiguration_syncconfig.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-graphqlapi.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationprovider.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationproviders.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-graphqlapi_cognitouserpoolconfig.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-graphqlapi_lambdaauthorizerconfig.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-graphqlapi_logconfig.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-graphqlapi_openidconnectconfig.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-graphqlapi_tags.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-graphqlapi_userpoolconfig.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-graphqlschema.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-resolver.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-resolver_cachingconfig.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-resolver_lambdaconflicthandlerconfig.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-resolver_pipelineconfig.go
 create mode 100644 goformation/cloudformation/appsync/aws-appsync-resolver_syncconfig.go
 create mode 100644 goformation/cloudformation/aps/aws-aps-rulegroupsnamespace.go
 create mode 100644 goformation/cloudformation/aps/aws-aps-workspace.go
 create mode 100644 goformation/cloudformation/ask/alexa-ask-skill.go
 create mode 100644 goformation/cloudformation/ask/alexa-ask-skill_authenticationconfiguration.go
 create mode 100644 goformation/cloudformation/ask/alexa-ask-skill_overrides.go
 create mode 100644 goformation/cloudformation/ask/alexa-ask-skill_skillpackage.go
 create mode 100644 goformation/cloudformation/athena/aws-athena-datacatalog.go
 create mode 100644 goformation/cloudformation/athena/aws-athena-datacatalog_tags.go
 create mode 100644 goformation/cloudformation/athena/aws-athena-namedquery.go
 create mode 100644 goformation/cloudformation/athena/aws-athena-preparedstatement.go
 create mode 100644 goformation/cloudformation/athena/aws-athena-workgroup.go
 create mode 100644 goformation/cloudformation/athena/aws-athena-workgroup_encryptionconfiguration.go
 create mode 100644 goformation/cloudformation/athena/aws-athena-workgroup_engineversion.go
 create mode 100644 goformation/cloudformation/athena/aws-athena-workgroup_resultconfiguration.go
 create mode 100644 goformation/cloudformation/athena/aws-athena-workgroup_resultconfigurationupdates.go
 create mode 100644 goformation/cloudformation/athena/aws-athena-workgroup_tags.go
 create mode 100644 goformation/cloudformation/athena/aws-athena-workgroup_workgroupconfiguration.go
 create mode 100644 goformation/cloudformation/athena/aws-athena-workgroup_workgroupconfigurationupdates.go
 create mode 100644 goformation/cloudformation/auditmanager/aws-auditmanager-assessment.go
 create mode 100644 goformation/cloudformation/auditmanager/aws-auditmanager-assessment_assessmentreportsdestination.go
 create mode 100644 goformation/cloudformation/auditmanager/aws-auditmanager-assessment_awsaccount.go
 create mode 100644 goformation/cloudformation/auditmanager/aws-auditmanager-assessment_awsservice.go
 create mode 100644 goformation/cloudformation/auditmanager/aws-auditmanager-assessment_delegation.go
 create mode 100644 goformation/cloudformation/auditmanager/aws-auditmanager-assessment_role.go
 create mode 100644 goformation/cloudformation/auditmanager/aws-auditmanager-assessment_scope.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratorcountrequest.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratortotalmemorymibrequest.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_baselineebsbandwidthmbpsrequest.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancerequirements.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancesdistribution.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplate.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplateoverrides.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplatespecification.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_lifecyclehookspecification.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorygibpervcpurequest.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorymibrequest.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_metricscollection.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_mixedinstancespolicy.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_networkinterfacecountrequest.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_notificationconfiguration.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_tagproperty.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_totallocalstoragegbrequest.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_vcpucountrequest.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevice.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevicemapping.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoption.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoptions.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-lifecyclehook.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_customizedmetricspecification.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_metricdimension.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predefinedmetricspecification.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingconfiguration.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingmetricspecification.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedloadmetric.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedmetricpair.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedscalingmetric.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_stepadjustment.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_targettrackingconfiguration.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-scheduledaction.go
 create mode 100644 goformation/cloudformation/autoscaling/aws-autoscaling-warmpool.go
 create mode 100644 goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan.go
 create mode 100644 goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_applicationsource.go
 create mode 100644 goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedloadmetricspecification.go
 create mode 100644 goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedscalingmetricspecification.go
 create mode 100644 goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_metricdimension.go
 create mode 100644 goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedloadmetricspecification.go
 create mode 100644 goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedscalingmetricspecification.go
 create mode 100644 goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_scalinginstruction.go
 create mode 100644 goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_tagfilter.go
 create mode 100644 goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_targettrackingconfiguration.go
 create mode 100644 goformation/cloudformation/backup/aws-backup-backupplan.go
 create mode 100644 goformation/cloudformation/backup/aws-backup-backupplan_advancedbackupsettingresourcetype.go
 create mode 100644 goformation/cloudformation/backup/aws-backup-backupplan_backupplanresourcetype.go
 create mode 100644 goformation/cloudformation/backup/aws-backup-backupplan_backupruleresourcetype.go
 create mode 100644 goformation/cloudformation/backup/aws-backup-backupplan_copyactionresourcetype.go
 create mode 100644 goformation/cloudformation/backup/aws-backup-backupplan_lifecycleresourcetype.go
 create mode 100644 goformation/cloudformation/backup/aws-backup-backupselection.go
 create mode 100644 goformation/cloudformation/backup/aws-backup-backupselection_backupselectionresourcetype.go
 create mode 100644 goformation/cloudformation/backup/aws-backup-backupselection_conditionresourcetype.go
 create mode 100644 goformation/cloudformation/backup/aws-backup-backupvault.go
 create mode 100644 goformation/cloudformation/backup/aws-backup-backupvault_lockconfigurationtype.go
 create mode 100644 goformation/cloudformation/backup/aws-backup-backupvault_notificationobjecttype.go
 create mode 100644 goformation/cloudformation/backup/aws-backup-framework.go
 create mode 100644 goformation/cloudformation/backup/aws-backup-framework_controlinputparameter.go
 create mode 100644 goformation/cloudformation/backup/aws-backup-framework_frameworkcontrol.go
 create mode 100644 goformation/cloudformation/backup/aws-backup-reportplan.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-computeenvironment.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-computeenvironment_computeresources.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-computeenvironment_ec2configurationobject.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-computeenvironment_launchtemplatespecification.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_authorizationconfig.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_containerproperties.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_device.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_efsvolumeconfiguration.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_environment.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_evaluateonexit.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_fargateplatformconfiguration.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_linuxparameters.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_logconfiguration.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_mountpoints.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_networkconfiguration.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_nodeproperties.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_noderangeproperty.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_resourcerequirement.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_retrystrategy.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_secret.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_timeout.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_tmpfs.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_ulimit.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_volumes.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobdefinition_volumeshost.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobqueue.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-jobqueue_computeenvironmentorder.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-schedulingpolicy.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-schedulingpolicy_fairsharepolicy.go
 create mode 100644 goformation/cloudformation/batch/aws-batch-schedulingpolicy_shareattributes.go
 create mode 100644 goformation/cloudformation/budgets/aws-budgets-budget.go
 create mode 100644 goformation/cloudformation/budgets/aws-budgets-budget_budgetdata.go
 create mode 100644 goformation/cloudformation/budgets/aws-budgets-budget_costtypes.go
 create mode 100644 goformation/cloudformation/budgets/aws-budgets-budget_notification.go
 create mode 100644 goformation/cloudformation/budgets/aws-budgets-budget_notificationwithsubscribers.go
 create mode 100644 goformation/cloudformation/budgets/aws-budgets-budget_spend.go
 create mode 100644 goformation/cloudformation/budgets/aws-budgets-budget_subscriber.go
 create mode 100644 goformation/cloudformation/budgets/aws-budgets-budget_timeperiod.go
 create mode 100644 goformation/cloudformation/budgets/aws-budgets-budgetsaction.go
 create mode 100644 goformation/cloudformation/budgets/aws-budgets-budgetsaction_actionthreshold.go
 create mode 100644 goformation/cloudformation/budgets/aws-budgets-budgetsaction_definition.go
 create mode 100644 goformation/cloudformation/budgets/aws-budgets-budgetsaction_iamactiondefinition.go
 create mode 100644 goformation/cloudformation/budgets/aws-budgets-budgetsaction_scpactiondefinition.go
 create mode 100644 goformation/cloudformation/budgets/aws-budgets-budgetsaction_ssmactiondefinition.go
 create mode 100644 goformation/cloudformation/budgets/aws-budgets-budgetsaction_subscriber.go
 create mode 100644 goformation/cloudformation/cassandra/aws-cassandra-keyspace.go
 create mode 100644 goformation/cloudformation/cassandra/aws-cassandra-table.go
 create mode 100644 goformation/cloudformation/cassandra/aws-cassandra-table_billingmode.go
 create mode 100644 goformation/cloudformation/cassandra/aws-cassandra-table_clusteringkeycolumn.go
 create mode 100644 goformation/cloudformation/cassandra/aws-cassandra-table_column.go
 create mode 100644 goformation/cloudformation/cassandra/aws-cassandra-table_encryptionspecification.go
 create mode 100644 goformation/cloudformation/cassandra/aws-cassandra-table_provisionedthroughput.go
 create mode 100644 goformation/cloudformation/ce/aws-ce-anomalymonitor.go
 create mode 100644 goformation/cloudformation/ce/aws-ce-anomalysubscription.go
 create mode 100644 goformation/cloudformation/ce/aws-ce-anomalysubscription_subscriber.go
 create mode 100644 goformation/cloudformation/ce/aws-ce-costcategory.go
 create mode 100644 goformation/cloudformation/certificatemanager/aws-certificatemanager-account.go
 create mode 100644 goformation/cloudformation/certificatemanager/aws-certificatemanager-account_expiryeventsconfiguration.go
 create mode 100644 goformation/cloudformation/certificatemanager/aws-certificatemanager-certificate.go
 create mode 100644 goformation/cloudformation/certificatemanager/aws-certificatemanager-certificate_domainvalidationoption.go
 create mode 100644 goformation/cloudformation/chatbot/aws-chatbot-slackchannelconfiguration.go
 create mode 100644 goformation/cloudformation/cloud9/aws-cloud9-environmentec2.go
 create mode 100644 goformation/cloudformation/cloud9/aws-cloud9-environmentec2_repository.go
 create mode 100644 goformation/cloudformation/cloudformation/aws-cloudformation-customresource.go
 create mode 100644 goformation/cloudformation/cloudformation/aws-cloudformation-macro.go
 create mode 100644 goformation/cloudformation/cloudformation/aws-cloudformation-moduledefaultversion.go
 create mode 100644 goformation/cloudformation/cloudformation/aws-cloudformation-moduleversion.go
 create mode 100644 goformation/cloudformation/cloudformation/aws-cloudformation-publictypeversion.go
 create mode 100644 goformation/cloudformation/cloudformation/aws-cloudformation-publisher.go
 create mode 100644 goformation/cloudformation/cloudformation/aws-cloudformation-resourcedefaultversion.go
 create mode 100644 goformation/cloudformation/cloudformation/aws-cloudformation-resourceversion.go
 create mode 100644 goformation/cloudformation/cloudformation/aws-cloudformation-resourceversion_loggingconfig.go
 create mode 100644 goformation/cloudformation/cloudformation/aws-cloudformation-stack.go
 create mode 100644 goformation/cloudformation/cloudformation/aws-cloudformation-stackset.go
 create mode 100644 goformation/cloudformation/cloudformation/aws-cloudformation-stackset_autodeployment.go
 create mode 100644 goformation/cloudformation/cloudformation/aws-cloudformation-stackset_deploymenttargets.go
 create mode 100644 goformation/cloudformation/cloudformation/aws-cloudformation-stackset_operationpreferences.go
 create mode 100644 goformation/cloudformation/cloudformation/aws-cloudformation-stackset_parameter.go
 create mode 100644 goformation/cloudformation/cloudformation/aws-cloudformation-stackset_stackinstances.go
 create mode 100644 goformation/cloudformation/cloudformation/aws-cloudformation-typeactivation.go
 create mode 100644 goformation/cloudformation/cloudformation/aws-cloudformation-typeactivation_loggingconfig.go
 create mode 100644 goformation/cloudformation/cloudformation/aws-cloudformation-waitcondition.go
 create mode 100644 goformation/cloudformation/cloudformation/aws-cloudformation-waitconditionhandle.go
 create mode 100644 goformation/cloudformation/cloudformation/tag.go
 create mode 100644 goformation/cloudformation/cloudformation_suite_test.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cachepolicyconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cookiesconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_headersconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_parametersincachekeyandforwardedtoorigin.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_querystringsconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity_cloudfrontoriginaccessidentityconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_cachebehavior.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_cookies.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_customerrorresponse.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_customoriginconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_defaultcachebehavior.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_distributionconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_forwardedvalues.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_functionassociation.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_georestriction.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_lambdafunctionassociation.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_legacycustomorigin.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_legacys3origin.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_logging.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origin.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origincustomheader.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroup.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupfailovercriteria.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmember.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmembers.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroups.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_originshield.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_restrictions.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_s3originconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_statuscodes.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-distribution_viewercertificate.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-function.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-function_functionconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-function_functionmetadata.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-keygroup.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-keygroup_keygroupconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_cookiesconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_headersconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_originrequestpolicyconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_querystringsconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-publickey.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-publickey_publickeyconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_endpoint.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_kinesisstreamconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowheaders.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowmethods.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolalloworigins.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolexposeheaders.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contentsecuritypolicy.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contenttypeoptions.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_corsconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheader.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheadersconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_frameoptions.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_referrerpolicy.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_responseheaderspolicyconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_securityheadersconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_stricttransportsecurity.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_xssprotection.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_logging.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_s3origin.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_streamingdistributionconfig.go
 create mode 100644 goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_trustedsigners.go
 create mode 100644 goformation/cloudformation/cloudtrail/aws-cloudtrail-trail.go
 create mode 100644 goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_dataresource.go
 create mode 100644 goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_eventselector.go
 create mode 100644 goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_insightselector.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_dimension.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metric.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricdataquery.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricstat.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_configuration.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_dimension.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metric.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataqueries.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataquery.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricmathanomalydetector.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricstat.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_range.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_singlemetricanomalydetector.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-compositealarm.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-dashboard.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-insightrule.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-insightrule_tags.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-metricstream.go
 create mode 100644 goformation/cloudformation/cloudwatch/aws-cloudwatch-metricstream_metricstreamfilter.go
 create mode 100644 goformation/cloudformation/codeartifact/aws-codeartifact-domain.go
 create mode 100644 goformation/cloudformation/codeartifact/aws-codeartifact-repository.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project_artifacts.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project_batchrestrictions.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project_buildstatusconfig.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project_cloudwatchlogsconfig.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project_environment.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project_environmentvariable.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project_filtergroup.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project_gitsubmodulesconfig.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project_logsconfig.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project_projectbuildbatchconfig.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project_projectcache.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project_projectfilesystemlocation.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project_projectsourceversion.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project_projecttriggers.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project_registrycredential.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project_s3logsconfig.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project_source.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project_sourceauth.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project_vpcconfig.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-project_webhookfilter.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-reportgroup.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-reportgroup_reportexportconfig.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-reportgroup_s3reportexportconfig.go
 create mode 100644 goformation/cloudformation/codebuild/aws-codebuild-sourcecredential.go
 create mode 100644 goformation/cloudformation/codecommit/aws-codecommit-repository.go
 create mode 100644 goformation/cloudformation/codecommit/aws-codecommit-repository_code.go
 create mode 100644 goformation/cloudformation/codecommit/aws-codecommit-repository_repositorytrigger.go
 create mode 100644 goformation/cloudformation/codecommit/aws-codecommit-repository_s3.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-application.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_minimumhealthyhosts.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedcanary.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedlinear.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_trafficroutingconfig.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarm.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarmconfiguration.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_autorollbackconfiguration.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_bluegreendeploymentconfiguration.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_blueinstanceterminationoption.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deployment.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentreadyoption.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentstyle.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagfilter.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagset.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagsetlistobject.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ecsservice.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_elbinfo.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_githublocation.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_greenfleetprovisioningoption.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_loadbalancerinfo.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagset.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagsetlistobject.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_revisionlocation.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_s3location.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_tagfilter.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_targetgroupinfo.go
 create mode 100644 goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_triggerconfig.go
 create mode 100644 goformation/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup.go
 create mode 100644 goformation/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup_channel.go
 create mode 100644 goformation/cloudformation/codegurureviewer/aws-codegurureviewer-repositoryassociation.go
 create mode 100644 goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype.go
 create mode 100644 goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_artifactdetails.go
 create mode 100644 goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_configurationproperties.go
 create mode 100644 goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_settings.go
 create mode 100644 goformation/cloudformation/codepipeline/aws-codepipeline-pipeline.go
 create mode 100644 goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_actiondeclaration.go
 create mode 100644 goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_actiontypeid.go
 create mode 100644 goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstore.go
 create mode 100644 goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstoremap.go
 create mode 100644 goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_blockerdeclaration.go
 create mode 100644 goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_encryptionkey.go
 create mode 100644 goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_inputartifact.go
 create mode 100644 goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_outputartifact.go
 create mode 100644 goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_stagedeclaration.go
 create mode 100644 goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_stagetransition.go
 create mode 100644 goformation/cloudformation/codepipeline/aws-codepipeline-webhook.go
 create mode 100644 goformation/cloudformation/codepipeline/aws-codepipeline-webhook_webhookauthconfiguration.go
 create mode 100644 goformation/cloudformation/codepipeline/aws-codepipeline-webhook_webhookfilterrule.go
 create mode 100644 goformation/cloudformation/codestar/aws-codestar-githubrepository.go
 create mode 100644 goformation/cloudformation/codestar/aws-codestar-githubrepository_code.go
 create mode 100644 goformation/cloudformation/codestar/aws-codestar-githubrepository_s3.go
 create mode 100644 goformation/cloudformation/codestarconnections/aws-codestarconnections-connection.go
 create mode 100644 goformation/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule.go
 create mode 100644 goformation/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule_target.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-identitypool.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-identitypool_cognitoidentityprovider.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-identitypool_cognitostreams.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-identitypool_pushsync.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_mappingrule.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rolemapping.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rulesconfigurationtype.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpool.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpool_accountrecoverysetting.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpool_admincreateuserconfig.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpool_customemailsender.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpool_customsmssender.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpool_deviceconfiguration.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpool_emailconfiguration.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpool_invitemessagetemplate.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpool_lambdaconfig.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpool_numberattributeconstraints.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpool_passwordpolicy.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpool_policies.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpool_recoveryoption.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpool_schemaattribute.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpool_smsconfiguration.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpool_stringattributeconstraints.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpool_usernameconfiguration.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpool_userpooladdons.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpool_verificationmessagetemplate.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpoolclient.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpoolclient_analyticsconfiguration.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpoolclient_tokenvalidityunits.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpooldomain.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpooldomain_customdomainconfigtype.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpoolgroup.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpoolidentityprovider.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpoolresourceserver.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpoolresourceserver_resourceserverscopetype.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractionstype.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractiontype.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoverriskconfigurationtype.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsactionstype.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsriskconfigurationtype.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyconfigurationtype.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyemailtype.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_riskexceptionconfigurationtype.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpooluicustomizationattachment.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpooluser.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpooluser_attributetype.go
 create mode 100644 goformation/cloudformation/cognito/aws-cognito-userpoolusertogroupattachment.go
 create mode 100644 goformation/cloudformation/config/aws-config-aggregationauthorization.go
 create mode 100644 goformation/cloudformation/config/aws-config-configrule.go
 create mode 100644 goformation/cloudformation/config/aws-config-configrule_scope.go
 create mode 100644 goformation/cloudformation/config/aws-config-configrule_source.go
 create mode 100644 goformation/cloudformation/config/aws-config-configrule_sourcedetail.go
 create mode 100644 goformation/cloudformation/config/aws-config-configurationaggregator.go
 create mode 100644 goformation/cloudformation/config/aws-config-configurationaggregator_accountaggregationsource.go
 create mode 100644 goformation/cloudformation/config/aws-config-configurationaggregator_organizationaggregationsource.go
 create mode 100644 goformation/cloudformation/config/aws-config-configurationrecorder.go
 create mode 100644 goformation/cloudformation/config/aws-config-configurationrecorder_recordinggroup.go
 create mode 100644 goformation/cloudformation/config/aws-config-conformancepack.go
 create mode 100644 goformation/cloudformation/config/aws-config-conformancepack_conformancepackinputparameter.go
 create mode 100644 goformation/cloudformation/config/aws-config-deliverychannel.go
 create mode 100644 goformation/cloudformation/config/aws-config-deliverychannel_configsnapshotdeliveryproperties.go
 create mode 100644 goformation/cloudformation/config/aws-config-organizationconfigrule.go
 create mode 100644 goformation/cloudformation/config/aws-config-organizationconfigrule_organizationcustomrulemetadata.go
 create mode 100644 goformation/cloudformation/config/aws-config-organizationconfigrule_organizationmanagedrulemetadata.go
 create mode 100644 goformation/cloudformation/config/aws-config-organizationconformancepack.go
 create mode 100644 goformation/cloudformation/config/aws-config-organizationconformancepack_conformancepackinputparameter.go
 create mode 100644 goformation/cloudformation/config/aws-config-remediationconfiguration.go
 create mode 100644 goformation/cloudformation/config/aws-config-remediationconfiguration_executioncontrols.go
 create mode 100644 goformation/cloudformation/config/aws-config-remediationconfiguration_remediationparametervalue.go
 create mode 100644 goformation/cloudformation/config/aws-config-remediationconfiguration_resourcevalue.go
 create mode 100644 goformation/cloudformation/config/aws-config-remediationconfiguration_ssmcontrols.go
 create mode 100644 goformation/cloudformation/config/aws-config-remediationconfiguration_staticvalue.go
 create mode 100644 goformation/cloudformation/config/aws-config-storedquery.go
 create mode 100644 goformation/cloudformation/connect/aws-connect-contactflow.go
 create mode 100644 goformation/cloudformation/connect/aws-connect-contactflowmodule.go
 create mode 100644 goformation/cloudformation/connect/aws-connect-hoursofoperation.go
 create mode 100644 goformation/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationconfig.go
 create mode 100644 goformation/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationtimeslice.go
 create mode 100644 goformation/cloudformation/connect/aws-connect-quickconnect.go
 create mode 100644 goformation/cloudformation/connect/aws-connect-quickconnect_phonenumberquickconnectconfig.go
 create mode 100644 goformation/cloudformation/connect/aws-connect-quickconnect_queuequickconnectconfig.go
 create mode 100644 goformation/cloudformation/connect/aws-connect-quickconnect_quickconnectconfig.go
 create mode 100644 goformation/cloudformation/connect/aws-connect-quickconnect_userquickconnectconfig.go
 create mode 100644 goformation/cloudformation/connect/aws-connect-user.go
 create mode 100644 goformation/cloudformation/connect/aws-connect-user_useridentityinfo.go
 create mode 100644 goformation/cloudformation/connect/aws-connect-user_userphoneconfig.go
 create mode 100644 goformation/cloudformation/connect/aws-connect-userhierarchygroup.go
 create mode 100644 goformation/cloudformation/cur/aws-cur-reportdefinition.go
 create mode 100644 goformation/cloudformation/custom_resource.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-domain.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-integration.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_connectoroperator.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_flowdefinition.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_incrementalpullconfig.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_marketosourceproperties.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_s3sourceproperties.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_salesforcesourceproperties.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_scheduledtriggerproperties.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_servicenowsourceproperties.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceconnectorproperties.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceflowconfig.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_task.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_taskpropertiesmap.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerconfig.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerproperties.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_zendesksourceproperties.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_fieldmap.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_keymap.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypefield.go
 create mode 100644 goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypekey.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-dataset.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-dataset_csvoptions.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-dataset_databaseinputdefinition.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-dataset_datacataloginputdefinition.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-dataset_datasetparameter.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-dataset_datetimeoptions.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-dataset_exceloptions.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-dataset_fileslimit.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-dataset_filterexpression.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-dataset_filtervalue.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-dataset_formatoptions.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-dataset_input.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-dataset_jsonoptions.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-dataset_metadata.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-dataset_pathoptions.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-dataset_pathparameter.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-dataset_s3location.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job_allowedstatistics.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job_columnselector.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job_columnstatisticsconfiguration.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job_csvoutputoptions.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job_databaseoutput.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job_databasetableoutputoptions.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job_datacatalogoutput.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job_entitydetectorconfiguration.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job_jobsample.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job_output.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job_outputformatoptions.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job_outputlocation.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job_parametermap.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job_profileconfiguration.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job_recipe.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job_s3location.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job_s3tableoutputoptions.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job_statisticoverride.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job_statisticsconfiguration.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-job_validationconfiguration.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-project.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-project_sample.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-recipe.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-recipe_action.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-recipe_conditionexpression.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-recipe_datacataloginputdefinition.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-recipe_parametermap.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-recipe_recipeparameters.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-recipe_recipestep.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-recipe_s3location.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-recipe_secondaryinput.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-ruleset.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-ruleset_columnselector.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-ruleset_rule.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-ruleset_substitutionvalue.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-ruleset_threshold.go
 create mode 100644 goformation/cloudformation/databrew/aws-databrew-schedule.go
 create mode 100644 goformation/cloudformation/datapipeline/aws-datapipeline-pipeline.go
 create mode 100644 goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_field.go
 create mode 100644 goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterattribute.go
 create mode 100644 goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterobject.go
 create mode 100644 goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parametervalue.go
 create mode 100644 goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelineobject.go
 create mode 100644 goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelinetag.go
 create mode 100644 goformation/cloudformation/datasync/aws-datasync-agent.go
 create mode 100644 goformation/cloudformation/datasync/aws-datasync-locationefs.go
 create mode 100644 goformation/cloudformation/datasync/aws-datasync-locationefs_ec2config.go
 create mode 100644 goformation/cloudformation/datasync/aws-datasync-locationfsxwindows.go
 create mode 100644 goformation/cloudformation/datasync/aws-datasync-locationhdfs.go
 create mode 100644 goformation/cloudformation/datasync/aws-datasync-locationhdfs_namenode.go
 create mode 100644 goformation/cloudformation/datasync/aws-datasync-locationhdfs_qopconfiguration.go
 create mode 100644 goformation/cloudformation/datasync/aws-datasync-locationnfs.go
 create mode 100644 goformation/cloudformation/datasync/aws-datasync-locationnfs_mountoptions.go
 create mode 100644 goformation/cloudformation/datasync/aws-datasync-locationnfs_onpremconfig.go
 create mode 100644 goformation/cloudformation/datasync/aws-datasync-locationobjectstorage.go
 create mode 100644 goformation/cloudformation/datasync/aws-datasync-locations3.go
 create mode 100644 goformation/cloudformation/datasync/aws-datasync-locations3_s3config.go
 create mode 100644 goformation/cloudformation/datasync/aws-datasync-locationsmb.go
 create mode 100644 goformation/cloudformation/datasync/aws-datasync-locationsmb_mountoptions.go
 create mode 100644 goformation/cloudformation/datasync/aws-datasync-task.go
 create mode 100644 goformation/cloudformation/datasync/aws-datasync-task_filterrule.go
 create mode 100644 goformation/cloudformation/datasync/aws-datasync-task_options.go
 create mode 100644 goformation/cloudformation/datasync/aws-datasync-task_taskschedule.go
 create mode 100644 goformation/cloudformation/dax/aws-dax-cluster.go
 create mode 100644 goformation/cloudformation/dax/aws-dax-cluster_ssespecification.go
 create mode 100644 goformation/cloudformation/dax/aws-dax-parametergroup.go
 create mode 100644 goformation/cloudformation/dax/aws-dax-subnetgroup.go
 create mode 100644 goformation/cloudformation/detective/aws-detective-graph.go
 create mode 100644 goformation/cloudformation/detective/aws-detective-memberinvitation.go
 create mode 100644 goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel.go
 create mode 100644 goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel_notificationchannelconfig.go
 create mode 100644 goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel_snschannelconfig.go
 create mode 100644 goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection.go
 create mode 100644 goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection_cloudformationcollectionfilter.go
 create mode 100644 goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection_resourcecollectionfilter.go
 create mode 100644 goformation/cloudformation/directoryservice/aws-directoryservice-microsoftad.go
 create mode 100644 goformation/cloudformation/directoryservice/aws-directoryservice-microsoftad_vpcsettings.go
 create mode 100644 goformation/cloudformation/directoryservice/aws-directoryservice-simplead.go
 create mode 100644 goformation/cloudformation/directoryservice/aws-directoryservice-simplead_vpcsettings.go
 create mode 100644 goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy.go
 create mode 100644 goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_action.go
 create mode 100644 goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_createrule.go
 create mode 100644 goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyaction.go
 create mode 100644 goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopydeprecaterule.go
 create mode 100644 goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyretainrule.go
 create mode 100644 goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyrule.go
 create mode 100644 goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_deprecaterule.go
 create mode 100644 goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_encryptionconfiguration.go
 create mode 100644 goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventparameters.go
 create mode 100644 goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventsource.go
 create mode 100644 goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_fastrestorerule.go
 create mode 100644 goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_parameters.go
 create mode 100644 goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_policydetails.go
 create mode 100644 goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_retainrule.go
 create mode 100644 goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_schedule.go
 create mode 100644 goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_sharerule.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-certificate.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-endpoint.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-endpoint_docdbsettings.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-endpoint_dynamodbsettings.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-endpoint_elasticsearchsettings.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-endpoint_ibmdb2settings.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-endpoint_kafkasettings.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-endpoint_kinesissettings.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-endpoint_microsoftsqlserversettings.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-endpoint_mongodbsettings.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-endpoint_mysqlsettings.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-endpoint_neptunesettings.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-endpoint_oraclesettings.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-endpoint_postgresqlsettings.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-endpoint_redissettings.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-endpoint_redshiftsettings.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-endpoint_s3settings.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-endpoint_sybasesettings.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-eventsubscription.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-replicationinstance.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-replicationsubnetgroup.go
 create mode 100644 goformation/cloudformation/dms/aws-dms-replicationtask.go
 create mode 100644 goformation/cloudformation/docdb/aws-docdb-dbcluster.go
 create mode 100644 goformation/cloudformation/docdb/aws-docdb-dbclusterparametergroup.go
 create mode 100644 goformation/cloudformation/docdb/aws-docdb-dbinstance.go
 create mode 100644 goformation/cloudformation/docdb/aws-docdb-dbsubnetgroup.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-globaltable.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_attributedefinition.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_capacityautoscalingsettings.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_contributorinsightsspecification.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_globalsecondaryindex.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_keyschema.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_localsecondaryindex.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_pointintimerecoveryspecification.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_projection.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_readprovisionedthroughputsettings.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaglobalsecondaryindexspecification.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaspecification.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicassespecification.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_ssespecification.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_streamspecification.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_targettrackingscalingpolicyconfiguration.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_timetolivespecification.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_writeprovisionedthroughputsettings.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-table.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-table_attributedefinition.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-table_contributorinsightsspecification.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-table_globalsecondaryindex.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-table_keyschema.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-table_kinesisstreamspecification.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-table_localsecondaryindex.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-table_pointintimerecoveryspecification.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-table_projection.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-table_provisionedthroughput.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-table_ssespecification.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-table_streamspecification.go
 create mode 100644 goformation/cloudformation/dynamodb/aws-dynamodb-table_timetolivespecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-capacityreservation.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-capacityreservation_tagspecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet_instancetypespecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet_tagspecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-carriergateway.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-carriergateway_tags.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-clientvpnauthorizationrule.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_certificateauthenticationrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientauthenticationrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientconnectoptions.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_connectionlogoptions.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_directoryserviceauthenticationrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_federatedauthenticationrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_tagspecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-clientvpnroute.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-clientvpntargetnetworkassociation.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-customergateway.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-dhcpoptions.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet_acceleratorcountrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet_acceleratortotalmemorymibrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet_baselineebsbandwidthmbpsrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet_capacityrebalance.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet_capacityreservationoptionsrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateconfigrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateoverridesrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplatespecificationrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet_instancerequirementsrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet_maintenancestrategies.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet_memorygibpervcpurequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet_memorymibrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet_networkinterfacecountrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet_ondemandoptionsrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet_placement.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet_spotoptionsrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet_tagspecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet_targetcapacityspecificationrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet_totallocalstoragegbrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ec2fleet_vcpucountrangerequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-egressonlyinternetgateway.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-eip.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-eipassociation.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-enclavecertificateiamroleassociation.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-flowlog.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-gatewayroutetableassociation.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-host.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-instance.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-instance_associationparameter.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-instance_blockdevicemapping.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-instance_cpuoptions.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-instance_creditspecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-instance_ebs.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-instance_elasticgpuspecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-instance_elasticinferenceaccelerator.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-instance_enclaveoptions.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-instance_hibernationoptions.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-instance_instanceipv6address.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-instance_launchtemplatespecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-instance_licensespecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-instance_networkinterface.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-instance_nodevice.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-instance_privateipaddressspecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-instance_ssmassociation.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-instance_volume.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-internetgateway.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ipam.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ipam_ipamoperatingregion.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ipamallocation.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ipampool.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ipampool_provisionedcidr.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-ipamscope.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_acceleratorcount.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_acceleratortotalmemorymib.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_baselineebsbandwidthmbps.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_blockdevicemapping.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationspecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationtarget.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_cpuoptions.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_creditspecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_ebs.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_elasticgpuspecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_enclaveoptions.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_hibernationoptions.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_iaminstanceprofile.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_instancemarketoptions.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_ipv6add.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatedata.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplateelasticinferenceaccelerator.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatetagspecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_licensespecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_memorygibpervcpu.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_memorymib.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_metadataoptions.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_monitoring.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_networkinterface.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_networkinterfacecount.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_placement.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_privateipadd.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_spotoptions.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_tagspecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_totallocalstoragegb.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-launchtemplate_vcpucount.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-localgatewayroute.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation_tags.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-natgateway.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkacl.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkaclentry.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkaclentry_icmp.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkaclentry_portrange.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_alternatepathhint.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisaclrule.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysiscomponent.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancerlistener.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancertarget.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysispacketheader.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisroutetableroute.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysissecuritygrouprule.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_explanation.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_pathcomponent.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_portrange.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkinsightspath.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkinterface.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkinterface_instanceipv6address.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkinterface_privateipaddressspecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkinterfaceattachment.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-networkinterfacepermission.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-placementgroup.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-prefixlist.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-prefixlist_entry.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-route.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-routetable.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-securitygroup.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-securitygroup_egress.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-securitygroup_ingress.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-securitygroupegress.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-securitygroupingress.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_acceleratorcountrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_acceleratortotalmemorymibrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_baselineebsbandwidthmbpsrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_blockdevicemapping.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancer.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancersconfig.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_ebsblockdevice.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_fleetlaunchtemplatespecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_groupidentifier.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_iaminstanceprofilespecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_instanceipv6address.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_instancenetworkinterfacespecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_instancerequirementsrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateconfig.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateoverrides.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_loadbalancersconfig.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_memorygibpervcpurequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_memorymibrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_networkinterfacecountrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_privateipaddressspecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_spotcapacityrebalance.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetlaunchspecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetmonitoring.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetrequestconfigdata.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleettagspecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_spotmaintenancestrategies.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_spotplacement.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_targetgroup.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_targetgroupsconfig.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_totallocalstoragegbrequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-spotfleet_vcpucountrangerequest.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-subnet.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-subnet_privatednsnameoptionsonlaunch.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-subnetcidrblock.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-subnetnetworkaclassociation.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-subnetroutetableassociation.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilter.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule_trafficmirrorportrange.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-trafficmirrorsession.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-trafficmirrortarget.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-transitgateway.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-transitgatewayattachment.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-transitgatewayconnect.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-transitgatewayconnect_transitgatewayconnectoptions.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomain.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomainassociation.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupmember.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupsource.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment_transitgatewaypeeringattachmentoptions.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-transitgatewayroute.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetable.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetableassociation.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetablepropagation.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-transitgatewayvpcattachment.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-volume.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-volumeattachment.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-vpc.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-vpccidrblock.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-vpcdhcpoptionsassociation.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-vpcendpoint.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-vpcendpointconnectionnotification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-vpcendpointservice.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-vpcendpointservicepermissions.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-vpcgatewayattachment.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-vpcpeeringconnection.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-vpnconnection.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-vpnconnection_vpntunneloptionsspecification.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-vpnconnectionroute.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-vpngateway.go
 create mode 100644 goformation/cloudformation/ec2/aws-ec2-vpngatewayroutepropagation.go
 create mode 100644 goformation/cloudformation/ecr/aws-ecr-publicrepository.go
 create mode 100644 goformation/cloudformation/ecr/aws-ecr-registrypolicy.go
 create mode 100644 goformation/cloudformation/ecr/aws-ecr-replicationconfiguration.go
 create mode 100644 goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationconfiguration.go
 create mode 100644 goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationdestination.go
 create mode 100644 goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationrule.go
 create mode 100644 goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_repositoryfilter.go
 create mode 100644 goformation/cloudformation/ecr/aws-ecr-repository.go
 create mode 100644 goformation/cloudformation/ecr/aws-ecr-repository_encryptionconfiguration.go
 create mode 100644 goformation/cloudformation/ecr/aws-ecr-repository_imagescanningconfiguration.go
 create mode 100644 goformation/cloudformation/ecr/aws-ecr-repository_lifecyclepolicy.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-capacityprovider.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-capacityprovider_autoscalinggroupprovider.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-capacityprovider_managedscaling.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-cluster.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-cluster_capacityproviderstrategyitem.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-cluster_clusterconfiguration.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-cluster_clustersettings.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-cluster_executecommandconfiguration.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-cluster_executecommandlogconfiguration.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations_capacityproviderstrategy.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-primarytaskset.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-service.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-service_awsvpcconfiguration.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-service_capacityproviderstrategyitem.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-service_deploymentcircuitbreaker.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-service_deploymentconfiguration.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-service_deploymentcontroller.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-service_loadbalancer.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-service_networkconfiguration.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-service_placementconstraint.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-service_placementstrategy.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-service_serviceregistry.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_authorizationconfig.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_containerdefinition.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_containerdependency.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_device.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_dockervolumeconfiguration.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_efsvolumeconfiguration.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_environmentfile.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_ephemeralstorage.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_firelensconfiguration.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_healthcheck.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_hostentry.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_hostvolumeproperties.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_inferenceaccelerator.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_kernelcapabilities.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_keyvaluepair.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_linuxparameters.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_logconfiguration.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_mountpoint.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_portmapping.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_proxyconfiguration.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_repositorycredentials.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_resourcerequirement.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_runtimeplatform.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_secret.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_systemcontrol.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_taskdefinitionplacementconstraint.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_tmpfs.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_ulimit.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_volume.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskdefinition_volumefrom.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskset.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskset_awsvpcconfiguration.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskset_loadbalancer.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskset_networkconfiguration.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskset_scale.go
 create mode 100644 goformation/cloudformation/ecs/aws-ecs-taskset_serviceregistry.go
 create mode 100644 goformation/cloudformation/efs/aws-efs-accesspoint.go
 create mode 100644 goformation/cloudformation/efs/aws-efs-accesspoint_accesspointtag.go
 create mode 100644 goformation/cloudformation/efs/aws-efs-accesspoint_creationinfo.go
 create mode 100644 goformation/cloudformation/efs/aws-efs-accesspoint_posixuser.go
 create mode 100644 goformation/cloudformation/efs/aws-efs-accesspoint_rootdirectory.go
 create mode 100644 goformation/cloudformation/efs/aws-efs-filesystem.go
 create mode 100644 goformation/cloudformation/efs/aws-efs-filesystem_backuppolicy.go
 create mode 100644 goformation/cloudformation/efs/aws-efs-filesystem_elasticfilesystemtag.go
 create mode 100644 goformation/cloudformation/efs/aws-efs-filesystem_lifecyclepolicy.go
 create mode 100644 goformation/cloudformation/efs/aws-efs-mounttarget.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-access-config.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-access-entry.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-access-entry_access_scope.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-access-entry_policy.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-addon.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-cluster.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-cluster_clusterlogging.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-cluster_compute_config.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-cluster_controlplaneplacement.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-cluster_elastic_loadbalancing.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-cluster_encryptionconfig.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-cluster_kubernetesnetworkconfig.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-cluster_logging.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-cluster_loggingtypeconfig.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-cluster_outpostconfig.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-cluster_provider.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-cluster_remotenetworks.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-cluster_resourcesvpcconfig.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-cluster_storage_config.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-cluster_zonal-shift.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-fargateprofile.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-fargateprofile_label.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-fargateprofile_selector.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-identityproviderconfig.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-identityproviderconfig_oidcidentityproviderconfig.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-identityproviderconfig_requiredclaim.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-nodegroup.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-nodegroup_launchtemplatespecification.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-nodegroup_remoteaccess.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-nodegroup_scalingconfig.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-nodegroup_taint.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-nodegroup_taints.go
 create mode 100644 goformation/cloudformation/eks/aws-eks-nodegroup_updateconfig.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-cachecluster.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-cachecluster_cloudwatchlogsdestinationdetails.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-cachecluster_destinationdetails.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-cachecluster_kinesisfirehosedestinationdetails.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-cachecluster_logdeliveryconfigurationrequest.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_globalreplicationgroupmember.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_regionalconfiguration.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_reshardingconfiguration.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-parametergroup.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-replicationgroup.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_cloudwatchlogsdestinationdetails.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_destinationdetails.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_kinesisfirehosedestinationdetails.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_logdeliveryconfigurationrequest.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_nodegroupconfiguration.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-securitygroup.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-securitygroupingress.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-subnetgroup.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-user.go
 create mode 100644 goformation/cloudformation/elasticache/aws-elasticache-usergroup.go
 create mode 100644 goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application.go
 create mode 100644 goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationresourcelifecycleconfig.go
 create mode 100644 goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationversionlifecycleconfig.go
 create mode 100644 goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxagerule.go
 create mode 100644 goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxcountrule.go
 create mode 100644 goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion.go
 create mode 100644 goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion_sourcebundle.go
 create mode 100644 goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate.go
 create mode 100644 goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_configurationoptionsetting.go
 create mode 100644 goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_sourceconfiguration.go
 create mode 100644 goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment.go
 create mode 100644 goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_optionsetting.go
 create mode 100644 goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_tier.go
 create mode 100644 goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer.go
 create mode 100644 goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_accessloggingpolicy.go
 create mode 100644 goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_appcookiestickinesspolicy.go
 create mode 100644 goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectiondrainingpolicy.go
 create mode 100644 goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectionsettings.go
 create mode 100644 goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_healthcheck.go
 create mode 100644 goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_lbcookiestickinesspolicy.go
 create mode 100644 goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_listeners.go
 create mode 100644 goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_policies.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_action.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticatecognitoconfig.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticateoidcconfig.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_certificate.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_fixedresponseconfig.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_forwardconfig.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_redirectconfig.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgroupstickinessconfig.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgrouptuple.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate_certificate.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_action.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticatecognitoconfig.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticateoidcconfig.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_fixedresponseconfig.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_forwardconfig.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_hostheaderconfig.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httpheaderconfig.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httprequestmethodconfig.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_pathpatternconfig.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringconfig.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringkeyvalue.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_redirectconfig.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_rulecondition.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_sourceipconfig.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgroupstickinessconfig.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgrouptuple.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_loadbalancerattribute.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_subnetmapping.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_matcher.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetdescription.go
 create mode 100644 goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetgroupattribute.go
 create mode 100644 goformation/cloudformation/elasticsearch/aws-elasticsearch-domain.go
 create mode 100644 goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_advancedsecurityoptionsinput.go
 create mode 100644 goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_cognitooptions.go
 create mode 100644 goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_coldstorageoptions.go
 create mode 100644 goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_domainendpointoptions.go
 create mode 100644 goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_ebsoptions.go
 create mode 100644 goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_elasticsearchclusterconfig.go
 create mode 100644 goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_encryptionatrestoptions.go
 create mode 100644 goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_logpublishingoption.go
 create mode 100644 goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_masteruseroptions.go
 create mode 100644 goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_nodetonodeencryptionoptions.go
 create mode 100644 goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_snapshotoptions.go
 create mode 100644 goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_vpcoptions.go
 create mode 100644 goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_zoneawarenessconfig.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_application.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_autoscalingpolicy.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_bootstrapactionconfig.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_cloudwatchalarmdefinition.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_computelimits.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_configuration.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_ebsblockdeviceconfig.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_ebsconfiguration.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_hadoopjarstepconfig.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_instancefleetconfig.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_instancefleetprovisioningspecifications.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_instancegroupconfig.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_instancetypeconfig.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_jobflowinstancesconfig.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_kerberosattributes.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_keyvalue.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_managedscalingpolicy.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_metricdimension.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_ondemandprovisioningspecification.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_placementtype.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_scalingaction.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_scalingconstraints.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_scalingrule.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_scalingtrigger.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_scriptbootstrapactionconfig.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_simplescalingpolicyconfiguration.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_spotprovisioningspecification.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_stepconfig.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-cluster_volumespecification.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancefleetconfig.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancefleetconfig_configuration.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancefleetconfig_ebsblockdeviceconfig.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancefleetconfig_ebsconfiguration.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancefleetconfig_instancefleetprovisioningspecifications.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancefleetconfig_instancetypeconfig.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancefleetconfig_ondemandprovisioningspecification.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancefleetconfig_spotprovisioningspecification.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancefleetconfig_volumespecification.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancegroupconfig.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancegroupconfig_autoscalingpolicy.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancegroupconfig_cloudwatchalarmdefinition.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancegroupconfig_configuration.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancegroupconfig_ebsblockdeviceconfig.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancegroupconfig_ebsconfiguration.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancegroupconfig_metricdimension.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingaction.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingconstraints.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingrule.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingtrigger.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancegroupconfig_simplescalingpolicyconfiguration.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-instancegroupconfig_volumespecification.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-securityconfiguration.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-step.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-step_hadoopjarstepconfig.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-step_keyvalue.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-studio.go
 create mode 100644 goformation/cloudformation/emr/aws-emr-studiosessionmapping.go
 create mode 100644 goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster.go
 create mode 100644 goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerinfo.go
 create mode 100644 goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerprovider.go
 create mode 100644 goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_eksinfo.go
 create mode 100644 goformation/cloudformation/events/aws-events-apidestination.go
 create mode 100644 goformation/cloudformation/events/aws-events-archive.go
 create mode 100644 goformation/cloudformation/events/aws-events-connection.go
 create mode 100644 goformation/cloudformation/events/aws-events-eventbus.go
 create mode 100644 goformation/cloudformation/events/aws-events-eventbuspolicy.go
 create mode 100644 goformation/cloudformation/events/aws-events-eventbuspolicy_condition.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule_awsvpcconfiguration.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule_batcharrayproperties.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule_batchparameters.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule_batchretrystrategy.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule_capacityproviderstrategyitem.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule_deadletterconfig.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule_ecsparameters.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule_httpparameters.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule_inputtransformer.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule_kinesisparameters.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule_networkconfiguration.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule_placementconstraint.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule_placementstrategy.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule_redshiftdataparameters.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule_retrypolicy.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule_runcommandparameters.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule_runcommandtarget.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule_sqsparameters.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule_tag.go
 create mode 100644 goformation/cloudformation/events/aws-events-rule_target.go
 create mode 100644 goformation/cloudformation/eventschemas/aws-eventschemas-discoverer.go
 create mode 100644 goformation/cloudformation/eventschemas/aws-eventschemas-discoverer_tagsentry.go
 create mode 100644 goformation/cloudformation/eventschemas/aws-eventschemas-registry.go
 create mode 100644 goformation/cloudformation/eventschemas/aws-eventschemas-registry_tagsentry.go
 create mode 100644 goformation/cloudformation/eventschemas/aws-eventschemas-registrypolicy.go
 create mode 100644 goformation/cloudformation/eventschemas/aws-eventschemas-schema.go
 create mode 100644 goformation/cloudformation/eventschemas/aws-eventschemas-schema_tagsentry.go
 create mode 100644 goformation/cloudformation/evidently/aws-evidently-experiment.go
 create mode 100644 goformation/cloudformation/evidently/aws-evidently-experiment_metricgoalobject.go
 create mode 100644 goformation/cloudformation/evidently/aws-evidently-experiment_onlineabconfigobject.go
 create mode 100644 goformation/cloudformation/evidently/aws-evidently-experiment_treatmentobject.go
 create mode 100644 goformation/cloudformation/evidently/aws-evidently-experiment_treatmenttoweight.go
 create mode 100644 goformation/cloudformation/evidently/aws-evidently-feature.go
 create mode 100644 goformation/cloudformation/evidently/aws-evidently-feature_entityoverride.go
 create mode 100644 goformation/cloudformation/evidently/aws-evidently-feature_variationobject.go
 create mode 100644 goformation/cloudformation/evidently/aws-evidently-launch.go
 create mode 100644 goformation/cloudformation/evidently/aws-evidently-launch_grouptoweight.go
 create mode 100644 goformation/cloudformation/evidently/aws-evidently-launch_launchgroupobject.go
 create mode 100644 goformation/cloudformation/evidently/aws-evidently-launch_metricdefinitionobject.go
 create mode 100644 goformation/cloudformation/evidently/aws-evidently-launch_stepconfig.go
 create mode 100644 goformation/cloudformation/evidently/aws-evidently-project.go
 create mode 100644 goformation/cloudformation/evidently/aws-evidently-project_datadeliveryobject.go
 create mode 100644 goformation/cloudformation/evidently/aws-evidently-project_s3destination.go
 create mode 100644 goformation/cloudformation/finspace/aws-finspace-environment.go
 create mode 100644 goformation/cloudformation/finspace/aws-finspace-environment_federationparameters.go
 create mode 100644 goformation/cloudformation/finspace/aws-finspace-environment_superuserparameters.go
 create mode 100644 goformation/cloudformation/fis/aws-fis-experimenttemplate.go
 create mode 100644 goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplateaction.go
 create mode 100644 goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatestopcondition.go
 create mode 100644 goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetarget.go
 create mode 100644 goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetargetfilter.go
 create mode 100644 goformation/cloudformation/fms/aws-fms-notificationchannel.go
 create mode 100644 goformation/cloudformation/fms/aws-fms-policy.go
 create mode 100644 goformation/cloudformation/fms/aws-fms-policy_iemap.go
 create mode 100644 goformation/cloudformation/fms/aws-fms-policy_policytag.go
 create mode 100644 goformation/cloudformation/fms/aws-fms-policy_resourcetag.go
 create mode 100644 goformation/cloudformation/frauddetector/aws-frauddetector-detector.go
 create mode 100644 goformation/cloudformation/frauddetector/aws-frauddetector-detector_entitytype.go
 create mode 100644 goformation/cloudformation/frauddetector/aws-frauddetector-detector_eventtype.go
 create mode 100644 goformation/cloudformation/frauddetector/aws-frauddetector-detector_eventvariable.go
 create mode 100644 goformation/cloudformation/frauddetector/aws-frauddetector-detector_label.go
 create mode 100644 goformation/cloudformation/frauddetector/aws-frauddetector-detector_model.go
 create mode 100644 goformation/cloudformation/frauddetector/aws-frauddetector-detector_outcome.go
 create mode 100644 goformation/cloudformation/frauddetector/aws-frauddetector-detector_rule.go
 create mode 100644 goformation/cloudformation/frauddetector/aws-frauddetector-entitytype.go
 create mode 100644 goformation/cloudformation/frauddetector/aws-frauddetector-eventtype.go
 create mode 100644 goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_entitytype.go
 create mode 100644 goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_eventvariable.go
 create mode 100644 goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_label.go
 create mode 100644 goformation/cloudformation/frauddetector/aws-frauddetector-label.go
 create mode 100644 goformation/cloudformation/frauddetector/aws-frauddetector-outcome.go
 create mode 100644 goformation/cloudformation/frauddetector/aws-frauddetector-variable.go
 create mode 100644 goformation/cloudformation/fsx/aws-fsx-filesystem.go
 create mode 100644 goformation/cloudformation/fsx/aws-fsx-filesystem_auditlogconfiguration.go
 create mode 100644 goformation/cloudformation/fsx/aws-fsx-filesystem_clientconfigurations.go
 create mode 100644 goformation/cloudformation/fsx/aws-fsx-filesystem_diskiopsconfiguration.go
 create mode 100644 goformation/cloudformation/fsx/aws-fsx-filesystem_lustreconfiguration.go
 create mode 100644 goformation/cloudformation/fsx/aws-fsx-filesystem_nfsexports.go
 create mode 100644 goformation/cloudformation/fsx/aws-fsx-filesystem_ontapconfiguration.go
 create mode 100644 goformation/cloudformation/fsx/aws-fsx-filesystem_openzfsconfiguration.go
 create mode 100644 goformation/cloudformation/fsx/aws-fsx-filesystem_rootvolumeconfiguration.go
 create mode 100644 goformation/cloudformation/fsx/aws-fsx-filesystem_selfmanagedactivedirectoryconfiguration.go
 create mode 100644 goformation/cloudformation/fsx/aws-fsx-filesystem_userandgroupquotas.go
 create mode 100644 goformation/cloudformation/fsx/aws-fsx-filesystem_windowsconfiguration.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-alias.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-alias_routingstrategy.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-build.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-build_s3location.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-fleet.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-fleet_certificateconfiguration.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-fleet_ippermission.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-fleet_locationcapacity.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-fleet_locationconfiguration.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-fleet_resourcecreationlimitpolicy.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-fleet_runtimeconfiguration.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-fleet_serverprocess.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-gameservergroup.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_autoscalingpolicy.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinition.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinitions.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_launchtemplate.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_tags.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_targettrackingconfiguration.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_vpcsubnets.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_destination.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_filterconfiguration.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_playerlatencypolicy.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_priorityconfiguration.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration_gameproperty.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-matchmakingruleset.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-script.go
 create mode 100644 goformation/cloudformation/gamelift/aws-gamelift-script_s3location.go
 create mode 100644 goformation/cloudformation/globalaccelerator/aws-globalaccelerator-accelerator.go
 create mode 100644 goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup.go
 create mode 100644 goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_endpointconfiguration.go
 create mode 100644 goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_portoverride.go
 create mode 100644 goformation/cloudformation/globalaccelerator/aws-globalaccelerator-listener.go
 create mode 100644 goformation/cloudformation/globalaccelerator/aws-globalaccelerator-listener_portrange.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-classifier.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-classifier_csvclassifier.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-classifier_grokclassifier.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-classifier_jsonclassifier.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-classifier_xmlclassifier.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-connection.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-connection_connectioninput.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-connection_physicalconnectionrequirements.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-crawler.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-crawler_catalogtarget.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-crawler_dynamodbtarget.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-crawler_jdbctarget.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-crawler_recrawlpolicy.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-crawler_s3target.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-crawler_schedule.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-crawler_schemachangepolicy.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-crawler_targets.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-database.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-database_databaseidentifier.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-database_databaseinput.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-database_datalakeprincipal.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-database_principalprivileges.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_connectionpasswordencryption.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_datacatalogencryptionsettings.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_encryptionatrest.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-devendpoint.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-job.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-job_connectionslist.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-job_executionproperty.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-job_jobcommand.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-job_notificationproperty.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-mltransform.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-mltransform_findmatchesparameters.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-mltransform_gluetables.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-mltransform_inputrecordtables.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-mltransform_mluserdataencryption.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-mltransform_transformencryption.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-mltransform_transformparameters.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-partition.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-partition_column.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-partition_order.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-partition_partitioninput.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-partition_schemaid.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-partition_schemareference.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-partition_serdeinfo.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-partition_skewedinfo.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-partition_storagedescriptor.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-registry.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-schema.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-schema_registry.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-schema_schemaversion.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-schemaversion.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-schemaversion_schema.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-schemaversionmetadata.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-securityconfiguration.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-securityconfiguration_cloudwatchencryption.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-securityconfiguration_encryptionconfiguration.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-securityconfiguration_jobbookmarksencryption.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-securityconfiguration_s3encryption.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-securityconfiguration_s3encryptions.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-table.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-table_column.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-table_order.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-table_schemaid.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-table_schemareference.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-table_serdeinfo.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-table_skewedinfo.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-table_storagedescriptor.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-table_tableidentifier.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-table_tableinput.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-trigger.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-trigger_action.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-trigger_condition.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-trigger_notificationproperty.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-trigger_predicate.go
 create mode 100644 goformation/cloudformation/glue/aws-glue-workflow.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-connectordefinition.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-connectordefinition_connector.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-connectordefinition_connectordefinitionversion.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-connectordefinitionversion.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-connectordefinitionversion_connector.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-coredefinition.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-coredefinition_core.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-coredefinition_coredefinitionversion.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-coredefinitionversion.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-coredefinitionversion_core.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-devicedefinition.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-devicedefinition_device.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-devicedefinition_devicedefinitionversion.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-devicedefinitionversion.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-devicedefinitionversion_device.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-functiondefinition.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_defaultconfig.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_environment.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_execution.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_function.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_functionconfiguration.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_functiondefinitionversion.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_resourceaccesspolicy.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_runas.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_defaultconfig.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_environment.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_execution.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_function.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_functionconfiguration.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_resourceaccesspolicy.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_runas.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-group.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-group_groupversion.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-groupversion.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition_logger.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition_loggerdefinitionversion.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion_logger.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_groupownersetting.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_localdeviceresourcedata.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_localvolumeresourcedata.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedatacontainer.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedefinitionversion.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedownloadownersetting.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourceinstance.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_s3machinelearningmodelresourcedata.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_sagemakermachinelearningmodelresourcedata.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_secretsmanagersecretresourcedata.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_groupownersetting.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localdeviceresourcedata.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localvolumeresourcedata.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedatacontainer.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedownloadownersetting.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourceinstance.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_s3machinelearningmodelresourcedata.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_sagemakermachinelearningmodelresourcedata.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_secretsmanagersecretresourcedata.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscription.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscriptiondefinitionversion.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion.go
 create mode 100644 goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion_subscription.go
 create mode 100644 goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion.go
 create mode 100644 goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentdependencyrequirement.go
 create mode 100644 goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentplatform.go
 create mode 100644 goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdacontainerparams.go
 create mode 100644 goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdadevicemount.go
 create mode 100644 goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaeventsource.go
 create mode 100644 goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaexecutionparameters.go
 create mode 100644 goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdafunctionrecipesource.go
 create mode 100644 goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdalinuxprocessparams.go
 create mode 100644 goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdavolumemount.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-config.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-config_antennadownlinkconfig.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-config_antennadownlinkdemoddecodeconfig.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-config_antennauplinkconfig.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-config_configdata.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-config_dataflowendpointconfig.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-config_decodeconfig.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-config_demodulationconfig.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-config_eirp.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-config_frequency.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-config_frequencybandwidth.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-config_s3recordingconfig.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-config_spectrumconfig.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-config_trackingconfig.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-config_uplinkechoconfig.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-config_uplinkspectrumconfig.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_dataflowendpoint.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_endpointdetails.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_securitydetails.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_socketaddress.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-missionprofile.go
 create mode 100644 goformation/cloudformation/groundstation/aws-groundstation-missionprofile_dataflowedge.go
 create mode 100644 goformation/cloudformation/guardduty/aws-guardduty-detector.go
 create mode 100644 goformation/cloudformation/guardduty/aws-guardduty-detector_cfndatasourceconfigurations.go
 create mode 100644 goformation/cloudformation/guardduty/aws-guardduty-detector_cfns3logsconfiguration.go
 create mode 100644 goformation/cloudformation/guardduty/aws-guardduty-filter.go
 create mode 100644 goformation/cloudformation/guardduty/aws-guardduty-filter_condition.go
 create mode 100644 goformation/cloudformation/guardduty/aws-guardduty-filter_findingcriteria.go
 create mode 100644 goformation/cloudformation/guardduty/aws-guardduty-ipset.go
 create mode 100644 goformation/cloudformation/guardduty/aws-guardduty-master.go
 create mode 100644 goformation/cloudformation/guardduty/aws-guardduty-member.go
 create mode 100644 goformation/cloudformation/guardduty/aws-guardduty-threatintelset.go
 create mode 100644 goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore.go
 create mode 100644 goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_kmsencryptionconfig.go
 create mode 100644 goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_preloaddataconfig.go
 create mode 100644 goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_sseconfiguration.go
 create mode 100644 goformation/cloudformation/iam/aws-iam-accesskey.go
 create mode 100644 goformation/cloudformation/iam/aws-iam-group.go
 create mode 100644 goformation/cloudformation/iam/aws-iam-group_policy.go
 create mode 100644 goformation/cloudformation/iam/aws-iam-instanceprofile.go
 create mode 100644 goformation/cloudformation/iam/aws-iam-managedpolicy.go
 create mode 100644 goformation/cloudformation/iam/aws-iam-oidcprovider.go
 create mode 100644 goformation/cloudformation/iam/aws-iam-policy.go
 create mode 100644 goformation/cloudformation/iam/aws-iam-role.go
 create mode 100644 goformation/cloudformation/iam/aws-iam-role_policy.go
 create mode 100644 goformation/cloudformation/iam/aws-iam-samlprovider.go
 create mode 100644 goformation/cloudformation/iam/aws-iam-servercertificate.go
 create mode 100644 goformation/cloudformation/iam/aws-iam-servicelinkedrole.go
 create mode 100644 goformation/cloudformation/iam/aws-iam-user.go
 create mode 100644 goformation/cloudformation/iam/aws-iam-user_loginprofile.go
 create mode 100644 goformation/cloudformation/iam/aws-iam-user_policy.go
 create mode 100644 goformation/cloudformation/iam/aws-iam-usertogroupaddition.go
 create mode 100644 goformation/cloudformation/iam/aws-iam-virtualmfadevice.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-component.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_componentconfiguration.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_ebsinstanceblockdevicespecification.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceblockdevicemapping.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceconfiguration.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_targetcontainerrepository.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_distribution.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_launchtemplateconfiguration.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-image.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-image_imagetestsconfiguration.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_imagetestsconfiguration.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_schedule.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_additionalinstanceconfiguration.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentconfiguration.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentparameter.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_ebsinstanceblockdevicespecification.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_instanceblockdevicemapping.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_systemsmanageragent.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_instancemetadataoptions.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_logging.go
 create mode 100644 goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_s3logs.go
 create mode 100644 goformation/cloudformation/inspector/aws-inspector-assessmenttarget.go
 create mode 100644 goformation/cloudformation/inspector/aws-inspector-assessmenttemplate.go
 create mode 100644 goformation/cloudformation/inspector/aws-inspector-resourcegroup.go
 create mode 100644 goformation/cloudformation/intrinsics.go
 create mode 100644 goformation/cloudformation/intrinsics_test.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-accountauditconfiguration.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfiguration.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfigurations.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtarget.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtargetconfigurations.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-authorizer.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-authorizer_tags.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-authorizer_tokensigningpublickeys.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-certificate.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-custommetric.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-dimension.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-domainconfiguration.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-domainconfiguration_authorizerconfig.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-domainconfiguration_servercertificatesummary.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-domainconfiguration_tags.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-fleetmetric.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-fleetmetric_aggregationtype.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-jobtemplate.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-logging.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-mitigationaction.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-mitigationaction_actionparams.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-mitigationaction_addthingstothinggroupparams.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-mitigationaction_enableiotloggingparams.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-mitigationaction_publishfindingtosnsparams.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-mitigationaction_replacedefaultpolicyversionparams.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-mitigationaction_updatecacertificateparams.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-mitigationaction_updatedevicecertificateparams.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-policy.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-policyprincipalattachment.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-provisioningtemplate.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-provisioningtemplate_provisioninghook.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-provisioningtemplate_tags.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-resourcespecificlogging.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-scheduledaudit.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-securityprofile.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-securityprofile_alerttarget.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-securityprofile_behavior.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-securityprofile_behaviorcriteria.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-securityprofile_machinelearningdetectionconfig.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-securityprofile_metricdimension.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-securityprofile_metrictoretain.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-securityprofile_metricvalue.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-securityprofile_statisticalthreshold.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-thing.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-thing_attributepayload.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-thingprincipalattachment.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_action.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_assetpropertytimestamp.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_assetpropertyvalue.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_assetpropertyvariant.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchalarmaction.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchlogsaction.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchmetricaction.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_dynamodbaction.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_dynamodbv2action.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_elasticsearchaction.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_firehoseaction.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_httpaction.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_httpactionheader.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_httpauthorization.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_iotanalyticsaction.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_ioteventsaction.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_iotsitewiseaction.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_kafkaaction.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_kinesisaction.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_lambdaaction.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_opensearchaction.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_putassetpropertyvalueentry.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_putiteminput.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_republishaction.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_s3action.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_sigv4authorization.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_snsaction.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_sqsaction.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_stepfunctionsaction.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_timestreamaction.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_timestreamdimension.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_timestreamtimestamp.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicrule_topicrulepayload.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicruledestination.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicruledestination_httpurldestinationsummary.go
 create mode 100644 goformation/cloudformation/iot/aws-iot-topicruledestination_vpcdestinationproperties.go
 create mode 100644 goformation/cloudformation/iot1click/aws-iot1click-device.go
 create mode 100644 goformation/cloudformation/iot1click/aws-iot1click-placement.go
 create mode 100644 goformation/cloudformation/iot1click/aws-iot1click-project.go
 create mode 100644 goformation/cloudformation/iot1click/aws-iot1click-project_devicetemplate.go
 create mode 100644 goformation/cloudformation/iot1click/aws-iot1click-project_placementtemplate.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-channel.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_channelstorage.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_customermanageds3.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_retentionperiod.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_servicemanageds3.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_action.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_containeraction.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryrule.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryruledestination.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentversionvalue.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatime.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatimesessionwindowconfiguration.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_filter.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_glueconfiguration.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_ioteventsdestinationconfiguration.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedatarule.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedataruleconfiguration.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_outputfileurivalue.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_queryaction.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_resourceconfiguration.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_retentionperiod.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_s3destinationconfiguration.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_schedule.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_trigger.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_triggeringdataset.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_variable.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_versioningconfiguration.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_column.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3storage.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartition.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartitions.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorestorage.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_fileformatconfiguration.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_iotsitewisemultilayerstorage.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_jsonconfiguration.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_parquetconfiguration.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_partition.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_retentionperiod.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_schemadefinition.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_servicemanageds3.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_timestamppartition.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_activity.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_addattributes.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_channel.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_datastore.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceregistryenrich.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceshadowenrich.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_filter.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_lambda.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_math.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_removeattributes.go
 create mode 100644 goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_selectattributes.go
 create mode 100644 goformation/cloudformation/iotcoredeviceadvisor/aws-iotcoredeviceadvisor-suitedefinition.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_action.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertytimestamp.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvalue.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvariant.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_cleartimer.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_detectormodeldefinition.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodb.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodbv2.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_event.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_firehose.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iotevents.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iotsitewise.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iottopicpublish.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_lambda.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_onenter.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_onexit.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_oninput.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_payload.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_resettimer.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_settimer.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_setvariable.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_sns.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_sqs.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_state.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-detectormodel_transitionevent.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-input.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-input_attribute.go
 create mode 100644 goformation/cloudformation/iotevents/aws-iotevents-input_inputdefinition.go
 create mode 100644 goformation/cloudformation/iotfleethub/aws-iotfleethub-application.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyidentity.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyresource.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamrole.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamuser.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_portal.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_project.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_user.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-asset.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-asset_assethierarchy.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-asset_assetproperty.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelcompositemodel.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelhierarchy.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelproperty.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_attribute.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_expressionvariable.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metric.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metricwindow.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_propertytype.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_transform.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_tumblingwindow.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_variablevalue.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-dashboard.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewaycapabilitysummary.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewayplatform.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_greengrass.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-portal.go
 create mode 100644 goformation/cloudformation/iotsitewise/aws-iotsitewise-project.go
 create mode 100644 goformation/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate.go
 create mode 100644 goformation/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate_definitiondocument.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-destination.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-deviceprofile.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-deviceprofile_lorawandeviceprofile.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-fuotatask.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-fuotatask_lorawan.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-multicastgroup.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-multicastgroup_lorawan.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkaccountinfo.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkupdateaccount.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-serviceprofile.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-serviceprofile_lorawanserviceprofile.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawangatewayversion.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskcreate.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskentry.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_updatewirelessgatewaytaskcreate.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv10x.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv11.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_lorawandevice.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav10x.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav11.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv10x.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv11.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-wirelessgateway.go
 create mode 100644 goformation/cloudformation/iotwireless/aws-iotwireless-wirelessgateway_lorawangateway.go
 create mode 100644 goformation/cloudformation/ivs/aws-ivs-channel.go
 create mode 100644 goformation/cloudformation/ivs/aws-ivs-playbackkeypair.go
 create mode 100644 goformation/cloudformation/ivs/aws-ivs-recordingconfiguration.go
 create mode 100644 goformation/cloudformation/ivs/aws-ivs-recordingconfiguration_destinationconfiguration.go
 create mode 100644 goformation/cloudformation/ivs/aws-ivs-recordingconfiguration_s3destinationconfiguration.go
 create mode 100644 goformation/cloudformation/ivs/aws-ivs-streamkey.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_accesscontrollistconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_aclconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_changedetectingcolumns.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_columnconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_confluenceattachmentconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_confluenceattachmenttoindexfieldmapping.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_confluenceblogconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_confluenceblogtoindexfieldmapping.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_confluenceconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_confluencepageconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_confluencepagetoindexfieldmapping.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_confluencespaceconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_confluencespacetoindexfieldmapping.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_connectionconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_databaseconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_datasourceconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_datasourceinclusionsexclusionsstrings.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmapping.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmappinglist.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_datasourcevpcconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_documentsmetadataconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_googledriveconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_onedriveconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_onedriveuserlist.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_onedriveusers.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_proxyconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_s3datasourceconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_s3path.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedincludefiltertypes.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_salesforceconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfigurationlist.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticleconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticlestatelist.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardknowledgearticletypeconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectattachmentconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfigurationlist.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_servicenowconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_servicenowknowledgearticleconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_servicenowservicecatalogconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_sharepointconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_sqlconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_taglist.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerauthenticationconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerbasicauthentication.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerseedurlconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlersitemapsconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerurls.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-datasource_workdocsconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-faq.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-faq_s3path.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-faq_taglist.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-index.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-index_capacityunitsconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-index_documentmetadataconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-index_documentmetadataconfigurationlist.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-index_jsontokentypeconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-index_jwttokentypeconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-index_relevance.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-index_search.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-index_serversideencryptionconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-index_taglist.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-index_usertokenconfiguration.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-index_valueimportanceitem.go
 create mode 100644 goformation/cloudformation/kendra/aws-kendra-index_valueimportanceitems.go
 create mode 100644 goformation/cloudformation/kinesis/aws-kinesis-stream.go
 create mode 100644 goformation/cloudformation/kinesis/aws-kinesis-stream_streamencryption.go
 create mode 100644 goformation/cloudformation/kinesis/aws-kinesis-streamconsumer.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_csvmappingparameters.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_input.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputlambdaprocessor.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputparallelism.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputprocessingconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputschema.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_jsonmappingparameters.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisfirehoseinput.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisstreamsinput.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_mappingparameters.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordcolumn.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordformat.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_destinationschema.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisfirehoseoutput.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisstreamsoutput.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_lambdaoutput.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_output.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_csvmappingparameters.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_jsonmappingparameters.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_mappingparameters.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordcolumn.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordformat.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referencedatasource.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referenceschema.go
 create mode 100644 goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_s3referencedatasource.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationcodeconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationsnapshotconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_catalogconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_checkpointconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_codecontent.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_csvmappingparameters.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactsconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_deployasapplicationconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_environmentproperties.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_flinkapplicationconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_gluedatacatalogconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_input.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputlambdaprocessor.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputparallelism.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputprocessingconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputschema.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_jsonmappingparameters.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisfirehoseinput.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisstreamsinput.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mappingparameters.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mavenreference.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_monitoringconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_parallelismconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_propertygroup.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordcolumn.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordformat.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentbaselocation.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentlocation.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_sqlapplicationconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinapplicationconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinmonitoringconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption_cloudwatchloggingoption.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_destinationschema.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisfirehoseoutput.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisstreamsoutput.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_lambdaoutput.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_output.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_csvmappingparameters.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_jsonmappingparameters.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_mappingparameters.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordcolumn.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordformat.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referencedatasource.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referenceschema.go
 create mode 100644 goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_s3referencedatasource.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicebufferinghints.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicedestinationconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchserviceretryoptions.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_bufferinghints.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_cloudwatchloggingoptions.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_copycommand.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dataformatconversionconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deliverystreamencryptionconfigurationinput.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deserializer.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dynamicpartitioningconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchbufferinghints.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchdestinationconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchretryoptions.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_encryptionconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_extendeds3destinationconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_hivejsonserde.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointcommonattribute.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointdestinationconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointrequestconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_inputformatconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kinesisstreamsourceconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kmsencryptionconfig.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_openxjsonserde.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_orcserde.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_outputformatconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_parquetserde.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processingconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processor.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processorparameter.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftdestinationconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftretryoptions.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_retryoptions.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_s3destinationconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_schemaconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_serializer.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkdestinationconfiguration.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkretryoptions.go
 create mode 100644 goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_vpcconfiguration.go
 create mode 100644 goformation/cloudformation/kms/aws-kms-alias.go
 create mode 100644 goformation/cloudformation/kms/aws-kms-key.go
 create mode 100644 goformation/cloudformation/kms/aws-kms-replicakey.go
 create mode 100644 goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings.go
 create mode 100644 goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings_admins.go
 create mode 100644 goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings_datalakeprincipal.go
 create mode 100644 goformation/cloudformation/lakeformation/aws-lakeformation-permissions.go
 create mode 100644 goformation/cloudformation/lakeformation/aws-lakeformation-permissions_columnwildcard.go
 create mode 100644 goformation/cloudformation/lakeformation/aws-lakeformation-permissions_databaseresource.go
 create mode 100644 goformation/cloudformation/lakeformation/aws-lakeformation-permissions_datalakeprincipal.go
 create mode 100644 goformation/cloudformation/lakeformation/aws-lakeformation-permissions_datalocationresource.go
 create mode 100644 goformation/cloudformation/lakeformation/aws-lakeformation-permissions_resource.go
 create mode 100644 goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tableresource.go
 create mode 100644 goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tablewildcard.go
 create mode 100644 goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tablewithcolumnsresource.go
 create mode 100644 goformation/cloudformation/lakeformation/aws-lakeformation-resource.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-alias.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-alias_aliasroutingconfiguration.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-alias_provisionedconcurrencyconfiguration.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-alias_versionweight.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-codesigningconfig.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-codesigningconfig_allowedpublishers.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-codesigningconfig_codesigningpolicies.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_destinationconfig.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_onfailure.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_onsuccess.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-eventsourcemapping.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_destinationconfig.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_endpoints.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_onfailure.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_selfmanagedeventsource.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_sourceaccessconfiguration.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-function.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-function_code.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-function_deadletterconfig.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-function_environment.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-function_filesystemconfig.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-function_imageconfig.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-function_tracingconfig.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-function_vpcconfig.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-layerversion.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-layerversion_content.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-layerversionpermission.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-permission.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-version.go
 create mode 100644 goformation/cloudformation/lambda/aws-lambda-version_provisionedconcurrencyconfiguration.go
 create mode 100644 goformation/cloudformation/licensemanager/aws-licensemanager-grant.go
 create mode 100644 goformation/cloudformation/licensemanager/aws-licensemanager-license.go
 create mode 100644 goformation/cloudformation/licensemanager/aws-licensemanager-license_borrowconfiguration.go
 create mode 100644 goformation/cloudformation/licensemanager/aws-licensemanager-license_consumptionconfiguration.go
 create mode 100644 goformation/cloudformation/licensemanager/aws-licensemanager-license_entitlement.go
 create mode 100644 goformation/cloudformation/licensemanager/aws-licensemanager-license_issuerdata.go
 create mode 100644 goformation/cloudformation/licensemanager/aws-licensemanager-license_metadata.go
 create mode 100644 goformation/cloudformation/licensemanager/aws-licensemanager-license_provisionalconfiguration.go
 create mode 100644 goformation/cloudformation/licensemanager/aws-licensemanager-license_validitydateformat.go
 create mode 100644 goformation/cloudformation/lightsail/aws-lightsail-database.go
 create mode 100644 goformation/cloudformation/lightsail/aws-lightsail-database_relationaldatabaseparameter.go
 create mode 100644 goformation/cloudformation/lightsail/aws-lightsail-disk.go
 create mode 100644 goformation/cloudformation/lightsail/aws-lightsail-disk_addon.go
 create mode 100644 goformation/cloudformation/lightsail/aws-lightsail-disk_autosnapshotaddon.go
 create mode 100644 goformation/cloudformation/lightsail/aws-lightsail-instance.go
 create mode 100644 goformation/cloudformation/lightsail/aws-lightsail-instance_addon.go
 create mode 100644 goformation/cloudformation/lightsail/aws-lightsail-instance_autosnapshotaddon.go
 create mode 100644 goformation/cloudformation/lightsail/aws-lightsail-instance_disk.go
 create mode 100644 goformation/cloudformation/lightsail/aws-lightsail-instance_hardware.go
 create mode 100644 goformation/cloudformation/lightsail/aws-lightsail-instance_location.go
 create mode 100644 goformation/cloudformation/lightsail/aws-lightsail-instance_monthlytransfer.go
 create mode 100644 goformation/cloudformation/lightsail/aws-lightsail-instance_networking.go
 create mode 100644 goformation/cloudformation/lightsail/aws-lightsail-instance_port.go
 create mode 100644 goformation/cloudformation/lightsail/aws-lightsail-instance_state.go
 create mode 100644 goformation/cloudformation/lightsail/aws-lightsail-staticip.go
 create mode 100644 goformation/cloudformation/location/aws-location-geofencecollection.go
 create mode 100644 goformation/cloudformation/location/aws-location-map.go
 create mode 100644 goformation/cloudformation/location/aws-location-map_mapconfiguration.go
 create mode 100644 goformation/cloudformation/location/aws-location-placeindex.go
 create mode 100644 goformation/cloudformation/location/aws-location-placeindex_datasourceconfiguration.go
 create mode 100644 goformation/cloudformation/location/aws-location-routecalculator.go
 create mode 100644 goformation/cloudformation/location/aws-location-tracker.go
 create mode 100644 goformation/cloudformation/location/aws-location-trackerconsumer.go
 create mode 100644 goformation/cloudformation/logs/aws-logs-destination.go
 create mode 100644 goformation/cloudformation/logs/aws-logs-loggroup.go
 create mode 100644 goformation/cloudformation/logs/aws-logs-logstream.go
 create mode 100644 goformation/cloudformation/logs/aws-logs-metricfilter.go
 create mode 100644 goformation/cloudformation/logs/aws-logs-metricfilter_metrictransformation.go
 create mode 100644 goformation/cloudformation/logs/aws-logs-querydefinition.go
 create mode 100644 goformation/cloudformation/logs/aws-logs-resourcepolicy.go
 create mode 100644 goformation/cloudformation/logs/aws-logs-subscriptionfilter.go
 create mode 100644 goformation/cloudformation/lookoutequipment/aws-lookoutequipment-inferencescheduler.go
 create mode 100644 goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert.go
 create mode 100644 goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_action.go
 create mode 100644 goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_lambdaconfiguration.go
 create mode 100644 goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_snsconfiguration.go
 create mode 100644 goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector.go
 create mode 100644 goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_anomalydetectorconfig.go
 create mode 100644 goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_appflowconfig.go
 create mode 100644 goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_cloudwatchconfig.go
 create mode 100644 goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_csvformatdescriptor.go
 create mode 100644 goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_fileformatdescriptor.go
 create mode 100644 goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_jsonformatdescriptor.go
 create mode 100644 goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metric.go
 create mode 100644 goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricset.go
 create mode 100644 goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricsource.go
 create mode 100644 goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_rdssourceconfig.go
 create mode 100644 goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_redshiftsourceconfig.go
 create mode 100644 goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_s3sourceconfig.go
 create mode 100644 goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_timestampcolumn.go
 create mode 100644 goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_vpcconfiguration.go
 create mode 100644 goformation/cloudformation/lookoutvision/aws-lookoutvision-project.go
 create mode 100644 goformation/cloudformation/macie/aws-macie-customdataidentifier.go
 create mode 100644 goformation/cloudformation/macie/aws-macie-findingsfilter.go
 create mode 100644 goformation/cloudformation/macie/aws-macie-findingsfilter_criterion.go
 create mode 100644 goformation/cloudformation/macie/aws-macie-findingsfilter_findingcriteria.go
 create mode 100644 goformation/cloudformation/macie/aws-macie-findingsfilter_findingsfilterlistitem.go
 create mode 100644 goformation/cloudformation/macie/aws-macie-session.go
 create mode 100644 goformation/cloudformation/managedblockchain/aws-managedblockchain-member.go
 create mode 100644 goformation/cloudformation/managedblockchain/aws-managedblockchain-member_approvalthresholdpolicy.go
 create mode 100644 goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberconfiguration.go
 create mode 100644 goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberfabricconfiguration.go
 create mode 100644 goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberframeworkconfiguration.go
 create mode 100644 goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkconfiguration.go
 create mode 100644 goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkfabricconfiguration.go
 create mode 100644 goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkframeworkconfiguration.go
 create mode 100644 goformation/cloudformation/managedblockchain/aws-managedblockchain-member_votingpolicy.go
 create mode 100644 goformation/cloudformation/managedblockchain/aws-managedblockchain-node.go
 create mode 100644 goformation/cloudformation/managedblockchain/aws-managedblockchain-node_nodeconfiguration.go
 create mode 100644 goformation/cloudformation/mediaconnect/aws-mediaconnect-flow.go
 create mode 100644 goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_encryption.go
 create mode 100644 goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_failoverconfig.go
 create mode 100644 goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_source.go
 create mode 100644 goformation/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement.go
 create mode 100644 goformation/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement_encryption.go
 create mode 100644 goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput.go
 create mode 100644 goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_encryption.go
 create mode 100644 goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_vpcinterfaceattachment.go
 create mode 100644 goformation/cloudformation/mediaconnect/aws-mediaconnect-flowsource.go
 create mode 100644 goformation/cloudformation/mediaconnect/aws-mediaconnect-flowsource_encryption.go
 create mode 100644 goformation/cloudformation/mediaconnect/aws-mediaconnect-flowvpcinterface.go
 create mode 100644 goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate.go
 create mode 100644 goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_accelerationsettings.go
 create mode 100644 goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_hopdestination.go
 create mode 100644 goformation/cloudformation/mediaconvert/aws-mediaconvert-preset.go
 create mode 100644 goformation/cloudformation/mediaconvert/aws-mediaconvert-queue.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_aacsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_ac3settings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_ancillarysourcesettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_archivecdnsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_archivecontainersettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_archivegroupsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_archiveoutputsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_archives3settings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_aribdestinationsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_aribsourcesettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_audiochannelmapping.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_audiocodecsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_audiodescription.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_audiohlsrenditionselection.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_audiolanguageselection.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_audionormalizationsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_audioonlyhlssettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_audiopidselection.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_audioselector.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_audioselectorsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_audiosilencefailoversettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_audiotrack.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_audiotrackselection.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_audiowatermarksettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_automaticinputfailoversettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_availblanking.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_availconfiguration.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_availsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_blackoutslate.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_burnindestinationsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_captiondescription.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_captiondestinationsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_captionlanguagemapping.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_captionrectangle.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_captionselector.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_captionselectorsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_cdiinputspecification.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_colorspacepassthroughsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_dvbnitsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_dvbsdtsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_dvbsubdestinationsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_dvbsubsourcesettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_dvbtdtsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_eac3settings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_ebuttddestinationsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_embeddeddestinationsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_embeddedplusscte20destinationsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_embeddedsourcesettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_encodersettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_failovercondition.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_failoverconditionsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_featureactivations.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_fecoutputsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_fmp4hlssettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_framecapturecdnsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_framecapturegroupsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_framecapturehlssettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_framecaptureoutputsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_framecaptures3settings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_framecapturesettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_globalconfiguration.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_h264colorspacesettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_h264filtersettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_h264settings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_h265colorspacesettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_h265filtersettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_h265settings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_hdr10settings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_hlsakamaisettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_hlsbasicputsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_hlscdnsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_hlsgroupsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_hlsinputsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_hlsmediastoresettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_hlsoutputsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_hlss3settings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_hlssettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_hlswebdavsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_htmlmotiongraphicssettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_inputattachment.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_inputchannellevel.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_inputlocation.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_inputlossbehavior.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_inputlossfailoversettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_inputsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_inputspecification.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_keyprovidersettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_m2tssettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_m3u8settings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_mediapackagegroupsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_mediapackageoutputdestinationsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_mediapackageoutputsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_motiongraphicsconfiguration.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_motiongraphicssettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_mp2settings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_mpeg2filtersettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_mpeg2settings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_mssmoothgroupsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_mssmoothoutputsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_multiplexgroupsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_multiplexoutputsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_multiplexprogramchanneldestinationsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_networkinputsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_nielsencbet.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_nielsenconfiguration.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_nielsennaesiinw.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_nielsenwatermarkssettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_output.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_outputdestination.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_outputdestinationsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_outputgroup.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_outputgroupsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_outputlocationref.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_outputsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_passthroughsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_rawsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_rec601settings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_rec709settings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_remixsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_rtmpcaptioninfodestinationsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_rtmpgroupsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_rtmpoutputsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_scte20plusembeddeddestinationsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_scte20sourcesettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_scte27destinationsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_scte27sourcesettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_scte35spliceinsert.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_scte35timesignalapos.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_smptettdestinationsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_standardhlssettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_statickeysettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_teletextdestinationsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_teletextsourcesettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_temporalfiltersettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_timecodeconfig.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_ttmldestinationsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_udpcontainersettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_udpgroupsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_udpoutputsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_videoblackfailoversettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_videocodecsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_videodescription.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_videoselector.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_videoselectorcolorspacesettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_videoselectorpid.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_videoselectorprogramid.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_videoselectorsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_vpcoutputsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_wavsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-channel_webvttdestinationsettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-input.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-input_inputdestinationrequest.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-input_inputdevicerequest.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-input_inputdevicesettings.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-input_inputsourcerequest.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-input_inputvpcrequest.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-input_mediaconnectflowrequest.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-inputsecuritygroup.go
 create mode 100644 goformation/cloudformation/medialive/aws-medialive-inputsecuritygroup_inputwhitelistrulecidr.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-asset.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-asset_egressendpoint.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-channel.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-channel_hlsingest.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-channel_ingestendpoint.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-channel_logconfiguration.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_adtriggers.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_authorization.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafencryption.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafpackage.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashencryption.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashpackage.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsencryption.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsmanifest.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlspackage.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_mssencryption.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_msspackage.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_spekekeyprovider.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_streamselection.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafencryption.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafpackage.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashencryption.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashmanifest.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashpackage.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsencryption.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsmanifest.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlspackage.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssencryption.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssmanifest.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_msspackage.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_spekekeyprovider.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_streamselection.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup_authorization.go
 create mode 100644 goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup_logconfiguration.go
 create mode 100644 goformation/cloudformation/mediastore/aws-mediastore-container.go
 create mode 100644 goformation/cloudformation/mediastore/aws-mediastore-container_corsrule.go
 create mode 100644 goformation/cloudformation/mediastore/aws-mediastore-container_metricpolicy.go
 create mode 100644 goformation/cloudformation/mediastore/aws-mediastore-container_metricpolicyrule.go
 create mode 100644 goformation/cloudformation/memorydb/aws-memorydb-acl.go
 create mode 100644 goformation/cloudformation/memorydb/aws-memorydb-cluster.go
 create mode 100644 goformation/cloudformation/memorydb/aws-memorydb-cluster_endpoint.go
 create mode 100644 goformation/cloudformation/memorydb/aws-memorydb-parametergroup.go
 create mode 100644 goformation/cloudformation/memorydb/aws-memorydb-subnetgroup.go
 create mode 100644 goformation/cloudformation/memorydb/aws-memorydb-user.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_brokerlogs.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_brokernodegroupinfo.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_clientauthentication.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_cloudwatchlogs.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_configurationinfo.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_connectivityinfo.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_ebsstorageinfo.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_encryptionatrest.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_encryptioninfo.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_encryptionintransit.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_firehose.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_iam.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_jmxexporter.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_logginginfo.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_nodeexporter.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_openmonitoring.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_prometheus.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_publicaccess.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_s3.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_sasl.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_scram.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_storageinfo.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_tls.go
 create mode 100644 goformation/cloudformation/msk/aws-msk-cluster_unauthenticated.go
 create mode 100644 goformation/cloudformation/mwaa/aws-mwaa-environment.go
 create mode 100644 goformation/cloudformation/mwaa/aws-mwaa-environment_loggingconfiguration.go
 create mode 100644 goformation/cloudformation/mwaa/aws-mwaa-environment_moduleloggingconfiguration.go
 create mode 100644 goformation/cloudformation/mwaa/aws-mwaa-environment_networkconfiguration.go
 create mode 100644 goformation/cloudformation/neptune/aws-neptune-dbcluster.go
 create mode 100644 goformation/cloudformation/neptune/aws-neptune-dbcluster_dbclusterrole.go
 create mode 100644 goformation/cloudformation/neptune/aws-neptune-dbclusterparametergroup.go
 create mode 100644 goformation/cloudformation/neptune/aws-neptune-dbinstance.go
 create mode 100644 goformation/cloudformation/neptune/aws-neptune-dbparametergroup.go
 create mode 100644 goformation/cloudformation/neptune/aws-neptune-dbsubnetgroup.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-firewall.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-firewall_subnetmapping.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_actiondefinition.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_customaction.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_dimension.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_firewallpolicy.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_publishmetricaction.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulengineoptions.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulrulegroupreference.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statelessrulegroupreference.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_logdestinationconfig.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_loggingconfiguration.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_actiondefinition.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_address.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_customaction.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_dimension.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_header.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ipset.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_matchattributes.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portrange.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portset.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_publishmetricaction.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruledefinition.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulegroup.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruleoption.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessource.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessourcelist.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulevariables.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulrule.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulruleoptions.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrule.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrulesandcustomactions.go
 create mode 100644 goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_tcpflagfield.go
 create mode 100644 goformation/cloudformation/networkmanager/aws-networkmanager-customergatewayassociation.go
 create mode 100644 goformation/cloudformation/networkmanager/aws-networkmanager-device.go
 create mode 100644 goformation/cloudformation/networkmanager/aws-networkmanager-device_location.go
 create mode 100644 goformation/cloudformation/networkmanager/aws-networkmanager-globalnetwork.go
 create mode 100644 goformation/cloudformation/networkmanager/aws-networkmanager-link.go
 create mode 100644 goformation/cloudformation/networkmanager/aws-networkmanager-link_bandwidth.go
 create mode 100644 goformation/cloudformation/networkmanager/aws-networkmanager-linkassociation.go
 create mode 100644 goformation/cloudformation/networkmanager/aws-networkmanager-site.go
 create mode 100644 goformation/cloudformation/networkmanager/aws-networkmanager-site_location.go
 create mode 100644 goformation/cloudformation/networkmanager/aws-networkmanager-transitgatewayregistration.go
 create mode 100644 goformation/cloudformation/nimblestudio/aws-nimblestudio-launchprofile.go
 create mode 100644 goformation/cloudformation/nimblestudio/aws-nimblestudio-launchprofile_streamconfiguration.go
 create mode 100644 goformation/cloudformation/nimblestudio/aws-nimblestudio-streamingimage.go
 create mode 100644 goformation/cloudformation/nimblestudio/aws-nimblestudio-studio.go
 create mode 100644 goformation/cloudformation/nimblestudio/aws-nimblestudio-studio_studioencryptionconfiguration.go
 create mode 100644 goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent.go
 create mode 100644 goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectorycomputerattribute.go
 create mode 100644 goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectoryconfiguration.go
 create mode 100644 goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_computefarmconfiguration.go
 create mode 100644 goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_licenseserviceconfiguration.go
 create mode 100644 goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_scriptparameterkeyvalue.go
 create mode 100644 goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_sharedfilesystemconfiguration.go
 create mode 100644 goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentconfiguration.go
 create mode 100644 goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentinitializationscript.go
 create mode 100644 goformation/cloudformation/opensearchservice/aws-opensearchservice-domain.go
 create mode 100644 goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_advancedsecurityoptionsinput.go
 create mode 100644 goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_clusterconfig.go
 create mode 100644 goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_cognitooptions.go
 create mode 100644 goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_domainendpointoptions.go
 create mode 100644 goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_ebsoptions.go
 create mode 100644 goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_encryptionatrestoptions.go
 create mode 100644 goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_logpublishingoption.go
 create mode 100644 goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_masteruseroptions.go
 create mode 100644 goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_nodetonodeencryptionoptions.go
 create mode 100644 goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_snapshotoptions.go
 create mode 100644 goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_vpcoptions.go
 create mode 100644 goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_zoneawarenessconfig.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-app.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-app_datasource.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-app_environmentvariable.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-app_source.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-app_sslconfiguration.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-elasticloadbalancerattachment.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-instance.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-instance_blockdevicemapping.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-instance_ebsblockdevice.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-instance_timebasedautoscaling.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-layer.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-layer_autoscalingthresholds.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-layer_lifecycleeventconfiguration.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-layer_loadbasedautoscaling.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-layer_recipes.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-layer_shutdowneventconfiguration.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-layer_volumeconfiguration.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-stack.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-stack_chefconfiguration.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-stack_elasticip.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-stack_rdsdbinstance.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-stack_source.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-stack_stackconfigurationmanager.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-userprofile.go
 create mode 100644 goformation/cloudformation/opsworks/aws-opsworks-volume.go
 create mode 100644 goformation/cloudformation/opsworkscm/aws-opsworkscm-server.go
 create mode 100644 goformation/cloudformation/opsworkscm/aws-opsworkscm-server_engineattribute.go
 create mode 100644 goformation/cloudformation/panorama/aws-panorama-applicationinstance.go
 create mode 100644 goformation/cloudformation/panorama/aws-panorama-applicationinstance_manifestoverridespayload.go
 create mode 100644 goformation/cloudformation/panorama/aws-panorama-applicationinstance_manifestpayload.go
 create mode 100644 goformation/cloudformation/panorama/aws-panorama-package.go
 create mode 100644 goformation/cloudformation/panorama/aws-panorama-packageversion.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-admchannel.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-apnschannel.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-apnssandboxchannel.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-apnsvoipchannel.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-apnsvoipsandboxchannel.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-app.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_campaignhook.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_limits.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_quiettime.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-baiduchannel.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_attributedimension.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignemailmessage.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaigneventfilter.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignhook.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaigninappmessage.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignsmsmessage.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_defaultbuttonconfiguration.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_eventdimensions.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebodyconfig.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebutton.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagecontent.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessageheaderconfig.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_limits.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_message.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_messageconfiguration.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_metricdimension.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_overridebuttonconfiguration.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_quiettime.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_schedule.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_setdimension.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-campaign_writetreatmentresource.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-emailchannel.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-emailtemplate.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-eventstream.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-gcmchannel.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_bodyconfig.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_buttonconfig.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_defaultbuttonconfiguration.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_headerconfig.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_inappmessagecontent.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_overridebuttonconfiguration.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_androidpushnotificationtemplate.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_apnspushnotificationtemplate.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_defaultpushnotificationtemplate.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-segment.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-segment_attributedimension.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-segment_behavior.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-segment_coordinates.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-segment_demographic.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-segment_gpspoint.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-segment_groups.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-segment_location.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-segment_recency.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-segment_segmentdimensions.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-segment_segmentgroups.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-segment_setdimension.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-segment_sourcesegments.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-smschannel.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-smstemplate.go
 create mode 100644 goformation/cloudformation/pinpoint/aws-pinpoint-voicechannel.go
 create mode 100644 goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset.go
 create mode 100644 goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_deliveryoptions.go
 create mode 100644 goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_reputationoptions.go
 create mode 100644 goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_sendingoptions.go
 create mode 100644 goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_tags.go
 create mode 100644 goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_trackingoptions.go
 create mode 100644 goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination.go
 create mode 100644 goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_cloudwatchdestination.go
 create mode 100644 goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_dimensionconfiguration.go
 create mode 100644 goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_eventdestination.go
 create mode 100644 goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_kinesisfirehosedestination.go
 create mode 100644 goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_pinpointdestination.go
 create mode 100644 goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_snsdestination.go
 create mode 100644 goformation/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool.go
 create mode 100644 goformation/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool_tags.go
 create mode 100644 goformation/cloudformation/pinpointemail/aws-pinpointemail-identity.go
 create mode 100644 goformation/cloudformation/pinpointemail/aws-pinpointemail-identity_mailfromattributes.go
 create mode 100644 goformation/cloudformation/pinpointemail/aws-pinpointemail-identity_tags.go
 create mode 100644 goformation/cloudformation/policies/policies.go
 create mode 100644 goformation/cloudformation/policies_test.go
 create mode 100644 goformation/cloudformation/qldb/aws-qldb-ledger.go
 create mode 100644 goformation/cloudformation/qldb/aws-qldb-stream.go
 create mode 100644 goformation/cloudformation/qldb/aws-qldb-stream_kinesisconfiguration.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-analysis.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-analysis_analysiserror.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-analysis_analysissourceentity.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-analysis_analysissourcetemplate.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-analysis_datasetreference.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-analysis_datetimeparameter.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-analysis_decimalparameter.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-analysis_integerparameter.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-analysis_parameters.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-analysis_resourcepermission.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-analysis_sheet.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-analysis_stringparameter.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dashboard.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dashboard_adhocfilteringoption.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardpublishoptions.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourceentity.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourcetemplate.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dashboard_datasetreference.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dashboard_datetimeparameter.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dashboard_decimalparameter.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dashboard_exporttocsvoption.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dashboard_integerparameter.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dashboard_parameters.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dashboard_resourcepermission.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dashboard_sheetcontrolsoption.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dashboard_stringparameter.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_calculatedcolumn.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_castcolumntypeoperation.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_columndescription.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_columngroup.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_columnlevelpermissionrule.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_columntag.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_createcolumnsoperation.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_customsql.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_fieldfolder.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_filteroperation.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_geospatialcolumngroup.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_ingestionwaitpolicy.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_inputcolumn.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_joininstruction.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_joinkeyproperties.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_logicaltable.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_logicaltablesource.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_outputcolumn.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_physicaltable.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_projectoperation.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_relationaltable.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_renamecolumnoperation.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_resourcepermission.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_rowlevelpermissiondataset.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_s3source.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_tagcolumnoperation.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_transformoperation.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-dataset_uploadsettings.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_amazonelasticsearchparameters.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_amazonopensearchparameters.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_athenaparameters.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_auroraparameters.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_aurorapostgresqlparameters.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_credentialpair.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourcecredentials.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourceerrorinfo.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourceparameters.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_manifestfilelocation.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_mariadbparameters.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_mysqlparameters.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_oracleparameters.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_postgresqlparameters.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_prestoparameters.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_rdsparameters.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_redshiftparameters.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_resourcepermission.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_s3parameters.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_snowflakeparameters.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_sparkparameters.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_sqlserverparameters.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_sslproperties.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_teradataparameters.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-datasource_vpcconnectionproperties.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-template.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-template_datasetreference.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-template_resourcepermission.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-template_templatesourceanalysis.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-template_templatesourceentity.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-template_templatesourcetemplate.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-theme.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-theme_borderstyle.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-theme_datacolorpalette.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-theme_font.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-theme_gutterstyle.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-theme_marginstyle.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-theme_resourcepermission.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-theme_sheetstyle.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-theme_themeconfiguration.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-theme_tilelayoutstyle.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-theme_tilestyle.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-theme_typography.go
 create mode 100644 goformation/cloudformation/quicksight/aws-quicksight-theme_uicolorpalette.go
 create mode 100644 goformation/cloudformation/ram/aws-ram-resourceshare.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-dbcluster.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-dbcluster_dbclusterrole.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-dbcluster_scalingconfiguration.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-dbclusterparametergroup.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-dbinstance.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-dbinstance_dbinstancerole.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-dbinstance_processorfeature.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-dbparametergroup.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-dbproxy.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-dbproxy_authformat.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-dbproxy_tagformat.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-dbproxyendpoint.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-dbproxyendpoint_tagformat.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-dbproxytargetgroup.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-dbproxytargetgroup_connectionpoolconfigurationinfoformat.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-dbsecuritygroup.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-dbsecuritygroup_ingress.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-dbsecuritygroupingress.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-dbsubnetgroup.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-eventsubscription.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-globalcluster.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-optiongroup.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-optiongroup_optionconfiguration.go
 create mode 100644 goformation/cloudformation/rds/aws-rds-optiongroup_optionsetting.go
 create mode 100644 goformation/cloudformation/redshift/aws-redshift-cluster.go
 create mode 100644 goformation/cloudformation/redshift/aws-redshift-cluster_endpoint.go
 create mode 100644 goformation/cloudformation/redshift/aws-redshift-cluster_loggingproperties.go
 create mode 100644 goformation/cloudformation/redshift/aws-redshift-clusterparametergroup.go
 create mode 100644 goformation/cloudformation/redshift/aws-redshift-clusterparametergroup_parameter.go
 create mode 100644 goformation/cloudformation/redshift/aws-redshift-clustersecuritygroup.go
 create mode 100644 goformation/cloudformation/redshift/aws-redshift-clustersecuritygroupingress.go
 create mode 100644 goformation/cloudformation/redshift/aws-redshift-clustersubnetgroup.go
 create mode 100644 goformation/cloudformation/redshift/aws-redshift-endpointaccess.go
 create mode 100644 goformation/cloudformation/redshift/aws-redshift-endpointaccess_vpcsecuritygroup.go
 create mode 100644 goformation/cloudformation/redshift/aws-redshift-endpointauthorization.go
 create mode 100644 goformation/cloudformation/redshift/aws-redshift-eventsubscription.go
 create mode 100644 goformation/cloudformation/redshift/aws-redshift-scheduledaction.go
 create mode 100644 goformation/cloudformation/redshift/aws-redshift-scheduledaction_pauseclustermessage.go
 create mode 100644 goformation/cloudformation/redshift/aws-redshift-scheduledaction_resizeclustermessage.go
 create mode 100644 goformation/cloudformation/redshift/aws-redshift-scheduledaction_resumeclustermessage.go
 create mode 100644 goformation/cloudformation/redshift/aws-redshift-scheduledaction_scheduledactiontype.go
 create mode 100644 goformation/cloudformation/refactorspaces/aws-refactorspaces-application.go
 create mode 100644 goformation/cloudformation/refactorspaces/aws-refactorspaces-application_apigatewayproxyinput.go
 create mode 100644 goformation/cloudformation/refactorspaces/aws-refactorspaces-environment.go
 create mode 100644 goformation/cloudformation/refactorspaces/aws-refactorspaces-route.go
 create mode 100644 goformation/cloudformation/refactorspaces/aws-refactorspaces-route_uripathrouteinput.go
 create mode 100644 goformation/cloudformation/refactorspaces/aws-refactorspaces-service.go
 create mode 100644 goformation/cloudformation/refactorspaces/aws-refactorspaces-service_lambdaendpointinput.go
 create mode 100644 goformation/cloudformation/refactorspaces/aws-refactorspaces-service_urlendpointinput.go
 create mode 100644 goformation/cloudformation/rekognition/aws-rekognition-project.go
 create mode 100644 goformation/cloudformation/resiliencehub/aws-resiliencehub-app.go
 create mode 100644 goformation/cloudformation/resiliencehub/aws-resiliencehub-app_physicalresourceid.go
 create mode 100644 goformation/cloudformation/resiliencehub/aws-resiliencehub-app_resourcemapping.go
 create mode 100644 goformation/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy.go
 create mode 100644 goformation/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy_failurepolicy.go
 create mode 100644 goformation/cloudformation/resourcegroups/aws-resourcegroups-group.go
 create mode 100644 goformation/cloudformation/resourcegroups/aws-resourcegroups-group_configurationitem.go
 create mode 100644 goformation/cloudformation/resourcegroups/aws-resourcegroups-group_configurationparameter.go
 create mode 100644 goformation/cloudformation/resourcegroups/aws-resourcegroups-group_query.go
 create mode 100644 goformation/cloudformation/resourcegroups/aws-resourcegroups-group_resourcequery.go
 create mode 100644 goformation/cloudformation/resourcegroups/aws-resourcegroups-group_tagfilter.go
 create mode 100644 goformation/cloudformation/robomaker/aws-robomaker-fleet.go
 create mode 100644 goformation/cloudformation/robomaker/aws-robomaker-robot.go
 create mode 100644 goformation/cloudformation/robomaker/aws-robomaker-robotapplication.go
 create mode 100644 goformation/cloudformation/robomaker/aws-robomaker-robotapplication_robotsoftwaresuite.go
 create mode 100644 goformation/cloudformation/robomaker/aws-robomaker-robotapplication_sourceconfig.go
 create mode 100644 goformation/cloudformation/robomaker/aws-robomaker-robotapplicationversion.go
 create mode 100644 goformation/cloudformation/robomaker/aws-robomaker-simulationapplication.go
 create mode 100644 goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_renderingengine.go
 create mode 100644 goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_robotsoftwaresuite.go
 create mode 100644 goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_simulationsoftwaresuite.go
 create mode 100644 goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_sourceconfig.go
 create mode 100644 goformation/cloudformation/robomaker/aws-robomaker-simulationapplicationversion.go
 create mode 100644 goformation/cloudformation/rolesanywhere/aws-rolesanywhere-crl.go
 create mode 100644 goformation/cloudformation/rolesanywhere/aws-rolesanywhere-profile.go
 create mode 100644 goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor.go
 create mode 100644 goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_notificationsetting.go
 create mode 100644 goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_source.go
 create mode 100644 goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_sourcedata.go
 create mode 100644 goformation/cloudformation/route53/aws-route53-dnssec.go
 create mode 100644 goformation/cloudformation/route53/aws-route53-healthcheck.go
 create mode 100644 goformation/cloudformation/route53/aws-route53-healthcheck_alarmidentifier.go
 create mode 100644 goformation/cloudformation/route53/aws-route53-healthcheck_healthcheckconfig.go
 create mode 100644 goformation/cloudformation/route53/aws-route53-healthcheck_healthchecktag.go
 create mode 100644 goformation/cloudformation/route53/aws-route53-hostedzone.go
 create mode 100644 goformation/cloudformation/route53/aws-route53-hostedzone_hostedzoneconfig.go
 create mode 100644 goformation/cloudformation/route53/aws-route53-hostedzone_hostedzonetag.go
 create mode 100644 goformation/cloudformation/route53/aws-route53-hostedzone_queryloggingconfig.go
 create mode 100644 goformation/cloudformation/route53/aws-route53-hostedzone_vpc.go
 create mode 100644 goformation/cloudformation/route53/aws-route53-keysigningkey.go
 create mode 100644 goformation/cloudformation/route53/aws-route53-recordset.go
 create mode 100644 goformation/cloudformation/route53/aws-route53-recordset_aliastarget.go
 create mode 100644 goformation/cloudformation/route53/aws-route53-recordset_geolocation.go
 create mode 100644 goformation/cloudformation/route53/aws-route53-recordsetgroup.go
 create mode 100644 goformation/cloudformation/route53/aws-route53-recordsetgroup_aliastarget.go
 create mode 100644 goformation/cloudformation/route53/aws-route53-recordsetgroup_geolocation.go
 create mode 100644 goformation/cloudformation/route53/aws-route53-recordsetgroup_recordset.go
 create mode 100644 goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster.go
 create mode 100644 goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster_clusterendpoint.go
 create mode 100644 goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-controlpanel.go
 create mode 100644 goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-routingcontrol.go
 create mode 100644 goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule.go
 create mode 100644 goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_assertionrule.go
 create mode 100644 goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_gatingrule.go
 create mode 100644 goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_ruleconfig.go
 create mode 100644 goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-cell.go
 create mode 100644 goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-readinesscheck.go
 create mode 100644 goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-recoverygroup.go
 create mode 100644 goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset.go
 create mode 100644 goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_dnstargetresource.go
 create mode 100644 goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_nlbresource.go
 create mode 100644 goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_r53resourcerecord.go
 create mode 100644 goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_resource.go
 create mode 100644 goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_targetresource.go
 create mode 100644 goformation/cloudformation/route53resolver/aws-route53resolver-firewalldomainlist.go
 create mode 100644 goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup.go
 create mode 100644 goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup_firewallrule.go
 create mode 100644 goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroupassociation.go
 create mode 100644 goformation/cloudformation/route53resolver/aws-route53resolver-resolverconfig.go
 create mode 100644 goformation/cloudformation/route53resolver/aws-route53resolver-resolverdnssecconfig.go
 create mode 100644 goformation/cloudformation/route53resolver/aws-route53resolver-resolverendpoint.go
 create mode 100644 goformation/cloudformation/route53resolver/aws-route53resolver-resolverendpoint_ipaddressrequest.go
 create mode 100644 goformation/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfig.go
 create mode 100644 goformation/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfigassociation.go
 create mode 100644 goformation/cloudformation/route53resolver/aws-route53resolver-resolverrule.go
 create mode 100644 goformation/cloudformation/route53resolver/aws-route53resolver-resolverrule_targetaddress.go
 create mode 100644 goformation/cloudformation/route53resolver/aws-route53resolver-resolverruleassociation.go
 create mode 100644 goformation/cloudformation/rum/aws-rum-appmonitor.go
 create mode 100644 goformation/cloudformation/rum/aws-rum-appmonitor_appmonitorconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-accesspoint.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-accesspoint_publicaccessblockconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-accesspoint_vpcconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_abortincompletemultipartupload.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_accelerateconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_accesscontroltranslation.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_analyticsconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_bucketencryption.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_corsconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_corsrule.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_dataexport.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_defaultretention.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_deletemarkerreplication.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_destination.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_encryptionconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_eventbridgeconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_filterrule.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_intelligenttieringconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_inventoryconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_lambdaconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_lifecycleconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_loggingconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_metrics.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_metricsconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_noncurrentversionexpiration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_noncurrentversiontransition.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_notificationconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_notificationfilter.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_objectlockconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_objectlockrule.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_ownershipcontrols.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_ownershipcontrolsrule.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_publicaccessblockconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_queueconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_redirectallrequeststo.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_redirectrule.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_replicamodifications.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_replicationconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_replicationdestination.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_replicationrule.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_replicationruleandoperator.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_replicationrulefilter.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_replicationtime.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_replicationtimevalue.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_routingrule.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_routingrulecondition.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_rule.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_s3keyfilter.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_serversideencryptionbydefault.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_serversideencryptionrule.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_sourceselectioncriteria.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_ssekmsencryptedobjects.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_storageclassanalysis.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_tagfilter.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_tiering.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_topicconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_transition.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_versioningconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucket_websiteconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-bucketpolicy.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-multiregionaccesspoint.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-multiregionaccesspoint_publicaccessblockconfiguration.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-multiregionaccesspoint_region.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-multiregionaccesspointpolicy.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-storagelens.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-storagelens_accountlevel.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-storagelens_activitymetrics.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-storagelens_awsorg.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-storagelens_bucketlevel.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-storagelens_bucketsandregions.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-storagelens_cloudwatchmetrics.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-storagelens_dataexport.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-storagelens_encryption.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-storagelens_prefixlevel.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-storagelens_prefixlevelstoragemetrics.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-storagelens_s3bucketdestination.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-storagelens_selectioncriteria.go
 create mode 100644 goformation/cloudformation/s3/aws-s3-storagelens_storagelensconfiguration.go
 create mode 100644 goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint.go
 create mode 100644 goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_objectlambdaconfiguration.go
 create mode 100644 goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_transformationconfiguration.go
 create mode 100644 goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspointpolicy.go
 create mode 100644 goformation/cloudformation/s3outposts/aws-s3outposts-accesspoint.go
 create mode 100644 goformation/cloudformation/s3outposts/aws-s3outposts-accesspoint_vpcconfiguration.go
 create mode 100644 goformation/cloudformation/s3outposts/aws-s3outposts-bucket.go
 create mode 100644 goformation/cloudformation/s3outposts/aws-s3outposts-bucket_abortincompletemultipartupload.go
 create mode 100644 goformation/cloudformation/s3outposts/aws-s3outposts-bucket_lifecycleconfiguration.go
 create mode 100644 goformation/cloudformation/s3outposts/aws-s3outposts-bucket_rule.go
 create mode 100644 goformation/cloudformation/s3outposts/aws-s3outposts-bucketpolicy.go
 create mode 100644 goformation/cloudformation/s3outposts/aws-s3outposts-endpoint.go
 create mode 100644 goformation/cloudformation/s3outposts/aws-s3outposts-endpoint_networkinterface.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-app.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-app_resourcespec.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_filesystemconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelgatewayimageconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelspec.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-coderepository.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-coderepository_gitconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_clusterconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_constraintsresource.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityappspecification.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualitybaselineconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityjobinput.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_endpointinput.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutput.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutputconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringresources.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_networkconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_s3output.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_statisticsresource.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_stoppingcondition.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_vpcconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-device.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-device_device.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-devicefleet.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-devicefleet_edgeoutputconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-domain.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-domain_customimage.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-domain_jupyterserverappsettings.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-domain_kernelgatewayappsettings.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-domain_resourcespec.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-domain_sharingsettings.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-domain_usersettings.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-endpoint.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_alarm.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_autorollbackconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_bluegreenupdatepolicy.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_capacitysize.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_deploymentconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_trafficroutingconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_variantproperty.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceclientconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferencenotificationconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceoutputconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_capturecontenttypeheader.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_captureoption.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_datacaptureconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_productionvariant.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_serverlessconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-featuregroup.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-featuregroup_featuredefinition.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-image.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-imageversion.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-model.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-model_containerdefinition.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-model_imageconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-model_inferenceexecutionconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-model_multimodelconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-model_repositoryauthconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-model_vpcconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_clusterconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_constraintsresource.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_endpointinput.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasappspecification.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasbaselineconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasjobinput.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringgroundtruths3input.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutput.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutputconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringresources.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_networkconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_s3output.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_stoppingcondition.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_vpcconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_clusterconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_constraintsresource.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_endpointinput.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityappspecification.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilitybaselineconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityjobinput.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutput.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutputconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringresources.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_networkconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_s3output.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_stoppingcondition.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_vpcconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelpackagegroup.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_clusterconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_constraintsresource.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_endpointinput.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityappspecification.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualitybaselineconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityjobinput.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringgroundtruths3input.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutput.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutputconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringresources.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_networkconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_s3output.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_stoppingcondition.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_vpcconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_baselineconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_clusterconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_constraintsresource.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_endpointinput.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_environment.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringappspecification.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringexecutionsummary.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinput.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinputs.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringjobdefinition.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutput.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutputconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringresources.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringscheduleconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_networkconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_s3output.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_scheduleconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_statisticsresource.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_stoppingcondition.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_vpcconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstance.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig_notebookinstancelifecyclehook.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-pipeline.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-project.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-userprofile.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_customimage.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_jupyterserverappsettings.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_kernelgatewayappsettings.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_resourcespec.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_sharingsettings.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_usersettings.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-workteam.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-workteam_cognitomemberdefinition.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-workteam_memberdefinition.go
 create mode 100644 goformation/cloudformation/sagemaker/aws-sagemaker-workteam_notificationconfiguration.go
 create mode 100644 goformation/cloudformation/sdb/aws-sdb-domain.go
 create mode 100644 goformation/cloudformation/secretsmanager/aws-secretsmanager-resourcepolicy.go
 create mode 100644 goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule.go
 create mode 100644 goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_hostedrotationlambda.go
 create mode 100644 goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_rotationrules.go
 create mode 100644 goformation/cloudformation/secretsmanager/aws-secretsmanager-secret.go
 create mode 100644 goformation/cloudformation/secretsmanager/aws-secretsmanager-secret_generatesecretstring.go
 create mode 100644 goformation/cloudformation/secretsmanager/aws-secretsmanager-secret_replicaregion.go
 create mode 100644 goformation/cloudformation/secretsmanager/aws-secretsmanager-secrettargetattachment.go
 create mode 100644 goformation/cloudformation/securityhub/aws-securityhub-hub.go
 create mode 100644 goformation/cloudformation/serverless/api_cors.go
 create mode 100644 goformation/cloudformation/serverless/api_definitionuri.go
 create mode 100644 goformation/cloudformation/serverless/application_location.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-api.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-api_accesslogsetting.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-api_auth.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-api_corsconfiguration.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-api_s3location.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-application.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-application_applicationlocation.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_alexaskillevent.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_apievent.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_bucketsampt.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_cloudwatcheventevent.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_cloudwatchlogsevent.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_collectionsampt.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_deadletterqueue.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_deploymentpreference.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_destinationconfig.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_domainsampt.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_dynamodbevent.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_emptysampt.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_eventbridgeruleevent.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_eventsource.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_filesystemconfig.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_functionenvironment.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_functionsampt.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_iampolicydocument.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_identitysampt.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_iotruleevent.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_keysampt.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_kinesisevent.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_loggroupsampt.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_onfailure.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_queuesampt.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_s3event.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_s3keyfilter.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_s3keyfilterrule.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_s3location.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_s3notificationfilter.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_sampolicytemplate.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_scheduleevent.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_snsevent.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_sqsevent.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_statemachinesampt.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_streamsampt.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_tablesampt.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_tablestreamsampt.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_topicsampt.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-function_vpcconfig.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-layerversion.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-simpletable.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-simpletable_primarykey.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-simpletable_provisionedthroughput.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-simpletable_ssespecification.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-statemachine.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-statemachine_apievent.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-statemachine_cloudwatcheventevent.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-statemachine_cloudwatchlogsloggroup.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-statemachine_eventbridgeruleevent.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-statemachine_eventsource.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-statemachine_functionsampt.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-statemachine_iampolicydocument.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-statemachine_logdestination.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-statemachine_loggingconfiguration.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-statemachine_s3location.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-statemachine_sampolicytemplate.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-statemachine_scheduleevent.go
 create mode 100644 goformation/cloudformation/serverless/aws-serverless-statemachine_statemachinesampt.go
 create mode 100644 goformation/cloudformation/serverless/function_codeuri.go
 create mode 100644 goformation/cloudformation/serverless/function_events.go
 create mode 100644 goformation/cloudformation/serverless/function_policies.go
 create mode 100644 goformation/cloudformation/serverless/function_properties.go
 create mode 100644 goformation/cloudformation/serverless/statemachine_definitionuri.go
 create mode 100644 goformation/cloudformation/serverless/statemachine_policies.go
 create mode 100644 goformation/cloudformation/serverless/statemachine_properties.go
 create mode 100644 goformation/cloudformation/servicecatalog/aws-servicecatalog-acceptedportfolioshare.go
 create mode 100644 goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct.go
 create mode 100644 goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct_provisioningartifactproperties.go
 create mode 100644 goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct.go
 create mode 100644 goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningparameter.go
 create mode 100644 goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningpreferences.go
 create mode 100644 goformation/cloudformation/servicecatalog/aws-servicecatalog-launchnotificationconstraint.go
 create mode 100644 goformation/cloudformation/servicecatalog/aws-servicecatalog-launchroleconstraint.go
 create mode 100644 goformation/cloudformation/servicecatalog/aws-servicecatalog-launchtemplateconstraint.go
 create mode 100644 goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolio.go
 create mode 100644 goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioprincipalassociation.go
 create mode 100644 goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioproductassociation.go
 create mode 100644 goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioshare.go
 create mode 100644 goformation/cloudformation/servicecatalog/aws-servicecatalog-resourceupdateconstraint.go
 create mode 100644 goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceaction.go
 create mode 100644 goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceaction_definitionparameter.go
 create mode 100644 goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceactionassociation.go
 create mode 100644 goformation/cloudformation/servicecatalog/aws-servicecatalog-stacksetconstraint.go
 create mode 100644 goformation/cloudformation/servicecatalog/aws-servicecatalog-tagoption.go
 create mode 100644 goformation/cloudformation/servicecatalog/aws-servicecatalog-tagoptionassociation.go
 create mode 100644 goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-application.go
 create mode 100644 goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroup.go
 create mode 100644 goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroupassociation.go
 create mode 100644 goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-resourceassociation.go
 create mode 100644 goformation/cloudformation/servicediscovery/aws-servicediscovery-httpnamespace.go
 create mode 100644 goformation/cloudformation/servicediscovery/aws-servicediscovery-instance.go
 create mode 100644 goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace.go
 create mode 100644 goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_privatednspropertiesmutable.go
 create mode 100644 goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_properties.go
 create mode 100644 goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_soa.go
 create mode 100644 goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace.go
 create mode 100644 goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_properties.go
 create mode 100644 goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_publicdnspropertiesmutable.go
 create mode 100644 goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_soa.go
 create mode 100644 goformation/cloudformation/servicediscovery/aws-servicediscovery-service.go
 create mode 100644 goformation/cloudformation/servicediscovery/aws-servicediscovery-service_dnsconfig.go
 create mode 100644 goformation/cloudformation/servicediscovery/aws-servicediscovery-service_dnsrecord.go
 create mode 100644 goformation/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckconfig.go
 create mode 100644 goformation/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckcustomconfig.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-configurationset.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-configurationseteventdestination.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-configurationseteventdestination_cloudwatchdestination.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-configurationseteventdestination_dimensionconfiguration.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-configurationseteventdestination_eventdestination.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-configurationseteventdestination_kinesisfirehosedestination.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-contactlist.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-contactlist_topic.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-receiptfilter.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-receiptfilter_filter.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-receiptfilter_ipfilter.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-receiptrule.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-receiptrule_action.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-receiptrule_addheaderaction.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-receiptrule_bounceaction.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-receiptrule_lambdaaction.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-receiptrule_rule.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-receiptrule_s3action.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-receiptrule_snsaction.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-receiptrule_stopaction.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-receiptrule_workmailaction.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-receiptruleset.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-template.go
 create mode 100644 goformation/cloudformation/ses/aws-ses-template_template.go
 create mode 100644 goformation/cloudformation/signer/aws-signer-profilepermission.go
 create mode 100644 goformation/cloudformation/signer/aws-signer-signingprofile.go
 create mode 100644 goformation/cloudformation/signer/aws-signer-signingprofile_signaturevalidityperiod.go
 create mode 100644 goformation/cloudformation/sns/aws-sns-subscription.go
 create mode 100644 goformation/cloudformation/sns/aws-sns-topic.go
 create mode 100644 goformation/cloudformation/sns/aws-sns-topic_subscription.go
 create mode 100644 goformation/cloudformation/sns/aws-sns-topicpolicy.go
 create mode 100644 goformation/cloudformation/sqs/aws-sqs-queue.go
 create mode 100644 goformation/cloudformation/sqs/aws-sqs-queuepolicy.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-association.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-association_instanceassociationoutputlocation.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-association_parametervalues.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-association_s3outputlocation.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-association_target.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-document.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-document_attachmentssource.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-document_documentrequires.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-maintenancewindow.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-maintenancewindowtarget.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-maintenancewindowtarget_targets.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_logginginfo.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowautomationparameters.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowlambdaparameters.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowruncommandparameters.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowstepfunctionsparameters.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_notificationconfig.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_target.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_taskinvocationparameters.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-parameter.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-patchbaseline.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchfilter.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchfiltergroup.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchsource.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchstringdate.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-patchbaseline_rule.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-patchbaseline_rulegroup.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-resourcedatasync.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-resourcedatasync_awsorganizationssource.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-resourcedatasync_s3destination.go
 create mode 100644 goformation/cloudformation/ssm/aws-ssm-resourcedatasync_syncsource.go
 create mode 100644 goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact.go
 create mode 100644 goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_channeltargetinfo.go
 create mode 100644 goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_contacttargetinfo.go
 create mode 100644 goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_stage.go
 create mode 100644 goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_targets.go
 create mode 100644 goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contactchannel.go
 create mode 100644 goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset.go
 create mode 100644 goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset_regionconfiguration.go
 create mode 100644 goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset_replicationregion.go
 create mode 100644 goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan.go
 create mode 100644 goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_action.go
 create mode 100644 goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_chatchannel.go
 create mode 100644 goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_incidenttemplate.go
 create mode 100644 goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_notificationtargetitem.go
 create mode 100644 goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmautomation.go
 create mode 100644 goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmparameter.go
 create mode 100644 goformation/cloudformation/sso/aws-sso-assignment.go
 create mode 100644 goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration.go
 create mode 100644 goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattribute.go
 create mode 100644 goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattributevalue.go
 create mode 100644 goformation/cloudformation/sso/aws-sso-permissionset.go
 create mode 100644 goformation/cloudformation/stepfunctions/aws-stepfunctions-activity.go
 create mode 100644 goformation/cloudformation/stepfunctions/aws-stepfunctions-activity_tagsentry.go
 create mode 100644 goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine.go
 create mode 100644 goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_cloudwatchlogsloggroup.go
 create mode 100644 goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definition.go
 create mode 100644 goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definitionsubstitutions.go
 create mode 100644 goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_logdestination.go
 create mode 100644 goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_loggingconfiguration.go
 create mode 100644 goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_s3location.go
 create mode 100644 goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tagsentry.go
 create mode 100644 goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tracingconfiguration.go
 create mode 100644 goformation/cloudformation/synthetics/aws-synthetics-canary.go
 create mode 100644 goformation/cloudformation/synthetics/aws-synthetics-canary_artifactconfig.go
 create mode 100644 goformation/cloudformation/synthetics/aws-synthetics-canary_basescreenshot.go
 create mode 100644 goformation/cloudformation/synthetics/aws-synthetics-canary_code.go
 create mode 100644 goformation/cloudformation/synthetics/aws-synthetics-canary_runconfig.go
 create mode 100644 goformation/cloudformation/synthetics/aws-synthetics-canary_s3encryption.go
 create mode 100644 goformation/cloudformation/synthetics/aws-synthetics-canary_schedule.go
 create mode 100644 goformation/cloudformation/synthetics/aws-synthetics-canary_visualreference.go
 create mode 100644 goformation/cloudformation/synthetics/aws-synthetics-canary_vpcconfig.go
 create mode 100644 goformation/cloudformation/template.go
 create mode 100644 goformation/cloudformation/timestream/aws-timestream-database.go
 create mode 100644 goformation/cloudformation/timestream/aws-timestream-scheduledquery.go
 create mode 100644 goformation/cloudformation/timestream/aws-timestream-scheduledquery_dimensionmapping.go
 create mode 100644 goformation/cloudformation/timestream/aws-timestream-scheduledquery_errorreportconfiguration.go
 create mode 100644 goformation/cloudformation/timestream/aws-timestream-scheduledquery_mixedmeasuremapping.go
 create mode 100644 goformation/cloudformation/timestream/aws-timestream-scheduledquery_multimeasureattributemapping.go
 create mode 100644 goformation/cloudformation/timestream/aws-timestream-scheduledquery_multimeasuremappings.go
 create mode 100644 goformation/cloudformation/timestream/aws-timestream-scheduledquery_notificationconfiguration.go
 create mode 100644 goformation/cloudformation/timestream/aws-timestream-scheduledquery_s3configuration.go
 create mode 100644 goformation/cloudformation/timestream/aws-timestream-scheduledquery_scheduleconfiguration.go
 create mode 100644 goformation/cloudformation/timestream/aws-timestream-scheduledquery_snsconfiguration.go
 create mode 100644 goformation/cloudformation/timestream/aws-timestream-scheduledquery_targetconfiguration.go
 create mode 100644 goformation/cloudformation/timestream/aws-timestream-scheduledquery_timestreamconfiguration.go
 create mode 100644 goformation/cloudformation/timestream/aws-timestream-table.go
 create mode 100644 goformation/cloudformation/transfer/aws-transfer-server.go
 create mode 100644 goformation/cloudformation/transfer/aws-transfer-server_endpointdetails.go
 create mode 100644 goformation/cloudformation/transfer/aws-transfer-server_identityproviderdetails.go
 create mode 100644 goformation/cloudformation/transfer/aws-transfer-server_protocol.go
 create mode 100644 goformation/cloudformation/transfer/aws-transfer-server_protocoldetails.go
 create mode 100644 goformation/cloudformation/transfer/aws-transfer-server_securitygroupid.go
 create mode 100644 goformation/cloudformation/transfer/aws-transfer-server_workflowdetail.go
 create mode 100644 goformation/cloudformation/transfer/aws-transfer-server_workflowdetails.go
 create mode 100644 goformation/cloudformation/transfer/aws-transfer-user.go
 create mode 100644 goformation/cloudformation/transfer/aws-transfer-user_homedirectorymapentry.go
 create mode 100644 goformation/cloudformation/transfer/aws-transfer-user_posixprofile.go
 create mode 100644 goformation/cloudformation/transfer/aws-transfer-user_sshpublickey.go
 create mode 100644 goformation/cloudformation/transfer/aws-transfer-workflow.go
 create mode 100644 goformation/cloudformation/transfer/aws-transfer-workflow_workflowstep.go
 create mode 100644 goformation/cloudformation/types/intrinsics.go
 create mode 100644 goformation/cloudformation/types/types.go
 create mode 100644 goformation/cloudformation/utils/utils.go
 create mode 100644 goformation/cloudformation/waf/aws-waf-bytematchset.go
 create mode 100644 goformation/cloudformation/waf/aws-waf-bytematchset_bytematchtuple.go
 create mode 100644 goformation/cloudformation/waf/aws-waf-bytematchset_fieldtomatch.go
 create mode 100644 goformation/cloudformation/waf/aws-waf-ipset.go
 create mode 100644 goformation/cloudformation/waf/aws-waf-ipset_ipsetdescriptor.go
 create mode 100644 goformation/cloudformation/waf/aws-waf-rule.go
 create mode 100644 goformation/cloudformation/waf/aws-waf-rule_predicate.go
 create mode 100644 goformation/cloudformation/waf/aws-waf-sizeconstraintset.go
 create mode 100644 goformation/cloudformation/waf/aws-waf-sizeconstraintset_fieldtomatch.go
 create mode 100644 goformation/cloudformation/waf/aws-waf-sizeconstraintset_sizeconstraint.go
 create mode 100644 goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset.go
 create mode 100644 goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset_fieldtomatch.go
 create mode 100644 goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset_sqlinjectionmatchtuple.go
 create mode 100644 goformation/cloudformation/waf/aws-waf-webacl.go
 create mode 100644 goformation/cloudformation/waf/aws-waf-webacl_activatedrule.go
 create mode 100644 goformation/cloudformation/waf/aws-waf-webacl_wafaction.go
 create mode 100644 goformation/cloudformation/waf/aws-waf-xssmatchset.go
 create mode 100644 goformation/cloudformation/waf/aws-waf-xssmatchset_fieldtomatch.go
 create mode 100644 goformation/cloudformation/waf/aws-waf-xssmatchset_xssmatchtuple.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-bytematchset.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-bytematchset_bytematchtuple.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-bytematchset_fieldtomatch.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-geomatchset.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-geomatchset_geomatchconstraint.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-ipset.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-ipset_ipsetdescriptor.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-ratebasedrule.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-ratebasedrule_predicate.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-regexpatternset.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-rule.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-rule_predicate.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset_fieldtomatch.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset_sizeconstraint.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_fieldtomatch.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_sqlinjectionmatchtuple.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-webacl.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-webacl_action.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-webacl_rule.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-webaclassociation.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-xssmatchset.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-xssmatchset_fieldtomatch.go
 create mode 100644 goformation/cloudformation/wafregional/aws-wafregional-xssmatchset_xssmatchtuple.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-ipset.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-loggingconfiguration.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-loggingconfiguration_fieldtomatch.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-regexpatternset.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementone.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementtwo.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_bytematchstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_customresponsebody.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_fieldtomatch.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_forwardedipconfiguration.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_geomatchstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetforwardedipconfiguration.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetreferencestatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_jsonbody.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_jsonmatchpattern.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_label.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_labelmatchstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_labelsummary.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementone.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementtwo.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementone.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementtwo.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementone.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementtwo.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_regexpatternsetreferencestatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_rule.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ruleaction.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_sizeconstraintstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_sqlimatchstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementone.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementthree.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementtwo.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_texttransformation.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_visibilityconfig.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-rulegroup_xssmatchstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_allowaction.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatementone.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatementtwo.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_blockaction.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_bytematchstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_countaction.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_customhttpheader.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_customrequesthandling.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_customresponse.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_customresponsebody.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_defaultaction.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_excludedrule.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_fieldtomatch.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_forwardedipconfiguration.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_geomatchstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_ipsetforwardedipconfiguration.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_ipsetreferencestatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_jsonbody.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_jsonmatchpattern.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_label.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_labelmatchstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_managedrulegroupstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatementone.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatementtwo.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatementone.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatementtwo.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_overrideaction.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementone.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementtwo.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_regexpatternsetreferencestatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_rule.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_ruleaction.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_rulegroupreferencestatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_sizeconstraintstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_sqlimatchstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_statement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_statementone.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_statementthree.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_statementtwo.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_texttransformation.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_visibilityconfig.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webacl_xssmatchstatement.go
 create mode 100644 goformation/cloudformation/wafv2/aws-wafv2-webaclassociation.go
 create mode 100644 goformation/cloudformation/wisdom/aws-wisdom-assistant.go
 create mode 100644 goformation/cloudformation/wisdom/aws-wisdom-assistant_serversideencryptionconfiguration.go
 create mode 100644 goformation/cloudformation/wisdom/aws-wisdom-assistantassociation.go
 create mode 100644 goformation/cloudformation/wisdom/aws-wisdom-assistantassociation_associationdata.go
 create mode 100644 goformation/cloudformation/wisdom/aws-wisdom-knowledgebase.go
 create mode 100644 goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_appintegrationsconfiguration.go
 create mode 100644 goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_renderingconfiguration.go
 create mode 100644 goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_serversideencryptionconfiguration.go
 create mode 100644 goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_sourceconfiguration.go
 create mode 100644 goformation/cloudformation/workspaces/aws-workspaces-connectionalias.go
 create mode 100644 goformation/cloudformation/workspaces/aws-workspaces-connectionalias_connectionaliasassociation.go
 create mode 100644 goformation/cloudformation/workspaces/aws-workspaces-workspace.go
 create mode 100644 goformation/cloudformation/workspaces/aws-workspaces-workspace_workspaceproperties.go
 create mode 100644 goformation/cloudformation/xray/aws-xray-group.go
 create mode 100644 goformation/cloudformation/xray/aws-xray-group_insightsconfiguration.go
 create mode 100644 goformation/cloudformation/xray/aws-xray-samplingrule.go
 create mode 100644 goformation/cloudformation/xray/aws-xray-samplingrule_samplingrule.go
 create mode 100644 goformation/cloudformation/xray/aws-xray-samplingrule_samplingrulerecord.go
 create mode 100644 goformation/cloudformation/xray/aws-xray-samplingrule_samplingruleupdate.go
 create mode 100644 goformation/example/go-to-yaml/main.go
 create mode 100644 goformation/example/yaml-to-go/main.go
 create mode 100644 goformation/example/yaml-to-go/template.yaml
 create mode 100755 goformation/generate/create-pull-request.sh
 create mode 100644 goformation/generate/generate.go
 create mode 100755 goformation/generate/generate.sh
 create mode 100644 goformation/generate/generate_suite_test.go
 create mode 100644 goformation/generate/main.go
 create mode 100644 goformation/generate/naming.go
 create mode 100644 goformation/generate/property.go
 create mode 100644 goformation/generate/property_test.go
 create mode 100644 goformation/generate/resource.go
 create mode 100644 goformation/generate/resource_test.go
 create mode 100644 goformation/generate/sam-2016-10-31.json
 create mode 100644 goformation/generate/spec.go
 create mode 100644 goformation/generate/templates/all.template
 create mode 100644 goformation/generate/templates/polymorphic-property.template
 create mode 100644 goformation/generate/templates/resource.template
 create mode 100644 goformation/generate/templates/schema-property.template
 create mode 100644 goformation/generate/templates/schema-resource.template
 create mode 100644 goformation/generate/templates/schema.template
 create mode 100644 goformation/go.mod
 create mode 100644 goformation/go.sum
 create mode 100644 goformation/goformation.go
 create mode 100644 goformation/goformation_schema_test.go
 create mode 100644 goformation/goformation_suite_test.go
 create mode 100644 goformation/goformation_test.go
 create mode 100644 goformation/intrinsics/intrinsics.go
 create mode 100644 goformation/intrinsics/intrinsics_suite_test.go
 create mode 100644 goformation/intrinsics/tags.go
 create mode 100644 goformation/schema/README.md
 create mode 100644 goformation/schema/cloudformation.go
 create mode 100644 goformation/schema/cloudformation.schema.json
 create mode 100644 goformation/schema/sam.go
 create mode 100644 goformation/schema/sam.schema.json
 create mode 100644 goformation/static/logo.png
 create mode 100644 goformation/test.go
 create mode 100644 goformation/test/json/invalid-sam-template-no-transform.json
 create mode 100644 goformation/test/json/invalid-sam-template-wrong-transform.json
 create mode 100644 goformation/test/json/invalid-template-additional-property.json
 create mode 100644 goformation/test/json/invalid-template-additional-resource-property.json
 create mode 100644 goformation/test/json/invalid-template-empty-resource-properties.json
 create mode 100644 goformation/test/json/invalid-template-invalid-resource-name.json
 create mode 100644 goformation/test/json/invalid-template-invalid-resource-subproperty.json
 create mode 100644 goformation/test/json/invalid-template-missing-resource-properties.json
 create mode 100644 goformation/test/json/invalid-template-missing-resource-type.json
 create mode 100644 goformation/test/json/invalid-template-missing-resources.json
 create mode 100644 goformation/test/json/invalid-template-subproperty-missing-property.json
 create mode 100644 goformation/test/json/invalid-template-unknown-resource-type.json
 create mode 100644 goformation/test/json/invalid-template-unknown-subproperty-property.json
 create mode 100644 goformation/test/json/resource-with-tags.json
 create mode 100644 goformation/test/json/valid-sam-template.json
 create mode 100644 goformation/test/json/valid-template-resource-attributes.json
 create mode 100644 goformation/test/json/valid-template-with-fns.json
 create mode 100644 goformation/test/json/valid-template.json
 create mode 100644 goformation/test/yaml/api-swagger-plain.yaml
 create mode 100644 goformation/test/yaml/aws-serverless-api-string-or-cors-configuration.yaml
 create mode 100644 goformation/test/yaml/aws-serverless-api-swagger.yaml
 create mode 100644 goformation/test/yaml/aws-serverless-api.yaml
 create mode 100644 goformation/test/yaml/aws-serverless-function-2016-10-31.yaml
 create mode 100644 goformation/test/yaml/aws-serverless-function-api-event.yaml
 create mode 100644 goformation/test/yaml/aws-serverless-function-env-vars.yaml
 create mode 100644 goformation/test/yaml/aws-serverless-function-string-or-s3-location.yaml
 create mode 100644 goformation/test/yaml/aws-serverless-simpletable.yaml
 create mode 100644 goformation/test/yaml/codestar/java.yml
 create mode 100644 goformation/test/yaml/codestar/nodejs.yml
 create mode 100644 goformation/test/yaml/codestar/python.yml
 create mode 100644 goformation/test/yaml/custom-resource.yaml
 create mode 100644 goformation/test/yaml/output_section.yaml
 create mode 100644 goformation/test/yaml/sam-official-samples/alexa_skill/index.js
 create mode 100644 goformation/test/yaml/sam-official-samples/alexa_skill/template.yaml
 create mode 100644 goformation/test/yaml/sam-official-samples/api-swagger-intrinsic.yaml
 create mode 100644 goformation/test/yaml/sam-official-samples/api-swagger-plain.yaml
 create mode 100644 goformation/test/yaml/sam-official-samples/api_backend/index.js
 create mode 100644 goformation/test/yaml/sam-official-samples/api_backend/template.yaml
 create mode 100644 goformation/test/yaml/sam-official-samples/api_swagger_cors/index.js
 create mode 100644 goformation/test/yaml/sam-official-samples/api_swagger_cors/swagger.yaml
 create mode 100644 goformation/test/yaml/sam-official-samples/api_swagger_cors/template.yaml
 create mode 100644 goformation/test/yaml/sam-official-samples/codestar-node4.3.yaml
 create mode 100644 goformation/test/yaml/sam-official-samples/encryption_proxy/README.MD
 create mode 100644 goformation/test/yaml/sam-official-samples/encryption_proxy/decryption.py
 create mode 100644 goformation/test/yaml/sam-official-samples/encryption_proxy/encryption.py
 create mode 100644 goformation/test/yaml/sam-official-samples/encryption_proxy/template.yaml
 create mode 100644 goformation/test/yaml/sam-official-samples/function.yaml
 create mode 100644 goformation/test/yaml/sam-official-samples/hello_world/index.js
 create mode 100644 goformation/test/yaml/sam-official-samples/hello_world/template.yaml
 create mode 100644 goformation/test/yaml/sam-official-samples/inline_swagger/index.js
 create mode 100644 goformation/test/yaml/sam-official-samples/inline_swagger/template.yaml
 create mode 100644 goformation/test/yaml/sam-official-samples/iot_backend/index.js
 create mode 100644 goformation/test/yaml/sam-official-samples/iot_backend/template.yaml
 create mode 100644 goformation/test/yaml/sam-official-samples/s3_processor/index.js
 create mode 100644 goformation/test/yaml/sam-official-samples/s3_processor/template.yaml
 create mode 100644 goformation/test/yaml/sam-official-samples/schedule/index.js
 create mode 100644 goformation/test/yaml/sam-official-samples/schedule/template.yaml
 create mode 100644 goformation/test/yaml/sam-official-samples/stream_processor/index.js
 create mode 100644 goformation/test/yaml/sam-official-samples/stream_processor/template.yaml
 create mode 100644 goformation/test/yaml/sam-official-samples/templates/basic.yaml
 create mode 100644 goformation/test/yaml/sam-official-samples/templates/intrinsic.yaml
 create mode 100644 goformation/test/yaml/sam-official-samples/templates/wrong.yaml
 create mode 100644 goformation/test/yaml/transform-multiple.yaml
 create mode 100644 goformation/test/yaml/transform-single.yaml
 create mode 100644 goformation/test/yaml/validation-errors/no-resources-section.yaml
 create mode 100644 goformation/test/yaml/yaml-intrinsic-tags.yaml

diff --git a/.golangci.yml b/.golangci.yml
index cdefececab..da2c7235f5 100644
--- a/.golangci.yml
+++ b/.golangci.yml
@@ -19,31 +19,36 @@ run:
         - release
         - integration
 
-    # which dirs to skip: they won't be analyzed;
-    # can use regexp here: generated.*, regexp is applied on full path;
-    # default value is empty list, but next dirs are always skipped independently
-    # from this option's value:
-    #   	vendor$, third_party$, testdata$, examples$, Godeps$, builtin$
-    skip-dirs:
-        - ^vendor$
-        - ^build$
-        - ^pkg\/eks\/mocks$
-
-    # which files to skip: they will be analyzed, but issues from them
-    # won't be reported. Default value is empty list, but there is
-    # no need to include all autogenerated files, we confidently recognize
-    # autogenerated files. If it's not please let us know.
-    skip-files:
-        #  - ".*\\.my\\.go$"
-        #  - lib/bad.go
-        - ^pkg\/nodebootstrap\/assets.go
-        - .*\/export_test.go
-        - ^pkg\/cfn\/builder\/fakes\/fake_cfn_template.go
-
 # output configuration options
 output:
-    # colored-line-number|line-number|json|tab|checkstyle, default is "colored-line-number"
-    format: tab
+    # The formats used to render issues.
+    # Formats:
+    # - `colored-line-number`
+    # - `line-number`
+    # - `json`
+    # - `colored-tab`
+    # - `tab`
+    # - `html`
+    # - `checkstyle`
+    # - `code-climate`
+    # - `junit-xml`
+    # - `junit-xml-extended`
+    # - `github-actions`
+    # - `teamcity`
+    # - `sarif`
+    # Output path can be either `stdout`, `stderr` or path to the file to write to.
+    #
+    # For the CLI flag (`--out-format`), multiple formats can be specified by separating them by comma.
+    # The output can be specified for each of them by separating format name and path by colon symbol.
+    # Example: "--out-format=checkstyle:report.xml,json:stdout,colored-line-number"
+    # The CLI flag (`--out-format`) override the configuration file.
+    #
+    # Default:
+    #   formats:
+    #     - format: colored-line-number
+    #       path: stdout
+    formats:
+    - format: tab
 
     # print lines of code with issue, default is true
     print-issued-lines: true
@@ -166,6 +171,31 @@ issues:
         - linters: [golint]
           text: "should not use dot imports|don't use an underscore in package name"
 
+    # Which dirs to exclude: issues from them won't be reported.
+    # Can use regexp here: `generated.*`, regexp is applied on full path,
+    # including the path prefix if one is set.
+    # Default dirs are skipped independently of this option's value (see exclude-dirs-use-default).
+    # "/" will be replaced by current OS file path separator to properly work on Windows.
+    # Default: []
+    exclude-dirs:
+        - ^vendor$
+        - ^build$
+        - ^pkg\/eks\/mocks$
+        - ^goformation$
+
+    # Which files to exclude: they will be analyzed, but issues from them won't be reported.
+    # There is no need to include all autogenerated files,
+    # we confidently recognize autogenerated files.
+    # If it's not, please let us know.
+    # "/" will be replaced by current OS file path separator to properly work on Windows.
+    # Default: []
+    exclude-files:
+        #  - ".*\\.my\\.go$"
+        #  - lib/bad.go
+        - ^pkg\/nodebootstrap\/assets.go
+        - .*\/export_test.go
+        - ^pkg\/cfn\/builder\/fakes\/fake_cfn_template.go
+
 linters:
     disable-all: true
     enable:
diff --git a/ATTRIBUTIONS.md b/ATTRIBUTIONS.md
index 5ce8f58ba6..afc30caaac 100644
--- a/ATTRIBUTIONS.md
+++ b/ATTRIBUTIONS.md
@@ -80,7 +80,6 @@ License version 2.0, we include the full text of the package's License below.
 * `github.com/tj/assert`
 * `github.com/vburenin/ifacemaker`
 * `github.com/vektra/mockery/v2`
-* `github.com/weaveworks/goformation/v4`
 * `github.com/weaveworks/schemer`
 * `github.com/xgfone/netaddr`
 * `golang.org/x/crypto`
@@ -16962,27 +16961,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-### github.com/weaveworks/goformation/v4
-
-Apache License version 2.0
-
-Subdependencies:
-* `github.com/awslabs/goformation/v4`
-* `github.com/imdario/mergo`
-* `github.com/onsi/ginkgo`
-* `github.com/onsi/gomega`
-* `github.com/sanathkr/go-yaml`
-* `github.com/sanathkr/yaml`
-* `github.com/stretchr/testify`
-* `github.com/xeipuuv/gojsonpointer`
-* `github.com/xeipuuv/gojsonreference`
-* `github.com/xeipuuv/gojsonschema`
-
-#### github.com/awslabs/goformation/v4
-
-Apache License version 2.0
-
-
 
 #### github.com/onsi/ginkgo
 
diff --git a/go.mod b/go.mod
index 4831470b6d..25bdfafb31 100644
--- a/go.mod
+++ b/go.mod
@@ -68,9 +68,9 @@ require (
 	github.com/tj/assert v0.0.3
 	github.com/vburenin/ifacemaker v1.2.1
 	github.com/vektra/mockery/v2 v2.38.0
-	github.com/weaveworks/goformation/v4 v4.10.2-0.20241201182214-a53d427b2c56
 	github.com/weaveworks/schemer v0.0.0-20230525114451-47139fe25848
 	github.com/xgfone/netaddr v0.5.1
+	goformation/v4 v4.0.0
 	golang.org/x/crypto v0.22.0
 	golang.org/x/exp v0.0.0-20240103183307-be819d1f06fc
 	golang.org/x/oauth2 v0.18.0
@@ -465,3 +465,6 @@ replace (
 
 // Ensure k8s dependencies are also pinned accordingly
 replace github.com/acomagu/bufpipe => github.com/acomagu/bufpipe v1.0.4
+
+// Use a local fork of goformation
+replace goformation/v4 => ./goformation
diff --git a/go.sum b/go.sum
index d2532e9378..643001319b 100644
--- a/go.sum
+++ b/go.sum
@@ -1813,8 +1813,6 @@ github.com/vektra/mockery/v2 v2.38.0 h1:I0LBuUzZHqAU4d1DknW0DTFBPO6n8TaD38WL2KJf
 github.com/vektra/mockery/v2 v2.38.0/go.mod h1:diB13hxXG6QrTR0ol2Rk8s2dRMftzvExSvPDKr+IYKk=
 github.com/voxelbrain/goptions v0.0.0-20180630082107-58cddc247ea2 h1:txplJASvd6b/hrE0s/Ixfpp2cuwH9IO9oZBAN9iYa4A=
 github.com/voxelbrain/goptions v0.0.0-20180630082107-58cddc247ea2/go.mod h1:DGCIhurYgnLz8J9ga1fMV/fbLDyUvTyrWXVWUIyJon4=
-github.com/weaveworks/goformation/v4 v4.10.2-0.20241201182214-a53d427b2c56 h1:9iBSXXEXMvH9doiIOETQiV6138915L2XFJD64pJcSKA=
-github.com/weaveworks/goformation/v4 v4.10.2-0.20241201182214-a53d427b2c56/go.mod h1:3c2tyJmoge5qTS4PXS0niVJxR0YzroIBsts3dQI3EdI=
 github.com/weaveworks/schemer v0.0.0-20230525114451-47139fe25848 h1:I7S+IHZIU49skVgTNArf9bIdy07mCn1Z0zv1r07ROws=
 github.com/weaveworks/schemer v0.0.0-20230525114451-47139fe25848/go.mod h1:y8Luzq6JDsYVoIV0QAlnvIiq8bSaap0myMjWKyzVFTY=
 github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
diff --git a/goformation/.gitignore b/goformation/.gitignore
new file mode 100644
index 0000000000..4f885c4cc2
--- /dev/null
+++ b/goformation/.gitignore
@@ -0,0 +1,4 @@
+.idea
+.vscode
+debug
+debug.test
diff --git a/goformation/AUTHORS.md b/goformation/AUTHORS.md
new file mode 100644
index 0000000000..0f4db2ed27
--- /dev/null
+++ b/goformation/AUTHORS.md
@@ -0,0 +1,35 @@
+# Authors
+
+This list is sorted by the number of commits per contributor in _descending_ order.
+
+Avatar|Contributor|Contributions
+:-:|---|:-:
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/4678446?v=4' width='36' height='36' alt='@PaulMaddox'>|[@PaulMaddox](https://github.com/PaulMaddox)|274
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/31303332?v=4' width='36' height='36' alt='@goformation'>|[@goformation](https://github.com/goformation)|40
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/331436?v=4' width='36' height='36' alt='@grahamjenson'>|[@grahamjenson](https://github.com/grahamjenson)|18
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/32174276?v=4' width='36' height='36' alt='@semantic-release-bot'>|[@semantic-release-bot](https://github.com/semantic-release-bot)|15
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/339849?v=4' width='36' height='36' alt='@pesama'>|[@pesama](https://github.com/pesama)|12
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/432692?v=4' width='36' height='36' alt='@parsnips'>|[@parsnips](https://github.com/parsnips)|8
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/484245?v=4' width='36' height='36' alt='@clareliguori'>|[@clareliguori](https://github.com/clareliguori)|7
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/22755571?v=4' width='36' height='36' alt='@sanathkr'>|[@sanathkr](https://github.com/sanathkr)|7
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/3868295?v=4' width='36' height='36' alt='@resios'>|[@resios](https://github.com/resios)|7
+<img class='float-left rounded-1' src='https://avatars3.githubusercontent.com/u/508179?v=4' width='36' height='36' alt='@neoandroid'>|[@neoandroid](https://github.com/neoandroid)|3
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/482239?v=4' width='36' height='36' alt='@stilvoid'>|[@stilvoid](https://github.com/stilvoid)|3
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/7834613?v=4' width='36' height='36' alt='@evantorrie'>|[@evantorrie](https://github.com/evantorrie)|3
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/41612521?v=4' width='36' height='36' alt='@aws-goformation'>|[@aws-goformation](https://github.com/aws-goformation)|2
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/142510?v=4' width='36' height='36' alt='@majasb'>|[@majasb](https://github.com/majasb)|2
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/38672686?v=4' width='36' height='36' alt='@sam-goodwin'>|[@sam-goodwin](https://github.com/sam-goodwin)|2
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/857609?v=4' width='36' height='36' alt='@adamchainz'>|[@adamchainz](https://github.com/adamchainz)|1
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/2552323?v=4' width='36' height='36' alt='@billyshambrook'>|[@billyshambrook](https://github.com/billyshambrook)|1
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/983?v=4' width='36' height='36' alt='@statik'>|[@statik](https://github.com/statik)|1
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/801084?v=4' width='36' height='36' alt='@lsuss'>|[@lsuss](https://github.com/lsuss)|1
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/85195?v=4' width='36' height='36' alt='@michaelansel'>|[@michaelansel](https://github.com/michaelansel)|1
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/16217941?v=4' width='36' height='36' alt='@nija-at'>|[@nija-at](https://github.com/nija-at)|1
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/9825?v=4' width='36' height='36' alt='@pedrofaria'>|[@pedrofaria](https://github.com/pedrofaria)|1
+<img class='float-left rounded-1' src='https://avatars2.githubusercontent.com/u/3982807?v=4' width='36' height='36' alt='@rjlohan'>|[@rjlohan](https://github.com/rjlohan)|1
+<img class='float-left rounded-1' src='https://avatars1.githubusercontent.com/u/35301479?v=4' width='36' height='36' alt='@manuel-trejo-rico'>|[@manuel-trejo-rico](https://github.com/manuel-trejo-rico)|1
+<img class='float-left rounded-1' src='https://avatars0.githubusercontent.com/u/29075662?v=4' width='36' height='36' alt='@rtim75'>|[@rtim75](https://github.com/rtim75)|1
+
+---
+
+Auto-generated by [gaocegege/maintainer](https://github.com/gaocegege/maintainer) on 2019-10-27.
diff --git a/goformation/CHANGELOG.md b/goformation/CHANGELOG.md
new file mode 100644
index 0000000000..40b2ea4851
--- /dev/null
+++ b/goformation/CHANGELOG.md
@@ -0,0 +1,397 @@
+# GoFormation Versioning Changelog
+
+## [4.15.5](https://github.com/awslabs/goformation/compare/v4.15.4...v4.15.5) (2020-11-06)
+
+
+### Bug Fixes
+
+* **schema:** CloudFormation Updates ([#331](https://github.com/awslabs/goformation/issues/331)) ([12f9c83](https://github.com/awslabs/goformation/commit/12f9c835cbd9b980e06e30c458f95b14e16a3771))
+
+## [4.15.4](https://github.com/awslabs/goformation/compare/v4.15.3...v4.15.4) (2020-11-01)
+
+
+### Bug Fixes
+
+* **schema:** CloudFormation Updates ([#330](https://github.com/awslabs/goformation/issues/330)) ([4070319](https://github.com/awslabs/goformation/commit/40703191771425b3519128027478cf740d10f2d9))
+
+## [4.15.3](https://github.com/awslabs/goformation/compare/v4.15.2...v4.15.3) (2020-10-23)
+
+
+### Bug Fixes
+
+* **schema:** CloudFormation Updates ([#329](https://github.com/awslabs/goformation/issues/329)) ([4c1362b](https://github.com/awslabs/goformation/commit/4c1362bac14a3d6fc2cebd56eddcaf440228a4e9))
+
+## [4.15.2](https://github.com/awslabs/goformation/compare/v4.15.1...v4.15.2) (2020-10-11)
+
+
+### Bug Fixes
+
+* **schema:** CloudFormation Updates ([#320](https://github.com/awslabs/goformation/issues/320)) ([49879b4](https://github.com/awslabs/goformation/commit/49879b45f79dc9880071facd32d76cc4bf0570eb))
+
+## [4.15.1](https://github.com/awslabs/goformation/compare/v4.15.0...v4.15.1) (2020-10-11)
+
+
+### Bug Fixes
+
+* **intrinsics:** Join function to allow to use parameters of type `List<>` ([#309](https://github.com/awslabs/goformation/issues/309)) ([6cc1cd3](https://github.com/awslabs/goformation/commit/6cc1cd329047227674caaf1b546066e3043c6616))
+
+# [4.15.0](https://github.com/awslabs/goformation/compare/v4.14.0...v4.15.0) (2020-08-16)
+
+
+### Features
+
+* **schema:** dummy commit - trigger CI for schema update ([66bc344](https://github.com/awslabs/goformation/commit/66bc344ed6a17a613abbb4d217afcc0b8ea02b48))
+
+# [4.14.0](https://github.com/awslabs/goformation/compare/v4.13.1...v4.14.0) (2020-07-26)
+
+
+### Features
+
+* **schema:** Add support for Template Outputs ([#291](https://github.com/awslabs/goformation/issues/291)) ([6875c50](https://github.com/awslabs/goformation/commit/6875c50d00d8e1af71d9bad5788446b29ab03513))
+
+## [4.13.1](https://github.com/awslabs/goformation/compare/v4.13.0...v4.13.1) (2020-07-26)
+
+
+### Bug Fixes
+
+* **schema:** Add Change and Update policies to the Unmarshal method ([#288](https://github.com/awslabs/goformation/issues/288)) ([989b05f](https://github.com/awslabs/goformation/commit/989b05fa78cb9e72f6d59298fb8bb287612f322e))
+
+# [4.13.0](https://github.com/awslabs/goformation/compare/v4.12.0...v4.13.0) (2020-07-26)
+
+
+### Features
+
+* **schema:** adding AWS::Serverless::StateMachine and FileSystemConfigs to Function ([#284](https://github.com/awslabs/goformation/issues/284)) ([d2d23ca](https://github.com/awslabs/goformation/commit/d2d23cafba606a8ea40649cc666073fa0e2d5ad3))
+
+# [4.12.0](https://github.com/awslabs/goformation/compare/v4.11.0...v4.12.0) (2020-07-21)
+
+
+### Features
+
+* **schema:** Add new DynamoDBEvent options ([#289](https://github.com/awslabs/goformation/issues/289)) ([741228d](https://github.com/awslabs/goformation/commit/741228d6923ea10f1d22a901bbddf106d5c71cd7))
+
+# [4.11.0](https://github.com/awslabs/goformation/compare/v4.10.1...v4.11.0) (2020-06-28)
+
+
+### Features
+
+* **schema:** CFN Updates ([#287](https://github.com/awslabs/goformation/issues/287)) ([9778479](https://github.com/awslabs/goformation/commit/97784795e35035b71b946d0ca69ef4d380d3b4a8))
+
+## [4.10.1](https://github.com/awslabs/goformation/compare/v4.10.0...v4.10.1) (2020-06-22)
+
+
+### Bug Fixes
+
+* **generator:** update the generation making it easier to fix CF schema errors to generate ([#285](https://github.com/awslabs/goformation/issues/285)) ([6751e5b](https://github.com/awslabs/goformation/commit/6751e5b6ecbe1daee45171528cb1300efc6fb300))
+
+# [4.10.0](https://github.com/awslabs/goformation/compare/v4.9.0...v4.10.0) (2020-06-22)
+
+
+### Features
+
+* **schema:** Serverless eventbridgeruleevent ([#279](https://github.com/awslabs/goformation/issues/279)) ([2a9e572](https://github.com/awslabs/goformation/commit/2a9e572313485023dc4e57cb8facda72a3571307))
+
+# [4.9.0](https://github.com/awslabs/goformation/compare/v4.8.0...v4.9.0) (2020-06-22)
+
+
+### Features
+
+* **schema:** Add OpenApiVersion field to serverless Api ([#281](https://github.com/awslabs/goformation/issues/281)) ([bccc71b](https://github.com/awslabs/goformation/commit/bccc71b90531fb6bba8465b578fc2accc4dc6e34))
+
+# [4.8.0](https://github.com/awslabs/goformation/compare/v4.7.1...v4.8.0) (2020-04-04)
+
+
+### Features
+
+* **schema:** Add UpdateReplacePolicy to the templates and the policies so that it is generated for every resource ([#272](https://github.com/awslabs/goformation/issues/272)) ([696c515](https://github.com/awslabs/goformation/commit/696c515bcbb07105683a328ef0e161d62146114b))
+
+## [4.7.1](https://github.com/awslabs/goformation/compare/v4.7.0...v4.7.1) (2020-04-04)
+
+
+### Bug Fixes
+
+* **intrinsics:** change Fn::Sub to allow AWS pseudo parameters ([#275](https://github.com/awslabs/goformation/issues/275)) ([5a48c27](https://github.com/awslabs/goformation/commit/5a48c27630b945dcdc33133defd0241f898ccc52)), closes [#274](https://github.com/awslabs/goformation/issues/274) [#202](https://github.com/awslabs/goformation/issues/202)
+
+# [4.7.0](https://github.com/awslabs/goformation/compare/v4.6.0...v4.7.0) (2020-02-28)
+
+
+### Features
+
+* **schema:** Added CloudWatch Logs event for SAM ([#271](https://github.com/awslabs/goformation/issues/271)) ([fedb013](https://github.com/awslabs/goformation/commit/fedb013e3b19ab1242cf8e3ae28a40240103d9b1))
+
+# [4.6.0](https://github.com/awslabs/goformation/compare/v4.5.1...v4.6.0) (2020-02-22)
+
+
+### Features
+
+* **schema:** CloudFormation Updates (2020-02-22) ([#269](https://github.com/awslabs/goformation/issues/269)) ([ffd88a6](https://github.com/awslabs/goformation/commit/ffd88a6a9b0349853517e811169ee66804d79a2e))
+
+## [4.5.1](https://github.com/awslabs/goformation/compare/v4.5.0...v4.5.1) (2020-02-14)
+
+
+### Bug Fixes
+
+* **schema, parser:** change Transform json schema to allow multiple macros ([#268](https://github.com/awslabs/goformation/issues/268)) ([072fc74](https://github.com/awslabs/goformation/commit/072fc74628c8ee9a603c2e502ac458af916afc07)), closes [#267](https://github.com/awslabs/goformation/issues/267)
+
+# [4.5.0](https://github.com/awslabs/goformation/compare/v4.4.0...v4.5.0) (2020-02-13)
+
+
+### Features
+
+* **schema:** CloudFormation Updates (2020-02-13) ([#266](https://github.com/awslabs/goformation/issues/266)) ([bc75922](https://github.com/awslabs/goformation/commit/bc75922eb604d6e43f290912234a644c4d7584b5))
+
+# [4.4.0](https://github.com/awslabs/goformation/compare/v4.3.0...v4.4.0) (2020-01-30)
+
+
+### Features
+
+* **schema:** CloudFormation Updates (2020-01-30) ([#263](https://github.com/awslabs/goformation/issues/263)) ([fda2d31](https://github.com/awslabs/goformation/commit/fda2d31f384eabbbf432ad1ee77ff8db6d0f2e73))
+
+# [4.3.0](https://github.com/awslabs/goformation/compare/v4.2.0...v4.3.0) (2020-01-30)
+
+
+### Features
+
+* **schema:** add CloudFormation parameter type ([#259](https://github.com/awslabs/goformation/issues/259)) ([27fe204](https://github.com/awslabs/goformation/commit/27fe204f7addb8cb1bd6e977b0f717c04b09364a))
+
+# [4.2.0](https://github.com/awslabs/goformation/compare/v4.1.0...v4.2.0) (2020-01-29)
+
+
+### Features
+
+* **parser:** Add support for Conditions ([#260](https://github.com/awslabs/goformation/issues/260)) ([1b00f17](https://github.com/awslabs/goformation/commit/1b00f17a33109023ad8a4471812448dc1d0db776))
+
+# [4.1.0](https://github.com/awslabs/goformation/compare/v4.0.3...v4.1.0) (2019-12-09)
+
+
+### Features
+
+* **schema:** CloudFormation Updates (2019-12-09) ([#251](https://github.com/awslabs/goformation/issues/251)) ([a23ba41](https://github.com/awslabs/goformation/commit/a23ba416a24649c7296a0bc507c7940d9082ea30))
+
+## [4.0.3](https://github.com/awslabs/goformation/compare/v4.0.2...v4.0.3) (2019-11-30)
+
+
+### Bug Fixes
+
+* **schema:** AWS::Serverless::Function S3 notification filters ([#249](https://github.com/awslabs/goformation/issues/249)) ([a50ef92](https://github.com/awslabs/goformation/commit/a50ef9291026420ea8a5e74790fc49b8a9c7fd85)), closes [#74](https://github.com/awslabs/goformation/issues/74)
+
+## [4.0.2](https://github.com/awslabs/goformation/compare/v4.0.1...v4.0.2) (2019-11-30)
+
+
+### Bug Fixes
+
+* **schema:** AWS::Serverless:Api.Cors ([#246](https://github.com/awslabs/goformation/issues/246)) ([62fd56a](https://github.com/awslabs/goformation/commit/62fd56a62586c65722f99dbd4c8308ab42fcfc1d)), closes [#244](https://github.com/awslabs/goformation/issues/244)
+
+## [4.0.1](https://github.com/awslabs/goformation/compare/v4.0.0...v4.0.1) (2019-11-30)
+
+
+### Bug Fixes
+
+* **schema:** AWS::Serverless::Api.MethodSettings should be a list ([a1f340a](https://github.com/awslabs/goformation/commit/a1f340a07e0ba4f21b8655da2c4d608849278901)), closes [#242](https://github.com/awslabs/goformation/issues/242)
+
+# [4.0.0](https://github.com/awslabs/goformation/compare/v3.1.0...v4.0.0) (2019-11-30)
+
+
+* Fix method conflicts (#245) ([d0b0a8b](https://github.com/awslabs/goformation/commit/d0b0a8bc322e27f72e840c9847f3c822d4efa933)), closes [#245](https://github.com/awslabs/goformation/issues/245) [#241](https://github.com/awslabs/goformation/issues/241) [#294](https://github.com/awslabs/goformation/issues/294)
+
+
+### BREAKING CHANGES
+
+* This change refactors the DependsOn, Metadata, CreationPolicy,
+UpdatePolicy and DeletionPolicy methods on each resource to a new
+name. This is required, as some CloudFormation resources use these
+keywords as properties (AWS::AppMesh::Route.GrpcRouteMatch has a
+Metadata field for example), which causes a conflict.
+
+`resource.DependsOn()` method is refactored to `resource.AWSCloudFormationDependsOn` field.
+`resource.SetDependsOn()` method is refactored to `resource.AWSCloudFormationDependsOn` field.
+`resource.Metadata()` method is refactored to `resource.AWSCloudFormationMetadata` field.
+`resource.SetMetadata()` method is refactored to `resource.AWSCloudFormationMetadata` field.
+`resource.CreationPolicy()` method is refactored to `resource.AWSCloudFormationCreationPolicy` field.
+`resource.SetCreationPolicy()` method is refactored to `resource.AWSCloudFormationCreationPolicy` field.
+`resource.UpdatePolicy()` method is refactored to `resource.AWSCloudFormationUpdatePolicy` field.
+`resource.SetUpdatePolicy()` method is refactored to `resource.AWSCloudFormationUpdatePolicy` field.
+`resource.DeletionPolicy()` method is refactored to `resource.AWSCloudFormationDeletionPolicy` field.
+`resource.SetDeletionPolicy()` method is refactored to `resource.AWSCloudFormationDeletionPolicy` field.
+
+# [3.1.0](https://github.com/awslabs/goformation/compare/v3.0.1...v3.1.0) (2019-10-29)
+
+
+### Features
+
+* **schema:** AWS CloudFormation Update (2019-10-29) ([#239](https://github.com/awslabs/goformation/issues/239)) ([7ff8499](https://github.com/awslabs/goformation/commit/7ff84990c89e11815d22e06d377e110ae422cc17))
+
+## [3.0.1](https://github.com/awslabs/goformation/compare/v3.0.0...v3.0.1) (2019-10-29)
+
+
+### Bug Fixes
+
+* **schema:** Ordered cloudformation/all.go file ([#238](https://github.com/awslabs/goformation/issues/238)) ([91254f3](https://github.com/awslabs/goformation/commit/91254f30925b89db5e79604d812a1ee9279267bd))
+
+# [3.0.0](https://github.com/awslabs/goformation/compare/v2.3.1...v3.0.0) (2019-10-27)
+
+
+* Group CloudFormation resources by AWS service name (#234) ([d0749e6](https://github.com/awslabs/goformation/commit/d0749e6a8fc5e7b0ddc301aef0170e12c7dc459c)), closes [#234](https://github.com/awslabs/goformation/issues/234)
+
+
+### BREAKING CHANGES
+
+* this change moves all Cloudformation resources to
+packages based on the AWS service name. The main motivation for this is
+that building goformation on some platforms (Windows) failed due to too
+many files in the old cloudformation/resources package. This new package
+style has a nice benefit of slightly nicer to use API, but is a breaking
+change and will require refactoring existing codebases to update to v3.
+
+Old usage:
+
+```go
+import "github.com/awslabs/goformation/v2/cloudformation/resources"
+
+... snip ...
+
+topic := &resources.AWSSNSTopic{}
+```
+
+New usage:
+
+```go
+import "github.com/awslabs/goformation/v4/cloudformation/sns"
+
+...snip...
+
+topic := &sns.Topic{}
+```
+
+Most tests are still failing at this point and need refactoring.
+
+* fix(schema): Tag handling
+
+Fixed tag handling for new grouped resources style (via new tags.Tag
+struct).
+
+* fix(schema): SAM specification
+
+SAM Specification now generates nicely with new grouped resources
+format. Also all tests are now passing \o/
+
+# [2.3.0](https://github.com/awslabs/goformation/compare/v2.2.2...v2.3.0) (2019-03-20)
+
+
+### Bug Fixes
+
+* **parser:** Unmarshalling of resources with polymorphic properties (like S3 events) now works ([#188](https://github.com/awslabs/goformation/issues/188)) ([8eff90a](https://github.com/awslabs/goformation/commit/8eff90a))
+
+
+### Features
+
+* **sam:** Add support for `AWS::Serverless::Api.TracingEnabled`, `AWS::Serverless::Function.PermissionsBoundary`, `AWS::Serverless::Function.DynamoEvent.Enabled`, `AWS::Serverless::Function.KinesisEvent.Enabled`, and `AWS::Serverless::Function.SQSEvent.Enabled` ([#191](https://github.com/awslabs/goformation/issues/191)) ([38f0187](https://github.com/awslabs/goformation/commit/38f0187))
+* **schema:** AWS CloudFormation Update (2019-03-15) ([#189](https://github.com/awslabs/goformation/issues/189)) ([8b332a4](https://github.com/awslabs/goformation/commit/8b332a4))
+
+## [2.2.2](https://github.com/awslabs/goformation/compare/v2.2.1...v2.2.2) (2019-03-13)
+
+
+### Bug Fixes
+
+* **parser:** Select the correct AWS CloudFormation resource type based on similarity ([#183](https://github.com/awslabs/goformation/issues/183)) ([5749b23](https://github.com/awslabs/goformation/commit/5749b23))
+
+## [2.2.1](https://github.com/awslabs/goformation/compare/v2.2.0...v2.2.1) (2019-03-10)
+
+
+### Bug Fixes
+
+* **parser:** fix invalid YAML template error for custom tag marshaler ([#177](https://github.com/awslabs/goformation/issues/177)) ([035d438](https://github.com/awslabs/goformation/commit/035d438))
+
+# [2.2.0](https://github.com/awslabs/goformation/compare/v2.1.5...v2.2.0) (2019-03-10)
+
+
+### Features
+
+* **schema:** regenerated resources to apply SAM schema fixes from previous PR ([b30c019](https://github.com/awslabs/goformation/commit/b30c019))
+
+## [2.1.5](https://github.com/awslabs/goformation/compare/v2.1.4...v2.1.5) (2019-03-10)
+
+
+### Bug Fixes
+
+* **parser:** do not break if a non-intrinsic `Condition` statement is found in a YAML template ([#169](https://github.com/awslabs/goformation/issues/169)) ([e4671e3](https://github.com/awslabs/goformation/commit/e4671e3))
+
+## [2.1.4](https://github.com/awslabs/goformation/compare/v2.1.3...v2.1.4) (2019-03-10)
+
+
+### Bug Fixes
+
+* **schema:** fixed incorrect field type for AWS::Serverless::Application.Location ([#167](https://github.com/awslabs/goformation/issues/167)) ([3f1817b](https://github.com/awslabs/goformation/commit/3f1817b))
+
+## [2.1.3](https://github.com/awslabs/goformation/compare/v2.1.2...v2.1.3) (2019-03-10)
+
+
+### Bug Fixes
+
+* **schema:** maps within YAML templates should allow unknown fields/properties ([3b6e359](https://github.com/awslabs/goformation/commit/3b6e359))
+
+## [2.1.2](https://github.com/awslabs/goformation/compare/v2.1.1...v2.1.2) (2019-03-10)
+
+
+### Bug Fixes
+
+* **CI:** fix broken GitHub PR integration ([#185](https://github.com/awslabs/goformation/issues/185)) ([d42d00a](https://github.com/awslabs/goformation/commit/d42d00a))
+
+## [2.1.1](https://github.com/awslabs/goformation/compare/v2.1.0...v2.1.1) (2019-03-10)
+
+
+### Bug Fixes
+
+* **CI:** only run semantic-release on push-to-master (not on pull requests) ([#184](https://github.com/awslabs/goformation/issues/184)) ([c83945a](https://github.com/awslabs/goformation/commit/c83945a))
+
+# [2.1.0](https://github.com/awslabs/goformation/compare/v2.0.0...v2.1.0) (2019-03-10)
+
+
+### Features
+
+* **CI:** auto-generate AUTHORS.md file ([b37af7b](https://github.com/awslabs/goformation/commit/b37af7b))
+
+# Semantic Versioning Changelog
+
+# [2.0.0](https://github.com/awslabs/goformation/compare/v1.4.1...v2.0.0) (2019-03-10)
+
+
+### Code Refactoring
+
+* **generator:** moving resources and policies into their own packages ([#161](https://github.com/awslabs/goformation/issues/161)) ([03a0123](https://github.com/awslabs/goformation/commit/03a0123))
+
+
+### BREAKING CHANGES
+
+* **generator:** this PR refactors the auto-generated CloudFormation resources out of the cloudformation package and into a dedicated package (resources). This helps keep the auto generated files separate from others.
+
+E.g. cloudformation.AWSSnsTopic{} becomes resources.AWSSnsTopic{}
+
+## [1.4.1](https://github.com/awslabs/goformation/compare/v1.4.0...v1.4.1) (2019-03-10)
+
+
+### Bug Fixes
+
+* **spec:** corrected AWS::Serverless::Api.Auth.Authorizers to be of type JSON rather than string  ([#164](https://github.com/awslabs/goformation/issues/164)) ([4cf1bee](https://github.com/awslabs/goformation/commit/4cf1bee))
+
+# [1.4.0](https://github.com/awslabs/goformation/compare/v1.3.0...v1.4.0) (2019-03-09)
+
+
+### Features
+
+* **parser:** Default to parsing as YAML unless the filename ends in .json ([#176](https://github.com/awslabs/goformation/issues/176)) ([42e7146](https://github.com/awslabs/goformation/commit/42e7146))
+
+# [1.3.0](https://github.com/awslabs/goformation/compare/v1.2.1...v1.3.0) (2019-03-09)
+
+
+### Bug Fixes
+
+* **CI:** speed up PR builds by only downloading the cfn spec and regenerating resources on cron schedule (not on every build) ([7ae2a32](https://github.com/awslabs/goformation/commit/7ae2a32))
+* **CI:** Update TravisCI configuration based on https://github.com/se… ([#180](https://github.com/awslabs/goformation/issues/180)) ([88e1e85](https://github.com/awslabs/goformation/commit/88e1e85))
+* **CI:** Update TravisCI configuration for semantic-release to use jobs ([f6c2fee](https://github.com/awslabs/goformation/commit/f6c2fee))
+
+
+### Features
+
+* Added semantic-release CI setup ([a9b368a](https://github.com/awslabs/goformation/commit/a9b368a))
+* Added semantic-release configuration file ([3b25fdb](https://github.com/awslabs/goformation/commit/3b25fdb))
diff --git a/goformation/CODE_OF_CONDUCT.md b/goformation/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000000..a95bc6820b
--- /dev/null
+++ b/goformation/CODE_OF_CONDUCT.md
@@ -0,0 +1,46 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as contributors and maintainers pledge to making participation in our project and our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, or to ban temporarily or permanently any contributor for other behaviors that they deem inappropriate, threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. Representation of a project may be further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at goformation@amazon.com. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
\ No newline at end of file
diff --git a/goformation/CONTRIBUTING.md b/goformation/CONTRIBUTING.md
new file mode 100644
index 0000000000..f26de00552
--- /dev/null
+++ b/goformation/CONTRIBUTING.md
@@ -0,0 +1,204 @@
+# Contributing to GoFormation
+
+✨ Thanks for contributing to **GoFormation**! ✨
+
+As a contributor, here are the guidelines we would like you to follow:
+- [Code of conduct](#code-of-conduct)
+- [Submitting a Pull Request](#submitting-a-pull-request)
+- [Coding rules](#coding-rules)
+  - [Source code](#source-code)
+  - [Commit message guidelines](#commit-message-guidelines)
+    - [Atomic commits](#atomic-commits)
+    - [Commit message format](#commit-message-format)
+    - [Revert](#revert)
+    - [Type](#type)
+    - [Subject](#subject)
+    - [Body](#body)
+    - [Footer](#footer)
+    - [Examples](#examples)
+- [Working with the code](#working-with-the-code)
+  - [Set up the workspace](#set-up-the-workspace)
+  - [Tests](#tests)
+  - [Commits](#commits)
+  - [Generating AWS CloudFormation Resources](#generating-aws-cloudformation-resources)
+
+We also recommend that you read [How to Contribute to Open Source](https://opensource.guide/how-to-contribute).
+
+## Code of conduct
+
+Help us keep **GoFormation** open and inclusive. Please read and follow our [Code of conduct](CODE_OF_CONDUCT.md).
+
+## Submitting a Pull Request
+
+Good pull requests, whether patches, improvements, or new features, are a fantastic help. They should remain focused in scope and avoid containing unrelated commits.
+
+**Please ask first** before embarking on any significant pull requests (e.g. implementing features, refactoring code), otherwise you risk spending a lot of time working on something that the project's developers might not want to merge into the project.
+
+If you have never created a pull request before, welcome 🎉 😄. [Here is a great tutorial](https://opensource.guide/how-to-contribute/#opening-a-pull-request) on how to send one :)
+
+Here is a summary of the steps to follow:
+
+1. [Set up the workspace](#set-up-the-workspace)
+2. If you cloned a while ago, get the latest changes from upstream and update dependencies:
+```bash
+$ git checkout master
+$ git pull upstream master
+```
+3. Create a new topic branch (off the main project development branch) to contain your feature, change, or fix:
+```bash
+$ git checkout -b <topic-branch-name>
+```
+4. Make your code changes, following the [Coding rules](#coding-rules)
+5. Push your topic branch up to your fork:
+```bash
+$ git push origin <topic-branch-name>
+```
+6. [Open a Pull Request](https://help.github.com/articles/creating-a-pull-request/#creating-the-pull-request) with a clear title and description.
+
+**Tips**:
+- For ambitious tasks, open a Pull Request as soon as possible with the `[WIP]` prefix in the title, in order to get feedback and help from the community.
+- [Allow GoFormation maintainers to make changes to your Pull Request branch](https://help.github.com/articles/allowing-changes-to-a-pull-request-branch-created-from-a-fork). This way, we can rebase it and make some minor changes if necessary. 
+
+## Coding rules
+
+### Source code
+
+To ensure consistency and quality throughout the source code, all code modifications must have:
+- A [test](#tests) for every possible case introduced by your code change
+- [Valid commit message(s)](#commit-message-guidelines)
+- Documentation for new features
+- Updated documentation for modified features
+
+### Commit message guidelines
+
+#### Atomic commits
+
+If possible, make [atomic commits](https://en.wikipedia.org/wiki/Atomic_commit), which means:
+- a commit should contain exactly one self-contained functional change
+- a functional change should be contained in exactly one commit
+- a commit should not create an inconsistent state (such as test errors, linting errors, partial fix, feature with documentation etc...)
+
+A complex feature can be broken down into multiple commits as long as each one maintains a consistent state and consists of a self-contained change.
+
+#### Commit message format
+
+Each commit message consists of a **header**, a **body** and a **footer**. The header has a special format that includes a **type**, a **scope** and a **subject**:
+
+```commit
+<type>(<scope>): <subject>
+<BLANK LINE>
+<body>
+<BLANK LINE>
+<footer>
+```
+
+The **header** is mandatory and the **scope** of the header is optional.
+
+The **footer** can contain a [closing reference to an issue](https://help.github.com/articles/closing-issues-via-commit-messages).
+
+#### Revert
+
+If the commit reverts a previous commit, it should begin with `revert: `, followed by the header of the reverted commit. In the body it should say: `This reverts commit <hash>.`, where the hash is the SHA of the commit being reverted.
+
+#### Type
+
+The type must be one of the following:
+
+| Type         | Description                                                                                                 |
+| ------------ | ----------------------------------------------------------------------------------------------------------- |
+| **build**    | Changes that affect the build system or external dependencies (go)                                          |
+| **ci**       | Changes to our CI configuration files and scripts (example scopes: Travis, Circle, BrowserStack, SauceLabs) |
+| **docs**     | Documentation only changes                                                                                  |
+| **feat**     | A new feature                                                                                               |
+| **fix**      | A bug fix                                                                                                   |
+| **perf**     | A code change that improves performance                                                                     |
+| **refactor** | A code change that neither fixes a bug nor adds a feature                                                   |
+| **style**    | Changes that do not affect the meaning of the code (white-space, formatting, missing semi-colons, etc)      |
+| **test**     | Adding missing tests or correcting existing tests                                                           |
+
+#### Subject
+
+The subject contains succinct description of the change:
+
+- use the imperative, present tense: "change" not "changed" nor "changes"
+- don't capitalize first letter
+- no dot (.) at the end
+
+#### Body
+Just as in the **subject**, use the imperative, present tense: "change" not "changed" nor "changes".
+The body should include the motivation for the change and contrast this with previous behavior.
+
+#### Footer
+The footer should contain any information about **Breaking Changes** and is also the place to reference GitHub issues that this commit **Closes**.
+
+**Breaking Changes** should start with the word `BREAKING CHANGE:` with a space or two newlines. The rest of the commit message is then used for this.
+
+#### Examples
+
+```commit
+`fix(pencil): stop graphite breaking when too much pressure applied`
+```
+
+```commit
+`feat(pencil): add 'graphiteWidth' option`
+
+Fix #42
+```
+
+```commit
+perf(pencil): remove graphiteWidth option`
+
+BREAKING CHANGE: The graphiteWidth option has been removed.
+
+The default graphite width of 10mm is always used for performance reasons.
+```
+
+## Working with the code
+
+### Set up the workspace
+
+[Fork](https://guides.github.com/activities/forking/#fork) the project, [clone](https://guides.github.com/activities/forking/#clone) your fork, configure the remotes and install the dependencies:
+
+```bash
+# Clone your fork of the repo into the current directory
+$ git clone https://github.com/<your-github-user>/goformation
+# Navigate to the newly cloned directory
+$ cd goformation
+# Assign the original repo to a remote called "upstream"
+$ git remote add upstream https://github.com/awslabs/goformation
+```
+
+### Tests
+
+Before pushing your code changes make sure all **tests pass**.
+
+```bash
+$ go test ./...
+```
+
+### Commits
+
+The [GoFormation](https://github.com/awslabs/goformation) repository uses [semantic-release](https://github.com/semantic-release/semantic-release) to automatically generate CHANGELOG entries, and cut releases based on commit messages. It's important to follow the [commit message guidelines](#commit-message-guidelines) so that this process continues to work.
+
+To make things easier, you can use a tool like [Commitizen CLI](https://github.com/commitizen/cz-cli) to help you craft your commit messages. 
+
+After staging your changes with `git add`, run `npx git-cz` to start the interactive commit message CLI.
+
+### Generating AWS CloudFormation Resources
+
+While you work on features, you may want to regenerate the CloudFormation resources in GoFormation. To do this, run:
+
+```
+$ go generate
+GoFormation Resource Generator
+Downloading cloudformation specification from https://d1uauaxba7bl26.cloudfront.net/latest/gzip/CloudFormationResourceSpecification.json
+Downloading sam specification from file://generate/sam-2016-10-31.json
+Updated the following AWS CloudFormation resources:
+ - AWS::Serverless::Application
+ - AWS::SNS::Topic
+Processed 1161 resources
+
+```
+You will see a summary of the resources that have been updated, and for more detailed changes you can just run `git diff`.
+
+If your contributions to GoFormation include regenerating resources (e.g. you make a change to the resource template, which modifies all resources), please make sure to run the `go generate` in a different git commit. This will make the pull request review process a lot easier for everybody involved :)
\ No newline at end of file
diff --git a/goformation/LICENSE b/goformation/LICENSE
new file mode 100644
index 0000000000..8dada3edaf
--- /dev/null
+++ b/goformation/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/goformation/LOGO.md b/goformation/LOGO.md
new file mode 100644
index 0000000000..2ee15f0324
--- /dev/null
+++ b/goformation/LOGO.md
@@ -0,0 +1,10 @@
+# AWS GoFormation logo information
+
+The AWS GoFormation logo is a custom work, based on the following artworks/assets:
+
+* [Go gopher app engine color](https://commons.wikimedia.org/wiki/File:Go_gopher_app_engine_color.jpg) logo, created by [Renee French](http://reneefrench.blogspot.com/) and modified by [Pelayo Sanchez](https://github.com/pesama). Original work licensed under Creative Commons [Attribution-Share Alike 3.0 Unported](https://creativecommons.org/licenses/by-sa/3.0/deed.en) license.
+
+* [Sallita](https://www.dafont.com/es/sallita.font?l[]=10&l[]=1) font used for `goformation` text, shared by Amarlettering with free license.
+
+* AWS CloudFormation logo.
+
diff --git a/goformation/NOTICE b/goformation/NOTICE
new file mode 100644
index 0000000000..595536ae35
--- /dev/null
+++ b/goformation/NOTICE
@@ -0,0 +1,2 @@
+GoFormation
+Copyright 2011-2017 Amazon.com, Inc. or its affiliates. All Rights Reserved. 
diff --git a/goformation/README.md b/goformation/README.md
new file mode 100644
index 0000000000..baecde0a7d
--- /dev/null
+++ b/goformation/README.md
@@ -0,0 +1,249 @@
+![AWS GoFormation logo](./static/logo.png)
+
+# AWS GoFormation
+
+![Version](https://img.shields.io/github/v/release/awslabs/goformation?label=stable%20version) ![Commits since release](https://img.shields.io/github/commits-since/awslabs/goformation/latest) [![Actions Status](https://github.com/awslabs/goformation/workflows/Release/badge.svg)](https://github.com/awslabs/goformation/actions) ![Update Schema](https://github.com/awslabs/goformation/workflows/Update%20Schema/badge.svg) [![GoDoc Reference](https://godoc.org/gopkg.in/awslabs/goformation.v1?status.svg)](http://godoc.org/github.com/awslabs/goformation) ![Apache-2.0](https://img.shields.io/badge/Licence-Apache%202.0-blue.svg) ![Downloads](https://img.shields.io/github/downloads/awslabs/goformation/total)
+ 
+`GoFormation` is a Go library for working with AWS CloudFormation / AWS Serverless Application Model (SAM) templates.
+- [Main features](#main-features)
+- [Installation](#installation)
+- [Usage](#usage)
+	- [Marshalling CloudFormation/SAM described with Go structs, into YAML/JSON](#marshalling-cloudformationsam-described-with-go-structs-into-yamljson)
+	- [Unmarshalling CloudFormation YAML/JSON into Go structs](#unmarshalling-cloudformation-yamljson-into-go-structs)
+- [Updating CloudFormation / SAM Resources in GoFormation](#updating-cloudformation--sam-resources-in-goformation)
+- [Advanced](#advanced)
+	- [AWS CloudFormation Intrinsic Functions](#aws-cloudformation-intrinsic-functions)
+		- [Resolving References (Ref)](#resolving-references-ref)
+- [Versioning](#versioning)
+- [Contributing](#contributing)
+
+## Main features
+
+ * Describe AWS CloudFormation and AWS SAM templates as Go objects (structs), and then turn it into JSON/YAML.
+ * Parse JSON/YAML AWS CloudFormation and AWS SAM templates and turn them into Go structs.
+ * Strongly typed Go structs generated for every AWS CloudFormation and AWS SAM resource.
+ * Automatically generated, from the published AWS CloudFormation Resource Specification.
+
+## Installation
+
+As with other Go libraries, GoFormation can be installed with `go get`.
+
+```
+$ go get github.com/awslabs/goformation/v4
+```
+
+## Usage
+
+### Marshalling CloudFormation/SAM described with Go structs, into YAML/JSON
+
+Below is an example of building a CloudFormation template programmatically, then outputting the resulting JSON
+
+```go
+package main
+
+import (
+	"fmt"
+	"strconv"
+	"time"
+
+	"github.com/awslabs/goformation/v4/cloudformation"
+	"github.com/awslabs/goformation/v4/cloudformation/sns"
+
+
+)
+
+func main() {
+
+	// Create a new CloudFormation template
+	template := cloudformation.NewTemplate()
+
+	// Create an Amazon SNS topic, with a unique name based off the current timestamp
+	template.Resources["MyTopic"] = &sns.Topic{
+		TopicName: "my-topic-" + strconv.FormatInt(time.Now().Unix(), 10),
+	}
+
+	// Create a subscription, connected to our topic, that forwards notifications to an email address
+	template.Resources["MyTopicSubscription"] = &sns.Subscription{
+		TopicArn: cloudformation.Ref("MyTopic"),
+		Protocol: "email",
+		Endpoint: "some.email@example.com",
+	}
+
+	// Let's see the JSON AWS CloudFormation template
+	j, err := template.JSON()
+	if err != nil {
+		fmt.Printf("Failed to generate JSON: %s\n", err)
+	} else {
+		fmt.Printf("%s\n", string(j))
+	}
+
+	// and also the YAML AWS CloudFormation template
+	y, err := template.YAML()
+	if err != nil {
+		fmt.Printf("Failed to generate YAML: %s\n", err)
+	} else {
+		fmt.Printf("%s\n", string(y))
+	}
+
+}
+```
+
+Would output the following JSON template:
+
+```javascript
+{
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Resources": {
+    "MyTopic": {
+      "Properties": {
+        "TopicName": "my-topic-1536878058"
+      },
+      "Type": "AWS::SNS::Topic"
+    },
+    "MyTopicSubscription": {
+      "Properties": {
+        "Endpoint": "some.email@example.com",
+        "Protocol": "email",
+        "TopicArn": {
+          "Ref": "MyTopic"
+        }
+      },
+      "Type": "AWS::SNS::Subscription"
+    }
+  }
+}
+```
+
+...and the following YAML template:
+
+```yaml
+AWSTemplateFormatVersion: 2010-09-09
+Resources:
+  MyTopic:
+    Properties:
+      TopicName: my-topic-1536878058
+    Type: AWS::SNS::Topic
+  MyTopicSubscription:
+    Properties:
+      Endpoint: some.email@example.com
+      Protocol: email
+      TopicArn:
+        Ref: MyTopic
+    Type: AWS::SNS::Subscription
+```
+
+When creating templates, you can use the following convenience functions to use [AWS CloudFormation Intrinsics](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference.html):
+
+ - `cloudformation.Ref(logicalName string)`
+ - `cloudformation.GetAtt(logicalName string, attribute string)`
+ - `cloudformation.ImportValue(name string)`
+ - `cloudformation.Base64(input string)`
+ - `cloudformation.CIDR(ipBlock, count, cidrBits string)`
+ - `cloudformation.FindInMap(mapName, topLevelKey, secondLevelKey string)`
+ - `cloudformation.GetAZs(region string)`
+ - `cloudformation.Join(delimiter string, values []string)`
+ - `cloudformation.Select(index string, list []string)`
+ - `cloudformation.Split(delimiter, source string)`
+ - `cloudformation.Sub(value string)`
+ - `And(conditions []string)`
+ - `Equals(value1, value2 string)`
+ - `If(value, ifEqual, ifNotEqual string)`
+ - `Not(conditions []string)`
+ - `Or(conditions []string)`
+
+### Unmarshalling CloudFormation YAML/JSON into Go structs
+
+GoFormation also works the other way - parsing JSON/YAML CloudFormation/SAM templates into Go structs.
+
+```go
+package main
+
+import (
+	"log"
+
+	"github.com/awslabs/goformation/v4"
+)
+
+func main() {
+
+	// Open a template from file (can be JSON or YAML)
+	template, err := goformation.Open("template.yaml")
+	if err != nil {
+		log.Fatalf("There was an error processing the template: %s", err)
+	}
+
+	// You can extract all resources of a certain type
+	// Each AWS CloudFormation resource is a strongly typed struct
+	functions := template.GetAllServerlessFunctionResources()
+	for name, function := range functions {
+
+		// E.g. Found a AWS::Serverless::Function named GetHelloWorld (runtime: nodejs6.10)
+		log.Printf("Found a %s named %s (runtime: %s)\n", function.AWSCloudFormationType(), name, function.Runtime)
+
+	}
+
+	// You can also search for specific resources by their logicalId
+	search := "GetHelloWorld"
+	function, err := template.GetServerlessFunctionWithName(search)
+	if err != nil {
+		log.Fatalf("Function not found")
+	}
+
+	// E.g. Found a AWS::Serverless::Function named GetHelloWorld (runtime: nodejs6.10)
+	log.Printf("Found a %s named %s (runtime: %s)\n", function.AWSCloudFormationType(), search, function.Runtime)
+
+}
+```
+
+## Updating CloudFormation / SAM Resources in GoFormation
+
+AWS GoFormation contains automatically generated Go structs for every CloudFormation/SAM resource, located in the [cloudformation/](cloudformation/) directory. These can be generated, from the latest [AWS CloudFormation Resource Specification](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-resource-specification.html) published for `us-east-1` by just running `go generate`:
+
+```
+$ go generate
+
+Generated 587 AWS CloudFormation resources from specification v1.4.2
+Generated 17 AWS SAM resources from specification v2016-10-31
+Generated JSON Schema: schema/cloudformation.schema.json
+```
+
+The GoFormation build pipeline automatically checks for any updated AWS CloudFormation resources on a daily basis, and creates a pull request against this repository if any are found.
+
+## Advanced
+
+### AWS CloudFormation Intrinsic Functions
+
+The following [AWS CloudFormation Intrinsic Functions](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference.html) are supported in GoFormation:
+
+- [x] [Fn::Base64](intrinsics/fnbase64.go)
+- [x] [Fn::FindInMap](intrinsics/fnfindinmap.go)
+- [x] [Fn::Join](intrinsics/fnjoin.go)
+- [x] [Fn::Select](intrinsics/fnselect.go)
+- [x] [Fn::Split](intrinsics/fnsplit.go)
+- [x] [Fn::Sub](intrinsics/fnsub.go)
+- [x] [Ref](intrinsics/ref.go)
+- [x] [Fn::And](intrinsics/fnand.go)
+- [x] [Fn::Equals](intrinsics/fnequals.go)
+- [x] [Fn::If](intrinsics/fnif.go)
+- [x] [Fn::Not](intrinsics/fnnot.go)
+- [x] [Fn::Or](intrinsics/fnor.go)
+- [ ] Fn::GetAtt
+- [x] [Fn::GetAZs](intrinsics/fngetazs.go)
+- [ ] Fn::ImportValue
+
+Any unsupported intrinsic functions will return `nil`.
+
+#### Resolving References (Ref)
+
+When converting a YAML/JSON template to go, the intrinsic 'Ref' function as implemented will resolve all of the [pseudo parameters](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-ref.html) such as `AWS::AccountId` with their default value as listed on [the bottom of this page](http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/intrinsic-function-reference-ref.html).
+
+If a reference is not a pseudo parameter, GoFormation will try to resolve it within the AWS CloudFormation template. **Currently, this implementation only searches for `Parameters` with a name that matches the ref, and returns the `Default` if it has one.**
+
+
+## Versioning
+
+This library is automatically versioned and tagged using [semantic-release](https://github.com/semantic-release/semantic-release).
+
+## Contributing
+
+Contributions and feedback are welcome! Proposals and pull requests will be considered and responded to. For more information, see the [CONTRIBUTING](CONTRIBUTING.md) file.
diff --git a/goformation/cloudformation/README.md b/goformation/cloudformation/README.md
new file mode 100644
index 0000000000..a1e31aab26
--- /dev/null
+++ b/goformation/cloudformation/README.md
@@ -0,0 +1,5 @@
+### Important
+
+All resource files in this directory are auto-generated by running 'go generate' in the repository root directory.
+
+Do not manually edit any of generated resource files 
\ No newline at end of file
diff --git a/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer.go b/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer.go
new file mode 100644
index 0000000000..d6b1bd0d21
--- /dev/null
+++ b/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer.go
@@ -0,0 +1,124 @@
+package accessanalyzer
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Analyzer AWS CloudFormation Resource (AWS::AccessAnalyzer::Analyzer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-accessanalyzer-analyzer.html
+type Analyzer struct {
+
+	// AnalyzerName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-accessanalyzer-analyzer.html#cfn-accessanalyzer-analyzer-analyzername
+	AnalyzerName *types.Value `json:"AnalyzerName,omitempty"`
+
+	// ArchiveRules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-accessanalyzer-analyzer.html#cfn-accessanalyzer-analyzer-archiverules
+	ArchiveRules []Analyzer_ArchiveRule `json:"ArchiveRules,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-accessanalyzer-analyzer.html#cfn-accessanalyzer-analyzer-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-accessanalyzer-analyzer.html#cfn-accessanalyzer-analyzer-type
+	Type *types.Value `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 *Analyzer) AWSCloudFormationType() string {
+	return "AWS::AccessAnalyzer::Analyzer"
+}
+
+// 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 Analyzer) MarshalJSON() ([]byte, error) {
+	type Properties Analyzer
+	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 *Analyzer) UnmarshalJSON(b []byte) error {
+	type Properties Analyzer
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Analyzer(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_archiverule.go b/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_archiverule.go
new file mode 100644
index 0000000000..3ce7a2df88
--- /dev/null
+++ b/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_archiverule.go
@@ -0,0 +1,42 @@
+package accessanalyzer
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Analyzer_ArchiveRule AWS CloudFormation Resource (AWS::AccessAnalyzer::Analyzer.ArchiveRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-accessanalyzer-analyzer-archiverule.html
+type Analyzer_ArchiveRule struct {
+
+	// Filter AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-accessanalyzer-analyzer-archiverule.html#cfn-accessanalyzer-analyzer-archiverule-filter
+	Filter []Analyzer_Filter `json:"Filter,omitempty"`
+
+	// RuleName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-accessanalyzer-analyzer-archiverule.html#cfn-accessanalyzer-analyzer-archiverule-rulename
+	RuleName *types.Value `json:"RuleName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Analyzer_ArchiveRule) AWSCloudFormationType() string {
+	return "AWS::AccessAnalyzer::Analyzer.ArchiveRule"
+}
diff --git a/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_filter.go b/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_filter.go
new file mode 100644
index 0000000000..5f2028e8fe
--- /dev/null
+++ b/goformation/cloudformation/accessanalyzer/aws-accessanalyzer-analyzer_filter.go
@@ -0,0 +1,57 @@
+package accessanalyzer
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Analyzer_Filter AWS CloudFormation Resource (AWS::AccessAnalyzer::Analyzer.Filter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-accessanalyzer-analyzer-filter.html
+type Analyzer_Filter struct {
+
+	// Contains AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-accessanalyzer-analyzer-filter.html#cfn-accessanalyzer-analyzer-filter-contains
+	Contains *types.Value `json:"Contains,omitempty"`
+
+	// Eq AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-accessanalyzer-analyzer-filter.html#cfn-accessanalyzer-analyzer-filter-eq
+	Eq *types.Value `json:"Eq,omitempty"`
+
+	// Exists AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-accessanalyzer-analyzer-filter.html#cfn-accessanalyzer-analyzer-filter-exists
+	Exists *types.Value `json:"Exists,omitempty"`
+
+	// Neq AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-accessanalyzer-analyzer-filter.html#cfn-accessanalyzer-analyzer-filter-neq
+	Neq *types.Value `json:"Neq,omitempty"`
+
+	// Property AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-accessanalyzer-analyzer-filter.html#cfn-accessanalyzer-analyzer-filter-property
+	Property *types.Value `json:"Property,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Analyzer_Filter) AWSCloudFormationType() string {
+	return "AWS::AccessAnalyzer::Analyzer.Filter"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate.go b/goformation/cloudformation/acmpca/aws-acmpca-certificate.go
new file mode 100644
index 0000000000..2b381e810a
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificate.go
@@ -0,0 +1,138 @@
+package acmpca
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Certificate AWS CloudFormation Resource (AWS::ACMPCA::Certificate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificate.html
+type Certificate struct {
+
+	// ApiPassthrough AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificate.html#cfn-acmpca-certificate-apipassthrough
+	ApiPassthrough *Certificate_ApiPassthrough `json:"ApiPassthrough,omitempty"`
+
+	// CertificateAuthorityArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificate.html#cfn-acmpca-certificate-certificateauthorityarn
+	CertificateAuthorityArn *types.Value `json:"CertificateAuthorityArn,omitempty"`
+
+	// CertificateSigningRequest AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificate.html#cfn-acmpca-certificate-certificatesigningrequest
+	CertificateSigningRequest *types.Value `json:"CertificateSigningRequest,omitempty"`
+
+	// SigningAlgorithm AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificate.html#cfn-acmpca-certificate-signingalgorithm
+	SigningAlgorithm *types.Value `json:"SigningAlgorithm,omitempty"`
+
+	// TemplateArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificate.html#cfn-acmpca-certificate-templatearn
+	TemplateArn *types.Value `json:"TemplateArn,omitempty"`
+
+	// Validity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificate.html#cfn-acmpca-certificate-validity
+	Validity *Certificate_Validity `json:"Validity,omitempty"`
+
+	// ValidityNotBefore AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificate.html#cfn-acmpca-certificate-validitynotbefore
+	ValidityNotBefore *Certificate_Validity `json:"ValidityNotBefore,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Certificate) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::Certificate"
+}
+
+// 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 Certificate) MarshalJSON() ([]byte, error) {
+	type Properties Certificate
+	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 *Certificate) UnmarshalJSON(b []byte) error {
+	type Properties Certificate
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Certificate(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/acmpca/aws-acmpca-certificate_apipassthrough.go b/goformation/cloudformation/acmpca/aws-acmpca-certificate_apipassthrough.go
new file mode 100644
index 0000000000..3092d73896
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificate_apipassthrough.go
@@ -0,0 +1,40 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Certificate_ApiPassthrough AWS CloudFormation Resource (AWS::ACMPCA::Certificate.ApiPassthrough)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-apipassthrough.html
+type Certificate_ApiPassthrough struct {
+
+	// Extensions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-apipassthrough.html#cfn-acmpca-certificate-apipassthrough-extensions
+	Extensions *Certificate_Extensions `json:"Extensions,omitempty"`
+
+	// Subject AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-apipassthrough.html#cfn-acmpca-certificate-apipassthrough-subject
+	Subject *Certificate_Subject `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 *Certificate_ApiPassthrough) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::Certificate.ApiPassthrough"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_edipartyname.go b/goformation/cloudformation/acmpca/aws-acmpca-certificate_edipartyname.go
new file mode 100644
index 0000000000..5ae358c092
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificate_edipartyname.go
@@ -0,0 +1,42 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Certificate_EdiPartyName AWS CloudFormation Resource (AWS::ACMPCA::Certificate.EdiPartyName)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-edipartyname.html
+type Certificate_EdiPartyName struct {
+
+	// NameAssigner AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-edipartyname.html#cfn-acmpca-certificate-edipartyname-nameassigner
+	NameAssigner *types.Value `json:"NameAssigner,omitempty"`
+
+	// PartyName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-edipartyname.html#cfn-acmpca-certificate-edipartyname-partyname
+	PartyName *types.Value `json:"PartyName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Certificate_EdiPartyName) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::Certificate.EdiPartyName"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_extendedkeyusage.go b/goformation/cloudformation/acmpca/aws-acmpca-certificate_extendedkeyusage.go
new file mode 100644
index 0000000000..85db869454
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificate_extendedkeyusage.go
@@ -0,0 +1,42 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Certificate_ExtendedKeyUsage AWS CloudFormation Resource (AWS::ACMPCA::Certificate.ExtendedKeyUsage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-extendedkeyusage.html
+type Certificate_ExtendedKeyUsage struct {
+
+	// ExtendedKeyUsageObjectIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-extendedkeyusage.html#cfn-acmpca-certificate-extendedkeyusage-extendedkeyusageobjectidentifier
+	ExtendedKeyUsageObjectIdentifier *types.Value `json:"ExtendedKeyUsageObjectIdentifier,omitempty"`
+
+	// ExtendedKeyUsageType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-extendedkeyusage.html#cfn-acmpca-certificate-extendedkeyusage-extendedkeyusagetype
+	ExtendedKeyUsageType *types.Value `json:"ExtendedKeyUsageType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Certificate_ExtendedKeyUsage) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::Certificate.ExtendedKeyUsage"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_extensions.go b/goformation/cloudformation/acmpca/aws-acmpca-certificate_extensions.go
new file mode 100644
index 0000000000..40a78728a7
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificate_extensions.go
@@ -0,0 +1,50 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Certificate_Extensions AWS CloudFormation Resource (AWS::ACMPCA::Certificate.Extensions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-extensions.html
+type Certificate_Extensions struct {
+
+	// CertificatePolicies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-extensions.html#cfn-acmpca-certificate-extensions-certificatepolicies
+	CertificatePolicies []Certificate_PolicyInformation `json:"CertificatePolicies,omitempty"`
+
+	// ExtendedKeyUsage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-extensions.html#cfn-acmpca-certificate-extensions-extendedkeyusage
+	ExtendedKeyUsage []Certificate_ExtendedKeyUsage `json:"ExtendedKeyUsage,omitempty"`
+
+	// KeyUsage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-extensions.html#cfn-acmpca-certificate-extensions-keyusage
+	KeyUsage *Certificate_KeyUsage `json:"KeyUsage,omitempty"`
+
+	// SubjectAlternativeNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-extensions.html#cfn-acmpca-certificate-extensions-subjectalternativenames
+	SubjectAlternativeNames []Certificate_GeneralName `json:"SubjectAlternativeNames,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Certificate_Extensions) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::Certificate.Extensions"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_generalname.go b/goformation/cloudformation/acmpca/aws-acmpca-certificate_generalname.go
new file mode 100644
index 0000000000..d6c12d01cc
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificate_generalname.go
@@ -0,0 +1,72 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Certificate_GeneralName AWS CloudFormation Resource (AWS::ACMPCA::Certificate.GeneralName)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-generalname.html
+type Certificate_GeneralName struct {
+
+	// DirectoryName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-generalname.html#cfn-acmpca-certificate-generalname-directoryname
+	DirectoryName *Certificate_Subject `json:"DirectoryName,omitempty"`
+
+	// DnsName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-generalname.html#cfn-acmpca-certificate-generalname-dnsname
+	DnsName *types.Value `json:"DnsName,omitempty"`
+
+	// EdiPartyName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-generalname.html#cfn-acmpca-certificate-generalname-edipartyname
+	EdiPartyName *Certificate_EdiPartyName `json:"EdiPartyName,omitempty"`
+
+	// IpAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-generalname.html#cfn-acmpca-certificate-generalname-ipaddress
+	IpAddress *types.Value `json:"IpAddress,omitempty"`
+
+	// OtherName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-generalname.html#cfn-acmpca-certificate-generalname-othername
+	OtherName *Certificate_OtherName `json:"OtherName,omitempty"`
+
+	// RegisteredId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-generalname.html#cfn-acmpca-certificate-generalname-registeredid
+	RegisteredId *types.Value `json:"RegisteredId,omitempty"`
+
+	// Rfc822Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-generalname.html#cfn-acmpca-certificate-generalname-rfc822name
+	Rfc822Name *types.Value `json:"Rfc822Name,omitempty"`
+
+	// UniformResourceIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-generalname.html#cfn-acmpca-certificate-generalname-uniformresourceidentifier
+	UniformResourceIdentifier *types.Value `json:"UniformResourceIdentifier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Certificate_GeneralName) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::Certificate.GeneralName"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_keyusage.go b/goformation/cloudformation/acmpca/aws-acmpca-certificate_keyusage.go
new file mode 100644
index 0000000000..7d0118f469
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificate_keyusage.go
@@ -0,0 +1,77 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Certificate_KeyUsage AWS CloudFormation Resource (AWS::ACMPCA::Certificate.KeyUsage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-keyusage.html
+type Certificate_KeyUsage struct {
+
+	// CRLSign AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-keyusage.html#cfn-acmpca-certificate-keyusage-crlsign
+	CRLSign *types.Value `json:"CRLSign,omitempty"`
+
+	// DataEncipherment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-keyusage.html#cfn-acmpca-certificate-keyusage-dataencipherment
+	DataEncipherment *types.Value `json:"DataEncipherment,omitempty"`
+
+	// DecipherOnly AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-keyusage.html#cfn-acmpca-certificate-keyusage-decipheronly
+	DecipherOnly *types.Value `json:"DecipherOnly,omitempty"`
+
+	// DigitalSignature AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-keyusage.html#cfn-acmpca-certificate-keyusage-digitalsignature
+	DigitalSignature *types.Value `json:"DigitalSignature,omitempty"`
+
+	// EncipherOnly AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-keyusage.html#cfn-acmpca-certificate-keyusage-encipheronly
+	EncipherOnly *types.Value `json:"EncipherOnly,omitempty"`
+
+	// KeyAgreement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-keyusage.html#cfn-acmpca-certificate-keyusage-keyagreement
+	KeyAgreement *types.Value `json:"KeyAgreement,omitempty"`
+
+	// KeyCertSign AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-keyusage.html#cfn-acmpca-certificate-keyusage-keycertsign
+	KeyCertSign *types.Value `json:"KeyCertSign,omitempty"`
+
+	// KeyEncipherment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-keyusage.html#cfn-acmpca-certificate-keyusage-keyencipherment
+	KeyEncipherment *types.Value `json:"KeyEncipherment,omitempty"`
+
+	// NonRepudiation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-keyusage.html#cfn-acmpca-certificate-keyusage-nonrepudiation
+	NonRepudiation *types.Value `json:"NonRepudiation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Certificate_KeyUsage) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::Certificate.KeyUsage"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_othername.go b/goformation/cloudformation/acmpca/aws-acmpca-certificate_othername.go
new file mode 100644
index 0000000000..8a8a2aef10
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificate_othername.go
@@ -0,0 +1,42 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Certificate_OtherName AWS CloudFormation Resource (AWS::ACMPCA::Certificate.OtherName)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-othername.html
+type Certificate_OtherName struct {
+
+	// TypeId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-othername.html#cfn-acmpca-certificate-othername-typeid
+	TypeId *types.Value `json:"TypeId,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-othername.html#cfn-acmpca-certificate-othername-value
+	Value *types.Value `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 *Certificate_OtherName) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::Certificate.OtherName"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_policyinformation.go b/goformation/cloudformation/acmpca/aws-acmpca-certificate_policyinformation.go
new file mode 100644
index 0000000000..75e320cebe
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificate_policyinformation.go
@@ -0,0 +1,42 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Certificate_PolicyInformation AWS CloudFormation Resource (AWS::ACMPCA::Certificate.PolicyInformation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-policyinformation.html
+type Certificate_PolicyInformation struct {
+
+	// CertPolicyId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-policyinformation.html#cfn-acmpca-certificate-policyinformation-certpolicyid
+	CertPolicyId *types.Value `json:"CertPolicyId,omitempty"`
+
+	// PolicyQualifiers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-policyinformation.html#cfn-acmpca-certificate-policyinformation-policyqualifiers
+	PolicyQualifiers []Certificate_PolicyQualifierInfo `json:"PolicyQualifiers,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Certificate_PolicyInformation) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::Certificate.PolicyInformation"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_policyqualifierinfo.go b/goformation/cloudformation/acmpca/aws-acmpca-certificate_policyqualifierinfo.go
new file mode 100644
index 0000000000..dd2225a066
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificate_policyqualifierinfo.go
@@ -0,0 +1,42 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Certificate_PolicyQualifierInfo AWS CloudFormation Resource (AWS::ACMPCA::Certificate.PolicyQualifierInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-policyqualifierinfo.html
+type Certificate_PolicyQualifierInfo struct {
+
+	// PolicyQualifierId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-policyqualifierinfo.html#cfn-acmpca-certificate-policyqualifierinfo-policyqualifierid
+	PolicyQualifierId *types.Value `json:"PolicyQualifierId,omitempty"`
+
+	// Qualifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-policyqualifierinfo.html#cfn-acmpca-certificate-policyqualifierinfo-qualifier
+	Qualifier *Certificate_Qualifier `json:"Qualifier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Certificate_PolicyQualifierInfo) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::Certificate.PolicyQualifierInfo"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_qualifier.go b/goformation/cloudformation/acmpca/aws-acmpca-certificate_qualifier.go
new file mode 100644
index 0000000000..d95fedaa12
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificate_qualifier.go
@@ -0,0 +1,37 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Certificate_Qualifier AWS CloudFormation Resource (AWS::ACMPCA::Certificate.Qualifier)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-qualifier.html
+type Certificate_Qualifier struct {
+
+	// CpsUri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-qualifier.html#cfn-acmpca-certificate-qualifier-cpsuri
+	CpsUri *types.Value `json:"CpsUri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Certificate_Qualifier) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::Certificate.Qualifier"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_subject.go b/goformation/cloudformation/acmpca/aws-acmpca-certificate_subject.go
new file mode 100644
index 0000000000..587876ebf2
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificate_subject.go
@@ -0,0 +1,102 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Certificate_Subject AWS CloudFormation Resource (AWS::ACMPCA::Certificate.Subject)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-subject.html
+type Certificate_Subject struct {
+
+	// CommonName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-subject.html#cfn-acmpca-certificate-subject-commonname
+	CommonName *types.Value `json:"CommonName,omitempty"`
+
+	// Country AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-subject.html#cfn-acmpca-certificate-subject-country
+	Country *types.Value `json:"Country,omitempty"`
+
+	// DistinguishedNameQualifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-subject.html#cfn-acmpca-certificate-subject-distinguishednamequalifier
+	DistinguishedNameQualifier *types.Value `json:"DistinguishedNameQualifier,omitempty"`
+
+	// GenerationQualifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-subject.html#cfn-acmpca-certificate-subject-generationqualifier
+	GenerationQualifier *types.Value `json:"GenerationQualifier,omitempty"`
+
+	// GivenName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-subject.html#cfn-acmpca-certificate-subject-givenname
+	GivenName *types.Value `json:"GivenName,omitempty"`
+
+	// Initials AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-subject.html#cfn-acmpca-certificate-subject-initials
+	Initials *types.Value `json:"Initials,omitempty"`
+
+	// Locality AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-subject.html#cfn-acmpca-certificate-subject-locality
+	Locality *types.Value `json:"Locality,omitempty"`
+
+	// Organization AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-subject.html#cfn-acmpca-certificate-subject-organization
+	Organization *types.Value `json:"Organization,omitempty"`
+
+	// OrganizationalUnit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-subject.html#cfn-acmpca-certificate-subject-organizationalunit
+	OrganizationalUnit *types.Value `json:"OrganizationalUnit,omitempty"`
+
+	// Pseudonym AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-subject.html#cfn-acmpca-certificate-subject-pseudonym
+	Pseudonym *types.Value `json:"Pseudonym,omitempty"`
+
+	// SerialNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-subject.html#cfn-acmpca-certificate-subject-serialnumber
+	SerialNumber *types.Value `json:"SerialNumber,omitempty"`
+
+	// State AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-subject.html#cfn-acmpca-certificate-subject-state
+	State *types.Value `json:"State,omitempty"`
+
+	// Surname AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-subject.html#cfn-acmpca-certificate-subject-surname
+	Surname *types.Value `json:"Surname,omitempty"`
+
+	// Title AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-subject.html#cfn-acmpca-certificate-subject-title
+	Title *types.Value `json:"Title,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Certificate_Subject) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::Certificate.Subject"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificate_validity.go b/goformation/cloudformation/acmpca/aws-acmpca-certificate_validity.go
new file mode 100644
index 0000000000..35805342aa
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificate_validity.go
@@ -0,0 +1,42 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Certificate_Validity AWS CloudFormation Resource (AWS::ACMPCA::Certificate.Validity)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-validity.html
+type Certificate_Validity struct {
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-validity.html#cfn-acmpca-certificate-validity-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificate-validity.html#cfn-acmpca-certificate-validity-value
+	Value *types.Value `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 *Certificate_Validity) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::Certificate.Validity"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority.go b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority.go
new file mode 100644
index 0000000000..097ce6d04f
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority.go
@@ -0,0 +1,144 @@
+package acmpca
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// CertificateAuthority AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificateauthority.html
+type CertificateAuthority struct {
+
+	// CsrExtensions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificateauthority.html#cfn-acmpca-certificateauthority-csrextensions
+	CsrExtensions *CertificateAuthority_CsrExtensions `json:"CsrExtensions,omitempty"`
+
+	// KeyAlgorithm AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificateauthority.html#cfn-acmpca-certificateauthority-keyalgorithm
+	KeyAlgorithm *types.Value `json:"KeyAlgorithm,omitempty"`
+
+	// KeyStorageSecurityStandard AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificateauthority.html#cfn-acmpca-certificateauthority-keystoragesecuritystandard
+	KeyStorageSecurityStandard *types.Value `json:"KeyStorageSecurityStandard,omitempty"`
+
+	// RevocationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificateauthority.html#cfn-acmpca-certificateauthority-revocationconfiguration
+	RevocationConfiguration *CertificateAuthority_RevocationConfiguration `json:"RevocationConfiguration,omitempty"`
+
+	// SigningAlgorithm AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificateauthority.html#cfn-acmpca-certificateauthority-signingalgorithm
+	SigningAlgorithm *types.Value `json:"SigningAlgorithm,omitempty"`
+
+	// Subject AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificateauthority.html#cfn-acmpca-certificateauthority-subject
+	Subject *CertificateAuthority_Subject `json:"Subject,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificateauthority.html#cfn-acmpca-certificateauthority-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificateauthority.html#cfn-acmpca-certificateauthority-type
+	Type *types.Value `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 *CertificateAuthority) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::CertificateAuthority"
+}
+
+// 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 CertificateAuthority) MarshalJSON() ([]byte, error) {
+	type Properties CertificateAuthority
+	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 *CertificateAuthority) UnmarshalJSON(b []byte) error {
+	type Properties CertificateAuthority
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CertificateAuthority(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_accessdescription.go b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_accessdescription.go
new file mode 100644
index 0000000000..3fc3d67c3d
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_accessdescription.go
@@ -0,0 +1,40 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// CertificateAuthority_AccessDescription AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.AccessDescription)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-accessdescription.html
+type CertificateAuthority_AccessDescription struct {
+
+	// AccessLocation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-accessdescription.html#cfn-acmpca-certificateauthority-accessdescription-accesslocation
+	AccessLocation *CertificateAuthority_GeneralName `json:"AccessLocation,omitempty"`
+
+	// AccessMethod AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-accessdescription.html#cfn-acmpca-certificateauthority-accessdescription-accessmethod
+	AccessMethod *CertificateAuthority_AccessMethod `json:"AccessMethod,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CertificateAuthority_AccessDescription) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::CertificateAuthority.AccessDescription"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_accessmethod.go b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_accessmethod.go
new file mode 100644
index 0000000000..5707425632
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_accessmethod.go
@@ -0,0 +1,42 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CertificateAuthority_AccessMethod AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.AccessMethod)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-accessmethod.html
+type CertificateAuthority_AccessMethod struct {
+
+	// AccessMethodType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-accessmethod.html#cfn-acmpca-certificateauthority-accessmethod-accessmethodtype
+	AccessMethodType *types.Value `json:"AccessMethodType,omitempty"`
+
+	// CustomObjectIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-accessmethod.html#cfn-acmpca-certificateauthority-accessmethod-customobjectidentifier
+	CustomObjectIdentifier *types.Value `json:"CustomObjectIdentifier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CertificateAuthority_AccessMethod) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::CertificateAuthority.AccessMethod"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_crlconfiguration.go b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_crlconfiguration.go
new file mode 100644
index 0000000000..65197732a5
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_crlconfiguration.go
@@ -0,0 +1,57 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CertificateAuthority_CrlConfiguration AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.CrlConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-crlconfiguration.html
+type CertificateAuthority_CrlConfiguration struct {
+
+	// CustomCname AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-crlconfiguration.html#cfn-acmpca-certificateauthority-crlconfiguration-customcname
+	CustomCname *types.Value `json:"CustomCname,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-crlconfiguration.html#cfn-acmpca-certificateauthority-crlconfiguration-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// ExpirationInDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-crlconfiguration.html#cfn-acmpca-certificateauthority-crlconfiguration-expirationindays
+	ExpirationInDays *types.Value `json:"ExpirationInDays,omitempty"`
+
+	// S3BucketName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-crlconfiguration.html#cfn-acmpca-certificateauthority-crlconfiguration-s3bucketname
+	S3BucketName *types.Value `json:"S3BucketName,omitempty"`
+
+	// S3ObjectAcl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-crlconfiguration.html#cfn-acmpca-certificateauthority-crlconfiguration-s3objectacl
+	S3ObjectAcl *types.Value `json:"S3ObjectAcl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CertificateAuthority_CrlConfiguration) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::CertificateAuthority.CrlConfiguration"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_csrextensions.go b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_csrextensions.go
new file mode 100644
index 0000000000..9960ba0ae4
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_csrextensions.go
@@ -0,0 +1,40 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// CertificateAuthority_CsrExtensions AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.CsrExtensions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-csrextensions.html
+type CertificateAuthority_CsrExtensions struct {
+
+	// KeyUsage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-csrextensions.html#cfn-acmpca-certificateauthority-csrextensions-keyusage
+	KeyUsage *CertificateAuthority_KeyUsage `json:"KeyUsage,omitempty"`
+
+	// SubjectInformationAccess AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-csrextensions.html#cfn-acmpca-certificateauthority-csrextensions-subjectinformationaccess
+	SubjectInformationAccess []CertificateAuthority_AccessDescription `json:"SubjectInformationAccess,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CertificateAuthority_CsrExtensions) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::CertificateAuthority.CsrExtensions"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_edipartyname.go b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_edipartyname.go
new file mode 100644
index 0000000000..820d83a4c7
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_edipartyname.go
@@ -0,0 +1,42 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CertificateAuthority_EdiPartyName AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.EdiPartyName)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-edipartyname.html
+type CertificateAuthority_EdiPartyName struct {
+
+	// NameAssigner AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-edipartyname.html#cfn-acmpca-certificateauthority-edipartyname-nameassigner
+	NameAssigner *types.Value `json:"NameAssigner,omitempty"`
+
+	// PartyName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-edipartyname.html#cfn-acmpca-certificateauthority-edipartyname-partyname
+	PartyName *types.Value `json:"PartyName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CertificateAuthority_EdiPartyName) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::CertificateAuthority.EdiPartyName"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_generalname.go b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_generalname.go
new file mode 100644
index 0000000000..55583ca431
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_generalname.go
@@ -0,0 +1,72 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CertificateAuthority_GeneralName AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.GeneralName)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-generalname.html
+type CertificateAuthority_GeneralName struct {
+
+	// DirectoryName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-generalname.html#cfn-acmpca-certificateauthority-generalname-directoryname
+	DirectoryName *CertificateAuthority_Subject `json:"DirectoryName,omitempty"`
+
+	// DnsName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-generalname.html#cfn-acmpca-certificateauthority-generalname-dnsname
+	DnsName *types.Value `json:"DnsName,omitempty"`
+
+	// EdiPartyName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-generalname.html#cfn-acmpca-certificateauthority-generalname-edipartyname
+	EdiPartyName *CertificateAuthority_EdiPartyName `json:"EdiPartyName,omitempty"`
+
+	// IpAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-generalname.html#cfn-acmpca-certificateauthority-generalname-ipaddress
+	IpAddress *types.Value `json:"IpAddress,omitempty"`
+
+	// OtherName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-generalname.html#cfn-acmpca-certificateauthority-generalname-othername
+	OtherName *CertificateAuthority_OtherName `json:"OtherName,omitempty"`
+
+	// RegisteredId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-generalname.html#cfn-acmpca-certificateauthority-generalname-registeredid
+	RegisteredId *types.Value `json:"RegisteredId,omitempty"`
+
+	// Rfc822Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-generalname.html#cfn-acmpca-certificateauthority-generalname-rfc822name
+	Rfc822Name *types.Value `json:"Rfc822Name,omitempty"`
+
+	// UniformResourceIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-generalname.html#cfn-acmpca-certificateauthority-generalname-uniformresourceidentifier
+	UniformResourceIdentifier *types.Value `json:"UniformResourceIdentifier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CertificateAuthority_GeneralName) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::CertificateAuthority.GeneralName"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_keyusage.go b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_keyusage.go
new file mode 100644
index 0000000000..903b3427a7
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_keyusage.go
@@ -0,0 +1,77 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CertificateAuthority_KeyUsage AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.KeyUsage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-keyusage.html
+type CertificateAuthority_KeyUsage struct {
+
+	// CRLSign AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-keyusage.html#cfn-acmpca-certificateauthority-keyusage-crlsign
+	CRLSign *types.Value `json:"CRLSign,omitempty"`
+
+	// DataEncipherment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-keyusage.html#cfn-acmpca-certificateauthority-keyusage-dataencipherment
+	DataEncipherment *types.Value `json:"DataEncipherment,omitempty"`
+
+	// DecipherOnly AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-keyusage.html#cfn-acmpca-certificateauthority-keyusage-decipheronly
+	DecipherOnly *types.Value `json:"DecipherOnly,omitempty"`
+
+	// DigitalSignature AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-keyusage.html#cfn-acmpca-certificateauthority-keyusage-digitalsignature
+	DigitalSignature *types.Value `json:"DigitalSignature,omitempty"`
+
+	// EncipherOnly AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-keyusage.html#cfn-acmpca-certificateauthority-keyusage-encipheronly
+	EncipherOnly *types.Value `json:"EncipherOnly,omitempty"`
+
+	// KeyAgreement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-keyusage.html#cfn-acmpca-certificateauthority-keyusage-keyagreement
+	KeyAgreement *types.Value `json:"KeyAgreement,omitempty"`
+
+	// KeyCertSign AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-keyusage.html#cfn-acmpca-certificateauthority-keyusage-keycertsign
+	KeyCertSign *types.Value `json:"KeyCertSign,omitempty"`
+
+	// KeyEncipherment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-keyusage.html#cfn-acmpca-certificateauthority-keyusage-keyencipherment
+	KeyEncipherment *types.Value `json:"KeyEncipherment,omitempty"`
+
+	// NonRepudiation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-keyusage.html#cfn-acmpca-certificateauthority-keyusage-nonrepudiation
+	NonRepudiation *types.Value `json:"NonRepudiation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CertificateAuthority_KeyUsage) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::CertificateAuthority.KeyUsage"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_ocspconfiguration.go b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_ocspconfiguration.go
new file mode 100644
index 0000000000..a919001cb0
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_ocspconfiguration.go
@@ -0,0 +1,42 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CertificateAuthority_OcspConfiguration AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.OcspConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-ocspconfiguration.html
+type CertificateAuthority_OcspConfiguration struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-ocspconfiguration.html#cfn-acmpca-certificateauthority-ocspconfiguration-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// OcspCustomCname AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-ocspconfiguration.html#cfn-acmpca-certificateauthority-ocspconfiguration-ocspcustomcname
+	OcspCustomCname *types.Value `json:"OcspCustomCname,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CertificateAuthority_OcspConfiguration) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::CertificateAuthority.OcspConfiguration"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_othername.go b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_othername.go
new file mode 100644
index 0000000000..355f056d61
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_othername.go
@@ -0,0 +1,42 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CertificateAuthority_OtherName AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.OtherName)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-othername.html
+type CertificateAuthority_OtherName struct {
+
+	// TypeId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-othername.html#cfn-acmpca-certificateauthority-othername-typeid
+	TypeId *types.Value `json:"TypeId,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-othername.html#cfn-acmpca-certificateauthority-othername-value
+	Value *types.Value `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 *CertificateAuthority_OtherName) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::CertificateAuthority.OtherName"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_revocationconfiguration.go b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_revocationconfiguration.go
new file mode 100644
index 0000000000..9068f4ca58
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_revocationconfiguration.go
@@ -0,0 +1,40 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// CertificateAuthority_RevocationConfiguration AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.RevocationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-revocationconfiguration.html
+type CertificateAuthority_RevocationConfiguration struct {
+
+	// CrlConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-revocationconfiguration.html#cfn-acmpca-certificateauthority-revocationconfiguration-crlconfiguration
+	CrlConfiguration *CertificateAuthority_CrlConfiguration `json:"CrlConfiguration,omitempty"`
+
+	// OcspConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-revocationconfiguration.html#cfn-acmpca-certificateauthority-revocationconfiguration-ocspconfiguration
+	OcspConfiguration *CertificateAuthority_OcspConfiguration `json:"OcspConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CertificateAuthority_RevocationConfiguration) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::CertificateAuthority.RevocationConfiguration"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_subject.go b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_subject.go
new file mode 100644
index 0000000000..6ea80ff6c9
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthority_subject.go
@@ -0,0 +1,102 @@
+package acmpca
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CertificateAuthority_Subject AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthority.Subject)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-subject.html
+type CertificateAuthority_Subject struct {
+
+	// CommonName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-subject.html#cfn-acmpca-certificateauthority-subject-commonname
+	CommonName *types.Value `json:"CommonName,omitempty"`
+
+	// Country AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-subject.html#cfn-acmpca-certificateauthority-subject-country
+	Country *types.Value `json:"Country,omitempty"`
+
+	// DistinguishedNameQualifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-subject.html#cfn-acmpca-certificateauthority-subject-distinguishednamequalifier
+	DistinguishedNameQualifier *types.Value `json:"DistinguishedNameQualifier,omitempty"`
+
+	// GenerationQualifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-subject.html#cfn-acmpca-certificateauthority-subject-generationqualifier
+	GenerationQualifier *types.Value `json:"GenerationQualifier,omitempty"`
+
+	// GivenName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-subject.html#cfn-acmpca-certificateauthority-subject-givenname
+	GivenName *types.Value `json:"GivenName,omitempty"`
+
+	// Initials AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-subject.html#cfn-acmpca-certificateauthority-subject-initials
+	Initials *types.Value `json:"Initials,omitempty"`
+
+	// Locality AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-subject.html#cfn-acmpca-certificateauthority-subject-locality
+	Locality *types.Value `json:"Locality,omitempty"`
+
+	// Organization AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-subject.html#cfn-acmpca-certificateauthority-subject-organization
+	Organization *types.Value `json:"Organization,omitempty"`
+
+	// OrganizationalUnit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-subject.html#cfn-acmpca-certificateauthority-subject-organizationalunit
+	OrganizationalUnit *types.Value `json:"OrganizationalUnit,omitempty"`
+
+	// Pseudonym AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-subject.html#cfn-acmpca-certificateauthority-subject-pseudonym
+	Pseudonym *types.Value `json:"Pseudonym,omitempty"`
+
+	// SerialNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-subject.html#cfn-acmpca-certificateauthority-subject-serialnumber
+	SerialNumber *types.Value `json:"SerialNumber,omitempty"`
+
+	// State AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-subject.html#cfn-acmpca-certificateauthority-subject-state
+	State *types.Value `json:"State,omitempty"`
+
+	// Surname AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-subject.html#cfn-acmpca-certificateauthority-subject-surname
+	Surname *types.Value `json:"Surname,omitempty"`
+
+	// Title AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-acmpca-certificateauthority-subject.html#cfn-acmpca-certificateauthority-subject-title
+	Title *types.Value `json:"Title,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CertificateAuthority_Subject) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::CertificateAuthority.Subject"
+}
diff --git a/goformation/cloudformation/acmpca/aws-acmpca-certificateauthorityactivation.go b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthorityactivation.go
new file mode 100644
index 0000000000..a5122f93c4
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-certificateauthorityactivation.go
@@ -0,0 +1,123 @@
+package acmpca
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CertificateAuthorityActivation AWS CloudFormation Resource (AWS::ACMPCA::CertificateAuthorityActivation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificateauthorityactivation.html
+type CertificateAuthorityActivation struct {
+
+	// Certificate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificateauthorityactivation.html#cfn-acmpca-certificateauthorityactivation-certificate
+	Certificate *types.Value `json:"Certificate,omitempty"`
+
+	// CertificateAuthorityArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificateauthorityactivation.html#cfn-acmpca-certificateauthorityactivation-certificateauthorityarn
+	CertificateAuthorityArn *types.Value `json:"CertificateAuthorityArn,omitempty"`
+
+	// CertificateChain AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificateauthorityactivation.html#cfn-acmpca-certificateauthorityactivation-certificatechain
+	CertificateChain *types.Value `json:"CertificateChain,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-certificateauthorityactivation.html#cfn-acmpca-certificateauthorityactivation-status
+	Status *types.Value `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 *CertificateAuthorityActivation) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::CertificateAuthorityActivation"
+}
+
+// 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 CertificateAuthorityActivation) MarshalJSON() ([]byte, error) {
+	type Properties CertificateAuthorityActivation
+	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 *CertificateAuthorityActivation) UnmarshalJSON(b []byte) error {
+	type Properties CertificateAuthorityActivation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CertificateAuthorityActivation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/acmpca/aws-acmpca-permission.go b/goformation/cloudformation/acmpca/aws-acmpca-permission.go
new file mode 100644
index 0000000000..3d24347563
--- /dev/null
+++ b/goformation/cloudformation/acmpca/aws-acmpca-permission.go
@@ -0,0 +1,123 @@
+package acmpca
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Permission AWS CloudFormation Resource (AWS::ACMPCA::Permission)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-permission.html
+type Permission struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-permission.html#cfn-acmpca-permission-actions
+	Actions *types.Value `json:"Actions,omitempty"`
+
+	// CertificateAuthorityArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-permission.html#cfn-acmpca-permission-certificateauthorityarn
+	CertificateAuthorityArn *types.Value `json:"CertificateAuthorityArn,omitempty"`
+
+	// Principal AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-permission.html#cfn-acmpca-permission-principal
+	Principal *types.Value `json:"Principal,omitempty"`
+
+	// SourceAccount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-acmpca-permission.html#cfn-acmpca-permission-sourceaccount
+	SourceAccount *types.Value `json:"SourceAccount,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Permission) AWSCloudFormationType() string {
+	return "AWS::ACMPCA::Permission"
+}
+
+// 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 Permission) MarshalJSON() ([]byte, error) {
+	type Properties Permission
+	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 *Permission) UnmarshalJSON(b []byte) error {
+	type Properties Permission
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Permission(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/all.go b/goformation/cloudformation/all.go
new file mode 100644
index 0000000000..0ac1079954
--- /dev/null
+++ b/goformation/cloudformation/all.go
@@ -0,0 +1,21693 @@
+package cloudformation
+
+import (
+	"fmt"
+
+	"goformation/v4/cloudformation/accessanalyzer"
+	"goformation/v4/cloudformation/acmpca"
+	"goformation/v4/cloudformation/amazonmq"
+	"goformation/v4/cloudformation/amplify"
+	"goformation/v4/cloudformation/amplifyuibuilder"
+	"goformation/v4/cloudformation/apigateway"
+	"goformation/v4/cloudformation/apigatewayv2"
+	"goformation/v4/cloudformation/appconfig"
+	"goformation/v4/cloudformation/appflow"
+	"goformation/v4/cloudformation/appintegrations"
+	"goformation/v4/cloudformation/applicationautoscaling"
+	"goformation/v4/cloudformation/applicationinsights"
+	"goformation/v4/cloudformation/appmesh"
+	"goformation/v4/cloudformation/apprunner"
+	"goformation/v4/cloudformation/appstream"
+	"goformation/v4/cloudformation/appsync"
+	"goformation/v4/cloudformation/aps"
+	"goformation/v4/cloudformation/ask"
+	"goformation/v4/cloudformation/athena"
+	"goformation/v4/cloudformation/auditmanager"
+	"goformation/v4/cloudformation/autoscaling"
+	"goformation/v4/cloudformation/autoscalingplans"
+	"goformation/v4/cloudformation/backup"
+	"goformation/v4/cloudformation/batch"
+	"goformation/v4/cloudformation/budgets"
+	"goformation/v4/cloudformation/cassandra"
+	"goformation/v4/cloudformation/ce"
+	"goformation/v4/cloudformation/certificatemanager"
+	"goformation/v4/cloudformation/chatbot"
+	"goformation/v4/cloudformation/cloud9"
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/cloudfront"
+	"goformation/v4/cloudformation/cloudtrail"
+	"goformation/v4/cloudformation/cloudwatch"
+	"goformation/v4/cloudformation/codeartifact"
+	"goformation/v4/cloudformation/codebuild"
+	"goformation/v4/cloudformation/codecommit"
+	"goformation/v4/cloudformation/codedeploy"
+	"goformation/v4/cloudformation/codeguruprofiler"
+	"goformation/v4/cloudformation/codegurureviewer"
+	"goformation/v4/cloudformation/codepipeline"
+	"goformation/v4/cloudformation/codestar"
+	"goformation/v4/cloudformation/codestarconnections"
+	"goformation/v4/cloudformation/codestarnotifications"
+	"goformation/v4/cloudformation/cognito"
+	"goformation/v4/cloudformation/config"
+	"goformation/v4/cloudformation/connect"
+	"goformation/v4/cloudformation/cur"
+	"goformation/v4/cloudformation/customerprofiles"
+	"goformation/v4/cloudformation/databrew"
+	"goformation/v4/cloudformation/datapipeline"
+	"goformation/v4/cloudformation/datasync"
+	"goformation/v4/cloudformation/dax"
+	"goformation/v4/cloudformation/detective"
+	"goformation/v4/cloudformation/devopsguru"
+	"goformation/v4/cloudformation/directoryservice"
+	"goformation/v4/cloudformation/dlm"
+	"goformation/v4/cloudformation/dms"
+	"goformation/v4/cloudformation/docdb"
+	"goformation/v4/cloudformation/dynamodb"
+	"goformation/v4/cloudformation/ec2"
+	"goformation/v4/cloudformation/ecr"
+	"goformation/v4/cloudformation/ecs"
+	"goformation/v4/cloudformation/efs"
+	"goformation/v4/cloudformation/eks"
+	"goformation/v4/cloudformation/elasticache"
+	"goformation/v4/cloudformation/elasticbeanstalk"
+	"goformation/v4/cloudformation/elasticloadbalancing"
+	"goformation/v4/cloudformation/elasticloadbalancingv2"
+	"goformation/v4/cloudformation/elasticsearch"
+	"goformation/v4/cloudformation/emr"
+	"goformation/v4/cloudformation/emrcontainers"
+	"goformation/v4/cloudformation/events"
+	"goformation/v4/cloudformation/eventschemas"
+	"goformation/v4/cloudformation/evidently"
+	"goformation/v4/cloudformation/finspace"
+	"goformation/v4/cloudformation/fis"
+	"goformation/v4/cloudformation/fms"
+	"goformation/v4/cloudformation/frauddetector"
+	"goformation/v4/cloudformation/fsx"
+	"goformation/v4/cloudformation/gamelift"
+	"goformation/v4/cloudformation/globalaccelerator"
+	"goformation/v4/cloudformation/glue"
+	"goformation/v4/cloudformation/greengrass"
+	"goformation/v4/cloudformation/greengrassv2"
+	"goformation/v4/cloudformation/groundstation"
+	"goformation/v4/cloudformation/guardduty"
+	"goformation/v4/cloudformation/healthlake"
+	"goformation/v4/cloudformation/iam"
+	"goformation/v4/cloudformation/imagebuilder"
+	"goformation/v4/cloudformation/inspector"
+	"goformation/v4/cloudformation/iot"
+	"goformation/v4/cloudformation/iot1click"
+	"goformation/v4/cloudformation/iotanalytics"
+	"goformation/v4/cloudformation/iotcoredeviceadvisor"
+	"goformation/v4/cloudformation/iotevents"
+	"goformation/v4/cloudformation/iotfleethub"
+	"goformation/v4/cloudformation/iotsitewise"
+	"goformation/v4/cloudformation/iotthingsgraph"
+	"goformation/v4/cloudformation/iotwireless"
+	"goformation/v4/cloudformation/ivs"
+	"goformation/v4/cloudformation/kendra"
+	"goformation/v4/cloudformation/kinesis"
+	"goformation/v4/cloudformation/kinesisanalytics"
+	"goformation/v4/cloudformation/kinesisanalyticsv2"
+	"goformation/v4/cloudformation/kinesisfirehose"
+	"goformation/v4/cloudformation/kms"
+	"goformation/v4/cloudformation/lakeformation"
+	"goformation/v4/cloudformation/lambda"
+	"goformation/v4/cloudformation/licensemanager"
+	"goformation/v4/cloudformation/lightsail"
+	"goformation/v4/cloudformation/location"
+	"goformation/v4/cloudformation/logs"
+	"goformation/v4/cloudformation/lookoutequipment"
+	"goformation/v4/cloudformation/lookoutmetrics"
+	"goformation/v4/cloudformation/lookoutvision"
+	"goformation/v4/cloudformation/macie"
+	"goformation/v4/cloudformation/managedblockchain"
+	"goformation/v4/cloudformation/mediaconnect"
+	"goformation/v4/cloudformation/mediaconvert"
+	"goformation/v4/cloudformation/medialive"
+	"goformation/v4/cloudformation/mediapackage"
+	"goformation/v4/cloudformation/mediastore"
+	"goformation/v4/cloudformation/memorydb"
+	"goformation/v4/cloudformation/msk"
+	"goformation/v4/cloudformation/mwaa"
+	"goformation/v4/cloudformation/neptune"
+	"goformation/v4/cloudformation/networkfirewall"
+	"goformation/v4/cloudformation/networkmanager"
+	"goformation/v4/cloudformation/nimblestudio"
+	"goformation/v4/cloudformation/opensearchservice"
+	"goformation/v4/cloudformation/opsworks"
+	"goformation/v4/cloudformation/opsworkscm"
+	"goformation/v4/cloudformation/panorama"
+	"goformation/v4/cloudformation/pinpoint"
+	"goformation/v4/cloudformation/pinpointemail"
+	"goformation/v4/cloudformation/qldb"
+	"goformation/v4/cloudformation/quicksight"
+	"goformation/v4/cloudformation/ram"
+	"goformation/v4/cloudformation/rds"
+	"goformation/v4/cloudformation/redshift"
+	"goformation/v4/cloudformation/refactorspaces"
+	"goformation/v4/cloudformation/rekognition"
+	"goformation/v4/cloudformation/resiliencehub"
+	"goformation/v4/cloudformation/resourcegroups"
+	"goformation/v4/cloudformation/robomaker"
+	"goformation/v4/cloudformation/route53"
+	"goformation/v4/cloudformation/route53recoverycontrol"
+	"goformation/v4/cloudformation/route53recoveryreadiness"
+	"goformation/v4/cloudformation/route53resolver"
+	"goformation/v4/cloudformation/rum"
+	"goformation/v4/cloudformation/s3"
+	"goformation/v4/cloudformation/s3objectlambda"
+	"goformation/v4/cloudformation/s3outposts"
+	"goformation/v4/cloudformation/sagemaker"
+	"goformation/v4/cloudformation/sdb"
+	"goformation/v4/cloudformation/secretsmanager"
+	"goformation/v4/cloudformation/securityhub"
+	"goformation/v4/cloudformation/serverless"
+	"goformation/v4/cloudformation/servicecatalog"
+	"goformation/v4/cloudformation/servicecatalogappregistry"
+	"goformation/v4/cloudformation/servicediscovery"
+	"goformation/v4/cloudformation/ses"
+	"goformation/v4/cloudformation/signer"
+	"goformation/v4/cloudformation/sns"
+	"goformation/v4/cloudformation/sqs"
+	"goformation/v4/cloudformation/ssm"
+	"goformation/v4/cloudformation/ssmcontacts"
+	"goformation/v4/cloudformation/ssmincidents"
+	"goformation/v4/cloudformation/sso"
+	"goformation/v4/cloudformation/stepfunctions"
+	"goformation/v4/cloudformation/synthetics"
+	"goformation/v4/cloudformation/timestream"
+	"goformation/v4/cloudformation/transfer"
+	"goformation/v4/cloudformation/waf"
+	"goformation/v4/cloudformation/wafregional"
+	"goformation/v4/cloudformation/wafv2"
+	"goformation/v4/cloudformation/wisdom"
+	"goformation/v4/cloudformation/workspaces"
+	"goformation/v4/cloudformation/xray"
+)
+
+// AllResources fetches an iterable map all CloudFormation and SAM resources
+func AllResources() map[string]Resource {
+	return map[string]Resource{
+		"AWS::ACMPCA::Certificate":                                    &acmpca.Certificate{},
+		"AWS::ACMPCA::CertificateAuthority":                           &acmpca.CertificateAuthority{},
+		"AWS::ACMPCA::CertificateAuthorityActivation":                 &acmpca.CertificateAuthorityActivation{},
+		"AWS::ACMPCA::Permission":                                     &acmpca.Permission{},
+		"AWS::APS::RuleGroupsNamespace":                               &aps.RuleGroupsNamespace{},
+		"AWS::APS::Workspace":                                         &aps.Workspace{},
+		"AWS::AccessAnalyzer::Analyzer":                               &accessanalyzer.Analyzer{},
+		"AWS::AmazonMQ::Broker":                                       &amazonmq.Broker{},
+		"AWS::AmazonMQ::Configuration":                                &amazonmq.Configuration{},
+		"AWS::AmazonMQ::ConfigurationAssociation":                     &amazonmq.ConfigurationAssociation{},
+		"AWS::Amplify::App":                                           &amplify.App{},
+		"AWS::Amplify::Branch":                                        &amplify.Branch{},
+		"AWS::Amplify::Domain":                                        &amplify.Domain{},
+		"AWS::AmplifyUIBuilder::Component":                            &amplifyuibuilder.Component{},
+		"AWS::AmplifyUIBuilder::Theme":                                &amplifyuibuilder.Theme{},
+		"AWS::ApiGateway::Account":                                    &apigateway.Account{},
+		"AWS::ApiGateway::ApiKey":                                     &apigateway.ApiKey{},
+		"AWS::ApiGateway::Authorizer":                                 &apigateway.Authorizer{},
+		"AWS::ApiGateway::BasePathMapping":                            &apigateway.BasePathMapping{},
+		"AWS::ApiGateway::ClientCertificate":                          &apigateway.ClientCertificate{},
+		"AWS::ApiGateway::Deployment":                                 &apigateway.Deployment{},
+		"AWS::ApiGateway::DocumentationPart":                          &apigateway.DocumentationPart{},
+		"AWS::ApiGateway::DocumentationVersion":                       &apigateway.DocumentationVersion{},
+		"AWS::ApiGateway::DomainName":                                 &apigateway.DomainName{},
+		"AWS::ApiGateway::GatewayResponse":                            &apigateway.GatewayResponse{},
+		"AWS::ApiGateway::Method":                                     &apigateway.Method{},
+		"AWS::ApiGateway::Model":                                      &apigateway.Model{},
+		"AWS::ApiGateway::RequestValidator":                           &apigateway.RequestValidator{},
+		"AWS::ApiGateway::Resource":                                   &apigateway.Resource{},
+		"AWS::ApiGateway::RestApi":                                    &apigateway.RestApi{},
+		"AWS::ApiGateway::Stage":                                      &apigateway.Stage{},
+		"AWS::ApiGateway::UsagePlan":                                  &apigateway.UsagePlan{},
+		"AWS::ApiGateway::UsagePlanKey":                               &apigateway.UsagePlanKey{},
+		"AWS::ApiGateway::VpcLink":                                    &apigateway.VpcLink{},
+		"AWS::ApiGatewayV2::Api":                                      &apigatewayv2.Api{},
+		"AWS::ApiGatewayV2::ApiGatewayManagedOverrides":               &apigatewayv2.ApiGatewayManagedOverrides{},
+		"AWS::ApiGatewayV2::ApiMapping":                               &apigatewayv2.ApiMapping{},
+		"AWS::ApiGatewayV2::Authorizer":                               &apigatewayv2.Authorizer{},
+		"AWS::ApiGatewayV2::Deployment":                               &apigatewayv2.Deployment{},
+		"AWS::ApiGatewayV2::DomainName":                               &apigatewayv2.DomainName{},
+		"AWS::ApiGatewayV2::Integration":                              &apigatewayv2.Integration{},
+		"AWS::ApiGatewayV2::IntegrationResponse":                      &apigatewayv2.IntegrationResponse{},
+		"AWS::ApiGatewayV2::Model":                                    &apigatewayv2.Model{},
+		"AWS::ApiGatewayV2::Route":                                    &apigatewayv2.Route{},
+		"AWS::ApiGatewayV2::RouteResponse":                            &apigatewayv2.RouteResponse{},
+		"AWS::ApiGatewayV2::Stage":                                    &apigatewayv2.Stage{},
+		"AWS::ApiGatewayV2::VpcLink":                                  &apigatewayv2.VpcLink{},
+		"AWS::AppConfig::Application":                                 &appconfig.Application{},
+		"AWS::AppConfig::ConfigurationProfile":                        &appconfig.ConfigurationProfile{},
+		"AWS::AppConfig::Deployment":                                  &appconfig.Deployment{},
+		"AWS::AppConfig::DeploymentStrategy":                          &appconfig.DeploymentStrategy{},
+		"AWS::AppConfig::Environment":                                 &appconfig.Environment{},
+		"AWS::AppConfig::HostedConfigurationVersion":                  &appconfig.HostedConfigurationVersion{},
+		"AWS::AppFlow::ConnectorProfile":                              &appflow.ConnectorProfile{},
+		"AWS::AppFlow::Flow":                                          &appflow.Flow{},
+		"AWS::AppIntegrations::EventIntegration":                      &appintegrations.EventIntegration{},
+		"AWS::AppMesh::GatewayRoute":                                  &appmesh.GatewayRoute{},
+		"AWS::AppMesh::Mesh":                                          &appmesh.Mesh{},
+		"AWS::AppMesh::Route":                                         &appmesh.Route{},
+		"AWS::AppMesh::VirtualGateway":                                &appmesh.VirtualGateway{},
+		"AWS::AppMesh::VirtualNode":                                   &appmesh.VirtualNode{},
+		"AWS::AppMesh::VirtualRouter":                                 &appmesh.VirtualRouter{},
+		"AWS::AppMesh::VirtualService":                                &appmesh.VirtualService{},
+		"AWS::AppRunner::Service":                                     &apprunner.Service{},
+		"AWS::AppStream::AppBlock":                                    &appstream.AppBlock{},
+		"AWS::AppStream::Application":                                 &appstream.Application{},
+		"AWS::AppStream::ApplicationFleetAssociation":                 &appstream.ApplicationFleetAssociation{},
+		"AWS::AppStream::DirectoryConfig":                             &appstream.DirectoryConfig{},
+		"AWS::AppStream::Fleet":                                       &appstream.Fleet{},
+		"AWS::AppStream::ImageBuilder":                                &appstream.ImageBuilder{},
+		"AWS::AppStream::Stack":                                       &appstream.Stack{},
+		"AWS::AppStream::StackFleetAssociation":                       &appstream.StackFleetAssociation{},
+		"AWS::AppStream::StackUserAssociation":                        &appstream.StackUserAssociation{},
+		"AWS::AppStream::User":                                        &appstream.User{},
+		"AWS::AppSync::ApiCache":                                      &appsync.ApiCache{},
+		"AWS::AppSync::ApiKey":                                        &appsync.ApiKey{},
+		"AWS::AppSync::DataSource":                                    &appsync.DataSource{},
+		"AWS::AppSync::FunctionConfiguration":                         &appsync.FunctionConfiguration{},
+		"AWS::AppSync::GraphQLApi":                                    &appsync.GraphQLApi{},
+		"AWS::AppSync::GraphQLSchema":                                 &appsync.GraphQLSchema{},
+		"AWS::AppSync::Resolver":                                      &appsync.Resolver{},
+		"AWS::ApplicationAutoScaling::ScalableTarget":                 &applicationautoscaling.ScalableTarget{},
+		"AWS::ApplicationAutoScaling::ScalingPolicy":                  &applicationautoscaling.ScalingPolicy{},
+		"AWS::ApplicationInsights::Application":                       &applicationinsights.Application{},
+		"AWS::Athena::DataCatalog":                                    &athena.DataCatalog{},
+		"AWS::Athena::NamedQuery":                                     &athena.NamedQuery{},
+		"AWS::Athena::PreparedStatement":                              &athena.PreparedStatement{},
+		"AWS::Athena::WorkGroup":                                      &athena.WorkGroup{},
+		"AWS::AuditManager::Assessment":                               &auditmanager.Assessment{},
+		"AWS::AutoScaling::AutoScalingGroup":                          &autoscaling.AutoScalingGroup{},
+		"AWS::AutoScaling::LaunchConfiguration":                       &autoscaling.LaunchConfiguration{},
+		"AWS::AutoScaling::LifecycleHook":                             &autoscaling.LifecycleHook{},
+		"AWS::AutoScaling::ScalingPolicy":                             &autoscaling.ScalingPolicy{},
+		"AWS::AutoScaling::ScheduledAction":                           &autoscaling.ScheduledAction{},
+		"AWS::AutoScaling::WarmPool":                                  &autoscaling.WarmPool{},
+		"AWS::AutoScalingPlans::ScalingPlan":                          &autoscalingplans.ScalingPlan{},
+		"AWS::Backup::BackupPlan":                                     &backup.BackupPlan{},
+		"AWS::Backup::BackupSelection":                                &backup.BackupSelection{},
+		"AWS::Backup::BackupVault":                                    &backup.BackupVault{},
+		"AWS::Backup::Framework":                                      &backup.Framework{},
+		"AWS::Backup::ReportPlan":                                     &backup.ReportPlan{},
+		"AWS::Batch::ComputeEnvironment":                              &batch.ComputeEnvironment{},
+		"AWS::Batch::JobDefinition":                                   &batch.JobDefinition{},
+		"AWS::Batch::JobQueue":                                        &batch.JobQueue{},
+		"AWS::Batch::SchedulingPolicy":                                &batch.SchedulingPolicy{},
+		"AWS::Budgets::Budget":                                        &budgets.Budget{},
+		"AWS::Budgets::BudgetsAction":                                 &budgets.BudgetsAction{},
+		"AWS::CE::AnomalyMonitor":                                     &ce.AnomalyMonitor{},
+		"AWS::CE::AnomalySubscription":                                &ce.AnomalySubscription{},
+		"AWS::CE::CostCategory":                                       &ce.CostCategory{},
+		"AWS::CUR::ReportDefinition":                                  &cur.ReportDefinition{},
+		"AWS::Cassandra::Keyspace":                                    &cassandra.Keyspace{},
+		"AWS::Cassandra::Table":                                       &cassandra.Table{},
+		"AWS::CertificateManager::Account":                            &certificatemanager.Account{},
+		"AWS::CertificateManager::Certificate":                        &certificatemanager.Certificate{},
+		"AWS::Chatbot::SlackChannelConfiguration":                     &chatbot.SlackChannelConfiguration{},
+		"AWS::Cloud9::EnvironmentEC2":                                 &cloud9.EnvironmentEC2{},
+		"AWS::CloudFormation::CustomResource":                         &cloudformation.CustomResource{},
+		"AWS::CloudFormation::Macro":                                  &cloudformation.Macro{},
+		"AWS::CloudFormation::ModuleDefaultVersion":                   &cloudformation.ModuleDefaultVersion{},
+		"AWS::CloudFormation::ModuleVersion":                          &cloudformation.ModuleVersion{},
+		"AWS::CloudFormation::PublicTypeVersion":                      &cloudformation.PublicTypeVersion{},
+		"AWS::CloudFormation::Publisher":                              &cloudformation.Publisher{},
+		"AWS::CloudFormation::ResourceDefaultVersion":                 &cloudformation.ResourceDefaultVersion{},
+		"AWS::CloudFormation::ResourceVersion":                        &cloudformation.ResourceVersion{},
+		"AWS::CloudFormation::Stack":                                  &cloudformation.Stack{},
+		"AWS::CloudFormation::StackSet":                               &cloudformation.StackSet{},
+		"AWS::CloudFormation::TypeActivation":                         &cloudformation.TypeActivation{},
+		"AWS::CloudFormation::WaitCondition":                          &cloudformation.WaitCondition{},
+		"AWS::CloudFormation::WaitConditionHandle":                    &cloudformation.WaitConditionHandle{},
+		"AWS::CloudFront::CachePolicy":                                &cloudfront.CachePolicy{},
+		"AWS::CloudFront::CloudFrontOriginAccessIdentity":             &cloudfront.CloudFrontOriginAccessIdentity{},
+		"AWS::CloudFront::Distribution":                               &cloudfront.Distribution{},
+		"AWS::CloudFront::Function":                                   &cloudfront.Function{},
+		"AWS::CloudFront::KeyGroup":                                   &cloudfront.KeyGroup{},
+		"AWS::CloudFront::OriginRequestPolicy":                        &cloudfront.OriginRequestPolicy{},
+		"AWS::CloudFront::PublicKey":                                  &cloudfront.PublicKey{},
+		"AWS::CloudFront::RealtimeLogConfig":                          &cloudfront.RealtimeLogConfig{},
+		"AWS::CloudFront::ResponseHeadersPolicy":                      &cloudfront.ResponseHeadersPolicy{},
+		"AWS::CloudFront::StreamingDistribution":                      &cloudfront.StreamingDistribution{},
+		"AWS::CloudTrail::Trail":                                      &cloudtrail.Trail{},
+		"AWS::CloudWatch::Alarm":                                      &cloudwatch.Alarm{},
+		"AWS::CloudWatch::AnomalyDetector":                            &cloudwatch.AnomalyDetector{},
+		"AWS::CloudWatch::CompositeAlarm":                             &cloudwatch.CompositeAlarm{},
+		"AWS::CloudWatch::Dashboard":                                  &cloudwatch.Dashboard{},
+		"AWS::CloudWatch::InsightRule":                                &cloudwatch.InsightRule{},
+		"AWS::CloudWatch::MetricStream":                               &cloudwatch.MetricStream{},
+		"AWS::CodeArtifact::Domain":                                   &codeartifact.Domain{},
+		"AWS::CodeArtifact::Repository":                               &codeartifact.Repository{},
+		"AWS::CodeBuild::Project":                                     &codebuild.Project{},
+		"AWS::CodeBuild::ReportGroup":                                 &codebuild.ReportGroup{},
+		"AWS::CodeBuild::SourceCredential":                            &codebuild.SourceCredential{},
+		"AWS::CodeCommit::Repository":                                 &codecommit.Repository{},
+		"AWS::CodeDeploy::Application":                                &codedeploy.Application{},
+		"AWS::CodeDeploy::DeploymentConfig":                           &codedeploy.DeploymentConfig{},
+		"AWS::CodeDeploy::DeploymentGroup":                            &codedeploy.DeploymentGroup{},
+		"AWS::CodeGuruProfiler::ProfilingGroup":                       &codeguruprofiler.ProfilingGroup{},
+		"AWS::CodeGuruReviewer::RepositoryAssociation":                &codegurureviewer.RepositoryAssociation{},
+		"AWS::CodePipeline::CustomActionType":                         &codepipeline.CustomActionType{},
+		"AWS::CodePipeline::Pipeline":                                 &codepipeline.Pipeline{},
+		"AWS::CodePipeline::Webhook":                                  &codepipeline.Webhook{},
+		"AWS::CodeStar::GitHubRepository":                             &codestar.GitHubRepository{},
+		"AWS::CodeStarConnections::Connection":                        &codestarconnections.Connection{},
+		"AWS::CodeStarNotifications::NotificationRule":                &codestarnotifications.NotificationRule{},
+		"AWS::Cognito::IdentityPool":                                  &cognito.IdentityPool{},
+		"AWS::Cognito::IdentityPoolRoleAttachment":                    &cognito.IdentityPoolRoleAttachment{},
+		"AWS::Cognito::UserPool":                                      &cognito.UserPool{},
+		"AWS::Cognito::UserPoolClient":                                &cognito.UserPoolClient{},
+		"AWS::Cognito::UserPoolDomain":                                &cognito.UserPoolDomain{},
+		"AWS::Cognito::UserPoolGroup":                                 &cognito.UserPoolGroup{},
+		"AWS::Cognito::UserPoolIdentityProvider":                      &cognito.UserPoolIdentityProvider{},
+		"AWS::Cognito::UserPoolResourceServer":                        &cognito.UserPoolResourceServer{},
+		"AWS::Cognito::UserPoolRiskConfigurationAttachment":           &cognito.UserPoolRiskConfigurationAttachment{},
+		"AWS::Cognito::UserPoolUICustomizationAttachment":             &cognito.UserPoolUICustomizationAttachment{},
+		"AWS::Cognito::UserPoolUser":                                  &cognito.UserPoolUser{},
+		"AWS::Cognito::UserPoolUserToGroupAttachment":                 &cognito.UserPoolUserToGroupAttachment{},
+		"AWS::Config::AggregationAuthorization":                       &config.AggregationAuthorization{},
+		"AWS::Config::ConfigRule":                                     &config.ConfigRule{},
+		"AWS::Config::ConfigurationAggregator":                        &config.ConfigurationAggregator{},
+		"AWS::Config::ConfigurationRecorder":                          &config.ConfigurationRecorder{},
+		"AWS::Config::ConformancePack":                                &config.ConformancePack{},
+		"AWS::Config::DeliveryChannel":                                &config.DeliveryChannel{},
+		"AWS::Config::OrganizationConfigRule":                         &config.OrganizationConfigRule{},
+		"AWS::Config::OrganizationConformancePack":                    &config.OrganizationConformancePack{},
+		"AWS::Config::RemediationConfiguration":                       &config.RemediationConfiguration{},
+		"AWS::Config::StoredQuery":                                    &config.StoredQuery{},
+		"AWS::Connect::ContactFlow":                                   &connect.ContactFlow{},
+		"AWS::Connect::ContactFlowModule":                             &connect.ContactFlowModule{},
+		"AWS::Connect::HoursOfOperation":                              &connect.HoursOfOperation{},
+		"AWS::Connect::QuickConnect":                                  &connect.QuickConnect{},
+		"AWS::Connect::User":                                          &connect.User{},
+		"AWS::Connect::UserHierarchyGroup":                            &connect.UserHierarchyGroup{},
+		"AWS::CustomerProfiles::Domain":                               &customerprofiles.Domain{},
+		"AWS::CustomerProfiles::Integration":                          &customerprofiles.Integration{},
+		"AWS::CustomerProfiles::ObjectType":                           &customerprofiles.ObjectType{},
+		"AWS::DAX::Cluster":                                           &dax.Cluster{},
+		"AWS::DAX::ParameterGroup":                                    &dax.ParameterGroup{},
+		"AWS::DAX::SubnetGroup":                                       &dax.SubnetGroup{},
+		"AWS::DLM::LifecyclePolicy":                                   &dlm.LifecyclePolicy{},
+		"AWS::DMS::Certificate":                                       &dms.Certificate{},
+		"AWS::DMS::Endpoint":                                          &dms.Endpoint{},
+		"AWS::DMS::EventSubscription":                                 &dms.EventSubscription{},
+		"AWS::DMS::ReplicationInstance":                               &dms.ReplicationInstance{},
+		"AWS::DMS::ReplicationSubnetGroup":                            &dms.ReplicationSubnetGroup{},
+		"AWS::DMS::ReplicationTask":                                   &dms.ReplicationTask{},
+		"AWS::DataBrew::Dataset":                                      &databrew.Dataset{},
+		"AWS::DataBrew::Job":                                          &databrew.Job{},
+		"AWS::DataBrew::Project":                                      &databrew.Project{},
+		"AWS::DataBrew::Recipe":                                       &databrew.Recipe{},
+		"AWS::DataBrew::Ruleset":                                      &databrew.Ruleset{},
+		"AWS::DataBrew::Schedule":                                     &databrew.Schedule{},
+		"AWS::DataPipeline::Pipeline":                                 &datapipeline.Pipeline{},
+		"AWS::DataSync::Agent":                                        &datasync.Agent{},
+		"AWS::DataSync::LocationEFS":                                  &datasync.LocationEFS{},
+		"AWS::DataSync::LocationFSxWindows":                           &datasync.LocationFSxWindows{},
+		"AWS::DataSync::LocationHDFS":                                 &datasync.LocationHDFS{},
+		"AWS::DataSync::LocationNFS":                                  &datasync.LocationNFS{},
+		"AWS::DataSync::LocationObjectStorage":                        &datasync.LocationObjectStorage{},
+		"AWS::DataSync::LocationS3":                                   &datasync.LocationS3{},
+		"AWS::DataSync::LocationSMB":                                  &datasync.LocationSMB{},
+		"AWS::DataSync::Task":                                         &datasync.Task{},
+		"AWS::Detective::Graph":                                       &detective.Graph{},
+		"AWS::Detective::MemberInvitation":                            &detective.MemberInvitation{},
+		"AWS::DevOpsGuru::NotificationChannel":                        &devopsguru.NotificationChannel{},
+		"AWS::DevOpsGuru::ResourceCollection":                         &devopsguru.ResourceCollection{},
+		"AWS::DirectoryService::MicrosoftAD":                          &directoryservice.MicrosoftAD{},
+		"AWS::DirectoryService::SimpleAD":                             &directoryservice.SimpleAD{},
+		"AWS::DocDB::DBCluster":                                       &docdb.DBCluster{},
+		"AWS::DocDB::DBClusterParameterGroup":                         &docdb.DBClusterParameterGroup{},
+		"AWS::DocDB::DBInstance":                                      &docdb.DBInstance{},
+		"AWS::DocDB::DBSubnetGroup":                                   &docdb.DBSubnetGroup{},
+		"AWS::DynamoDB::GlobalTable":                                  &dynamodb.GlobalTable{},
+		"AWS::DynamoDB::Table":                                        &dynamodb.Table{},
+		"AWS::EC2::CapacityReservation":                               &ec2.CapacityReservation{},
+		"AWS::EC2::CapacityReservationFleet":                          &ec2.CapacityReservationFleet{},
+		"AWS::EC2::CarrierGateway":                                    &ec2.CarrierGateway{},
+		"AWS::EC2::ClientVpnAuthorizationRule":                        &ec2.ClientVpnAuthorizationRule{},
+		"AWS::EC2::ClientVpnEndpoint":                                 &ec2.ClientVpnEndpoint{},
+		"AWS::EC2::ClientVpnRoute":                                    &ec2.ClientVpnRoute{},
+		"AWS::EC2::ClientVpnTargetNetworkAssociation":                 &ec2.ClientVpnTargetNetworkAssociation{},
+		"AWS::EC2::CustomerGateway":                                   &ec2.CustomerGateway{},
+		"AWS::EC2::DHCPOptions":                                       &ec2.DHCPOptions{},
+		"AWS::EC2::EC2Fleet":                                          &ec2.EC2Fleet{},
+		"AWS::EC2::EIP":                                               &ec2.EIP{},
+		"AWS::EC2::EIPAssociation":                                    &ec2.EIPAssociation{},
+		"AWS::EC2::EgressOnlyInternetGateway":                         &ec2.EgressOnlyInternetGateway{},
+		"AWS::EC2::EnclaveCertificateIamRoleAssociation":              &ec2.EnclaveCertificateIamRoleAssociation{},
+		"AWS::EC2::FlowLog":                                           &ec2.FlowLog{},
+		"AWS::EC2::GatewayRouteTableAssociation":                      &ec2.GatewayRouteTableAssociation{},
+		"AWS::EC2::Host":                                              &ec2.Host{},
+		"AWS::EC2::IPAM":                                              &ec2.IPAM{},
+		"AWS::EC2::IPAMAllocation":                                    &ec2.IPAMAllocation{},
+		"AWS::EC2::IPAMPool":                                          &ec2.IPAMPool{},
+		"AWS::EC2::IPAMScope":                                         &ec2.IPAMScope{},
+		"AWS::EC2::Instance":                                          &ec2.Instance{},
+		"AWS::EC2::InternetGateway":                                   &ec2.InternetGateway{},
+		"AWS::EC2::LaunchTemplate":                                    &ec2.LaunchTemplate{},
+		"AWS::EC2::LocalGatewayRoute":                                 &ec2.LocalGatewayRoute{},
+		"AWS::EC2::LocalGatewayRouteTableVPCAssociation":              &ec2.LocalGatewayRouteTableVPCAssociation{},
+		"AWS::EC2::NatGateway":                                        &ec2.NatGateway{},
+		"AWS::EC2::NetworkAcl":                                        &ec2.NetworkAcl{},
+		"AWS::EC2::NetworkAclEntry":                                   &ec2.NetworkAclEntry{},
+		"AWS::EC2::NetworkInsightsAnalysis":                           &ec2.NetworkInsightsAnalysis{},
+		"AWS::EC2::NetworkInsightsPath":                               &ec2.NetworkInsightsPath{},
+		"AWS::EC2::NetworkInterface":                                  &ec2.NetworkInterface{},
+		"AWS::EC2::NetworkInterfaceAttachment":                        &ec2.NetworkInterfaceAttachment{},
+		"AWS::EC2::NetworkInterfacePermission":                        &ec2.NetworkInterfacePermission{},
+		"AWS::EC2::PlacementGroup":                                    &ec2.PlacementGroup{},
+		"AWS::EC2::PrefixList":                                        &ec2.PrefixList{},
+		"AWS::EC2::Route":                                             &ec2.Route{},
+		"AWS::EC2::RouteTable":                                        &ec2.RouteTable{},
+		"AWS::EC2::SecurityGroup":                                     &ec2.SecurityGroup{},
+		"AWS::EC2::SecurityGroupEgress":                               &ec2.SecurityGroupEgress{},
+		"AWS::EC2::SecurityGroupIngress":                              &ec2.SecurityGroupIngress{},
+		"AWS::EC2::SpotFleet":                                         &ec2.SpotFleet{},
+		"AWS::EC2::Subnet":                                            &ec2.Subnet{},
+		"AWS::EC2::SubnetCidrBlock":                                   &ec2.SubnetCidrBlock{},
+		"AWS::EC2::SubnetNetworkAclAssociation":                       &ec2.SubnetNetworkAclAssociation{},
+		"AWS::EC2::SubnetRouteTableAssociation":                       &ec2.SubnetRouteTableAssociation{},
+		"AWS::EC2::TrafficMirrorFilter":                               &ec2.TrafficMirrorFilter{},
+		"AWS::EC2::TrafficMirrorFilterRule":                           &ec2.TrafficMirrorFilterRule{},
+		"AWS::EC2::TrafficMirrorSession":                              &ec2.TrafficMirrorSession{},
+		"AWS::EC2::TrafficMirrorTarget":                               &ec2.TrafficMirrorTarget{},
+		"AWS::EC2::TransitGateway":                                    &ec2.TransitGateway{},
+		"AWS::EC2::TransitGatewayAttachment":                          &ec2.TransitGatewayAttachment{},
+		"AWS::EC2::TransitGatewayConnect":                             &ec2.TransitGatewayConnect{},
+		"AWS::EC2::TransitGatewayMulticastDomain":                     &ec2.TransitGatewayMulticastDomain{},
+		"AWS::EC2::TransitGatewayMulticastDomainAssociation":          &ec2.TransitGatewayMulticastDomainAssociation{},
+		"AWS::EC2::TransitGatewayMulticastGroupMember":                &ec2.TransitGatewayMulticastGroupMember{},
+		"AWS::EC2::TransitGatewayMulticastGroupSource":                &ec2.TransitGatewayMulticastGroupSource{},
+		"AWS::EC2::TransitGatewayPeeringAttachment":                   &ec2.TransitGatewayPeeringAttachment{},
+		"AWS::EC2::TransitGatewayRoute":                               &ec2.TransitGatewayRoute{},
+		"AWS::EC2::TransitGatewayRouteTable":                          &ec2.TransitGatewayRouteTable{},
+		"AWS::EC2::TransitGatewayRouteTableAssociation":               &ec2.TransitGatewayRouteTableAssociation{},
+		"AWS::EC2::TransitGatewayRouteTablePropagation":               &ec2.TransitGatewayRouteTablePropagation{},
+		"AWS::EC2::TransitGatewayVpcAttachment":                       &ec2.TransitGatewayVpcAttachment{},
+		"AWS::EC2::VPC":                                               &ec2.VPC{},
+		"AWS::EC2::VPCCidrBlock":                                      &ec2.VPCCidrBlock{},
+		"AWS::EC2::VPCDHCPOptionsAssociation":                         &ec2.VPCDHCPOptionsAssociation{},
+		"AWS::EC2::VPCEndpoint":                                       &ec2.VPCEndpoint{},
+		"AWS::EC2::VPCEndpointConnectionNotification":                 &ec2.VPCEndpointConnectionNotification{},
+		"AWS::EC2::VPCEndpointService":                                &ec2.VPCEndpointService{},
+		"AWS::EC2::VPCEndpointServicePermissions":                     &ec2.VPCEndpointServicePermissions{},
+		"AWS::EC2::VPCGatewayAttachment":                              &ec2.VPCGatewayAttachment{},
+		"AWS::EC2::VPCPeeringConnection":                              &ec2.VPCPeeringConnection{},
+		"AWS::EC2::VPNConnection":                                     &ec2.VPNConnection{},
+		"AWS::EC2::VPNConnectionRoute":                                &ec2.VPNConnectionRoute{},
+		"AWS::EC2::VPNGateway":                                        &ec2.VPNGateway{},
+		"AWS::EC2::VPNGatewayRoutePropagation":                        &ec2.VPNGatewayRoutePropagation{},
+		"AWS::EC2::Volume":                                            &ec2.Volume{},
+		"AWS::EC2::VolumeAttachment":                                  &ec2.VolumeAttachment{},
+		"AWS::ECR::PublicRepository":                                  &ecr.PublicRepository{},
+		"AWS::ECR::RegistryPolicy":                                    &ecr.RegistryPolicy{},
+		"AWS::ECR::ReplicationConfiguration":                          &ecr.ReplicationConfiguration{},
+		"AWS::ECR::Repository":                                        &ecr.Repository{},
+		"AWS::ECS::CapacityProvider":                                  &ecs.CapacityProvider{},
+		"AWS::ECS::Cluster":                                           &ecs.Cluster{},
+		"AWS::ECS::ClusterCapacityProviderAssociations":               &ecs.ClusterCapacityProviderAssociations{},
+		"AWS::ECS::PrimaryTaskSet":                                    &ecs.PrimaryTaskSet{},
+		"AWS::ECS::Service":                                           &ecs.Service{},
+		"AWS::ECS::TaskDefinition":                                    &ecs.TaskDefinition{},
+		"AWS::ECS::TaskSet":                                           &ecs.TaskSet{},
+		"AWS::EFS::AccessPoint":                                       &efs.AccessPoint{},
+		"AWS::EFS::FileSystem":                                        &efs.FileSystem{},
+		"AWS::EFS::MountTarget":                                       &efs.MountTarget{},
+		"AWS::EKS::Addon":                                             &eks.Addon{},
+		"AWS::EKS::Cluster":                                           &eks.Cluster{},
+		"AWS::EKS::AccessEntry":                                       &eks.AccessEntry{},
+		"AWS::EKS::FargateProfile":                                    &eks.FargateProfile{},
+		"AWS::EKS::Nodegroup":                                         &eks.Nodegroup{},
+		"AWS::EMR::Cluster":                                           &emr.Cluster{},
+		"AWS::EMR::InstanceFleetConfig":                               &emr.InstanceFleetConfig{},
+		"AWS::EMR::InstanceGroupConfig":                               &emr.InstanceGroupConfig{},
+		"AWS::EMR::SecurityConfiguration":                             &emr.SecurityConfiguration{},
+		"AWS::EMR::Step":                                              &emr.Step{},
+		"AWS::EMR::Studio":                                            &emr.Studio{},
+		"AWS::EMR::StudioSessionMapping":                              &emr.StudioSessionMapping{},
+		"AWS::EMRContainers::VirtualCluster":                          &emrcontainers.VirtualCluster{},
+		"AWS::ElastiCache::CacheCluster":                              &elasticache.CacheCluster{},
+		"AWS::ElastiCache::GlobalReplicationGroup":                    &elasticache.GlobalReplicationGroup{},
+		"AWS::ElastiCache::ParameterGroup":                            &elasticache.ParameterGroup{},
+		"AWS::ElastiCache::ReplicationGroup":                          &elasticache.ReplicationGroup{},
+		"AWS::ElastiCache::SecurityGroup":                             &elasticache.SecurityGroup{},
+		"AWS::ElastiCache::SecurityGroupIngress":                      &elasticache.SecurityGroupIngress{},
+		"AWS::ElastiCache::SubnetGroup":                               &elasticache.SubnetGroup{},
+		"AWS::ElastiCache::User":                                      &elasticache.User{},
+		"AWS::ElastiCache::UserGroup":                                 &elasticache.UserGroup{},
+		"AWS::ElasticBeanstalk::Application":                          &elasticbeanstalk.Application{},
+		"AWS::ElasticBeanstalk::ApplicationVersion":                   &elasticbeanstalk.ApplicationVersion{},
+		"AWS::ElasticBeanstalk::ConfigurationTemplate":                &elasticbeanstalk.ConfigurationTemplate{},
+		"AWS::ElasticBeanstalk::Environment":                          &elasticbeanstalk.Environment{},
+		"AWS::ElasticLoadBalancing::LoadBalancer":                     &elasticloadbalancing.LoadBalancer{},
+		"AWS::ElasticLoadBalancingV2::Listener":                       &elasticloadbalancingv2.Listener{},
+		"AWS::ElasticLoadBalancingV2::ListenerCertificate":            &elasticloadbalancingv2.ListenerCertificate{},
+		"AWS::ElasticLoadBalancingV2::ListenerRule":                   &elasticloadbalancingv2.ListenerRule{},
+		"AWS::ElasticLoadBalancingV2::LoadBalancer":                   &elasticloadbalancingv2.LoadBalancer{},
+		"AWS::ElasticLoadBalancingV2::TargetGroup":                    &elasticloadbalancingv2.TargetGroup{},
+		"AWS::Elasticsearch::Domain":                                  &elasticsearch.Domain{},
+		"AWS::EventSchemas::Discoverer":                               &eventschemas.Discoverer{},
+		"AWS::EventSchemas::Registry":                                 &eventschemas.Registry{},
+		"AWS::EventSchemas::RegistryPolicy":                           &eventschemas.RegistryPolicy{},
+		"AWS::EventSchemas::Schema":                                   &eventschemas.Schema{},
+		"AWS::Events::ApiDestination":                                 &events.ApiDestination{},
+		"AWS::Events::Archive":                                        &events.Archive{},
+		"AWS::Events::Connection":                                     &events.Connection{},
+		"AWS::Events::EventBus":                                       &events.EventBus{},
+		"AWS::Events::EventBusPolicy":                                 &events.EventBusPolicy{},
+		"AWS::Events::Rule":                                           &events.Rule{},
+		"AWS::Evidently::Experiment":                                  &evidently.Experiment{},
+		"AWS::Evidently::Feature":                                     &evidently.Feature{},
+		"AWS::Evidently::Launch":                                      &evidently.Launch{},
+		"AWS::Evidently::Project":                                     &evidently.Project{},
+		"AWS::FIS::ExperimentTemplate":                                &fis.ExperimentTemplate{},
+		"AWS::FMS::NotificationChannel":                               &fms.NotificationChannel{},
+		"AWS::FMS::Policy":                                            &fms.Policy{},
+		"AWS::FSx::FileSystem":                                        &fsx.FileSystem{},
+		"AWS::FinSpace::Environment":                                  &finspace.Environment{},
+		"AWS::FraudDetector::Detector":                                &frauddetector.Detector{},
+		"AWS::FraudDetector::EntityType":                              &frauddetector.EntityType{},
+		"AWS::FraudDetector::EventType":                               &frauddetector.EventType{},
+		"AWS::FraudDetector::Label":                                   &frauddetector.Label{},
+		"AWS::FraudDetector::Outcome":                                 &frauddetector.Outcome{},
+		"AWS::FraudDetector::Variable":                                &frauddetector.Variable{},
+		"AWS::GameLift::Alias":                                        &gamelift.Alias{},
+		"AWS::GameLift::Build":                                        &gamelift.Build{},
+		"AWS::GameLift::Fleet":                                        &gamelift.Fleet{},
+		"AWS::GameLift::GameServerGroup":                              &gamelift.GameServerGroup{},
+		"AWS::GameLift::GameSessionQueue":                             &gamelift.GameSessionQueue{},
+		"AWS::GameLift::MatchmakingConfiguration":                     &gamelift.MatchmakingConfiguration{},
+		"AWS::GameLift::MatchmakingRuleSet":                           &gamelift.MatchmakingRuleSet{},
+		"AWS::GameLift::Script":                                       &gamelift.Script{},
+		"AWS::GlobalAccelerator::Accelerator":                         &globalaccelerator.Accelerator{},
+		"AWS::GlobalAccelerator::EndpointGroup":                       &globalaccelerator.EndpointGroup{},
+		"AWS::GlobalAccelerator::Listener":                            &globalaccelerator.Listener{},
+		"AWS::Glue::Classifier":                                       &glue.Classifier{},
+		"AWS::Glue::Connection":                                       &glue.Connection{},
+		"AWS::Glue::Crawler":                                          &glue.Crawler{},
+		"AWS::Glue::DataCatalogEncryptionSettings":                    &glue.DataCatalogEncryptionSettings{},
+		"AWS::Glue::Database":                                         &glue.Database{},
+		"AWS::Glue::DevEndpoint":                                      &glue.DevEndpoint{},
+		"AWS::Glue::Job":                                              &glue.Job{},
+		"AWS::Glue::MLTransform":                                      &glue.MLTransform{},
+		"AWS::Glue::Partition":                                        &glue.Partition{},
+		"AWS::Glue::Registry":                                         &glue.Registry{},
+		"AWS::Glue::Schema":                                           &glue.Schema{},
+		"AWS::Glue::SchemaVersion":                                    &glue.SchemaVersion{},
+		"AWS::Glue::SchemaVersionMetadata":                            &glue.SchemaVersionMetadata{},
+		"AWS::Glue::SecurityConfiguration":                            &glue.SecurityConfiguration{},
+		"AWS::Glue::Table":                                            &glue.Table{},
+		"AWS::Glue::Trigger":                                          &glue.Trigger{},
+		"AWS::Glue::Workflow":                                         &glue.Workflow{},
+		"AWS::Greengrass::ConnectorDefinition":                        &greengrass.ConnectorDefinition{},
+		"AWS::Greengrass::ConnectorDefinitionVersion":                 &greengrass.ConnectorDefinitionVersion{},
+		"AWS::Greengrass::CoreDefinition":                             &greengrass.CoreDefinition{},
+		"AWS::Greengrass::CoreDefinitionVersion":                      &greengrass.CoreDefinitionVersion{},
+		"AWS::Greengrass::DeviceDefinition":                           &greengrass.DeviceDefinition{},
+		"AWS::Greengrass::DeviceDefinitionVersion":                    &greengrass.DeviceDefinitionVersion{},
+		"AWS::Greengrass::FunctionDefinition":                         &greengrass.FunctionDefinition{},
+		"AWS::Greengrass::FunctionDefinitionVersion":                  &greengrass.FunctionDefinitionVersion{},
+		"AWS::Greengrass::Group":                                      &greengrass.Group{},
+		"AWS::Greengrass::GroupVersion":                               &greengrass.GroupVersion{},
+		"AWS::Greengrass::LoggerDefinition":                           &greengrass.LoggerDefinition{},
+		"AWS::Greengrass::LoggerDefinitionVersion":                    &greengrass.LoggerDefinitionVersion{},
+		"AWS::Greengrass::ResourceDefinition":                         &greengrass.ResourceDefinition{},
+		"AWS::Greengrass::ResourceDefinitionVersion":                  &greengrass.ResourceDefinitionVersion{},
+		"AWS::Greengrass::SubscriptionDefinition":                     &greengrass.SubscriptionDefinition{},
+		"AWS::Greengrass::SubscriptionDefinitionVersion":              &greengrass.SubscriptionDefinitionVersion{},
+		"AWS::GreengrassV2::ComponentVersion":                         &greengrassv2.ComponentVersion{},
+		"AWS::GroundStation::Config":                                  &groundstation.Config{},
+		"AWS::GroundStation::DataflowEndpointGroup":                   &groundstation.DataflowEndpointGroup{},
+		"AWS::GroundStation::MissionProfile":                          &groundstation.MissionProfile{},
+		"AWS::GuardDuty::Detector":                                    &guardduty.Detector{},
+		"AWS::GuardDuty::Filter":                                      &guardduty.Filter{},
+		"AWS::GuardDuty::IPSet":                                       &guardduty.IPSet{},
+		"AWS::GuardDuty::Master":                                      &guardduty.Master{},
+		"AWS::GuardDuty::Member":                                      &guardduty.Member{},
+		"AWS::GuardDuty::ThreatIntelSet":                              &guardduty.ThreatIntelSet{},
+		"AWS::HealthLake::FHIRDatastore":                              &healthlake.FHIRDatastore{},
+		"AWS::IAM::AccessKey":                                         &iam.AccessKey{},
+		"AWS::IAM::Group":                                             &iam.Group{},
+		"AWS::IAM::InstanceProfile":                                   &iam.InstanceProfile{},
+		"AWS::IAM::ManagedPolicy":                                     &iam.ManagedPolicy{},
+		"AWS::IAM::OIDCProvider":                                      &iam.OIDCProvider{},
+		"AWS::IAM::Policy":                                            &iam.Policy{},
+		"AWS::IAM::Role":                                              &iam.Role{},
+		"AWS::IAM::SAMLProvider":                                      &iam.SAMLProvider{},
+		"AWS::IAM::ServerCertificate":                                 &iam.ServerCertificate{},
+		"AWS::IAM::ServiceLinkedRole":                                 &iam.ServiceLinkedRole{},
+		"AWS::IAM::User":                                              &iam.User{},
+		"AWS::IAM::UserToGroupAddition":                               &iam.UserToGroupAddition{},
+		"AWS::IAM::VirtualMFADevice":                                  &iam.VirtualMFADevice{},
+		"AWS::IVS::Channel":                                           &ivs.Channel{},
+		"AWS::IVS::PlaybackKeyPair":                                   &ivs.PlaybackKeyPair{},
+		"AWS::IVS::RecordingConfiguration":                            &ivs.RecordingConfiguration{},
+		"AWS::IVS::StreamKey":                                         &ivs.StreamKey{},
+		"AWS::ImageBuilder::Component":                                &imagebuilder.Component{},
+		"AWS::ImageBuilder::ContainerRecipe":                          &imagebuilder.ContainerRecipe{},
+		"AWS::ImageBuilder::DistributionConfiguration":                &imagebuilder.DistributionConfiguration{},
+		"AWS::ImageBuilder::Image":                                    &imagebuilder.Image{},
+		"AWS::ImageBuilder::ImagePipeline":                            &imagebuilder.ImagePipeline{},
+		"AWS::ImageBuilder::ImageRecipe":                              &imagebuilder.ImageRecipe{},
+		"AWS::ImageBuilder::InfrastructureConfiguration":              &imagebuilder.InfrastructureConfiguration{},
+		"AWS::Inspector::AssessmentTarget":                            &inspector.AssessmentTarget{},
+		"AWS::Inspector::AssessmentTemplate":                          &inspector.AssessmentTemplate{},
+		"AWS::Inspector::ResourceGroup":                               &inspector.ResourceGroup{},
+		"AWS::IoT1Click::Device":                                      &iot1click.Device{},
+		"AWS::IoT1Click::Placement":                                   &iot1click.Placement{},
+		"AWS::IoT1Click::Project":                                     &iot1click.Project{},
+		"AWS::IoT::AccountAuditConfiguration":                         &iot.AccountAuditConfiguration{},
+		"AWS::IoT::Authorizer":                                        &iot.Authorizer{},
+		"AWS::IoT::Certificate":                                       &iot.Certificate{},
+		"AWS::IoT::CustomMetric":                                      &iot.CustomMetric{},
+		"AWS::IoT::Dimension":                                         &iot.Dimension{},
+		"AWS::IoT::DomainConfiguration":                               &iot.DomainConfiguration{},
+		"AWS::IoT::FleetMetric":                                       &iot.FleetMetric{},
+		"AWS::IoT::JobTemplate":                                       &iot.JobTemplate{},
+		"AWS::IoT::Logging":                                           &iot.Logging{},
+		"AWS::IoT::MitigationAction":                                  &iot.MitigationAction{},
+		"AWS::IoT::Policy":                                            &iot.Policy{},
+		"AWS::IoT::PolicyPrincipalAttachment":                         &iot.PolicyPrincipalAttachment{},
+		"AWS::IoT::ProvisioningTemplate":                              &iot.ProvisioningTemplate{},
+		"AWS::IoT::ResourceSpecificLogging":                           &iot.ResourceSpecificLogging{},
+		"AWS::IoT::ScheduledAudit":                                    &iot.ScheduledAudit{},
+		"AWS::IoT::SecurityProfile":                                   &iot.SecurityProfile{},
+		"AWS::IoT::Thing":                                             &iot.Thing{},
+		"AWS::IoT::ThingPrincipalAttachment":                          &iot.ThingPrincipalAttachment{},
+		"AWS::IoT::TopicRule":                                         &iot.TopicRule{},
+		"AWS::IoT::TopicRuleDestination":                              &iot.TopicRuleDestination{},
+		"AWS::IoTAnalytics::Channel":                                  &iotanalytics.Channel{},
+		"AWS::IoTAnalytics::Dataset":                                  &iotanalytics.Dataset{},
+		"AWS::IoTAnalytics::Datastore":                                &iotanalytics.Datastore{},
+		"AWS::IoTAnalytics::Pipeline":                                 &iotanalytics.Pipeline{},
+		"AWS::IoTCoreDeviceAdvisor::SuiteDefinition":                  &iotcoredeviceadvisor.SuiteDefinition{},
+		"AWS::IoTEvents::DetectorModel":                               &iotevents.DetectorModel{},
+		"AWS::IoTEvents::Input":                                       &iotevents.Input{},
+		"AWS::IoTFleetHub::Application":                               &iotfleethub.Application{},
+		"AWS::IoTSiteWise::AccessPolicy":                              &iotsitewise.AccessPolicy{},
+		"AWS::IoTSiteWise::Asset":                                     &iotsitewise.Asset{},
+		"AWS::IoTSiteWise::AssetModel":                                &iotsitewise.AssetModel{},
+		"AWS::IoTSiteWise::Dashboard":                                 &iotsitewise.Dashboard{},
+		"AWS::IoTSiteWise::Gateway":                                   &iotsitewise.Gateway{},
+		"AWS::IoTSiteWise::Portal":                                    &iotsitewise.Portal{},
+		"AWS::IoTSiteWise::Project":                                   &iotsitewise.Project{},
+		"AWS::IoTThingsGraph::FlowTemplate":                           &iotthingsgraph.FlowTemplate{},
+		"AWS::IoTWireless::Destination":                               &iotwireless.Destination{},
+		"AWS::IoTWireless::DeviceProfile":                             &iotwireless.DeviceProfile{},
+		"AWS::IoTWireless::FuotaTask":                                 &iotwireless.FuotaTask{},
+		"AWS::IoTWireless::MulticastGroup":                            &iotwireless.MulticastGroup{},
+		"AWS::IoTWireless::PartnerAccount":                            &iotwireless.PartnerAccount{},
+		"AWS::IoTWireless::ServiceProfile":                            &iotwireless.ServiceProfile{},
+		"AWS::IoTWireless::TaskDefinition":                            &iotwireless.TaskDefinition{},
+		"AWS::IoTWireless::WirelessDevice":                            &iotwireless.WirelessDevice{},
+		"AWS::IoTWireless::WirelessGateway":                           &iotwireless.WirelessGateway{},
+		"AWS::KMS::Alias":                                             &kms.Alias{},
+		"AWS::KMS::Key":                                               &kms.Key{},
+		"AWS::KMS::ReplicaKey":                                        &kms.ReplicaKey{},
+		"AWS::Kendra::DataSource":                                     &kendra.DataSource{},
+		"AWS::Kendra::Faq":                                            &kendra.Faq{},
+		"AWS::Kendra::Index":                                          &kendra.Index{},
+		"AWS::Kinesis::Stream":                                        &kinesis.Stream{},
+		"AWS::Kinesis::StreamConsumer":                                &kinesis.StreamConsumer{},
+		"AWS::KinesisAnalytics::Application":                          &kinesisanalytics.Application{},
+		"AWS::KinesisAnalytics::ApplicationOutput":                    &kinesisanalytics.ApplicationOutput{},
+		"AWS::KinesisAnalytics::ApplicationReferenceDataSource":       &kinesisanalytics.ApplicationReferenceDataSource{},
+		"AWS::KinesisAnalyticsV2::Application":                        &kinesisanalyticsv2.Application{},
+		"AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption": &kinesisanalyticsv2.ApplicationCloudWatchLoggingOption{},
+		"AWS::KinesisAnalyticsV2::ApplicationOutput":                  &kinesisanalyticsv2.ApplicationOutput{},
+		"AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource":     &kinesisanalyticsv2.ApplicationReferenceDataSource{},
+		"AWS::KinesisFirehose::DeliveryStream":                        &kinesisfirehose.DeliveryStream{},
+		"AWS::LakeFormation::DataLakeSettings":                        &lakeformation.DataLakeSettings{},
+		"AWS::LakeFormation::Permissions":                             &lakeformation.Permissions{},
+		"AWS::LakeFormation::Resource":                                &lakeformation.Resource{},
+		"AWS::Lambda::Alias":                                          &lambda.Alias{},
+		"AWS::Lambda::CodeSigningConfig":                              &lambda.CodeSigningConfig{},
+		"AWS::Lambda::EventInvokeConfig":                              &lambda.EventInvokeConfig{},
+		"AWS::Lambda::EventSourceMapping":                             &lambda.EventSourceMapping{},
+		"AWS::Lambda::Function":                                       &lambda.Function{},
+		"AWS::Lambda::LayerVersion":                                   &lambda.LayerVersion{},
+		"AWS::Lambda::LayerVersionPermission":                         &lambda.LayerVersionPermission{},
+		"AWS::Lambda::Permission":                                     &lambda.Permission{},
+		"AWS::Lambda::Version":                                        &lambda.Version{},
+		"AWS::LicenseManager::Grant":                                  &licensemanager.Grant{},
+		"AWS::LicenseManager::License":                                &licensemanager.License{},
+		"AWS::Lightsail::Database":                                    &lightsail.Database{},
+		"AWS::Lightsail::Disk":                                        &lightsail.Disk{},
+		"AWS::Lightsail::Instance":                                    &lightsail.Instance{},
+		"AWS::Lightsail::StaticIp":                                    &lightsail.StaticIp{},
+		"AWS::Location::GeofenceCollection":                           &location.GeofenceCollection{},
+		"AWS::Location::Map":                                          &location.Map{},
+		"AWS::Location::PlaceIndex":                                   &location.PlaceIndex{},
+		"AWS::Location::RouteCalculator":                              &location.RouteCalculator{},
+		"AWS::Location::Tracker":                                      &location.Tracker{},
+		"AWS::Location::TrackerConsumer":                              &location.TrackerConsumer{},
+		"AWS::Logs::Destination":                                      &logs.Destination{},
+		"AWS::Logs::LogGroup":                                         &logs.LogGroup{},
+		"AWS::Logs::LogStream":                                        &logs.LogStream{},
+		"AWS::Logs::MetricFilter":                                     &logs.MetricFilter{},
+		"AWS::Logs::QueryDefinition":                                  &logs.QueryDefinition{},
+		"AWS::Logs::ResourcePolicy":                                   &logs.ResourcePolicy{},
+		"AWS::Logs::SubscriptionFilter":                               &logs.SubscriptionFilter{},
+		"AWS::LookoutEquipment::InferenceScheduler":                   &lookoutequipment.InferenceScheduler{},
+		"AWS::LookoutMetrics::Alert":                                  &lookoutmetrics.Alert{},
+		"AWS::LookoutMetrics::AnomalyDetector":                        &lookoutmetrics.AnomalyDetector{},
+		"AWS::LookoutVision::Project":                                 &lookoutvision.Project{},
+		"AWS::MSK::Cluster":                                           &msk.Cluster{},
+		"AWS::MWAA::Environment":                                      &mwaa.Environment{},
+		"AWS::Macie::CustomDataIdentifier":                            &macie.CustomDataIdentifier{},
+		"AWS::Macie::FindingsFilter":                                  &macie.FindingsFilter{},
+		"AWS::Macie::Session":                                         &macie.Session{},
+		"AWS::ManagedBlockchain::Member":                              &managedblockchain.Member{},
+		"AWS::ManagedBlockchain::Node":                                &managedblockchain.Node{},
+		"AWS::MediaConnect::Flow":                                     &mediaconnect.Flow{},
+		"AWS::MediaConnect::FlowEntitlement":                          &mediaconnect.FlowEntitlement{},
+		"AWS::MediaConnect::FlowOutput":                               &mediaconnect.FlowOutput{},
+		"AWS::MediaConnect::FlowSource":                               &mediaconnect.FlowSource{},
+		"AWS::MediaConnect::FlowVpcInterface":                         &mediaconnect.FlowVpcInterface{},
+		"AWS::MediaConvert::JobTemplate":                              &mediaconvert.JobTemplate{},
+		"AWS::MediaConvert::Preset":                                   &mediaconvert.Preset{},
+		"AWS::MediaConvert::Queue":                                    &mediaconvert.Queue{},
+		"AWS::MediaLive::Channel":                                     &medialive.Channel{},
+		"AWS::MediaLive::Input":                                       &medialive.Input{},
+		"AWS::MediaLive::InputSecurityGroup":                          &medialive.InputSecurityGroup{},
+		"AWS::MediaPackage::Asset":                                    &mediapackage.Asset{},
+		"AWS::MediaPackage::Channel":                                  &mediapackage.Channel{},
+		"AWS::MediaPackage::OriginEndpoint":                           &mediapackage.OriginEndpoint{},
+		"AWS::MediaPackage::PackagingConfiguration":                   &mediapackage.PackagingConfiguration{},
+		"AWS::MediaPackage::PackagingGroup":                           &mediapackage.PackagingGroup{},
+		"AWS::MediaStore::Container":                                  &mediastore.Container{},
+		"AWS::MemoryDB::ACL":                                          &memorydb.ACL{},
+		"AWS::MemoryDB::Cluster":                                      &memorydb.Cluster{},
+		"AWS::MemoryDB::ParameterGroup":                               &memorydb.ParameterGroup{},
+		"AWS::MemoryDB::SubnetGroup":                                  &memorydb.SubnetGroup{},
+		"AWS::MemoryDB::User":                                         &memorydb.User{},
+		"AWS::Neptune::DBCluster":                                     &neptune.DBCluster{},
+		"AWS::Neptune::DBClusterParameterGroup":                       &neptune.DBClusterParameterGroup{},
+		"AWS::Neptune::DBInstance":                                    &neptune.DBInstance{},
+		"AWS::Neptune::DBParameterGroup":                              &neptune.DBParameterGroup{},
+		"AWS::Neptune::DBSubnetGroup":                                 &neptune.DBSubnetGroup{},
+		"AWS::NetworkFirewall::Firewall":                              &networkfirewall.Firewall{},
+		"AWS::NetworkFirewall::FirewallPolicy":                        &networkfirewall.FirewallPolicy{},
+		"AWS::NetworkFirewall::LoggingConfiguration":                  &networkfirewall.LoggingConfiguration{},
+		"AWS::NetworkFirewall::RuleGroup":                             &networkfirewall.RuleGroup{},
+		"AWS::NetworkManager::CustomerGatewayAssociation":             &networkmanager.CustomerGatewayAssociation{},
+		"AWS::NetworkManager::Device":                                 &networkmanager.Device{},
+		"AWS::NetworkManager::GlobalNetwork":                          &networkmanager.GlobalNetwork{},
+		"AWS::NetworkManager::Link":                                   &networkmanager.Link{},
+		"AWS::NetworkManager::LinkAssociation":                        &networkmanager.LinkAssociation{},
+		"AWS::NetworkManager::Site":                                   &networkmanager.Site{},
+		"AWS::NetworkManager::TransitGatewayRegistration":             &networkmanager.TransitGatewayRegistration{},
+		"AWS::NimbleStudio::LaunchProfile":                            &nimblestudio.LaunchProfile{},
+		"AWS::NimbleStudio::StreamingImage":                           &nimblestudio.StreamingImage{},
+		"AWS::NimbleStudio::Studio":                                   &nimblestudio.Studio{},
+		"AWS::NimbleStudio::StudioComponent":                          &nimblestudio.StudioComponent{},
+		"AWS::OpenSearchService::Domain":                              &opensearchservice.Domain{},
+		"AWS::OpsWorks::App":                                          &opsworks.App{},
+		"AWS::OpsWorks::ElasticLoadBalancerAttachment":                &opsworks.ElasticLoadBalancerAttachment{},
+		"AWS::OpsWorks::Instance":                                     &opsworks.Instance{},
+		"AWS::OpsWorks::Layer":                                        &opsworks.Layer{},
+		"AWS::OpsWorks::Stack":                                        &opsworks.Stack{},
+		"AWS::OpsWorks::UserProfile":                                  &opsworks.UserProfile{},
+		"AWS::OpsWorks::Volume":                                       &opsworks.Volume{},
+		"AWS::OpsWorksCM::Server":                                     &opsworkscm.Server{},
+		"AWS::Panorama::ApplicationInstance":                          &panorama.ApplicationInstance{},
+		"AWS::Panorama::Package":                                      &panorama.Package{},
+		"AWS::Panorama::PackageVersion":                               &panorama.PackageVersion{},
+		"AWS::Pinpoint::ADMChannel":                                   &pinpoint.ADMChannel{},
+		"AWS::Pinpoint::APNSChannel":                                  &pinpoint.APNSChannel{},
+		"AWS::Pinpoint::APNSSandboxChannel":                           &pinpoint.APNSSandboxChannel{},
+		"AWS::Pinpoint::APNSVoipChannel":                              &pinpoint.APNSVoipChannel{},
+		"AWS::Pinpoint::APNSVoipSandboxChannel":                       &pinpoint.APNSVoipSandboxChannel{},
+		"AWS::Pinpoint::App":                                          &pinpoint.App{},
+		"AWS::Pinpoint::ApplicationSettings":                          &pinpoint.ApplicationSettings{},
+		"AWS::Pinpoint::BaiduChannel":                                 &pinpoint.BaiduChannel{},
+		"AWS::Pinpoint::Campaign":                                     &pinpoint.Campaign{},
+		"AWS::Pinpoint::EmailChannel":                                 &pinpoint.EmailChannel{},
+		"AWS::Pinpoint::EmailTemplate":                                &pinpoint.EmailTemplate{},
+		"AWS::Pinpoint::EventStream":                                  &pinpoint.EventStream{},
+		"AWS::Pinpoint::GCMChannel":                                   &pinpoint.GCMChannel{},
+		"AWS::Pinpoint::InAppTemplate":                                &pinpoint.InAppTemplate{},
+		"AWS::Pinpoint::PushTemplate":                                 &pinpoint.PushTemplate{},
+		"AWS::Pinpoint::SMSChannel":                                   &pinpoint.SMSChannel{},
+		"AWS::Pinpoint::Segment":                                      &pinpoint.Segment{},
+		"AWS::Pinpoint::SmsTemplate":                                  &pinpoint.SmsTemplate{},
+		"AWS::Pinpoint::VoiceChannel":                                 &pinpoint.VoiceChannel{},
+		"AWS::PinpointEmail::ConfigurationSet":                        &pinpointemail.ConfigurationSet{},
+		"AWS::PinpointEmail::ConfigurationSetEventDestination":        &pinpointemail.ConfigurationSetEventDestination{},
+		"AWS::PinpointEmail::DedicatedIpPool":                         &pinpointemail.DedicatedIpPool{},
+		"AWS::PinpointEmail::Identity":                                &pinpointemail.Identity{},
+		"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::Template":                                   &quicksight.Template{},
+		"AWS::QuickSight::Theme":                                      &quicksight.Theme{},
+		"AWS::RAM::ResourceShare":                                     &ram.ResourceShare{},
+		"AWS::RDS::DBCluster":                                         &rds.DBCluster{},
+		"AWS::RDS::DBClusterParameterGroup":                           &rds.DBClusterParameterGroup{},
+		"AWS::RDS::DBInstance":                                        &rds.DBInstance{},
+		"AWS::RDS::DBParameterGroup":                                  &rds.DBParameterGroup{},
+		"AWS::RDS::DBProxy":                                           &rds.DBProxy{},
+		"AWS::RDS::DBProxyEndpoint":                                   &rds.DBProxyEndpoint{},
+		"AWS::RDS::DBProxyTargetGroup":                                &rds.DBProxyTargetGroup{},
+		"AWS::RDS::DBSecurityGroup":                                   &rds.DBSecurityGroup{},
+		"AWS::RDS::DBSecurityGroupIngress":                            &rds.DBSecurityGroupIngress{},
+		"AWS::RDS::DBSubnetGroup":                                     &rds.DBSubnetGroup{},
+		"AWS::RDS::EventSubscription":                                 &rds.EventSubscription{},
+		"AWS::RDS::GlobalCluster":                                     &rds.GlobalCluster{},
+		"AWS::RDS::OptionGroup":                                       &rds.OptionGroup{},
+		"AWS::RUM::AppMonitor":                                        &rum.AppMonitor{},
+		"AWS::Redshift::Cluster":                                      &redshift.Cluster{},
+		"AWS::Redshift::ClusterParameterGroup":                        &redshift.ClusterParameterGroup{},
+		"AWS::Redshift::ClusterSecurityGroup":                         &redshift.ClusterSecurityGroup{},
+		"AWS::Redshift::ClusterSecurityGroupIngress":                  &redshift.ClusterSecurityGroupIngress{},
+		"AWS::Redshift::ClusterSubnetGroup":                           &redshift.ClusterSubnetGroup{},
+		"AWS::Redshift::EndpointAccess":                               &redshift.EndpointAccess{},
+		"AWS::Redshift::EndpointAuthorization":                        &redshift.EndpointAuthorization{},
+		"AWS::Redshift::EventSubscription":                            &redshift.EventSubscription{},
+		"AWS::Redshift::ScheduledAction":                              &redshift.ScheduledAction{},
+		"AWS::RefactorSpaces::Application":                            &refactorspaces.Application{},
+		"AWS::RefactorSpaces::Environment":                            &refactorspaces.Environment{},
+		"AWS::RefactorSpaces::Route":                                  &refactorspaces.Route{},
+		"AWS::RefactorSpaces::Service":                                &refactorspaces.Service{},
+		"AWS::Rekognition::Project":                                   &rekognition.Project{},
+		"AWS::ResilienceHub::App":                                     &resiliencehub.App{},
+		"AWS::ResilienceHub::ResiliencyPolicy":                        &resiliencehub.ResiliencyPolicy{},
+		"AWS::ResourceGroups::Group":                                  &resourcegroups.Group{},
+		"AWS::RoboMaker::Fleet":                                       &robomaker.Fleet{},
+		"AWS::RoboMaker::Robot":                                       &robomaker.Robot{},
+		"AWS::RoboMaker::RobotApplication":                            &robomaker.RobotApplication{},
+		"AWS::RoboMaker::RobotApplicationVersion":                     &robomaker.RobotApplicationVersion{},
+		"AWS::RoboMaker::SimulationApplication":                       &robomaker.SimulationApplication{},
+		"AWS::RoboMaker::SimulationApplicationVersion":                &robomaker.SimulationApplicationVersion{},
+		"AWS::Route53::DNSSEC":                                        &route53.DNSSEC{},
+		"AWS::Route53::HealthCheck":                                   &route53.HealthCheck{},
+		"AWS::Route53::HostedZone":                                    &route53.HostedZone{},
+		"AWS::Route53::KeySigningKey":                                 &route53.KeySigningKey{},
+		"AWS::Route53::RecordSet":                                     &route53.RecordSet{},
+		"AWS::Route53::RecordSetGroup":                                &route53.RecordSetGroup{},
+		"AWS::Route53RecoveryControl::Cluster":                        &route53recoverycontrol.Cluster{},
+		"AWS::Route53RecoveryControl::ControlPanel":                   &route53recoverycontrol.ControlPanel{},
+		"AWS::Route53RecoveryControl::RoutingControl":                 &route53recoverycontrol.RoutingControl{},
+		"AWS::Route53RecoveryControl::SafetyRule":                     &route53recoverycontrol.SafetyRule{},
+		"AWS::Route53RecoveryReadiness::Cell":                         &route53recoveryreadiness.Cell{},
+		"AWS::Route53RecoveryReadiness::ReadinessCheck":               &route53recoveryreadiness.ReadinessCheck{},
+		"AWS::Route53RecoveryReadiness::RecoveryGroup":                &route53recoveryreadiness.RecoveryGroup{},
+		"AWS::Route53RecoveryReadiness::ResourceSet":                  &route53recoveryreadiness.ResourceSet{},
+		"AWS::Route53Resolver::FirewallDomainList":                    &route53resolver.FirewallDomainList{},
+		"AWS::Route53Resolver::FirewallRuleGroup":                     &route53resolver.FirewallRuleGroup{},
+		"AWS::Route53Resolver::FirewallRuleGroupAssociation":          &route53resolver.FirewallRuleGroupAssociation{},
+		"AWS::Route53Resolver::ResolverConfig":                        &route53resolver.ResolverConfig{},
+		"AWS::Route53Resolver::ResolverDNSSECConfig":                  &route53resolver.ResolverDNSSECConfig{},
+		"AWS::Route53Resolver::ResolverEndpoint":                      &route53resolver.ResolverEndpoint{},
+		"AWS::Route53Resolver::ResolverQueryLoggingConfig":            &route53resolver.ResolverQueryLoggingConfig{},
+		"AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation": &route53resolver.ResolverQueryLoggingConfigAssociation{},
+		"AWS::Route53Resolver::ResolverRule":                          &route53resolver.ResolverRule{},
+		"AWS::Route53Resolver::ResolverRuleAssociation":               &route53resolver.ResolverRuleAssociation{},
+		"AWS::S3::AccessPoint":                                        &s3.AccessPoint{},
+		"AWS::S3::Bucket":                                             &s3.Bucket{},
+		"AWS::S3::BucketPolicy":                                       &s3.BucketPolicy{},
+		"AWS::S3::MultiRegionAccessPoint":                             &s3.MultiRegionAccessPoint{},
+		"AWS::S3::MultiRegionAccessPointPolicy":                       &s3.MultiRegionAccessPointPolicy{},
+		"AWS::S3::StorageLens":                                        &s3.StorageLens{},
+		"AWS::S3ObjectLambda::AccessPoint":                            &s3objectlambda.AccessPoint{},
+		"AWS::S3ObjectLambda::AccessPointPolicy":                      &s3objectlambda.AccessPointPolicy{},
+		"AWS::S3Outposts::AccessPoint":                                &s3outposts.AccessPoint{},
+		"AWS::S3Outposts::Bucket":                                     &s3outposts.Bucket{},
+		"AWS::S3Outposts::BucketPolicy":                               &s3outposts.BucketPolicy{},
+		"AWS::S3Outposts::Endpoint":                                   &s3outposts.Endpoint{},
+		"AWS::SDB::Domain":                                            &sdb.Domain{},
+		"AWS::SES::ConfigurationSet":                                  &ses.ConfigurationSet{},
+		"AWS::SES::ConfigurationSetEventDestination":                  &ses.ConfigurationSetEventDestination{},
+		"AWS::SES::ContactList":                                       &ses.ContactList{},
+		"AWS::SES::ReceiptFilter":                                     &ses.ReceiptFilter{},
+		"AWS::SES::ReceiptRule":                                       &ses.ReceiptRule{},
+		"AWS::SES::ReceiptRuleSet":                                    &ses.ReceiptRuleSet{},
+		"AWS::SES::Template":                                          &ses.Template{},
+		"AWS::SNS::Subscription":                                      &sns.Subscription{},
+		"AWS::SNS::Topic":                                             &sns.Topic{},
+		"AWS::SNS::TopicPolicy":                                       &sns.TopicPolicy{},
+		"AWS::SQS::Queue":                                             &sqs.Queue{},
+		"AWS::SQS::QueuePolicy":                                       &sqs.QueuePolicy{},
+		"AWS::SSM::Association":                                       &ssm.Association{},
+		"AWS::SSM::Document":                                          &ssm.Document{},
+		"AWS::SSM::MaintenanceWindow":                                 &ssm.MaintenanceWindow{},
+		"AWS::SSM::MaintenanceWindowTarget":                           &ssm.MaintenanceWindowTarget{},
+		"AWS::SSM::MaintenanceWindowTask":                             &ssm.MaintenanceWindowTask{},
+		"AWS::SSM::Parameter":                                         &ssm.Parameter{},
+		"AWS::SSM::PatchBaseline":                                     &ssm.PatchBaseline{},
+		"AWS::SSM::ResourceDataSync":                                  &ssm.ResourceDataSync{},
+		"AWS::SSMContacts::Contact":                                   &ssmcontacts.Contact{},
+		"AWS::SSMContacts::ContactChannel":                            &ssmcontacts.ContactChannel{},
+		"AWS::SSMIncidents::ReplicationSet":                           &ssmincidents.ReplicationSet{},
+		"AWS::SSMIncidents::ResponsePlan":                             &ssmincidents.ResponsePlan{},
+		"AWS::SSO::Assignment":                                        &sso.Assignment{},
+		"AWS::SSO::InstanceAccessControlAttributeConfiguration":       &sso.InstanceAccessControlAttributeConfiguration{},
+		"AWS::SSO::PermissionSet":                                     &sso.PermissionSet{},
+		"AWS::SageMaker::App":                                         &sagemaker.App{},
+		"AWS::SageMaker::AppImageConfig":                              &sagemaker.AppImageConfig{},
+		"AWS::SageMaker::CodeRepository":                              &sagemaker.CodeRepository{},
+		"AWS::SageMaker::DataQualityJobDefinition":                    &sagemaker.DataQualityJobDefinition{},
+		"AWS::SageMaker::Device":                                      &sagemaker.Device{},
+		"AWS::SageMaker::DeviceFleet":                                 &sagemaker.DeviceFleet{},
+		"AWS::SageMaker::Domain":                                      &sagemaker.Domain{},
+		"AWS::SageMaker::Endpoint":                                    &sagemaker.Endpoint{},
+		"AWS::SageMaker::EndpointConfig":                              &sagemaker.EndpointConfig{},
+		"AWS::SageMaker::FeatureGroup":                                &sagemaker.FeatureGroup{},
+		"AWS::SageMaker::Image":                                       &sagemaker.Image{},
+		"AWS::SageMaker::ImageVersion":                                &sagemaker.ImageVersion{},
+		"AWS::SageMaker::Model":                                       &sagemaker.Model{},
+		"AWS::SageMaker::ModelBiasJobDefinition":                      &sagemaker.ModelBiasJobDefinition{},
+		"AWS::SageMaker::ModelExplainabilityJobDefinition":            &sagemaker.ModelExplainabilityJobDefinition{},
+		"AWS::SageMaker::ModelPackageGroup":                           &sagemaker.ModelPackageGroup{},
+		"AWS::SageMaker::ModelQualityJobDefinition":                   &sagemaker.ModelQualityJobDefinition{},
+		"AWS::SageMaker::MonitoringSchedule":                          &sagemaker.MonitoringSchedule{},
+		"AWS::SageMaker::NotebookInstance":                            &sagemaker.NotebookInstance{},
+		"AWS::SageMaker::NotebookInstanceLifecycleConfig":             &sagemaker.NotebookInstanceLifecycleConfig{},
+		"AWS::SageMaker::Pipeline":                                    &sagemaker.Pipeline{},
+		"AWS::SageMaker::Project":                                     &sagemaker.Project{},
+		"AWS::SageMaker::UserProfile":                                 &sagemaker.UserProfile{},
+		"AWS::SageMaker::Workteam":                                    &sagemaker.Workteam{},
+		"AWS::SecretsManager::ResourcePolicy":                         &secretsmanager.ResourcePolicy{},
+		"AWS::SecretsManager::RotationSchedule":                       &secretsmanager.RotationSchedule{},
+		"AWS::SecretsManager::Secret":                                 &secretsmanager.Secret{},
+		"AWS::SecretsManager::SecretTargetAttachment":                 &secretsmanager.SecretTargetAttachment{},
+		"AWS::SecurityHub::Hub":                                       &securityhub.Hub{},
+		"AWS::Serverless::Api":                                        &serverless.Api{},
+		"AWS::Serverless::Application":                                &serverless.Application{},
+		"AWS::Serverless::Function":                                   &serverless.Function{},
+		"AWS::Serverless::LayerVersion":                               &serverless.LayerVersion{},
+		"AWS::Serverless::SimpleTable":                                &serverless.SimpleTable{},
+		"AWS::Serverless::StateMachine":                               &serverless.StateMachine{},
+		"AWS::ServiceCatalog::AcceptedPortfolioShare":                 &servicecatalog.AcceptedPortfolioShare{},
+		"AWS::ServiceCatalog::CloudFormationProduct":                  &servicecatalog.CloudFormationProduct{},
+		"AWS::ServiceCatalog::CloudFormationProvisionedProduct":       &servicecatalog.CloudFormationProvisionedProduct{},
+		"AWS::ServiceCatalog::LaunchNotificationConstraint":           &servicecatalog.LaunchNotificationConstraint{},
+		"AWS::ServiceCatalog::LaunchRoleConstraint":                   &servicecatalog.LaunchRoleConstraint{},
+		"AWS::ServiceCatalog::LaunchTemplateConstraint":               &servicecatalog.LaunchTemplateConstraint{},
+		"AWS::ServiceCatalog::Portfolio":                              &servicecatalog.Portfolio{},
+		"AWS::ServiceCatalog::PortfolioPrincipalAssociation":          &servicecatalog.PortfolioPrincipalAssociation{},
+		"AWS::ServiceCatalog::PortfolioProductAssociation":            &servicecatalog.PortfolioProductAssociation{},
+		"AWS::ServiceCatalog::PortfolioShare":                         &servicecatalog.PortfolioShare{},
+		"AWS::ServiceCatalog::ResourceUpdateConstraint":               &servicecatalog.ResourceUpdateConstraint{},
+		"AWS::ServiceCatalog::ServiceAction":                          &servicecatalog.ServiceAction{},
+		"AWS::ServiceCatalog::ServiceActionAssociation":               &servicecatalog.ServiceActionAssociation{},
+		"AWS::ServiceCatalog::StackSetConstraint":                     &servicecatalog.StackSetConstraint{},
+		"AWS::ServiceCatalog::TagOption":                              &servicecatalog.TagOption{},
+		"AWS::ServiceCatalog::TagOptionAssociation":                   &servicecatalog.TagOptionAssociation{},
+		"AWS::ServiceCatalogAppRegistry::Application":                 &servicecatalogappregistry.Application{},
+		"AWS::ServiceCatalogAppRegistry::AttributeGroup":              &servicecatalogappregistry.AttributeGroup{},
+		"AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation":   &servicecatalogappregistry.AttributeGroupAssociation{},
+		"AWS::ServiceCatalogAppRegistry::ResourceAssociation":         &servicecatalogappregistry.ResourceAssociation{},
+		"AWS::ServiceDiscovery::HttpNamespace":                        &servicediscovery.HttpNamespace{},
+		"AWS::ServiceDiscovery::Instance":                             &servicediscovery.Instance{},
+		"AWS::ServiceDiscovery::PrivateDnsNamespace":                  &servicediscovery.PrivateDnsNamespace{},
+		"AWS::ServiceDiscovery::PublicDnsNamespace":                   &servicediscovery.PublicDnsNamespace{},
+		"AWS::ServiceDiscovery::Service":                              &servicediscovery.Service{},
+		"AWS::Signer::ProfilePermission":                              &signer.ProfilePermission{},
+		"AWS::Signer::SigningProfile":                                 &signer.SigningProfile{},
+		"AWS::StepFunctions::Activity":                                &stepfunctions.Activity{},
+		"AWS::StepFunctions::StateMachine":                            &stepfunctions.StateMachine{},
+		"AWS::Synthetics::Canary":                                     &synthetics.Canary{},
+		"AWS::Timestream::Database":                                   &timestream.Database{},
+		"AWS::Timestream::ScheduledQuery":                             &timestream.ScheduledQuery{},
+		"AWS::Timestream::Table":                                      &timestream.Table{},
+		"AWS::Transfer::Server":                                       &transfer.Server{},
+		"AWS::Transfer::User":                                         &transfer.User{},
+		"AWS::Transfer::Workflow":                                     &transfer.Workflow{},
+		"AWS::WAF::ByteMatchSet":                                      &waf.ByteMatchSet{},
+		"AWS::WAF::IPSet":                                             &waf.IPSet{},
+		"AWS::WAF::Rule":                                              &waf.Rule{},
+		"AWS::WAF::SizeConstraintSet":                                 &waf.SizeConstraintSet{},
+		"AWS::WAF::SqlInjectionMatchSet":                              &waf.SqlInjectionMatchSet{},
+		"AWS::WAF::WebACL":                                            &waf.WebACL{},
+		"AWS::WAF::XssMatchSet":                                       &waf.XssMatchSet{},
+		"AWS::WAFRegional::ByteMatchSet":                              &wafregional.ByteMatchSet{},
+		"AWS::WAFRegional::GeoMatchSet":                               &wafregional.GeoMatchSet{},
+		"AWS::WAFRegional::IPSet":                                     &wafregional.IPSet{},
+		"AWS::WAFRegional::RateBasedRule":                             &wafregional.RateBasedRule{},
+		"AWS::WAFRegional::RegexPatternSet":                           &wafregional.RegexPatternSet{},
+		"AWS::WAFRegional::Rule":                                      &wafregional.Rule{},
+		"AWS::WAFRegional::SizeConstraintSet":                         &wafregional.SizeConstraintSet{},
+		"AWS::WAFRegional::SqlInjectionMatchSet":                      &wafregional.SqlInjectionMatchSet{},
+		"AWS::WAFRegional::WebACL":                                    &wafregional.WebACL{},
+		"AWS::WAFRegional::WebACLAssociation":                         &wafregional.WebACLAssociation{},
+		"AWS::WAFRegional::XssMatchSet":                               &wafregional.XssMatchSet{},
+		"AWS::WAFv2::IPSet":                                           &wafv2.IPSet{},
+		"AWS::WAFv2::LoggingConfiguration":                            &wafv2.LoggingConfiguration{},
+		"AWS::WAFv2::RegexPatternSet":                                 &wafv2.RegexPatternSet{},
+		"AWS::WAFv2::RuleGroup":                                       &wafv2.RuleGroup{},
+		"AWS::WAFv2::WebACL":                                          &wafv2.WebACL{},
+		"AWS::WAFv2::WebACLAssociation":                               &wafv2.WebACLAssociation{},
+		"AWS::Wisdom::Assistant":                                      &wisdom.Assistant{},
+		"AWS::Wisdom::AssistantAssociation":                           &wisdom.AssistantAssociation{},
+		"AWS::Wisdom::KnowledgeBase":                                  &wisdom.KnowledgeBase{},
+		"AWS::WorkSpaces::ConnectionAlias":                            &workspaces.ConnectionAlias{},
+		"AWS::WorkSpaces::Workspace":                                  &workspaces.Workspace{},
+		"AWS::XRay::Group":                                            &xray.Group{},
+		"AWS::XRay::SamplingRule":                                     &xray.SamplingRule{},
+		"Alexa::ASK::Skill":                                           &ask.Skill{},
+	}
+}
+
+// GetAllACMPCACertificateResources retrieves all acmpca.Certificate items from an AWS CloudFormation template
+func (t *Template) GetAllACMPCACertificateResources() map[string]*acmpca.Certificate {
+	results := map[string]*acmpca.Certificate{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *acmpca.Certificate:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetACMPCACertificateWithName retrieves all acmpca.Certificate items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetACMPCACertificateWithName(name string) (*acmpca.Certificate, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *acmpca.Certificate:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type acmpca.Certificate not found", name)
+}
+
+// GetAllACMPCACertificateAuthorityResources retrieves all acmpca.CertificateAuthority items from an AWS CloudFormation template
+func (t *Template) GetAllACMPCACertificateAuthorityResources() map[string]*acmpca.CertificateAuthority {
+	results := map[string]*acmpca.CertificateAuthority{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *acmpca.CertificateAuthority:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetACMPCACertificateAuthorityWithName retrieves all acmpca.CertificateAuthority items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetACMPCACertificateAuthorityWithName(name string) (*acmpca.CertificateAuthority, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *acmpca.CertificateAuthority:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type acmpca.CertificateAuthority not found", name)
+}
+
+// GetAllACMPCACertificateAuthorityActivationResources retrieves all acmpca.CertificateAuthorityActivation items from an AWS CloudFormation template
+func (t *Template) GetAllACMPCACertificateAuthorityActivationResources() map[string]*acmpca.CertificateAuthorityActivation {
+	results := map[string]*acmpca.CertificateAuthorityActivation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *acmpca.CertificateAuthorityActivation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetACMPCACertificateAuthorityActivationWithName retrieves all acmpca.CertificateAuthorityActivation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetACMPCACertificateAuthorityActivationWithName(name string) (*acmpca.CertificateAuthorityActivation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *acmpca.CertificateAuthorityActivation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type acmpca.CertificateAuthorityActivation not found", name)
+}
+
+// GetAllACMPCAPermissionResources retrieves all acmpca.Permission items from an AWS CloudFormation template
+func (t *Template) GetAllACMPCAPermissionResources() map[string]*acmpca.Permission {
+	results := map[string]*acmpca.Permission{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *acmpca.Permission:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetACMPCAPermissionWithName retrieves all acmpca.Permission items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetACMPCAPermissionWithName(name string) (*acmpca.Permission, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *acmpca.Permission:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type acmpca.Permission not found", name)
+}
+
+// GetAllAPSRuleGroupsNamespaceResources retrieves all aps.RuleGroupsNamespace items from an AWS CloudFormation template
+func (t *Template) GetAllAPSRuleGroupsNamespaceResources() map[string]*aps.RuleGroupsNamespace {
+	results := map[string]*aps.RuleGroupsNamespace{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *aps.RuleGroupsNamespace:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAPSRuleGroupsNamespaceWithName retrieves all aps.RuleGroupsNamespace items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAPSRuleGroupsNamespaceWithName(name string) (*aps.RuleGroupsNamespace, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *aps.RuleGroupsNamespace:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type aps.RuleGroupsNamespace not found", name)
+}
+
+// GetAllAPSWorkspaceResources retrieves all aps.Workspace items from an AWS CloudFormation template
+func (t *Template) GetAllAPSWorkspaceResources() map[string]*aps.Workspace {
+	results := map[string]*aps.Workspace{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *aps.Workspace:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAPSWorkspaceWithName retrieves all aps.Workspace items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAPSWorkspaceWithName(name string) (*aps.Workspace, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *aps.Workspace:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type aps.Workspace not found", name)
+}
+
+// GetAllAccessAnalyzerAnalyzerResources retrieves all accessanalyzer.Analyzer items from an AWS CloudFormation template
+func (t *Template) GetAllAccessAnalyzerAnalyzerResources() map[string]*accessanalyzer.Analyzer {
+	results := map[string]*accessanalyzer.Analyzer{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *accessanalyzer.Analyzer:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAccessAnalyzerAnalyzerWithName retrieves all accessanalyzer.Analyzer items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAccessAnalyzerAnalyzerWithName(name string) (*accessanalyzer.Analyzer, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *accessanalyzer.Analyzer:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type accessanalyzer.Analyzer not found", name)
+}
+
+// GetAllAmazonMQBrokerResources retrieves all amazonmq.Broker items from an AWS CloudFormation template
+func (t *Template) GetAllAmazonMQBrokerResources() map[string]*amazonmq.Broker {
+	results := map[string]*amazonmq.Broker{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *amazonmq.Broker:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAmazonMQBrokerWithName retrieves all amazonmq.Broker items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAmazonMQBrokerWithName(name string) (*amazonmq.Broker, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *amazonmq.Broker:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type amazonmq.Broker not found", name)
+}
+
+// GetAllAmazonMQConfigurationResources retrieves all amazonmq.Configuration items from an AWS CloudFormation template
+func (t *Template) GetAllAmazonMQConfigurationResources() map[string]*amazonmq.Configuration {
+	results := map[string]*amazonmq.Configuration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *amazonmq.Configuration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAmazonMQConfigurationWithName retrieves all amazonmq.Configuration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAmazonMQConfigurationWithName(name string) (*amazonmq.Configuration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *amazonmq.Configuration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type amazonmq.Configuration not found", name)
+}
+
+// GetAllAmazonMQConfigurationAssociationResources retrieves all amazonmq.ConfigurationAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllAmazonMQConfigurationAssociationResources() map[string]*amazonmq.ConfigurationAssociation {
+	results := map[string]*amazonmq.ConfigurationAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *amazonmq.ConfigurationAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAmazonMQConfigurationAssociationWithName retrieves all amazonmq.ConfigurationAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAmazonMQConfigurationAssociationWithName(name string) (*amazonmq.ConfigurationAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *amazonmq.ConfigurationAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type amazonmq.ConfigurationAssociation not found", name)
+}
+
+// GetAllAmplifyAppResources retrieves all amplify.App items from an AWS CloudFormation template
+func (t *Template) GetAllAmplifyAppResources() map[string]*amplify.App {
+	results := map[string]*amplify.App{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *amplify.App:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAmplifyAppWithName retrieves all amplify.App items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAmplifyAppWithName(name string) (*amplify.App, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *amplify.App:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type amplify.App not found", name)
+}
+
+// GetAllAmplifyBranchResources retrieves all amplify.Branch items from an AWS CloudFormation template
+func (t *Template) GetAllAmplifyBranchResources() map[string]*amplify.Branch {
+	results := map[string]*amplify.Branch{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *amplify.Branch:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAmplifyBranchWithName retrieves all amplify.Branch items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAmplifyBranchWithName(name string) (*amplify.Branch, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *amplify.Branch:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type amplify.Branch not found", name)
+}
+
+// GetAllAmplifyDomainResources retrieves all amplify.Domain items from an AWS CloudFormation template
+func (t *Template) GetAllAmplifyDomainResources() map[string]*amplify.Domain {
+	results := map[string]*amplify.Domain{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *amplify.Domain:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAmplifyDomainWithName retrieves all amplify.Domain items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAmplifyDomainWithName(name string) (*amplify.Domain, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *amplify.Domain:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type amplify.Domain not found", name)
+}
+
+// GetAllAmplifyUIBuilderComponentResources retrieves all amplifyuibuilder.Component items from an AWS CloudFormation template
+func (t *Template) GetAllAmplifyUIBuilderComponentResources() map[string]*amplifyuibuilder.Component {
+	results := map[string]*amplifyuibuilder.Component{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *amplifyuibuilder.Component:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAmplifyUIBuilderComponentWithName retrieves all amplifyuibuilder.Component items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAmplifyUIBuilderComponentWithName(name string) (*amplifyuibuilder.Component, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *amplifyuibuilder.Component:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type amplifyuibuilder.Component not found", name)
+}
+
+// GetAllAmplifyUIBuilderThemeResources retrieves all amplifyuibuilder.Theme items from an AWS CloudFormation template
+func (t *Template) GetAllAmplifyUIBuilderThemeResources() map[string]*amplifyuibuilder.Theme {
+	results := map[string]*amplifyuibuilder.Theme{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *amplifyuibuilder.Theme:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAmplifyUIBuilderThemeWithName retrieves all amplifyuibuilder.Theme items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAmplifyUIBuilderThemeWithName(name string) (*amplifyuibuilder.Theme, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *amplifyuibuilder.Theme:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type amplifyuibuilder.Theme not found", name)
+}
+
+// GetAllApiGatewayAccountResources retrieves all apigateway.Account items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayAccountResources() map[string]*apigateway.Account {
+	results := map[string]*apigateway.Account{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigateway.Account:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayAccountWithName retrieves all apigateway.Account items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayAccountWithName(name string) (*apigateway.Account, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigateway.Account:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigateway.Account not found", name)
+}
+
+// GetAllApiGatewayApiKeyResources retrieves all apigateway.ApiKey items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayApiKeyResources() map[string]*apigateway.ApiKey {
+	results := map[string]*apigateway.ApiKey{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigateway.ApiKey:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayApiKeyWithName retrieves all apigateway.ApiKey items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayApiKeyWithName(name string) (*apigateway.ApiKey, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigateway.ApiKey:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigateway.ApiKey not found", name)
+}
+
+// GetAllApiGatewayAuthorizerResources retrieves all apigateway.Authorizer items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayAuthorizerResources() map[string]*apigateway.Authorizer {
+	results := map[string]*apigateway.Authorizer{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigateway.Authorizer:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayAuthorizerWithName retrieves all apigateway.Authorizer items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayAuthorizerWithName(name string) (*apigateway.Authorizer, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigateway.Authorizer:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigateway.Authorizer not found", name)
+}
+
+// GetAllApiGatewayBasePathMappingResources retrieves all apigateway.BasePathMapping items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayBasePathMappingResources() map[string]*apigateway.BasePathMapping {
+	results := map[string]*apigateway.BasePathMapping{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigateway.BasePathMapping:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayBasePathMappingWithName retrieves all apigateway.BasePathMapping items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayBasePathMappingWithName(name string) (*apigateway.BasePathMapping, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigateway.BasePathMapping:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigateway.BasePathMapping not found", name)
+}
+
+// GetAllApiGatewayClientCertificateResources retrieves all apigateway.ClientCertificate items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayClientCertificateResources() map[string]*apigateway.ClientCertificate {
+	results := map[string]*apigateway.ClientCertificate{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigateway.ClientCertificate:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayClientCertificateWithName retrieves all apigateway.ClientCertificate items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayClientCertificateWithName(name string) (*apigateway.ClientCertificate, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigateway.ClientCertificate:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigateway.ClientCertificate not found", name)
+}
+
+// GetAllApiGatewayDeploymentResources retrieves all apigateway.Deployment items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayDeploymentResources() map[string]*apigateway.Deployment {
+	results := map[string]*apigateway.Deployment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigateway.Deployment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayDeploymentWithName retrieves all apigateway.Deployment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayDeploymentWithName(name string) (*apigateway.Deployment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigateway.Deployment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigateway.Deployment not found", name)
+}
+
+// GetAllApiGatewayDocumentationPartResources retrieves all apigateway.DocumentationPart items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayDocumentationPartResources() map[string]*apigateway.DocumentationPart {
+	results := map[string]*apigateway.DocumentationPart{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigateway.DocumentationPart:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayDocumentationPartWithName retrieves all apigateway.DocumentationPart items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayDocumentationPartWithName(name string) (*apigateway.DocumentationPart, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigateway.DocumentationPart:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigateway.DocumentationPart not found", name)
+}
+
+// GetAllApiGatewayDocumentationVersionResources retrieves all apigateway.DocumentationVersion items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayDocumentationVersionResources() map[string]*apigateway.DocumentationVersion {
+	results := map[string]*apigateway.DocumentationVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigateway.DocumentationVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayDocumentationVersionWithName retrieves all apigateway.DocumentationVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayDocumentationVersionWithName(name string) (*apigateway.DocumentationVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigateway.DocumentationVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigateway.DocumentationVersion not found", name)
+}
+
+// GetAllApiGatewayDomainNameResources retrieves all apigateway.DomainName items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayDomainNameResources() map[string]*apigateway.DomainName {
+	results := map[string]*apigateway.DomainName{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigateway.DomainName:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayDomainNameWithName retrieves all apigateway.DomainName items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayDomainNameWithName(name string) (*apigateway.DomainName, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigateway.DomainName:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigateway.DomainName not found", name)
+}
+
+// GetAllApiGatewayGatewayResponseResources retrieves all apigateway.GatewayResponse items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayGatewayResponseResources() map[string]*apigateway.GatewayResponse {
+	results := map[string]*apigateway.GatewayResponse{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigateway.GatewayResponse:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayGatewayResponseWithName retrieves all apigateway.GatewayResponse items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayGatewayResponseWithName(name string) (*apigateway.GatewayResponse, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigateway.GatewayResponse:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigateway.GatewayResponse not found", name)
+}
+
+// GetAllApiGatewayMethodResources retrieves all apigateway.Method items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayMethodResources() map[string]*apigateway.Method {
+	results := map[string]*apigateway.Method{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigateway.Method:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayMethodWithName retrieves all apigateway.Method items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayMethodWithName(name string) (*apigateway.Method, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigateway.Method:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigateway.Method not found", name)
+}
+
+// GetAllApiGatewayModelResources retrieves all apigateway.Model items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayModelResources() map[string]*apigateway.Model {
+	results := map[string]*apigateway.Model{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigateway.Model:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayModelWithName retrieves all apigateway.Model items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayModelWithName(name string) (*apigateway.Model, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigateway.Model:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigateway.Model not found", name)
+}
+
+// GetAllApiGatewayRequestValidatorResources retrieves all apigateway.RequestValidator items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayRequestValidatorResources() map[string]*apigateway.RequestValidator {
+	results := map[string]*apigateway.RequestValidator{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigateway.RequestValidator:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayRequestValidatorWithName retrieves all apigateway.RequestValidator items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayRequestValidatorWithName(name string) (*apigateway.RequestValidator, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigateway.RequestValidator:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigateway.RequestValidator not found", name)
+}
+
+// GetAllApiGatewayResourceResources retrieves all apigateway.Resource items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayResourceResources() map[string]*apigateway.Resource {
+	results := map[string]*apigateway.Resource{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigateway.Resource:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayResourceWithName retrieves all apigateway.Resource items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayResourceWithName(name string) (*apigateway.Resource, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigateway.Resource:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigateway.Resource not found", name)
+}
+
+// GetAllApiGatewayRestApiResources retrieves all apigateway.RestApi items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayRestApiResources() map[string]*apigateway.RestApi {
+	results := map[string]*apigateway.RestApi{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigateway.RestApi:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayRestApiWithName retrieves all apigateway.RestApi items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayRestApiWithName(name string) (*apigateway.RestApi, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigateway.RestApi:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigateway.RestApi not found", name)
+}
+
+// GetAllApiGatewayStageResources retrieves all apigateway.Stage items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayStageResources() map[string]*apigateway.Stage {
+	results := map[string]*apigateway.Stage{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigateway.Stage:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayStageWithName retrieves all apigateway.Stage items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayStageWithName(name string) (*apigateway.Stage, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigateway.Stage:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigateway.Stage not found", name)
+}
+
+// GetAllApiGatewayUsagePlanResources retrieves all apigateway.UsagePlan items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayUsagePlanResources() map[string]*apigateway.UsagePlan {
+	results := map[string]*apigateway.UsagePlan{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigateway.UsagePlan:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayUsagePlanWithName retrieves all apigateway.UsagePlan items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayUsagePlanWithName(name string) (*apigateway.UsagePlan, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigateway.UsagePlan:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigateway.UsagePlan not found", name)
+}
+
+// GetAllApiGatewayUsagePlanKeyResources retrieves all apigateway.UsagePlanKey items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayUsagePlanKeyResources() map[string]*apigateway.UsagePlanKey {
+	results := map[string]*apigateway.UsagePlanKey{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigateway.UsagePlanKey:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayUsagePlanKeyWithName retrieves all apigateway.UsagePlanKey items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayUsagePlanKeyWithName(name string) (*apigateway.UsagePlanKey, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigateway.UsagePlanKey:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigateway.UsagePlanKey not found", name)
+}
+
+// GetAllApiGatewayVpcLinkResources retrieves all apigateway.VpcLink items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayVpcLinkResources() map[string]*apigateway.VpcLink {
+	results := map[string]*apigateway.VpcLink{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigateway.VpcLink:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayVpcLinkWithName retrieves all apigateway.VpcLink items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayVpcLinkWithName(name string) (*apigateway.VpcLink, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigateway.VpcLink:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigateway.VpcLink not found", name)
+}
+
+// GetAllApiGatewayV2ApiResources retrieves all apigatewayv2.Api items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayV2ApiResources() map[string]*apigatewayv2.Api {
+	results := map[string]*apigatewayv2.Api{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.Api:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayV2ApiWithName retrieves all apigatewayv2.Api items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayV2ApiWithName(name string) (*apigatewayv2.Api, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.Api:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigatewayv2.Api not found", name)
+}
+
+// GetAllApiGatewayV2ApiGatewayManagedOverridesResources retrieves all apigatewayv2.ApiGatewayManagedOverrides items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayV2ApiGatewayManagedOverridesResources() map[string]*apigatewayv2.ApiGatewayManagedOverrides {
+	results := map[string]*apigatewayv2.ApiGatewayManagedOverrides{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.ApiGatewayManagedOverrides:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayV2ApiGatewayManagedOverridesWithName retrieves all apigatewayv2.ApiGatewayManagedOverrides items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayV2ApiGatewayManagedOverridesWithName(name string) (*apigatewayv2.ApiGatewayManagedOverrides, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.ApiGatewayManagedOverrides:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigatewayv2.ApiGatewayManagedOverrides not found", name)
+}
+
+// GetAllApiGatewayV2ApiMappingResources retrieves all apigatewayv2.ApiMapping items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayV2ApiMappingResources() map[string]*apigatewayv2.ApiMapping {
+	results := map[string]*apigatewayv2.ApiMapping{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.ApiMapping:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayV2ApiMappingWithName retrieves all apigatewayv2.ApiMapping items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayV2ApiMappingWithName(name string) (*apigatewayv2.ApiMapping, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.ApiMapping:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigatewayv2.ApiMapping not found", name)
+}
+
+// GetAllApiGatewayV2AuthorizerResources retrieves all apigatewayv2.Authorizer items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayV2AuthorizerResources() map[string]*apigatewayv2.Authorizer {
+	results := map[string]*apigatewayv2.Authorizer{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.Authorizer:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayV2AuthorizerWithName retrieves all apigatewayv2.Authorizer items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayV2AuthorizerWithName(name string) (*apigatewayv2.Authorizer, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.Authorizer:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigatewayv2.Authorizer not found", name)
+}
+
+// GetAllApiGatewayV2DeploymentResources retrieves all apigatewayv2.Deployment items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayV2DeploymentResources() map[string]*apigatewayv2.Deployment {
+	results := map[string]*apigatewayv2.Deployment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.Deployment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayV2DeploymentWithName retrieves all apigatewayv2.Deployment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayV2DeploymentWithName(name string) (*apigatewayv2.Deployment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.Deployment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigatewayv2.Deployment not found", name)
+}
+
+// GetAllApiGatewayV2DomainNameResources retrieves all apigatewayv2.DomainName items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayV2DomainNameResources() map[string]*apigatewayv2.DomainName {
+	results := map[string]*apigatewayv2.DomainName{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.DomainName:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayV2DomainNameWithName retrieves all apigatewayv2.DomainName items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayV2DomainNameWithName(name string) (*apigatewayv2.DomainName, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.DomainName:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigatewayv2.DomainName not found", name)
+}
+
+// GetAllApiGatewayV2IntegrationResources retrieves all apigatewayv2.Integration items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayV2IntegrationResources() map[string]*apigatewayv2.Integration {
+	results := map[string]*apigatewayv2.Integration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.Integration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayV2IntegrationWithName retrieves all apigatewayv2.Integration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayV2IntegrationWithName(name string) (*apigatewayv2.Integration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.Integration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigatewayv2.Integration not found", name)
+}
+
+// GetAllApiGatewayV2IntegrationResponseResources retrieves all apigatewayv2.IntegrationResponse items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayV2IntegrationResponseResources() map[string]*apigatewayv2.IntegrationResponse {
+	results := map[string]*apigatewayv2.IntegrationResponse{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.IntegrationResponse:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayV2IntegrationResponseWithName retrieves all apigatewayv2.IntegrationResponse items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayV2IntegrationResponseWithName(name string) (*apigatewayv2.IntegrationResponse, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.IntegrationResponse:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigatewayv2.IntegrationResponse not found", name)
+}
+
+// GetAllApiGatewayV2ModelResources retrieves all apigatewayv2.Model items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayV2ModelResources() map[string]*apigatewayv2.Model {
+	results := map[string]*apigatewayv2.Model{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.Model:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayV2ModelWithName retrieves all apigatewayv2.Model items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayV2ModelWithName(name string) (*apigatewayv2.Model, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.Model:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigatewayv2.Model not found", name)
+}
+
+// GetAllApiGatewayV2RouteResources retrieves all apigatewayv2.Route items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayV2RouteResources() map[string]*apigatewayv2.Route {
+	results := map[string]*apigatewayv2.Route{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.Route:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayV2RouteWithName retrieves all apigatewayv2.Route items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayV2RouteWithName(name string) (*apigatewayv2.Route, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.Route:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigatewayv2.Route not found", name)
+}
+
+// GetAllApiGatewayV2RouteResponseResources retrieves all apigatewayv2.RouteResponse items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayV2RouteResponseResources() map[string]*apigatewayv2.RouteResponse {
+	results := map[string]*apigatewayv2.RouteResponse{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.RouteResponse:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayV2RouteResponseWithName retrieves all apigatewayv2.RouteResponse items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayV2RouteResponseWithName(name string) (*apigatewayv2.RouteResponse, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.RouteResponse:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigatewayv2.RouteResponse not found", name)
+}
+
+// GetAllApiGatewayV2StageResources retrieves all apigatewayv2.Stage items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayV2StageResources() map[string]*apigatewayv2.Stage {
+	results := map[string]*apigatewayv2.Stage{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.Stage:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayV2StageWithName retrieves all apigatewayv2.Stage items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayV2StageWithName(name string) (*apigatewayv2.Stage, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.Stage:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigatewayv2.Stage not found", name)
+}
+
+// GetAllApiGatewayV2VpcLinkResources retrieves all apigatewayv2.VpcLink items from an AWS CloudFormation template
+func (t *Template) GetAllApiGatewayV2VpcLinkResources() map[string]*apigatewayv2.VpcLink {
+	results := map[string]*apigatewayv2.VpcLink{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.VpcLink:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApiGatewayV2VpcLinkWithName retrieves all apigatewayv2.VpcLink items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApiGatewayV2VpcLinkWithName(name string) (*apigatewayv2.VpcLink, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apigatewayv2.VpcLink:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apigatewayv2.VpcLink not found", name)
+}
+
+// GetAllAppConfigApplicationResources retrieves all appconfig.Application items from an AWS CloudFormation template
+func (t *Template) GetAllAppConfigApplicationResources() map[string]*appconfig.Application {
+	results := map[string]*appconfig.Application{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appconfig.Application:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppConfigApplicationWithName retrieves all appconfig.Application items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppConfigApplicationWithName(name string) (*appconfig.Application, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appconfig.Application:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appconfig.Application not found", name)
+}
+
+// GetAllAppConfigConfigurationProfileResources retrieves all appconfig.ConfigurationProfile items from an AWS CloudFormation template
+func (t *Template) GetAllAppConfigConfigurationProfileResources() map[string]*appconfig.ConfigurationProfile {
+	results := map[string]*appconfig.ConfigurationProfile{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appconfig.ConfigurationProfile:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppConfigConfigurationProfileWithName retrieves all appconfig.ConfigurationProfile items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppConfigConfigurationProfileWithName(name string) (*appconfig.ConfigurationProfile, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appconfig.ConfigurationProfile:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appconfig.ConfigurationProfile not found", name)
+}
+
+// GetAllAppConfigDeploymentResources retrieves all appconfig.Deployment items from an AWS CloudFormation template
+func (t *Template) GetAllAppConfigDeploymentResources() map[string]*appconfig.Deployment {
+	results := map[string]*appconfig.Deployment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appconfig.Deployment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppConfigDeploymentWithName retrieves all appconfig.Deployment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppConfigDeploymentWithName(name string) (*appconfig.Deployment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appconfig.Deployment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appconfig.Deployment not found", name)
+}
+
+// GetAllAppConfigDeploymentStrategyResources retrieves all appconfig.DeploymentStrategy items from an AWS CloudFormation template
+func (t *Template) GetAllAppConfigDeploymentStrategyResources() map[string]*appconfig.DeploymentStrategy {
+	results := map[string]*appconfig.DeploymentStrategy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appconfig.DeploymentStrategy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppConfigDeploymentStrategyWithName retrieves all appconfig.DeploymentStrategy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppConfigDeploymentStrategyWithName(name string) (*appconfig.DeploymentStrategy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appconfig.DeploymentStrategy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appconfig.DeploymentStrategy not found", name)
+}
+
+// GetAllAppConfigEnvironmentResources retrieves all appconfig.Environment items from an AWS CloudFormation template
+func (t *Template) GetAllAppConfigEnvironmentResources() map[string]*appconfig.Environment {
+	results := map[string]*appconfig.Environment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appconfig.Environment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppConfigEnvironmentWithName retrieves all appconfig.Environment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppConfigEnvironmentWithName(name string) (*appconfig.Environment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appconfig.Environment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appconfig.Environment not found", name)
+}
+
+// GetAllAppConfigHostedConfigurationVersionResources retrieves all appconfig.HostedConfigurationVersion items from an AWS CloudFormation template
+func (t *Template) GetAllAppConfigHostedConfigurationVersionResources() map[string]*appconfig.HostedConfigurationVersion {
+	results := map[string]*appconfig.HostedConfigurationVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appconfig.HostedConfigurationVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppConfigHostedConfigurationVersionWithName retrieves all appconfig.HostedConfigurationVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppConfigHostedConfigurationVersionWithName(name string) (*appconfig.HostedConfigurationVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appconfig.HostedConfigurationVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appconfig.HostedConfigurationVersion not found", name)
+}
+
+// GetAllAppFlowConnectorProfileResources retrieves all appflow.ConnectorProfile items from an AWS CloudFormation template
+func (t *Template) GetAllAppFlowConnectorProfileResources() map[string]*appflow.ConnectorProfile {
+	results := map[string]*appflow.ConnectorProfile{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appflow.ConnectorProfile:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppFlowConnectorProfileWithName retrieves all appflow.ConnectorProfile items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppFlowConnectorProfileWithName(name string) (*appflow.ConnectorProfile, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appflow.ConnectorProfile:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appflow.ConnectorProfile not found", name)
+}
+
+// GetAllAppFlowFlowResources retrieves all appflow.Flow items from an AWS CloudFormation template
+func (t *Template) GetAllAppFlowFlowResources() map[string]*appflow.Flow {
+	results := map[string]*appflow.Flow{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appflow.Flow:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppFlowFlowWithName retrieves all appflow.Flow items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppFlowFlowWithName(name string) (*appflow.Flow, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appflow.Flow:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appflow.Flow not found", name)
+}
+
+// GetAllAppIntegrationsEventIntegrationResources retrieves all appintegrations.EventIntegration items from an AWS CloudFormation template
+func (t *Template) GetAllAppIntegrationsEventIntegrationResources() map[string]*appintegrations.EventIntegration {
+	results := map[string]*appintegrations.EventIntegration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appintegrations.EventIntegration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppIntegrationsEventIntegrationWithName retrieves all appintegrations.EventIntegration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppIntegrationsEventIntegrationWithName(name string) (*appintegrations.EventIntegration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appintegrations.EventIntegration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appintegrations.EventIntegration not found", name)
+}
+
+// GetAllAppMeshGatewayRouteResources retrieves all appmesh.GatewayRoute items from an AWS CloudFormation template
+func (t *Template) GetAllAppMeshGatewayRouteResources() map[string]*appmesh.GatewayRoute {
+	results := map[string]*appmesh.GatewayRoute{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appmesh.GatewayRoute:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppMeshGatewayRouteWithName retrieves all appmesh.GatewayRoute items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppMeshGatewayRouteWithName(name string) (*appmesh.GatewayRoute, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appmesh.GatewayRoute:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appmesh.GatewayRoute not found", name)
+}
+
+// GetAllAppMeshMeshResources retrieves all appmesh.Mesh items from an AWS CloudFormation template
+func (t *Template) GetAllAppMeshMeshResources() map[string]*appmesh.Mesh {
+	results := map[string]*appmesh.Mesh{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appmesh.Mesh:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppMeshMeshWithName retrieves all appmesh.Mesh items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppMeshMeshWithName(name string) (*appmesh.Mesh, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appmesh.Mesh:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appmesh.Mesh not found", name)
+}
+
+// GetAllAppMeshRouteResources retrieves all appmesh.Route items from an AWS CloudFormation template
+func (t *Template) GetAllAppMeshRouteResources() map[string]*appmesh.Route {
+	results := map[string]*appmesh.Route{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appmesh.Route:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppMeshRouteWithName retrieves all appmesh.Route items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppMeshRouteWithName(name string) (*appmesh.Route, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appmesh.Route:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appmesh.Route not found", name)
+}
+
+// GetAllAppMeshVirtualGatewayResources retrieves all appmesh.VirtualGateway items from an AWS CloudFormation template
+func (t *Template) GetAllAppMeshVirtualGatewayResources() map[string]*appmesh.VirtualGateway {
+	results := map[string]*appmesh.VirtualGateway{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appmesh.VirtualGateway:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppMeshVirtualGatewayWithName retrieves all appmesh.VirtualGateway items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppMeshVirtualGatewayWithName(name string) (*appmesh.VirtualGateway, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appmesh.VirtualGateway:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appmesh.VirtualGateway not found", name)
+}
+
+// GetAllAppMeshVirtualNodeResources retrieves all appmesh.VirtualNode items from an AWS CloudFormation template
+func (t *Template) GetAllAppMeshVirtualNodeResources() map[string]*appmesh.VirtualNode {
+	results := map[string]*appmesh.VirtualNode{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appmesh.VirtualNode:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppMeshVirtualNodeWithName retrieves all appmesh.VirtualNode items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppMeshVirtualNodeWithName(name string) (*appmesh.VirtualNode, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appmesh.VirtualNode:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appmesh.VirtualNode not found", name)
+}
+
+// GetAllAppMeshVirtualRouterResources retrieves all appmesh.VirtualRouter items from an AWS CloudFormation template
+func (t *Template) GetAllAppMeshVirtualRouterResources() map[string]*appmesh.VirtualRouter {
+	results := map[string]*appmesh.VirtualRouter{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appmesh.VirtualRouter:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppMeshVirtualRouterWithName retrieves all appmesh.VirtualRouter items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppMeshVirtualRouterWithName(name string) (*appmesh.VirtualRouter, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appmesh.VirtualRouter:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appmesh.VirtualRouter not found", name)
+}
+
+// GetAllAppMeshVirtualServiceResources retrieves all appmesh.VirtualService items from an AWS CloudFormation template
+func (t *Template) GetAllAppMeshVirtualServiceResources() map[string]*appmesh.VirtualService {
+	results := map[string]*appmesh.VirtualService{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appmesh.VirtualService:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppMeshVirtualServiceWithName retrieves all appmesh.VirtualService items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppMeshVirtualServiceWithName(name string) (*appmesh.VirtualService, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appmesh.VirtualService:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appmesh.VirtualService not found", name)
+}
+
+// GetAllAppRunnerServiceResources retrieves all apprunner.Service items from an AWS CloudFormation template
+func (t *Template) GetAllAppRunnerServiceResources() map[string]*apprunner.Service {
+	results := map[string]*apprunner.Service{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *apprunner.Service:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppRunnerServiceWithName retrieves all apprunner.Service items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppRunnerServiceWithName(name string) (*apprunner.Service, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *apprunner.Service:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type apprunner.Service not found", name)
+}
+
+// GetAllAppStreamAppBlockResources retrieves all appstream.AppBlock items from an AWS CloudFormation template
+func (t *Template) GetAllAppStreamAppBlockResources() map[string]*appstream.AppBlock {
+	results := map[string]*appstream.AppBlock{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appstream.AppBlock:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppStreamAppBlockWithName retrieves all appstream.AppBlock items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppStreamAppBlockWithName(name string) (*appstream.AppBlock, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appstream.AppBlock:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appstream.AppBlock not found", name)
+}
+
+// GetAllAppStreamApplicationResources retrieves all appstream.Application items from an AWS CloudFormation template
+func (t *Template) GetAllAppStreamApplicationResources() map[string]*appstream.Application {
+	results := map[string]*appstream.Application{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appstream.Application:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppStreamApplicationWithName retrieves all appstream.Application items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppStreamApplicationWithName(name string) (*appstream.Application, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appstream.Application:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appstream.Application not found", name)
+}
+
+// GetAllAppStreamApplicationFleetAssociationResources retrieves all appstream.ApplicationFleetAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllAppStreamApplicationFleetAssociationResources() map[string]*appstream.ApplicationFleetAssociation {
+	results := map[string]*appstream.ApplicationFleetAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appstream.ApplicationFleetAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppStreamApplicationFleetAssociationWithName retrieves all appstream.ApplicationFleetAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppStreamApplicationFleetAssociationWithName(name string) (*appstream.ApplicationFleetAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appstream.ApplicationFleetAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appstream.ApplicationFleetAssociation not found", name)
+}
+
+// GetAllAppStreamDirectoryConfigResources retrieves all appstream.DirectoryConfig items from an AWS CloudFormation template
+func (t *Template) GetAllAppStreamDirectoryConfigResources() map[string]*appstream.DirectoryConfig {
+	results := map[string]*appstream.DirectoryConfig{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appstream.DirectoryConfig:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppStreamDirectoryConfigWithName retrieves all appstream.DirectoryConfig items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppStreamDirectoryConfigWithName(name string) (*appstream.DirectoryConfig, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appstream.DirectoryConfig:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appstream.DirectoryConfig not found", name)
+}
+
+// GetAllAppStreamFleetResources retrieves all appstream.Fleet items from an AWS CloudFormation template
+func (t *Template) GetAllAppStreamFleetResources() map[string]*appstream.Fleet {
+	results := map[string]*appstream.Fleet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appstream.Fleet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppStreamFleetWithName retrieves all appstream.Fleet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppStreamFleetWithName(name string) (*appstream.Fleet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appstream.Fleet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appstream.Fleet not found", name)
+}
+
+// GetAllAppStreamImageBuilderResources retrieves all appstream.ImageBuilder items from an AWS CloudFormation template
+func (t *Template) GetAllAppStreamImageBuilderResources() map[string]*appstream.ImageBuilder {
+	results := map[string]*appstream.ImageBuilder{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appstream.ImageBuilder:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppStreamImageBuilderWithName retrieves all appstream.ImageBuilder items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppStreamImageBuilderWithName(name string) (*appstream.ImageBuilder, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appstream.ImageBuilder:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appstream.ImageBuilder not found", name)
+}
+
+// GetAllAppStreamStackResources retrieves all appstream.Stack items from an AWS CloudFormation template
+func (t *Template) GetAllAppStreamStackResources() map[string]*appstream.Stack {
+	results := map[string]*appstream.Stack{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appstream.Stack:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppStreamStackWithName retrieves all appstream.Stack items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppStreamStackWithName(name string) (*appstream.Stack, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appstream.Stack:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appstream.Stack not found", name)
+}
+
+// GetAllAppStreamStackFleetAssociationResources retrieves all appstream.StackFleetAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllAppStreamStackFleetAssociationResources() map[string]*appstream.StackFleetAssociation {
+	results := map[string]*appstream.StackFleetAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appstream.StackFleetAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppStreamStackFleetAssociationWithName retrieves all appstream.StackFleetAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppStreamStackFleetAssociationWithName(name string) (*appstream.StackFleetAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appstream.StackFleetAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appstream.StackFleetAssociation not found", name)
+}
+
+// GetAllAppStreamStackUserAssociationResources retrieves all appstream.StackUserAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllAppStreamStackUserAssociationResources() map[string]*appstream.StackUserAssociation {
+	results := map[string]*appstream.StackUserAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appstream.StackUserAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppStreamStackUserAssociationWithName retrieves all appstream.StackUserAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppStreamStackUserAssociationWithName(name string) (*appstream.StackUserAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appstream.StackUserAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appstream.StackUserAssociation not found", name)
+}
+
+// GetAllAppStreamUserResources retrieves all appstream.User items from an AWS CloudFormation template
+func (t *Template) GetAllAppStreamUserResources() map[string]*appstream.User {
+	results := map[string]*appstream.User{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appstream.User:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppStreamUserWithName retrieves all appstream.User items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppStreamUserWithName(name string) (*appstream.User, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appstream.User:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appstream.User not found", name)
+}
+
+// GetAllAppSyncApiCacheResources retrieves all appsync.ApiCache items from an AWS CloudFormation template
+func (t *Template) GetAllAppSyncApiCacheResources() map[string]*appsync.ApiCache {
+	results := map[string]*appsync.ApiCache{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appsync.ApiCache:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppSyncApiCacheWithName retrieves all appsync.ApiCache items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppSyncApiCacheWithName(name string) (*appsync.ApiCache, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appsync.ApiCache:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appsync.ApiCache not found", name)
+}
+
+// GetAllAppSyncApiKeyResources retrieves all appsync.ApiKey items from an AWS CloudFormation template
+func (t *Template) GetAllAppSyncApiKeyResources() map[string]*appsync.ApiKey {
+	results := map[string]*appsync.ApiKey{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appsync.ApiKey:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppSyncApiKeyWithName retrieves all appsync.ApiKey items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppSyncApiKeyWithName(name string) (*appsync.ApiKey, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appsync.ApiKey:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appsync.ApiKey not found", name)
+}
+
+// GetAllAppSyncDataSourceResources retrieves all appsync.DataSource items from an AWS CloudFormation template
+func (t *Template) GetAllAppSyncDataSourceResources() map[string]*appsync.DataSource {
+	results := map[string]*appsync.DataSource{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appsync.DataSource:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppSyncDataSourceWithName retrieves all appsync.DataSource items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppSyncDataSourceWithName(name string) (*appsync.DataSource, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appsync.DataSource:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appsync.DataSource not found", name)
+}
+
+// GetAllAppSyncFunctionConfigurationResources retrieves all appsync.FunctionConfiguration items from an AWS CloudFormation template
+func (t *Template) GetAllAppSyncFunctionConfigurationResources() map[string]*appsync.FunctionConfiguration {
+	results := map[string]*appsync.FunctionConfiguration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appsync.FunctionConfiguration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppSyncFunctionConfigurationWithName retrieves all appsync.FunctionConfiguration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppSyncFunctionConfigurationWithName(name string) (*appsync.FunctionConfiguration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appsync.FunctionConfiguration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appsync.FunctionConfiguration not found", name)
+}
+
+// GetAllAppSyncGraphQLApiResources retrieves all appsync.GraphQLApi items from an AWS CloudFormation template
+func (t *Template) GetAllAppSyncGraphQLApiResources() map[string]*appsync.GraphQLApi {
+	results := map[string]*appsync.GraphQLApi{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appsync.GraphQLApi:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppSyncGraphQLApiWithName retrieves all appsync.GraphQLApi items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppSyncGraphQLApiWithName(name string) (*appsync.GraphQLApi, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appsync.GraphQLApi:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appsync.GraphQLApi not found", name)
+}
+
+// GetAllAppSyncGraphQLSchemaResources retrieves all appsync.GraphQLSchema items from an AWS CloudFormation template
+func (t *Template) GetAllAppSyncGraphQLSchemaResources() map[string]*appsync.GraphQLSchema {
+	results := map[string]*appsync.GraphQLSchema{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appsync.GraphQLSchema:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppSyncGraphQLSchemaWithName retrieves all appsync.GraphQLSchema items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppSyncGraphQLSchemaWithName(name string) (*appsync.GraphQLSchema, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appsync.GraphQLSchema:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appsync.GraphQLSchema not found", name)
+}
+
+// GetAllAppSyncResolverResources retrieves all appsync.Resolver items from an AWS CloudFormation template
+func (t *Template) GetAllAppSyncResolverResources() map[string]*appsync.Resolver {
+	results := map[string]*appsync.Resolver{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *appsync.Resolver:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAppSyncResolverWithName retrieves all appsync.Resolver items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAppSyncResolverWithName(name string) (*appsync.Resolver, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *appsync.Resolver:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type appsync.Resolver 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{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *applicationautoscaling.ScalableTarget:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApplicationAutoScalingScalableTargetWithName retrieves all applicationautoscaling.ScalableTarget items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApplicationAutoScalingScalableTargetWithName(name string) (*applicationautoscaling.ScalableTarget, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *applicationautoscaling.ScalableTarget:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type applicationautoscaling.ScalableTarget not found", name)
+}
+
+// GetAllApplicationAutoScalingScalingPolicyResources retrieves all applicationautoscaling.ScalingPolicy items from an AWS CloudFormation template
+func (t *Template) GetAllApplicationAutoScalingScalingPolicyResources() map[string]*applicationautoscaling.ScalingPolicy {
+	results := map[string]*applicationautoscaling.ScalingPolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *applicationautoscaling.ScalingPolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApplicationAutoScalingScalingPolicyWithName retrieves all applicationautoscaling.ScalingPolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApplicationAutoScalingScalingPolicyWithName(name string) (*applicationautoscaling.ScalingPolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *applicationautoscaling.ScalingPolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type applicationautoscaling.ScalingPolicy not found", name)
+}
+
+// GetAllApplicationInsightsApplicationResources retrieves all applicationinsights.Application items from an AWS CloudFormation template
+func (t *Template) GetAllApplicationInsightsApplicationResources() map[string]*applicationinsights.Application {
+	results := map[string]*applicationinsights.Application{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *applicationinsights.Application:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetApplicationInsightsApplicationWithName retrieves all applicationinsights.Application items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetApplicationInsightsApplicationWithName(name string) (*applicationinsights.Application, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *applicationinsights.Application:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type applicationinsights.Application not found", name)
+}
+
+// GetAllAthenaDataCatalogResources retrieves all athena.DataCatalog items from an AWS CloudFormation template
+func (t *Template) GetAllAthenaDataCatalogResources() map[string]*athena.DataCatalog {
+	results := map[string]*athena.DataCatalog{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *athena.DataCatalog:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAthenaDataCatalogWithName retrieves all athena.DataCatalog items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAthenaDataCatalogWithName(name string) (*athena.DataCatalog, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *athena.DataCatalog:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type athena.DataCatalog not found", name)
+}
+
+// GetAllAthenaNamedQueryResources retrieves all athena.NamedQuery items from an AWS CloudFormation template
+func (t *Template) GetAllAthenaNamedQueryResources() map[string]*athena.NamedQuery {
+	results := map[string]*athena.NamedQuery{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *athena.NamedQuery:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAthenaNamedQueryWithName retrieves all athena.NamedQuery items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAthenaNamedQueryWithName(name string) (*athena.NamedQuery, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *athena.NamedQuery:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type athena.NamedQuery not found", name)
+}
+
+// GetAllAthenaPreparedStatementResources retrieves all athena.PreparedStatement items from an AWS CloudFormation template
+func (t *Template) GetAllAthenaPreparedStatementResources() map[string]*athena.PreparedStatement {
+	results := map[string]*athena.PreparedStatement{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *athena.PreparedStatement:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAthenaPreparedStatementWithName retrieves all athena.PreparedStatement items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAthenaPreparedStatementWithName(name string) (*athena.PreparedStatement, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *athena.PreparedStatement:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type athena.PreparedStatement not found", name)
+}
+
+// GetAllAthenaWorkGroupResources retrieves all athena.WorkGroup items from an AWS CloudFormation template
+func (t *Template) GetAllAthenaWorkGroupResources() map[string]*athena.WorkGroup {
+	results := map[string]*athena.WorkGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *athena.WorkGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAthenaWorkGroupWithName retrieves all athena.WorkGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAthenaWorkGroupWithName(name string) (*athena.WorkGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *athena.WorkGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type athena.WorkGroup not found", name)
+}
+
+// GetAllAuditManagerAssessmentResources retrieves all auditmanager.Assessment items from an AWS CloudFormation template
+func (t *Template) GetAllAuditManagerAssessmentResources() map[string]*auditmanager.Assessment {
+	results := map[string]*auditmanager.Assessment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *auditmanager.Assessment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAuditManagerAssessmentWithName retrieves all auditmanager.Assessment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAuditManagerAssessmentWithName(name string) (*auditmanager.Assessment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *auditmanager.Assessment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type auditmanager.Assessment not found", name)
+}
+
+// GetAllAutoScalingAutoScalingGroupResources retrieves all autoscaling.AutoScalingGroup items from an AWS CloudFormation template
+func (t *Template) GetAllAutoScalingAutoScalingGroupResources() map[string]*autoscaling.AutoScalingGroup {
+	results := map[string]*autoscaling.AutoScalingGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *autoscaling.AutoScalingGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAutoScalingAutoScalingGroupWithName retrieves all autoscaling.AutoScalingGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAutoScalingAutoScalingGroupWithName(name string) (*autoscaling.AutoScalingGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *autoscaling.AutoScalingGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type autoscaling.AutoScalingGroup not found", name)
+}
+
+// GetAllAutoScalingLaunchConfigurationResources retrieves all autoscaling.LaunchConfiguration items from an AWS CloudFormation template
+func (t *Template) GetAllAutoScalingLaunchConfigurationResources() map[string]*autoscaling.LaunchConfiguration {
+	results := map[string]*autoscaling.LaunchConfiguration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *autoscaling.LaunchConfiguration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAutoScalingLaunchConfigurationWithName retrieves all autoscaling.LaunchConfiguration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAutoScalingLaunchConfigurationWithName(name string) (*autoscaling.LaunchConfiguration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *autoscaling.LaunchConfiguration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type autoscaling.LaunchConfiguration not found", name)
+}
+
+// GetAllAutoScalingLifecycleHookResources retrieves all autoscaling.LifecycleHook items from an AWS CloudFormation template
+func (t *Template) GetAllAutoScalingLifecycleHookResources() map[string]*autoscaling.LifecycleHook {
+	results := map[string]*autoscaling.LifecycleHook{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *autoscaling.LifecycleHook:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAutoScalingLifecycleHookWithName retrieves all autoscaling.LifecycleHook items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAutoScalingLifecycleHookWithName(name string) (*autoscaling.LifecycleHook, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *autoscaling.LifecycleHook:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type autoscaling.LifecycleHook not found", name)
+}
+
+// GetAllAutoScalingScalingPolicyResources retrieves all autoscaling.ScalingPolicy items from an AWS CloudFormation template
+func (t *Template) GetAllAutoScalingScalingPolicyResources() map[string]*autoscaling.ScalingPolicy {
+	results := map[string]*autoscaling.ScalingPolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *autoscaling.ScalingPolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAutoScalingScalingPolicyWithName retrieves all autoscaling.ScalingPolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAutoScalingScalingPolicyWithName(name string) (*autoscaling.ScalingPolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *autoscaling.ScalingPolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type autoscaling.ScalingPolicy not found", name)
+}
+
+// GetAllAutoScalingScheduledActionResources retrieves all autoscaling.ScheduledAction items from an AWS CloudFormation template
+func (t *Template) GetAllAutoScalingScheduledActionResources() map[string]*autoscaling.ScheduledAction {
+	results := map[string]*autoscaling.ScheduledAction{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *autoscaling.ScheduledAction:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAutoScalingScheduledActionWithName retrieves all autoscaling.ScheduledAction items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAutoScalingScheduledActionWithName(name string) (*autoscaling.ScheduledAction, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *autoscaling.ScheduledAction:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type autoscaling.ScheduledAction not found", name)
+}
+
+// GetAllAutoScalingWarmPoolResources retrieves all autoscaling.WarmPool items from an AWS CloudFormation template
+func (t *Template) GetAllAutoScalingWarmPoolResources() map[string]*autoscaling.WarmPool {
+	results := map[string]*autoscaling.WarmPool{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *autoscaling.WarmPool:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAutoScalingWarmPoolWithName retrieves all autoscaling.WarmPool items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAutoScalingWarmPoolWithName(name string) (*autoscaling.WarmPool, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *autoscaling.WarmPool:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type autoscaling.WarmPool not found", name)
+}
+
+// GetAllAutoScalingPlansScalingPlanResources retrieves all autoscalingplans.ScalingPlan items from an AWS CloudFormation template
+func (t *Template) GetAllAutoScalingPlansScalingPlanResources() map[string]*autoscalingplans.ScalingPlan {
+	results := map[string]*autoscalingplans.ScalingPlan{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *autoscalingplans.ScalingPlan:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetAutoScalingPlansScalingPlanWithName retrieves all autoscalingplans.ScalingPlan items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetAutoScalingPlansScalingPlanWithName(name string) (*autoscalingplans.ScalingPlan, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *autoscalingplans.ScalingPlan:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type autoscalingplans.ScalingPlan not found", name)
+}
+
+// GetAllBackupBackupPlanResources retrieves all backup.BackupPlan items from an AWS CloudFormation template
+func (t *Template) GetAllBackupBackupPlanResources() map[string]*backup.BackupPlan {
+	results := map[string]*backup.BackupPlan{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *backup.BackupPlan:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetBackupBackupPlanWithName retrieves all backup.BackupPlan items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetBackupBackupPlanWithName(name string) (*backup.BackupPlan, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *backup.BackupPlan:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type backup.BackupPlan not found", name)
+}
+
+// GetAllBackupBackupSelectionResources retrieves all backup.BackupSelection items from an AWS CloudFormation template
+func (t *Template) GetAllBackupBackupSelectionResources() map[string]*backup.BackupSelection {
+	results := map[string]*backup.BackupSelection{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *backup.BackupSelection:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetBackupBackupSelectionWithName retrieves all backup.BackupSelection items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetBackupBackupSelectionWithName(name string) (*backup.BackupSelection, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *backup.BackupSelection:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type backup.BackupSelection not found", name)
+}
+
+// GetAllBackupBackupVaultResources retrieves all backup.BackupVault items from an AWS CloudFormation template
+func (t *Template) GetAllBackupBackupVaultResources() map[string]*backup.BackupVault {
+	results := map[string]*backup.BackupVault{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *backup.BackupVault:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetBackupBackupVaultWithName retrieves all backup.BackupVault items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetBackupBackupVaultWithName(name string) (*backup.BackupVault, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *backup.BackupVault:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type backup.BackupVault not found", name)
+}
+
+// GetAllBackupFrameworkResources retrieves all backup.Framework items from an AWS CloudFormation template
+func (t *Template) GetAllBackupFrameworkResources() map[string]*backup.Framework {
+	results := map[string]*backup.Framework{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *backup.Framework:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetBackupFrameworkWithName retrieves all backup.Framework items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetBackupFrameworkWithName(name string) (*backup.Framework, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *backup.Framework:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type backup.Framework not found", name)
+}
+
+// GetAllBackupReportPlanResources retrieves all backup.ReportPlan items from an AWS CloudFormation template
+func (t *Template) GetAllBackupReportPlanResources() map[string]*backup.ReportPlan {
+	results := map[string]*backup.ReportPlan{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *backup.ReportPlan:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetBackupReportPlanWithName retrieves all backup.ReportPlan items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetBackupReportPlanWithName(name string) (*backup.ReportPlan, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *backup.ReportPlan:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type backup.ReportPlan not found", name)
+}
+
+// GetAllBatchComputeEnvironmentResources retrieves all batch.ComputeEnvironment items from an AWS CloudFormation template
+func (t *Template) GetAllBatchComputeEnvironmentResources() map[string]*batch.ComputeEnvironment {
+	results := map[string]*batch.ComputeEnvironment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *batch.ComputeEnvironment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetBatchComputeEnvironmentWithName retrieves all batch.ComputeEnvironment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetBatchComputeEnvironmentWithName(name string) (*batch.ComputeEnvironment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *batch.ComputeEnvironment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type batch.ComputeEnvironment not found", name)
+}
+
+// GetAllBatchJobDefinitionResources retrieves all batch.JobDefinition items from an AWS CloudFormation template
+func (t *Template) GetAllBatchJobDefinitionResources() map[string]*batch.JobDefinition {
+	results := map[string]*batch.JobDefinition{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *batch.JobDefinition:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetBatchJobDefinitionWithName retrieves all batch.JobDefinition items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetBatchJobDefinitionWithName(name string) (*batch.JobDefinition, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *batch.JobDefinition:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type batch.JobDefinition not found", name)
+}
+
+// GetAllBatchJobQueueResources retrieves all batch.JobQueue items from an AWS CloudFormation template
+func (t *Template) GetAllBatchJobQueueResources() map[string]*batch.JobQueue {
+	results := map[string]*batch.JobQueue{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *batch.JobQueue:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetBatchJobQueueWithName retrieves all batch.JobQueue items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetBatchJobQueueWithName(name string) (*batch.JobQueue, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *batch.JobQueue:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type batch.JobQueue not found", name)
+}
+
+// GetAllBatchSchedulingPolicyResources retrieves all batch.SchedulingPolicy items from an AWS CloudFormation template
+func (t *Template) GetAllBatchSchedulingPolicyResources() map[string]*batch.SchedulingPolicy {
+	results := map[string]*batch.SchedulingPolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *batch.SchedulingPolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetBatchSchedulingPolicyWithName retrieves all batch.SchedulingPolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetBatchSchedulingPolicyWithName(name string) (*batch.SchedulingPolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *batch.SchedulingPolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type batch.SchedulingPolicy not found", name)
+}
+
+// GetAllBudgetsBudgetResources retrieves all budgets.Budget items from an AWS CloudFormation template
+func (t *Template) GetAllBudgetsBudgetResources() map[string]*budgets.Budget {
+	results := map[string]*budgets.Budget{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *budgets.Budget:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetBudgetsBudgetWithName retrieves all budgets.Budget items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetBudgetsBudgetWithName(name string) (*budgets.Budget, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *budgets.Budget:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type budgets.Budget not found", name)
+}
+
+// GetAllBudgetsBudgetsActionResources retrieves all budgets.BudgetsAction items from an AWS CloudFormation template
+func (t *Template) GetAllBudgetsBudgetsActionResources() map[string]*budgets.BudgetsAction {
+	results := map[string]*budgets.BudgetsAction{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *budgets.BudgetsAction:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetBudgetsBudgetsActionWithName retrieves all budgets.BudgetsAction items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetBudgetsBudgetsActionWithName(name string) (*budgets.BudgetsAction, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *budgets.BudgetsAction:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type budgets.BudgetsAction not found", name)
+}
+
+// GetAllCEAnomalyMonitorResources retrieves all ce.AnomalyMonitor items from an AWS CloudFormation template
+func (t *Template) GetAllCEAnomalyMonitorResources() map[string]*ce.AnomalyMonitor {
+	results := map[string]*ce.AnomalyMonitor{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ce.AnomalyMonitor:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCEAnomalyMonitorWithName retrieves all ce.AnomalyMonitor items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCEAnomalyMonitorWithName(name string) (*ce.AnomalyMonitor, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ce.AnomalyMonitor:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ce.AnomalyMonitor not found", name)
+}
+
+// GetAllCEAnomalySubscriptionResources retrieves all ce.AnomalySubscription items from an AWS CloudFormation template
+func (t *Template) GetAllCEAnomalySubscriptionResources() map[string]*ce.AnomalySubscription {
+	results := map[string]*ce.AnomalySubscription{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ce.AnomalySubscription:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCEAnomalySubscriptionWithName retrieves all ce.AnomalySubscription items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCEAnomalySubscriptionWithName(name string) (*ce.AnomalySubscription, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ce.AnomalySubscription:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ce.AnomalySubscription not found", name)
+}
+
+// GetAllCECostCategoryResources retrieves all ce.CostCategory items from an AWS CloudFormation template
+func (t *Template) GetAllCECostCategoryResources() map[string]*ce.CostCategory {
+	results := map[string]*ce.CostCategory{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ce.CostCategory:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCECostCategoryWithName retrieves all ce.CostCategory items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCECostCategoryWithName(name string) (*ce.CostCategory, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ce.CostCategory:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ce.CostCategory not found", name)
+}
+
+// GetAllCURReportDefinitionResources retrieves all cur.ReportDefinition items from an AWS CloudFormation template
+func (t *Template) GetAllCURReportDefinitionResources() map[string]*cur.ReportDefinition {
+	results := map[string]*cur.ReportDefinition{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cur.ReportDefinition:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCURReportDefinitionWithName retrieves all cur.ReportDefinition items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCURReportDefinitionWithName(name string) (*cur.ReportDefinition, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cur.ReportDefinition:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cur.ReportDefinition not found", name)
+}
+
+// GetAllCassandraKeyspaceResources retrieves all cassandra.Keyspace items from an AWS CloudFormation template
+func (t *Template) GetAllCassandraKeyspaceResources() map[string]*cassandra.Keyspace {
+	results := map[string]*cassandra.Keyspace{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cassandra.Keyspace:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCassandraKeyspaceWithName retrieves all cassandra.Keyspace items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCassandraKeyspaceWithName(name string) (*cassandra.Keyspace, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cassandra.Keyspace:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cassandra.Keyspace not found", name)
+}
+
+// GetAllCassandraTableResources retrieves all cassandra.Table items from an AWS CloudFormation template
+func (t *Template) GetAllCassandraTableResources() map[string]*cassandra.Table {
+	results := map[string]*cassandra.Table{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cassandra.Table:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCassandraTableWithName retrieves all cassandra.Table items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCassandraTableWithName(name string) (*cassandra.Table, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cassandra.Table:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cassandra.Table not found", name)
+}
+
+// GetAllCertificateManagerAccountResources retrieves all certificatemanager.Account items from an AWS CloudFormation template
+func (t *Template) GetAllCertificateManagerAccountResources() map[string]*certificatemanager.Account {
+	results := map[string]*certificatemanager.Account{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *certificatemanager.Account:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCertificateManagerAccountWithName retrieves all certificatemanager.Account items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCertificateManagerAccountWithName(name string) (*certificatemanager.Account, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *certificatemanager.Account:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type certificatemanager.Account not found", name)
+}
+
+// GetAllCertificateManagerCertificateResources retrieves all certificatemanager.Certificate items from an AWS CloudFormation template
+func (t *Template) GetAllCertificateManagerCertificateResources() map[string]*certificatemanager.Certificate {
+	results := map[string]*certificatemanager.Certificate{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *certificatemanager.Certificate:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCertificateManagerCertificateWithName retrieves all certificatemanager.Certificate items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCertificateManagerCertificateWithName(name string) (*certificatemanager.Certificate, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *certificatemanager.Certificate:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type certificatemanager.Certificate not found", name)
+}
+
+// GetAllChatbotSlackChannelConfigurationResources retrieves all chatbot.SlackChannelConfiguration items from an AWS CloudFormation template
+func (t *Template) GetAllChatbotSlackChannelConfigurationResources() map[string]*chatbot.SlackChannelConfiguration {
+	results := map[string]*chatbot.SlackChannelConfiguration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *chatbot.SlackChannelConfiguration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetChatbotSlackChannelConfigurationWithName retrieves all chatbot.SlackChannelConfiguration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetChatbotSlackChannelConfigurationWithName(name string) (*chatbot.SlackChannelConfiguration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *chatbot.SlackChannelConfiguration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type chatbot.SlackChannelConfiguration not found", name)
+}
+
+// GetAllCloud9EnvironmentEC2Resources retrieves all cloud9.EnvironmentEC2 items from an AWS CloudFormation template
+func (t *Template) GetAllCloud9EnvironmentEC2Resources() map[string]*cloud9.EnvironmentEC2 {
+	results := map[string]*cloud9.EnvironmentEC2{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloud9.EnvironmentEC2:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloud9EnvironmentEC2WithName retrieves all cloud9.EnvironmentEC2 items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloud9EnvironmentEC2WithName(name string) (*cloud9.EnvironmentEC2, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloud9.EnvironmentEC2:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloud9.EnvironmentEC2 not found", name)
+}
+
+// GetAllCloudFormationCustomResourceResources retrieves all cloudformation.CustomResource items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFormationCustomResourceResources() map[string]*cloudformation.CustomResource {
+	results := map[string]*cloudformation.CustomResource{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudformation.CustomResource:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFormationCustomResourceWithName retrieves all cloudformation.CustomResource items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFormationCustomResourceWithName(name string) (*cloudformation.CustomResource, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudformation.CustomResource:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudformation.CustomResource not found", name)
+}
+
+// GetAllCloudFormationMacroResources retrieves all cloudformation.Macro items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFormationMacroResources() map[string]*cloudformation.Macro {
+	results := map[string]*cloudformation.Macro{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudformation.Macro:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFormationMacroWithName retrieves all cloudformation.Macro items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFormationMacroWithName(name string) (*cloudformation.Macro, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudformation.Macro:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudformation.Macro not found", name)
+}
+
+// GetAllCloudFormationModuleDefaultVersionResources retrieves all cloudformation.ModuleDefaultVersion items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFormationModuleDefaultVersionResources() map[string]*cloudformation.ModuleDefaultVersion {
+	results := map[string]*cloudformation.ModuleDefaultVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudformation.ModuleDefaultVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFormationModuleDefaultVersionWithName retrieves all cloudformation.ModuleDefaultVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFormationModuleDefaultVersionWithName(name string) (*cloudformation.ModuleDefaultVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudformation.ModuleDefaultVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudformation.ModuleDefaultVersion not found", name)
+}
+
+// GetAllCloudFormationModuleVersionResources retrieves all cloudformation.ModuleVersion items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFormationModuleVersionResources() map[string]*cloudformation.ModuleVersion {
+	results := map[string]*cloudformation.ModuleVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudformation.ModuleVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFormationModuleVersionWithName retrieves all cloudformation.ModuleVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFormationModuleVersionWithName(name string) (*cloudformation.ModuleVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudformation.ModuleVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudformation.ModuleVersion not found", name)
+}
+
+// GetAllCloudFormationPublicTypeVersionResources retrieves all cloudformation.PublicTypeVersion items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFormationPublicTypeVersionResources() map[string]*cloudformation.PublicTypeVersion {
+	results := map[string]*cloudformation.PublicTypeVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudformation.PublicTypeVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFormationPublicTypeVersionWithName retrieves all cloudformation.PublicTypeVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFormationPublicTypeVersionWithName(name string) (*cloudformation.PublicTypeVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudformation.PublicTypeVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudformation.PublicTypeVersion not found", name)
+}
+
+// GetAllCloudFormationPublisherResources retrieves all cloudformation.Publisher items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFormationPublisherResources() map[string]*cloudformation.Publisher {
+	results := map[string]*cloudformation.Publisher{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudformation.Publisher:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFormationPublisherWithName retrieves all cloudformation.Publisher items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFormationPublisherWithName(name string) (*cloudformation.Publisher, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudformation.Publisher:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudformation.Publisher not found", name)
+}
+
+// GetAllCloudFormationResourceDefaultVersionResources retrieves all cloudformation.ResourceDefaultVersion items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFormationResourceDefaultVersionResources() map[string]*cloudformation.ResourceDefaultVersion {
+	results := map[string]*cloudformation.ResourceDefaultVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudformation.ResourceDefaultVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFormationResourceDefaultVersionWithName retrieves all cloudformation.ResourceDefaultVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFormationResourceDefaultVersionWithName(name string) (*cloudformation.ResourceDefaultVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudformation.ResourceDefaultVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudformation.ResourceDefaultVersion not found", name)
+}
+
+// GetAllCloudFormationResourceVersionResources retrieves all cloudformation.ResourceVersion items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFormationResourceVersionResources() map[string]*cloudformation.ResourceVersion {
+	results := map[string]*cloudformation.ResourceVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudformation.ResourceVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFormationResourceVersionWithName retrieves all cloudformation.ResourceVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFormationResourceVersionWithName(name string) (*cloudformation.ResourceVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudformation.ResourceVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudformation.ResourceVersion not found", name)
+}
+
+// GetAllCloudFormationStackResources retrieves all cloudformation.Stack items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFormationStackResources() map[string]*cloudformation.Stack {
+	results := map[string]*cloudformation.Stack{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudformation.Stack:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFormationStackWithName retrieves all cloudformation.Stack items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFormationStackWithName(name string) (*cloudformation.Stack, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudformation.Stack:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudformation.Stack not found", name)
+}
+
+// GetAllCloudFormationStackSetResources retrieves all cloudformation.StackSet items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFormationStackSetResources() map[string]*cloudformation.StackSet {
+	results := map[string]*cloudformation.StackSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudformation.StackSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFormationStackSetWithName retrieves all cloudformation.StackSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFormationStackSetWithName(name string) (*cloudformation.StackSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudformation.StackSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudformation.StackSet not found", name)
+}
+
+// GetAllCloudFormationTypeActivationResources retrieves all cloudformation.TypeActivation items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFormationTypeActivationResources() map[string]*cloudformation.TypeActivation {
+	results := map[string]*cloudformation.TypeActivation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudformation.TypeActivation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFormationTypeActivationWithName retrieves all cloudformation.TypeActivation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFormationTypeActivationWithName(name string) (*cloudformation.TypeActivation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudformation.TypeActivation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudformation.TypeActivation not found", name)
+}
+
+// GetAllCloudFormationWaitConditionResources retrieves all cloudformation.WaitCondition items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFormationWaitConditionResources() map[string]*cloudformation.WaitCondition {
+	results := map[string]*cloudformation.WaitCondition{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudformation.WaitCondition:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFormationWaitConditionWithName retrieves all cloudformation.WaitCondition items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFormationWaitConditionWithName(name string) (*cloudformation.WaitCondition, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudformation.WaitCondition:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudformation.WaitCondition not found", name)
+}
+
+// GetAllCloudFormationWaitConditionHandleResources retrieves all cloudformation.WaitConditionHandle items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFormationWaitConditionHandleResources() map[string]*cloudformation.WaitConditionHandle {
+	results := map[string]*cloudformation.WaitConditionHandle{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudformation.WaitConditionHandle:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFormationWaitConditionHandleWithName retrieves all cloudformation.WaitConditionHandle items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFormationWaitConditionHandleWithName(name string) (*cloudformation.WaitConditionHandle, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudformation.WaitConditionHandle:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudformation.WaitConditionHandle not found", name)
+}
+
+// GetAllCloudFrontCachePolicyResources retrieves all cloudfront.CachePolicy items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFrontCachePolicyResources() map[string]*cloudfront.CachePolicy {
+	results := map[string]*cloudfront.CachePolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudfront.CachePolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFrontCachePolicyWithName retrieves all cloudfront.CachePolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFrontCachePolicyWithName(name string) (*cloudfront.CachePolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudfront.CachePolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudfront.CachePolicy not found", name)
+}
+
+// GetAllCloudFrontCloudFrontOriginAccessIdentityResources retrieves all cloudfront.CloudFrontOriginAccessIdentity items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFrontCloudFrontOriginAccessIdentityResources() map[string]*cloudfront.CloudFrontOriginAccessIdentity {
+	results := map[string]*cloudfront.CloudFrontOriginAccessIdentity{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudfront.CloudFrontOriginAccessIdentity:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFrontCloudFrontOriginAccessIdentityWithName retrieves all cloudfront.CloudFrontOriginAccessIdentity items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFrontCloudFrontOriginAccessIdentityWithName(name string) (*cloudfront.CloudFrontOriginAccessIdentity, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudfront.CloudFrontOriginAccessIdentity:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudfront.CloudFrontOriginAccessIdentity not found", name)
+}
+
+// GetAllCloudFrontDistributionResources retrieves all cloudfront.Distribution items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFrontDistributionResources() map[string]*cloudfront.Distribution {
+	results := map[string]*cloudfront.Distribution{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudfront.Distribution:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFrontDistributionWithName retrieves all cloudfront.Distribution items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFrontDistributionWithName(name string) (*cloudfront.Distribution, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudfront.Distribution:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudfront.Distribution not found", name)
+}
+
+// GetAllCloudFrontFunctionResources retrieves all cloudfront.Function items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFrontFunctionResources() map[string]*cloudfront.Function {
+	results := map[string]*cloudfront.Function{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudfront.Function:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFrontFunctionWithName retrieves all cloudfront.Function items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFrontFunctionWithName(name string) (*cloudfront.Function, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudfront.Function:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudfront.Function not found", name)
+}
+
+// GetAllCloudFrontKeyGroupResources retrieves all cloudfront.KeyGroup items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFrontKeyGroupResources() map[string]*cloudfront.KeyGroup {
+	results := map[string]*cloudfront.KeyGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudfront.KeyGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFrontKeyGroupWithName retrieves all cloudfront.KeyGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFrontKeyGroupWithName(name string) (*cloudfront.KeyGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudfront.KeyGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudfront.KeyGroup not found", name)
+}
+
+// GetAllCloudFrontOriginRequestPolicyResources retrieves all cloudfront.OriginRequestPolicy items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFrontOriginRequestPolicyResources() map[string]*cloudfront.OriginRequestPolicy {
+	results := map[string]*cloudfront.OriginRequestPolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudfront.OriginRequestPolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFrontOriginRequestPolicyWithName retrieves all cloudfront.OriginRequestPolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFrontOriginRequestPolicyWithName(name string) (*cloudfront.OriginRequestPolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudfront.OriginRequestPolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudfront.OriginRequestPolicy not found", name)
+}
+
+// GetAllCloudFrontPublicKeyResources retrieves all cloudfront.PublicKey items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFrontPublicKeyResources() map[string]*cloudfront.PublicKey {
+	results := map[string]*cloudfront.PublicKey{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudfront.PublicKey:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFrontPublicKeyWithName retrieves all cloudfront.PublicKey items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFrontPublicKeyWithName(name string) (*cloudfront.PublicKey, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudfront.PublicKey:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudfront.PublicKey not found", name)
+}
+
+// GetAllCloudFrontRealtimeLogConfigResources retrieves all cloudfront.RealtimeLogConfig items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFrontRealtimeLogConfigResources() map[string]*cloudfront.RealtimeLogConfig {
+	results := map[string]*cloudfront.RealtimeLogConfig{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudfront.RealtimeLogConfig:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFrontRealtimeLogConfigWithName retrieves all cloudfront.RealtimeLogConfig items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFrontRealtimeLogConfigWithName(name string) (*cloudfront.RealtimeLogConfig, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudfront.RealtimeLogConfig:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudfront.RealtimeLogConfig not found", name)
+}
+
+// GetAllCloudFrontResponseHeadersPolicyResources retrieves all cloudfront.ResponseHeadersPolicy items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFrontResponseHeadersPolicyResources() map[string]*cloudfront.ResponseHeadersPolicy {
+	results := map[string]*cloudfront.ResponseHeadersPolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudfront.ResponseHeadersPolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFrontResponseHeadersPolicyWithName retrieves all cloudfront.ResponseHeadersPolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFrontResponseHeadersPolicyWithName(name string) (*cloudfront.ResponseHeadersPolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudfront.ResponseHeadersPolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudfront.ResponseHeadersPolicy not found", name)
+}
+
+// GetAllCloudFrontStreamingDistributionResources retrieves all cloudfront.StreamingDistribution items from an AWS CloudFormation template
+func (t *Template) GetAllCloudFrontStreamingDistributionResources() map[string]*cloudfront.StreamingDistribution {
+	results := map[string]*cloudfront.StreamingDistribution{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudfront.StreamingDistribution:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudFrontStreamingDistributionWithName retrieves all cloudfront.StreamingDistribution items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudFrontStreamingDistributionWithName(name string) (*cloudfront.StreamingDistribution, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudfront.StreamingDistribution:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudfront.StreamingDistribution not found", name)
+}
+
+// GetAllCloudTrailTrailResources retrieves all cloudtrail.Trail items from an AWS CloudFormation template
+func (t *Template) GetAllCloudTrailTrailResources() map[string]*cloudtrail.Trail {
+	results := map[string]*cloudtrail.Trail{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudtrail.Trail:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudTrailTrailWithName retrieves all cloudtrail.Trail items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudTrailTrailWithName(name string) (*cloudtrail.Trail, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudtrail.Trail:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudtrail.Trail not found", name)
+}
+
+// GetAllCloudWatchAlarmResources retrieves all cloudwatch.Alarm items from an AWS CloudFormation template
+func (t *Template) GetAllCloudWatchAlarmResources() map[string]*cloudwatch.Alarm {
+	results := map[string]*cloudwatch.Alarm{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudwatch.Alarm:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudWatchAlarmWithName retrieves all cloudwatch.Alarm items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudWatchAlarmWithName(name string) (*cloudwatch.Alarm, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudwatch.Alarm:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudwatch.Alarm not found", name)
+}
+
+// GetAllCloudWatchAnomalyDetectorResources retrieves all cloudwatch.AnomalyDetector items from an AWS CloudFormation template
+func (t *Template) GetAllCloudWatchAnomalyDetectorResources() map[string]*cloudwatch.AnomalyDetector {
+	results := map[string]*cloudwatch.AnomalyDetector{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudwatch.AnomalyDetector:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudWatchAnomalyDetectorWithName retrieves all cloudwatch.AnomalyDetector items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudWatchAnomalyDetectorWithName(name string) (*cloudwatch.AnomalyDetector, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudwatch.AnomalyDetector:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudwatch.AnomalyDetector not found", name)
+}
+
+// GetAllCloudWatchCompositeAlarmResources retrieves all cloudwatch.CompositeAlarm items from an AWS CloudFormation template
+func (t *Template) GetAllCloudWatchCompositeAlarmResources() map[string]*cloudwatch.CompositeAlarm {
+	results := map[string]*cloudwatch.CompositeAlarm{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudwatch.CompositeAlarm:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudWatchCompositeAlarmWithName retrieves all cloudwatch.CompositeAlarm items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudWatchCompositeAlarmWithName(name string) (*cloudwatch.CompositeAlarm, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudwatch.CompositeAlarm:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudwatch.CompositeAlarm not found", name)
+}
+
+// GetAllCloudWatchDashboardResources retrieves all cloudwatch.Dashboard items from an AWS CloudFormation template
+func (t *Template) GetAllCloudWatchDashboardResources() map[string]*cloudwatch.Dashboard {
+	results := map[string]*cloudwatch.Dashboard{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudwatch.Dashboard:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudWatchDashboardWithName retrieves all cloudwatch.Dashboard items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudWatchDashboardWithName(name string) (*cloudwatch.Dashboard, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudwatch.Dashboard:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudwatch.Dashboard not found", name)
+}
+
+// GetAllCloudWatchInsightRuleResources retrieves all cloudwatch.InsightRule items from an AWS CloudFormation template
+func (t *Template) GetAllCloudWatchInsightRuleResources() map[string]*cloudwatch.InsightRule {
+	results := map[string]*cloudwatch.InsightRule{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudwatch.InsightRule:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudWatchInsightRuleWithName retrieves all cloudwatch.InsightRule items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudWatchInsightRuleWithName(name string) (*cloudwatch.InsightRule, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudwatch.InsightRule:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudwatch.InsightRule not found", name)
+}
+
+// GetAllCloudWatchMetricStreamResources retrieves all cloudwatch.MetricStream items from an AWS CloudFormation template
+func (t *Template) GetAllCloudWatchMetricStreamResources() map[string]*cloudwatch.MetricStream {
+	results := map[string]*cloudwatch.MetricStream{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cloudwatch.MetricStream:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCloudWatchMetricStreamWithName retrieves all cloudwatch.MetricStream items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCloudWatchMetricStreamWithName(name string) (*cloudwatch.MetricStream, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cloudwatch.MetricStream:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cloudwatch.MetricStream not found", name)
+}
+
+// GetAllCodeArtifactDomainResources retrieves all codeartifact.Domain items from an AWS CloudFormation template
+func (t *Template) GetAllCodeArtifactDomainResources() map[string]*codeartifact.Domain {
+	results := map[string]*codeartifact.Domain{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *codeartifact.Domain:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCodeArtifactDomainWithName retrieves all codeartifact.Domain items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCodeArtifactDomainWithName(name string) (*codeartifact.Domain, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *codeartifact.Domain:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type codeartifact.Domain not found", name)
+}
+
+// GetAllCodeArtifactRepositoryResources retrieves all codeartifact.Repository items from an AWS CloudFormation template
+func (t *Template) GetAllCodeArtifactRepositoryResources() map[string]*codeartifact.Repository {
+	results := map[string]*codeartifact.Repository{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *codeartifact.Repository:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCodeArtifactRepositoryWithName retrieves all codeartifact.Repository items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCodeArtifactRepositoryWithName(name string) (*codeartifact.Repository, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *codeartifact.Repository:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type codeartifact.Repository not found", name)
+}
+
+// GetAllCodeBuildProjectResources retrieves all codebuild.Project items from an AWS CloudFormation template
+func (t *Template) GetAllCodeBuildProjectResources() map[string]*codebuild.Project {
+	results := map[string]*codebuild.Project{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *codebuild.Project:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCodeBuildProjectWithName retrieves all codebuild.Project items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCodeBuildProjectWithName(name string) (*codebuild.Project, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *codebuild.Project:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type codebuild.Project not found", name)
+}
+
+// GetAllCodeBuildReportGroupResources retrieves all codebuild.ReportGroup items from an AWS CloudFormation template
+func (t *Template) GetAllCodeBuildReportGroupResources() map[string]*codebuild.ReportGroup {
+	results := map[string]*codebuild.ReportGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *codebuild.ReportGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCodeBuildReportGroupWithName retrieves all codebuild.ReportGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCodeBuildReportGroupWithName(name string) (*codebuild.ReportGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *codebuild.ReportGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type codebuild.ReportGroup not found", name)
+}
+
+// GetAllCodeBuildSourceCredentialResources retrieves all codebuild.SourceCredential items from an AWS CloudFormation template
+func (t *Template) GetAllCodeBuildSourceCredentialResources() map[string]*codebuild.SourceCredential {
+	results := map[string]*codebuild.SourceCredential{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *codebuild.SourceCredential:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCodeBuildSourceCredentialWithName retrieves all codebuild.SourceCredential items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCodeBuildSourceCredentialWithName(name string) (*codebuild.SourceCredential, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *codebuild.SourceCredential:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type codebuild.SourceCredential not found", name)
+}
+
+// GetAllCodeCommitRepositoryResources retrieves all codecommit.Repository items from an AWS CloudFormation template
+func (t *Template) GetAllCodeCommitRepositoryResources() map[string]*codecommit.Repository {
+	results := map[string]*codecommit.Repository{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *codecommit.Repository:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCodeCommitRepositoryWithName retrieves all codecommit.Repository items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCodeCommitRepositoryWithName(name string) (*codecommit.Repository, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *codecommit.Repository:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type codecommit.Repository not found", name)
+}
+
+// GetAllCodeDeployApplicationResources retrieves all codedeploy.Application items from an AWS CloudFormation template
+func (t *Template) GetAllCodeDeployApplicationResources() map[string]*codedeploy.Application {
+	results := map[string]*codedeploy.Application{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *codedeploy.Application:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCodeDeployApplicationWithName retrieves all codedeploy.Application items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCodeDeployApplicationWithName(name string) (*codedeploy.Application, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *codedeploy.Application:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type codedeploy.Application not found", name)
+}
+
+// GetAllCodeDeployDeploymentConfigResources retrieves all codedeploy.DeploymentConfig items from an AWS CloudFormation template
+func (t *Template) GetAllCodeDeployDeploymentConfigResources() map[string]*codedeploy.DeploymentConfig {
+	results := map[string]*codedeploy.DeploymentConfig{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *codedeploy.DeploymentConfig:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCodeDeployDeploymentConfigWithName retrieves all codedeploy.DeploymentConfig items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCodeDeployDeploymentConfigWithName(name string) (*codedeploy.DeploymentConfig, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *codedeploy.DeploymentConfig:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type codedeploy.DeploymentConfig not found", name)
+}
+
+// GetAllCodeDeployDeploymentGroupResources retrieves all codedeploy.DeploymentGroup items from an AWS CloudFormation template
+func (t *Template) GetAllCodeDeployDeploymentGroupResources() map[string]*codedeploy.DeploymentGroup {
+	results := map[string]*codedeploy.DeploymentGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *codedeploy.DeploymentGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCodeDeployDeploymentGroupWithName retrieves all codedeploy.DeploymentGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCodeDeployDeploymentGroupWithName(name string) (*codedeploy.DeploymentGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *codedeploy.DeploymentGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type codedeploy.DeploymentGroup not found", name)
+}
+
+// GetAllCodeGuruProfilerProfilingGroupResources retrieves all codeguruprofiler.ProfilingGroup items from an AWS CloudFormation template
+func (t *Template) GetAllCodeGuruProfilerProfilingGroupResources() map[string]*codeguruprofiler.ProfilingGroup {
+	results := map[string]*codeguruprofiler.ProfilingGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *codeguruprofiler.ProfilingGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCodeGuruProfilerProfilingGroupWithName retrieves all codeguruprofiler.ProfilingGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCodeGuruProfilerProfilingGroupWithName(name string) (*codeguruprofiler.ProfilingGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *codeguruprofiler.ProfilingGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type codeguruprofiler.ProfilingGroup not found", name)
+}
+
+// GetAllCodeGuruReviewerRepositoryAssociationResources retrieves all codegurureviewer.RepositoryAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllCodeGuruReviewerRepositoryAssociationResources() map[string]*codegurureviewer.RepositoryAssociation {
+	results := map[string]*codegurureviewer.RepositoryAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *codegurureviewer.RepositoryAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCodeGuruReviewerRepositoryAssociationWithName retrieves all codegurureviewer.RepositoryAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCodeGuruReviewerRepositoryAssociationWithName(name string) (*codegurureviewer.RepositoryAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *codegurureviewer.RepositoryAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type codegurureviewer.RepositoryAssociation not found", name)
+}
+
+// GetAllCodePipelineCustomActionTypeResources retrieves all codepipeline.CustomActionType items from an AWS CloudFormation template
+func (t *Template) GetAllCodePipelineCustomActionTypeResources() map[string]*codepipeline.CustomActionType {
+	results := map[string]*codepipeline.CustomActionType{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *codepipeline.CustomActionType:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCodePipelineCustomActionTypeWithName retrieves all codepipeline.CustomActionType items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCodePipelineCustomActionTypeWithName(name string) (*codepipeline.CustomActionType, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *codepipeline.CustomActionType:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type codepipeline.CustomActionType not found", name)
+}
+
+// GetAllCodePipelinePipelineResources retrieves all codepipeline.Pipeline items from an AWS CloudFormation template
+func (t *Template) GetAllCodePipelinePipelineResources() map[string]*codepipeline.Pipeline {
+	results := map[string]*codepipeline.Pipeline{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *codepipeline.Pipeline:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCodePipelinePipelineWithName retrieves all codepipeline.Pipeline items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCodePipelinePipelineWithName(name string) (*codepipeline.Pipeline, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *codepipeline.Pipeline:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type codepipeline.Pipeline not found", name)
+}
+
+// GetAllCodePipelineWebhookResources retrieves all codepipeline.Webhook items from an AWS CloudFormation template
+func (t *Template) GetAllCodePipelineWebhookResources() map[string]*codepipeline.Webhook {
+	results := map[string]*codepipeline.Webhook{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *codepipeline.Webhook:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCodePipelineWebhookWithName retrieves all codepipeline.Webhook items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCodePipelineWebhookWithName(name string) (*codepipeline.Webhook, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *codepipeline.Webhook:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type codepipeline.Webhook not found", name)
+}
+
+// GetAllCodeStarGitHubRepositoryResources retrieves all codestar.GitHubRepository items from an AWS CloudFormation template
+func (t *Template) GetAllCodeStarGitHubRepositoryResources() map[string]*codestar.GitHubRepository {
+	results := map[string]*codestar.GitHubRepository{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *codestar.GitHubRepository:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCodeStarGitHubRepositoryWithName retrieves all codestar.GitHubRepository items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCodeStarGitHubRepositoryWithName(name string) (*codestar.GitHubRepository, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *codestar.GitHubRepository:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type codestar.GitHubRepository not found", name)
+}
+
+// GetAllCodeStarConnectionsConnectionResources retrieves all codestarconnections.Connection items from an AWS CloudFormation template
+func (t *Template) GetAllCodeStarConnectionsConnectionResources() map[string]*codestarconnections.Connection {
+	results := map[string]*codestarconnections.Connection{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *codestarconnections.Connection:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCodeStarConnectionsConnectionWithName retrieves all codestarconnections.Connection items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCodeStarConnectionsConnectionWithName(name string) (*codestarconnections.Connection, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *codestarconnections.Connection:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type codestarconnections.Connection not found", name)
+}
+
+// GetAllCodeStarNotificationsNotificationRuleResources retrieves all codestarnotifications.NotificationRule items from an AWS CloudFormation template
+func (t *Template) GetAllCodeStarNotificationsNotificationRuleResources() map[string]*codestarnotifications.NotificationRule {
+	results := map[string]*codestarnotifications.NotificationRule{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *codestarnotifications.NotificationRule:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCodeStarNotificationsNotificationRuleWithName retrieves all codestarnotifications.NotificationRule items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCodeStarNotificationsNotificationRuleWithName(name string) (*codestarnotifications.NotificationRule, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *codestarnotifications.NotificationRule:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type codestarnotifications.NotificationRule not found", name)
+}
+
+// GetAllCognitoIdentityPoolResources retrieves all cognito.IdentityPool items from an AWS CloudFormation template
+func (t *Template) GetAllCognitoIdentityPoolResources() map[string]*cognito.IdentityPool {
+	results := map[string]*cognito.IdentityPool{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cognito.IdentityPool:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCognitoIdentityPoolWithName retrieves all cognito.IdentityPool items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCognitoIdentityPoolWithName(name string) (*cognito.IdentityPool, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cognito.IdentityPool:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cognito.IdentityPool not found", name)
+}
+
+// GetAllCognitoIdentityPoolRoleAttachmentResources retrieves all cognito.IdentityPoolRoleAttachment items from an AWS CloudFormation template
+func (t *Template) GetAllCognitoIdentityPoolRoleAttachmentResources() map[string]*cognito.IdentityPoolRoleAttachment {
+	results := map[string]*cognito.IdentityPoolRoleAttachment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cognito.IdentityPoolRoleAttachment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCognitoIdentityPoolRoleAttachmentWithName retrieves all cognito.IdentityPoolRoleAttachment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCognitoIdentityPoolRoleAttachmentWithName(name string) (*cognito.IdentityPoolRoleAttachment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cognito.IdentityPoolRoleAttachment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cognito.IdentityPoolRoleAttachment not found", name)
+}
+
+// GetAllCognitoUserPoolResources retrieves all cognito.UserPool items from an AWS CloudFormation template
+func (t *Template) GetAllCognitoUserPoolResources() map[string]*cognito.UserPool {
+	results := map[string]*cognito.UserPool{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cognito.UserPool:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCognitoUserPoolWithName retrieves all cognito.UserPool items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCognitoUserPoolWithName(name string) (*cognito.UserPool, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cognito.UserPool:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cognito.UserPool not found", name)
+}
+
+// GetAllCognitoUserPoolClientResources retrieves all cognito.UserPoolClient items from an AWS CloudFormation template
+func (t *Template) GetAllCognitoUserPoolClientResources() map[string]*cognito.UserPoolClient {
+	results := map[string]*cognito.UserPoolClient{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cognito.UserPoolClient:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCognitoUserPoolClientWithName retrieves all cognito.UserPoolClient items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCognitoUserPoolClientWithName(name string) (*cognito.UserPoolClient, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cognito.UserPoolClient:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cognito.UserPoolClient not found", name)
+}
+
+// GetAllCognitoUserPoolDomainResources retrieves all cognito.UserPoolDomain items from an AWS CloudFormation template
+func (t *Template) GetAllCognitoUserPoolDomainResources() map[string]*cognito.UserPoolDomain {
+	results := map[string]*cognito.UserPoolDomain{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cognito.UserPoolDomain:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCognitoUserPoolDomainWithName retrieves all cognito.UserPoolDomain items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCognitoUserPoolDomainWithName(name string) (*cognito.UserPoolDomain, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cognito.UserPoolDomain:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cognito.UserPoolDomain not found", name)
+}
+
+// GetAllCognitoUserPoolGroupResources retrieves all cognito.UserPoolGroup items from an AWS CloudFormation template
+func (t *Template) GetAllCognitoUserPoolGroupResources() map[string]*cognito.UserPoolGroup {
+	results := map[string]*cognito.UserPoolGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cognito.UserPoolGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCognitoUserPoolGroupWithName retrieves all cognito.UserPoolGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCognitoUserPoolGroupWithName(name string) (*cognito.UserPoolGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cognito.UserPoolGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cognito.UserPoolGroup not found", name)
+}
+
+// GetAllCognitoUserPoolIdentityProviderResources retrieves all cognito.UserPoolIdentityProvider items from an AWS CloudFormation template
+func (t *Template) GetAllCognitoUserPoolIdentityProviderResources() map[string]*cognito.UserPoolIdentityProvider {
+	results := map[string]*cognito.UserPoolIdentityProvider{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cognito.UserPoolIdentityProvider:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCognitoUserPoolIdentityProviderWithName retrieves all cognito.UserPoolIdentityProvider items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCognitoUserPoolIdentityProviderWithName(name string) (*cognito.UserPoolIdentityProvider, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cognito.UserPoolIdentityProvider:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cognito.UserPoolIdentityProvider not found", name)
+}
+
+// GetAllCognitoUserPoolResourceServerResources retrieves all cognito.UserPoolResourceServer items from an AWS CloudFormation template
+func (t *Template) GetAllCognitoUserPoolResourceServerResources() map[string]*cognito.UserPoolResourceServer {
+	results := map[string]*cognito.UserPoolResourceServer{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cognito.UserPoolResourceServer:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCognitoUserPoolResourceServerWithName retrieves all cognito.UserPoolResourceServer items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCognitoUserPoolResourceServerWithName(name string) (*cognito.UserPoolResourceServer, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cognito.UserPoolResourceServer:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cognito.UserPoolResourceServer not found", name)
+}
+
+// GetAllCognitoUserPoolRiskConfigurationAttachmentResources retrieves all cognito.UserPoolRiskConfigurationAttachment items from an AWS CloudFormation template
+func (t *Template) GetAllCognitoUserPoolRiskConfigurationAttachmentResources() map[string]*cognito.UserPoolRiskConfigurationAttachment {
+	results := map[string]*cognito.UserPoolRiskConfigurationAttachment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cognito.UserPoolRiskConfigurationAttachment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCognitoUserPoolRiskConfigurationAttachmentWithName retrieves all cognito.UserPoolRiskConfigurationAttachment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCognitoUserPoolRiskConfigurationAttachmentWithName(name string) (*cognito.UserPoolRiskConfigurationAttachment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cognito.UserPoolRiskConfigurationAttachment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cognito.UserPoolRiskConfigurationAttachment not found", name)
+}
+
+// GetAllCognitoUserPoolUICustomizationAttachmentResources retrieves all cognito.UserPoolUICustomizationAttachment items from an AWS CloudFormation template
+func (t *Template) GetAllCognitoUserPoolUICustomizationAttachmentResources() map[string]*cognito.UserPoolUICustomizationAttachment {
+	results := map[string]*cognito.UserPoolUICustomizationAttachment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cognito.UserPoolUICustomizationAttachment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCognitoUserPoolUICustomizationAttachmentWithName retrieves all cognito.UserPoolUICustomizationAttachment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCognitoUserPoolUICustomizationAttachmentWithName(name string) (*cognito.UserPoolUICustomizationAttachment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cognito.UserPoolUICustomizationAttachment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cognito.UserPoolUICustomizationAttachment not found", name)
+}
+
+// GetAllCognitoUserPoolUserResources retrieves all cognito.UserPoolUser items from an AWS CloudFormation template
+func (t *Template) GetAllCognitoUserPoolUserResources() map[string]*cognito.UserPoolUser {
+	results := map[string]*cognito.UserPoolUser{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cognito.UserPoolUser:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCognitoUserPoolUserWithName retrieves all cognito.UserPoolUser items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCognitoUserPoolUserWithName(name string) (*cognito.UserPoolUser, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cognito.UserPoolUser:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cognito.UserPoolUser not found", name)
+}
+
+// GetAllCognitoUserPoolUserToGroupAttachmentResources retrieves all cognito.UserPoolUserToGroupAttachment items from an AWS CloudFormation template
+func (t *Template) GetAllCognitoUserPoolUserToGroupAttachmentResources() map[string]*cognito.UserPoolUserToGroupAttachment {
+	results := map[string]*cognito.UserPoolUserToGroupAttachment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *cognito.UserPoolUserToGroupAttachment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCognitoUserPoolUserToGroupAttachmentWithName retrieves all cognito.UserPoolUserToGroupAttachment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCognitoUserPoolUserToGroupAttachmentWithName(name string) (*cognito.UserPoolUserToGroupAttachment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *cognito.UserPoolUserToGroupAttachment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type cognito.UserPoolUserToGroupAttachment not found", name)
+}
+
+// GetAllConfigAggregationAuthorizationResources retrieves all config.AggregationAuthorization items from an AWS CloudFormation template
+func (t *Template) GetAllConfigAggregationAuthorizationResources() map[string]*config.AggregationAuthorization {
+	results := map[string]*config.AggregationAuthorization{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *config.AggregationAuthorization:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetConfigAggregationAuthorizationWithName retrieves all config.AggregationAuthorization items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetConfigAggregationAuthorizationWithName(name string) (*config.AggregationAuthorization, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *config.AggregationAuthorization:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type config.AggregationAuthorization not found", name)
+}
+
+// GetAllConfigConfigRuleResources retrieves all config.ConfigRule items from an AWS CloudFormation template
+func (t *Template) GetAllConfigConfigRuleResources() map[string]*config.ConfigRule {
+	results := map[string]*config.ConfigRule{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *config.ConfigRule:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetConfigConfigRuleWithName retrieves all config.ConfigRule items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetConfigConfigRuleWithName(name string) (*config.ConfigRule, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *config.ConfigRule:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type config.ConfigRule not found", name)
+}
+
+// GetAllConfigConfigurationAggregatorResources retrieves all config.ConfigurationAggregator items from an AWS CloudFormation template
+func (t *Template) GetAllConfigConfigurationAggregatorResources() map[string]*config.ConfigurationAggregator {
+	results := map[string]*config.ConfigurationAggregator{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *config.ConfigurationAggregator:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetConfigConfigurationAggregatorWithName retrieves all config.ConfigurationAggregator items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetConfigConfigurationAggregatorWithName(name string) (*config.ConfigurationAggregator, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *config.ConfigurationAggregator:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type config.ConfigurationAggregator not found", name)
+}
+
+// GetAllConfigConfigurationRecorderResources retrieves all config.ConfigurationRecorder items from an AWS CloudFormation template
+func (t *Template) GetAllConfigConfigurationRecorderResources() map[string]*config.ConfigurationRecorder {
+	results := map[string]*config.ConfigurationRecorder{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *config.ConfigurationRecorder:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetConfigConfigurationRecorderWithName retrieves all config.ConfigurationRecorder items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetConfigConfigurationRecorderWithName(name string) (*config.ConfigurationRecorder, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *config.ConfigurationRecorder:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type config.ConfigurationRecorder not found", name)
+}
+
+// GetAllConfigConformancePackResources retrieves all config.ConformancePack items from an AWS CloudFormation template
+func (t *Template) GetAllConfigConformancePackResources() map[string]*config.ConformancePack {
+	results := map[string]*config.ConformancePack{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *config.ConformancePack:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetConfigConformancePackWithName retrieves all config.ConformancePack items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetConfigConformancePackWithName(name string) (*config.ConformancePack, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *config.ConformancePack:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type config.ConformancePack not found", name)
+}
+
+// GetAllConfigDeliveryChannelResources retrieves all config.DeliveryChannel items from an AWS CloudFormation template
+func (t *Template) GetAllConfigDeliveryChannelResources() map[string]*config.DeliveryChannel {
+	results := map[string]*config.DeliveryChannel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *config.DeliveryChannel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetConfigDeliveryChannelWithName retrieves all config.DeliveryChannel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetConfigDeliveryChannelWithName(name string) (*config.DeliveryChannel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *config.DeliveryChannel:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type config.DeliveryChannel not found", name)
+}
+
+// GetAllConfigOrganizationConfigRuleResources retrieves all config.OrganizationConfigRule items from an AWS CloudFormation template
+func (t *Template) GetAllConfigOrganizationConfigRuleResources() map[string]*config.OrganizationConfigRule {
+	results := map[string]*config.OrganizationConfigRule{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *config.OrganizationConfigRule:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetConfigOrganizationConfigRuleWithName retrieves all config.OrganizationConfigRule items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetConfigOrganizationConfigRuleWithName(name string) (*config.OrganizationConfigRule, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *config.OrganizationConfigRule:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type config.OrganizationConfigRule not found", name)
+}
+
+// GetAllConfigOrganizationConformancePackResources retrieves all config.OrganizationConformancePack items from an AWS CloudFormation template
+func (t *Template) GetAllConfigOrganizationConformancePackResources() map[string]*config.OrganizationConformancePack {
+	results := map[string]*config.OrganizationConformancePack{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *config.OrganizationConformancePack:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetConfigOrganizationConformancePackWithName retrieves all config.OrganizationConformancePack items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetConfigOrganizationConformancePackWithName(name string) (*config.OrganizationConformancePack, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *config.OrganizationConformancePack:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type config.OrganizationConformancePack not found", name)
+}
+
+// GetAllConfigRemediationConfigurationResources retrieves all config.RemediationConfiguration items from an AWS CloudFormation template
+func (t *Template) GetAllConfigRemediationConfigurationResources() map[string]*config.RemediationConfiguration {
+	results := map[string]*config.RemediationConfiguration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *config.RemediationConfiguration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetConfigRemediationConfigurationWithName retrieves all config.RemediationConfiguration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetConfigRemediationConfigurationWithName(name string) (*config.RemediationConfiguration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *config.RemediationConfiguration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type config.RemediationConfiguration not found", name)
+}
+
+// GetAllConfigStoredQueryResources retrieves all config.StoredQuery items from an AWS CloudFormation template
+func (t *Template) GetAllConfigStoredQueryResources() map[string]*config.StoredQuery {
+	results := map[string]*config.StoredQuery{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *config.StoredQuery:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetConfigStoredQueryWithName retrieves all config.StoredQuery items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetConfigStoredQueryWithName(name string) (*config.StoredQuery, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *config.StoredQuery:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type config.StoredQuery not found", name)
+}
+
+// GetAllConnectContactFlowResources retrieves all connect.ContactFlow items from an AWS CloudFormation template
+func (t *Template) GetAllConnectContactFlowResources() map[string]*connect.ContactFlow {
+	results := map[string]*connect.ContactFlow{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *connect.ContactFlow:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetConnectContactFlowWithName retrieves all connect.ContactFlow items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetConnectContactFlowWithName(name string) (*connect.ContactFlow, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *connect.ContactFlow:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type connect.ContactFlow not found", name)
+}
+
+// GetAllConnectContactFlowModuleResources retrieves all connect.ContactFlowModule items from an AWS CloudFormation template
+func (t *Template) GetAllConnectContactFlowModuleResources() map[string]*connect.ContactFlowModule {
+	results := map[string]*connect.ContactFlowModule{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *connect.ContactFlowModule:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetConnectContactFlowModuleWithName retrieves all connect.ContactFlowModule items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetConnectContactFlowModuleWithName(name string) (*connect.ContactFlowModule, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *connect.ContactFlowModule:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type connect.ContactFlowModule not found", name)
+}
+
+// GetAllConnectHoursOfOperationResources retrieves all connect.HoursOfOperation items from an AWS CloudFormation template
+func (t *Template) GetAllConnectHoursOfOperationResources() map[string]*connect.HoursOfOperation {
+	results := map[string]*connect.HoursOfOperation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *connect.HoursOfOperation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetConnectHoursOfOperationWithName retrieves all connect.HoursOfOperation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetConnectHoursOfOperationWithName(name string) (*connect.HoursOfOperation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *connect.HoursOfOperation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type connect.HoursOfOperation not found", name)
+}
+
+// GetAllConnectQuickConnectResources retrieves all connect.QuickConnect items from an AWS CloudFormation template
+func (t *Template) GetAllConnectQuickConnectResources() map[string]*connect.QuickConnect {
+	results := map[string]*connect.QuickConnect{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *connect.QuickConnect:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetConnectQuickConnectWithName retrieves all connect.QuickConnect items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetConnectQuickConnectWithName(name string) (*connect.QuickConnect, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *connect.QuickConnect:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type connect.QuickConnect not found", name)
+}
+
+// GetAllConnectUserResources retrieves all connect.User items from an AWS CloudFormation template
+func (t *Template) GetAllConnectUserResources() map[string]*connect.User {
+	results := map[string]*connect.User{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *connect.User:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetConnectUserWithName retrieves all connect.User items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetConnectUserWithName(name string) (*connect.User, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *connect.User:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type connect.User not found", name)
+}
+
+// GetAllConnectUserHierarchyGroupResources retrieves all connect.UserHierarchyGroup items from an AWS CloudFormation template
+func (t *Template) GetAllConnectUserHierarchyGroupResources() map[string]*connect.UserHierarchyGroup {
+	results := map[string]*connect.UserHierarchyGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *connect.UserHierarchyGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetConnectUserHierarchyGroupWithName retrieves all connect.UserHierarchyGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetConnectUserHierarchyGroupWithName(name string) (*connect.UserHierarchyGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *connect.UserHierarchyGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type connect.UserHierarchyGroup not found", name)
+}
+
+// GetAllCustomerProfilesDomainResources retrieves all customerprofiles.Domain items from an AWS CloudFormation template
+func (t *Template) GetAllCustomerProfilesDomainResources() map[string]*customerprofiles.Domain {
+	results := map[string]*customerprofiles.Domain{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *customerprofiles.Domain:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCustomerProfilesDomainWithName retrieves all customerprofiles.Domain items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCustomerProfilesDomainWithName(name string) (*customerprofiles.Domain, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *customerprofiles.Domain:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type customerprofiles.Domain not found", name)
+}
+
+// GetAllCustomerProfilesIntegrationResources retrieves all customerprofiles.Integration items from an AWS CloudFormation template
+func (t *Template) GetAllCustomerProfilesIntegrationResources() map[string]*customerprofiles.Integration {
+	results := map[string]*customerprofiles.Integration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *customerprofiles.Integration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCustomerProfilesIntegrationWithName retrieves all customerprofiles.Integration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCustomerProfilesIntegrationWithName(name string) (*customerprofiles.Integration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *customerprofiles.Integration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type customerprofiles.Integration not found", name)
+}
+
+// GetAllCustomerProfilesObjectTypeResources retrieves all customerprofiles.ObjectType items from an AWS CloudFormation template
+func (t *Template) GetAllCustomerProfilesObjectTypeResources() map[string]*customerprofiles.ObjectType {
+	results := map[string]*customerprofiles.ObjectType{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *customerprofiles.ObjectType:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCustomerProfilesObjectTypeWithName retrieves all customerprofiles.ObjectType items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCustomerProfilesObjectTypeWithName(name string) (*customerprofiles.ObjectType, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *customerprofiles.ObjectType:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type customerprofiles.ObjectType not found", name)
+}
+
+// GetAllDAXClusterResources retrieves all dax.Cluster items from an AWS CloudFormation template
+func (t *Template) GetAllDAXClusterResources() map[string]*dax.Cluster {
+	results := map[string]*dax.Cluster{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *dax.Cluster:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDAXClusterWithName retrieves all dax.Cluster items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDAXClusterWithName(name string) (*dax.Cluster, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *dax.Cluster:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type dax.Cluster not found", name)
+}
+
+// GetAllDAXParameterGroupResources retrieves all dax.ParameterGroup items from an AWS CloudFormation template
+func (t *Template) GetAllDAXParameterGroupResources() map[string]*dax.ParameterGroup {
+	results := map[string]*dax.ParameterGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *dax.ParameterGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDAXParameterGroupWithName retrieves all dax.ParameterGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDAXParameterGroupWithName(name string) (*dax.ParameterGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *dax.ParameterGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type dax.ParameterGroup not found", name)
+}
+
+// GetAllDAXSubnetGroupResources retrieves all dax.SubnetGroup items from an AWS CloudFormation template
+func (t *Template) GetAllDAXSubnetGroupResources() map[string]*dax.SubnetGroup {
+	results := map[string]*dax.SubnetGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *dax.SubnetGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDAXSubnetGroupWithName retrieves all dax.SubnetGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDAXSubnetGroupWithName(name string) (*dax.SubnetGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *dax.SubnetGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type dax.SubnetGroup not found", name)
+}
+
+// GetAllDLMLifecyclePolicyResources retrieves all dlm.LifecyclePolicy items from an AWS CloudFormation template
+func (t *Template) GetAllDLMLifecyclePolicyResources() map[string]*dlm.LifecyclePolicy {
+	results := map[string]*dlm.LifecyclePolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *dlm.LifecyclePolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDLMLifecyclePolicyWithName retrieves all dlm.LifecyclePolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDLMLifecyclePolicyWithName(name string) (*dlm.LifecyclePolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *dlm.LifecyclePolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type dlm.LifecyclePolicy not found", name)
+}
+
+// GetAllDMSCertificateResources retrieves all dms.Certificate items from an AWS CloudFormation template
+func (t *Template) GetAllDMSCertificateResources() map[string]*dms.Certificate {
+	results := map[string]*dms.Certificate{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *dms.Certificate:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDMSCertificateWithName retrieves all dms.Certificate items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDMSCertificateWithName(name string) (*dms.Certificate, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *dms.Certificate:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type dms.Certificate not found", name)
+}
+
+// GetAllDMSEndpointResources retrieves all dms.Endpoint items from an AWS CloudFormation template
+func (t *Template) GetAllDMSEndpointResources() map[string]*dms.Endpoint {
+	results := map[string]*dms.Endpoint{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *dms.Endpoint:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDMSEndpointWithName retrieves all dms.Endpoint items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDMSEndpointWithName(name string) (*dms.Endpoint, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *dms.Endpoint:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type dms.Endpoint not found", name)
+}
+
+// GetAllDMSEventSubscriptionResources retrieves all dms.EventSubscription items from an AWS CloudFormation template
+func (t *Template) GetAllDMSEventSubscriptionResources() map[string]*dms.EventSubscription {
+	results := map[string]*dms.EventSubscription{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *dms.EventSubscription:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDMSEventSubscriptionWithName retrieves all dms.EventSubscription items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDMSEventSubscriptionWithName(name string) (*dms.EventSubscription, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *dms.EventSubscription:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type dms.EventSubscription not found", name)
+}
+
+// GetAllDMSReplicationInstanceResources retrieves all dms.ReplicationInstance items from an AWS CloudFormation template
+func (t *Template) GetAllDMSReplicationInstanceResources() map[string]*dms.ReplicationInstance {
+	results := map[string]*dms.ReplicationInstance{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *dms.ReplicationInstance:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDMSReplicationInstanceWithName retrieves all dms.ReplicationInstance items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDMSReplicationInstanceWithName(name string) (*dms.ReplicationInstance, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *dms.ReplicationInstance:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type dms.ReplicationInstance not found", name)
+}
+
+// GetAllDMSReplicationSubnetGroupResources retrieves all dms.ReplicationSubnetGroup items from an AWS CloudFormation template
+func (t *Template) GetAllDMSReplicationSubnetGroupResources() map[string]*dms.ReplicationSubnetGroup {
+	results := map[string]*dms.ReplicationSubnetGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *dms.ReplicationSubnetGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDMSReplicationSubnetGroupWithName retrieves all dms.ReplicationSubnetGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDMSReplicationSubnetGroupWithName(name string) (*dms.ReplicationSubnetGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *dms.ReplicationSubnetGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type dms.ReplicationSubnetGroup not found", name)
+}
+
+// GetAllDMSReplicationTaskResources retrieves all dms.ReplicationTask items from an AWS CloudFormation template
+func (t *Template) GetAllDMSReplicationTaskResources() map[string]*dms.ReplicationTask {
+	results := map[string]*dms.ReplicationTask{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *dms.ReplicationTask:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDMSReplicationTaskWithName retrieves all dms.ReplicationTask items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDMSReplicationTaskWithName(name string) (*dms.ReplicationTask, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *dms.ReplicationTask:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type dms.ReplicationTask not found", name)
+}
+
+// GetAllDataBrewDatasetResources retrieves all databrew.Dataset items from an AWS CloudFormation template
+func (t *Template) GetAllDataBrewDatasetResources() map[string]*databrew.Dataset {
+	results := map[string]*databrew.Dataset{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *databrew.Dataset:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDataBrewDatasetWithName retrieves all databrew.Dataset items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDataBrewDatasetWithName(name string) (*databrew.Dataset, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *databrew.Dataset:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type databrew.Dataset not found", name)
+}
+
+// GetAllDataBrewJobResources retrieves all databrew.Job items from an AWS CloudFormation template
+func (t *Template) GetAllDataBrewJobResources() map[string]*databrew.Job {
+	results := map[string]*databrew.Job{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *databrew.Job:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDataBrewJobWithName retrieves all databrew.Job items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDataBrewJobWithName(name string) (*databrew.Job, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *databrew.Job:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type databrew.Job not found", name)
+}
+
+// GetAllDataBrewProjectResources retrieves all databrew.Project items from an AWS CloudFormation template
+func (t *Template) GetAllDataBrewProjectResources() map[string]*databrew.Project {
+	results := map[string]*databrew.Project{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *databrew.Project:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDataBrewProjectWithName retrieves all databrew.Project items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDataBrewProjectWithName(name string) (*databrew.Project, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *databrew.Project:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type databrew.Project not found", name)
+}
+
+// GetAllDataBrewRecipeResources retrieves all databrew.Recipe items from an AWS CloudFormation template
+func (t *Template) GetAllDataBrewRecipeResources() map[string]*databrew.Recipe {
+	results := map[string]*databrew.Recipe{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *databrew.Recipe:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDataBrewRecipeWithName retrieves all databrew.Recipe items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDataBrewRecipeWithName(name string) (*databrew.Recipe, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *databrew.Recipe:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type databrew.Recipe not found", name)
+}
+
+// GetAllDataBrewRulesetResources retrieves all databrew.Ruleset items from an AWS CloudFormation template
+func (t *Template) GetAllDataBrewRulesetResources() map[string]*databrew.Ruleset {
+	results := map[string]*databrew.Ruleset{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *databrew.Ruleset:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDataBrewRulesetWithName retrieves all databrew.Ruleset items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDataBrewRulesetWithName(name string) (*databrew.Ruleset, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *databrew.Ruleset:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type databrew.Ruleset not found", name)
+}
+
+// GetAllDataBrewScheduleResources retrieves all databrew.Schedule items from an AWS CloudFormation template
+func (t *Template) GetAllDataBrewScheduleResources() map[string]*databrew.Schedule {
+	results := map[string]*databrew.Schedule{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *databrew.Schedule:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDataBrewScheduleWithName retrieves all databrew.Schedule items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDataBrewScheduleWithName(name string) (*databrew.Schedule, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *databrew.Schedule:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type databrew.Schedule not found", name)
+}
+
+// GetAllDataPipelinePipelineResources retrieves all datapipeline.Pipeline items from an AWS CloudFormation template
+func (t *Template) GetAllDataPipelinePipelineResources() map[string]*datapipeline.Pipeline {
+	results := map[string]*datapipeline.Pipeline{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *datapipeline.Pipeline:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDataPipelinePipelineWithName retrieves all datapipeline.Pipeline items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDataPipelinePipelineWithName(name string) (*datapipeline.Pipeline, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *datapipeline.Pipeline:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type datapipeline.Pipeline not found", name)
+}
+
+// GetAllDataSyncAgentResources retrieves all datasync.Agent items from an AWS CloudFormation template
+func (t *Template) GetAllDataSyncAgentResources() map[string]*datasync.Agent {
+	results := map[string]*datasync.Agent{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *datasync.Agent:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDataSyncAgentWithName retrieves all datasync.Agent items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDataSyncAgentWithName(name string) (*datasync.Agent, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *datasync.Agent:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type datasync.Agent not found", name)
+}
+
+// GetAllDataSyncLocationEFSResources retrieves all datasync.LocationEFS items from an AWS CloudFormation template
+func (t *Template) GetAllDataSyncLocationEFSResources() map[string]*datasync.LocationEFS {
+	results := map[string]*datasync.LocationEFS{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *datasync.LocationEFS:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDataSyncLocationEFSWithName retrieves all datasync.LocationEFS items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDataSyncLocationEFSWithName(name string) (*datasync.LocationEFS, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *datasync.LocationEFS:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type datasync.LocationEFS not found", name)
+}
+
+// GetAllDataSyncLocationFSxWindowsResources retrieves all datasync.LocationFSxWindows items from an AWS CloudFormation template
+func (t *Template) GetAllDataSyncLocationFSxWindowsResources() map[string]*datasync.LocationFSxWindows {
+	results := map[string]*datasync.LocationFSxWindows{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *datasync.LocationFSxWindows:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDataSyncLocationFSxWindowsWithName retrieves all datasync.LocationFSxWindows items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDataSyncLocationFSxWindowsWithName(name string) (*datasync.LocationFSxWindows, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *datasync.LocationFSxWindows:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type datasync.LocationFSxWindows not found", name)
+}
+
+// GetAllDataSyncLocationHDFSResources retrieves all datasync.LocationHDFS items from an AWS CloudFormation template
+func (t *Template) GetAllDataSyncLocationHDFSResources() map[string]*datasync.LocationHDFS {
+	results := map[string]*datasync.LocationHDFS{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *datasync.LocationHDFS:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDataSyncLocationHDFSWithName retrieves all datasync.LocationHDFS items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDataSyncLocationHDFSWithName(name string) (*datasync.LocationHDFS, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *datasync.LocationHDFS:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type datasync.LocationHDFS not found", name)
+}
+
+// GetAllDataSyncLocationNFSResources retrieves all datasync.LocationNFS items from an AWS CloudFormation template
+func (t *Template) GetAllDataSyncLocationNFSResources() map[string]*datasync.LocationNFS {
+	results := map[string]*datasync.LocationNFS{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *datasync.LocationNFS:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDataSyncLocationNFSWithName retrieves all datasync.LocationNFS items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDataSyncLocationNFSWithName(name string) (*datasync.LocationNFS, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *datasync.LocationNFS:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type datasync.LocationNFS not found", name)
+}
+
+// GetAllDataSyncLocationObjectStorageResources retrieves all datasync.LocationObjectStorage items from an AWS CloudFormation template
+func (t *Template) GetAllDataSyncLocationObjectStorageResources() map[string]*datasync.LocationObjectStorage {
+	results := map[string]*datasync.LocationObjectStorage{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *datasync.LocationObjectStorage:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDataSyncLocationObjectStorageWithName retrieves all datasync.LocationObjectStorage items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDataSyncLocationObjectStorageWithName(name string) (*datasync.LocationObjectStorage, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *datasync.LocationObjectStorage:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type datasync.LocationObjectStorage not found", name)
+}
+
+// GetAllDataSyncLocationS3Resources retrieves all datasync.LocationS3 items from an AWS CloudFormation template
+func (t *Template) GetAllDataSyncLocationS3Resources() map[string]*datasync.LocationS3 {
+	results := map[string]*datasync.LocationS3{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *datasync.LocationS3:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDataSyncLocationS3WithName retrieves all datasync.LocationS3 items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDataSyncLocationS3WithName(name string) (*datasync.LocationS3, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *datasync.LocationS3:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type datasync.LocationS3 not found", name)
+}
+
+// GetAllDataSyncLocationSMBResources retrieves all datasync.LocationSMB items from an AWS CloudFormation template
+func (t *Template) GetAllDataSyncLocationSMBResources() map[string]*datasync.LocationSMB {
+	results := map[string]*datasync.LocationSMB{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *datasync.LocationSMB:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDataSyncLocationSMBWithName retrieves all datasync.LocationSMB items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDataSyncLocationSMBWithName(name string) (*datasync.LocationSMB, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *datasync.LocationSMB:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type datasync.LocationSMB not found", name)
+}
+
+// GetAllDataSyncTaskResources retrieves all datasync.Task items from an AWS CloudFormation template
+func (t *Template) GetAllDataSyncTaskResources() map[string]*datasync.Task {
+	results := map[string]*datasync.Task{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *datasync.Task:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDataSyncTaskWithName retrieves all datasync.Task items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDataSyncTaskWithName(name string) (*datasync.Task, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *datasync.Task:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type datasync.Task not found", name)
+}
+
+// GetAllDetectiveGraphResources retrieves all detective.Graph items from an AWS CloudFormation template
+func (t *Template) GetAllDetectiveGraphResources() map[string]*detective.Graph {
+	results := map[string]*detective.Graph{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *detective.Graph:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDetectiveGraphWithName retrieves all detective.Graph items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDetectiveGraphWithName(name string) (*detective.Graph, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *detective.Graph:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type detective.Graph not found", name)
+}
+
+// GetAllDetectiveMemberInvitationResources retrieves all detective.MemberInvitation items from an AWS CloudFormation template
+func (t *Template) GetAllDetectiveMemberInvitationResources() map[string]*detective.MemberInvitation {
+	results := map[string]*detective.MemberInvitation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *detective.MemberInvitation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDetectiveMemberInvitationWithName retrieves all detective.MemberInvitation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDetectiveMemberInvitationWithName(name string) (*detective.MemberInvitation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *detective.MemberInvitation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type detective.MemberInvitation not found", name)
+}
+
+// GetAllDevOpsGuruNotificationChannelResources retrieves all devopsguru.NotificationChannel items from an AWS CloudFormation template
+func (t *Template) GetAllDevOpsGuruNotificationChannelResources() map[string]*devopsguru.NotificationChannel {
+	results := map[string]*devopsguru.NotificationChannel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *devopsguru.NotificationChannel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDevOpsGuruNotificationChannelWithName retrieves all devopsguru.NotificationChannel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDevOpsGuruNotificationChannelWithName(name string) (*devopsguru.NotificationChannel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *devopsguru.NotificationChannel:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type devopsguru.NotificationChannel not found", name)
+}
+
+// GetAllDevOpsGuruResourceCollectionResources retrieves all devopsguru.ResourceCollection items from an AWS CloudFormation template
+func (t *Template) GetAllDevOpsGuruResourceCollectionResources() map[string]*devopsguru.ResourceCollection {
+	results := map[string]*devopsguru.ResourceCollection{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *devopsguru.ResourceCollection:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDevOpsGuruResourceCollectionWithName retrieves all devopsguru.ResourceCollection items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDevOpsGuruResourceCollectionWithName(name string) (*devopsguru.ResourceCollection, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *devopsguru.ResourceCollection:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type devopsguru.ResourceCollection not found", name)
+}
+
+// GetAllDirectoryServiceMicrosoftADResources retrieves all directoryservice.MicrosoftAD items from an AWS CloudFormation template
+func (t *Template) GetAllDirectoryServiceMicrosoftADResources() map[string]*directoryservice.MicrosoftAD {
+	results := map[string]*directoryservice.MicrosoftAD{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *directoryservice.MicrosoftAD:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDirectoryServiceMicrosoftADWithName retrieves all directoryservice.MicrosoftAD items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDirectoryServiceMicrosoftADWithName(name string) (*directoryservice.MicrosoftAD, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *directoryservice.MicrosoftAD:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type directoryservice.MicrosoftAD not found", name)
+}
+
+// GetAllDirectoryServiceSimpleADResources retrieves all directoryservice.SimpleAD items from an AWS CloudFormation template
+func (t *Template) GetAllDirectoryServiceSimpleADResources() map[string]*directoryservice.SimpleAD {
+	results := map[string]*directoryservice.SimpleAD{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *directoryservice.SimpleAD:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDirectoryServiceSimpleADWithName retrieves all directoryservice.SimpleAD items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDirectoryServiceSimpleADWithName(name string) (*directoryservice.SimpleAD, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *directoryservice.SimpleAD:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type directoryservice.SimpleAD not found", name)
+}
+
+// GetAllDocDBDBClusterResources retrieves all docdb.DBCluster items from an AWS CloudFormation template
+func (t *Template) GetAllDocDBDBClusterResources() map[string]*docdb.DBCluster {
+	results := map[string]*docdb.DBCluster{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *docdb.DBCluster:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDocDBDBClusterWithName retrieves all docdb.DBCluster items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDocDBDBClusterWithName(name string) (*docdb.DBCluster, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *docdb.DBCluster:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type docdb.DBCluster not found", name)
+}
+
+// GetAllDocDBDBClusterParameterGroupResources retrieves all docdb.DBClusterParameterGroup items from an AWS CloudFormation template
+func (t *Template) GetAllDocDBDBClusterParameterGroupResources() map[string]*docdb.DBClusterParameterGroup {
+	results := map[string]*docdb.DBClusterParameterGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *docdb.DBClusterParameterGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDocDBDBClusterParameterGroupWithName retrieves all docdb.DBClusterParameterGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDocDBDBClusterParameterGroupWithName(name string) (*docdb.DBClusterParameterGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *docdb.DBClusterParameterGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type docdb.DBClusterParameterGroup not found", name)
+}
+
+// GetAllDocDBDBInstanceResources retrieves all docdb.DBInstance items from an AWS CloudFormation template
+func (t *Template) GetAllDocDBDBInstanceResources() map[string]*docdb.DBInstance {
+	results := map[string]*docdb.DBInstance{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *docdb.DBInstance:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDocDBDBInstanceWithName retrieves all docdb.DBInstance items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDocDBDBInstanceWithName(name string) (*docdb.DBInstance, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *docdb.DBInstance:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type docdb.DBInstance not found", name)
+}
+
+// GetAllDocDBDBSubnetGroupResources retrieves all docdb.DBSubnetGroup items from an AWS CloudFormation template
+func (t *Template) GetAllDocDBDBSubnetGroupResources() map[string]*docdb.DBSubnetGroup {
+	results := map[string]*docdb.DBSubnetGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *docdb.DBSubnetGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDocDBDBSubnetGroupWithName retrieves all docdb.DBSubnetGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDocDBDBSubnetGroupWithName(name string) (*docdb.DBSubnetGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *docdb.DBSubnetGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type docdb.DBSubnetGroup not found", name)
+}
+
+// GetAllDynamoDBGlobalTableResources retrieves all dynamodb.GlobalTable items from an AWS CloudFormation template
+func (t *Template) GetAllDynamoDBGlobalTableResources() map[string]*dynamodb.GlobalTable {
+	results := map[string]*dynamodb.GlobalTable{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *dynamodb.GlobalTable:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDynamoDBGlobalTableWithName retrieves all dynamodb.GlobalTable items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDynamoDBGlobalTableWithName(name string) (*dynamodb.GlobalTable, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *dynamodb.GlobalTable:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type dynamodb.GlobalTable not found", name)
+}
+
+// GetAllDynamoDBTableResources retrieves all dynamodb.Table items from an AWS CloudFormation template
+func (t *Template) GetAllDynamoDBTableResources() map[string]*dynamodb.Table {
+	results := map[string]*dynamodb.Table{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *dynamodb.Table:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetDynamoDBTableWithName retrieves all dynamodb.Table items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetDynamoDBTableWithName(name string) (*dynamodb.Table, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *dynamodb.Table:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type dynamodb.Table not found", name)
+}
+
+// GetAllEC2CapacityReservationResources retrieves all ec2.CapacityReservation items from an AWS CloudFormation template
+func (t *Template) GetAllEC2CapacityReservationResources() map[string]*ec2.CapacityReservation {
+	results := map[string]*ec2.CapacityReservation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.CapacityReservation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2CapacityReservationWithName retrieves all ec2.CapacityReservation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2CapacityReservationWithName(name string) (*ec2.CapacityReservation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.CapacityReservation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.CapacityReservation not found", name)
+}
+
+// GetAllEC2CapacityReservationFleetResources retrieves all ec2.CapacityReservationFleet items from an AWS CloudFormation template
+func (t *Template) GetAllEC2CapacityReservationFleetResources() map[string]*ec2.CapacityReservationFleet {
+	results := map[string]*ec2.CapacityReservationFleet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.CapacityReservationFleet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2CapacityReservationFleetWithName retrieves all ec2.CapacityReservationFleet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2CapacityReservationFleetWithName(name string) (*ec2.CapacityReservationFleet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.CapacityReservationFleet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.CapacityReservationFleet not found", name)
+}
+
+// GetAllEC2CarrierGatewayResources retrieves all ec2.CarrierGateway items from an AWS CloudFormation template
+func (t *Template) GetAllEC2CarrierGatewayResources() map[string]*ec2.CarrierGateway {
+	results := map[string]*ec2.CarrierGateway{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.CarrierGateway:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2CarrierGatewayWithName retrieves all ec2.CarrierGateway items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2CarrierGatewayWithName(name string) (*ec2.CarrierGateway, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.CarrierGateway:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.CarrierGateway not found", name)
+}
+
+// GetAllEC2ClientVpnAuthorizationRuleResources retrieves all ec2.ClientVpnAuthorizationRule items from an AWS CloudFormation template
+func (t *Template) GetAllEC2ClientVpnAuthorizationRuleResources() map[string]*ec2.ClientVpnAuthorizationRule {
+	results := map[string]*ec2.ClientVpnAuthorizationRule{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.ClientVpnAuthorizationRule:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2ClientVpnAuthorizationRuleWithName retrieves all ec2.ClientVpnAuthorizationRule items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2ClientVpnAuthorizationRuleWithName(name string) (*ec2.ClientVpnAuthorizationRule, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.ClientVpnAuthorizationRule:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.ClientVpnAuthorizationRule not found", name)
+}
+
+// GetAllEC2ClientVpnEndpointResources retrieves all ec2.ClientVpnEndpoint items from an AWS CloudFormation template
+func (t *Template) GetAllEC2ClientVpnEndpointResources() map[string]*ec2.ClientVpnEndpoint {
+	results := map[string]*ec2.ClientVpnEndpoint{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.ClientVpnEndpoint:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2ClientVpnEndpointWithName retrieves all ec2.ClientVpnEndpoint items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2ClientVpnEndpointWithName(name string) (*ec2.ClientVpnEndpoint, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.ClientVpnEndpoint:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.ClientVpnEndpoint not found", name)
+}
+
+// GetAllEC2ClientVpnRouteResources retrieves all ec2.ClientVpnRoute items from an AWS CloudFormation template
+func (t *Template) GetAllEC2ClientVpnRouteResources() map[string]*ec2.ClientVpnRoute {
+	results := map[string]*ec2.ClientVpnRoute{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.ClientVpnRoute:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2ClientVpnRouteWithName retrieves all ec2.ClientVpnRoute items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2ClientVpnRouteWithName(name string) (*ec2.ClientVpnRoute, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.ClientVpnRoute:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.ClientVpnRoute not found", name)
+}
+
+// GetAllEC2ClientVpnTargetNetworkAssociationResources retrieves all ec2.ClientVpnTargetNetworkAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllEC2ClientVpnTargetNetworkAssociationResources() map[string]*ec2.ClientVpnTargetNetworkAssociation {
+	results := map[string]*ec2.ClientVpnTargetNetworkAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.ClientVpnTargetNetworkAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2ClientVpnTargetNetworkAssociationWithName retrieves all ec2.ClientVpnTargetNetworkAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2ClientVpnTargetNetworkAssociationWithName(name string) (*ec2.ClientVpnTargetNetworkAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.ClientVpnTargetNetworkAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.ClientVpnTargetNetworkAssociation not found", name)
+}
+
+// GetAllEC2CustomerGatewayResources retrieves all ec2.CustomerGateway items from an AWS CloudFormation template
+func (t *Template) GetAllEC2CustomerGatewayResources() map[string]*ec2.CustomerGateway {
+	results := map[string]*ec2.CustomerGateway{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.CustomerGateway:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2CustomerGatewayWithName retrieves all ec2.CustomerGateway items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2CustomerGatewayWithName(name string) (*ec2.CustomerGateway, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.CustomerGateway:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.CustomerGateway not found", name)
+}
+
+// GetAllEC2DHCPOptionsResources retrieves all ec2.DHCPOptions items from an AWS CloudFormation template
+func (t *Template) GetAllEC2DHCPOptionsResources() map[string]*ec2.DHCPOptions {
+	results := map[string]*ec2.DHCPOptions{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.DHCPOptions:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2DHCPOptionsWithName retrieves all ec2.DHCPOptions items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2DHCPOptionsWithName(name string) (*ec2.DHCPOptions, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.DHCPOptions:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.DHCPOptions not found", name)
+}
+
+// GetAllEC2EC2FleetResources retrieves all ec2.EC2Fleet items from an AWS CloudFormation template
+func (t *Template) GetAllEC2EC2FleetResources() map[string]*ec2.EC2Fleet {
+	results := map[string]*ec2.EC2Fleet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.EC2Fleet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2EC2FleetWithName retrieves all ec2.EC2Fleet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2EC2FleetWithName(name string) (*ec2.EC2Fleet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.EC2Fleet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.EC2Fleet not found", name)
+}
+
+// GetAllEC2EIPResources retrieves all ec2.EIP items from an AWS CloudFormation template
+func (t *Template) GetAllEC2EIPResources() map[string]*ec2.EIP {
+	results := map[string]*ec2.EIP{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.EIP:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2EIPWithName retrieves all ec2.EIP items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2EIPWithName(name string) (*ec2.EIP, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.EIP:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.EIP not found", name)
+}
+
+// GetAllEC2EIPAssociationResources retrieves all ec2.EIPAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllEC2EIPAssociationResources() map[string]*ec2.EIPAssociation {
+	results := map[string]*ec2.EIPAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.EIPAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2EIPAssociationWithName retrieves all ec2.EIPAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2EIPAssociationWithName(name string) (*ec2.EIPAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.EIPAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.EIPAssociation not found", name)
+}
+
+// GetAllEC2EgressOnlyInternetGatewayResources retrieves all ec2.EgressOnlyInternetGateway items from an AWS CloudFormation template
+func (t *Template) GetAllEC2EgressOnlyInternetGatewayResources() map[string]*ec2.EgressOnlyInternetGateway {
+	results := map[string]*ec2.EgressOnlyInternetGateway{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.EgressOnlyInternetGateway:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2EgressOnlyInternetGatewayWithName retrieves all ec2.EgressOnlyInternetGateway items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2EgressOnlyInternetGatewayWithName(name string) (*ec2.EgressOnlyInternetGateway, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.EgressOnlyInternetGateway:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.EgressOnlyInternetGateway not found", name)
+}
+
+// GetAllEC2EnclaveCertificateIamRoleAssociationResources retrieves all ec2.EnclaveCertificateIamRoleAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllEC2EnclaveCertificateIamRoleAssociationResources() map[string]*ec2.EnclaveCertificateIamRoleAssociation {
+	results := map[string]*ec2.EnclaveCertificateIamRoleAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.EnclaveCertificateIamRoleAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2EnclaveCertificateIamRoleAssociationWithName retrieves all ec2.EnclaveCertificateIamRoleAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2EnclaveCertificateIamRoleAssociationWithName(name string) (*ec2.EnclaveCertificateIamRoleAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.EnclaveCertificateIamRoleAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.EnclaveCertificateIamRoleAssociation not found", name)
+}
+
+// GetAllEC2FlowLogResources retrieves all ec2.FlowLog items from an AWS CloudFormation template
+func (t *Template) GetAllEC2FlowLogResources() map[string]*ec2.FlowLog {
+	results := map[string]*ec2.FlowLog{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.FlowLog:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2FlowLogWithName retrieves all ec2.FlowLog items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2FlowLogWithName(name string) (*ec2.FlowLog, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.FlowLog:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.FlowLog not found", name)
+}
+
+// GetAllEC2GatewayRouteTableAssociationResources retrieves all ec2.GatewayRouteTableAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllEC2GatewayRouteTableAssociationResources() map[string]*ec2.GatewayRouteTableAssociation {
+	results := map[string]*ec2.GatewayRouteTableAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.GatewayRouteTableAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2GatewayRouteTableAssociationWithName retrieves all ec2.GatewayRouteTableAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2GatewayRouteTableAssociationWithName(name string) (*ec2.GatewayRouteTableAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.GatewayRouteTableAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.GatewayRouteTableAssociation not found", name)
+}
+
+// GetAllEC2HostResources retrieves all ec2.Host items from an AWS CloudFormation template
+func (t *Template) GetAllEC2HostResources() map[string]*ec2.Host {
+	results := map[string]*ec2.Host{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.Host:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2HostWithName retrieves all ec2.Host items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2HostWithName(name string) (*ec2.Host, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.Host:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.Host not found", name)
+}
+
+// GetAllEC2IPAMResources retrieves all ec2.IPAM items from an AWS CloudFormation template
+func (t *Template) GetAllEC2IPAMResources() map[string]*ec2.IPAM {
+	results := map[string]*ec2.IPAM{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.IPAM:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2IPAMWithName retrieves all ec2.IPAM items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2IPAMWithName(name string) (*ec2.IPAM, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.IPAM:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.IPAM not found", name)
+}
+
+// GetAllEC2IPAMAllocationResources retrieves all ec2.IPAMAllocation items from an AWS CloudFormation template
+func (t *Template) GetAllEC2IPAMAllocationResources() map[string]*ec2.IPAMAllocation {
+	results := map[string]*ec2.IPAMAllocation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.IPAMAllocation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2IPAMAllocationWithName retrieves all ec2.IPAMAllocation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2IPAMAllocationWithName(name string) (*ec2.IPAMAllocation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.IPAMAllocation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.IPAMAllocation not found", name)
+}
+
+// GetAllEC2IPAMPoolResources retrieves all ec2.IPAMPool items from an AWS CloudFormation template
+func (t *Template) GetAllEC2IPAMPoolResources() map[string]*ec2.IPAMPool {
+	results := map[string]*ec2.IPAMPool{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.IPAMPool:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2IPAMPoolWithName retrieves all ec2.IPAMPool items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2IPAMPoolWithName(name string) (*ec2.IPAMPool, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.IPAMPool:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.IPAMPool not found", name)
+}
+
+// GetAllEC2IPAMScopeResources retrieves all ec2.IPAMScope items from an AWS CloudFormation template
+func (t *Template) GetAllEC2IPAMScopeResources() map[string]*ec2.IPAMScope {
+	results := map[string]*ec2.IPAMScope{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.IPAMScope:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2IPAMScopeWithName retrieves all ec2.IPAMScope items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2IPAMScopeWithName(name string) (*ec2.IPAMScope, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.IPAMScope:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.IPAMScope not found", name)
+}
+
+// GetAllEC2InstanceResources retrieves all ec2.Instance items from an AWS CloudFormation template
+func (t *Template) GetAllEC2InstanceResources() map[string]*ec2.Instance {
+	results := map[string]*ec2.Instance{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.Instance:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2InstanceWithName retrieves all ec2.Instance items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2InstanceWithName(name string) (*ec2.Instance, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.Instance:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.Instance not found", name)
+}
+
+// GetAllEC2InternetGatewayResources retrieves all ec2.InternetGateway items from an AWS CloudFormation template
+func (t *Template) GetAllEC2InternetGatewayResources() map[string]*ec2.InternetGateway {
+	results := map[string]*ec2.InternetGateway{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.InternetGateway:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2InternetGatewayWithName retrieves all ec2.InternetGateway items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2InternetGatewayWithName(name string) (*ec2.InternetGateway, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.InternetGateway:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.InternetGateway not found", name)
+}
+
+// GetAllEC2LaunchTemplateResources retrieves all ec2.LaunchTemplate items from an AWS CloudFormation template
+func (t *Template) GetAllEC2LaunchTemplateResources() map[string]*ec2.LaunchTemplate {
+	results := map[string]*ec2.LaunchTemplate{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.LaunchTemplate:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2LaunchTemplateWithName retrieves all ec2.LaunchTemplate items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2LaunchTemplateWithName(name string) (*ec2.LaunchTemplate, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.LaunchTemplate:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.LaunchTemplate not found", name)
+}
+
+// GetAllEC2LocalGatewayRouteResources retrieves all ec2.LocalGatewayRoute items from an AWS CloudFormation template
+func (t *Template) GetAllEC2LocalGatewayRouteResources() map[string]*ec2.LocalGatewayRoute {
+	results := map[string]*ec2.LocalGatewayRoute{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.LocalGatewayRoute:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2LocalGatewayRouteWithName retrieves all ec2.LocalGatewayRoute items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2LocalGatewayRouteWithName(name string) (*ec2.LocalGatewayRoute, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.LocalGatewayRoute:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.LocalGatewayRoute not found", name)
+}
+
+// GetAllEC2LocalGatewayRouteTableVPCAssociationResources retrieves all ec2.LocalGatewayRouteTableVPCAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllEC2LocalGatewayRouteTableVPCAssociationResources() map[string]*ec2.LocalGatewayRouteTableVPCAssociation {
+	results := map[string]*ec2.LocalGatewayRouteTableVPCAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.LocalGatewayRouteTableVPCAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2LocalGatewayRouteTableVPCAssociationWithName retrieves all ec2.LocalGatewayRouteTableVPCAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2LocalGatewayRouteTableVPCAssociationWithName(name string) (*ec2.LocalGatewayRouteTableVPCAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.LocalGatewayRouteTableVPCAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.LocalGatewayRouteTableVPCAssociation not found", name)
+}
+
+// GetAllEC2NatGatewayResources retrieves all ec2.NatGateway items from an AWS CloudFormation template
+func (t *Template) GetAllEC2NatGatewayResources() map[string]*ec2.NatGateway {
+	results := map[string]*ec2.NatGateway{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.NatGateway:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2NatGatewayWithName retrieves all ec2.NatGateway items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2NatGatewayWithName(name string) (*ec2.NatGateway, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.NatGateway:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.NatGateway not found", name)
+}
+
+// GetAllEC2NetworkAclResources retrieves all ec2.NetworkAcl items from an AWS CloudFormation template
+func (t *Template) GetAllEC2NetworkAclResources() map[string]*ec2.NetworkAcl {
+	results := map[string]*ec2.NetworkAcl{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.NetworkAcl:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2NetworkAclWithName retrieves all ec2.NetworkAcl items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2NetworkAclWithName(name string) (*ec2.NetworkAcl, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.NetworkAcl:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.NetworkAcl not found", name)
+}
+
+// GetAllEC2NetworkAclEntryResources retrieves all ec2.NetworkAclEntry items from an AWS CloudFormation template
+func (t *Template) GetAllEC2NetworkAclEntryResources() map[string]*ec2.NetworkAclEntry {
+	results := map[string]*ec2.NetworkAclEntry{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.NetworkAclEntry:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2NetworkAclEntryWithName retrieves all ec2.NetworkAclEntry items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2NetworkAclEntryWithName(name string) (*ec2.NetworkAclEntry, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.NetworkAclEntry:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.NetworkAclEntry not found", name)
+}
+
+// GetAllEC2NetworkInsightsAnalysisResources retrieves all ec2.NetworkInsightsAnalysis items from an AWS CloudFormation template
+func (t *Template) GetAllEC2NetworkInsightsAnalysisResources() map[string]*ec2.NetworkInsightsAnalysis {
+	results := map[string]*ec2.NetworkInsightsAnalysis{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.NetworkInsightsAnalysis:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2NetworkInsightsAnalysisWithName retrieves all ec2.NetworkInsightsAnalysis items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2NetworkInsightsAnalysisWithName(name string) (*ec2.NetworkInsightsAnalysis, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.NetworkInsightsAnalysis:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.NetworkInsightsAnalysis not found", name)
+}
+
+// GetAllEC2NetworkInsightsPathResources retrieves all ec2.NetworkInsightsPath items from an AWS CloudFormation template
+func (t *Template) GetAllEC2NetworkInsightsPathResources() map[string]*ec2.NetworkInsightsPath {
+	results := map[string]*ec2.NetworkInsightsPath{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.NetworkInsightsPath:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2NetworkInsightsPathWithName retrieves all ec2.NetworkInsightsPath items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2NetworkInsightsPathWithName(name string) (*ec2.NetworkInsightsPath, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.NetworkInsightsPath:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.NetworkInsightsPath not found", name)
+}
+
+// GetAllEC2NetworkInterfaceResources retrieves all ec2.NetworkInterface items from an AWS CloudFormation template
+func (t *Template) GetAllEC2NetworkInterfaceResources() map[string]*ec2.NetworkInterface {
+	results := map[string]*ec2.NetworkInterface{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.NetworkInterface:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2NetworkInterfaceWithName retrieves all ec2.NetworkInterface items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2NetworkInterfaceWithName(name string) (*ec2.NetworkInterface, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.NetworkInterface:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.NetworkInterface not found", name)
+}
+
+// GetAllEC2NetworkInterfaceAttachmentResources retrieves all ec2.NetworkInterfaceAttachment items from an AWS CloudFormation template
+func (t *Template) GetAllEC2NetworkInterfaceAttachmentResources() map[string]*ec2.NetworkInterfaceAttachment {
+	results := map[string]*ec2.NetworkInterfaceAttachment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.NetworkInterfaceAttachment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2NetworkInterfaceAttachmentWithName retrieves all ec2.NetworkInterfaceAttachment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2NetworkInterfaceAttachmentWithName(name string) (*ec2.NetworkInterfaceAttachment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.NetworkInterfaceAttachment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.NetworkInterfaceAttachment not found", name)
+}
+
+// GetAllEC2NetworkInterfacePermissionResources retrieves all ec2.NetworkInterfacePermission items from an AWS CloudFormation template
+func (t *Template) GetAllEC2NetworkInterfacePermissionResources() map[string]*ec2.NetworkInterfacePermission {
+	results := map[string]*ec2.NetworkInterfacePermission{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.NetworkInterfacePermission:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2NetworkInterfacePermissionWithName retrieves all ec2.NetworkInterfacePermission items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2NetworkInterfacePermissionWithName(name string) (*ec2.NetworkInterfacePermission, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.NetworkInterfacePermission:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.NetworkInterfacePermission not found", name)
+}
+
+// GetAllEC2PlacementGroupResources retrieves all ec2.PlacementGroup items from an AWS CloudFormation template
+func (t *Template) GetAllEC2PlacementGroupResources() map[string]*ec2.PlacementGroup {
+	results := map[string]*ec2.PlacementGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.PlacementGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2PlacementGroupWithName retrieves all ec2.PlacementGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2PlacementGroupWithName(name string) (*ec2.PlacementGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.PlacementGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.PlacementGroup not found", name)
+}
+
+// GetAllEC2PrefixListResources retrieves all ec2.PrefixList items from an AWS CloudFormation template
+func (t *Template) GetAllEC2PrefixListResources() map[string]*ec2.PrefixList {
+	results := map[string]*ec2.PrefixList{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.PrefixList:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2PrefixListWithName retrieves all ec2.PrefixList items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2PrefixListWithName(name string) (*ec2.PrefixList, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.PrefixList:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.PrefixList not found", name)
+}
+
+// GetAllEC2RouteResources retrieves all ec2.Route items from an AWS CloudFormation template
+func (t *Template) GetAllEC2RouteResources() map[string]*ec2.Route {
+	results := map[string]*ec2.Route{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.Route:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2RouteWithName retrieves all ec2.Route items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2RouteWithName(name string) (*ec2.Route, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.Route:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.Route not found", name)
+}
+
+// GetAllEC2RouteTableResources retrieves all ec2.RouteTable items from an AWS CloudFormation template
+func (t *Template) GetAllEC2RouteTableResources() map[string]*ec2.RouteTable {
+	results := map[string]*ec2.RouteTable{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.RouteTable:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2RouteTableWithName retrieves all ec2.RouteTable items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2RouteTableWithName(name string) (*ec2.RouteTable, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.RouteTable:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.RouteTable not found", name)
+}
+
+// GetAllEC2SecurityGroupResources retrieves all ec2.SecurityGroup items from an AWS CloudFormation template
+func (t *Template) GetAllEC2SecurityGroupResources() map[string]*ec2.SecurityGroup {
+	results := map[string]*ec2.SecurityGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.SecurityGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2SecurityGroupWithName retrieves all ec2.SecurityGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2SecurityGroupWithName(name string) (*ec2.SecurityGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.SecurityGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.SecurityGroup not found", name)
+}
+
+// GetAllEC2SecurityGroupEgressResources retrieves all ec2.SecurityGroupEgress items from an AWS CloudFormation template
+func (t *Template) GetAllEC2SecurityGroupEgressResources() map[string]*ec2.SecurityGroupEgress {
+	results := map[string]*ec2.SecurityGroupEgress{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.SecurityGroupEgress:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2SecurityGroupEgressWithName retrieves all ec2.SecurityGroupEgress items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2SecurityGroupEgressWithName(name string) (*ec2.SecurityGroupEgress, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.SecurityGroupEgress:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.SecurityGroupEgress not found", name)
+}
+
+// GetAllEC2SecurityGroupIngressResources retrieves all ec2.SecurityGroupIngress items from an AWS CloudFormation template
+func (t *Template) GetAllEC2SecurityGroupIngressResources() map[string]*ec2.SecurityGroupIngress {
+	results := map[string]*ec2.SecurityGroupIngress{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.SecurityGroupIngress:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2SecurityGroupIngressWithName retrieves all ec2.SecurityGroupIngress items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2SecurityGroupIngressWithName(name string) (*ec2.SecurityGroupIngress, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.SecurityGroupIngress:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.SecurityGroupIngress not found", name)
+}
+
+// GetAllEC2SpotFleetResources retrieves all ec2.SpotFleet items from an AWS CloudFormation template
+func (t *Template) GetAllEC2SpotFleetResources() map[string]*ec2.SpotFleet {
+	results := map[string]*ec2.SpotFleet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.SpotFleet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2SpotFleetWithName retrieves all ec2.SpotFleet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2SpotFleetWithName(name string) (*ec2.SpotFleet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.SpotFleet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.SpotFleet not found", name)
+}
+
+// GetAllEC2SubnetResources retrieves all ec2.Subnet items from an AWS CloudFormation template
+func (t *Template) GetAllEC2SubnetResources() map[string]*ec2.Subnet {
+	results := map[string]*ec2.Subnet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.Subnet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2SubnetWithName retrieves all ec2.Subnet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2SubnetWithName(name string) (*ec2.Subnet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.Subnet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.Subnet not found", name)
+}
+
+// GetAllEC2SubnetCidrBlockResources retrieves all ec2.SubnetCidrBlock items from an AWS CloudFormation template
+func (t *Template) GetAllEC2SubnetCidrBlockResources() map[string]*ec2.SubnetCidrBlock {
+	results := map[string]*ec2.SubnetCidrBlock{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.SubnetCidrBlock:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2SubnetCidrBlockWithName retrieves all ec2.SubnetCidrBlock items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2SubnetCidrBlockWithName(name string) (*ec2.SubnetCidrBlock, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.SubnetCidrBlock:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.SubnetCidrBlock not found", name)
+}
+
+// GetAllEC2SubnetNetworkAclAssociationResources retrieves all ec2.SubnetNetworkAclAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllEC2SubnetNetworkAclAssociationResources() map[string]*ec2.SubnetNetworkAclAssociation {
+	results := map[string]*ec2.SubnetNetworkAclAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.SubnetNetworkAclAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2SubnetNetworkAclAssociationWithName retrieves all ec2.SubnetNetworkAclAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2SubnetNetworkAclAssociationWithName(name string) (*ec2.SubnetNetworkAclAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.SubnetNetworkAclAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.SubnetNetworkAclAssociation not found", name)
+}
+
+// GetAllEC2SubnetRouteTableAssociationResources retrieves all ec2.SubnetRouteTableAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllEC2SubnetRouteTableAssociationResources() map[string]*ec2.SubnetRouteTableAssociation {
+	results := map[string]*ec2.SubnetRouteTableAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.SubnetRouteTableAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2SubnetRouteTableAssociationWithName retrieves all ec2.SubnetRouteTableAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2SubnetRouteTableAssociationWithName(name string) (*ec2.SubnetRouteTableAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.SubnetRouteTableAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.SubnetRouteTableAssociation not found", name)
+}
+
+// GetAllEC2TrafficMirrorFilterResources retrieves all ec2.TrafficMirrorFilter items from an AWS CloudFormation template
+func (t *Template) GetAllEC2TrafficMirrorFilterResources() map[string]*ec2.TrafficMirrorFilter {
+	results := map[string]*ec2.TrafficMirrorFilter{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.TrafficMirrorFilter:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2TrafficMirrorFilterWithName retrieves all ec2.TrafficMirrorFilter items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2TrafficMirrorFilterWithName(name string) (*ec2.TrafficMirrorFilter, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.TrafficMirrorFilter:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.TrafficMirrorFilter not found", name)
+}
+
+// GetAllEC2TrafficMirrorFilterRuleResources retrieves all ec2.TrafficMirrorFilterRule items from an AWS CloudFormation template
+func (t *Template) GetAllEC2TrafficMirrorFilterRuleResources() map[string]*ec2.TrafficMirrorFilterRule {
+	results := map[string]*ec2.TrafficMirrorFilterRule{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.TrafficMirrorFilterRule:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2TrafficMirrorFilterRuleWithName retrieves all ec2.TrafficMirrorFilterRule items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2TrafficMirrorFilterRuleWithName(name string) (*ec2.TrafficMirrorFilterRule, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.TrafficMirrorFilterRule:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.TrafficMirrorFilterRule not found", name)
+}
+
+// GetAllEC2TrafficMirrorSessionResources retrieves all ec2.TrafficMirrorSession items from an AWS CloudFormation template
+func (t *Template) GetAllEC2TrafficMirrorSessionResources() map[string]*ec2.TrafficMirrorSession {
+	results := map[string]*ec2.TrafficMirrorSession{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.TrafficMirrorSession:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2TrafficMirrorSessionWithName retrieves all ec2.TrafficMirrorSession items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2TrafficMirrorSessionWithName(name string) (*ec2.TrafficMirrorSession, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.TrafficMirrorSession:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.TrafficMirrorSession not found", name)
+}
+
+// GetAllEC2TrafficMirrorTargetResources retrieves all ec2.TrafficMirrorTarget items from an AWS CloudFormation template
+func (t *Template) GetAllEC2TrafficMirrorTargetResources() map[string]*ec2.TrafficMirrorTarget {
+	results := map[string]*ec2.TrafficMirrorTarget{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.TrafficMirrorTarget:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2TrafficMirrorTargetWithName retrieves all ec2.TrafficMirrorTarget items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2TrafficMirrorTargetWithName(name string) (*ec2.TrafficMirrorTarget, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.TrafficMirrorTarget:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.TrafficMirrorTarget not found", name)
+}
+
+// GetAllEC2TransitGatewayResources retrieves all ec2.TransitGateway items from an AWS CloudFormation template
+func (t *Template) GetAllEC2TransitGatewayResources() map[string]*ec2.TransitGateway {
+	results := map[string]*ec2.TransitGateway{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGateway:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2TransitGatewayWithName retrieves all ec2.TransitGateway items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2TransitGatewayWithName(name string) (*ec2.TransitGateway, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGateway:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.TransitGateway not found", name)
+}
+
+// GetAllEC2TransitGatewayAttachmentResources retrieves all ec2.TransitGatewayAttachment items from an AWS CloudFormation template
+func (t *Template) GetAllEC2TransitGatewayAttachmentResources() map[string]*ec2.TransitGatewayAttachment {
+	results := map[string]*ec2.TransitGatewayAttachment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayAttachment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2TransitGatewayAttachmentWithName retrieves all ec2.TransitGatewayAttachment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2TransitGatewayAttachmentWithName(name string) (*ec2.TransitGatewayAttachment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayAttachment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.TransitGatewayAttachment not found", name)
+}
+
+// GetAllEC2TransitGatewayConnectResources retrieves all ec2.TransitGatewayConnect items from an AWS CloudFormation template
+func (t *Template) GetAllEC2TransitGatewayConnectResources() map[string]*ec2.TransitGatewayConnect {
+	results := map[string]*ec2.TransitGatewayConnect{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayConnect:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2TransitGatewayConnectWithName retrieves all ec2.TransitGatewayConnect items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2TransitGatewayConnectWithName(name string) (*ec2.TransitGatewayConnect, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayConnect:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.TransitGatewayConnect not found", name)
+}
+
+// GetAllEC2TransitGatewayMulticastDomainResources retrieves all ec2.TransitGatewayMulticastDomain items from an AWS CloudFormation template
+func (t *Template) GetAllEC2TransitGatewayMulticastDomainResources() map[string]*ec2.TransitGatewayMulticastDomain {
+	results := map[string]*ec2.TransitGatewayMulticastDomain{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayMulticastDomain:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2TransitGatewayMulticastDomainWithName retrieves all ec2.TransitGatewayMulticastDomain items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2TransitGatewayMulticastDomainWithName(name string) (*ec2.TransitGatewayMulticastDomain, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayMulticastDomain:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.TransitGatewayMulticastDomain not found", name)
+}
+
+// GetAllEC2TransitGatewayMulticastDomainAssociationResources retrieves all ec2.TransitGatewayMulticastDomainAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllEC2TransitGatewayMulticastDomainAssociationResources() map[string]*ec2.TransitGatewayMulticastDomainAssociation {
+	results := map[string]*ec2.TransitGatewayMulticastDomainAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayMulticastDomainAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2TransitGatewayMulticastDomainAssociationWithName retrieves all ec2.TransitGatewayMulticastDomainAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2TransitGatewayMulticastDomainAssociationWithName(name string) (*ec2.TransitGatewayMulticastDomainAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayMulticastDomainAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.TransitGatewayMulticastDomainAssociation not found", name)
+}
+
+// GetAllEC2TransitGatewayMulticastGroupMemberResources retrieves all ec2.TransitGatewayMulticastGroupMember items from an AWS CloudFormation template
+func (t *Template) GetAllEC2TransitGatewayMulticastGroupMemberResources() map[string]*ec2.TransitGatewayMulticastGroupMember {
+	results := map[string]*ec2.TransitGatewayMulticastGroupMember{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayMulticastGroupMember:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2TransitGatewayMulticastGroupMemberWithName retrieves all ec2.TransitGatewayMulticastGroupMember items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2TransitGatewayMulticastGroupMemberWithName(name string) (*ec2.TransitGatewayMulticastGroupMember, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayMulticastGroupMember:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.TransitGatewayMulticastGroupMember not found", name)
+}
+
+// GetAllEC2TransitGatewayMulticastGroupSourceResources retrieves all ec2.TransitGatewayMulticastGroupSource items from an AWS CloudFormation template
+func (t *Template) GetAllEC2TransitGatewayMulticastGroupSourceResources() map[string]*ec2.TransitGatewayMulticastGroupSource {
+	results := map[string]*ec2.TransitGatewayMulticastGroupSource{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayMulticastGroupSource:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2TransitGatewayMulticastGroupSourceWithName retrieves all ec2.TransitGatewayMulticastGroupSource items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2TransitGatewayMulticastGroupSourceWithName(name string) (*ec2.TransitGatewayMulticastGroupSource, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayMulticastGroupSource:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.TransitGatewayMulticastGroupSource not found", name)
+}
+
+// GetAllEC2TransitGatewayPeeringAttachmentResources retrieves all ec2.TransitGatewayPeeringAttachment items from an AWS CloudFormation template
+func (t *Template) GetAllEC2TransitGatewayPeeringAttachmentResources() map[string]*ec2.TransitGatewayPeeringAttachment {
+	results := map[string]*ec2.TransitGatewayPeeringAttachment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayPeeringAttachment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2TransitGatewayPeeringAttachmentWithName retrieves all ec2.TransitGatewayPeeringAttachment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2TransitGatewayPeeringAttachmentWithName(name string) (*ec2.TransitGatewayPeeringAttachment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayPeeringAttachment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.TransitGatewayPeeringAttachment not found", name)
+}
+
+// GetAllEC2TransitGatewayRouteResources retrieves all ec2.TransitGatewayRoute items from an AWS CloudFormation template
+func (t *Template) GetAllEC2TransitGatewayRouteResources() map[string]*ec2.TransitGatewayRoute {
+	results := map[string]*ec2.TransitGatewayRoute{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayRoute:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2TransitGatewayRouteWithName retrieves all ec2.TransitGatewayRoute items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2TransitGatewayRouteWithName(name string) (*ec2.TransitGatewayRoute, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayRoute:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.TransitGatewayRoute not found", name)
+}
+
+// GetAllEC2TransitGatewayRouteTableResources retrieves all ec2.TransitGatewayRouteTable items from an AWS CloudFormation template
+func (t *Template) GetAllEC2TransitGatewayRouteTableResources() map[string]*ec2.TransitGatewayRouteTable {
+	results := map[string]*ec2.TransitGatewayRouteTable{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayRouteTable:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2TransitGatewayRouteTableWithName retrieves all ec2.TransitGatewayRouteTable items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2TransitGatewayRouteTableWithName(name string) (*ec2.TransitGatewayRouteTable, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayRouteTable:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.TransitGatewayRouteTable not found", name)
+}
+
+// GetAllEC2TransitGatewayRouteTableAssociationResources retrieves all ec2.TransitGatewayRouteTableAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllEC2TransitGatewayRouteTableAssociationResources() map[string]*ec2.TransitGatewayRouteTableAssociation {
+	results := map[string]*ec2.TransitGatewayRouteTableAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayRouteTableAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2TransitGatewayRouteTableAssociationWithName retrieves all ec2.TransitGatewayRouteTableAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2TransitGatewayRouteTableAssociationWithName(name string) (*ec2.TransitGatewayRouteTableAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayRouteTableAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.TransitGatewayRouteTableAssociation not found", name)
+}
+
+// GetAllEC2TransitGatewayRouteTablePropagationResources retrieves all ec2.TransitGatewayRouteTablePropagation items from an AWS CloudFormation template
+func (t *Template) GetAllEC2TransitGatewayRouteTablePropagationResources() map[string]*ec2.TransitGatewayRouteTablePropagation {
+	results := map[string]*ec2.TransitGatewayRouteTablePropagation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayRouteTablePropagation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2TransitGatewayRouteTablePropagationWithName retrieves all ec2.TransitGatewayRouteTablePropagation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2TransitGatewayRouteTablePropagationWithName(name string) (*ec2.TransitGatewayRouteTablePropagation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayRouteTablePropagation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.TransitGatewayRouteTablePropagation not found", name)
+}
+
+// GetAllEC2TransitGatewayVpcAttachmentResources retrieves all ec2.TransitGatewayVpcAttachment items from an AWS CloudFormation template
+func (t *Template) GetAllEC2TransitGatewayVpcAttachmentResources() map[string]*ec2.TransitGatewayVpcAttachment {
+	results := map[string]*ec2.TransitGatewayVpcAttachment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayVpcAttachment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2TransitGatewayVpcAttachmentWithName retrieves all ec2.TransitGatewayVpcAttachment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2TransitGatewayVpcAttachmentWithName(name string) (*ec2.TransitGatewayVpcAttachment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.TransitGatewayVpcAttachment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.TransitGatewayVpcAttachment not found", name)
+}
+
+// GetAllEC2VPCResources retrieves all ec2.VPC items from an AWS CloudFormation template
+func (t *Template) GetAllEC2VPCResources() map[string]*ec2.VPC {
+	results := map[string]*ec2.VPC{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.VPC:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2VPCWithName retrieves all ec2.VPC items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2VPCWithName(name string) (*ec2.VPC, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.VPC:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.VPC not found", name)
+}
+
+// GetAllEC2VPCCidrBlockResources retrieves all ec2.VPCCidrBlock items from an AWS CloudFormation template
+func (t *Template) GetAllEC2VPCCidrBlockResources() map[string]*ec2.VPCCidrBlock {
+	results := map[string]*ec2.VPCCidrBlock{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.VPCCidrBlock:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2VPCCidrBlockWithName retrieves all ec2.VPCCidrBlock items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2VPCCidrBlockWithName(name string) (*ec2.VPCCidrBlock, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.VPCCidrBlock:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.VPCCidrBlock not found", name)
+}
+
+// GetAllEC2VPCDHCPOptionsAssociationResources retrieves all ec2.VPCDHCPOptionsAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllEC2VPCDHCPOptionsAssociationResources() map[string]*ec2.VPCDHCPOptionsAssociation {
+	results := map[string]*ec2.VPCDHCPOptionsAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.VPCDHCPOptionsAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2VPCDHCPOptionsAssociationWithName retrieves all ec2.VPCDHCPOptionsAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2VPCDHCPOptionsAssociationWithName(name string) (*ec2.VPCDHCPOptionsAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.VPCDHCPOptionsAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.VPCDHCPOptionsAssociation not found", name)
+}
+
+// GetAllEC2VPCEndpointResources retrieves all ec2.VPCEndpoint items from an AWS CloudFormation template
+func (t *Template) GetAllEC2VPCEndpointResources() map[string]*ec2.VPCEndpoint {
+	results := map[string]*ec2.VPCEndpoint{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.VPCEndpoint:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2VPCEndpointWithName retrieves all ec2.VPCEndpoint items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2VPCEndpointWithName(name string) (*ec2.VPCEndpoint, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.VPCEndpoint:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.VPCEndpoint not found", name)
+}
+
+// GetAllEC2VPCEndpointConnectionNotificationResources retrieves all ec2.VPCEndpointConnectionNotification items from an AWS CloudFormation template
+func (t *Template) GetAllEC2VPCEndpointConnectionNotificationResources() map[string]*ec2.VPCEndpointConnectionNotification {
+	results := map[string]*ec2.VPCEndpointConnectionNotification{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.VPCEndpointConnectionNotification:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2VPCEndpointConnectionNotificationWithName retrieves all ec2.VPCEndpointConnectionNotification items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2VPCEndpointConnectionNotificationWithName(name string) (*ec2.VPCEndpointConnectionNotification, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.VPCEndpointConnectionNotification:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.VPCEndpointConnectionNotification not found", name)
+}
+
+// GetAllEC2VPCEndpointServiceResources retrieves all ec2.VPCEndpointService items from an AWS CloudFormation template
+func (t *Template) GetAllEC2VPCEndpointServiceResources() map[string]*ec2.VPCEndpointService {
+	results := map[string]*ec2.VPCEndpointService{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.VPCEndpointService:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2VPCEndpointServiceWithName retrieves all ec2.VPCEndpointService items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2VPCEndpointServiceWithName(name string) (*ec2.VPCEndpointService, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.VPCEndpointService:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.VPCEndpointService not found", name)
+}
+
+// GetAllEC2VPCEndpointServicePermissionsResources retrieves all ec2.VPCEndpointServicePermissions items from an AWS CloudFormation template
+func (t *Template) GetAllEC2VPCEndpointServicePermissionsResources() map[string]*ec2.VPCEndpointServicePermissions {
+	results := map[string]*ec2.VPCEndpointServicePermissions{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.VPCEndpointServicePermissions:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2VPCEndpointServicePermissionsWithName retrieves all ec2.VPCEndpointServicePermissions items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2VPCEndpointServicePermissionsWithName(name string) (*ec2.VPCEndpointServicePermissions, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.VPCEndpointServicePermissions:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.VPCEndpointServicePermissions not found", name)
+}
+
+// GetAllEC2VPCGatewayAttachmentResources retrieves all ec2.VPCGatewayAttachment items from an AWS CloudFormation template
+func (t *Template) GetAllEC2VPCGatewayAttachmentResources() map[string]*ec2.VPCGatewayAttachment {
+	results := map[string]*ec2.VPCGatewayAttachment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.VPCGatewayAttachment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2VPCGatewayAttachmentWithName retrieves all ec2.VPCGatewayAttachment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2VPCGatewayAttachmentWithName(name string) (*ec2.VPCGatewayAttachment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.VPCGatewayAttachment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.VPCGatewayAttachment not found", name)
+}
+
+// GetAllEC2VPCPeeringConnectionResources retrieves all ec2.VPCPeeringConnection items from an AWS CloudFormation template
+func (t *Template) GetAllEC2VPCPeeringConnectionResources() map[string]*ec2.VPCPeeringConnection {
+	results := map[string]*ec2.VPCPeeringConnection{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.VPCPeeringConnection:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2VPCPeeringConnectionWithName retrieves all ec2.VPCPeeringConnection items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2VPCPeeringConnectionWithName(name string) (*ec2.VPCPeeringConnection, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.VPCPeeringConnection:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.VPCPeeringConnection not found", name)
+}
+
+// GetAllEC2VPNConnectionResources retrieves all ec2.VPNConnection items from an AWS CloudFormation template
+func (t *Template) GetAllEC2VPNConnectionResources() map[string]*ec2.VPNConnection {
+	results := map[string]*ec2.VPNConnection{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.VPNConnection:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2VPNConnectionWithName retrieves all ec2.VPNConnection items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2VPNConnectionWithName(name string) (*ec2.VPNConnection, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.VPNConnection:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.VPNConnection not found", name)
+}
+
+// GetAllEC2VPNConnectionRouteResources retrieves all ec2.VPNConnectionRoute items from an AWS CloudFormation template
+func (t *Template) GetAllEC2VPNConnectionRouteResources() map[string]*ec2.VPNConnectionRoute {
+	results := map[string]*ec2.VPNConnectionRoute{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.VPNConnectionRoute:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2VPNConnectionRouteWithName retrieves all ec2.VPNConnectionRoute items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2VPNConnectionRouteWithName(name string) (*ec2.VPNConnectionRoute, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.VPNConnectionRoute:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.VPNConnectionRoute not found", name)
+}
+
+// GetAllEC2VPNGatewayResources retrieves all ec2.VPNGateway items from an AWS CloudFormation template
+func (t *Template) GetAllEC2VPNGatewayResources() map[string]*ec2.VPNGateway {
+	results := map[string]*ec2.VPNGateway{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.VPNGateway:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2VPNGatewayWithName retrieves all ec2.VPNGateway items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2VPNGatewayWithName(name string) (*ec2.VPNGateway, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.VPNGateway:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.VPNGateway not found", name)
+}
+
+// GetAllEC2VPNGatewayRoutePropagationResources retrieves all ec2.VPNGatewayRoutePropagation items from an AWS CloudFormation template
+func (t *Template) GetAllEC2VPNGatewayRoutePropagationResources() map[string]*ec2.VPNGatewayRoutePropagation {
+	results := map[string]*ec2.VPNGatewayRoutePropagation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.VPNGatewayRoutePropagation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2VPNGatewayRoutePropagationWithName retrieves all ec2.VPNGatewayRoutePropagation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2VPNGatewayRoutePropagationWithName(name string) (*ec2.VPNGatewayRoutePropagation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.VPNGatewayRoutePropagation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.VPNGatewayRoutePropagation not found", name)
+}
+
+// GetAllEC2VolumeResources retrieves all ec2.Volume items from an AWS CloudFormation template
+func (t *Template) GetAllEC2VolumeResources() map[string]*ec2.Volume {
+	results := map[string]*ec2.Volume{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.Volume:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2VolumeWithName retrieves all ec2.Volume items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2VolumeWithName(name string) (*ec2.Volume, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.Volume:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.Volume not found", name)
+}
+
+// GetAllEC2VolumeAttachmentResources retrieves all ec2.VolumeAttachment items from an AWS CloudFormation template
+func (t *Template) GetAllEC2VolumeAttachmentResources() map[string]*ec2.VolumeAttachment {
+	results := map[string]*ec2.VolumeAttachment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ec2.VolumeAttachment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEC2VolumeAttachmentWithName retrieves all ec2.VolumeAttachment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEC2VolumeAttachmentWithName(name string) (*ec2.VolumeAttachment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ec2.VolumeAttachment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ec2.VolumeAttachment not found", name)
+}
+
+// GetAllECRPublicRepositoryResources retrieves all ecr.PublicRepository items from an AWS CloudFormation template
+func (t *Template) GetAllECRPublicRepositoryResources() map[string]*ecr.PublicRepository {
+	results := map[string]*ecr.PublicRepository{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ecr.PublicRepository:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetECRPublicRepositoryWithName retrieves all ecr.PublicRepository items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetECRPublicRepositoryWithName(name string) (*ecr.PublicRepository, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ecr.PublicRepository:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ecr.PublicRepository not found", name)
+}
+
+// GetAllECRRegistryPolicyResources retrieves all ecr.RegistryPolicy items from an AWS CloudFormation template
+func (t *Template) GetAllECRRegistryPolicyResources() map[string]*ecr.RegistryPolicy {
+	results := map[string]*ecr.RegistryPolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ecr.RegistryPolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetECRRegistryPolicyWithName retrieves all ecr.RegistryPolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetECRRegistryPolicyWithName(name string) (*ecr.RegistryPolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ecr.RegistryPolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ecr.RegistryPolicy not found", name)
+}
+
+// GetAllECRReplicationConfigurationResources retrieves all ecr.ReplicationConfiguration items from an AWS CloudFormation template
+func (t *Template) GetAllECRReplicationConfigurationResources() map[string]*ecr.ReplicationConfiguration {
+	results := map[string]*ecr.ReplicationConfiguration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ecr.ReplicationConfiguration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetECRReplicationConfigurationWithName retrieves all ecr.ReplicationConfiguration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetECRReplicationConfigurationWithName(name string) (*ecr.ReplicationConfiguration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ecr.ReplicationConfiguration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ecr.ReplicationConfiguration not found", name)
+}
+
+// GetAllECRRepositoryResources retrieves all ecr.Repository items from an AWS CloudFormation template
+func (t *Template) GetAllECRRepositoryResources() map[string]*ecr.Repository {
+	results := map[string]*ecr.Repository{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ecr.Repository:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetECRRepositoryWithName retrieves all ecr.Repository items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetECRRepositoryWithName(name string) (*ecr.Repository, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ecr.Repository:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ecr.Repository not found", name)
+}
+
+// GetAllECSCapacityProviderResources retrieves all ecs.CapacityProvider items from an AWS CloudFormation template
+func (t *Template) GetAllECSCapacityProviderResources() map[string]*ecs.CapacityProvider {
+	results := map[string]*ecs.CapacityProvider{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ecs.CapacityProvider:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetECSCapacityProviderWithName retrieves all ecs.CapacityProvider items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetECSCapacityProviderWithName(name string) (*ecs.CapacityProvider, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ecs.CapacityProvider:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ecs.CapacityProvider not found", name)
+}
+
+// GetAllECSClusterResources retrieves all ecs.Cluster items from an AWS CloudFormation template
+func (t *Template) GetAllECSClusterResources() map[string]*ecs.Cluster {
+	results := map[string]*ecs.Cluster{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ecs.Cluster:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetECSClusterWithName retrieves all ecs.Cluster items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetECSClusterWithName(name string) (*ecs.Cluster, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ecs.Cluster:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ecs.Cluster not found", name)
+}
+
+// GetAllECSClusterCapacityProviderAssociationsResources retrieves all ecs.ClusterCapacityProviderAssociations items from an AWS CloudFormation template
+func (t *Template) GetAllECSClusterCapacityProviderAssociationsResources() map[string]*ecs.ClusterCapacityProviderAssociations {
+	results := map[string]*ecs.ClusterCapacityProviderAssociations{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ecs.ClusterCapacityProviderAssociations:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetECSClusterCapacityProviderAssociationsWithName retrieves all ecs.ClusterCapacityProviderAssociations items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetECSClusterCapacityProviderAssociationsWithName(name string) (*ecs.ClusterCapacityProviderAssociations, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ecs.ClusterCapacityProviderAssociations:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ecs.ClusterCapacityProviderAssociations not found", name)
+}
+
+// GetAllECSPrimaryTaskSetResources retrieves all ecs.PrimaryTaskSet items from an AWS CloudFormation template
+func (t *Template) GetAllECSPrimaryTaskSetResources() map[string]*ecs.PrimaryTaskSet {
+	results := map[string]*ecs.PrimaryTaskSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ecs.PrimaryTaskSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetECSPrimaryTaskSetWithName retrieves all ecs.PrimaryTaskSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetECSPrimaryTaskSetWithName(name string) (*ecs.PrimaryTaskSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ecs.PrimaryTaskSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ecs.PrimaryTaskSet not found", name)
+}
+
+// GetAllECSServiceResources retrieves all ecs.Service items from an AWS CloudFormation template
+func (t *Template) GetAllECSServiceResources() map[string]*ecs.Service {
+	results := map[string]*ecs.Service{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ecs.Service:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetECSServiceWithName retrieves all ecs.Service items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetECSServiceWithName(name string) (*ecs.Service, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ecs.Service:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ecs.Service not found", name)
+}
+
+// GetAllECSTaskDefinitionResources retrieves all ecs.TaskDefinition items from an AWS CloudFormation template
+func (t *Template) GetAllECSTaskDefinitionResources() map[string]*ecs.TaskDefinition {
+	results := map[string]*ecs.TaskDefinition{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ecs.TaskDefinition:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetECSTaskDefinitionWithName retrieves all ecs.TaskDefinition items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetECSTaskDefinitionWithName(name string) (*ecs.TaskDefinition, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ecs.TaskDefinition:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ecs.TaskDefinition not found", name)
+}
+
+// GetAllECSTaskSetResources retrieves all ecs.TaskSet items from an AWS CloudFormation template
+func (t *Template) GetAllECSTaskSetResources() map[string]*ecs.TaskSet {
+	results := map[string]*ecs.TaskSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ecs.TaskSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetECSTaskSetWithName retrieves all ecs.TaskSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetECSTaskSetWithName(name string) (*ecs.TaskSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ecs.TaskSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ecs.TaskSet not found", name)
+}
+
+// GetAllEFSAccessPointResources retrieves all efs.AccessPoint items from an AWS CloudFormation template
+func (t *Template) GetAllEFSAccessPointResources() map[string]*efs.AccessPoint {
+	results := map[string]*efs.AccessPoint{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *efs.AccessPoint:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEFSAccessPointWithName retrieves all efs.AccessPoint items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEFSAccessPointWithName(name string) (*efs.AccessPoint, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *efs.AccessPoint:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type efs.AccessPoint not found", name)
+}
+
+// GetAllEFSFileSystemResources retrieves all efs.FileSystem items from an AWS CloudFormation template
+func (t *Template) GetAllEFSFileSystemResources() map[string]*efs.FileSystem {
+	results := map[string]*efs.FileSystem{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *efs.FileSystem:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEFSFileSystemWithName retrieves all efs.FileSystem items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEFSFileSystemWithName(name string) (*efs.FileSystem, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *efs.FileSystem:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type efs.FileSystem not found", name)
+}
+
+// GetAllEFSMountTargetResources retrieves all efs.MountTarget items from an AWS CloudFormation template
+func (t *Template) GetAllEFSMountTargetResources() map[string]*efs.MountTarget {
+	results := map[string]*efs.MountTarget{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *efs.MountTarget:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEFSMountTargetWithName retrieves all efs.MountTarget items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEFSMountTargetWithName(name string) (*efs.MountTarget, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *efs.MountTarget:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type efs.MountTarget not found", name)
+}
+
+// GetAllEKSAddonResources retrieves all eks.Addon items from an AWS CloudFormation template
+func (t *Template) GetAllEKSAddonResources() map[string]*eks.Addon {
+	results := map[string]*eks.Addon{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *eks.Addon:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEKSAddonWithName retrieves all eks.Addon items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEKSAddonWithName(name string) (*eks.Addon, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *eks.Addon:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type eks.Addon not found", name)
+}
+
+// GetAllEKSClusterResources retrieves all eks.Cluster items from an AWS CloudFormation template
+func (t *Template) GetAllEKSClusterResources() map[string]*eks.Cluster {
+	results := map[string]*eks.Cluster{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *eks.Cluster:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEKSClusterWithName retrieves all eks.Cluster items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEKSClusterWithName(name string) (*eks.Cluster, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *eks.Cluster:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type eks.Cluster not found", name)
+}
+
+// GetAllEKSFargateProfileResources retrieves all eks.FargateProfile items from an AWS CloudFormation template
+func (t *Template) GetAllEKSFargateProfileResources() map[string]*eks.FargateProfile {
+	results := map[string]*eks.FargateProfile{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *eks.FargateProfile:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEKSFargateProfileWithName retrieves all eks.FargateProfile items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEKSFargateProfileWithName(name string) (*eks.FargateProfile, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *eks.FargateProfile:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type eks.FargateProfile not found", name)
+}
+
+// GetAllEKSNodegroupResources retrieves all eks.Nodegroup items from an AWS CloudFormation template
+func (t *Template) GetAllEKSNodegroupResources() map[string]*eks.Nodegroup {
+	results := map[string]*eks.Nodegroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *eks.Nodegroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEKSNodegroupWithName retrieves all eks.Nodegroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEKSNodegroupWithName(name string) (*eks.Nodegroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *eks.Nodegroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type eks.Nodegroup not found", name)
+}
+
+// GetAllEMRClusterResources retrieves all emr.Cluster items from an AWS CloudFormation template
+func (t *Template) GetAllEMRClusterResources() map[string]*emr.Cluster {
+	results := map[string]*emr.Cluster{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *emr.Cluster:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEMRClusterWithName retrieves all emr.Cluster items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEMRClusterWithName(name string) (*emr.Cluster, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *emr.Cluster:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type emr.Cluster not found", name)
+}
+
+// GetAllEMRInstanceFleetConfigResources retrieves all emr.InstanceFleetConfig items from an AWS CloudFormation template
+func (t *Template) GetAllEMRInstanceFleetConfigResources() map[string]*emr.InstanceFleetConfig {
+	results := map[string]*emr.InstanceFleetConfig{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *emr.InstanceFleetConfig:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEMRInstanceFleetConfigWithName retrieves all emr.InstanceFleetConfig items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEMRInstanceFleetConfigWithName(name string) (*emr.InstanceFleetConfig, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *emr.InstanceFleetConfig:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type emr.InstanceFleetConfig not found", name)
+}
+
+// GetAllEMRInstanceGroupConfigResources retrieves all emr.InstanceGroupConfig items from an AWS CloudFormation template
+func (t *Template) GetAllEMRInstanceGroupConfigResources() map[string]*emr.InstanceGroupConfig {
+	results := map[string]*emr.InstanceGroupConfig{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *emr.InstanceGroupConfig:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEMRInstanceGroupConfigWithName retrieves all emr.InstanceGroupConfig items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEMRInstanceGroupConfigWithName(name string) (*emr.InstanceGroupConfig, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *emr.InstanceGroupConfig:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type emr.InstanceGroupConfig not found", name)
+}
+
+// GetAllEMRSecurityConfigurationResources retrieves all emr.SecurityConfiguration items from an AWS CloudFormation template
+func (t *Template) GetAllEMRSecurityConfigurationResources() map[string]*emr.SecurityConfiguration {
+	results := map[string]*emr.SecurityConfiguration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *emr.SecurityConfiguration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEMRSecurityConfigurationWithName retrieves all emr.SecurityConfiguration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEMRSecurityConfigurationWithName(name string) (*emr.SecurityConfiguration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *emr.SecurityConfiguration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type emr.SecurityConfiguration not found", name)
+}
+
+// GetAllEMRStepResources retrieves all emr.Step items from an AWS CloudFormation template
+func (t *Template) GetAllEMRStepResources() map[string]*emr.Step {
+	results := map[string]*emr.Step{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *emr.Step:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEMRStepWithName retrieves all emr.Step items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEMRStepWithName(name string) (*emr.Step, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *emr.Step:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type emr.Step not found", name)
+}
+
+// GetAllEMRStudioResources retrieves all emr.Studio items from an AWS CloudFormation template
+func (t *Template) GetAllEMRStudioResources() map[string]*emr.Studio {
+	results := map[string]*emr.Studio{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *emr.Studio:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEMRStudioWithName retrieves all emr.Studio items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEMRStudioWithName(name string) (*emr.Studio, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *emr.Studio:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type emr.Studio not found", name)
+}
+
+// GetAllEMRStudioSessionMappingResources retrieves all emr.StudioSessionMapping items from an AWS CloudFormation template
+func (t *Template) GetAllEMRStudioSessionMappingResources() map[string]*emr.StudioSessionMapping {
+	results := map[string]*emr.StudioSessionMapping{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *emr.StudioSessionMapping:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEMRStudioSessionMappingWithName retrieves all emr.StudioSessionMapping items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEMRStudioSessionMappingWithName(name string) (*emr.StudioSessionMapping, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *emr.StudioSessionMapping:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type emr.StudioSessionMapping not found", name)
+}
+
+// GetAllEMRContainersVirtualClusterResources retrieves all emrcontainers.VirtualCluster items from an AWS CloudFormation template
+func (t *Template) GetAllEMRContainersVirtualClusterResources() map[string]*emrcontainers.VirtualCluster {
+	results := map[string]*emrcontainers.VirtualCluster{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *emrcontainers.VirtualCluster:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEMRContainersVirtualClusterWithName retrieves all emrcontainers.VirtualCluster items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEMRContainersVirtualClusterWithName(name string) (*emrcontainers.VirtualCluster, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *emrcontainers.VirtualCluster:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type emrcontainers.VirtualCluster not found", name)
+}
+
+// GetAllElastiCacheCacheClusterResources retrieves all elasticache.CacheCluster items from an AWS CloudFormation template
+func (t *Template) GetAllElastiCacheCacheClusterResources() map[string]*elasticache.CacheCluster {
+	results := map[string]*elasticache.CacheCluster{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *elasticache.CacheCluster:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetElastiCacheCacheClusterWithName retrieves all elasticache.CacheCluster items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetElastiCacheCacheClusterWithName(name string) (*elasticache.CacheCluster, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *elasticache.CacheCluster:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type elasticache.CacheCluster not found", name)
+}
+
+// GetAllElastiCacheGlobalReplicationGroupResources retrieves all elasticache.GlobalReplicationGroup items from an AWS CloudFormation template
+func (t *Template) GetAllElastiCacheGlobalReplicationGroupResources() map[string]*elasticache.GlobalReplicationGroup {
+	results := map[string]*elasticache.GlobalReplicationGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *elasticache.GlobalReplicationGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetElastiCacheGlobalReplicationGroupWithName retrieves all elasticache.GlobalReplicationGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetElastiCacheGlobalReplicationGroupWithName(name string) (*elasticache.GlobalReplicationGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *elasticache.GlobalReplicationGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type elasticache.GlobalReplicationGroup not found", name)
+}
+
+// GetAllElastiCacheParameterGroupResources retrieves all elasticache.ParameterGroup items from an AWS CloudFormation template
+func (t *Template) GetAllElastiCacheParameterGroupResources() map[string]*elasticache.ParameterGroup {
+	results := map[string]*elasticache.ParameterGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *elasticache.ParameterGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetElastiCacheParameterGroupWithName retrieves all elasticache.ParameterGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetElastiCacheParameterGroupWithName(name string) (*elasticache.ParameterGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *elasticache.ParameterGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type elasticache.ParameterGroup not found", name)
+}
+
+// GetAllElastiCacheReplicationGroupResources retrieves all elasticache.ReplicationGroup items from an AWS CloudFormation template
+func (t *Template) GetAllElastiCacheReplicationGroupResources() map[string]*elasticache.ReplicationGroup {
+	results := map[string]*elasticache.ReplicationGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *elasticache.ReplicationGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetElastiCacheReplicationGroupWithName retrieves all elasticache.ReplicationGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetElastiCacheReplicationGroupWithName(name string) (*elasticache.ReplicationGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *elasticache.ReplicationGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type elasticache.ReplicationGroup not found", name)
+}
+
+// GetAllElastiCacheSecurityGroupResources retrieves all elasticache.SecurityGroup items from an AWS CloudFormation template
+func (t *Template) GetAllElastiCacheSecurityGroupResources() map[string]*elasticache.SecurityGroup {
+	results := map[string]*elasticache.SecurityGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *elasticache.SecurityGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetElastiCacheSecurityGroupWithName retrieves all elasticache.SecurityGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetElastiCacheSecurityGroupWithName(name string) (*elasticache.SecurityGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *elasticache.SecurityGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type elasticache.SecurityGroup not found", name)
+}
+
+// GetAllElastiCacheSecurityGroupIngressResources retrieves all elasticache.SecurityGroupIngress items from an AWS CloudFormation template
+func (t *Template) GetAllElastiCacheSecurityGroupIngressResources() map[string]*elasticache.SecurityGroupIngress {
+	results := map[string]*elasticache.SecurityGroupIngress{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *elasticache.SecurityGroupIngress:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetElastiCacheSecurityGroupIngressWithName retrieves all elasticache.SecurityGroupIngress items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetElastiCacheSecurityGroupIngressWithName(name string) (*elasticache.SecurityGroupIngress, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *elasticache.SecurityGroupIngress:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type elasticache.SecurityGroupIngress not found", name)
+}
+
+// GetAllElastiCacheSubnetGroupResources retrieves all elasticache.SubnetGroup items from an AWS CloudFormation template
+func (t *Template) GetAllElastiCacheSubnetGroupResources() map[string]*elasticache.SubnetGroup {
+	results := map[string]*elasticache.SubnetGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *elasticache.SubnetGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetElastiCacheSubnetGroupWithName retrieves all elasticache.SubnetGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetElastiCacheSubnetGroupWithName(name string) (*elasticache.SubnetGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *elasticache.SubnetGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type elasticache.SubnetGroup not found", name)
+}
+
+// GetAllElastiCacheUserResources retrieves all elasticache.User items from an AWS CloudFormation template
+func (t *Template) GetAllElastiCacheUserResources() map[string]*elasticache.User {
+	results := map[string]*elasticache.User{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *elasticache.User:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetElastiCacheUserWithName retrieves all elasticache.User items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetElastiCacheUserWithName(name string) (*elasticache.User, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *elasticache.User:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type elasticache.User not found", name)
+}
+
+// GetAllElastiCacheUserGroupResources retrieves all elasticache.UserGroup items from an AWS CloudFormation template
+func (t *Template) GetAllElastiCacheUserGroupResources() map[string]*elasticache.UserGroup {
+	results := map[string]*elasticache.UserGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *elasticache.UserGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetElastiCacheUserGroupWithName retrieves all elasticache.UserGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetElastiCacheUserGroupWithName(name string) (*elasticache.UserGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *elasticache.UserGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type elasticache.UserGroup not found", name)
+}
+
+// GetAllElasticBeanstalkApplicationResources retrieves all elasticbeanstalk.Application items from an AWS CloudFormation template
+func (t *Template) GetAllElasticBeanstalkApplicationResources() map[string]*elasticbeanstalk.Application {
+	results := map[string]*elasticbeanstalk.Application{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *elasticbeanstalk.Application:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetElasticBeanstalkApplicationWithName retrieves all elasticbeanstalk.Application items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetElasticBeanstalkApplicationWithName(name string) (*elasticbeanstalk.Application, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *elasticbeanstalk.Application:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type elasticbeanstalk.Application not found", name)
+}
+
+// GetAllElasticBeanstalkApplicationVersionResources retrieves all elasticbeanstalk.ApplicationVersion items from an AWS CloudFormation template
+func (t *Template) GetAllElasticBeanstalkApplicationVersionResources() map[string]*elasticbeanstalk.ApplicationVersion {
+	results := map[string]*elasticbeanstalk.ApplicationVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *elasticbeanstalk.ApplicationVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetElasticBeanstalkApplicationVersionWithName retrieves all elasticbeanstalk.ApplicationVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetElasticBeanstalkApplicationVersionWithName(name string) (*elasticbeanstalk.ApplicationVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *elasticbeanstalk.ApplicationVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type elasticbeanstalk.ApplicationVersion not found", name)
+}
+
+// GetAllElasticBeanstalkConfigurationTemplateResources retrieves all elasticbeanstalk.ConfigurationTemplate items from an AWS CloudFormation template
+func (t *Template) GetAllElasticBeanstalkConfigurationTemplateResources() map[string]*elasticbeanstalk.ConfigurationTemplate {
+	results := map[string]*elasticbeanstalk.ConfigurationTemplate{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *elasticbeanstalk.ConfigurationTemplate:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetElasticBeanstalkConfigurationTemplateWithName retrieves all elasticbeanstalk.ConfigurationTemplate items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetElasticBeanstalkConfigurationTemplateWithName(name string) (*elasticbeanstalk.ConfigurationTemplate, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *elasticbeanstalk.ConfigurationTemplate:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type elasticbeanstalk.ConfigurationTemplate not found", name)
+}
+
+// GetAllElasticBeanstalkEnvironmentResources retrieves all elasticbeanstalk.Environment items from an AWS CloudFormation template
+func (t *Template) GetAllElasticBeanstalkEnvironmentResources() map[string]*elasticbeanstalk.Environment {
+	results := map[string]*elasticbeanstalk.Environment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *elasticbeanstalk.Environment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetElasticBeanstalkEnvironmentWithName retrieves all elasticbeanstalk.Environment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetElasticBeanstalkEnvironmentWithName(name string) (*elasticbeanstalk.Environment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *elasticbeanstalk.Environment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type elasticbeanstalk.Environment not found", name)
+}
+
+// GetAllElasticLoadBalancingLoadBalancerResources retrieves all elasticloadbalancing.LoadBalancer items from an AWS CloudFormation template
+func (t *Template) GetAllElasticLoadBalancingLoadBalancerResources() map[string]*elasticloadbalancing.LoadBalancer {
+	results := map[string]*elasticloadbalancing.LoadBalancer{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *elasticloadbalancing.LoadBalancer:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetElasticLoadBalancingLoadBalancerWithName retrieves all elasticloadbalancing.LoadBalancer items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetElasticLoadBalancingLoadBalancerWithName(name string) (*elasticloadbalancing.LoadBalancer, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *elasticloadbalancing.LoadBalancer:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type elasticloadbalancing.LoadBalancer not found", name)
+}
+
+// GetAllElasticLoadBalancingV2ListenerResources retrieves all elasticloadbalancingv2.Listener items from an AWS CloudFormation template
+func (t *Template) GetAllElasticLoadBalancingV2ListenerResources() map[string]*elasticloadbalancingv2.Listener {
+	results := map[string]*elasticloadbalancingv2.Listener{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *elasticloadbalancingv2.Listener:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetElasticLoadBalancingV2ListenerWithName retrieves all elasticloadbalancingv2.Listener items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetElasticLoadBalancingV2ListenerWithName(name string) (*elasticloadbalancingv2.Listener, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *elasticloadbalancingv2.Listener:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type elasticloadbalancingv2.Listener not found", name)
+}
+
+// GetAllElasticLoadBalancingV2ListenerCertificateResources retrieves all elasticloadbalancingv2.ListenerCertificate items from an AWS CloudFormation template
+func (t *Template) GetAllElasticLoadBalancingV2ListenerCertificateResources() map[string]*elasticloadbalancingv2.ListenerCertificate {
+	results := map[string]*elasticloadbalancingv2.ListenerCertificate{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *elasticloadbalancingv2.ListenerCertificate:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetElasticLoadBalancingV2ListenerCertificateWithName retrieves all elasticloadbalancingv2.ListenerCertificate items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetElasticLoadBalancingV2ListenerCertificateWithName(name string) (*elasticloadbalancingv2.ListenerCertificate, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *elasticloadbalancingv2.ListenerCertificate:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type elasticloadbalancingv2.ListenerCertificate not found", name)
+}
+
+// GetAllElasticLoadBalancingV2ListenerRuleResources retrieves all elasticloadbalancingv2.ListenerRule items from an AWS CloudFormation template
+func (t *Template) GetAllElasticLoadBalancingV2ListenerRuleResources() map[string]*elasticloadbalancingv2.ListenerRule {
+	results := map[string]*elasticloadbalancingv2.ListenerRule{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *elasticloadbalancingv2.ListenerRule:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetElasticLoadBalancingV2ListenerRuleWithName retrieves all elasticloadbalancingv2.ListenerRule items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetElasticLoadBalancingV2ListenerRuleWithName(name string) (*elasticloadbalancingv2.ListenerRule, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *elasticloadbalancingv2.ListenerRule:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type elasticloadbalancingv2.ListenerRule not found", name)
+}
+
+// GetAllElasticLoadBalancingV2LoadBalancerResources retrieves all elasticloadbalancingv2.LoadBalancer items from an AWS CloudFormation template
+func (t *Template) GetAllElasticLoadBalancingV2LoadBalancerResources() map[string]*elasticloadbalancingv2.LoadBalancer {
+	results := map[string]*elasticloadbalancingv2.LoadBalancer{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *elasticloadbalancingv2.LoadBalancer:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetElasticLoadBalancingV2LoadBalancerWithName retrieves all elasticloadbalancingv2.LoadBalancer items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetElasticLoadBalancingV2LoadBalancerWithName(name string) (*elasticloadbalancingv2.LoadBalancer, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *elasticloadbalancingv2.LoadBalancer:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type elasticloadbalancingv2.LoadBalancer not found", name)
+}
+
+// GetAllElasticLoadBalancingV2TargetGroupResources retrieves all elasticloadbalancingv2.TargetGroup items from an AWS CloudFormation template
+func (t *Template) GetAllElasticLoadBalancingV2TargetGroupResources() map[string]*elasticloadbalancingv2.TargetGroup {
+	results := map[string]*elasticloadbalancingv2.TargetGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *elasticloadbalancingv2.TargetGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetElasticLoadBalancingV2TargetGroupWithName retrieves all elasticloadbalancingv2.TargetGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetElasticLoadBalancingV2TargetGroupWithName(name string) (*elasticloadbalancingv2.TargetGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *elasticloadbalancingv2.TargetGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type elasticloadbalancingv2.TargetGroup not found", name)
+}
+
+// GetAllElasticsearchDomainResources retrieves all elasticsearch.Domain items from an AWS CloudFormation template
+func (t *Template) GetAllElasticsearchDomainResources() map[string]*elasticsearch.Domain {
+	results := map[string]*elasticsearch.Domain{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *elasticsearch.Domain:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetElasticsearchDomainWithName retrieves all elasticsearch.Domain items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetElasticsearchDomainWithName(name string) (*elasticsearch.Domain, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *elasticsearch.Domain:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type elasticsearch.Domain not found", name)
+}
+
+// GetAllEventSchemasDiscovererResources retrieves all eventschemas.Discoverer items from an AWS CloudFormation template
+func (t *Template) GetAllEventSchemasDiscovererResources() map[string]*eventschemas.Discoverer {
+	results := map[string]*eventschemas.Discoverer{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *eventschemas.Discoverer:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEventSchemasDiscovererWithName retrieves all eventschemas.Discoverer items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEventSchemasDiscovererWithName(name string) (*eventschemas.Discoverer, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *eventschemas.Discoverer:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type eventschemas.Discoverer not found", name)
+}
+
+// GetAllEventSchemasRegistryResources retrieves all eventschemas.Registry items from an AWS CloudFormation template
+func (t *Template) GetAllEventSchemasRegistryResources() map[string]*eventschemas.Registry {
+	results := map[string]*eventschemas.Registry{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *eventschemas.Registry:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEventSchemasRegistryWithName retrieves all eventschemas.Registry items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEventSchemasRegistryWithName(name string) (*eventschemas.Registry, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *eventschemas.Registry:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type eventschemas.Registry not found", name)
+}
+
+// GetAllEventSchemasRegistryPolicyResources retrieves all eventschemas.RegistryPolicy items from an AWS CloudFormation template
+func (t *Template) GetAllEventSchemasRegistryPolicyResources() map[string]*eventschemas.RegistryPolicy {
+	results := map[string]*eventschemas.RegistryPolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *eventschemas.RegistryPolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEventSchemasRegistryPolicyWithName retrieves all eventschemas.RegistryPolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEventSchemasRegistryPolicyWithName(name string) (*eventschemas.RegistryPolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *eventschemas.RegistryPolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type eventschemas.RegistryPolicy not found", name)
+}
+
+// GetAllEventSchemasSchemaResources retrieves all eventschemas.Schema items from an AWS CloudFormation template
+func (t *Template) GetAllEventSchemasSchemaResources() map[string]*eventschemas.Schema {
+	results := map[string]*eventschemas.Schema{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *eventschemas.Schema:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEventSchemasSchemaWithName retrieves all eventschemas.Schema items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEventSchemasSchemaWithName(name string) (*eventschemas.Schema, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *eventschemas.Schema:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type eventschemas.Schema not found", name)
+}
+
+// GetAllEventsApiDestinationResources retrieves all events.ApiDestination items from an AWS CloudFormation template
+func (t *Template) GetAllEventsApiDestinationResources() map[string]*events.ApiDestination {
+	results := map[string]*events.ApiDestination{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *events.ApiDestination:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEventsApiDestinationWithName retrieves all events.ApiDestination items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEventsApiDestinationWithName(name string) (*events.ApiDestination, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *events.ApiDestination:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type events.ApiDestination not found", name)
+}
+
+// GetAllEventsArchiveResources retrieves all events.Archive items from an AWS CloudFormation template
+func (t *Template) GetAllEventsArchiveResources() map[string]*events.Archive {
+	results := map[string]*events.Archive{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *events.Archive:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEventsArchiveWithName retrieves all events.Archive items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEventsArchiveWithName(name string) (*events.Archive, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *events.Archive:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type events.Archive not found", name)
+}
+
+// GetAllEventsConnectionResources retrieves all events.Connection items from an AWS CloudFormation template
+func (t *Template) GetAllEventsConnectionResources() map[string]*events.Connection {
+	results := map[string]*events.Connection{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *events.Connection:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEventsConnectionWithName retrieves all events.Connection items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEventsConnectionWithName(name string) (*events.Connection, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *events.Connection:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type events.Connection not found", name)
+}
+
+// GetAllEventsEventBusResources retrieves all events.EventBus items from an AWS CloudFormation template
+func (t *Template) GetAllEventsEventBusResources() map[string]*events.EventBus {
+	results := map[string]*events.EventBus{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *events.EventBus:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEventsEventBusWithName retrieves all events.EventBus items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEventsEventBusWithName(name string) (*events.EventBus, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *events.EventBus:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type events.EventBus not found", name)
+}
+
+// GetAllEventsEventBusPolicyResources retrieves all events.EventBusPolicy items from an AWS CloudFormation template
+func (t *Template) GetAllEventsEventBusPolicyResources() map[string]*events.EventBusPolicy {
+	results := map[string]*events.EventBusPolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *events.EventBusPolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEventsEventBusPolicyWithName retrieves all events.EventBusPolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEventsEventBusPolicyWithName(name string) (*events.EventBusPolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *events.EventBusPolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type events.EventBusPolicy not found", name)
+}
+
+// GetAllEventsRuleResources retrieves all events.Rule items from an AWS CloudFormation template
+func (t *Template) GetAllEventsRuleResources() map[string]*events.Rule {
+	results := map[string]*events.Rule{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *events.Rule:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEventsRuleWithName retrieves all events.Rule items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEventsRuleWithName(name string) (*events.Rule, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *events.Rule:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type events.Rule not found", name)
+}
+
+// GetAllEvidentlyExperimentResources retrieves all evidently.Experiment items from an AWS CloudFormation template
+func (t *Template) GetAllEvidentlyExperimentResources() map[string]*evidently.Experiment {
+	results := map[string]*evidently.Experiment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *evidently.Experiment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEvidentlyExperimentWithName retrieves all evidently.Experiment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEvidentlyExperimentWithName(name string) (*evidently.Experiment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *evidently.Experiment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type evidently.Experiment not found", name)
+}
+
+// GetAllEvidentlyFeatureResources retrieves all evidently.Feature items from an AWS CloudFormation template
+func (t *Template) GetAllEvidentlyFeatureResources() map[string]*evidently.Feature {
+	results := map[string]*evidently.Feature{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *evidently.Feature:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEvidentlyFeatureWithName retrieves all evidently.Feature items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEvidentlyFeatureWithName(name string) (*evidently.Feature, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *evidently.Feature:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type evidently.Feature not found", name)
+}
+
+// GetAllEvidentlyLaunchResources retrieves all evidently.Launch items from an AWS CloudFormation template
+func (t *Template) GetAllEvidentlyLaunchResources() map[string]*evidently.Launch {
+	results := map[string]*evidently.Launch{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *evidently.Launch:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEvidentlyLaunchWithName retrieves all evidently.Launch items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEvidentlyLaunchWithName(name string) (*evidently.Launch, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *evidently.Launch:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type evidently.Launch not found", name)
+}
+
+// GetAllEvidentlyProjectResources retrieves all evidently.Project items from an AWS CloudFormation template
+func (t *Template) GetAllEvidentlyProjectResources() map[string]*evidently.Project {
+	results := map[string]*evidently.Project{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *evidently.Project:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetEvidentlyProjectWithName retrieves all evidently.Project items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetEvidentlyProjectWithName(name string) (*evidently.Project, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *evidently.Project:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type evidently.Project not found", name)
+}
+
+// GetAllFISExperimentTemplateResources retrieves all fis.ExperimentTemplate items from an AWS CloudFormation template
+func (t *Template) GetAllFISExperimentTemplateResources() map[string]*fis.ExperimentTemplate {
+	results := map[string]*fis.ExperimentTemplate{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *fis.ExperimentTemplate:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetFISExperimentTemplateWithName retrieves all fis.ExperimentTemplate items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetFISExperimentTemplateWithName(name string) (*fis.ExperimentTemplate, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *fis.ExperimentTemplate:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type fis.ExperimentTemplate not found", name)
+}
+
+// GetAllFMSNotificationChannelResources retrieves all fms.NotificationChannel items from an AWS CloudFormation template
+func (t *Template) GetAllFMSNotificationChannelResources() map[string]*fms.NotificationChannel {
+	results := map[string]*fms.NotificationChannel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *fms.NotificationChannel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetFMSNotificationChannelWithName retrieves all fms.NotificationChannel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetFMSNotificationChannelWithName(name string) (*fms.NotificationChannel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *fms.NotificationChannel:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type fms.NotificationChannel not found", name)
+}
+
+// GetAllFMSPolicyResources retrieves all fms.Policy items from an AWS CloudFormation template
+func (t *Template) GetAllFMSPolicyResources() map[string]*fms.Policy {
+	results := map[string]*fms.Policy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *fms.Policy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetFMSPolicyWithName retrieves all fms.Policy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetFMSPolicyWithName(name string) (*fms.Policy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *fms.Policy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type fms.Policy not found", name)
+}
+
+// GetAllFSxFileSystemResources retrieves all fsx.FileSystem items from an AWS CloudFormation template
+func (t *Template) GetAllFSxFileSystemResources() map[string]*fsx.FileSystem {
+	results := map[string]*fsx.FileSystem{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *fsx.FileSystem:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetFSxFileSystemWithName retrieves all fsx.FileSystem items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetFSxFileSystemWithName(name string) (*fsx.FileSystem, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *fsx.FileSystem:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type fsx.FileSystem not found", name)
+}
+
+// GetAllFinSpaceEnvironmentResources retrieves all finspace.Environment items from an AWS CloudFormation template
+func (t *Template) GetAllFinSpaceEnvironmentResources() map[string]*finspace.Environment {
+	results := map[string]*finspace.Environment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *finspace.Environment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetFinSpaceEnvironmentWithName retrieves all finspace.Environment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetFinSpaceEnvironmentWithName(name string) (*finspace.Environment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *finspace.Environment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type finspace.Environment not found", name)
+}
+
+// GetAllFraudDetectorDetectorResources retrieves all frauddetector.Detector items from an AWS CloudFormation template
+func (t *Template) GetAllFraudDetectorDetectorResources() map[string]*frauddetector.Detector {
+	results := map[string]*frauddetector.Detector{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *frauddetector.Detector:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetFraudDetectorDetectorWithName retrieves all frauddetector.Detector items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetFraudDetectorDetectorWithName(name string) (*frauddetector.Detector, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *frauddetector.Detector:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type frauddetector.Detector not found", name)
+}
+
+// GetAllFraudDetectorEntityTypeResources retrieves all frauddetector.EntityType items from an AWS CloudFormation template
+func (t *Template) GetAllFraudDetectorEntityTypeResources() map[string]*frauddetector.EntityType {
+	results := map[string]*frauddetector.EntityType{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *frauddetector.EntityType:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetFraudDetectorEntityTypeWithName retrieves all frauddetector.EntityType items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetFraudDetectorEntityTypeWithName(name string) (*frauddetector.EntityType, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *frauddetector.EntityType:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type frauddetector.EntityType not found", name)
+}
+
+// GetAllFraudDetectorEventTypeResources retrieves all frauddetector.EventType items from an AWS CloudFormation template
+func (t *Template) GetAllFraudDetectorEventTypeResources() map[string]*frauddetector.EventType {
+	results := map[string]*frauddetector.EventType{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *frauddetector.EventType:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetFraudDetectorEventTypeWithName retrieves all frauddetector.EventType items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetFraudDetectorEventTypeWithName(name string) (*frauddetector.EventType, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *frauddetector.EventType:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type frauddetector.EventType not found", name)
+}
+
+// GetAllFraudDetectorLabelResources retrieves all frauddetector.Label items from an AWS CloudFormation template
+func (t *Template) GetAllFraudDetectorLabelResources() map[string]*frauddetector.Label {
+	results := map[string]*frauddetector.Label{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *frauddetector.Label:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetFraudDetectorLabelWithName retrieves all frauddetector.Label items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetFraudDetectorLabelWithName(name string) (*frauddetector.Label, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *frauddetector.Label:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type frauddetector.Label not found", name)
+}
+
+// GetAllFraudDetectorOutcomeResources retrieves all frauddetector.Outcome items from an AWS CloudFormation template
+func (t *Template) GetAllFraudDetectorOutcomeResources() map[string]*frauddetector.Outcome {
+	results := map[string]*frauddetector.Outcome{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *frauddetector.Outcome:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetFraudDetectorOutcomeWithName retrieves all frauddetector.Outcome items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetFraudDetectorOutcomeWithName(name string) (*frauddetector.Outcome, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *frauddetector.Outcome:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type frauddetector.Outcome not found", name)
+}
+
+// GetAllFraudDetectorVariableResources retrieves all frauddetector.Variable items from an AWS CloudFormation template
+func (t *Template) GetAllFraudDetectorVariableResources() map[string]*frauddetector.Variable {
+	results := map[string]*frauddetector.Variable{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *frauddetector.Variable:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetFraudDetectorVariableWithName retrieves all frauddetector.Variable items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetFraudDetectorVariableWithName(name string) (*frauddetector.Variable, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *frauddetector.Variable:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type frauddetector.Variable not found", name)
+}
+
+// GetAllGameLiftAliasResources retrieves all gamelift.Alias items from an AWS CloudFormation template
+func (t *Template) GetAllGameLiftAliasResources() map[string]*gamelift.Alias {
+	results := map[string]*gamelift.Alias{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *gamelift.Alias:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGameLiftAliasWithName retrieves all gamelift.Alias items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGameLiftAliasWithName(name string) (*gamelift.Alias, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *gamelift.Alias:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type gamelift.Alias not found", name)
+}
+
+// GetAllGameLiftBuildResources retrieves all gamelift.Build items from an AWS CloudFormation template
+func (t *Template) GetAllGameLiftBuildResources() map[string]*gamelift.Build {
+	results := map[string]*gamelift.Build{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *gamelift.Build:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGameLiftBuildWithName retrieves all gamelift.Build items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGameLiftBuildWithName(name string) (*gamelift.Build, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *gamelift.Build:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type gamelift.Build not found", name)
+}
+
+// GetAllGameLiftFleetResources retrieves all gamelift.Fleet items from an AWS CloudFormation template
+func (t *Template) GetAllGameLiftFleetResources() map[string]*gamelift.Fleet {
+	results := map[string]*gamelift.Fleet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *gamelift.Fleet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGameLiftFleetWithName retrieves all gamelift.Fleet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGameLiftFleetWithName(name string) (*gamelift.Fleet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *gamelift.Fleet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type gamelift.Fleet not found", name)
+}
+
+// GetAllGameLiftGameServerGroupResources retrieves all gamelift.GameServerGroup items from an AWS CloudFormation template
+func (t *Template) GetAllGameLiftGameServerGroupResources() map[string]*gamelift.GameServerGroup {
+	results := map[string]*gamelift.GameServerGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *gamelift.GameServerGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGameLiftGameServerGroupWithName retrieves all gamelift.GameServerGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGameLiftGameServerGroupWithName(name string) (*gamelift.GameServerGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *gamelift.GameServerGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type gamelift.GameServerGroup not found", name)
+}
+
+// GetAllGameLiftGameSessionQueueResources retrieves all gamelift.GameSessionQueue items from an AWS CloudFormation template
+func (t *Template) GetAllGameLiftGameSessionQueueResources() map[string]*gamelift.GameSessionQueue {
+	results := map[string]*gamelift.GameSessionQueue{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *gamelift.GameSessionQueue:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGameLiftGameSessionQueueWithName retrieves all gamelift.GameSessionQueue items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGameLiftGameSessionQueueWithName(name string) (*gamelift.GameSessionQueue, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *gamelift.GameSessionQueue:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type gamelift.GameSessionQueue not found", name)
+}
+
+// GetAllGameLiftMatchmakingConfigurationResources retrieves all gamelift.MatchmakingConfiguration items from an AWS CloudFormation template
+func (t *Template) GetAllGameLiftMatchmakingConfigurationResources() map[string]*gamelift.MatchmakingConfiguration {
+	results := map[string]*gamelift.MatchmakingConfiguration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *gamelift.MatchmakingConfiguration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGameLiftMatchmakingConfigurationWithName retrieves all gamelift.MatchmakingConfiguration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGameLiftMatchmakingConfigurationWithName(name string) (*gamelift.MatchmakingConfiguration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *gamelift.MatchmakingConfiguration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type gamelift.MatchmakingConfiguration not found", name)
+}
+
+// GetAllGameLiftMatchmakingRuleSetResources retrieves all gamelift.MatchmakingRuleSet items from an AWS CloudFormation template
+func (t *Template) GetAllGameLiftMatchmakingRuleSetResources() map[string]*gamelift.MatchmakingRuleSet {
+	results := map[string]*gamelift.MatchmakingRuleSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *gamelift.MatchmakingRuleSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGameLiftMatchmakingRuleSetWithName retrieves all gamelift.MatchmakingRuleSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGameLiftMatchmakingRuleSetWithName(name string) (*gamelift.MatchmakingRuleSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *gamelift.MatchmakingRuleSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type gamelift.MatchmakingRuleSet not found", name)
+}
+
+// GetAllGameLiftScriptResources retrieves all gamelift.Script items from an AWS CloudFormation template
+func (t *Template) GetAllGameLiftScriptResources() map[string]*gamelift.Script {
+	results := map[string]*gamelift.Script{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *gamelift.Script:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGameLiftScriptWithName retrieves all gamelift.Script items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGameLiftScriptWithName(name string) (*gamelift.Script, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *gamelift.Script:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type gamelift.Script not found", name)
+}
+
+// GetAllGlobalAcceleratorAcceleratorResources retrieves all globalaccelerator.Accelerator items from an AWS CloudFormation template
+func (t *Template) GetAllGlobalAcceleratorAcceleratorResources() map[string]*globalaccelerator.Accelerator {
+	results := map[string]*globalaccelerator.Accelerator{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *globalaccelerator.Accelerator:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGlobalAcceleratorAcceleratorWithName retrieves all globalaccelerator.Accelerator items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGlobalAcceleratorAcceleratorWithName(name string) (*globalaccelerator.Accelerator, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *globalaccelerator.Accelerator:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type globalaccelerator.Accelerator not found", name)
+}
+
+// GetAllGlobalAcceleratorEndpointGroupResources retrieves all globalaccelerator.EndpointGroup items from an AWS CloudFormation template
+func (t *Template) GetAllGlobalAcceleratorEndpointGroupResources() map[string]*globalaccelerator.EndpointGroup {
+	results := map[string]*globalaccelerator.EndpointGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *globalaccelerator.EndpointGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGlobalAcceleratorEndpointGroupWithName retrieves all globalaccelerator.EndpointGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGlobalAcceleratorEndpointGroupWithName(name string) (*globalaccelerator.EndpointGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *globalaccelerator.EndpointGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type globalaccelerator.EndpointGroup not found", name)
+}
+
+// GetAllGlobalAcceleratorListenerResources retrieves all globalaccelerator.Listener items from an AWS CloudFormation template
+func (t *Template) GetAllGlobalAcceleratorListenerResources() map[string]*globalaccelerator.Listener {
+	results := map[string]*globalaccelerator.Listener{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *globalaccelerator.Listener:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGlobalAcceleratorListenerWithName retrieves all globalaccelerator.Listener items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGlobalAcceleratorListenerWithName(name string) (*globalaccelerator.Listener, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *globalaccelerator.Listener:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type globalaccelerator.Listener not found", name)
+}
+
+// GetAllGlueClassifierResources retrieves all glue.Classifier items from an AWS CloudFormation template
+func (t *Template) GetAllGlueClassifierResources() map[string]*glue.Classifier {
+	results := map[string]*glue.Classifier{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *glue.Classifier:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGlueClassifierWithName retrieves all glue.Classifier items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGlueClassifierWithName(name string) (*glue.Classifier, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *glue.Classifier:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type glue.Classifier not found", name)
+}
+
+// GetAllGlueConnectionResources retrieves all glue.Connection items from an AWS CloudFormation template
+func (t *Template) GetAllGlueConnectionResources() map[string]*glue.Connection {
+	results := map[string]*glue.Connection{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *glue.Connection:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGlueConnectionWithName retrieves all glue.Connection items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGlueConnectionWithName(name string) (*glue.Connection, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *glue.Connection:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type glue.Connection not found", name)
+}
+
+// GetAllGlueCrawlerResources retrieves all glue.Crawler items from an AWS CloudFormation template
+func (t *Template) GetAllGlueCrawlerResources() map[string]*glue.Crawler {
+	results := map[string]*glue.Crawler{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *glue.Crawler:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGlueCrawlerWithName retrieves all glue.Crawler items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGlueCrawlerWithName(name string) (*glue.Crawler, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *glue.Crawler:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type glue.Crawler not found", name)
+}
+
+// GetAllGlueDataCatalogEncryptionSettingsResources retrieves all glue.DataCatalogEncryptionSettings items from an AWS CloudFormation template
+func (t *Template) GetAllGlueDataCatalogEncryptionSettingsResources() map[string]*glue.DataCatalogEncryptionSettings {
+	results := map[string]*glue.DataCatalogEncryptionSettings{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *glue.DataCatalogEncryptionSettings:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGlueDataCatalogEncryptionSettingsWithName retrieves all glue.DataCatalogEncryptionSettings items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGlueDataCatalogEncryptionSettingsWithName(name string) (*glue.DataCatalogEncryptionSettings, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *glue.DataCatalogEncryptionSettings:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type glue.DataCatalogEncryptionSettings not found", name)
+}
+
+// GetAllGlueDatabaseResources retrieves all glue.Database items from an AWS CloudFormation template
+func (t *Template) GetAllGlueDatabaseResources() map[string]*glue.Database {
+	results := map[string]*glue.Database{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *glue.Database:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGlueDatabaseWithName retrieves all glue.Database items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGlueDatabaseWithName(name string) (*glue.Database, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *glue.Database:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type glue.Database not found", name)
+}
+
+// GetAllGlueDevEndpointResources retrieves all glue.DevEndpoint items from an AWS CloudFormation template
+func (t *Template) GetAllGlueDevEndpointResources() map[string]*glue.DevEndpoint {
+	results := map[string]*glue.DevEndpoint{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *glue.DevEndpoint:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGlueDevEndpointWithName retrieves all glue.DevEndpoint items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGlueDevEndpointWithName(name string) (*glue.DevEndpoint, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *glue.DevEndpoint:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type glue.DevEndpoint not found", name)
+}
+
+// GetAllGlueJobResources retrieves all glue.Job items from an AWS CloudFormation template
+func (t *Template) GetAllGlueJobResources() map[string]*glue.Job {
+	results := map[string]*glue.Job{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *glue.Job:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGlueJobWithName retrieves all glue.Job items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGlueJobWithName(name string) (*glue.Job, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *glue.Job:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type glue.Job not found", name)
+}
+
+// GetAllGlueMLTransformResources retrieves all glue.MLTransform items from an AWS CloudFormation template
+func (t *Template) GetAllGlueMLTransformResources() map[string]*glue.MLTransform {
+	results := map[string]*glue.MLTransform{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *glue.MLTransform:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGlueMLTransformWithName retrieves all glue.MLTransform items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGlueMLTransformWithName(name string) (*glue.MLTransform, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *glue.MLTransform:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type glue.MLTransform not found", name)
+}
+
+// GetAllGluePartitionResources retrieves all glue.Partition items from an AWS CloudFormation template
+func (t *Template) GetAllGluePartitionResources() map[string]*glue.Partition {
+	results := map[string]*glue.Partition{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *glue.Partition:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGluePartitionWithName retrieves all glue.Partition items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGluePartitionWithName(name string) (*glue.Partition, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *glue.Partition:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type glue.Partition not found", name)
+}
+
+// GetAllGlueRegistryResources retrieves all glue.Registry items from an AWS CloudFormation template
+func (t *Template) GetAllGlueRegistryResources() map[string]*glue.Registry {
+	results := map[string]*glue.Registry{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *glue.Registry:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGlueRegistryWithName retrieves all glue.Registry items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGlueRegistryWithName(name string) (*glue.Registry, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *glue.Registry:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type glue.Registry not found", name)
+}
+
+// GetAllGlueSchemaResources retrieves all glue.Schema items from an AWS CloudFormation template
+func (t *Template) GetAllGlueSchemaResources() map[string]*glue.Schema {
+	results := map[string]*glue.Schema{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *glue.Schema:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGlueSchemaWithName retrieves all glue.Schema items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGlueSchemaWithName(name string) (*glue.Schema, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *glue.Schema:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type glue.Schema not found", name)
+}
+
+// GetAllGlueSchemaVersionResources retrieves all glue.SchemaVersion items from an AWS CloudFormation template
+func (t *Template) GetAllGlueSchemaVersionResources() map[string]*glue.SchemaVersion {
+	results := map[string]*glue.SchemaVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *glue.SchemaVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGlueSchemaVersionWithName retrieves all glue.SchemaVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGlueSchemaVersionWithName(name string) (*glue.SchemaVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *glue.SchemaVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type glue.SchemaVersion not found", name)
+}
+
+// GetAllGlueSchemaVersionMetadataResources retrieves all glue.SchemaVersionMetadata items from an AWS CloudFormation template
+func (t *Template) GetAllGlueSchemaVersionMetadataResources() map[string]*glue.SchemaVersionMetadata {
+	results := map[string]*glue.SchemaVersionMetadata{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *glue.SchemaVersionMetadata:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGlueSchemaVersionMetadataWithName retrieves all glue.SchemaVersionMetadata items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGlueSchemaVersionMetadataWithName(name string) (*glue.SchemaVersionMetadata, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *glue.SchemaVersionMetadata:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type glue.SchemaVersionMetadata not found", name)
+}
+
+// GetAllGlueSecurityConfigurationResources retrieves all glue.SecurityConfiguration items from an AWS CloudFormation template
+func (t *Template) GetAllGlueSecurityConfigurationResources() map[string]*glue.SecurityConfiguration {
+	results := map[string]*glue.SecurityConfiguration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *glue.SecurityConfiguration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGlueSecurityConfigurationWithName retrieves all glue.SecurityConfiguration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGlueSecurityConfigurationWithName(name string) (*glue.SecurityConfiguration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *glue.SecurityConfiguration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type glue.SecurityConfiguration not found", name)
+}
+
+// GetAllGlueTableResources retrieves all glue.Table items from an AWS CloudFormation template
+func (t *Template) GetAllGlueTableResources() map[string]*glue.Table {
+	results := map[string]*glue.Table{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *glue.Table:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGlueTableWithName retrieves all glue.Table items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGlueTableWithName(name string) (*glue.Table, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *glue.Table:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type glue.Table not found", name)
+}
+
+// GetAllGlueTriggerResources retrieves all glue.Trigger items from an AWS CloudFormation template
+func (t *Template) GetAllGlueTriggerResources() map[string]*glue.Trigger {
+	results := map[string]*glue.Trigger{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *glue.Trigger:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGlueTriggerWithName retrieves all glue.Trigger items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGlueTriggerWithName(name string) (*glue.Trigger, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *glue.Trigger:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type glue.Trigger 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{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *glue.Workflow:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGlueWorkflowWithName retrieves all glue.Workflow items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGlueWorkflowWithName(name string) (*glue.Workflow, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *glue.Workflow:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type glue.Workflow not found", name)
+}
+
+// GetAllGreengrassConnectorDefinitionResources retrieves all greengrass.ConnectorDefinition items from an AWS CloudFormation template
+func (t *Template) GetAllGreengrassConnectorDefinitionResources() map[string]*greengrass.ConnectorDefinition {
+	results := map[string]*greengrass.ConnectorDefinition{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *greengrass.ConnectorDefinition:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGreengrassConnectorDefinitionWithName retrieves all greengrass.ConnectorDefinition items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGreengrassConnectorDefinitionWithName(name string) (*greengrass.ConnectorDefinition, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *greengrass.ConnectorDefinition:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type greengrass.ConnectorDefinition not found", name)
+}
+
+// GetAllGreengrassConnectorDefinitionVersionResources retrieves all greengrass.ConnectorDefinitionVersion items from an AWS CloudFormation template
+func (t *Template) GetAllGreengrassConnectorDefinitionVersionResources() map[string]*greengrass.ConnectorDefinitionVersion {
+	results := map[string]*greengrass.ConnectorDefinitionVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *greengrass.ConnectorDefinitionVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGreengrassConnectorDefinitionVersionWithName retrieves all greengrass.ConnectorDefinitionVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGreengrassConnectorDefinitionVersionWithName(name string) (*greengrass.ConnectorDefinitionVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *greengrass.ConnectorDefinitionVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type greengrass.ConnectorDefinitionVersion not found", name)
+}
+
+// GetAllGreengrassCoreDefinitionResources retrieves all greengrass.CoreDefinition items from an AWS CloudFormation template
+func (t *Template) GetAllGreengrassCoreDefinitionResources() map[string]*greengrass.CoreDefinition {
+	results := map[string]*greengrass.CoreDefinition{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *greengrass.CoreDefinition:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGreengrassCoreDefinitionWithName retrieves all greengrass.CoreDefinition items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGreengrassCoreDefinitionWithName(name string) (*greengrass.CoreDefinition, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *greengrass.CoreDefinition:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type greengrass.CoreDefinition not found", name)
+}
+
+// GetAllGreengrassCoreDefinitionVersionResources retrieves all greengrass.CoreDefinitionVersion items from an AWS CloudFormation template
+func (t *Template) GetAllGreengrassCoreDefinitionVersionResources() map[string]*greengrass.CoreDefinitionVersion {
+	results := map[string]*greengrass.CoreDefinitionVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *greengrass.CoreDefinitionVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGreengrassCoreDefinitionVersionWithName retrieves all greengrass.CoreDefinitionVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGreengrassCoreDefinitionVersionWithName(name string) (*greengrass.CoreDefinitionVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *greengrass.CoreDefinitionVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type greengrass.CoreDefinitionVersion not found", name)
+}
+
+// GetAllGreengrassDeviceDefinitionResources retrieves all greengrass.DeviceDefinition items from an AWS CloudFormation template
+func (t *Template) GetAllGreengrassDeviceDefinitionResources() map[string]*greengrass.DeviceDefinition {
+	results := map[string]*greengrass.DeviceDefinition{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *greengrass.DeviceDefinition:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGreengrassDeviceDefinitionWithName retrieves all greengrass.DeviceDefinition items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGreengrassDeviceDefinitionWithName(name string) (*greengrass.DeviceDefinition, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *greengrass.DeviceDefinition:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type greengrass.DeviceDefinition not found", name)
+}
+
+// GetAllGreengrassDeviceDefinitionVersionResources retrieves all greengrass.DeviceDefinitionVersion items from an AWS CloudFormation template
+func (t *Template) GetAllGreengrassDeviceDefinitionVersionResources() map[string]*greengrass.DeviceDefinitionVersion {
+	results := map[string]*greengrass.DeviceDefinitionVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *greengrass.DeviceDefinitionVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGreengrassDeviceDefinitionVersionWithName retrieves all greengrass.DeviceDefinitionVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGreengrassDeviceDefinitionVersionWithName(name string) (*greengrass.DeviceDefinitionVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *greengrass.DeviceDefinitionVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type greengrass.DeviceDefinitionVersion not found", name)
+}
+
+// GetAllGreengrassFunctionDefinitionResources retrieves all greengrass.FunctionDefinition items from an AWS CloudFormation template
+func (t *Template) GetAllGreengrassFunctionDefinitionResources() map[string]*greengrass.FunctionDefinition {
+	results := map[string]*greengrass.FunctionDefinition{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *greengrass.FunctionDefinition:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGreengrassFunctionDefinitionWithName retrieves all greengrass.FunctionDefinition items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGreengrassFunctionDefinitionWithName(name string) (*greengrass.FunctionDefinition, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *greengrass.FunctionDefinition:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type greengrass.FunctionDefinition not found", name)
+}
+
+// GetAllGreengrassFunctionDefinitionVersionResources retrieves all greengrass.FunctionDefinitionVersion items from an AWS CloudFormation template
+func (t *Template) GetAllGreengrassFunctionDefinitionVersionResources() map[string]*greengrass.FunctionDefinitionVersion {
+	results := map[string]*greengrass.FunctionDefinitionVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *greengrass.FunctionDefinitionVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGreengrassFunctionDefinitionVersionWithName retrieves all greengrass.FunctionDefinitionVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGreengrassFunctionDefinitionVersionWithName(name string) (*greengrass.FunctionDefinitionVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *greengrass.FunctionDefinitionVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type greengrass.FunctionDefinitionVersion not found", name)
+}
+
+// GetAllGreengrassGroupResources retrieves all greengrass.Group items from an AWS CloudFormation template
+func (t *Template) GetAllGreengrassGroupResources() map[string]*greengrass.Group {
+	results := map[string]*greengrass.Group{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *greengrass.Group:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGreengrassGroupWithName retrieves all greengrass.Group items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGreengrassGroupWithName(name string) (*greengrass.Group, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *greengrass.Group:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type greengrass.Group not found", name)
+}
+
+// GetAllGreengrassGroupVersionResources retrieves all greengrass.GroupVersion items from an AWS CloudFormation template
+func (t *Template) GetAllGreengrassGroupVersionResources() map[string]*greengrass.GroupVersion {
+	results := map[string]*greengrass.GroupVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *greengrass.GroupVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGreengrassGroupVersionWithName retrieves all greengrass.GroupVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGreengrassGroupVersionWithName(name string) (*greengrass.GroupVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *greengrass.GroupVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type greengrass.GroupVersion not found", name)
+}
+
+// GetAllGreengrassLoggerDefinitionResources retrieves all greengrass.LoggerDefinition items from an AWS CloudFormation template
+func (t *Template) GetAllGreengrassLoggerDefinitionResources() map[string]*greengrass.LoggerDefinition {
+	results := map[string]*greengrass.LoggerDefinition{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *greengrass.LoggerDefinition:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGreengrassLoggerDefinitionWithName retrieves all greengrass.LoggerDefinition items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGreengrassLoggerDefinitionWithName(name string) (*greengrass.LoggerDefinition, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *greengrass.LoggerDefinition:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type greengrass.LoggerDefinition not found", name)
+}
+
+// GetAllGreengrassLoggerDefinitionVersionResources retrieves all greengrass.LoggerDefinitionVersion items from an AWS CloudFormation template
+func (t *Template) GetAllGreengrassLoggerDefinitionVersionResources() map[string]*greengrass.LoggerDefinitionVersion {
+	results := map[string]*greengrass.LoggerDefinitionVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *greengrass.LoggerDefinitionVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGreengrassLoggerDefinitionVersionWithName retrieves all greengrass.LoggerDefinitionVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGreengrassLoggerDefinitionVersionWithName(name string) (*greengrass.LoggerDefinitionVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *greengrass.LoggerDefinitionVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type greengrass.LoggerDefinitionVersion not found", name)
+}
+
+// GetAllGreengrassResourceDefinitionResources retrieves all greengrass.ResourceDefinition items from an AWS CloudFormation template
+func (t *Template) GetAllGreengrassResourceDefinitionResources() map[string]*greengrass.ResourceDefinition {
+	results := map[string]*greengrass.ResourceDefinition{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *greengrass.ResourceDefinition:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGreengrassResourceDefinitionWithName retrieves all greengrass.ResourceDefinition items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGreengrassResourceDefinitionWithName(name string) (*greengrass.ResourceDefinition, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *greengrass.ResourceDefinition:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type greengrass.ResourceDefinition not found", name)
+}
+
+// GetAllGreengrassResourceDefinitionVersionResources retrieves all greengrass.ResourceDefinitionVersion items from an AWS CloudFormation template
+func (t *Template) GetAllGreengrassResourceDefinitionVersionResources() map[string]*greengrass.ResourceDefinitionVersion {
+	results := map[string]*greengrass.ResourceDefinitionVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *greengrass.ResourceDefinitionVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGreengrassResourceDefinitionVersionWithName retrieves all greengrass.ResourceDefinitionVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGreengrassResourceDefinitionVersionWithName(name string) (*greengrass.ResourceDefinitionVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *greengrass.ResourceDefinitionVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type greengrass.ResourceDefinitionVersion not found", name)
+}
+
+// GetAllGreengrassSubscriptionDefinitionResources retrieves all greengrass.SubscriptionDefinition items from an AWS CloudFormation template
+func (t *Template) GetAllGreengrassSubscriptionDefinitionResources() map[string]*greengrass.SubscriptionDefinition {
+	results := map[string]*greengrass.SubscriptionDefinition{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *greengrass.SubscriptionDefinition:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGreengrassSubscriptionDefinitionWithName retrieves all greengrass.SubscriptionDefinition items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGreengrassSubscriptionDefinitionWithName(name string) (*greengrass.SubscriptionDefinition, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *greengrass.SubscriptionDefinition:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type greengrass.SubscriptionDefinition not found", name)
+}
+
+// GetAllGreengrassSubscriptionDefinitionVersionResources retrieves all greengrass.SubscriptionDefinitionVersion items from an AWS CloudFormation template
+func (t *Template) GetAllGreengrassSubscriptionDefinitionVersionResources() map[string]*greengrass.SubscriptionDefinitionVersion {
+	results := map[string]*greengrass.SubscriptionDefinitionVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *greengrass.SubscriptionDefinitionVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGreengrassSubscriptionDefinitionVersionWithName retrieves all greengrass.SubscriptionDefinitionVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGreengrassSubscriptionDefinitionVersionWithName(name string) (*greengrass.SubscriptionDefinitionVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *greengrass.SubscriptionDefinitionVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type greengrass.SubscriptionDefinitionVersion not found", name)
+}
+
+// GetAllGreengrassV2ComponentVersionResources retrieves all greengrassv2.ComponentVersion items from an AWS CloudFormation template
+func (t *Template) GetAllGreengrassV2ComponentVersionResources() map[string]*greengrassv2.ComponentVersion {
+	results := map[string]*greengrassv2.ComponentVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *greengrassv2.ComponentVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGreengrassV2ComponentVersionWithName retrieves all greengrassv2.ComponentVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGreengrassV2ComponentVersionWithName(name string) (*greengrassv2.ComponentVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *greengrassv2.ComponentVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type greengrassv2.ComponentVersion not found", name)
+}
+
+// GetAllGroundStationConfigResources retrieves all groundstation.Config items from an AWS CloudFormation template
+func (t *Template) GetAllGroundStationConfigResources() map[string]*groundstation.Config {
+	results := map[string]*groundstation.Config{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *groundstation.Config:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGroundStationConfigWithName retrieves all groundstation.Config items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGroundStationConfigWithName(name string) (*groundstation.Config, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *groundstation.Config:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type groundstation.Config not found", name)
+}
+
+// GetAllGroundStationDataflowEndpointGroupResources retrieves all groundstation.DataflowEndpointGroup items from an AWS CloudFormation template
+func (t *Template) GetAllGroundStationDataflowEndpointGroupResources() map[string]*groundstation.DataflowEndpointGroup {
+	results := map[string]*groundstation.DataflowEndpointGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *groundstation.DataflowEndpointGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGroundStationDataflowEndpointGroupWithName retrieves all groundstation.DataflowEndpointGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGroundStationDataflowEndpointGroupWithName(name string) (*groundstation.DataflowEndpointGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *groundstation.DataflowEndpointGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type groundstation.DataflowEndpointGroup not found", name)
+}
+
+// GetAllGroundStationMissionProfileResources retrieves all groundstation.MissionProfile items from an AWS CloudFormation template
+func (t *Template) GetAllGroundStationMissionProfileResources() map[string]*groundstation.MissionProfile {
+	results := map[string]*groundstation.MissionProfile{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *groundstation.MissionProfile:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGroundStationMissionProfileWithName retrieves all groundstation.MissionProfile items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGroundStationMissionProfileWithName(name string) (*groundstation.MissionProfile, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *groundstation.MissionProfile:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type groundstation.MissionProfile not found", name)
+}
+
+// GetAllGuardDutyDetectorResources retrieves all guardduty.Detector items from an AWS CloudFormation template
+func (t *Template) GetAllGuardDutyDetectorResources() map[string]*guardduty.Detector {
+	results := map[string]*guardduty.Detector{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *guardduty.Detector:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGuardDutyDetectorWithName retrieves all guardduty.Detector items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGuardDutyDetectorWithName(name string) (*guardduty.Detector, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *guardduty.Detector:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type guardduty.Detector not found", name)
+}
+
+// GetAllGuardDutyFilterResources retrieves all guardduty.Filter items from an AWS CloudFormation template
+func (t *Template) GetAllGuardDutyFilterResources() map[string]*guardduty.Filter {
+	results := map[string]*guardduty.Filter{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *guardduty.Filter:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGuardDutyFilterWithName retrieves all guardduty.Filter items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGuardDutyFilterWithName(name string) (*guardduty.Filter, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *guardduty.Filter:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type guardduty.Filter not found", name)
+}
+
+// GetAllGuardDutyIPSetResources retrieves all guardduty.IPSet items from an AWS CloudFormation template
+func (t *Template) GetAllGuardDutyIPSetResources() map[string]*guardduty.IPSet {
+	results := map[string]*guardduty.IPSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *guardduty.IPSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGuardDutyIPSetWithName retrieves all guardduty.IPSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGuardDutyIPSetWithName(name string) (*guardduty.IPSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *guardduty.IPSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type guardduty.IPSet 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{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *guardduty.Master:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGuardDutyMasterWithName retrieves all guardduty.Master items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGuardDutyMasterWithName(name string) (*guardduty.Master, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *guardduty.Master:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type guardduty.Master not found", name)
+}
+
+// GetAllGuardDutyMemberResources retrieves all guardduty.Member items from an AWS CloudFormation template
+func (t *Template) GetAllGuardDutyMemberResources() map[string]*guardduty.Member {
+	results := map[string]*guardduty.Member{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *guardduty.Member:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGuardDutyMemberWithName retrieves all guardduty.Member items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGuardDutyMemberWithName(name string) (*guardduty.Member, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *guardduty.Member:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type guardduty.Member not found", name)
+}
+
+// GetAllGuardDutyThreatIntelSetResources retrieves all guardduty.ThreatIntelSet items from an AWS CloudFormation template
+func (t *Template) GetAllGuardDutyThreatIntelSetResources() map[string]*guardduty.ThreatIntelSet {
+	results := map[string]*guardduty.ThreatIntelSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *guardduty.ThreatIntelSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetGuardDutyThreatIntelSetWithName retrieves all guardduty.ThreatIntelSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetGuardDutyThreatIntelSetWithName(name string) (*guardduty.ThreatIntelSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *guardduty.ThreatIntelSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type guardduty.ThreatIntelSet not found", name)
+}
+
+// GetAllHealthLakeFHIRDatastoreResources retrieves all healthlake.FHIRDatastore items from an AWS CloudFormation template
+func (t *Template) GetAllHealthLakeFHIRDatastoreResources() map[string]*healthlake.FHIRDatastore {
+	results := map[string]*healthlake.FHIRDatastore{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *healthlake.FHIRDatastore:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetHealthLakeFHIRDatastoreWithName retrieves all healthlake.FHIRDatastore items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetHealthLakeFHIRDatastoreWithName(name string) (*healthlake.FHIRDatastore, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *healthlake.FHIRDatastore:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type healthlake.FHIRDatastore not found", name)
+}
+
+// GetAllIAMAccessKeyResources retrieves all iam.AccessKey items from an AWS CloudFormation template
+func (t *Template) GetAllIAMAccessKeyResources() map[string]*iam.AccessKey {
+	results := map[string]*iam.AccessKey{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iam.AccessKey:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIAMAccessKeyWithName retrieves all iam.AccessKey items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIAMAccessKeyWithName(name string) (*iam.AccessKey, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iam.AccessKey:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iam.AccessKey not found", name)
+}
+
+// GetAllIAMGroupResources retrieves all iam.Group items from an AWS CloudFormation template
+func (t *Template) GetAllIAMGroupResources() map[string]*iam.Group {
+	results := map[string]*iam.Group{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iam.Group:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIAMGroupWithName retrieves all iam.Group items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIAMGroupWithName(name string) (*iam.Group, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iam.Group:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iam.Group not found", name)
+}
+
+// GetAllIAMInstanceProfileResources retrieves all iam.InstanceProfile items from an AWS CloudFormation template
+func (t *Template) GetAllIAMInstanceProfileResources() map[string]*iam.InstanceProfile {
+	results := map[string]*iam.InstanceProfile{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iam.InstanceProfile:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIAMInstanceProfileWithName retrieves all iam.InstanceProfile items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIAMInstanceProfileWithName(name string) (*iam.InstanceProfile, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iam.InstanceProfile:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iam.InstanceProfile not found", name)
+}
+
+// GetAllIAMManagedPolicyResources retrieves all iam.ManagedPolicy items from an AWS CloudFormation template
+func (t *Template) GetAllIAMManagedPolicyResources() map[string]*iam.ManagedPolicy {
+	results := map[string]*iam.ManagedPolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iam.ManagedPolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIAMManagedPolicyWithName retrieves all iam.ManagedPolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIAMManagedPolicyWithName(name string) (*iam.ManagedPolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iam.ManagedPolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iam.ManagedPolicy not found", name)
+}
+
+// GetAllIAMOIDCProviderResources retrieves all iam.OIDCProvider items from an AWS CloudFormation template
+func (t *Template) GetAllIAMOIDCProviderResources() map[string]*iam.OIDCProvider {
+	results := map[string]*iam.OIDCProvider{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iam.OIDCProvider:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIAMOIDCProviderWithName retrieves all iam.OIDCProvider items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIAMOIDCProviderWithName(name string) (*iam.OIDCProvider, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iam.OIDCProvider:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iam.OIDCProvider not found", name)
+}
+
+// GetAllIAMPolicyResources retrieves all iam.Policy items from an AWS CloudFormation template
+func (t *Template) GetAllIAMPolicyResources() map[string]*iam.Policy {
+	results := map[string]*iam.Policy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iam.Policy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIAMPolicyWithName retrieves all iam.Policy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIAMPolicyWithName(name string) (*iam.Policy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iam.Policy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iam.Policy not found", name)
+}
+
+// GetAllIAMRoleResources retrieves all iam.Role items from an AWS CloudFormation template
+func (t *Template) GetAllIAMRoleResources() map[string]*iam.Role {
+	results := map[string]*iam.Role{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iam.Role:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIAMRoleWithName retrieves all iam.Role items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIAMRoleWithName(name string) (*iam.Role, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iam.Role:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iam.Role not found", name)
+}
+
+// GetAllIAMSAMLProviderResources retrieves all iam.SAMLProvider items from an AWS CloudFormation template
+func (t *Template) GetAllIAMSAMLProviderResources() map[string]*iam.SAMLProvider {
+	results := map[string]*iam.SAMLProvider{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iam.SAMLProvider:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIAMSAMLProviderWithName retrieves all iam.SAMLProvider items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIAMSAMLProviderWithName(name string) (*iam.SAMLProvider, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iam.SAMLProvider:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iam.SAMLProvider not found", name)
+}
+
+// GetAllIAMServerCertificateResources retrieves all iam.ServerCertificate items from an AWS CloudFormation template
+func (t *Template) GetAllIAMServerCertificateResources() map[string]*iam.ServerCertificate {
+	results := map[string]*iam.ServerCertificate{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iam.ServerCertificate:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIAMServerCertificateWithName retrieves all iam.ServerCertificate items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIAMServerCertificateWithName(name string) (*iam.ServerCertificate, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iam.ServerCertificate:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iam.ServerCertificate not found", name)
+}
+
+// GetAllIAMServiceLinkedRoleResources retrieves all iam.ServiceLinkedRole items from an AWS CloudFormation template
+func (t *Template) GetAllIAMServiceLinkedRoleResources() map[string]*iam.ServiceLinkedRole {
+	results := map[string]*iam.ServiceLinkedRole{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iam.ServiceLinkedRole:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIAMServiceLinkedRoleWithName retrieves all iam.ServiceLinkedRole items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIAMServiceLinkedRoleWithName(name string) (*iam.ServiceLinkedRole, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iam.ServiceLinkedRole:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iam.ServiceLinkedRole not found", name)
+}
+
+// GetAllIAMUserResources retrieves all iam.User items from an AWS CloudFormation template
+func (t *Template) GetAllIAMUserResources() map[string]*iam.User {
+	results := map[string]*iam.User{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iam.User:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIAMUserWithName retrieves all iam.User items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIAMUserWithName(name string) (*iam.User, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iam.User:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iam.User not found", name)
+}
+
+// GetAllIAMUserToGroupAdditionResources retrieves all iam.UserToGroupAddition items from an AWS CloudFormation template
+func (t *Template) GetAllIAMUserToGroupAdditionResources() map[string]*iam.UserToGroupAddition {
+	results := map[string]*iam.UserToGroupAddition{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iam.UserToGroupAddition:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIAMUserToGroupAdditionWithName retrieves all iam.UserToGroupAddition items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIAMUserToGroupAdditionWithName(name string) (*iam.UserToGroupAddition, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iam.UserToGroupAddition:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iam.UserToGroupAddition not found", name)
+}
+
+// GetAllIAMVirtualMFADeviceResources retrieves all iam.VirtualMFADevice items from an AWS CloudFormation template
+func (t *Template) GetAllIAMVirtualMFADeviceResources() map[string]*iam.VirtualMFADevice {
+	results := map[string]*iam.VirtualMFADevice{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iam.VirtualMFADevice:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIAMVirtualMFADeviceWithName retrieves all iam.VirtualMFADevice items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIAMVirtualMFADeviceWithName(name string) (*iam.VirtualMFADevice, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iam.VirtualMFADevice:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iam.VirtualMFADevice not found", name)
+}
+
+// GetAllIVSChannelResources retrieves all ivs.Channel items from an AWS CloudFormation template
+func (t *Template) GetAllIVSChannelResources() map[string]*ivs.Channel {
+	results := map[string]*ivs.Channel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ivs.Channel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIVSChannelWithName retrieves all ivs.Channel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIVSChannelWithName(name string) (*ivs.Channel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ivs.Channel:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ivs.Channel not found", name)
+}
+
+// GetAllIVSPlaybackKeyPairResources retrieves all ivs.PlaybackKeyPair items from an AWS CloudFormation template
+func (t *Template) GetAllIVSPlaybackKeyPairResources() map[string]*ivs.PlaybackKeyPair {
+	results := map[string]*ivs.PlaybackKeyPair{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ivs.PlaybackKeyPair:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIVSPlaybackKeyPairWithName retrieves all ivs.PlaybackKeyPair items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIVSPlaybackKeyPairWithName(name string) (*ivs.PlaybackKeyPair, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ivs.PlaybackKeyPair:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ivs.PlaybackKeyPair 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{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ivs.RecordingConfiguration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIVSRecordingConfigurationWithName retrieves all ivs.RecordingConfiguration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIVSRecordingConfigurationWithName(name string) (*ivs.RecordingConfiguration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ivs.RecordingConfiguration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ivs.RecordingConfiguration not found", name)
+}
+
+// GetAllIVSStreamKeyResources retrieves all ivs.StreamKey items from an AWS CloudFormation template
+func (t *Template) GetAllIVSStreamKeyResources() map[string]*ivs.StreamKey {
+	results := map[string]*ivs.StreamKey{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ivs.StreamKey:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIVSStreamKeyWithName retrieves all ivs.StreamKey items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIVSStreamKeyWithName(name string) (*ivs.StreamKey, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ivs.StreamKey:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ivs.StreamKey not found", name)
+}
+
+// GetAllImageBuilderComponentResources retrieves all imagebuilder.Component items from an AWS CloudFormation template
+func (t *Template) GetAllImageBuilderComponentResources() map[string]*imagebuilder.Component {
+	results := map[string]*imagebuilder.Component{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *imagebuilder.Component:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetImageBuilderComponentWithName retrieves all imagebuilder.Component items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetImageBuilderComponentWithName(name string) (*imagebuilder.Component, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *imagebuilder.Component:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type imagebuilder.Component not found", name)
+}
+
+// GetAllImageBuilderContainerRecipeResources retrieves all imagebuilder.ContainerRecipe items from an AWS CloudFormation template
+func (t *Template) GetAllImageBuilderContainerRecipeResources() map[string]*imagebuilder.ContainerRecipe {
+	results := map[string]*imagebuilder.ContainerRecipe{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *imagebuilder.ContainerRecipe:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetImageBuilderContainerRecipeWithName retrieves all imagebuilder.ContainerRecipe items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetImageBuilderContainerRecipeWithName(name string) (*imagebuilder.ContainerRecipe, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *imagebuilder.ContainerRecipe:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type imagebuilder.ContainerRecipe not found", name)
+}
+
+// GetAllImageBuilderDistributionConfigurationResources retrieves all imagebuilder.DistributionConfiguration items from an AWS CloudFormation template
+func (t *Template) GetAllImageBuilderDistributionConfigurationResources() map[string]*imagebuilder.DistributionConfiguration {
+	results := map[string]*imagebuilder.DistributionConfiguration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *imagebuilder.DistributionConfiguration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetImageBuilderDistributionConfigurationWithName retrieves all imagebuilder.DistributionConfiguration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetImageBuilderDistributionConfigurationWithName(name string) (*imagebuilder.DistributionConfiguration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *imagebuilder.DistributionConfiguration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type imagebuilder.DistributionConfiguration not found", name)
+}
+
+// GetAllImageBuilderImageResources retrieves all imagebuilder.Image items from an AWS CloudFormation template
+func (t *Template) GetAllImageBuilderImageResources() map[string]*imagebuilder.Image {
+	results := map[string]*imagebuilder.Image{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *imagebuilder.Image:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetImageBuilderImageWithName retrieves all imagebuilder.Image items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetImageBuilderImageWithName(name string) (*imagebuilder.Image, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *imagebuilder.Image:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type imagebuilder.Image not found", name)
+}
+
+// GetAllImageBuilderImagePipelineResources retrieves all imagebuilder.ImagePipeline items from an AWS CloudFormation template
+func (t *Template) GetAllImageBuilderImagePipelineResources() map[string]*imagebuilder.ImagePipeline {
+	results := map[string]*imagebuilder.ImagePipeline{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *imagebuilder.ImagePipeline:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetImageBuilderImagePipelineWithName retrieves all imagebuilder.ImagePipeline items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetImageBuilderImagePipelineWithName(name string) (*imagebuilder.ImagePipeline, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *imagebuilder.ImagePipeline:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type imagebuilder.ImagePipeline not found", name)
+}
+
+// GetAllImageBuilderImageRecipeResources retrieves all imagebuilder.ImageRecipe items from an AWS CloudFormation template
+func (t *Template) GetAllImageBuilderImageRecipeResources() map[string]*imagebuilder.ImageRecipe {
+	results := map[string]*imagebuilder.ImageRecipe{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *imagebuilder.ImageRecipe:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetImageBuilderImageRecipeWithName retrieves all imagebuilder.ImageRecipe items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetImageBuilderImageRecipeWithName(name string) (*imagebuilder.ImageRecipe, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *imagebuilder.ImageRecipe:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type imagebuilder.ImageRecipe not found", name)
+}
+
+// GetAllImageBuilderInfrastructureConfigurationResources retrieves all imagebuilder.InfrastructureConfiguration items from an AWS CloudFormation template
+func (t *Template) GetAllImageBuilderInfrastructureConfigurationResources() map[string]*imagebuilder.InfrastructureConfiguration {
+	results := map[string]*imagebuilder.InfrastructureConfiguration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *imagebuilder.InfrastructureConfiguration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetImageBuilderInfrastructureConfigurationWithName retrieves all imagebuilder.InfrastructureConfiguration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetImageBuilderInfrastructureConfigurationWithName(name string) (*imagebuilder.InfrastructureConfiguration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *imagebuilder.InfrastructureConfiguration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type imagebuilder.InfrastructureConfiguration not found", name)
+}
+
+// GetAllInspectorAssessmentTargetResources retrieves all inspector.AssessmentTarget items from an AWS CloudFormation template
+func (t *Template) GetAllInspectorAssessmentTargetResources() map[string]*inspector.AssessmentTarget {
+	results := map[string]*inspector.AssessmentTarget{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *inspector.AssessmentTarget:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetInspectorAssessmentTargetWithName retrieves all inspector.AssessmentTarget items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetInspectorAssessmentTargetWithName(name string) (*inspector.AssessmentTarget, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *inspector.AssessmentTarget:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type inspector.AssessmentTarget not found", name)
+}
+
+// GetAllInspectorAssessmentTemplateResources retrieves all inspector.AssessmentTemplate items from an AWS CloudFormation template
+func (t *Template) GetAllInspectorAssessmentTemplateResources() map[string]*inspector.AssessmentTemplate {
+	results := map[string]*inspector.AssessmentTemplate{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *inspector.AssessmentTemplate:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetInspectorAssessmentTemplateWithName retrieves all inspector.AssessmentTemplate items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetInspectorAssessmentTemplateWithName(name string) (*inspector.AssessmentTemplate, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *inspector.AssessmentTemplate:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type inspector.AssessmentTemplate not found", name)
+}
+
+// GetAllInspectorResourceGroupResources retrieves all inspector.ResourceGroup items from an AWS CloudFormation template
+func (t *Template) GetAllInspectorResourceGroupResources() map[string]*inspector.ResourceGroup {
+	results := map[string]*inspector.ResourceGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *inspector.ResourceGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetInspectorResourceGroupWithName retrieves all inspector.ResourceGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetInspectorResourceGroupWithName(name string) (*inspector.ResourceGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *inspector.ResourceGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type inspector.ResourceGroup not found", name)
+}
+
+// GetAllIoT1ClickDeviceResources retrieves all iot1click.Device items from an AWS CloudFormation template
+func (t *Template) GetAllIoT1ClickDeviceResources() map[string]*iot1click.Device {
+	results := map[string]*iot1click.Device{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot1click.Device:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoT1ClickDeviceWithName retrieves all iot1click.Device items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoT1ClickDeviceWithName(name string) (*iot1click.Device, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot1click.Device:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot1click.Device not found", name)
+}
+
+// GetAllIoT1ClickPlacementResources retrieves all iot1click.Placement items from an AWS CloudFormation template
+func (t *Template) GetAllIoT1ClickPlacementResources() map[string]*iot1click.Placement {
+	results := map[string]*iot1click.Placement{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot1click.Placement:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoT1ClickPlacementWithName retrieves all iot1click.Placement items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoT1ClickPlacementWithName(name string) (*iot1click.Placement, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot1click.Placement:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot1click.Placement not found", name)
+}
+
+// GetAllIoT1ClickProjectResources retrieves all iot1click.Project items from an AWS CloudFormation template
+func (t *Template) GetAllIoT1ClickProjectResources() map[string]*iot1click.Project {
+	results := map[string]*iot1click.Project{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot1click.Project:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoT1ClickProjectWithName retrieves all iot1click.Project items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoT1ClickProjectWithName(name string) (*iot1click.Project, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot1click.Project:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot1click.Project not found", name)
+}
+
+// GetAllIoTAccountAuditConfigurationResources retrieves all iot.AccountAuditConfiguration items from an AWS CloudFormation template
+func (t *Template) GetAllIoTAccountAuditConfigurationResources() map[string]*iot.AccountAuditConfiguration {
+	results := map[string]*iot.AccountAuditConfiguration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot.AccountAuditConfiguration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTAccountAuditConfigurationWithName retrieves all iot.AccountAuditConfiguration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTAccountAuditConfigurationWithName(name string) (*iot.AccountAuditConfiguration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot.AccountAuditConfiguration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot.AccountAuditConfiguration not found", name)
+}
+
+// GetAllIoTAuthorizerResources retrieves all iot.Authorizer items from an AWS CloudFormation template
+func (t *Template) GetAllIoTAuthorizerResources() map[string]*iot.Authorizer {
+	results := map[string]*iot.Authorizer{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot.Authorizer:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTAuthorizerWithName retrieves all iot.Authorizer items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTAuthorizerWithName(name string) (*iot.Authorizer, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot.Authorizer:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot.Authorizer not found", name)
+}
+
+// GetAllIoTCertificateResources retrieves all iot.Certificate items from an AWS CloudFormation template
+func (t *Template) GetAllIoTCertificateResources() map[string]*iot.Certificate {
+	results := map[string]*iot.Certificate{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot.Certificate:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTCertificateWithName retrieves all iot.Certificate items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTCertificateWithName(name string) (*iot.Certificate, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot.Certificate:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot.Certificate not found", name)
+}
+
+// GetAllIoTCustomMetricResources retrieves all iot.CustomMetric items from an AWS CloudFormation template
+func (t *Template) GetAllIoTCustomMetricResources() map[string]*iot.CustomMetric {
+	results := map[string]*iot.CustomMetric{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot.CustomMetric:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTCustomMetricWithName retrieves all iot.CustomMetric items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTCustomMetricWithName(name string) (*iot.CustomMetric, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot.CustomMetric:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot.CustomMetric not found", name)
+}
+
+// GetAllIoTDimensionResources retrieves all iot.Dimension items from an AWS CloudFormation template
+func (t *Template) GetAllIoTDimensionResources() map[string]*iot.Dimension {
+	results := map[string]*iot.Dimension{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot.Dimension:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTDimensionWithName retrieves all iot.Dimension items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTDimensionWithName(name string) (*iot.Dimension, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot.Dimension:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot.Dimension not found", name)
+}
+
+// GetAllIoTDomainConfigurationResources retrieves all iot.DomainConfiguration items from an AWS CloudFormation template
+func (t *Template) GetAllIoTDomainConfigurationResources() map[string]*iot.DomainConfiguration {
+	results := map[string]*iot.DomainConfiguration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot.DomainConfiguration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTDomainConfigurationWithName retrieves all iot.DomainConfiguration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTDomainConfigurationWithName(name string) (*iot.DomainConfiguration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot.DomainConfiguration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot.DomainConfiguration not found", name)
+}
+
+// GetAllIoTFleetMetricResources retrieves all iot.FleetMetric items from an AWS CloudFormation template
+func (t *Template) GetAllIoTFleetMetricResources() map[string]*iot.FleetMetric {
+	results := map[string]*iot.FleetMetric{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot.FleetMetric:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTFleetMetricWithName retrieves all iot.FleetMetric items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTFleetMetricWithName(name string) (*iot.FleetMetric, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot.FleetMetric:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot.FleetMetric not found", name)
+}
+
+// GetAllIoTJobTemplateResources retrieves all iot.JobTemplate items from an AWS CloudFormation template
+func (t *Template) GetAllIoTJobTemplateResources() map[string]*iot.JobTemplate {
+	results := map[string]*iot.JobTemplate{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot.JobTemplate:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTJobTemplateWithName retrieves all iot.JobTemplate items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTJobTemplateWithName(name string) (*iot.JobTemplate, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot.JobTemplate:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot.JobTemplate not found", name)
+}
+
+// GetAllIoTLoggingResources retrieves all iot.Logging items from an AWS CloudFormation template
+func (t *Template) GetAllIoTLoggingResources() map[string]*iot.Logging {
+	results := map[string]*iot.Logging{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot.Logging:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTLoggingWithName retrieves all iot.Logging items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTLoggingWithName(name string) (*iot.Logging, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot.Logging:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot.Logging not found", name)
+}
+
+// GetAllIoTMitigationActionResources retrieves all iot.MitigationAction items from an AWS CloudFormation template
+func (t *Template) GetAllIoTMitigationActionResources() map[string]*iot.MitigationAction {
+	results := map[string]*iot.MitigationAction{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot.MitigationAction:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTMitigationActionWithName retrieves all iot.MitigationAction items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTMitigationActionWithName(name string) (*iot.MitigationAction, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot.MitigationAction:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot.MitigationAction not found", name)
+}
+
+// GetAllIoTPolicyResources retrieves all iot.Policy items from an AWS CloudFormation template
+func (t *Template) GetAllIoTPolicyResources() map[string]*iot.Policy {
+	results := map[string]*iot.Policy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot.Policy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTPolicyWithName retrieves all iot.Policy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTPolicyWithName(name string) (*iot.Policy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot.Policy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot.Policy not found", name)
+}
+
+// GetAllIoTPolicyPrincipalAttachmentResources retrieves all iot.PolicyPrincipalAttachment items from an AWS CloudFormation template
+func (t *Template) GetAllIoTPolicyPrincipalAttachmentResources() map[string]*iot.PolicyPrincipalAttachment {
+	results := map[string]*iot.PolicyPrincipalAttachment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot.PolicyPrincipalAttachment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTPolicyPrincipalAttachmentWithName retrieves all iot.PolicyPrincipalAttachment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTPolicyPrincipalAttachmentWithName(name string) (*iot.PolicyPrincipalAttachment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot.PolicyPrincipalAttachment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot.PolicyPrincipalAttachment not found", name)
+}
+
+// GetAllIoTProvisioningTemplateResources retrieves all iot.ProvisioningTemplate items from an AWS CloudFormation template
+func (t *Template) GetAllIoTProvisioningTemplateResources() map[string]*iot.ProvisioningTemplate {
+	results := map[string]*iot.ProvisioningTemplate{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot.ProvisioningTemplate:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTProvisioningTemplateWithName retrieves all iot.ProvisioningTemplate items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTProvisioningTemplateWithName(name string) (*iot.ProvisioningTemplate, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot.ProvisioningTemplate:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot.ProvisioningTemplate not found", name)
+}
+
+// GetAllIoTResourceSpecificLoggingResources retrieves all iot.ResourceSpecificLogging items from an AWS CloudFormation template
+func (t *Template) GetAllIoTResourceSpecificLoggingResources() map[string]*iot.ResourceSpecificLogging {
+	results := map[string]*iot.ResourceSpecificLogging{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot.ResourceSpecificLogging:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTResourceSpecificLoggingWithName retrieves all iot.ResourceSpecificLogging items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTResourceSpecificLoggingWithName(name string) (*iot.ResourceSpecificLogging, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot.ResourceSpecificLogging:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot.ResourceSpecificLogging not found", name)
+}
+
+// GetAllIoTScheduledAuditResources retrieves all iot.ScheduledAudit items from an AWS CloudFormation template
+func (t *Template) GetAllIoTScheduledAuditResources() map[string]*iot.ScheduledAudit {
+	results := map[string]*iot.ScheduledAudit{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot.ScheduledAudit:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTScheduledAuditWithName retrieves all iot.ScheduledAudit items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTScheduledAuditWithName(name string) (*iot.ScheduledAudit, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot.ScheduledAudit:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot.ScheduledAudit not found", name)
+}
+
+// GetAllIoTSecurityProfileResources retrieves all iot.SecurityProfile items from an AWS CloudFormation template
+func (t *Template) GetAllIoTSecurityProfileResources() map[string]*iot.SecurityProfile {
+	results := map[string]*iot.SecurityProfile{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot.SecurityProfile:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTSecurityProfileWithName retrieves all iot.SecurityProfile items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTSecurityProfileWithName(name string) (*iot.SecurityProfile, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot.SecurityProfile:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot.SecurityProfile not found", name)
+}
+
+// GetAllIoTThingResources retrieves all iot.Thing items from an AWS CloudFormation template
+func (t *Template) GetAllIoTThingResources() map[string]*iot.Thing {
+	results := map[string]*iot.Thing{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot.Thing:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTThingWithName retrieves all iot.Thing items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTThingWithName(name string) (*iot.Thing, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot.Thing:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot.Thing not found", name)
+}
+
+// GetAllIoTThingPrincipalAttachmentResources retrieves all iot.ThingPrincipalAttachment items from an AWS CloudFormation template
+func (t *Template) GetAllIoTThingPrincipalAttachmentResources() map[string]*iot.ThingPrincipalAttachment {
+	results := map[string]*iot.ThingPrincipalAttachment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot.ThingPrincipalAttachment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTThingPrincipalAttachmentWithName retrieves all iot.ThingPrincipalAttachment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTThingPrincipalAttachmentWithName(name string) (*iot.ThingPrincipalAttachment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot.ThingPrincipalAttachment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot.ThingPrincipalAttachment not found", name)
+}
+
+// GetAllIoTTopicRuleResources retrieves all iot.TopicRule items from an AWS CloudFormation template
+func (t *Template) GetAllIoTTopicRuleResources() map[string]*iot.TopicRule {
+	results := map[string]*iot.TopicRule{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot.TopicRule:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTTopicRuleWithName retrieves all iot.TopicRule items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTTopicRuleWithName(name string) (*iot.TopicRule, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot.TopicRule:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot.TopicRule not found", name)
+}
+
+// GetAllIoTTopicRuleDestinationResources retrieves all iot.TopicRuleDestination items from an AWS CloudFormation template
+func (t *Template) GetAllIoTTopicRuleDestinationResources() map[string]*iot.TopicRuleDestination {
+	results := map[string]*iot.TopicRuleDestination{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iot.TopicRuleDestination:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTTopicRuleDestinationWithName retrieves all iot.TopicRuleDestination items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTTopicRuleDestinationWithName(name string) (*iot.TopicRuleDestination, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iot.TopicRuleDestination:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iot.TopicRuleDestination not found", name)
+}
+
+// GetAllIoTAnalyticsChannelResources retrieves all iotanalytics.Channel items from an AWS CloudFormation template
+func (t *Template) GetAllIoTAnalyticsChannelResources() map[string]*iotanalytics.Channel {
+	results := map[string]*iotanalytics.Channel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotanalytics.Channel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTAnalyticsChannelWithName retrieves all iotanalytics.Channel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTAnalyticsChannelWithName(name string) (*iotanalytics.Channel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotanalytics.Channel:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotanalytics.Channel not found", name)
+}
+
+// GetAllIoTAnalyticsDatasetResources retrieves all iotanalytics.Dataset items from an AWS CloudFormation template
+func (t *Template) GetAllIoTAnalyticsDatasetResources() map[string]*iotanalytics.Dataset {
+	results := map[string]*iotanalytics.Dataset{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotanalytics.Dataset:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTAnalyticsDatasetWithName retrieves all iotanalytics.Dataset items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTAnalyticsDatasetWithName(name string) (*iotanalytics.Dataset, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotanalytics.Dataset:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotanalytics.Dataset not found", name)
+}
+
+// GetAllIoTAnalyticsDatastoreResources retrieves all iotanalytics.Datastore items from an AWS CloudFormation template
+func (t *Template) GetAllIoTAnalyticsDatastoreResources() map[string]*iotanalytics.Datastore {
+	results := map[string]*iotanalytics.Datastore{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotanalytics.Datastore:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTAnalyticsDatastoreWithName retrieves all iotanalytics.Datastore items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTAnalyticsDatastoreWithName(name string) (*iotanalytics.Datastore, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotanalytics.Datastore:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotanalytics.Datastore not found", name)
+}
+
+// GetAllIoTAnalyticsPipelineResources retrieves all iotanalytics.Pipeline items from an AWS CloudFormation template
+func (t *Template) GetAllIoTAnalyticsPipelineResources() map[string]*iotanalytics.Pipeline {
+	results := map[string]*iotanalytics.Pipeline{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotanalytics.Pipeline:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTAnalyticsPipelineWithName retrieves all iotanalytics.Pipeline items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTAnalyticsPipelineWithName(name string) (*iotanalytics.Pipeline, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotanalytics.Pipeline:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotanalytics.Pipeline not found", name)
+}
+
+// GetAllIoTCoreDeviceAdvisorSuiteDefinitionResources retrieves all iotcoredeviceadvisor.SuiteDefinition items from an AWS CloudFormation template
+func (t *Template) GetAllIoTCoreDeviceAdvisorSuiteDefinitionResources() map[string]*iotcoredeviceadvisor.SuiteDefinition {
+	results := map[string]*iotcoredeviceadvisor.SuiteDefinition{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotcoredeviceadvisor.SuiteDefinition:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTCoreDeviceAdvisorSuiteDefinitionWithName retrieves all iotcoredeviceadvisor.SuiteDefinition items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTCoreDeviceAdvisorSuiteDefinitionWithName(name string) (*iotcoredeviceadvisor.SuiteDefinition, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotcoredeviceadvisor.SuiteDefinition:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotcoredeviceadvisor.SuiteDefinition not found", name)
+}
+
+// GetAllIoTEventsDetectorModelResources retrieves all iotevents.DetectorModel items from an AWS CloudFormation template
+func (t *Template) GetAllIoTEventsDetectorModelResources() map[string]*iotevents.DetectorModel {
+	results := map[string]*iotevents.DetectorModel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotevents.DetectorModel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTEventsDetectorModelWithName retrieves all iotevents.DetectorModel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTEventsDetectorModelWithName(name string) (*iotevents.DetectorModel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotevents.DetectorModel:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotevents.DetectorModel not found", name)
+}
+
+// GetAllIoTEventsInputResources retrieves all iotevents.Input items from an AWS CloudFormation template
+func (t *Template) GetAllIoTEventsInputResources() map[string]*iotevents.Input {
+	results := map[string]*iotevents.Input{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotevents.Input:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTEventsInputWithName retrieves all iotevents.Input items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTEventsInputWithName(name string) (*iotevents.Input, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotevents.Input:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotevents.Input not found", name)
+}
+
+// GetAllIoTFleetHubApplicationResources retrieves all iotfleethub.Application items from an AWS CloudFormation template
+func (t *Template) GetAllIoTFleetHubApplicationResources() map[string]*iotfleethub.Application {
+	results := map[string]*iotfleethub.Application{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotfleethub.Application:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTFleetHubApplicationWithName retrieves all iotfleethub.Application items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTFleetHubApplicationWithName(name string) (*iotfleethub.Application, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotfleethub.Application:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotfleethub.Application not found", name)
+}
+
+// GetAllIoTSiteWiseAccessPolicyResources retrieves all iotsitewise.AccessPolicy items from an AWS CloudFormation template
+func (t *Template) GetAllIoTSiteWiseAccessPolicyResources() map[string]*iotsitewise.AccessPolicy {
+	results := map[string]*iotsitewise.AccessPolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotsitewise.AccessPolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTSiteWiseAccessPolicyWithName retrieves all iotsitewise.AccessPolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTSiteWiseAccessPolicyWithName(name string) (*iotsitewise.AccessPolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotsitewise.AccessPolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotsitewise.AccessPolicy not found", name)
+}
+
+// GetAllIoTSiteWiseAssetResources retrieves all iotsitewise.Asset items from an AWS CloudFormation template
+func (t *Template) GetAllIoTSiteWiseAssetResources() map[string]*iotsitewise.Asset {
+	results := map[string]*iotsitewise.Asset{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotsitewise.Asset:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTSiteWiseAssetWithName retrieves all iotsitewise.Asset items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTSiteWiseAssetWithName(name string) (*iotsitewise.Asset, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotsitewise.Asset:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotsitewise.Asset not found", name)
+}
+
+// GetAllIoTSiteWiseAssetModelResources retrieves all iotsitewise.AssetModel items from an AWS CloudFormation template
+func (t *Template) GetAllIoTSiteWiseAssetModelResources() map[string]*iotsitewise.AssetModel {
+	results := map[string]*iotsitewise.AssetModel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotsitewise.AssetModel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTSiteWiseAssetModelWithName retrieves all iotsitewise.AssetModel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTSiteWiseAssetModelWithName(name string) (*iotsitewise.AssetModel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotsitewise.AssetModel:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotsitewise.AssetModel not found", name)
+}
+
+// GetAllIoTSiteWiseDashboardResources retrieves all iotsitewise.Dashboard items from an AWS CloudFormation template
+func (t *Template) GetAllIoTSiteWiseDashboardResources() map[string]*iotsitewise.Dashboard {
+	results := map[string]*iotsitewise.Dashboard{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotsitewise.Dashboard:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTSiteWiseDashboardWithName retrieves all iotsitewise.Dashboard items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTSiteWiseDashboardWithName(name string) (*iotsitewise.Dashboard, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotsitewise.Dashboard:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotsitewise.Dashboard not found", name)
+}
+
+// GetAllIoTSiteWiseGatewayResources retrieves all iotsitewise.Gateway items from an AWS CloudFormation template
+func (t *Template) GetAllIoTSiteWiseGatewayResources() map[string]*iotsitewise.Gateway {
+	results := map[string]*iotsitewise.Gateway{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotsitewise.Gateway:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTSiteWiseGatewayWithName retrieves all iotsitewise.Gateway items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTSiteWiseGatewayWithName(name string) (*iotsitewise.Gateway, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotsitewise.Gateway:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotsitewise.Gateway not found", name)
+}
+
+// GetAllIoTSiteWisePortalResources retrieves all iotsitewise.Portal items from an AWS CloudFormation template
+func (t *Template) GetAllIoTSiteWisePortalResources() map[string]*iotsitewise.Portal {
+	results := map[string]*iotsitewise.Portal{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotsitewise.Portal:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTSiteWisePortalWithName retrieves all iotsitewise.Portal items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTSiteWisePortalWithName(name string) (*iotsitewise.Portal, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotsitewise.Portal:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotsitewise.Portal not found", name)
+}
+
+// GetAllIoTSiteWiseProjectResources retrieves all iotsitewise.Project items from an AWS CloudFormation template
+func (t *Template) GetAllIoTSiteWiseProjectResources() map[string]*iotsitewise.Project {
+	results := map[string]*iotsitewise.Project{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotsitewise.Project:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTSiteWiseProjectWithName retrieves all iotsitewise.Project items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTSiteWiseProjectWithName(name string) (*iotsitewise.Project, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotsitewise.Project:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotsitewise.Project not found", name)
+}
+
+// GetAllIoTThingsGraphFlowTemplateResources retrieves all iotthingsgraph.FlowTemplate items from an AWS CloudFormation template
+func (t *Template) GetAllIoTThingsGraphFlowTemplateResources() map[string]*iotthingsgraph.FlowTemplate {
+	results := map[string]*iotthingsgraph.FlowTemplate{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotthingsgraph.FlowTemplate:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTThingsGraphFlowTemplateWithName retrieves all iotthingsgraph.FlowTemplate items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTThingsGraphFlowTemplateWithName(name string) (*iotthingsgraph.FlowTemplate, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotthingsgraph.FlowTemplate:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotthingsgraph.FlowTemplate not found", name)
+}
+
+// GetAllIoTWirelessDestinationResources retrieves all iotwireless.Destination items from an AWS CloudFormation template
+func (t *Template) GetAllIoTWirelessDestinationResources() map[string]*iotwireless.Destination {
+	results := map[string]*iotwireless.Destination{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotwireless.Destination:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTWirelessDestinationWithName retrieves all iotwireless.Destination items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTWirelessDestinationWithName(name string) (*iotwireless.Destination, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotwireless.Destination:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotwireless.Destination not found", name)
+}
+
+// GetAllIoTWirelessDeviceProfileResources retrieves all iotwireless.DeviceProfile items from an AWS CloudFormation template
+func (t *Template) GetAllIoTWirelessDeviceProfileResources() map[string]*iotwireless.DeviceProfile {
+	results := map[string]*iotwireless.DeviceProfile{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotwireless.DeviceProfile:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTWirelessDeviceProfileWithName retrieves all iotwireless.DeviceProfile items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTWirelessDeviceProfileWithName(name string) (*iotwireless.DeviceProfile, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotwireless.DeviceProfile:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotwireless.DeviceProfile not found", name)
+}
+
+// GetAllIoTWirelessFuotaTaskResources retrieves all iotwireless.FuotaTask items from an AWS CloudFormation template
+func (t *Template) GetAllIoTWirelessFuotaTaskResources() map[string]*iotwireless.FuotaTask {
+	results := map[string]*iotwireless.FuotaTask{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotwireless.FuotaTask:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTWirelessFuotaTaskWithName retrieves all iotwireless.FuotaTask items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTWirelessFuotaTaskWithName(name string) (*iotwireless.FuotaTask, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotwireless.FuotaTask:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotwireless.FuotaTask not found", name)
+}
+
+// GetAllIoTWirelessMulticastGroupResources retrieves all iotwireless.MulticastGroup items from an AWS CloudFormation template
+func (t *Template) GetAllIoTWirelessMulticastGroupResources() map[string]*iotwireless.MulticastGroup {
+	results := map[string]*iotwireless.MulticastGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotwireless.MulticastGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTWirelessMulticastGroupWithName retrieves all iotwireless.MulticastGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTWirelessMulticastGroupWithName(name string) (*iotwireless.MulticastGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotwireless.MulticastGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotwireless.MulticastGroup not found", name)
+}
+
+// GetAllIoTWirelessPartnerAccountResources retrieves all iotwireless.PartnerAccount items from an AWS CloudFormation template
+func (t *Template) GetAllIoTWirelessPartnerAccountResources() map[string]*iotwireless.PartnerAccount {
+	results := map[string]*iotwireless.PartnerAccount{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotwireless.PartnerAccount:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTWirelessPartnerAccountWithName retrieves all iotwireless.PartnerAccount items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTWirelessPartnerAccountWithName(name string) (*iotwireless.PartnerAccount, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotwireless.PartnerAccount:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotwireless.PartnerAccount not found", name)
+}
+
+// GetAllIoTWirelessServiceProfileResources retrieves all iotwireless.ServiceProfile items from an AWS CloudFormation template
+func (t *Template) GetAllIoTWirelessServiceProfileResources() map[string]*iotwireless.ServiceProfile {
+	results := map[string]*iotwireless.ServiceProfile{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotwireless.ServiceProfile:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTWirelessServiceProfileWithName retrieves all iotwireless.ServiceProfile items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTWirelessServiceProfileWithName(name string) (*iotwireless.ServiceProfile, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotwireless.ServiceProfile:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotwireless.ServiceProfile not found", name)
+}
+
+// GetAllIoTWirelessTaskDefinitionResources retrieves all iotwireless.TaskDefinition items from an AWS CloudFormation template
+func (t *Template) GetAllIoTWirelessTaskDefinitionResources() map[string]*iotwireless.TaskDefinition {
+	results := map[string]*iotwireless.TaskDefinition{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotwireless.TaskDefinition:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTWirelessTaskDefinitionWithName retrieves all iotwireless.TaskDefinition items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTWirelessTaskDefinitionWithName(name string) (*iotwireless.TaskDefinition, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotwireless.TaskDefinition:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotwireless.TaskDefinition not found", name)
+}
+
+// GetAllIoTWirelessWirelessDeviceResources retrieves all iotwireless.WirelessDevice items from an AWS CloudFormation template
+func (t *Template) GetAllIoTWirelessWirelessDeviceResources() map[string]*iotwireless.WirelessDevice {
+	results := map[string]*iotwireless.WirelessDevice{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotwireless.WirelessDevice:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTWirelessWirelessDeviceWithName retrieves all iotwireless.WirelessDevice items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTWirelessWirelessDeviceWithName(name string) (*iotwireless.WirelessDevice, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotwireless.WirelessDevice:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotwireless.WirelessDevice not found", name)
+}
+
+// GetAllIoTWirelessWirelessGatewayResources retrieves all iotwireless.WirelessGateway items from an AWS CloudFormation template
+func (t *Template) GetAllIoTWirelessWirelessGatewayResources() map[string]*iotwireless.WirelessGateway {
+	results := map[string]*iotwireless.WirelessGateway{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *iotwireless.WirelessGateway:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetIoTWirelessWirelessGatewayWithName retrieves all iotwireless.WirelessGateway items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetIoTWirelessWirelessGatewayWithName(name string) (*iotwireless.WirelessGateway, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *iotwireless.WirelessGateway:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type iotwireless.WirelessGateway not found", name)
+}
+
+// GetAllKMSAliasResources retrieves all kms.Alias items from an AWS CloudFormation template
+func (t *Template) GetAllKMSAliasResources() map[string]*kms.Alias {
+	results := map[string]*kms.Alias{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *kms.Alias:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetKMSAliasWithName retrieves all kms.Alias items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetKMSAliasWithName(name string) (*kms.Alias, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *kms.Alias:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type kms.Alias not found", name)
+}
+
+// GetAllKMSKeyResources retrieves all kms.Key items from an AWS CloudFormation template
+func (t *Template) GetAllKMSKeyResources() map[string]*kms.Key {
+	results := map[string]*kms.Key{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *kms.Key:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetKMSKeyWithName retrieves all kms.Key items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetKMSKeyWithName(name string) (*kms.Key, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *kms.Key:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type kms.Key not found", name)
+}
+
+// GetAllKMSReplicaKeyResources retrieves all kms.ReplicaKey items from an AWS CloudFormation template
+func (t *Template) GetAllKMSReplicaKeyResources() map[string]*kms.ReplicaKey {
+	results := map[string]*kms.ReplicaKey{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *kms.ReplicaKey:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetKMSReplicaKeyWithName retrieves all kms.ReplicaKey items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetKMSReplicaKeyWithName(name string) (*kms.ReplicaKey, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *kms.ReplicaKey:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type kms.ReplicaKey not found", name)
+}
+
+// GetAllKendraDataSourceResources retrieves all kendra.DataSource items from an AWS CloudFormation template
+func (t *Template) GetAllKendraDataSourceResources() map[string]*kendra.DataSource {
+	results := map[string]*kendra.DataSource{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *kendra.DataSource:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetKendraDataSourceWithName retrieves all kendra.DataSource items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetKendraDataSourceWithName(name string) (*kendra.DataSource, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *kendra.DataSource:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type kendra.DataSource not found", name)
+}
+
+// GetAllKendraFaqResources retrieves all kendra.Faq items from an AWS CloudFormation template
+func (t *Template) GetAllKendraFaqResources() map[string]*kendra.Faq {
+	results := map[string]*kendra.Faq{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *kendra.Faq:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetKendraFaqWithName retrieves all kendra.Faq items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetKendraFaqWithName(name string) (*kendra.Faq, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *kendra.Faq:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type kendra.Faq not found", name)
+}
+
+// GetAllKendraIndexResources retrieves all kendra.Index items from an AWS CloudFormation template
+func (t *Template) GetAllKendraIndexResources() map[string]*kendra.Index {
+	results := map[string]*kendra.Index{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *kendra.Index:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetKendraIndexWithName retrieves all kendra.Index items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetKendraIndexWithName(name string) (*kendra.Index, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *kendra.Index:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type kendra.Index 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{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *kinesis.Stream:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetKinesisStreamWithName retrieves all kinesis.Stream items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetKinesisStreamWithName(name string) (*kinesis.Stream, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *kinesis.Stream:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type kinesis.Stream not found", name)
+}
+
+// GetAllKinesisStreamConsumerResources retrieves all kinesis.StreamConsumer items from an AWS CloudFormation template
+func (t *Template) GetAllKinesisStreamConsumerResources() map[string]*kinesis.StreamConsumer {
+	results := map[string]*kinesis.StreamConsumer{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *kinesis.StreamConsumer:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetKinesisStreamConsumerWithName retrieves all kinesis.StreamConsumer items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetKinesisStreamConsumerWithName(name string) (*kinesis.StreamConsumer, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *kinesis.StreamConsumer:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type kinesis.StreamConsumer not found", name)
+}
+
+// GetAllKinesisAnalyticsApplicationResources retrieves all kinesisanalytics.Application items from an AWS CloudFormation template
+func (t *Template) GetAllKinesisAnalyticsApplicationResources() map[string]*kinesisanalytics.Application {
+	results := map[string]*kinesisanalytics.Application{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *kinesisanalytics.Application:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetKinesisAnalyticsApplicationWithName retrieves all kinesisanalytics.Application items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetKinesisAnalyticsApplicationWithName(name string) (*kinesisanalytics.Application, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *kinesisanalytics.Application:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type kinesisanalytics.Application not found", name)
+}
+
+// GetAllKinesisAnalyticsApplicationOutputResources retrieves all kinesisanalytics.ApplicationOutput items from an AWS CloudFormation template
+func (t *Template) GetAllKinesisAnalyticsApplicationOutputResources() map[string]*kinesisanalytics.ApplicationOutput {
+	results := map[string]*kinesisanalytics.ApplicationOutput{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *kinesisanalytics.ApplicationOutput:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetKinesisAnalyticsApplicationOutputWithName retrieves all kinesisanalytics.ApplicationOutput items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetKinesisAnalyticsApplicationOutputWithName(name string) (*kinesisanalytics.ApplicationOutput, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *kinesisanalytics.ApplicationOutput:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type kinesisanalytics.ApplicationOutput not found", name)
+}
+
+// GetAllKinesisAnalyticsApplicationReferenceDataSourceResources retrieves all kinesisanalytics.ApplicationReferenceDataSource items from an AWS CloudFormation template
+func (t *Template) GetAllKinesisAnalyticsApplicationReferenceDataSourceResources() map[string]*kinesisanalytics.ApplicationReferenceDataSource {
+	results := map[string]*kinesisanalytics.ApplicationReferenceDataSource{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *kinesisanalytics.ApplicationReferenceDataSource:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetKinesisAnalyticsApplicationReferenceDataSourceWithName retrieves all kinesisanalytics.ApplicationReferenceDataSource items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetKinesisAnalyticsApplicationReferenceDataSourceWithName(name string) (*kinesisanalytics.ApplicationReferenceDataSource, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *kinesisanalytics.ApplicationReferenceDataSource:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type kinesisanalytics.ApplicationReferenceDataSource not found", name)
+}
+
+// GetAllKinesisAnalyticsV2ApplicationResources retrieves all kinesisanalyticsv2.Application items from an AWS CloudFormation template
+func (t *Template) GetAllKinesisAnalyticsV2ApplicationResources() map[string]*kinesisanalyticsv2.Application {
+	results := map[string]*kinesisanalyticsv2.Application{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *kinesisanalyticsv2.Application:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetKinesisAnalyticsV2ApplicationWithName retrieves all kinesisanalyticsv2.Application items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetKinesisAnalyticsV2ApplicationWithName(name string) (*kinesisanalyticsv2.Application, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *kinesisanalyticsv2.Application:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type kinesisanalyticsv2.Application not found", name)
+}
+
+// GetAllKinesisAnalyticsV2ApplicationCloudWatchLoggingOptionResources retrieves all kinesisanalyticsv2.ApplicationCloudWatchLoggingOption items from an AWS CloudFormation template
+func (t *Template) GetAllKinesisAnalyticsV2ApplicationCloudWatchLoggingOptionResources() map[string]*kinesisanalyticsv2.ApplicationCloudWatchLoggingOption {
+	results := map[string]*kinesisanalyticsv2.ApplicationCloudWatchLoggingOption{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *kinesisanalyticsv2.ApplicationCloudWatchLoggingOption:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetKinesisAnalyticsV2ApplicationCloudWatchLoggingOptionWithName retrieves all kinesisanalyticsv2.ApplicationCloudWatchLoggingOption items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetKinesisAnalyticsV2ApplicationCloudWatchLoggingOptionWithName(name string) (*kinesisanalyticsv2.ApplicationCloudWatchLoggingOption, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *kinesisanalyticsv2.ApplicationCloudWatchLoggingOption:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type kinesisanalyticsv2.ApplicationCloudWatchLoggingOption not found", name)
+}
+
+// GetAllKinesisAnalyticsV2ApplicationOutputResources retrieves all kinesisanalyticsv2.ApplicationOutput items from an AWS CloudFormation template
+func (t *Template) GetAllKinesisAnalyticsV2ApplicationOutputResources() map[string]*kinesisanalyticsv2.ApplicationOutput {
+	results := map[string]*kinesisanalyticsv2.ApplicationOutput{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *kinesisanalyticsv2.ApplicationOutput:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetKinesisAnalyticsV2ApplicationOutputWithName retrieves all kinesisanalyticsv2.ApplicationOutput items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetKinesisAnalyticsV2ApplicationOutputWithName(name string) (*kinesisanalyticsv2.ApplicationOutput, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *kinesisanalyticsv2.ApplicationOutput:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type kinesisanalyticsv2.ApplicationOutput not found", name)
+}
+
+// GetAllKinesisAnalyticsV2ApplicationReferenceDataSourceResources retrieves all kinesisanalyticsv2.ApplicationReferenceDataSource items from an AWS CloudFormation template
+func (t *Template) GetAllKinesisAnalyticsV2ApplicationReferenceDataSourceResources() map[string]*kinesisanalyticsv2.ApplicationReferenceDataSource {
+	results := map[string]*kinesisanalyticsv2.ApplicationReferenceDataSource{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *kinesisanalyticsv2.ApplicationReferenceDataSource:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetKinesisAnalyticsV2ApplicationReferenceDataSourceWithName retrieves all kinesisanalyticsv2.ApplicationReferenceDataSource items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetKinesisAnalyticsV2ApplicationReferenceDataSourceWithName(name string) (*kinesisanalyticsv2.ApplicationReferenceDataSource, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *kinesisanalyticsv2.ApplicationReferenceDataSource:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type kinesisanalyticsv2.ApplicationReferenceDataSource not found", name)
+}
+
+// GetAllKinesisFirehoseDeliveryStreamResources retrieves all kinesisfirehose.DeliveryStream items from an AWS CloudFormation template
+func (t *Template) GetAllKinesisFirehoseDeliveryStreamResources() map[string]*kinesisfirehose.DeliveryStream {
+	results := map[string]*kinesisfirehose.DeliveryStream{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *kinesisfirehose.DeliveryStream:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetKinesisFirehoseDeliveryStreamWithName retrieves all kinesisfirehose.DeliveryStream items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetKinesisFirehoseDeliveryStreamWithName(name string) (*kinesisfirehose.DeliveryStream, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *kinesisfirehose.DeliveryStream:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type kinesisfirehose.DeliveryStream not found", name)
+}
+
+// GetAllLakeFormationDataLakeSettingsResources retrieves all lakeformation.DataLakeSettings items from an AWS CloudFormation template
+func (t *Template) GetAllLakeFormationDataLakeSettingsResources() map[string]*lakeformation.DataLakeSettings {
+	results := map[string]*lakeformation.DataLakeSettings{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *lakeformation.DataLakeSettings:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLakeFormationDataLakeSettingsWithName retrieves all lakeformation.DataLakeSettings items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLakeFormationDataLakeSettingsWithName(name string) (*lakeformation.DataLakeSettings, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *lakeformation.DataLakeSettings:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type lakeformation.DataLakeSettings not found", name)
+}
+
+// GetAllLakeFormationPermissionsResources retrieves all lakeformation.Permissions items from an AWS CloudFormation template
+func (t *Template) GetAllLakeFormationPermissionsResources() map[string]*lakeformation.Permissions {
+	results := map[string]*lakeformation.Permissions{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *lakeformation.Permissions:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLakeFormationPermissionsWithName retrieves all lakeformation.Permissions items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLakeFormationPermissionsWithName(name string) (*lakeformation.Permissions, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *lakeformation.Permissions:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type lakeformation.Permissions not found", name)
+}
+
+// GetAllLakeFormationResourceResources retrieves all lakeformation.Resource items from an AWS CloudFormation template
+func (t *Template) GetAllLakeFormationResourceResources() map[string]*lakeformation.Resource {
+	results := map[string]*lakeformation.Resource{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *lakeformation.Resource:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLakeFormationResourceWithName retrieves all lakeformation.Resource items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLakeFormationResourceWithName(name string) (*lakeformation.Resource, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *lakeformation.Resource:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type lakeformation.Resource not found", name)
+}
+
+// GetAllLambdaAliasResources retrieves all lambda.Alias items from an AWS CloudFormation template
+func (t *Template) GetAllLambdaAliasResources() map[string]*lambda.Alias {
+	results := map[string]*lambda.Alias{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *lambda.Alias:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLambdaAliasWithName retrieves all lambda.Alias items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLambdaAliasWithName(name string) (*lambda.Alias, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *lambda.Alias:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type lambda.Alias not found", name)
+}
+
+// GetAllLambdaCodeSigningConfigResources retrieves all lambda.CodeSigningConfig items from an AWS CloudFormation template
+func (t *Template) GetAllLambdaCodeSigningConfigResources() map[string]*lambda.CodeSigningConfig {
+	results := map[string]*lambda.CodeSigningConfig{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *lambda.CodeSigningConfig:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLambdaCodeSigningConfigWithName retrieves all lambda.CodeSigningConfig items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLambdaCodeSigningConfigWithName(name string) (*lambda.CodeSigningConfig, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *lambda.CodeSigningConfig:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type lambda.CodeSigningConfig not found", name)
+}
+
+// GetAllLambdaEventInvokeConfigResources retrieves all lambda.EventInvokeConfig items from an AWS CloudFormation template
+func (t *Template) GetAllLambdaEventInvokeConfigResources() map[string]*lambda.EventInvokeConfig {
+	results := map[string]*lambda.EventInvokeConfig{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *lambda.EventInvokeConfig:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLambdaEventInvokeConfigWithName retrieves all lambda.EventInvokeConfig items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLambdaEventInvokeConfigWithName(name string) (*lambda.EventInvokeConfig, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *lambda.EventInvokeConfig:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type lambda.EventInvokeConfig not found", name)
+}
+
+// GetAllLambdaEventSourceMappingResources retrieves all lambda.EventSourceMapping items from an AWS CloudFormation template
+func (t *Template) GetAllLambdaEventSourceMappingResources() map[string]*lambda.EventSourceMapping {
+	results := map[string]*lambda.EventSourceMapping{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *lambda.EventSourceMapping:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLambdaEventSourceMappingWithName retrieves all lambda.EventSourceMapping items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLambdaEventSourceMappingWithName(name string) (*lambda.EventSourceMapping, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *lambda.EventSourceMapping:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type lambda.EventSourceMapping not found", name)
+}
+
+// GetAllLambdaFunctionResources retrieves all lambda.Function items from an AWS CloudFormation template
+func (t *Template) GetAllLambdaFunctionResources() map[string]*lambda.Function {
+	results := map[string]*lambda.Function{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *lambda.Function:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLambdaFunctionWithName retrieves all lambda.Function items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLambdaFunctionWithName(name string) (*lambda.Function, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *lambda.Function:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type lambda.Function not found", name)
+}
+
+// GetAllLambdaLayerVersionResources retrieves all lambda.LayerVersion items from an AWS CloudFormation template
+func (t *Template) GetAllLambdaLayerVersionResources() map[string]*lambda.LayerVersion {
+	results := map[string]*lambda.LayerVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *lambda.LayerVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLambdaLayerVersionWithName retrieves all lambda.LayerVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLambdaLayerVersionWithName(name string) (*lambda.LayerVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *lambda.LayerVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type lambda.LayerVersion not found", name)
+}
+
+// GetAllLambdaLayerVersionPermissionResources retrieves all lambda.LayerVersionPermission items from an AWS CloudFormation template
+func (t *Template) GetAllLambdaLayerVersionPermissionResources() map[string]*lambda.LayerVersionPermission {
+	results := map[string]*lambda.LayerVersionPermission{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *lambda.LayerVersionPermission:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLambdaLayerVersionPermissionWithName retrieves all lambda.LayerVersionPermission items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLambdaLayerVersionPermissionWithName(name string) (*lambda.LayerVersionPermission, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *lambda.LayerVersionPermission:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type lambda.LayerVersionPermission not found", name)
+}
+
+// GetAllLambdaPermissionResources retrieves all lambda.Permission items from an AWS CloudFormation template
+func (t *Template) GetAllLambdaPermissionResources() map[string]*lambda.Permission {
+	results := map[string]*lambda.Permission{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *lambda.Permission:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLambdaPermissionWithName retrieves all lambda.Permission items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLambdaPermissionWithName(name string) (*lambda.Permission, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *lambda.Permission:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type lambda.Permission not found", name)
+}
+
+// GetAllLambdaVersionResources retrieves all lambda.Version items from an AWS CloudFormation template
+func (t *Template) GetAllLambdaVersionResources() map[string]*lambda.Version {
+	results := map[string]*lambda.Version{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *lambda.Version:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLambdaVersionWithName retrieves all lambda.Version items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLambdaVersionWithName(name string) (*lambda.Version, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *lambda.Version:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type lambda.Version not found", name)
+}
+
+// GetAllLicenseManagerGrantResources retrieves all licensemanager.Grant items from an AWS CloudFormation template
+func (t *Template) GetAllLicenseManagerGrantResources() map[string]*licensemanager.Grant {
+	results := map[string]*licensemanager.Grant{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *licensemanager.Grant:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLicenseManagerGrantWithName retrieves all licensemanager.Grant items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLicenseManagerGrantWithName(name string) (*licensemanager.Grant, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *licensemanager.Grant:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type licensemanager.Grant not found", name)
+}
+
+// GetAllLicenseManagerLicenseResources retrieves all licensemanager.License items from an AWS CloudFormation template
+func (t *Template) GetAllLicenseManagerLicenseResources() map[string]*licensemanager.License {
+	results := map[string]*licensemanager.License{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *licensemanager.License:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLicenseManagerLicenseWithName retrieves all licensemanager.License items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLicenseManagerLicenseWithName(name string) (*licensemanager.License, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *licensemanager.License:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type licensemanager.License not found", name)
+}
+
+// GetAllLightsailDatabaseResources retrieves all lightsail.Database items from an AWS CloudFormation template
+func (t *Template) GetAllLightsailDatabaseResources() map[string]*lightsail.Database {
+	results := map[string]*lightsail.Database{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *lightsail.Database:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLightsailDatabaseWithName retrieves all lightsail.Database items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLightsailDatabaseWithName(name string) (*lightsail.Database, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *lightsail.Database:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type lightsail.Database not found", name)
+}
+
+// GetAllLightsailDiskResources retrieves all lightsail.Disk items from an AWS CloudFormation template
+func (t *Template) GetAllLightsailDiskResources() map[string]*lightsail.Disk {
+	results := map[string]*lightsail.Disk{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *lightsail.Disk:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLightsailDiskWithName retrieves all lightsail.Disk items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLightsailDiskWithName(name string) (*lightsail.Disk, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *lightsail.Disk:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type lightsail.Disk not found", name)
+}
+
+// GetAllLightsailInstanceResources retrieves all lightsail.Instance items from an AWS CloudFormation template
+func (t *Template) GetAllLightsailInstanceResources() map[string]*lightsail.Instance {
+	results := map[string]*lightsail.Instance{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *lightsail.Instance:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLightsailInstanceWithName retrieves all lightsail.Instance items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLightsailInstanceWithName(name string) (*lightsail.Instance, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *lightsail.Instance:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type lightsail.Instance not found", name)
+}
+
+// GetAllLightsailStaticIpResources retrieves all lightsail.StaticIp items from an AWS CloudFormation template
+func (t *Template) GetAllLightsailStaticIpResources() map[string]*lightsail.StaticIp {
+	results := map[string]*lightsail.StaticIp{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *lightsail.StaticIp:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLightsailStaticIpWithName retrieves all lightsail.StaticIp items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLightsailStaticIpWithName(name string) (*lightsail.StaticIp, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *lightsail.StaticIp:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type lightsail.StaticIp not found", name)
+}
+
+// GetAllLocationGeofenceCollectionResources retrieves all location.GeofenceCollection items from an AWS CloudFormation template
+func (t *Template) GetAllLocationGeofenceCollectionResources() map[string]*location.GeofenceCollection {
+	results := map[string]*location.GeofenceCollection{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *location.GeofenceCollection:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLocationGeofenceCollectionWithName retrieves all location.GeofenceCollection items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLocationGeofenceCollectionWithName(name string) (*location.GeofenceCollection, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *location.GeofenceCollection:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type location.GeofenceCollection not found", name)
+}
+
+// GetAllLocationMapResources retrieves all location.Map items from an AWS CloudFormation template
+func (t *Template) GetAllLocationMapResources() map[string]*location.Map {
+	results := map[string]*location.Map{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *location.Map:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLocationMapWithName retrieves all location.Map items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLocationMapWithName(name string) (*location.Map, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *location.Map:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type location.Map not found", name)
+}
+
+// GetAllLocationPlaceIndexResources retrieves all location.PlaceIndex items from an AWS CloudFormation template
+func (t *Template) GetAllLocationPlaceIndexResources() map[string]*location.PlaceIndex {
+	results := map[string]*location.PlaceIndex{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *location.PlaceIndex:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLocationPlaceIndexWithName retrieves all location.PlaceIndex items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLocationPlaceIndexWithName(name string) (*location.PlaceIndex, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *location.PlaceIndex:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type location.PlaceIndex not found", name)
+}
+
+// GetAllLocationRouteCalculatorResources retrieves all location.RouteCalculator items from an AWS CloudFormation template
+func (t *Template) GetAllLocationRouteCalculatorResources() map[string]*location.RouteCalculator {
+	results := map[string]*location.RouteCalculator{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *location.RouteCalculator:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLocationRouteCalculatorWithName retrieves all location.RouteCalculator items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLocationRouteCalculatorWithName(name string) (*location.RouteCalculator, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *location.RouteCalculator:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type location.RouteCalculator not found", name)
+}
+
+// GetAllLocationTrackerResources retrieves all location.Tracker items from an AWS CloudFormation template
+func (t *Template) GetAllLocationTrackerResources() map[string]*location.Tracker {
+	results := map[string]*location.Tracker{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *location.Tracker:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLocationTrackerWithName retrieves all location.Tracker items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLocationTrackerWithName(name string) (*location.Tracker, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *location.Tracker:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type location.Tracker not found", name)
+}
+
+// GetAllLocationTrackerConsumerResources retrieves all location.TrackerConsumer items from an AWS CloudFormation template
+func (t *Template) GetAllLocationTrackerConsumerResources() map[string]*location.TrackerConsumer {
+	results := map[string]*location.TrackerConsumer{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *location.TrackerConsumer:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLocationTrackerConsumerWithName retrieves all location.TrackerConsumer items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLocationTrackerConsumerWithName(name string) (*location.TrackerConsumer, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *location.TrackerConsumer:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type location.TrackerConsumer not found", name)
+}
+
+// GetAllLogsDestinationResources retrieves all logs.Destination items from an AWS CloudFormation template
+func (t *Template) GetAllLogsDestinationResources() map[string]*logs.Destination {
+	results := map[string]*logs.Destination{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *logs.Destination:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLogsDestinationWithName retrieves all logs.Destination items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLogsDestinationWithName(name string) (*logs.Destination, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *logs.Destination:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type logs.Destination not found", name)
+}
+
+// GetAllLogsLogGroupResources retrieves all logs.LogGroup items from an AWS CloudFormation template
+func (t *Template) GetAllLogsLogGroupResources() map[string]*logs.LogGroup {
+	results := map[string]*logs.LogGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *logs.LogGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLogsLogGroupWithName retrieves all logs.LogGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLogsLogGroupWithName(name string) (*logs.LogGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *logs.LogGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type logs.LogGroup not found", name)
+}
+
+// GetAllLogsLogStreamResources retrieves all logs.LogStream items from an AWS CloudFormation template
+func (t *Template) GetAllLogsLogStreamResources() map[string]*logs.LogStream {
+	results := map[string]*logs.LogStream{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *logs.LogStream:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLogsLogStreamWithName retrieves all logs.LogStream items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLogsLogStreamWithName(name string) (*logs.LogStream, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *logs.LogStream:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type logs.LogStream not found", name)
+}
+
+// GetAllLogsMetricFilterResources retrieves all logs.MetricFilter items from an AWS CloudFormation template
+func (t *Template) GetAllLogsMetricFilterResources() map[string]*logs.MetricFilter {
+	results := map[string]*logs.MetricFilter{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *logs.MetricFilter:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLogsMetricFilterWithName retrieves all logs.MetricFilter items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLogsMetricFilterWithName(name string) (*logs.MetricFilter, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *logs.MetricFilter:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type logs.MetricFilter not found", name)
+}
+
+// GetAllLogsQueryDefinitionResources retrieves all logs.QueryDefinition items from an AWS CloudFormation template
+func (t *Template) GetAllLogsQueryDefinitionResources() map[string]*logs.QueryDefinition {
+	results := map[string]*logs.QueryDefinition{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *logs.QueryDefinition:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLogsQueryDefinitionWithName retrieves all logs.QueryDefinition items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLogsQueryDefinitionWithName(name string) (*logs.QueryDefinition, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *logs.QueryDefinition:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type logs.QueryDefinition not found", name)
+}
+
+// GetAllLogsResourcePolicyResources retrieves all logs.ResourcePolicy items from an AWS CloudFormation template
+func (t *Template) GetAllLogsResourcePolicyResources() map[string]*logs.ResourcePolicy {
+	results := map[string]*logs.ResourcePolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *logs.ResourcePolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLogsResourcePolicyWithName retrieves all logs.ResourcePolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLogsResourcePolicyWithName(name string) (*logs.ResourcePolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *logs.ResourcePolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type logs.ResourcePolicy not found", name)
+}
+
+// GetAllLogsSubscriptionFilterResources retrieves all logs.SubscriptionFilter items from an AWS CloudFormation template
+func (t *Template) GetAllLogsSubscriptionFilterResources() map[string]*logs.SubscriptionFilter {
+	results := map[string]*logs.SubscriptionFilter{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *logs.SubscriptionFilter:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLogsSubscriptionFilterWithName retrieves all logs.SubscriptionFilter items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLogsSubscriptionFilterWithName(name string) (*logs.SubscriptionFilter, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *logs.SubscriptionFilter:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type logs.SubscriptionFilter not found", name)
+}
+
+// GetAllLookoutEquipmentInferenceSchedulerResources retrieves all lookoutequipment.InferenceScheduler items from an AWS CloudFormation template
+func (t *Template) GetAllLookoutEquipmentInferenceSchedulerResources() map[string]*lookoutequipment.InferenceScheduler {
+	results := map[string]*lookoutequipment.InferenceScheduler{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *lookoutequipment.InferenceScheduler:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLookoutEquipmentInferenceSchedulerWithName retrieves all lookoutequipment.InferenceScheduler items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLookoutEquipmentInferenceSchedulerWithName(name string) (*lookoutequipment.InferenceScheduler, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *lookoutequipment.InferenceScheduler:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type lookoutequipment.InferenceScheduler not found", name)
+}
+
+// GetAllLookoutMetricsAlertResources retrieves all lookoutmetrics.Alert items from an AWS CloudFormation template
+func (t *Template) GetAllLookoutMetricsAlertResources() map[string]*lookoutmetrics.Alert {
+	results := map[string]*lookoutmetrics.Alert{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *lookoutmetrics.Alert:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLookoutMetricsAlertWithName retrieves all lookoutmetrics.Alert items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLookoutMetricsAlertWithName(name string) (*lookoutmetrics.Alert, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *lookoutmetrics.Alert:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type lookoutmetrics.Alert not found", name)
+}
+
+// GetAllLookoutMetricsAnomalyDetectorResources retrieves all lookoutmetrics.AnomalyDetector items from an AWS CloudFormation template
+func (t *Template) GetAllLookoutMetricsAnomalyDetectorResources() map[string]*lookoutmetrics.AnomalyDetector {
+	results := map[string]*lookoutmetrics.AnomalyDetector{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *lookoutmetrics.AnomalyDetector:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLookoutMetricsAnomalyDetectorWithName retrieves all lookoutmetrics.AnomalyDetector items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLookoutMetricsAnomalyDetectorWithName(name string) (*lookoutmetrics.AnomalyDetector, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *lookoutmetrics.AnomalyDetector:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type lookoutmetrics.AnomalyDetector not found", name)
+}
+
+// GetAllLookoutVisionProjectResources retrieves all lookoutvision.Project items from an AWS CloudFormation template
+func (t *Template) GetAllLookoutVisionProjectResources() map[string]*lookoutvision.Project {
+	results := map[string]*lookoutvision.Project{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *lookoutvision.Project:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetLookoutVisionProjectWithName retrieves all lookoutvision.Project items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetLookoutVisionProjectWithName(name string) (*lookoutvision.Project, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *lookoutvision.Project:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type lookoutvision.Project not found", name)
+}
+
+// GetAllMSKClusterResources retrieves all msk.Cluster items from an AWS CloudFormation template
+func (t *Template) GetAllMSKClusterResources() map[string]*msk.Cluster {
+	results := map[string]*msk.Cluster{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *msk.Cluster:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMSKClusterWithName retrieves all msk.Cluster items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMSKClusterWithName(name string) (*msk.Cluster, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *msk.Cluster:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type msk.Cluster not found", name)
+}
+
+// GetAllMWAAEnvironmentResources retrieves all mwaa.Environment items from an AWS CloudFormation template
+func (t *Template) GetAllMWAAEnvironmentResources() map[string]*mwaa.Environment {
+	results := map[string]*mwaa.Environment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *mwaa.Environment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMWAAEnvironmentWithName retrieves all mwaa.Environment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMWAAEnvironmentWithName(name string) (*mwaa.Environment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *mwaa.Environment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type mwaa.Environment not found", name)
+}
+
+// GetAllMacieCustomDataIdentifierResources retrieves all macie.CustomDataIdentifier items from an AWS CloudFormation template
+func (t *Template) GetAllMacieCustomDataIdentifierResources() map[string]*macie.CustomDataIdentifier {
+	results := map[string]*macie.CustomDataIdentifier{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *macie.CustomDataIdentifier:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMacieCustomDataIdentifierWithName retrieves all macie.CustomDataIdentifier items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMacieCustomDataIdentifierWithName(name string) (*macie.CustomDataIdentifier, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *macie.CustomDataIdentifier:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type macie.CustomDataIdentifier not found", name)
+}
+
+// GetAllMacieFindingsFilterResources retrieves all macie.FindingsFilter items from an AWS CloudFormation template
+func (t *Template) GetAllMacieFindingsFilterResources() map[string]*macie.FindingsFilter {
+	results := map[string]*macie.FindingsFilter{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *macie.FindingsFilter:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMacieFindingsFilterWithName retrieves all macie.FindingsFilter items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMacieFindingsFilterWithName(name string) (*macie.FindingsFilter, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *macie.FindingsFilter:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type macie.FindingsFilter not found", name)
+}
+
+// GetAllMacieSessionResources retrieves all macie.Session items from an AWS CloudFormation template
+func (t *Template) GetAllMacieSessionResources() map[string]*macie.Session {
+	results := map[string]*macie.Session{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *macie.Session:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMacieSessionWithName retrieves all macie.Session items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMacieSessionWithName(name string) (*macie.Session, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *macie.Session:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type macie.Session not found", name)
+}
+
+// GetAllManagedBlockchainMemberResources retrieves all managedblockchain.Member items from an AWS CloudFormation template
+func (t *Template) GetAllManagedBlockchainMemberResources() map[string]*managedblockchain.Member {
+	results := map[string]*managedblockchain.Member{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *managedblockchain.Member:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetManagedBlockchainMemberWithName retrieves all managedblockchain.Member items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetManagedBlockchainMemberWithName(name string) (*managedblockchain.Member, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *managedblockchain.Member:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type managedblockchain.Member not found", name)
+}
+
+// GetAllManagedBlockchainNodeResources retrieves all managedblockchain.Node items from an AWS CloudFormation template
+func (t *Template) GetAllManagedBlockchainNodeResources() map[string]*managedblockchain.Node {
+	results := map[string]*managedblockchain.Node{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *managedblockchain.Node:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetManagedBlockchainNodeWithName retrieves all managedblockchain.Node items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetManagedBlockchainNodeWithName(name string) (*managedblockchain.Node, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *managedblockchain.Node:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type managedblockchain.Node not found", name)
+}
+
+// GetAllMediaConnectFlowResources retrieves all mediaconnect.Flow items from an AWS CloudFormation template
+func (t *Template) GetAllMediaConnectFlowResources() map[string]*mediaconnect.Flow {
+	results := map[string]*mediaconnect.Flow{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *mediaconnect.Flow:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMediaConnectFlowWithName retrieves all mediaconnect.Flow items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMediaConnectFlowWithName(name string) (*mediaconnect.Flow, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *mediaconnect.Flow:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type mediaconnect.Flow not found", name)
+}
+
+// GetAllMediaConnectFlowEntitlementResources retrieves all mediaconnect.FlowEntitlement items from an AWS CloudFormation template
+func (t *Template) GetAllMediaConnectFlowEntitlementResources() map[string]*mediaconnect.FlowEntitlement {
+	results := map[string]*mediaconnect.FlowEntitlement{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *mediaconnect.FlowEntitlement:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMediaConnectFlowEntitlementWithName retrieves all mediaconnect.FlowEntitlement items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMediaConnectFlowEntitlementWithName(name string) (*mediaconnect.FlowEntitlement, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *mediaconnect.FlowEntitlement:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type mediaconnect.FlowEntitlement not found", name)
+}
+
+// GetAllMediaConnectFlowOutputResources retrieves all mediaconnect.FlowOutput items from an AWS CloudFormation template
+func (t *Template) GetAllMediaConnectFlowOutputResources() map[string]*mediaconnect.FlowOutput {
+	results := map[string]*mediaconnect.FlowOutput{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *mediaconnect.FlowOutput:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMediaConnectFlowOutputWithName retrieves all mediaconnect.FlowOutput items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMediaConnectFlowOutputWithName(name string) (*mediaconnect.FlowOutput, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *mediaconnect.FlowOutput:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type mediaconnect.FlowOutput not found", name)
+}
+
+// GetAllMediaConnectFlowSourceResources retrieves all mediaconnect.FlowSource items from an AWS CloudFormation template
+func (t *Template) GetAllMediaConnectFlowSourceResources() map[string]*mediaconnect.FlowSource {
+	results := map[string]*mediaconnect.FlowSource{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *mediaconnect.FlowSource:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMediaConnectFlowSourceWithName retrieves all mediaconnect.FlowSource items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMediaConnectFlowSourceWithName(name string) (*mediaconnect.FlowSource, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *mediaconnect.FlowSource:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type mediaconnect.FlowSource not found", name)
+}
+
+// GetAllMediaConnectFlowVpcInterfaceResources retrieves all mediaconnect.FlowVpcInterface items from an AWS CloudFormation template
+func (t *Template) GetAllMediaConnectFlowVpcInterfaceResources() map[string]*mediaconnect.FlowVpcInterface {
+	results := map[string]*mediaconnect.FlowVpcInterface{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *mediaconnect.FlowVpcInterface:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMediaConnectFlowVpcInterfaceWithName retrieves all mediaconnect.FlowVpcInterface items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMediaConnectFlowVpcInterfaceWithName(name string) (*mediaconnect.FlowVpcInterface, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *mediaconnect.FlowVpcInterface:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type mediaconnect.FlowVpcInterface not found", name)
+}
+
+// GetAllMediaConvertJobTemplateResources retrieves all mediaconvert.JobTemplate items from an AWS CloudFormation template
+func (t *Template) GetAllMediaConvertJobTemplateResources() map[string]*mediaconvert.JobTemplate {
+	results := map[string]*mediaconvert.JobTemplate{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *mediaconvert.JobTemplate:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMediaConvertJobTemplateWithName retrieves all mediaconvert.JobTemplate items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMediaConvertJobTemplateWithName(name string) (*mediaconvert.JobTemplate, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *mediaconvert.JobTemplate:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type mediaconvert.JobTemplate not found", name)
+}
+
+// GetAllMediaConvertPresetResources retrieves all mediaconvert.Preset items from an AWS CloudFormation template
+func (t *Template) GetAllMediaConvertPresetResources() map[string]*mediaconvert.Preset {
+	results := map[string]*mediaconvert.Preset{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *mediaconvert.Preset:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMediaConvertPresetWithName retrieves all mediaconvert.Preset items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMediaConvertPresetWithName(name string) (*mediaconvert.Preset, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *mediaconvert.Preset:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type mediaconvert.Preset not found", name)
+}
+
+// GetAllMediaConvertQueueResources retrieves all mediaconvert.Queue items from an AWS CloudFormation template
+func (t *Template) GetAllMediaConvertQueueResources() map[string]*mediaconvert.Queue {
+	results := map[string]*mediaconvert.Queue{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *mediaconvert.Queue:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMediaConvertQueueWithName retrieves all mediaconvert.Queue items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMediaConvertQueueWithName(name string) (*mediaconvert.Queue, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *mediaconvert.Queue:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type mediaconvert.Queue not found", name)
+}
+
+// GetAllMediaLiveChannelResources retrieves all medialive.Channel items from an AWS CloudFormation template
+func (t *Template) GetAllMediaLiveChannelResources() map[string]*medialive.Channel {
+	results := map[string]*medialive.Channel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *medialive.Channel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMediaLiveChannelWithName retrieves all medialive.Channel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMediaLiveChannelWithName(name string) (*medialive.Channel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *medialive.Channel:
+			return resource, nil
+		}
+	}
+	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{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *medialive.Input:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// 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) GetMediaLiveInputWithName(name string) (*medialive.Input, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *medialive.Input:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type medialive.Input 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{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *medialive.InputSecurityGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// 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) GetMediaLiveInputSecurityGroupWithName(name string) (*medialive.InputSecurityGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *medialive.InputSecurityGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type medialive.InputSecurityGroup 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)
+}
+
+// GetAllMediaStoreContainerResources retrieves all mediastore.Container items from an AWS CloudFormation template
+func (t *Template) GetAllMediaStoreContainerResources() map[string]*mediastore.Container {
+	results := map[string]*mediastore.Container{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *mediastore.Container:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMediaStoreContainerWithName retrieves all mediastore.Container items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMediaStoreContainerWithName(name string) (*mediastore.Container, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *mediastore.Container:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type mediastore.Container not found", name)
+}
+
+// GetAllMemoryDBACLResources retrieves all memorydb.ACL items from an AWS CloudFormation template
+func (t *Template) GetAllMemoryDBACLResources() map[string]*memorydb.ACL {
+	results := map[string]*memorydb.ACL{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *memorydb.ACL:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMemoryDBACLWithName retrieves all memorydb.ACL items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMemoryDBACLWithName(name string) (*memorydb.ACL, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *memorydb.ACL:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type memorydb.ACL not found", name)
+}
+
+// GetAllMemoryDBClusterResources retrieves all memorydb.Cluster items from an AWS CloudFormation template
+func (t *Template) GetAllMemoryDBClusterResources() map[string]*memorydb.Cluster {
+	results := map[string]*memorydb.Cluster{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *memorydb.Cluster:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMemoryDBClusterWithName retrieves all memorydb.Cluster items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMemoryDBClusterWithName(name string) (*memorydb.Cluster, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *memorydb.Cluster:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type memorydb.Cluster not found", name)
+}
+
+// GetAllMemoryDBParameterGroupResources retrieves all memorydb.ParameterGroup items from an AWS CloudFormation template
+func (t *Template) GetAllMemoryDBParameterGroupResources() map[string]*memorydb.ParameterGroup {
+	results := map[string]*memorydb.ParameterGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *memorydb.ParameterGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMemoryDBParameterGroupWithName retrieves all memorydb.ParameterGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMemoryDBParameterGroupWithName(name string) (*memorydb.ParameterGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *memorydb.ParameterGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type memorydb.ParameterGroup not found", name)
+}
+
+// GetAllMemoryDBSubnetGroupResources retrieves all memorydb.SubnetGroup items from an AWS CloudFormation template
+func (t *Template) GetAllMemoryDBSubnetGroupResources() map[string]*memorydb.SubnetGroup {
+	results := map[string]*memorydb.SubnetGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *memorydb.SubnetGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMemoryDBSubnetGroupWithName retrieves all memorydb.SubnetGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMemoryDBSubnetGroupWithName(name string) (*memorydb.SubnetGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *memorydb.SubnetGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type memorydb.SubnetGroup not found", name)
+}
+
+// GetAllMemoryDBUserResources retrieves all memorydb.User items from an AWS CloudFormation template
+func (t *Template) GetAllMemoryDBUserResources() map[string]*memorydb.User {
+	results := map[string]*memorydb.User{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *memorydb.User:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetMemoryDBUserWithName retrieves all memorydb.User items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetMemoryDBUserWithName(name string) (*memorydb.User, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *memorydb.User:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type memorydb.User not found", name)
+}
+
+// GetAllNeptuneDBClusterResources retrieves all neptune.DBCluster items from an AWS CloudFormation template
+func (t *Template) GetAllNeptuneDBClusterResources() map[string]*neptune.DBCluster {
+	results := map[string]*neptune.DBCluster{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *neptune.DBCluster:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNeptuneDBClusterWithName retrieves all neptune.DBCluster items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNeptuneDBClusterWithName(name string) (*neptune.DBCluster, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *neptune.DBCluster:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type neptune.DBCluster not found", name)
+}
+
+// GetAllNeptuneDBClusterParameterGroupResources retrieves all neptune.DBClusterParameterGroup items from an AWS CloudFormation template
+func (t *Template) GetAllNeptuneDBClusterParameterGroupResources() map[string]*neptune.DBClusterParameterGroup {
+	results := map[string]*neptune.DBClusterParameterGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *neptune.DBClusterParameterGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNeptuneDBClusterParameterGroupWithName retrieves all neptune.DBClusterParameterGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNeptuneDBClusterParameterGroupWithName(name string) (*neptune.DBClusterParameterGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *neptune.DBClusterParameterGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type neptune.DBClusterParameterGroup not found", name)
+}
+
+// GetAllNeptuneDBInstanceResources retrieves all neptune.DBInstance items from an AWS CloudFormation template
+func (t *Template) GetAllNeptuneDBInstanceResources() map[string]*neptune.DBInstance {
+	results := map[string]*neptune.DBInstance{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *neptune.DBInstance:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNeptuneDBInstanceWithName retrieves all neptune.DBInstance items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNeptuneDBInstanceWithName(name string) (*neptune.DBInstance, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *neptune.DBInstance:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type neptune.DBInstance not found", name)
+}
+
+// GetAllNeptuneDBParameterGroupResources retrieves all neptune.DBParameterGroup items from an AWS CloudFormation template
+func (t *Template) GetAllNeptuneDBParameterGroupResources() map[string]*neptune.DBParameterGroup {
+	results := map[string]*neptune.DBParameterGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *neptune.DBParameterGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNeptuneDBParameterGroupWithName retrieves all neptune.DBParameterGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNeptuneDBParameterGroupWithName(name string) (*neptune.DBParameterGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *neptune.DBParameterGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type neptune.DBParameterGroup not found", name)
+}
+
+// GetAllNeptuneDBSubnetGroupResources retrieves all neptune.DBSubnetGroup items from an AWS CloudFormation template
+func (t *Template) GetAllNeptuneDBSubnetGroupResources() map[string]*neptune.DBSubnetGroup {
+	results := map[string]*neptune.DBSubnetGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *neptune.DBSubnetGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNeptuneDBSubnetGroupWithName retrieves all neptune.DBSubnetGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNeptuneDBSubnetGroupWithName(name string) (*neptune.DBSubnetGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *neptune.DBSubnetGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type neptune.DBSubnetGroup not found", name)
+}
+
+// GetAllNetworkFirewallFirewallResources retrieves all networkfirewall.Firewall items from an AWS CloudFormation template
+func (t *Template) GetAllNetworkFirewallFirewallResources() map[string]*networkfirewall.Firewall {
+	results := map[string]*networkfirewall.Firewall{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *networkfirewall.Firewall:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNetworkFirewallFirewallWithName retrieves all networkfirewall.Firewall items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNetworkFirewallFirewallWithName(name string) (*networkfirewall.Firewall, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *networkfirewall.Firewall:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type networkfirewall.Firewall not found", name)
+}
+
+// GetAllNetworkFirewallFirewallPolicyResources retrieves all networkfirewall.FirewallPolicy items from an AWS CloudFormation template
+func (t *Template) GetAllNetworkFirewallFirewallPolicyResources() map[string]*networkfirewall.FirewallPolicy {
+	results := map[string]*networkfirewall.FirewallPolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *networkfirewall.FirewallPolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNetworkFirewallFirewallPolicyWithName retrieves all networkfirewall.FirewallPolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNetworkFirewallFirewallPolicyWithName(name string) (*networkfirewall.FirewallPolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *networkfirewall.FirewallPolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type networkfirewall.FirewallPolicy not found", name)
+}
+
+// GetAllNetworkFirewallLoggingConfigurationResources retrieves all networkfirewall.LoggingConfiguration items from an AWS CloudFormation template
+func (t *Template) GetAllNetworkFirewallLoggingConfigurationResources() map[string]*networkfirewall.LoggingConfiguration {
+	results := map[string]*networkfirewall.LoggingConfiguration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *networkfirewall.LoggingConfiguration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNetworkFirewallLoggingConfigurationWithName retrieves all networkfirewall.LoggingConfiguration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNetworkFirewallLoggingConfigurationWithName(name string) (*networkfirewall.LoggingConfiguration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *networkfirewall.LoggingConfiguration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type networkfirewall.LoggingConfiguration not found", name)
+}
+
+// GetAllNetworkFirewallRuleGroupResources retrieves all networkfirewall.RuleGroup items from an AWS CloudFormation template
+func (t *Template) GetAllNetworkFirewallRuleGroupResources() map[string]*networkfirewall.RuleGroup {
+	results := map[string]*networkfirewall.RuleGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *networkfirewall.RuleGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNetworkFirewallRuleGroupWithName retrieves all networkfirewall.RuleGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNetworkFirewallRuleGroupWithName(name string) (*networkfirewall.RuleGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *networkfirewall.RuleGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type networkfirewall.RuleGroup not found", name)
+}
+
+// GetAllNetworkManagerCustomerGatewayAssociationResources retrieves all networkmanager.CustomerGatewayAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllNetworkManagerCustomerGatewayAssociationResources() map[string]*networkmanager.CustomerGatewayAssociation {
+	results := map[string]*networkmanager.CustomerGatewayAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *networkmanager.CustomerGatewayAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNetworkManagerCustomerGatewayAssociationWithName retrieves all networkmanager.CustomerGatewayAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNetworkManagerCustomerGatewayAssociationWithName(name string) (*networkmanager.CustomerGatewayAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *networkmanager.CustomerGatewayAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type networkmanager.CustomerGatewayAssociation not found", name)
+}
+
+// GetAllNetworkManagerDeviceResources retrieves all networkmanager.Device items from an AWS CloudFormation template
+func (t *Template) GetAllNetworkManagerDeviceResources() map[string]*networkmanager.Device {
+	results := map[string]*networkmanager.Device{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *networkmanager.Device:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNetworkManagerDeviceWithName retrieves all networkmanager.Device items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNetworkManagerDeviceWithName(name string) (*networkmanager.Device, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *networkmanager.Device:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type networkmanager.Device not found", name)
+}
+
+// GetAllNetworkManagerGlobalNetworkResources retrieves all networkmanager.GlobalNetwork items from an AWS CloudFormation template
+func (t *Template) GetAllNetworkManagerGlobalNetworkResources() map[string]*networkmanager.GlobalNetwork {
+	results := map[string]*networkmanager.GlobalNetwork{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *networkmanager.GlobalNetwork:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNetworkManagerGlobalNetworkWithName retrieves all networkmanager.GlobalNetwork items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNetworkManagerGlobalNetworkWithName(name string) (*networkmanager.GlobalNetwork, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *networkmanager.GlobalNetwork:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type networkmanager.GlobalNetwork not found", name)
+}
+
+// GetAllNetworkManagerLinkResources retrieves all networkmanager.Link items from an AWS CloudFormation template
+func (t *Template) GetAllNetworkManagerLinkResources() map[string]*networkmanager.Link {
+	results := map[string]*networkmanager.Link{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *networkmanager.Link:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNetworkManagerLinkWithName retrieves all networkmanager.Link items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNetworkManagerLinkWithName(name string) (*networkmanager.Link, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *networkmanager.Link:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type networkmanager.Link not found", name)
+}
+
+// GetAllNetworkManagerLinkAssociationResources retrieves all networkmanager.LinkAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllNetworkManagerLinkAssociationResources() map[string]*networkmanager.LinkAssociation {
+	results := map[string]*networkmanager.LinkAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *networkmanager.LinkAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNetworkManagerLinkAssociationWithName retrieves all networkmanager.LinkAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNetworkManagerLinkAssociationWithName(name string) (*networkmanager.LinkAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *networkmanager.LinkAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type networkmanager.LinkAssociation not found", name)
+}
+
+// GetAllNetworkManagerSiteResources retrieves all networkmanager.Site items from an AWS CloudFormation template
+func (t *Template) GetAllNetworkManagerSiteResources() map[string]*networkmanager.Site {
+	results := map[string]*networkmanager.Site{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *networkmanager.Site:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNetworkManagerSiteWithName retrieves all networkmanager.Site items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNetworkManagerSiteWithName(name string) (*networkmanager.Site, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *networkmanager.Site:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type networkmanager.Site not found", name)
+}
+
+// GetAllNetworkManagerTransitGatewayRegistrationResources retrieves all networkmanager.TransitGatewayRegistration items from an AWS CloudFormation template
+func (t *Template) GetAllNetworkManagerTransitGatewayRegistrationResources() map[string]*networkmanager.TransitGatewayRegistration {
+	results := map[string]*networkmanager.TransitGatewayRegistration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *networkmanager.TransitGatewayRegistration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNetworkManagerTransitGatewayRegistrationWithName retrieves all networkmanager.TransitGatewayRegistration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNetworkManagerTransitGatewayRegistrationWithName(name string) (*networkmanager.TransitGatewayRegistration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *networkmanager.TransitGatewayRegistration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type networkmanager.TransitGatewayRegistration not found", name)
+}
+
+// GetAllNimbleStudioLaunchProfileResources retrieves all nimblestudio.LaunchProfile items from an AWS CloudFormation template
+func (t *Template) GetAllNimbleStudioLaunchProfileResources() map[string]*nimblestudio.LaunchProfile {
+	results := map[string]*nimblestudio.LaunchProfile{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *nimblestudio.LaunchProfile:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNimbleStudioLaunchProfileWithName retrieves all nimblestudio.LaunchProfile items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNimbleStudioLaunchProfileWithName(name string) (*nimblestudio.LaunchProfile, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *nimblestudio.LaunchProfile:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type nimblestudio.LaunchProfile not found", name)
+}
+
+// GetAllNimbleStudioStreamingImageResources retrieves all nimblestudio.StreamingImage items from an AWS CloudFormation template
+func (t *Template) GetAllNimbleStudioStreamingImageResources() map[string]*nimblestudio.StreamingImage {
+	results := map[string]*nimblestudio.StreamingImage{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *nimblestudio.StreamingImage:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNimbleStudioStreamingImageWithName retrieves all nimblestudio.StreamingImage items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNimbleStudioStreamingImageWithName(name string) (*nimblestudio.StreamingImage, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *nimblestudio.StreamingImage:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type nimblestudio.StreamingImage not found", name)
+}
+
+// GetAllNimbleStudioStudioResources retrieves all nimblestudio.Studio items from an AWS CloudFormation template
+func (t *Template) GetAllNimbleStudioStudioResources() map[string]*nimblestudio.Studio {
+	results := map[string]*nimblestudio.Studio{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *nimblestudio.Studio:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNimbleStudioStudioWithName retrieves all nimblestudio.Studio items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNimbleStudioStudioWithName(name string) (*nimblestudio.Studio, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *nimblestudio.Studio:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type nimblestudio.Studio not found", name)
+}
+
+// GetAllNimbleStudioStudioComponentResources retrieves all nimblestudio.StudioComponent items from an AWS CloudFormation template
+func (t *Template) GetAllNimbleStudioStudioComponentResources() map[string]*nimblestudio.StudioComponent {
+	results := map[string]*nimblestudio.StudioComponent{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *nimblestudio.StudioComponent:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetNimbleStudioStudioComponentWithName retrieves all nimblestudio.StudioComponent items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetNimbleStudioStudioComponentWithName(name string) (*nimblestudio.StudioComponent, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *nimblestudio.StudioComponent:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type nimblestudio.StudioComponent not found", name)
+}
+
+// GetAllOpenSearchServiceDomainResources retrieves all opensearchservice.Domain items from an AWS CloudFormation template
+func (t *Template) GetAllOpenSearchServiceDomainResources() map[string]*opensearchservice.Domain {
+	results := map[string]*opensearchservice.Domain{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *opensearchservice.Domain:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetOpenSearchServiceDomainWithName retrieves all opensearchservice.Domain items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetOpenSearchServiceDomainWithName(name string) (*opensearchservice.Domain, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *opensearchservice.Domain:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type opensearchservice.Domain not found", name)
+}
+
+// GetAllOpsWorksAppResources retrieves all opsworks.App items from an AWS CloudFormation template
+func (t *Template) GetAllOpsWorksAppResources() map[string]*opsworks.App {
+	results := map[string]*opsworks.App{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *opsworks.App:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetOpsWorksAppWithName retrieves all opsworks.App items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetOpsWorksAppWithName(name string) (*opsworks.App, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *opsworks.App:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type opsworks.App not found", name)
+}
+
+// GetAllOpsWorksElasticLoadBalancerAttachmentResources retrieves all opsworks.ElasticLoadBalancerAttachment items from an AWS CloudFormation template
+func (t *Template) GetAllOpsWorksElasticLoadBalancerAttachmentResources() map[string]*opsworks.ElasticLoadBalancerAttachment {
+	results := map[string]*opsworks.ElasticLoadBalancerAttachment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *opsworks.ElasticLoadBalancerAttachment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetOpsWorksElasticLoadBalancerAttachmentWithName retrieves all opsworks.ElasticLoadBalancerAttachment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetOpsWorksElasticLoadBalancerAttachmentWithName(name string) (*opsworks.ElasticLoadBalancerAttachment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *opsworks.ElasticLoadBalancerAttachment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type opsworks.ElasticLoadBalancerAttachment not found", name)
+}
+
+// GetAllOpsWorksInstanceResources retrieves all opsworks.Instance items from an AWS CloudFormation template
+func (t *Template) GetAllOpsWorksInstanceResources() map[string]*opsworks.Instance {
+	results := map[string]*opsworks.Instance{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *opsworks.Instance:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetOpsWorksInstanceWithName retrieves all opsworks.Instance items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetOpsWorksInstanceWithName(name string) (*opsworks.Instance, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *opsworks.Instance:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type opsworks.Instance not found", name)
+}
+
+// GetAllOpsWorksLayerResources retrieves all opsworks.Layer items from an AWS CloudFormation template
+func (t *Template) GetAllOpsWorksLayerResources() map[string]*opsworks.Layer {
+	results := map[string]*opsworks.Layer{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *opsworks.Layer:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetOpsWorksLayerWithName retrieves all opsworks.Layer items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetOpsWorksLayerWithName(name string) (*opsworks.Layer, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *opsworks.Layer:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type opsworks.Layer not found", name)
+}
+
+// GetAllOpsWorksStackResources retrieves all opsworks.Stack items from an AWS CloudFormation template
+func (t *Template) GetAllOpsWorksStackResources() map[string]*opsworks.Stack {
+	results := map[string]*opsworks.Stack{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *opsworks.Stack:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetOpsWorksStackWithName retrieves all opsworks.Stack items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetOpsWorksStackWithName(name string) (*opsworks.Stack, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *opsworks.Stack:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type opsworks.Stack not found", name)
+}
+
+// GetAllOpsWorksUserProfileResources retrieves all opsworks.UserProfile items from an AWS CloudFormation template
+func (t *Template) GetAllOpsWorksUserProfileResources() map[string]*opsworks.UserProfile {
+	results := map[string]*opsworks.UserProfile{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *opsworks.UserProfile:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetOpsWorksUserProfileWithName retrieves all opsworks.UserProfile items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetOpsWorksUserProfileWithName(name string) (*opsworks.UserProfile, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *opsworks.UserProfile:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type opsworks.UserProfile not found", name)
+}
+
+// GetAllOpsWorksVolumeResources retrieves all opsworks.Volume items from an AWS CloudFormation template
+func (t *Template) GetAllOpsWorksVolumeResources() map[string]*opsworks.Volume {
+	results := map[string]*opsworks.Volume{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *opsworks.Volume:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetOpsWorksVolumeWithName retrieves all opsworks.Volume items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetOpsWorksVolumeWithName(name string) (*opsworks.Volume, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *opsworks.Volume:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type opsworks.Volume not found", name)
+}
+
+// GetAllOpsWorksCMServerResources retrieves all opsworkscm.Server items from an AWS CloudFormation template
+func (t *Template) GetAllOpsWorksCMServerResources() map[string]*opsworkscm.Server {
+	results := map[string]*opsworkscm.Server{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *opsworkscm.Server:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetOpsWorksCMServerWithName retrieves all opsworkscm.Server items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetOpsWorksCMServerWithName(name string) (*opsworkscm.Server, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *opsworkscm.Server:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type opsworkscm.Server 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{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *panorama.ApplicationInstance:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPanoramaApplicationInstanceWithName retrieves all panorama.ApplicationInstance items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPanoramaApplicationInstanceWithName(name string) (*panorama.ApplicationInstance, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *panorama.ApplicationInstance:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type panorama.ApplicationInstance not found", name)
+}
+
+// GetAllPanoramaPackageResources retrieves all panorama.Package items from an AWS CloudFormation template
+func (t *Template) GetAllPanoramaPackageResources() map[string]*panorama.Package {
+	results := map[string]*panorama.Package{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *panorama.Package:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPanoramaPackageWithName retrieves all panorama.Package items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPanoramaPackageWithName(name string) (*panorama.Package, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *panorama.Package:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type panorama.Package not found", name)
+}
+
+// GetAllPanoramaPackageVersionResources retrieves all panorama.PackageVersion items from an AWS CloudFormation template
+func (t *Template) GetAllPanoramaPackageVersionResources() map[string]*panorama.PackageVersion {
+	results := map[string]*panorama.PackageVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *panorama.PackageVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPanoramaPackageVersionWithName retrieves all panorama.PackageVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPanoramaPackageVersionWithName(name string) (*panorama.PackageVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *panorama.PackageVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type panorama.PackageVersion not found", name)
+}
+
+// GetAllPinpointADMChannelResources retrieves all pinpoint.ADMChannel items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointADMChannelResources() map[string]*pinpoint.ADMChannel {
+	results := map[string]*pinpoint.ADMChannel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpoint.ADMChannel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointADMChannelWithName retrieves all pinpoint.ADMChannel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointADMChannelWithName(name string) (*pinpoint.ADMChannel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpoint.ADMChannel:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpoint.ADMChannel not found", name)
+}
+
+// GetAllPinpointAPNSChannelResources retrieves all pinpoint.APNSChannel items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointAPNSChannelResources() map[string]*pinpoint.APNSChannel {
+	results := map[string]*pinpoint.APNSChannel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpoint.APNSChannel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointAPNSChannelWithName retrieves all pinpoint.APNSChannel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointAPNSChannelWithName(name string) (*pinpoint.APNSChannel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpoint.APNSChannel:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpoint.APNSChannel not found", name)
+}
+
+// GetAllPinpointAPNSSandboxChannelResources retrieves all pinpoint.APNSSandboxChannel items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointAPNSSandboxChannelResources() map[string]*pinpoint.APNSSandboxChannel {
+	results := map[string]*pinpoint.APNSSandboxChannel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpoint.APNSSandboxChannel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointAPNSSandboxChannelWithName retrieves all pinpoint.APNSSandboxChannel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointAPNSSandboxChannelWithName(name string) (*pinpoint.APNSSandboxChannel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpoint.APNSSandboxChannel:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpoint.APNSSandboxChannel not found", name)
+}
+
+// GetAllPinpointAPNSVoipChannelResources retrieves all pinpoint.APNSVoipChannel items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointAPNSVoipChannelResources() map[string]*pinpoint.APNSVoipChannel {
+	results := map[string]*pinpoint.APNSVoipChannel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpoint.APNSVoipChannel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointAPNSVoipChannelWithName retrieves all pinpoint.APNSVoipChannel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointAPNSVoipChannelWithName(name string) (*pinpoint.APNSVoipChannel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpoint.APNSVoipChannel:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpoint.APNSVoipChannel not found", name)
+}
+
+// GetAllPinpointAPNSVoipSandboxChannelResources retrieves all pinpoint.APNSVoipSandboxChannel items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointAPNSVoipSandboxChannelResources() map[string]*pinpoint.APNSVoipSandboxChannel {
+	results := map[string]*pinpoint.APNSVoipSandboxChannel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpoint.APNSVoipSandboxChannel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointAPNSVoipSandboxChannelWithName retrieves all pinpoint.APNSVoipSandboxChannel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointAPNSVoipSandboxChannelWithName(name string) (*pinpoint.APNSVoipSandboxChannel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpoint.APNSVoipSandboxChannel:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpoint.APNSVoipSandboxChannel not found", name)
+}
+
+// GetAllPinpointAppResources retrieves all pinpoint.App items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointAppResources() map[string]*pinpoint.App {
+	results := map[string]*pinpoint.App{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpoint.App:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointAppWithName retrieves all pinpoint.App items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointAppWithName(name string) (*pinpoint.App, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpoint.App:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpoint.App not found", name)
+}
+
+// GetAllPinpointApplicationSettingsResources retrieves all pinpoint.ApplicationSettings items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointApplicationSettingsResources() map[string]*pinpoint.ApplicationSettings {
+	results := map[string]*pinpoint.ApplicationSettings{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpoint.ApplicationSettings:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointApplicationSettingsWithName retrieves all pinpoint.ApplicationSettings items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointApplicationSettingsWithName(name string) (*pinpoint.ApplicationSettings, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpoint.ApplicationSettings:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpoint.ApplicationSettings not found", name)
+}
+
+// GetAllPinpointBaiduChannelResources retrieves all pinpoint.BaiduChannel items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointBaiduChannelResources() map[string]*pinpoint.BaiduChannel {
+	results := map[string]*pinpoint.BaiduChannel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpoint.BaiduChannel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointBaiduChannelWithName retrieves all pinpoint.BaiduChannel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointBaiduChannelWithName(name string) (*pinpoint.BaiduChannel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpoint.BaiduChannel:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpoint.BaiduChannel not found", name)
+}
+
+// GetAllPinpointCampaignResources retrieves all pinpoint.Campaign items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointCampaignResources() map[string]*pinpoint.Campaign {
+	results := map[string]*pinpoint.Campaign{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpoint.Campaign:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointCampaignWithName retrieves all pinpoint.Campaign items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointCampaignWithName(name string) (*pinpoint.Campaign, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpoint.Campaign:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpoint.Campaign not found", name)
+}
+
+// GetAllPinpointEmailChannelResources retrieves all pinpoint.EmailChannel items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointEmailChannelResources() map[string]*pinpoint.EmailChannel {
+	results := map[string]*pinpoint.EmailChannel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpoint.EmailChannel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointEmailChannelWithName retrieves all pinpoint.EmailChannel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointEmailChannelWithName(name string) (*pinpoint.EmailChannel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpoint.EmailChannel:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpoint.EmailChannel not found", name)
+}
+
+// GetAllPinpointEmailTemplateResources retrieves all pinpoint.EmailTemplate items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointEmailTemplateResources() map[string]*pinpoint.EmailTemplate {
+	results := map[string]*pinpoint.EmailTemplate{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpoint.EmailTemplate:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointEmailTemplateWithName retrieves all pinpoint.EmailTemplate items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointEmailTemplateWithName(name string) (*pinpoint.EmailTemplate, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpoint.EmailTemplate:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpoint.EmailTemplate not found", name)
+}
+
+// GetAllPinpointEventStreamResources retrieves all pinpoint.EventStream items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointEventStreamResources() map[string]*pinpoint.EventStream {
+	results := map[string]*pinpoint.EventStream{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpoint.EventStream:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointEventStreamWithName retrieves all pinpoint.EventStream items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointEventStreamWithName(name string) (*pinpoint.EventStream, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpoint.EventStream:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpoint.EventStream not found", name)
+}
+
+// GetAllPinpointGCMChannelResources retrieves all pinpoint.GCMChannel items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointGCMChannelResources() map[string]*pinpoint.GCMChannel {
+	results := map[string]*pinpoint.GCMChannel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpoint.GCMChannel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointGCMChannelWithName retrieves all pinpoint.GCMChannel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointGCMChannelWithName(name string) (*pinpoint.GCMChannel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpoint.GCMChannel:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpoint.GCMChannel not found", name)
+}
+
+// GetAllPinpointInAppTemplateResources retrieves all pinpoint.InAppTemplate items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointInAppTemplateResources() map[string]*pinpoint.InAppTemplate {
+	results := map[string]*pinpoint.InAppTemplate{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpoint.InAppTemplate:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointInAppTemplateWithName retrieves all pinpoint.InAppTemplate items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointInAppTemplateWithName(name string) (*pinpoint.InAppTemplate, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpoint.InAppTemplate:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpoint.InAppTemplate not found", name)
+}
+
+// GetAllPinpointPushTemplateResources retrieves all pinpoint.PushTemplate items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointPushTemplateResources() map[string]*pinpoint.PushTemplate {
+	results := map[string]*pinpoint.PushTemplate{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpoint.PushTemplate:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointPushTemplateWithName retrieves all pinpoint.PushTemplate items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointPushTemplateWithName(name string) (*pinpoint.PushTemplate, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpoint.PushTemplate:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpoint.PushTemplate not found", name)
+}
+
+// GetAllPinpointSMSChannelResources retrieves all pinpoint.SMSChannel items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointSMSChannelResources() map[string]*pinpoint.SMSChannel {
+	results := map[string]*pinpoint.SMSChannel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpoint.SMSChannel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointSMSChannelWithName retrieves all pinpoint.SMSChannel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointSMSChannelWithName(name string) (*pinpoint.SMSChannel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpoint.SMSChannel:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpoint.SMSChannel not found", name)
+}
+
+// GetAllPinpointSegmentResources retrieves all pinpoint.Segment items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointSegmentResources() map[string]*pinpoint.Segment {
+	results := map[string]*pinpoint.Segment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpoint.Segment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointSegmentWithName retrieves all pinpoint.Segment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointSegmentWithName(name string) (*pinpoint.Segment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpoint.Segment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpoint.Segment not found", name)
+}
+
+// GetAllPinpointSmsTemplateResources retrieves all pinpoint.SmsTemplate items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointSmsTemplateResources() map[string]*pinpoint.SmsTemplate {
+	results := map[string]*pinpoint.SmsTemplate{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpoint.SmsTemplate:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointSmsTemplateWithName retrieves all pinpoint.SmsTemplate items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointSmsTemplateWithName(name string) (*pinpoint.SmsTemplate, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpoint.SmsTemplate:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpoint.SmsTemplate not found", name)
+}
+
+// GetAllPinpointVoiceChannelResources retrieves all pinpoint.VoiceChannel items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointVoiceChannelResources() map[string]*pinpoint.VoiceChannel {
+	results := map[string]*pinpoint.VoiceChannel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpoint.VoiceChannel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointVoiceChannelWithName retrieves all pinpoint.VoiceChannel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointVoiceChannelWithName(name string) (*pinpoint.VoiceChannel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpoint.VoiceChannel:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpoint.VoiceChannel not found", name)
+}
+
+// GetAllPinpointEmailConfigurationSetResources retrieves all pinpointemail.ConfigurationSet items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointEmailConfigurationSetResources() map[string]*pinpointemail.ConfigurationSet {
+	results := map[string]*pinpointemail.ConfigurationSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpointemail.ConfigurationSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointEmailConfigurationSetWithName retrieves all pinpointemail.ConfigurationSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointEmailConfigurationSetWithName(name string) (*pinpointemail.ConfigurationSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpointemail.ConfigurationSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpointemail.ConfigurationSet not found", name)
+}
+
+// GetAllPinpointEmailConfigurationSetEventDestinationResources retrieves all pinpointemail.ConfigurationSetEventDestination items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointEmailConfigurationSetEventDestinationResources() map[string]*pinpointemail.ConfigurationSetEventDestination {
+	results := map[string]*pinpointemail.ConfigurationSetEventDestination{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpointemail.ConfigurationSetEventDestination:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointEmailConfigurationSetEventDestinationWithName retrieves all pinpointemail.ConfigurationSetEventDestination items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointEmailConfigurationSetEventDestinationWithName(name string) (*pinpointemail.ConfigurationSetEventDestination, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpointemail.ConfigurationSetEventDestination:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpointemail.ConfigurationSetEventDestination not found", name)
+}
+
+// GetAllPinpointEmailDedicatedIpPoolResources retrieves all pinpointemail.DedicatedIpPool items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointEmailDedicatedIpPoolResources() map[string]*pinpointemail.DedicatedIpPool {
+	results := map[string]*pinpointemail.DedicatedIpPool{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpointemail.DedicatedIpPool:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointEmailDedicatedIpPoolWithName retrieves all pinpointemail.DedicatedIpPool items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointEmailDedicatedIpPoolWithName(name string) (*pinpointemail.DedicatedIpPool, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpointemail.DedicatedIpPool:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpointemail.DedicatedIpPool not found", name)
+}
+
+// GetAllPinpointEmailIdentityResources retrieves all pinpointemail.Identity items from an AWS CloudFormation template
+func (t *Template) GetAllPinpointEmailIdentityResources() map[string]*pinpointemail.Identity {
+	results := map[string]*pinpointemail.Identity{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *pinpointemail.Identity:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetPinpointEmailIdentityWithName retrieves all pinpointemail.Identity items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetPinpointEmailIdentityWithName(name string) (*pinpointemail.Identity, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *pinpointemail.Identity:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type pinpointemail.Identity 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{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *qldb.Ledger:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetQLDBLedgerWithName retrieves all qldb.Ledger items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetQLDBLedgerWithName(name string) (*qldb.Ledger, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *qldb.Ledger:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type qldb.Ledger not found", name)
+}
+
+// GetAllQLDBStreamResources retrieves all qldb.Stream items from an AWS CloudFormation template
+func (t *Template) GetAllQLDBStreamResources() map[string]*qldb.Stream {
+	results := map[string]*qldb.Stream{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *qldb.Stream:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetQLDBStreamWithName retrieves all qldb.Stream items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetQLDBStreamWithName(name string) (*qldb.Stream, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *qldb.Stream:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type qldb.Stream not found", name)
+}
+
+// GetAllQuickSightAnalysisResources retrieves all quicksight.Analysis items from an AWS CloudFormation template
+func (t *Template) GetAllQuickSightAnalysisResources() map[string]*quicksight.Analysis {
+	results := map[string]*quicksight.Analysis{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *quicksight.Analysis:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetQuickSightAnalysisWithName retrieves all quicksight.Analysis items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetQuickSightAnalysisWithName(name string) (*quicksight.Analysis, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *quicksight.Analysis:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type quicksight.Analysis not found", name)
+}
+
+// GetAllQuickSightDashboardResources retrieves all quicksight.Dashboard items from an AWS CloudFormation template
+func (t *Template) GetAllQuickSightDashboardResources() map[string]*quicksight.Dashboard {
+	results := map[string]*quicksight.Dashboard{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *quicksight.Dashboard:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetQuickSightDashboardWithName retrieves all quicksight.Dashboard items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetQuickSightDashboardWithName(name string) (*quicksight.Dashboard, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *quicksight.Dashboard:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type quicksight.Dashboard not found", name)
+}
+
+// GetAllQuickSightDataSetResources retrieves all quicksight.DataSet items from an AWS CloudFormation template
+func (t *Template) GetAllQuickSightDataSetResources() map[string]*quicksight.DataSet {
+	results := map[string]*quicksight.DataSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *quicksight.DataSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetQuickSightDataSetWithName retrieves all quicksight.DataSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetQuickSightDataSetWithName(name string) (*quicksight.DataSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *quicksight.DataSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type quicksight.DataSet not found", name)
+}
+
+// GetAllQuickSightDataSourceResources retrieves all quicksight.DataSource items from an AWS CloudFormation template
+func (t *Template) GetAllQuickSightDataSourceResources() map[string]*quicksight.DataSource {
+	results := map[string]*quicksight.DataSource{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *quicksight.DataSource:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetQuickSightDataSourceWithName retrieves all quicksight.DataSource items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetQuickSightDataSourceWithName(name string) (*quicksight.DataSource, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *quicksight.DataSource:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type quicksight.DataSource not found", name)
+}
+
+// GetAllQuickSightTemplateResources retrieves all quicksight.Template items from an AWS CloudFormation template
+func (t *Template) GetAllQuickSightTemplateResources() map[string]*quicksight.Template {
+	results := map[string]*quicksight.Template{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *quicksight.Template:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetQuickSightTemplateWithName retrieves all quicksight.Template items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetQuickSightTemplateWithName(name string) (*quicksight.Template, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *quicksight.Template:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type quicksight.Template not found", name)
+}
+
+// GetAllQuickSightThemeResources retrieves all quicksight.Theme items from an AWS CloudFormation template
+func (t *Template) GetAllQuickSightThemeResources() map[string]*quicksight.Theme {
+	results := map[string]*quicksight.Theme{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *quicksight.Theme:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetQuickSightThemeWithName retrieves all quicksight.Theme items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetQuickSightThemeWithName(name string) (*quicksight.Theme, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *quicksight.Theme:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type quicksight.Theme not found", name)
+}
+
+// GetAllRAMResourceShareResources retrieves all ram.ResourceShare items from an AWS CloudFormation template
+func (t *Template) GetAllRAMResourceShareResources() map[string]*ram.ResourceShare {
+	results := map[string]*ram.ResourceShare{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ram.ResourceShare:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRAMResourceShareWithName retrieves all ram.ResourceShare items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRAMResourceShareWithName(name string) (*ram.ResourceShare, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ram.ResourceShare:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ram.ResourceShare not found", name)
+}
+
+// GetAllRDSDBClusterResources retrieves all rds.DBCluster items from an AWS CloudFormation template
+func (t *Template) GetAllRDSDBClusterResources() map[string]*rds.DBCluster {
+	results := map[string]*rds.DBCluster{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *rds.DBCluster:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRDSDBClusterWithName retrieves all rds.DBCluster items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRDSDBClusterWithName(name string) (*rds.DBCluster, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *rds.DBCluster:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type rds.DBCluster not found", name)
+}
+
+// GetAllRDSDBClusterParameterGroupResources retrieves all rds.DBClusterParameterGroup items from an AWS CloudFormation template
+func (t *Template) GetAllRDSDBClusterParameterGroupResources() map[string]*rds.DBClusterParameterGroup {
+	results := map[string]*rds.DBClusterParameterGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *rds.DBClusterParameterGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRDSDBClusterParameterGroupWithName retrieves all rds.DBClusterParameterGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRDSDBClusterParameterGroupWithName(name string) (*rds.DBClusterParameterGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *rds.DBClusterParameterGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type rds.DBClusterParameterGroup not found", name)
+}
+
+// GetAllRDSDBInstanceResources retrieves all rds.DBInstance items from an AWS CloudFormation template
+func (t *Template) GetAllRDSDBInstanceResources() map[string]*rds.DBInstance {
+	results := map[string]*rds.DBInstance{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *rds.DBInstance:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRDSDBInstanceWithName retrieves all rds.DBInstance items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRDSDBInstanceWithName(name string) (*rds.DBInstance, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *rds.DBInstance:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type rds.DBInstance not found", name)
+}
+
+// GetAllRDSDBParameterGroupResources retrieves all rds.DBParameterGroup items from an AWS CloudFormation template
+func (t *Template) GetAllRDSDBParameterGroupResources() map[string]*rds.DBParameterGroup {
+	results := map[string]*rds.DBParameterGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *rds.DBParameterGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRDSDBParameterGroupWithName retrieves all rds.DBParameterGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRDSDBParameterGroupWithName(name string) (*rds.DBParameterGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *rds.DBParameterGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type rds.DBParameterGroup not found", name)
+}
+
+// GetAllRDSDBProxyResources retrieves all rds.DBProxy items from an AWS CloudFormation template
+func (t *Template) GetAllRDSDBProxyResources() map[string]*rds.DBProxy {
+	results := map[string]*rds.DBProxy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *rds.DBProxy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRDSDBProxyWithName retrieves all rds.DBProxy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRDSDBProxyWithName(name string) (*rds.DBProxy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *rds.DBProxy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type rds.DBProxy not found", name)
+}
+
+// GetAllRDSDBProxyEndpointResources retrieves all rds.DBProxyEndpoint items from an AWS CloudFormation template
+func (t *Template) GetAllRDSDBProxyEndpointResources() map[string]*rds.DBProxyEndpoint {
+	results := map[string]*rds.DBProxyEndpoint{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *rds.DBProxyEndpoint:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRDSDBProxyEndpointWithName retrieves all rds.DBProxyEndpoint items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRDSDBProxyEndpointWithName(name string) (*rds.DBProxyEndpoint, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *rds.DBProxyEndpoint:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type rds.DBProxyEndpoint not found", name)
+}
+
+// GetAllRDSDBProxyTargetGroupResources retrieves all rds.DBProxyTargetGroup items from an AWS CloudFormation template
+func (t *Template) GetAllRDSDBProxyTargetGroupResources() map[string]*rds.DBProxyTargetGroup {
+	results := map[string]*rds.DBProxyTargetGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *rds.DBProxyTargetGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRDSDBProxyTargetGroupWithName retrieves all rds.DBProxyTargetGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRDSDBProxyTargetGroupWithName(name string) (*rds.DBProxyTargetGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *rds.DBProxyTargetGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type rds.DBProxyTargetGroup not found", name)
+}
+
+// GetAllRDSDBSecurityGroupResources retrieves all rds.DBSecurityGroup items from an AWS CloudFormation template
+func (t *Template) GetAllRDSDBSecurityGroupResources() map[string]*rds.DBSecurityGroup {
+	results := map[string]*rds.DBSecurityGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *rds.DBSecurityGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRDSDBSecurityGroupWithName retrieves all rds.DBSecurityGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRDSDBSecurityGroupWithName(name string) (*rds.DBSecurityGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *rds.DBSecurityGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type rds.DBSecurityGroup not found", name)
+}
+
+// GetAllRDSDBSecurityGroupIngressResources retrieves all rds.DBSecurityGroupIngress items from an AWS CloudFormation template
+func (t *Template) GetAllRDSDBSecurityGroupIngressResources() map[string]*rds.DBSecurityGroupIngress {
+	results := map[string]*rds.DBSecurityGroupIngress{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *rds.DBSecurityGroupIngress:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRDSDBSecurityGroupIngressWithName retrieves all rds.DBSecurityGroupIngress items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRDSDBSecurityGroupIngressWithName(name string) (*rds.DBSecurityGroupIngress, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *rds.DBSecurityGroupIngress:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type rds.DBSecurityGroupIngress not found", name)
+}
+
+// GetAllRDSDBSubnetGroupResources retrieves all rds.DBSubnetGroup items from an AWS CloudFormation template
+func (t *Template) GetAllRDSDBSubnetGroupResources() map[string]*rds.DBSubnetGroup {
+	results := map[string]*rds.DBSubnetGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *rds.DBSubnetGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRDSDBSubnetGroupWithName retrieves all rds.DBSubnetGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRDSDBSubnetGroupWithName(name string) (*rds.DBSubnetGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *rds.DBSubnetGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type rds.DBSubnetGroup not found", name)
+}
+
+// GetAllRDSEventSubscriptionResources retrieves all rds.EventSubscription items from an AWS CloudFormation template
+func (t *Template) GetAllRDSEventSubscriptionResources() map[string]*rds.EventSubscription {
+	results := map[string]*rds.EventSubscription{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *rds.EventSubscription:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRDSEventSubscriptionWithName retrieves all rds.EventSubscription items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRDSEventSubscriptionWithName(name string) (*rds.EventSubscription, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *rds.EventSubscription:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type rds.EventSubscription not found", name)
+}
+
+// GetAllRDSGlobalClusterResources retrieves all rds.GlobalCluster items from an AWS CloudFormation template
+func (t *Template) GetAllRDSGlobalClusterResources() map[string]*rds.GlobalCluster {
+	results := map[string]*rds.GlobalCluster{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *rds.GlobalCluster:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRDSGlobalClusterWithName retrieves all rds.GlobalCluster items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRDSGlobalClusterWithName(name string) (*rds.GlobalCluster, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *rds.GlobalCluster:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type rds.GlobalCluster not found", name)
+}
+
+// GetAllRDSOptionGroupResources retrieves all rds.OptionGroup items from an AWS CloudFormation template
+func (t *Template) GetAllRDSOptionGroupResources() map[string]*rds.OptionGroup {
+	results := map[string]*rds.OptionGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *rds.OptionGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRDSOptionGroupWithName retrieves all rds.OptionGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRDSOptionGroupWithName(name string) (*rds.OptionGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *rds.OptionGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type rds.OptionGroup not found", name)
+}
+
+// GetAllRUMAppMonitorResources retrieves all rum.AppMonitor items from an AWS CloudFormation template
+func (t *Template) GetAllRUMAppMonitorResources() map[string]*rum.AppMonitor {
+	results := map[string]*rum.AppMonitor{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *rum.AppMonitor:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRUMAppMonitorWithName retrieves all rum.AppMonitor items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRUMAppMonitorWithName(name string) (*rum.AppMonitor, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *rum.AppMonitor:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type rum.AppMonitor not found", name)
+}
+
+// GetAllRedshiftClusterResources retrieves all redshift.Cluster items from an AWS CloudFormation template
+func (t *Template) GetAllRedshiftClusterResources() map[string]*redshift.Cluster {
+	results := map[string]*redshift.Cluster{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *redshift.Cluster:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRedshiftClusterWithName retrieves all redshift.Cluster items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRedshiftClusterWithName(name string) (*redshift.Cluster, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *redshift.Cluster:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type redshift.Cluster not found", name)
+}
+
+// GetAllRedshiftClusterParameterGroupResources retrieves all redshift.ClusterParameterGroup items from an AWS CloudFormation template
+func (t *Template) GetAllRedshiftClusterParameterGroupResources() map[string]*redshift.ClusterParameterGroup {
+	results := map[string]*redshift.ClusterParameterGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *redshift.ClusterParameterGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRedshiftClusterParameterGroupWithName retrieves all redshift.ClusterParameterGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRedshiftClusterParameterGroupWithName(name string) (*redshift.ClusterParameterGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *redshift.ClusterParameterGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type redshift.ClusterParameterGroup not found", name)
+}
+
+// GetAllRedshiftClusterSecurityGroupResources retrieves all redshift.ClusterSecurityGroup items from an AWS CloudFormation template
+func (t *Template) GetAllRedshiftClusterSecurityGroupResources() map[string]*redshift.ClusterSecurityGroup {
+	results := map[string]*redshift.ClusterSecurityGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *redshift.ClusterSecurityGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRedshiftClusterSecurityGroupWithName retrieves all redshift.ClusterSecurityGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRedshiftClusterSecurityGroupWithName(name string) (*redshift.ClusterSecurityGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *redshift.ClusterSecurityGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type redshift.ClusterSecurityGroup not found", name)
+}
+
+// GetAllRedshiftClusterSecurityGroupIngressResources retrieves all redshift.ClusterSecurityGroupIngress items from an AWS CloudFormation template
+func (t *Template) GetAllRedshiftClusterSecurityGroupIngressResources() map[string]*redshift.ClusterSecurityGroupIngress {
+	results := map[string]*redshift.ClusterSecurityGroupIngress{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *redshift.ClusterSecurityGroupIngress:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRedshiftClusterSecurityGroupIngressWithName retrieves all redshift.ClusterSecurityGroupIngress items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRedshiftClusterSecurityGroupIngressWithName(name string) (*redshift.ClusterSecurityGroupIngress, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *redshift.ClusterSecurityGroupIngress:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type redshift.ClusterSecurityGroupIngress not found", name)
+}
+
+// GetAllRedshiftClusterSubnetGroupResources retrieves all redshift.ClusterSubnetGroup items from an AWS CloudFormation template
+func (t *Template) GetAllRedshiftClusterSubnetGroupResources() map[string]*redshift.ClusterSubnetGroup {
+	results := map[string]*redshift.ClusterSubnetGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *redshift.ClusterSubnetGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRedshiftClusterSubnetGroupWithName retrieves all redshift.ClusterSubnetGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRedshiftClusterSubnetGroupWithName(name string) (*redshift.ClusterSubnetGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *redshift.ClusterSubnetGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type redshift.ClusterSubnetGroup not found", name)
+}
+
+// GetAllRedshiftEndpointAccessResources retrieves all redshift.EndpointAccess items from an AWS CloudFormation template
+func (t *Template) GetAllRedshiftEndpointAccessResources() map[string]*redshift.EndpointAccess {
+	results := map[string]*redshift.EndpointAccess{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *redshift.EndpointAccess:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRedshiftEndpointAccessWithName retrieves all redshift.EndpointAccess items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRedshiftEndpointAccessWithName(name string) (*redshift.EndpointAccess, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *redshift.EndpointAccess:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type redshift.EndpointAccess not found", name)
+}
+
+// GetAllRedshiftEndpointAuthorizationResources retrieves all redshift.EndpointAuthorization items from an AWS CloudFormation template
+func (t *Template) GetAllRedshiftEndpointAuthorizationResources() map[string]*redshift.EndpointAuthorization {
+	results := map[string]*redshift.EndpointAuthorization{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *redshift.EndpointAuthorization:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRedshiftEndpointAuthorizationWithName retrieves all redshift.EndpointAuthorization items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRedshiftEndpointAuthorizationWithName(name string) (*redshift.EndpointAuthorization, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *redshift.EndpointAuthorization:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type redshift.EndpointAuthorization not found", name)
+}
+
+// GetAllRedshiftEventSubscriptionResources retrieves all redshift.EventSubscription items from an AWS CloudFormation template
+func (t *Template) GetAllRedshiftEventSubscriptionResources() map[string]*redshift.EventSubscription {
+	results := map[string]*redshift.EventSubscription{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *redshift.EventSubscription:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRedshiftEventSubscriptionWithName retrieves all redshift.EventSubscription items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRedshiftEventSubscriptionWithName(name string) (*redshift.EventSubscription, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *redshift.EventSubscription:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type redshift.EventSubscription not found", name)
+}
+
+// GetAllRedshiftScheduledActionResources retrieves all redshift.ScheduledAction items from an AWS CloudFormation template
+func (t *Template) GetAllRedshiftScheduledActionResources() map[string]*redshift.ScheduledAction {
+	results := map[string]*redshift.ScheduledAction{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *redshift.ScheduledAction:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRedshiftScheduledActionWithName retrieves all redshift.ScheduledAction items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRedshiftScheduledActionWithName(name string) (*redshift.ScheduledAction, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *redshift.ScheduledAction:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type redshift.ScheduledAction not found", name)
+}
+
+// GetAllRefactorSpacesApplicationResources retrieves all refactorspaces.Application items from an AWS CloudFormation template
+func (t *Template) GetAllRefactorSpacesApplicationResources() map[string]*refactorspaces.Application {
+	results := map[string]*refactorspaces.Application{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *refactorspaces.Application:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRefactorSpacesApplicationWithName retrieves all refactorspaces.Application items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRefactorSpacesApplicationWithName(name string) (*refactorspaces.Application, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *refactorspaces.Application:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type refactorspaces.Application not found", name)
+}
+
+// GetAllRefactorSpacesEnvironmentResources retrieves all refactorspaces.Environment items from an AWS CloudFormation template
+func (t *Template) GetAllRefactorSpacesEnvironmentResources() map[string]*refactorspaces.Environment {
+	results := map[string]*refactorspaces.Environment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *refactorspaces.Environment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRefactorSpacesEnvironmentWithName retrieves all refactorspaces.Environment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRefactorSpacesEnvironmentWithName(name string) (*refactorspaces.Environment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *refactorspaces.Environment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type refactorspaces.Environment not found", name)
+}
+
+// GetAllRefactorSpacesRouteResources retrieves all refactorspaces.Route items from an AWS CloudFormation template
+func (t *Template) GetAllRefactorSpacesRouteResources() map[string]*refactorspaces.Route {
+	results := map[string]*refactorspaces.Route{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *refactorspaces.Route:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRefactorSpacesRouteWithName retrieves all refactorspaces.Route items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRefactorSpacesRouteWithName(name string) (*refactorspaces.Route, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *refactorspaces.Route:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type refactorspaces.Route not found", name)
+}
+
+// GetAllRefactorSpacesServiceResources retrieves all refactorspaces.Service items from an AWS CloudFormation template
+func (t *Template) GetAllRefactorSpacesServiceResources() map[string]*refactorspaces.Service {
+	results := map[string]*refactorspaces.Service{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *refactorspaces.Service:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRefactorSpacesServiceWithName retrieves all refactorspaces.Service items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRefactorSpacesServiceWithName(name string) (*refactorspaces.Service, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *refactorspaces.Service:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type refactorspaces.Service not found", name)
+}
+
+// GetAllRekognitionProjectResources retrieves all rekognition.Project items from an AWS CloudFormation template
+func (t *Template) GetAllRekognitionProjectResources() map[string]*rekognition.Project {
+	results := map[string]*rekognition.Project{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *rekognition.Project:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRekognitionProjectWithName retrieves all rekognition.Project items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRekognitionProjectWithName(name string) (*rekognition.Project, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *rekognition.Project:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type rekognition.Project not found", name)
+}
+
+// GetAllResilienceHubAppResources retrieves all resiliencehub.App items from an AWS CloudFormation template
+func (t *Template) GetAllResilienceHubAppResources() map[string]*resiliencehub.App {
+	results := map[string]*resiliencehub.App{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *resiliencehub.App:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetResilienceHubAppWithName retrieves all resiliencehub.App items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetResilienceHubAppWithName(name string) (*resiliencehub.App, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *resiliencehub.App:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type resiliencehub.App not found", name)
+}
+
+// GetAllResilienceHubResiliencyPolicyResources retrieves all resiliencehub.ResiliencyPolicy items from an AWS CloudFormation template
+func (t *Template) GetAllResilienceHubResiliencyPolicyResources() map[string]*resiliencehub.ResiliencyPolicy {
+	results := map[string]*resiliencehub.ResiliencyPolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *resiliencehub.ResiliencyPolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetResilienceHubResiliencyPolicyWithName retrieves all resiliencehub.ResiliencyPolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetResilienceHubResiliencyPolicyWithName(name string) (*resiliencehub.ResiliencyPolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *resiliencehub.ResiliencyPolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type resiliencehub.ResiliencyPolicy not found", name)
+}
+
+// GetAllResourceGroupsGroupResources retrieves all resourcegroups.Group items from an AWS CloudFormation template
+func (t *Template) GetAllResourceGroupsGroupResources() map[string]*resourcegroups.Group {
+	results := map[string]*resourcegroups.Group{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *resourcegroups.Group:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetResourceGroupsGroupWithName retrieves all resourcegroups.Group items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetResourceGroupsGroupWithName(name string) (*resourcegroups.Group, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *resourcegroups.Group:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type resourcegroups.Group not found", name)
+}
+
+// GetAllRoboMakerFleetResources retrieves all robomaker.Fleet items from an AWS CloudFormation template
+func (t *Template) GetAllRoboMakerFleetResources() map[string]*robomaker.Fleet {
+	results := map[string]*robomaker.Fleet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *robomaker.Fleet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoboMakerFleetWithName retrieves all robomaker.Fleet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoboMakerFleetWithName(name string) (*robomaker.Fleet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *robomaker.Fleet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type robomaker.Fleet not found", name)
+}
+
+// GetAllRoboMakerRobotResources retrieves all robomaker.Robot items from an AWS CloudFormation template
+func (t *Template) GetAllRoboMakerRobotResources() map[string]*robomaker.Robot {
+	results := map[string]*robomaker.Robot{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *robomaker.Robot:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoboMakerRobotWithName retrieves all robomaker.Robot items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoboMakerRobotWithName(name string) (*robomaker.Robot, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *robomaker.Robot:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type robomaker.Robot not found", name)
+}
+
+// GetAllRoboMakerRobotApplicationResources retrieves all robomaker.RobotApplication items from an AWS CloudFormation template
+func (t *Template) GetAllRoboMakerRobotApplicationResources() map[string]*robomaker.RobotApplication {
+	results := map[string]*robomaker.RobotApplication{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *robomaker.RobotApplication:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoboMakerRobotApplicationWithName retrieves all robomaker.RobotApplication items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoboMakerRobotApplicationWithName(name string) (*robomaker.RobotApplication, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *robomaker.RobotApplication:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type robomaker.RobotApplication not found", name)
+}
+
+// GetAllRoboMakerRobotApplicationVersionResources retrieves all robomaker.RobotApplicationVersion items from an AWS CloudFormation template
+func (t *Template) GetAllRoboMakerRobotApplicationVersionResources() map[string]*robomaker.RobotApplicationVersion {
+	results := map[string]*robomaker.RobotApplicationVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *robomaker.RobotApplicationVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoboMakerRobotApplicationVersionWithName retrieves all robomaker.RobotApplicationVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoboMakerRobotApplicationVersionWithName(name string) (*robomaker.RobotApplicationVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *robomaker.RobotApplicationVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type robomaker.RobotApplicationVersion not found", name)
+}
+
+// GetAllRoboMakerSimulationApplicationResources retrieves all robomaker.SimulationApplication items from an AWS CloudFormation template
+func (t *Template) GetAllRoboMakerSimulationApplicationResources() map[string]*robomaker.SimulationApplication {
+	results := map[string]*robomaker.SimulationApplication{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *robomaker.SimulationApplication:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoboMakerSimulationApplicationWithName retrieves all robomaker.SimulationApplication items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoboMakerSimulationApplicationWithName(name string) (*robomaker.SimulationApplication, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *robomaker.SimulationApplication:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type robomaker.SimulationApplication not found", name)
+}
+
+// GetAllRoboMakerSimulationApplicationVersionResources retrieves all robomaker.SimulationApplicationVersion items from an AWS CloudFormation template
+func (t *Template) GetAllRoboMakerSimulationApplicationVersionResources() map[string]*robomaker.SimulationApplicationVersion {
+	results := map[string]*robomaker.SimulationApplicationVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *robomaker.SimulationApplicationVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoboMakerSimulationApplicationVersionWithName retrieves all robomaker.SimulationApplicationVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoboMakerSimulationApplicationVersionWithName(name string) (*robomaker.SimulationApplicationVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *robomaker.SimulationApplicationVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type robomaker.SimulationApplicationVersion not found", name)
+}
+
+// GetAllRoute53DNSSECResources retrieves all route53.DNSSEC items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53DNSSECResources() map[string]*route53.DNSSEC {
+	results := map[string]*route53.DNSSEC{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53.DNSSEC:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53DNSSECWithName retrieves all route53.DNSSEC items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53DNSSECWithName(name string) (*route53.DNSSEC, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53.DNSSEC:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53.DNSSEC not found", name)
+}
+
+// GetAllRoute53HealthCheckResources retrieves all route53.HealthCheck items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53HealthCheckResources() map[string]*route53.HealthCheck {
+	results := map[string]*route53.HealthCheck{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53.HealthCheck:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53HealthCheckWithName retrieves all route53.HealthCheck items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53HealthCheckWithName(name string) (*route53.HealthCheck, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53.HealthCheck:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53.HealthCheck not found", name)
+}
+
+// GetAllRoute53HostedZoneResources retrieves all route53.HostedZone items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53HostedZoneResources() map[string]*route53.HostedZone {
+	results := map[string]*route53.HostedZone{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53.HostedZone:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53HostedZoneWithName retrieves all route53.HostedZone items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53HostedZoneWithName(name string) (*route53.HostedZone, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53.HostedZone:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53.HostedZone not found", name)
+}
+
+// GetAllRoute53KeySigningKeyResources retrieves all route53.KeySigningKey items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53KeySigningKeyResources() map[string]*route53.KeySigningKey {
+	results := map[string]*route53.KeySigningKey{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53.KeySigningKey:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53KeySigningKeyWithName retrieves all route53.KeySigningKey items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53KeySigningKeyWithName(name string) (*route53.KeySigningKey, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53.KeySigningKey:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53.KeySigningKey not found", name)
+}
+
+// GetAllRoute53RecordSetResources retrieves all route53.RecordSet items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53RecordSetResources() map[string]*route53.RecordSet {
+	results := map[string]*route53.RecordSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53.RecordSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53RecordSetWithName retrieves all route53.RecordSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53RecordSetWithName(name string) (*route53.RecordSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53.RecordSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53.RecordSet not found", name)
+}
+
+// GetAllRoute53RecordSetGroupResources retrieves all route53.RecordSetGroup items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53RecordSetGroupResources() map[string]*route53.RecordSetGroup {
+	results := map[string]*route53.RecordSetGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53.RecordSetGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53RecordSetGroupWithName retrieves all route53.RecordSetGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53RecordSetGroupWithName(name string) (*route53.RecordSetGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53.RecordSetGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53.RecordSetGroup not found", name)
+}
+
+// GetAllRoute53RecoveryControlClusterResources retrieves all route53recoverycontrol.Cluster items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53RecoveryControlClusterResources() map[string]*route53recoverycontrol.Cluster {
+	results := map[string]*route53recoverycontrol.Cluster{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53recoverycontrol.Cluster:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53RecoveryControlClusterWithName retrieves all route53recoverycontrol.Cluster items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53RecoveryControlClusterWithName(name string) (*route53recoverycontrol.Cluster, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53recoverycontrol.Cluster:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53recoverycontrol.Cluster not found", name)
+}
+
+// GetAllRoute53RecoveryControlControlPanelResources retrieves all route53recoverycontrol.ControlPanel items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53RecoveryControlControlPanelResources() map[string]*route53recoverycontrol.ControlPanel {
+	results := map[string]*route53recoverycontrol.ControlPanel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53recoverycontrol.ControlPanel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53RecoveryControlControlPanelWithName retrieves all route53recoverycontrol.ControlPanel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53RecoveryControlControlPanelWithName(name string) (*route53recoverycontrol.ControlPanel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53recoverycontrol.ControlPanel:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53recoverycontrol.ControlPanel not found", name)
+}
+
+// GetAllRoute53RecoveryControlRoutingControlResources retrieves all route53recoverycontrol.RoutingControl items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53RecoveryControlRoutingControlResources() map[string]*route53recoverycontrol.RoutingControl {
+	results := map[string]*route53recoverycontrol.RoutingControl{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53recoverycontrol.RoutingControl:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53RecoveryControlRoutingControlWithName retrieves all route53recoverycontrol.RoutingControl items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53RecoveryControlRoutingControlWithName(name string) (*route53recoverycontrol.RoutingControl, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53recoverycontrol.RoutingControl:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53recoverycontrol.RoutingControl not found", name)
+}
+
+// GetAllRoute53RecoveryControlSafetyRuleResources retrieves all route53recoverycontrol.SafetyRule items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53RecoveryControlSafetyRuleResources() map[string]*route53recoverycontrol.SafetyRule {
+	results := map[string]*route53recoverycontrol.SafetyRule{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53recoverycontrol.SafetyRule:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53RecoveryControlSafetyRuleWithName retrieves all route53recoverycontrol.SafetyRule items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53RecoveryControlSafetyRuleWithName(name string) (*route53recoverycontrol.SafetyRule, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53recoverycontrol.SafetyRule:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53recoverycontrol.SafetyRule not found", name)
+}
+
+// GetAllRoute53RecoveryReadinessCellResources retrieves all route53recoveryreadiness.Cell items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53RecoveryReadinessCellResources() map[string]*route53recoveryreadiness.Cell {
+	results := map[string]*route53recoveryreadiness.Cell{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53recoveryreadiness.Cell:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53RecoveryReadinessCellWithName retrieves all route53recoveryreadiness.Cell items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53RecoveryReadinessCellWithName(name string) (*route53recoveryreadiness.Cell, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53recoveryreadiness.Cell:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53recoveryreadiness.Cell not found", name)
+}
+
+// GetAllRoute53RecoveryReadinessReadinessCheckResources retrieves all route53recoveryreadiness.ReadinessCheck items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53RecoveryReadinessReadinessCheckResources() map[string]*route53recoveryreadiness.ReadinessCheck {
+	results := map[string]*route53recoveryreadiness.ReadinessCheck{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53recoveryreadiness.ReadinessCheck:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53RecoveryReadinessReadinessCheckWithName retrieves all route53recoveryreadiness.ReadinessCheck items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53RecoveryReadinessReadinessCheckWithName(name string) (*route53recoveryreadiness.ReadinessCheck, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53recoveryreadiness.ReadinessCheck:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53recoveryreadiness.ReadinessCheck not found", name)
+}
+
+// GetAllRoute53RecoveryReadinessRecoveryGroupResources retrieves all route53recoveryreadiness.RecoveryGroup items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53RecoveryReadinessRecoveryGroupResources() map[string]*route53recoveryreadiness.RecoveryGroup {
+	results := map[string]*route53recoveryreadiness.RecoveryGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53recoveryreadiness.RecoveryGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53RecoveryReadinessRecoveryGroupWithName retrieves all route53recoveryreadiness.RecoveryGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53RecoveryReadinessRecoveryGroupWithName(name string) (*route53recoveryreadiness.RecoveryGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53recoveryreadiness.RecoveryGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53recoveryreadiness.RecoveryGroup not found", name)
+}
+
+// GetAllRoute53RecoveryReadinessResourceSetResources retrieves all route53recoveryreadiness.ResourceSet items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53RecoveryReadinessResourceSetResources() map[string]*route53recoveryreadiness.ResourceSet {
+	results := map[string]*route53recoveryreadiness.ResourceSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53recoveryreadiness.ResourceSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53RecoveryReadinessResourceSetWithName retrieves all route53recoveryreadiness.ResourceSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53RecoveryReadinessResourceSetWithName(name string) (*route53recoveryreadiness.ResourceSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53recoveryreadiness.ResourceSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53recoveryreadiness.ResourceSet not found", name)
+}
+
+// GetAllRoute53ResolverFirewallDomainListResources retrieves all route53resolver.FirewallDomainList items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53ResolverFirewallDomainListResources() map[string]*route53resolver.FirewallDomainList {
+	results := map[string]*route53resolver.FirewallDomainList{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53resolver.FirewallDomainList:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53ResolverFirewallDomainListWithName retrieves all route53resolver.FirewallDomainList items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53ResolverFirewallDomainListWithName(name string) (*route53resolver.FirewallDomainList, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53resolver.FirewallDomainList:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53resolver.FirewallDomainList not found", name)
+}
+
+// GetAllRoute53ResolverFirewallRuleGroupResources retrieves all route53resolver.FirewallRuleGroup items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53ResolverFirewallRuleGroupResources() map[string]*route53resolver.FirewallRuleGroup {
+	results := map[string]*route53resolver.FirewallRuleGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53resolver.FirewallRuleGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53ResolverFirewallRuleGroupWithName retrieves all route53resolver.FirewallRuleGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53ResolverFirewallRuleGroupWithName(name string) (*route53resolver.FirewallRuleGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53resolver.FirewallRuleGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53resolver.FirewallRuleGroup not found", name)
+}
+
+// GetAllRoute53ResolverFirewallRuleGroupAssociationResources retrieves all route53resolver.FirewallRuleGroupAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53ResolverFirewallRuleGroupAssociationResources() map[string]*route53resolver.FirewallRuleGroupAssociation {
+	results := map[string]*route53resolver.FirewallRuleGroupAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53resolver.FirewallRuleGroupAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53ResolverFirewallRuleGroupAssociationWithName retrieves all route53resolver.FirewallRuleGroupAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53ResolverFirewallRuleGroupAssociationWithName(name string) (*route53resolver.FirewallRuleGroupAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53resolver.FirewallRuleGroupAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53resolver.FirewallRuleGroupAssociation not found", name)
+}
+
+// GetAllRoute53ResolverResolverConfigResources retrieves all route53resolver.ResolverConfig items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53ResolverResolverConfigResources() map[string]*route53resolver.ResolverConfig {
+	results := map[string]*route53resolver.ResolverConfig{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53resolver.ResolverConfig:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53ResolverResolverConfigWithName retrieves all route53resolver.ResolverConfig items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53ResolverResolverConfigWithName(name string) (*route53resolver.ResolverConfig, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53resolver.ResolverConfig:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53resolver.ResolverConfig not found", name)
+}
+
+// GetAllRoute53ResolverResolverDNSSECConfigResources retrieves all route53resolver.ResolverDNSSECConfig items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53ResolverResolverDNSSECConfigResources() map[string]*route53resolver.ResolverDNSSECConfig {
+	results := map[string]*route53resolver.ResolverDNSSECConfig{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53resolver.ResolverDNSSECConfig:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53ResolverResolverDNSSECConfigWithName retrieves all route53resolver.ResolverDNSSECConfig items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53ResolverResolverDNSSECConfigWithName(name string) (*route53resolver.ResolverDNSSECConfig, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53resolver.ResolverDNSSECConfig:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53resolver.ResolverDNSSECConfig not found", name)
+}
+
+// GetAllRoute53ResolverResolverEndpointResources retrieves all route53resolver.ResolverEndpoint items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53ResolverResolverEndpointResources() map[string]*route53resolver.ResolverEndpoint {
+	results := map[string]*route53resolver.ResolverEndpoint{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53resolver.ResolverEndpoint:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53ResolverResolverEndpointWithName retrieves all route53resolver.ResolverEndpoint items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53ResolverResolverEndpointWithName(name string) (*route53resolver.ResolverEndpoint, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53resolver.ResolverEndpoint:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53resolver.ResolverEndpoint not found", name)
+}
+
+// GetAllRoute53ResolverResolverQueryLoggingConfigResources retrieves all route53resolver.ResolverQueryLoggingConfig items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53ResolverResolverQueryLoggingConfigResources() map[string]*route53resolver.ResolverQueryLoggingConfig {
+	results := map[string]*route53resolver.ResolverQueryLoggingConfig{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53resolver.ResolverQueryLoggingConfig:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53ResolverResolverQueryLoggingConfigWithName retrieves all route53resolver.ResolverQueryLoggingConfig items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53ResolverResolverQueryLoggingConfigWithName(name string) (*route53resolver.ResolverQueryLoggingConfig, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53resolver.ResolverQueryLoggingConfig:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53resolver.ResolverQueryLoggingConfig not found", name)
+}
+
+// GetAllRoute53ResolverResolverQueryLoggingConfigAssociationResources retrieves all route53resolver.ResolverQueryLoggingConfigAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53ResolverResolverQueryLoggingConfigAssociationResources() map[string]*route53resolver.ResolverQueryLoggingConfigAssociation {
+	results := map[string]*route53resolver.ResolverQueryLoggingConfigAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53resolver.ResolverQueryLoggingConfigAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53ResolverResolverQueryLoggingConfigAssociationWithName retrieves all route53resolver.ResolverQueryLoggingConfigAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53ResolverResolverQueryLoggingConfigAssociationWithName(name string) (*route53resolver.ResolverQueryLoggingConfigAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53resolver.ResolverQueryLoggingConfigAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53resolver.ResolverQueryLoggingConfigAssociation not found", name)
+}
+
+// GetAllRoute53ResolverResolverRuleResources retrieves all route53resolver.ResolverRule items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53ResolverResolverRuleResources() map[string]*route53resolver.ResolverRule {
+	results := map[string]*route53resolver.ResolverRule{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53resolver.ResolverRule:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53ResolverResolverRuleWithName retrieves all route53resolver.ResolverRule items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53ResolverResolverRuleWithName(name string) (*route53resolver.ResolverRule, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53resolver.ResolverRule:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53resolver.ResolverRule not found", name)
+}
+
+// GetAllRoute53ResolverResolverRuleAssociationResources retrieves all route53resolver.ResolverRuleAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllRoute53ResolverResolverRuleAssociationResources() map[string]*route53resolver.ResolverRuleAssociation {
+	results := map[string]*route53resolver.ResolverRuleAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *route53resolver.ResolverRuleAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetRoute53ResolverResolverRuleAssociationWithName retrieves all route53resolver.ResolverRuleAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetRoute53ResolverResolverRuleAssociationWithName(name string) (*route53resolver.ResolverRuleAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *route53resolver.ResolverRuleAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type route53resolver.ResolverRuleAssociation not found", name)
+}
+
+// GetAllS3AccessPointResources retrieves all s3.AccessPoint items from an AWS CloudFormation template
+func (t *Template) GetAllS3AccessPointResources() map[string]*s3.AccessPoint {
+	results := map[string]*s3.AccessPoint{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *s3.AccessPoint:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetS3AccessPointWithName retrieves all s3.AccessPoint items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetS3AccessPointWithName(name string) (*s3.AccessPoint, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *s3.AccessPoint:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type s3.AccessPoint not found", name)
+}
+
+// GetAllS3BucketResources retrieves all s3.Bucket items from an AWS CloudFormation template
+func (t *Template) GetAllS3BucketResources() map[string]*s3.Bucket {
+	results := map[string]*s3.Bucket{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *s3.Bucket:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetS3BucketWithName retrieves all s3.Bucket items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetS3BucketWithName(name string) (*s3.Bucket, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *s3.Bucket:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type s3.Bucket not found", name)
+}
+
+// GetAllS3BucketPolicyResources retrieves all s3.BucketPolicy items from an AWS CloudFormation template
+func (t *Template) GetAllS3BucketPolicyResources() map[string]*s3.BucketPolicy {
+	results := map[string]*s3.BucketPolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *s3.BucketPolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetS3BucketPolicyWithName retrieves all s3.BucketPolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetS3BucketPolicyWithName(name string) (*s3.BucketPolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *s3.BucketPolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type s3.BucketPolicy not found", name)
+}
+
+// GetAllS3MultiRegionAccessPointResources retrieves all s3.MultiRegionAccessPoint items from an AWS CloudFormation template
+func (t *Template) GetAllS3MultiRegionAccessPointResources() map[string]*s3.MultiRegionAccessPoint {
+	results := map[string]*s3.MultiRegionAccessPoint{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *s3.MultiRegionAccessPoint:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetS3MultiRegionAccessPointWithName retrieves all s3.MultiRegionAccessPoint items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetS3MultiRegionAccessPointWithName(name string) (*s3.MultiRegionAccessPoint, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *s3.MultiRegionAccessPoint:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type s3.MultiRegionAccessPoint not found", name)
+}
+
+// GetAllS3MultiRegionAccessPointPolicyResources retrieves all s3.MultiRegionAccessPointPolicy items from an AWS CloudFormation template
+func (t *Template) GetAllS3MultiRegionAccessPointPolicyResources() map[string]*s3.MultiRegionAccessPointPolicy {
+	results := map[string]*s3.MultiRegionAccessPointPolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *s3.MultiRegionAccessPointPolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetS3MultiRegionAccessPointPolicyWithName retrieves all s3.MultiRegionAccessPointPolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetS3MultiRegionAccessPointPolicyWithName(name string) (*s3.MultiRegionAccessPointPolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *s3.MultiRegionAccessPointPolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type s3.MultiRegionAccessPointPolicy not found", name)
+}
+
+// GetAllS3StorageLensResources retrieves all s3.StorageLens items from an AWS CloudFormation template
+func (t *Template) GetAllS3StorageLensResources() map[string]*s3.StorageLens {
+	results := map[string]*s3.StorageLens{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *s3.StorageLens:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetS3StorageLensWithName retrieves all s3.StorageLens items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetS3StorageLensWithName(name string) (*s3.StorageLens, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *s3.StorageLens:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type s3.StorageLens not found", name)
+}
+
+// GetAllS3ObjectLambdaAccessPointResources retrieves all s3objectlambda.AccessPoint items from an AWS CloudFormation template
+func (t *Template) GetAllS3ObjectLambdaAccessPointResources() map[string]*s3objectlambda.AccessPoint {
+	results := map[string]*s3objectlambda.AccessPoint{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *s3objectlambda.AccessPoint:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetS3ObjectLambdaAccessPointWithName retrieves all s3objectlambda.AccessPoint items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetS3ObjectLambdaAccessPointWithName(name string) (*s3objectlambda.AccessPoint, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *s3objectlambda.AccessPoint:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type s3objectlambda.AccessPoint not found", name)
+}
+
+// GetAllS3ObjectLambdaAccessPointPolicyResources retrieves all s3objectlambda.AccessPointPolicy items from an AWS CloudFormation template
+func (t *Template) GetAllS3ObjectLambdaAccessPointPolicyResources() map[string]*s3objectlambda.AccessPointPolicy {
+	results := map[string]*s3objectlambda.AccessPointPolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *s3objectlambda.AccessPointPolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetS3ObjectLambdaAccessPointPolicyWithName retrieves all s3objectlambda.AccessPointPolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetS3ObjectLambdaAccessPointPolicyWithName(name string) (*s3objectlambda.AccessPointPolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *s3objectlambda.AccessPointPolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type s3objectlambda.AccessPointPolicy not found", name)
+}
+
+// GetAllS3OutpostsAccessPointResources retrieves all s3outposts.AccessPoint items from an AWS CloudFormation template
+func (t *Template) GetAllS3OutpostsAccessPointResources() map[string]*s3outposts.AccessPoint {
+	results := map[string]*s3outposts.AccessPoint{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *s3outposts.AccessPoint:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetS3OutpostsAccessPointWithName retrieves all s3outposts.AccessPoint items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetS3OutpostsAccessPointWithName(name string) (*s3outposts.AccessPoint, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *s3outposts.AccessPoint:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type s3outposts.AccessPoint not found", name)
+}
+
+// GetAllS3OutpostsBucketResources retrieves all s3outposts.Bucket items from an AWS CloudFormation template
+func (t *Template) GetAllS3OutpostsBucketResources() map[string]*s3outposts.Bucket {
+	results := map[string]*s3outposts.Bucket{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *s3outposts.Bucket:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetS3OutpostsBucketWithName retrieves all s3outposts.Bucket items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetS3OutpostsBucketWithName(name string) (*s3outposts.Bucket, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *s3outposts.Bucket:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type s3outposts.Bucket not found", name)
+}
+
+// GetAllS3OutpostsBucketPolicyResources retrieves all s3outposts.BucketPolicy items from an AWS CloudFormation template
+func (t *Template) GetAllS3OutpostsBucketPolicyResources() map[string]*s3outposts.BucketPolicy {
+	results := map[string]*s3outposts.BucketPolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *s3outposts.BucketPolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetS3OutpostsBucketPolicyWithName retrieves all s3outposts.BucketPolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetS3OutpostsBucketPolicyWithName(name string) (*s3outposts.BucketPolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *s3outposts.BucketPolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type s3outposts.BucketPolicy not found", name)
+}
+
+// GetAllS3OutpostsEndpointResources retrieves all s3outposts.Endpoint items from an AWS CloudFormation template
+func (t *Template) GetAllS3OutpostsEndpointResources() map[string]*s3outposts.Endpoint {
+	results := map[string]*s3outposts.Endpoint{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *s3outposts.Endpoint:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetS3OutpostsEndpointWithName retrieves all s3outposts.Endpoint items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetS3OutpostsEndpointWithName(name string) (*s3outposts.Endpoint, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *s3outposts.Endpoint:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type s3outposts.Endpoint not found", name)
+}
+
+// GetAllSDBDomainResources retrieves all sdb.Domain items from an AWS CloudFormation template
+func (t *Template) GetAllSDBDomainResources() map[string]*sdb.Domain {
+	results := map[string]*sdb.Domain{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sdb.Domain:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSDBDomainWithName retrieves all sdb.Domain items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSDBDomainWithName(name string) (*sdb.Domain, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sdb.Domain:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sdb.Domain not found", name)
+}
+
+// GetAllSESConfigurationSetResources retrieves all ses.ConfigurationSet items from an AWS CloudFormation template
+func (t *Template) GetAllSESConfigurationSetResources() map[string]*ses.ConfigurationSet {
+	results := map[string]*ses.ConfigurationSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ses.ConfigurationSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSESConfigurationSetWithName retrieves all ses.ConfigurationSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSESConfigurationSetWithName(name string) (*ses.ConfigurationSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ses.ConfigurationSet:
+			return resource, nil
+		}
+	}
+	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{}
+	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)
+}
+
+// GetAllSESReceiptFilterResources retrieves all ses.ReceiptFilter items from an AWS CloudFormation template
+func (t *Template) GetAllSESReceiptFilterResources() map[string]*ses.ReceiptFilter {
+	results := map[string]*ses.ReceiptFilter{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ses.ReceiptFilter:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSESReceiptFilterWithName retrieves all ses.ReceiptFilter items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSESReceiptFilterWithName(name string) (*ses.ReceiptFilter, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ses.ReceiptFilter:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ses.ReceiptFilter not found", name)
+}
+
+// GetAllSESReceiptRuleResources retrieves all ses.ReceiptRule items from an AWS CloudFormation template
+func (t *Template) GetAllSESReceiptRuleResources() map[string]*ses.ReceiptRule {
+	results := map[string]*ses.ReceiptRule{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ses.ReceiptRule:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSESReceiptRuleWithName retrieves all ses.ReceiptRule items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSESReceiptRuleWithName(name string) (*ses.ReceiptRule, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ses.ReceiptRule:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ses.ReceiptRule not found", name)
+}
+
+// GetAllSESReceiptRuleSetResources retrieves all ses.ReceiptRuleSet items from an AWS CloudFormation template
+func (t *Template) GetAllSESReceiptRuleSetResources() map[string]*ses.ReceiptRuleSet {
+	results := map[string]*ses.ReceiptRuleSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ses.ReceiptRuleSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSESReceiptRuleSetWithName retrieves all ses.ReceiptRuleSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSESReceiptRuleSetWithName(name string) (*ses.ReceiptRuleSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ses.ReceiptRuleSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ses.ReceiptRuleSet not found", name)
+}
+
+// GetAllSESTemplateResources retrieves all ses.Template items from an AWS CloudFormation template
+func (t *Template) GetAllSESTemplateResources() map[string]*ses.Template {
+	results := map[string]*ses.Template{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ses.Template:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSESTemplateWithName retrieves all ses.Template items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSESTemplateWithName(name string) (*ses.Template, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ses.Template:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ses.Template not found", name)
+}
+
+// GetAllSNSSubscriptionResources retrieves all sns.Subscription items from an AWS CloudFormation template
+func (t *Template) GetAllSNSSubscriptionResources() map[string]*sns.Subscription {
+	results := map[string]*sns.Subscription{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sns.Subscription:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSNSSubscriptionWithName retrieves all sns.Subscription items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSNSSubscriptionWithName(name string) (*sns.Subscription, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sns.Subscription:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sns.Subscription not found", name)
+}
+
+// GetAllSNSTopicResources retrieves all sns.Topic items from an AWS CloudFormation template
+func (t *Template) GetAllSNSTopicResources() map[string]*sns.Topic {
+	results := map[string]*sns.Topic{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sns.Topic:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSNSTopicWithName retrieves all sns.Topic items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSNSTopicWithName(name string) (*sns.Topic, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sns.Topic:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sns.Topic not found", name)
+}
+
+// GetAllSNSTopicPolicyResources retrieves all sns.TopicPolicy items from an AWS CloudFormation template
+func (t *Template) GetAllSNSTopicPolicyResources() map[string]*sns.TopicPolicy {
+	results := map[string]*sns.TopicPolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sns.TopicPolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSNSTopicPolicyWithName retrieves all sns.TopicPolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSNSTopicPolicyWithName(name string) (*sns.TopicPolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sns.TopicPolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sns.TopicPolicy not found", name)
+}
+
+// GetAllSQSQueueResources retrieves all sqs.Queue items from an AWS CloudFormation template
+func (t *Template) GetAllSQSQueueResources() map[string]*sqs.Queue {
+	results := map[string]*sqs.Queue{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sqs.Queue:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSQSQueueWithName retrieves all sqs.Queue items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSQSQueueWithName(name string) (*sqs.Queue, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sqs.Queue:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sqs.Queue not found", name)
+}
+
+// GetAllSQSQueuePolicyResources retrieves all sqs.QueuePolicy items from an AWS CloudFormation template
+func (t *Template) GetAllSQSQueuePolicyResources() map[string]*sqs.QueuePolicy {
+	results := map[string]*sqs.QueuePolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sqs.QueuePolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSQSQueuePolicyWithName retrieves all sqs.QueuePolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSQSQueuePolicyWithName(name string) (*sqs.QueuePolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sqs.QueuePolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sqs.QueuePolicy not found", name)
+}
+
+// GetAllSSMAssociationResources retrieves all ssm.Association items from an AWS CloudFormation template
+func (t *Template) GetAllSSMAssociationResources() map[string]*ssm.Association {
+	results := map[string]*ssm.Association{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ssm.Association:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSSMAssociationWithName retrieves all ssm.Association items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSSMAssociationWithName(name string) (*ssm.Association, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ssm.Association:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ssm.Association not found", name)
+}
+
+// GetAllSSMDocumentResources retrieves all ssm.Document items from an AWS CloudFormation template
+func (t *Template) GetAllSSMDocumentResources() map[string]*ssm.Document {
+	results := map[string]*ssm.Document{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ssm.Document:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSSMDocumentWithName retrieves all ssm.Document items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSSMDocumentWithName(name string) (*ssm.Document, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ssm.Document:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ssm.Document not found", name)
+}
+
+// GetAllSSMMaintenanceWindowResources retrieves all ssm.MaintenanceWindow items from an AWS CloudFormation template
+func (t *Template) GetAllSSMMaintenanceWindowResources() map[string]*ssm.MaintenanceWindow {
+	results := map[string]*ssm.MaintenanceWindow{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ssm.MaintenanceWindow:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSSMMaintenanceWindowWithName retrieves all ssm.MaintenanceWindow items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSSMMaintenanceWindowWithName(name string) (*ssm.MaintenanceWindow, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ssm.MaintenanceWindow:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ssm.MaintenanceWindow not found", name)
+}
+
+// GetAllSSMMaintenanceWindowTargetResources retrieves all ssm.MaintenanceWindowTarget items from an AWS CloudFormation template
+func (t *Template) GetAllSSMMaintenanceWindowTargetResources() map[string]*ssm.MaintenanceWindowTarget {
+	results := map[string]*ssm.MaintenanceWindowTarget{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ssm.MaintenanceWindowTarget:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSSMMaintenanceWindowTargetWithName retrieves all ssm.MaintenanceWindowTarget items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSSMMaintenanceWindowTargetWithName(name string) (*ssm.MaintenanceWindowTarget, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ssm.MaintenanceWindowTarget:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ssm.MaintenanceWindowTarget not found", name)
+}
+
+// GetAllSSMMaintenanceWindowTaskResources retrieves all ssm.MaintenanceWindowTask items from an AWS CloudFormation template
+func (t *Template) GetAllSSMMaintenanceWindowTaskResources() map[string]*ssm.MaintenanceWindowTask {
+	results := map[string]*ssm.MaintenanceWindowTask{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ssm.MaintenanceWindowTask:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSSMMaintenanceWindowTaskWithName retrieves all ssm.MaintenanceWindowTask items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSSMMaintenanceWindowTaskWithName(name string) (*ssm.MaintenanceWindowTask, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ssm.MaintenanceWindowTask:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ssm.MaintenanceWindowTask not found", name)
+}
+
+// GetAllSSMParameterResources retrieves all ssm.Parameter items from an AWS CloudFormation template
+func (t *Template) GetAllSSMParameterResources() map[string]*ssm.Parameter {
+	results := map[string]*ssm.Parameter{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ssm.Parameter:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSSMParameterWithName retrieves all ssm.Parameter items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSSMParameterWithName(name string) (*ssm.Parameter, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ssm.Parameter:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ssm.Parameter not found", name)
+}
+
+// GetAllSSMPatchBaselineResources retrieves all ssm.PatchBaseline items from an AWS CloudFormation template
+func (t *Template) GetAllSSMPatchBaselineResources() map[string]*ssm.PatchBaseline {
+	results := map[string]*ssm.PatchBaseline{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ssm.PatchBaseline:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSSMPatchBaselineWithName retrieves all ssm.PatchBaseline items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSSMPatchBaselineWithName(name string) (*ssm.PatchBaseline, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ssm.PatchBaseline:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ssm.PatchBaseline not found", name)
+}
+
+// GetAllSSMResourceDataSyncResources retrieves all ssm.ResourceDataSync items from an AWS CloudFormation template
+func (t *Template) GetAllSSMResourceDataSyncResources() map[string]*ssm.ResourceDataSync {
+	results := map[string]*ssm.ResourceDataSync{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ssm.ResourceDataSync:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSSMResourceDataSyncWithName retrieves all ssm.ResourceDataSync items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSSMResourceDataSyncWithName(name string) (*ssm.ResourceDataSync, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ssm.ResourceDataSync:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ssm.ResourceDataSync not found", name)
+}
+
+// GetAllSSMContactsContactResources retrieves all ssmcontacts.Contact items from an AWS CloudFormation template
+func (t *Template) GetAllSSMContactsContactResources() map[string]*ssmcontacts.Contact {
+	results := map[string]*ssmcontacts.Contact{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ssmcontacts.Contact:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSSMContactsContactWithName retrieves all ssmcontacts.Contact items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSSMContactsContactWithName(name string) (*ssmcontacts.Contact, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ssmcontacts.Contact:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ssmcontacts.Contact not found", name)
+}
+
+// GetAllSSMContactsContactChannelResources retrieves all ssmcontacts.ContactChannel items from an AWS CloudFormation template
+func (t *Template) GetAllSSMContactsContactChannelResources() map[string]*ssmcontacts.ContactChannel {
+	results := map[string]*ssmcontacts.ContactChannel{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ssmcontacts.ContactChannel:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSSMContactsContactChannelWithName retrieves all ssmcontacts.ContactChannel items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSSMContactsContactChannelWithName(name string) (*ssmcontacts.ContactChannel, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ssmcontacts.ContactChannel:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ssmcontacts.ContactChannel not found", name)
+}
+
+// GetAllSSMIncidentsReplicationSetResources retrieves all ssmincidents.ReplicationSet items from an AWS CloudFormation template
+func (t *Template) GetAllSSMIncidentsReplicationSetResources() map[string]*ssmincidents.ReplicationSet {
+	results := map[string]*ssmincidents.ReplicationSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ssmincidents.ReplicationSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSSMIncidentsReplicationSetWithName retrieves all ssmincidents.ReplicationSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSSMIncidentsReplicationSetWithName(name string) (*ssmincidents.ReplicationSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ssmincidents.ReplicationSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ssmincidents.ReplicationSet not found", name)
+}
+
+// GetAllSSMIncidentsResponsePlanResources retrieves all ssmincidents.ResponsePlan items from an AWS CloudFormation template
+func (t *Template) GetAllSSMIncidentsResponsePlanResources() map[string]*ssmincidents.ResponsePlan {
+	results := map[string]*ssmincidents.ResponsePlan{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ssmincidents.ResponsePlan:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSSMIncidentsResponsePlanWithName retrieves all ssmincidents.ResponsePlan items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSSMIncidentsResponsePlanWithName(name string) (*ssmincidents.ResponsePlan, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ssmincidents.ResponsePlan:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ssmincidents.ResponsePlan 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{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sso.Assignment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSSOAssignmentWithName retrieves all sso.Assignment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSSOAssignmentWithName(name string) (*sso.Assignment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sso.Assignment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sso.Assignment 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{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sso.InstanceAccessControlAttributeConfiguration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSSOInstanceAccessControlAttributeConfigurationWithName retrieves all sso.InstanceAccessControlAttributeConfiguration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSSOInstanceAccessControlAttributeConfigurationWithName(name string) (*sso.InstanceAccessControlAttributeConfiguration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sso.InstanceAccessControlAttributeConfiguration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sso.InstanceAccessControlAttributeConfiguration not found", name)
+}
+
+// GetAllSSOPermissionSetResources retrieves all sso.PermissionSet items from an AWS CloudFormation template
+func (t *Template) GetAllSSOPermissionSetResources() map[string]*sso.PermissionSet {
+	results := map[string]*sso.PermissionSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sso.PermissionSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSSOPermissionSetWithName retrieves all sso.PermissionSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSSOPermissionSetWithName(name string) (*sso.PermissionSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sso.PermissionSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sso.PermissionSet not found", name)
+}
+
+// GetAllSageMakerAppResources retrieves all sagemaker.App items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerAppResources() map[string]*sagemaker.App {
+	results := map[string]*sagemaker.App{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.App:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerAppWithName retrieves all sagemaker.App items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerAppWithName(name string) (*sagemaker.App, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.App:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.App not found", name)
+}
+
+// GetAllSageMakerAppImageConfigResources retrieves all sagemaker.AppImageConfig items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerAppImageConfigResources() map[string]*sagemaker.AppImageConfig {
+	results := map[string]*sagemaker.AppImageConfig{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.AppImageConfig:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerAppImageConfigWithName retrieves all sagemaker.AppImageConfig items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerAppImageConfigWithName(name string) (*sagemaker.AppImageConfig, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.AppImageConfig:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.AppImageConfig 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{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.CodeRepository:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerCodeRepositoryWithName retrieves all sagemaker.CodeRepository items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerCodeRepositoryWithName(name string) (*sagemaker.CodeRepository, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.CodeRepository:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.CodeRepository not found", name)
+}
+
+// GetAllSageMakerDataQualityJobDefinitionResources retrieves all sagemaker.DataQualityJobDefinition items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerDataQualityJobDefinitionResources() map[string]*sagemaker.DataQualityJobDefinition {
+	results := map[string]*sagemaker.DataQualityJobDefinition{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.DataQualityJobDefinition:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerDataQualityJobDefinitionWithName retrieves all sagemaker.DataQualityJobDefinition items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerDataQualityJobDefinitionWithName(name string) (*sagemaker.DataQualityJobDefinition, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.DataQualityJobDefinition:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.DataQualityJobDefinition not found", name)
+}
+
+// GetAllSageMakerDeviceResources retrieves all sagemaker.Device items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerDeviceResources() map[string]*sagemaker.Device {
+	results := map[string]*sagemaker.Device{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.Device:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerDeviceWithName retrieves all sagemaker.Device items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerDeviceWithName(name string) (*sagemaker.Device, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.Device:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.Device not found", name)
+}
+
+// GetAllSageMakerDeviceFleetResources retrieves all sagemaker.DeviceFleet items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerDeviceFleetResources() map[string]*sagemaker.DeviceFleet {
+	results := map[string]*sagemaker.DeviceFleet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.DeviceFleet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerDeviceFleetWithName retrieves all sagemaker.DeviceFleet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerDeviceFleetWithName(name string) (*sagemaker.DeviceFleet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.DeviceFleet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.DeviceFleet not found", name)
+}
+
+// GetAllSageMakerDomainResources retrieves all sagemaker.Domain items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerDomainResources() map[string]*sagemaker.Domain {
+	results := map[string]*sagemaker.Domain{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.Domain:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerDomainWithName retrieves all sagemaker.Domain items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerDomainWithName(name string) (*sagemaker.Domain, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.Domain:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.Domain not found", name)
+}
+
+// GetAllSageMakerEndpointResources retrieves all sagemaker.Endpoint items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerEndpointResources() map[string]*sagemaker.Endpoint {
+	results := map[string]*sagemaker.Endpoint{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.Endpoint:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerEndpointWithName retrieves all sagemaker.Endpoint items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerEndpointWithName(name string) (*sagemaker.Endpoint, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.Endpoint:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.Endpoint not found", name)
+}
+
+// GetAllSageMakerEndpointConfigResources retrieves all sagemaker.EndpointConfig items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerEndpointConfigResources() map[string]*sagemaker.EndpointConfig {
+	results := map[string]*sagemaker.EndpointConfig{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.EndpointConfig:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerEndpointConfigWithName retrieves all sagemaker.EndpointConfig items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerEndpointConfigWithName(name string) (*sagemaker.EndpointConfig, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.EndpointConfig:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.EndpointConfig not found", name)
+}
+
+// GetAllSageMakerFeatureGroupResources retrieves all sagemaker.FeatureGroup items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerFeatureGroupResources() map[string]*sagemaker.FeatureGroup {
+	results := map[string]*sagemaker.FeatureGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.FeatureGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerFeatureGroupWithName retrieves all sagemaker.FeatureGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerFeatureGroupWithName(name string) (*sagemaker.FeatureGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.FeatureGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.FeatureGroup not found", name)
+}
+
+// GetAllSageMakerImageResources retrieves all sagemaker.Image items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerImageResources() map[string]*sagemaker.Image {
+	results := map[string]*sagemaker.Image{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.Image:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerImageWithName retrieves all sagemaker.Image items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerImageWithName(name string) (*sagemaker.Image, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.Image:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.Image not found", name)
+}
+
+// GetAllSageMakerImageVersionResources retrieves all sagemaker.ImageVersion items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerImageVersionResources() map[string]*sagemaker.ImageVersion {
+	results := map[string]*sagemaker.ImageVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.ImageVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerImageVersionWithName retrieves all sagemaker.ImageVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerImageVersionWithName(name string) (*sagemaker.ImageVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.ImageVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.ImageVersion 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{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.Model:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerModelWithName retrieves all sagemaker.Model items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerModelWithName(name string) (*sagemaker.Model, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.Model:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.Model not found", name)
+}
+
+// GetAllSageMakerModelBiasJobDefinitionResources retrieves all sagemaker.ModelBiasJobDefinition items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerModelBiasJobDefinitionResources() map[string]*sagemaker.ModelBiasJobDefinition {
+	results := map[string]*sagemaker.ModelBiasJobDefinition{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.ModelBiasJobDefinition:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerModelBiasJobDefinitionWithName retrieves all sagemaker.ModelBiasJobDefinition items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerModelBiasJobDefinitionWithName(name string) (*sagemaker.ModelBiasJobDefinition, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.ModelBiasJobDefinition:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.ModelBiasJobDefinition not found", name)
+}
+
+// GetAllSageMakerModelExplainabilityJobDefinitionResources retrieves all sagemaker.ModelExplainabilityJobDefinition items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerModelExplainabilityJobDefinitionResources() map[string]*sagemaker.ModelExplainabilityJobDefinition {
+	results := map[string]*sagemaker.ModelExplainabilityJobDefinition{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.ModelExplainabilityJobDefinition:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerModelExplainabilityJobDefinitionWithName retrieves all sagemaker.ModelExplainabilityJobDefinition items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerModelExplainabilityJobDefinitionWithName(name string) (*sagemaker.ModelExplainabilityJobDefinition, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.ModelExplainabilityJobDefinition:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.ModelExplainabilityJobDefinition not found", name)
+}
+
+// GetAllSageMakerModelPackageGroupResources retrieves all sagemaker.ModelPackageGroup items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerModelPackageGroupResources() map[string]*sagemaker.ModelPackageGroup {
+	results := map[string]*sagemaker.ModelPackageGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.ModelPackageGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerModelPackageGroupWithName retrieves all sagemaker.ModelPackageGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerModelPackageGroupWithName(name string) (*sagemaker.ModelPackageGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.ModelPackageGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.ModelPackageGroup not found", name)
+}
+
+// GetAllSageMakerModelQualityJobDefinitionResources retrieves all sagemaker.ModelQualityJobDefinition items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerModelQualityJobDefinitionResources() map[string]*sagemaker.ModelQualityJobDefinition {
+	results := map[string]*sagemaker.ModelQualityJobDefinition{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.ModelQualityJobDefinition:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerModelQualityJobDefinitionWithName retrieves all sagemaker.ModelQualityJobDefinition items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerModelQualityJobDefinitionWithName(name string) (*sagemaker.ModelQualityJobDefinition, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.ModelQualityJobDefinition:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.ModelQualityJobDefinition not found", name)
+}
+
+// GetAllSageMakerMonitoringScheduleResources retrieves all sagemaker.MonitoringSchedule items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerMonitoringScheduleResources() map[string]*sagemaker.MonitoringSchedule {
+	results := map[string]*sagemaker.MonitoringSchedule{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.MonitoringSchedule:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerMonitoringScheduleWithName retrieves all sagemaker.MonitoringSchedule items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerMonitoringScheduleWithName(name string) (*sagemaker.MonitoringSchedule, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.MonitoringSchedule:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.MonitoringSchedule not found", name)
+}
+
+// GetAllSageMakerNotebookInstanceResources retrieves all sagemaker.NotebookInstance items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerNotebookInstanceResources() map[string]*sagemaker.NotebookInstance {
+	results := map[string]*sagemaker.NotebookInstance{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.NotebookInstance:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerNotebookInstanceWithName retrieves all sagemaker.NotebookInstance items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerNotebookInstanceWithName(name string) (*sagemaker.NotebookInstance, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.NotebookInstance:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.NotebookInstance not found", name)
+}
+
+// GetAllSageMakerNotebookInstanceLifecycleConfigResources retrieves all sagemaker.NotebookInstanceLifecycleConfig items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerNotebookInstanceLifecycleConfigResources() map[string]*sagemaker.NotebookInstanceLifecycleConfig {
+	results := map[string]*sagemaker.NotebookInstanceLifecycleConfig{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.NotebookInstanceLifecycleConfig:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerNotebookInstanceLifecycleConfigWithName retrieves all sagemaker.NotebookInstanceLifecycleConfig items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerNotebookInstanceLifecycleConfigWithName(name string) (*sagemaker.NotebookInstanceLifecycleConfig, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.NotebookInstanceLifecycleConfig:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.NotebookInstanceLifecycleConfig not found", name)
+}
+
+// GetAllSageMakerPipelineResources retrieves all sagemaker.Pipeline items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerPipelineResources() map[string]*sagemaker.Pipeline {
+	results := map[string]*sagemaker.Pipeline{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.Pipeline:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerPipelineWithName retrieves all sagemaker.Pipeline items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerPipelineWithName(name string) (*sagemaker.Pipeline, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.Pipeline:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.Pipeline not found", name)
+}
+
+// GetAllSageMakerProjectResources retrieves all sagemaker.Project items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerProjectResources() map[string]*sagemaker.Project {
+	results := map[string]*sagemaker.Project{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.Project:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerProjectWithName retrieves all sagemaker.Project items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerProjectWithName(name string) (*sagemaker.Project, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.Project:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.Project 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{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.UserProfile:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerUserProfileWithName retrieves all sagemaker.UserProfile items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerUserProfileWithName(name string) (*sagemaker.UserProfile, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.UserProfile:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.UserProfile not found", name)
+}
+
+// GetAllSageMakerWorkteamResources retrieves all sagemaker.Workteam items from an AWS CloudFormation template
+func (t *Template) GetAllSageMakerWorkteamResources() map[string]*sagemaker.Workteam {
+	results := map[string]*sagemaker.Workteam{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *sagemaker.Workteam:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSageMakerWorkteamWithName retrieves all sagemaker.Workteam items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSageMakerWorkteamWithName(name string) (*sagemaker.Workteam, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *sagemaker.Workteam:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type sagemaker.Workteam not found", name)
+}
+
+// GetAllSecretsManagerResourcePolicyResources retrieves all secretsmanager.ResourcePolicy items from an AWS CloudFormation template
+func (t *Template) GetAllSecretsManagerResourcePolicyResources() map[string]*secretsmanager.ResourcePolicy {
+	results := map[string]*secretsmanager.ResourcePolicy{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *secretsmanager.ResourcePolicy:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSecretsManagerResourcePolicyWithName retrieves all secretsmanager.ResourcePolicy items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSecretsManagerResourcePolicyWithName(name string) (*secretsmanager.ResourcePolicy, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *secretsmanager.ResourcePolicy:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type secretsmanager.ResourcePolicy not found", name)
+}
+
+// GetAllSecretsManagerRotationScheduleResources retrieves all secretsmanager.RotationSchedule items from an AWS CloudFormation template
+func (t *Template) GetAllSecretsManagerRotationScheduleResources() map[string]*secretsmanager.RotationSchedule {
+	results := map[string]*secretsmanager.RotationSchedule{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *secretsmanager.RotationSchedule:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSecretsManagerRotationScheduleWithName retrieves all secretsmanager.RotationSchedule items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSecretsManagerRotationScheduleWithName(name string) (*secretsmanager.RotationSchedule, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *secretsmanager.RotationSchedule:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type secretsmanager.RotationSchedule not found", name)
+}
+
+// GetAllSecretsManagerSecretResources retrieves all secretsmanager.Secret items from an AWS CloudFormation template
+func (t *Template) GetAllSecretsManagerSecretResources() map[string]*secretsmanager.Secret {
+	results := map[string]*secretsmanager.Secret{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *secretsmanager.Secret:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSecretsManagerSecretWithName retrieves all secretsmanager.Secret items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSecretsManagerSecretWithName(name string) (*secretsmanager.Secret, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *secretsmanager.Secret:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type secretsmanager.Secret not found", name)
+}
+
+// GetAllSecretsManagerSecretTargetAttachmentResources retrieves all secretsmanager.SecretTargetAttachment items from an AWS CloudFormation template
+func (t *Template) GetAllSecretsManagerSecretTargetAttachmentResources() map[string]*secretsmanager.SecretTargetAttachment {
+	results := map[string]*secretsmanager.SecretTargetAttachment{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *secretsmanager.SecretTargetAttachment:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSecretsManagerSecretTargetAttachmentWithName retrieves all secretsmanager.SecretTargetAttachment items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSecretsManagerSecretTargetAttachmentWithName(name string) (*secretsmanager.SecretTargetAttachment, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *secretsmanager.SecretTargetAttachment:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type secretsmanager.SecretTargetAttachment 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{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *securityhub.Hub:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSecurityHubHubWithName retrieves all securityhub.Hub items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSecurityHubHubWithName(name string) (*securityhub.Hub, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *securityhub.Hub:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type securityhub.Hub 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{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *serverless.Api:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServerlessApiWithName retrieves all serverless.Api items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServerlessApiWithName(name string) (*serverless.Api, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *serverless.Api:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type serverless.Api not found", name)
+}
+
+// GetAllServerlessApplicationResources retrieves all serverless.Application items from an AWS CloudFormation template
+func (t *Template) GetAllServerlessApplicationResources() map[string]*serverless.Application {
+	results := map[string]*serverless.Application{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *serverless.Application:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServerlessApplicationWithName retrieves all serverless.Application items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServerlessApplicationWithName(name string) (*serverless.Application, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *serverless.Application:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type serverless.Application not found", name)
+}
+
+// GetAllServerlessFunctionResources retrieves all serverless.Function items from an AWS CloudFormation template
+func (t *Template) GetAllServerlessFunctionResources() map[string]*serverless.Function {
+	results := map[string]*serverless.Function{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *serverless.Function:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServerlessFunctionWithName retrieves all serverless.Function items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServerlessFunctionWithName(name string) (*serverless.Function, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *serverless.Function:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type serverless.Function not found", name)
+}
+
+// GetAllServerlessLayerVersionResources retrieves all serverless.LayerVersion items from an AWS CloudFormation template
+func (t *Template) GetAllServerlessLayerVersionResources() map[string]*serverless.LayerVersion {
+	results := map[string]*serverless.LayerVersion{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *serverless.LayerVersion:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServerlessLayerVersionWithName retrieves all serverless.LayerVersion items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServerlessLayerVersionWithName(name string) (*serverless.LayerVersion, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *serverless.LayerVersion:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type serverless.LayerVersion not found", name)
+}
+
+// GetAllServerlessSimpleTableResources retrieves all serverless.SimpleTable items from an AWS CloudFormation template
+func (t *Template) GetAllServerlessSimpleTableResources() map[string]*serverless.SimpleTable {
+	results := map[string]*serverless.SimpleTable{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *serverless.SimpleTable:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServerlessSimpleTableWithName retrieves all serverless.SimpleTable items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServerlessSimpleTableWithName(name string) (*serverless.SimpleTable, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *serverless.SimpleTable:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type serverless.SimpleTable not found", name)
+}
+
+// GetAllServerlessStateMachineResources retrieves all serverless.StateMachine items from an AWS CloudFormation template
+func (t *Template) GetAllServerlessStateMachineResources() map[string]*serverless.StateMachine {
+	results := map[string]*serverless.StateMachine{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *serverless.StateMachine:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServerlessStateMachineWithName retrieves all serverless.StateMachine items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServerlessStateMachineWithName(name string) (*serverless.StateMachine, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *serverless.StateMachine:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type serverless.StateMachine not found", name)
+}
+
+// GetAllServiceCatalogAcceptedPortfolioShareResources retrieves all servicecatalog.AcceptedPortfolioShare items from an AWS CloudFormation template
+func (t *Template) GetAllServiceCatalogAcceptedPortfolioShareResources() map[string]*servicecatalog.AcceptedPortfolioShare {
+	results := map[string]*servicecatalog.AcceptedPortfolioShare{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicecatalog.AcceptedPortfolioShare:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceCatalogAcceptedPortfolioShareWithName retrieves all servicecatalog.AcceptedPortfolioShare items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceCatalogAcceptedPortfolioShareWithName(name string) (*servicecatalog.AcceptedPortfolioShare, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicecatalog.AcceptedPortfolioShare:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicecatalog.AcceptedPortfolioShare not found", name)
+}
+
+// GetAllServiceCatalogCloudFormationProductResources retrieves all servicecatalog.CloudFormationProduct items from an AWS CloudFormation template
+func (t *Template) GetAllServiceCatalogCloudFormationProductResources() map[string]*servicecatalog.CloudFormationProduct {
+	results := map[string]*servicecatalog.CloudFormationProduct{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicecatalog.CloudFormationProduct:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceCatalogCloudFormationProductWithName retrieves all servicecatalog.CloudFormationProduct items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceCatalogCloudFormationProductWithName(name string) (*servicecatalog.CloudFormationProduct, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicecatalog.CloudFormationProduct:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicecatalog.CloudFormationProduct not found", name)
+}
+
+// GetAllServiceCatalogCloudFormationProvisionedProductResources retrieves all servicecatalog.CloudFormationProvisionedProduct items from an AWS CloudFormation template
+func (t *Template) GetAllServiceCatalogCloudFormationProvisionedProductResources() map[string]*servicecatalog.CloudFormationProvisionedProduct {
+	results := map[string]*servicecatalog.CloudFormationProvisionedProduct{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicecatalog.CloudFormationProvisionedProduct:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceCatalogCloudFormationProvisionedProductWithName retrieves all servicecatalog.CloudFormationProvisionedProduct items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceCatalogCloudFormationProvisionedProductWithName(name string) (*servicecatalog.CloudFormationProvisionedProduct, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicecatalog.CloudFormationProvisionedProduct:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicecatalog.CloudFormationProvisionedProduct not found", name)
+}
+
+// GetAllServiceCatalogLaunchNotificationConstraintResources retrieves all servicecatalog.LaunchNotificationConstraint items from an AWS CloudFormation template
+func (t *Template) GetAllServiceCatalogLaunchNotificationConstraintResources() map[string]*servicecatalog.LaunchNotificationConstraint {
+	results := map[string]*servicecatalog.LaunchNotificationConstraint{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicecatalog.LaunchNotificationConstraint:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceCatalogLaunchNotificationConstraintWithName retrieves all servicecatalog.LaunchNotificationConstraint items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceCatalogLaunchNotificationConstraintWithName(name string) (*servicecatalog.LaunchNotificationConstraint, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicecatalog.LaunchNotificationConstraint:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicecatalog.LaunchNotificationConstraint not found", name)
+}
+
+// GetAllServiceCatalogLaunchRoleConstraintResources retrieves all servicecatalog.LaunchRoleConstraint items from an AWS CloudFormation template
+func (t *Template) GetAllServiceCatalogLaunchRoleConstraintResources() map[string]*servicecatalog.LaunchRoleConstraint {
+	results := map[string]*servicecatalog.LaunchRoleConstraint{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicecatalog.LaunchRoleConstraint:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceCatalogLaunchRoleConstraintWithName retrieves all servicecatalog.LaunchRoleConstraint items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceCatalogLaunchRoleConstraintWithName(name string) (*servicecatalog.LaunchRoleConstraint, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicecatalog.LaunchRoleConstraint:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicecatalog.LaunchRoleConstraint not found", name)
+}
+
+// GetAllServiceCatalogLaunchTemplateConstraintResources retrieves all servicecatalog.LaunchTemplateConstraint items from an AWS CloudFormation template
+func (t *Template) GetAllServiceCatalogLaunchTemplateConstraintResources() map[string]*servicecatalog.LaunchTemplateConstraint {
+	results := map[string]*servicecatalog.LaunchTemplateConstraint{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicecatalog.LaunchTemplateConstraint:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceCatalogLaunchTemplateConstraintWithName retrieves all servicecatalog.LaunchTemplateConstraint items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceCatalogLaunchTemplateConstraintWithName(name string) (*servicecatalog.LaunchTemplateConstraint, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicecatalog.LaunchTemplateConstraint:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicecatalog.LaunchTemplateConstraint not found", name)
+}
+
+// GetAllServiceCatalogPortfolioResources retrieves all servicecatalog.Portfolio items from an AWS CloudFormation template
+func (t *Template) GetAllServiceCatalogPortfolioResources() map[string]*servicecatalog.Portfolio {
+	results := map[string]*servicecatalog.Portfolio{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicecatalog.Portfolio:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceCatalogPortfolioWithName retrieves all servicecatalog.Portfolio items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceCatalogPortfolioWithName(name string) (*servicecatalog.Portfolio, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicecatalog.Portfolio:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicecatalog.Portfolio not found", name)
+}
+
+// GetAllServiceCatalogPortfolioPrincipalAssociationResources retrieves all servicecatalog.PortfolioPrincipalAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllServiceCatalogPortfolioPrincipalAssociationResources() map[string]*servicecatalog.PortfolioPrincipalAssociation {
+	results := map[string]*servicecatalog.PortfolioPrincipalAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicecatalog.PortfolioPrincipalAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceCatalogPortfolioPrincipalAssociationWithName retrieves all servicecatalog.PortfolioPrincipalAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceCatalogPortfolioPrincipalAssociationWithName(name string) (*servicecatalog.PortfolioPrincipalAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicecatalog.PortfolioPrincipalAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicecatalog.PortfolioPrincipalAssociation not found", name)
+}
+
+// GetAllServiceCatalogPortfolioProductAssociationResources retrieves all servicecatalog.PortfolioProductAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllServiceCatalogPortfolioProductAssociationResources() map[string]*servicecatalog.PortfolioProductAssociation {
+	results := map[string]*servicecatalog.PortfolioProductAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicecatalog.PortfolioProductAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceCatalogPortfolioProductAssociationWithName retrieves all servicecatalog.PortfolioProductAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceCatalogPortfolioProductAssociationWithName(name string) (*servicecatalog.PortfolioProductAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicecatalog.PortfolioProductAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicecatalog.PortfolioProductAssociation not found", name)
+}
+
+// GetAllServiceCatalogPortfolioShareResources retrieves all servicecatalog.PortfolioShare items from an AWS CloudFormation template
+func (t *Template) GetAllServiceCatalogPortfolioShareResources() map[string]*servicecatalog.PortfolioShare {
+	results := map[string]*servicecatalog.PortfolioShare{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicecatalog.PortfolioShare:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceCatalogPortfolioShareWithName retrieves all servicecatalog.PortfolioShare items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceCatalogPortfolioShareWithName(name string) (*servicecatalog.PortfolioShare, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicecatalog.PortfolioShare:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicecatalog.PortfolioShare not found", name)
+}
+
+// GetAllServiceCatalogResourceUpdateConstraintResources retrieves all servicecatalog.ResourceUpdateConstraint items from an AWS CloudFormation template
+func (t *Template) GetAllServiceCatalogResourceUpdateConstraintResources() map[string]*servicecatalog.ResourceUpdateConstraint {
+	results := map[string]*servicecatalog.ResourceUpdateConstraint{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicecatalog.ResourceUpdateConstraint:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceCatalogResourceUpdateConstraintWithName retrieves all servicecatalog.ResourceUpdateConstraint items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceCatalogResourceUpdateConstraintWithName(name string) (*servicecatalog.ResourceUpdateConstraint, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicecatalog.ResourceUpdateConstraint:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicecatalog.ResourceUpdateConstraint not found", name)
+}
+
+// GetAllServiceCatalogServiceActionResources retrieves all servicecatalog.ServiceAction items from an AWS CloudFormation template
+func (t *Template) GetAllServiceCatalogServiceActionResources() map[string]*servicecatalog.ServiceAction {
+	results := map[string]*servicecatalog.ServiceAction{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicecatalog.ServiceAction:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceCatalogServiceActionWithName retrieves all servicecatalog.ServiceAction items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceCatalogServiceActionWithName(name string) (*servicecatalog.ServiceAction, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicecatalog.ServiceAction:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicecatalog.ServiceAction not found", name)
+}
+
+// GetAllServiceCatalogServiceActionAssociationResources retrieves all servicecatalog.ServiceActionAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllServiceCatalogServiceActionAssociationResources() map[string]*servicecatalog.ServiceActionAssociation {
+	results := map[string]*servicecatalog.ServiceActionAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicecatalog.ServiceActionAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceCatalogServiceActionAssociationWithName retrieves all servicecatalog.ServiceActionAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceCatalogServiceActionAssociationWithName(name string) (*servicecatalog.ServiceActionAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicecatalog.ServiceActionAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicecatalog.ServiceActionAssociation not found", name)
+}
+
+// GetAllServiceCatalogStackSetConstraintResources retrieves all servicecatalog.StackSetConstraint items from an AWS CloudFormation template
+func (t *Template) GetAllServiceCatalogStackSetConstraintResources() map[string]*servicecatalog.StackSetConstraint {
+	results := map[string]*servicecatalog.StackSetConstraint{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicecatalog.StackSetConstraint:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceCatalogStackSetConstraintWithName retrieves all servicecatalog.StackSetConstraint items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceCatalogStackSetConstraintWithName(name string) (*servicecatalog.StackSetConstraint, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicecatalog.StackSetConstraint:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicecatalog.StackSetConstraint not found", name)
+}
+
+// GetAllServiceCatalogTagOptionResources retrieves all servicecatalog.TagOption items from an AWS CloudFormation template
+func (t *Template) GetAllServiceCatalogTagOptionResources() map[string]*servicecatalog.TagOption {
+	results := map[string]*servicecatalog.TagOption{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicecatalog.TagOption:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceCatalogTagOptionWithName retrieves all servicecatalog.TagOption items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceCatalogTagOptionWithName(name string) (*servicecatalog.TagOption, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicecatalog.TagOption:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicecatalog.TagOption not found", name)
+}
+
+// GetAllServiceCatalogTagOptionAssociationResources retrieves all servicecatalog.TagOptionAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllServiceCatalogTagOptionAssociationResources() map[string]*servicecatalog.TagOptionAssociation {
+	results := map[string]*servicecatalog.TagOptionAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicecatalog.TagOptionAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceCatalogTagOptionAssociationWithName retrieves all servicecatalog.TagOptionAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceCatalogTagOptionAssociationWithName(name string) (*servicecatalog.TagOptionAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicecatalog.TagOptionAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicecatalog.TagOptionAssociation not found", name)
+}
+
+// GetAllServiceCatalogAppRegistryApplicationResources retrieves all servicecatalogappregistry.Application items from an AWS CloudFormation template
+func (t *Template) GetAllServiceCatalogAppRegistryApplicationResources() map[string]*servicecatalogappregistry.Application {
+	results := map[string]*servicecatalogappregistry.Application{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicecatalogappregistry.Application:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceCatalogAppRegistryApplicationWithName retrieves all servicecatalogappregistry.Application items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceCatalogAppRegistryApplicationWithName(name string) (*servicecatalogappregistry.Application, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicecatalogappregistry.Application:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicecatalogappregistry.Application not found", name)
+}
+
+// GetAllServiceCatalogAppRegistryAttributeGroupResources retrieves all servicecatalogappregistry.AttributeGroup items from an AWS CloudFormation template
+func (t *Template) GetAllServiceCatalogAppRegistryAttributeGroupResources() map[string]*servicecatalogappregistry.AttributeGroup {
+	results := map[string]*servicecatalogappregistry.AttributeGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicecatalogappregistry.AttributeGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceCatalogAppRegistryAttributeGroupWithName retrieves all servicecatalogappregistry.AttributeGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceCatalogAppRegistryAttributeGroupWithName(name string) (*servicecatalogappregistry.AttributeGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicecatalogappregistry.AttributeGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicecatalogappregistry.AttributeGroup not found", name)
+}
+
+// GetAllServiceCatalogAppRegistryAttributeGroupAssociationResources retrieves all servicecatalogappregistry.AttributeGroupAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllServiceCatalogAppRegistryAttributeGroupAssociationResources() map[string]*servicecatalogappregistry.AttributeGroupAssociation {
+	results := map[string]*servicecatalogappregistry.AttributeGroupAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicecatalogappregistry.AttributeGroupAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceCatalogAppRegistryAttributeGroupAssociationWithName retrieves all servicecatalogappregistry.AttributeGroupAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceCatalogAppRegistryAttributeGroupAssociationWithName(name string) (*servicecatalogappregistry.AttributeGroupAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicecatalogappregistry.AttributeGroupAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicecatalogappregistry.AttributeGroupAssociation not found", name)
+}
+
+// GetAllServiceCatalogAppRegistryResourceAssociationResources retrieves all servicecatalogappregistry.ResourceAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllServiceCatalogAppRegistryResourceAssociationResources() map[string]*servicecatalogappregistry.ResourceAssociation {
+	results := map[string]*servicecatalogappregistry.ResourceAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicecatalogappregistry.ResourceAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceCatalogAppRegistryResourceAssociationWithName retrieves all servicecatalogappregistry.ResourceAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceCatalogAppRegistryResourceAssociationWithName(name string) (*servicecatalogappregistry.ResourceAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicecatalogappregistry.ResourceAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicecatalogappregistry.ResourceAssociation not found", name)
+}
+
+// GetAllServiceDiscoveryHttpNamespaceResources retrieves all servicediscovery.HttpNamespace items from an AWS CloudFormation template
+func (t *Template) GetAllServiceDiscoveryHttpNamespaceResources() map[string]*servicediscovery.HttpNamespace {
+	results := map[string]*servicediscovery.HttpNamespace{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicediscovery.HttpNamespace:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceDiscoveryHttpNamespaceWithName retrieves all servicediscovery.HttpNamespace items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceDiscoveryHttpNamespaceWithName(name string) (*servicediscovery.HttpNamespace, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicediscovery.HttpNamespace:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicediscovery.HttpNamespace not found", name)
+}
+
+// GetAllServiceDiscoveryInstanceResources retrieves all servicediscovery.Instance items from an AWS CloudFormation template
+func (t *Template) GetAllServiceDiscoveryInstanceResources() map[string]*servicediscovery.Instance {
+	results := map[string]*servicediscovery.Instance{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicediscovery.Instance:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceDiscoveryInstanceWithName retrieves all servicediscovery.Instance items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceDiscoveryInstanceWithName(name string) (*servicediscovery.Instance, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicediscovery.Instance:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicediscovery.Instance not found", name)
+}
+
+// GetAllServiceDiscoveryPrivateDnsNamespaceResources retrieves all servicediscovery.PrivateDnsNamespace items from an AWS CloudFormation template
+func (t *Template) GetAllServiceDiscoveryPrivateDnsNamespaceResources() map[string]*servicediscovery.PrivateDnsNamespace {
+	results := map[string]*servicediscovery.PrivateDnsNamespace{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicediscovery.PrivateDnsNamespace:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceDiscoveryPrivateDnsNamespaceWithName retrieves all servicediscovery.PrivateDnsNamespace items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceDiscoveryPrivateDnsNamespaceWithName(name string) (*servicediscovery.PrivateDnsNamespace, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicediscovery.PrivateDnsNamespace:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicediscovery.PrivateDnsNamespace not found", name)
+}
+
+// GetAllServiceDiscoveryPublicDnsNamespaceResources retrieves all servicediscovery.PublicDnsNamespace items from an AWS CloudFormation template
+func (t *Template) GetAllServiceDiscoveryPublicDnsNamespaceResources() map[string]*servicediscovery.PublicDnsNamespace {
+	results := map[string]*servicediscovery.PublicDnsNamespace{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicediscovery.PublicDnsNamespace:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceDiscoveryPublicDnsNamespaceWithName retrieves all servicediscovery.PublicDnsNamespace items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceDiscoveryPublicDnsNamespaceWithName(name string) (*servicediscovery.PublicDnsNamespace, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicediscovery.PublicDnsNamespace:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicediscovery.PublicDnsNamespace not found", name)
+}
+
+// GetAllServiceDiscoveryServiceResources retrieves all servicediscovery.Service items from an AWS CloudFormation template
+func (t *Template) GetAllServiceDiscoveryServiceResources() map[string]*servicediscovery.Service {
+	results := map[string]*servicediscovery.Service{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *servicediscovery.Service:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetServiceDiscoveryServiceWithName retrieves all servicediscovery.Service items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetServiceDiscoveryServiceWithName(name string) (*servicediscovery.Service, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *servicediscovery.Service:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type servicediscovery.Service not found", name)
+}
+
+// GetAllSignerProfilePermissionResources retrieves all signer.ProfilePermission items from an AWS CloudFormation template
+func (t *Template) GetAllSignerProfilePermissionResources() map[string]*signer.ProfilePermission {
+	results := map[string]*signer.ProfilePermission{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *signer.ProfilePermission:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSignerProfilePermissionWithName retrieves all signer.ProfilePermission items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSignerProfilePermissionWithName(name string) (*signer.ProfilePermission, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *signer.ProfilePermission:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type signer.ProfilePermission not found", name)
+}
+
+// GetAllSignerSigningProfileResources retrieves all signer.SigningProfile items from an AWS CloudFormation template
+func (t *Template) GetAllSignerSigningProfileResources() map[string]*signer.SigningProfile {
+	results := map[string]*signer.SigningProfile{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *signer.SigningProfile:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSignerSigningProfileWithName retrieves all signer.SigningProfile items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSignerSigningProfileWithName(name string) (*signer.SigningProfile, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *signer.SigningProfile:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type signer.SigningProfile not found", name)
+}
+
+// GetAllStepFunctionsActivityResources retrieves all stepfunctions.Activity items from an AWS CloudFormation template
+func (t *Template) GetAllStepFunctionsActivityResources() map[string]*stepfunctions.Activity {
+	results := map[string]*stepfunctions.Activity{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *stepfunctions.Activity:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetStepFunctionsActivityWithName retrieves all stepfunctions.Activity items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetStepFunctionsActivityWithName(name string) (*stepfunctions.Activity, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *stepfunctions.Activity:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type stepfunctions.Activity not found", name)
+}
+
+// GetAllStepFunctionsStateMachineResources retrieves all stepfunctions.StateMachine items from an AWS CloudFormation template
+func (t *Template) GetAllStepFunctionsStateMachineResources() map[string]*stepfunctions.StateMachine {
+	results := map[string]*stepfunctions.StateMachine{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *stepfunctions.StateMachine:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetStepFunctionsStateMachineWithName retrieves all stepfunctions.StateMachine items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetStepFunctionsStateMachineWithName(name string) (*stepfunctions.StateMachine, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *stepfunctions.StateMachine:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type stepfunctions.StateMachine not found", name)
+}
+
+// GetAllSyntheticsCanaryResources retrieves all synthetics.Canary items from an AWS CloudFormation template
+func (t *Template) GetAllSyntheticsCanaryResources() map[string]*synthetics.Canary {
+	results := map[string]*synthetics.Canary{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *synthetics.Canary:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetSyntheticsCanaryWithName retrieves all synthetics.Canary items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetSyntheticsCanaryWithName(name string) (*synthetics.Canary, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *synthetics.Canary:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type synthetics.Canary not found", name)
+}
+
+// GetAllTimestreamDatabaseResources retrieves all timestream.Database items from an AWS CloudFormation template
+func (t *Template) GetAllTimestreamDatabaseResources() map[string]*timestream.Database {
+	results := map[string]*timestream.Database{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *timestream.Database:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetTimestreamDatabaseWithName retrieves all timestream.Database items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetTimestreamDatabaseWithName(name string) (*timestream.Database, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *timestream.Database:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type timestream.Database not found", name)
+}
+
+// GetAllTimestreamScheduledQueryResources retrieves all timestream.ScheduledQuery items from an AWS CloudFormation template
+func (t *Template) GetAllTimestreamScheduledQueryResources() map[string]*timestream.ScheduledQuery {
+	results := map[string]*timestream.ScheduledQuery{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *timestream.ScheduledQuery:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetTimestreamScheduledQueryWithName retrieves all timestream.ScheduledQuery items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetTimestreamScheduledQueryWithName(name string) (*timestream.ScheduledQuery, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *timestream.ScheduledQuery:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type timestream.ScheduledQuery not found", name)
+}
+
+// GetAllTimestreamTableResources retrieves all timestream.Table items from an AWS CloudFormation template
+func (t *Template) GetAllTimestreamTableResources() map[string]*timestream.Table {
+	results := map[string]*timestream.Table{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *timestream.Table:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetTimestreamTableWithName retrieves all timestream.Table items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetTimestreamTableWithName(name string) (*timestream.Table, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *timestream.Table:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type timestream.Table not found", name)
+}
+
+// GetAllTransferServerResources retrieves all transfer.Server items from an AWS CloudFormation template
+func (t *Template) GetAllTransferServerResources() map[string]*transfer.Server {
+	results := map[string]*transfer.Server{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *transfer.Server:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetTransferServerWithName retrieves all transfer.Server items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetTransferServerWithName(name string) (*transfer.Server, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *transfer.Server:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type transfer.Server not found", name)
+}
+
+// GetAllTransferUserResources retrieves all transfer.User items from an AWS CloudFormation template
+func (t *Template) GetAllTransferUserResources() map[string]*transfer.User {
+	results := map[string]*transfer.User{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *transfer.User:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetTransferUserWithName retrieves all transfer.User items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetTransferUserWithName(name string) (*transfer.User, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *transfer.User:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type transfer.User not found", name)
+}
+
+// GetAllTransferWorkflowResources retrieves all transfer.Workflow items from an AWS CloudFormation template
+func (t *Template) GetAllTransferWorkflowResources() map[string]*transfer.Workflow {
+	results := map[string]*transfer.Workflow{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *transfer.Workflow:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetTransferWorkflowWithName retrieves all transfer.Workflow items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetTransferWorkflowWithName(name string) (*transfer.Workflow, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *transfer.Workflow:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type transfer.Workflow not found", name)
+}
+
+// GetAllWAFByteMatchSetResources retrieves all waf.ByteMatchSet items from an AWS CloudFormation template
+func (t *Template) GetAllWAFByteMatchSetResources() map[string]*waf.ByteMatchSet {
+	results := map[string]*waf.ByteMatchSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *waf.ByteMatchSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFByteMatchSetWithName retrieves all waf.ByteMatchSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFByteMatchSetWithName(name string) (*waf.ByteMatchSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *waf.ByteMatchSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type waf.ByteMatchSet not found", name)
+}
+
+// GetAllWAFIPSetResources retrieves all waf.IPSet items from an AWS CloudFormation template
+func (t *Template) GetAllWAFIPSetResources() map[string]*waf.IPSet {
+	results := map[string]*waf.IPSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *waf.IPSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFIPSetWithName retrieves all waf.IPSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFIPSetWithName(name string) (*waf.IPSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *waf.IPSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type waf.IPSet not found", name)
+}
+
+// GetAllWAFRuleResources retrieves all waf.Rule items from an AWS CloudFormation template
+func (t *Template) GetAllWAFRuleResources() map[string]*waf.Rule {
+	results := map[string]*waf.Rule{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *waf.Rule:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFRuleWithName retrieves all waf.Rule items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFRuleWithName(name string) (*waf.Rule, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *waf.Rule:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type waf.Rule not found", name)
+}
+
+// GetAllWAFSizeConstraintSetResources retrieves all waf.SizeConstraintSet items from an AWS CloudFormation template
+func (t *Template) GetAllWAFSizeConstraintSetResources() map[string]*waf.SizeConstraintSet {
+	results := map[string]*waf.SizeConstraintSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *waf.SizeConstraintSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFSizeConstraintSetWithName retrieves all waf.SizeConstraintSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFSizeConstraintSetWithName(name string) (*waf.SizeConstraintSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *waf.SizeConstraintSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type waf.SizeConstraintSet not found", name)
+}
+
+// GetAllWAFSqlInjectionMatchSetResources retrieves all waf.SqlInjectionMatchSet items from an AWS CloudFormation template
+func (t *Template) GetAllWAFSqlInjectionMatchSetResources() map[string]*waf.SqlInjectionMatchSet {
+	results := map[string]*waf.SqlInjectionMatchSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *waf.SqlInjectionMatchSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFSqlInjectionMatchSetWithName retrieves all waf.SqlInjectionMatchSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFSqlInjectionMatchSetWithName(name string) (*waf.SqlInjectionMatchSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *waf.SqlInjectionMatchSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type waf.SqlInjectionMatchSet not found", name)
+}
+
+// GetAllWAFWebACLResources retrieves all waf.WebACL items from an AWS CloudFormation template
+func (t *Template) GetAllWAFWebACLResources() map[string]*waf.WebACL {
+	results := map[string]*waf.WebACL{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *waf.WebACL:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFWebACLWithName retrieves all waf.WebACL items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFWebACLWithName(name string) (*waf.WebACL, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *waf.WebACL:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type waf.WebACL not found", name)
+}
+
+// GetAllWAFXssMatchSetResources retrieves all waf.XssMatchSet items from an AWS CloudFormation template
+func (t *Template) GetAllWAFXssMatchSetResources() map[string]*waf.XssMatchSet {
+	results := map[string]*waf.XssMatchSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *waf.XssMatchSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFXssMatchSetWithName retrieves all waf.XssMatchSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFXssMatchSetWithName(name string) (*waf.XssMatchSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *waf.XssMatchSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type waf.XssMatchSet not found", name)
+}
+
+// GetAllWAFRegionalByteMatchSetResources retrieves all wafregional.ByteMatchSet items from an AWS CloudFormation template
+func (t *Template) GetAllWAFRegionalByteMatchSetResources() map[string]*wafregional.ByteMatchSet {
+	results := map[string]*wafregional.ByteMatchSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *wafregional.ByteMatchSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFRegionalByteMatchSetWithName retrieves all wafregional.ByteMatchSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFRegionalByteMatchSetWithName(name string) (*wafregional.ByteMatchSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *wafregional.ByteMatchSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type wafregional.ByteMatchSet not found", name)
+}
+
+// GetAllWAFRegionalGeoMatchSetResources retrieves all wafregional.GeoMatchSet items from an AWS CloudFormation template
+func (t *Template) GetAllWAFRegionalGeoMatchSetResources() map[string]*wafregional.GeoMatchSet {
+	results := map[string]*wafregional.GeoMatchSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *wafregional.GeoMatchSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFRegionalGeoMatchSetWithName retrieves all wafregional.GeoMatchSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFRegionalGeoMatchSetWithName(name string) (*wafregional.GeoMatchSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *wafregional.GeoMatchSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type wafregional.GeoMatchSet not found", name)
+}
+
+// GetAllWAFRegionalIPSetResources retrieves all wafregional.IPSet items from an AWS CloudFormation template
+func (t *Template) GetAllWAFRegionalIPSetResources() map[string]*wafregional.IPSet {
+	results := map[string]*wafregional.IPSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *wafregional.IPSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFRegionalIPSetWithName retrieves all wafregional.IPSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFRegionalIPSetWithName(name string) (*wafregional.IPSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *wafregional.IPSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type wafregional.IPSet not found", name)
+}
+
+// GetAllWAFRegionalRateBasedRuleResources retrieves all wafregional.RateBasedRule items from an AWS CloudFormation template
+func (t *Template) GetAllWAFRegionalRateBasedRuleResources() map[string]*wafregional.RateBasedRule {
+	results := map[string]*wafregional.RateBasedRule{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *wafregional.RateBasedRule:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFRegionalRateBasedRuleWithName retrieves all wafregional.RateBasedRule items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFRegionalRateBasedRuleWithName(name string) (*wafregional.RateBasedRule, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *wafregional.RateBasedRule:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type wafregional.RateBasedRule not found", name)
+}
+
+// GetAllWAFRegionalRegexPatternSetResources retrieves all wafregional.RegexPatternSet items from an AWS CloudFormation template
+func (t *Template) GetAllWAFRegionalRegexPatternSetResources() map[string]*wafregional.RegexPatternSet {
+	results := map[string]*wafregional.RegexPatternSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *wafregional.RegexPatternSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFRegionalRegexPatternSetWithName retrieves all wafregional.RegexPatternSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFRegionalRegexPatternSetWithName(name string) (*wafregional.RegexPatternSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *wafregional.RegexPatternSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type wafregional.RegexPatternSet not found", name)
+}
+
+// GetAllWAFRegionalRuleResources retrieves all wafregional.Rule items from an AWS CloudFormation template
+func (t *Template) GetAllWAFRegionalRuleResources() map[string]*wafregional.Rule {
+	results := map[string]*wafregional.Rule{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *wafregional.Rule:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFRegionalRuleWithName retrieves all wafregional.Rule items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFRegionalRuleWithName(name string) (*wafregional.Rule, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *wafregional.Rule:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type wafregional.Rule not found", name)
+}
+
+// GetAllWAFRegionalSizeConstraintSetResources retrieves all wafregional.SizeConstraintSet items from an AWS CloudFormation template
+func (t *Template) GetAllWAFRegionalSizeConstraintSetResources() map[string]*wafregional.SizeConstraintSet {
+	results := map[string]*wafregional.SizeConstraintSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *wafregional.SizeConstraintSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFRegionalSizeConstraintSetWithName retrieves all wafregional.SizeConstraintSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFRegionalSizeConstraintSetWithName(name string) (*wafregional.SizeConstraintSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *wafregional.SizeConstraintSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type wafregional.SizeConstraintSet not found", name)
+}
+
+// GetAllWAFRegionalSqlInjectionMatchSetResources retrieves all wafregional.SqlInjectionMatchSet items from an AWS CloudFormation template
+func (t *Template) GetAllWAFRegionalSqlInjectionMatchSetResources() map[string]*wafregional.SqlInjectionMatchSet {
+	results := map[string]*wafregional.SqlInjectionMatchSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *wafregional.SqlInjectionMatchSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFRegionalSqlInjectionMatchSetWithName retrieves all wafregional.SqlInjectionMatchSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFRegionalSqlInjectionMatchSetWithName(name string) (*wafregional.SqlInjectionMatchSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *wafregional.SqlInjectionMatchSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type wafregional.SqlInjectionMatchSet not found", name)
+}
+
+// GetAllWAFRegionalWebACLResources retrieves all wafregional.WebACL items from an AWS CloudFormation template
+func (t *Template) GetAllWAFRegionalWebACLResources() map[string]*wafregional.WebACL {
+	results := map[string]*wafregional.WebACL{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *wafregional.WebACL:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFRegionalWebACLWithName retrieves all wafregional.WebACL items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFRegionalWebACLWithName(name string) (*wafregional.WebACL, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *wafregional.WebACL:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type wafregional.WebACL not found", name)
+}
+
+// GetAllWAFRegionalWebACLAssociationResources retrieves all wafregional.WebACLAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllWAFRegionalWebACLAssociationResources() map[string]*wafregional.WebACLAssociation {
+	results := map[string]*wafregional.WebACLAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *wafregional.WebACLAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFRegionalWebACLAssociationWithName retrieves all wafregional.WebACLAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFRegionalWebACLAssociationWithName(name string) (*wafregional.WebACLAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *wafregional.WebACLAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type wafregional.WebACLAssociation not found", name)
+}
+
+// GetAllWAFRegionalXssMatchSetResources retrieves all wafregional.XssMatchSet items from an AWS CloudFormation template
+func (t *Template) GetAllWAFRegionalXssMatchSetResources() map[string]*wafregional.XssMatchSet {
+	results := map[string]*wafregional.XssMatchSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *wafregional.XssMatchSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFRegionalXssMatchSetWithName retrieves all wafregional.XssMatchSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFRegionalXssMatchSetWithName(name string) (*wafregional.XssMatchSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *wafregional.XssMatchSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type wafregional.XssMatchSet not found", name)
+}
+
+// GetAllWAFv2IPSetResources retrieves all wafv2.IPSet items from an AWS CloudFormation template
+func (t *Template) GetAllWAFv2IPSetResources() map[string]*wafv2.IPSet {
+	results := map[string]*wafv2.IPSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *wafv2.IPSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFv2IPSetWithName retrieves all wafv2.IPSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFv2IPSetWithName(name string) (*wafv2.IPSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *wafv2.IPSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type wafv2.IPSet not found", name)
+}
+
+// GetAllWAFv2LoggingConfigurationResources retrieves all wafv2.LoggingConfiguration items from an AWS CloudFormation template
+func (t *Template) GetAllWAFv2LoggingConfigurationResources() map[string]*wafv2.LoggingConfiguration {
+	results := map[string]*wafv2.LoggingConfiguration{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *wafv2.LoggingConfiguration:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFv2LoggingConfigurationWithName retrieves all wafv2.LoggingConfiguration items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFv2LoggingConfigurationWithName(name string) (*wafv2.LoggingConfiguration, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *wafv2.LoggingConfiguration:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type wafv2.LoggingConfiguration not found", name)
+}
+
+// GetAllWAFv2RegexPatternSetResources retrieves all wafv2.RegexPatternSet items from an AWS CloudFormation template
+func (t *Template) GetAllWAFv2RegexPatternSetResources() map[string]*wafv2.RegexPatternSet {
+	results := map[string]*wafv2.RegexPatternSet{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *wafv2.RegexPatternSet:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFv2RegexPatternSetWithName retrieves all wafv2.RegexPatternSet items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFv2RegexPatternSetWithName(name string) (*wafv2.RegexPatternSet, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *wafv2.RegexPatternSet:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type wafv2.RegexPatternSet not found", name)
+}
+
+// GetAllWAFv2RuleGroupResources retrieves all wafv2.RuleGroup items from an AWS CloudFormation template
+func (t *Template) GetAllWAFv2RuleGroupResources() map[string]*wafv2.RuleGroup {
+	results := map[string]*wafv2.RuleGroup{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *wafv2.RuleGroup:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFv2RuleGroupWithName retrieves all wafv2.RuleGroup items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFv2RuleGroupWithName(name string) (*wafv2.RuleGroup, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *wafv2.RuleGroup:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type wafv2.RuleGroup not found", name)
+}
+
+// GetAllWAFv2WebACLResources retrieves all wafv2.WebACL items from an AWS CloudFormation template
+func (t *Template) GetAllWAFv2WebACLResources() map[string]*wafv2.WebACL {
+	results := map[string]*wafv2.WebACL{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *wafv2.WebACL:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFv2WebACLWithName retrieves all wafv2.WebACL items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFv2WebACLWithName(name string) (*wafv2.WebACL, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *wafv2.WebACL:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type wafv2.WebACL not found", name)
+}
+
+// GetAllWAFv2WebACLAssociationResources retrieves all wafv2.WebACLAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllWAFv2WebACLAssociationResources() map[string]*wafv2.WebACLAssociation {
+	results := map[string]*wafv2.WebACLAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *wafv2.WebACLAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWAFv2WebACLAssociationWithName retrieves all wafv2.WebACLAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWAFv2WebACLAssociationWithName(name string) (*wafv2.WebACLAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *wafv2.WebACLAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type wafv2.WebACLAssociation not found", name)
+}
+
+// GetAllWisdomAssistantResources retrieves all wisdom.Assistant items from an AWS CloudFormation template
+func (t *Template) GetAllWisdomAssistantResources() map[string]*wisdom.Assistant {
+	results := map[string]*wisdom.Assistant{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *wisdom.Assistant:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWisdomAssistantWithName retrieves all wisdom.Assistant items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWisdomAssistantWithName(name string) (*wisdom.Assistant, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *wisdom.Assistant:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type wisdom.Assistant not found", name)
+}
+
+// GetAllWisdomAssistantAssociationResources retrieves all wisdom.AssistantAssociation items from an AWS CloudFormation template
+func (t *Template) GetAllWisdomAssistantAssociationResources() map[string]*wisdom.AssistantAssociation {
+	results := map[string]*wisdom.AssistantAssociation{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *wisdom.AssistantAssociation:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWisdomAssistantAssociationWithName retrieves all wisdom.AssistantAssociation items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWisdomAssistantAssociationWithName(name string) (*wisdom.AssistantAssociation, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *wisdom.AssistantAssociation:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type wisdom.AssistantAssociation not found", name)
+}
+
+// GetAllWisdomKnowledgeBaseResources retrieves all wisdom.KnowledgeBase items from an AWS CloudFormation template
+func (t *Template) GetAllWisdomKnowledgeBaseResources() map[string]*wisdom.KnowledgeBase {
+	results := map[string]*wisdom.KnowledgeBase{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *wisdom.KnowledgeBase:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWisdomKnowledgeBaseWithName retrieves all wisdom.KnowledgeBase items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWisdomKnowledgeBaseWithName(name string) (*wisdom.KnowledgeBase, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *wisdom.KnowledgeBase:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type wisdom.KnowledgeBase not found", name)
+}
+
+// GetAllWorkSpacesConnectionAliasResources retrieves all workspaces.ConnectionAlias items from an AWS CloudFormation template
+func (t *Template) GetAllWorkSpacesConnectionAliasResources() map[string]*workspaces.ConnectionAlias {
+	results := map[string]*workspaces.ConnectionAlias{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *workspaces.ConnectionAlias:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWorkSpacesConnectionAliasWithName retrieves all workspaces.ConnectionAlias items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWorkSpacesConnectionAliasWithName(name string) (*workspaces.ConnectionAlias, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *workspaces.ConnectionAlias:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type workspaces.ConnectionAlias not found", name)
+}
+
+// GetAllWorkSpacesWorkspaceResources retrieves all workspaces.Workspace items from an AWS CloudFormation template
+func (t *Template) GetAllWorkSpacesWorkspaceResources() map[string]*workspaces.Workspace {
+	results := map[string]*workspaces.Workspace{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *workspaces.Workspace:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetWorkSpacesWorkspaceWithName retrieves all workspaces.Workspace items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetWorkSpacesWorkspaceWithName(name string) (*workspaces.Workspace, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *workspaces.Workspace:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type workspaces.Workspace not found", name)
+}
+
+// GetAllXRayGroupResources retrieves all xray.Group items from an AWS CloudFormation template
+func (t *Template) GetAllXRayGroupResources() map[string]*xray.Group {
+	results := map[string]*xray.Group{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *xray.Group:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetXRayGroupWithName retrieves all xray.Group items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetXRayGroupWithName(name string) (*xray.Group, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *xray.Group:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type xray.Group not found", name)
+}
+
+// GetAllXRaySamplingRuleResources retrieves all xray.SamplingRule items from an AWS CloudFormation template
+func (t *Template) GetAllXRaySamplingRuleResources() map[string]*xray.SamplingRule {
+	results := map[string]*xray.SamplingRule{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *xray.SamplingRule:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetXRaySamplingRuleWithName retrieves all xray.SamplingRule items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetXRaySamplingRuleWithName(name string) (*xray.SamplingRule, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *xray.SamplingRule:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type xray.SamplingRule not found", name)
+}
+
+// GetAllASKSkillResources retrieves all ask.Skill items from an AWS CloudFormation template
+func (t *Template) GetAllASKSkillResources() map[string]*ask.Skill {
+	results := map[string]*ask.Skill{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *ask.Skill:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetASKSkillWithName retrieves all ask.Skill items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetASKSkillWithName(name string) (*ask.Skill, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *ask.Skill:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type ask.Skill not found", name)
+}
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-broker.go b/goformation/cloudformation/amazonmq/aws-amazonmq-broker.go
new file mode 100644
index 0000000000..a21337b707
--- /dev/null
+++ b/goformation/cloudformation/amazonmq/aws-amazonmq-broker.go
@@ -0,0 +1,193 @@
+package amazonmq
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Broker AWS CloudFormation Resource (AWS::AmazonMQ::Broker)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html
+type Broker struct {
+
+	// AuthenticationStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-authenticationstrategy
+	AuthenticationStrategy *types.Value `json:"AuthenticationStrategy,omitempty"`
+
+	// AutoMinorVersionUpgrade AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-autominorversionupgrade
+	AutoMinorVersionUpgrade *types.Value `json:"AutoMinorVersionUpgrade"`
+
+	// BrokerName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-brokername
+	BrokerName *types.Value `json:"BrokerName,omitempty"`
+
+	// Configuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-configuration
+	Configuration *Broker_ConfigurationId `json:"Configuration,omitempty"`
+
+	// DeploymentMode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-deploymentmode
+	DeploymentMode *types.Value `json:"DeploymentMode,omitempty"`
+
+	// EncryptionOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-encryptionoptions
+	EncryptionOptions *Broker_EncryptionOptions `json:"EncryptionOptions,omitempty"`
+
+	// EngineType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-enginetype
+	EngineType *types.Value `json:"EngineType,omitempty"`
+
+	// EngineVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-engineversion
+	EngineVersion *types.Value `json:"EngineVersion,omitempty"`
+
+	// HostInstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-hostinstancetype
+	HostInstanceType *types.Value `json:"HostInstanceType,omitempty"`
+
+	// LdapServerMetadata AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-ldapservermetadata
+	LdapServerMetadata *Broker_LdapServerMetadata `json:"LdapServerMetadata,omitempty"`
+
+	// Logs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-logs
+	Logs *Broker_LogList `json:"Logs,omitempty"`
+
+	// MaintenanceWindowStartTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-maintenancewindowstarttime
+	MaintenanceWindowStartTime *Broker_MaintenanceWindow `json:"MaintenanceWindowStartTime,omitempty"`
+
+	// PubliclyAccessible AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-publiclyaccessible
+	PubliclyAccessible *types.Value `json:"PubliclyAccessible"`
+
+	// SecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-securitygroups
+	SecurityGroups *types.Value `json:"SecurityGroups,omitempty"`
+
+	// StorageType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-storagetype
+	StorageType *types.Value `json:"StorageType,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-tags
+	Tags []Broker_TagsEntry `json:"Tags,omitempty"`
+
+	// Users AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-broker.html#cfn-amazonmq-broker-users
+	Users []Broker_User `json:"Users,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Broker) AWSCloudFormationType() string {
+	return "AWS::AmazonMQ::Broker"
+}
+
+// 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 Broker) MarshalJSON() ([]byte, error) {
+	type Properties Broker
+	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 *Broker) UnmarshalJSON(b []byte) error {
+	type Properties Broker
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Broker(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/amazonmq/aws-amazonmq-broker_configurationid.go b/goformation/cloudformation/amazonmq/aws-amazonmq-broker_configurationid.go
new file mode 100644
index 0000000000..40127b1cd9
--- /dev/null
+++ b/goformation/cloudformation/amazonmq/aws-amazonmq-broker_configurationid.go
@@ -0,0 +1,42 @@
+package amazonmq
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Broker_ConfigurationId AWS CloudFormation Resource (AWS::AmazonMQ::Broker.ConfigurationId)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-configurationid.html
+type Broker_ConfigurationId struct {
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-configurationid.html#cfn-amazonmq-broker-configurationid-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Revision AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-configurationid.html#cfn-amazonmq-broker-configurationid-revision
+	Revision *types.Value `json:"Revision"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Broker_ConfigurationId) AWSCloudFormationType() string {
+	return "AWS::AmazonMQ::Broker.ConfigurationId"
+}
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-broker_encryptionoptions.go b/goformation/cloudformation/amazonmq/aws-amazonmq-broker_encryptionoptions.go
new file mode 100644
index 0000000000..e519f5ee0d
--- /dev/null
+++ b/goformation/cloudformation/amazonmq/aws-amazonmq-broker_encryptionoptions.go
@@ -0,0 +1,42 @@
+package amazonmq
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Broker_EncryptionOptions AWS CloudFormation Resource (AWS::AmazonMQ::Broker.EncryptionOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-encryptionoptions.html
+type Broker_EncryptionOptions struct {
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-encryptionoptions.html#cfn-amazonmq-broker-encryptionoptions-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// UseAwsOwnedKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-encryptionoptions.html#cfn-amazonmq-broker-encryptionoptions-useawsownedkey
+	UseAwsOwnedKey *types.Value `json:"UseAwsOwnedKey"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Broker_EncryptionOptions) AWSCloudFormationType() string {
+	return "AWS::AmazonMQ::Broker.EncryptionOptions"
+}
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-broker_ldapservermetadata.go b/goformation/cloudformation/amazonmq/aws-amazonmq-broker_ldapservermetadata.go
new file mode 100644
index 0000000000..14aa7a01ad
--- /dev/null
+++ b/goformation/cloudformation/amazonmq/aws-amazonmq-broker_ldapservermetadata.go
@@ -0,0 +1,87 @@
+package amazonmq
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Broker_LdapServerMetadata AWS CloudFormation Resource (AWS::AmazonMQ::Broker.LdapServerMetadata)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-ldapservermetadata.html
+type Broker_LdapServerMetadata struct {
+
+	// Hosts AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-ldapservermetadata.html#cfn-amazonmq-broker-ldapservermetadata-hosts
+	Hosts *types.Value `json:"Hosts,omitempty"`
+
+	// RoleBase AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-ldapservermetadata.html#cfn-amazonmq-broker-ldapservermetadata-rolebase
+	RoleBase *types.Value `json:"RoleBase,omitempty"`
+
+	// RoleName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-ldapservermetadata.html#cfn-amazonmq-broker-ldapservermetadata-rolename
+	RoleName *types.Value `json:"RoleName,omitempty"`
+
+	// RoleSearchMatching AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-ldapservermetadata.html#cfn-amazonmq-broker-ldapservermetadata-rolesearchmatching
+	RoleSearchMatching *types.Value `json:"RoleSearchMatching,omitempty"`
+
+	// RoleSearchSubtree AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-ldapservermetadata.html#cfn-amazonmq-broker-ldapservermetadata-rolesearchsubtree
+	RoleSearchSubtree *types.Value `json:"RoleSearchSubtree,omitempty"`
+
+	// ServiceAccountPassword AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-ldapservermetadata.html#cfn-amazonmq-broker-ldapservermetadata-serviceaccountpassword
+	ServiceAccountPassword *types.Value `json:"ServiceAccountPassword,omitempty"`
+
+	// ServiceAccountUsername AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-ldapservermetadata.html#cfn-amazonmq-broker-ldapservermetadata-serviceaccountusername
+	ServiceAccountUsername *types.Value `json:"ServiceAccountUsername,omitempty"`
+
+	// UserBase AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-ldapservermetadata.html#cfn-amazonmq-broker-ldapservermetadata-userbase
+	UserBase *types.Value `json:"UserBase,omitempty"`
+
+	// UserRoleName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-ldapservermetadata.html#cfn-amazonmq-broker-ldapservermetadata-userrolename
+	UserRoleName *types.Value `json:"UserRoleName,omitempty"`
+
+	// UserSearchMatching AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-ldapservermetadata.html#cfn-amazonmq-broker-ldapservermetadata-usersearchmatching
+	UserSearchMatching *types.Value `json:"UserSearchMatching,omitempty"`
+
+	// UserSearchSubtree AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-ldapservermetadata.html#cfn-amazonmq-broker-ldapservermetadata-usersearchsubtree
+	UserSearchSubtree *types.Value `json:"UserSearchSubtree,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Broker_LdapServerMetadata) AWSCloudFormationType() string {
+	return "AWS::AmazonMQ::Broker.LdapServerMetadata"
+}
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-broker_loglist.go b/goformation/cloudformation/amazonmq/aws-amazonmq-broker_loglist.go
new file mode 100644
index 0000000000..4ee46ba8fe
--- /dev/null
+++ b/goformation/cloudformation/amazonmq/aws-amazonmq-broker_loglist.go
@@ -0,0 +1,42 @@
+package amazonmq
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Broker_LogList AWS CloudFormation Resource (AWS::AmazonMQ::Broker.LogList)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-loglist.html
+type Broker_LogList struct {
+
+	// Audit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-loglist.html#cfn-amazonmq-broker-loglist-audit
+	Audit *types.Value `json:"Audit,omitempty"`
+
+	// General AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-loglist.html#cfn-amazonmq-broker-loglist-general
+	General *types.Value `json:"General,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Broker_LogList) AWSCloudFormationType() string {
+	return "AWS::AmazonMQ::Broker.LogList"
+}
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-broker_maintenancewindow.go b/goformation/cloudformation/amazonmq/aws-amazonmq-broker_maintenancewindow.go
new file mode 100644
index 0000000000..cd23644817
--- /dev/null
+++ b/goformation/cloudformation/amazonmq/aws-amazonmq-broker_maintenancewindow.go
@@ -0,0 +1,47 @@
+package amazonmq
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Broker_MaintenanceWindow AWS CloudFormation Resource (AWS::AmazonMQ::Broker.MaintenanceWindow)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-maintenancewindow.html
+type Broker_MaintenanceWindow struct {
+
+	// DayOfWeek AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-maintenancewindow.html#cfn-amazonmq-broker-maintenancewindow-dayofweek
+	DayOfWeek *types.Value `json:"DayOfWeek,omitempty"`
+
+	// TimeOfDay AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-maintenancewindow.html#cfn-amazonmq-broker-maintenancewindow-timeofday
+	TimeOfDay *types.Value `json:"TimeOfDay,omitempty"`
+
+	// TimeZone AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-maintenancewindow.html#cfn-amazonmq-broker-maintenancewindow-timezone
+	TimeZone *types.Value `json:"TimeZone,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Broker_MaintenanceWindow) AWSCloudFormationType() string {
+	return "AWS::AmazonMQ::Broker.MaintenanceWindow"
+}
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-broker_tagsentry.go b/goformation/cloudformation/amazonmq/aws-amazonmq-broker_tagsentry.go
new file mode 100644
index 0000000000..2e3030e4a3
--- /dev/null
+++ b/goformation/cloudformation/amazonmq/aws-amazonmq-broker_tagsentry.go
@@ -0,0 +1,42 @@
+package amazonmq
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Broker_TagsEntry AWS CloudFormation Resource (AWS::AmazonMQ::Broker.TagsEntry)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-tagsentry.html
+type Broker_TagsEntry struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-tagsentry.html#cfn-amazonmq-broker-tagsentry-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-tagsentry.html#cfn-amazonmq-broker-tagsentry-value
+	Value *types.Value `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 *Broker_TagsEntry) AWSCloudFormationType() string {
+	return "AWS::AmazonMQ::Broker.TagsEntry"
+}
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-broker_user.go b/goformation/cloudformation/amazonmq/aws-amazonmq-broker_user.go
new file mode 100644
index 0000000000..9298e8a5ff
--- /dev/null
+++ b/goformation/cloudformation/amazonmq/aws-amazonmq-broker_user.go
@@ -0,0 +1,52 @@
+package amazonmq
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Broker_User AWS CloudFormation Resource (AWS::AmazonMQ::Broker.User)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-user.html
+type Broker_User struct {
+
+	// ConsoleAccess AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-user.html#cfn-amazonmq-broker-user-consoleaccess
+	ConsoleAccess *types.Value `json:"ConsoleAccess,omitempty"`
+
+	// Groups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-user.html#cfn-amazonmq-broker-user-groups
+	Groups *types.Value `json:"Groups,omitempty"`
+
+	// Password AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-user.html#cfn-amazonmq-broker-user-password
+	Password *types.Value `json:"Password,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-broker-user.html#cfn-amazonmq-broker-user-username
+	Username *types.Value `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 *Broker_User) AWSCloudFormationType() string {
+	return "AWS::AmazonMQ::Broker.User"
+}
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-configuration.go b/goformation/cloudformation/amazonmq/aws-amazonmq-configuration.go
new file mode 100644
index 0000000000..08b922bf03
--- /dev/null
+++ b/goformation/cloudformation/amazonmq/aws-amazonmq-configuration.go
@@ -0,0 +1,138 @@
+package amazonmq
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Configuration AWS CloudFormation Resource (AWS::AmazonMQ::Configuration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-configuration.html
+type Configuration struct {
+
+	// AuthenticationStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-configuration.html#cfn-amazonmq-configuration-authenticationstrategy
+	AuthenticationStrategy *types.Value `json:"AuthenticationStrategy,omitempty"`
+
+	// Data AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-configuration.html#cfn-amazonmq-configuration-data
+	Data *types.Value `json:"Data,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-configuration.html#cfn-amazonmq-configuration-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EngineType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-configuration.html#cfn-amazonmq-configuration-enginetype
+	EngineType *types.Value `json:"EngineType,omitempty"`
+
+	// EngineVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-configuration.html#cfn-amazonmq-configuration-engineversion
+	EngineVersion *types.Value `json:"EngineVersion,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-configuration.html#cfn-amazonmq-configuration-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-configuration.html#cfn-amazonmq-configuration-tags
+	Tags []Configuration_TagsEntry `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 *Configuration) AWSCloudFormationType() string {
+	return "AWS::AmazonMQ::Configuration"
+}
+
+// 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 Configuration) MarshalJSON() ([]byte, error) {
+	type Properties Configuration
+	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 *Configuration) UnmarshalJSON(b []byte) error {
+	type Properties Configuration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Configuration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/amazonmq/aws-amazonmq-configuration_tagsentry.go b/goformation/cloudformation/amazonmq/aws-amazonmq-configuration_tagsentry.go
new file mode 100644
index 0000000000..cdf1c7fa72
--- /dev/null
+++ b/goformation/cloudformation/amazonmq/aws-amazonmq-configuration_tagsentry.go
@@ -0,0 +1,42 @@
+package amazonmq
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Configuration_TagsEntry AWS CloudFormation Resource (AWS::AmazonMQ::Configuration.TagsEntry)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-configuration-tagsentry.html
+type Configuration_TagsEntry struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-configuration-tagsentry.html#cfn-amazonmq-configuration-tagsentry-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-configuration-tagsentry.html#cfn-amazonmq-configuration-tagsentry-value
+	Value *types.Value `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 *Configuration_TagsEntry) AWSCloudFormationType() string {
+	return "AWS::AmazonMQ::Configuration.TagsEntry"
+}
diff --git a/goformation/cloudformation/amazonmq/aws-amazonmq-configurationassociation.go b/goformation/cloudformation/amazonmq/aws-amazonmq-configurationassociation.go
new file mode 100644
index 0000000000..ec1bf95786
--- /dev/null
+++ b/goformation/cloudformation/amazonmq/aws-amazonmq-configurationassociation.go
@@ -0,0 +1,113 @@
+package amazonmq
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationAssociation AWS CloudFormation Resource (AWS::AmazonMQ::ConfigurationAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-configurationassociation.html
+type ConfigurationAssociation struct {
+
+	// Broker AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-configurationassociation.html#cfn-amazonmq-configurationassociation-broker
+	Broker *types.Value `json:"Broker,omitempty"`
+
+	// Configuration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amazonmq-configurationassociation.html#cfn-amazonmq-configurationassociation-configuration
+	Configuration *ConfigurationAssociation_ConfigurationId `json:"Configuration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConfigurationAssociation) AWSCloudFormationType() string {
+	return "AWS::AmazonMQ::ConfigurationAssociation"
+}
+
+// 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 ConfigurationAssociation) MarshalJSON() ([]byte, error) {
+	type Properties ConfigurationAssociation
+	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 *ConfigurationAssociation) UnmarshalJSON(b []byte) error {
+	type Properties ConfigurationAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ConfigurationAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/amazonmq/aws-amazonmq-configurationassociation_configurationid.go b/goformation/cloudformation/amazonmq/aws-amazonmq-configurationassociation_configurationid.go
new file mode 100644
index 0000000000..f18ad5cc68
--- /dev/null
+++ b/goformation/cloudformation/amazonmq/aws-amazonmq-configurationassociation_configurationid.go
@@ -0,0 +1,42 @@
+package amazonmq
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationAssociation_ConfigurationId AWS CloudFormation Resource (AWS::AmazonMQ::ConfigurationAssociation.ConfigurationId)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-configurationassociation-configurationid.html
+type ConfigurationAssociation_ConfigurationId struct {
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-configurationassociation-configurationid.html#cfn-amazonmq-configurationassociation-configurationid-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Revision AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amazonmq-configurationassociation-configurationid.html#cfn-amazonmq-configurationassociation-configurationid-revision
+	Revision *types.Value `json:"Revision"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConfigurationAssociation_ConfigurationId) AWSCloudFormationType() string {
+	return "AWS::AmazonMQ::ConfigurationAssociation.ConfigurationId"
+}
diff --git a/goformation/cloudformation/amplify/aws-amplify-app.go b/goformation/cloudformation/amplify/aws-amplify-app.go
new file mode 100644
index 0000000000..93995b149c
--- /dev/null
+++ b/goformation/cloudformation/amplify/aws-amplify-app.go
@@ -0,0 +1,174 @@
+package amplify
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// App AWS CloudFormation Resource (AWS::Amplify::App)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html
+type App struct {
+
+	// AccessToken AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html#cfn-amplify-app-accesstoken
+	AccessToken *types.Value `json:"AccessToken,omitempty"`
+
+	// AutoBranchCreationConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html#cfn-amplify-app-autobranchcreationconfig
+	AutoBranchCreationConfig *App_AutoBranchCreationConfig `json:"AutoBranchCreationConfig,omitempty"`
+
+	// BasicAuthConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html#cfn-amplify-app-basicauthconfig
+	BasicAuthConfig *App_BasicAuthConfig `json:"BasicAuthConfig,omitempty"`
+
+	// BuildSpec AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html#cfn-amplify-app-buildspec
+	BuildSpec *types.Value `json:"BuildSpec,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
+	CustomHeaders *types.Value `json:"CustomHeaders,omitempty"`
+
+	// CustomRules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html#cfn-amplify-app-customrules
+	CustomRules []App_CustomRule `json:"CustomRules,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html#cfn-amplify-app-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EnableBranchAutoDeletion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html#cfn-amplify-app-enablebranchautodeletion
+	EnableBranchAutoDeletion *types.Value `json:"EnableBranchAutoDeletion,omitempty"`
+
+	// EnvironmentVariables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html#cfn-amplify-app-environmentvariables
+	EnvironmentVariables []App_EnvironmentVariable `json:"EnvironmentVariables,omitempty"`
+
+	// IAMServiceRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html#cfn-amplify-app-iamservicerole
+	IAMServiceRole *types.Value `json:"IAMServiceRole,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html#cfn-amplify-app-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// OauthToken AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html#cfn-amplify-app-oauthtoken
+	OauthToken *types.Value `json:"OauthToken,omitempty"`
+
+	// Repository AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html#cfn-amplify-app-repository
+	Repository *types.Value `json:"Repository,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-app.html#cfn-amplify-app-tags
+	Tags []cloudformation.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 *App) AWSCloudFormationType() string {
+	return "AWS::Amplify::App"
+}
+
+// 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 App) MarshalJSON() ([]byte, error) {
+	type Properties App
+	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 *App) UnmarshalJSON(b []byte) error {
+	type Properties App
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = App(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/amplify/aws-amplify-app_autobranchcreationconfig.go b/goformation/cloudformation/amplify/aws-amplify-app_autobranchcreationconfig.go
new file mode 100644
index 0000000000..92703e3838
--- /dev/null
+++ b/goformation/cloudformation/amplify/aws-amplify-app_autobranchcreationconfig.go
@@ -0,0 +1,82 @@
+package amplify
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// App_AutoBranchCreationConfig AWS CloudFormation Resource (AWS::Amplify::App.AutoBranchCreationConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-autobranchcreationconfig.html
+type App_AutoBranchCreationConfig struct {
+
+	// AutoBranchCreationPatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-autobranchcreationconfig.html#cfn-amplify-app-autobranchcreationconfig-autobranchcreationpatterns
+	AutoBranchCreationPatterns *types.Value `json:"AutoBranchCreationPatterns,omitempty"`
+
+	// BasicAuthConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-autobranchcreationconfig.html#cfn-amplify-app-autobranchcreationconfig-basicauthconfig
+	BasicAuthConfig *App_BasicAuthConfig `json:"BasicAuthConfig,omitempty"`
+
+	// BuildSpec AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-autobranchcreationconfig.html#cfn-amplify-app-autobranchcreationconfig-buildspec
+	BuildSpec *types.Value `json:"BuildSpec,omitempty"`
+
+	// EnableAutoBranchCreation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-autobranchcreationconfig.html#cfn-amplify-app-autobranchcreationconfig-enableautobranchcreation
+	EnableAutoBranchCreation *types.Value `json:"EnableAutoBranchCreation,omitempty"`
+
+	// EnableAutoBuild AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-autobranchcreationconfig.html#cfn-amplify-app-autobranchcreationconfig-enableautobuild
+	EnableAutoBuild *types.Value `json:"EnableAutoBuild,omitempty"`
+
+	// EnablePerformanceMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-autobranchcreationconfig.html#cfn-amplify-app-autobranchcreationconfig-enableperformancemode
+	EnablePerformanceMode *types.Value `json:"EnablePerformanceMode,omitempty"`
+
+	// EnablePullRequestPreview AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-autobranchcreationconfig.html#cfn-amplify-app-autobranchcreationconfig-enablepullrequestpreview
+	EnablePullRequestPreview *types.Value `json:"EnablePullRequestPreview,omitempty"`
+
+	// EnvironmentVariables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-autobranchcreationconfig.html#cfn-amplify-app-autobranchcreationconfig-environmentvariables
+	EnvironmentVariables []App_EnvironmentVariable `json:"EnvironmentVariables,omitempty"`
+
+	// PullRequestEnvironmentName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-autobranchcreationconfig.html#cfn-amplify-app-autobranchcreationconfig-pullrequestenvironmentname
+	PullRequestEnvironmentName *types.Value `json:"PullRequestEnvironmentName,omitempty"`
+
+	// Stage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-autobranchcreationconfig.html#cfn-amplify-app-autobranchcreationconfig-stage
+	Stage *types.Value `json:"Stage,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AutoBranchCreationConfig) AWSCloudFormationType() string {
+	return "AWS::Amplify::App.AutoBranchCreationConfig"
+}
diff --git a/goformation/cloudformation/amplify/aws-amplify-app_basicauthconfig.go b/goformation/cloudformation/amplify/aws-amplify-app_basicauthconfig.go
new file mode 100644
index 0000000000..086108015a
--- /dev/null
+++ b/goformation/cloudformation/amplify/aws-amplify-app_basicauthconfig.go
@@ -0,0 +1,47 @@
+package amplify
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// App_BasicAuthConfig AWS CloudFormation Resource (AWS::Amplify::App.BasicAuthConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-basicauthconfig.html
+type App_BasicAuthConfig struct {
+
+	// EnableBasicAuth AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-basicauthconfig.html#cfn-amplify-app-basicauthconfig-enablebasicauth
+	EnableBasicAuth *types.Value `json:"EnableBasicAuth,omitempty"`
+
+	// Password AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-basicauthconfig.html#cfn-amplify-app-basicauthconfig-password
+	Password *types.Value `json:"Password,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-basicauthconfig.html#cfn-amplify-app-basicauthconfig-username
+	Username *types.Value `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 *App_BasicAuthConfig) AWSCloudFormationType() string {
+	return "AWS::Amplify::App.BasicAuthConfig"
+}
diff --git a/goformation/cloudformation/amplify/aws-amplify-app_customrule.go b/goformation/cloudformation/amplify/aws-amplify-app_customrule.go
new file mode 100644
index 0000000000..7fdd36a684
--- /dev/null
+++ b/goformation/cloudformation/amplify/aws-amplify-app_customrule.go
@@ -0,0 +1,52 @@
+package amplify
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// App_CustomRule AWS CloudFormation Resource (AWS::Amplify::App.CustomRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-customrule.html
+type App_CustomRule struct {
+
+	// Condition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-customrule.html#cfn-amplify-app-customrule-condition
+	Condition *types.Value `json:"Condition,omitempty"`
+
+	// Source AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-customrule.html#cfn-amplify-app-customrule-source
+	Source *types.Value `json:"Source,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-customrule.html#cfn-amplify-app-customrule-status
+	Status *types.Value `json:"Status,omitempty"`
+
+	// Target AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-customrule.html#cfn-amplify-app-customrule-target
+	Target *types.Value `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 *App_CustomRule) AWSCloudFormationType() string {
+	return "AWS::Amplify::App.CustomRule"
+}
diff --git a/goformation/cloudformation/amplify/aws-amplify-app_environmentvariable.go b/goformation/cloudformation/amplify/aws-amplify-app_environmentvariable.go
new file mode 100644
index 0000000000..792c6aabc1
--- /dev/null
+++ b/goformation/cloudformation/amplify/aws-amplify-app_environmentvariable.go
@@ -0,0 +1,42 @@
+package amplify
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// App_EnvironmentVariable AWS CloudFormation Resource (AWS::Amplify::App.EnvironmentVariable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-environmentvariable.html
+type App_EnvironmentVariable struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-environmentvariable.html#cfn-amplify-app-environmentvariable-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-app-environmentvariable.html#cfn-amplify-app-environmentvariable-value
+	Value *types.Value `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 *App_EnvironmentVariable) AWSCloudFormationType() string {
+	return "AWS::Amplify::App.EnvironmentVariable"
+}
diff --git a/goformation/cloudformation/amplify/aws-amplify-branch.go b/goformation/cloudformation/amplify/aws-amplify-branch.go
new file mode 100644
index 0000000000..0800fac93c
--- /dev/null
+++ b/goformation/cloudformation/amplify/aws-amplify-branch.go
@@ -0,0 +1,164 @@
+package amplify
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Branch AWS CloudFormation Resource (AWS::Amplify::Branch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-branch.html
+type Branch struct {
+
+	// AppId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-branch.html#cfn-amplify-branch-appid
+	AppId *types.Value `json:"AppId,omitempty"`
+
+	// BasicAuthConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-branch.html#cfn-amplify-branch-basicauthconfig
+	BasicAuthConfig *Branch_BasicAuthConfig `json:"BasicAuthConfig,omitempty"`
+
+	// BranchName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-branch.html#cfn-amplify-branch-branchname
+	BranchName *types.Value `json:"BranchName,omitempty"`
+
+	// BuildSpec AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-branch.html#cfn-amplify-branch-buildspec
+	BuildSpec *types.Value `json:"BuildSpec,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-branch.html#cfn-amplify-branch-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EnableAutoBuild AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-branch.html#cfn-amplify-branch-enableautobuild
+	EnableAutoBuild *types.Value `json:"EnableAutoBuild,omitempty"`
+
+	// EnablePerformanceMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-branch.html#cfn-amplify-branch-enableperformancemode
+	EnablePerformanceMode *types.Value `json:"EnablePerformanceMode,omitempty"`
+
+	// EnablePullRequestPreview AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-branch.html#cfn-amplify-branch-enablepullrequestpreview
+	EnablePullRequestPreview *types.Value `json:"EnablePullRequestPreview,omitempty"`
+
+	// EnvironmentVariables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-branch.html#cfn-amplify-branch-environmentvariables
+	EnvironmentVariables []Branch_EnvironmentVariable `json:"EnvironmentVariables,omitempty"`
+
+	// PullRequestEnvironmentName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-branch.html#cfn-amplify-branch-pullrequestenvironmentname
+	PullRequestEnvironmentName *types.Value `json:"PullRequestEnvironmentName,omitempty"`
+
+	// Stage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-branch.html#cfn-amplify-branch-stage
+	Stage *types.Value `json:"Stage,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-branch.html#cfn-amplify-branch-tags
+	Tags []cloudformation.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 *Branch) AWSCloudFormationType() string {
+	return "AWS::Amplify::Branch"
+}
+
+// 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 Branch) MarshalJSON() ([]byte, error) {
+	type Properties Branch
+	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 *Branch) UnmarshalJSON(b []byte) error {
+	type Properties Branch
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Branch(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/amplify/aws-amplify-branch_basicauthconfig.go b/goformation/cloudformation/amplify/aws-amplify-branch_basicauthconfig.go
new file mode 100644
index 0000000000..0040e24c54
--- /dev/null
+++ b/goformation/cloudformation/amplify/aws-amplify-branch_basicauthconfig.go
@@ -0,0 +1,47 @@
+package amplify
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Branch_BasicAuthConfig AWS CloudFormation Resource (AWS::Amplify::Branch.BasicAuthConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-branch-basicauthconfig.html
+type Branch_BasicAuthConfig struct {
+
+	// EnableBasicAuth AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-branch-basicauthconfig.html#cfn-amplify-branch-basicauthconfig-enablebasicauth
+	EnableBasicAuth *types.Value `json:"EnableBasicAuth,omitempty"`
+
+	// Password AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-branch-basicauthconfig.html#cfn-amplify-branch-basicauthconfig-password
+	Password *types.Value `json:"Password,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-branch-basicauthconfig.html#cfn-amplify-branch-basicauthconfig-username
+	Username *types.Value `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 *Branch_BasicAuthConfig) AWSCloudFormationType() string {
+	return "AWS::Amplify::Branch.BasicAuthConfig"
+}
diff --git a/goformation/cloudformation/amplify/aws-amplify-branch_environmentvariable.go b/goformation/cloudformation/amplify/aws-amplify-branch_environmentvariable.go
new file mode 100644
index 0000000000..d4ce20c8b6
--- /dev/null
+++ b/goformation/cloudformation/amplify/aws-amplify-branch_environmentvariable.go
@@ -0,0 +1,42 @@
+package amplify
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Branch_EnvironmentVariable AWS CloudFormation Resource (AWS::Amplify::Branch.EnvironmentVariable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-branch-environmentvariable.html
+type Branch_EnvironmentVariable struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-branch-environmentvariable.html#cfn-amplify-branch-environmentvariable-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-branch-environmentvariable.html#cfn-amplify-branch-environmentvariable-value
+	Value *types.Value `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 *Branch_EnvironmentVariable) AWSCloudFormationType() string {
+	return "AWS::Amplify::Branch.EnvironmentVariable"
+}
diff --git a/goformation/cloudformation/amplify/aws-amplify-domain.go b/goformation/cloudformation/amplify/aws-amplify-domain.go
new file mode 100644
index 0000000000..53623e74a0
--- /dev/null
+++ b/goformation/cloudformation/amplify/aws-amplify-domain.go
@@ -0,0 +1,133 @@
+package amplify
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain AWS CloudFormation Resource (AWS::Amplify::Domain)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-domain.html
+type Domain struct {
+
+	// AppId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-domain.html#cfn-amplify-domain-appid
+	AppId *types.Value `json:"AppId,omitempty"`
+
+	// AutoSubDomainCreationPatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-domain.html#cfn-amplify-domain-autosubdomaincreationpatterns
+	AutoSubDomainCreationPatterns *types.Value `json:"AutoSubDomainCreationPatterns,omitempty"`
+
+	// AutoSubDomainIAMRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-domain.html#cfn-amplify-domain-autosubdomainiamrole
+	AutoSubDomainIAMRole *types.Value `json:"AutoSubDomainIAMRole,omitempty"`
+
+	// DomainName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-domain.html#cfn-amplify-domain-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// EnableAutoSubDomain AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-domain.html#cfn-amplify-domain-enableautosubdomain
+	EnableAutoSubDomain *types.Value `json:"EnableAutoSubDomain,omitempty"`
+
+	// SubDomainSettings AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplify-domain.html#cfn-amplify-domain-subdomainsettings
+	SubDomainSettings []Domain_SubDomainSetting `json:"SubDomainSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::Amplify::Domain"
+}
+
+// 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 Domain) MarshalJSON() ([]byte, error) {
+	type Properties Domain
+	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 *Domain) UnmarshalJSON(b []byte) error {
+	type Properties Domain
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Domain(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/amplify/aws-amplify-domain_subdomainsetting.go b/goformation/cloudformation/amplify/aws-amplify-domain_subdomainsetting.go
new file mode 100644
index 0000000000..272291e093
--- /dev/null
+++ b/goformation/cloudformation/amplify/aws-amplify-domain_subdomainsetting.go
@@ -0,0 +1,42 @@
+package amplify
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_SubDomainSetting AWS CloudFormation Resource (AWS::Amplify::Domain.SubDomainSetting)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-domain-subdomainsetting.html
+type Domain_SubDomainSetting struct {
+
+	// BranchName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-domain-subdomainsetting.html#cfn-amplify-domain-subdomainsetting-branchname
+	BranchName *types.Value `json:"BranchName,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplify-domain-subdomainsetting.html#cfn-amplify-domain-subdomainsetting-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SubDomainSetting) AWSCloudFormationType() string {
+	return "AWS::Amplify::Domain.SubDomainSetting"
+}
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component.go b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component.go
new file mode 100644
index 0000000000..7722d23b28
--- /dev/null
+++ b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component.go
@@ -0,0 +1,153 @@
+package amplifyuibuilder
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Component AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplifyuibuilder-component.html
+type Component struct {
+
+	// BindingProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplifyuibuilder-component.html#cfn-amplifyuibuilder-component-bindingproperties
+	BindingProperties map[string]Component_ComponentBindingPropertiesValue `json:"BindingProperties,omitempty"`
+
+	// Children AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplifyuibuilder-component.html#cfn-amplifyuibuilder-component-children
+	Children []Component_ComponentChild `json:"Children,omitempty"`
+
+	// CollectionProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplifyuibuilder-component.html#cfn-amplifyuibuilder-component-collectionproperties
+	CollectionProperties map[string]Component_ComponentDataConfiguration `json:"CollectionProperties,omitempty"`
+
+	// ComponentType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplifyuibuilder-component.html#cfn-amplifyuibuilder-component-componenttype
+	ComponentType *types.Value `json:"ComponentType,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplifyuibuilder-component.html#cfn-amplifyuibuilder-component-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Overrides AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplifyuibuilder-component.html#cfn-amplifyuibuilder-component-overrides
+	Overrides map[string]Component_ComponentOverridesValue `json:"Overrides,omitempty"`
+
+	// Properties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplifyuibuilder-component.html#cfn-amplifyuibuilder-component-properties
+	Properties map[string]Component_ComponentProperty `json:"Properties,omitempty"`
+
+	// SourceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplifyuibuilder-component.html#cfn-amplifyuibuilder-component-sourceid
+	SourceId *types.Value `json:"SourceId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplifyuibuilder-component.html#cfn-amplifyuibuilder-component-tags
+	Tags map[string]*types.Value `json:"Tags,omitempty"`
+
+	// Variants AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplifyuibuilder-component.html#cfn-amplifyuibuilder-component-variants
+	Variants []Component_ComponentVariant `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 *Component) AWSCloudFormationType() string {
+	return "AWS::AmplifyUIBuilder::Component"
+}
+
+// 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 Component) MarshalJSON() ([]byte, error) {
+	type Properties Component
+	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 *Component) UnmarshalJSON(b []byte) error {
+	type Properties Component
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Component(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalue.go b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalue.go
new file mode 100644
index 0000000000..647fcefa93
--- /dev/null
+++ b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalue.go
@@ -0,0 +1,47 @@
+package amplifyuibuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Component_ComponentBindingPropertiesValue AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentbindingpropertiesvalue.html
+type Component_ComponentBindingPropertiesValue struct {
+
+	// BindingProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentbindingpropertiesvalue.html#cfn-amplifyuibuilder-component-componentbindingpropertiesvalue-bindingproperties
+	BindingProperties *Component_ComponentBindingPropertiesValueProperties `json:"BindingProperties,omitempty"`
+
+	// DefaultValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentbindingpropertiesvalue.html#cfn-amplifyuibuilder-component-componentbindingpropertiesvalue-defaultvalue
+	DefaultValue *types.Value `json:"DefaultValue,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentbindingpropertiesvalue.html#cfn-amplifyuibuilder-component-componentbindingpropertiesvalue-type
+	Type *types.Value `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 *Component_ComponentBindingPropertiesValue) AWSCloudFormationType() string {
+	return "AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValue"
+}
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalueproperties.go b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalueproperties.go
new file mode 100644
index 0000000000..d84ec36bf3
--- /dev/null
+++ b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentbindingpropertiesvalueproperties.go
@@ -0,0 +1,67 @@
+package amplifyuibuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Component_ComponentBindingPropertiesValueProperties AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValueProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentbindingpropertiesvalueproperties.html
+type Component_ComponentBindingPropertiesValueProperties struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentbindingpropertiesvalueproperties.html#cfn-amplifyuibuilder-component-componentbindingpropertiesvalueproperties-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// DefaultValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentbindingpropertiesvalueproperties.html#cfn-amplifyuibuilder-component-componentbindingpropertiesvalueproperties-defaultvalue
+	DefaultValue *types.Value `json:"DefaultValue,omitempty"`
+
+	// Field AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentbindingpropertiesvalueproperties.html#cfn-amplifyuibuilder-component-componentbindingpropertiesvalueproperties-field
+	Field *types.Value `json:"Field,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentbindingpropertiesvalueproperties.html#cfn-amplifyuibuilder-component-componentbindingpropertiesvalueproperties-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Model AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentbindingpropertiesvalueproperties.html#cfn-amplifyuibuilder-component-componentbindingpropertiesvalueproperties-model
+	Model *types.Value `json:"Model,omitempty"`
+
+	// Predicates AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentbindingpropertiesvalueproperties.html#cfn-amplifyuibuilder-component-componentbindingpropertiesvalueproperties-predicates
+	Predicates []Component_Predicate `json:"Predicates,omitempty"`
+
+	// UserAttribute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentbindingpropertiesvalueproperties.html#cfn-amplifyuibuilder-component-componentbindingpropertiesvalueproperties-userattribute
+	UserAttribute *types.Value `json:"UserAttribute,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Component_ComponentBindingPropertiesValueProperties) AWSCloudFormationType() string {
+	return "AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValueProperties"
+}
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentchild.go b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentchild.go
new file mode 100644
index 0000000000..8ebbf90a74
--- /dev/null
+++ b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentchild.go
@@ -0,0 +1,52 @@
+package amplifyuibuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Component_ComponentChild AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentChild)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentchild.html
+type Component_ComponentChild struct {
+
+	// Children AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentchild.html#cfn-amplifyuibuilder-component-componentchild-children
+	Children []Component_ComponentChild `json:"Children,omitempty"`
+
+	// ComponentType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentchild.html#cfn-amplifyuibuilder-component-componentchild-componenttype
+	ComponentType *types.Value `json:"ComponentType,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentchild.html#cfn-amplifyuibuilder-component-componentchild-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Properties AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentchild.html#cfn-amplifyuibuilder-component-componentchild-properties
+	Properties *Component_ComponentProperties `json:"Properties,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Component_ComponentChild) AWSCloudFormationType() string {
+	return "AWS::AmplifyUIBuilder::Component.ComponentChild"
+}
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentconditionproperty.go b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentconditionproperty.go
new file mode 100644
index 0000000000..b645e4e0bd
--- /dev/null
+++ b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentconditionproperty.go
@@ -0,0 +1,62 @@
+package amplifyuibuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Component_ComponentConditionProperty AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentConditionProperty)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentconditionproperty.html
+type Component_ComponentConditionProperty struct {
+
+	// Else AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentconditionproperty.html#cfn-amplifyuibuilder-component-componentconditionproperty-else
+	Else *Component_ComponentProperty `json:"Else,omitempty"`
+
+	// Field AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentconditionproperty.html#cfn-amplifyuibuilder-component-componentconditionproperty-field
+	Field *types.Value `json:"Field,omitempty"`
+
+	// Operand AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentconditionproperty.html#cfn-amplifyuibuilder-component-componentconditionproperty-operand
+	Operand *types.Value `json:"Operand,omitempty"`
+
+	// Operator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentconditionproperty.html#cfn-amplifyuibuilder-component-componentconditionproperty-operator
+	Operator *types.Value `json:"Operator,omitempty"`
+
+	// Property AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentconditionproperty.html#cfn-amplifyuibuilder-component-componentconditionproperty-property
+	Property *types.Value `json:"Property,omitempty"`
+
+	// Then AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentconditionproperty.html#cfn-amplifyuibuilder-component-componentconditionproperty-then
+	Then *Component_ComponentProperty `json:"Then,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Component_ComponentConditionProperty) AWSCloudFormationType() string {
+	return "AWS::AmplifyUIBuilder::Component.ComponentConditionProperty"
+}
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentdataconfiguration.go b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentdataconfiguration.go
new file mode 100644
index 0000000000..2a5e180e08
--- /dev/null
+++ b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentdataconfiguration.go
@@ -0,0 +1,52 @@
+package amplifyuibuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Component_ComponentDataConfiguration AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentDataConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentdataconfiguration.html
+type Component_ComponentDataConfiguration struct {
+
+	// Identifiers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentdataconfiguration.html#cfn-amplifyuibuilder-component-componentdataconfiguration-identifiers
+	Identifiers *types.Value `json:"Identifiers,omitempty"`
+
+	// Model AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentdataconfiguration.html#cfn-amplifyuibuilder-component-componentdataconfiguration-model
+	Model *types.Value `json:"Model,omitempty"`
+
+	// Predicate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentdataconfiguration.html#cfn-amplifyuibuilder-component-componentdataconfiguration-predicate
+	Predicate *Component_Predicate `json:"Predicate,omitempty"`
+
+	// Sort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentdataconfiguration.html#cfn-amplifyuibuilder-component-componentdataconfiguration-sort
+	Sort []Component_SortProperty `json:"Sort,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Component_ComponentDataConfiguration) AWSCloudFormationType() string {
+	return "AWS::AmplifyUIBuilder::Component.ComponentDataConfiguration"
+}
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverrides.go b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverrides.go
new file mode 100644
index 0000000000..866108f12e
--- /dev/null
+++ b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverrides.go
@@ -0,0 +1,30 @@
+package amplifyuibuilder
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Component_ComponentOverrides AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentOverrides)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentoverrides.html
+type Component_ComponentOverrides struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Component_ComponentOverrides) AWSCloudFormationType() string {
+	return "AWS::AmplifyUIBuilder::Component.ComponentOverrides"
+}
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverridesvalue.go b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverridesvalue.go
new file mode 100644
index 0000000000..badacc291d
--- /dev/null
+++ b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentoverridesvalue.go
@@ -0,0 +1,30 @@
+package amplifyuibuilder
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Component_ComponentOverridesValue AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentOverridesValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentoverridesvalue.html
+type Component_ComponentOverridesValue struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Component_ComponentOverridesValue) AWSCloudFormationType() string {
+	return "AWS::AmplifyUIBuilder::Component.ComponentOverridesValue"
+}
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperties.go b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperties.go
new file mode 100644
index 0000000000..91496464ea
--- /dev/null
+++ b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperties.go
@@ -0,0 +1,30 @@
+package amplifyuibuilder
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Component_ComponentProperties AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentproperties.html
+type Component_ComponentProperties struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Component_ComponentProperties) AWSCloudFormationType() string {
+	return "AWS::AmplifyUIBuilder::Component.ComponentProperties"
+}
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperty.go b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperty.go
new file mode 100644
index 0000000000..64ad584a5e
--- /dev/null
+++ b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentproperty.go
@@ -0,0 +1,97 @@
+package amplifyuibuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Component_ComponentProperty AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentProperty)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentproperty.html
+type Component_ComponentProperty struct {
+
+	// BindingProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentproperty.html#cfn-amplifyuibuilder-component-componentproperty-bindingproperties
+	BindingProperties *Component_ComponentPropertyBindingProperties `json:"BindingProperties,omitempty"`
+
+	// Bindings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentproperty.html#cfn-amplifyuibuilder-component-componentproperty-bindings
+	Bindings *Component_FormBindings `json:"Bindings,omitempty"`
+
+	// CollectionBindingProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentproperty.html#cfn-amplifyuibuilder-component-componentproperty-collectionbindingproperties
+	CollectionBindingProperties *Component_ComponentPropertyBindingProperties `json:"CollectionBindingProperties,omitempty"`
+
+	// Concat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentproperty.html#cfn-amplifyuibuilder-component-componentproperty-concat
+	Concat []Component_ComponentProperty `json:"Concat,omitempty"`
+
+	// Condition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentproperty.html#cfn-amplifyuibuilder-component-componentproperty-condition
+	Condition *Component_ComponentConditionProperty `json:"Condition,omitempty"`
+
+	// Configured AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentproperty.html#cfn-amplifyuibuilder-component-componentproperty-configured
+	Configured *types.Value `json:"Configured,omitempty"`
+
+	// DefaultValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentproperty.html#cfn-amplifyuibuilder-component-componentproperty-defaultvalue
+	DefaultValue *types.Value `json:"DefaultValue,omitempty"`
+
+	// Event AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentproperty.html#cfn-amplifyuibuilder-component-componentproperty-event
+	Event *types.Value `json:"Event,omitempty"`
+
+	// ImportedValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentproperty.html#cfn-amplifyuibuilder-component-componentproperty-importedvalue
+	ImportedValue *types.Value `json:"ImportedValue,omitempty"`
+
+	// Model AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentproperty.html#cfn-amplifyuibuilder-component-componentproperty-model
+	Model *types.Value `json:"Model,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentproperty.html#cfn-amplifyuibuilder-component-componentproperty-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// UserAttribute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentproperty.html#cfn-amplifyuibuilder-component-componentproperty-userattribute
+	UserAttribute *types.Value `json:"UserAttribute,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentproperty.html#cfn-amplifyuibuilder-component-componentproperty-value
+	Value *types.Value `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 *Component_ComponentProperty) AWSCloudFormationType() string {
+	return "AWS::AmplifyUIBuilder::Component.ComponentProperty"
+}
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentpropertybindingproperties.go b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentpropertybindingproperties.go
new file mode 100644
index 0000000000..57a43600ee
--- /dev/null
+++ b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentpropertybindingproperties.go
@@ -0,0 +1,42 @@
+package amplifyuibuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Component_ComponentPropertyBindingProperties AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentPropertyBindingProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentpropertybindingproperties.html
+type Component_ComponentPropertyBindingProperties struct {
+
+	// Field AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentpropertybindingproperties.html#cfn-amplifyuibuilder-component-componentpropertybindingproperties-field
+	Field *types.Value `json:"Field,omitempty"`
+
+	// Property AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentpropertybindingproperties.html#cfn-amplifyuibuilder-component-componentpropertybindingproperties-property
+	Property *types.Value `json:"Property,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Component_ComponentPropertyBindingProperties) AWSCloudFormationType() string {
+	return "AWS::AmplifyUIBuilder::Component.ComponentPropertyBindingProperties"
+}
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariant.go b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariant.go
new file mode 100644
index 0000000000..f168e57cca
--- /dev/null
+++ b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariant.go
@@ -0,0 +1,40 @@
+package amplifyuibuilder
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Component_ComponentVariant AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentVariant)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentvariant.html
+type Component_ComponentVariant struct {
+
+	// Overrides AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentvariant.html#cfn-amplifyuibuilder-component-componentvariant-overrides
+	Overrides *Component_ComponentOverrides `json:"Overrides,omitempty"`
+
+	// VariantValues AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentvariant.html#cfn-amplifyuibuilder-component-componentvariant-variantvalues
+	VariantValues *Component_ComponentVariantValues `json:"VariantValues,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Component_ComponentVariant) AWSCloudFormationType() string {
+	return "AWS::AmplifyUIBuilder::Component.ComponentVariant"
+}
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariantvalues.go b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariantvalues.go
new file mode 100644
index 0000000000..9a3b91415a
--- /dev/null
+++ b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_componentvariantvalues.go
@@ -0,0 +1,30 @@
+package amplifyuibuilder
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Component_ComponentVariantValues AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.ComponentVariantValues)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-componentvariantvalues.html
+type Component_ComponentVariantValues struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Component_ComponentVariantValues) AWSCloudFormationType() string {
+	return "AWS::AmplifyUIBuilder::Component.ComponentVariantValues"
+}
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_formbindings.go b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_formbindings.go
new file mode 100644
index 0000000000..b3e251ab75
--- /dev/null
+++ b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_formbindings.go
@@ -0,0 +1,30 @@
+package amplifyuibuilder
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Component_FormBindings AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.FormBindings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-formbindings.html
+type Component_FormBindings struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Component_FormBindings) AWSCloudFormationType() string {
+	return "AWS::AmplifyUIBuilder::Component.FormBindings"
+}
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_predicate.go b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_predicate.go
new file mode 100644
index 0000000000..9884a48454
--- /dev/null
+++ b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_predicate.go
@@ -0,0 +1,57 @@
+package amplifyuibuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Component_Predicate AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.Predicate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-predicate.html
+type Component_Predicate struct {
+
+	// And AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-predicate.html#cfn-amplifyuibuilder-component-predicate-and
+	And []Component_Predicate `json:"And,omitempty"`
+
+	// Field AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-predicate.html#cfn-amplifyuibuilder-component-predicate-field
+	Field *types.Value `json:"Field,omitempty"`
+
+	// Operand AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-predicate.html#cfn-amplifyuibuilder-component-predicate-operand
+	Operand *types.Value `json:"Operand,omitempty"`
+
+	// Operator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-predicate.html#cfn-amplifyuibuilder-component-predicate-operator
+	Operator *types.Value `json:"Operator,omitempty"`
+
+	// Or AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-predicate.html#cfn-amplifyuibuilder-component-predicate-or
+	Or []Component_Predicate `json:"Or,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Component_Predicate) AWSCloudFormationType() string {
+	return "AWS::AmplifyUIBuilder::Component.Predicate"
+}
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_sortproperty.go b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_sortproperty.go
new file mode 100644
index 0000000000..ac5a50e141
--- /dev/null
+++ b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-component_sortproperty.go
@@ -0,0 +1,42 @@
+package amplifyuibuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Component_SortProperty AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Component.SortProperty)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-sortproperty.html
+type Component_SortProperty struct {
+
+	// Direction AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-sortproperty.html#cfn-amplifyuibuilder-component-sortproperty-direction
+	Direction *types.Value `json:"Direction,omitempty"`
+
+	// Field AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-component-sortproperty.html#cfn-amplifyuibuilder-component-sortproperty-field
+	Field *types.Value `json:"Field,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Component_SortProperty) AWSCloudFormationType() string {
+	return "AWS::AmplifyUIBuilder::Component.SortProperty"
+}
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme.go b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme.go
new file mode 100644
index 0000000000..75f7d22fd3
--- /dev/null
+++ b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme.go
@@ -0,0 +1,123 @@
+package amplifyuibuilder
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Theme AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Theme)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplifyuibuilder-theme.html
+type Theme struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplifyuibuilder-theme.html#cfn-amplifyuibuilder-theme-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Overrides AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplifyuibuilder-theme.html#cfn-amplifyuibuilder-theme-overrides
+	Overrides []Theme_ThemeValues `json:"Overrides,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplifyuibuilder-theme.html#cfn-amplifyuibuilder-theme-tags
+	Tags map[string]*types.Value `json:"Tags,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-amplifyuibuilder-theme.html#cfn-amplifyuibuilder-theme-values
+	Values []Theme_ThemeValues `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Theme) AWSCloudFormationType() string {
+	return "AWS::AmplifyUIBuilder::Theme"
+}
+
+// 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 Theme) MarshalJSON() ([]byte, error) {
+	type Properties Theme
+	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 *Theme) UnmarshalJSON(b []byte) error {
+	type Properties Theme
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Theme(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalue.go b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalue.go
new file mode 100644
index 0000000000..20da187ec7
--- /dev/null
+++ b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalue.go
@@ -0,0 +1,42 @@
+package amplifyuibuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Theme_ThemeValue AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Theme.ThemeValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-theme-themevalue.html
+type Theme_ThemeValue struct {
+
+	// Children AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-theme-themevalue.html#cfn-amplifyuibuilder-theme-themevalue-children
+	Children []Theme_ThemeValues `json:"Children,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-theme-themevalue.html#cfn-amplifyuibuilder-theme-themevalue-value
+	Value *types.Value `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 *Theme_ThemeValue) AWSCloudFormationType() string {
+	return "AWS::AmplifyUIBuilder::Theme.ThemeValue"
+}
diff --git a/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalues.go b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalues.go
new file mode 100644
index 0000000000..5aa1d918fb
--- /dev/null
+++ b/goformation/cloudformation/amplifyuibuilder/aws-amplifyuibuilder-theme_themevalues.go
@@ -0,0 +1,42 @@
+package amplifyuibuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Theme_ThemeValues AWS CloudFormation Resource (AWS::AmplifyUIBuilder::Theme.ThemeValues)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-theme-themevalues.html
+type Theme_ThemeValues struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-theme-themevalues.html#cfn-amplifyuibuilder-theme-themevalues-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-amplifyuibuilder-theme-themevalues.html#cfn-amplifyuibuilder-theme-themevalues-value
+	Value *Theme_ThemeValue `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 *Theme_ThemeValues) AWSCloudFormationType() string {
+	return "AWS::AmplifyUIBuilder::Theme.ThemeValues"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-account.go b/goformation/cloudformation/apigateway/aws-apigateway-account.go
new file mode 100644
index 0000000000..ad85978be1
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-account.go
@@ -0,0 +1,108 @@
+package apigateway
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Account AWS CloudFormation Resource (AWS::ApiGateway::Account)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-account.html
+type Account struct {
+
+	// CloudWatchRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-account.html#cfn-apigateway-account-cloudwatchrolearn
+	CloudWatchRoleArn *types.Value `json:"CloudWatchRoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Account) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::Account"
+}
+
+// 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 Account) MarshalJSON() ([]byte, error) {
+	type Properties Account
+	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 *Account) UnmarshalJSON(b []byte) error {
+	type Properties Account
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Account(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigateway/aws-apigateway-apikey.go b/goformation/cloudformation/apigateway/aws-apigateway-apikey.go
new file mode 100644
index 0000000000..129129c6ce
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-apikey.go
@@ -0,0 +1,144 @@
+package apigateway
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApiKey AWS CloudFormation Resource (AWS::ApiGateway::ApiKey)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html
+type ApiKey struct {
+
+	// CustomerId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apikey-customerid
+	CustomerId *types.Value `json:"CustomerId,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apikey-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apikey-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// GenerateDistinctId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apikey-generatedistinctid
+	GenerateDistinctId *types.Value `json:"GenerateDistinctId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apikey-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// StageKeys AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apikey-stagekeys
+	StageKeys []ApiKey_StageKey `json:"StageKeys,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apikey-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-apikey.html#cfn-apigateway-apikey-value
+	Value *types.Value `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 *ApiKey) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::ApiKey"
+}
+
+// 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 ApiKey) MarshalJSON() ([]byte, error) {
+	type Properties ApiKey
+	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 *ApiKey) UnmarshalJSON(b []byte) error {
+	type Properties ApiKey
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ApiKey(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigateway/aws-apigateway-apikey_stagekey.go b/goformation/cloudformation/apigateway/aws-apigateway-apikey_stagekey.go
new file mode 100644
index 0000000000..de9da65559
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-apikey_stagekey.go
@@ -0,0 +1,42 @@
+package apigateway
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApiKey_StageKey AWS CloudFormation Resource (AWS::ApiGateway::ApiKey.StageKey)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-apikey-stagekey.html
+type ApiKey_StageKey struct {
+
+	// RestApiId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-apikey-stagekey.html#cfn-apigateway-apikey-stagekey-restapiid
+	RestApiId *types.Value `json:"RestApiId,omitempty"`
+
+	// StageName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-apikey-stagekey.html#cfn-apigateway-apikey-stagekey-stagename
+	StageName *types.Value `json:"StageName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApiKey_StageKey) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::ApiKey.StageKey"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-authorizer.go b/goformation/cloudformation/apigateway/aws-apigateway-authorizer.go
new file mode 100644
index 0000000000..8902ffd1b3
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-authorizer.go
@@ -0,0 +1,153 @@
+package apigateway
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Authorizer AWS CloudFormation Resource (AWS::ApiGateway::Authorizer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html
+type Authorizer struct {
+
+	// AuthType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html#cfn-apigateway-authorizer-authtype
+	AuthType *types.Value `json:"AuthType,omitempty"`
+
+	// AuthorizerCredentials AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html#cfn-apigateway-authorizer-authorizercredentials
+	AuthorizerCredentials *types.Value `json:"AuthorizerCredentials,omitempty"`
+
+	// AuthorizerResultTtlInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html#cfn-apigateway-authorizer-authorizerresultttlinseconds
+	AuthorizerResultTtlInSeconds *types.Value `json:"AuthorizerResultTtlInSeconds,omitempty"`
+
+	// AuthorizerUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html#cfn-apigateway-authorizer-authorizeruri
+	AuthorizerUri *types.Value `json:"AuthorizerUri,omitempty"`
+
+	// IdentitySource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html#cfn-apigateway-authorizer-identitysource
+	IdentitySource *types.Value `json:"IdentitySource,omitempty"`
+
+	// IdentityValidationExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html#cfn-apigateway-authorizer-identityvalidationexpression
+	IdentityValidationExpression *types.Value `json:"IdentityValidationExpression,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html#cfn-apigateway-authorizer-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ProviderARNs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html#cfn-apigateway-authorizer-providerarns
+	ProviderARNs *types.Value `json:"ProviderARNs,omitempty"`
+
+	// RestApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html#cfn-apigateway-authorizer-restapiid
+	RestApiId *types.Value `json:"RestApiId,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-authorizer.html#cfn-apigateway-authorizer-type
+	Type *types.Value `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 *Authorizer) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::Authorizer"
+}
+
+// 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 Authorizer) MarshalJSON() ([]byte, error) {
+	type Properties Authorizer
+	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 *Authorizer) UnmarshalJSON(b []byte) error {
+	type Properties Authorizer
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Authorizer(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigateway/aws-apigateway-basepathmapping.go b/goformation/cloudformation/apigateway/aws-apigateway-basepathmapping.go
new file mode 100644
index 0000000000..62676ae67e
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-basepathmapping.go
@@ -0,0 +1,123 @@
+package apigateway
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BasePathMapping AWS CloudFormation Resource (AWS::ApiGateway::BasePathMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-basepathmapping.html
+type BasePathMapping struct {
+
+	// BasePath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-basepathmapping.html#cfn-apigateway-basepathmapping-basepath
+	BasePath *types.Value `json:"BasePath,omitempty"`
+
+	// DomainName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-basepathmapping.html#cfn-apigateway-basepathmapping-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// RestApiId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-basepathmapping.html#cfn-apigateway-basepathmapping-restapiid
+	RestApiId *types.Value `json:"RestApiId,omitempty"`
+
+	// Stage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-basepathmapping.html#cfn-apigateway-basepathmapping-stage
+	Stage *types.Value `json:"Stage,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *BasePathMapping) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::BasePathMapping"
+}
+
+// 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 BasePathMapping) MarshalJSON() ([]byte, error) {
+	type Properties BasePathMapping
+	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 *BasePathMapping) UnmarshalJSON(b []byte) error {
+	type Properties BasePathMapping
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = BasePathMapping(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigateway/aws-apigateway-clientcertificate.go b/goformation/cloudformation/apigateway/aws-apigateway-clientcertificate.go
new file mode 100644
index 0000000000..32c1ef4816
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-clientcertificate.go
@@ -0,0 +1,114 @@
+package apigateway
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ClientCertificate AWS CloudFormation Resource (AWS::ApiGateway::ClientCertificate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-clientcertificate.html
+type ClientCertificate struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-clientcertificate.html#cfn-apigateway-clientcertificate-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-clientcertificate.html#cfn-apigateway-clientcertificate-tags
+	Tags []cloudformation.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 *ClientCertificate) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::ClientCertificate"
+}
+
+// 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 ClientCertificate) MarshalJSON() ([]byte, error) {
+	type Properties ClientCertificate
+	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 *ClientCertificate) UnmarshalJSON(b []byte) error {
+	type Properties ClientCertificate
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ClientCertificate(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigateway/aws-apigateway-deployment.go b/goformation/cloudformation/apigateway/aws-apigateway-deployment.go
new file mode 100644
index 0000000000..4a1a724497
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-deployment.go
@@ -0,0 +1,128 @@
+package apigateway
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Deployment AWS CloudFormation Resource (AWS::ApiGateway::Deployment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-deployment.html
+type Deployment struct {
+
+	// DeploymentCanarySettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-deployment.html#cfn-apigateway-deployment-deploymentcanarysettings
+	DeploymentCanarySettings *Deployment_DeploymentCanarySettings `json:"DeploymentCanarySettings,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-deployment.html#cfn-apigateway-deployment-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// RestApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-deployment.html#cfn-apigateway-deployment-restapiid
+	RestApiId *types.Value `json:"RestApiId,omitempty"`
+
+	// StageDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-deployment.html#cfn-apigateway-deployment-stagedescription
+	StageDescription *Deployment_StageDescription `json:"StageDescription,omitempty"`
+
+	// StageName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-deployment.html#cfn-apigateway-deployment-stagename
+	StageName *types.Value `json:"StageName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::ApiGateway::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigateway/aws-apigateway-deployment_accesslogsetting.go b/goformation/cloudformation/apigateway/aws-apigateway-deployment_accesslogsetting.go
new file mode 100644
index 0000000000..4b7d675ef2
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-deployment_accesslogsetting.go
@@ -0,0 +1,42 @@
+package apigateway
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Deployment_AccessLogSetting AWS CloudFormation Resource (AWS::ApiGateway::Deployment.AccessLogSetting)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-accesslogsetting.html
+type Deployment_AccessLogSetting struct {
+
+	// DestinationArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-accesslogsetting.html#cfn-apigateway-deployment-accesslogsetting-destinationarn
+	DestinationArn *types.Value `json:"DestinationArn,omitempty"`
+
+	// Format AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-accesslogsetting.html#cfn-apigateway-deployment-accesslogsetting-format
+	Format *types.Value `json:"Format,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AccessLogSetting) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::Deployment.AccessLogSetting"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-deployment_canarysetting.go b/goformation/cloudformation/apigateway/aws-apigateway-deployment_canarysetting.go
new file mode 100644
index 0000000000..1e43dec668
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-deployment_canarysetting.go
@@ -0,0 +1,47 @@
+package apigateway
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Deployment_CanarySetting AWS CloudFormation Resource (AWS::ApiGateway::Deployment.CanarySetting)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-canarysetting.html
+type Deployment_CanarySetting struct {
+
+	// PercentTraffic AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-canarysetting.html#cfn-apigateway-deployment-canarysetting-percenttraffic
+	PercentTraffic *types.Value `json:"PercentTraffic,omitempty"`
+
+	// StageVariableOverrides AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-canarysetting.html#cfn-apigateway-deployment-canarysetting-stagevariableoverrides
+	StageVariableOverrides map[string]*types.Value `json:"StageVariableOverrides,omitempty"`
+
+	// UseStageCache AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-canarysetting.html#cfn-apigateway-deployment-canarysetting-usestagecache
+	UseStageCache *types.Value `json:"UseStageCache,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CanarySetting) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::Deployment.CanarySetting"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-deployment_deploymentcanarysettings.go b/goformation/cloudformation/apigateway/aws-apigateway-deployment_deploymentcanarysettings.go
new file mode 100644
index 0000000000..223ddf09bc
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-deployment_deploymentcanarysettings.go
@@ -0,0 +1,47 @@
+package apigateway
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Deployment_DeploymentCanarySettings AWS CloudFormation Resource (AWS::ApiGateway::Deployment.DeploymentCanarySettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-deploymentcanarysettings.html
+type Deployment_DeploymentCanarySettings struct {
+
+	// PercentTraffic AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-deploymentcanarysettings.html#cfn-apigateway-deployment-deploymentcanarysettings-percenttraffic
+	PercentTraffic *types.Value `json:"PercentTraffic,omitempty"`
+
+	// StageVariableOverrides AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-deploymentcanarysettings.html#cfn-apigateway-deployment-deploymentcanarysettings-stagevariableoverrides
+	StageVariableOverrides map[string]*types.Value `json:"StageVariableOverrides,omitempty"`
+
+	// UseStageCache AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-deploymentcanarysettings.html#cfn-apigateway-deployment-deploymentcanarysettings-usestagecache
+	UseStageCache *types.Value `json:"UseStageCache,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DeploymentCanarySettings) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::Deployment.DeploymentCanarySettings"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-deployment_methodsetting.go b/goformation/cloudformation/apigateway/aws-apigateway-deployment_methodsetting.go
new file mode 100644
index 0000000000..8bce486845
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-deployment_methodsetting.go
@@ -0,0 +1,82 @@
+package apigateway
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Deployment_MethodSetting AWS CloudFormation Resource (AWS::ApiGateway::Deployment.MethodSetting)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html
+type Deployment_MethodSetting struct {
+
+	// CacheDataEncrypted AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html#cfn-apigateway-deployment-stagedescription-methodsetting-cachedataencrypted
+	CacheDataEncrypted *types.Value `json:"CacheDataEncrypted,omitempty"`
+
+	// CacheTtlInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html#cfn-apigateway-deployment-stagedescription-methodsetting-cachettlinseconds
+	CacheTtlInSeconds *types.Value `json:"CacheTtlInSeconds,omitempty"`
+
+	// CachingEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html#cfn-apigateway-deployment-stagedescription-methodsetting-cachingenabled
+	CachingEnabled *types.Value `json:"CachingEnabled,omitempty"`
+
+	// DataTraceEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html#cfn-apigateway-deployment-stagedescription-methodsetting-datatraceenabled
+	DataTraceEnabled *types.Value `json:"DataTraceEnabled,omitempty"`
+
+	// HttpMethod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html#cfn-apigateway-deployment-stagedescription-methodsetting-httpmethod
+	HttpMethod *types.Value `json:"HttpMethod,omitempty"`
+
+	// LoggingLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html#cfn-apigateway-deployment-stagedescription-methodsetting-logginglevel
+	LoggingLevel *types.Value `json:"LoggingLevel,omitempty"`
+
+	// MetricsEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html#cfn-apigateway-deployment-stagedescription-methodsetting-metricsenabled
+	MetricsEnabled *types.Value `json:"MetricsEnabled,omitempty"`
+
+	// ResourcePath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html#cfn-apigateway-deployment-stagedescription-methodsetting-resourcepath
+	ResourcePath *types.Value `json:"ResourcePath,omitempty"`
+
+	// ThrottlingBurstLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html#cfn-apigateway-deployment-stagedescription-methodsetting-throttlingburstlimit
+	ThrottlingBurstLimit *types.Value `json:"ThrottlingBurstLimit,omitempty"`
+
+	// ThrottlingRateLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription-methodsetting.html#cfn-apigateway-deployment-stagedescription-methodsetting-throttlingratelimit
+	ThrottlingRateLimit *types.Value `json:"ThrottlingRateLimit,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_MethodSetting) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::Deployment.MethodSetting"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-deployment_stagedescription.go b/goformation/cloudformation/apigateway/aws-apigateway-deployment_stagedescription.go
new file mode 100644
index 0000000000..70ad885288
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-deployment_stagedescription.go
@@ -0,0 +1,128 @@
+package apigateway
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Deployment_StageDescription AWS CloudFormation Resource (AWS::ApiGateway::Deployment.StageDescription)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html
+type Deployment_StageDescription struct {
+
+	// AccessLogSetting AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-accesslogsetting
+	AccessLogSetting *Deployment_AccessLogSetting `json:"AccessLogSetting,omitempty"`
+
+	// CacheClusterEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-cacheclusterenabled
+	CacheClusterEnabled *types.Value `json:"CacheClusterEnabled,omitempty"`
+
+	// CacheClusterSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-cacheclustersize
+	CacheClusterSize *types.Value `json:"CacheClusterSize,omitempty"`
+
+	// CacheDataEncrypted AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-cachedataencrypted
+	CacheDataEncrypted *types.Value `json:"CacheDataEncrypted,omitempty"`
+
+	// CacheTtlInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-cachettlinseconds
+	CacheTtlInSeconds *types.Value `json:"CacheTtlInSeconds,omitempty"`
+
+	// CachingEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-cachingenabled
+	CachingEnabled *types.Value `json:"CachingEnabled,omitempty"`
+
+	// CanarySetting AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-canarysetting
+	CanarySetting *Deployment_CanarySetting `json:"CanarySetting,omitempty"`
+
+	// ClientCertificateId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-clientcertificateid
+	ClientCertificateId *types.Value `json:"ClientCertificateId,omitempty"`
+
+	// DataTraceEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-datatraceenabled
+	DataTraceEnabled *types.Value `json:"DataTraceEnabled,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DocumentationVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-documentationversion
+	DocumentationVersion *types.Value `json:"DocumentationVersion,omitempty"`
+
+	// LoggingLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-logginglevel
+	LoggingLevel *types.Value `json:"LoggingLevel,omitempty"`
+
+	// MethodSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-methodsettings
+	MethodSettings []Deployment_MethodSetting `json:"MethodSettings,omitempty"`
+
+	// MetricsEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-metricsenabled
+	MetricsEnabled *types.Value `json:"MetricsEnabled,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// ThrottlingBurstLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-throttlingburstlimit
+	ThrottlingBurstLimit *types.Value `json:"ThrottlingBurstLimit,omitempty"`
+
+	// ThrottlingRateLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-throttlingratelimit
+	ThrottlingRateLimit *types.Value `json:"ThrottlingRateLimit,omitempty"`
+
+	// TracingEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-tracingenabled
+	TracingEnabled *types.Value `json:"TracingEnabled,omitempty"`
+
+	// Variables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-deployment-stagedescription.html#cfn-apigateway-deployment-stagedescription-variables
+	Variables map[string]*types.Value `json:"Variables,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_StageDescription) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::Deployment.StageDescription"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-documentationpart.go b/goformation/cloudformation/apigateway/aws-apigateway-documentationpart.go
new file mode 100644
index 0000000000..54abb761c3
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-documentationpart.go
@@ -0,0 +1,118 @@
+package apigateway
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DocumentationPart AWS CloudFormation Resource (AWS::ApiGateway::DocumentationPart)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-documentationpart.html
+type DocumentationPart struct {
+
+	// Location AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-documentationpart.html#cfn-apigateway-documentationpart-location
+	Location *DocumentationPart_Location `json:"Location,omitempty"`
+
+	// Properties AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-documentationpart.html#cfn-apigateway-documentationpart-properties
+	Properties *types.Value `json:"Properties,omitempty"`
+
+	// RestApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-documentationpart.html#cfn-apigateway-documentationpart-restapiid
+	RestApiId *types.Value `json:"RestApiId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DocumentationPart) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::DocumentationPart"
+}
+
+// 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 DocumentationPart) MarshalJSON() ([]byte, error) {
+	type Properties DocumentationPart
+	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 *DocumentationPart) UnmarshalJSON(b []byte) error {
+	type Properties DocumentationPart
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DocumentationPart(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigateway/aws-apigateway-documentationpart_location.go b/goformation/cloudformation/apigateway/aws-apigateway-documentationpart_location.go
new file mode 100644
index 0000000000..612a77494e
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-documentationpart_location.go
@@ -0,0 +1,57 @@
+package apigateway
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DocumentationPart_Location AWS CloudFormation Resource (AWS::ApiGateway::DocumentationPart.Location)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-documentationpart-location.html
+type DocumentationPart_Location struct {
+
+	// Method AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-documentationpart-location.html#cfn-apigateway-documentationpart-location-method
+	Method *types.Value `json:"Method,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-documentationpart-location.html#cfn-apigateway-documentationpart-location-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-documentationpart-location.html#cfn-apigateway-documentationpart-location-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// StatusCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-documentationpart-location.html#cfn-apigateway-documentationpart-location-statuscode
+	StatusCode *types.Value `json:"StatusCode,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-documentationpart-location.html#cfn-apigateway-documentationpart-location-type
+	Type *types.Value `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 *DocumentationPart_Location) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::DocumentationPart.Location"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-documentationversion.go b/goformation/cloudformation/apigateway/aws-apigateway-documentationversion.go
new file mode 100644
index 0000000000..8258757c3e
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-documentationversion.go
@@ -0,0 +1,118 @@
+package apigateway
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DocumentationVersion AWS CloudFormation Resource (AWS::ApiGateway::DocumentationVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-documentationversion.html
+type DocumentationVersion struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-documentationversion.html#cfn-apigateway-documentationversion-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DocumentationVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-documentationversion.html#cfn-apigateway-documentationversion-documentationversion
+	DocumentationVersion *types.Value `json:"DocumentationVersion,omitempty"`
+
+	// RestApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-documentationversion.html#cfn-apigateway-documentationversion-restapiid
+	RestApiId *types.Value `json:"RestApiId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DocumentationVersion) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::DocumentationVersion"
+}
+
+// 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 DocumentationVersion) MarshalJSON() ([]byte, error) {
+	type Properties DocumentationVersion
+	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 *DocumentationVersion) UnmarshalJSON(b []byte) error {
+	type Properties DocumentationVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DocumentationVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigateway/aws-apigateway-domainname.go b/goformation/cloudformation/apigateway/aws-apigateway-domainname.go
new file mode 100644
index 0000000000..f8de230efe
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-domainname.go
@@ -0,0 +1,144 @@
+package apigateway
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DomainName AWS CloudFormation Resource (AWS::ApiGateway::DomainName)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainname.html
+type DomainName struct {
+
+	// CertificateArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainname.html#cfn-apigateway-domainname-certificatearn
+	CertificateArn *types.Value `json:"CertificateArn,omitempty"`
+
+	// DomainName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainname.html#cfn-apigateway-domainname-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// EndpointConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainname.html#cfn-apigateway-domainname-endpointconfiguration
+	EndpointConfiguration *DomainName_EndpointConfiguration `json:"EndpointConfiguration,omitempty"`
+
+	// MutualTlsAuthentication AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainname.html#cfn-apigateway-domainname-mutualtlsauthentication
+	MutualTlsAuthentication *DomainName_MutualTlsAuthentication `json:"MutualTlsAuthentication,omitempty"`
+
+	// OwnershipVerificationCertificateArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainname.html#cfn-apigateway-domainname-ownershipverificationcertificatearn
+	OwnershipVerificationCertificateArn *types.Value `json:"OwnershipVerificationCertificateArn,omitempty"`
+
+	// RegionalCertificateArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainname.html#cfn-apigateway-domainname-regionalcertificatearn
+	RegionalCertificateArn *types.Value `json:"RegionalCertificateArn,omitempty"`
+
+	// SecurityPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainname.html#cfn-apigateway-domainname-securitypolicy
+	SecurityPolicy *types.Value `json:"SecurityPolicy,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-domainname.html#cfn-apigateway-domainname-tags
+	Tags []cloudformation.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 *DomainName) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::DomainName"
+}
+
+// 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 DomainName) MarshalJSON() ([]byte, error) {
+	type Properties DomainName
+	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 *DomainName) UnmarshalJSON(b []byte) error {
+	type Properties DomainName
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DomainName(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigateway/aws-apigateway-domainname_endpointconfiguration.go b/goformation/cloudformation/apigateway/aws-apigateway-domainname_endpointconfiguration.go
new file mode 100644
index 0000000000..0ebf9816c9
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-domainname_endpointconfiguration.go
@@ -0,0 +1,37 @@
+package apigateway
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DomainName_EndpointConfiguration AWS CloudFormation Resource (AWS::ApiGateway::DomainName.EndpointConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-domainname-endpointconfiguration.html
+type DomainName_EndpointConfiguration struct {
+
+	// Types AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-domainname-endpointconfiguration.html#cfn-apigateway-domainname-endpointconfiguration-types
+	Types *types.Value `json:"Types,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DomainName_EndpointConfiguration) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::DomainName.EndpointConfiguration"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-domainname_mutualtlsauthentication.go b/goformation/cloudformation/apigateway/aws-apigateway-domainname_mutualtlsauthentication.go
new file mode 100644
index 0000000000..bfa0febcc7
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-domainname_mutualtlsauthentication.go
@@ -0,0 +1,42 @@
+package apigateway
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DomainName_MutualTlsAuthentication AWS CloudFormation Resource (AWS::ApiGateway::DomainName.MutualTlsAuthentication)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-domainname-mutualtlsauthentication.html
+type DomainName_MutualTlsAuthentication struct {
+
+	// TruststoreUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-domainname-mutualtlsauthentication.html#cfn-apigateway-domainname-mutualtlsauthentication-truststoreuri
+	TruststoreUri *types.Value `json:"TruststoreUri,omitempty"`
+
+	// TruststoreVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-domainname-mutualtlsauthentication.html#cfn-apigateway-domainname-mutualtlsauthentication-truststoreversion
+	TruststoreVersion *types.Value `json:"TruststoreVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DomainName_MutualTlsAuthentication) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::DomainName.MutualTlsAuthentication"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-gatewayresponse.go b/goformation/cloudformation/apigateway/aws-apigateway-gatewayresponse.go
new file mode 100644
index 0000000000..9485cd1c9b
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-gatewayresponse.go
@@ -0,0 +1,128 @@
+package apigateway
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayResponse AWS CloudFormation Resource (AWS::ApiGateway::GatewayResponse)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-gatewayresponse.html
+type GatewayResponse struct {
+
+	// ResponseParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-gatewayresponse.html#cfn-apigateway-gatewayresponse-responseparameters
+	ResponseParameters map[string]*types.Value `json:"ResponseParameters,omitempty"`
+
+	// ResponseTemplates AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-gatewayresponse.html#cfn-apigateway-gatewayresponse-responsetemplates
+	ResponseTemplates map[string]*types.Value `json:"ResponseTemplates,omitempty"`
+
+	// ResponseType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-gatewayresponse.html#cfn-apigateway-gatewayresponse-responsetype
+	ResponseType *types.Value `json:"ResponseType,omitempty"`
+
+	// RestApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-gatewayresponse.html#cfn-apigateway-gatewayresponse-restapiid
+	RestApiId *types.Value `json:"RestApiId,omitempty"`
+
+	// StatusCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-gatewayresponse.html#cfn-apigateway-gatewayresponse-statuscode
+	StatusCode *types.Value `json:"StatusCode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GatewayResponse) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::GatewayResponse"
+}
+
+// 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 GatewayResponse) MarshalJSON() ([]byte, error) {
+	type Properties GatewayResponse
+	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 *GatewayResponse) UnmarshalJSON(b []byte) error {
+	type Properties GatewayResponse
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = GatewayResponse(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigateway/aws-apigateway-method.go b/goformation/cloudformation/apigateway/aws-apigateway-method.go
new file mode 100644
index 0000000000..f42fe1a5d5
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-method.go
@@ -0,0 +1,168 @@
+package apigateway
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Method AWS CloudFormation Resource (AWS::ApiGateway::Method)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html
+type Method struct {
+
+	// ApiKeyRequired AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-apikeyrequired
+	ApiKeyRequired *types.Value `json:"ApiKeyRequired,omitempty"`
+
+	// AuthorizationScopes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-authorizationscopes
+	AuthorizationScopes *types.Value `json:"AuthorizationScopes,omitempty"`
+
+	// AuthorizationType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-authorizationtype
+	AuthorizationType *types.Value `json:"AuthorizationType,omitempty"`
+
+	// AuthorizerId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-authorizerid
+	AuthorizerId *types.Value `json:"AuthorizerId,omitempty"`
+
+	// HttpMethod AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-httpmethod
+	HttpMethod *types.Value `json:"HttpMethod,omitempty"`
+
+	// Integration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-integration
+	Integration *Method_Integration `json:"Integration,omitempty"`
+
+	// MethodResponses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-methodresponses
+	MethodResponses []Method_MethodResponse `json:"MethodResponses,omitempty"`
+
+	// OperationName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-operationname
+	OperationName *types.Value `json:"OperationName,omitempty"`
+
+	// RequestModels AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-requestmodels
+	RequestModels map[string]*types.Value `json:"RequestModels,omitempty"`
+
+	// RequestParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-requestparameters
+	RequestParameters map[string]*types.Value `json:"RequestParameters,omitempty"`
+
+	// RequestValidatorId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-requestvalidatorid
+	RequestValidatorId *types.Value `json:"RequestValidatorId,omitempty"`
+
+	// ResourceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-resourceid
+	ResourceId *types.Value `json:"ResourceId,omitempty"`
+
+	// RestApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-method.html#cfn-apigateway-method-restapiid
+	RestApiId *types.Value `json:"RestApiId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Method) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::Method"
+}
+
+// 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 Method) MarshalJSON() ([]byte, error) {
+	type Properties Method
+	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 *Method) UnmarshalJSON(b []byte) error {
+	type Properties Method
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Method(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigateway/aws-apigateway-method_integration.go b/goformation/cloudformation/apigateway/aws-apigateway-method_integration.go
new file mode 100644
index 0000000000..f9e29bb4e3
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-method_integration.go
@@ -0,0 +1,102 @@
+package apigateway
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Method_Integration AWS CloudFormation Resource (AWS::ApiGateway::Method.Integration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html
+type Method_Integration struct {
+
+	// CacheKeyParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-cachekeyparameters
+	CacheKeyParameters *types.Value `json:"CacheKeyParameters,omitempty"`
+
+	// CacheNamespace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-cachenamespace
+	CacheNamespace *types.Value `json:"CacheNamespace,omitempty"`
+
+	// ConnectionId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-connectionid
+	ConnectionId *types.Value `json:"ConnectionId,omitempty"`
+
+	// ConnectionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-connectiontype
+	ConnectionType *types.Value `json:"ConnectionType,omitempty"`
+
+	// ContentHandling AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-contenthandling
+	ContentHandling *types.Value `json:"ContentHandling,omitempty"`
+
+	// Credentials AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-credentials
+	Credentials *types.Value `json:"Credentials,omitempty"`
+
+	// IntegrationHttpMethod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-integrationhttpmethod
+	IntegrationHttpMethod *types.Value `json:"IntegrationHttpMethod,omitempty"`
+
+	// IntegrationResponses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-integrationresponses
+	IntegrationResponses []Method_IntegrationResponse `json:"IntegrationResponses,omitempty"`
+
+	// PassthroughBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-passthroughbehavior
+	PassthroughBehavior *types.Value `json:"PassthroughBehavior,omitempty"`
+
+	// RequestParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-requestparameters
+	RequestParameters map[string]*types.Value `json:"RequestParameters,omitempty"`
+
+	// RequestTemplates AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-requesttemplates
+	RequestTemplates map[string]*types.Value `json:"RequestTemplates,omitempty"`
+
+	// TimeoutInMillis AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-timeoutinmillis
+	TimeoutInMillis *types.Value `json:"TimeoutInMillis,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Uri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration.html#cfn-apigateway-method-integration-uri
+	Uri *types.Value `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 *Method_Integration) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::Method.Integration"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-method_integrationresponse.go b/goformation/cloudformation/apigateway/aws-apigateway-method_integrationresponse.go
new file mode 100644
index 0000000000..9153a66a6f
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-method_integrationresponse.go
@@ -0,0 +1,57 @@
+package apigateway
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Method_IntegrationResponse AWS CloudFormation Resource (AWS::ApiGateway::Method.IntegrationResponse)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration-integrationresponse.html
+type Method_IntegrationResponse struct {
+
+	// ContentHandling AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration-integrationresponse.html#cfn-apigateway-method-integrationresponse-contenthandling
+	ContentHandling *types.Value `json:"ContentHandling,omitempty"`
+
+	// ResponseParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration-integrationresponse.html#cfn-apigateway-method-integration-integrationresponse-responseparameters
+	ResponseParameters map[string]*types.Value `json:"ResponseParameters,omitempty"`
+
+	// ResponseTemplates AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration-integrationresponse.html#cfn-apigateway-method-integration-integrationresponse-responsetemplates
+	ResponseTemplates map[string]*types.Value `json:"ResponseTemplates,omitempty"`
+
+	// SelectionPattern AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration-integrationresponse.html#cfn-apigateway-method-integration-integrationresponse-selectionpattern
+	SelectionPattern *types.Value `json:"SelectionPattern,omitempty"`
+
+	// StatusCode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-integration-integrationresponse.html#cfn-apigateway-method-integration-integrationresponse-statuscode
+	StatusCode *types.Value `json:"StatusCode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Method_IntegrationResponse) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::Method.IntegrationResponse"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-method_methodresponse.go b/goformation/cloudformation/apigateway/aws-apigateway-method_methodresponse.go
new file mode 100644
index 0000000000..d3f723aba6
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-method_methodresponse.go
@@ -0,0 +1,47 @@
+package apigateway
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Method_MethodResponse AWS CloudFormation Resource (AWS::ApiGateway::Method.MethodResponse)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-methodresponse.html
+type Method_MethodResponse struct {
+
+	// ResponseModels AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-methodresponse.html#cfn-apigateway-method-methodresponse-responsemodels
+	ResponseModels map[string]*types.Value `json:"ResponseModels,omitempty"`
+
+	// ResponseParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-methodresponse.html#cfn-apigateway-method-methodresponse-responseparameters
+	ResponseParameters map[string]*types.Value `json:"ResponseParameters,omitempty"`
+
+	// StatusCode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apitgateway-method-methodresponse.html#cfn-apigateway-method-methodresponse-statuscode
+	StatusCode *types.Value `json:"StatusCode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Method_MethodResponse) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::Method.MethodResponse"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-model.go b/goformation/cloudformation/apigateway/aws-apigateway-model.go
new file mode 100644
index 0000000000..705f69fbeb
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-model.go
@@ -0,0 +1,128 @@
+package apigateway
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Model AWS CloudFormation Resource (AWS::ApiGateway::Model)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-model.html
+type Model struct {
+
+	// ContentType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-model.html#cfn-apigateway-model-contenttype
+	ContentType *types.Value `json:"ContentType,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-model.html#cfn-apigateway-model-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-model.html#cfn-apigateway-model-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RestApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-model.html#cfn-apigateway-model-restapiid
+	RestApiId *types.Value `json:"RestApiId,omitempty"`
+
+	// Schema AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-model.html#cfn-apigateway-model-schema
+	Schema interface{} `json:"Schema,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::Model"
+}
+
+// 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 Model) MarshalJSON() ([]byte, error) {
+	type Properties Model
+	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 *Model) UnmarshalJSON(b []byte) error {
+	type Properties Model
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Model(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigateway/aws-apigateway-requestvalidator.go b/goformation/cloudformation/apigateway/aws-apigateway-requestvalidator.go
new file mode 100644
index 0000000000..e76f478d72
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-requestvalidator.go
@@ -0,0 +1,123 @@
+package apigateway
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RequestValidator AWS CloudFormation Resource (AWS::ApiGateway::RequestValidator)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-requestvalidator.html
+type RequestValidator struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-requestvalidator.html#cfn-apigateway-requestvalidator-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RestApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-requestvalidator.html#cfn-apigateway-requestvalidator-restapiid
+	RestApiId *types.Value `json:"RestApiId,omitempty"`
+
+	// ValidateRequestBody AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-requestvalidator.html#cfn-apigateway-requestvalidator-validaterequestbody
+	ValidateRequestBody *types.Value `json:"ValidateRequestBody,omitempty"`
+
+	// ValidateRequestParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-requestvalidator.html#cfn-apigateway-requestvalidator-validaterequestparameters
+	ValidateRequestParameters *types.Value `json:"ValidateRequestParameters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RequestValidator) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::RequestValidator"
+}
+
+// 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 RequestValidator) MarshalJSON() ([]byte, error) {
+	type Properties RequestValidator
+	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 *RequestValidator) UnmarshalJSON(b []byte) error {
+	type Properties RequestValidator
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RequestValidator(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigateway/aws-apigateway-resource.go b/goformation/cloudformation/apigateway/aws-apigateway-resource.go
new file mode 100644
index 0000000000..840edb83da
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-resource.go
@@ -0,0 +1,118 @@
+package apigateway
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Resource AWS CloudFormation Resource (AWS::ApiGateway::Resource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-resource.html
+type Resource struct {
+
+	// ParentId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-resource.html#cfn-apigateway-resource-parentid
+	ParentId *types.Value `json:"ParentId,omitempty"`
+
+	// PathPart AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-resource.html#cfn-apigateway-resource-pathpart
+	PathPart *types.Value `json:"PathPart,omitempty"`
+
+	// RestApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-resource.html#cfn-apigateway-resource-restapiid
+	RestApiId *types.Value `json:"RestApiId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Resource) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::Resource"
+}
+
+// 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 Resource) MarshalJSON() ([]byte, error) {
+	type Properties Resource
+	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 *Resource) UnmarshalJSON(b []byte) error {
+	type Properties Resource
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Resource(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigateway/aws-apigateway-restapi.go b/goformation/cloudformation/apigateway/aws-apigateway-restapi.go
new file mode 100644
index 0000000000..a8577c0f69
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-restapi.go
@@ -0,0 +1,179 @@
+package apigateway
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// RestApi AWS CloudFormation Resource (AWS::ApiGateway::RestApi)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html
+type RestApi struct {
+
+	// ApiKeySourceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-apikeysourcetype
+	ApiKeySourceType *types.Value `json:"ApiKeySourceType,omitempty"`
+
+	// BinaryMediaTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-binarymediatypes
+	BinaryMediaTypes *types.Value `json:"BinaryMediaTypes,omitempty"`
+
+	// Body AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-body
+	Body interface{} `json:"Body,omitempty"`
+
+	// BodyS3Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-bodys3location
+	BodyS3Location *RestApi_S3Location `json:"BodyS3Location,omitempty"`
+
+	// CloneFrom AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-clonefrom
+	CloneFrom *types.Value `json:"CloneFrom,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DisableExecuteApiEndpoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-disableexecuteapiendpoint
+	DisableExecuteApiEndpoint *types.Value `json:"DisableExecuteApiEndpoint,omitempty"`
+
+	// EndpointConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-endpointconfiguration
+	EndpointConfiguration *RestApi_EndpointConfiguration `json:"EndpointConfiguration,omitempty"`
+
+	// FailOnWarnings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-failonwarnings
+	FailOnWarnings *types.Value `json:"FailOnWarnings,omitempty"`
+
+	// MinimumCompressionSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-minimumcompressionsize
+	MinimumCompressionSize *types.Value `json:"MinimumCompressionSize,omitempty"`
+
+	// Mode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-mode
+	Mode *types.Value `json:"Mode,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-parameters
+	Parameters map[string]*types.Value `json:"Parameters,omitempty"`
+
+	// Policy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-policy
+	Policy interface{} `json:"Policy,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-restapi.html#cfn-apigateway-restapi-tags
+	Tags []cloudformation.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 *RestApi) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::RestApi"
+}
+
+// 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 RestApi) MarshalJSON() ([]byte, error) {
+	type Properties RestApi
+	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 *RestApi) UnmarshalJSON(b []byte) error {
+	type Properties RestApi
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RestApi(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigateway/aws-apigateway-restapi_endpointconfiguration.go b/goformation/cloudformation/apigateway/aws-apigateway-restapi_endpointconfiguration.go
new file mode 100644
index 0000000000..d81550535e
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-restapi_endpointconfiguration.go
@@ -0,0 +1,42 @@
+package apigateway
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RestApi_EndpointConfiguration AWS CloudFormation Resource (AWS::ApiGateway::RestApi.EndpointConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-restapi-endpointconfiguration.html
+type RestApi_EndpointConfiguration struct {
+
+	// Types AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-restapi-endpointconfiguration.html#cfn-apigateway-restapi-endpointconfiguration-types
+	Types *types.Value `json:"Types,omitempty"`
+
+	// VpcEndpointIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-restapi-endpointconfiguration.html#cfn-apigateway-restapi-endpointconfiguration-vpcendpointids
+	VpcEndpointIds *types.Value `json:"VpcEndpointIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RestApi_EndpointConfiguration) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::RestApi.EndpointConfiguration"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-restapi_s3location.go b/goformation/cloudformation/apigateway/aws-apigateway-restapi_s3location.go
new file mode 100644
index 0000000000..3fe4e7c83a
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-restapi_s3location.go
@@ -0,0 +1,52 @@
+package apigateway
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RestApi_S3Location AWS CloudFormation Resource (AWS::ApiGateway::RestApi.S3Location)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-restapi-s3location.html
+type RestApi_S3Location struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-restapi-s3location.html#cfn-apigateway-restapi-s3location-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// ETag AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-restapi-s3location.html#cfn-apigateway-restapi-s3location-etag
+	ETag *types.Value `json:"ETag,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-restapi-s3location.html#cfn-apigateway-restapi-s3location-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-restapi-s3location.html#cfn-apigateway-restapi-s3location-version
+	Version *types.Value `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 *RestApi_S3Location) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::RestApi.S3Location"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-stage.go b/goformation/cloudformation/apigateway/aws-apigateway-stage.go
new file mode 100644
index 0000000000..42a8989a2a
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-stage.go
@@ -0,0 +1,174 @@
+package apigateway
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stage AWS CloudFormation Resource (AWS::ApiGateway::Stage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html
+type Stage struct {
+
+	// AccessLogSetting AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-accesslogsetting
+	AccessLogSetting *Stage_AccessLogSetting `json:"AccessLogSetting,omitempty"`
+
+	// CacheClusterEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-cacheclusterenabled
+	CacheClusterEnabled *types.Value `json:"CacheClusterEnabled,omitempty"`
+
+	// CacheClusterSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-cacheclustersize
+	CacheClusterSize *types.Value `json:"CacheClusterSize,omitempty"`
+
+	// CanarySetting AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-canarysetting
+	CanarySetting *Stage_CanarySetting `json:"CanarySetting,omitempty"`
+
+	// ClientCertificateId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-clientcertificateid
+	ClientCertificateId *types.Value `json:"ClientCertificateId,omitempty"`
+
+	// DeploymentId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-deploymentid
+	DeploymentId *types.Value `json:"DeploymentId,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DocumentationVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-documentationversion
+	DocumentationVersion *types.Value `json:"DocumentationVersion,omitempty"`
+
+	// MethodSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-methodsettings
+	MethodSettings []Stage_MethodSetting `json:"MethodSettings,omitempty"`
+
+	// RestApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-restapiid
+	RestApiId *types.Value `json:"RestApiId,omitempty"`
+
+	// StageName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-stagename
+	StageName *types.Value `json:"StageName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TracingEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-tracingenabled
+	TracingEnabled *types.Value `json:"TracingEnabled,omitempty"`
+
+	// Variables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-stage.html#cfn-apigateway-stage-variables
+	Variables map[string]*types.Value `json:"Variables,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::Stage"
+}
+
+// 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 Stage) MarshalJSON() ([]byte, error) {
+	type Properties Stage
+	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 *Stage) UnmarshalJSON(b []byte) error {
+	type Properties Stage
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Stage(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigateway/aws-apigateway-stage_accesslogsetting.go b/goformation/cloudformation/apigateway/aws-apigateway-stage_accesslogsetting.go
new file mode 100644
index 0000000000..f9f1e4b1b4
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-stage_accesslogsetting.go
@@ -0,0 +1,42 @@
+package apigateway
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stage_AccessLogSetting AWS CloudFormation Resource (AWS::ApiGateway::Stage.AccessLogSetting)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-accesslogsetting.html
+type Stage_AccessLogSetting struct {
+
+	// DestinationArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-accesslogsetting.html#cfn-apigateway-stage-accesslogsetting-destinationarn
+	DestinationArn *types.Value `json:"DestinationArn,omitempty"`
+
+	// Format AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-accesslogsetting.html#cfn-apigateway-stage-accesslogsetting-format
+	Format *types.Value `json:"Format,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AccessLogSetting) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::Stage.AccessLogSetting"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-stage_canarysetting.go b/goformation/cloudformation/apigateway/aws-apigateway-stage_canarysetting.go
new file mode 100644
index 0000000000..e6cf14eff5
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-stage_canarysetting.go
@@ -0,0 +1,52 @@
+package apigateway
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stage_CanarySetting AWS CloudFormation Resource (AWS::ApiGateway::Stage.CanarySetting)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-canarysetting.html
+type Stage_CanarySetting struct {
+
+	// DeploymentId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-canarysetting.html#cfn-apigateway-stage-canarysetting-deploymentid
+	DeploymentId *types.Value `json:"DeploymentId,omitempty"`
+
+	// PercentTraffic AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-canarysetting.html#cfn-apigateway-stage-canarysetting-percenttraffic
+	PercentTraffic *types.Value `json:"PercentTraffic,omitempty"`
+
+	// StageVariableOverrides AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-canarysetting.html#cfn-apigateway-stage-canarysetting-stagevariableoverrides
+	StageVariableOverrides map[string]*types.Value `json:"StageVariableOverrides,omitempty"`
+
+	// UseStageCache AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-canarysetting.html#cfn-apigateway-stage-canarysetting-usestagecache
+	UseStageCache *types.Value `json:"UseStageCache,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CanarySetting) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::Stage.CanarySetting"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-stage_methodsetting.go b/goformation/cloudformation/apigateway/aws-apigateway-stage_methodsetting.go
new file mode 100644
index 0000000000..bfc93b6800
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-stage_methodsetting.go
@@ -0,0 +1,82 @@
+package apigateway
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stage_MethodSetting AWS CloudFormation Resource (AWS::ApiGateway::Stage.MethodSetting)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-methodsetting.html
+type Stage_MethodSetting struct {
+
+	// CacheDataEncrypted AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-cachedataencrypted
+	CacheDataEncrypted *types.Value `json:"CacheDataEncrypted,omitempty"`
+
+	// CacheTtlInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-cachettlinseconds
+	CacheTtlInSeconds *types.Value `json:"CacheTtlInSeconds,omitempty"`
+
+	// CachingEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-cachingenabled
+	CachingEnabled *types.Value `json:"CachingEnabled,omitempty"`
+
+	// DataTraceEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-datatraceenabled
+	DataTraceEnabled *types.Value `json:"DataTraceEnabled,omitempty"`
+
+	// HttpMethod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-httpmethod
+	HttpMethod *types.Value `json:"HttpMethod,omitempty"`
+
+	// LoggingLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-logginglevel
+	LoggingLevel *types.Value `json:"LoggingLevel,omitempty"`
+
+	// MetricsEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-metricsenabled
+	MetricsEnabled *types.Value `json:"MetricsEnabled,omitempty"`
+
+	// ResourcePath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-resourcepath
+	ResourcePath *types.Value `json:"ResourcePath,omitempty"`
+
+	// ThrottlingBurstLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-throttlingburstlimit
+	ThrottlingBurstLimit *types.Value `json:"ThrottlingBurstLimit,omitempty"`
+
+	// ThrottlingRateLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-methodsetting.html#cfn-apigateway-stage-methodsetting-throttlingratelimit
+	ThrottlingRateLimit *types.Value `json:"ThrottlingRateLimit,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_MethodSetting) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::Stage.MethodSetting"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-usageplan.go b/goformation/cloudformation/apigateway/aws-apigateway-usageplan.go
new file mode 100644
index 0000000000..837eb79e42
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-usageplan.go
@@ -0,0 +1,134 @@
+package apigateway
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// UsagePlan AWS CloudFormation Resource (AWS::ApiGateway::UsagePlan)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplan.html
+type UsagePlan struct {
+
+	// ApiStages AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplan.html#cfn-apigateway-usageplan-apistages
+	ApiStages []UsagePlan_ApiStage `json:"ApiStages,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplan.html#cfn-apigateway-usageplan-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Quota AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplan.html#cfn-apigateway-usageplan-quota
+	Quota *UsagePlan_QuotaSettings `json:"Quota,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplan.html#cfn-apigateway-usageplan-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Throttle AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplan.html#cfn-apigateway-usageplan-throttle
+	Throttle *UsagePlan_ThrottleSettings `json:"Throttle,omitempty"`
+
+	// UsagePlanName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplan.html#cfn-apigateway-usageplan-usageplanname
+	UsagePlanName *types.Value `json:"UsagePlanName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UsagePlan) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::UsagePlan"
+}
+
+// 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 UsagePlan) MarshalJSON() ([]byte, error) {
+	type Properties UsagePlan
+	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 *UsagePlan) UnmarshalJSON(b []byte) error {
+	type Properties UsagePlan
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = UsagePlan(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigateway/aws-apigateway-usageplan_apistage.go b/goformation/cloudformation/apigateway/aws-apigateway-usageplan_apistage.go
new file mode 100644
index 0000000000..abcfd65f61
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-usageplan_apistage.go
@@ -0,0 +1,47 @@
+package apigateway
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UsagePlan_ApiStage AWS CloudFormation Resource (AWS::ApiGateway::UsagePlan.ApiStage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-apistage.html
+type UsagePlan_ApiStage struct {
+
+	// ApiId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-apistage.html#cfn-apigateway-usageplan-apistage-apiid
+	ApiId *types.Value `json:"ApiId,omitempty"`
+
+	// Stage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-apistage.html#cfn-apigateway-usageplan-apistage-stage
+	Stage *types.Value `json:"Stage,omitempty"`
+
+	// Throttle AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-apistage.html#cfn-apigateway-usageplan-apistage-throttle
+	Throttle map[string]UsagePlan_ThrottleSettings `json:"Throttle,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UsagePlan_ApiStage) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::UsagePlan.ApiStage"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-usageplan_quotasettings.go b/goformation/cloudformation/apigateway/aws-apigateway-usageplan_quotasettings.go
new file mode 100644
index 0000000000..fd327d0e42
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-usageplan_quotasettings.go
@@ -0,0 +1,47 @@
+package apigateway
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UsagePlan_QuotaSettings AWS CloudFormation Resource (AWS::ApiGateway::UsagePlan.QuotaSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-quotasettings.html
+type UsagePlan_QuotaSettings struct {
+
+	// Limit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-quotasettings.html#cfn-apigateway-usageplan-quotasettings-limit
+	Limit *types.Value `json:"Limit,omitempty"`
+
+	// Offset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-quotasettings.html#cfn-apigateway-usageplan-quotasettings-offset
+	Offset *types.Value `json:"Offset,omitempty"`
+
+	// Period AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-quotasettings.html#cfn-apigateway-usageplan-quotasettings-period
+	Period *types.Value `json:"Period,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UsagePlan_QuotaSettings) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::UsagePlan.QuotaSettings"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-usageplan_throttlesettings.go b/goformation/cloudformation/apigateway/aws-apigateway-usageplan_throttlesettings.go
new file mode 100644
index 0000000000..d01037be52
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-usageplan_throttlesettings.go
@@ -0,0 +1,42 @@
+package apigateway
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UsagePlan_ThrottleSettings AWS CloudFormation Resource (AWS::ApiGateway::UsagePlan.ThrottleSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-throttlesettings.html
+type UsagePlan_ThrottleSettings struct {
+
+	// BurstLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-throttlesettings.html#cfn-apigateway-usageplan-throttlesettings-burstlimit
+	BurstLimit *types.Value `json:"BurstLimit,omitempty"`
+
+	// RateLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-usageplan-throttlesettings.html#cfn-apigateway-usageplan-throttlesettings-ratelimit
+	RateLimit *types.Value `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 *UsagePlan_ThrottleSettings) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::UsagePlan.ThrottleSettings"
+}
diff --git a/goformation/cloudformation/apigateway/aws-apigateway-usageplankey.go b/goformation/cloudformation/apigateway/aws-apigateway-usageplankey.go
new file mode 100644
index 0000000000..bb82d4bc9d
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-usageplankey.go
@@ -0,0 +1,118 @@
+package apigateway
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UsagePlanKey AWS CloudFormation Resource (AWS::ApiGateway::UsagePlanKey)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplankey.html
+type UsagePlanKey struct {
+
+	// KeyId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplankey.html#cfn-apigateway-usageplankey-keyid
+	KeyId *types.Value `json:"KeyId,omitempty"`
+
+	// KeyType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplankey.html#cfn-apigateway-usageplankey-keytype
+	KeyType *types.Value `json:"KeyType,omitempty"`
+
+	// UsagePlanId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-usageplankey.html#cfn-apigateway-usageplankey-usageplanid
+	UsagePlanId *types.Value `json:"UsagePlanId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UsagePlanKey) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::UsagePlanKey"
+}
+
+// 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 UsagePlanKey) MarshalJSON() ([]byte, error) {
+	type Properties UsagePlanKey
+	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 *UsagePlanKey) UnmarshalJSON(b []byte) error {
+	type Properties UsagePlanKey
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = UsagePlanKey(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigateway/aws-apigateway-vpclink.go b/goformation/cloudformation/apigateway/aws-apigateway-vpclink.go
new file mode 100644
index 0000000000..263fb492d5
--- /dev/null
+++ b/goformation/cloudformation/apigateway/aws-apigateway-vpclink.go
@@ -0,0 +1,124 @@
+package apigateway
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// VpcLink AWS CloudFormation Resource (AWS::ApiGateway::VpcLink)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-vpclink.html
+type VpcLink struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-vpclink.html#cfn-apigateway-vpclink-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-vpclink.html#cfn-apigateway-vpclink-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-vpclink.html#cfn-apigateway-vpclink-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TargetArns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigateway-vpclink.html#cfn-apigateway-vpclink-targetarns
+	TargetArns *types.Value `json:"TargetArns,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VpcLink) AWSCloudFormationType() string {
+	return "AWS::ApiGateway::VpcLink"
+}
+
+// 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 VpcLink) MarshalJSON() ([]byte, error) {
+	type Properties VpcLink
+	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 *VpcLink) UnmarshalJSON(b []byte) error {
+	type Properties VpcLink
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VpcLink(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api.go
new file mode 100644
index 0000000000..896a22f521
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api.go
@@ -0,0 +1,188 @@
+package apigatewayv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Api AWS CloudFormation Resource (AWS::ApiGatewayV2::Api)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-api.html
+type Api struct {
+
+	// ApiKeySelectionExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-api.html#cfn-apigatewayv2-api-apikeyselectionexpression
+	ApiKeySelectionExpression *types.Value `json:"ApiKeySelectionExpression,omitempty"`
+
+	// BasePath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-api.html#cfn-apigatewayv2-api-basepath
+	BasePath *types.Value `json:"BasePath,omitempty"`
+
+	// Body AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-api.html#cfn-apigatewayv2-api-body
+	Body interface{} `json:"Body,omitempty"`
+
+	// BodyS3Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-api.html#cfn-apigatewayv2-api-bodys3location
+	BodyS3Location *Api_BodyS3Location `json:"BodyS3Location,omitempty"`
+
+	// CorsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-api.html#cfn-apigatewayv2-api-corsconfiguration
+	CorsConfiguration *Api_Cors `json:"CorsConfiguration,omitempty"`
+
+	// CredentialsArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-api.html#cfn-apigatewayv2-api-credentialsarn
+	CredentialsArn *types.Value `json:"CredentialsArn,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-api.html#cfn-apigatewayv2-api-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DisableExecuteApiEndpoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-api.html#cfn-apigatewayv2-api-disableexecuteapiendpoint
+	DisableExecuteApiEndpoint *types.Value `json:"DisableExecuteApiEndpoint,omitempty"`
+
+	// DisableSchemaValidation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-api.html#cfn-apigatewayv2-api-disableschemavalidation
+	DisableSchemaValidation *types.Value `json:"DisableSchemaValidation,omitempty"`
+
+	// FailOnWarnings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-api.html#cfn-apigatewayv2-api-failonwarnings
+	FailOnWarnings *types.Value `json:"FailOnWarnings,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-api.html#cfn-apigatewayv2-api-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ProtocolType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-api.html#cfn-apigatewayv2-api-protocoltype
+	ProtocolType *types.Value `json:"ProtocolType,omitempty"`
+
+	// RouteKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-api.html#cfn-apigatewayv2-api-routekey
+	RouteKey *types.Value `json:"RouteKey,omitempty"`
+
+	// RouteSelectionExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-api.html#cfn-apigatewayv2-api-routeselectionexpression
+	RouteSelectionExpression *types.Value `json:"RouteSelectionExpression,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-api.html#cfn-apigatewayv2-api-tags
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// Target AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-api.html#cfn-apigatewayv2-api-target
+	Target *types.Value `json:"Target,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-api.html#cfn-apigatewayv2-api-version
+	Version *types.Value `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 *Api) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::Api"
+}
+
+// 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 Api) MarshalJSON() ([]byte, error) {
+	type Properties Api
+	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 *Api) UnmarshalJSON(b []byte) error {
+	type Properties Api
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Api(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api_bodys3location.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api_bodys3location.go
new file mode 100644
index 0000000000..46406a3d06
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api_bodys3location.go
@@ -0,0 +1,52 @@
+package apigatewayv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Api_BodyS3Location AWS CloudFormation Resource (AWS::ApiGatewayV2::Api.BodyS3Location)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-api-bodys3location.html
+type Api_BodyS3Location struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-api-bodys3location.html#cfn-apigatewayv2-api-bodys3location-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Etag AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-api-bodys3location.html#cfn-apigatewayv2-api-bodys3location-etag
+	Etag *types.Value `json:"Etag,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-api-bodys3location.html#cfn-apigatewayv2-api-bodys3location-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-api-bodys3location.html#cfn-apigatewayv2-api-bodys3location-version
+	Version *types.Value `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 *Api_BodyS3Location) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::Api.BodyS3Location"
+}
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api_cors.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api_cors.go
new file mode 100644
index 0000000000..cfb0b66984
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-api_cors.go
@@ -0,0 +1,62 @@
+package apigatewayv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Api_Cors AWS CloudFormation Resource (AWS::ApiGatewayV2::Api.Cors)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-api-cors.html
+type Api_Cors struct {
+
+	// AllowCredentials AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-api-cors.html#cfn-apigatewayv2-api-cors-allowcredentials
+	AllowCredentials *types.Value `json:"AllowCredentials,omitempty"`
+
+	// AllowHeaders AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-api-cors.html#cfn-apigatewayv2-api-cors-allowheaders
+	AllowHeaders *types.Value `json:"AllowHeaders,omitempty"`
+
+	// AllowMethods AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-api-cors.html#cfn-apigatewayv2-api-cors-allowmethods
+	AllowMethods *types.Value `json:"AllowMethods,omitempty"`
+
+	// AllowOrigins AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-api-cors.html#cfn-apigatewayv2-api-cors-alloworigins
+	AllowOrigins *types.Value `json:"AllowOrigins,omitempty"`
+
+	// ExposeHeaders AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-api-cors.html#cfn-apigatewayv2-api-cors-exposeheaders
+	ExposeHeaders *types.Value `json:"ExposeHeaders,omitempty"`
+
+	// MaxAge AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-api-cors.html#cfn-apigatewayv2-api-cors-maxage
+	MaxAge *types.Value `json:"MaxAge,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Api_Cors) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::Api.Cors"
+}
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides.go
new file mode 100644
index 0000000000..a72b990b6d
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides.go
@@ -0,0 +1,123 @@
+package apigatewayv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApiGatewayManagedOverrides AWS CloudFormation Resource (AWS::ApiGatewayV2::ApiGatewayManagedOverrides)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-apigatewaymanagedoverrides.html
+type ApiGatewayManagedOverrides struct {
+
+	// ApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-apigatewaymanagedoverrides.html#cfn-apigatewayv2-apigatewaymanagedoverrides-apiid
+	ApiId *types.Value `json:"ApiId,omitempty"`
+
+	// Integration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-apigatewaymanagedoverrides.html#cfn-apigatewayv2-apigatewaymanagedoverrides-integration
+	Integration *ApiGatewayManagedOverrides_IntegrationOverrides `json:"Integration,omitempty"`
+
+	// Route AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-apigatewaymanagedoverrides.html#cfn-apigatewayv2-apigatewaymanagedoverrides-route
+	Route *ApiGatewayManagedOverrides_RouteOverrides `json:"Route,omitempty"`
+
+	// Stage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-apigatewaymanagedoverrides.html#cfn-apigatewayv2-apigatewaymanagedoverrides-stage
+	Stage *ApiGatewayManagedOverrides_StageOverrides `json:"Stage,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApiGatewayManagedOverrides) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::ApiGatewayManagedOverrides"
+}
+
+// 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 ApiGatewayManagedOverrides) MarshalJSON() ([]byte, error) {
+	type Properties ApiGatewayManagedOverrides
+	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 *ApiGatewayManagedOverrides) UnmarshalJSON(b []byte) error {
+	type Properties ApiGatewayManagedOverrides
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ApiGatewayManagedOverrides(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_accesslogsettings.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_accesslogsettings.go
new file mode 100644
index 0000000000..f3197aa3c6
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_accesslogsettings.go
@@ -0,0 +1,42 @@
+package apigatewayv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApiGatewayManagedOverrides_AccessLogSettings AWS CloudFormation Resource (AWS::ApiGatewayV2::ApiGatewayManagedOverrides.AccessLogSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-accesslogsettings.html
+type ApiGatewayManagedOverrides_AccessLogSettings struct {
+
+	// DestinationArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-accesslogsettings.html#cfn-apigatewayv2-apigatewaymanagedoverrides-accesslogsettings-destinationarn
+	DestinationArn *types.Value `json:"DestinationArn,omitempty"`
+
+	// Format AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-accesslogsettings.html#cfn-apigatewayv2-apigatewaymanagedoverrides-accesslogsettings-format
+	Format *types.Value `json:"Format,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApiGatewayManagedOverrides_AccessLogSettings) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.AccessLogSettings"
+}
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_integrationoverrides.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_integrationoverrides.go
new file mode 100644
index 0000000000..38adbdb9c2
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_integrationoverrides.go
@@ -0,0 +1,52 @@
+package apigatewayv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApiGatewayManagedOverrides_IntegrationOverrides AWS CloudFormation Resource (AWS::ApiGatewayV2::ApiGatewayManagedOverrides.IntegrationOverrides)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-integrationoverrides.html
+type ApiGatewayManagedOverrides_IntegrationOverrides struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-integrationoverrides.html#cfn-apigatewayv2-apigatewaymanagedoverrides-integrationoverrides-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// IntegrationMethod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-integrationoverrides.html#cfn-apigatewayv2-apigatewaymanagedoverrides-integrationoverrides-integrationmethod
+	IntegrationMethod *types.Value `json:"IntegrationMethod,omitempty"`
+
+	// PayloadFormatVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-integrationoverrides.html#cfn-apigatewayv2-apigatewaymanagedoverrides-integrationoverrides-payloadformatversion
+	PayloadFormatVersion *types.Value `json:"PayloadFormatVersion,omitempty"`
+
+	// TimeoutInMillis AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-integrationoverrides.html#cfn-apigatewayv2-apigatewaymanagedoverrides-integrationoverrides-timeoutinmillis
+	TimeoutInMillis *types.Value `json:"TimeoutInMillis,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApiGatewayManagedOverrides_IntegrationOverrides) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.IntegrationOverrides"
+}
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routeoverrides.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routeoverrides.go
new file mode 100644
index 0000000000..b2826b569e
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routeoverrides.go
@@ -0,0 +1,57 @@
+package apigatewayv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApiGatewayManagedOverrides_RouteOverrides AWS CloudFormation Resource (AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteOverrides)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-routeoverrides.html
+type ApiGatewayManagedOverrides_RouteOverrides struct {
+
+	// AuthorizationScopes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-routeoverrides.html#cfn-apigatewayv2-apigatewaymanagedoverrides-routeoverrides-authorizationscopes
+	AuthorizationScopes *types.Value `json:"AuthorizationScopes,omitempty"`
+
+	// AuthorizationType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-routeoverrides.html#cfn-apigatewayv2-apigatewaymanagedoverrides-routeoverrides-authorizationtype
+	AuthorizationType *types.Value `json:"AuthorizationType,omitempty"`
+
+	// AuthorizerId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-routeoverrides.html#cfn-apigatewayv2-apigatewaymanagedoverrides-routeoverrides-authorizerid
+	AuthorizerId *types.Value `json:"AuthorizerId,omitempty"`
+
+	// OperationName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-routeoverrides.html#cfn-apigatewayv2-apigatewaymanagedoverrides-routeoverrides-operationname
+	OperationName *types.Value `json:"OperationName,omitempty"`
+
+	// Target AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-routeoverrides.html#cfn-apigatewayv2-apigatewaymanagedoverrides-routeoverrides-target
+	Target *types.Value `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 *ApiGatewayManagedOverrides_RouteOverrides) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteOverrides"
+}
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routesettings.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routesettings.go
new file mode 100644
index 0000000000..537a3e3c65
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_routesettings.go
@@ -0,0 +1,57 @@
+package apigatewayv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApiGatewayManagedOverrides_RouteSettings AWS CloudFormation Resource (AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-routesettings.html
+type ApiGatewayManagedOverrides_RouteSettings struct {
+
+	// DataTraceEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-routesettings.html#cfn-apigatewayv2-apigatewaymanagedoverrides-routesettings-datatraceenabled
+	DataTraceEnabled *types.Value `json:"DataTraceEnabled,omitempty"`
+
+	// DetailedMetricsEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-routesettings.html#cfn-apigatewayv2-apigatewaymanagedoverrides-routesettings-detailedmetricsenabled
+	DetailedMetricsEnabled *types.Value `json:"DetailedMetricsEnabled,omitempty"`
+
+	// LoggingLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-routesettings.html#cfn-apigatewayv2-apigatewaymanagedoverrides-routesettings-logginglevel
+	LoggingLevel *types.Value `json:"LoggingLevel,omitempty"`
+
+	// ThrottlingBurstLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-routesettings.html#cfn-apigatewayv2-apigatewaymanagedoverrides-routesettings-throttlingburstlimit
+	ThrottlingBurstLimit *types.Value `json:"ThrottlingBurstLimit,omitempty"`
+
+	// ThrottlingRateLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-routesettings.html#cfn-apigatewayv2-apigatewaymanagedoverrides-routesettings-throttlingratelimit
+	ThrottlingRateLimit *types.Value `json:"ThrottlingRateLimit,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApiGatewayManagedOverrides_RouteSettings) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteSettings"
+}
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_stageoverrides.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_stageoverrides.go
new file mode 100644
index 0000000000..44eac13283
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apigatewaymanagedoverrides_stageoverrides.go
@@ -0,0 +1,62 @@
+package apigatewayv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApiGatewayManagedOverrides_StageOverrides AWS CloudFormation Resource (AWS::ApiGatewayV2::ApiGatewayManagedOverrides.StageOverrides)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-stageoverrides.html
+type ApiGatewayManagedOverrides_StageOverrides struct {
+
+	// AccessLogSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-stageoverrides.html#cfn-apigatewayv2-apigatewaymanagedoverrides-stageoverrides-accesslogsettings
+	AccessLogSettings *ApiGatewayManagedOverrides_AccessLogSettings `json:"AccessLogSettings,omitempty"`
+
+	// AutoDeploy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-stageoverrides.html#cfn-apigatewayv2-apigatewaymanagedoverrides-stageoverrides-autodeploy
+	AutoDeploy *types.Value `json:"AutoDeploy,omitempty"`
+
+	// DefaultRouteSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-stageoverrides.html#cfn-apigatewayv2-apigatewaymanagedoverrides-stageoverrides-defaultroutesettings
+	DefaultRouteSettings *ApiGatewayManagedOverrides_RouteSettings `json:"DefaultRouteSettings,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-stageoverrides.html#cfn-apigatewayv2-apigatewaymanagedoverrides-stageoverrides-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// RouteSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-stageoverrides.html#cfn-apigatewayv2-apigatewaymanagedoverrides-stageoverrides-routesettings
+	RouteSettings interface{} `json:"RouteSettings,omitempty"`
+
+	// StageVariables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-apigatewaymanagedoverrides-stageoverrides.html#cfn-apigatewayv2-apigatewaymanagedoverrides-stageoverrides-stagevariables
+	StageVariables interface{} `json:"StageVariables,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApiGatewayManagedOverrides_StageOverrides) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.StageOverrides"
+}
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apimapping.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apimapping.go
new file mode 100644
index 0000000000..139d140b72
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-apimapping.go
@@ -0,0 +1,123 @@
+package apigatewayv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApiMapping AWS CloudFormation Resource (AWS::ApiGatewayV2::ApiMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-apimapping.html
+type ApiMapping struct {
+
+	// ApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-apimapping.html#cfn-apigatewayv2-apimapping-apiid
+	ApiId *types.Value `json:"ApiId,omitempty"`
+
+	// ApiMappingKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-apimapping.html#cfn-apigatewayv2-apimapping-apimappingkey
+	ApiMappingKey *types.Value `json:"ApiMappingKey,omitempty"`
+
+	// DomainName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-apimapping.html#cfn-apigatewayv2-apimapping-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// Stage AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-apimapping.html#cfn-apigatewayv2-apimapping-stage
+	Stage *types.Value `json:"Stage,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApiMapping) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::ApiMapping"
+}
+
+// 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 ApiMapping) MarshalJSON() ([]byte, error) {
+	type Properties ApiMapping
+	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 *ApiMapping) UnmarshalJSON(b []byte) error {
+	type Properties ApiMapping
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ApiMapping(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer.go
new file mode 100644
index 0000000000..662d89cd1e
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer.go
@@ -0,0 +1,158 @@
+package apigatewayv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Authorizer AWS CloudFormation Resource (AWS::ApiGatewayV2::Authorizer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-authorizer.html
+type Authorizer struct {
+
+	// ApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-authorizer.html#cfn-apigatewayv2-authorizer-apiid
+	ApiId *types.Value `json:"ApiId,omitempty"`
+
+	// AuthorizerCredentialsArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-authorizer.html#cfn-apigatewayv2-authorizer-authorizercredentialsarn
+	AuthorizerCredentialsArn *types.Value `json:"AuthorizerCredentialsArn,omitempty"`
+
+	// AuthorizerPayloadFormatVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-authorizer.html#cfn-apigatewayv2-authorizer-authorizerpayloadformatversion
+	AuthorizerPayloadFormatVersion *types.Value `json:"AuthorizerPayloadFormatVersion,omitempty"`
+
+	// AuthorizerResultTtlInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-authorizer.html#cfn-apigatewayv2-authorizer-authorizerresultttlinseconds
+	AuthorizerResultTtlInSeconds *types.Value `json:"AuthorizerResultTtlInSeconds,omitempty"`
+
+	// AuthorizerType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-authorizer.html#cfn-apigatewayv2-authorizer-authorizertype
+	AuthorizerType *types.Value `json:"AuthorizerType,omitempty"`
+
+	// AuthorizerUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-authorizer.html#cfn-apigatewayv2-authorizer-authorizeruri
+	AuthorizerUri *types.Value `json:"AuthorizerUri,omitempty"`
+
+	// EnableSimpleResponses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-authorizer.html#cfn-apigatewayv2-authorizer-enablesimpleresponses
+	EnableSimpleResponses *types.Value `json:"EnableSimpleResponses,omitempty"`
+
+	// IdentitySource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-authorizer.html#cfn-apigatewayv2-authorizer-identitysource
+	IdentitySource *types.Value `json:"IdentitySource,omitempty"`
+
+	// IdentityValidationExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-authorizer.html#cfn-apigatewayv2-authorizer-identityvalidationexpression
+	IdentityValidationExpression *types.Value `json:"IdentityValidationExpression,omitempty"`
+
+	// JwtConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-authorizer.html#cfn-apigatewayv2-authorizer-jwtconfiguration
+	JwtConfiguration *Authorizer_JWTConfiguration `json:"JwtConfiguration,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-authorizer.html#cfn-apigatewayv2-authorizer-name
+	Name *types.Value `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 *Authorizer) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::Authorizer"
+}
+
+// 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 Authorizer) MarshalJSON() ([]byte, error) {
+	type Properties Authorizer
+	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 *Authorizer) UnmarshalJSON(b []byte) error {
+	type Properties Authorizer
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Authorizer(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer_jwtconfiguration.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer_jwtconfiguration.go
new file mode 100644
index 0000000000..24da4e5e0a
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-authorizer_jwtconfiguration.go
@@ -0,0 +1,42 @@
+package apigatewayv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Authorizer_JWTConfiguration AWS CloudFormation Resource (AWS::ApiGatewayV2::Authorizer.JWTConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-authorizer-jwtconfiguration.html
+type Authorizer_JWTConfiguration struct {
+
+	// Audience AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-authorizer-jwtconfiguration.html#cfn-apigatewayv2-authorizer-jwtconfiguration-audience
+	Audience *types.Value `json:"Audience,omitempty"`
+
+	// Issuer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-authorizer-jwtconfiguration.html#cfn-apigatewayv2-authorizer-jwtconfiguration-issuer
+	Issuer *types.Value `json:"Issuer,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Authorizer_JWTConfiguration) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::Authorizer.JWTConfiguration"
+}
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-deployment.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-deployment.go
new file mode 100644
index 0000000000..011097c0cb
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-deployment.go
@@ -0,0 +1,118 @@
+package apigatewayv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Deployment AWS CloudFormation Resource (AWS::ApiGatewayV2::Deployment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-deployment.html
+type Deployment struct {
+
+	// ApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-deployment.html#cfn-apigatewayv2-deployment-apiid
+	ApiId *types.Value `json:"ApiId,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-deployment.html#cfn-apigatewayv2-deployment-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// StageName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-deployment.html#cfn-apigatewayv2-deployment-stagename
+	StageName *types.Value `json:"StageName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::ApiGatewayV2::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname.go
new file mode 100644
index 0000000000..59fe256a67
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname.go
@@ -0,0 +1,123 @@
+package apigatewayv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DomainName AWS CloudFormation Resource (AWS::ApiGatewayV2::DomainName)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-domainname.html
+type DomainName struct {
+
+	// DomainName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-domainname.html#cfn-apigatewayv2-domainname-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// DomainNameConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-domainname.html#cfn-apigatewayv2-domainname-domainnameconfigurations
+	DomainNameConfigurations []DomainName_DomainNameConfiguration `json:"DomainNameConfigurations,omitempty"`
+
+	// MutualTlsAuthentication AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-domainname.html#cfn-apigatewayv2-domainname-mutualtlsauthentication
+	MutualTlsAuthentication *DomainName_MutualTlsAuthentication `json:"MutualTlsAuthentication,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-domainname.html#cfn-apigatewayv2-domainname-tags
+	Tags interface{} `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 *DomainName) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::DomainName"
+}
+
+// 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 DomainName) MarshalJSON() ([]byte, error) {
+	type Properties DomainName
+	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 *DomainName) UnmarshalJSON(b []byte) error {
+	type Properties DomainName
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DomainName(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_domainnameconfiguration.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_domainnameconfiguration.go
new file mode 100644
index 0000000000..4f2aaeffff
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_domainnameconfiguration.go
@@ -0,0 +1,57 @@
+package apigatewayv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DomainName_DomainNameConfiguration AWS CloudFormation Resource (AWS::ApiGatewayV2::DomainName.DomainNameConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-domainname-domainnameconfiguration.html
+type DomainName_DomainNameConfiguration struct {
+
+	// CertificateArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-domainname-domainnameconfiguration.html#cfn-apigatewayv2-domainname-domainnameconfiguration-certificatearn
+	CertificateArn *types.Value `json:"CertificateArn,omitempty"`
+
+	// CertificateName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-domainname-domainnameconfiguration.html#cfn-apigatewayv2-domainname-domainnameconfiguration-certificatename
+	CertificateName *types.Value `json:"CertificateName,omitempty"`
+
+	// EndpointType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-domainname-domainnameconfiguration.html#cfn-apigatewayv2-domainname-domainnameconfiguration-endpointtype
+	EndpointType *types.Value `json:"EndpointType,omitempty"`
+
+	// OwnershipVerificationCertificateArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-domainname-domainnameconfiguration.html#cfn-apigatewayv2-domainname-domainnameconfiguration-ownershipverificationcertificatearn
+	OwnershipVerificationCertificateArn *types.Value `json:"OwnershipVerificationCertificateArn,omitempty"`
+
+	// SecurityPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-domainname-domainnameconfiguration.html#cfn-apigatewayv2-domainname-domainnameconfiguration-securitypolicy
+	SecurityPolicy *types.Value `json:"SecurityPolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DomainName_DomainNameConfiguration) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::DomainName.DomainNameConfiguration"
+}
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_mutualtlsauthentication.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_mutualtlsauthentication.go
new file mode 100644
index 0000000000..8d895a9854
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-domainname_mutualtlsauthentication.go
@@ -0,0 +1,42 @@
+package apigatewayv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DomainName_MutualTlsAuthentication AWS CloudFormation Resource (AWS::ApiGatewayV2::DomainName.MutualTlsAuthentication)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-domainname-mutualtlsauthentication.html
+type DomainName_MutualTlsAuthentication struct {
+
+	// TruststoreUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-domainname-mutualtlsauthentication.html#cfn-apigatewayv2-domainname-mutualtlsauthentication-truststoreuri
+	TruststoreUri *types.Value `json:"TruststoreUri,omitempty"`
+
+	// TruststoreVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-domainname-mutualtlsauthentication.html#cfn-apigatewayv2-domainname-mutualtlsauthentication-truststoreversion
+	TruststoreVersion *types.Value `json:"TruststoreVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DomainName_MutualTlsAuthentication) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::DomainName.MutualTlsAuthentication"
+}
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration.go
new file mode 100644
index 0000000000..2aa8603ab4
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration.go
@@ -0,0 +1,193 @@
+package apigatewayv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Integration AWS CloudFormation Resource (AWS::ApiGatewayV2::Integration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html
+type Integration struct {
+
+	// ApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html#cfn-apigatewayv2-integration-apiid
+	ApiId *types.Value `json:"ApiId,omitempty"`
+
+	// ConnectionId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html#cfn-apigatewayv2-integration-connectionid
+	ConnectionId *types.Value `json:"ConnectionId,omitempty"`
+
+	// ConnectionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html#cfn-apigatewayv2-integration-connectiontype
+	ConnectionType *types.Value `json:"ConnectionType,omitempty"`
+
+	// ContentHandlingStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html#cfn-apigatewayv2-integration-contenthandlingstrategy
+	ContentHandlingStrategy *types.Value `json:"ContentHandlingStrategy,omitempty"`
+
+	// CredentialsArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html#cfn-apigatewayv2-integration-credentialsarn
+	CredentialsArn *types.Value `json:"CredentialsArn,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html#cfn-apigatewayv2-integration-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// IntegrationMethod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html#cfn-apigatewayv2-integration-integrationmethod
+	IntegrationMethod *types.Value `json:"IntegrationMethod,omitempty"`
+
+	// IntegrationSubtype AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html#cfn-apigatewayv2-integration-integrationsubtype
+	IntegrationSubtype *types.Value `json:"IntegrationSubtype,omitempty"`
+
+	// IntegrationType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html#cfn-apigatewayv2-integration-integrationtype
+	IntegrationType *types.Value `json:"IntegrationType,omitempty"`
+
+	// IntegrationUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html#cfn-apigatewayv2-integration-integrationuri
+	IntegrationUri *types.Value `json:"IntegrationUri,omitempty"`
+
+	// PassthroughBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html#cfn-apigatewayv2-integration-passthroughbehavior
+	PassthroughBehavior *types.Value `json:"PassthroughBehavior,omitempty"`
+
+	// PayloadFormatVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html#cfn-apigatewayv2-integration-payloadformatversion
+	PayloadFormatVersion *types.Value `json:"PayloadFormatVersion,omitempty"`
+
+	// 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"`
+
+	// 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"`
+
+	// 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"`
+
+	// TemplateSelectionExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html#cfn-apigatewayv2-integration-templateselectionexpression
+	TemplateSelectionExpression *types.Value `json:"TemplateSelectionExpression,omitempty"`
+
+	// TimeoutInMillis AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html#cfn-apigatewayv2-integration-timeoutinmillis
+	TimeoutInMillis *types.Value `json:"TimeoutInMillis,omitempty"`
+
+	// TlsConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integration.html#cfn-apigatewayv2-integration-tlsconfig
+	TlsConfig *Integration_TlsConfig `json:"TlsConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::Integration"
+}
+
+// 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 Integration) MarshalJSON() ([]byte, error) {
+	type Properties Integration
+	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 *Integration) UnmarshalJSON(b []byte) error {
+	type Properties Integration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Integration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameter.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameter.go
new file mode 100644
index 0000000000..a82abe4dae
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameter.go
@@ -0,0 +1,42 @@
+package apigatewayv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Integration_ResponseParameter AWS CloudFormation Resource (AWS::ApiGatewayV2::Integration.ResponseParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-integration-responseparameter.html
+type Integration_ResponseParameter struct {
+
+	// Destination AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-integration-responseparameter.html#cfn-apigatewayv2-integration-responseparameter-destination
+	Destination *types.Value `json:"Destination,omitempty"`
+
+	// Source AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-integration-responseparameter.html#cfn-apigatewayv2-integration-responseparameter-source
+	Source *types.Value `json:"Source,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ResponseParameter) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::Integration.ResponseParameter"
+}
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameterlist.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameterlist.go
new file mode 100644
index 0000000000..cdbe818ceb
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_responseparameterlist.go
@@ -0,0 +1,35 @@
+package apigatewayv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Integration_ResponseParameterList AWS CloudFormation Resource (AWS::ApiGatewayV2::Integration.ResponseParameterList)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-integration-responseparameterlist.html
+type Integration_ResponseParameterList struct {
+
+	// ResponseParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-integration-responseparameterlist.html#cfn-apigatewayv2-integration-responseparameterlist-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_ResponseParameterList) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::Integration.ResponseParameterList"
+}
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_tlsconfig.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_tlsconfig.go
new file mode 100644
index 0000000000..7f9d638c27
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integration_tlsconfig.go
@@ -0,0 +1,37 @@
+package apigatewayv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Integration_TlsConfig AWS CloudFormation Resource (AWS::ApiGatewayV2::Integration.TlsConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-integration-tlsconfig.html
+type Integration_TlsConfig struct {
+
+	// ServerNameToVerify AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-integration-tlsconfig.html#cfn-apigatewayv2-integration-tlsconfig-servernametoverify
+	ServerNameToVerify *types.Value `json:"ServerNameToVerify,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TlsConfig) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::Integration.TlsConfig"
+}
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integrationresponse.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integrationresponse.go
new file mode 100644
index 0000000000..e88bab5ba0
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-integrationresponse.go
@@ -0,0 +1,138 @@
+package apigatewayv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// IntegrationResponse AWS CloudFormation Resource (AWS::ApiGatewayV2::IntegrationResponse)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integrationresponse.html
+type IntegrationResponse struct {
+
+	// ApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integrationresponse.html#cfn-apigatewayv2-integrationresponse-apiid
+	ApiId *types.Value `json:"ApiId,omitempty"`
+
+	// ContentHandlingStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integrationresponse.html#cfn-apigatewayv2-integrationresponse-contenthandlingstrategy
+	ContentHandlingStrategy *types.Value `json:"ContentHandlingStrategy,omitempty"`
+
+	// IntegrationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integrationresponse.html#cfn-apigatewayv2-integrationresponse-integrationid
+	IntegrationId *types.Value `json:"IntegrationId,omitempty"`
+
+	// IntegrationResponseKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integrationresponse.html#cfn-apigatewayv2-integrationresponse-integrationresponsekey
+	IntegrationResponseKey *types.Value `json:"IntegrationResponseKey,omitempty"`
+
+	// ResponseParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integrationresponse.html#cfn-apigatewayv2-integrationresponse-responseparameters
+	ResponseParameters interface{} `json:"ResponseParameters,omitempty"`
+
+	// ResponseTemplates AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integrationresponse.html#cfn-apigatewayv2-integrationresponse-responsetemplates
+	ResponseTemplates interface{} `json:"ResponseTemplates,omitempty"`
+
+	// TemplateSelectionExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-integrationresponse.html#cfn-apigatewayv2-integrationresponse-templateselectionexpression
+	TemplateSelectionExpression *types.Value `json:"TemplateSelectionExpression,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *IntegrationResponse) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::IntegrationResponse"
+}
+
+// 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 IntegrationResponse) MarshalJSON() ([]byte, error) {
+	type Properties IntegrationResponse
+	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 *IntegrationResponse) UnmarshalJSON(b []byte) error {
+	type Properties IntegrationResponse
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = IntegrationResponse(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-model.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-model.go
new file mode 100644
index 0000000000..96ebe8939d
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-model.go
@@ -0,0 +1,128 @@
+package apigatewayv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Model AWS CloudFormation Resource (AWS::ApiGatewayV2::Model)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-model.html
+type Model struct {
+
+	// ApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-model.html#cfn-apigatewayv2-model-apiid
+	ApiId *types.Value `json:"ApiId,omitempty"`
+
+	// ContentType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-model.html#cfn-apigatewayv2-model-contenttype
+	ContentType *types.Value `json:"ContentType,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-model.html#cfn-apigatewayv2-model-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-model.html#cfn-apigatewayv2-model-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Schema AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-model.html#cfn-apigatewayv2-model-schema
+	Schema interface{} `json:"Schema,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::Model"
+}
+
+// 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 Model) MarshalJSON() ([]byte, error) {
+	type Properties Model
+	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 *Model) UnmarshalJSON(b []byte) error {
+	type Properties Model
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Model(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-route.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-route.go
new file mode 100644
index 0000000000..e649acb45f
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-route.go
@@ -0,0 +1,163 @@
+package apigatewayv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route AWS CloudFormation Resource (AWS::ApiGatewayV2::Route)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-route.html
+type Route struct {
+
+	// ApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-route.html#cfn-apigatewayv2-route-apiid
+	ApiId *types.Value `json:"ApiId,omitempty"`
+
+	// ApiKeyRequired AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-route.html#cfn-apigatewayv2-route-apikeyrequired
+	ApiKeyRequired *types.Value `json:"ApiKeyRequired,omitempty"`
+
+	// AuthorizationScopes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-route.html#cfn-apigatewayv2-route-authorizationscopes
+	AuthorizationScopes *types.Value `json:"AuthorizationScopes,omitempty"`
+
+	// AuthorizationType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-route.html#cfn-apigatewayv2-route-authorizationtype
+	AuthorizationType *types.Value `json:"AuthorizationType,omitempty"`
+
+	// AuthorizerId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-route.html#cfn-apigatewayv2-route-authorizerid
+	AuthorizerId *types.Value `json:"AuthorizerId,omitempty"`
+
+	// ModelSelectionExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-route.html#cfn-apigatewayv2-route-modelselectionexpression
+	ModelSelectionExpression *types.Value `json:"ModelSelectionExpression,omitempty"`
+
+	// OperationName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-route.html#cfn-apigatewayv2-route-operationname
+	OperationName *types.Value `json:"OperationName,omitempty"`
+
+	// RequestModels AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-route.html#cfn-apigatewayv2-route-requestmodels
+	RequestModels interface{} `json:"RequestModels,omitempty"`
+
+	// RequestParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-route.html#cfn-apigatewayv2-route-requestparameters
+	RequestParameters interface{} `json:"RequestParameters,omitempty"`
+
+	// RouteKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-route.html#cfn-apigatewayv2-route-routekey
+	RouteKey *types.Value `json:"RouteKey,omitempty"`
+
+	// RouteResponseSelectionExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-route.html#cfn-apigatewayv2-route-routeresponseselectionexpression
+	RouteResponseSelectionExpression *types.Value `json:"RouteResponseSelectionExpression,omitempty"`
+
+	// Target AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-route.html#cfn-apigatewayv2-route-target
+	Target *types.Value `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 *Route) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::Route"
+}
+
+// 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 Route) MarshalJSON() ([]byte, error) {
+	type Properties Route
+	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 *Route) UnmarshalJSON(b []byte) error {
+	type Properties Route
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Route(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-route_parameterconstraints.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-route_parameterconstraints.go
new file mode 100644
index 0000000000..8dbbecd152
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-route_parameterconstraints.go
@@ -0,0 +1,37 @@
+package apigatewayv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_ParameterConstraints AWS CloudFormation Resource (AWS::ApiGatewayV2::Route.ParameterConstraints)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-route-parameterconstraints.html
+type Route_ParameterConstraints struct {
+
+	// Required AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-route-parameterconstraints.html#cfn-apigatewayv2-route-parameterconstraints-required
+	Required *types.Value `json:"Required"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_ParameterConstraints) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::Route.ParameterConstraints"
+}
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse.go
new file mode 100644
index 0000000000..5b49cfaeb7
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse.go
@@ -0,0 +1,133 @@
+package apigatewayv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RouteResponse AWS CloudFormation Resource (AWS::ApiGatewayV2::RouteResponse)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-routeresponse.html
+type RouteResponse struct {
+
+	// ApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-routeresponse.html#cfn-apigatewayv2-routeresponse-apiid
+	ApiId *types.Value `json:"ApiId,omitempty"`
+
+	// ModelSelectionExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-routeresponse.html#cfn-apigatewayv2-routeresponse-modelselectionexpression
+	ModelSelectionExpression *types.Value `json:"ModelSelectionExpression,omitempty"`
+
+	// ResponseModels AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-routeresponse.html#cfn-apigatewayv2-routeresponse-responsemodels
+	ResponseModels interface{} `json:"ResponseModels,omitempty"`
+
+	// ResponseParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-routeresponse.html#cfn-apigatewayv2-routeresponse-responseparameters
+	ResponseParameters interface{} `json:"ResponseParameters,omitempty"`
+
+	// RouteId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-routeresponse.html#cfn-apigatewayv2-routeresponse-routeid
+	RouteId *types.Value `json:"RouteId,omitempty"`
+
+	// RouteResponseKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-routeresponse.html#cfn-apigatewayv2-routeresponse-routeresponsekey
+	RouteResponseKey *types.Value `json:"RouteResponseKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RouteResponse) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::RouteResponse"
+}
+
+// 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 RouteResponse) MarshalJSON() ([]byte, error) {
+	type Properties RouteResponse
+	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 *RouteResponse) UnmarshalJSON(b []byte) error {
+	type Properties RouteResponse
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RouteResponse(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse_parameterconstraints.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse_parameterconstraints.go
new file mode 100644
index 0000000000..bb0cb97385
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-routeresponse_parameterconstraints.go
@@ -0,0 +1,37 @@
+package apigatewayv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RouteResponse_ParameterConstraints AWS CloudFormation Resource (AWS::ApiGatewayV2::RouteResponse.ParameterConstraints)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-routeresponse-parameterconstraints.html
+type RouteResponse_ParameterConstraints struct {
+
+	// Required AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-routeresponse-parameterconstraints.html#cfn-apigatewayv2-routeresponse-parameterconstraints-required
+	Required *types.Value `json:"Required"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RouteResponse_ParameterConstraints) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::RouteResponse.ParameterConstraints"
+}
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage.go
new file mode 100644
index 0000000000..d5ef630a06
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage.go
@@ -0,0 +1,163 @@
+package apigatewayv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stage AWS CloudFormation Resource (AWS::ApiGatewayV2::Stage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-stage.html
+type Stage struct {
+
+	// AccessLogSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-stage.html#cfn-apigatewayv2-stage-accesslogsettings
+	AccessLogSettings *Stage_AccessLogSettings `json:"AccessLogSettings,omitempty"`
+
+	// AccessPolicyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-stage.html#cfn-apigatewayv2-stage-accesspolicyid
+	AccessPolicyId *types.Value `json:"AccessPolicyId,omitempty"`
+
+	// ApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-stage.html#cfn-apigatewayv2-stage-apiid
+	ApiId *types.Value `json:"ApiId,omitempty"`
+
+	// AutoDeploy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-stage.html#cfn-apigatewayv2-stage-autodeploy
+	AutoDeploy *types.Value `json:"AutoDeploy,omitempty"`
+
+	// ClientCertificateId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-stage.html#cfn-apigatewayv2-stage-clientcertificateid
+	ClientCertificateId *types.Value `json:"ClientCertificateId,omitempty"`
+
+	// DefaultRouteSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-stage.html#cfn-apigatewayv2-stage-defaultroutesettings
+	DefaultRouteSettings *Stage_RouteSettings `json:"DefaultRouteSettings,omitempty"`
+
+	// DeploymentId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-stage.html#cfn-apigatewayv2-stage-deploymentid
+	DeploymentId *types.Value `json:"DeploymentId,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-stage.html#cfn-apigatewayv2-stage-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// RouteSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-stage.html#cfn-apigatewayv2-stage-routesettings
+	RouteSettings interface{} `json:"RouteSettings,omitempty"`
+
+	// StageName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-stage.html#cfn-apigatewayv2-stage-stagename
+	StageName *types.Value `json:"StageName,omitempty"`
+
+	// StageVariables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-stage.html#cfn-apigatewayv2-stage-stagevariables
+	StageVariables interface{} `json:"StageVariables,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-stage.html#cfn-apigatewayv2-stage-tags
+	Tags interface{} `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 *Stage) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::Stage"
+}
+
+// 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 Stage) MarshalJSON() ([]byte, error) {
+	type Properties Stage
+	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 *Stage) UnmarshalJSON(b []byte) error {
+	type Properties Stage
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Stage(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage_accesslogsettings.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage_accesslogsettings.go
new file mode 100644
index 0000000000..9003055bb3
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage_accesslogsettings.go
@@ -0,0 +1,42 @@
+package apigatewayv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stage_AccessLogSettings AWS CloudFormation Resource (AWS::ApiGatewayV2::Stage.AccessLogSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-stage-accesslogsettings.html
+type Stage_AccessLogSettings struct {
+
+	// DestinationArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-stage-accesslogsettings.html#cfn-apigatewayv2-stage-accesslogsettings-destinationarn
+	DestinationArn *types.Value `json:"DestinationArn,omitempty"`
+
+	// Format AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-stage-accesslogsettings.html#cfn-apigatewayv2-stage-accesslogsettings-format
+	Format *types.Value `json:"Format,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AccessLogSettings) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::Stage.AccessLogSettings"
+}
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage_routesettings.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage_routesettings.go
new file mode 100644
index 0000000000..b141258bfc
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-stage_routesettings.go
@@ -0,0 +1,57 @@
+package apigatewayv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stage_RouteSettings AWS CloudFormation Resource (AWS::ApiGatewayV2::Stage.RouteSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-stage-routesettings.html
+type Stage_RouteSettings struct {
+
+	// DataTraceEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-stage-routesettings.html#cfn-apigatewayv2-stage-routesettings-datatraceenabled
+	DataTraceEnabled *types.Value `json:"DataTraceEnabled,omitempty"`
+
+	// DetailedMetricsEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-stage-routesettings.html#cfn-apigatewayv2-stage-routesettings-detailedmetricsenabled
+	DetailedMetricsEnabled *types.Value `json:"DetailedMetricsEnabled,omitempty"`
+
+	// LoggingLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-stage-routesettings.html#cfn-apigatewayv2-stage-routesettings-logginglevel
+	LoggingLevel *types.Value `json:"LoggingLevel,omitempty"`
+
+	// ThrottlingBurstLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-stage-routesettings.html#cfn-apigatewayv2-stage-routesettings-throttlingburstlimit
+	ThrottlingBurstLimit *types.Value `json:"ThrottlingBurstLimit,omitempty"`
+
+	// ThrottlingRateLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigatewayv2-stage-routesettings.html#cfn-apigatewayv2-stage-routesettings-throttlingratelimit
+	ThrottlingRateLimit *types.Value `json:"ThrottlingRateLimit,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RouteSettings) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::Stage.RouteSettings"
+}
diff --git a/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-vpclink.go b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-vpclink.go
new file mode 100644
index 0000000000..9c3651b406
--- /dev/null
+++ b/goformation/cloudformation/apigatewayv2/aws-apigatewayv2-vpclink.go
@@ -0,0 +1,123 @@
+package apigatewayv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VpcLink AWS CloudFormation Resource (AWS::ApiGatewayV2::VpcLink)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-vpclink.html
+type VpcLink struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-vpclink.html#cfn-apigatewayv2-vpclink-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-vpclink.html#cfn-apigatewayv2-vpclink-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-vpclink.html#cfn-apigatewayv2-vpclink-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apigatewayv2-vpclink.html#cfn-apigatewayv2-vpclink-tags
+	Tags interface{} `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 *VpcLink) AWSCloudFormationType() string {
+	return "AWS::ApiGatewayV2::VpcLink"
+}
+
+// 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 VpcLink) MarshalJSON() ([]byte, error) {
+	type Properties VpcLink
+	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 *VpcLink) UnmarshalJSON(b []byte) error {
+	type Properties VpcLink
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VpcLink(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appconfig/aws-appconfig-application.go b/goformation/cloudformation/appconfig/aws-appconfig-application.go
new file mode 100644
index 0000000000..9929e53295
--- /dev/null
+++ b/goformation/cloudformation/appconfig/aws-appconfig-application.go
@@ -0,0 +1,118 @@
+package appconfig
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application AWS CloudFormation Resource (AWS::AppConfig::Application)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-application.html
+type Application struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-application.html#cfn-appconfig-application-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-application.html#cfn-appconfig-application-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-application.html#cfn-appconfig-application-tags
+	Tags []Application_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 *Application) AWSCloudFormationType() string {
+	return "AWS::AppConfig::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appconfig/aws-appconfig-application_tags.go b/goformation/cloudformation/appconfig/aws-appconfig-application_tags.go
new file mode 100644
index 0000000000..b9b8992da1
--- /dev/null
+++ b/goformation/cloudformation/appconfig/aws-appconfig-application_tags.go
@@ -0,0 +1,42 @@
+package appconfig
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_Tags AWS CloudFormation Resource (AWS::AppConfig::Application.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-application-tags.html
+type Application_Tags struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-application-tags.html#cfn-appconfig-application-tags-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-application-tags.html#cfn-appconfig-application-tags-value
+	Value *types.Value `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 *Application_Tags) AWSCloudFormationType() string {
+	return "AWS::AppConfig::Application.Tags"
+}
diff --git a/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile.go b/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile.go
new file mode 100644
index 0000000000..7c5c93fbc9
--- /dev/null
+++ b/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile.go
@@ -0,0 +1,143 @@
+package appconfig
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationProfile AWS CloudFormation Resource (AWS::AppConfig::ConfigurationProfile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-configurationprofile.html
+type ConfigurationProfile struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-configurationprofile.html#cfn-appconfig-configurationprofile-applicationid
+	ApplicationId *types.Value `json:"ApplicationId,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-configurationprofile.html#cfn-appconfig-configurationprofile-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// LocationUri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-configurationprofile.html#cfn-appconfig-configurationprofile-locationuri
+	LocationUri *types.Value `json:"LocationUri,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-configurationprofile.html#cfn-appconfig-configurationprofile-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RetrievalRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-configurationprofile.html#cfn-appconfig-configurationprofile-retrievalrolearn
+	RetrievalRoleArn *types.Value `json:"RetrievalRoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-configurationprofile.html#cfn-appconfig-configurationprofile-tags
+	Tags []ConfigurationProfile_Tags `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-configurationprofile.html#cfn-appconfig-configurationprofile-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Validators AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-configurationprofile.html#cfn-appconfig-configurationprofile-validators
+	Validators []ConfigurationProfile_Validators `json:"Validators,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConfigurationProfile) AWSCloudFormationType() string {
+	return "AWS::AppConfig::ConfigurationProfile"
+}
+
+// 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 ConfigurationProfile) MarshalJSON() ([]byte, error) {
+	type Properties ConfigurationProfile
+	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 *ConfigurationProfile) UnmarshalJSON(b []byte) error {
+	type Properties ConfigurationProfile
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ConfigurationProfile(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile_tags.go b/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile_tags.go
new file mode 100644
index 0000000000..b3ca5719ab
--- /dev/null
+++ b/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile_tags.go
@@ -0,0 +1,42 @@
+package appconfig
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationProfile_Tags AWS CloudFormation Resource (AWS::AppConfig::ConfigurationProfile.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-configurationprofile-tags.html
+type ConfigurationProfile_Tags struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-configurationprofile-tags.html#cfn-appconfig-configurationprofile-tags-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-configurationprofile-tags.html#cfn-appconfig-configurationprofile-tags-value
+	Value *types.Value `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 *ConfigurationProfile_Tags) AWSCloudFormationType() string {
+	return "AWS::AppConfig::ConfigurationProfile.Tags"
+}
diff --git a/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile_validators.go b/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile_validators.go
new file mode 100644
index 0000000000..d5c8e4b60b
--- /dev/null
+++ b/goformation/cloudformation/appconfig/aws-appconfig-configurationprofile_validators.go
@@ -0,0 +1,42 @@
+package appconfig
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationProfile_Validators AWS CloudFormation Resource (AWS::AppConfig::ConfigurationProfile.Validators)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-configurationprofile-validators.html
+type ConfigurationProfile_Validators struct {
+
+	// Content AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-configurationprofile-validators.html#cfn-appconfig-configurationprofile-validators-content
+	Content *types.Value `json:"Content,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-configurationprofile-validators.html#cfn-appconfig-configurationprofile-validators-type
+	Type *types.Value `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 *ConfigurationProfile_Validators) AWSCloudFormationType() string {
+	return "AWS::AppConfig::ConfigurationProfile.Validators"
+}
diff --git a/goformation/cloudformation/appconfig/aws-appconfig-deployment.go b/goformation/cloudformation/appconfig/aws-appconfig-deployment.go
new file mode 100644
index 0000000000..c704d4bb72
--- /dev/null
+++ b/goformation/cloudformation/appconfig/aws-appconfig-deployment.go
@@ -0,0 +1,138 @@
+package appconfig
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Deployment AWS CloudFormation Resource (AWS::AppConfig::Deployment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deployment.html
+type Deployment struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deployment.html#cfn-appconfig-deployment-applicationid
+	ApplicationId *types.Value `json:"ApplicationId,omitempty"`
+
+	// ConfigurationProfileId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deployment.html#cfn-appconfig-deployment-configurationprofileid
+	ConfigurationProfileId *types.Value `json:"ConfigurationProfileId,omitempty"`
+
+	// ConfigurationVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deployment.html#cfn-appconfig-deployment-configurationversion
+	ConfigurationVersion *types.Value `json:"ConfigurationVersion,omitempty"`
+
+	// DeploymentStrategyId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deployment.html#cfn-appconfig-deployment-deploymentstrategyid
+	DeploymentStrategyId *types.Value `json:"DeploymentStrategyId,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deployment.html#cfn-appconfig-deployment-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EnvironmentId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deployment.html#cfn-appconfig-deployment-environmentid
+	EnvironmentId *types.Value `json:"EnvironmentId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deployment.html#cfn-appconfig-deployment-tags
+	Tags []Deployment_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 *Deployment) AWSCloudFormationType() string {
+	return "AWS::AppConfig::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appconfig/aws-appconfig-deployment_tags.go b/goformation/cloudformation/appconfig/aws-appconfig-deployment_tags.go
new file mode 100644
index 0000000000..c7f1954a6d
--- /dev/null
+++ b/goformation/cloudformation/appconfig/aws-appconfig-deployment_tags.go
@@ -0,0 +1,42 @@
+package appconfig
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Deployment_Tags AWS CloudFormation Resource (AWS::AppConfig::Deployment.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-deployment-tags.html
+type Deployment_Tags struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-deployment-tags.html#cfn-appconfig-deployment-tags-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-deployment-tags.html#cfn-appconfig-deployment-tags-value
+	Value *types.Value `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::AppConfig::Deployment.Tags"
+}
diff --git a/goformation/cloudformation/appconfig/aws-appconfig-deploymentstrategy.go b/goformation/cloudformation/appconfig/aws-appconfig-deploymentstrategy.go
new file mode 100644
index 0000000000..9cf5622797
--- /dev/null
+++ b/goformation/cloudformation/appconfig/aws-appconfig-deploymentstrategy.go
@@ -0,0 +1,143 @@
+package appconfig
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentStrategy AWS CloudFormation Resource (AWS::AppConfig::DeploymentStrategy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deploymentstrategy.html
+type DeploymentStrategy struct {
+
+	// DeploymentDurationInMinutes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deploymentstrategy.html#cfn-appconfig-deploymentstrategy-deploymentdurationinminutes
+	DeploymentDurationInMinutes *types.Value `json:"DeploymentDurationInMinutes"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deploymentstrategy.html#cfn-appconfig-deploymentstrategy-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// FinalBakeTimeInMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deploymentstrategy.html#cfn-appconfig-deploymentstrategy-finalbaketimeinminutes
+	FinalBakeTimeInMinutes *types.Value `json:"FinalBakeTimeInMinutes,omitempty"`
+
+	// GrowthFactor AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deploymentstrategy.html#cfn-appconfig-deploymentstrategy-growthfactor
+	GrowthFactor *types.Value `json:"GrowthFactor"`
+
+	// GrowthType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deploymentstrategy.html#cfn-appconfig-deploymentstrategy-growthtype
+	GrowthType *types.Value `json:"GrowthType,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deploymentstrategy.html#cfn-appconfig-deploymentstrategy-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ReplicateTo AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deploymentstrategy.html#cfn-appconfig-deploymentstrategy-replicateto
+	ReplicateTo *types.Value `json:"ReplicateTo,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-deploymentstrategy.html#cfn-appconfig-deploymentstrategy-tags
+	Tags []DeploymentStrategy_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 *DeploymentStrategy) AWSCloudFormationType() string {
+	return "AWS::AppConfig::DeploymentStrategy"
+}
+
+// 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 DeploymentStrategy) MarshalJSON() ([]byte, error) {
+	type Properties DeploymentStrategy
+	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 *DeploymentStrategy) UnmarshalJSON(b []byte) error {
+	type Properties DeploymentStrategy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DeploymentStrategy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appconfig/aws-appconfig-deploymentstrategy_tags.go b/goformation/cloudformation/appconfig/aws-appconfig-deploymentstrategy_tags.go
new file mode 100644
index 0000000000..c036c0f959
--- /dev/null
+++ b/goformation/cloudformation/appconfig/aws-appconfig-deploymentstrategy_tags.go
@@ -0,0 +1,42 @@
+package appconfig
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentStrategy_Tags AWS CloudFormation Resource (AWS::AppConfig::DeploymentStrategy.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-deploymentstrategy-tags.html
+type DeploymentStrategy_Tags struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-deploymentstrategy-tags.html#cfn-appconfig-deploymentstrategy-tags-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-deploymentstrategy-tags.html#cfn-appconfig-deploymentstrategy-tags-value
+	Value *types.Value `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 *DeploymentStrategy_Tags) AWSCloudFormationType() string {
+	return "AWS::AppConfig::DeploymentStrategy.Tags"
+}
diff --git a/goformation/cloudformation/appconfig/aws-appconfig-environment.go b/goformation/cloudformation/appconfig/aws-appconfig-environment.go
new file mode 100644
index 0000000000..7af6bbf411
--- /dev/null
+++ b/goformation/cloudformation/appconfig/aws-appconfig-environment.go
@@ -0,0 +1,128 @@
+package appconfig
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Environment AWS CloudFormation Resource (AWS::AppConfig::Environment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-environment.html
+type Environment struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-environment.html#cfn-appconfig-environment-applicationid
+	ApplicationId *types.Value `json:"ApplicationId,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-environment.html#cfn-appconfig-environment-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Monitors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-environment.html#cfn-appconfig-environment-monitors
+	Monitors []Environment_Monitors `json:"Monitors,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-environment.html#cfn-appconfig-environment-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-environment.html#cfn-appconfig-environment-tags
+	Tags []Environment_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 *Environment) AWSCloudFormationType() string {
+	return "AWS::AppConfig::Environment"
+}
+
+// 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 Environment) MarshalJSON() ([]byte, error) {
+	type Properties Environment
+	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 *Environment) UnmarshalJSON(b []byte) error {
+	type Properties Environment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Environment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appconfig/aws-appconfig-environment_monitors.go b/goformation/cloudformation/appconfig/aws-appconfig-environment_monitors.go
new file mode 100644
index 0000000000..52eb2a4794
--- /dev/null
+++ b/goformation/cloudformation/appconfig/aws-appconfig-environment_monitors.go
@@ -0,0 +1,42 @@
+package appconfig
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Environment_Monitors AWS CloudFormation Resource (AWS::AppConfig::Environment.Monitors)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-environment-monitors.html
+type Environment_Monitors struct {
+
+	// AlarmArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-environment-monitors.html#cfn-appconfig-environment-monitors-alarmarn
+	AlarmArn *types.Value `json:"AlarmArn,omitempty"`
+
+	// AlarmRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-environment-monitors.html#cfn-appconfig-environment-monitors-alarmrolearn
+	AlarmRoleArn *types.Value `json:"AlarmRoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Environment_Monitors) AWSCloudFormationType() string {
+	return "AWS::AppConfig::Environment.Monitors"
+}
diff --git a/goformation/cloudformation/appconfig/aws-appconfig-environment_tags.go b/goformation/cloudformation/appconfig/aws-appconfig-environment_tags.go
new file mode 100644
index 0000000000..6ccc3429bf
--- /dev/null
+++ b/goformation/cloudformation/appconfig/aws-appconfig-environment_tags.go
@@ -0,0 +1,42 @@
+package appconfig
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Environment_Tags AWS CloudFormation Resource (AWS::AppConfig::Environment.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-environment-tags.html
+type Environment_Tags struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-environment-tags.html#cfn-appconfig-environment-tags-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appconfig-environment-tags.html#cfn-appconfig-environment-tags-value
+	Value *types.Value `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 *Environment_Tags) AWSCloudFormationType() string {
+	return "AWS::AppConfig::Environment.Tags"
+}
diff --git a/goformation/cloudformation/appconfig/aws-appconfig-hostedconfigurationversion.go b/goformation/cloudformation/appconfig/aws-appconfig-hostedconfigurationversion.go
new file mode 100644
index 0000000000..4dade74f04
--- /dev/null
+++ b/goformation/cloudformation/appconfig/aws-appconfig-hostedconfigurationversion.go
@@ -0,0 +1,133 @@
+package appconfig
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// HostedConfigurationVersion AWS CloudFormation Resource (AWS::AppConfig::HostedConfigurationVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-hostedconfigurationversion.html
+type HostedConfigurationVersion struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-hostedconfigurationversion.html#cfn-appconfig-hostedconfigurationversion-applicationid
+	ApplicationId *types.Value `json:"ApplicationId,omitempty"`
+
+	// ConfigurationProfileId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-hostedconfigurationversion.html#cfn-appconfig-hostedconfigurationversion-configurationprofileid
+	ConfigurationProfileId *types.Value `json:"ConfigurationProfileId,omitempty"`
+
+	// Content AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-hostedconfigurationversion.html#cfn-appconfig-hostedconfigurationversion-content
+	Content *types.Value `json:"Content,omitempty"`
+
+	// ContentType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-hostedconfigurationversion.html#cfn-appconfig-hostedconfigurationversion-contenttype
+	ContentType *types.Value `json:"ContentType,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-hostedconfigurationversion.html#cfn-appconfig-hostedconfigurationversion-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// LatestVersionNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appconfig-hostedconfigurationversion.html#cfn-appconfig-hostedconfigurationversion-latestversionnumber
+	LatestVersionNumber *types.Value `json:"LatestVersionNumber,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *HostedConfigurationVersion) AWSCloudFormationType() string {
+	return "AWS::AppConfig::HostedConfigurationVersion"
+}
+
+// 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 HostedConfigurationVersion) MarshalJSON() ([]byte, error) {
+	type Properties HostedConfigurationVersion
+	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 *HostedConfigurationVersion) UnmarshalJSON(b []byte) error {
+	type Properties HostedConfigurationVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = HostedConfigurationVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appflow/aws-appflow-connectorprofile.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile.go
new file mode 100644
index 0000000000..55cb875893
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile.go
@@ -0,0 +1,128 @@
+package appflow
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-connectorprofile.html
+type ConnectorProfile struct {
+
+	// ConnectionMode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-connectorprofile.html#cfn-appflow-connectorprofile-connectionmode
+	ConnectionMode *types.Value `json:"ConnectionMode,omitempty"`
+
+	// ConnectorProfileConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-connectorprofile.html#cfn-appflow-connectorprofile-connectorprofileconfig
+	ConnectorProfileConfig *ConnectorProfile_ConnectorProfileConfig `json:"ConnectorProfileConfig,omitempty"`
+
+	// ConnectorProfileName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-connectorprofile.html#cfn-appflow-connectorprofile-connectorprofilename
+	ConnectorProfileName *types.Value `json:"ConnectorProfileName,omitempty"`
+
+	// ConnectorType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-connectorprofile.html#cfn-appflow-connectorprofile-connectortype
+	ConnectorType *types.Value `json:"ConnectorType,omitempty"`
+
+	// KMSArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-connectorprofile.html#cfn-appflow-connectorprofile-kmsarn
+	KMSArn *types.Value `json:"KMSArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile"
+}
+
+// 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 ConnectorProfile) MarshalJSON() ([]byte, error) {
+	type Properties ConnectorProfile
+	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 *ConnectorProfile) UnmarshalJSON(b []byte) error {
+	type Properties ConnectorProfile
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ConnectorProfile(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appflow/aws-appflow-connectorprofile_amplitudeconnectorprofilecredentials.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_amplitudeconnectorprofilecredentials.go
new file mode 100644
index 0000000000..b011531b31
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_amplitudeconnectorprofilecredentials.go
@@ -0,0 +1,42 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_AmplitudeConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.AmplitudeConnectorProfileCredentials)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-amplitudeconnectorprofilecredentials.html
+type ConnectorProfile_AmplitudeConnectorProfileCredentials struct {
+
+	// ApiKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-amplitudeconnectorprofilecredentials.html#cfn-appflow-connectorprofile-amplitudeconnectorprofilecredentials-apikey
+	ApiKey *types.Value `json:"ApiKey,omitempty"`
+
+	// SecretKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-amplitudeconnectorprofilecredentials.html#cfn-appflow-connectorprofile-amplitudeconnectorprofilecredentials-secretkey
+	SecretKey *types.Value `json:"SecretKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_AmplitudeConnectorProfileCredentials) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.AmplitudeConnectorProfileCredentials"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectoroauthrequest.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectoroauthrequest.go
new file mode 100644
index 0000000000..6899af5d6f
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectoroauthrequest.go
@@ -0,0 +1,42 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_ConnectorOAuthRequest AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectoroauthrequest.html
+type ConnectorProfile_ConnectorOAuthRequest struct {
+
+	// AuthCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectoroauthrequest.html#cfn-appflow-connectorprofile-connectoroauthrequest-authcode
+	AuthCode *types.Value `json:"AuthCode,omitempty"`
+
+	// RedirectUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectoroauthrequest.html#cfn-appflow-connectorprofile-connectoroauthrequest-redirecturi
+	RedirectUri *types.Value `json:"RedirectUri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_ConnectorOAuthRequest) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileconfig.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileconfig.go
new file mode 100644
index 0000000000..1cb7951bb6
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileconfig.go
@@ -0,0 +1,40 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_ConnectorProfileConfig AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.ConnectorProfileConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofileconfig.html
+type ConnectorProfile_ConnectorProfileConfig struct {
+
+	// ConnectorProfileCredentials AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofileconfig.html#cfn-appflow-connectorprofile-connectorprofileconfig-connectorprofilecredentials
+	ConnectorProfileCredentials *ConnectorProfile_ConnectorProfileCredentials `json:"ConnectorProfileCredentials,omitempty"`
+
+	// ConnectorProfileProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofileconfig.html#cfn-appflow-connectorprofile-connectorprofileconfig-connectorprofileproperties
+	ConnectorProfileProperties *ConnectorProfile_ConnectorProfileProperties `json:"ConnectorProfileProperties,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_ConnectorProfileConfig) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.ConnectorProfileConfig"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofilecredentials.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofilecredentials.go
new file mode 100644
index 0000000000..fc490d7f0b
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofilecredentials.go
@@ -0,0 +1,110 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_ConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.ConnectorProfileCredentials)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofilecredentials.html
+type ConnectorProfile_ConnectorProfileCredentials struct {
+
+	// Amplitude AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofilecredentials.html#cfn-appflow-connectorprofile-connectorprofilecredentials-amplitude
+	Amplitude *ConnectorProfile_AmplitudeConnectorProfileCredentials `json:"Amplitude,omitempty"`
+
+	// Datadog AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofilecredentials.html#cfn-appflow-connectorprofile-connectorprofilecredentials-datadog
+	Datadog *ConnectorProfile_DatadogConnectorProfileCredentials `json:"Datadog,omitempty"`
+
+	// Dynatrace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofilecredentials.html#cfn-appflow-connectorprofile-connectorprofilecredentials-dynatrace
+	Dynatrace *ConnectorProfile_DynatraceConnectorProfileCredentials `json:"Dynatrace,omitempty"`
+
+	// GoogleAnalytics AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofilecredentials.html#cfn-appflow-connectorprofile-connectorprofilecredentials-googleanalytics
+	GoogleAnalytics *ConnectorProfile_GoogleAnalyticsConnectorProfileCredentials `json:"GoogleAnalytics,omitempty"`
+
+	// InforNexus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofilecredentials.html#cfn-appflow-connectorprofile-connectorprofilecredentials-infornexus
+	InforNexus *ConnectorProfile_InforNexusConnectorProfileCredentials `json:"InforNexus,omitempty"`
+
+	// Marketo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofilecredentials.html#cfn-appflow-connectorprofile-connectorprofilecredentials-marketo
+	Marketo *ConnectorProfile_MarketoConnectorProfileCredentials `json:"Marketo,omitempty"`
+
+	// Redshift AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofilecredentials.html#cfn-appflow-connectorprofile-connectorprofilecredentials-redshift
+	Redshift *ConnectorProfile_RedshiftConnectorProfileCredentials `json:"Redshift,omitempty"`
+
+	// SAPOData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofilecredentials.html#cfn-appflow-connectorprofile-connectorprofilecredentials-sapodata
+	SAPOData *ConnectorProfile_SAPODataConnectorProfileCredentials `json:"SAPOData,omitempty"`
+
+	// Salesforce AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofilecredentials.html#cfn-appflow-connectorprofile-connectorprofilecredentials-salesforce
+	Salesforce *ConnectorProfile_SalesforceConnectorProfileCredentials `json:"Salesforce,omitempty"`
+
+	// ServiceNow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofilecredentials.html#cfn-appflow-connectorprofile-connectorprofilecredentials-servicenow
+	ServiceNow *ConnectorProfile_ServiceNowConnectorProfileCredentials `json:"ServiceNow,omitempty"`
+
+	// Singular AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofilecredentials.html#cfn-appflow-connectorprofile-connectorprofilecredentials-singular
+	Singular *ConnectorProfile_SingularConnectorProfileCredentials `json:"Singular,omitempty"`
+
+	// Slack AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofilecredentials.html#cfn-appflow-connectorprofile-connectorprofilecredentials-slack
+	Slack *ConnectorProfile_SlackConnectorProfileCredentials `json:"Slack,omitempty"`
+
+	// Snowflake AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofilecredentials.html#cfn-appflow-connectorprofile-connectorprofilecredentials-snowflake
+	Snowflake *ConnectorProfile_SnowflakeConnectorProfileCredentials `json:"Snowflake,omitempty"`
+
+	// Trendmicro AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofilecredentials.html#cfn-appflow-connectorprofile-connectorprofilecredentials-trendmicro
+	Trendmicro *ConnectorProfile_TrendmicroConnectorProfileCredentials `json:"Trendmicro,omitempty"`
+
+	// Veeva AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofilecredentials.html#cfn-appflow-connectorprofile-connectorprofilecredentials-veeva
+	Veeva *ConnectorProfile_VeevaConnectorProfileCredentials `json:"Veeva,omitempty"`
+
+	// Zendesk AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofilecredentials.html#cfn-appflow-connectorprofile-connectorprofilecredentials-zendesk
+	Zendesk *ConnectorProfile_ZendeskConnectorProfileCredentials `json:"Zendesk,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_ConnectorProfileCredentials) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.ConnectorProfileCredentials"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileproperties.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileproperties.go
new file mode 100644
index 0000000000..a616bd3c9a
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_connectorprofileproperties.go
@@ -0,0 +1,90 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_ConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.ConnectorProfileProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofileproperties.html
+type ConnectorProfile_ConnectorProfileProperties struct {
+
+	// Datadog AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofileproperties.html#cfn-appflow-connectorprofile-connectorprofileproperties-datadog
+	Datadog *ConnectorProfile_DatadogConnectorProfileProperties `json:"Datadog,omitempty"`
+
+	// Dynatrace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofileproperties.html#cfn-appflow-connectorprofile-connectorprofileproperties-dynatrace
+	Dynatrace *ConnectorProfile_DynatraceConnectorProfileProperties `json:"Dynatrace,omitempty"`
+
+	// InforNexus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofileproperties.html#cfn-appflow-connectorprofile-connectorprofileproperties-infornexus
+	InforNexus *ConnectorProfile_InforNexusConnectorProfileProperties `json:"InforNexus,omitempty"`
+
+	// Marketo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofileproperties.html#cfn-appflow-connectorprofile-connectorprofileproperties-marketo
+	Marketo *ConnectorProfile_MarketoConnectorProfileProperties `json:"Marketo,omitempty"`
+
+	// Redshift AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofileproperties.html#cfn-appflow-connectorprofile-connectorprofileproperties-redshift
+	Redshift *ConnectorProfile_RedshiftConnectorProfileProperties `json:"Redshift,omitempty"`
+
+	// SAPOData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofileproperties.html#cfn-appflow-connectorprofile-connectorprofileproperties-sapodata
+	SAPOData *ConnectorProfile_SAPODataConnectorProfileProperties `json:"SAPOData,omitempty"`
+
+	// Salesforce AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofileproperties.html#cfn-appflow-connectorprofile-connectorprofileproperties-salesforce
+	Salesforce *ConnectorProfile_SalesforceConnectorProfileProperties `json:"Salesforce,omitempty"`
+
+	// ServiceNow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofileproperties.html#cfn-appflow-connectorprofile-connectorprofileproperties-servicenow
+	ServiceNow *ConnectorProfile_ServiceNowConnectorProfileProperties `json:"ServiceNow,omitempty"`
+
+	// Slack AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofileproperties.html#cfn-appflow-connectorprofile-connectorprofileproperties-slack
+	Slack *ConnectorProfile_SlackConnectorProfileProperties `json:"Slack,omitempty"`
+
+	// Snowflake AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofileproperties.html#cfn-appflow-connectorprofile-connectorprofileproperties-snowflake
+	Snowflake *ConnectorProfile_SnowflakeConnectorProfileProperties `json:"Snowflake,omitempty"`
+
+	// Veeva AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofileproperties.html#cfn-appflow-connectorprofile-connectorprofileproperties-veeva
+	Veeva *ConnectorProfile_VeevaConnectorProfileProperties `json:"Veeva,omitempty"`
+
+	// Zendesk AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-connectorprofileproperties.html#cfn-appflow-connectorprofile-connectorprofileproperties-zendesk
+	Zendesk *ConnectorProfile_ZendeskConnectorProfileProperties `json:"Zendesk,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_ConnectorProfileProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.ConnectorProfileProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofilecredentials.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofilecredentials.go
new file mode 100644
index 0000000000..f36fdd1d89
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofilecredentials.go
@@ -0,0 +1,42 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_DatadogConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileCredentials)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-datadogconnectorprofilecredentials.html
+type ConnectorProfile_DatadogConnectorProfileCredentials struct {
+
+	// ApiKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-datadogconnectorprofilecredentials.html#cfn-appflow-connectorprofile-datadogconnectorprofilecredentials-apikey
+	ApiKey *types.Value `json:"ApiKey,omitempty"`
+
+	// ApplicationKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-datadogconnectorprofilecredentials.html#cfn-appflow-connectorprofile-datadogconnectorprofilecredentials-applicationkey
+	ApplicationKey *types.Value `json:"ApplicationKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_DatadogConnectorProfileCredentials) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileCredentials"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofileproperties.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofileproperties.go
new file mode 100644
index 0000000000..e46b55be2d
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_datadogconnectorprofileproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_DatadogConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-datadogconnectorprofileproperties.html
+type ConnectorProfile_DatadogConnectorProfileProperties struct {
+
+	// InstanceUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-datadogconnectorprofileproperties.html#cfn-appflow-connectorprofile-datadogconnectorprofileproperties-instanceurl
+	InstanceUrl *types.Value `json:"InstanceUrl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_DatadogConnectorProfileProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofilecredentials.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofilecredentials.go
new file mode 100644
index 0000000000..9e7a239241
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofilecredentials.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_DynatraceConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileCredentials)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-dynatraceconnectorprofilecredentials.html
+type ConnectorProfile_DynatraceConnectorProfileCredentials struct {
+
+	// ApiToken AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-dynatraceconnectorprofilecredentials.html#cfn-appflow-connectorprofile-dynatraceconnectorprofilecredentials-apitoken
+	ApiToken *types.Value `json:"ApiToken,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_DynatraceConnectorProfileCredentials) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileCredentials"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofileproperties.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofileproperties.go
new file mode 100644
index 0000000000..7583aaa91e
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_dynatraceconnectorprofileproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_DynatraceConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-dynatraceconnectorprofileproperties.html
+type ConnectorProfile_DynatraceConnectorProfileProperties struct {
+
+	// InstanceUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-dynatraceconnectorprofileproperties.html#cfn-appflow-connectorprofile-dynatraceconnectorprofileproperties-instanceurl
+	InstanceUrl *types.Value `json:"InstanceUrl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_DynatraceConnectorProfileProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_googleanalyticsconnectorprofilecredentials.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_googleanalyticsconnectorprofilecredentials.go
new file mode 100644
index 0000000000..fb05e2db43
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_googleanalyticsconnectorprofilecredentials.go
@@ -0,0 +1,57 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_GoogleAnalyticsConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.GoogleAnalyticsConnectorProfileCredentials)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-googleanalyticsconnectorprofilecredentials.html
+type ConnectorProfile_GoogleAnalyticsConnectorProfileCredentials struct {
+
+	// AccessToken AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-googleanalyticsconnectorprofilecredentials.html#cfn-appflow-connectorprofile-googleanalyticsconnectorprofilecredentials-accesstoken
+	AccessToken *types.Value `json:"AccessToken,omitempty"`
+
+	// ClientId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-googleanalyticsconnectorprofilecredentials.html#cfn-appflow-connectorprofile-googleanalyticsconnectorprofilecredentials-clientid
+	ClientId *types.Value `json:"ClientId,omitempty"`
+
+	// ClientSecret AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-googleanalyticsconnectorprofilecredentials.html#cfn-appflow-connectorprofile-googleanalyticsconnectorprofilecredentials-clientsecret
+	ClientSecret *types.Value `json:"ClientSecret,omitempty"`
+
+	// ConnectorOAuthRequest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-googleanalyticsconnectorprofilecredentials.html#cfn-appflow-connectorprofile-googleanalyticsconnectorprofilecredentials-connectoroauthrequest
+	ConnectorOAuthRequest *ConnectorProfile_ConnectorOAuthRequest `json:"ConnectorOAuthRequest,omitempty"`
+
+	// RefreshToken AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-googleanalyticsconnectorprofilecredentials.html#cfn-appflow-connectorprofile-googleanalyticsconnectorprofilecredentials-refreshtoken
+	RefreshToken *types.Value `json:"RefreshToken,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_GoogleAnalyticsConnectorProfileCredentials) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.GoogleAnalyticsConnectorProfileCredentials"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofilecredentials.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofilecredentials.go
new file mode 100644
index 0000000000..ff45890257
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofilecredentials.go
@@ -0,0 +1,52 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_InforNexusConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileCredentials)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-infornexusconnectorprofilecredentials.html
+type ConnectorProfile_InforNexusConnectorProfileCredentials struct {
+
+	// AccessKeyId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-infornexusconnectorprofilecredentials.html#cfn-appflow-connectorprofile-infornexusconnectorprofilecredentials-accesskeyid
+	AccessKeyId *types.Value `json:"AccessKeyId,omitempty"`
+
+	// Datakey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-infornexusconnectorprofilecredentials.html#cfn-appflow-connectorprofile-infornexusconnectorprofilecredentials-datakey
+	Datakey *types.Value `json:"Datakey,omitempty"`
+
+	// SecretAccessKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-infornexusconnectorprofilecredentials.html#cfn-appflow-connectorprofile-infornexusconnectorprofilecredentials-secretaccesskey
+	SecretAccessKey *types.Value `json:"SecretAccessKey,omitempty"`
+
+	// UserId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-infornexusconnectorprofilecredentials.html#cfn-appflow-connectorprofile-infornexusconnectorprofilecredentials-userid
+	UserId *types.Value `json:"UserId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_InforNexusConnectorProfileCredentials) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileCredentials"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofileproperties.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofileproperties.go
new file mode 100644
index 0000000000..7e29e8cc9a
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_infornexusconnectorprofileproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_InforNexusConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-infornexusconnectorprofileproperties.html
+type ConnectorProfile_InforNexusConnectorProfileProperties struct {
+
+	// InstanceUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-infornexusconnectorprofileproperties.html#cfn-appflow-connectorprofile-infornexusconnectorprofileproperties-instanceurl
+	InstanceUrl *types.Value `json:"InstanceUrl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_InforNexusConnectorProfileProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofilecredentials.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofilecredentials.go
new file mode 100644
index 0000000000..da4856f91d
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofilecredentials.go
@@ -0,0 +1,52 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_MarketoConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileCredentials)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-marketoconnectorprofilecredentials.html
+type ConnectorProfile_MarketoConnectorProfileCredentials struct {
+
+	// AccessToken AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-marketoconnectorprofilecredentials.html#cfn-appflow-connectorprofile-marketoconnectorprofilecredentials-accesstoken
+	AccessToken *types.Value `json:"AccessToken,omitempty"`
+
+	// ClientId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-marketoconnectorprofilecredentials.html#cfn-appflow-connectorprofile-marketoconnectorprofilecredentials-clientid
+	ClientId *types.Value `json:"ClientId,omitempty"`
+
+	// ClientSecret AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-marketoconnectorprofilecredentials.html#cfn-appflow-connectorprofile-marketoconnectorprofilecredentials-clientsecret
+	ClientSecret *types.Value `json:"ClientSecret,omitempty"`
+
+	// ConnectorOAuthRequest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-marketoconnectorprofilecredentials.html#cfn-appflow-connectorprofile-marketoconnectorprofilecredentials-connectoroauthrequest
+	ConnectorOAuthRequest *ConnectorProfile_ConnectorOAuthRequest `json:"ConnectorOAuthRequest,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_MarketoConnectorProfileCredentials) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileCredentials"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofileproperties.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofileproperties.go
new file mode 100644
index 0000000000..991e06128e
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_marketoconnectorprofileproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_MarketoConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-marketoconnectorprofileproperties.html
+type ConnectorProfile_MarketoConnectorProfileProperties struct {
+
+	// InstanceUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-marketoconnectorprofileproperties.html#cfn-appflow-connectorprofile-marketoconnectorprofileproperties-instanceurl
+	InstanceUrl *types.Value `json:"InstanceUrl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_MarketoConnectorProfileProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_oauthproperties.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_oauthproperties.go
new file mode 100644
index 0000000000..5e4d0d4565
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_oauthproperties.go
@@ -0,0 +1,47 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_OAuthProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.OAuthProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-oauthproperties.html
+type ConnectorProfile_OAuthProperties struct {
+
+	// AuthCodeUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-oauthproperties.html#cfn-appflow-connectorprofile-oauthproperties-authcodeurl
+	AuthCodeUrl *types.Value `json:"AuthCodeUrl,omitempty"`
+
+	// OAuthScopes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-oauthproperties.html#cfn-appflow-connectorprofile-oauthproperties-oauthscopes
+	OAuthScopes *types.Value `json:"OAuthScopes,omitempty"`
+
+	// TokenUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-oauthproperties.html#cfn-appflow-connectorprofile-oauthproperties-tokenurl
+	TokenUrl *types.Value `json:"TokenUrl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_OAuthProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.OAuthProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofilecredentials.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofilecredentials.go
new file mode 100644
index 0000000000..169d7a7c99
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofilecredentials.go
@@ -0,0 +1,42 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_RedshiftConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileCredentials)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-redshiftconnectorprofilecredentials.html
+type ConnectorProfile_RedshiftConnectorProfileCredentials struct {
+
+	// Password AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-redshiftconnectorprofilecredentials.html#cfn-appflow-connectorprofile-redshiftconnectorprofilecredentials-password
+	Password *types.Value `json:"Password,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-redshiftconnectorprofilecredentials.html#cfn-appflow-connectorprofile-redshiftconnectorprofilecredentials-username
+	Username *types.Value `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 *ConnectorProfile_RedshiftConnectorProfileCredentials) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileCredentials"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofileproperties.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofileproperties.go
new file mode 100644
index 0000000000..8c3d192efb
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_redshiftconnectorprofileproperties.go
@@ -0,0 +1,52 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_RedshiftConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-redshiftconnectorprofileproperties.html
+type ConnectorProfile_RedshiftConnectorProfileProperties struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-redshiftconnectorprofileproperties.html#cfn-appflow-connectorprofile-redshiftconnectorprofileproperties-bucketname
+	BucketName *types.Value `json:"BucketName,omitempty"`
+
+	// BucketPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-redshiftconnectorprofileproperties.html#cfn-appflow-connectorprofile-redshiftconnectorprofileproperties-bucketprefix
+	BucketPrefix *types.Value `json:"BucketPrefix,omitempty"`
+
+	// DatabaseUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-redshiftconnectorprofileproperties.html#cfn-appflow-connectorprofile-redshiftconnectorprofileproperties-databaseurl
+	DatabaseUrl *types.Value `json:"DatabaseUrl,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-redshiftconnectorprofileproperties.html#cfn-appflow-connectorprofile-redshiftconnectorprofileproperties-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_RedshiftConnectorProfileProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofilecredentials.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofilecredentials.go
new file mode 100644
index 0000000000..e05336fe53
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofilecredentials.go
@@ -0,0 +1,52 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_SalesforceConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileCredentials)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-salesforceconnectorprofilecredentials.html
+type ConnectorProfile_SalesforceConnectorProfileCredentials struct {
+
+	// AccessToken AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-salesforceconnectorprofilecredentials.html#cfn-appflow-connectorprofile-salesforceconnectorprofilecredentials-accesstoken
+	AccessToken *types.Value `json:"AccessToken,omitempty"`
+
+	// ClientCredentialsArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-salesforceconnectorprofilecredentials.html#cfn-appflow-connectorprofile-salesforceconnectorprofilecredentials-clientcredentialsarn
+	ClientCredentialsArn *types.Value `json:"ClientCredentialsArn,omitempty"`
+
+	// ConnectorOAuthRequest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-salesforceconnectorprofilecredentials.html#cfn-appflow-connectorprofile-salesforceconnectorprofilecredentials-connectoroauthrequest
+	ConnectorOAuthRequest *ConnectorProfile_ConnectorOAuthRequest `json:"ConnectorOAuthRequest,omitempty"`
+
+	// RefreshToken AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-salesforceconnectorprofilecredentials.html#cfn-appflow-connectorprofile-salesforceconnectorprofilecredentials-refreshtoken
+	RefreshToken *types.Value `json:"RefreshToken,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_SalesforceConnectorProfileCredentials) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileCredentials"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofileproperties.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofileproperties.go
new file mode 100644
index 0000000000..38733a81f2
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_salesforceconnectorprofileproperties.go
@@ -0,0 +1,42 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_SalesforceConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-salesforceconnectorprofileproperties.html
+type ConnectorProfile_SalesforceConnectorProfileProperties struct {
+
+	// InstanceUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-salesforceconnectorprofileproperties.html#cfn-appflow-connectorprofile-salesforceconnectorprofileproperties-instanceurl
+	InstanceUrl *types.Value `json:"InstanceUrl,omitempty"`
+
+	// isSandboxEnvironment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-salesforceconnectorprofileproperties.html#cfn-appflow-connectorprofile-salesforceconnectorprofileproperties-issandboxenvironment
+	isSandboxEnvironment *types.Value `json:"isSandboxEnvironment,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_SalesforceConnectorProfileProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofilecredentials.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofilecredentials.go
new file mode 100644
index 0000000000..96029b4c54
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofilecredentials.go
@@ -0,0 +1,40 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_SAPODataConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileCredentials)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-sapodataconnectorprofilecredentials.html
+type ConnectorProfile_SAPODataConnectorProfileCredentials struct {
+
+	// BasicAuthCredentials AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-sapodataconnectorprofilecredentials.html#cfn-appflow-connectorprofile-sapodataconnectorprofilecredentials-basicauthcredentials
+	BasicAuthCredentials interface{} `json:"BasicAuthCredentials,omitempty"`
+
+	// OAuthCredentials AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-sapodataconnectorprofilecredentials.html#cfn-appflow-connectorprofile-sapodataconnectorprofilecredentials-oauthcredentials
+	OAuthCredentials interface{} `json:"OAuthCredentials,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_SAPODataConnectorProfileCredentials) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileCredentials"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofileproperties.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofileproperties.go
new file mode 100644
index 0000000000..e11353fc67
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_sapodataconnectorprofileproperties.go
@@ -0,0 +1,67 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_SAPODataConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-sapodataconnectorprofileproperties.html
+type ConnectorProfile_SAPODataConnectorProfileProperties struct {
+
+	// ApplicationHostUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-sapodataconnectorprofileproperties.html#cfn-appflow-connectorprofile-sapodataconnectorprofileproperties-applicationhosturl
+	ApplicationHostUrl *types.Value `json:"ApplicationHostUrl,omitempty"`
+
+	// ApplicationServicePath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-sapodataconnectorprofileproperties.html#cfn-appflow-connectorprofile-sapodataconnectorprofileproperties-applicationservicepath
+	ApplicationServicePath *types.Value `json:"ApplicationServicePath,omitempty"`
+
+	// ClientNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-sapodataconnectorprofileproperties.html#cfn-appflow-connectorprofile-sapodataconnectorprofileproperties-clientnumber
+	ClientNumber *types.Value `json:"ClientNumber,omitempty"`
+
+	// LogonLanguage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-sapodataconnectorprofileproperties.html#cfn-appflow-connectorprofile-sapodataconnectorprofileproperties-logonlanguage
+	LogonLanguage *types.Value `json:"LogonLanguage,omitempty"`
+
+	// OAuthProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-sapodataconnectorprofileproperties.html#cfn-appflow-connectorprofile-sapodataconnectorprofileproperties-oauthproperties
+	OAuthProperties *ConnectorProfile_OAuthProperties `json:"OAuthProperties,omitempty"`
+
+	// PortNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-sapodataconnectorprofileproperties.html#cfn-appflow-connectorprofile-sapodataconnectorprofileproperties-portnumber
+	PortNumber *types.Value `json:"PortNumber,omitempty"`
+
+	// PrivateLinkServiceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-sapodataconnectorprofileproperties.html#cfn-appflow-connectorprofile-sapodataconnectorprofileproperties-privatelinkservicename
+	PrivateLinkServiceName *types.Value `json:"PrivateLinkServiceName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_SAPODataConnectorProfileProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofilecredentials.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofilecredentials.go
new file mode 100644
index 0000000000..62dfe8c04b
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofilecredentials.go
@@ -0,0 +1,42 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_ServiceNowConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileCredentials)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-servicenowconnectorprofilecredentials.html
+type ConnectorProfile_ServiceNowConnectorProfileCredentials struct {
+
+	// Password AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-servicenowconnectorprofilecredentials.html#cfn-appflow-connectorprofile-servicenowconnectorprofilecredentials-password
+	Password *types.Value `json:"Password,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-servicenowconnectorprofilecredentials.html#cfn-appflow-connectorprofile-servicenowconnectorprofilecredentials-username
+	Username *types.Value `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 *ConnectorProfile_ServiceNowConnectorProfileCredentials) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileCredentials"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofileproperties.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofileproperties.go
new file mode 100644
index 0000000000..e8ba101748
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_servicenowconnectorprofileproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_ServiceNowConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-servicenowconnectorprofileproperties.html
+type ConnectorProfile_ServiceNowConnectorProfileProperties struct {
+
+	// InstanceUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-servicenowconnectorprofileproperties.html#cfn-appflow-connectorprofile-servicenowconnectorprofileproperties-instanceurl
+	InstanceUrl *types.Value `json:"InstanceUrl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_ServiceNowConnectorProfileProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_singularconnectorprofilecredentials.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_singularconnectorprofilecredentials.go
new file mode 100644
index 0000000000..da7dda2025
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_singularconnectorprofilecredentials.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_SingularConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.SingularConnectorProfileCredentials)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-singularconnectorprofilecredentials.html
+type ConnectorProfile_SingularConnectorProfileCredentials struct {
+
+	// ApiKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-singularconnectorprofilecredentials.html#cfn-appflow-connectorprofile-singularconnectorprofilecredentials-apikey
+	ApiKey *types.Value `json:"ApiKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_SingularConnectorProfileCredentials) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.SingularConnectorProfileCredentials"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofilecredentials.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofilecredentials.go
new file mode 100644
index 0000000000..93ab72ab76
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofilecredentials.go
@@ -0,0 +1,52 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_SlackConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.SlackConnectorProfileCredentials)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-slackconnectorprofilecredentials.html
+type ConnectorProfile_SlackConnectorProfileCredentials struct {
+
+	// AccessToken AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-slackconnectorprofilecredentials.html#cfn-appflow-connectorprofile-slackconnectorprofilecredentials-accesstoken
+	AccessToken *types.Value `json:"AccessToken,omitempty"`
+
+	// ClientId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-slackconnectorprofilecredentials.html#cfn-appflow-connectorprofile-slackconnectorprofilecredentials-clientid
+	ClientId *types.Value `json:"ClientId,omitempty"`
+
+	// ClientSecret AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-slackconnectorprofilecredentials.html#cfn-appflow-connectorprofile-slackconnectorprofilecredentials-clientsecret
+	ClientSecret *types.Value `json:"ClientSecret,omitempty"`
+
+	// ConnectorOAuthRequest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-slackconnectorprofilecredentials.html#cfn-appflow-connectorprofile-slackconnectorprofilecredentials-connectoroauthrequest
+	ConnectorOAuthRequest *ConnectorProfile_ConnectorOAuthRequest `json:"ConnectorOAuthRequest,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_SlackConnectorProfileCredentials) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.SlackConnectorProfileCredentials"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofileproperties.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofileproperties.go
new file mode 100644
index 0000000000..321979f0ff
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_slackconnectorprofileproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_SlackConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.SlackConnectorProfileProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-slackconnectorprofileproperties.html
+type ConnectorProfile_SlackConnectorProfileProperties struct {
+
+	// InstanceUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-slackconnectorprofileproperties.html#cfn-appflow-connectorprofile-slackconnectorprofileproperties-instanceurl
+	InstanceUrl *types.Value `json:"InstanceUrl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_SlackConnectorProfileProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.SlackConnectorProfileProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofilecredentials.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofilecredentials.go
new file mode 100644
index 0000000000..2f3b66f3cb
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofilecredentials.go
@@ -0,0 +1,42 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_SnowflakeConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileCredentials)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-snowflakeconnectorprofilecredentials.html
+type ConnectorProfile_SnowflakeConnectorProfileCredentials struct {
+
+	// Password AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-snowflakeconnectorprofilecredentials.html#cfn-appflow-connectorprofile-snowflakeconnectorprofilecredentials-password
+	Password *types.Value `json:"Password,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-snowflakeconnectorprofilecredentials.html#cfn-appflow-connectorprofile-snowflakeconnectorprofilecredentials-username
+	Username *types.Value `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 *ConnectorProfile_SnowflakeConnectorProfileCredentials) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileCredentials"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofileproperties.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofileproperties.go
new file mode 100644
index 0000000000..ca67ed22a4
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_snowflakeconnectorprofileproperties.go
@@ -0,0 +1,67 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_SnowflakeConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-snowflakeconnectorprofileproperties.html
+type ConnectorProfile_SnowflakeConnectorProfileProperties struct {
+
+	// AccountName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-snowflakeconnectorprofileproperties.html#cfn-appflow-connectorprofile-snowflakeconnectorprofileproperties-accountname
+	AccountName *types.Value `json:"AccountName,omitempty"`
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-snowflakeconnectorprofileproperties.html#cfn-appflow-connectorprofile-snowflakeconnectorprofileproperties-bucketname
+	BucketName *types.Value `json:"BucketName,omitempty"`
+
+	// BucketPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-snowflakeconnectorprofileproperties.html#cfn-appflow-connectorprofile-snowflakeconnectorprofileproperties-bucketprefix
+	BucketPrefix *types.Value `json:"BucketPrefix,omitempty"`
+
+	// PrivateLinkServiceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-snowflakeconnectorprofileproperties.html#cfn-appflow-connectorprofile-snowflakeconnectorprofileproperties-privatelinkservicename
+	PrivateLinkServiceName *types.Value `json:"PrivateLinkServiceName,omitempty"`
+
+	// Region AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-snowflakeconnectorprofileproperties.html#cfn-appflow-connectorprofile-snowflakeconnectorprofileproperties-region
+	Region *types.Value `json:"Region,omitempty"`
+
+	// Stage AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-snowflakeconnectorprofileproperties.html#cfn-appflow-connectorprofile-snowflakeconnectorprofileproperties-stage
+	Stage *types.Value `json:"Stage,omitempty"`
+
+	// Warehouse AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-snowflakeconnectorprofileproperties.html#cfn-appflow-connectorprofile-snowflakeconnectorprofileproperties-warehouse
+	Warehouse *types.Value `json:"Warehouse,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_SnowflakeConnectorProfileProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_trendmicroconnectorprofilecredentials.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_trendmicroconnectorprofilecredentials.go
new file mode 100644
index 0000000000..0935c26056
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_trendmicroconnectorprofilecredentials.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_TrendmicroConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.TrendmicroConnectorProfileCredentials)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-trendmicroconnectorprofilecredentials.html
+type ConnectorProfile_TrendmicroConnectorProfileCredentials struct {
+
+	// ApiSecretKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-trendmicroconnectorprofilecredentials.html#cfn-appflow-connectorprofile-trendmicroconnectorprofilecredentials-apisecretkey
+	ApiSecretKey *types.Value `json:"ApiSecretKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_TrendmicroConnectorProfileCredentials) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.TrendmicroConnectorProfileCredentials"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofilecredentials.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofilecredentials.go
new file mode 100644
index 0000000000..9c105aaa69
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofilecredentials.go
@@ -0,0 +1,42 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_VeevaConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileCredentials)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-veevaconnectorprofilecredentials.html
+type ConnectorProfile_VeevaConnectorProfileCredentials struct {
+
+	// Password AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-veevaconnectorprofilecredentials.html#cfn-appflow-connectorprofile-veevaconnectorprofilecredentials-password
+	Password *types.Value `json:"Password,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-veevaconnectorprofilecredentials.html#cfn-appflow-connectorprofile-veevaconnectorprofilecredentials-username
+	Username *types.Value `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 *ConnectorProfile_VeevaConnectorProfileCredentials) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileCredentials"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofileproperties.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofileproperties.go
new file mode 100644
index 0000000000..5f6e7a62f9
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_veevaconnectorprofileproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_VeevaConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-veevaconnectorprofileproperties.html
+type ConnectorProfile_VeevaConnectorProfileProperties struct {
+
+	// InstanceUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-veevaconnectorprofileproperties.html#cfn-appflow-connectorprofile-veevaconnectorprofileproperties-instanceurl
+	InstanceUrl *types.Value `json:"InstanceUrl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_VeevaConnectorProfileProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofilecredentials.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofilecredentials.go
new file mode 100644
index 0000000000..34314ecb42
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofilecredentials.go
@@ -0,0 +1,52 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_ZendeskConnectorProfileCredentials AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileCredentials)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-zendeskconnectorprofilecredentials.html
+type ConnectorProfile_ZendeskConnectorProfileCredentials struct {
+
+	// AccessToken AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-zendeskconnectorprofilecredentials.html#cfn-appflow-connectorprofile-zendeskconnectorprofilecredentials-accesstoken
+	AccessToken *types.Value `json:"AccessToken,omitempty"`
+
+	// ClientId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-zendeskconnectorprofilecredentials.html#cfn-appflow-connectorprofile-zendeskconnectorprofilecredentials-clientid
+	ClientId *types.Value `json:"ClientId,omitempty"`
+
+	// ClientSecret AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-zendeskconnectorprofilecredentials.html#cfn-appflow-connectorprofile-zendeskconnectorprofilecredentials-clientsecret
+	ClientSecret *types.Value `json:"ClientSecret,omitempty"`
+
+	// ConnectorOAuthRequest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-zendeskconnectorprofilecredentials.html#cfn-appflow-connectorprofile-zendeskconnectorprofilecredentials-connectoroauthrequest
+	ConnectorOAuthRequest *ConnectorProfile_ConnectorOAuthRequest `json:"ConnectorOAuthRequest,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_ZendeskConnectorProfileCredentials) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileCredentials"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofileproperties.go b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofileproperties.go
new file mode 100644
index 0000000000..013766a199
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-connectorprofile_zendeskconnectorprofileproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorProfile_ZendeskConnectorProfileProperties AWS CloudFormation Resource (AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-zendeskconnectorprofileproperties.html
+type ConnectorProfile_ZendeskConnectorProfileProperties struct {
+
+	// InstanceUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-connectorprofile-zendeskconnectorprofileproperties.html#cfn-appflow-connectorprofile-zendeskconnectorprofileproperties-instanceurl
+	InstanceUrl *types.Value `json:"InstanceUrl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorProfile_ZendeskConnectorProfileProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow.go b/goformation/cloudformation/appflow/aws-appflow-flow.go
new file mode 100644
index 0000000000..1802b2def8
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow.go
@@ -0,0 +1,144 @@
+package appflow
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow AWS CloudFormation Resource (AWS::AppFlow::Flow)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-flow.html
+type Flow struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-flow.html#cfn-appflow-flow-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DestinationFlowConfigList AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-flow.html#cfn-appflow-flow-destinationflowconfiglist
+	DestinationFlowConfigList []Flow_DestinationFlowConfig `json:"DestinationFlowConfigList,omitempty"`
+
+	// FlowName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-flow.html#cfn-appflow-flow-flowname
+	FlowName *types.Value `json:"FlowName,omitempty"`
+
+	// KMSArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-flow.html#cfn-appflow-flow-kmsarn
+	KMSArn *types.Value `json:"KMSArn,omitempty"`
+
+	// SourceFlowConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-flow.html#cfn-appflow-flow-sourceflowconfig
+	SourceFlowConfig *Flow_SourceFlowConfig `json:"SourceFlowConfig,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-flow.html#cfn-appflow-flow-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Tasks AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-flow.html#cfn-appflow-flow-tasks
+	Tasks []Flow_Task `json:"Tasks,omitempty"`
+
+	// TriggerConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appflow-flow.html#cfn-appflow-flow-triggerconfig
+	TriggerConfig *Flow_TriggerConfig `json:"TriggerConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::AppFlow::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appflow/aws-appflow-flow_aggregationconfig.go b/goformation/cloudformation/appflow/aws-appflow-flow_aggregationconfig.go
new file mode 100644
index 0000000000..83c577feab
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_aggregationconfig.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_AggregationConfig AWS CloudFormation Resource (AWS::AppFlow::Flow.AggregationConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-aggregationconfig.html
+type Flow_AggregationConfig struct {
+
+	// AggregationType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-aggregationconfig.html#cfn-appflow-flow-aggregationconfig-aggregationtype
+	AggregationType *types.Value `json:"AggregationType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AggregationConfig) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.AggregationConfig"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_amplitudesourceproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_amplitudesourceproperties.go
new file mode 100644
index 0000000000..04a158454f
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_amplitudesourceproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_AmplitudeSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.AmplitudeSourceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-amplitudesourceproperties.html
+type Flow_AmplitudeSourceProperties struct {
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-amplitudesourceproperties.html#cfn-appflow-flow-amplitudesourceproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AmplitudeSourceProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.AmplitudeSourceProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_connectoroperator.go b/goformation/cloudformation/appflow/aws-appflow-flow_connectoroperator.go
new file mode 100644
index 0000000000..47a709fb6a
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_connectoroperator.go
@@ -0,0 +1,107 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_ConnectorOperator AWS CloudFormation Resource (AWS::AppFlow::Flow.ConnectorOperator)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-connectoroperator.html
+type Flow_ConnectorOperator struct {
+
+	// Amplitude AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-connectoroperator.html#cfn-appflow-flow-connectoroperator-amplitude
+	Amplitude *types.Value `json:"Amplitude,omitempty"`
+
+	// Datadog AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-connectoroperator.html#cfn-appflow-flow-connectoroperator-datadog
+	Datadog *types.Value `json:"Datadog,omitempty"`
+
+	// Dynatrace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-connectoroperator.html#cfn-appflow-flow-connectoroperator-dynatrace
+	Dynatrace *types.Value `json:"Dynatrace,omitempty"`
+
+	// GoogleAnalytics AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-connectoroperator.html#cfn-appflow-flow-connectoroperator-googleanalytics
+	GoogleAnalytics *types.Value `json:"GoogleAnalytics,omitempty"`
+
+	// InforNexus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-connectoroperator.html#cfn-appflow-flow-connectoroperator-infornexus
+	InforNexus *types.Value `json:"InforNexus,omitempty"`
+
+	// Marketo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-connectoroperator.html#cfn-appflow-flow-connectoroperator-marketo
+	Marketo *types.Value `json:"Marketo,omitempty"`
+
+	// S3 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-connectoroperator.html#cfn-appflow-flow-connectoroperator-s3
+	S3 *types.Value `json:"S3,omitempty"`
+
+	// SAPOData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-connectoroperator.html#cfn-appflow-flow-connectoroperator-sapodata
+	SAPOData *types.Value `json:"SAPOData,omitempty"`
+
+	// Salesforce AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-connectoroperator.html#cfn-appflow-flow-connectoroperator-salesforce
+	Salesforce *types.Value `json:"Salesforce,omitempty"`
+
+	// ServiceNow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-connectoroperator.html#cfn-appflow-flow-connectoroperator-servicenow
+	ServiceNow *types.Value `json:"ServiceNow,omitempty"`
+
+	// Singular AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-connectoroperator.html#cfn-appflow-flow-connectoroperator-singular
+	Singular *types.Value `json:"Singular,omitempty"`
+
+	// Slack AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-connectoroperator.html#cfn-appflow-flow-connectoroperator-slack
+	Slack *types.Value `json:"Slack,omitempty"`
+
+	// Trendmicro AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-connectoroperator.html#cfn-appflow-flow-connectoroperator-trendmicro
+	Trendmicro *types.Value `json:"Trendmicro,omitempty"`
+
+	// Veeva AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-connectoroperator.html#cfn-appflow-flow-connectoroperator-veeva
+	Veeva *types.Value `json:"Veeva,omitempty"`
+
+	// Zendesk AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-connectoroperator.html#cfn-appflow-flow-connectoroperator-zendesk
+	Zendesk *types.Value `json:"Zendesk,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ConnectorOperator) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.ConnectorOperator"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_datadogsourceproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_datadogsourceproperties.go
new file mode 100644
index 0000000000..20723dc428
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_datadogsourceproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_DatadogSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.DatadogSourceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-datadogsourceproperties.html
+type Flow_DatadogSourceProperties struct {
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-datadogsourceproperties.html#cfn-appflow-flow-datadogsourceproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DatadogSourceProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.DatadogSourceProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_destinationconnectorproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_destinationconnectorproperties.go
new file mode 100644
index 0000000000..f648d0e4b4
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_destinationconnectorproperties.go
@@ -0,0 +1,70 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_DestinationConnectorProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.DestinationConnectorProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-destinationconnectorproperties.html
+type Flow_DestinationConnectorProperties struct {
+
+	// EventBridge AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-destinationconnectorproperties.html#cfn-appflow-flow-destinationconnectorproperties-eventbridge
+	EventBridge *Flow_EventBridgeDestinationProperties `json:"EventBridge,omitempty"`
+
+	// LookoutMetrics AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-destinationconnectorproperties.html#cfn-appflow-flow-destinationconnectorproperties-lookoutmetrics
+	LookoutMetrics *Flow_LookoutMetricsDestinationProperties `json:"LookoutMetrics,omitempty"`
+
+	// Redshift AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-destinationconnectorproperties.html#cfn-appflow-flow-destinationconnectorproperties-redshift
+	Redshift *Flow_RedshiftDestinationProperties `json:"Redshift,omitempty"`
+
+	// S3 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-destinationconnectorproperties.html#cfn-appflow-flow-destinationconnectorproperties-s3
+	S3 *Flow_S3DestinationProperties `json:"S3,omitempty"`
+
+	// Salesforce AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-destinationconnectorproperties.html#cfn-appflow-flow-destinationconnectorproperties-salesforce
+	Salesforce *Flow_SalesforceDestinationProperties `json:"Salesforce,omitempty"`
+
+	// Snowflake AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-destinationconnectorproperties.html#cfn-appflow-flow-destinationconnectorproperties-snowflake
+	Snowflake *Flow_SnowflakeDestinationProperties `json:"Snowflake,omitempty"`
+
+	// Upsolver AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-destinationconnectorproperties.html#cfn-appflow-flow-destinationconnectorproperties-upsolver
+	Upsolver *Flow_UpsolverDestinationProperties `json:"Upsolver,omitempty"`
+
+	// Zendesk AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-destinationconnectorproperties.html#cfn-appflow-flow-destinationconnectorproperties-zendesk
+	Zendesk *Flow_ZendeskDestinationProperties `json:"Zendesk,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DestinationConnectorProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.DestinationConnectorProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_destinationflowconfig.go b/goformation/cloudformation/appflow/aws-appflow-flow_destinationflowconfig.go
new file mode 100644
index 0000000000..4a561ab400
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_destinationflowconfig.go
@@ -0,0 +1,47 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_DestinationFlowConfig AWS CloudFormation Resource (AWS::AppFlow::Flow.DestinationFlowConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-destinationflowconfig.html
+type Flow_DestinationFlowConfig struct {
+
+	// ConnectorProfileName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-destinationflowconfig.html#cfn-appflow-flow-destinationflowconfig-connectorprofilename
+	ConnectorProfileName *types.Value `json:"ConnectorProfileName,omitempty"`
+
+	// ConnectorType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-destinationflowconfig.html#cfn-appflow-flow-destinationflowconfig-connectortype
+	ConnectorType *types.Value `json:"ConnectorType,omitempty"`
+
+	// DestinationConnectorProperties AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-destinationflowconfig.html#cfn-appflow-flow-destinationflowconfig-destinationconnectorproperties
+	DestinationConnectorProperties *Flow_DestinationConnectorProperties `json:"DestinationConnectorProperties,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DestinationFlowConfig) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.DestinationFlowConfig"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_dynatracesourceproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_dynatracesourceproperties.go
new file mode 100644
index 0000000000..1aee61d954
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_dynatracesourceproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_DynatraceSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.DynatraceSourceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-dynatracesourceproperties.html
+type Flow_DynatraceSourceProperties struct {
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-dynatracesourceproperties.html#cfn-appflow-flow-dynatracesourceproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DynatraceSourceProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.DynatraceSourceProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_errorhandlingconfig.go b/goformation/cloudformation/appflow/aws-appflow-flow_errorhandlingconfig.go
new file mode 100644
index 0000000000..36990ef36d
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_errorhandlingconfig.go
@@ -0,0 +1,47 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_ErrorHandlingConfig AWS CloudFormation Resource (AWS::AppFlow::Flow.ErrorHandlingConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-errorhandlingconfig.html
+type Flow_ErrorHandlingConfig struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-errorhandlingconfig.html#cfn-appflow-flow-errorhandlingconfig-bucketname
+	BucketName *types.Value `json:"BucketName,omitempty"`
+
+	// BucketPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-errorhandlingconfig.html#cfn-appflow-flow-errorhandlingconfig-bucketprefix
+	BucketPrefix *types.Value `json:"BucketPrefix,omitempty"`
+
+	// FailOnFirstError AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-errorhandlingconfig.html#cfn-appflow-flow-errorhandlingconfig-failonfirsterror
+	FailOnFirstError *types.Value `json:"FailOnFirstError,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ErrorHandlingConfig) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.ErrorHandlingConfig"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_eventbridgedestinationproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_eventbridgedestinationproperties.go
new file mode 100644
index 0000000000..47f96bd4ea
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_eventbridgedestinationproperties.go
@@ -0,0 +1,42 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_EventBridgeDestinationProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.EventBridgeDestinationProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-eventbridgedestinationproperties.html
+type Flow_EventBridgeDestinationProperties struct {
+
+	// ErrorHandlingConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-eventbridgedestinationproperties.html#cfn-appflow-flow-eventbridgedestinationproperties-errorhandlingconfig
+	ErrorHandlingConfig *Flow_ErrorHandlingConfig `json:"ErrorHandlingConfig,omitempty"`
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-eventbridgedestinationproperties.html#cfn-appflow-flow-eventbridgedestinationproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EventBridgeDestinationProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.EventBridgeDestinationProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_googleanalyticssourceproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_googleanalyticssourceproperties.go
new file mode 100644
index 0000000000..60c71ca615
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_googleanalyticssourceproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_GoogleAnalyticsSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.GoogleAnalyticsSourceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-googleanalyticssourceproperties.html
+type Flow_GoogleAnalyticsSourceProperties struct {
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-googleanalyticssourceproperties.html#cfn-appflow-flow-googleanalyticssourceproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_GoogleAnalyticsSourceProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.GoogleAnalyticsSourceProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_incrementalpullconfig.go b/goformation/cloudformation/appflow/aws-appflow-flow_incrementalpullconfig.go
new file mode 100644
index 0000000000..b47f741da2
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_incrementalpullconfig.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_IncrementalPullConfig AWS CloudFormation Resource (AWS::AppFlow::Flow.IncrementalPullConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-incrementalpullconfig.html
+type Flow_IncrementalPullConfig struct {
+
+	// DatetimeTypeFieldName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-incrementalpullconfig.html#cfn-appflow-flow-incrementalpullconfig-datetimetypefieldname
+	DatetimeTypeFieldName *types.Value `json:"DatetimeTypeFieldName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_IncrementalPullConfig) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.IncrementalPullConfig"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_infornexussourceproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_infornexussourceproperties.go
new file mode 100644
index 0000000000..8617171275
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_infornexussourceproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_InforNexusSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.InforNexusSourceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-infornexussourceproperties.html
+type Flow_InforNexusSourceProperties struct {
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-infornexussourceproperties.html#cfn-appflow-flow-infornexussourceproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InforNexusSourceProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.InforNexusSourceProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_lookoutmetricsdestinationproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_lookoutmetricsdestinationproperties.go
new file mode 100644
index 0000000000..7c07028720
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_lookoutmetricsdestinationproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_LookoutMetricsDestinationProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.LookoutMetricsDestinationProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-lookoutmetricsdestinationproperties.html
+type Flow_LookoutMetricsDestinationProperties struct {
+
+	// Object AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-lookoutmetricsdestinationproperties.html#cfn-appflow-flow-lookoutmetricsdestinationproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LookoutMetricsDestinationProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.LookoutMetricsDestinationProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_marketosourceproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_marketosourceproperties.go
new file mode 100644
index 0000000000..d28b0cccc6
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_marketosourceproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_MarketoSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.MarketoSourceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-marketosourceproperties.html
+type Flow_MarketoSourceProperties struct {
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-marketosourceproperties.html#cfn-appflow-flow-marketosourceproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_MarketoSourceProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.MarketoSourceProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_prefixconfig.go b/goformation/cloudformation/appflow/aws-appflow-flow_prefixconfig.go
new file mode 100644
index 0000000000..6871e240f8
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_prefixconfig.go
@@ -0,0 +1,42 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_PrefixConfig AWS CloudFormation Resource (AWS::AppFlow::Flow.PrefixConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-prefixconfig.html
+type Flow_PrefixConfig struct {
+
+	// PrefixFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-prefixconfig.html#cfn-appflow-flow-prefixconfig-prefixformat
+	PrefixFormat *types.Value `json:"PrefixFormat,omitempty"`
+
+	// PrefixType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-prefixconfig.html#cfn-appflow-flow-prefixconfig-prefixtype
+	PrefixType *types.Value `json:"PrefixType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PrefixConfig) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.PrefixConfig"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_redshiftdestinationproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_redshiftdestinationproperties.go
new file mode 100644
index 0000000000..bd1d7aaad0
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_redshiftdestinationproperties.go
@@ -0,0 +1,52 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_RedshiftDestinationProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.RedshiftDestinationProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-redshiftdestinationproperties.html
+type Flow_RedshiftDestinationProperties struct {
+
+	// BucketPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-redshiftdestinationproperties.html#cfn-appflow-flow-redshiftdestinationproperties-bucketprefix
+	BucketPrefix *types.Value `json:"BucketPrefix,omitempty"`
+
+	// ErrorHandlingConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-redshiftdestinationproperties.html#cfn-appflow-flow-redshiftdestinationproperties-errorhandlingconfig
+	ErrorHandlingConfig *Flow_ErrorHandlingConfig `json:"ErrorHandlingConfig,omitempty"`
+
+	// IntermediateBucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-redshiftdestinationproperties.html#cfn-appflow-flow-redshiftdestinationproperties-intermediatebucketname
+	IntermediateBucketName *types.Value `json:"IntermediateBucketName,omitempty"`
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-redshiftdestinationproperties.html#cfn-appflow-flow-redshiftdestinationproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RedshiftDestinationProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.RedshiftDestinationProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_s3destinationproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_s3destinationproperties.go
new file mode 100644
index 0000000000..61b1dfcad0
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_s3destinationproperties.go
@@ -0,0 +1,47 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_S3DestinationProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.S3DestinationProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-s3destinationproperties.html
+type Flow_S3DestinationProperties struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-s3destinationproperties.html#cfn-appflow-flow-s3destinationproperties-bucketname
+	BucketName *types.Value `json:"BucketName,omitempty"`
+
+	// BucketPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-s3destinationproperties.html#cfn-appflow-flow-s3destinationproperties-bucketprefix
+	BucketPrefix *types.Value `json:"BucketPrefix,omitempty"`
+
+	// S3OutputFormatConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-s3destinationproperties.html#cfn-appflow-flow-s3destinationproperties-s3outputformatconfig
+	S3OutputFormatConfig *Flow_S3OutputFormatConfig `json:"S3OutputFormatConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_S3DestinationProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.S3DestinationProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_s3inputformatconfig.go b/goformation/cloudformation/appflow/aws-appflow-flow_s3inputformatconfig.go
new file mode 100644
index 0000000000..bdff4b9c82
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_s3inputformatconfig.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_S3InputFormatConfig AWS CloudFormation Resource (AWS::AppFlow::Flow.S3InputFormatConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-s3inputformatconfig.html
+type Flow_S3InputFormatConfig struct {
+
+	// S3InputFileType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-s3inputformatconfig.html#cfn-appflow-flow-s3inputformatconfig-s3inputfiletype
+	S3InputFileType *types.Value `json:"S3InputFileType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_S3InputFormatConfig) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.S3InputFormatConfig"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_s3outputformatconfig.go b/goformation/cloudformation/appflow/aws-appflow-flow_s3outputformatconfig.go
new file mode 100644
index 0000000000..99f5be618a
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_s3outputformatconfig.go
@@ -0,0 +1,47 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_S3OutputFormatConfig AWS CloudFormation Resource (AWS::AppFlow::Flow.S3OutputFormatConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-s3outputformatconfig.html
+type Flow_S3OutputFormatConfig struct {
+
+	// AggregationConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-s3outputformatconfig.html#cfn-appflow-flow-s3outputformatconfig-aggregationconfig
+	AggregationConfig *Flow_AggregationConfig `json:"AggregationConfig,omitempty"`
+
+	// FileType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-s3outputformatconfig.html#cfn-appflow-flow-s3outputformatconfig-filetype
+	FileType *types.Value `json:"FileType,omitempty"`
+
+	// PrefixConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-s3outputformatconfig.html#cfn-appflow-flow-s3outputformatconfig-prefixconfig
+	PrefixConfig *Flow_PrefixConfig `json:"PrefixConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_S3OutputFormatConfig) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.S3OutputFormatConfig"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_s3sourceproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_s3sourceproperties.go
new file mode 100644
index 0000000000..e069baff18
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_s3sourceproperties.go
@@ -0,0 +1,47 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_S3SourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.S3SourceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-s3sourceproperties.html
+type Flow_S3SourceProperties struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-s3sourceproperties.html#cfn-appflow-flow-s3sourceproperties-bucketname
+	BucketName *types.Value `json:"BucketName,omitempty"`
+
+	// BucketPrefix AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-s3sourceproperties.html#cfn-appflow-flow-s3sourceproperties-bucketprefix
+	BucketPrefix *types.Value `json:"BucketPrefix,omitempty"`
+
+	// S3InputFormatConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-s3sourceproperties.html#cfn-appflow-flow-s3sourceproperties-s3inputformatconfig
+	S3InputFormatConfig *Flow_S3InputFormatConfig `json:"S3InputFormatConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_S3SourceProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.S3SourceProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_salesforcedestinationproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_salesforcedestinationproperties.go
new file mode 100644
index 0000000000..6021eafc8a
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_salesforcedestinationproperties.go
@@ -0,0 +1,52 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_SalesforceDestinationProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.SalesforceDestinationProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-salesforcedestinationproperties.html
+type Flow_SalesforceDestinationProperties struct {
+
+	// ErrorHandlingConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-salesforcedestinationproperties.html#cfn-appflow-flow-salesforcedestinationproperties-errorhandlingconfig
+	ErrorHandlingConfig *Flow_ErrorHandlingConfig `json:"ErrorHandlingConfig,omitempty"`
+
+	// IdFieldNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-salesforcedestinationproperties.html#cfn-appflow-flow-salesforcedestinationproperties-idfieldnames
+	IdFieldNames *types.Value `json:"IdFieldNames,omitempty"`
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-salesforcedestinationproperties.html#cfn-appflow-flow-salesforcedestinationproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// WriteOperationType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-salesforcedestinationproperties.html#cfn-appflow-flow-salesforcedestinationproperties-writeoperationtype
+	WriteOperationType *types.Value `json:"WriteOperationType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SalesforceDestinationProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.SalesforceDestinationProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_salesforcesourceproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_salesforcesourceproperties.go
new file mode 100644
index 0000000000..e8a00a9a09
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_salesforcesourceproperties.go
@@ -0,0 +1,47 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_SalesforceSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.SalesforceSourceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-salesforcesourceproperties.html
+type Flow_SalesforceSourceProperties struct {
+
+	// EnableDynamicFieldUpdate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-salesforcesourceproperties.html#cfn-appflow-flow-salesforcesourceproperties-enabledynamicfieldupdate
+	EnableDynamicFieldUpdate *types.Value `json:"EnableDynamicFieldUpdate,omitempty"`
+
+	// IncludeDeletedRecords AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-salesforcesourceproperties.html#cfn-appflow-flow-salesforcesourceproperties-includedeletedrecords
+	IncludeDeletedRecords *types.Value `json:"IncludeDeletedRecords,omitempty"`
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-salesforcesourceproperties.html#cfn-appflow-flow-salesforcesourceproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SalesforceSourceProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.SalesforceSourceProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_sapodatasourceproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_sapodatasourceproperties.go
new file mode 100644
index 0000000000..ae31e07510
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_sapodatasourceproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_SAPODataSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.SAPODataSourceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sapodatasourceproperties.html
+type Flow_SAPODataSourceProperties struct {
+
+	// ObjectPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sapodatasourceproperties.html#cfn-appflow-flow-sapodatasourceproperties-objectpath
+	ObjectPath *types.Value `json:"ObjectPath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SAPODataSourceProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.SAPODataSourceProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_scheduledtriggerproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_scheduledtriggerproperties.go
new file mode 100644
index 0000000000..8f44a179a0
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_scheduledtriggerproperties.go
@@ -0,0 +1,62 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_ScheduledTriggerProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.ScheduledTriggerProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-scheduledtriggerproperties.html
+type Flow_ScheduledTriggerProperties struct {
+
+	// DataPullMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-scheduledtriggerproperties.html#cfn-appflow-flow-scheduledtriggerproperties-datapullmode
+	DataPullMode *types.Value `json:"DataPullMode,omitempty"`
+
+	// ScheduleEndTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-scheduledtriggerproperties.html#cfn-appflow-flow-scheduledtriggerproperties-scheduleendtime
+	ScheduleEndTime *types.Value `json:"ScheduleEndTime,omitempty"`
+
+	// ScheduleExpression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-scheduledtriggerproperties.html#cfn-appflow-flow-scheduledtriggerproperties-scheduleexpression
+	ScheduleExpression *types.Value `json:"ScheduleExpression,omitempty"`
+
+	// ScheduleOffset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-scheduledtriggerproperties.html#cfn-appflow-flow-scheduledtriggerproperties-scheduleoffset
+	ScheduleOffset *types.Value `json:"ScheduleOffset,omitempty"`
+
+	// ScheduleStartTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-scheduledtriggerproperties.html#cfn-appflow-flow-scheduledtriggerproperties-schedulestarttime
+	ScheduleStartTime *types.Value `json:"ScheduleStartTime,omitempty"`
+
+	// TimeZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-scheduledtriggerproperties.html#cfn-appflow-flow-scheduledtriggerproperties-timezone
+	TimeZone *types.Value `json:"TimeZone,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ScheduledTriggerProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.ScheduledTriggerProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_servicenowsourceproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_servicenowsourceproperties.go
new file mode 100644
index 0000000000..931e0179d6
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_servicenowsourceproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_ServiceNowSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.ServiceNowSourceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-servicenowsourceproperties.html
+type Flow_ServiceNowSourceProperties struct {
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-servicenowsourceproperties.html#cfn-appflow-flow-servicenowsourceproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ServiceNowSourceProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.ServiceNowSourceProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_singularsourceproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_singularsourceproperties.go
new file mode 100644
index 0000000000..1db7cb6ca2
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_singularsourceproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_SingularSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.SingularSourceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-singularsourceproperties.html
+type Flow_SingularSourceProperties struct {
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-singularsourceproperties.html#cfn-appflow-flow-singularsourceproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SingularSourceProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.SingularSourceProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_slacksourceproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_slacksourceproperties.go
new file mode 100644
index 0000000000..674138457a
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_slacksourceproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_SlackSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.SlackSourceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-slacksourceproperties.html
+type Flow_SlackSourceProperties struct {
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-slacksourceproperties.html#cfn-appflow-flow-slacksourceproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SlackSourceProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.SlackSourceProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_snowflakedestinationproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_snowflakedestinationproperties.go
new file mode 100644
index 0000000000..e31537b43f
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_snowflakedestinationproperties.go
@@ -0,0 +1,52 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_SnowflakeDestinationProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.SnowflakeDestinationProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-snowflakedestinationproperties.html
+type Flow_SnowflakeDestinationProperties struct {
+
+	// BucketPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-snowflakedestinationproperties.html#cfn-appflow-flow-snowflakedestinationproperties-bucketprefix
+	BucketPrefix *types.Value `json:"BucketPrefix,omitempty"`
+
+	// ErrorHandlingConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-snowflakedestinationproperties.html#cfn-appflow-flow-snowflakedestinationproperties-errorhandlingconfig
+	ErrorHandlingConfig *Flow_ErrorHandlingConfig `json:"ErrorHandlingConfig,omitempty"`
+
+	// IntermediateBucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-snowflakedestinationproperties.html#cfn-appflow-flow-snowflakedestinationproperties-intermediatebucketname
+	IntermediateBucketName *types.Value `json:"IntermediateBucketName,omitempty"`
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-snowflakedestinationproperties.html#cfn-appflow-flow-snowflakedestinationproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SnowflakeDestinationProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.SnowflakeDestinationProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_sourceconnectorproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_sourceconnectorproperties.go
new file mode 100644
index 0000000000..c9ab0cdf65
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_sourceconnectorproperties.go
@@ -0,0 +1,105 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_SourceConnectorProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.SourceConnectorProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceconnectorproperties.html
+type Flow_SourceConnectorProperties struct {
+
+	// Amplitude AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceconnectorproperties.html#cfn-appflow-flow-sourceconnectorproperties-amplitude
+	Amplitude *Flow_AmplitudeSourceProperties `json:"Amplitude,omitempty"`
+
+	// Datadog AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceconnectorproperties.html#cfn-appflow-flow-sourceconnectorproperties-datadog
+	Datadog *Flow_DatadogSourceProperties `json:"Datadog,omitempty"`
+
+	// Dynatrace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceconnectorproperties.html#cfn-appflow-flow-sourceconnectorproperties-dynatrace
+	Dynatrace *Flow_DynatraceSourceProperties `json:"Dynatrace,omitempty"`
+
+	// GoogleAnalytics AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceconnectorproperties.html#cfn-appflow-flow-sourceconnectorproperties-googleanalytics
+	GoogleAnalytics *Flow_GoogleAnalyticsSourceProperties `json:"GoogleAnalytics,omitempty"`
+
+	// InforNexus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceconnectorproperties.html#cfn-appflow-flow-sourceconnectorproperties-infornexus
+	InforNexus *Flow_InforNexusSourceProperties `json:"InforNexus,omitempty"`
+
+	// Marketo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceconnectorproperties.html#cfn-appflow-flow-sourceconnectorproperties-marketo
+	Marketo *Flow_MarketoSourceProperties `json:"Marketo,omitempty"`
+
+	// S3 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceconnectorproperties.html#cfn-appflow-flow-sourceconnectorproperties-s3
+	S3 *Flow_S3SourceProperties `json:"S3,omitempty"`
+
+	// SAPOData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceconnectorproperties.html#cfn-appflow-flow-sourceconnectorproperties-sapodata
+	SAPOData *Flow_SAPODataSourceProperties `json:"SAPOData,omitempty"`
+
+	// Salesforce AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceconnectorproperties.html#cfn-appflow-flow-sourceconnectorproperties-salesforce
+	Salesforce *Flow_SalesforceSourceProperties `json:"Salesforce,omitempty"`
+
+	// ServiceNow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceconnectorproperties.html#cfn-appflow-flow-sourceconnectorproperties-servicenow
+	ServiceNow *Flow_ServiceNowSourceProperties `json:"ServiceNow,omitempty"`
+
+	// Singular AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceconnectorproperties.html#cfn-appflow-flow-sourceconnectorproperties-singular
+	Singular *Flow_SingularSourceProperties `json:"Singular,omitempty"`
+
+	// Slack AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceconnectorproperties.html#cfn-appflow-flow-sourceconnectorproperties-slack
+	Slack *Flow_SlackSourceProperties `json:"Slack,omitempty"`
+
+	// Trendmicro AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceconnectorproperties.html#cfn-appflow-flow-sourceconnectorproperties-trendmicro
+	Trendmicro *Flow_TrendmicroSourceProperties `json:"Trendmicro,omitempty"`
+
+	// Veeva AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceconnectorproperties.html#cfn-appflow-flow-sourceconnectorproperties-veeva
+	Veeva *Flow_VeevaSourceProperties `json:"Veeva,omitempty"`
+
+	// Zendesk AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceconnectorproperties.html#cfn-appflow-flow-sourceconnectorproperties-zendesk
+	Zendesk *Flow_ZendeskSourceProperties `json:"Zendesk,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SourceConnectorProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.SourceConnectorProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_sourceflowconfig.go b/goformation/cloudformation/appflow/aws-appflow-flow_sourceflowconfig.go
new file mode 100644
index 0000000000..b957d1eaa4
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_sourceflowconfig.go
@@ -0,0 +1,52 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_SourceFlowConfig AWS CloudFormation Resource (AWS::AppFlow::Flow.SourceFlowConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceflowconfig.html
+type Flow_SourceFlowConfig struct {
+
+	// ConnectorProfileName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceflowconfig.html#cfn-appflow-flow-sourceflowconfig-connectorprofilename
+	ConnectorProfileName *types.Value `json:"ConnectorProfileName,omitempty"`
+
+	// ConnectorType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceflowconfig.html#cfn-appflow-flow-sourceflowconfig-connectortype
+	ConnectorType *types.Value `json:"ConnectorType,omitempty"`
+
+	// IncrementalPullConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceflowconfig.html#cfn-appflow-flow-sourceflowconfig-incrementalpullconfig
+	IncrementalPullConfig *Flow_IncrementalPullConfig `json:"IncrementalPullConfig,omitempty"`
+
+	// SourceConnectorProperties AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-sourceflowconfig.html#cfn-appflow-flow-sourceflowconfig-sourceconnectorproperties
+	SourceConnectorProperties *Flow_SourceConnectorProperties `json:"SourceConnectorProperties,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SourceFlowConfig) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.SourceFlowConfig"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_task.go b/goformation/cloudformation/appflow/aws-appflow-flow_task.go
new file mode 100644
index 0000000000..7984f78937
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_task.go
@@ -0,0 +1,57 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_Task AWS CloudFormation Resource (AWS::AppFlow::Flow.Task)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-task.html
+type Flow_Task struct {
+
+	// ConnectorOperator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-task.html#cfn-appflow-flow-task-connectoroperator
+	ConnectorOperator *Flow_ConnectorOperator `json:"ConnectorOperator,omitempty"`
+
+	// DestinationField AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-task.html#cfn-appflow-flow-task-destinationfield
+	DestinationField *types.Value `json:"DestinationField,omitempty"`
+
+	// SourceFields AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-task.html#cfn-appflow-flow-task-sourcefields
+	SourceFields *types.Value `json:"SourceFields,omitempty"`
+
+	// TaskProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-task.html#cfn-appflow-flow-task-taskproperties
+	TaskProperties []Flow_TaskPropertiesObject `json:"TaskProperties,omitempty"`
+
+	// TaskType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-task.html#cfn-appflow-flow-task-tasktype
+	TaskType *types.Value `json:"TaskType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Task) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.Task"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_taskpropertiesobject.go b/goformation/cloudformation/appflow/aws-appflow-flow_taskpropertiesobject.go
new file mode 100644
index 0000000000..e007f85345
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_taskpropertiesobject.go
@@ -0,0 +1,42 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_TaskPropertiesObject AWS CloudFormation Resource (AWS::AppFlow::Flow.TaskPropertiesObject)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-taskpropertiesobject.html
+type Flow_TaskPropertiesObject struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-taskpropertiesobject.html#cfn-appflow-flow-taskpropertiesobject-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-taskpropertiesobject.html#cfn-appflow-flow-taskpropertiesobject-value
+	Value *types.Value `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 *Flow_TaskPropertiesObject) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.TaskPropertiesObject"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_trendmicrosourceproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_trendmicrosourceproperties.go
new file mode 100644
index 0000000000..db75f0c7ef
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_trendmicrosourceproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_TrendmicroSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.TrendmicroSourceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-trendmicrosourceproperties.html
+type Flow_TrendmicroSourceProperties struct {
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-trendmicrosourceproperties.html#cfn-appflow-flow-trendmicrosourceproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TrendmicroSourceProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.TrendmicroSourceProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_triggerconfig.go b/goformation/cloudformation/appflow/aws-appflow-flow_triggerconfig.go
new file mode 100644
index 0000000000..1afac80932
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_triggerconfig.go
@@ -0,0 +1,42 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_TriggerConfig AWS CloudFormation Resource (AWS::AppFlow::Flow.TriggerConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-triggerconfig.html
+type Flow_TriggerConfig struct {
+
+	// TriggerProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-triggerconfig.html#cfn-appflow-flow-triggerconfig-triggerproperties
+	TriggerProperties *Flow_ScheduledTriggerProperties `json:"TriggerProperties,omitempty"`
+
+	// TriggerType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-triggerconfig.html#cfn-appflow-flow-triggerconfig-triggertype
+	TriggerType *types.Value `json:"TriggerType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TriggerConfig) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.TriggerConfig"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_upsolverdestinationproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_upsolverdestinationproperties.go
new file mode 100644
index 0000000000..ad180348f6
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_upsolverdestinationproperties.go
@@ -0,0 +1,47 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_UpsolverDestinationProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.UpsolverDestinationProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-upsolverdestinationproperties.html
+type Flow_UpsolverDestinationProperties struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-upsolverdestinationproperties.html#cfn-appflow-flow-upsolverdestinationproperties-bucketname
+	BucketName *types.Value `json:"BucketName,omitempty"`
+
+	// BucketPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-upsolverdestinationproperties.html#cfn-appflow-flow-upsolverdestinationproperties-bucketprefix
+	BucketPrefix *types.Value `json:"BucketPrefix,omitempty"`
+
+	// S3OutputFormatConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-upsolverdestinationproperties.html#cfn-appflow-flow-upsolverdestinationproperties-s3outputformatconfig
+	S3OutputFormatConfig *Flow_UpsolverS3OutputFormatConfig `json:"S3OutputFormatConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_UpsolverDestinationProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.UpsolverDestinationProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_upsolvers3outputformatconfig.go b/goformation/cloudformation/appflow/aws-appflow-flow_upsolvers3outputformatconfig.go
new file mode 100644
index 0000000000..f48371584b
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_upsolvers3outputformatconfig.go
@@ -0,0 +1,47 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_UpsolverS3OutputFormatConfig AWS CloudFormation Resource (AWS::AppFlow::Flow.UpsolverS3OutputFormatConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-upsolvers3outputformatconfig.html
+type Flow_UpsolverS3OutputFormatConfig struct {
+
+	// AggregationConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-upsolvers3outputformatconfig.html#cfn-appflow-flow-upsolvers3outputformatconfig-aggregationconfig
+	AggregationConfig *Flow_AggregationConfig `json:"AggregationConfig,omitempty"`
+
+	// FileType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-upsolvers3outputformatconfig.html#cfn-appflow-flow-upsolvers3outputformatconfig-filetype
+	FileType *types.Value `json:"FileType,omitempty"`
+
+	// PrefixConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-upsolvers3outputformatconfig.html#cfn-appflow-flow-upsolvers3outputformatconfig-prefixconfig
+	PrefixConfig *Flow_PrefixConfig `json:"PrefixConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_UpsolverS3OutputFormatConfig) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.UpsolverS3OutputFormatConfig"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_veevasourceproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_veevasourceproperties.go
new file mode 100644
index 0000000000..0fbe0ef50a
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_veevasourceproperties.go
@@ -0,0 +1,57 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_VeevaSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.VeevaSourceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-veevasourceproperties.html
+type Flow_VeevaSourceProperties struct {
+
+	// DocumentType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-veevasourceproperties.html#cfn-appflow-flow-veevasourceproperties-documenttype
+	DocumentType *types.Value `json:"DocumentType,omitempty"`
+
+	// IncludeAllVersions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-veevasourceproperties.html#cfn-appflow-flow-veevasourceproperties-includeallversions
+	IncludeAllVersions *types.Value `json:"IncludeAllVersions,omitempty"`
+
+	// IncludeRenditions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-veevasourceproperties.html#cfn-appflow-flow-veevasourceproperties-includerenditions
+	IncludeRenditions *types.Value `json:"IncludeRenditions,omitempty"`
+
+	// IncludeSourceFiles AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-veevasourceproperties.html#cfn-appflow-flow-veevasourceproperties-includesourcefiles
+	IncludeSourceFiles *types.Value `json:"IncludeSourceFiles,omitempty"`
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-veevasourceproperties.html#cfn-appflow-flow-veevasourceproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_VeevaSourceProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.VeevaSourceProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_zendeskdestinationproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_zendeskdestinationproperties.go
new file mode 100644
index 0000000000..1000e560f8
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_zendeskdestinationproperties.go
@@ -0,0 +1,52 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_ZendeskDestinationProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.ZendeskDestinationProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-zendeskdestinationproperties.html
+type Flow_ZendeskDestinationProperties struct {
+
+	// ErrorHandlingConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-zendeskdestinationproperties.html#cfn-appflow-flow-zendeskdestinationproperties-errorhandlingconfig
+	ErrorHandlingConfig *Flow_ErrorHandlingConfig `json:"ErrorHandlingConfig,omitempty"`
+
+	// IdFieldNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-zendeskdestinationproperties.html#cfn-appflow-flow-zendeskdestinationproperties-idfieldnames
+	IdFieldNames *types.Value `json:"IdFieldNames,omitempty"`
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-zendeskdestinationproperties.html#cfn-appflow-flow-zendeskdestinationproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// WriteOperationType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-zendeskdestinationproperties.html#cfn-appflow-flow-zendeskdestinationproperties-writeoperationtype
+	WriteOperationType *types.Value `json:"WriteOperationType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ZendeskDestinationProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.ZendeskDestinationProperties"
+}
diff --git a/goformation/cloudformation/appflow/aws-appflow-flow_zendesksourceproperties.go b/goformation/cloudformation/appflow/aws-appflow-flow_zendesksourceproperties.go
new file mode 100644
index 0000000000..06d7b90373
--- /dev/null
+++ b/goformation/cloudformation/appflow/aws-appflow-flow_zendesksourceproperties.go
@@ -0,0 +1,37 @@
+package appflow
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_ZendeskSourceProperties AWS CloudFormation Resource (AWS::AppFlow::Flow.ZendeskSourceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-zendesksourceproperties.html
+type Flow_ZendeskSourceProperties struct {
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appflow-flow-zendesksourceproperties.html#cfn-appflow-flow-zendesksourceproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ZendeskSourceProperties) AWSCloudFormationType() string {
+	return "AWS::AppFlow::Flow.ZendeskSourceProperties"
+}
diff --git a/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration.go b/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration.go
new file mode 100644
index 0000000000..11e2bb1142
--- /dev/null
+++ b/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration.go
@@ -0,0 +1,129 @@
+package appintegrations
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventIntegration AWS CloudFormation Resource (AWS::AppIntegrations::EventIntegration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appintegrations-eventintegration.html
+type EventIntegration struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appintegrations-eventintegration.html#cfn-appintegrations-eventintegration-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EventBridgeBus AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appintegrations-eventintegration.html#cfn-appintegrations-eventintegration-eventbridgebus
+	EventBridgeBus *types.Value `json:"EventBridgeBus,omitempty"`
+
+	// EventFilter AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appintegrations-eventintegration.html#cfn-appintegrations-eventintegration-eventfilter
+	EventFilter *EventIntegration_EventFilter `json:"EventFilter,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appintegrations-eventintegration.html#cfn-appintegrations-eventintegration-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appintegrations-eventintegration.html#cfn-appintegrations-eventintegration-tags
+	Tags []cloudformation.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 *EventIntegration) AWSCloudFormationType() string {
+	return "AWS::AppIntegrations::EventIntegration"
+}
+
+// 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 EventIntegration) MarshalJSON() ([]byte, error) {
+	type Properties EventIntegration
+	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 *EventIntegration) UnmarshalJSON(b []byte) error {
+	type Properties EventIntegration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = EventIntegration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventfilter.go b/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventfilter.go
new file mode 100644
index 0000000000..1db1139bef
--- /dev/null
+++ b/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventfilter.go
@@ -0,0 +1,37 @@
+package appintegrations
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventIntegration_EventFilter AWS CloudFormation Resource (AWS::AppIntegrations::EventIntegration.EventFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appintegrations-eventintegration-eventfilter.html
+type EventIntegration_EventFilter struct {
+
+	// Source AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appintegrations-eventintegration-eventfilter.html#cfn-appintegrations-eventintegration-eventfilter-source
+	Source *types.Value `json:"Source,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EventIntegration_EventFilter) AWSCloudFormationType() string {
+	return "AWS::AppIntegrations::EventIntegration.EventFilter"
+}
diff --git a/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventintegrationassociation.go b/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventintegrationassociation.go
new file mode 100644
index 0000000000..ca0f995182
--- /dev/null
+++ b/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_eventintegrationassociation.go
@@ -0,0 +1,57 @@
+package appintegrations
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventIntegration_EventIntegrationAssociation AWS CloudFormation Resource (AWS::AppIntegrations::EventIntegration.EventIntegrationAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appintegrations-eventintegration-eventintegrationassociation.html
+type EventIntegration_EventIntegrationAssociation struct {
+
+	// ClientAssociationMetadata AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appintegrations-eventintegration-eventintegrationassociation.html#cfn-appintegrations-eventintegration-eventintegrationassociation-clientassociationmetadata
+	ClientAssociationMetadata []EventIntegration_Metadata `json:"ClientAssociationMetadata,omitempty"`
+
+	// ClientId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appintegrations-eventintegration-eventintegrationassociation.html#cfn-appintegrations-eventintegration-eventintegrationassociation-clientid
+	ClientId *types.Value `json:"ClientId,omitempty"`
+
+	// EventBridgeRuleName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appintegrations-eventintegration-eventintegrationassociation.html#cfn-appintegrations-eventintegration-eventintegrationassociation-eventbridgerulename
+	EventBridgeRuleName *types.Value `json:"EventBridgeRuleName,omitempty"`
+
+	// EventIntegrationAssociationArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appintegrations-eventintegration-eventintegrationassociation.html#cfn-appintegrations-eventintegration-eventintegrationassociation-eventintegrationassociationarn
+	EventIntegrationAssociationArn *types.Value `json:"EventIntegrationAssociationArn,omitempty"`
+
+	// EventIntegrationAssociationId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appintegrations-eventintegration-eventintegrationassociation.html#cfn-appintegrations-eventintegration-eventintegrationassociation-eventintegrationassociationid
+	EventIntegrationAssociationId *types.Value `json:"EventIntegrationAssociationId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EventIntegration_EventIntegrationAssociation) AWSCloudFormationType() string {
+	return "AWS::AppIntegrations::EventIntegration.EventIntegrationAssociation"
+}
diff --git a/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_metadata.go b/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_metadata.go
new file mode 100644
index 0000000000..953e3a908d
--- /dev/null
+++ b/goformation/cloudformation/appintegrations/aws-appintegrations-eventintegration_metadata.go
@@ -0,0 +1,42 @@
+package appintegrations
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventIntegration_Metadata AWS CloudFormation Resource (AWS::AppIntegrations::EventIntegration.Metadata)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appintegrations-eventintegration-metadata.html
+type EventIntegration_Metadata struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appintegrations-eventintegration-metadata.html#cfn-appintegrations-eventintegration-metadata-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appintegrations-eventintegration-metadata.html#cfn-appintegrations-eventintegration-metadata-value
+	Value *types.Value `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 *EventIntegration_Metadata) AWSCloudFormationType() string {
+	return "AWS::AppIntegrations::EventIntegration.Metadata"
+}
diff --git a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget.go b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget.go
new file mode 100644
index 0000000000..750ff94c87
--- /dev/null
+++ b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget.go
@@ -0,0 +1,143 @@
+package applicationautoscaling
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalableTarget AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalableTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html
+type ScalableTarget struct {
+
+	// MaxCapacity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html#cfn-applicationautoscaling-scalabletarget-maxcapacity
+	MaxCapacity *types.Value `json:"MaxCapacity"`
+
+	// MinCapacity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html#cfn-applicationautoscaling-scalabletarget-mincapacity
+	MinCapacity *types.Value `json:"MinCapacity"`
+
+	// ResourceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html#cfn-applicationautoscaling-scalabletarget-resourceid
+	ResourceId *types.Value `json:"ResourceId,omitempty"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html#cfn-applicationautoscaling-scalabletarget-rolearn
+	RoleARN *types.Value `json:"RoleARN,omitempty"`
+
+	// ScalableDimension AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html#cfn-applicationautoscaling-scalabletarget-scalabledimension
+	ScalableDimension *types.Value `json:"ScalableDimension,omitempty"`
+
+	// ScheduledActions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html#cfn-applicationautoscaling-scalabletarget-scheduledactions
+	ScheduledActions []ScalableTarget_ScheduledAction `json:"ScheduledActions,omitempty"`
+
+	// ServiceNamespace AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html#cfn-applicationautoscaling-scalabletarget-servicenamespace
+	ServiceNamespace *types.Value `json:"ServiceNamespace,omitempty"`
+
+	// SuspendedState AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalabletarget.html#cfn-applicationautoscaling-scalabletarget-suspendedstate
+	SuspendedState *ScalableTarget_SuspendedState `json:"SuspendedState,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScalableTarget) AWSCloudFormationType() string {
+	return "AWS::ApplicationAutoScaling::ScalableTarget"
+}
+
+// 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 ScalableTarget) MarshalJSON() ([]byte, error) {
+	type Properties ScalableTarget
+	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 *ScalableTarget) UnmarshalJSON(b []byte) error {
+	type Properties ScalableTarget
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ScalableTarget(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scalabletargetaction.go b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scalabletargetaction.go
new file mode 100644
index 0000000000..71ec013fa1
--- /dev/null
+++ b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scalabletargetaction.go
@@ -0,0 +1,42 @@
+package applicationautoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalableTarget_ScalableTargetAction AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scalabletargetaction.html
+type ScalableTarget_ScalableTargetAction struct {
+
+	// MaxCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scalabletargetaction.html#cfn-applicationautoscaling-scalabletarget-scalabletargetaction-maxcapacity
+	MaxCapacity *types.Value `json:"MaxCapacity,omitempty"`
+
+	// MinCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scalabletargetaction.html#cfn-applicationautoscaling-scalabletarget-scalabletargetaction-mincapacity
+	MinCapacity *types.Value `json:"MinCapacity,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScalableTarget_ScalableTargetAction) AWSCloudFormationType() string {
+	return "AWS::ApplicationAutoScaling::ScalableTarget.ScalableTargetAction"
+}
diff --git a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scheduledaction.go b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scheduledaction.go
new file mode 100644
index 0000000000..0c040e4e76
--- /dev/null
+++ b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_scheduledaction.go
@@ -0,0 +1,62 @@
+package applicationautoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalableTarget_ScheduledAction AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scheduledaction.html
+type ScalableTarget_ScheduledAction struct {
+
+	// EndTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scheduledaction.html#cfn-applicationautoscaling-scalabletarget-scheduledaction-endtime
+	EndTime string `json:"EndTime,omitempty"`
+
+	// ScalableTargetAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scheduledaction.html#cfn-applicationautoscaling-scalabletarget-scheduledaction-scalabletargetaction
+	ScalableTargetAction *ScalableTarget_ScalableTargetAction `json:"ScalableTargetAction,omitempty"`
+
+	// Schedule AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scheduledaction.html#cfn-applicationautoscaling-scalabletarget-scheduledaction-schedule
+	Schedule *types.Value `json:"Schedule,omitempty"`
+
+	// ScheduledActionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scheduledaction.html#cfn-applicationautoscaling-scalabletarget-scheduledaction-scheduledactionname
+	ScheduledActionName *types.Value `json:"ScheduledActionName,omitempty"`
+
+	// StartTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scheduledaction.html#cfn-applicationautoscaling-scalabletarget-scheduledaction-starttime
+	StartTime string `json:"StartTime,omitempty"`
+
+	// Timezone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-scheduledaction.html#cfn-applicationautoscaling-scalabletarget-scheduledaction-timezone
+	Timezone *types.Value `json:"Timezone,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScalableTarget_ScheduledAction) AWSCloudFormationType() string {
+	return "AWS::ApplicationAutoScaling::ScalableTarget.ScheduledAction"
+}
diff --git a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_suspendedstate.go b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_suspendedstate.go
new file mode 100644
index 0000000000..a432bf3625
--- /dev/null
+++ b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalabletarget_suspendedstate.go
@@ -0,0 +1,47 @@
+package applicationautoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalableTarget_SuspendedState AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-suspendedstate.html
+type ScalableTarget_SuspendedState struct {
+
+	// DynamicScalingInSuspended AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-suspendedstate.html#cfn-applicationautoscaling-scalabletarget-suspendedstate-dynamicscalinginsuspended
+	DynamicScalingInSuspended *types.Value `json:"DynamicScalingInSuspended,omitempty"`
+
+	// DynamicScalingOutSuspended AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-suspendedstate.html#cfn-applicationautoscaling-scalabletarget-suspendedstate-dynamicscalingoutsuspended
+	DynamicScalingOutSuspended *types.Value `json:"DynamicScalingOutSuspended,omitempty"`
+
+	// ScheduledScalingSuspended AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalabletarget-suspendedstate.html#cfn-applicationautoscaling-scalabletarget-suspendedstate-scheduledscalingsuspended
+	ScheduledScalingSuspended *types.Value `json:"ScheduledScalingSuspended,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScalableTarget_SuspendedState) AWSCloudFormationType() string {
+	return "AWS::ApplicationAutoScaling::ScalableTarget.SuspendedState"
+}
diff --git a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy.go b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy.go
new file mode 100644
index 0000000000..a8bc44b0c0
--- /dev/null
+++ b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy.go
@@ -0,0 +1,143 @@
+package applicationautoscaling
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPolicy AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalingpolicy.html
+type ScalingPolicy struct {
+
+	// PolicyName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalingpolicy.html#cfn-applicationautoscaling-scalingpolicy-policyname
+	PolicyName *types.Value `json:"PolicyName,omitempty"`
+
+	// PolicyType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalingpolicy.html#cfn-applicationautoscaling-scalingpolicy-policytype
+	PolicyType *types.Value `json:"PolicyType,omitempty"`
+
+	// ResourceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalingpolicy.html#cfn-applicationautoscaling-scalingpolicy-resourceid
+	ResourceId *types.Value `json:"ResourceId,omitempty"`
+
+	// ScalableDimension AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalingpolicy.html#cfn-applicationautoscaling-scalingpolicy-scalabledimension
+	ScalableDimension *types.Value `json:"ScalableDimension,omitempty"`
+
+	// ScalingTargetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalingpolicy.html#cfn-applicationautoscaling-scalingpolicy-scalingtargetid
+	ScalingTargetId *types.Value `json:"ScalingTargetId,omitempty"`
+
+	// ServiceNamespace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalingpolicy.html#cfn-applicationautoscaling-scalingpolicy-servicenamespace
+	ServiceNamespace *types.Value `json:"ServiceNamespace,omitempty"`
+
+	// StepScalingPolicyConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalingpolicy.html#cfn-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration
+	StepScalingPolicyConfiguration *ScalingPolicy_StepScalingPolicyConfiguration `json:"StepScalingPolicyConfiguration,omitempty"`
+
+	// TargetTrackingScalingPolicyConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationautoscaling-scalingpolicy.html#cfn-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration
+	TargetTrackingScalingPolicyConfiguration *ScalingPolicy_TargetTrackingScalingPolicyConfiguration `json:"TargetTrackingScalingPolicyConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::ApplicationAutoScaling::ScalingPolicy"
+}
+
+// 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 ScalingPolicy) MarshalJSON() ([]byte, error) {
+	type Properties ScalingPolicy
+	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 *ScalingPolicy) UnmarshalJSON(b []byte) error {
+	type Properties ScalingPolicy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ScalingPolicy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_customizedmetricspecification.go b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_customizedmetricspecification.go
new file mode 100644
index 0000000000..1b0c447d44
--- /dev/null
+++ b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_customizedmetricspecification.go
@@ -0,0 +1,57 @@
+package applicationautoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPolicy_CustomizedMetricSpecification AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy.CustomizedMetricSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-customizedmetricspecification.html
+type ScalingPolicy_CustomizedMetricSpecification struct {
+
+	// Dimensions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-customizedmetricspecification.html#cfn-applicationautoscaling-scalingpolicy-customizedmetricspecification-dimensions
+	Dimensions []ScalingPolicy_MetricDimension `json:"Dimensions,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-customizedmetricspecification.html#cfn-applicationautoscaling-scalingpolicy-customizedmetricspecification-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// Namespace AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-customizedmetricspecification.html#cfn-applicationautoscaling-scalingpolicy-customizedmetricspecification-namespace
+	Namespace *types.Value `json:"Namespace,omitempty"`
+
+	// Statistic AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-customizedmetricspecification.html#cfn-applicationautoscaling-scalingpolicy-customizedmetricspecification-statistic
+	Statistic *types.Value `json:"Statistic,omitempty"`
+
+	// Unit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-customizedmetricspecification.html#cfn-applicationautoscaling-scalingpolicy-customizedmetricspecification-unit
+	Unit *types.Value `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_CustomizedMetricSpecification) AWSCloudFormationType() string {
+	return "AWS::ApplicationAutoScaling::ScalingPolicy.CustomizedMetricSpecification"
+}
diff --git a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_metricdimension.go b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_metricdimension.go
new file mode 100644
index 0000000000..b80e86d149
--- /dev/null
+++ b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_metricdimension.go
@@ -0,0 +1,42 @@
+package applicationautoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPolicy_MetricDimension AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy.MetricDimension)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-metricdimension.html
+type ScalingPolicy_MetricDimension struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-metricdimension.html#cfn-applicationautoscaling-scalingpolicy-metricdimension-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-metricdimension.html#cfn-applicationautoscaling-scalingpolicy-metricdimension-value
+	Value *types.Value `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 *ScalingPolicy_MetricDimension) AWSCloudFormationType() string {
+	return "AWS::ApplicationAutoScaling::ScalingPolicy.MetricDimension"
+}
diff --git a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_predefinedmetricspecification.go b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_predefinedmetricspecification.go
new file mode 100644
index 0000000000..51cda4b1b2
--- /dev/null
+++ b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_predefinedmetricspecification.go
@@ -0,0 +1,42 @@
+package applicationautoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPolicy_PredefinedMetricSpecification AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy.PredefinedMetricSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-predefinedmetricspecification.html
+type ScalingPolicy_PredefinedMetricSpecification struct {
+
+	// PredefinedMetricType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-predefinedmetricspecification.html#cfn-applicationautoscaling-scalingpolicy-predefinedmetricspecification-predefinedmetrictype
+	PredefinedMetricType *types.Value `json:"PredefinedMetricType,omitempty"`
+
+	// ResourceLabel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-predefinedmetricspecification.html#cfn-applicationautoscaling-scalingpolicy-predefinedmetricspecification-resourcelabel
+	ResourceLabel *types.Value `json:"ResourceLabel,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PredefinedMetricSpecification) AWSCloudFormationType() string {
+	return "AWS::ApplicationAutoScaling::ScalingPolicy.PredefinedMetricSpecification"
+}
diff --git a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepadjustment.go b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepadjustment.go
new file mode 100644
index 0000000000..8943af36cf
--- /dev/null
+++ b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepadjustment.go
@@ -0,0 +1,47 @@
+package applicationautoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPolicy_StepAdjustment AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy.StepAdjustment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-stepadjustment.html
+type ScalingPolicy_StepAdjustment struct {
+
+	// MetricIntervalLowerBound AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-stepadjustment.html#cfn-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-stepadjustment-metricintervallowerbound
+	MetricIntervalLowerBound *types.Value `json:"MetricIntervalLowerBound,omitempty"`
+
+	// MetricIntervalUpperBound AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-stepadjustment.html#cfn-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-stepadjustment-metricintervalupperbound
+	MetricIntervalUpperBound *types.Value `json:"MetricIntervalUpperBound,omitempty"`
+
+	// ScalingAdjustment AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-stepadjustment.html#cfn-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-stepadjustment-scalingadjustment
+	ScalingAdjustment *types.Value `json:"ScalingAdjustment"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_StepAdjustment) AWSCloudFormationType() string {
+	return "AWS::ApplicationAutoScaling::ScalingPolicy.StepAdjustment"
+}
diff --git a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepscalingpolicyconfiguration.go b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepscalingpolicyconfiguration.go
new file mode 100644
index 0000000000..5fe6aa8aa4
--- /dev/null
+++ b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_stepscalingpolicyconfiguration.go
@@ -0,0 +1,57 @@
+package applicationautoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPolicy_StepScalingPolicyConfiguration AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy.StepScalingPolicyConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration.html
+type ScalingPolicy_StepScalingPolicyConfiguration struct {
+
+	// AdjustmentType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-adjustmenttype
+	AdjustmentType *types.Value `json:"AdjustmentType,omitempty"`
+
+	// Cooldown AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-cooldown
+	Cooldown *types.Value `json:"Cooldown,omitempty"`
+
+	// MetricAggregationType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-metricaggregationtype
+	MetricAggregationType *types.Value `json:"MetricAggregationType,omitempty"`
+
+	// MinAdjustmentMagnitude AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-minadjustmentmagnitude
+	MinAdjustmentMagnitude *types.Value `json:"MinAdjustmentMagnitude,omitempty"`
+
+	// StepAdjustments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-stepscalingpolicyconfiguration-stepadjustments
+	StepAdjustments []ScalingPolicy_StepAdjustment `json:"StepAdjustments,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_StepScalingPolicyConfiguration) AWSCloudFormationType() string {
+	return "AWS::ApplicationAutoScaling::ScalingPolicy.StepScalingPolicyConfiguration"
+}
diff --git a/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_targettrackingscalingpolicyconfiguration.go b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_targettrackingscalingpolicyconfiguration.go
new file mode 100644
index 0000000000..d45e0af55c
--- /dev/null
+++ b/goformation/cloudformation/applicationautoscaling/aws-applicationautoscaling-scalingpolicy_targettrackingscalingpolicyconfiguration.go
@@ -0,0 +1,62 @@
+package applicationautoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPolicy_TargetTrackingScalingPolicyConfiguration AWS CloudFormation Resource (AWS::ApplicationAutoScaling::ScalingPolicy.TargetTrackingScalingPolicyConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration.html
+type ScalingPolicy_TargetTrackingScalingPolicyConfiguration struct {
+
+	// CustomizedMetricSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration-customizedmetricspecification
+	CustomizedMetricSpecification *ScalingPolicy_CustomizedMetricSpecification `json:"CustomizedMetricSpecification,omitempty"`
+
+	// DisableScaleIn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration-disablescalein
+	DisableScaleIn *types.Value `json:"DisableScaleIn,omitempty"`
+
+	// PredefinedMetricSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration-predefinedmetricspecification
+	PredefinedMetricSpecification *ScalingPolicy_PredefinedMetricSpecification `json:"PredefinedMetricSpecification,omitempty"`
+
+	// ScaleInCooldown AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration-scaleincooldown
+	ScaleInCooldown *types.Value `json:"ScaleInCooldown,omitempty"`
+
+	// ScaleOutCooldown AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration-scaleoutcooldown
+	ScaleOutCooldown *types.Value `json:"ScaleOutCooldown,omitempty"`
+
+	// TargetValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration.html#cfn-applicationautoscaling-scalingpolicy-targettrackingscalingpolicyconfiguration-targetvalue
+	TargetValue *types.Value `json:"TargetValue"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TargetTrackingScalingPolicyConfiguration) AWSCloudFormationType() string {
+	return "AWS::ApplicationAutoScaling::ScalingPolicy.TargetTrackingScalingPolicyConfiguration"
+}
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application.go b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application.go
new file mode 100644
index 0000000000..ecfd2bb545
--- /dev/null
+++ b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application.go
@@ -0,0 +1,149 @@
+package applicationinsights
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application AWS CloudFormation Resource (AWS::ApplicationInsights::Application)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationinsights-application.html
+type Application struct {
+
+	// AutoConfigurationEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationinsights-application.html#cfn-applicationinsights-application-autoconfigurationenabled
+	AutoConfigurationEnabled *types.Value `json:"AutoConfigurationEnabled,omitempty"`
+
+	// CWEMonitorEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationinsights-application.html#cfn-applicationinsights-application-cwemonitorenabled
+	CWEMonitorEnabled *types.Value `json:"CWEMonitorEnabled,omitempty"`
+
+	// ComponentMonitoringSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationinsights-application.html#cfn-applicationinsights-application-componentmonitoringsettings
+	ComponentMonitoringSettings []Application_ComponentMonitoringSetting `json:"ComponentMonitoringSettings,omitempty"`
+
+	// CustomComponents AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationinsights-application.html#cfn-applicationinsights-application-customcomponents
+	CustomComponents []Application_CustomComponent `json:"CustomComponents,omitempty"`
+
+	// LogPatternSets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationinsights-application.html#cfn-applicationinsights-application-logpatternsets
+	LogPatternSets []Application_LogPatternSet `json:"LogPatternSets,omitempty"`
+
+	// OpsCenterEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationinsights-application.html#cfn-applicationinsights-application-opscenterenabled
+	OpsCenterEnabled *types.Value `json:"OpsCenterEnabled,omitempty"`
+
+	// OpsItemSNSTopicArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationinsights-application.html#cfn-applicationinsights-application-opsitemsnstopicarn
+	OpsItemSNSTopicArn *types.Value `json:"OpsItemSNSTopicArn,omitempty"`
+
+	// ResourceGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationinsights-application.html#cfn-applicationinsights-application-resourcegroupname
+	ResourceGroupName *types.Value `json:"ResourceGroupName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-applicationinsights-application.html#cfn-applicationinsights-application-tags
+	Tags []cloudformation.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::ApplicationInsights::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_alarm.go b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_alarm.go
new file mode 100644
index 0000000000..a0eb66d278
--- /dev/null
+++ b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_alarm.go
@@ -0,0 +1,42 @@
+package applicationinsights
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_Alarm AWS CloudFormation Resource (AWS::ApplicationInsights::Application.Alarm)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-alarm.html
+type Application_Alarm struct {
+
+	// AlarmName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-alarm.html#cfn-applicationinsights-application-alarm-alarmname
+	AlarmName *types.Value `json:"AlarmName,omitempty"`
+
+	// Severity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-alarm.html#cfn-applicationinsights-application-alarm-severity
+	Severity *types.Value `json:"Severity,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Alarm) AWSCloudFormationType() string {
+	return "AWS::ApplicationInsights::Application.Alarm"
+}
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_alarmmetric.go b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_alarmmetric.go
new file mode 100644
index 0000000000..7f9cb7dcc0
--- /dev/null
+++ b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_alarmmetric.go
@@ -0,0 +1,37 @@
+package applicationinsights
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_AlarmMetric AWS CloudFormation Resource (AWS::ApplicationInsights::Application.AlarmMetric)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-alarmmetric.html
+type Application_AlarmMetric struct {
+
+	// AlarmMetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-alarmmetric.html#cfn-applicationinsights-application-alarmmetric-alarmmetricname
+	AlarmMetricName *types.Value `json:"AlarmMetricName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AlarmMetric) AWSCloudFormationType() string {
+	return "AWS::ApplicationInsights::Application.AlarmMetric"
+}
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_componentconfiguration.go b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_componentconfiguration.go
new file mode 100644
index 0000000000..91a687c6df
--- /dev/null
+++ b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_componentconfiguration.go
@@ -0,0 +1,40 @@
+package applicationinsights
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_ComponentConfiguration AWS CloudFormation Resource (AWS::ApplicationInsights::Application.ComponentConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-componentconfiguration.html
+type Application_ComponentConfiguration struct {
+
+	// ConfigurationDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-componentconfiguration.html#cfn-applicationinsights-application-componentconfiguration-configurationdetails
+	ConfigurationDetails *Application_ConfigurationDetails `json:"ConfigurationDetails,omitempty"`
+
+	// SubComponentTypeConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-componentconfiguration.html#cfn-applicationinsights-application-componentconfiguration-subcomponenttypeconfigurations
+	SubComponentTypeConfigurations []Application_SubComponentTypeConfiguration `json:"SubComponentTypeConfigurations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ComponentConfiguration) AWSCloudFormationType() string {
+	return "AWS::ApplicationInsights::Application.ComponentConfiguration"
+}
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_componentmonitoringsetting.go b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_componentmonitoringsetting.go
new file mode 100644
index 0000000000..baf6307d03
--- /dev/null
+++ b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_componentmonitoringsetting.go
@@ -0,0 +1,62 @@
+package applicationinsights
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_ComponentMonitoringSetting AWS CloudFormation Resource (AWS::ApplicationInsights::Application.ComponentMonitoringSetting)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-componentmonitoringsetting.html
+type Application_ComponentMonitoringSetting struct {
+
+	// ComponentARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-componentmonitoringsetting.html#cfn-applicationinsights-application-componentmonitoringsetting-componentarn
+	ComponentARN *types.Value `json:"ComponentARN,omitempty"`
+
+	// ComponentConfigurationMode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-componentmonitoringsetting.html#cfn-applicationinsights-application-componentmonitoringsetting-componentconfigurationmode
+	ComponentConfigurationMode *types.Value `json:"ComponentConfigurationMode,omitempty"`
+
+	// ComponentName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-componentmonitoringsetting.html#cfn-applicationinsights-application-componentmonitoringsetting-componentname
+	ComponentName *types.Value `json:"ComponentName,omitempty"`
+
+	// CustomComponentConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-componentmonitoringsetting.html#cfn-applicationinsights-application-componentmonitoringsetting-customcomponentconfiguration
+	CustomComponentConfiguration *Application_ComponentConfiguration `json:"CustomComponentConfiguration,omitempty"`
+
+	// DefaultOverwriteComponentConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-componentmonitoringsetting.html#cfn-applicationinsights-application-componentmonitoringsetting-defaultoverwritecomponentconfiguration
+	DefaultOverwriteComponentConfiguration *Application_ComponentConfiguration `json:"DefaultOverwriteComponentConfiguration,omitempty"`
+
+	// Tier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-componentmonitoringsetting.html#cfn-applicationinsights-application-componentmonitoringsetting-tier
+	Tier *types.Value `json:"Tier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ComponentMonitoringSetting) AWSCloudFormationType() string {
+	return "AWS::ApplicationInsights::Application.ComponentMonitoringSetting"
+}
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_configurationdetails.go b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_configurationdetails.go
new file mode 100644
index 0000000000..c06a485795
--- /dev/null
+++ b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_configurationdetails.go
@@ -0,0 +1,55 @@
+package applicationinsights
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_ConfigurationDetails AWS CloudFormation Resource (AWS::ApplicationInsights::Application.ConfigurationDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-configurationdetails.html
+type Application_ConfigurationDetails struct {
+
+	// AlarmMetrics AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-configurationdetails.html#cfn-applicationinsights-application-configurationdetails-alarmmetrics
+	AlarmMetrics []Application_AlarmMetric `json:"AlarmMetrics,omitempty"`
+
+	// Alarms AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-configurationdetails.html#cfn-applicationinsights-application-configurationdetails-alarms
+	Alarms []Application_Alarm `json:"Alarms,omitempty"`
+
+	// JMXPrometheusExporter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-configurationdetails.html#cfn-applicationinsights-application-configurationdetails-jmxprometheusexporter
+	JMXPrometheusExporter *Application_JMXPrometheusExporter `json:"JMXPrometheusExporter,omitempty"`
+
+	// Logs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-configurationdetails.html#cfn-applicationinsights-application-configurationdetails-logs
+	Logs []Application_Log `json:"Logs,omitempty"`
+
+	// WindowsEvents AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-configurationdetails.html#cfn-applicationinsights-application-configurationdetails-windowsevents
+	WindowsEvents []Application_WindowsEvent `json:"WindowsEvents,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ConfigurationDetails) AWSCloudFormationType() string {
+	return "AWS::ApplicationInsights::Application.ConfigurationDetails"
+}
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_customcomponent.go b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_customcomponent.go
new file mode 100644
index 0000000000..793cb1afa8
--- /dev/null
+++ b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_customcomponent.go
@@ -0,0 +1,42 @@
+package applicationinsights
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_CustomComponent AWS CloudFormation Resource (AWS::ApplicationInsights::Application.CustomComponent)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-customcomponent.html
+type Application_CustomComponent struct {
+
+	// ComponentName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-customcomponent.html#cfn-applicationinsights-application-customcomponent-componentname
+	ComponentName *types.Value `json:"ComponentName,omitempty"`
+
+	// ResourceList AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-customcomponent.html#cfn-applicationinsights-application-customcomponent-resourcelist
+	ResourceList *types.Value `json:"ResourceList,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CustomComponent) AWSCloudFormationType() string {
+	return "AWS::ApplicationInsights::Application.CustomComponent"
+}
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_jmxprometheusexporter.go b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_jmxprometheusexporter.go
new file mode 100644
index 0000000000..c2be1f0e7b
--- /dev/null
+++ b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_jmxprometheusexporter.go
@@ -0,0 +1,47 @@
+package applicationinsights
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_JMXPrometheusExporter AWS CloudFormation Resource (AWS::ApplicationInsights::Application.JMXPrometheusExporter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-jmxprometheusexporter.html
+type Application_JMXPrometheusExporter struct {
+
+	// HostPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-jmxprometheusexporter.html#cfn-applicationinsights-application-jmxprometheusexporter-hostport
+	HostPort *types.Value `json:"HostPort,omitempty"`
+
+	// JMXURL AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-jmxprometheusexporter.html#cfn-applicationinsights-application-jmxprometheusexporter-jmxurl
+	JMXURL *types.Value `json:"JMXURL,omitempty"`
+
+	// PrometheusPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-jmxprometheusexporter.html#cfn-applicationinsights-application-jmxprometheusexporter-prometheusport
+	PrometheusPort *types.Value `json:"PrometheusPort,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_JMXPrometheusExporter) AWSCloudFormationType() string {
+	return "AWS::ApplicationInsights::Application.JMXPrometheusExporter"
+}
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_log.go b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_log.go
new file mode 100644
index 0000000000..37b3500d48
--- /dev/null
+++ b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_log.go
@@ -0,0 +1,57 @@
+package applicationinsights
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_Log AWS CloudFormation Resource (AWS::ApplicationInsights::Application.Log)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-log.html
+type Application_Log struct {
+
+	// Encoding AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-log.html#cfn-applicationinsights-application-log-encoding
+	Encoding *types.Value `json:"Encoding,omitempty"`
+
+	// LogGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-log.html#cfn-applicationinsights-application-log-loggroupname
+	LogGroupName *types.Value `json:"LogGroupName,omitempty"`
+
+	// LogPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-log.html#cfn-applicationinsights-application-log-logpath
+	LogPath *types.Value `json:"LogPath,omitempty"`
+
+	// LogType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-log.html#cfn-applicationinsights-application-log-logtype
+	LogType *types.Value `json:"LogType,omitempty"`
+
+	// PatternSet AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-log.html#cfn-applicationinsights-application-log-patternset
+	PatternSet *types.Value `json:"PatternSet,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Log) AWSCloudFormationType() string {
+	return "AWS::ApplicationInsights::Application.Log"
+}
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_logpattern.go b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_logpattern.go
new file mode 100644
index 0000000000..75eb10721b
--- /dev/null
+++ b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_logpattern.go
@@ -0,0 +1,47 @@
+package applicationinsights
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_LogPattern AWS CloudFormation Resource (AWS::ApplicationInsights::Application.LogPattern)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-logpattern.html
+type Application_LogPattern struct {
+
+	// Pattern AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-logpattern.html#cfn-applicationinsights-application-logpattern-pattern
+	Pattern *types.Value `json:"Pattern,omitempty"`
+
+	// PatternName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-logpattern.html#cfn-applicationinsights-application-logpattern-patternname
+	PatternName *types.Value `json:"PatternName,omitempty"`
+
+	// Rank AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-logpattern.html#cfn-applicationinsights-application-logpattern-rank
+	Rank *types.Value `json:"Rank"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LogPattern) AWSCloudFormationType() string {
+	return "AWS::ApplicationInsights::Application.LogPattern"
+}
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_logpatternset.go b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_logpatternset.go
new file mode 100644
index 0000000000..f06c62316e
--- /dev/null
+++ b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_logpatternset.go
@@ -0,0 +1,42 @@
+package applicationinsights
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_LogPatternSet AWS CloudFormation Resource (AWS::ApplicationInsights::Application.LogPatternSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-logpatternset.html
+type Application_LogPatternSet struct {
+
+	// LogPatterns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-logpatternset.html#cfn-applicationinsights-application-logpatternset-logpatterns
+	LogPatterns []Application_LogPattern `json:"LogPatterns,omitempty"`
+
+	// PatternSetName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-logpatternset.html#cfn-applicationinsights-application-logpatternset-patternsetname
+	PatternSetName *types.Value `json:"PatternSetName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LogPatternSet) AWSCloudFormationType() string {
+	return "AWS::ApplicationInsights::Application.LogPatternSet"
+}
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponentconfigurationdetails.go b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponentconfigurationdetails.go
new file mode 100644
index 0000000000..5e0ae5cdaf
--- /dev/null
+++ b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponentconfigurationdetails.go
@@ -0,0 +1,45 @@
+package applicationinsights
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_SubComponentConfigurationDetails AWS CloudFormation Resource (AWS::ApplicationInsights::Application.SubComponentConfigurationDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-subcomponentconfigurationdetails.html
+type Application_SubComponentConfigurationDetails struct {
+
+	// AlarmMetrics AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-subcomponentconfigurationdetails.html#cfn-applicationinsights-application-subcomponentconfigurationdetails-alarmmetrics
+	AlarmMetrics []Application_AlarmMetric `json:"AlarmMetrics,omitempty"`
+
+	// Logs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-subcomponentconfigurationdetails.html#cfn-applicationinsights-application-subcomponentconfigurationdetails-logs
+	Logs []Application_Log `json:"Logs,omitempty"`
+
+	// WindowsEvents AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-subcomponentconfigurationdetails.html#cfn-applicationinsights-application-subcomponentconfigurationdetails-windowsevents
+	WindowsEvents []Application_WindowsEvent `json:"WindowsEvents,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SubComponentConfigurationDetails) AWSCloudFormationType() string {
+	return "AWS::ApplicationInsights::Application.SubComponentConfigurationDetails"
+}
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponenttypeconfiguration.go b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponenttypeconfiguration.go
new file mode 100644
index 0000000000..2d66d2fb4e
--- /dev/null
+++ b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_subcomponenttypeconfiguration.go
@@ -0,0 +1,42 @@
+package applicationinsights
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_SubComponentTypeConfiguration AWS CloudFormation Resource (AWS::ApplicationInsights::Application.SubComponentTypeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-subcomponenttypeconfiguration.html
+type Application_SubComponentTypeConfiguration struct {
+
+	// SubComponentConfigurationDetails AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-subcomponenttypeconfiguration.html#cfn-applicationinsights-application-subcomponenttypeconfiguration-subcomponentconfigurationdetails
+	SubComponentConfigurationDetails *Application_SubComponentConfigurationDetails `json:"SubComponentConfigurationDetails,omitempty"`
+
+	// SubComponentType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-subcomponenttypeconfiguration.html#cfn-applicationinsights-application-subcomponenttypeconfiguration-subcomponenttype
+	SubComponentType *types.Value `json:"SubComponentType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SubComponentTypeConfiguration) AWSCloudFormationType() string {
+	return "AWS::ApplicationInsights::Application.SubComponentTypeConfiguration"
+}
diff --git a/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_windowsevent.go b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_windowsevent.go
new file mode 100644
index 0000000000..977ac588fe
--- /dev/null
+++ b/goformation/cloudformation/applicationinsights/aws-applicationinsights-application_windowsevent.go
@@ -0,0 +1,52 @@
+package applicationinsights
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_WindowsEvent AWS CloudFormation Resource (AWS::ApplicationInsights::Application.WindowsEvent)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-windowsevent.html
+type Application_WindowsEvent struct {
+
+	// EventLevels AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-windowsevent.html#cfn-applicationinsights-application-windowsevent-eventlevels
+	EventLevels *types.Value `json:"EventLevels,omitempty"`
+
+	// EventName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-windowsevent.html#cfn-applicationinsights-application-windowsevent-eventname
+	EventName *types.Value `json:"EventName,omitempty"`
+
+	// LogGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-windowsevent.html#cfn-applicationinsights-application-windowsevent-loggroupname
+	LogGroupName *types.Value `json:"LogGroupName,omitempty"`
+
+	// PatternSet AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-applicationinsights-application-windowsevent.html#cfn-applicationinsights-application-windowsevent-patternset
+	PatternSet *types.Value `json:"PatternSet,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_WindowsEvent) AWSCloudFormationType() string {
+	return "AWS::ApplicationInsights::Application.WindowsEvent"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute.go
new file mode 100644
index 0000000000..0e20d64867
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute.go
@@ -0,0 +1,134 @@
+package appmesh
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-gatewayroute.html
+type GatewayRoute struct {
+
+	// GatewayRouteName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-gatewayroute.html#cfn-appmesh-gatewayroute-gatewayroutename
+	GatewayRouteName *types.Value `json:"GatewayRouteName,omitempty"`
+
+	// MeshName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-gatewayroute.html#cfn-appmesh-gatewayroute-meshname
+	MeshName *types.Value `json:"MeshName,omitempty"`
+
+	// MeshOwner AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-gatewayroute.html#cfn-appmesh-gatewayroute-meshowner
+	MeshOwner *types.Value `json:"MeshOwner,omitempty"`
+
+	// Spec AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-gatewayroute.html#cfn-appmesh-gatewayroute-spec
+	Spec *GatewayRoute_GatewayRouteSpec `json:"Spec,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-gatewayroute.html#cfn-appmesh-gatewayroute-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VirtualGatewayName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-gatewayroute.html#cfn-appmesh-gatewayroute-virtualgatewayname
+	VirtualGatewayName *types.Value `json:"VirtualGatewayName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GatewayRoute) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute"
+}
+
+// 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 GatewayRoute) MarshalJSON() ([]byte, error) {
+	type Properties GatewayRoute
+	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 *GatewayRoute) UnmarshalJSON(b []byte) error {
+	type Properties GatewayRoute
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = GatewayRoute(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamematch.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamematch.go
new file mode 100644
index 0000000000..be0d97e048
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamematch.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_GatewayRouteHostnameMatch AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GatewayRouteHostnameMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutehostnamematch.html
+type GatewayRoute_GatewayRouteHostnameMatch struct {
+
+	// Exact AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutehostnamematch.html#cfn-appmesh-gatewayroute-gatewayroutehostnamematch-exact
+	Exact *types.Value `json:"Exact,omitempty"`
+
+	// Suffix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutehostnamematch.html#cfn-appmesh-gatewayroute-gatewayroutehostnamematch-suffix
+	Suffix *types.Value `json:"Suffix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GatewayRoute_GatewayRouteHostnameMatch) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.GatewayRouteHostnameMatch"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamerewrite.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamerewrite.go
new file mode 100644
index 0000000000..96421e16db
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutehostnamerewrite.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_GatewayRouteHostnameRewrite AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GatewayRouteHostnameRewrite)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutehostnamerewrite.html
+type GatewayRoute_GatewayRouteHostnameRewrite struct {
+
+	// DefaultTargetHostname AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutehostnamerewrite.html#cfn-appmesh-gatewayroute-gatewayroutehostnamerewrite-defaulttargethostname
+	DefaultTargetHostname *types.Value `json:"DefaultTargetHostname,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GatewayRoute_GatewayRouteHostnameRewrite) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.GatewayRouteHostnameRewrite"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutemetadatamatch.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutemetadatamatch.go
new file mode 100644
index 0000000000..65c542822f
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutemetadatamatch.go
@@ -0,0 +1,57 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_GatewayRouteMetadataMatch AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GatewayRouteMetadataMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutemetadatamatch.html
+type GatewayRoute_GatewayRouteMetadataMatch struct {
+
+	// Exact AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutemetadatamatch.html#cfn-appmesh-gatewayroute-gatewayroutemetadatamatch-exact
+	Exact *types.Value `json:"Exact,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutemetadatamatch.html#cfn-appmesh-gatewayroute-gatewayroutemetadatamatch-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// Range AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutemetadatamatch.html#cfn-appmesh-gatewayroute-gatewayroutemetadatamatch-range
+	Range *GatewayRoute_GatewayRouteRangeMatch `json:"Range,omitempty"`
+
+	// Regex AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutemetadatamatch.html#cfn-appmesh-gatewayroute-gatewayroutemetadatamatch-regex
+	Regex *types.Value `json:"Regex,omitempty"`
+
+	// Suffix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutemetadatamatch.html#cfn-appmesh-gatewayroute-gatewayroutemetadatamatch-suffix
+	Suffix *types.Value `json:"Suffix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GatewayRoute_GatewayRouteMetadataMatch) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.GatewayRouteMetadataMatch"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayrouterangematch.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayrouterangematch.go
new file mode 100644
index 0000000000..c76ea87a48
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayrouterangematch.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_GatewayRouteRangeMatch AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GatewayRouteRangeMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayrouterangematch.html
+type GatewayRoute_GatewayRouteRangeMatch struct {
+
+	// End AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayrouterangematch.html#cfn-appmesh-gatewayroute-gatewayrouterangematch-end
+	End *types.Value `json:"End"`
+
+	// Start AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayrouterangematch.html#cfn-appmesh-gatewayroute-gatewayrouterangematch-start
+	Start *types.Value `json:"Start"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GatewayRoute_GatewayRouteRangeMatch) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.GatewayRouteRangeMatch"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutespec.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutespec.go
new file mode 100644
index 0000000000..cffc818fa8
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutespec.go
@@ -0,0 +1,52 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_GatewayRouteSpec AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GatewayRouteSpec)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutespec.html
+type GatewayRoute_GatewayRouteSpec struct {
+
+	// GrpcRoute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutespec.html#cfn-appmesh-gatewayroute-gatewayroutespec-grpcroute
+	GrpcRoute *GatewayRoute_GrpcGatewayRoute `json:"GrpcRoute,omitempty"`
+
+	// Http2Route AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutespec.html#cfn-appmesh-gatewayroute-gatewayroutespec-http2route
+	Http2Route *GatewayRoute_HttpGatewayRoute `json:"Http2Route,omitempty"`
+
+	// HttpRoute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutespec.html#cfn-appmesh-gatewayroute-gatewayroutespec-httproute
+	HttpRoute *GatewayRoute_HttpGatewayRoute `json:"HttpRoute,omitempty"`
+
+	// Priority AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutespec.html#cfn-appmesh-gatewayroute-gatewayroutespec-priority
+	Priority *types.Value `json:"Priority,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GatewayRoute_GatewayRouteSpec) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.GatewayRouteSpec"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutetarget.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutetarget.go
new file mode 100644
index 0000000000..8640f1299c
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutetarget.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_GatewayRouteTarget AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GatewayRouteTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutetarget.html
+type GatewayRoute_GatewayRouteTarget struct {
+
+	// VirtualService AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutetarget.html#cfn-appmesh-gatewayroute-gatewayroutetarget-virtualservice
+	VirtualService *GatewayRoute_GatewayRouteVirtualService `json:"VirtualService,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GatewayRoute_GatewayRouteTarget) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.GatewayRouteTarget"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutevirtualservice.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutevirtualservice.go
new file mode 100644
index 0000000000..f8eb2c7eef
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_gatewayroutevirtualservice.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_GatewayRouteVirtualService AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GatewayRouteVirtualService)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutevirtualservice.html
+type GatewayRoute_GatewayRouteVirtualService struct {
+
+	// VirtualServiceName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-gatewayroutevirtualservice.html#cfn-appmesh-gatewayroute-gatewayroutevirtualservice-virtualservicename
+	VirtualServiceName *types.Value `json:"VirtualServiceName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GatewayRoute_GatewayRouteVirtualService) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.GatewayRouteVirtualService"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroute.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroute.go
new file mode 100644
index 0000000000..5dbda44ea4
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroute.go
@@ -0,0 +1,40 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_GrpcGatewayRoute AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GrpcGatewayRoute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayroute.html
+type GatewayRoute_GrpcGatewayRoute struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayroute.html#cfn-appmesh-gatewayroute-grpcgatewayroute-action
+	Action *GatewayRoute_GrpcGatewayRouteAction `json:"Action,omitempty"`
+
+	// Match AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayroute.html#cfn-appmesh-gatewayroute-grpcgatewayroute-match
+	Match *GatewayRoute_GrpcGatewayRouteMatch `json:"Match,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GatewayRoute_GrpcGatewayRoute) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.GrpcGatewayRoute"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouteaction.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouteaction.go
new file mode 100644
index 0000000000..4f873915c7
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouteaction.go
@@ -0,0 +1,40 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_GrpcGatewayRouteAction AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GrpcGatewayRouteAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayrouteaction.html
+type GatewayRoute_GrpcGatewayRouteAction struct {
+
+	// Rewrite AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayrouteaction.html#cfn-appmesh-gatewayroute-grpcgatewayrouteaction-rewrite
+	Rewrite *GatewayRoute_GrpcGatewayRouteRewrite `json:"Rewrite,omitempty"`
+
+	// Target AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayrouteaction.html#cfn-appmesh-gatewayroute-grpcgatewayrouteaction-target
+	Target *GatewayRoute_GatewayRouteTarget `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 *GatewayRoute_GrpcGatewayRouteAction) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteAction"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutematch.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutematch.go
new file mode 100644
index 0000000000..b7b8c65848
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutematch.go
@@ -0,0 +1,47 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_GrpcGatewayRouteMatch AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayroutematch.html
+type GatewayRoute_GrpcGatewayRouteMatch struct {
+
+	// Hostname AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayroutematch.html#cfn-appmesh-gatewayroute-grpcgatewayroutematch-hostname
+	Hostname *GatewayRoute_GatewayRouteHostnameMatch `json:"Hostname,omitempty"`
+
+	// Metadata AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayroutematch.html#cfn-appmesh-gatewayroute-grpcgatewayroutematch-metadata
+	Metadata []GatewayRoute_GrpcGatewayRouteMetadata `json:"Metadata,omitempty"`
+
+	// ServiceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayroutematch.html#cfn-appmesh-gatewayroute-grpcgatewayroutematch-servicename
+	ServiceName *types.Value `json:"ServiceName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GatewayRoute_GrpcGatewayRouteMatch) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMatch"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutemetadata.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutemetadata.go
new file mode 100644
index 0000000000..2f43774ebb
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayroutemetadata.go
@@ -0,0 +1,47 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_GrpcGatewayRouteMetadata AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMetadata)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayroutemetadata.html
+type GatewayRoute_GrpcGatewayRouteMetadata struct {
+
+	// Invert AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayroutemetadata.html#cfn-appmesh-gatewayroute-grpcgatewayroutemetadata-invert
+	Invert *types.Value `json:"Invert,omitempty"`
+
+	// Match AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayroutemetadata.html#cfn-appmesh-gatewayroute-grpcgatewayroutemetadata-match
+	Match *GatewayRoute_GatewayRouteMetadataMatch `json:"Match,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayroutemetadata.html#cfn-appmesh-gatewayroute-grpcgatewayroutemetadata-name
+	Name *types.Value `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 *GatewayRoute_GrpcGatewayRouteMetadata) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMetadata"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouterewrite.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouterewrite.go
new file mode 100644
index 0000000000..5d577f95be
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_grpcgatewayrouterewrite.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_GrpcGatewayRouteRewrite AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.GrpcGatewayRouteRewrite)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayrouterewrite.html
+type GatewayRoute_GrpcGatewayRouteRewrite struct {
+
+	// Hostname AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-grpcgatewayrouterewrite.html#cfn-appmesh-gatewayroute-grpcgatewayrouterewrite-hostname
+	Hostname *GatewayRoute_GatewayRouteHostnameRewrite `json:"Hostname,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GatewayRoute_GrpcGatewayRouteRewrite) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteRewrite"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroute.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroute.go
new file mode 100644
index 0000000000..a6f53cb1db
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroute.go
@@ -0,0 +1,40 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_HttpGatewayRoute AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.HttpGatewayRoute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroute.html
+type GatewayRoute_HttpGatewayRoute struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroute.html#cfn-appmesh-gatewayroute-httpgatewayroute-action
+	Action *GatewayRoute_HttpGatewayRouteAction `json:"Action,omitempty"`
+
+	// Match AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroute.html#cfn-appmesh-gatewayroute-httpgatewayroute-match
+	Match *GatewayRoute_HttpGatewayRouteMatch `json:"Match,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GatewayRoute_HttpGatewayRoute) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.HttpGatewayRoute"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteaction.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteaction.go
new file mode 100644
index 0000000000..cd6dc25071
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteaction.go
@@ -0,0 +1,40 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_HttpGatewayRouteAction AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.HttpGatewayRouteAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteaction.html
+type GatewayRoute_HttpGatewayRouteAction struct {
+
+	// Rewrite AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteaction.html#cfn-appmesh-gatewayroute-httpgatewayrouteaction-rewrite
+	Rewrite *GatewayRoute_HttpGatewayRouteRewrite `json:"Rewrite,omitempty"`
+
+	// Target AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteaction.html#cfn-appmesh-gatewayroute-httpgatewayrouteaction-target
+	Target *GatewayRoute_GatewayRouteTarget `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 *GatewayRoute_HttpGatewayRouteAction) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.HttpGatewayRouteAction"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheader.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheader.go
new file mode 100644
index 0000000000..2936dbc1df
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheader.go
@@ -0,0 +1,47 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_HttpGatewayRouteHeader AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeader)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteheader.html
+type GatewayRoute_HttpGatewayRouteHeader struct {
+
+	// Invert AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteheader.html#cfn-appmesh-gatewayroute-httpgatewayrouteheader-invert
+	Invert *types.Value `json:"Invert,omitempty"`
+
+	// Match AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteheader.html#cfn-appmesh-gatewayroute-httpgatewayrouteheader-match
+	Match *GatewayRoute_HttpGatewayRouteHeaderMatch `json:"Match,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteheader.html#cfn-appmesh-gatewayroute-httpgatewayrouteheader-name
+	Name *types.Value `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 *GatewayRoute_HttpGatewayRouteHeader) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeader"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheadermatch.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheadermatch.go
new file mode 100644
index 0000000000..70374bde74
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteheadermatch.go
@@ -0,0 +1,57 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_HttpGatewayRouteHeaderMatch AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeaderMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteheadermatch.html
+type GatewayRoute_HttpGatewayRouteHeaderMatch struct {
+
+	// Exact AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteheadermatch.html#cfn-appmesh-gatewayroute-httpgatewayrouteheadermatch-exact
+	Exact *types.Value `json:"Exact,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteheadermatch.html#cfn-appmesh-gatewayroute-httpgatewayrouteheadermatch-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// Range AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteheadermatch.html#cfn-appmesh-gatewayroute-httpgatewayrouteheadermatch-range
+	Range *GatewayRoute_GatewayRouteRangeMatch `json:"Range,omitempty"`
+
+	// Regex AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteheadermatch.html#cfn-appmesh-gatewayroute-httpgatewayrouteheadermatch-regex
+	Regex *types.Value `json:"Regex,omitempty"`
+
+	// Suffix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteheadermatch.html#cfn-appmesh-gatewayroute-httpgatewayrouteheadermatch-suffix
+	Suffix *types.Value `json:"Suffix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GatewayRoute_HttpGatewayRouteHeaderMatch) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeaderMatch"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutematch.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutematch.go
new file mode 100644
index 0000000000..dd1516ce3d
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutematch.go
@@ -0,0 +1,62 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_HttpGatewayRouteMatch AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.HttpGatewayRouteMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroutematch.html
+type GatewayRoute_HttpGatewayRouteMatch struct {
+
+	// Headers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroutematch.html#cfn-appmesh-gatewayroute-httpgatewayroutematch-headers
+	Headers []GatewayRoute_HttpGatewayRouteHeader `json:"Headers,omitempty"`
+
+	// Hostname AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroutematch.html#cfn-appmesh-gatewayroute-httpgatewayroutematch-hostname
+	Hostname *GatewayRoute_GatewayRouteHostnameMatch `json:"Hostname,omitempty"`
+
+	// Method AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroutematch.html#cfn-appmesh-gatewayroute-httpgatewayroutematch-method
+	Method *types.Value `json:"Method,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroutematch.html#cfn-appmesh-gatewayroute-httpgatewayroutematch-path
+	Path *GatewayRoute_HttpPathMatch `json:"Path,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroutematch.html#cfn-appmesh-gatewayroute-httpgatewayroutematch-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// QueryParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroutematch.html#cfn-appmesh-gatewayroute-httpgatewayroutematch-queryparameters
+	QueryParameters []GatewayRoute_QueryParameter `json:"QueryParameters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GatewayRoute_HttpGatewayRouteMatch) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.HttpGatewayRouteMatch"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutepathrewrite.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutepathrewrite.go
new file mode 100644
index 0000000000..71f84154af
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayroutepathrewrite.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_HttpGatewayRoutePathRewrite AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.HttpGatewayRoutePathRewrite)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroutepathrewrite.html
+type GatewayRoute_HttpGatewayRoutePathRewrite struct {
+
+	// Exact AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayroutepathrewrite.html#cfn-appmesh-gatewayroute-httpgatewayroutepathrewrite-exact
+	Exact *types.Value `json:"Exact,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GatewayRoute_HttpGatewayRoutePathRewrite) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.HttpGatewayRoutePathRewrite"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteprefixrewrite.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteprefixrewrite.go
new file mode 100644
index 0000000000..66342d4349
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouteprefixrewrite.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_HttpGatewayRoutePrefixRewrite AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.HttpGatewayRoutePrefixRewrite)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteprefixrewrite.html
+type GatewayRoute_HttpGatewayRoutePrefixRewrite struct {
+
+	// DefaultPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteprefixrewrite.html#cfn-appmesh-gatewayroute-httpgatewayrouteprefixrewrite-defaultprefix
+	DefaultPrefix *types.Value `json:"DefaultPrefix,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouteprefixrewrite.html#cfn-appmesh-gatewayroute-httpgatewayrouteprefixrewrite-value
+	Value *types.Value `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 *GatewayRoute_HttpGatewayRoutePrefixRewrite) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.HttpGatewayRoutePrefixRewrite"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouterewrite.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouterewrite.go
new file mode 100644
index 0000000000..f1f57fc4d3
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpgatewayrouterewrite.go
@@ -0,0 +1,45 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_HttpGatewayRouteRewrite AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.HttpGatewayRouteRewrite)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouterewrite.html
+type GatewayRoute_HttpGatewayRouteRewrite struct {
+
+	// Hostname AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouterewrite.html#cfn-appmesh-gatewayroute-httpgatewayrouterewrite-hostname
+	Hostname *GatewayRoute_GatewayRouteHostnameRewrite `json:"Hostname,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouterewrite.html#cfn-appmesh-gatewayroute-httpgatewayrouterewrite-path
+	Path *GatewayRoute_HttpGatewayRoutePathRewrite `json:"Path,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpgatewayrouterewrite.html#cfn-appmesh-gatewayroute-httpgatewayrouterewrite-prefix
+	Prefix *GatewayRoute_HttpGatewayRoutePrefixRewrite `json:"Prefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GatewayRoute_HttpGatewayRouteRewrite) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.HttpGatewayRouteRewrite"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httppathmatch.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httppathmatch.go
new file mode 100644
index 0000000000..c4f561d68c
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httppathmatch.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_HttpPathMatch AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.HttpPathMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httppathmatch.html
+type GatewayRoute_HttpPathMatch struct {
+
+	// Exact AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httppathmatch.html#cfn-appmesh-gatewayroute-httppathmatch-exact
+	Exact *types.Value `json:"Exact,omitempty"`
+
+	// Regex AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httppathmatch.html#cfn-appmesh-gatewayroute-httppathmatch-regex
+	Regex *types.Value `json:"Regex,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GatewayRoute_HttpPathMatch) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.HttpPathMatch"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpqueryparametermatch.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpqueryparametermatch.go
new file mode 100644
index 0000000000..9c7dd73d45
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_httpqueryparametermatch.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_HttpQueryParameterMatch AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.HttpQueryParameterMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpqueryparametermatch.html
+type GatewayRoute_HttpQueryParameterMatch struct {
+
+	// Exact AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-httpqueryparametermatch.html#cfn-appmesh-gatewayroute-httpqueryparametermatch-exact
+	Exact *types.Value `json:"Exact,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GatewayRoute_HttpQueryParameterMatch) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.HttpQueryParameterMatch"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_queryparameter.go b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_queryparameter.go
new file mode 100644
index 0000000000..03257cbe8d
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-gatewayroute_queryparameter.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRoute_QueryParameter AWS CloudFormation Resource (AWS::AppMesh::GatewayRoute.QueryParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-queryparameter.html
+type GatewayRoute_QueryParameter struct {
+
+	// Match AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-queryparameter.html#cfn-appmesh-gatewayroute-queryparameter-match
+	Match *GatewayRoute_HttpQueryParameterMatch `json:"Match,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-gatewayroute-queryparameter.html#cfn-appmesh-gatewayroute-queryparameter-name
+	Name *types.Value `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 *GatewayRoute_QueryParameter) AWSCloudFormationType() string {
+	return "AWS::AppMesh::GatewayRoute.QueryParameter"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-mesh.go b/goformation/cloudformation/appmesh/aws-appmesh-mesh.go
new file mode 100644
index 0000000000..c188d3b79e
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-mesh.go
@@ -0,0 +1,119 @@
+package appmesh
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Mesh AWS CloudFormation Resource (AWS::AppMesh::Mesh)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-mesh.html
+type Mesh struct {
+
+	// MeshName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-mesh.html#cfn-appmesh-mesh-meshname
+	MeshName *types.Value `json:"MeshName,omitempty"`
+
+	// Spec AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-mesh.html#cfn-appmesh-mesh-spec
+	Spec *Mesh_MeshSpec `json:"Spec,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-mesh.html#cfn-appmesh-mesh-tags
+	Tags []cloudformation.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 *Mesh) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Mesh"
+}
+
+// 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 Mesh) MarshalJSON() ([]byte, error) {
+	type Properties Mesh
+	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 *Mesh) UnmarshalJSON(b []byte) error {
+	type Properties Mesh
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Mesh(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appmesh/aws-appmesh-mesh_egressfilter.go b/goformation/cloudformation/appmesh/aws-appmesh-mesh_egressfilter.go
new file mode 100644
index 0000000000..c6074d7032
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-mesh_egressfilter.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Mesh_EgressFilter AWS CloudFormation Resource (AWS::AppMesh::Mesh.EgressFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-mesh-egressfilter.html
+type Mesh_EgressFilter struct {
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-mesh-egressfilter.html#cfn-appmesh-mesh-egressfilter-type
+	Type *types.Value `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 *Mesh_EgressFilter) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Mesh.EgressFilter"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-mesh_meshspec.go b/goformation/cloudformation/appmesh/aws-appmesh-mesh_meshspec.go
new file mode 100644
index 0000000000..726e0d68b8
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-mesh_meshspec.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Mesh_MeshSpec AWS CloudFormation Resource (AWS::AppMesh::Mesh.MeshSpec)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-mesh-meshspec.html
+type Mesh_MeshSpec struct {
+
+	// EgressFilter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-mesh-meshspec.html#cfn-appmesh-mesh-meshspec-egressfilter
+	EgressFilter *Mesh_EgressFilter `json:"EgressFilter,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Mesh_MeshSpec) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Mesh.MeshSpec"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route.go b/goformation/cloudformation/appmesh/aws-appmesh-route.go
new file mode 100644
index 0000000000..a193e36e69
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route.go
@@ -0,0 +1,134 @@
+package appmesh
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route AWS CloudFormation Resource (AWS::AppMesh::Route)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-route.html
+type Route struct {
+
+	// MeshName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-route.html#cfn-appmesh-route-meshname
+	MeshName *types.Value `json:"MeshName,omitempty"`
+
+	// MeshOwner AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-route.html#cfn-appmesh-route-meshowner
+	MeshOwner *types.Value `json:"MeshOwner,omitempty"`
+
+	// RouteName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-route.html#cfn-appmesh-route-routename
+	RouteName *types.Value `json:"RouteName,omitempty"`
+
+	// Spec AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-route.html#cfn-appmesh-route-spec
+	Spec *Route_RouteSpec `json:"Spec,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-route.html#cfn-appmesh-route-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VirtualRouterName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-route.html#cfn-appmesh-route-virtualroutername
+	VirtualRouterName *types.Value `json:"VirtualRouterName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route"
+}
+
+// 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 Route) MarshalJSON() ([]byte, error) {
+	type Properties Route
+	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 *Route) UnmarshalJSON(b []byte) error {
+	type Properties Route
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Route(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appmesh/aws-appmesh-route_duration.go b/goformation/cloudformation/appmesh/aws-appmesh-route_duration.go
new file mode 100644
index 0000000000..36881b46d3
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_duration.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_Duration AWS CloudFormation Resource (AWS::AppMesh::Route.Duration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-duration.html
+type Route_Duration struct {
+
+	// Unit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-duration.html#cfn-appmesh-route-duration-unit
+	Unit *types.Value `json:"Unit,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-duration.html#cfn-appmesh-route-duration-value
+	Value *types.Value `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 *Route_Duration) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.Duration"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_grpcretrypolicy.go b/goformation/cloudformation/appmesh/aws-appmesh-route_grpcretrypolicy.go
new file mode 100644
index 0000000000..c1f919d88f
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_grpcretrypolicy.go
@@ -0,0 +1,57 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_GrpcRetryPolicy AWS CloudFormation Resource (AWS::AppMesh::Route.GrpcRetryPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcretrypolicy.html
+type Route_GrpcRetryPolicy struct {
+
+	// GrpcRetryEvents AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcretrypolicy.html#cfn-appmesh-route-grpcretrypolicy-grpcretryevents
+	GrpcRetryEvents *types.Value `json:"GrpcRetryEvents,omitempty"`
+
+	// HttpRetryEvents AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcretrypolicy.html#cfn-appmesh-route-grpcretrypolicy-httpretryevents
+	HttpRetryEvents *types.Value `json:"HttpRetryEvents,omitempty"`
+
+	// MaxRetries AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcretrypolicy.html#cfn-appmesh-route-grpcretrypolicy-maxretries
+	MaxRetries *types.Value `json:"MaxRetries"`
+
+	// PerRetryTimeout AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcretrypolicy.html#cfn-appmesh-route-grpcretrypolicy-perretrytimeout
+	PerRetryTimeout *Route_Duration `json:"PerRetryTimeout,omitempty"`
+
+	// TcpRetryEvents AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcretrypolicy.html#cfn-appmesh-route-grpcretrypolicy-tcpretryevents
+	TcpRetryEvents *types.Value `json:"TcpRetryEvents,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_GrpcRetryPolicy) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.GrpcRetryPolicy"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroute.go b/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroute.go
new file mode 100644
index 0000000000..df01c806ba
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroute.go
@@ -0,0 +1,50 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_GrpcRoute AWS CloudFormation Resource (AWS::AppMesh::Route.GrpcRoute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcroute.html
+type Route_GrpcRoute struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcroute.html#cfn-appmesh-route-grpcroute-action
+	Action *Route_GrpcRouteAction `json:"Action,omitempty"`
+
+	// Match AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcroute.html#cfn-appmesh-route-grpcroute-match
+	Match *Route_GrpcRouteMatch `json:"Match,omitempty"`
+
+	// RetryPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcroute.html#cfn-appmesh-route-grpcroute-retrypolicy
+	RetryPolicy *Route_GrpcRetryPolicy `json:"RetryPolicy,omitempty"`
+
+	// Timeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcroute.html#cfn-appmesh-route-grpcroute-timeout
+	Timeout *Route_GrpcTimeout `json:"Timeout,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_GrpcRoute) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.GrpcRoute"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_grpcrouteaction.go b/goformation/cloudformation/appmesh/aws-appmesh-route_grpcrouteaction.go
new file mode 100644
index 0000000000..dbe6d970a6
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_grpcrouteaction.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_GrpcRouteAction AWS CloudFormation Resource (AWS::AppMesh::Route.GrpcRouteAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcrouteaction.html
+type Route_GrpcRouteAction struct {
+
+	// WeightedTargets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcrouteaction.html#cfn-appmesh-route-grpcrouteaction-weightedtargets
+	WeightedTargets []Route_WeightedTarget `json:"WeightedTargets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_GrpcRouteAction) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.GrpcRouteAction"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutematch.go b/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutematch.go
new file mode 100644
index 0000000000..cc2f48ead3
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutematch.go
@@ -0,0 +1,47 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_GrpcRouteMatch AWS CloudFormation Resource (AWS::AppMesh::Route.GrpcRouteMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcroutematch.html
+type Route_GrpcRouteMatch struct {
+
+	// Metadata AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcroutematch.html#cfn-appmesh-route-grpcroutematch-metadata
+	Metadata []Route_GrpcRouteMetadata `json:"Metadata,omitempty"`
+
+	// MethodName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcroutematch.html#cfn-appmesh-route-grpcroutematch-methodname
+	MethodName *types.Value `json:"MethodName,omitempty"`
+
+	// ServiceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcroutematch.html#cfn-appmesh-route-grpcroutematch-servicename
+	ServiceName *types.Value `json:"ServiceName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_GrpcRouteMatch) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.GrpcRouteMatch"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadata.go b/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadata.go
new file mode 100644
index 0000000000..0b0391debf
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadata.go
@@ -0,0 +1,47 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_GrpcRouteMetadata AWS CloudFormation Resource (AWS::AppMesh::Route.GrpcRouteMetadata)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcroutemetadata.html
+type Route_GrpcRouteMetadata struct {
+
+	// Invert AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcroutemetadata.html#cfn-appmesh-route-grpcroutemetadata-invert
+	Invert *types.Value `json:"Invert,omitempty"`
+
+	// Match AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcroutemetadata.html#cfn-appmesh-route-grpcroutemetadata-match
+	Match *Route_GrpcRouteMetadataMatchMethod `json:"Match,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcroutemetadata.html#cfn-appmesh-route-grpcroutemetadata-name
+	Name *types.Value `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 *Route_GrpcRouteMetadata) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.GrpcRouteMetadata"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadatamatchmethod.go b/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadatamatchmethod.go
new file mode 100644
index 0000000000..9b54323f54
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_grpcroutemetadatamatchmethod.go
@@ -0,0 +1,57 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_GrpcRouteMetadataMatchMethod AWS CloudFormation Resource (AWS::AppMesh::Route.GrpcRouteMetadataMatchMethod)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcroutemetadatamatchmethod.html
+type Route_GrpcRouteMetadataMatchMethod struct {
+
+	// Exact AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcroutemetadatamatchmethod.html#cfn-appmesh-route-grpcroutemetadatamatchmethod-exact
+	Exact *types.Value `json:"Exact,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcroutemetadatamatchmethod.html#cfn-appmesh-route-grpcroutemetadatamatchmethod-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// Range AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcroutemetadatamatchmethod.html#cfn-appmesh-route-grpcroutemetadatamatchmethod-range
+	Range *Route_MatchRange `json:"Range,omitempty"`
+
+	// Regex AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcroutemetadatamatchmethod.html#cfn-appmesh-route-grpcroutemetadatamatchmethod-regex
+	Regex *types.Value `json:"Regex,omitempty"`
+
+	// Suffix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpcroutemetadatamatchmethod.html#cfn-appmesh-route-grpcroutemetadatamatchmethod-suffix
+	Suffix *types.Value `json:"Suffix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_GrpcRouteMetadataMatchMethod) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.GrpcRouteMetadataMatchMethod"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_grpctimeout.go b/goformation/cloudformation/appmesh/aws-appmesh-route_grpctimeout.go
new file mode 100644
index 0000000000..707bd1a1f8
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_grpctimeout.go
@@ -0,0 +1,40 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_GrpcTimeout AWS CloudFormation Resource (AWS::AppMesh::Route.GrpcTimeout)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpctimeout.html
+type Route_GrpcTimeout struct {
+
+	// Idle AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpctimeout.html#cfn-appmesh-route-grpctimeout-idle
+	Idle *Route_Duration `json:"Idle,omitempty"`
+
+	// PerRequest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-grpctimeout.html#cfn-appmesh-route-grpctimeout-perrequest
+	PerRequest *Route_Duration `json:"PerRequest,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_GrpcTimeout) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.GrpcTimeout"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_headermatchmethod.go b/goformation/cloudformation/appmesh/aws-appmesh-route_headermatchmethod.go
new file mode 100644
index 0000000000..5d062b05f2
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_headermatchmethod.go
@@ -0,0 +1,57 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_HeaderMatchMethod AWS CloudFormation Resource (AWS::AppMesh::Route.HeaderMatchMethod)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-headermatchmethod.html
+type Route_HeaderMatchMethod struct {
+
+	// Exact AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-headermatchmethod.html#cfn-appmesh-route-headermatchmethod-exact
+	Exact *types.Value `json:"Exact,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-headermatchmethod.html#cfn-appmesh-route-headermatchmethod-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// Range AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-headermatchmethod.html#cfn-appmesh-route-headermatchmethod-range
+	Range *Route_MatchRange `json:"Range,omitempty"`
+
+	// Regex AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-headermatchmethod.html#cfn-appmesh-route-headermatchmethod-regex
+	Regex *types.Value `json:"Regex,omitempty"`
+
+	// Suffix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-headermatchmethod.html#cfn-appmesh-route-headermatchmethod-suffix
+	Suffix *types.Value `json:"Suffix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_HeaderMatchMethod) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.HeaderMatchMethod"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_httppathmatch.go b/goformation/cloudformation/appmesh/aws-appmesh-route_httppathmatch.go
new file mode 100644
index 0000000000..6dc1c54265
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_httppathmatch.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_HttpPathMatch AWS CloudFormation Resource (AWS::AppMesh::Route.HttpPathMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httppathmatch.html
+type Route_HttpPathMatch struct {
+
+	// Exact AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httppathmatch.html#cfn-appmesh-route-httppathmatch-exact
+	Exact *types.Value `json:"Exact,omitempty"`
+
+	// Regex AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httppathmatch.html#cfn-appmesh-route-httppathmatch-regex
+	Regex *types.Value `json:"Regex,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_HttpPathMatch) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.HttpPathMatch"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_httpqueryparametermatch.go b/goformation/cloudformation/appmesh/aws-appmesh-route_httpqueryparametermatch.go
new file mode 100644
index 0000000000..dd7fec6675
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_httpqueryparametermatch.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_HttpQueryParameterMatch AWS CloudFormation Resource (AWS::AppMesh::Route.HttpQueryParameterMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httpqueryparametermatch.html
+type Route_HttpQueryParameterMatch struct {
+
+	// Exact AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httpqueryparametermatch.html#cfn-appmesh-route-httpqueryparametermatch-exact
+	Exact *types.Value `json:"Exact,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_HttpQueryParameterMatch) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.HttpQueryParameterMatch"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_httpretrypolicy.go b/goformation/cloudformation/appmesh/aws-appmesh-route_httpretrypolicy.go
new file mode 100644
index 0000000000..584143efa7
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_httpretrypolicy.go
@@ -0,0 +1,52 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_HttpRetryPolicy AWS CloudFormation Resource (AWS::AppMesh::Route.HttpRetryPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httpretrypolicy.html
+type Route_HttpRetryPolicy struct {
+
+	// HttpRetryEvents AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httpretrypolicy.html#cfn-appmesh-route-httpretrypolicy-httpretryevents
+	HttpRetryEvents *types.Value `json:"HttpRetryEvents,omitempty"`
+
+	// MaxRetries AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httpretrypolicy.html#cfn-appmesh-route-httpretrypolicy-maxretries
+	MaxRetries *types.Value `json:"MaxRetries"`
+
+	// PerRetryTimeout AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httpretrypolicy.html#cfn-appmesh-route-httpretrypolicy-perretrytimeout
+	PerRetryTimeout *Route_Duration `json:"PerRetryTimeout,omitempty"`
+
+	// TcpRetryEvents AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httpretrypolicy.html#cfn-appmesh-route-httpretrypolicy-tcpretryevents
+	TcpRetryEvents *types.Value `json:"TcpRetryEvents,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_HttpRetryPolicy) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.HttpRetryPolicy"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_httproute.go b/goformation/cloudformation/appmesh/aws-appmesh-route_httproute.go
new file mode 100644
index 0000000000..40306a4bf5
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_httproute.go
@@ -0,0 +1,50 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_HttpRoute AWS CloudFormation Resource (AWS::AppMesh::Route.HttpRoute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httproute.html
+type Route_HttpRoute struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httproute.html#cfn-appmesh-route-httproute-action
+	Action *Route_HttpRouteAction `json:"Action,omitempty"`
+
+	// Match AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httproute.html#cfn-appmesh-route-httproute-match
+	Match *Route_HttpRouteMatch `json:"Match,omitempty"`
+
+	// RetryPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httproute.html#cfn-appmesh-route-httproute-retrypolicy
+	RetryPolicy *Route_HttpRetryPolicy `json:"RetryPolicy,omitempty"`
+
+	// Timeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httproute.html#cfn-appmesh-route-httproute-timeout
+	Timeout *Route_HttpTimeout `json:"Timeout,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_HttpRoute) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.HttpRoute"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_httprouteaction.go b/goformation/cloudformation/appmesh/aws-appmesh-route_httprouteaction.go
new file mode 100644
index 0000000000..b56daaf807
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_httprouteaction.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_HttpRouteAction AWS CloudFormation Resource (AWS::AppMesh::Route.HttpRouteAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httprouteaction.html
+type Route_HttpRouteAction struct {
+
+	// WeightedTargets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httprouteaction.html#cfn-appmesh-route-httprouteaction-weightedtargets
+	WeightedTargets []Route_WeightedTarget `json:"WeightedTargets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_HttpRouteAction) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.HttpRouteAction"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_httprouteheader.go b/goformation/cloudformation/appmesh/aws-appmesh-route_httprouteheader.go
new file mode 100644
index 0000000000..22098547fb
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_httprouteheader.go
@@ -0,0 +1,47 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_HttpRouteHeader AWS CloudFormation Resource (AWS::AppMesh::Route.HttpRouteHeader)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httprouteheader.html
+type Route_HttpRouteHeader struct {
+
+	// Invert AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httprouteheader.html#cfn-appmesh-route-httprouteheader-invert
+	Invert *types.Value `json:"Invert,omitempty"`
+
+	// Match AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httprouteheader.html#cfn-appmesh-route-httprouteheader-match
+	Match *Route_HeaderMatchMethod `json:"Match,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httprouteheader.html#cfn-appmesh-route-httprouteheader-name
+	Name *types.Value `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 *Route_HttpRouteHeader) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.HttpRouteHeader"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_httproutematch.go b/goformation/cloudformation/appmesh/aws-appmesh-route_httproutematch.go
new file mode 100644
index 0000000000..5dbeac021e
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_httproutematch.go
@@ -0,0 +1,62 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_HttpRouteMatch AWS CloudFormation Resource (AWS::AppMesh::Route.HttpRouteMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httproutematch.html
+type Route_HttpRouteMatch struct {
+
+	// Headers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httproutematch.html#cfn-appmesh-route-httproutematch-headers
+	Headers []Route_HttpRouteHeader `json:"Headers,omitempty"`
+
+	// Method AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httproutematch.html#cfn-appmesh-route-httproutematch-method
+	Method *types.Value `json:"Method,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httproutematch.html#cfn-appmesh-route-httproutematch-path
+	Path *Route_HttpPathMatch `json:"Path,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httproutematch.html#cfn-appmesh-route-httproutematch-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// QueryParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httproutematch.html#cfn-appmesh-route-httproutematch-queryparameters
+	QueryParameters []Route_QueryParameter `json:"QueryParameters,omitempty"`
+
+	// Scheme AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httproutematch.html#cfn-appmesh-route-httproutematch-scheme
+	Scheme *types.Value `json:"Scheme,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_HttpRouteMatch) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.HttpRouteMatch"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_httptimeout.go b/goformation/cloudformation/appmesh/aws-appmesh-route_httptimeout.go
new file mode 100644
index 0000000000..084c23ce3e
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_httptimeout.go
@@ -0,0 +1,40 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_HttpTimeout AWS CloudFormation Resource (AWS::AppMesh::Route.HttpTimeout)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httptimeout.html
+type Route_HttpTimeout struct {
+
+	// Idle AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httptimeout.html#cfn-appmesh-route-httptimeout-idle
+	Idle *Route_Duration `json:"Idle,omitempty"`
+
+	// PerRequest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-httptimeout.html#cfn-appmesh-route-httptimeout-perrequest
+	PerRequest *Route_Duration `json:"PerRequest,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_HttpTimeout) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.HttpTimeout"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_matchrange.go b/goformation/cloudformation/appmesh/aws-appmesh-route_matchrange.go
new file mode 100644
index 0000000000..cd4e632a45
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_matchrange.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_MatchRange AWS CloudFormation Resource (AWS::AppMesh::Route.MatchRange)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-matchrange.html
+type Route_MatchRange struct {
+
+	// End AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-matchrange.html#cfn-appmesh-route-matchrange-end
+	End *types.Value `json:"End"`
+
+	// Start AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-matchrange.html#cfn-appmesh-route-matchrange-start
+	Start *types.Value `json:"Start"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_MatchRange) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.MatchRange"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_queryparameter.go b/goformation/cloudformation/appmesh/aws-appmesh-route_queryparameter.go
new file mode 100644
index 0000000000..ab736682fe
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_queryparameter.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_QueryParameter AWS CloudFormation Resource (AWS::AppMesh::Route.QueryParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-queryparameter.html
+type Route_QueryParameter struct {
+
+	// Match AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-queryparameter.html#cfn-appmesh-route-queryparameter-match
+	Match *Route_HttpQueryParameterMatch `json:"Match,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-queryparameter.html#cfn-appmesh-route-queryparameter-name
+	Name *types.Value `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 *Route_QueryParameter) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.QueryParameter"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_routespec.go b/goformation/cloudformation/appmesh/aws-appmesh-route_routespec.go
new file mode 100644
index 0000000000..5d16df4495
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_routespec.go
@@ -0,0 +1,57 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_RouteSpec AWS CloudFormation Resource (AWS::AppMesh::Route.RouteSpec)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-routespec.html
+type Route_RouteSpec struct {
+
+	// GrpcRoute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-routespec.html#cfn-appmesh-route-routespec-grpcroute
+	GrpcRoute *Route_GrpcRoute `json:"GrpcRoute,omitempty"`
+
+	// Http2Route AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-routespec.html#cfn-appmesh-route-routespec-http2route
+	Http2Route *Route_HttpRoute `json:"Http2Route,omitempty"`
+
+	// HttpRoute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-routespec.html#cfn-appmesh-route-routespec-httproute
+	HttpRoute *Route_HttpRoute `json:"HttpRoute,omitempty"`
+
+	// Priority AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-routespec.html#cfn-appmesh-route-routespec-priority
+	Priority *types.Value `json:"Priority,omitempty"`
+
+	// TcpRoute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-routespec.html#cfn-appmesh-route-routespec-tcproute
+	TcpRoute *Route_TcpRoute `json:"TcpRoute,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_RouteSpec) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.RouteSpec"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_tcproute.go b/goformation/cloudformation/appmesh/aws-appmesh-route_tcproute.go
new file mode 100644
index 0000000000..300a39ce1f
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_tcproute.go
@@ -0,0 +1,40 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_TcpRoute AWS CloudFormation Resource (AWS::AppMesh::Route.TcpRoute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-tcproute.html
+type Route_TcpRoute struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-tcproute.html#cfn-appmesh-route-tcproute-action
+	Action *Route_TcpRouteAction `json:"Action,omitempty"`
+
+	// Timeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-tcproute.html#cfn-appmesh-route-tcproute-timeout
+	Timeout *Route_TcpTimeout `json:"Timeout,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_TcpRoute) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.TcpRoute"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_tcprouteaction.go b/goformation/cloudformation/appmesh/aws-appmesh-route_tcprouteaction.go
new file mode 100644
index 0000000000..c2d2e24b31
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_tcprouteaction.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_TcpRouteAction AWS CloudFormation Resource (AWS::AppMesh::Route.TcpRouteAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-tcprouteaction.html
+type Route_TcpRouteAction struct {
+
+	// WeightedTargets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-tcprouteaction.html#cfn-appmesh-route-tcprouteaction-weightedtargets
+	WeightedTargets []Route_WeightedTarget `json:"WeightedTargets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_TcpRouteAction) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.TcpRouteAction"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_tcptimeout.go b/goformation/cloudformation/appmesh/aws-appmesh-route_tcptimeout.go
new file mode 100644
index 0000000000..e320991d7a
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_tcptimeout.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_TcpTimeout AWS CloudFormation Resource (AWS::AppMesh::Route.TcpTimeout)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-tcptimeout.html
+type Route_TcpTimeout struct {
+
+	// Idle AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-tcptimeout.html#cfn-appmesh-route-tcptimeout-idle
+	Idle *Route_Duration `json:"Idle,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_TcpTimeout) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.TcpTimeout"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-route_weightedtarget.go b/goformation/cloudformation/appmesh/aws-appmesh-route_weightedtarget.go
new file mode 100644
index 0000000000..538f2ade9e
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-route_weightedtarget.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_WeightedTarget AWS CloudFormation Resource (AWS::AppMesh::Route.WeightedTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-weightedtarget.html
+type Route_WeightedTarget struct {
+
+	// VirtualNode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-weightedtarget.html#cfn-appmesh-route-weightedtarget-virtualnode
+	VirtualNode *types.Value `json:"VirtualNode,omitempty"`
+
+	// Weight AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-route-weightedtarget.html#cfn-appmesh-route-weightedtarget-weight
+	Weight *types.Value `json:"Weight"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_WeightedTarget) AWSCloudFormationType() string {
+	return "AWS::AppMesh::Route.WeightedTarget"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway.go
new file mode 100644
index 0000000000..34bbe21855
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway.go
@@ -0,0 +1,129 @@
+package appmesh
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualgateway.html
+type VirtualGateway struct {
+
+	// MeshName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualgateway.html#cfn-appmesh-virtualgateway-meshname
+	MeshName *types.Value `json:"MeshName,omitempty"`
+
+	// MeshOwner AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualgateway.html#cfn-appmesh-virtualgateway-meshowner
+	MeshOwner *types.Value `json:"MeshOwner,omitempty"`
+
+	// Spec AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualgateway.html#cfn-appmesh-virtualgateway-spec
+	Spec *VirtualGateway_VirtualGatewaySpec `json:"Spec,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualgateway.html#cfn-appmesh-virtualgateway-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VirtualGatewayName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualgateway.html#cfn-appmesh-virtualgateway-virtualgatewayname
+	VirtualGatewayName *types.Value `json:"VirtualGatewayName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway"
+}
+
+// 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 VirtualGateway) MarshalJSON() ([]byte, error) {
+	type Properties VirtualGateway
+	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 *VirtualGateway) UnmarshalJSON(b []byte) error {
+	type Properties VirtualGateway
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VirtualGateway(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenamematchers.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenamematchers.go
new file mode 100644
index 0000000000..fae2b0eb16
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenamematchers.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_SubjectAlternativeNameMatchers AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.SubjectAlternativeNameMatchers)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-subjectalternativenamematchers.html
+type VirtualGateway_SubjectAlternativeNameMatchers struct {
+
+	// Exact AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-subjectalternativenamematchers.html#cfn-appmesh-virtualgateway-subjectalternativenamematchers-exact
+	Exact *types.Value `json:"Exact,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_SubjectAlternativeNameMatchers) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.SubjectAlternativeNameMatchers"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenames.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenames.go
new file mode 100644
index 0000000000..5fa4ff1ca7
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_subjectalternativenames.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_SubjectAlternativeNames AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.SubjectAlternativeNames)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-subjectalternativenames.html
+type VirtualGateway_SubjectAlternativeNames struct {
+
+	// Match AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-subjectalternativenames.html#cfn-appmesh-virtualgateway-subjectalternativenames-match
+	Match *VirtualGateway_SubjectAlternativeNameMatchers `json:"Match,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_SubjectAlternativeNames) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.SubjectAlternativeNames"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayaccesslog.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayaccesslog.go
new file mode 100644
index 0000000000..b99e2932b2
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayaccesslog.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayAccessLog AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayAccessLog)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayaccesslog.html
+type VirtualGateway_VirtualGatewayAccessLog struct {
+
+	// File AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayaccesslog.html#cfn-appmesh-virtualgateway-virtualgatewayaccesslog-file
+	File *VirtualGateway_VirtualGatewayFileAccessLog `json:"File,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayAccessLog) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayAccessLog"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaybackenddefaults.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaybackenddefaults.go
new file mode 100644
index 0000000000..e498a42227
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaybackenddefaults.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayBackendDefaults AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayBackendDefaults)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaybackenddefaults.html
+type VirtualGateway_VirtualGatewayBackendDefaults struct {
+
+	// ClientPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaybackenddefaults.html#cfn-appmesh-virtualgateway-virtualgatewaybackenddefaults-clientpolicy
+	ClientPolicy *VirtualGateway_VirtualGatewayClientPolicy `json:"ClientPolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayBackendDefaults) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayBackendDefaults"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicy.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicy.go
new file mode 100644
index 0000000000..a50a07d74b
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicy.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayClientPolicy AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayclientpolicy.html
+type VirtualGateway_VirtualGatewayClientPolicy struct {
+
+	// TLS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayclientpolicy.html#cfn-appmesh-virtualgateway-virtualgatewayclientpolicy-tls
+	TLS *VirtualGateway_VirtualGatewayClientPolicyTls `json:"TLS,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayClientPolicy) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicy"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicytls.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicytls.go
new file mode 100644
index 0000000000..e73d21ec49
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclientpolicytls.go
@@ -0,0 +1,52 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayClientPolicyTls AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicyTls)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayclientpolicytls.html
+type VirtualGateway_VirtualGatewayClientPolicyTls struct {
+
+	// Certificate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayclientpolicytls.html#cfn-appmesh-virtualgateway-virtualgatewayclientpolicytls-certificate
+	Certificate *VirtualGateway_VirtualGatewayClientTlsCertificate `json:"Certificate,omitempty"`
+
+	// Enforce AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayclientpolicytls.html#cfn-appmesh-virtualgateway-virtualgatewayclientpolicytls-enforce
+	Enforce *types.Value `json:"Enforce,omitempty"`
+
+	// Ports AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayclientpolicytls.html#cfn-appmesh-virtualgateway-virtualgatewayclientpolicytls-ports
+	Ports *types.Value `json:"Ports,omitempty"`
+
+	// Validation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayclientpolicytls.html#cfn-appmesh-virtualgateway-virtualgatewayclientpolicytls-validation
+	Validation *VirtualGateway_VirtualGatewayTlsValidationContext `json:"Validation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayClientPolicyTls) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicyTls"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclienttlscertificate.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclienttlscertificate.go
new file mode 100644
index 0000000000..df4bc0a57b
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayclienttlscertificate.go
@@ -0,0 +1,40 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayClientTlsCertificate AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayClientTlsCertificate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayclienttlscertificate.html
+type VirtualGateway_VirtualGatewayClientTlsCertificate struct {
+
+	// File AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayclienttlscertificate.html#cfn-appmesh-virtualgateway-virtualgatewayclienttlscertificate-file
+	File *VirtualGateway_VirtualGatewayListenerTlsFileCertificate `json:"File,omitempty"`
+
+	// SDS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayclienttlscertificate.html#cfn-appmesh-virtualgateway-virtualgatewayclienttlscertificate-sds
+	SDS *VirtualGateway_VirtualGatewayListenerTlsSdsCertificate `json:"SDS,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayClientTlsCertificate) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayClientTlsCertificate"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayconnectionpool.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayconnectionpool.go
new file mode 100644
index 0000000000..6fc3eafab0
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayconnectionpool.go
@@ -0,0 +1,45 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayConnectionPool AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayConnectionPool)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayconnectionpool.html
+type VirtualGateway_VirtualGatewayConnectionPool struct {
+
+	// GRPC AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayconnectionpool.html#cfn-appmesh-virtualgateway-virtualgatewayconnectionpool-grpc
+	GRPC *VirtualGateway_VirtualGatewayGrpcConnectionPool `json:"GRPC,omitempty"`
+
+	// HTTP AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayconnectionpool.html#cfn-appmesh-virtualgateway-virtualgatewayconnectionpool-http
+	HTTP *VirtualGateway_VirtualGatewayHttpConnectionPool `json:"HTTP,omitempty"`
+
+	// HTTP2 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayconnectionpool.html#cfn-appmesh-virtualgateway-virtualgatewayconnectionpool-http2
+	HTTP2 *VirtualGateway_VirtualGatewayHttp2ConnectionPool `json:"HTTP2,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayConnectionPool) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayConnectionPool"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayfileaccesslog.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayfileaccesslog.go
new file mode 100644
index 0000000000..ad0d393e92
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayfileaccesslog.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayFileAccessLog AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayFileAccessLog)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayfileaccesslog.html
+type VirtualGateway_VirtualGatewayFileAccessLog struct {
+
+	// Path AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayfileaccesslog.html#cfn-appmesh-virtualgateway-virtualgatewayfileaccesslog-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayFileAccessLog) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayFileAccessLog"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaygrpcconnectionpool.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaygrpcconnectionpool.go
new file mode 100644
index 0000000000..430d868d5e
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaygrpcconnectionpool.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayGrpcConnectionPool AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayGrpcConnectionPool)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaygrpcconnectionpool.html
+type VirtualGateway_VirtualGatewayGrpcConnectionPool struct {
+
+	// MaxRequests AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaygrpcconnectionpool.html#cfn-appmesh-virtualgateway-virtualgatewaygrpcconnectionpool-maxrequests
+	MaxRequests *types.Value `json:"MaxRequests"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayGrpcConnectionPool) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayGrpcConnectionPool"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhealthcheckpolicy.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhealthcheckpolicy.go
new file mode 100644
index 0000000000..dcd9c0c0e1
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhealthcheckpolicy.go
@@ -0,0 +1,67 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayHealthCheckPolicy AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayHealthCheckPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayhealthcheckpolicy.html
+type VirtualGateway_VirtualGatewayHealthCheckPolicy struct {
+
+	// HealthyThreshold AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayhealthcheckpolicy.html#cfn-appmesh-virtualgateway-virtualgatewayhealthcheckpolicy-healthythreshold
+	HealthyThreshold *types.Value `json:"HealthyThreshold"`
+
+	// IntervalMillis AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayhealthcheckpolicy.html#cfn-appmesh-virtualgateway-virtualgatewayhealthcheckpolicy-intervalmillis
+	IntervalMillis *types.Value `json:"IntervalMillis"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayhealthcheckpolicy.html#cfn-appmesh-virtualgateway-virtualgatewayhealthcheckpolicy-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayhealthcheckpolicy.html#cfn-appmesh-virtualgateway-virtualgatewayhealthcheckpolicy-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayhealthcheckpolicy.html#cfn-appmesh-virtualgateway-virtualgatewayhealthcheckpolicy-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// TimeoutMillis AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayhealthcheckpolicy.html#cfn-appmesh-virtualgateway-virtualgatewayhealthcheckpolicy-timeoutmillis
+	TimeoutMillis *types.Value `json:"TimeoutMillis"`
+
+	// UnhealthyThreshold AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayhealthcheckpolicy.html#cfn-appmesh-virtualgateway-virtualgatewayhealthcheckpolicy-unhealthythreshold
+	UnhealthyThreshold *types.Value `json:"UnhealthyThreshold"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayHealthCheckPolicy) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayHealthCheckPolicy"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttp2connectionpool.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttp2connectionpool.go
new file mode 100644
index 0000000000..d9166fbb4d
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttp2connectionpool.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayHttp2ConnectionPool AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayHttp2ConnectionPool)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayhttp2connectionpool.html
+type VirtualGateway_VirtualGatewayHttp2ConnectionPool struct {
+
+	// MaxRequests AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayhttp2connectionpool.html#cfn-appmesh-virtualgateway-virtualgatewayhttp2connectionpool-maxrequests
+	MaxRequests *types.Value `json:"MaxRequests"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayHttp2ConnectionPool) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayHttp2ConnectionPool"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttpconnectionpool.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttpconnectionpool.go
new file mode 100644
index 0000000000..76423e0b2d
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayhttpconnectionpool.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayHttpConnectionPool AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayHttpConnectionPool)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayhttpconnectionpool.html
+type VirtualGateway_VirtualGatewayHttpConnectionPool struct {
+
+	// MaxConnections AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayhttpconnectionpool.html#cfn-appmesh-virtualgateway-virtualgatewayhttpconnectionpool-maxconnections
+	MaxConnections *types.Value `json:"MaxConnections"`
+
+	// MaxPendingRequests AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayhttpconnectionpool.html#cfn-appmesh-virtualgateway-virtualgatewayhttpconnectionpool-maxpendingrequests
+	MaxPendingRequests *types.Value `json:"MaxPendingRequests,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayHttpConnectionPool) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayHttpConnectionPool"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistener.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistener.go
new file mode 100644
index 0000000000..45bfb80e13
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistener.go
@@ -0,0 +1,50 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayListener AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayListener)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistener.html
+type VirtualGateway_VirtualGatewayListener struct {
+
+	// ConnectionPool AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistener.html#cfn-appmesh-virtualgateway-virtualgatewaylistener-connectionpool
+	ConnectionPool *VirtualGateway_VirtualGatewayConnectionPool `json:"ConnectionPool,omitempty"`
+
+	// HealthCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistener.html#cfn-appmesh-virtualgateway-virtualgatewaylistener-healthcheck
+	HealthCheck *VirtualGateway_VirtualGatewayHealthCheckPolicy `json:"HealthCheck,omitempty"`
+
+	// PortMapping AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistener.html#cfn-appmesh-virtualgateway-virtualgatewaylistener-portmapping
+	PortMapping *VirtualGateway_VirtualGatewayPortMapping `json:"PortMapping,omitempty"`
+
+	// TLS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistener.html#cfn-appmesh-virtualgateway-virtualgatewaylistener-tls
+	TLS *VirtualGateway_VirtualGatewayListenerTls `json:"TLS,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayListener) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayListener"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertls.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertls.go
new file mode 100644
index 0000000000..9e3fe9aa37
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertls.go
@@ -0,0 +1,47 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayListenerTls AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTls)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertls.html
+type VirtualGateway_VirtualGatewayListenerTls struct {
+
+	// Certificate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertls.html#cfn-appmesh-virtualgateway-virtualgatewaylistenertls-certificate
+	Certificate *VirtualGateway_VirtualGatewayListenerTlsCertificate `json:"Certificate,omitempty"`
+
+	// Mode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertls.html#cfn-appmesh-virtualgateway-virtualgatewaylistenertls-mode
+	Mode *types.Value `json:"Mode,omitempty"`
+
+	// Validation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertls.html#cfn-appmesh-virtualgateway-virtualgatewaylistenertls-validation
+	Validation *VirtualGateway_VirtualGatewayListenerTlsValidationContext `json:"Validation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayListenerTls) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTls"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsacmcertificate.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsacmcertificate.go
new file mode 100644
index 0000000000..7c7470adb3
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsacmcertificate.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayListenerTlsAcmCertificate AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsAcmCertificate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertlsacmcertificate.html
+type VirtualGateway_VirtualGatewayListenerTlsAcmCertificate struct {
+
+	// CertificateArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertlsacmcertificate.html#cfn-appmesh-virtualgateway-virtualgatewaylistenertlsacmcertificate-certificatearn
+	CertificateArn *types.Value `json:"CertificateArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayListenerTlsAcmCertificate) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsAcmCertificate"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlscertificate.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlscertificate.go
new file mode 100644
index 0000000000..6149447ee2
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlscertificate.go
@@ -0,0 +1,45 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayListenerTlsCertificate AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsCertificate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertlscertificate.html
+type VirtualGateway_VirtualGatewayListenerTlsCertificate struct {
+
+	// ACM AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertlscertificate.html#cfn-appmesh-virtualgateway-virtualgatewaylistenertlscertificate-acm
+	ACM *VirtualGateway_VirtualGatewayListenerTlsAcmCertificate `json:"ACM,omitempty"`
+
+	// File AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertlscertificate.html#cfn-appmesh-virtualgateway-virtualgatewaylistenertlscertificate-file
+	File *VirtualGateway_VirtualGatewayListenerTlsFileCertificate `json:"File,omitempty"`
+
+	// SDS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertlscertificate.html#cfn-appmesh-virtualgateway-virtualgatewaylistenertlscertificate-sds
+	SDS *VirtualGateway_VirtualGatewayListenerTlsSdsCertificate `json:"SDS,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayListenerTlsCertificate) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsCertificate"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsfilecertificate.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsfilecertificate.go
new file mode 100644
index 0000000000..4eea07e707
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsfilecertificate.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayListenerTlsFileCertificate AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsFileCertificate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertlsfilecertificate.html
+type VirtualGateway_VirtualGatewayListenerTlsFileCertificate struct {
+
+	// CertificateChain AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertlsfilecertificate.html#cfn-appmesh-virtualgateway-virtualgatewaylistenertlsfilecertificate-certificatechain
+	CertificateChain *types.Value `json:"CertificateChain,omitempty"`
+
+	// PrivateKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertlsfilecertificate.html#cfn-appmesh-virtualgateway-virtualgatewaylistenertlsfilecertificate-privatekey
+	PrivateKey *types.Value `json:"PrivateKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayListenerTlsFileCertificate) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsFileCertificate"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlssdscertificate.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlssdscertificate.go
new file mode 100644
index 0000000000..dcb3bef153
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlssdscertificate.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayListenerTlsSdsCertificate AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsSdsCertificate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertlssdscertificate.html
+type VirtualGateway_VirtualGatewayListenerTlsSdsCertificate struct {
+
+	// SecretName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertlssdscertificate.html#cfn-appmesh-virtualgateway-virtualgatewaylistenertlssdscertificate-secretname
+	SecretName *types.Value `json:"SecretName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayListenerTlsSdsCertificate) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsSdsCertificate"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontext.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontext.go
new file mode 100644
index 0000000000..da2fc6f79e
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontext.go
@@ -0,0 +1,40 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayListenerTlsValidationContext AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContext)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertlsvalidationcontext.html
+type VirtualGateway_VirtualGatewayListenerTlsValidationContext struct {
+
+	// SubjectAlternativeNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertlsvalidationcontext.html#cfn-appmesh-virtualgateway-virtualgatewaylistenertlsvalidationcontext-subjectalternativenames
+	SubjectAlternativeNames *VirtualGateway_SubjectAlternativeNames `json:"SubjectAlternativeNames,omitempty"`
+
+	// Trust AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertlsvalidationcontext.html#cfn-appmesh-virtualgateway-virtualgatewaylistenertlsvalidationcontext-trust
+	Trust *VirtualGateway_VirtualGatewayListenerTlsValidationContextTrust `json:"Trust,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayListenerTlsValidationContext) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContext"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontexttrust.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontexttrust.go
new file mode 100644
index 0000000000..ffa57f9adb
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylistenertlsvalidationcontexttrust.go
@@ -0,0 +1,40 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayListenerTlsValidationContextTrust AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContextTrust)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertlsvalidationcontexttrust.html
+type VirtualGateway_VirtualGatewayListenerTlsValidationContextTrust struct {
+
+	// File AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertlsvalidationcontexttrust.html#cfn-appmesh-virtualgateway-virtualgatewaylistenertlsvalidationcontexttrust-file
+	File *VirtualGateway_VirtualGatewayTlsValidationContextFileTrust `json:"File,omitempty"`
+
+	// SDS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylistenertlsvalidationcontexttrust.html#cfn-appmesh-virtualgateway-virtualgatewaylistenertlsvalidationcontexttrust-sds
+	SDS *VirtualGateway_VirtualGatewayTlsValidationContextSdsTrust `json:"SDS,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayListenerTlsValidationContextTrust) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContextTrust"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylogging.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylogging.go
new file mode 100644
index 0000000000..cc6068c7f1
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaylogging.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayLogging AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayLogging)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylogging.html
+type VirtualGateway_VirtualGatewayLogging struct {
+
+	// AccessLog AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaylogging.html#cfn-appmesh-virtualgateway-virtualgatewaylogging-accesslog
+	AccessLog *VirtualGateway_VirtualGatewayAccessLog `json:"AccessLog,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayLogging) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayLogging"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayportmapping.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayportmapping.go
new file mode 100644
index 0000000000..7b8bccf896
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayportmapping.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayPortMapping AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayPortMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayportmapping.html
+type VirtualGateway_VirtualGatewayPortMapping struct {
+
+	// Port AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayportmapping.html#cfn-appmesh-virtualgateway-virtualgatewayportmapping-port
+	Port *types.Value `json:"Port"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayportmapping.html#cfn-appmesh-virtualgateway-virtualgatewayportmapping-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayPortMapping) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayPortMapping"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayspec.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayspec.go
new file mode 100644
index 0000000000..292690a7d0
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewayspec.go
@@ -0,0 +1,45 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewaySpec AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewaySpec)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayspec.html
+type VirtualGateway_VirtualGatewaySpec struct {
+
+	// BackendDefaults AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayspec.html#cfn-appmesh-virtualgateway-virtualgatewayspec-backenddefaults
+	BackendDefaults *VirtualGateway_VirtualGatewayBackendDefaults `json:"BackendDefaults,omitempty"`
+
+	// Listeners AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayspec.html#cfn-appmesh-virtualgateway-virtualgatewayspec-listeners
+	Listeners []VirtualGateway_VirtualGatewayListener `json:"Listeners,omitempty"`
+
+	// Logging AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewayspec.html#cfn-appmesh-virtualgateway-virtualgatewayspec-logging
+	Logging *VirtualGateway_VirtualGatewayLogging `json:"Logging,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewaySpec) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewaySpec"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontext.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontext.go
new file mode 100644
index 0000000000..702c33013e
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontext.go
@@ -0,0 +1,40 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayTlsValidationContext AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContext)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaytlsvalidationcontext.html
+type VirtualGateway_VirtualGatewayTlsValidationContext struct {
+
+	// SubjectAlternativeNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaytlsvalidationcontext.html#cfn-appmesh-virtualgateway-virtualgatewaytlsvalidationcontext-subjectalternativenames
+	SubjectAlternativeNames *VirtualGateway_SubjectAlternativeNames `json:"SubjectAlternativeNames,omitempty"`
+
+	// Trust AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaytlsvalidationcontext.html#cfn-appmesh-virtualgateway-virtualgatewaytlsvalidationcontext-trust
+	Trust *VirtualGateway_VirtualGatewayTlsValidationContextTrust `json:"Trust,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayTlsValidationContext) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContext"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextacmtrust.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextacmtrust.go
new file mode 100644
index 0000000000..457ffda52c
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextacmtrust.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayTlsValidationContextAcmTrust AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextAcmTrust)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaytlsvalidationcontextacmtrust.html
+type VirtualGateway_VirtualGatewayTlsValidationContextAcmTrust struct {
+
+	// CertificateAuthorityArns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaytlsvalidationcontextacmtrust.html#cfn-appmesh-virtualgateway-virtualgatewaytlsvalidationcontextacmtrust-certificateauthorityarns
+	CertificateAuthorityArns *types.Value `json:"CertificateAuthorityArns,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayTlsValidationContextAcmTrust) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextAcmTrust"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextfiletrust.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextfiletrust.go
new file mode 100644
index 0000000000..0ab20c5a8d
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextfiletrust.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayTlsValidationContextFileTrust AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextFileTrust)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaytlsvalidationcontextfiletrust.html
+type VirtualGateway_VirtualGatewayTlsValidationContextFileTrust struct {
+
+	// CertificateChain AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaytlsvalidationcontextfiletrust.html#cfn-appmesh-virtualgateway-virtualgatewaytlsvalidationcontextfiletrust-certificatechain
+	CertificateChain *types.Value `json:"CertificateChain,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayTlsValidationContextFileTrust) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextFileTrust"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextsdstrust.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextsdstrust.go
new file mode 100644
index 0000000000..653c5c43a9
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontextsdstrust.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayTlsValidationContextSdsTrust AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextSdsTrust)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaytlsvalidationcontextsdstrust.html
+type VirtualGateway_VirtualGatewayTlsValidationContextSdsTrust struct {
+
+	// SecretName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaytlsvalidationcontextsdstrust.html#cfn-appmesh-virtualgateway-virtualgatewaytlsvalidationcontextsdstrust-secretname
+	SecretName *types.Value `json:"SecretName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayTlsValidationContextSdsTrust) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextSdsTrust"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontexttrust.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontexttrust.go
new file mode 100644
index 0000000000..f5a3c72025
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualgateway_virtualgatewaytlsvalidationcontexttrust.go
@@ -0,0 +1,45 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualGateway_VirtualGatewayTlsValidationContextTrust AWS CloudFormation Resource (AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextTrust)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaytlsvalidationcontexttrust.html
+type VirtualGateway_VirtualGatewayTlsValidationContextTrust struct {
+
+	// ACM AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaytlsvalidationcontexttrust.html#cfn-appmesh-virtualgateway-virtualgatewaytlsvalidationcontexttrust-acm
+	ACM *VirtualGateway_VirtualGatewayTlsValidationContextAcmTrust `json:"ACM,omitempty"`
+
+	// File AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaytlsvalidationcontexttrust.html#cfn-appmesh-virtualgateway-virtualgatewaytlsvalidationcontexttrust-file
+	File *VirtualGateway_VirtualGatewayTlsValidationContextFileTrust `json:"File,omitempty"`
+
+	// SDS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualgateway-virtualgatewaytlsvalidationcontexttrust.html#cfn-appmesh-virtualgateway-virtualgatewaytlsvalidationcontexttrust-sds
+	SDS *VirtualGateway_VirtualGatewayTlsValidationContextSdsTrust `json:"SDS,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualGateway_VirtualGatewayTlsValidationContextTrust) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextTrust"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode.go
new file mode 100644
index 0000000000..822dbe8b0b
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode.go
@@ -0,0 +1,129 @@
+package appmesh
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode AWS CloudFormation Resource (AWS::AppMesh::VirtualNode)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualnode.html
+type VirtualNode struct {
+
+	// MeshName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualnode.html#cfn-appmesh-virtualnode-meshname
+	MeshName *types.Value `json:"MeshName,omitempty"`
+
+	// MeshOwner AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualnode.html#cfn-appmesh-virtualnode-meshowner
+	MeshOwner *types.Value `json:"MeshOwner,omitempty"`
+
+	// Spec AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualnode.html#cfn-appmesh-virtualnode-spec
+	Spec *VirtualNode_VirtualNodeSpec `json:"Spec,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualnode.html#cfn-appmesh-virtualnode-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VirtualNodeName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualnode.html#cfn-appmesh-virtualnode-virtualnodename
+	VirtualNodeName *types.Value `json:"VirtualNodeName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode"
+}
+
+// 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 VirtualNode) MarshalJSON() ([]byte, error) {
+	type Properties VirtualNode
+	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 *VirtualNode) UnmarshalJSON(b []byte) error {
+	type Properties VirtualNode
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VirtualNode(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_accesslog.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_accesslog.go
new file mode 100644
index 0000000000..cef9b077b9
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_accesslog.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_AccessLog AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.AccessLog)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-accesslog.html
+type VirtualNode_AccessLog struct {
+
+	// File AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-accesslog.html#cfn-appmesh-virtualnode-accesslog-file
+	File *VirtualNode_FileAccessLog `json:"File,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_AccessLog) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.AccessLog"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapinstanceattribute.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapinstanceattribute.go
new file mode 100644
index 0000000000..1299145110
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapinstanceattribute.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_AwsCloudMapInstanceAttribute AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.AwsCloudMapInstanceAttribute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-awscloudmapinstanceattribute.html
+type VirtualNode_AwsCloudMapInstanceAttribute struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-awscloudmapinstanceattribute.html#cfn-appmesh-virtualnode-awscloudmapinstanceattribute-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-awscloudmapinstanceattribute.html#cfn-appmesh-virtualnode-awscloudmapinstanceattribute-value
+	Value *types.Value `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 *VirtualNode_AwsCloudMapInstanceAttribute) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.AwsCloudMapInstanceAttribute"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapservicediscovery.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapservicediscovery.go
new file mode 100644
index 0000000000..31d925bae5
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_awscloudmapservicediscovery.go
@@ -0,0 +1,47 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_AwsCloudMapServiceDiscovery AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.AwsCloudMapServiceDiscovery)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-awscloudmapservicediscovery.html
+type VirtualNode_AwsCloudMapServiceDiscovery struct {
+
+	// Attributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-awscloudmapservicediscovery.html#cfn-appmesh-virtualnode-awscloudmapservicediscovery-attributes
+	Attributes []VirtualNode_AwsCloudMapInstanceAttribute `json:"Attributes,omitempty"`
+
+	// NamespaceName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-awscloudmapservicediscovery.html#cfn-appmesh-virtualnode-awscloudmapservicediscovery-namespacename
+	NamespaceName *types.Value `json:"NamespaceName,omitempty"`
+
+	// ServiceName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-awscloudmapservicediscovery.html#cfn-appmesh-virtualnode-awscloudmapservicediscovery-servicename
+	ServiceName *types.Value `json:"ServiceName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_AwsCloudMapServiceDiscovery) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.AwsCloudMapServiceDiscovery"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_backend.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_backend.go
new file mode 100644
index 0000000000..3241333f27
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_backend.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_Backend AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.Backend)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-backend.html
+type VirtualNode_Backend struct {
+
+	// VirtualService AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-backend.html#cfn-appmesh-virtualnode-backend-virtualservice
+	VirtualService *VirtualNode_VirtualServiceBackend `json:"VirtualService,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_Backend) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.Backend"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_backenddefaults.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_backenddefaults.go
new file mode 100644
index 0000000000..04c595c231
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_backenddefaults.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_BackendDefaults AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.BackendDefaults)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-backenddefaults.html
+type VirtualNode_BackendDefaults struct {
+
+	// ClientPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-backenddefaults.html#cfn-appmesh-virtualnode-backenddefaults-clientpolicy
+	ClientPolicy *VirtualNode_ClientPolicy `json:"ClientPolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_BackendDefaults) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.BackendDefaults"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicy.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicy.go
new file mode 100644
index 0000000000..b12a859c39
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicy.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_ClientPolicy AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ClientPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-clientpolicy.html
+type VirtualNode_ClientPolicy struct {
+
+	// TLS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-clientpolicy.html#cfn-appmesh-virtualnode-clientpolicy-tls
+	TLS *VirtualNode_ClientPolicyTls `json:"TLS,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_ClientPolicy) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.ClientPolicy"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicytls.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicytls.go
new file mode 100644
index 0000000000..a74049cf4a
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clientpolicytls.go
@@ -0,0 +1,52 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_ClientPolicyTls AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ClientPolicyTls)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-clientpolicytls.html
+type VirtualNode_ClientPolicyTls struct {
+
+	// Certificate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-clientpolicytls.html#cfn-appmesh-virtualnode-clientpolicytls-certificate
+	Certificate *VirtualNode_ClientTlsCertificate `json:"Certificate,omitempty"`
+
+	// Enforce AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-clientpolicytls.html#cfn-appmesh-virtualnode-clientpolicytls-enforce
+	Enforce *types.Value `json:"Enforce,omitempty"`
+
+	// Ports AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-clientpolicytls.html#cfn-appmesh-virtualnode-clientpolicytls-ports
+	Ports *types.Value `json:"Ports,omitempty"`
+
+	// Validation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-clientpolicytls.html#cfn-appmesh-virtualnode-clientpolicytls-validation
+	Validation *VirtualNode_TlsValidationContext `json:"Validation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_ClientPolicyTls) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.ClientPolicyTls"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clienttlscertificate.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clienttlscertificate.go
new file mode 100644
index 0000000000..06d382492b
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_clienttlscertificate.go
@@ -0,0 +1,40 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_ClientTlsCertificate AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ClientTlsCertificate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-clienttlscertificate.html
+type VirtualNode_ClientTlsCertificate struct {
+
+	// File AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-clienttlscertificate.html#cfn-appmesh-virtualnode-clienttlscertificate-file
+	File *VirtualNode_ListenerTlsFileCertificate `json:"File,omitempty"`
+
+	// SDS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-clienttlscertificate.html#cfn-appmesh-virtualnode-clienttlscertificate-sds
+	SDS *VirtualNode_ListenerTlsSdsCertificate `json:"SDS,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_ClientTlsCertificate) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.ClientTlsCertificate"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_dnsservicediscovery.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_dnsservicediscovery.go
new file mode 100644
index 0000000000..a934ecf8fb
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_dnsservicediscovery.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_DnsServiceDiscovery AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.DnsServiceDiscovery)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-dnsservicediscovery.html
+type VirtualNode_DnsServiceDiscovery struct {
+
+	// Hostname AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-dnsservicediscovery.html#cfn-appmesh-virtualnode-dnsservicediscovery-hostname
+	Hostname *types.Value `json:"Hostname,omitempty"`
+
+	// ResponseType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-dnsservicediscovery.html#cfn-appmesh-virtualnode-dnsservicediscovery-responsetype
+	ResponseType *types.Value `json:"ResponseType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_DnsServiceDiscovery) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.DnsServiceDiscovery"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_duration.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_duration.go
new file mode 100644
index 0000000000..8712860e0b
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_duration.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_Duration AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.Duration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-duration.html
+type VirtualNode_Duration struct {
+
+	// Unit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-duration.html#cfn-appmesh-virtualnode-duration-unit
+	Unit *types.Value `json:"Unit,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-duration.html#cfn-appmesh-virtualnode-duration-value
+	Value *types.Value `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 *VirtualNode_Duration) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.Duration"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_fileaccesslog.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_fileaccesslog.go
new file mode 100644
index 0000000000..2f6ba9f3bb
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_fileaccesslog.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_FileAccessLog AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.FileAccessLog)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-fileaccesslog.html
+type VirtualNode_FileAccessLog struct {
+
+	// Path AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-fileaccesslog.html#cfn-appmesh-virtualnode-fileaccesslog-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_FileAccessLog) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.FileAccessLog"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_grpctimeout.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_grpctimeout.go
new file mode 100644
index 0000000000..5bf627305a
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_grpctimeout.go
@@ -0,0 +1,40 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_GrpcTimeout AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.GrpcTimeout)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-grpctimeout.html
+type VirtualNode_GrpcTimeout struct {
+
+	// Idle AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-grpctimeout.html#cfn-appmesh-virtualnode-grpctimeout-idle
+	Idle *VirtualNode_Duration `json:"Idle,omitempty"`
+
+	// PerRequest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-grpctimeout.html#cfn-appmesh-virtualnode-grpctimeout-perrequest
+	PerRequest *VirtualNode_Duration `json:"PerRequest,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_GrpcTimeout) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.GrpcTimeout"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_healthcheck.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_healthcheck.go
new file mode 100644
index 0000000000..a007a261f4
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_healthcheck.go
@@ -0,0 +1,67 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_HealthCheck AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.HealthCheck)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-healthcheck.html
+type VirtualNode_HealthCheck struct {
+
+	// HealthyThreshold AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-healthcheck.html#cfn-appmesh-virtualnode-healthcheck-healthythreshold
+	HealthyThreshold *types.Value `json:"HealthyThreshold"`
+
+	// IntervalMillis AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-healthcheck.html#cfn-appmesh-virtualnode-healthcheck-intervalmillis
+	IntervalMillis *types.Value `json:"IntervalMillis"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-healthcheck.html#cfn-appmesh-virtualnode-healthcheck-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-healthcheck.html#cfn-appmesh-virtualnode-healthcheck-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-healthcheck.html#cfn-appmesh-virtualnode-healthcheck-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// TimeoutMillis AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-healthcheck.html#cfn-appmesh-virtualnode-healthcheck-timeoutmillis
+	TimeoutMillis *types.Value `json:"TimeoutMillis"`
+
+	// UnhealthyThreshold AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-healthcheck.html#cfn-appmesh-virtualnode-healthcheck-unhealthythreshold
+	UnhealthyThreshold *types.Value `json:"UnhealthyThreshold"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_HealthCheck) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.HealthCheck"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_httptimeout.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_httptimeout.go
new file mode 100644
index 0000000000..42797d61f4
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_httptimeout.go
@@ -0,0 +1,40 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_HttpTimeout AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.HttpTimeout)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-httptimeout.html
+type VirtualNode_HttpTimeout struct {
+
+	// Idle AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-httptimeout.html#cfn-appmesh-virtualnode-httptimeout-idle
+	Idle *VirtualNode_Duration `json:"Idle,omitempty"`
+
+	// PerRequest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-httptimeout.html#cfn-appmesh-virtualnode-httptimeout-perrequest
+	PerRequest *VirtualNode_Duration `json:"PerRequest,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_HttpTimeout) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.HttpTimeout"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listener.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listener.go
new file mode 100644
index 0000000000..92574a7fcb
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listener.go
@@ -0,0 +1,60 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_Listener AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.Listener)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listener.html
+type VirtualNode_Listener struct {
+
+	// ConnectionPool AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listener.html#cfn-appmesh-virtualnode-listener-connectionpool
+	ConnectionPool *VirtualNode_VirtualNodeConnectionPool `json:"ConnectionPool,omitempty"`
+
+	// HealthCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listener.html#cfn-appmesh-virtualnode-listener-healthcheck
+	HealthCheck *VirtualNode_HealthCheck `json:"HealthCheck,omitempty"`
+
+	// OutlierDetection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listener.html#cfn-appmesh-virtualnode-listener-outlierdetection
+	OutlierDetection *VirtualNode_OutlierDetection `json:"OutlierDetection,omitempty"`
+
+	// PortMapping AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listener.html#cfn-appmesh-virtualnode-listener-portmapping
+	PortMapping *VirtualNode_PortMapping `json:"PortMapping,omitempty"`
+
+	// TLS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listener.html#cfn-appmesh-virtualnode-listener-tls
+	TLS *VirtualNode_ListenerTls `json:"TLS,omitempty"`
+
+	// Timeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listener.html#cfn-appmesh-virtualnode-listener-timeout
+	Timeout *VirtualNode_ListenerTimeout `json:"Timeout,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_Listener) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.Listener"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertimeout.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertimeout.go
new file mode 100644
index 0000000000..adbf1a92af
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertimeout.go
@@ -0,0 +1,50 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_ListenerTimeout AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ListenerTimeout)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertimeout.html
+type VirtualNode_ListenerTimeout struct {
+
+	// GRPC AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertimeout.html#cfn-appmesh-virtualnode-listenertimeout-grpc
+	GRPC *VirtualNode_GrpcTimeout `json:"GRPC,omitempty"`
+
+	// HTTP AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertimeout.html#cfn-appmesh-virtualnode-listenertimeout-http
+	HTTP *VirtualNode_HttpTimeout `json:"HTTP,omitempty"`
+
+	// HTTP2 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertimeout.html#cfn-appmesh-virtualnode-listenertimeout-http2
+	HTTP2 *VirtualNode_HttpTimeout `json:"HTTP2,omitempty"`
+
+	// TCP AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertimeout.html#cfn-appmesh-virtualnode-listenertimeout-tcp
+	TCP *VirtualNode_TcpTimeout `json:"TCP,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_ListenerTimeout) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.ListenerTimeout"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertls.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertls.go
new file mode 100644
index 0000000000..c624fa0703
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertls.go
@@ -0,0 +1,47 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_ListenerTls AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ListenerTls)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertls.html
+type VirtualNode_ListenerTls struct {
+
+	// Certificate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertls.html#cfn-appmesh-virtualnode-listenertls-certificate
+	Certificate *VirtualNode_ListenerTlsCertificate `json:"Certificate,omitempty"`
+
+	// Mode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertls.html#cfn-appmesh-virtualnode-listenertls-mode
+	Mode *types.Value `json:"Mode,omitempty"`
+
+	// Validation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertls.html#cfn-appmesh-virtualnode-listenertls-validation
+	Validation *VirtualNode_ListenerTlsValidationContext `json:"Validation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_ListenerTls) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.ListenerTls"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsacmcertificate.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsacmcertificate.go
new file mode 100644
index 0000000000..a33c2a4c00
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsacmcertificate.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_ListenerTlsAcmCertificate AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ListenerTlsAcmCertificate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertlsacmcertificate.html
+type VirtualNode_ListenerTlsAcmCertificate struct {
+
+	// CertificateArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertlsacmcertificate.html#cfn-appmesh-virtualnode-listenertlsacmcertificate-certificatearn
+	CertificateArn *types.Value `json:"CertificateArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_ListenerTlsAcmCertificate) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.ListenerTlsAcmCertificate"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlscertificate.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlscertificate.go
new file mode 100644
index 0000000000..f4ad632834
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlscertificate.go
@@ -0,0 +1,45 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_ListenerTlsCertificate AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ListenerTlsCertificate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertlscertificate.html
+type VirtualNode_ListenerTlsCertificate struct {
+
+	// ACM AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertlscertificate.html#cfn-appmesh-virtualnode-listenertlscertificate-acm
+	ACM *VirtualNode_ListenerTlsAcmCertificate `json:"ACM,omitempty"`
+
+	// File AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertlscertificate.html#cfn-appmesh-virtualnode-listenertlscertificate-file
+	File *VirtualNode_ListenerTlsFileCertificate `json:"File,omitempty"`
+
+	// SDS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertlscertificate.html#cfn-appmesh-virtualnode-listenertlscertificate-sds
+	SDS *VirtualNode_ListenerTlsSdsCertificate `json:"SDS,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_ListenerTlsCertificate) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.ListenerTlsCertificate"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsfilecertificate.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsfilecertificate.go
new file mode 100644
index 0000000000..6ecbd31684
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsfilecertificate.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_ListenerTlsFileCertificate AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ListenerTlsFileCertificate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertlsfilecertificate.html
+type VirtualNode_ListenerTlsFileCertificate struct {
+
+	// CertificateChain AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertlsfilecertificate.html#cfn-appmesh-virtualnode-listenertlsfilecertificate-certificatechain
+	CertificateChain *types.Value `json:"CertificateChain,omitempty"`
+
+	// PrivateKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertlsfilecertificate.html#cfn-appmesh-virtualnode-listenertlsfilecertificate-privatekey
+	PrivateKey *types.Value `json:"PrivateKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_ListenerTlsFileCertificate) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.ListenerTlsFileCertificate"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlssdscertificate.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlssdscertificate.go
new file mode 100644
index 0000000000..bfc4340183
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlssdscertificate.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_ListenerTlsSdsCertificate AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ListenerTlsSdsCertificate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertlssdscertificate.html
+type VirtualNode_ListenerTlsSdsCertificate struct {
+
+	// SecretName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertlssdscertificate.html#cfn-appmesh-virtualnode-listenertlssdscertificate-secretname
+	SecretName *types.Value `json:"SecretName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_ListenerTlsSdsCertificate) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.ListenerTlsSdsCertificate"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontext.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontext.go
new file mode 100644
index 0000000000..0f6bbecdd5
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontext.go
@@ -0,0 +1,40 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_ListenerTlsValidationContext AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ListenerTlsValidationContext)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertlsvalidationcontext.html
+type VirtualNode_ListenerTlsValidationContext struct {
+
+	// SubjectAlternativeNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertlsvalidationcontext.html#cfn-appmesh-virtualnode-listenertlsvalidationcontext-subjectalternativenames
+	SubjectAlternativeNames *VirtualNode_SubjectAlternativeNames `json:"SubjectAlternativeNames,omitempty"`
+
+	// Trust AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertlsvalidationcontext.html#cfn-appmesh-virtualnode-listenertlsvalidationcontext-trust
+	Trust *VirtualNode_ListenerTlsValidationContextTrust `json:"Trust,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_ListenerTlsValidationContext) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.ListenerTlsValidationContext"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontexttrust.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontexttrust.go
new file mode 100644
index 0000000000..7656c889c4
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_listenertlsvalidationcontexttrust.go
@@ -0,0 +1,40 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_ListenerTlsValidationContextTrust AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ListenerTlsValidationContextTrust)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertlsvalidationcontexttrust.html
+type VirtualNode_ListenerTlsValidationContextTrust struct {
+
+	// File AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertlsvalidationcontexttrust.html#cfn-appmesh-virtualnode-listenertlsvalidationcontexttrust-file
+	File *VirtualNode_TlsValidationContextFileTrust `json:"File,omitempty"`
+
+	// SDS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-listenertlsvalidationcontexttrust.html#cfn-appmesh-virtualnode-listenertlsvalidationcontexttrust-sds
+	SDS *VirtualNode_TlsValidationContextSdsTrust `json:"SDS,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_ListenerTlsValidationContextTrust) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.ListenerTlsValidationContextTrust"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_logging.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_logging.go
new file mode 100644
index 0000000000..159876459c
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_logging.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_Logging AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.Logging)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-logging.html
+type VirtualNode_Logging struct {
+
+	// AccessLog AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-logging.html#cfn-appmesh-virtualnode-logging-accesslog
+	AccessLog *VirtualNode_AccessLog `json:"AccessLog,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_Logging) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.Logging"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_outlierdetection.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_outlierdetection.go
new file mode 100644
index 0000000000..10d3787ee4
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_outlierdetection.go
@@ -0,0 +1,52 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_OutlierDetection AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.OutlierDetection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-outlierdetection.html
+type VirtualNode_OutlierDetection struct {
+
+	// BaseEjectionDuration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-outlierdetection.html#cfn-appmesh-virtualnode-outlierdetection-baseejectionduration
+	BaseEjectionDuration *VirtualNode_Duration `json:"BaseEjectionDuration,omitempty"`
+
+	// Interval AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-outlierdetection.html#cfn-appmesh-virtualnode-outlierdetection-interval
+	Interval *VirtualNode_Duration `json:"Interval,omitempty"`
+
+	// MaxEjectionPercent AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-outlierdetection.html#cfn-appmesh-virtualnode-outlierdetection-maxejectionpercent
+	MaxEjectionPercent *types.Value `json:"MaxEjectionPercent"`
+
+	// MaxServerErrors AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-outlierdetection.html#cfn-appmesh-virtualnode-outlierdetection-maxservererrors
+	MaxServerErrors *types.Value `json:"MaxServerErrors"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_OutlierDetection) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.OutlierDetection"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_portmapping.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_portmapping.go
new file mode 100644
index 0000000000..c5aad60dc2
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_portmapping.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_PortMapping AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.PortMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-portmapping.html
+type VirtualNode_PortMapping struct {
+
+	// Port AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-portmapping.html#cfn-appmesh-virtualnode-portmapping-port
+	Port *types.Value `json:"Port"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-portmapping.html#cfn-appmesh-virtualnode-portmapping-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_PortMapping) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.PortMapping"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_servicediscovery.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_servicediscovery.go
new file mode 100644
index 0000000000..f901282c83
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_servicediscovery.go
@@ -0,0 +1,40 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_ServiceDiscovery AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.ServiceDiscovery)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-servicediscovery.html
+type VirtualNode_ServiceDiscovery struct {
+
+	// AWSCloudMap AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-servicediscovery.html#cfn-appmesh-virtualnode-servicediscovery-awscloudmap
+	AWSCloudMap *VirtualNode_AwsCloudMapServiceDiscovery `json:"AWSCloudMap,omitempty"`
+
+	// DNS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-servicediscovery.html#cfn-appmesh-virtualnode-servicediscovery-dns
+	DNS *VirtualNode_DnsServiceDiscovery `json:"DNS,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_ServiceDiscovery) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.ServiceDiscovery"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenamematchers.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenamematchers.go
new file mode 100644
index 0000000000..bb4beeee6b
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenamematchers.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_SubjectAlternativeNameMatchers AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.SubjectAlternativeNameMatchers)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-subjectalternativenamematchers.html
+type VirtualNode_SubjectAlternativeNameMatchers struct {
+
+	// Exact AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-subjectalternativenamematchers.html#cfn-appmesh-virtualnode-subjectalternativenamematchers-exact
+	Exact *types.Value `json:"Exact,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_SubjectAlternativeNameMatchers) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.SubjectAlternativeNameMatchers"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenames.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenames.go
new file mode 100644
index 0000000000..d3432d6e67
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_subjectalternativenames.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_SubjectAlternativeNames AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.SubjectAlternativeNames)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-subjectalternativenames.html
+type VirtualNode_SubjectAlternativeNames struct {
+
+	// Match AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-subjectalternativenames.html#cfn-appmesh-virtualnode-subjectalternativenames-match
+	Match *VirtualNode_SubjectAlternativeNameMatchers `json:"Match,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_SubjectAlternativeNames) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.SubjectAlternativeNames"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tcptimeout.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tcptimeout.go
new file mode 100644
index 0000000000..788bea23b4
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tcptimeout.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_TcpTimeout AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.TcpTimeout)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-tcptimeout.html
+type VirtualNode_TcpTimeout struct {
+
+	// Idle AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-tcptimeout.html#cfn-appmesh-virtualnode-tcptimeout-idle
+	Idle *VirtualNode_Duration `json:"Idle,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_TcpTimeout) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.TcpTimeout"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontext.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontext.go
new file mode 100644
index 0000000000..5b9317d6ba
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontext.go
@@ -0,0 +1,40 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_TlsValidationContext AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.TlsValidationContext)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-tlsvalidationcontext.html
+type VirtualNode_TlsValidationContext struct {
+
+	// SubjectAlternativeNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-tlsvalidationcontext.html#cfn-appmesh-virtualnode-tlsvalidationcontext-subjectalternativenames
+	SubjectAlternativeNames *VirtualNode_SubjectAlternativeNames `json:"SubjectAlternativeNames,omitempty"`
+
+	// Trust AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-tlsvalidationcontext.html#cfn-appmesh-virtualnode-tlsvalidationcontext-trust
+	Trust *VirtualNode_TlsValidationContextTrust `json:"Trust,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_TlsValidationContext) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.TlsValidationContext"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextacmtrust.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextacmtrust.go
new file mode 100644
index 0000000000..c791235bdd
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextacmtrust.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_TlsValidationContextAcmTrust AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.TlsValidationContextAcmTrust)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-tlsvalidationcontextacmtrust.html
+type VirtualNode_TlsValidationContextAcmTrust struct {
+
+	// CertificateAuthorityArns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-tlsvalidationcontextacmtrust.html#cfn-appmesh-virtualnode-tlsvalidationcontextacmtrust-certificateauthorityarns
+	CertificateAuthorityArns *types.Value `json:"CertificateAuthorityArns,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_TlsValidationContextAcmTrust) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.TlsValidationContextAcmTrust"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextfiletrust.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextfiletrust.go
new file mode 100644
index 0000000000..7118a83657
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextfiletrust.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_TlsValidationContextFileTrust AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.TlsValidationContextFileTrust)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-tlsvalidationcontextfiletrust.html
+type VirtualNode_TlsValidationContextFileTrust struct {
+
+	// CertificateChain AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-tlsvalidationcontextfiletrust.html#cfn-appmesh-virtualnode-tlsvalidationcontextfiletrust-certificatechain
+	CertificateChain *types.Value `json:"CertificateChain,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_TlsValidationContextFileTrust) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.TlsValidationContextFileTrust"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextsdstrust.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextsdstrust.go
new file mode 100644
index 0000000000..cd7051b7cb
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontextsdstrust.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_TlsValidationContextSdsTrust AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.TlsValidationContextSdsTrust)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-tlsvalidationcontextsdstrust.html
+type VirtualNode_TlsValidationContextSdsTrust struct {
+
+	// SecretName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-tlsvalidationcontextsdstrust.html#cfn-appmesh-virtualnode-tlsvalidationcontextsdstrust-secretname
+	SecretName *types.Value `json:"SecretName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_TlsValidationContextSdsTrust) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.TlsValidationContextSdsTrust"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontexttrust.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontexttrust.go
new file mode 100644
index 0000000000..c2f93fe1d3
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_tlsvalidationcontexttrust.go
@@ -0,0 +1,45 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_TlsValidationContextTrust AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.TlsValidationContextTrust)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-tlsvalidationcontexttrust.html
+type VirtualNode_TlsValidationContextTrust struct {
+
+	// ACM AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-tlsvalidationcontexttrust.html#cfn-appmesh-virtualnode-tlsvalidationcontexttrust-acm
+	ACM *VirtualNode_TlsValidationContextAcmTrust `json:"ACM,omitempty"`
+
+	// File AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-tlsvalidationcontexttrust.html#cfn-appmesh-virtualnode-tlsvalidationcontexttrust-file
+	File *VirtualNode_TlsValidationContextFileTrust `json:"File,omitempty"`
+
+	// SDS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-tlsvalidationcontexttrust.html#cfn-appmesh-virtualnode-tlsvalidationcontexttrust-sds
+	SDS *VirtualNode_TlsValidationContextSdsTrust `json:"SDS,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_TlsValidationContextTrust) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.TlsValidationContextTrust"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodeconnectionpool.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodeconnectionpool.go
new file mode 100644
index 0000000000..16c8faf9c0
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodeconnectionpool.go
@@ -0,0 +1,50 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_VirtualNodeConnectionPool AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.VirtualNodeConnectionPool)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualnodeconnectionpool.html
+type VirtualNode_VirtualNodeConnectionPool struct {
+
+	// GRPC AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualnodeconnectionpool.html#cfn-appmesh-virtualnode-virtualnodeconnectionpool-grpc
+	GRPC *VirtualNode_VirtualNodeGrpcConnectionPool `json:"GRPC,omitempty"`
+
+	// HTTP AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualnodeconnectionpool.html#cfn-appmesh-virtualnode-virtualnodeconnectionpool-http
+	HTTP *VirtualNode_VirtualNodeHttpConnectionPool `json:"HTTP,omitempty"`
+
+	// HTTP2 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualnodeconnectionpool.html#cfn-appmesh-virtualnode-virtualnodeconnectionpool-http2
+	HTTP2 *VirtualNode_VirtualNodeHttp2ConnectionPool `json:"HTTP2,omitempty"`
+
+	// TCP AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualnodeconnectionpool.html#cfn-appmesh-virtualnode-virtualnodeconnectionpool-tcp
+	TCP *VirtualNode_VirtualNodeTcpConnectionPool `json:"TCP,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_VirtualNodeConnectionPool) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.VirtualNodeConnectionPool"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodegrpcconnectionpool.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodegrpcconnectionpool.go
new file mode 100644
index 0000000000..4e6dc460d4
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodegrpcconnectionpool.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_VirtualNodeGrpcConnectionPool AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.VirtualNodeGrpcConnectionPool)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualnodegrpcconnectionpool.html
+type VirtualNode_VirtualNodeGrpcConnectionPool struct {
+
+	// MaxRequests AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualnodegrpcconnectionpool.html#cfn-appmesh-virtualnode-virtualnodegrpcconnectionpool-maxrequests
+	MaxRequests *types.Value `json:"MaxRequests"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_VirtualNodeGrpcConnectionPool) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.VirtualNodeGrpcConnectionPool"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttp2connectionpool.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttp2connectionpool.go
new file mode 100644
index 0000000000..54ac2a2ed5
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttp2connectionpool.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_VirtualNodeHttp2ConnectionPool AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.VirtualNodeHttp2ConnectionPool)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualnodehttp2connectionpool.html
+type VirtualNode_VirtualNodeHttp2ConnectionPool struct {
+
+	// MaxRequests AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualnodehttp2connectionpool.html#cfn-appmesh-virtualnode-virtualnodehttp2connectionpool-maxrequests
+	MaxRequests *types.Value `json:"MaxRequests"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_VirtualNodeHttp2ConnectionPool) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.VirtualNodeHttp2ConnectionPool"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttpconnectionpool.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttpconnectionpool.go
new file mode 100644
index 0000000000..9e1cdcb03f
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodehttpconnectionpool.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_VirtualNodeHttpConnectionPool AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.VirtualNodeHttpConnectionPool)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualnodehttpconnectionpool.html
+type VirtualNode_VirtualNodeHttpConnectionPool struct {
+
+	// MaxConnections AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualnodehttpconnectionpool.html#cfn-appmesh-virtualnode-virtualnodehttpconnectionpool-maxconnections
+	MaxConnections *types.Value `json:"MaxConnections"`
+
+	// MaxPendingRequests AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualnodehttpconnectionpool.html#cfn-appmesh-virtualnode-virtualnodehttpconnectionpool-maxpendingrequests
+	MaxPendingRequests *types.Value `json:"MaxPendingRequests,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_VirtualNodeHttpConnectionPool) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.VirtualNodeHttpConnectionPool"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodespec.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodespec.go
new file mode 100644
index 0000000000..64d571c7b4
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodespec.go
@@ -0,0 +1,55 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_VirtualNodeSpec AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.VirtualNodeSpec)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualnodespec.html
+type VirtualNode_VirtualNodeSpec struct {
+
+	// BackendDefaults AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualnodespec.html#cfn-appmesh-virtualnode-virtualnodespec-backenddefaults
+	BackendDefaults *VirtualNode_BackendDefaults `json:"BackendDefaults,omitempty"`
+
+	// Backends AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualnodespec.html#cfn-appmesh-virtualnode-virtualnodespec-backends
+	Backends []VirtualNode_Backend `json:"Backends,omitempty"`
+
+	// Listeners AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualnodespec.html#cfn-appmesh-virtualnode-virtualnodespec-listeners
+	Listeners []VirtualNode_Listener `json:"Listeners,omitempty"`
+
+	// Logging AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualnodespec.html#cfn-appmesh-virtualnode-virtualnodespec-logging
+	Logging *VirtualNode_Logging `json:"Logging,omitempty"`
+
+	// ServiceDiscovery AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualnodespec.html#cfn-appmesh-virtualnode-virtualnodespec-servicediscovery
+	ServiceDiscovery *VirtualNode_ServiceDiscovery `json:"ServiceDiscovery,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_VirtualNodeSpec) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.VirtualNodeSpec"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodetcpconnectionpool.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodetcpconnectionpool.go
new file mode 100644
index 0000000000..aa89797dc2
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualnodetcpconnectionpool.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_VirtualNodeTcpConnectionPool AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.VirtualNodeTcpConnectionPool)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualnodetcpconnectionpool.html
+type VirtualNode_VirtualNodeTcpConnectionPool struct {
+
+	// MaxConnections AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualnodetcpconnectionpool.html#cfn-appmesh-virtualnode-virtualnodetcpconnectionpool-maxconnections
+	MaxConnections *types.Value `json:"MaxConnections"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_VirtualNodeTcpConnectionPool) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.VirtualNodeTcpConnectionPool"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualservicebackend.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualservicebackend.go
new file mode 100644
index 0000000000..9c0891a90f
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualnode_virtualservicebackend.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualNode_VirtualServiceBackend AWS CloudFormation Resource (AWS::AppMesh::VirtualNode.VirtualServiceBackend)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualservicebackend.html
+type VirtualNode_VirtualServiceBackend struct {
+
+	// ClientPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualservicebackend.html#cfn-appmesh-virtualnode-virtualservicebackend-clientpolicy
+	ClientPolicy *VirtualNode_ClientPolicy `json:"ClientPolicy,omitempty"`
+
+	// VirtualServiceName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualnode-virtualservicebackend.html#cfn-appmesh-virtualnode-virtualservicebackend-virtualservicename
+	VirtualServiceName *types.Value `json:"VirtualServiceName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualNode_VirtualServiceBackend) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualNode.VirtualServiceBackend"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter.go
new file mode 100644
index 0000000000..ab4614506c
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter.go
@@ -0,0 +1,129 @@
+package appmesh
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualRouter AWS CloudFormation Resource (AWS::AppMesh::VirtualRouter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualrouter.html
+type VirtualRouter struct {
+
+	// MeshName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualrouter.html#cfn-appmesh-virtualrouter-meshname
+	MeshName *types.Value `json:"MeshName,omitempty"`
+
+	// MeshOwner AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualrouter.html#cfn-appmesh-virtualrouter-meshowner
+	MeshOwner *types.Value `json:"MeshOwner,omitempty"`
+
+	// Spec AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualrouter.html#cfn-appmesh-virtualrouter-spec
+	Spec *VirtualRouter_VirtualRouterSpec `json:"Spec,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualrouter.html#cfn-appmesh-virtualrouter-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VirtualRouterName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualrouter.html#cfn-appmesh-virtualrouter-virtualroutername
+	VirtualRouterName *types.Value `json:"VirtualRouterName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualRouter) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualRouter"
+}
+
+// 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 VirtualRouter) MarshalJSON() ([]byte, error) {
+	type Properties VirtualRouter
+	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 *VirtualRouter) UnmarshalJSON(b []byte) error {
+	type Properties VirtualRouter
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VirtualRouter(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_portmapping.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_portmapping.go
new file mode 100644
index 0000000000..52eeb5faf4
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_portmapping.go
@@ -0,0 +1,42 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualRouter_PortMapping AWS CloudFormation Resource (AWS::AppMesh::VirtualRouter.PortMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualrouter-portmapping.html
+type VirtualRouter_PortMapping struct {
+
+	// Port AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualrouter-portmapping.html#cfn-appmesh-virtualrouter-portmapping-port
+	Port *types.Value `json:"Port"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualrouter-portmapping.html#cfn-appmesh-virtualrouter-portmapping-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualRouter_PortMapping) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualRouter.PortMapping"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterlistener.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterlistener.go
new file mode 100644
index 0000000000..a2291cbf18
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterlistener.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualRouter_VirtualRouterListener AWS CloudFormation Resource (AWS::AppMesh::VirtualRouter.VirtualRouterListener)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualrouter-virtualrouterlistener.html
+type VirtualRouter_VirtualRouterListener struct {
+
+	// PortMapping AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualrouter-virtualrouterlistener.html#cfn-appmesh-virtualrouter-virtualrouterlistener-portmapping
+	PortMapping *VirtualRouter_PortMapping `json:"PortMapping,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualRouter_VirtualRouterListener) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualRouter.VirtualRouterListener"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterspec.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterspec.go
new file mode 100644
index 0000000000..13a4f678f6
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualrouter_virtualrouterspec.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualRouter_VirtualRouterSpec AWS CloudFormation Resource (AWS::AppMesh::VirtualRouter.VirtualRouterSpec)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualrouter-virtualrouterspec.html
+type VirtualRouter_VirtualRouterSpec struct {
+
+	// Listeners AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualrouter-virtualrouterspec.html#cfn-appmesh-virtualrouter-virtualrouterspec-listeners
+	Listeners []VirtualRouter_VirtualRouterListener `json:"Listeners,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualRouter_VirtualRouterSpec) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualRouter.VirtualRouterSpec"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualservice.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualservice.go
new file mode 100644
index 0000000000..d1b0204579
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualservice.go
@@ -0,0 +1,129 @@
+package appmesh
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualService AWS CloudFormation Resource (AWS::AppMesh::VirtualService)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualservice.html
+type VirtualService struct {
+
+	// MeshName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualservice.html#cfn-appmesh-virtualservice-meshname
+	MeshName *types.Value `json:"MeshName,omitempty"`
+
+	// MeshOwner AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualservice.html#cfn-appmesh-virtualservice-meshowner
+	MeshOwner *types.Value `json:"MeshOwner,omitempty"`
+
+	// Spec AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualservice.html#cfn-appmesh-virtualservice-spec
+	Spec *VirtualService_VirtualServiceSpec `json:"Spec,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualservice.html#cfn-appmesh-virtualservice-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VirtualServiceName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appmesh-virtualservice.html#cfn-appmesh-virtualservice-virtualservicename
+	VirtualServiceName *types.Value `json:"VirtualServiceName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualService) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualService"
+}
+
+// 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 VirtualService) MarshalJSON() ([]byte, error) {
+	type Properties VirtualService
+	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 *VirtualService) UnmarshalJSON(b []byte) error {
+	type Properties VirtualService
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VirtualService(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualnodeserviceprovider.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualnodeserviceprovider.go
new file mode 100644
index 0000000000..3fc6c4cbe9
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualnodeserviceprovider.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualService_VirtualNodeServiceProvider AWS CloudFormation Resource (AWS::AppMesh::VirtualService.VirtualNodeServiceProvider)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualservice-virtualnodeserviceprovider.html
+type VirtualService_VirtualNodeServiceProvider struct {
+
+	// VirtualNodeName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualservice-virtualnodeserviceprovider.html#cfn-appmesh-virtualservice-virtualnodeserviceprovider-virtualnodename
+	VirtualNodeName *types.Value `json:"VirtualNodeName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualService_VirtualNodeServiceProvider) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualService.VirtualNodeServiceProvider"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualrouterserviceprovider.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualrouterserviceprovider.go
new file mode 100644
index 0000000000..450b121ca1
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualrouterserviceprovider.go
@@ -0,0 +1,37 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualService_VirtualRouterServiceProvider AWS CloudFormation Resource (AWS::AppMesh::VirtualService.VirtualRouterServiceProvider)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualservice-virtualrouterserviceprovider.html
+type VirtualService_VirtualRouterServiceProvider struct {
+
+	// VirtualRouterName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualservice-virtualrouterserviceprovider.html#cfn-appmesh-virtualservice-virtualrouterserviceprovider-virtualroutername
+	VirtualRouterName *types.Value `json:"VirtualRouterName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualService_VirtualRouterServiceProvider) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualService.VirtualRouterServiceProvider"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualserviceprovider.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualserviceprovider.go
new file mode 100644
index 0000000000..7db1b669cb
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualserviceprovider.go
@@ -0,0 +1,40 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualService_VirtualServiceProvider AWS CloudFormation Resource (AWS::AppMesh::VirtualService.VirtualServiceProvider)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualservice-virtualserviceprovider.html
+type VirtualService_VirtualServiceProvider struct {
+
+	// VirtualNode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualservice-virtualserviceprovider.html#cfn-appmesh-virtualservice-virtualserviceprovider-virtualnode
+	VirtualNode *VirtualService_VirtualNodeServiceProvider `json:"VirtualNode,omitempty"`
+
+	// VirtualRouter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualservice-virtualserviceprovider.html#cfn-appmesh-virtualservice-virtualserviceprovider-virtualrouter
+	VirtualRouter *VirtualService_VirtualRouterServiceProvider `json:"VirtualRouter,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualService_VirtualServiceProvider) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualService.VirtualServiceProvider"
+}
diff --git a/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualservicespec.go b/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualservicespec.go
new file mode 100644
index 0000000000..a38af7f93e
--- /dev/null
+++ b/goformation/cloudformation/appmesh/aws-appmesh-virtualservice_virtualservicespec.go
@@ -0,0 +1,35 @@
+package appmesh
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualService_VirtualServiceSpec AWS CloudFormation Resource (AWS::AppMesh::VirtualService.VirtualServiceSpec)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualservice-virtualservicespec.html
+type VirtualService_VirtualServiceSpec struct {
+
+	// Provider AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appmesh-virtualservice-virtualservicespec.html#cfn-appmesh-virtualservice-virtualservicespec-provider
+	Provider *VirtualService_VirtualServiceProvider `json:"Provider,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualService_VirtualServiceSpec) AWSCloudFormationType() string {
+	return "AWS::AppMesh::VirtualService.VirtualServiceSpec"
+}
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service.go b/goformation/cloudformation/apprunner/aws-apprunner-service.go
new file mode 100644
index 0000000000..94be3e2ac5
--- /dev/null
+++ b/goformation/cloudformation/apprunner/aws-apprunner-service.go
@@ -0,0 +1,139 @@
+package apprunner
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service AWS CloudFormation Resource (AWS::AppRunner::Service)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apprunner-service.html
+type Service struct {
+
+	// AutoScalingConfigurationArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apprunner-service.html#cfn-apprunner-service-autoscalingconfigurationarn
+	AutoScalingConfigurationArn *types.Value `json:"AutoScalingConfigurationArn,omitempty"`
+
+	// EncryptionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apprunner-service.html#cfn-apprunner-service-encryptionconfiguration
+	EncryptionConfiguration *Service_EncryptionConfiguration `json:"EncryptionConfiguration,omitempty"`
+
+	// HealthCheckConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apprunner-service.html#cfn-apprunner-service-healthcheckconfiguration
+	HealthCheckConfiguration *Service_HealthCheckConfiguration `json:"HealthCheckConfiguration,omitempty"`
+
+	// InstanceConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apprunner-service.html#cfn-apprunner-service-instanceconfiguration
+	InstanceConfiguration *Service_InstanceConfiguration `json:"InstanceConfiguration,omitempty"`
+
+	// ServiceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apprunner-service.html#cfn-apprunner-service-servicename
+	ServiceName *types.Value `json:"ServiceName,omitempty"`
+
+	// SourceConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apprunner-service.html#cfn-apprunner-service-sourceconfiguration
+	SourceConfiguration *Service_SourceConfiguration `json:"SourceConfiguration,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-apprunner-service.html#cfn-apprunner-service-tags
+	Tags []cloudformation.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 *Service) AWSCloudFormationType() string {
+	return "AWS::AppRunner::Service"
+}
+
+// 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 Service) MarshalJSON() ([]byte, error) {
+	type Properties Service
+	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 *Service) UnmarshalJSON(b []byte) error {
+	type Properties Service
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Service(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/apprunner/aws-apprunner-service_authenticationconfiguration.go b/goformation/cloudformation/apprunner/aws-apprunner-service_authenticationconfiguration.go
new file mode 100644
index 0000000000..4c34acdc0e
--- /dev/null
+++ b/goformation/cloudformation/apprunner/aws-apprunner-service_authenticationconfiguration.go
@@ -0,0 +1,42 @@
+package apprunner
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_AuthenticationConfiguration AWS CloudFormation Resource (AWS::AppRunner::Service.AuthenticationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-authenticationconfiguration.html
+type Service_AuthenticationConfiguration struct {
+
+	// AccessRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-authenticationconfiguration.html#cfn-apprunner-service-authenticationconfiguration-accessrolearn
+	AccessRoleArn *types.Value `json:"AccessRoleArn,omitempty"`
+
+	// ConnectionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-authenticationconfiguration.html#cfn-apprunner-service-authenticationconfiguration-connectionarn
+	ConnectionArn *types.Value `json:"ConnectionArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service_AuthenticationConfiguration) AWSCloudFormationType() string {
+	return "AWS::AppRunner::Service.AuthenticationConfiguration"
+}
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_codeconfiguration.go b/goformation/cloudformation/apprunner/aws-apprunner-service_codeconfiguration.go
new file mode 100644
index 0000000000..2a535c8e59
--- /dev/null
+++ b/goformation/cloudformation/apprunner/aws-apprunner-service_codeconfiguration.go
@@ -0,0 +1,42 @@
+package apprunner
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_CodeConfiguration AWS CloudFormation Resource (AWS::AppRunner::Service.CodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-codeconfiguration.html
+type Service_CodeConfiguration struct {
+
+	// CodeConfigurationValues AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-codeconfiguration.html#cfn-apprunner-service-codeconfiguration-codeconfigurationvalues
+	CodeConfigurationValues *Service_CodeConfigurationValues `json:"CodeConfigurationValues,omitempty"`
+
+	// ConfigurationSource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-codeconfiguration.html#cfn-apprunner-service-codeconfiguration-configurationsource
+	ConfigurationSource *types.Value `json:"ConfigurationSource,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service_CodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::AppRunner::Service.CodeConfiguration"
+}
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_codeconfigurationvalues.go b/goformation/cloudformation/apprunner/aws-apprunner-service_codeconfigurationvalues.go
new file mode 100644
index 0000000000..8bc9fa2239
--- /dev/null
+++ b/goformation/cloudformation/apprunner/aws-apprunner-service_codeconfigurationvalues.go
@@ -0,0 +1,57 @@
+package apprunner
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_CodeConfigurationValues AWS CloudFormation Resource (AWS::AppRunner::Service.CodeConfigurationValues)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-codeconfigurationvalues.html
+type Service_CodeConfigurationValues struct {
+
+	// BuildCommand AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-codeconfigurationvalues.html#cfn-apprunner-service-codeconfigurationvalues-buildcommand
+	BuildCommand *types.Value `json:"BuildCommand,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-codeconfigurationvalues.html#cfn-apprunner-service-codeconfigurationvalues-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// Runtime AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-codeconfigurationvalues.html#cfn-apprunner-service-codeconfigurationvalues-runtime
+	Runtime *types.Value `json:"Runtime,omitempty"`
+
+	// RuntimeEnvironmentVariables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-codeconfigurationvalues.html#cfn-apprunner-service-codeconfigurationvalues-runtimeenvironmentvariables
+	RuntimeEnvironmentVariables []Service_KeyValuePair `json:"RuntimeEnvironmentVariables,omitempty"`
+
+	// StartCommand AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-codeconfigurationvalues.html#cfn-apprunner-service-codeconfigurationvalues-startcommand
+	StartCommand *types.Value `json:"StartCommand,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service_CodeConfigurationValues) AWSCloudFormationType() string {
+	return "AWS::AppRunner::Service.CodeConfigurationValues"
+}
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_coderepository.go b/goformation/cloudformation/apprunner/aws-apprunner-service_coderepository.go
new file mode 100644
index 0000000000..4ac70b529b
--- /dev/null
+++ b/goformation/cloudformation/apprunner/aws-apprunner-service_coderepository.go
@@ -0,0 +1,47 @@
+package apprunner
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_CodeRepository AWS CloudFormation Resource (AWS::AppRunner::Service.CodeRepository)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-coderepository.html
+type Service_CodeRepository struct {
+
+	// CodeConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-coderepository.html#cfn-apprunner-service-coderepository-codeconfiguration
+	CodeConfiguration *Service_CodeConfiguration `json:"CodeConfiguration,omitempty"`
+
+	// RepositoryUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-coderepository.html#cfn-apprunner-service-coderepository-repositoryurl
+	RepositoryUrl *types.Value `json:"RepositoryUrl,omitempty"`
+
+	// SourceCodeVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-coderepository.html#cfn-apprunner-service-coderepository-sourcecodeversion
+	SourceCodeVersion *Service_SourceCodeVersion `json:"SourceCodeVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service_CodeRepository) AWSCloudFormationType() string {
+	return "AWS::AppRunner::Service.CodeRepository"
+}
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_encryptionconfiguration.go b/goformation/cloudformation/apprunner/aws-apprunner-service_encryptionconfiguration.go
new file mode 100644
index 0000000000..5ec34472b3
--- /dev/null
+++ b/goformation/cloudformation/apprunner/aws-apprunner-service_encryptionconfiguration.go
@@ -0,0 +1,37 @@
+package apprunner
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_EncryptionConfiguration AWS CloudFormation Resource (AWS::AppRunner::Service.EncryptionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-encryptionconfiguration.html
+type Service_EncryptionConfiguration struct {
+
+	// KmsKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-encryptionconfiguration.html#cfn-apprunner-service-encryptionconfiguration-kmskey
+	KmsKey *types.Value `json:"KmsKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service_EncryptionConfiguration) AWSCloudFormationType() string {
+	return "AWS::AppRunner::Service.EncryptionConfiguration"
+}
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_healthcheckconfiguration.go b/goformation/cloudformation/apprunner/aws-apprunner-service_healthcheckconfiguration.go
new file mode 100644
index 0000000000..1e3607d5ff
--- /dev/null
+++ b/goformation/cloudformation/apprunner/aws-apprunner-service_healthcheckconfiguration.go
@@ -0,0 +1,62 @@
+package apprunner
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_HealthCheckConfiguration AWS CloudFormation Resource (AWS::AppRunner::Service.HealthCheckConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-healthcheckconfiguration.html
+type Service_HealthCheckConfiguration struct {
+
+	// HealthyThreshold AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-healthcheckconfiguration.html#cfn-apprunner-service-healthcheckconfiguration-healthythreshold
+	HealthyThreshold *types.Value `json:"HealthyThreshold,omitempty"`
+
+	// Interval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-healthcheckconfiguration.html#cfn-apprunner-service-healthcheckconfiguration-interval
+	Interval *types.Value `json:"Interval,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-healthcheckconfiguration.html#cfn-apprunner-service-healthcheckconfiguration-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-healthcheckconfiguration.html#cfn-apprunner-service-healthcheckconfiguration-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// Timeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-healthcheckconfiguration.html#cfn-apprunner-service-healthcheckconfiguration-timeout
+	Timeout *types.Value `json:"Timeout,omitempty"`
+
+	// UnhealthyThreshold AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-healthcheckconfiguration.html#cfn-apprunner-service-healthcheckconfiguration-unhealthythreshold
+	UnhealthyThreshold *types.Value `json:"UnhealthyThreshold,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service_HealthCheckConfiguration) AWSCloudFormationType() string {
+	return "AWS::AppRunner::Service.HealthCheckConfiguration"
+}
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_imageconfiguration.go b/goformation/cloudformation/apprunner/aws-apprunner-service_imageconfiguration.go
new file mode 100644
index 0000000000..0d2e42041a
--- /dev/null
+++ b/goformation/cloudformation/apprunner/aws-apprunner-service_imageconfiguration.go
@@ -0,0 +1,47 @@
+package apprunner
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_ImageConfiguration AWS CloudFormation Resource (AWS::AppRunner::Service.ImageConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-imageconfiguration.html
+type Service_ImageConfiguration struct {
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-imageconfiguration.html#cfn-apprunner-service-imageconfiguration-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// RuntimeEnvironmentVariables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-imageconfiguration.html#cfn-apprunner-service-imageconfiguration-runtimeenvironmentvariables
+	RuntimeEnvironmentVariables []Service_KeyValuePair `json:"RuntimeEnvironmentVariables,omitempty"`
+
+	// StartCommand AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-imageconfiguration.html#cfn-apprunner-service-imageconfiguration-startcommand
+	StartCommand *types.Value `json:"StartCommand,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service_ImageConfiguration) AWSCloudFormationType() string {
+	return "AWS::AppRunner::Service.ImageConfiguration"
+}
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_imagerepository.go b/goformation/cloudformation/apprunner/aws-apprunner-service_imagerepository.go
new file mode 100644
index 0000000000..9870a4de04
--- /dev/null
+++ b/goformation/cloudformation/apprunner/aws-apprunner-service_imagerepository.go
@@ -0,0 +1,47 @@
+package apprunner
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_ImageRepository AWS CloudFormation Resource (AWS::AppRunner::Service.ImageRepository)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-imagerepository.html
+type Service_ImageRepository struct {
+
+	// ImageConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-imagerepository.html#cfn-apprunner-service-imagerepository-imageconfiguration
+	ImageConfiguration *Service_ImageConfiguration `json:"ImageConfiguration,omitempty"`
+
+	// ImageIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-imagerepository.html#cfn-apprunner-service-imagerepository-imageidentifier
+	ImageIdentifier *types.Value `json:"ImageIdentifier,omitempty"`
+
+	// ImageRepositoryType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-imagerepository.html#cfn-apprunner-service-imagerepository-imagerepositorytype
+	ImageRepositoryType *types.Value `json:"ImageRepositoryType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service_ImageRepository) AWSCloudFormationType() string {
+	return "AWS::AppRunner::Service.ImageRepository"
+}
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_instanceconfiguration.go b/goformation/cloudformation/apprunner/aws-apprunner-service_instanceconfiguration.go
new file mode 100644
index 0000000000..d0c1557785
--- /dev/null
+++ b/goformation/cloudformation/apprunner/aws-apprunner-service_instanceconfiguration.go
@@ -0,0 +1,47 @@
+package apprunner
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_InstanceConfiguration AWS CloudFormation Resource (AWS::AppRunner::Service.InstanceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-instanceconfiguration.html
+type Service_InstanceConfiguration struct {
+
+	// Cpu AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-instanceconfiguration.html#cfn-apprunner-service-instanceconfiguration-cpu
+	Cpu *types.Value `json:"Cpu,omitempty"`
+
+	// InstanceRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-instanceconfiguration.html#cfn-apprunner-service-instanceconfiguration-instancerolearn
+	InstanceRoleArn *types.Value `json:"InstanceRoleArn,omitempty"`
+
+	// Memory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-instanceconfiguration.html#cfn-apprunner-service-instanceconfiguration-memory
+	Memory *types.Value `json:"Memory,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service_InstanceConfiguration) AWSCloudFormationType() string {
+	return "AWS::AppRunner::Service.InstanceConfiguration"
+}
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_keyvaluepair.go b/goformation/cloudformation/apprunner/aws-apprunner-service_keyvaluepair.go
new file mode 100644
index 0000000000..37d016fdb9
--- /dev/null
+++ b/goformation/cloudformation/apprunner/aws-apprunner-service_keyvaluepair.go
@@ -0,0 +1,42 @@
+package apprunner
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_KeyValuePair AWS CloudFormation Resource (AWS::AppRunner::Service.KeyValuePair)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-keyvaluepair.html
+type Service_KeyValuePair struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-keyvaluepair.html#cfn-apprunner-service-keyvaluepair-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-keyvaluepair.html#cfn-apprunner-service-keyvaluepair-value
+	Value *types.Value `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 *Service_KeyValuePair) AWSCloudFormationType() string {
+	return "AWS::AppRunner::Service.KeyValuePair"
+}
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_sourcecodeversion.go b/goformation/cloudformation/apprunner/aws-apprunner-service_sourcecodeversion.go
new file mode 100644
index 0000000000..57480eb192
--- /dev/null
+++ b/goformation/cloudformation/apprunner/aws-apprunner-service_sourcecodeversion.go
@@ -0,0 +1,42 @@
+package apprunner
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_SourceCodeVersion AWS CloudFormation Resource (AWS::AppRunner::Service.SourceCodeVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-sourcecodeversion.html
+type Service_SourceCodeVersion struct {
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-sourcecodeversion.html#cfn-apprunner-service-sourcecodeversion-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-sourcecodeversion.html#cfn-apprunner-service-sourcecodeversion-value
+	Value *types.Value `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 *Service_SourceCodeVersion) AWSCloudFormationType() string {
+	return "AWS::AppRunner::Service.SourceCodeVersion"
+}
diff --git a/goformation/cloudformation/apprunner/aws-apprunner-service_sourceconfiguration.go b/goformation/cloudformation/apprunner/aws-apprunner-service_sourceconfiguration.go
new file mode 100644
index 0000000000..a1e67591b0
--- /dev/null
+++ b/goformation/cloudformation/apprunner/aws-apprunner-service_sourceconfiguration.go
@@ -0,0 +1,52 @@
+package apprunner
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_SourceConfiguration AWS CloudFormation Resource (AWS::AppRunner::Service.SourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-sourceconfiguration.html
+type Service_SourceConfiguration struct {
+
+	// AuthenticationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-sourceconfiguration.html#cfn-apprunner-service-sourceconfiguration-authenticationconfiguration
+	AuthenticationConfiguration *Service_AuthenticationConfiguration `json:"AuthenticationConfiguration,omitempty"`
+
+	// AutoDeploymentsEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-sourceconfiguration.html#cfn-apprunner-service-sourceconfiguration-autodeploymentsenabled
+	AutoDeploymentsEnabled *types.Value `json:"AutoDeploymentsEnabled,omitempty"`
+
+	// CodeRepository AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-sourceconfiguration.html#cfn-apprunner-service-sourceconfiguration-coderepository
+	CodeRepository *Service_CodeRepository `json:"CodeRepository,omitempty"`
+
+	// ImageRepository AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apprunner-service-sourceconfiguration.html#cfn-apprunner-service-sourceconfiguration-imagerepository
+	ImageRepository *Service_ImageRepository `json:"ImageRepository,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service_SourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::AppRunner::Service.SourceConfiguration"
+}
diff --git a/goformation/cloudformation/appstream/aws-appstream-appblock.go b/goformation/cloudformation/appstream/aws-appstream-appblock.go
new file mode 100644
index 0000000000..d93ce45571
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-appblock.go
@@ -0,0 +1,134 @@
+package appstream
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// AppBlock AWS CloudFormation Resource (AWS::AppStream::AppBlock)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblock.html
+type AppBlock struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblock.html#cfn-appstream-appblock-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DisplayName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblock.html#cfn-appstream-appblock-displayname
+	DisplayName *types.Value `json:"DisplayName,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblock.html#cfn-appstream-appblock-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SetupScriptDetails AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblock.html#cfn-appstream-appblock-setupscriptdetails
+	SetupScriptDetails *AppBlock_ScriptDetails `json:"SetupScriptDetails,omitempty"`
+
+	// SourceS3Location AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblock.html#cfn-appstream-appblock-sources3location
+	SourceS3Location *AppBlock_S3Location `json:"SourceS3Location,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-appblock.html#cfn-appstream-appblock-tags
+	Tags []cloudformation.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 *AppBlock) AWSCloudFormationType() string {
+	return "AWS::AppStream::AppBlock"
+}
+
+// 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 AppBlock) MarshalJSON() ([]byte, error) {
+	type Properties AppBlock
+	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 *AppBlock) UnmarshalJSON(b []byte) error {
+	type Properties AppBlock
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AppBlock(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appstream/aws-appstream-appblock_s3location.go b/goformation/cloudformation/appstream/aws-appstream-appblock_s3location.go
new file mode 100644
index 0000000000..d954526bf3
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-appblock_s3location.go
@@ -0,0 +1,42 @@
+package appstream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AppBlock_S3Location AWS CloudFormation Resource (AWS::AppStream::AppBlock.S3Location)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-appblock-s3location.html
+type AppBlock_S3Location struct {
+
+	// S3Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-appblock-s3location.html#cfn-appstream-appblock-s3location-s3bucket
+	S3Bucket *types.Value `json:"S3Bucket,omitempty"`
+
+	// S3Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-appblock-s3location.html#cfn-appstream-appblock-s3location-s3key
+	S3Key *types.Value `json:"S3Key,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AppBlock_S3Location) AWSCloudFormationType() string {
+	return "AWS::AppStream::AppBlock.S3Location"
+}
diff --git a/goformation/cloudformation/appstream/aws-appstream-appblock_scriptdetails.go b/goformation/cloudformation/appstream/aws-appstream-appblock_scriptdetails.go
new file mode 100644
index 0000000000..aad90030c9
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-appblock_scriptdetails.go
@@ -0,0 +1,52 @@
+package appstream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AppBlock_ScriptDetails AWS CloudFormation Resource (AWS::AppStream::AppBlock.ScriptDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-appblock-scriptdetails.html
+type AppBlock_ScriptDetails struct {
+
+	// ExecutableParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-appblock-scriptdetails.html#cfn-appstream-appblock-scriptdetails-executableparameters
+	ExecutableParameters *types.Value `json:"ExecutableParameters,omitempty"`
+
+	// ExecutablePath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-appblock-scriptdetails.html#cfn-appstream-appblock-scriptdetails-executablepath
+	ExecutablePath *types.Value `json:"ExecutablePath,omitempty"`
+
+	// ScriptS3Location AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-appblock-scriptdetails.html#cfn-appstream-appblock-scriptdetails-scripts3location
+	ScriptS3Location *AppBlock_S3Location `json:"ScriptS3Location,omitempty"`
+
+	// TimeoutInSeconds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-appblock-scriptdetails.html#cfn-appstream-appblock-scriptdetails-timeoutinseconds
+	TimeoutInSeconds *types.Value `json:"TimeoutInSeconds"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AppBlock_ScriptDetails) AWSCloudFormationType() string {
+	return "AWS::AppStream::AppBlock.ScriptDetails"
+}
diff --git a/goformation/cloudformation/appstream/aws-appstream-application.go b/goformation/cloudformation/appstream/aws-appstream-application.go
new file mode 100644
index 0000000000..8a71c83adb
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-application.go
@@ -0,0 +1,164 @@
+package appstream
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application AWS CloudFormation Resource (AWS::AppStream::Application)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-application.html
+type Application struct {
+
+	// AppBlockArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-application.html#cfn-appstream-application-appblockarn
+	AppBlockArn *types.Value `json:"AppBlockArn,omitempty"`
+
+	// AttributesToDelete AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-application.html#cfn-appstream-application-attributestodelete
+	AttributesToDelete *types.Value `json:"AttributesToDelete,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-application.html#cfn-appstream-application-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DisplayName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-application.html#cfn-appstream-application-displayname
+	DisplayName *types.Value `json:"DisplayName,omitempty"`
+
+	// IconS3Location AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-application.html#cfn-appstream-application-icons3location
+	IconS3Location *Application_S3Location `json:"IconS3Location,omitempty"`
+
+	// InstanceFamilies AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-application.html#cfn-appstream-application-instancefamilies
+	InstanceFamilies *types.Value `json:"InstanceFamilies,omitempty"`
+
+	// LaunchParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-application.html#cfn-appstream-application-launchparameters
+	LaunchParameters *types.Value `json:"LaunchParameters,omitempty"`
+
+	// LaunchPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-application.html#cfn-appstream-application-launchpath
+	LaunchPath *types.Value `json:"LaunchPath,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-application.html#cfn-appstream-application-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Platforms AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-application.html#cfn-appstream-application-platforms
+	Platforms *types.Value `json:"Platforms,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-application.html#cfn-appstream-application-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// WorkingDirectory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-application.html#cfn-appstream-application-workingdirectory
+	WorkingDirectory *types.Value `json:"WorkingDirectory,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::AppStream::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appstream/aws-appstream-application_s3location.go b/goformation/cloudformation/appstream/aws-appstream-application_s3location.go
new file mode 100644
index 0000000000..fdd7f78442
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-application_s3location.go
@@ -0,0 +1,42 @@
+package appstream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_S3Location AWS CloudFormation Resource (AWS::AppStream::Application.S3Location)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-application-s3location.html
+type Application_S3Location struct {
+
+	// S3Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-application-s3location.html#cfn-appstream-application-s3location-s3bucket
+	S3Bucket *types.Value `json:"S3Bucket,omitempty"`
+
+	// S3Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-application-s3location.html#cfn-appstream-application-s3location-s3key
+	S3Key *types.Value `json:"S3Key,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_S3Location) AWSCloudFormationType() string {
+	return "AWS::AppStream::Application.S3Location"
+}
diff --git a/goformation/cloudformation/appstream/aws-appstream-applicationfleetassociation.go b/goformation/cloudformation/appstream/aws-appstream-applicationfleetassociation.go
new file mode 100644
index 0000000000..7c26bee120
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-applicationfleetassociation.go
@@ -0,0 +1,113 @@
+package appstream
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationFleetAssociation AWS CloudFormation Resource (AWS::AppStream::ApplicationFleetAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-applicationfleetassociation.html
+type ApplicationFleetAssociation struct {
+
+	// ApplicationArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-applicationfleetassociation.html#cfn-appstream-applicationfleetassociation-applicationarn
+	ApplicationArn *types.Value `json:"ApplicationArn,omitempty"`
+
+	// FleetName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-applicationfleetassociation.html#cfn-appstream-applicationfleetassociation-fleetname
+	FleetName *types.Value `json:"FleetName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationFleetAssociation) AWSCloudFormationType() string {
+	return "AWS::AppStream::ApplicationFleetAssociation"
+}
+
+// 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 ApplicationFleetAssociation) MarshalJSON() ([]byte, error) {
+	type Properties ApplicationFleetAssociation
+	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 *ApplicationFleetAssociation) UnmarshalJSON(b []byte) error {
+	type Properties ApplicationFleetAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ApplicationFleetAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appstream/aws-appstream-directoryconfig.go b/goformation/cloudformation/appstream/aws-appstream-directoryconfig.go
new file mode 100644
index 0000000000..15029557a6
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-directoryconfig.go
@@ -0,0 +1,118 @@
+package appstream
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DirectoryConfig AWS CloudFormation Resource (AWS::AppStream::DirectoryConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-directoryconfig.html
+type DirectoryConfig struct {
+
+	// DirectoryName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-directoryconfig.html#cfn-appstream-directoryconfig-directoryname
+	DirectoryName *types.Value `json:"DirectoryName,omitempty"`
+
+	// OrganizationalUnitDistinguishedNames AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-directoryconfig.html#cfn-appstream-directoryconfig-organizationalunitdistinguishednames
+	OrganizationalUnitDistinguishedNames *types.Value `json:"OrganizationalUnitDistinguishedNames,omitempty"`
+
+	// ServiceAccountCredentials AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-directoryconfig.html#cfn-appstream-directoryconfig-serviceaccountcredentials
+	ServiceAccountCredentials *DirectoryConfig_ServiceAccountCredentials `json:"ServiceAccountCredentials,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DirectoryConfig) AWSCloudFormationType() string {
+	return "AWS::AppStream::DirectoryConfig"
+}
+
+// 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 DirectoryConfig) MarshalJSON() ([]byte, error) {
+	type Properties DirectoryConfig
+	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 *DirectoryConfig) UnmarshalJSON(b []byte) error {
+	type Properties DirectoryConfig
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DirectoryConfig(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appstream/aws-appstream-directoryconfig_serviceaccountcredentials.go b/goformation/cloudformation/appstream/aws-appstream-directoryconfig_serviceaccountcredentials.go
new file mode 100644
index 0000000000..870171a693
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-directoryconfig_serviceaccountcredentials.go
@@ -0,0 +1,42 @@
+package appstream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DirectoryConfig_ServiceAccountCredentials AWS CloudFormation Resource (AWS::AppStream::DirectoryConfig.ServiceAccountCredentials)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-directoryconfig-serviceaccountcredentials.html
+type DirectoryConfig_ServiceAccountCredentials struct {
+
+	// AccountName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-directoryconfig-serviceaccountcredentials.html#cfn-appstream-directoryconfig-serviceaccountcredentials-accountname
+	AccountName *types.Value `json:"AccountName,omitempty"`
+
+	// AccountPassword AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-directoryconfig-serviceaccountcredentials.html#cfn-appstream-directoryconfig-serviceaccountcredentials-accountpassword
+	AccountPassword *types.Value `json:"AccountPassword,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DirectoryConfig_ServiceAccountCredentials) AWSCloudFormationType() string {
+	return "AWS::AppStream::DirectoryConfig.ServiceAccountCredentials"
+}
diff --git a/goformation/cloudformation/appstream/aws-appstream-fleet.go b/goformation/cloudformation/appstream/aws-appstream-fleet.go
new file mode 100644
index 0000000000..9b868f3725
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-fleet.go
@@ -0,0 +1,204 @@
+package appstream
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Fleet AWS CloudFormation Resource (AWS::AppStream::Fleet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html
+type Fleet struct {
+
+	// ComputeCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-computecapacity
+	ComputeCapacity *Fleet_ComputeCapacity `json:"ComputeCapacity,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DisconnectTimeoutInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-disconnecttimeoutinseconds
+	DisconnectTimeoutInSeconds *types.Value `json:"DisconnectTimeoutInSeconds,omitempty"`
+
+	// DisplayName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-displayname
+	DisplayName *types.Value `json:"DisplayName,omitempty"`
+
+	// DomainJoinInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-domainjoininfo
+	DomainJoinInfo *Fleet_DomainJoinInfo `json:"DomainJoinInfo,omitempty"`
+
+	// EnableDefaultInternetAccess AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-enabledefaultinternetaccess
+	EnableDefaultInternetAccess *types.Value `json:"EnableDefaultInternetAccess,omitempty"`
+
+	// FleetType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-fleettype
+	FleetType *types.Value `json:"FleetType,omitempty"`
+
+	// IamRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-iamrolearn
+	IamRoleArn *types.Value `json:"IamRoleArn,omitempty"`
+
+	// IdleDisconnectTimeoutInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-idledisconnecttimeoutinseconds
+	IdleDisconnectTimeoutInSeconds *types.Value `json:"IdleDisconnectTimeoutInSeconds,omitempty"`
+
+	// ImageArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-imagearn
+	ImageArn *types.Value `json:"ImageArn,omitempty"`
+
+	// ImageName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-imagename
+	ImageName *types.Value `json:"ImageName,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// MaxConcurrentSessions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-maxconcurrentsessions
+	MaxConcurrentSessions *types.Value `json:"MaxConcurrentSessions,omitempty"`
+
+	// MaxUserDurationInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-maxuserdurationinseconds
+	MaxUserDurationInSeconds *types.Value `json:"MaxUserDurationInSeconds,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Platform AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-platform
+	Platform *types.Value `json:"Platform,omitempty"`
+
+	// StreamView AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-streamview
+	StreamView *types.Value `json:"StreamView,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// UsbDeviceFilterStrings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-usbdevicefilterstrings
+	UsbDeviceFilterStrings *types.Value `json:"UsbDeviceFilterStrings,omitempty"`
+
+	// VpcConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-fleet.html#cfn-appstream-fleet-vpcconfig
+	VpcConfig *Fleet_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 *Fleet) AWSCloudFormationType() string {
+	return "AWS::AppStream::Fleet"
+}
+
+// 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 Fleet) MarshalJSON() ([]byte, error) {
+	type Properties Fleet
+	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 *Fleet) UnmarshalJSON(b []byte) error {
+	type Properties Fleet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Fleet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appstream/aws-appstream-fleet_computecapacity.go b/goformation/cloudformation/appstream/aws-appstream-fleet_computecapacity.go
new file mode 100644
index 0000000000..0b3570091f
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-fleet_computecapacity.go
@@ -0,0 +1,37 @@
+package appstream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Fleet_ComputeCapacity AWS CloudFormation Resource (AWS::AppStream::Fleet.ComputeCapacity)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-fleet-computecapacity.html
+type Fleet_ComputeCapacity struct {
+
+	// DesiredInstances AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-fleet-computecapacity.html#cfn-appstream-fleet-computecapacity-desiredinstances
+	DesiredInstances *types.Value `json:"DesiredInstances"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ComputeCapacity) AWSCloudFormationType() string {
+	return "AWS::AppStream::Fleet.ComputeCapacity"
+}
diff --git a/goformation/cloudformation/appstream/aws-appstream-fleet_domainjoininfo.go b/goformation/cloudformation/appstream/aws-appstream-fleet_domainjoininfo.go
new file mode 100644
index 0000000000..83ac1d57ed
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-fleet_domainjoininfo.go
@@ -0,0 +1,42 @@
+package appstream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Fleet_DomainJoinInfo AWS CloudFormation Resource (AWS::AppStream::Fleet.DomainJoinInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-fleet-domainjoininfo.html
+type Fleet_DomainJoinInfo struct {
+
+	// DirectoryName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-fleet-domainjoininfo.html#cfn-appstream-fleet-domainjoininfo-directoryname
+	DirectoryName *types.Value `json:"DirectoryName,omitempty"`
+
+	// OrganizationalUnitDistinguishedName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-fleet-domainjoininfo.html#cfn-appstream-fleet-domainjoininfo-organizationalunitdistinguishedname
+	OrganizationalUnitDistinguishedName *types.Value `json:"OrganizationalUnitDistinguishedName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DomainJoinInfo) AWSCloudFormationType() string {
+	return "AWS::AppStream::Fleet.DomainJoinInfo"
+}
diff --git a/goformation/cloudformation/appstream/aws-appstream-fleet_vpcconfig.go b/goformation/cloudformation/appstream/aws-appstream-fleet_vpcconfig.go
new file mode 100644
index 0000000000..bbaf1004c8
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-fleet_vpcconfig.go
@@ -0,0 +1,42 @@
+package appstream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Fleet_VpcConfig AWS CloudFormation Resource (AWS::AppStream::Fleet.VpcConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-fleet-vpcconfig.html
+type Fleet_VpcConfig struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-fleet-vpcconfig.html#cfn-appstream-fleet-vpcconfig-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-fleet-vpcconfig.html#cfn-appstream-fleet-vpcconfig-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Fleet_VpcConfig) AWSCloudFormationType() string {
+	return "AWS::AppStream::Fleet.VpcConfig"
+}
diff --git a/goformation/cloudformation/appstream/aws-appstream-imagebuilder.go b/goformation/cloudformation/appstream/aws-appstream-imagebuilder.go
new file mode 100644
index 0000000000..3e19162bc4
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-imagebuilder.go
@@ -0,0 +1,169 @@
+package appstream
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ImageBuilder AWS CloudFormation Resource (AWS::AppStream::ImageBuilder)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-imagebuilder.html
+type ImageBuilder struct {
+
+	// AccessEndpoints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-imagebuilder.html#cfn-appstream-imagebuilder-accessendpoints
+	AccessEndpoints []ImageBuilder_AccessEndpoint `json:"AccessEndpoints,omitempty"`
+
+	// AppstreamAgentVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-imagebuilder.html#cfn-appstream-imagebuilder-appstreamagentversion
+	AppstreamAgentVersion *types.Value `json:"AppstreamAgentVersion,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-imagebuilder.html#cfn-appstream-imagebuilder-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DisplayName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-imagebuilder.html#cfn-appstream-imagebuilder-displayname
+	DisplayName *types.Value `json:"DisplayName,omitempty"`
+
+	// DomainJoinInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-imagebuilder.html#cfn-appstream-imagebuilder-domainjoininfo
+	DomainJoinInfo *ImageBuilder_DomainJoinInfo `json:"DomainJoinInfo,omitempty"`
+
+	// EnableDefaultInternetAccess AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-imagebuilder.html#cfn-appstream-imagebuilder-enabledefaultinternetaccess
+	EnableDefaultInternetAccess *types.Value `json:"EnableDefaultInternetAccess,omitempty"`
+
+	// IamRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-imagebuilder.html#cfn-appstream-imagebuilder-iamrolearn
+	IamRoleArn *types.Value `json:"IamRoleArn,omitempty"`
+
+	// ImageArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-imagebuilder.html#cfn-appstream-imagebuilder-imagearn
+	ImageArn *types.Value `json:"ImageArn,omitempty"`
+
+	// ImageName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-imagebuilder.html#cfn-appstream-imagebuilder-imagename
+	ImageName *types.Value `json:"ImageName,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-imagebuilder.html#cfn-appstream-imagebuilder-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-imagebuilder.html#cfn-appstream-imagebuilder-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-imagebuilder.html#cfn-appstream-imagebuilder-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VpcConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-imagebuilder.html#cfn-appstream-imagebuilder-vpcconfig
+	VpcConfig *ImageBuilder_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 *ImageBuilder) AWSCloudFormationType() string {
+	return "AWS::AppStream::ImageBuilder"
+}
+
+// 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 ImageBuilder) MarshalJSON() ([]byte, error) {
+	type Properties ImageBuilder
+	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 *ImageBuilder) UnmarshalJSON(b []byte) error {
+	type Properties ImageBuilder
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ImageBuilder(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appstream/aws-appstream-imagebuilder_accessendpoint.go b/goformation/cloudformation/appstream/aws-appstream-imagebuilder_accessendpoint.go
new file mode 100644
index 0000000000..97ba37a741
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-imagebuilder_accessendpoint.go
@@ -0,0 +1,42 @@
+package appstream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ImageBuilder_AccessEndpoint AWS CloudFormation Resource (AWS::AppStream::ImageBuilder.AccessEndpoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-imagebuilder-accessendpoint.html
+type ImageBuilder_AccessEndpoint struct {
+
+	// EndpointType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-imagebuilder-accessendpoint.html#cfn-appstream-imagebuilder-accessendpoint-endpointtype
+	EndpointType *types.Value `json:"EndpointType,omitempty"`
+
+	// VpceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-imagebuilder-accessendpoint.html#cfn-appstream-imagebuilder-accessendpoint-vpceid
+	VpceId *types.Value `json:"VpceId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ImageBuilder_AccessEndpoint) AWSCloudFormationType() string {
+	return "AWS::AppStream::ImageBuilder.AccessEndpoint"
+}
diff --git a/goformation/cloudformation/appstream/aws-appstream-imagebuilder_domainjoininfo.go b/goformation/cloudformation/appstream/aws-appstream-imagebuilder_domainjoininfo.go
new file mode 100644
index 0000000000..95b78c3cec
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-imagebuilder_domainjoininfo.go
@@ -0,0 +1,42 @@
+package appstream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ImageBuilder_DomainJoinInfo AWS CloudFormation Resource (AWS::AppStream::ImageBuilder.DomainJoinInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-imagebuilder-domainjoininfo.html
+type ImageBuilder_DomainJoinInfo struct {
+
+	// DirectoryName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-imagebuilder-domainjoininfo.html#cfn-appstream-imagebuilder-domainjoininfo-directoryname
+	DirectoryName *types.Value `json:"DirectoryName,omitempty"`
+
+	// OrganizationalUnitDistinguishedName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-imagebuilder-domainjoininfo.html#cfn-appstream-imagebuilder-domainjoininfo-organizationalunitdistinguishedname
+	OrganizationalUnitDistinguishedName *types.Value `json:"OrganizationalUnitDistinguishedName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ImageBuilder_DomainJoinInfo) AWSCloudFormationType() string {
+	return "AWS::AppStream::ImageBuilder.DomainJoinInfo"
+}
diff --git a/goformation/cloudformation/appstream/aws-appstream-imagebuilder_vpcconfig.go b/goformation/cloudformation/appstream/aws-appstream-imagebuilder_vpcconfig.go
new file mode 100644
index 0000000000..3b58ae63f8
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-imagebuilder_vpcconfig.go
@@ -0,0 +1,42 @@
+package appstream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ImageBuilder_VpcConfig AWS CloudFormation Resource (AWS::AppStream::ImageBuilder.VpcConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-imagebuilder-vpcconfig.html
+type ImageBuilder_VpcConfig struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-imagebuilder-vpcconfig.html#cfn-appstream-imagebuilder-vpcconfig-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-imagebuilder-vpcconfig.html#cfn-appstream-imagebuilder-vpcconfig-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ImageBuilder_VpcConfig) AWSCloudFormationType() string {
+	return "AWS::AppStream::ImageBuilder.VpcConfig"
+}
diff --git a/goformation/cloudformation/appstream/aws-appstream-stack.go b/goformation/cloudformation/appstream/aws-appstream-stack.go
new file mode 100644
index 0000000000..26930699fc
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-stack.go
@@ -0,0 +1,169 @@
+package appstream
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stack AWS CloudFormation Resource (AWS::AppStream::Stack)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stack.html
+type Stack struct {
+
+	// AccessEndpoints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stack.html#cfn-appstream-stack-accessendpoints
+	AccessEndpoints []Stack_AccessEndpoint `json:"AccessEndpoints,omitempty"`
+
+	// ApplicationSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stack.html#cfn-appstream-stack-applicationsettings
+	ApplicationSettings *Stack_ApplicationSettings `json:"ApplicationSettings,omitempty"`
+
+	// AttributesToDelete AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stack.html#cfn-appstream-stack-attributestodelete
+	AttributesToDelete *types.Value `json:"AttributesToDelete,omitempty"`
+
+	// DeleteStorageConnectors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stack.html#cfn-appstream-stack-deletestorageconnectors
+	DeleteStorageConnectors *types.Value `json:"DeleteStorageConnectors,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stack.html#cfn-appstream-stack-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DisplayName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stack.html#cfn-appstream-stack-displayname
+	DisplayName *types.Value `json:"DisplayName,omitempty"`
+
+	// EmbedHostDomains AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stack.html#cfn-appstream-stack-embedhostdomains
+	EmbedHostDomains *types.Value `json:"EmbedHostDomains,omitempty"`
+
+	// FeedbackURL AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stack.html#cfn-appstream-stack-feedbackurl
+	FeedbackURL *types.Value `json:"FeedbackURL,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stack.html#cfn-appstream-stack-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RedirectURL AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stack.html#cfn-appstream-stack-redirecturl
+	RedirectURL *types.Value `json:"RedirectURL,omitempty"`
+
+	// StorageConnectors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stack.html#cfn-appstream-stack-storageconnectors
+	StorageConnectors []Stack_StorageConnector `json:"StorageConnectors,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stack.html#cfn-appstream-stack-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// UserSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stack.html#cfn-appstream-stack-usersettings
+	UserSettings []Stack_UserSetting `json:"UserSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Stack) AWSCloudFormationType() string {
+	return "AWS::AppStream::Stack"
+}
+
+// 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 Stack) MarshalJSON() ([]byte, error) {
+	type Properties Stack
+	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 *Stack) UnmarshalJSON(b []byte) error {
+	type Properties Stack
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Stack(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appstream/aws-appstream-stack_accessendpoint.go b/goformation/cloudformation/appstream/aws-appstream-stack_accessendpoint.go
new file mode 100644
index 0000000000..e300ffce21
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-stack_accessendpoint.go
@@ -0,0 +1,42 @@
+package appstream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stack_AccessEndpoint AWS CloudFormation Resource (AWS::AppStream::Stack.AccessEndpoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-stack-accessendpoint.html
+type Stack_AccessEndpoint struct {
+
+	// EndpointType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-stack-accessendpoint.html#cfn-appstream-stack-accessendpoint-endpointtype
+	EndpointType *types.Value `json:"EndpointType,omitempty"`
+
+	// VpceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-stack-accessendpoint.html#cfn-appstream-stack-accessendpoint-vpceid
+	VpceId *types.Value `json:"VpceId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Stack_AccessEndpoint) AWSCloudFormationType() string {
+	return "AWS::AppStream::Stack.AccessEndpoint"
+}
diff --git a/goformation/cloudformation/appstream/aws-appstream-stack_applicationsettings.go b/goformation/cloudformation/appstream/aws-appstream-stack_applicationsettings.go
new file mode 100644
index 0000000000..2c3e881d9c
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-stack_applicationsettings.go
@@ -0,0 +1,42 @@
+package appstream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stack_ApplicationSettings AWS CloudFormation Resource (AWS::AppStream::Stack.ApplicationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-stack-applicationsettings.html
+type Stack_ApplicationSettings struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-stack-applicationsettings.html#cfn-appstream-stack-applicationsettings-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// SettingsGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-stack-applicationsettings.html#cfn-appstream-stack-applicationsettings-settingsgroup
+	SettingsGroup *types.Value `json:"SettingsGroup,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Stack_ApplicationSettings) AWSCloudFormationType() string {
+	return "AWS::AppStream::Stack.ApplicationSettings"
+}
diff --git a/goformation/cloudformation/appstream/aws-appstream-stack_storageconnector.go b/goformation/cloudformation/appstream/aws-appstream-stack_storageconnector.go
new file mode 100644
index 0000000000..b6ac5220e8
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-stack_storageconnector.go
@@ -0,0 +1,47 @@
+package appstream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stack_StorageConnector AWS CloudFormation Resource (AWS::AppStream::Stack.StorageConnector)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-stack-storageconnector.html
+type Stack_StorageConnector struct {
+
+	// ConnectorType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-stack-storageconnector.html#cfn-appstream-stack-storageconnector-connectortype
+	ConnectorType *types.Value `json:"ConnectorType,omitempty"`
+
+	// Domains AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-stack-storageconnector.html#cfn-appstream-stack-storageconnector-domains
+	Domains *types.Value `json:"Domains,omitempty"`
+
+	// ResourceIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-stack-storageconnector.html#cfn-appstream-stack-storageconnector-resourceidentifier
+	ResourceIdentifier *types.Value `json:"ResourceIdentifier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Stack_StorageConnector) AWSCloudFormationType() string {
+	return "AWS::AppStream::Stack.StorageConnector"
+}
diff --git a/goformation/cloudformation/appstream/aws-appstream-stack_usersetting.go b/goformation/cloudformation/appstream/aws-appstream-stack_usersetting.go
new file mode 100644
index 0000000000..2f3e2185d9
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-stack_usersetting.go
@@ -0,0 +1,42 @@
+package appstream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stack_UserSetting AWS CloudFormation Resource (AWS::AppStream::Stack.UserSetting)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-stack-usersetting.html
+type Stack_UserSetting struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-stack-usersetting.html#cfn-appstream-stack-usersetting-action
+	Action *types.Value `json:"Action,omitempty"`
+
+	// Permission AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appstream-stack-usersetting.html#cfn-appstream-stack-usersetting-permission
+	Permission *types.Value `json:"Permission,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Stack_UserSetting) AWSCloudFormationType() string {
+	return "AWS::AppStream::Stack.UserSetting"
+}
diff --git a/goformation/cloudformation/appstream/aws-appstream-stackfleetassociation.go b/goformation/cloudformation/appstream/aws-appstream-stackfleetassociation.go
new file mode 100644
index 0000000000..7218293234
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-stackfleetassociation.go
@@ -0,0 +1,113 @@
+package appstream
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StackFleetAssociation AWS CloudFormation Resource (AWS::AppStream::StackFleetAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stackfleetassociation.html
+type StackFleetAssociation struct {
+
+	// FleetName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stackfleetassociation.html#cfn-appstream-stackfleetassociation-fleetname
+	FleetName *types.Value `json:"FleetName,omitempty"`
+
+	// StackName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stackfleetassociation.html#cfn-appstream-stackfleetassociation-stackname
+	StackName *types.Value `json:"StackName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StackFleetAssociation) AWSCloudFormationType() string {
+	return "AWS::AppStream::StackFleetAssociation"
+}
+
+// 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 StackFleetAssociation) MarshalJSON() ([]byte, error) {
+	type Properties StackFleetAssociation
+	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 *StackFleetAssociation) UnmarshalJSON(b []byte) error {
+	type Properties StackFleetAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = StackFleetAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appstream/aws-appstream-stackuserassociation.go b/goformation/cloudformation/appstream/aws-appstream-stackuserassociation.go
new file mode 100644
index 0000000000..3b1959f7ca
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-stackuserassociation.go
@@ -0,0 +1,123 @@
+package appstream
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StackUserAssociation AWS CloudFormation Resource (AWS::AppStream::StackUserAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stackuserassociation.html
+type StackUserAssociation struct {
+
+	// AuthenticationType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stackuserassociation.html#cfn-appstream-stackuserassociation-authenticationtype
+	AuthenticationType *types.Value `json:"AuthenticationType,omitempty"`
+
+	// SendEmailNotification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stackuserassociation.html#cfn-appstream-stackuserassociation-sendemailnotification
+	SendEmailNotification *types.Value `json:"SendEmailNotification,omitempty"`
+
+	// StackName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stackuserassociation.html#cfn-appstream-stackuserassociation-stackname
+	StackName *types.Value `json:"StackName,omitempty"`
+
+	// UserName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-stackuserassociation.html#cfn-appstream-stackuserassociation-username
+	UserName *types.Value `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 *StackUserAssociation) AWSCloudFormationType() string {
+	return "AWS::AppStream::StackUserAssociation"
+}
+
+// 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 StackUserAssociation) MarshalJSON() ([]byte, error) {
+	type Properties StackUserAssociation
+	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 *StackUserAssociation) UnmarshalJSON(b []byte) error {
+	type Properties StackUserAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = StackUserAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appstream/aws-appstream-user.go b/goformation/cloudformation/appstream/aws-appstream-user.go
new file mode 100644
index 0000000000..03ef001c60
--- /dev/null
+++ b/goformation/cloudformation/appstream/aws-appstream-user.go
@@ -0,0 +1,128 @@
+package appstream
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// User AWS CloudFormation Resource (AWS::AppStream::User)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-user.html
+type User struct {
+
+	// AuthenticationType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-user.html#cfn-appstream-user-authenticationtype
+	AuthenticationType *types.Value `json:"AuthenticationType,omitempty"`
+
+	// FirstName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-user.html#cfn-appstream-user-firstname
+	FirstName *types.Value `json:"FirstName,omitempty"`
+
+	// LastName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-user.html#cfn-appstream-user-lastname
+	LastName *types.Value `json:"LastName,omitempty"`
+
+	// MessageAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-user.html#cfn-appstream-user-messageaction
+	MessageAction *types.Value `json:"MessageAction,omitempty"`
+
+	// UserName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appstream-user.html#cfn-appstream-user-username
+	UserName *types.Value `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 *User) AWSCloudFormationType() string {
+	return "AWS::AppStream::User"
+}
+
+// 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 User) MarshalJSON() ([]byte, error) {
+	type Properties User
+	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 *User) UnmarshalJSON(b []byte) error {
+	type Properties User
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = User(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appsync/aws-appsync-apicache.go b/goformation/cloudformation/appsync/aws-appsync-apicache.go
new file mode 100644
index 0000000000..c1a891972b
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-apicache.go
@@ -0,0 +1,133 @@
+package appsync
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApiCache AWS CloudFormation Resource (AWS::AppSync::ApiCache)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-apicache.html
+type ApiCache struct {
+
+	// ApiCachingBehavior AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-apicache.html#cfn-appsync-apicache-apicachingbehavior
+	ApiCachingBehavior *types.Value `json:"ApiCachingBehavior,omitempty"`
+
+	// ApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-apicache.html#cfn-appsync-apicache-apiid
+	ApiId *types.Value `json:"ApiId,omitempty"`
+
+	// AtRestEncryptionEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-apicache.html#cfn-appsync-apicache-atrestencryptionenabled
+	AtRestEncryptionEnabled *types.Value `json:"AtRestEncryptionEnabled,omitempty"`
+
+	// TransitEncryptionEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-apicache.html#cfn-appsync-apicache-transitencryptionenabled
+	TransitEncryptionEnabled *types.Value `json:"TransitEncryptionEnabled,omitempty"`
+
+	// Ttl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-apicache.html#cfn-appsync-apicache-ttl
+	Ttl *types.Value `json:"Ttl"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-apicache.html#cfn-appsync-apicache-type
+	Type *types.Value `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 *ApiCache) AWSCloudFormationType() string {
+	return "AWS::AppSync::ApiCache"
+}
+
+// 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 ApiCache) MarshalJSON() ([]byte, error) {
+	type Properties ApiCache
+	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 *ApiCache) UnmarshalJSON(b []byte) error {
+	type Properties ApiCache
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ApiCache(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appsync/aws-appsync-apikey.go b/goformation/cloudformation/appsync/aws-appsync-apikey.go
new file mode 100644
index 0000000000..1334d1ead6
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-apikey.go
@@ -0,0 +1,123 @@
+package appsync
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApiKey AWS CloudFormation Resource (AWS::AppSync::ApiKey)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-apikey.html
+type ApiKey struct {
+
+	// ApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-apikey.html#cfn-appsync-apikey-apiid
+	ApiId *types.Value `json:"ApiId,omitempty"`
+
+	// ApiKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-apikey.html#cfn-appsync-apikey-apikeyid
+	ApiKeyId *types.Value `json:"ApiKeyId,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-apikey.html#cfn-appsync-apikey-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Expires AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-apikey.html#cfn-appsync-apikey-expires
+	Expires *types.Value `json:"Expires,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApiKey) AWSCloudFormationType() string {
+	return "AWS::AppSync::ApiKey"
+}
+
+// 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 ApiKey) MarshalJSON() ([]byte, error) {
+	type Properties ApiKey
+	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 *ApiKey) UnmarshalJSON(b []byte) error {
+	type Properties ApiKey
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ApiKey(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appsync/aws-appsync-datasource.go b/goformation/cloudformation/appsync/aws-appsync-datasource.go
new file mode 100644
index 0000000000..9d543a9880
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-datasource.go
@@ -0,0 +1,158 @@
+package appsync
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource AWS CloudFormation Resource (AWS::AppSync::DataSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-datasource.html
+type DataSource struct {
+
+	// ApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-datasource.html#cfn-appsync-datasource-apiid
+	ApiId *types.Value `json:"ApiId,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-datasource.html#cfn-appsync-datasource-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DynamoDBConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-datasource.html#cfn-appsync-datasource-dynamodbconfig
+	DynamoDBConfig *DataSource_DynamoDBConfig `json:"DynamoDBConfig,omitempty"`
+
+	// ElasticsearchConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-datasource.html#cfn-appsync-datasource-elasticsearchconfig
+	ElasticsearchConfig *DataSource_ElasticsearchConfig `json:"ElasticsearchConfig,omitempty"`
+
+	// HttpConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-datasource.html#cfn-appsync-datasource-httpconfig
+	HttpConfig *DataSource_HttpConfig `json:"HttpConfig,omitempty"`
+
+	// LambdaConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-datasource.html#cfn-appsync-datasource-lambdaconfig
+	LambdaConfig *DataSource_LambdaConfig `json:"LambdaConfig,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-datasource.html#cfn-appsync-datasource-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// OpenSearchServiceConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-datasource.html#cfn-appsync-datasource-opensearchserviceconfig
+	OpenSearchServiceConfig *DataSource_OpenSearchServiceConfig `json:"OpenSearchServiceConfig,omitempty"`
+
+	// RelationalDatabaseConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-datasource.html#cfn-appsync-datasource-relationaldatabaseconfig
+	RelationalDatabaseConfig *DataSource_RelationalDatabaseConfig `json:"RelationalDatabaseConfig,omitempty"`
+
+	// ServiceRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-datasource.html#cfn-appsync-datasource-servicerolearn
+	ServiceRoleArn *types.Value `json:"ServiceRoleArn,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-datasource.html#cfn-appsync-datasource-type
+	Type *types.Value `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 *DataSource) AWSCloudFormationType() string {
+	return "AWS::AppSync::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appsync/aws-appsync-datasource_authorizationconfig.go b/goformation/cloudformation/appsync/aws-appsync-datasource_authorizationconfig.go
new file mode 100644
index 0000000000..9546a31a85
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-datasource_authorizationconfig.go
@@ -0,0 +1,42 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_AuthorizationConfig AWS CloudFormation Resource (AWS::AppSync::DataSource.AuthorizationConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-authorizationconfig.html
+type DataSource_AuthorizationConfig struct {
+
+	// AuthorizationType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-authorizationconfig.html#cfn-appsync-datasource-authorizationconfig-authorizationtype
+	AuthorizationType *types.Value `json:"AuthorizationType,omitempty"`
+
+	// AwsIamConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-authorizationconfig.html#cfn-appsync-datasource-authorizationconfig-awsiamconfig
+	AwsIamConfig *DataSource_AwsIamConfig `json:"AwsIamConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AuthorizationConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::DataSource.AuthorizationConfig"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-datasource_awsiamconfig.go b/goformation/cloudformation/appsync/aws-appsync-datasource_awsiamconfig.go
new file mode 100644
index 0000000000..44361149e2
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-datasource_awsiamconfig.go
@@ -0,0 +1,42 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_AwsIamConfig AWS CloudFormation Resource (AWS::AppSync::DataSource.AwsIamConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-awsiamconfig.html
+type DataSource_AwsIamConfig struct {
+
+	// SigningRegion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-awsiamconfig.html#cfn-appsync-datasource-awsiamconfig-signingregion
+	SigningRegion *types.Value `json:"SigningRegion,omitempty"`
+
+	// SigningServiceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-awsiamconfig.html#cfn-appsync-datasource-awsiamconfig-signingservicename
+	SigningServiceName *types.Value `json:"SigningServiceName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AwsIamConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::DataSource.AwsIamConfig"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-datasource_deltasyncconfig.go b/goformation/cloudformation/appsync/aws-appsync-datasource_deltasyncconfig.go
new file mode 100644
index 0000000000..92cf5c32b8
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-datasource_deltasyncconfig.go
@@ -0,0 +1,47 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_DeltaSyncConfig AWS CloudFormation Resource (AWS::AppSync::DataSource.DeltaSyncConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-deltasyncconfig.html
+type DataSource_DeltaSyncConfig struct {
+
+	// BaseTableTTL AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-deltasyncconfig.html#cfn-appsync-datasource-deltasyncconfig-basetablettl
+	BaseTableTTL *types.Value `json:"BaseTableTTL,omitempty"`
+
+	// DeltaSyncTableName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-deltasyncconfig.html#cfn-appsync-datasource-deltasyncconfig-deltasynctablename
+	DeltaSyncTableName *types.Value `json:"DeltaSyncTableName,omitempty"`
+
+	// DeltaSyncTableTTL AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-deltasyncconfig.html#cfn-appsync-datasource-deltasyncconfig-deltasynctablettl
+	DeltaSyncTableTTL *types.Value `json:"DeltaSyncTableTTL,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DeltaSyncConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::DataSource.DeltaSyncConfig"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-datasource_dynamodbconfig.go b/goformation/cloudformation/appsync/aws-appsync-datasource_dynamodbconfig.go
new file mode 100644
index 0000000000..a892973ab9
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-datasource_dynamodbconfig.go
@@ -0,0 +1,57 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_DynamoDBConfig AWS CloudFormation Resource (AWS::AppSync::DataSource.DynamoDBConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-dynamodbconfig.html
+type DataSource_DynamoDBConfig struct {
+
+	// AwsRegion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-dynamodbconfig.html#cfn-appsync-datasource-dynamodbconfig-awsregion
+	AwsRegion *types.Value `json:"AwsRegion,omitempty"`
+
+	// DeltaSyncConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-dynamodbconfig.html#cfn-appsync-datasource-dynamodbconfig-deltasyncconfig
+	DeltaSyncConfig *DataSource_DeltaSyncConfig `json:"DeltaSyncConfig,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-dynamodbconfig.html#cfn-appsync-datasource-dynamodbconfig-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// UseCallerCredentials AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-dynamodbconfig.html#cfn-appsync-datasource-dynamodbconfig-usecallercredentials
+	UseCallerCredentials *types.Value `json:"UseCallerCredentials,omitempty"`
+
+	// Versioned AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-dynamodbconfig.html#cfn-appsync-datasource-dynamodbconfig-versioned
+	Versioned *types.Value `json:"Versioned,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DynamoDBConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::DataSource.DynamoDBConfig"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-datasource_elasticsearchconfig.go b/goformation/cloudformation/appsync/aws-appsync-datasource_elasticsearchconfig.go
new file mode 100644
index 0000000000..59972afeca
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-datasource_elasticsearchconfig.go
@@ -0,0 +1,42 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_ElasticsearchConfig AWS CloudFormation Resource (AWS::AppSync::DataSource.ElasticsearchConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-elasticsearchconfig.html
+type DataSource_ElasticsearchConfig struct {
+
+	// AwsRegion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-elasticsearchconfig.html#cfn-appsync-datasource-elasticsearchconfig-awsregion
+	AwsRegion *types.Value `json:"AwsRegion,omitempty"`
+
+	// Endpoint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-elasticsearchconfig.html#cfn-appsync-datasource-elasticsearchconfig-endpoint
+	Endpoint *types.Value `json:"Endpoint,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ElasticsearchConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::DataSource.ElasticsearchConfig"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-datasource_httpconfig.go b/goformation/cloudformation/appsync/aws-appsync-datasource_httpconfig.go
new file mode 100644
index 0000000000..4d5ca8741e
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-datasource_httpconfig.go
@@ -0,0 +1,42 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_HttpConfig AWS CloudFormation Resource (AWS::AppSync::DataSource.HttpConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-httpconfig.html
+type DataSource_HttpConfig struct {
+
+	// AuthorizationConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-httpconfig.html#cfn-appsync-datasource-httpconfig-authorizationconfig
+	AuthorizationConfig *DataSource_AuthorizationConfig `json:"AuthorizationConfig,omitempty"`
+
+	// Endpoint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-httpconfig.html#cfn-appsync-datasource-httpconfig-endpoint
+	Endpoint *types.Value `json:"Endpoint,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_HttpConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::DataSource.HttpConfig"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-datasource_lambdaconfig.go b/goformation/cloudformation/appsync/aws-appsync-datasource_lambdaconfig.go
new file mode 100644
index 0000000000..9ffe076576
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-datasource_lambdaconfig.go
@@ -0,0 +1,37 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_LambdaConfig AWS CloudFormation Resource (AWS::AppSync::DataSource.LambdaConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-lambdaconfig.html
+type DataSource_LambdaConfig struct {
+
+	// LambdaFunctionArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-lambdaconfig.html#cfn-appsync-datasource-lambdaconfig-lambdafunctionarn
+	LambdaFunctionArn *types.Value `json:"LambdaFunctionArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LambdaConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::DataSource.LambdaConfig"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-datasource_opensearchserviceconfig.go b/goformation/cloudformation/appsync/aws-appsync-datasource_opensearchserviceconfig.go
new file mode 100644
index 0000000000..55ead4ebf5
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-datasource_opensearchserviceconfig.go
@@ -0,0 +1,42 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_OpenSearchServiceConfig AWS CloudFormation Resource (AWS::AppSync::DataSource.OpenSearchServiceConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-opensearchserviceconfig.html
+type DataSource_OpenSearchServiceConfig struct {
+
+	// AwsRegion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-opensearchserviceconfig.html#cfn-appsync-datasource-opensearchserviceconfig-awsregion
+	AwsRegion *types.Value `json:"AwsRegion,omitempty"`
+
+	// Endpoint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-opensearchserviceconfig.html#cfn-appsync-datasource-opensearchserviceconfig-endpoint
+	Endpoint *types.Value `json:"Endpoint,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_OpenSearchServiceConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::DataSource.OpenSearchServiceConfig"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-datasource_rdshttpendpointconfig.go b/goformation/cloudformation/appsync/aws-appsync-datasource_rdshttpendpointconfig.go
new file mode 100644
index 0000000000..3db42fa0de
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-datasource_rdshttpendpointconfig.go
@@ -0,0 +1,57 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_RdsHttpEndpointConfig AWS CloudFormation Resource (AWS::AppSync::DataSource.RdsHttpEndpointConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-rdshttpendpointconfig.html
+type DataSource_RdsHttpEndpointConfig struct {
+
+	// AwsRegion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-rdshttpendpointconfig.html#cfn-appsync-datasource-rdshttpendpointconfig-awsregion
+	AwsRegion *types.Value `json:"AwsRegion,omitempty"`
+
+	// AwsSecretStoreArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-rdshttpendpointconfig.html#cfn-appsync-datasource-rdshttpendpointconfig-awssecretstorearn
+	AwsSecretStoreArn *types.Value `json:"AwsSecretStoreArn,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-rdshttpendpointconfig.html#cfn-appsync-datasource-rdshttpendpointconfig-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// DbClusterIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-rdshttpendpointconfig.html#cfn-appsync-datasource-rdshttpendpointconfig-dbclusteridentifier
+	DbClusterIdentifier *types.Value `json:"DbClusterIdentifier,omitempty"`
+
+	// Schema AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-rdshttpendpointconfig.html#cfn-appsync-datasource-rdshttpendpointconfig-schema
+	Schema *types.Value `json:"Schema,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RdsHttpEndpointConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::DataSource.RdsHttpEndpointConfig"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-datasource_relationaldatabaseconfig.go b/goformation/cloudformation/appsync/aws-appsync-datasource_relationaldatabaseconfig.go
new file mode 100644
index 0000000000..071e048138
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-datasource_relationaldatabaseconfig.go
@@ -0,0 +1,42 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_RelationalDatabaseConfig AWS CloudFormation Resource (AWS::AppSync::DataSource.RelationalDatabaseConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-relationaldatabaseconfig.html
+type DataSource_RelationalDatabaseConfig struct {
+
+	// RdsHttpEndpointConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-relationaldatabaseconfig.html#cfn-appsync-datasource-relationaldatabaseconfig-rdshttpendpointconfig
+	RdsHttpEndpointConfig *DataSource_RdsHttpEndpointConfig `json:"RdsHttpEndpointConfig,omitempty"`
+
+	// RelationalDatabaseSourceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-datasource-relationaldatabaseconfig.html#cfn-appsync-datasource-relationaldatabaseconfig-relationaldatabasesourcetype
+	RelationalDatabaseSourceType *types.Value `json:"RelationalDatabaseSourceType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RelationalDatabaseConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::DataSource.RelationalDatabaseConfig"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-functionconfiguration.go b/goformation/cloudformation/appsync/aws-appsync-functionconfiguration.go
new file mode 100644
index 0000000000..cf02c45a69
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-functionconfiguration.go
@@ -0,0 +1,153 @@
+package appsync
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FunctionConfiguration AWS CloudFormation Resource (AWS::AppSync::FunctionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-functionconfiguration.html
+type FunctionConfiguration struct {
+
+	// ApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-functionconfiguration.html#cfn-appsync-functionconfiguration-apiid
+	ApiId *types.Value `json:"ApiId,omitempty"`
+
+	// DataSourceName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-functionconfiguration.html#cfn-appsync-functionconfiguration-datasourcename
+	DataSourceName *types.Value `json:"DataSourceName,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-functionconfiguration.html#cfn-appsync-functionconfiguration-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// FunctionVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-functionconfiguration.html#cfn-appsync-functionconfiguration-functionversion
+	FunctionVersion *types.Value `json:"FunctionVersion,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-functionconfiguration.html#cfn-appsync-functionconfiguration-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RequestMappingTemplate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-functionconfiguration.html#cfn-appsync-functionconfiguration-requestmappingtemplate
+	RequestMappingTemplate *types.Value `json:"RequestMappingTemplate,omitempty"`
+
+	// RequestMappingTemplateS3Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-functionconfiguration.html#cfn-appsync-functionconfiguration-requestmappingtemplates3location
+	RequestMappingTemplateS3Location *types.Value `json:"RequestMappingTemplateS3Location,omitempty"`
+
+	// ResponseMappingTemplate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-functionconfiguration.html#cfn-appsync-functionconfiguration-responsemappingtemplate
+	ResponseMappingTemplate *types.Value `json:"ResponseMappingTemplate,omitempty"`
+
+	// ResponseMappingTemplateS3Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-functionconfiguration.html#cfn-appsync-functionconfiguration-responsemappingtemplates3location
+	ResponseMappingTemplateS3Location *types.Value `json:"ResponseMappingTemplateS3Location,omitempty"`
+
+	// SyncConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-functionconfiguration.html#cfn-appsync-functionconfiguration-syncconfig
+	SyncConfig *FunctionConfiguration_SyncConfig `json:"SyncConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FunctionConfiguration) AWSCloudFormationType() string {
+	return "AWS::AppSync::FunctionConfiguration"
+}
+
+// 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 FunctionConfiguration) MarshalJSON() ([]byte, error) {
+	type Properties FunctionConfiguration
+	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 *FunctionConfiguration) UnmarshalJSON(b []byte) error {
+	type Properties FunctionConfiguration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FunctionConfiguration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appsync/aws-appsync-functionconfiguration_lambdaconflicthandlerconfig.go b/goformation/cloudformation/appsync/aws-appsync-functionconfiguration_lambdaconflicthandlerconfig.go
new file mode 100644
index 0000000000..2515d8dcfe
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-functionconfiguration_lambdaconflicthandlerconfig.go
@@ -0,0 +1,37 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FunctionConfiguration_LambdaConflictHandlerConfig AWS CloudFormation Resource (AWS::AppSync::FunctionConfiguration.LambdaConflictHandlerConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-functionconfiguration-lambdaconflicthandlerconfig.html
+type FunctionConfiguration_LambdaConflictHandlerConfig struct {
+
+	// LambdaConflictHandlerArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-functionconfiguration-lambdaconflicthandlerconfig.html#cfn-appsync-functionconfiguration-lambdaconflicthandlerconfig-lambdaconflicthandlerarn
+	LambdaConflictHandlerArn *types.Value `json:"LambdaConflictHandlerArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FunctionConfiguration_LambdaConflictHandlerConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::FunctionConfiguration.LambdaConflictHandlerConfig"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-functionconfiguration_syncconfig.go b/goformation/cloudformation/appsync/aws-appsync-functionconfiguration_syncconfig.go
new file mode 100644
index 0000000000..8ded863459
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-functionconfiguration_syncconfig.go
@@ -0,0 +1,47 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FunctionConfiguration_SyncConfig AWS CloudFormation Resource (AWS::AppSync::FunctionConfiguration.SyncConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-functionconfiguration-syncconfig.html
+type FunctionConfiguration_SyncConfig struct {
+
+	// ConflictDetection AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-functionconfiguration-syncconfig.html#cfn-appsync-functionconfiguration-syncconfig-conflictdetection
+	ConflictDetection *types.Value `json:"ConflictDetection,omitempty"`
+
+	// ConflictHandler AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-functionconfiguration-syncconfig.html#cfn-appsync-functionconfiguration-syncconfig-conflicthandler
+	ConflictHandler *types.Value `json:"ConflictHandler,omitempty"`
+
+	// LambdaConflictHandlerConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-functionconfiguration-syncconfig.html#cfn-appsync-functionconfiguration-syncconfig-lambdaconflicthandlerconfig
+	LambdaConflictHandlerConfig *FunctionConfiguration_LambdaConflictHandlerConfig `json:"LambdaConflictHandlerConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FunctionConfiguration_SyncConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::FunctionConfiguration.SyncConfig"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-graphqlapi.go b/goformation/cloudformation/appsync/aws-appsync-graphqlapi.go
new file mode 100644
index 0000000000..f43d171fe6
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-graphqlapi.go
@@ -0,0 +1,148 @@
+package appsync
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GraphQLApi AWS CloudFormation Resource (AWS::AppSync::GraphQLApi)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-graphqlapi.html
+type GraphQLApi struct {
+
+	// AdditionalAuthenticationProviders AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-graphqlapi.html#cfn-appsync-graphqlapi-additionalauthenticationproviders
+	AdditionalAuthenticationProviders *GraphQLApi_AdditionalAuthenticationProviders `json:"AdditionalAuthenticationProviders,omitempty"`
+
+	// AuthenticationType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-graphqlapi.html#cfn-appsync-graphqlapi-authenticationtype
+	AuthenticationType *types.Value `json:"AuthenticationType,omitempty"`
+
+	// LambdaAuthorizerConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-graphqlapi.html#cfn-appsync-graphqlapi-lambdaauthorizerconfig
+	LambdaAuthorizerConfig *GraphQLApi_LambdaAuthorizerConfig `json:"LambdaAuthorizerConfig,omitempty"`
+
+	// LogConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-graphqlapi.html#cfn-appsync-graphqlapi-logconfig
+	LogConfig *GraphQLApi_LogConfig `json:"LogConfig,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-graphqlapi.html#cfn-appsync-graphqlapi-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// OpenIDConnectConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-graphqlapi.html#cfn-appsync-graphqlapi-openidconnectconfig
+	OpenIDConnectConfig *GraphQLApi_OpenIDConnectConfig `json:"OpenIDConnectConfig,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-graphqlapi.html#cfn-appsync-graphqlapi-tags
+	Tags *GraphQLApi_Tags `json:"Tags,omitempty"`
+
+	// UserPoolConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-graphqlapi.html#cfn-appsync-graphqlapi-userpoolconfig
+	UserPoolConfig *GraphQLApi_UserPoolConfig `json:"UserPoolConfig,omitempty"`
+
+	// XrayEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-graphqlapi.html#cfn-appsync-graphqlapi-xrayenabled
+	XrayEnabled *types.Value `json:"XrayEnabled,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GraphQLApi) AWSCloudFormationType() string {
+	return "AWS::AppSync::GraphQLApi"
+}
+
+// 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 GraphQLApi) MarshalJSON() ([]byte, error) {
+	type Properties GraphQLApi
+	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 *GraphQLApi) UnmarshalJSON(b []byte) error {
+	type Properties GraphQLApi
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = GraphQLApi(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationprovider.go b/goformation/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationprovider.go
new file mode 100644
index 0000000000..5864abb251
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationprovider.go
@@ -0,0 +1,52 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GraphQLApi_AdditionalAuthenticationProvider AWS CloudFormation Resource (AWS::AppSync::GraphQLApi.AdditionalAuthenticationProvider)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-additionalauthenticationprovider.html
+type GraphQLApi_AdditionalAuthenticationProvider struct {
+
+	// AuthenticationType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-additionalauthenticationprovider.html#cfn-appsync-graphqlapi-additionalauthenticationprovider-authenticationtype
+	AuthenticationType *types.Value `json:"AuthenticationType,omitempty"`
+
+	// LambdaAuthorizerConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-additionalauthenticationprovider.html#cfn-appsync-graphqlapi-additionalauthenticationprovider-lambdaauthorizerconfig
+	LambdaAuthorizerConfig *GraphQLApi_LambdaAuthorizerConfig `json:"LambdaAuthorizerConfig,omitempty"`
+
+	// OpenIDConnectConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-additionalauthenticationprovider.html#cfn-appsync-graphqlapi-additionalauthenticationprovider-openidconnectconfig
+	OpenIDConnectConfig *GraphQLApi_OpenIDConnectConfig `json:"OpenIDConnectConfig,omitempty"`
+
+	// UserPoolConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-additionalauthenticationprovider.html#cfn-appsync-graphqlapi-additionalauthenticationprovider-userpoolconfig
+	UserPoolConfig *GraphQLApi_CognitoUserPoolConfig `json:"UserPoolConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GraphQLApi_AdditionalAuthenticationProvider) AWSCloudFormationType() string {
+	return "AWS::AppSync::GraphQLApi.AdditionalAuthenticationProvider"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationproviders.go b/goformation/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationproviders.go
new file mode 100644
index 0000000000..f80e2860bb
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-graphqlapi_additionalauthenticationproviders.go
@@ -0,0 +1,30 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// GraphQLApi_AdditionalAuthenticationProviders AWS CloudFormation Resource (AWS::AppSync::GraphQLApi.AdditionalAuthenticationProviders)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-additionalauthenticationproviders.html
+type GraphQLApi_AdditionalAuthenticationProviders struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GraphQLApi_AdditionalAuthenticationProviders) AWSCloudFormationType() string {
+	return "AWS::AppSync::GraphQLApi.AdditionalAuthenticationProviders"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_cognitouserpoolconfig.go b/goformation/cloudformation/appsync/aws-appsync-graphqlapi_cognitouserpoolconfig.go
new file mode 100644
index 0000000000..f83e92501e
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-graphqlapi_cognitouserpoolconfig.go
@@ -0,0 +1,47 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GraphQLApi_CognitoUserPoolConfig AWS CloudFormation Resource (AWS::AppSync::GraphQLApi.CognitoUserPoolConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-cognitouserpoolconfig.html
+type GraphQLApi_CognitoUserPoolConfig struct {
+
+	// AppIdClientRegex AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-cognitouserpoolconfig.html#cfn-appsync-graphqlapi-cognitouserpoolconfig-appidclientregex
+	AppIdClientRegex *types.Value `json:"AppIdClientRegex,omitempty"`
+
+	// AwsRegion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-cognitouserpoolconfig.html#cfn-appsync-graphqlapi-cognitouserpoolconfig-awsregion
+	AwsRegion *types.Value `json:"AwsRegion,omitempty"`
+
+	// UserPoolId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-cognitouserpoolconfig.html#cfn-appsync-graphqlapi-cognitouserpoolconfig-userpoolid
+	UserPoolId *types.Value `json:"UserPoolId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GraphQLApi_CognitoUserPoolConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::GraphQLApi.CognitoUserPoolConfig"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_lambdaauthorizerconfig.go b/goformation/cloudformation/appsync/aws-appsync-graphqlapi_lambdaauthorizerconfig.go
new file mode 100644
index 0000000000..ce1277601c
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-graphqlapi_lambdaauthorizerconfig.go
@@ -0,0 +1,47 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GraphQLApi_LambdaAuthorizerConfig AWS CloudFormation Resource (AWS::AppSync::GraphQLApi.LambdaAuthorizerConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-lambdaauthorizerconfig.html
+type GraphQLApi_LambdaAuthorizerConfig struct {
+
+	// AuthorizerResultTtlInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-lambdaauthorizerconfig.html#cfn-appsync-graphqlapi-lambdaauthorizerconfig-authorizerresultttlinseconds
+	AuthorizerResultTtlInSeconds *types.Value `json:"AuthorizerResultTtlInSeconds,omitempty"`
+
+	// AuthorizerUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-lambdaauthorizerconfig.html#cfn-appsync-graphqlapi-lambdaauthorizerconfig-authorizeruri
+	AuthorizerUri *types.Value `json:"AuthorizerUri,omitempty"`
+
+	// IdentityValidationExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-lambdaauthorizerconfig.html#cfn-appsync-graphqlapi-lambdaauthorizerconfig-identityvalidationexpression
+	IdentityValidationExpression *types.Value `json:"IdentityValidationExpression,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GraphQLApi_LambdaAuthorizerConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::GraphQLApi.LambdaAuthorizerConfig"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_logconfig.go b/goformation/cloudformation/appsync/aws-appsync-graphqlapi_logconfig.go
new file mode 100644
index 0000000000..b6eb292e87
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-graphqlapi_logconfig.go
@@ -0,0 +1,47 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GraphQLApi_LogConfig AWS CloudFormation Resource (AWS::AppSync::GraphQLApi.LogConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-logconfig.html
+type GraphQLApi_LogConfig struct {
+
+	// CloudWatchLogsRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-logconfig.html#cfn-appsync-graphqlapi-logconfig-cloudwatchlogsrolearn
+	CloudWatchLogsRoleArn *types.Value `json:"CloudWatchLogsRoleArn,omitempty"`
+
+	// ExcludeVerboseContent AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-logconfig.html#cfn-appsync-graphqlapi-logconfig-excludeverbosecontent
+	ExcludeVerboseContent *types.Value `json:"ExcludeVerboseContent,omitempty"`
+
+	// FieldLogLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-logconfig.html#cfn-appsync-graphqlapi-logconfig-fieldloglevel
+	FieldLogLevel *types.Value `json:"FieldLogLevel,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GraphQLApi_LogConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::GraphQLApi.LogConfig"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_openidconnectconfig.go b/goformation/cloudformation/appsync/aws-appsync-graphqlapi_openidconnectconfig.go
new file mode 100644
index 0000000000..e6814277ee
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-graphqlapi_openidconnectconfig.go
@@ -0,0 +1,52 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GraphQLApi_OpenIDConnectConfig AWS CloudFormation Resource (AWS::AppSync::GraphQLApi.OpenIDConnectConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-openidconnectconfig.html
+type GraphQLApi_OpenIDConnectConfig struct {
+
+	// AuthTTL AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-openidconnectconfig.html#cfn-appsync-graphqlapi-openidconnectconfig-authttl
+	AuthTTL *types.Value `json:"AuthTTL,omitempty"`
+
+	// ClientId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-openidconnectconfig.html#cfn-appsync-graphqlapi-openidconnectconfig-clientid
+	ClientId *types.Value `json:"ClientId,omitempty"`
+
+	// IatTTL AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-openidconnectconfig.html#cfn-appsync-graphqlapi-openidconnectconfig-iatttl
+	IatTTL *types.Value `json:"IatTTL,omitempty"`
+
+	// Issuer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-openidconnectconfig.html#cfn-appsync-graphqlapi-openidconnectconfig-issuer
+	Issuer *types.Value `json:"Issuer,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GraphQLApi_OpenIDConnectConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::GraphQLApi.OpenIDConnectConfig"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_tags.go b/goformation/cloudformation/appsync/aws-appsync-graphqlapi_tags.go
new file mode 100644
index 0000000000..b19417a4a7
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-graphqlapi_tags.go
@@ -0,0 +1,30 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// GraphQLApi_Tags AWS CloudFormation Resource (AWS::AppSync::GraphQLApi.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-tags.html
+type GraphQLApi_Tags struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GraphQLApi_Tags) AWSCloudFormationType() string {
+	return "AWS::AppSync::GraphQLApi.Tags"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-graphqlapi_userpoolconfig.go b/goformation/cloudformation/appsync/aws-appsync-graphqlapi_userpoolconfig.go
new file mode 100644
index 0000000000..85fa8939e7
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-graphqlapi_userpoolconfig.go
@@ -0,0 +1,52 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GraphQLApi_UserPoolConfig AWS CloudFormation Resource (AWS::AppSync::GraphQLApi.UserPoolConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-userpoolconfig.html
+type GraphQLApi_UserPoolConfig struct {
+
+	// AppIdClientRegex AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-userpoolconfig.html#cfn-appsync-graphqlapi-userpoolconfig-appidclientregex
+	AppIdClientRegex *types.Value `json:"AppIdClientRegex,omitempty"`
+
+	// AwsRegion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-userpoolconfig.html#cfn-appsync-graphqlapi-userpoolconfig-awsregion
+	AwsRegion *types.Value `json:"AwsRegion,omitempty"`
+
+	// DefaultAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-userpoolconfig.html#cfn-appsync-graphqlapi-userpoolconfig-defaultaction
+	DefaultAction *types.Value `json:"DefaultAction,omitempty"`
+
+	// UserPoolId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-graphqlapi-userpoolconfig.html#cfn-appsync-graphqlapi-userpoolconfig-userpoolid
+	UserPoolId *types.Value `json:"UserPoolId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GraphQLApi_UserPoolConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::GraphQLApi.UserPoolConfig"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-graphqlschema.go b/goformation/cloudformation/appsync/aws-appsync-graphqlschema.go
new file mode 100644
index 0000000000..e724eef3d1
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-graphqlschema.go
@@ -0,0 +1,118 @@
+package appsync
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GraphQLSchema AWS CloudFormation Resource (AWS::AppSync::GraphQLSchema)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-graphqlschema.html
+type GraphQLSchema struct {
+
+	// ApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-graphqlschema.html#cfn-appsync-graphqlschema-apiid
+	ApiId *types.Value `json:"ApiId,omitempty"`
+
+	// Definition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-graphqlschema.html#cfn-appsync-graphqlschema-definition
+	Definition *types.Value `json:"Definition,omitempty"`
+
+	// DefinitionS3Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-graphqlschema.html#cfn-appsync-graphqlschema-definitions3location
+	DefinitionS3Location *types.Value `json:"DefinitionS3Location,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GraphQLSchema) AWSCloudFormationType() string {
+	return "AWS::AppSync::GraphQLSchema"
+}
+
+// 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 GraphQLSchema) MarshalJSON() ([]byte, error) {
+	type Properties GraphQLSchema
+	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 *GraphQLSchema) UnmarshalJSON(b []byte) error {
+	type Properties GraphQLSchema
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = GraphQLSchema(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appsync/aws-appsync-resolver.go b/goformation/cloudformation/appsync/aws-appsync-resolver.go
new file mode 100644
index 0000000000..5bf80cd563
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-resolver.go
@@ -0,0 +1,163 @@
+package appsync
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Resolver AWS CloudFormation Resource (AWS::AppSync::Resolver)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-resolver.html
+type Resolver struct {
+
+	// ApiId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-resolver.html#cfn-appsync-resolver-apiid
+	ApiId *types.Value `json:"ApiId,omitempty"`
+
+	// CachingConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-resolver.html#cfn-appsync-resolver-cachingconfig
+	CachingConfig *Resolver_CachingConfig `json:"CachingConfig,omitempty"`
+
+	// DataSourceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-resolver.html#cfn-appsync-resolver-datasourcename
+	DataSourceName *types.Value `json:"DataSourceName,omitempty"`
+
+	// FieldName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-resolver.html#cfn-appsync-resolver-fieldname
+	FieldName *types.Value `json:"FieldName,omitempty"`
+
+	// Kind AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-resolver.html#cfn-appsync-resolver-kind
+	Kind *types.Value `json:"Kind,omitempty"`
+
+	// PipelineConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-resolver.html#cfn-appsync-resolver-pipelineconfig
+	PipelineConfig *Resolver_PipelineConfig `json:"PipelineConfig,omitempty"`
+
+	// RequestMappingTemplate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-resolver.html#cfn-appsync-resolver-requestmappingtemplate
+	RequestMappingTemplate *types.Value `json:"RequestMappingTemplate,omitempty"`
+
+	// RequestMappingTemplateS3Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-resolver.html#cfn-appsync-resolver-requestmappingtemplates3location
+	RequestMappingTemplateS3Location *types.Value `json:"RequestMappingTemplateS3Location,omitempty"`
+
+	// ResponseMappingTemplate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-resolver.html#cfn-appsync-resolver-responsemappingtemplate
+	ResponseMappingTemplate *types.Value `json:"ResponseMappingTemplate,omitempty"`
+
+	// ResponseMappingTemplateS3Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-resolver.html#cfn-appsync-resolver-responsemappingtemplates3location
+	ResponseMappingTemplateS3Location *types.Value `json:"ResponseMappingTemplateS3Location,omitempty"`
+
+	// SyncConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-resolver.html#cfn-appsync-resolver-syncconfig
+	SyncConfig *Resolver_SyncConfig `json:"SyncConfig,omitempty"`
+
+	// TypeName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-appsync-resolver.html#cfn-appsync-resolver-typename
+	TypeName *types.Value `json:"TypeName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Resolver) AWSCloudFormationType() string {
+	return "AWS::AppSync::Resolver"
+}
+
+// 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 Resolver) MarshalJSON() ([]byte, error) {
+	type Properties Resolver
+	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 *Resolver) UnmarshalJSON(b []byte) error {
+	type Properties Resolver
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Resolver(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/appsync/aws-appsync-resolver_cachingconfig.go b/goformation/cloudformation/appsync/aws-appsync-resolver_cachingconfig.go
new file mode 100644
index 0000000000..ee14579578
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-resolver_cachingconfig.go
@@ -0,0 +1,42 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Resolver_CachingConfig AWS CloudFormation Resource (AWS::AppSync::Resolver.CachingConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-resolver-cachingconfig.html
+type Resolver_CachingConfig struct {
+
+	// CachingKeys AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-resolver-cachingconfig.html#cfn-appsync-resolver-cachingconfig-cachingkeys
+	CachingKeys *types.Value `json:"CachingKeys,omitempty"`
+
+	// Ttl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-resolver-cachingconfig.html#cfn-appsync-resolver-cachingconfig-ttl
+	Ttl *types.Value `json:"Ttl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Resolver_CachingConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::Resolver.CachingConfig"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-resolver_lambdaconflicthandlerconfig.go b/goformation/cloudformation/appsync/aws-appsync-resolver_lambdaconflicthandlerconfig.go
new file mode 100644
index 0000000000..8b2af44b13
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-resolver_lambdaconflicthandlerconfig.go
@@ -0,0 +1,37 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Resolver_LambdaConflictHandlerConfig AWS CloudFormation Resource (AWS::AppSync::Resolver.LambdaConflictHandlerConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-resolver-lambdaconflicthandlerconfig.html
+type Resolver_LambdaConflictHandlerConfig struct {
+
+	// LambdaConflictHandlerArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-resolver-lambdaconflicthandlerconfig.html#cfn-appsync-resolver-lambdaconflicthandlerconfig-lambdaconflicthandlerarn
+	LambdaConflictHandlerArn *types.Value `json:"LambdaConflictHandlerArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Resolver_LambdaConflictHandlerConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::Resolver.LambdaConflictHandlerConfig"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-resolver_pipelineconfig.go b/goformation/cloudformation/appsync/aws-appsync-resolver_pipelineconfig.go
new file mode 100644
index 0000000000..62edd8c7f4
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-resolver_pipelineconfig.go
@@ -0,0 +1,37 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Resolver_PipelineConfig AWS CloudFormation Resource (AWS::AppSync::Resolver.PipelineConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-resolver-pipelineconfig.html
+type Resolver_PipelineConfig struct {
+
+	// Functions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-resolver-pipelineconfig.html#cfn-appsync-resolver-pipelineconfig-functions
+	Functions *types.Value `json:"Functions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Resolver_PipelineConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::Resolver.PipelineConfig"
+}
diff --git a/goformation/cloudformation/appsync/aws-appsync-resolver_syncconfig.go b/goformation/cloudformation/appsync/aws-appsync-resolver_syncconfig.go
new file mode 100644
index 0000000000..bd55a37088
--- /dev/null
+++ b/goformation/cloudformation/appsync/aws-appsync-resolver_syncconfig.go
@@ -0,0 +1,47 @@
+package appsync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Resolver_SyncConfig AWS CloudFormation Resource (AWS::AppSync::Resolver.SyncConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-resolver-syncconfig.html
+type Resolver_SyncConfig struct {
+
+	// ConflictDetection AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-resolver-syncconfig.html#cfn-appsync-resolver-syncconfig-conflictdetection
+	ConflictDetection *types.Value `json:"ConflictDetection,omitempty"`
+
+	// ConflictHandler AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-resolver-syncconfig.html#cfn-appsync-resolver-syncconfig-conflicthandler
+	ConflictHandler *types.Value `json:"ConflictHandler,omitempty"`
+
+	// LambdaConflictHandlerConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-appsync-resolver-syncconfig.html#cfn-appsync-resolver-syncconfig-lambdaconflicthandlerconfig
+	LambdaConflictHandlerConfig *Resolver_LambdaConflictHandlerConfig `json:"LambdaConflictHandlerConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Resolver_SyncConfig) AWSCloudFormationType() string {
+	return "AWS::AppSync::Resolver.SyncConfig"
+}
diff --git a/goformation/cloudformation/aps/aws-aps-rulegroupsnamespace.go b/goformation/cloudformation/aps/aws-aps-rulegroupsnamespace.go
new file mode 100644
index 0000000000..7634593c86
--- /dev/null
+++ b/goformation/cloudformation/aps/aws-aps-rulegroupsnamespace.go
@@ -0,0 +1,124 @@
+package aps
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroupsNamespace AWS CloudFormation Resource (AWS::APS::RuleGroupsNamespace)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-aps-rulegroupsnamespace.html
+type RuleGroupsNamespace struct {
+
+	// Data AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-aps-rulegroupsnamespace.html#cfn-aps-rulegroupsnamespace-data
+	Data *types.Value `json:"Data,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-aps-rulegroupsnamespace.html#cfn-aps-rulegroupsnamespace-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-aps-rulegroupsnamespace.html#cfn-aps-rulegroupsnamespace-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Workspace AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-aps-rulegroupsnamespace.html#cfn-aps-rulegroupsnamespace-workspace
+	Workspace *types.Value `json:"Workspace,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroupsNamespace) AWSCloudFormationType() string {
+	return "AWS::APS::RuleGroupsNamespace"
+}
+
+// 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 RuleGroupsNamespace) MarshalJSON() ([]byte, error) {
+	type Properties RuleGroupsNamespace
+	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 *RuleGroupsNamespace) UnmarshalJSON(b []byte) error {
+	type Properties RuleGroupsNamespace
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RuleGroupsNamespace(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/aps/aws-aps-workspace.go b/goformation/cloudformation/aps/aws-aps-workspace.go
new file mode 100644
index 0000000000..c0cd3c1d0b
--- /dev/null
+++ b/goformation/cloudformation/aps/aws-aps-workspace.go
@@ -0,0 +1,119 @@
+package aps
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Workspace AWS CloudFormation Resource (AWS::APS::Workspace)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-aps-workspace.html
+type Workspace struct {
+
+	// AlertManagerDefinition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-aps-workspace.html#cfn-aps-workspace-alertmanagerdefinition
+	AlertManagerDefinition *types.Value `json:"AlertManagerDefinition,omitempty"`
+
+	// Alias AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-aps-workspace.html#cfn-aps-workspace-alias
+	Alias *types.Value `json:"Alias,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-aps-workspace.html#cfn-aps-workspace-tags
+	Tags []cloudformation.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 *Workspace) AWSCloudFormationType() string {
+	return "AWS::APS::Workspace"
+}
+
+// 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 Workspace) MarshalJSON() ([]byte, error) {
+	type Properties Workspace
+	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 *Workspace) UnmarshalJSON(b []byte) error {
+	type Properties Workspace
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Workspace(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ask/alexa-ask-skill.go b/goformation/cloudformation/ask/alexa-ask-skill.go
new file mode 100644
index 0000000000..2592c6f4cc
--- /dev/null
+++ b/goformation/cloudformation/ask/alexa-ask-skill.go
@@ -0,0 +1,118 @@
+package ask
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Skill AWS CloudFormation Resource (Alexa::ASK::Skill)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ask-skill.html
+type Skill struct {
+
+	// AuthenticationConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ask-skill.html#cfn-ask-skill-authenticationconfiguration
+	AuthenticationConfiguration *Skill_AuthenticationConfiguration `json:"AuthenticationConfiguration,omitempty"`
+
+	// SkillPackage AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ask-skill.html#cfn-ask-skill-skillpackage
+	SkillPackage *Skill_SkillPackage `json:"SkillPackage,omitempty"`
+
+	// VendorId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ask-skill.html#cfn-ask-skill-vendorid
+	VendorId *types.Value `json:"VendorId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Skill) AWSCloudFormationType() string {
+	return "Alexa::ASK::Skill"
+}
+
+// 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 Skill) MarshalJSON() ([]byte, error) {
+	type Properties Skill
+	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 *Skill) UnmarshalJSON(b []byte) error {
+	type Properties Skill
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Skill(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ask/alexa-ask-skill_authenticationconfiguration.go b/goformation/cloudformation/ask/alexa-ask-skill_authenticationconfiguration.go
new file mode 100644
index 0000000000..3011e5f616
--- /dev/null
+++ b/goformation/cloudformation/ask/alexa-ask-skill_authenticationconfiguration.go
@@ -0,0 +1,47 @@
+package ask
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Skill_AuthenticationConfiguration AWS CloudFormation Resource (Alexa::ASK::Skill.AuthenticationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ask-skill-authenticationconfiguration.html
+type Skill_AuthenticationConfiguration struct {
+
+	// ClientId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ask-skill-authenticationconfiguration.html#cfn-ask-skill-authenticationconfiguration-clientid
+	ClientId *types.Value `json:"ClientId,omitempty"`
+
+	// ClientSecret AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ask-skill-authenticationconfiguration.html#cfn-ask-skill-authenticationconfiguration-clientsecret
+	ClientSecret *types.Value `json:"ClientSecret,omitempty"`
+
+	// RefreshToken AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ask-skill-authenticationconfiguration.html#cfn-ask-skill-authenticationconfiguration-refreshtoken
+	RefreshToken *types.Value `json:"RefreshToken,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Skill_AuthenticationConfiguration) AWSCloudFormationType() string {
+	return "Alexa::ASK::Skill.AuthenticationConfiguration"
+}
diff --git a/goformation/cloudformation/ask/alexa-ask-skill_overrides.go b/goformation/cloudformation/ask/alexa-ask-skill_overrides.go
new file mode 100644
index 0000000000..7a8bbcca7a
--- /dev/null
+++ b/goformation/cloudformation/ask/alexa-ask-skill_overrides.go
@@ -0,0 +1,35 @@
+package ask
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Skill_Overrides AWS CloudFormation Resource (Alexa::ASK::Skill.Overrides)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ask-skill-overrides.html
+type Skill_Overrides struct {
+
+	// Manifest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ask-skill-overrides.html#cfn-ask-skill-overrides-manifest
+	Manifest interface{} `json:"Manifest,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Skill_Overrides) AWSCloudFormationType() string {
+	return "Alexa::ASK::Skill.Overrides"
+}
diff --git a/goformation/cloudformation/ask/alexa-ask-skill_skillpackage.go b/goformation/cloudformation/ask/alexa-ask-skill_skillpackage.go
new file mode 100644
index 0000000000..a27627ed76
--- /dev/null
+++ b/goformation/cloudformation/ask/alexa-ask-skill_skillpackage.go
@@ -0,0 +1,57 @@
+package ask
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Skill_SkillPackage AWS CloudFormation Resource (Alexa::ASK::Skill.SkillPackage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ask-skill-skillpackage.html
+type Skill_SkillPackage struct {
+
+	// Overrides AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ask-skill-skillpackage.html#cfn-ask-skill-skillpackage-overrides
+	Overrides *Skill_Overrides `json:"Overrides,omitempty"`
+
+	// S3Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ask-skill-skillpackage.html#cfn-ask-skill-skillpackage-s3bucket
+	S3Bucket *types.Value `json:"S3Bucket,omitempty"`
+
+	// S3BucketRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ask-skill-skillpackage.html#cfn-ask-skill-skillpackage-s3bucketrole
+	S3BucketRole *types.Value `json:"S3BucketRole,omitempty"`
+
+	// S3Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ask-skill-skillpackage.html#cfn-ask-skill-skillpackage-s3key
+	S3Key *types.Value `json:"S3Key,omitempty"`
+
+	// S3ObjectVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ask-skill-skillpackage.html#cfn-ask-skill-skillpackage-s3objectversion
+	S3ObjectVersion *types.Value `json:"S3ObjectVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Skill_SkillPackage) AWSCloudFormationType() string {
+	return "Alexa::ASK::Skill.SkillPackage"
+}
diff --git a/goformation/cloudformation/athena/aws-athena-datacatalog.go b/goformation/cloudformation/athena/aws-athena-datacatalog.go
new file mode 100644
index 0000000000..a070eea8e7
--- /dev/null
+++ b/goformation/cloudformation/athena/aws-athena-datacatalog.go
@@ -0,0 +1,129 @@
+package athena
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataCatalog AWS CloudFormation Resource (AWS::Athena::DataCatalog)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-datacatalog.html
+type DataCatalog struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-datacatalog.html#cfn-athena-datacatalog-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-datacatalog.html#cfn-athena-datacatalog-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-datacatalog.html#cfn-athena-datacatalog-parameters
+	Parameters map[string]*types.Value `json:"Parameters,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-datacatalog.html#cfn-athena-datacatalog-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-datacatalog.html#cfn-athena-datacatalog-type
+	Type *types.Value `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 *DataCatalog) AWSCloudFormationType() string {
+	return "AWS::Athena::DataCatalog"
+}
+
+// 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 DataCatalog) MarshalJSON() ([]byte, error) {
+	type Properties DataCatalog
+	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 *DataCatalog) UnmarshalJSON(b []byte) error {
+	type Properties DataCatalog
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DataCatalog(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/athena/aws-athena-datacatalog_tags.go b/goformation/cloudformation/athena/aws-athena-datacatalog_tags.go
new file mode 100644
index 0000000000..a216ef97c3
--- /dev/null
+++ b/goformation/cloudformation/athena/aws-athena-datacatalog_tags.go
@@ -0,0 +1,36 @@
+package athena
+
+import (
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataCatalog_Tags AWS CloudFormation Resource (AWS::Athena::DataCatalog.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-datacatalog-tags.html
+type DataCatalog_Tags struct {
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-datacatalog-tags.html#cfn-athena-datacatalog-tags-tags
+	Tags []cloudformation.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 *DataCatalog_Tags) AWSCloudFormationType() string {
+	return "AWS::Athena::DataCatalog.Tags"
+}
diff --git a/goformation/cloudformation/athena/aws-athena-namedquery.go b/goformation/cloudformation/athena/aws-athena-namedquery.go
new file mode 100644
index 0000000000..f320b18b9a
--- /dev/null
+++ b/goformation/cloudformation/athena/aws-athena-namedquery.go
@@ -0,0 +1,128 @@
+package athena
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NamedQuery AWS CloudFormation Resource (AWS::Athena::NamedQuery)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html
+type NamedQuery struct {
+
+	// Database AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-database
+	Database *types.Value `json:"Database,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// QueryString AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-querystring
+	QueryString *types.Value `json:"QueryString,omitempty"`
+
+	// WorkGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-namedquery.html#cfn-athena-namedquery-workgroup
+	WorkGroup *types.Value `json:"WorkGroup,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NamedQuery) AWSCloudFormationType() string {
+	return "AWS::Athena::NamedQuery"
+}
+
+// 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 NamedQuery) MarshalJSON() ([]byte, error) {
+	type Properties NamedQuery
+	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 *NamedQuery) UnmarshalJSON(b []byte) error {
+	type Properties NamedQuery
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = NamedQuery(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/athena/aws-athena-preparedstatement.go b/goformation/cloudformation/athena/aws-athena-preparedstatement.go
new file mode 100644
index 0000000000..13acf77c24
--- /dev/null
+++ b/goformation/cloudformation/athena/aws-athena-preparedstatement.go
@@ -0,0 +1,123 @@
+package athena
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PreparedStatement AWS CloudFormation Resource (AWS::Athena::PreparedStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-preparedstatement.html
+type PreparedStatement struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-preparedstatement.html#cfn-athena-preparedstatement-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// QueryStatement AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-preparedstatement.html#cfn-athena-preparedstatement-querystatement
+	QueryStatement *types.Value `json:"QueryStatement,omitempty"`
+
+	// StatementName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-preparedstatement.html#cfn-athena-preparedstatement-statementname
+	StatementName *types.Value `json:"StatementName,omitempty"`
+
+	// WorkGroup AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-preparedstatement.html#cfn-athena-preparedstatement-workgroup
+	WorkGroup *types.Value `json:"WorkGroup,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PreparedStatement) AWSCloudFormationType() string {
+	return "AWS::Athena::PreparedStatement"
+}
+
+// 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 PreparedStatement) MarshalJSON() ([]byte, error) {
+	type Properties PreparedStatement
+	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 *PreparedStatement) UnmarshalJSON(b []byte) error {
+	type Properties PreparedStatement
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PreparedStatement(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/athena/aws-athena-workgroup.go b/goformation/cloudformation/athena/aws-athena-workgroup.go
new file mode 100644
index 0000000000..ecb07fa001
--- /dev/null
+++ b/goformation/cloudformation/athena/aws-athena-workgroup.go
@@ -0,0 +1,139 @@
+package athena
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// WorkGroup AWS CloudFormation Resource (AWS::Athena::WorkGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-workgroup.html
+type WorkGroup struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-workgroup.html#cfn-athena-workgroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-workgroup.html#cfn-athena-workgroup-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RecursiveDeleteOption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-workgroup.html#cfn-athena-workgroup-recursivedeleteoption
+	RecursiveDeleteOption *types.Value `json:"RecursiveDeleteOption,omitempty"`
+
+	// State AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-workgroup.html#cfn-athena-workgroup-state
+	State *types.Value `json:"State,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-workgroup.html#cfn-athena-workgroup-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// WorkGroupConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-workgroup.html#cfn-athena-workgroup-workgroupconfiguration
+	WorkGroupConfiguration *WorkGroup_WorkGroupConfiguration `json:"WorkGroupConfiguration,omitempty"`
+
+	// WorkGroupConfigurationUpdates AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-athena-workgroup.html#cfn-athena-workgroup-workgroupconfigurationupdates
+	WorkGroupConfigurationUpdates *WorkGroup_WorkGroupConfigurationUpdates `json:"WorkGroupConfigurationUpdates,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WorkGroup) AWSCloudFormationType() string {
+	return "AWS::Athena::WorkGroup"
+}
+
+// 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 WorkGroup) MarshalJSON() ([]byte, error) {
+	type Properties WorkGroup
+	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 *WorkGroup) UnmarshalJSON(b []byte) error {
+	type Properties WorkGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = WorkGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/athena/aws-athena-workgroup_encryptionconfiguration.go b/goformation/cloudformation/athena/aws-athena-workgroup_encryptionconfiguration.go
new file mode 100644
index 0000000000..c0690ecf34
--- /dev/null
+++ b/goformation/cloudformation/athena/aws-athena-workgroup_encryptionconfiguration.go
@@ -0,0 +1,42 @@
+package athena
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WorkGroup_EncryptionConfiguration AWS CloudFormation Resource (AWS::Athena::WorkGroup.EncryptionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-encryptionconfiguration.html
+type WorkGroup_EncryptionConfiguration struct {
+
+	// EncryptionOption AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-encryptionconfiguration.html#cfn-athena-workgroup-encryptionconfiguration-encryptionoption
+	EncryptionOption *types.Value `json:"EncryptionOption,omitempty"`
+
+	// KmsKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-encryptionconfiguration.html#cfn-athena-workgroup-encryptionconfiguration-kmskey
+	KmsKey *types.Value `json:"KmsKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WorkGroup_EncryptionConfiguration) AWSCloudFormationType() string {
+	return "AWS::Athena::WorkGroup.EncryptionConfiguration"
+}
diff --git a/goformation/cloudformation/athena/aws-athena-workgroup_engineversion.go b/goformation/cloudformation/athena/aws-athena-workgroup_engineversion.go
new file mode 100644
index 0000000000..f4823c83de
--- /dev/null
+++ b/goformation/cloudformation/athena/aws-athena-workgroup_engineversion.go
@@ -0,0 +1,42 @@
+package athena
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WorkGroup_EngineVersion AWS CloudFormation Resource (AWS::Athena::WorkGroup.EngineVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-engineversion.html
+type WorkGroup_EngineVersion struct {
+
+	// EffectiveEngineVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-engineversion.html#cfn-athena-workgroup-engineversion-effectiveengineversion
+	EffectiveEngineVersion *types.Value `json:"EffectiveEngineVersion,omitempty"`
+
+	// SelectedEngineVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-engineversion.html#cfn-athena-workgroup-engineversion-selectedengineversion
+	SelectedEngineVersion *types.Value `json:"SelectedEngineVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WorkGroup_EngineVersion) AWSCloudFormationType() string {
+	return "AWS::Athena::WorkGroup.EngineVersion"
+}
diff --git a/goformation/cloudformation/athena/aws-athena-workgroup_resultconfiguration.go b/goformation/cloudformation/athena/aws-athena-workgroup_resultconfiguration.go
new file mode 100644
index 0000000000..61dfb7839e
--- /dev/null
+++ b/goformation/cloudformation/athena/aws-athena-workgroup_resultconfiguration.go
@@ -0,0 +1,42 @@
+package athena
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WorkGroup_ResultConfiguration AWS CloudFormation Resource (AWS::Athena::WorkGroup.ResultConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-resultconfiguration.html
+type WorkGroup_ResultConfiguration struct {
+
+	// EncryptionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-resultconfiguration.html#cfn-athena-workgroup-resultconfiguration-encryptionconfiguration
+	EncryptionConfiguration *WorkGroup_EncryptionConfiguration `json:"EncryptionConfiguration,omitempty"`
+
+	// OutputLocation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-resultconfiguration.html#cfn-athena-workgroup-resultconfiguration-outputlocation
+	OutputLocation *types.Value `json:"OutputLocation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WorkGroup_ResultConfiguration) AWSCloudFormationType() string {
+	return "AWS::Athena::WorkGroup.ResultConfiguration"
+}
diff --git a/goformation/cloudformation/athena/aws-athena-workgroup_resultconfigurationupdates.go b/goformation/cloudformation/athena/aws-athena-workgroup_resultconfigurationupdates.go
new file mode 100644
index 0000000000..b6d07a5df9
--- /dev/null
+++ b/goformation/cloudformation/athena/aws-athena-workgroup_resultconfigurationupdates.go
@@ -0,0 +1,52 @@
+package athena
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WorkGroup_ResultConfigurationUpdates AWS CloudFormation Resource (AWS::Athena::WorkGroup.ResultConfigurationUpdates)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-resultconfigurationupdates.html
+type WorkGroup_ResultConfigurationUpdates struct {
+
+	// EncryptionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-resultconfigurationupdates.html#cfn-athena-workgroup-resultconfigurationupdates-encryptionconfiguration
+	EncryptionConfiguration *WorkGroup_EncryptionConfiguration `json:"EncryptionConfiguration,omitempty"`
+
+	// OutputLocation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-resultconfigurationupdates.html#cfn-athena-workgroup-resultconfigurationupdates-outputlocation
+	OutputLocation *types.Value `json:"OutputLocation,omitempty"`
+
+	// RemoveEncryptionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-resultconfigurationupdates.html#cfn-athena-workgroup-resultconfigurationupdates-removeencryptionconfiguration
+	RemoveEncryptionConfiguration *types.Value `json:"RemoveEncryptionConfiguration,omitempty"`
+
+	// RemoveOutputLocation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-resultconfigurationupdates.html#cfn-athena-workgroup-resultconfigurationupdates-removeoutputlocation
+	RemoveOutputLocation *types.Value `json:"RemoveOutputLocation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WorkGroup_ResultConfigurationUpdates) AWSCloudFormationType() string {
+	return "AWS::Athena::WorkGroup.ResultConfigurationUpdates"
+}
diff --git a/goformation/cloudformation/athena/aws-athena-workgroup_tags.go b/goformation/cloudformation/athena/aws-athena-workgroup_tags.go
new file mode 100644
index 0000000000..fe496b5558
--- /dev/null
+++ b/goformation/cloudformation/athena/aws-athena-workgroup_tags.go
@@ -0,0 +1,36 @@
+package athena
+
+import (
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// WorkGroup_Tags AWS CloudFormation Resource (AWS::Athena::WorkGroup.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-tags.html
+type WorkGroup_Tags struct {
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-tags.html#cfn-athena-workgroup-tags-tags
+	Tags []cloudformation.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 *WorkGroup_Tags) AWSCloudFormationType() string {
+	return "AWS::Athena::WorkGroup.Tags"
+}
diff --git a/goformation/cloudformation/athena/aws-athena-workgroup_workgroupconfiguration.go b/goformation/cloudformation/athena/aws-athena-workgroup_workgroupconfiguration.go
new file mode 100644
index 0000000000..deadba9335
--- /dev/null
+++ b/goformation/cloudformation/athena/aws-athena-workgroup_workgroupconfiguration.go
@@ -0,0 +1,62 @@
+package athena
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WorkGroup_WorkGroupConfiguration AWS CloudFormation Resource (AWS::Athena::WorkGroup.WorkGroupConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-workgroupconfiguration.html
+type WorkGroup_WorkGroupConfiguration struct {
+
+	// BytesScannedCutoffPerQuery AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-workgroupconfiguration.html#cfn-athena-workgroup-workgroupconfiguration-bytesscannedcutoffperquery
+	BytesScannedCutoffPerQuery *types.Value `json:"BytesScannedCutoffPerQuery,omitempty"`
+
+	// EnforceWorkGroupConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-workgroupconfiguration.html#cfn-athena-workgroup-workgroupconfiguration-enforceworkgroupconfiguration
+	EnforceWorkGroupConfiguration *types.Value `json:"EnforceWorkGroupConfiguration,omitempty"`
+
+	// EngineVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-workgroupconfiguration.html#cfn-athena-workgroup-workgroupconfiguration-engineversion
+	EngineVersion *WorkGroup_EngineVersion `json:"EngineVersion,omitempty"`
+
+	// PublishCloudWatchMetricsEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-workgroupconfiguration.html#cfn-athena-workgroup-workgroupconfiguration-publishcloudwatchmetricsenabled
+	PublishCloudWatchMetricsEnabled *types.Value `json:"PublishCloudWatchMetricsEnabled,omitempty"`
+
+	// RequesterPaysEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-workgroupconfiguration.html#cfn-athena-workgroup-workgroupconfiguration-requesterpaysenabled
+	RequesterPaysEnabled *types.Value `json:"RequesterPaysEnabled,omitempty"`
+
+	// ResultConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-workgroupconfiguration.html#cfn-athena-workgroup-workgroupconfiguration-resultconfiguration
+	ResultConfiguration *WorkGroup_ResultConfiguration `json:"ResultConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WorkGroup_WorkGroupConfiguration) AWSCloudFormationType() string {
+	return "AWS::Athena::WorkGroup.WorkGroupConfiguration"
+}
diff --git a/goformation/cloudformation/athena/aws-athena-workgroup_workgroupconfigurationupdates.go b/goformation/cloudformation/athena/aws-athena-workgroup_workgroupconfigurationupdates.go
new file mode 100644
index 0000000000..e2f7ba814d
--- /dev/null
+++ b/goformation/cloudformation/athena/aws-athena-workgroup_workgroupconfigurationupdates.go
@@ -0,0 +1,67 @@
+package athena
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WorkGroup_WorkGroupConfigurationUpdates AWS CloudFormation Resource (AWS::Athena::WorkGroup.WorkGroupConfigurationUpdates)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-workgroupconfigurationupdates.html
+type WorkGroup_WorkGroupConfigurationUpdates struct {
+
+	// BytesScannedCutoffPerQuery AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-workgroupconfigurationupdates.html#cfn-athena-workgroup-workgroupconfigurationupdates-bytesscannedcutoffperquery
+	BytesScannedCutoffPerQuery *types.Value `json:"BytesScannedCutoffPerQuery,omitempty"`
+
+	// EnforceWorkGroupConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-workgroupconfigurationupdates.html#cfn-athena-workgroup-workgroupconfigurationupdates-enforceworkgroupconfiguration
+	EnforceWorkGroupConfiguration *types.Value `json:"EnforceWorkGroupConfiguration,omitempty"`
+
+	// EngineVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-workgroupconfigurationupdates.html#cfn-athena-workgroup-workgroupconfigurationupdates-engineversion
+	EngineVersion *WorkGroup_EngineVersion `json:"EngineVersion,omitempty"`
+
+	// PublishCloudWatchMetricsEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-workgroupconfigurationupdates.html#cfn-athena-workgroup-workgroupconfigurationupdates-publishcloudwatchmetricsenabled
+	PublishCloudWatchMetricsEnabled *types.Value `json:"PublishCloudWatchMetricsEnabled,omitempty"`
+
+	// RemoveBytesScannedCutoffPerQuery AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-workgroupconfigurationupdates.html#cfn-athena-workgroup-workgroupconfigurationupdates-removebytesscannedcutoffperquery
+	RemoveBytesScannedCutoffPerQuery *types.Value `json:"RemoveBytesScannedCutoffPerQuery,omitempty"`
+
+	// RequesterPaysEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-workgroupconfigurationupdates.html#cfn-athena-workgroup-workgroupconfigurationupdates-requesterpaysenabled
+	RequesterPaysEnabled *types.Value `json:"RequesterPaysEnabled,omitempty"`
+
+	// ResultConfigurationUpdates AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-athena-workgroup-workgroupconfigurationupdates.html#cfn-athena-workgroup-workgroupconfigurationupdates-resultconfigurationupdates
+	ResultConfigurationUpdates *WorkGroup_ResultConfigurationUpdates `json:"ResultConfigurationUpdates,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WorkGroup_WorkGroupConfigurationUpdates) AWSCloudFormationType() string {
+	return "AWS::Athena::WorkGroup.WorkGroupConfigurationUpdates"
+}
diff --git a/goformation/cloudformation/auditmanager/aws-auditmanager-assessment.go b/goformation/cloudformation/auditmanager/aws-auditmanager-assessment.go
new file mode 100644
index 0000000000..7f30330e14
--- /dev/null
+++ b/goformation/cloudformation/auditmanager/aws-auditmanager-assessment.go
@@ -0,0 +1,149 @@
+package auditmanager
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Assessment AWS CloudFormation Resource (AWS::AuditManager::Assessment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-auditmanager-assessment.html
+type Assessment struct {
+
+	// AssessmentReportsDestination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-auditmanager-assessment.html#cfn-auditmanager-assessment-assessmentreportsdestination
+	AssessmentReportsDestination *Assessment_AssessmentReportsDestination `json:"AssessmentReportsDestination,omitempty"`
+
+	// AwsAccount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-auditmanager-assessment.html#cfn-auditmanager-assessment-awsaccount
+	AwsAccount *Assessment_AWSAccount `json:"AwsAccount,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-auditmanager-assessment.html#cfn-auditmanager-assessment-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// FrameworkId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-auditmanager-assessment.html#cfn-auditmanager-assessment-frameworkid
+	FrameworkId *types.Value `json:"FrameworkId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-auditmanager-assessment.html#cfn-auditmanager-assessment-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Roles AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-auditmanager-assessment.html#cfn-auditmanager-assessment-roles
+	Roles []Assessment_Role `json:"Roles,omitempty"`
+
+	// Scope AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-auditmanager-assessment.html#cfn-auditmanager-assessment-scope
+	Scope *Assessment_Scope `json:"Scope,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-auditmanager-assessment.html#cfn-auditmanager-assessment-status
+	Status *types.Value `json:"Status,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-auditmanager-assessment.html#cfn-auditmanager-assessment-tags
+	Tags []cloudformation.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 *Assessment) AWSCloudFormationType() string {
+	return "AWS::AuditManager::Assessment"
+}
+
+// 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 Assessment) MarshalJSON() ([]byte, error) {
+	type Properties Assessment
+	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 *Assessment) UnmarshalJSON(b []byte) error {
+	type Properties Assessment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Assessment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_assessmentreportsdestination.go b/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_assessmentreportsdestination.go
new file mode 100644
index 0000000000..d098a19131
--- /dev/null
+++ b/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_assessmentreportsdestination.go
@@ -0,0 +1,42 @@
+package auditmanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Assessment_AssessmentReportsDestination AWS CloudFormation Resource (AWS::AuditManager::Assessment.AssessmentReportsDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-assessmentreportsdestination.html
+type Assessment_AssessmentReportsDestination struct {
+
+	// Destination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-assessmentreportsdestination.html#cfn-auditmanager-assessment-assessmentreportsdestination-destination
+	Destination *types.Value `json:"Destination,omitempty"`
+
+	// DestinationType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-assessmentreportsdestination.html#cfn-auditmanager-assessment-assessmentreportsdestination-destinationtype
+	DestinationType *types.Value `json:"DestinationType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Assessment_AssessmentReportsDestination) AWSCloudFormationType() string {
+	return "AWS::AuditManager::Assessment.AssessmentReportsDestination"
+}
diff --git a/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_awsaccount.go b/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_awsaccount.go
new file mode 100644
index 0000000000..1850d79f75
--- /dev/null
+++ b/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_awsaccount.go
@@ -0,0 +1,47 @@
+package auditmanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Assessment_AWSAccount AWS CloudFormation Resource (AWS::AuditManager::Assessment.AWSAccount)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-awsaccount.html
+type Assessment_AWSAccount struct {
+
+	// EmailAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-awsaccount.html#cfn-auditmanager-assessment-awsaccount-emailaddress
+	EmailAddress *types.Value `json:"EmailAddress,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-awsaccount.html#cfn-auditmanager-assessment-awsaccount-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-awsaccount.html#cfn-auditmanager-assessment-awsaccount-name
+	Name *types.Value `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 *Assessment_AWSAccount) AWSCloudFormationType() string {
+	return "AWS::AuditManager::Assessment.AWSAccount"
+}
diff --git a/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_awsservice.go b/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_awsservice.go
new file mode 100644
index 0000000000..5a9f4c2bd2
--- /dev/null
+++ b/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_awsservice.go
@@ -0,0 +1,37 @@
+package auditmanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Assessment_AWSService AWS CloudFormation Resource (AWS::AuditManager::Assessment.AWSService)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-awsservice.html
+type Assessment_AWSService struct {
+
+	// ServiceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-awsservice.html#cfn-auditmanager-assessment-awsservice-servicename
+	ServiceName *types.Value `json:"ServiceName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Assessment_AWSService) AWSCloudFormationType() string {
+	return "AWS::AuditManager::Assessment.AWSService"
+}
diff --git a/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_delegation.go b/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_delegation.go
new file mode 100644
index 0000000000..eaa1b43975
--- /dev/null
+++ b/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_delegation.go
@@ -0,0 +1,87 @@
+package auditmanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Assessment_Delegation AWS CloudFormation Resource (AWS::AuditManager::Assessment.Delegation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-delegation.html
+type Assessment_Delegation struct {
+
+	// AssessmentId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-delegation.html#cfn-auditmanager-assessment-delegation-assessmentid
+	AssessmentId *types.Value `json:"AssessmentId,omitempty"`
+
+	// AssessmentName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-delegation.html#cfn-auditmanager-assessment-delegation-assessmentname
+	AssessmentName *types.Value `json:"AssessmentName,omitempty"`
+
+	// Comment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-delegation.html#cfn-auditmanager-assessment-delegation-comment
+	Comment *types.Value `json:"Comment,omitempty"`
+
+	// ControlSetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-delegation.html#cfn-auditmanager-assessment-delegation-controlsetid
+	ControlSetId *types.Value `json:"ControlSetId,omitempty"`
+
+	// CreatedBy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-delegation.html#cfn-auditmanager-assessment-delegation-createdby
+	CreatedBy *types.Value `json:"CreatedBy,omitempty"`
+
+	// CreationTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-delegation.html#cfn-auditmanager-assessment-delegation-creationtime
+	CreationTime *types.Value `json:"CreationTime,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-delegation.html#cfn-auditmanager-assessment-delegation-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// LastUpdated AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-delegation.html#cfn-auditmanager-assessment-delegation-lastupdated
+	LastUpdated *types.Value `json:"LastUpdated,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-delegation.html#cfn-auditmanager-assessment-delegation-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// RoleType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-delegation.html#cfn-auditmanager-assessment-delegation-roletype
+	RoleType *types.Value `json:"RoleType,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-delegation.html#cfn-auditmanager-assessment-delegation-status
+	Status *types.Value `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 *Assessment_Delegation) AWSCloudFormationType() string {
+	return "AWS::AuditManager::Assessment.Delegation"
+}
diff --git a/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_role.go b/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_role.go
new file mode 100644
index 0000000000..b8406e9a00
--- /dev/null
+++ b/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_role.go
@@ -0,0 +1,42 @@
+package auditmanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Assessment_Role AWS CloudFormation Resource (AWS::AuditManager::Assessment.Role)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-role.html
+type Assessment_Role struct {
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-role.html#cfn-auditmanager-assessment-role-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// RoleType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-role.html#cfn-auditmanager-assessment-role-roletype
+	RoleType *types.Value `json:"RoleType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Assessment_Role) AWSCloudFormationType() string {
+	return "AWS::AuditManager::Assessment.Role"
+}
diff --git a/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_scope.go b/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_scope.go
new file mode 100644
index 0000000000..ee425635a6
--- /dev/null
+++ b/goformation/cloudformation/auditmanager/aws-auditmanager-assessment_scope.go
@@ -0,0 +1,40 @@
+package auditmanager
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Assessment_Scope AWS CloudFormation Resource (AWS::AuditManager::Assessment.Scope)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-scope.html
+type Assessment_Scope struct {
+
+	// AwsAccounts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-scope.html#cfn-auditmanager-assessment-scope-awsaccounts
+	AwsAccounts []Assessment_AWSAccount `json:"AwsAccounts,omitempty"`
+
+	// AwsServices AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-auditmanager-assessment-scope.html#cfn-auditmanager-assessment-scope-awsservices
+	AwsServices []Assessment_AWSService `json:"AwsServices,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Assessment_Scope) AWSCloudFormationType() string {
+	return "AWS::AuditManager::Assessment.Scope"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup.go b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup.go
new file mode 100644
index 0000000000..57d6df0553
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup.go
@@ -0,0 +1,258 @@
+package autoscaling
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AutoScalingGroup AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html
+type AutoScalingGroup struct {
+
+	// AutoScalingGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-autoscaling-autoscalinggroup-autoscalinggroupname
+	AutoScalingGroupName *types.Value `json:"AutoScalingGroupName,omitempty"`
+
+	// AvailabilityZones AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-availabilityzones
+	AvailabilityZones *types.Value `json:"AvailabilityZones,omitempty"`
+
+	// CapacityRebalance AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-capacityrebalance
+	CapacityRebalance *types.Value `json:"CapacityRebalance,omitempty"`
+
+	// Context AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-context
+	Context *types.Value `json:"Context,omitempty"`
+
+	// Cooldown AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-cooldown
+	Cooldown *types.Value `json:"Cooldown,omitempty"`
+
+	// DesiredCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-desiredcapacity
+	DesiredCapacity *types.Value `json:"DesiredCapacity,omitempty"`
+
+	// DesiredCapacityType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-desiredcapacitytype
+	DesiredCapacityType *types.Value `json:"DesiredCapacityType,omitempty"`
+
+	// HealthCheckGracePeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-healthcheckgraceperiod
+	HealthCheckGracePeriod *types.Value `json:"HealthCheckGracePeriod,omitempty"`
+
+	// HealthCheckType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-healthchecktype
+	HealthCheckType *types.Value `json:"HealthCheckType,omitempty"`
+
+	// InstanceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-instanceid
+	InstanceId *types.Value `json:"InstanceId,omitempty"`
+
+	// LaunchConfigurationName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-launchconfigurationname
+	LaunchConfigurationName *types.Value `json:"LaunchConfigurationName,omitempty"`
+
+	// LaunchTemplate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-launchtemplate
+	LaunchTemplate *AutoScalingGroup_LaunchTemplateSpecification `json:"LaunchTemplate,omitempty"`
+
+	// LifecycleHookSpecificationList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-autoscaling-autoscalinggroup-lifecyclehookspecificationlist
+	LifecycleHookSpecificationList []AutoScalingGroup_LifecycleHookSpecification `json:"LifecycleHookSpecificationList,omitempty"`
+
+	// LoadBalancerNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-loadbalancernames
+	LoadBalancerNames *types.Value `json:"LoadBalancerNames,omitempty"`
+
+	// MaxInstanceLifetime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-maxinstancelifetime
+	MaxInstanceLifetime *types.Value `json:"MaxInstanceLifetime,omitempty"`
+
+	// MaxSize AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-maxsize
+	MaxSize *types.Value `json:"MaxSize,omitempty"`
+
+	// MetricsCollection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-metricscollection
+	MetricsCollection []AutoScalingGroup_MetricsCollection `json:"MetricsCollection,omitempty"`
+
+	// MinSize AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-minsize
+	MinSize *types.Value `json:"MinSize,omitempty"`
+
+	// MixedInstancesPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-mixedinstancespolicy
+	MixedInstancesPolicy *AutoScalingGroup_MixedInstancesPolicy `json:"MixedInstancesPolicy,omitempty"`
+
+	// NewInstancesProtectedFromScaleIn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-newinstancesprotectedfromscalein
+	NewInstancesProtectedFromScaleIn *types.Value `json:"NewInstancesProtectedFromScaleIn,omitempty"`
+
+	// NotificationConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-notificationconfigurations
+	NotificationConfigurations []AutoScalingGroup_NotificationConfiguration `json:"NotificationConfigurations,omitempty"`
+
+	// PlacementGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-placementgroup
+	PlacementGroup *types.Value `json:"PlacementGroup,omitempty"`
+
+	// ServiceLinkedRoleARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-autoscaling-autoscalinggroup-servicelinkedrolearn
+	ServiceLinkedRoleARN *types.Value `json:"ServiceLinkedRoleARN,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-tags
+	Tags []AutoScalingGroup_TagProperty `json:"Tags,omitempty"`
+
+	// TargetGroupARNs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-targetgrouparns
+	TargetGroupARNs *types.Value `json:"TargetGroupARNs,omitempty"`
+
+	// TerminationPolicies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-termpolicy
+	TerminationPolicies *types.Value `json:"TerminationPolicies,omitempty"`
+
+	// VPCZoneIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-group.html#cfn-as-group-vpczoneidentifier
+	VPCZoneIdentifier *types.Value `json:"VPCZoneIdentifier,omitempty"`
+
+	// AWSCloudFormationUpdatePolicy represents a CloudFormation UpdatePolicy
+	AWSCloudFormationUpdatePolicy *policies.UpdatePolicy `json:"-"`
+
+	// AWSCloudFormationCreationPolicy represents a CloudFormation CreationPolicy
+	AWSCloudFormationCreationPolicy *policies.CreationPolicy `json:"-"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AutoScalingGroup) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::AutoScalingGroup"
+}
+
+// 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 AutoScalingGroup) MarshalJSON() ([]byte, error) {
+	type Properties AutoScalingGroup
+	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"`
+		UpdatePolicy        *policies.UpdatePolicy       `json:"UpdatePolicy,omitempty"`
+		CreationPolicy      *policies.CreationPolicy     `json:"CreationPolicy,omitempty"`
+	}{
+		Type:                r.AWSCloudFormationType(),
+		Properties:          (Properties)(r),
+		DependsOn:           r.AWSCloudFormationDependsOn,
+		Metadata:            r.AWSCloudFormationMetadata,
+		DeletionPolicy:      r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition:           r.AWSCloudFormationCondition,
+		UpdatePolicy:        r.AWSCloudFormationUpdatePolicy,
+		CreationPolicy:      r.AWSCloudFormationCreationPolicy,
+	})
+}
+
+// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
+// AWS CloudFormation resource object, and just keeps the 'Properties' field.
+func (r *AutoScalingGroup) UnmarshalJSON(b []byte) error {
+	type Properties AutoScalingGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		Metadata            map[string]interface{}
+		DeletionPolicy      string
+		UpdateReplacePolicy string
+		Condition           string
+		UpdatePolicy        *policies.UpdatePolicy
+		CreationPolicy      *policies.CreationPolicy
+	}{}
+
+	dec := json.NewDecoder(bytes.NewReader(b))
+	dec.DisallowUnknownFields() // Force error if unknown field is found
+
+	if err := dec.Decode(&res); err != nil {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AutoScalingGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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
+	}
+	if res.UpdatePolicy != nil {
+		r.AWSCloudFormationUpdatePolicy = res.UpdatePolicy
+	}
+
+	if res.CreationPolicy != nil {
+		r.AWSCloudFormationCreationPolicy = res.CreationPolicy
+	}
+
+	return nil
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratorcountrequest.go b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratorcountrequest.go
new file mode 100644
index 0000000000..3a09e05666
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratorcountrequest.go
@@ -0,0 +1,42 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AutoScalingGroup_AcceleratorCountRequest AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.AcceleratorCountRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-acceleratorcountrequest.html
+type AutoScalingGroup_AcceleratorCountRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-acceleratorcountrequest.html#cfn-autoscaling-autoscalinggroup-acceleratorcountrequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-acceleratorcountrequest.html#cfn-autoscaling-autoscalinggroup-acceleratorcountrequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AutoScalingGroup_AcceleratorCountRequest) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::AutoScalingGroup.AcceleratorCountRequest"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratortotalmemorymibrequest.go b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratortotalmemorymibrequest.go
new file mode 100644
index 0000000000..8fb29ee733
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_acceleratortotalmemorymibrequest.go
@@ -0,0 +1,42 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AutoScalingGroup_AcceleratorTotalMemoryMiBRequest AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.AcceleratorTotalMemoryMiBRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-acceleratortotalmemorymibrequest.html
+type AutoScalingGroup_AcceleratorTotalMemoryMiBRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-acceleratortotalmemorymibrequest.html#cfn-autoscaling-autoscalinggroup-acceleratortotalmemorymibrequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-acceleratortotalmemorymibrequest.html#cfn-autoscaling-autoscalinggroup-acceleratortotalmemorymibrequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AutoScalingGroup_AcceleratorTotalMemoryMiBRequest) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::AutoScalingGroup.AcceleratorTotalMemoryMiBRequest"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_baselineebsbandwidthmbpsrequest.go b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_baselineebsbandwidthmbpsrequest.go
new file mode 100644
index 0000000000..48e46166b0
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_baselineebsbandwidthmbpsrequest.go
@@ -0,0 +1,42 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AutoScalingGroup_BaselineEbsBandwidthMbpsRequest AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.BaselineEbsBandwidthMbpsRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-baselineebsbandwidthmbpsrequest.html
+type AutoScalingGroup_BaselineEbsBandwidthMbpsRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-baselineebsbandwidthmbpsrequest.html#cfn-autoscaling-autoscalinggroup-baselineebsbandwidthmbpsrequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-baselineebsbandwidthmbpsrequest.html#cfn-autoscaling-autoscalinggroup-baselineebsbandwidthmbpsrequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AutoScalingGroup_BaselineEbsBandwidthMbpsRequest) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::AutoScalingGroup.BaselineEbsBandwidthMbpsRequest"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancerequirements.go b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancerequirements.go
new file mode 100644
index 0000000000..55e12753d5
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancerequirements.go
@@ -0,0 +1,137 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AutoScalingGroup_InstanceRequirements AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.InstanceRequirements)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html
+type AutoScalingGroup_InstanceRequirements struct {
+
+	// AcceleratorCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-acceleratorcount
+	AcceleratorCount *AutoScalingGroup_AcceleratorCountRequest `json:"AcceleratorCount,omitempty"`
+
+	// AcceleratorManufacturers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-acceleratormanufacturers
+	AcceleratorManufacturers *types.Value `json:"AcceleratorManufacturers,omitempty"`
+
+	// AcceleratorNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-acceleratornames
+	AcceleratorNames *types.Value `json:"AcceleratorNames,omitempty"`
+
+	// AcceleratorTotalMemoryMiB AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-acceleratortotalmemorymib
+	AcceleratorTotalMemoryMiB *AutoScalingGroup_AcceleratorTotalMemoryMiBRequest `json:"AcceleratorTotalMemoryMiB,omitempty"`
+
+	// AcceleratorTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-acceleratortypes
+	AcceleratorTypes *types.Value `json:"AcceleratorTypes,omitempty"`
+
+	// BareMetal AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-baremetal
+	BareMetal *types.Value `json:"BareMetal,omitempty"`
+
+	// BaselineEbsBandwidthMbps AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-baselineebsbandwidthmbps
+	BaselineEbsBandwidthMbps *AutoScalingGroup_BaselineEbsBandwidthMbpsRequest `json:"BaselineEbsBandwidthMbps,omitempty"`
+
+	// BurstablePerformance AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-burstableperformance
+	BurstablePerformance *types.Value `json:"BurstablePerformance,omitempty"`
+
+	// CpuManufacturers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-cpumanufacturers
+	CpuManufacturers *types.Value `json:"CpuManufacturers,omitempty"`
+
+	// ExcludedInstanceTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-excludedinstancetypes
+	ExcludedInstanceTypes *types.Value `json:"ExcludedInstanceTypes,omitempty"`
+
+	// InstanceGenerations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-instancegenerations
+	InstanceGenerations *types.Value `json:"InstanceGenerations,omitempty"`
+
+	// LocalStorage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-localstorage
+	LocalStorage *types.Value `json:"LocalStorage,omitempty"`
+
+	// LocalStorageTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-localstoragetypes
+	LocalStorageTypes *types.Value `json:"LocalStorageTypes,omitempty"`
+
+	// MemoryGiBPerVCpu AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-memorygibpervcpu
+	MemoryGiBPerVCpu *AutoScalingGroup_MemoryGiBPerVCpuRequest `json:"MemoryGiBPerVCpu,omitempty"`
+
+	// MemoryMiB AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-memorymib
+	MemoryMiB *AutoScalingGroup_MemoryMiBRequest `json:"MemoryMiB,omitempty"`
+
+	// NetworkInterfaceCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-networkinterfacecount
+	NetworkInterfaceCount *AutoScalingGroup_NetworkInterfaceCountRequest `json:"NetworkInterfaceCount,omitempty"`
+
+	// OnDemandMaxPricePercentageOverLowestPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-ondemandmaxpricepercentageoverlowestprice
+	OnDemandMaxPricePercentageOverLowestPrice *types.Value `json:"OnDemandMaxPricePercentageOverLowestPrice,omitempty"`
+
+	// RequireHibernateSupport AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-requirehibernatesupport
+	RequireHibernateSupport *types.Value `json:"RequireHibernateSupport,omitempty"`
+
+	// SpotMaxPricePercentageOverLowestPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-spotmaxpricepercentageoverlowestprice
+	SpotMaxPricePercentageOverLowestPrice *types.Value `json:"SpotMaxPricePercentageOverLowestPrice,omitempty"`
+
+	// TotalLocalStorageGB AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-totallocalstoragegb
+	TotalLocalStorageGB *AutoScalingGroup_TotalLocalStorageGBRequest `json:"TotalLocalStorageGB,omitempty"`
+
+	// VCpuCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancerequirements.html#cfn-autoscaling-autoscalinggroup-instancerequirements-vcpucount
+	VCpuCount *AutoScalingGroup_VCpuCountRequest `json:"VCpuCount,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AutoScalingGroup_InstanceRequirements) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::AutoScalingGroup.InstanceRequirements"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancesdistribution.go b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancesdistribution.go
new file mode 100644
index 0000000000..79abdb06f0
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_instancesdistribution.go
@@ -0,0 +1,62 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AutoScalingGroup_InstancesDistribution AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.InstancesDistribution)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancesdistribution.html
+type AutoScalingGroup_InstancesDistribution struct {
+
+	// OnDemandAllocationStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancesdistribution.html#cfn-autoscaling-autoscalinggroup-instancesdistribution-ondemandallocationstrategy
+	OnDemandAllocationStrategy *types.Value `json:"OnDemandAllocationStrategy,omitempty"`
+
+	// OnDemandBaseCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancesdistribution.html#cfn-autoscaling-autoscalinggroup-instancesdistribution-ondemandbasecapacity
+	OnDemandBaseCapacity *types.Value `json:"OnDemandBaseCapacity,omitempty"`
+
+	// OnDemandPercentageAboveBaseCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancesdistribution.html#cfn-autoscaling-autoscalinggroup-instancesdistribution-ondemandpercentageabovebasecapacity
+	OnDemandPercentageAboveBaseCapacity *types.Value `json:"OnDemandPercentageAboveBaseCapacity,omitempty"`
+
+	// SpotAllocationStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancesdistribution.html#cfn-autoscaling-autoscalinggroup-instancesdistribution-spotallocationstrategy
+	SpotAllocationStrategy *types.Value `json:"SpotAllocationStrategy,omitempty"`
+
+	// SpotInstancePools AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancesdistribution.html#cfn-autoscaling-autoscalinggroup-instancesdistribution-spotinstancepools
+	SpotInstancePools *types.Value `json:"SpotInstancePools,omitempty"`
+
+	// SpotMaxPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-instancesdistribution.html#cfn-autoscaling-autoscalinggroup-instancesdistribution-spotmaxprice
+	SpotMaxPrice *types.Value `json:"SpotMaxPrice,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AutoScalingGroup_InstancesDistribution) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::AutoScalingGroup.InstancesDistribution"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplate.go b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplate.go
new file mode 100644
index 0000000000..d00bdba5d6
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplate.go
@@ -0,0 +1,40 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// AutoScalingGroup_LaunchTemplate AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.LaunchTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-launchtemplate.html
+type AutoScalingGroup_LaunchTemplate struct {
+
+	// LaunchTemplateSpecification AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-launchtemplate.html#cfn-as-group-launchtemplate
+	LaunchTemplateSpecification *AutoScalingGroup_LaunchTemplateSpecification `json:"LaunchTemplateSpecification,omitempty"`
+
+	// Overrides AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-launchtemplate.html#cfn-as-mixedinstancespolicy-overrides
+	Overrides []AutoScalingGroup_LaunchTemplateOverrides `json:"Overrides,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AutoScalingGroup_LaunchTemplate) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::AutoScalingGroup.LaunchTemplate"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplateoverrides.go b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplateoverrides.go
new file mode 100644
index 0000000000..ddf624b1d8
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplateoverrides.go
@@ -0,0 +1,52 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AutoScalingGroup_LaunchTemplateOverrides AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.LaunchTemplateOverrides)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-launchtemplateoverrides.html
+type AutoScalingGroup_LaunchTemplateOverrides struct {
+
+	// InstanceRequirements AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-launchtemplateoverrides.html#cfn-as-mixedinstancespolicy-instancerequirements
+	InstanceRequirements *AutoScalingGroup_InstanceRequirements `json:"InstanceRequirements,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-launchtemplateoverrides.html#cfn-autoscaling-autoscalinggroup-launchtemplateoverrides-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// LaunchTemplateSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-launchtemplateoverrides.html#cfn-autoscaling-autoscalinggroup-launchtemplateoverrides-launchtemplatespecification
+	LaunchTemplateSpecification *AutoScalingGroup_LaunchTemplateSpecification `json:"LaunchTemplateSpecification,omitempty"`
+
+	// WeightedCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-mixedinstancespolicy-launchtemplateoverrides.html#cfn-autoscaling-autoscalinggroup-launchtemplateoverrides-weightedcapacity
+	WeightedCapacity *types.Value `json:"WeightedCapacity,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AutoScalingGroup_LaunchTemplateOverrides) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::AutoScalingGroup.LaunchTemplateOverrides"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplatespecification.go b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplatespecification.go
new file mode 100644
index 0000000000..bb01fd67fa
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_launchtemplatespecification.go
@@ -0,0 +1,47 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AutoScalingGroup_LaunchTemplateSpecification AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.LaunchTemplateSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-launchtemplatespecification.html
+type AutoScalingGroup_LaunchTemplateSpecification struct {
+
+	// LaunchTemplateId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-launchtemplatespecification.html#cfn-autoscaling-autoscalinggroup-launchtemplatespecification-launchtemplateid
+	LaunchTemplateId *types.Value `json:"LaunchTemplateId,omitempty"`
+
+	// LaunchTemplateName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-launchtemplatespecification.html#cfn-autoscaling-autoscalinggroup-launchtemplatespecification-launchtemplatename
+	LaunchTemplateName *types.Value `json:"LaunchTemplateName,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-launchtemplatespecification.html#cfn-autoscaling-autoscalinggroup-launchtemplatespecification-version
+	Version *types.Value `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 *AutoScalingGroup_LaunchTemplateSpecification) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::AutoScalingGroup.LaunchTemplateSpecification"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_lifecyclehookspecification.go b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_lifecyclehookspecification.go
new file mode 100644
index 0000000000..f31817caf9
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_lifecyclehookspecification.go
@@ -0,0 +1,67 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AutoScalingGroup_LifecycleHookSpecification AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.LifecycleHookSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-lifecyclehookspecification.html
+type AutoScalingGroup_LifecycleHookSpecification struct {
+
+	// DefaultResult AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-lifecyclehookspecification.html#cfn-autoscaling-autoscalinggroup-lifecyclehookspecification-defaultresult
+	DefaultResult *types.Value `json:"DefaultResult,omitempty"`
+
+	// HeartbeatTimeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-lifecyclehookspecification.html#cfn-autoscaling-autoscalinggroup-lifecyclehookspecification-heartbeattimeout
+	HeartbeatTimeout *types.Value `json:"HeartbeatTimeout,omitempty"`
+
+	// LifecycleHookName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-lifecyclehookspecification.html#cfn-autoscaling-autoscalinggroup-lifecyclehookspecification-lifecyclehookname
+	LifecycleHookName *types.Value `json:"LifecycleHookName,omitempty"`
+
+	// LifecycleTransition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-lifecyclehookspecification.html#cfn-autoscaling-autoscalinggroup-lifecyclehookspecification-lifecycletransition
+	LifecycleTransition *types.Value `json:"LifecycleTransition,omitempty"`
+
+	// NotificationMetadata AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-lifecyclehookspecification.html#cfn-autoscaling-autoscalinggroup-lifecyclehookspecification-notificationmetadata
+	NotificationMetadata *types.Value `json:"NotificationMetadata,omitempty"`
+
+	// NotificationTargetARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-lifecyclehookspecification.html#cfn-autoscaling-autoscalinggroup-lifecyclehookspecification-notificationtargetarn
+	NotificationTargetARN *types.Value `json:"NotificationTargetARN,omitempty"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-lifecyclehookspecification.html#cfn-autoscaling-autoscalinggroup-lifecyclehookspecification-rolearn
+	RoleARN *types.Value `json:"RoleARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AutoScalingGroup_LifecycleHookSpecification) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::AutoScalingGroup.LifecycleHookSpecification"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorygibpervcpurequest.go b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorygibpervcpurequest.go
new file mode 100644
index 0000000000..4ad05e3cdd
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorygibpervcpurequest.go
@@ -0,0 +1,42 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AutoScalingGroup_MemoryGiBPerVCpuRequest AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.MemoryGiBPerVCpuRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-memorygibpervcpurequest.html
+type AutoScalingGroup_MemoryGiBPerVCpuRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-memorygibpervcpurequest.html#cfn-autoscaling-autoscalinggroup-memorygibpervcpurequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-memorygibpervcpurequest.html#cfn-autoscaling-autoscalinggroup-memorygibpervcpurequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AutoScalingGroup_MemoryGiBPerVCpuRequest) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::AutoScalingGroup.MemoryGiBPerVCpuRequest"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorymibrequest.go b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorymibrequest.go
new file mode 100644
index 0000000000..39663b8282
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_memorymibrequest.go
@@ -0,0 +1,42 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AutoScalingGroup_MemoryMiBRequest AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.MemoryMiBRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-memorymibrequest.html
+type AutoScalingGroup_MemoryMiBRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-memorymibrequest.html#cfn-autoscaling-autoscalinggroup-memorymibrequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-memorymibrequest.html#cfn-autoscaling-autoscalinggroup-memorymibrequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AutoScalingGroup_MemoryMiBRequest) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::AutoScalingGroup.MemoryMiBRequest"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_metricscollection.go b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_metricscollection.go
new file mode 100644
index 0000000000..c60ddc3778
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_metricscollection.go
@@ -0,0 +1,42 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AutoScalingGroup_MetricsCollection AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.MetricsCollection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-metricscollection.html
+type AutoScalingGroup_MetricsCollection struct {
+
+	// Granularity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-metricscollection.html#cfn-as-metricscollection-granularity
+	Granularity *types.Value `json:"Granularity,omitempty"`
+
+	// Metrics AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-metricscollection.html#cfn-as-metricscollection-metrics
+	Metrics *types.Value `json:"Metrics,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AutoScalingGroup_MetricsCollection) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::AutoScalingGroup.MetricsCollection"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_mixedinstancespolicy.go b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_mixedinstancespolicy.go
new file mode 100644
index 0000000000..5d56cac0d9
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_mixedinstancespolicy.go
@@ -0,0 +1,40 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// AutoScalingGroup_MixedInstancesPolicy AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.MixedInstancesPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-group-mixedinstancespolicy.html
+type AutoScalingGroup_MixedInstancesPolicy struct {
+
+	// InstancesDistribution AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-group-mixedinstancespolicy.html#cfn-as-mixedinstancespolicy-instancesdistribution
+	InstancesDistribution *AutoScalingGroup_InstancesDistribution `json:"InstancesDistribution,omitempty"`
+
+	// LaunchTemplate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-as-group-mixedinstancespolicy.html#cfn-as-mixedinstancespolicy-launchtemplate
+	LaunchTemplate *AutoScalingGroup_LaunchTemplate `json:"LaunchTemplate,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AutoScalingGroup_MixedInstancesPolicy) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::AutoScalingGroup.MixedInstancesPolicy"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_networkinterfacecountrequest.go b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_networkinterfacecountrequest.go
new file mode 100644
index 0000000000..420939cf82
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_networkinterfacecountrequest.go
@@ -0,0 +1,42 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AutoScalingGroup_NetworkInterfaceCountRequest AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.NetworkInterfaceCountRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-networkinterfacecountrequest.html
+type AutoScalingGroup_NetworkInterfaceCountRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-networkinterfacecountrequest.html#cfn-autoscaling-autoscalinggroup-networkinterfacecountrequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-networkinterfacecountrequest.html#cfn-autoscaling-autoscalinggroup-networkinterfacecountrequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AutoScalingGroup_NetworkInterfaceCountRequest) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::AutoScalingGroup.NetworkInterfaceCountRequest"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_notificationconfiguration.go b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_notificationconfiguration.go
new file mode 100644
index 0000000000..b21c669ff7
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_notificationconfiguration.go
@@ -0,0 +1,42 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AutoScalingGroup_NotificationConfiguration AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.NotificationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-notificationconfigurations.html
+type AutoScalingGroup_NotificationConfiguration struct {
+
+	// NotificationTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-notificationconfigurations.html#cfn-as-group-notificationconfigurations-notificationtypes
+	NotificationTypes *types.Value `json:"NotificationTypes,omitempty"`
+
+	// TopicARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-notificationconfigurations.html#cfn-autoscaling-autoscalinggroup-notificationconfigurations-topicarn
+	TopicARN *types.Value `json:"TopicARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AutoScalingGroup_NotificationConfiguration) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::AutoScalingGroup.NotificationConfiguration"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_tagproperty.go b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_tagproperty.go
new file mode 100644
index 0000000000..a7777ff135
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_tagproperty.go
@@ -0,0 +1,47 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AutoScalingGroup_TagProperty AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.TagProperty)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-tags.html
+type AutoScalingGroup_TagProperty struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-tags.html#cfn-as-tags-Key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// PropagateAtLaunch AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-tags.html#cfn-as-tags-PropagateAtLaunch
+	PropagateAtLaunch *types.Value `json:"PropagateAtLaunch"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-tags.html#cfn-as-tags-Value
+	Value *types.Value `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 *AutoScalingGroup_TagProperty) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::AutoScalingGroup.TagProperty"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_totallocalstoragegbrequest.go b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_totallocalstoragegbrequest.go
new file mode 100644
index 0000000000..ac30e575ed
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_totallocalstoragegbrequest.go
@@ -0,0 +1,42 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AutoScalingGroup_TotalLocalStorageGBRequest AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.TotalLocalStorageGBRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-totallocalstoragegbrequest.html
+type AutoScalingGroup_TotalLocalStorageGBRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-totallocalstoragegbrequest.html#cfn-autoscaling-autoscalinggroup-totallocalstoragegbrequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-totallocalstoragegbrequest.html#cfn-autoscaling-autoscalinggroup-totallocalstoragegbrequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AutoScalingGroup_TotalLocalStorageGBRequest) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::AutoScalingGroup.TotalLocalStorageGBRequest"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_vcpucountrequest.go b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_vcpucountrequest.go
new file mode 100644
index 0000000000..e6c6668670
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-autoscalinggroup_vcpucountrequest.go
@@ -0,0 +1,42 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AutoScalingGroup_VCpuCountRequest AWS CloudFormation Resource (AWS::AutoScaling::AutoScalingGroup.VCpuCountRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-vcpucountrequest.html
+type AutoScalingGroup_VCpuCountRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-vcpucountrequest.html#cfn-autoscaling-autoscalinggroup-vcpucountrequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-autoscalinggroup-vcpucountrequest.html#cfn-autoscaling-autoscalinggroup-vcpucountrequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AutoScalingGroup_VCpuCountRequest) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::AutoScalingGroup.VCpuCountRequest"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration.go b/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration.go
new file mode 100644
index 0000000000..8eb5e4b53a
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration.go
@@ -0,0 +1,198 @@
+package autoscaling
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchConfiguration AWS CloudFormation Resource (AWS::AutoScaling::LaunchConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html
+type LaunchConfiguration struct {
+
+	// AssociatePublicIpAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cf-as-launchconfig-associatepubip
+	AssociatePublicIpAddress *types.Value `json:"AssociatePublicIpAddress,omitempty"`
+
+	// BlockDeviceMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-blockdevicemappings
+	BlockDeviceMappings []LaunchConfiguration_BlockDeviceMapping `json:"BlockDeviceMappings,omitempty"`
+
+	// ClassicLinkVPCId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-classiclinkvpcid
+	ClassicLinkVPCId *types.Value `json:"ClassicLinkVPCId,omitempty"`
+
+	// ClassicLinkVPCSecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-classiclinkvpcsecuritygroups
+	ClassicLinkVPCSecurityGroups *types.Value `json:"ClassicLinkVPCSecurityGroups,omitempty"`
+
+	// EbsOptimized AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-ebsoptimized
+	EbsOptimized *types.Value `json:"EbsOptimized,omitempty"`
+
+	// IamInstanceProfile AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-iaminstanceprofile
+	IamInstanceProfile *types.Value `json:"IamInstanceProfile,omitempty"`
+
+	// ImageId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-imageid
+	ImageId *types.Value `json:"ImageId,omitempty"`
+
+	// InstanceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-instanceid
+	InstanceId *types.Value `json:"InstanceId,omitempty"`
+
+	// InstanceMonitoring AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-instancemonitoring
+	InstanceMonitoring *types.Value `json:"InstanceMonitoring,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// KernelId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-kernelid
+	KernelId *types.Value `json:"KernelId,omitempty"`
+
+	// KeyName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-keyname
+	KeyName *types.Value `json:"KeyName,omitempty"`
+
+	// LaunchConfigurationName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-autoscaling-launchconfig-launchconfigurationname
+	LaunchConfigurationName *types.Value `json:"LaunchConfigurationName,omitempty"`
+
+	// MetadataOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-autoscaling-launchconfig-metadataoptions
+	MetadataOptions *LaunchConfiguration_MetadataOptions `json:"MetadataOptions,omitempty"`
+
+	// PlacementTenancy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-placementtenancy
+	PlacementTenancy *types.Value `json:"PlacementTenancy,omitempty"`
+
+	// RamDiskId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-ramdiskid
+	RamDiskId *types.Value `json:"RamDiskId,omitempty"`
+
+	// SecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-securitygroups
+	SecurityGroups *types.Value `json:"SecurityGroups,omitempty"`
+
+	// SpotPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-spotprice
+	SpotPrice *types.Value `json:"SpotPrice,omitempty"`
+
+	// UserData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig.html#cfn-as-launchconfig-userdata
+	UserData *types.Value `json:"UserData,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchConfiguration) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::LaunchConfiguration"
+}
+
+// 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 LaunchConfiguration) MarshalJSON() ([]byte, error) {
+	type Properties LaunchConfiguration
+	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 *LaunchConfiguration) UnmarshalJSON(b []byte) error {
+	type Properties LaunchConfiguration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LaunchConfiguration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevice.go b/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevice.go
new file mode 100644
index 0000000000..17453ace81
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevice.go
@@ -0,0 +1,67 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchConfiguration_BlockDevice AWS CloudFormation Resource (AWS::AutoScaling::LaunchConfiguration.BlockDevice)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-template.html
+type LaunchConfiguration_BlockDevice struct {
+
+	// DeleteOnTermination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-template.html#cfn-as-launchconfig-blockdev-template-deleteonterm
+	DeleteOnTermination *types.Value `json:"DeleteOnTermination,omitempty"`
+
+	// Encrypted AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-template.html#cfn-as-launchconfig-blockdev-template-encrypted
+	Encrypted *types.Value `json:"Encrypted,omitempty"`
+
+	// Iops AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-template.html#cfn-as-launchconfig-blockdev-template-iops
+	Iops *types.Value `json:"Iops,omitempty"`
+
+	// SnapshotId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-template.html#cfn-as-launchconfig-blockdev-template-snapshotid
+	SnapshotId *types.Value `json:"SnapshotId,omitempty"`
+
+	// Throughput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-template.html#cfn-as-launchconfig-blockdev-template-throughput
+	Throughput *types.Value `json:"Throughput,omitempty"`
+
+	// VolumeSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-template.html#cfn-as-launchconfig-blockdev-template-volumesize
+	VolumeSize *types.Value `json:"VolumeSize,omitempty"`
+
+	// VolumeType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-template.html#cfn-as-launchconfig-blockdev-template-volumetype
+	VolumeType *types.Value `json:"VolumeType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchConfiguration_BlockDevice) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::LaunchConfiguration.BlockDevice"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevicemapping.go b/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevicemapping.go
new file mode 100644
index 0000000000..64706d3fc9
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_blockdevicemapping.go
@@ -0,0 +1,52 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchConfiguration_BlockDeviceMapping AWS CloudFormation Resource (AWS::AutoScaling::LaunchConfiguration.BlockDeviceMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-mapping.html
+type LaunchConfiguration_BlockDeviceMapping struct {
+
+	// DeviceName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-mapping.html#cfn-as-launchconfig-blockdev-mapping-devicename
+	DeviceName *types.Value `json:"DeviceName,omitempty"`
+
+	// Ebs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-mapping.html#cfn-as-launchconfig-blockdev-mapping-ebs
+	Ebs *LaunchConfiguration_BlockDevice `json:"Ebs,omitempty"`
+
+	// NoDevice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-mapping.html#cfn-as-launchconfig-blockdev-mapping-nodevice
+	NoDevice *types.Value `json:"NoDevice,omitempty"`
+
+	// VirtualName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-launchconfig-blockdev-mapping.html#cfn-as-launchconfig-blockdev-mapping-virtualname
+	VirtualName *types.Value `json:"VirtualName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchConfiguration_BlockDeviceMapping) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::LaunchConfiguration.BlockDeviceMapping"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoption.go b/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoption.go
new file mode 100644
index 0000000000..731a3584a6
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoption.go
@@ -0,0 +1,47 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchConfiguration_MetadataOption AWS CloudFormation Resource (AWS::AutoScaling::LaunchConfiguration.MetadataOption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-launchconfig-metadataoption.html
+type LaunchConfiguration_MetadataOption struct {
+
+	// HttpEndpoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-launchconfig-metadataoption.html#cfn-autoscaling-launchconfig-metadataoption-httpendpoint
+	HttpEndpoint *types.Value `json:"HttpEndpoint,omitempty"`
+
+	// HttpPutResponseHopLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-launchconfig-metadataoption.html#cfn-autoscaling-launchconfig-metadataoption-httpputresponsehoplimit
+	HttpPutResponseHopLimit *types.Value `json:"HttpPutResponseHopLimit,omitempty"`
+
+	// HttpTokens AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-launchconfig-metadataoption.html#cfn-autoscaling-launchconfig-metadataoption-httptokens
+	HttpTokens *types.Value `json:"HttpTokens,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchConfiguration_MetadataOption) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::LaunchConfiguration.MetadataOption"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoptions.go b/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoptions.go
new file mode 100644
index 0000000000..1b7d6bbdab
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-launchconfiguration_metadataoptions.go
@@ -0,0 +1,47 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchConfiguration_MetadataOptions AWS CloudFormation Resource (AWS::AutoScaling::LaunchConfiguration.MetadataOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-launchconfig-metadataoptions.html
+type LaunchConfiguration_MetadataOptions struct {
+
+	// HttpEndpoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-launchconfig-metadataoptions.html#cfn-autoscaling-launchconfig-metadataoptions-httpendpoint
+	HttpEndpoint *types.Value `json:"HttpEndpoint,omitempty"`
+
+	// HttpPutResponseHopLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-launchconfig-metadataoptions.html#cfn-autoscaling-launchconfig-metadataoptions-httpputresponsehoplimit
+	HttpPutResponseHopLimit *types.Value `json:"HttpPutResponseHopLimit,omitempty"`
+
+	// HttpTokens AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-launchconfig-metadataoptions.html#cfn-autoscaling-launchconfig-metadataoptions-httptokens
+	HttpTokens *types.Value `json:"HttpTokens,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchConfiguration_MetadataOptions) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::LaunchConfiguration.MetadataOptions"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-lifecyclehook.go b/goformation/cloudformation/autoscaling/aws-autoscaling-lifecyclehook.go
new file mode 100644
index 0000000000..bc9841b5fa
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-lifecyclehook.go
@@ -0,0 +1,143 @@
+package autoscaling
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LifecycleHook AWS CloudFormation Resource (AWS::AutoScaling::LifecycleHook)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-lifecyclehook.html
+type LifecycleHook struct {
+
+	// AutoScalingGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-lifecyclehook.html#cfn-autoscaling-lifecyclehook-autoscalinggroupname
+	AutoScalingGroupName *types.Value `json:"AutoScalingGroupName,omitempty"`
+
+	// DefaultResult AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-lifecyclehook.html#cfn-autoscaling-lifecyclehook-defaultresult
+	DefaultResult *types.Value `json:"DefaultResult,omitempty"`
+
+	// HeartbeatTimeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-lifecyclehook.html#cfn-autoscaling-lifecyclehook-heartbeattimeout
+	HeartbeatTimeout *types.Value `json:"HeartbeatTimeout,omitempty"`
+
+	// LifecycleHookName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-lifecyclehook.html#cfn-autoscaling-lifecyclehook-lifecyclehookname
+	LifecycleHookName *types.Value `json:"LifecycleHookName,omitempty"`
+
+	// LifecycleTransition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-lifecyclehook.html#cfn-autoscaling-lifecyclehook-lifecycletransition
+	LifecycleTransition *types.Value `json:"LifecycleTransition,omitempty"`
+
+	// NotificationMetadata AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-lifecyclehook.html#cfn-autoscaling-lifecyclehook-notificationmetadata
+	NotificationMetadata *types.Value `json:"NotificationMetadata,omitempty"`
+
+	// NotificationTargetARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-lifecyclehook.html#cfn-autoscaling-lifecyclehook-notificationtargetarn
+	NotificationTargetARN *types.Value `json:"NotificationTargetARN,omitempty"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-lifecyclehook.html#cfn-autoscaling-lifecyclehook-rolearn
+	RoleARN *types.Value `json:"RoleARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LifecycleHook) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::LifecycleHook"
+}
+
+// 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 LifecycleHook) MarshalJSON() ([]byte, error) {
+	type Properties LifecycleHook
+	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 *LifecycleHook) UnmarshalJSON(b []byte) error {
+	type Properties LifecycleHook
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LifecycleHook(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy.go b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy.go
new file mode 100644
index 0000000000..2362d12fd4
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy.go
@@ -0,0 +1,158 @@
+package autoscaling
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPolicy AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html
+type ScalingPolicy struct {
+
+	// AdjustmentType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-as-scalingpolicy-adjustmenttype
+	AdjustmentType *types.Value `json:"AdjustmentType,omitempty"`
+
+	// AutoScalingGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-as-scalingpolicy-autoscalinggroupname
+	AutoScalingGroupName *types.Value `json:"AutoScalingGroupName,omitempty"`
+
+	// Cooldown AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-as-scalingpolicy-cooldown
+	Cooldown *types.Value `json:"Cooldown,omitempty"`
+
+	// EstimatedInstanceWarmup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-as-scalingpolicy-estimatedinstancewarmup
+	EstimatedInstanceWarmup *types.Value `json:"EstimatedInstanceWarmup,omitempty"`
+
+	// MetricAggregationType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-as-scalingpolicy-metricaggregationtype
+	MetricAggregationType *types.Value `json:"MetricAggregationType,omitempty"`
+
+	// MinAdjustmentMagnitude AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-as-scalingpolicy-minadjustmentmagnitude
+	MinAdjustmentMagnitude *types.Value `json:"MinAdjustmentMagnitude,omitempty"`
+
+	// PolicyType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-as-scalingpolicy-policytype
+	PolicyType *types.Value `json:"PolicyType,omitempty"`
+
+	// PredictiveScalingConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-autoscaling-scalingpolicy-predictivescalingconfiguration
+	PredictiveScalingConfiguration *ScalingPolicy_PredictiveScalingConfiguration `json:"PredictiveScalingConfiguration,omitempty"`
+
+	// ScalingAdjustment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-as-scalingpolicy-scalingadjustment
+	ScalingAdjustment *types.Value `json:"ScalingAdjustment,omitempty"`
+
+	// StepAdjustments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-as-scalingpolicy-stepadjustments
+	StepAdjustments []ScalingPolicy_StepAdjustment `json:"StepAdjustments,omitempty"`
+
+	// TargetTrackingConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-as-policy.html#cfn-autoscaling-scalingpolicy-targettrackingconfiguration
+	TargetTrackingConfiguration *ScalingPolicy_TargetTrackingConfiguration `json:"TargetTrackingConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::ScalingPolicy"
+}
+
+// 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 ScalingPolicy) MarshalJSON() ([]byte, error) {
+	type Properties ScalingPolicy
+	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 *ScalingPolicy) UnmarshalJSON(b []byte) error {
+	type Properties ScalingPolicy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ScalingPolicy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_customizedmetricspecification.go b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_customizedmetricspecification.go
new file mode 100644
index 0000000000..2f6676da8a
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_customizedmetricspecification.go
@@ -0,0 +1,57 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPolicy_CustomizedMetricSpecification AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.CustomizedMetricSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-customizedmetricspecification.html
+type ScalingPolicy_CustomizedMetricSpecification struct {
+
+	// Dimensions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-customizedmetricspecification.html#cfn-autoscaling-scalingpolicy-customizedmetricspecification-dimensions
+	Dimensions []ScalingPolicy_MetricDimension `json:"Dimensions,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-customizedmetricspecification.html#cfn-autoscaling-scalingpolicy-customizedmetricspecification-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// Namespace AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-customizedmetricspecification.html#cfn-autoscaling-scalingpolicy-customizedmetricspecification-namespace
+	Namespace *types.Value `json:"Namespace,omitempty"`
+
+	// Statistic AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-customizedmetricspecification.html#cfn-autoscaling-scalingpolicy-customizedmetricspecification-statistic
+	Statistic *types.Value `json:"Statistic,omitempty"`
+
+	// Unit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-customizedmetricspecification.html#cfn-autoscaling-scalingpolicy-customizedmetricspecification-unit
+	Unit *types.Value `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_CustomizedMetricSpecification) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::ScalingPolicy.CustomizedMetricSpecification"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_metricdimension.go b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_metricdimension.go
new file mode 100644
index 0000000000..952d436840
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_metricdimension.go
@@ -0,0 +1,42 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPolicy_MetricDimension AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.MetricDimension)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-metricdimension.html
+type ScalingPolicy_MetricDimension struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-metricdimension.html#cfn-autoscaling-scalingpolicy-metricdimension-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-metricdimension.html#cfn-autoscaling-scalingpolicy-metricdimension-value
+	Value *types.Value `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 *ScalingPolicy_MetricDimension) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::ScalingPolicy.MetricDimension"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predefinedmetricspecification.go b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predefinedmetricspecification.go
new file mode 100644
index 0000000000..6fb1819d99
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predefinedmetricspecification.go
@@ -0,0 +1,42 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPolicy_PredefinedMetricSpecification AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.PredefinedMetricSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predefinedmetricspecification.html
+type ScalingPolicy_PredefinedMetricSpecification struct {
+
+	// PredefinedMetricType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predefinedmetricspecification.html#cfn-autoscaling-scalingpolicy-predefinedmetricspecification-predefinedmetrictype
+	PredefinedMetricType *types.Value `json:"PredefinedMetricType,omitempty"`
+
+	// ResourceLabel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predefinedmetricspecification.html#cfn-autoscaling-scalingpolicy-predefinedmetricspecification-resourcelabel
+	ResourceLabel *types.Value `json:"ResourceLabel,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PredefinedMetricSpecification) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::ScalingPolicy.PredefinedMetricSpecification"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingconfiguration.go b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingconfiguration.go
new file mode 100644
index 0000000000..d76681e44e
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingconfiguration.go
@@ -0,0 +1,57 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPolicy_PredictiveScalingConfiguration AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.PredictiveScalingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predictivescalingconfiguration.html
+type ScalingPolicy_PredictiveScalingConfiguration struct {
+
+	// MaxCapacityBreachBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predictivescalingconfiguration.html#cfn-autoscaling-scalingpolicy-predictivescalingconfiguration-maxcapacitybreachbehavior
+	MaxCapacityBreachBehavior *types.Value `json:"MaxCapacityBreachBehavior,omitempty"`
+
+	// MaxCapacityBuffer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predictivescalingconfiguration.html#cfn-autoscaling-scalingpolicy-predictivescalingconfiguration-maxcapacitybuffer
+	MaxCapacityBuffer *types.Value `json:"MaxCapacityBuffer,omitempty"`
+
+	// MetricSpecifications AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predictivescalingconfiguration.html#cfn-autoscaling-scalingpolicy-predictivescalingconfiguration-metricspecifications
+	MetricSpecifications []ScalingPolicy_PredictiveScalingMetricSpecification `json:"MetricSpecifications,omitempty"`
+
+	// Mode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predictivescalingconfiguration.html#cfn-autoscaling-scalingpolicy-predictivescalingconfiguration-mode
+	Mode *types.Value `json:"Mode,omitempty"`
+
+	// SchedulingBufferTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predictivescalingconfiguration.html#cfn-autoscaling-scalingpolicy-predictivescalingconfiguration-schedulingbuffertime
+	SchedulingBufferTime *types.Value `json:"SchedulingBufferTime,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PredictiveScalingConfiguration) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::ScalingPolicy.PredictiveScalingConfiguration"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingmetricspecification.go b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingmetricspecification.go
new file mode 100644
index 0000000000..069ccf4f2f
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingmetricspecification.go
@@ -0,0 +1,52 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPolicy_PredictiveScalingMetricSpecification AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.PredictiveScalingMetricSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predictivescalingmetricspecification.html
+type ScalingPolicy_PredictiveScalingMetricSpecification struct {
+
+	// PredefinedLoadMetricSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predictivescalingmetricspecification.html#cfn-autoscaling-scalingpolicy-predictivescalingmetricspecification-predefinedloadmetricspecification
+	PredefinedLoadMetricSpecification *ScalingPolicy_PredictiveScalingPredefinedLoadMetric `json:"PredefinedLoadMetricSpecification,omitempty"`
+
+	// PredefinedMetricPairSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predictivescalingmetricspecification.html#cfn-autoscaling-scalingpolicy-predictivescalingmetricspecification-predefinedmetricpairspecification
+	PredefinedMetricPairSpecification *ScalingPolicy_PredictiveScalingPredefinedMetricPair `json:"PredefinedMetricPairSpecification,omitempty"`
+
+	// PredefinedScalingMetricSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predictivescalingmetricspecification.html#cfn-autoscaling-scalingpolicy-predictivescalingmetricspecification-predefinedscalingmetricspecification
+	PredefinedScalingMetricSpecification *ScalingPolicy_PredictiveScalingPredefinedScalingMetric `json:"PredefinedScalingMetricSpecification,omitempty"`
+
+	// TargetValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predictivescalingmetricspecification.html#cfn-autoscaling-scalingpolicy-predictivescalingmetricspecification-targetvalue
+	TargetValue *types.Value `json:"TargetValue"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PredictiveScalingMetricSpecification) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::ScalingPolicy.PredictiveScalingMetricSpecification"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedloadmetric.go b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedloadmetric.go
new file mode 100644
index 0000000000..55ac20f821
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedloadmetric.go
@@ -0,0 +1,42 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPolicy_PredictiveScalingPredefinedLoadMetric AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedLoadMetric)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predictivescalingpredefinedloadmetric.html
+type ScalingPolicy_PredictiveScalingPredefinedLoadMetric struct {
+
+	// PredefinedMetricType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predictivescalingpredefinedloadmetric.html#cfn-autoscaling-scalingpolicy-predictivescalingpredefinedloadmetric-predefinedmetrictype
+	PredefinedMetricType *types.Value `json:"PredefinedMetricType,omitempty"`
+
+	// ResourceLabel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predictivescalingpredefinedloadmetric.html#cfn-autoscaling-scalingpolicy-predictivescalingpredefinedloadmetric-resourcelabel
+	ResourceLabel *types.Value `json:"ResourceLabel,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PredictiveScalingPredefinedLoadMetric) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedLoadMetric"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedmetricpair.go b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedmetricpair.go
new file mode 100644
index 0000000000..295c868d2f
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedmetricpair.go
@@ -0,0 +1,42 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPolicy_PredictiveScalingPredefinedMetricPair AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedMetricPair)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predictivescalingpredefinedmetricpair.html
+type ScalingPolicy_PredictiveScalingPredefinedMetricPair struct {
+
+	// PredefinedMetricType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predictivescalingpredefinedmetricpair.html#cfn-autoscaling-scalingpolicy-predictivescalingpredefinedmetricpair-predefinedmetrictype
+	PredefinedMetricType *types.Value `json:"PredefinedMetricType,omitempty"`
+
+	// ResourceLabel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predictivescalingpredefinedmetricpair.html#cfn-autoscaling-scalingpolicy-predictivescalingpredefinedmetricpair-resourcelabel
+	ResourceLabel *types.Value `json:"ResourceLabel,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PredictiveScalingPredefinedMetricPair) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedMetricPair"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedscalingmetric.go b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedscalingmetric.go
new file mode 100644
index 0000000000..cd580747c6
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_predictivescalingpredefinedscalingmetric.go
@@ -0,0 +1,42 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPolicy_PredictiveScalingPredefinedScalingMetric AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedScalingMetric)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predictivescalingpredefinedscalingmetric.html
+type ScalingPolicy_PredictiveScalingPredefinedScalingMetric struct {
+
+	// PredefinedMetricType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predictivescalingpredefinedscalingmetric.html#cfn-autoscaling-scalingpolicy-predictivescalingpredefinedscalingmetric-predefinedmetrictype
+	PredefinedMetricType *types.Value `json:"PredefinedMetricType,omitempty"`
+
+	// ResourceLabel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-predictivescalingpredefinedscalingmetric.html#cfn-autoscaling-scalingpolicy-predictivescalingpredefinedscalingmetric-resourcelabel
+	ResourceLabel *types.Value `json:"ResourceLabel,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PredictiveScalingPredefinedScalingMetric) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedScalingMetric"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_stepadjustment.go b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_stepadjustment.go
new file mode 100644
index 0000000000..d78bb7b255
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_stepadjustment.go
@@ -0,0 +1,47 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPolicy_StepAdjustment AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.StepAdjustment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-stepadjustments.html
+type ScalingPolicy_StepAdjustment struct {
+
+	// MetricIntervalLowerBound AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-stepadjustments.html#cfn-autoscaling-scalingpolicy-stepadjustment-metricintervallowerbound
+	MetricIntervalLowerBound *types.Value `json:"MetricIntervalLowerBound,omitempty"`
+
+	// MetricIntervalUpperBound AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-stepadjustments.html#cfn-autoscaling-scalingpolicy-stepadjustment-metricintervalupperbound
+	MetricIntervalUpperBound *types.Value `json:"MetricIntervalUpperBound,omitempty"`
+
+	// ScalingAdjustment AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-stepadjustments.html#cfn-autoscaling-scalingpolicy-stepadjustment-scalingadjustment
+	ScalingAdjustment *types.Value `json:"ScalingAdjustment"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_StepAdjustment) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::ScalingPolicy.StepAdjustment"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_targettrackingconfiguration.go b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_targettrackingconfiguration.go
new file mode 100644
index 0000000000..67bbc576d8
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-scalingpolicy_targettrackingconfiguration.go
@@ -0,0 +1,52 @@
+package autoscaling
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPolicy_TargetTrackingConfiguration AWS CloudFormation Resource (AWS::AutoScaling::ScalingPolicy.TargetTrackingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-targettrackingconfiguration.html
+type ScalingPolicy_TargetTrackingConfiguration struct {
+
+	// CustomizedMetricSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-targettrackingconfiguration.html#cfn-autoscaling-scalingpolicy-targettrackingconfiguration-customizedmetricspecification
+	CustomizedMetricSpecification *ScalingPolicy_CustomizedMetricSpecification `json:"CustomizedMetricSpecification,omitempty"`
+
+	// DisableScaleIn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-targettrackingconfiguration.html#cfn-autoscaling-scalingpolicy-targettrackingconfiguration-disablescalein
+	DisableScaleIn *types.Value `json:"DisableScaleIn,omitempty"`
+
+	// PredefinedMetricSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-targettrackingconfiguration.html#cfn-autoscaling-scalingpolicy-targettrackingconfiguration-predefinedmetricspecification
+	PredefinedMetricSpecification *ScalingPolicy_PredefinedMetricSpecification `json:"PredefinedMetricSpecification,omitempty"`
+
+	// TargetValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscaling-scalingpolicy-targettrackingconfiguration.html#cfn-autoscaling-scalingpolicy-targettrackingconfiguration-targetvalue
+	TargetValue *types.Value `json:"TargetValue"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TargetTrackingConfiguration) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::ScalingPolicy.TargetTrackingConfiguration"
+}
diff --git a/goformation/cloudformation/autoscaling/aws-autoscaling-scheduledaction.go b/goformation/cloudformation/autoscaling/aws-autoscaling-scheduledaction.go
new file mode 100644
index 0000000000..0ecc8f69cc
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-scheduledaction.go
@@ -0,0 +1,143 @@
+package autoscaling
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScheduledAction AWS CloudFormation Resource (AWS::AutoScaling::ScheduledAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-scheduledaction.html
+type ScheduledAction struct {
+
+	// AutoScalingGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-scheduledaction.html#cfn-as-scheduledaction-asgname
+	AutoScalingGroupName *types.Value `json:"AutoScalingGroupName,omitempty"`
+
+	// DesiredCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-scheduledaction.html#cfn-as-scheduledaction-desiredcapacity
+	DesiredCapacity *types.Value `json:"DesiredCapacity,omitempty"`
+
+	// EndTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-scheduledaction.html#cfn-as-scheduledaction-endtime
+	EndTime *types.Value `json:"EndTime,omitempty"`
+
+	// MaxSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-scheduledaction.html#cfn-as-scheduledaction-maxsize
+	MaxSize *types.Value `json:"MaxSize,omitempty"`
+
+	// MinSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-scheduledaction.html#cfn-as-scheduledaction-minsize
+	MinSize *types.Value `json:"MinSize,omitempty"`
+
+	// Recurrence AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-scheduledaction.html#cfn-as-scheduledaction-recurrence
+	Recurrence *types.Value `json:"Recurrence,omitempty"`
+
+	// StartTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-scheduledaction.html#cfn-as-scheduledaction-starttime
+	StartTime *types.Value `json:"StartTime,omitempty"`
+
+	// TimeZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-as-scheduledaction.html#cfn-as-scheduledaction-timezone
+	TimeZone *types.Value `json:"TimeZone,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScheduledAction) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::ScheduledAction"
+}
+
+// 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 ScheduledAction) MarshalJSON() ([]byte, error) {
+	type Properties ScheduledAction
+	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 *ScheduledAction) UnmarshalJSON(b []byte) error {
+	type Properties ScheduledAction
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ScheduledAction(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/autoscaling/aws-autoscaling-warmpool.go b/goformation/cloudformation/autoscaling/aws-autoscaling-warmpool.go
new file mode 100644
index 0000000000..88ee8b846d
--- /dev/null
+++ b/goformation/cloudformation/autoscaling/aws-autoscaling-warmpool.go
@@ -0,0 +1,123 @@
+package autoscaling
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WarmPool AWS CloudFormation Resource (AWS::AutoScaling::WarmPool)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-warmpool.html
+type WarmPool struct {
+
+	// AutoScalingGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-warmpool.html#cfn-autoscaling-warmpool-autoscalinggroupname
+	AutoScalingGroupName *types.Value `json:"AutoScalingGroupName,omitempty"`
+
+	// MaxGroupPreparedCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-warmpool.html#cfn-autoscaling-warmpool-maxgrouppreparedcapacity
+	MaxGroupPreparedCapacity *types.Value `json:"MaxGroupPreparedCapacity,omitempty"`
+
+	// MinSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-warmpool.html#cfn-autoscaling-warmpool-minsize
+	MinSize *types.Value `json:"MinSize,omitempty"`
+
+	// PoolState AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscaling-warmpool.html#cfn-autoscaling-warmpool-poolstate
+	PoolState *types.Value `json:"PoolState,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WarmPool) AWSCloudFormationType() string {
+	return "AWS::AutoScaling::WarmPool"
+}
+
+// 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 WarmPool) MarshalJSON() ([]byte, error) {
+	type Properties WarmPool
+	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 *WarmPool) UnmarshalJSON(b []byte) error {
+	type Properties WarmPool
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = WarmPool(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan.go b/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan.go
new file mode 100644
index 0000000000..45b30792b9
--- /dev/null
+++ b/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan.go
@@ -0,0 +1,111 @@
+package autoscalingplans
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPlan AWS CloudFormation Resource (AWS::AutoScalingPlans::ScalingPlan)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscalingplans-scalingplan.html
+type ScalingPlan struct {
+
+	// ApplicationSource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscalingplans-scalingplan.html#cfn-autoscalingplans-scalingplan-applicationsource
+	ApplicationSource *ScalingPlan_ApplicationSource `json:"ApplicationSource,omitempty"`
+
+	// ScalingInstructions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-autoscalingplans-scalingplan.html#cfn-autoscalingplans-scalingplan-scalinginstructions
+	ScalingInstructions []ScalingPlan_ScalingInstruction `json:"ScalingInstructions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScalingPlan) AWSCloudFormationType() string {
+	return "AWS::AutoScalingPlans::ScalingPlan"
+}
+
+// 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 ScalingPlan) MarshalJSON() ([]byte, error) {
+	type Properties ScalingPlan
+	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 *ScalingPlan) UnmarshalJSON(b []byte) error {
+	type Properties ScalingPlan
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ScalingPlan(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_applicationsource.go b/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_applicationsource.go
new file mode 100644
index 0000000000..d3a654cae7
--- /dev/null
+++ b/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_applicationsource.go
@@ -0,0 +1,42 @@
+package autoscalingplans
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPlan_ApplicationSource AWS CloudFormation Resource (AWS::AutoScalingPlans::ScalingPlan.ApplicationSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-applicationsource.html
+type ScalingPlan_ApplicationSource struct {
+
+	// CloudFormationStackARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-applicationsource.html#cfn-autoscalingplans-scalingplan-applicationsource-cloudformationstackarn
+	CloudFormationStackARN *types.Value `json:"CloudFormationStackARN,omitempty"`
+
+	// TagFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-applicationsource.html#cfn-autoscalingplans-scalingplan-applicationsource-tagfilters
+	TagFilters []ScalingPlan_TagFilter `json:"TagFilters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScalingPlan_ApplicationSource) AWSCloudFormationType() string {
+	return "AWS::AutoScalingPlans::ScalingPlan.ApplicationSource"
+}
diff --git a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedloadmetricspecification.go b/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedloadmetricspecification.go
new file mode 100644
index 0000000000..9b91a932c6
--- /dev/null
+++ b/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedloadmetricspecification.go
@@ -0,0 +1,57 @@
+package autoscalingplans
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPlan_CustomizedLoadMetricSpecification AWS CloudFormation Resource (AWS::AutoScalingPlans::ScalingPlan.CustomizedLoadMetricSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-customizedloadmetricspecification.html
+type ScalingPlan_CustomizedLoadMetricSpecification struct {
+
+	// Dimensions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-customizedloadmetricspecification.html#cfn-autoscalingplans-scalingplan-customizedloadmetricspecification-dimensions
+	Dimensions []ScalingPlan_MetricDimension `json:"Dimensions,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-customizedloadmetricspecification.html#cfn-autoscalingplans-scalingplan-customizedloadmetricspecification-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// Namespace AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-customizedloadmetricspecification.html#cfn-autoscalingplans-scalingplan-customizedloadmetricspecification-namespace
+	Namespace *types.Value `json:"Namespace,omitempty"`
+
+	// Statistic AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-customizedloadmetricspecification.html#cfn-autoscalingplans-scalingplan-customizedloadmetricspecification-statistic
+	Statistic *types.Value `json:"Statistic,omitempty"`
+
+	// Unit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-customizedloadmetricspecification.html#cfn-autoscalingplans-scalingplan-customizedloadmetricspecification-unit
+	Unit *types.Value `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 *ScalingPlan_CustomizedLoadMetricSpecification) AWSCloudFormationType() string {
+	return "AWS::AutoScalingPlans::ScalingPlan.CustomizedLoadMetricSpecification"
+}
diff --git a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedscalingmetricspecification.go b/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedscalingmetricspecification.go
new file mode 100644
index 0000000000..ec61e6229d
--- /dev/null
+++ b/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_customizedscalingmetricspecification.go
@@ -0,0 +1,57 @@
+package autoscalingplans
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPlan_CustomizedScalingMetricSpecification AWS CloudFormation Resource (AWS::AutoScalingPlans::ScalingPlan.CustomizedScalingMetricSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-customizedscalingmetricspecification.html
+type ScalingPlan_CustomizedScalingMetricSpecification struct {
+
+	// Dimensions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-customizedscalingmetricspecification.html#cfn-autoscalingplans-scalingplan-customizedscalingmetricspecification-dimensions
+	Dimensions []ScalingPlan_MetricDimension `json:"Dimensions,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-customizedscalingmetricspecification.html#cfn-autoscalingplans-scalingplan-customizedscalingmetricspecification-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// Namespace AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-customizedscalingmetricspecification.html#cfn-autoscalingplans-scalingplan-customizedscalingmetricspecification-namespace
+	Namespace *types.Value `json:"Namespace,omitempty"`
+
+	// Statistic AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-customizedscalingmetricspecification.html#cfn-autoscalingplans-scalingplan-customizedscalingmetricspecification-statistic
+	Statistic *types.Value `json:"Statistic,omitempty"`
+
+	// Unit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-customizedscalingmetricspecification.html#cfn-autoscalingplans-scalingplan-customizedscalingmetricspecification-unit
+	Unit *types.Value `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 *ScalingPlan_CustomizedScalingMetricSpecification) AWSCloudFormationType() string {
+	return "AWS::AutoScalingPlans::ScalingPlan.CustomizedScalingMetricSpecification"
+}
diff --git a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_metricdimension.go b/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_metricdimension.go
new file mode 100644
index 0000000000..9b32187b21
--- /dev/null
+++ b/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_metricdimension.go
@@ -0,0 +1,42 @@
+package autoscalingplans
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPlan_MetricDimension AWS CloudFormation Resource (AWS::AutoScalingPlans::ScalingPlan.MetricDimension)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-metricdimension.html
+type ScalingPlan_MetricDimension struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-metricdimension.html#cfn-autoscalingplans-scalingplan-metricdimension-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-metricdimension.html#cfn-autoscalingplans-scalingplan-metricdimension-value
+	Value *types.Value `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 *ScalingPlan_MetricDimension) AWSCloudFormationType() string {
+	return "AWS::AutoScalingPlans::ScalingPlan.MetricDimension"
+}
diff --git a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedloadmetricspecification.go b/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedloadmetricspecification.go
new file mode 100644
index 0000000000..e07e6712ba
--- /dev/null
+++ b/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedloadmetricspecification.go
@@ -0,0 +1,42 @@
+package autoscalingplans
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPlan_PredefinedLoadMetricSpecification AWS CloudFormation Resource (AWS::AutoScalingPlans::ScalingPlan.PredefinedLoadMetricSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-predefinedloadmetricspecification.html
+type ScalingPlan_PredefinedLoadMetricSpecification struct {
+
+	// PredefinedLoadMetricType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-predefinedloadmetricspecification.html#cfn-autoscalingplans-scalingplan-predefinedloadmetricspecification-predefinedloadmetrictype
+	PredefinedLoadMetricType *types.Value `json:"PredefinedLoadMetricType,omitempty"`
+
+	// ResourceLabel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-predefinedloadmetricspecification.html#cfn-autoscalingplans-scalingplan-predefinedloadmetricspecification-resourcelabel
+	ResourceLabel *types.Value `json:"ResourceLabel,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScalingPlan_PredefinedLoadMetricSpecification) AWSCloudFormationType() string {
+	return "AWS::AutoScalingPlans::ScalingPlan.PredefinedLoadMetricSpecification"
+}
diff --git a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedscalingmetricspecification.go b/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedscalingmetricspecification.go
new file mode 100644
index 0000000000..8f84772c57
--- /dev/null
+++ b/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_predefinedscalingmetricspecification.go
@@ -0,0 +1,42 @@
+package autoscalingplans
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPlan_PredefinedScalingMetricSpecification AWS CloudFormation Resource (AWS::AutoScalingPlans::ScalingPlan.PredefinedScalingMetricSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-predefinedscalingmetricspecification.html
+type ScalingPlan_PredefinedScalingMetricSpecification struct {
+
+	// PredefinedScalingMetricType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-predefinedscalingmetricspecification.html#cfn-autoscalingplans-scalingplan-predefinedscalingmetricspecification-predefinedscalingmetrictype
+	PredefinedScalingMetricType *types.Value `json:"PredefinedScalingMetricType,omitempty"`
+
+	// ResourceLabel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-predefinedscalingmetricspecification.html#cfn-autoscalingplans-scalingplan-predefinedscalingmetricspecification-resourcelabel
+	ResourceLabel *types.Value `json:"ResourceLabel,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScalingPlan_PredefinedScalingMetricSpecification) AWSCloudFormationType() string {
+	return "AWS::AutoScalingPlans::ScalingPlan.PredefinedScalingMetricSpecification"
+}
diff --git a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_scalinginstruction.go b/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_scalinginstruction.go
new file mode 100644
index 0000000000..df60731bce
--- /dev/null
+++ b/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_scalinginstruction.go
@@ -0,0 +1,102 @@
+package autoscalingplans
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPlan_ScalingInstruction AWS CloudFormation Resource (AWS::AutoScalingPlans::ScalingPlan.ScalingInstruction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-scalinginstruction.html
+type ScalingPlan_ScalingInstruction struct {
+
+	// CustomizedLoadMetricSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-scalinginstruction.html#cfn-autoscalingplans-scalingplan-scalinginstruction-customizedloadmetricspecification
+	CustomizedLoadMetricSpecification *ScalingPlan_CustomizedLoadMetricSpecification `json:"CustomizedLoadMetricSpecification,omitempty"`
+
+	// DisableDynamicScaling AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-scalinginstruction.html#cfn-autoscalingplans-scalingplan-scalinginstruction-disabledynamicscaling
+	DisableDynamicScaling *types.Value `json:"DisableDynamicScaling,omitempty"`
+
+	// MaxCapacity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-scalinginstruction.html#cfn-autoscalingplans-scalingplan-scalinginstruction-maxcapacity
+	MaxCapacity *types.Value `json:"MaxCapacity"`
+
+	// MinCapacity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-scalinginstruction.html#cfn-autoscalingplans-scalingplan-scalinginstruction-mincapacity
+	MinCapacity *types.Value `json:"MinCapacity"`
+
+	// PredefinedLoadMetricSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-scalinginstruction.html#cfn-autoscalingplans-scalingplan-scalinginstruction-predefinedloadmetricspecification
+	PredefinedLoadMetricSpecification *ScalingPlan_PredefinedLoadMetricSpecification `json:"PredefinedLoadMetricSpecification,omitempty"`
+
+	// PredictiveScalingMaxCapacityBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-scalinginstruction.html#cfn-autoscalingplans-scalingplan-scalinginstruction-predictivescalingmaxcapacitybehavior
+	PredictiveScalingMaxCapacityBehavior *types.Value `json:"PredictiveScalingMaxCapacityBehavior,omitempty"`
+
+	// PredictiveScalingMaxCapacityBuffer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-scalinginstruction.html#cfn-autoscalingplans-scalingplan-scalinginstruction-predictivescalingmaxcapacitybuffer
+	PredictiveScalingMaxCapacityBuffer *types.Value `json:"PredictiveScalingMaxCapacityBuffer,omitempty"`
+
+	// PredictiveScalingMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-scalinginstruction.html#cfn-autoscalingplans-scalingplan-scalinginstruction-predictivescalingmode
+	PredictiveScalingMode *types.Value `json:"PredictiveScalingMode,omitempty"`
+
+	// ResourceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-scalinginstruction.html#cfn-autoscalingplans-scalingplan-scalinginstruction-resourceid
+	ResourceId *types.Value `json:"ResourceId,omitempty"`
+
+	// ScalableDimension AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-scalinginstruction.html#cfn-autoscalingplans-scalingplan-scalinginstruction-scalabledimension
+	ScalableDimension *types.Value `json:"ScalableDimension,omitempty"`
+
+	// ScalingPolicyUpdateBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-scalinginstruction.html#cfn-autoscalingplans-scalingplan-scalinginstruction-scalingpolicyupdatebehavior
+	ScalingPolicyUpdateBehavior *types.Value `json:"ScalingPolicyUpdateBehavior,omitempty"`
+
+	// ScheduledActionBufferTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-scalinginstruction.html#cfn-autoscalingplans-scalingplan-scalinginstruction-scheduledactionbuffertime
+	ScheduledActionBufferTime *types.Value `json:"ScheduledActionBufferTime,omitempty"`
+
+	// ServiceNamespace AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-scalinginstruction.html#cfn-autoscalingplans-scalingplan-scalinginstruction-servicenamespace
+	ServiceNamespace *types.Value `json:"ServiceNamespace,omitempty"`
+
+	// TargetTrackingConfigurations AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-scalinginstruction.html#cfn-autoscalingplans-scalingplan-scalinginstruction-targettrackingconfigurations
+	TargetTrackingConfigurations []ScalingPlan_TargetTrackingConfiguration `json:"TargetTrackingConfigurations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScalingPlan_ScalingInstruction) AWSCloudFormationType() string {
+	return "AWS::AutoScalingPlans::ScalingPlan.ScalingInstruction"
+}
diff --git a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_tagfilter.go b/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_tagfilter.go
new file mode 100644
index 0000000000..b1751828e7
--- /dev/null
+++ b/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_tagfilter.go
@@ -0,0 +1,42 @@
+package autoscalingplans
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPlan_TagFilter AWS CloudFormation Resource (AWS::AutoScalingPlans::ScalingPlan.TagFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-tagfilter.html
+type ScalingPlan_TagFilter struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-tagfilter.html#cfn-autoscalingplans-scalingplan-tagfilter-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-tagfilter.html#cfn-autoscalingplans-scalingplan-tagfilter-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScalingPlan_TagFilter) AWSCloudFormationType() string {
+	return "AWS::AutoScalingPlans::ScalingPlan.TagFilter"
+}
diff --git a/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_targettrackingconfiguration.go b/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_targettrackingconfiguration.go
new file mode 100644
index 0000000000..2c8a52450b
--- /dev/null
+++ b/goformation/cloudformation/autoscalingplans/aws-autoscalingplans-scalingplan_targettrackingconfiguration.go
@@ -0,0 +1,67 @@
+package autoscalingplans
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScalingPlan_TargetTrackingConfiguration AWS CloudFormation Resource (AWS::AutoScalingPlans::ScalingPlan.TargetTrackingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-targettrackingconfiguration.html
+type ScalingPlan_TargetTrackingConfiguration struct {
+
+	// CustomizedScalingMetricSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-targettrackingconfiguration.html#cfn-autoscalingplans-scalingplan-targettrackingconfiguration-customizedscalingmetricspecification
+	CustomizedScalingMetricSpecification *ScalingPlan_CustomizedScalingMetricSpecification `json:"CustomizedScalingMetricSpecification,omitempty"`
+
+	// DisableScaleIn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-targettrackingconfiguration.html#cfn-autoscalingplans-scalingplan-targettrackingconfiguration-disablescalein
+	DisableScaleIn *types.Value `json:"DisableScaleIn,omitempty"`
+
+	// EstimatedInstanceWarmup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-targettrackingconfiguration.html#cfn-autoscalingplans-scalingplan-targettrackingconfiguration-estimatedinstancewarmup
+	EstimatedInstanceWarmup *types.Value `json:"EstimatedInstanceWarmup,omitempty"`
+
+	// PredefinedScalingMetricSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-targettrackingconfiguration.html#cfn-autoscalingplans-scalingplan-targettrackingconfiguration-predefinedscalingmetricspecification
+	PredefinedScalingMetricSpecification *ScalingPlan_PredefinedScalingMetricSpecification `json:"PredefinedScalingMetricSpecification,omitempty"`
+
+	// ScaleInCooldown AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-targettrackingconfiguration.html#cfn-autoscalingplans-scalingplan-targettrackingconfiguration-scaleincooldown
+	ScaleInCooldown *types.Value `json:"ScaleInCooldown,omitempty"`
+
+	// ScaleOutCooldown AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-targettrackingconfiguration.html#cfn-autoscalingplans-scalingplan-targettrackingconfiguration-scaleoutcooldown
+	ScaleOutCooldown *types.Value `json:"ScaleOutCooldown,omitempty"`
+
+	// TargetValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-autoscalingplans-scalingplan-targettrackingconfiguration.html#cfn-autoscalingplans-scalingplan-targettrackingconfiguration-targetvalue
+	TargetValue *types.Value `json:"TargetValue"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScalingPlan_TargetTrackingConfiguration) AWSCloudFormationType() string {
+	return "AWS::AutoScalingPlans::ScalingPlan.TargetTrackingConfiguration"
+}
diff --git a/goformation/cloudformation/backup/aws-backup-backupplan.go b/goformation/cloudformation/backup/aws-backup-backupplan.go
new file mode 100644
index 0000000000..d3dccae22c
--- /dev/null
+++ b/goformation/cloudformation/backup/aws-backup-backupplan.go
@@ -0,0 +1,113 @@
+package backup
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BackupPlan AWS CloudFormation Resource (AWS::Backup::BackupPlan)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-backupplan.html
+type BackupPlan struct {
+
+	// BackupPlan AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-backupplan.html#cfn-backup-backupplan-backupplan
+	BackupPlan *BackupPlan_BackupPlanResourceType `json:"BackupPlan,omitempty"`
+
+	// BackupPlanTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-backupplan.html#cfn-backup-backupplan-backupplantags
+	BackupPlanTags map[string]*types.Value `json:"BackupPlanTags,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *BackupPlan) AWSCloudFormationType() string {
+	return "AWS::Backup::BackupPlan"
+}
+
+// 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 BackupPlan) MarshalJSON() ([]byte, error) {
+	type Properties BackupPlan
+	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 *BackupPlan) UnmarshalJSON(b []byte) error {
+	type Properties BackupPlan
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = BackupPlan(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/backup/aws-backup-backupplan_advancedbackupsettingresourcetype.go b/goformation/cloudformation/backup/aws-backup-backupplan_advancedbackupsettingresourcetype.go
new file mode 100644
index 0000000000..c6b1ad4370
--- /dev/null
+++ b/goformation/cloudformation/backup/aws-backup-backupplan_advancedbackupsettingresourcetype.go
@@ -0,0 +1,42 @@
+package backup
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BackupPlan_AdvancedBackupSettingResourceType AWS CloudFormation Resource (AWS::Backup::BackupPlan.AdvancedBackupSettingResourceType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-advancedbackupsettingresourcetype.html
+type BackupPlan_AdvancedBackupSettingResourceType struct {
+
+	// BackupOptions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-advancedbackupsettingresourcetype.html#cfn-backup-backupplan-advancedbackupsettingresourcetype-backupoptions
+	BackupOptions interface{} `json:"BackupOptions,omitempty"`
+
+	// ResourceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-advancedbackupsettingresourcetype.html#cfn-backup-backupplan-advancedbackupsettingresourcetype-resourcetype
+	ResourceType *types.Value `json:"ResourceType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *BackupPlan_AdvancedBackupSettingResourceType) AWSCloudFormationType() string {
+	return "AWS::Backup::BackupPlan.AdvancedBackupSettingResourceType"
+}
diff --git a/goformation/cloudformation/backup/aws-backup-backupplan_backupplanresourcetype.go b/goformation/cloudformation/backup/aws-backup-backupplan_backupplanresourcetype.go
new file mode 100644
index 0000000000..9407b39cf6
--- /dev/null
+++ b/goformation/cloudformation/backup/aws-backup-backupplan_backupplanresourcetype.go
@@ -0,0 +1,47 @@
+package backup
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BackupPlan_BackupPlanResourceType AWS CloudFormation Resource (AWS::Backup::BackupPlan.BackupPlanResourceType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-backupplanresourcetype.html
+type BackupPlan_BackupPlanResourceType struct {
+
+	// AdvancedBackupSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-backupplanresourcetype.html#cfn-backup-backupplan-backupplanresourcetype-advancedbackupsettings
+	AdvancedBackupSettings []BackupPlan_AdvancedBackupSettingResourceType `json:"AdvancedBackupSettings,omitempty"`
+
+	// BackupPlanName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-backupplanresourcetype.html#cfn-backup-backupplan-backupplanresourcetype-backupplanname
+	BackupPlanName *types.Value `json:"BackupPlanName,omitempty"`
+
+	// BackupPlanRule AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-backupplanresourcetype.html#cfn-backup-backupplan-backupplanresourcetype-backupplanrule
+	BackupPlanRule []BackupPlan_BackupRuleResourceType `json:"BackupPlanRule,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *BackupPlan_BackupPlanResourceType) AWSCloudFormationType() string {
+	return "AWS::Backup::BackupPlan.BackupPlanResourceType"
+}
diff --git a/goformation/cloudformation/backup/aws-backup-backupplan_backupruleresourcetype.go b/goformation/cloudformation/backup/aws-backup-backupplan_backupruleresourcetype.go
new file mode 100644
index 0000000000..8f297e30eb
--- /dev/null
+++ b/goformation/cloudformation/backup/aws-backup-backupplan_backupruleresourcetype.go
@@ -0,0 +1,77 @@
+package backup
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BackupPlan_BackupRuleResourceType AWS CloudFormation Resource (AWS::Backup::BackupPlan.BackupRuleResourceType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-backupruleresourcetype.html
+type BackupPlan_BackupRuleResourceType struct {
+
+	// CompletionWindowMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-backupruleresourcetype.html#cfn-backup-backupplan-backupruleresourcetype-completionwindowminutes
+	CompletionWindowMinutes *types.Value `json:"CompletionWindowMinutes,omitempty"`
+
+	// CopyActions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-backupruleresourcetype.html#cfn-backup-backupplan-backupruleresourcetype-copyactions
+	CopyActions []BackupPlan_CopyActionResourceType `json:"CopyActions,omitempty"`
+
+	// EnableContinuousBackup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-backupruleresourcetype.html#cfn-backup-backupplan-backupruleresourcetype-enablecontinuousbackup
+	EnableContinuousBackup *types.Value `json:"EnableContinuousBackup,omitempty"`
+
+	// Lifecycle AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-backupruleresourcetype.html#cfn-backup-backupplan-backupruleresourcetype-lifecycle
+	Lifecycle *BackupPlan_LifecycleResourceType `json:"Lifecycle,omitempty"`
+
+	// RecoveryPointTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-backupruleresourcetype.html#cfn-backup-backupplan-backupruleresourcetype-recoverypointtags
+	RecoveryPointTags map[string]*types.Value `json:"RecoveryPointTags,omitempty"`
+
+	// RuleName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-backupruleresourcetype.html#cfn-backup-backupplan-backupruleresourcetype-rulename
+	RuleName *types.Value `json:"RuleName,omitempty"`
+
+	// ScheduleExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-backupruleresourcetype.html#cfn-backup-backupplan-backupruleresourcetype-scheduleexpression
+	ScheduleExpression *types.Value `json:"ScheduleExpression,omitempty"`
+
+	// StartWindowMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-backupruleresourcetype.html#cfn-backup-backupplan-backupruleresourcetype-startwindowminutes
+	StartWindowMinutes *types.Value `json:"StartWindowMinutes,omitempty"`
+
+	// TargetBackupVault AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-backupruleresourcetype.html#cfn-backup-backupplan-backupruleresourcetype-targetbackupvault
+	TargetBackupVault *types.Value `json:"TargetBackupVault,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *BackupPlan_BackupRuleResourceType) AWSCloudFormationType() string {
+	return "AWS::Backup::BackupPlan.BackupRuleResourceType"
+}
diff --git a/goformation/cloudformation/backup/aws-backup-backupplan_copyactionresourcetype.go b/goformation/cloudformation/backup/aws-backup-backupplan_copyactionresourcetype.go
new file mode 100644
index 0000000000..3cc90623e7
--- /dev/null
+++ b/goformation/cloudformation/backup/aws-backup-backupplan_copyactionresourcetype.go
@@ -0,0 +1,42 @@
+package backup
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BackupPlan_CopyActionResourceType AWS CloudFormation Resource (AWS::Backup::BackupPlan.CopyActionResourceType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-copyactionresourcetype.html
+type BackupPlan_CopyActionResourceType struct {
+
+	// DestinationBackupVaultArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-copyactionresourcetype.html#cfn-backup-backupplan-copyactionresourcetype-destinationbackupvaultarn
+	DestinationBackupVaultArn *types.Value `json:"DestinationBackupVaultArn,omitempty"`
+
+	// Lifecycle AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-copyactionresourcetype.html#cfn-backup-backupplan-copyactionresourcetype-lifecycle
+	Lifecycle *BackupPlan_LifecycleResourceType `json:"Lifecycle,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *BackupPlan_CopyActionResourceType) AWSCloudFormationType() string {
+	return "AWS::Backup::BackupPlan.CopyActionResourceType"
+}
diff --git a/goformation/cloudformation/backup/aws-backup-backupplan_lifecycleresourcetype.go b/goformation/cloudformation/backup/aws-backup-backupplan_lifecycleresourcetype.go
new file mode 100644
index 0000000000..eb7e372226
--- /dev/null
+++ b/goformation/cloudformation/backup/aws-backup-backupplan_lifecycleresourcetype.go
@@ -0,0 +1,42 @@
+package backup
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BackupPlan_LifecycleResourceType AWS CloudFormation Resource (AWS::Backup::BackupPlan.LifecycleResourceType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-lifecycleresourcetype.html
+type BackupPlan_LifecycleResourceType struct {
+
+	// DeleteAfterDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-lifecycleresourcetype.html#cfn-backup-backupplan-lifecycleresourcetype-deleteafterdays
+	DeleteAfterDays *types.Value `json:"DeleteAfterDays,omitempty"`
+
+	// MoveToColdStorageAfterDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupplan-lifecycleresourcetype.html#cfn-backup-backupplan-lifecycleresourcetype-movetocoldstorageafterdays
+	MoveToColdStorageAfterDays *types.Value `json:"MoveToColdStorageAfterDays,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *BackupPlan_LifecycleResourceType) AWSCloudFormationType() string {
+	return "AWS::Backup::BackupPlan.LifecycleResourceType"
+}
diff --git a/goformation/cloudformation/backup/aws-backup-backupselection.go b/goformation/cloudformation/backup/aws-backup-backupselection.go
new file mode 100644
index 0000000000..0aba08c9eb
--- /dev/null
+++ b/goformation/cloudformation/backup/aws-backup-backupselection.go
@@ -0,0 +1,113 @@
+package backup
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BackupSelection AWS CloudFormation Resource (AWS::Backup::BackupSelection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-backupselection.html
+type BackupSelection struct {
+
+	// BackupPlanId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-backupselection.html#cfn-backup-backupselection-backupplanid
+	BackupPlanId *types.Value `json:"BackupPlanId,omitempty"`
+
+	// BackupSelection AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-backupselection.html#cfn-backup-backupselection-backupselection
+	BackupSelection *BackupSelection_BackupSelectionResourceType `json:"BackupSelection,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *BackupSelection) AWSCloudFormationType() string {
+	return "AWS::Backup::BackupSelection"
+}
+
+// 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 BackupSelection) MarshalJSON() ([]byte, error) {
+	type Properties BackupSelection
+	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 *BackupSelection) UnmarshalJSON(b []byte) error {
+	type Properties BackupSelection
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = BackupSelection(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/backup/aws-backup-backupselection_backupselectionresourcetype.go b/goformation/cloudformation/backup/aws-backup-backupselection_backupselectionresourcetype.go
new file mode 100644
index 0000000000..46a6b014d9
--- /dev/null
+++ b/goformation/cloudformation/backup/aws-backup-backupselection_backupselectionresourcetype.go
@@ -0,0 +1,62 @@
+package backup
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BackupSelection_BackupSelectionResourceType AWS CloudFormation Resource (AWS::Backup::BackupSelection.BackupSelectionResourceType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupselection-backupselectionresourcetype.html
+type BackupSelection_BackupSelectionResourceType struct {
+
+	// Conditions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupselection-backupselectionresourcetype.html#cfn-backup-backupselection-backupselectionresourcetype-conditions
+	Conditions interface{} `json:"Conditions,omitempty"`
+
+	// IamRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupselection-backupselectionresourcetype.html#cfn-backup-backupselection-backupselectionresourcetype-iamrolearn
+	IamRoleArn *types.Value `json:"IamRoleArn,omitempty"`
+
+	// ListOfTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupselection-backupselectionresourcetype.html#cfn-backup-backupselection-backupselectionresourcetype-listoftags
+	ListOfTags []BackupSelection_ConditionResourceType `json:"ListOfTags,omitempty"`
+
+	// NotResources AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupselection-backupselectionresourcetype.html#cfn-backup-backupselection-backupselectionresourcetype-notresources
+	NotResources *types.Value `json:"NotResources,omitempty"`
+
+	// Resources AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupselection-backupselectionresourcetype.html#cfn-backup-backupselection-backupselectionresourcetype-resources
+	Resources *types.Value `json:"Resources,omitempty"`
+
+	// SelectionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupselection-backupselectionresourcetype.html#cfn-backup-backupselection-backupselectionresourcetype-selectionname
+	SelectionName *types.Value `json:"SelectionName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *BackupSelection_BackupSelectionResourceType) AWSCloudFormationType() string {
+	return "AWS::Backup::BackupSelection.BackupSelectionResourceType"
+}
diff --git a/goformation/cloudformation/backup/aws-backup-backupselection_conditionresourcetype.go b/goformation/cloudformation/backup/aws-backup-backupselection_conditionresourcetype.go
new file mode 100644
index 0000000000..009ead30d4
--- /dev/null
+++ b/goformation/cloudformation/backup/aws-backup-backupselection_conditionresourcetype.go
@@ -0,0 +1,47 @@
+package backup
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BackupSelection_ConditionResourceType AWS CloudFormation Resource (AWS::Backup::BackupSelection.ConditionResourceType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupselection-conditionresourcetype.html
+type BackupSelection_ConditionResourceType struct {
+
+	// ConditionKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupselection-conditionresourcetype.html#cfn-backup-backupselection-conditionresourcetype-conditionkey
+	ConditionKey *types.Value `json:"ConditionKey,omitempty"`
+
+	// ConditionType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupselection-conditionresourcetype.html#cfn-backup-backupselection-conditionresourcetype-conditiontype
+	ConditionType *types.Value `json:"ConditionType,omitempty"`
+
+	// ConditionValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupselection-conditionresourcetype.html#cfn-backup-backupselection-conditionresourcetype-conditionvalue
+	ConditionValue *types.Value `json:"ConditionValue,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *BackupSelection_ConditionResourceType) AWSCloudFormationType() string {
+	return "AWS::Backup::BackupSelection.ConditionResourceType"
+}
diff --git a/goformation/cloudformation/backup/aws-backup-backupvault.go b/goformation/cloudformation/backup/aws-backup-backupvault.go
new file mode 100644
index 0000000000..3824dd4837
--- /dev/null
+++ b/goformation/cloudformation/backup/aws-backup-backupvault.go
@@ -0,0 +1,133 @@
+package backup
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BackupVault AWS CloudFormation Resource (AWS::Backup::BackupVault)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-backupvault.html
+type BackupVault struct {
+
+	// AccessPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-backupvault.html#cfn-backup-backupvault-accesspolicy
+	AccessPolicy interface{} `json:"AccessPolicy,omitempty"`
+
+	// BackupVaultName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-backupvault.html#cfn-backup-backupvault-backupvaultname
+	BackupVaultName *types.Value `json:"BackupVaultName,omitempty"`
+
+	// BackupVaultTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-backupvault.html#cfn-backup-backupvault-backupvaulttags
+	BackupVaultTags map[string]*types.Value `json:"BackupVaultTags,omitempty"`
+
+	// EncryptionKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-backupvault.html#cfn-backup-backupvault-encryptionkeyarn
+	EncryptionKeyArn *types.Value `json:"EncryptionKeyArn,omitempty"`
+
+	// LockConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-backupvault.html#cfn-backup-backupvault-lockconfiguration
+	LockConfiguration *BackupVault_LockConfigurationType `json:"LockConfiguration,omitempty"`
+
+	// Notifications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-backupvault.html#cfn-backup-backupvault-notifications
+	Notifications *BackupVault_NotificationObjectType `json:"Notifications,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *BackupVault) AWSCloudFormationType() string {
+	return "AWS::Backup::BackupVault"
+}
+
+// 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 BackupVault) MarshalJSON() ([]byte, error) {
+	type Properties BackupVault
+	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 *BackupVault) UnmarshalJSON(b []byte) error {
+	type Properties BackupVault
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = BackupVault(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/backup/aws-backup-backupvault_lockconfigurationtype.go b/goformation/cloudformation/backup/aws-backup-backupvault_lockconfigurationtype.go
new file mode 100644
index 0000000000..855a8b4979
--- /dev/null
+++ b/goformation/cloudformation/backup/aws-backup-backupvault_lockconfigurationtype.go
@@ -0,0 +1,47 @@
+package backup
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BackupVault_LockConfigurationType AWS CloudFormation Resource (AWS::Backup::BackupVault.LockConfigurationType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupvault-lockconfigurationtype.html
+type BackupVault_LockConfigurationType struct {
+
+	// ChangeableForDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupvault-lockconfigurationtype.html#cfn-backup-backupvault-lockconfigurationtype-changeablefordays
+	ChangeableForDays *types.Value `json:"ChangeableForDays,omitempty"`
+
+	// MaxRetentionDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupvault-lockconfigurationtype.html#cfn-backup-backupvault-lockconfigurationtype-maxretentiondays
+	MaxRetentionDays *types.Value `json:"MaxRetentionDays,omitempty"`
+
+	// MinRetentionDays AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupvault-lockconfigurationtype.html#cfn-backup-backupvault-lockconfigurationtype-minretentiondays
+	MinRetentionDays *types.Value `json:"MinRetentionDays"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *BackupVault_LockConfigurationType) AWSCloudFormationType() string {
+	return "AWS::Backup::BackupVault.LockConfigurationType"
+}
diff --git a/goformation/cloudformation/backup/aws-backup-backupvault_notificationobjecttype.go b/goformation/cloudformation/backup/aws-backup-backupvault_notificationobjecttype.go
new file mode 100644
index 0000000000..6e203d485a
--- /dev/null
+++ b/goformation/cloudformation/backup/aws-backup-backupvault_notificationobjecttype.go
@@ -0,0 +1,42 @@
+package backup
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BackupVault_NotificationObjectType AWS CloudFormation Resource (AWS::Backup::BackupVault.NotificationObjectType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupvault-notificationobjecttype.html
+type BackupVault_NotificationObjectType struct {
+
+	// BackupVaultEvents AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupvault-notificationobjecttype.html#cfn-backup-backupvault-notificationobjecttype-backupvaultevents
+	BackupVaultEvents *types.Value `json:"BackupVaultEvents,omitempty"`
+
+	// SNSTopicArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-backupvault-notificationobjecttype.html#cfn-backup-backupvault-notificationobjecttype-snstopicarn
+	SNSTopicArn *types.Value `json:"SNSTopicArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *BackupVault_NotificationObjectType) AWSCloudFormationType() string {
+	return "AWS::Backup::BackupVault.NotificationObjectType"
+}
diff --git a/goformation/cloudformation/backup/aws-backup-framework.go b/goformation/cloudformation/backup/aws-backup-framework.go
new file mode 100644
index 0000000000..f2f2b56194
--- /dev/null
+++ b/goformation/cloudformation/backup/aws-backup-framework.go
@@ -0,0 +1,124 @@
+package backup
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Framework AWS CloudFormation Resource (AWS::Backup::Framework)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-framework.html
+type Framework struct {
+
+	// FrameworkControls AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-framework.html#cfn-backup-framework-frameworkcontrols
+	FrameworkControls []Framework_FrameworkControl `json:"FrameworkControls,omitempty"`
+
+	// FrameworkDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-framework.html#cfn-backup-framework-frameworkdescription
+	FrameworkDescription *types.Value `json:"FrameworkDescription,omitempty"`
+
+	// FrameworkName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-framework.html#cfn-backup-framework-frameworkname
+	FrameworkName *types.Value `json:"FrameworkName,omitempty"`
+
+	// FrameworkTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-framework.html#cfn-backup-framework-frameworktags
+	FrameworkTags []cloudformation.Tag `json:"FrameworkTags,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Framework) AWSCloudFormationType() string {
+	return "AWS::Backup::Framework"
+}
+
+// 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 Framework) MarshalJSON() ([]byte, error) {
+	type Properties Framework
+	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 *Framework) UnmarshalJSON(b []byte) error {
+	type Properties Framework
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Framework(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/backup/aws-backup-framework_controlinputparameter.go b/goformation/cloudformation/backup/aws-backup-framework_controlinputparameter.go
new file mode 100644
index 0000000000..83e8618ef2
--- /dev/null
+++ b/goformation/cloudformation/backup/aws-backup-framework_controlinputparameter.go
@@ -0,0 +1,42 @@
+package backup
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Framework_ControlInputParameter AWS CloudFormation Resource (AWS::Backup::Framework.ControlInputParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-framework-controlinputparameter.html
+type Framework_ControlInputParameter struct {
+
+	// ParameterName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-framework-controlinputparameter.html#cfn-backup-framework-controlinputparameter-parametername
+	ParameterName *types.Value `json:"ParameterName,omitempty"`
+
+	// ParameterValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-framework-controlinputparameter.html#cfn-backup-framework-controlinputparameter-parametervalue
+	ParameterValue *types.Value `json:"ParameterValue,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Framework_ControlInputParameter) AWSCloudFormationType() string {
+	return "AWS::Backup::Framework.ControlInputParameter"
+}
diff --git a/goformation/cloudformation/backup/aws-backup-framework_frameworkcontrol.go b/goformation/cloudformation/backup/aws-backup-framework_frameworkcontrol.go
new file mode 100644
index 0000000000..57d27772ad
--- /dev/null
+++ b/goformation/cloudformation/backup/aws-backup-framework_frameworkcontrol.go
@@ -0,0 +1,47 @@
+package backup
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Framework_FrameworkControl AWS CloudFormation Resource (AWS::Backup::Framework.FrameworkControl)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-framework-frameworkcontrol.html
+type Framework_FrameworkControl struct {
+
+	// ControlInputParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-framework-frameworkcontrol.html#cfn-backup-framework-frameworkcontrol-controlinputparameters
+	ControlInputParameters []Framework_ControlInputParameter `json:"ControlInputParameters,omitempty"`
+
+	// ControlName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-framework-frameworkcontrol.html#cfn-backup-framework-frameworkcontrol-controlname
+	ControlName *types.Value `json:"ControlName,omitempty"`
+
+	// ControlScope AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-backup-framework-frameworkcontrol.html#cfn-backup-framework-frameworkcontrol-controlscope
+	ControlScope interface{} `json:"ControlScope,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Framework_FrameworkControl) AWSCloudFormationType() string {
+	return "AWS::Backup::Framework.FrameworkControl"
+}
diff --git a/goformation/cloudformation/backup/aws-backup-reportplan.go b/goformation/cloudformation/backup/aws-backup-reportplan.go
new file mode 100644
index 0000000000..0f9ef8b10d
--- /dev/null
+++ b/goformation/cloudformation/backup/aws-backup-reportplan.go
@@ -0,0 +1,129 @@
+package backup
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReportPlan AWS CloudFormation Resource (AWS::Backup::ReportPlan)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-reportplan.html
+type ReportPlan struct {
+
+	// ReportDeliveryChannel AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-reportplan.html#cfn-backup-reportplan-reportdeliverychannel
+	ReportDeliveryChannel interface{} `json:"ReportDeliveryChannel,omitempty"`
+
+	// ReportPlanDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-reportplan.html#cfn-backup-reportplan-reportplandescription
+	ReportPlanDescription *types.Value `json:"ReportPlanDescription,omitempty"`
+
+	// ReportPlanName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-reportplan.html#cfn-backup-reportplan-reportplanname
+	ReportPlanName *types.Value `json:"ReportPlanName,omitempty"`
+
+	// ReportPlanTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-reportplan.html#cfn-backup-reportplan-reportplantags
+	ReportPlanTags []cloudformation.Tag `json:"ReportPlanTags,omitempty"`
+
+	// ReportSetting AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-backup-reportplan.html#cfn-backup-reportplan-reportsetting
+	ReportSetting interface{} `json:"ReportSetting,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReportPlan) AWSCloudFormationType() string {
+	return "AWS::Backup::ReportPlan"
+}
+
+// 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 ReportPlan) MarshalJSON() ([]byte, error) {
+	type Properties ReportPlan
+	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 *ReportPlan) UnmarshalJSON(b []byte) error {
+	type Properties ReportPlan
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ReportPlan(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/batch/aws-batch-computeenvironment.go b/goformation/cloudformation/batch/aws-batch-computeenvironment.go
new file mode 100644
index 0000000000..d6f8f3da13
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-computeenvironment.go
@@ -0,0 +1,138 @@
+package batch
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ComputeEnvironment AWS CloudFormation Resource (AWS::Batch::ComputeEnvironment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html
+type ComputeEnvironment struct {
+
+	// ComputeEnvironmentName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-computeenvironmentname
+	ComputeEnvironmentName *types.Value `json:"ComputeEnvironmentName,omitempty"`
+
+	// ComputeResources AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-computeresources
+	ComputeResources *ComputeEnvironment_ComputeResources `json:"ComputeResources,omitempty"`
+
+	// ServiceRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-servicerole
+	ServiceRole *types.Value `json:"ServiceRole,omitempty"`
+
+	// State AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-state
+	State *types.Value `json:"State,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-tags
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// UnmanagedvCpus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-computeenvironment.html#cfn-batch-computeenvironment-unmanagedvcpus
+	UnmanagedvCpus *types.Value `json:"UnmanagedvCpus,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ComputeEnvironment) AWSCloudFormationType() string {
+	return "AWS::Batch::ComputeEnvironment"
+}
+
+// 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 ComputeEnvironment) MarshalJSON() ([]byte, error) {
+	type Properties ComputeEnvironment
+	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 *ComputeEnvironment) UnmarshalJSON(b []byte) error {
+	type Properties ComputeEnvironment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ComputeEnvironment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/batch/aws-batch-computeenvironment_computeresources.go b/goformation/cloudformation/batch/aws-batch-computeenvironment_computeresources.go
new file mode 100644
index 0000000000..d6e5065882
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-computeenvironment_computeresources.go
@@ -0,0 +1,117 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ComputeEnvironment_ComputeResources AWS CloudFormation Resource (AWS::Batch::ComputeEnvironment.ComputeResources)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html
+type ComputeEnvironment_ComputeResources struct {
+
+	// AllocationStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-allocationstrategy
+	AllocationStrategy *types.Value `json:"AllocationStrategy,omitempty"`
+
+	// BidPercentage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-bidpercentage
+	BidPercentage *types.Value `json:"BidPercentage,omitempty"`
+
+	// DesiredvCpus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-desiredvcpus
+	DesiredvCpus *types.Value `json:"DesiredvCpus,omitempty"`
+
+	// Ec2Configuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-ec2configuration
+	Ec2Configuration []ComputeEnvironment_Ec2ConfigurationObject `json:"Ec2Configuration,omitempty"`
+
+	// Ec2KeyPair AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-ec2keypair
+	Ec2KeyPair *types.Value `json:"Ec2KeyPair,omitempty"`
+
+	// ImageId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-imageid
+	ImageId *types.Value `json:"ImageId,omitempty"`
+
+	// InstanceRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-instancerole
+	InstanceRole *types.Value `json:"InstanceRole,omitempty"`
+
+	// InstanceTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-instancetypes
+	InstanceTypes *types.Value `json:"InstanceTypes,omitempty"`
+
+	// LaunchTemplate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-launchtemplate
+	LaunchTemplate *ComputeEnvironment_LaunchTemplateSpecification `json:"LaunchTemplate,omitempty"`
+
+	// MaxvCpus AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-maxvcpus
+	MaxvCpus *types.Value `json:"MaxvCpus"`
+
+	// MinvCpus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-minvcpus
+	MinvCpus *types.Value `json:"MinvCpus,omitempty"`
+
+	// PlacementGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-placementgroup
+	PlacementGroup *types.Value `json:"PlacementGroup,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SpotIamFleetRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-spotiamfleetrole
+	SpotIamFleetRole *types.Value `json:"SpotIamFleetRole,omitempty"`
+
+	// Subnets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-subnets
+	Subnets *types.Value `json:"Subnets,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-tags
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-computeresources.html#cfn-batch-computeenvironment-computeresources-type
+	Type *types.Value `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 *ComputeEnvironment_ComputeResources) AWSCloudFormationType() string {
+	return "AWS::Batch::ComputeEnvironment.ComputeResources"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-computeenvironment_ec2configurationobject.go b/goformation/cloudformation/batch/aws-batch-computeenvironment_ec2configurationobject.go
new file mode 100644
index 0000000000..01b9845de2
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-computeenvironment_ec2configurationobject.go
@@ -0,0 +1,42 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ComputeEnvironment_Ec2ConfigurationObject AWS CloudFormation Resource (AWS::Batch::ComputeEnvironment.Ec2ConfigurationObject)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-ec2configurationobject.html
+type ComputeEnvironment_Ec2ConfigurationObject struct {
+
+	// ImageIdOverride AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-ec2configurationobject.html#cfn-batch-computeenvironment-ec2configurationobject-imageidoverride
+	ImageIdOverride *types.Value `json:"ImageIdOverride,omitempty"`
+
+	// ImageType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-ec2configurationobject.html#cfn-batch-computeenvironment-ec2configurationobject-imagetype
+	ImageType *types.Value `json:"ImageType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ComputeEnvironment_Ec2ConfigurationObject) AWSCloudFormationType() string {
+	return "AWS::Batch::ComputeEnvironment.Ec2ConfigurationObject"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-computeenvironment_launchtemplatespecification.go b/goformation/cloudformation/batch/aws-batch-computeenvironment_launchtemplatespecification.go
new file mode 100644
index 0000000000..6b2a604fa3
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-computeenvironment_launchtemplatespecification.go
@@ -0,0 +1,47 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ComputeEnvironment_LaunchTemplateSpecification AWS CloudFormation Resource (AWS::Batch::ComputeEnvironment.LaunchTemplateSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-launchtemplatespecification.html
+type ComputeEnvironment_LaunchTemplateSpecification struct {
+
+	// LaunchTemplateId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-launchtemplatespecification.html#cfn-batch-computeenvironment-launchtemplatespecification-launchtemplateid
+	LaunchTemplateId *types.Value `json:"LaunchTemplateId,omitempty"`
+
+	// LaunchTemplateName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-launchtemplatespecification.html#cfn-batch-computeenvironment-launchtemplatespecification-launchtemplatename
+	LaunchTemplateName *types.Value `json:"LaunchTemplateName,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-computeenvironment-launchtemplatespecification.html#cfn-batch-computeenvironment-launchtemplatespecification-version
+	Version *types.Value `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 *ComputeEnvironment_LaunchTemplateSpecification) AWSCloudFormationType() string {
+	return "AWS::Batch::ComputeEnvironment.LaunchTemplateSpecification"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition.go b/goformation/cloudformation/batch/aws-batch-jobdefinition.go
new file mode 100644
index 0000000000..0f03620333
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition.go
@@ -0,0 +1,158 @@
+package batch
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition AWS CloudFormation Resource (AWS::Batch::JobDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html
+type JobDefinition struct {
+
+	// ContainerProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-containerproperties
+	ContainerProperties *JobDefinition_ContainerProperties `json:"ContainerProperties,omitempty"`
+
+	// JobDefinitionName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-jobdefinitionname
+	JobDefinitionName *types.Value `json:"JobDefinitionName,omitempty"`
+
+	// NodeProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-nodeproperties
+	NodeProperties *JobDefinition_NodeProperties `json:"NodeProperties,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-parameters
+	Parameters interface{} `json:"Parameters,omitempty"`
+
+	// PlatformCapabilities AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-platformcapabilities
+	PlatformCapabilities *types.Value `json:"PlatformCapabilities,omitempty"`
+
+	// PropagateTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-propagatetags
+	PropagateTags *types.Value `json:"PropagateTags,omitempty"`
+
+	// RetryStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-retrystrategy
+	RetryStrategy *JobDefinition_RetryStrategy `json:"RetryStrategy,omitempty"`
+
+	// SchedulingPriority AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-schedulingpriority
+	SchedulingPriority *types.Value `json:"SchedulingPriority,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-tags
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// Timeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-timeout
+	Timeout *JobDefinition_Timeout `json:"Timeout,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobdefinition.html#cfn-batch-jobdefinition-type
+	Type *types.Value `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 *JobDefinition) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition"
+}
+
+// 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 JobDefinition) MarshalJSON() ([]byte, error) {
+	type Properties JobDefinition
+	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 *JobDefinition) UnmarshalJSON(b []byte) error {
+	type Properties JobDefinition
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = JobDefinition(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/batch/aws-batch-jobdefinition_authorizationconfig.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_authorizationconfig.go
new file mode 100644
index 0000000000..357c8d18ac
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_authorizationconfig.go
@@ -0,0 +1,42 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_AuthorizationConfig AWS CloudFormation Resource (AWS::Batch::JobDefinition.AuthorizationConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-authorizationconfig.html
+type JobDefinition_AuthorizationConfig struct {
+
+	// AccessPointId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-authorizationconfig.html#cfn-batch-jobdefinition-authorizationconfig-accesspointid
+	AccessPointId *types.Value `json:"AccessPointId,omitempty"`
+
+	// Iam AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-authorizationconfig.html#cfn-batch-jobdefinition-authorizationconfig-iam
+	Iam *types.Value `json:"Iam,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobDefinition_AuthorizationConfig) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.AuthorizationConfig"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_containerproperties.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_containerproperties.go
new file mode 100644
index 0000000000..14338f6921
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_containerproperties.go
@@ -0,0 +1,132 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_ContainerProperties AWS CloudFormation Resource (AWS::Batch::JobDefinition.ContainerProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html
+type JobDefinition_ContainerProperties struct {
+
+	// Command AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-command
+	Command *types.Value `json:"Command,omitempty"`
+
+	// Environment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-environment
+	Environment []JobDefinition_Environment `json:"Environment,omitempty"`
+
+	// ExecutionRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-executionrolearn
+	ExecutionRoleArn *types.Value `json:"ExecutionRoleArn,omitempty"`
+
+	// FargatePlatformConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-fargateplatformconfiguration
+	FargatePlatformConfiguration *JobDefinition_FargatePlatformConfiguration `json:"FargatePlatformConfiguration,omitempty"`
+
+	// Image AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-image
+	Image *types.Value `json:"Image,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// JobRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-jobrolearn
+	JobRoleArn *types.Value `json:"JobRoleArn,omitempty"`
+
+	// LinuxParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-linuxparameters
+	LinuxParameters *JobDefinition_LinuxParameters `json:"LinuxParameters,omitempty"`
+
+	// LogConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-logconfiguration
+	LogConfiguration *JobDefinition_LogConfiguration `json:"LogConfiguration,omitempty"`
+
+	// Memory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-memory
+	Memory *types.Value `json:"Memory,omitempty"`
+
+	// MountPoints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-mountpoints
+	MountPoints []JobDefinition_MountPoints `json:"MountPoints,omitempty"`
+
+	// NetworkConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-networkconfiguration
+	NetworkConfiguration *JobDefinition_NetworkConfiguration `json:"NetworkConfiguration,omitempty"`
+
+	// Privileged AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-privileged
+	Privileged *types.Value `json:"Privileged,omitempty"`
+
+	// ReadonlyRootFilesystem AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-readonlyrootfilesystem
+	ReadonlyRootFilesystem *types.Value `json:"ReadonlyRootFilesystem,omitempty"`
+
+	// ResourceRequirements AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-resourcerequirements
+	ResourceRequirements []JobDefinition_ResourceRequirement `json:"ResourceRequirements,omitempty"`
+
+	// Secrets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-secrets
+	Secrets []JobDefinition_Secret `json:"Secrets,omitempty"`
+
+	// Ulimits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-ulimits
+	Ulimits []JobDefinition_Ulimit `json:"Ulimits,omitempty"`
+
+	// User AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-user
+	User *types.Value `json:"User,omitempty"`
+
+	// Vcpus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-vcpus
+	Vcpus *types.Value `json:"Vcpus,omitempty"`
+
+	// Volumes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties.html#cfn-batch-jobdefinition-containerproperties-volumes
+	Volumes []JobDefinition_Volumes `json:"Volumes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobDefinition_ContainerProperties) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.ContainerProperties"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_device.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_device.go
new file mode 100644
index 0000000000..e73e4ff7c6
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_device.go
@@ -0,0 +1,47 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_Device AWS CloudFormation Resource (AWS::Batch::JobDefinition.Device)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-device.html
+type JobDefinition_Device struct {
+
+	// ContainerPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-device.html#cfn-batch-jobdefinition-device-containerpath
+	ContainerPath *types.Value `json:"ContainerPath,omitempty"`
+
+	// HostPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-device.html#cfn-batch-jobdefinition-device-hostpath
+	HostPath *types.Value `json:"HostPath,omitempty"`
+
+	// Permissions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-device.html#cfn-batch-jobdefinition-device-permissions
+	Permissions *types.Value `json:"Permissions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobDefinition_Device) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.Device"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_efsvolumeconfiguration.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_efsvolumeconfiguration.go
new file mode 100644
index 0000000000..cdbfd21bc4
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_efsvolumeconfiguration.go
@@ -0,0 +1,57 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_EfsVolumeConfiguration AWS CloudFormation Resource (AWS::Batch::JobDefinition.EfsVolumeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-efsvolumeconfiguration.html
+type JobDefinition_EfsVolumeConfiguration struct {
+
+	// AuthorizationConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-efsvolumeconfiguration.html#cfn-batch-jobdefinition-efsvolumeconfiguration-authorizationconfig
+	AuthorizationConfig *JobDefinition_AuthorizationConfig `json:"AuthorizationConfig,omitempty"`
+
+	// FileSystemId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-efsvolumeconfiguration.html#cfn-batch-jobdefinition-efsvolumeconfiguration-filesystemid
+	FileSystemId *types.Value `json:"FileSystemId,omitempty"`
+
+	// RootDirectory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-efsvolumeconfiguration.html#cfn-batch-jobdefinition-efsvolumeconfiguration-rootdirectory
+	RootDirectory *types.Value `json:"RootDirectory,omitempty"`
+
+	// TransitEncryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-efsvolumeconfiguration.html#cfn-batch-jobdefinition-efsvolumeconfiguration-transitencryption
+	TransitEncryption *types.Value `json:"TransitEncryption,omitempty"`
+
+	// TransitEncryptionPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-efsvolumeconfiguration.html#cfn-batch-jobdefinition-efsvolumeconfiguration-transitencryptionport
+	TransitEncryptionPort *types.Value `json:"TransitEncryptionPort,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobDefinition_EfsVolumeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.EfsVolumeConfiguration"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_environment.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_environment.go
new file mode 100644
index 0000000000..d278843c4f
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_environment.go
@@ -0,0 +1,42 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_Environment AWS CloudFormation Resource (AWS::Batch::JobDefinition.Environment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-environment.html
+type JobDefinition_Environment struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-environment.html#cfn-batch-jobdefinition-environment-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-environment.html#cfn-batch-jobdefinition-environment-value
+	Value *types.Value `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 *JobDefinition_Environment) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.Environment"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_evaluateonexit.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_evaluateonexit.go
new file mode 100644
index 0000000000..bf93aaf3e0
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_evaluateonexit.go
@@ -0,0 +1,52 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_EvaluateOnExit AWS CloudFormation Resource (AWS::Batch::JobDefinition.EvaluateOnExit)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-evaluateonexit.html
+type JobDefinition_EvaluateOnExit struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-evaluateonexit.html#cfn-batch-jobdefinition-evaluateonexit-action
+	Action *types.Value `json:"Action,omitempty"`
+
+	// OnExitCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-evaluateonexit.html#cfn-batch-jobdefinition-evaluateonexit-onexitcode
+	OnExitCode *types.Value `json:"OnExitCode,omitempty"`
+
+	// OnReason AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-evaluateonexit.html#cfn-batch-jobdefinition-evaluateonexit-onreason
+	OnReason *types.Value `json:"OnReason,omitempty"`
+
+	// OnStatusReason AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-evaluateonexit.html#cfn-batch-jobdefinition-evaluateonexit-onstatusreason
+	OnStatusReason *types.Value `json:"OnStatusReason,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobDefinition_EvaluateOnExit) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.EvaluateOnExit"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_fargateplatformconfiguration.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_fargateplatformconfiguration.go
new file mode 100644
index 0000000000..87ed3ffcbc
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_fargateplatformconfiguration.go
@@ -0,0 +1,37 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_FargatePlatformConfiguration AWS CloudFormation Resource (AWS::Batch::JobDefinition.FargatePlatformConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-fargateplatformconfiguration.html
+type JobDefinition_FargatePlatformConfiguration struct {
+
+	// PlatformVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-fargateplatformconfiguration.html#cfn-batch-jobdefinition-containerproperties-fargateplatformconfiguration-platformversion
+	PlatformVersion *types.Value `json:"PlatformVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobDefinition_FargatePlatformConfiguration) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.FargatePlatformConfiguration"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_linuxparameters.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_linuxparameters.go
new file mode 100644
index 0000000000..1ebdccc63b
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_linuxparameters.go
@@ -0,0 +1,62 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_LinuxParameters AWS CloudFormation Resource (AWS::Batch::JobDefinition.LinuxParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-linuxparameters.html
+type JobDefinition_LinuxParameters struct {
+
+	// Devices AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-linuxparameters.html#cfn-batch-jobdefinition-containerproperties-linuxparameters-devices
+	Devices []JobDefinition_Device `json:"Devices,omitempty"`
+
+	// InitProcessEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-linuxparameters.html#cfn-batch-jobdefinition-containerproperties-linuxparameters-initprocessenabled
+	InitProcessEnabled *types.Value `json:"InitProcessEnabled,omitempty"`
+
+	// MaxSwap AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-linuxparameters.html#cfn-batch-jobdefinition-containerproperties-linuxparameters-maxswap
+	MaxSwap *types.Value `json:"MaxSwap,omitempty"`
+
+	// SharedMemorySize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-linuxparameters.html#cfn-batch-jobdefinition-containerproperties-linuxparameters-sharedmemorysize
+	SharedMemorySize *types.Value `json:"SharedMemorySize,omitempty"`
+
+	// Swappiness AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-linuxparameters.html#cfn-batch-jobdefinition-containerproperties-linuxparameters-swappiness
+	Swappiness *types.Value `json:"Swappiness,omitempty"`
+
+	// Tmpfs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-linuxparameters.html#cfn-batch-jobdefinition-containerproperties-linuxparameters-tmpfs
+	Tmpfs []JobDefinition_Tmpfs `json:"Tmpfs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobDefinition_LinuxParameters) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.LinuxParameters"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_logconfiguration.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_logconfiguration.go
new file mode 100644
index 0000000000..fda01d5b73
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_logconfiguration.go
@@ -0,0 +1,47 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_LogConfiguration AWS CloudFormation Resource (AWS::Batch::JobDefinition.LogConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-logconfiguration.html
+type JobDefinition_LogConfiguration struct {
+
+	// LogDriver AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-logconfiguration.html#cfn-batch-jobdefinition-containerproperties-logconfiguration-logdriver
+	LogDriver *types.Value `json:"LogDriver,omitempty"`
+
+	// Options AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-logconfiguration.html#cfn-batch-jobdefinition-containerproperties-logconfiguration-options
+	Options interface{} `json:"Options,omitempty"`
+
+	// SecretOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-logconfiguration.html#cfn-batch-jobdefinition-containerproperties-logconfiguration-secretoptions
+	SecretOptions []JobDefinition_Secret `json:"SecretOptions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobDefinition_LogConfiguration) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.LogConfiguration"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_mountpoints.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_mountpoints.go
new file mode 100644
index 0000000000..a116bf72c0
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_mountpoints.go
@@ -0,0 +1,47 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_MountPoints AWS CloudFormation Resource (AWS::Batch::JobDefinition.MountPoints)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-mountpoints.html
+type JobDefinition_MountPoints struct {
+
+	// ContainerPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-mountpoints.html#cfn-batch-jobdefinition-mountpoints-containerpath
+	ContainerPath *types.Value `json:"ContainerPath,omitempty"`
+
+	// ReadOnly AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-mountpoints.html#cfn-batch-jobdefinition-mountpoints-readonly
+	ReadOnly *types.Value `json:"ReadOnly,omitempty"`
+
+	// SourceVolume AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-mountpoints.html#cfn-batch-jobdefinition-mountpoints-sourcevolume
+	SourceVolume *types.Value `json:"SourceVolume,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobDefinition_MountPoints) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.MountPoints"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_networkconfiguration.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_networkconfiguration.go
new file mode 100644
index 0000000000..8596c4af1f
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_networkconfiguration.go
@@ -0,0 +1,37 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_NetworkConfiguration AWS CloudFormation Resource (AWS::Batch::JobDefinition.NetworkConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-networkconfiguration.html
+type JobDefinition_NetworkConfiguration struct {
+
+	// AssignPublicIp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-containerproperties-networkconfiguration.html#cfn-batch-jobdefinition-containerproperties-networkconfiguration-assignpublicip
+	AssignPublicIp *types.Value `json:"AssignPublicIp,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobDefinition_NetworkConfiguration) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.NetworkConfiguration"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_nodeproperties.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_nodeproperties.go
new file mode 100644
index 0000000000..586f3565f7
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_nodeproperties.go
@@ -0,0 +1,47 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_NodeProperties AWS CloudFormation Resource (AWS::Batch::JobDefinition.NodeProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-nodeproperties.html
+type JobDefinition_NodeProperties struct {
+
+	// MainNode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-nodeproperties.html#cfn-batch-jobdefinition-nodeproperties-mainnode
+	MainNode *types.Value `json:"MainNode"`
+
+	// NodeRangeProperties AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-nodeproperties.html#cfn-batch-jobdefinition-nodeproperties-noderangeproperties
+	NodeRangeProperties []JobDefinition_NodeRangeProperty `json:"NodeRangeProperties,omitempty"`
+
+	// NumNodes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-nodeproperties.html#cfn-batch-jobdefinition-nodeproperties-numnodes
+	NumNodes *types.Value `json:"NumNodes"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobDefinition_NodeProperties) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.NodeProperties"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_noderangeproperty.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_noderangeproperty.go
new file mode 100644
index 0000000000..8140d3afad
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_noderangeproperty.go
@@ -0,0 +1,42 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_NodeRangeProperty AWS CloudFormation Resource (AWS::Batch::JobDefinition.NodeRangeProperty)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-noderangeproperty.html
+type JobDefinition_NodeRangeProperty struct {
+
+	// Container AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-noderangeproperty.html#cfn-batch-jobdefinition-noderangeproperty-container
+	Container *JobDefinition_ContainerProperties `json:"Container,omitempty"`
+
+	// TargetNodes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-noderangeproperty.html#cfn-batch-jobdefinition-noderangeproperty-targetnodes
+	TargetNodes *types.Value `json:"TargetNodes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobDefinition_NodeRangeProperty) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.NodeRangeProperty"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_resourcerequirement.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_resourcerequirement.go
new file mode 100644
index 0000000000..cd4635a4ac
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_resourcerequirement.go
@@ -0,0 +1,42 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_ResourceRequirement AWS CloudFormation Resource (AWS::Batch::JobDefinition.ResourceRequirement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-resourcerequirement.html
+type JobDefinition_ResourceRequirement struct {
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-resourcerequirement.html#cfn-batch-jobdefinition-resourcerequirement-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-resourcerequirement.html#cfn-batch-jobdefinition-resourcerequirement-value
+	Value *types.Value `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 *JobDefinition_ResourceRequirement) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.ResourceRequirement"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_retrystrategy.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_retrystrategy.go
new file mode 100644
index 0000000000..58b172b6a6
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_retrystrategy.go
@@ -0,0 +1,42 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_RetryStrategy AWS CloudFormation Resource (AWS::Batch::JobDefinition.RetryStrategy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-retrystrategy.html
+type JobDefinition_RetryStrategy struct {
+
+	// Attempts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-retrystrategy.html#cfn-batch-jobdefinition-retrystrategy-attempts
+	Attempts *types.Value `json:"Attempts,omitempty"`
+
+	// EvaluateOnExit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-retrystrategy.html#cfn-batch-jobdefinition-retrystrategy-evaluateonexit
+	EvaluateOnExit []JobDefinition_EvaluateOnExit `json:"EvaluateOnExit,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobDefinition_RetryStrategy) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.RetryStrategy"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_secret.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_secret.go
new file mode 100644
index 0000000000..4da8fc2d4b
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_secret.go
@@ -0,0 +1,42 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_Secret AWS CloudFormation Resource (AWS::Batch::JobDefinition.Secret)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-secret.html
+type JobDefinition_Secret struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-secret.html#cfn-batch-jobdefinition-secret-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ValueFrom AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-secret.html#cfn-batch-jobdefinition-secret-valuefrom
+	ValueFrom *types.Value `json:"ValueFrom,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobDefinition_Secret) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.Secret"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_timeout.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_timeout.go
new file mode 100644
index 0000000000..2d39443d3f
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_timeout.go
@@ -0,0 +1,37 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_Timeout AWS CloudFormation Resource (AWS::Batch::JobDefinition.Timeout)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-timeout.html
+type JobDefinition_Timeout struct {
+
+	// AttemptDurationSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-timeout.html#cfn-batch-jobdefinition-timeout-attemptdurationseconds
+	AttemptDurationSeconds *types.Value `json:"AttemptDurationSeconds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobDefinition_Timeout) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.Timeout"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_tmpfs.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_tmpfs.go
new file mode 100644
index 0000000000..6b062a2cb7
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_tmpfs.go
@@ -0,0 +1,47 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_Tmpfs AWS CloudFormation Resource (AWS::Batch::JobDefinition.Tmpfs)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-tmpfs.html
+type JobDefinition_Tmpfs struct {
+
+	// ContainerPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-tmpfs.html#cfn-batch-jobdefinition-tmpfs-containerpath
+	ContainerPath *types.Value `json:"ContainerPath,omitempty"`
+
+	// MountOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-tmpfs.html#cfn-batch-jobdefinition-tmpfs-mountoptions
+	MountOptions *types.Value `json:"MountOptions,omitempty"`
+
+	// Size AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-tmpfs.html#cfn-batch-jobdefinition-tmpfs-size
+	Size *types.Value `json:"Size"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobDefinition_Tmpfs) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.Tmpfs"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_ulimit.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_ulimit.go
new file mode 100644
index 0000000000..c99354d67d
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_ulimit.go
@@ -0,0 +1,47 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_Ulimit AWS CloudFormation Resource (AWS::Batch::JobDefinition.Ulimit)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-ulimit.html
+type JobDefinition_Ulimit struct {
+
+	// HardLimit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-ulimit.html#cfn-batch-jobdefinition-ulimit-hardlimit
+	HardLimit *types.Value `json:"HardLimit"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-ulimit.html#cfn-batch-jobdefinition-ulimit-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SoftLimit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-ulimit.html#cfn-batch-jobdefinition-ulimit-softlimit
+	SoftLimit *types.Value `json:"SoftLimit"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobDefinition_Ulimit) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.Ulimit"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_volumes.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_volumes.go
new file mode 100644
index 0000000000..88de1c5f74
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_volumes.go
@@ -0,0 +1,47 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_Volumes AWS CloudFormation Resource (AWS::Batch::JobDefinition.Volumes)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-volumes.html
+type JobDefinition_Volumes struct {
+
+	// EfsVolumeConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-volumes.html#cfn-batch-jobdefinition-volumes-efsvolumeconfiguration
+	EfsVolumeConfiguration *JobDefinition_EfsVolumeConfiguration `json:"EfsVolumeConfiguration,omitempty"`
+
+	// Host AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-volumes.html#cfn-batch-jobdefinition-volumes-host
+	Host *JobDefinition_VolumesHost `json:"Host,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-volumes.html#cfn-batch-jobdefinition-volumes-name
+	Name *types.Value `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 *JobDefinition_Volumes) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.Volumes"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobdefinition_volumeshost.go b/goformation/cloudformation/batch/aws-batch-jobdefinition_volumeshost.go
new file mode 100644
index 0000000000..8d9e27673e
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobdefinition_volumeshost.go
@@ -0,0 +1,37 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobDefinition_VolumesHost AWS CloudFormation Resource (AWS::Batch::JobDefinition.VolumesHost)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-volumeshost.html
+type JobDefinition_VolumesHost struct {
+
+	// SourcePath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobdefinition-volumeshost.html#cfn-batch-jobdefinition-volumeshost-sourcepath
+	SourcePath *types.Value `json:"SourcePath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobDefinition_VolumesHost) AWSCloudFormationType() string {
+	return "AWS::Batch::JobDefinition.VolumesHost"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-jobqueue.go b/goformation/cloudformation/batch/aws-batch-jobqueue.go
new file mode 100644
index 0000000000..82d39e4761
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobqueue.go
@@ -0,0 +1,133 @@
+package batch
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobQueue AWS CloudFormation Resource (AWS::Batch::JobQueue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html
+type JobQueue struct {
+
+	// ComputeEnvironmentOrder AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-computeenvironmentorder
+	ComputeEnvironmentOrder []JobQueue_ComputeEnvironmentOrder `json:"ComputeEnvironmentOrder,omitempty"`
+
+	// JobQueueName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-jobqueuename
+	JobQueueName *types.Value `json:"JobQueueName,omitempty"`
+
+	// Priority AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-priority
+	Priority *types.Value `json:"Priority"`
+
+	// SchedulingPolicyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-schedulingpolicyarn
+	SchedulingPolicyArn *types.Value `json:"SchedulingPolicyArn,omitempty"`
+
+	// State AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-state
+	State *types.Value `json:"State,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-jobqueue.html#cfn-batch-jobqueue-tags
+	Tags interface{} `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 *JobQueue) AWSCloudFormationType() string {
+	return "AWS::Batch::JobQueue"
+}
+
+// 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 JobQueue) MarshalJSON() ([]byte, error) {
+	type Properties JobQueue
+	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 *JobQueue) UnmarshalJSON(b []byte) error {
+	type Properties JobQueue
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = JobQueue(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/batch/aws-batch-jobqueue_computeenvironmentorder.go b/goformation/cloudformation/batch/aws-batch-jobqueue_computeenvironmentorder.go
new file mode 100644
index 0000000000..18b677352f
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-jobqueue_computeenvironmentorder.go
@@ -0,0 +1,42 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobQueue_ComputeEnvironmentOrder AWS CloudFormation Resource (AWS::Batch::JobQueue.ComputeEnvironmentOrder)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobqueue-computeenvironmentorder.html
+type JobQueue_ComputeEnvironmentOrder struct {
+
+	// ComputeEnvironment AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobqueue-computeenvironmentorder.html#cfn-batch-jobqueue-computeenvironmentorder-computeenvironment
+	ComputeEnvironment *types.Value `json:"ComputeEnvironment,omitempty"`
+
+	// Order AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-jobqueue-computeenvironmentorder.html#cfn-batch-jobqueue-computeenvironmentorder-order
+	Order *types.Value `json:"Order"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobQueue_ComputeEnvironmentOrder) AWSCloudFormationType() string {
+	return "AWS::Batch::JobQueue.ComputeEnvironmentOrder"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-schedulingpolicy.go b/goformation/cloudformation/batch/aws-batch-schedulingpolicy.go
new file mode 100644
index 0000000000..e00a3db548
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-schedulingpolicy.go
@@ -0,0 +1,118 @@
+package batch
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SchedulingPolicy AWS CloudFormation Resource (AWS::Batch::SchedulingPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-schedulingpolicy.html
+type SchedulingPolicy struct {
+
+	// FairsharePolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-schedulingpolicy.html#cfn-batch-schedulingpolicy-fairsharepolicy
+	FairsharePolicy *SchedulingPolicy_FairsharePolicy `json:"FairsharePolicy,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-schedulingpolicy.html#cfn-batch-schedulingpolicy-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-batch-schedulingpolicy.html#cfn-batch-schedulingpolicy-tags
+	Tags map[string]*types.Value `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 *SchedulingPolicy) AWSCloudFormationType() string {
+	return "AWS::Batch::SchedulingPolicy"
+}
+
+// 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 SchedulingPolicy) MarshalJSON() ([]byte, error) {
+	type Properties SchedulingPolicy
+	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 *SchedulingPolicy) UnmarshalJSON(b []byte) error {
+	type Properties SchedulingPolicy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SchedulingPolicy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/batch/aws-batch-schedulingpolicy_fairsharepolicy.go b/goformation/cloudformation/batch/aws-batch-schedulingpolicy_fairsharepolicy.go
new file mode 100644
index 0000000000..edb3559f1e
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-schedulingpolicy_fairsharepolicy.go
@@ -0,0 +1,47 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SchedulingPolicy_FairsharePolicy AWS CloudFormation Resource (AWS::Batch::SchedulingPolicy.FairsharePolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-schedulingpolicy-fairsharepolicy.html
+type SchedulingPolicy_FairsharePolicy struct {
+
+	// ComputeReservation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-schedulingpolicy-fairsharepolicy.html#cfn-batch-schedulingpolicy-fairsharepolicy-computereservation
+	ComputeReservation *types.Value `json:"ComputeReservation,omitempty"`
+
+	// ShareDecaySeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-schedulingpolicy-fairsharepolicy.html#cfn-batch-schedulingpolicy-fairsharepolicy-sharedecayseconds
+	ShareDecaySeconds *types.Value `json:"ShareDecaySeconds,omitempty"`
+
+	// ShareDistribution AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-schedulingpolicy-fairsharepolicy.html#cfn-batch-schedulingpolicy-fairsharepolicy-sharedistribution
+	ShareDistribution []SchedulingPolicy_ShareAttributes `json:"ShareDistribution,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SchedulingPolicy_FairsharePolicy) AWSCloudFormationType() string {
+	return "AWS::Batch::SchedulingPolicy.FairsharePolicy"
+}
diff --git a/goformation/cloudformation/batch/aws-batch-schedulingpolicy_shareattributes.go b/goformation/cloudformation/batch/aws-batch-schedulingpolicy_shareattributes.go
new file mode 100644
index 0000000000..222cd172be
--- /dev/null
+++ b/goformation/cloudformation/batch/aws-batch-schedulingpolicy_shareattributes.go
@@ -0,0 +1,42 @@
+package batch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SchedulingPolicy_ShareAttributes AWS CloudFormation Resource (AWS::Batch::SchedulingPolicy.ShareAttributes)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-schedulingpolicy-shareattributes.html
+type SchedulingPolicy_ShareAttributes struct {
+
+	// ShareIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-schedulingpolicy-shareattributes.html#cfn-batch-schedulingpolicy-shareattributes-shareidentifier
+	ShareIdentifier *types.Value `json:"ShareIdentifier,omitempty"`
+
+	// WeightFactor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-batch-schedulingpolicy-shareattributes.html#cfn-batch-schedulingpolicy-shareattributes-weightfactor
+	WeightFactor *types.Value `json:"WeightFactor,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SchedulingPolicy_ShareAttributes) AWSCloudFormationType() string {
+	return "AWS::Batch::SchedulingPolicy.ShareAttributes"
+}
diff --git a/goformation/cloudformation/budgets/aws-budgets-budget.go b/goformation/cloudformation/budgets/aws-budgets-budget.go
new file mode 100644
index 0000000000..e68022a299
--- /dev/null
+++ b/goformation/cloudformation/budgets/aws-budgets-budget.go
@@ -0,0 +1,111 @@
+package budgets
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Budget AWS CloudFormation Resource (AWS::Budgets::Budget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-budgets-budget.html
+type Budget struct {
+
+	// Budget AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-budgets-budget.html#cfn-budgets-budget-budget
+	Budget *Budget_BudgetData `json:"Budget,omitempty"`
+
+	// NotificationsWithSubscribers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-budgets-budget.html#cfn-budgets-budget-notificationswithsubscribers
+	NotificationsWithSubscribers []Budget_NotificationWithSubscribers `json:"NotificationsWithSubscribers,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::Budgets::Budget"
+}
+
+// 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 Budget) MarshalJSON() ([]byte, error) {
+	type Properties Budget
+	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 *Budget) UnmarshalJSON(b []byte) error {
+	type Properties Budget
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Budget(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/budgets/aws-budgets-budget_budgetdata.go b/goformation/cloudformation/budgets/aws-budgets-budget_budgetdata.go
new file mode 100644
index 0000000000..ae419e0974
--- /dev/null
+++ b/goformation/cloudformation/budgets/aws-budgets-budget_budgetdata.go
@@ -0,0 +1,72 @@
+package budgets
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Budget_BudgetData AWS CloudFormation Resource (AWS::Budgets::Budget.BudgetData)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-budgetdata.html
+type Budget_BudgetData struct {
+
+	// BudgetLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-budgetdata.html#cfn-budgets-budget-budgetdata-budgetlimit
+	BudgetLimit *Budget_Spend `json:"BudgetLimit,omitempty"`
+
+	// BudgetName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-budgetdata.html#cfn-budgets-budget-budgetdata-budgetname
+	BudgetName *types.Value `json:"BudgetName,omitempty"`
+
+	// BudgetType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-budgetdata.html#cfn-budgets-budget-budgetdata-budgettype
+	BudgetType *types.Value `json:"BudgetType,omitempty"`
+
+	// CostFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-budgetdata.html#cfn-budgets-budget-budgetdata-costfilters
+	CostFilters interface{} `json:"CostFilters,omitempty"`
+
+	// CostTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-budgetdata.html#cfn-budgets-budget-budgetdata-costtypes
+	CostTypes *Budget_CostTypes `json:"CostTypes,omitempty"`
+
+	// PlannedBudgetLimits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-budgetdata.html#cfn-budgets-budget-budgetdata-plannedbudgetlimits
+	PlannedBudgetLimits interface{} `json:"PlannedBudgetLimits,omitempty"`
+
+	// TimePeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-budgetdata.html#cfn-budgets-budget-budgetdata-timeperiod
+	TimePeriod *Budget_TimePeriod `json:"TimePeriod,omitempty"`
+
+	// TimeUnit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-budgetdata.html#cfn-budgets-budget-budgetdata-timeunit
+	TimeUnit *types.Value `json:"TimeUnit,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_BudgetData) AWSCloudFormationType() string {
+	return "AWS::Budgets::Budget.BudgetData"
+}
diff --git a/goformation/cloudformation/budgets/aws-budgets-budget_costtypes.go b/goformation/cloudformation/budgets/aws-budgets-budget_costtypes.go
new file mode 100644
index 0000000000..a6f6500ed5
--- /dev/null
+++ b/goformation/cloudformation/budgets/aws-budgets-budget_costtypes.go
@@ -0,0 +1,87 @@
+package budgets
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Budget_CostTypes AWS CloudFormation Resource (AWS::Budgets::Budget.CostTypes)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-costtypes.html
+type Budget_CostTypes struct {
+
+	// IncludeCredit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-costtypes.html#cfn-budgets-budget-costtypes-includecredit
+	IncludeCredit *types.Value `json:"IncludeCredit,omitempty"`
+
+	// IncludeDiscount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-costtypes.html#cfn-budgets-budget-costtypes-includediscount
+	IncludeDiscount *types.Value `json:"IncludeDiscount,omitempty"`
+
+	// IncludeOtherSubscription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-costtypes.html#cfn-budgets-budget-costtypes-includeothersubscription
+	IncludeOtherSubscription *types.Value `json:"IncludeOtherSubscription,omitempty"`
+
+	// IncludeRecurring AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-costtypes.html#cfn-budgets-budget-costtypes-includerecurring
+	IncludeRecurring *types.Value `json:"IncludeRecurring,omitempty"`
+
+	// IncludeRefund AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-costtypes.html#cfn-budgets-budget-costtypes-includerefund
+	IncludeRefund *types.Value `json:"IncludeRefund,omitempty"`
+
+	// IncludeSubscription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-costtypes.html#cfn-budgets-budget-costtypes-includesubscription
+	IncludeSubscription *types.Value `json:"IncludeSubscription,omitempty"`
+
+	// IncludeSupport AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-costtypes.html#cfn-budgets-budget-costtypes-includesupport
+	IncludeSupport *types.Value `json:"IncludeSupport,omitempty"`
+
+	// IncludeTax AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-costtypes.html#cfn-budgets-budget-costtypes-includetax
+	IncludeTax *types.Value `json:"IncludeTax,omitempty"`
+
+	// IncludeUpfront AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-costtypes.html#cfn-budgets-budget-costtypes-includeupfront
+	IncludeUpfront *types.Value `json:"IncludeUpfront,omitempty"`
+
+	// UseAmortized AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-costtypes.html#cfn-budgets-budget-costtypes-useamortized
+	UseAmortized *types.Value `json:"UseAmortized,omitempty"`
+
+	// UseBlended AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-costtypes.html#cfn-budgets-budget-costtypes-useblended
+	UseBlended *types.Value `json:"UseBlended,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CostTypes) AWSCloudFormationType() string {
+	return "AWS::Budgets::Budget.CostTypes"
+}
diff --git a/goformation/cloudformation/budgets/aws-budgets-budget_notification.go b/goformation/cloudformation/budgets/aws-budgets-budget_notification.go
new file mode 100644
index 0000000000..c873b2d7cf
--- /dev/null
+++ b/goformation/cloudformation/budgets/aws-budgets-budget_notification.go
@@ -0,0 +1,52 @@
+package budgets
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Budget_Notification AWS CloudFormation Resource (AWS::Budgets::Budget.Notification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-notification.html
+type Budget_Notification struct {
+
+	// ComparisonOperator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-notification.html#cfn-budgets-budget-notification-comparisonoperator
+	ComparisonOperator *types.Value `json:"ComparisonOperator,omitempty"`
+
+	// NotificationType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-notification.html#cfn-budgets-budget-notification-notificationtype
+	NotificationType *types.Value `json:"NotificationType,omitempty"`
+
+	// Threshold AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-notification.html#cfn-budgets-budget-notification-threshold
+	Threshold *types.Value `json:"Threshold"`
+
+	// ThresholdType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-notification.html#cfn-budgets-budget-notification-thresholdtype
+	ThresholdType *types.Value `json:"ThresholdType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Notification) AWSCloudFormationType() string {
+	return "AWS::Budgets::Budget.Notification"
+}
diff --git a/goformation/cloudformation/budgets/aws-budgets-budget_notificationwithsubscribers.go b/goformation/cloudformation/budgets/aws-budgets-budget_notificationwithsubscribers.go
new file mode 100644
index 0000000000..df56d1fc99
--- /dev/null
+++ b/goformation/cloudformation/budgets/aws-budgets-budget_notificationwithsubscribers.go
@@ -0,0 +1,40 @@
+package budgets
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Budget_NotificationWithSubscribers AWS CloudFormation Resource (AWS::Budgets::Budget.NotificationWithSubscribers)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-notificationwithsubscribers.html
+type Budget_NotificationWithSubscribers struct {
+
+	// Notification AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-notificationwithsubscribers.html#cfn-budgets-budget-notificationwithsubscribers-notification
+	Notification *Budget_Notification `json:"Notification,omitempty"`
+
+	// Subscribers AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-notificationwithsubscribers.html#cfn-budgets-budget-notificationwithsubscribers-subscribers
+	Subscribers []Budget_Subscriber `json:"Subscribers,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_NotificationWithSubscribers) AWSCloudFormationType() string {
+	return "AWS::Budgets::Budget.NotificationWithSubscribers"
+}
diff --git a/goformation/cloudformation/budgets/aws-budgets-budget_spend.go b/goformation/cloudformation/budgets/aws-budgets-budget_spend.go
new file mode 100644
index 0000000000..0fe964b024
--- /dev/null
+++ b/goformation/cloudformation/budgets/aws-budgets-budget_spend.go
@@ -0,0 +1,42 @@
+package budgets
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Budget_Spend AWS CloudFormation Resource (AWS::Budgets::Budget.Spend)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-spend.html
+type Budget_Spend struct {
+
+	// Amount AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-spend.html#cfn-budgets-budget-spend-amount
+	Amount *types.Value `json:"Amount"`
+
+	// Unit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-spend.html#cfn-budgets-budget-spend-unit
+	Unit *types.Value `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 *Budget_Spend) AWSCloudFormationType() string {
+	return "AWS::Budgets::Budget.Spend"
+}
diff --git a/goformation/cloudformation/budgets/aws-budgets-budget_subscriber.go b/goformation/cloudformation/budgets/aws-budgets-budget_subscriber.go
new file mode 100644
index 0000000000..db5d8d2c12
--- /dev/null
+++ b/goformation/cloudformation/budgets/aws-budgets-budget_subscriber.go
@@ -0,0 +1,42 @@
+package budgets
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Budget_Subscriber AWS CloudFormation Resource (AWS::Budgets::Budget.Subscriber)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-subscriber.html
+type Budget_Subscriber struct {
+
+	// Address AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-subscriber.html#cfn-budgets-budget-subscriber-address
+	Address *types.Value `json:"Address,omitempty"`
+
+	// SubscriptionType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-subscriber.html#cfn-budgets-budget-subscriber-subscriptiontype
+	SubscriptionType *types.Value `json:"SubscriptionType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Subscriber) AWSCloudFormationType() string {
+	return "AWS::Budgets::Budget.Subscriber"
+}
diff --git a/goformation/cloudformation/budgets/aws-budgets-budget_timeperiod.go b/goformation/cloudformation/budgets/aws-budgets-budget_timeperiod.go
new file mode 100644
index 0000000000..d83fd0e2f6
--- /dev/null
+++ b/goformation/cloudformation/budgets/aws-budgets-budget_timeperiod.go
@@ -0,0 +1,42 @@
+package budgets
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Budget_TimePeriod AWS CloudFormation Resource (AWS::Budgets::Budget.TimePeriod)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-timeperiod.html
+type Budget_TimePeriod struct {
+
+	// End AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-timeperiod.html#cfn-budgets-budget-timeperiod-end
+	End *types.Value `json:"End,omitempty"`
+
+	// Start AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budget-timeperiod.html#cfn-budgets-budget-timeperiod-start
+	Start *types.Value `json:"Start,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TimePeriod) AWSCloudFormationType() string {
+	return "AWS::Budgets::Budget.TimePeriod"
+}
diff --git a/goformation/cloudformation/budgets/aws-budgets-budgetsaction.go b/goformation/cloudformation/budgets/aws-budgets-budgetsaction.go
new file mode 100644
index 0000000000..0e80aeaa85
--- /dev/null
+++ b/goformation/cloudformation/budgets/aws-budgets-budgetsaction.go
@@ -0,0 +1,143 @@
+package budgets
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BudgetsAction AWS CloudFormation Resource (AWS::Budgets::BudgetsAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-budgets-budgetsaction.html
+type BudgetsAction struct {
+
+	// ActionThreshold AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-budgets-budgetsaction.html#cfn-budgets-budgetsaction-actionthreshold
+	ActionThreshold *BudgetsAction_ActionThreshold `json:"ActionThreshold,omitempty"`
+
+	// ActionType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-budgets-budgetsaction.html#cfn-budgets-budgetsaction-actiontype
+	ActionType *types.Value `json:"ActionType,omitempty"`
+
+	// ApprovalModel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-budgets-budgetsaction.html#cfn-budgets-budgetsaction-approvalmodel
+	ApprovalModel *types.Value `json:"ApprovalModel,omitempty"`
+
+	// BudgetName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-budgets-budgetsaction.html#cfn-budgets-budgetsaction-budgetname
+	BudgetName *types.Value `json:"BudgetName,omitempty"`
+
+	// Definition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-budgets-budgetsaction.html#cfn-budgets-budgetsaction-definition
+	Definition *BudgetsAction_Definition `json:"Definition,omitempty"`
+
+	// ExecutionRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-budgets-budgetsaction.html#cfn-budgets-budgetsaction-executionrolearn
+	ExecutionRoleArn *types.Value `json:"ExecutionRoleArn,omitempty"`
+
+	// NotificationType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-budgets-budgetsaction.html#cfn-budgets-budgetsaction-notificationtype
+	NotificationType *types.Value `json:"NotificationType,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
+	Subscribers []BudgetsAction_Subscriber `json:"Subscribers,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::Budgets::BudgetsAction"
+}
+
+// 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 BudgetsAction) MarshalJSON() ([]byte, error) {
+	type Properties BudgetsAction
+	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 *BudgetsAction) UnmarshalJSON(b []byte) error {
+	type Properties BudgetsAction
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = BudgetsAction(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/budgets/aws-budgets-budgetsaction_actionthreshold.go b/goformation/cloudformation/budgets/aws-budgets-budgetsaction_actionthreshold.go
new file mode 100644
index 0000000000..12922a4e88
--- /dev/null
+++ b/goformation/cloudformation/budgets/aws-budgets-budgetsaction_actionthreshold.go
@@ -0,0 +1,42 @@
+package budgets
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BudgetsAction_ActionThreshold AWS CloudFormation Resource (AWS::Budgets::BudgetsAction.ActionThreshold)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-actionthreshold.html
+type BudgetsAction_ActionThreshold struct {
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-actionthreshold.html#cfn-budgets-budgetsaction-actionthreshold-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-actionthreshold.html#cfn-budgets-budgetsaction-actionthreshold-value
+	Value *types.Value `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_ActionThreshold) AWSCloudFormationType() string {
+	return "AWS::Budgets::BudgetsAction.ActionThreshold"
+}
diff --git a/goformation/cloudformation/budgets/aws-budgets-budgetsaction_definition.go b/goformation/cloudformation/budgets/aws-budgets-budgetsaction_definition.go
new file mode 100644
index 0000000000..d6fd141c7d
--- /dev/null
+++ b/goformation/cloudformation/budgets/aws-budgets-budgetsaction_definition.go
@@ -0,0 +1,45 @@
+package budgets
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// BudgetsAction_Definition AWS CloudFormation Resource (AWS::Budgets::BudgetsAction.Definition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-definition.html
+type BudgetsAction_Definition struct {
+
+	// IamActionDefinition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-definition.html#cfn-budgets-budgetsaction-definition-iamactiondefinition
+	IamActionDefinition *BudgetsAction_IamActionDefinition `json:"IamActionDefinition,omitempty"`
+
+	// ScpActionDefinition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-definition.html#cfn-budgets-budgetsaction-definition-scpactiondefinition
+	ScpActionDefinition *BudgetsAction_ScpActionDefinition `json:"ScpActionDefinition,omitempty"`
+
+	// SsmActionDefinition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-definition.html#cfn-budgets-budgetsaction-definition-ssmactiondefinition
+	SsmActionDefinition *BudgetsAction_SsmActionDefinition `json:"SsmActionDefinition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Definition) AWSCloudFormationType() string {
+	return "AWS::Budgets::BudgetsAction.Definition"
+}
diff --git a/goformation/cloudformation/budgets/aws-budgets-budgetsaction_iamactiondefinition.go b/goformation/cloudformation/budgets/aws-budgets-budgetsaction_iamactiondefinition.go
new file mode 100644
index 0000000000..958a5c293b
--- /dev/null
+++ b/goformation/cloudformation/budgets/aws-budgets-budgetsaction_iamactiondefinition.go
@@ -0,0 +1,52 @@
+package budgets
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BudgetsAction_IamActionDefinition AWS CloudFormation Resource (AWS::Budgets::BudgetsAction.IamActionDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-iamactiondefinition.html
+type BudgetsAction_IamActionDefinition struct {
+
+	// Groups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-iamactiondefinition.html#cfn-budgets-budgetsaction-iamactiondefinition-groups
+	Groups *types.Value `json:"Groups,omitempty"`
+
+	// PolicyArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-iamactiondefinition.html#cfn-budgets-budgetsaction-iamactiondefinition-policyarn
+	PolicyArn *types.Value `json:"PolicyArn,omitempty"`
+
+	// Roles AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-iamactiondefinition.html#cfn-budgets-budgetsaction-iamactiondefinition-roles
+	Roles *types.Value `json:"Roles,omitempty"`
+
+	// Users AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-iamactiondefinition.html#cfn-budgets-budgetsaction-iamactiondefinition-users
+	Users *types.Value `json:"Users,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_IamActionDefinition) AWSCloudFormationType() string {
+	return "AWS::Budgets::BudgetsAction.IamActionDefinition"
+}
diff --git a/goformation/cloudformation/budgets/aws-budgets-budgetsaction_scpactiondefinition.go b/goformation/cloudformation/budgets/aws-budgets-budgetsaction_scpactiondefinition.go
new file mode 100644
index 0000000000..0507df7fd0
--- /dev/null
+++ b/goformation/cloudformation/budgets/aws-budgets-budgetsaction_scpactiondefinition.go
@@ -0,0 +1,42 @@
+package budgets
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BudgetsAction_ScpActionDefinition AWS CloudFormation Resource (AWS::Budgets::BudgetsAction.ScpActionDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-scpactiondefinition.html
+type BudgetsAction_ScpActionDefinition struct {
+
+	// PolicyId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-scpactiondefinition.html#cfn-budgets-budgetsaction-scpactiondefinition-policyid
+	PolicyId *types.Value `json:"PolicyId,omitempty"`
+
+	// TargetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-scpactiondefinition.html#cfn-budgets-budgetsaction-scpactiondefinition-targetids
+	TargetIds *types.Value `json:"TargetIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ScpActionDefinition) AWSCloudFormationType() string {
+	return "AWS::Budgets::BudgetsAction.ScpActionDefinition"
+}
diff --git a/goformation/cloudformation/budgets/aws-budgets-budgetsaction_ssmactiondefinition.go b/goformation/cloudformation/budgets/aws-budgets-budgetsaction_ssmactiondefinition.go
new file mode 100644
index 0000000000..dcf2c46661
--- /dev/null
+++ b/goformation/cloudformation/budgets/aws-budgets-budgetsaction_ssmactiondefinition.go
@@ -0,0 +1,47 @@
+package budgets
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BudgetsAction_SsmActionDefinition AWS CloudFormation Resource (AWS::Budgets::BudgetsAction.SsmActionDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-ssmactiondefinition.html
+type BudgetsAction_SsmActionDefinition struct {
+
+	// InstanceIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-ssmactiondefinition.html#cfn-budgets-budgetsaction-ssmactiondefinition-instanceids
+	InstanceIds *types.Value `json:"InstanceIds,omitempty"`
+
+	// Region AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-ssmactiondefinition.html#cfn-budgets-budgetsaction-ssmactiondefinition-region
+	Region *types.Value `json:"Region,omitempty"`
+
+	// Subtype AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-ssmactiondefinition.html#cfn-budgets-budgetsaction-ssmactiondefinition-subtype
+	Subtype *types.Value `json:"Subtype,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SsmActionDefinition) AWSCloudFormationType() string {
+	return "AWS::Budgets::BudgetsAction.SsmActionDefinition"
+}
diff --git a/goformation/cloudformation/budgets/aws-budgets-budgetsaction_subscriber.go b/goformation/cloudformation/budgets/aws-budgets-budgetsaction_subscriber.go
new file mode 100644
index 0000000000..810b63fd15
--- /dev/null
+++ b/goformation/cloudformation/budgets/aws-budgets-budgetsaction_subscriber.go
@@ -0,0 +1,42 @@
+package budgets
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BudgetsAction_Subscriber AWS CloudFormation Resource (AWS::Budgets::BudgetsAction.Subscriber)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-subscriber.html
+type BudgetsAction_Subscriber struct {
+
+	// Address AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-subscriber.html#cfn-budgets-budgetsaction-subscriber-address
+	Address *types.Value `json:"Address,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-budgets-budgetsaction-subscriber.html#cfn-budgets-budgetsaction-subscriber-type
+	Type *types.Value `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 *BudgetsAction_Subscriber) AWSCloudFormationType() string {
+	return "AWS::Budgets::BudgetsAction.Subscriber"
+}
diff --git a/goformation/cloudformation/cassandra/aws-cassandra-keyspace.go b/goformation/cloudformation/cassandra/aws-cassandra-keyspace.go
new file mode 100644
index 0000000000..7cdc329d06
--- /dev/null
+++ b/goformation/cloudformation/cassandra/aws-cassandra-keyspace.go
@@ -0,0 +1,114 @@
+package cassandra
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Keyspace AWS CloudFormation Resource (AWS::Cassandra::Keyspace)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cassandra-keyspace.html
+type Keyspace struct {
+
+	// KeyspaceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cassandra-keyspace.html#cfn-cassandra-keyspace-keyspacename
+	KeyspaceName *types.Value `json:"KeyspaceName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cassandra-keyspace.html#cfn-cassandra-keyspace-tags
+	Tags []cloudformation.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 *Keyspace) AWSCloudFormationType() string {
+	return "AWS::Cassandra::Keyspace"
+}
+
+// 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 Keyspace) MarshalJSON() ([]byte, error) {
+	type Properties Keyspace
+	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 *Keyspace) UnmarshalJSON(b []byte) error {
+	type Properties Keyspace
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Keyspace(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cassandra/aws-cassandra-table.go b/goformation/cloudformation/cassandra/aws-cassandra-table.go
new file mode 100644
index 0000000000..11d3a2f760
--- /dev/null
+++ b/goformation/cloudformation/cassandra/aws-cassandra-table.go
@@ -0,0 +1,154 @@
+package cassandra
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table AWS CloudFormation Resource (AWS::Cassandra::Table)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cassandra-table.html
+type Table struct {
+
+	// BillingMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cassandra-table.html#cfn-cassandra-table-billingmode
+	BillingMode *Table_BillingMode `json:"BillingMode,omitempty"`
+
+	// ClusteringKeyColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cassandra-table.html#cfn-cassandra-table-clusteringkeycolumns
+	ClusteringKeyColumns []Table_ClusteringKeyColumn `json:"ClusteringKeyColumns,omitempty"`
+
+	// DefaultTimeToLive AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cassandra-table.html#cfn-cassandra-table-defaulttimetolive
+	DefaultTimeToLive *types.Value `json:"DefaultTimeToLive,omitempty"`
+
+	// EncryptionSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cassandra-table.html#cfn-cassandra-table-encryptionspecification
+	EncryptionSpecification *Table_EncryptionSpecification `json:"EncryptionSpecification,omitempty"`
+
+	// KeyspaceName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cassandra-table.html#cfn-cassandra-table-keyspacename
+	KeyspaceName *types.Value `json:"KeyspaceName,omitempty"`
+
+	// PartitionKeyColumns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cassandra-table.html#cfn-cassandra-table-partitionkeycolumns
+	PartitionKeyColumns []Table_Column `json:"PartitionKeyColumns,omitempty"`
+
+	// PointInTimeRecoveryEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cassandra-table.html#cfn-cassandra-table-pointintimerecoveryenabled
+	PointInTimeRecoveryEnabled *types.Value `json:"PointInTimeRecoveryEnabled,omitempty"`
+
+	// RegularColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cassandra-table.html#cfn-cassandra-table-regularcolumns
+	RegularColumns []Table_Column `json:"RegularColumns,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cassandra-table.html#cfn-cassandra-table-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cassandra-table.html#cfn-cassandra-table-tags
+	Tags []cloudformation.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 *Table) AWSCloudFormationType() string {
+	return "AWS::Cassandra::Table"
+}
+
+// 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 Table) MarshalJSON() ([]byte, error) {
+	type Properties Table
+	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 *Table) UnmarshalJSON(b []byte) error {
+	type Properties Table
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Table(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cassandra/aws-cassandra-table_billingmode.go b/goformation/cloudformation/cassandra/aws-cassandra-table_billingmode.go
new file mode 100644
index 0000000000..b9968d2160
--- /dev/null
+++ b/goformation/cloudformation/cassandra/aws-cassandra-table_billingmode.go
@@ -0,0 +1,42 @@
+package cassandra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_BillingMode AWS CloudFormation Resource (AWS::Cassandra::Table.BillingMode)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cassandra-table-billingmode.html
+type Table_BillingMode struct {
+
+	// Mode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cassandra-table-billingmode.html#cfn-cassandra-table-billingmode-mode
+	Mode *types.Value `json:"Mode,omitempty"`
+
+	// ProvisionedThroughput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cassandra-table-billingmode.html#cfn-cassandra-table-billingmode-provisionedthroughput
+	ProvisionedThroughput *Table_ProvisionedThroughput `json:"ProvisionedThroughput,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_BillingMode) AWSCloudFormationType() string {
+	return "AWS::Cassandra::Table.BillingMode"
+}
diff --git a/goformation/cloudformation/cassandra/aws-cassandra-table_clusteringkeycolumn.go b/goformation/cloudformation/cassandra/aws-cassandra-table_clusteringkeycolumn.go
new file mode 100644
index 0000000000..d33747ec87
--- /dev/null
+++ b/goformation/cloudformation/cassandra/aws-cassandra-table_clusteringkeycolumn.go
@@ -0,0 +1,42 @@
+package cassandra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_ClusteringKeyColumn AWS CloudFormation Resource (AWS::Cassandra::Table.ClusteringKeyColumn)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cassandra-table-clusteringkeycolumn.html
+type Table_ClusteringKeyColumn struct {
+
+	// Column AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cassandra-table-clusteringkeycolumn.html#cfn-cassandra-table-clusteringkeycolumn-column
+	Column *Table_Column `json:"Column,omitempty"`
+
+	// OrderBy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cassandra-table-clusteringkeycolumn.html#cfn-cassandra-table-clusteringkeycolumn-orderby
+	OrderBy *types.Value `json:"OrderBy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ClusteringKeyColumn) AWSCloudFormationType() string {
+	return "AWS::Cassandra::Table.ClusteringKeyColumn"
+}
diff --git a/goformation/cloudformation/cassandra/aws-cassandra-table_column.go b/goformation/cloudformation/cassandra/aws-cassandra-table_column.go
new file mode 100644
index 0000000000..30f16c4cda
--- /dev/null
+++ b/goformation/cloudformation/cassandra/aws-cassandra-table_column.go
@@ -0,0 +1,42 @@
+package cassandra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_Column AWS CloudFormation Resource (AWS::Cassandra::Table.Column)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cassandra-table-column.html
+type Table_Column struct {
+
+	// ColumnName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cassandra-table-column.html#cfn-cassandra-table-column-columnname
+	ColumnName *types.Value `json:"ColumnName,omitempty"`
+
+	// ColumnType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cassandra-table-column.html#cfn-cassandra-table-column-columntype
+	ColumnType *types.Value `json:"ColumnType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Column) AWSCloudFormationType() string {
+	return "AWS::Cassandra::Table.Column"
+}
diff --git a/goformation/cloudformation/cassandra/aws-cassandra-table_encryptionspecification.go b/goformation/cloudformation/cassandra/aws-cassandra-table_encryptionspecification.go
new file mode 100644
index 0000000000..5617f235eb
--- /dev/null
+++ b/goformation/cloudformation/cassandra/aws-cassandra-table_encryptionspecification.go
@@ -0,0 +1,42 @@
+package cassandra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_EncryptionSpecification AWS CloudFormation Resource (AWS::Cassandra::Table.EncryptionSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cassandra-table-encryptionspecification.html
+type Table_EncryptionSpecification struct {
+
+	// EncryptionType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cassandra-table-encryptionspecification.html#cfn-cassandra-table-encryptionspecification-encryptiontype
+	EncryptionType *types.Value `json:"EncryptionType,omitempty"`
+
+	// KmsKeyIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cassandra-table-encryptionspecification.html#cfn-cassandra-table-encryptionspecification-kmskeyidentifier
+	KmsKeyIdentifier *types.Value `json:"KmsKeyIdentifier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EncryptionSpecification) AWSCloudFormationType() string {
+	return "AWS::Cassandra::Table.EncryptionSpecification"
+}
diff --git a/goformation/cloudformation/cassandra/aws-cassandra-table_provisionedthroughput.go b/goformation/cloudformation/cassandra/aws-cassandra-table_provisionedthroughput.go
new file mode 100644
index 0000000000..fc020fa9e8
--- /dev/null
+++ b/goformation/cloudformation/cassandra/aws-cassandra-table_provisionedthroughput.go
@@ -0,0 +1,42 @@
+package cassandra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_ProvisionedThroughput AWS CloudFormation Resource (AWS::Cassandra::Table.ProvisionedThroughput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cassandra-table-provisionedthroughput.html
+type Table_ProvisionedThroughput struct {
+
+	// ReadCapacityUnits AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cassandra-table-provisionedthroughput.html#cfn-cassandra-table-provisionedthroughput-readcapacityunits
+	ReadCapacityUnits *types.Value `json:"ReadCapacityUnits"`
+
+	// WriteCapacityUnits AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cassandra-table-provisionedthroughput.html#cfn-cassandra-table-provisionedthroughput-writecapacityunits
+	WriteCapacityUnits *types.Value `json:"WriteCapacityUnits"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ProvisionedThroughput) AWSCloudFormationType() string {
+	return "AWS::Cassandra::Table.ProvisionedThroughput"
+}
diff --git a/goformation/cloudformation/ce/aws-ce-anomalymonitor.go b/goformation/cloudformation/ce/aws-ce-anomalymonitor.go
new file mode 100644
index 0000000000..db777cbeaa
--- /dev/null
+++ b/goformation/cloudformation/ce/aws-ce-anomalymonitor.go
@@ -0,0 +1,123 @@
+package ce
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyMonitor AWS CloudFormation Resource (AWS::CE::AnomalyMonitor)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-anomalymonitor.html
+type AnomalyMonitor struct {
+
+	// MonitorDimension AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-anomalymonitor.html#cfn-ce-anomalymonitor-monitordimension
+	MonitorDimension *types.Value `json:"MonitorDimension,omitempty"`
+
+	// MonitorName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-anomalymonitor.html#cfn-ce-anomalymonitor-monitorname
+	MonitorName *types.Value `json:"MonitorName,omitempty"`
+
+	// MonitorSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-anomalymonitor.html#cfn-ce-anomalymonitor-monitorspecification
+	MonitorSpecification *types.Value `json:"MonitorSpecification,omitempty"`
+
+	// MonitorType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-anomalymonitor.html#cfn-ce-anomalymonitor-monitortype
+	MonitorType *types.Value `json:"MonitorType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AnomalyMonitor) AWSCloudFormationType() string {
+	return "AWS::CE::AnomalyMonitor"
+}
+
+// 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 AnomalyMonitor) MarshalJSON() ([]byte, error) {
+	type Properties AnomalyMonitor
+	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 *AnomalyMonitor) UnmarshalJSON(b []byte) error {
+	type Properties AnomalyMonitor
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AnomalyMonitor(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ce/aws-ce-anomalysubscription.go b/goformation/cloudformation/ce/aws-ce-anomalysubscription.go
new file mode 100644
index 0000000000..e0c799e192
--- /dev/null
+++ b/goformation/cloudformation/ce/aws-ce-anomalysubscription.go
@@ -0,0 +1,128 @@
+package ce
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalySubscription AWS CloudFormation Resource (AWS::CE::AnomalySubscription)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-anomalysubscription.html
+type AnomalySubscription struct {
+
+	// Frequency AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-anomalysubscription.html#cfn-ce-anomalysubscription-frequency
+	Frequency *types.Value `json:"Frequency,omitempty"`
+
+	// MonitorArnList AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-anomalysubscription.html#cfn-ce-anomalysubscription-monitorarnlist
+	MonitorArnList *types.Value `json:"MonitorArnList,omitempty"`
+
+	// Subscribers AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-anomalysubscription.html#cfn-ce-anomalysubscription-subscribers
+	Subscribers []AnomalySubscription_Subscriber `json:"Subscribers,omitempty"`
+
+	// SubscriptionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-anomalysubscription.html#cfn-ce-anomalysubscription-subscriptionname
+	SubscriptionName *types.Value `json:"SubscriptionName,omitempty"`
+
+	// Threshold AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-anomalysubscription.html#cfn-ce-anomalysubscription-threshold
+	Threshold *types.Value `json:"Threshold"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AnomalySubscription) AWSCloudFormationType() string {
+	return "AWS::CE::AnomalySubscription"
+}
+
+// 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 AnomalySubscription) MarshalJSON() ([]byte, error) {
+	type Properties AnomalySubscription
+	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 *AnomalySubscription) UnmarshalJSON(b []byte) error {
+	type Properties AnomalySubscription
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AnomalySubscription(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ce/aws-ce-anomalysubscription_subscriber.go b/goformation/cloudformation/ce/aws-ce-anomalysubscription_subscriber.go
new file mode 100644
index 0000000000..1229d9cee3
--- /dev/null
+++ b/goformation/cloudformation/ce/aws-ce-anomalysubscription_subscriber.go
@@ -0,0 +1,47 @@
+package ce
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalySubscription_Subscriber AWS CloudFormation Resource (AWS::CE::AnomalySubscription.Subscriber)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ce-anomalysubscription-subscriber.html
+type AnomalySubscription_Subscriber struct {
+
+	// Address AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ce-anomalysubscription-subscriber.html#cfn-ce-anomalysubscription-subscriber-address
+	Address *types.Value `json:"Address,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ce-anomalysubscription-subscriber.html#cfn-ce-anomalysubscription-subscriber-status
+	Status *types.Value `json:"Status,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ce-anomalysubscription-subscriber.html#cfn-ce-anomalysubscription-subscriber-type
+	Type *types.Value `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 *AnomalySubscription_Subscriber) AWSCloudFormationType() string {
+	return "AWS::CE::AnomalySubscription.Subscriber"
+}
diff --git a/goformation/cloudformation/ce/aws-ce-costcategory.go b/goformation/cloudformation/ce/aws-ce-costcategory.go
new file mode 100644
index 0000000000..4b185a8148
--- /dev/null
+++ b/goformation/cloudformation/ce/aws-ce-costcategory.go
@@ -0,0 +1,128 @@
+package ce
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CostCategory AWS CloudFormation Resource (AWS::CE::CostCategory)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-costcategory.html
+type CostCategory struct {
+
+	// DefaultValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-costcategory.html#cfn-ce-costcategory-defaultvalue
+	DefaultValue *types.Value `json:"DefaultValue,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-costcategory.html#cfn-ce-costcategory-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RuleVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-costcategory.html#cfn-ce-costcategory-ruleversion
+	RuleVersion *types.Value `json:"RuleVersion,omitempty"`
+
+	// Rules AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-costcategory.html#cfn-ce-costcategory-rules
+	Rules *types.Value `json:"Rules,omitempty"`
+
+	// SplitChargeRules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ce-costcategory.html#cfn-ce-costcategory-splitchargerules
+	SplitChargeRules *types.Value `json:"SplitChargeRules,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CostCategory) AWSCloudFormationType() string {
+	return "AWS::CE::CostCategory"
+}
+
+// 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 CostCategory) MarshalJSON() ([]byte, error) {
+	type Properties CostCategory
+	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 *CostCategory) UnmarshalJSON(b []byte) error {
+	type Properties CostCategory
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CostCategory(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/certificatemanager/aws-certificatemanager-account.go b/goformation/cloudformation/certificatemanager/aws-certificatemanager-account.go
new file mode 100644
index 0000000000..4e198feb8e
--- /dev/null
+++ b/goformation/cloudformation/certificatemanager/aws-certificatemanager-account.go
@@ -0,0 +1,106 @@
+package certificatemanager
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Account AWS CloudFormation Resource (AWS::CertificateManager::Account)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-account.html
+type Account struct {
+
+	// ExpiryEventsConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-account.html#cfn-certificatemanager-account-expiryeventsconfiguration
+	ExpiryEventsConfiguration *Account_ExpiryEventsConfiguration `json:"ExpiryEventsConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Account) AWSCloudFormationType() string {
+	return "AWS::CertificateManager::Account"
+}
+
+// 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 Account) MarshalJSON() ([]byte, error) {
+	type Properties Account
+	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 *Account) UnmarshalJSON(b []byte) error {
+	type Properties Account
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Account(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/certificatemanager/aws-certificatemanager-account_expiryeventsconfiguration.go b/goformation/cloudformation/certificatemanager/aws-certificatemanager-account_expiryeventsconfiguration.go
new file mode 100644
index 0000000000..696769a6c2
--- /dev/null
+++ b/goformation/cloudformation/certificatemanager/aws-certificatemanager-account_expiryeventsconfiguration.go
@@ -0,0 +1,37 @@
+package certificatemanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Account_ExpiryEventsConfiguration AWS CloudFormation Resource (AWS::CertificateManager::Account.ExpiryEventsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-certificatemanager-account-expiryeventsconfiguration.html
+type Account_ExpiryEventsConfiguration struct {
+
+	// DaysBeforeExpiry AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-certificatemanager-account-expiryeventsconfiguration.html#cfn-certificatemanager-account-expiryeventsconfiguration-daysbeforeexpiry
+	DaysBeforeExpiry *types.Value `json:"DaysBeforeExpiry,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Account_ExpiryEventsConfiguration) AWSCloudFormationType() string {
+	return "AWS::CertificateManager::Account.ExpiryEventsConfiguration"
+}
diff --git a/goformation/cloudformation/certificatemanager/aws-certificatemanager-certificate.go b/goformation/cloudformation/certificatemanager/aws-certificatemanager-certificate.go
new file mode 100644
index 0000000000..483fc52a78
--- /dev/null
+++ b/goformation/cloudformation/certificatemanager/aws-certificatemanager-certificate.go
@@ -0,0 +1,139 @@
+package certificatemanager
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Certificate AWS CloudFormation Resource (AWS::CertificateManager::Certificate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-certificate.html
+type Certificate struct {
+
+	// CertificateAuthorityArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-certificate.html#cfn-certificatemanager-certificate-certificateauthorityarn
+	CertificateAuthorityArn *types.Value `json:"CertificateAuthorityArn,omitempty"`
+
+	// CertificateTransparencyLoggingPreference AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-certificate.html#cfn-certificatemanager-certificate-certificatetransparencyloggingpreference
+	CertificateTransparencyLoggingPreference *types.Value `json:"CertificateTransparencyLoggingPreference,omitempty"`
+
+	// DomainName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-certificate.html#cfn-certificatemanager-certificate-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// DomainValidationOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-certificate.html#cfn-certificatemanager-certificate-domainvalidationoptions
+	DomainValidationOptions []Certificate_DomainValidationOption `json:"DomainValidationOptions,omitempty"`
+
+	// SubjectAlternativeNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-certificate.html#cfn-certificatemanager-certificate-subjectalternativenames
+	SubjectAlternativeNames *types.Value `json:"SubjectAlternativeNames,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-certificate.html#cfn-certificatemanager-certificate-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// ValidationMethod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-certificatemanager-certificate.html#cfn-certificatemanager-certificate-validationmethod
+	ValidationMethod *types.Value `json:"ValidationMethod,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Certificate) AWSCloudFormationType() string {
+	return "AWS::CertificateManager::Certificate"
+}
+
+// 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 Certificate) MarshalJSON() ([]byte, error) {
+	type Properties Certificate
+	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 *Certificate) UnmarshalJSON(b []byte) error {
+	type Properties Certificate
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Certificate(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/certificatemanager/aws-certificatemanager-certificate_domainvalidationoption.go b/goformation/cloudformation/certificatemanager/aws-certificatemanager-certificate_domainvalidationoption.go
new file mode 100644
index 0000000000..9b725087b7
--- /dev/null
+++ b/goformation/cloudformation/certificatemanager/aws-certificatemanager-certificate_domainvalidationoption.go
@@ -0,0 +1,47 @@
+package certificatemanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Certificate_DomainValidationOption AWS CloudFormation Resource (AWS::CertificateManager::Certificate.DomainValidationOption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-certificatemanager-certificate-domainvalidationoption.html
+type Certificate_DomainValidationOption struct {
+
+	// DomainName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-certificatemanager-certificate-domainvalidationoption.html#cfn-certificatemanager-certificate-domainvalidationoptions-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// HostedZoneId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-certificatemanager-certificate-domainvalidationoption.html#cfn-certificatemanager-certificate-domainvalidationoption-hostedzoneid
+	HostedZoneId *types.Value `json:"HostedZoneId,omitempty"`
+
+	// ValidationDomain AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-certificatemanager-certificate-domainvalidationoption.html#cfn-certificatemanager-certificate-domainvalidationoption-validationdomain
+	ValidationDomain *types.Value `json:"ValidationDomain,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Certificate_DomainValidationOption) AWSCloudFormationType() string {
+	return "AWS::CertificateManager::Certificate.DomainValidationOption"
+}
diff --git a/goformation/cloudformation/chatbot/aws-chatbot-slackchannelconfiguration.go b/goformation/cloudformation/chatbot/aws-chatbot-slackchannelconfiguration.go
new file mode 100644
index 0000000000..5b35047a61
--- /dev/null
+++ b/goformation/cloudformation/chatbot/aws-chatbot-slackchannelconfiguration.go
@@ -0,0 +1,143 @@
+package chatbot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SlackChannelConfiguration AWS CloudFormation Resource (AWS::Chatbot::SlackChannelConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-slackchannelconfiguration.html
+type SlackChannelConfiguration struct {
+
+	// ConfigurationName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-slackchannelconfiguration.html#cfn-chatbot-slackchannelconfiguration-configurationname
+	ConfigurationName *types.Value `json:"ConfigurationName,omitempty"`
+
+	// GuardrailPolicies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-slackchannelconfiguration.html#cfn-chatbot-slackchannelconfiguration-guardrailpolicies
+	GuardrailPolicies *types.Value `json:"GuardrailPolicies,omitempty"`
+
+	// IamRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-slackchannelconfiguration.html#cfn-chatbot-slackchannelconfiguration-iamrolearn
+	IamRoleArn *types.Value `json:"IamRoleArn,omitempty"`
+
+	// LoggingLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-slackchannelconfiguration.html#cfn-chatbot-slackchannelconfiguration-logginglevel
+	LoggingLevel *types.Value `json:"LoggingLevel,omitempty"`
+
+	// SlackChannelId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-slackchannelconfiguration.html#cfn-chatbot-slackchannelconfiguration-slackchannelid
+	SlackChannelId *types.Value `json:"SlackChannelId,omitempty"`
+
+	// SlackWorkspaceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-slackchannelconfiguration.html#cfn-chatbot-slackchannelconfiguration-slackworkspaceid
+	SlackWorkspaceId *types.Value `json:"SlackWorkspaceId,omitempty"`
+
+	// SnsTopicArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-chatbot-slackchannelconfiguration.html#cfn-chatbot-slackchannelconfiguration-snstopicarns
+	SnsTopicArns *types.Value `json:"SnsTopicArns,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
+	UserRoleRequired *types.Value `json:"UserRoleRequired,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SlackChannelConfiguration) AWSCloudFormationType() string {
+	return "AWS::Chatbot::SlackChannelConfiguration"
+}
+
+// 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 SlackChannelConfiguration) MarshalJSON() ([]byte, error) {
+	type Properties SlackChannelConfiguration
+	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 *SlackChannelConfiguration) UnmarshalJSON(b []byte) error {
+	type Properties SlackChannelConfiguration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SlackChannelConfiguration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloud9/aws-cloud9-environmentec2.go b/goformation/cloudformation/cloud9/aws-cloud9-environmentec2.go
new file mode 100644
index 0000000000..960771e30a
--- /dev/null
+++ b/goformation/cloudformation/cloud9/aws-cloud9-environmentec2.go
@@ -0,0 +1,154 @@
+package cloud9
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// EnvironmentEC2 AWS CloudFormation Resource (AWS::Cloud9::EnvironmentEC2)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloud9-environmentec2.html
+type EnvironmentEC2 struct {
+
+	// AutomaticStopTimeMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloud9-environmentec2.html#cfn-cloud9-environmentec2-automaticstoptimeminutes
+	AutomaticStopTimeMinutes *types.Value `json:"AutomaticStopTimeMinutes,omitempty"`
+
+	// ConnectionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloud9-environmentec2.html#cfn-cloud9-environmentec2-connectiontype
+	ConnectionType *types.Value `json:"ConnectionType,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloud9-environmentec2.html#cfn-cloud9-environmentec2-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// ImageId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloud9-environmentec2.html#cfn-cloud9-environmentec2-imageid
+	ImageId *types.Value `json:"ImageId,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloud9-environmentec2.html#cfn-cloud9-environmentec2-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloud9-environmentec2.html#cfn-cloud9-environmentec2-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// OwnerArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloud9-environmentec2.html#cfn-cloud9-environmentec2-ownerarn
+	OwnerArn *types.Value `json:"OwnerArn,omitempty"`
+
+	// Repositories AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloud9-environmentec2.html#cfn-cloud9-environmentec2-repositories
+	Repositories []EnvironmentEC2_Repository `json:"Repositories,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloud9-environmentec2.html#cfn-cloud9-environmentec2-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloud9-environmentec2.html#cfn-cloud9-environmentec2-tags
+	Tags []cloudformation.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 *EnvironmentEC2) AWSCloudFormationType() string {
+	return "AWS::Cloud9::EnvironmentEC2"
+}
+
+// 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 EnvironmentEC2) MarshalJSON() ([]byte, error) {
+	type Properties EnvironmentEC2
+	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 *EnvironmentEC2) UnmarshalJSON(b []byte) error {
+	type Properties EnvironmentEC2
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = EnvironmentEC2(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloud9/aws-cloud9-environmentec2_repository.go b/goformation/cloudformation/cloud9/aws-cloud9-environmentec2_repository.go
new file mode 100644
index 0000000000..ab4856f927
--- /dev/null
+++ b/goformation/cloudformation/cloud9/aws-cloud9-environmentec2_repository.go
@@ -0,0 +1,42 @@
+package cloud9
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EnvironmentEC2_Repository AWS CloudFormation Resource (AWS::Cloud9::EnvironmentEC2.Repository)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloud9-environmentec2-repository.html
+type EnvironmentEC2_Repository struct {
+
+	// PathComponent AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloud9-environmentec2-repository.html#cfn-cloud9-environmentec2-repository-pathcomponent
+	PathComponent *types.Value `json:"PathComponent,omitempty"`
+
+	// RepositoryUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloud9-environmentec2-repository.html#cfn-cloud9-environmentec2-repository-repositoryurl
+	RepositoryUrl *types.Value `json:"RepositoryUrl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EnvironmentEC2_Repository) AWSCloudFormationType() string {
+	return "AWS::Cloud9::EnvironmentEC2.Repository"
+}
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-customresource.go b/goformation/cloudformation/cloudformation/aws-cloudformation-customresource.go
new file mode 100644
index 0000000000..7b702f1cf3
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/aws-cloudformation-customresource.go
@@ -0,0 +1,108 @@
+package cloudformation
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CustomResource AWS CloudFormation Resource (AWS::CloudFormation::CustomResource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cfn-customresource.html
+type CustomResource struct {
+
+	// ServiceToken AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cfn-customresource.html#cfn-customresource-servicetoken
+	ServiceToken *types.Value `json:"ServiceToken,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CustomResource) AWSCloudFormationType() string {
+	return "AWS::CloudFormation::CustomResource"
+}
+
+// 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 CustomResource) MarshalJSON() ([]byte, error) {
+	type Properties CustomResource
+	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 *CustomResource) UnmarshalJSON(b []byte) error {
+	type Properties CustomResource
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CustomResource(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudformation/aws-cloudformation-macro.go b/goformation/cloudformation/cloudformation/aws-cloudformation-macro.go
new file mode 100644
index 0000000000..dcfb42179e
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/aws-cloudformation-macro.go
@@ -0,0 +1,128 @@
+package cloudformation
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Macro AWS CloudFormation Resource (AWS::CloudFormation::Macro)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-macro.html
+type Macro struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-macro.html#cfn-cloudformation-macro-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// FunctionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-macro.html#cfn-cloudformation-macro-functionname
+	FunctionName *types.Value `json:"FunctionName,omitempty"`
+
+	// LogGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-macro.html#cfn-cloudformation-macro-loggroupname
+	LogGroupName *types.Value `json:"LogGroupName,omitempty"`
+
+	// LogRoleARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-macro.html#cfn-cloudformation-macro-logrolearn
+	LogRoleARN *types.Value `json:"LogRoleARN,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-macro.html#cfn-cloudformation-macro-name
+	Name *types.Value `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 *Macro) AWSCloudFormationType() string {
+	return "AWS::CloudFormation::Macro"
+}
+
+// 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 Macro) MarshalJSON() ([]byte, error) {
+	type Properties Macro
+	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 *Macro) UnmarshalJSON(b []byte) error {
+	type Properties Macro
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Macro(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudformation/aws-cloudformation-moduledefaultversion.go b/goformation/cloudformation/cloudformation/aws-cloudformation-moduledefaultversion.go
new file mode 100644
index 0000000000..17d9b22aa0
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/aws-cloudformation-moduledefaultversion.go
@@ -0,0 +1,118 @@
+package cloudformation
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModuleDefaultVersion AWS CloudFormation Resource (AWS::CloudFormation::ModuleDefaultVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-moduledefaultversion.html
+type ModuleDefaultVersion struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-moduledefaultversion.html#cfn-cloudformation-moduledefaultversion-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// ModuleName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-moduledefaultversion.html#cfn-cloudformation-moduledefaultversion-modulename
+	ModuleName *types.Value `json:"ModuleName,omitempty"`
+
+	// VersionId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-moduledefaultversion.html#cfn-cloudformation-moduledefaultversion-versionid
+	VersionId *types.Value `json:"VersionId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModuleDefaultVersion) AWSCloudFormationType() string {
+	return "AWS::CloudFormation::ModuleDefaultVersion"
+}
+
+// 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 ModuleDefaultVersion) MarshalJSON() ([]byte, error) {
+	type Properties ModuleDefaultVersion
+	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 *ModuleDefaultVersion) UnmarshalJSON(b []byte) error {
+	type Properties ModuleDefaultVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ModuleDefaultVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudformation/aws-cloudformation-moduleversion.go b/goformation/cloudformation/cloudformation/aws-cloudformation-moduleversion.go
new file mode 100644
index 0000000000..cb8ee5d74c
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/aws-cloudformation-moduleversion.go
@@ -0,0 +1,113 @@
+package cloudformation
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModuleVersion AWS CloudFormation Resource (AWS::CloudFormation::ModuleVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-moduleversion.html
+type ModuleVersion struct {
+
+	// ModuleName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-moduleversion.html#cfn-cloudformation-moduleversion-modulename
+	ModuleName *types.Value `json:"ModuleName,omitempty"`
+
+	// ModulePackage AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-moduleversion.html#cfn-cloudformation-moduleversion-modulepackage
+	ModulePackage *types.Value `json:"ModulePackage,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModuleVersion) AWSCloudFormationType() string {
+	return "AWS::CloudFormation::ModuleVersion"
+}
+
+// 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 ModuleVersion) MarshalJSON() ([]byte, error) {
+	type Properties ModuleVersion
+	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 *ModuleVersion) UnmarshalJSON(b []byte) error {
+	type Properties ModuleVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ModuleVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudformation/aws-cloudformation-publictypeversion.go b/goformation/cloudformation/cloudformation/aws-cloudformation-publictypeversion.go
new file mode 100644
index 0000000000..132956c1a2
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/aws-cloudformation-publictypeversion.go
@@ -0,0 +1,128 @@
+package cloudformation
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PublicTypeVersion AWS CloudFormation Resource (AWS::CloudFormation::PublicTypeVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publictypeversion.html
+type PublicTypeVersion struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publictypeversion.html#cfn-cloudformation-publictypeversion-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// LogDeliveryBucket AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publictypeversion.html#cfn-cloudformation-publictypeversion-logdeliverybucket
+	LogDeliveryBucket *types.Value `json:"LogDeliveryBucket,omitempty"`
+
+	// PublicVersionNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publictypeversion.html#cfn-cloudformation-publictypeversion-publicversionnumber
+	PublicVersionNumber *types.Value `json:"PublicVersionNumber,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publictypeversion.html#cfn-cloudformation-publictypeversion-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// TypeName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publictypeversion.html#cfn-cloudformation-publictypeversion-typename
+	TypeName *types.Value `json:"TypeName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PublicTypeVersion) AWSCloudFormationType() string {
+	return "AWS::CloudFormation::PublicTypeVersion"
+}
+
+// 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 PublicTypeVersion) MarshalJSON() ([]byte, error) {
+	type Properties PublicTypeVersion
+	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 *PublicTypeVersion) UnmarshalJSON(b []byte) error {
+	type Properties PublicTypeVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PublicTypeVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudformation/aws-cloudformation-publisher.go b/goformation/cloudformation/cloudformation/aws-cloudformation-publisher.go
new file mode 100644
index 0000000000..072b5ea11d
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/aws-cloudformation-publisher.go
@@ -0,0 +1,113 @@
+package cloudformation
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Publisher AWS CloudFormation Resource (AWS::CloudFormation::Publisher)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publisher.html
+type Publisher struct {
+
+	// AcceptTermsAndConditions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publisher.html#cfn-cloudformation-publisher-accepttermsandconditions
+	AcceptTermsAndConditions *types.Value `json:"AcceptTermsAndConditions"`
+
+	// ConnectionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-publisher.html#cfn-cloudformation-publisher-connectionarn
+	ConnectionArn *types.Value `json:"ConnectionArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Publisher) AWSCloudFormationType() string {
+	return "AWS::CloudFormation::Publisher"
+}
+
+// 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 Publisher) MarshalJSON() ([]byte, error) {
+	type Properties Publisher
+	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 *Publisher) UnmarshalJSON(b []byte) error {
+	type Properties Publisher
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Publisher(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudformation/aws-cloudformation-resourcedefaultversion.go b/goformation/cloudformation/cloudformation/aws-cloudformation-resourcedefaultversion.go
new file mode 100644
index 0000000000..154e9b66cc
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/aws-cloudformation-resourcedefaultversion.go
@@ -0,0 +1,118 @@
+package cloudformation
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefaultVersion AWS CloudFormation Resource (AWS::CloudFormation::ResourceDefaultVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-resourcedefaultversion.html
+type ResourceDefaultVersion struct {
+
+	// TypeName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-resourcedefaultversion.html#cfn-cloudformation-resourcedefaultversion-typename
+	TypeName *types.Value `json:"TypeName,omitempty"`
+
+	// TypeVersionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-resourcedefaultversion.html#cfn-cloudformation-resourcedefaultversion-typeversionarn
+	TypeVersionArn *types.Value `json:"TypeVersionArn,omitempty"`
+
+	// VersionId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-resourcedefaultversion.html#cfn-cloudformation-resourcedefaultversion-versionid
+	VersionId *types.Value `json:"VersionId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefaultVersion) AWSCloudFormationType() string {
+	return "AWS::CloudFormation::ResourceDefaultVersion"
+}
+
+// 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 ResourceDefaultVersion) MarshalJSON() ([]byte, error) {
+	type Properties ResourceDefaultVersion
+	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 *ResourceDefaultVersion) UnmarshalJSON(b []byte) error {
+	type Properties ResourceDefaultVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResourceDefaultVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudformation/aws-cloudformation-resourceversion.go b/goformation/cloudformation/cloudformation/aws-cloudformation-resourceversion.go
new file mode 100644
index 0000000000..6c400c945e
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/aws-cloudformation-resourceversion.go
@@ -0,0 +1,123 @@
+package cloudformation
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceVersion AWS CloudFormation Resource (AWS::CloudFormation::ResourceVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-resourceversion.html
+type ResourceVersion struct {
+
+	// ExecutionRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-resourceversion.html#cfn-cloudformation-resourceversion-executionrolearn
+	ExecutionRoleArn *types.Value `json:"ExecutionRoleArn,omitempty"`
+
+	// LoggingConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-resourceversion.html#cfn-cloudformation-resourceversion-loggingconfig
+	LoggingConfig *ResourceVersion_LoggingConfig `json:"LoggingConfig,omitempty"`
+
+	// SchemaHandlerPackage AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-resourceversion.html#cfn-cloudformation-resourceversion-schemahandlerpackage
+	SchemaHandlerPackage *types.Value `json:"SchemaHandlerPackage,omitempty"`
+
+	// TypeName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-resourceversion.html#cfn-cloudformation-resourceversion-typename
+	TypeName *types.Value `json:"TypeName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceVersion) AWSCloudFormationType() string {
+	return "AWS::CloudFormation::ResourceVersion"
+}
+
+// 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 ResourceVersion) MarshalJSON() ([]byte, error) {
+	type Properties ResourceVersion
+	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 *ResourceVersion) UnmarshalJSON(b []byte) error {
+	type Properties ResourceVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResourceVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudformation/aws-cloudformation-resourceversion_loggingconfig.go b/goformation/cloudformation/cloudformation/aws-cloudformation-resourceversion_loggingconfig.go
new file mode 100644
index 0000000000..ce4517ab07
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/aws-cloudformation-resourceversion_loggingconfig.go
@@ -0,0 +1,42 @@
+package cloudformation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceVersion_LoggingConfig AWS CloudFormation Resource (AWS::CloudFormation::ResourceVersion.LoggingConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-resourceversion-loggingconfig.html
+type ResourceVersion_LoggingConfig struct {
+
+	// LogGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-resourceversion-loggingconfig.html#cfn-cloudformation-resourceversion-loggingconfig-loggroupname
+	LogGroupName *types.Value `json:"LogGroupName,omitempty"`
+
+	// LogRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-resourceversion-loggingconfig.html#cfn-cloudformation-resourceversion-loggingconfig-logrolearn
+	LogRoleArn *types.Value `json:"LogRoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceVersion_LoggingConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFormation::ResourceVersion.LoggingConfig"
+}
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-stack.go b/goformation/cloudformation/cloudformation/aws-cloudformation-stack.go
new file mode 100644
index 0000000000..fabec51538
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/aws-cloudformation-stack.go
@@ -0,0 +1,128 @@
+package cloudformation
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stack AWS CloudFormation Resource (AWS::CloudFormation::Stack)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stack.html
+type Stack struct {
+
+	// NotificationARNs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stack.html#cfn-cloudformation-stack-notificationarns
+	NotificationARNs *types.Value `json:"NotificationARNs,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stack.html#cfn-cloudformation-stack-parameters
+	Parameters map[string]*types.Value `json:"Parameters,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stack.html#cfn-cloudformation-stack-tags
+	Tags []Tag `json:"Tags,omitempty"`
+
+	// TemplateURL AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stack.html#cfn-cloudformation-stack-templateurl
+	TemplateURL *types.Value `json:"TemplateURL,omitempty"`
+
+	// TimeoutInMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stack.html#cfn-cloudformation-stack-timeoutinminutes
+	TimeoutInMinutes *types.Value `json:"TimeoutInMinutes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Stack) AWSCloudFormationType() string {
+	return "AWS::CloudFormation::Stack"
+}
+
+// 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 Stack) MarshalJSON() ([]byte, error) {
+	type Properties Stack
+	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 *Stack) UnmarshalJSON(b []byte) error {
+	type Properties Stack
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Stack(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudformation/aws-cloudformation-stackset.go b/goformation/cloudformation/cloudformation/aws-cloudformation-stackset.go
new file mode 100644
index 0000000000..df3344290f
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/aws-cloudformation-stackset.go
@@ -0,0 +1,178 @@
+package cloudformation
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StackSet AWS CloudFormation Resource (AWS::CloudFormation::StackSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html
+type StackSet struct {
+
+	// AdministrationRoleARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html#cfn-cloudformation-stackset-administrationrolearn
+	AdministrationRoleARN *types.Value `json:"AdministrationRoleARN,omitempty"`
+
+	// AutoDeployment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html#cfn-cloudformation-stackset-autodeployment
+	AutoDeployment *StackSet_AutoDeployment `json:"AutoDeployment,omitempty"`
+
+	// CallAs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html#cfn-cloudformation-stackset-callas
+	CallAs *types.Value `json:"CallAs,omitempty"`
+
+	// Capabilities AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html#cfn-cloudformation-stackset-capabilities
+	Capabilities *types.Value `json:"Capabilities,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html#cfn-cloudformation-stackset-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// ExecutionRoleName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html#cfn-cloudformation-stackset-executionrolename
+	ExecutionRoleName *types.Value `json:"ExecutionRoleName,omitempty"`
+
+	// ManagedExecution AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html#cfn-cloudformation-stackset-managedexecution
+	ManagedExecution interface{} `json:"ManagedExecution,omitempty"`
+
+	// OperationPreferences AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html#cfn-cloudformation-stackset-operationpreferences
+	OperationPreferences *StackSet_OperationPreferences `json:"OperationPreferences,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html#cfn-cloudformation-stackset-parameters
+	Parameters []StackSet_Parameter `json:"Parameters,omitempty"`
+
+	// PermissionModel AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html#cfn-cloudformation-stackset-permissionmodel
+	PermissionModel *types.Value `json:"PermissionModel,omitempty"`
+
+	// StackInstancesGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html#cfn-cloudformation-stackset-stackinstancesgroup
+	StackInstancesGroup []StackSet_StackInstances `json:"StackInstancesGroup,omitempty"`
+
+	// StackSetName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html#cfn-cloudformation-stackset-stacksetname
+	StackSetName *types.Value `json:"StackSetName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html#cfn-cloudformation-stackset-tags
+	Tags []Tag `json:"Tags,omitempty"`
+
+	// TemplateBody AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html#cfn-cloudformation-stackset-templatebody
+	TemplateBody *types.Value `json:"TemplateBody,omitempty"`
+
+	// TemplateURL AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-stackset.html#cfn-cloudformation-stackset-templateurl
+	TemplateURL *types.Value `json:"TemplateURL,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StackSet) AWSCloudFormationType() string {
+	return "AWS::CloudFormation::StackSet"
+}
+
+// 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 StackSet) MarshalJSON() ([]byte, error) {
+	type Properties StackSet
+	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 *StackSet) UnmarshalJSON(b []byte) error {
+	type Properties StackSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = StackSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_autodeployment.go b/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_autodeployment.go
new file mode 100644
index 0000000000..fcf0bca65c
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_autodeployment.go
@@ -0,0 +1,42 @@
+package cloudformation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StackSet_AutoDeployment AWS CloudFormation Resource (AWS::CloudFormation::StackSet.AutoDeployment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-autodeployment.html
+type StackSet_AutoDeployment struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-autodeployment.html#cfn-cloudformation-stackset-autodeployment-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// RetainStacksOnAccountRemoval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-autodeployment.html#cfn-cloudformation-stackset-autodeployment-retainstacksonaccountremoval
+	RetainStacksOnAccountRemoval *types.Value `json:"RetainStacksOnAccountRemoval,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StackSet_AutoDeployment) AWSCloudFormationType() string {
+	return "AWS::CloudFormation::StackSet.AutoDeployment"
+}
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_deploymenttargets.go b/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_deploymenttargets.go
new file mode 100644
index 0000000000..9f1453c798
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_deploymenttargets.go
@@ -0,0 +1,42 @@
+package cloudformation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StackSet_DeploymentTargets AWS CloudFormation Resource (AWS::CloudFormation::StackSet.DeploymentTargets)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-deploymenttargets.html
+type StackSet_DeploymentTargets struct {
+
+	// Accounts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-deploymenttargets.html#cfn-cloudformation-stackset-deploymenttargets-accounts
+	Accounts *types.Value `json:"Accounts,omitempty"`
+
+	// OrganizationalUnitIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-deploymenttargets.html#cfn-cloudformation-stackset-deploymenttargets-organizationalunitids
+	OrganizationalUnitIds *types.Value `json:"OrganizationalUnitIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StackSet_DeploymentTargets) AWSCloudFormationType() string {
+	return "AWS::CloudFormation::StackSet.DeploymentTargets"
+}
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_operationpreferences.go b/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_operationpreferences.go
new file mode 100644
index 0000000000..6fa91d3198
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_operationpreferences.go
@@ -0,0 +1,62 @@
+package cloudformation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StackSet_OperationPreferences AWS CloudFormation Resource (AWS::CloudFormation::StackSet.OperationPreferences)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-operationpreferences.html
+type StackSet_OperationPreferences struct {
+
+	// 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
+	FailureToleranceCount *types.Value `json:"FailureToleranceCount,omitempty"`
+
+	// FailureTolerancePercentage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-operationpreferences.html#cfn-cloudformation-stackset-operationpreferences-failuretolerancepercentage
+	FailureTolerancePercentage *types.Value `json:"FailureTolerancePercentage,omitempty"`
+
+	// MaxConcurrentCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-operationpreferences.html#cfn-cloudformation-stackset-operationpreferences-maxconcurrentcount
+	MaxConcurrentCount *types.Value `json:"MaxConcurrentCount,omitempty"`
+
+	// MaxConcurrentPercentage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-operationpreferences.html#cfn-cloudformation-stackset-operationpreferences-maxconcurrentpercentage
+	MaxConcurrentPercentage *types.Value `json:"MaxConcurrentPercentage,omitempty"`
+
+	// RegionConcurrencyType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-operationpreferences.html#cfn-cloudformation-stackset-operationpreferences-regionconcurrencytype
+	RegionConcurrencyType *types.Value `json:"RegionConcurrencyType,omitempty"`
+
+	// RegionOrder AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-operationpreferences.html#cfn-cloudformation-stackset-operationpreferences-regionorder
+	RegionOrder *types.Value `json:"RegionOrder,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StackSet_OperationPreferences) AWSCloudFormationType() string {
+	return "AWS::CloudFormation::StackSet.OperationPreferences"
+}
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_parameter.go b/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_parameter.go
new file mode 100644
index 0000000000..effa6e503d
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_parameter.go
@@ -0,0 +1,42 @@
+package cloudformation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StackSet_Parameter AWS CloudFormation Resource (AWS::CloudFormation::StackSet.Parameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-parameter.html
+type StackSet_Parameter struct {
+
+	// ParameterKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-parameter.html#cfn-cloudformation-stackset-parameter-parameterkey
+	ParameterKey *types.Value `json:"ParameterKey,omitempty"`
+
+	// ParameterValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-parameter.html#cfn-cloudformation-stackset-parameter-parametervalue
+	ParameterValue *types.Value `json:"ParameterValue,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StackSet_Parameter) AWSCloudFormationType() string {
+	return "AWS::CloudFormation::StackSet.Parameter"
+}
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_stackinstances.go b/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_stackinstances.go
new file mode 100644
index 0000000000..c341cae8d1
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/aws-cloudformation-stackset_stackinstances.go
@@ -0,0 +1,47 @@
+package cloudformation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StackSet_StackInstances AWS CloudFormation Resource (AWS::CloudFormation::StackSet.StackInstances)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-stackinstances.html
+type StackSet_StackInstances struct {
+
+	// DeploymentTargets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-stackinstances.html#cfn-cloudformation-stackset-stackinstances-deploymenttargets
+	DeploymentTargets *StackSet_DeploymentTargets `json:"DeploymentTargets,omitempty"`
+
+	// ParameterOverrides AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-stackinstances.html#cfn-cloudformation-stackset-stackinstances-parameteroverrides
+	ParameterOverrides []StackSet_Parameter `json:"ParameterOverrides,omitempty"`
+
+	// Regions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-stackset-stackinstances.html#cfn-cloudformation-stackset-stackinstances-regions
+	Regions *types.Value `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 *StackSet_StackInstances) AWSCloudFormationType() string {
+	return "AWS::CloudFormation::StackSet.StackInstances"
+}
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-typeactivation.go b/goformation/cloudformation/cloudformation/aws-cloudformation-typeactivation.go
new file mode 100644
index 0000000000..8dc6552969
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/aws-cloudformation-typeactivation.go
@@ -0,0 +1,153 @@
+package cloudformation
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TypeActivation AWS CloudFormation Resource (AWS::CloudFormation::TypeActivation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html
+type TypeActivation struct {
+
+	// AutoUpdate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html#cfn-cloudformation-typeactivation-autoupdate
+	AutoUpdate *types.Value `json:"AutoUpdate,omitempty"`
+
+	// ExecutionRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html#cfn-cloudformation-typeactivation-executionrolearn
+	ExecutionRoleArn *types.Value `json:"ExecutionRoleArn,omitempty"`
+
+	// LoggingConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html#cfn-cloudformation-typeactivation-loggingconfig
+	LoggingConfig *TypeActivation_LoggingConfig `json:"LoggingConfig,omitempty"`
+
+	// MajorVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html#cfn-cloudformation-typeactivation-majorversion
+	MajorVersion *types.Value `json:"MajorVersion,omitempty"`
+
+	// PublicTypeArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html#cfn-cloudformation-typeactivation-publictypearn
+	PublicTypeArn *types.Value `json:"PublicTypeArn,omitempty"`
+
+	// PublisherId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html#cfn-cloudformation-typeactivation-publisherid
+	PublisherId *types.Value `json:"PublisherId,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html#cfn-cloudformation-typeactivation-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// TypeName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html#cfn-cloudformation-typeactivation-typename
+	TypeName *types.Value `json:"TypeName,omitempty"`
+
+	// TypeNameAlias AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html#cfn-cloudformation-typeactivation-typenamealias
+	TypeNameAlias *types.Value `json:"TypeNameAlias,omitempty"`
+
+	// VersionBump AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudformation-typeactivation.html#cfn-cloudformation-typeactivation-versionbump
+	VersionBump *types.Value `json:"VersionBump,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TypeActivation) AWSCloudFormationType() string {
+	return "AWS::CloudFormation::TypeActivation"
+}
+
+// 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 TypeActivation) MarshalJSON() ([]byte, error) {
+	type Properties TypeActivation
+	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 *TypeActivation) UnmarshalJSON(b []byte) error {
+	type Properties TypeActivation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TypeActivation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudformation/aws-cloudformation-typeactivation_loggingconfig.go b/goformation/cloudformation/cloudformation/aws-cloudformation-typeactivation_loggingconfig.go
new file mode 100644
index 0000000000..06d4002047
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/aws-cloudformation-typeactivation_loggingconfig.go
@@ -0,0 +1,42 @@
+package cloudformation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TypeActivation_LoggingConfig AWS CloudFormation Resource (AWS::CloudFormation::TypeActivation.LoggingConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-typeactivation-loggingconfig.html
+type TypeActivation_LoggingConfig struct {
+
+	// LogGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-typeactivation-loggingconfig.html#cfn-cloudformation-typeactivation-loggingconfig-loggroupname
+	LogGroupName *types.Value `json:"LogGroupName,omitempty"`
+
+	// LogRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudformation-typeactivation-loggingconfig.html#cfn-cloudformation-typeactivation-loggingconfig-logrolearn
+	LogRoleArn *types.Value `json:"LogRoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TypeActivation_LoggingConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFormation::TypeActivation.LoggingConfig"
+}
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-waitcondition.go b/goformation/cloudformation/cloudformation/aws-cloudformation-waitcondition.go
new file mode 100644
index 0000000000..13ce6e89b4
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/aws-cloudformation-waitcondition.go
@@ -0,0 +1,131 @@
+package cloudformation
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WaitCondition AWS CloudFormation Resource (AWS::CloudFormation::WaitCondition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waitcondition.html
+type WaitCondition struct {
+
+	// Count AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waitcondition.html#cfn-waitcondition-count
+	Count *types.Value `json:"Count,omitempty"`
+
+	// Handle AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waitcondition.html#cfn-waitcondition-handle
+	Handle *types.Value `json:"Handle,omitempty"`
+
+	// Timeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waitcondition.html#cfn-waitcondition-timeout
+	Timeout *types.Value `json:"Timeout,omitempty"`
+
+	// AWSCloudFormationCreationPolicy represents a CloudFormation CreationPolicy
+	AWSCloudFormationCreationPolicy *policies.CreationPolicy `json:"-"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WaitCondition) AWSCloudFormationType() string {
+	return "AWS::CloudFormation::WaitCondition"
+}
+
+// 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 WaitCondition) MarshalJSON() ([]byte, error) {
+	type Properties WaitCondition
+	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"`
+
+		CreationPolicy *policies.CreationPolicy `json:"CreationPolicy,omitempty"`
+	}{
+		Type:                r.AWSCloudFormationType(),
+		Properties:          (Properties)(r),
+		DependsOn:           r.AWSCloudFormationDependsOn,
+		Metadata:            r.AWSCloudFormationMetadata,
+		DeletionPolicy:      r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition:           r.AWSCloudFormationCondition,
+
+		CreationPolicy: r.AWSCloudFormationCreationPolicy,
+	})
+}
+
+// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
+// AWS CloudFormation resource object, and just keeps the 'Properties' field.
+func (r *WaitCondition) UnmarshalJSON(b []byte) error {
+	type Properties WaitCondition
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		Metadata            map[string]interface{}
+		DeletionPolicy      string
+		UpdateReplacePolicy string
+		Condition           string
+
+		CreationPolicy *policies.CreationPolicy
+	}{}
+
+	dec := json.NewDecoder(bytes.NewReader(b))
+	dec.DisallowUnknownFields() // Force error if unknown field is found
+
+	if err := dec.Decode(&res); err != nil {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = WaitCondition(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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
+	}
+	if res.CreationPolicy != nil {
+		r.AWSCloudFormationCreationPolicy = res.CreationPolicy
+	}
+
+	return nil
+}
diff --git a/goformation/cloudformation/cloudformation/aws-cloudformation-waitconditionhandle.go b/goformation/cloudformation/cloudformation/aws-cloudformation-waitconditionhandle.go
new file mode 100644
index 0000000000..0d595f2677
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/aws-cloudformation-waitconditionhandle.go
@@ -0,0 +1,101 @@
+package cloudformation
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WaitConditionHandle AWS CloudFormation Resource (AWS::CloudFormation::WaitConditionHandle)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waitconditionhandle.html
+type WaitConditionHandle struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WaitConditionHandle) AWSCloudFormationType() string {
+	return "AWS::CloudFormation::WaitConditionHandle"
+}
+
+// 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 WaitConditionHandle) MarshalJSON() ([]byte, error) {
+	type Properties WaitConditionHandle
+	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 *WaitConditionHandle) UnmarshalJSON(b []byte) error {
+	type Properties WaitConditionHandle
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = WaitConditionHandle(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudformation/tag.go b/goformation/cloudformation/cloudformation/tag.go
new file mode 100644
index 0000000000..4e4a001af2
--- /dev/null
+++ b/goformation/cloudformation/cloudformation/tag.go
@@ -0,0 +1,42 @@
+package cloudformation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Tag AWS CloudFormation Resource (Tag)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html
+type Tag struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html#cfn-resource-tags-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resource-tags.html#cfn-resource-tags-value
+	Value *types.Value `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 *Tag) AWSCloudFormationType() string {
+	return "Tag"
+}
diff --git a/goformation/cloudformation/cloudformation_suite_test.go b/goformation/cloudformation/cloudformation_suite_test.go
new file mode 100644
index 0000000000..392ec5974e
--- /dev/null
+++ b/goformation/cloudformation/cloudformation_suite_test.go
@@ -0,0 +1,13 @@
+package cloudformation_test
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	"testing"
+)
+
+func TestCloudformation(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Cloudformation Suite")
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy.go b/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy.go
new file mode 100644
index 0000000000..2a04ed7f18
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy.go
@@ -0,0 +1,106 @@
+package cloudfront
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CachePolicy AWS CloudFormation Resource (AWS::CloudFront::CachePolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-cachepolicy.html
+type CachePolicy struct {
+
+	// CachePolicyConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-cachepolicy.html#cfn-cloudfront-cachepolicy-cachepolicyconfig
+	CachePolicyConfig *CachePolicy_CachePolicyConfig `json:"CachePolicyConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CachePolicy) AWSCloudFormationType() string {
+	return "AWS::CloudFront::CachePolicy"
+}
+
+// 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 CachePolicy) MarshalJSON() ([]byte, error) {
+	type Properties CachePolicy
+	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 *CachePolicy) UnmarshalJSON(b []byte) error {
+	type Properties CachePolicy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CachePolicy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cachepolicyconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cachepolicyconfig.go
new file mode 100644
index 0000000000..b73c09dac1
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cachepolicyconfig.go
@@ -0,0 +1,62 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CachePolicy_CachePolicyConfig AWS CloudFormation Resource (AWS::CloudFront::CachePolicy.CachePolicyConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-cachepolicyconfig.html
+type CachePolicy_CachePolicyConfig struct {
+
+	// Comment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-cachepolicyconfig.html#cfn-cloudfront-cachepolicy-cachepolicyconfig-comment
+	Comment *types.Value `json:"Comment,omitempty"`
+
+	// DefaultTTL AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-cachepolicyconfig.html#cfn-cloudfront-cachepolicy-cachepolicyconfig-defaultttl
+	DefaultTTL *types.Value `json:"DefaultTTL"`
+
+	// MaxTTL AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-cachepolicyconfig.html#cfn-cloudfront-cachepolicy-cachepolicyconfig-maxttl
+	MaxTTL *types.Value `json:"MaxTTL"`
+
+	// MinTTL AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-cachepolicyconfig.html#cfn-cloudfront-cachepolicy-cachepolicyconfig-minttl
+	MinTTL *types.Value `json:"MinTTL"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-cachepolicyconfig.html#cfn-cloudfront-cachepolicy-cachepolicyconfig-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ParametersInCacheKeyAndForwardedToOrigin AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-cachepolicyconfig.html#cfn-cloudfront-cachepolicy-cachepolicyconfig-parametersincachekeyandforwardedtoorigin
+	ParametersInCacheKeyAndForwardedToOrigin *CachePolicy_ParametersInCacheKeyAndForwardedToOrigin `json:"ParametersInCacheKeyAndForwardedToOrigin,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CachePolicy_CachePolicyConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::CachePolicy.CachePolicyConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cookiesconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cookiesconfig.go
new file mode 100644
index 0000000000..4d3e021d0b
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_cookiesconfig.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CachePolicy_CookiesConfig AWS CloudFormation Resource (AWS::CloudFront::CachePolicy.CookiesConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-cookiesconfig.html
+type CachePolicy_CookiesConfig struct {
+
+	// CookieBehavior AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-cookiesconfig.html#cfn-cloudfront-cachepolicy-cookiesconfig-cookiebehavior
+	CookieBehavior *types.Value `json:"CookieBehavior,omitempty"`
+
+	// Cookies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-cookiesconfig.html#cfn-cloudfront-cachepolicy-cookiesconfig-cookies
+	Cookies *types.Value `json:"Cookies,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CachePolicy_CookiesConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::CachePolicy.CookiesConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_headersconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_headersconfig.go
new file mode 100644
index 0000000000..4991cad5a1
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_headersconfig.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CachePolicy_HeadersConfig AWS CloudFormation Resource (AWS::CloudFront::CachePolicy.HeadersConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-headersconfig.html
+type CachePolicy_HeadersConfig struct {
+
+	// HeaderBehavior AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-headersconfig.html#cfn-cloudfront-cachepolicy-headersconfig-headerbehavior
+	HeaderBehavior *types.Value `json:"HeaderBehavior,omitempty"`
+
+	// Headers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-headersconfig.html#cfn-cloudfront-cachepolicy-headersconfig-headers
+	Headers *types.Value `json:"Headers,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CachePolicy_HeadersConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::CachePolicy.HeadersConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_parametersincachekeyandforwardedtoorigin.go b/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_parametersincachekeyandforwardedtoorigin.go
new file mode 100644
index 0000000000..d1b1b6fa13
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_parametersincachekeyandforwardedtoorigin.go
@@ -0,0 +1,57 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CachePolicy_ParametersInCacheKeyAndForwardedToOrigin AWS CloudFormation Resource (AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-parametersincachekeyandforwardedtoorigin.html
+type CachePolicy_ParametersInCacheKeyAndForwardedToOrigin struct {
+
+	// CookiesConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-parametersincachekeyandforwardedtoorigin.html#cfn-cloudfront-cachepolicy-parametersincachekeyandforwardedtoorigin-cookiesconfig
+	CookiesConfig *CachePolicy_CookiesConfig `json:"CookiesConfig,omitempty"`
+
+	// EnableAcceptEncodingBrotli AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-parametersincachekeyandforwardedtoorigin.html#cfn-cloudfront-cachepolicy-parametersincachekeyandforwardedtoorigin-enableacceptencodingbrotli
+	EnableAcceptEncodingBrotli *types.Value `json:"EnableAcceptEncodingBrotli,omitempty"`
+
+	// EnableAcceptEncodingGzip AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-parametersincachekeyandforwardedtoorigin.html#cfn-cloudfront-cachepolicy-parametersincachekeyandforwardedtoorigin-enableacceptencodinggzip
+	EnableAcceptEncodingGzip *types.Value `json:"EnableAcceptEncodingGzip"`
+
+	// HeadersConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-parametersincachekeyandforwardedtoorigin.html#cfn-cloudfront-cachepolicy-parametersincachekeyandforwardedtoorigin-headersconfig
+	HeadersConfig *CachePolicy_HeadersConfig `json:"HeadersConfig,omitempty"`
+
+	// QueryStringsConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-parametersincachekeyandforwardedtoorigin.html#cfn-cloudfront-cachepolicy-parametersincachekeyandforwardedtoorigin-querystringsconfig
+	QueryStringsConfig *CachePolicy_QueryStringsConfig `json:"QueryStringsConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CachePolicy_ParametersInCacheKeyAndForwardedToOrigin) AWSCloudFormationType() string {
+	return "AWS::CloudFront::CachePolicy.ParametersInCacheKeyAndForwardedToOrigin"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_querystringsconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_querystringsconfig.go
new file mode 100644
index 0000000000..5b8df2372d
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-cachepolicy_querystringsconfig.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CachePolicy_QueryStringsConfig AWS CloudFormation Resource (AWS::CloudFront::CachePolicy.QueryStringsConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-querystringsconfig.html
+type CachePolicy_QueryStringsConfig struct {
+
+	// QueryStringBehavior AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-querystringsconfig.html#cfn-cloudfront-cachepolicy-querystringsconfig-querystringbehavior
+	QueryStringBehavior *types.Value `json:"QueryStringBehavior,omitempty"`
+
+	// QueryStrings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cachepolicy-querystringsconfig.html#cfn-cloudfront-cachepolicy-querystringsconfig-querystrings
+	QueryStrings *types.Value `json:"QueryStrings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CachePolicy_QueryStringsConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::CachePolicy.QueryStringsConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity.go b/goformation/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity.go
new file mode 100644
index 0000000000..3958c7840b
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity.go
@@ -0,0 +1,106 @@
+package cloudfront
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CloudFrontOriginAccessIdentity AWS CloudFormation Resource (AWS::CloudFront::CloudFrontOriginAccessIdentity)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-cloudfrontoriginaccessidentity.html
+type CloudFrontOriginAccessIdentity struct {
+
+	// CloudFrontOriginAccessIdentityConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-cloudfrontoriginaccessidentity.html#cfn-cloudfront-cloudfrontoriginaccessidentity-cloudfrontoriginaccessidentityconfig
+	CloudFrontOriginAccessIdentityConfig *CloudFrontOriginAccessIdentity_CloudFrontOriginAccessIdentityConfig `json:"CloudFrontOriginAccessIdentityConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CloudFrontOriginAccessIdentity) AWSCloudFormationType() string {
+	return "AWS::CloudFront::CloudFrontOriginAccessIdentity"
+}
+
+// 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 CloudFrontOriginAccessIdentity) MarshalJSON() ([]byte, error) {
+	type Properties CloudFrontOriginAccessIdentity
+	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 *CloudFrontOriginAccessIdentity) UnmarshalJSON(b []byte) error {
+	type Properties CloudFrontOriginAccessIdentity
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CloudFrontOriginAccessIdentity(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity_cloudfrontoriginaccessidentityconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity_cloudfrontoriginaccessidentityconfig.go
new file mode 100644
index 0000000000..93f16a00c4
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-cloudfrontoriginaccessidentity_cloudfrontoriginaccessidentityconfig.go
@@ -0,0 +1,37 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CloudFrontOriginAccessIdentity_CloudFrontOriginAccessIdentityConfig AWS CloudFormation Resource (AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cloudfrontoriginaccessidentity-cloudfrontoriginaccessidentityconfig.html
+type CloudFrontOriginAccessIdentity_CloudFrontOriginAccessIdentityConfig struct {
+
+	// Comment AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-cloudfrontoriginaccessidentity-cloudfrontoriginaccessidentityconfig.html#cfn-cloudfront-cloudfrontoriginaccessidentity-cloudfrontoriginaccessidentityconfig-comment
+	Comment *types.Value `json:"Comment,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CloudFrontOriginAccessIdentity_CloudFrontOriginAccessIdentityConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::CloudFrontOriginAccessIdentity.CloudFrontOriginAccessIdentityConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution.go
new file mode 100644
index 0000000000..409180d6f7
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution.go
@@ -0,0 +1,112 @@
+package cloudfront
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution AWS CloudFormation Resource (AWS::CloudFront::Distribution)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-distribution.html
+type Distribution struct {
+
+	// DistributionConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-distribution.html#cfn-cloudfront-distribution-distributionconfig
+	DistributionConfig *Distribution_DistributionConfig `json:"DistributionConfig,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-distribution.html#cfn-cloudfront-distribution-tags
+	Tags []cloudformation.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 *Distribution) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution"
+}
+
+// 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 Distribution) MarshalJSON() ([]byte, error) {
+	type Properties Distribution
+	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 *Distribution) UnmarshalJSON(b []byte) error {
+	type Properties Distribution
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Distribution(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_cachebehavior.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_cachebehavior.go
new file mode 100644
index 0000000000..7add23e9ee
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_cachebehavior.go
@@ -0,0 +1,132 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_CacheBehavior AWS CloudFormation Resource (AWS::CloudFront::Distribution.CacheBehavior)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html
+type Distribution_CacheBehavior struct {
+
+	// AllowedMethods AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-allowedmethods
+	AllowedMethods *types.Value `json:"AllowedMethods,omitempty"`
+
+	// CachePolicyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-cachepolicyid
+	CachePolicyId *types.Value `json:"CachePolicyId,omitempty"`
+
+	// CachedMethods AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-cachedmethods
+	CachedMethods *types.Value `json:"CachedMethods,omitempty"`
+
+	// Compress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-compress
+	Compress *types.Value `json:"Compress,omitempty"`
+
+	// DefaultTTL AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-defaultttl
+	DefaultTTL *types.Value `json:"DefaultTTL,omitempty"`
+
+	// FieldLevelEncryptionId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-fieldlevelencryptionid
+	FieldLevelEncryptionId *types.Value `json:"FieldLevelEncryptionId,omitempty"`
+
+	// ForwardedValues AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-forwardedvalues
+	ForwardedValues *Distribution_ForwardedValues `json:"ForwardedValues,omitempty"`
+
+	// FunctionAssociations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-functionassociations
+	FunctionAssociations []Distribution_FunctionAssociation `json:"FunctionAssociations,omitempty"`
+
+	// LambdaFunctionAssociations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-lambdafunctionassociations
+	LambdaFunctionAssociations []Distribution_LambdaFunctionAssociation `json:"LambdaFunctionAssociations,omitempty"`
+
+	// MaxTTL AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-maxttl
+	MaxTTL *types.Value `json:"MaxTTL,omitempty"`
+
+	// MinTTL AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-minttl
+	MinTTL *types.Value `json:"MinTTL,omitempty"`
+
+	// OriginRequestPolicyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-originrequestpolicyid
+	OriginRequestPolicyId *types.Value `json:"OriginRequestPolicyId,omitempty"`
+
+	// PathPattern AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-pathpattern
+	PathPattern *types.Value `json:"PathPattern,omitempty"`
+
+	// RealtimeLogConfigArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-realtimelogconfigarn
+	RealtimeLogConfigArn *types.Value `json:"RealtimeLogConfigArn,omitempty"`
+
+	// ResponseHeadersPolicyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-responseheaderspolicyid
+	ResponseHeadersPolicyId *types.Value `json:"ResponseHeadersPolicyId,omitempty"`
+
+	// SmoothStreaming AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-smoothstreaming
+	SmoothStreaming *types.Value `json:"SmoothStreaming,omitempty"`
+
+	// TargetOriginId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-targetoriginid
+	TargetOriginId *types.Value `json:"TargetOriginId,omitempty"`
+
+	// TrustedKeyGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-trustedkeygroups
+	TrustedKeyGroups *types.Value `json:"TrustedKeyGroups,omitempty"`
+
+	// TrustedSigners AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-trustedsigners
+	TrustedSigners *types.Value `json:"TrustedSigners,omitempty"`
+
+	// ViewerProtocolPolicy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cachebehavior.html#cfn-cloudfront-distribution-cachebehavior-viewerprotocolpolicy
+	ViewerProtocolPolicy *types.Value `json:"ViewerProtocolPolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_CacheBehavior) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.CacheBehavior"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_cookies.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_cookies.go
new file mode 100644
index 0000000000..a418fa2cd2
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_cookies.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_Cookies AWS CloudFormation Resource (AWS::CloudFront::Distribution.Cookies)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cookies.html
+type Distribution_Cookies struct {
+
+	// Forward AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cookies.html#cfn-cloudfront-distribution-cookies-forward
+	Forward *types.Value `json:"Forward,omitempty"`
+
+	// WhitelistedNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-cookies.html#cfn-cloudfront-distribution-cookies-whitelistednames
+	WhitelistedNames *types.Value `json:"WhitelistedNames,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_Cookies) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.Cookies"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_customerrorresponse.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_customerrorresponse.go
new file mode 100644
index 0000000000..afc3048473
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_customerrorresponse.go
@@ -0,0 +1,52 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_CustomErrorResponse AWS CloudFormation Resource (AWS::CloudFront::Distribution.CustomErrorResponse)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-customerrorresponse.html
+type Distribution_CustomErrorResponse struct {
+
+	// ErrorCachingMinTTL AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-customerrorresponse.html#cfn-cloudfront-distribution-customerrorresponse-errorcachingminttl
+	ErrorCachingMinTTL *types.Value `json:"ErrorCachingMinTTL,omitempty"`
+
+	// ErrorCode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-customerrorresponse.html#cfn-cloudfront-distribution-customerrorresponse-errorcode
+	ErrorCode *types.Value `json:"ErrorCode"`
+
+	// ResponseCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-customerrorresponse.html#cfn-cloudfront-distribution-customerrorresponse-responsecode
+	ResponseCode *types.Value `json:"ResponseCode,omitempty"`
+
+	// ResponsePagePath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-customerrorresponse.html#cfn-cloudfront-distribution-customerrorresponse-responsepagepath
+	ResponsePagePath *types.Value `json:"ResponsePagePath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_CustomErrorResponse) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.CustomErrorResponse"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_customoriginconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_customoriginconfig.go
new file mode 100644
index 0000000000..209b0e60c9
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_customoriginconfig.go
@@ -0,0 +1,62 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_CustomOriginConfig AWS CloudFormation Resource (AWS::CloudFront::Distribution.CustomOriginConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-customoriginconfig.html
+type Distribution_CustomOriginConfig struct {
+
+	// HTTPPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-customoriginconfig.html#cfn-cloudfront-distribution-customoriginconfig-httpport
+	HTTPPort *types.Value `json:"HTTPPort,omitempty"`
+
+	// HTTPSPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-customoriginconfig.html#cfn-cloudfront-distribution-customoriginconfig-httpsport
+	HTTPSPort *types.Value `json:"HTTPSPort,omitempty"`
+
+	// OriginKeepaliveTimeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-customoriginconfig.html#cfn-cloudfront-distribution-customoriginconfig-originkeepalivetimeout
+	OriginKeepaliveTimeout *types.Value `json:"OriginKeepaliveTimeout,omitempty"`
+
+	// OriginProtocolPolicy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-customoriginconfig.html#cfn-cloudfront-distribution-customoriginconfig-originprotocolpolicy
+	OriginProtocolPolicy *types.Value `json:"OriginProtocolPolicy,omitempty"`
+
+	// OriginReadTimeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-customoriginconfig.html#cfn-cloudfront-distribution-customoriginconfig-originreadtimeout
+	OriginReadTimeout *types.Value `json:"OriginReadTimeout,omitempty"`
+
+	// OriginSSLProtocols AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-customoriginconfig.html#cfn-cloudfront-distribution-customoriginconfig-originsslprotocols
+	OriginSSLProtocols *types.Value `json:"OriginSSLProtocols,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_CustomOriginConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.CustomOriginConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_defaultcachebehavior.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_defaultcachebehavior.go
new file mode 100644
index 0000000000..92c17040eb
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_defaultcachebehavior.go
@@ -0,0 +1,127 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_DefaultCacheBehavior AWS CloudFormation Resource (AWS::CloudFront::Distribution.DefaultCacheBehavior)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html
+type Distribution_DefaultCacheBehavior struct {
+
+	// AllowedMethods AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-allowedmethods
+	AllowedMethods *types.Value `json:"AllowedMethods,omitempty"`
+
+	// CachePolicyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-cachepolicyid
+	CachePolicyId *types.Value `json:"CachePolicyId,omitempty"`
+
+	// CachedMethods AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-cachedmethods
+	CachedMethods *types.Value `json:"CachedMethods,omitempty"`
+
+	// Compress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-compress
+	Compress *types.Value `json:"Compress,omitempty"`
+
+	// DefaultTTL AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-defaultttl
+	DefaultTTL *types.Value `json:"DefaultTTL,omitempty"`
+
+	// FieldLevelEncryptionId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-fieldlevelencryptionid
+	FieldLevelEncryptionId *types.Value `json:"FieldLevelEncryptionId,omitempty"`
+
+	// ForwardedValues AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-forwardedvalues
+	ForwardedValues *Distribution_ForwardedValues `json:"ForwardedValues,omitempty"`
+
+	// FunctionAssociations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-functionassociations
+	FunctionAssociations []Distribution_FunctionAssociation `json:"FunctionAssociations,omitempty"`
+
+	// LambdaFunctionAssociations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-lambdafunctionassociations
+	LambdaFunctionAssociations []Distribution_LambdaFunctionAssociation `json:"LambdaFunctionAssociations,omitempty"`
+
+	// MaxTTL AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-maxttl
+	MaxTTL *types.Value `json:"MaxTTL,omitempty"`
+
+	// MinTTL AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-minttl
+	MinTTL *types.Value `json:"MinTTL,omitempty"`
+
+	// OriginRequestPolicyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-originrequestpolicyid
+	OriginRequestPolicyId *types.Value `json:"OriginRequestPolicyId,omitempty"`
+
+	// RealtimeLogConfigArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-realtimelogconfigarn
+	RealtimeLogConfigArn *types.Value `json:"RealtimeLogConfigArn,omitempty"`
+
+	// ResponseHeadersPolicyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-responseheaderspolicyid
+	ResponseHeadersPolicyId *types.Value `json:"ResponseHeadersPolicyId,omitempty"`
+
+	// SmoothStreaming AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-smoothstreaming
+	SmoothStreaming *types.Value `json:"SmoothStreaming,omitempty"`
+
+	// TargetOriginId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-targetoriginid
+	TargetOriginId *types.Value `json:"TargetOriginId,omitempty"`
+
+	// TrustedKeyGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-trustedkeygroups
+	TrustedKeyGroups *types.Value `json:"TrustedKeyGroups,omitempty"`
+
+	// TrustedSigners AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-trustedsigners
+	TrustedSigners *types.Value `json:"TrustedSigners,omitempty"`
+
+	// ViewerProtocolPolicy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-defaultcachebehavior.html#cfn-cloudfront-distribution-defaultcachebehavior-viewerprotocolpolicy
+	ViewerProtocolPolicy *types.Value `json:"ViewerProtocolPolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_DefaultCacheBehavior) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.DefaultCacheBehavior"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_distributionconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_distributionconfig.go
new file mode 100644
index 0000000000..c8822461d9
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_distributionconfig.go
@@ -0,0 +1,127 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_DistributionConfig AWS CloudFormation Resource (AWS::CloudFront::Distribution.DistributionConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html
+type Distribution_DistributionConfig struct {
+
+	// Aliases AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-aliases
+	Aliases *types.Value `json:"Aliases,omitempty"`
+
+	// CNAMEs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-cnames
+	CNAMEs *types.Value `json:"CNAMEs,omitempty"`
+
+	// CacheBehaviors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-cachebehaviors
+	CacheBehaviors []Distribution_CacheBehavior `json:"CacheBehaviors,omitempty"`
+
+	// Comment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-comment
+	Comment *types.Value `json:"Comment,omitempty"`
+
+	// CustomErrorResponses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-customerrorresponses
+	CustomErrorResponses []Distribution_CustomErrorResponse `json:"CustomErrorResponses,omitempty"`
+
+	// CustomOrigin AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-customorigin
+	CustomOrigin *Distribution_LegacyCustomOrigin `json:"CustomOrigin,omitempty"`
+
+	// DefaultCacheBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-defaultcachebehavior
+	DefaultCacheBehavior *Distribution_DefaultCacheBehavior `json:"DefaultCacheBehavior,omitempty"`
+
+	// DefaultRootObject AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-defaultrootobject
+	DefaultRootObject *types.Value `json:"DefaultRootObject,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// HttpVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-httpversion
+	HttpVersion *types.Value `json:"HttpVersion,omitempty"`
+
+	// IPV6Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-ipv6enabled
+	IPV6Enabled *types.Value `json:"IPV6Enabled,omitempty"`
+
+	// Logging AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-logging
+	Logging *Distribution_Logging `json:"Logging,omitempty"`
+
+	// OriginGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-origingroups
+	OriginGroups *Distribution_OriginGroups `json:"OriginGroups,omitempty"`
+
+	// Origins AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-origins
+	Origins []Distribution_Origin `json:"Origins,omitempty"`
+
+	// PriceClass AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-priceclass
+	PriceClass *types.Value `json:"PriceClass,omitempty"`
+
+	// Restrictions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-restrictions
+	Restrictions *Distribution_Restrictions `json:"Restrictions,omitempty"`
+
+	// S3Origin AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-s3origin
+	S3Origin *Distribution_LegacyS3Origin `json:"S3Origin,omitempty"`
+
+	// ViewerCertificate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-viewercertificate
+	ViewerCertificate *Distribution_ViewerCertificate `json:"ViewerCertificate,omitempty"`
+
+	// WebACLId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-distributionconfig.html#cfn-cloudfront-distribution-distributionconfig-webaclid
+	WebACLId *types.Value `json:"WebACLId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_DistributionConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.DistributionConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_forwardedvalues.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_forwardedvalues.go
new file mode 100644
index 0000000000..2b31e84732
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_forwardedvalues.go
@@ -0,0 +1,52 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_ForwardedValues AWS CloudFormation Resource (AWS::CloudFront::Distribution.ForwardedValues)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-forwardedvalues.html
+type Distribution_ForwardedValues struct {
+
+	// Cookies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-forwardedvalues.html#cfn-cloudfront-distribution-forwardedvalues-cookies
+	Cookies *Distribution_Cookies `json:"Cookies,omitempty"`
+
+	// Headers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-forwardedvalues.html#cfn-cloudfront-distribution-forwardedvalues-headers
+	Headers *types.Value `json:"Headers,omitempty"`
+
+	// QueryString AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-forwardedvalues.html#cfn-cloudfront-distribution-forwardedvalues-querystring
+	QueryString *types.Value `json:"QueryString"`
+
+	// QueryStringCacheKeys AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-forwardedvalues.html#cfn-cloudfront-distribution-forwardedvalues-querystringcachekeys
+	QueryStringCacheKeys *types.Value `json:"QueryStringCacheKeys,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_ForwardedValues) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.ForwardedValues"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_functionassociation.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_functionassociation.go
new file mode 100644
index 0000000000..178db1e833
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_functionassociation.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_FunctionAssociation AWS CloudFormation Resource (AWS::CloudFront::Distribution.FunctionAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-functionassociation.html
+type Distribution_FunctionAssociation struct {
+
+	// EventType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-functionassociation.html#cfn-cloudfront-distribution-functionassociation-eventtype
+	EventType *types.Value `json:"EventType,omitempty"`
+
+	// FunctionARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-functionassociation.html#cfn-cloudfront-distribution-functionassociation-functionarn
+	FunctionARN *types.Value `json:"FunctionARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_FunctionAssociation) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.FunctionAssociation"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_georestriction.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_georestriction.go
new file mode 100644
index 0000000000..fc1e811159
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_georestriction.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_GeoRestriction AWS CloudFormation Resource (AWS::CloudFront::Distribution.GeoRestriction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-georestriction.html
+type Distribution_GeoRestriction struct {
+
+	// Locations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-georestriction.html#cfn-cloudfront-distribution-georestriction-locations
+	Locations *types.Value `json:"Locations,omitempty"`
+
+	// RestrictionType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-georestriction.html#cfn-cloudfront-distribution-georestriction-restrictiontype
+	RestrictionType *types.Value `json:"RestrictionType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_GeoRestriction) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.GeoRestriction"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_lambdafunctionassociation.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_lambdafunctionassociation.go
new file mode 100644
index 0000000000..e4967568e1
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_lambdafunctionassociation.go
@@ -0,0 +1,47 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_LambdaFunctionAssociation AWS CloudFormation Resource (AWS::CloudFront::Distribution.LambdaFunctionAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-lambdafunctionassociation.html
+type Distribution_LambdaFunctionAssociation struct {
+
+	// EventType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-lambdafunctionassociation.html#cfn-cloudfront-distribution-lambdafunctionassociation-eventtype
+	EventType *types.Value `json:"EventType,omitempty"`
+
+	// IncludeBody AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-lambdafunctionassociation.html#cfn-cloudfront-distribution-lambdafunctionassociation-includebody
+	IncludeBody *types.Value `json:"IncludeBody,omitempty"`
+
+	// LambdaFunctionARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-lambdafunctionassociation.html#cfn-cloudfront-distribution-lambdafunctionassociation-lambdafunctionarn
+	LambdaFunctionARN *types.Value `json:"LambdaFunctionARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_LambdaFunctionAssociation) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.LambdaFunctionAssociation"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_legacycustomorigin.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_legacycustomorigin.go
new file mode 100644
index 0000000000..4be68e24d8
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_legacycustomorigin.go
@@ -0,0 +1,57 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_LegacyCustomOrigin AWS CloudFormation Resource (AWS::CloudFront::Distribution.LegacyCustomOrigin)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-legacycustomorigin.html
+type Distribution_LegacyCustomOrigin struct {
+
+	// DNSName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-legacycustomorigin.html#cfn-cloudfront-distribution-legacycustomorigin-dnsname
+	DNSName *types.Value `json:"DNSName,omitempty"`
+
+	// HTTPPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-legacycustomorigin.html#cfn-cloudfront-distribution-legacycustomorigin-httpport
+	HTTPPort *types.Value `json:"HTTPPort,omitempty"`
+
+	// HTTPSPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-legacycustomorigin.html#cfn-cloudfront-distribution-legacycustomorigin-httpsport
+	HTTPSPort *types.Value `json:"HTTPSPort,omitempty"`
+
+	// OriginProtocolPolicy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-legacycustomorigin.html#cfn-cloudfront-distribution-legacycustomorigin-originprotocolpolicy
+	OriginProtocolPolicy *types.Value `json:"OriginProtocolPolicy,omitempty"`
+
+	// OriginSSLProtocols AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-legacycustomorigin.html#cfn-cloudfront-distribution-legacycustomorigin-originsslprotocols
+	OriginSSLProtocols *types.Value `json:"OriginSSLProtocols,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_LegacyCustomOrigin) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.LegacyCustomOrigin"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_legacys3origin.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_legacys3origin.go
new file mode 100644
index 0000000000..86e56b33dc
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_legacys3origin.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_LegacyS3Origin AWS CloudFormation Resource (AWS::CloudFront::Distribution.LegacyS3Origin)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-legacys3origin.html
+type Distribution_LegacyS3Origin struct {
+
+	// DNSName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-legacys3origin.html#cfn-cloudfront-distribution-legacys3origin-dnsname
+	DNSName *types.Value `json:"DNSName,omitempty"`
+
+	// OriginAccessIdentity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-legacys3origin.html#cfn-cloudfront-distribution-legacys3origin-originaccessidentity
+	OriginAccessIdentity *types.Value `json:"OriginAccessIdentity,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_LegacyS3Origin) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.LegacyS3Origin"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_logging.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_logging.go
new file mode 100644
index 0000000000..a390f901a2
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_logging.go
@@ -0,0 +1,47 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_Logging AWS CloudFormation Resource (AWS::CloudFront::Distribution.Logging)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-logging.html
+type Distribution_Logging struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-logging.html#cfn-cloudfront-distribution-logging-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// IncludeCookies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-logging.html#cfn-cloudfront-distribution-logging-includecookies
+	IncludeCookies *types.Value `json:"IncludeCookies,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-logging.html#cfn-cloudfront-distribution-logging-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_Logging) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.Logging"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origin.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origin.go
new file mode 100644
index 0000000000..852c227705
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origin.go
@@ -0,0 +1,77 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_Origin AWS CloudFormation Resource (AWS::CloudFront::Distribution.Origin)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origin.html
+type Distribution_Origin struct {
+
+	// ConnectionAttempts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origin.html#cfn-cloudfront-distribution-origin-connectionattempts
+	ConnectionAttempts *types.Value `json:"ConnectionAttempts,omitempty"`
+
+	// ConnectionTimeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origin.html#cfn-cloudfront-distribution-origin-connectiontimeout
+	ConnectionTimeout *types.Value `json:"ConnectionTimeout,omitempty"`
+
+	// CustomOriginConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origin.html#cfn-cloudfront-distribution-origin-customoriginconfig
+	CustomOriginConfig *Distribution_CustomOriginConfig `json:"CustomOriginConfig,omitempty"`
+
+	// DomainName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origin.html#cfn-cloudfront-distribution-origin-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origin.html#cfn-cloudfront-distribution-origin-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// OriginCustomHeaders AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origin.html#cfn-cloudfront-distribution-origin-origincustomheaders
+	OriginCustomHeaders []Distribution_OriginCustomHeader `json:"OriginCustomHeaders,omitempty"`
+
+	// OriginPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origin.html#cfn-cloudfront-distribution-origin-originpath
+	OriginPath *types.Value `json:"OriginPath,omitempty"`
+
+	// OriginShield AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origin.html#cfn-cloudfront-distribution-origin-originshield
+	OriginShield *Distribution_OriginShield `json:"OriginShield,omitempty"`
+
+	// S3OriginConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origin.html#cfn-cloudfront-distribution-origin-s3originconfig
+	S3OriginConfig *Distribution_S3OriginConfig `json:"S3OriginConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_Origin) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.Origin"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origincustomheader.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origincustomheader.go
new file mode 100644
index 0000000000..f088f71c3e
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origincustomheader.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_OriginCustomHeader AWS CloudFormation Resource (AWS::CloudFront::Distribution.OriginCustomHeader)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origincustomheader.html
+type Distribution_OriginCustomHeader struct {
+
+	// HeaderName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origincustomheader.html#cfn-cloudfront-distribution-origincustomheader-headername
+	HeaderName *types.Value `json:"HeaderName,omitempty"`
+
+	// HeaderValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origincustomheader.html#cfn-cloudfront-distribution-origincustomheader-headervalue
+	HeaderValue *types.Value `json:"HeaderValue,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_OriginCustomHeader) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.OriginCustomHeader"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroup.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroup.go
new file mode 100644
index 0000000000..9e0af659cc
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroup.go
@@ -0,0 +1,47 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_OriginGroup AWS CloudFormation Resource (AWS::CloudFront::Distribution.OriginGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origingroup.html
+type Distribution_OriginGroup struct {
+
+	// FailoverCriteria AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origingroup.html#cfn-cloudfront-distribution-origingroup-failovercriteria
+	FailoverCriteria *Distribution_OriginGroupFailoverCriteria `json:"FailoverCriteria,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origingroup.html#cfn-cloudfront-distribution-origingroup-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Members AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origingroup.html#cfn-cloudfront-distribution-origingroup-members
+	Members *Distribution_OriginGroupMembers `json:"Members,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_OriginGroup) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.OriginGroup"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupfailovercriteria.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupfailovercriteria.go
new file mode 100644
index 0000000000..9e213dabb6
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupfailovercriteria.go
@@ -0,0 +1,35 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_OriginGroupFailoverCriteria AWS CloudFormation Resource (AWS::CloudFront::Distribution.OriginGroupFailoverCriteria)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origingroupfailovercriteria.html
+type Distribution_OriginGroupFailoverCriteria struct {
+
+	// StatusCodes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origingroupfailovercriteria.html#cfn-cloudfront-distribution-origingroupfailovercriteria-statuscodes
+	StatusCodes *Distribution_StatusCodes `json:"StatusCodes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_OriginGroupFailoverCriteria) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.OriginGroupFailoverCriteria"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmember.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmember.go
new file mode 100644
index 0000000000..31d578c2ac
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmember.go
@@ -0,0 +1,37 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_OriginGroupMember AWS CloudFormation Resource (AWS::CloudFront::Distribution.OriginGroupMember)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origingroupmember.html
+type Distribution_OriginGroupMember struct {
+
+	// OriginId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origingroupmember.html#cfn-cloudfront-distribution-origingroupmember-originid
+	OriginId *types.Value `json:"OriginId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_OriginGroupMember) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.OriginGroupMember"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmembers.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmembers.go
new file mode 100644
index 0000000000..1d4beb19dc
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroupmembers.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_OriginGroupMembers AWS CloudFormation Resource (AWS::CloudFront::Distribution.OriginGroupMembers)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origingroupmembers.html
+type Distribution_OriginGroupMembers struct {
+
+	// Items AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origingroupmembers.html#cfn-cloudfront-distribution-origingroupmembers-items
+	Items []Distribution_OriginGroupMember `json:"Items,omitempty"`
+
+	// Quantity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origingroupmembers.html#cfn-cloudfront-distribution-origingroupmembers-quantity
+	Quantity *types.Value `json:"Quantity"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_OriginGroupMembers) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.OriginGroupMembers"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroups.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroups.go
new file mode 100644
index 0000000000..56836b3bdb
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_origingroups.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_OriginGroups AWS CloudFormation Resource (AWS::CloudFront::Distribution.OriginGroups)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origingroups.html
+type Distribution_OriginGroups struct {
+
+	// Items AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origingroups.html#cfn-cloudfront-distribution-origingroups-items
+	Items []Distribution_OriginGroup `json:"Items,omitempty"`
+
+	// Quantity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-origingroups.html#cfn-cloudfront-distribution-origingroups-quantity
+	Quantity *types.Value `json:"Quantity"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_OriginGroups) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.OriginGroups"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_originshield.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_originshield.go
new file mode 100644
index 0000000000..142ae2866f
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_originshield.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_OriginShield AWS CloudFormation Resource (AWS::CloudFront::Distribution.OriginShield)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-originshield.html
+type Distribution_OriginShield struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-originshield.html#cfn-cloudfront-distribution-originshield-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// OriginShieldRegion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-originshield.html#cfn-cloudfront-distribution-originshield-originshieldregion
+	OriginShieldRegion *types.Value `json:"OriginShieldRegion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_OriginShield) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.OriginShield"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_restrictions.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_restrictions.go
new file mode 100644
index 0000000000..a209c2f81b
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_restrictions.go
@@ -0,0 +1,35 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_Restrictions AWS CloudFormation Resource (AWS::CloudFront::Distribution.Restrictions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-restrictions.html
+type Distribution_Restrictions struct {
+
+	// GeoRestriction AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-restrictions.html#cfn-cloudfront-distribution-restrictions-georestriction
+	GeoRestriction *Distribution_GeoRestriction `json:"GeoRestriction,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_Restrictions) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.Restrictions"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_s3originconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_s3originconfig.go
new file mode 100644
index 0000000000..2cf860e8c3
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_s3originconfig.go
@@ -0,0 +1,37 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_S3OriginConfig AWS CloudFormation Resource (AWS::CloudFront::Distribution.S3OriginConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-s3originconfig.html
+type Distribution_S3OriginConfig struct {
+
+	// OriginAccessIdentity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-s3originconfig.html#cfn-cloudfront-distribution-s3originconfig-originaccessidentity
+	OriginAccessIdentity *types.Value `json:"OriginAccessIdentity,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_S3OriginConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.S3OriginConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_statuscodes.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_statuscodes.go
new file mode 100644
index 0000000000..9fff7960d0
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_statuscodes.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_StatusCodes AWS CloudFormation Resource (AWS::CloudFront::Distribution.StatusCodes)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-statuscodes.html
+type Distribution_StatusCodes struct {
+
+	// Items AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-statuscodes.html#cfn-cloudfront-distribution-statuscodes-items
+	Items *types.Value `json:"Items,omitempty"`
+
+	// Quantity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-statuscodes.html#cfn-cloudfront-distribution-statuscodes-quantity
+	Quantity *types.Value `json:"Quantity"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_StatusCodes) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.StatusCodes"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_viewercertificate.go b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_viewercertificate.go
new file mode 100644
index 0000000000..e1349390a7
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-distribution_viewercertificate.go
@@ -0,0 +1,57 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Distribution_ViewerCertificate AWS CloudFormation Resource (AWS::CloudFront::Distribution.ViewerCertificate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-viewercertificate.html
+type Distribution_ViewerCertificate struct {
+
+	// AcmCertificateArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-viewercertificate.html#cfn-cloudfront-distribution-viewercertificate-acmcertificatearn
+	AcmCertificateArn *types.Value `json:"AcmCertificateArn,omitempty"`
+
+	// CloudFrontDefaultCertificate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-viewercertificate.html#cfn-cloudfront-distribution-viewercertificate-cloudfrontdefaultcertificate
+	CloudFrontDefaultCertificate *types.Value `json:"CloudFrontDefaultCertificate,omitempty"`
+
+	// IamCertificateId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-viewercertificate.html#cfn-cloudfront-distribution-viewercertificate-iamcertificateid
+	IamCertificateId *types.Value `json:"IamCertificateId,omitempty"`
+
+	// MinimumProtocolVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-viewercertificate.html#cfn-cloudfront-distribution-viewercertificate-minimumprotocolversion
+	MinimumProtocolVersion *types.Value `json:"MinimumProtocolVersion,omitempty"`
+
+	// SslSupportMethod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-distribution-viewercertificate.html#cfn-cloudfront-distribution-viewercertificate-sslsupportmethod
+	SslSupportMethod *types.Value `json:"SslSupportMethod,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Distribution_ViewerCertificate) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Distribution.ViewerCertificate"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-function.go b/goformation/cloudformation/cloudfront/aws-cloudfront-function.go
new file mode 100644
index 0000000000..b3912450ac
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-function.go
@@ -0,0 +1,123 @@
+package cloudfront
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function AWS CloudFormation Resource (AWS::CloudFront::Function)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-function.html
+type Function struct {
+
+	// AutoPublish AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-function.html#cfn-cloudfront-function-autopublish
+	AutoPublish *types.Value `json:"AutoPublish,omitempty"`
+
+	// FunctionCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-function.html#cfn-cloudfront-function-functioncode
+	FunctionCode *types.Value `json:"FunctionCode,omitempty"`
+
+	// FunctionConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-function.html#cfn-cloudfront-function-functionconfig
+	FunctionConfig *Function_FunctionConfig `json:"FunctionConfig,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-function.html#cfn-cloudfront-function-name
+	Name *types.Value `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 *Function) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Function"
+}
+
+// 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 Function) MarshalJSON() ([]byte, error) {
+	type Properties Function
+	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 *Function) UnmarshalJSON(b []byte) error {
+	type Properties Function
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Function(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudfront/aws-cloudfront-function_functionconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-function_functionconfig.go
new file mode 100644
index 0000000000..dafc87c5dd
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-function_functionconfig.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_FunctionConfig AWS CloudFormation Resource (AWS::CloudFront::Function.FunctionConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-function-functionconfig.html
+type Function_FunctionConfig struct {
+
+	// Comment AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-function-functionconfig.html#cfn-cloudfront-function-functionconfig-comment
+	Comment *types.Value `json:"Comment,omitempty"`
+
+	// Runtime AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-function-functionconfig.html#cfn-cloudfront-function-functionconfig-runtime
+	Runtime *types.Value `json:"Runtime,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_FunctionConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Function.FunctionConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-function_functionmetadata.go b/goformation/cloudformation/cloudfront/aws-cloudfront-function_functionmetadata.go
new file mode 100644
index 0000000000..551ac07243
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-function_functionmetadata.go
@@ -0,0 +1,37 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_FunctionMetadata AWS CloudFormation Resource (AWS::CloudFront::Function.FunctionMetadata)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-function-functionmetadata.html
+type Function_FunctionMetadata struct {
+
+	// FunctionARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-function-functionmetadata.html#cfn-cloudfront-function-functionmetadata-functionarn
+	FunctionARN *types.Value `json:"FunctionARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_FunctionMetadata) AWSCloudFormationType() string {
+	return "AWS::CloudFront::Function.FunctionMetadata"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-keygroup.go b/goformation/cloudformation/cloudfront/aws-cloudfront-keygroup.go
new file mode 100644
index 0000000000..fc04dfe197
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-keygroup.go
@@ -0,0 +1,106 @@
+package cloudfront
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// KeyGroup AWS CloudFormation Resource (AWS::CloudFront::KeyGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-keygroup.html
+type KeyGroup struct {
+
+	// KeyGroupConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-keygroup.html#cfn-cloudfront-keygroup-keygroupconfig
+	KeyGroupConfig *KeyGroup_KeyGroupConfig `json:"KeyGroupConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *KeyGroup) AWSCloudFormationType() string {
+	return "AWS::CloudFront::KeyGroup"
+}
+
+// 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 KeyGroup) MarshalJSON() ([]byte, error) {
+	type Properties KeyGroup
+	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 *KeyGroup) UnmarshalJSON(b []byte) error {
+	type Properties KeyGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = KeyGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudfront/aws-cloudfront-keygroup_keygroupconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-keygroup_keygroupconfig.go
new file mode 100644
index 0000000000..0bf5f98ba1
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-keygroup_keygroupconfig.go
@@ -0,0 +1,47 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// KeyGroup_KeyGroupConfig AWS CloudFormation Resource (AWS::CloudFront::KeyGroup.KeyGroupConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-keygroup-keygroupconfig.html
+type KeyGroup_KeyGroupConfig struct {
+
+	// Comment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-keygroup-keygroupconfig.html#cfn-cloudfront-keygroup-keygroupconfig-comment
+	Comment *types.Value `json:"Comment,omitempty"`
+
+	// Items AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-keygroup-keygroupconfig.html#cfn-cloudfront-keygroup-keygroupconfig-items
+	Items *types.Value `json:"Items,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-keygroup-keygroupconfig.html#cfn-cloudfront-keygroup-keygroupconfig-name
+	Name *types.Value `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 *KeyGroup_KeyGroupConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::KeyGroup.KeyGroupConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy.go b/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy.go
new file mode 100644
index 0000000000..10c8a22b31
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy.go
@@ -0,0 +1,106 @@
+package cloudfront
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OriginRequestPolicy AWS CloudFormation Resource (AWS::CloudFront::OriginRequestPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-originrequestpolicy.html
+type OriginRequestPolicy struct {
+
+	// OriginRequestPolicyConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-originrequestpolicy.html#cfn-cloudfront-originrequestpolicy-originrequestpolicyconfig
+	OriginRequestPolicyConfig *OriginRequestPolicy_OriginRequestPolicyConfig `json:"OriginRequestPolicyConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *OriginRequestPolicy) AWSCloudFormationType() string {
+	return "AWS::CloudFront::OriginRequestPolicy"
+}
+
+// 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 OriginRequestPolicy) MarshalJSON() ([]byte, error) {
+	type Properties OriginRequestPolicy
+	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 *OriginRequestPolicy) UnmarshalJSON(b []byte) error {
+	type Properties OriginRequestPolicy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = OriginRequestPolicy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_cookiesconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_cookiesconfig.go
new file mode 100644
index 0000000000..6a42512423
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_cookiesconfig.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OriginRequestPolicy_CookiesConfig AWS CloudFormation Resource (AWS::CloudFront::OriginRequestPolicy.CookiesConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-originrequestpolicy-cookiesconfig.html
+type OriginRequestPolicy_CookiesConfig struct {
+
+	// CookieBehavior AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-originrequestpolicy-cookiesconfig.html#cfn-cloudfront-originrequestpolicy-cookiesconfig-cookiebehavior
+	CookieBehavior *types.Value `json:"CookieBehavior,omitempty"`
+
+	// Cookies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-originrequestpolicy-cookiesconfig.html#cfn-cloudfront-originrequestpolicy-cookiesconfig-cookies
+	Cookies *types.Value `json:"Cookies,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *OriginRequestPolicy_CookiesConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::OriginRequestPolicy.CookiesConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_headersconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_headersconfig.go
new file mode 100644
index 0000000000..e2a7aaca9b
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_headersconfig.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OriginRequestPolicy_HeadersConfig AWS CloudFormation Resource (AWS::CloudFront::OriginRequestPolicy.HeadersConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-originrequestpolicy-headersconfig.html
+type OriginRequestPolicy_HeadersConfig struct {
+
+	// HeaderBehavior AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-originrequestpolicy-headersconfig.html#cfn-cloudfront-originrequestpolicy-headersconfig-headerbehavior
+	HeaderBehavior *types.Value `json:"HeaderBehavior,omitempty"`
+
+	// Headers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-originrequestpolicy-headersconfig.html#cfn-cloudfront-originrequestpolicy-headersconfig-headers
+	Headers *types.Value `json:"Headers,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *OriginRequestPolicy_HeadersConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::OriginRequestPolicy.HeadersConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_originrequestpolicyconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_originrequestpolicyconfig.go
new file mode 100644
index 0000000000..5f9c5458c7
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_originrequestpolicyconfig.go
@@ -0,0 +1,57 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OriginRequestPolicy_OriginRequestPolicyConfig AWS CloudFormation Resource (AWS::CloudFront::OriginRequestPolicy.OriginRequestPolicyConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-originrequestpolicy-originrequestpolicyconfig.html
+type OriginRequestPolicy_OriginRequestPolicyConfig struct {
+
+	// Comment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-originrequestpolicy-originrequestpolicyconfig.html#cfn-cloudfront-originrequestpolicy-originrequestpolicyconfig-comment
+	Comment *types.Value `json:"Comment,omitempty"`
+
+	// CookiesConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-originrequestpolicy-originrequestpolicyconfig.html#cfn-cloudfront-originrequestpolicy-originrequestpolicyconfig-cookiesconfig
+	CookiesConfig *OriginRequestPolicy_CookiesConfig `json:"CookiesConfig,omitempty"`
+
+	// HeadersConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-originrequestpolicy-originrequestpolicyconfig.html#cfn-cloudfront-originrequestpolicy-originrequestpolicyconfig-headersconfig
+	HeadersConfig *OriginRequestPolicy_HeadersConfig `json:"HeadersConfig,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-originrequestpolicy-originrequestpolicyconfig.html#cfn-cloudfront-originrequestpolicy-originrequestpolicyconfig-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// QueryStringsConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-originrequestpolicy-originrequestpolicyconfig.html#cfn-cloudfront-originrequestpolicy-originrequestpolicyconfig-querystringsconfig
+	QueryStringsConfig *OriginRequestPolicy_QueryStringsConfig `json:"QueryStringsConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *OriginRequestPolicy_OriginRequestPolicyConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::OriginRequestPolicy.OriginRequestPolicyConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_querystringsconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_querystringsconfig.go
new file mode 100644
index 0000000000..60ac84178e
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-originrequestpolicy_querystringsconfig.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OriginRequestPolicy_QueryStringsConfig AWS CloudFormation Resource (AWS::CloudFront::OriginRequestPolicy.QueryStringsConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-originrequestpolicy-querystringsconfig.html
+type OriginRequestPolicy_QueryStringsConfig struct {
+
+	// QueryStringBehavior AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-originrequestpolicy-querystringsconfig.html#cfn-cloudfront-originrequestpolicy-querystringsconfig-querystringbehavior
+	QueryStringBehavior *types.Value `json:"QueryStringBehavior,omitempty"`
+
+	// QueryStrings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-originrequestpolicy-querystringsconfig.html#cfn-cloudfront-originrequestpolicy-querystringsconfig-querystrings
+	QueryStrings *types.Value `json:"QueryStrings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *OriginRequestPolicy_QueryStringsConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::OriginRequestPolicy.QueryStringsConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-publickey.go b/goformation/cloudformation/cloudfront/aws-cloudfront-publickey.go
new file mode 100644
index 0000000000..edc62af62f
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-publickey.go
@@ -0,0 +1,106 @@
+package cloudfront
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PublicKey AWS CloudFormation Resource (AWS::CloudFront::PublicKey)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-publickey.html
+type PublicKey struct {
+
+	// PublicKeyConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-publickey.html#cfn-cloudfront-publickey-publickeyconfig
+	PublicKeyConfig *PublicKey_PublicKeyConfig `json:"PublicKeyConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::CloudFront::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudfront/aws-cloudfront-publickey_publickeyconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-publickey_publickeyconfig.go
new file mode 100644
index 0000000000..3081e17180
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-publickey_publickeyconfig.go
@@ -0,0 +1,52 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PublicKey_PublicKeyConfig AWS CloudFormation Resource (AWS::CloudFront::PublicKey.PublicKeyConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-publickey-publickeyconfig.html
+type PublicKey_PublicKeyConfig struct {
+
+	// CallerReference AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-publickey-publickeyconfig.html#cfn-cloudfront-publickey-publickeyconfig-callerreference
+	CallerReference *types.Value `json:"CallerReference,omitempty"`
+
+	// Comment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-publickey-publickeyconfig.html#cfn-cloudfront-publickey-publickeyconfig-comment
+	Comment *types.Value `json:"Comment,omitempty"`
+
+	// EncodedKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-publickey-publickeyconfig.html#cfn-cloudfront-publickey-publickeyconfig-encodedkey
+	EncodedKey *types.Value `json:"EncodedKey,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-publickey-publickeyconfig.html#cfn-cloudfront-publickey-publickeyconfig-name
+	Name *types.Value `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 *PublicKey_PublicKeyConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::PublicKey.PublicKeyConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig.go
new file mode 100644
index 0000000000..5df6b5ad91
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig.go
@@ -0,0 +1,123 @@
+package cloudfront
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RealtimeLogConfig AWS CloudFormation Resource (AWS::CloudFront::RealtimeLogConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-realtimelogconfig.html
+type RealtimeLogConfig struct {
+
+	// EndPoints AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-realtimelogconfig.html#cfn-cloudfront-realtimelogconfig-endpoints
+	EndPoints []RealtimeLogConfig_EndPoint `json:"EndPoints,omitempty"`
+
+	// Fields AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-realtimelogconfig.html#cfn-cloudfront-realtimelogconfig-fields
+	Fields *types.Value `json:"Fields,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-realtimelogconfig.html#cfn-cloudfront-realtimelogconfig-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SamplingRate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-realtimelogconfig.html#cfn-cloudfront-realtimelogconfig-samplingrate
+	SamplingRate *types.Value `json:"SamplingRate"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RealtimeLogConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::RealtimeLogConfig"
+}
+
+// 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 RealtimeLogConfig) MarshalJSON() ([]byte, error) {
+	type Properties RealtimeLogConfig
+	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 *RealtimeLogConfig) UnmarshalJSON(b []byte) error {
+	type Properties RealtimeLogConfig
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RealtimeLogConfig(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_endpoint.go b/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_endpoint.go
new file mode 100644
index 0000000000..74d2ae1f1f
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_endpoint.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RealtimeLogConfig_EndPoint AWS CloudFormation Resource (AWS::CloudFront::RealtimeLogConfig.EndPoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-realtimelogconfig-endpoint.html
+type RealtimeLogConfig_EndPoint struct {
+
+	// KinesisStreamConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-realtimelogconfig-endpoint.html#cfn-cloudfront-realtimelogconfig-endpoint-kinesisstreamconfig
+	KinesisStreamConfig *RealtimeLogConfig_KinesisStreamConfig `json:"KinesisStreamConfig,omitempty"`
+
+	// StreamType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-realtimelogconfig-endpoint.html#cfn-cloudfront-realtimelogconfig-endpoint-streamtype
+	StreamType *types.Value `json:"StreamType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RealtimeLogConfig_EndPoint) AWSCloudFormationType() string {
+	return "AWS::CloudFront::RealtimeLogConfig.EndPoint"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_kinesisstreamconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_kinesisstreamconfig.go
new file mode 100644
index 0000000000..21a8b73364
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-realtimelogconfig_kinesisstreamconfig.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RealtimeLogConfig_KinesisStreamConfig AWS CloudFormation Resource (AWS::CloudFront::RealtimeLogConfig.KinesisStreamConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-realtimelogconfig-kinesisstreamconfig.html
+type RealtimeLogConfig_KinesisStreamConfig struct {
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-realtimelogconfig-kinesisstreamconfig.html#cfn-cloudfront-realtimelogconfig-kinesisstreamconfig-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// StreamArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-realtimelogconfig-kinesisstreamconfig.html#cfn-cloudfront-realtimelogconfig-kinesisstreamconfig-streamarn
+	StreamArn *types.Value `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 *RealtimeLogConfig_KinesisStreamConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::RealtimeLogConfig.KinesisStreamConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy.go b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy.go
new file mode 100644
index 0000000000..7531873d3e
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy.go
@@ -0,0 +1,106 @@
+package cloudfront
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponseHeadersPolicy AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-responseheaderspolicy.html
+type ResponseHeadersPolicy struct {
+
+	// ResponseHeadersPolicyConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-responseheaderspolicy.html#cfn-cloudfront-responseheaderspolicy-responseheaderspolicyconfig
+	ResponseHeadersPolicyConfig *ResponseHeadersPolicy_ResponseHeadersPolicyConfig `json:"ResponseHeadersPolicyConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponseHeadersPolicy) AWSCloudFormationType() string {
+	return "AWS::CloudFront::ResponseHeadersPolicy"
+}
+
+// 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 ResponseHeadersPolicy) MarshalJSON() ([]byte, error) {
+	type Properties ResponseHeadersPolicy
+	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 *ResponseHeadersPolicy) UnmarshalJSON(b []byte) error {
+	type Properties ResponseHeadersPolicy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResponseHeadersPolicy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowheaders.go b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowheaders.go
new file mode 100644
index 0000000000..b30f3ec390
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowheaders.go
@@ -0,0 +1,37 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponseHeadersPolicy_AccessControlAllowHeaders AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowHeaders)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-accesscontrolallowheaders.html
+type ResponseHeadersPolicy_AccessControlAllowHeaders struct {
+
+	// Items AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-accesscontrolallowheaders.html#cfn-cloudfront-responseheaderspolicy-accesscontrolallowheaders-items
+	Items *types.Value `json:"Items,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponseHeadersPolicy_AccessControlAllowHeaders) AWSCloudFormationType() string {
+	return "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowHeaders"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowmethods.go b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowmethods.go
new file mode 100644
index 0000000000..2fc629d546
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolallowmethods.go
@@ -0,0 +1,37 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponseHeadersPolicy_AccessControlAllowMethods AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowMethods)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-accesscontrolallowmethods.html
+type ResponseHeadersPolicy_AccessControlAllowMethods struct {
+
+	// Items AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-accesscontrolallowmethods.html#cfn-cloudfront-responseheaderspolicy-accesscontrolallowmethods-items
+	Items *types.Value `json:"Items,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponseHeadersPolicy_AccessControlAllowMethods) AWSCloudFormationType() string {
+	return "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowMethods"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolalloworigins.go b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolalloworigins.go
new file mode 100644
index 0000000000..85754b594a
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolalloworigins.go
@@ -0,0 +1,37 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponseHeadersPolicy_AccessControlAllowOrigins AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowOrigins)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-accesscontrolalloworigins.html
+type ResponseHeadersPolicy_AccessControlAllowOrigins struct {
+
+	// Items AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-accesscontrolalloworigins.html#cfn-cloudfront-responseheaderspolicy-accesscontrolalloworigins-items
+	Items *types.Value `json:"Items,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponseHeadersPolicy_AccessControlAllowOrigins) AWSCloudFormationType() string {
+	return "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowOrigins"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolexposeheaders.go b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolexposeheaders.go
new file mode 100644
index 0000000000..1f7f55a4d4
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_accesscontrolexposeheaders.go
@@ -0,0 +1,37 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponseHeadersPolicy_AccessControlExposeHeaders AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.AccessControlExposeHeaders)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-accesscontrolexposeheaders.html
+type ResponseHeadersPolicy_AccessControlExposeHeaders struct {
+
+	// Items AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-accesscontrolexposeheaders.html#cfn-cloudfront-responseheaderspolicy-accesscontrolexposeheaders-items
+	Items *types.Value `json:"Items,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponseHeadersPolicy_AccessControlExposeHeaders) AWSCloudFormationType() string {
+	return "AWS::CloudFront::ResponseHeadersPolicy.AccessControlExposeHeaders"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contentsecuritypolicy.go b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contentsecuritypolicy.go
new file mode 100644
index 0000000000..d979f7fa36
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contentsecuritypolicy.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponseHeadersPolicy_ContentSecurityPolicy AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.ContentSecurityPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-contentsecuritypolicy.html
+type ResponseHeadersPolicy_ContentSecurityPolicy struct {
+
+	// ContentSecurityPolicy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-contentsecuritypolicy.html#cfn-cloudfront-responseheaderspolicy-contentsecuritypolicy-contentsecuritypolicy
+	ContentSecurityPolicy *types.Value `json:"ContentSecurityPolicy,omitempty"`
+
+	// Override AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-contentsecuritypolicy.html#cfn-cloudfront-responseheaderspolicy-contentsecuritypolicy-override
+	Override *types.Value `json:"Override"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponseHeadersPolicy_ContentSecurityPolicy) AWSCloudFormationType() string {
+	return "AWS::CloudFront::ResponseHeadersPolicy.ContentSecurityPolicy"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contenttypeoptions.go b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contenttypeoptions.go
new file mode 100644
index 0000000000..1e8f42b5f1
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_contenttypeoptions.go
@@ -0,0 +1,37 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponseHeadersPolicy_ContentTypeOptions AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.ContentTypeOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-contenttypeoptions.html
+type ResponseHeadersPolicy_ContentTypeOptions struct {
+
+	// Override AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-contenttypeoptions.html#cfn-cloudfront-responseheaderspolicy-contenttypeoptions-override
+	Override *types.Value `json:"Override"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponseHeadersPolicy_ContentTypeOptions) AWSCloudFormationType() string {
+	return "AWS::CloudFront::ResponseHeadersPolicy.ContentTypeOptions"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_corsconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_corsconfig.go
new file mode 100644
index 0000000000..864c0ee61d
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_corsconfig.go
@@ -0,0 +1,67 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponseHeadersPolicy_CorsConfig AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.CorsConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-corsconfig.html
+type ResponseHeadersPolicy_CorsConfig struct {
+
+	// AccessControlAllowCredentials AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-corsconfig.html#cfn-cloudfront-responseheaderspolicy-corsconfig-accesscontrolallowcredentials
+	AccessControlAllowCredentials *types.Value `json:"AccessControlAllowCredentials"`
+
+	// AccessControlAllowHeaders AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-corsconfig.html#cfn-cloudfront-responseheaderspolicy-corsconfig-accesscontrolallowheaders
+	AccessControlAllowHeaders *ResponseHeadersPolicy_AccessControlAllowHeaders `json:"AccessControlAllowHeaders,omitempty"`
+
+	// AccessControlAllowMethods AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-corsconfig.html#cfn-cloudfront-responseheaderspolicy-corsconfig-accesscontrolallowmethods
+	AccessControlAllowMethods *ResponseHeadersPolicy_AccessControlAllowMethods `json:"AccessControlAllowMethods,omitempty"`
+
+	// AccessControlAllowOrigins AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-corsconfig.html#cfn-cloudfront-responseheaderspolicy-corsconfig-accesscontrolalloworigins
+	AccessControlAllowOrigins *ResponseHeadersPolicy_AccessControlAllowOrigins `json:"AccessControlAllowOrigins,omitempty"`
+
+	// AccessControlExposeHeaders AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-corsconfig.html#cfn-cloudfront-responseheaderspolicy-corsconfig-accesscontrolexposeheaders
+	AccessControlExposeHeaders *ResponseHeadersPolicy_AccessControlExposeHeaders `json:"AccessControlExposeHeaders,omitempty"`
+
+	// AccessControlMaxAgeSec AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-corsconfig.html#cfn-cloudfront-responseheaderspolicy-corsconfig-accesscontrolmaxagesec
+	AccessControlMaxAgeSec *types.Value `json:"AccessControlMaxAgeSec,omitempty"`
+
+	// OriginOverride AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-corsconfig.html#cfn-cloudfront-responseheaderspolicy-corsconfig-originoverride
+	OriginOverride *types.Value `json:"OriginOverride"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponseHeadersPolicy_CorsConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::ResponseHeadersPolicy.CorsConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheader.go b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheader.go
new file mode 100644
index 0000000000..eca26d42e7
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheader.go
@@ -0,0 +1,47 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponseHeadersPolicy_CustomHeader AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.CustomHeader)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-customheader.html
+type ResponseHeadersPolicy_CustomHeader struct {
+
+	// Header AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-customheader.html#cfn-cloudfront-responseheaderspolicy-customheader-header
+	Header *types.Value `json:"Header,omitempty"`
+
+	// Override AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-customheader.html#cfn-cloudfront-responseheaderspolicy-customheader-override
+	Override *types.Value `json:"Override"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-customheader.html#cfn-cloudfront-responseheaderspolicy-customheader-value
+	Value *types.Value `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 *ResponseHeadersPolicy_CustomHeader) AWSCloudFormationType() string {
+	return "AWS::CloudFront::ResponseHeadersPolicy.CustomHeader"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheadersconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheadersconfig.go
new file mode 100644
index 0000000000..d41239a9f0
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_customheadersconfig.go
@@ -0,0 +1,35 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponseHeadersPolicy_CustomHeadersConfig AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.CustomHeadersConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-customheadersconfig.html
+type ResponseHeadersPolicy_CustomHeadersConfig struct {
+
+	// Items AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-customheadersconfig.html#cfn-cloudfront-responseheaderspolicy-customheadersconfig-items
+	Items []ResponseHeadersPolicy_CustomHeader `json:"Items,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponseHeadersPolicy_CustomHeadersConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::ResponseHeadersPolicy.CustomHeadersConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_frameoptions.go b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_frameoptions.go
new file mode 100644
index 0000000000..544710cac4
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_frameoptions.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponseHeadersPolicy_FrameOptions AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.FrameOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-frameoptions.html
+type ResponseHeadersPolicy_FrameOptions struct {
+
+	// FrameOption AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-frameoptions.html#cfn-cloudfront-responseheaderspolicy-frameoptions-frameoption
+	FrameOption *types.Value `json:"FrameOption,omitempty"`
+
+	// Override AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-frameoptions.html#cfn-cloudfront-responseheaderspolicy-frameoptions-override
+	Override *types.Value `json:"Override"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponseHeadersPolicy_FrameOptions) AWSCloudFormationType() string {
+	return "AWS::CloudFront::ResponseHeadersPolicy.FrameOptions"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_referrerpolicy.go b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_referrerpolicy.go
new file mode 100644
index 0000000000..a943ae7ccc
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_referrerpolicy.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponseHeadersPolicy_ReferrerPolicy AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.ReferrerPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-referrerpolicy.html
+type ResponseHeadersPolicy_ReferrerPolicy struct {
+
+	// Override AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-referrerpolicy.html#cfn-cloudfront-responseheaderspolicy-referrerpolicy-override
+	Override *types.Value `json:"Override"`
+
+	// ReferrerPolicy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-referrerpolicy.html#cfn-cloudfront-responseheaderspolicy-referrerpolicy-referrerpolicy
+	ReferrerPolicy *types.Value `json:"ReferrerPolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponseHeadersPolicy_ReferrerPolicy) AWSCloudFormationType() string {
+	return "AWS::CloudFront::ResponseHeadersPolicy.ReferrerPolicy"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_responseheaderspolicyconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_responseheaderspolicyconfig.go
new file mode 100644
index 0000000000..d3c4420597
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_responseheaderspolicyconfig.go
@@ -0,0 +1,57 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponseHeadersPolicy_ResponseHeadersPolicyConfig AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.ResponseHeadersPolicyConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-responseheaderspolicyconfig.html
+type ResponseHeadersPolicy_ResponseHeadersPolicyConfig struct {
+
+	// Comment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-responseheaderspolicyconfig.html#cfn-cloudfront-responseheaderspolicy-responseheaderspolicyconfig-comment
+	Comment *types.Value `json:"Comment,omitempty"`
+
+	// CorsConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-responseheaderspolicyconfig.html#cfn-cloudfront-responseheaderspolicy-responseheaderspolicyconfig-corsconfig
+	CorsConfig *ResponseHeadersPolicy_CorsConfig `json:"CorsConfig,omitempty"`
+
+	// CustomHeadersConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-responseheaderspolicyconfig.html#cfn-cloudfront-responseheaderspolicy-responseheaderspolicyconfig-customheadersconfig
+	CustomHeadersConfig *ResponseHeadersPolicy_CustomHeadersConfig `json:"CustomHeadersConfig,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-responseheaderspolicyconfig.html#cfn-cloudfront-responseheaderspolicy-responseheaderspolicyconfig-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SecurityHeadersConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-responseheaderspolicyconfig.html#cfn-cloudfront-responseheaderspolicy-responseheaderspolicyconfig-securityheadersconfig
+	SecurityHeadersConfig *ResponseHeadersPolicy_SecurityHeadersConfig `json:"SecurityHeadersConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponseHeadersPolicy_ResponseHeadersPolicyConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::ResponseHeadersPolicy.ResponseHeadersPolicyConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_securityheadersconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_securityheadersconfig.go
new file mode 100644
index 0000000000..85c1217ae0
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_securityheadersconfig.go
@@ -0,0 +1,60 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponseHeadersPolicy_SecurityHeadersConfig AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.SecurityHeadersConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-securityheadersconfig.html
+type ResponseHeadersPolicy_SecurityHeadersConfig struct {
+
+	// ContentSecurityPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-securityheadersconfig.html#cfn-cloudfront-responseheaderspolicy-securityheadersconfig-contentsecuritypolicy
+	ContentSecurityPolicy *ResponseHeadersPolicy_ContentSecurityPolicy `json:"ContentSecurityPolicy,omitempty"`
+
+	// ContentTypeOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-securityheadersconfig.html#cfn-cloudfront-responseheaderspolicy-securityheadersconfig-contenttypeoptions
+	ContentTypeOptions *ResponseHeadersPolicy_ContentTypeOptions `json:"ContentTypeOptions,omitempty"`
+
+	// FrameOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-securityheadersconfig.html#cfn-cloudfront-responseheaderspolicy-securityheadersconfig-frameoptions
+	FrameOptions *ResponseHeadersPolicy_FrameOptions `json:"FrameOptions,omitempty"`
+
+	// ReferrerPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-securityheadersconfig.html#cfn-cloudfront-responseheaderspolicy-securityheadersconfig-referrerpolicy
+	ReferrerPolicy *ResponseHeadersPolicy_ReferrerPolicy `json:"ReferrerPolicy,omitempty"`
+
+	// StrictTransportSecurity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-securityheadersconfig.html#cfn-cloudfront-responseheaderspolicy-securityheadersconfig-stricttransportsecurity
+	StrictTransportSecurity *ResponseHeadersPolicy_StrictTransportSecurity `json:"StrictTransportSecurity,omitempty"`
+
+	// XSSProtection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-securityheadersconfig.html#cfn-cloudfront-responseheaderspolicy-securityheadersconfig-xssprotection
+	XSSProtection *ResponseHeadersPolicy_XSSProtection `json:"XSSProtection,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponseHeadersPolicy_SecurityHeadersConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::ResponseHeadersPolicy.SecurityHeadersConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_stricttransportsecurity.go b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_stricttransportsecurity.go
new file mode 100644
index 0000000000..56c6d1efd6
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_stricttransportsecurity.go
@@ -0,0 +1,52 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponseHeadersPolicy_StrictTransportSecurity AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.StrictTransportSecurity)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-stricttransportsecurity.html
+type ResponseHeadersPolicy_StrictTransportSecurity struct {
+
+	// AccessControlMaxAgeSec AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-stricttransportsecurity.html#cfn-cloudfront-responseheaderspolicy-stricttransportsecurity-accesscontrolmaxagesec
+	AccessControlMaxAgeSec *types.Value `json:"AccessControlMaxAgeSec"`
+
+	// IncludeSubdomains AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-stricttransportsecurity.html#cfn-cloudfront-responseheaderspolicy-stricttransportsecurity-includesubdomains
+	IncludeSubdomains *types.Value `json:"IncludeSubdomains,omitempty"`
+
+	// Override AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-stricttransportsecurity.html#cfn-cloudfront-responseheaderspolicy-stricttransportsecurity-override
+	Override *types.Value `json:"Override"`
+
+	// Preload AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-stricttransportsecurity.html#cfn-cloudfront-responseheaderspolicy-stricttransportsecurity-preload
+	Preload *types.Value `json:"Preload,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponseHeadersPolicy_StrictTransportSecurity) AWSCloudFormationType() string {
+	return "AWS::CloudFront::ResponseHeadersPolicy.StrictTransportSecurity"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_xssprotection.go b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_xssprotection.go
new file mode 100644
index 0000000000..cd658ebaed
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-responseheaderspolicy_xssprotection.go
@@ -0,0 +1,52 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponseHeadersPolicy_XSSProtection AWS CloudFormation Resource (AWS::CloudFront::ResponseHeadersPolicy.XSSProtection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-xssprotection.html
+type ResponseHeadersPolicy_XSSProtection struct {
+
+	// ModeBlock AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-xssprotection.html#cfn-cloudfront-responseheaderspolicy-xssprotection-modeblock
+	ModeBlock *types.Value `json:"ModeBlock,omitempty"`
+
+	// Override AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-xssprotection.html#cfn-cloudfront-responseheaderspolicy-xssprotection-override
+	Override *types.Value `json:"Override"`
+
+	// Protection AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-xssprotection.html#cfn-cloudfront-responseheaderspolicy-xssprotection-protection
+	Protection *types.Value `json:"Protection"`
+
+	// ReportUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-responseheaderspolicy-xssprotection.html#cfn-cloudfront-responseheaderspolicy-xssprotection-reporturi
+	ReportUri *types.Value `json:"ReportUri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponseHeadersPolicy_XSSProtection) AWSCloudFormationType() string {
+	return "AWS::CloudFront::ResponseHeadersPolicy.XSSProtection"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution.go b/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution.go
new file mode 100644
index 0000000000..5e9e85fcae
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution.go
@@ -0,0 +1,112 @@
+package cloudfront
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// StreamingDistribution AWS CloudFormation Resource (AWS::CloudFront::StreamingDistribution)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-streamingdistribution.html
+type StreamingDistribution struct {
+
+	// StreamingDistributionConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-streamingdistribution.html#cfn-cloudfront-streamingdistribution-streamingdistributionconfig
+	StreamingDistributionConfig *StreamingDistribution_StreamingDistributionConfig `json:"StreamingDistributionConfig,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudfront-streamingdistribution.html#cfn-cloudfront-streamingdistribution-tags
+	Tags []cloudformation.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 *StreamingDistribution) AWSCloudFormationType() string {
+	return "AWS::CloudFront::StreamingDistribution"
+}
+
+// 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 StreamingDistribution) MarshalJSON() ([]byte, error) {
+	type Properties StreamingDistribution
+	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 *StreamingDistribution) UnmarshalJSON(b []byte) error {
+	type Properties StreamingDistribution
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = StreamingDistribution(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_logging.go b/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_logging.go
new file mode 100644
index 0000000000..f70435968c
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_logging.go
@@ -0,0 +1,47 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StreamingDistribution_Logging AWS CloudFormation Resource (AWS::CloudFront::StreamingDistribution.Logging)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-streamingdistribution-logging.html
+type StreamingDistribution_Logging struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-streamingdistribution-logging.html#cfn-cloudfront-streamingdistribution-logging-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-streamingdistribution-logging.html#cfn-cloudfront-streamingdistribution-logging-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-streamingdistribution-logging.html#cfn-cloudfront-streamingdistribution-logging-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StreamingDistribution_Logging) AWSCloudFormationType() string {
+	return "AWS::CloudFront::StreamingDistribution.Logging"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_s3origin.go b/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_s3origin.go
new file mode 100644
index 0000000000..7959876961
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_s3origin.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StreamingDistribution_S3Origin AWS CloudFormation Resource (AWS::CloudFront::StreamingDistribution.S3Origin)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-streamingdistribution-s3origin.html
+type StreamingDistribution_S3Origin struct {
+
+	// DomainName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-streamingdistribution-s3origin.html#cfn-cloudfront-streamingdistribution-s3origin-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// OriginAccessIdentity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-streamingdistribution-s3origin.html#cfn-cloudfront-streamingdistribution-s3origin-originaccessidentity
+	OriginAccessIdentity *types.Value `json:"OriginAccessIdentity,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StreamingDistribution_S3Origin) AWSCloudFormationType() string {
+	return "AWS::CloudFront::StreamingDistribution.S3Origin"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_streamingdistributionconfig.go b/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_streamingdistributionconfig.go
new file mode 100644
index 0000000000..206e0989f3
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_streamingdistributionconfig.go
@@ -0,0 +1,67 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StreamingDistribution_StreamingDistributionConfig AWS CloudFormation Resource (AWS::CloudFront::StreamingDistribution.StreamingDistributionConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-streamingdistribution-streamingdistributionconfig.html
+type StreamingDistribution_StreamingDistributionConfig struct {
+
+	// Aliases AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-streamingdistribution-streamingdistributionconfig.html#cfn-cloudfront-streamingdistribution-streamingdistributionconfig-aliases
+	Aliases *types.Value `json:"Aliases,omitempty"`
+
+	// Comment AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-streamingdistribution-streamingdistributionconfig.html#cfn-cloudfront-streamingdistribution-streamingdistributionconfig-comment
+	Comment *types.Value `json:"Comment,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-streamingdistribution-streamingdistributionconfig.html#cfn-cloudfront-streamingdistribution-streamingdistributionconfig-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// Logging AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-streamingdistribution-streamingdistributionconfig.html#cfn-cloudfront-streamingdistribution-streamingdistributionconfig-logging
+	Logging *StreamingDistribution_Logging `json:"Logging,omitempty"`
+
+	// PriceClass AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-streamingdistribution-streamingdistributionconfig.html#cfn-cloudfront-streamingdistribution-streamingdistributionconfig-priceclass
+	PriceClass *types.Value `json:"PriceClass,omitempty"`
+
+	// S3Origin AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-streamingdistribution-streamingdistributionconfig.html#cfn-cloudfront-streamingdistribution-streamingdistributionconfig-s3origin
+	S3Origin *StreamingDistribution_S3Origin `json:"S3Origin,omitempty"`
+
+	// TrustedSigners AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-streamingdistribution-streamingdistributionconfig.html#cfn-cloudfront-streamingdistribution-streamingdistributionconfig-trustedsigners
+	TrustedSigners *StreamingDistribution_TrustedSigners `json:"TrustedSigners,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StreamingDistribution_StreamingDistributionConfig) AWSCloudFormationType() string {
+	return "AWS::CloudFront::StreamingDistribution.StreamingDistributionConfig"
+}
diff --git a/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_trustedsigners.go b/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_trustedsigners.go
new file mode 100644
index 0000000000..b53f4d210f
--- /dev/null
+++ b/goformation/cloudformation/cloudfront/aws-cloudfront-streamingdistribution_trustedsigners.go
@@ -0,0 +1,42 @@
+package cloudfront
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StreamingDistribution_TrustedSigners AWS CloudFormation Resource (AWS::CloudFront::StreamingDistribution.TrustedSigners)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-streamingdistribution-trustedsigners.html
+type StreamingDistribution_TrustedSigners struct {
+
+	// AwsAccountNumbers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-streamingdistribution-trustedsigners.html#cfn-cloudfront-streamingdistribution-trustedsigners-awsaccountnumbers
+	AwsAccountNumbers *types.Value `json:"AwsAccountNumbers,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudfront-streamingdistribution-trustedsigners.html#cfn-cloudfront-streamingdistribution-trustedsigners-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StreamingDistribution_TrustedSigners) AWSCloudFormationType() string {
+	return "AWS::CloudFront::StreamingDistribution.TrustedSigners"
+}
diff --git a/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail.go b/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail.go
new file mode 100644
index 0000000000..d20b2cf153
--- /dev/null
+++ b/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail.go
@@ -0,0 +1,179 @@
+package cloudtrail
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Trail AWS CloudFormation Resource (AWS::CloudTrail::Trail)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html
+type Trail struct {
+
+	// CloudWatchLogsLogGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-cloudwatchlogsloggrouparn
+	CloudWatchLogsLogGroupArn *types.Value `json:"CloudWatchLogsLogGroupArn,omitempty"`
+
+	// CloudWatchLogsRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-cloudwatchlogsrolearn
+	CloudWatchLogsRoleArn *types.Value `json:"CloudWatchLogsRoleArn,omitempty"`
+
+	// EnableLogFileValidation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-enablelogfilevalidation
+	EnableLogFileValidation *types.Value `json:"EnableLogFileValidation,omitempty"`
+
+	// EventSelectors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-eventselectors
+	EventSelectors []Trail_EventSelector `json:"EventSelectors,omitempty"`
+
+	// IncludeGlobalServiceEvents AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-includeglobalserviceevents
+	IncludeGlobalServiceEvents *types.Value `json:"IncludeGlobalServiceEvents,omitempty"`
+
+	// InsightSelectors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-insightselectors
+	InsightSelectors []Trail_InsightSelector `json:"InsightSelectors,omitempty"`
+
+	// IsLogging AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-islogging
+	IsLogging *types.Value `json:"IsLogging"`
+
+	// IsMultiRegionTrail AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-ismultiregiontrail
+	IsMultiRegionTrail *types.Value `json:"IsMultiRegionTrail,omitempty"`
+
+	// IsOrganizationTrail AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-isorganizationtrail
+	IsOrganizationTrail *types.Value `json:"IsOrganizationTrail,omitempty"`
+
+	// KMSKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-kmskeyid
+	KMSKeyId *types.Value `json:"KMSKeyId,omitempty"`
+
+	// S3BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-s3bucketname
+	S3BucketName *types.Value `json:"S3BucketName,omitempty"`
+
+	// S3KeyPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-s3keyprefix
+	S3KeyPrefix *types.Value `json:"S3KeyPrefix,omitempty"`
+
+	// SnsTopicName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-snstopicname
+	SnsTopicName *types.Value `json:"SnsTopicName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TrailName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudtrail-trail.html#cfn-cloudtrail-trail-trailname
+	TrailName *types.Value `json:"TrailName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Trail) AWSCloudFormationType() string {
+	return "AWS::CloudTrail::Trail"
+}
+
+// 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 Trail) MarshalJSON() ([]byte, error) {
+	type Properties Trail
+	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 *Trail) UnmarshalJSON(b []byte) error {
+	type Properties Trail
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Trail(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_dataresource.go b/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_dataresource.go
new file mode 100644
index 0000000000..d1c2024010
--- /dev/null
+++ b/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_dataresource.go
@@ -0,0 +1,42 @@
+package cloudtrail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Trail_DataResource AWS CloudFormation Resource (AWS::CloudTrail::Trail.DataResource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-dataresource.html
+type Trail_DataResource struct {
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-dataresource.html#cfn-cloudtrail-trail-dataresource-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-dataresource.html#cfn-cloudtrail-trail-dataresource-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Trail_DataResource) AWSCloudFormationType() string {
+	return "AWS::CloudTrail::Trail.DataResource"
+}
diff --git a/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_eventselector.go b/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_eventselector.go
new file mode 100644
index 0000000000..e9ee90692d
--- /dev/null
+++ b/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_eventselector.go
@@ -0,0 +1,52 @@
+package cloudtrail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Trail_EventSelector AWS CloudFormation Resource (AWS::CloudTrail::Trail.EventSelector)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-eventselector.html
+type Trail_EventSelector struct {
+
+	// DataResources AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-eventselector.html#cfn-cloudtrail-trail-eventselector-dataresources
+	DataResources []Trail_DataResource `json:"DataResources,omitempty"`
+
+	// ExcludeManagementEventSources AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-eventselector.html#cfn-cloudtrail-trail-eventselector-excludemanagementeventsources
+	ExcludeManagementEventSources *types.Value `json:"ExcludeManagementEventSources,omitempty"`
+
+	// IncludeManagementEvents AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-eventselector.html#cfn-cloudtrail-trail-eventselector-includemanagementevents
+	IncludeManagementEvents *types.Value `json:"IncludeManagementEvents,omitempty"`
+
+	// ReadWriteType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-eventselector.html#cfn-cloudtrail-trail-eventselector-readwritetype
+	ReadWriteType *types.Value `json:"ReadWriteType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Trail_EventSelector) AWSCloudFormationType() string {
+	return "AWS::CloudTrail::Trail.EventSelector"
+}
diff --git a/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_insightselector.go b/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_insightselector.go
new file mode 100644
index 0000000000..006eed6dda
--- /dev/null
+++ b/goformation/cloudformation/cloudtrail/aws-cloudtrail-trail_insightselector.go
@@ -0,0 +1,37 @@
+package cloudtrail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Trail_InsightSelector AWS CloudFormation Resource (AWS::CloudTrail::Trail.InsightSelector)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-insightselector.html
+type Trail_InsightSelector struct {
+
+	// InsightType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudtrail-trail-insightselector.html#cfn-cloudtrail-trail-insightselector-insighttype
+	InsightType *types.Value `json:"InsightType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Trail_InsightSelector) AWSCloudFormationType() string {
+	return "AWS::CloudTrail::Trail.InsightSelector"
+}
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm.go
new file mode 100644
index 0000000000..3074b8bf7c
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm.go
@@ -0,0 +1,208 @@
+package cloudwatch
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Alarm AWS CloudFormation Resource (AWS::CloudWatch::Alarm)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html
+type Alarm struct {
+
+	// ActionsEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-actionsenabled
+	ActionsEnabled *types.Value `json:"ActionsEnabled,omitempty"`
+
+	// AlarmActions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-alarmactions
+	AlarmActions *types.Value `json:"AlarmActions,omitempty"`
+
+	// AlarmDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-alarmdescription
+	AlarmDescription *types.Value `json:"AlarmDescription,omitempty"`
+
+	// AlarmName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-alarmname
+	AlarmName *types.Value `json:"AlarmName,omitempty"`
+
+	// ComparisonOperator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-comparisonoperator
+	ComparisonOperator *types.Value `json:"ComparisonOperator,omitempty"`
+
+	// DatapointsToAlarm AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarm-datapointstoalarm
+	DatapointsToAlarm *types.Value `json:"DatapointsToAlarm,omitempty"`
+
+	// Dimensions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-dimension
+	Dimensions []Alarm_Dimension `json:"Dimensions,omitempty"`
+
+	// EvaluateLowSampleCountPercentile AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-evaluatelowsamplecountpercentile
+	EvaluateLowSampleCountPercentile *types.Value `json:"EvaluateLowSampleCountPercentile,omitempty"`
+
+	// EvaluationPeriods AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-evaluationperiods
+	EvaluationPeriods *types.Value `json:"EvaluationPeriods"`
+
+	// ExtendedStatistic AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-extendedstatistic
+	ExtendedStatistic *types.Value `json:"ExtendedStatistic,omitempty"`
+
+	// InsufficientDataActions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-insufficientdataactions
+	InsufficientDataActions *types.Value `json:"InsufficientDataActions,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// Metrics AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarm-metrics
+	Metrics []Alarm_MetricDataQuery `json:"Metrics,omitempty"`
+
+	// Namespace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-namespace
+	Namespace *types.Value `json:"Namespace,omitempty"`
+
+	// OKActions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-okactions
+	OKActions *types.Value `json:"OKActions,omitempty"`
+
+	// Period AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-period
+	Period *types.Value `json:"Period,omitempty"`
+
+	// Statistic AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-statistic
+	Statistic *types.Value `json:"Statistic,omitempty"`
+
+	// Threshold AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-threshold
+	Threshold *types.Value `json:"Threshold,omitempty"`
+
+	// ThresholdMetricId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-dynamic-threshold
+	ThresholdMetricId *types.Value `json:"ThresholdMetricId,omitempty"`
+
+	// TreatMissingData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-treatmissingdata
+	TreatMissingData *types.Value `json:"TreatMissingData,omitempty"`
+
+	// Unit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-alarm.html#cfn-cloudwatch-alarms-unit
+	Unit *types.Value `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 *Alarm) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::Alarm"
+}
+
+// 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 Alarm) MarshalJSON() ([]byte, error) {
+	type Properties Alarm
+	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 *Alarm) UnmarshalJSON(b []byte) error {
+	type Properties Alarm
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Alarm(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_dimension.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_dimension.go
new file mode 100644
index 0000000000..8d1f341777
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_dimension.go
@@ -0,0 +1,42 @@
+package cloudwatch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Alarm_Dimension AWS CloudFormation Resource (AWS::CloudWatch::Alarm.Dimension)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-dimension.html
+type Alarm_Dimension struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-dimension.html#cfn-cloudwatch-alarm-dimension-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cw-dimension.html#cfn-cloudwatch-alarm-dimension-value
+	Value *types.Value `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 *Alarm_Dimension) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::Alarm.Dimension"
+}
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metric.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metric.go
new file mode 100644
index 0000000000..0b9a004666
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metric.go
@@ -0,0 +1,47 @@
+package cloudwatch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Alarm_Metric AWS CloudFormation Resource (AWS::CloudWatch::Alarm.Metric)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-alarm-metric.html
+type Alarm_Metric struct {
+
+	// Dimensions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-alarm-metric.html#cfn-cloudwatch-alarm-metric-dimensions
+	Dimensions []Alarm_Dimension `json:"Dimensions,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-alarm-metric.html#cfn-cloudwatch-alarm-metric-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// Namespace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-alarm-metric.html#cfn-cloudwatch-alarm-metric-namespace
+	Namespace *types.Value `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 *Alarm_Metric) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::Alarm.Metric"
+}
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricdataquery.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricdataquery.go
new file mode 100644
index 0000000000..567e1abf2a
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricdataquery.go
@@ -0,0 +1,67 @@
+package cloudwatch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Alarm_MetricDataQuery AWS CloudFormation Resource (AWS::CloudWatch::Alarm.MetricDataQuery)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-alarm-metricdataquery.html
+type Alarm_MetricDataQuery struct {
+
+	// AccountId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-alarm-metricdataquery.html#cfn-cloudwatch-alarm-metricdataquery-accountid
+	AccountId *types.Value `json:"AccountId,omitempty"`
+
+	// Expression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-alarm-metricdataquery.html#cfn-cloudwatch-alarm-metricdataquery-expression
+	Expression *types.Value `json:"Expression,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-alarm-metricdataquery.html#cfn-cloudwatch-alarm-metricdataquery-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Label AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-alarm-metricdataquery.html#cfn-cloudwatch-alarm-metricdataquery-label
+	Label *types.Value `json:"Label,omitempty"`
+
+	// MetricStat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-alarm-metricdataquery.html#cfn-cloudwatch-alarm-metricdataquery-metricstat
+	MetricStat *Alarm_MetricStat `json:"MetricStat,omitempty"`
+
+	// Period AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-alarm-metricdataquery.html#cfn-cloudwatch-alarm-metricdataquery-period
+	Period *types.Value `json:"Period,omitempty"`
+
+	// ReturnData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-alarm-metricdataquery.html#cfn-cloudwatch-alarm-metricdataquery-returndata
+	ReturnData *types.Value `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 *Alarm_MetricDataQuery) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::Alarm.MetricDataQuery"
+}
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricstat.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricstat.go
new file mode 100644
index 0000000000..a13a23782e
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-alarm_metricstat.go
@@ -0,0 +1,52 @@
+package cloudwatch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Alarm_MetricStat AWS CloudFormation Resource (AWS::CloudWatch::Alarm.MetricStat)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-alarm-metricstat.html
+type Alarm_MetricStat struct {
+
+	// Metric AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-alarm-metricstat.html#cfn-cloudwatch-alarm-metricstat-metric
+	Metric *Alarm_Metric `json:"Metric,omitempty"`
+
+	// Period AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-alarm-metricstat.html#cfn-cloudwatch-alarm-metricstat-period
+	Period *types.Value `json:"Period"`
+
+	// Stat AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-alarm-metricstat.html#cfn-cloudwatch-alarm-metricstat-stat
+	Stat *types.Value `json:"Stat,omitempty"`
+
+	// Unit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-alarm-metricstat.html#cfn-cloudwatch-alarm-metricstat-unit
+	Unit *types.Value `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 *Alarm_MetricStat) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::Alarm.MetricStat"
+}
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector.go
new file mode 100644
index 0000000000..fd7f974098
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector.go
@@ -0,0 +1,138 @@
+package cloudwatch
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector AWS CloudFormation Resource (AWS::CloudWatch::AnomalyDetector)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-anomalydetector.html
+type AnomalyDetector struct {
+
+	// Configuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-anomalydetector.html#cfn-cloudwatch-anomalydetector-configuration
+	Configuration *AnomalyDetector_Configuration `json:"Configuration,omitempty"`
+
+	// Dimensions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-anomalydetector.html#cfn-cloudwatch-anomalydetector-dimensions
+	Dimensions []AnomalyDetector_Dimension `json:"Dimensions,omitempty"`
+
+	// MetricMathAnomalyDetector AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-anomalydetector.html#cfn-cloudwatch-anomalydetector-metricmathanomalydetector
+	MetricMathAnomalyDetector *AnomalyDetector_MetricMathAnomalyDetector `json:"MetricMathAnomalyDetector,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-anomalydetector.html#cfn-cloudwatch-anomalydetector-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// Namespace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-anomalydetector.html#cfn-cloudwatch-anomalydetector-namespace
+	Namespace *types.Value `json:"Namespace,omitempty"`
+
+	// SingleMetricAnomalyDetector AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-anomalydetector.html#cfn-cloudwatch-anomalydetector-singlemetricanomalydetector
+	SingleMetricAnomalyDetector *AnomalyDetector_SingleMetricAnomalyDetector `json:"SingleMetricAnomalyDetector,omitempty"`
+
+	// Stat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-anomalydetector.html#cfn-cloudwatch-anomalydetector-stat
+	Stat *types.Value `json:"Stat,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AnomalyDetector) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::AnomalyDetector"
+}
+
+// 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 AnomalyDetector) MarshalJSON() ([]byte, error) {
+	type Properties AnomalyDetector
+	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 *AnomalyDetector) UnmarshalJSON(b []byte) error {
+	type Properties AnomalyDetector
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AnomalyDetector(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_configuration.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_configuration.go
new file mode 100644
index 0000000000..58ad076981
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_configuration.go
@@ -0,0 +1,42 @@
+package cloudwatch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_Configuration AWS CloudFormation Resource (AWS::CloudWatch::AnomalyDetector.Configuration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-configuration.html
+type AnomalyDetector_Configuration struct {
+
+	// ExcludedTimeRanges AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-configuration.html#cfn-cloudwatch-anomalydetector-configuration-excludedtimeranges
+	ExcludedTimeRanges []AnomalyDetector_Range `json:"ExcludedTimeRanges,omitempty"`
+
+	// MetricTimeZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-configuration.html#cfn-cloudwatch-anomalydetector-configuration-metrictimezone
+	MetricTimeZone *types.Value `json:"MetricTimeZone,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AnomalyDetector_Configuration) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::AnomalyDetector.Configuration"
+}
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_dimension.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_dimension.go
new file mode 100644
index 0000000000..01a7f513d8
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_dimension.go
@@ -0,0 +1,42 @@
+package cloudwatch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_Dimension AWS CloudFormation Resource (AWS::CloudWatch::AnomalyDetector.Dimension)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-dimension.html
+type AnomalyDetector_Dimension struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-dimension.html#cfn-cloudwatch-anomalydetector-dimension-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-dimension.html#cfn-cloudwatch-anomalydetector-dimension-value
+	Value *types.Value `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 *AnomalyDetector_Dimension) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::AnomalyDetector.Dimension"
+}
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metric.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metric.go
new file mode 100644
index 0000000000..726a2fd668
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metric.go
@@ -0,0 +1,47 @@
+package cloudwatch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_Metric AWS CloudFormation Resource (AWS::CloudWatch::AnomalyDetector.Metric)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-metric.html
+type AnomalyDetector_Metric struct {
+
+	// Dimensions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-metric.html#cfn-cloudwatch-anomalydetector-metric-dimensions
+	Dimensions []AnomalyDetector_Dimension `json:"Dimensions,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-metric.html#cfn-cloudwatch-anomalydetector-metric-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// Namespace AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-metric.html#cfn-cloudwatch-anomalydetector-metric-namespace
+	Namespace *types.Value `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 *AnomalyDetector_Metric) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::AnomalyDetector.Metric"
+}
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataqueries.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataqueries.go
new file mode 100644
index 0000000000..ae6dfbc836
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataqueries.go
@@ -0,0 +1,30 @@
+package cloudwatch
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_MetricDataQueries AWS CloudFormation Resource (AWS::CloudWatch::AnomalyDetector.MetricDataQueries)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-metricdataqueries.html
+type AnomalyDetector_MetricDataQueries struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AnomalyDetector_MetricDataQueries) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::AnomalyDetector.MetricDataQueries"
+}
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataquery.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataquery.go
new file mode 100644
index 0000000000..6082f67e4e
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricdataquery.go
@@ -0,0 +1,67 @@
+package cloudwatch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_MetricDataQuery AWS CloudFormation Resource (AWS::CloudWatch::AnomalyDetector.MetricDataQuery)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-metricdataquery.html
+type AnomalyDetector_MetricDataQuery struct {
+
+	// AccountId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-metricdataquery.html#cfn-cloudwatch-anomalydetector-metricdataquery-accountid
+	AccountId *types.Value `json:"AccountId,omitempty"`
+
+	// Expression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-metricdataquery.html#cfn-cloudwatch-anomalydetector-metricdataquery-expression
+	Expression *types.Value `json:"Expression,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-metricdataquery.html#cfn-cloudwatch-anomalydetector-metricdataquery-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Label AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-metricdataquery.html#cfn-cloudwatch-anomalydetector-metricdataquery-label
+	Label *types.Value `json:"Label,omitempty"`
+
+	// MetricStat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-metricdataquery.html#cfn-cloudwatch-anomalydetector-metricdataquery-metricstat
+	MetricStat *AnomalyDetector_MetricStat `json:"MetricStat,omitempty"`
+
+	// Period AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-metricdataquery.html#cfn-cloudwatch-anomalydetector-metricdataquery-period
+	Period *types.Value `json:"Period,omitempty"`
+
+	// ReturnData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-metricdataquery.html#cfn-cloudwatch-anomalydetector-metricdataquery-returndata
+	ReturnData *types.Value `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 *AnomalyDetector_MetricDataQuery) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::AnomalyDetector.MetricDataQuery"
+}
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricmathanomalydetector.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricmathanomalydetector.go
new file mode 100644
index 0000000000..01797942e2
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricmathanomalydetector.go
@@ -0,0 +1,35 @@
+package cloudwatch
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_MetricMathAnomalyDetector AWS CloudFormation Resource (AWS::CloudWatch::AnomalyDetector.MetricMathAnomalyDetector)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-metricmathanomalydetector.html
+type AnomalyDetector_MetricMathAnomalyDetector struct {
+
+	// MetricDataQueries AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-metricmathanomalydetector.html#cfn-cloudwatch-anomalydetector-metricmathanomalydetector-metricdataqueries
+	MetricDataQueries []AnomalyDetector_MetricDataQuery `json:"MetricDataQueries,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AnomalyDetector_MetricMathAnomalyDetector) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::AnomalyDetector.MetricMathAnomalyDetector"
+}
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricstat.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricstat.go
new file mode 100644
index 0000000000..76ee46852a
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_metricstat.go
@@ -0,0 +1,52 @@
+package cloudwatch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_MetricStat AWS CloudFormation Resource (AWS::CloudWatch::AnomalyDetector.MetricStat)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-metricstat.html
+type AnomalyDetector_MetricStat struct {
+
+	// Metric AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-metricstat.html#cfn-cloudwatch-anomalydetector-metricstat-metric
+	Metric *AnomalyDetector_Metric `json:"Metric,omitempty"`
+
+	// Period AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-metricstat.html#cfn-cloudwatch-anomalydetector-metricstat-period
+	Period *types.Value `json:"Period"`
+
+	// Stat AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-metricstat.html#cfn-cloudwatch-anomalydetector-metricstat-stat
+	Stat *types.Value `json:"Stat,omitempty"`
+
+	// Unit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-metricstat.html#cfn-cloudwatch-anomalydetector-metricstat-unit
+	Unit *types.Value `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 *AnomalyDetector_MetricStat) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::AnomalyDetector.MetricStat"
+}
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_range.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_range.go
new file mode 100644
index 0000000000..271a660b10
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_range.go
@@ -0,0 +1,42 @@
+package cloudwatch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_Range AWS CloudFormation Resource (AWS::CloudWatch::AnomalyDetector.Range)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-range.html
+type AnomalyDetector_Range struct {
+
+	// EndTime AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-range.html#cfn-cloudwatch-anomalydetector-range-endtime
+	EndTime *types.Value `json:"EndTime,omitempty"`
+
+	// StartTime AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-range.html#cfn-cloudwatch-anomalydetector-range-starttime
+	StartTime *types.Value `json:"StartTime,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AnomalyDetector_Range) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::AnomalyDetector.Range"
+}
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_singlemetricanomalydetector.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_singlemetricanomalydetector.go
new file mode 100644
index 0000000000..949b67a32a
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-anomalydetector_singlemetricanomalydetector.go
@@ -0,0 +1,52 @@
+package cloudwatch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_SingleMetricAnomalyDetector AWS CloudFormation Resource (AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-singlemetricanomalydetector.html
+type AnomalyDetector_SingleMetricAnomalyDetector struct {
+
+	// Dimensions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-singlemetricanomalydetector.html#cfn-cloudwatch-anomalydetector-singlemetricanomalydetector-dimensions
+	Dimensions []AnomalyDetector_Dimension `json:"Dimensions,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-singlemetricanomalydetector.html#cfn-cloudwatch-anomalydetector-singlemetricanomalydetector-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// Namespace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-singlemetricanomalydetector.html#cfn-cloudwatch-anomalydetector-singlemetricanomalydetector-namespace
+	Namespace *types.Value `json:"Namespace,omitempty"`
+
+	// Stat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-anomalydetector-singlemetricanomalydetector.html#cfn-cloudwatch-anomalydetector-singlemetricanomalydetector-stat
+	Stat *types.Value `json:"Stat,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AnomalyDetector_SingleMetricAnomalyDetector) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector"
+}
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-compositealarm.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-compositealarm.go
new file mode 100644
index 0000000000..46f4ccbb66
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-compositealarm.go
@@ -0,0 +1,138 @@
+package cloudwatch
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CompositeAlarm AWS CloudFormation Resource (AWS::CloudWatch::CompositeAlarm)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-compositealarm.html
+type CompositeAlarm struct {
+
+	// ActionsEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-compositealarm.html#cfn-cloudwatch-compositealarm-actionsenabled
+	ActionsEnabled *types.Value `json:"ActionsEnabled,omitempty"`
+
+	// AlarmActions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-compositealarm.html#cfn-cloudwatch-compositealarm-alarmactions
+	AlarmActions *types.Value `json:"AlarmActions,omitempty"`
+
+	// AlarmDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-compositealarm.html#cfn-cloudwatch-compositealarm-alarmdescription
+	AlarmDescription *types.Value `json:"AlarmDescription,omitempty"`
+
+	// AlarmName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-compositealarm.html#cfn-cloudwatch-compositealarm-alarmname
+	AlarmName *types.Value `json:"AlarmName,omitempty"`
+
+	// AlarmRule AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-compositealarm.html#cfn-cloudwatch-compositealarm-alarmrule
+	AlarmRule *types.Value `json:"AlarmRule,omitempty"`
+
+	// InsufficientDataActions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-compositealarm.html#cfn-cloudwatch-compositealarm-insufficientdataactions
+	InsufficientDataActions *types.Value `json:"InsufficientDataActions,omitempty"`
+
+	// OKActions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-compositealarm.html#cfn-cloudwatch-compositealarm-okactions
+	OKActions *types.Value `json:"OKActions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CompositeAlarm) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::CompositeAlarm"
+}
+
+// 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 CompositeAlarm) MarshalJSON() ([]byte, error) {
+	type Properties CompositeAlarm
+	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 *CompositeAlarm) UnmarshalJSON(b []byte) error {
+	type Properties CompositeAlarm
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CompositeAlarm(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudwatch/aws-cloudwatch-dashboard.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-dashboard.go
new file mode 100644
index 0000000000..80ef6fd8de
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-dashboard.go
@@ -0,0 +1,113 @@
+package cloudwatch
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dashboard AWS CloudFormation Resource (AWS::CloudWatch::Dashboard)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-dashboard.html
+type Dashboard struct {
+
+	// DashboardBody AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-dashboard.html#cfn-cloudwatch-dashboard-dashboardbody
+	DashboardBody *types.Value `json:"DashboardBody,omitempty"`
+
+	// DashboardName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-dashboard.html#cfn-cloudwatch-dashboard-dashboardname
+	DashboardName *types.Value `json:"DashboardName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::Dashboard"
+}
+
+// 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 Dashboard) MarshalJSON() ([]byte, error) {
+	type Properties Dashboard
+	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 *Dashboard) UnmarshalJSON(b []byte) error {
+	type Properties Dashboard
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Dashboard(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudwatch/aws-cloudwatch-insightrule.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-insightrule.go
new file mode 100644
index 0000000000..3240556f1d
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-insightrule.go
@@ -0,0 +1,123 @@
+package cloudwatch
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InsightRule AWS CloudFormation Resource (AWS::CloudWatch::InsightRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-insightrule.html
+type InsightRule struct {
+
+	// RuleBody AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-insightrule.html#cfn-cloudwatch-insightrule-rulebody
+	RuleBody *types.Value `json:"RuleBody,omitempty"`
+
+	// RuleName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-insightrule.html#cfn-cloudwatch-insightrule-rulename
+	RuleName *types.Value `json:"RuleName,omitempty"`
+
+	// RuleState AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-insightrule.html#cfn-cloudwatch-insightrule-rulestate
+	RuleState *types.Value `json:"RuleState,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-insightrule.html#cfn-cloudwatch-insightrule-tags
+	Tags *InsightRule_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 *InsightRule) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::InsightRule"
+}
+
+// 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 InsightRule) MarshalJSON() ([]byte, error) {
+	type Properties InsightRule
+	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 *InsightRule) UnmarshalJSON(b []byte) error {
+	type Properties InsightRule
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = InsightRule(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudwatch/aws-cloudwatch-insightrule_tags.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-insightrule_tags.go
new file mode 100644
index 0000000000..fa325f1338
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-insightrule_tags.go
@@ -0,0 +1,30 @@
+package cloudwatch
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// InsightRule_Tags AWS CloudFormation Resource (AWS::CloudWatch::InsightRule.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-insightrule-tags.html
+type InsightRule_Tags struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InsightRule_Tags) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::InsightRule.Tags"
+}
diff --git a/goformation/cloudformation/cloudwatch/aws-cloudwatch-metricstream.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-metricstream.go
new file mode 100644
index 0000000000..8ee9746440
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-metricstream.go
@@ -0,0 +1,139 @@
+package cloudwatch
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// MetricStream AWS CloudFormation Resource (AWS::CloudWatch::MetricStream)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-metricstream.html
+type MetricStream struct {
+
+	// ExcludeFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-metricstream.html#cfn-cloudwatch-metricstream-excludefilters
+	ExcludeFilters []MetricStream_MetricStreamFilter `json:"ExcludeFilters,omitempty"`
+
+	// FirehoseArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-metricstream.html#cfn-cloudwatch-metricstream-firehosearn
+	FirehoseArn *types.Value `json:"FirehoseArn,omitempty"`
+
+	// IncludeFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-metricstream.html#cfn-cloudwatch-metricstream-includefilters
+	IncludeFilters []MetricStream_MetricStreamFilter `json:"IncludeFilters,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-metricstream.html#cfn-cloudwatch-metricstream-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// OutputFormat AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-metricstream.html#cfn-cloudwatch-metricstream-outputformat
+	OutputFormat *types.Value `json:"OutputFormat,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-metricstream.html#cfn-cloudwatch-metricstream-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cloudwatch-metricstream.html#cfn-cloudwatch-metricstream-tags
+	Tags []cloudformation.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 *MetricStream) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::MetricStream"
+}
+
+// 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 MetricStream) MarshalJSON() ([]byte, error) {
+	type Properties MetricStream
+	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 *MetricStream) UnmarshalJSON(b []byte) error {
+	type Properties MetricStream
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = MetricStream(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cloudwatch/aws-cloudwatch-metricstream_metricstreamfilter.go b/goformation/cloudformation/cloudwatch/aws-cloudwatch-metricstream_metricstreamfilter.go
new file mode 100644
index 0000000000..c402790e27
--- /dev/null
+++ b/goformation/cloudformation/cloudwatch/aws-cloudwatch-metricstream_metricstreamfilter.go
@@ -0,0 +1,37 @@
+package cloudwatch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MetricStream_MetricStreamFilter AWS CloudFormation Resource (AWS::CloudWatch::MetricStream.MetricStreamFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-metricstream-metricstreamfilter.html
+type MetricStream_MetricStreamFilter struct {
+
+	// Namespace AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cloudwatch-metricstream-metricstreamfilter.html#cfn-cloudwatch-metricstream-metricstreamfilter-namespace
+	Namespace *types.Value `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 *MetricStream_MetricStreamFilter) AWSCloudFormationType() string {
+	return "AWS::CloudWatch::MetricStream.MetricStreamFilter"
+}
diff --git a/goformation/cloudformation/codeartifact/aws-codeartifact-domain.go b/goformation/cloudformation/codeartifact/aws-codeartifact-domain.go
new file mode 100644
index 0000000000..7ef110e816
--- /dev/null
+++ b/goformation/cloudformation/codeartifact/aws-codeartifact-domain.go
@@ -0,0 +1,124 @@
+package codeartifact
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain AWS CloudFormation Resource (AWS::CodeArtifact::Domain)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeartifact-domain.html
+type Domain struct {
+
+	// DomainName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeartifact-domain.html#cfn-codeartifact-domain-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// EncryptionKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeartifact-domain.html#cfn-codeartifact-domain-encryptionkey
+	EncryptionKey *types.Value `json:"EncryptionKey,omitempty"`
+
+	// PermissionsPolicyDocument AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeartifact-domain.html#cfn-codeartifact-domain-permissionspolicydocument
+	PermissionsPolicyDocument interface{} `json:"PermissionsPolicyDocument,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeartifact-domain.html#cfn-codeartifact-domain-tags
+	Tags []cloudformation.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 *Domain) AWSCloudFormationType() string {
+	return "AWS::CodeArtifact::Domain"
+}
+
+// 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 Domain) MarshalJSON() ([]byte, error) {
+	type Properties Domain
+	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 *Domain) UnmarshalJSON(b []byte) error {
+	type Properties Domain
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Domain(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/codeartifact/aws-codeartifact-repository.go b/goformation/cloudformation/codeartifact/aws-codeartifact-repository.go
new file mode 100644
index 0000000000..9c9a704167
--- /dev/null
+++ b/goformation/cloudformation/codeartifact/aws-codeartifact-repository.go
@@ -0,0 +1,144 @@
+package codeartifact
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Repository AWS CloudFormation Resource (AWS::CodeArtifact::Repository)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeartifact-repository.html
+type Repository struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeartifact-repository.html#cfn-codeartifact-repository-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DomainName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeartifact-repository.html#cfn-codeartifact-repository-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// DomainOwner AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeartifact-repository.html#cfn-codeartifact-repository-domainowner
+	DomainOwner *types.Value `json:"DomainOwner,omitempty"`
+
+	// ExternalConnections AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeartifact-repository.html#cfn-codeartifact-repository-externalconnections
+	ExternalConnections *types.Value `json:"ExternalConnections,omitempty"`
+
+	// PermissionsPolicyDocument AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeartifact-repository.html#cfn-codeartifact-repository-permissionspolicydocument
+	PermissionsPolicyDocument interface{} `json:"PermissionsPolicyDocument,omitempty"`
+
+	// RepositoryName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeartifact-repository.html#cfn-codeartifact-repository-repositoryname
+	RepositoryName *types.Value `json:"RepositoryName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeartifact-repository.html#cfn-codeartifact-repository-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Upstreams AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeartifact-repository.html#cfn-codeartifact-repository-upstreams
+	Upstreams *types.Value `json:"Upstreams,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Repository) AWSCloudFormationType() string {
+	return "AWS::CodeArtifact::Repository"
+}
+
+// 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 Repository) MarshalJSON() ([]byte, error) {
+	type Properties Repository
+	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 *Repository) UnmarshalJSON(b []byte) error {
+	type Properties Repository
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Repository(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/codebuild/aws-codebuild-project.go b/goformation/cloudformation/codebuild/aws-codebuild-project.go
new file mode 100644
index 0000000000..02240f35f9
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project.go
@@ -0,0 +1,224 @@
+package codebuild
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project AWS CloudFormation Resource (AWS::CodeBuild::Project)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html
+type Project struct {
+
+	// Artifacts AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-artifacts
+	Artifacts *Project_Artifacts `json:"Artifacts,omitempty"`
+
+	// BadgeEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-badgeenabled
+	BadgeEnabled *types.Value `json:"BadgeEnabled,omitempty"`
+
+	// BuildBatchConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-buildbatchconfig
+	BuildBatchConfig *Project_ProjectBuildBatchConfig `json:"BuildBatchConfig,omitempty"`
+
+	// Cache AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-cache
+	Cache *Project_ProjectCache `json:"Cache,omitempty"`
+
+	// ConcurrentBuildLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-concurrentbuildlimit
+	ConcurrentBuildLimit *types.Value `json:"ConcurrentBuildLimit,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EncryptionKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-encryptionkey
+	EncryptionKey *types.Value `json:"EncryptionKey,omitempty"`
+
+	// Environment AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-environment
+	Environment *Project_Environment `json:"Environment,omitempty"`
+
+	// FileSystemLocations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-filesystemlocations
+	FileSystemLocations []Project_ProjectFileSystemLocation `json:"FileSystemLocations,omitempty"`
+
+	// LogsConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-logsconfig
+	LogsConfig *Project_LogsConfig `json:"LogsConfig,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// QueuedTimeoutInMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-queuedtimeoutinminutes
+	QueuedTimeoutInMinutes *types.Value `json:"QueuedTimeoutInMinutes,omitempty"`
+
+	// ResourceAccessRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-resourceaccessrole
+	ResourceAccessRole *types.Value `json:"ResourceAccessRole,omitempty"`
+
+	// SecondaryArtifacts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-secondaryartifacts
+	SecondaryArtifacts []Project_Artifacts `json:"SecondaryArtifacts,omitempty"`
+
+	// SecondarySourceVersions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-secondarysourceversions
+	SecondarySourceVersions []Project_ProjectSourceVersion `json:"SecondarySourceVersions,omitempty"`
+
+	// SecondarySources AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-secondarysources
+	SecondarySources []Project_Source `json:"SecondarySources,omitempty"`
+
+	// ServiceRole AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-servicerole
+	ServiceRole *types.Value `json:"ServiceRole,omitempty"`
+
+	// Source AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-source
+	Source *Project_Source `json:"Source,omitempty"`
+
+	// SourceVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-sourceversion
+	SourceVersion *types.Value `json:"SourceVersion,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TimeoutInMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-timeoutinminutes
+	TimeoutInMinutes *types.Value `json:"TimeoutInMinutes,omitempty"`
+
+	// Triggers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-triggers
+	Triggers *Project_ProjectTriggers `json:"Triggers,omitempty"`
+
+	// Visibility AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-visibility
+	Visibility *types.Value `json:"Visibility,omitempty"`
+
+	// VpcConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-project.html#cfn-codebuild-project-vpcconfig
+	VpcConfig *Project_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 *Project) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project"
+}
+
+// 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 Project) MarshalJSON() ([]byte, error) {
+	type Properties Project
+	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 *Project) UnmarshalJSON(b []byte) error {
+	type Properties Project
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Project(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/codebuild/aws-codebuild-project_artifacts.go b/goformation/cloudformation/codebuild/aws-codebuild-project_artifacts.go
new file mode 100644
index 0000000000..06c47c0901
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project_artifacts.go
@@ -0,0 +1,77 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_Artifacts AWS CloudFormation Resource (AWS::CodeBuild::Project.Artifacts)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-artifacts.html
+type Project_Artifacts struct {
+
+	// ArtifactIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-artifacts.html#cfn-codebuild-project-artifacts-artifactidentifier
+	ArtifactIdentifier *types.Value `json:"ArtifactIdentifier,omitempty"`
+
+	// EncryptionDisabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-artifacts.html#cfn-codebuild-project-artifacts-encryptiondisabled
+	EncryptionDisabled *types.Value `json:"EncryptionDisabled,omitempty"`
+
+	// Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-artifacts.html#cfn-codebuild-project-artifacts-location
+	Location *types.Value `json:"Location,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-artifacts.html#cfn-codebuild-project-artifacts-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// NamespaceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-artifacts.html#cfn-codebuild-project-artifacts-namespacetype
+	NamespaceType *types.Value `json:"NamespaceType,omitempty"`
+
+	// OverrideArtifactName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-artifacts.html#cfn-codebuild-project-artifacts-overrideartifactname
+	OverrideArtifactName *types.Value `json:"OverrideArtifactName,omitempty"`
+
+	// Packaging AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-artifacts.html#cfn-codebuild-project-artifacts-packaging
+	Packaging *types.Value `json:"Packaging,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-artifacts.html#cfn-codebuild-project-artifacts-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-artifacts.html#cfn-codebuild-project-artifacts-type
+	Type *types.Value `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 *Project_Artifacts) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.Artifacts"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_batchrestrictions.go b/goformation/cloudformation/codebuild/aws-codebuild-project_batchrestrictions.go
new file mode 100644
index 0000000000..b32afc2894
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project_batchrestrictions.go
@@ -0,0 +1,42 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_BatchRestrictions AWS CloudFormation Resource (AWS::CodeBuild::Project.BatchRestrictions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-batchrestrictions.html
+type Project_BatchRestrictions struct {
+
+	// ComputeTypesAllowed AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-batchrestrictions.html#cfn-codebuild-project-batchrestrictions-computetypesallowed
+	ComputeTypesAllowed *types.Value `json:"ComputeTypesAllowed,omitempty"`
+
+	// MaximumBuildsAllowed AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-batchrestrictions.html#cfn-codebuild-project-batchrestrictions-maximumbuildsallowed
+	MaximumBuildsAllowed *types.Value `json:"MaximumBuildsAllowed,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_BatchRestrictions) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.BatchRestrictions"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_buildstatusconfig.go b/goformation/cloudformation/codebuild/aws-codebuild-project_buildstatusconfig.go
new file mode 100644
index 0000000000..3da6ec931e
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project_buildstatusconfig.go
@@ -0,0 +1,42 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_BuildStatusConfig AWS CloudFormation Resource (AWS::CodeBuild::Project.BuildStatusConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-buildstatusconfig.html
+type Project_BuildStatusConfig struct {
+
+	// Context AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-buildstatusconfig.html#cfn-codebuild-project-buildstatusconfig-context
+	Context *types.Value `json:"Context,omitempty"`
+
+	// TargetUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-buildstatusconfig.html#cfn-codebuild-project-buildstatusconfig-targeturl
+	TargetUrl *types.Value `json:"TargetUrl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_BuildStatusConfig) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.BuildStatusConfig"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_cloudwatchlogsconfig.go b/goformation/cloudformation/codebuild/aws-codebuild-project_cloudwatchlogsconfig.go
new file mode 100644
index 0000000000..923ea8fe9e
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project_cloudwatchlogsconfig.go
@@ -0,0 +1,47 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_CloudWatchLogsConfig AWS CloudFormation Resource (AWS::CodeBuild::Project.CloudWatchLogsConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-cloudwatchlogsconfig.html
+type Project_CloudWatchLogsConfig struct {
+
+	// GroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-cloudwatchlogsconfig.html#cfn-codebuild-project-cloudwatchlogsconfig-groupname
+	GroupName *types.Value `json:"GroupName,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-cloudwatchlogsconfig.html#cfn-codebuild-project-cloudwatchlogsconfig-status
+	Status *types.Value `json:"Status,omitempty"`
+
+	// StreamName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-cloudwatchlogsconfig.html#cfn-codebuild-project-cloudwatchlogsconfig-streamname
+	StreamName *types.Value `json:"StreamName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CloudWatchLogsConfig) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.CloudWatchLogsConfig"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_environment.go b/goformation/cloudformation/codebuild/aws-codebuild-project_environment.go
new file mode 100644
index 0000000000..4a03e78c48
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project_environment.go
@@ -0,0 +1,72 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_Environment AWS CloudFormation Resource (AWS::CodeBuild::Project.Environment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environment.html
+type Project_Environment struct {
+
+	// Certificate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environment.html#cfn-codebuild-project-environment-certificate
+	Certificate *types.Value `json:"Certificate,omitempty"`
+
+	// ComputeType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environment.html#cfn-codebuild-project-environment-computetype
+	ComputeType *types.Value `json:"ComputeType,omitempty"`
+
+	// EnvironmentVariables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environment.html#cfn-codebuild-project-environment-environmentvariables
+	EnvironmentVariables []Project_EnvironmentVariable `json:"EnvironmentVariables,omitempty"`
+
+	// Image AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environment.html#cfn-codebuild-project-environment-image
+	Image *types.Value `json:"Image,omitempty"`
+
+	// ImagePullCredentialsType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environment.html#cfn-codebuild-project-environment-imagepullcredentialstype
+	ImagePullCredentialsType *types.Value `json:"ImagePullCredentialsType,omitempty"`
+
+	// PrivilegedMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environment.html#cfn-codebuild-project-environment-privilegedmode
+	PrivilegedMode *types.Value `json:"PrivilegedMode,omitempty"`
+
+	// RegistryCredential AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environment.html#cfn-codebuild-project-environment-registrycredential
+	RegistryCredential *Project_RegistryCredential `json:"RegistryCredential,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environment.html#cfn-codebuild-project-environment-type
+	Type *types.Value `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 *Project_Environment) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.Environment"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_environmentvariable.go b/goformation/cloudformation/codebuild/aws-codebuild-project_environmentvariable.go
new file mode 100644
index 0000000000..5459256dad
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project_environmentvariable.go
@@ -0,0 +1,47 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_EnvironmentVariable AWS CloudFormation Resource (AWS::CodeBuild::Project.EnvironmentVariable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environmentvariable.html
+type Project_EnvironmentVariable struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environmentvariable.html#cfn-codebuild-project-environmentvariable-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environmentvariable.html#cfn-codebuild-project-environmentvariable-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-environmentvariable.html#cfn-codebuild-project-environmentvariable-value
+	Value *types.Value `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 *Project_EnvironmentVariable) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.EnvironmentVariable"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_filtergroup.go b/goformation/cloudformation/codebuild/aws-codebuild-project_filtergroup.go
new file mode 100644
index 0000000000..7beeccd479
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project_filtergroup.go
@@ -0,0 +1,30 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_FilterGroup AWS CloudFormation Resource (AWS::CodeBuild::Project.FilterGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-filtergroup.html
+type Project_FilterGroup struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_FilterGroup) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.FilterGroup"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_gitsubmodulesconfig.go b/goformation/cloudformation/codebuild/aws-codebuild-project_gitsubmodulesconfig.go
new file mode 100644
index 0000000000..e7bd7791b3
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project_gitsubmodulesconfig.go
@@ -0,0 +1,37 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_GitSubmodulesConfig AWS CloudFormation Resource (AWS::CodeBuild::Project.GitSubmodulesConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-gitsubmodulesconfig.html
+type Project_GitSubmodulesConfig struct {
+
+	// FetchSubmodules AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-gitsubmodulesconfig.html#cfn-codebuild-project-gitsubmodulesconfig-fetchsubmodules
+	FetchSubmodules *types.Value `json:"FetchSubmodules"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_GitSubmodulesConfig) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.GitSubmodulesConfig"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_logsconfig.go b/goformation/cloudformation/codebuild/aws-codebuild-project_logsconfig.go
new file mode 100644
index 0000000000..3268315b94
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project_logsconfig.go
@@ -0,0 +1,40 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_LogsConfig AWS CloudFormation Resource (AWS::CodeBuild::Project.LogsConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-logsconfig.html
+type Project_LogsConfig struct {
+
+	// CloudWatchLogs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-logsconfig.html#cfn-codebuild-project-logsconfig-cloudwatchlogs
+	CloudWatchLogs *Project_CloudWatchLogsConfig `json:"CloudWatchLogs,omitempty"`
+
+	// S3Logs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-logsconfig.html#cfn-codebuild-project-logsconfig-s3logs
+	S3Logs *Project_S3LogsConfig `json:"S3Logs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LogsConfig) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.LogsConfig"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_projectbuildbatchconfig.go b/goformation/cloudformation/codebuild/aws-codebuild-project_projectbuildbatchconfig.go
new file mode 100644
index 0000000000..57c8d1b247
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project_projectbuildbatchconfig.go
@@ -0,0 +1,57 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_ProjectBuildBatchConfig AWS CloudFormation Resource (AWS::CodeBuild::Project.ProjectBuildBatchConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projectbuildbatchconfig.html
+type Project_ProjectBuildBatchConfig struct {
+
+	// BatchReportMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projectbuildbatchconfig.html#cfn-codebuild-project-projectbuildbatchconfig-batchreportmode
+	BatchReportMode *types.Value `json:"BatchReportMode,omitempty"`
+
+	// CombineArtifacts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projectbuildbatchconfig.html#cfn-codebuild-project-projectbuildbatchconfig-combineartifacts
+	CombineArtifacts *types.Value `json:"CombineArtifacts,omitempty"`
+
+	// Restrictions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projectbuildbatchconfig.html#cfn-codebuild-project-projectbuildbatchconfig-restrictions
+	Restrictions *Project_BatchRestrictions `json:"Restrictions,omitempty"`
+
+	// ServiceRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projectbuildbatchconfig.html#cfn-codebuild-project-projectbuildbatchconfig-servicerole
+	ServiceRole *types.Value `json:"ServiceRole,omitempty"`
+
+	// TimeoutInMins AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projectbuildbatchconfig.html#cfn-codebuild-project-projectbuildbatchconfig-timeoutinmins
+	TimeoutInMins *types.Value `json:"TimeoutInMins,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ProjectBuildBatchConfig) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.ProjectBuildBatchConfig"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_projectcache.go b/goformation/cloudformation/codebuild/aws-codebuild-project_projectcache.go
new file mode 100644
index 0000000000..d96f16d91d
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project_projectcache.go
@@ -0,0 +1,47 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_ProjectCache AWS CloudFormation Resource (AWS::CodeBuild::Project.ProjectCache)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projectcache.html
+type Project_ProjectCache struct {
+
+	// Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projectcache.html#cfn-codebuild-project-projectcache-location
+	Location *types.Value `json:"Location,omitempty"`
+
+	// Modes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projectcache.html#cfn-codebuild-project-projectcache-modes
+	Modes *types.Value `json:"Modes,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projectcache.html#cfn-codebuild-project-projectcache-type
+	Type *types.Value `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 *Project_ProjectCache) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.ProjectCache"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_projectfilesystemlocation.go b/goformation/cloudformation/codebuild/aws-codebuild-project_projectfilesystemlocation.go
new file mode 100644
index 0000000000..6ffa554432
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project_projectfilesystemlocation.go
@@ -0,0 +1,57 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_ProjectFileSystemLocation AWS CloudFormation Resource (AWS::CodeBuild::Project.ProjectFileSystemLocation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projectfilesystemlocation.html
+type Project_ProjectFileSystemLocation struct {
+
+	// Identifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projectfilesystemlocation.html#cfn-codebuild-project-projectfilesystemlocation-identifier
+	Identifier *types.Value `json:"Identifier,omitempty"`
+
+	// Location AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projectfilesystemlocation.html#cfn-codebuild-project-projectfilesystemlocation-location
+	Location *types.Value `json:"Location,omitempty"`
+
+	// MountOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projectfilesystemlocation.html#cfn-codebuild-project-projectfilesystemlocation-mountoptions
+	MountOptions *types.Value `json:"MountOptions,omitempty"`
+
+	// MountPoint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projectfilesystemlocation.html#cfn-codebuild-project-projectfilesystemlocation-mountpoint
+	MountPoint *types.Value `json:"MountPoint,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projectfilesystemlocation.html#cfn-codebuild-project-projectfilesystemlocation-type
+	Type *types.Value `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 *Project_ProjectFileSystemLocation) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.ProjectFileSystemLocation"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_projectsourceversion.go b/goformation/cloudformation/codebuild/aws-codebuild-project_projectsourceversion.go
new file mode 100644
index 0000000000..c9de41f1fc
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project_projectsourceversion.go
@@ -0,0 +1,42 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_ProjectSourceVersion AWS CloudFormation Resource (AWS::CodeBuild::Project.ProjectSourceVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projectsourceversion.html
+type Project_ProjectSourceVersion struct {
+
+	// SourceIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projectsourceversion.html#cfn-codebuild-project-projectsourceversion-sourceidentifier
+	SourceIdentifier *types.Value `json:"SourceIdentifier,omitempty"`
+
+	// SourceVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projectsourceversion.html#cfn-codebuild-project-projectsourceversion-sourceversion
+	SourceVersion *types.Value `json:"SourceVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ProjectSourceVersion) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.ProjectSourceVersion"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_projecttriggers.go b/goformation/cloudformation/codebuild/aws-codebuild-project_projecttriggers.go
new file mode 100644
index 0000000000..3d46f7233b
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project_projecttriggers.go
@@ -0,0 +1,47 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_ProjectTriggers AWS CloudFormation Resource (AWS::CodeBuild::Project.ProjectTriggers)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projecttriggers.html
+type Project_ProjectTriggers struct {
+
+	// BuildType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-projecttriggers.html#cfn-codebuild-project-projecttriggers-buildtype
+	BuildType *types.Value `json:"BuildType,omitempty"`
+
+	// FilterGroups AWS CloudFormation Property
+	// Required: false
+	// 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"`
+
+	// 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
+	Webhook *types.Value `json:"Webhook,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ProjectTriggers) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.ProjectTriggers"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_registrycredential.go b/goformation/cloudformation/codebuild/aws-codebuild-project_registrycredential.go
new file mode 100644
index 0000000000..075852b723
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project_registrycredential.go
@@ -0,0 +1,42 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_RegistryCredential AWS CloudFormation Resource (AWS::CodeBuild::Project.RegistryCredential)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-registrycredential.html
+type Project_RegistryCredential struct {
+
+	// Credential AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-registrycredential.html#cfn-codebuild-project-registrycredential-credential
+	Credential *types.Value `json:"Credential,omitempty"`
+
+	// CredentialProvider AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-registrycredential.html#cfn-codebuild-project-registrycredential-credentialprovider
+	CredentialProvider *types.Value `json:"CredentialProvider,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RegistryCredential) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.RegistryCredential"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_s3logsconfig.go b/goformation/cloudformation/codebuild/aws-codebuild-project_s3logsconfig.go
new file mode 100644
index 0000000000..fe2c074315
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project_s3logsconfig.go
@@ -0,0 +1,47 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_S3LogsConfig AWS CloudFormation Resource (AWS::CodeBuild::Project.S3LogsConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-s3logsconfig.html
+type Project_S3LogsConfig struct {
+
+	// EncryptionDisabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-s3logsconfig.html#cfn-codebuild-project-s3logsconfig-encryptiondisabled
+	EncryptionDisabled *types.Value `json:"EncryptionDisabled,omitempty"`
+
+	// Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-s3logsconfig.html#cfn-codebuild-project-s3logsconfig-location
+	Location *types.Value `json:"Location,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-s3logsconfig.html#cfn-codebuild-project-s3logsconfig-status
+	Status *types.Value `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 *Project_S3LogsConfig) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.S3LogsConfig"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_source.go b/goformation/cloudformation/codebuild/aws-codebuild-project_source.go
new file mode 100644
index 0000000000..7edf6efd3f
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project_source.go
@@ -0,0 +1,82 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_Source AWS CloudFormation Resource (AWS::CodeBuild::Project.Source)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-source.html
+type Project_Source struct {
+
+	// Auth AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-source.html#cfn-codebuild-project-source-auth
+	Auth *Project_SourceAuth `json:"Auth,omitempty"`
+
+	// BuildSpec AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-source.html#cfn-codebuild-project-source-buildspec
+	BuildSpec *types.Value `json:"BuildSpec,omitempty"`
+
+	// BuildStatusConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-source.html#cfn-codebuild-project-source-buildstatusconfig
+	BuildStatusConfig *Project_BuildStatusConfig `json:"BuildStatusConfig,omitempty"`
+
+	// GitCloneDepth AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-source.html#cfn-codebuild-project-source-gitclonedepth
+	GitCloneDepth *types.Value `json:"GitCloneDepth,omitempty"`
+
+	// GitSubmodulesConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-source.html#cfn-codebuild-project-source-gitsubmodulesconfig
+	GitSubmodulesConfig *Project_GitSubmodulesConfig `json:"GitSubmodulesConfig,omitempty"`
+
+	// InsecureSsl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-source.html#cfn-codebuild-project-source-insecuressl
+	InsecureSsl *types.Value `json:"InsecureSsl,omitempty"`
+
+	// Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-source.html#cfn-codebuild-project-source-location
+	Location *types.Value `json:"Location,omitempty"`
+
+	// ReportBuildStatus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-source.html#cfn-codebuild-project-source-reportbuildstatus
+	ReportBuildStatus *types.Value `json:"ReportBuildStatus,omitempty"`
+
+	// SourceIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-source.html#cfn-codebuild-project-source-sourceidentifier
+	SourceIdentifier *types.Value `json:"SourceIdentifier,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-source.html#cfn-codebuild-project-source-type
+	Type *types.Value `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 *Project_Source) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.Source"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_sourceauth.go b/goformation/cloudformation/codebuild/aws-codebuild-project_sourceauth.go
new file mode 100644
index 0000000000..1f99102835
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project_sourceauth.go
@@ -0,0 +1,42 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_SourceAuth AWS CloudFormation Resource (AWS::CodeBuild::Project.SourceAuth)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-sourceauth.html
+type Project_SourceAuth struct {
+
+	// Resource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-sourceauth.html#cfn-codebuild-project-sourceauth-resource
+	Resource *types.Value `json:"Resource,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-sourceauth.html#cfn-codebuild-project-sourceauth-type
+	Type *types.Value `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 *Project_SourceAuth) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.SourceAuth"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_vpcconfig.go b/goformation/cloudformation/codebuild/aws-codebuild-project_vpcconfig.go
new file mode 100644
index 0000000000..45d08e43c3
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project_vpcconfig.go
@@ -0,0 +1,47 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_VpcConfig AWS CloudFormation Resource (AWS::CodeBuild::Project.VpcConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-vpcconfig.html
+type Project_VpcConfig struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-vpcconfig.html#cfn-codebuild-project-vpcconfig-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// Subnets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-vpcconfig.html#cfn-codebuild-project-vpcconfig-subnets
+	Subnets *types.Value `json:"Subnets,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-vpcconfig.html#cfn-codebuild-project-vpcconfig-vpcid
+	VpcId *types.Value `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 *Project_VpcConfig) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.VpcConfig"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-project_webhookfilter.go b/goformation/cloudformation/codebuild/aws-codebuild-project_webhookfilter.go
new file mode 100644
index 0000000000..df185d81e0
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-project_webhookfilter.go
@@ -0,0 +1,47 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_WebhookFilter AWS CloudFormation Resource (AWS::CodeBuild::Project.WebhookFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-webhookfilter.html
+type Project_WebhookFilter struct {
+
+	// ExcludeMatchedPattern AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-webhookfilter.html#cfn-codebuild-project-webhookfilter-excludematchedpattern
+	ExcludeMatchedPattern *types.Value `json:"ExcludeMatchedPattern,omitempty"`
+
+	// Pattern AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-webhookfilter.html#cfn-codebuild-project-webhookfilter-pattern
+	Pattern *types.Value `json:"Pattern,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-project-webhookfilter.html#cfn-codebuild-project-webhookfilter-type
+	Type *types.Value `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 *Project_WebhookFilter) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::Project.WebhookFilter"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-reportgroup.go b/goformation/cloudformation/codebuild/aws-codebuild-reportgroup.go
new file mode 100644
index 0000000000..d519e1e212
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-reportgroup.go
@@ -0,0 +1,129 @@
+package codebuild
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReportGroup AWS CloudFormation Resource (AWS::CodeBuild::ReportGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-reportgroup.html
+type ReportGroup struct {
+
+	// DeleteReports AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-reportgroup.html#cfn-codebuild-reportgroup-deletereports
+	DeleteReports *types.Value `json:"DeleteReports,omitempty"`
+
+	// ExportConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-reportgroup.html#cfn-codebuild-reportgroup-exportconfig
+	ExportConfig *ReportGroup_ReportExportConfig `json:"ExportConfig,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-reportgroup.html#cfn-codebuild-reportgroup-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-reportgroup.html#cfn-codebuild-reportgroup-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-reportgroup.html#cfn-codebuild-reportgroup-type
+	Type *types.Value `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 *ReportGroup) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::ReportGroup"
+}
+
+// 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 ReportGroup) MarshalJSON() ([]byte, error) {
+	type Properties ReportGroup
+	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 *ReportGroup) UnmarshalJSON(b []byte) error {
+	type Properties ReportGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ReportGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/codebuild/aws-codebuild-reportgroup_reportexportconfig.go b/goformation/cloudformation/codebuild/aws-codebuild-reportgroup_reportexportconfig.go
new file mode 100644
index 0000000000..316b8a21fc
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-reportgroup_reportexportconfig.go
@@ -0,0 +1,42 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReportGroup_ReportExportConfig AWS CloudFormation Resource (AWS::CodeBuild::ReportGroup.ReportExportConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-reportgroup-reportexportconfig.html
+type ReportGroup_ReportExportConfig struct {
+
+	// ExportConfigType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-reportgroup-reportexportconfig.html#cfn-codebuild-reportgroup-reportexportconfig-exportconfigtype
+	ExportConfigType *types.Value `json:"ExportConfigType,omitempty"`
+
+	// S3Destination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-reportgroup-reportexportconfig.html#cfn-codebuild-reportgroup-reportexportconfig-s3destination
+	S3Destination *ReportGroup_S3ReportExportConfig `json:"S3Destination,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReportGroup_ReportExportConfig) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::ReportGroup.ReportExportConfig"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-reportgroup_s3reportexportconfig.go b/goformation/cloudformation/codebuild/aws-codebuild-reportgroup_s3reportexportconfig.go
new file mode 100644
index 0000000000..5d1a0970ee
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-reportgroup_s3reportexportconfig.go
@@ -0,0 +1,62 @@
+package codebuild
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReportGroup_S3ReportExportConfig AWS CloudFormation Resource (AWS::CodeBuild::ReportGroup.S3ReportExportConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-reportgroup-s3reportexportconfig.html
+type ReportGroup_S3ReportExportConfig struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-reportgroup-s3reportexportconfig.html#cfn-codebuild-reportgroup-s3reportexportconfig-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// BucketOwner AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-reportgroup-s3reportexportconfig.html#cfn-codebuild-reportgroup-s3reportexportconfig-bucketowner
+	BucketOwner *types.Value `json:"BucketOwner,omitempty"`
+
+	// EncryptionDisabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-reportgroup-s3reportexportconfig.html#cfn-codebuild-reportgroup-s3reportexportconfig-encryptiondisabled
+	EncryptionDisabled *types.Value `json:"EncryptionDisabled,omitempty"`
+
+	// EncryptionKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-reportgroup-s3reportexportconfig.html#cfn-codebuild-reportgroup-s3reportexportconfig-encryptionkey
+	EncryptionKey *types.Value `json:"EncryptionKey,omitempty"`
+
+	// Packaging AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-reportgroup-s3reportexportconfig.html#cfn-codebuild-reportgroup-s3reportexportconfig-packaging
+	Packaging *types.Value `json:"Packaging,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codebuild-reportgroup-s3reportexportconfig.html#cfn-codebuild-reportgroup-s3reportexportconfig-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReportGroup_S3ReportExportConfig) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::ReportGroup.S3ReportExportConfig"
+}
diff --git a/goformation/cloudformation/codebuild/aws-codebuild-sourcecredential.go b/goformation/cloudformation/codebuild/aws-codebuild-sourcecredential.go
new file mode 100644
index 0000000000..90deac45f1
--- /dev/null
+++ b/goformation/cloudformation/codebuild/aws-codebuild-sourcecredential.go
@@ -0,0 +1,123 @@
+package codebuild
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SourceCredential AWS CloudFormation Resource (AWS::CodeBuild::SourceCredential)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-sourcecredential.html
+type SourceCredential struct {
+
+	// AuthType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-sourcecredential.html#cfn-codebuild-sourcecredential-authtype
+	AuthType *types.Value `json:"AuthType,omitempty"`
+
+	// ServerType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-sourcecredential.html#cfn-codebuild-sourcecredential-servertype
+	ServerType *types.Value `json:"ServerType,omitempty"`
+
+	// Token AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-sourcecredential.html#cfn-codebuild-sourcecredential-token
+	Token *types.Value `json:"Token,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codebuild-sourcecredential.html#cfn-codebuild-sourcecredential-username
+	Username *types.Value `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 *SourceCredential) AWSCloudFormationType() string {
+	return "AWS::CodeBuild::SourceCredential"
+}
+
+// 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 SourceCredential) MarshalJSON() ([]byte, error) {
+	type Properties SourceCredential
+	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 *SourceCredential) UnmarshalJSON(b []byte) error {
+	type Properties SourceCredential
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SourceCredential(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/codecommit/aws-codecommit-repository.go b/goformation/cloudformation/codecommit/aws-codecommit-repository.go
new file mode 100644
index 0000000000..d6e57cab5a
--- /dev/null
+++ b/goformation/cloudformation/codecommit/aws-codecommit-repository.go
@@ -0,0 +1,129 @@
+package codecommit
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Repository AWS CloudFormation Resource (AWS::CodeCommit::Repository)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html
+type Repository struct {
+
+	// Code AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-code
+	Code *Repository_Code `json:"Code,omitempty"`
+
+	// RepositoryDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositorydescription
+	RepositoryDescription *types.Value `json:"RepositoryDescription,omitempty"`
+
+	// RepositoryName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-repositoryname
+	RepositoryName *types.Value `json:"RepositoryName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Triggers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codecommit-repository.html#cfn-codecommit-repository-triggers
+	Triggers []Repository_RepositoryTrigger `json:"Triggers,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Repository) AWSCloudFormationType() string {
+	return "AWS::CodeCommit::Repository"
+}
+
+// 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 Repository) MarshalJSON() ([]byte, error) {
+	type Properties Repository
+	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 *Repository) UnmarshalJSON(b []byte) error {
+	type Properties Repository
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Repository(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/codecommit/aws-codecommit-repository_code.go b/goformation/cloudformation/codecommit/aws-codecommit-repository_code.go
new file mode 100644
index 0000000000..1b78790a6c
--- /dev/null
+++ b/goformation/cloudformation/codecommit/aws-codecommit-repository_code.go
@@ -0,0 +1,42 @@
+package codecommit
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Repository_Code AWS CloudFormation Resource (AWS::CodeCommit::Repository.Code)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-code.html
+type Repository_Code struct {
+
+	// BranchName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-code.html#cfn-codecommit-repository-code-branchname
+	BranchName *types.Value `json:"BranchName,omitempty"`
+
+	// S3 AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-code.html#cfn-codecommit-repository-code-s3
+	S3 *Repository_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 *Repository_Code) AWSCloudFormationType() string {
+	return "AWS::CodeCommit::Repository.Code"
+}
diff --git a/goformation/cloudformation/codecommit/aws-codecommit-repository_repositorytrigger.go b/goformation/cloudformation/codecommit/aws-codecommit-repository_repositorytrigger.go
new file mode 100644
index 0000000000..e135930cc6
--- /dev/null
+++ b/goformation/cloudformation/codecommit/aws-codecommit-repository_repositorytrigger.go
@@ -0,0 +1,57 @@
+package codecommit
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Repository_RepositoryTrigger AWS CloudFormation Resource (AWS::CodeCommit::Repository.RepositoryTrigger)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-repositorytrigger.html
+type Repository_RepositoryTrigger struct {
+
+	// Branches AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-repositorytrigger.html#cfn-codecommit-repository-repositorytrigger-branches
+	Branches *types.Value `json:"Branches,omitempty"`
+
+	// CustomData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-repositorytrigger.html#cfn-codecommit-repository-repositorytrigger-customdata
+	CustomData *types.Value `json:"CustomData,omitempty"`
+
+	// DestinationArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-repositorytrigger.html#cfn-codecommit-repository-repositorytrigger-destinationarn
+	DestinationArn *types.Value `json:"DestinationArn,omitempty"`
+
+	// Events AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-repositorytrigger.html#cfn-codecommit-repository-repositorytrigger-events
+	Events *types.Value `json:"Events,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-repositorytrigger.html#cfn-codecommit-repository-repositorytrigger-name
+	Name *types.Value `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 *Repository_RepositoryTrigger) AWSCloudFormationType() string {
+	return "AWS::CodeCommit::Repository.RepositoryTrigger"
+}
diff --git a/goformation/cloudformation/codecommit/aws-codecommit-repository_s3.go b/goformation/cloudformation/codecommit/aws-codecommit-repository_s3.go
new file mode 100644
index 0000000000..9412d07f7a
--- /dev/null
+++ b/goformation/cloudformation/codecommit/aws-codecommit-repository_s3.go
@@ -0,0 +1,47 @@
+package codecommit
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Repository_S3 AWS CloudFormation Resource (AWS::CodeCommit::Repository.S3)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-s3.html
+type Repository_S3 struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-s3.html#cfn-codecommit-repository-s3-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-s3.html#cfn-codecommit-repository-s3-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// ObjectVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codecommit-repository-s3.html#cfn-codecommit-repository-s3-objectversion
+	ObjectVersion *types.Value `json:"ObjectVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Repository_S3) AWSCloudFormationType() string {
+	return "AWS::CodeCommit::Repository.S3"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-application.go b/goformation/cloudformation/codedeploy/aws-codedeploy-application.go
new file mode 100644
index 0000000000..ad31d0c761
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-application.go
@@ -0,0 +1,119 @@
+package codedeploy
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application AWS CloudFormation Resource (AWS::CodeDeploy::Application)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-application.html
+type Application struct {
+
+	// ApplicationName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-application.html#cfn-codedeploy-application-applicationname
+	ApplicationName *types.Value `json:"ApplicationName,omitempty"`
+
+	// ComputePlatform AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-application.html#cfn-codedeploy-application-computeplatform
+	ComputePlatform *types.Value `json:"ComputePlatform,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-application.html#cfn-codedeploy-application-tags
+	Tags []cloudformation.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::CodeDeploy::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig.go
new file mode 100644
index 0000000000..146050f3e8
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig.go
@@ -0,0 +1,123 @@
+package codedeploy
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentConfig AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentconfig.html
+type DeploymentConfig struct {
+
+	// ComputePlatform AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentconfig.html#cfn-codedeploy-deploymentconfig-computeplatform
+	ComputePlatform *types.Value `json:"ComputePlatform,omitempty"`
+
+	// DeploymentConfigName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentconfig.html#cfn-codedeploy-deploymentconfig-deploymentconfigname
+	DeploymentConfigName *types.Value `json:"DeploymentConfigName,omitempty"`
+
+	// MinimumHealthyHosts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentconfig.html#cfn-codedeploy-deploymentconfig-minimumhealthyhosts
+	MinimumHealthyHosts *DeploymentConfig_MinimumHealthyHosts `json:"MinimumHealthyHosts,omitempty"`
+
+	// TrafficRoutingConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentconfig.html#cfn-codedeploy-deploymentconfig-trafficroutingconfig
+	TrafficRoutingConfig *DeploymentConfig_TrafficRoutingConfig `json:"TrafficRoutingConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentConfig) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentConfig"
+}
+
+// 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 DeploymentConfig) MarshalJSON() ([]byte, error) {
+	type Properties DeploymentConfig
+	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 *DeploymentConfig) UnmarshalJSON(b []byte) error {
+	type Properties DeploymentConfig
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DeploymentConfig(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_minimumhealthyhosts.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_minimumhealthyhosts.go
new file mode 100644
index 0000000000..d3144a723c
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_minimumhealthyhosts.go
@@ -0,0 +1,42 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentConfig_MinimumHealthyHosts AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentConfig.MinimumHealthyHosts)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentconfig-minimumhealthyhosts.html
+type DeploymentConfig_MinimumHealthyHosts struct {
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentconfig-minimumhealthyhosts.html#cfn-codedeploy-deploymentconfig-minimumhealthyhosts-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentconfig-minimumhealthyhosts.html#cfn-codedeploy-deploymentconfig-minimumhealthyhosts-value
+	Value *types.Value `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 *DeploymentConfig_MinimumHealthyHosts) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentConfig.MinimumHealthyHosts"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedcanary.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedcanary.go
new file mode 100644
index 0000000000..c3f54d3663
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedcanary.go
@@ -0,0 +1,42 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentConfig_TimeBasedCanary AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentConfig.TimeBasedCanary)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentconfig-timebasedcanary.html
+type DeploymentConfig_TimeBasedCanary struct {
+
+	// CanaryInterval AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentconfig-timebasedcanary.html#cfn-properties-codedeploy-deploymentconfig-trafficroutingconfig-timebasedcanary-canaryinterval
+	CanaryInterval *types.Value `json:"CanaryInterval"`
+
+	// CanaryPercentage AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentconfig-timebasedcanary.html#cfn-properties-codedeploy-deploymentconfig-trafficroutingconfig-timebasedcanary-canarypercentage
+	CanaryPercentage *types.Value `json:"CanaryPercentage"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentConfig_TimeBasedCanary) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentConfig.TimeBasedCanary"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedlinear.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedlinear.go
new file mode 100644
index 0000000000..dbe5188e24
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_timebasedlinear.go
@@ -0,0 +1,42 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentConfig_TimeBasedLinear AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentConfig.TimeBasedLinear)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentconfig-timebasedlinear.html
+type DeploymentConfig_TimeBasedLinear struct {
+
+	// LinearInterval AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentconfig-timebasedlinear.html#cfn-properties-codedeploy-deploymentconfig-trafficroutingconfig-timebasedlinear-linearinterval
+	LinearInterval *types.Value `json:"LinearInterval"`
+
+	// LinearPercentage AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentconfig-timebasedlinear.html#cfn-properties-codedeploy-deploymentconfig-trafficroutingconfig-timebasedlinear-linearpercentage
+	LinearPercentage *types.Value `json:"LinearPercentage"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentConfig_TimeBasedLinear) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentConfig.TimeBasedLinear"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_trafficroutingconfig.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_trafficroutingconfig.go
new file mode 100644
index 0000000000..5448ddf6d5
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentconfig_trafficroutingconfig.go
@@ -0,0 +1,47 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentConfig_TrafficRoutingConfig AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentConfig.TrafficRoutingConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentconfig-trafficroutingconfig.html
+type DeploymentConfig_TrafficRoutingConfig struct {
+
+	// TimeBasedCanary AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentconfig-trafficroutingconfig.html#cfn-properties-codedeploy-deploymentconfig-trafficroutingconfig-timebasedcanary
+	TimeBasedCanary *DeploymentConfig_TimeBasedCanary `json:"TimeBasedCanary,omitempty"`
+
+	// TimeBasedLinear AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentconfig-trafficroutingconfig.html#cfn-properties-codedeploy-deploymentconfig-trafficroutingconfig-timebasedlinear
+	TimeBasedLinear *DeploymentConfig_TimeBasedLinear `json:"TimeBasedLinear,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentconfig-trafficroutingconfig.html#cfn-properties-codedeploy-deploymentconfig-trafficroutingconfig-type
+	Type *types.Value `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 *DeploymentConfig_TrafficRoutingConfig) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentConfig.TrafficRoutingConfig"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup.go
new file mode 100644
index 0000000000..7977bef912
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup.go
@@ -0,0 +1,188 @@
+package codedeploy
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html
+type DeploymentGroup struct {
+
+	// AlarmConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-alarmconfiguration
+	AlarmConfiguration *DeploymentGroup_AlarmConfiguration `json:"AlarmConfiguration,omitempty"`
+
+	// ApplicationName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-applicationname
+	ApplicationName *types.Value `json:"ApplicationName,omitempty"`
+
+	// AutoRollbackConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-autorollbackconfiguration
+	AutoRollbackConfiguration *DeploymentGroup_AutoRollbackConfiguration `json:"AutoRollbackConfiguration,omitempty"`
+
+	// AutoScalingGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-autoscalinggroups
+	AutoScalingGroups *types.Value `json:"AutoScalingGroups,omitempty"`
+
+	// BlueGreenDeploymentConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-bluegreendeploymentconfiguration
+	BlueGreenDeploymentConfiguration *DeploymentGroup_BlueGreenDeploymentConfiguration `json:"BlueGreenDeploymentConfiguration,omitempty"`
+
+	// Deployment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-deployment
+	Deployment *DeploymentGroup_Deployment `json:"Deployment,omitempty"`
+
+	// DeploymentConfigName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-deploymentconfigname
+	DeploymentConfigName *types.Value `json:"DeploymentConfigName,omitempty"`
+
+	// DeploymentGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-deploymentgroupname
+	DeploymentGroupName *types.Value `json:"DeploymentGroupName,omitempty"`
+
+	// DeploymentStyle AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-deploymentstyle
+	DeploymentStyle *DeploymentGroup_DeploymentStyle `json:"DeploymentStyle,omitempty"`
+
+	// ECSServices AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-ecsservices
+	ECSServices []DeploymentGroup_ECSService `json:"ECSServices,omitempty"`
+
+	// Ec2TagFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-ec2tagfilters
+	Ec2TagFilters []DeploymentGroup_EC2TagFilter `json:"Ec2TagFilters,omitempty"`
+
+	// Ec2TagSet AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-ec2tagset
+	Ec2TagSet *DeploymentGroup_EC2TagSet `json:"Ec2TagSet,omitempty"`
+
+	// LoadBalancerInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-loadbalancerinfo
+	LoadBalancerInfo *DeploymentGroup_LoadBalancerInfo `json:"LoadBalancerInfo,omitempty"`
+
+	// OnPremisesInstanceTagFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-onpremisesinstancetagfilters
+	OnPremisesInstanceTagFilters []DeploymentGroup_TagFilter `json:"OnPremisesInstanceTagFilters,omitempty"`
+
+	// OnPremisesTagSet AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-onpremisestagset
+	OnPremisesTagSet *DeploymentGroup_OnPremisesTagSet `json:"OnPremisesTagSet,omitempty"`
+
+	// ServiceRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-servicerolearn
+	ServiceRoleArn *types.Value `json:"ServiceRoleArn,omitempty"`
+
+	// TriggerConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codedeploy-deploymentgroup.html#cfn-codedeploy-deploymentgroup-triggerconfigurations
+	TriggerConfigurations []DeploymentGroup_TriggerConfig `json:"TriggerConfigurations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentGroup) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup"
+}
+
+// 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 DeploymentGroup) MarshalJSON() ([]byte, error) {
+	type Properties DeploymentGroup
+	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 *DeploymentGroup) UnmarshalJSON(b []byte) error {
+	type Properties DeploymentGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DeploymentGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarm.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarm.go
new file mode 100644
index 0000000000..546113db51
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarm.go
@@ -0,0 +1,37 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_Alarm AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.Alarm)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-alarm.html
+type DeploymentGroup_Alarm struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-alarm.html#cfn-codedeploy-deploymentgroup-alarm-name
+	Name *types.Value `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 *DeploymentGroup_Alarm) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.Alarm"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarmconfiguration.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarmconfiguration.go
new file mode 100644
index 0000000000..56b5e4b1e4
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_alarmconfiguration.go
@@ -0,0 +1,47 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_AlarmConfiguration AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.AlarmConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-alarmconfiguration.html
+type DeploymentGroup_AlarmConfiguration struct {
+
+	// Alarms AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-alarmconfiguration.html#cfn-codedeploy-deploymentgroup-alarmconfiguration-alarms
+	Alarms []DeploymentGroup_Alarm `json:"Alarms,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-alarmconfiguration.html#cfn-codedeploy-deploymentgroup-alarmconfiguration-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// IgnorePollAlarmFailure AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-alarmconfiguration.html#cfn-codedeploy-deploymentgroup-alarmconfiguration-ignorepollalarmfailure
+	IgnorePollAlarmFailure *types.Value `json:"IgnorePollAlarmFailure,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentGroup_AlarmConfiguration) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.AlarmConfiguration"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_autorollbackconfiguration.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_autorollbackconfiguration.go
new file mode 100644
index 0000000000..ba341d8c83
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_autorollbackconfiguration.go
@@ -0,0 +1,42 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_AutoRollbackConfiguration AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.AutoRollbackConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-autorollbackconfiguration.html
+type DeploymentGroup_AutoRollbackConfiguration struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-autorollbackconfiguration.html#cfn-codedeploy-deploymentgroup-autorollbackconfiguration-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// Events AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-autorollbackconfiguration.html#cfn-codedeploy-deploymentgroup-autorollbackconfiguration-events
+	Events *types.Value `json:"Events,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentGroup_AutoRollbackConfiguration) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.AutoRollbackConfiguration"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_bluegreendeploymentconfiguration.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_bluegreendeploymentconfiguration.go
new file mode 100644
index 0000000000..8f8011800d
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_bluegreendeploymentconfiguration.go
@@ -0,0 +1,45 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_BlueGreenDeploymentConfiguration AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.BlueGreenDeploymentConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-bluegreendeploymentconfiguration.html
+type DeploymentGroup_BlueGreenDeploymentConfiguration struct {
+
+	// DeploymentReadyOption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-bluegreendeploymentconfiguration.html#cfn-codedeploy-deploymentgroup-bluegreendeploymentconfiguration-deploymentreadyoption
+	DeploymentReadyOption *DeploymentGroup_DeploymentReadyOption `json:"DeploymentReadyOption,omitempty"`
+
+	// GreenFleetProvisioningOption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-bluegreendeploymentconfiguration.html#cfn-codedeploy-deploymentgroup-bluegreendeploymentconfiguration-greenfleetprovisioningoption
+	GreenFleetProvisioningOption *DeploymentGroup_GreenFleetProvisioningOption `json:"GreenFleetProvisioningOption,omitempty"`
+
+	// TerminateBlueInstancesOnDeploymentSuccess AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-bluegreendeploymentconfiguration.html#cfn-codedeploy-deploymentgroup-bluegreendeploymentconfiguration-terminateblueinstancesondeploymentsuccess
+	TerminateBlueInstancesOnDeploymentSuccess *DeploymentGroup_BlueInstanceTerminationOption `json:"TerminateBlueInstancesOnDeploymentSuccess,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentGroup_BlueGreenDeploymentConfiguration) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.BlueGreenDeploymentConfiguration"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_blueinstanceterminationoption.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_blueinstanceterminationoption.go
new file mode 100644
index 0000000000..f19787c836
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_blueinstanceterminationoption.go
@@ -0,0 +1,42 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_BlueInstanceTerminationOption AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.BlueInstanceTerminationOption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-blueinstanceterminationoption.html
+type DeploymentGroup_BlueInstanceTerminationOption struct {
+
+	// Action AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-blueinstanceterminationoption.html#cfn-codedeploy-deploymentgroup-bluegreendeploymentconfiguration-blueinstanceterminationoption-action
+	Action *types.Value `json:"Action,omitempty"`
+
+	// TerminationWaitTimeInMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-blueinstanceterminationoption.html#cfn-codedeploy-deploymentgroup-bluegreendeploymentconfiguration-blueinstanceterminationoption-terminationwaittimeinminutes
+	TerminationWaitTimeInMinutes *types.Value `json:"TerminationWaitTimeInMinutes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentGroup_BlueInstanceTerminationOption) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.BlueInstanceTerminationOption"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deployment.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deployment.go
new file mode 100644
index 0000000000..799cc3984f
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deployment.go
@@ -0,0 +1,47 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_Deployment AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.Deployment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment.html
+type DeploymentGroup_Deployment struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment.html#cfn-properties-codedeploy-deploymentgroup-deployment-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// IgnoreApplicationStopFailures AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment.html#cfn-properties-codedeploy-deploymentgroup-deployment-ignoreapplicationstopfailures
+	IgnoreApplicationStopFailures *types.Value `json:"IgnoreApplicationStopFailures,omitempty"`
+
+	// Revision AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision
+	Revision *DeploymentGroup_RevisionLocation `json:"Revision,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentGroup_Deployment) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.Deployment"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentreadyoption.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentreadyoption.go
new file mode 100644
index 0000000000..f615444aa9
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentreadyoption.go
@@ -0,0 +1,42 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_DeploymentReadyOption AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.DeploymentReadyOption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deploymentreadyoption.html
+type DeploymentGroup_DeploymentReadyOption struct {
+
+	// ActionOnTimeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deploymentreadyoption.html#cfn-codedeploy-deploymentgroup-bluegreendeploymentconfiguration-deploymentreadyoption-actionontimeout
+	ActionOnTimeout *types.Value `json:"ActionOnTimeout,omitempty"`
+
+	// WaitTimeInMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deploymentreadyoption.html#cfn-codedeploy-deploymentgroup-bluegreendeploymentconfiguration-deploymentreadyoption-waittimeinminutes
+	WaitTimeInMinutes *types.Value `json:"WaitTimeInMinutes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentGroup_DeploymentReadyOption) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.DeploymentReadyOption"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentstyle.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentstyle.go
new file mode 100644
index 0000000000..606e16532d
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_deploymentstyle.go
@@ -0,0 +1,42 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_DeploymentStyle AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.DeploymentStyle)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deploymentstyle.html
+type DeploymentGroup_DeploymentStyle struct {
+
+	// DeploymentOption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deploymentstyle.html#cfn-codedeploy-deploymentgroup-deploymentstyle-deploymentoption
+	DeploymentOption *types.Value `json:"DeploymentOption,omitempty"`
+
+	// DeploymentType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deploymentstyle.html#cfn-codedeploy-deploymentgroup-deploymentstyle-deploymenttype
+	DeploymentType *types.Value `json:"DeploymentType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentGroup_DeploymentStyle) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.DeploymentStyle"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagfilter.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagfilter.go
new file mode 100644
index 0000000000..2061fe6b6e
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagfilter.go
@@ -0,0 +1,47 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_EC2TagFilter AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.EC2TagFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-ec2tagfilter.html
+type DeploymentGroup_EC2TagFilter struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-ec2tagfilter.html#cfn-codedeploy-deploymentgroup-ec2tagfilter-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-ec2tagfilter.html#cfn-codedeploy-deploymentgroup-ec2tagfilter-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-ec2tagfilter.html#cfn-codedeploy-deploymentgroup-ec2tagfilter-value
+	Value *types.Value `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 *DeploymentGroup_EC2TagFilter) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.EC2TagFilter"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagset.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagset.go
new file mode 100644
index 0000000000..569e08b0bd
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagset.go
@@ -0,0 +1,35 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_EC2TagSet AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.EC2TagSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-ec2tagset.html
+type DeploymentGroup_EC2TagSet struct {
+
+	// Ec2TagSetList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-ec2tagset.html#cfn-codedeploy-deploymentgroup-ec2tagset-ec2tagsetlist
+	Ec2TagSetList []DeploymentGroup_EC2TagSetListObject `json:"Ec2TagSetList,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentGroup_EC2TagSet) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.EC2TagSet"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagsetlistobject.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagsetlistobject.go
new file mode 100644
index 0000000000..e182b21a20
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ec2tagsetlistobject.go
@@ -0,0 +1,35 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_EC2TagSetListObject AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.EC2TagSetListObject)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-ec2tagsetlistobject.html
+type DeploymentGroup_EC2TagSetListObject struct {
+
+	// Ec2TagGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-ec2tagsetlistobject.html#cfn-codedeploy-deploymentgroup-ec2tagsetlistobject-ec2taggroup
+	Ec2TagGroup []DeploymentGroup_EC2TagFilter `json:"Ec2TagGroup,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentGroup_EC2TagSetListObject) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.EC2TagSetListObject"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ecsservice.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ecsservice.go
new file mode 100644
index 0000000000..8469aff767
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_ecsservice.go
@@ -0,0 +1,42 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_ECSService AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.ECSService)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-ecsservice.html
+type DeploymentGroup_ECSService struct {
+
+	// ClusterName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-ecsservice.html#cfn-codedeploy-deploymentgroup-ecsservice-clustername
+	ClusterName *types.Value `json:"ClusterName,omitempty"`
+
+	// ServiceName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-ecsservice.html#cfn-codedeploy-deploymentgroup-ecsservice-servicename
+	ServiceName *types.Value `json:"ServiceName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentGroup_ECSService) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.ECSService"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_elbinfo.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_elbinfo.go
new file mode 100644
index 0000000000..9b71f944dd
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_elbinfo.go
@@ -0,0 +1,37 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_ELBInfo AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.ELBInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-elbinfo.html
+type DeploymentGroup_ELBInfo struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-elbinfo.html#cfn-codedeploy-deploymentgroup-elbinfo-name
+	Name *types.Value `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 *DeploymentGroup_ELBInfo) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.ELBInfo"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_githublocation.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_githublocation.go
new file mode 100644
index 0000000000..505833e6b2
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_githublocation.go
@@ -0,0 +1,42 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_GitHubLocation AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.GitHubLocation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision-githublocation.html
+type DeploymentGroup_GitHubLocation struct {
+
+	// CommitId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision-githublocation.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision-githublocation-commitid
+	CommitId *types.Value `json:"CommitId,omitempty"`
+
+	// Repository AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision-githublocation.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision-githublocation-repository
+	Repository *types.Value `json:"Repository,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentGroup_GitHubLocation) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.GitHubLocation"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_greenfleetprovisioningoption.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_greenfleetprovisioningoption.go
new file mode 100644
index 0000000000..34dab5188e
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_greenfleetprovisioningoption.go
@@ -0,0 +1,37 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_GreenFleetProvisioningOption AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.GreenFleetProvisioningOption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-greenfleetprovisioningoption.html
+type DeploymentGroup_GreenFleetProvisioningOption struct {
+
+	// Action AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-greenfleetprovisioningoption.html#cfn-codedeploy-deploymentgroup-bluegreendeploymentconfiguration-greenfleetprovisioningoption-action
+	Action *types.Value `json:"Action,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentGroup_GreenFleetProvisioningOption) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.GreenFleetProvisioningOption"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_loadbalancerinfo.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_loadbalancerinfo.go
new file mode 100644
index 0000000000..c43c8f06be
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_loadbalancerinfo.go
@@ -0,0 +1,40 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_LoadBalancerInfo AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.LoadBalancerInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-loadbalancerinfo.html
+type DeploymentGroup_LoadBalancerInfo struct {
+
+	// ElbInfoList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-loadbalancerinfo.html#cfn-codedeploy-deploymentgroup-loadbalancerinfo-elbinfolist
+	ElbInfoList []DeploymentGroup_ELBInfo `json:"ElbInfoList,omitempty"`
+
+	// TargetGroupInfoList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-loadbalancerinfo.html#cfn-codedeploy-deploymentgroup-loadbalancerinfo-targetgroupinfolist
+	TargetGroupInfoList []DeploymentGroup_TargetGroupInfo `json:"TargetGroupInfoList,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentGroup_LoadBalancerInfo) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.LoadBalancerInfo"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagset.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagset.go
new file mode 100644
index 0000000000..f692f51ec1
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagset.go
@@ -0,0 +1,35 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_OnPremisesTagSet AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-onpremisestagset.html
+type DeploymentGroup_OnPremisesTagSet struct {
+
+	// OnPremisesTagSetList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-onpremisestagset.html#cfn-codedeploy-deploymentgroup-onpremisestagset-onpremisestagsetlist
+	OnPremisesTagSetList []DeploymentGroup_OnPremisesTagSetListObject `json:"OnPremisesTagSetList,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentGroup_OnPremisesTagSet) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSet"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagsetlistobject.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagsetlistobject.go
new file mode 100644
index 0000000000..c19b29c9cb
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_onpremisestagsetlistobject.go
@@ -0,0 +1,35 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_OnPremisesTagSetListObject AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSetListObject)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-onpremisestagsetlistobject.html
+type DeploymentGroup_OnPremisesTagSetListObject struct {
+
+	// OnPremisesTagGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-onpremisestagsetlistobject.html#cfn-codedeploy-deploymentgroup-onpremisestagsetlistobject-onpremisestaggroup
+	OnPremisesTagGroup []DeploymentGroup_TagFilter `json:"OnPremisesTagGroup,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentGroup_OnPremisesTagSetListObject) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSetListObject"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_revisionlocation.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_revisionlocation.go
new file mode 100644
index 0000000000..fb18710b25
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_revisionlocation.go
@@ -0,0 +1,47 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_RevisionLocation AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.RevisionLocation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision.html
+type DeploymentGroup_RevisionLocation struct {
+
+	// GitHubLocation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision-githublocation
+	GitHubLocation *DeploymentGroup_GitHubLocation `json:"GitHubLocation,omitempty"`
+
+	// RevisionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision-revisiontype
+	RevisionType *types.Value `json:"RevisionType,omitempty"`
+
+	// S3Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision-s3location
+	S3Location *DeploymentGroup_S3Location `json:"S3Location,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentGroup_RevisionLocation) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.RevisionLocation"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_s3location.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_s3location.go
new file mode 100644
index 0000000000..004d48fc50
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_s3location.go
@@ -0,0 +1,57 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_S3Location AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.S3Location)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision-s3location.html
+type DeploymentGroup_S3Location struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision-s3location.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision-s3location-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// BundleType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision-s3location.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision-s3location-bundletype
+	BundleType *types.Value `json:"BundleType,omitempty"`
+
+	// ETag AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision-s3location.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision-s3location-etag
+	ETag *types.Value `json:"ETag,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision-s3location.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision-s3location-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-deployment-revision-s3location.html#cfn-properties-codedeploy-deploymentgroup-deployment-revision-s3location-value
+	Version *types.Value `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 *DeploymentGroup_S3Location) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.S3Location"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_tagfilter.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_tagfilter.go
new file mode 100644
index 0000000000..fd646820ce
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_tagfilter.go
@@ -0,0 +1,47 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_TagFilter AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.TagFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-tagfilter.html
+type DeploymentGroup_TagFilter struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-tagfilter.html#cfn-codedeploy-deploymentgroup-tagfilter-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-tagfilter.html#cfn-codedeploy-deploymentgroup-tagfilter-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-tagfilter.html#cfn-codedeploy-deploymentgroup-tagfilter-value
+	Value *types.Value `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 *DeploymentGroup_TagFilter) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.TagFilter"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_targetgroupinfo.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_targetgroupinfo.go
new file mode 100644
index 0000000000..7a62554df6
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_targetgroupinfo.go
@@ -0,0 +1,37 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_TargetGroupInfo AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.TargetGroupInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-targetgroupinfo.html
+type DeploymentGroup_TargetGroupInfo struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-targetgroupinfo.html#cfn-codedeploy-deploymentgroup-targetgroupinfo-name
+	Name *types.Value `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 *DeploymentGroup_TargetGroupInfo) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.TargetGroupInfo"
+}
diff --git a/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_triggerconfig.go b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_triggerconfig.go
new file mode 100644
index 0000000000..4a44ce98f5
--- /dev/null
+++ b/goformation/cloudformation/codedeploy/aws-codedeploy-deploymentgroup_triggerconfig.go
@@ -0,0 +1,47 @@
+package codedeploy
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeploymentGroup_TriggerConfig AWS CloudFormation Resource (AWS::CodeDeploy::DeploymentGroup.TriggerConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-triggerconfig.html
+type DeploymentGroup_TriggerConfig struct {
+
+	// TriggerEvents AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-triggerconfig.html#cfn-codedeploy-deploymentgroup-triggerconfig-triggerevents
+	TriggerEvents *types.Value `json:"TriggerEvents,omitempty"`
+
+	// TriggerName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-triggerconfig.html#cfn-codedeploy-deploymentgroup-triggerconfig-triggername
+	TriggerName *types.Value `json:"TriggerName,omitempty"`
+
+	// TriggerTargetArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codedeploy-deploymentgroup-triggerconfig.html#cfn-codedeploy-deploymentgroup-triggerconfig-triggertargetarn
+	TriggerTargetArn *types.Value `json:"TriggerTargetArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeploymentGroup_TriggerConfig) AWSCloudFormationType() string {
+	return "AWS::CodeDeploy::DeploymentGroup.TriggerConfig"
+}
diff --git a/goformation/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup.go b/goformation/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup.go
new file mode 100644
index 0000000000..26017ffc3e
--- /dev/null
+++ b/goformation/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup.go
@@ -0,0 +1,129 @@
+package codeguruprofiler
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ProfilingGroup AWS CloudFormation Resource (AWS::CodeGuruProfiler::ProfilingGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeguruprofiler-profilinggroup.html
+type ProfilingGroup struct {
+
+	// AgentPermissions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeguruprofiler-profilinggroup.html#cfn-codeguruprofiler-profilinggroup-agentpermissions
+	AgentPermissions interface{} `json:"AgentPermissions,omitempty"`
+
+	// AnomalyDetectionNotificationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeguruprofiler-profilinggroup.html#cfn-codeguruprofiler-profilinggroup-anomalydetectionnotificationconfiguration
+	AnomalyDetectionNotificationConfiguration []ProfilingGroup_Channel `json:"AnomalyDetectionNotificationConfiguration,omitempty"`
+
+	// ComputePlatform AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeguruprofiler-profilinggroup.html#cfn-codeguruprofiler-profilinggroup-computeplatform
+	ComputePlatform *types.Value `json:"ComputePlatform,omitempty"`
+
+	// ProfilingGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeguruprofiler-profilinggroup.html#cfn-codeguruprofiler-profilinggroup-profilinggroupname
+	ProfilingGroupName *types.Value `json:"ProfilingGroupName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codeguruprofiler-profilinggroup.html#cfn-codeguruprofiler-profilinggroup-tags
+	Tags []cloudformation.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 *ProfilingGroup) AWSCloudFormationType() string {
+	return "AWS::CodeGuruProfiler::ProfilingGroup"
+}
+
+// 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 ProfilingGroup) MarshalJSON() ([]byte, error) {
+	type Properties ProfilingGroup
+	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 *ProfilingGroup) UnmarshalJSON(b []byte) error {
+	type Properties ProfilingGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ProfilingGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup_channel.go b/goformation/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup_channel.go
new file mode 100644
index 0000000000..a161015acc
--- /dev/null
+++ b/goformation/cloudformation/codeguruprofiler/aws-codeguruprofiler-profilinggroup_channel.go
@@ -0,0 +1,42 @@
+package codeguruprofiler
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ProfilingGroup_Channel AWS CloudFormation Resource (AWS::CodeGuruProfiler::ProfilingGroup.Channel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codeguruprofiler-profilinggroup-channel.html
+type ProfilingGroup_Channel struct {
+
+	// channelId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codeguruprofiler-profilinggroup-channel.html#cfn-codeguruprofiler-profilinggroup-channel-channelid
+	channelId *types.Value `json:"channelId,omitempty"`
+
+	// channelUri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codeguruprofiler-profilinggroup-channel.html#cfn-codeguruprofiler-profilinggroup-channel-channeluri
+	channelUri *types.Value `json:"channelUri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ProfilingGroup_Channel) AWSCloudFormationType() string {
+	return "AWS::CodeGuruProfiler::ProfilingGroup.Channel"
+}
diff --git a/goformation/cloudformation/codegurureviewer/aws-codegurureviewer-repositoryassociation.go b/goformation/cloudformation/codegurureviewer/aws-codegurureviewer-repositoryassociation.go
new file mode 100644
index 0000000000..4163b22f76
--- /dev/null
+++ b/goformation/cloudformation/codegurureviewer/aws-codegurureviewer-repositoryassociation.go
@@ -0,0 +1,134 @@
+package codegurureviewer
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// RepositoryAssociation AWS CloudFormation Resource (AWS::CodeGuruReviewer::RepositoryAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codegurureviewer-repositoryassociation.html
+type RepositoryAssociation struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codegurureviewer-repositoryassociation.html#cfn-codegurureviewer-repositoryassociation-bucketname
+	BucketName *types.Value `json:"BucketName,omitempty"`
+
+	// ConnectionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codegurureviewer-repositoryassociation.html#cfn-codegurureviewer-repositoryassociation-connectionarn
+	ConnectionArn *types.Value `json:"ConnectionArn,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codegurureviewer-repositoryassociation.html#cfn-codegurureviewer-repositoryassociation-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Owner AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codegurureviewer-repositoryassociation.html#cfn-codegurureviewer-repositoryassociation-owner
+	Owner *types.Value `json:"Owner,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codegurureviewer-repositoryassociation.html#cfn-codegurureviewer-repositoryassociation-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codegurureviewer-repositoryassociation.html#cfn-codegurureviewer-repositoryassociation-type
+	Type *types.Value `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 *RepositoryAssociation) AWSCloudFormationType() string {
+	return "AWS::CodeGuruReviewer::RepositoryAssociation"
+}
+
+// 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 RepositoryAssociation) MarshalJSON() ([]byte, error) {
+	type Properties RepositoryAssociation
+	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 *RepositoryAssociation) UnmarshalJSON(b []byte) error {
+	type Properties RepositoryAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RepositoryAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype.go b/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype.go
new file mode 100644
index 0000000000..5410d968cc
--- /dev/null
+++ b/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype.go
@@ -0,0 +1,144 @@
+package codepipeline
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// CustomActionType AWS CloudFormation Resource (AWS::CodePipeline::CustomActionType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-customactiontype.html
+type CustomActionType struct {
+
+	// Category AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-customactiontype.html#cfn-codepipeline-customactiontype-category
+	Category *types.Value `json:"Category,omitempty"`
+
+	// ConfigurationProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-customactiontype.html#cfn-codepipeline-customactiontype-configurationproperties
+	ConfigurationProperties []CustomActionType_ConfigurationProperties `json:"ConfigurationProperties,omitempty"`
+
+	// InputArtifactDetails AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-customactiontype.html#cfn-codepipeline-customactiontype-inputartifactdetails
+	InputArtifactDetails *CustomActionType_ArtifactDetails `json:"InputArtifactDetails,omitempty"`
+
+	// OutputArtifactDetails AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-customactiontype.html#cfn-codepipeline-customactiontype-outputartifactdetails
+	OutputArtifactDetails *CustomActionType_ArtifactDetails `json:"OutputArtifactDetails,omitempty"`
+
+	// Provider AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-customactiontype.html#cfn-codepipeline-customactiontype-provider
+	Provider *types.Value `json:"Provider,omitempty"`
+
+	// Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-customactiontype.html#cfn-codepipeline-customactiontype-settings
+	Settings *CustomActionType_Settings `json:"Settings,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-customactiontype.html#cfn-codepipeline-customactiontype-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-customactiontype.html#cfn-codepipeline-customactiontype-version
+	Version *types.Value `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 *CustomActionType) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::CustomActionType"
+}
+
+// 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 CustomActionType) MarshalJSON() ([]byte, error) {
+	type Properties CustomActionType
+	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 *CustomActionType) UnmarshalJSON(b []byte) error {
+	type Properties CustomActionType
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CustomActionType(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_artifactdetails.go b/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_artifactdetails.go
new file mode 100644
index 0000000000..6d8980afa4
--- /dev/null
+++ b/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_artifactdetails.go
@@ -0,0 +1,42 @@
+package codepipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CustomActionType_ArtifactDetails AWS CloudFormation Resource (AWS::CodePipeline::CustomActionType.ArtifactDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-artifactdetails.html
+type CustomActionType_ArtifactDetails struct {
+
+	// MaximumCount AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-artifactdetails.html#cfn-codepipeline-customactiontype-artifactdetails-maximumcount
+	MaximumCount *types.Value `json:"MaximumCount"`
+
+	// MinimumCount AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-artifactdetails.html#cfn-codepipeline-customactiontype-artifactdetails-minimumcount
+	MinimumCount *types.Value `json:"MinimumCount"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CustomActionType_ArtifactDetails) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::CustomActionType.ArtifactDetails"
+}
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_configurationproperties.go b/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_configurationproperties.go
new file mode 100644
index 0000000000..a8fc78b189
--- /dev/null
+++ b/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_configurationproperties.go
@@ -0,0 +1,67 @@
+package codepipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CustomActionType_ConfigurationProperties AWS CloudFormation Resource (AWS::CodePipeline::CustomActionType.ConfigurationProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-configurationproperties.html
+type CustomActionType_ConfigurationProperties struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-configurationproperties.html#cfn-codepipeline-customactiontype-configurationproperties-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-configurationproperties.html#cfn-codepipeline-customactiontype-configurationproperties-key
+	Key *types.Value `json:"Key"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-configurationproperties.html#cfn-codepipeline-customactiontype-configurationproperties-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Queryable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-configurationproperties.html#cfn-codepipeline-customactiontype-configurationproperties-queryable
+	Queryable *types.Value `json:"Queryable,omitempty"`
+
+	// Required AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-configurationproperties.html#cfn-codepipeline-customactiontype-configurationproperties-required
+	Required *types.Value `json:"Required"`
+
+	// Secret AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-configurationproperties.html#cfn-codepipeline-customactiontype-configurationproperties-secret
+	Secret *types.Value `json:"Secret"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-configurationproperties.html#cfn-codepipeline-customactiontype-configurationproperties-type
+	Type *types.Value `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 *CustomActionType_ConfigurationProperties) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::CustomActionType.ConfigurationProperties"
+}
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_settings.go b/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_settings.go
new file mode 100644
index 0000000000..fb8b89d268
--- /dev/null
+++ b/goformation/cloudformation/codepipeline/aws-codepipeline-customactiontype_settings.go
@@ -0,0 +1,52 @@
+package codepipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CustomActionType_Settings AWS CloudFormation Resource (AWS::CodePipeline::CustomActionType.Settings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-settings.html
+type CustomActionType_Settings struct {
+
+	// EntityUrlTemplate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-settings.html#cfn-codepipeline-customactiontype-settings-entityurltemplate
+	EntityUrlTemplate *types.Value `json:"EntityUrlTemplate,omitempty"`
+
+	// ExecutionUrlTemplate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-settings.html#cfn-codepipeline-customactiontype-settings-executionurltemplate
+	ExecutionUrlTemplate *types.Value `json:"ExecutionUrlTemplate,omitempty"`
+
+	// RevisionUrlTemplate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-settings.html#cfn-codepipeline-customactiontype-settings-revisionurltemplate
+	RevisionUrlTemplate *types.Value `json:"RevisionUrlTemplate,omitempty"`
+
+	// ThirdPartyConfigurationUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-customactiontype-settings.html#cfn-codepipeline-customactiontype-settings-thirdpartyconfigurationurl
+	ThirdPartyConfigurationUrl *types.Value `json:"ThirdPartyConfigurationUrl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CustomActionType_Settings) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::CustomActionType.Settings"
+}
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline.go b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline.go
new file mode 100644
index 0000000000..7d524b870a
--- /dev/null
+++ b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline.go
@@ -0,0 +1,144 @@
+package codepipeline
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline AWS CloudFormation Resource (AWS::CodePipeline::Pipeline)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-pipeline.html
+type Pipeline struct {
+
+	// ArtifactStore AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-pipeline.html#cfn-codepipeline-pipeline-artifactstore
+	ArtifactStore *Pipeline_ArtifactStore `json:"ArtifactStore,omitempty"`
+
+	// ArtifactStores AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-pipeline.html#cfn-codepipeline-pipeline-artifactstores
+	ArtifactStores []Pipeline_ArtifactStoreMap `json:"ArtifactStores,omitempty"`
+
+	// DisableInboundStageTransitions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-pipeline.html#cfn-codepipeline-pipeline-disableinboundstagetransitions
+	DisableInboundStageTransitions []Pipeline_StageTransition `json:"DisableInboundStageTransitions,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-pipeline.html#cfn-codepipeline-pipeline-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RestartExecutionOnUpdate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-pipeline.html#cfn-codepipeline-pipeline-restartexecutiononupdate
+	RestartExecutionOnUpdate *types.Value `json:"RestartExecutionOnUpdate,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-pipeline.html#cfn-codepipeline-pipeline-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Stages AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-pipeline.html#cfn-codepipeline-pipeline-stages
+	Stages []Pipeline_StageDeclaration `json:"Stages,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-pipeline.html#cfn-codepipeline-pipeline-tags
+	Tags []cloudformation.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 *Pipeline) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::Pipeline"
+}
+
+// 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 Pipeline) MarshalJSON() ([]byte, error) {
+	type Properties Pipeline
+	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 *Pipeline) UnmarshalJSON(b []byte) error {
+	type Properties Pipeline
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Pipeline(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_actiondeclaration.go b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_actiondeclaration.go
new file mode 100644
index 0000000000..e97ccd912d
--- /dev/null
+++ b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_actiondeclaration.go
@@ -0,0 +1,77 @@
+package codepipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// 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
+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
+	ActionTypeId *Pipeline_ActionTypeId `json:"ActionTypeId,omitempty"`
+
+	// 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
+	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
+	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
+	Name *types.Value `json:"Name,omitempty"`
+
+	// 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
+	Namespace *types.Value `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
+	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
+	Region *types.Value `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
+	RoleArn *types.Value `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
+	RunOrder *types.Value `json:"RunOrder,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ActionDeclaration) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::Pipeline.ActionDeclaration"
+}
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_actiontypeid.go b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_actiontypeid.go
new file mode 100644
index 0000000000..7de517fa2a
--- /dev/null
+++ b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_actiontypeid.go
@@ -0,0 +1,52 @@
+package codepipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// 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
+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
+	Category *types.Value `json:"Category,omitempty"`
+
+	// 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
+	Owner *types.Value `json:"Owner,omitempty"`
+
+	// 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
+	Provider *types.Value `json:"Provider,omitempty"`
+
+	// 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
+	Version *types.Value `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_ActionTypeId) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::Pipeline.ActionTypeId"
+}
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstore.go b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstore.go
new file mode 100644
index 0000000000..3fe27d5b1d
--- /dev/null
+++ b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstore.go
@@ -0,0 +1,47 @@
+package codepipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_ArtifactStore AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.ArtifactStore)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-artifactstore.html
+type Pipeline_ArtifactStore struct {
+
+	// EncryptionKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-artifactstore.html#cfn-codepipeline-pipeline-artifactstore-encryptionkey
+	EncryptionKey *Pipeline_EncryptionKey `json:"EncryptionKey,omitempty"`
+
+	// Location AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-artifactstore.html#cfn-codepipeline-pipeline-artifactstore-location
+	Location *types.Value `json:"Location,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-artifactstore.html#cfn-codepipeline-pipeline-artifactstore-type
+	Type *types.Value `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 *Pipeline_ArtifactStore) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::Pipeline.ArtifactStore"
+}
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstoremap.go b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstoremap.go
new file mode 100644
index 0000000000..a65c53a0cd
--- /dev/null
+++ b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_artifactstoremap.go
@@ -0,0 +1,42 @@
+package codepipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_ArtifactStoreMap AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.ArtifactStoreMap)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-artifactstoremap.html
+type Pipeline_ArtifactStoreMap struct {
+
+	// ArtifactStore AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-artifactstoremap.html#cfn-codepipeline-pipeline-artifactstoremap-artifactstore
+	ArtifactStore *Pipeline_ArtifactStore `json:"ArtifactStore,omitempty"`
+
+	// Region AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-artifactstoremap.html#cfn-codepipeline-pipeline-artifactstoremap-region
+	Region *types.Value `json:"Region,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ArtifactStoreMap) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::Pipeline.ArtifactStoreMap"
+}
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_blockerdeclaration.go b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_blockerdeclaration.go
new file mode 100644
index 0000000000..e6812ce84a
--- /dev/null
+++ b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_blockerdeclaration.go
@@ -0,0 +1,42 @@
+package codepipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// 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
+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
+	Name *types.Value `json:"Name,omitempty"`
+
+	// 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
+	Type *types.Value `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 *Pipeline_BlockerDeclaration) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::Pipeline.BlockerDeclaration"
+}
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_encryptionkey.go b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_encryptionkey.go
new file mode 100644
index 0000000000..2551662562
--- /dev/null
+++ b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_encryptionkey.go
@@ -0,0 +1,42 @@
+package codepipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// 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
+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
+	Id *types.Value `json:"Id,omitempty"`
+
+	// 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
+	Type *types.Value `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 *Pipeline_EncryptionKey) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::Pipeline.EncryptionKey"
+}
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_inputartifact.go b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_inputartifact.go
new file mode 100644
index 0000000000..87760e1b4b
--- /dev/null
+++ b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_inputartifact.go
@@ -0,0 +1,37 @@
+package codepipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// 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
+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
+	Name *types.Value `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 *Pipeline_InputArtifact) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::Pipeline.InputArtifact"
+}
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_outputartifact.go b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_outputartifact.go
new file mode 100644
index 0000000000..cb22f660c6
--- /dev/null
+++ b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_outputartifact.go
@@ -0,0 +1,37 @@
+package codepipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// 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
+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
+	Name *types.Value `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 *Pipeline_OutputArtifact) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::Pipeline.OutputArtifact"
+}
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_stagedeclaration.go b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_stagedeclaration.go
new file mode 100644
index 0000000000..c2086addb2
--- /dev/null
+++ b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_stagedeclaration.go
@@ -0,0 +1,47 @@
+package codepipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_StageDeclaration AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.StageDeclaration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-stages.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
+	Actions []Pipeline_ActionDeclaration `json:"Actions,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
+	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
+	Name *types.Value `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 *Pipeline_StageDeclaration) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::Pipeline.StageDeclaration"
+}
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_stagetransition.go b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_stagetransition.go
new file mode 100644
index 0000000000..4896f64755
--- /dev/null
+++ b/goformation/cloudformation/codepipeline/aws-codepipeline-pipeline_stagetransition.go
@@ -0,0 +1,42 @@
+package codepipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_StageTransition AWS CloudFormation Resource (AWS::CodePipeline::Pipeline.StageTransition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-pipeline-disableinboundstagetransitions.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
+	Reason *types.Value `json:"Reason,omitempty"`
+
+	// 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
+	StageName *types.Value `json:"StageName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_StageTransition) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::Pipeline.StageTransition"
+}
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-webhook.go b/goformation/cloudformation/codepipeline/aws-codepipeline-webhook.go
new file mode 100644
index 0000000000..69ccae9ba4
--- /dev/null
+++ b/goformation/cloudformation/codepipeline/aws-codepipeline-webhook.go
@@ -0,0 +1,143 @@
+package codepipeline
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Webhook AWS CloudFormation Resource (AWS::CodePipeline::Webhook)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-webhook.html
+type Webhook struct {
+
+	// Authentication AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-webhook.html#cfn-codepipeline-webhook-authentication
+	Authentication *types.Value `json:"Authentication,omitempty"`
+
+	// AuthenticationConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-webhook.html#cfn-codepipeline-webhook-authenticationconfiguration
+	AuthenticationConfiguration *Webhook_WebhookAuthConfiguration `json:"AuthenticationConfiguration,omitempty"`
+
+	// Filters AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-webhook.html#cfn-codepipeline-webhook-filters
+	Filters []Webhook_WebhookFilterRule `json:"Filters,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-webhook.html#cfn-codepipeline-webhook-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RegisterWithThirdParty AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-webhook.html#cfn-codepipeline-webhook-registerwiththirdparty
+	RegisterWithThirdParty *types.Value `json:"RegisterWithThirdParty,omitempty"`
+
+	// TargetAction AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-webhook.html#cfn-codepipeline-webhook-targetaction
+	TargetAction *types.Value `json:"TargetAction,omitempty"`
+
+	// TargetPipeline AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-webhook.html#cfn-codepipeline-webhook-targetpipeline
+	TargetPipeline *types.Value `json:"TargetPipeline,omitempty"`
+
+	// TargetPipelineVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codepipeline-webhook.html#cfn-codepipeline-webhook-targetpipelineversion
+	TargetPipelineVersion *types.Value `json:"TargetPipelineVersion"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Webhook) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::Webhook"
+}
+
+// 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 Webhook) MarshalJSON() ([]byte, error) {
+	type Properties Webhook
+	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 *Webhook) UnmarshalJSON(b []byte) error {
+	type Properties Webhook
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Webhook(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/codepipeline/aws-codepipeline-webhook_webhookauthconfiguration.go b/goformation/cloudformation/codepipeline/aws-codepipeline-webhook_webhookauthconfiguration.go
new file mode 100644
index 0000000000..8c89f49115
--- /dev/null
+++ b/goformation/cloudformation/codepipeline/aws-codepipeline-webhook_webhookauthconfiguration.go
@@ -0,0 +1,42 @@
+package codepipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Webhook_WebhookAuthConfiguration AWS CloudFormation Resource (AWS::CodePipeline::Webhook.WebhookAuthConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-webhook-webhookauthconfiguration.html
+type Webhook_WebhookAuthConfiguration struct {
+
+	// AllowedIPRange AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-webhook-webhookauthconfiguration.html#cfn-codepipeline-webhook-webhookauthconfiguration-allowediprange
+	AllowedIPRange *types.Value `json:"AllowedIPRange,omitempty"`
+
+	// SecretToken AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-webhook-webhookauthconfiguration.html#cfn-codepipeline-webhook-webhookauthconfiguration-secrettoken
+	SecretToken *types.Value `json:"SecretToken,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Webhook_WebhookAuthConfiguration) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::Webhook.WebhookAuthConfiguration"
+}
diff --git a/goformation/cloudformation/codepipeline/aws-codepipeline-webhook_webhookfilterrule.go b/goformation/cloudformation/codepipeline/aws-codepipeline-webhook_webhookfilterrule.go
new file mode 100644
index 0000000000..9e60fc38e8
--- /dev/null
+++ b/goformation/cloudformation/codepipeline/aws-codepipeline-webhook_webhookfilterrule.go
@@ -0,0 +1,42 @@
+package codepipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Webhook_WebhookFilterRule AWS CloudFormation Resource (AWS::CodePipeline::Webhook.WebhookFilterRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-webhook-webhookfilterrule.html
+type Webhook_WebhookFilterRule struct {
+
+	// JsonPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-webhook-webhookfilterrule.html#cfn-codepipeline-webhook-webhookfilterrule-jsonpath
+	JsonPath *types.Value `json:"JsonPath,omitempty"`
+
+	// MatchEquals AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codepipeline-webhook-webhookfilterrule.html#cfn-codepipeline-webhook-webhookfilterrule-matchequals
+	MatchEquals *types.Value `json:"MatchEquals,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Webhook_WebhookFilterRule) AWSCloudFormationType() string {
+	return "AWS::CodePipeline::Webhook.WebhookFilterRule"
+}
diff --git a/goformation/cloudformation/codestar/aws-codestar-githubrepository.go b/goformation/cloudformation/codestar/aws-codestar-githubrepository.go
new file mode 100644
index 0000000000..8b36a38337
--- /dev/null
+++ b/goformation/cloudformation/codestar/aws-codestar-githubrepository.go
@@ -0,0 +1,143 @@
+package codestar
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GitHubRepository AWS CloudFormation Resource (AWS::CodeStar::GitHubRepository)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestar-githubrepository.html
+type GitHubRepository struct {
+
+	// Code AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestar-githubrepository.html#cfn-codestar-githubrepository-code
+	Code *GitHubRepository_Code `json:"Code,omitempty"`
+
+	// ConnectionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestar-githubrepository.html#cfn-codestar-githubrepository-connectionarn
+	ConnectionArn *types.Value `json:"ConnectionArn,omitempty"`
+
+	// EnableIssues AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestar-githubrepository.html#cfn-codestar-githubrepository-enableissues
+	EnableIssues *types.Value `json:"EnableIssues,omitempty"`
+
+	// IsPrivate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestar-githubrepository.html#cfn-codestar-githubrepository-isprivate
+	IsPrivate *types.Value `json:"IsPrivate,omitempty"`
+
+	// RepositoryAccessToken AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestar-githubrepository.html#cfn-codestar-githubrepository-repositoryaccesstoken
+	RepositoryAccessToken *types.Value `json:"RepositoryAccessToken,omitempty"`
+
+	// RepositoryDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestar-githubrepository.html#cfn-codestar-githubrepository-repositorydescription
+	RepositoryDescription *types.Value `json:"RepositoryDescription,omitempty"`
+
+	// RepositoryName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestar-githubrepository.html#cfn-codestar-githubrepository-repositoryname
+	RepositoryName *types.Value `json:"RepositoryName,omitempty"`
+
+	// RepositoryOwner AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestar-githubrepository.html#cfn-codestar-githubrepository-repositoryowner
+	RepositoryOwner *types.Value `json:"RepositoryOwner,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GitHubRepository) AWSCloudFormationType() string {
+	return "AWS::CodeStar::GitHubRepository"
+}
+
+// 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 GitHubRepository) MarshalJSON() ([]byte, error) {
+	type Properties GitHubRepository
+	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 *GitHubRepository) UnmarshalJSON(b []byte) error {
+	type Properties GitHubRepository
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = GitHubRepository(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/codestar/aws-codestar-githubrepository_code.go b/goformation/cloudformation/codestar/aws-codestar-githubrepository_code.go
new file mode 100644
index 0000000000..c894a21ede
--- /dev/null
+++ b/goformation/cloudformation/codestar/aws-codestar-githubrepository_code.go
@@ -0,0 +1,35 @@
+package codestar
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// GitHubRepository_Code AWS CloudFormation Resource (AWS::CodeStar::GitHubRepository.Code)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codestar-githubrepository-code.html
+type GitHubRepository_Code struct {
+
+	// S3 AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codestar-githubrepository-code.html#cfn-codestar-githubrepository-code-s3
+	S3 *GitHubRepository_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 *GitHubRepository_Code) AWSCloudFormationType() string {
+	return "AWS::CodeStar::GitHubRepository.Code"
+}
diff --git a/goformation/cloudformation/codestar/aws-codestar-githubrepository_s3.go b/goformation/cloudformation/codestar/aws-codestar-githubrepository_s3.go
new file mode 100644
index 0000000000..c21604a03f
--- /dev/null
+++ b/goformation/cloudformation/codestar/aws-codestar-githubrepository_s3.go
@@ -0,0 +1,47 @@
+package codestar
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GitHubRepository_S3 AWS CloudFormation Resource (AWS::CodeStar::GitHubRepository.S3)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codestar-githubrepository-s3.html
+type GitHubRepository_S3 struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codestar-githubrepository-s3.html#cfn-codestar-githubrepository-s3-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codestar-githubrepository-s3.html#cfn-codestar-githubrepository-s3-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// ObjectVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codestar-githubrepository-s3.html#cfn-codestar-githubrepository-s3-objectversion
+	ObjectVersion *types.Value `json:"ObjectVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GitHubRepository_S3) AWSCloudFormationType() string {
+	return "AWS::CodeStar::GitHubRepository.S3"
+}
diff --git a/goformation/cloudformation/codestarconnections/aws-codestarconnections-connection.go b/goformation/cloudformation/codestarconnections/aws-codestarconnections-connection.go
new file mode 100644
index 0000000000..e7cecf16d8
--- /dev/null
+++ b/goformation/cloudformation/codestarconnections/aws-codestarconnections-connection.go
@@ -0,0 +1,124 @@
+package codestarconnections
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Connection AWS CloudFormation Resource (AWS::CodeStarConnections::Connection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestarconnections-connection.html
+type Connection struct {
+
+	// ConnectionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestarconnections-connection.html#cfn-codestarconnections-connection-connectionname
+	ConnectionName *types.Value `json:"ConnectionName,omitempty"`
+
+	// HostArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestarconnections-connection.html#cfn-codestarconnections-connection-hostarn
+	HostArn *types.Value `json:"HostArn,omitempty"`
+
+	// ProviderType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestarconnections-connection.html#cfn-codestarconnections-connection-providertype
+	ProviderType *types.Value `json:"ProviderType,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestarconnections-connection.html#cfn-codestarconnections-connection-tags
+	Tags []cloudformation.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 *Connection) AWSCloudFormationType() string {
+	return "AWS::CodeStarConnections::Connection"
+}
+
+// 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 Connection) MarshalJSON() ([]byte, error) {
+	type Properties Connection
+	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 *Connection) UnmarshalJSON(b []byte) error {
+	type Properties Connection
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Connection(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule.go b/goformation/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule.go
new file mode 100644
index 0000000000..d5f022f29b
--- /dev/null
+++ b/goformation/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule.go
@@ -0,0 +1,153 @@
+package codestarnotifications
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NotificationRule AWS CloudFormation Resource (AWS::CodeStarNotifications::NotificationRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestarnotifications-notificationrule.html
+type NotificationRule struct {
+
+	// CreatedBy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestarnotifications-notificationrule.html#cfn-codestarnotifications-notificationrule-createdby
+	CreatedBy *types.Value `json:"CreatedBy,omitempty"`
+
+	// DetailType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestarnotifications-notificationrule.html#cfn-codestarnotifications-notificationrule-detailtype
+	DetailType *types.Value `json:"DetailType,omitempty"`
+
+	// EventTypeId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestarnotifications-notificationrule.html#cfn-codestarnotifications-notificationrule-eventtypeid
+	EventTypeId *types.Value `json:"EventTypeId,omitempty"`
+
+	// EventTypeIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestarnotifications-notificationrule.html#cfn-codestarnotifications-notificationrule-eventtypeids
+	EventTypeIds *types.Value `json:"EventTypeIds,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestarnotifications-notificationrule.html#cfn-codestarnotifications-notificationrule-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Resource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestarnotifications-notificationrule.html#cfn-codestarnotifications-notificationrule-resource
+	Resource *types.Value `json:"Resource,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestarnotifications-notificationrule.html#cfn-codestarnotifications-notificationrule-status
+	Status *types.Value `json:"Status,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestarnotifications-notificationrule.html#cfn-codestarnotifications-notificationrule-tags
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// TargetAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestarnotifications-notificationrule.html#cfn-codestarnotifications-notificationrule-targetaddress
+	TargetAddress *types.Value `json:"TargetAddress,omitempty"`
+
+	// Targets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-codestarnotifications-notificationrule.html#cfn-codestarnotifications-notificationrule-targets
+	Targets []NotificationRule_Target `json:"Targets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NotificationRule) AWSCloudFormationType() string {
+	return "AWS::CodeStarNotifications::NotificationRule"
+}
+
+// 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 NotificationRule) MarshalJSON() ([]byte, error) {
+	type Properties NotificationRule
+	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 *NotificationRule) UnmarshalJSON(b []byte) error {
+	type Properties NotificationRule
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = NotificationRule(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule_target.go b/goformation/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule_target.go
new file mode 100644
index 0000000000..2fafbb02f2
--- /dev/null
+++ b/goformation/cloudformation/codestarnotifications/aws-codestarnotifications-notificationrule_target.go
@@ -0,0 +1,42 @@
+package codestarnotifications
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NotificationRule_Target AWS CloudFormation Resource (AWS::CodeStarNotifications::NotificationRule.Target)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codestarnotifications-notificationrule-target.html
+type NotificationRule_Target struct {
+
+	// TargetAddress AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codestarnotifications-notificationrule-target.html#cfn-codestarnotifications-notificationrule-target-targetaddress
+	TargetAddress *types.Value `json:"TargetAddress,omitempty"`
+
+	// TargetType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-codestarnotifications-notificationrule-target.html#cfn-codestarnotifications-notificationrule-target-targettype
+	TargetType *types.Value `json:"TargetType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NotificationRule_Target) AWSCloudFormationType() string {
+	return "AWS::CodeStarNotifications::NotificationRule.Target"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-identitypool.go b/goformation/cloudformation/cognito/aws-cognito-identitypool.go
new file mode 100644
index 0000000000..b39014d8da
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-identitypool.go
@@ -0,0 +1,158 @@
+package cognito
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// IdentityPool AWS CloudFormation Resource (AWS::Cognito::IdentityPool)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html
+type IdentityPool struct {
+
+	// AllowClassicFlow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-allowclassicflow
+	AllowClassicFlow *types.Value `json:"AllowClassicFlow,omitempty"`
+
+	// AllowUnauthenticatedIdentities AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-allowunauthenticatedidentities
+	AllowUnauthenticatedIdentities *types.Value `json:"AllowUnauthenticatedIdentities"`
+
+	// CognitoEvents AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-cognitoevents
+	CognitoEvents interface{} `json:"CognitoEvents,omitempty"`
+
+	// CognitoIdentityProviders AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-cognitoidentityproviders
+	CognitoIdentityProviders []IdentityPool_CognitoIdentityProvider `json:"CognitoIdentityProviders,omitempty"`
+
+	// CognitoStreams AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-cognitostreams
+	CognitoStreams *IdentityPool_CognitoStreams `json:"CognitoStreams,omitempty"`
+
+	// DeveloperProviderName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-developerprovidername
+	DeveloperProviderName *types.Value `json:"DeveloperProviderName,omitempty"`
+
+	// IdentityPoolName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-identitypoolname
+	IdentityPoolName *types.Value `json:"IdentityPoolName,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
+	OpenIdConnectProviderARNs *types.Value `json:"OpenIdConnectProviderARNs,omitempty"`
+
+	// PushSync AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-pushsync
+	PushSync *IdentityPool_PushSync `json:"PushSync,omitempty"`
+
+	// SamlProviderARNs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-samlproviderarns
+	SamlProviderARNs *types.Value `json:"SamlProviderARNs,omitempty"`
+
+	// SupportedLoginProviders AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypool.html#cfn-cognito-identitypool-supportedloginproviders
+	SupportedLoginProviders interface{} `json:"SupportedLoginProviders,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *IdentityPool) AWSCloudFormationType() string {
+	return "AWS::Cognito::IdentityPool"
+}
+
+// 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 IdentityPool) MarshalJSON() ([]byte, error) {
+	type Properties IdentityPool
+	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 *IdentityPool) UnmarshalJSON(b []byte) error {
+	type Properties IdentityPool
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = IdentityPool(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cognito/aws-cognito-identitypool_cognitoidentityprovider.go b/goformation/cloudformation/cognito/aws-cognito-identitypool_cognitoidentityprovider.go
new file mode 100644
index 0000000000..7b48104e53
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-identitypool_cognitoidentityprovider.go
@@ -0,0 +1,47 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// IdentityPool_CognitoIdentityProvider AWS CloudFormation Resource (AWS::Cognito::IdentityPool.CognitoIdentityProvider)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-cognitoidentityprovider.html
+type IdentityPool_CognitoIdentityProvider struct {
+
+	// ClientId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-cognitoidentityprovider.html#cfn-cognito-identitypool-cognitoidentityprovider-clientid
+	ClientId *types.Value `json:"ClientId,omitempty"`
+
+	// ProviderName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-cognitoidentityprovider.html#cfn-cognito-identitypool-cognitoidentityprovider-providername
+	ProviderName *types.Value `json:"ProviderName,omitempty"`
+
+	// ServerSideTokenCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-cognitoidentityprovider.html#cfn-cognito-identitypool-cognitoidentityprovider-serversidetokencheck
+	ServerSideTokenCheck *types.Value `json:"ServerSideTokenCheck,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *IdentityPool_CognitoIdentityProvider) AWSCloudFormationType() string {
+	return "AWS::Cognito::IdentityPool.CognitoIdentityProvider"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-identitypool_cognitostreams.go b/goformation/cloudformation/cognito/aws-cognito-identitypool_cognitostreams.go
new file mode 100644
index 0000000000..0ef3c70d61
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-identitypool_cognitostreams.go
@@ -0,0 +1,47 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// IdentityPool_CognitoStreams AWS CloudFormation Resource (AWS::Cognito::IdentityPool.CognitoStreams)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-cognitostreams.html
+type IdentityPool_CognitoStreams struct {
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-cognitostreams.html#cfn-cognito-identitypool-cognitostreams-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// StreamName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-cognitostreams.html#cfn-cognito-identitypool-cognitostreams-streamname
+	StreamName *types.Value `json:"StreamName,omitempty"`
+
+	// StreamingStatus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-cognitostreams.html#cfn-cognito-identitypool-cognitostreams-streamingstatus
+	StreamingStatus *types.Value `json:"StreamingStatus,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *IdentityPool_CognitoStreams) AWSCloudFormationType() string {
+	return "AWS::Cognito::IdentityPool.CognitoStreams"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-identitypool_pushsync.go b/goformation/cloudformation/cognito/aws-cognito-identitypool_pushsync.go
new file mode 100644
index 0000000000..a31fe6b0a7
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-identitypool_pushsync.go
@@ -0,0 +1,42 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// IdentityPool_PushSync AWS CloudFormation Resource (AWS::Cognito::IdentityPool.PushSync)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-pushsync.html
+type IdentityPool_PushSync struct {
+
+	// ApplicationArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-pushsync.html#cfn-cognito-identitypool-pushsync-applicationarns
+	ApplicationArns *types.Value `json:"ApplicationArns,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypool-pushsync.html#cfn-cognito-identitypool-pushsync-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *IdentityPool_PushSync) AWSCloudFormationType() string {
+	return "AWS::Cognito::IdentityPool.PushSync"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment.go b/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment.go
new file mode 100644
index 0000000000..e3a52c4ec2
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment.go
@@ -0,0 +1,118 @@
+package cognito
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// IdentityPoolRoleAttachment AWS CloudFormation Resource (AWS::Cognito::IdentityPoolRoleAttachment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypoolroleattachment.html
+type IdentityPoolRoleAttachment struct {
+
+	// IdentityPoolId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypoolroleattachment.html#cfn-cognito-identitypoolroleattachment-identitypoolid
+	IdentityPoolId *types.Value `json:"IdentityPoolId,omitempty"`
+
+	// RoleMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypoolroleattachment.html#cfn-cognito-identitypoolroleattachment-rolemappings
+	RoleMappings interface{} `json:"RoleMappings,omitempty"`
+
+	// Roles AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-identitypoolroleattachment.html#cfn-cognito-identitypoolroleattachment-roles
+	Roles interface{} `json:"Roles,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *IdentityPoolRoleAttachment) AWSCloudFormationType() string {
+	return "AWS::Cognito::IdentityPoolRoleAttachment"
+}
+
+// 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 IdentityPoolRoleAttachment) MarshalJSON() ([]byte, error) {
+	type Properties IdentityPoolRoleAttachment
+	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 *IdentityPoolRoleAttachment) UnmarshalJSON(b []byte) error {
+	type Properties IdentityPoolRoleAttachment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = IdentityPoolRoleAttachment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_mappingrule.go b/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_mappingrule.go
new file mode 100644
index 0000000000..26cc34b647
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_mappingrule.go
@@ -0,0 +1,52 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// IdentityPoolRoleAttachment_MappingRule AWS CloudFormation Resource (AWS::Cognito::IdentityPoolRoleAttachment.MappingRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-mappingrule.html
+type IdentityPoolRoleAttachment_MappingRule struct {
+
+	// Claim AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-mappingrule.html#cfn-cognito-identitypoolroleattachment-mappingrule-claim
+	Claim *types.Value `json:"Claim,omitempty"`
+
+	// MatchType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-mappingrule.html#cfn-cognito-identitypoolroleattachment-mappingrule-matchtype
+	MatchType *types.Value `json:"MatchType,omitempty"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-mappingrule.html#cfn-cognito-identitypoolroleattachment-mappingrule-rolearn
+	RoleARN *types.Value `json:"RoleARN,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-mappingrule.html#cfn-cognito-identitypoolroleattachment-mappingrule-value
+	Value *types.Value `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 *IdentityPoolRoleAttachment_MappingRule) AWSCloudFormationType() string {
+	return "AWS::Cognito::IdentityPoolRoleAttachment.MappingRule"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rolemapping.go b/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rolemapping.go
new file mode 100644
index 0000000000..d54770b48a
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rolemapping.go
@@ -0,0 +1,52 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// IdentityPoolRoleAttachment_RoleMapping AWS CloudFormation Resource (AWS::Cognito::IdentityPoolRoleAttachment.RoleMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-rolemapping.html
+type IdentityPoolRoleAttachment_RoleMapping struct {
+
+	// AmbiguousRoleResolution AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-rolemapping.html#cfn-cognito-identitypoolroleattachment-rolemapping-ambiguousroleresolution
+	AmbiguousRoleResolution *types.Value `json:"AmbiguousRoleResolution,omitempty"`
+
+	// IdentityProvider AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-rolemapping.html#cfn-cognito-identitypoolroleattachment-rolemapping-identityprovider
+	IdentityProvider *types.Value `json:"IdentityProvider,omitempty"`
+
+	// RulesConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-rolemapping.html#cfn-cognito-identitypoolroleattachment-rolemapping-rulesconfiguration
+	RulesConfiguration *IdentityPoolRoleAttachment_RulesConfigurationType `json:"RulesConfiguration,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-rolemapping.html#cfn-cognito-identitypoolroleattachment-rolemapping-type
+	Type *types.Value `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 *IdentityPoolRoleAttachment_RoleMapping) AWSCloudFormationType() string {
+	return "AWS::Cognito::IdentityPoolRoleAttachment.RoleMapping"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rulesconfigurationtype.go b/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rulesconfigurationtype.go
new file mode 100644
index 0000000000..54458c1ece
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-identitypoolroleattachment_rulesconfigurationtype.go
@@ -0,0 +1,35 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// IdentityPoolRoleAttachment_RulesConfigurationType AWS CloudFormation Resource (AWS::Cognito::IdentityPoolRoleAttachment.RulesConfigurationType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-rulesconfigurationtype.html
+type IdentityPoolRoleAttachment_RulesConfigurationType struct {
+
+	// Rules AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-identitypoolroleattachment-rulesconfigurationtype.html#cfn-cognito-identitypoolroleattachment-rulesconfigurationtype-rules
+	Rules []IdentityPoolRoleAttachment_MappingRule `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 *IdentityPoolRoleAttachment_RulesConfigurationType) AWSCloudFormationType() string {
+	return "AWS::Cognito::IdentityPoolRoleAttachment.RulesConfigurationType"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool.go b/goformation/cloudformation/cognito/aws-cognito-userpool.go
new file mode 100644
index 0000000000..b8ad5c5651
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpool.go
@@ -0,0 +1,213 @@
+package cognito
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPool AWS CloudFormation Resource (AWS::Cognito::UserPool)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html
+type UserPool struct {
+
+	// AccountRecoverySetting AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-accountrecoverysetting
+	AccountRecoverySetting *UserPool_AccountRecoverySetting `json:"AccountRecoverySetting,omitempty"`
+
+	// AdminCreateUserConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-admincreateuserconfig
+	AdminCreateUserConfig *UserPool_AdminCreateUserConfig `json:"AdminCreateUserConfig,omitempty"`
+
+	// AliasAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-aliasattributes
+	AliasAttributes *types.Value `json:"AliasAttributes,omitempty"`
+
+	// AutoVerifiedAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-autoverifiedattributes
+	AutoVerifiedAttributes *types.Value `json:"AutoVerifiedAttributes,omitempty"`
+
+	// DeviceConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-deviceconfiguration
+	DeviceConfiguration *UserPool_DeviceConfiguration `json:"DeviceConfiguration,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
+	EmailConfiguration *UserPool_EmailConfiguration `json:"EmailConfiguration,omitempty"`
+
+	// EmailVerificationMessage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-emailverificationmessage
+	EmailVerificationMessage *types.Value `json:"EmailVerificationMessage,omitempty"`
+
+	// EmailVerificationSubject AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-emailverificationsubject
+	EmailVerificationSubject *types.Value `json:"EmailVerificationSubject,omitempty"`
+
+	// EnabledMfas AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-enabledmfas
+	EnabledMfas *types.Value `json:"EnabledMfas,omitempty"`
+
+	// LambdaConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-lambdaconfig
+	LambdaConfig *UserPool_LambdaConfig `json:"LambdaConfig,omitempty"`
+
+	// MfaConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-mfaconfiguration
+	MfaConfiguration *types.Value `json:"MfaConfiguration,omitempty"`
+
+	// Policies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-policies
+	Policies *UserPool_Policies `json:"Policies,omitempty"`
+
+	// Schema AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-schema
+	Schema []UserPool_SchemaAttribute `json:"Schema,omitempty"`
+
+	// SmsAuthenticationMessage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-smsauthenticationmessage
+	SmsAuthenticationMessage *types.Value `json:"SmsAuthenticationMessage,omitempty"`
+
+	// SmsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-smsconfiguration
+	SmsConfiguration *UserPool_SmsConfiguration `json:"SmsConfiguration,omitempty"`
+
+	// SmsVerificationMessage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-smsverificationmessage
+	SmsVerificationMessage *types.Value `json:"SmsVerificationMessage,omitempty"`
+
+	// UserPoolAddOns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-userpooladdons
+	UserPoolAddOns *UserPool_UserPoolAddOns `json:"UserPoolAddOns,omitempty"`
+
+	// UserPoolName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-userpoolname
+	UserPoolName *types.Value `json:"UserPoolName,omitempty"`
+
+	// UserPoolTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-userpooltags
+	UserPoolTags interface{} `json:"UserPoolTags,omitempty"`
+
+	// UsernameAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-usernameattributes
+	UsernameAttributes *types.Value `json:"UsernameAttributes,omitempty"`
+
+	// UsernameConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-usernameconfiguration
+	UsernameConfiguration *UserPool_UsernameConfiguration `json:"UsernameConfiguration,omitempty"`
+
+	// VerificationMessageTemplate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpool.html#cfn-cognito-userpool-verificationmessagetemplate
+	VerificationMessageTemplate *UserPool_VerificationMessageTemplate `json:"VerificationMessageTemplate,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPool"
+}
+
+// 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 UserPool) MarshalJSON() ([]byte, error) {
+	type Properties UserPool
+	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 *UserPool) UnmarshalJSON(b []byte) error {
+	type Properties UserPool
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = UserPool(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cognito/aws-cognito-userpool_accountrecoverysetting.go b/goformation/cloudformation/cognito/aws-cognito-userpool_accountrecoverysetting.go
new file mode 100644
index 0000000000..b64d5240ae
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpool_accountrecoverysetting.go
@@ -0,0 +1,35 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPool_AccountRecoverySetting AWS CloudFormation Resource (AWS::Cognito::UserPool.AccountRecoverySetting)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-accountrecoverysetting.html
+type UserPool_AccountRecoverySetting struct {
+
+	// RecoveryMechanisms AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-accountrecoverysetting.html#cfn-cognito-userpool-accountrecoverysetting-recoverymechanisms
+	RecoveryMechanisms []UserPool_RecoveryOption `json:"RecoveryMechanisms,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AccountRecoverySetting) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPool.AccountRecoverySetting"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_admincreateuserconfig.go b/goformation/cloudformation/cognito/aws-cognito-userpool_admincreateuserconfig.go
new file mode 100644
index 0000000000..7dbe9e0ed2
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpool_admincreateuserconfig.go
@@ -0,0 +1,47 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPool_AdminCreateUserConfig AWS CloudFormation Resource (AWS::Cognito::UserPool.AdminCreateUserConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-admincreateuserconfig.html
+type UserPool_AdminCreateUserConfig struct {
+
+	// AllowAdminCreateUserOnly AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-admincreateuserconfig.html#cfn-cognito-userpool-admincreateuserconfig-allowadmincreateuseronly
+	AllowAdminCreateUserOnly *types.Value `json:"AllowAdminCreateUserOnly,omitempty"`
+
+	// InviteMessageTemplate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-admincreateuserconfig.html#cfn-cognito-userpool-admincreateuserconfig-invitemessagetemplate
+	InviteMessageTemplate *UserPool_InviteMessageTemplate `json:"InviteMessageTemplate,omitempty"`
+
+	// UnusedAccountValidityDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-admincreateuserconfig.html#cfn-cognito-userpool-admincreateuserconfig-unusedaccountvaliditydays
+	UnusedAccountValidityDays *types.Value `json:"UnusedAccountValidityDays,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AdminCreateUserConfig) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPool.AdminCreateUserConfig"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_customemailsender.go b/goformation/cloudformation/cognito/aws-cognito-userpool_customemailsender.go
new file mode 100644
index 0000000000..acbcfc80bb
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpool_customemailsender.go
@@ -0,0 +1,42 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPool_CustomEmailSender AWS CloudFormation Resource (AWS::Cognito::UserPool.CustomEmailSender)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-customemailsender.html
+type UserPool_CustomEmailSender struct {
+
+	// LambdaArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-customemailsender.html#cfn-cognito-userpool-customemailsender-lambdaarn
+	LambdaArn *types.Value `json:"LambdaArn,omitempty"`
+
+	// LambdaVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-customemailsender.html#cfn-cognito-userpool-customemailsender-lambdaversion
+	LambdaVersion *types.Value `json:"LambdaVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CustomEmailSender) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPool.CustomEmailSender"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_customsmssender.go b/goformation/cloudformation/cognito/aws-cognito-userpool_customsmssender.go
new file mode 100644
index 0000000000..89a1243a3c
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpool_customsmssender.go
@@ -0,0 +1,42 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPool_CustomSMSSender AWS CloudFormation Resource (AWS::Cognito::UserPool.CustomSMSSender)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-customsmssender.html
+type UserPool_CustomSMSSender struct {
+
+	// LambdaArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-customsmssender.html#cfn-cognito-userpool-customsmssender-lambdaarn
+	LambdaArn *types.Value `json:"LambdaArn,omitempty"`
+
+	// LambdaVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-customsmssender.html#cfn-cognito-userpool-customsmssender-lambdaversion
+	LambdaVersion *types.Value `json:"LambdaVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CustomSMSSender) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPool.CustomSMSSender"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_deviceconfiguration.go b/goformation/cloudformation/cognito/aws-cognito-userpool_deviceconfiguration.go
new file mode 100644
index 0000000000..29257e9b25
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpool_deviceconfiguration.go
@@ -0,0 +1,42 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPool_DeviceConfiguration AWS CloudFormation Resource (AWS::Cognito::UserPool.DeviceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-deviceconfiguration.html
+type UserPool_DeviceConfiguration struct {
+
+	// ChallengeRequiredOnNewDevice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-deviceconfiguration.html#cfn-cognito-userpool-deviceconfiguration-challengerequiredonnewdevice
+	ChallengeRequiredOnNewDevice *types.Value `json:"ChallengeRequiredOnNewDevice,omitempty"`
+
+	// DeviceOnlyRememberedOnUserPrompt AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-deviceconfiguration.html#cfn-cognito-userpool-deviceconfiguration-deviceonlyrememberedonuserprompt
+	DeviceOnlyRememberedOnUserPrompt *types.Value `json:"DeviceOnlyRememberedOnUserPrompt,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DeviceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPool.DeviceConfiguration"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_emailconfiguration.go b/goformation/cloudformation/cognito/aws-cognito-userpool_emailconfiguration.go
new file mode 100644
index 0000000000..b6dfa9dfcc
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpool_emailconfiguration.go
@@ -0,0 +1,57 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPool_EmailConfiguration AWS CloudFormation Resource (AWS::Cognito::UserPool.EmailConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-emailconfiguration.html
+type UserPool_EmailConfiguration struct {
+
+	// ConfigurationSet AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-emailconfiguration.html#cfn-cognito-userpool-emailconfiguration-configurationset
+	ConfigurationSet *types.Value `json:"ConfigurationSet,omitempty"`
+
+	// EmailSendingAccount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-emailconfiguration.html#cfn-cognito-userpool-emailconfiguration-emailsendingaccount
+	EmailSendingAccount *types.Value `json:"EmailSendingAccount,omitempty"`
+
+	// From AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-emailconfiguration.html#cfn-cognito-userpool-emailconfiguration-from
+	From *types.Value `json:"From,omitempty"`
+
+	// ReplyToEmailAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-emailconfiguration.html#cfn-cognito-userpool-emailconfiguration-replytoemailaddress
+	ReplyToEmailAddress *types.Value `json:"ReplyToEmailAddress,omitempty"`
+
+	// SourceArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-emailconfiguration.html#cfn-cognito-userpool-emailconfiguration-sourcearn
+	SourceArn *types.Value `json:"SourceArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EmailConfiguration) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPool.EmailConfiguration"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_invitemessagetemplate.go b/goformation/cloudformation/cognito/aws-cognito-userpool_invitemessagetemplate.go
new file mode 100644
index 0000000000..8eebb4a9e9
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpool_invitemessagetemplate.go
@@ -0,0 +1,47 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPool_InviteMessageTemplate AWS CloudFormation Resource (AWS::Cognito::UserPool.InviteMessageTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-invitemessagetemplate.html
+type UserPool_InviteMessageTemplate struct {
+
+	// EmailMessage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-invitemessagetemplate.html#cfn-cognito-userpool-invitemessagetemplate-emailmessage
+	EmailMessage *types.Value `json:"EmailMessage,omitempty"`
+
+	// EmailSubject AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-invitemessagetemplate.html#cfn-cognito-userpool-invitemessagetemplate-emailsubject
+	EmailSubject *types.Value `json:"EmailSubject,omitempty"`
+
+	// SMSMessage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-invitemessagetemplate.html#cfn-cognito-userpool-invitemessagetemplate-smsmessage
+	SMSMessage *types.Value `json:"SMSMessage,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InviteMessageTemplate) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPool.InviteMessageTemplate"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_lambdaconfig.go b/goformation/cloudformation/cognito/aws-cognito-userpool_lambdaconfig.go
new file mode 100644
index 0000000000..c16296fd01
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpool_lambdaconfig.go
@@ -0,0 +1,97 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPool_LambdaConfig AWS CloudFormation Resource (AWS::Cognito::UserPool.LambdaConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html
+type UserPool_LambdaConfig struct {
+
+	// CreateAuthChallenge AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-createauthchallenge
+	CreateAuthChallenge *types.Value `json:"CreateAuthChallenge,omitempty"`
+
+	// CustomEmailSender AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-customemailsender
+	CustomEmailSender *UserPool_CustomEmailSender `json:"CustomEmailSender,omitempty"`
+
+	// CustomMessage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-custommessage
+	CustomMessage *types.Value `json:"CustomMessage,omitempty"`
+
+	// CustomSMSSender AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-customsmssender
+	CustomSMSSender *UserPool_CustomSMSSender `json:"CustomSMSSender,omitempty"`
+
+	// DefineAuthChallenge AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-defineauthchallenge
+	DefineAuthChallenge *types.Value `json:"DefineAuthChallenge,omitempty"`
+
+	// KMSKeyID AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-kmskeyid
+	KMSKeyID *types.Value `json:"KMSKeyID,omitempty"`
+
+	// PostAuthentication AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-postauthentication
+	PostAuthentication *types.Value `json:"PostAuthentication,omitempty"`
+
+	// PostConfirmation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-postconfirmation
+	PostConfirmation *types.Value `json:"PostConfirmation,omitempty"`
+
+	// PreAuthentication AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-preauthentication
+	PreAuthentication *types.Value `json:"PreAuthentication,omitempty"`
+
+	// PreSignUp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-presignup
+	PreSignUp *types.Value `json:"PreSignUp,omitempty"`
+
+	// PreTokenGeneration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-pretokengeneration
+	PreTokenGeneration *types.Value `json:"PreTokenGeneration,omitempty"`
+
+	// UserMigration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-usermigration
+	UserMigration *types.Value `json:"UserMigration,omitempty"`
+
+	// VerifyAuthChallengeResponse AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-lambdaconfig.html#cfn-cognito-userpool-lambdaconfig-verifyauthchallengeresponse
+	VerifyAuthChallengeResponse *types.Value `json:"VerifyAuthChallengeResponse,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LambdaConfig) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPool.LambdaConfig"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_numberattributeconstraints.go b/goformation/cloudformation/cognito/aws-cognito-userpool_numberattributeconstraints.go
new file mode 100644
index 0000000000..91c792e705
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpool_numberattributeconstraints.go
@@ -0,0 +1,42 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPool_NumberAttributeConstraints AWS CloudFormation Resource (AWS::Cognito::UserPool.NumberAttributeConstraints)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-numberattributeconstraints.html
+type UserPool_NumberAttributeConstraints struct {
+
+	// MaxValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-numberattributeconstraints.html#cfn-cognito-userpool-numberattributeconstraints-maxvalue
+	MaxValue *types.Value `json:"MaxValue,omitempty"`
+
+	// MinValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-numberattributeconstraints.html#cfn-cognito-userpool-numberattributeconstraints-minvalue
+	MinValue *types.Value `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 *UserPool_NumberAttributeConstraints) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPool.NumberAttributeConstraints"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_passwordpolicy.go b/goformation/cloudformation/cognito/aws-cognito-userpool_passwordpolicy.go
new file mode 100644
index 0000000000..484ec95239
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpool_passwordpolicy.go
@@ -0,0 +1,62 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPool_PasswordPolicy AWS CloudFormation Resource (AWS::Cognito::UserPool.PasswordPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-passwordpolicy.html
+type UserPool_PasswordPolicy struct {
+
+	// MinimumLength AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-passwordpolicy.html#cfn-cognito-userpool-passwordpolicy-minimumlength
+	MinimumLength *types.Value `json:"MinimumLength,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
+	RequireLowercase *types.Value `json:"RequireLowercase,omitempty"`
+
+	// RequireNumbers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-passwordpolicy.html#cfn-cognito-userpool-passwordpolicy-requirenumbers
+	RequireNumbers *types.Value `json:"RequireNumbers,omitempty"`
+
+	// RequireSymbols AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-passwordpolicy.html#cfn-cognito-userpool-passwordpolicy-requiresymbols
+	RequireSymbols *types.Value `json:"RequireSymbols,omitempty"`
+
+	// RequireUppercase AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-passwordpolicy.html#cfn-cognito-userpool-passwordpolicy-requireuppercase
+	RequireUppercase *types.Value `json:"RequireUppercase,omitempty"`
+
+	// TemporaryPasswordValidityDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-passwordpolicy.html#cfn-cognito-userpool-passwordpolicy-temporarypasswordvaliditydays
+	TemporaryPasswordValidityDays *types.Value `json:"TemporaryPasswordValidityDays,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PasswordPolicy) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPool.PasswordPolicy"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_policies.go b/goformation/cloudformation/cognito/aws-cognito-userpool_policies.go
new file mode 100644
index 0000000000..50369543e7
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpool_policies.go
@@ -0,0 +1,35 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPool_Policies AWS CloudFormation Resource (AWS::Cognito::UserPool.Policies)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-policies.html
+type UserPool_Policies struct {
+
+	// PasswordPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-policies.html#cfn-cognito-userpool-policies-passwordpolicy
+	PasswordPolicy *UserPool_PasswordPolicy `json:"PasswordPolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Policies) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPool.Policies"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_recoveryoption.go b/goformation/cloudformation/cognito/aws-cognito-userpool_recoveryoption.go
new file mode 100644
index 0000000000..ad6978b94a
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpool_recoveryoption.go
@@ -0,0 +1,42 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPool_RecoveryOption AWS CloudFormation Resource (AWS::Cognito::UserPool.RecoveryOption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-recoveryoption.html
+type UserPool_RecoveryOption struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-recoveryoption.html#cfn-cognito-userpool-recoveryoption-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Priority AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-recoveryoption.html#cfn-cognito-userpool-recoveryoption-priority
+	Priority *types.Value `json:"Priority,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RecoveryOption) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPool.RecoveryOption"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_schemaattribute.go b/goformation/cloudformation/cognito/aws-cognito-userpool_schemaattribute.go
new file mode 100644
index 0000000000..a586d63226
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpool_schemaattribute.go
@@ -0,0 +1,67 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPool_SchemaAttribute AWS CloudFormation Resource (AWS::Cognito::UserPool.SchemaAttribute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-schemaattribute.html
+type UserPool_SchemaAttribute struct {
+
+	// AttributeDataType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-schemaattribute.html#cfn-cognito-userpool-schemaattribute-attributedatatype
+	AttributeDataType *types.Value `json:"AttributeDataType,omitempty"`
+
+	// DeveloperOnlyAttribute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-schemaattribute.html#cfn-cognito-userpool-schemaattribute-developeronlyattribute
+	DeveloperOnlyAttribute *types.Value `json:"DeveloperOnlyAttribute,omitempty"`
+
+	// Mutable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-schemaattribute.html#cfn-cognito-userpool-schemaattribute-mutable
+	Mutable *types.Value `json:"Mutable,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-schemaattribute.html#cfn-cognito-userpool-schemaattribute-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// NumberAttributeConstraints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-schemaattribute.html#cfn-cognito-userpool-schemaattribute-numberattributeconstraints
+	NumberAttributeConstraints *UserPool_NumberAttributeConstraints `json:"NumberAttributeConstraints,omitempty"`
+
+	// Required AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-schemaattribute.html#cfn-cognito-userpool-schemaattribute-required
+	Required *types.Value `json:"Required,omitempty"`
+
+	// StringAttributeConstraints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-schemaattribute.html#cfn-cognito-userpool-schemaattribute-stringattributeconstraints
+	StringAttributeConstraints *UserPool_StringAttributeConstraints `json:"StringAttributeConstraints,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SchemaAttribute) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPool.SchemaAttribute"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_smsconfiguration.go b/goformation/cloudformation/cognito/aws-cognito-userpool_smsconfiguration.go
new file mode 100644
index 0000000000..b04a937c7d
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpool_smsconfiguration.go
@@ -0,0 +1,42 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPool_SmsConfiguration AWS CloudFormation Resource (AWS::Cognito::UserPool.SmsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-smsconfiguration.html
+type UserPool_SmsConfiguration struct {
+
+	// ExternalId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-smsconfiguration.html#cfn-cognito-userpool-smsconfiguration-externalid
+	ExternalId *types.Value `json:"ExternalId,omitempty"`
+
+	// SnsCallerArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-smsconfiguration.html#cfn-cognito-userpool-smsconfiguration-snscallerarn
+	SnsCallerArn *types.Value `json:"SnsCallerArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SmsConfiguration) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPool.SmsConfiguration"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_stringattributeconstraints.go b/goformation/cloudformation/cognito/aws-cognito-userpool_stringattributeconstraints.go
new file mode 100644
index 0000000000..781ecdf1c8
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpool_stringattributeconstraints.go
@@ -0,0 +1,42 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPool_StringAttributeConstraints AWS CloudFormation Resource (AWS::Cognito::UserPool.StringAttributeConstraints)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-stringattributeconstraints.html
+type UserPool_StringAttributeConstraints struct {
+
+	// MaxLength AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-stringattributeconstraints.html#cfn-cognito-userpool-stringattributeconstraints-maxlength
+	MaxLength *types.Value `json:"MaxLength,omitempty"`
+
+	// MinLength AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-stringattributeconstraints.html#cfn-cognito-userpool-stringattributeconstraints-minlength
+	MinLength *types.Value `json:"MinLength,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_StringAttributeConstraints) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPool.StringAttributeConstraints"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_usernameconfiguration.go b/goformation/cloudformation/cognito/aws-cognito-userpool_usernameconfiguration.go
new file mode 100644
index 0000000000..8113f0f5f4
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpool_usernameconfiguration.go
@@ -0,0 +1,37 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPool_UsernameConfiguration AWS CloudFormation Resource (AWS::Cognito::UserPool.UsernameConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-usernameconfiguration.html
+type UserPool_UsernameConfiguration struct {
+
+	// CaseSensitive AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-usernameconfiguration.html#cfn-cognito-userpool-usernameconfiguration-casesensitive
+	CaseSensitive *types.Value `json:"CaseSensitive,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_UsernameConfiguration) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPool.UsernameConfiguration"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_userpooladdons.go b/goformation/cloudformation/cognito/aws-cognito-userpool_userpooladdons.go
new file mode 100644
index 0000000000..dd07d81730
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpool_userpooladdons.go
@@ -0,0 +1,37 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPool_UserPoolAddOns AWS CloudFormation Resource (AWS::Cognito::UserPool.UserPoolAddOns)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-userpooladdons.html
+type UserPool_UserPoolAddOns struct {
+
+	// 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
+	AdvancedSecurityMode *types.Value `json:"AdvancedSecurityMode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_UserPoolAddOns) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPool.UserPoolAddOns"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpool_verificationmessagetemplate.go b/goformation/cloudformation/cognito/aws-cognito-userpool_verificationmessagetemplate.go
new file mode 100644
index 0000000000..b6c659f0ad
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpool_verificationmessagetemplate.go
@@ -0,0 +1,62 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPool_VerificationMessageTemplate AWS CloudFormation Resource (AWS::Cognito::UserPool.VerificationMessageTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-verificationmessagetemplate.html
+type UserPool_VerificationMessageTemplate struct {
+
+	// DefaultEmailOption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-verificationmessagetemplate.html#cfn-cognito-userpool-verificationmessagetemplate-defaultemailoption
+	DefaultEmailOption *types.Value `json:"DefaultEmailOption,omitempty"`
+
+	// EmailMessage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-verificationmessagetemplate.html#cfn-cognito-userpool-verificationmessagetemplate-emailmessage
+	EmailMessage *types.Value `json:"EmailMessage,omitempty"`
+
+	// EmailMessageByLink AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-verificationmessagetemplate.html#cfn-cognito-userpool-verificationmessagetemplate-emailmessagebylink
+	EmailMessageByLink *types.Value `json:"EmailMessageByLink,omitempty"`
+
+	// EmailSubject AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-verificationmessagetemplate.html#cfn-cognito-userpool-verificationmessagetemplate-emailsubject
+	EmailSubject *types.Value `json:"EmailSubject,omitempty"`
+
+	// EmailSubjectByLink AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-verificationmessagetemplate.html#cfn-cognito-userpool-verificationmessagetemplate-emailsubjectbylink
+	EmailSubjectByLink *types.Value `json:"EmailSubjectByLink,omitempty"`
+
+	// SmsMessage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpool-verificationmessagetemplate.html#cfn-cognito-userpool-verificationmessagetemplate-smsmessage
+	SmsMessage *types.Value `json:"SmsMessage,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_VerificationMessageTemplate) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPool.VerificationMessageTemplate"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolclient.go b/goformation/cloudformation/cognito/aws-cognito-userpoolclient.go
new file mode 100644
index 0000000000..e0fe48c1d7
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpoolclient.go
@@ -0,0 +1,203 @@
+package cognito
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolClient AWS CloudFormation Resource (AWS::Cognito::UserPoolClient)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html
+type UserPoolClient struct {
+
+	// AccessTokenValidity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-accesstokenvalidity
+	AccessTokenValidity *types.Value `json:"AccessTokenValidity,omitempty"`
+
+	// AllowedOAuthFlows AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-allowedoauthflows
+	AllowedOAuthFlows *types.Value `json:"AllowedOAuthFlows,omitempty"`
+
+	// AllowedOAuthFlowsUserPoolClient AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-allowedoauthflowsuserpoolclient
+	AllowedOAuthFlowsUserPoolClient *types.Value `json:"AllowedOAuthFlowsUserPoolClient,omitempty"`
+
+	// AllowedOAuthScopes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-allowedoauthscopes
+	AllowedOAuthScopes *types.Value `json:"AllowedOAuthScopes,omitempty"`
+
+	// AnalyticsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-analyticsconfiguration
+	AnalyticsConfiguration *UserPoolClient_AnalyticsConfiguration `json:"AnalyticsConfiguration,omitempty"`
+
+	// CallbackURLs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-callbackurls
+	CallbackURLs *types.Value `json:"CallbackURLs,omitempty"`
+
+	// ClientName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-clientname
+	ClientName *types.Value `json:"ClientName,omitempty"`
+
+	// DefaultRedirectURI AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-defaultredirecturi
+	DefaultRedirectURI *types.Value `json:"DefaultRedirectURI,omitempty"`
+
+	// EnableTokenRevocation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-enabletokenrevocation
+	EnableTokenRevocation *types.Value `json:"EnableTokenRevocation,omitempty"`
+
+	// ExplicitAuthFlows AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-explicitauthflows
+	ExplicitAuthFlows *types.Value `json:"ExplicitAuthFlows,omitempty"`
+
+	// GenerateSecret AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-generatesecret
+	GenerateSecret *types.Value `json:"GenerateSecret,omitempty"`
+
+	// IdTokenValidity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-idtokenvalidity
+	IdTokenValidity *types.Value `json:"IdTokenValidity,omitempty"`
+
+	// LogoutURLs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-logouturls
+	LogoutURLs *types.Value `json:"LogoutURLs,omitempty"`
+
+	// PreventUserExistenceErrors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-preventuserexistenceerrors
+	PreventUserExistenceErrors *types.Value `json:"PreventUserExistenceErrors,omitempty"`
+
+	// ReadAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-readattributes
+	ReadAttributes *types.Value `json:"ReadAttributes,omitempty"`
+
+	// RefreshTokenValidity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-refreshtokenvalidity
+	RefreshTokenValidity *types.Value `json:"RefreshTokenValidity,omitempty"`
+
+	// SupportedIdentityProviders AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-supportedidentityproviders
+	SupportedIdentityProviders *types.Value `json:"SupportedIdentityProviders,omitempty"`
+
+	// TokenValidityUnits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-tokenvalidityunits
+	TokenValidityUnits *UserPoolClient_TokenValidityUnits `json:"TokenValidityUnits,omitempty"`
+
+	// UserPoolId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-userpoolid
+	UserPoolId *types.Value `json:"UserPoolId,omitempty"`
+
+	// WriteAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolclient.html#cfn-cognito-userpoolclient-writeattributes
+	WriteAttributes *types.Value `json:"WriteAttributes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserPoolClient) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolClient"
+}
+
+// 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 UserPoolClient) MarshalJSON() ([]byte, error) {
+	type Properties UserPoolClient
+	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 *UserPoolClient) UnmarshalJSON(b []byte) error {
+	type Properties UserPoolClient
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = UserPoolClient(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cognito/aws-cognito-userpoolclient_analyticsconfiguration.go b/goformation/cloudformation/cognito/aws-cognito-userpoolclient_analyticsconfiguration.go
new file mode 100644
index 0000000000..4d1af3a469
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpoolclient_analyticsconfiguration.go
@@ -0,0 +1,57 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolClient_AnalyticsConfiguration AWS CloudFormation Resource (AWS::Cognito::UserPoolClient.AnalyticsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolclient-analyticsconfiguration.html
+type UserPoolClient_AnalyticsConfiguration struct {
+
+	// ApplicationArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolclient-analyticsconfiguration.html#cfn-cognito-userpoolclient-analyticsconfiguration-applicationarn
+	ApplicationArn *types.Value `json:"ApplicationArn,omitempty"`
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolclient-analyticsconfiguration.html#cfn-cognito-userpoolclient-analyticsconfiguration-applicationid
+	ApplicationId *types.Value `json:"ApplicationId,omitempty"`
+
+	// ExternalId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolclient-analyticsconfiguration.html#cfn-cognito-userpoolclient-analyticsconfiguration-externalid
+	ExternalId *types.Value `json:"ExternalId,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolclient-analyticsconfiguration.html#cfn-cognito-userpoolclient-analyticsconfiguration-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// UserDataShared AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolclient-analyticsconfiguration.html#cfn-cognito-userpoolclient-analyticsconfiguration-userdatashared
+	UserDataShared *types.Value `json:"UserDataShared,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserPoolClient_AnalyticsConfiguration) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolClient.AnalyticsConfiguration"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolclient_tokenvalidityunits.go b/goformation/cloudformation/cognito/aws-cognito-userpoolclient_tokenvalidityunits.go
new file mode 100644
index 0000000000..5b86a598b8
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpoolclient_tokenvalidityunits.go
@@ -0,0 +1,47 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolClient_TokenValidityUnits AWS CloudFormation Resource (AWS::Cognito::UserPoolClient.TokenValidityUnits)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolclient-tokenvalidityunits.html
+type UserPoolClient_TokenValidityUnits struct {
+
+	// AccessToken AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolclient-tokenvalidityunits.html#cfn-cognito-userpoolclient-tokenvalidityunits-accesstoken
+	AccessToken *types.Value `json:"AccessToken,omitempty"`
+
+	// IdToken AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolclient-tokenvalidityunits.html#cfn-cognito-userpoolclient-tokenvalidityunits-idtoken
+	IdToken *types.Value `json:"IdToken,omitempty"`
+
+	// RefreshToken AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolclient-tokenvalidityunits.html#cfn-cognito-userpoolclient-tokenvalidityunits-refreshtoken
+	RefreshToken *types.Value `json:"RefreshToken,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserPoolClient_TokenValidityUnits) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolClient.TokenValidityUnits"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpooldomain.go b/goformation/cloudformation/cognito/aws-cognito-userpooldomain.go
new file mode 100644
index 0000000000..a897c184ca
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpooldomain.go
@@ -0,0 +1,118 @@
+package cognito
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolDomain AWS CloudFormation Resource (AWS::Cognito::UserPoolDomain)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooldomain.html
+type UserPoolDomain struct {
+
+	// CustomDomainConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooldomain.html#cfn-cognito-userpooldomain-customdomainconfig
+	CustomDomainConfig *UserPoolDomain_CustomDomainConfigType `json:"CustomDomainConfig,omitempty"`
+
+	// Domain AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooldomain.html#cfn-cognito-userpooldomain-domain
+	Domain *types.Value `json:"Domain,omitempty"`
+
+	// UserPoolId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooldomain.html#cfn-cognito-userpooldomain-userpoolid
+	UserPoolId *types.Value `json:"UserPoolId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserPoolDomain) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolDomain"
+}
+
+// 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 UserPoolDomain) MarshalJSON() ([]byte, error) {
+	type Properties UserPoolDomain
+	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 *UserPoolDomain) UnmarshalJSON(b []byte) error {
+	type Properties UserPoolDomain
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = UserPoolDomain(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cognito/aws-cognito-userpooldomain_customdomainconfigtype.go b/goformation/cloudformation/cognito/aws-cognito-userpooldomain_customdomainconfigtype.go
new file mode 100644
index 0000000000..9ee1d563ba
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpooldomain_customdomainconfigtype.go
@@ -0,0 +1,37 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolDomain_CustomDomainConfigType AWS CloudFormation Resource (AWS::Cognito::UserPoolDomain.CustomDomainConfigType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpooldomain-customdomainconfigtype.html
+type UserPoolDomain_CustomDomainConfigType struct {
+
+	// CertificateArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpooldomain-customdomainconfigtype.html#cfn-cognito-userpooldomain-customdomainconfigtype-certificatearn
+	CertificateArn *types.Value `json:"CertificateArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserPoolDomain_CustomDomainConfigType) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolDomain.CustomDomainConfigType"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolgroup.go b/goformation/cloudformation/cognito/aws-cognito-userpoolgroup.go
new file mode 100644
index 0000000000..a686c17576
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpoolgroup.go
@@ -0,0 +1,128 @@
+package cognito
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolGroup AWS CloudFormation Resource (AWS::Cognito::UserPoolGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolgroup.html
+type UserPoolGroup struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolgroup.html#cfn-cognito-userpoolgroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// GroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolgroup.html#cfn-cognito-userpoolgroup-groupname
+	GroupName *types.Value `json:"GroupName,omitempty"`
+
+	// Precedence AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolgroup.html#cfn-cognito-userpoolgroup-precedence
+	Precedence *types.Value `json:"Precedence,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolgroup.html#cfn-cognito-userpoolgroup-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// UserPoolId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolgroup.html#cfn-cognito-userpoolgroup-userpoolid
+	UserPoolId *types.Value `json:"UserPoolId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserPoolGroup) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolGroup"
+}
+
+// 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 UserPoolGroup) MarshalJSON() ([]byte, error) {
+	type Properties UserPoolGroup
+	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 *UserPoolGroup) UnmarshalJSON(b []byte) error {
+	type Properties UserPoolGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = UserPoolGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cognito/aws-cognito-userpoolidentityprovider.go b/goformation/cloudformation/cognito/aws-cognito-userpoolidentityprovider.go
new file mode 100644
index 0000000000..b4a07725a5
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpoolidentityprovider.go
@@ -0,0 +1,133 @@
+package cognito
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolIdentityProvider AWS CloudFormation Resource (AWS::Cognito::UserPoolIdentityProvider)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolidentityprovider.html
+type UserPoolIdentityProvider struct {
+
+	// AttributeMapping AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolidentityprovider.html#cfn-cognito-userpoolidentityprovider-attributemapping
+	AttributeMapping interface{} `json:"AttributeMapping,omitempty"`
+
+	// IdpIdentifiers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolidentityprovider.html#cfn-cognito-userpoolidentityprovider-idpidentifiers
+	IdpIdentifiers *types.Value `json:"IdpIdentifiers,omitempty"`
+
+	// ProviderDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolidentityprovider.html#cfn-cognito-userpoolidentityprovider-providerdetails
+	ProviderDetails interface{} `json:"ProviderDetails,omitempty"`
+
+	// ProviderName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolidentityprovider.html#cfn-cognito-userpoolidentityprovider-providername
+	ProviderName *types.Value `json:"ProviderName,omitempty"`
+
+	// ProviderType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolidentityprovider.html#cfn-cognito-userpoolidentityprovider-providertype
+	ProviderType *types.Value `json:"ProviderType,omitempty"`
+
+	// UserPoolId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolidentityprovider.html#cfn-cognito-userpoolidentityprovider-userpoolid
+	UserPoolId *types.Value `json:"UserPoolId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserPoolIdentityProvider) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolIdentityProvider"
+}
+
+// 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 UserPoolIdentityProvider) MarshalJSON() ([]byte, error) {
+	type Properties UserPoolIdentityProvider
+	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 *UserPoolIdentityProvider) UnmarshalJSON(b []byte) error {
+	type Properties UserPoolIdentityProvider
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = UserPoolIdentityProvider(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cognito/aws-cognito-userpoolresourceserver.go b/goformation/cloudformation/cognito/aws-cognito-userpoolresourceserver.go
new file mode 100644
index 0000000000..8aeb53be23
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpoolresourceserver.go
@@ -0,0 +1,123 @@
+package cognito
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolResourceServer AWS CloudFormation Resource (AWS::Cognito::UserPoolResourceServer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolresourceserver.html
+type UserPoolResourceServer struct {
+
+	// Identifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolresourceserver.html#cfn-cognito-userpoolresourceserver-identifier
+	Identifier *types.Value `json:"Identifier,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolresourceserver.html#cfn-cognito-userpoolresourceserver-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Scopes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolresourceserver.html#cfn-cognito-userpoolresourceserver-scopes
+	Scopes []UserPoolResourceServer_ResourceServerScopeType `json:"Scopes,omitempty"`
+
+	// UserPoolId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolresourceserver.html#cfn-cognito-userpoolresourceserver-userpoolid
+	UserPoolId *types.Value `json:"UserPoolId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserPoolResourceServer) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolResourceServer"
+}
+
+// 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 UserPoolResourceServer) MarshalJSON() ([]byte, error) {
+	type Properties UserPoolResourceServer
+	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 *UserPoolResourceServer) UnmarshalJSON(b []byte) error {
+	type Properties UserPoolResourceServer
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = UserPoolResourceServer(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cognito/aws-cognito-userpoolresourceserver_resourceserverscopetype.go b/goformation/cloudformation/cognito/aws-cognito-userpoolresourceserver_resourceserverscopetype.go
new file mode 100644
index 0000000000..80660efc28
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpoolresourceserver_resourceserverscopetype.go
@@ -0,0 +1,42 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolResourceServer_ResourceServerScopeType AWS CloudFormation Resource (AWS::Cognito::UserPoolResourceServer.ResourceServerScopeType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolresourceserver-resourceserverscopetype.html
+type UserPoolResourceServer_ResourceServerScopeType struct {
+
+	// ScopeDescription AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolresourceserver-resourceserverscopetype.html#cfn-cognito-userpoolresourceserver-resourceserverscopetype-scopedescription
+	ScopeDescription *types.Value `json:"ScopeDescription,omitempty"`
+
+	// ScopeName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolresourceserver-resourceserverscopetype.html#cfn-cognito-userpoolresourceserver-resourceserverscopetype-scopename
+	ScopeName *types.Value `json:"ScopeName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserPoolResourceServer_ResourceServerScopeType) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolResourceServer.ResourceServerScopeType"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment.go b/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment.go
new file mode 100644
index 0000000000..d61882d2b9
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment.go
@@ -0,0 +1,128 @@
+package cognito
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolRiskConfigurationAttachment AWS CloudFormation Resource (AWS::Cognito::UserPoolRiskConfigurationAttachment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolriskconfigurationattachment.html
+type UserPoolRiskConfigurationAttachment struct {
+
+	// AccountTakeoverRiskConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolriskconfigurationattachment.html#cfn-cognito-userpoolriskconfigurationattachment-accounttakeoverriskconfiguration
+	AccountTakeoverRiskConfiguration *UserPoolRiskConfigurationAttachment_AccountTakeoverRiskConfigurationType `json:"AccountTakeoverRiskConfiguration,omitempty"`
+
+	// ClientId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolriskconfigurationattachment.html#cfn-cognito-userpoolriskconfigurationattachment-clientid
+	ClientId *types.Value `json:"ClientId,omitempty"`
+
+	// CompromisedCredentialsRiskConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolriskconfigurationattachment.html#cfn-cognito-userpoolriskconfigurationattachment-compromisedcredentialsriskconfiguration
+	CompromisedCredentialsRiskConfiguration *UserPoolRiskConfigurationAttachment_CompromisedCredentialsRiskConfigurationType `json:"CompromisedCredentialsRiskConfiguration,omitempty"`
+
+	// RiskExceptionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolriskconfigurationattachment.html#cfn-cognito-userpoolriskconfigurationattachment-riskexceptionconfiguration
+	RiskExceptionConfiguration *UserPoolRiskConfigurationAttachment_RiskExceptionConfigurationType `json:"RiskExceptionConfiguration,omitempty"`
+
+	// UserPoolId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolriskconfigurationattachment.html#cfn-cognito-userpoolriskconfigurationattachment-userpoolid
+	UserPoolId *types.Value `json:"UserPoolId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserPoolRiskConfigurationAttachment) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolRiskConfigurationAttachment"
+}
+
+// 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 UserPoolRiskConfigurationAttachment) MarshalJSON() ([]byte, error) {
+	type Properties UserPoolRiskConfigurationAttachment
+	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 *UserPoolRiskConfigurationAttachment) UnmarshalJSON(b []byte) error {
+	type Properties UserPoolRiskConfigurationAttachment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = UserPoolRiskConfigurationAttachment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractionstype.go b/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractionstype.go
new file mode 100644
index 0000000000..7b3cb113e8
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractionstype.go
@@ -0,0 +1,45 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolRiskConfigurationAttachment_AccountTakeoverActionsType AWS CloudFormation Resource (AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionsType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-accounttakeoveractionstype.html
+type UserPoolRiskConfigurationAttachment_AccountTakeoverActionsType struct {
+
+	// HighAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-accounttakeoveractionstype.html#cfn-cognito-userpoolriskconfigurationattachment-accounttakeoveractionstype-highaction
+	HighAction *UserPoolRiskConfigurationAttachment_AccountTakeoverActionType `json:"HighAction,omitempty"`
+
+	// LowAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-accounttakeoveractionstype.html#cfn-cognito-userpoolriskconfigurationattachment-accounttakeoveractionstype-lowaction
+	LowAction *UserPoolRiskConfigurationAttachment_AccountTakeoverActionType `json:"LowAction,omitempty"`
+
+	// MediumAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-accounttakeoveractionstype.html#cfn-cognito-userpoolriskconfigurationattachment-accounttakeoveractionstype-mediumaction
+	MediumAction *UserPoolRiskConfigurationAttachment_AccountTakeoverActionType `json:"MediumAction,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserPoolRiskConfigurationAttachment_AccountTakeoverActionsType) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionsType"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractiontype.go b/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractiontype.go
new file mode 100644
index 0000000000..d370cefefd
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoveractiontype.go
@@ -0,0 +1,42 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolRiskConfigurationAttachment_AccountTakeoverActionType AWS CloudFormation Resource (AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-accounttakeoveractiontype.html
+type UserPoolRiskConfigurationAttachment_AccountTakeoverActionType struct {
+
+	// EventAction AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-accounttakeoveractiontype.html#cfn-cognito-userpoolriskconfigurationattachment-accounttakeoveractiontype-eventaction
+	EventAction *types.Value `json:"EventAction,omitempty"`
+
+	// Notify AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-accounttakeoveractiontype.html#cfn-cognito-userpoolriskconfigurationattachment-accounttakeoveractiontype-notify
+	Notify *types.Value `json:"Notify"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserPoolRiskConfigurationAttachment_AccountTakeoverActionType) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionType"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoverriskconfigurationtype.go b/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoverriskconfigurationtype.go
new file mode 100644
index 0000000000..719673073b
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_accounttakeoverriskconfigurationtype.go
@@ -0,0 +1,40 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolRiskConfigurationAttachment_AccountTakeoverRiskConfigurationType AWS CloudFormation Resource (AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverRiskConfigurationType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-accounttakeoverriskconfigurationtype.html
+type UserPoolRiskConfigurationAttachment_AccountTakeoverRiskConfigurationType struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-accounttakeoverriskconfigurationtype.html#cfn-cognito-userpoolriskconfigurationattachment-accounttakeoverriskconfigurationtype-actions
+	Actions *UserPoolRiskConfigurationAttachment_AccountTakeoverActionsType `json:"Actions,omitempty"`
+
+	// NotifyConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-accounttakeoverriskconfigurationtype.html#cfn-cognito-userpoolriskconfigurationattachment-accounttakeoverriskconfigurationtype-notifyconfiguration
+	NotifyConfiguration *UserPoolRiskConfigurationAttachment_NotifyConfigurationType `json:"NotifyConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserPoolRiskConfigurationAttachment_AccountTakeoverRiskConfigurationType) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverRiskConfigurationType"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsactionstype.go b/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsactionstype.go
new file mode 100644
index 0000000000..7d69262896
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsactionstype.go
@@ -0,0 +1,37 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolRiskConfigurationAttachment_CompromisedCredentialsActionsType AWS CloudFormation Resource (AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsActionsType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-compromisedcredentialsactionstype.html
+type UserPoolRiskConfigurationAttachment_CompromisedCredentialsActionsType struct {
+
+	// EventAction AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-compromisedcredentialsactionstype.html#cfn-cognito-userpoolriskconfigurationattachment-compromisedcredentialsactionstype-eventaction
+	EventAction *types.Value `json:"EventAction,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserPoolRiskConfigurationAttachment_CompromisedCredentialsActionsType) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsActionsType"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsriskconfigurationtype.go b/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsriskconfigurationtype.go
new file mode 100644
index 0000000000..b59d03d6aa
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_compromisedcredentialsriskconfigurationtype.go
@@ -0,0 +1,42 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolRiskConfigurationAttachment_CompromisedCredentialsRiskConfigurationType AWS CloudFormation Resource (AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsRiskConfigurationType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-compromisedcredentialsriskconfigurationtype.html
+type UserPoolRiskConfigurationAttachment_CompromisedCredentialsRiskConfigurationType struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-compromisedcredentialsriskconfigurationtype.html#cfn-cognito-userpoolriskconfigurationattachment-compromisedcredentialsriskconfigurationtype-actions
+	Actions *UserPoolRiskConfigurationAttachment_CompromisedCredentialsActionsType `json:"Actions,omitempty"`
+
+	// EventFilter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-compromisedcredentialsriskconfigurationtype.html#cfn-cognito-userpoolriskconfigurationattachment-compromisedcredentialsriskconfigurationtype-eventfilter
+	EventFilter *types.Value `json:"EventFilter,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserPoolRiskConfigurationAttachment_CompromisedCredentialsRiskConfigurationType) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsRiskConfigurationType"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyconfigurationtype.go b/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyconfigurationtype.go
new file mode 100644
index 0000000000..d845a61d86
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyconfigurationtype.go
@@ -0,0 +1,62 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolRiskConfigurationAttachment_NotifyConfigurationType AWS CloudFormation Resource (AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyConfigurationType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-notifyconfigurationtype.html
+type UserPoolRiskConfigurationAttachment_NotifyConfigurationType struct {
+
+	// BlockEmail AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-notifyconfigurationtype.html#cfn-cognito-userpoolriskconfigurationattachment-notifyconfigurationtype-blockemail
+	BlockEmail *UserPoolRiskConfigurationAttachment_NotifyEmailType `json:"BlockEmail,omitempty"`
+
+	// From AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-notifyconfigurationtype.html#cfn-cognito-userpoolriskconfigurationattachment-notifyconfigurationtype-from
+	From *types.Value `json:"From,omitempty"`
+
+	// MfaEmail AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-notifyconfigurationtype.html#cfn-cognito-userpoolriskconfigurationattachment-notifyconfigurationtype-mfaemail
+	MfaEmail *UserPoolRiskConfigurationAttachment_NotifyEmailType `json:"MfaEmail,omitempty"`
+
+	// NoActionEmail AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-notifyconfigurationtype.html#cfn-cognito-userpoolriskconfigurationattachment-notifyconfigurationtype-noactionemail
+	NoActionEmail *UserPoolRiskConfigurationAttachment_NotifyEmailType `json:"NoActionEmail,omitempty"`
+
+	// ReplyTo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-notifyconfigurationtype.html#cfn-cognito-userpoolriskconfigurationattachment-notifyconfigurationtype-replyto
+	ReplyTo *types.Value `json:"ReplyTo,omitempty"`
+
+	// SourceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-notifyconfigurationtype.html#cfn-cognito-userpoolriskconfigurationattachment-notifyconfigurationtype-sourcearn
+	SourceArn *types.Value `json:"SourceArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserPoolRiskConfigurationAttachment_NotifyConfigurationType) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyConfigurationType"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyemailtype.go b/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyemailtype.go
new file mode 100644
index 0000000000..5eb0f223a3
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_notifyemailtype.go
@@ -0,0 +1,47 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolRiskConfigurationAttachment_NotifyEmailType AWS CloudFormation Resource (AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyEmailType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-notifyemailtype.html
+type UserPoolRiskConfigurationAttachment_NotifyEmailType struct {
+
+	// HtmlBody AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-notifyemailtype.html#cfn-cognito-userpoolriskconfigurationattachment-notifyemailtype-htmlbody
+	HtmlBody *types.Value `json:"HtmlBody,omitempty"`
+
+	// Subject AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-notifyemailtype.html#cfn-cognito-userpoolriskconfigurationattachment-notifyemailtype-subject
+	Subject *types.Value `json:"Subject,omitempty"`
+
+	// TextBody AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-notifyemailtype.html#cfn-cognito-userpoolriskconfigurationattachment-notifyemailtype-textbody
+	TextBody *types.Value `json:"TextBody,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserPoolRiskConfigurationAttachment_NotifyEmailType) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyEmailType"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_riskexceptionconfigurationtype.go b/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_riskexceptionconfigurationtype.go
new file mode 100644
index 0000000000..c4c45db1ee
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpoolriskconfigurationattachment_riskexceptionconfigurationtype.go
@@ -0,0 +1,42 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolRiskConfigurationAttachment_RiskExceptionConfigurationType AWS CloudFormation Resource (AWS::Cognito::UserPoolRiskConfigurationAttachment.RiskExceptionConfigurationType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-riskexceptionconfigurationtype.html
+type UserPoolRiskConfigurationAttachment_RiskExceptionConfigurationType struct {
+
+	// BlockedIPRangeList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-riskexceptionconfigurationtype.html#cfn-cognito-userpoolriskconfigurationattachment-riskexceptionconfigurationtype-blockediprangelist
+	BlockedIPRangeList *types.Value `json:"BlockedIPRangeList,omitempty"`
+
+	// SkippedIPRangeList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpoolriskconfigurationattachment-riskexceptionconfigurationtype.html#cfn-cognito-userpoolriskconfigurationattachment-riskexceptionconfigurationtype-skippediprangelist
+	SkippedIPRangeList *types.Value `json:"SkippedIPRangeList,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserPoolRiskConfigurationAttachment_RiskExceptionConfigurationType) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolRiskConfigurationAttachment.RiskExceptionConfigurationType"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpooluicustomizationattachment.go b/goformation/cloudformation/cognito/aws-cognito-userpooluicustomizationattachment.go
new file mode 100644
index 0000000000..52e55493b6
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpooluicustomizationattachment.go
@@ -0,0 +1,118 @@
+package cognito
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolUICustomizationAttachment AWS CloudFormation Resource (AWS::Cognito::UserPoolUICustomizationAttachment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluicustomizationattachment.html
+type UserPoolUICustomizationAttachment struct {
+
+	// CSS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluicustomizationattachment.html#cfn-cognito-userpooluicustomizationattachment-css
+	CSS *types.Value `json:"CSS,omitempty"`
+
+	// ClientId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluicustomizationattachment.html#cfn-cognito-userpooluicustomizationattachment-clientid
+	ClientId *types.Value `json:"ClientId,omitempty"`
+
+	// UserPoolId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluicustomizationattachment.html#cfn-cognito-userpooluicustomizationattachment-userpoolid
+	UserPoolId *types.Value `json:"UserPoolId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserPoolUICustomizationAttachment) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolUICustomizationAttachment"
+}
+
+// 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 UserPoolUICustomizationAttachment) MarshalJSON() ([]byte, error) {
+	type Properties UserPoolUICustomizationAttachment
+	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 *UserPoolUICustomizationAttachment) UnmarshalJSON(b []byte) error {
+	type Properties UserPoolUICustomizationAttachment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = UserPoolUICustomizationAttachment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cognito/aws-cognito-userpooluser.go b/goformation/cloudformation/cognito/aws-cognito-userpooluser.go
new file mode 100644
index 0000000000..4b9f941eb1
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpooluser.go
@@ -0,0 +1,143 @@
+package cognito
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolUser AWS CloudFormation Resource (AWS::Cognito::UserPoolUser)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html
+type UserPoolUser struct {
+
+	// ClientMetadata AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html#cfn-cognito-userpooluser-clientmetadata
+	ClientMetadata interface{} `json:"ClientMetadata,omitempty"`
+
+	// DesiredDeliveryMediums AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html#cfn-cognito-userpooluser-desireddeliverymediums
+	DesiredDeliveryMediums *types.Value `json:"DesiredDeliveryMediums,omitempty"`
+
+	// ForceAliasCreation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html#cfn-cognito-userpooluser-forcealiascreation
+	ForceAliasCreation *types.Value `json:"ForceAliasCreation,omitempty"`
+
+	// MessageAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html#cfn-cognito-userpooluser-messageaction
+	MessageAction *types.Value `json:"MessageAction,omitempty"`
+
+	// UserAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html#cfn-cognito-userpooluser-userattributes
+	UserAttributes []UserPoolUser_AttributeType `json:"UserAttributes,omitempty"`
+
+	// UserPoolId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html#cfn-cognito-userpooluser-userpoolid
+	UserPoolId *types.Value `json:"UserPoolId,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html#cfn-cognito-userpooluser-username
+	Username *types.Value `json:"Username,omitempty"`
+
+	// ValidationData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpooluser.html#cfn-cognito-userpooluser-validationdata
+	ValidationData []UserPoolUser_AttributeType `json:"ValidationData,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserPoolUser) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolUser"
+}
+
+// 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 UserPoolUser) MarshalJSON() ([]byte, error) {
+	type Properties UserPoolUser
+	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 *UserPoolUser) UnmarshalJSON(b []byte) error {
+	type Properties UserPoolUser
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = UserPoolUser(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cognito/aws-cognito-userpooluser_attributetype.go b/goformation/cloudformation/cognito/aws-cognito-userpooluser_attributetype.go
new file mode 100644
index 0000000000..1caf4fddce
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpooluser_attributetype.go
@@ -0,0 +1,42 @@
+package cognito
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolUser_AttributeType AWS CloudFormation Resource (AWS::Cognito::UserPoolUser.AttributeType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpooluser-attributetype.html
+type UserPoolUser_AttributeType struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpooluser-attributetype.html#cfn-cognito-userpooluser-attributetype-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-cognito-userpooluser-attributetype.html#cfn-cognito-userpooluser-attributetype-value
+	Value *types.Value `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 *UserPoolUser_AttributeType) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolUser.AttributeType"
+}
diff --git a/goformation/cloudformation/cognito/aws-cognito-userpoolusertogroupattachment.go b/goformation/cloudformation/cognito/aws-cognito-userpoolusertogroupattachment.go
new file mode 100644
index 0000000000..c4153d9a4f
--- /dev/null
+++ b/goformation/cloudformation/cognito/aws-cognito-userpoolusertogroupattachment.go
@@ -0,0 +1,118 @@
+package cognito
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserPoolUserToGroupAttachment AWS CloudFormation Resource (AWS::Cognito::UserPoolUserToGroupAttachment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolusertogroupattachment.html
+type UserPoolUserToGroupAttachment struct {
+
+	// GroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolusertogroupattachment.html#cfn-cognito-userpoolusertogroupattachment-groupname
+	GroupName *types.Value `json:"GroupName,omitempty"`
+
+	// UserPoolId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolusertogroupattachment.html#cfn-cognito-userpoolusertogroupattachment-userpoolid
+	UserPoolId *types.Value `json:"UserPoolId,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cognito-userpoolusertogroupattachment.html#cfn-cognito-userpoolusertogroupattachment-username
+	Username *types.Value `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 *UserPoolUserToGroupAttachment) AWSCloudFormationType() string {
+	return "AWS::Cognito::UserPoolUserToGroupAttachment"
+}
+
+// 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 UserPoolUserToGroupAttachment) MarshalJSON() ([]byte, error) {
+	type Properties UserPoolUserToGroupAttachment
+	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 *UserPoolUserToGroupAttachment) UnmarshalJSON(b []byte) error {
+	type Properties UserPoolUserToGroupAttachment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = UserPoolUserToGroupAttachment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/config/aws-config-aggregationauthorization.go b/goformation/cloudformation/config/aws-config-aggregationauthorization.go
new file mode 100644
index 0000000000..92a4e4decf
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-aggregationauthorization.go
@@ -0,0 +1,119 @@
+package config
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// AggregationAuthorization AWS CloudFormation Resource (AWS::Config::AggregationAuthorization)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-aggregationauthorization.html
+type AggregationAuthorization struct {
+
+	// AuthorizedAccountId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-aggregationauthorization.html#cfn-config-aggregationauthorization-authorizedaccountid
+	AuthorizedAccountId *types.Value `json:"AuthorizedAccountId,omitempty"`
+
+	// AuthorizedAwsRegion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-aggregationauthorization.html#cfn-config-aggregationauthorization-authorizedawsregion
+	AuthorizedAwsRegion *types.Value `json:"AuthorizedAwsRegion,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-aggregationauthorization.html#cfn-config-aggregationauthorization-tags
+	Tags []cloudformation.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 *AggregationAuthorization) AWSCloudFormationType() string {
+	return "AWS::Config::AggregationAuthorization"
+}
+
+// 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 AggregationAuthorization) MarshalJSON() ([]byte, error) {
+	type Properties AggregationAuthorization
+	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 *AggregationAuthorization) UnmarshalJSON(b []byte) error {
+	type Properties AggregationAuthorization
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AggregationAuthorization(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/config/aws-config-configrule.go b/goformation/cloudformation/config/aws-config-configrule.go
new file mode 100644
index 0000000000..9b21fd1437
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-configrule.go
@@ -0,0 +1,133 @@
+package config
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigRule AWS CloudFormation Resource (AWS::Config::ConfigRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configrule.html
+type ConfigRule struct {
+
+	// ConfigRuleName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configrule.html#cfn-config-configrule-configrulename
+	ConfigRuleName *types.Value `json:"ConfigRuleName,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configrule.html#cfn-config-configrule-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// InputParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configrule.html#cfn-config-configrule-inputparameters
+	InputParameters interface{} `json:"InputParameters,omitempty"`
+
+	// MaximumExecutionFrequency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configrule.html#cfn-config-configrule-maximumexecutionfrequency
+	MaximumExecutionFrequency *types.Value `json:"MaximumExecutionFrequency,omitempty"`
+
+	// Scope AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configrule.html#cfn-config-configrule-scope
+	Scope *ConfigRule_Scope `json:"Scope,omitempty"`
+
+	// Source AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configrule.html#cfn-config-configrule-source
+	Source *ConfigRule_Source `json:"Source,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConfigRule) AWSCloudFormationType() string {
+	return "AWS::Config::ConfigRule"
+}
+
+// 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 ConfigRule) MarshalJSON() ([]byte, error) {
+	type Properties ConfigRule
+	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 *ConfigRule) UnmarshalJSON(b []byte) error {
+	type Properties ConfigRule
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ConfigRule(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/config/aws-config-configrule_scope.go b/goformation/cloudformation/config/aws-config-configrule_scope.go
new file mode 100644
index 0000000000..5e739d49cf
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-configrule_scope.go
@@ -0,0 +1,52 @@
+package config
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigRule_Scope AWS CloudFormation Resource (AWS::Config::ConfigRule.Scope)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-scope.html
+type ConfigRule_Scope struct {
+
+	// ComplianceResourceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-scope.html#cfn-config-configrule-scope-complianceresourceid
+	ComplianceResourceId *types.Value `json:"ComplianceResourceId,omitempty"`
+
+	// ComplianceResourceTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-scope.html#cfn-config-configrule-scope-complianceresourcetypes
+	ComplianceResourceTypes *types.Value `json:"ComplianceResourceTypes,omitempty"`
+
+	// TagKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-scope.html#cfn-config-configrule-scope-tagkey
+	TagKey *types.Value `json:"TagKey,omitempty"`
+
+	// TagValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-scope.html#cfn-config-configrule-scope-tagvalue
+	TagValue *types.Value `json:"TagValue,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConfigRule_Scope) AWSCloudFormationType() string {
+	return "AWS::Config::ConfigRule.Scope"
+}
diff --git a/goformation/cloudformation/config/aws-config-configrule_source.go b/goformation/cloudformation/config/aws-config-configrule_source.go
new file mode 100644
index 0000000000..8bfaffa989
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-configrule_source.go
@@ -0,0 +1,47 @@
+package config
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigRule_Source AWS CloudFormation Resource (AWS::Config::ConfigRule.Source)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-source.html
+type ConfigRule_Source struct {
+
+	// Owner AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-source.html#cfn-config-configrule-source-owner
+	Owner *types.Value `json:"Owner,omitempty"`
+
+	// SourceDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-source.html#cfn-config-configrule-source-sourcedetails
+	SourceDetails []ConfigRule_SourceDetail `json:"SourceDetails,omitempty"`
+
+	// SourceIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-source.html#cfn-config-configrule-source-sourceidentifier
+	SourceIdentifier *types.Value `json:"SourceIdentifier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConfigRule_Source) AWSCloudFormationType() string {
+	return "AWS::Config::ConfigRule.Source"
+}
diff --git a/goformation/cloudformation/config/aws-config-configrule_sourcedetail.go b/goformation/cloudformation/config/aws-config-configrule_sourcedetail.go
new file mode 100644
index 0000000000..7722595949
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-configrule_sourcedetail.go
@@ -0,0 +1,47 @@
+package config
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigRule_SourceDetail AWS CloudFormation Resource (AWS::Config::ConfigRule.SourceDetail)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-source-sourcedetails.html
+type ConfigRule_SourceDetail struct {
+
+	// EventSource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-source-sourcedetails.html#cfn-config-configrule-source-sourcedetail-eventsource
+	EventSource *types.Value `json:"EventSource,omitempty"`
+
+	// MaximumExecutionFrequency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-source-sourcedetails.html#cfn-config-configrule-sourcedetail-maximumexecutionfrequency
+	MaximumExecutionFrequency *types.Value `json:"MaximumExecutionFrequency,omitempty"`
+
+	// MessageType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configrule-source-sourcedetails.html#cfn-config-configrule-source-sourcedetail-messagetype
+	MessageType *types.Value `json:"MessageType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConfigRule_SourceDetail) AWSCloudFormationType() string {
+	return "AWS::Config::ConfigRule.SourceDetail"
+}
diff --git a/goformation/cloudformation/config/aws-config-configurationaggregator.go b/goformation/cloudformation/config/aws-config-configurationaggregator.go
new file mode 100644
index 0000000000..e35cd18481
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-configurationaggregator.go
@@ -0,0 +1,124 @@
+package config
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationAggregator AWS CloudFormation Resource (AWS::Config::ConfigurationAggregator)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configurationaggregator.html
+type ConfigurationAggregator struct {
+
+	// AccountAggregationSources AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configurationaggregator.html#cfn-config-configurationaggregator-accountaggregationsources
+	AccountAggregationSources []ConfigurationAggregator_AccountAggregationSource `json:"AccountAggregationSources,omitempty"`
+
+	// ConfigurationAggregatorName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configurationaggregator.html#cfn-config-configurationaggregator-configurationaggregatorname
+	ConfigurationAggregatorName *types.Value `json:"ConfigurationAggregatorName,omitempty"`
+
+	// OrganizationAggregationSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configurationaggregator.html#cfn-config-configurationaggregator-organizationaggregationsource
+	OrganizationAggregationSource *ConfigurationAggregator_OrganizationAggregationSource `json:"OrganizationAggregationSource,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configurationaggregator.html#cfn-config-configurationaggregator-tags
+	Tags []cloudformation.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 *ConfigurationAggregator) AWSCloudFormationType() string {
+	return "AWS::Config::ConfigurationAggregator"
+}
+
+// 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 ConfigurationAggregator) MarshalJSON() ([]byte, error) {
+	type Properties ConfigurationAggregator
+	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 *ConfigurationAggregator) UnmarshalJSON(b []byte) error {
+	type Properties ConfigurationAggregator
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ConfigurationAggregator(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/config/aws-config-configurationaggregator_accountaggregationsource.go b/goformation/cloudformation/config/aws-config-configurationaggregator_accountaggregationsource.go
new file mode 100644
index 0000000000..67a79c27af
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-configurationaggregator_accountaggregationsource.go
@@ -0,0 +1,47 @@
+package config
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationAggregator_AccountAggregationSource AWS CloudFormation Resource (AWS::Config::ConfigurationAggregator.AccountAggregationSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configurationaggregator-accountaggregationsource.html
+type ConfigurationAggregator_AccountAggregationSource struct {
+
+	// AccountIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configurationaggregator-accountaggregationsource.html#cfn-config-configurationaggregator-accountaggregationsource-accountids
+	AccountIds *types.Value `json:"AccountIds,omitempty"`
+
+	// AllAwsRegions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configurationaggregator-accountaggregationsource.html#cfn-config-configurationaggregator-accountaggregationsource-allawsregions
+	AllAwsRegions *types.Value `json:"AllAwsRegions,omitempty"`
+
+	// AwsRegions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configurationaggregator-accountaggregationsource.html#cfn-config-configurationaggregator-accountaggregationsource-awsregions
+	AwsRegions *types.Value `json:"AwsRegions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConfigurationAggregator_AccountAggregationSource) AWSCloudFormationType() string {
+	return "AWS::Config::ConfigurationAggregator.AccountAggregationSource"
+}
diff --git a/goformation/cloudformation/config/aws-config-configurationaggregator_organizationaggregationsource.go b/goformation/cloudformation/config/aws-config-configurationaggregator_organizationaggregationsource.go
new file mode 100644
index 0000000000..928fe0831c
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-configurationaggregator_organizationaggregationsource.go
@@ -0,0 +1,47 @@
+package config
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationAggregator_OrganizationAggregationSource AWS CloudFormation Resource (AWS::Config::ConfigurationAggregator.OrganizationAggregationSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configurationaggregator-organizationaggregationsource.html
+type ConfigurationAggregator_OrganizationAggregationSource struct {
+
+	// AllAwsRegions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configurationaggregator-organizationaggregationsource.html#cfn-config-configurationaggregator-organizationaggregationsource-allawsregions
+	AllAwsRegions *types.Value `json:"AllAwsRegions,omitempty"`
+
+	// AwsRegions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configurationaggregator-organizationaggregationsource.html#cfn-config-configurationaggregator-organizationaggregationsource-awsregions
+	AwsRegions *types.Value `json:"AwsRegions,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configurationaggregator-organizationaggregationsource.html#cfn-config-configurationaggregator-organizationaggregationsource-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConfigurationAggregator_OrganizationAggregationSource) AWSCloudFormationType() string {
+	return "AWS::Config::ConfigurationAggregator.OrganizationAggregationSource"
+}
diff --git a/goformation/cloudformation/config/aws-config-configurationrecorder.go b/goformation/cloudformation/config/aws-config-configurationrecorder.go
new file mode 100644
index 0000000000..adcf279cdb
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-configurationrecorder.go
@@ -0,0 +1,118 @@
+package config
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationRecorder AWS CloudFormation Resource (AWS::Config::ConfigurationRecorder)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configurationrecorder.html
+type ConfigurationRecorder struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configurationrecorder.html#cfn-config-configurationrecorder-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RecordingGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configurationrecorder.html#cfn-config-configurationrecorder-recordinggroup
+	RecordingGroup *ConfigurationRecorder_RecordingGroup `json:"RecordingGroup,omitempty"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-configurationrecorder.html#cfn-config-configurationrecorder-rolearn
+	RoleARN *types.Value `json:"RoleARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConfigurationRecorder) AWSCloudFormationType() string {
+	return "AWS::Config::ConfigurationRecorder"
+}
+
+// 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 ConfigurationRecorder) MarshalJSON() ([]byte, error) {
+	type Properties ConfigurationRecorder
+	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 *ConfigurationRecorder) UnmarshalJSON(b []byte) error {
+	type Properties ConfigurationRecorder
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ConfigurationRecorder(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/config/aws-config-configurationrecorder_recordinggroup.go b/goformation/cloudformation/config/aws-config-configurationrecorder_recordinggroup.go
new file mode 100644
index 0000000000..99db495b4a
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-configurationrecorder_recordinggroup.go
@@ -0,0 +1,47 @@
+package config
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationRecorder_RecordingGroup AWS CloudFormation Resource (AWS::Config::ConfigurationRecorder.RecordingGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configurationrecorder-recordinggroup.html
+type ConfigurationRecorder_RecordingGroup struct {
+
+	// AllSupported AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configurationrecorder-recordinggroup.html#cfn-config-configurationrecorder-recordinggroup-allsupported
+	AllSupported *types.Value `json:"AllSupported,omitempty"`
+
+	// IncludeGlobalResourceTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configurationrecorder-recordinggroup.html#cfn-config-configurationrecorder-recordinggroup-includeglobalresourcetypes
+	IncludeGlobalResourceTypes *types.Value `json:"IncludeGlobalResourceTypes,omitempty"`
+
+	// ResourceTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-configurationrecorder-recordinggroup.html#cfn-config-configurationrecorder-recordinggroup-resourcetypes
+	ResourceTypes *types.Value `json:"ResourceTypes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConfigurationRecorder_RecordingGroup) AWSCloudFormationType() string {
+	return "AWS::Config::ConfigurationRecorder.RecordingGroup"
+}
diff --git a/goformation/cloudformation/config/aws-config-conformancepack.go b/goformation/cloudformation/config/aws-config-conformancepack.go
new file mode 100644
index 0000000000..f1da352883
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-conformancepack.go
@@ -0,0 +1,133 @@
+package config
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConformancePack AWS CloudFormation Resource (AWS::Config::ConformancePack)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-conformancepack.html
+type ConformancePack struct {
+
+	// ConformancePackInputParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-conformancepack.html#cfn-config-conformancepack-conformancepackinputparameters
+	ConformancePackInputParameters []ConformancePack_ConformancePackInputParameter `json:"ConformancePackInputParameters,omitempty"`
+
+	// ConformancePackName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-conformancepack.html#cfn-config-conformancepack-conformancepackname
+	ConformancePackName *types.Value `json:"ConformancePackName,omitempty"`
+
+	// DeliveryS3Bucket AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-conformancepack.html#cfn-config-conformancepack-deliverys3bucket
+	DeliveryS3Bucket *types.Value `json:"DeliveryS3Bucket,omitempty"`
+
+	// DeliveryS3KeyPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-conformancepack.html#cfn-config-conformancepack-deliverys3keyprefix
+	DeliveryS3KeyPrefix *types.Value `json:"DeliveryS3KeyPrefix,omitempty"`
+
+	// TemplateBody AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-conformancepack.html#cfn-config-conformancepack-templatebody
+	TemplateBody *types.Value `json:"TemplateBody,omitempty"`
+
+	// TemplateS3Uri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-conformancepack.html#cfn-config-conformancepack-templates3uri
+	TemplateS3Uri *types.Value `json:"TemplateS3Uri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConformancePack) AWSCloudFormationType() string {
+	return "AWS::Config::ConformancePack"
+}
+
+// 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 ConformancePack) MarshalJSON() ([]byte, error) {
+	type Properties ConformancePack
+	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 *ConformancePack) UnmarshalJSON(b []byte) error {
+	type Properties ConformancePack
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ConformancePack(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/config/aws-config-conformancepack_conformancepackinputparameter.go b/goformation/cloudformation/config/aws-config-conformancepack_conformancepackinputparameter.go
new file mode 100644
index 0000000000..30f674f8cf
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-conformancepack_conformancepackinputparameter.go
@@ -0,0 +1,42 @@
+package config
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConformancePack_ConformancePackInputParameter AWS CloudFormation Resource (AWS::Config::ConformancePack.ConformancePackInputParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-conformancepack-conformancepackinputparameter.html
+type ConformancePack_ConformancePackInputParameter struct {
+
+	// ParameterName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-conformancepack-conformancepackinputparameter.html#cfn-config-conformancepack-conformancepackinputparameter-parametername
+	ParameterName *types.Value `json:"ParameterName,omitempty"`
+
+	// ParameterValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-conformancepack-conformancepackinputparameter.html#cfn-config-conformancepack-conformancepackinputparameter-parametervalue
+	ParameterValue *types.Value `json:"ParameterValue,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConformancePack_ConformancePackInputParameter) AWSCloudFormationType() string {
+	return "AWS::Config::ConformancePack.ConformancePackInputParameter"
+}
diff --git a/goformation/cloudformation/config/aws-config-deliverychannel.go b/goformation/cloudformation/config/aws-config-deliverychannel.go
new file mode 100644
index 0000000000..53eb25da74
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-deliverychannel.go
@@ -0,0 +1,133 @@
+package config
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryChannel AWS CloudFormation Resource (AWS::Config::DeliveryChannel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-deliverychannel.html
+type DeliveryChannel struct {
+
+	// ConfigSnapshotDeliveryProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-deliverychannel.html#cfn-config-deliverychannel-configsnapshotdeliveryproperties
+	ConfigSnapshotDeliveryProperties *DeliveryChannel_ConfigSnapshotDeliveryProperties `json:"ConfigSnapshotDeliveryProperties,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-deliverychannel.html#cfn-config-deliverychannel-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// S3BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-deliverychannel.html#cfn-config-deliverychannel-s3bucketname
+	S3BucketName *types.Value `json:"S3BucketName,omitempty"`
+
+	// S3KeyPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-deliverychannel.html#cfn-config-deliverychannel-s3keyprefix
+	S3KeyPrefix *types.Value `json:"S3KeyPrefix,omitempty"`
+
+	// S3KmsKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-deliverychannel.html#cfn-config-deliverychannel-s3kmskeyarn
+	S3KmsKeyArn *types.Value `json:"S3KmsKeyArn,omitempty"`
+
+	// SnsTopicARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-deliverychannel.html#cfn-config-deliverychannel-snstopicarn
+	SnsTopicARN *types.Value `json:"SnsTopicARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeliveryChannel) AWSCloudFormationType() string {
+	return "AWS::Config::DeliveryChannel"
+}
+
+// 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 DeliveryChannel) MarshalJSON() ([]byte, error) {
+	type Properties DeliveryChannel
+	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 *DeliveryChannel) UnmarshalJSON(b []byte) error {
+	type Properties DeliveryChannel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DeliveryChannel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/config/aws-config-deliverychannel_configsnapshotdeliveryproperties.go b/goformation/cloudformation/config/aws-config-deliverychannel_configsnapshotdeliveryproperties.go
new file mode 100644
index 0000000000..a253840233
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-deliverychannel_configsnapshotdeliveryproperties.go
@@ -0,0 +1,37 @@
+package config
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryChannel_ConfigSnapshotDeliveryProperties AWS CloudFormation Resource (AWS::Config::DeliveryChannel.ConfigSnapshotDeliveryProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-deliverychannel-configsnapshotdeliveryproperties.html
+type DeliveryChannel_ConfigSnapshotDeliveryProperties struct {
+
+	// DeliveryFrequency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-deliverychannel-configsnapshotdeliveryproperties.html#cfn-config-deliverychannel-configsnapshotdeliveryproperties-deliveryfrequency
+	DeliveryFrequency *types.Value `json:"DeliveryFrequency,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeliveryChannel_ConfigSnapshotDeliveryProperties) AWSCloudFormationType() string {
+	return "AWS::Config::DeliveryChannel.ConfigSnapshotDeliveryProperties"
+}
diff --git a/goformation/cloudformation/config/aws-config-organizationconfigrule.go b/goformation/cloudformation/config/aws-config-organizationconfigrule.go
new file mode 100644
index 0000000000..a79ecd0e20
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-organizationconfigrule.go
@@ -0,0 +1,123 @@
+package config
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OrganizationConfigRule AWS CloudFormation Resource (AWS::Config::OrganizationConfigRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-organizationconfigrule.html
+type OrganizationConfigRule struct {
+
+	// ExcludedAccounts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-organizationconfigrule.html#cfn-config-organizationconfigrule-excludedaccounts
+	ExcludedAccounts *types.Value `json:"ExcludedAccounts,omitempty"`
+
+	// OrganizationConfigRuleName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-organizationconfigrule.html#cfn-config-organizationconfigrule-organizationconfigrulename
+	OrganizationConfigRuleName *types.Value `json:"OrganizationConfigRuleName,omitempty"`
+
+	// OrganizationCustomRuleMetadata AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-organizationconfigrule.html#cfn-config-organizationconfigrule-organizationcustomrulemetadata
+	OrganizationCustomRuleMetadata *OrganizationConfigRule_OrganizationCustomRuleMetadata `json:"OrganizationCustomRuleMetadata,omitempty"`
+
+	// OrganizationManagedRuleMetadata AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-organizationconfigrule.html#cfn-config-organizationconfigrule-organizationmanagedrulemetadata
+	OrganizationManagedRuleMetadata *OrganizationConfigRule_OrganizationManagedRuleMetadata `json:"OrganizationManagedRuleMetadata,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *OrganizationConfigRule) AWSCloudFormationType() string {
+	return "AWS::Config::OrganizationConfigRule"
+}
+
+// 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 OrganizationConfigRule) MarshalJSON() ([]byte, error) {
+	type Properties OrganizationConfigRule
+	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 *OrganizationConfigRule) UnmarshalJSON(b []byte) error {
+	type Properties OrganizationConfigRule
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = OrganizationConfigRule(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/config/aws-config-organizationconfigrule_organizationcustomrulemetadata.go b/goformation/cloudformation/config/aws-config-organizationconfigrule_organizationcustomrulemetadata.go
new file mode 100644
index 0000000000..e1f0dc320e
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-organizationconfigrule_organizationcustomrulemetadata.go
@@ -0,0 +1,77 @@
+package config
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OrganizationConfigRule_OrganizationCustomRuleMetadata AWS CloudFormation Resource (AWS::Config::OrganizationConfigRule.OrganizationCustomRuleMetadata)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconfigrule-organizationcustomrulemetadata.html
+type OrganizationConfigRule_OrganizationCustomRuleMetadata struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconfigrule-organizationcustomrulemetadata.html#cfn-config-organizationconfigrule-organizationcustomrulemetadata-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// InputParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconfigrule-organizationcustomrulemetadata.html#cfn-config-organizationconfigrule-organizationcustomrulemetadata-inputparameters
+	InputParameters *types.Value `json:"InputParameters,omitempty"`
+
+	// LambdaFunctionArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconfigrule-organizationcustomrulemetadata.html#cfn-config-organizationconfigrule-organizationcustomrulemetadata-lambdafunctionarn
+	LambdaFunctionArn *types.Value `json:"LambdaFunctionArn,omitempty"`
+
+	// MaximumExecutionFrequency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconfigrule-organizationcustomrulemetadata.html#cfn-config-organizationconfigrule-organizationcustomrulemetadata-maximumexecutionfrequency
+	MaximumExecutionFrequency *types.Value `json:"MaximumExecutionFrequency,omitempty"`
+
+	// OrganizationConfigRuleTriggerTypes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconfigrule-organizationcustomrulemetadata.html#cfn-config-organizationconfigrule-organizationcustomrulemetadata-organizationconfigruletriggertypes
+	OrganizationConfigRuleTriggerTypes *types.Value `json:"OrganizationConfigRuleTriggerTypes,omitempty"`
+
+	// ResourceIdScope AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconfigrule-organizationcustomrulemetadata.html#cfn-config-organizationconfigrule-organizationcustomrulemetadata-resourceidscope
+	ResourceIdScope *types.Value `json:"ResourceIdScope,omitempty"`
+
+	// ResourceTypesScope AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconfigrule-organizationcustomrulemetadata.html#cfn-config-organizationconfigrule-organizationcustomrulemetadata-resourcetypesscope
+	ResourceTypesScope *types.Value `json:"ResourceTypesScope,omitempty"`
+
+	// TagKeyScope AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconfigrule-organizationcustomrulemetadata.html#cfn-config-organizationconfigrule-organizationcustomrulemetadata-tagkeyscope
+	TagKeyScope *types.Value `json:"TagKeyScope,omitempty"`
+
+	// TagValueScope AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconfigrule-organizationcustomrulemetadata.html#cfn-config-organizationconfigrule-organizationcustomrulemetadata-tagvaluescope
+	TagValueScope *types.Value `json:"TagValueScope,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *OrganizationConfigRule_OrganizationCustomRuleMetadata) AWSCloudFormationType() string {
+	return "AWS::Config::OrganizationConfigRule.OrganizationCustomRuleMetadata"
+}
diff --git a/goformation/cloudformation/config/aws-config-organizationconfigrule_organizationmanagedrulemetadata.go b/goformation/cloudformation/config/aws-config-organizationconfigrule_organizationmanagedrulemetadata.go
new file mode 100644
index 0000000000..d116a3cfa9
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-organizationconfigrule_organizationmanagedrulemetadata.go
@@ -0,0 +1,72 @@
+package config
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OrganizationConfigRule_OrganizationManagedRuleMetadata AWS CloudFormation Resource (AWS::Config::OrganizationConfigRule.OrganizationManagedRuleMetadata)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconfigrule-organizationmanagedrulemetadata.html
+type OrganizationConfigRule_OrganizationManagedRuleMetadata struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconfigrule-organizationmanagedrulemetadata.html#cfn-config-organizationconfigrule-organizationmanagedrulemetadata-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// InputParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconfigrule-organizationmanagedrulemetadata.html#cfn-config-organizationconfigrule-organizationmanagedrulemetadata-inputparameters
+	InputParameters *types.Value `json:"InputParameters,omitempty"`
+
+	// MaximumExecutionFrequency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconfigrule-organizationmanagedrulemetadata.html#cfn-config-organizationconfigrule-organizationmanagedrulemetadata-maximumexecutionfrequency
+	MaximumExecutionFrequency *types.Value `json:"MaximumExecutionFrequency,omitempty"`
+
+	// ResourceIdScope AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconfigrule-organizationmanagedrulemetadata.html#cfn-config-organizationconfigrule-organizationmanagedrulemetadata-resourceidscope
+	ResourceIdScope *types.Value `json:"ResourceIdScope,omitempty"`
+
+	// ResourceTypesScope AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconfigrule-organizationmanagedrulemetadata.html#cfn-config-organizationconfigrule-organizationmanagedrulemetadata-resourcetypesscope
+	ResourceTypesScope *types.Value `json:"ResourceTypesScope,omitempty"`
+
+	// RuleIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconfigrule-organizationmanagedrulemetadata.html#cfn-config-organizationconfigrule-organizationmanagedrulemetadata-ruleidentifier
+	RuleIdentifier *types.Value `json:"RuleIdentifier,omitempty"`
+
+	// TagKeyScope AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconfigrule-organizationmanagedrulemetadata.html#cfn-config-organizationconfigrule-organizationmanagedrulemetadata-tagkeyscope
+	TagKeyScope *types.Value `json:"TagKeyScope,omitempty"`
+
+	// TagValueScope AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconfigrule-organizationmanagedrulemetadata.html#cfn-config-organizationconfigrule-organizationmanagedrulemetadata-tagvaluescope
+	TagValueScope *types.Value `json:"TagValueScope,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *OrganizationConfigRule_OrganizationManagedRuleMetadata) AWSCloudFormationType() string {
+	return "AWS::Config::OrganizationConfigRule.OrganizationManagedRuleMetadata"
+}
diff --git a/goformation/cloudformation/config/aws-config-organizationconformancepack.go b/goformation/cloudformation/config/aws-config-organizationconformancepack.go
new file mode 100644
index 0000000000..b8c579e20b
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-organizationconformancepack.go
@@ -0,0 +1,138 @@
+package config
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OrganizationConformancePack AWS CloudFormation Resource (AWS::Config::OrganizationConformancePack)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-organizationconformancepack.html
+type OrganizationConformancePack struct {
+
+	// ConformancePackInputParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-organizationconformancepack.html#cfn-config-organizationconformancepack-conformancepackinputparameters
+	ConformancePackInputParameters []OrganizationConformancePack_ConformancePackInputParameter `json:"ConformancePackInputParameters,omitempty"`
+
+	// DeliveryS3Bucket AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-organizationconformancepack.html#cfn-config-organizationconformancepack-deliverys3bucket
+	DeliveryS3Bucket *types.Value `json:"DeliveryS3Bucket,omitempty"`
+
+	// DeliveryS3KeyPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-organizationconformancepack.html#cfn-config-organizationconformancepack-deliverys3keyprefix
+	DeliveryS3KeyPrefix *types.Value `json:"DeliveryS3KeyPrefix,omitempty"`
+
+	// ExcludedAccounts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-organizationconformancepack.html#cfn-config-organizationconformancepack-excludedaccounts
+	ExcludedAccounts *types.Value `json:"ExcludedAccounts,omitempty"`
+
+	// OrganizationConformancePackName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-organizationconformancepack.html#cfn-config-organizationconformancepack-organizationconformancepackname
+	OrganizationConformancePackName *types.Value `json:"OrganizationConformancePackName,omitempty"`
+
+	// TemplateBody AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-organizationconformancepack.html#cfn-config-organizationconformancepack-templatebody
+	TemplateBody *types.Value `json:"TemplateBody,omitempty"`
+
+	// TemplateS3Uri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-organizationconformancepack.html#cfn-config-organizationconformancepack-templates3uri
+	TemplateS3Uri *types.Value `json:"TemplateS3Uri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *OrganizationConformancePack) AWSCloudFormationType() string {
+	return "AWS::Config::OrganizationConformancePack"
+}
+
+// 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 OrganizationConformancePack) MarshalJSON() ([]byte, error) {
+	type Properties OrganizationConformancePack
+	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 *OrganizationConformancePack) UnmarshalJSON(b []byte) error {
+	type Properties OrganizationConformancePack
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = OrganizationConformancePack(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/config/aws-config-organizationconformancepack_conformancepackinputparameter.go b/goformation/cloudformation/config/aws-config-organizationconformancepack_conformancepackinputparameter.go
new file mode 100644
index 0000000000..599bf2b4cd
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-organizationconformancepack_conformancepackinputparameter.go
@@ -0,0 +1,42 @@
+package config
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OrganizationConformancePack_ConformancePackInputParameter AWS CloudFormation Resource (AWS::Config::OrganizationConformancePack.ConformancePackInputParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconformancepack-conformancepackinputparameter.html
+type OrganizationConformancePack_ConformancePackInputParameter struct {
+
+	// ParameterName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconformancepack-conformancepackinputparameter.html#cfn-config-organizationconformancepack-conformancepackinputparameter-parametername
+	ParameterName *types.Value `json:"ParameterName,omitempty"`
+
+	// ParameterValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-organizationconformancepack-conformancepackinputparameter.html#cfn-config-organizationconformancepack-conformancepackinputparameter-parametervalue
+	ParameterValue *types.Value `json:"ParameterValue,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *OrganizationConformancePack_ConformancePackInputParameter) AWSCloudFormationType() string {
+	return "AWS::Config::OrganizationConformancePack.ConformancePackInputParameter"
+}
diff --git a/goformation/cloudformation/config/aws-config-remediationconfiguration.go b/goformation/cloudformation/config/aws-config-remediationconfiguration.go
new file mode 100644
index 0000000000..057d5709c0
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-remediationconfiguration.go
@@ -0,0 +1,153 @@
+package config
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RemediationConfiguration AWS CloudFormation Resource (AWS::Config::RemediationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-remediationconfiguration.html
+type RemediationConfiguration struct {
+
+	// Automatic AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-remediationconfiguration.html#cfn-config-remediationconfiguration-automatic
+	Automatic *types.Value `json:"Automatic,omitempty"`
+
+	// ConfigRuleName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-remediationconfiguration.html#cfn-config-remediationconfiguration-configrulename
+	ConfigRuleName *types.Value `json:"ConfigRuleName,omitempty"`
+
+	// ExecutionControls AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-remediationconfiguration.html#cfn-config-remediationconfiguration-executioncontrols
+	ExecutionControls *RemediationConfiguration_ExecutionControls `json:"ExecutionControls,omitempty"`
+
+	// MaximumAutomaticAttempts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-remediationconfiguration.html#cfn-config-remediationconfiguration-maximumautomaticattempts
+	MaximumAutomaticAttempts *types.Value `json:"MaximumAutomaticAttempts,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-remediationconfiguration.html#cfn-config-remediationconfiguration-parameters
+	Parameters interface{} `json:"Parameters,omitempty"`
+
+	// ResourceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-remediationconfiguration.html#cfn-config-remediationconfiguration-resourcetype
+	ResourceType *types.Value `json:"ResourceType,omitempty"`
+
+	// RetryAttemptSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-remediationconfiguration.html#cfn-config-remediationconfiguration-retryattemptseconds
+	RetryAttemptSeconds *types.Value `json:"RetryAttemptSeconds,omitempty"`
+
+	// TargetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-remediationconfiguration.html#cfn-config-remediationconfiguration-targetid
+	TargetId *types.Value `json:"TargetId,omitempty"`
+
+	// TargetType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-remediationconfiguration.html#cfn-config-remediationconfiguration-targettype
+	TargetType *types.Value `json:"TargetType,omitempty"`
+
+	// TargetVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-remediationconfiguration.html#cfn-config-remediationconfiguration-targetversion
+	TargetVersion *types.Value `json:"TargetVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RemediationConfiguration) AWSCloudFormationType() string {
+	return "AWS::Config::RemediationConfiguration"
+}
+
+// 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 RemediationConfiguration) MarshalJSON() ([]byte, error) {
+	type Properties RemediationConfiguration
+	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 *RemediationConfiguration) UnmarshalJSON(b []byte) error {
+	type Properties RemediationConfiguration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RemediationConfiguration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/config/aws-config-remediationconfiguration_executioncontrols.go b/goformation/cloudformation/config/aws-config-remediationconfiguration_executioncontrols.go
new file mode 100644
index 0000000000..0052a0d5bc
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-remediationconfiguration_executioncontrols.go
@@ -0,0 +1,35 @@
+package config
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RemediationConfiguration_ExecutionControls AWS CloudFormation Resource (AWS::Config::RemediationConfiguration.ExecutionControls)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-remediationconfiguration-executioncontrols.html
+type RemediationConfiguration_ExecutionControls struct {
+
+	// SsmControls AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-remediationconfiguration-executioncontrols.html#cfn-config-remediationconfiguration-executioncontrols-ssmcontrols
+	SsmControls *RemediationConfiguration_SsmControls `json:"SsmControls,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RemediationConfiguration_ExecutionControls) AWSCloudFormationType() string {
+	return "AWS::Config::RemediationConfiguration.ExecutionControls"
+}
diff --git a/goformation/cloudformation/config/aws-config-remediationconfiguration_remediationparametervalue.go b/goformation/cloudformation/config/aws-config-remediationconfiguration_remediationparametervalue.go
new file mode 100644
index 0000000000..f743298f62
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-remediationconfiguration_remediationparametervalue.go
@@ -0,0 +1,40 @@
+package config
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RemediationConfiguration_RemediationParameterValue AWS CloudFormation Resource (AWS::Config::RemediationConfiguration.RemediationParameterValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-remediationconfiguration-remediationparametervalue.html
+type RemediationConfiguration_RemediationParameterValue struct {
+
+	// ResourceValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-remediationconfiguration-remediationparametervalue.html#cfn-config-remediationconfiguration-remediationparametervalue-resourcevalue
+	ResourceValue *RemediationConfiguration_ResourceValue `json:"ResourceValue,omitempty"`
+
+	// StaticValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-remediationconfiguration-remediationparametervalue.html#cfn-config-remediationconfiguration-remediationparametervalue-staticvalue
+	StaticValue *RemediationConfiguration_StaticValue `json:"StaticValue,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RemediationConfiguration_RemediationParameterValue) AWSCloudFormationType() string {
+	return "AWS::Config::RemediationConfiguration.RemediationParameterValue"
+}
diff --git a/goformation/cloudformation/config/aws-config-remediationconfiguration_resourcevalue.go b/goformation/cloudformation/config/aws-config-remediationconfiguration_resourcevalue.go
new file mode 100644
index 0000000000..3410444f5e
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-remediationconfiguration_resourcevalue.go
@@ -0,0 +1,37 @@
+package config
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RemediationConfiguration_ResourceValue AWS CloudFormation Resource (AWS::Config::RemediationConfiguration.ResourceValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-remediationconfiguration-resourcevalue.html
+type RemediationConfiguration_ResourceValue struct {
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-remediationconfiguration-resourcevalue.html#cfn-config-remediationconfiguration-resourcevalue-value
+	Value *types.Value `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 *RemediationConfiguration_ResourceValue) AWSCloudFormationType() string {
+	return "AWS::Config::RemediationConfiguration.ResourceValue"
+}
diff --git a/goformation/cloudformation/config/aws-config-remediationconfiguration_ssmcontrols.go b/goformation/cloudformation/config/aws-config-remediationconfiguration_ssmcontrols.go
new file mode 100644
index 0000000000..1806710ec4
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-remediationconfiguration_ssmcontrols.go
@@ -0,0 +1,42 @@
+package config
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RemediationConfiguration_SsmControls AWS CloudFormation Resource (AWS::Config::RemediationConfiguration.SsmControls)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-remediationconfiguration-ssmcontrols.html
+type RemediationConfiguration_SsmControls struct {
+
+	// ConcurrentExecutionRatePercentage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-remediationconfiguration-ssmcontrols.html#cfn-config-remediationconfiguration-ssmcontrols-concurrentexecutionratepercentage
+	ConcurrentExecutionRatePercentage *types.Value `json:"ConcurrentExecutionRatePercentage,omitempty"`
+
+	// ErrorPercentage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-remediationconfiguration-ssmcontrols.html#cfn-config-remediationconfiguration-ssmcontrols-errorpercentage
+	ErrorPercentage *types.Value `json:"ErrorPercentage,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RemediationConfiguration_SsmControls) AWSCloudFormationType() string {
+	return "AWS::Config::RemediationConfiguration.SsmControls"
+}
diff --git a/goformation/cloudformation/config/aws-config-remediationconfiguration_staticvalue.go b/goformation/cloudformation/config/aws-config-remediationconfiguration_staticvalue.go
new file mode 100644
index 0000000000..80c983c79b
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-remediationconfiguration_staticvalue.go
@@ -0,0 +1,37 @@
+package config
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RemediationConfiguration_StaticValue AWS CloudFormation Resource (AWS::Config::RemediationConfiguration.StaticValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-remediationconfiguration-staticvalue.html
+type RemediationConfiguration_StaticValue struct {
+
+	// Values AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-config-remediationconfiguration-staticvalue.html#cfn-config-remediationconfiguration-staticvalue-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RemediationConfiguration_StaticValue) AWSCloudFormationType() string {
+	return "AWS::Config::RemediationConfiguration.StaticValue"
+}
diff --git a/goformation/cloudformation/config/aws-config-storedquery.go b/goformation/cloudformation/config/aws-config-storedquery.go
new file mode 100644
index 0000000000..4dbfcb8c8c
--- /dev/null
+++ b/goformation/cloudformation/config/aws-config-storedquery.go
@@ -0,0 +1,124 @@
+package config
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// StoredQuery AWS CloudFormation Resource (AWS::Config::StoredQuery)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-storedquery.html
+type StoredQuery struct {
+
+	// QueryDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-storedquery.html#cfn-config-storedquery-querydescription
+	QueryDescription *types.Value `json:"QueryDescription,omitempty"`
+
+	// QueryExpression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-storedquery.html#cfn-config-storedquery-queryexpression
+	QueryExpression *types.Value `json:"QueryExpression,omitempty"`
+
+	// QueryName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-storedquery.html#cfn-config-storedquery-queryname
+	QueryName *types.Value `json:"QueryName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-config-storedquery.html#cfn-config-storedquery-tags
+	Tags []cloudformation.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 *StoredQuery) AWSCloudFormationType() string {
+	return "AWS::Config::StoredQuery"
+}
+
+// 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 StoredQuery) MarshalJSON() ([]byte, error) {
+	type Properties StoredQuery
+	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 *StoredQuery) UnmarshalJSON(b []byte) error {
+	type Properties StoredQuery
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = StoredQuery(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/connect/aws-connect-contactflow.go b/goformation/cloudformation/connect/aws-connect-contactflow.go
new file mode 100644
index 0000000000..f570b81cc6
--- /dev/null
+++ b/goformation/cloudformation/connect/aws-connect-contactflow.go
@@ -0,0 +1,139 @@
+package connect
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ContactFlow AWS CloudFormation Resource (AWS::Connect::ContactFlow)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-contactflow.html
+type ContactFlow struct {
+
+	// Content AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-contactflow.html#cfn-connect-contactflow-content
+	Content *types.Value `json:"Content,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-contactflow.html#cfn-connect-contactflow-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// InstanceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-contactflow.html#cfn-connect-contactflow-instancearn
+	InstanceArn *types.Value `json:"InstanceArn,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-contactflow.html#cfn-connect-contactflow-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// State AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-contactflow.html#cfn-connect-contactflow-state
+	State *types.Value `json:"State,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-contactflow.html#cfn-connect-contactflow-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-contactflow.html#cfn-connect-contactflow-type
+	Type *types.Value `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 *ContactFlow) AWSCloudFormationType() string {
+	return "AWS::Connect::ContactFlow"
+}
+
+// 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 ContactFlow) MarshalJSON() ([]byte, error) {
+	type Properties ContactFlow
+	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 *ContactFlow) UnmarshalJSON(b []byte) error {
+	type Properties ContactFlow
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ContactFlow(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/connect/aws-connect-contactflowmodule.go b/goformation/cloudformation/connect/aws-connect-contactflowmodule.go
new file mode 100644
index 0000000000..c5ca649328
--- /dev/null
+++ b/goformation/cloudformation/connect/aws-connect-contactflowmodule.go
@@ -0,0 +1,134 @@
+package connect
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ContactFlowModule AWS CloudFormation Resource (AWS::Connect::ContactFlowModule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-contactflowmodule.html
+type ContactFlowModule struct {
+
+	// Content AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-contactflowmodule.html#cfn-connect-contactflowmodule-content
+	Content *types.Value `json:"Content,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-contactflowmodule.html#cfn-connect-contactflowmodule-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// InstanceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-contactflowmodule.html#cfn-connect-contactflowmodule-instancearn
+	InstanceArn *types.Value `json:"InstanceArn,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-contactflowmodule.html#cfn-connect-contactflowmodule-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// State AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-contactflowmodule.html#cfn-connect-contactflowmodule-state
+	State *types.Value `json:"State,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-contactflowmodule.html#cfn-connect-contactflowmodule-tags
+	Tags []cloudformation.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 *ContactFlowModule) AWSCloudFormationType() string {
+	return "AWS::Connect::ContactFlowModule"
+}
+
+// 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 ContactFlowModule) MarshalJSON() ([]byte, error) {
+	type Properties ContactFlowModule
+	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 *ContactFlowModule) UnmarshalJSON(b []byte) error {
+	type Properties ContactFlowModule
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ContactFlowModule(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/connect/aws-connect-hoursofoperation.go b/goformation/cloudformation/connect/aws-connect-hoursofoperation.go
new file mode 100644
index 0000000000..21413bb0ff
--- /dev/null
+++ b/goformation/cloudformation/connect/aws-connect-hoursofoperation.go
@@ -0,0 +1,134 @@
+package connect
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// HoursOfOperation AWS CloudFormation Resource (AWS::Connect::HoursOfOperation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-hoursofoperation.html
+type HoursOfOperation struct {
+
+	// Config AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-hoursofoperation.html#cfn-connect-hoursofoperation-config
+	Config []HoursOfOperation_HoursOfOperationConfig `json:"Config,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-hoursofoperation.html#cfn-connect-hoursofoperation-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// InstanceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-hoursofoperation.html#cfn-connect-hoursofoperation-instancearn
+	InstanceArn *types.Value `json:"InstanceArn,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-hoursofoperation.html#cfn-connect-hoursofoperation-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-hoursofoperation.html#cfn-connect-hoursofoperation-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TimeZone AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-hoursofoperation.html#cfn-connect-hoursofoperation-timezone
+	TimeZone *types.Value `json:"TimeZone,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *HoursOfOperation) AWSCloudFormationType() string {
+	return "AWS::Connect::HoursOfOperation"
+}
+
+// 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 HoursOfOperation) MarshalJSON() ([]byte, error) {
+	type Properties HoursOfOperation
+	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 *HoursOfOperation) UnmarshalJSON(b []byte) error {
+	type Properties HoursOfOperation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = HoursOfOperation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationconfig.go b/goformation/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationconfig.go
new file mode 100644
index 0000000000..aaf8753ec8
--- /dev/null
+++ b/goformation/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationconfig.go
@@ -0,0 +1,47 @@
+package connect
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// HoursOfOperation_HoursOfOperationConfig AWS CloudFormation Resource (AWS::Connect::HoursOfOperation.HoursOfOperationConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-hoursofoperation-hoursofoperationconfig.html
+type HoursOfOperation_HoursOfOperationConfig struct {
+
+	// Day AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-hoursofoperation-hoursofoperationconfig.html#cfn-connect-hoursofoperation-hoursofoperationconfig-day
+	Day *types.Value `json:"Day,omitempty"`
+
+	// EndTime AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-hoursofoperation-hoursofoperationconfig.html#cfn-connect-hoursofoperation-hoursofoperationconfig-endtime
+	EndTime *HoursOfOperation_HoursOfOperationTimeSlice `json:"EndTime,omitempty"`
+
+	// StartTime AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-hoursofoperation-hoursofoperationconfig.html#cfn-connect-hoursofoperation-hoursofoperationconfig-starttime
+	StartTime *HoursOfOperation_HoursOfOperationTimeSlice `json:"StartTime,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *HoursOfOperation_HoursOfOperationConfig) AWSCloudFormationType() string {
+	return "AWS::Connect::HoursOfOperation.HoursOfOperationConfig"
+}
diff --git a/goformation/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationtimeslice.go b/goformation/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationtimeslice.go
new file mode 100644
index 0000000000..784202eb2b
--- /dev/null
+++ b/goformation/cloudformation/connect/aws-connect-hoursofoperation_hoursofoperationtimeslice.go
@@ -0,0 +1,42 @@
+package connect
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// HoursOfOperation_HoursOfOperationTimeSlice AWS CloudFormation Resource (AWS::Connect::HoursOfOperation.HoursOfOperationTimeSlice)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-hoursofoperation-hoursofoperationtimeslice.html
+type HoursOfOperation_HoursOfOperationTimeSlice struct {
+
+	// Hours AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-hoursofoperation-hoursofoperationtimeslice.html#cfn-connect-hoursofoperation-hoursofoperationtimeslice-hours
+	Hours *types.Value `json:"Hours"`
+
+	// Minutes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-hoursofoperation-hoursofoperationtimeslice.html#cfn-connect-hoursofoperation-hoursofoperationtimeslice-minutes
+	Minutes *types.Value `json:"Minutes"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *HoursOfOperation_HoursOfOperationTimeSlice) AWSCloudFormationType() string {
+	return "AWS::Connect::HoursOfOperation.HoursOfOperationTimeSlice"
+}
diff --git a/goformation/cloudformation/connect/aws-connect-quickconnect.go b/goformation/cloudformation/connect/aws-connect-quickconnect.go
new file mode 100644
index 0000000000..f6424993db
--- /dev/null
+++ b/goformation/cloudformation/connect/aws-connect-quickconnect.go
@@ -0,0 +1,129 @@
+package connect
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// QuickConnect AWS CloudFormation Resource (AWS::Connect::QuickConnect)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-quickconnect.html
+type QuickConnect struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-quickconnect.html#cfn-connect-quickconnect-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// InstanceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-quickconnect.html#cfn-connect-quickconnect-instancearn
+	InstanceArn *types.Value `json:"InstanceArn,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-quickconnect.html#cfn-connect-quickconnect-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// QuickConnectConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-quickconnect.html#cfn-connect-quickconnect-quickconnectconfig
+	QuickConnectConfig *QuickConnect_QuickConnectConfig `json:"QuickConnectConfig,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-quickconnect.html#cfn-connect-quickconnect-tags
+	Tags []cloudformation.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 *QuickConnect) AWSCloudFormationType() string {
+	return "AWS::Connect::QuickConnect"
+}
+
+// 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 QuickConnect) MarshalJSON() ([]byte, error) {
+	type Properties QuickConnect
+	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 *QuickConnect) UnmarshalJSON(b []byte) error {
+	type Properties QuickConnect
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = QuickConnect(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/connect/aws-connect-quickconnect_phonenumberquickconnectconfig.go b/goformation/cloudformation/connect/aws-connect-quickconnect_phonenumberquickconnectconfig.go
new file mode 100644
index 0000000000..b62ff06932
--- /dev/null
+++ b/goformation/cloudformation/connect/aws-connect-quickconnect_phonenumberquickconnectconfig.go
@@ -0,0 +1,37 @@
+package connect
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// QuickConnect_PhoneNumberQuickConnectConfig AWS CloudFormation Resource (AWS::Connect::QuickConnect.PhoneNumberQuickConnectConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-phonenumberquickconnectconfig.html
+type QuickConnect_PhoneNumberQuickConnectConfig struct {
+
+	// PhoneNumber AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-phonenumberquickconnectconfig.html#cfn-connect-quickconnect-phonenumberquickconnectconfig-phonenumber
+	PhoneNumber *types.Value `json:"PhoneNumber,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *QuickConnect_PhoneNumberQuickConnectConfig) AWSCloudFormationType() string {
+	return "AWS::Connect::QuickConnect.PhoneNumberQuickConnectConfig"
+}
diff --git a/goformation/cloudformation/connect/aws-connect-quickconnect_queuequickconnectconfig.go b/goformation/cloudformation/connect/aws-connect-quickconnect_queuequickconnectconfig.go
new file mode 100644
index 0000000000..e35550b285
--- /dev/null
+++ b/goformation/cloudformation/connect/aws-connect-quickconnect_queuequickconnectconfig.go
@@ -0,0 +1,42 @@
+package connect
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// QuickConnect_QueueQuickConnectConfig AWS CloudFormation Resource (AWS::Connect::QuickConnect.QueueQuickConnectConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-queuequickconnectconfig.html
+type QuickConnect_QueueQuickConnectConfig struct {
+
+	// ContactFlowArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-queuequickconnectconfig.html#cfn-connect-quickconnect-queuequickconnectconfig-contactflowarn
+	ContactFlowArn *types.Value `json:"ContactFlowArn,omitempty"`
+
+	// QueueArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-queuequickconnectconfig.html#cfn-connect-quickconnect-queuequickconnectconfig-queuearn
+	QueueArn *types.Value `json:"QueueArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *QuickConnect_QueueQuickConnectConfig) AWSCloudFormationType() string {
+	return "AWS::Connect::QuickConnect.QueueQuickConnectConfig"
+}
diff --git a/goformation/cloudformation/connect/aws-connect-quickconnect_quickconnectconfig.go b/goformation/cloudformation/connect/aws-connect-quickconnect_quickconnectconfig.go
new file mode 100644
index 0000000000..5e14e7bf4d
--- /dev/null
+++ b/goformation/cloudformation/connect/aws-connect-quickconnect_quickconnectconfig.go
@@ -0,0 +1,52 @@
+package connect
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// QuickConnect_QuickConnectConfig AWS CloudFormation Resource (AWS::Connect::QuickConnect.QuickConnectConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-quickconnectconfig.html
+type QuickConnect_QuickConnectConfig struct {
+
+	// PhoneConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-quickconnectconfig.html#cfn-connect-quickconnect-quickconnectconfig-phoneconfig
+	PhoneConfig *QuickConnect_PhoneNumberQuickConnectConfig `json:"PhoneConfig,omitempty"`
+
+	// QueueConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-quickconnectconfig.html#cfn-connect-quickconnect-quickconnectconfig-queueconfig
+	QueueConfig *QuickConnect_QueueQuickConnectConfig `json:"QueueConfig,omitempty"`
+
+	// QuickConnectType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-quickconnectconfig.html#cfn-connect-quickconnect-quickconnectconfig-quickconnecttype
+	QuickConnectType *types.Value `json:"QuickConnectType,omitempty"`
+
+	// UserConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-quickconnectconfig.html#cfn-connect-quickconnect-quickconnectconfig-userconfig
+	UserConfig *QuickConnect_UserQuickConnectConfig `json:"UserConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *QuickConnect_QuickConnectConfig) AWSCloudFormationType() string {
+	return "AWS::Connect::QuickConnect.QuickConnectConfig"
+}
diff --git a/goformation/cloudformation/connect/aws-connect-quickconnect_userquickconnectconfig.go b/goformation/cloudformation/connect/aws-connect-quickconnect_userquickconnectconfig.go
new file mode 100644
index 0000000000..cc23909536
--- /dev/null
+++ b/goformation/cloudformation/connect/aws-connect-quickconnect_userquickconnectconfig.go
@@ -0,0 +1,42 @@
+package connect
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// QuickConnect_UserQuickConnectConfig AWS CloudFormation Resource (AWS::Connect::QuickConnect.UserQuickConnectConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-userquickconnectconfig.html
+type QuickConnect_UserQuickConnectConfig struct {
+
+	// ContactFlowArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-userquickconnectconfig.html#cfn-connect-quickconnect-userquickconnectconfig-contactflowarn
+	ContactFlowArn *types.Value `json:"ContactFlowArn,omitempty"`
+
+	// UserArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-quickconnect-userquickconnectconfig.html#cfn-connect-quickconnect-userquickconnectconfig-userarn
+	UserArn *types.Value `json:"UserArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *QuickConnect_UserQuickConnectConfig) AWSCloudFormationType() string {
+	return "AWS::Connect::QuickConnect.UserQuickConnectConfig"
+}
diff --git a/goformation/cloudformation/connect/aws-connect-user.go b/goformation/cloudformation/connect/aws-connect-user.go
new file mode 100644
index 0000000000..3d1c1eb0d3
--- /dev/null
+++ b/goformation/cloudformation/connect/aws-connect-user.go
@@ -0,0 +1,154 @@
+package connect
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// User AWS CloudFormation Resource (AWS::Connect::User)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-user.html
+type User struct {
+
+	// DirectoryUserId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-user.html#cfn-connect-user-directoryuserid
+	DirectoryUserId *types.Value `json:"DirectoryUserId,omitempty"`
+
+	// HierarchyGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-user.html#cfn-connect-user-hierarchygrouparn
+	HierarchyGroupArn *types.Value `json:"HierarchyGroupArn,omitempty"`
+
+	// IdentityInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-user.html#cfn-connect-user-identityinfo
+	IdentityInfo *User_UserIdentityInfo `json:"IdentityInfo,omitempty"`
+
+	// InstanceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-user.html#cfn-connect-user-instancearn
+	InstanceArn *types.Value `json:"InstanceArn,omitempty"`
+
+	// Password AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-user.html#cfn-connect-user-password
+	Password *types.Value `json:"Password,omitempty"`
+
+	// PhoneConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-user.html#cfn-connect-user-phoneconfig
+	PhoneConfig *User_UserPhoneConfig `json:"PhoneConfig,omitempty"`
+
+	// RoutingProfileArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-user.html#cfn-connect-user-routingprofilearn
+	RoutingProfileArn *types.Value `json:"RoutingProfileArn,omitempty"`
+
+	// SecurityProfileArns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-user.html#cfn-connect-user-securityprofilearns
+	SecurityProfileArns *types.Value `json:"SecurityProfileArns,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-user.html#cfn-connect-user-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-user.html#cfn-connect-user-username
+	Username *types.Value `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 *User) AWSCloudFormationType() string {
+	return "AWS::Connect::User"
+}
+
+// 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 User) MarshalJSON() ([]byte, error) {
+	type Properties User
+	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 *User) UnmarshalJSON(b []byte) error {
+	type Properties User
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = User(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/connect/aws-connect-user_useridentityinfo.go b/goformation/cloudformation/connect/aws-connect-user_useridentityinfo.go
new file mode 100644
index 0000000000..5c74a174ec
--- /dev/null
+++ b/goformation/cloudformation/connect/aws-connect-user_useridentityinfo.go
@@ -0,0 +1,47 @@
+package connect
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// User_UserIdentityInfo AWS CloudFormation Resource (AWS::Connect::User.UserIdentityInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-user-useridentityinfo.html
+type User_UserIdentityInfo struct {
+
+	// Email AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-user-useridentityinfo.html#cfn-connect-user-useridentityinfo-email
+	Email *types.Value `json:"Email,omitempty"`
+
+	// FirstName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-user-useridentityinfo.html#cfn-connect-user-useridentityinfo-firstname
+	FirstName *types.Value `json:"FirstName,omitempty"`
+
+	// LastName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-user-useridentityinfo.html#cfn-connect-user-useridentityinfo-lastname
+	LastName *types.Value `json:"LastName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *User_UserIdentityInfo) AWSCloudFormationType() string {
+	return "AWS::Connect::User.UserIdentityInfo"
+}
diff --git a/goformation/cloudformation/connect/aws-connect-user_userphoneconfig.go b/goformation/cloudformation/connect/aws-connect-user_userphoneconfig.go
new file mode 100644
index 0000000000..f9cda7fc6f
--- /dev/null
+++ b/goformation/cloudformation/connect/aws-connect-user_userphoneconfig.go
@@ -0,0 +1,52 @@
+package connect
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// User_UserPhoneConfig AWS CloudFormation Resource (AWS::Connect::User.UserPhoneConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-user-userphoneconfig.html
+type User_UserPhoneConfig struct {
+
+	// AfterContactWorkTimeLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-user-userphoneconfig.html#cfn-connect-user-userphoneconfig-aftercontactworktimelimit
+	AfterContactWorkTimeLimit *types.Value `json:"AfterContactWorkTimeLimit,omitempty"`
+
+	// AutoAccept AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-user-userphoneconfig.html#cfn-connect-user-userphoneconfig-autoaccept
+	AutoAccept *types.Value `json:"AutoAccept,omitempty"`
+
+	// DeskPhoneNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-user-userphoneconfig.html#cfn-connect-user-userphoneconfig-deskphonenumber
+	DeskPhoneNumber *types.Value `json:"DeskPhoneNumber,omitempty"`
+
+	// PhoneType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-connect-user-userphoneconfig.html#cfn-connect-user-userphoneconfig-phonetype
+	PhoneType *types.Value `json:"PhoneType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *User_UserPhoneConfig) AWSCloudFormationType() string {
+	return "AWS::Connect::User.UserPhoneConfig"
+}
diff --git a/goformation/cloudformation/connect/aws-connect-userhierarchygroup.go b/goformation/cloudformation/connect/aws-connect-userhierarchygroup.go
new file mode 100644
index 0000000000..02bdaa9c02
--- /dev/null
+++ b/goformation/cloudformation/connect/aws-connect-userhierarchygroup.go
@@ -0,0 +1,118 @@
+package connect
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserHierarchyGroup AWS CloudFormation Resource (AWS::Connect::UserHierarchyGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-userhierarchygroup.html
+type UserHierarchyGroup struct {
+
+	// InstanceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-userhierarchygroup.html#cfn-connect-userhierarchygroup-instancearn
+	InstanceArn *types.Value `json:"InstanceArn,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-userhierarchygroup.html#cfn-connect-userhierarchygroup-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ParentGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-connect-userhierarchygroup.html#cfn-connect-userhierarchygroup-parentgrouparn
+	ParentGroupArn *types.Value `json:"ParentGroupArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserHierarchyGroup) AWSCloudFormationType() string {
+	return "AWS::Connect::UserHierarchyGroup"
+}
+
+// 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 UserHierarchyGroup) MarshalJSON() ([]byte, error) {
+	type Properties UserHierarchyGroup
+	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 *UserHierarchyGroup) UnmarshalJSON(b []byte) error {
+	type Properties UserHierarchyGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = UserHierarchyGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/cur/aws-cur-reportdefinition.go b/goformation/cloudformation/cur/aws-cur-reportdefinition.go
new file mode 100644
index 0000000000..7f3ea6610c
--- /dev/null
+++ b/goformation/cloudformation/cur/aws-cur-reportdefinition.go
@@ -0,0 +1,163 @@
+package cur
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReportDefinition AWS CloudFormation Resource (AWS::CUR::ReportDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html
+type ReportDefinition struct {
+
+	// AdditionalArtifacts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-additionalartifacts
+	AdditionalArtifacts *types.Value `json:"AdditionalArtifacts,omitempty"`
+
+	// AdditionalSchemaElements AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-additionalschemaelements
+	AdditionalSchemaElements *types.Value `json:"AdditionalSchemaElements,omitempty"`
+
+	// BillingViewArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-billingviewarn
+	BillingViewArn *types.Value `json:"BillingViewArn,omitempty"`
+
+	// Compression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-compression
+	Compression *types.Value `json:"Compression,omitempty"`
+
+	// Format AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-format
+	Format *types.Value `json:"Format,omitempty"`
+
+	// RefreshClosedReports AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-refreshclosedreports
+	RefreshClosedReports *types.Value `json:"RefreshClosedReports"`
+
+	// ReportName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-reportname
+	ReportName *types.Value `json:"ReportName,omitempty"`
+
+	// ReportVersioning AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-reportversioning
+	ReportVersioning *types.Value `json:"ReportVersioning,omitempty"`
+
+	// S3Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-s3bucket
+	S3Bucket *types.Value `json:"S3Bucket,omitempty"`
+
+	// S3Prefix AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-s3prefix
+	S3Prefix *types.Value `json:"S3Prefix,omitempty"`
+
+	// S3Region AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-s3region
+	S3Region *types.Value `json:"S3Region,omitempty"`
+
+	// TimeUnit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cur-reportdefinition.html#cfn-cur-reportdefinition-timeunit
+	TimeUnit *types.Value `json:"TimeUnit,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReportDefinition) AWSCloudFormationType() string {
+	return "AWS::CUR::ReportDefinition"
+}
+
+// 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 ReportDefinition) MarshalJSON() ([]byte, error) {
+	type Properties ReportDefinition
+	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 *ReportDefinition) UnmarshalJSON(b []byte) error {
+	type Properties ReportDefinition
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ReportDefinition(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/custom_resource.go b/goformation/cloudformation/custom_resource.go
new file mode 100644
index 0000000000..ca80374240
--- /dev/null
+++ b/goformation/cloudformation/custom_resource.go
@@ -0,0 +1,87 @@
+package cloudformation
+
+import (
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-cfn-customresource.html
+type CustomResource struct {
+	Type       string                 `json:"Type,omitempty"`
+	Properties map[string]interface{} `json:"Properties,omitempty"`
+
+	// _deletionPolicy represents a CloudFormation DeletionPolicy
+	_deletionPolicy policies.DeletionPolicy
+
+	// _dependsOn stores the logical ID of the resources to be created before this resource
+	_dependsOn []string
+
+	// _metadata stores structured data associated with this resource
+	_metadata map[string]interface{}
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CustomResource) AWSCloudFormationType() string {
+	return r.Type
+}
+
+// DependsOn returns a slice of logical ID names this resource depends on.
+// see: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-dependson.html
+func (r *CustomResource) DependsOn() []string {
+	return r._dependsOn
+}
+
+// SetDependsOn specify that the creation of this resource follows another.
+// see: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-dependson.html
+func (r *CustomResource) SetDependsOn(dependencies []string) {
+	r._dependsOn = dependencies
+}
+
+// Metadata returns the metadata associated with this resource.
+// see: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-metadata.html
+func (r *CustomResource) Metadata() map[string]interface{} {
+	return r._metadata
+}
+
+// SetMetadata enables you to associate structured data with this resource.
+// see: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-metadata.html
+func (r *CustomResource) SetMetadata(metadata map[string]interface{}) {
+	r._metadata = metadata
+}
+
+// DeletionPolicy returns the AWS CloudFormation DeletionPolicy to this resource
+// see: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-deletionpolicy.html
+func (r *CustomResource) DeletionPolicy() policies.DeletionPolicy {
+	return r._deletionPolicy
+}
+
+// SetDeletionPolicy applies an AWS CloudFormation DeletionPolicy to this resource
+// see: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-deletionpolicy.html
+func (r *CustomResource) SetDeletionPolicy(policy policies.DeletionPolicy) {
+	r._deletionPolicy = policy
+}
+
+// GetAllCustomResourceResources retrieves all CustomResource items from an AWS CloudFormation template
+func (t *Template) GetAllCustomResources() map[string]*CustomResource {
+	results := map[string]*CustomResource{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *CustomResource:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// GetCustomResourceWithName retrieves all CustomResource items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) GetCustomResourceWithName(name string) (*CustomResource, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *CustomResource:
+			return resource, nil
+		}
+	}
+	return nil, fmt.Errorf("resource %q of type CustomResource not found", name)
+}
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-domain.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-domain.go
new file mode 100644
index 0000000000..31a4b0fe86
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-domain.go
@@ -0,0 +1,129 @@
+package customerprofiles
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain AWS CloudFormation Resource (AWS::CustomerProfiles::Domain)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-domain.html
+type Domain struct {
+
+	// DeadLetterQueueUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-domain.html#cfn-customerprofiles-domain-deadletterqueueurl
+	DeadLetterQueueUrl *types.Value `json:"DeadLetterQueueUrl,omitempty"`
+
+	// DefaultEncryptionKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-domain.html#cfn-customerprofiles-domain-defaultencryptionkey
+	DefaultEncryptionKey *types.Value `json:"DefaultEncryptionKey,omitempty"`
+
+	// DefaultExpirationDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-domain.html#cfn-customerprofiles-domain-defaultexpirationdays
+	DefaultExpirationDays *types.Value `json:"DefaultExpirationDays,omitempty"`
+
+	// DomainName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-domain.html#cfn-customerprofiles-domain-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-domain.html#cfn-customerprofiles-domain-tags
+	Tags []cloudformation.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 *Domain) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::Domain"
+}
+
+// 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 Domain) MarshalJSON() ([]byte, error) {
+	type Properties Domain
+	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 *Domain) UnmarshalJSON(b []byte) error {
+	type Properties Domain
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Domain(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration.go
new file mode 100644
index 0000000000..7b94f33a18
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration.go
@@ -0,0 +1,129 @@
+package customerprofiles
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Integration AWS CloudFormation Resource (AWS::CustomerProfiles::Integration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-integration.html
+type Integration struct {
+
+	// DomainName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-integration.html#cfn-customerprofiles-integration-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// FlowDefinition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-integration.html#cfn-customerprofiles-integration-flowdefinition
+	FlowDefinition *Integration_FlowDefinition `json:"FlowDefinition,omitempty"`
+
+	// ObjectTypeName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-integration.html#cfn-customerprofiles-integration-objecttypename
+	ObjectTypeName *types.Value `json:"ObjectTypeName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-integration.html#cfn-customerprofiles-integration-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Uri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-integration.html#cfn-customerprofiles-integration-uri
+	Uri *types.Value `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 *Integration) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::Integration"
+}
+
+// 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 Integration) MarshalJSON() ([]byte, error) {
+	type Properties Integration
+	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 *Integration) UnmarshalJSON(b []byte) error {
+	type Properties Integration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Integration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_connectoroperator.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_connectoroperator.go
new file mode 100644
index 0000000000..0e426af002
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_connectoroperator.go
@@ -0,0 +1,57 @@
+package customerprofiles
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Integration_ConnectorOperator AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.ConnectorOperator)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-connectoroperator.html
+type Integration_ConnectorOperator struct {
+
+	// Marketo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-connectoroperator.html#cfn-customerprofiles-integration-connectoroperator-marketo
+	Marketo *types.Value `json:"Marketo,omitempty"`
+
+	// S3 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-connectoroperator.html#cfn-customerprofiles-integration-connectoroperator-s3
+	S3 *types.Value `json:"S3,omitempty"`
+
+	// Salesforce AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-connectoroperator.html#cfn-customerprofiles-integration-connectoroperator-salesforce
+	Salesforce *types.Value `json:"Salesforce,omitempty"`
+
+	// ServiceNow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-connectoroperator.html#cfn-customerprofiles-integration-connectoroperator-servicenow
+	ServiceNow *types.Value `json:"ServiceNow,omitempty"`
+
+	// Zendesk AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-connectoroperator.html#cfn-customerprofiles-integration-connectoroperator-zendesk
+	Zendesk *types.Value `json:"Zendesk,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ConnectorOperator) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::Integration.ConnectorOperator"
+}
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_flowdefinition.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_flowdefinition.go
new file mode 100644
index 0000000000..3ad7637940
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_flowdefinition.go
@@ -0,0 +1,62 @@
+package customerprofiles
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Integration_FlowDefinition AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.FlowDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-flowdefinition.html
+type Integration_FlowDefinition struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-flowdefinition.html#cfn-customerprofiles-integration-flowdefinition-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// FlowName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-flowdefinition.html#cfn-customerprofiles-integration-flowdefinition-flowname
+	FlowName *types.Value `json:"FlowName,omitempty"`
+
+	// KmsArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-flowdefinition.html#cfn-customerprofiles-integration-flowdefinition-kmsarn
+	KmsArn *types.Value `json:"KmsArn,omitempty"`
+
+	// SourceFlowConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-flowdefinition.html#cfn-customerprofiles-integration-flowdefinition-sourceflowconfig
+	SourceFlowConfig *Integration_SourceFlowConfig `json:"SourceFlowConfig,omitempty"`
+
+	// Tasks AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-flowdefinition.html#cfn-customerprofiles-integration-flowdefinition-tasks
+	Tasks []Integration_Task `json:"Tasks,omitempty"`
+
+	// TriggerConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-flowdefinition.html#cfn-customerprofiles-integration-flowdefinition-triggerconfig
+	TriggerConfig *Integration_TriggerConfig `json:"TriggerConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_FlowDefinition) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::Integration.FlowDefinition"
+}
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_incrementalpullconfig.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_incrementalpullconfig.go
new file mode 100644
index 0000000000..8f40b59faa
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_incrementalpullconfig.go
@@ -0,0 +1,37 @@
+package customerprofiles
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Integration_IncrementalPullConfig AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.IncrementalPullConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-incrementalpullconfig.html
+type Integration_IncrementalPullConfig struct {
+
+	// DatetimeTypeFieldName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-incrementalpullconfig.html#cfn-customerprofiles-integration-incrementalpullconfig-datetimetypefieldname
+	DatetimeTypeFieldName *types.Value `json:"DatetimeTypeFieldName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_IncrementalPullConfig) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::Integration.IncrementalPullConfig"
+}
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_marketosourceproperties.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_marketosourceproperties.go
new file mode 100644
index 0000000000..84355dd5b5
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_marketosourceproperties.go
@@ -0,0 +1,37 @@
+package customerprofiles
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Integration_MarketoSourceProperties AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.MarketoSourceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-marketosourceproperties.html
+type Integration_MarketoSourceProperties struct {
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-marketosourceproperties.html#cfn-customerprofiles-integration-marketosourceproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_MarketoSourceProperties) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::Integration.MarketoSourceProperties"
+}
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_s3sourceproperties.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_s3sourceproperties.go
new file mode 100644
index 0000000000..ada956beb6
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_s3sourceproperties.go
@@ -0,0 +1,42 @@
+package customerprofiles
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Integration_S3SourceProperties AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.S3SourceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-s3sourceproperties.html
+type Integration_S3SourceProperties struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-s3sourceproperties.html#cfn-customerprofiles-integration-s3sourceproperties-bucketname
+	BucketName *types.Value `json:"BucketName,omitempty"`
+
+	// BucketPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-s3sourceproperties.html#cfn-customerprofiles-integration-s3sourceproperties-bucketprefix
+	BucketPrefix *types.Value `json:"BucketPrefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_S3SourceProperties) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::Integration.S3SourceProperties"
+}
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_salesforcesourceproperties.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_salesforcesourceproperties.go
new file mode 100644
index 0000000000..b29cc71e15
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_salesforcesourceproperties.go
@@ -0,0 +1,47 @@
+package customerprofiles
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Integration_SalesforceSourceProperties AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.SalesforceSourceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-salesforcesourceproperties.html
+type Integration_SalesforceSourceProperties struct {
+
+	// EnableDynamicFieldUpdate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-salesforcesourceproperties.html#cfn-customerprofiles-integration-salesforcesourceproperties-enabledynamicfieldupdate
+	EnableDynamicFieldUpdate *types.Value `json:"EnableDynamicFieldUpdate,omitempty"`
+
+	// IncludeDeletedRecords AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-salesforcesourceproperties.html#cfn-customerprofiles-integration-salesforcesourceproperties-includedeletedrecords
+	IncludeDeletedRecords *types.Value `json:"IncludeDeletedRecords,omitempty"`
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-salesforcesourceproperties.html#cfn-customerprofiles-integration-salesforcesourceproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SalesforceSourceProperties) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::Integration.SalesforceSourceProperties"
+}
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_scheduledtriggerproperties.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_scheduledtriggerproperties.go
new file mode 100644
index 0000000000..e0766bd607
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_scheduledtriggerproperties.go
@@ -0,0 +1,67 @@
+package customerprofiles
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Integration_ScheduledTriggerProperties AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.ScheduledTriggerProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-scheduledtriggerproperties.html
+type Integration_ScheduledTriggerProperties struct {
+
+	// DataPullMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-scheduledtriggerproperties.html#cfn-customerprofiles-integration-scheduledtriggerproperties-datapullmode
+	DataPullMode *types.Value `json:"DataPullMode,omitempty"`
+
+	// FirstExecutionFrom AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-scheduledtriggerproperties.html#cfn-customerprofiles-integration-scheduledtriggerproperties-firstexecutionfrom
+	FirstExecutionFrom *types.Value `json:"FirstExecutionFrom,omitempty"`
+
+	// ScheduleEndTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-scheduledtriggerproperties.html#cfn-customerprofiles-integration-scheduledtriggerproperties-scheduleendtime
+	ScheduleEndTime *types.Value `json:"ScheduleEndTime,omitempty"`
+
+	// ScheduleExpression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-scheduledtriggerproperties.html#cfn-customerprofiles-integration-scheduledtriggerproperties-scheduleexpression
+	ScheduleExpression *types.Value `json:"ScheduleExpression,omitempty"`
+
+	// ScheduleOffset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-scheduledtriggerproperties.html#cfn-customerprofiles-integration-scheduledtriggerproperties-scheduleoffset
+	ScheduleOffset *types.Value `json:"ScheduleOffset,omitempty"`
+
+	// ScheduleStartTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-scheduledtriggerproperties.html#cfn-customerprofiles-integration-scheduledtriggerproperties-schedulestarttime
+	ScheduleStartTime *types.Value `json:"ScheduleStartTime,omitempty"`
+
+	// Timezone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-scheduledtriggerproperties.html#cfn-customerprofiles-integration-scheduledtriggerproperties-timezone
+	Timezone *types.Value `json:"Timezone,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ScheduledTriggerProperties) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::Integration.ScheduledTriggerProperties"
+}
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_servicenowsourceproperties.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_servicenowsourceproperties.go
new file mode 100644
index 0000000000..cf7b0a22c1
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_servicenowsourceproperties.go
@@ -0,0 +1,37 @@
+package customerprofiles
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Integration_ServiceNowSourceProperties AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.ServiceNowSourceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-servicenowsourceproperties.html
+type Integration_ServiceNowSourceProperties struct {
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-servicenowsourceproperties.html#cfn-customerprofiles-integration-servicenowsourceproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ServiceNowSourceProperties) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::Integration.ServiceNowSourceProperties"
+}
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceconnectorproperties.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceconnectorproperties.go
new file mode 100644
index 0000000000..8419724033
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceconnectorproperties.go
@@ -0,0 +1,55 @@
+package customerprofiles
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Integration_SourceConnectorProperties AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.SourceConnectorProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-sourceconnectorproperties.html
+type Integration_SourceConnectorProperties struct {
+
+	// Marketo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-sourceconnectorproperties.html#cfn-customerprofiles-integration-sourceconnectorproperties-marketo
+	Marketo *Integration_MarketoSourceProperties `json:"Marketo,omitempty"`
+
+	// S3 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-sourceconnectorproperties.html#cfn-customerprofiles-integration-sourceconnectorproperties-s3
+	S3 *Integration_S3SourceProperties `json:"S3,omitempty"`
+
+	// Salesforce AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-sourceconnectorproperties.html#cfn-customerprofiles-integration-sourceconnectorproperties-salesforce
+	Salesforce *Integration_SalesforceSourceProperties `json:"Salesforce,omitempty"`
+
+	// ServiceNow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-sourceconnectorproperties.html#cfn-customerprofiles-integration-sourceconnectorproperties-servicenow
+	ServiceNow *Integration_ServiceNowSourceProperties `json:"ServiceNow,omitempty"`
+
+	// Zendesk AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-sourceconnectorproperties.html#cfn-customerprofiles-integration-sourceconnectorproperties-zendesk
+	Zendesk *Integration_ZendeskSourceProperties `json:"Zendesk,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SourceConnectorProperties) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::Integration.SourceConnectorProperties"
+}
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceflowconfig.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceflowconfig.go
new file mode 100644
index 0000000000..d173cd3bf5
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_sourceflowconfig.go
@@ -0,0 +1,52 @@
+package customerprofiles
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Integration_SourceFlowConfig AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.SourceFlowConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-sourceflowconfig.html
+type Integration_SourceFlowConfig struct {
+
+	// ConnectorProfileName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-sourceflowconfig.html#cfn-customerprofiles-integration-sourceflowconfig-connectorprofilename
+	ConnectorProfileName *types.Value `json:"ConnectorProfileName,omitempty"`
+
+	// ConnectorType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-sourceflowconfig.html#cfn-customerprofiles-integration-sourceflowconfig-connectortype
+	ConnectorType *types.Value `json:"ConnectorType,omitempty"`
+
+	// IncrementalPullConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-sourceflowconfig.html#cfn-customerprofiles-integration-sourceflowconfig-incrementalpullconfig
+	IncrementalPullConfig *Integration_IncrementalPullConfig `json:"IncrementalPullConfig,omitempty"`
+
+	// SourceConnectorProperties AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-sourceflowconfig.html#cfn-customerprofiles-integration-sourceflowconfig-sourceconnectorproperties
+	SourceConnectorProperties *Integration_SourceConnectorProperties `json:"SourceConnectorProperties,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SourceFlowConfig) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::Integration.SourceFlowConfig"
+}
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_task.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_task.go
new file mode 100644
index 0000000000..20f3282b39
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_task.go
@@ -0,0 +1,57 @@
+package customerprofiles
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Integration_Task AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.Task)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-task.html
+type Integration_Task struct {
+
+	// ConnectorOperator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-task.html#cfn-customerprofiles-integration-task-connectoroperator
+	ConnectorOperator *Integration_ConnectorOperator `json:"ConnectorOperator,omitempty"`
+
+	// DestinationField AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-task.html#cfn-customerprofiles-integration-task-destinationfield
+	DestinationField *types.Value `json:"DestinationField,omitempty"`
+
+	// SourceFields AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-task.html#cfn-customerprofiles-integration-task-sourcefields
+	SourceFields *types.Value `json:"SourceFields,omitempty"`
+
+	// TaskProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-task.html#cfn-customerprofiles-integration-task-taskproperties
+	TaskProperties []Integration_TaskPropertiesMap `json:"TaskProperties,omitempty"`
+
+	// TaskType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-task.html#cfn-customerprofiles-integration-task-tasktype
+	TaskType *types.Value `json:"TaskType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Task) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::Integration.Task"
+}
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_taskpropertiesmap.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_taskpropertiesmap.go
new file mode 100644
index 0000000000..2254f769ca
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_taskpropertiesmap.go
@@ -0,0 +1,42 @@
+package customerprofiles
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Integration_TaskPropertiesMap AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.TaskPropertiesMap)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-taskpropertiesmap.html
+type Integration_TaskPropertiesMap struct {
+
+	// OperatorPropertyKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-taskpropertiesmap.html#cfn-customerprofiles-integration-taskpropertiesmap-operatorpropertykey
+	OperatorPropertyKey *types.Value `json:"OperatorPropertyKey,omitempty"`
+
+	// Property AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-taskpropertiesmap.html#cfn-customerprofiles-integration-taskpropertiesmap-property
+	Property *types.Value `json:"Property,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TaskPropertiesMap) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::Integration.TaskPropertiesMap"
+}
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerconfig.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerconfig.go
new file mode 100644
index 0000000000..d3b3a464ec
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerconfig.go
@@ -0,0 +1,42 @@
+package customerprofiles
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Integration_TriggerConfig AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.TriggerConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-triggerconfig.html
+type Integration_TriggerConfig struct {
+
+	// TriggerProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-triggerconfig.html#cfn-customerprofiles-integration-triggerconfig-triggerproperties
+	TriggerProperties *Integration_TriggerProperties `json:"TriggerProperties,omitempty"`
+
+	// TriggerType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-triggerconfig.html#cfn-customerprofiles-integration-triggerconfig-triggertype
+	TriggerType *types.Value `json:"TriggerType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TriggerConfig) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::Integration.TriggerConfig"
+}
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerproperties.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerproperties.go
new file mode 100644
index 0000000000..ce7f8e3cd9
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_triggerproperties.go
@@ -0,0 +1,35 @@
+package customerprofiles
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Integration_TriggerProperties AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.TriggerProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-triggerproperties.html
+type Integration_TriggerProperties struct {
+
+	// Scheduled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-triggerproperties.html#cfn-customerprofiles-integration-triggerproperties-scheduled
+	Scheduled *Integration_ScheduledTriggerProperties `json:"Scheduled,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TriggerProperties) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::Integration.TriggerProperties"
+}
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_zendesksourceproperties.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_zendesksourceproperties.go
new file mode 100644
index 0000000000..c92f5e37a3
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-integration_zendesksourceproperties.go
@@ -0,0 +1,37 @@
+package customerprofiles
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Integration_ZendeskSourceProperties AWS CloudFormation Resource (AWS::CustomerProfiles::Integration.ZendeskSourceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-zendesksourceproperties.html
+type Integration_ZendeskSourceProperties struct {
+
+	// Object AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-integration-zendesksourceproperties.html#cfn-customerprofiles-integration-zendesksourceproperties-object
+	Object *types.Value `json:"Object,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ZendeskSourceProperties) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::Integration.ZendeskSourceProperties"
+}
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype.go
new file mode 100644
index 0000000000..8ec328fda6
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype.go
@@ -0,0 +1,154 @@
+package customerprofiles
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ObjectType AWS CloudFormation Resource (AWS::CustomerProfiles::ObjectType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-objecttype.html
+type ObjectType struct {
+
+	// AllowProfileCreation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-objecttype.html#cfn-customerprofiles-objecttype-allowprofilecreation
+	AllowProfileCreation *types.Value `json:"AllowProfileCreation,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-objecttype.html#cfn-customerprofiles-objecttype-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DomainName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-objecttype.html#cfn-customerprofiles-objecttype-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// EncryptionKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-objecttype.html#cfn-customerprofiles-objecttype-encryptionkey
+	EncryptionKey *types.Value `json:"EncryptionKey,omitempty"`
+
+	// ExpirationDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-objecttype.html#cfn-customerprofiles-objecttype-expirationdays
+	ExpirationDays *types.Value `json:"ExpirationDays,omitempty"`
+
+	// Fields AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-objecttype.html#cfn-customerprofiles-objecttype-fields
+	Fields []ObjectType_FieldMap `json:"Fields,omitempty"`
+
+	// Keys AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-objecttype.html#cfn-customerprofiles-objecttype-keys
+	Keys []ObjectType_KeyMap `json:"Keys,omitempty"`
+
+	// ObjectTypeName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-objecttype.html#cfn-customerprofiles-objecttype-objecttypename
+	ObjectTypeName *types.Value `json:"ObjectTypeName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-objecttype.html#cfn-customerprofiles-objecttype-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TemplateId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-customerprofiles-objecttype.html#cfn-customerprofiles-objecttype-templateid
+	TemplateId *types.Value `json:"TemplateId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ObjectType) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::ObjectType"
+}
+
+// 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 ObjectType) MarshalJSON() ([]byte, error) {
+	type Properties ObjectType
+	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 *ObjectType) UnmarshalJSON(b []byte) error {
+	type Properties ObjectType
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ObjectType(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_fieldmap.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_fieldmap.go
new file mode 100644
index 0000000000..c76ac2ffa5
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_fieldmap.go
@@ -0,0 +1,42 @@
+package customerprofiles
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ObjectType_FieldMap AWS CloudFormation Resource (AWS::CustomerProfiles::ObjectType.FieldMap)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-objecttype-fieldmap.html
+type ObjectType_FieldMap struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-objecttype-fieldmap.html#cfn-customerprofiles-objecttype-fieldmap-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ObjectTypeField AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-objecttype-fieldmap.html#cfn-customerprofiles-objecttype-fieldmap-objecttypefield
+	ObjectTypeField *ObjectType_ObjectTypeField `json:"ObjectTypeField,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ObjectType_FieldMap) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::ObjectType.FieldMap"
+}
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_keymap.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_keymap.go
new file mode 100644
index 0000000000..755ff569c8
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_keymap.go
@@ -0,0 +1,42 @@
+package customerprofiles
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ObjectType_KeyMap AWS CloudFormation Resource (AWS::CustomerProfiles::ObjectType.KeyMap)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-objecttype-keymap.html
+type ObjectType_KeyMap struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-objecttype-keymap.html#cfn-customerprofiles-objecttype-keymap-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ObjectTypeKeyList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-objecttype-keymap.html#cfn-customerprofiles-objecttype-keymap-objecttypekeylist
+	ObjectTypeKeyList []ObjectType_ObjectTypeKey `json:"ObjectTypeKeyList,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ObjectType_KeyMap) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::ObjectType.KeyMap"
+}
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypefield.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypefield.go
new file mode 100644
index 0000000000..320a881869
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypefield.go
@@ -0,0 +1,47 @@
+package customerprofiles
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ObjectType_ObjectTypeField AWS CloudFormation Resource (AWS::CustomerProfiles::ObjectType.ObjectTypeField)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-objecttype-objecttypefield.html
+type ObjectType_ObjectTypeField struct {
+
+	// ContentType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-objecttype-objecttypefield.html#cfn-customerprofiles-objecttype-objecttypefield-contenttype
+	ContentType *types.Value `json:"ContentType,omitempty"`
+
+	// Source AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-objecttype-objecttypefield.html#cfn-customerprofiles-objecttype-objecttypefield-source
+	Source *types.Value `json:"Source,omitempty"`
+
+	// Target AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-objecttype-objecttypefield.html#cfn-customerprofiles-objecttype-objecttypefield-target
+	Target *types.Value `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 *ObjectType_ObjectTypeField) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::ObjectType.ObjectTypeField"
+}
diff --git a/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypekey.go b/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypekey.go
new file mode 100644
index 0000000000..7cff8b6dc8
--- /dev/null
+++ b/goformation/cloudformation/customerprofiles/aws-customerprofiles-objecttype_objecttypekey.go
@@ -0,0 +1,42 @@
+package customerprofiles
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ObjectType_ObjectTypeKey AWS CloudFormation Resource (AWS::CustomerProfiles::ObjectType.ObjectTypeKey)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-objecttype-objecttypekey.html
+type ObjectType_ObjectTypeKey struct {
+
+	// FieldNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-objecttype-objecttypekey.html#cfn-customerprofiles-objecttype-objecttypekey-fieldnames
+	FieldNames *types.Value `json:"FieldNames,omitempty"`
+
+	// StandardIdentifiers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-customerprofiles-objecttype-objecttypekey.html#cfn-customerprofiles-objecttype-objecttypekey-standardidentifiers
+	StandardIdentifiers *types.Value `json:"StandardIdentifiers,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ObjectType_ObjectTypeKey) AWSCloudFormationType() string {
+	return "AWS::CustomerProfiles::ObjectType.ObjectTypeKey"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset.go b/goformation/cloudformation/databrew/aws-databrew-dataset.go
new file mode 100644
index 0000000000..e795474093
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-dataset.go
@@ -0,0 +1,134 @@
+package databrew
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset AWS CloudFormation Resource (AWS::DataBrew::Dataset)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-dataset.html
+type Dataset struct {
+
+	// Format AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-dataset.html#cfn-databrew-dataset-format
+	Format *types.Value `json:"Format,omitempty"`
+
+	// FormatOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-dataset.html#cfn-databrew-dataset-formatoptions
+	FormatOptions *Dataset_FormatOptions `json:"FormatOptions,omitempty"`
+
+	// Input AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-dataset.html#cfn-databrew-dataset-input
+	Input *Dataset_Input `json:"Input,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-dataset.html#cfn-databrew-dataset-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// PathOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-dataset.html#cfn-databrew-dataset-pathoptions
+	PathOptions *Dataset_PathOptions `json:"PathOptions,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-dataset.html#cfn-databrew-dataset-tags
+	Tags []cloudformation.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 *Dataset) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Dataset"
+}
+
+// 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 Dataset) MarshalJSON() ([]byte, error) {
+	type Properties Dataset
+	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 *Dataset) UnmarshalJSON(b []byte) error {
+	type Properties Dataset
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Dataset(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/databrew/aws-databrew-dataset_csvoptions.go b/goformation/cloudformation/databrew/aws-databrew-dataset_csvoptions.go
new file mode 100644
index 0000000000..df123c5f48
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-dataset_csvoptions.go
@@ -0,0 +1,42 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_CsvOptions AWS CloudFormation Resource (AWS::DataBrew::Dataset.CsvOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-csvoptions.html
+type Dataset_CsvOptions struct {
+
+	// Delimiter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-csvoptions.html#cfn-databrew-dataset-csvoptions-delimiter
+	Delimiter *types.Value `json:"Delimiter,omitempty"`
+
+	// HeaderRow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-csvoptions.html#cfn-databrew-dataset-csvoptions-headerrow
+	HeaderRow *types.Value `json:"HeaderRow,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CsvOptions) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Dataset.CsvOptions"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_databaseinputdefinition.go b/goformation/cloudformation/databrew/aws-databrew-dataset_databaseinputdefinition.go
new file mode 100644
index 0000000000..17e8588e9e
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-dataset_databaseinputdefinition.go
@@ -0,0 +1,52 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_DatabaseInputDefinition AWS CloudFormation Resource (AWS::DataBrew::Dataset.DatabaseInputDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-databaseinputdefinition.html
+type Dataset_DatabaseInputDefinition struct {
+
+	// DatabaseTableName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-databaseinputdefinition.html#cfn-databrew-dataset-databaseinputdefinition-databasetablename
+	DatabaseTableName *types.Value `json:"DatabaseTableName,omitempty"`
+
+	// GlueConnectionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-databaseinputdefinition.html#cfn-databrew-dataset-databaseinputdefinition-glueconnectionname
+	GlueConnectionName *types.Value `json:"GlueConnectionName,omitempty"`
+
+	// QueryString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-databaseinputdefinition.html#cfn-databrew-dataset-databaseinputdefinition-querystring
+	QueryString *types.Value `json:"QueryString,omitempty"`
+
+	// TempDirectory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-databaseinputdefinition.html#cfn-databrew-dataset-databaseinputdefinition-tempdirectory
+	TempDirectory *Dataset_S3Location `json:"TempDirectory,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DatabaseInputDefinition) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Dataset.DatabaseInputDefinition"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_datacataloginputdefinition.go b/goformation/cloudformation/databrew/aws-databrew-dataset_datacataloginputdefinition.go
new file mode 100644
index 0000000000..63b31b5aa9
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-dataset_datacataloginputdefinition.go
@@ -0,0 +1,52 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_DataCatalogInputDefinition AWS CloudFormation Resource (AWS::DataBrew::Dataset.DataCatalogInputDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-datacataloginputdefinition.html
+type Dataset_DataCatalogInputDefinition struct {
+
+	// CatalogId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-datacataloginputdefinition.html#cfn-databrew-dataset-datacataloginputdefinition-catalogid
+	CatalogId *types.Value `json:"CatalogId,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-datacataloginputdefinition.html#cfn-databrew-dataset-datacataloginputdefinition-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-datacataloginputdefinition.html#cfn-databrew-dataset-datacataloginputdefinition-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// TempDirectory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-datacataloginputdefinition.html#cfn-databrew-dataset-datacataloginputdefinition-tempdirectory
+	TempDirectory *Dataset_S3Location `json:"TempDirectory,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DataCatalogInputDefinition) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Dataset.DataCatalogInputDefinition"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_datasetparameter.go b/goformation/cloudformation/databrew/aws-databrew-dataset_datasetparameter.go
new file mode 100644
index 0000000000..d417d083ef
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-dataset_datasetparameter.go
@@ -0,0 +1,57 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_DatasetParameter AWS CloudFormation Resource (AWS::DataBrew::Dataset.DatasetParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-datasetparameter.html
+type Dataset_DatasetParameter struct {
+
+	// CreateColumn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-datasetparameter.html#cfn-databrew-dataset-datasetparameter-createcolumn
+	CreateColumn *types.Value `json:"CreateColumn,omitempty"`
+
+	// DatetimeOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-datasetparameter.html#cfn-databrew-dataset-datasetparameter-datetimeoptions
+	DatetimeOptions *Dataset_DatetimeOptions `json:"DatetimeOptions,omitempty"`
+
+	// Filter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-datasetparameter.html#cfn-databrew-dataset-datasetparameter-filter
+	Filter *Dataset_FilterExpression `json:"Filter,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-datasetparameter.html#cfn-databrew-dataset-datasetparameter-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-datasetparameter.html#cfn-databrew-dataset-datasetparameter-type
+	Type *types.Value `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 *Dataset_DatasetParameter) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Dataset.DatasetParameter"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_datetimeoptions.go b/goformation/cloudformation/databrew/aws-databrew-dataset_datetimeoptions.go
new file mode 100644
index 0000000000..ac7b2535d2
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-dataset_datetimeoptions.go
@@ -0,0 +1,47 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_DatetimeOptions AWS CloudFormation Resource (AWS::DataBrew::Dataset.DatetimeOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-datetimeoptions.html
+type Dataset_DatetimeOptions struct {
+
+	// Format AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-datetimeoptions.html#cfn-databrew-dataset-datetimeoptions-format
+	Format *types.Value `json:"Format,omitempty"`
+
+	// LocaleCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-datetimeoptions.html#cfn-databrew-dataset-datetimeoptions-localecode
+	LocaleCode *types.Value `json:"LocaleCode,omitempty"`
+
+	// TimezoneOffset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-datetimeoptions.html#cfn-databrew-dataset-datetimeoptions-timezoneoffset
+	TimezoneOffset *types.Value `json:"TimezoneOffset,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DatetimeOptions) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Dataset.DatetimeOptions"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_exceloptions.go b/goformation/cloudformation/databrew/aws-databrew-dataset_exceloptions.go
new file mode 100644
index 0000000000..c1e44974cf
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-dataset_exceloptions.go
@@ -0,0 +1,47 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_ExcelOptions AWS CloudFormation Resource (AWS::DataBrew::Dataset.ExcelOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-exceloptions.html
+type Dataset_ExcelOptions struct {
+
+	// HeaderRow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-exceloptions.html#cfn-databrew-dataset-exceloptions-headerrow
+	HeaderRow *types.Value `json:"HeaderRow,omitempty"`
+
+	// SheetIndexes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-exceloptions.html#cfn-databrew-dataset-exceloptions-sheetindexes
+	SheetIndexes *types.Value `json:"SheetIndexes,omitempty"`
+
+	// SheetNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-exceloptions.html#cfn-databrew-dataset-exceloptions-sheetnames
+	SheetNames *types.Value `json:"SheetNames,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ExcelOptions) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Dataset.ExcelOptions"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_fileslimit.go b/goformation/cloudformation/databrew/aws-databrew-dataset_fileslimit.go
new file mode 100644
index 0000000000..f352d145ac
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-dataset_fileslimit.go
@@ -0,0 +1,47 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_FilesLimit AWS CloudFormation Resource (AWS::DataBrew::Dataset.FilesLimit)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-fileslimit.html
+type Dataset_FilesLimit struct {
+
+	// MaxFiles AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-fileslimit.html#cfn-databrew-dataset-fileslimit-maxfiles
+	MaxFiles *types.Value `json:"MaxFiles"`
+
+	// Order AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-fileslimit.html#cfn-databrew-dataset-fileslimit-order
+	Order *types.Value `json:"Order,omitempty"`
+
+	// OrderedBy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-fileslimit.html#cfn-databrew-dataset-fileslimit-orderedby
+	OrderedBy *types.Value `json:"OrderedBy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_FilesLimit) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Dataset.FilesLimit"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_filterexpression.go b/goformation/cloudformation/databrew/aws-databrew-dataset_filterexpression.go
new file mode 100644
index 0000000000..bb54cafa81
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-dataset_filterexpression.go
@@ -0,0 +1,42 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_FilterExpression AWS CloudFormation Resource (AWS::DataBrew::Dataset.FilterExpression)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-filterexpression.html
+type Dataset_FilterExpression struct {
+
+	// Expression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-filterexpression.html#cfn-databrew-dataset-filterexpression-expression
+	Expression *types.Value `json:"Expression,omitempty"`
+
+	// ValuesMap AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-filterexpression.html#cfn-databrew-dataset-filterexpression-valuesmap
+	ValuesMap []Dataset_FilterValue `json:"ValuesMap,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_FilterExpression) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Dataset.FilterExpression"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_filtervalue.go b/goformation/cloudformation/databrew/aws-databrew-dataset_filtervalue.go
new file mode 100644
index 0000000000..ac98941a4f
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-dataset_filtervalue.go
@@ -0,0 +1,42 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_FilterValue AWS CloudFormation Resource (AWS::DataBrew::Dataset.FilterValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-filtervalue.html
+type Dataset_FilterValue struct {
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-filtervalue.html#cfn-databrew-dataset-filtervalue-value
+	Value *types.Value `json:"Value,omitempty"`
+
+	// ValueReference AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-filtervalue.html#cfn-databrew-dataset-filtervalue-valuereference
+	ValueReference *types.Value `json:"ValueReference,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_FilterValue) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Dataset.FilterValue"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_formatoptions.go b/goformation/cloudformation/databrew/aws-databrew-dataset_formatoptions.go
new file mode 100644
index 0000000000..16e8738b58
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-dataset_formatoptions.go
@@ -0,0 +1,45 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_FormatOptions AWS CloudFormation Resource (AWS::DataBrew::Dataset.FormatOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-formatoptions.html
+type Dataset_FormatOptions struct {
+
+	// Csv AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-formatoptions.html#cfn-databrew-dataset-formatoptions-csv
+	Csv *Dataset_CsvOptions `json:"Csv,omitempty"`
+
+	// Excel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-formatoptions.html#cfn-databrew-dataset-formatoptions-excel
+	Excel *Dataset_ExcelOptions `json:"Excel,omitempty"`
+
+	// Json AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-formatoptions.html#cfn-databrew-dataset-formatoptions-json
+	Json *Dataset_JsonOptions `json:"Json,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_FormatOptions) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Dataset.FormatOptions"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_input.go b/goformation/cloudformation/databrew/aws-databrew-dataset_input.go
new file mode 100644
index 0000000000..7500c2cdd9
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-dataset_input.go
@@ -0,0 +1,50 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_Input AWS CloudFormation Resource (AWS::DataBrew::Dataset.Input)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-input.html
+type Dataset_Input struct {
+
+	// DataCatalogInputDefinition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-input.html#cfn-databrew-dataset-input-datacataloginputdefinition
+	DataCatalogInputDefinition *Dataset_DataCatalogInputDefinition `json:"DataCatalogInputDefinition,omitempty"`
+
+	// DatabaseInputDefinition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-input.html#cfn-databrew-dataset-input-databaseinputdefinition
+	DatabaseInputDefinition *Dataset_DatabaseInputDefinition `json:"DatabaseInputDefinition,omitempty"`
+
+	// Metadata AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-input.html#cfn-databrew-dataset-input-metadata
+	Metadata *Dataset_Metadata `json:"Metadata,omitempty"`
+
+	// S3InputDefinition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-input.html#cfn-databrew-dataset-input-s3inputdefinition
+	S3InputDefinition *Dataset_S3Location `json:"S3InputDefinition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Input) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Dataset.Input"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_jsonoptions.go b/goformation/cloudformation/databrew/aws-databrew-dataset_jsonoptions.go
new file mode 100644
index 0000000000..d224e805c0
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-dataset_jsonoptions.go
@@ -0,0 +1,37 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_JsonOptions AWS CloudFormation Resource (AWS::DataBrew::Dataset.JsonOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-jsonoptions.html
+type Dataset_JsonOptions struct {
+
+	// MultiLine AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-jsonoptions.html#cfn-databrew-dataset-jsonoptions-multiline
+	MultiLine *types.Value `json:"MultiLine,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_JsonOptions) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Dataset.JsonOptions"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_metadata.go b/goformation/cloudformation/databrew/aws-databrew-dataset_metadata.go
new file mode 100644
index 0000000000..f5b4590d02
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-dataset_metadata.go
@@ -0,0 +1,37 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_Metadata AWS CloudFormation Resource (AWS::DataBrew::Dataset.Metadata)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-metadata.html
+type Dataset_Metadata struct {
+
+	// SourceArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-metadata.html#cfn-databrew-dataset-metadata-sourcearn
+	SourceArn *types.Value `json:"SourceArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Metadata) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Dataset.Metadata"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_pathoptions.go b/goformation/cloudformation/databrew/aws-databrew-dataset_pathoptions.go
new file mode 100644
index 0000000000..d0038d32ae
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-dataset_pathoptions.go
@@ -0,0 +1,45 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_PathOptions AWS CloudFormation Resource (AWS::DataBrew::Dataset.PathOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-pathoptions.html
+type Dataset_PathOptions struct {
+
+	// FilesLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-pathoptions.html#cfn-databrew-dataset-pathoptions-fileslimit
+	FilesLimit *Dataset_FilesLimit `json:"FilesLimit,omitempty"`
+
+	// LastModifiedDateCondition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-pathoptions.html#cfn-databrew-dataset-pathoptions-lastmodifieddatecondition
+	LastModifiedDateCondition *Dataset_FilterExpression `json:"LastModifiedDateCondition,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-pathoptions.html#cfn-databrew-dataset-pathoptions-parameters
+	Parameters []Dataset_PathParameter `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 *Dataset_PathOptions) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Dataset.PathOptions"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_pathparameter.go b/goformation/cloudformation/databrew/aws-databrew-dataset_pathparameter.go
new file mode 100644
index 0000000000..160e59e1eb
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-dataset_pathparameter.go
@@ -0,0 +1,42 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_PathParameter AWS CloudFormation Resource (AWS::DataBrew::Dataset.PathParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-pathparameter.html
+type Dataset_PathParameter struct {
+
+	// DatasetParameter AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-pathparameter.html#cfn-databrew-dataset-pathparameter-datasetparameter
+	DatasetParameter *Dataset_DatasetParameter `json:"DatasetParameter,omitempty"`
+
+	// PathParameterName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-pathparameter.html#cfn-databrew-dataset-pathparameter-pathparametername
+	PathParameterName *types.Value `json:"PathParameterName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PathParameter) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Dataset.PathParameter"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-dataset_s3location.go b/goformation/cloudformation/databrew/aws-databrew-dataset_s3location.go
new file mode 100644
index 0000000000..5c48a92a00
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-dataset_s3location.go
@@ -0,0 +1,42 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_S3Location AWS CloudFormation Resource (AWS::DataBrew::Dataset.S3Location)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-s3location.html
+type Dataset_S3Location struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-s3location.html#cfn-databrew-dataset-s3location-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-dataset-s3location.html#cfn-databrew-dataset-s3location-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_S3Location) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Dataset.S3Location"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-job.go b/goformation/cloudformation/databrew/aws-databrew-job.go
new file mode 100644
index 0000000000..7d1fb401d8
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job.go
@@ -0,0 +1,204 @@
+package databrew
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job AWS CloudFormation Resource (AWS::DataBrew::Job)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html
+type Job struct {
+
+	// DataCatalogOutputs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html#cfn-databrew-job-datacatalogoutputs
+	DataCatalogOutputs []Job_DataCatalogOutput `json:"DataCatalogOutputs,omitempty"`
+
+	// DatabaseOutputs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html#cfn-databrew-job-databaseoutputs
+	DatabaseOutputs []Job_DatabaseOutput `json:"DatabaseOutputs,omitempty"`
+
+	// DatasetName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html#cfn-databrew-job-datasetname
+	DatasetName *types.Value `json:"DatasetName,omitempty"`
+
+	// EncryptionKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html#cfn-databrew-job-encryptionkeyarn
+	EncryptionKeyArn *types.Value `json:"EncryptionKeyArn,omitempty"`
+
+	// EncryptionMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html#cfn-databrew-job-encryptionmode
+	EncryptionMode *types.Value `json:"EncryptionMode,omitempty"`
+
+	// JobSample AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html#cfn-databrew-job-jobsample
+	JobSample *Job_JobSample `json:"JobSample,omitempty"`
+
+	// LogSubscription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html#cfn-databrew-job-logsubscription
+	LogSubscription *types.Value `json:"LogSubscription,omitempty"`
+
+	// MaxCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html#cfn-databrew-job-maxcapacity
+	MaxCapacity *types.Value `json:"MaxCapacity,omitempty"`
+
+	// MaxRetries AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html#cfn-databrew-job-maxretries
+	MaxRetries *types.Value `json:"MaxRetries,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html#cfn-databrew-job-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// OutputLocation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html#cfn-databrew-job-outputlocation
+	OutputLocation *Job_OutputLocation `json:"OutputLocation,omitempty"`
+
+	// Outputs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html#cfn-databrew-job-outputs
+	Outputs []Job_Output `json:"Outputs,omitempty"`
+
+	// ProfileConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html#cfn-databrew-job-profileconfiguration
+	ProfileConfiguration *Job_ProfileConfiguration `json:"ProfileConfiguration,omitempty"`
+
+	// ProjectName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html#cfn-databrew-job-projectname
+	ProjectName *types.Value `json:"ProjectName,omitempty"`
+
+	// Recipe AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html#cfn-databrew-job-recipe
+	Recipe *Job_Recipe `json:"Recipe,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html#cfn-databrew-job-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html#cfn-databrew-job-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Timeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html#cfn-databrew-job-timeout
+	Timeout *types.Value `json:"Timeout,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html#cfn-databrew-job-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// ValidationConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-job.html#cfn-databrew-job-validationconfigurations
+	ValidationConfigurations []Job_ValidationConfiguration `json:"ValidationConfigurations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job"
+}
+
+// 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 Job) MarshalJSON() ([]byte, error) {
+	type Properties Job
+	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 *Job) UnmarshalJSON(b []byte) error {
+	type Properties Job
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Job(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/databrew/aws-databrew-job_allowedstatistics.go b/goformation/cloudformation/databrew/aws-databrew-job_allowedstatistics.go
new file mode 100644
index 0000000000..dfd1bc7c84
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job_allowedstatistics.go
@@ -0,0 +1,37 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_AllowedStatistics AWS CloudFormation Resource (AWS::DataBrew::Job.AllowedStatistics)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-allowedstatistics.html
+type Job_AllowedStatistics struct {
+
+	// Statistics AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-allowedstatistics.html#cfn-databrew-job-allowedstatistics-statistics
+	Statistics *types.Value `json:"Statistics,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_AllowedStatistics) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job.AllowedStatistics"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_columnselector.go b/goformation/cloudformation/databrew/aws-databrew-job_columnselector.go
new file mode 100644
index 0000000000..235c00fb46
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job_columnselector.go
@@ -0,0 +1,42 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_ColumnSelector AWS CloudFormation Resource (AWS::DataBrew::Job.ColumnSelector)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-columnselector.html
+type Job_ColumnSelector struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-columnselector.html#cfn-databrew-job-columnselector-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Regex AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-columnselector.html#cfn-databrew-job-columnselector-regex
+	Regex *types.Value `json:"Regex,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_ColumnSelector) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job.ColumnSelector"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_columnstatisticsconfiguration.go b/goformation/cloudformation/databrew/aws-databrew-job_columnstatisticsconfiguration.go
new file mode 100644
index 0000000000..0dd723de11
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job_columnstatisticsconfiguration.go
@@ -0,0 +1,40 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_ColumnStatisticsConfiguration AWS CloudFormation Resource (AWS::DataBrew::Job.ColumnStatisticsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-columnstatisticsconfiguration.html
+type Job_ColumnStatisticsConfiguration struct {
+
+	// Selectors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-columnstatisticsconfiguration.html#cfn-databrew-job-columnstatisticsconfiguration-selectors
+	Selectors []Job_ColumnSelector `json:"Selectors,omitempty"`
+
+	// Statistics AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-columnstatisticsconfiguration.html#cfn-databrew-job-columnstatisticsconfiguration-statistics
+	Statistics *Job_StatisticsConfiguration `json:"Statistics,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_ColumnStatisticsConfiguration) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job.ColumnStatisticsConfiguration"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_csvoutputoptions.go b/goformation/cloudformation/databrew/aws-databrew-job_csvoutputoptions.go
new file mode 100644
index 0000000000..c60c592f6e
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job_csvoutputoptions.go
@@ -0,0 +1,37 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_CsvOutputOptions AWS CloudFormation Resource (AWS::DataBrew::Job.CsvOutputOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-csvoutputoptions.html
+type Job_CsvOutputOptions struct {
+
+	// Delimiter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-csvoutputoptions.html#cfn-databrew-job-csvoutputoptions-delimiter
+	Delimiter *types.Value `json:"Delimiter,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_CsvOutputOptions) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job.CsvOutputOptions"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_databaseoutput.go b/goformation/cloudformation/databrew/aws-databrew-job_databaseoutput.go
new file mode 100644
index 0000000000..9ec6b4c7d0
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job_databaseoutput.go
@@ -0,0 +1,47 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_DatabaseOutput AWS CloudFormation Resource (AWS::DataBrew::Job.DatabaseOutput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-databaseoutput.html
+type Job_DatabaseOutput struct {
+
+	// DatabaseOptions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-databaseoutput.html#cfn-databrew-job-databaseoutput-databaseoptions
+	DatabaseOptions *Job_DatabaseTableOutputOptions `json:"DatabaseOptions,omitempty"`
+
+	// DatabaseOutputMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-databaseoutput.html#cfn-databrew-job-databaseoutput-databaseoutputmode
+	DatabaseOutputMode *types.Value `json:"DatabaseOutputMode,omitempty"`
+
+	// GlueConnectionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-databaseoutput.html#cfn-databrew-job-databaseoutput-glueconnectionname
+	GlueConnectionName *types.Value `json:"GlueConnectionName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_DatabaseOutput) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job.DatabaseOutput"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_databasetableoutputoptions.go b/goformation/cloudformation/databrew/aws-databrew-job_databasetableoutputoptions.go
new file mode 100644
index 0000000000..5964c18083
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job_databasetableoutputoptions.go
@@ -0,0 +1,42 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_DatabaseTableOutputOptions AWS CloudFormation Resource (AWS::DataBrew::Job.DatabaseTableOutputOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-databasetableoutputoptions.html
+type Job_DatabaseTableOutputOptions struct {
+
+	// TableName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-databasetableoutputoptions.html#cfn-databrew-job-databasetableoutputoptions-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// TempDirectory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-databasetableoutputoptions.html#cfn-databrew-job-databasetableoutputoptions-tempdirectory
+	TempDirectory *Job_S3Location `json:"TempDirectory,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_DatabaseTableOutputOptions) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job.DatabaseTableOutputOptions"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_datacatalogoutput.go b/goformation/cloudformation/databrew/aws-databrew-job_datacatalogoutput.go
new file mode 100644
index 0000000000..2a6bfca713
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job_datacatalogoutput.go
@@ -0,0 +1,62 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_DataCatalogOutput AWS CloudFormation Resource (AWS::DataBrew::Job.DataCatalogOutput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-datacatalogoutput.html
+type Job_DataCatalogOutput struct {
+
+	// CatalogId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-datacatalogoutput.html#cfn-databrew-job-datacatalogoutput-catalogid
+	CatalogId *types.Value `json:"CatalogId,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-datacatalogoutput.html#cfn-databrew-job-datacatalogoutput-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// DatabaseOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-datacatalogoutput.html#cfn-databrew-job-datacatalogoutput-databaseoptions
+	DatabaseOptions *Job_DatabaseTableOutputOptions `json:"DatabaseOptions,omitempty"`
+
+	// Overwrite AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-datacatalogoutput.html#cfn-databrew-job-datacatalogoutput-overwrite
+	Overwrite *types.Value `json:"Overwrite,omitempty"`
+
+	// S3Options AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-datacatalogoutput.html#cfn-databrew-job-datacatalogoutput-s3options
+	S3Options *Job_S3TableOutputOptions `json:"S3Options,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-datacatalogoutput.html#cfn-databrew-job-datacatalogoutput-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_DataCatalogOutput) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job.DataCatalogOutput"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_entitydetectorconfiguration.go b/goformation/cloudformation/databrew/aws-databrew-job_entitydetectorconfiguration.go
new file mode 100644
index 0000000000..017563f228
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job_entitydetectorconfiguration.go
@@ -0,0 +1,42 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_EntityDetectorConfiguration AWS CloudFormation Resource (AWS::DataBrew::Job.EntityDetectorConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-entitydetectorconfiguration.html
+type Job_EntityDetectorConfiguration struct {
+
+	// AllowedStatistics AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-entitydetectorconfiguration.html#cfn-databrew-job-entitydetectorconfiguration-allowedstatistics
+	AllowedStatistics *Job_AllowedStatistics `json:"AllowedStatistics,omitempty"`
+
+	// EntityTypes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-entitydetectorconfiguration.html#cfn-databrew-job-entitydetectorconfiguration-entitytypes
+	EntityTypes *types.Value `json:"EntityTypes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_EntityDetectorConfiguration) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job.EntityDetectorConfiguration"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_jobsample.go b/goformation/cloudformation/databrew/aws-databrew-job_jobsample.go
new file mode 100644
index 0000000000..ab60c9cb80
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job_jobsample.go
@@ -0,0 +1,42 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_JobSample AWS CloudFormation Resource (AWS::DataBrew::Job.JobSample)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-jobsample.html
+type Job_JobSample struct {
+
+	// Mode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-jobsample.html#cfn-databrew-job-jobsample-mode
+	Mode *types.Value `json:"Mode,omitempty"`
+
+	// Size AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-jobsample.html#cfn-databrew-job-jobsample-size
+	Size *types.Value `json:"Size,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_JobSample) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job.JobSample"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_output.go b/goformation/cloudformation/databrew/aws-databrew-job_output.go
new file mode 100644
index 0000000000..95f49b9bb0
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job_output.go
@@ -0,0 +1,62 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_Output AWS CloudFormation Resource (AWS::DataBrew::Job.Output)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-output.html
+type Job_Output struct {
+
+	// CompressionFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-output.html#cfn-databrew-job-output-compressionformat
+	CompressionFormat *types.Value `json:"CompressionFormat,omitempty"`
+
+	// Format AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-output.html#cfn-databrew-job-output-format
+	Format *types.Value `json:"Format,omitempty"`
+
+	// FormatOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-output.html#cfn-databrew-job-output-formatoptions
+	FormatOptions *Job_OutputFormatOptions `json:"FormatOptions,omitempty"`
+
+	// Location AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-output.html#cfn-databrew-job-output-location
+	Location *Job_S3Location `json:"Location,omitempty"`
+
+	// Overwrite AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-output.html#cfn-databrew-job-output-overwrite
+	Overwrite *types.Value `json:"Overwrite,omitempty"`
+
+	// PartitionColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-output.html#cfn-databrew-job-output-partitioncolumns
+	PartitionColumns *types.Value `json:"PartitionColumns,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_Output) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job.Output"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_outputformatoptions.go b/goformation/cloudformation/databrew/aws-databrew-job_outputformatoptions.go
new file mode 100644
index 0000000000..71b74780cd
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job_outputformatoptions.go
@@ -0,0 +1,35 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_OutputFormatOptions AWS CloudFormation Resource (AWS::DataBrew::Job.OutputFormatOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-outputformatoptions.html
+type Job_OutputFormatOptions struct {
+
+	// Csv AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-outputformatoptions.html#cfn-databrew-job-outputformatoptions-csv
+	Csv *Job_CsvOutputOptions `json:"Csv,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_OutputFormatOptions) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job.OutputFormatOptions"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_outputlocation.go b/goformation/cloudformation/databrew/aws-databrew-job_outputlocation.go
new file mode 100644
index 0000000000..619c5a39b1
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job_outputlocation.go
@@ -0,0 +1,42 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_OutputLocation AWS CloudFormation Resource (AWS::DataBrew::Job.OutputLocation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-outputlocation.html
+type Job_OutputLocation struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-outputlocation.html#cfn-databrew-job-outputlocation-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-outputlocation.html#cfn-databrew-job-outputlocation-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_OutputLocation) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job.OutputLocation"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_parametermap.go b/goformation/cloudformation/databrew/aws-databrew-job_parametermap.go
new file mode 100644
index 0000000000..521d8b7ec9
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job_parametermap.go
@@ -0,0 +1,30 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_ParameterMap AWS CloudFormation Resource (AWS::DataBrew::Job.ParameterMap)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-parametermap.html
+type Job_ParameterMap struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_ParameterMap) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job.ParameterMap"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_profileconfiguration.go b/goformation/cloudformation/databrew/aws-databrew-job_profileconfiguration.go
new file mode 100644
index 0000000000..2458a1df5f
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job_profileconfiguration.go
@@ -0,0 +1,50 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_ProfileConfiguration AWS CloudFormation Resource (AWS::DataBrew::Job.ProfileConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-profileconfiguration.html
+type Job_ProfileConfiguration struct {
+
+	// ColumnStatisticsConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-profileconfiguration.html#cfn-databrew-job-profileconfiguration-columnstatisticsconfigurations
+	ColumnStatisticsConfigurations []Job_ColumnStatisticsConfiguration `json:"ColumnStatisticsConfigurations,omitempty"`
+
+	// DatasetStatisticsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-profileconfiguration.html#cfn-databrew-job-profileconfiguration-datasetstatisticsconfiguration
+	DatasetStatisticsConfiguration *Job_StatisticsConfiguration `json:"DatasetStatisticsConfiguration,omitempty"`
+
+	// EntityDetectorConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-profileconfiguration.html#cfn-databrew-job-profileconfiguration-entitydetectorconfiguration
+	EntityDetectorConfiguration *Job_EntityDetectorConfiguration `json:"EntityDetectorConfiguration,omitempty"`
+
+	// ProfileColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-profileconfiguration.html#cfn-databrew-job-profileconfiguration-profilecolumns
+	ProfileColumns []Job_ColumnSelector `json:"ProfileColumns,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_ProfileConfiguration) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job.ProfileConfiguration"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_recipe.go b/goformation/cloudformation/databrew/aws-databrew-job_recipe.go
new file mode 100644
index 0000000000..a46028e64b
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job_recipe.go
@@ -0,0 +1,42 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_Recipe AWS CloudFormation Resource (AWS::DataBrew::Job.Recipe)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-recipe.html
+type Job_Recipe struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-recipe.html#cfn-databrew-job-recipe-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-recipe.html#cfn-databrew-job-recipe-version
+	Version *types.Value `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 *Job_Recipe) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job.Recipe"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_s3location.go b/goformation/cloudformation/databrew/aws-databrew-job_s3location.go
new file mode 100644
index 0000000000..c517b8c589
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job_s3location.go
@@ -0,0 +1,42 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_S3Location AWS CloudFormation Resource (AWS::DataBrew::Job.S3Location)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-s3location.html
+type Job_S3Location struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-s3location.html#cfn-databrew-job-s3location-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-s3location.html#cfn-databrew-job-s3location-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_S3Location) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job.S3Location"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_s3tableoutputoptions.go b/goformation/cloudformation/databrew/aws-databrew-job_s3tableoutputoptions.go
new file mode 100644
index 0000000000..ad166e29f6
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job_s3tableoutputoptions.go
@@ -0,0 +1,35 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_S3TableOutputOptions AWS CloudFormation Resource (AWS::DataBrew::Job.S3TableOutputOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-s3tableoutputoptions.html
+type Job_S3TableOutputOptions struct {
+
+	// Location AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-s3tableoutputoptions.html#cfn-databrew-job-s3tableoutputoptions-location
+	Location *Job_S3Location `json:"Location,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_S3TableOutputOptions) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job.S3TableOutputOptions"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_statisticoverride.go b/goformation/cloudformation/databrew/aws-databrew-job_statisticoverride.go
new file mode 100644
index 0000000000..49557579d0
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job_statisticoverride.go
@@ -0,0 +1,42 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_StatisticOverride AWS CloudFormation Resource (AWS::DataBrew::Job.StatisticOverride)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-statisticoverride.html
+type Job_StatisticOverride struct {
+
+	// Parameters AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-statisticoverride.html#cfn-databrew-job-statisticoverride-parameters
+	Parameters *Job_ParameterMap `json:"Parameters,omitempty"`
+
+	// Statistic AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-statisticoverride.html#cfn-databrew-job-statisticoverride-statistic
+	Statistic *types.Value `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 *Job_StatisticOverride) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job.StatisticOverride"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_statisticsconfiguration.go b/goformation/cloudformation/databrew/aws-databrew-job_statisticsconfiguration.go
new file mode 100644
index 0000000000..eba36cea53
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job_statisticsconfiguration.go
@@ -0,0 +1,42 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_StatisticsConfiguration AWS CloudFormation Resource (AWS::DataBrew::Job.StatisticsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-statisticsconfiguration.html
+type Job_StatisticsConfiguration struct {
+
+	// IncludedStatistics AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-statisticsconfiguration.html#cfn-databrew-job-statisticsconfiguration-includedstatistics
+	IncludedStatistics *types.Value `json:"IncludedStatistics,omitempty"`
+
+	// Overrides AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-statisticsconfiguration.html#cfn-databrew-job-statisticsconfiguration-overrides
+	Overrides []Job_StatisticOverride `json:"Overrides,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_StatisticsConfiguration) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job.StatisticsConfiguration"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-job_validationconfiguration.go b/goformation/cloudformation/databrew/aws-databrew-job_validationconfiguration.go
new file mode 100644
index 0000000000..d23f9255d3
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-job_validationconfiguration.go
@@ -0,0 +1,42 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_ValidationConfiguration AWS CloudFormation Resource (AWS::DataBrew::Job.ValidationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-validationconfiguration.html
+type Job_ValidationConfiguration struct {
+
+	// RulesetArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-validationconfiguration.html#cfn-databrew-job-validationconfiguration-rulesetarn
+	RulesetArn *types.Value `json:"RulesetArn,omitempty"`
+
+	// ValidationMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-job-validationconfiguration.html#cfn-databrew-job-validationconfiguration-validationmode
+	ValidationMode *types.Value `json:"ValidationMode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_ValidationConfiguration) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Job.ValidationConfiguration"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-project.go b/goformation/cloudformation/databrew/aws-databrew-project.go
new file mode 100644
index 0000000000..bd24322621
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-project.go
@@ -0,0 +1,134 @@
+package databrew
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project AWS CloudFormation Resource (AWS::DataBrew::Project)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-project.html
+type Project struct {
+
+	// DatasetName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-project.html#cfn-databrew-project-datasetname
+	DatasetName *types.Value `json:"DatasetName,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-project.html#cfn-databrew-project-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RecipeName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-project.html#cfn-databrew-project-recipename
+	RecipeName *types.Value `json:"RecipeName,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-project.html#cfn-databrew-project-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Sample AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-project.html#cfn-databrew-project-sample
+	Sample *Project_Sample `json:"Sample,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-project.html#cfn-databrew-project-tags
+	Tags []cloudformation.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 *Project) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Project"
+}
+
+// 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 Project) MarshalJSON() ([]byte, error) {
+	type Properties Project
+	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 *Project) UnmarshalJSON(b []byte) error {
+	type Properties Project
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Project(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/databrew/aws-databrew-project_sample.go b/goformation/cloudformation/databrew/aws-databrew-project_sample.go
new file mode 100644
index 0000000000..26d9f2125e
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-project_sample.go
@@ -0,0 +1,42 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_Sample AWS CloudFormation Resource (AWS::DataBrew::Project.Sample)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-project-sample.html
+type Project_Sample struct {
+
+	// Size AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-project-sample.html#cfn-databrew-project-sample-size
+	Size *types.Value `json:"Size,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-project-sample.html#cfn-databrew-project-sample-type
+	Type *types.Value `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 *Project_Sample) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Project.Sample"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-recipe.go b/goformation/cloudformation/databrew/aws-databrew-recipe.go
new file mode 100644
index 0000000000..bb55c87b28
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-recipe.go
@@ -0,0 +1,124 @@
+package databrew
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Recipe AWS CloudFormation Resource (AWS::DataBrew::Recipe)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-recipe.html
+type Recipe struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-recipe.html#cfn-databrew-recipe-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-recipe.html#cfn-databrew-recipe-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Steps AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-recipe.html#cfn-databrew-recipe-steps
+	Steps []Recipe_RecipeStep `json:"Steps,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-recipe.html#cfn-databrew-recipe-tags
+	Tags []cloudformation.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 *Recipe) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Recipe"
+}
+
+// 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 Recipe) MarshalJSON() ([]byte, error) {
+	type Properties Recipe
+	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 *Recipe) UnmarshalJSON(b []byte) error {
+	type Properties Recipe
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Recipe(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/databrew/aws-databrew-recipe_action.go b/goformation/cloudformation/databrew/aws-databrew-recipe_action.go
new file mode 100644
index 0000000000..33c34cda3c
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-recipe_action.go
@@ -0,0 +1,42 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Recipe_Action AWS CloudFormation Resource (AWS::DataBrew::Recipe.Action)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-action.html
+type Recipe_Action struct {
+
+	// Operation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-action.html#cfn-databrew-recipe-action-operation
+	Operation *types.Value `json:"Operation,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-action.html#cfn-databrew-recipe-action-parameters
+	Parameters *Recipe_ParameterMap `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 *Recipe_Action) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Recipe.Action"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-recipe_conditionexpression.go b/goformation/cloudformation/databrew/aws-databrew-recipe_conditionexpression.go
new file mode 100644
index 0000000000..2acb29410b
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-recipe_conditionexpression.go
@@ -0,0 +1,47 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Recipe_ConditionExpression AWS CloudFormation Resource (AWS::DataBrew::Recipe.ConditionExpression)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-conditionexpression.html
+type Recipe_ConditionExpression struct {
+
+	// Condition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-conditionexpression.html#cfn-databrew-recipe-conditionexpression-condition
+	Condition *types.Value `json:"Condition,omitempty"`
+
+	// TargetColumn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-conditionexpression.html#cfn-databrew-recipe-conditionexpression-targetcolumn
+	TargetColumn *types.Value `json:"TargetColumn,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-conditionexpression.html#cfn-databrew-recipe-conditionexpression-value
+	Value *types.Value `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 *Recipe_ConditionExpression) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Recipe.ConditionExpression"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-recipe_datacataloginputdefinition.go b/goformation/cloudformation/databrew/aws-databrew-recipe_datacataloginputdefinition.go
new file mode 100644
index 0000000000..8105816485
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-recipe_datacataloginputdefinition.go
@@ -0,0 +1,52 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Recipe_DataCatalogInputDefinition AWS CloudFormation Resource (AWS::DataBrew::Recipe.DataCatalogInputDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-datacataloginputdefinition.html
+type Recipe_DataCatalogInputDefinition struct {
+
+	// CatalogId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-datacataloginputdefinition.html#cfn-databrew-recipe-datacataloginputdefinition-catalogid
+	CatalogId *types.Value `json:"CatalogId,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-datacataloginputdefinition.html#cfn-databrew-recipe-datacataloginputdefinition-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-datacataloginputdefinition.html#cfn-databrew-recipe-datacataloginputdefinition-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// TempDirectory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-datacataloginputdefinition.html#cfn-databrew-recipe-datacataloginputdefinition-tempdirectory
+	TempDirectory *Recipe_S3Location `json:"TempDirectory,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Recipe_DataCatalogInputDefinition) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Recipe.DataCatalogInputDefinition"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-recipe_parametermap.go b/goformation/cloudformation/databrew/aws-databrew-recipe_parametermap.go
new file mode 100644
index 0000000000..1bd3ec2c36
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-recipe_parametermap.go
@@ -0,0 +1,30 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Recipe_ParameterMap AWS CloudFormation Resource (AWS::DataBrew::Recipe.ParameterMap)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-parametermap.html
+type Recipe_ParameterMap struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Recipe_ParameterMap) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Recipe.ParameterMap"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-recipe_recipeparameters.go b/goformation/cloudformation/databrew/aws-databrew-recipe_recipeparameters.go
new file mode 100644
index 0000000000..d05844b04b
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-recipe_recipeparameters.go
@@ -0,0 +1,537 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Recipe_RecipeParameters AWS CloudFormation Resource (AWS::DataBrew::Recipe.RecipeParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html
+type Recipe_RecipeParameters struct {
+
+	// AggregateFunction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-aggregatefunction
+	AggregateFunction *types.Value `json:"AggregateFunction,omitempty"`
+
+	// Base AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-base
+	Base *types.Value `json:"Base,omitempty"`
+
+	// CaseStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-casestatement
+	CaseStatement *types.Value `json:"CaseStatement,omitempty"`
+
+	// CategoryMap AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-categorymap
+	CategoryMap *types.Value `json:"CategoryMap,omitempty"`
+
+	// CharsToRemove AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-charstoremove
+	CharsToRemove *types.Value `json:"CharsToRemove,omitempty"`
+
+	// CollapseConsecutiveWhitespace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-collapseconsecutivewhitespace
+	CollapseConsecutiveWhitespace *types.Value `json:"CollapseConsecutiveWhitespace,omitempty"`
+
+	// ColumnDataType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-columndatatype
+	ColumnDataType *types.Value `json:"ColumnDataType,omitempty"`
+
+	// ColumnRange AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-columnrange
+	ColumnRange *types.Value `json:"ColumnRange,omitempty"`
+
+	// Count AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-count
+	Count *types.Value `json:"Count,omitempty"`
+
+	// CustomCharacters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-customcharacters
+	CustomCharacters *types.Value `json:"CustomCharacters,omitempty"`
+
+	// CustomStopWords AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-customstopwords
+	CustomStopWords *types.Value `json:"CustomStopWords,omitempty"`
+
+	// CustomValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-customvalue
+	CustomValue *types.Value `json:"CustomValue,omitempty"`
+
+	// DatasetsColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-datasetscolumns
+	DatasetsColumns *types.Value `json:"DatasetsColumns,omitempty"`
+
+	// DateAddValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-dateaddvalue
+	DateAddValue *types.Value `json:"DateAddValue,omitempty"`
+
+	// DateTimeFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-datetimeformat
+	DateTimeFormat *types.Value `json:"DateTimeFormat,omitempty"`
+
+	// DateTimeParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-datetimeparameters
+	DateTimeParameters *types.Value `json:"DateTimeParameters,omitempty"`
+
+	// DeleteOtherRows AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-deleteotherrows
+	DeleteOtherRows *types.Value `json:"DeleteOtherRows,omitempty"`
+
+	// Delimiter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-delimiter
+	Delimiter *types.Value `json:"Delimiter,omitempty"`
+
+	// EndPattern AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-endpattern
+	EndPattern *types.Value `json:"EndPattern,omitempty"`
+
+	// EndPosition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-endposition
+	EndPosition *types.Value `json:"EndPosition,omitempty"`
+
+	// EndValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-endvalue
+	EndValue *types.Value `json:"EndValue,omitempty"`
+
+	// ExpandContractions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-expandcontractions
+	ExpandContractions *types.Value `json:"ExpandContractions,omitempty"`
+
+	// Exponent AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-exponent
+	Exponent *types.Value `json:"Exponent,omitempty"`
+
+	// FalseString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-falsestring
+	FalseString *types.Value `json:"FalseString,omitempty"`
+
+	// GroupByAggFunctionOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-groupbyaggfunctionoptions
+	GroupByAggFunctionOptions *types.Value `json:"GroupByAggFunctionOptions,omitempty"`
+
+	// GroupByColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-groupbycolumns
+	GroupByColumns *types.Value `json:"GroupByColumns,omitempty"`
+
+	// HiddenColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-hiddencolumns
+	HiddenColumns *types.Value `json:"HiddenColumns,omitempty"`
+
+	// IgnoreCase AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-ignorecase
+	IgnoreCase *types.Value `json:"IgnoreCase,omitempty"`
+
+	// IncludeInSplit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-includeinsplit
+	IncludeInSplit *types.Value `json:"IncludeInSplit,omitempty"`
+
+	// Input AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-input
+	Input interface{} `json:"Input,omitempty"`
+
+	// Interval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-interval
+	Interval *types.Value `json:"Interval,omitempty"`
+
+	// IsText AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-istext
+	IsText *types.Value `json:"IsText,omitempty"`
+
+	// JoinKeys AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-joinkeys
+	JoinKeys *types.Value `json:"JoinKeys,omitempty"`
+
+	// JoinType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-jointype
+	JoinType *types.Value `json:"JoinType,omitempty"`
+
+	// LeftColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-leftcolumns
+	LeftColumns *types.Value `json:"LeftColumns,omitempty"`
+
+	// Limit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-limit
+	Limit *types.Value `json:"Limit,omitempty"`
+
+	// LowerBound AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-lowerbound
+	LowerBound *types.Value `json:"LowerBound,omitempty"`
+
+	// MapType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-maptype
+	MapType *types.Value `json:"MapType,omitempty"`
+
+	// ModeType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-modetype
+	ModeType *types.Value `json:"ModeType,omitempty"`
+
+	// MultiLine AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-multiline
+	MultiLine *types.Value `json:"MultiLine,omitempty"`
+
+	// NumRows AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-numrows
+	NumRows *types.Value `json:"NumRows,omitempty"`
+
+	// NumRowsAfter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-numrowsafter
+	NumRowsAfter *types.Value `json:"NumRowsAfter,omitempty"`
+
+	// NumRowsBefore AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-numrowsbefore
+	NumRowsBefore *types.Value `json:"NumRowsBefore,omitempty"`
+
+	// OrderByColumn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-orderbycolumn
+	OrderByColumn *types.Value `json:"OrderByColumn,omitempty"`
+
+	// OrderByColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-orderbycolumns
+	OrderByColumns *types.Value `json:"OrderByColumns,omitempty"`
+
+	// Other AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-other
+	Other *types.Value `json:"Other,omitempty"`
+
+	// Pattern AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-pattern
+	Pattern *types.Value `json:"Pattern,omitempty"`
+
+	// PatternOption1 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-patternoption1
+	PatternOption1 *types.Value `json:"PatternOption1,omitempty"`
+
+	// PatternOption2 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-patternoption2
+	PatternOption2 *types.Value `json:"PatternOption2,omitempty"`
+
+	// PatternOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-patternoptions
+	PatternOptions *types.Value `json:"PatternOptions,omitempty"`
+
+	// Period AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-period
+	Period *types.Value `json:"Period,omitempty"`
+
+	// Position AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-position
+	Position *types.Value `json:"Position,omitempty"`
+
+	// RemoveAllPunctuation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-removeallpunctuation
+	RemoveAllPunctuation *types.Value `json:"RemoveAllPunctuation,omitempty"`
+
+	// RemoveAllQuotes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-removeallquotes
+	RemoveAllQuotes *types.Value `json:"RemoveAllQuotes,omitempty"`
+
+	// RemoveAllWhitespace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-removeallwhitespace
+	RemoveAllWhitespace *types.Value `json:"RemoveAllWhitespace,omitempty"`
+
+	// RemoveCustomCharacters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-removecustomcharacters
+	RemoveCustomCharacters *types.Value `json:"RemoveCustomCharacters,omitempty"`
+
+	// RemoveCustomValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-removecustomvalue
+	RemoveCustomValue *types.Value `json:"RemoveCustomValue,omitempty"`
+
+	// RemoveLeadingAndTrailingPunctuation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-removeleadingandtrailingpunctuation
+	RemoveLeadingAndTrailingPunctuation *types.Value `json:"RemoveLeadingAndTrailingPunctuation,omitempty"`
+
+	// RemoveLeadingAndTrailingQuotes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-removeleadingandtrailingquotes
+	RemoveLeadingAndTrailingQuotes *types.Value `json:"RemoveLeadingAndTrailingQuotes,omitempty"`
+
+	// RemoveLeadingAndTrailingWhitespace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-removeleadingandtrailingwhitespace
+	RemoveLeadingAndTrailingWhitespace *types.Value `json:"RemoveLeadingAndTrailingWhitespace,omitempty"`
+
+	// RemoveLetters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-removeletters
+	RemoveLetters *types.Value `json:"RemoveLetters,omitempty"`
+
+	// RemoveNumbers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-removenumbers
+	RemoveNumbers *types.Value `json:"RemoveNumbers,omitempty"`
+
+	// RemoveSourceColumn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-removesourcecolumn
+	RemoveSourceColumn *types.Value `json:"RemoveSourceColumn,omitempty"`
+
+	// RemoveSpecialCharacters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-removespecialcharacters
+	RemoveSpecialCharacters *types.Value `json:"RemoveSpecialCharacters,omitempty"`
+
+	// RightColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-rightcolumns
+	RightColumns *types.Value `json:"RightColumns,omitempty"`
+
+	// SampleSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-samplesize
+	SampleSize *types.Value `json:"SampleSize,omitempty"`
+
+	// SampleType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-sampletype
+	SampleType *types.Value `json:"SampleType,omitempty"`
+
+	// SecondInput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-secondinput
+	SecondInput *types.Value `json:"SecondInput,omitempty"`
+
+	// SecondaryInputs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-secondaryinputs
+	SecondaryInputs []Recipe_SecondaryInput `json:"SecondaryInputs,omitempty"`
+
+	// SheetIndexes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-sheetindexes
+	SheetIndexes *types.Value `json:"SheetIndexes,omitempty"`
+
+	// SheetNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-sheetnames
+	SheetNames *types.Value `json:"SheetNames,omitempty"`
+
+	// SourceColumn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-sourcecolumn
+	SourceColumn *types.Value `json:"SourceColumn,omitempty"`
+
+	// SourceColumn1 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-sourcecolumn1
+	SourceColumn1 *types.Value `json:"SourceColumn1,omitempty"`
+
+	// SourceColumn2 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-sourcecolumn2
+	SourceColumn2 *types.Value `json:"SourceColumn2,omitempty"`
+
+	// SourceColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-sourcecolumns
+	SourceColumns *types.Value `json:"SourceColumns,omitempty"`
+
+	// StartColumnIndex AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-startcolumnindex
+	StartColumnIndex *types.Value `json:"StartColumnIndex,omitempty"`
+
+	// StartPattern AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-startpattern
+	StartPattern *types.Value `json:"StartPattern,omitempty"`
+
+	// StartPosition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-startposition
+	StartPosition *types.Value `json:"StartPosition,omitempty"`
+
+	// StartValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-startvalue
+	StartValue *types.Value `json:"StartValue,omitempty"`
+
+	// StemmingMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-stemmingmode
+	StemmingMode *types.Value `json:"StemmingMode,omitempty"`
+
+	// StepCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-stepcount
+	StepCount *types.Value `json:"StepCount,omitempty"`
+
+	// StepIndex AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-stepindex
+	StepIndex *types.Value `json:"StepIndex,omitempty"`
+
+	// StopWordsMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-stopwordsmode
+	StopWordsMode *types.Value `json:"StopWordsMode,omitempty"`
+
+	// Strategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-strategy
+	Strategy *types.Value `json:"Strategy,omitempty"`
+
+	// TargetColumn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-targetcolumn
+	TargetColumn *types.Value `json:"TargetColumn,omitempty"`
+
+	// TargetColumnNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-targetcolumnnames
+	TargetColumnNames *types.Value `json:"TargetColumnNames,omitempty"`
+
+	// TargetDateFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-targetdateformat
+	TargetDateFormat *types.Value `json:"TargetDateFormat,omitempty"`
+
+	// TargetIndex AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-targetindex
+	TargetIndex *types.Value `json:"TargetIndex,omitempty"`
+
+	// TimeZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-timezone
+	TimeZone *types.Value `json:"TimeZone,omitempty"`
+
+	// TokenizerPattern AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-tokenizerpattern
+	TokenizerPattern *types.Value `json:"TokenizerPattern,omitempty"`
+
+	// TrueString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-truestring
+	TrueString *types.Value `json:"TrueString,omitempty"`
+
+	// UdfLang AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-udflang
+	UdfLang *types.Value `json:"UdfLang,omitempty"`
+
+	// Units AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-units
+	Units *types.Value `json:"Units,omitempty"`
+
+	// UnpivotColumn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-unpivotcolumn
+	UnpivotColumn *types.Value `json:"UnpivotColumn,omitempty"`
+
+	// UpperBound AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-upperbound
+	UpperBound *types.Value `json:"UpperBound,omitempty"`
+
+	// UseNewDataFrame AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-usenewdataframe
+	UseNewDataFrame *types.Value `json:"UseNewDataFrame,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-value
+	Value *types.Value `json:"Value,omitempty"`
+
+	// Value1 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-value1
+	Value1 *types.Value `json:"Value1,omitempty"`
+
+	// Value2 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-value2
+	Value2 *types.Value `json:"Value2,omitempty"`
+
+	// ValueColumn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-valuecolumn
+	ValueColumn *types.Value `json:"ValueColumn,omitempty"`
+
+	// ViewFrame AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipeparameters.html#cfn-databrew-recipe-recipeparameters-viewframe
+	ViewFrame *types.Value `json:"ViewFrame,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Recipe_RecipeParameters) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Recipe.RecipeParameters"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-recipe_recipestep.go b/goformation/cloudformation/databrew/aws-databrew-recipe_recipestep.go
new file mode 100644
index 0000000000..b122cd9798
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-recipe_recipestep.go
@@ -0,0 +1,40 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Recipe_RecipeStep AWS CloudFormation Resource (AWS::DataBrew::Recipe.RecipeStep)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipestep.html
+type Recipe_RecipeStep struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipestep.html#cfn-databrew-recipe-recipestep-action
+	Action *Recipe_Action `json:"Action,omitempty"`
+
+	// ConditionExpressions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-recipestep.html#cfn-databrew-recipe-recipestep-conditionexpressions
+	ConditionExpressions []Recipe_ConditionExpression `json:"ConditionExpressions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Recipe_RecipeStep) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Recipe.RecipeStep"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-recipe_s3location.go b/goformation/cloudformation/databrew/aws-databrew-recipe_s3location.go
new file mode 100644
index 0000000000..3c3ca4fc60
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-recipe_s3location.go
@@ -0,0 +1,42 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Recipe_S3Location AWS CloudFormation Resource (AWS::DataBrew::Recipe.S3Location)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-s3location.html
+type Recipe_S3Location struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-s3location.html#cfn-databrew-recipe-s3location-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-s3location.html#cfn-databrew-recipe-s3location-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Recipe_S3Location) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Recipe.S3Location"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-recipe_secondaryinput.go b/goformation/cloudformation/databrew/aws-databrew-recipe_secondaryinput.go
new file mode 100644
index 0000000000..8edb8aacf7
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-recipe_secondaryinput.go
@@ -0,0 +1,40 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Recipe_SecondaryInput AWS CloudFormation Resource (AWS::DataBrew::Recipe.SecondaryInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-secondaryinput.html
+type Recipe_SecondaryInput struct {
+
+	// DataCatalogInputDefinition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-secondaryinput.html#cfn-databrew-recipe-secondaryinput-datacataloginputdefinition
+	DataCatalogInputDefinition *Recipe_DataCatalogInputDefinition `json:"DataCatalogInputDefinition,omitempty"`
+
+	// S3InputDefinition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-recipe-secondaryinput.html#cfn-databrew-recipe-secondaryinput-s3inputdefinition
+	S3InputDefinition *Recipe_S3Location `json:"S3InputDefinition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Recipe_SecondaryInput) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Recipe.SecondaryInput"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-ruleset.go b/goformation/cloudformation/databrew/aws-databrew-ruleset.go
new file mode 100644
index 0000000000..ed9f9b4b76
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-ruleset.go
@@ -0,0 +1,129 @@
+package databrew
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Ruleset AWS CloudFormation Resource (AWS::DataBrew::Ruleset)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-ruleset.html
+type Ruleset struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-ruleset.html#cfn-databrew-ruleset-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-ruleset.html#cfn-databrew-ruleset-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Rules AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-ruleset.html#cfn-databrew-ruleset-rules
+	Rules []Ruleset_Rule `json:"Rules,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-ruleset.html#cfn-databrew-ruleset-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TargetArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-ruleset.html#cfn-databrew-ruleset-targetarn
+	TargetArn *types.Value `json:"TargetArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Ruleset) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Ruleset"
+}
+
+// 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 Ruleset) MarshalJSON() ([]byte, error) {
+	type Properties Ruleset
+	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 *Ruleset) UnmarshalJSON(b []byte) error {
+	type Properties Ruleset
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Ruleset(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/databrew/aws-databrew-ruleset_columnselector.go b/goformation/cloudformation/databrew/aws-databrew-ruleset_columnselector.go
new file mode 100644
index 0000000000..30d331a873
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-ruleset_columnselector.go
@@ -0,0 +1,42 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Ruleset_ColumnSelector AWS CloudFormation Resource (AWS::DataBrew::Ruleset.ColumnSelector)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-ruleset-columnselector.html
+type Ruleset_ColumnSelector struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-ruleset-columnselector.html#cfn-databrew-ruleset-columnselector-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Regex AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-ruleset-columnselector.html#cfn-databrew-ruleset-columnselector-regex
+	Regex *types.Value `json:"Regex,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Ruleset_ColumnSelector) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Ruleset.ColumnSelector"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-ruleset_rule.go b/goformation/cloudformation/databrew/aws-databrew-ruleset_rule.go
new file mode 100644
index 0000000000..b4f31b8bb0
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-ruleset_rule.go
@@ -0,0 +1,62 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Ruleset_Rule AWS CloudFormation Resource (AWS::DataBrew::Ruleset.Rule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-ruleset-rule.html
+type Ruleset_Rule struct {
+
+	// CheckExpression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-ruleset-rule.html#cfn-databrew-ruleset-rule-checkexpression
+	CheckExpression *types.Value `json:"CheckExpression,omitempty"`
+
+	// ColumnSelectors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-ruleset-rule.html#cfn-databrew-ruleset-rule-columnselectors
+	ColumnSelectors []Ruleset_ColumnSelector `json:"ColumnSelectors,omitempty"`
+
+	// Disabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-ruleset-rule.html#cfn-databrew-ruleset-rule-disabled
+	Disabled *types.Value `json:"Disabled,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-ruleset-rule.html#cfn-databrew-ruleset-rule-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SubstitutionMap AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-ruleset-rule.html#cfn-databrew-ruleset-rule-substitutionmap
+	SubstitutionMap []Ruleset_SubstitutionValue `json:"SubstitutionMap,omitempty"`
+
+	// Threshold AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-ruleset-rule.html#cfn-databrew-ruleset-rule-threshold
+	Threshold *Ruleset_Threshold `json:"Threshold,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Ruleset_Rule) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Ruleset.Rule"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-ruleset_substitutionvalue.go b/goformation/cloudformation/databrew/aws-databrew-ruleset_substitutionvalue.go
new file mode 100644
index 0000000000..acb3b0c3f3
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-ruleset_substitutionvalue.go
@@ -0,0 +1,42 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Ruleset_SubstitutionValue AWS CloudFormation Resource (AWS::DataBrew::Ruleset.SubstitutionValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-ruleset-substitutionvalue.html
+type Ruleset_SubstitutionValue struct {
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-ruleset-substitutionvalue.html#cfn-databrew-ruleset-substitutionvalue-value
+	Value *types.Value `json:"Value,omitempty"`
+
+	// ValueReference AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-ruleset-substitutionvalue.html#cfn-databrew-ruleset-substitutionvalue-valuereference
+	ValueReference *types.Value `json:"ValueReference,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Ruleset_SubstitutionValue) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Ruleset.SubstitutionValue"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-ruleset_threshold.go b/goformation/cloudformation/databrew/aws-databrew-ruleset_threshold.go
new file mode 100644
index 0000000000..6ef177b639
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-ruleset_threshold.go
@@ -0,0 +1,47 @@
+package databrew
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Ruleset_Threshold AWS CloudFormation Resource (AWS::DataBrew::Ruleset.Threshold)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-ruleset-threshold.html
+type Ruleset_Threshold struct {
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-ruleset-threshold.html#cfn-databrew-ruleset-threshold-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Unit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-ruleset-threshold.html#cfn-databrew-ruleset-threshold-unit
+	Unit *types.Value `json:"Unit,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-databrew-ruleset-threshold.html#cfn-databrew-ruleset-threshold-value
+	Value *types.Value `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 *Ruleset_Threshold) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Ruleset.Threshold"
+}
diff --git a/goformation/cloudformation/databrew/aws-databrew-schedule.go b/goformation/cloudformation/databrew/aws-databrew-schedule.go
new file mode 100644
index 0000000000..da93f07618
--- /dev/null
+++ b/goformation/cloudformation/databrew/aws-databrew-schedule.go
@@ -0,0 +1,124 @@
+package databrew
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Schedule AWS CloudFormation Resource (AWS::DataBrew::Schedule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-schedule.html
+type Schedule struct {
+
+	// CronExpression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-schedule.html#cfn-databrew-schedule-cronexpression
+	CronExpression *types.Value `json:"CronExpression,omitempty"`
+
+	// JobNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-schedule.html#cfn-databrew-schedule-jobnames
+	JobNames *types.Value `json:"JobNames,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-schedule.html#cfn-databrew-schedule-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-databrew-schedule.html#cfn-databrew-schedule-tags
+	Tags []cloudformation.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 *Schedule) AWSCloudFormationType() string {
+	return "AWS::DataBrew::Schedule"
+}
+
+// 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 Schedule) MarshalJSON() ([]byte, error) {
+	type Properties Schedule
+	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 *Schedule) UnmarshalJSON(b []byte) error {
+	type Properties Schedule
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Schedule(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline.go b/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline.go
new file mode 100644
index 0000000000..960645654b
--- /dev/null
+++ b/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline.go
@@ -0,0 +1,138 @@
+package datapipeline
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline AWS CloudFormation Resource (AWS::DataPipeline::Pipeline)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datapipeline-pipeline.html
+type Pipeline struct {
+
+	// Activate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datapipeline-pipeline.html#cfn-datapipeline-pipeline-activate
+	Activate *types.Value `json:"Activate,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datapipeline-pipeline.html#cfn-datapipeline-pipeline-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datapipeline-pipeline.html#cfn-datapipeline-pipeline-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ParameterObjects AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datapipeline-pipeline.html#cfn-datapipeline-pipeline-parameterobjects
+	ParameterObjects []Pipeline_ParameterObject `json:"ParameterObjects,omitempty"`
+
+	// ParameterValues AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datapipeline-pipeline.html#cfn-datapipeline-pipeline-parametervalues
+	ParameterValues []Pipeline_ParameterValue `json:"ParameterValues,omitempty"`
+
+	// PipelineObjects AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datapipeline-pipeline.html#cfn-datapipeline-pipeline-pipelineobjects
+	PipelineObjects []Pipeline_PipelineObject `json:"PipelineObjects,omitempty"`
+
+	// PipelineTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datapipeline-pipeline.html#cfn-datapipeline-pipeline-pipelinetags
+	PipelineTags []Pipeline_PipelineTag `json:"PipelineTags,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::DataPipeline::Pipeline"
+}
+
+// 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 Pipeline) MarshalJSON() ([]byte, error) {
+	type Properties Pipeline
+	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 *Pipeline) UnmarshalJSON(b []byte) error {
+	type Properties Pipeline
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Pipeline(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_field.go b/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_field.go
new file mode 100644
index 0000000000..ade6b315db
--- /dev/null
+++ b/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_field.go
@@ -0,0 +1,47 @@
+package datapipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_Field AWS CloudFormation Resource (AWS::DataPipeline::Pipeline.Field)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelineobjects-fields.html
+type Pipeline_Field struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelineobjects-fields.html#cfn-datapipeline-pipeline-pipelineobjects-fields-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// RefValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelineobjects-fields.html#cfn-datapipeline-pipeline-pipelineobjects-fields-refvalue
+	RefValue *types.Value `json:"RefValue,omitempty"`
+
+	// StringValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelineobjects-fields.html#cfn-datapipeline-pipeline-pipelineobjects-fields-stringvalue
+	StringValue *types.Value `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 *Pipeline_Field) AWSCloudFormationType() string {
+	return "AWS::DataPipeline::Pipeline.Field"
+}
diff --git a/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterattribute.go b/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterattribute.go
new file mode 100644
index 0000000000..79a7d076cc
--- /dev/null
+++ b/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterattribute.go
@@ -0,0 +1,42 @@
+package datapipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_ParameterAttribute AWS CloudFormation Resource (AWS::DataPipeline::Pipeline.ParameterAttribute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-parameterobjects-attributes.html
+type Pipeline_ParameterAttribute struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-parameterobjects-attributes.html#cfn-datapipeline-pipeline-parameterobjects-attribtues-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// StringValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-parameterobjects-attributes.html#cfn-datapipeline-pipeline-parameterobjects-attribtues-stringvalue
+	StringValue *types.Value `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 *Pipeline_ParameterAttribute) AWSCloudFormationType() string {
+	return "AWS::DataPipeline::Pipeline.ParameterAttribute"
+}
diff --git a/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterobject.go b/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterobject.go
new file mode 100644
index 0000000000..a5061407e2
--- /dev/null
+++ b/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parameterobject.go
@@ -0,0 +1,42 @@
+package datapipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_ParameterObject AWS CloudFormation Resource (AWS::DataPipeline::Pipeline.ParameterObject)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-parameterobjects.html
+type Pipeline_ParameterObject struct {
+
+	// Attributes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-parameterobjects.html#cfn-datapipeline-pipeline-parameterobjects-attributes
+	Attributes []Pipeline_ParameterAttribute `json:"Attributes,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-parameterobjects.html#cfn-datapipeline-pipeline-parameterobjects-id
+	Id *types.Value `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 *Pipeline_ParameterObject) AWSCloudFormationType() string {
+	return "AWS::DataPipeline::Pipeline.ParameterObject"
+}
diff --git a/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parametervalue.go b/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parametervalue.go
new file mode 100644
index 0000000000..1854d2d3c0
--- /dev/null
+++ b/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_parametervalue.go
@@ -0,0 +1,42 @@
+package datapipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_ParameterValue AWS CloudFormation Resource (AWS::DataPipeline::Pipeline.ParameterValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-parametervalues.html
+type Pipeline_ParameterValue struct {
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-parametervalues.html#cfn-datapipeline-pipeline-parametervalues-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// StringValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-parametervalues.html#cfn-datapipeline-pipeline-parametervalues-stringvalue
+	StringValue *types.Value `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 *Pipeline_ParameterValue) AWSCloudFormationType() string {
+	return "AWS::DataPipeline::Pipeline.ParameterValue"
+}
diff --git a/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelineobject.go b/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelineobject.go
new file mode 100644
index 0000000000..7d03e9c7c5
--- /dev/null
+++ b/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelineobject.go
@@ -0,0 +1,47 @@
+package datapipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_PipelineObject AWS CloudFormation Resource (AWS::DataPipeline::Pipeline.PipelineObject)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelineobjects.html
+type Pipeline_PipelineObject struct {
+
+	// Fields AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelineobjects.html#cfn-datapipeline-pipeline-pipelineobjects-fields
+	Fields []Pipeline_Field `json:"Fields,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelineobjects.html#cfn-datapipeline-pipeline-pipelineobjects-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelineobjects.html#cfn-datapipeline-pipeline-pipelineobjects-name
+	Name *types.Value `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 *Pipeline_PipelineObject) AWSCloudFormationType() string {
+	return "AWS::DataPipeline::Pipeline.PipelineObject"
+}
diff --git a/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelinetag.go b/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelinetag.go
new file mode 100644
index 0000000000..61f5d008cc
--- /dev/null
+++ b/goformation/cloudformation/datapipeline/aws-datapipeline-pipeline_pipelinetag.go
@@ -0,0 +1,42 @@
+package datapipeline
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_PipelineTag AWS CloudFormation Resource (AWS::DataPipeline::Pipeline.PipelineTag)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelinetags.html
+type Pipeline_PipelineTag struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelinetags.html#cfn-datapipeline-pipeline-pipelinetags-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datapipeline-pipeline-pipelinetags.html#cfn-datapipeline-pipeline-pipelinetags-value
+	Value *types.Value `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 *Pipeline_PipelineTag) AWSCloudFormationType() string {
+	return "AWS::DataPipeline::Pipeline.PipelineTag"
+}
diff --git a/goformation/cloudformation/datasync/aws-datasync-agent.go b/goformation/cloudformation/datasync/aws-datasync-agent.go
new file mode 100644
index 0000000000..8c6999dfb0
--- /dev/null
+++ b/goformation/cloudformation/datasync/aws-datasync-agent.go
@@ -0,0 +1,134 @@
+package datasync
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Agent AWS CloudFormation Resource (AWS::DataSync::Agent)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-agent.html
+type Agent struct {
+
+	// ActivationKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-agent.html#cfn-datasync-agent-activationkey
+	ActivationKey *types.Value `json:"ActivationKey,omitempty"`
+
+	// AgentName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-agent.html#cfn-datasync-agent-agentname
+	AgentName *types.Value `json:"AgentName,omitempty"`
+
+	// SecurityGroupArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-agent.html#cfn-datasync-agent-securitygrouparns
+	SecurityGroupArns *types.Value `json:"SecurityGroupArns,omitempty"`
+
+	// SubnetArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-agent.html#cfn-datasync-agent-subnetarns
+	SubnetArns *types.Value `json:"SubnetArns,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-agent.html#cfn-datasync-agent-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VpcEndpointId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-agent.html#cfn-datasync-agent-vpcendpointid
+	VpcEndpointId *types.Value `json:"VpcEndpointId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::DataSync::Agent"
+}
+
+// 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 Agent) MarshalJSON() ([]byte, error) {
+	type Properties Agent
+	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 *Agent) UnmarshalJSON(b []byte) error {
+	type Properties Agent
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Agent(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/datasync/aws-datasync-locationefs.go b/goformation/cloudformation/datasync/aws-datasync-locationefs.go
new file mode 100644
index 0000000000..43b5017a01
--- /dev/null
+++ b/goformation/cloudformation/datasync/aws-datasync-locationefs.go
@@ -0,0 +1,124 @@
+package datasync
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// LocationEFS AWS CloudFormation Resource (AWS::DataSync::LocationEFS)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationefs.html
+type LocationEFS struct {
+
+	// Ec2Config AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationefs.html#cfn-datasync-locationefs-ec2config
+	Ec2Config *LocationEFS_Ec2Config `json:"Ec2Config,omitempty"`
+
+	// EfsFilesystemArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationefs.html#cfn-datasync-locationefs-efsfilesystemarn
+	EfsFilesystemArn *types.Value `json:"EfsFilesystemArn,omitempty"`
+
+	// Subdirectory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationefs.html#cfn-datasync-locationefs-subdirectory
+	Subdirectory *types.Value `json:"Subdirectory,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationefs.html#cfn-datasync-locationefs-tags
+	Tags []cloudformation.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 *LocationEFS) AWSCloudFormationType() string {
+	return "AWS::DataSync::LocationEFS"
+}
+
+// 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 LocationEFS) MarshalJSON() ([]byte, error) {
+	type Properties LocationEFS
+	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 *LocationEFS) UnmarshalJSON(b []byte) error {
+	type Properties LocationEFS
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LocationEFS(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/datasync/aws-datasync-locationefs_ec2config.go b/goformation/cloudformation/datasync/aws-datasync-locationefs_ec2config.go
new file mode 100644
index 0000000000..cbd0f9bc70
--- /dev/null
+++ b/goformation/cloudformation/datasync/aws-datasync-locationefs_ec2config.go
@@ -0,0 +1,42 @@
+package datasync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LocationEFS_Ec2Config AWS CloudFormation Resource (AWS::DataSync::LocationEFS.Ec2Config)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationefs-ec2config.html
+type LocationEFS_Ec2Config struct {
+
+	// SecurityGroupArns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationefs-ec2config.html#cfn-datasync-locationefs-ec2config-securitygrouparns
+	SecurityGroupArns *types.Value `json:"SecurityGroupArns,omitempty"`
+
+	// SubnetArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationefs-ec2config.html#cfn-datasync-locationefs-ec2config-subnetarn
+	SubnetArn *types.Value `json:"SubnetArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LocationEFS_Ec2Config) AWSCloudFormationType() string {
+	return "AWS::DataSync::LocationEFS.Ec2Config"
+}
diff --git a/goformation/cloudformation/datasync/aws-datasync-locationfsxwindows.go b/goformation/cloudformation/datasync/aws-datasync-locationfsxwindows.go
new file mode 100644
index 0000000000..acb5608e38
--- /dev/null
+++ b/goformation/cloudformation/datasync/aws-datasync-locationfsxwindows.go
@@ -0,0 +1,139 @@
+package datasync
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// LocationFSxWindows AWS CloudFormation Resource (AWS::DataSync::LocationFSxWindows)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxwindows.html
+type LocationFSxWindows struct {
+
+	// Domain AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxwindows.html#cfn-datasync-locationfsxwindows-domain
+	Domain *types.Value `json:"Domain,omitempty"`
+
+	// FsxFilesystemArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxwindows.html#cfn-datasync-locationfsxwindows-fsxfilesystemarn
+	FsxFilesystemArn *types.Value `json:"FsxFilesystemArn,omitempty"`
+
+	// Password AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxwindows.html#cfn-datasync-locationfsxwindows-password
+	Password *types.Value `json:"Password,omitempty"`
+
+	// SecurityGroupArns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxwindows.html#cfn-datasync-locationfsxwindows-securitygrouparns
+	SecurityGroupArns *types.Value `json:"SecurityGroupArns,omitempty"`
+
+	// Subdirectory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxwindows.html#cfn-datasync-locationfsxwindows-subdirectory
+	Subdirectory *types.Value `json:"Subdirectory,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxwindows.html#cfn-datasync-locationfsxwindows-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// User AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationfsxwindows.html#cfn-datasync-locationfsxwindows-user
+	User *types.Value `json:"User,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LocationFSxWindows) AWSCloudFormationType() string {
+	return "AWS::DataSync::LocationFSxWindows"
+}
+
+// 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 LocationFSxWindows) MarshalJSON() ([]byte, error) {
+	type Properties LocationFSxWindows
+	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 *LocationFSxWindows) UnmarshalJSON(b []byte) error {
+	type Properties LocationFSxWindows
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LocationFSxWindows(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/datasync/aws-datasync-locationhdfs.go b/goformation/cloudformation/datasync/aws-datasync-locationhdfs.go
new file mode 100644
index 0000000000..998b4492e7
--- /dev/null
+++ b/goformation/cloudformation/datasync/aws-datasync-locationhdfs.go
@@ -0,0 +1,169 @@
+package datasync
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// LocationHDFS AWS CloudFormation Resource (AWS::DataSync::LocationHDFS)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationhdfs.html
+type LocationHDFS struct {
+
+	// AgentArns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationhdfs.html#cfn-datasync-locationhdfs-agentarns
+	AgentArns *types.Value `json:"AgentArns,omitempty"`
+
+	// AuthenticationType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationhdfs.html#cfn-datasync-locationhdfs-authenticationtype
+	AuthenticationType *types.Value `json:"AuthenticationType,omitempty"`
+
+	// BlockSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationhdfs.html#cfn-datasync-locationhdfs-blocksize
+	BlockSize *types.Value `json:"BlockSize,omitempty"`
+
+	// KerberosKeytab AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationhdfs.html#cfn-datasync-locationhdfs-kerberoskeytab
+	KerberosKeytab *types.Value `json:"KerberosKeytab,omitempty"`
+
+	// KerberosKrb5Conf AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationhdfs.html#cfn-datasync-locationhdfs-kerberoskrb5conf
+	KerberosKrb5Conf *types.Value `json:"KerberosKrb5Conf,omitempty"`
+
+	// KerberosPrincipal AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationhdfs.html#cfn-datasync-locationhdfs-kerberosprincipal
+	KerberosPrincipal *types.Value `json:"KerberosPrincipal,omitempty"`
+
+	// KmsKeyProviderUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationhdfs.html#cfn-datasync-locationhdfs-kmskeyprovideruri
+	KmsKeyProviderUri *types.Value `json:"KmsKeyProviderUri,omitempty"`
+
+	// NameNodes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationhdfs.html#cfn-datasync-locationhdfs-namenodes
+	NameNodes []LocationHDFS_NameNode `json:"NameNodes,omitempty"`
+
+	// QopConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationhdfs.html#cfn-datasync-locationhdfs-qopconfiguration
+	QopConfiguration *LocationHDFS_QopConfiguration `json:"QopConfiguration,omitempty"`
+
+	// ReplicationFactor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationhdfs.html#cfn-datasync-locationhdfs-replicationfactor
+	ReplicationFactor *types.Value `json:"ReplicationFactor,omitempty"`
+
+	// SimpleUser AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationhdfs.html#cfn-datasync-locationhdfs-simpleuser
+	SimpleUser *types.Value `json:"SimpleUser,omitempty"`
+
+	// Subdirectory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationhdfs.html#cfn-datasync-locationhdfs-subdirectory
+	Subdirectory *types.Value `json:"Subdirectory,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationhdfs.html#cfn-datasync-locationhdfs-tags
+	Tags []cloudformation.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 *LocationHDFS) AWSCloudFormationType() string {
+	return "AWS::DataSync::LocationHDFS"
+}
+
+// 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 LocationHDFS) MarshalJSON() ([]byte, error) {
+	type Properties LocationHDFS
+	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 *LocationHDFS) UnmarshalJSON(b []byte) error {
+	type Properties LocationHDFS
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LocationHDFS(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/datasync/aws-datasync-locationhdfs_namenode.go b/goformation/cloudformation/datasync/aws-datasync-locationhdfs_namenode.go
new file mode 100644
index 0000000000..709f32a9e4
--- /dev/null
+++ b/goformation/cloudformation/datasync/aws-datasync-locationhdfs_namenode.go
@@ -0,0 +1,42 @@
+package datasync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LocationHDFS_NameNode AWS CloudFormation Resource (AWS::DataSync::LocationHDFS.NameNode)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationhdfs-namenode.html
+type LocationHDFS_NameNode struct {
+
+	// Hostname AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationhdfs-namenode.html#cfn-datasync-locationhdfs-namenode-hostname
+	Hostname *types.Value `json:"Hostname,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationhdfs-namenode.html#cfn-datasync-locationhdfs-namenode-port
+	Port *types.Value `json:"Port"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LocationHDFS_NameNode) AWSCloudFormationType() string {
+	return "AWS::DataSync::LocationHDFS.NameNode"
+}
diff --git a/goformation/cloudformation/datasync/aws-datasync-locationhdfs_qopconfiguration.go b/goformation/cloudformation/datasync/aws-datasync-locationhdfs_qopconfiguration.go
new file mode 100644
index 0000000000..3b5da1fd9a
--- /dev/null
+++ b/goformation/cloudformation/datasync/aws-datasync-locationhdfs_qopconfiguration.go
@@ -0,0 +1,42 @@
+package datasync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LocationHDFS_QopConfiguration AWS CloudFormation Resource (AWS::DataSync::LocationHDFS.QopConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationhdfs-qopconfiguration.html
+type LocationHDFS_QopConfiguration struct {
+
+	// DataTransferProtection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationhdfs-qopconfiguration.html#cfn-datasync-locationhdfs-qopconfiguration-datatransferprotection
+	DataTransferProtection *types.Value `json:"DataTransferProtection,omitempty"`
+
+	// RpcProtection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationhdfs-qopconfiguration.html#cfn-datasync-locationhdfs-qopconfiguration-rpcprotection
+	RpcProtection *types.Value `json:"RpcProtection,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LocationHDFS_QopConfiguration) AWSCloudFormationType() string {
+	return "AWS::DataSync::LocationHDFS.QopConfiguration"
+}
diff --git a/goformation/cloudformation/datasync/aws-datasync-locationnfs.go b/goformation/cloudformation/datasync/aws-datasync-locationnfs.go
new file mode 100644
index 0000000000..4911212b69
--- /dev/null
+++ b/goformation/cloudformation/datasync/aws-datasync-locationnfs.go
@@ -0,0 +1,129 @@
+package datasync
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// LocationNFS AWS CloudFormation Resource (AWS::DataSync::LocationNFS)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationnfs.html
+type LocationNFS struct {
+
+	// MountOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationnfs.html#cfn-datasync-locationnfs-mountoptions
+	MountOptions *LocationNFS_MountOptions `json:"MountOptions,omitempty"`
+
+	// OnPremConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationnfs.html#cfn-datasync-locationnfs-onpremconfig
+	OnPremConfig *LocationNFS_OnPremConfig `json:"OnPremConfig,omitempty"`
+
+	// ServerHostname AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationnfs.html#cfn-datasync-locationnfs-serverhostname
+	ServerHostname *types.Value `json:"ServerHostname,omitempty"`
+
+	// Subdirectory AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationnfs.html#cfn-datasync-locationnfs-subdirectory
+	Subdirectory *types.Value `json:"Subdirectory,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationnfs.html#cfn-datasync-locationnfs-tags
+	Tags []cloudformation.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 *LocationNFS) AWSCloudFormationType() string {
+	return "AWS::DataSync::LocationNFS"
+}
+
+// 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 LocationNFS) MarshalJSON() ([]byte, error) {
+	type Properties LocationNFS
+	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 *LocationNFS) UnmarshalJSON(b []byte) error {
+	type Properties LocationNFS
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LocationNFS(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/datasync/aws-datasync-locationnfs_mountoptions.go b/goformation/cloudformation/datasync/aws-datasync-locationnfs_mountoptions.go
new file mode 100644
index 0000000000..4f558f31f4
--- /dev/null
+++ b/goformation/cloudformation/datasync/aws-datasync-locationnfs_mountoptions.go
@@ -0,0 +1,37 @@
+package datasync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LocationNFS_MountOptions AWS CloudFormation Resource (AWS::DataSync::LocationNFS.MountOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationnfs-mountoptions.html
+type LocationNFS_MountOptions struct {
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationnfs-mountoptions.html#cfn-datasync-locationnfs-mountoptions-version
+	Version *types.Value `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 *LocationNFS_MountOptions) AWSCloudFormationType() string {
+	return "AWS::DataSync::LocationNFS.MountOptions"
+}
diff --git a/goformation/cloudformation/datasync/aws-datasync-locationnfs_onpremconfig.go b/goformation/cloudformation/datasync/aws-datasync-locationnfs_onpremconfig.go
new file mode 100644
index 0000000000..00e7b29ee0
--- /dev/null
+++ b/goformation/cloudformation/datasync/aws-datasync-locationnfs_onpremconfig.go
@@ -0,0 +1,37 @@
+package datasync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LocationNFS_OnPremConfig AWS CloudFormation Resource (AWS::DataSync::LocationNFS.OnPremConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationnfs-onpremconfig.html
+type LocationNFS_OnPremConfig struct {
+
+	// AgentArns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationnfs-onpremconfig.html#cfn-datasync-locationnfs-onpremconfig-agentarns
+	AgentArns *types.Value `json:"AgentArns,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LocationNFS_OnPremConfig) AWSCloudFormationType() string {
+	return "AWS::DataSync::LocationNFS.OnPremConfig"
+}
diff --git a/goformation/cloudformation/datasync/aws-datasync-locationobjectstorage.go b/goformation/cloudformation/datasync/aws-datasync-locationobjectstorage.go
new file mode 100644
index 0000000000..b4ae1ed921
--- /dev/null
+++ b/goformation/cloudformation/datasync/aws-datasync-locationobjectstorage.go
@@ -0,0 +1,149 @@
+package datasync
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// LocationObjectStorage AWS CloudFormation Resource (AWS::DataSync::LocationObjectStorage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationobjectstorage.html
+type LocationObjectStorage struct {
+
+	// AccessKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationobjectstorage.html#cfn-datasync-locationobjectstorage-accesskey
+	AccessKey *types.Value `json:"AccessKey,omitempty"`
+
+	// AgentArns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationobjectstorage.html#cfn-datasync-locationobjectstorage-agentarns
+	AgentArns *types.Value `json:"AgentArns,omitempty"`
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationobjectstorage.html#cfn-datasync-locationobjectstorage-bucketname
+	BucketName *types.Value `json:"BucketName,omitempty"`
+
+	// SecretKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationobjectstorage.html#cfn-datasync-locationobjectstorage-secretkey
+	SecretKey *types.Value `json:"SecretKey,omitempty"`
+
+	// ServerHostname AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationobjectstorage.html#cfn-datasync-locationobjectstorage-serverhostname
+	ServerHostname *types.Value `json:"ServerHostname,omitempty"`
+
+	// ServerPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationobjectstorage.html#cfn-datasync-locationobjectstorage-serverport
+	ServerPort *types.Value `json:"ServerPort,omitempty"`
+
+	// ServerProtocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationobjectstorage.html#cfn-datasync-locationobjectstorage-serverprotocol
+	ServerProtocol *types.Value `json:"ServerProtocol,omitempty"`
+
+	// Subdirectory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationobjectstorage.html#cfn-datasync-locationobjectstorage-subdirectory
+	Subdirectory *types.Value `json:"Subdirectory,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationobjectstorage.html#cfn-datasync-locationobjectstorage-tags
+	Tags []cloudformation.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 *LocationObjectStorage) AWSCloudFormationType() string {
+	return "AWS::DataSync::LocationObjectStorage"
+}
+
+// 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 LocationObjectStorage) MarshalJSON() ([]byte, error) {
+	type Properties LocationObjectStorage
+	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 *LocationObjectStorage) UnmarshalJSON(b []byte) error {
+	type Properties LocationObjectStorage
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LocationObjectStorage(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/datasync/aws-datasync-locations3.go b/goformation/cloudformation/datasync/aws-datasync-locations3.go
new file mode 100644
index 0000000000..4f9abef479
--- /dev/null
+++ b/goformation/cloudformation/datasync/aws-datasync-locations3.go
@@ -0,0 +1,129 @@
+package datasync
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// LocationS3 AWS CloudFormation Resource (AWS::DataSync::LocationS3)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locations3.html
+type LocationS3 struct {
+
+	// S3BucketArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locations3.html#cfn-datasync-locations3-s3bucketarn
+	S3BucketArn *types.Value `json:"S3BucketArn,omitempty"`
+
+	// S3Config AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locations3.html#cfn-datasync-locations3-s3config
+	S3Config *LocationS3_S3Config `json:"S3Config,omitempty"`
+
+	// S3StorageClass AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locations3.html#cfn-datasync-locations3-s3storageclass
+	S3StorageClass *types.Value `json:"S3StorageClass,omitempty"`
+
+	// Subdirectory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locations3.html#cfn-datasync-locations3-subdirectory
+	Subdirectory *types.Value `json:"Subdirectory,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locations3.html#cfn-datasync-locations3-tags
+	Tags []cloudformation.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 *LocationS3) AWSCloudFormationType() string {
+	return "AWS::DataSync::LocationS3"
+}
+
+// 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 LocationS3) MarshalJSON() ([]byte, error) {
+	type Properties LocationS3
+	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 *LocationS3) UnmarshalJSON(b []byte) error {
+	type Properties LocationS3
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LocationS3(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/datasync/aws-datasync-locations3_s3config.go b/goformation/cloudformation/datasync/aws-datasync-locations3_s3config.go
new file mode 100644
index 0000000000..6a1df2f02a
--- /dev/null
+++ b/goformation/cloudformation/datasync/aws-datasync-locations3_s3config.go
@@ -0,0 +1,37 @@
+package datasync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LocationS3_S3Config AWS CloudFormation Resource (AWS::DataSync::LocationS3.S3Config)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locations3-s3config.html
+type LocationS3_S3Config struct {
+
+	// BucketAccessRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locations3-s3config.html#cfn-datasync-locations3-s3config-bucketaccessrolearn
+	BucketAccessRoleArn *types.Value `json:"BucketAccessRoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LocationS3_S3Config) AWSCloudFormationType() string {
+	return "AWS::DataSync::LocationS3.S3Config"
+}
diff --git a/goformation/cloudformation/datasync/aws-datasync-locationsmb.go b/goformation/cloudformation/datasync/aws-datasync-locationsmb.go
new file mode 100644
index 0000000000..16582748d3
--- /dev/null
+++ b/goformation/cloudformation/datasync/aws-datasync-locationsmb.go
@@ -0,0 +1,144 @@
+package datasync
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// LocationSMB AWS CloudFormation Resource (AWS::DataSync::LocationSMB)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationsmb.html
+type LocationSMB struct {
+
+	// AgentArns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationsmb.html#cfn-datasync-locationsmb-agentarns
+	AgentArns *types.Value `json:"AgentArns,omitempty"`
+
+	// Domain AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationsmb.html#cfn-datasync-locationsmb-domain
+	Domain *types.Value `json:"Domain,omitempty"`
+
+	// MountOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationsmb.html#cfn-datasync-locationsmb-mountoptions
+	MountOptions *LocationSMB_MountOptions `json:"MountOptions,omitempty"`
+
+	// Password AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationsmb.html#cfn-datasync-locationsmb-password
+	Password *types.Value `json:"Password,omitempty"`
+
+	// ServerHostname AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationsmb.html#cfn-datasync-locationsmb-serverhostname
+	ServerHostname *types.Value `json:"ServerHostname,omitempty"`
+
+	// Subdirectory AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationsmb.html#cfn-datasync-locationsmb-subdirectory
+	Subdirectory *types.Value `json:"Subdirectory,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationsmb.html#cfn-datasync-locationsmb-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// User AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-locationsmb.html#cfn-datasync-locationsmb-user
+	User *types.Value `json:"User,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LocationSMB) AWSCloudFormationType() string {
+	return "AWS::DataSync::LocationSMB"
+}
+
+// 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 LocationSMB) MarshalJSON() ([]byte, error) {
+	type Properties LocationSMB
+	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 *LocationSMB) UnmarshalJSON(b []byte) error {
+	type Properties LocationSMB
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LocationSMB(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/datasync/aws-datasync-locationsmb_mountoptions.go b/goformation/cloudformation/datasync/aws-datasync-locationsmb_mountoptions.go
new file mode 100644
index 0000000000..18fbbc494e
--- /dev/null
+++ b/goformation/cloudformation/datasync/aws-datasync-locationsmb_mountoptions.go
@@ -0,0 +1,37 @@
+package datasync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LocationSMB_MountOptions AWS CloudFormation Resource (AWS::DataSync::LocationSMB.MountOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationsmb-mountoptions.html
+type LocationSMB_MountOptions struct {
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-locationsmb-mountoptions.html#cfn-datasync-locationsmb-mountoptions-version
+	Version *types.Value `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 *LocationSMB_MountOptions) AWSCloudFormationType() string {
+	return "AWS::DataSync::LocationSMB.MountOptions"
+}
diff --git a/goformation/cloudformation/datasync/aws-datasync-task.go b/goformation/cloudformation/datasync/aws-datasync-task.go
new file mode 100644
index 0000000000..defab43377
--- /dev/null
+++ b/goformation/cloudformation/datasync/aws-datasync-task.go
@@ -0,0 +1,149 @@
+package datasync
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Task AWS CloudFormation Resource (AWS::DataSync::Task)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-task.html
+type Task struct {
+
+	// CloudWatchLogGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-task.html#cfn-datasync-task-cloudwatchloggrouparn
+	CloudWatchLogGroupArn *types.Value `json:"CloudWatchLogGroupArn,omitempty"`
+
+	// DestinationLocationArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-task.html#cfn-datasync-task-destinationlocationarn
+	DestinationLocationArn *types.Value `json:"DestinationLocationArn,omitempty"`
+
+	// Excludes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-task.html#cfn-datasync-task-excludes
+	Excludes []Task_FilterRule `json:"Excludes,omitempty"`
+
+	// Includes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-task.html#cfn-datasync-task-includes
+	Includes []Task_FilterRule `json:"Includes,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-task.html#cfn-datasync-task-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Options AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-task.html#cfn-datasync-task-options
+	Options *Task_Options `json:"Options,omitempty"`
+
+	// Schedule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-task.html#cfn-datasync-task-schedule
+	Schedule *Task_TaskSchedule `json:"Schedule,omitempty"`
+
+	// SourceLocationArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-task.html#cfn-datasync-task-sourcelocationarn
+	SourceLocationArn *types.Value `json:"SourceLocationArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-datasync-task.html#cfn-datasync-task-tags
+	Tags []cloudformation.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 *Task) AWSCloudFormationType() string {
+	return "AWS::DataSync::Task"
+}
+
+// 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 Task) MarshalJSON() ([]byte, error) {
+	type Properties Task
+	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 *Task) UnmarshalJSON(b []byte) error {
+	type Properties Task
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Task(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/datasync/aws-datasync-task_filterrule.go b/goformation/cloudformation/datasync/aws-datasync-task_filterrule.go
new file mode 100644
index 0000000000..ce24d7c021
--- /dev/null
+++ b/goformation/cloudformation/datasync/aws-datasync-task_filterrule.go
@@ -0,0 +1,42 @@
+package datasync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Task_FilterRule AWS CloudFormation Resource (AWS::DataSync::Task.FilterRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-task-filterrule.html
+type Task_FilterRule struct {
+
+	// FilterType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-task-filterrule.html#cfn-datasync-task-filterrule-filtertype
+	FilterType *types.Value `json:"FilterType,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-task-filterrule.html#cfn-datasync-task-filterrule-value
+	Value *types.Value `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 *Task_FilterRule) AWSCloudFormationType() string {
+	return "AWS::DataSync::Task.FilterRule"
+}
diff --git a/goformation/cloudformation/datasync/aws-datasync-task_options.go b/goformation/cloudformation/datasync/aws-datasync-task_options.go
new file mode 100644
index 0000000000..89f8f0f689
--- /dev/null
+++ b/goformation/cloudformation/datasync/aws-datasync-task_options.go
@@ -0,0 +1,102 @@
+package datasync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Task_Options AWS CloudFormation Resource (AWS::DataSync::Task.Options)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-task-options.html
+type Task_Options struct {
+
+	// Atime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-task-options.html#cfn-datasync-task-options-atime
+	Atime *types.Value `json:"Atime,omitempty"`
+
+	// BytesPerSecond AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-task-options.html#cfn-datasync-task-options-bytespersecond
+	BytesPerSecond *types.Value `json:"BytesPerSecond,omitempty"`
+
+	// Gid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-task-options.html#cfn-datasync-task-options-gid
+	Gid *types.Value `json:"Gid,omitempty"`
+
+	// LogLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-task-options.html#cfn-datasync-task-options-loglevel
+	LogLevel *types.Value `json:"LogLevel,omitempty"`
+
+	// Mtime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-task-options.html#cfn-datasync-task-options-mtime
+	Mtime *types.Value `json:"Mtime,omitempty"`
+
+	// OverwriteMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-task-options.html#cfn-datasync-task-options-overwritemode
+	OverwriteMode *types.Value `json:"OverwriteMode,omitempty"`
+
+	// PosixPermissions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-task-options.html#cfn-datasync-task-options-posixpermissions
+	PosixPermissions *types.Value `json:"PosixPermissions,omitempty"`
+
+	// PreserveDeletedFiles AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-task-options.html#cfn-datasync-task-options-preservedeletedfiles
+	PreserveDeletedFiles *types.Value `json:"PreserveDeletedFiles,omitempty"`
+
+	// PreserveDevices AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-task-options.html#cfn-datasync-task-options-preservedevices
+	PreserveDevices *types.Value `json:"PreserveDevices,omitempty"`
+
+	// SecurityDescriptorCopyFlags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-task-options.html#cfn-datasync-task-options-securitydescriptorcopyflags
+	SecurityDescriptorCopyFlags *types.Value `json:"SecurityDescriptorCopyFlags,omitempty"`
+
+	// TaskQueueing AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-task-options.html#cfn-datasync-task-options-taskqueueing
+	TaskQueueing *types.Value `json:"TaskQueueing,omitempty"`
+
+	// TransferMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-task-options.html#cfn-datasync-task-options-transfermode
+	TransferMode *types.Value `json:"TransferMode,omitempty"`
+
+	// Uid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-task-options.html#cfn-datasync-task-options-uid
+	Uid *types.Value `json:"Uid,omitempty"`
+
+	// VerifyMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-task-options.html#cfn-datasync-task-options-verifymode
+	VerifyMode *types.Value `json:"VerifyMode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Task_Options) AWSCloudFormationType() string {
+	return "AWS::DataSync::Task.Options"
+}
diff --git a/goformation/cloudformation/datasync/aws-datasync-task_taskschedule.go b/goformation/cloudformation/datasync/aws-datasync-task_taskschedule.go
new file mode 100644
index 0000000000..f70236a001
--- /dev/null
+++ b/goformation/cloudformation/datasync/aws-datasync-task_taskschedule.go
@@ -0,0 +1,37 @@
+package datasync
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Task_TaskSchedule AWS CloudFormation Resource (AWS::DataSync::Task.TaskSchedule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-task-taskschedule.html
+type Task_TaskSchedule struct {
+
+	// ScheduleExpression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-datasync-task-taskschedule.html#cfn-datasync-task-taskschedule-scheduleexpression
+	ScheduleExpression *types.Value `json:"ScheduleExpression,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Task_TaskSchedule) AWSCloudFormationType() string {
+	return "AWS::DataSync::Task.TaskSchedule"
+}
diff --git a/goformation/cloudformation/dax/aws-dax-cluster.go b/goformation/cloudformation/dax/aws-dax-cluster.go
new file mode 100644
index 0000000000..3a53c4309d
--- /dev/null
+++ b/goformation/cloudformation/dax/aws-dax-cluster.go
@@ -0,0 +1,173 @@
+package dax
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster AWS CloudFormation Resource (AWS::DAX::Cluster)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html
+type Cluster struct {
+
+	// AvailabilityZones AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-availabilityzones
+	AvailabilityZones *types.Value `json:"AvailabilityZones,omitempty"`
+
+	// ClusterEndpointEncryptionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-clusterendpointencryptiontype
+	ClusterEndpointEncryptionType *types.Value `json:"ClusterEndpointEncryptionType,omitempty"`
+
+	// ClusterName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-clustername
+	ClusterName *types.Value `json:"ClusterName,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// IAMRoleARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-iamrolearn
+	IAMRoleARN *types.Value `json:"IAMRoleARN,omitempty"`
+
+	// NodeType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-nodetype
+	NodeType *types.Value `json:"NodeType,omitempty"`
+
+	// NotificationTopicARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-notificationtopicarn
+	NotificationTopicARN *types.Value `json:"NotificationTopicARN,omitempty"`
+
+	// ParameterGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-parametergroupname
+	ParameterGroupName *types.Value `json:"ParameterGroupName,omitempty"`
+
+	// PreferredMaintenanceWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-preferredmaintenancewindow
+	PreferredMaintenanceWindow *types.Value `json:"PreferredMaintenanceWindow,omitempty"`
+
+	// ReplicationFactor AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-replicationfactor
+	ReplicationFactor *types.Value `json:"ReplicationFactor"`
+
+	// SSESpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-ssespecification
+	SSESpecification *Cluster_SSESpecification `json:"SSESpecification,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-subnetgroupname
+	SubnetGroupName *types.Value `json:"SubnetGroupName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-cluster.html#cfn-dax-cluster-tags
+	Tags interface{} `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::DAX::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/dax/aws-dax-cluster_ssespecification.go b/goformation/cloudformation/dax/aws-dax-cluster_ssespecification.go
new file mode 100644
index 0000000000..596a696624
--- /dev/null
+++ b/goformation/cloudformation/dax/aws-dax-cluster_ssespecification.go
@@ -0,0 +1,37 @@
+package dax
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_SSESpecification AWS CloudFormation Resource (AWS::DAX::Cluster.SSESpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dax-cluster-ssespecification.html
+type Cluster_SSESpecification struct {
+
+	// SSEEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dax-cluster-ssespecification.html#cfn-dax-cluster-ssespecification-sseenabled
+	SSEEnabled *types.Value `json:"SSEEnabled,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SSESpecification) AWSCloudFormationType() string {
+	return "AWS::DAX::Cluster.SSESpecification"
+}
diff --git a/goformation/cloudformation/dax/aws-dax-parametergroup.go b/goformation/cloudformation/dax/aws-dax-parametergroup.go
new file mode 100644
index 0000000000..2d754397b9
--- /dev/null
+++ b/goformation/cloudformation/dax/aws-dax-parametergroup.go
@@ -0,0 +1,118 @@
+package dax
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ParameterGroup AWS CloudFormation Resource (AWS::DAX::ParameterGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html
+type ParameterGroup struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// ParameterGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-parametergroupname
+	ParameterGroupName *types.Value `json:"ParameterGroupName,omitempty"`
+
+	// ParameterNameValues AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-parametergroup.html#cfn-dax-parametergroup-parameternamevalues
+	ParameterNameValues interface{} `json:"ParameterNameValues,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ParameterGroup) AWSCloudFormationType() string {
+	return "AWS::DAX::ParameterGroup"
+}
+
+// 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 ParameterGroup) MarshalJSON() ([]byte, error) {
+	type Properties ParameterGroup
+	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 *ParameterGroup) UnmarshalJSON(b []byte) error {
+	type Properties ParameterGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ParameterGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/dax/aws-dax-subnetgroup.go b/goformation/cloudformation/dax/aws-dax-subnetgroup.go
new file mode 100644
index 0000000000..581206b7a5
--- /dev/null
+++ b/goformation/cloudformation/dax/aws-dax-subnetgroup.go
@@ -0,0 +1,118 @@
+package dax
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SubnetGroup AWS CloudFormation Resource (AWS::DAX::SubnetGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html
+type SubnetGroup struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// SubnetGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-subnetgroupname
+	SubnetGroupName *types.Value `json:"SubnetGroupName,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dax-subnetgroup.html#cfn-dax-subnetgroup-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SubnetGroup) AWSCloudFormationType() string {
+	return "AWS::DAX::SubnetGroup"
+}
+
+// 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 SubnetGroup) MarshalJSON() ([]byte, error) {
+	type Properties SubnetGroup
+	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 *SubnetGroup) UnmarshalJSON(b []byte) error {
+	type Properties SubnetGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SubnetGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/detective/aws-detective-graph.go b/goformation/cloudformation/detective/aws-detective-graph.go
new file mode 100644
index 0000000000..ec6e16ecb9
--- /dev/null
+++ b/goformation/cloudformation/detective/aws-detective-graph.go
@@ -0,0 +1,107 @@
+package detective
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Graph AWS CloudFormation Resource (AWS::Detective::Graph)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-detective-graph.html
+type Graph struct {
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-detective-graph.html#cfn-detective-graph-tags
+	Tags []cloudformation.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 *Graph) AWSCloudFormationType() string {
+	return "AWS::Detective::Graph"
+}
+
+// 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 Graph) MarshalJSON() ([]byte, error) {
+	type Properties Graph
+	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 *Graph) UnmarshalJSON(b []byte) error {
+	type Properties Graph
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Graph(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/detective/aws-detective-memberinvitation.go b/goformation/cloudformation/detective/aws-detective-memberinvitation.go
new file mode 100644
index 0000000000..6ded1546eb
--- /dev/null
+++ b/goformation/cloudformation/detective/aws-detective-memberinvitation.go
@@ -0,0 +1,128 @@
+package detective
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MemberInvitation AWS CloudFormation Resource (AWS::Detective::MemberInvitation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-detective-memberinvitation.html
+type MemberInvitation struct {
+
+	// DisableEmailNotification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-detective-memberinvitation.html#cfn-detective-memberinvitation-disableemailnotification
+	DisableEmailNotification *types.Value `json:"DisableEmailNotification,omitempty"`
+
+	// GraphArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-detective-memberinvitation.html#cfn-detective-memberinvitation-grapharn
+	GraphArn *types.Value `json:"GraphArn,omitempty"`
+
+	// MemberEmailAddress AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-detective-memberinvitation.html#cfn-detective-memberinvitation-memberemailaddress
+	MemberEmailAddress *types.Value `json:"MemberEmailAddress,omitempty"`
+
+	// MemberId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-detective-memberinvitation.html#cfn-detective-memberinvitation-memberid
+	MemberId *types.Value `json:"MemberId,omitempty"`
+
+	// Message AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-detective-memberinvitation.html#cfn-detective-memberinvitation-message
+	Message *types.Value `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 *MemberInvitation) AWSCloudFormationType() string {
+	return "AWS::Detective::MemberInvitation"
+}
+
+// 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 MemberInvitation) MarshalJSON() ([]byte, error) {
+	type Properties MemberInvitation
+	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 *MemberInvitation) UnmarshalJSON(b []byte) error {
+	type Properties MemberInvitation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = MemberInvitation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel.go b/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel.go
new file mode 100644
index 0000000000..e17e5b053c
--- /dev/null
+++ b/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel.go
@@ -0,0 +1,106 @@
+package devopsguru
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NotificationChannel AWS CloudFormation Resource (AWS::DevOpsGuru::NotificationChannel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-devopsguru-notificationchannel.html
+type NotificationChannel struct {
+
+	// Config AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-devopsguru-notificationchannel.html#cfn-devopsguru-notificationchannel-config
+	Config *NotificationChannel_NotificationChannelConfig `json:"Config,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NotificationChannel) AWSCloudFormationType() string {
+	return "AWS::DevOpsGuru::NotificationChannel"
+}
+
+// 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 NotificationChannel) MarshalJSON() ([]byte, error) {
+	type Properties NotificationChannel
+	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 *NotificationChannel) UnmarshalJSON(b []byte) error {
+	type Properties NotificationChannel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = NotificationChannel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel_notificationchannelconfig.go b/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel_notificationchannelconfig.go
new file mode 100644
index 0000000000..9cad99b758
--- /dev/null
+++ b/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel_notificationchannelconfig.go
@@ -0,0 +1,35 @@
+package devopsguru
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// NotificationChannel_NotificationChannelConfig AWS CloudFormation Resource (AWS::DevOpsGuru::NotificationChannel.NotificationChannelConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-devopsguru-notificationchannel-notificationchannelconfig.html
+type NotificationChannel_NotificationChannelConfig struct {
+
+	// Sns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-devopsguru-notificationchannel-notificationchannelconfig.html#cfn-devopsguru-notificationchannel-notificationchannelconfig-sns
+	Sns *NotificationChannel_SnsChannelConfig `json:"Sns,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NotificationChannel_NotificationChannelConfig) AWSCloudFormationType() string {
+	return "AWS::DevOpsGuru::NotificationChannel.NotificationChannelConfig"
+}
diff --git a/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel_snschannelconfig.go b/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel_snschannelconfig.go
new file mode 100644
index 0000000000..2a09faf80c
--- /dev/null
+++ b/goformation/cloudformation/devopsguru/aws-devopsguru-notificationchannel_snschannelconfig.go
@@ -0,0 +1,37 @@
+package devopsguru
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NotificationChannel_SnsChannelConfig AWS CloudFormation Resource (AWS::DevOpsGuru::NotificationChannel.SnsChannelConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-devopsguru-notificationchannel-snschannelconfig.html
+type NotificationChannel_SnsChannelConfig struct {
+
+	// TopicArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-devopsguru-notificationchannel-snschannelconfig.html#cfn-devopsguru-notificationchannel-snschannelconfig-topicarn
+	TopicArn *types.Value `json:"TopicArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NotificationChannel_SnsChannelConfig) AWSCloudFormationType() string {
+	return "AWS::DevOpsGuru::NotificationChannel.SnsChannelConfig"
+}
diff --git a/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection.go b/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection.go
new file mode 100644
index 0000000000..2d46be3cda
--- /dev/null
+++ b/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection.go
@@ -0,0 +1,106 @@
+package devopsguru
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceCollection AWS CloudFormation Resource (AWS::DevOpsGuru::ResourceCollection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-devopsguru-resourcecollection.html
+type ResourceCollection struct {
+
+	// ResourceCollectionFilter AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-devopsguru-resourcecollection.html#cfn-devopsguru-resourcecollection-resourcecollectionfilter
+	ResourceCollectionFilter *ResourceCollection_ResourceCollectionFilter `json:"ResourceCollectionFilter,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceCollection) AWSCloudFormationType() string {
+	return "AWS::DevOpsGuru::ResourceCollection"
+}
+
+// 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 ResourceCollection) MarshalJSON() ([]byte, error) {
+	type Properties ResourceCollection
+	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 *ResourceCollection) UnmarshalJSON(b []byte) error {
+	type Properties ResourceCollection
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResourceCollection(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection_cloudformationcollectionfilter.go b/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection_cloudformationcollectionfilter.go
new file mode 100644
index 0000000000..a5835628e4
--- /dev/null
+++ b/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection_cloudformationcollectionfilter.go
@@ -0,0 +1,37 @@
+package devopsguru
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceCollection_CloudFormationCollectionFilter AWS CloudFormation Resource (AWS::DevOpsGuru::ResourceCollection.CloudFormationCollectionFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-devopsguru-resourcecollection-cloudformationcollectionfilter.html
+type ResourceCollection_CloudFormationCollectionFilter struct {
+
+	// StackNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-devopsguru-resourcecollection-cloudformationcollectionfilter.html#cfn-devopsguru-resourcecollection-cloudformationcollectionfilter-stacknames
+	StackNames *types.Value `json:"StackNames,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceCollection_CloudFormationCollectionFilter) AWSCloudFormationType() string {
+	return "AWS::DevOpsGuru::ResourceCollection.CloudFormationCollectionFilter"
+}
diff --git a/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection_resourcecollectionfilter.go b/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection_resourcecollectionfilter.go
new file mode 100644
index 0000000000..4d8bbe5fa0
--- /dev/null
+++ b/goformation/cloudformation/devopsguru/aws-devopsguru-resourcecollection_resourcecollectionfilter.go
@@ -0,0 +1,35 @@
+package devopsguru
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceCollection_ResourceCollectionFilter AWS CloudFormation Resource (AWS::DevOpsGuru::ResourceCollection.ResourceCollectionFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-devopsguru-resourcecollection-resourcecollectionfilter.html
+type ResourceCollection_ResourceCollectionFilter struct {
+
+	// CloudFormation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-devopsguru-resourcecollection-resourcecollectionfilter.html#cfn-devopsguru-resourcecollection-resourcecollectionfilter-cloudformation
+	CloudFormation *ResourceCollection_CloudFormationCollectionFilter `json:"CloudFormation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceCollection_ResourceCollectionFilter) AWSCloudFormationType() string {
+	return "AWS::DevOpsGuru::ResourceCollection.ResourceCollectionFilter"
+}
diff --git a/goformation/cloudformation/directoryservice/aws-directoryservice-microsoftad.go b/goformation/cloudformation/directoryservice/aws-directoryservice-microsoftad.go
new file mode 100644
index 0000000000..fdd5e7d332
--- /dev/null
+++ b/goformation/cloudformation/directoryservice/aws-directoryservice-microsoftad.go
@@ -0,0 +1,138 @@
+package directoryservice
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MicrosoftAD AWS CloudFormation Resource (AWS::DirectoryService::MicrosoftAD)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-microsoftad.html
+type MicrosoftAD struct {
+
+	// CreateAlias AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-microsoftad.html#cfn-directoryservice-microsoftad-createalias
+	CreateAlias *types.Value `json:"CreateAlias,omitempty"`
+
+	// Edition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-microsoftad.html#cfn-directoryservice-microsoftad-edition
+	Edition *types.Value `json:"Edition,omitempty"`
+
+	// EnableSso AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-microsoftad.html#cfn-directoryservice-microsoftad-enablesso
+	EnableSso *types.Value `json:"EnableSso,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-microsoftad.html#cfn-directoryservice-microsoftad-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Password AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-microsoftad.html#cfn-directoryservice-microsoftad-password
+	Password *types.Value `json:"Password,omitempty"`
+
+	// ShortName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-microsoftad.html#cfn-directoryservice-microsoftad-shortname
+	ShortName *types.Value `json:"ShortName,omitempty"`
+
+	// VpcSettings AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-microsoftad.html#cfn-directoryservice-microsoftad-vpcsettings
+	VpcSettings *MicrosoftAD_VpcSettings `json:"VpcSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MicrosoftAD) AWSCloudFormationType() string {
+	return "AWS::DirectoryService::MicrosoftAD"
+}
+
+// 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 MicrosoftAD) MarshalJSON() ([]byte, error) {
+	type Properties MicrosoftAD
+	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 *MicrosoftAD) UnmarshalJSON(b []byte) error {
+	type Properties MicrosoftAD
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = MicrosoftAD(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/directoryservice/aws-directoryservice-microsoftad_vpcsettings.go b/goformation/cloudformation/directoryservice/aws-directoryservice-microsoftad_vpcsettings.go
new file mode 100644
index 0000000000..c31a454465
--- /dev/null
+++ b/goformation/cloudformation/directoryservice/aws-directoryservice-microsoftad_vpcsettings.go
@@ -0,0 +1,42 @@
+package directoryservice
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MicrosoftAD_VpcSettings AWS CloudFormation Resource (AWS::DirectoryService::MicrosoftAD.VpcSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-directoryservice-microsoftad-vpcsettings.html
+type MicrosoftAD_VpcSettings struct {
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-directoryservice-microsoftad-vpcsettings.html#cfn-directoryservice-microsoftad-vpcsettings-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-directoryservice-microsoftad-vpcsettings.html#cfn-directoryservice-microsoftad-vpcsettings-vpcid
+	VpcId *types.Value `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 *MicrosoftAD_VpcSettings) AWSCloudFormationType() string {
+	return "AWS::DirectoryService::MicrosoftAD.VpcSettings"
+}
diff --git a/goformation/cloudformation/directoryservice/aws-directoryservice-simplead.go b/goformation/cloudformation/directoryservice/aws-directoryservice-simplead.go
new file mode 100644
index 0000000000..163c6aa9f0
--- /dev/null
+++ b/goformation/cloudformation/directoryservice/aws-directoryservice-simplead.go
@@ -0,0 +1,143 @@
+package directoryservice
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SimpleAD AWS CloudFormation Resource (AWS::DirectoryService::SimpleAD)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-simplead.html
+type SimpleAD struct {
+
+	// CreateAlias AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-simplead.html#cfn-directoryservice-simplead-createalias
+	CreateAlias *types.Value `json:"CreateAlias,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-simplead.html#cfn-directoryservice-simplead-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EnableSso AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-simplead.html#cfn-directoryservice-simplead-enablesso
+	EnableSso *types.Value `json:"EnableSso,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-simplead.html#cfn-directoryservice-simplead-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Password AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-simplead.html#cfn-directoryservice-simplead-password
+	Password *types.Value `json:"Password,omitempty"`
+
+	// ShortName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-simplead.html#cfn-directoryservice-simplead-shortname
+	ShortName *types.Value `json:"ShortName,omitempty"`
+
+	// Size AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-simplead.html#cfn-directoryservice-simplead-size
+	Size *types.Value `json:"Size,omitempty"`
+
+	// VpcSettings AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-directoryservice-simplead.html#cfn-directoryservice-simplead-vpcsettings
+	VpcSettings *SimpleAD_VpcSettings `json:"VpcSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SimpleAD) AWSCloudFormationType() string {
+	return "AWS::DirectoryService::SimpleAD"
+}
+
+// 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 SimpleAD) MarshalJSON() ([]byte, error) {
+	type Properties SimpleAD
+	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 *SimpleAD) UnmarshalJSON(b []byte) error {
+	type Properties SimpleAD
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SimpleAD(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/directoryservice/aws-directoryservice-simplead_vpcsettings.go b/goformation/cloudformation/directoryservice/aws-directoryservice-simplead_vpcsettings.go
new file mode 100644
index 0000000000..115d5eb11c
--- /dev/null
+++ b/goformation/cloudformation/directoryservice/aws-directoryservice-simplead_vpcsettings.go
@@ -0,0 +1,42 @@
+package directoryservice
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SimpleAD_VpcSettings AWS CloudFormation Resource (AWS::DirectoryService::SimpleAD.VpcSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-directoryservice-simplead-vpcsettings.html
+type SimpleAD_VpcSettings struct {
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-directoryservice-simplead-vpcsettings.html#cfn-directoryservice-simplead-vpcsettings-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-directoryservice-simplead-vpcsettings.html#cfn-directoryservice-simplead-vpcsettings-vpcid
+	VpcId *types.Value `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 *SimpleAD_VpcSettings) AWSCloudFormationType() string {
+	return "AWS::DirectoryService::SimpleAD.VpcSettings"
+}
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy.go b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy.go
new file mode 100644
index 0000000000..59dd06ec2f
--- /dev/null
+++ b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy.go
@@ -0,0 +1,129 @@
+package dlm
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// LifecyclePolicy AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dlm-lifecyclepolicy.html
+type LifecyclePolicy struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dlm-lifecyclepolicy.html#cfn-dlm-lifecyclepolicy-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// ExecutionRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dlm-lifecyclepolicy.html#cfn-dlm-lifecyclepolicy-executionrolearn
+	ExecutionRoleArn *types.Value `json:"ExecutionRoleArn,omitempty"`
+
+	// PolicyDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dlm-lifecyclepolicy.html#cfn-dlm-lifecyclepolicy-policydetails
+	PolicyDetails *LifecyclePolicy_PolicyDetails `json:"PolicyDetails,omitempty"`
+
+	// State AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dlm-lifecyclepolicy.html#cfn-dlm-lifecyclepolicy-state
+	State *types.Value `json:"State,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dlm-lifecyclepolicy.html#cfn-dlm-lifecyclepolicy-tags
+	Tags []cloudformation.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 *LifecyclePolicy) AWSCloudFormationType() string {
+	return "AWS::DLM::LifecyclePolicy"
+}
+
+// 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 LifecyclePolicy) MarshalJSON() ([]byte, error) {
+	type Properties LifecyclePolicy
+	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 *LifecyclePolicy) UnmarshalJSON(b []byte) error {
+	type Properties LifecyclePolicy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LifecyclePolicy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_action.go b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_action.go
new file mode 100644
index 0000000000..7c2b9c0a5c
--- /dev/null
+++ b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_action.go
@@ -0,0 +1,42 @@
+package dlm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LifecyclePolicy_Action AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.Action)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-action.html
+type LifecyclePolicy_Action struct {
+
+	// CrossRegionCopy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-action.html#cfn-dlm-lifecyclepolicy-action-crossregioncopy
+	CrossRegionCopy []LifecyclePolicy_CrossRegionCopyAction `json:"CrossRegionCopy,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-action.html#cfn-dlm-lifecyclepolicy-action-name
+	Name *types.Value `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 *LifecyclePolicy_Action) AWSCloudFormationType() string {
+	return "AWS::DLM::LifecyclePolicy.Action"
+}
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_createrule.go b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_createrule.go
new file mode 100644
index 0000000000..2df8b8f2f1
--- /dev/null
+++ b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_createrule.go
@@ -0,0 +1,57 @@
+package dlm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LifecyclePolicy_CreateRule AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.CreateRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-createrule.html
+type LifecyclePolicy_CreateRule struct {
+
+	// CronExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-createrule.html#cfn-dlm-lifecyclepolicy-createrule-cronexpression
+	CronExpression *types.Value `json:"CronExpression,omitempty"`
+
+	// Interval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-createrule.html#cfn-dlm-lifecyclepolicy-createrule-interval
+	Interval *types.Value `json:"Interval,omitempty"`
+
+	// IntervalUnit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-createrule.html#cfn-dlm-lifecyclepolicy-createrule-intervalunit
+	IntervalUnit *types.Value `json:"IntervalUnit,omitempty"`
+
+	// Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-createrule.html#cfn-dlm-lifecyclepolicy-createrule-location
+	Location *types.Value `json:"Location,omitempty"`
+
+	// Times AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-createrule.html#cfn-dlm-lifecyclepolicy-createrule-times
+	Times *types.Value `json:"Times,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LifecyclePolicy_CreateRule) AWSCloudFormationType() string {
+	return "AWS::DLM::LifecyclePolicy.CreateRule"
+}
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyaction.go b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyaction.go
new file mode 100644
index 0000000000..e209af6c8d
--- /dev/null
+++ b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyaction.go
@@ -0,0 +1,47 @@
+package dlm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LifecyclePolicy_CrossRegionCopyAction AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.CrossRegionCopyAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-crossregioncopyaction.html
+type LifecyclePolicy_CrossRegionCopyAction struct {
+
+	// EncryptionConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-crossregioncopyaction.html#cfn-dlm-lifecyclepolicy-crossregioncopyaction-encryptionconfiguration
+	EncryptionConfiguration *LifecyclePolicy_EncryptionConfiguration `json:"EncryptionConfiguration,omitempty"`
+
+	// RetainRule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-crossregioncopyaction.html#cfn-dlm-lifecyclepolicy-crossregioncopyaction-retainrule
+	RetainRule *LifecyclePolicy_CrossRegionCopyRetainRule `json:"RetainRule,omitempty"`
+
+	// Target AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-crossregioncopyaction.html#cfn-dlm-lifecyclepolicy-crossregioncopyaction-target
+	Target *types.Value `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 *LifecyclePolicy_CrossRegionCopyAction) AWSCloudFormationType() string {
+	return "AWS::DLM::LifecyclePolicy.CrossRegionCopyAction"
+}
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopydeprecaterule.go b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopydeprecaterule.go
new file mode 100644
index 0000000000..e160d2cd61
--- /dev/null
+++ b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopydeprecaterule.go
@@ -0,0 +1,42 @@
+package dlm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LifecyclePolicy_CrossRegionCopyDeprecateRule AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.CrossRegionCopyDeprecateRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-crossregioncopydeprecaterule.html
+type LifecyclePolicy_CrossRegionCopyDeprecateRule struct {
+
+	// Interval AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-crossregioncopydeprecaterule.html#cfn-dlm-lifecyclepolicy-crossregioncopydeprecaterule-interval
+	Interval *types.Value `json:"Interval"`
+
+	// IntervalUnit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-crossregioncopydeprecaterule.html#cfn-dlm-lifecyclepolicy-crossregioncopydeprecaterule-intervalunit
+	IntervalUnit *types.Value `json:"IntervalUnit,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LifecyclePolicy_CrossRegionCopyDeprecateRule) AWSCloudFormationType() string {
+	return "AWS::DLM::LifecyclePolicy.CrossRegionCopyDeprecateRule"
+}
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyretainrule.go b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyretainrule.go
new file mode 100644
index 0000000000..22f004e1a9
--- /dev/null
+++ b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyretainrule.go
@@ -0,0 +1,42 @@
+package dlm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LifecyclePolicy_CrossRegionCopyRetainRule AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.CrossRegionCopyRetainRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-crossregioncopyretainrule.html
+type LifecyclePolicy_CrossRegionCopyRetainRule struct {
+
+	// Interval AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-crossregioncopyretainrule.html#cfn-dlm-lifecyclepolicy-crossregioncopyretainrule-interval
+	Interval *types.Value `json:"Interval"`
+
+	// IntervalUnit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-crossregioncopyretainrule.html#cfn-dlm-lifecyclepolicy-crossregioncopyretainrule-intervalunit
+	IntervalUnit *types.Value `json:"IntervalUnit,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LifecyclePolicy_CrossRegionCopyRetainRule) AWSCloudFormationType() string {
+	return "AWS::DLM::LifecyclePolicy.CrossRegionCopyRetainRule"
+}
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyrule.go b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyrule.go
new file mode 100644
index 0000000000..d6a36d200d
--- /dev/null
+++ b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_crossregioncopyrule.go
@@ -0,0 +1,67 @@
+package dlm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LifecyclePolicy_CrossRegionCopyRule AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.CrossRegionCopyRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-crossregioncopyrule.html
+type LifecyclePolicy_CrossRegionCopyRule struct {
+
+	// CmkArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-crossregioncopyrule.html#cfn-dlm-lifecyclepolicy-crossregioncopyrule-cmkarn
+	CmkArn *types.Value `json:"CmkArn,omitempty"`
+
+	// CopyTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-crossregioncopyrule.html#cfn-dlm-lifecyclepolicy-crossregioncopyrule-copytags
+	CopyTags *types.Value `json:"CopyTags,omitempty"`
+
+	// DeprecateRule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-crossregioncopyrule.html#cfn-dlm-lifecyclepolicy-crossregioncopyrule-deprecaterule
+	DeprecateRule *LifecyclePolicy_CrossRegionCopyDeprecateRule `json:"DeprecateRule,omitempty"`
+
+	// Encrypted AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-crossregioncopyrule.html#cfn-dlm-lifecyclepolicy-crossregioncopyrule-encrypted
+	Encrypted *types.Value `json:"Encrypted"`
+
+	// RetainRule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-crossregioncopyrule.html#cfn-dlm-lifecyclepolicy-crossregioncopyrule-retainrule
+	RetainRule *LifecyclePolicy_CrossRegionCopyRetainRule `json:"RetainRule,omitempty"`
+
+	// Target AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-crossregioncopyrule.html#cfn-dlm-lifecyclepolicy-crossregioncopyrule-target
+	Target *types.Value `json:"Target,omitempty"`
+
+	// TargetRegion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-crossregioncopyrule.html#cfn-dlm-lifecyclepolicy-crossregioncopyrule-targetregion
+	TargetRegion *types.Value `json:"TargetRegion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LifecyclePolicy_CrossRegionCopyRule) AWSCloudFormationType() string {
+	return "AWS::DLM::LifecyclePolicy.CrossRegionCopyRule"
+}
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_deprecaterule.go b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_deprecaterule.go
new file mode 100644
index 0000000000..1872ad435c
--- /dev/null
+++ b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_deprecaterule.go
@@ -0,0 +1,47 @@
+package dlm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LifecyclePolicy_DeprecateRule AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.DeprecateRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-deprecaterule.html
+type LifecyclePolicy_DeprecateRule struct {
+
+	// Count AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-deprecaterule.html#cfn-dlm-lifecyclepolicy-deprecaterule-count
+	Count *types.Value `json:"Count,omitempty"`
+
+	// Interval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-deprecaterule.html#cfn-dlm-lifecyclepolicy-deprecaterule-interval
+	Interval *types.Value `json:"Interval,omitempty"`
+
+	// IntervalUnit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-deprecaterule.html#cfn-dlm-lifecyclepolicy-deprecaterule-intervalunit
+	IntervalUnit *types.Value `json:"IntervalUnit,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LifecyclePolicy_DeprecateRule) AWSCloudFormationType() string {
+	return "AWS::DLM::LifecyclePolicy.DeprecateRule"
+}
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_encryptionconfiguration.go b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_encryptionconfiguration.go
new file mode 100644
index 0000000000..63d6685f05
--- /dev/null
+++ b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_encryptionconfiguration.go
@@ -0,0 +1,42 @@
+package dlm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LifecyclePolicy_EncryptionConfiguration AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.EncryptionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-encryptionconfiguration.html
+type LifecyclePolicy_EncryptionConfiguration struct {
+
+	// CmkArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-encryptionconfiguration.html#cfn-dlm-lifecyclepolicy-encryptionconfiguration-cmkarn
+	CmkArn *types.Value `json:"CmkArn,omitempty"`
+
+	// Encrypted AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-encryptionconfiguration.html#cfn-dlm-lifecyclepolicy-encryptionconfiguration-encrypted
+	Encrypted *types.Value `json:"Encrypted"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LifecyclePolicy_EncryptionConfiguration) AWSCloudFormationType() string {
+	return "AWS::DLM::LifecyclePolicy.EncryptionConfiguration"
+}
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventparameters.go b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventparameters.go
new file mode 100644
index 0000000000..f56d45dcfe
--- /dev/null
+++ b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventparameters.go
@@ -0,0 +1,47 @@
+package dlm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LifecyclePolicy_EventParameters AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.EventParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-eventparameters.html
+type LifecyclePolicy_EventParameters struct {
+
+	// DescriptionRegex AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-eventparameters.html#cfn-dlm-lifecyclepolicy-eventparameters-descriptionregex
+	DescriptionRegex *types.Value `json:"DescriptionRegex,omitempty"`
+
+	// EventType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-eventparameters.html#cfn-dlm-lifecyclepolicy-eventparameters-eventtype
+	EventType *types.Value `json:"EventType,omitempty"`
+
+	// SnapshotOwner AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-eventparameters.html#cfn-dlm-lifecyclepolicy-eventparameters-snapshotowner
+	SnapshotOwner *types.Value `json:"SnapshotOwner,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LifecyclePolicy_EventParameters) AWSCloudFormationType() string {
+	return "AWS::DLM::LifecyclePolicy.EventParameters"
+}
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventsource.go b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventsource.go
new file mode 100644
index 0000000000..28ccb5e555
--- /dev/null
+++ b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_eventsource.go
@@ -0,0 +1,42 @@
+package dlm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LifecyclePolicy_EventSource AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.EventSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-eventsource.html
+type LifecyclePolicy_EventSource struct {
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-eventsource.html#cfn-dlm-lifecyclepolicy-eventsource-parameters
+	Parameters *LifecyclePolicy_EventParameters `json:"Parameters,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-eventsource.html#cfn-dlm-lifecyclepolicy-eventsource-type
+	Type *types.Value `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 *LifecyclePolicy_EventSource) AWSCloudFormationType() string {
+	return "AWS::DLM::LifecyclePolicy.EventSource"
+}
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_fastrestorerule.go b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_fastrestorerule.go
new file mode 100644
index 0000000000..a4f6ed735c
--- /dev/null
+++ b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_fastrestorerule.go
@@ -0,0 +1,52 @@
+package dlm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LifecyclePolicy_FastRestoreRule AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.FastRestoreRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-fastrestorerule.html
+type LifecyclePolicy_FastRestoreRule struct {
+
+	// AvailabilityZones AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-fastrestorerule.html#cfn-dlm-lifecyclepolicy-fastrestorerule-availabilityzones
+	AvailabilityZones *types.Value `json:"AvailabilityZones,omitempty"`
+
+	// Count AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-fastrestorerule.html#cfn-dlm-lifecyclepolicy-fastrestorerule-count
+	Count *types.Value `json:"Count,omitempty"`
+
+	// Interval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-fastrestorerule.html#cfn-dlm-lifecyclepolicy-fastrestorerule-interval
+	Interval *types.Value `json:"Interval,omitempty"`
+
+	// IntervalUnit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-fastrestorerule.html#cfn-dlm-lifecyclepolicy-fastrestorerule-intervalunit
+	IntervalUnit *types.Value `json:"IntervalUnit,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LifecyclePolicy_FastRestoreRule) AWSCloudFormationType() string {
+	return "AWS::DLM::LifecyclePolicy.FastRestoreRule"
+}
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_parameters.go b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_parameters.go
new file mode 100644
index 0000000000..1988edb363
--- /dev/null
+++ b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_parameters.go
@@ -0,0 +1,42 @@
+package dlm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LifecyclePolicy_Parameters AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.Parameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-parameters.html
+type LifecyclePolicy_Parameters struct {
+
+	// ExcludeBootVolume AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-parameters.html#cfn-dlm-lifecyclepolicy-parameters-excludebootvolume
+	ExcludeBootVolume *types.Value `json:"ExcludeBootVolume,omitempty"`
+
+	// NoReboot AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-parameters.html#cfn-dlm-lifecyclepolicy-parameters-noreboot
+	NoReboot *types.Value `json:"NoReboot,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LifecyclePolicy_Parameters) AWSCloudFormationType() string {
+	return "AWS::DLM::LifecyclePolicy.Parameters"
+}
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_policydetails.go b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_policydetails.go
new file mode 100644
index 0000000000..2a2b0145d4
--- /dev/null
+++ b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_policydetails.go
@@ -0,0 +1,73 @@
+package dlm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// LifecyclePolicy_PolicyDetails AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.PolicyDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-policydetails.html
+type LifecyclePolicy_PolicyDetails struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-policydetails.html#cfn-dlm-lifecyclepolicy-policydetails-actions
+	Actions []LifecyclePolicy_Action `json:"Actions,omitempty"`
+
+	// EventSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-policydetails.html#cfn-dlm-lifecyclepolicy-policydetails-eventsource
+	EventSource *LifecyclePolicy_EventSource `json:"EventSource,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-policydetails.html#cfn-dlm-lifecyclepolicy-policydetails-parameters
+	Parameters *LifecyclePolicy_Parameters `json:"Parameters,omitempty"`
+
+	// PolicyType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-policydetails.html#cfn-dlm-lifecyclepolicy-policydetails-policytype
+	PolicyType *types.Value `json:"PolicyType,omitempty"`
+
+	// ResourceLocations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-policydetails.html#cfn-dlm-lifecyclepolicy-policydetails-resourcelocations
+	ResourceLocations *types.Value `json:"ResourceLocations,omitempty"`
+
+	// ResourceTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-policydetails.html#cfn-dlm-lifecyclepolicy-policydetails-resourcetypes
+	ResourceTypes *types.Value `json:"ResourceTypes,omitempty"`
+
+	// Schedules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-policydetails.html#cfn-dlm-lifecyclepolicy-policydetails-schedules
+	Schedules []LifecyclePolicy_Schedule `json:"Schedules,omitempty"`
+
+	// TargetTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-policydetails.html#cfn-dlm-lifecyclepolicy-policydetails-targettags
+	TargetTags []cloudformation.Tag `json:"TargetTags,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LifecyclePolicy_PolicyDetails) AWSCloudFormationType() string {
+	return "AWS::DLM::LifecyclePolicy.PolicyDetails"
+}
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_retainrule.go b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_retainrule.go
new file mode 100644
index 0000000000..ecb1b3f037
--- /dev/null
+++ b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_retainrule.go
@@ -0,0 +1,47 @@
+package dlm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LifecyclePolicy_RetainRule AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.RetainRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-retainrule.html
+type LifecyclePolicy_RetainRule struct {
+
+	// Count AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-retainrule.html#cfn-dlm-lifecyclepolicy-retainrule-count
+	Count *types.Value `json:"Count,omitempty"`
+
+	// Interval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-retainrule.html#cfn-dlm-lifecyclepolicy-retainrule-interval
+	Interval *types.Value `json:"Interval,omitempty"`
+
+	// IntervalUnit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-retainrule.html#cfn-dlm-lifecyclepolicy-retainrule-intervalunit
+	IntervalUnit *types.Value `json:"IntervalUnit,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LifecyclePolicy_RetainRule) AWSCloudFormationType() string {
+	return "AWS::DLM::LifecyclePolicy.RetainRule"
+}
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_schedule.go b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_schedule.go
new file mode 100644
index 0000000000..1ab5a20168
--- /dev/null
+++ b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_schedule.go
@@ -0,0 +1,83 @@
+package dlm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// LifecyclePolicy_Schedule AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.Schedule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-schedule.html
+type LifecyclePolicy_Schedule struct {
+
+	// CopyTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-schedule.html#cfn-dlm-lifecyclepolicy-schedule-copytags
+	CopyTags *types.Value `json:"CopyTags,omitempty"`
+
+	// CreateRule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-schedule.html#cfn-dlm-lifecyclepolicy-schedule-createrule
+	CreateRule *LifecyclePolicy_CreateRule `json:"CreateRule,omitempty"`
+
+	// CrossRegionCopyRules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-schedule.html#cfn-dlm-lifecyclepolicy-schedule-crossregioncopyrules
+	CrossRegionCopyRules []LifecyclePolicy_CrossRegionCopyRule `json:"CrossRegionCopyRules,omitempty"`
+
+	// DeprecateRule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-schedule.html#cfn-dlm-lifecyclepolicy-schedule-deprecaterule
+	DeprecateRule *LifecyclePolicy_DeprecateRule `json:"DeprecateRule,omitempty"`
+
+	// FastRestoreRule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-schedule.html#cfn-dlm-lifecyclepolicy-schedule-fastrestorerule
+	FastRestoreRule *LifecyclePolicy_FastRestoreRule `json:"FastRestoreRule,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-schedule.html#cfn-dlm-lifecyclepolicy-schedule-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RetainRule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-schedule.html#cfn-dlm-lifecyclepolicy-schedule-retainrule
+	RetainRule *LifecyclePolicy_RetainRule `json:"RetainRule,omitempty"`
+
+	// ShareRules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-schedule.html#cfn-dlm-lifecyclepolicy-schedule-sharerules
+	ShareRules []LifecyclePolicy_ShareRule `json:"ShareRules,omitempty"`
+
+	// TagsToAdd AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-schedule.html#cfn-dlm-lifecyclepolicy-schedule-tagstoadd
+	TagsToAdd []cloudformation.Tag `json:"TagsToAdd,omitempty"`
+
+	// VariableTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-schedule.html#cfn-dlm-lifecyclepolicy-schedule-variabletags
+	VariableTags []cloudformation.Tag `json:"VariableTags,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LifecyclePolicy_Schedule) AWSCloudFormationType() string {
+	return "AWS::DLM::LifecyclePolicy.Schedule"
+}
diff --git a/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_sharerule.go b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_sharerule.go
new file mode 100644
index 0000000000..1779e9765e
--- /dev/null
+++ b/goformation/cloudformation/dlm/aws-dlm-lifecyclepolicy_sharerule.go
@@ -0,0 +1,47 @@
+package dlm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LifecyclePolicy_ShareRule AWS CloudFormation Resource (AWS::DLM::LifecyclePolicy.ShareRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-sharerule.html
+type LifecyclePolicy_ShareRule struct {
+
+	// TargetAccounts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-sharerule.html#cfn-dlm-lifecyclepolicy-sharerule-targetaccounts
+	TargetAccounts *types.Value `json:"TargetAccounts,omitempty"`
+
+	// UnshareInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-sharerule.html#cfn-dlm-lifecyclepolicy-sharerule-unshareinterval
+	UnshareInterval *types.Value `json:"UnshareInterval,omitempty"`
+
+	// UnshareIntervalUnit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-sharerule.html#cfn-dlm-lifecyclepolicy-sharerule-unshareintervalunit
+	UnshareIntervalUnit *types.Value `json:"UnshareIntervalUnit,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LifecyclePolicy_ShareRule) AWSCloudFormationType() string {
+	return "AWS::DLM::LifecyclePolicy.ShareRule"
+}
diff --git a/goformation/cloudformation/dms/aws-dms-certificate.go b/goformation/cloudformation/dms/aws-dms-certificate.go
new file mode 100644
index 0000000000..3fe147d8b3
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-certificate.go
@@ -0,0 +1,118 @@
+package dms
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Certificate AWS CloudFormation Resource (AWS::DMS::Certificate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html
+type Certificate struct {
+
+	// CertificateIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificateidentifier
+	CertificateIdentifier *types.Value `json:"CertificateIdentifier,omitempty"`
+
+	// CertificatePem AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificatepem
+	CertificatePem *types.Value `json:"CertificatePem,omitempty"`
+
+	// CertificateWallet AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-certificate.html#cfn-dms-certificate-certificatewallet
+	CertificateWallet *types.Value `json:"CertificateWallet,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Certificate) AWSCloudFormationType() string {
+	return "AWS::DMS::Certificate"
+}
+
+// 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 Certificate) MarshalJSON() ([]byte, error) {
+	type Properties Certificate
+	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 *Certificate) UnmarshalJSON(b []byte) error {
+	type Properties Certificate
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Certificate(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/dms/aws-dms-endpoint.go b/goformation/cloudformation/dms/aws-dms-endpoint.go
new file mode 100644
index 0000000000..d1af5e7aad
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-endpoint.go
@@ -0,0 +1,254 @@
+package dms
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint AWS CloudFormation Resource (AWS::DMS::Endpoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html
+type Endpoint struct {
+
+	// CertificateArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-certificatearn
+	CertificateArn *types.Value `json:"CertificateArn,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// DocDbSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-docdbsettings
+	DocDbSettings *Endpoint_DocDbSettings `json:"DocDbSettings,omitempty"`
+
+	// DynamoDbSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-dynamodbsettings
+	DynamoDbSettings *Endpoint_DynamoDbSettings `json:"DynamoDbSettings,omitempty"`
+
+	// ElasticsearchSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-elasticsearchsettings
+	ElasticsearchSettings *Endpoint_ElasticsearchSettings `json:"ElasticsearchSettings,omitempty"`
+
+	// EndpointIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-endpointidentifier
+	EndpointIdentifier *types.Value `json:"EndpointIdentifier,omitempty"`
+
+	// EndpointType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-endpointtype
+	EndpointType *types.Value `json:"EndpointType,omitempty"`
+
+	// EngineName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-enginename
+	EngineName *types.Value `json:"EngineName,omitempty"`
+
+	// ExtraConnectionAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-extraconnectionattributes
+	ExtraConnectionAttributes *types.Value `json:"ExtraConnectionAttributes,omitempty"`
+
+	// IbmDb2Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-ibmdb2settings
+	IbmDb2Settings *Endpoint_IbmDb2Settings `json:"IbmDb2Settings,omitempty"`
+
+	// KafkaSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-kafkasettings
+	KafkaSettings *Endpoint_KafkaSettings `json:"KafkaSettings,omitempty"`
+
+	// KinesisSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-kinesissettings
+	KinesisSettings *Endpoint_KinesisSettings `json:"KinesisSettings,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// MicrosoftSqlServerSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-microsoftsqlserversettings
+	MicrosoftSqlServerSettings *Endpoint_MicrosoftSqlServerSettings `json:"MicrosoftSqlServerSettings,omitempty"`
+
+	// MongoDbSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-mongodbsettings
+	MongoDbSettings *Endpoint_MongoDbSettings `json:"MongoDbSettings,omitempty"`
+
+	// MySqlSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-mysqlsettings
+	MySqlSettings *Endpoint_MySqlSettings `json:"MySqlSettings,omitempty"`
+
+	// NeptuneSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-neptunesettings
+	NeptuneSettings *Endpoint_NeptuneSettings `json:"NeptuneSettings,omitempty"`
+
+	// OracleSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-oraclesettings
+	OracleSettings *Endpoint_OracleSettings `json:"OracleSettings,omitempty"`
+
+	// Password AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-password
+	Password *types.Value `json:"Password,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// PostgreSqlSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-postgresqlsettings
+	PostgreSqlSettings *Endpoint_PostgreSqlSettings `json:"PostgreSqlSettings,omitempty"`
+
+	// RedisSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-redissettings
+	RedisSettings *Endpoint_RedisSettings `json:"RedisSettings,omitempty"`
+
+	// RedshiftSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-redshiftsettings
+	RedshiftSettings *Endpoint_RedshiftSettings `json:"RedshiftSettings,omitempty"`
+
+	// ResourceIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-resourceidentifier
+	ResourceIdentifier *types.Value `json:"ResourceIdentifier,omitempty"`
+
+	// S3Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-s3settings
+	S3Settings *Endpoint_S3Settings `json:"S3Settings,omitempty"`
+
+	// ServerName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-servername
+	ServerName *types.Value `json:"ServerName,omitempty"`
+
+	// SslMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-sslmode
+	SslMode *types.Value `json:"SslMode,omitempty"`
+
+	// SybaseSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-sybasesettings
+	SybaseSettings *Endpoint_SybaseSettings `json:"SybaseSettings,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-endpoint.html#cfn-dms-endpoint-username
+	Username *types.Value `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 *Endpoint) AWSCloudFormationType() string {
+	return "AWS::DMS::Endpoint"
+}
+
+// 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 Endpoint) MarshalJSON() ([]byte, error) {
+	type Properties Endpoint
+	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 *Endpoint) UnmarshalJSON(b []byte) error {
+	type Properties Endpoint
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Endpoint(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/dms/aws-dms-endpoint_docdbsettings.go b/goformation/cloudformation/dms/aws-dms-endpoint_docdbsettings.go
new file mode 100644
index 0000000000..f2c17cc211
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-endpoint_docdbsettings.go
@@ -0,0 +1,42 @@
+package dms
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_DocDbSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.DocDbSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-docdbsettings.html
+type Endpoint_DocDbSettings struct {
+
+	// SecretsManagerAccessRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-docdbsettings.html#cfn-dms-endpoint-docdbsettings-secretsmanageraccessrolearn
+	SecretsManagerAccessRoleArn *types.Value `json:"SecretsManagerAccessRoleArn,omitempty"`
+
+	// SecretsManagerSecretId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-docdbsettings.html#cfn-dms-endpoint-docdbsettings-secretsmanagersecretid
+	SecretsManagerSecretId *types.Value `json:"SecretsManagerSecretId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_DocDbSettings) AWSCloudFormationType() string {
+	return "AWS::DMS::Endpoint.DocDbSettings"
+}
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_dynamodbsettings.go b/goformation/cloudformation/dms/aws-dms-endpoint_dynamodbsettings.go
new file mode 100644
index 0000000000..0397a5e45d
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-endpoint_dynamodbsettings.go
@@ -0,0 +1,37 @@
+package dms
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_DynamoDbSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.DynamoDbSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-dynamodbsettings.html
+type Endpoint_DynamoDbSettings struct {
+
+	// ServiceAccessRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-dynamodbsettings.html#cfn-dms-endpoint-dynamodbsettings-serviceaccessrolearn
+	ServiceAccessRoleArn *types.Value `json:"ServiceAccessRoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_DynamoDbSettings) AWSCloudFormationType() string {
+	return "AWS::DMS::Endpoint.DynamoDbSettings"
+}
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_elasticsearchsettings.go b/goformation/cloudformation/dms/aws-dms-endpoint_elasticsearchsettings.go
new file mode 100644
index 0000000000..99cf92c866
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-endpoint_elasticsearchsettings.go
@@ -0,0 +1,52 @@
+package dms
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_ElasticsearchSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.ElasticsearchSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-elasticsearchsettings.html
+type Endpoint_ElasticsearchSettings struct {
+
+	// EndpointUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-elasticsearchsettings.html#cfn-dms-endpoint-elasticsearchsettings-endpointuri
+	EndpointUri *types.Value `json:"EndpointUri,omitempty"`
+
+	// ErrorRetryDuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-elasticsearchsettings.html#cfn-dms-endpoint-elasticsearchsettings-errorretryduration
+	ErrorRetryDuration *types.Value `json:"ErrorRetryDuration,omitempty"`
+
+	// FullLoadErrorPercentage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-elasticsearchsettings.html#cfn-dms-endpoint-elasticsearchsettings-fullloaderrorpercentage
+	FullLoadErrorPercentage *types.Value `json:"FullLoadErrorPercentage,omitempty"`
+
+	// ServiceAccessRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-elasticsearchsettings.html#cfn-dms-endpoint-elasticsearchsettings-serviceaccessrolearn
+	ServiceAccessRoleArn *types.Value `json:"ServiceAccessRoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_ElasticsearchSettings) AWSCloudFormationType() string {
+	return "AWS::DMS::Endpoint.ElasticsearchSettings"
+}
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_ibmdb2settings.go b/goformation/cloudformation/dms/aws-dms-endpoint_ibmdb2settings.go
new file mode 100644
index 0000000000..7c316ded80
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-endpoint_ibmdb2settings.go
@@ -0,0 +1,42 @@
+package dms
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_IbmDb2Settings AWS CloudFormation Resource (AWS::DMS::Endpoint.IbmDb2Settings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-ibmdb2settings.html
+type Endpoint_IbmDb2Settings struct {
+
+	// SecretsManagerAccessRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-ibmdb2settings.html#cfn-dms-endpoint-ibmdb2settings-secretsmanageraccessrolearn
+	SecretsManagerAccessRoleArn *types.Value `json:"SecretsManagerAccessRoleArn,omitempty"`
+
+	// SecretsManagerSecretId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-ibmdb2settings.html#cfn-dms-endpoint-ibmdb2settings-secretsmanagersecretid
+	SecretsManagerSecretId *types.Value `json:"SecretsManagerSecretId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_IbmDb2Settings) AWSCloudFormationType() string {
+	return "AWS::DMS::Endpoint.IbmDb2Settings"
+}
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_kafkasettings.go b/goformation/cloudformation/dms/aws-dms-endpoint_kafkasettings.go
new file mode 100644
index 0000000000..13e1d66319
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-endpoint_kafkasettings.go
@@ -0,0 +1,107 @@
+package dms
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_KafkaSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.KafkaSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kafkasettings.html
+type Endpoint_KafkaSettings struct {
+
+	// Broker AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kafkasettings.html#cfn-dms-endpoint-kafkasettings-broker
+	Broker *types.Value `json:"Broker,omitempty"`
+
+	// IncludeControlDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kafkasettings.html#cfn-dms-endpoint-kafkasettings-includecontroldetails
+	IncludeControlDetails *types.Value `json:"IncludeControlDetails,omitempty"`
+
+	// IncludeNullAndEmpty AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kafkasettings.html#cfn-dms-endpoint-kafkasettings-includenullandempty
+	IncludeNullAndEmpty *types.Value `json:"IncludeNullAndEmpty,omitempty"`
+
+	// IncludeTableAlterOperations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kafkasettings.html#cfn-dms-endpoint-kafkasettings-includetablealteroperations
+	IncludeTableAlterOperations *types.Value `json:"IncludeTableAlterOperations,omitempty"`
+
+	// IncludeTransactionDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kafkasettings.html#cfn-dms-endpoint-kafkasettings-includetransactiondetails
+	IncludeTransactionDetails *types.Value `json:"IncludeTransactionDetails,omitempty"`
+
+	// NoHexPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kafkasettings.html#cfn-dms-endpoint-kafkasettings-nohexprefix
+	NoHexPrefix *types.Value `json:"NoHexPrefix,omitempty"`
+
+	// PartitionIncludeSchemaTable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kafkasettings.html#cfn-dms-endpoint-kafkasettings-partitionincludeschematable
+	PartitionIncludeSchemaTable *types.Value `json:"PartitionIncludeSchemaTable,omitempty"`
+
+	// SaslPassword AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kafkasettings.html#cfn-dms-endpoint-kafkasettings-saslpassword
+	SaslPassword *types.Value `json:"SaslPassword,omitempty"`
+
+	// SaslUserName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kafkasettings.html#cfn-dms-endpoint-kafkasettings-saslusername
+	SaslUserName *types.Value `json:"SaslUserName,omitempty"`
+
+	// SecurityProtocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kafkasettings.html#cfn-dms-endpoint-kafkasettings-securityprotocol
+	SecurityProtocol *types.Value `json:"SecurityProtocol,omitempty"`
+
+	// SslCaCertificateArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kafkasettings.html#cfn-dms-endpoint-kafkasettings-sslcacertificatearn
+	SslCaCertificateArn *types.Value `json:"SslCaCertificateArn,omitempty"`
+
+	// SslClientCertificateArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kafkasettings.html#cfn-dms-endpoint-kafkasettings-sslclientcertificatearn
+	SslClientCertificateArn *types.Value `json:"SslClientCertificateArn,omitempty"`
+
+	// SslClientKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kafkasettings.html#cfn-dms-endpoint-kafkasettings-sslclientkeyarn
+	SslClientKeyArn *types.Value `json:"SslClientKeyArn,omitempty"`
+
+	// SslClientKeyPassword AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kafkasettings.html#cfn-dms-endpoint-kafkasettings-sslclientkeypassword
+	SslClientKeyPassword *types.Value `json:"SslClientKeyPassword,omitempty"`
+
+	// Topic AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kafkasettings.html#cfn-dms-endpoint-kafkasettings-topic
+	Topic *types.Value `json:"Topic,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_KafkaSettings) AWSCloudFormationType() string {
+	return "AWS::DMS::Endpoint.KafkaSettings"
+}
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_kinesissettings.go b/goformation/cloudformation/dms/aws-dms-endpoint_kinesissettings.go
new file mode 100644
index 0000000000..b1e423a77f
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-endpoint_kinesissettings.go
@@ -0,0 +1,77 @@
+package dms
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_KinesisSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.KinesisSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kinesissettings.html
+type Endpoint_KinesisSettings struct {
+
+	// IncludeControlDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kinesissettings.html#cfn-dms-endpoint-kinesissettings-includecontroldetails
+	IncludeControlDetails *types.Value `json:"IncludeControlDetails,omitempty"`
+
+	// IncludeNullAndEmpty AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kinesissettings.html#cfn-dms-endpoint-kinesissettings-includenullandempty
+	IncludeNullAndEmpty *types.Value `json:"IncludeNullAndEmpty,omitempty"`
+
+	// IncludeTableAlterOperations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kinesissettings.html#cfn-dms-endpoint-kinesissettings-includetablealteroperations
+	IncludeTableAlterOperations *types.Value `json:"IncludeTableAlterOperations,omitempty"`
+
+	// IncludeTransactionDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kinesissettings.html#cfn-dms-endpoint-kinesissettings-includetransactiondetails
+	IncludeTransactionDetails *types.Value `json:"IncludeTransactionDetails,omitempty"`
+
+	// MessageFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kinesissettings.html#cfn-dms-endpoint-kinesissettings-messageformat
+	MessageFormat *types.Value `json:"MessageFormat,omitempty"`
+
+	// NoHexPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kinesissettings.html#cfn-dms-endpoint-kinesissettings-nohexprefix
+	NoHexPrefix *types.Value `json:"NoHexPrefix,omitempty"`
+
+	// PartitionIncludeSchemaTable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kinesissettings.html#cfn-dms-endpoint-kinesissettings-partitionincludeschematable
+	PartitionIncludeSchemaTable *types.Value `json:"PartitionIncludeSchemaTable,omitempty"`
+
+	// ServiceAccessRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kinesissettings.html#cfn-dms-endpoint-kinesissettings-serviceaccessrolearn
+	ServiceAccessRoleArn *types.Value `json:"ServiceAccessRoleArn,omitempty"`
+
+	// StreamArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-kinesissettings.html#cfn-dms-endpoint-kinesissettings-streamarn
+	StreamArn *types.Value `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 *Endpoint_KinesisSettings) AWSCloudFormationType() string {
+	return "AWS::DMS::Endpoint.KinesisSettings"
+}
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_microsoftsqlserversettings.go b/goformation/cloudformation/dms/aws-dms-endpoint_microsoftsqlserversettings.go
new file mode 100644
index 0000000000..7c54e4d39e
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-endpoint_microsoftsqlserversettings.go
@@ -0,0 +1,42 @@
+package dms
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_MicrosoftSqlServerSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.MicrosoftSqlServerSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-microsoftsqlserversettings.html
+type Endpoint_MicrosoftSqlServerSettings struct {
+
+	// SecretsManagerAccessRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-microsoftsqlserversettings.html#cfn-dms-endpoint-microsoftsqlserversettings-secretsmanageraccessrolearn
+	SecretsManagerAccessRoleArn *types.Value `json:"SecretsManagerAccessRoleArn,omitempty"`
+
+	// SecretsManagerSecretId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-microsoftsqlserversettings.html#cfn-dms-endpoint-microsoftsqlserversettings-secretsmanagersecretid
+	SecretsManagerSecretId *types.Value `json:"SecretsManagerSecretId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_MicrosoftSqlServerSettings) AWSCloudFormationType() string {
+	return "AWS::DMS::Endpoint.MicrosoftSqlServerSettings"
+}
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_mongodbsettings.go b/goformation/cloudformation/dms/aws-dms-endpoint_mongodbsettings.go
new file mode 100644
index 0000000000..e520d7da66
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-endpoint_mongodbsettings.go
@@ -0,0 +1,97 @@
+package dms
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_MongoDbSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.MongoDbSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html
+type Endpoint_MongoDbSettings struct {
+
+	// AuthMechanism AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-authmechanism
+	AuthMechanism *types.Value `json:"AuthMechanism,omitempty"`
+
+	// AuthSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-authsource
+	AuthSource *types.Value `json:"AuthSource,omitempty"`
+
+	// AuthType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-authtype
+	AuthType *types.Value `json:"AuthType,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// DocsToInvestigate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-docstoinvestigate
+	DocsToInvestigate *types.Value `json:"DocsToInvestigate,omitempty"`
+
+	// ExtractDocId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-extractdocid
+	ExtractDocId *types.Value `json:"ExtractDocId,omitempty"`
+
+	// NestingLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-nestinglevel
+	NestingLevel *types.Value `json:"NestingLevel,omitempty"`
+
+	// Password AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-password
+	Password *types.Value `json:"Password,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// SecretsManagerAccessRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-secretsmanageraccessrolearn
+	SecretsManagerAccessRoleArn *types.Value `json:"SecretsManagerAccessRoleArn,omitempty"`
+
+	// SecretsManagerSecretId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-secretsmanagersecretid
+	SecretsManagerSecretId *types.Value `json:"SecretsManagerSecretId,omitempty"`
+
+	// ServerName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-servername
+	ServerName *types.Value `json:"ServerName,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mongodbsettings.html#cfn-dms-endpoint-mongodbsettings-username
+	Username *types.Value `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 *Endpoint_MongoDbSettings) AWSCloudFormationType() string {
+	return "AWS::DMS::Endpoint.MongoDbSettings"
+}
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_mysqlsettings.go b/goformation/cloudformation/dms/aws-dms-endpoint_mysqlsettings.go
new file mode 100644
index 0000000000..fb20a7ae69
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-endpoint_mysqlsettings.go
@@ -0,0 +1,42 @@
+package dms
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_MySqlSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.MySqlSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mysqlsettings.html
+type Endpoint_MySqlSettings struct {
+
+	// SecretsManagerAccessRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mysqlsettings.html#cfn-dms-endpoint-mysqlsettings-secretsmanageraccessrolearn
+	SecretsManagerAccessRoleArn *types.Value `json:"SecretsManagerAccessRoleArn,omitempty"`
+
+	// SecretsManagerSecretId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-mysqlsettings.html#cfn-dms-endpoint-mysqlsettings-secretsmanagersecretid
+	SecretsManagerSecretId *types.Value `json:"SecretsManagerSecretId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_MySqlSettings) AWSCloudFormationType() string {
+	return "AWS::DMS::Endpoint.MySqlSettings"
+}
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_neptunesettings.go b/goformation/cloudformation/dms/aws-dms-endpoint_neptunesettings.go
new file mode 100644
index 0000000000..a836b1ca35
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-endpoint_neptunesettings.go
@@ -0,0 +1,67 @@
+package dms
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_NeptuneSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.NeptuneSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-neptunesettings.html
+type Endpoint_NeptuneSettings struct {
+
+	// ErrorRetryDuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-neptunesettings.html#cfn-dms-endpoint-neptunesettings-errorretryduration
+	ErrorRetryDuration *types.Value `json:"ErrorRetryDuration,omitempty"`
+
+	// IamAuthEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-neptunesettings.html#cfn-dms-endpoint-neptunesettings-iamauthenabled
+	IamAuthEnabled *types.Value `json:"IamAuthEnabled,omitempty"`
+
+	// MaxFileSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-neptunesettings.html#cfn-dms-endpoint-neptunesettings-maxfilesize
+	MaxFileSize *types.Value `json:"MaxFileSize,omitempty"`
+
+	// MaxRetryCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-neptunesettings.html#cfn-dms-endpoint-neptunesettings-maxretrycount
+	MaxRetryCount *types.Value `json:"MaxRetryCount,omitempty"`
+
+	// S3BucketFolder AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-neptunesettings.html#cfn-dms-endpoint-neptunesettings-s3bucketfolder
+	S3BucketFolder *types.Value `json:"S3BucketFolder,omitempty"`
+
+	// S3BucketName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-neptunesettings.html#cfn-dms-endpoint-neptunesettings-s3bucketname
+	S3BucketName *types.Value `json:"S3BucketName,omitempty"`
+
+	// ServiceAccessRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-neptunesettings.html#cfn-dms-endpoint-neptunesettings-serviceaccessrolearn
+	ServiceAccessRoleArn *types.Value `json:"ServiceAccessRoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_NeptuneSettings) AWSCloudFormationType() string {
+	return "AWS::DMS::Endpoint.NeptuneSettings"
+}
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_oraclesettings.go b/goformation/cloudformation/dms/aws-dms-endpoint_oraclesettings.go
new file mode 100644
index 0000000000..93ea4f4ed8
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-endpoint_oraclesettings.go
@@ -0,0 +1,52 @@
+package dms
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_OracleSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.OracleSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-oraclesettings.html
+type Endpoint_OracleSettings struct {
+
+	// SecretsManagerAccessRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-oraclesettings.html#cfn-dms-endpoint-oraclesettings-secretsmanageraccessrolearn
+	SecretsManagerAccessRoleArn *types.Value `json:"SecretsManagerAccessRoleArn,omitempty"`
+
+	// SecretsManagerOracleAsmAccessRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-oraclesettings.html#cfn-dms-endpoint-oraclesettings-secretsmanageroracleasmaccessrolearn
+	SecretsManagerOracleAsmAccessRoleArn *types.Value `json:"SecretsManagerOracleAsmAccessRoleArn,omitempty"`
+
+	// SecretsManagerOracleAsmSecretId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-oraclesettings.html#cfn-dms-endpoint-oraclesettings-secretsmanageroracleasmsecretid
+	SecretsManagerOracleAsmSecretId *types.Value `json:"SecretsManagerOracleAsmSecretId,omitempty"`
+
+	// SecretsManagerSecretId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-oraclesettings.html#cfn-dms-endpoint-oraclesettings-secretsmanagersecretid
+	SecretsManagerSecretId *types.Value `json:"SecretsManagerSecretId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_OracleSettings) AWSCloudFormationType() string {
+	return "AWS::DMS::Endpoint.OracleSettings"
+}
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_postgresqlsettings.go b/goformation/cloudformation/dms/aws-dms-endpoint_postgresqlsettings.go
new file mode 100644
index 0000000000..374703b1ae
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-endpoint_postgresqlsettings.go
@@ -0,0 +1,42 @@
+package dms
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_PostgreSqlSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.PostgreSqlSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-postgresqlsettings.html
+type Endpoint_PostgreSqlSettings struct {
+
+	// SecretsManagerAccessRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-postgresqlsettings.html#cfn-dms-endpoint-postgresqlsettings-secretsmanageraccessrolearn
+	SecretsManagerAccessRoleArn *types.Value `json:"SecretsManagerAccessRoleArn,omitempty"`
+
+	// SecretsManagerSecretId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-postgresqlsettings.html#cfn-dms-endpoint-postgresqlsettings-secretsmanagersecretid
+	SecretsManagerSecretId *types.Value `json:"SecretsManagerSecretId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_PostgreSqlSettings) AWSCloudFormationType() string {
+	return "AWS::DMS::Endpoint.PostgreSqlSettings"
+}
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_redissettings.go b/goformation/cloudformation/dms/aws-dms-endpoint_redissettings.go
new file mode 100644
index 0000000000..9ef0695fab
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-endpoint_redissettings.go
@@ -0,0 +1,67 @@
+package dms
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_RedisSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.RedisSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-redissettings.html
+type Endpoint_RedisSettings struct {
+
+	// AuthPassword AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-redissettings.html#cfn-dms-endpoint-redissettings-authpassword
+	AuthPassword *types.Value `json:"AuthPassword,omitempty"`
+
+	// AuthType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-redissettings.html#cfn-dms-endpoint-redissettings-authtype
+	AuthType *types.Value `json:"AuthType,omitempty"`
+
+	// AuthUserName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-redissettings.html#cfn-dms-endpoint-redissettings-authusername
+	AuthUserName *types.Value `json:"AuthUserName,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-redissettings.html#cfn-dms-endpoint-redissettings-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// ServerName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-redissettings.html#cfn-dms-endpoint-redissettings-servername
+	ServerName *types.Value `json:"ServerName,omitempty"`
+
+	// SslCaCertificateArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-redissettings.html#cfn-dms-endpoint-redissettings-sslcacertificatearn
+	SslCaCertificateArn *types.Value `json:"SslCaCertificateArn,omitempty"`
+
+	// SslSecurityProtocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-redissettings.html#cfn-dms-endpoint-redissettings-sslsecurityprotocol
+	SslSecurityProtocol *types.Value `json:"SslSecurityProtocol,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_RedisSettings) AWSCloudFormationType() string {
+	return "AWS::DMS::Endpoint.RedisSettings"
+}
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_redshiftsettings.go b/goformation/cloudformation/dms/aws-dms-endpoint_redshiftsettings.go
new file mode 100644
index 0000000000..3f12a159a8
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-endpoint_redshiftsettings.go
@@ -0,0 +1,42 @@
+package dms
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_RedshiftSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.RedshiftSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-redshiftsettings.html
+type Endpoint_RedshiftSettings struct {
+
+	// SecretsManagerAccessRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-redshiftsettings.html#cfn-dms-endpoint-redshiftsettings-secretsmanageraccessrolearn
+	SecretsManagerAccessRoleArn *types.Value `json:"SecretsManagerAccessRoleArn,omitempty"`
+
+	// SecretsManagerSecretId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-redshiftsettings.html#cfn-dms-endpoint-redshiftsettings-secretsmanagersecretid
+	SecretsManagerSecretId *types.Value `json:"SecretsManagerSecretId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_RedshiftSettings) AWSCloudFormationType() string {
+	return "AWS::DMS::Endpoint.RedshiftSettings"
+}
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_s3settings.go b/goformation/cloudformation/dms/aws-dms-endpoint_s3settings.go
new file mode 100644
index 0000000000..7592ae8744
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-endpoint_s3settings.go
@@ -0,0 +1,67 @@
+package dms
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_S3Settings AWS CloudFormation Resource (AWS::DMS::Endpoint.S3Settings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-s3settings.html
+type Endpoint_S3Settings struct {
+
+	// BucketFolder AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-s3settings.html#cfn-dms-endpoint-s3settings-bucketfolder
+	BucketFolder *types.Value `json:"BucketFolder,omitempty"`
+
+	// BucketName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-s3settings.html#cfn-dms-endpoint-s3settings-bucketname
+	BucketName *types.Value `json:"BucketName,omitempty"`
+
+	// CompressionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-s3settings.html#cfn-dms-endpoint-s3settings-compressiontype
+	CompressionType *types.Value `json:"CompressionType,omitempty"`
+
+	// CsvDelimiter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-s3settings.html#cfn-dms-endpoint-s3settings-csvdelimiter
+	CsvDelimiter *types.Value `json:"CsvDelimiter,omitempty"`
+
+	// CsvRowDelimiter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-s3settings.html#cfn-dms-endpoint-s3settings-csvrowdelimiter
+	CsvRowDelimiter *types.Value `json:"CsvRowDelimiter,omitempty"`
+
+	// ExternalTableDefinition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-s3settings.html#cfn-dms-endpoint-s3settings-externaltabledefinition
+	ExternalTableDefinition *types.Value `json:"ExternalTableDefinition,omitempty"`
+
+	// ServiceAccessRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-s3settings.html#cfn-dms-endpoint-s3settings-serviceaccessrolearn
+	ServiceAccessRoleArn *types.Value `json:"ServiceAccessRoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_S3Settings) AWSCloudFormationType() string {
+	return "AWS::DMS::Endpoint.S3Settings"
+}
diff --git a/goformation/cloudformation/dms/aws-dms-endpoint_sybasesettings.go b/goformation/cloudformation/dms/aws-dms-endpoint_sybasesettings.go
new file mode 100644
index 0000000000..29fa548557
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-endpoint_sybasesettings.go
@@ -0,0 +1,42 @@
+package dms
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_SybaseSettings AWS CloudFormation Resource (AWS::DMS::Endpoint.SybaseSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-sybasesettings.html
+type Endpoint_SybaseSettings struct {
+
+	// SecretsManagerAccessRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-sybasesettings.html#cfn-dms-endpoint-sybasesettings-secretsmanageraccessrolearn
+	SecretsManagerAccessRoleArn *types.Value `json:"SecretsManagerAccessRoleArn,omitempty"`
+
+	// SecretsManagerSecretId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dms-endpoint-sybasesettings.html#cfn-dms-endpoint-sybasesettings-secretsmanagersecretid
+	SecretsManagerSecretId *types.Value `json:"SecretsManagerSecretId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_SybaseSettings) AWSCloudFormationType() string {
+	return "AWS::DMS::Endpoint.SybaseSettings"
+}
diff --git a/goformation/cloudformation/dms/aws-dms-eventsubscription.go b/goformation/cloudformation/dms/aws-dms-eventsubscription.go
new file mode 100644
index 0000000000..d9ffe2a435
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-eventsubscription.go
@@ -0,0 +1,139 @@
+package dms
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventSubscription AWS CloudFormation Resource (AWS::DMS::EventSubscription)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html
+type EventSubscription struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// EventCategories AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-eventcategories
+	EventCategories *types.Value `json:"EventCategories,omitempty"`
+
+	// SnsTopicArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-snstopicarn
+	SnsTopicArn *types.Value `json:"SnsTopicArn,omitempty"`
+
+	// SourceIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-sourceids
+	SourceIds *types.Value `json:"SourceIds,omitempty"`
+
+	// SourceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-sourcetype
+	SourceType *types.Value `json:"SourceType,omitempty"`
+
+	// SubscriptionName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-subscriptionname
+	SubscriptionName *types.Value `json:"SubscriptionName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-eventsubscription.html#cfn-dms-eventsubscription-tags
+	Tags []cloudformation.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 *EventSubscription) AWSCloudFormationType() string {
+	return "AWS::DMS::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/dms/aws-dms-replicationinstance.go b/goformation/cloudformation/dms/aws-dms-replicationinstance.go
new file mode 100644
index 0000000000..c3f806e9de
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-replicationinstance.go
@@ -0,0 +1,179 @@
+package dms
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReplicationInstance AWS CloudFormation Resource (AWS::DMS::ReplicationInstance)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html
+type ReplicationInstance struct {
+
+	// AllocatedStorage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-allocatedstorage
+	AllocatedStorage *types.Value `json:"AllocatedStorage,omitempty"`
+
+	// AllowMajorVersionUpgrade AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-allowmajorversionupgrade
+	AllowMajorVersionUpgrade *types.Value `json:"AllowMajorVersionUpgrade,omitempty"`
+
+	// AutoMinorVersionUpgrade AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-autominorversionupgrade
+	AutoMinorVersionUpgrade *types.Value `json:"AutoMinorVersionUpgrade,omitempty"`
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// EngineVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-engineversion
+	EngineVersion *types.Value `json:"EngineVersion,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// MultiAZ AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-multiaz
+	MultiAZ *types.Value `json:"MultiAZ,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
+	PreferredMaintenanceWindow *types.Value `json:"PreferredMaintenanceWindow,omitempty"`
+
+	// PubliclyAccessible AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-publiclyaccessible
+	PubliclyAccessible *types.Value `json:"PubliclyAccessible,omitempty"`
+
+	// ReplicationInstanceClass AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationinstanceclass
+	ReplicationInstanceClass *types.Value `json:"ReplicationInstanceClass,omitempty"`
+
+	// ReplicationInstanceIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationinstanceidentifier
+	ReplicationInstanceIdentifier *types.Value `json:"ReplicationInstanceIdentifier,omitempty"`
+
+	// ReplicationSubnetGroupIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-replicationsubnetgroupidentifier
+	ReplicationSubnetGroupIdentifier *types.Value `json:"ReplicationSubnetGroupIdentifier,omitempty"`
+
+	// ResourceIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-resourceidentifier
+	ResourceIdentifier *types.Value `json:"ResourceIdentifier,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VpcSecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationinstance.html#cfn-dms-replicationinstance-vpcsecuritygroupids
+	VpcSecurityGroupIds *types.Value `json:"VpcSecurityGroupIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReplicationInstance) AWSCloudFormationType() string {
+	return "AWS::DMS::ReplicationInstance"
+}
+
+// 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 ReplicationInstance) MarshalJSON() ([]byte, error) {
+	type Properties ReplicationInstance
+	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 *ReplicationInstance) UnmarshalJSON(b []byte) error {
+	type Properties ReplicationInstance
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ReplicationInstance(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/dms/aws-dms-replicationsubnetgroup.go b/goformation/cloudformation/dms/aws-dms-replicationsubnetgroup.go
new file mode 100644
index 0000000000..4eb8ecabc7
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-replicationsubnetgroup.go
@@ -0,0 +1,124 @@
+package dms
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReplicationSubnetGroup AWS CloudFormation Resource (AWS::DMS::ReplicationSubnetGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html
+type ReplicationSubnetGroup struct {
+
+	// ReplicationSubnetGroupDescription AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-replicationsubnetgroupdescription
+	ReplicationSubnetGroupDescription *types.Value `json:"ReplicationSubnetGroupDescription,omitempty"`
+
+	// ReplicationSubnetGroupIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-replicationsubnetgroupidentifier
+	ReplicationSubnetGroupIdentifier *types.Value `json:"ReplicationSubnetGroupIdentifier,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationsubnetgroup.html#cfn-dms-replicationsubnetgroup-tags
+	Tags []cloudformation.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 *ReplicationSubnetGroup) AWSCloudFormationType() string {
+	return "AWS::DMS::ReplicationSubnetGroup"
+}
+
+// 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 ReplicationSubnetGroup) MarshalJSON() ([]byte, error) {
+	type Properties ReplicationSubnetGroup
+	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 *ReplicationSubnetGroup) UnmarshalJSON(b []byte) error {
+	type Properties ReplicationSubnetGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ReplicationSubnetGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/dms/aws-dms-replicationtask.go b/goformation/cloudformation/dms/aws-dms-replicationtask.go
new file mode 100644
index 0000000000..e8beb26fcd
--- /dev/null
+++ b/goformation/cloudformation/dms/aws-dms-replicationtask.go
@@ -0,0 +1,169 @@
+package dms
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReplicationTask AWS CloudFormation Resource (AWS::DMS::ReplicationTask)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html
+type ReplicationTask struct {
+
+	// CdcStartPosition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-cdcstartposition
+	CdcStartPosition *types.Value `json:"CdcStartPosition,omitempty"`
+
+	// CdcStartTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-cdcstarttime
+	CdcStartTime *types.Value `json:"CdcStartTime,omitempty"`
+
+	// CdcStopPosition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-cdcstopposition
+	CdcStopPosition *types.Value `json:"CdcStopPosition,omitempty"`
+
+	// MigrationType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-migrationtype
+	MigrationType *types.Value `json:"MigrationType,omitempty"`
+
+	// ReplicationInstanceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationinstancearn
+	ReplicationInstanceArn *types.Value `json:"ReplicationInstanceArn,omitempty"`
+
+	// ReplicationTaskIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationtaskidentifier
+	ReplicationTaskIdentifier *types.Value `json:"ReplicationTaskIdentifier,omitempty"`
+
+	// ReplicationTaskSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-replicationtasksettings
+	ReplicationTaskSettings *types.Value `json:"ReplicationTaskSettings,omitempty"`
+
+	// ResourceIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-resourceidentifier
+	ResourceIdentifier *types.Value `json:"ResourceIdentifier,omitempty"`
+
+	// SourceEndpointArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-sourceendpointarn
+	SourceEndpointArn *types.Value `json:"SourceEndpointArn,omitempty"`
+
+	// TableMappings AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-tablemappings
+	TableMappings *types.Value `json:"TableMappings,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TargetEndpointArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-targetendpointarn
+	TargetEndpointArn *types.Value `json:"TargetEndpointArn,omitempty"`
+
+	// TaskData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dms-replicationtask.html#cfn-dms-replicationtask-taskdata
+	TaskData *types.Value `json:"TaskData,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReplicationTask) AWSCloudFormationType() string {
+	return "AWS::DMS::ReplicationTask"
+}
+
+// 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 ReplicationTask) MarshalJSON() ([]byte, error) {
+	type Properties ReplicationTask
+	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 *ReplicationTask) UnmarshalJSON(b []byte) error {
+	type Properties ReplicationTask
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ReplicationTask(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/docdb/aws-docdb-dbcluster.go b/goformation/cloudformation/docdb/aws-docdb-dbcluster.go
new file mode 100644
index 0000000000..22cb2bb9c1
--- /dev/null
+++ b/goformation/cloudformation/docdb/aws-docdb-dbcluster.go
@@ -0,0 +1,194 @@
+package docdb
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBCluster AWS CloudFormation Resource (AWS::DocDB::DBCluster)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html
+type DBCluster struct {
+
+	// AvailabilityZones AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html#cfn-docdb-dbcluster-availabilityzones
+	AvailabilityZones *types.Value `json:"AvailabilityZones,omitempty"`
+
+	// BackupRetentionPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html#cfn-docdb-dbcluster-backupretentionperiod
+	BackupRetentionPeriod *types.Value `json:"BackupRetentionPeriod,omitempty"`
+
+	// DBClusterIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html#cfn-docdb-dbcluster-dbclusteridentifier
+	DBClusterIdentifier *types.Value `json:"DBClusterIdentifier,omitempty"`
+
+	// DBClusterParameterGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html#cfn-docdb-dbcluster-dbclusterparametergroupname
+	DBClusterParameterGroupName *types.Value `json:"DBClusterParameterGroupName,omitempty"`
+
+	// DBSubnetGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html#cfn-docdb-dbcluster-dbsubnetgroupname
+	DBSubnetGroupName *types.Value `json:"DBSubnetGroupName,omitempty"`
+
+	// DeletionProtection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html#cfn-docdb-dbcluster-deletionprotection
+	DeletionProtection *types.Value `json:"DeletionProtection,omitempty"`
+
+	// EnableCloudwatchLogsExports AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html#cfn-docdb-dbcluster-enablecloudwatchlogsexports
+	EnableCloudwatchLogsExports *types.Value `json:"EnableCloudwatchLogsExports,omitempty"`
+
+	// EngineVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html#cfn-docdb-dbcluster-engineversion
+	EngineVersion *types.Value `json:"EngineVersion,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html#cfn-docdb-dbcluster-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// MasterUserPassword AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html#cfn-docdb-dbcluster-masteruserpassword
+	MasterUserPassword *types.Value `json:"MasterUserPassword,omitempty"`
+
+	// MasterUsername AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html#cfn-docdb-dbcluster-masterusername
+	MasterUsername *types.Value `json:"MasterUsername,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html#cfn-docdb-dbcluster-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// PreferredBackupWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html#cfn-docdb-dbcluster-preferredbackupwindow
+	PreferredBackupWindow *types.Value `json:"PreferredBackupWindow,omitempty"`
+
+	// PreferredMaintenanceWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html#cfn-docdb-dbcluster-preferredmaintenancewindow
+	PreferredMaintenanceWindow *types.Value `json:"PreferredMaintenanceWindow,omitempty"`
+
+	// SnapshotIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html#cfn-docdb-dbcluster-snapshotidentifier
+	SnapshotIdentifier *types.Value `json:"SnapshotIdentifier,omitempty"`
+
+	// StorageEncrypted AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html#cfn-docdb-dbcluster-storageencrypted
+	StorageEncrypted *types.Value `json:"StorageEncrypted,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html#cfn-docdb-dbcluster-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VpcSecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbcluster.html#cfn-docdb-dbcluster-vpcsecuritygroupids
+	VpcSecurityGroupIds *types.Value `json:"VpcSecurityGroupIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DBCluster) AWSCloudFormationType() string {
+	return "AWS::DocDB::DBCluster"
+}
+
+// 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 DBCluster) MarshalJSON() ([]byte, error) {
+	type Properties DBCluster
+	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 *DBCluster) UnmarshalJSON(b []byte) error {
+	type Properties DBCluster
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DBCluster(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/docdb/aws-docdb-dbclusterparametergroup.go b/goformation/cloudformation/docdb/aws-docdb-dbclusterparametergroup.go
new file mode 100644
index 0000000000..3a033d786b
--- /dev/null
+++ b/goformation/cloudformation/docdb/aws-docdb-dbclusterparametergroup.go
@@ -0,0 +1,129 @@
+package docdb
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBClusterParameterGroup AWS CloudFormation Resource (AWS::DocDB::DBClusterParameterGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbclusterparametergroup.html
+type DBClusterParameterGroup struct {
+
+	// Description AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbclusterparametergroup.html#cfn-docdb-dbclusterparametergroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Family AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbclusterparametergroup.html#cfn-docdb-dbclusterparametergroup-family
+	Family *types.Value `json:"Family,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbclusterparametergroup.html#cfn-docdb-dbclusterparametergroup-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbclusterparametergroup.html#cfn-docdb-dbclusterparametergroup-parameters
+	Parameters interface{} `json:"Parameters,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbclusterparametergroup.html#cfn-docdb-dbclusterparametergroup-tags
+	Tags []cloudformation.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 *DBClusterParameterGroup) AWSCloudFormationType() string {
+	return "AWS::DocDB::DBClusterParameterGroup"
+}
+
+// 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 DBClusterParameterGroup) MarshalJSON() ([]byte, error) {
+	type Properties DBClusterParameterGroup
+	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 *DBClusterParameterGroup) UnmarshalJSON(b []byte) error {
+	type Properties DBClusterParameterGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DBClusterParameterGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/docdb/aws-docdb-dbinstance.go b/goformation/cloudformation/docdb/aws-docdb-dbinstance.go
new file mode 100644
index 0000000000..929d6e4d28
--- /dev/null
+++ b/goformation/cloudformation/docdb/aws-docdb-dbinstance.go
@@ -0,0 +1,139 @@
+package docdb
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBInstance AWS CloudFormation Resource (AWS::DocDB::DBInstance)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbinstance.html
+type DBInstance struct {
+
+	// AutoMinorVersionUpgrade AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbinstance.html#cfn-docdb-dbinstance-autominorversionupgrade
+	AutoMinorVersionUpgrade *types.Value `json:"AutoMinorVersionUpgrade,omitempty"`
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbinstance.html#cfn-docdb-dbinstance-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// DBClusterIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbinstance.html#cfn-docdb-dbinstance-dbclusteridentifier
+	DBClusterIdentifier *types.Value `json:"DBClusterIdentifier,omitempty"`
+
+	// DBInstanceClass AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbinstance.html#cfn-docdb-dbinstance-dbinstanceclass
+	DBInstanceClass *types.Value `json:"DBInstanceClass,omitempty"`
+
+	// DBInstanceIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbinstance.html#cfn-docdb-dbinstance-dbinstanceidentifier
+	DBInstanceIdentifier *types.Value `json:"DBInstanceIdentifier,omitempty"`
+
+	// PreferredMaintenanceWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbinstance.html#cfn-docdb-dbinstance-preferredmaintenancewindow
+	PreferredMaintenanceWindow *types.Value `json:"PreferredMaintenanceWindow,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbinstance.html#cfn-docdb-dbinstance-tags
+	Tags []cloudformation.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 *DBInstance) AWSCloudFormationType() string {
+	return "AWS::DocDB::DBInstance"
+}
+
+// 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 DBInstance) MarshalJSON() ([]byte, error) {
+	type Properties DBInstance
+	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 *DBInstance) UnmarshalJSON(b []byte) error {
+	type Properties DBInstance
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DBInstance(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/docdb/aws-docdb-dbsubnetgroup.go b/goformation/cloudformation/docdb/aws-docdb-dbsubnetgroup.go
new file mode 100644
index 0000000000..68c8ae4a20
--- /dev/null
+++ b/goformation/cloudformation/docdb/aws-docdb-dbsubnetgroup.go
@@ -0,0 +1,124 @@
+package docdb
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBSubnetGroup AWS CloudFormation Resource (AWS::DocDB::DBSubnetGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbsubnetgroup.html
+type DBSubnetGroup struct {
+
+	// DBSubnetGroupDescription AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbsubnetgroup.html#cfn-docdb-dbsubnetgroup-dbsubnetgroupdescription
+	DBSubnetGroupDescription *types.Value `json:"DBSubnetGroupDescription,omitempty"`
+
+	// DBSubnetGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbsubnetgroup.html#cfn-docdb-dbsubnetgroup-dbsubnetgroupname
+	DBSubnetGroupName *types.Value `json:"DBSubnetGroupName,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbsubnetgroup.html#cfn-docdb-dbsubnetgroup-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-docdb-dbsubnetgroup.html#cfn-docdb-dbsubnetgroup-tags
+	Tags []cloudformation.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 *DBSubnetGroup) AWSCloudFormationType() string {
+	return "AWS::DocDB::DBSubnetGroup"
+}
+
+// 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 DBSubnetGroup) MarshalJSON() ([]byte, error) {
+	type Properties DBSubnetGroup
+	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 *DBSubnetGroup) UnmarshalJSON(b []byte) error {
+	type Properties DBSubnetGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DBSubnetGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable.go b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable.go
new file mode 100644
index 0000000000..90873baeb4
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable.go
@@ -0,0 +1,158 @@
+package dynamodb
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalTable AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-globaltable.html
+type GlobalTable struct {
+
+	// AttributeDefinitions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-globaltable.html#cfn-dynamodb-globaltable-attributedefinitions
+	AttributeDefinitions []GlobalTable_AttributeDefinition `json:"AttributeDefinitions,omitempty"`
+
+	// BillingMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-globaltable.html#cfn-dynamodb-globaltable-billingmode
+	BillingMode *types.Value `json:"BillingMode,omitempty"`
+
+	// GlobalSecondaryIndexes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-globaltable.html#cfn-dynamodb-globaltable-globalsecondaryindexes
+	GlobalSecondaryIndexes []GlobalTable_GlobalSecondaryIndex `json:"GlobalSecondaryIndexes,omitempty"`
+
+	// KeySchema AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-globaltable.html#cfn-dynamodb-globaltable-keyschema
+	KeySchema []GlobalTable_KeySchema `json:"KeySchema,omitempty"`
+
+	// LocalSecondaryIndexes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-globaltable.html#cfn-dynamodb-globaltable-localsecondaryindexes
+	LocalSecondaryIndexes []GlobalTable_LocalSecondaryIndex `json:"LocalSecondaryIndexes,omitempty"`
+
+	// Replicas AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-globaltable.html#cfn-dynamodb-globaltable-replicas
+	Replicas []GlobalTable_ReplicaSpecification `json:"Replicas,omitempty"`
+
+	// SSESpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-globaltable.html#cfn-dynamodb-globaltable-ssespecification
+	SSESpecification *GlobalTable_SSESpecification `json:"SSESpecification,omitempty"`
+
+	// StreamSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-globaltable.html#cfn-dynamodb-globaltable-streamspecification
+	StreamSpecification *GlobalTable_StreamSpecification `json:"StreamSpecification,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-globaltable.html#cfn-dynamodb-globaltable-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// TimeToLiveSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-globaltable.html#cfn-dynamodb-globaltable-timetolivespecification
+	TimeToLiveSpecification *GlobalTable_TimeToLiveSpecification `json:"TimeToLiveSpecification,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
+	WriteProvisionedThroughputSettings *GlobalTable_WriteProvisionedThroughputSettings `json:"WriteProvisionedThroughputSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::GlobalTable"
+}
+
+// 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 GlobalTable) MarshalJSON() ([]byte, error) {
+	type Properties GlobalTable
+	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 *GlobalTable) UnmarshalJSON(b []byte) error {
+	type Properties GlobalTable
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = GlobalTable(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_attributedefinition.go b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_attributedefinition.go
new file mode 100644
index 0000000000..e581c1af4d
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_attributedefinition.go
@@ -0,0 +1,42 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalTable_AttributeDefinition AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.AttributeDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-attributedefinition.html
+type GlobalTable_AttributeDefinition struct {
+
+	// AttributeName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-attributedefinition.html#cfn-dynamodb-globaltable-attributedefinition-attributename
+	AttributeName *types.Value `json:"AttributeName,omitempty"`
+
+	// AttributeType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-attributedefinition.html#cfn-dynamodb-globaltable-attributedefinition-attributetype
+	AttributeType *types.Value `json:"AttributeType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AttributeDefinition) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::GlobalTable.AttributeDefinition"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_capacityautoscalingsettings.go b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_capacityautoscalingsettings.go
new file mode 100644
index 0000000000..fdeb9bfa92
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_capacityautoscalingsettings.go
@@ -0,0 +1,52 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalTable_CapacityAutoScalingSettings AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.CapacityAutoScalingSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-capacityautoscalingsettings.html
+type GlobalTable_CapacityAutoScalingSettings struct {
+
+	// MaxCapacity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-capacityautoscalingsettings.html#cfn-dynamodb-globaltable-capacityautoscalingsettings-maxcapacity
+	MaxCapacity *types.Value `json:"MaxCapacity"`
+
+	// MinCapacity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-capacityautoscalingsettings.html#cfn-dynamodb-globaltable-capacityautoscalingsettings-mincapacity
+	MinCapacity *types.Value `json:"MinCapacity"`
+
+	// SeedCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-capacityautoscalingsettings.html#cfn-dynamodb-globaltable-capacityautoscalingsettings-seedcapacity
+	SeedCapacity *types.Value `json:"SeedCapacity,omitempty"`
+
+	// TargetTrackingScalingPolicyConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-capacityautoscalingsettings.html#cfn-dynamodb-globaltable-capacityautoscalingsettings-targettrackingscalingpolicyconfiguration
+	TargetTrackingScalingPolicyConfiguration *GlobalTable_TargetTrackingScalingPolicyConfiguration `json:"TargetTrackingScalingPolicyConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CapacityAutoScalingSettings) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::GlobalTable.CapacityAutoScalingSettings"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_contributorinsightsspecification.go b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_contributorinsightsspecification.go
new file mode 100644
index 0000000000..c6936ae66b
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_contributorinsightsspecification.go
@@ -0,0 +1,37 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalTable_ContributorInsightsSpecification AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.ContributorInsightsSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-contributorinsightsspecification.html
+type GlobalTable_ContributorInsightsSpecification struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-contributorinsightsspecification.html#cfn-dynamodb-globaltable-contributorinsightsspecification-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ContributorInsightsSpecification) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::GlobalTable.ContributorInsightsSpecification"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_globalsecondaryindex.go b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_globalsecondaryindex.go
new file mode 100644
index 0000000000..9568ace993
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_globalsecondaryindex.go
@@ -0,0 +1,52 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalTable_GlobalSecondaryIndex AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.GlobalSecondaryIndex)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-globalsecondaryindex.html
+type GlobalTable_GlobalSecondaryIndex struct {
+
+	// IndexName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-globalsecondaryindex.html#cfn-dynamodb-globaltable-globalsecondaryindex-indexname
+	IndexName *types.Value `json:"IndexName,omitempty"`
+
+	// KeySchema AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-globalsecondaryindex.html#cfn-dynamodb-globaltable-globalsecondaryindex-keyschema
+	KeySchema []GlobalTable_KeySchema `json:"KeySchema,omitempty"`
+
+	// Projection AWS CloudFormation Property
+	// Required: true
+	// 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,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
+	WriteProvisionedThroughputSettings *GlobalTable_WriteProvisionedThroughputSettings `json:"WriteProvisionedThroughputSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_GlobalSecondaryIndex) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::GlobalTable.GlobalSecondaryIndex"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_keyschema.go b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_keyschema.go
new file mode 100644
index 0000000000..3b56106277
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_keyschema.go
@@ -0,0 +1,42 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalTable_KeySchema AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.KeySchema)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-keyschema.html
+type GlobalTable_KeySchema struct {
+
+	// AttributeName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-keyschema.html#cfn-dynamodb-globaltable-keyschema-attributename
+	AttributeName *types.Value `json:"AttributeName,omitempty"`
+
+	// KeyType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-keyschema.html#cfn-dynamodb-globaltable-keyschema-keytype
+	KeyType *types.Value `json:"KeyType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_KeySchema) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::GlobalTable.KeySchema"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_localsecondaryindex.go b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_localsecondaryindex.go
new file mode 100644
index 0000000000..aca48f567b
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_localsecondaryindex.go
@@ -0,0 +1,47 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalTable_LocalSecondaryIndex AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.LocalSecondaryIndex)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-localsecondaryindex.html
+type GlobalTable_LocalSecondaryIndex struct {
+
+	// IndexName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-localsecondaryindex.html#cfn-dynamodb-globaltable-localsecondaryindex-indexname
+	IndexName *types.Value `json:"IndexName,omitempty"`
+
+	// KeySchema AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-localsecondaryindex.html#cfn-dynamodb-globaltable-localsecondaryindex-keyschema
+	KeySchema []GlobalTable_KeySchema `json:"KeySchema,omitempty"`
+
+	// Projection AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-localsecondaryindex.html#cfn-dynamodb-globaltable-localsecondaryindex-projection
+	Projection *GlobalTable_Projection `json:"Projection,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LocalSecondaryIndex) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::GlobalTable.LocalSecondaryIndex"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_pointintimerecoveryspecification.go b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_pointintimerecoveryspecification.go
new file mode 100644
index 0000000000..ef4e85dad9
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_pointintimerecoveryspecification.go
@@ -0,0 +1,37 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalTable_PointInTimeRecoverySpecification AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.PointInTimeRecoverySpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-pointintimerecoveryspecification.html
+type GlobalTable_PointInTimeRecoverySpecification struct {
+
+	// PointInTimeRecoveryEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-pointintimerecoveryspecification.html#cfn-dynamodb-globaltable-pointintimerecoveryspecification-pointintimerecoveryenabled
+	PointInTimeRecoveryEnabled *types.Value `json:"PointInTimeRecoveryEnabled,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PointInTimeRecoverySpecification) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::GlobalTable.PointInTimeRecoverySpecification"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_projection.go b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_projection.go
new file mode 100644
index 0000000000..9ea0beaad0
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_projection.go
@@ -0,0 +1,42 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalTable_Projection AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.Projection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-projection.html
+type GlobalTable_Projection struct {
+
+	// NonKeyAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-projection.html#cfn-dynamodb-globaltable-projection-nonkeyattributes
+	NonKeyAttributes *types.Value `json:"NonKeyAttributes,omitempty"`
+
+	// ProjectionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-projection.html#cfn-dynamodb-globaltable-projection-projectiontype
+	ProjectionType *types.Value `json:"ProjectionType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Projection) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::GlobalTable.Projection"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_readprovisionedthroughputsettings.go b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_readprovisionedthroughputsettings.go
new file mode 100644
index 0000000000..80e68a4dcd
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_readprovisionedthroughputsettings.go
@@ -0,0 +1,42 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalTable_ReadProvisionedThroughputSettings AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-readprovisionedthroughputsettings.html
+type GlobalTable_ReadProvisionedThroughputSettings struct {
+
+	// ReadCapacityAutoScalingSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-readprovisionedthroughputsettings.html#cfn-dynamodb-globaltable-readprovisionedthroughputsettings-readcapacityautoscalingsettings
+	ReadCapacityAutoScalingSettings *GlobalTable_CapacityAutoScalingSettings `json:"ReadCapacityAutoScalingSettings,omitempty"`
+
+	// ReadCapacityUnits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-readprovisionedthroughputsettings.html#cfn-dynamodb-globaltable-readprovisionedthroughputsettings-readcapacityunits
+	ReadCapacityUnits *types.Value `json:"ReadCapacityUnits,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ReadProvisionedThroughputSettings) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaglobalsecondaryindexspecification.go b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaglobalsecondaryindexspecification.go
new file mode 100644
index 0000000000..a419abe3db
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaglobalsecondaryindexspecification.go
@@ -0,0 +1,47 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalTable_ReplicaGlobalSecondaryIndexSpecification AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.ReplicaGlobalSecondaryIndexSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-replicaglobalsecondaryindexspecification.html
+type GlobalTable_ReplicaGlobalSecondaryIndexSpecification struct {
+
+	// ContributorInsightsSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-replicaglobalsecondaryindexspecification.html#cfn-dynamodb-globaltable-replicaglobalsecondaryindexspecification-contributorinsightsspecification
+	ContributorInsightsSpecification *GlobalTable_ContributorInsightsSpecification `json:"ContributorInsightsSpecification,omitempty"`
+
+	// IndexName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-replicaglobalsecondaryindexspecification.html#cfn-dynamodb-globaltable-replicaglobalsecondaryindexspecification-indexname
+	IndexName *types.Value `json:"IndexName,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
+	ReadProvisionedThroughputSettings *GlobalTable_ReadProvisionedThroughputSettings `json:"ReadProvisionedThroughputSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ReplicaGlobalSecondaryIndexSpecification) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::GlobalTable.ReplicaGlobalSecondaryIndexSpecification"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaspecification.go b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaspecification.go
new file mode 100644
index 0000000000..d23d5bfa39
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicaspecification.go
@@ -0,0 +1,68 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalTable_ReplicaSpecification AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.ReplicaSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-replicaspecification.html
+type GlobalTable_ReplicaSpecification struct {
+
+	// ContributorInsightsSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-replicaspecification.html#cfn-dynamodb-globaltable-replicaspecification-contributorinsightsspecification
+	ContributorInsightsSpecification *GlobalTable_ContributorInsightsSpecification `json:"ContributorInsightsSpecification,omitempty"`
+
+	// GlobalSecondaryIndexes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-replicaspecification.html#cfn-dynamodb-globaltable-replicaspecification-globalsecondaryindexes
+	GlobalSecondaryIndexes []GlobalTable_ReplicaGlobalSecondaryIndexSpecification `json:"GlobalSecondaryIndexes,omitempty"`
+
+	// PointInTimeRecoverySpecification AWS CloudFormation Property
+	// Required: false
+	// 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"`
+
+	// 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
+	ReadProvisionedThroughputSettings *GlobalTable_ReadProvisionedThroughputSettings `json:"ReadProvisionedThroughputSettings,omitempty"`
+
+	// Region AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-replicaspecification.html#cfn-dynamodb-globaltable-replicaspecification-region
+	Region *types.Value `json:"Region,omitempty"`
+
+	// SSESpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-replicaspecification.html#cfn-dynamodb-globaltable-replicaspecification-ssespecification
+	SSESpecification *GlobalTable_ReplicaSSESpecification `json:"SSESpecification,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-replicaspecification.html#cfn-dynamodb-globaltable-replicaspecification-tags
+	Tags []cloudformation.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 *GlobalTable_ReplicaSpecification) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::GlobalTable.ReplicaSpecification"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicassespecification.go b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicassespecification.go
new file mode 100644
index 0000000000..b712e808dc
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_replicassespecification.go
@@ -0,0 +1,37 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalTable_ReplicaSSESpecification AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.ReplicaSSESpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-replicassespecification.html
+type GlobalTable_ReplicaSSESpecification struct {
+
+	// KMSMasterKeyId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-replicassespecification.html#cfn-dynamodb-globaltable-replicassespecification-kmsmasterkeyid
+	KMSMasterKeyId *types.Value `json:"KMSMasterKeyId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ReplicaSSESpecification) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::GlobalTable.ReplicaSSESpecification"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_ssespecification.go b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_ssespecification.go
new file mode 100644
index 0000000000..f9629b8e2d
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_ssespecification.go
@@ -0,0 +1,42 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalTable_SSESpecification AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.SSESpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-ssespecification.html
+type GlobalTable_SSESpecification struct {
+
+	// SSEEnabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-ssespecification.html#cfn-dynamodb-globaltable-ssespecification-sseenabled
+	SSEEnabled *types.Value `json:"SSEEnabled"`
+
+	// SSEType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-ssespecification.html#cfn-dynamodb-globaltable-ssespecification-ssetype
+	SSEType *types.Value `json:"SSEType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SSESpecification) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::GlobalTable.SSESpecification"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_streamspecification.go b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_streamspecification.go
new file mode 100644
index 0000000000..a15a4eb954
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_streamspecification.go
@@ -0,0 +1,37 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalTable_StreamSpecification AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.StreamSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-streamspecification.html
+type GlobalTable_StreamSpecification struct {
+
+	// StreamViewType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-streamspecification.html#cfn-dynamodb-globaltable-streamspecification-streamviewtype
+	StreamViewType *types.Value `json:"StreamViewType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_StreamSpecification) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::GlobalTable.StreamSpecification"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_targettrackingscalingpolicyconfiguration.go b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_targettrackingscalingpolicyconfiguration.go
new file mode 100644
index 0000000000..41b1da9194
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_targettrackingscalingpolicyconfiguration.go
@@ -0,0 +1,52 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalTable_TargetTrackingScalingPolicyConfiguration AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.TargetTrackingScalingPolicyConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-targettrackingscalingpolicyconfiguration.html
+type GlobalTable_TargetTrackingScalingPolicyConfiguration struct {
+
+	// DisableScaleIn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-targettrackingscalingpolicyconfiguration.html#cfn-dynamodb-globaltable-targettrackingscalingpolicyconfiguration-disablescalein
+	DisableScaleIn *types.Value `json:"DisableScaleIn,omitempty"`
+
+	// ScaleInCooldown AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-targettrackingscalingpolicyconfiguration.html#cfn-dynamodb-globaltable-targettrackingscalingpolicyconfiguration-scaleincooldown
+	ScaleInCooldown *types.Value `json:"ScaleInCooldown,omitempty"`
+
+	// ScaleOutCooldown AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-targettrackingscalingpolicyconfiguration.html#cfn-dynamodb-globaltable-targettrackingscalingpolicyconfiguration-scaleoutcooldown
+	ScaleOutCooldown *types.Value `json:"ScaleOutCooldown,omitempty"`
+
+	// TargetValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-targettrackingscalingpolicyconfiguration.html#cfn-dynamodb-globaltable-targettrackingscalingpolicyconfiguration-targetvalue
+	TargetValue *types.Value `json:"TargetValue"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TargetTrackingScalingPolicyConfiguration) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::GlobalTable.TargetTrackingScalingPolicyConfiguration"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_timetolivespecification.go b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_timetolivespecification.go
new file mode 100644
index 0000000000..d9015b1bff
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_timetolivespecification.go
@@ -0,0 +1,42 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalTable_TimeToLiveSpecification AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.TimeToLiveSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-timetolivespecification.html
+type GlobalTable_TimeToLiveSpecification struct {
+
+	// AttributeName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-timetolivespecification.html#cfn-dynamodb-globaltable-timetolivespecification-attributename
+	AttributeName *types.Value `json:"AttributeName,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-timetolivespecification.html#cfn-dynamodb-globaltable-timetolivespecification-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TimeToLiveSpecification) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::GlobalTable.TimeToLiveSpecification"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_writeprovisionedthroughputsettings.go b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_writeprovisionedthroughputsettings.go
new file mode 100644
index 0000000000..80a101b106
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-globaltable_writeprovisionedthroughputsettings.go
@@ -0,0 +1,35 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalTable_WriteProvisionedThroughputSettings AWS CloudFormation Resource (AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-writeprovisionedthroughputsettings.html
+type GlobalTable_WriteProvisionedThroughputSettings struct {
+
+	// WriteCapacityAutoScalingSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-globaltable-writeprovisionedthroughputsettings.html#cfn-dynamodb-globaltable-writeprovisionedthroughputsettings-writecapacityautoscalingsettings
+	WriteCapacityAutoScalingSettings *GlobalTable_CapacityAutoScalingSettings `json:"WriteCapacityAutoScalingSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_WriteProvisionedThroughputSettings) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table.go b/goformation/cloudformation/dynamodb/aws-dynamodb-table.go
new file mode 100644
index 0000000000..eca04b90a3
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-table.go
@@ -0,0 +1,179 @@
+package dynamodb
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table AWS CloudFormation Resource (AWS::DynamoDB::Table)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html
+type Table struct {
+
+	// AttributeDefinitions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-attributedef
+	AttributeDefinitions []Table_AttributeDefinition `json:"AttributeDefinitions,omitempty"`
+
+	// BillingMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-billingmode
+	BillingMode *types.Value `json:"BillingMode,omitempty"`
+
+	// ContributorInsightsSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-contributorinsightsspecification-enabled
+	ContributorInsightsSpecification *Table_ContributorInsightsSpecification `json:"ContributorInsightsSpecification,omitempty"`
+
+	// GlobalSecondaryIndexes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-gsi
+	GlobalSecondaryIndexes []Table_GlobalSecondaryIndex `json:"GlobalSecondaryIndexes,omitempty"`
+
+	// KeySchema AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-keyschema
+	KeySchema []Table_KeySchema `json:"KeySchema,omitempty"`
+
+	// KinesisStreamSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-kinesisstreamspecification
+	KinesisStreamSpecification *Table_KinesisStreamSpecification `json:"KinesisStreamSpecification,omitempty"`
+
+	// LocalSecondaryIndexes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-lsi
+	LocalSecondaryIndexes []Table_LocalSecondaryIndex `json:"LocalSecondaryIndexes,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
+	PointInTimeRecoverySpecification *Table_PointInTimeRecoverySpecification `json:"PointInTimeRecoverySpecification,omitempty"`
+
+	// ProvisionedThroughput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-provisionedthroughput
+	ProvisionedThroughput *Table_ProvisionedThroughput `json:"ProvisionedThroughput,omitempty"`
+
+	// SSESpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-ssespecification
+	SSESpecification *Table_SSESpecification `json:"SSESpecification,omitempty"`
+
+	// StreamSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-streamspecification
+	StreamSpecification *Table_StreamSpecification `json:"StreamSpecification,omitempty"`
+
+	// TableClass AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-tableclass
+	TableClass *types.Value `json:"TableClass,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TimeToLiveSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-dynamodb-table.html#cfn-dynamodb-table-timetolivespecification
+	TimeToLiveSpecification *Table_TimeToLiveSpecification `json:"TimeToLiveSpecification,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::Table"
+}
+
+// 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 Table) MarshalJSON() ([]byte, error) {
+	type Properties Table
+	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 *Table) UnmarshalJSON(b []byte) error {
+	type Properties Table
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Table(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/dynamodb/aws-dynamodb-table_attributedefinition.go b/goformation/cloudformation/dynamodb/aws-dynamodb-table_attributedefinition.go
new file mode 100644
index 0000000000..c016d2a743
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-table_attributedefinition.go
@@ -0,0 +1,42 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_AttributeDefinition AWS CloudFormation Resource (AWS::DynamoDB::Table.AttributeDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-attributedef.html
+type Table_AttributeDefinition struct {
+
+	// AttributeName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-attributedef.html#cfn-dynamodb-attributedef-attributename
+	AttributeName *types.Value `json:"AttributeName,omitempty"`
+
+	// AttributeType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-attributedef.html#cfn-dynamodb-attributedef-attributename-attributetype
+	AttributeType *types.Value `json:"AttributeType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AttributeDefinition) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::Table.AttributeDefinition"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_contributorinsightsspecification.go b/goformation/cloudformation/dynamodb/aws-dynamodb-table_contributorinsightsspecification.go
new file mode 100644
index 0000000000..a466f04142
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-table_contributorinsightsspecification.go
@@ -0,0 +1,37 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_ContributorInsightsSpecification AWS CloudFormation Resource (AWS::DynamoDB::Table.ContributorInsightsSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-contributorinsightsspecification.html
+type Table_ContributorInsightsSpecification struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-contributorinsightsspecification.html#cfn-dynamodb-contributorinsightsspecification-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ContributorInsightsSpecification) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::Table.ContributorInsightsSpecification"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_globalsecondaryindex.go b/goformation/cloudformation/dynamodb/aws-dynamodb-table_globalsecondaryindex.go
new file mode 100644
index 0000000000..34722fee63
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-table_globalsecondaryindex.go
@@ -0,0 +1,57 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_GlobalSecondaryIndex AWS CloudFormation Resource (AWS::DynamoDB::Table.GlobalSecondaryIndex)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-gsi.html
+type Table_GlobalSecondaryIndex struct {
+
+	// ContributorInsightsSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-gsi.html#cfn-dynamodb-contributorinsightsspecification-enabled
+	ContributorInsightsSpecification *Table_ContributorInsightsSpecification `json:"ContributorInsightsSpecification,omitempty"`
+
+	// IndexName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-gsi.html#cfn-dynamodb-gsi-indexname
+	IndexName *types.Value `json:"IndexName,omitempty"`
+
+	// KeySchema AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-gsi.html#cfn-dynamodb-gsi-keyschema
+	KeySchema []Table_KeySchema `json:"KeySchema,omitempty"`
+
+	// Projection AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-gsi.html#cfn-dynamodb-gsi-projection
+	Projection *Table_Projection `json:"Projection,omitempty"`
+
+	// ProvisionedThroughput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-gsi.html#cfn-dynamodb-gsi-provisionedthroughput
+	ProvisionedThroughput *Table_ProvisionedThroughput `json:"ProvisionedThroughput,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_GlobalSecondaryIndex) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::Table.GlobalSecondaryIndex"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_keyschema.go b/goformation/cloudformation/dynamodb/aws-dynamodb-table_keyschema.go
new file mode 100644
index 0000000000..d32f707b32
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-table_keyschema.go
@@ -0,0 +1,42 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_KeySchema AWS CloudFormation Resource (AWS::DynamoDB::Table.KeySchema)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-keyschema.html
+type Table_KeySchema struct {
+
+	// AttributeName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-keyschema.html#aws-properties-dynamodb-keyschema-attributename
+	AttributeName *types.Value `json:"AttributeName,omitempty"`
+
+	// KeyType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-keyschema.html#aws-properties-dynamodb-keyschema-keytype
+	KeyType *types.Value `json:"KeyType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_KeySchema) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::Table.KeySchema"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_kinesisstreamspecification.go b/goformation/cloudformation/dynamodb/aws-dynamodb-table_kinesisstreamspecification.go
new file mode 100644
index 0000000000..4cb827cfc7
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-table_kinesisstreamspecification.go
@@ -0,0 +1,37 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_KinesisStreamSpecification AWS CloudFormation Resource (AWS::DynamoDB::Table.KinesisStreamSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-kinesisstreamspecification.html
+type Table_KinesisStreamSpecification struct {
+
+	// StreamArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-kinesisstreamspecification.html#cfn-dynamodb-kinesisstreamspecification-streamarn
+	StreamArn *types.Value `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 *Table_KinesisStreamSpecification) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::Table.KinesisStreamSpecification"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_localsecondaryindex.go b/goformation/cloudformation/dynamodb/aws-dynamodb-table_localsecondaryindex.go
new file mode 100644
index 0000000000..03028b966e
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-table_localsecondaryindex.go
@@ -0,0 +1,47 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_LocalSecondaryIndex AWS CloudFormation Resource (AWS::DynamoDB::Table.LocalSecondaryIndex)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-lsi.html
+type Table_LocalSecondaryIndex struct {
+
+	// IndexName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-lsi.html#cfn-dynamodb-lsi-indexname
+	IndexName *types.Value `json:"IndexName,omitempty"`
+
+	// KeySchema AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-lsi.html#cfn-dynamodb-lsi-keyschema
+	KeySchema []Table_KeySchema `json:"KeySchema,omitempty"`
+
+	// Projection AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-lsi.html#cfn-dynamodb-lsi-projection
+	Projection *Table_Projection `json:"Projection,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LocalSecondaryIndex) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::Table.LocalSecondaryIndex"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_pointintimerecoveryspecification.go b/goformation/cloudformation/dynamodb/aws-dynamodb-table_pointintimerecoveryspecification.go
new file mode 100644
index 0000000000..b87724f6e0
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-table_pointintimerecoveryspecification.go
@@ -0,0 +1,37 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_PointInTimeRecoverySpecification AWS CloudFormation Resource (AWS::DynamoDB::Table.PointInTimeRecoverySpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-pointintimerecoveryspecification.html
+type Table_PointInTimeRecoverySpecification struct {
+
+	// PointInTimeRecoveryEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-pointintimerecoveryspecification.html#cfn-dynamodb-table-pointintimerecoveryspecification-pointintimerecoveryenabled
+	PointInTimeRecoveryEnabled *types.Value `json:"PointInTimeRecoveryEnabled,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PointInTimeRecoverySpecification) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::Table.PointInTimeRecoverySpecification"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_projection.go b/goformation/cloudformation/dynamodb/aws-dynamodb-table_projection.go
new file mode 100644
index 0000000000..74b955a652
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-table_projection.go
@@ -0,0 +1,42 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_Projection AWS CloudFormation Resource (AWS::DynamoDB::Table.Projection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-projectionobject.html
+type Table_Projection struct {
+
+	// NonKeyAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-projectionobject.html#cfn-dynamodb-projectionobj-nonkeyatt
+	NonKeyAttributes *types.Value `json:"NonKeyAttributes,omitempty"`
+
+	// ProjectionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-projectionobject.html#cfn-dynamodb-projectionobj-projtype
+	ProjectionType *types.Value `json:"ProjectionType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Projection) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::Table.Projection"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_provisionedthroughput.go b/goformation/cloudformation/dynamodb/aws-dynamodb-table_provisionedthroughput.go
new file mode 100644
index 0000000000..f0a2325f7f
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-table_provisionedthroughput.go
@@ -0,0 +1,42 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_ProvisionedThroughput AWS CloudFormation Resource (AWS::DynamoDB::Table.ProvisionedThroughput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-provisionedthroughput.html
+type Table_ProvisionedThroughput struct {
+
+	// ReadCapacityUnits AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-provisionedthroughput.html#cfn-dynamodb-provisionedthroughput-readcapacityunits
+	ReadCapacityUnits *types.Value `json:"ReadCapacityUnits"`
+
+	// WriteCapacityUnits AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-provisionedthroughput.html#cfn-dynamodb-provisionedthroughput-writecapacityunits
+	WriteCapacityUnits *types.Value `json:"WriteCapacityUnits"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ProvisionedThroughput) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::Table.ProvisionedThroughput"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_ssespecification.go b/goformation/cloudformation/dynamodb/aws-dynamodb-table_ssespecification.go
new file mode 100644
index 0000000000..7f5ecf0cc9
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-table_ssespecification.go
@@ -0,0 +1,47 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_SSESpecification AWS CloudFormation Resource (AWS::DynamoDB::Table.SSESpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-ssespecification.html
+type Table_SSESpecification struct {
+
+	// KMSMasterKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-ssespecification.html#cfn-dynamodb-table-ssespecification-kmsmasterkeyid
+	KMSMasterKeyId *types.Value `json:"KMSMasterKeyId,omitempty"`
+
+	// SSEEnabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-ssespecification.html#cfn-dynamodb-table-ssespecification-sseenabled
+	SSEEnabled *types.Value `json:"SSEEnabled"`
+
+	// SSEType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-ssespecification.html#cfn-dynamodb-table-ssespecification-ssetype
+	SSEType *types.Value `json:"SSEType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SSESpecification) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::Table.SSESpecification"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_streamspecification.go b/goformation/cloudformation/dynamodb/aws-dynamodb-table_streamspecification.go
new file mode 100644
index 0000000000..98dabb9a30
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-table_streamspecification.go
@@ -0,0 +1,37 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_StreamSpecification AWS CloudFormation Resource (AWS::DynamoDB::Table.StreamSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-streamspecification.html
+type Table_StreamSpecification struct {
+
+	// StreamViewType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-streamspecification.html#cfn-dynamodb-streamspecification-streamviewtype
+	StreamViewType *types.Value `json:"StreamViewType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_StreamSpecification) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::Table.StreamSpecification"
+}
diff --git a/goformation/cloudformation/dynamodb/aws-dynamodb-table_timetolivespecification.go b/goformation/cloudformation/dynamodb/aws-dynamodb-table_timetolivespecification.go
new file mode 100644
index 0000000000..9342ca0249
--- /dev/null
+++ b/goformation/cloudformation/dynamodb/aws-dynamodb-table_timetolivespecification.go
@@ -0,0 +1,42 @@
+package dynamodb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_TimeToLiveSpecification AWS CloudFormation Resource (AWS::DynamoDB::Table.TimeToLiveSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-timetolivespecification.html
+type Table_TimeToLiveSpecification struct {
+
+	// AttributeName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-timetolivespecification.html#cfn-dynamodb-timetolivespecification-attributename
+	AttributeName *types.Value `json:"AttributeName,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-timetolivespecification.html#cfn-dynamodb-timetolivespecification-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TimeToLiveSpecification) AWSCloudFormationType() string {
+	return "AWS::DynamoDB::Table.TimeToLiveSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-capacityreservation.go b/goformation/cloudformation/ec2/aws-ec2-capacityreservation.go
new file mode 100644
index 0000000000..5b7cff7403
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-capacityreservation.go
@@ -0,0 +1,168 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CapacityReservation AWS CloudFormation Resource (AWS::EC2::CapacityReservation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservation.html
+type CapacityReservation struct {
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservation.html#cfn-ec2-capacityreservation-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// EbsOptimized AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservation.html#cfn-ec2-capacityreservation-ebsoptimized
+	EbsOptimized *types.Value `json:"EbsOptimized,omitempty"`
+
+	// EndDate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservation.html#cfn-ec2-capacityreservation-enddate
+	EndDate *types.Value `json:"EndDate,omitempty"`
+
+	// EndDateType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservation.html#cfn-ec2-capacityreservation-enddatetype
+	EndDateType *types.Value `json:"EndDateType,omitempty"`
+
+	// EphemeralStorage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservation.html#cfn-ec2-capacityreservation-ephemeralstorage
+	EphemeralStorage *types.Value `json:"EphemeralStorage,omitempty"`
+
+	// InstanceCount AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservation.html#cfn-ec2-capacityreservation-instancecount
+	InstanceCount *types.Value `json:"InstanceCount"`
+
+	// InstanceMatchCriteria AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservation.html#cfn-ec2-capacityreservation-instancematchcriteria
+	InstanceMatchCriteria *types.Value `json:"InstanceMatchCriteria,omitempty"`
+
+	// InstancePlatform AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservation.html#cfn-ec2-capacityreservation-instanceplatform
+	InstancePlatform *types.Value `json:"InstancePlatform,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservation.html#cfn-ec2-capacityreservation-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// OutPostArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservation.html#cfn-ec2-capacityreservation-outpostarn
+	OutPostArn *types.Value `json:"OutPostArn,omitempty"`
+
+	// PlacementGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservation.html#cfn-ec2-capacityreservation-placementgrouparn
+	PlacementGroupArn *types.Value `json:"PlacementGroupArn,omitempty"`
+
+	// TagSpecifications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservation.html#cfn-ec2-capacityreservation-tagspecifications
+	TagSpecifications []CapacityReservation_TagSpecification `json:"TagSpecifications,omitempty"`
+
+	// Tenancy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservation.html#cfn-ec2-capacityreservation-tenancy
+	Tenancy *types.Value `json:"Tenancy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CapacityReservation) AWSCloudFormationType() string {
+	return "AWS::EC2::CapacityReservation"
+}
+
+// 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 CapacityReservation) MarshalJSON() ([]byte, error) {
+	type Properties CapacityReservation
+	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 *CapacityReservation) UnmarshalJSON(b []byte) error {
+	type Properties CapacityReservation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CapacityReservation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-capacityreservation_tagspecification.go b/goformation/cloudformation/ec2/aws-ec2-capacityreservation_tagspecification.go
new file mode 100644
index 0000000000..5999d74fd7
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-capacityreservation_tagspecification.go
@@ -0,0 +1,43 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// CapacityReservation_TagSpecification AWS CloudFormation Resource (AWS::EC2::CapacityReservation.TagSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-capacityreservation-tagspecification.html
+type CapacityReservation_TagSpecification struct {
+
+	// ResourceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-capacityreservation-tagspecification.html#cfn-ec2-capacityreservation-tagspecification-resourcetype
+	ResourceType *types.Value `json:"ResourceType,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-capacityreservation-tagspecification.html#cfn-ec2-capacityreservation-tagspecification-tags
+	Tags []cloudformation.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 *CapacityReservation_TagSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::CapacityReservation.TagSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet.go b/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet.go
new file mode 100644
index 0000000000..a98c9c453b
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet.go
@@ -0,0 +1,148 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CapacityReservationFleet AWS CloudFormation Resource (AWS::EC2::CapacityReservationFleet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservationfleet.html
+type CapacityReservationFleet struct {
+
+	// AllocationStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservationfleet.html#cfn-ec2-capacityreservationfleet-allocationstrategy
+	AllocationStrategy *types.Value `json:"AllocationStrategy,omitempty"`
+
+	// EndDate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservationfleet.html#cfn-ec2-capacityreservationfleet-enddate
+	EndDate *types.Value `json:"EndDate,omitempty"`
+
+	// InstanceMatchCriteria AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservationfleet.html#cfn-ec2-capacityreservationfleet-instancematchcriteria
+	InstanceMatchCriteria *types.Value `json:"InstanceMatchCriteria,omitempty"`
+
+	// InstanceTypeSpecifications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservationfleet.html#cfn-ec2-capacityreservationfleet-instancetypespecifications
+	InstanceTypeSpecifications []CapacityReservationFleet_InstanceTypeSpecification `json:"InstanceTypeSpecifications,omitempty"`
+
+	// NoRemoveEndDate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservationfleet.html#cfn-ec2-capacityreservationfleet-noremoveenddate
+	NoRemoveEndDate *types.Value `json:"NoRemoveEndDate,omitempty"`
+
+	// RemoveEndDate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservationfleet.html#cfn-ec2-capacityreservationfleet-removeenddate
+	RemoveEndDate *types.Value `json:"RemoveEndDate,omitempty"`
+
+	// TagSpecifications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservationfleet.html#cfn-ec2-capacityreservationfleet-tagspecifications
+	TagSpecifications []CapacityReservationFleet_TagSpecification `json:"TagSpecifications,omitempty"`
+
+	// Tenancy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservationfleet.html#cfn-ec2-capacityreservationfleet-tenancy
+	Tenancy *types.Value `json:"Tenancy,omitempty"`
+
+	// TotalTargetCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-capacityreservationfleet.html#cfn-ec2-capacityreservationfleet-totaltargetcapacity
+	TotalTargetCapacity *types.Value `json:"TotalTargetCapacity,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CapacityReservationFleet) AWSCloudFormationType() string {
+	return "AWS::EC2::CapacityReservationFleet"
+}
+
+// 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 CapacityReservationFleet) MarshalJSON() ([]byte, error) {
+	type Properties CapacityReservationFleet
+	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 *CapacityReservationFleet) UnmarshalJSON(b []byte) error {
+	type Properties CapacityReservationFleet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CapacityReservationFleet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet_instancetypespecification.go b/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet_instancetypespecification.go
new file mode 100644
index 0000000000..16218214d4
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet_instancetypespecification.go
@@ -0,0 +1,67 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CapacityReservationFleet_InstanceTypeSpecification AWS CloudFormation Resource (AWS::EC2::CapacityReservationFleet.InstanceTypeSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-capacityreservationfleet-instancetypespecification.html
+type CapacityReservationFleet_InstanceTypeSpecification struct {
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-capacityreservationfleet-instancetypespecification.html#cfn-ec2-capacityreservationfleet-instancetypespecification-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// AvailabilityZoneId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-capacityreservationfleet-instancetypespecification.html#cfn-ec2-capacityreservationfleet-instancetypespecification-availabilityzoneid
+	AvailabilityZoneId *types.Value `json:"AvailabilityZoneId,omitempty"`
+
+	// EbsOptimized AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-capacityreservationfleet-instancetypespecification.html#cfn-ec2-capacityreservationfleet-instancetypespecification-ebsoptimized
+	EbsOptimized *types.Value `json:"EbsOptimized,omitempty"`
+
+	// InstancePlatform AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-capacityreservationfleet-instancetypespecification.html#cfn-ec2-capacityreservationfleet-instancetypespecification-instanceplatform
+	InstancePlatform *types.Value `json:"InstancePlatform,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-capacityreservationfleet-instancetypespecification.html#cfn-ec2-capacityreservationfleet-instancetypespecification-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// Priority AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-capacityreservationfleet-instancetypespecification.html#cfn-ec2-capacityreservationfleet-instancetypespecification-priority
+	Priority *types.Value `json:"Priority,omitempty"`
+
+	// Weight AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-capacityreservationfleet-instancetypespecification.html#cfn-ec2-capacityreservationfleet-instancetypespecification-weight
+	Weight *types.Value `json:"Weight,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CapacityReservationFleet_InstanceTypeSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::CapacityReservationFleet.InstanceTypeSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet_tagspecification.go b/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet_tagspecification.go
new file mode 100644
index 0000000000..d5fea1ab8e
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-capacityreservationfleet_tagspecification.go
@@ -0,0 +1,43 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// CapacityReservationFleet_TagSpecification AWS CloudFormation Resource (AWS::EC2::CapacityReservationFleet.TagSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-capacityreservationfleet-tagspecification.html
+type CapacityReservationFleet_TagSpecification struct {
+
+	// ResourceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-capacityreservationfleet-tagspecification.html#cfn-ec2-capacityreservationfleet-tagspecification-resourcetype
+	ResourceType *types.Value `json:"ResourceType,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-capacityreservationfleet-tagspecification.html#cfn-ec2-capacityreservationfleet-tagspecification-tags
+	Tags []cloudformation.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 *CapacityReservationFleet_TagSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::CapacityReservationFleet.TagSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-carriergateway.go b/goformation/cloudformation/ec2/aws-ec2-carriergateway.go
new file mode 100644
index 0000000000..6c2554cad2
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-carriergateway.go
@@ -0,0 +1,114 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// CarrierGateway AWS CloudFormation Resource (AWS::EC2::CarrierGateway)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-carriergateway.html
+type CarrierGateway struct {
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-carriergateway.html#cfn-ec2-carriergateway-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-carriergateway.html#cfn-ec2-carriergateway-vpcid
+	VpcId *types.Value `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 *CarrierGateway) AWSCloudFormationType() string {
+	return "AWS::EC2::CarrierGateway"
+}
+
+// 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 CarrierGateway) MarshalJSON() ([]byte, error) {
+	type Properties CarrierGateway
+	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 *CarrierGateway) UnmarshalJSON(b []byte) error {
+	type Properties CarrierGateway
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CarrierGateway(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-carriergateway_tags.go b/goformation/cloudformation/ec2/aws-ec2-carriergateway_tags.go
new file mode 100644
index 0000000000..9e8e4400c7
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-carriergateway_tags.go
@@ -0,0 +1,36 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// CarrierGateway_Tags AWS CloudFormation Resource (AWS::EC2::CarrierGateway.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-carriergateway-tags.html
+type CarrierGateway_Tags struct {
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-carriergateway-tags.html#cfn-ec2-carriergateway-tags-tags
+	Tags []cloudformation.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 *CarrierGateway_Tags) AWSCloudFormationType() string {
+	return "AWS::EC2::CarrierGateway.Tags"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-clientvpnauthorizationrule.go b/goformation/cloudformation/ec2/aws-ec2-clientvpnauthorizationrule.go
new file mode 100644
index 0000000000..381c707a95
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-clientvpnauthorizationrule.go
@@ -0,0 +1,128 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ClientVpnAuthorizationRule AWS CloudFormation Resource (AWS::EC2::ClientVpnAuthorizationRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnauthorizationrule.html
+type ClientVpnAuthorizationRule struct {
+
+	// AccessGroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnauthorizationrule.html#cfn-ec2-clientvpnauthorizationrule-accessgroupid
+	AccessGroupId *types.Value `json:"AccessGroupId,omitempty"`
+
+	// AuthorizeAllGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnauthorizationrule.html#cfn-ec2-clientvpnauthorizationrule-authorizeallgroups
+	AuthorizeAllGroups *types.Value `json:"AuthorizeAllGroups,omitempty"`
+
+	// ClientVpnEndpointId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnauthorizationrule.html#cfn-ec2-clientvpnauthorizationrule-clientvpnendpointid
+	ClientVpnEndpointId *types.Value `json:"ClientVpnEndpointId,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnauthorizationrule.html#cfn-ec2-clientvpnauthorizationrule-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// TargetNetworkCidr AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnauthorizationrule.html#cfn-ec2-clientvpnauthorizationrule-targetnetworkcidr
+	TargetNetworkCidr *types.Value `json:"TargetNetworkCidr,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ClientVpnAuthorizationRule) AWSCloudFormationType() string {
+	return "AWS::EC2::ClientVpnAuthorizationRule"
+}
+
+// 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 ClientVpnAuthorizationRule) MarshalJSON() ([]byte, error) {
+	type Properties ClientVpnAuthorizationRule
+	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 *ClientVpnAuthorizationRule) UnmarshalJSON(b []byte) error {
+	type Properties ClientVpnAuthorizationRule
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ClientVpnAuthorizationRule(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint.go b/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint.go
new file mode 100644
index 0000000000..e9382efc5b
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint.go
@@ -0,0 +1,173 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ClientVpnEndpoint AWS CloudFormation Resource (AWS::EC2::ClientVpnEndpoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnendpoint.html
+type ClientVpnEndpoint struct {
+
+	// AuthenticationOptions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnendpoint.html#cfn-ec2-clientvpnendpoint-authenticationoptions
+	AuthenticationOptions []ClientVpnEndpoint_ClientAuthenticationRequest `json:"AuthenticationOptions,omitempty"`
+
+	// ClientCidrBlock AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnendpoint.html#cfn-ec2-clientvpnendpoint-clientcidrblock
+	ClientCidrBlock *types.Value `json:"ClientCidrBlock,omitempty"`
+
+	// ClientConnectOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnendpoint.html#cfn-ec2-clientvpnendpoint-clientconnectoptions
+	ClientConnectOptions *ClientVpnEndpoint_ClientConnectOptions `json:"ClientConnectOptions,omitempty"`
+
+	// ConnectionLogOptions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnendpoint.html#cfn-ec2-clientvpnendpoint-connectionlogoptions
+	ConnectionLogOptions *ClientVpnEndpoint_ConnectionLogOptions `json:"ConnectionLogOptions,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnendpoint.html#cfn-ec2-clientvpnendpoint-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DnsServers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnendpoint.html#cfn-ec2-clientvpnendpoint-dnsservers
+	DnsServers *types.Value `json:"DnsServers,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnendpoint.html#cfn-ec2-clientvpnendpoint-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SelfServicePortal AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnendpoint.html#cfn-ec2-clientvpnendpoint-selfserviceportal
+	SelfServicePortal *types.Value `json:"SelfServicePortal,omitempty"`
+
+	// ServerCertificateArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnendpoint.html#cfn-ec2-clientvpnendpoint-servercertificatearn
+	ServerCertificateArn *types.Value `json:"ServerCertificateArn,omitempty"`
+
+	// SplitTunnel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnendpoint.html#cfn-ec2-clientvpnendpoint-splittunnel
+	SplitTunnel *types.Value `json:"SplitTunnel,omitempty"`
+
+	// TagSpecifications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnendpoint.html#cfn-ec2-clientvpnendpoint-tagspecifications
+	TagSpecifications []ClientVpnEndpoint_TagSpecification `json:"TagSpecifications,omitempty"`
+
+	// TransportProtocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnendpoint.html#cfn-ec2-clientvpnendpoint-transportprotocol
+	TransportProtocol *types.Value `json:"TransportProtocol,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnendpoint.html#cfn-ec2-clientvpnendpoint-vpcid
+	VpcId *types.Value `json:"VpcId,omitempty"`
+
+	// VpnPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnendpoint.html#cfn-ec2-clientvpnendpoint-vpnport
+	VpnPort *types.Value `json:"VpnPort,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ClientVpnEndpoint) AWSCloudFormationType() string {
+	return "AWS::EC2::ClientVpnEndpoint"
+}
+
+// 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 ClientVpnEndpoint) MarshalJSON() ([]byte, error) {
+	type Properties ClientVpnEndpoint
+	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 *ClientVpnEndpoint) UnmarshalJSON(b []byte) error {
+	type Properties ClientVpnEndpoint
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ClientVpnEndpoint(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_certificateauthenticationrequest.go b/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_certificateauthenticationrequest.go
new file mode 100644
index 0000000000..6fa532a80c
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_certificateauthenticationrequest.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ClientVpnEndpoint_CertificateAuthenticationRequest AWS CloudFormation Resource (AWS::EC2::ClientVpnEndpoint.CertificateAuthenticationRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-certificateauthenticationrequest.html
+type ClientVpnEndpoint_CertificateAuthenticationRequest struct {
+
+	// ClientRootCertificateChainArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-certificateauthenticationrequest.html#cfn-ec2-clientvpnendpoint-certificateauthenticationrequest-clientrootcertificatechainarn
+	ClientRootCertificateChainArn *types.Value `json:"ClientRootCertificateChainArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ClientVpnEndpoint_CertificateAuthenticationRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::ClientVpnEndpoint.CertificateAuthenticationRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientauthenticationrequest.go b/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientauthenticationrequest.go
new file mode 100644
index 0000000000..b48cb0e2fe
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientauthenticationrequest.go
@@ -0,0 +1,52 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ClientVpnEndpoint_ClientAuthenticationRequest AWS CloudFormation Resource (AWS::EC2::ClientVpnEndpoint.ClientAuthenticationRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-clientauthenticationrequest.html
+type ClientVpnEndpoint_ClientAuthenticationRequest struct {
+
+	// ActiveDirectory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-clientauthenticationrequest.html#cfn-ec2-clientvpnendpoint-clientauthenticationrequest-activedirectory
+	ActiveDirectory *ClientVpnEndpoint_DirectoryServiceAuthenticationRequest `json:"ActiveDirectory,omitempty"`
+
+	// FederatedAuthentication AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-clientauthenticationrequest.html#cfn-ec2-clientvpnendpoint-clientauthenticationrequest-federatedauthentication
+	FederatedAuthentication *ClientVpnEndpoint_FederatedAuthenticationRequest `json:"FederatedAuthentication,omitempty"`
+
+	// MutualAuthentication AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-clientauthenticationrequest.html#cfn-ec2-clientvpnendpoint-clientauthenticationrequest-mutualauthentication
+	MutualAuthentication *ClientVpnEndpoint_CertificateAuthenticationRequest `json:"MutualAuthentication,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-clientauthenticationrequest.html#cfn-ec2-clientvpnendpoint-clientauthenticationrequest-type
+	Type *types.Value `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 *ClientVpnEndpoint_ClientAuthenticationRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::ClientVpnEndpoint.ClientAuthenticationRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientconnectoptions.go b/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientconnectoptions.go
new file mode 100644
index 0000000000..99de3c2011
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_clientconnectoptions.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ClientVpnEndpoint_ClientConnectOptions AWS CloudFormation Resource (AWS::EC2::ClientVpnEndpoint.ClientConnectOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-clientconnectoptions.html
+type ClientVpnEndpoint_ClientConnectOptions struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-clientconnectoptions.html#cfn-ec2-clientvpnendpoint-clientconnectoptions-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// LambdaFunctionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-clientconnectoptions.html#cfn-ec2-clientvpnendpoint-clientconnectoptions-lambdafunctionarn
+	LambdaFunctionArn *types.Value `json:"LambdaFunctionArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ClientVpnEndpoint_ClientConnectOptions) AWSCloudFormationType() string {
+	return "AWS::EC2::ClientVpnEndpoint.ClientConnectOptions"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_connectionlogoptions.go b/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_connectionlogoptions.go
new file mode 100644
index 0000000000..bf92f12c65
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_connectionlogoptions.go
@@ -0,0 +1,47 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ClientVpnEndpoint_ConnectionLogOptions AWS CloudFormation Resource (AWS::EC2::ClientVpnEndpoint.ConnectionLogOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-connectionlogoptions.html
+type ClientVpnEndpoint_ConnectionLogOptions struct {
+
+	// CloudwatchLogGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-connectionlogoptions.html#cfn-ec2-clientvpnendpoint-connectionlogoptions-cloudwatchloggroup
+	CloudwatchLogGroup *types.Value `json:"CloudwatchLogGroup,omitempty"`
+
+	// CloudwatchLogStream AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-connectionlogoptions.html#cfn-ec2-clientvpnendpoint-connectionlogoptions-cloudwatchlogstream
+	CloudwatchLogStream *types.Value `json:"CloudwatchLogStream,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-connectionlogoptions.html#cfn-ec2-clientvpnendpoint-connectionlogoptions-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ClientVpnEndpoint_ConnectionLogOptions) AWSCloudFormationType() string {
+	return "AWS::EC2::ClientVpnEndpoint.ConnectionLogOptions"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_directoryserviceauthenticationrequest.go b/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_directoryserviceauthenticationrequest.go
new file mode 100644
index 0000000000..dee8b9f490
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_directoryserviceauthenticationrequest.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ClientVpnEndpoint_DirectoryServiceAuthenticationRequest AWS CloudFormation Resource (AWS::EC2::ClientVpnEndpoint.DirectoryServiceAuthenticationRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-directoryserviceauthenticationrequest.html
+type ClientVpnEndpoint_DirectoryServiceAuthenticationRequest struct {
+
+	// DirectoryId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-directoryserviceauthenticationrequest.html#cfn-ec2-clientvpnendpoint-directoryserviceauthenticationrequest-directoryid
+	DirectoryId *types.Value `json:"DirectoryId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ClientVpnEndpoint_DirectoryServiceAuthenticationRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::ClientVpnEndpoint.DirectoryServiceAuthenticationRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_federatedauthenticationrequest.go b/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_federatedauthenticationrequest.go
new file mode 100644
index 0000000000..e131a5947a
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_federatedauthenticationrequest.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ClientVpnEndpoint_FederatedAuthenticationRequest AWS CloudFormation Resource (AWS::EC2::ClientVpnEndpoint.FederatedAuthenticationRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-federatedauthenticationrequest.html
+type ClientVpnEndpoint_FederatedAuthenticationRequest struct {
+
+	// SAMLProviderArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-federatedauthenticationrequest.html#cfn-ec2-clientvpnendpoint-federatedauthenticationrequest-samlproviderarn
+	SAMLProviderArn *types.Value `json:"SAMLProviderArn,omitempty"`
+
+	// SelfServiceSAMLProviderArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-federatedauthenticationrequest.html#cfn-ec2-clientvpnendpoint-federatedauthenticationrequest-selfservicesamlproviderarn
+	SelfServiceSAMLProviderArn *types.Value `json:"SelfServiceSAMLProviderArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ClientVpnEndpoint_FederatedAuthenticationRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::ClientVpnEndpoint.FederatedAuthenticationRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_tagspecification.go b/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_tagspecification.go
new file mode 100644
index 0000000000..66444ee61f
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-clientvpnendpoint_tagspecification.go
@@ -0,0 +1,43 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ClientVpnEndpoint_TagSpecification AWS CloudFormation Resource (AWS::EC2::ClientVpnEndpoint.TagSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-tagspecification.html
+type ClientVpnEndpoint_TagSpecification struct {
+
+	// ResourceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-tagspecification.html#cfn-ec2-clientvpnendpoint-tagspecification-resourcetype
+	ResourceType *types.Value `json:"ResourceType,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-clientvpnendpoint-tagspecification.html#cfn-ec2-clientvpnendpoint-tagspecification-tags
+	Tags []cloudformation.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 *ClientVpnEndpoint_TagSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::ClientVpnEndpoint.TagSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-clientvpnroute.go b/goformation/cloudformation/ec2/aws-ec2-clientvpnroute.go
new file mode 100644
index 0000000000..f213969e14
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-clientvpnroute.go
@@ -0,0 +1,123 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ClientVpnRoute AWS CloudFormation Resource (AWS::EC2::ClientVpnRoute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnroute.html
+type ClientVpnRoute struct {
+
+	// ClientVpnEndpointId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnroute.html#cfn-ec2-clientvpnroute-clientvpnendpointid
+	ClientVpnEndpointId *types.Value `json:"ClientVpnEndpointId,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnroute.html#cfn-ec2-clientvpnroute-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DestinationCidrBlock AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnroute.html#cfn-ec2-clientvpnroute-destinationcidrblock
+	DestinationCidrBlock *types.Value `json:"DestinationCidrBlock,omitempty"`
+
+	// TargetVpcSubnetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpnroute.html#cfn-ec2-clientvpnroute-targetvpcsubnetid
+	TargetVpcSubnetId *types.Value `json:"TargetVpcSubnetId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ClientVpnRoute) AWSCloudFormationType() string {
+	return "AWS::EC2::ClientVpnRoute"
+}
+
+// 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 ClientVpnRoute) MarshalJSON() ([]byte, error) {
+	type Properties ClientVpnRoute
+	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 *ClientVpnRoute) UnmarshalJSON(b []byte) error {
+	type Properties ClientVpnRoute
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ClientVpnRoute(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-clientvpntargetnetworkassociation.go b/goformation/cloudformation/ec2/aws-ec2-clientvpntargetnetworkassociation.go
new file mode 100644
index 0000000000..6162a6a42e
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-clientvpntargetnetworkassociation.go
@@ -0,0 +1,113 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ClientVpnTargetNetworkAssociation AWS CloudFormation Resource (AWS::EC2::ClientVpnTargetNetworkAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpntargetnetworkassociation.html
+type ClientVpnTargetNetworkAssociation struct {
+
+	// ClientVpnEndpointId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpntargetnetworkassociation.html#cfn-ec2-clientvpntargetnetworkassociation-clientvpnendpointid
+	ClientVpnEndpointId *types.Value `json:"ClientVpnEndpointId,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-clientvpntargetnetworkassociation.html#cfn-ec2-clientvpntargetnetworkassociation-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ClientVpnTargetNetworkAssociation) AWSCloudFormationType() string {
+	return "AWS::EC2::ClientVpnTargetNetworkAssociation"
+}
+
+// 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 ClientVpnTargetNetworkAssociation) MarshalJSON() ([]byte, error) {
+	type Properties ClientVpnTargetNetworkAssociation
+	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 *ClientVpnTargetNetworkAssociation) UnmarshalJSON(b []byte) error {
+	type Properties ClientVpnTargetNetworkAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ClientVpnTargetNetworkAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-customergateway.go b/goformation/cloudformation/ec2/aws-ec2-customergateway.go
new file mode 100644
index 0000000000..4c1af857da
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-customergateway.go
@@ -0,0 +1,124 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// CustomerGateway AWS CloudFormation Resource (AWS::EC2::CustomerGateway)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-customer-gateway.html
+type CustomerGateway struct {
+
+	// BgpAsn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-customer-gateway.html#cfn-ec2-customergateway-bgpasn
+	BgpAsn *types.Value `json:"BgpAsn"`
+
+	// IpAddress AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-customer-gateway.html#cfn-ec2-customergateway-ipaddress
+	IpAddress *types.Value `json:"IpAddress,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-customer-gateway.html#cfn-ec2-customergateway-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-customer-gateway.html#cfn-ec2-customergateway-type
+	Type *types.Value `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 *CustomerGateway) AWSCloudFormationType() string {
+	return "AWS::EC2::CustomerGateway"
+}
+
+// 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 CustomerGateway) MarshalJSON() ([]byte, error) {
+	type Properties CustomerGateway
+	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 *CustomerGateway) UnmarshalJSON(b []byte) error {
+	type Properties CustomerGateway
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CustomerGateway(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-dhcpoptions.go b/goformation/cloudformation/ec2/aws-ec2-dhcpoptions.go
new file mode 100644
index 0000000000..e8fbe4bdf5
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-dhcpoptions.go
@@ -0,0 +1,134 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DHCPOptions AWS CloudFormation Resource (AWS::EC2::DHCPOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-dhcpoptions.html
+type DHCPOptions struct {
+
+	// DomainName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-dhcpoptions.html#cfn-ec2-dhcpoptions-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// DomainNameServers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-dhcpoptions.html#cfn-ec2-dhcpoptions-domainnameservers
+	DomainNameServers *types.Value `json:"DomainNameServers,omitempty"`
+
+	// NetbiosNameServers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-dhcpoptions.html#cfn-ec2-dhcpoptions-netbiosnameservers
+	NetbiosNameServers *types.Value `json:"NetbiosNameServers,omitempty"`
+
+	// NetbiosNodeType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-dhcpoptions.html#cfn-ec2-dhcpoptions-netbiosnodetype
+	NetbiosNodeType *types.Value `json:"NetbiosNodeType,omitempty"`
+
+	// NtpServers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-dhcpoptions.html#cfn-ec2-dhcpoptions-ntpservers
+	NtpServers *types.Value `json:"NtpServers,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-dhcpoptions.html#cfn-ec2-dhcpoptions-tags
+	Tags []cloudformation.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 *DHCPOptions) AWSCloudFormationType() string {
+	return "AWS::EC2::DHCPOptions"
+}
+
+// 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 DHCPOptions) MarshalJSON() ([]byte, error) {
+	type Properties DHCPOptions
+	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 *DHCPOptions) UnmarshalJSON(b []byte) error {
+	type Properties DHCPOptions
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DHCPOptions(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-ec2fleet.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet.go
new file mode 100644
index 0000000000..e1f94cf9e1
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet.go
@@ -0,0 +1,163 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet AWS CloudFormation Resource (AWS::EC2::EC2Fleet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ec2fleet.html
+type EC2Fleet struct {
+
+	// Context AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ec2fleet.html#cfn-ec2-ec2fleet-context
+	Context *types.Value `json:"Context,omitempty"`
+
+	// ExcessCapacityTerminationPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ec2fleet.html#cfn-ec2-ec2fleet-excesscapacityterminationpolicy
+	ExcessCapacityTerminationPolicy *types.Value `json:"ExcessCapacityTerminationPolicy,omitempty"`
+
+	// LaunchTemplateConfigs AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ec2fleet.html#cfn-ec2-ec2fleet-launchtemplateconfigs
+	LaunchTemplateConfigs []EC2Fleet_FleetLaunchTemplateConfigRequest `json:"LaunchTemplateConfigs,omitempty"`
+
+	// OnDemandOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ec2fleet.html#cfn-ec2-ec2fleet-ondemandoptions
+	OnDemandOptions *EC2Fleet_OnDemandOptionsRequest `json:"OnDemandOptions,omitempty"`
+
+	// ReplaceUnhealthyInstances AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ec2fleet.html#cfn-ec2-ec2fleet-replaceunhealthyinstances
+	ReplaceUnhealthyInstances *types.Value `json:"ReplaceUnhealthyInstances,omitempty"`
+
+	// SpotOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ec2fleet.html#cfn-ec2-ec2fleet-spotoptions
+	SpotOptions *EC2Fleet_SpotOptionsRequest `json:"SpotOptions,omitempty"`
+
+	// TagSpecifications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ec2fleet.html#cfn-ec2-ec2fleet-tagspecifications
+	TagSpecifications []EC2Fleet_TagSpecification `json:"TagSpecifications,omitempty"`
+
+	// TargetCapacitySpecification AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ec2fleet.html#cfn-ec2-ec2fleet-targetcapacityspecification
+	TargetCapacitySpecification *EC2Fleet_TargetCapacitySpecificationRequest `json:"TargetCapacitySpecification,omitempty"`
+
+	// TerminateInstancesWithExpiration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ec2fleet.html#cfn-ec2-ec2fleet-terminateinstanceswithexpiration
+	TerminateInstancesWithExpiration *types.Value `json:"TerminateInstancesWithExpiration,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ec2fleet.html#cfn-ec2-ec2fleet-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// ValidFrom AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ec2fleet.html#cfn-ec2-ec2fleet-validfrom
+	ValidFrom *types.Value `json:"ValidFrom,omitempty"`
+
+	// ValidUntil AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ec2fleet.html#cfn-ec2-ec2fleet-validuntil
+	ValidUntil *types.Value `json:"ValidUntil,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EC2Fleet) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet"
+}
+
+// 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 EC2Fleet) MarshalJSON() ([]byte, error) {
+	type Properties EC2Fleet
+	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 *EC2Fleet) UnmarshalJSON(b []byte) error {
+	type Properties EC2Fleet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = EC2Fleet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-ec2fleet_acceleratorcountrequest.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_acceleratorcountrequest.go
new file mode 100644
index 0000000000..4883de04a3
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_acceleratorcountrequest.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet_AcceleratorCountRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.AcceleratorCountRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-acceleratorcountrequest.html
+type EC2Fleet_AcceleratorCountRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-acceleratorcountrequest.html#cfn-ec2-ec2fleet-acceleratorcountrequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-acceleratorcountrequest.html#cfn-ec2-ec2fleet-acceleratorcountrequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EC2Fleet_AcceleratorCountRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet.AcceleratorCountRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_acceleratortotalmemorymibrequest.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_acceleratortotalmemorymibrequest.go
new file mode 100644
index 0000000000..30e68daf68
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_acceleratortotalmemorymibrequest.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet_AcceleratorTotalMemoryMiBRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.AcceleratorTotalMemoryMiBRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-acceleratortotalmemorymibrequest.html
+type EC2Fleet_AcceleratorTotalMemoryMiBRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-acceleratortotalmemorymibrequest.html#cfn-ec2-ec2fleet-acceleratortotalmemorymibrequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-acceleratortotalmemorymibrequest.html#cfn-ec2-ec2fleet-acceleratortotalmemorymibrequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EC2Fleet_AcceleratorTotalMemoryMiBRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet.AcceleratorTotalMemoryMiBRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_baselineebsbandwidthmbpsrequest.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_baselineebsbandwidthmbpsrequest.go
new file mode 100644
index 0000000000..4d821b104f
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_baselineebsbandwidthmbpsrequest.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet_BaselineEbsBandwidthMbpsRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.BaselineEbsBandwidthMbpsRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-baselineebsbandwidthmbpsrequest.html
+type EC2Fleet_BaselineEbsBandwidthMbpsRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-baselineebsbandwidthmbpsrequest.html#cfn-ec2-ec2fleet-baselineebsbandwidthmbpsrequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-baselineebsbandwidthmbpsrequest.html#cfn-ec2-ec2fleet-baselineebsbandwidthmbpsrequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EC2Fleet_BaselineEbsBandwidthMbpsRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet.BaselineEbsBandwidthMbpsRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_capacityrebalance.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_capacityrebalance.go
new file mode 100644
index 0000000000..59758ed84a
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_capacityrebalance.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet_CapacityRebalance AWS CloudFormation Resource (AWS::EC2::EC2Fleet.CapacityRebalance)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-capacityrebalance.html
+type EC2Fleet_CapacityRebalance struct {
+
+	// ReplacementStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-capacityrebalance.html#cfn-ec2-ec2fleet-capacityrebalance-replacementstrategy
+	ReplacementStrategy *types.Value `json:"ReplacementStrategy,omitempty"`
+
+	// TerminationDelay AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-capacityrebalance.html#cfn-ec2-ec2fleet-capacityrebalance-terminationdelay
+	TerminationDelay *types.Value `json:"TerminationDelay,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EC2Fleet_CapacityRebalance) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet.CapacityRebalance"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_capacityreservationoptionsrequest.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_capacityreservationoptionsrequest.go
new file mode 100644
index 0000000000..07e1b1d16d
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_capacityreservationoptionsrequest.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet_CapacityReservationOptionsRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.CapacityReservationOptionsRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-capacityreservationoptionsrequest.html
+type EC2Fleet_CapacityReservationOptionsRequest struct {
+
+	// UsageStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-capacityreservationoptionsrequest.html#cfn-ec2-ec2fleet-capacityreservationoptionsrequest-usagestrategy
+	UsageStrategy *types.Value `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 *EC2Fleet_CapacityReservationOptionsRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet.CapacityReservationOptionsRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateconfigrequest.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateconfigrequest.go
new file mode 100644
index 0000000000..df41917f4b
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateconfigrequest.go
@@ -0,0 +1,40 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet_FleetLaunchTemplateConfigRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.FleetLaunchTemplateConfigRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-fleetlaunchtemplateconfigrequest.html
+type EC2Fleet_FleetLaunchTemplateConfigRequest struct {
+
+	// LaunchTemplateSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-fleetlaunchtemplateconfigrequest.html#cfn-ec2-ec2fleet-fleetlaunchtemplateconfigrequest-launchtemplatespecification
+	LaunchTemplateSpecification *EC2Fleet_FleetLaunchTemplateSpecificationRequest `json:"LaunchTemplateSpecification,omitempty"`
+
+	// Overrides AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-fleetlaunchtemplateconfigrequest.html#cfn-ec2-ec2fleet-fleetlaunchtemplateconfigrequest-overrides
+	Overrides []EC2Fleet_FleetLaunchTemplateOverridesRequest `json:"Overrides,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EC2Fleet_FleetLaunchTemplateConfigRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet.FleetLaunchTemplateConfigRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateoverridesrequest.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateoverridesrequest.go
new file mode 100644
index 0000000000..53ebc986b7
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplateoverridesrequest.go
@@ -0,0 +1,72 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet_FleetLaunchTemplateOverridesRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.FleetLaunchTemplateOverridesRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-fleetlaunchtemplateoverridesrequest.html
+type EC2Fleet_FleetLaunchTemplateOverridesRequest struct {
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-fleetlaunchtemplateoverridesrequest.html#cfn-ec2-ec2fleet-fleetlaunchtemplateoverridesrequest-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// InstanceRequirements AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-fleetlaunchtemplateoverridesrequest.html#cfn-ec2-ec2fleet-fleetlaunchtemplateoverridesrequest-instancerequirements
+	InstanceRequirements *EC2Fleet_InstanceRequirementsRequest `json:"InstanceRequirements,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-fleetlaunchtemplateoverridesrequest.html#cfn-ec2-ec2fleet-fleetlaunchtemplateoverridesrequest-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// MaxPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-fleetlaunchtemplateoverridesrequest.html#cfn-ec2-ec2fleet-fleetlaunchtemplateoverridesrequest-maxprice
+	MaxPrice *types.Value `json:"MaxPrice,omitempty"`
+
+	// Placement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-fleetlaunchtemplateoverridesrequest.html#cfn-ec2-ec2fleet-fleetlaunchtemplateoverridesrequest-placement
+	Placement *EC2Fleet_Placement `json:"Placement,omitempty"`
+
+	// Priority AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-fleetlaunchtemplateoverridesrequest.html#cfn-ec2-ec2fleet-fleetlaunchtemplateoverridesrequest-priority
+	Priority *types.Value `json:"Priority,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-fleetlaunchtemplateoverridesrequest.html#cfn-ec2-ec2fleet-fleetlaunchtemplateoverridesrequest-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// WeightedCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-fleetlaunchtemplateoverridesrequest.html#cfn-ec2-ec2fleet-fleetlaunchtemplateoverridesrequest-weightedcapacity
+	WeightedCapacity *types.Value `json:"WeightedCapacity,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EC2Fleet_FleetLaunchTemplateOverridesRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet.FleetLaunchTemplateOverridesRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplatespecificationrequest.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplatespecificationrequest.go
new file mode 100644
index 0000000000..8ee29a5439
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_fleetlaunchtemplatespecificationrequest.go
@@ -0,0 +1,47 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet_FleetLaunchTemplateSpecificationRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.FleetLaunchTemplateSpecificationRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-fleetlaunchtemplatespecificationrequest.html
+type EC2Fleet_FleetLaunchTemplateSpecificationRequest struct {
+
+	// LaunchTemplateId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-fleetlaunchtemplatespecificationrequest.html#cfn-ec2-ec2fleet-fleetlaunchtemplatespecificationrequest-launchtemplateid
+	LaunchTemplateId *types.Value `json:"LaunchTemplateId,omitempty"`
+
+	// LaunchTemplateName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-fleetlaunchtemplatespecificationrequest.html#cfn-ec2-ec2fleet-fleetlaunchtemplatespecificationrequest-launchtemplatename
+	LaunchTemplateName *types.Value `json:"LaunchTemplateName,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-fleetlaunchtemplatespecificationrequest.html#cfn-ec2-ec2fleet-fleetlaunchtemplatespecificationrequest-version
+	Version *types.Value `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 *EC2Fleet_FleetLaunchTemplateSpecificationRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet.FleetLaunchTemplateSpecificationRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_instancerequirementsrequest.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_instancerequirementsrequest.go
new file mode 100644
index 0000000000..0a0ca62a80
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_instancerequirementsrequest.go
@@ -0,0 +1,137 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet_InstanceRequirementsRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.InstanceRequirementsRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html
+type EC2Fleet_InstanceRequirementsRequest struct {
+
+	// AcceleratorCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-acceleratorcount
+	AcceleratorCount *EC2Fleet_AcceleratorCountRequest `json:"AcceleratorCount,omitempty"`
+
+	// AcceleratorManufacturers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-acceleratormanufacturers
+	AcceleratorManufacturers *types.Value `json:"AcceleratorManufacturers,omitempty"`
+
+	// AcceleratorNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-acceleratornames
+	AcceleratorNames *types.Value `json:"AcceleratorNames,omitempty"`
+
+	// AcceleratorTotalMemoryMiB AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-acceleratortotalmemorymib
+	AcceleratorTotalMemoryMiB *EC2Fleet_AcceleratorTotalMemoryMiBRequest `json:"AcceleratorTotalMemoryMiB,omitempty"`
+
+	// AcceleratorTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-acceleratortypes
+	AcceleratorTypes *types.Value `json:"AcceleratorTypes,omitempty"`
+
+	// BareMetal AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-baremetal
+	BareMetal *types.Value `json:"BareMetal,omitempty"`
+
+	// BaselineEbsBandwidthMbps AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-baselineebsbandwidthmbps
+	BaselineEbsBandwidthMbps *EC2Fleet_BaselineEbsBandwidthMbpsRequest `json:"BaselineEbsBandwidthMbps,omitempty"`
+
+	// BurstablePerformance AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-burstableperformance
+	BurstablePerformance *types.Value `json:"BurstablePerformance,omitempty"`
+
+	// CpuManufacturers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-cpumanufacturers
+	CpuManufacturers *types.Value `json:"CpuManufacturers,omitempty"`
+
+	// ExcludedInstanceTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-excludedinstancetypes
+	ExcludedInstanceTypes *types.Value `json:"ExcludedInstanceTypes,omitempty"`
+
+	// InstanceGenerations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-instancegenerations
+	InstanceGenerations *types.Value `json:"InstanceGenerations,omitempty"`
+
+	// LocalStorage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-localstorage
+	LocalStorage *types.Value `json:"LocalStorage,omitempty"`
+
+	// LocalStorageTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-localstoragetypes
+	LocalStorageTypes *types.Value `json:"LocalStorageTypes,omitempty"`
+
+	// MemoryGiBPerVCpu AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-memorygibpervcpu
+	MemoryGiBPerVCpu *EC2Fleet_MemoryGiBPerVCpuRequest `json:"MemoryGiBPerVCpu,omitempty"`
+
+	// MemoryMiB AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-memorymib
+	MemoryMiB *EC2Fleet_MemoryMiBRequest `json:"MemoryMiB,omitempty"`
+
+	// NetworkInterfaceCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-networkinterfacecount
+	NetworkInterfaceCount *EC2Fleet_NetworkInterfaceCountRequest `json:"NetworkInterfaceCount,omitempty"`
+
+	// OnDemandMaxPricePercentageOverLowestPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-ondemandmaxpricepercentageoverlowestprice
+	OnDemandMaxPricePercentageOverLowestPrice *types.Value `json:"OnDemandMaxPricePercentageOverLowestPrice,omitempty"`
+
+	// RequireHibernateSupport AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-requirehibernatesupport
+	RequireHibernateSupport *types.Value `json:"RequireHibernateSupport,omitempty"`
+
+	// SpotMaxPricePercentageOverLowestPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-spotmaxpricepercentageoverlowestprice
+	SpotMaxPricePercentageOverLowestPrice *types.Value `json:"SpotMaxPricePercentageOverLowestPrice,omitempty"`
+
+	// TotalLocalStorageGB AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-totallocalstoragegb
+	TotalLocalStorageGB *EC2Fleet_TotalLocalStorageGBRequest `json:"TotalLocalStorageGB,omitempty"`
+
+	// VCpuCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-instancerequirementsrequest.html#cfn-ec2-ec2fleet-instancerequirementsrequest-vcpucount
+	VCpuCount *EC2Fleet_VCpuCountRangeRequest `json:"VCpuCount,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EC2Fleet_InstanceRequirementsRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet.InstanceRequirementsRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_maintenancestrategies.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_maintenancestrategies.go
new file mode 100644
index 0000000000..076bba1500
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_maintenancestrategies.go
@@ -0,0 +1,35 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet_MaintenanceStrategies AWS CloudFormation Resource (AWS::EC2::EC2Fleet.MaintenanceStrategies)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-maintenancestrategies.html
+type EC2Fleet_MaintenanceStrategies struct {
+
+	// CapacityRebalance AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-maintenancestrategies.html#cfn-ec2-ec2fleet-maintenancestrategies-capacityrebalance
+	CapacityRebalance *EC2Fleet_CapacityRebalance `json:"CapacityRebalance,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EC2Fleet_MaintenanceStrategies) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet.MaintenanceStrategies"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_memorygibpervcpurequest.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_memorygibpervcpurequest.go
new file mode 100644
index 0000000000..54cff3effb
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_memorygibpervcpurequest.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet_MemoryGiBPerVCpuRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.MemoryGiBPerVCpuRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-memorygibpervcpurequest.html
+type EC2Fleet_MemoryGiBPerVCpuRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-memorygibpervcpurequest.html#cfn-ec2-ec2fleet-memorygibpervcpurequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-memorygibpervcpurequest.html#cfn-ec2-ec2fleet-memorygibpervcpurequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EC2Fleet_MemoryGiBPerVCpuRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet.MemoryGiBPerVCpuRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_memorymibrequest.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_memorymibrequest.go
new file mode 100644
index 0000000000..8ae6d5d91d
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_memorymibrequest.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet_MemoryMiBRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.MemoryMiBRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-memorymibrequest.html
+type EC2Fleet_MemoryMiBRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-memorymibrequest.html#cfn-ec2-ec2fleet-memorymibrequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-memorymibrequest.html#cfn-ec2-ec2fleet-memorymibrequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EC2Fleet_MemoryMiBRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet.MemoryMiBRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_networkinterfacecountrequest.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_networkinterfacecountrequest.go
new file mode 100644
index 0000000000..e20ffe9c21
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_networkinterfacecountrequest.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet_NetworkInterfaceCountRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.NetworkInterfaceCountRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-networkinterfacecountrequest.html
+type EC2Fleet_NetworkInterfaceCountRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-networkinterfacecountrequest.html#cfn-ec2-ec2fleet-networkinterfacecountrequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-networkinterfacecountrequest.html#cfn-ec2-ec2fleet-networkinterfacecountrequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EC2Fleet_NetworkInterfaceCountRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet.NetworkInterfaceCountRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_ondemandoptionsrequest.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_ondemandoptionsrequest.go
new file mode 100644
index 0000000000..43344e01fc
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_ondemandoptionsrequest.go
@@ -0,0 +1,62 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet_OnDemandOptionsRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.OnDemandOptionsRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-ondemandoptionsrequest.html
+type EC2Fleet_OnDemandOptionsRequest struct {
+
+	// AllocationStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-ondemandoptionsrequest.html#cfn-ec2-ec2fleet-ondemandoptionsrequest-allocationstrategy
+	AllocationStrategy *types.Value `json:"AllocationStrategy,omitempty"`
+
+	// CapacityReservationOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-ondemandoptionsrequest.html#cfn-ec2-ec2fleet-ondemandoptionsrequest-capacityreservationoptions
+	CapacityReservationOptions *EC2Fleet_CapacityReservationOptionsRequest `json:"CapacityReservationOptions,omitempty"`
+
+	// MaxTotalPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-ondemandoptionsrequest.html#cfn-ec2-ec2fleet-ondemandoptionsrequest-maxtotalprice
+	MaxTotalPrice *types.Value `json:"MaxTotalPrice,omitempty"`
+
+	// MinTargetCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-ondemandoptionsrequest.html#cfn-ec2-ec2fleet-ondemandoptionsrequest-mintargetcapacity
+	MinTargetCapacity *types.Value `json:"MinTargetCapacity,omitempty"`
+
+	// SingleAvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-ondemandoptionsrequest.html#cfn-ec2-ec2fleet-ondemandoptionsrequest-singleavailabilityzone
+	SingleAvailabilityZone *types.Value `json:"SingleAvailabilityZone,omitempty"`
+
+	// SingleInstanceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-ondemandoptionsrequest.html#cfn-ec2-ec2fleet-ondemandoptionsrequest-singleinstancetype
+	SingleInstanceType *types.Value `json:"SingleInstanceType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EC2Fleet_OnDemandOptionsRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet.OnDemandOptionsRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_placement.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_placement.go
new file mode 100644
index 0000000000..fb9fda5088
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_placement.go
@@ -0,0 +1,72 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet_Placement AWS CloudFormation Resource (AWS::EC2::EC2Fleet.Placement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-placement.html
+type EC2Fleet_Placement struct {
+
+	// Affinity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-placement.html#cfn-ec2-ec2fleet-placement-affinity
+	Affinity *types.Value `json:"Affinity,omitempty"`
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-placement.html#cfn-ec2-ec2fleet-placement-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// GroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-placement.html#cfn-ec2-ec2fleet-placement-groupname
+	GroupName *types.Value `json:"GroupName,omitempty"`
+
+	// HostId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-placement.html#cfn-ec2-ec2fleet-placement-hostid
+	HostId *types.Value `json:"HostId,omitempty"`
+
+	// HostResourceGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-placement.html#cfn-ec2-ec2fleet-placement-hostresourcegrouparn
+	HostResourceGroupArn *types.Value `json:"HostResourceGroupArn,omitempty"`
+
+	// PartitionNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-placement.html#cfn-ec2-ec2fleet-placement-partitionnumber
+	PartitionNumber *types.Value `json:"PartitionNumber,omitempty"`
+
+	// SpreadDomain AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-placement.html#cfn-ec2-ec2fleet-placement-spreaddomain
+	SpreadDomain *types.Value `json:"SpreadDomain,omitempty"`
+
+	// Tenancy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-placement.html#cfn-ec2-ec2fleet-placement-tenancy
+	Tenancy *types.Value `json:"Tenancy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EC2Fleet_Placement) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet.Placement"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_spotoptionsrequest.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_spotoptionsrequest.go
new file mode 100644
index 0000000000..1f31debfa6
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_spotoptionsrequest.go
@@ -0,0 +1,72 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet_SpotOptionsRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.SpotOptionsRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-spotoptionsrequest.html
+type EC2Fleet_SpotOptionsRequest struct {
+
+	// AllocationStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-spotoptionsrequest.html#cfn-ec2-ec2fleet-spotoptionsrequest-allocationstrategy
+	AllocationStrategy *types.Value `json:"AllocationStrategy,omitempty"`
+
+	// InstanceInterruptionBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-spotoptionsrequest.html#cfn-ec2-ec2fleet-spotoptionsrequest-instanceinterruptionbehavior
+	InstanceInterruptionBehavior *types.Value `json:"InstanceInterruptionBehavior,omitempty"`
+
+	// InstancePoolsToUseCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-spotoptionsrequest.html#cfn-ec2-ec2fleet-spotoptionsrequest-instancepoolstousecount
+	InstancePoolsToUseCount *types.Value `json:"InstancePoolsToUseCount,omitempty"`
+
+	// MaintenanceStrategies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-spotoptionsrequest.html#cfn-ec2-ec2fleet-spotoptionsrequest-maintenancestrategies
+	MaintenanceStrategies *EC2Fleet_MaintenanceStrategies `json:"MaintenanceStrategies,omitempty"`
+
+	// MaxTotalPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-spotoptionsrequest.html#cfn-ec2-ec2fleet-spotoptionsrequest-maxtotalprice
+	MaxTotalPrice *types.Value `json:"MaxTotalPrice,omitempty"`
+
+	// MinTargetCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-spotoptionsrequest.html#cfn-ec2-ec2fleet-spotoptionsrequest-mintargetcapacity
+	MinTargetCapacity *types.Value `json:"MinTargetCapacity,omitempty"`
+
+	// SingleAvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-spotoptionsrequest.html#cfn-ec2-ec2fleet-spotoptionsrequest-singleavailabilityzone
+	SingleAvailabilityZone *types.Value `json:"SingleAvailabilityZone,omitempty"`
+
+	// SingleInstanceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-spotoptionsrequest.html#cfn-ec2-ec2fleet-spotoptionsrequest-singleinstancetype
+	SingleInstanceType *types.Value `json:"SingleInstanceType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EC2Fleet_SpotOptionsRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet.SpotOptionsRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_tagspecification.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_tagspecification.go
new file mode 100644
index 0000000000..e10ce49458
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_tagspecification.go
@@ -0,0 +1,43 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet_TagSpecification AWS CloudFormation Resource (AWS::EC2::EC2Fleet.TagSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-tagspecification.html
+type EC2Fleet_TagSpecification struct {
+
+	// ResourceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-tagspecification.html#cfn-ec2-ec2fleet-tagspecification-resourcetype
+	ResourceType *types.Value `json:"ResourceType,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-tagspecification.html#cfn-ec2-ec2fleet-tagspecification-tags
+	Tags []cloudformation.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 *EC2Fleet_TagSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet.TagSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_targetcapacityspecificationrequest.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_targetcapacityspecificationrequest.go
new file mode 100644
index 0000000000..cc6e8871d2
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_targetcapacityspecificationrequest.go
@@ -0,0 +1,57 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet_TargetCapacitySpecificationRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.TargetCapacitySpecificationRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-targetcapacityspecificationrequest.html
+type EC2Fleet_TargetCapacitySpecificationRequest struct {
+
+	// DefaultTargetCapacityType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-targetcapacityspecificationrequest.html#cfn-ec2-ec2fleet-targetcapacityspecificationrequest-defaulttargetcapacitytype
+	DefaultTargetCapacityType *types.Value `json:"DefaultTargetCapacityType,omitempty"`
+
+	// OnDemandTargetCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-targetcapacityspecificationrequest.html#cfn-ec2-ec2fleet-targetcapacityspecificationrequest-ondemandtargetcapacity
+	OnDemandTargetCapacity *types.Value `json:"OnDemandTargetCapacity,omitempty"`
+
+	// SpotTargetCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-targetcapacityspecificationrequest.html#cfn-ec2-ec2fleet-targetcapacityspecificationrequest-spottargetcapacity
+	SpotTargetCapacity *types.Value `json:"SpotTargetCapacity,omitempty"`
+
+	// TargetCapacityUnitType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-targetcapacityspecificationrequest.html#cfn-ec2-ec2fleet-targetcapacityspecificationrequest-targetcapacityunittype
+	TargetCapacityUnitType *types.Value `json:"TargetCapacityUnitType,omitempty"`
+
+	// TotalTargetCapacity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-targetcapacityspecificationrequest.html#cfn-ec2-ec2fleet-targetcapacityspecificationrequest-totaltargetcapacity
+	TotalTargetCapacity *types.Value `json:"TotalTargetCapacity"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EC2Fleet_TargetCapacitySpecificationRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet.TargetCapacitySpecificationRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_totallocalstoragegbrequest.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_totallocalstoragegbrequest.go
new file mode 100644
index 0000000000..2534c2a9d7
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_totallocalstoragegbrequest.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet_TotalLocalStorageGBRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.TotalLocalStorageGBRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-totallocalstoragegbrequest.html
+type EC2Fleet_TotalLocalStorageGBRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-totallocalstoragegbrequest.html#cfn-ec2-ec2fleet-totallocalstoragegbrequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-totallocalstoragegbrequest.html#cfn-ec2-ec2fleet-totallocalstoragegbrequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EC2Fleet_TotalLocalStorageGBRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet.TotalLocalStorageGBRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ec2fleet_vcpucountrangerequest.go b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_vcpucountrangerequest.go
new file mode 100644
index 0000000000..d6255743d2
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ec2fleet_vcpucountrangerequest.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EC2Fleet_VCpuCountRangeRequest AWS CloudFormation Resource (AWS::EC2::EC2Fleet.VCpuCountRangeRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-vcpucountrangerequest.html
+type EC2Fleet_VCpuCountRangeRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-vcpucountrangerequest.html#cfn-ec2-ec2fleet-vcpucountrangerequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ec2fleet-vcpucountrangerequest.html#cfn-ec2-ec2fleet-vcpucountrangerequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EC2Fleet_VCpuCountRangeRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::EC2Fleet.VCpuCountRangeRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-egressonlyinternetgateway.go b/goformation/cloudformation/ec2/aws-ec2-egressonlyinternetgateway.go
new file mode 100644
index 0000000000..f45a1a3b3a
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-egressonlyinternetgateway.go
@@ -0,0 +1,108 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EgressOnlyInternetGateway AWS CloudFormation Resource (AWS::EC2::EgressOnlyInternetGateway)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-egressonlyinternetgateway.html
+type EgressOnlyInternetGateway struct {
+
+	// VpcId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-egressonlyinternetgateway.html#cfn-ec2-egressonlyinternetgateway-vpcid
+	VpcId *types.Value `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 *EgressOnlyInternetGateway) AWSCloudFormationType() string {
+	return "AWS::EC2::EgressOnlyInternetGateway"
+}
+
+// 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 EgressOnlyInternetGateway) MarshalJSON() ([]byte, error) {
+	type Properties EgressOnlyInternetGateway
+	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 *EgressOnlyInternetGateway) UnmarshalJSON(b []byte) error {
+	type Properties EgressOnlyInternetGateway
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = EgressOnlyInternetGateway(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-eip.go b/goformation/cloudformation/ec2/aws-ec2-eip.go
new file mode 100644
index 0000000000..b50f91d75f
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-eip.go
@@ -0,0 +1,124 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// EIP AWS CloudFormation Resource (AWS::EC2::EIP)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip.html
+type EIP struct {
+
+	// Domain AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip.html#cfn-ec2-eip-domain
+	Domain *types.Value `json:"Domain,omitempty"`
+
+	// InstanceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip.html#cfn-ec2-eip-instanceid
+	InstanceId *types.Value `json:"InstanceId,omitempty"`
+
+	// PublicIpv4Pool AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip.html#cfn-ec2-eip-publicipv4pool
+	PublicIpv4Pool *types.Value `json:"PublicIpv4Pool,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip.html#cfn-ec2-eip-tags
+	Tags []cloudformation.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 *EIP) AWSCloudFormationType() string {
+	return "AWS::EC2::EIP"
+}
+
+// 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 EIP) MarshalJSON() ([]byte, error) {
+	type Properties EIP
+	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 *EIP) UnmarshalJSON(b []byte) error {
+	type Properties EIP
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = EIP(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-eipassociation.go b/goformation/cloudformation/ec2/aws-ec2-eipassociation.go
new file mode 100644
index 0000000000..6f6b5c1788
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-eipassociation.go
@@ -0,0 +1,128 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EIPAssociation AWS CloudFormation Resource (AWS::EC2::EIPAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip-association.html
+type EIPAssociation struct {
+
+	// AllocationId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip-association.html#cfn-ec2-eipassociation-allocationid
+	AllocationId *types.Value `json:"AllocationId,omitempty"`
+
+	// EIP AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip-association.html#cfn-ec2-eipassociation-eip
+	EIP *types.Value `json:"EIP,omitempty"`
+
+	// InstanceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip-association.html#cfn-ec2-eipassociation-instanceid
+	InstanceId *types.Value `json:"InstanceId,omitempty"`
+
+	// NetworkInterfaceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip-association.html#cfn-ec2-eipassociation-networkinterfaceid
+	NetworkInterfaceId *types.Value `json:"NetworkInterfaceId,omitempty"`
+
+	// PrivateIpAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-eip-association.html#cfn-ec2-eipassociation-PrivateIpAddress
+	PrivateIpAddress *types.Value `json:"PrivateIpAddress,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EIPAssociation) AWSCloudFormationType() string {
+	return "AWS::EC2::EIPAssociation"
+}
+
+// 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 EIPAssociation) MarshalJSON() ([]byte, error) {
+	type Properties EIPAssociation
+	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 *EIPAssociation) UnmarshalJSON(b []byte) error {
+	type Properties EIPAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = EIPAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-enclavecertificateiamroleassociation.go b/goformation/cloudformation/ec2/aws-ec2-enclavecertificateiamroleassociation.go
new file mode 100644
index 0000000000..bb781da414
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-enclavecertificateiamroleassociation.go
@@ -0,0 +1,113 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EnclaveCertificateIamRoleAssociation AWS CloudFormation Resource (AWS::EC2::EnclaveCertificateIamRoleAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-enclavecertificateiamroleassociation.html
+type EnclaveCertificateIamRoleAssociation struct {
+
+	// CertificateArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-enclavecertificateiamroleassociation.html#cfn-ec2-enclavecertificateiamroleassociation-certificatearn
+	CertificateArn *types.Value `json:"CertificateArn,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-enclavecertificateiamroleassociation.html#cfn-ec2-enclavecertificateiamroleassociation-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EnclaveCertificateIamRoleAssociation) AWSCloudFormationType() string {
+	return "AWS::EC2::EnclaveCertificateIamRoleAssociation"
+}
+
+// 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 EnclaveCertificateIamRoleAssociation) MarshalJSON() ([]byte, error) {
+	type Properties EnclaveCertificateIamRoleAssociation
+	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 *EnclaveCertificateIamRoleAssociation) UnmarshalJSON(b []byte) error {
+	type Properties EnclaveCertificateIamRoleAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = EnclaveCertificateIamRoleAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-flowlog.go b/goformation/cloudformation/ec2/aws-ec2-flowlog.go
new file mode 100644
index 0000000000..2581030bd1
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-flowlog.go
@@ -0,0 +1,154 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// FlowLog AWS CloudFormation Resource (AWS::EC2::FlowLog)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html
+type FlowLog struct {
+
+	// DeliverLogsPermissionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html#cfn-ec2-flowlog-deliverlogspermissionarn
+	DeliverLogsPermissionArn *types.Value `json:"DeliverLogsPermissionArn,omitempty"`
+
+	// LogDestination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html#cfn-ec2-flowlog-logdestination
+	LogDestination *types.Value `json:"LogDestination,omitempty"`
+
+	// LogDestinationType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html#cfn-ec2-flowlog-logdestinationtype
+	LogDestinationType *types.Value `json:"LogDestinationType,omitempty"`
+
+	// LogFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html#cfn-ec2-flowlog-logformat
+	LogFormat *types.Value `json:"LogFormat,omitempty"`
+
+	// LogGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html#cfn-ec2-flowlog-loggroupname
+	LogGroupName *types.Value `json:"LogGroupName,omitempty"`
+
+	// MaxAggregationInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html#cfn-ec2-flowlog-maxaggregationinterval
+	MaxAggregationInterval *types.Value `json:"MaxAggregationInterval,omitempty"`
+
+	// ResourceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html#cfn-ec2-flowlog-resourceid
+	ResourceId *types.Value `json:"ResourceId,omitempty"`
+
+	// ResourceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html#cfn-ec2-flowlog-resourcetype
+	ResourceType *types.Value `json:"ResourceType,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html#cfn-ec2-flowlog-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TrafficType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-flowlog.html#cfn-ec2-flowlog-traffictype
+	TrafficType *types.Value `json:"TrafficType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FlowLog) AWSCloudFormationType() string {
+	return "AWS::EC2::FlowLog"
+}
+
+// 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 FlowLog) MarshalJSON() ([]byte, error) {
+	type Properties FlowLog
+	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 *FlowLog) UnmarshalJSON(b []byte) error {
+	type Properties FlowLog
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FlowLog(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-gatewayroutetableassociation.go b/goformation/cloudformation/ec2/aws-ec2-gatewayroutetableassociation.go
new file mode 100644
index 0000000000..c324938fc7
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-gatewayroutetableassociation.go
@@ -0,0 +1,113 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GatewayRouteTableAssociation AWS CloudFormation Resource (AWS::EC2::GatewayRouteTableAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-gatewayroutetableassociation.html
+type GatewayRouteTableAssociation struct {
+
+	// GatewayId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-gatewayroutetableassociation.html#cfn-ec2-gatewayroutetableassociation-gatewayid
+	GatewayId *types.Value `json:"GatewayId,omitempty"`
+
+	// RouteTableId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-gatewayroutetableassociation.html#cfn-ec2-gatewayroutetableassociation-routetableid
+	RouteTableId *types.Value `json:"RouteTableId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GatewayRouteTableAssociation) AWSCloudFormationType() string {
+	return "AWS::EC2::GatewayRouteTableAssociation"
+}
+
+// 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 GatewayRouteTableAssociation) MarshalJSON() ([]byte, error) {
+	type Properties GatewayRouteTableAssociation
+	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 *GatewayRouteTableAssociation) UnmarshalJSON(b []byte) error {
+	type Properties GatewayRouteTableAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = GatewayRouteTableAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-host.go b/goformation/cloudformation/ec2/aws-ec2-host.go
new file mode 100644
index 0000000000..f594fde7e6
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-host.go
@@ -0,0 +1,123 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Host AWS CloudFormation Resource (AWS::EC2::Host)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-host.html
+type Host struct {
+
+	// AutoPlacement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-host.html#cfn-ec2-host-autoplacement
+	AutoPlacement *types.Value `json:"AutoPlacement,omitempty"`
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-host.html#cfn-ec2-host-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// HostRecovery AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-host.html#cfn-ec2-host-hostrecovery
+	HostRecovery *types.Value `json:"HostRecovery,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-host.html#cfn-ec2-host-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Host) AWSCloudFormationType() string {
+	return "AWS::EC2::Host"
+}
+
+// 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 Host) MarshalJSON() ([]byte, error) {
+	type Properties Host
+	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 *Host) UnmarshalJSON(b []byte) error {
+	type Properties Host
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Host(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-instance.go b/goformation/cloudformation/ec2/aws-ec2-instance.go
new file mode 100644
index 0000000000..1700a3f402
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-instance.go
@@ -0,0 +1,312 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance AWS CloudFormation Resource (AWS::EC2::Instance)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html
+type Instance struct {
+
+	// AdditionalInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-additionalinfo
+	AdditionalInfo *types.Value `json:"AdditionalInfo,omitempty"`
+
+	// Affinity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-affinity
+	Affinity *types.Value `json:"Affinity,omitempty"`
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// BlockDeviceMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-blockdevicemappings
+	BlockDeviceMappings []Instance_BlockDeviceMapping `json:"BlockDeviceMappings,omitempty"`
+
+	// CpuOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-cpuoptions
+	CpuOptions *Instance_CpuOptions `json:"CpuOptions,omitempty"`
+
+	// CreditSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-creditspecification
+	CreditSpecification *Instance_CreditSpecification `json:"CreditSpecification,omitempty"`
+
+	// DisableApiTermination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-disableapitermination
+	DisableApiTermination *types.Value `json:"DisableApiTermination,omitempty"`
+
+	// EbsOptimized AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-ebsoptimized
+	EbsOptimized *types.Value `json:"EbsOptimized,omitempty"`
+
+	// ElasticGpuSpecifications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-elasticgpuspecifications
+	ElasticGpuSpecifications []Instance_ElasticGpuSpecification `json:"ElasticGpuSpecifications,omitempty"`
+
+	// ElasticInferenceAccelerators AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-elasticinferenceaccelerators
+	ElasticInferenceAccelerators []Instance_ElasticInferenceAccelerator `json:"ElasticInferenceAccelerators,omitempty"`
+
+	// EnclaveOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-enclaveoptions
+	EnclaveOptions *Instance_EnclaveOptions `json:"EnclaveOptions,omitempty"`
+
+	// HibernationOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-hibernationoptions
+	HibernationOptions *Instance_HibernationOptions `json:"HibernationOptions,omitempty"`
+
+	// HostId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-hostid
+	HostId *types.Value `json:"HostId,omitempty"`
+
+	// HostResourceGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-hostresourcegrouparn
+	HostResourceGroupArn *types.Value `json:"HostResourceGroupArn,omitempty"`
+
+	// IamInstanceProfile AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-iaminstanceprofile
+	IamInstanceProfile *types.Value `json:"IamInstanceProfile,omitempty"`
+
+	// ImageId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-imageid
+	ImageId *types.Value `json:"ImageId,omitempty"`
+
+	// InstanceInitiatedShutdownBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-instanceinitiatedshutdownbehavior
+	InstanceInitiatedShutdownBehavior *types.Value `json:"InstanceInitiatedShutdownBehavior,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// Ipv6AddressCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-ipv6addresscount
+	Ipv6AddressCount *types.Value `json:"Ipv6AddressCount,omitempty"`
+
+	// Ipv6Addresses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-ipv6addresses
+	Ipv6Addresses []Instance_InstanceIpv6Address `json:"Ipv6Addresses,omitempty"`
+
+	// KernelId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-kernelid
+	KernelId *types.Value `json:"KernelId,omitempty"`
+
+	// KeyName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-keyname
+	KeyName *types.Value `json:"KeyName,omitempty"`
+
+	// LaunchTemplate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-launchtemplate
+	LaunchTemplate *Instance_LaunchTemplateSpecification `json:"LaunchTemplate,omitempty"`
+
+	// LicenseSpecifications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-licensespecifications
+	LicenseSpecifications []Instance_LicenseSpecification `json:"LicenseSpecifications,omitempty"`
+
+	// Monitoring AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-monitoring
+	Monitoring *types.Value `json:"Monitoring,omitempty"`
+
+	// NetworkInterfaces AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-networkinterfaces
+	NetworkInterfaces []Instance_NetworkInterface `json:"NetworkInterfaces,omitempty"`
+
+	// PlacementGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-placementgroupname
+	PlacementGroupName *types.Value `json:"PlacementGroupName,omitempty"`
+
+	// PrivateIpAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-privateipaddress
+	PrivateIpAddress *types.Value `json:"PrivateIpAddress,omitempty"`
+
+	// PropagateTagsToVolumeOnCreation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-propagatetagstovolumeoncreation
+	PropagateTagsToVolumeOnCreation *types.Value `json:"PropagateTagsToVolumeOnCreation,omitempty"`
+
+	// RamdiskId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-ramdiskid
+	RamdiskId *types.Value `json:"RamdiskId,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-securitygroups
+	SecurityGroups *types.Value `json:"SecurityGroups,omitempty"`
+
+	// SourceDestCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-sourcedestcheck
+	SourceDestCheck *types.Value `json:"SourceDestCheck,omitempty"`
+
+	// SsmAssociations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-ssmassociations
+	SsmAssociations []Instance_SsmAssociation `json:"SsmAssociations,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Tenancy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-tenancy
+	Tenancy *types.Value `json:"Tenancy,omitempty"`
+
+	// UserData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-userdata
+	UserData *types.Value `json:"UserData,omitempty"`
+
+	// Volumes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance.html#cfn-ec2-instance-volumes
+	Volumes []Instance_Volume `json:"Volumes,omitempty"`
+
+	// AWSCloudFormationCreationPolicy represents a CloudFormation CreationPolicy
+	AWSCloudFormationCreationPolicy *policies.CreationPolicy `json:"-"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::EC2::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"`
+
+		CreationPolicy *policies.CreationPolicy `json:"CreationPolicy,omitempty"`
+	}{
+		Type:                r.AWSCloudFormationType(),
+		Properties:          (Properties)(r),
+		DependsOn:           r.AWSCloudFormationDependsOn,
+		Metadata:            r.AWSCloudFormationMetadata,
+		DeletionPolicy:      r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition:           r.AWSCloudFormationCondition,
+
+		CreationPolicy: r.AWSCloudFormationCreationPolicy,
+	})
+}
+
+// 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           []string
+		Metadata            map[string]interface{}
+		DeletionPolicy      string
+		UpdateReplacePolicy string
+		Condition           string
+
+		CreationPolicy *policies.CreationPolicy
+	}{}
+
+	dec := json.NewDecoder(bytes.NewReader(b))
+	dec.DisallowUnknownFields() // Force error if unknown field is found
+
+	if err := dec.Decode(&res); err != nil {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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
+	}
+	if res.CreationPolicy != nil {
+		r.AWSCloudFormationCreationPolicy = res.CreationPolicy
+	}
+
+	return nil
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_associationparameter.go b/goformation/cloudformation/ec2/aws-ec2-instance_associationparameter.go
new file mode 100644
index 0000000000..8f7637eee9
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-instance_associationparameter.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_AssociationParameter AWS CloudFormation Resource (AWS::EC2::Instance.AssociationParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-ssmassociations-associationparameters.html
+type Instance_AssociationParameter struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-ssmassociations-associationparameters.html#cfn-ec2-instance-ssmassociations-associationparameters-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-ssmassociations-associationparameters.html#cfn-ec2-instance-ssmassociations-associationparameters-value
+	Value *types.Value `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 *Instance_AssociationParameter) AWSCloudFormationType() string {
+	return "AWS::EC2::Instance.AssociationParameter"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_blockdevicemapping.go b/goformation/cloudformation/ec2/aws-ec2-instance_blockdevicemapping.go
new file mode 100644
index 0000000000..aa141a6651
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-instance_blockdevicemapping.go
@@ -0,0 +1,52 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_BlockDeviceMapping AWS CloudFormation Resource (AWS::EC2::Instance.BlockDeviceMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-mapping.html
+type Instance_BlockDeviceMapping struct {
+
+	// DeviceName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-mapping.html#cfn-ec2-blockdev-mapping-devicename
+	DeviceName *types.Value `json:"DeviceName,omitempty"`
+
+	// Ebs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-mapping.html#cfn-ec2-blockdev-mapping-ebs
+	Ebs *Instance_Ebs `json:"Ebs,omitempty"`
+
+	// NoDevice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-mapping.html#cfn-ec2-blockdev-mapping-nodevice
+	NoDevice *Instance_NoDevice `json:"NoDevice,omitempty"`
+
+	// VirtualName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-mapping.html#cfn-ec2-blockdev-mapping-virtualname
+	VirtualName *types.Value `json:"VirtualName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_BlockDeviceMapping) AWSCloudFormationType() string {
+	return "AWS::EC2::Instance.BlockDeviceMapping"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_cpuoptions.go b/goformation/cloudformation/ec2/aws-ec2-instance_cpuoptions.go
new file mode 100644
index 0000000000..396f6f4ead
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-instance_cpuoptions.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_CpuOptions AWS CloudFormation Resource (AWS::EC2::Instance.CpuOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-cpuoptions.html
+type Instance_CpuOptions struct {
+
+	// CoreCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-cpuoptions.html#cfn-ec2-instance-cpuoptions-corecount
+	CoreCount *types.Value `json:"CoreCount,omitempty"`
+
+	// ThreadsPerCore AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-cpuoptions.html#cfn-ec2-instance-cpuoptions-threadspercore
+	ThreadsPerCore *types.Value `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 *Instance_CpuOptions) AWSCloudFormationType() string {
+	return "AWS::EC2::Instance.CpuOptions"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_creditspecification.go b/goformation/cloudformation/ec2/aws-ec2-instance_creditspecification.go
new file mode 100644
index 0000000000..3c4247db09
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-instance_creditspecification.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_CreditSpecification AWS CloudFormation Resource (AWS::EC2::Instance.CreditSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-creditspecification.html
+type Instance_CreditSpecification struct {
+
+	// CPUCredits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-creditspecification.html#cfn-ec2-instance-creditspecification-cpucredits
+	CPUCredits *types.Value `json:"CPUCredits,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CreditSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::Instance.CreditSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_ebs.go b/goformation/cloudformation/ec2/aws-ec2-instance_ebs.go
new file mode 100644
index 0000000000..a685263dee
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-instance_ebs.go
@@ -0,0 +1,67 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_Ebs AWS CloudFormation Resource (AWS::EC2::Instance.Ebs)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-template.html
+type Instance_Ebs struct {
+
+	// DeleteOnTermination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-template.html#cfn-ec2-blockdev-template-deleteontermination
+	DeleteOnTermination *types.Value `json:"DeleteOnTermination,omitempty"`
+
+	// Encrypted AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-template.html#cfn-ec2-blockdev-template-encrypted
+	Encrypted *types.Value `json:"Encrypted,omitempty"`
+
+	// Iops AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-template.html#cfn-ec2-blockdev-template-iops
+	Iops *types.Value `json:"Iops,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-template.html#cfn-ec2-instance-ebs-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// SnapshotId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-template.html#cfn-ec2-blockdev-template-snapshotid
+	SnapshotId *types.Value `json:"SnapshotId,omitempty"`
+
+	// VolumeSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-template.html#cfn-ec2-blockdev-template-volumesize
+	VolumeSize *types.Value `json:"VolumeSize,omitempty"`
+
+	// VolumeType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-blockdev-template.html#cfn-ec2-blockdev-template-volumetype
+	VolumeType *types.Value `json:"VolumeType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Ebs) AWSCloudFormationType() string {
+	return "AWS::EC2::Instance.Ebs"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_elasticgpuspecification.go b/goformation/cloudformation/ec2/aws-ec2-instance_elasticgpuspecification.go
new file mode 100644
index 0000000000..4444cedef6
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-instance_elasticgpuspecification.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_ElasticGpuSpecification AWS CloudFormation Resource (AWS::EC2::Instance.ElasticGpuSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-elasticgpuspecification.html
+type Instance_ElasticGpuSpecification struct {
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-elasticgpuspecification.html#cfn-ec2-instance-elasticgpuspecification-type
+	Type *types.Value `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 *Instance_ElasticGpuSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::Instance.ElasticGpuSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_elasticinferenceaccelerator.go b/goformation/cloudformation/ec2/aws-ec2-instance_elasticinferenceaccelerator.go
new file mode 100644
index 0000000000..d552e25095
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-instance_elasticinferenceaccelerator.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_ElasticInferenceAccelerator AWS CloudFormation Resource (AWS::EC2::Instance.ElasticInferenceAccelerator)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-elasticinferenceaccelerator.html
+type Instance_ElasticInferenceAccelerator struct {
+
+	// Count AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-elasticinferenceaccelerator.html#cfn-ec2-instance-elasticinferenceaccelerator-count
+	Count *types.Value `json:"Count,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-elasticinferenceaccelerator.html#cfn-ec2-instance-elasticinferenceaccelerator-type
+	Type *types.Value `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 *Instance_ElasticInferenceAccelerator) AWSCloudFormationType() string {
+	return "AWS::EC2::Instance.ElasticInferenceAccelerator"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_enclaveoptions.go b/goformation/cloudformation/ec2/aws-ec2-instance_enclaveoptions.go
new file mode 100644
index 0000000000..eec7192243
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-instance_enclaveoptions.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_EnclaveOptions AWS CloudFormation Resource (AWS::EC2::Instance.EnclaveOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-enclaveoptions.html
+type Instance_EnclaveOptions struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-enclaveoptions.html#cfn-ec2-instance-enclaveoptions-enabled
+	Enabled *types.Value `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 *Instance_EnclaveOptions) AWSCloudFormationType() string {
+	return "AWS::EC2::Instance.EnclaveOptions"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_hibernationoptions.go b/goformation/cloudformation/ec2/aws-ec2-instance_hibernationoptions.go
new file mode 100644
index 0000000000..453b72bfa8
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-instance_hibernationoptions.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_HibernationOptions AWS CloudFormation Resource (AWS::EC2::Instance.HibernationOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-hibernationoptions.html
+type Instance_HibernationOptions struct {
+
+	// Configured AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-hibernationoptions.html#cfn-ec2-instance-hibernationoptions-configured
+	Configured *types.Value `json:"Configured,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_HibernationOptions) AWSCloudFormationType() string {
+	return "AWS::EC2::Instance.HibernationOptions"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_instanceipv6address.go b/goformation/cloudformation/ec2/aws-ec2-instance_instanceipv6address.go
new file mode 100644
index 0000000000..617b66ea32
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-instance_instanceipv6address.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_InstanceIpv6Address AWS CloudFormation Resource (AWS::EC2::Instance.InstanceIpv6Address)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-instanceipv6address.html
+type Instance_InstanceIpv6Address struct {
+
+	// Ipv6Address AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-instanceipv6address.html#cfn-ec2-instance-instanceipv6address-ipv6address
+	Ipv6Address *types.Value `json:"Ipv6Address,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InstanceIpv6Address) AWSCloudFormationType() string {
+	return "AWS::EC2::Instance.InstanceIpv6Address"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_launchtemplatespecification.go b/goformation/cloudformation/ec2/aws-ec2-instance_launchtemplatespecification.go
new file mode 100644
index 0000000000..71a0a01f9f
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-instance_launchtemplatespecification.go
@@ -0,0 +1,47 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_LaunchTemplateSpecification AWS CloudFormation Resource (AWS::EC2::Instance.LaunchTemplateSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-launchtemplatespecification.html
+type Instance_LaunchTemplateSpecification struct {
+
+	// LaunchTemplateId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-launchtemplatespecification.html#cfn-ec2-instance-launchtemplatespecification-launchtemplateid
+	LaunchTemplateId *types.Value `json:"LaunchTemplateId,omitempty"`
+
+	// LaunchTemplateName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-launchtemplatespecification.html#cfn-ec2-instance-launchtemplatespecification-launchtemplatename
+	LaunchTemplateName *types.Value `json:"LaunchTemplateName,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-launchtemplatespecification.html#cfn-ec2-instance-launchtemplatespecification-version
+	Version *types.Value `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 *Instance_LaunchTemplateSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::Instance.LaunchTemplateSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_licensespecification.go b/goformation/cloudformation/ec2/aws-ec2-instance_licensespecification.go
new file mode 100644
index 0000000000..eb441d2964
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-instance_licensespecification.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_LicenseSpecification AWS CloudFormation Resource (AWS::EC2::Instance.LicenseSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-licensespecification.html
+type Instance_LicenseSpecification struct {
+
+	// LicenseConfigurationArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-licensespecification.html#cfn-ec2-instance-licensespecification-licenseconfigurationarn
+	LicenseConfigurationArn *types.Value `json:"LicenseConfigurationArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LicenseSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::Instance.LicenseSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_networkinterface.go b/goformation/cloudformation/ec2/aws-ec2-instance_networkinterface.go
new file mode 100644
index 0000000000..aa2640372c
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-instance_networkinterface.go
@@ -0,0 +1,92 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_NetworkInterface AWS CloudFormation Resource (AWS::EC2::Instance.NetworkInterface)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html
+type Instance_NetworkInterface struct {
+
+	// AssociatePublicIpAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#aws-properties-ec2-network-iface-embedded-associatepubip
+	AssociatePublicIpAddress *types.Value `json:"AssociatePublicIpAddress,omitempty"`
+
+	// DeleteOnTermination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#aws-properties-ec2-network-iface-embedded-delete
+	DeleteOnTermination *types.Value `json:"DeleteOnTermination,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#aws-properties-ec2-network-iface-embedded-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DeviceIndex AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#aws-properties-ec2-network-iface-embedded-deviceindex
+	DeviceIndex *types.Value `json:"DeviceIndex,omitempty"`
+
+	// GroupSet AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#aws-properties-ec2-network-iface-embedded-groupset
+	GroupSet *types.Value `json:"GroupSet,omitempty"`
+
+	// Ipv6AddressCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#cfn-ec2-instance-networkinterface-ipv6addresscount
+	Ipv6AddressCount *types.Value `json:"Ipv6AddressCount,omitempty"`
+
+	// Ipv6Addresses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#cfn-ec2-instance-networkinterface-ipv6addresses
+	Ipv6Addresses []Instance_InstanceIpv6Address `json:"Ipv6Addresses,omitempty"`
+
+	// NetworkInterfaceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#aws-properties-ec2-network-iface-embedded-network-iface
+	NetworkInterfaceId *types.Value `json:"NetworkInterfaceId,omitempty"`
+
+	// PrivateIpAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#aws-properties-ec2-network-iface-embedded-privateipaddress
+	PrivateIpAddress *types.Value `json:"PrivateIpAddress,omitempty"`
+
+	// PrivateIpAddresses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#aws-properties-ec2-network-iface-embedded-privateipaddresses
+	PrivateIpAddresses []Instance_PrivateIpAddressSpecification `json:"PrivateIpAddresses,omitempty"`
+
+	// SecondaryPrivateIpAddressCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#aws-properties-ec2-network-iface-embedded-secondprivateip
+	SecondaryPrivateIpAddressCount *types.Value `json:"SecondaryPrivateIpAddressCount,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-iface-embedded.html#aws-properties-ec2-network-iface-embedded-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_NetworkInterface) AWSCloudFormationType() string {
+	return "AWS::EC2::Instance.NetworkInterface"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_nodevice.go b/goformation/cloudformation/ec2/aws-ec2-instance_nodevice.go
new file mode 100644
index 0000000000..32dbfef163
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-instance_nodevice.go
@@ -0,0 +1,30 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_NoDevice AWS CloudFormation Resource (AWS::EC2::Instance.NoDevice)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-nodevice.html
+type Instance_NoDevice struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_NoDevice) AWSCloudFormationType() string {
+	return "AWS::EC2::Instance.NoDevice"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_privateipaddressspecification.go b/goformation/cloudformation/ec2/aws-ec2-instance_privateipaddressspecification.go
new file mode 100644
index 0000000000..8c9b183bfb
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-instance_privateipaddressspecification.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_PrivateIpAddressSpecification AWS CloudFormation Resource (AWS::EC2::Instance.PrivateIpAddressSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-interface-privateipspec.html
+type Instance_PrivateIpAddressSpecification struct {
+
+	// Primary AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-interface-privateipspec.html#cfn-ec2-networkinterface-privateipspecification-primary
+	Primary *types.Value `json:"Primary"`
+
+	// PrivateIpAddress AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-network-interface-privateipspec.html#cfn-ec2-networkinterface-privateipspecification-privateipaddress
+	PrivateIpAddress *types.Value `json:"PrivateIpAddress,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PrivateIpAddressSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::Instance.PrivateIpAddressSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_ssmassociation.go b/goformation/cloudformation/ec2/aws-ec2-instance_ssmassociation.go
new file mode 100644
index 0000000000..ea35e71907
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-instance_ssmassociation.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_SsmAssociation AWS CloudFormation Resource (AWS::EC2::Instance.SsmAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-ssmassociations.html
+type Instance_SsmAssociation struct {
+
+	// AssociationParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-ssmassociations.html#cfn-ec2-instance-ssmassociations-associationparameters
+	AssociationParameters []Instance_AssociationParameter `json:"AssociationParameters,omitempty"`
+
+	// DocumentName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-instance-ssmassociations.html#cfn-ec2-instance-ssmassociations-documentname
+	DocumentName *types.Value `json:"DocumentName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SsmAssociation) AWSCloudFormationType() string {
+	return "AWS::EC2::Instance.SsmAssociation"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-instance_volume.go b/goformation/cloudformation/ec2/aws-ec2-instance_volume.go
new file mode 100644
index 0000000000..9571dd368e
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-instance_volume.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_Volume AWS CloudFormation Resource (AWS::EC2::Instance.Volume)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-mount-point.html
+type Instance_Volume struct {
+
+	// Device AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-mount-point.html#cfn-ec2-mountpoint-device
+	Device *types.Value `json:"Device,omitempty"`
+
+	// VolumeId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-mount-point.html#cfn-ec2-mountpoint-volumeid
+	VolumeId *types.Value `json:"VolumeId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Volume) AWSCloudFormationType() string {
+	return "AWS::EC2::Instance.Volume"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-internetgateway.go b/goformation/cloudformation/ec2/aws-ec2-internetgateway.go
new file mode 100644
index 0000000000..c481d9e251
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-internetgateway.go
@@ -0,0 +1,107 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// InternetGateway AWS CloudFormation Resource (AWS::EC2::InternetGateway)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-internetgateway.html
+type InternetGateway struct {
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-internetgateway.html#cfn-ec2-internetgateway-tags
+	Tags []cloudformation.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 *InternetGateway) AWSCloudFormationType() string {
+	return "AWS::EC2::InternetGateway"
+}
+
+// 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 InternetGateway) MarshalJSON() ([]byte, error) {
+	type Properties InternetGateway
+	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 *InternetGateway) UnmarshalJSON(b []byte) error {
+	type Properties InternetGateway
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = InternetGateway(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-ipam.go b/goformation/cloudformation/ec2/aws-ec2-ipam.go
new file mode 100644
index 0000000000..840199385b
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ipam.go
@@ -0,0 +1,119 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// IPAM AWS CloudFormation Resource (AWS::EC2::IPAM)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipam.html
+type IPAM struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipam.html#cfn-ec2-ipam-description
+	Description *types.Value `json:"Description,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
+	OperatingRegions []IPAM_IpamOperatingRegion `json:"OperatingRegions,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipam.html#cfn-ec2-ipam-tags
+	Tags []cloudformation.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 *IPAM) AWSCloudFormationType() string {
+	return "AWS::EC2::IPAM"
+}
+
+// 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 IPAM) MarshalJSON() ([]byte, error) {
+	type Properties IPAM
+	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 *IPAM) UnmarshalJSON(b []byte) error {
+	type Properties IPAM
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = IPAM(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-ipam_ipamoperatingregion.go b/goformation/cloudformation/ec2/aws-ec2-ipam_ipamoperatingregion.go
new file mode 100644
index 0000000000..9d4aa53a5c
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ipam_ipamoperatingregion.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// IPAM_IpamOperatingRegion AWS CloudFormation Resource (AWS::EC2::IPAM.IpamOperatingRegion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ipam-ipamoperatingregion.html
+type IPAM_IpamOperatingRegion struct {
+
+	// RegionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ipam-ipamoperatingregion.html#cfn-ec2-ipam-ipamoperatingregion-regionname
+	RegionName *types.Value `json:"RegionName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *IPAM_IpamOperatingRegion) AWSCloudFormationType() string {
+	return "AWS::EC2::IPAM.IpamOperatingRegion"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ipamallocation.go b/goformation/cloudformation/ec2/aws-ec2-ipamallocation.go
new file mode 100644
index 0000000000..4d73c57dd2
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ipamallocation.go
@@ -0,0 +1,123 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// IPAMAllocation AWS CloudFormation Resource (AWS::EC2::IPAMAllocation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamallocation.html
+type IPAMAllocation struct {
+
+	// Cidr AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamallocation.html#cfn-ec2-ipamallocation-cidr
+	Cidr *types.Value `json:"Cidr,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamallocation.html#cfn-ec2-ipamallocation-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// IpamPoolId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamallocation.html#cfn-ec2-ipamallocation-ipampoolid
+	IpamPoolId *types.Value `json:"IpamPoolId,omitempty"`
+
+	// NetmaskLength AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamallocation.html#cfn-ec2-ipamallocation-netmasklength
+	NetmaskLength *types.Value `json:"NetmaskLength,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *IPAMAllocation) AWSCloudFormationType() string {
+	return "AWS::EC2::IPAMAllocation"
+}
+
+// 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 IPAMAllocation) MarshalJSON() ([]byte, error) {
+	type Properties IPAMAllocation
+	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 *IPAMAllocation) UnmarshalJSON(b []byte) error {
+	type Properties IPAMAllocation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = IPAMAllocation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-ipampool.go b/goformation/cloudformation/ec2/aws-ec2-ipampool.go
new file mode 100644
index 0000000000..634fc968c5
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ipampool.go
@@ -0,0 +1,169 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// IPAMPool AWS CloudFormation Resource (AWS::EC2::IPAMPool)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipampool.html
+type IPAMPool struct {
+
+	// AddressFamily AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipampool.html#cfn-ec2-ipampool-addressfamily
+	AddressFamily *types.Value `json:"AddressFamily,omitempty"`
+
+	// AllocationDefaultNetmaskLength AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipampool.html#cfn-ec2-ipampool-allocationdefaultnetmasklength
+	AllocationDefaultNetmaskLength *types.Value `json:"AllocationDefaultNetmaskLength,omitempty"`
+
+	// AllocationMaxNetmaskLength AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipampool.html#cfn-ec2-ipampool-allocationmaxnetmasklength
+	AllocationMaxNetmaskLength *types.Value `json:"AllocationMaxNetmaskLength,omitempty"`
+
+	// AllocationMinNetmaskLength AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipampool.html#cfn-ec2-ipampool-allocationminnetmasklength
+	AllocationMinNetmaskLength *types.Value `json:"AllocationMinNetmaskLength,omitempty"`
+
+	// AllocationResourceTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipampool.html#cfn-ec2-ipampool-allocationresourcetags
+	AllocationResourceTags []cloudformation.Tag `json:"AllocationResourceTags,omitempty"`
+
+	// AutoImport AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipampool.html#cfn-ec2-ipampool-autoimport
+	AutoImport *types.Value `json:"AutoImport,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipampool.html#cfn-ec2-ipampool-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// IpamScopeId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipampool.html#cfn-ec2-ipampool-ipamscopeid
+	IpamScopeId *types.Value `json:"IpamScopeId,omitempty"`
+
+	// Locale AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipampool.html#cfn-ec2-ipampool-locale
+	Locale *types.Value `json:"Locale,omitempty"`
+
+	// ProvisionedCidrs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipampool.html#cfn-ec2-ipampool-provisionedcidrs
+	ProvisionedCidrs []IPAMPool_ProvisionedCidr `json:"ProvisionedCidrs,omitempty"`
+
+	// PubliclyAdvertisable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipampool.html#cfn-ec2-ipampool-publiclyadvertisable
+	PubliclyAdvertisable *types.Value `json:"PubliclyAdvertisable,omitempty"`
+
+	// SourceIpamPoolId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipampool.html#cfn-ec2-ipampool-sourceipampoolid
+	SourceIpamPoolId *types.Value `json:"SourceIpamPoolId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipampool.html#cfn-ec2-ipampool-tags
+	Tags []cloudformation.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 *IPAMPool) AWSCloudFormationType() string {
+	return "AWS::EC2::IPAMPool"
+}
+
+// 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 IPAMPool) MarshalJSON() ([]byte, error) {
+	type Properties IPAMPool
+	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 *IPAMPool) UnmarshalJSON(b []byte) error {
+	type Properties IPAMPool
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = IPAMPool(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-ipampool_provisionedcidr.go b/goformation/cloudformation/ec2/aws-ec2-ipampool_provisionedcidr.go
new file mode 100644
index 0000000000..615a06d825
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ipampool_provisionedcidr.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// IPAMPool_ProvisionedCidr AWS CloudFormation Resource (AWS::EC2::IPAMPool.ProvisionedCidr)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ipampool-provisionedcidr.html
+type IPAMPool_ProvisionedCidr struct {
+
+	// Cidr AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ipampool-provisionedcidr.html#cfn-ec2-ipampool-provisionedcidr-cidr
+	Cidr *types.Value `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 *IPAMPool_ProvisionedCidr) AWSCloudFormationType() string {
+	return "AWS::EC2::IPAMPool.ProvisionedCidr"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-ipamscope.go b/goformation/cloudformation/ec2/aws-ec2-ipamscope.go
new file mode 100644
index 0000000000..e34f497584
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-ipamscope.go
@@ -0,0 +1,124 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// IPAMScope AWS CloudFormation Resource (AWS::EC2::IPAMScope)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamscope.html
+type IPAMScope struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamscope.html#cfn-ec2-ipamscope-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// IpamId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamscope.html#cfn-ec2-ipamscope-ipamid
+	IpamId *types.Value `json:"IpamId,omitempty"`
+
+	// IpamScopeType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamscope.html#cfn-ec2-ipamscope-ipamscopetype
+	IpamScopeType *types.Value `json:"IpamScopeType,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-ipamscope.html#cfn-ec2-ipamscope-tags
+	Tags []cloudformation.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 *IPAMScope) AWSCloudFormationType() string {
+	return "AWS::EC2::IPAMScope"
+}
+
+// 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 IPAMScope) MarshalJSON() ([]byte, error) {
+	type Properties IPAMScope
+	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 *IPAMScope) UnmarshalJSON(b []byte) error {
+	type Properties IPAMScope
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = IPAMScope(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-launchtemplate.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate.go
new file mode 100644
index 0000000000..a70945b4e5
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate.go
@@ -0,0 +1,118 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate AWS CloudFormation Resource (AWS::EC2::LaunchTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html
+type LaunchTemplate struct {
+
+	// LaunchTemplateData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html#cfn-ec2-launchtemplate-launchtemplatedata
+	LaunchTemplateData *LaunchTemplate_LaunchTemplateData `json:"LaunchTemplateData,omitempty"`
+
+	// LaunchTemplateName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html#cfn-ec2-launchtemplate-launchtemplatename
+	LaunchTemplateName *types.Value `json:"LaunchTemplateName,omitempty"`
+
+	// TagSpecifications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-launchtemplate.html#cfn-ec2-launchtemplate-tagspecifications
+	TagSpecifications []LaunchTemplate_LaunchTemplateTagSpecification `json:"TagSpecifications,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate"
+}
+
+// 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 LaunchTemplate) MarshalJSON() ([]byte, error) {
+	type Properties LaunchTemplate
+	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 *LaunchTemplate) UnmarshalJSON(b []byte) error {
+	type Properties LaunchTemplate
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LaunchTemplate(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-launchtemplate_acceleratorcount.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_acceleratorcount.go
new file mode 100644
index 0000000000..70b15cdc43
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_acceleratorcount.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_AcceleratorCount AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.AcceleratorCount)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-acceleratorcount.html
+type LaunchTemplate_AcceleratorCount struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-acceleratorcount.html#cfn-ec2-launchtemplate-acceleratorcount-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-acceleratorcount.html#cfn-ec2-launchtemplate-acceleratorcount-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_AcceleratorCount) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.AcceleratorCount"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_acceleratortotalmemorymib.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_acceleratortotalmemorymib.go
new file mode 100644
index 0000000000..0f1938ca40
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_acceleratortotalmemorymib.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_AcceleratorTotalMemoryMiB AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.AcceleratorTotalMemoryMiB)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-acceleratortotalmemorymib.html
+type LaunchTemplate_AcceleratorTotalMemoryMiB struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-acceleratortotalmemorymib.html#cfn-ec2-launchtemplate-acceleratortotalmemorymib-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-acceleratortotalmemorymib.html#cfn-ec2-launchtemplate-acceleratortotalmemorymib-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_AcceleratorTotalMemoryMiB) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.AcceleratorTotalMemoryMiB"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_baselineebsbandwidthmbps.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_baselineebsbandwidthmbps.go
new file mode 100644
index 0000000000..df2c2f88bd
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_baselineebsbandwidthmbps.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_BaselineEbsBandwidthMbps AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.BaselineEbsBandwidthMbps)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-baselineebsbandwidthmbps.html
+type LaunchTemplate_BaselineEbsBandwidthMbps struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-baselineebsbandwidthmbps.html#cfn-ec2-launchtemplate-baselineebsbandwidthmbps-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-baselineebsbandwidthmbps.html#cfn-ec2-launchtemplate-baselineebsbandwidthmbps-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_BaselineEbsBandwidthMbps) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.BaselineEbsBandwidthMbps"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_blockdevicemapping.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_blockdevicemapping.go
new file mode 100644
index 0000000000..3bfec5d10b
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_blockdevicemapping.go
@@ -0,0 +1,52 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_BlockDeviceMapping AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.BlockDeviceMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping.html
+type LaunchTemplate_BlockDeviceMapping struct {
+
+	// DeviceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping.html#cfn-ec2-launchtemplate-blockdevicemapping-devicename
+	DeviceName *types.Value `json:"DeviceName,omitempty"`
+
+	// Ebs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping.html#cfn-ec2-launchtemplate-blockdevicemapping-ebs
+	Ebs *LaunchTemplate_Ebs `json:"Ebs,omitempty"`
+
+	// NoDevice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping.html#cfn-ec2-launchtemplate-blockdevicemapping-nodevice
+	NoDevice *types.Value `json:"NoDevice,omitempty"`
+
+	// VirtualName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping.html#cfn-ec2-launchtemplate-blockdevicemapping-virtualname
+	VirtualName *types.Value `json:"VirtualName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_BlockDeviceMapping) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.BlockDeviceMapping"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationspecification.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationspecification.go
new file mode 100644
index 0000000000..e26ccc0fac
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationspecification.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_CapacityReservationSpecification AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.CapacityReservationSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-capacityreservationspecification.html
+type LaunchTemplate_CapacityReservationSpecification struct {
+
+	// CapacityReservationPreference AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-capacityreservationspecification.html#cfn-ec2-launchtemplate-launchtemplatedata-capacityreservationspecification-capacityreservationpreference
+	CapacityReservationPreference *types.Value `json:"CapacityReservationPreference,omitempty"`
+
+	// CapacityReservationTarget AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-capacityreservationspecification.html#cfn-ec2-launchtemplate-launchtemplatedata-capacityreservationspecification-capacityreservationtarget
+	CapacityReservationTarget *LaunchTemplate_CapacityReservationTarget `json:"CapacityReservationTarget,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_CapacityReservationSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.CapacityReservationSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationtarget.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationtarget.go
new file mode 100644
index 0000000000..4aa6970b83
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_capacityreservationtarget.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_CapacityReservationTarget AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.CapacityReservationTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-capacityreservationtarget.html
+type LaunchTemplate_CapacityReservationTarget struct {
+
+	// CapacityReservationId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-capacityreservationtarget.html#cfn-ec2-launchtemplate-capacityreservationtarget-capacityreservationid
+	CapacityReservationId *types.Value `json:"CapacityReservationId,omitempty"`
+
+	// CapacityReservationResourceGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-capacityreservationtarget.html#cfn-ec2-launchtemplate-capacityreservationtarget-capacityreservationresourcegrouparn
+	CapacityReservationResourceGroupArn *types.Value `json:"CapacityReservationResourceGroupArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_CapacityReservationTarget) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.CapacityReservationTarget"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_cpuoptions.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_cpuoptions.go
new file mode 100644
index 0000000000..e8e0d6b4d0
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_cpuoptions.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_CpuOptions AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.CpuOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-cpuoptions.html
+type LaunchTemplate_CpuOptions struct {
+
+	// CoreCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-cpuoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-cpuoptions-corecount
+	CoreCount *types.Value `json:"CoreCount,omitempty"`
+
+	// ThreadsPerCore AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-cpuoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-cpuoptions-threadspercore
+	ThreadsPerCore *types.Value `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 *LaunchTemplate_CpuOptions) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.CpuOptions"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_creditspecification.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_creditspecification.go
new file mode 100644
index 0000000000..83274dcc9a
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_creditspecification.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_CreditSpecification AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.CreditSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-creditspecification.html
+type LaunchTemplate_CreditSpecification struct {
+
+	// CpuCredits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-creditspecification.html#cfn-ec2-launchtemplate-launchtemplatedata-creditspecification-cpucredits
+	CpuCredits *types.Value `json:"CpuCredits,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_CreditSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.CreditSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_ebs.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_ebs.go
new file mode 100644
index 0000000000..569c0d87f4
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_ebs.go
@@ -0,0 +1,72 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_Ebs AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.Ebs)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping-ebs.html
+type LaunchTemplate_Ebs struct {
+
+	// DeleteOnTermination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping-ebs.html#cfn-ec2-launchtemplate-blockdevicemapping-ebs-deleteontermination
+	DeleteOnTermination *types.Value `json:"DeleteOnTermination,omitempty"`
+
+	// Encrypted AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping-ebs.html#cfn-ec2-launchtemplate-blockdevicemapping-ebs-encrypted
+	Encrypted *types.Value `json:"Encrypted,omitempty"`
+
+	// Iops AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping-ebs.html#cfn-ec2-launchtemplate-blockdevicemapping-ebs-iops
+	Iops *types.Value `json:"Iops,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping-ebs.html#cfn-ec2-launchtemplate-blockdevicemapping-ebs-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// SnapshotId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping-ebs.html#cfn-ec2-launchtemplate-blockdevicemapping-ebs-snapshotid
+	SnapshotId *types.Value `json:"SnapshotId,omitempty"`
+
+	// Throughput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping-ebs.html#cfn-ec2-launchtemplate-blockdevicemapping-ebs-throughput
+	Throughput *types.Value `json:"Throughput,omitempty"`
+
+	// VolumeSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping-ebs.html#cfn-ec2-launchtemplate-blockdevicemapping-ebs-volumesize
+	VolumeSize *types.Value `json:"VolumeSize,omitempty"`
+
+	// VolumeType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-blockdevicemapping-ebs.html#cfn-ec2-launchtemplate-blockdevicemapping-ebs-volumetype
+	VolumeType *types.Value `json:"VolumeType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_Ebs) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.Ebs"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_elasticgpuspecification.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_elasticgpuspecification.go
new file mode 100644
index 0000000000..84c52d9cc6
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_elasticgpuspecification.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_ElasticGpuSpecification AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.ElasticGpuSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-elasticgpuspecification.html
+type LaunchTemplate_ElasticGpuSpecification struct {
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-elasticgpuspecification.html#cfn-ec2-launchtemplate-elasticgpuspecification-type
+	Type *types.Value `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 *LaunchTemplate_ElasticGpuSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.ElasticGpuSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_enclaveoptions.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_enclaveoptions.go
new file mode 100644
index 0000000000..dbd7f8adf8
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_enclaveoptions.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_EnclaveOptions AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.EnclaveOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-enclaveoptions.html
+type LaunchTemplate_EnclaveOptions struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-enclaveoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-enclaveoptions-enabled
+	Enabled *types.Value `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 *LaunchTemplate_EnclaveOptions) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.EnclaveOptions"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_hibernationoptions.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_hibernationoptions.go
new file mode 100644
index 0000000000..99a50b2a8c
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_hibernationoptions.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_HibernationOptions AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.HibernationOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-hibernationoptions.html
+type LaunchTemplate_HibernationOptions struct {
+
+	// Configured AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-hibernationoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-hibernationoptions-configured
+	Configured *types.Value `json:"Configured,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_HibernationOptions) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.HibernationOptions"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_iaminstanceprofile.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_iaminstanceprofile.go
new file mode 100644
index 0000000000..30ebb7cada
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_iaminstanceprofile.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_IamInstanceProfile AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.IamInstanceProfile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-iaminstanceprofile.html
+type LaunchTemplate_IamInstanceProfile struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-iaminstanceprofile.html#cfn-ec2-launchtemplate-launchtemplatedata-iaminstanceprofile-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-iaminstanceprofile.html#cfn-ec2-launchtemplate-launchtemplatedata-iaminstanceprofile-name
+	Name *types.Value `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 *LaunchTemplate_IamInstanceProfile) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.IamInstanceProfile"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_instancemarketoptions.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_instancemarketoptions.go
new file mode 100644
index 0000000000..6d4172432a
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_instancemarketoptions.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_InstanceMarketOptions AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.InstanceMarketOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancemarketoptions.html
+type LaunchTemplate_InstanceMarketOptions struct {
+
+	// MarketType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancemarketoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-markettype
+	MarketType *types.Value `json:"MarketType,omitempty"`
+
+	// SpotOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancemarketoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions
+	SpotOptions *LaunchTemplate_SpotOptions `json:"SpotOptions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_InstanceMarketOptions) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.InstanceMarketOptions"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_ipv6add.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_ipv6add.go
new file mode 100644
index 0000000000..5646d2335f
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_ipv6add.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_Ipv6Add AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.Ipv6Add)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-ipv6add.html
+type LaunchTemplate_Ipv6Add struct {
+
+	// Ipv6Address AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-ipv6add.html#cfn-ec2-launchtemplate-ipv6add-ipv6address
+	Ipv6Address *types.Value `json:"Ipv6Address,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_Ipv6Add) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.Ipv6Add"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatedata.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatedata.go
new file mode 100644
index 0000000000..d2088bbaa7
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatedata.go
@@ -0,0 +1,167 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_LaunchTemplateData AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.LaunchTemplateData)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html
+type LaunchTemplate_LaunchTemplateData struct {
+
+	// BlockDeviceMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-blockdevicemappings
+	BlockDeviceMappings []LaunchTemplate_BlockDeviceMapping `json:"BlockDeviceMappings,omitempty"`
+
+	// CapacityReservationSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-capacityreservationspecification
+	CapacityReservationSpecification *LaunchTemplate_CapacityReservationSpecification `json:"CapacityReservationSpecification,omitempty"`
+
+	// CpuOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-cpuoptions
+	CpuOptions *LaunchTemplate_CpuOptions `json:"CpuOptions,omitempty"`
+
+	// CreditSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-creditspecification
+	CreditSpecification *LaunchTemplate_CreditSpecification `json:"CreditSpecification,omitempty"`
+
+	// DisableApiTermination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-disableapitermination
+	DisableApiTermination *types.Value `json:"DisableApiTermination,omitempty"`
+
+	// EbsOptimized AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-ebsoptimized
+	EbsOptimized *types.Value `json:"EbsOptimized,omitempty"`
+
+	// ElasticGpuSpecifications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-elasticgpuspecifications
+	ElasticGpuSpecifications []LaunchTemplate_ElasticGpuSpecification `json:"ElasticGpuSpecifications,omitempty"`
+
+	// ElasticInferenceAccelerators AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-elasticinferenceaccelerators
+	ElasticInferenceAccelerators []LaunchTemplate_LaunchTemplateElasticInferenceAccelerator `json:"ElasticInferenceAccelerators,omitempty"`
+
+	// EnclaveOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-enclaveoptions
+	EnclaveOptions *LaunchTemplate_EnclaveOptions `json:"EnclaveOptions,omitempty"`
+
+	// HibernationOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-hibernationoptions
+	HibernationOptions *LaunchTemplate_HibernationOptions `json:"HibernationOptions,omitempty"`
+
+	// IamInstanceProfile AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-iaminstanceprofile
+	IamInstanceProfile *LaunchTemplate_IamInstanceProfile `json:"IamInstanceProfile,omitempty"`
+
+	// ImageId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-imageid
+	ImageId *types.Value `json:"ImageId,omitempty"`
+
+	// InstanceInitiatedShutdownBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-instanceinitiatedshutdownbehavior
+	InstanceInitiatedShutdownBehavior *types.Value `json:"InstanceInitiatedShutdownBehavior,omitempty"`
+
+	// InstanceMarketOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-instancemarketoptions
+	InstanceMarketOptions *LaunchTemplate_InstanceMarketOptions `json:"InstanceMarketOptions,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// KernelId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-kernelid
+	KernelId *types.Value `json:"KernelId,omitempty"`
+
+	// KeyName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-keyname
+	KeyName *types.Value `json:"KeyName,omitempty"`
+
+	// LicenseSpecifications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-licensespecifications
+	LicenseSpecifications []LaunchTemplate_LicenseSpecification `json:"LicenseSpecifications,omitempty"`
+
+	// MetadataOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-metadataoptions
+	MetadataOptions *LaunchTemplate_MetadataOptions `json:"MetadataOptions,omitempty"`
+
+	// Monitoring AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-monitoring
+	Monitoring *LaunchTemplate_Monitoring `json:"Monitoring,omitempty"`
+
+	// NetworkInterfaces AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-networkinterfaces
+	NetworkInterfaces []LaunchTemplate_NetworkInterface `json:"NetworkInterfaces,omitempty"`
+
+	// Placement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-placement
+	Placement *LaunchTemplate_Placement `json:"Placement,omitempty"`
+
+	// RamDiskId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-ramdiskid
+	RamDiskId *types.Value `json:"RamDiskId,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-securitygroups
+	SecurityGroups *types.Value `json:"SecurityGroups,omitempty"`
+
+	// TagSpecifications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-tagspecifications
+	TagSpecifications []LaunchTemplate_TagSpecification `json:"TagSpecifications,omitempty"`
+
+	// UserData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata.html#cfn-ec2-launchtemplate-launchtemplatedata-userdata
+	UserData *types.Value `json:"UserData,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_LaunchTemplateData) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.LaunchTemplateData"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplateelasticinferenceaccelerator.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplateelasticinferenceaccelerator.go
new file mode 100644
index 0000000000..e5c0783f9b
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplateelasticinferenceaccelerator.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_LaunchTemplateElasticInferenceAccelerator AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.LaunchTemplateElasticInferenceAccelerator)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplateelasticinferenceaccelerator.html
+type LaunchTemplate_LaunchTemplateElasticInferenceAccelerator struct {
+
+	// Count AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplateelasticinferenceaccelerator.html#cfn-ec2-launchtemplate-launchtemplateelasticinferenceaccelerator-count
+	Count *types.Value `json:"Count,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplateelasticinferenceaccelerator.html#cfn-ec2-launchtemplate-launchtemplateelasticinferenceaccelerator-type
+	Type *types.Value `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 *LaunchTemplate_LaunchTemplateElasticInferenceAccelerator) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.LaunchTemplateElasticInferenceAccelerator"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatetagspecification.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatetagspecification.go
new file mode 100644
index 0000000000..94b7f52c78
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_launchtemplatetagspecification.go
@@ -0,0 +1,43 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_LaunchTemplateTagSpecification AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.LaunchTemplateTagSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatetagspecification.html
+type LaunchTemplate_LaunchTemplateTagSpecification struct {
+
+	// ResourceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatetagspecification.html#cfn-ec2-launchtemplate-launchtemplatetagspecification-resourcetype
+	ResourceType *types.Value `json:"ResourceType,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatetagspecification.html#cfn-ec2-launchtemplate-launchtemplatetagspecification-tags
+	Tags []cloudformation.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 *LaunchTemplate_LaunchTemplateTagSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.LaunchTemplateTagSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_licensespecification.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_licensespecification.go
new file mode 100644
index 0000000000..9d6f3e96ce
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_licensespecification.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_LicenseSpecification AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.LicenseSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-licensespecification.html
+type LaunchTemplate_LicenseSpecification struct {
+
+	// LicenseConfigurationArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-licensespecification.html#cfn-ec2-launchtemplate-licensespecification-licenseconfigurationarn
+	LicenseConfigurationArn *types.Value `json:"LicenseConfigurationArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_LicenseSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.LicenseSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_memorygibpervcpu.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_memorygibpervcpu.go
new file mode 100644
index 0000000000..eca65689b4
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_memorygibpervcpu.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_MemoryGiBPerVCpu AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.MemoryGiBPerVCpu)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-memorygibpervcpu.html
+type LaunchTemplate_MemoryGiBPerVCpu struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-memorygibpervcpu.html#cfn-ec2-launchtemplate-memorygibpervcpu-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-memorygibpervcpu.html#cfn-ec2-launchtemplate-memorygibpervcpu-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_MemoryGiBPerVCpu) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.MemoryGiBPerVCpu"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_memorymib.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_memorymib.go
new file mode 100644
index 0000000000..c947bcb7f1
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_memorymib.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_MemoryMiB AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.MemoryMiB)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-memorymib.html
+type LaunchTemplate_MemoryMiB struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-memorymib.html#cfn-ec2-launchtemplate-memorymib-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-memorymib.html#cfn-ec2-launchtemplate-memorymib-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_MemoryMiB) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.MemoryMiB"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_metadataoptions.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_metadataoptions.go
new file mode 100644
index 0000000000..fb387281dd
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_metadataoptions.go
@@ -0,0 +1,52 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_MetadataOptions AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.MetadataOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-metadataoptions.html
+type LaunchTemplate_MetadataOptions struct {
+
+	// HttpEndpoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-metadataoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-metadataoptions-httpendpoint
+	HttpEndpoint *types.Value `json:"HttpEndpoint,omitempty"`
+
+	// HttpProtocolIpv6 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-metadataoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-metadataoptions-httpprotocolipv6
+	HttpProtocolIpv6 *types.Value `json:"HttpProtocolIpv6,omitempty"`
+
+	// HttpPutResponseHopLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-metadataoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-metadataoptions-httpputresponsehoplimit
+	HttpPutResponseHopLimit *types.Value `json:"HttpPutResponseHopLimit,omitempty"`
+
+	// HttpTokens AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-metadataoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-metadataoptions-httptokens
+	HttpTokens *types.Value `json:"HttpTokens,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_MetadataOptions) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.MetadataOptions"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_monitoring.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_monitoring.go
new file mode 100644
index 0000000000..84f6e321c6
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_monitoring.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_Monitoring AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.Monitoring)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-monitoring.html
+type LaunchTemplate_Monitoring struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-monitoring.html#cfn-ec2-launchtemplate-launchtemplatedata-monitoring-enabled
+	Enabled *types.Value `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 *LaunchTemplate_Monitoring) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.Monitoring"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_networkinterface.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_networkinterface.go
new file mode 100644
index 0000000000..c69c2c301e
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_networkinterface.go
@@ -0,0 +1,107 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_NetworkInterface AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.NetworkInterface)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterface.html
+type LaunchTemplate_NetworkInterface struct {
+
+	// AssociateCarrierIpAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterface.html#cfn-ec2-launchtemplate-networkinterface-associatecarrieripaddress
+	AssociateCarrierIpAddress *types.Value `json:"AssociateCarrierIpAddress,omitempty"`
+
+	// AssociatePublicIpAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterface.html#cfn-ec2-launchtemplate-networkinterface-associatepublicipaddress
+	AssociatePublicIpAddress *types.Value `json:"AssociatePublicIpAddress,omitempty"`
+
+	// DeleteOnTermination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterface.html#cfn-ec2-launchtemplate-networkinterface-deleteontermination
+	DeleteOnTermination *types.Value `json:"DeleteOnTermination,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterface.html#cfn-ec2-launchtemplate-networkinterface-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DeviceIndex AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterface.html#cfn-ec2-launchtemplate-networkinterface-deviceindex
+	DeviceIndex *types.Value `json:"DeviceIndex,omitempty"`
+
+	// Groups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterface.html#cfn-ec2-launchtemplate-networkinterface-groups
+	Groups *types.Value `json:"Groups,omitempty"`
+
+	// InterfaceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterface.html#cfn-ec2-launchtemplate-networkinterface-interfacetype
+	InterfaceType *types.Value `json:"InterfaceType,omitempty"`
+
+	// Ipv6AddressCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterface.html#cfn-ec2-launchtemplate-networkinterface-ipv6addresscount
+	Ipv6AddressCount *types.Value `json:"Ipv6AddressCount,omitempty"`
+
+	// Ipv6Addresses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterface.html#cfn-ec2-launchtemplate-networkinterface-ipv6addresses
+	Ipv6Addresses []LaunchTemplate_Ipv6Add `json:"Ipv6Addresses,omitempty"`
+
+	// NetworkCardIndex AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterface.html#cfn-ec2-launchtemplate-networkinterface-networkcardindex
+	NetworkCardIndex *types.Value `json:"NetworkCardIndex,omitempty"`
+
+	// NetworkInterfaceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterface.html#cfn-ec2-launchtemplate-networkinterface-networkinterfaceid
+	NetworkInterfaceId *types.Value `json:"NetworkInterfaceId,omitempty"`
+
+	// PrivateIpAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterface.html#cfn-ec2-launchtemplate-networkinterface-privateipaddress
+	PrivateIpAddress *types.Value `json:"PrivateIpAddress,omitempty"`
+
+	// PrivateIpAddresses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterface.html#cfn-ec2-launchtemplate-networkinterface-privateipaddresses
+	PrivateIpAddresses []LaunchTemplate_PrivateIpAdd `json:"PrivateIpAddresses,omitempty"`
+
+	// SecondaryPrivateIpAddressCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterface.html#cfn-ec2-launchtemplate-networkinterface-secondaryprivateipaddresscount
+	SecondaryPrivateIpAddressCount *types.Value `json:"SecondaryPrivateIpAddressCount,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterface.html#cfn-ec2-launchtemplate-networkinterface-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_NetworkInterface) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.NetworkInterface"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_networkinterfacecount.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_networkinterfacecount.go
new file mode 100644
index 0000000000..436249b91e
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_networkinterfacecount.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_NetworkInterfaceCount AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.NetworkInterfaceCount)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterfacecount.html
+type LaunchTemplate_NetworkInterfaceCount struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterfacecount.html#cfn-ec2-launchtemplate-networkinterfacecount-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-networkinterfacecount.html#cfn-ec2-launchtemplate-networkinterfacecount-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_NetworkInterfaceCount) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.NetworkInterfaceCount"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_placement.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_placement.go
new file mode 100644
index 0000000000..3badacd7a4
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_placement.go
@@ -0,0 +1,72 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_Placement AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.Placement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-placement.html
+type LaunchTemplate_Placement struct {
+
+	// Affinity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-placement.html#cfn-ec2-launchtemplate-launchtemplatedata-placement-affinity
+	Affinity *types.Value `json:"Affinity,omitempty"`
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-placement.html#cfn-ec2-launchtemplate-launchtemplatedata-placement-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// GroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-placement.html#cfn-ec2-launchtemplate-launchtemplatedata-placement-groupname
+	GroupName *types.Value `json:"GroupName,omitempty"`
+
+	// HostId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-placement.html#cfn-ec2-launchtemplate-launchtemplatedata-placement-hostid
+	HostId *types.Value `json:"HostId,omitempty"`
+
+	// HostResourceGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-placement.html#cfn-ec2-launchtemplate-launchtemplatedata-placement-hostresourcegrouparn
+	HostResourceGroupArn *types.Value `json:"HostResourceGroupArn,omitempty"`
+
+	// PartitionNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-placement.html#cfn-ec2-launchtemplate-launchtemplatedata-placement-partitionnumber
+	PartitionNumber *types.Value `json:"PartitionNumber,omitempty"`
+
+	// SpreadDomain AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-placement.html#cfn-ec2-launchtemplate-launchtemplatedata-placement-spreaddomain
+	SpreadDomain *types.Value `json:"SpreadDomain,omitempty"`
+
+	// Tenancy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-placement.html#cfn-ec2-launchtemplate-launchtemplatedata-placement-tenancy
+	Tenancy *types.Value `json:"Tenancy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_Placement) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.Placement"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_privateipadd.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_privateipadd.go
new file mode 100644
index 0000000000..1c55a3a52d
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_privateipadd.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_PrivateIpAdd AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.PrivateIpAdd)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-privateipadd.html
+type LaunchTemplate_PrivateIpAdd struct {
+
+	// Primary AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-privateipadd.html#cfn-ec2-launchtemplate-privateipadd-primary
+	Primary *types.Value `json:"Primary,omitempty"`
+
+	// PrivateIpAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-privateipadd.html#cfn-ec2-launchtemplate-privateipadd-privateipaddress
+	PrivateIpAddress *types.Value `json:"PrivateIpAddress,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_PrivateIpAdd) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.PrivateIpAdd"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_spotoptions.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_spotoptions.go
new file mode 100644
index 0000000000..0870787804
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_spotoptions.go
@@ -0,0 +1,57 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_SpotOptions AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.SpotOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions.html
+type LaunchTemplate_SpotOptions struct {
+
+	// BlockDurationMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions-blockdurationminutes
+	BlockDurationMinutes *types.Value `json:"BlockDurationMinutes,omitempty"`
+
+	// InstanceInterruptionBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions-instanceinterruptionbehavior
+	InstanceInterruptionBehavior *types.Value `json:"InstanceInterruptionBehavior,omitempty"`
+
+	// MaxPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions-maxprice
+	MaxPrice *types.Value `json:"MaxPrice,omitempty"`
+
+	// SpotInstanceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions-spotinstancetype
+	SpotInstanceType *types.Value `json:"SpotInstanceType,omitempty"`
+
+	// ValidUntil AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions.html#cfn-ec2-launchtemplate-launchtemplatedata-instancemarketoptions-spotoptions-validuntil
+	ValidUntil *types.Value `json:"ValidUntil,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_SpotOptions) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.SpotOptions"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_tagspecification.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_tagspecification.go
new file mode 100644
index 0000000000..c8375829f3
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_tagspecification.go
@@ -0,0 +1,43 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_TagSpecification AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.TagSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html
+type LaunchTemplate_TagSpecification struct {
+
+	// ResourceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html#cfn-ec2-launchtemplate-tagspecification-resourcetype
+	ResourceType *types.Value `json:"ResourceType,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-tagspecification.html#cfn-ec2-launchtemplate-tagspecification-tags
+	Tags []cloudformation.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 *LaunchTemplate_TagSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.TagSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_totallocalstoragegb.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_totallocalstoragegb.go
new file mode 100644
index 0000000000..420d9459a4
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_totallocalstoragegb.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_TotalLocalStorageGB AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.TotalLocalStorageGB)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-totallocalstoragegb.html
+type LaunchTemplate_TotalLocalStorageGB struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-totallocalstoragegb.html#cfn-ec2-launchtemplate-totallocalstoragegb-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-totallocalstoragegb.html#cfn-ec2-launchtemplate-totallocalstoragegb-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_TotalLocalStorageGB) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.TotalLocalStorageGB"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-launchtemplate_vcpucount.go b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_vcpucount.go
new file mode 100644
index 0000000000..4ea39ffa45
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-launchtemplate_vcpucount.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplate_VCpuCount AWS CloudFormation Resource (AWS::EC2::LaunchTemplate.VCpuCount)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-vcpucount.html
+type LaunchTemplate_VCpuCount struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-vcpucount.html#cfn-ec2-launchtemplate-vcpucount-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-launchtemplate-vcpucount.html#cfn-ec2-launchtemplate-vcpucount-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchTemplate_VCpuCount) AWSCloudFormationType() string {
+	return "AWS::EC2::LaunchTemplate.VCpuCount"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-localgatewayroute.go b/goformation/cloudformation/ec2/aws-ec2-localgatewayroute.go
new file mode 100644
index 0000000000..54bb147ba4
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-localgatewayroute.go
@@ -0,0 +1,118 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LocalGatewayRoute AWS CloudFormation Resource (AWS::EC2::LocalGatewayRoute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-localgatewayroute.html
+type LocalGatewayRoute struct {
+
+	// DestinationCidrBlock AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-localgatewayroute.html#cfn-ec2-localgatewayroute-destinationcidrblock
+	DestinationCidrBlock *types.Value `json:"DestinationCidrBlock,omitempty"`
+
+	// LocalGatewayRouteTableId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-localgatewayroute.html#cfn-ec2-localgatewayroute-localgatewayroutetableid
+	LocalGatewayRouteTableId *types.Value `json:"LocalGatewayRouteTableId,omitempty"`
+
+	// LocalGatewayVirtualInterfaceGroupId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-localgatewayroute.html#cfn-ec2-localgatewayroute-localgatewayvirtualinterfacegroupid
+	LocalGatewayVirtualInterfaceGroupId *types.Value `json:"LocalGatewayVirtualInterfaceGroupId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LocalGatewayRoute) AWSCloudFormationType() string {
+	return "AWS::EC2::LocalGatewayRoute"
+}
+
+// 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 LocalGatewayRoute) MarshalJSON() ([]byte, error) {
+	type Properties LocalGatewayRoute
+	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 *LocalGatewayRoute) UnmarshalJSON(b []byte) error {
+	type Properties LocalGatewayRoute
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LocalGatewayRoute(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation.go b/goformation/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation.go
new file mode 100644
index 0000000000..99731eda73
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation.go
@@ -0,0 +1,119 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// LocalGatewayRouteTableVPCAssociation AWS CloudFormation Resource (AWS::EC2::LocalGatewayRouteTableVPCAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-localgatewayroutetablevpcassociation.html
+type LocalGatewayRouteTableVPCAssociation struct {
+
+	// LocalGatewayRouteTableId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-localgatewayroutetablevpcassociation.html#cfn-ec2-localgatewayroutetablevpcassociation-localgatewayroutetableid
+	LocalGatewayRouteTableId *types.Value `json:"LocalGatewayRouteTableId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-localgatewayroutetablevpcassociation.html#cfn-ec2-localgatewayroutetablevpcassociation-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-localgatewayroutetablevpcassociation.html#cfn-ec2-localgatewayroutetablevpcassociation-vpcid
+	VpcId *types.Value `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 *LocalGatewayRouteTableVPCAssociation) AWSCloudFormationType() string {
+	return "AWS::EC2::LocalGatewayRouteTableVPCAssociation"
+}
+
+// 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 LocalGatewayRouteTableVPCAssociation) MarshalJSON() ([]byte, error) {
+	type Properties LocalGatewayRouteTableVPCAssociation
+	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 *LocalGatewayRouteTableVPCAssociation) UnmarshalJSON(b []byte) error {
+	type Properties LocalGatewayRouteTableVPCAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LocalGatewayRouteTableVPCAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation_tags.go b/goformation/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation_tags.go
new file mode 100644
index 0000000000..a05a349b2a
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-localgatewayroutetablevpcassociation_tags.go
@@ -0,0 +1,36 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// LocalGatewayRouteTableVPCAssociation_Tags AWS CloudFormation Resource (AWS::EC2::LocalGatewayRouteTableVPCAssociation.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-localgatewayroutetablevpcassociation-tags.html
+type LocalGatewayRouteTableVPCAssociation_Tags struct {
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-localgatewayroutetablevpcassociation-tags.html#cfn-ec2-localgatewayroutetablevpcassociation-tags-tags
+	Tags []cloudformation.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 *LocalGatewayRouteTableVPCAssociation_Tags) AWSCloudFormationType() string {
+	return "AWS::EC2::LocalGatewayRouteTableVPCAssociation.Tags"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-natgateway.go b/goformation/cloudformation/ec2/aws-ec2-natgateway.go
new file mode 100644
index 0000000000..a364a9cbfe
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-natgateway.go
@@ -0,0 +1,124 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// NatGateway AWS CloudFormation Resource (AWS::EC2::NatGateway)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-natgateway.html
+type NatGateway struct {
+
+	// AllocationId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-natgateway.html#cfn-ec2-natgateway-allocationid
+	AllocationId *types.Value `json:"AllocationId,omitempty"`
+
+	// ConnectivityType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-natgateway.html#cfn-ec2-natgateway-connectivitytype
+	ConnectivityType *types.Value `json:"ConnectivityType,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-natgateway.html#cfn-ec2-natgateway-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-natgateway.html#cfn-ec2-natgateway-tags
+	Tags []cloudformation.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 *NatGateway) AWSCloudFormationType() string {
+	return "AWS::EC2::NatGateway"
+}
+
+// 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 NatGateway) MarshalJSON() ([]byte, error) {
+	type Properties NatGateway
+	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 *NatGateway) UnmarshalJSON(b []byte) error {
+	type Properties NatGateway
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = NatGateway(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-networkacl.go b/goformation/cloudformation/ec2/aws-ec2-networkacl.go
new file mode 100644
index 0000000000..bd4d9f1436
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkacl.go
@@ -0,0 +1,114 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkAcl AWS CloudFormation Resource (AWS::EC2::NetworkAcl)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkacl.html
+type NetworkAcl struct {
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkacl.html#cfn-ec2-networkacl-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkacl.html#cfn-ec2-networkacl-vpcid
+	VpcId *types.Value `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 *NetworkAcl) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkAcl"
+}
+
+// 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 NetworkAcl) MarshalJSON() ([]byte, error) {
+	type Properties NetworkAcl
+	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 *NetworkAcl) UnmarshalJSON(b []byte) error {
+	type Properties NetworkAcl
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = NetworkAcl(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-networkaclentry.go b/goformation/cloudformation/ec2/aws-ec2-networkaclentry.go
new file mode 100644
index 0000000000..4b3b20b5e1
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkaclentry.go
@@ -0,0 +1,148 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkAclEntry AWS CloudFormation Resource (AWS::EC2::NetworkAclEntry)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkaclentry.html
+type NetworkAclEntry struct {
+
+	// CidrBlock AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkaclentry.html#cfn-ec2-networkaclentry-cidrblock
+	CidrBlock *types.Value `json:"CidrBlock,omitempty"`
+
+	// Egress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkaclentry.html#cfn-ec2-networkaclentry-egress
+	Egress *types.Value `json:"Egress,omitempty"`
+
+	// Icmp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkaclentry.html#cfn-ec2-networkaclentry-icmp
+	Icmp *NetworkAclEntry_Icmp `json:"Icmp,omitempty"`
+
+	// Ipv6CidrBlock AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkaclentry.html#cfn-ec2-networkaclentry-ipv6cidrblock
+	Ipv6CidrBlock *types.Value `json:"Ipv6CidrBlock,omitempty"`
+
+	// NetworkAclId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkaclentry.html#cfn-ec2-networkaclentry-networkaclid
+	NetworkAclId *types.Value `json:"NetworkAclId,omitempty"`
+
+	// PortRange AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkaclentry.html#cfn-ec2-networkaclentry-portrange
+	PortRange *NetworkAclEntry_PortRange `json:"PortRange,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkaclentry.html#cfn-ec2-networkaclentry-protocol
+	Protocol *types.Value `json:"Protocol"`
+
+	// RuleAction AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkaclentry.html#cfn-ec2-networkaclentry-ruleaction
+	RuleAction *types.Value `json:"RuleAction,omitempty"`
+
+	// RuleNumber AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkaclentry.html#cfn-ec2-networkaclentry-rulenumber
+	RuleNumber *types.Value `json:"RuleNumber"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NetworkAclEntry) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkAclEntry"
+}
+
+// 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 NetworkAclEntry) MarshalJSON() ([]byte, error) {
+	type Properties NetworkAclEntry
+	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 *NetworkAclEntry) UnmarshalJSON(b []byte) error {
+	type Properties NetworkAclEntry
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = NetworkAclEntry(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-networkaclentry_icmp.go b/goformation/cloudformation/ec2/aws-ec2-networkaclentry_icmp.go
new file mode 100644
index 0000000000..bd346dcd46
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkaclentry_icmp.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkAclEntry_Icmp AWS CloudFormation Resource (AWS::EC2::NetworkAclEntry.Icmp)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkaclentry-icmp.html
+type NetworkAclEntry_Icmp struct {
+
+	// Code AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkaclentry-icmp.html#cfn-ec2-networkaclentry-icmp-code
+	Code *types.Value `json:"Code,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkaclentry-icmp.html#cfn-ec2-networkaclentry-icmp-type
+	Type *types.Value `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 *NetworkAclEntry_Icmp) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkAclEntry.Icmp"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkaclentry_portrange.go b/goformation/cloudformation/ec2/aws-ec2-networkaclentry_portrange.go
new file mode 100644
index 0000000000..03efe69ff5
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkaclentry_portrange.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkAclEntry_PortRange AWS CloudFormation Resource (AWS::EC2::NetworkAclEntry.PortRange)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkaclentry-portrange.html
+type NetworkAclEntry_PortRange struct {
+
+	// From AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkaclentry-portrange.html#cfn-ec2-networkaclentry-portrange-from
+	From *types.Value `json:"From,omitempty"`
+
+	// To AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkaclentry-portrange.html#cfn-ec2-networkaclentry-portrange-to
+	To *types.Value `json:"To,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NetworkAclEntry_PortRange) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkAclEntry.PortRange"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis.go b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis.go
new file mode 100644
index 0000000000..9298c77874
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis.go
@@ -0,0 +1,119 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkInsightsAnalysis AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinsightsanalysis.html
+type NetworkInsightsAnalysis struct {
+
+	// FilterInArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinsightsanalysis.html#cfn-ec2-networkinsightsanalysis-filterinarns
+	FilterInArns *types.Value `json:"FilterInArns,omitempty"`
+
+	// NetworkInsightsPathId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinsightsanalysis.html#cfn-ec2-networkinsightsanalysis-networkinsightspathid
+	NetworkInsightsPathId *types.Value `json:"NetworkInsightsPathId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinsightsanalysis.html#cfn-ec2-networkinsightsanalysis-tags
+	Tags []cloudformation.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 *NetworkInsightsAnalysis) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkInsightsAnalysis"
+}
+
+// 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 NetworkInsightsAnalysis) MarshalJSON() ([]byte, error) {
+	type Properties NetworkInsightsAnalysis
+	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 *NetworkInsightsAnalysis) UnmarshalJSON(b []byte) error {
+	type Properties NetworkInsightsAnalysis
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = NetworkInsightsAnalysis(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_alternatepathhint.go b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_alternatepathhint.go
new file mode 100644
index 0000000000..87f739e470
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_alternatepathhint.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkInsightsAnalysis_AlternatePathHint AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.AlternatePathHint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-alternatepathhint.html
+type NetworkInsightsAnalysis_AlternatePathHint struct {
+
+	// ComponentArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-alternatepathhint.html#cfn-ec2-networkinsightsanalysis-alternatepathhint-componentarn
+	ComponentArn *types.Value `json:"ComponentArn,omitempty"`
+
+	// ComponentId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-alternatepathhint.html#cfn-ec2-networkinsightsanalysis-alternatepathhint-componentid
+	ComponentId *types.Value `json:"ComponentId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NetworkInsightsAnalysis_AlternatePathHint) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkInsightsAnalysis.AlternatePathHint"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisaclrule.go b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisaclrule.go
new file mode 100644
index 0000000000..b44b752885
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisaclrule.go
@@ -0,0 +1,62 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkInsightsAnalysis_AnalysisAclRule AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisaclrule.html
+type NetworkInsightsAnalysis_AnalysisAclRule struct {
+
+	// Cidr AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisaclrule.html#cfn-ec2-networkinsightsanalysis-analysisaclrule-cidr
+	Cidr *types.Value `json:"Cidr,omitempty"`
+
+	// Egress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisaclrule.html#cfn-ec2-networkinsightsanalysis-analysisaclrule-egress
+	Egress *types.Value `json:"Egress,omitempty"`
+
+	// PortRange AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisaclrule.html#cfn-ec2-networkinsightsanalysis-analysisaclrule-portrange
+	PortRange *NetworkInsightsAnalysis_PortRange `json:"PortRange,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisaclrule.html#cfn-ec2-networkinsightsanalysis-analysisaclrule-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// RuleAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisaclrule.html#cfn-ec2-networkinsightsanalysis-analysisaclrule-ruleaction
+	RuleAction *types.Value `json:"RuleAction,omitempty"`
+
+	// RuleNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisaclrule.html#cfn-ec2-networkinsightsanalysis-analysisaclrule-rulenumber
+	RuleNumber *types.Value `json:"RuleNumber,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NetworkInsightsAnalysis_AnalysisAclRule) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysiscomponent.go b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysiscomponent.go
new file mode 100644
index 0000000000..cf1572d5b2
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysiscomponent.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkInsightsAnalysis_AnalysisComponent AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysiscomponent.html
+type NetworkInsightsAnalysis_AnalysisComponent struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysiscomponent.html#cfn-ec2-networkinsightsanalysis-analysiscomponent-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysiscomponent.html#cfn-ec2-networkinsightsanalysis-analysiscomponent-id
+	Id *types.Value `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 *NetworkInsightsAnalysis_AnalysisComponent) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancerlistener.go b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancerlistener.go
new file mode 100644
index 0000000000..94b14046dd
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancerlistener.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkInsightsAnalysis_AnalysisLoadBalancerListener AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerListener)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisloadbalancerlistener.html
+type NetworkInsightsAnalysis_AnalysisLoadBalancerListener struct {
+
+	// InstancePort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisloadbalancerlistener.html#cfn-ec2-networkinsightsanalysis-analysisloadbalancerlistener-instanceport
+	InstancePort *types.Value `json:"InstancePort,omitempty"`
+
+	// LoadBalancerPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisloadbalancerlistener.html#cfn-ec2-networkinsightsanalysis-analysisloadbalancerlistener-loadbalancerport
+	LoadBalancerPort *types.Value `json:"LoadBalancerPort,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NetworkInsightsAnalysis_AnalysisLoadBalancerListener) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerListener"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancertarget.go b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancertarget.go
new file mode 100644
index 0000000000..c3745bbaa3
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisloadbalancertarget.go
@@ -0,0 +1,52 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkInsightsAnalysis_AnalysisLoadBalancerTarget AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisloadbalancertarget.html
+type NetworkInsightsAnalysis_AnalysisLoadBalancerTarget struct {
+
+	// Address AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisloadbalancertarget.html#cfn-ec2-networkinsightsanalysis-analysisloadbalancertarget-address
+	Address *types.Value `json:"Address,omitempty"`
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisloadbalancertarget.html#cfn-ec2-networkinsightsanalysis-analysisloadbalancertarget-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// Instance AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisloadbalancertarget.html#cfn-ec2-networkinsightsanalysis-analysisloadbalancertarget-instance
+	Instance *NetworkInsightsAnalysis_AnalysisComponent `json:"Instance,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisloadbalancertarget.html#cfn-ec2-networkinsightsanalysis-analysisloadbalancertarget-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NetworkInsightsAnalysis_AnalysisLoadBalancerTarget) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerTarget"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysispacketheader.go b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysispacketheader.go
new file mode 100644
index 0000000000..63306fc50f
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysispacketheader.go
@@ -0,0 +1,57 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkInsightsAnalysis_AnalysisPacketHeader AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysispacketheader.html
+type NetworkInsightsAnalysis_AnalysisPacketHeader struct {
+
+	// DestinationAddresses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysispacketheader.html#cfn-ec2-networkinsightsanalysis-analysispacketheader-destinationaddresses
+	DestinationAddresses *types.Value `json:"DestinationAddresses,omitempty"`
+
+	// DestinationPortRanges AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysispacketheader.html#cfn-ec2-networkinsightsanalysis-analysispacketheader-destinationportranges
+	DestinationPortRanges []NetworkInsightsAnalysis_PortRange `json:"DestinationPortRanges,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysispacketheader.html#cfn-ec2-networkinsightsanalysis-analysispacketheader-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// SourceAddresses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysispacketheader.html#cfn-ec2-networkinsightsanalysis-analysispacketheader-sourceaddresses
+	SourceAddresses *types.Value `json:"SourceAddresses,omitempty"`
+
+	// SourcePortRanges AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysispacketheader.html#cfn-ec2-networkinsightsanalysis-analysispacketheader-sourceportranges
+	SourcePortRanges []NetworkInsightsAnalysis_PortRange `json:"SourcePortRanges,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NetworkInsightsAnalysis_AnalysisPacketHeader) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisroutetableroute.go b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisroutetableroute.go
new file mode 100644
index 0000000000..9072c8a9d9
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysisroutetableroute.go
@@ -0,0 +1,82 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkInsightsAnalysis_AnalysisRouteTableRoute AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.AnalysisRouteTableRoute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisroutetableroute.html
+type NetworkInsightsAnalysis_AnalysisRouteTableRoute struct {
+
+	// NatGatewayId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisroutetableroute.html#cfn-ec2-networkinsightsanalysis-analysisroutetableroute-natgatewayid
+	NatGatewayId *types.Value `json:"NatGatewayId,omitempty"`
+
+	// NetworkInterfaceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisroutetableroute.html#cfn-ec2-networkinsightsanalysis-analysisroutetableroute-networkinterfaceid
+	NetworkInterfaceId *types.Value `json:"NetworkInterfaceId,omitempty"`
+
+	// Origin AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisroutetableroute.html#cfn-ec2-networkinsightsanalysis-analysisroutetableroute-origin
+	Origin *types.Value `json:"Origin,omitempty"`
+
+	// TransitGatewayId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisroutetableroute.html#cfn-ec2-networkinsightsanalysis-analysisroutetableroute-transitgatewayid
+	TransitGatewayId *types.Value `json:"TransitGatewayId,omitempty"`
+
+	// VpcPeeringConnectionId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisroutetableroute.html#cfn-ec2-networkinsightsanalysis-analysisroutetableroute-vpcpeeringconnectionid
+	VpcPeeringConnectionId *types.Value `json:"VpcPeeringConnectionId,omitempty"`
+
+	// destinationCidr AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisroutetableroute.html#cfn-ec2-networkinsightsanalysis-analysisroutetableroute-destinationcidr
+	destinationCidr *types.Value `json:"destinationCidr,omitempty"`
+
+	// destinationPrefixListId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisroutetableroute.html#cfn-ec2-networkinsightsanalysis-analysisroutetableroute-destinationprefixlistid
+	destinationPrefixListId *types.Value `json:"destinationPrefixListId,omitempty"`
+
+	// egressOnlyInternetGatewayId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisroutetableroute.html#cfn-ec2-networkinsightsanalysis-analysisroutetableroute-egressonlyinternetgatewayid
+	egressOnlyInternetGatewayId *types.Value `json:"egressOnlyInternetGatewayId,omitempty"`
+
+	// gatewayId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisroutetableroute.html#cfn-ec2-networkinsightsanalysis-analysisroutetableroute-gatewayid
+	gatewayId *types.Value `json:"gatewayId,omitempty"`
+
+	// instanceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysisroutetableroute.html#cfn-ec2-networkinsightsanalysis-analysisroutetableroute-instanceid
+	instanceId *types.Value `json:"instanceId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NetworkInsightsAnalysis_AnalysisRouteTableRoute) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkInsightsAnalysis.AnalysisRouteTableRoute"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysissecuritygrouprule.go b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysissecuritygrouprule.go
new file mode 100644
index 0000000000..4379233f45
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_analysissecuritygrouprule.go
@@ -0,0 +1,62 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkInsightsAnalysis_AnalysisSecurityGroupRule AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.AnalysisSecurityGroupRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysissecuritygrouprule.html
+type NetworkInsightsAnalysis_AnalysisSecurityGroupRule struct {
+
+	// Cidr AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysissecuritygrouprule.html#cfn-ec2-networkinsightsanalysis-analysissecuritygrouprule-cidr
+	Cidr *types.Value `json:"Cidr,omitempty"`
+
+	// Direction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysissecuritygrouprule.html#cfn-ec2-networkinsightsanalysis-analysissecuritygrouprule-direction
+	Direction *types.Value `json:"Direction,omitempty"`
+
+	// PortRange AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysissecuritygrouprule.html#cfn-ec2-networkinsightsanalysis-analysissecuritygrouprule-portrange
+	PortRange *NetworkInsightsAnalysis_PortRange `json:"PortRange,omitempty"`
+
+	// PrefixListId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysissecuritygrouprule.html#cfn-ec2-networkinsightsanalysis-analysissecuritygrouprule-prefixlistid
+	PrefixListId *types.Value `json:"PrefixListId,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysissecuritygrouprule.html#cfn-ec2-networkinsightsanalysis-analysissecuritygrouprule-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// SecurityGroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-analysissecuritygrouprule.html#cfn-ec2-networkinsightsanalysis-analysissecuritygrouprule-securitygroupid
+	SecurityGroupId *types.Value `json:"SecurityGroupId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NetworkInsightsAnalysis_AnalysisSecurityGroupRule) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkInsightsAnalysis.AnalysisSecurityGroupRule"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_explanation.go b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_explanation.go
new file mode 100644
index 0000000000..e933440d4d
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_explanation.go
@@ -0,0 +1,257 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkInsightsAnalysis_Explanation AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.Explanation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html
+type NetworkInsightsAnalysis_Explanation struct {
+
+	// Acl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-acl
+	Acl *NetworkInsightsAnalysis_AnalysisComponent `json:"Acl,omitempty"`
+
+	// AclRule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-aclrule
+	AclRule *NetworkInsightsAnalysis_AnalysisAclRule `json:"AclRule,omitempty"`
+
+	// Address AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-address
+	Address *types.Value `json:"Address,omitempty"`
+
+	// Addresses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-addresses
+	Addresses *types.Value `json:"Addresses,omitempty"`
+
+	// AttachedTo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-attachedto
+	AttachedTo *NetworkInsightsAnalysis_AnalysisComponent `json:"AttachedTo,omitempty"`
+
+	// AvailabilityZones AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-availabilityzones
+	AvailabilityZones *types.Value `json:"AvailabilityZones,omitempty"`
+
+	// Cidrs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-cidrs
+	Cidrs *types.Value `json:"Cidrs,omitempty"`
+
+	// ClassicLoadBalancerListener AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-classicloadbalancerlistener
+	ClassicLoadBalancerListener *NetworkInsightsAnalysis_AnalysisLoadBalancerListener `json:"ClassicLoadBalancerListener,omitempty"`
+
+	// Component AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-component
+	Component *NetworkInsightsAnalysis_AnalysisComponent `json:"Component,omitempty"`
+
+	// CustomerGateway AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-customergateway
+	CustomerGateway *NetworkInsightsAnalysis_AnalysisComponent `json:"CustomerGateway,omitempty"`
+
+	// Destination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-destination
+	Destination *NetworkInsightsAnalysis_AnalysisComponent `json:"Destination,omitempty"`
+
+	// DestinationVpc AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-destinationvpc
+	DestinationVpc *NetworkInsightsAnalysis_AnalysisComponent `json:"DestinationVpc,omitempty"`
+
+	// Direction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-direction
+	Direction *types.Value `json:"Direction,omitempty"`
+
+	// ElasticLoadBalancerListener AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-elasticloadbalancerlistener
+	ElasticLoadBalancerListener *NetworkInsightsAnalysis_AnalysisComponent `json:"ElasticLoadBalancerListener,omitempty"`
+
+	// ExplanationCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-explanationcode
+	ExplanationCode *types.Value `json:"ExplanationCode,omitempty"`
+
+	// IngressRouteTable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-ingressroutetable
+	IngressRouteTable *NetworkInsightsAnalysis_AnalysisComponent `json:"IngressRouteTable,omitempty"`
+
+	// InternetGateway AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-internetgateway
+	InternetGateway *NetworkInsightsAnalysis_AnalysisComponent `json:"InternetGateway,omitempty"`
+
+	// LoadBalancerArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-loadbalancerarn
+	LoadBalancerArn *types.Value `json:"LoadBalancerArn,omitempty"`
+
+	// LoadBalancerListenerPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-loadbalancerlistenerport
+	LoadBalancerListenerPort *types.Value `json:"LoadBalancerListenerPort,omitempty"`
+
+	// LoadBalancerTarget AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-loadbalancertarget
+	LoadBalancerTarget *NetworkInsightsAnalysis_AnalysisLoadBalancerTarget `json:"LoadBalancerTarget,omitempty"`
+
+	// LoadBalancerTargetGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-loadbalancertargetgroup
+	LoadBalancerTargetGroup *NetworkInsightsAnalysis_AnalysisComponent `json:"LoadBalancerTargetGroup,omitempty"`
+
+	// LoadBalancerTargetGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-loadbalancertargetgroups
+	LoadBalancerTargetGroups []NetworkInsightsAnalysis_AnalysisComponent `json:"LoadBalancerTargetGroups,omitempty"`
+
+	// LoadBalancerTargetPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-loadbalancertargetport
+	LoadBalancerTargetPort *types.Value `json:"LoadBalancerTargetPort,omitempty"`
+
+	// MissingComponent AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-missingcomponent
+	MissingComponent *types.Value `json:"MissingComponent,omitempty"`
+
+	// NatGateway AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-natgateway
+	NatGateway *NetworkInsightsAnalysis_AnalysisComponent `json:"NatGateway,omitempty"`
+
+	// NetworkInterface AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-networkinterface
+	NetworkInterface *NetworkInsightsAnalysis_AnalysisComponent `json:"NetworkInterface,omitempty"`
+
+	// PacketField AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-packetfield
+	PacketField *types.Value `json:"PacketField,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// PortRanges AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-portranges
+	PortRanges []NetworkInsightsAnalysis_PortRange `json:"PortRanges,omitempty"`
+
+	// PrefixList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-prefixlist
+	PrefixList *NetworkInsightsAnalysis_AnalysisComponent `json:"PrefixList,omitempty"`
+
+	// Protocols AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-protocols
+	Protocols *types.Value `json:"Protocols,omitempty"`
+
+	// RouteTable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-routetable
+	RouteTable *NetworkInsightsAnalysis_AnalysisComponent `json:"RouteTable,omitempty"`
+
+	// RouteTableRoute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-routetableroute
+	RouteTableRoute *NetworkInsightsAnalysis_AnalysisRouteTableRoute `json:"RouteTableRoute,omitempty"`
+
+	// SecurityGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-securitygroup
+	SecurityGroup *NetworkInsightsAnalysis_AnalysisComponent `json:"SecurityGroup,omitempty"`
+
+	// SecurityGroupRule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-securitygrouprule
+	SecurityGroupRule *NetworkInsightsAnalysis_AnalysisSecurityGroupRule `json:"SecurityGroupRule,omitempty"`
+
+	// SecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-securitygroups
+	SecurityGroups []NetworkInsightsAnalysis_AnalysisComponent `json:"SecurityGroups,omitempty"`
+
+	// SourceVpc AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-sourcevpc
+	SourceVpc *NetworkInsightsAnalysis_AnalysisComponent `json:"SourceVpc,omitempty"`
+
+	// State AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-state
+	State *types.Value `json:"State,omitempty"`
+
+	// Subnet AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-subnet
+	Subnet *NetworkInsightsAnalysis_AnalysisComponent `json:"Subnet,omitempty"`
+
+	// SubnetRouteTable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-subnetroutetable
+	SubnetRouteTable *NetworkInsightsAnalysis_AnalysisComponent `json:"SubnetRouteTable,omitempty"`
+
+	// Vpc AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-vpc
+	Vpc *NetworkInsightsAnalysis_AnalysisComponent `json:"Vpc,omitempty"`
+
+	// VpcPeeringConnection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-vpcpeeringconnection
+	VpcPeeringConnection *NetworkInsightsAnalysis_AnalysisComponent `json:"VpcPeeringConnection,omitempty"`
+
+	// VpnConnection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-vpnconnection
+	VpnConnection *NetworkInsightsAnalysis_AnalysisComponent `json:"VpnConnection,omitempty"`
+
+	// VpnGateway AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-vpngateway
+	VpnGateway *NetworkInsightsAnalysis_AnalysisComponent `json:"VpnGateway,omitempty"`
+
+	// vpcEndpoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-explanation.html#cfn-ec2-networkinsightsanalysis-explanation-vpcendpoint
+	vpcEndpoint *NetworkInsightsAnalysis_AnalysisComponent `json:"vpcEndpoint,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NetworkInsightsAnalysis_Explanation) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkInsightsAnalysis.Explanation"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_pathcomponent.go b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_pathcomponent.go
new file mode 100644
index 0000000000..af2f7265d2
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_pathcomponent.go
@@ -0,0 +1,87 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkInsightsAnalysis_PathComponent AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.PathComponent)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-pathcomponent.html
+type NetworkInsightsAnalysis_PathComponent struct {
+
+	// AclRule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-pathcomponent.html#cfn-ec2-networkinsightsanalysis-pathcomponent-aclrule
+	AclRule *NetworkInsightsAnalysis_AnalysisAclRule `json:"AclRule,omitempty"`
+
+	// Component AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-pathcomponent.html#cfn-ec2-networkinsightsanalysis-pathcomponent-component
+	Component *NetworkInsightsAnalysis_AnalysisComponent `json:"Component,omitempty"`
+
+	// DestinationVpc AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-pathcomponent.html#cfn-ec2-networkinsightsanalysis-pathcomponent-destinationvpc
+	DestinationVpc *NetworkInsightsAnalysis_AnalysisComponent `json:"DestinationVpc,omitempty"`
+
+	// InboundHeader AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-pathcomponent.html#cfn-ec2-networkinsightsanalysis-pathcomponent-inboundheader
+	InboundHeader *NetworkInsightsAnalysis_AnalysisPacketHeader `json:"InboundHeader,omitempty"`
+
+	// OutboundHeader AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-pathcomponent.html#cfn-ec2-networkinsightsanalysis-pathcomponent-outboundheader
+	OutboundHeader *NetworkInsightsAnalysis_AnalysisPacketHeader `json:"OutboundHeader,omitempty"`
+
+	// RouteTableRoute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-pathcomponent.html#cfn-ec2-networkinsightsanalysis-pathcomponent-routetableroute
+	RouteTableRoute *NetworkInsightsAnalysis_AnalysisRouteTableRoute `json:"RouteTableRoute,omitempty"`
+
+	// SecurityGroupRule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-pathcomponent.html#cfn-ec2-networkinsightsanalysis-pathcomponent-securitygrouprule
+	SecurityGroupRule *NetworkInsightsAnalysis_AnalysisSecurityGroupRule `json:"SecurityGroupRule,omitempty"`
+
+	// SequenceNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-pathcomponent.html#cfn-ec2-networkinsightsanalysis-pathcomponent-sequencenumber
+	SequenceNumber *types.Value `json:"SequenceNumber,omitempty"`
+
+	// SourceVpc AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-pathcomponent.html#cfn-ec2-networkinsightsanalysis-pathcomponent-sourcevpc
+	SourceVpc *NetworkInsightsAnalysis_AnalysisComponent `json:"SourceVpc,omitempty"`
+
+	// Subnet AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-pathcomponent.html#cfn-ec2-networkinsightsanalysis-pathcomponent-subnet
+	Subnet *NetworkInsightsAnalysis_AnalysisComponent `json:"Subnet,omitempty"`
+
+	// Vpc AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-pathcomponent.html#cfn-ec2-networkinsightsanalysis-pathcomponent-vpc
+	Vpc *NetworkInsightsAnalysis_AnalysisComponent `json:"Vpc,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NetworkInsightsAnalysis_PathComponent) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkInsightsAnalysis.PathComponent"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_portrange.go b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_portrange.go
new file mode 100644
index 0000000000..c352f478ee
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkinsightsanalysis_portrange.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkInsightsAnalysis_PortRange AWS CloudFormation Resource (AWS::EC2::NetworkInsightsAnalysis.PortRange)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-portrange.html
+type NetworkInsightsAnalysis_PortRange struct {
+
+	// From AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-portrange.html#cfn-ec2-networkinsightsanalysis-portrange-from
+	From *types.Value `json:"From,omitempty"`
+
+	// To AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinsightsanalysis-portrange.html#cfn-ec2-networkinsightsanalysis-portrange-to
+	To *types.Value `json:"To,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NetworkInsightsAnalysis_PortRange) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkInsightsAnalysis.PortRange"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinsightspath.go b/goformation/cloudformation/ec2/aws-ec2-networkinsightspath.go
new file mode 100644
index 0000000000..92e6f14fc7
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkinsightspath.go
@@ -0,0 +1,139 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkInsightsPath AWS CloudFormation Resource (AWS::EC2::NetworkInsightsPath)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinsightspath.html
+type NetworkInsightsPath struct {
+
+	// Destination AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinsightspath.html#cfn-ec2-networkinsightspath-destination
+	Destination *types.Value `json:"Destination,omitempty"`
+
+	// DestinationIp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinsightspath.html#cfn-ec2-networkinsightspath-destinationip
+	DestinationIp *types.Value `json:"DestinationIp,omitempty"`
+
+	// DestinationPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinsightspath.html#cfn-ec2-networkinsightspath-destinationport
+	DestinationPort *types.Value `json:"DestinationPort,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinsightspath.html#cfn-ec2-networkinsightspath-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// Source AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinsightspath.html#cfn-ec2-networkinsightspath-source
+	Source *types.Value `json:"Source,omitempty"`
+
+	// SourceIp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinsightspath.html#cfn-ec2-networkinsightspath-sourceip
+	SourceIp *types.Value `json:"SourceIp,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinsightspath.html#cfn-ec2-networkinsightspath-tags
+	Tags []cloudformation.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 *NetworkInsightsPath) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkInsightsPath"
+}
+
+// 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 NetworkInsightsPath) MarshalJSON() ([]byte, error) {
+	type Properties NetworkInsightsPath
+	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 *NetworkInsightsPath) UnmarshalJSON(b []byte) error {
+	type Properties NetworkInsightsPath
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = NetworkInsightsPath(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-networkinterface.go b/goformation/cloudformation/ec2/aws-ec2-networkinterface.go
new file mode 100644
index 0000000000..0b3af9a2eb
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkinterface.go
@@ -0,0 +1,159 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkInterface AWS CloudFormation Resource (AWS::EC2::NetworkInterface)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterface.html
+type NetworkInterface struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterface.html#cfn-ec2-networkinterface-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// GroupSet AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterface.html#cfn-ec2-networkinterface-groupset
+	GroupSet *types.Value `json:"GroupSet,omitempty"`
+
+	// InterfaceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterface.html#cfn-ec2-networkinterface-interfacetype
+	InterfaceType *types.Value `json:"InterfaceType,omitempty"`
+
+	// Ipv6AddressCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterface.html#cfn-ec2-networkinterface-ipv6addresscount
+	Ipv6AddressCount *types.Value `json:"Ipv6AddressCount,omitempty"`
+
+	// Ipv6Addresses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterface.html#cfn-ec2-networkinterface-ipv6addresses
+	Ipv6Addresses []NetworkInterface_InstanceIpv6Address `json:"Ipv6Addresses,omitempty"`
+
+	// PrivateIpAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterface.html#cfn-ec2-networkinterface-privateipaddress
+	PrivateIpAddress *types.Value `json:"PrivateIpAddress,omitempty"`
+
+	// PrivateIpAddresses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterface.html#cfn-ec2-networkinterface-privateipaddresses
+	PrivateIpAddresses []NetworkInterface_PrivateIpAddressSpecification `json:"PrivateIpAddresses,omitempty"`
+
+	// SecondaryPrivateIpAddressCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterface.html#cfn-ec2-networkinterface-secondaryprivateipaddresscount
+	SecondaryPrivateIpAddressCount *types.Value `json:"SecondaryPrivateIpAddressCount,omitempty"`
+
+	// SourceDestCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterface.html#cfn-ec2-networkinterface-sourcedestcheck
+	SourceDestCheck *types.Value `json:"SourceDestCheck,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterface.html#cfn-ec2-networkinterface-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterface.html#cfn-ec2-networkinterface-tags
+	Tags []cloudformation.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 *NetworkInterface) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkInterface"
+}
+
+// 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 NetworkInterface) MarshalJSON() ([]byte, error) {
+	type Properties NetworkInterface
+	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 *NetworkInterface) UnmarshalJSON(b []byte) error {
+	type Properties NetworkInterface
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = NetworkInterface(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-networkinterface_instanceipv6address.go b/goformation/cloudformation/ec2/aws-ec2-networkinterface_instanceipv6address.go
new file mode 100644
index 0000000000..868e462b5f
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkinterface_instanceipv6address.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkInterface_InstanceIpv6Address AWS CloudFormation Resource (AWS::EC2::NetworkInterface.InstanceIpv6Address)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinterface-instanceipv6address.html
+type NetworkInterface_InstanceIpv6Address struct {
+
+	// Ipv6Address AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinterface-instanceipv6address.html#cfn-ec2-networkinterface-instanceipv6address-ipv6address
+	Ipv6Address *types.Value `json:"Ipv6Address,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NetworkInterface_InstanceIpv6Address) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkInterface.InstanceIpv6Address"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinterface_privateipaddressspecification.go b/goformation/cloudformation/ec2/aws-ec2-networkinterface_privateipaddressspecification.go
new file mode 100644
index 0000000000..d37d20d0af
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkinterface_privateipaddressspecification.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkInterface_PrivateIpAddressSpecification AWS CloudFormation Resource (AWS::EC2::NetworkInterface.PrivateIpAddressSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinterface-privateipaddressspecification.html
+type NetworkInterface_PrivateIpAddressSpecification struct {
+
+	// Primary AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinterface-privateipaddressspecification.html#cfn-ec2-networkinterface-privateipaddressspecification-primary
+	Primary *types.Value `json:"Primary"`
+
+	// PrivateIpAddress AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-networkinterface-privateipaddressspecification.html#cfn-ec2-networkinterface-privateipaddressspecification-privateipaddress
+	PrivateIpAddress *types.Value `json:"PrivateIpAddress,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NetworkInterface_PrivateIpAddressSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkInterface.PrivateIpAddressSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-networkinterfaceattachment.go b/goformation/cloudformation/ec2/aws-ec2-networkinterfaceattachment.go
new file mode 100644
index 0000000000..c0bcb195c4
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkinterfaceattachment.go
@@ -0,0 +1,123 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkInterfaceAttachment AWS CloudFormation Resource (AWS::EC2::NetworkInterfaceAttachment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface-attachment.html
+type NetworkInterfaceAttachment struct {
+
+	// DeleteOnTermination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface-attachment.html#cfn-ec2-network-interface-attachment-deleteonterm
+	DeleteOnTermination *types.Value `json:"DeleteOnTermination,omitempty"`
+
+	// DeviceIndex AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface-attachment.html#cfn-ec2-network-interface-attachment-deviceindex
+	DeviceIndex *types.Value `json:"DeviceIndex,omitempty"`
+
+	// InstanceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface-attachment.html#cfn-ec2-network-interface-attachment-instanceid
+	InstanceId *types.Value `json:"InstanceId,omitempty"`
+
+	// NetworkInterfaceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-network-interface-attachment.html#cfn-ec2-network-interface-attachment-networkinterfaceid
+	NetworkInterfaceId *types.Value `json:"NetworkInterfaceId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NetworkInterfaceAttachment) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkInterfaceAttachment"
+}
+
+// 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 NetworkInterfaceAttachment) MarshalJSON() ([]byte, error) {
+	type Properties NetworkInterfaceAttachment
+	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 *NetworkInterfaceAttachment) UnmarshalJSON(b []byte) error {
+	type Properties NetworkInterfaceAttachment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = NetworkInterfaceAttachment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-networkinterfacepermission.go b/goformation/cloudformation/ec2/aws-ec2-networkinterfacepermission.go
new file mode 100644
index 0000000000..747cb018e6
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-networkinterfacepermission.go
@@ -0,0 +1,118 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NetworkInterfacePermission AWS CloudFormation Resource (AWS::EC2::NetworkInterfacePermission)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterfacepermission.html
+type NetworkInterfacePermission struct {
+
+	// AwsAccountId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterfacepermission.html#cfn-ec2-networkinterfacepermission-awsaccountid
+	AwsAccountId *types.Value `json:"AwsAccountId,omitempty"`
+
+	// NetworkInterfaceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterfacepermission.html#cfn-ec2-networkinterfacepermission-networkinterfaceid
+	NetworkInterfaceId *types.Value `json:"NetworkInterfaceId,omitempty"`
+
+	// Permission AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-networkinterfacepermission.html#cfn-ec2-networkinterfacepermission-permission
+	Permission *types.Value `json:"Permission,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NetworkInterfacePermission) AWSCloudFormationType() string {
+	return "AWS::EC2::NetworkInterfacePermission"
+}
+
+// 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 NetworkInterfacePermission) MarshalJSON() ([]byte, error) {
+	type Properties NetworkInterfacePermission
+	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 *NetworkInterfacePermission) UnmarshalJSON(b []byte) error {
+	type Properties NetworkInterfacePermission
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = NetworkInterfacePermission(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-placementgroup.go b/goformation/cloudformation/ec2/aws-ec2-placementgroup.go
new file mode 100644
index 0000000000..95c2e6aea6
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-placementgroup.go
@@ -0,0 +1,108 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PlacementGroup AWS CloudFormation Resource (AWS::EC2::PlacementGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-placementgroup.html
+type PlacementGroup struct {
+
+	// Strategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-placementgroup.html#cfn-ec2-placementgroup-strategy
+	Strategy *types.Value `json:"Strategy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PlacementGroup) AWSCloudFormationType() string {
+	return "AWS::EC2::PlacementGroup"
+}
+
+// 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 PlacementGroup) MarshalJSON() ([]byte, error) {
+	type Properties PlacementGroup
+	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 *PlacementGroup) UnmarshalJSON(b []byte) error {
+	type Properties PlacementGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PlacementGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-prefixlist.go b/goformation/cloudformation/ec2/aws-ec2-prefixlist.go
new file mode 100644
index 0000000000..55530a85f0
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-prefixlist.go
@@ -0,0 +1,129 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// PrefixList AWS CloudFormation Resource (AWS::EC2::PrefixList)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-prefixlist.html
+type PrefixList struct {
+
+	// AddressFamily AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-prefixlist.html#cfn-ec2-prefixlist-addressfamily
+	AddressFamily *types.Value `json:"AddressFamily,omitempty"`
+
+	// Entries AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-prefixlist.html#cfn-ec2-prefixlist-entries
+	Entries []PrefixList_Entry `json:"Entries,omitempty"`
+
+	// MaxEntries AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-prefixlist.html#cfn-ec2-prefixlist-maxentries
+	MaxEntries *types.Value `json:"MaxEntries"`
+
+	// PrefixListName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-prefixlist.html#cfn-ec2-prefixlist-prefixlistname
+	PrefixListName *types.Value `json:"PrefixListName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-prefixlist.html#cfn-ec2-prefixlist-tags
+	Tags []cloudformation.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 *PrefixList) AWSCloudFormationType() string {
+	return "AWS::EC2::PrefixList"
+}
+
+// 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 PrefixList) MarshalJSON() ([]byte, error) {
+	type Properties PrefixList
+	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 *PrefixList) UnmarshalJSON(b []byte) error {
+	type Properties PrefixList
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PrefixList(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-prefixlist_entry.go b/goformation/cloudformation/ec2/aws-ec2-prefixlist_entry.go
new file mode 100644
index 0000000000..4708992bdf
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-prefixlist_entry.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PrefixList_Entry AWS CloudFormation Resource (AWS::EC2::PrefixList.Entry)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-prefixlist-entry.html
+type PrefixList_Entry struct {
+
+	// Cidr AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-prefixlist-entry.html#cfn-ec2-prefixlist-entry-cidr
+	Cidr *types.Value `json:"Cidr,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-prefixlist-entry.html#cfn-ec2-prefixlist-entry-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PrefixList_Entry) AWSCloudFormationType() string {
+	return "AWS::EC2::PrefixList.Entry"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-route.go b/goformation/cloudformation/ec2/aws-ec2-route.go
new file mode 100644
index 0000000000..a99e2d4090
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-route.go
@@ -0,0 +1,168 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route AWS CloudFormation Resource (AWS::EC2::Route)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html
+type Route struct {
+
+	// CarrierGatewayId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-carriergatewayid
+	CarrierGatewayId *types.Value `json:"CarrierGatewayId,omitempty"`
+
+	// DestinationCidrBlock AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-destinationcidrblock
+	DestinationCidrBlock *types.Value `json:"DestinationCidrBlock,omitempty"`
+
+	// DestinationIpv6CidrBlock AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-destinationipv6cidrblock
+	DestinationIpv6CidrBlock *types.Value `json:"DestinationIpv6CidrBlock,omitempty"`
+
+	// EgressOnlyInternetGatewayId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-egressonlyinternetgatewayid
+	EgressOnlyInternetGatewayId *types.Value `json:"EgressOnlyInternetGatewayId,omitempty"`
+
+	// GatewayId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-gatewayid
+	GatewayId *types.Value `json:"GatewayId,omitempty"`
+
+	// InstanceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-instanceid
+	InstanceId *types.Value `json:"InstanceId,omitempty"`
+
+	// LocalGatewayId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-localgatewayid
+	LocalGatewayId *types.Value `json:"LocalGatewayId,omitempty"`
+
+	// NatGatewayId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-natgatewayid
+	NatGatewayId *types.Value `json:"NatGatewayId,omitempty"`
+
+	// NetworkInterfaceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-networkinterfaceid
+	NetworkInterfaceId *types.Value `json:"NetworkInterfaceId,omitempty"`
+
+	// RouteTableId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-routetableid
+	RouteTableId *types.Value `json:"RouteTableId,omitempty"`
+
+	// TransitGatewayId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-transitgatewayid
+	TransitGatewayId *types.Value `json:"TransitGatewayId,omitempty"`
+
+	// VpcEndpointId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-vpcendpointid
+	VpcEndpointId *types.Value `json:"VpcEndpointId,omitempty"`
+
+	// VpcPeeringConnectionId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-route.html#cfn-ec2-route-vpcpeeringconnectionid
+	VpcPeeringConnectionId *types.Value `json:"VpcPeeringConnectionId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route) AWSCloudFormationType() string {
+	return "AWS::EC2::Route"
+}
+
+// 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 Route) MarshalJSON() ([]byte, error) {
+	type Properties Route
+	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 *Route) UnmarshalJSON(b []byte) error {
+	type Properties Route
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Route(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-routetable.go b/goformation/cloudformation/ec2/aws-ec2-routetable.go
new file mode 100644
index 0000000000..2cf26cbe24
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-routetable.go
@@ -0,0 +1,114 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// RouteTable AWS CloudFormation Resource (AWS::EC2::RouteTable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-routetable.html
+type RouteTable struct {
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-routetable.html#cfn-ec2-routetable-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-routetable.html#cfn-ec2-routetable-vpcid
+	VpcId *types.Value `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 *RouteTable) AWSCloudFormationType() string {
+	return "AWS::EC2::RouteTable"
+}
+
+// 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 RouteTable) MarshalJSON() ([]byte, error) {
+	type Properties RouteTable
+	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 *RouteTable) UnmarshalJSON(b []byte) error {
+	type Properties RouteTable
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RouteTable(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-securitygroup.go b/goformation/cloudformation/ec2/aws-ec2-securitygroup.go
new file mode 100644
index 0000000000..a40adf774b
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-securitygroup.go
@@ -0,0 +1,134 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityGroup AWS CloudFormation Resource (AWS::EC2::SecurityGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group.html
+type SecurityGroup struct {
+
+	// GroupDescription AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group.html#cfn-ec2-securitygroup-groupdescription
+	GroupDescription *types.Value `json:"GroupDescription,omitempty"`
+
+	// GroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group.html#cfn-ec2-securitygroup-groupname
+	GroupName *types.Value `json:"GroupName,omitempty"`
+
+	// SecurityGroupEgress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group.html#cfn-ec2-securitygroup-securitygroupegress
+	SecurityGroupEgress []SecurityGroup_Egress `json:"SecurityGroupEgress,omitempty"`
+
+	// SecurityGroupIngress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group.html#cfn-ec2-securitygroup-securitygroupingress
+	SecurityGroupIngress []SecurityGroup_Ingress `json:"SecurityGroupIngress,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group.html#cfn-ec2-securitygroup-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group.html#cfn-ec2-securitygroup-vpcid
+	VpcId *types.Value `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 *SecurityGroup) AWSCloudFormationType() string {
+	return "AWS::EC2::SecurityGroup"
+}
+
+// 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 SecurityGroup) MarshalJSON() ([]byte, error) {
+	type Properties SecurityGroup
+	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 *SecurityGroup) UnmarshalJSON(b []byte) error {
+	type Properties SecurityGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SecurityGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-securitygroup_egress.go b/goformation/cloudformation/ec2/aws-ec2-securitygroup_egress.go
new file mode 100644
index 0000000000..e28592eeac
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-securitygroup_egress.go
@@ -0,0 +1,72 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityGroup_Egress AWS CloudFormation Resource (AWS::EC2::SecurityGroup.Egress)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html
+type SecurityGroup_Egress struct {
+
+	// CidrIp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-cidrip
+	CidrIp *types.Value `json:"CidrIp,omitempty"`
+
+	// CidrIpv6 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-cidripv6
+	CidrIpv6 *types.Value `json:"CidrIpv6,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DestinationPrefixListId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-destinationprefixlistid
+	DestinationPrefixListId *types.Value `json:"DestinationPrefixListId,omitempty"`
+
+	// DestinationSecurityGroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-destsecgroupid
+	DestinationSecurityGroupId *types.Value `json:"DestinationSecurityGroupId,omitempty"`
+
+	// FromPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-fromport
+	FromPort *types.Value `json:"FromPort,omitempty"`
+
+	// IpProtocol AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-ipprotocol
+	IpProtocol *types.Value `json:"IpProtocol,omitempty"`
+
+	// ToPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-toport
+	ToPort *types.Value `json:"ToPort,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SecurityGroup_Egress) AWSCloudFormationType() string {
+	return "AWS::EC2::SecurityGroup.Egress"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-securitygroup_ingress.go b/goformation/cloudformation/ec2/aws-ec2-securitygroup_ingress.go
new file mode 100644
index 0000000000..e130a2d275
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-securitygroup_ingress.go
@@ -0,0 +1,82 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityGroup_Ingress AWS CloudFormation Resource (AWS::EC2::SecurityGroup.Ingress)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html
+type SecurityGroup_Ingress struct {
+
+	// CidrIp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-cidrip
+	CidrIp *types.Value `json:"CidrIp,omitempty"`
+
+	// CidrIpv6 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-cidripv6
+	CidrIpv6 *types.Value `json:"CidrIpv6,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// FromPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-fromport
+	FromPort *types.Value `json:"FromPort,omitempty"`
+
+	// IpProtocol AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-ipprotocol
+	IpProtocol *types.Value `json:"IpProtocol,omitempty"`
+
+	// SourcePrefixListId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-securitygroup-ingress-sourceprefixlistid
+	SourcePrefixListId *types.Value `json:"SourcePrefixListId,omitempty"`
+
+	// SourceSecurityGroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-sourcesecuritygroupid
+	SourceSecurityGroupId *types.Value `json:"SourceSecurityGroupId,omitempty"`
+
+	// SourceSecurityGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-sourcesecuritygroupname
+	SourceSecurityGroupName *types.Value `json:"SourceSecurityGroupName,omitempty"`
+
+	// SourceSecurityGroupOwnerId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-sourcesecuritygroupownerid
+	SourceSecurityGroupOwnerId *types.Value `json:"SourceSecurityGroupOwnerId,omitempty"`
+
+	// ToPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-rule.html#cfn-ec2-security-group-rule-toport
+	ToPort *types.Value `json:"ToPort,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SecurityGroup_Ingress) AWSCloudFormationType() string {
+	return "AWS::EC2::SecurityGroup.Ingress"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-securitygroupegress.go b/goformation/cloudformation/ec2/aws-ec2-securitygroupegress.go
new file mode 100644
index 0000000000..a1fa830443
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-securitygroupegress.go
@@ -0,0 +1,148 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityGroupEgress AWS CloudFormation Resource (AWS::EC2::SecurityGroupEgress)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html
+type SecurityGroupEgress struct {
+
+	// CidrIp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html#cfn-ec2-securitygroupegress-cidrip
+	CidrIp *types.Value `json:"CidrIp,omitempty"`
+
+	// CidrIpv6 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html#cfn-ec2-securitygroupegress-cidripv6
+	CidrIpv6 *types.Value `json:"CidrIpv6,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html#cfn-ec2-securitygroupegress-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DestinationPrefixListId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html#cfn-ec2-securitygroupegress-destinationprefixlistid
+	DestinationPrefixListId *types.Value `json:"DestinationPrefixListId,omitempty"`
+
+	// DestinationSecurityGroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html#cfn-ec2-securitygroupegress-destinationsecuritygroupid
+	DestinationSecurityGroupId *types.Value `json:"DestinationSecurityGroupId,omitempty"`
+
+	// FromPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html#cfn-ec2-securitygroupegress-fromport
+	FromPort *types.Value `json:"FromPort,omitempty"`
+
+	// GroupId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html#cfn-ec2-securitygroupegress-groupid
+	GroupId *types.Value `json:"GroupId,omitempty"`
+
+	// IpProtocol AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html#cfn-ec2-securitygroupegress-ipprotocol
+	IpProtocol *types.Value `json:"IpProtocol,omitempty"`
+
+	// ToPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-security-group-egress.html#cfn-ec2-securitygroupegress-toport
+	ToPort *types.Value `json:"ToPort,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SecurityGroupEgress) AWSCloudFormationType() string {
+	return "AWS::EC2::SecurityGroupEgress"
+}
+
+// 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 SecurityGroupEgress) MarshalJSON() ([]byte, error) {
+	type Properties SecurityGroupEgress
+	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 *SecurityGroupEgress) UnmarshalJSON(b []byte) error {
+	type Properties SecurityGroupEgress
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SecurityGroupEgress(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-securitygroupingress.go b/goformation/cloudformation/ec2/aws-ec2-securitygroupingress.go
new file mode 100644
index 0000000000..91eba11be8
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-securitygroupingress.go
@@ -0,0 +1,163 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityGroupIngress AWS CloudFormation Resource (AWS::EC2::SecurityGroupIngress)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html
+type SecurityGroupIngress struct {
+
+	// CidrIp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-cidrip
+	CidrIp *types.Value `json:"CidrIp,omitempty"`
+
+	// CidrIpv6 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-cidripv6
+	CidrIpv6 *types.Value `json:"CidrIpv6,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// FromPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-fromport
+	FromPort *types.Value `json:"FromPort,omitempty"`
+
+	// GroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-groupid
+	GroupId *types.Value `json:"GroupId,omitempty"`
+
+	// GroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-groupname
+	GroupName *types.Value `json:"GroupName,omitempty"`
+
+	// IpProtocol AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-ipprotocol
+	IpProtocol *types.Value `json:"IpProtocol,omitempty"`
+
+	// SourcePrefixListId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-securitygroupingress-sourceprefixlistid
+	SourcePrefixListId *types.Value `json:"SourcePrefixListId,omitempty"`
+
+	// SourceSecurityGroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-sourcesecuritygroupid
+	SourceSecurityGroupId *types.Value `json:"SourceSecurityGroupId,omitempty"`
+
+	// SourceSecurityGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-sourcesecuritygroupname
+	SourceSecurityGroupName *types.Value `json:"SourceSecurityGroupName,omitempty"`
+
+	// SourceSecurityGroupOwnerId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-sourcesecuritygroupownerid
+	SourceSecurityGroupOwnerId *types.Value `json:"SourceSecurityGroupOwnerId,omitempty"`
+
+	// ToPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-security-group-ingress.html#cfn-ec2-security-group-ingress-toport
+	ToPort *types.Value `json:"ToPort,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SecurityGroupIngress) AWSCloudFormationType() string {
+	return "AWS::EC2::SecurityGroupIngress"
+}
+
+// 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 SecurityGroupIngress) MarshalJSON() ([]byte, error) {
+	type Properties SecurityGroupIngress
+	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 *SecurityGroupIngress) UnmarshalJSON(b []byte) error {
+	type Properties SecurityGroupIngress
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SecurityGroupIngress(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-spotfleet.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet.go
new file mode 100644
index 0000000000..45c0d1c515
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet.go
@@ -0,0 +1,106 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet AWS CloudFormation Resource (AWS::EC2::SpotFleet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-spotfleet.html
+type SpotFleet struct {
+
+	// SpotFleetRequestConfigData AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-spotfleet.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata
+	SpotFleetRequestConfigData *SpotFleet_SpotFleetRequestConfigData `json:"SpotFleetRequestConfigData,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet"
+}
+
+// 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 SpotFleet) MarshalJSON() ([]byte, error) {
+	type Properties SpotFleet
+	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 *SpotFleet) UnmarshalJSON(b []byte) error {
+	type Properties SpotFleet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SpotFleet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-spotfleet_acceleratorcountrequest.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_acceleratorcountrequest.go
new file mode 100644
index 0000000000..3410a5d6d9
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_acceleratorcountrequest.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_AcceleratorCountRequest AWS CloudFormation Resource (AWS::EC2::SpotFleet.AcceleratorCountRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-acceleratorcountrequest.html
+type SpotFleet_AcceleratorCountRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-acceleratorcountrequest.html#cfn-ec2-spotfleet-acceleratorcountrequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-acceleratorcountrequest.html#cfn-ec2-spotfleet-acceleratorcountrequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_AcceleratorCountRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.AcceleratorCountRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_acceleratortotalmemorymibrequest.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_acceleratortotalmemorymibrequest.go
new file mode 100644
index 0000000000..3d3e9e657b
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_acceleratortotalmemorymibrequest.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_AcceleratorTotalMemoryMiBRequest AWS CloudFormation Resource (AWS::EC2::SpotFleet.AcceleratorTotalMemoryMiBRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-acceleratortotalmemorymibrequest.html
+type SpotFleet_AcceleratorTotalMemoryMiBRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-acceleratortotalmemorymibrequest.html#cfn-ec2-spotfleet-acceleratortotalmemorymibrequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-acceleratortotalmemorymibrequest.html#cfn-ec2-spotfleet-acceleratortotalmemorymibrequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_AcceleratorTotalMemoryMiBRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.AcceleratorTotalMemoryMiBRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_baselineebsbandwidthmbpsrequest.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_baselineebsbandwidthmbpsrequest.go
new file mode 100644
index 0000000000..0dfabafd17
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_baselineebsbandwidthmbpsrequest.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_BaselineEbsBandwidthMbpsRequest AWS CloudFormation Resource (AWS::EC2::SpotFleet.BaselineEbsBandwidthMbpsRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-baselineebsbandwidthmbpsrequest.html
+type SpotFleet_BaselineEbsBandwidthMbpsRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-baselineebsbandwidthmbpsrequest.html#cfn-ec2-spotfleet-baselineebsbandwidthmbpsrequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-baselineebsbandwidthmbpsrequest.html#cfn-ec2-spotfleet-baselineebsbandwidthmbpsrequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_BaselineEbsBandwidthMbpsRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.BaselineEbsBandwidthMbpsRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_blockdevicemapping.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_blockdevicemapping.go
new file mode 100644
index 0000000000..e868e324a6
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_blockdevicemapping.go
@@ -0,0 +1,52 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_BlockDeviceMapping AWS CloudFormation Resource (AWS::EC2::SpotFleet.BlockDeviceMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-blockdevicemapping.html
+type SpotFleet_BlockDeviceMapping struct {
+
+	// DeviceName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-blockdevicemapping.html#cfn-ec2-spotfleet-blockdevicemapping-devicename
+	DeviceName *types.Value `json:"DeviceName,omitempty"`
+
+	// Ebs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-blockdevicemapping.html#cfn-ec2-spotfleet-blockdevicemapping-ebs
+	Ebs *SpotFleet_EbsBlockDevice `json:"Ebs,omitempty"`
+
+	// NoDevice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-blockdevicemapping.html#cfn-ec2-spotfleet-blockdevicemapping-nodevice
+	NoDevice *types.Value `json:"NoDevice,omitempty"`
+
+	// VirtualName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-blockdevicemapping.html#cfn-ec2-spotfleet-blockdevicemapping-virtualname
+	VirtualName *types.Value `json:"VirtualName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_BlockDeviceMapping) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.BlockDeviceMapping"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancer.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancer.go
new file mode 100644
index 0000000000..e1d1a21b6b
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancer.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_ClassicLoadBalancer AWS CloudFormation Resource (AWS::EC2::SpotFleet.ClassicLoadBalancer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-classicloadbalancer.html
+type SpotFleet_ClassicLoadBalancer struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-classicloadbalancer.html#cfn-ec2-spotfleet-classicloadbalancer-name
+	Name *types.Value `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 *SpotFleet_ClassicLoadBalancer) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.ClassicLoadBalancer"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancersconfig.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancersconfig.go
new file mode 100644
index 0000000000..f075357b25
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_classicloadbalancersconfig.go
@@ -0,0 +1,35 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_ClassicLoadBalancersConfig AWS CloudFormation Resource (AWS::EC2::SpotFleet.ClassicLoadBalancersConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-classicloadbalancersconfig.html
+type SpotFleet_ClassicLoadBalancersConfig struct {
+
+	// ClassicLoadBalancers AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-classicloadbalancersconfig.html#cfn-ec2-spotfleet-classicloadbalancersconfig-classicloadbalancers
+	ClassicLoadBalancers []SpotFleet_ClassicLoadBalancer `json:"ClassicLoadBalancers,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_ClassicLoadBalancersConfig) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.ClassicLoadBalancersConfig"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_ebsblockdevice.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_ebsblockdevice.go
new file mode 100644
index 0000000000..5478348ab8
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_ebsblockdevice.go
@@ -0,0 +1,62 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_EbsBlockDevice AWS CloudFormation Resource (AWS::EC2::SpotFleet.EbsBlockDevice)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-ebsblockdevice.html
+type SpotFleet_EbsBlockDevice struct {
+
+	// DeleteOnTermination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-ebsblockdevice.html#cfn-ec2-spotfleet-ebsblockdevice-deleteontermination
+	DeleteOnTermination *types.Value `json:"DeleteOnTermination,omitempty"`
+
+	// Encrypted AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-ebsblockdevice.html#cfn-ec2-spotfleet-ebsblockdevice-encrypted
+	Encrypted *types.Value `json:"Encrypted,omitempty"`
+
+	// Iops AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-ebsblockdevice.html#cfn-ec2-spotfleet-ebsblockdevice-iops
+	Iops *types.Value `json:"Iops,omitempty"`
+
+	// SnapshotId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-ebsblockdevice.html#cfn-ec2-spotfleet-ebsblockdevice-snapshotid
+	SnapshotId *types.Value `json:"SnapshotId,omitempty"`
+
+	// VolumeSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-ebsblockdevice.html#cfn-ec2-spotfleet-ebsblockdevice-volumesize
+	VolumeSize *types.Value `json:"VolumeSize,omitempty"`
+
+	// VolumeType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-ebsblockdevice.html#cfn-ec2-spotfleet-ebsblockdevice-volumetype
+	VolumeType *types.Value `json:"VolumeType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_EbsBlockDevice) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.EbsBlockDevice"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_fleetlaunchtemplatespecification.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_fleetlaunchtemplatespecification.go
new file mode 100644
index 0000000000..b82d9ef3f4
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_fleetlaunchtemplatespecification.go
@@ -0,0 +1,47 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_FleetLaunchTemplateSpecification AWS CloudFormation Resource (AWS::EC2::SpotFleet.FleetLaunchTemplateSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-fleetlaunchtemplatespecification.html
+type SpotFleet_FleetLaunchTemplateSpecification struct {
+
+	// LaunchTemplateId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-fleetlaunchtemplatespecification.html#cfn-ec2-spotfleet-fleetlaunchtemplatespecification-launchtemplateid
+	LaunchTemplateId *types.Value `json:"LaunchTemplateId,omitempty"`
+
+	// LaunchTemplateName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-fleetlaunchtemplatespecification.html#cfn-ec2-spotfleet-fleetlaunchtemplatespecification-launchtemplatename
+	LaunchTemplateName *types.Value `json:"LaunchTemplateName,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-fleetlaunchtemplatespecification.html#cfn-ec2-spotfleet-fleetlaunchtemplatespecification-version
+	Version *types.Value `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 *SpotFleet_FleetLaunchTemplateSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.FleetLaunchTemplateSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_groupidentifier.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_groupidentifier.go
new file mode 100644
index 0000000000..cdba320ac7
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_groupidentifier.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_GroupIdentifier AWS CloudFormation Resource (AWS::EC2::SpotFleet.GroupIdentifier)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-groupidentifier.html
+type SpotFleet_GroupIdentifier struct {
+
+	// GroupId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-groupidentifier.html#cfn-ec2-spotfleet-groupidentifier-groupid
+	GroupId *types.Value `json:"GroupId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_GroupIdentifier) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.GroupIdentifier"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_iaminstanceprofilespecification.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_iaminstanceprofilespecification.go
new file mode 100644
index 0000000000..5607d44927
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_iaminstanceprofilespecification.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_IamInstanceProfileSpecification AWS CloudFormation Resource (AWS::EC2::SpotFleet.IamInstanceProfileSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-iaminstanceprofilespecification.html
+type SpotFleet_IamInstanceProfileSpecification struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-iaminstanceprofilespecification.html#cfn-ec2-spotfleet-iaminstanceprofilespecification-arn
+	Arn *types.Value `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 *SpotFleet_IamInstanceProfileSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.IamInstanceProfileSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_instanceipv6address.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_instanceipv6address.go
new file mode 100644
index 0000000000..b858152241
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_instanceipv6address.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_InstanceIpv6Address AWS CloudFormation Resource (AWS::EC2::SpotFleet.InstanceIpv6Address)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instanceipv6address.html
+type SpotFleet_InstanceIpv6Address struct {
+
+	// Ipv6Address AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instanceipv6address.html#cfn-ec2-spotfleet-instanceipv6address-ipv6address
+	Ipv6Address *types.Value `json:"Ipv6Address,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_InstanceIpv6Address) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.InstanceIpv6Address"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_instancenetworkinterfacespecification.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_instancenetworkinterfacespecification.go
new file mode 100644
index 0000000000..e1dfb81d87
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_instancenetworkinterfacespecification.go
@@ -0,0 +1,87 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_InstanceNetworkInterfaceSpecification AWS CloudFormation Resource (AWS::EC2::SpotFleet.InstanceNetworkInterfaceSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancenetworkinterfacespecification.html
+type SpotFleet_InstanceNetworkInterfaceSpecification struct {
+
+	// AssociatePublicIpAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancenetworkinterfacespecification.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-associatepublicipaddress
+	AssociatePublicIpAddress *types.Value `json:"AssociatePublicIpAddress,omitempty"`
+
+	// DeleteOnTermination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancenetworkinterfacespecification.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-deleteontermination
+	DeleteOnTermination *types.Value `json:"DeleteOnTermination,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancenetworkinterfacespecification.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DeviceIndex AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancenetworkinterfacespecification.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-deviceindex
+	DeviceIndex *types.Value `json:"DeviceIndex,omitempty"`
+
+	// Groups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancenetworkinterfacespecification.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-groups
+	Groups *types.Value `json:"Groups,omitempty"`
+
+	// Ipv6AddressCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancenetworkinterfacespecification.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-ipv6addresscount
+	Ipv6AddressCount *types.Value `json:"Ipv6AddressCount,omitempty"`
+
+	// Ipv6Addresses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancenetworkinterfacespecification.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-ipv6addresses
+	Ipv6Addresses []SpotFleet_InstanceIpv6Address `json:"Ipv6Addresses,omitempty"`
+
+	// NetworkInterfaceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancenetworkinterfacespecification.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-networkinterfaceid
+	NetworkInterfaceId *types.Value `json:"NetworkInterfaceId,omitempty"`
+
+	// PrivateIpAddresses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancenetworkinterfacespecification.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-privateipaddresses
+	PrivateIpAddresses []SpotFleet_PrivateIpAddressSpecification `json:"PrivateIpAddresses,omitempty"`
+
+	// SecondaryPrivateIpAddressCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancenetworkinterfacespecification.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-secondaryprivateipaddresscount
+	SecondaryPrivateIpAddressCount *types.Value `json:"SecondaryPrivateIpAddressCount,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancenetworkinterfacespecification.html#cfn-ec2-spotfleet-instancenetworkinterfacespecification-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_InstanceNetworkInterfaceSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.InstanceNetworkInterfaceSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_instancerequirementsrequest.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_instancerequirementsrequest.go
new file mode 100644
index 0000000000..f2927a03bc
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_instancerequirementsrequest.go
@@ -0,0 +1,137 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_InstanceRequirementsRequest AWS CloudFormation Resource (AWS::EC2::SpotFleet.InstanceRequirementsRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html
+type SpotFleet_InstanceRequirementsRequest struct {
+
+	// AcceleratorCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-acceleratorcount
+	AcceleratorCount *SpotFleet_AcceleratorCountRequest `json:"AcceleratorCount,omitempty"`
+
+	// AcceleratorManufacturers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-acceleratormanufacturers
+	AcceleratorManufacturers *types.Value `json:"AcceleratorManufacturers,omitempty"`
+
+	// AcceleratorNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-acceleratornames
+	AcceleratorNames *types.Value `json:"AcceleratorNames,omitempty"`
+
+	// AcceleratorTotalMemoryMiB AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-acceleratortotalmemorymib
+	AcceleratorTotalMemoryMiB *SpotFleet_AcceleratorTotalMemoryMiBRequest `json:"AcceleratorTotalMemoryMiB,omitempty"`
+
+	// AcceleratorTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-acceleratortypes
+	AcceleratorTypes *types.Value `json:"AcceleratorTypes,omitempty"`
+
+	// BareMetal AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-baremetal
+	BareMetal *types.Value `json:"BareMetal,omitempty"`
+
+	// BaselineEbsBandwidthMbps AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-baselineebsbandwidthmbps
+	BaselineEbsBandwidthMbps *SpotFleet_BaselineEbsBandwidthMbpsRequest `json:"BaselineEbsBandwidthMbps,omitempty"`
+
+	// BurstablePerformance AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-burstableperformance
+	BurstablePerformance *types.Value `json:"BurstablePerformance,omitempty"`
+
+	// CpuManufacturers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-cpumanufacturers
+	CpuManufacturers *types.Value `json:"CpuManufacturers,omitempty"`
+
+	// ExcludedInstanceTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-excludedinstancetypes
+	ExcludedInstanceTypes *types.Value `json:"ExcludedInstanceTypes,omitempty"`
+
+	// InstanceGenerations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-instancegenerations
+	InstanceGenerations *types.Value `json:"InstanceGenerations,omitempty"`
+
+	// LocalStorage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-localstorage
+	LocalStorage *types.Value `json:"LocalStorage,omitempty"`
+
+	// LocalStorageTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-localstoragetypes
+	LocalStorageTypes *types.Value `json:"LocalStorageTypes,omitempty"`
+
+	// MemoryGiBPerVCpu AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-memorygibpervcpu
+	MemoryGiBPerVCpu *SpotFleet_MemoryGiBPerVCpuRequest `json:"MemoryGiBPerVCpu,omitempty"`
+
+	// MemoryMiB AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-memorymib
+	MemoryMiB *SpotFleet_MemoryMiBRequest `json:"MemoryMiB,omitempty"`
+
+	// NetworkInterfaceCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-networkinterfacecount
+	NetworkInterfaceCount *SpotFleet_NetworkInterfaceCountRequest `json:"NetworkInterfaceCount,omitempty"`
+
+	// OnDemandMaxPricePercentageOverLowestPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-ondemandmaxpricepercentageoverlowestprice
+	OnDemandMaxPricePercentageOverLowestPrice *types.Value `json:"OnDemandMaxPricePercentageOverLowestPrice,omitempty"`
+
+	// RequireHibernateSupport AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-requirehibernatesupport
+	RequireHibernateSupport *types.Value `json:"RequireHibernateSupport,omitempty"`
+
+	// SpotMaxPricePercentageOverLowestPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-spotmaxpricepercentageoverlowestprice
+	SpotMaxPricePercentageOverLowestPrice *types.Value `json:"SpotMaxPricePercentageOverLowestPrice,omitempty"`
+
+	// TotalLocalStorageGB AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-totallocalstoragegb
+	TotalLocalStorageGB *SpotFleet_TotalLocalStorageGBRequest `json:"TotalLocalStorageGB,omitempty"`
+
+	// VCpuCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-instancerequirementsrequest.html#cfn-ec2-spotfleet-instancerequirementsrequest-vcpucount
+	VCpuCount *SpotFleet_VCpuCountRangeRequest `json:"VCpuCount,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_InstanceRequirementsRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.InstanceRequirementsRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateconfig.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateconfig.go
new file mode 100644
index 0000000000..877b27d47f
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateconfig.go
@@ -0,0 +1,40 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_LaunchTemplateConfig AWS CloudFormation Resource (AWS::EC2::SpotFleet.LaunchTemplateConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-launchtemplateconfig.html
+type SpotFleet_LaunchTemplateConfig struct {
+
+	// LaunchTemplateSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-launchtemplateconfig.html#cfn-ec2-spotfleet-launchtemplateconfig-launchtemplatespecification
+	LaunchTemplateSpecification *SpotFleet_FleetLaunchTemplateSpecification `json:"LaunchTemplateSpecification,omitempty"`
+
+	// Overrides AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-launchtemplateconfig.html#cfn-ec2-spotfleet-launchtemplateconfig-overrides
+	Overrides []SpotFleet_LaunchTemplateOverrides `json:"Overrides,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_LaunchTemplateConfig) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.LaunchTemplateConfig"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateoverrides.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateoverrides.go
new file mode 100644
index 0000000000..a371ee70d5
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_launchtemplateoverrides.go
@@ -0,0 +1,62 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_LaunchTemplateOverrides AWS CloudFormation Resource (AWS::EC2::SpotFleet.LaunchTemplateOverrides)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-launchtemplateoverrides.html
+type SpotFleet_LaunchTemplateOverrides struct {
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-launchtemplateoverrides.html#cfn-ec2-spotfleet-launchtemplateoverrides-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// InstanceRequirements AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-launchtemplateoverrides.html#cfn-ec2-spotfleet-launchtemplateoverrides-instancerequirements
+	InstanceRequirements *SpotFleet_InstanceRequirementsRequest `json:"InstanceRequirements,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-launchtemplateoverrides.html#cfn-ec2-spotfleet-launchtemplateoverrides-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// SpotPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-launchtemplateoverrides.html#cfn-ec2-spotfleet-launchtemplateoverrides-spotprice
+	SpotPrice *types.Value `json:"SpotPrice,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-launchtemplateoverrides.html#cfn-ec2-spotfleet-launchtemplateoverrides-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// WeightedCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-launchtemplateoverrides.html#cfn-ec2-spotfleet-launchtemplateoverrides-weightedcapacity
+	WeightedCapacity *types.Value `json:"WeightedCapacity,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_LaunchTemplateOverrides) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.LaunchTemplateOverrides"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_loadbalancersconfig.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_loadbalancersconfig.go
new file mode 100644
index 0000000000..83aacd264e
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_loadbalancersconfig.go
@@ -0,0 +1,40 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_LoadBalancersConfig AWS CloudFormation Resource (AWS::EC2::SpotFleet.LoadBalancersConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-loadbalancersconfig.html
+type SpotFleet_LoadBalancersConfig struct {
+
+	// ClassicLoadBalancersConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-loadbalancersconfig.html#cfn-ec2-spotfleet-loadbalancersconfig-classicloadbalancersconfig
+	ClassicLoadBalancersConfig *SpotFleet_ClassicLoadBalancersConfig `json:"ClassicLoadBalancersConfig,omitempty"`
+
+	// TargetGroupsConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-loadbalancersconfig.html#cfn-ec2-spotfleet-loadbalancersconfig-targetgroupsconfig
+	TargetGroupsConfig *SpotFleet_TargetGroupsConfig `json:"TargetGroupsConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_LoadBalancersConfig) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.LoadBalancersConfig"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_memorygibpervcpurequest.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_memorygibpervcpurequest.go
new file mode 100644
index 0000000000..dd31a23f4a
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_memorygibpervcpurequest.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_MemoryGiBPerVCpuRequest AWS CloudFormation Resource (AWS::EC2::SpotFleet.MemoryGiBPerVCpuRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-memorygibpervcpurequest.html
+type SpotFleet_MemoryGiBPerVCpuRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-memorygibpervcpurequest.html#cfn-ec2-spotfleet-memorygibpervcpurequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-memorygibpervcpurequest.html#cfn-ec2-spotfleet-memorygibpervcpurequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_MemoryGiBPerVCpuRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.MemoryGiBPerVCpuRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_memorymibrequest.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_memorymibrequest.go
new file mode 100644
index 0000000000..19ecc4d947
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_memorymibrequest.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_MemoryMiBRequest AWS CloudFormation Resource (AWS::EC2::SpotFleet.MemoryMiBRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-memorymibrequest.html
+type SpotFleet_MemoryMiBRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-memorymibrequest.html#cfn-ec2-spotfleet-memorymibrequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-memorymibrequest.html#cfn-ec2-spotfleet-memorymibrequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_MemoryMiBRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.MemoryMiBRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_networkinterfacecountrequest.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_networkinterfacecountrequest.go
new file mode 100644
index 0000000000..3c157aa884
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_networkinterfacecountrequest.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_NetworkInterfaceCountRequest AWS CloudFormation Resource (AWS::EC2::SpotFleet.NetworkInterfaceCountRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-networkinterfacecountrequest.html
+type SpotFleet_NetworkInterfaceCountRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-networkinterfacecountrequest.html#cfn-ec2-spotfleet-networkinterfacecountrequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-networkinterfacecountrequest.html#cfn-ec2-spotfleet-networkinterfacecountrequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_NetworkInterfaceCountRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.NetworkInterfaceCountRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_privateipaddressspecification.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_privateipaddressspecification.go
new file mode 100644
index 0000000000..e9b2b4cfe6
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_privateipaddressspecification.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_PrivateIpAddressSpecification AWS CloudFormation Resource (AWS::EC2::SpotFleet.PrivateIpAddressSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-privateipaddressspecification.html
+type SpotFleet_PrivateIpAddressSpecification struct {
+
+	// Primary AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-privateipaddressspecification.html#cfn-ec2-spotfleet-privateipaddressspecification-primary
+	Primary *types.Value `json:"Primary,omitempty"`
+
+	// PrivateIpAddress AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-privateipaddressspecification.html#cfn-ec2-spotfleet-privateipaddressspecification-privateipaddress
+	PrivateIpAddress *types.Value `json:"PrivateIpAddress,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_PrivateIpAddressSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.PrivateIpAddressSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotcapacityrebalance.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotcapacityrebalance.go
new file mode 100644
index 0000000000..b1cd15e9dd
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotcapacityrebalance.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_SpotCapacityRebalance AWS CloudFormation Resource (AWS::EC2::SpotFleet.SpotCapacityRebalance)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotcapacityrebalance.html
+type SpotFleet_SpotCapacityRebalance struct {
+
+	// ReplacementStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotcapacityrebalance.html#cfn-ec2-spotfleet-spotcapacityrebalance-replacementstrategy
+	ReplacementStrategy *types.Value `json:"ReplacementStrategy,omitempty"`
+
+	// TerminationDelay AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotcapacityrebalance.html#cfn-ec2-spotfleet-spotcapacityrebalance-terminationdelay
+	TerminationDelay *types.Value `json:"TerminationDelay,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_SpotCapacityRebalance) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.SpotCapacityRebalance"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetlaunchspecification.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetlaunchspecification.go
new file mode 100644
index 0000000000..d4dbf095eb
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetlaunchspecification.go
@@ -0,0 +1,122 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_SpotFleetLaunchSpecification AWS CloudFormation Resource (AWS::EC2::SpotFleet.SpotFleetLaunchSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetlaunchspecification.html
+type SpotFleet_SpotFleetLaunchSpecification struct {
+
+	// BlockDeviceMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetlaunchspecification.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-blockdevicemappings
+	BlockDeviceMappings []SpotFleet_BlockDeviceMapping `json:"BlockDeviceMappings,omitempty"`
+
+	// EbsOptimized AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetlaunchspecification.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-ebsoptimized
+	EbsOptimized *types.Value `json:"EbsOptimized,omitempty"`
+
+	// IamInstanceProfile AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetlaunchspecification.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-iaminstanceprofile
+	IamInstanceProfile *SpotFleet_IamInstanceProfileSpecification `json:"IamInstanceProfile,omitempty"`
+
+	// ImageId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetlaunchspecification.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-imageid
+	ImageId *types.Value `json:"ImageId,omitempty"`
+
+	// InstanceRequirements AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetlaunchspecification.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-instancerequirements
+	InstanceRequirements *SpotFleet_InstanceRequirementsRequest `json:"InstanceRequirements,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetlaunchspecification.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// KernelId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetlaunchspecification.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-kernelid
+	KernelId *types.Value `json:"KernelId,omitempty"`
+
+	// KeyName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetlaunchspecification.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-keyname
+	KeyName *types.Value `json:"KeyName,omitempty"`
+
+	// Monitoring AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetlaunchspecification.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-monitoring
+	Monitoring *SpotFleet_SpotFleetMonitoring `json:"Monitoring,omitempty"`
+
+	// NetworkInterfaces AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetlaunchspecification.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-networkinterfaces
+	NetworkInterfaces []SpotFleet_InstanceNetworkInterfaceSpecification `json:"NetworkInterfaces,omitempty"`
+
+	// Placement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetlaunchspecification.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-placement
+	Placement *SpotFleet_SpotPlacement `json:"Placement,omitempty"`
+
+	// RamdiskId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetlaunchspecification.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-ramdiskid
+	RamdiskId *types.Value `json:"RamdiskId,omitempty"`
+
+	// SecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetlaunchspecification.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-securitygroups
+	SecurityGroups []SpotFleet_GroupIdentifier `json:"SecurityGroups,omitempty"`
+
+	// SpotPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetlaunchspecification.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-spotprice
+	SpotPrice *types.Value `json:"SpotPrice,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetlaunchspecification.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// TagSpecifications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetlaunchspecification.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-tagspecifications
+	TagSpecifications []SpotFleet_SpotFleetTagSpecification `json:"TagSpecifications,omitempty"`
+
+	// UserData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetlaunchspecification.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-userdata
+	UserData *types.Value `json:"UserData,omitempty"`
+
+	// WeightedCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetlaunchspecification.html#cfn-ec2-spotfleet-spotfleetlaunchspecification-weightedcapacity
+	WeightedCapacity *types.Value `json:"WeightedCapacity,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_SpotFleetLaunchSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.SpotFleetLaunchSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetmonitoring.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetmonitoring.go
new file mode 100644
index 0000000000..3919914482
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetmonitoring.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_SpotFleetMonitoring AWS CloudFormation Resource (AWS::EC2::SpotFleet.SpotFleetMonitoring)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetmonitoring.html
+type SpotFleet_SpotFleetMonitoring struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetmonitoring.html#cfn-ec2-spotfleet-spotfleetmonitoring-enabled
+	Enabled *types.Value `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 *SpotFleet_SpotFleetMonitoring) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.SpotFleetMonitoring"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetrequestconfigdata.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetrequestconfigdata.go
new file mode 100644
index 0000000000..854e490514
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleetrequestconfigdata.go
@@ -0,0 +1,142 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_SpotFleetRequestConfigData AWS CloudFormation Resource (AWS::EC2::SpotFleet.SpotFleetRequestConfigData)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html
+type SpotFleet_SpotFleetRequestConfigData struct {
+
+	// AllocationStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-allocationstrategy
+	AllocationStrategy *types.Value `json:"AllocationStrategy,omitempty"`
+
+	// Context AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-context
+	Context *types.Value `json:"Context,omitempty"`
+
+	// ExcessCapacityTerminationPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-excesscapacityterminationpolicy
+	ExcessCapacityTerminationPolicy *types.Value `json:"ExcessCapacityTerminationPolicy,omitempty"`
+
+	// IamFleetRole AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-iamfleetrole
+	IamFleetRole *types.Value `json:"IamFleetRole,omitempty"`
+
+	// InstanceInterruptionBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-instanceinterruptionbehavior
+	InstanceInterruptionBehavior *types.Value `json:"InstanceInterruptionBehavior,omitempty"`
+
+	// InstancePoolsToUseCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-instancepoolstousecount
+	InstancePoolsToUseCount *types.Value `json:"InstancePoolsToUseCount,omitempty"`
+
+	// LaunchSpecifications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-launchspecifications
+	LaunchSpecifications []SpotFleet_SpotFleetLaunchSpecification `json:"LaunchSpecifications,omitempty"`
+
+	// LaunchTemplateConfigs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-launchtemplateconfigs
+	LaunchTemplateConfigs []SpotFleet_LaunchTemplateConfig `json:"LaunchTemplateConfigs,omitempty"`
+
+	// LoadBalancersConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-loadbalancersconfig
+	LoadBalancersConfig *SpotFleet_LoadBalancersConfig `json:"LoadBalancersConfig,omitempty"`
+
+	// OnDemandAllocationStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-ondemandallocationstrategy
+	OnDemandAllocationStrategy *types.Value `json:"OnDemandAllocationStrategy,omitempty"`
+
+	// OnDemandMaxTotalPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-ondemandmaxtotalprice
+	OnDemandMaxTotalPrice *types.Value `json:"OnDemandMaxTotalPrice,omitempty"`
+
+	// OnDemandTargetCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-ondemandtargetcapacity
+	OnDemandTargetCapacity *types.Value `json:"OnDemandTargetCapacity,omitempty"`
+
+	// ReplaceUnhealthyInstances AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-replaceunhealthyinstances
+	ReplaceUnhealthyInstances *types.Value `json:"ReplaceUnhealthyInstances,omitempty"`
+
+	// SpotMaintenanceStrategies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-spotmaintenancestrategies
+	SpotMaintenanceStrategies *SpotFleet_SpotMaintenanceStrategies `json:"SpotMaintenanceStrategies,omitempty"`
+
+	// SpotMaxTotalPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-spotmaxtotalprice
+	SpotMaxTotalPrice *types.Value `json:"SpotMaxTotalPrice,omitempty"`
+
+	// SpotPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-spotprice
+	SpotPrice *types.Value `json:"SpotPrice,omitempty"`
+
+	// TargetCapacity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-targetcapacity
+	TargetCapacity *types.Value `json:"TargetCapacity"`
+
+	// TargetCapacityUnitType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-targetcapacityunittype
+	TargetCapacityUnitType *types.Value `json:"TargetCapacityUnitType,omitempty"`
+
+	// TerminateInstancesWithExpiration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-terminateinstanceswithexpiration
+	TerminateInstancesWithExpiration *types.Value `json:"TerminateInstancesWithExpiration,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// ValidFrom AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-validfrom
+	ValidFrom *types.Value `json:"ValidFrom,omitempty"`
+
+	// ValidUntil AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleetrequestconfigdata.html#cfn-ec2-spotfleet-spotfleetrequestconfigdata-validuntil
+	ValidUntil *types.Value `json:"ValidUntil,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_SpotFleetRequestConfigData) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.SpotFleetRequestConfigData"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleettagspecification.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleettagspecification.go
new file mode 100644
index 0000000000..ddc52c5080
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotfleettagspecification.go
@@ -0,0 +1,43 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_SpotFleetTagSpecification AWS CloudFormation Resource (AWS::EC2::SpotFleet.SpotFleetTagSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleettagspecification.html
+type SpotFleet_SpotFleetTagSpecification struct {
+
+	// ResourceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleettagspecification.html#cfn-ec2-spotfleet-spotfleettagspecification-resourcetype
+	ResourceType *types.Value `json:"ResourceType,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotfleettagspecification.html#cfn-ec2-spotfleet-spotfleettagspecification-tags
+	Tags []cloudformation.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 *SpotFleet_SpotFleetTagSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.SpotFleetTagSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotmaintenancestrategies.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotmaintenancestrategies.go
new file mode 100644
index 0000000000..2d05ef6f52
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotmaintenancestrategies.go
@@ -0,0 +1,35 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_SpotMaintenanceStrategies AWS CloudFormation Resource (AWS::EC2::SpotFleet.SpotMaintenanceStrategies)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotmaintenancestrategies.html
+type SpotFleet_SpotMaintenanceStrategies struct {
+
+	// CapacityRebalance AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotmaintenancestrategies.html#cfn-ec2-spotfleet-spotmaintenancestrategies-capacityrebalance
+	CapacityRebalance *SpotFleet_SpotCapacityRebalance `json:"CapacityRebalance,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_SpotMaintenanceStrategies) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.SpotMaintenanceStrategies"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotplacement.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotplacement.go
new file mode 100644
index 0000000000..b85127cbec
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_spotplacement.go
@@ -0,0 +1,47 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_SpotPlacement AWS CloudFormation Resource (AWS::EC2::SpotFleet.SpotPlacement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotplacement.html
+type SpotFleet_SpotPlacement struct {
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotplacement.html#cfn-ec2-spotfleet-spotplacement-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// GroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotplacement.html#cfn-ec2-spotfleet-spotplacement-groupname
+	GroupName *types.Value `json:"GroupName,omitempty"`
+
+	// Tenancy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-spotplacement.html#cfn-ec2-spotfleet-spotplacement-tenancy
+	Tenancy *types.Value `json:"Tenancy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_SpotPlacement) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.SpotPlacement"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_targetgroup.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_targetgroup.go
new file mode 100644
index 0000000000..5151465b51
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_targetgroup.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_TargetGroup AWS CloudFormation Resource (AWS::EC2::SpotFleet.TargetGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-targetgroup.html
+type SpotFleet_TargetGroup struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-targetgroup.html#cfn-ec2-spotfleet-targetgroup-arn
+	Arn *types.Value `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 *SpotFleet_TargetGroup) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.TargetGroup"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_targetgroupsconfig.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_targetgroupsconfig.go
new file mode 100644
index 0000000000..c2985a8784
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_targetgroupsconfig.go
@@ -0,0 +1,35 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_TargetGroupsConfig AWS CloudFormation Resource (AWS::EC2::SpotFleet.TargetGroupsConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-targetgroupsconfig.html
+type SpotFleet_TargetGroupsConfig struct {
+
+	// TargetGroups AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-targetgroupsconfig.html#cfn-ec2-spotfleet-targetgroupsconfig-targetgroups
+	TargetGroups []SpotFleet_TargetGroup `json:"TargetGroups,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_TargetGroupsConfig) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.TargetGroupsConfig"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_totallocalstoragegbrequest.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_totallocalstoragegbrequest.go
new file mode 100644
index 0000000000..91b1fccec4
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_totallocalstoragegbrequest.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_TotalLocalStorageGBRequest AWS CloudFormation Resource (AWS::EC2::SpotFleet.TotalLocalStorageGBRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-totallocalstoragegbrequest.html
+type SpotFleet_TotalLocalStorageGBRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-totallocalstoragegbrequest.html#cfn-ec2-spotfleet-totallocalstoragegbrequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-totallocalstoragegbrequest.html#cfn-ec2-spotfleet-totallocalstoragegbrequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_TotalLocalStorageGBRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.TotalLocalStorageGBRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-spotfleet_vcpucountrangerequest.go b/goformation/cloudformation/ec2/aws-ec2-spotfleet_vcpucountrangerequest.go
new file mode 100644
index 0000000000..b9ebf0c32c
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-spotfleet_vcpucountrangerequest.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SpotFleet_VCpuCountRangeRequest AWS CloudFormation Resource (AWS::EC2::SpotFleet.VCpuCountRangeRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-vcpucountrangerequest.html
+type SpotFleet_VCpuCountRangeRequest struct {
+
+	// Max AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-vcpucountrangerequest.html#cfn-ec2-spotfleet-vcpucountrangerequest-max
+	Max *types.Value `json:"Max,omitempty"`
+
+	// Min AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-spotfleet-vcpucountrangerequest.html#cfn-ec2-spotfleet-vcpucountrangerequest-min
+	Min *types.Value `json:"Min,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SpotFleet_VCpuCountRangeRequest) AWSCloudFormationType() string {
+	return "AWS::EC2::SpotFleet.VCpuCountRangeRequest"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-subnet.go b/goformation/cloudformation/ec2/aws-ec2-subnet.go
new file mode 100644
index 0000000000..89d05497ba
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-subnet.go
@@ -0,0 +1,164 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Subnet AWS CloudFormation Resource (AWS::EC2::Subnet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html
+type Subnet struct {
+
+	// AssignIpv6AddressOnCreation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-assignipv6addressoncreation
+	AssignIpv6AddressOnCreation *types.Value `json:"AssignIpv6AddressOnCreation,omitempty"`
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// AvailabilityZoneId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-availabilityzoneid
+	AvailabilityZoneId *types.Value `json:"AvailabilityZoneId,omitempty"`
+
+	// CidrBlock AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-cidrblock
+	CidrBlock *types.Value `json:"CidrBlock,omitempty"`
+
+	// EnableDns64 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-enabledns64
+	EnableDns64 *types.Value `json:"EnableDns64,omitempty"`
+
+	// Ipv6CidrBlock AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-ipv6cidrblock
+	Ipv6CidrBlock *types.Value `json:"Ipv6CidrBlock,omitempty"`
+
+	// Ipv6Native AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-ipv6native
+	Ipv6Native *types.Value `json:"Ipv6Native,omitempty"`
+
+	// MapPublicIpOnLaunch AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-mappubliciponlaunch
+	MapPublicIpOnLaunch *types.Value `json:"MapPublicIpOnLaunch,omitempty"`
+
+	// OutpostArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-outpostarn
+	OutpostArn *types.Value `json:"OutpostArn,omitempty"`
+
+	// PrivateDnsNameOptionsOnLaunch AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-privatednsnameoptionsonlaunch
+	PrivateDnsNameOptionsOnLaunch *Subnet_PrivateDnsNameOptionsOnLaunch `json:"PrivateDnsNameOptionsOnLaunch,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet.html#cfn-ec2-subnet-vpcid
+	VpcId *types.Value `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 *Subnet) AWSCloudFormationType() string {
+	return "AWS::EC2::Subnet"
+}
+
+// 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 Subnet) MarshalJSON() ([]byte, error) {
+	type Properties Subnet
+	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 *Subnet) UnmarshalJSON(b []byte) error {
+	type Properties Subnet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Subnet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-subnet_privatednsnameoptionsonlaunch.go b/goformation/cloudformation/ec2/aws-ec2-subnet_privatednsnameoptionsonlaunch.go
new file mode 100644
index 0000000000..478ac40e83
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-subnet_privatednsnameoptionsonlaunch.go
@@ -0,0 +1,47 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Subnet_PrivateDnsNameOptionsOnLaunch AWS CloudFormation Resource (AWS::EC2::Subnet.PrivateDnsNameOptionsOnLaunch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-subnet-privatednsnameoptionsonlaunch.html
+type Subnet_PrivateDnsNameOptionsOnLaunch struct {
+
+	// EnableResourceNameDnsAAAARecord AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-subnet-privatednsnameoptionsonlaunch.html#cfn-ec2-subnet-privatednsnameoptionsonlaunch-enableresourcenamednsaaaarecord
+	EnableResourceNameDnsAAAARecord *types.Value `json:"EnableResourceNameDnsAAAARecord,omitempty"`
+
+	// EnableResourceNameDnsARecord AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-subnet-privatednsnameoptionsonlaunch.html#cfn-ec2-subnet-privatednsnameoptionsonlaunch-enableresourcenamednsarecord
+	EnableResourceNameDnsARecord *types.Value `json:"EnableResourceNameDnsARecord,omitempty"`
+
+	// HostnameType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-subnet-privatednsnameoptionsonlaunch.html#cfn-ec2-subnet-privatednsnameoptionsonlaunch-hostnametype
+	HostnameType *types.Value `json:"HostnameType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Subnet_PrivateDnsNameOptionsOnLaunch) AWSCloudFormationType() string {
+	return "AWS::EC2::Subnet.PrivateDnsNameOptionsOnLaunch"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-subnetcidrblock.go b/goformation/cloudformation/ec2/aws-ec2-subnetcidrblock.go
new file mode 100644
index 0000000000..cc4cf72460
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-subnetcidrblock.go
@@ -0,0 +1,113 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SubnetCidrBlock AWS CloudFormation Resource (AWS::EC2::SubnetCidrBlock)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnetcidrblock.html
+type SubnetCidrBlock struct {
+
+	// Ipv6CidrBlock AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnetcidrblock.html#cfn-ec2-subnetcidrblock-ipv6cidrblock
+	Ipv6CidrBlock *types.Value `json:"Ipv6CidrBlock,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnetcidrblock.html#cfn-ec2-subnetcidrblock-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SubnetCidrBlock) AWSCloudFormationType() string {
+	return "AWS::EC2::SubnetCidrBlock"
+}
+
+// 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 SubnetCidrBlock) MarshalJSON() ([]byte, error) {
+	type Properties SubnetCidrBlock
+	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 *SubnetCidrBlock) UnmarshalJSON(b []byte) error {
+	type Properties SubnetCidrBlock
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SubnetCidrBlock(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-subnetnetworkaclassociation.go b/goformation/cloudformation/ec2/aws-ec2-subnetnetworkaclassociation.go
new file mode 100644
index 0000000000..2fa2186d80
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-subnetnetworkaclassociation.go
@@ -0,0 +1,113 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SubnetNetworkAclAssociation AWS CloudFormation Resource (AWS::EC2::SubnetNetworkAclAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-network-acl-assoc.html
+type SubnetNetworkAclAssociation struct {
+
+	// NetworkAclId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-network-acl-assoc.html#cfn-ec2-subnetnetworkaclassociation-networkaclid
+	NetworkAclId *types.Value `json:"NetworkAclId,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnet-network-acl-assoc.html#cfn-ec2-subnetnetworkaclassociation-associationid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SubnetNetworkAclAssociation) AWSCloudFormationType() string {
+	return "AWS::EC2::SubnetNetworkAclAssociation"
+}
+
+// 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 SubnetNetworkAclAssociation) MarshalJSON() ([]byte, error) {
+	type Properties SubnetNetworkAclAssociation
+	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 *SubnetNetworkAclAssociation) UnmarshalJSON(b []byte) error {
+	type Properties SubnetNetworkAclAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SubnetNetworkAclAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-subnetroutetableassociation.go b/goformation/cloudformation/ec2/aws-ec2-subnetroutetableassociation.go
new file mode 100644
index 0000000000..43f8c143b3
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-subnetroutetableassociation.go
@@ -0,0 +1,113 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SubnetRouteTableAssociation AWS CloudFormation Resource (AWS::EC2::SubnetRouteTableAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnetroutetableassociation.html
+type SubnetRouteTableAssociation struct {
+
+	// RouteTableId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnetroutetableassociation.html#cfn-ec2-subnetroutetableassociation-routetableid
+	RouteTableId *types.Value `json:"RouteTableId,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-subnetroutetableassociation.html#cfn-ec2-subnetroutetableassociation-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SubnetRouteTableAssociation) AWSCloudFormationType() string {
+	return "AWS::EC2::SubnetRouteTableAssociation"
+}
+
+// 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 SubnetRouteTableAssociation) MarshalJSON() ([]byte, error) {
+	type Properties SubnetRouteTableAssociation
+	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 *SubnetRouteTableAssociation) UnmarshalJSON(b []byte) error {
+	type Properties SubnetRouteTableAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SubnetRouteTableAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilter.go b/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilter.go
new file mode 100644
index 0000000000..75cd77f4ba
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilter.go
@@ -0,0 +1,119 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// TrafficMirrorFilter AWS CloudFormation Resource (AWS::EC2::TrafficMirrorFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilter.html
+type TrafficMirrorFilter struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilter.html#cfn-ec2-trafficmirrorfilter-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// NetworkServices AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilter.html#cfn-ec2-trafficmirrorfilter-networkservices
+	NetworkServices *types.Value `json:"NetworkServices,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilter.html#cfn-ec2-trafficmirrorfilter-tags
+	Tags []cloudformation.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 *TrafficMirrorFilter) AWSCloudFormationType() string {
+	return "AWS::EC2::TrafficMirrorFilter"
+}
+
+// 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 TrafficMirrorFilter) MarshalJSON() ([]byte, error) {
+	type Properties TrafficMirrorFilter
+	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 *TrafficMirrorFilter) UnmarshalJSON(b []byte) error {
+	type Properties TrafficMirrorFilter
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TrafficMirrorFilter(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule.go b/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule.go
new file mode 100644
index 0000000000..62357ca94c
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule.go
@@ -0,0 +1,153 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TrafficMirrorFilterRule AWS CloudFormation Resource (AWS::EC2::TrafficMirrorFilterRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilterrule.html
+type TrafficMirrorFilterRule struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilterrule.html#cfn-ec2-trafficmirrorfilterrule-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DestinationCidrBlock AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilterrule.html#cfn-ec2-trafficmirrorfilterrule-destinationcidrblock
+	DestinationCidrBlock *types.Value `json:"DestinationCidrBlock,omitempty"`
+
+	// DestinationPortRange AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilterrule.html#cfn-ec2-trafficmirrorfilterrule-destinationportrange
+	DestinationPortRange *TrafficMirrorFilterRule_TrafficMirrorPortRange `json:"DestinationPortRange,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilterrule.html#cfn-ec2-trafficmirrorfilterrule-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// RuleAction AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilterrule.html#cfn-ec2-trafficmirrorfilterrule-ruleaction
+	RuleAction *types.Value `json:"RuleAction,omitempty"`
+
+	// RuleNumber AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilterrule.html#cfn-ec2-trafficmirrorfilterrule-rulenumber
+	RuleNumber *types.Value `json:"RuleNumber"`
+
+	// SourceCidrBlock AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilterrule.html#cfn-ec2-trafficmirrorfilterrule-sourcecidrblock
+	SourceCidrBlock *types.Value `json:"SourceCidrBlock,omitempty"`
+
+	// SourcePortRange AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilterrule.html#cfn-ec2-trafficmirrorfilterrule-sourceportrange
+	SourcePortRange *TrafficMirrorFilterRule_TrafficMirrorPortRange `json:"SourcePortRange,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
+	TrafficDirection *types.Value `json:"TrafficDirection,omitempty"`
+
+	// TrafficMirrorFilterId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorfilterrule.html#cfn-ec2-trafficmirrorfilterrule-trafficmirrorfilterid
+	TrafficMirrorFilterId *types.Value `json:"TrafficMirrorFilterId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TrafficMirrorFilterRule) AWSCloudFormationType() string {
+	return "AWS::EC2::TrafficMirrorFilterRule"
+}
+
+// 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 TrafficMirrorFilterRule) MarshalJSON() ([]byte, error) {
+	type Properties TrafficMirrorFilterRule
+	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 *TrafficMirrorFilterRule) UnmarshalJSON(b []byte) error {
+	type Properties TrafficMirrorFilterRule
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TrafficMirrorFilterRule(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule_trafficmirrorportrange.go b/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule_trafficmirrorportrange.go
new file mode 100644
index 0000000000..903dad0e9b
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-trafficmirrorfilterrule_trafficmirrorportrange.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TrafficMirrorFilterRule_TrafficMirrorPortRange AWS CloudFormation Resource (AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-trafficmirrorfilterrule-trafficmirrorportrange.html
+type TrafficMirrorFilterRule_TrafficMirrorPortRange struct {
+
+	// FromPort AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-trafficmirrorfilterrule-trafficmirrorportrange.html#cfn-ec2-trafficmirrorfilterrule-trafficmirrorportrange-fromport
+	FromPort *types.Value `json:"FromPort"`
+
+	// ToPort AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-trafficmirrorfilterrule-trafficmirrorportrange.html#cfn-ec2-trafficmirrorfilterrule-trafficmirrorportrange-toport
+	ToPort *types.Value `json:"ToPort"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TrafficMirrorFilterRule_TrafficMirrorPortRange) AWSCloudFormationType() string {
+	return "AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-trafficmirrorsession.go b/goformation/cloudformation/ec2/aws-ec2-trafficmirrorsession.go
new file mode 100644
index 0000000000..b6a5348f3f
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-trafficmirrorsession.go
@@ -0,0 +1,144 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// TrafficMirrorSession AWS CloudFormation Resource (AWS::EC2::TrafficMirrorSession)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorsession.html
+type TrafficMirrorSession struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorsession.html#cfn-ec2-trafficmirrorsession-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// NetworkInterfaceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorsession.html#cfn-ec2-trafficmirrorsession-networkinterfaceid
+	NetworkInterfaceId *types.Value `json:"NetworkInterfaceId,omitempty"`
+
+	// PacketLength AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorsession.html#cfn-ec2-trafficmirrorsession-packetlength
+	PacketLength *types.Value `json:"PacketLength,omitempty"`
+
+	// SessionNumber AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorsession.html#cfn-ec2-trafficmirrorsession-sessionnumber
+	SessionNumber *types.Value `json:"SessionNumber"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorsession.html#cfn-ec2-trafficmirrorsession-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TrafficMirrorFilterId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorsession.html#cfn-ec2-trafficmirrorsession-trafficmirrorfilterid
+	TrafficMirrorFilterId *types.Value `json:"TrafficMirrorFilterId,omitempty"`
+
+	// TrafficMirrorTargetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorsession.html#cfn-ec2-trafficmirrorsession-trafficmirrortargetid
+	TrafficMirrorTargetId *types.Value `json:"TrafficMirrorTargetId,omitempty"`
+
+	// VirtualNetworkId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrorsession.html#cfn-ec2-trafficmirrorsession-virtualnetworkid
+	VirtualNetworkId *types.Value `json:"VirtualNetworkId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TrafficMirrorSession) AWSCloudFormationType() string {
+	return "AWS::EC2::TrafficMirrorSession"
+}
+
+// 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 TrafficMirrorSession) MarshalJSON() ([]byte, error) {
+	type Properties TrafficMirrorSession
+	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 *TrafficMirrorSession) UnmarshalJSON(b []byte) error {
+	type Properties TrafficMirrorSession
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TrafficMirrorSession(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-trafficmirrortarget.go b/goformation/cloudformation/ec2/aws-ec2-trafficmirrortarget.go
new file mode 100644
index 0000000000..ab7af4a853
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-trafficmirrortarget.go
@@ -0,0 +1,124 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// TrafficMirrorTarget AWS CloudFormation Resource (AWS::EC2::TrafficMirrorTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrortarget.html
+type TrafficMirrorTarget struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrortarget.html#cfn-ec2-trafficmirrortarget-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// NetworkInterfaceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrortarget.html#cfn-ec2-trafficmirrortarget-networkinterfaceid
+	NetworkInterfaceId *types.Value `json:"NetworkInterfaceId,omitempty"`
+
+	// NetworkLoadBalancerArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrortarget.html#cfn-ec2-trafficmirrortarget-networkloadbalancerarn
+	NetworkLoadBalancerArn *types.Value `json:"NetworkLoadBalancerArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-trafficmirrortarget.html#cfn-ec2-trafficmirrortarget-tags
+	Tags []cloudformation.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 *TrafficMirrorTarget) AWSCloudFormationType() string {
+	return "AWS::EC2::TrafficMirrorTarget"
+}
+
+// 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 TrafficMirrorTarget) MarshalJSON() ([]byte, error) {
+	type Properties TrafficMirrorTarget
+	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 *TrafficMirrorTarget) UnmarshalJSON(b []byte) error {
+	type Properties TrafficMirrorTarget
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TrafficMirrorTarget(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-transitgateway.go b/goformation/cloudformation/ec2/aws-ec2-transitgateway.go
new file mode 100644
index 0000000000..f38184cbd2
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-transitgateway.go
@@ -0,0 +1,164 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// TransitGateway AWS CloudFormation Resource (AWS::EC2::TransitGateway)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgateway.html
+type TransitGateway struct {
+
+	// AmazonSideAsn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgateway.html#cfn-ec2-transitgateway-amazonsideasn
+	AmazonSideAsn *types.Value `json:"AmazonSideAsn,omitempty"`
+
+	// AssociationDefaultRouteTableId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgateway.html#cfn-ec2-transitgateway-associationdefaultroutetableid
+	AssociationDefaultRouteTableId *types.Value `json:"AssociationDefaultRouteTableId,omitempty"`
+
+	// AutoAcceptSharedAttachments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgateway.html#cfn-ec2-transitgateway-autoacceptsharedattachments
+	AutoAcceptSharedAttachments *types.Value `json:"AutoAcceptSharedAttachments,omitempty"`
+
+	// DefaultRouteTableAssociation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgateway.html#cfn-ec2-transitgateway-defaultroutetableassociation
+	DefaultRouteTableAssociation *types.Value `json:"DefaultRouteTableAssociation,omitempty"`
+
+	// DefaultRouteTablePropagation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgateway.html#cfn-ec2-transitgateway-defaultroutetablepropagation
+	DefaultRouteTablePropagation *types.Value `json:"DefaultRouteTablePropagation,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgateway.html#cfn-ec2-transitgateway-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DnsSupport AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgateway.html#cfn-ec2-transitgateway-dnssupport
+	DnsSupport *types.Value `json:"DnsSupport,omitempty"`
+
+	// MulticastSupport AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgateway.html#cfn-ec2-transitgateway-multicastsupport
+	MulticastSupport *types.Value `json:"MulticastSupport,omitempty"`
+
+	// PropagationDefaultRouteTableId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgateway.html#cfn-ec2-transitgateway-propagationdefaultroutetableid
+	PropagationDefaultRouteTableId *types.Value `json:"PropagationDefaultRouteTableId,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
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TransitGatewayCidrBlocks AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgateway.html#cfn-ec2-transitgateway-transitgatewaycidrblocks
+	TransitGatewayCidrBlocks *types.Value `json:"TransitGatewayCidrBlocks,omitempty"`
+
+	// VpnEcmpSupport AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgateway.html#cfn-ec2-transitgateway-vpnecmpsupport
+	VpnEcmpSupport *types.Value `json:"VpnEcmpSupport,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TransitGateway) AWSCloudFormationType() string {
+	return "AWS::EC2::TransitGateway"
+}
+
+// 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 TransitGateway) MarshalJSON() ([]byte, error) {
+	type Properties TransitGateway
+	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 *TransitGateway) UnmarshalJSON(b []byte) error {
+	type Properties TransitGateway
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TransitGateway(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-transitgatewayattachment.go b/goformation/cloudformation/ec2/aws-ec2-transitgatewayattachment.go
new file mode 100644
index 0000000000..df7fb72257
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-transitgatewayattachment.go
@@ -0,0 +1,124 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// TransitGatewayAttachment AWS CloudFormation Resource (AWS::EC2::TransitGatewayAttachment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayattachment.html
+type TransitGatewayAttachment struct {
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayattachment.html#cfn-ec2-transitgatewayattachment-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayattachment.html#cfn-ec2-transitgatewayattachment-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TransitGatewayId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayattachment.html#cfn-ec2-transitgatewayattachment-transitgatewayid
+	TransitGatewayId *types.Value `json:"TransitGatewayId,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayattachment.html#cfn-ec2-transitgatewayattachment-vpcid
+	VpcId *types.Value `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 *TransitGatewayAttachment) AWSCloudFormationType() string {
+	return "AWS::EC2::TransitGatewayAttachment"
+}
+
+// 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 TransitGatewayAttachment) MarshalJSON() ([]byte, error) {
+	type Properties TransitGatewayAttachment
+	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 *TransitGatewayAttachment) UnmarshalJSON(b []byte) error {
+	type Properties TransitGatewayAttachment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TransitGatewayAttachment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-transitgatewayconnect.go b/goformation/cloudformation/ec2/aws-ec2-transitgatewayconnect.go
new file mode 100644
index 0000000000..5925b2bda3
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-transitgatewayconnect.go
@@ -0,0 +1,119 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// TransitGatewayConnect AWS CloudFormation Resource (AWS::EC2::TransitGatewayConnect)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayconnect.html
+type TransitGatewayConnect struct {
+
+	// Options AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayconnect.html#cfn-ec2-transitgatewayconnect-options
+	Options *TransitGatewayConnect_TransitGatewayConnectOptions `json:"Options,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayconnect.html#cfn-ec2-transitgatewayconnect-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TransportTransitGatewayAttachmentId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayconnect.html#cfn-ec2-transitgatewayconnect-transporttransitgatewayattachmentid
+	TransportTransitGatewayAttachmentId *types.Value `json:"TransportTransitGatewayAttachmentId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TransitGatewayConnect) AWSCloudFormationType() string {
+	return "AWS::EC2::TransitGatewayConnect"
+}
+
+// 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 TransitGatewayConnect) MarshalJSON() ([]byte, error) {
+	type Properties TransitGatewayConnect
+	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 *TransitGatewayConnect) UnmarshalJSON(b []byte) error {
+	type Properties TransitGatewayConnect
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TransitGatewayConnect(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-transitgatewayconnect_transitgatewayconnectoptions.go b/goformation/cloudformation/ec2/aws-ec2-transitgatewayconnect_transitgatewayconnectoptions.go
new file mode 100644
index 0000000000..61cd2b2b6e
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-transitgatewayconnect_transitgatewayconnectoptions.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TransitGatewayConnect_TransitGatewayConnectOptions AWS CloudFormation Resource (AWS::EC2::TransitGatewayConnect.TransitGatewayConnectOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-transitgatewayconnect-transitgatewayconnectoptions.html
+type TransitGatewayConnect_TransitGatewayConnectOptions struct {
+
+	// Protocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-transitgatewayconnect-transitgatewayconnectoptions.html#cfn-ec2-transitgatewayconnect-transitgatewayconnectoptions-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TransitGatewayConnect_TransitGatewayConnectOptions) AWSCloudFormationType() string {
+	return "AWS::EC2::TransitGatewayConnect.TransitGatewayConnectOptions"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomain.go b/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomain.go
new file mode 100644
index 0000000000..57f8d697ab
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomain.go
@@ -0,0 +1,119 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// TransitGatewayMulticastDomain AWS CloudFormation Resource (AWS::EC2::TransitGatewayMulticastDomain)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastdomain.html
+type TransitGatewayMulticastDomain struct {
+
+	// Options AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastdomain.html#cfn-ec2-transitgatewaymulticastdomain-options
+	Options interface{} `json:"Options,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastdomain.html#cfn-ec2-transitgatewaymulticastdomain-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TransitGatewayId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastdomain.html#cfn-ec2-transitgatewaymulticastdomain-transitgatewayid
+	TransitGatewayId *types.Value `json:"TransitGatewayId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TransitGatewayMulticastDomain) AWSCloudFormationType() string {
+	return "AWS::EC2::TransitGatewayMulticastDomain"
+}
+
+// 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 TransitGatewayMulticastDomain) MarshalJSON() ([]byte, error) {
+	type Properties TransitGatewayMulticastDomain
+	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 *TransitGatewayMulticastDomain) UnmarshalJSON(b []byte) error {
+	type Properties TransitGatewayMulticastDomain
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TransitGatewayMulticastDomain(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomainassociation.go b/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomainassociation.go
new file mode 100644
index 0000000000..b1c4313a67
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastdomainassociation.go
@@ -0,0 +1,118 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TransitGatewayMulticastDomainAssociation AWS CloudFormation Resource (AWS::EC2::TransitGatewayMulticastDomainAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastdomainassociation.html
+type TransitGatewayMulticastDomainAssociation struct {
+
+	// SubnetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastdomainassociation.html#cfn-ec2-transitgatewaymulticastdomainassociation-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// TransitGatewayAttachmentId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastdomainassociation.html#cfn-ec2-transitgatewaymulticastdomainassociation-transitgatewayattachmentid
+	TransitGatewayAttachmentId *types.Value `json:"TransitGatewayAttachmentId,omitempty"`
+
+	// TransitGatewayMulticastDomainId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastdomainassociation.html#cfn-ec2-transitgatewaymulticastdomainassociation-transitgatewaymulticastdomainid
+	TransitGatewayMulticastDomainId *types.Value `json:"TransitGatewayMulticastDomainId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TransitGatewayMulticastDomainAssociation) AWSCloudFormationType() string {
+	return "AWS::EC2::TransitGatewayMulticastDomainAssociation"
+}
+
+// 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 TransitGatewayMulticastDomainAssociation) MarshalJSON() ([]byte, error) {
+	type Properties TransitGatewayMulticastDomainAssociation
+	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 *TransitGatewayMulticastDomainAssociation) UnmarshalJSON(b []byte) error {
+	type Properties TransitGatewayMulticastDomainAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TransitGatewayMulticastDomainAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupmember.go b/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupmember.go
new file mode 100644
index 0000000000..7b8ed70c4d
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupmember.go
@@ -0,0 +1,118 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TransitGatewayMulticastGroupMember AWS CloudFormation Resource (AWS::EC2::TransitGatewayMulticastGroupMember)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastgroupmember.html
+type TransitGatewayMulticastGroupMember struct {
+
+	// GroupIpAddress AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastgroupmember.html#cfn-ec2-transitgatewaymulticastgroupmember-groupipaddress
+	GroupIpAddress *types.Value `json:"GroupIpAddress,omitempty"`
+
+	// NetworkInterfaceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastgroupmember.html#cfn-ec2-transitgatewaymulticastgroupmember-networkinterfaceid
+	NetworkInterfaceId *types.Value `json:"NetworkInterfaceId,omitempty"`
+
+	// TransitGatewayMulticastDomainId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastgroupmember.html#cfn-ec2-transitgatewaymulticastgroupmember-transitgatewaymulticastdomainid
+	TransitGatewayMulticastDomainId *types.Value `json:"TransitGatewayMulticastDomainId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TransitGatewayMulticastGroupMember) AWSCloudFormationType() string {
+	return "AWS::EC2::TransitGatewayMulticastGroupMember"
+}
+
+// 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 TransitGatewayMulticastGroupMember) MarshalJSON() ([]byte, error) {
+	type Properties TransitGatewayMulticastGroupMember
+	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 *TransitGatewayMulticastGroupMember) UnmarshalJSON(b []byte) error {
+	type Properties TransitGatewayMulticastGroupMember
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TransitGatewayMulticastGroupMember(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupsource.go b/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupsource.go
new file mode 100644
index 0000000000..0e05ef2aff
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-transitgatewaymulticastgroupsource.go
@@ -0,0 +1,118 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TransitGatewayMulticastGroupSource AWS CloudFormation Resource (AWS::EC2::TransitGatewayMulticastGroupSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastgroupsource.html
+type TransitGatewayMulticastGroupSource struct {
+
+	// GroupIpAddress AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastgroupsource.html#cfn-ec2-transitgatewaymulticastgroupsource-groupipaddress
+	GroupIpAddress *types.Value `json:"GroupIpAddress,omitempty"`
+
+	// NetworkInterfaceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastgroupsource.html#cfn-ec2-transitgatewaymulticastgroupsource-networkinterfaceid
+	NetworkInterfaceId *types.Value `json:"NetworkInterfaceId,omitempty"`
+
+	// TransitGatewayMulticastDomainId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaymulticastgroupsource.html#cfn-ec2-transitgatewaymulticastgroupsource-transitgatewaymulticastdomainid
+	TransitGatewayMulticastDomainId *types.Value `json:"TransitGatewayMulticastDomainId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TransitGatewayMulticastGroupSource) AWSCloudFormationType() string {
+	return "AWS::EC2::TransitGatewayMulticastGroupSource"
+}
+
+// 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 TransitGatewayMulticastGroupSource) MarshalJSON() ([]byte, error) {
+	type Properties TransitGatewayMulticastGroupSource
+	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 *TransitGatewayMulticastGroupSource) UnmarshalJSON(b []byte) error {
+	type Properties TransitGatewayMulticastGroupSource
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TransitGatewayMulticastGroupSource(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment.go b/goformation/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment.go
new file mode 100644
index 0000000000..7bab6f2dc6
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment.go
@@ -0,0 +1,134 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// TransitGatewayPeeringAttachment AWS CloudFormation Resource (AWS::EC2::TransitGatewayPeeringAttachment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaypeeringattachment.html
+type TransitGatewayPeeringAttachment struct {
+
+	// Options AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaypeeringattachment.html#cfn-ec2-transitgatewaypeeringattachment-options
+	Options *TransitGatewayPeeringAttachment_TransitGatewayPeeringAttachmentOptions `json:"Options,omitempty"`
+
+	// PeerAccountId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaypeeringattachment.html#cfn-ec2-transitgatewaypeeringattachment-peeraccountid
+	PeerAccountId *types.Value `json:"PeerAccountId,omitempty"`
+
+	// PeerRegion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaypeeringattachment.html#cfn-ec2-transitgatewaypeeringattachment-peerregion
+	PeerRegion *types.Value `json:"PeerRegion,omitempty"`
+
+	// PeerTransitGatewayId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaypeeringattachment.html#cfn-ec2-transitgatewaypeeringattachment-peertransitgatewayid
+	PeerTransitGatewayId *types.Value `json:"PeerTransitGatewayId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaypeeringattachment.html#cfn-ec2-transitgatewaypeeringattachment-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TransitGatewayId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewaypeeringattachment.html#cfn-ec2-transitgatewaypeeringattachment-transitgatewayid
+	TransitGatewayId *types.Value `json:"TransitGatewayId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TransitGatewayPeeringAttachment) AWSCloudFormationType() string {
+	return "AWS::EC2::TransitGatewayPeeringAttachment"
+}
+
+// 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 TransitGatewayPeeringAttachment) MarshalJSON() ([]byte, error) {
+	type Properties TransitGatewayPeeringAttachment
+	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 *TransitGatewayPeeringAttachment) UnmarshalJSON(b []byte) error {
+	type Properties TransitGatewayPeeringAttachment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TransitGatewayPeeringAttachment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment_transitgatewaypeeringattachmentoptions.go b/goformation/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment_transitgatewaypeeringattachmentoptions.go
new file mode 100644
index 0000000000..efb7d1350c
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-transitgatewaypeeringattachment_transitgatewaypeeringattachmentoptions.go
@@ -0,0 +1,37 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TransitGatewayPeeringAttachment_TransitGatewayPeeringAttachmentOptions AWS CloudFormation Resource (AWS::EC2::TransitGatewayPeeringAttachment.TransitGatewayPeeringAttachmentOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-transitgatewaypeeringattachment-transitgatewaypeeringattachmentoptions.html
+type TransitGatewayPeeringAttachment_TransitGatewayPeeringAttachmentOptions struct {
+
+	// DynamicRouting AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-transitgatewaypeeringattachment-transitgatewaypeeringattachmentoptions.html#cfn-ec2-transitgatewaypeeringattachment-transitgatewaypeeringattachmentoptions-dynamicrouting
+	DynamicRouting *types.Value `json:"DynamicRouting,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TransitGatewayPeeringAttachment_TransitGatewayPeeringAttachmentOptions) AWSCloudFormationType() string {
+	return "AWS::EC2::TransitGatewayPeeringAttachment.TransitGatewayPeeringAttachmentOptions"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-transitgatewayroute.go b/goformation/cloudformation/ec2/aws-ec2-transitgatewayroute.go
new file mode 100644
index 0000000000..cd95a4386b
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-transitgatewayroute.go
@@ -0,0 +1,123 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TransitGatewayRoute AWS CloudFormation Resource (AWS::EC2::TransitGatewayRoute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroute.html
+type TransitGatewayRoute struct {
+
+	// Blackhole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroute.html#cfn-ec2-transitgatewayroute-blackhole
+	Blackhole *types.Value `json:"Blackhole,omitempty"`
+
+	// DestinationCidrBlock AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroute.html#cfn-ec2-transitgatewayroute-destinationcidrblock
+	DestinationCidrBlock *types.Value `json:"DestinationCidrBlock,omitempty"`
+
+	// TransitGatewayAttachmentId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroute.html#cfn-ec2-transitgatewayroute-transitgatewayattachmentid
+	TransitGatewayAttachmentId *types.Value `json:"TransitGatewayAttachmentId,omitempty"`
+
+	// TransitGatewayRouteTableId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroute.html#cfn-ec2-transitgatewayroute-transitgatewayroutetableid
+	TransitGatewayRouteTableId *types.Value `json:"TransitGatewayRouteTableId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TransitGatewayRoute) AWSCloudFormationType() string {
+	return "AWS::EC2::TransitGatewayRoute"
+}
+
+// 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 TransitGatewayRoute) MarshalJSON() ([]byte, error) {
+	type Properties TransitGatewayRoute
+	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 *TransitGatewayRoute) UnmarshalJSON(b []byte) error {
+	type Properties TransitGatewayRoute
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TransitGatewayRoute(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetable.go b/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetable.go
new file mode 100644
index 0000000000..279e193983
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetable.go
@@ -0,0 +1,114 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// TransitGatewayRouteTable AWS CloudFormation Resource (AWS::EC2::TransitGatewayRouteTable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroutetable.html
+type TransitGatewayRouteTable struct {
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroutetable.html#cfn-ec2-transitgatewayroutetable-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TransitGatewayId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroutetable.html#cfn-ec2-transitgatewayroutetable-transitgatewayid
+	TransitGatewayId *types.Value `json:"TransitGatewayId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TransitGatewayRouteTable) AWSCloudFormationType() string {
+	return "AWS::EC2::TransitGatewayRouteTable"
+}
+
+// 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 TransitGatewayRouteTable) MarshalJSON() ([]byte, error) {
+	type Properties TransitGatewayRouteTable
+	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 *TransitGatewayRouteTable) UnmarshalJSON(b []byte) error {
+	type Properties TransitGatewayRouteTable
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TransitGatewayRouteTable(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetableassociation.go b/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetableassociation.go
new file mode 100644
index 0000000000..de2f6965c9
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetableassociation.go
@@ -0,0 +1,113 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TransitGatewayRouteTableAssociation AWS CloudFormation Resource (AWS::EC2::TransitGatewayRouteTableAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroutetableassociation.html
+type TransitGatewayRouteTableAssociation struct {
+
+	// TransitGatewayAttachmentId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroutetableassociation.html#cfn-ec2-transitgatewayroutetableassociation-transitgatewayattachmentid
+	TransitGatewayAttachmentId *types.Value `json:"TransitGatewayAttachmentId,omitempty"`
+
+	// TransitGatewayRouteTableId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroutetableassociation.html#cfn-ec2-transitgatewayroutetableassociation-transitgatewayroutetableid
+	TransitGatewayRouteTableId *types.Value `json:"TransitGatewayRouteTableId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TransitGatewayRouteTableAssociation) AWSCloudFormationType() string {
+	return "AWS::EC2::TransitGatewayRouteTableAssociation"
+}
+
+// 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 TransitGatewayRouteTableAssociation) MarshalJSON() ([]byte, error) {
+	type Properties TransitGatewayRouteTableAssociation
+	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 *TransitGatewayRouteTableAssociation) UnmarshalJSON(b []byte) error {
+	type Properties TransitGatewayRouteTableAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TransitGatewayRouteTableAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetablepropagation.go b/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetablepropagation.go
new file mode 100644
index 0000000000..fba3ae5736
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-transitgatewayroutetablepropagation.go
@@ -0,0 +1,113 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TransitGatewayRouteTablePropagation AWS CloudFormation Resource (AWS::EC2::TransitGatewayRouteTablePropagation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroutetablepropagation.html
+type TransitGatewayRouteTablePropagation struct {
+
+	// TransitGatewayAttachmentId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroutetablepropagation.html#cfn-ec2-transitgatewayroutetablepropagation-transitgatewayattachmentid
+	TransitGatewayAttachmentId *types.Value `json:"TransitGatewayAttachmentId,omitempty"`
+
+	// TransitGatewayRouteTableId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayroutetablepropagation.html#cfn-ec2-transitgatewayroutetablepropagation-transitgatewayroutetableid
+	TransitGatewayRouteTableId *types.Value `json:"TransitGatewayRouteTableId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TransitGatewayRouteTablePropagation) AWSCloudFormationType() string {
+	return "AWS::EC2::TransitGatewayRouteTablePropagation"
+}
+
+// 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 TransitGatewayRouteTablePropagation) MarshalJSON() ([]byte, error) {
+	type Properties TransitGatewayRouteTablePropagation
+	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 *TransitGatewayRouteTablePropagation) UnmarshalJSON(b []byte) error {
+	type Properties TransitGatewayRouteTablePropagation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TransitGatewayRouteTablePropagation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-transitgatewayvpcattachment.go b/goformation/cloudformation/ec2/aws-ec2-transitgatewayvpcattachment.go
new file mode 100644
index 0000000000..5d6340cddd
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-transitgatewayvpcattachment.go
@@ -0,0 +1,139 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// TransitGatewayVpcAttachment AWS CloudFormation Resource (AWS::EC2::TransitGatewayVpcAttachment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayvpcattachment.html
+type TransitGatewayVpcAttachment struct {
+
+	// AddSubnetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayvpcattachment.html#cfn-ec2-transitgatewayvpcattachment-addsubnetids
+	AddSubnetIds *types.Value `json:"AddSubnetIds,omitempty"`
+
+	// Options AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayvpcattachment.html#cfn-ec2-transitgatewayvpcattachment-options
+	Options interface{} `json:"Options,omitempty"`
+
+	// RemoveSubnetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayvpcattachment.html#cfn-ec2-transitgatewayvpcattachment-removesubnetids
+	RemoveSubnetIds *types.Value `json:"RemoveSubnetIds,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayvpcattachment.html#cfn-ec2-transitgatewayvpcattachment-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayvpcattachment.html#cfn-ec2-transitgatewayvpcattachment-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TransitGatewayId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayvpcattachment.html#cfn-ec2-transitgatewayvpcattachment-transitgatewayid
+	TransitGatewayId *types.Value `json:"TransitGatewayId,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-transitgatewayvpcattachment.html#cfn-ec2-transitgatewayvpcattachment-vpcid
+	VpcId *types.Value `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 *TransitGatewayVpcAttachment) AWSCloudFormationType() string {
+	return "AWS::EC2::TransitGatewayVpcAttachment"
+}
+
+// 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 TransitGatewayVpcAttachment) MarshalJSON() ([]byte, error) {
+	type Properties TransitGatewayVpcAttachment
+	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 *TransitGatewayVpcAttachment) UnmarshalJSON(b []byte) error {
+	type Properties TransitGatewayVpcAttachment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TransitGatewayVpcAttachment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-volume.go b/goformation/cloudformation/ec2/aws-ec2-volume.go
new file mode 100644
index 0000000000..45dba8f3cd
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-volume.go
@@ -0,0 +1,164 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Volume AWS CloudFormation Resource (AWS::EC2::Volume)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html
+type Volume struct {
+
+	// AutoEnableIO AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-autoenableio
+	AutoEnableIO *types.Value `json:"AutoEnableIO,omitempty"`
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// Encrypted AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-encrypted
+	Encrypted *types.Value `json:"Encrypted,omitempty"`
+
+	// Iops AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-iops
+	Iops *types.Value `json:"Iops,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// MultiAttachEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-multiattachenabled
+	MultiAttachEnabled *types.Value `json:"MultiAttachEnabled,omitempty"`
+
+	// OutpostArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-outpostarn
+	OutpostArn *types.Value `json:"OutpostArn,omitempty"`
+
+	// Size AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-size
+	Size *types.Value `json:"Size,omitempty"`
+
+	// SnapshotId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-snapshotid
+	SnapshotId *types.Value `json:"SnapshotId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Throughput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-throughput
+	Throughput *types.Value `json:"Throughput,omitempty"`
+
+	// VolumeType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html#cfn-ec2-ebs-volume-volumetype
+	VolumeType *types.Value `json:"VolumeType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Volume) AWSCloudFormationType() string {
+	return "AWS::EC2::Volume"
+}
+
+// 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 Volume) MarshalJSON() ([]byte, error) {
+	type Properties Volume
+	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 *Volume) UnmarshalJSON(b []byte) error {
+	type Properties Volume
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Volume(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-volumeattachment.go b/goformation/cloudformation/ec2/aws-ec2-volumeattachment.go
new file mode 100644
index 0000000000..4e8907ce36
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-volumeattachment.go
@@ -0,0 +1,118 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VolumeAttachment AWS CloudFormation Resource (AWS::EC2::VolumeAttachment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volumeattachment.html
+type VolumeAttachment struct {
+
+	// Device AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volumeattachment.html#cfn-ec2-ebs-volumeattachment-device
+	Device *types.Value `json:"Device,omitempty"`
+
+	// InstanceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volumeattachment.html#cfn-ec2-ebs-volumeattachment-instanceid
+	InstanceId *types.Value `json:"InstanceId,omitempty"`
+
+	// VolumeId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volumeattachment.html#cfn-ec2-ebs-volumeattachment-volumeid
+	VolumeId *types.Value `json:"VolumeId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VolumeAttachment) AWSCloudFormationType() string {
+	return "AWS::EC2::VolumeAttachment"
+}
+
+// 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 VolumeAttachment) MarshalJSON() ([]byte, error) {
+	type Properties VolumeAttachment
+	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 *VolumeAttachment) UnmarshalJSON(b []byte) error {
+	type Properties VolumeAttachment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VolumeAttachment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-vpc.go b/goformation/cloudformation/ec2/aws-ec2-vpc.go
new file mode 100644
index 0000000000..86ee06d227
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-vpc.go
@@ -0,0 +1,129 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// VPC AWS CloudFormation Resource (AWS::EC2::VPC)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc.html
+type VPC struct {
+
+	// CidrBlock AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc.html#cfn-aws-ec2-vpc-cidrblock
+	CidrBlock *types.Value `json:"CidrBlock,omitempty"`
+
+	// EnableDnsHostnames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc.html#cfn-aws-ec2-vpc-EnableDnsHostnames
+	EnableDnsHostnames *types.Value `json:"EnableDnsHostnames,omitempty"`
+
+	// EnableDnsSupport AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc.html#cfn-aws-ec2-vpc-EnableDnsSupport
+	EnableDnsSupport *types.Value `json:"EnableDnsSupport,omitempty"`
+
+	// InstanceTenancy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc.html#cfn-aws-ec2-vpc-instancetenancy
+	InstanceTenancy *types.Value `json:"InstanceTenancy,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc.html#cfn-aws-ec2-vpc-tags
+	Tags []cloudformation.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 *VPC) AWSCloudFormationType() string {
+	return "AWS::EC2::VPC"
+}
+
+// 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 VPC) MarshalJSON() ([]byte, error) {
+	type Properties VPC
+	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 *VPC) UnmarshalJSON(b []byte) error {
+	type Properties VPC
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VPC(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-vpccidrblock.go b/goformation/cloudformation/ec2/aws-ec2-vpccidrblock.go
new file mode 100644
index 0000000000..8d27f729e4
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-vpccidrblock.go
@@ -0,0 +1,128 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VPCCidrBlock AWS CloudFormation Resource (AWS::EC2::VPCCidrBlock)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpccidrblock.html
+type VPCCidrBlock struct {
+
+	// AmazonProvidedIpv6CidrBlock AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpccidrblock.html#cfn-ec2-vpccidrblock-amazonprovidedipv6cidrblock
+	AmazonProvidedIpv6CidrBlock *types.Value `json:"AmazonProvidedIpv6CidrBlock,omitempty"`
+
+	// CidrBlock AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpccidrblock.html#cfn-ec2-vpccidrblock-cidrblock
+	CidrBlock *types.Value `json:"CidrBlock,omitempty"`
+
+	// Ipv6CidrBlock AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpccidrblock.html#cfn-ec2-vpccidrblock-ipv6cidrblock
+	Ipv6CidrBlock *types.Value `json:"Ipv6CidrBlock,omitempty"`
+
+	// Ipv6Pool AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpccidrblock.html#cfn-ec2-vpccidrblock-ipv6pool
+	Ipv6Pool *types.Value `json:"Ipv6Pool,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpccidrblock.html#cfn-ec2-vpccidrblock-vpcid
+	VpcId *types.Value `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 *VPCCidrBlock) AWSCloudFormationType() string {
+	return "AWS::EC2::VPCCidrBlock"
+}
+
+// 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 VPCCidrBlock) MarshalJSON() ([]byte, error) {
+	type Properties VPCCidrBlock
+	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 *VPCCidrBlock) UnmarshalJSON(b []byte) error {
+	type Properties VPCCidrBlock
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VPCCidrBlock(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-vpcdhcpoptionsassociation.go b/goformation/cloudformation/ec2/aws-ec2-vpcdhcpoptionsassociation.go
new file mode 100644
index 0000000000..7a922026ab
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-vpcdhcpoptionsassociation.go
@@ -0,0 +1,113 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VPCDHCPOptionsAssociation AWS CloudFormation Resource (AWS::EC2::VPCDHCPOptionsAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcdhcpoptionsassociation.html
+type VPCDHCPOptionsAssociation struct {
+
+	// DhcpOptionsId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcdhcpoptionsassociation.html#cfn-ec2-vpcdhcpoptionsassociation-dhcpoptionsid
+	DhcpOptionsId *types.Value `json:"DhcpOptionsId,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcdhcpoptionsassociation.html#cfn-ec2-vpcdhcpoptionsassociation-vpcid
+	VpcId *types.Value `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 *VPCDHCPOptionsAssociation) AWSCloudFormationType() string {
+	return "AWS::EC2::VPCDHCPOptionsAssociation"
+}
+
+// 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 VPCDHCPOptionsAssociation) MarshalJSON() ([]byte, error) {
+	type Properties VPCDHCPOptionsAssociation
+	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 *VPCDHCPOptionsAssociation) UnmarshalJSON(b []byte) error {
+	type Properties VPCDHCPOptionsAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VPCDHCPOptionsAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-vpcendpoint.go b/goformation/cloudformation/ec2/aws-ec2-vpcendpoint.go
new file mode 100644
index 0000000000..f07b81f9de
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-vpcendpoint.go
@@ -0,0 +1,143 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VPCEndpoint AWS CloudFormation Resource (AWS::EC2::VPCEndpoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html
+type VPCEndpoint struct {
+
+	// PolicyDocument AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html#cfn-ec2-vpcendpoint-policydocument
+	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
+
+	// PrivateDnsEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html#cfn-ec2-vpcendpoint-privatednsenabled
+	PrivateDnsEnabled *types.Value `json:"PrivateDnsEnabled,omitempty"`
+
+	// RouteTableIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html#cfn-ec2-vpcendpoint-routetableids
+	RouteTableIds *types.Value `json:"RouteTableIds,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html#cfn-ec2-vpcendpoint-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// ServiceName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html#cfn-ec2-vpcendpoint-servicename
+	ServiceName *types.Value `json:"ServiceName,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html#cfn-ec2-vpcendpoint-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// VpcEndpointType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html#cfn-ec2-vpcendpoint-vpcendpointtype
+	VpcEndpointType *types.Value `json:"VpcEndpointType,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpoint.html#cfn-ec2-vpcendpoint-vpcid
+	VpcId *types.Value `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 *VPCEndpoint) AWSCloudFormationType() string {
+	return "AWS::EC2::VPCEndpoint"
+}
+
+// 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 VPCEndpoint) MarshalJSON() ([]byte, error) {
+	type Properties VPCEndpoint
+	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 *VPCEndpoint) UnmarshalJSON(b []byte) error {
+	type Properties VPCEndpoint
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VPCEndpoint(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-vpcendpointconnectionnotification.go b/goformation/cloudformation/ec2/aws-ec2-vpcendpointconnectionnotification.go
new file mode 100644
index 0000000000..e9fce01c50
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-vpcendpointconnectionnotification.go
@@ -0,0 +1,123 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VPCEndpointConnectionNotification AWS CloudFormation Resource (AWS::EC2::VPCEndpointConnectionNotification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpointconnectionnotification.html
+type VPCEndpointConnectionNotification struct {
+
+	// ConnectionEvents AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpointconnectionnotification.html#cfn-ec2-vpcendpointconnectionnotification-connectionevents
+	ConnectionEvents *types.Value `json:"ConnectionEvents,omitempty"`
+
+	// ConnectionNotificationArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpointconnectionnotification.html#cfn-ec2-vpcendpointconnectionnotification-connectionnotificationarn
+	ConnectionNotificationArn *types.Value `json:"ConnectionNotificationArn,omitempty"`
+
+	// ServiceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpointconnectionnotification.html#cfn-ec2-vpcendpointconnectionnotification-serviceid
+	ServiceId *types.Value `json:"ServiceId,omitempty"`
+
+	// VPCEndpointId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpointconnectionnotification.html#cfn-ec2-vpcendpointconnectionnotification-vpcendpointid
+	VPCEndpointId *types.Value `json:"VPCEndpointId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VPCEndpointConnectionNotification) AWSCloudFormationType() string {
+	return "AWS::EC2::VPCEndpointConnectionNotification"
+}
+
+// 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 VPCEndpointConnectionNotification) MarshalJSON() ([]byte, error) {
+	type Properties VPCEndpointConnectionNotification
+	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 *VPCEndpointConnectionNotification) UnmarshalJSON(b []byte) error {
+	type Properties VPCEndpointConnectionNotification
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VPCEndpointConnectionNotification(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-vpcendpointservice.go b/goformation/cloudformation/ec2/aws-ec2-vpcendpointservice.go
new file mode 100644
index 0000000000..b3c1bd44ad
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-vpcendpointservice.go
@@ -0,0 +1,118 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VPCEndpointService AWS CloudFormation Resource (AWS::EC2::VPCEndpointService)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpointservice.html
+type VPCEndpointService struct {
+
+	// AcceptanceRequired AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpointservice.html#cfn-ec2-vpcendpointservice-acceptancerequired
+	AcceptanceRequired *types.Value `json:"AcceptanceRequired,omitempty"`
+
+	// GatewayLoadBalancerArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpointservice.html#cfn-ec2-vpcendpointservice-gatewayloadbalancerarns
+	GatewayLoadBalancerArns *types.Value `json:"GatewayLoadBalancerArns,omitempty"`
+
+	// NetworkLoadBalancerArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpointservice.html#cfn-ec2-vpcendpointservice-networkloadbalancerarns
+	NetworkLoadBalancerArns *types.Value `json:"NetworkLoadBalancerArns,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VPCEndpointService) AWSCloudFormationType() string {
+	return "AWS::EC2::VPCEndpointService"
+}
+
+// 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 VPCEndpointService) MarshalJSON() ([]byte, error) {
+	type Properties VPCEndpointService
+	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 *VPCEndpointService) UnmarshalJSON(b []byte) error {
+	type Properties VPCEndpointService
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VPCEndpointService(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-vpcendpointservicepermissions.go b/goformation/cloudformation/ec2/aws-ec2-vpcendpointservicepermissions.go
new file mode 100644
index 0000000000..64efc800b1
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-vpcendpointservicepermissions.go
@@ -0,0 +1,113 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VPCEndpointServicePermissions AWS CloudFormation Resource (AWS::EC2::VPCEndpointServicePermissions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpointservicepermissions.html
+type VPCEndpointServicePermissions struct {
+
+	// AllowedPrincipals AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpointservicepermissions.html#cfn-ec2-vpcendpointservicepermissions-allowedprincipals
+	AllowedPrincipals *types.Value `json:"AllowedPrincipals,omitempty"`
+
+	// ServiceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcendpointservicepermissions.html#cfn-ec2-vpcendpointservicepermissions-serviceid
+	ServiceId *types.Value `json:"ServiceId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VPCEndpointServicePermissions) AWSCloudFormationType() string {
+	return "AWS::EC2::VPCEndpointServicePermissions"
+}
+
+// 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 VPCEndpointServicePermissions) MarshalJSON() ([]byte, error) {
+	type Properties VPCEndpointServicePermissions
+	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 *VPCEndpointServicePermissions) UnmarshalJSON(b []byte) error {
+	type Properties VPCEndpointServicePermissions
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VPCEndpointServicePermissions(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-vpcgatewayattachment.go b/goformation/cloudformation/ec2/aws-ec2-vpcgatewayattachment.go
new file mode 100644
index 0000000000..11c87a637a
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-vpcgatewayattachment.go
@@ -0,0 +1,118 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VPCGatewayAttachment AWS CloudFormation Resource (AWS::EC2::VPCGatewayAttachment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc-gateway-attachment.html
+type VPCGatewayAttachment struct {
+
+	// InternetGatewayId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc-gateway-attachment.html#cfn-ec2-vpcgatewayattachment-internetgatewayid
+	InternetGatewayId *types.Value `json:"InternetGatewayId,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc-gateway-attachment.html#cfn-ec2-vpcgatewayattachment-vpcid
+	VpcId *types.Value `json:"VpcId,omitempty"`
+
+	// VpnGatewayId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpc-gateway-attachment.html#cfn-ec2-vpcgatewayattachment-vpngatewayid
+	VpnGatewayId *types.Value `json:"VpnGatewayId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VPCGatewayAttachment) AWSCloudFormationType() string {
+	return "AWS::EC2::VPCGatewayAttachment"
+}
+
+// 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 VPCGatewayAttachment) MarshalJSON() ([]byte, error) {
+	type Properties VPCGatewayAttachment
+	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 *VPCGatewayAttachment) UnmarshalJSON(b []byte) error {
+	type Properties VPCGatewayAttachment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VPCGatewayAttachment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-vpcpeeringconnection.go b/goformation/cloudformation/ec2/aws-ec2-vpcpeeringconnection.go
new file mode 100644
index 0000000000..8b0bf61ab5
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-vpcpeeringconnection.go
@@ -0,0 +1,134 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// VPCPeeringConnection AWS CloudFormation Resource (AWS::EC2::VPCPeeringConnection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html
+type VPCPeeringConnection struct {
+
+	// PeerOwnerId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html#cfn-ec2-vpcpeeringconnection-peerownerid
+	PeerOwnerId *types.Value `json:"PeerOwnerId,omitempty"`
+
+	// PeerRegion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html#cfn-ec2-vpcpeeringconnection-peerregion
+	PeerRegion *types.Value `json:"PeerRegion,omitempty"`
+
+	// PeerRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html#cfn-ec2-vpcpeeringconnection-peerrolearn
+	PeerRoleArn *types.Value `json:"PeerRoleArn,omitempty"`
+
+	// PeerVpcId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html#cfn-ec2-vpcpeeringconnection-peervpcid
+	PeerVpcId *types.Value `json:"PeerVpcId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html#cfn-ec2-vpcpeeringconnection-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpcpeeringconnection.html#cfn-ec2-vpcpeeringconnection-vpcid
+	VpcId *types.Value `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 *VPCPeeringConnection) AWSCloudFormationType() string {
+	return "AWS::EC2::VPCPeeringConnection"
+}
+
+// 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 VPCPeeringConnection) MarshalJSON() ([]byte, error) {
+	type Properties VPCPeeringConnection
+	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 *VPCPeeringConnection) UnmarshalJSON(b []byte) error {
+	type Properties VPCPeeringConnection
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VPCPeeringConnection(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-vpnconnection.go b/goformation/cloudformation/ec2/aws-ec2-vpnconnection.go
new file mode 100644
index 0000000000..f14a0278e7
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-vpnconnection.go
@@ -0,0 +1,139 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// VPNConnection AWS CloudFormation Resource (AWS::EC2::VPNConnection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection.html
+type VPNConnection struct {
+
+	// CustomerGatewayId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection.html#cfn-ec2-vpnconnection-customergatewayid
+	CustomerGatewayId *types.Value `json:"CustomerGatewayId,omitempty"`
+
+	// StaticRoutesOnly AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection.html#cfn-ec2-vpnconnection-StaticRoutesOnly
+	StaticRoutesOnly *types.Value `json:"StaticRoutesOnly,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection.html#cfn-ec2-vpnconnection-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TransitGatewayId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection.html#cfn-ec2-vpnconnection-transitgatewayid
+	TransitGatewayId *types.Value `json:"TransitGatewayId,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection.html#cfn-ec2-vpnconnection-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// VpnGatewayId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection.html#cfn-ec2-vpnconnection-vpngatewayid
+	VpnGatewayId *types.Value `json:"VpnGatewayId,omitempty"`
+
+	// VpnTunnelOptionsSpecifications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection.html#cfn-ec2-vpnconnection-vpntunneloptionsspecifications
+	VpnTunnelOptionsSpecifications []VPNConnection_VpnTunnelOptionsSpecification `json:"VpnTunnelOptionsSpecifications,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VPNConnection) AWSCloudFormationType() string {
+	return "AWS::EC2::VPNConnection"
+}
+
+// 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 VPNConnection) MarshalJSON() ([]byte, error) {
+	type Properties VPNConnection
+	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 *VPNConnection) UnmarshalJSON(b []byte) error {
+	type Properties VPNConnection
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VPNConnection(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-vpnconnection_vpntunneloptionsspecification.go b/goformation/cloudformation/ec2/aws-ec2-vpnconnection_vpntunneloptionsspecification.go
new file mode 100644
index 0000000000..70e5bbb262
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-vpnconnection_vpntunneloptionsspecification.go
@@ -0,0 +1,42 @@
+package ec2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VPNConnection_VpnTunnelOptionsSpecification AWS CloudFormation Resource (AWS::EC2::VPNConnection.VpnTunnelOptionsSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-vpnconnection-vpntunneloptionsspecification.html
+type VPNConnection_VpnTunnelOptionsSpecification struct {
+
+	// PreSharedKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-vpnconnection-vpntunneloptionsspecification.html#cfn-ec2-vpnconnection-vpntunneloptionsspecification-presharedkey
+	PreSharedKey *types.Value `json:"PreSharedKey,omitempty"`
+
+	// TunnelInsideCidr AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-vpnconnection-vpntunneloptionsspecification.html#cfn-ec2-vpnconnection-vpntunneloptionsspecification-tunnelinsidecidr
+	TunnelInsideCidr *types.Value `json:"TunnelInsideCidr,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VPNConnection_VpnTunnelOptionsSpecification) AWSCloudFormationType() string {
+	return "AWS::EC2::VPNConnection.VpnTunnelOptionsSpecification"
+}
diff --git a/goformation/cloudformation/ec2/aws-ec2-vpnconnectionroute.go b/goformation/cloudformation/ec2/aws-ec2-vpnconnectionroute.go
new file mode 100644
index 0000000000..9f01ad52ae
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-vpnconnectionroute.go
@@ -0,0 +1,113 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VPNConnectionRoute AWS CloudFormation Resource (AWS::EC2::VPNConnectionRoute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection-route.html
+type VPNConnectionRoute struct {
+
+	// DestinationCidrBlock AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection-route.html#cfn-ec2-vpnconnectionroute-cidrblock
+	DestinationCidrBlock *types.Value `json:"DestinationCidrBlock,omitempty"`
+
+	// VpnConnectionId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-connection-route.html#cfn-ec2-vpnconnectionroute-connectionid
+	VpnConnectionId *types.Value `json:"VpnConnectionId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VPNConnectionRoute) AWSCloudFormationType() string {
+	return "AWS::EC2::VPNConnectionRoute"
+}
+
+// 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 VPNConnectionRoute) MarshalJSON() ([]byte, error) {
+	type Properties VPNConnectionRoute
+	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 *VPNConnectionRoute) UnmarshalJSON(b []byte) error {
+	type Properties VPNConnectionRoute
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VPNConnectionRoute(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-vpngateway.go b/goformation/cloudformation/ec2/aws-ec2-vpngateway.go
new file mode 100644
index 0000000000..05cff61edc
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-vpngateway.go
@@ -0,0 +1,119 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// VPNGateway AWS CloudFormation Resource (AWS::EC2::VPNGateway)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-gateway.html
+type VPNGateway struct {
+
+	// AmazonSideAsn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-gateway.html#cfn-ec2-vpngateway-amazonsideasn
+	AmazonSideAsn *types.Value `json:"AmazonSideAsn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-gateway.html#cfn-ec2-vpngateway-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-gateway.html#cfn-ec2-vpngateway-type
+	Type *types.Value `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 *VPNGateway) AWSCloudFormationType() string {
+	return "AWS::EC2::VPNGateway"
+}
+
+// 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 VPNGateway) MarshalJSON() ([]byte, error) {
+	type Properties VPNGateway
+	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 *VPNGateway) UnmarshalJSON(b []byte) error {
+	type Properties VPNGateway
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VPNGateway(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ec2/aws-ec2-vpngatewayroutepropagation.go b/goformation/cloudformation/ec2/aws-ec2-vpngatewayroutepropagation.go
new file mode 100644
index 0000000000..2dc3688c89
--- /dev/null
+++ b/goformation/cloudformation/ec2/aws-ec2-vpngatewayroutepropagation.go
@@ -0,0 +1,113 @@
+package ec2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VPNGatewayRoutePropagation AWS CloudFormation Resource (AWS::EC2::VPNGatewayRoutePropagation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ec2-vpn-gatewayrouteprop.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
+	RouteTableIds *types.Value `json:"RouteTableIds,omitempty"`
+
+	// 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
+	VpnGatewayId *types.Value `json:"VpnGatewayId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VPNGatewayRoutePropagation) AWSCloudFormationType() string {
+	return "AWS::EC2::VPNGatewayRoutePropagation"
+}
+
+// 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 VPNGatewayRoutePropagation) MarshalJSON() ([]byte, error) {
+	type Properties VPNGatewayRoutePropagation
+	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 *VPNGatewayRoutePropagation) UnmarshalJSON(b []byte) error {
+	type Properties VPNGatewayRoutePropagation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VPNGatewayRoutePropagation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ecr/aws-ecr-publicrepository.go b/goformation/cloudformation/ecr/aws-ecr-publicrepository.go
new file mode 100644
index 0000000000..df78efe6ee
--- /dev/null
+++ b/goformation/cloudformation/ecr/aws-ecr-publicrepository.go
@@ -0,0 +1,124 @@
+package ecr
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// PublicRepository AWS CloudFormation Resource (AWS::ECR::PublicRepository)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html
+type PublicRepository struct {
+
+	// RepositoryCatalogData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorycatalogdata
+	RepositoryCatalogData interface{} `json:"RepositoryCatalogData,omitempty"`
+
+	// RepositoryName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositoryname
+	RepositoryName *types.Value `json:"RepositoryName,omitempty"`
+
+	// RepositoryPolicyText AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-repositorypolicytext
+	RepositoryPolicyText interface{} `json:"RepositoryPolicyText,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-publicrepository.html#cfn-ecr-publicrepository-tags
+	Tags []cloudformation.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 *PublicRepository) AWSCloudFormationType() string {
+	return "AWS::ECR::PublicRepository"
+}
+
+// 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 PublicRepository) MarshalJSON() ([]byte, error) {
+	type Properties PublicRepository
+	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 *PublicRepository) UnmarshalJSON(b []byte) error {
+	type Properties PublicRepository
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PublicRepository(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ecr/aws-ecr-registrypolicy.go b/goformation/cloudformation/ecr/aws-ecr-registrypolicy.go
new file mode 100644
index 0000000000..453a44b399
--- /dev/null
+++ b/goformation/cloudformation/ecr/aws-ecr-registrypolicy.go
@@ -0,0 +1,106 @@
+package ecr
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RegistryPolicy AWS CloudFormation Resource (AWS::ECR::RegistryPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-registrypolicy.html
+type RegistryPolicy struct {
+
+	// PolicyText AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-registrypolicy.html#cfn-ecr-registrypolicy-policytext
+	PolicyText interface{} `json:"PolicyText,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RegistryPolicy) AWSCloudFormationType() string {
+	return "AWS::ECR::RegistryPolicy"
+}
+
+// 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 RegistryPolicy) MarshalJSON() ([]byte, error) {
+	type Properties RegistryPolicy
+	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 *RegistryPolicy) UnmarshalJSON(b []byte) error {
+	type Properties RegistryPolicy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RegistryPolicy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration.go b/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration.go
new file mode 100644
index 0000000000..a440ca89e4
--- /dev/null
+++ b/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration.go
@@ -0,0 +1,106 @@
+package ecr
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReplicationConfiguration AWS CloudFormation Resource (AWS::ECR::ReplicationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-replicationconfiguration.html
+type ReplicationConfiguration struct {
+
+	// ReplicationConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-replicationconfiguration.html#cfn-ecr-replicationconfiguration-replicationconfiguration
+	ReplicationConfiguration *ReplicationConfiguration_ReplicationConfiguration `json:"ReplicationConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReplicationConfiguration) AWSCloudFormationType() string {
+	return "AWS::ECR::ReplicationConfiguration"
+}
+
+// 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 ReplicationConfiguration) MarshalJSON() ([]byte, error) {
+	type Properties ReplicationConfiguration
+	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 *ReplicationConfiguration) UnmarshalJSON(b []byte) error {
+	type Properties ReplicationConfiguration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ReplicationConfiguration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationconfiguration.go b/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationconfiguration.go
new file mode 100644
index 0000000000..54927fe4c8
--- /dev/null
+++ b/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationconfiguration.go
@@ -0,0 +1,35 @@
+package ecr
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReplicationConfiguration_ReplicationConfiguration AWS CloudFormation Resource (AWS::ECR::ReplicationConfiguration.ReplicationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-replicationconfiguration-replicationconfiguration.html
+type ReplicationConfiguration_ReplicationConfiguration struct {
+
+	// Rules AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-replicationconfiguration-replicationconfiguration.html#cfn-ecr-replicationconfiguration-replicationconfiguration-rules
+	Rules []ReplicationConfiguration_ReplicationRule `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 *ReplicationConfiguration_ReplicationConfiguration) AWSCloudFormationType() string {
+	return "AWS::ECR::ReplicationConfiguration.ReplicationConfiguration"
+}
diff --git a/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationdestination.go b/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationdestination.go
new file mode 100644
index 0000000000..508f337474
--- /dev/null
+++ b/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationdestination.go
@@ -0,0 +1,42 @@
+package ecr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReplicationConfiguration_ReplicationDestination AWS CloudFormation Resource (AWS::ECR::ReplicationConfiguration.ReplicationDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-replicationconfiguration-replicationdestination.html
+type ReplicationConfiguration_ReplicationDestination struct {
+
+	// Region AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-replicationconfiguration-replicationdestination.html#cfn-ecr-replicationconfiguration-replicationdestination-region
+	Region *types.Value `json:"Region,omitempty"`
+
+	// RegistryId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-replicationconfiguration-replicationdestination.html#cfn-ecr-replicationconfiguration-replicationdestination-registryid
+	RegistryId *types.Value `json:"RegistryId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReplicationConfiguration_ReplicationDestination) AWSCloudFormationType() string {
+	return "AWS::ECR::ReplicationConfiguration.ReplicationDestination"
+}
diff --git a/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationrule.go b/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationrule.go
new file mode 100644
index 0000000000..631e871e21
--- /dev/null
+++ b/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_replicationrule.go
@@ -0,0 +1,40 @@
+package ecr
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReplicationConfiguration_ReplicationRule AWS CloudFormation Resource (AWS::ECR::ReplicationConfiguration.ReplicationRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-replicationconfiguration-replicationrule.html
+type ReplicationConfiguration_ReplicationRule struct {
+
+	// Destinations AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-replicationconfiguration-replicationrule.html#cfn-ecr-replicationconfiguration-replicationrule-destinations
+	Destinations []ReplicationConfiguration_ReplicationDestination `json:"Destinations,omitempty"`
+
+	// RepositoryFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-replicationconfiguration-replicationrule.html#cfn-ecr-replicationconfiguration-replicationrule-repositoryfilters
+	RepositoryFilters []ReplicationConfiguration_RepositoryFilter `json:"RepositoryFilters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReplicationConfiguration_ReplicationRule) AWSCloudFormationType() string {
+	return "AWS::ECR::ReplicationConfiguration.ReplicationRule"
+}
diff --git a/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_repositoryfilter.go b/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_repositoryfilter.go
new file mode 100644
index 0000000000..11bea70518
--- /dev/null
+++ b/goformation/cloudformation/ecr/aws-ecr-replicationconfiguration_repositoryfilter.go
@@ -0,0 +1,42 @@
+package ecr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReplicationConfiguration_RepositoryFilter AWS CloudFormation Resource (AWS::ECR::ReplicationConfiguration.RepositoryFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-replicationconfiguration-repositoryfilter.html
+type ReplicationConfiguration_RepositoryFilter struct {
+
+	// Filter AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-replicationconfiguration-repositoryfilter.html#cfn-ecr-replicationconfiguration-repositoryfilter-filter
+	Filter *types.Value `json:"Filter,omitempty"`
+
+	// FilterType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-replicationconfiguration-repositoryfilter.html#cfn-ecr-replicationconfiguration-repositoryfilter-filtertype
+	FilterType *types.Value `json:"FilterType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReplicationConfiguration_RepositoryFilter) AWSCloudFormationType() string {
+	return "AWS::ECR::ReplicationConfiguration.RepositoryFilter"
+}
diff --git a/goformation/cloudformation/ecr/aws-ecr-repository.go b/goformation/cloudformation/ecr/aws-ecr-repository.go
new file mode 100644
index 0000000000..41c1677c22
--- /dev/null
+++ b/goformation/cloudformation/ecr/aws-ecr-repository.go
@@ -0,0 +1,139 @@
+package ecr
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Repository AWS CloudFormation Resource (AWS::ECR::Repository)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repository.html
+type Repository struct {
+
+	// EncryptionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repository.html#cfn-ecr-repository-encryptionconfiguration
+	EncryptionConfiguration *Repository_EncryptionConfiguration `json:"EncryptionConfiguration,omitempty"`
+
+	// ImageScanningConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repository.html#cfn-ecr-repository-imagescanningconfiguration
+	ImageScanningConfiguration *Repository_ImageScanningConfiguration `json:"ImageScanningConfiguration,omitempty"`
+
+	// ImageTagMutability AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repository.html#cfn-ecr-repository-imagetagmutability
+	ImageTagMutability *types.Value `json:"ImageTagMutability,omitempty"`
+
+	// LifecyclePolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repository.html#cfn-ecr-repository-lifecyclepolicy
+	LifecyclePolicy *Repository_LifecyclePolicy `json:"LifecyclePolicy,omitempty"`
+
+	// RepositoryName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repository.html#cfn-ecr-repository-repositoryname
+	RepositoryName *types.Value `json:"RepositoryName,omitempty"`
+
+	// RepositoryPolicyText AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repository.html#cfn-ecr-repository-repositorypolicytext
+	RepositoryPolicyText interface{} `json:"RepositoryPolicyText,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecr-repository.html#cfn-ecr-repository-tags
+	Tags []cloudformation.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 *Repository) AWSCloudFormationType() string {
+	return "AWS::ECR::Repository"
+}
+
+// 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 Repository) MarshalJSON() ([]byte, error) {
+	type Properties Repository
+	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 *Repository) UnmarshalJSON(b []byte) error {
+	type Properties Repository
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Repository(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ecr/aws-ecr-repository_encryptionconfiguration.go b/goformation/cloudformation/ecr/aws-ecr-repository_encryptionconfiguration.go
new file mode 100644
index 0000000000..caa39100a9
--- /dev/null
+++ b/goformation/cloudformation/ecr/aws-ecr-repository_encryptionconfiguration.go
@@ -0,0 +1,42 @@
+package ecr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Repository_EncryptionConfiguration AWS CloudFormation Resource (AWS::ECR::Repository.EncryptionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-repository-encryptionconfiguration.html
+type Repository_EncryptionConfiguration struct {
+
+	// EncryptionType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-repository-encryptionconfiguration.html#cfn-ecr-repository-encryptionconfiguration-encryptiontype
+	EncryptionType *types.Value `json:"EncryptionType,omitempty"`
+
+	// KmsKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-repository-encryptionconfiguration.html#cfn-ecr-repository-encryptionconfiguration-kmskey
+	KmsKey *types.Value `json:"KmsKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Repository_EncryptionConfiguration) AWSCloudFormationType() string {
+	return "AWS::ECR::Repository.EncryptionConfiguration"
+}
diff --git a/goformation/cloudformation/ecr/aws-ecr-repository_imagescanningconfiguration.go b/goformation/cloudformation/ecr/aws-ecr-repository_imagescanningconfiguration.go
new file mode 100644
index 0000000000..d59afd0db3
--- /dev/null
+++ b/goformation/cloudformation/ecr/aws-ecr-repository_imagescanningconfiguration.go
@@ -0,0 +1,37 @@
+package ecr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Repository_ImageScanningConfiguration AWS CloudFormation Resource (AWS::ECR::Repository.ImageScanningConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-repository-imagescanningconfiguration.html
+type Repository_ImageScanningConfiguration struct {
+
+	// ScanOnPush AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-repository-imagescanningconfiguration.html#cfn-ecr-repository-imagescanningconfiguration-scanonpush
+	ScanOnPush *types.Value `json:"ScanOnPush,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Repository_ImageScanningConfiguration) AWSCloudFormationType() string {
+	return "AWS::ECR::Repository.ImageScanningConfiguration"
+}
diff --git a/goformation/cloudformation/ecr/aws-ecr-repository_lifecyclepolicy.go b/goformation/cloudformation/ecr/aws-ecr-repository_lifecyclepolicy.go
new file mode 100644
index 0000000000..d18ccdad99
--- /dev/null
+++ b/goformation/cloudformation/ecr/aws-ecr-repository_lifecyclepolicy.go
@@ -0,0 +1,42 @@
+package ecr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Repository_LifecyclePolicy AWS CloudFormation Resource (AWS::ECR::Repository.LifecyclePolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-repository-lifecyclepolicy.html
+type Repository_LifecyclePolicy struct {
+
+	// LifecyclePolicyText AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-repository-lifecyclepolicy.html#cfn-ecr-repository-lifecyclepolicy-lifecyclepolicytext
+	LifecyclePolicyText *types.Value `json:"LifecyclePolicyText,omitempty"`
+
+	// RegistryId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecr-repository-lifecyclepolicy.html#cfn-ecr-repository-lifecyclepolicy-registryid
+	RegistryId *types.Value `json:"RegistryId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Repository_LifecyclePolicy) AWSCloudFormationType() string {
+	return "AWS::ECR::Repository.LifecyclePolicy"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-capacityprovider.go b/goformation/cloudformation/ecs/aws-ecs-capacityprovider.go
new file mode 100644
index 0000000000..5fcbc8aa90
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-capacityprovider.go
@@ -0,0 +1,119 @@
+package ecs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// CapacityProvider AWS CloudFormation Resource (AWS::ECS::CapacityProvider)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-capacityprovider.html
+type CapacityProvider struct {
+
+	// AutoScalingGroupProvider AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-capacityprovider.html#cfn-ecs-capacityprovider-autoscalinggroupprovider
+	AutoScalingGroupProvider *CapacityProvider_AutoScalingGroupProvider `json:"AutoScalingGroupProvider,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-capacityprovider.html#cfn-ecs-capacityprovider-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-capacityprovider.html#cfn-ecs-capacityprovider-tags
+	Tags []cloudformation.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 *CapacityProvider) AWSCloudFormationType() string {
+	return "AWS::ECS::CapacityProvider"
+}
+
+// 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 CapacityProvider) MarshalJSON() ([]byte, error) {
+	type Properties CapacityProvider
+	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 *CapacityProvider) UnmarshalJSON(b []byte) error {
+	type Properties CapacityProvider
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CapacityProvider(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ecs/aws-ecs-capacityprovider_autoscalinggroupprovider.go b/goformation/cloudformation/ecs/aws-ecs-capacityprovider_autoscalinggroupprovider.go
new file mode 100644
index 0000000000..c7c3c15bed
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-capacityprovider_autoscalinggroupprovider.go
@@ -0,0 +1,47 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CapacityProvider_AutoScalingGroupProvider AWS CloudFormation Resource (AWS::ECS::CapacityProvider.AutoScalingGroupProvider)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-autoscalinggroupprovider.html
+type CapacityProvider_AutoScalingGroupProvider struct {
+
+	// AutoScalingGroupArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-autoscalinggroupprovider.html#cfn-ecs-capacityprovider-autoscalinggroupprovider-autoscalinggrouparn
+	AutoScalingGroupArn *types.Value `json:"AutoScalingGroupArn,omitempty"`
+
+	// ManagedScaling AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-autoscalinggroupprovider.html#cfn-ecs-capacityprovider-autoscalinggroupprovider-managedscaling
+	ManagedScaling *CapacityProvider_ManagedScaling `json:"ManagedScaling,omitempty"`
+
+	// ManagedTerminationProtection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-autoscalinggroupprovider.html#cfn-ecs-capacityprovider-autoscalinggroupprovider-managedterminationprotection
+	ManagedTerminationProtection *types.Value `json:"ManagedTerminationProtection,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CapacityProvider_AutoScalingGroupProvider) AWSCloudFormationType() string {
+	return "AWS::ECS::CapacityProvider.AutoScalingGroupProvider"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-capacityprovider_managedscaling.go b/goformation/cloudformation/ecs/aws-ecs-capacityprovider_managedscaling.go
new file mode 100644
index 0000000000..6fc8f1b80e
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-capacityprovider_managedscaling.go
@@ -0,0 +1,57 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CapacityProvider_ManagedScaling AWS CloudFormation Resource (AWS::ECS::CapacityProvider.ManagedScaling)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-managedscaling.html
+type CapacityProvider_ManagedScaling struct {
+
+	// InstanceWarmupPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-managedscaling.html#cfn-ecs-capacityprovider-managedscaling-instancewarmupperiod
+	InstanceWarmupPeriod *types.Value `json:"InstanceWarmupPeriod,omitempty"`
+
+	// MaximumScalingStepSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-managedscaling.html#cfn-ecs-capacityprovider-managedscaling-maximumscalingstepsize
+	MaximumScalingStepSize *types.Value `json:"MaximumScalingStepSize,omitempty"`
+
+	// MinimumScalingStepSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-managedscaling.html#cfn-ecs-capacityprovider-managedscaling-minimumscalingstepsize
+	MinimumScalingStepSize *types.Value `json:"MinimumScalingStepSize,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-managedscaling.html#cfn-ecs-capacityprovider-managedscaling-status
+	Status *types.Value `json:"Status,omitempty"`
+
+	// TargetCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-capacityprovider-managedscaling.html#cfn-ecs-capacityprovider-managedscaling-targetcapacity
+	TargetCapacity *types.Value `json:"TargetCapacity,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CapacityProvider_ManagedScaling) AWSCloudFormationType() string {
+	return "AWS::ECS::CapacityProvider.ManagedScaling"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-cluster.go b/goformation/cloudformation/ecs/aws-ecs-cluster.go
new file mode 100644
index 0000000000..04be9676fd
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-cluster.go
@@ -0,0 +1,134 @@
+package ecs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster AWS CloudFormation Resource (AWS::ECS::Cluster)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-cluster.html
+type Cluster struct {
+
+	// CapacityProviders AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-cluster.html#cfn-ecs-cluster-capacityproviders
+	CapacityProviders *types.Value `json:"CapacityProviders,omitempty"`
+
+	// ClusterName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-cluster.html#cfn-ecs-cluster-clustername
+	ClusterName *types.Value `json:"ClusterName,omitempty"`
+
+	// ClusterSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-cluster.html#cfn-ecs-cluster-clustersettings
+	ClusterSettings []Cluster_ClusterSettings `json:"ClusterSettings,omitempty"`
+
+	// Configuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-cluster.html#cfn-ecs-cluster-configuration
+	Configuration *Cluster_ClusterConfiguration `json:"Configuration,omitempty"`
+
+	// DefaultCapacityProviderStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-cluster.html#cfn-ecs-cluster-defaultcapacityproviderstrategy
+	DefaultCapacityProviderStrategy []Cluster_CapacityProviderStrategyItem `json:"DefaultCapacityProviderStrategy,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-cluster.html#cfn-ecs-cluster-tags
+	Tags []cloudformation.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 *Cluster) AWSCloudFormationType() string {
+	return "AWS::ECS::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ecs/aws-ecs-cluster_capacityproviderstrategyitem.go b/goformation/cloudformation/ecs/aws-ecs-cluster_capacityproviderstrategyitem.go
new file mode 100644
index 0000000000..a7d2bbfb0f
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-cluster_capacityproviderstrategyitem.go
@@ -0,0 +1,47 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_CapacityProviderStrategyItem AWS CloudFormation Resource (AWS::ECS::Cluster.CapacityProviderStrategyItem)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-capacityproviderstrategyitem.html
+type Cluster_CapacityProviderStrategyItem struct {
+
+	// Base AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-capacityproviderstrategyitem.html#cfn-ecs-cluster-capacityproviderstrategyitem-base
+	Base *types.Value `json:"Base,omitempty"`
+
+	// CapacityProvider AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-capacityproviderstrategyitem.html#cfn-ecs-cluster-capacityproviderstrategyitem-capacityprovider
+	CapacityProvider *types.Value `json:"CapacityProvider,omitempty"`
+
+	// Weight AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-capacityproviderstrategyitem.html#cfn-ecs-cluster-capacityproviderstrategyitem-weight
+	Weight *types.Value `json:"Weight,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CapacityProviderStrategyItem) AWSCloudFormationType() string {
+	return "AWS::ECS::Cluster.CapacityProviderStrategyItem"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-cluster_clusterconfiguration.go b/goformation/cloudformation/ecs/aws-ecs-cluster_clusterconfiguration.go
new file mode 100644
index 0000000000..cad99a0be2
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-cluster_clusterconfiguration.go
@@ -0,0 +1,35 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_ClusterConfiguration AWS CloudFormation Resource (AWS::ECS::Cluster.ClusterConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-clusterconfiguration.html
+type Cluster_ClusterConfiguration struct {
+
+	// ExecuteCommandConfiguration AWS CloudFormation Property
+	// Required: false
+	// 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"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ClusterConfiguration) AWSCloudFormationType() string {
+	return "AWS::ECS::Cluster.ClusterConfiguration"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-cluster_clustersettings.go b/goformation/cloudformation/ecs/aws-ecs-cluster_clustersettings.go
new file mode 100644
index 0000000000..9cf4d39f3f
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-cluster_clustersettings.go
@@ -0,0 +1,42 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_ClusterSettings AWS CloudFormation Resource (AWS::ECS::Cluster.ClusterSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-clustersettings.html
+type Cluster_ClusterSettings struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-clustersettings.html#cfn-ecs-cluster-clustersettings-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-clustersettings.html#cfn-ecs-cluster-clustersettings-value
+	Value *types.Value `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_ClusterSettings) AWSCloudFormationType() string {
+	return "AWS::ECS::Cluster.ClusterSettings"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-cluster_executecommandconfiguration.go b/goformation/cloudformation/ecs/aws-ecs-cluster_executecommandconfiguration.go
new file mode 100644
index 0000000000..bbec2cfe39
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-cluster_executecommandconfiguration.go
@@ -0,0 +1,47 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_ExecuteCommandConfiguration AWS CloudFormation Resource (AWS::ECS::Cluster.ExecuteCommandConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-executecommandconfiguration.html
+type Cluster_ExecuteCommandConfiguration struct {
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-executecommandconfiguration.html#cfn-ecs-cluster-executecommandconfiguration-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// LogConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-executecommandconfiguration.html#cfn-ecs-cluster-executecommandconfiguration-logconfiguration
+	LogConfiguration *Cluster_ExecuteCommandLogConfiguration `json:"LogConfiguration,omitempty"`
+
+	// Logging AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-executecommandconfiguration.html#cfn-ecs-cluster-executecommandconfiguration-logging
+	Logging *types.Value `json:"Logging,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ExecuteCommandConfiguration) AWSCloudFormationType() string {
+	return "AWS::ECS::Cluster.ExecuteCommandConfiguration"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-cluster_executecommandlogconfiguration.go b/goformation/cloudformation/ecs/aws-ecs-cluster_executecommandlogconfiguration.go
new file mode 100644
index 0000000000..61035b0104
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-cluster_executecommandlogconfiguration.go
@@ -0,0 +1,57 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_ExecuteCommandLogConfiguration AWS CloudFormation Resource (AWS::ECS::Cluster.ExecuteCommandLogConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-executecommandlogconfiguration.html
+type Cluster_ExecuteCommandLogConfiguration struct {
+
+	// CloudWatchEncryptionEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-executecommandlogconfiguration.html#cfn-ecs-cluster-executecommandlogconfiguration-cloudwatchencryptionenabled
+	CloudWatchEncryptionEnabled *types.Value `json:"CloudWatchEncryptionEnabled,omitempty"`
+
+	// CloudWatchLogGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-executecommandlogconfiguration.html#cfn-ecs-cluster-executecommandlogconfiguration-cloudwatchloggroupname
+	CloudWatchLogGroupName *types.Value `json:"CloudWatchLogGroupName,omitempty"`
+
+	// S3BucketName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-executecommandlogconfiguration.html#cfn-ecs-cluster-executecommandlogconfiguration-s3bucketname
+	S3BucketName *types.Value `json:"S3BucketName,omitempty"`
+
+	// S3EncryptionEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-executecommandlogconfiguration.html#cfn-ecs-cluster-executecommandlogconfiguration-s3encryptionenabled
+	S3EncryptionEnabled *types.Value `json:"S3EncryptionEnabled,omitempty"`
+
+	// S3KeyPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-cluster-executecommandlogconfiguration.html#cfn-ecs-cluster-executecommandlogconfiguration-s3keyprefix
+	S3KeyPrefix *types.Value `json:"S3KeyPrefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ExecuteCommandLogConfiguration) AWSCloudFormationType() string {
+	return "AWS::ECS::Cluster.ExecuteCommandLogConfiguration"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations.go b/goformation/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations.go
new file mode 100644
index 0000000000..d952d47eff
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations.go
@@ -0,0 +1,118 @@
+package ecs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ClusterCapacityProviderAssociations AWS CloudFormation Resource (AWS::ECS::ClusterCapacityProviderAssociations)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-clustercapacityproviderassociations.html
+type ClusterCapacityProviderAssociations struct {
+
+	// CapacityProviders AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-clustercapacityproviderassociations.html#cfn-ecs-clustercapacityproviderassociations-capacityproviders
+	CapacityProviders *types.Value `json:"CapacityProviders,omitempty"`
+
+	// Cluster AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-clustercapacityproviderassociations.html#cfn-ecs-clustercapacityproviderassociations-cluster
+	Cluster *types.Value `json:"Cluster,omitempty"`
+
+	// DefaultCapacityProviderStrategy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-clustercapacityproviderassociations.html#cfn-ecs-clustercapacityproviderassociations-defaultcapacityproviderstrategy
+	DefaultCapacityProviderStrategy []ClusterCapacityProviderAssociations_CapacityProviderStrategy `json:"DefaultCapacityProviderStrategy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ClusterCapacityProviderAssociations) AWSCloudFormationType() string {
+	return "AWS::ECS::ClusterCapacityProviderAssociations"
+}
+
+// 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 ClusterCapacityProviderAssociations) MarshalJSON() ([]byte, error) {
+	type Properties ClusterCapacityProviderAssociations
+	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 *ClusterCapacityProviderAssociations) UnmarshalJSON(b []byte) error {
+	type Properties ClusterCapacityProviderAssociations
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ClusterCapacityProviderAssociations(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations_capacityproviderstrategy.go b/goformation/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations_capacityproviderstrategy.go
new file mode 100644
index 0000000000..d0e58f4094
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-clustercapacityproviderassociations_capacityproviderstrategy.go
@@ -0,0 +1,47 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ClusterCapacityProviderAssociations_CapacityProviderStrategy AWS CloudFormation Resource (AWS::ECS::ClusterCapacityProviderAssociations.CapacityProviderStrategy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-clustercapacityproviderassociations-capacityproviderstrategy.html
+type ClusterCapacityProviderAssociations_CapacityProviderStrategy struct {
+
+	// Base AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-clustercapacityproviderassociations-capacityproviderstrategy.html#cfn-ecs-clustercapacityproviderassociations-capacityproviderstrategy-base
+	Base *types.Value `json:"Base,omitempty"`
+
+	// CapacityProvider AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-clustercapacityproviderassociations-capacityproviderstrategy.html#cfn-ecs-clustercapacityproviderassociations-capacityproviderstrategy-capacityprovider
+	CapacityProvider *types.Value `json:"CapacityProvider,omitempty"`
+
+	// Weight AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-clustercapacityproviderassociations-capacityproviderstrategy.html#cfn-ecs-clustercapacityproviderassociations-capacityproviderstrategy-weight
+	Weight *types.Value `json:"Weight,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ClusterCapacityProviderAssociations_CapacityProviderStrategy) AWSCloudFormationType() string {
+	return "AWS::ECS::ClusterCapacityProviderAssociations.CapacityProviderStrategy"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-primarytaskset.go b/goformation/cloudformation/ecs/aws-ecs-primarytaskset.go
new file mode 100644
index 0000000000..700554eb26
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-primarytaskset.go
@@ -0,0 +1,118 @@
+package ecs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PrimaryTaskSet AWS CloudFormation Resource (AWS::ECS::PrimaryTaskSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-primarytaskset.html
+type PrimaryTaskSet struct {
+
+	// Cluster AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-primarytaskset.html#cfn-ecs-primarytaskset-cluster
+	Cluster *types.Value `json:"Cluster,omitempty"`
+
+	// Service AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-primarytaskset.html#cfn-ecs-primarytaskset-service
+	Service *types.Value `json:"Service,omitempty"`
+
+	// TaskSetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-primarytaskset.html#cfn-ecs-primarytaskset-tasksetid
+	TaskSetId *types.Value `json:"TaskSetId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PrimaryTaskSet) AWSCloudFormationType() string {
+	return "AWS::ECS::PrimaryTaskSet"
+}
+
+// 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 PrimaryTaskSet) MarshalJSON() ([]byte, error) {
+	type Properties PrimaryTaskSet
+	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 *PrimaryTaskSet) UnmarshalJSON(b []byte) error {
+	type Properties PrimaryTaskSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PrimaryTaskSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ecs/aws-ecs-service.go b/goformation/cloudformation/ecs/aws-ecs-service.go
new file mode 100644
index 0000000000..37df18935d
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-service.go
@@ -0,0 +1,209 @@
+package ecs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service AWS CloudFormation Resource (AWS::ECS::Service)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html
+type Service struct {
+
+	// CapacityProviderStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-capacityproviderstrategy
+	CapacityProviderStrategy []Service_CapacityProviderStrategyItem `json:"CapacityProviderStrategy,omitempty"`
+
+	// Cluster AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-cluster
+	Cluster *types.Value `json:"Cluster,omitempty"`
+
+	// DeploymentConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-deploymentconfiguration
+	DeploymentConfiguration *Service_DeploymentConfiguration `json:"DeploymentConfiguration,omitempty"`
+
+	// DeploymentController AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-deploymentcontroller
+	DeploymentController *Service_DeploymentController `json:"DeploymentController,omitempty"`
+
+	// DesiredCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-desiredcount
+	DesiredCount *types.Value `json:"DesiredCount,omitempty"`
+
+	// EnableECSManagedTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-enableecsmanagedtags
+	EnableECSManagedTags *types.Value `json:"EnableECSManagedTags,omitempty"`
+
+	// EnableExecuteCommand AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-enableexecutecommand
+	EnableExecuteCommand *types.Value `json:"EnableExecuteCommand,omitempty"`
+
+	// HealthCheckGracePeriodSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-healthcheckgraceperiodseconds
+	HealthCheckGracePeriodSeconds *types.Value `json:"HealthCheckGracePeriodSeconds,omitempty"`
+
+	// LaunchType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-launchtype
+	LaunchType *types.Value `json:"LaunchType,omitempty"`
+
+	// LoadBalancers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-loadbalancers
+	LoadBalancers []Service_LoadBalancer `json:"LoadBalancers,omitempty"`
+
+	// NetworkConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-networkconfiguration
+	NetworkConfiguration *Service_NetworkConfiguration `json:"NetworkConfiguration,omitempty"`
+
+	// PlacementConstraints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-placementconstraints
+	PlacementConstraints []Service_PlacementConstraint `json:"PlacementConstraints,omitempty"`
+
+	// PlacementStrategies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-placementstrategies
+	PlacementStrategies []Service_PlacementStrategy `json:"PlacementStrategies,omitempty"`
+
+	// PlatformVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-platformversion
+	PlatformVersion *types.Value `json:"PlatformVersion,omitempty"`
+
+	// PropagateTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-propagatetags
+	PropagateTags *types.Value `json:"PropagateTags,omitempty"`
+
+	// Role AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-role
+	Role *types.Value `json:"Role,omitempty"`
+
+	// SchedulingStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-schedulingstrategy
+	SchedulingStrategy *types.Value `json:"SchedulingStrategy,omitempty"`
+
+	// ServiceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-servicename
+	ServiceName *types.Value `json:"ServiceName,omitempty"`
+
+	// ServiceRegistries AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-serviceregistries
+	ServiceRegistries []Service_ServiceRegistry `json:"ServiceRegistries,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TaskDefinition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-service.html#cfn-ecs-service-taskdefinition
+	TaskDefinition *types.Value `json:"TaskDefinition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service) AWSCloudFormationType() string {
+	return "AWS::ECS::Service"
+}
+
+// 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 Service) MarshalJSON() ([]byte, error) {
+	type Properties Service
+	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 *Service) UnmarshalJSON(b []byte) error {
+	type Properties Service
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Service(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ecs/aws-ecs-service_awsvpcconfiguration.go b/goformation/cloudformation/ecs/aws-ecs-service_awsvpcconfiguration.go
new file mode 100644
index 0000000000..abab8c41a6
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-service_awsvpcconfiguration.go
@@ -0,0 +1,47 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_AwsVpcConfiguration AWS CloudFormation Resource (AWS::ECS::Service.AwsVpcConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-awsvpcconfiguration.html
+type Service_AwsVpcConfiguration struct {
+
+	// AssignPublicIp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-awsvpcconfiguration.html#cfn-ecs-service-awsvpcconfiguration-assignpublicip
+	AssignPublicIp *types.Value `json:"AssignPublicIp,omitempty"`
+
+	// SecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-awsvpcconfiguration.html#cfn-ecs-service-awsvpcconfiguration-securitygroups
+	SecurityGroups *types.Value `json:"SecurityGroups,omitempty"`
+
+	// Subnets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-awsvpcconfiguration.html#cfn-ecs-service-awsvpcconfiguration-subnets
+	Subnets *types.Value `json:"Subnets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service_AwsVpcConfiguration) AWSCloudFormationType() string {
+	return "AWS::ECS::Service.AwsVpcConfiguration"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-service_capacityproviderstrategyitem.go b/goformation/cloudformation/ecs/aws-ecs-service_capacityproviderstrategyitem.go
new file mode 100644
index 0000000000..3ed6fbebaa
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-service_capacityproviderstrategyitem.go
@@ -0,0 +1,47 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_CapacityProviderStrategyItem AWS CloudFormation Resource (AWS::ECS::Service.CapacityProviderStrategyItem)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-capacityproviderstrategyitem.html
+type Service_CapacityProviderStrategyItem struct {
+
+	// Base AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-capacityproviderstrategyitem.html#cfn-ecs-service-capacityproviderstrategyitem-base
+	Base *types.Value `json:"Base,omitempty"`
+
+	// CapacityProvider AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-capacityproviderstrategyitem.html#cfn-ecs-service-capacityproviderstrategyitem-capacityprovider
+	CapacityProvider *types.Value `json:"CapacityProvider,omitempty"`
+
+	// Weight AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-capacityproviderstrategyitem.html#cfn-ecs-service-capacityproviderstrategyitem-weight
+	Weight *types.Value `json:"Weight,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service_CapacityProviderStrategyItem) AWSCloudFormationType() string {
+	return "AWS::ECS::Service.CapacityProviderStrategyItem"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-service_deploymentcircuitbreaker.go b/goformation/cloudformation/ecs/aws-ecs-service_deploymentcircuitbreaker.go
new file mode 100644
index 0000000000..91c3215439
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-service_deploymentcircuitbreaker.go
@@ -0,0 +1,42 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_DeploymentCircuitBreaker AWS CloudFormation Resource (AWS::ECS::Service.DeploymentCircuitBreaker)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-deploymentcircuitbreaker.html
+type Service_DeploymentCircuitBreaker struct {
+
+	// Enable AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-deploymentcircuitbreaker.html#cfn-ecs-service-deploymentcircuitbreaker-enable
+	Enable *types.Value `json:"Enable"`
+
+	// Rollback AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-deploymentcircuitbreaker.html#cfn-ecs-service-deploymentcircuitbreaker-rollback
+	Rollback *types.Value `json:"Rollback"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service_DeploymentCircuitBreaker) AWSCloudFormationType() string {
+	return "AWS::ECS::Service.DeploymentCircuitBreaker"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-service_deploymentconfiguration.go b/goformation/cloudformation/ecs/aws-ecs-service_deploymentconfiguration.go
new file mode 100644
index 0000000000..a3cf6a5128
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-service_deploymentconfiguration.go
@@ -0,0 +1,47 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_DeploymentConfiguration AWS CloudFormation Resource (AWS::ECS::Service.DeploymentConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-deploymentconfiguration.html
+type Service_DeploymentConfiguration struct {
+
+	// DeploymentCircuitBreaker AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-deploymentconfiguration.html#cfn-ecs-service-deploymentconfiguration-deploymentcircuitbreaker
+	DeploymentCircuitBreaker *Service_DeploymentCircuitBreaker `json:"DeploymentCircuitBreaker,omitempty"`
+
+	// MaximumPercent AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-deploymentconfiguration.html#cfn-ecs-service-deploymentconfiguration-maximumpercent
+	MaximumPercent *types.Value `json:"MaximumPercent,omitempty"`
+
+	// MinimumHealthyPercent AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-deploymentconfiguration.html#cfn-ecs-service-deploymentconfiguration-minimumhealthypercent
+	MinimumHealthyPercent *types.Value `json:"MinimumHealthyPercent,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service_DeploymentConfiguration) AWSCloudFormationType() string {
+	return "AWS::ECS::Service.DeploymentConfiguration"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-service_deploymentcontroller.go b/goformation/cloudformation/ecs/aws-ecs-service_deploymentcontroller.go
new file mode 100644
index 0000000000..85c8622096
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-service_deploymentcontroller.go
@@ -0,0 +1,37 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_DeploymentController AWS CloudFormation Resource (AWS::ECS::Service.DeploymentController)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-deploymentcontroller.html
+type Service_DeploymentController struct {
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-deploymentcontroller.html#cfn-ecs-service-deploymentcontroller-type
+	Type *types.Value `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 *Service_DeploymentController) AWSCloudFormationType() string {
+	return "AWS::ECS::Service.DeploymentController"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-service_loadbalancer.go b/goformation/cloudformation/ecs/aws-ecs-service_loadbalancer.go
new file mode 100644
index 0000000000..49d4a76dcf
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-service_loadbalancer.go
@@ -0,0 +1,52 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_LoadBalancer AWS CloudFormation Resource (AWS::ECS::Service.LoadBalancer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-loadbalancer.html
+type Service_LoadBalancer struct {
+
+	// ContainerName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-loadbalancer.html#cfn-ecs-service-loadbalancer-containername
+	ContainerName *types.Value `json:"ContainerName,omitempty"`
+
+	// ContainerPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-loadbalancer.html#cfn-ecs-service-loadbalancer-containerport
+	ContainerPort *types.Value `json:"ContainerPort,omitempty"`
+
+	// LoadBalancerName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-loadbalancer.html#cfn-ecs-service-loadbalancer-loadbalancername
+	LoadBalancerName *types.Value `json:"LoadBalancerName,omitempty"`
+
+	// TargetGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-loadbalancer.html#cfn-ecs-service-loadbalancer-targetgrouparn
+	TargetGroupArn *types.Value `json:"TargetGroupArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service_LoadBalancer) AWSCloudFormationType() string {
+	return "AWS::ECS::Service.LoadBalancer"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-service_networkconfiguration.go b/goformation/cloudformation/ecs/aws-ecs-service_networkconfiguration.go
new file mode 100644
index 0000000000..d7aaf5dbfb
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-service_networkconfiguration.go
@@ -0,0 +1,35 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_NetworkConfiguration AWS CloudFormation Resource (AWS::ECS::Service.NetworkConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-networkconfiguration.html
+type Service_NetworkConfiguration struct {
+
+	// AwsvpcConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-networkconfiguration.html#cfn-ecs-service-networkconfiguration-awsvpcconfiguration
+	AwsvpcConfiguration *Service_AwsVpcConfiguration `json:"AwsvpcConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service_NetworkConfiguration) AWSCloudFormationType() string {
+	return "AWS::ECS::Service.NetworkConfiguration"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-service_placementconstraint.go b/goformation/cloudformation/ecs/aws-ecs-service_placementconstraint.go
new file mode 100644
index 0000000000..0ffd5526d3
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-service_placementconstraint.go
@@ -0,0 +1,42 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_PlacementConstraint AWS CloudFormation Resource (AWS::ECS::Service.PlacementConstraint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-placementconstraint.html
+type Service_PlacementConstraint struct {
+
+	// Expression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-placementconstraint.html#cfn-ecs-service-placementconstraint-expression
+	Expression *types.Value `json:"Expression,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-placementconstraint.html#cfn-ecs-service-placementconstraint-type
+	Type *types.Value `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 *Service_PlacementConstraint) AWSCloudFormationType() string {
+	return "AWS::ECS::Service.PlacementConstraint"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-service_placementstrategy.go b/goformation/cloudformation/ecs/aws-ecs-service_placementstrategy.go
new file mode 100644
index 0000000000..d37c36f7fc
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-service_placementstrategy.go
@@ -0,0 +1,42 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_PlacementStrategy AWS CloudFormation Resource (AWS::ECS::Service.PlacementStrategy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-placementstrategy.html
+type Service_PlacementStrategy struct {
+
+	// Field AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-placementstrategy.html#cfn-ecs-service-placementstrategy-field
+	Field *types.Value `json:"Field,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-placementstrategy.html#cfn-ecs-service-placementstrategy-type
+	Type *types.Value `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 *Service_PlacementStrategy) AWSCloudFormationType() string {
+	return "AWS::ECS::Service.PlacementStrategy"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-service_serviceregistry.go b/goformation/cloudformation/ecs/aws-ecs-service_serviceregistry.go
new file mode 100644
index 0000000000..1b10abb401
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-service_serviceregistry.go
@@ -0,0 +1,52 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_ServiceRegistry AWS CloudFormation Resource (AWS::ECS::Service.ServiceRegistry)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-serviceregistry.html
+type Service_ServiceRegistry struct {
+
+	// ContainerName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-serviceregistry.html#cfn-ecs-service-serviceregistry-containername
+	ContainerName *types.Value `json:"ContainerName,omitempty"`
+
+	// ContainerPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-serviceregistry.html#cfn-ecs-service-serviceregistry-containerport
+	ContainerPort *types.Value `json:"ContainerPort,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-serviceregistry.html#cfn-ecs-service-serviceregistry-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// RegistryArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-service-serviceregistry.html#cfn-ecs-service-serviceregistry-registryarn
+	RegistryArn *types.Value `json:"RegistryArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service_ServiceRegistry) AWSCloudFormationType() string {
+	return "AWS::ECS::Service.ServiceRegistry"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition.go
new file mode 100644
index 0000000000..c776f355a2
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition.go
@@ -0,0 +1,189 @@
+package ecs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition AWS CloudFormation Resource (AWS::ECS::TaskDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html
+type TaskDefinition struct {
+
+	// ContainerDefinitions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-containerdefinitions
+	ContainerDefinitions []TaskDefinition_ContainerDefinition `json:"ContainerDefinitions,omitempty"`
+
+	// Cpu AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-cpu
+	Cpu *types.Value `json:"Cpu,omitempty"`
+
+	// EphemeralStorage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-ephemeralstorage
+	EphemeralStorage *TaskDefinition_EphemeralStorage `json:"EphemeralStorage,omitempty"`
+
+	// ExecutionRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-executionrolearn
+	ExecutionRoleArn *types.Value `json:"ExecutionRoleArn,omitempty"`
+
+	// Family AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-family
+	Family *types.Value `json:"Family,omitempty"`
+
+	// InferenceAccelerators AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-inferenceaccelerators
+	InferenceAccelerators []TaskDefinition_InferenceAccelerator `json:"InferenceAccelerators,omitempty"`
+
+	// IpcMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-ipcmode
+	IpcMode *types.Value `json:"IpcMode,omitempty"`
+
+	// Memory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-memory
+	Memory *types.Value `json:"Memory,omitempty"`
+
+	// NetworkMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-networkmode
+	NetworkMode *types.Value `json:"NetworkMode,omitempty"`
+
+	// PidMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-pidmode
+	PidMode *types.Value `json:"PidMode,omitempty"`
+
+	// PlacementConstraints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-placementconstraints
+	PlacementConstraints []TaskDefinition_TaskDefinitionPlacementConstraint `json:"PlacementConstraints,omitempty"`
+
+	// ProxyConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-proxyconfiguration
+	ProxyConfiguration *TaskDefinition_ProxyConfiguration `json:"ProxyConfiguration,omitempty"`
+
+	// RequiresCompatibilities AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-requirescompatibilities
+	RequiresCompatibilities *types.Value `json:"RequiresCompatibilities,omitempty"`
+
+	// RuntimePlatform AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-runtimeplatform
+	RuntimePlatform *TaskDefinition_RuntimePlatform `json:"RuntimePlatform,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TaskRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-taskrolearn
+	TaskRoleArn *types.Value `json:"TaskRoleArn,omitempty"`
+
+	// Volumes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskdefinition.html#cfn-ecs-taskdefinition-volumes
+	Volumes []TaskDefinition_Volume `json:"Volumes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition"
+}
+
+// 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 TaskDefinition) MarshalJSON() ([]byte, error) {
+	type Properties TaskDefinition
+	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 *TaskDefinition) UnmarshalJSON(b []byte) error {
+	type Properties TaskDefinition
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TaskDefinition(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ecs/aws-ecs-taskdefinition_authorizationconfig.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_authorizationconfig.go
new file mode 100644
index 0000000000..f33c636751
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_authorizationconfig.go
@@ -0,0 +1,42 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_AuthorizationConfig AWS CloudFormation Resource (AWS::ECS::TaskDefinition.AuthorizationConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-authorizationconfig.html
+type TaskDefinition_AuthorizationConfig struct {
+
+	// AccessPointId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-authorizationconfig.html#cfn-ecs-taskdefinition-authorizationconfig-accesspointid
+	AccessPointId *types.Value `json:"AccessPointId,omitempty"`
+
+	// IAM AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-authorizationconfig.html#cfn-ecs-taskdefinition-authorizationconfig-iam
+	IAM *types.Value `json:"IAM,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AuthorizationConfig) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.AuthorizationConfig"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_containerdefinition.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_containerdefinition.go
new file mode 100644
index 0000000000..f333c8f615
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_containerdefinition.go
@@ -0,0 +1,227 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_ContainerDefinition AWS CloudFormation Resource (AWS::ECS::TaskDefinition.ContainerDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html
+type TaskDefinition_ContainerDefinition struct {
+
+	// Command AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-command
+	Command *types.Value `json:"Command,omitempty"`
+
+	// Cpu AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-cpu
+	Cpu *types.Value `json:"Cpu,omitempty"`
+
+	// DependsOn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-dependson
+	DependsOnProp []TaskDefinition_ContainerDependency `json:"DependsOn,omitempty"`
+
+	// DisableNetworking AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-disablenetworking
+	DisableNetworking *types.Value `json:"DisableNetworking,omitempty"`
+
+	// DnsSearchDomains AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-dnssearchdomains
+	DnsSearchDomains *types.Value `json:"DnsSearchDomains,omitempty"`
+
+	// DnsServers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-dnsservers
+	DnsServers *types.Value `json:"DnsServers,omitempty"`
+
+	// DockerLabels AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-dockerlabels
+	DockerLabels map[string]*types.Value `json:"DockerLabels,omitempty"`
+
+	// DockerSecurityOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-dockersecurityoptions
+	DockerSecurityOptions *types.Value `json:"DockerSecurityOptions,omitempty"`
+
+	// EntryPoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-entrypoint
+	EntryPoint *types.Value `json:"EntryPoint,omitempty"`
+
+	// Environment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-environment
+	Environment []TaskDefinition_KeyValuePair `json:"Environment,omitempty"`
+
+	// EnvironmentFiles AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-environmentfiles
+	EnvironmentFiles []TaskDefinition_EnvironmentFile `json:"EnvironmentFiles,omitempty"`
+
+	// Essential AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-essential
+	Essential *types.Value `json:"Essential,omitempty"`
+
+	// ExtraHosts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-extrahosts
+	ExtraHosts []TaskDefinition_HostEntry `json:"ExtraHosts,omitempty"`
+
+	// FirelensConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-firelensconfiguration
+	FirelensConfiguration *TaskDefinition_FirelensConfiguration `json:"FirelensConfiguration,omitempty"`
+
+	// HealthCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-healthcheck
+	HealthCheck *TaskDefinition_HealthCheck `json:"HealthCheck,omitempty"`
+
+	// Hostname AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-hostname
+	Hostname *types.Value `json:"Hostname,omitempty"`
+
+	// Image AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-image
+	Image *types.Value `json:"Image,omitempty"`
+
+	// Interactive AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-interactive
+	Interactive *types.Value `json:"Interactive,omitempty"`
+
+	// Links AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-links
+	Links *types.Value `json:"Links,omitempty"`
+
+	// LinuxParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-linuxparameters
+	LinuxParameters *TaskDefinition_LinuxParameters `json:"LinuxParameters,omitempty"`
+
+	// LogConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-logconfiguration
+	LogConfiguration *TaskDefinition_LogConfiguration `json:"LogConfiguration,omitempty"`
+
+	// Memory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-memory
+	Memory *types.Value `json:"Memory,omitempty"`
+
+	// MemoryReservation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-memoryreservation
+	MemoryReservation *types.Value `json:"MemoryReservation,omitempty"`
+
+	// MountPoints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-mountpoints
+	MountPoints []TaskDefinition_MountPoint `json:"MountPoints,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// PortMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-portmappings
+	PortMappings []TaskDefinition_PortMapping `json:"PortMappings,omitempty"`
+
+	// Privileged AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-privileged
+	Privileged *types.Value `json:"Privileged,omitempty"`
+
+	// PseudoTerminal AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-pseudoterminal
+	PseudoTerminal *types.Value `json:"PseudoTerminal,omitempty"`
+
+	// ReadonlyRootFilesystem AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-readonlyrootfilesystem
+	ReadonlyRootFilesystem *types.Value `json:"ReadonlyRootFilesystem,omitempty"`
+
+	// RepositoryCredentials AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-repositorycredentials
+	RepositoryCredentials *TaskDefinition_RepositoryCredentials `json:"RepositoryCredentials,omitempty"`
+
+	// ResourceRequirements AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-resourcerequirements
+	ResourceRequirements []TaskDefinition_ResourceRequirement `json:"ResourceRequirements,omitempty"`
+
+	// Secrets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-secrets
+	Secrets []TaskDefinition_Secret `json:"Secrets,omitempty"`
+
+	// StartTimeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-starttimeout
+	StartTimeout *types.Value `json:"StartTimeout,omitempty"`
+
+	// StopTimeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-stoptimeout
+	StopTimeout *types.Value `json:"StopTimeout,omitempty"`
+
+	// SystemControls AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-systemcontrols
+	SystemControls []TaskDefinition_SystemControl `json:"SystemControls,omitempty"`
+
+	// Ulimits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-ulimits
+	Ulimits []TaskDefinition_Ulimit `json:"Ulimits,omitempty"`
+
+	// User AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-user
+	User *types.Value `json:"User,omitempty"`
+
+	// VolumesFrom AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-volumesfrom
+	VolumesFrom []TaskDefinition_VolumeFrom `json:"VolumesFrom,omitempty"`
+
+	// WorkingDirectory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions.html#cfn-ecs-taskdefinition-containerdefinition-workingdirectory
+	WorkingDirectory *types.Value `json:"WorkingDirectory,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ContainerDefinition) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.ContainerDefinition"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_containerdependency.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_containerdependency.go
new file mode 100644
index 0000000000..fccfa31a46
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_containerdependency.go
@@ -0,0 +1,42 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_ContainerDependency AWS CloudFormation Resource (AWS::ECS::TaskDefinition.ContainerDependency)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdependency.html
+type TaskDefinition_ContainerDependency struct {
+
+	// Condition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdependency.html#cfn-ecs-taskdefinition-containerdependency-condition
+	Condition *types.Value `json:"Condition,omitempty"`
+
+	// ContainerName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdependency.html#cfn-ecs-taskdefinition-containerdependency-containername
+	ContainerName *types.Value `json:"ContainerName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ContainerDependency) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.ContainerDependency"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_device.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_device.go
new file mode 100644
index 0000000000..8d4e6f5ca6
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_device.go
@@ -0,0 +1,47 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_Device AWS CloudFormation Resource (AWS::ECS::TaskDefinition.Device)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-device.html
+type TaskDefinition_Device struct {
+
+	// ContainerPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-device.html#cfn-ecs-taskdefinition-device-containerpath
+	ContainerPath *types.Value `json:"ContainerPath,omitempty"`
+
+	// HostPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-device.html#cfn-ecs-taskdefinition-device-hostpath
+	HostPath *types.Value `json:"HostPath,omitempty"`
+
+	// Permissions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-device.html#cfn-ecs-taskdefinition-device-permissions
+	Permissions *types.Value `json:"Permissions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Device) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.Device"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_dockervolumeconfiguration.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_dockervolumeconfiguration.go
new file mode 100644
index 0000000000..2ebcb65545
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_dockervolumeconfiguration.go
@@ -0,0 +1,57 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_DockerVolumeConfiguration AWS CloudFormation Resource (AWS::ECS::TaskDefinition.DockerVolumeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-dockervolumeconfiguration.html
+type TaskDefinition_DockerVolumeConfiguration struct {
+
+	// Autoprovision AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-dockervolumeconfiguration.html#cfn-ecs-taskdefinition-dockervolumeconfiguration-autoprovision
+	Autoprovision *types.Value `json:"Autoprovision,omitempty"`
+
+	// Driver AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-dockervolumeconfiguration.html#cfn-ecs-taskdefinition-dockervolumeconfiguration-driver
+	Driver *types.Value `json:"Driver,omitempty"`
+
+	// DriverOpts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-dockervolumeconfiguration.html#cfn-ecs-taskdefinition-dockervolumeconfiguration-driveropts
+	DriverOpts map[string]*types.Value `json:"DriverOpts,omitempty"`
+
+	// Labels AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-dockervolumeconfiguration.html#cfn-ecs-taskdefinition-dockervolumeconfiguration-labels
+	Labels map[string]*types.Value `json:"Labels,omitempty"`
+
+	// Scope AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-dockervolumeconfiguration.html#cfn-ecs-taskdefinition-dockervolumeconfiguration-scope
+	Scope *types.Value `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 *TaskDefinition_DockerVolumeConfiguration) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.DockerVolumeConfiguration"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_efsvolumeconfiguration.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_efsvolumeconfiguration.go
new file mode 100644
index 0000000000..5d1e80464b
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_efsvolumeconfiguration.go
@@ -0,0 +1,57 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_EFSVolumeConfiguration AWS CloudFormation Resource (AWS::ECS::TaskDefinition.EFSVolumeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-efsvolumeconfiguration.html
+type TaskDefinition_EFSVolumeConfiguration struct {
+
+	// AuthorizationConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-efsvolumeconfiguration.html#cfn-ecs-taskdefinition-efsvolumeconfiguration-authorizationconfig
+	AuthorizationConfig interface{} `json:"AuthorizationConfig,omitempty"`
+
+	// FilesystemId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-efsvolumeconfiguration.html#cfn-ecs-taskdefinition-efsvolumeconfiguration-filesystemid
+	FilesystemId *types.Value `json:"FilesystemId,omitempty"`
+
+	// RootDirectory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-efsvolumeconfiguration.html#cfn-ecs-taskdefinition-efsvolumeconfiguration-rootdirectory
+	RootDirectory *types.Value `json:"RootDirectory,omitempty"`
+
+	// TransitEncryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-efsvolumeconfiguration.html#cfn-ecs-taskdefinition-efsvolumeconfiguration-transitencryption
+	TransitEncryption *types.Value `json:"TransitEncryption,omitempty"`
+
+	// TransitEncryptionPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-efsvolumeconfiguration.html#cfn-ecs-taskdefinition-efsvolumeconfiguration-transitencryptionport
+	TransitEncryptionPort *types.Value `json:"TransitEncryptionPort,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EFSVolumeConfiguration) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.EFSVolumeConfiguration"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_environmentfile.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_environmentfile.go
new file mode 100644
index 0000000000..e9a75d127b
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_environmentfile.go
@@ -0,0 +1,42 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_EnvironmentFile AWS CloudFormation Resource (AWS::ECS::TaskDefinition.EnvironmentFile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-environmentfile.html
+type TaskDefinition_EnvironmentFile struct {
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-environmentfile.html#cfn-ecs-taskdefinition-environmentfile-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-environmentfile.html#cfn-ecs-taskdefinition-environmentfile-value
+	Value *types.Value `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 *TaskDefinition_EnvironmentFile) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.EnvironmentFile"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_ephemeralstorage.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_ephemeralstorage.go
new file mode 100644
index 0000000000..d454aa8727
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_ephemeralstorage.go
@@ -0,0 +1,37 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_EphemeralStorage AWS CloudFormation Resource (AWS::ECS::TaskDefinition.EphemeralStorage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-ephemeralstorage.html
+type TaskDefinition_EphemeralStorage struct {
+
+	// SizeInGiB AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-ephemeralstorage.html#cfn-ecs-taskdefinition-ephemeralstorage-sizeingib
+	SizeInGiB *types.Value `json:"SizeInGiB,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EphemeralStorage) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.EphemeralStorage"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_firelensconfiguration.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_firelensconfiguration.go
new file mode 100644
index 0000000000..d03353aa8b
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_firelensconfiguration.go
@@ -0,0 +1,42 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_FirelensConfiguration AWS CloudFormation Resource (AWS::ECS::TaskDefinition.FirelensConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-firelensconfiguration.html
+type TaskDefinition_FirelensConfiguration struct {
+
+	// Options AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-firelensconfiguration.html#cfn-ecs-taskdefinition-firelensconfiguration-options
+	Options map[string]*types.Value `json:"Options,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-firelensconfiguration.html#cfn-ecs-taskdefinition-firelensconfiguration-type
+	Type *types.Value `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 *TaskDefinition_FirelensConfiguration) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.FirelensConfiguration"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_healthcheck.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_healthcheck.go
new file mode 100644
index 0000000000..f8db91a21c
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_healthcheck.go
@@ -0,0 +1,57 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_HealthCheck AWS CloudFormation Resource (AWS::ECS::TaskDefinition.HealthCheck)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-healthcheck.html
+type TaskDefinition_HealthCheck struct {
+
+	// Command AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-healthcheck.html#cfn-ecs-taskdefinition-healthcheck-command
+	Command *types.Value `json:"Command,omitempty"`
+
+	// Interval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-healthcheck.html#cfn-ecs-taskdefinition-healthcheck-interval
+	Interval *types.Value `json:"Interval,omitempty"`
+
+	// Retries AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-healthcheck.html#cfn-ecs-taskdefinition-healthcheck-retries
+	Retries *types.Value `json:"Retries,omitempty"`
+
+	// StartPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-healthcheck.html#cfn-ecs-taskdefinition-healthcheck-startperiod
+	StartPeriod *types.Value `json:"StartPeriod,omitempty"`
+
+	// Timeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-healthcheck.html#cfn-ecs-taskdefinition-healthcheck-timeout
+	Timeout *types.Value `json:"Timeout,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_HealthCheck) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.HealthCheck"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_hostentry.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_hostentry.go
new file mode 100644
index 0000000000..1d9aa2b2bc
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_hostentry.go
@@ -0,0 +1,42 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_HostEntry AWS CloudFormation Resource (AWS::ECS::TaskDefinition.HostEntry)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-hostentry.html
+type TaskDefinition_HostEntry struct {
+
+	// Hostname AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-hostentry.html#cfn-ecs-taskdefinition-containerdefinition-hostentry-hostname
+	Hostname *types.Value `json:"Hostname,omitempty"`
+
+	// IpAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-hostentry.html#cfn-ecs-taskdefinition-containerdefinition-hostentry-ipaddress
+	IpAddress *types.Value `json:"IpAddress,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_HostEntry) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.HostEntry"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_hostvolumeproperties.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_hostvolumeproperties.go
new file mode 100644
index 0000000000..5f734f3e9c
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_hostvolumeproperties.go
@@ -0,0 +1,37 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_HostVolumeProperties AWS CloudFormation Resource (AWS::ECS::TaskDefinition.HostVolumeProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-volumes-host.html
+type TaskDefinition_HostVolumeProperties struct {
+
+	// SourcePath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-volumes-host.html#cfn-ecs-taskdefinition-volumes-host-sourcepath
+	SourcePath *types.Value `json:"SourcePath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_HostVolumeProperties) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.HostVolumeProperties"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_inferenceaccelerator.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_inferenceaccelerator.go
new file mode 100644
index 0000000000..3c84aa2a0a
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_inferenceaccelerator.go
@@ -0,0 +1,42 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_InferenceAccelerator AWS CloudFormation Resource (AWS::ECS::TaskDefinition.InferenceAccelerator)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-inferenceaccelerator.html
+type TaskDefinition_InferenceAccelerator struct {
+
+	// DeviceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-inferenceaccelerator.html#cfn-ecs-taskdefinition-inferenceaccelerator-devicename
+	DeviceName *types.Value `json:"DeviceName,omitempty"`
+
+	// DeviceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-inferenceaccelerator.html#cfn-ecs-taskdefinition-inferenceaccelerator-devicetype
+	DeviceType *types.Value `json:"DeviceType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InferenceAccelerator) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.InferenceAccelerator"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_kernelcapabilities.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_kernelcapabilities.go
new file mode 100644
index 0000000000..43197d5fa7
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_kernelcapabilities.go
@@ -0,0 +1,42 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_KernelCapabilities AWS CloudFormation Resource (AWS::ECS::TaskDefinition.KernelCapabilities)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-kernelcapabilities.html
+type TaskDefinition_KernelCapabilities struct {
+
+	// Add AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-kernelcapabilities.html#cfn-ecs-taskdefinition-kernelcapabilities-add
+	Add *types.Value `json:"Add,omitempty"`
+
+	// Drop AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-kernelcapabilities.html#cfn-ecs-taskdefinition-kernelcapabilities-drop
+	Drop *types.Value `json:"Drop,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_KernelCapabilities) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.KernelCapabilities"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_keyvaluepair.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_keyvaluepair.go
new file mode 100644
index 0000000000..a6e62f0eca
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_keyvaluepair.go
@@ -0,0 +1,42 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_KeyValuePair AWS CloudFormation Resource (AWS::ECS::TaskDefinition.KeyValuePair)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-environment.html
+type TaskDefinition_KeyValuePair struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-environment.html#cfn-ecs-taskdefinition-containerdefinition-environment-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-environment.html#cfn-ecs-taskdefinition-containerdefinition-environment-value
+	Value *types.Value `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 *TaskDefinition_KeyValuePair) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.KeyValuePair"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_linuxparameters.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_linuxparameters.go
new file mode 100644
index 0000000000..1afe053189
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_linuxparameters.go
@@ -0,0 +1,67 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_LinuxParameters AWS CloudFormation Resource (AWS::ECS::TaskDefinition.LinuxParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-linuxparameters.html
+type TaskDefinition_LinuxParameters struct {
+
+	// Capabilities AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-linuxparameters.html#cfn-ecs-taskdefinition-linuxparameters-capabilities
+	Capabilities *TaskDefinition_KernelCapabilities `json:"Capabilities,omitempty"`
+
+	// Devices AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-linuxparameters.html#cfn-ecs-taskdefinition-linuxparameters-devices
+	Devices []TaskDefinition_Device `json:"Devices,omitempty"`
+
+	// InitProcessEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-linuxparameters.html#cfn-ecs-taskdefinition-linuxparameters-initprocessenabled
+	InitProcessEnabled *types.Value `json:"InitProcessEnabled,omitempty"`
+
+	// MaxSwap AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-linuxparameters.html#cfn-ecs-taskdefinition-linuxparameters-maxswap
+	MaxSwap *types.Value `json:"MaxSwap,omitempty"`
+
+	// SharedMemorySize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-linuxparameters.html#cfn-ecs-taskdefinition-linuxparameters-sharedmemorysize
+	SharedMemorySize *types.Value `json:"SharedMemorySize,omitempty"`
+
+	// Swappiness AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-linuxparameters.html#cfn-ecs-taskdefinition-linuxparameters-swappiness
+	Swappiness *types.Value `json:"Swappiness,omitempty"`
+
+	// Tmpfs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-linuxparameters.html#cfn-ecs-taskdefinition-linuxparameters-tmpfs
+	Tmpfs []TaskDefinition_Tmpfs `json:"Tmpfs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LinuxParameters) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.LinuxParameters"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_logconfiguration.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_logconfiguration.go
new file mode 100644
index 0000000000..06843211e3
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_logconfiguration.go
@@ -0,0 +1,47 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_LogConfiguration AWS CloudFormation Resource (AWS::ECS::TaskDefinition.LogConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-logconfiguration.html
+type TaskDefinition_LogConfiguration struct {
+
+	// LogDriver AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-logconfiguration.html#cfn-ecs-taskdefinition-containerdefinition-logconfiguration-logdriver
+	LogDriver *types.Value `json:"LogDriver,omitempty"`
+
+	// Options AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-logconfiguration.html#cfn-ecs-taskdefinition-containerdefinition-logconfiguration-options
+	Options map[string]*types.Value `json:"Options,omitempty"`
+
+	// SecretOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-logconfiguration.html#cfn-ecs-taskdefinition-logconfiguration-secretoptions
+	SecretOptions []TaskDefinition_Secret `json:"SecretOptions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LogConfiguration) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.LogConfiguration"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_mountpoint.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_mountpoint.go
new file mode 100644
index 0000000000..4bee83d3ef
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_mountpoint.go
@@ -0,0 +1,47 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_MountPoint AWS CloudFormation Resource (AWS::ECS::TaskDefinition.MountPoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-mountpoints.html
+type TaskDefinition_MountPoint struct {
+
+	// ContainerPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-mountpoints.html#cfn-ecs-taskdefinition-containerdefinition-mountpoints-containerpath
+	ContainerPath *types.Value `json:"ContainerPath,omitempty"`
+
+	// ReadOnly AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-mountpoints.html#cfn-ecs-taskdefinition-containerdefinition-mountpoints-readonly
+	ReadOnly *types.Value `json:"ReadOnly,omitempty"`
+
+	// SourceVolume AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-mountpoints.html#cfn-ecs-taskdefinition-containerdefinition-mountpoints-sourcevolume
+	SourceVolume *types.Value `json:"SourceVolume,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_MountPoint) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.MountPoint"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_portmapping.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_portmapping.go
new file mode 100644
index 0000000000..d5944017a0
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_portmapping.go
@@ -0,0 +1,47 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_PortMapping AWS CloudFormation Resource (AWS::ECS::TaskDefinition.PortMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-portmappings.html
+type TaskDefinition_PortMapping struct {
+
+	// ContainerPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-portmappings.html#cfn-ecs-taskdefinition-containerdefinition-portmappings-containerport
+	ContainerPort *types.Value `json:"ContainerPort,omitempty"`
+
+	// HostPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-portmappings.html#cfn-ecs-taskdefinition-containerdefinition-portmappings-readonly
+	HostPort *types.Value `json:"HostPort,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-portmappings.html#cfn-ecs-taskdefinition-containerdefinition-portmappings-sourcevolume
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PortMapping) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.PortMapping"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_proxyconfiguration.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_proxyconfiguration.go
new file mode 100644
index 0000000000..99111850aa
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_proxyconfiguration.go
@@ -0,0 +1,47 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_ProxyConfiguration AWS CloudFormation Resource (AWS::ECS::TaskDefinition.ProxyConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-proxyconfiguration.html
+type TaskDefinition_ProxyConfiguration struct {
+
+	// ContainerName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-proxyconfiguration.html#cfn-ecs-taskdefinition-proxyconfiguration-containername
+	ContainerName *types.Value `json:"ContainerName,omitempty"`
+
+	// ProxyConfigurationProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-proxyconfiguration.html#cfn-ecs-taskdefinition-proxyconfiguration-proxyconfigurationproperties
+	ProxyConfigurationProperties []TaskDefinition_KeyValuePair `json:"ProxyConfigurationProperties,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-proxyconfiguration.html#cfn-ecs-taskdefinition-proxyconfiguration-type
+	Type *types.Value `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 *TaskDefinition_ProxyConfiguration) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.ProxyConfiguration"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_repositorycredentials.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_repositorycredentials.go
new file mode 100644
index 0000000000..d3e9b9d21b
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_repositorycredentials.go
@@ -0,0 +1,37 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_RepositoryCredentials AWS CloudFormation Resource (AWS::ECS::TaskDefinition.RepositoryCredentials)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-repositorycredentials.html
+type TaskDefinition_RepositoryCredentials struct {
+
+	// CredentialsParameter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-repositorycredentials.html#cfn-ecs-taskdefinition-repositorycredentials-credentialsparameter
+	CredentialsParameter *types.Value `json:"CredentialsParameter,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RepositoryCredentials) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.RepositoryCredentials"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_resourcerequirement.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_resourcerequirement.go
new file mode 100644
index 0000000000..2ff01978cf
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_resourcerequirement.go
@@ -0,0 +1,42 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_ResourceRequirement AWS CloudFormation Resource (AWS::ECS::TaskDefinition.ResourceRequirement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-resourcerequirement.html
+type TaskDefinition_ResourceRequirement struct {
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-resourcerequirement.html#cfn-ecs-taskdefinition-resourcerequirement-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-resourcerequirement.html#cfn-ecs-taskdefinition-resourcerequirement-value
+	Value *types.Value `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 *TaskDefinition_ResourceRequirement) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.ResourceRequirement"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_runtimeplatform.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_runtimeplatform.go
new file mode 100644
index 0000000000..2e76535e88
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_runtimeplatform.go
@@ -0,0 +1,42 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_RuntimePlatform AWS CloudFormation Resource (AWS::ECS::TaskDefinition.RuntimePlatform)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-runtimeplatform.html
+type TaskDefinition_RuntimePlatform struct {
+
+	// CpuArchitecture AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-runtimeplatform.html#cfn-ecs-taskdefinition-runtimeplatform-cpuarchitecture
+	CpuArchitecture *types.Value `json:"CpuArchitecture,omitempty"`
+
+	// OperatingSystemFamily AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-runtimeplatform.html#cfn-ecs-taskdefinition-runtimeplatform-operatingsystemfamily
+	OperatingSystemFamily *types.Value `json:"OperatingSystemFamily,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RuntimePlatform) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.RuntimePlatform"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_secret.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_secret.go
new file mode 100644
index 0000000000..db4cc04d51
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_secret.go
@@ -0,0 +1,42 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_Secret AWS CloudFormation Resource (AWS::ECS::TaskDefinition.Secret)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-secret.html
+type TaskDefinition_Secret struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-secret.html#cfn-ecs-taskdefinition-secret-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ValueFrom AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-secret.html#cfn-ecs-taskdefinition-secret-valuefrom
+	ValueFrom *types.Value `json:"ValueFrom,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Secret) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.Secret"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_systemcontrol.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_systemcontrol.go
new file mode 100644
index 0000000000..06e0c7a645
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_systemcontrol.go
@@ -0,0 +1,42 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_SystemControl AWS CloudFormation Resource (AWS::ECS::TaskDefinition.SystemControl)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-systemcontrol.html
+type TaskDefinition_SystemControl struct {
+
+	// Namespace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-systemcontrol.html#cfn-ecs-taskdefinition-systemcontrol-namespace
+	Namespace *types.Value `json:"Namespace,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-systemcontrol.html#cfn-ecs-taskdefinition-systemcontrol-value
+	Value *types.Value `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 *TaskDefinition_SystemControl) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.SystemControl"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_taskdefinitionplacementconstraint.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_taskdefinitionplacementconstraint.go
new file mode 100644
index 0000000000..efa884285b
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_taskdefinitionplacementconstraint.go
@@ -0,0 +1,42 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_TaskDefinitionPlacementConstraint AWS CloudFormation Resource (AWS::ECS::TaskDefinition.TaskDefinitionPlacementConstraint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-taskdefinitionplacementconstraint.html
+type TaskDefinition_TaskDefinitionPlacementConstraint struct {
+
+	// Expression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-taskdefinitionplacementconstraint.html#cfn-ecs-taskdefinition-taskdefinitionplacementconstraint-expression
+	Expression *types.Value `json:"Expression,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-taskdefinitionplacementconstraint.html#cfn-ecs-taskdefinition-taskdefinitionplacementconstraint-type
+	Type *types.Value `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 *TaskDefinition_TaskDefinitionPlacementConstraint) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.TaskDefinitionPlacementConstraint"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_tmpfs.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_tmpfs.go
new file mode 100644
index 0000000000..921ca4fe5f
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_tmpfs.go
@@ -0,0 +1,47 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_Tmpfs AWS CloudFormation Resource (AWS::ECS::TaskDefinition.Tmpfs)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-tmpfs.html
+type TaskDefinition_Tmpfs struct {
+
+	// ContainerPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-tmpfs.html#cfn-ecs-taskdefinition-tmpfs-containerpath
+	ContainerPath *types.Value `json:"ContainerPath,omitempty"`
+
+	// MountOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-tmpfs.html#cfn-ecs-taskdefinition-tmpfs-mountoptions
+	MountOptions *types.Value `json:"MountOptions,omitempty"`
+
+	// Size AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-tmpfs.html#cfn-ecs-taskdefinition-tmpfs-size
+	Size *types.Value `json:"Size"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Tmpfs) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.Tmpfs"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_ulimit.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_ulimit.go
new file mode 100644
index 0000000000..0e838ace3d
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_ulimit.go
@@ -0,0 +1,47 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_Ulimit AWS CloudFormation Resource (AWS::ECS::TaskDefinition.Ulimit)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-ulimit.html
+type TaskDefinition_Ulimit struct {
+
+	// HardLimit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-ulimit.html#cfn-ecs-taskdefinition-containerdefinition-ulimit-hardlimit
+	HardLimit *types.Value `json:"HardLimit"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-ulimit.html#cfn-ecs-taskdefinition-containerdefinition-ulimit-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SoftLimit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-ulimit.html#cfn-ecs-taskdefinition-containerdefinition-ulimit-softlimit
+	SoftLimit *types.Value `json:"SoftLimit"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Ulimit) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.Ulimit"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_volume.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_volume.go
new file mode 100644
index 0000000000..0fd69c0933
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_volume.go
@@ -0,0 +1,52 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_Volume AWS CloudFormation Resource (AWS::ECS::TaskDefinition.Volume)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-volumes.html
+type TaskDefinition_Volume struct {
+
+	// DockerVolumeConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-volumes.html#cfn-ecs-taskdefinition-volume-dockervolumeconfiguration
+	DockerVolumeConfiguration *TaskDefinition_DockerVolumeConfiguration `json:"DockerVolumeConfiguration,omitempty"`
+
+	// EFSVolumeConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-volumes.html#cfn-ecs-taskdefinition-volume-efsvolumeconfiguration
+	EFSVolumeConfiguration *TaskDefinition_EFSVolumeConfiguration `json:"EFSVolumeConfiguration,omitempty"`
+
+	// Host AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-volumes.html#cfn-ecs-taskdefinition-volumes-host
+	Host *TaskDefinition_HostVolumeProperties `json:"Host,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-volumes.html#cfn-ecs-taskdefinition-volumes-name
+	Name *types.Value `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 *TaskDefinition_Volume) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.Volume"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskdefinition_volumefrom.go b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_volumefrom.go
new file mode 100644
index 0000000000..83c1698396
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskdefinition_volumefrom.go
@@ -0,0 +1,42 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_VolumeFrom AWS CloudFormation Resource (AWS::ECS::TaskDefinition.VolumeFrom)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-volumesfrom.html
+type TaskDefinition_VolumeFrom struct {
+
+	// ReadOnly AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-volumesfrom.html#cfn-ecs-taskdefinition-containerdefinition-volumesfrom-readonly
+	ReadOnly *types.Value `json:"ReadOnly,omitempty"`
+
+	// SourceContainer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskdefinition-containerdefinitions-volumesfrom.html#cfn-ecs-taskdefinition-containerdefinition-volumesfrom-sourcecontainer
+	SourceContainer *types.Value `json:"SourceContainer,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_VolumeFrom) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskDefinition.VolumeFrom"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskset.go b/goformation/cloudformation/ecs/aws-ecs-taskset.go
new file mode 100644
index 0000000000..148cfd336b
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskset.go
@@ -0,0 +1,153 @@
+package ecs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskSet AWS CloudFormation Resource (AWS::ECS::TaskSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskset.html
+type TaskSet struct {
+
+	// Cluster AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskset.html#cfn-ecs-taskset-cluster
+	Cluster *types.Value `json:"Cluster,omitempty"`
+
+	// ExternalId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskset.html#cfn-ecs-taskset-externalid
+	ExternalId *types.Value `json:"ExternalId,omitempty"`
+
+	// LaunchType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskset.html#cfn-ecs-taskset-launchtype
+	LaunchType *types.Value `json:"LaunchType,omitempty"`
+
+	// LoadBalancers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskset.html#cfn-ecs-taskset-loadbalancers
+	LoadBalancers []TaskSet_LoadBalancer `json:"LoadBalancers,omitempty"`
+
+	// NetworkConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskset.html#cfn-ecs-taskset-networkconfiguration
+	NetworkConfiguration *TaskSet_NetworkConfiguration `json:"NetworkConfiguration,omitempty"`
+
+	// PlatformVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskset.html#cfn-ecs-taskset-platformversion
+	PlatformVersion *types.Value `json:"PlatformVersion,omitempty"`
+
+	// Scale AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskset.html#cfn-ecs-taskset-scale
+	Scale *TaskSet_Scale `json:"Scale,omitempty"`
+
+	// Service AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskset.html#cfn-ecs-taskset-service
+	Service *types.Value `json:"Service,omitempty"`
+
+	// ServiceRegistries AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskset.html#cfn-ecs-taskset-serviceregistries
+	ServiceRegistries []TaskSet_ServiceRegistry `json:"ServiceRegistries,omitempty"`
+
+	// TaskDefinition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ecs-taskset.html#cfn-ecs-taskset-taskdefinition
+	TaskDefinition *types.Value `json:"TaskDefinition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TaskSet) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskSet"
+}
+
+// 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 TaskSet) MarshalJSON() ([]byte, error) {
+	type Properties TaskSet
+	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 *TaskSet) UnmarshalJSON(b []byte) error {
+	type Properties TaskSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TaskSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ecs/aws-ecs-taskset_awsvpcconfiguration.go b/goformation/cloudformation/ecs/aws-ecs-taskset_awsvpcconfiguration.go
new file mode 100644
index 0000000000..eb1ca471ca
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskset_awsvpcconfiguration.go
@@ -0,0 +1,47 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskSet_AwsVpcConfiguration AWS CloudFormation Resource (AWS::ECS::TaskSet.AwsVpcConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskset-awsvpcconfiguration.html
+type TaskSet_AwsVpcConfiguration struct {
+
+	// AssignPublicIp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskset-awsvpcconfiguration.html#cfn-ecs-taskset-awsvpcconfiguration-assignpublicip
+	AssignPublicIp *types.Value `json:"AssignPublicIp,omitempty"`
+
+	// SecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskset-awsvpcconfiguration.html#cfn-ecs-taskset-awsvpcconfiguration-securitygroups
+	SecurityGroups *types.Value `json:"SecurityGroups,omitempty"`
+
+	// Subnets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskset-awsvpcconfiguration.html#cfn-ecs-taskset-awsvpcconfiguration-subnets
+	Subnets *types.Value `json:"Subnets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TaskSet_AwsVpcConfiguration) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskSet.AwsVpcConfiguration"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskset_loadbalancer.go b/goformation/cloudformation/ecs/aws-ecs-taskset_loadbalancer.go
new file mode 100644
index 0000000000..57e7c30642
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskset_loadbalancer.go
@@ -0,0 +1,52 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskSet_LoadBalancer AWS CloudFormation Resource (AWS::ECS::TaskSet.LoadBalancer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskset-loadbalancer.html
+type TaskSet_LoadBalancer struct {
+
+	// ContainerName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskset-loadbalancer.html#cfn-ecs-taskset-loadbalancer-containername
+	ContainerName *types.Value `json:"ContainerName,omitempty"`
+
+	// ContainerPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskset-loadbalancer.html#cfn-ecs-taskset-loadbalancer-containerport
+	ContainerPort *types.Value `json:"ContainerPort,omitempty"`
+
+	// LoadBalancerName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskset-loadbalancer.html#cfn-ecs-taskset-loadbalancer-loadbalancername
+	LoadBalancerName *types.Value `json:"LoadBalancerName,omitempty"`
+
+	// TargetGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskset-loadbalancer.html#cfn-ecs-taskset-loadbalancer-targetgrouparn
+	TargetGroupArn *types.Value `json:"TargetGroupArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TaskSet_LoadBalancer) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskSet.LoadBalancer"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskset_networkconfiguration.go b/goformation/cloudformation/ecs/aws-ecs-taskset_networkconfiguration.go
new file mode 100644
index 0000000000..f64bc70468
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskset_networkconfiguration.go
@@ -0,0 +1,35 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskSet_NetworkConfiguration AWS CloudFormation Resource (AWS::ECS::TaskSet.NetworkConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskset-networkconfiguration.html
+type TaskSet_NetworkConfiguration struct {
+
+	// AwsVpcConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskset-networkconfiguration.html#cfn-ecs-taskset-networkconfiguration-awsvpcconfiguration
+	AwsVpcConfiguration *TaskSet_AwsVpcConfiguration `json:"AwsVpcConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TaskSet_NetworkConfiguration) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskSet.NetworkConfiguration"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskset_scale.go b/goformation/cloudformation/ecs/aws-ecs-taskset_scale.go
new file mode 100644
index 0000000000..31f39e0c6c
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskset_scale.go
@@ -0,0 +1,42 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskSet_Scale AWS CloudFormation Resource (AWS::ECS::TaskSet.Scale)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskset-scale.html
+type TaskSet_Scale struct {
+
+	// Unit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskset-scale.html#cfn-ecs-taskset-scale-unit
+	Unit *types.Value `json:"Unit,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskset-scale.html#cfn-ecs-taskset-scale-value
+	Value *types.Value `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 *TaskSet_Scale) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskSet.Scale"
+}
diff --git a/goformation/cloudformation/ecs/aws-ecs-taskset_serviceregistry.go b/goformation/cloudformation/ecs/aws-ecs-taskset_serviceregistry.go
new file mode 100644
index 0000000000..f071232f5e
--- /dev/null
+++ b/goformation/cloudformation/ecs/aws-ecs-taskset_serviceregistry.go
@@ -0,0 +1,52 @@
+package ecs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskSet_ServiceRegistry AWS CloudFormation Resource (AWS::ECS::TaskSet.ServiceRegistry)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskset-serviceregistry.html
+type TaskSet_ServiceRegistry struct {
+
+	// ContainerName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskset-serviceregistry.html#cfn-ecs-taskset-serviceregistry-containername
+	ContainerName *types.Value `json:"ContainerName,omitempty"`
+
+	// ContainerPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskset-serviceregistry.html#cfn-ecs-taskset-serviceregistry-containerport
+	ContainerPort *types.Value `json:"ContainerPort,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskset-serviceregistry.html#cfn-ecs-taskset-serviceregistry-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// RegistryArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ecs-taskset-serviceregistry.html#cfn-ecs-taskset-serviceregistry-registryarn
+	RegistryArn *types.Value `json:"RegistryArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TaskSet_ServiceRegistry) AWSCloudFormationType() string {
+	return "AWS::ECS::TaskSet.ServiceRegistry"
+}
diff --git a/goformation/cloudformation/efs/aws-efs-accesspoint.go b/goformation/cloudformation/efs/aws-efs-accesspoint.go
new file mode 100644
index 0000000000..a2d55d10c7
--- /dev/null
+++ b/goformation/cloudformation/efs/aws-efs-accesspoint.go
@@ -0,0 +1,128 @@
+package efs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPoint AWS CloudFormation Resource (AWS::EFS::AccessPoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-accesspoint.html
+type AccessPoint struct {
+
+	// AccessPointTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-accesspoint.html#cfn-efs-accesspoint-accesspointtags
+	AccessPointTags []AccessPoint_AccessPointTag `json:"AccessPointTags,omitempty"`
+
+	// ClientToken AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-accesspoint.html#cfn-efs-accesspoint-clienttoken
+	ClientToken *types.Value `json:"ClientToken,omitempty"`
+
+	// FileSystemId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-accesspoint.html#cfn-efs-accesspoint-filesystemid
+	FileSystemId *types.Value `json:"FileSystemId,omitempty"`
+
+	// PosixUser AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-accesspoint.html#cfn-efs-accesspoint-posixuser
+	PosixUser *AccessPoint_PosixUser `json:"PosixUser,omitempty"`
+
+	// RootDirectory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-accesspoint.html#cfn-efs-accesspoint-rootdirectory
+	RootDirectory *AccessPoint_RootDirectory `json:"RootDirectory,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AccessPoint) AWSCloudFormationType() string {
+	return "AWS::EFS::AccessPoint"
+}
+
+// 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 AccessPoint) MarshalJSON() ([]byte, error) {
+	type Properties AccessPoint
+	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 *AccessPoint) UnmarshalJSON(b []byte) error {
+	type Properties AccessPoint
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AccessPoint(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/efs/aws-efs-accesspoint_accesspointtag.go b/goformation/cloudformation/efs/aws-efs-accesspoint_accesspointtag.go
new file mode 100644
index 0000000000..61d19285ad
--- /dev/null
+++ b/goformation/cloudformation/efs/aws-efs-accesspoint_accesspointtag.go
@@ -0,0 +1,42 @@
+package efs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPoint_AccessPointTag AWS CloudFormation Resource (AWS::EFS::AccessPoint.AccessPointTag)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-accesspoint-accesspointtag.html
+type AccessPoint_AccessPointTag struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-accesspoint-accesspointtag.html#cfn-efs-accesspoint-accesspointtag-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-accesspoint-accesspointtag.html#cfn-efs-accesspoint-accesspointtag-value
+	Value *types.Value `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 *AccessPoint_AccessPointTag) AWSCloudFormationType() string {
+	return "AWS::EFS::AccessPoint.AccessPointTag"
+}
diff --git a/goformation/cloudformation/efs/aws-efs-accesspoint_creationinfo.go b/goformation/cloudformation/efs/aws-efs-accesspoint_creationinfo.go
new file mode 100644
index 0000000000..a1795af330
--- /dev/null
+++ b/goformation/cloudformation/efs/aws-efs-accesspoint_creationinfo.go
@@ -0,0 +1,47 @@
+package efs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPoint_CreationInfo AWS CloudFormation Resource (AWS::EFS::AccessPoint.CreationInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-accesspoint-creationinfo.html
+type AccessPoint_CreationInfo struct {
+
+	// OwnerGid AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-accesspoint-creationinfo.html#cfn-efs-accesspoint-creationinfo-ownergid
+	OwnerGid *types.Value `json:"OwnerGid,omitempty"`
+
+	// OwnerUid AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-accesspoint-creationinfo.html#cfn-efs-accesspoint-creationinfo-owneruid
+	OwnerUid *types.Value `json:"OwnerUid,omitempty"`
+
+	// Permissions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-accesspoint-creationinfo.html#cfn-efs-accesspoint-creationinfo-permissions
+	Permissions *types.Value `json:"Permissions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AccessPoint_CreationInfo) AWSCloudFormationType() string {
+	return "AWS::EFS::AccessPoint.CreationInfo"
+}
diff --git a/goformation/cloudformation/efs/aws-efs-accesspoint_posixuser.go b/goformation/cloudformation/efs/aws-efs-accesspoint_posixuser.go
new file mode 100644
index 0000000000..69b90c47a1
--- /dev/null
+++ b/goformation/cloudformation/efs/aws-efs-accesspoint_posixuser.go
@@ -0,0 +1,47 @@
+package efs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPoint_PosixUser AWS CloudFormation Resource (AWS::EFS::AccessPoint.PosixUser)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-accesspoint-posixuser.html
+type AccessPoint_PosixUser struct {
+
+	// Gid AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-accesspoint-posixuser.html#cfn-efs-accesspoint-posixuser-gid
+	Gid *types.Value `json:"Gid,omitempty"`
+
+	// SecondaryGids AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-accesspoint-posixuser.html#cfn-efs-accesspoint-posixuser-secondarygids
+	SecondaryGids *types.Value `json:"SecondaryGids,omitempty"`
+
+	// Uid AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-accesspoint-posixuser.html#cfn-efs-accesspoint-posixuser-uid
+	Uid *types.Value `json:"Uid,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AccessPoint_PosixUser) AWSCloudFormationType() string {
+	return "AWS::EFS::AccessPoint.PosixUser"
+}
diff --git a/goformation/cloudformation/efs/aws-efs-accesspoint_rootdirectory.go b/goformation/cloudformation/efs/aws-efs-accesspoint_rootdirectory.go
new file mode 100644
index 0000000000..119e716756
--- /dev/null
+++ b/goformation/cloudformation/efs/aws-efs-accesspoint_rootdirectory.go
@@ -0,0 +1,42 @@
+package efs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPoint_RootDirectory AWS CloudFormation Resource (AWS::EFS::AccessPoint.RootDirectory)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-accesspoint-rootdirectory.html
+type AccessPoint_RootDirectory struct {
+
+	// CreationInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-accesspoint-rootdirectory.html#cfn-efs-accesspoint-rootdirectory-creationinfo
+	CreationInfo *AccessPoint_CreationInfo `json:"CreationInfo,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-accesspoint-rootdirectory.html#cfn-efs-accesspoint-rootdirectory-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AccessPoint_RootDirectory) AWSCloudFormationType() string {
+	return "AWS::EFS::AccessPoint.RootDirectory"
+}
diff --git a/goformation/cloudformation/efs/aws-efs-filesystem.go b/goformation/cloudformation/efs/aws-efs-filesystem.go
new file mode 100644
index 0000000000..42927480dd
--- /dev/null
+++ b/goformation/cloudformation/efs/aws-efs-filesystem.go
@@ -0,0 +1,158 @@
+package efs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FileSystem AWS CloudFormation Resource (AWS::EFS::FileSystem)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html
+type FileSystem struct {
+
+	// AvailabilityZoneName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-efs-filesystem-availabilityzonename
+	AvailabilityZoneName *types.Value `json:"AvailabilityZoneName,omitempty"`
+
+	// BackupPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-efs-filesystem-backuppolicy
+	BackupPolicy *FileSystem_BackupPolicy `json:"BackupPolicy,omitempty"`
+
+	// BypassPolicyLockoutSafetyCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-efs-filesystem-bypasspolicylockoutsafetycheck
+	BypassPolicyLockoutSafetyCheck *types.Value `json:"BypassPolicyLockoutSafetyCheck,omitempty"`
+
+	// Encrypted AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-efs-filesystem-encrypted
+	Encrypted *types.Value `json:"Encrypted,omitempty"`
+
+	// FileSystemPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-efs-filesystem-filesystempolicy
+	FileSystemPolicy interface{} `json:"FileSystemPolicy,omitempty"`
+
+	// FileSystemTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-efs-filesystem-filesystemtags
+	FileSystemTags []FileSystem_ElasticFileSystemTag `json:"FileSystemTags,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-efs-filesystem-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// LifecyclePolicies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-efs-filesystem-lifecyclepolicies
+	LifecyclePolicies []FileSystem_LifecyclePolicy `json:"LifecyclePolicies,omitempty"`
+
+	// PerformanceMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-efs-filesystem-performancemode
+	PerformanceMode *types.Value `json:"PerformanceMode,omitempty"`
+
+	// ProvisionedThroughputInMibps AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-efs-filesystem-provisionedthroughputinmibps
+	ProvisionedThroughputInMibps *types.Value `json:"ProvisionedThroughputInMibps,omitempty"`
+
+	// ThroughputMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-filesystem.html#cfn-efs-filesystem-throughputmode
+	ThroughputMode *types.Value `json:"ThroughputMode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::EFS::FileSystem"
+}
+
+// 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 FileSystem) MarshalJSON() ([]byte, error) {
+	type Properties FileSystem
+	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 *FileSystem) UnmarshalJSON(b []byte) error {
+	type Properties FileSystem
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FileSystem(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/efs/aws-efs-filesystem_backuppolicy.go b/goformation/cloudformation/efs/aws-efs-filesystem_backuppolicy.go
new file mode 100644
index 0000000000..420796080c
--- /dev/null
+++ b/goformation/cloudformation/efs/aws-efs-filesystem_backuppolicy.go
@@ -0,0 +1,37 @@
+package efs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FileSystem_BackupPolicy AWS CloudFormation Resource (AWS::EFS::FileSystem.BackupPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-filesystem-backuppolicy.html
+type FileSystem_BackupPolicy struct {
+
+	// Status AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-filesystem-backuppolicy.html#cfn-efs-filesystem-backuppolicy-status
+	Status *types.Value `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 *FileSystem_BackupPolicy) AWSCloudFormationType() string {
+	return "AWS::EFS::FileSystem.BackupPolicy"
+}
diff --git a/goformation/cloudformation/efs/aws-efs-filesystem_elasticfilesystemtag.go b/goformation/cloudformation/efs/aws-efs-filesystem_elasticfilesystemtag.go
new file mode 100644
index 0000000000..7478322bfe
--- /dev/null
+++ b/goformation/cloudformation/efs/aws-efs-filesystem_elasticfilesystemtag.go
@@ -0,0 +1,42 @@
+package efs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FileSystem_ElasticFileSystemTag AWS CloudFormation Resource (AWS::EFS::FileSystem.ElasticFileSystemTag)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-filesystem-elasticfilesystemtag.html
+type FileSystem_ElasticFileSystemTag struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-filesystem-elasticfilesystemtag.html#cfn-efs-filesystem-elasticfilesystemtag-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-filesystem-elasticfilesystemtag.html#cfn-efs-filesystem-elasticfilesystemtag-value
+	Value *types.Value `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 *FileSystem_ElasticFileSystemTag) AWSCloudFormationType() string {
+	return "AWS::EFS::FileSystem.ElasticFileSystemTag"
+}
diff --git a/goformation/cloudformation/efs/aws-efs-filesystem_lifecyclepolicy.go b/goformation/cloudformation/efs/aws-efs-filesystem_lifecyclepolicy.go
new file mode 100644
index 0000000000..407bebf03e
--- /dev/null
+++ b/goformation/cloudformation/efs/aws-efs-filesystem_lifecyclepolicy.go
@@ -0,0 +1,42 @@
+package efs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FileSystem_LifecyclePolicy AWS CloudFormation Resource (AWS::EFS::FileSystem.LifecyclePolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-filesystem-lifecyclepolicy.html
+type FileSystem_LifecyclePolicy struct {
+
+	// TransitionToIA AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-filesystem-lifecyclepolicy.html#cfn-efs-filesystem-lifecyclepolicy-transitiontoia
+	TransitionToIA *types.Value `json:"TransitionToIA,omitempty"`
+
+	// TransitionToPrimaryStorageClass AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-efs-filesystem-lifecyclepolicy.html#cfn-efs-filesystem-lifecyclepolicy-transitiontoprimarystorageclass
+	TransitionToPrimaryStorageClass *types.Value `json:"TransitionToPrimaryStorageClass,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LifecyclePolicy) AWSCloudFormationType() string {
+	return "AWS::EFS::FileSystem.LifecyclePolicy"
+}
diff --git a/goformation/cloudformation/efs/aws-efs-mounttarget.go b/goformation/cloudformation/efs/aws-efs-mounttarget.go
new file mode 100644
index 0000000000..825aaa11e9
--- /dev/null
+++ b/goformation/cloudformation/efs/aws-efs-mounttarget.go
@@ -0,0 +1,123 @@
+package efs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MountTarget AWS CloudFormation Resource (AWS::EFS::MountTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-mounttarget.html
+type MountTarget struct {
+
+	// FileSystemId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-mounttarget.html#cfn-efs-mounttarget-filesystemid
+	FileSystemId *types.Value `json:"FileSystemId,omitempty"`
+
+	// IpAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-mounttarget.html#cfn-efs-mounttarget-ipaddress
+	IpAddress *types.Value `json:"IpAddress,omitempty"`
+
+	// SecurityGroups AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-mounttarget.html#cfn-efs-mounttarget-securitygroups
+	SecurityGroups *types.Value `json:"SecurityGroups,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-efs-mounttarget.html#cfn-efs-mounttarget-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MountTarget) AWSCloudFormationType() string {
+	return "AWS::EFS::MountTarget"
+}
+
+// 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 MountTarget) MarshalJSON() ([]byte, error) {
+	type Properties MountTarget
+	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 *MountTarget) UnmarshalJSON(b []byte) error {
+	type Properties MountTarget
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = MountTarget(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/eks/aws-eks-access-config.go b/goformation/cloudformation/eks/aws-eks-access-config.go
new file mode 100644
index 0000000000..91c5dc8c97
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-access-config.go
@@ -0,0 +1,21 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+)
+
+// Cluster_AccessConfig describes the access configuration for the cluster.
+type Cluster_AccessConfig struct {
+
+	// AuthenticationMode specifies the desired authentication mode for the cluster.
+	AuthenticationMode *types.Value
+
+	// BootstrapClusterCreatorAdminPermissions specifies whether the cluster creator IAM principal was set as a cluster
+	// admin access entry during cluster creation time.
+	BootstrapClusterCreatorAdminPermissions *types.Value
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Cluster_AccessConfig) AWSCloudFormationType() string {
+	return "AWS::EKS::Cluster.AccessConfig"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-access-entry.go b/goformation/cloudformation/eks/aws-eks-access-entry.go
new file mode 100644
index 0000000000..e5fee5eb8e
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-access-entry.go
@@ -0,0 +1,119 @@
+package eks
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+type AccessEntry struct {
+	PrincipalArn *types.Value `json:"PrincipalArn,omitempty"`
+
+	// ClusterName AWS CloudFormation Property
+	// Required: true
+	ClusterName *types.Value `json:"ClusterName,omitempty"`
+
+	KubernetesGroups *types.Value `json:"KubernetesGroups,omitempty"`
+
+	Username *types.Value `json:"Username,omitempty"`
+
+	AccessPolicies []AccessEntry_AccessPolicy `json:"AccessPolicies,omitempty"`
+
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	Tags []cloudformation.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 *AccessEntry) AWSCloudFormationType() string {
+	return "AWS::EKS::AccessEntry"
+}
+
+// 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 AccessEntry) MarshalJSON() ([]byte, error) {
+	type Properties AccessEntry
+	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 *AccessEntry) UnmarshalJSON(b []byte) error {
+	type Properties AccessEntry
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AccessEntry(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/eks/aws-eks-access-entry_access_scope.go b/goformation/cloudformation/eks/aws-eks-access-entry_access_scope.go
new file mode 100644
index 0000000000..dffe48d088
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-access-entry_access_scope.go
@@ -0,0 +1,20 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+)
+
+type AccessEntry_AccessScope struct {
+
+	// Effect AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-taint.html#cfn-eks-nodegroup-taint-effect
+	Type *types.Value `json:"Type,omitempty"`
+
+	Namespaces *types.Value `json:"Namespaces,omitempty"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AccessEntry_AccessScope) AWSCloudFormationType() string {
+	return "AWS::EKS::AccessEntry.AccessScope"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-access-entry_policy.go b/goformation/cloudformation/eks/aws-eks-access-entry_policy.go
new file mode 100644
index 0000000000..59574797d5
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-access-entry_policy.go
@@ -0,0 +1,33 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+type AccessEntry_AccessPolicy struct {
+	PolicyArn *types.Value `json:"PolicyArn,omitempty"`
+
+	AccessScope *AccessEntry_AccessScope `json:"AccessScope,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AccessEntry_AccessPolicy) AWSCloudFormationType() string {
+	return "AWS::EKS::AccessEntry.AccessPolicy"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-addon.go b/goformation/cloudformation/eks/aws-eks-addon.go
new file mode 100644
index 0000000000..8ad4689933
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-addon.go
@@ -0,0 +1,134 @@
+package eks
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Addon AWS CloudFormation Resource (AWS::EKS::Addon)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-addon.html
+type Addon struct {
+
+	// AddonName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-addon.html#cfn-eks-addon-addonname
+	AddonName *types.Value `json:"AddonName,omitempty"`
+
+	// AddonVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-addon.html#cfn-eks-addon-addonversion
+	AddonVersion *types.Value `json:"AddonVersion,omitempty"`
+
+	// ClusterName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-addon.html#cfn-eks-addon-clustername
+	ClusterName *types.Value `json:"ClusterName,omitempty"`
+
+	// ResolveConflicts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-addon.html#cfn-eks-addon-resolveconflicts
+	ResolveConflicts *types.Value `json:"ResolveConflicts,omitempty"`
+
+	// ServiceAccountRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-addon.html#cfn-eks-addon-serviceaccountrolearn
+	ServiceAccountRoleArn *types.Value `json:"ServiceAccountRoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-addon.html#cfn-eks-addon-tags
+	Tags []cloudformation.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 *Addon) AWSCloudFormationType() string {
+	return "AWS::EKS::Addon"
+}
+
+// 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 Addon) MarshalJSON() ([]byte, error) {
+	type Properties Addon
+	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 *Addon) UnmarshalJSON(b []byte) error {
+	type Properties Addon
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Addon(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/eks/aws-eks-cluster.go b/goformation/cloudformation/eks/aws-eks-cluster.go
new file mode 100644
index 0000000000..e5be2b193d
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-cluster.go
@@ -0,0 +1,164 @@
+package eks
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster AWS CloudFormation Resource (AWS::EKS::Cluster)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html
+type Cluster struct {
+
+	// EncryptionConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html#cfn-eks-cluster-encryptionconfig
+	EncryptionConfig []Cluster_EncryptionConfig `json:"EncryptionConfig,omitempty"`
+
+	AccessConfig *Cluster_AccessConfig `json:"AccessConfig,omitempty"`
+
+	BootstrapSelfManagedAddons *types.Value `json:"BootstrapSelfManagedAddons,omitempty"`
+
+	// KubernetesNetworkConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html#cfn-eks-cluster-kubernetesnetworkconfig
+	KubernetesNetworkConfig *Cluster_KubernetesNetworkConfig `json:"KubernetesNetworkConfig,omitempty"`
+
+	// Logging AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html#cfn-eks-cluster-logging
+	Logging *Cluster_Logging `json:"Logging,omitempty"`
+
+	ComputeConfig *Cluster_ComputeConfig `json:"ComputeConfig,omitempty"`
+
+	StorageConfig *Cluster_StorageConfig `json:"StorageConfig,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html#cfn-eks-cluster-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// OutpostConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html#cfn-eks-cluster-outpostconfig
+	OutpostConfig *Cluster_OutpostConfig `json:"OutpostConfig,omitempty"`
+
+	// ResourcesVpcConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html#cfn-eks-cluster-resourcesvpcconfig
+	ResourcesVpcConfig *Cluster_ResourcesVpcConfig `json:"ResourcesVpcConfig,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html#cfn-eks-cluster-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// RemoteNetworkConfig AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-remotenetworkconfig.html
+	RemoteNetworkConfig *Cluster_RemoteNetworkConfig `json:"RemoteNetworkConfig,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-cluster.html#cfn-eks-cluster-tags
+	Tags []cloudformation.Tag `json:"Tags,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 *types.Value `json:"Version,omitempty"`
+
+	ZonalShiftConfig *Cluster_ZonalShift `json:"ZonalShiftConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::EKS::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/eks/aws-eks-cluster_clusterlogging.go b/goformation/cloudformation/eks/aws-eks-cluster_clusterlogging.go
new file mode 100644
index 0000000000..f9668df361
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-cluster_clusterlogging.go
@@ -0,0 +1,35 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_ClusterLogging AWS CloudFormation Resource (AWS::EKS::Cluster.ClusterLogging)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-clusterlogging.html
+type Cluster_ClusterLogging struct {
+
+	// EnabledTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-clusterlogging.html#cfn-eks-cluster-clusterlogging-enabledtypes
+	EnabledTypes []Cluster_LoggingTypeConfig `json:"EnabledTypes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ClusterLogging) AWSCloudFormationType() string {
+	return "AWS::EKS::Cluster.ClusterLogging"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_compute_config.go b/goformation/cloudformation/eks/aws-eks-cluster_compute_config.go
new file mode 100644
index 0000000000..d1a3ef6573
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-cluster_compute_config.go
@@ -0,0 +1,37 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+type Cluster_ComputeConfig struct {
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	NodeRoleArn *types.Value `json:"NodeRoleArn,omitempty"`
+
+	ControllerRoleARN *types.Value `json:"ControllerRoleArn,omitempty"`
+
+	NodePools *types.Value `json:"NodePools,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ComputeConfig) AWSCloudFormationType() string {
+	return "AWS::EKS::Cluster.ComputeConfig"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_controlplaneplacement.go b/goformation/cloudformation/eks/aws-eks-cluster_controlplaneplacement.go
new file mode 100644
index 0000000000..cda6da5b34
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-cluster_controlplaneplacement.go
@@ -0,0 +1,37 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_ControlPlanePlacement AWS CloudFormation Resource (AWS::EKS::Cluster.ControlPlanePlacement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-controlplaneplacement.html
+type Cluster_ControlPlanePlacement struct {
+
+	// GroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-controlplaneplacement.html#cfn-eks-cluster-controlplaneplacement-groupname
+	GroupName *types.Value `json:"GroupName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ControlPlanePlacement) AWSCloudFormationType() string {
+	return "AWS::EKS::Cluster.ControlPlanePlacement"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_elastic_loadbalancing.go b/goformation/cloudformation/eks/aws-eks-cluster_elastic_loadbalancing.go
new file mode 100644
index 0000000000..fe31c819b6
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-cluster_elastic_loadbalancing.go
@@ -0,0 +1,31 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+type Cluster_ElasticLoadBalancing struct {
+	Enabled *types.Value `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_ElasticLoadBalancing) AWSCloudFormationType() string {
+	return "AWS::EKS::Cluster.ElasticLoadBalancing"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_encryptionconfig.go b/goformation/cloudformation/eks/aws-eks-cluster_encryptionconfig.go
new file mode 100644
index 0000000000..5ad1688819
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-cluster_encryptionconfig.go
@@ -0,0 +1,42 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_EncryptionConfig AWS CloudFormation Resource (AWS::EKS::Cluster.EncryptionConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-encryptionconfig.html
+type Cluster_EncryptionConfig struct {
+
+	// Provider AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-encryptionconfig.html#cfn-eks-cluster-encryptionconfig-provider
+	Provider *Cluster_Provider `json:"Provider,omitempty"`
+
+	// Resources AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-encryptionconfig.html#cfn-eks-cluster-encryptionconfig-resources
+	Resources *types.Value `json:"Resources,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EncryptionConfig) AWSCloudFormationType() string {
+	return "AWS::EKS::Cluster.EncryptionConfig"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_kubernetesnetworkconfig.go b/goformation/cloudformation/eks/aws-eks-cluster_kubernetesnetworkconfig.go
new file mode 100644
index 0000000000..d65552d92b
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-cluster_kubernetesnetworkconfig.go
@@ -0,0 +1,49 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_KubernetesNetworkConfig AWS CloudFormation Resource (AWS::EKS::Cluster.KubernetesNetworkConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-kubernetesnetworkconfig.html
+type Cluster_KubernetesNetworkConfig struct {
+
+	// IpFamily AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-kubernetesnetworkconfig.html#cfn-eks-cluster-kubernetesnetworkconfig-ipfamily
+	IpFamily *types.Value `json:"IpFamily,omitempty"`
+
+	// ServiceIpv4Cidr AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-kubernetesnetworkconfig.html#cfn-eks-cluster-kubernetesnetworkconfig-serviceipv4cidr
+	ServiceIpv4Cidr *types.Value `json:"ServiceIpv4Cidr,omitempty"`
+
+	// ServiceIpv6Cidr AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-kubernetesnetworkconfig.html#cfn-eks-cluster-kubernetesnetworkconfig-serviceipv6cidr
+	ServiceIpv6Cidr *types.Value `json:"ServiceIpv6Cidr,omitempty"`
+
+	ElasticLoadBalancing *Cluster_ElasticLoadBalancing `json:"ElasticLoadBalancing,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_KubernetesNetworkConfig) AWSCloudFormationType() string {
+	return "AWS::EKS::Cluster.KubernetesNetworkConfig"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_logging.go b/goformation/cloudformation/eks/aws-eks-cluster_logging.go
new file mode 100644
index 0000000000..ae6030c59a
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-cluster_logging.go
@@ -0,0 +1,35 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_Logging AWS CloudFormation Resource (AWS::EKS::Cluster.Logging)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-logging.html
+type Cluster_Logging struct {
+
+	// ClusterLogging AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-logging.html#cfn-eks-cluster-logging-clusterlogging
+	ClusterLogging *Cluster_ClusterLogging `json:"ClusterLogging,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Logging) AWSCloudFormationType() string {
+	return "AWS::EKS::Cluster.Logging"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_loggingtypeconfig.go b/goformation/cloudformation/eks/aws-eks-cluster_loggingtypeconfig.go
new file mode 100644
index 0000000000..0f8c9ba5a0
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-cluster_loggingtypeconfig.go
@@ -0,0 +1,37 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_LoggingTypeConfig AWS CloudFormation Resource (AWS::EKS::Cluster.LoggingTypeConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-loggingtypeconfig.html
+type Cluster_LoggingTypeConfig struct {
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-loggingtypeconfig.html#cfn-eks-cluster-loggingtypeconfig-type
+	Type *types.Value `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 *Cluster_LoggingTypeConfig) AWSCloudFormationType() string {
+	return "AWS::EKS::Cluster.LoggingTypeConfig"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_outpostconfig.go b/goformation/cloudformation/eks/aws-eks-cluster_outpostconfig.go
new file mode 100644
index 0000000000..5575687911
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-cluster_outpostconfig.go
@@ -0,0 +1,47 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_OutpostConfig AWS CloudFormation Resource (AWS::EKS::Cluster.OutpostConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-outpostconfig.html
+type Cluster_OutpostConfig struct {
+
+	// ControlPlaneInstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-outpostconfig.html#cfn-eks-cluster-outpostconfig-controlplaneinstancetype
+	ControlPlaneInstanceType *types.Value `json:"ControlPlaneInstanceType,omitempty"`
+
+	// ControlPlanePlacement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-outpostconfig.html#cfn-eks-cluster-outpostconfig-controlplaneplacement
+	ControlPlanePlacement *Cluster_ControlPlanePlacement `json:"ControlPlanePlacement,omitempty"`
+
+	// OutpostArns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-outpostconfig.html#cfn-eks-cluster-outpostconfig-outpostarns
+	OutpostArns *types.Value `json:"OutpostArns,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_OutpostConfig) AWSCloudFormationType() string {
+	return "AWS::EKS::Cluster.OutpostConfig"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_provider.go b/goformation/cloudformation/eks/aws-eks-cluster_provider.go
new file mode 100644
index 0000000000..e23dc89074
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-cluster_provider.go
@@ -0,0 +1,37 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_Provider AWS CloudFormation Resource (AWS::EKS::Cluster.Provider)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-provider.html
+type Cluster_Provider struct {
+
+	// KeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-provider.html#cfn-eks-cluster-provider-keyarn
+	KeyArn *types.Value `json:"KeyArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Provider) AWSCloudFormationType() string {
+	return "AWS::EKS::Cluster.Provider"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_remotenetworks.go b/goformation/cloudformation/eks/aws-eks-cluster_remotenetworks.go
new file mode 100644
index 0000000000..731c5960a0
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-cluster_remotenetworks.go
@@ -0,0 +1,17 @@
+package eks
+
+import "goformation/v4/cloudformation/types"
+
+type Cluster_RemoteNetworkConfig struct {
+	RemotePodNetworks  []RemoteNetworks `json:"RemotePodNetworks,omitempty"`
+	RemoteNodeNetworks []RemoteNetworks `json:"RemoteNodeNetworks,omitempty"`
+}
+
+type RemoteNetworks struct {
+	CIDRs *types.Value `json:"Cidrs"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Cluster_RemoteNetworkConfig) AWSCloudFormationType() string {
+	return "AWS::EKS::Cluster.RemoteNetworkConfig"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_resourcesvpcconfig.go b/goformation/cloudformation/eks/aws-eks-cluster_resourcesvpcconfig.go
new file mode 100644
index 0000000000..1f92d524a4
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-cluster_resourcesvpcconfig.go
@@ -0,0 +1,57 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_ResourcesVpcConfig AWS CloudFormation Resource (AWS::EKS::Cluster.ResourcesVpcConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-resourcesvpcconfig.html
+type Cluster_ResourcesVpcConfig struct {
+
+	// EndpointPrivateAccess AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-resourcesvpcconfig.html#cfn-eks-cluster-resourcesvpcconfig-endpointprivateaccess
+	EndpointPrivateAccess *types.Value `json:"EndpointPrivateAccess,omitempty"`
+
+	// EndpointPublicAccess AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-resourcesvpcconfig.html#cfn-eks-cluster-resourcesvpcconfig-endpointpublicaccess
+	EndpointPublicAccess *types.Value `json:"EndpointPublicAccess,omitempty"`
+
+	// PublicAccessCidrs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-resourcesvpcconfig.html#cfn-eks-cluster-resourcesvpcconfig-publicaccesscidrs
+	PublicAccessCidrs *types.Value `json:"PublicAccessCidrs,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-resourcesvpcconfig.html#cfn-eks-cluster-resourcesvpcconfig-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-cluster-resourcesvpcconfig.html#cfn-eks-cluster-resourcesvpcconfig-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Cluster_ResourcesVpcConfig) AWSCloudFormationType() string {
+	return "AWS::EKS::Cluster.ResourcesVpcConfig"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_storage_config.go b/goformation/cloudformation/eks/aws-eks-cluster_storage_config.go
new file mode 100644
index 0000000000..788e987559
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-cluster_storage_config.go
@@ -0,0 +1,55 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+type Cluster_StorageConfig struct {
+	BlockStorage *Cluster_BlockStorage `json:"BlockStorage,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_StorageConfig) AWSCloudFormationType() string {
+	return "AWS::EKS::Cluster.StorageConfig"
+}
+
+type Cluster_BlockStorage struct {
+	Enabled *types.Value `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_BlockStorage) AWSCloudFormationType() string {
+	return "AWS::EKS::Cluster.BlockStorage"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-cluster_zonal-shift.go b/goformation/cloudformation/eks/aws-eks-cluster_zonal-shift.go
new file mode 100644
index 0000000000..94b64c4b1a
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-cluster_zonal-shift.go
@@ -0,0 +1,31 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+type Cluster_ZonalShift struct {
+	Enabled *types.Value `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 (*Cluster_ZonalShift) AWSCloudFormationType() string {
+	return "AWS::EKS::Cluster.ZonalShift"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-fargateprofile.go b/goformation/cloudformation/eks/aws-eks-fargateprofile.go
new file mode 100644
index 0000000000..80faeda88e
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-fargateprofile.go
@@ -0,0 +1,134 @@
+package eks
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// FargateProfile AWS CloudFormation Resource (AWS::EKS::FargateProfile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-fargateprofile.html
+type FargateProfile struct {
+
+	// ClusterName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-fargateprofile.html#cfn-eks-fargateprofile-clustername
+	ClusterName *types.Value `json:"ClusterName,omitempty"`
+
+	// FargateProfileName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-fargateprofile.html#cfn-eks-fargateprofile-fargateprofilename
+	FargateProfileName *types.Value `json:"FargateProfileName,omitempty"`
+
+	// PodExecutionRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-fargateprofile.html#cfn-eks-fargateprofile-podexecutionrolearn
+	PodExecutionRoleArn *types.Value `json:"PodExecutionRoleArn,omitempty"`
+
+	// Selectors AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-fargateprofile.html#cfn-eks-fargateprofile-selectors
+	Selectors []FargateProfile_Selector `json:"Selectors,omitempty"`
+
+	// Subnets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-fargateprofile.html#cfn-eks-fargateprofile-subnets
+	Subnets *types.Value `json:"Subnets,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-fargateprofile.html#cfn-eks-fargateprofile-tags
+	Tags []cloudformation.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 *FargateProfile) AWSCloudFormationType() string {
+	return "AWS::EKS::FargateProfile"
+}
+
+// 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 FargateProfile) MarshalJSON() ([]byte, error) {
+	type Properties FargateProfile
+	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 *FargateProfile) UnmarshalJSON(b []byte) error {
+	type Properties FargateProfile
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FargateProfile(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/eks/aws-eks-fargateprofile_label.go b/goformation/cloudformation/eks/aws-eks-fargateprofile_label.go
new file mode 100644
index 0000000000..4d5e7c78dc
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-fargateprofile_label.go
@@ -0,0 +1,42 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FargateProfile_Label AWS CloudFormation Resource (AWS::EKS::FargateProfile.Label)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-fargateprofile-label.html
+type FargateProfile_Label struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-fargateprofile-label.html#cfn-eks-fargateprofile-label-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-fargateprofile-label.html#cfn-eks-fargateprofile-label-value
+	Value *types.Value `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 *FargateProfile_Label) AWSCloudFormationType() string {
+	return "AWS::EKS::FargateProfile.Label"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-fargateprofile_selector.go b/goformation/cloudformation/eks/aws-eks-fargateprofile_selector.go
new file mode 100644
index 0000000000..38a347da08
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-fargateprofile_selector.go
@@ -0,0 +1,42 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FargateProfile_Selector AWS CloudFormation Resource (AWS::EKS::FargateProfile.Selector)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-fargateprofile-selector.html
+type FargateProfile_Selector struct {
+
+	// Labels AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-fargateprofile-selector.html#cfn-eks-fargateprofile-selector-labels
+	Labels []FargateProfile_Label `json:"Labels,omitempty"`
+
+	// Namespace AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-fargateprofile-selector.html#cfn-eks-fargateprofile-selector-namespace
+	Namespace *types.Value `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 *FargateProfile_Selector) AWSCloudFormationType() string {
+	return "AWS::EKS::FargateProfile.Selector"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-identityproviderconfig.go b/goformation/cloudformation/eks/aws-eks-identityproviderconfig.go
new file mode 100644
index 0000000000..d9306cf585
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-identityproviderconfig.go
@@ -0,0 +1,129 @@
+package eks
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// IdentityProviderConfig AWS CloudFormation Resource (AWS::EKS::IdentityProviderConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-identityproviderconfig.html
+type IdentityProviderConfig struct {
+
+	// ClusterName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-identityproviderconfig.html#cfn-eks-identityproviderconfig-clustername
+	ClusterName *types.Value `json:"ClusterName,omitempty"`
+
+	// IdentityProviderConfigName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-identityproviderconfig.html#cfn-eks-identityproviderconfig-identityproviderconfigname
+	IdentityProviderConfigName *types.Value `json:"IdentityProviderConfigName,omitempty"`
+
+	// Oidc AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-identityproviderconfig.html#cfn-eks-identityproviderconfig-oidc
+	Oidc *IdentityProviderConfig_OidcIdentityProviderConfig `json:"Oidc,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-identityproviderconfig.html#cfn-eks-identityproviderconfig-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-identityproviderconfig.html#cfn-eks-identityproviderconfig-type
+	Type *types.Value `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 *IdentityProviderConfig) AWSCloudFormationType() string {
+	return "AWS::EKS::IdentityProviderConfig"
+}
+
+// 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 IdentityProviderConfig) MarshalJSON() ([]byte, error) {
+	type Properties IdentityProviderConfig
+	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 *IdentityProviderConfig) UnmarshalJSON(b []byte) error {
+	type Properties IdentityProviderConfig
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = IdentityProviderConfig(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/eks/aws-eks-identityproviderconfig_oidcidentityproviderconfig.go b/goformation/cloudformation/eks/aws-eks-identityproviderconfig_oidcidentityproviderconfig.go
new file mode 100644
index 0000000000..b73426b155
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-identityproviderconfig_oidcidentityproviderconfig.go
@@ -0,0 +1,67 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// IdentityProviderConfig_OidcIdentityProviderConfig AWS CloudFormation Resource (AWS::EKS::IdentityProviderConfig.OidcIdentityProviderConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-identityproviderconfig-oidcidentityproviderconfig.html
+type IdentityProviderConfig_OidcIdentityProviderConfig struct {
+
+	// ClientId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-identityproviderconfig-oidcidentityproviderconfig.html#cfn-eks-identityproviderconfig-oidcidentityproviderconfig-clientid
+	ClientId *types.Value `json:"ClientId,omitempty"`
+
+	// GroupsClaim AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-identityproviderconfig-oidcidentityproviderconfig.html#cfn-eks-identityproviderconfig-oidcidentityproviderconfig-groupsclaim
+	GroupsClaim *types.Value `json:"GroupsClaim,omitempty"`
+
+	// GroupsPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-identityproviderconfig-oidcidentityproviderconfig.html#cfn-eks-identityproviderconfig-oidcidentityproviderconfig-groupsprefix
+	GroupsPrefix *types.Value `json:"GroupsPrefix,omitempty"`
+
+	// IssuerUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-identityproviderconfig-oidcidentityproviderconfig.html#cfn-eks-identityproviderconfig-oidcidentityproviderconfig-issuerurl
+	IssuerUrl *types.Value `json:"IssuerUrl,omitempty"`
+
+	// RequiredClaims AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-identityproviderconfig-oidcidentityproviderconfig.html#cfn-eks-identityproviderconfig-oidcidentityproviderconfig-requiredclaims
+	RequiredClaims []IdentityProviderConfig_RequiredClaim `json:"RequiredClaims,omitempty"`
+
+	// UsernameClaim AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-identityproviderconfig-oidcidentityproviderconfig.html#cfn-eks-identityproviderconfig-oidcidentityproviderconfig-usernameclaim
+	UsernameClaim *types.Value `json:"UsernameClaim,omitempty"`
+
+	// UsernamePrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-identityproviderconfig-oidcidentityproviderconfig.html#cfn-eks-identityproviderconfig-oidcidentityproviderconfig-usernameprefix
+	UsernamePrefix *types.Value `json:"UsernamePrefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *IdentityProviderConfig_OidcIdentityProviderConfig) AWSCloudFormationType() string {
+	return "AWS::EKS::IdentityProviderConfig.OidcIdentityProviderConfig"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-identityproviderconfig_requiredclaim.go b/goformation/cloudformation/eks/aws-eks-identityproviderconfig_requiredclaim.go
new file mode 100644
index 0000000000..aef9fa055e
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-identityproviderconfig_requiredclaim.go
@@ -0,0 +1,42 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// IdentityProviderConfig_RequiredClaim AWS CloudFormation Resource (AWS::EKS::IdentityProviderConfig.RequiredClaim)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-identityproviderconfig-requiredclaim.html
+type IdentityProviderConfig_RequiredClaim struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-identityproviderconfig-requiredclaim.html#cfn-eks-identityproviderconfig-requiredclaim-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-identityproviderconfig-requiredclaim.html#cfn-eks-identityproviderconfig-requiredclaim-value
+	Value *types.Value `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 *IdentityProviderConfig_RequiredClaim) AWSCloudFormationType() string {
+	return "AWS::EKS::IdentityProviderConfig.RequiredClaim"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-nodegroup.go b/goformation/cloudformation/eks/aws-eks-nodegroup.go
new file mode 100644
index 0000000000..4e06e8349f
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-nodegroup.go
@@ -0,0 +1,193 @@
+package eks
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Nodegroup AWS CloudFormation Resource (AWS::EKS::Nodegroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html
+type Nodegroup struct {
+
+	// AmiType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-amitype
+	AmiType *types.Value `json:"AmiType,omitempty"`
+
+	// CapacityType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-capacitytype
+	CapacityType *types.Value `json:"CapacityType,omitempty"`
+
+	// ClusterName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-clustername
+	ClusterName *types.Value `json:"ClusterName,omitempty"`
+
+	// DiskSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-disksize
+	DiskSize *types.Value `json:"DiskSize,omitempty"`
+
+	// ForceUpdateEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-forceupdateenabled
+	ForceUpdateEnabled *types.Value `json:"ForceUpdateEnabled,omitempty"`
+
+	// InstanceTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-instancetypes
+	InstanceTypes *types.Value `json:"InstanceTypes,omitempty"`
+
+	// Labels AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-labels
+	Labels interface{} `json:"Labels,omitempty"`
+
+	// LaunchTemplate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-launchtemplate
+	LaunchTemplate *Nodegroup_LaunchTemplateSpecification `json:"LaunchTemplate,omitempty"`
+
+	// NodeRole AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-noderole
+	NodeRole *types.Value `json:"NodeRole,omitempty"`
+
+	// NodegroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-nodegroupname
+	NodegroupName *types.Value `json:"NodegroupName,omitempty"`
+
+	// ReleaseVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-releaseversion
+	ReleaseVersion *types.Value `json:"ReleaseVersion,omitempty"`
+
+	// RemoteAccess AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-remoteaccess
+	RemoteAccess *Nodegroup_RemoteAccess `json:"RemoteAccess,omitempty"`
+
+	// ScalingConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-scalingconfig
+	ScalingConfig *Nodegroup_ScalingConfig `json:"ScalingConfig,omitempty"`
+
+	// Subnets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-subnets
+	Subnets *types.Value `json:"Subnets,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-tags
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// Taints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-taints
+	Taints []Nodegroup_Taint `json:"Taints,omitempty"`
+
+	// UpdateConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-updateconfig
+	UpdateConfig *Nodegroup_UpdateConfig `json:"UpdateConfig,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eks-nodegroup.html#cfn-eks-nodegroup-version
+	Version *types.Value `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 *Nodegroup) AWSCloudFormationType() string {
+	return "AWS::EKS::Nodegroup"
+}
+
+// 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 Nodegroup) MarshalJSON() ([]byte, error) {
+	type Properties Nodegroup
+	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 *Nodegroup) UnmarshalJSON(b []byte) error {
+	type Properties Nodegroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Nodegroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/eks/aws-eks-nodegroup_launchtemplatespecification.go b/goformation/cloudformation/eks/aws-eks-nodegroup_launchtemplatespecification.go
new file mode 100644
index 0000000000..cff957239b
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-nodegroup_launchtemplatespecification.go
@@ -0,0 +1,47 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Nodegroup_LaunchTemplateSpecification AWS CloudFormation Resource (AWS::EKS::Nodegroup.LaunchTemplateSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-launchtemplatespecification.html
+type Nodegroup_LaunchTemplateSpecification struct {
+
+	// Id AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-launchtemplatespecification.html#cfn-eks-nodegroup-launchtemplatespecification-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-launchtemplatespecification.html#cfn-eks-nodegroup-launchtemplatespecification-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-launchtemplatespecification.html#cfn-eks-nodegroup-launchtemplatespecification-version
+	Version *types.Value `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 *Nodegroup_LaunchTemplateSpecification) AWSCloudFormationType() string {
+	return "AWS::EKS::Nodegroup.LaunchTemplateSpecification"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-nodegroup_remoteaccess.go b/goformation/cloudformation/eks/aws-eks-nodegroup_remoteaccess.go
new file mode 100644
index 0000000000..da451d2bb3
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-nodegroup_remoteaccess.go
@@ -0,0 +1,42 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Nodegroup_RemoteAccess AWS CloudFormation Resource (AWS::EKS::Nodegroup.RemoteAccess)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-remoteaccess.html
+type Nodegroup_RemoteAccess struct {
+
+	// Ec2SshKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-remoteaccess.html#cfn-eks-nodegroup-remoteaccess-ec2sshkey
+	Ec2SshKey *types.Value `json:"Ec2SshKey,omitempty"`
+
+	// SourceSecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-remoteaccess.html#cfn-eks-nodegroup-remoteaccess-sourcesecuritygroups
+	SourceSecurityGroups *types.Value `json:"SourceSecurityGroups,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Nodegroup_RemoteAccess) AWSCloudFormationType() string {
+	return "AWS::EKS::Nodegroup.RemoteAccess"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-nodegroup_scalingconfig.go b/goformation/cloudformation/eks/aws-eks-nodegroup_scalingconfig.go
new file mode 100644
index 0000000000..c1443b7c18
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-nodegroup_scalingconfig.go
@@ -0,0 +1,47 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Nodegroup_ScalingConfig AWS CloudFormation Resource (AWS::EKS::Nodegroup.ScalingConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-scalingconfig.html
+type Nodegroup_ScalingConfig struct {
+
+	// DesiredSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-scalingconfig.html#cfn-eks-nodegroup-scalingconfig-desiredsize
+	DesiredSize *types.Value `json:"DesiredSize,omitempty"`
+
+	// MaxSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-scalingconfig.html#cfn-eks-nodegroup-scalingconfig-maxsize
+	MaxSize *types.Value `json:"MaxSize,omitempty"`
+
+	// MinSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-scalingconfig.html#cfn-eks-nodegroup-scalingconfig-minsize
+	MinSize *types.Value `json:"MinSize,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Nodegroup_ScalingConfig) AWSCloudFormationType() string {
+	return "AWS::EKS::Nodegroup.ScalingConfig"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-nodegroup_taint.go b/goformation/cloudformation/eks/aws-eks-nodegroup_taint.go
new file mode 100644
index 0000000000..c296d5e2e9
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-nodegroup_taint.go
@@ -0,0 +1,47 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Nodegroup_Taint AWS CloudFormation Resource (AWS::EKS::Nodegroup.Taint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-taint.html
+type Nodegroup_Taint struct {
+
+	// Effect AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-taint.html#cfn-eks-nodegroup-taint-effect
+	Effect *types.Value `json:"Effect,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-taint.html#cfn-eks-nodegroup-taint-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-taint.html#cfn-eks-nodegroup-taint-value
+	Value *types.Value `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 *Nodegroup_Taint) AWSCloudFormationType() string {
+	return "AWS::EKS::Nodegroup.Taint"
+}
diff --git a/goformation/cloudformation/eks/aws-eks-nodegroup_taints.go b/goformation/cloudformation/eks/aws-eks-nodegroup_taints.go
new file mode 100644
index 0000000000..eb79342026
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-nodegroup_taints.go
@@ -0,0 +1,12 @@
+package eks
+
+import "goformation/v4/cloudformation/types"
+
+// Nodegroup_Taints AWS CloudFormation Resource (AWS::EKS::Nodegroup.Taints)
+// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-taint.html
+type Nodegroup_Taints struct {
+	// TODO documentation
+	Key    *types.Value `json:"Key,omitempty"`
+	Value  *types.Value `json:"Value,omitempty"`
+	Effect *types.Value `json:"Effect,omitempty"`
+}
diff --git a/goformation/cloudformation/eks/aws-eks-nodegroup_updateconfig.go b/goformation/cloudformation/eks/aws-eks-nodegroup_updateconfig.go
new file mode 100644
index 0000000000..ef6244875c
--- /dev/null
+++ b/goformation/cloudformation/eks/aws-eks-nodegroup_updateconfig.go
@@ -0,0 +1,42 @@
+package eks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Nodegroup_UpdateConfig AWS CloudFormation Resource (AWS::EKS::Nodegroup.UpdateConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-updateconfig.html
+type Nodegroup_UpdateConfig struct {
+
+	// MaxUnavailable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-updateconfig.html#cfn-eks-nodegroup-updateconfig-maxunavailable
+	MaxUnavailable *types.Value `json:"MaxUnavailable,omitempty"`
+
+	// MaxUnavailablePercentage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eks-nodegroup-updateconfig.html#cfn-eks-nodegroup-updateconfig-maxunavailablepercentage
+	MaxUnavailablePercentage *types.Value `json:"MaxUnavailablePercentage,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Nodegroup_UpdateConfig) AWSCloudFormationType() string {
+	return "AWS::EKS::Nodegroup.UpdateConfig"
+}
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-cachecluster.go b/goformation/cloudformation/elasticache/aws-elasticache-cachecluster.go
new file mode 100644
index 0000000000..a9cd717d57
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-cachecluster.go
@@ -0,0 +1,214 @@
+package elasticache
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// CacheCluster AWS CloudFormation Resource (AWS::ElastiCache::CacheCluster)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html
+type CacheCluster struct {
+
+	// AZMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-azmode
+	AZMode *types.Value `json:"AZMode,omitempty"`
+
+	// AutoMinorVersionUpgrade AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-autominorversionupgrade
+	AutoMinorVersionUpgrade *types.Value `json:"AutoMinorVersionUpgrade,omitempty"`
+
+	// CacheNodeType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-cachenodetype
+	CacheNodeType *types.Value `json:"CacheNodeType,omitempty"`
+
+	// CacheParameterGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-cacheparametergroupname
+	CacheParameterGroupName *types.Value `json:"CacheParameterGroupName,omitempty"`
+
+	// CacheSecurityGroupNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-cachesecuritygroupnames
+	CacheSecurityGroupNames *types.Value `json:"CacheSecurityGroupNames,omitempty"`
+
+	// CacheSubnetGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-cachesubnetgroupname
+	CacheSubnetGroupName *types.Value `json:"CacheSubnetGroupName,omitempty"`
+
+	// ClusterName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-clustername
+	ClusterName *types.Value `json:"ClusterName,omitempty"`
+
+	// Engine AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-engine
+	Engine *types.Value `json:"Engine,omitempty"`
+
+	// EngineVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-engineversion
+	EngineVersion *types.Value `json:"EngineVersion,omitempty"`
+
+	// LogDeliveryConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-logdeliveryconfigurations
+	LogDeliveryConfigurations []CacheCluster_LogDeliveryConfigurationRequest `json:"LogDeliveryConfigurations,omitempty"`
+
+	// NotificationTopicArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-notificationtopicarn
+	NotificationTopicArn *types.Value `json:"NotificationTopicArn,omitempty"`
+
+	// NumCacheNodes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-numcachenodes
+	NumCacheNodes *types.Value `json:"NumCacheNodes"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// PreferredAvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-preferredavailabilityzone
+	PreferredAvailabilityZone *types.Value `json:"PreferredAvailabilityZone,omitempty"`
+
+	// PreferredAvailabilityZones AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-preferredavailabilityzones
+	PreferredAvailabilityZones *types.Value `json:"PreferredAvailabilityZones,omitempty"`
+
+	// PreferredMaintenanceWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-preferredmaintenancewindow
+	PreferredMaintenanceWindow *types.Value `json:"PreferredMaintenanceWindow,omitempty"`
+
+	// SnapshotArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-snapshotarns
+	SnapshotArns *types.Value `json:"SnapshotArns,omitempty"`
+
+	// SnapshotName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-snapshotname
+	SnapshotName *types.Value `json:"SnapshotName,omitempty"`
+
+	// SnapshotRetentionLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-snapshotretentionlimit
+	SnapshotRetentionLimit *types.Value `json:"SnapshotRetentionLimit,omitempty"`
+
+	// SnapshotWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-snapshotwindow
+	SnapshotWindow *types.Value `json:"SnapshotWindow,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VpcSecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cache-cluster.html#cfn-elasticache-cachecluster-vpcsecuritygroupids
+	VpcSecurityGroupIds *types.Value `json:"VpcSecurityGroupIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CacheCluster) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::CacheCluster"
+}
+
+// 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 CacheCluster) MarshalJSON() ([]byte, error) {
+	type Properties CacheCluster
+	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 *CacheCluster) UnmarshalJSON(b []byte) error {
+	type Properties CacheCluster
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CacheCluster(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_cloudwatchlogsdestinationdetails.go b/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_cloudwatchlogsdestinationdetails.go
new file mode 100644
index 0000000000..51aa7c78a2
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_cloudwatchlogsdestinationdetails.go
@@ -0,0 +1,37 @@
+package elasticache
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CacheCluster_CloudWatchLogsDestinationDetails AWS CloudFormation Resource (AWS::ElastiCache::CacheCluster.CloudWatchLogsDestinationDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cachecluster-cloudwatchlogsdestinationdetails.html
+type CacheCluster_CloudWatchLogsDestinationDetails struct {
+
+	// LogGroup AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cachecluster-cloudwatchlogsdestinationdetails.html#cfn-elasticache-cachecluster-cloudwatchlogsdestinationdetails-loggroup
+	LogGroup *types.Value `json:"LogGroup,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CacheCluster_CloudWatchLogsDestinationDetails) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::CacheCluster.CloudWatchLogsDestinationDetails"
+}
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_destinationdetails.go b/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_destinationdetails.go
new file mode 100644
index 0000000000..8384278cfc
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_destinationdetails.go
@@ -0,0 +1,40 @@
+package elasticache
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// CacheCluster_DestinationDetails AWS CloudFormation Resource (AWS::ElastiCache::CacheCluster.DestinationDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cachecluster-destinationdetails.html
+type CacheCluster_DestinationDetails struct {
+
+	// CloudWatchLogsDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cachecluster-destinationdetails.html#cfn-elasticache-cachecluster-destinationdetails-cloudwatchlogsdetails
+	CloudWatchLogsDetails *CacheCluster_CloudWatchLogsDestinationDetails `json:"CloudWatchLogsDetails,omitempty"`
+
+	// KinesisFirehoseDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cachecluster-destinationdetails.html#cfn-elasticache-cachecluster-destinationdetails-kinesisfirehosedetails
+	KinesisFirehoseDetails *CacheCluster_KinesisFirehoseDestinationDetails `json:"KinesisFirehoseDetails,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CacheCluster_DestinationDetails) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::CacheCluster.DestinationDetails"
+}
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_kinesisfirehosedestinationdetails.go b/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_kinesisfirehosedestinationdetails.go
new file mode 100644
index 0000000000..8ea3428139
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_kinesisfirehosedestinationdetails.go
@@ -0,0 +1,37 @@
+package elasticache
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CacheCluster_KinesisFirehoseDestinationDetails AWS CloudFormation Resource (AWS::ElastiCache::CacheCluster.KinesisFirehoseDestinationDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cachecluster-kinesisfirehosedestinationdetails.html
+type CacheCluster_KinesisFirehoseDestinationDetails struct {
+
+	// DeliveryStream AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cachecluster-kinesisfirehosedestinationdetails.html#cfn-elasticache-cachecluster-kinesisfirehosedestinationdetails-deliverystream
+	DeliveryStream *types.Value `json:"DeliveryStream,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CacheCluster_KinesisFirehoseDestinationDetails) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::CacheCluster.KinesisFirehoseDestinationDetails"
+}
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_logdeliveryconfigurationrequest.go b/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_logdeliveryconfigurationrequest.go
new file mode 100644
index 0000000000..a819934f65
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-cachecluster_logdeliveryconfigurationrequest.go
@@ -0,0 +1,52 @@
+package elasticache
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CacheCluster_LogDeliveryConfigurationRequest AWS CloudFormation Resource (AWS::ElastiCache::CacheCluster.LogDeliveryConfigurationRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cachecluster-logdeliveryconfigurationrequest.html
+type CacheCluster_LogDeliveryConfigurationRequest struct {
+
+	// DestinationDetails AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cachecluster-logdeliveryconfigurationrequest.html#cfn-elasticache-cachecluster-logdeliveryconfigurationrequest-destinationdetails
+	DestinationDetails *CacheCluster_DestinationDetails `json:"DestinationDetails,omitempty"`
+
+	// DestinationType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cachecluster-logdeliveryconfigurationrequest.html#cfn-elasticache-cachecluster-logdeliveryconfigurationrequest-destinationtype
+	DestinationType *types.Value `json:"DestinationType,omitempty"`
+
+	// LogFormat AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cachecluster-logdeliveryconfigurationrequest.html#cfn-elasticache-cachecluster-logdeliveryconfigurationrequest-logformat
+	LogFormat *types.Value `json:"LogFormat,omitempty"`
+
+	// LogType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-cachecluster-logdeliveryconfigurationrequest.html#cfn-elasticache-cachecluster-logdeliveryconfigurationrequest-logtype
+	LogType *types.Value `json:"LogType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CacheCluster_LogDeliveryConfigurationRequest) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::CacheCluster.LogDeliveryConfigurationRequest"
+}
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup.go b/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup.go
new file mode 100644
index 0000000000..5780f040de
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup.go
@@ -0,0 +1,148 @@
+package elasticache
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalReplicationGroup AWS CloudFormation Resource (AWS::ElastiCache::GlobalReplicationGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-globalreplicationgroup.html
+type GlobalReplicationGroup struct {
+
+	// AutomaticFailoverEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-globalreplicationgroup.html#cfn-elasticache-globalreplicationgroup-automaticfailoverenabled
+	AutomaticFailoverEnabled *types.Value `json:"AutomaticFailoverEnabled,omitempty"`
+
+	// CacheNodeType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-globalreplicationgroup.html#cfn-elasticache-globalreplicationgroup-cachenodetype
+	CacheNodeType *types.Value `json:"CacheNodeType,omitempty"`
+
+	// CacheParameterGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-globalreplicationgroup.html#cfn-elasticache-globalreplicationgroup-cacheparametergroupname
+	CacheParameterGroupName *types.Value `json:"CacheParameterGroupName,omitempty"`
+
+	// EngineVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-globalreplicationgroup.html#cfn-elasticache-globalreplicationgroup-engineversion
+	EngineVersion *types.Value `json:"EngineVersion,omitempty"`
+
+	// GlobalNodeGroupCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-globalreplicationgroup.html#cfn-elasticache-globalreplicationgroup-globalnodegroupcount
+	GlobalNodeGroupCount *types.Value `json:"GlobalNodeGroupCount,omitempty"`
+
+	// GlobalReplicationGroupDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-globalreplicationgroup.html#cfn-elasticache-globalreplicationgroup-globalreplicationgroupdescription
+	GlobalReplicationGroupDescription *types.Value `json:"GlobalReplicationGroupDescription,omitempty"`
+
+	// GlobalReplicationGroupIdSuffix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-globalreplicationgroup.html#cfn-elasticache-globalreplicationgroup-globalreplicationgroupidsuffix
+	GlobalReplicationGroupIdSuffix *types.Value `json:"GlobalReplicationGroupIdSuffix,omitempty"`
+
+	// Members AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-globalreplicationgroup.html#cfn-elasticache-globalreplicationgroup-members
+	Members []GlobalReplicationGroup_GlobalReplicationGroupMember `json:"Members,omitempty"`
+
+	// RegionalConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-globalreplicationgroup.html#cfn-elasticache-globalreplicationgroup-regionalconfigurations
+	RegionalConfigurations []GlobalReplicationGroup_RegionalConfiguration `json:"RegionalConfigurations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GlobalReplicationGroup) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::GlobalReplicationGroup"
+}
+
+// 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 GlobalReplicationGroup) MarshalJSON() ([]byte, error) {
+	type Properties GlobalReplicationGroup
+	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 *GlobalReplicationGroup) UnmarshalJSON(b []byte) error {
+	type Properties GlobalReplicationGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = GlobalReplicationGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_globalreplicationgroupmember.go b/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_globalreplicationgroupmember.go
new file mode 100644
index 0000000000..de3aab0f4d
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_globalreplicationgroupmember.go
@@ -0,0 +1,47 @@
+package elasticache
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalReplicationGroup_GlobalReplicationGroupMember AWS CloudFormation Resource (AWS::ElastiCache::GlobalReplicationGroup.GlobalReplicationGroupMember)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-globalreplicationgroup-globalreplicationgroupmember.html
+type GlobalReplicationGroup_GlobalReplicationGroupMember struct {
+
+	// ReplicationGroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-globalreplicationgroup-globalreplicationgroupmember.html#cfn-elasticache-globalreplicationgroup-globalreplicationgroupmember-replicationgroupid
+	ReplicationGroupId *types.Value `json:"ReplicationGroupId,omitempty"`
+
+	// ReplicationGroupRegion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-globalreplicationgroup-globalreplicationgroupmember.html#cfn-elasticache-globalreplicationgroup-globalreplicationgroupmember-replicationgroupregion
+	ReplicationGroupRegion *types.Value `json:"ReplicationGroupRegion,omitempty"`
+
+	// Role AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-globalreplicationgroup-globalreplicationgroupmember.html#cfn-elasticache-globalreplicationgroup-globalreplicationgroupmember-role
+	Role *types.Value `json:"Role,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GlobalReplicationGroup_GlobalReplicationGroupMember) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::GlobalReplicationGroup.GlobalReplicationGroupMember"
+}
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_regionalconfiguration.go b/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_regionalconfiguration.go
new file mode 100644
index 0000000000..a4bb2129c4
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_regionalconfiguration.go
@@ -0,0 +1,47 @@
+package elasticache
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalReplicationGroup_RegionalConfiguration AWS CloudFormation Resource (AWS::ElastiCache::GlobalReplicationGroup.RegionalConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-globalreplicationgroup-regionalconfiguration.html
+type GlobalReplicationGroup_RegionalConfiguration struct {
+
+	// ReplicationGroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-globalreplicationgroup-regionalconfiguration.html#cfn-elasticache-globalreplicationgroup-regionalconfiguration-replicationgroupid
+	ReplicationGroupId *types.Value `json:"ReplicationGroupId,omitempty"`
+
+	// ReplicationGroupRegion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-globalreplicationgroup-regionalconfiguration.html#cfn-elasticache-globalreplicationgroup-regionalconfiguration-replicationgroupregion
+	ReplicationGroupRegion *types.Value `json:"ReplicationGroupRegion,omitempty"`
+
+	// ReshardingConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-globalreplicationgroup-regionalconfiguration.html#cfn-elasticache-globalreplicationgroup-regionalconfiguration-reshardingconfigurations
+	ReshardingConfigurations []GlobalReplicationGroup_ReshardingConfiguration `json:"ReshardingConfigurations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GlobalReplicationGroup_RegionalConfiguration) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::GlobalReplicationGroup.RegionalConfiguration"
+}
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_reshardingconfiguration.go b/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_reshardingconfiguration.go
new file mode 100644
index 0000000000..7ed7bf2e90
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-globalreplicationgroup_reshardingconfiguration.go
@@ -0,0 +1,42 @@
+package elasticache
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalReplicationGroup_ReshardingConfiguration AWS CloudFormation Resource (AWS::ElastiCache::GlobalReplicationGroup.ReshardingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-globalreplicationgroup-reshardingconfiguration.html
+type GlobalReplicationGroup_ReshardingConfiguration struct {
+
+	// NodeGroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-globalreplicationgroup-reshardingconfiguration.html#cfn-elasticache-globalreplicationgroup-reshardingconfiguration-nodegroupid
+	NodeGroupId *types.Value `json:"NodeGroupId,omitempty"`
+
+	// PreferredAvailabilityZones AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-globalreplicationgroup-reshardingconfiguration.html#cfn-elasticache-globalreplicationgroup-reshardingconfiguration-preferredavailabilityzones
+	PreferredAvailabilityZones *types.Value `json:"PreferredAvailabilityZones,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GlobalReplicationGroup_ReshardingConfiguration) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::GlobalReplicationGroup.ReshardingConfiguration"
+}
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-parametergroup.go b/goformation/cloudformation/elasticache/aws-elasticache-parametergroup.go
new file mode 100644
index 0000000000..66d47549d3
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-parametergroup.go
@@ -0,0 +1,124 @@
+package elasticache
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ParameterGroup AWS CloudFormation Resource (AWS::ElastiCache::ParameterGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-parameter-group.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
+	CacheParameterGroupFamily *types.Value `json:"CacheParameterGroupFamily,omitempty"`
+
+	// 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
+	Description *types.Value `json:"Description,omitempty"`
+
+	// 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
+	Properties map[string]*types.Value `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
+	Tags []cloudformation.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 *ParameterGroup) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::ParameterGroup"
+}
+
+// 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 ParameterGroup) MarshalJSON() ([]byte, error) {
+	type Properties ParameterGroup
+	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 *ParameterGroup) UnmarshalJSON(b []byte) error {
+	type Properties ParameterGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ParameterGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup.go b/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup.go
new file mode 100644
index 0000000000..df8ffa140f
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup.go
@@ -0,0 +1,279 @@
+package elasticache
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReplicationGroup AWS CloudFormation Resource (AWS::ElastiCache::ReplicationGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html
+type ReplicationGroup struct {
+
+	// AtRestEncryptionEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-atrestencryptionenabled
+	AtRestEncryptionEnabled *types.Value `json:"AtRestEncryptionEnabled,omitempty"`
+
+	// AuthToken AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-authtoken
+	AuthToken *types.Value `json:"AuthToken,omitempty"`
+
+	// AutoMinorVersionUpgrade AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-autominorversionupgrade
+	AutoMinorVersionUpgrade *types.Value `json:"AutoMinorVersionUpgrade,omitempty"`
+
+	// AutomaticFailoverEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-automaticfailoverenabled
+	AutomaticFailoverEnabled *types.Value `json:"AutomaticFailoverEnabled,omitempty"`
+
+	// CacheNodeType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-cachenodetype
+	CacheNodeType *types.Value `json:"CacheNodeType,omitempty"`
+
+	// CacheParameterGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-cacheparametergroupname
+	CacheParameterGroupName *types.Value `json:"CacheParameterGroupName,omitempty"`
+
+	// CacheSecurityGroupNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-cachesecuritygroupnames
+	CacheSecurityGroupNames *types.Value `json:"CacheSecurityGroupNames,omitempty"`
+
+	// CacheSubnetGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-cachesubnetgroupname
+	CacheSubnetGroupName *types.Value `json:"CacheSubnetGroupName,omitempty"`
+
+	// DataTieringEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-datatieringenabled
+	DataTieringEnabled *types.Value `json:"DataTieringEnabled,omitempty"`
+
+	// Engine AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-engine
+	Engine *types.Value `json:"Engine,omitempty"`
+
+	// EngineVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-engineversion
+	EngineVersion *types.Value `json:"EngineVersion,omitempty"`
+
+	// GlobalReplicationGroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-globalreplicationgroupid
+	GlobalReplicationGroupId *types.Value `json:"GlobalReplicationGroupId,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// LogDeliveryConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-logdeliveryconfigurations
+	LogDeliveryConfigurations []ReplicationGroup_LogDeliveryConfigurationRequest `json:"LogDeliveryConfigurations,omitempty"`
+
+	// MultiAZEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-multiazenabled
+	MultiAZEnabled *types.Value `json:"MultiAZEnabled,omitempty"`
+
+	// NodeGroupConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-nodegroupconfiguration
+	NodeGroupConfiguration []ReplicationGroup_NodeGroupConfiguration `json:"NodeGroupConfiguration,omitempty"`
+
+	// NotificationTopicArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-notificationtopicarn
+	NotificationTopicArn *types.Value `json:"NotificationTopicArn,omitempty"`
+
+	// NumCacheClusters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-numcacheclusters
+	NumCacheClusters *types.Value `json:"NumCacheClusters,omitempty"`
+
+	// NumNodeGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-numnodegroups
+	NumNodeGroups *types.Value `json:"NumNodeGroups,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// PreferredCacheClusterAZs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-preferredcacheclusterazs
+	PreferredCacheClusterAZs *types.Value `json:"PreferredCacheClusterAZs,omitempty"`
+
+	// PreferredMaintenanceWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-preferredmaintenancewindow
+	PreferredMaintenanceWindow *types.Value `json:"PreferredMaintenanceWindow,omitempty"`
+
+	// PrimaryClusterId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-primaryclusterid
+	PrimaryClusterId *types.Value `json:"PrimaryClusterId,omitempty"`
+
+	// ReplicasPerNodeGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-replicaspernodegroup
+	ReplicasPerNodeGroup *types.Value `json:"ReplicasPerNodeGroup,omitempty"`
+
+	// ReplicationGroupDescription AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-replicationgroupdescription
+	ReplicationGroupDescription *types.Value `json:"ReplicationGroupDescription,omitempty"`
+
+	// ReplicationGroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-replicationgroupid
+	ReplicationGroupId *types.Value `json:"ReplicationGroupId,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SnapshotArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-snapshotarns
+	SnapshotArns *types.Value `json:"SnapshotArns,omitempty"`
+
+	// SnapshotName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-snapshotname
+	SnapshotName *types.Value `json:"SnapshotName,omitempty"`
+
+	// SnapshotRetentionLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-snapshotretentionlimit
+	SnapshotRetentionLimit *types.Value `json:"SnapshotRetentionLimit,omitempty"`
+
+	// SnapshotWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-snapshotwindow
+	SnapshotWindow *types.Value `json:"SnapshotWindow,omitempty"`
+
+	// SnapshottingClusterId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-snapshottingclusterid
+	SnapshottingClusterId *types.Value `json:"SnapshottingClusterId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TransitEncryptionEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-transitencryptionenabled
+	TransitEncryptionEnabled *types.Value `json:"TransitEncryptionEnabled,omitempty"`
+
+	// UserGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-replicationgroup.html#cfn-elasticache-replicationgroup-usergroupids
+	UserGroupIds *types.Value `json:"UserGroupIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReplicationGroup) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::ReplicationGroup"
+}
+
+// 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 ReplicationGroup) MarshalJSON() ([]byte, error) {
+	type Properties ReplicationGroup
+	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 *ReplicationGroup) UnmarshalJSON(b []byte) error {
+	type Properties ReplicationGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ReplicationGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_cloudwatchlogsdestinationdetails.go b/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_cloudwatchlogsdestinationdetails.go
new file mode 100644
index 0000000000..be96aab9bf
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_cloudwatchlogsdestinationdetails.go
@@ -0,0 +1,37 @@
+package elasticache
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReplicationGroup_CloudWatchLogsDestinationDetails AWS CloudFormation Resource (AWS::ElastiCache::ReplicationGroup.CloudWatchLogsDestinationDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-cloudwatchlogsdestinationdetails.html
+type ReplicationGroup_CloudWatchLogsDestinationDetails struct {
+
+	// LogGroup AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-cloudwatchlogsdestinationdetails.html#cfn-elasticache-replicationgroup-cloudwatchlogsdestinationdetails-loggroup
+	LogGroup *types.Value `json:"LogGroup,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReplicationGroup_CloudWatchLogsDestinationDetails) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::ReplicationGroup.CloudWatchLogsDestinationDetails"
+}
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_destinationdetails.go b/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_destinationdetails.go
new file mode 100644
index 0000000000..78bf0e5930
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_destinationdetails.go
@@ -0,0 +1,40 @@
+package elasticache
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReplicationGroup_DestinationDetails AWS CloudFormation Resource (AWS::ElastiCache::ReplicationGroup.DestinationDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-destinationdetails.html
+type ReplicationGroup_DestinationDetails struct {
+
+	// CloudWatchLogsDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-destinationdetails.html#cfn-elasticache-replicationgroup-destinationdetails-cloudwatchlogsdetails
+	CloudWatchLogsDetails *ReplicationGroup_CloudWatchLogsDestinationDetails `json:"CloudWatchLogsDetails,omitempty"`
+
+	// KinesisFirehoseDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-destinationdetails.html#cfn-elasticache-replicationgroup-destinationdetails-kinesisfirehosedetails
+	KinesisFirehoseDetails *ReplicationGroup_KinesisFirehoseDestinationDetails `json:"KinesisFirehoseDetails,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReplicationGroup_DestinationDetails) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::ReplicationGroup.DestinationDetails"
+}
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_kinesisfirehosedestinationdetails.go b/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_kinesisfirehosedestinationdetails.go
new file mode 100644
index 0000000000..60c2fcecfc
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_kinesisfirehosedestinationdetails.go
@@ -0,0 +1,37 @@
+package elasticache
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReplicationGroup_KinesisFirehoseDestinationDetails AWS CloudFormation Resource (AWS::ElastiCache::ReplicationGroup.KinesisFirehoseDestinationDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-kinesisfirehosedestinationdetails.html
+type ReplicationGroup_KinesisFirehoseDestinationDetails struct {
+
+	// DeliveryStream AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-kinesisfirehosedestinationdetails.html#cfn-elasticache-replicationgroup-kinesisfirehosedestinationdetails-deliverystream
+	DeliveryStream *types.Value `json:"DeliveryStream,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReplicationGroup_KinesisFirehoseDestinationDetails) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::ReplicationGroup.KinesisFirehoseDestinationDetails"
+}
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_logdeliveryconfigurationrequest.go b/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_logdeliveryconfigurationrequest.go
new file mode 100644
index 0000000000..af4ed5e1fa
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_logdeliveryconfigurationrequest.go
@@ -0,0 +1,52 @@
+package elasticache
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReplicationGroup_LogDeliveryConfigurationRequest AWS CloudFormation Resource (AWS::ElastiCache::ReplicationGroup.LogDeliveryConfigurationRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-logdeliveryconfigurationrequest.html
+type ReplicationGroup_LogDeliveryConfigurationRequest struct {
+
+	// DestinationDetails AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-logdeliveryconfigurationrequest.html#cfn-elasticache-replicationgroup-logdeliveryconfigurationrequest-destinationdetails
+	DestinationDetails *ReplicationGroup_DestinationDetails `json:"DestinationDetails,omitempty"`
+
+	// DestinationType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-logdeliveryconfigurationrequest.html#cfn-elasticache-replicationgroup-logdeliveryconfigurationrequest-destinationtype
+	DestinationType *types.Value `json:"DestinationType,omitempty"`
+
+	// LogFormat AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-logdeliveryconfigurationrequest.html#cfn-elasticache-replicationgroup-logdeliveryconfigurationrequest-logformat
+	LogFormat *types.Value `json:"LogFormat,omitempty"`
+
+	// LogType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-logdeliveryconfigurationrequest.html#cfn-elasticache-replicationgroup-logdeliveryconfigurationrequest-logtype
+	LogType *types.Value `json:"LogType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReplicationGroup_LogDeliveryConfigurationRequest) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::ReplicationGroup.LogDeliveryConfigurationRequest"
+}
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_nodegroupconfiguration.go b/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_nodegroupconfiguration.go
new file mode 100644
index 0000000000..5f2ca7907a
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-replicationgroup_nodegroupconfiguration.go
@@ -0,0 +1,57 @@
+package elasticache
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReplicationGroup_NodeGroupConfiguration AWS CloudFormation Resource (AWS::ElastiCache::ReplicationGroup.NodeGroupConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-nodegroupconfiguration.html
+type ReplicationGroup_NodeGroupConfiguration struct {
+
+	// NodeGroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-nodegroupconfiguration.html#cfn-elasticache-replicationgroup-nodegroupconfiguration-nodegroupid
+	NodeGroupId *types.Value `json:"NodeGroupId,omitempty"`
+
+	// PrimaryAvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-nodegroupconfiguration.html#cfn-elasticache-replicationgroup-nodegroupconfiguration-primaryavailabilityzone
+	PrimaryAvailabilityZone *types.Value `json:"PrimaryAvailabilityZone,omitempty"`
+
+	// ReplicaAvailabilityZones AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-nodegroupconfiguration.html#cfn-elasticache-replicationgroup-nodegroupconfiguration-replicaavailabilityzones
+	ReplicaAvailabilityZones *types.Value `json:"ReplicaAvailabilityZones,omitempty"`
+
+	// ReplicaCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-nodegroupconfiguration.html#cfn-elasticache-replicationgroup-nodegroupconfiguration-replicacount
+	ReplicaCount *types.Value `json:"ReplicaCount,omitempty"`
+
+	// Slots AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-replicationgroup-nodegroupconfiguration.html#cfn-elasticache-replicationgroup-nodegroupconfiguration-slots
+	Slots *types.Value `json:"Slots,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReplicationGroup_NodeGroupConfiguration) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::ReplicationGroup.NodeGroupConfiguration"
+}
diff --git a/goformation/cloudformation/elasticache/aws-elasticache-securitygroup.go b/goformation/cloudformation/elasticache/aws-elasticache-securitygroup.go
new file mode 100644
index 0000000000..24bf79611b
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-securitygroup.go
@@ -0,0 +1,114 @@
+package elasticache
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityGroup AWS CloudFormation Resource (AWS::ElastiCache::SecurityGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-security-group.html
+type SecurityGroup struct {
+
+	// Description AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-security-group.html#cfn-elasticache-securitygroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-security-group.html#cfn-elasticache-securitygroup-tags
+	Tags []cloudformation.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 *SecurityGroup) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::SecurityGroup"
+}
+
+// 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 SecurityGroup) MarshalJSON() ([]byte, error) {
+	type Properties SecurityGroup
+	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 *SecurityGroup) UnmarshalJSON(b []byte) error {
+	type Properties SecurityGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SecurityGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/elasticache/aws-elasticache-securitygroupingress.go b/goformation/cloudformation/elasticache/aws-elasticache-securitygroupingress.go
new file mode 100644
index 0000000000..b3146dd774
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-securitygroupingress.go
@@ -0,0 +1,118 @@
+package elasticache
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityGroupIngress AWS CloudFormation Resource (AWS::ElastiCache::SecurityGroupIngress)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-security-group-ingress.html
+type SecurityGroupIngress struct {
+
+	// CacheSecurityGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-security-group-ingress.html#cfn-elasticache-securitygroupingress-cachesecuritygroupname
+	CacheSecurityGroupName *types.Value `json:"CacheSecurityGroupName,omitempty"`
+
+	// EC2SecurityGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-security-group-ingress.html#cfn-elasticache-securitygroupingress-ec2securitygroupname
+	EC2SecurityGroupName *types.Value `json:"EC2SecurityGroupName,omitempty"`
+
+	// EC2SecurityGroupOwnerId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-security-group-ingress.html#cfn-elasticache-securitygroupingress-ec2securitygroupownerid
+	EC2SecurityGroupOwnerId *types.Value `json:"EC2SecurityGroupOwnerId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SecurityGroupIngress) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::SecurityGroupIngress"
+}
+
+// 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 SecurityGroupIngress) MarshalJSON() ([]byte, error) {
+	type Properties SecurityGroupIngress
+	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 *SecurityGroupIngress) UnmarshalJSON(b []byte) error {
+	type Properties SecurityGroupIngress
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SecurityGroupIngress(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/elasticache/aws-elasticache-subnetgroup.go b/goformation/cloudformation/elasticache/aws-elasticache-subnetgroup.go
new file mode 100644
index 0000000000..4a796a8808
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-subnetgroup.go
@@ -0,0 +1,124 @@
+package elasticache
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// SubnetGroup AWS CloudFormation Resource (AWS::ElastiCache::SubnetGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-subnetgroup.html
+type SubnetGroup struct {
+
+	// CacheSubnetGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-subnetgroup.html#cfn-elasticache-subnetgroup-cachesubnetgroupname
+	CacheSubnetGroupName *types.Value `json:"CacheSubnetGroupName,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-subnetgroup.html#cfn-elasticache-subnetgroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-subnetgroup.html#cfn-elasticache-subnetgroup-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticache-subnetgroup.html#cfn-elasticache-subnetgroup-tags
+	Tags []cloudformation.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 *SubnetGroup) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::SubnetGroup"
+}
+
+// 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 SubnetGroup) MarshalJSON() ([]byte, error) {
+	type Properties SubnetGroup
+	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 *SubnetGroup) UnmarshalJSON(b []byte) error {
+	type Properties SubnetGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SubnetGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/elasticache/aws-elasticache-user.go b/goformation/cloudformation/elasticache/aws-elasticache-user.go
new file mode 100644
index 0000000000..d822ed300d
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-user.go
@@ -0,0 +1,133 @@
+package elasticache
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// User AWS CloudFormation Resource (AWS::ElastiCache::User)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-user.html
+type User struct {
+
+	// AccessString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-user.html#cfn-elasticache-user-accessstring
+	AccessString *types.Value `json:"AccessString,omitempty"`
+
+	// Engine AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-user.html#cfn-elasticache-user-engine
+	Engine *types.Value `json:"Engine,omitempty"`
+
+	// NoPasswordRequired AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-user.html#cfn-elasticache-user-nopasswordrequired
+	NoPasswordRequired *types.Value `json:"NoPasswordRequired,omitempty"`
+
+	// Passwords AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-user.html#cfn-elasticache-user-passwords
+	Passwords *types.Value `json:"Passwords,omitempty"`
+
+	// UserId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-user.html#cfn-elasticache-user-userid
+	UserId *types.Value `json:"UserId,omitempty"`
+
+	// UserName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-user.html#cfn-elasticache-user-username
+	UserName *types.Value `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 *User) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::User"
+}
+
+// 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 User) MarshalJSON() ([]byte, error) {
+	type Properties User
+	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 *User) UnmarshalJSON(b []byte) error {
+	type Properties User
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = User(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/elasticache/aws-elasticache-usergroup.go b/goformation/cloudformation/elasticache/aws-elasticache-usergroup.go
new file mode 100644
index 0000000000..ecd5fe117f
--- /dev/null
+++ b/goformation/cloudformation/elasticache/aws-elasticache-usergroup.go
@@ -0,0 +1,118 @@
+package elasticache
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserGroup AWS CloudFormation Resource (AWS::ElastiCache::UserGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-usergroup.html
+type UserGroup struct {
+
+	// Engine AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-usergroup.html#cfn-elasticache-usergroup-engine
+	Engine *types.Value `json:"Engine,omitempty"`
+
+	// UserGroupId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-usergroup.html#cfn-elasticache-usergroup-usergroupid
+	UserGroupId *types.Value `json:"UserGroupId,omitempty"`
+
+	// UserIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticache-usergroup.html#cfn-elasticache-usergroup-userids
+	UserIds *types.Value `json:"UserIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserGroup) AWSCloudFormationType() string {
+	return "AWS::ElastiCache::UserGroup"
+}
+
+// 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 UserGroup) MarshalJSON() ([]byte, error) {
+	type Properties UserGroup
+	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 *UserGroup) UnmarshalJSON(b []byte) error {
+	type Properties UserGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = UserGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application.go b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application.go
new file mode 100644
index 0000000000..b969590dcb
--- /dev/null
+++ b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application.go
@@ -0,0 +1,118 @@
+package elasticbeanstalk
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application AWS CloudFormation Resource (AWS::ElasticBeanstalk::Application)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk.html
+type Application struct {
+
+	// ApplicationName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk.html#cfn-elasticbeanstalk-application-name
+	ApplicationName *types.Value `json:"ApplicationName,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk.html#cfn-elasticbeanstalk-application-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// ResourceLifecycleConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk.html#cfn-elasticbeanstalk-application-resourcelifecycleconfig
+	ResourceLifecycleConfig *Application_ApplicationResourceLifecycleConfig `json:"ResourceLifecycleConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::ElasticBeanstalk::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationresourcelifecycleconfig.go b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationresourcelifecycleconfig.go
new file mode 100644
index 0000000000..de43c7c21f
--- /dev/null
+++ b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationresourcelifecycleconfig.go
@@ -0,0 +1,42 @@
+package elasticbeanstalk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_ApplicationResourceLifecycleConfig AWS CloudFormation Resource (AWS::ElasticBeanstalk::Application.ApplicationResourceLifecycleConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-applicationresourcelifecycleconfig.html
+type Application_ApplicationResourceLifecycleConfig struct {
+
+	// ServiceRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-applicationresourcelifecycleconfig.html#cfn-elasticbeanstalk-application-applicationresourcelifecycleconfig-servicerole
+	ServiceRole *types.Value `json:"ServiceRole,omitempty"`
+
+	// VersionLifecycleConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-applicationresourcelifecycleconfig.html#cfn-elasticbeanstalk-application-applicationresourcelifecycleconfig-versionlifecycleconfig
+	VersionLifecycleConfig *Application_ApplicationVersionLifecycleConfig `json:"VersionLifecycleConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ApplicationResourceLifecycleConfig) AWSCloudFormationType() string {
+	return "AWS::ElasticBeanstalk::Application.ApplicationResourceLifecycleConfig"
+}
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationversionlifecycleconfig.go b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationversionlifecycleconfig.go
new file mode 100644
index 0000000000..7f8f55ed7f
--- /dev/null
+++ b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_applicationversionlifecycleconfig.go
@@ -0,0 +1,40 @@
+package elasticbeanstalk
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_ApplicationVersionLifecycleConfig AWS CloudFormation Resource (AWS::ElasticBeanstalk::Application.ApplicationVersionLifecycleConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-applicationversionlifecycleconfig.html
+type Application_ApplicationVersionLifecycleConfig struct {
+
+	// MaxAgeRule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-applicationversionlifecycleconfig.html#cfn-elasticbeanstalk-application-applicationversionlifecycleconfig-maxagerule
+	MaxAgeRule *Application_MaxAgeRule `json:"MaxAgeRule,omitempty"`
+
+	// MaxCountRule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-applicationversionlifecycleconfig.html#cfn-elasticbeanstalk-application-applicationversionlifecycleconfig-maxcountrule
+	MaxCountRule *Application_MaxCountRule `json:"MaxCountRule,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ApplicationVersionLifecycleConfig) AWSCloudFormationType() string {
+	return "AWS::ElasticBeanstalk::Application.ApplicationVersionLifecycleConfig"
+}
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxagerule.go b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxagerule.go
new file mode 100644
index 0000000000..d0c8a2432c
--- /dev/null
+++ b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxagerule.go
@@ -0,0 +1,47 @@
+package elasticbeanstalk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_MaxAgeRule AWS CloudFormation Resource (AWS::ElasticBeanstalk::Application.MaxAgeRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-maxagerule.html
+type Application_MaxAgeRule struct {
+
+	// DeleteSourceFromS3 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-maxagerule.html#cfn-elasticbeanstalk-application-maxagerule-deletesourcefroms3
+	DeleteSourceFromS3 *types.Value `json:"DeleteSourceFromS3,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-maxagerule.html#cfn-elasticbeanstalk-application-maxagerule-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// MaxAgeInDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-maxagerule.html#cfn-elasticbeanstalk-application-maxagerule-maxageindays
+	MaxAgeInDays *types.Value `json:"MaxAgeInDays,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_MaxAgeRule) AWSCloudFormationType() string {
+	return "AWS::ElasticBeanstalk::Application.MaxAgeRule"
+}
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxcountrule.go b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxcountrule.go
new file mode 100644
index 0000000000..62d36c32a6
--- /dev/null
+++ b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-application_maxcountrule.go
@@ -0,0 +1,47 @@
+package elasticbeanstalk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_MaxCountRule AWS CloudFormation Resource (AWS::ElasticBeanstalk::Application.MaxCountRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-maxcountrule.html
+type Application_MaxCountRule struct {
+
+	// DeleteSourceFromS3 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-maxcountrule.html#cfn-elasticbeanstalk-application-maxcountrule-deletesourcefroms3
+	DeleteSourceFromS3 *types.Value `json:"DeleteSourceFromS3,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-maxcountrule.html#cfn-elasticbeanstalk-application-maxcountrule-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// MaxCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-application-maxcountrule.html#cfn-elasticbeanstalk-application-maxcountrule-maxcount
+	MaxCount *types.Value `json:"MaxCount,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_MaxCountRule) AWSCloudFormationType() string {
+	return "AWS::ElasticBeanstalk::Application.MaxCountRule"
+}
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion.go b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion.go
new file mode 100644
index 0000000000..742a5c19a9
--- /dev/null
+++ b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion.go
@@ -0,0 +1,118 @@
+package elasticbeanstalk
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationVersion AWS CloudFormation Resource (AWS::ElasticBeanstalk::ApplicationVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-version.html
+type ApplicationVersion struct {
+
+	// ApplicationName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-version.html#cfn-elasticbeanstalk-applicationversion-applicationname
+	ApplicationName *types.Value `json:"ApplicationName,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-version.html#cfn-elasticbeanstalk-applicationversion-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// SourceBundle AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-version.html#cfn-elasticbeanstalk-applicationversion-sourcebundle
+	SourceBundle *ApplicationVersion_SourceBundle `json:"SourceBundle,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationVersion) AWSCloudFormationType() string {
+	return "AWS::ElasticBeanstalk::ApplicationVersion"
+}
+
+// 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 ApplicationVersion) MarshalJSON() ([]byte, error) {
+	type Properties ApplicationVersion
+	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 *ApplicationVersion) UnmarshalJSON(b []byte) error {
+	type Properties ApplicationVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ApplicationVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion_sourcebundle.go b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion_sourcebundle.go
new file mode 100644
index 0000000000..461c617700
--- /dev/null
+++ b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-applicationversion_sourcebundle.go
@@ -0,0 +1,42 @@
+package elasticbeanstalk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationVersion_SourceBundle AWS CloudFormation Resource (AWS::ElasticBeanstalk::ApplicationVersion.SourceBundle)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-sourcebundle.html
+type ApplicationVersion_SourceBundle struct {
+
+	// S3Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-sourcebundle.html#cfn-beanstalk-sourcebundle-s3bucket
+	S3Bucket *types.Value `json:"S3Bucket,omitempty"`
+
+	// S3Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-sourcebundle.html#cfn-beanstalk-sourcebundle-s3key
+	S3Key *types.Value `json:"S3Key,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationVersion_SourceBundle) AWSCloudFormationType() string {
+	return "AWS::ElasticBeanstalk::ApplicationVersion.SourceBundle"
+}
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate.go b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate.go
new file mode 100644
index 0000000000..ac24b0d0d5
--- /dev/null
+++ b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate.go
@@ -0,0 +1,138 @@
+package elasticbeanstalk
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationTemplate AWS CloudFormation Resource (AWS::ElasticBeanstalk::ConfigurationTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticbeanstalk-configurationtemplate.html
+type ConfigurationTemplate struct {
+
+	// ApplicationName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticbeanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-applicationname
+	ApplicationName *types.Value `json:"ApplicationName,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticbeanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EnvironmentId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticbeanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-environmentid
+	EnvironmentId *types.Value `json:"EnvironmentId,omitempty"`
+
+	// OptionSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticbeanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-optionsettings
+	OptionSettings []ConfigurationTemplate_ConfigurationOptionSetting `json:"OptionSettings,omitempty"`
+
+	// PlatformArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticbeanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-platformarn
+	PlatformArn *types.Value `json:"PlatformArn,omitempty"`
+
+	// SolutionStackName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticbeanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-solutionstackname
+	SolutionStackName *types.Value `json:"SolutionStackName,omitempty"`
+
+	// SourceConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticbeanstalk-configurationtemplate.html#cfn-elasticbeanstalk-configurationtemplate-sourceconfiguration
+	SourceConfiguration *ConfigurationTemplate_SourceConfiguration `json:"SourceConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConfigurationTemplate) AWSCloudFormationType() string {
+	return "AWS::ElasticBeanstalk::ConfigurationTemplate"
+}
+
+// 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 ConfigurationTemplate) MarshalJSON() ([]byte, error) {
+	type Properties ConfigurationTemplate
+	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 *ConfigurationTemplate) UnmarshalJSON(b []byte) error {
+	type Properties ConfigurationTemplate
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ConfigurationTemplate(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_configurationoptionsetting.go b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_configurationoptionsetting.go
new file mode 100644
index 0000000000..43eb6b96aa
--- /dev/null
+++ b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_configurationoptionsetting.go
@@ -0,0 +1,52 @@
+package elasticbeanstalk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationTemplate_ConfigurationOptionSetting AWS CloudFormation Resource (AWS::ElasticBeanstalk::ConfigurationTemplate.ConfigurationOptionSetting)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-configurationtemplate-configurationoptionsetting.html
+type ConfigurationTemplate_ConfigurationOptionSetting struct {
+
+	// Namespace AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-configurationtemplate-configurationoptionsetting.html#cfn-elasticbeanstalk-configurationtemplate-configurationoptionsetting-namespace
+	Namespace *types.Value `json:"Namespace,omitempty"`
+
+	// OptionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-configurationtemplate-configurationoptionsetting.html#cfn-elasticbeanstalk-configurationtemplate-configurationoptionsetting-optionname
+	OptionName *types.Value `json:"OptionName,omitempty"`
+
+	// ResourceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-configurationtemplate-configurationoptionsetting.html#cfn-elasticbeanstalk-configurationtemplate-configurationoptionsetting-resourcename
+	ResourceName *types.Value `json:"ResourceName,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-configurationtemplate-configurationoptionsetting.html#cfn-elasticbeanstalk-configurationtemplate-configurationoptionsetting-value
+	Value *types.Value `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 *ConfigurationTemplate_ConfigurationOptionSetting) AWSCloudFormationType() string {
+	return "AWS::ElasticBeanstalk::ConfigurationTemplate.ConfigurationOptionSetting"
+}
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_sourceconfiguration.go b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_sourceconfiguration.go
new file mode 100644
index 0000000000..fe880215e2
--- /dev/null
+++ b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-configurationtemplate_sourceconfiguration.go
@@ -0,0 +1,42 @@
+package elasticbeanstalk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationTemplate_SourceConfiguration AWS CloudFormation Resource (AWS::ElasticBeanstalk::ConfigurationTemplate.SourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-configurationtemplate-sourceconfiguration.html
+type ConfigurationTemplate_SourceConfiguration struct {
+
+	// ApplicationName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-configurationtemplate-sourceconfiguration.html#cfn-elasticbeanstalk-configurationtemplate-sourceconfiguration-applicationname
+	ApplicationName *types.Value `json:"ApplicationName,omitempty"`
+
+	// TemplateName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticbeanstalk-configurationtemplate-sourceconfiguration.html#cfn-elasticbeanstalk-configurationtemplate-sourceconfiguration-templatename
+	TemplateName *types.Value `json:"TemplateName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConfigurationTemplate_SourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::ElasticBeanstalk::ConfigurationTemplate.SourceConfiguration"
+}
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment.go b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment.go
new file mode 100644
index 0000000000..82f37e4bc5
--- /dev/null
+++ b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment.go
@@ -0,0 +1,164 @@
+package elasticbeanstalk
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Environment AWS CloudFormation Resource (AWS::ElasticBeanstalk::Environment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html
+type Environment struct {
+
+	// ApplicationName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-applicationname
+	ApplicationName *types.Value `json:"ApplicationName,omitempty"`
+
+	// CNAMEPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-cnameprefix
+	CNAMEPrefix *types.Value `json:"CNAMEPrefix,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EnvironmentName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-name
+	EnvironmentName *types.Value `json:"EnvironmentName,omitempty"`
+
+	// OperationsRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-operations-role
+	OperationsRole *types.Value `json:"OperationsRole,omitempty"`
+
+	// OptionSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-optionsettings
+	OptionSettings []Environment_OptionSetting `json:"OptionSettings,omitempty"`
+
+	// PlatformArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-platformarn
+	PlatformArn *types.Value `json:"PlatformArn,omitempty"`
+
+	// SolutionStackName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-solutionstackname
+	SolutionStackName *types.Value `json:"SolutionStackName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-elasticbeanstalk-environment-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TemplateName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-templatename
+	TemplateName *types.Value `json:"TemplateName,omitempty"`
+
+	// Tier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-tier
+	Tier *Environment_Tier `json:"Tier,omitempty"`
+
+	// VersionLabel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment.html#cfn-beanstalk-environment-versionlabel
+	VersionLabel *types.Value `json:"VersionLabel,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Environment) AWSCloudFormationType() string {
+	return "AWS::ElasticBeanstalk::Environment"
+}
+
+// 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 Environment) MarshalJSON() ([]byte, error) {
+	type Properties Environment
+	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 *Environment) UnmarshalJSON(b []byte) error {
+	type Properties Environment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Environment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_optionsetting.go b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_optionsetting.go
new file mode 100644
index 0000000000..d6f8dbb20b
--- /dev/null
+++ b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_optionsetting.go
@@ -0,0 +1,52 @@
+package elasticbeanstalk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Environment_OptionSetting AWS CloudFormation Resource (AWS::ElasticBeanstalk::Environment.OptionSetting)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-option-settings.html
+type Environment_OptionSetting struct {
+
+	// Namespace AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-option-settings.html#cfn-beanstalk-optionsettings-namespace
+	Namespace *types.Value `json:"Namespace,omitempty"`
+
+	// OptionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-option-settings.html#cfn-beanstalk-optionsettings-optionname
+	OptionName *types.Value `json:"OptionName,omitempty"`
+
+	// ResourceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-option-settings.html#cfn-elasticbeanstalk-environment-optionsetting-resourcename
+	ResourceName *types.Value `json:"ResourceName,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-option-settings.html#cfn-beanstalk-optionsettings-value
+	Value *types.Value `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 *Environment_OptionSetting) AWSCloudFormationType() string {
+	return "AWS::ElasticBeanstalk::Environment.OptionSetting"
+}
diff --git a/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_tier.go b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_tier.go
new file mode 100644
index 0000000000..660b64786f
--- /dev/null
+++ b/goformation/cloudformation/elasticbeanstalk/aws-elasticbeanstalk-environment_tier.go
@@ -0,0 +1,47 @@
+package elasticbeanstalk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Environment_Tier AWS CloudFormation Resource (AWS::ElasticBeanstalk::Environment.Tier)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment-tier.html
+type Environment_Tier struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment-tier.html#cfn-beanstalk-env-tier-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment-tier.html#cfn-beanstalk-env-tier-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-beanstalk-environment-tier.html#cfn-beanstalk-env-tier-version
+	Version *types.Value `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 *Environment_Tier) AWSCloudFormationType() string {
+	return "AWS::ElasticBeanstalk::Environment.Tier"
+}
diff --git a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer.go b/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer.go
new file mode 100644
index 0000000000..69fc23f496
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer.go
@@ -0,0 +1,184 @@
+package elasticloadbalancing
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoadBalancer AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html
+type LoadBalancer struct {
+
+	// AccessLoggingPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-accessloggingpolicy
+	AccessLoggingPolicy *LoadBalancer_AccessLoggingPolicy `json:"AccessLoggingPolicy,omitempty"`
+
+	// AppCookieStickinessPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-appcookiestickinesspolicy
+	AppCookieStickinessPolicy []LoadBalancer_AppCookieStickinessPolicy `json:"AppCookieStickinessPolicy,omitempty"`
+
+	// AvailabilityZones AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-availabilityzones
+	AvailabilityZones *types.Value `json:"AvailabilityZones,omitempty"`
+
+	// ConnectionDrainingPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-connectiondrainingpolicy
+	ConnectionDrainingPolicy *LoadBalancer_ConnectionDrainingPolicy `json:"ConnectionDrainingPolicy,omitempty"`
+
+	// ConnectionSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-connectionsettings
+	ConnectionSettings *LoadBalancer_ConnectionSettings `json:"ConnectionSettings,omitempty"`
+
+	// CrossZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-crosszone
+	CrossZone *types.Value `json:"CrossZone,omitempty"`
+
+	// HealthCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-healthcheck
+	HealthCheck *LoadBalancer_HealthCheck `json:"HealthCheck,omitempty"`
+
+	// Instances AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-instances
+	Instances *types.Value `json:"Instances,omitempty"`
+
+	// LBCookieStickinessPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-lbcookiestickinesspolicy
+	LBCookieStickinessPolicy []LoadBalancer_LBCookieStickinessPolicy `json:"LBCookieStickinessPolicy,omitempty"`
+
+	// Listeners AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-listeners
+	Listeners []LoadBalancer_Listeners `json:"Listeners,omitempty"`
+
+	// LoadBalancerName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-elbname
+	LoadBalancerName *types.Value `json:"LoadBalancerName,omitempty"`
+
+	// Policies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-policies
+	Policies []LoadBalancer_Policies `json:"Policies,omitempty"`
+
+	// Scheme AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-scheme
+	Scheme *types.Value `json:"Scheme,omitempty"`
+
+	// SecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-securitygroups
+	SecurityGroups *types.Value `json:"SecurityGroups,omitempty"`
+
+	// Subnets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-ec2-elb-subnets
+	Subnets *types.Value `json:"Subnets,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb.html#cfn-elasticloadbalancing-loadbalancer-tags
+	Tags []cloudformation.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 *LoadBalancer) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancing::LoadBalancer"
+}
+
+// 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 LoadBalancer) MarshalJSON() ([]byte, error) {
+	type Properties LoadBalancer
+	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 *LoadBalancer) UnmarshalJSON(b []byte) error {
+	type Properties LoadBalancer
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LoadBalancer(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_accessloggingpolicy.go b/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_accessloggingpolicy.go
new file mode 100644
index 0000000000..060048b774
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_accessloggingpolicy.go
@@ -0,0 +1,52 @@
+package elasticloadbalancing
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoadBalancer_AccessLoggingPolicy AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.AccessLoggingPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-accessloggingpolicy.html
+type LoadBalancer_AccessLoggingPolicy struct {
+
+	// EmitInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-accessloggingpolicy.html#cfn-elb-accessloggingpolicy-emitinterval
+	EmitInterval *types.Value `json:"EmitInterval,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-accessloggingpolicy.html#cfn-elb-accessloggingpolicy-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// S3BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-accessloggingpolicy.html#cfn-elb-accessloggingpolicy-s3bucketname
+	S3BucketName *types.Value `json:"S3BucketName,omitempty"`
+
+	// S3BucketPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-accessloggingpolicy.html#cfn-elb-accessloggingpolicy-s3bucketprefix
+	S3BucketPrefix *types.Value `json:"S3BucketPrefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LoadBalancer_AccessLoggingPolicy) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancing::LoadBalancer.AccessLoggingPolicy"
+}
diff --git a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_appcookiestickinesspolicy.go b/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_appcookiestickinesspolicy.go
new file mode 100644
index 0000000000..2e0efcacbd
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_appcookiestickinesspolicy.go
@@ -0,0 +1,42 @@
+package elasticloadbalancing
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoadBalancer_AppCookieStickinessPolicy AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.AppCookieStickinessPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-AppCookieStickinessPolicy.html
+type LoadBalancer_AppCookieStickinessPolicy struct {
+
+	// CookieName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-AppCookieStickinessPolicy.html#cfn-elb-appcookiestickinesspolicy-cookiename
+	CookieName *types.Value `json:"CookieName,omitempty"`
+
+	// PolicyName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-AppCookieStickinessPolicy.html#cfn-elb-appcookiestickinesspolicy-policyname
+	PolicyName *types.Value `json:"PolicyName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LoadBalancer_AppCookieStickinessPolicy) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancing::LoadBalancer.AppCookieStickinessPolicy"
+}
diff --git a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectiondrainingpolicy.go b/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectiondrainingpolicy.go
new file mode 100644
index 0000000000..cc00f0aff3
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectiondrainingpolicy.go
@@ -0,0 +1,42 @@
+package elasticloadbalancing
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoadBalancer_ConnectionDrainingPolicy AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.ConnectionDrainingPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-connectiondrainingpolicy.html
+type LoadBalancer_ConnectionDrainingPolicy struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-connectiondrainingpolicy.html#cfn-elb-connectiondrainingpolicy-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// Timeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-connectiondrainingpolicy.html#cfn-elb-connectiondrainingpolicy-timeout
+	Timeout *types.Value `json:"Timeout,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LoadBalancer_ConnectionDrainingPolicy) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancing::LoadBalancer.ConnectionDrainingPolicy"
+}
diff --git a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectionsettings.go b/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectionsettings.go
new file mode 100644
index 0000000000..7809415efa
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_connectionsettings.go
@@ -0,0 +1,37 @@
+package elasticloadbalancing
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoadBalancer_ConnectionSettings AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.ConnectionSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-connectionsettings.html
+type LoadBalancer_ConnectionSettings struct {
+
+	// IdleTimeout AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-connectionsettings.html#cfn-elb-connectionsettings-idletimeout
+	IdleTimeout *types.Value `json:"IdleTimeout"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LoadBalancer_ConnectionSettings) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancing::LoadBalancer.ConnectionSettings"
+}
diff --git a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_healthcheck.go b/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_healthcheck.go
new file mode 100644
index 0000000000..49a9cf2e55
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_healthcheck.go
@@ -0,0 +1,57 @@
+package elasticloadbalancing
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoadBalancer_HealthCheck AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.HealthCheck)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-health-check.html
+type LoadBalancer_HealthCheck struct {
+
+	// HealthyThreshold AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-health-check.html#cfn-elb-healthcheck-healthythreshold
+	HealthyThreshold *types.Value `json:"HealthyThreshold,omitempty"`
+
+	// Interval AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-health-check.html#cfn-elb-healthcheck-interval
+	Interval *types.Value `json:"Interval,omitempty"`
+
+	// Target AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-health-check.html#cfn-elb-healthcheck-target
+	Target *types.Value `json:"Target,omitempty"`
+
+	// Timeout AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-health-check.html#cfn-elb-healthcheck-timeout
+	Timeout *types.Value `json:"Timeout,omitempty"`
+
+	// UnhealthyThreshold AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-health-check.html#cfn-elb-healthcheck-unhealthythreshold
+	UnhealthyThreshold *types.Value `json:"UnhealthyThreshold,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LoadBalancer_HealthCheck) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancing::LoadBalancer.HealthCheck"
+}
diff --git a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_lbcookiestickinesspolicy.go b/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_lbcookiestickinesspolicy.go
new file mode 100644
index 0000000000..bb09b81703
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_lbcookiestickinesspolicy.go
@@ -0,0 +1,42 @@
+package elasticloadbalancing
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoadBalancer_LBCookieStickinessPolicy AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.LBCookieStickinessPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-LBCookieStickinessPolicy.html
+type LoadBalancer_LBCookieStickinessPolicy struct {
+
+	// CookieExpirationPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-LBCookieStickinessPolicy.html#cfn-elb-lbcookiestickinesspolicy-cookieexpirationperiod
+	CookieExpirationPeriod *types.Value `json:"CookieExpirationPeriod,omitempty"`
+
+	// PolicyName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-LBCookieStickinessPolicy.html#cfn-elb-lbcookiestickinesspolicy-policyname
+	PolicyName *types.Value `json:"PolicyName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LoadBalancer_LBCookieStickinessPolicy) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancing::LoadBalancer.LBCookieStickinessPolicy"
+}
diff --git a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_listeners.go b/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_listeners.go
new file mode 100644
index 0000000000..7ae1e59e70
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_listeners.go
@@ -0,0 +1,62 @@
+package elasticloadbalancing
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoadBalancer_Listeners AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.Listeners)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-listener.html
+type LoadBalancer_Listeners struct {
+
+	// InstancePort AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-listener.html#cfn-ec2-elb-listener-instanceport
+	InstancePort *types.Value `json:"InstancePort,omitempty"`
+
+	// InstanceProtocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-listener.html#cfn-ec2-elb-listener-instanceprotocol
+	InstanceProtocol *types.Value `json:"InstanceProtocol,omitempty"`
+
+	// LoadBalancerPort AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-listener.html#cfn-ec2-elb-listener-loadbalancerport
+	LoadBalancerPort *types.Value `json:"LoadBalancerPort,omitempty"`
+
+	// PolicyNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-listener.html#cfn-ec2-elb-listener-policynames
+	PolicyNames *types.Value `json:"PolicyNames,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-listener.html#cfn-ec2-elb-listener-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// SSLCertificateId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-listener.html#cfn-ec2-elb-listener-sslcertificateid
+	SSLCertificateId *types.Value `json:"SSLCertificateId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LoadBalancer_Listeners) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancing::LoadBalancer.Listeners"
+}
diff --git a/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_policies.go b/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_policies.go
new file mode 100644
index 0000000000..fd9cb549ed
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancing/aws-elasticloadbalancing-loadbalancer_policies.go
@@ -0,0 +1,57 @@
+package elasticloadbalancing
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoadBalancer_Policies AWS CloudFormation Resource (AWS::ElasticLoadBalancing::LoadBalancer.Policies)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-policy.html
+type LoadBalancer_Policies struct {
+
+	// Attributes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-policy.html#cfn-ec2-elb-policy-attributes
+	Attributes []interface{} `json:"Attributes,omitempty"`
+
+	// InstancePorts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-policy.html#cfn-ec2-elb-policy-instanceports
+	InstancePorts *types.Value `json:"InstancePorts,omitempty"`
+
+	// LoadBalancerPorts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-policy.html#cfn-ec2-elb-policy-loadbalancerports
+	LoadBalancerPorts *types.Value `json:"LoadBalancerPorts,omitempty"`
+
+	// PolicyName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-policy.html#cfn-ec2-elb-policy-policyname
+	PolicyName *types.Value `json:"PolicyName,omitempty"`
+
+	// PolicyType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-elb-policy.html#cfn-ec2-elb-policy-policytype
+	PolicyType *types.Value `json:"PolicyType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LoadBalancer_Policies) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancing::LoadBalancer.Policies"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener.go
new file mode 100644
index 0000000000..35e129143e
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener.go
@@ -0,0 +1,138 @@
+package elasticloadbalancingv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Listener AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html
+type Listener struct {
+
+	// AlpnPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html#cfn-elasticloadbalancingv2-listener-alpnpolicy
+	AlpnPolicy *types.Value `json:"AlpnPolicy,omitempty"`
+
+	// Certificates AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html#cfn-elasticloadbalancingv2-listener-certificates
+	Certificates []Listener_Certificate `json:"Certificates,omitempty"`
+
+	// DefaultActions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html#cfn-elasticloadbalancingv2-listener-defaultactions
+	DefaultActions []Listener_Action `json:"DefaultActions,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
+	LoadBalancerArn *types.Value `json:"LoadBalancerArn,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html#cfn-elasticloadbalancingv2-listener-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html#cfn-elasticloadbalancingv2-listener-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// SslPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listener.html#cfn-elasticloadbalancingv2-listener-sslpolicy
+	SslPolicy *types.Value `json:"SslPolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::Listener"
+}
+
+// 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 Listener) MarshalJSON() ([]byte, error) {
+	type Properties Listener
+	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 *Listener) UnmarshalJSON(b []byte) error {
+	type Properties Listener
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Listener(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_action.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_action.go
new file mode 100644
index 0000000000..db94dba6a5
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_action.go
@@ -0,0 +1,72 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Listener_Action AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.Action)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-action.html
+type Listener_Action struct {
+
+	// AuthenticateCognitoConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-action.html#cfn-elasticloadbalancingv2-listener-action-authenticatecognitoconfig
+	AuthenticateCognitoConfig *Listener_AuthenticateCognitoConfig `json:"AuthenticateCognitoConfig,omitempty"`
+
+	// AuthenticateOidcConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-action.html#cfn-elasticloadbalancingv2-listener-action-authenticateoidcconfig
+	AuthenticateOidcConfig *Listener_AuthenticateOidcConfig `json:"AuthenticateOidcConfig,omitempty"`
+
+	// FixedResponseConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-action.html#cfn-elasticloadbalancingv2-listener-action-fixedresponseconfig
+	FixedResponseConfig *Listener_FixedResponseConfig `json:"FixedResponseConfig,omitempty"`
+
+	// ForwardConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-action.html#cfn-elasticloadbalancingv2-listener-action-forwardconfig
+	ForwardConfig *Listener_ForwardConfig `json:"ForwardConfig,omitempty"`
+
+	// Order AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-action.html#cfn-elasticloadbalancingv2-listener-action-order
+	Order *types.Value `json:"Order,omitempty"`
+
+	// RedirectConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-action.html#cfn-elasticloadbalancingv2-listener-action-redirectconfig
+	RedirectConfig *Listener_RedirectConfig `json:"RedirectConfig,omitempty"`
+
+	// TargetGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-action.html#cfn-elasticloadbalancingv2-listener-action-targetgrouparn
+	TargetGroupArn *types.Value `json:"TargetGroupArn,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-action.html#cfn-elasticloadbalancingv2-listener-action-type
+	Type *types.Value `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 *Listener_Action) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::Listener.Action"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticatecognitoconfig.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticatecognitoconfig.go
new file mode 100644
index 0000000000..5a1cbb3c24
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticatecognitoconfig.go
@@ -0,0 +1,72 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Listener_AuthenticateCognitoConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.AuthenticateCognitoConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticatecognitoconfig.html
+type Listener_AuthenticateCognitoConfig struct {
+
+	// AuthenticationRequestExtraParams AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticatecognitoconfig.html#cfn-elasticloadbalancingv2-listener-authenticatecognitoconfig-authenticationrequestextraparams
+	AuthenticationRequestExtraParams map[string]*types.Value `json:"AuthenticationRequestExtraParams,omitempty"`
+
+	// OnUnauthenticatedRequest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticatecognitoconfig.html#cfn-elasticloadbalancingv2-listener-authenticatecognitoconfig-onunauthenticatedrequest
+	OnUnauthenticatedRequest *types.Value `json:"OnUnauthenticatedRequest,omitempty"`
+
+	// Scope AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticatecognitoconfig.html#cfn-elasticloadbalancingv2-listener-authenticatecognitoconfig-scope
+	Scope *types.Value `json:"Scope,omitempty"`
+
+	// SessionCookieName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticatecognitoconfig.html#cfn-elasticloadbalancingv2-listener-authenticatecognitoconfig-sessioncookiename
+	SessionCookieName *types.Value `json:"SessionCookieName,omitempty"`
+
+	// SessionTimeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticatecognitoconfig.html#cfn-elasticloadbalancingv2-listener-authenticatecognitoconfig-sessiontimeout
+	SessionTimeout *types.Value `json:"SessionTimeout,omitempty"`
+
+	// UserPoolArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticatecognitoconfig.html#cfn-elasticloadbalancingv2-listener-authenticatecognitoconfig-userpoolarn
+	UserPoolArn *types.Value `json:"UserPoolArn,omitempty"`
+
+	// UserPoolClientId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticatecognitoconfig.html#cfn-elasticloadbalancingv2-listener-authenticatecognitoconfig-userpoolclientid
+	UserPoolClientId *types.Value `json:"UserPoolClientId,omitempty"`
+
+	// UserPoolDomain AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticatecognitoconfig.html#cfn-elasticloadbalancingv2-listener-authenticatecognitoconfig-userpooldomain
+	UserPoolDomain *types.Value `json:"UserPoolDomain,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AuthenticateCognitoConfig) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::Listener.AuthenticateCognitoConfig"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticateoidcconfig.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticateoidcconfig.go
new file mode 100644
index 0000000000..7c0364a635
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_authenticateoidcconfig.go
@@ -0,0 +1,87 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Listener_AuthenticateOidcConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.AuthenticateOidcConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticateoidcconfig.html
+type Listener_AuthenticateOidcConfig struct {
+
+	// AuthenticationRequestExtraParams AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listener-authenticateoidcconfig-authenticationrequestextraparams
+	AuthenticationRequestExtraParams map[string]*types.Value `json:"AuthenticationRequestExtraParams,omitempty"`
+
+	// AuthorizationEndpoint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listener-authenticateoidcconfig-authorizationendpoint
+	AuthorizationEndpoint *types.Value `json:"AuthorizationEndpoint,omitempty"`
+
+	// ClientId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listener-authenticateoidcconfig-clientid
+	ClientId *types.Value `json:"ClientId,omitempty"`
+
+	// ClientSecret AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listener-authenticateoidcconfig-clientsecret
+	ClientSecret *types.Value `json:"ClientSecret,omitempty"`
+
+	// Issuer AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listener-authenticateoidcconfig-issuer
+	Issuer *types.Value `json:"Issuer,omitempty"`
+
+	// OnUnauthenticatedRequest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listener-authenticateoidcconfig-onunauthenticatedrequest
+	OnUnauthenticatedRequest *types.Value `json:"OnUnauthenticatedRequest,omitempty"`
+
+	// Scope AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listener-authenticateoidcconfig-scope
+	Scope *types.Value `json:"Scope,omitempty"`
+
+	// SessionCookieName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listener-authenticateoidcconfig-sessioncookiename
+	SessionCookieName *types.Value `json:"SessionCookieName,omitempty"`
+
+	// SessionTimeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listener-authenticateoidcconfig-sessiontimeout
+	SessionTimeout *types.Value `json:"SessionTimeout,omitempty"`
+
+	// TokenEndpoint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listener-authenticateoidcconfig-tokenendpoint
+	TokenEndpoint *types.Value `json:"TokenEndpoint,omitempty"`
+
+	// UserInfoEndpoint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listener-authenticateoidcconfig-userinfoendpoint
+	UserInfoEndpoint *types.Value `json:"UserInfoEndpoint,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AuthenticateOidcConfig) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::Listener.AuthenticateOidcConfig"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_certificate.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_certificate.go
new file mode 100644
index 0000000000..3d4cbeebf2
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_certificate.go
@@ -0,0 +1,37 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Listener_Certificate AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.Certificate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-certificate.html
+type Listener_Certificate struct {
+
+	// CertificateArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-certificate.html#cfn-elasticloadbalancingv2-listener-certificate-certificatearn
+	CertificateArn *types.Value `json:"CertificateArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Certificate) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::Listener.Certificate"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_fixedresponseconfig.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_fixedresponseconfig.go
new file mode 100644
index 0000000000..9a8d84ac6a
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_fixedresponseconfig.go
@@ -0,0 +1,47 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Listener_FixedResponseConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.FixedResponseConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-fixedresponseconfig.html
+type Listener_FixedResponseConfig struct {
+
+	// ContentType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-fixedresponseconfig.html#cfn-elasticloadbalancingv2-listener-fixedresponseconfig-contenttype
+	ContentType *types.Value `json:"ContentType,omitempty"`
+
+	// MessageBody AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-fixedresponseconfig.html#cfn-elasticloadbalancingv2-listener-fixedresponseconfig-messagebody
+	MessageBody *types.Value `json:"MessageBody,omitempty"`
+
+	// StatusCode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-fixedresponseconfig.html#cfn-elasticloadbalancingv2-listener-fixedresponseconfig-statuscode
+	StatusCode *types.Value `json:"StatusCode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_FixedResponseConfig) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::Listener.FixedResponseConfig"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_forwardconfig.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_forwardconfig.go
new file mode 100644
index 0000000000..0fae0b040b
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_forwardconfig.go
@@ -0,0 +1,40 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Listener_ForwardConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.ForwardConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-forwardconfig.html
+type Listener_ForwardConfig struct {
+
+	// TargetGroupStickinessConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-forwardconfig.html#cfn-elasticloadbalancingv2-listener-forwardconfig-targetgroupstickinessconfig
+	TargetGroupStickinessConfig *Listener_TargetGroupStickinessConfig `json:"TargetGroupStickinessConfig,omitempty"`
+
+	// TargetGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-forwardconfig.html#cfn-elasticloadbalancingv2-listener-forwardconfig-targetgroups
+	TargetGroups []Listener_TargetGroupTuple `json:"TargetGroups,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ForwardConfig) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::Listener.ForwardConfig"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_redirectconfig.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_redirectconfig.go
new file mode 100644
index 0000000000..a5f723b2b8
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_redirectconfig.go
@@ -0,0 +1,62 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Listener_RedirectConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.RedirectConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-redirectconfig.html
+type Listener_RedirectConfig struct {
+
+	// Host AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-redirectconfig.html#cfn-elasticloadbalancingv2-listener-redirectconfig-host
+	Host *types.Value `json:"Host,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-redirectconfig.html#cfn-elasticloadbalancingv2-listener-redirectconfig-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-redirectconfig.html#cfn-elasticloadbalancingv2-listener-redirectconfig-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-redirectconfig.html#cfn-elasticloadbalancingv2-listener-redirectconfig-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// Query AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-redirectconfig.html#cfn-elasticloadbalancingv2-listener-redirectconfig-query
+	Query *types.Value `json:"Query,omitempty"`
+
+	// StatusCode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-redirectconfig.html#cfn-elasticloadbalancingv2-listener-redirectconfig-statuscode
+	StatusCode *types.Value `json:"StatusCode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RedirectConfig) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::Listener.RedirectConfig"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgroupstickinessconfig.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgroupstickinessconfig.go
new file mode 100644
index 0000000000..848a2cc400
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgroupstickinessconfig.go
@@ -0,0 +1,42 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Listener_TargetGroupStickinessConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.TargetGroupStickinessConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-targetgroupstickinessconfig.html
+type Listener_TargetGroupStickinessConfig struct {
+
+	// DurationSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-targetgroupstickinessconfig.html#cfn-elasticloadbalancingv2-listener-targetgroupstickinessconfig-durationseconds
+	DurationSeconds *types.Value `json:"DurationSeconds,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-targetgroupstickinessconfig.html#cfn-elasticloadbalancingv2-listener-targetgroupstickinessconfig-enabled
+	Enabled *types.Value `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 *Listener_TargetGroupStickinessConfig) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::Listener.TargetGroupStickinessConfig"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgrouptuple.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgrouptuple.go
new file mode 100644
index 0000000000..83988d355c
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listener_targetgrouptuple.go
@@ -0,0 +1,42 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Listener_TargetGroupTuple AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::Listener.TargetGroupTuple)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-targetgrouptuple.html
+type Listener_TargetGroupTuple struct {
+
+	// TargetGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-targetgrouptuple.html#cfn-elasticloadbalancingv2-listener-targetgrouptuple-targetgrouparn
+	TargetGroupArn *types.Value `json:"TargetGroupArn,omitempty"`
+
+	// Weight AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-targetgrouptuple.html#cfn-elasticloadbalancingv2-listener-targetgrouptuple-weight
+	Weight *types.Value `json:"Weight,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TargetGroupTuple) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::Listener.TargetGroupTuple"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate.go
new file mode 100644
index 0000000000..75d556c70c
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate.go
@@ -0,0 +1,113 @@
+package elasticloadbalancingv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ListenerCertificate AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerCertificate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenercertificate.html
+type ListenerCertificate struct {
+
+	// Certificates AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenercertificate.html#cfn-elasticloadbalancingv2-listenercertificate-certificates
+	Certificates []ListenerCertificate_Certificate `json:"Certificates,omitempty"`
+
+	// ListenerArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenercertificate.html#cfn-elasticloadbalancingv2-listenercertificate-listenerarn
+	ListenerArn *types.Value `json:"ListenerArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ListenerCertificate) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::ListenerCertificate"
+}
+
+// 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 ListenerCertificate) MarshalJSON() ([]byte, error) {
+	type Properties ListenerCertificate
+	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 *ListenerCertificate) UnmarshalJSON(b []byte) error {
+	type Properties ListenerCertificate
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ListenerCertificate(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate_certificate.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate_certificate.go
new file mode 100644
index 0000000000..4a15d6b3e7
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenercertificate_certificate.go
@@ -0,0 +1,37 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ListenerCertificate_Certificate AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerCertificate.Certificate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-certificates.html
+type ListenerCertificate_Certificate struct {
+
+	// CertificateArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listener-certificates.html#cfn-elasticloadbalancingv2-listener-certificates-certificatearn
+	CertificateArn *types.Value `json:"CertificateArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ListenerCertificate_Certificate) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::ListenerCertificate.Certificate"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule.go
new file mode 100644
index 0000000000..9dced982ec
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule.go
@@ -0,0 +1,123 @@
+package elasticloadbalancingv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ListenerRule AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenerrule.html
+type ListenerRule struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenerrule.html#cfn-elasticloadbalancingv2-listenerrule-actions
+	Actions []ListenerRule_Action `json:"Actions,omitempty"`
+
+	// Conditions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenerrule.html#cfn-elasticloadbalancingv2-listenerrule-conditions
+	Conditions []ListenerRule_RuleCondition `json:"Conditions,omitempty"`
+
+	// ListenerArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenerrule.html#cfn-elasticloadbalancingv2-listenerrule-listenerarn
+	ListenerArn *types.Value `json:"ListenerArn,omitempty"`
+
+	// Priority AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-listenerrule.html#cfn-elasticloadbalancingv2-listenerrule-priority
+	Priority *types.Value `json:"Priority"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ListenerRule) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::ListenerRule"
+}
+
+// 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 ListenerRule) MarshalJSON() ([]byte, error) {
+	type Properties ListenerRule
+	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 *ListenerRule) UnmarshalJSON(b []byte) error {
+	type Properties ListenerRule
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ListenerRule(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_action.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_action.go
new file mode 100644
index 0000000000..136d62498d
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_action.go
@@ -0,0 +1,72 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ListenerRule_Action AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.Action)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-action.html
+type ListenerRule_Action struct {
+
+	// AuthenticateCognitoConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-action.html#cfn-elasticloadbalancingv2-listenerrule-action-authenticatecognitoconfig
+	AuthenticateCognitoConfig *ListenerRule_AuthenticateCognitoConfig `json:"AuthenticateCognitoConfig,omitempty"`
+
+	// AuthenticateOidcConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-action.html#cfn-elasticloadbalancingv2-listenerrule-action-authenticateoidcconfig
+	AuthenticateOidcConfig *ListenerRule_AuthenticateOidcConfig `json:"AuthenticateOidcConfig,omitempty"`
+
+	// FixedResponseConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-action.html#cfn-elasticloadbalancingv2-listenerrule-action-fixedresponseconfig
+	FixedResponseConfig *ListenerRule_FixedResponseConfig `json:"FixedResponseConfig,omitempty"`
+
+	// ForwardConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-action.html#cfn-elasticloadbalancingv2-listenerrule-action-forwardconfig
+	ForwardConfig *ListenerRule_ForwardConfig `json:"ForwardConfig,omitempty"`
+
+	// Order AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-action.html#cfn-elasticloadbalancingv2-listenerrule-action-order
+	Order *types.Value `json:"Order,omitempty"`
+
+	// RedirectConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-action.html#cfn-elasticloadbalancingv2-listenerrule-action-redirectconfig
+	RedirectConfig *ListenerRule_RedirectConfig `json:"RedirectConfig,omitempty"`
+
+	// TargetGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-action.html#cfn-elasticloadbalancingv2-listenerrule-action-targetgrouparn
+	TargetGroupArn *types.Value `json:"TargetGroupArn,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-action.html#cfn-elasticloadbalancingv2-listenerrule-action-type
+	Type *types.Value `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 *ListenerRule_Action) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::ListenerRule.Action"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticatecognitoconfig.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticatecognitoconfig.go
new file mode 100644
index 0000000000..f9cb2cd358
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticatecognitoconfig.go
@@ -0,0 +1,72 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ListenerRule_AuthenticateCognitoConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateCognitoConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticatecognitoconfig.html
+type ListenerRule_AuthenticateCognitoConfig struct {
+
+	// AuthenticationRequestExtraParams AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticatecognitoconfig.html#cfn-elasticloadbalancingv2-listenerrule-authenticatecognitoconfig-authenticationrequestextraparams
+	AuthenticationRequestExtraParams map[string]*types.Value `json:"AuthenticationRequestExtraParams,omitempty"`
+
+	// OnUnauthenticatedRequest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticatecognitoconfig.html#cfn-elasticloadbalancingv2-listenerrule-authenticatecognitoconfig-onunauthenticatedrequest
+	OnUnauthenticatedRequest *types.Value `json:"OnUnauthenticatedRequest,omitempty"`
+
+	// Scope AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticatecognitoconfig.html#cfn-elasticloadbalancingv2-listenerrule-authenticatecognitoconfig-scope
+	Scope *types.Value `json:"Scope,omitempty"`
+
+	// SessionCookieName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticatecognitoconfig.html#cfn-elasticloadbalancingv2-listenerrule-authenticatecognitoconfig-sessioncookiename
+	SessionCookieName *types.Value `json:"SessionCookieName,omitempty"`
+
+	// SessionTimeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticatecognitoconfig.html#cfn-elasticloadbalancingv2-listenerrule-authenticatecognitoconfig-sessiontimeout
+	SessionTimeout *types.Value `json:"SessionTimeout,omitempty"`
+
+	// UserPoolArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticatecognitoconfig.html#cfn-elasticloadbalancingv2-listenerrule-authenticatecognitoconfig-userpoolarn
+	UserPoolArn *types.Value `json:"UserPoolArn,omitempty"`
+
+	// UserPoolClientId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticatecognitoconfig.html#cfn-elasticloadbalancingv2-listenerrule-authenticatecognitoconfig-userpoolclientid
+	UserPoolClientId *types.Value `json:"UserPoolClientId,omitempty"`
+
+	// UserPoolDomain AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticatecognitoconfig.html#cfn-elasticloadbalancingv2-listenerrule-authenticatecognitoconfig-userpooldomain
+	UserPoolDomain *types.Value `json:"UserPoolDomain,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ListenerRule_AuthenticateCognitoConfig) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateCognitoConfig"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticateoidcconfig.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticateoidcconfig.go
new file mode 100644
index 0000000000..7bd99a7b7d
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_authenticateoidcconfig.go
@@ -0,0 +1,92 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ListenerRule_AuthenticateOidcConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateOidcConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticateoidcconfig.html
+type ListenerRule_AuthenticateOidcConfig struct {
+
+	// AuthenticationRequestExtraParams AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listenerrule-authenticateoidcconfig-authenticationrequestextraparams
+	AuthenticationRequestExtraParams map[string]*types.Value `json:"AuthenticationRequestExtraParams,omitempty"`
+
+	// AuthorizationEndpoint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listenerrule-authenticateoidcconfig-authorizationendpoint
+	AuthorizationEndpoint *types.Value `json:"AuthorizationEndpoint,omitempty"`
+
+	// ClientId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listenerrule-authenticateoidcconfig-clientid
+	ClientId *types.Value `json:"ClientId,omitempty"`
+
+	// ClientSecret AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listenerrule-authenticateoidcconfig-clientsecret
+	ClientSecret *types.Value `json:"ClientSecret,omitempty"`
+
+	// Issuer AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listenerrule-authenticateoidcconfig-issuer
+	Issuer *types.Value `json:"Issuer,omitempty"`
+
+	// OnUnauthenticatedRequest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listenerrule-authenticateoidcconfig-onunauthenticatedrequest
+	OnUnauthenticatedRequest *types.Value `json:"OnUnauthenticatedRequest,omitempty"`
+
+	// Scope AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listenerrule-authenticateoidcconfig-scope
+	Scope *types.Value `json:"Scope,omitempty"`
+
+	// SessionCookieName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listenerrule-authenticateoidcconfig-sessioncookiename
+	SessionCookieName *types.Value `json:"SessionCookieName,omitempty"`
+
+	// SessionTimeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listenerrule-authenticateoidcconfig-sessiontimeout
+	SessionTimeout *types.Value `json:"SessionTimeout,omitempty"`
+
+	// TokenEndpoint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listenerrule-authenticateoidcconfig-tokenendpoint
+	TokenEndpoint *types.Value `json:"TokenEndpoint,omitempty"`
+
+	// UseExistingClientSecret AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listenerrule-authenticateoidcconfig-useexistingclientsecret
+	UseExistingClientSecret *types.Value `json:"UseExistingClientSecret,omitempty"`
+
+	// UserInfoEndpoint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-authenticateoidcconfig.html#cfn-elasticloadbalancingv2-listenerrule-authenticateoidcconfig-userinfoendpoint
+	UserInfoEndpoint *types.Value `json:"UserInfoEndpoint,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ListenerRule_AuthenticateOidcConfig) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateOidcConfig"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_fixedresponseconfig.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_fixedresponseconfig.go
new file mode 100644
index 0000000000..56790d7d10
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_fixedresponseconfig.go
@@ -0,0 +1,47 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ListenerRule_FixedResponseConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.FixedResponseConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-fixedresponseconfig.html
+type ListenerRule_FixedResponseConfig struct {
+
+	// ContentType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-fixedresponseconfig.html#cfn-elasticloadbalancingv2-listenerrule-fixedresponseconfig-contenttype
+	ContentType *types.Value `json:"ContentType,omitempty"`
+
+	// MessageBody AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-fixedresponseconfig.html#cfn-elasticloadbalancingv2-listenerrule-fixedresponseconfig-messagebody
+	MessageBody *types.Value `json:"MessageBody,omitempty"`
+
+	// StatusCode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-fixedresponseconfig.html#cfn-elasticloadbalancingv2-listenerrule-fixedresponseconfig-statuscode
+	StatusCode *types.Value `json:"StatusCode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ListenerRule_FixedResponseConfig) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::ListenerRule.FixedResponseConfig"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_forwardconfig.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_forwardconfig.go
new file mode 100644
index 0000000000..91f8fe4374
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_forwardconfig.go
@@ -0,0 +1,40 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ListenerRule_ForwardConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.ForwardConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-forwardconfig.html
+type ListenerRule_ForwardConfig struct {
+
+	// TargetGroupStickinessConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-forwardconfig.html#cfn-elasticloadbalancingv2-listenerrule-forwardconfig-targetgroupstickinessconfig
+	TargetGroupStickinessConfig *ListenerRule_TargetGroupStickinessConfig `json:"TargetGroupStickinessConfig,omitempty"`
+
+	// TargetGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-forwardconfig.html#cfn-elasticloadbalancingv2-listenerrule-forwardconfig-targetgroups
+	TargetGroups []ListenerRule_TargetGroupTuple `json:"TargetGroups,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ListenerRule_ForwardConfig) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::ListenerRule.ForwardConfig"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_hostheaderconfig.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_hostheaderconfig.go
new file mode 100644
index 0000000000..515f13991e
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_hostheaderconfig.go
@@ -0,0 +1,37 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ListenerRule_HostHeaderConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.HostHeaderConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-hostheaderconfig.html
+type ListenerRule_HostHeaderConfig struct {
+
+	// Values AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-hostheaderconfig.html#cfn-elasticloadbalancingv2-listenerrule-hostheaderconfig-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ListenerRule_HostHeaderConfig) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::ListenerRule.HostHeaderConfig"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httpheaderconfig.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httpheaderconfig.go
new file mode 100644
index 0000000000..c23d1a87da
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httpheaderconfig.go
@@ -0,0 +1,42 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ListenerRule_HttpHeaderConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.HttpHeaderConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-httpheaderconfig.html
+type ListenerRule_HttpHeaderConfig struct {
+
+	// HttpHeaderName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-httpheaderconfig.html#cfn-elasticloadbalancingv2-listenerrule-httpheaderconfig-httpheadername
+	HttpHeaderName *types.Value `json:"HttpHeaderName,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-httpheaderconfig.html#cfn-elasticloadbalancingv2-listenerrule-httpheaderconfig-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ListenerRule_HttpHeaderConfig) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::ListenerRule.HttpHeaderConfig"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httprequestmethodconfig.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httprequestmethodconfig.go
new file mode 100644
index 0000000000..3e20e41867
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_httprequestmethodconfig.go
@@ -0,0 +1,37 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ListenerRule_HttpRequestMethodConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.HttpRequestMethodConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-httprequestmethodconfig.html
+type ListenerRule_HttpRequestMethodConfig struct {
+
+	// Values AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-httprequestmethodconfig.html#cfn-elasticloadbalancingv2-listenerrule-httprequestmethodconfig-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ListenerRule_HttpRequestMethodConfig) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::ListenerRule.HttpRequestMethodConfig"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_pathpatternconfig.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_pathpatternconfig.go
new file mode 100644
index 0000000000..951167101d
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_pathpatternconfig.go
@@ -0,0 +1,37 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ListenerRule_PathPatternConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.PathPatternConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-pathpatternconfig.html
+type ListenerRule_PathPatternConfig struct {
+
+	// Values AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-pathpatternconfig.html#cfn-elasticloadbalancingv2-listenerrule-pathpatternconfig-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ListenerRule_PathPatternConfig) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::ListenerRule.PathPatternConfig"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringconfig.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringconfig.go
new file mode 100644
index 0000000000..be254de56f
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringconfig.go
@@ -0,0 +1,35 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ListenerRule_QueryStringConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-querystringconfig.html
+type ListenerRule_QueryStringConfig struct {
+
+	// Values AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-querystringconfig.html#cfn-elasticloadbalancingv2-listenerrule-querystringconfig-values
+	Values []ListenerRule_QueryStringKeyValue `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ListenerRule_QueryStringConfig) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringConfig"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringkeyvalue.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringkeyvalue.go
new file mode 100644
index 0000000000..21cd260328
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_querystringkeyvalue.go
@@ -0,0 +1,42 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ListenerRule_QueryStringKeyValue AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringKeyValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-querystringkeyvalue.html
+type ListenerRule_QueryStringKeyValue struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-querystringkeyvalue.html#cfn-elasticloadbalancingv2-listenerrule-querystringkeyvalue-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-querystringkeyvalue.html#cfn-elasticloadbalancingv2-listenerrule-querystringkeyvalue-value
+	Value *types.Value `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 *ListenerRule_QueryStringKeyValue) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringKeyValue"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_redirectconfig.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_redirectconfig.go
new file mode 100644
index 0000000000..faae073a66
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_redirectconfig.go
@@ -0,0 +1,62 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ListenerRule_RedirectConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.RedirectConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-redirectconfig.html
+type ListenerRule_RedirectConfig struct {
+
+	// Host AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-redirectconfig.html#cfn-elasticloadbalancingv2-listenerrule-redirectconfig-host
+	Host *types.Value `json:"Host,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-redirectconfig.html#cfn-elasticloadbalancingv2-listenerrule-redirectconfig-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-redirectconfig.html#cfn-elasticloadbalancingv2-listenerrule-redirectconfig-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-redirectconfig.html#cfn-elasticloadbalancingv2-listenerrule-redirectconfig-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// Query AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-redirectconfig.html#cfn-elasticloadbalancingv2-listenerrule-redirectconfig-query
+	Query *types.Value `json:"Query,omitempty"`
+
+	// StatusCode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-redirectconfig.html#cfn-elasticloadbalancingv2-listenerrule-redirectconfig-statuscode
+	StatusCode *types.Value `json:"StatusCode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ListenerRule_RedirectConfig) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::ListenerRule.RedirectConfig"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_rulecondition.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_rulecondition.go
new file mode 100644
index 0000000000..711fd75111
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_rulecondition.go
@@ -0,0 +1,72 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ListenerRule_RuleCondition AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.RuleCondition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-rulecondition.html
+type ListenerRule_RuleCondition struct {
+
+	// Field AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-rulecondition.html#cfn-elasticloadbalancingv2-listenerrule-rulecondition-field
+	Field *types.Value `json:"Field,omitempty"`
+
+	// HostHeaderConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-rulecondition.html#cfn-elasticloadbalancingv2-listenerrule-rulecondition-hostheaderconfig
+	HostHeaderConfig *ListenerRule_HostHeaderConfig `json:"HostHeaderConfig,omitempty"`
+
+	// HttpHeaderConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-rulecondition.html#cfn-elasticloadbalancingv2-listenerrule-rulecondition-httpheaderconfig
+	HttpHeaderConfig *ListenerRule_HttpHeaderConfig `json:"HttpHeaderConfig,omitempty"`
+
+	// HttpRequestMethodConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-rulecondition.html#cfn-elasticloadbalancingv2-listenerrule-rulecondition-httprequestmethodconfig
+	HttpRequestMethodConfig *ListenerRule_HttpRequestMethodConfig `json:"HttpRequestMethodConfig,omitempty"`
+
+	// PathPatternConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-rulecondition.html#cfn-elasticloadbalancingv2-listenerrule-rulecondition-pathpatternconfig
+	PathPatternConfig *ListenerRule_PathPatternConfig `json:"PathPatternConfig,omitempty"`
+
+	// QueryStringConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-rulecondition.html#cfn-elasticloadbalancingv2-listenerrule-rulecondition-querystringconfig
+	QueryStringConfig *ListenerRule_QueryStringConfig `json:"QueryStringConfig,omitempty"`
+
+	// SourceIpConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-rulecondition.html#cfn-elasticloadbalancingv2-listenerrule-rulecondition-sourceipconfig
+	SourceIpConfig *ListenerRule_SourceIpConfig `json:"SourceIpConfig,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-rulecondition.html#cfn-elasticloadbalancingv2-listenerrule-rulecondition-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ListenerRule_RuleCondition) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::ListenerRule.RuleCondition"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_sourceipconfig.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_sourceipconfig.go
new file mode 100644
index 0000000000..ad69ea380d
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_sourceipconfig.go
@@ -0,0 +1,37 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ListenerRule_SourceIpConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.SourceIpConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-sourceipconfig.html
+type ListenerRule_SourceIpConfig struct {
+
+	// Values AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-sourceipconfig.html#cfn-elasticloadbalancingv2-listenerrule-sourceipconfig-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ListenerRule_SourceIpConfig) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::ListenerRule.SourceIpConfig"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgroupstickinessconfig.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgroupstickinessconfig.go
new file mode 100644
index 0000000000..0c586f1152
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgroupstickinessconfig.go
@@ -0,0 +1,42 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ListenerRule_TargetGroupStickinessConfig AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupStickinessConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-targetgroupstickinessconfig.html
+type ListenerRule_TargetGroupStickinessConfig struct {
+
+	// DurationSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-targetgroupstickinessconfig.html#cfn-elasticloadbalancingv2-listenerrule-targetgroupstickinessconfig-durationseconds
+	DurationSeconds *types.Value `json:"DurationSeconds,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-targetgroupstickinessconfig.html#cfn-elasticloadbalancingv2-listenerrule-targetgroupstickinessconfig-enabled
+	Enabled *types.Value `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 *ListenerRule_TargetGroupStickinessConfig) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupStickinessConfig"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgrouptuple.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgrouptuple.go
new file mode 100644
index 0000000000..d6cf5548a4
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-listenerrule_targetgrouptuple.go
@@ -0,0 +1,42 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ListenerRule_TargetGroupTuple AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupTuple)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-targetgrouptuple.html
+type ListenerRule_TargetGroupTuple struct {
+
+	// TargetGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-targetgrouptuple.html#cfn-elasticloadbalancingv2-listenerrule-targetgrouptuple-targetgrouparn
+	TargetGroupArn *types.Value `json:"TargetGroupArn,omitempty"`
+
+	// Weight AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-listenerrule-targetgrouptuple.html#cfn-elasticloadbalancingv2-listenerrule-targetgrouptuple-weight
+	Weight *types.Value `json:"Weight,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ListenerRule_TargetGroupTuple) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupTuple"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer.go
new file mode 100644
index 0000000000..d5eb075c4b
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer.go
@@ -0,0 +1,149 @@
+package elasticloadbalancingv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoadBalancer AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::LoadBalancer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html
+type LoadBalancer struct {
+
+	// IpAddressType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html#cfn-elasticloadbalancingv2-loadbalancer-ipaddresstype
+	IpAddressType *types.Value `json:"IpAddressType,omitempty"`
+
+	// LoadBalancerAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html#cfn-elasticloadbalancingv2-loadbalancer-loadbalancerattributes
+	LoadBalancerAttributes []LoadBalancer_LoadBalancerAttribute `json:"LoadBalancerAttributes,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html#cfn-elasticloadbalancingv2-loadbalancer-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Scheme AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html#cfn-elasticloadbalancingv2-loadbalancer-scheme
+	Scheme *types.Value `json:"Scheme,omitempty"`
+
+	// SecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html#cfn-elasticloadbalancingv2-loadbalancer-securitygroups
+	SecurityGroups *types.Value `json:"SecurityGroups,omitempty"`
+
+	// SubnetMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html#cfn-elasticloadbalancingv2-loadbalancer-subnetmappings
+	SubnetMappings []LoadBalancer_SubnetMapping `json:"SubnetMappings,omitempty"`
+
+	// Subnets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html#cfn-elasticloadbalancingv2-loadbalancer-subnets
+	Subnets *types.Value `json:"Subnets,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html#cfn-elasticloadbalancingv2-loadbalancer-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-loadbalancer.html#cfn-elasticloadbalancingv2-loadbalancer-type
+	Type *types.Value `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 *LoadBalancer) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::LoadBalancer"
+}
+
+// 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 LoadBalancer) MarshalJSON() ([]byte, error) {
+	type Properties LoadBalancer
+	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 *LoadBalancer) UnmarshalJSON(b []byte) error {
+	type Properties LoadBalancer
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LoadBalancer(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_loadbalancerattribute.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_loadbalancerattribute.go
new file mode 100644
index 0000000000..e82ba4ac12
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_loadbalancerattribute.go
@@ -0,0 +1,42 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoadBalancer_LoadBalancerAttribute AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::LoadBalancer.LoadBalancerAttribute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-loadbalancer-loadbalancerattributes.html
+type LoadBalancer_LoadBalancerAttribute struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-loadbalancer-loadbalancerattributes.html#cfn-elasticloadbalancingv2-loadbalancer-loadbalancerattributes-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-loadbalancer-loadbalancerattributes.html#cfn-elasticloadbalancingv2-loadbalancer-loadbalancerattributes-value
+	Value *types.Value `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 *LoadBalancer_LoadBalancerAttribute) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::LoadBalancer.LoadBalancerAttribute"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_subnetmapping.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_subnetmapping.go
new file mode 100644
index 0000000000..11cd085a50
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-loadbalancer_subnetmapping.go
@@ -0,0 +1,52 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoadBalancer_SubnetMapping AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::LoadBalancer.SubnetMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-loadbalancer-subnetmapping.html
+type LoadBalancer_SubnetMapping struct {
+
+	// AllocationId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-loadbalancer-subnetmapping.html#cfn-elasticloadbalancingv2-loadbalancer-subnetmapping-allocationid
+	AllocationId *types.Value `json:"AllocationId,omitempty"`
+
+	// IPv6Address AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-loadbalancer-subnetmapping.html#cfn-elasticloadbalancingv2-loadbalancer-subnetmapping-ipv6address
+	IPv6Address *types.Value `json:"IPv6Address,omitempty"`
+
+	// PrivateIPv4Address AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-loadbalancer-subnetmapping.html#cfn-elasticloadbalancingv2-loadbalancer-subnetmapping-privateipv4address
+	PrivateIPv4Address *types.Value `json:"PrivateIPv4Address,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-loadbalancer-subnetmapping.html#cfn-elasticloadbalancingv2-loadbalancer-subnetmapping-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LoadBalancer_SubnetMapping) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::LoadBalancer.SubnetMapping"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup.go
new file mode 100644
index 0000000000..f34868a201
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup.go
@@ -0,0 +1,199 @@
+package elasticloadbalancingv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// TargetGroup AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::TargetGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html
+type TargetGroup struct {
+
+	// HealthCheckEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-healthcheckenabled
+	HealthCheckEnabled *types.Value `json:"HealthCheckEnabled,omitempty"`
+
+	// HealthCheckIntervalSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-healthcheckintervalseconds
+	HealthCheckIntervalSeconds *types.Value `json:"HealthCheckIntervalSeconds,omitempty"`
+
+	// HealthCheckPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-healthcheckpath
+	HealthCheckPath *types.Value `json:"HealthCheckPath,omitempty"`
+
+	// HealthCheckPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-healthcheckport
+	HealthCheckPort *types.Value `json:"HealthCheckPort,omitempty"`
+
+	// HealthCheckProtocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-healthcheckprotocol
+	HealthCheckProtocol *types.Value `json:"HealthCheckProtocol,omitempty"`
+
+	// HealthCheckTimeoutSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-healthchecktimeoutseconds
+	HealthCheckTimeoutSeconds *types.Value `json:"HealthCheckTimeoutSeconds,omitempty"`
+
+	// HealthyThresholdCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-healthythresholdcount
+	HealthyThresholdCount *types.Value `json:"HealthyThresholdCount,omitempty"`
+
+	// IpAddressType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-ipaddresstype
+	IpAddressType *types.Value `json:"IpAddressType,omitempty"`
+
+	// Matcher AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-matcher
+	Matcher *TargetGroup_Matcher `json:"Matcher,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// ProtocolVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-protocolversion
+	ProtocolVersion *types.Value `json:"ProtocolVersion,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TargetGroupAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-targetgroupattributes
+	TargetGroupAttributes []TargetGroup_TargetGroupAttribute `json:"TargetGroupAttributes,omitempty"`
+
+	// TargetType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-targettype
+	TargetType *types.Value `json:"TargetType,omitempty"`
+
+	// Targets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-targets
+	Targets []TargetGroup_TargetDescription `json:"Targets,omitempty"`
+
+	// UnhealthyThresholdCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-unhealthythresholdcount
+	UnhealthyThresholdCount *types.Value `json:"UnhealthyThresholdCount,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticloadbalancingv2-targetgroup.html#cfn-elasticloadbalancingv2-targetgroup-vpcid
+	VpcId *types.Value `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 *TargetGroup) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::TargetGroup"
+}
+
+// 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 TargetGroup) MarshalJSON() ([]byte, error) {
+	type Properties TargetGroup
+	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 *TargetGroup) UnmarshalJSON(b []byte) error {
+	type Properties TargetGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TargetGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_matcher.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_matcher.go
new file mode 100644
index 0000000000..a8eb391738
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_matcher.go
@@ -0,0 +1,42 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TargetGroup_Matcher AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::TargetGroup.Matcher)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-matcher.html
+type TargetGroup_Matcher struct {
+
+	// GrpcCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-matcher.html#cfn-elasticloadbalancingv2-targetgroup-matcher-grpccode
+	GrpcCode *types.Value `json:"GrpcCode,omitempty"`
+
+	// HttpCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-matcher.html#cfn-elasticloadbalancingv2-targetgroup-matcher-httpcode
+	HttpCode *types.Value `json:"HttpCode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TargetGroup_Matcher) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::TargetGroup.Matcher"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetdescription.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetdescription.go
new file mode 100644
index 0000000000..4fa654a7fe
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetdescription.go
@@ -0,0 +1,47 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TargetGroup_TargetDescription AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::TargetGroup.TargetDescription)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-targetdescription.html
+type TargetGroup_TargetDescription struct {
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-targetdescription.html#cfn-elasticloadbalancingv2-targetgroup-targetdescription-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-targetdescription.html#cfn-elasticloadbalancingv2-targetgroup-targetdescription-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-targetdescription.html#cfn-elasticloadbalancingv2-targetgroup-targetdescription-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TargetGroup_TargetDescription) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::TargetGroup.TargetDescription"
+}
diff --git a/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetgroupattribute.go b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetgroupattribute.go
new file mode 100644
index 0000000000..2059b9d171
--- /dev/null
+++ b/goformation/cloudformation/elasticloadbalancingv2/aws-elasticloadbalancingv2-targetgroup_targetgroupattribute.go
@@ -0,0 +1,42 @@
+package elasticloadbalancingv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TargetGroup_TargetGroupAttribute AWS CloudFormation Resource (AWS::ElasticLoadBalancingV2::TargetGroup.TargetGroupAttribute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-targetgroupattribute.html
+type TargetGroup_TargetGroupAttribute struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-targetgroupattribute.html#cfn-elasticloadbalancingv2-targetgroup-targetgroupattribute-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticloadbalancingv2-targetgroup-targetgroupattribute.html#cfn-elasticloadbalancingv2-targetgroup-targetgroupattribute-value
+	Value *types.Value `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 *TargetGroup_TargetGroupAttribute) AWSCloudFormationType() string {
+	return "AWS::ElasticLoadBalancingV2::TargetGroup.TargetGroupAttribute"
+}
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain.go b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain.go
new file mode 100644
index 0000000000..e9e29dd5ae
--- /dev/null
+++ b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain.go
@@ -0,0 +1,179 @@
+package elasticsearch
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain AWS CloudFormation Resource (AWS::Elasticsearch::Domain)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html
+type Domain struct {
+
+	// AccessPolicies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-accesspolicies
+	AccessPolicies interface{} `json:"AccessPolicies,omitempty"`
+
+	// AdvancedOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-advancedoptions
+	AdvancedOptions map[string]*types.Value `json:"AdvancedOptions,omitempty"`
+
+	// AdvancedSecurityOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-advancedsecurityoptions
+	AdvancedSecurityOptions *Domain_AdvancedSecurityOptionsInput `json:"AdvancedSecurityOptions,omitempty"`
+
+	// CognitoOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-cognitooptions
+	CognitoOptions *Domain_CognitoOptions `json:"CognitoOptions,omitempty"`
+
+	// DomainEndpointOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-domainendpointoptions
+	DomainEndpointOptions *Domain_DomainEndpointOptions `json:"DomainEndpointOptions,omitempty"`
+
+	// DomainName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// EBSOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-ebsoptions
+	EBSOptions *Domain_EBSOptions `json:"EBSOptions,omitempty"`
+
+	// ElasticsearchClusterConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-elasticsearchclusterconfig
+	ElasticsearchClusterConfig *Domain_ElasticsearchClusterConfig `json:"ElasticsearchClusterConfig,omitempty"`
+
+	// ElasticsearchVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-elasticsearchversion
+	ElasticsearchVersion *types.Value `json:"ElasticsearchVersion,omitempty"`
+
+	// EncryptionAtRestOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-encryptionatrestoptions
+	EncryptionAtRestOptions *Domain_EncryptionAtRestOptions `json:"EncryptionAtRestOptions,omitempty"`
+
+	// LogPublishingOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-logpublishingoptions
+	LogPublishingOptions map[string]Domain_LogPublishingOption `json:"LogPublishingOptions,omitempty"`
+
+	// NodeToNodeEncryptionOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-nodetonodeencryptionoptions
+	NodeToNodeEncryptionOptions *Domain_NodeToNodeEncryptionOptions `json:"NodeToNodeEncryptionOptions,omitempty"`
+
+	// SnapshotOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-snapshotoptions
+	SnapshotOptions *Domain_SnapshotOptions `json:"SnapshotOptions,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VPCOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticsearch-domain.html#cfn-elasticsearch-domain-vpcoptions
+	VPCOptions *Domain_VPCOptions `json:"VPCOptions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::Elasticsearch::Domain"
+}
+
+// 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 Domain) MarshalJSON() ([]byte, error) {
+	type Properties Domain
+	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 *Domain) UnmarshalJSON(b []byte) error {
+	type Properties Domain
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Domain(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_advancedsecurityoptionsinput.go b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_advancedsecurityoptionsinput.go
new file mode 100644
index 0000000000..d2c7c34800
--- /dev/null
+++ b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_advancedsecurityoptionsinput.go
@@ -0,0 +1,47 @@
+package elasticsearch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_AdvancedSecurityOptionsInput AWS CloudFormation Resource (AWS::Elasticsearch::Domain.AdvancedSecurityOptionsInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-advancedsecurityoptionsinput.html
+type Domain_AdvancedSecurityOptionsInput struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-advancedsecurityoptionsinput.html#cfn-elasticsearch-domain-advancedsecurityoptionsinput-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// InternalUserDatabaseEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-advancedsecurityoptionsinput.html#cfn-elasticsearch-domain-advancedsecurityoptionsinput-internaluserdatabaseenabled
+	InternalUserDatabaseEnabled *types.Value `json:"InternalUserDatabaseEnabled,omitempty"`
+
+	// MasterUserOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-advancedsecurityoptionsinput.html#cfn-elasticsearch-domain-advancedsecurityoptionsinput-masteruseroptions
+	MasterUserOptions *Domain_MasterUserOptions `json:"MasterUserOptions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AdvancedSecurityOptionsInput) AWSCloudFormationType() string {
+	return "AWS::Elasticsearch::Domain.AdvancedSecurityOptionsInput"
+}
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_cognitooptions.go b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_cognitooptions.go
new file mode 100644
index 0000000000..be64a7e1fc
--- /dev/null
+++ b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_cognitooptions.go
@@ -0,0 +1,52 @@
+package elasticsearch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_CognitoOptions AWS CloudFormation Resource (AWS::Elasticsearch::Domain.CognitoOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-cognitooptions.html
+type Domain_CognitoOptions struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-cognitooptions.html#cfn-elasticsearch-domain-cognitooptions-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// IdentityPoolId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-cognitooptions.html#cfn-elasticsearch-domain-cognitooptions-identitypoolid
+	IdentityPoolId *types.Value `json:"IdentityPoolId,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-cognitooptions.html#cfn-elasticsearch-domain-cognitooptions-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// UserPoolId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-cognitooptions.html#cfn-elasticsearch-domain-cognitooptions-userpoolid
+	UserPoolId *types.Value `json:"UserPoolId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CognitoOptions) AWSCloudFormationType() string {
+	return "AWS::Elasticsearch::Domain.CognitoOptions"
+}
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_coldstorageoptions.go b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_coldstorageoptions.go
new file mode 100644
index 0000000000..94e0da930c
--- /dev/null
+++ b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_coldstorageoptions.go
@@ -0,0 +1,37 @@
+package elasticsearch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_ColdStorageOptions AWS CloudFormation Resource (AWS::Elasticsearch::Domain.ColdStorageOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-coldstorageoptions.html
+type Domain_ColdStorageOptions struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-coldstorageoptions.html#cfn-elasticsearch-domain-coldstorageoptions-enabled
+	Enabled *types.Value `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 *Domain_ColdStorageOptions) AWSCloudFormationType() string {
+	return "AWS::Elasticsearch::Domain.ColdStorageOptions"
+}
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_domainendpointoptions.go b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_domainendpointoptions.go
new file mode 100644
index 0000000000..9a3636d80a
--- /dev/null
+++ b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_domainendpointoptions.go
@@ -0,0 +1,57 @@
+package elasticsearch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_DomainEndpointOptions AWS CloudFormation Resource (AWS::Elasticsearch::Domain.DomainEndpointOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-domainendpointoptions.html
+type Domain_DomainEndpointOptions struct {
+
+	// CustomEndpoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-domainendpointoptions.html#cfn-elasticsearch-domain-domainendpointoptions-customendpoint
+	CustomEndpoint *types.Value `json:"CustomEndpoint,omitempty"`
+
+	// CustomEndpointCertificateArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-domainendpointoptions.html#cfn-elasticsearch-domain-domainendpointoptions-customendpointcertificatearn
+	CustomEndpointCertificateArn *types.Value `json:"CustomEndpointCertificateArn,omitempty"`
+
+	// CustomEndpointEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-domainendpointoptions.html#cfn-elasticsearch-domain-domainendpointoptions-customendpointenabled
+	CustomEndpointEnabled *types.Value `json:"CustomEndpointEnabled,omitempty"`
+
+	// EnforceHTTPS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-domainendpointoptions.html#cfn-elasticsearch-domain-domainendpointoptions-enforcehttps
+	EnforceHTTPS *types.Value `json:"EnforceHTTPS,omitempty"`
+
+	// TLSSecurityPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-domainendpointoptions.html#cfn-elasticsearch-domain-domainendpointoptions-tlssecuritypolicy
+	TLSSecurityPolicy *types.Value `json:"TLSSecurityPolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DomainEndpointOptions) AWSCloudFormationType() string {
+	return "AWS::Elasticsearch::Domain.DomainEndpointOptions"
+}
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_ebsoptions.go b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_ebsoptions.go
new file mode 100644
index 0000000000..f539d16193
--- /dev/null
+++ b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_ebsoptions.go
@@ -0,0 +1,52 @@
+package elasticsearch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_EBSOptions AWS CloudFormation Resource (AWS::Elasticsearch::Domain.EBSOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-ebsoptions.html
+type Domain_EBSOptions struct {
+
+	// EBSEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-ebsoptions.html#cfn-elasticsearch-domain-ebsoptions-ebsenabled
+	EBSEnabled *types.Value `json:"EBSEnabled,omitempty"`
+
+	// Iops AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-ebsoptions.html#cfn-elasticsearch-domain-ebsoptions-iops
+	Iops *types.Value `json:"Iops,omitempty"`
+
+	// VolumeSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-ebsoptions.html#cfn-elasticsearch-domain-ebsoptions-volumesize
+	VolumeSize *types.Value `json:"VolumeSize,omitempty"`
+
+	// VolumeType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-ebsoptions.html#cfn-elasticsearch-domain-ebsoptions-volumetype
+	VolumeType *types.Value `json:"VolumeType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EBSOptions) AWSCloudFormationType() string {
+	return "AWS::Elasticsearch::Domain.EBSOptions"
+}
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_elasticsearchclusterconfig.go b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_elasticsearchclusterconfig.go
new file mode 100644
index 0000000000..a372d0bca1
--- /dev/null
+++ b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_elasticsearchclusterconfig.go
@@ -0,0 +1,87 @@
+package elasticsearch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_ElasticsearchClusterConfig AWS CloudFormation Resource (AWS::Elasticsearch::Domain.ElasticsearchClusterConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html
+type Domain_ElasticsearchClusterConfig struct {
+
+	// ColdStorageOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticsearchclusterconfig-coldstorageoptions
+	ColdStorageOptions *Domain_ColdStorageOptions `json:"ColdStorageOptions,omitempty"`
+
+	// DedicatedMasterCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticseachclusterconfig-dedicatedmastercount
+	DedicatedMasterCount *types.Value `json:"DedicatedMasterCount,omitempty"`
+
+	// DedicatedMasterEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticseachclusterconfig-dedicatedmasterenabled
+	DedicatedMasterEnabled *types.Value `json:"DedicatedMasterEnabled,omitempty"`
+
+	// DedicatedMasterType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticseachclusterconfig-dedicatedmastertype
+	DedicatedMasterType *types.Value `json:"DedicatedMasterType,omitempty"`
+
+	// InstanceCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticseachclusterconfig-instancecount
+	InstanceCount *types.Value `json:"InstanceCount,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticseachclusterconfig-instnacetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// WarmCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticsearchclusterconfig-warmcount
+	WarmCount *types.Value `json:"WarmCount,omitempty"`
+
+	// WarmEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticsearchclusterconfig-warmenabled
+	WarmEnabled *types.Value `json:"WarmEnabled,omitempty"`
+
+	// WarmType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticsearchclusterconfig-warmtype
+	WarmType *types.Value `json:"WarmType,omitempty"`
+
+	// ZoneAwarenessConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticsearchclusterconfig-zoneawarenessconfig
+	ZoneAwarenessConfig *Domain_ZoneAwarenessConfig `json:"ZoneAwarenessConfig,omitempty"`
+
+	// ZoneAwarenessEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-elasticsearchclusterconfig.html#cfn-elasticsearch-domain-elasticseachclusterconfig-zoneawarenessenabled
+	ZoneAwarenessEnabled *types.Value `json:"ZoneAwarenessEnabled,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ElasticsearchClusterConfig) AWSCloudFormationType() string {
+	return "AWS::Elasticsearch::Domain.ElasticsearchClusterConfig"
+}
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_encryptionatrestoptions.go b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_encryptionatrestoptions.go
new file mode 100644
index 0000000000..bcc052afeb
--- /dev/null
+++ b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_encryptionatrestoptions.go
@@ -0,0 +1,42 @@
+package elasticsearch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_EncryptionAtRestOptions AWS CloudFormation Resource (AWS::Elasticsearch::Domain.EncryptionAtRestOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-encryptionatrestoptions.html
+type Domain_EncryptionAtRestOptions struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-encryptionatrestoptions.html#cfn-elasticsearch-domain-encryptionatrestoptions-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-encryptionatrestoptions.html#cfn-elasticsearch-domain-encryptionatrestoptions-kmskeyid
+	KmsKeyId *types.Value `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 *Domain_EncryptionAtRestOptions) AWSCloudFormationType() string {
+	return "AWS::Elasticsearch::Domain.EncryptionAtRestOptions"
+}
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_logpublishingoption.go b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_logpublishingoption.go
new file mode 100644
index 0000000000..46ca0d39dd
--- /dev/null
+++ b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_logpublishingoption.go
@@ -0,0 +1,42 @@
+package elasticsearch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_LogPublishingOption AWS CloudFormation Resource (AWS::Elasticsearch::Domain.LogPublishingOption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-logpublishingoption.html
+type Domain_LogPublishingOption struct {
+
+	// CloudWatchLogsLogGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-logpublishingoption.html#cfn-elasticsearch-domain-logpublishingoption-cloudwatchlogsloggrouparn
+	CloudWatchLogsLogGroupArn *types.Value `json:"CloudWatchLogsLogGroupArn,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-logpublishingoption.html#cfn-elasticsearch-domain-logpublishingoption-enabled
+	Enabled *types.Value `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 *Domain_LogPublishingOption) AWSCloudFormationType() string {
+	return "AWS::Elasticsearch::Domain.LogPublishingOption"
+}
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_masteruseroptions.go b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_masteruseroptions.go
new file mode 100644
index 0000000000..d98bd0c499
--- /dev/null
+++ b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_masteruseroptions.go
@@ -0,0 +1,47 @@
+package elasticsearch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_MasterUserOptions AWS CloudFormation Resource (AWS::Elasticsearch::Domain.MasterUserOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-masteruseroptions.html
+type Domain_MasterUserOptions struct {
+
+	// MasterUserARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-masteruseroptions.html#cfn-elasticsearch-domain-masteruseroptions-masteruserarn
+	MasterUserARN *types.Value `json:"MasterUserARN,omitempty"`
+
+	// MasterUserName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-masteruseroptions.html#cfn-elasticsearch-domain-masteruseroptions-masterusername
+	MasterUserName *types.Value `json:"MasterUserName,omitempty"`
+
+	// MasterUserPassword AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-masteruseroptions.html#cfn-elasticsearch-domain-masteruseroptions-masteruserpassword
+	MasterUserPassword *types.Value `json:"MasterUserPassword,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_MasterUserOptions) AWSCloudFormationType() string {
+	return "AWS::Elasticsearch::Domain.MasterUserOptions"
+}
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_nodetonodeencryptionoptions.go b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_nodetonodeencryptionoptions.go
new file mode 100644
index 0000000000..baa8239b11
--- /dev/null
+++ b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_nodetonodeencryptionoptions.go
@@ -0,0 +1,37 @@
+package elasticsearch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_NodeToNodeEncryptionOptions AWS CloudFormation Resource (AWS::Elasticsearch::Domain.NodeToNodeEncryptionOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-nodetonodeencryptionoptions.html
+type Domain_NodeToNodeEncryptionOptions struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-nodetonodeencryptionoptions.html#cfn-elasticsearch-domain-nodetonodeencryptionoptions-enabled
+	Enabled *types.Value `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 *Domain_NodeToNodeEncryptionOptions) AWSCloudFormationType() string {
+	return "AWS::Elasticsearch::Domain.NodeToNodeEncryptionOptions"
+}
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_snapshotoptions.go b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_snapshotoptions.go
new file mode 100644
index 0000000000..eac32ce0bf
--- /dev/null
+++ b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_snapshotoptions.go
@@ -0,0 +1,37 @@
+package elasticsearch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_SnapshotOptions AWS CloudFormation Resource (AWS::Elasticsearch::Domain.SnapshotOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-snapshotoptions.html
+type Domain_SnapshotOptions struct {
+
+	// AutomatedSnapshotStartHour AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-snapshotoptions.html#cfn-elasticsearch-domain-snapshotoptions-automatedsnapshotstarthour
+	AutomatedSnapshotStartHour *types.Value `json:"AutomatedSnapshotStartHour,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SnapshotOptions) AWSCloudFormationType() string {
+	return "AWS::Elasticsearch::Domain.SnapshotOptions"
+}
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_vpcoptions.go b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_vpcoptions.go
new file mode 100644
index 0000000000..dd65319f9c
--- /dev/null
+++ b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_vpcoptions.go
@@ -0,0 +1,42 @@
+package elasticsearch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_VPCOptions AWS CloudFormation Resource (AWS::Elasticsearch::Domain.VPCOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-vpcoptions.html
+type Domain_VPCOptions struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-vpcoptions.html#cfn-elasticsearch-domain-vpcoptions-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-vpcoptions.html#cfn-elasticsearch-domain-vpcoptions-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Domain_VPCOptions) AWSCloudFormationType() string {
+	return "AWS::Elasticsearch::Domain.VPCOptions"
+}
diff --git a/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_zoneawarenessconfig.go b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_zoneawarenessconfig.go
new file mode 100644
index 0000000000..68604a1c85
--- /dev/null
+++ b/goformation/cloudformation/elasticsearch/aws-elasticsearch-domain_zoneawarenessconfig.go
@@ -0,0 +1,37 @@
+package elasticsearch
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_ZoneAwarenessConfig AWS CloudFormation Resource (AWS::Elasticsearch::Domain.ZoneAwarenessConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-zoneawarenessconfig.html
+type Domain_ZoneAwarenessConfig struct {
+
+	// AvailabilityZoneCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticsearch-domain-zoneawarenessconfig.html#cfn-elasticsearch-domain-zoneawarenessconfig-availabilityzonecount
+	AvailabilityZoneCount *types.Value `json:"AvailabilityZoneCount,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ZoneAwarenessConfig) AWSCloudFormationType() string {
+	return "AWS::Elasticsearch::Domain.ZoneAwarenessConfig"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster.go b/goformation/cloudformation/emr/aws-emr-cluster.go
new file mode 100644
index 0000000000..bc1384d12e
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster.go
@@ -0,0 +1,214 @@
+package emr
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster AWS CloudFormation Resource (AWS::EMR::Cluster)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html
+type Cluster struct {
+
+	// AdditionalInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-additionalinfo
+	AdditionalInfo interface{} `json:"AdditionalInfo,omitempty"`
+
+	// Applications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-applications
+	Applications []Cluster_Application `json:"Applications,omitempty"`
+
+	// AutoScalingRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-autoscalingrole
+	AutoScalingRole *types.Value `json:"AutoScalingRole,omitempty"`
+
+	// BootstrapActions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-bootstrapactions
+	BootstrapActions []Cluster_BootstrapActionConfig `json:"BootstrapActions,omitempty"`
+
+	// Configurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-configurations
+	Configurations []Cluster_Configuration `json:"Configurations,omitempty"`
+
+	// CustomAmiId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-customamiid
+	CustomAmiId *types.Value `json:"CustomAmiId,omitempty"`
+
+	// EbsRootVolumeSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-ebsrootvolumesize
+	EbsRootVolumeSize *types.Value `json:"EbsRootVolumeSize,omitempty"`
+
+	// Instances AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-instances
+	Instances *Cluster_JobFlowInstancesConfig `json:"Instances,omitempty"`
+
+	// JobFlowRole AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-jobflowrole
+	JobFlowRole *types.Value `json:"JobFlowRole,omitempty"`
+
+	// KerberosAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-kerberosattributes
+	KerberosAttributes *Cluster_KerberosAttributes `json:"KerberosAttributes,omitempty"`
+
+	// LogEncryptionKmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-logencryptionkmskeyid
+	LogEncryptionKmsKeyId *types.Value `json:"LogEncryptionKmsKeyId,omitempty"`
+
+	// LogUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-loguri
+	LogUri *types.Value `json:"LogUri,omitempty"`
+
+	// ManagedScalingPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-managedscalingpolicy
+	ManagedScalingPolicy *Cluster_ManagedScalingPolicy `json:"ManagedScalingPolicy,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ReleaseLabel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-releaselabel
+	ReleaseLabel *types.Value `json:"ReleaseLabel,omitempty"`
+
+	// ScaleDownBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-scaledownbehavior
+	ScaleDownBehavior *types.Value `json:"ScaleDownBehavior,omitempty"`
+
+	// SecurityConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-securityconfiguration
+	SecurityConfiguration *types.Value `json:"SecurityConfiguration,omitempty"`
+
+	// ServiceRole AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-servicerole
+	ServiceRole *types.Value `json:"ServiceRole,omitempty"`
+
+	// StepConcurrencyLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-stepconcurrencylevel
+	StepConcurrencyLevel *types.Value `json:"StepConcurrencyLevel,omitempty"`
+
+	// Steps AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-steps
+	Steps []Cluster_StepConfig `json:"Steps,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VisibleToAllUsers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-cluster.html#cfn-elasticmapreduce-cluster-visibletoallusers
+	VisibleToAllUsers *types.Value `json:"VisibleToAllUsers,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::EMR::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/emr/aws-emr-cluster_application.go b/goformation/cloudformation/emr/aws-emr-cluster_application.go
new file mode 100644
index 0000000000..a154e4fa6a
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_application.go
@@ -0,0 +1,52 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_Application AWS CloudFormation Resource (AWS::EMR::Cluster.Application)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-application.html
+type Cluster_Application struct {
+
+	// AdditionalInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-application.html#cfn-elasticmapreduce-cluster-application-additionalinfo
+	AdditionalInfo map[string]*types.Value `json:"AdditionalInfo,omitempty"`
+
+	// Args AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-application.html#cfn-elasticmapreduce-cluster-application-args
+	Args *types.Value `json:"Args,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-application.html#cfn-elasticmapreduce-cluster-application-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-application.html#cfn-elasticmapreduce-cluster-application-version
+	Version *types.Value `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 *Cluster_Application) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.Application"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_autoscalingpolicy.go b/goformation/cloudformation/emr/aws-emr-cluster_autoscalingpolicy.go
new file mode 100644
index 0000000000..44db300c70
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_autoscalingpolicy.go
@@ -0,0 +1,40 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_AutoScalingPolicy AWS CloudFormation Resource (AWS::EMR::Cluster.AutoScalingPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-autoscalingpolicy.html
+type Cluster_AutoScalingPolicy struct {
+
+	// Constraints AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-autoscalingpolicy.html#cfn-elasticmapreduce-cluster-autoscalingpolicy-constraints
+	Constraints *Cluster_ScalingConstraints `json:"Constraints,omitempty"`
+
+	// Rules AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-autoscalingpolicy.html#cfn-elasticmapreduce-cluster-autoscalingpolicy-rules
+	Rules []Cluster_ScalingRule `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 *Cluster_AutoScalingPolicy) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.AutoScalingPolicy"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_bootstrapactionconfig.go b/goformation/cloudformation/emr/aws-emr-cluster_bootstrapactionconfig.go
new file mode 100644
index 0000000000..afcebea459
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_bootstrapactionconfig.go
@@ -0,0 +1,42 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_BootstrapActionConfig AWS CloudFormation Resource (AWS::EMR::Cluster.BootstrapActionConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-bootstrapactionconfig.html
+type Cluster_BootstrapActionConfig struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-bootstrapactionconfig.html#cfn-elasticmapreduce-cluster-bootstrapactionconfig-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ScriptBootstrapAction AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-bootstrapactionconfig.html#cfn-elasticmapreduce-cluster-bootstrapactionconfig-scriptbootstrapaction
+	ScriptBootstrapAction *Cluster_ScriptBootstrapActionConfig `json:"ScriptBootstrapAction,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_BootstrapActionConfig) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.BootstrapActionConfig"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_cloudwatchalarmdefinition.go b/goformation/cloudformation/emr/aws-emr-cluster_cloudwatchalarmdefinition.go
new file mode 100644
index 0000000000..ea600e502f
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_cloudwatchalarmdefinition.go
@@ -0,0 +1,77 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_CloudWatchAlarmDefinition AWS CloudFormation Resource (AWS::EMR::Cluster.CloudWatchAlarmDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-cloudwatchalarmdefinition.html
+type Cluster_CloudWatchAlarmDefinition struct {
+
+	// ComparisonOperator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-cluster-cloudwatchalarmdefinition-comparisonoperator
+	ComparisonOperator *types.Value `json:"ComparisonOperator,omitempty"`
+
+	// Dimensions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-cluster-cloudwatchalarmdefinition-dimensions
+	Dimensions []Cluster_MetricDimension `json:"Dimensions,omitempty"`
+
+	// EvaluationPeriods AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-cluster-cloudwatchalarmdefinition-evaluationperiods
+	EvaluationPeriods *types.Value `json:"EvaluationPeriods,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-cluster-cloudwatchalarmdefinition-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// Namespace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-cluster-cloudwatchalarmdefinition-namespace
+	Namespace *types.Value `json:"Namespace,omitempty"`
+
+	// Period AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-cluster-cloudwatchalarmdefinition-period
+	Period *types.Value `json:"Period"`
+
+	// Statistic AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-cluster-cloudwatchalarmdefinition-statistic
+	Statistic *types.Value `json:"Statistic,omitempty"`
+
+	// Threshold AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-cluster-cloudwatchalarmdefinition-threshold
+	Threshold *types.Value `json:"Threshold"`
+
+	// Unit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-cluster-cloudwatchalarmdefinition-unit
+	Unit *types.Value `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 *Cluster_CloudWatchAlarmDefinition) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.CloudWatchAlarmDefinition"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_computelimits.go b/goformation/cloudformation/emr/aws-emr-cluster_computelimits.go
new file mode 100644
index 0000000000..82236daf58
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_computelimits.go
@@ -0,0 +1,57 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_ComputeLimits AWS CloudFormation Resource (AWS::EMR::Cluster.ComputeLimits)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-computelimits.html
+type Cluster_ComputeLimits struct {
+
+	// MaximumCapacityUnits AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-computelimits.html#cfn-elasticmapreduce-cluster-computelimits-maximumcapacityunits
+	MaximumCapacityUnits *types.Value `json:"MaximumCapacityUnits"`
+
+	// MaximumCoreCapacityUnits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-computelimits.html#cfn-elasticmapreduce-cluster-computelimits-maximumcorecapacityunits
+	MaximumCoreCapacityUnits *types.Value `json:"MaximumCoreCapacityUnits,omitempty"`
+
+	// MaximumOnDemandCapacityUnits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-computelimits.html#cfn-elasticmapreduce-cluster-computelimits-maximumondemandcapacityunits
+	MaximumOnDemandCapacityUnits *types.Value `json:"MaximumOnDemandCapacityUnits,omitempty"`
+
+	// MinimumCapacityUnits AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-computelimits.html#cfn-elasticmapreduce-cluster-computelimits-minimumcapacityunits
+	MinimumCapacityUnits *types.Value `json:"MinimumCapacityUnits"`
+
+	// UnitType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-computelimits.html#cfn-elasticmapreduce-cluster-computelimits-unittype
+	UnitType *types.Value `json:"UnitType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ComputeLimits) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.ComputeLimits"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_configuration.go b/goformation/cloudformation/emr/aws-emr-cluster_configuration.go
new file mode 100644
index 0000000000..a1522cb80b
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_configuration.go
@@ -0,0 +1,47 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_Configuration AWS CloudFormation Resource (AWS::EMR::Cluster.Configuration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-configuration.html
+type Cluster_Configuration struct {
+
+	// Classification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-configuration.html#cfn-elasticmapreduce-cluster-configuration-classification
+	Classification *types.Value `json:"Classification,omitempty"`
+
+	// ConfigurationProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-configuration.html#cfn-elasticmapreduce-cluster-configuration-configurationproperties
+	ConfigurationProperties map[string]*types.Value `json:"ConfigurationProperties,omitempty"`
+
+	// Configurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-configuration.html#cfn-elasticmapreduce-cluster-configuration-configurations
+	Configurations []Cluster_Configuration `json:"Configurations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Configuration) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.Configuration"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_ebsblockdeviceconfig.go b/goformation/cloudformation/emr/aws-emr-cluster_ebsblockdeviceconfig.go
new file mode 100644
index 0000000000..9cb9ca38fa
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_ebsblockdeviceconfig.go
@@ -0,0 +1,42 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_EbsBlockDeviceConfig AWS CloudFormation Resource (AWS::EMR::Cluster.EbsBlockDeviceConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ebsblockdeviceconfig.html
+type Cluster_EbsBlockDeviceConfig struct {
+
+	// VolumeSpecification AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ebsblockdeviceconfig.html#cfn-elasticmapreduce-cluster-ebsblockdeviceconfig-volumespecification
+	VolumeSpecification *Cluster_VolumeSpecification `json:"VolumeSpecification,omitempty"`
+
+	// VolumesPerInstance AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ebsblockdeviceconfig.html#cfn-elasticmapreduce-cluster-ebsblockdeviceconfig-volumesperinstance
+	VolumesPerInstance *types.Value `json:"VolumesPerInstance,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EbsBlockDeviceConfig) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.EbsBlockDeviceConfig"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_ebsconfiguration.go b/goformation/cloudformation/emr/aws-emr-cluster_ebsconfiguration.go
new file mode 100644
index 0000000000..040fae8047
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_ebsconfiguration.go
@@ -0,0 +1,42 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_EbsConfiguration AWS CloudFormation Resource (AWS::EMR::Cluster.EbsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ebsconfiguration.html
+type Cluster_EbsConfiguration struct {
+
+	// EbsBlockDeviceConfigs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ebsconfiguration.html#cfn-elasticmapreduce-cluster-ebsconfiguration-ebsblockdeviceconfigs
+	EbsBlockDeviceConfigs []Cluster_EbsBlockDeviceConfig `json:"EbsBlockDeviceConfigs,omitempty"`
+
+	// EbsOptimized AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ebsconfiguration.html#cfn-elasticmapreduce-cluster-ebsconfiguration-ebsoptimized
+	EbsOptimized *types.Value `json:"EbsOptimized,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EbsConfiguration) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.EbsConfiguration"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_hadoopjarstepconfig.go b/goformation/cloudformation/emr/aws-emr-cluster_hadoopjarstepconfig.go
new file mode 100644
index 0000000000..5bc4df44d0
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_hadoopjarstepconfig.go
@@ -0,0 +1,52 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_HadoopJarStepConfig AWS CloudFormation Resource (AWS::EMR::Cluster.HadoopJarStepConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-hadoopjarstepconfig.html
+type Cluster_HadoopJarStepConfig struct {
+
+	// Args AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-hadoopjarstepconfig.html#cfn-elasticmapreduce-cluster-hadoopjarstepconfig-args
+	Args *types.Value `json:"Args,omitempty"`
+
+	// Jar AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-hadoopjarstepconfig.html#cfn-elasticmapreduce-cluster-hadoopjarstepconfig-jar
+	Jar *types.Value `json:"Jar,omitempty"`
+
+	// MainClass AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-hadoopjarstepconfig.html#cfn-elasticmapreduce-cluster-hadoopjarstepconfig-mainclass
+	MainClass *types.Value `json:"MainClass,omitempty"`
+
+	// StepProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-hadoopjarstepconfig.html#cfn-elasticmapreduce-cluster-hadoopjarstepconfig-stepproperties
+	StepProperties []Cluster_KeyValue `json:"StepProperties,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_HadoopJarStepConfig) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.HadoopJarStepConfig"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_instancefleetconfig.go b/goformation/cloudformation/emr/aws-emr-cluster_instancefleetconfig.go
new file mode 100644
index 0000000000..56003bcb76
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_instancefleetconfig.go
@@ -0,0 +1,57 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_InstanceFleetConfig AWS CloudFormation Resource (AWS::EMR::Cluster.InstanceFleetConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetconfig.html
+type Cluster_InstanceFleetConfig struct {
+
+	// InstanceTypeConfigs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetconfig.html#cfn-elasticmapreduce-cluster-instancefleetconfig-instancetypeconfigs
+	InstanceTypeConfigs []Cluster_InstanceTypeConfig `json:"InstanceTypeConfigs,omitempty"`
+
+	// LaunchSpecifications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetconfig.html#cfn-elasticmapreduce-cluster-instancefleetconfig-launchspecifications
+	LaunchSpecifications *Cluster_InstanceFleetProvisioningSpecifications `json:"LaunchSpecifications,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetconfig.html#cfn-elasticmapreduce-cluster-instancefleetconfig-name
+	Name *types.Value `json:"Name,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
+	TargetOnDemandCapacity *types.Value `json:"TargetOnDemandCapacity,omitempty"`
+
+	// TargetSpotCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetconfig.html#cfn-elasticmapreduce-cluster-instancefleetconfig-targetspotcapacity
+	TargetSpotCapacity *types.Value `json:"TargetSpotCapacity,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InstanceFleetConfig) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.InstanceFleetConfig"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_instancefleetprovisioningspecifications.go b/goformation/cloudformation/emr/aws-emr-cluster_instancefleetprovisioningspecifications.go
new file mode 100644
index 0000000000..2dd628e828
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_instancefleetprovisioningspecifications.go
@@ -0,0 +1,40 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_InstanceFleetProvisioningSpecifications AWS CloudFormation Resource (AWS::EMR::Cluster.InstanceFleetProvisioningSpecifications)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetprovisioningspecifications.html
+type Cluster_InstanceFleetProvisioningSpecifications struct {
+
+	// OnDemandSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetprovisioningspecifications.html#cfn-elasticmapreduce-cluster-instancefleetprovisioningspecifications-ondemandspecification
+	OnDemandSpecification *Cluster_OnDemandProvisioningSpecification `json:"OnDemandSpecification,omitempty"`
+
+	// SpotSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancefleetprovisioningspecifications.html#cfn-elasticmapreduce-cluster-instancefleetprovisioningspecifications-spotspecification
+	SpotSpecification *Cluster_SpotProvisioningSpecification `json:"SpotSpecification,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InstanceFleetProvisioningSpecifications) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.InstanceFleetProvisioningSpecifications"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_instancegroupconfig.go b/goformation/cloudformation/emr/aws-emr-cluster_instancegroupconfig.go
new file mode 100644
index 0000000000..1b84114b0d
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_instancegroupconfig.go
@@ -0,0 +1,77 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_InstanceGroupConfig AWS CloudFormation Resource (AWS::EMR::Cluster.InstanceGroupConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancegroupconfig.html
+type Cluster_InstanceGroupConfig struct {
+
+	// AutoScalingPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancegroupconfig.html#cfn-elasticmapreduce-cluster-instancegroupconfig-autoscalingpolicy
+	AutoScalingPolicy *Cluster_AutoScalingPolicy `json:"AutoScalingPolicy,omitempty"`
+
+	// BidPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancegroupconfig.html#cfn-elasticmapreduce-cluster-instancegroupconfig-bidprice
+	BidPrice *types.Value `json:"BidPrice,omitempty"`
+
+	// Configurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancegroupconfig.html#cfn-elasticmapreduce-cluster-instancegroupconfig-configurations
+	Configurations []Cluster_Configuration `json:"Configurations,omitempty"`
+
+	// CustomAmiId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancegroupconfig.html#cfn-elasticmapreduce-cluster-instancegroupconfig-customamiid
+	CustomAmiId *types.Value `json:"CustomAmiId,omitempty"`
+
+	// EbsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancegroupconfig.html#cfn-elasticmapreduce-cluster-instancegroupconfig-ebsconfiguration
+	EbsConfiguration *Cluster_EbsConfiguration `json:"EbsConfiguration,omitempty"`
+
+	// InstanceCount AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancegroupconfig.html#cfn-elasticmapreduce-cluster-instancegroupconfig-instancecount
+	InstanceCount *types.Value `json:"InstanceCount"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancegroupconfig.html#cfn-elasticmapreduce-cluster-instancegroupconfig-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// Market AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancegroupconfig.html#cfn-elasticmapreduce-cluster-instancegroupconfig-market
+	Market *types.Value `json:"Market,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancegroupconfig.html#cfn-elasticmapreduce-cluster-instancegroupconfig-name
+	Name *types.Value `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 *Cluster_InstanceGroupConfig) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.InstanceGroupConfig"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_instancetypeconfig.go b/goformation/cloudformation/emr/aws-emr-cluster_instancetypeconfig.go
new file mode 100644
index 0000000000..393767ad4d
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_instancetypeconfig.go
@@ -0,0 +1,67 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_InstanceTypeConfig AWS CloudFormation Resource (AWS::EMR::Cluster.InstanceTypeConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancetypeconfig.html
+type Cluster_InstanceTypeConfig struct {
+
+	// BidPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancetypeconfig.html#cfn-elasticmapreduce-cluster-instancetypeconfig-bidprice
+	BidPrice *types.Value `json:"BidPrice,omitempty"`
+
+	// BidPriceAsPercentageOfOnDemandPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancetypeconfig.html#cfn-elasticmapreduce-cluster-instancetypeconfig-bidpriceaspercentageofondemandprice
+	BidPriceAsPercentageOfOnDemandPrice *types.Value `json:"BidPriceAsPercentageOfOnDemandPrice,omitempty"`
+
+	// Configurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancetypeconfig.html#cfn-elasticmapreduce-cluster-instancetypeconfig-configurations
+	Configurations []Cluster_Configuration `json:"Configurations,omitempty"`
+
+	// CustomAmiId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancetypeconfig.html#cfn-elasticmapreduce-cluster-instancetypeconfig-customamiid
+	CustomAmiId *types.Value `json:"CustomAmiId,omitempty"`
+
+	// EbsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancetypeconfig.html#cfn-elasticmapreduce-cluster-instancetypeconfig-ebsconfiguration
+	EbsConfiguration *Cluster_EbsConfiguration `json:"EbsConfiguration,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-instancetypeconfig.html#cfn-elasticmapreduce-cluster-instancetypeconfig-instancetype
+	InstanceType *types.Value `json:"InstanceType,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
+	WeightedCapacity *types.Value `json:"WeightedCapacity,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InstanceTypeConfig) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.InstanceTypeConfig"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_jobflowinstancesconfig.go b/goformation/cloudformation/emr/aws-emr-cluster_jobflowinstancesconfig.go
new file mode 100644
index 0000000000..bdde7f4b35
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_jobflowinstancesconfig.go
@@ -0,0 +1,112 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_JobFlowInstancesConfig AWS CloudFormation Resource (AWS::EMR::Cluster.JobFlowInstancesConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html
+type Cluster_JobFlowInstancesConfig struct {
+
+	// AdditionalMasterSecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-additionalmastersecuritygroups
+	AdditionalMasterSecurityGroups *types.Value `json:"AdditionalMasterSecurityGroups,omitempty"`
+
+	// AdditionalSlaveSecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-additionalslavesecuritygroups
+	AdditionalSlaveSecurityGroups *types.Value `json:"AdditionalSlaveSecurityGroups,omitempty"`
+
+	// CoreInstanceFleet AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-coreinstancefleet
+	CoreInstanceFleet *Cluster_InstanceFleetConfig `json:"CoreInstanceFleet,omitempty"`
+
+	// CoreInstanceGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-coreinstancegroup
+	CoreInstanceGroup *Cluster_InstanceGroupConfig `json:"CoreInstanceGroup,omitempty"`
+
+	// Ec2KeyName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-ec2keyname
+	Ec2KeyName *types.Value `json:"Ec2KeyName,omitempty"`
+
+	// Ec2SubnetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-ec2subnetid
+	Ec2SubnetId *types.Value `json:"Ec2SubnetId,omitempty"`
+
+	// Ec2SubnetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-ec2subnetids
+	Ec2SubnetIds *types.Value `json:"Ec2SubnetIds,omitempty"`
+
+	// EmrManagedMasterSecurityGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-emrmanagedmastersecuritygroup
+	EmrManagedMasterSecurityGroup *types.Value `json:"EmrManagedMasterSecurityGroup,omitempty"`
+
+	// EmrManagedSlaveSecurityGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-emrmanagedslavesecuritygroup
+	EmrManagedSlaveSecurityGroup *types.Value `json:"EmrManagedSlaveSecurityGroup,omitempty"`
+
+	// HadoopVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-hadoopversion
+	HadoopVersion *types.Value `json:"HadoopVersion,omitempty"`
+
+	// KeepJobFlowAliveWhenNoSteps AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-keepjobflowalivewhennosteps
+	KeepJobFlowAliveWhenNoSteps *types.Value `json:"KeepJobFlowAliveWhenNoSteps,omitempty"`
+
+	// MasterInstanceFleet AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-masterinstancefleet
+	MasterInstanceFleet *Cluster_InstanceFleetConfig `json:"MasterInstanceFleet,omitempty"`
+
+	// MasterInstanceGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-masterinstancegroup
+	MasterInstanceGroup *Cluster_InstanceGroupConfig `json:"MasterInstanceGroup,omitempty"`
+
+	// Placement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-placement
+	Placement *Cluster_PlacementType `json:"Placement,omitempty"`
+
+	// ServiceAccessSecurityGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-serviceaccesssecuritygroup
+	ServiceAccessSecurityGroup *types.Value `json:"ServiceAccessSecurityGroup,omitempty"`
+
+	// TerminationProtected AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-jobflowinstancesconfig.html#cfn-elasticmapreduce-cluster-jobflowinstancesconfig-terminationprotected
+	TerminationProtected *types.Value `json:"TerminationProtected,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_JobFlowInstancesConfig) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.JobFlowInstancesConfig"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_kerberosattributes.go b/goformation/cloudformation/emr/aws-emr-cluster_kerberosattributes.go
new file mode 100644
index 0000000000..ecd5e2238c
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_kerberosattributes.go
@@ -0,0 +1,57 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_KerberosAttributes AWS CloudFormation Resource (AWS::EMR::Cluster.KerberosAttributes)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-kerberosattributes.html
+type Cluster_KerberosAttributes struct {
+
+	// ADDomainJoinPassword AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-kerberosattributes.html#cfn-elasticmapreduce-cluster-kerberosattributes-addomainjoinpassword
+	ADDomainJoinPassword *types.Value `json:"ADDomainJoinPassword,omitempty"`
+
+	// ADDomainJoinUser AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-kerberosattributes.html#cfn-elasticmapreduce-cluster-kerberosattributes-addomainjoinuser
+	ADDomainJoinUser *types.Value `json:"ADDomainJoinUser,omitempty"`
+
+	// CrossRealmTrustPrincipalPassword AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-kerberosattributes.html#cfn-elasticmapreduce-cluster-kerberosattributes-crossrealmtrustprincipalpassword
+	CrossRealmTrustPrincipalPassword *types.Value `json:"CrossRealmTrustPrincipalPassword,omitempty"`
+
+	// KdcAdminPassword AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-kerberosattributes.html#cfn-elasticmapreduce-cluster-kerberosattributes-kdcadminpassword
+	KdcAdminPassword *types.Value `json:"KdcAdminPassword,omitempty"`
+
+	// Realm AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-kerberosattributes.html#cfn-elasticmapreduce-cluster-kerberosattributes-realm
+	Realm *types.Value `json:"Realm,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_KerberosAttributes) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.KerberosAttributes"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_keyvalue.go b/goformation/cloudformation/emr/aws-emr-cluster_keyvalue.go
new file mode 100644
index 0000000000..3fb0540c8a
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_keyvalue.go
@@ -0,0 +1,42 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_KeyValue AWS CloudFormation Resource (AWS::EMR::Cluster.KeyValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-keyvalue.html
+type Cluster_KeyValue struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-keyvalue.html#cfn-elasticmapreduce-cluster-keyvalue-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-keyvalue.html#cfn-elasticmapreduce-cluster-keyvalue-value
+	Value *types.Value `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_KeyValue) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.KeyValue"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_managedscalingpolicy.go b/goformation/cloudformation/emr/aws-emr-cluster_managedscalingpolicy.go
new file mode 100644
index 0000000000..4e6363864f
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_managedscalingpolicy.go
@@ -0,0 +1,35 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_ManagedScalingPolicy AWS CloudFormation Resource (AWS::EMR::Cluster.ManagedScalingPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-managedscalingpolicy.html
+type Cluster_ManagedScalingPolicy struct {
+
+	// ComputeLimits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-managedscalingpolicy.html#cfn-elasticmapreduce-cluster-managedscalingpolicy-computelimits
+	ComputeLimits *Cluster_ComputeLimits `json:"ComputeLimits,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ManagedScalingPolicy) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.ManagedScalingPolicy"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_metricdimension.go b/goformation/cloudformation/emr/aws-emr-cluster_metricdimension.go
new file mode 100644
index 0000000000..7f4eff120c
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_metricdimension.go
@@ -0,0 +1,42 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_MetricDimension AWS CloudFormation Resource (AWS::EMR::Cluster.MetricDimension)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-metricdimension.html
+type Cluster_MetricDimension struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-metricdimension.html#cfn-elasticmapreduce-cluster-metricdimension-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-metricdimension.html#cfn-elasticmapreduce-cluster-metricdimension-value
+	Value *types.Value `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_MetricDimension) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.MetricDimension"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_ondemandprovisioningspecification.go b/goformation/cloudformation/emr/aws-emr-cluster_ondemandprovisioningspecification.go
new file mode 100644
index 0000000000..ca72832344
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_ondemandprovisioningspecification.go
@@ -0,0 +1,37 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_OnDemandProvisioningSpecification AWS CloudFormation Resource (AWS::EMR::Cluster.OnDemandProvisioningSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ondemandprovisioningspecification.html
+type Cluster_OnDemandProvisioningSpecification struct {
+
+	// AllocationStrategy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-ondemandprovisioningspecification.html#cfn-elasticmapreduce-cluster-ondemandprovisioningspecification-allocationstrategy
+	AllocationStrategy *types.Value `json:"AllocationStrategy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_OnDemandProvisioningSpecification) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.OnDemandProvisioningSpecification"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_placementtype.go b/goformation/cloudformation/emr/aws-emr-cluster_placementtype.go
new file mode 100644
index 0000000000..08e2e4bcfa
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_placementtype.go
@@ -0,0 +1,37 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_PlacementType AWS CloudFormation Resource (AWS::EMR::Cluster.PlacementType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-placementtype.html
+type Cluster_PlacementType struct {
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-placementtype.html#cfn-elasticmapreduce-cluster-placementtype-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PlacementType) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.PlacementType"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_scalingaction.go b/goformation/cloudformation/emr/aws-emr-cluster_scalingaction.go
new file mode 100644
index 0000000000..729086991f
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_scalingaction.go
@@ -0,0 +1,42 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_ScalingAction AWS CloudFormation Resource (AWS::EMR::Cluster.ScalingAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingaction.html
+type Cluster_ScalingAction struct {
+
+	// Market AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingaction.html#cfn-elasticmapreduce-cluster-scalingaction-market
+	Market *types.Value `json:"Market,omitempty"`
+
+	// SimpleScalingPolicyConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingaction.html#cfn-elasticmapreduce-cluster-scalingaction-simplescalingpolicyconfiguration
+	SimpleScalingPolicyConfiguration *Cluster_SimpleScalingPolicyConfiguration `json:"SimpleScalingPolicyConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ScalingAction) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.ScalingAction"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_scalingconstraints.go b/goformation/cloudformation/emr/aws-emr-cluster_scalingconstraints.go
new file mode 100644
index 0000000000..a8400f9edb
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_scalingconstraints.go
@@ -0,0 +1,42 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_ScalingConstraints AWS CloudFormation Resource (AWS::EMR::Cluster.ScalingConstraints)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingconstraints.html
+type Cluster_ScalingConstraints struct {
+
+	// MaxCapacity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingconstraints.html#cfn-elasticmapreduce-cluster-scalingconstraints-maxcapacity
+	MaxCapacity *types.Value `json:"MaxCapacity"`
+
+	// MinCapacity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingconstraints.html#cfn-elasticmapreduce-cluster-scalingconstraints-mincapacity
+	MinCapacity *types.Value `json:"MinCapacity"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ScalingConstraints) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.ScalingConstraints"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_scalingrule.go b/goformation/cloudformation/emr/aws-emr-cluster_scalingrule.go
new file mode 100644
index 0000000000..7600a81208
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_scalingrule.go
@@ -0,0 +1,52 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_ScalingRule AWS CloudFormation Resource (AWS::EMR::Cluster.ScalingRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingrule.html
+type Cluster_ScalingRule struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingrule.html#cfn-elasticmapreduce-cluster-scalingrule-action
+	Action *Cluster_ScalingAction `json:"Action,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingrule.html#cfn-elasticmapreduce-cluster-scalingrule-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingrule.html#cfn-elasticmapreduce-cluster-scalingrule-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Trigger AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingrule.html#cfn-elasticmapreduce-cluster-scalingrule-trigger
+	Trigger *Cluster_ScalingTrigger `json:"Trigger,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ScalingRule) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.ScalingRule"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_scalingtrigger.go b/goformation/cloudformation/emr/aws-emr-cluster_scalingtrigger.go
new file mode 100644
index 0000000000..cb090f8322
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_scalingtrigger.go
@@ -0,0 +1,35 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_ScalingTrigger AWS CloudFormation Resource (AWS::EMR::Cluster.ScalingTrigger)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingtrigger.html
+type Cluster_ScalingTrigger struct {
+
+	// CloudWatchAlarmDefinition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scalingtrigger.html#cfn-elasticmapreduce-cluster-scalingtrigger-cloudwatchalarmdefinition
+	CloudWatchAlarmDefinition *Cluster_CloudWatchAlarmDefinition `json:"CloudWatchAlarmDefinition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ScalingTrigger) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.ScalingTrigger"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_scriptbootstrapactionconfig.go b/goformation/cloudformation/emr/aws-emr-cluster_scriptbootstrapactionconfig.go
new file mode 100644
index 0000000000..952d84ad20
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_scriptbootstrapactionconfig.go
@@ -0,0 +1,42 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_ScriptBootstrapActionConfig AWS CloudFormation Resource (AWS::EMR::Cluster.ScriptBootstrapActionConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scriptbootstrapactionconfig.html
+type Cluster_ScriptBootstrapActionConfig struct {
+
+	// Args AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scriptbootstrapactionconfig.html#cfn-elasticmapreduce-cluster-scriptbootstrapactionconfig-args
+	Args *types.Value `json:"Args,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-scriptbootstrapactionconfig.html#cfn-elasticmapreduce-cluster-scriptbootstrapactionconfig-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ScriptBootstrapActionConfig) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.ScriptBootstrapActionConfig"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_simplescalingpolicyconfiguration.go b/goformation/cloudformation/emr/aws-emr-cluster_simplescalingpolicyconfiguration.go
new file mode 100644
index 0000000000..4c3dc42b2b
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_simplescalingpolicyconfiguration.go
@@ -0,0 +1,47 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_SimpleScalingPolicyConfiguration AWS CloudFormation Resource (AWS::EMR::Cluster.SimpleScalingPolicyConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-simplescalingpolicyconfiguration.html
+type Cluster_SimpleScalingPolicyConfiguration struct {
+
+	// AdjustmentType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-simplescalingpolicyconfiguration.html#cfn-elasticmapreduce-cluster-simplescalingpolicyconfiguration-adjustmenttype
+	AdjustmentType *types.Value `json:"AdjustmentType,omitempty"`
+
+	// CoolDown AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-simplescalingpolicyconfiguration.html#cfn-elasticmapreduce-cluster-simplescalingpolicyconfiguration-cooldown
+	CoolDown *types.Value `json:"CoolDown,omitempty"`
+
+	// ScalingAdjustment AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-simplescalingpolicyconfiguration.html#cfn-elasticmapreduce-cluster-simplescalingpolicyconfiguration-scalingadjustment
+	ScalingAdjustment *types.Value `json:"ScalingAdjustment"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SimpleScalingPolicyConfiguration) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.SimpleScalingPolicyConfiguration"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_spotprovisioningspecification.go b/goformation/cloudformation/emr/aws-emr-cluster_spotprovisioningspecification.go
new file mode 100644
index 0000000000..9816f897ef
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_spotprovisioningspecification.go
@@ -0,0 +1,52 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_SpotProvisioningSpecification AWS CloudFormation Resource (AWS::EMR::Cluster.SpotProvisioningSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-spotprovisioningspecification.html
+type Cluster_SpotProvisioningSpecification struct {
+
+	// AllocationStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-spotprovisioningspecification.html#cfn-elasticmapreduce-cluster-spotprovisioningspecification-allocationstrategy
+	AllocationStrategy *types.Value `json:"AllocationStrategy,omitempty"`
+
+	// BlockDurationMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-spotprovisioningspecification.html#cfn-elasticmapreduce-cluster-spotprovisioningspecification-blockdurationminutes
+	BlockDurationMinutes *types.Value `json:"BlockDurationMinutes,omitempty"`
+
+	// TimeoutAction AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-spotprovisioningspecification.html#cfn-elasticmapreduce-cluster-spotprovisioningspecification-timeoutaction
+	TimeoutAction *types.Value `json:"TimeoutAction,omitempty"`
+
+	// TimeoutDurationMinutes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-spotprovisioningspecification.html#cfn-elasticmapreduce-cluster-spotprovisioningspecification-timeoutdurationminutes
+	TimeoutDurationMinutes *types.Value `json:"TimeoutDurationMinutes"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SpotProvisioningSpecification) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.SpotProvisioningSpecification"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_stepconfig.go b/goformation/cloudformation/emr/aws-emr-cluster_stepconfig.go
new file mode 100644
index 0000000000..6e1bb58c77
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_stepconfig.go
@@ -0,0 +1,47 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_StepConfig AWS CloudFormation Resource (AWS::EMR::Cluster.StepConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-stepconfig.html
+type Cluster_StepConfig struct {
+
+	// ActionOnFailure AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-stepconfig.html#cfn-elasticmapreduce-cluster-stepconfig-actiononfailure
+	ActionOnFailure *types.Value `json:"ActionOnFailure,omitempty"`
+
+	// HadoopJarStep AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-stepconfig.html#cfn-elasticmapreduce-cluster-stepconfig-hadoopjarstep
+	HadoopJarStep *Cluster_HadoopJarStepConfig `json:"HadoopJarStep,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-stepconfig.html#cfn-elasticmapreduce-cluster-stepconfig-name
+	Name *types.Value `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 *Cluster_StepConfig) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.StepConfig"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-cluster_volumespecification.go b/goformation/cloudformation/emr/aws-emr-cluster_volumespecification.go
new file mode 100644
index 0000000000..9c9c66d12d
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-cluster_volumespecification.go
@@ -0,0 +1,47 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_VolumeSpecification AWS CloudFormation Resource (AWS::EMR::Cluster.VolumeSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-volumespecification.html
+type Cluster_VolumeSpecification struct {
+
+	// Iops AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-volumespecification.html#cfn-elasticmapreduce-cluster-volumespecification-iops
+	Iops *types.Value `json:"Iops,omitempty"`
+
+	// SizeInGB AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-volumespecification.html#cfn-elasticmapreduce-cluster-volumespecification-sizeingb
+	SizeInGB *types.Value `json:"SizeInGB"`
+
+	// VolumeType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-cluster-volumespecification.html#cfn-elasticmapreduce-cluster-volumespecification-volumetype
+	VolumeType *types.Value `json:"VolumeType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_VolumeSpecification) AWSCloudFormationType() string {
+	return "AWS::EMR::Cluster.VolumeSpecification"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-instancefleetconfig.go b/goformation/cloudformation/emr/aws-emr-instancefleetconfig.go
new file mode 100644
index 0000000000..bea1779768
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancefleetconfig.go
@@ -0,0 +1,138 @@
+package emr
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceFleetConfig AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-instancefleetconfig.html
+type InstanceFleetConfig struct {
+
+	// ClusterId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-instancefleetconfig.html#cfn-elasticmapreduce-instancefleetconfig-clusterid
+	ClusterId *types.Value `json:"ClusterId,omitempty"`
+
+	// InstanceFleetType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-instancefleetconfig.html#cfn-elasticmapreduce-instancefleetconfig-instancefleettype
+	InstanceFleetType *types.Value `json:"InstanceFleetType,omitempty"`
+
+	// InstanceTypeConfigs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-instancefleetconfig.html#cfn-elasticmapreduce-instancefleetconfig-instancetypeconfigs
+	InstanceTypeConfigs []InstanceFleetConfig_InstanceTypeConfig `json:"InstanceTypeConfigs,omitempty"`
+
+	// LaunchSpecifications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-instancefleetconfig.html#cfn-elasticmapreduce-instancefleetconfig-launchspecifications
+	LaunchSpecifications *InstanceFleetConfig_InstanceFleetProvisioningSpecifications `json:"LaunchSpecifications,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-instancefleetconfig.html#cfn-elasticmapreduce-instancefleetconfig-name
+	Name *types.Value `json:"Name,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
+	TargetOnDemandCapacity *types.Value `json:"TargetOnDemandCapacity,omitempty"`
+
+	// TargetSpotCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-elasticmapreduce-instancefleetconfig.html#cfn-elasticmapreduce-instancefleetconfig-targetspotcapacity
+	TargetSpotCapacity *types.Value `json:"TargetSpotCapacity,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceFleetConfig"
+}
+
+// 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 InstanceFleetConfig) MarshalJSON() ([]byte, error) {
+	type Properties InstanceFleetConfig
+	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 *InstanceFleetConfig) UnmarshalJSON(b []byte) error {
+	type Properties InstanceFleetConfig
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = InstanceFleetConfig(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/emr/aws-emr-instancefleetconfig_configuration.go b/goformation/cloudformation/emr/aws-emr-instancefleetconfig_configuration.go
new file mode 100644
index 0000000000..523c36ca68
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancefleetconfig_configuration.go
@@ -0,0 +1,47 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceFleetConfig_Configuration AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.Configuration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-configuration.html
+type InstanceFleetConfig_Configuration struct {
+
+	// Classification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-configuration.html#cfn-elasticmapreduce-instancefleetconfig-configuration-classification
+	Classification *types.Value `json:"Classification,omitempty"`
+
+	// ConfigurationProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-configuration.html#cfn-elasticmapreduce-instancefleetconfig-configuration-configurationproperties
+	ConfigurationProperties map[string]*types.Value `json:"ConfigurationProperties,omitempty"`
+
+	// Configurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-configuration.html#cfn-elasticmapreduce-instancefleetconfig-configuration-configurations
+	Configurations []InstanceFleetConfig_Configuration `json:"Configurations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Configuration) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceFleetConfig.Configuration"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ebsblockdeviceconfig.go b/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ebsblockdeviceconfig.go
new file mode 100644
index 0000000000..1cdb93c569
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ebsblockdeviceconfig.go
@@ -0,0 +1,42 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceFleetConfig_EbsBlockDeviceConfig AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.EbsBlockDeviceConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ebsblockdeviceconfig.html
+type InstanceFleetConfig_EbsBlockDeviceConfig struct {
+
+	// VolumeSpecification AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ebsblockdeviceconfig.html#cfn-elasticmapreduce-instancefleetconfig-ebsblockdeviceconfig-volumespecification
+	VolumeSpecification *InstanceFleetConfig_VolumeSpecification `json:"VolumeSpecification,omitempty"`
+
+	// VolumesPerInstance AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ebsblockdeviceconfig.html#cfn-elasticmapreduce-instancefleetconfig-ebsblockdeviceconfig-volumesperinstance
+	VolumesPerInstance *types.Value `json:"VolumesPerInstance,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EbsBlockDeviceConfig) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceFleetConfig.EbsBlockDeviceConfig"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ebsconfiguration.go b/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ebsconfiguration.go
new file mode 100644
index 0000000000..3dceaf3e31
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ebsconfiguration.go
@@ -0,0 +1,42 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceFleetConfig_EbsConfiguration AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.EbsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ebsconfiguration.html
+type InstanceFleetConfig_EbsConfiguration struct {
+
+	// EbsBlockDeviceConfigs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ebsconfiguration.html#cfn-elasticmapreduce-instancefleetconfig-ebsconfiguration-ebsblockdeviceconfigs
+	EbsBlockDeviceConfigs []InstanceFleetConfig_EbsBlockDeviceConfig `json:"EbsBlockDeviceConfigs,omitempty"`
+
+	// EbsOptimized AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ebsconfiguration.html#cfn-elasticmapreduce-instancefleetconfig-ebsconfiguration-ebsoptimized
+	EbsOptimized *types.Value `json:"EbsOptimized,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EbsConfiguration) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceFleetConfig.EbsConfiguration"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_instancefleetprovisioningspecifications.go b/goformation/cloudformation/emr/aws-emr-instancefleetconfig_instancefleetprovisioningspecifications.go
new file mode 100644
index 0000000000..9e52ad0fce
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancefleetconfig_instancefleetprovisioningspecifications.go
@@ -0,0 +1,40 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceFleetConfig_InstanceFleetProvisioningSpecifications AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.InstanceFleetProvisioningSpecifications)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancefleetprovisioningspecifications.html
+type InstanceFleetConfig_InstanceFleetProvisioningSpecifications struct {
+
+	// OnDemandSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancefleetprovisioningspecifications.html#cfn-elasticmapreduce-instancefleetconfig-instancefleetprovisioningspecifications-ondemandspecification
+	OnDemandSpecification *InstanceFleetConfig_OnDemandProvisioningSpecification `json:"OnDemandSpecification,omitempty"`
+
+	// SpotSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancefleetprovisioningspecifications.html#cfn-elasticmapreduce-instancefleetconfig-instancefleetprovisioningspecifications-spotspecification
+	SpotSpecification *InstanceFleetConfig_SpotProvisioningSpecification `json:"SpotSpecification,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InstanceFleetProvisioningSpecifications) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceFleetConfig.InstanceFleetProvisioningSpecifications"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_instancetypeconfig.go b/goformation/cloudformation/emr/aws-emr-instancefleetconfig_instancetypeconfig.go
new file mode 100644
index 0000000000..698c0b4825
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancefleetconfig_instancetypeconfig.go
@@ -0,0 +1,67 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceFleetConfig_InstanceTypeConfig AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.InstanceTypeConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancetypeconfig.html
+type InstanceFleetConfig_InstanceTypeConfig struct {
+
+	// BidPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancetypeconfig.html#cfn-elasticmapreduce-instancefleetconfig-instancetypeconfig-bidprice
+	BidPrice *types.Value `json:"BidPrice,omitempty"`
+
+	// BidPriceAsPercentageOfOnDemandPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancetypeconfig.html#cfn-elasticmapreduce-instancefleetconfig-instancetypeconfig-bidpriceaspercentageofondemandprice
+	BidPriceAsPercentageOfOnDemandPrice *types.Value `json:"BidPriceAsPercentageOfOnDemandPrice,omitempty"`
+
+	// Configurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancetypeconfig.html#cfn-elasticmapreduce-instancefleetconfig-instancetypeconfig-configurations
+	Configurations []InstanceFleetConfig_Configuration `json:"Configurations,omitempty"`
+
+	// CustomAmiId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancetypeconfig.html#cfn-elasticmapreduce-instancefleetconfig-instancetypeconfig-customamiid
+	CustomAmiId *types.Value `json:"CustomAmiId,omitempty"`
+
+	// EbsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancetypeconfig.html#cfn-elasticmapreduce-instancefleetconfig-instancetypeconfig-ebsconfiguration
+	EbsConfiguration *InstanceFleetConfig_EbsConfiguration `json:"EbsConfiguration,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-instancetypeconfig.html#cfn-elasticmapreduce-instancefleetconfig-instancetypeconfig-instancetype
+	InstanceType *types.Value `json:"InstanceType,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
+	WeightedCapacity *types.Value `json:"WeightedCapacity,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InstanceTypeConfig) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceFleetConfig.InstanceTypeConfig"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ondemandprovisioningspecification.go b/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ondemandprovisioningspecification.go
new file mode 100644
index 0000000000..2e678f5a8a
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancefleetconfig_ondemandprovisioningspecification.go
@@ -0,0 +1,37 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceFleetConfig_OnDemandProvisioningSpecification AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.OnDemandProvisioningSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ondemandprovisioningspecification.html
+type InstanceFleetConfig_OnDemandProvisioningSpecification struct {
+
+	// AllocationStrategy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-ondemandprovisioningspecification.html#cfn-elasticmapreduce-instancefleetconfig-ondemandprovisioningspecification-allocationstrategy
+	AllocationStrategy *types.Value `json:"AllocationStrategy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_OnDemandProvisioningSpecification) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceFleetConfig.OnDemandProvisioningSpecification"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_spotprovisioningspecification.go b/goformation/cloudformation/emr/aws-emr-instancefleetconfig_spotprovisioningspecification.go
new file mode 100644
index 0000000000..00a71741f8
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancefleetconfig_spotprovisioningspecification.go
@@ -0,0 +1,52 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceFleetConfig_SpotProvisioningSpecification AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.SpotProvisioningSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-spotprovisioningspecification.html
+type InstanceFleetConfig_SpotProvisioningSpecification struct {
+
+	// AllocationStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-spotprovisioningspecification.html#cfn-elasticmapreduce-instancefleetconfig-spotprovisioningspecification-allocationstrategy
+	AllocationStrategy *types.Value `json:"AllocationStrategy,omitempty"`
+
+	// BlockDurationMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-spotprovisioningspecification.html#cfn-elasticmapreduce-instancefleetconfig-spotprovisioningspecification-blockdurationminutes
+	BlockDurationMinutes *types.Value `json:"BlockDurationMinutes,omitempty"`
+
+	// TimeoutAction AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-spotprovisioningspecification.html#cfn-elasticmapreduce-instancefleetconfig-spotprovisioningspecification-timeoutaction
+	TimeoutAction *types.Value `json:"TimeoutAction,omitempty"`
+
+	// TimeoutDurationMinutes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-spotprovisioningspecification.html#cfn-elasticmapreduce-instancefleetconfig-spotprovisioningspecification-timeoutdurationminutes
+	TimeoutDurationMinutes *types.Value `json:"TimeoutDurationMinutes"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SpotProvisioningSpecification) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceFleetConfig.SpotProvisioningSpecification"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-instancefleetconfig_volumespecification.go b/goformation/cloudformation/emr/aws-emr-instancefleetconfig_volumespecification.go
new file mode 100644
index 0000000000..df72426c01
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancefleetconfig_volumespecification.go
@@ -0,0 +1,47 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceFleetConfig_VolumeSpecification AWS CloudFormation Resource (AWS::EMR::InstanceFleetConfig.VolumeSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-volumespecification.html
+type InstanceFleetConfig_VolumeSpecification struct {
+
+	// Iops AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-volumespecification.html#cfn-elasticmapreduce-instancefleetconfig-volumespecification-iops
+	Iops *types.Value `json:"Iops,omitempty"`
+
+	// SizeInGB AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-volumespecification.html#cfn-elasticmapreduce-instancefleetconfig-volumespecification-sizeingb
+	SizeInGB *types.Value `json:"SizeInGB"`
+
+	// VolumeType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancefleetconfig-volumespecification.html#cfn-elasticmapreduce-instancefleetconfig-volumespecification-volumetype
+	VolumeType *types.Value `json:"VolumeType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_VolumeSpecification) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceFleetConfig.VolumeSpecification"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig.go b/goformation/cloudformation/emr/aws-emr-instancegroupconfig.go
new file mode 100644
index 0000000000..31e0d61e46
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancegroupconfig.go
@@ -0,0 +1,158 @@
+package emr
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceGroupConfig AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html
+type InstanceGroupConfig struct {
+
+	// AutoScalingPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-elasticmapreduce-instancegroupconfig-autoscalingpolicy
+	AutoScalingPolicy *InstanceGroupConfig_AutoScalingPolicy `json:"AutoScalingPolicy,omitempty"`
+
+	// BidPrice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-emr-instancegroupconfig-bidprice
+	BidPrice *types.Value `json:"BidPrice,omitempty"`
+
+	// Configurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-emr-instancegroupconfig-configurations
+	Configurations []InstanceGroupConfig_Configuration `json:"Configurations,omitempty"`
+
+	// CustomAmiId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-emr-instancegroupconfig-customamiid
+	CustomAmiId *types.Value `json:"CustomAmiId,omitempty"`
+
+	// EbsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-emr-instancegroupconfig-ebsconfiguration
+	EbsConfiguration *InstanceGroupConfig_EbsConfiguration `json:"EbsConfiguration,omitempty"`
+
+	// InstanceCount AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-emr-instancegroupconfiginstancecount-
+	InstanceCount *types.Value `json:"InstanceCount"`
+
+	// InstanceRole AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-emr-instancegroupconfig-instancerole
+	InstanceRole *types.Value `json:"InstanceRole,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-emr-instancegroupconfig-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// JobFlowId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-emr-instancegroupconfig-jobflowid
+	JobFlowId *types.Value `json:"JobFlowId,omitempty"`
+
+	// Market AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-emr-instancegroupconfig-market
+	Market *types.Value `json:"Market,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-instancegroupconfig.html#cfn-emr-instancegroupconfig-name
+	Name *types.Value `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 *InstanceGroupConfig) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceGroupConfig"
+}
+
+// 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 InstanceGroupConfig) MarshalJSON() ([]byte, error) {
+	type Properties InstanceGroupConfig
+	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 *InstanceGroupConfig) UnmarshalJSON(b []byte) error {
+	type Properties InstanceGroupConfig
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = InstanceGroupConfig(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/emr/aws-emr-instancegroupconfig_autoscalingpolicy.go b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_autoscalingpolicy.go
new file mode 100644
index 0000000000..b572fa6369
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_autoscalingpolicy.go
@@ -0,0 +1,40 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceGroupConfig_AutoScalingPolicy AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.AutoScalingPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-autoscalingpolicy.html
+type InstanceGroupConfig_AutoScalingPolicy struct {
+
+	// Constraints AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-autoscalingpolicy.html#cfn-elasticmapreduce-instancegroupconfig-autoscalingpolicy-constraints
+	Constraints *InstanceGroupConfig_ScalingConstraints `json:"Constraints,omitempty"`
+
+	// Rules AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-autoscalingpolicy.html#cfn-elasticmapreduce-instancegroupconfig-autoscalingpolicy-rules
+	Rules []InstanceGroupConfig_ScalingRule `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 *InstanceGroupConfig_AutoScalingPolicy) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceGroupConfig.AutoScalingPolicy"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_cloudwatchalarmdefinition.go b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_cloudwatchalarmdefinition.go
new file mode 100644
index 0000000000..2237263259
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_cloudwatchalarmdefinition.go
@@ -0,0 +1,77 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceGroupConfig_CloudWatchAlarmDefinition AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.CloudWatchAlarmDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition.html
+type InstanceGroupConfig_CloudWatchAlarmDefinition struct {
+
+	// ComparisonOperator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition-comparisonoperator
+	ComparisonOperator *types.Value `json:"ComparisonOperator,omitempty"`
+
+	// Dimensions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition-dimensions
+	Dimensions []InstanceGroupConfig_MetricDimension `json:"Dimensions,omitempty"`
+
+	// EvaluationPeriods AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition-evaluationperiods
+	EvaluationPeriods *types.Value `json:"EvaluationPeriods,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// Namespace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition-namespace
+	Namespace *types.Value `json:"Namespace,omitempty"`
+
+	// Period AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition-period
+	Period *types.Value `json:"Period"`
+
+	// Statistic AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition-statistic
+	Statistic *types.Value `json:"Statistic,omitempty"`
+
+	// Threshold AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition-threshold
+	Threshold *types.Value `json:"Threshold"`
+
+	// Unit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition.html#cfn-elasticmapreduce-instancegroupconfig-cloudwatchalarmdefinition-unit
+	Unit *types.Value `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 *InstanceGroupConfig_CloudWatchAlarmDefinition) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceGroupConfig.CloudWatchAlarmDefinition"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_configuration.go b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_configuration.go
new file mode 100644
index 0000000000..78bb90bbf1
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_configuration.go
@@ -0,0 +1,47 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceGroupConfig_Configuration AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.Configuration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-cluster-configuration.html
+type InstanceGroupConfig_Configuration struct {
+
+	// Classification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-cluster-configuration.html#cfn-emr-cluster-configuration-classification
+	Classification *types.Value `json:"Classification,omitempty"`
+
+	// ConfigurationProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-cluster-configuration.html#cfn-emr-cluster-configuration-configurationproperties
+	ConfigurationProperties map[string]*types.Value `json:"ConfigurationProperties,omitempty"`
+
+	// Configurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-cluster-configuration.html#cfn-emr-cluster-configuration-configurations
+	Configurations []InstanceGroupConfig_Configuration `json:"Configurations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InstanceGroupConfig_Configuration) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceGroupConfig.Configuration"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_ebsblockdeviceconfig.go b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_ebsblockdeviceconfig.go
new file mode 100644
index 0000000000..c04946f949
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_ebsblockdeviceconfig.go
@@ -0,0 +1,42 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceGroupConfig_EbsBlockDeviceConfig AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.EbsBlockDeviceConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-ebsconfiguration-ebsblockdeviceconfig.html
+type InstanceGroupConfig_EbsBlockDeviceConfig struct {
+
+	// VolumeSpecification AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-ebsconfiguration-ebsblockdeviceconfig.html#cfn-emr-ebsconfiguration-ebsblockdeviceconfig-volumespecification
+	VolumeSpecification *InstanceGroupConfig_VolumeSpecification `json:"VolumeSpecification,omitempty"`
+
+	// VolumesPerInstance AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-ebsconfiguration-ebsblockdeviceconfig.html#cfn-emr-ebsconfiguration-ebsblockdeviceconfig-volumesperinstance
+	VolumesPerInstance *types.Value `json:"VolumesPerInstance,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InstanceGroupConfig_EbsBlockDeviceConfig) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceGroupConfig.EbsBlockDeviceConfig"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_ebsconfiguration.go b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_ebsconfiguration.go
new file mode 100644
index 0000000000..c371027613
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_ebsconfiguration.go
@@ -0,0 +1,42 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceGroupConfig_EbsConfiguration AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.EbsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-ebsconfiguration.html
+type InstanceGroupConfig_EbsConfiguration struct {
+
+	// EbsBlockDeviceConfigs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-ebsconfiguration.html#cfn-emr-ebsconfiguration-ebsblockdeviceconfigs
+	EbsBlockDeviceConfigs []InstanceGroupConfig_EbsBlockDeviceConfig `json:"EbsBlockDeviceConfigs,omitempty"`
+
+	// EbsOptimized AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-ebsconfiguration.html#cfn-emr-ebsconfiguration-ebsoptimized
+	EbsOptimized *types.Value `json:"EbsOptimized,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InstanceGroupConfig_EbsConfiguration) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceGroupConfig.EbsConfiguration"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_metricdimension.go b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_metricdimension.go
new file mode 100644
index 0000000000..6aae548edc
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_metricdimension.go
@@ -0,0 +1,42 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceGroupConfig_MetricDimension AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.MetricDimension)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-metricdimension.html
+type InstanceGroupConfig_MetricDimension struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-metricdimension.html#cfn-elasticmapreduce-instancegroupconfig-metricdimension-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-metricdimension.html#cfn-elasticmapreduce-instancegroupconfig-metricdimension-value
+	Value *types.Value `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 *InstanceGroupConfig_MetricDimension) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceGroupConfig.MetricDimension"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingaction.go b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingaction.go
new file mode 100644
index 0000000000..5469b78d7a
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingaction.go
@@ -0,0 +1,42 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceGroupConfig_ScalingAction AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.ScalingAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingaction.html
+type InstanceGroupConfig_ScalingAction struct {
+
+	// Market AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingaction.html#cfn-elasticmapreduce-instancegroupconfig-scalingaction-market
+	Market *types.Value `json:"Market,omitempty"`
+
+	// SimpleScalingPolicyConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingaction.html#cfn-elasticmapreduce-instancegroupconfig-scalingaction-simplescalingpolicyconfiguration
+	SimpleScalingPolicyConfiguration *InstanceGroupConfig_SimpleScalingPolicyConfiguration `json:"SimpleScalingPolicyConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InstanceGroupConfig_ScalingAction) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceGroupConfig.ScalingAction"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingconstraints.go b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingconstraints.go
new file mode 100644
index 0000000000..80201403df
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingconstraints.go
@@ -0,0 +1,42 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceGroupConfig_ScalingConstraints AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.ScalingConstraints)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingconstraints.html
+type InstanceGroupConfig_ScalingConstraints struct {
+
+	// MaxCapacity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingconstraints.html#cfn-elasticmapreduce-instancegroupconfig-scalingconstraints-maxcapacity
+	MaxCapacity *types.Value `json:"MaxCapacity"`
+
+	// MinCapacity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingconstraints.html#cfn-elasticmapreduce-instancegroupconfig-scalingconstraints-mincapacity
+	MinCapacity *types.Value `json:"MinCapacity"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InstanceGroupConfig_ScalingConstraints) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceGroupConfig.ScalingConstraints"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingrule.go b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingrule.go
new file mode 100644
index 0000000000..cef507529a
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingrule.go
@@ -0,0 +1,52 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceGroupConfig_ScalingRule AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.ScalingRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingrule.html
+type InstanceGroupConfig_ScalingRule struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingrule.html#cfn-elasticmapreduce-instancegroupconfig-scalingrule-action
+	Action *InstanceGroupConfig_ScalingAction `json:"Action,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingrule.html#cfn-elasticmapreduce-instancegroupconfig-scalingrule-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingrule.html#cfn-elasticmapreduce-instancegroupconfig-scalingrule-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Trigger AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingrule.html#cfn-elasticmapreduce-instancegroupconfig-scalingrule-trigger
+	Trigger *InstanceGroupConfig_ScalingTrigger `json:"Trigger,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InstanceGroupConfig_ScalingRule) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceGroupConfig.ScalingRule"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingtrigger.go b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingtrigger.go
new file mode 100644
index 0000000000..eedd2095a8
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_scalingtrigger.go
@@ -0,0 +1,35 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceGroupConfig_ScalingTrigger AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.ScalingTrigger)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingtrigger.html
+type InstanceGroupConfig_ScalingTrigger struct {
+
+	// CloudWatchAlarmDefinition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-scalingtrigger.html#cfn-elasticmapreduce-instancegroupconfig-scalingtrigger-cloudwatchalarmdefinition
+	CloudWatchAlarmDefinition *InstanceGroupConfig_CloudWatchAlarmDefinition `json:"CloudWatchAlarmDefinition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InstanceGroupConfig_ScalingTrigger) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceGroupConfig.ScalingTrigger"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_simplescalingpolicyconfiguration.go b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_simplescalingpolicyconfiguration.go
new file mode 100644
index 0000000000..42e88c96c7
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_simplescalingpolicyconfiguration.go
@@ -0,0 +1,47 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceGroupConfig_SimpleScalingPolicyConfiguration AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.SimpleScalingPolicyConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-simplescalingpolicyconfiguration.html
+type InstanceGroupConfig_SimpleScalingPolicyConfiguration struct {
+
+	// AdjustmentType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-simplescalingpolicyconfiguration.html#cfn-elasticmapreduce-instancegroupconfig-simplescalingpolicyconfiguration-adjustmenttype
+	AdjustmentType *types.Value `json:"AdjustmentType,omitempty"`
+
+	// CoolDown AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-simplescalingpolicyconfiguration.html#cfn-elasticmapreduce-instancegroupconfig-simplescalingpolicyconfiguration-cooldown
+	CoolDown *types.Value `json:"CoolDown,omitempty"`
+
+	// ScalingAdjustment AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-instancegroupconfig-simplescalingpolicyconfiguration.html#cfn-elasticmapreduce-instancegroupconfig-simplescalingpolicyconfiguration-scalingadjustment
+	ScalingAdjustment *types.Value `json:"ScalingAdjustment"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InstanceGroupConfig_SimpleScalingPolicyConfiguration) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceGroupConfig.SimpleScalingPolicyConfiguration"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-instancegroupconfig_volumespecification.go b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_volumespecification.go
new file mode 100644
index 0000000000..32fff6b18c
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-instancegroupconfig_volumespecification.go
@@ -0,0 +1,47 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceGroupConfig_VolumeSpecification AWS CloudFormation Resource (AWS::EMR::InstanceGroupConfig.VolumeSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-ebsconfiguration-ebsblockdeviceconfig-volumespecification.html
+type InstanceGroupConfig_VolumeSpecification struct {
+
+	// Iops AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-ebsconfiguration-ebsblockdeviceconfig-volumespecification.html#cfn-emr-ebsconfiguration-ebsblockdeviceconfig-volumespecification-iops
+	Iops *types.Value `json:"Iops,omitempty"`
+
+	// SizeInGB AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-ebsconfiguration-ebsblockdeviceconfig-volumespecification.html#cfn-emr-ebsconfiguration-ebsblockdeviceconfig-volumespecification-sizeingb
+	SizeInGB *types.Value `json:"SizeInGB"`
+
+	// VolumeType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emr-ebsconfiguration-ebsblockdeviceconfig-volumespecification.html#cfn-emr-ebsconfiguration-ebsblockdeviceconfig-volumespecification-volumetype
+	VolumeType *types.Value `json:"VolumeType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InstanceGroupConfig_VolumeSpecification) AWSCloudFormationType() string {
+	return "AWS::EMR::InstanceGroupConfig.VolumeSpecification"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-securityconfiguration.go b/goformation/cloudformation/emr/aws-emr-securityconfiguration.go
new file mode 100644
index 0000000000..d94d4ea28e
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-securityconfiguration.go
@@ -0,0 +1,113 @@
+package emr
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityConfiguration AWS CloudFormation Resource (AWS::EMR::SecurityConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-securityconfiguration.html
+type SecurityConfiguration struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-securityconfiguration.html#cfn-emr-securityconfiguration-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SecurityConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-securityconfiguration.html#cfn-emr-securityconfiguration-securityconfiguration
+	SecurityConfiguration interface{} `json:"SecurityConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SecurityConfiguration) AWSCloudFormationType() string {
+	return "AWS::EMR::SecurityConfiguration"
+}
+
+// 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 SecurityConfiguration) MarshalJSON() ([]byte, error) {
+	type Properties SecurityConfiguration
+	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 *SecurityConfiguration) UnmarshalJSON(b []byte) error {
+	type Properties SecurityConfiguration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SecurityConfiguration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/emr/aws-emr-step.go b/goformation/cloudformation/emr/aws-emr-step.go
new file mode 100644
index 0000000000..edd0c1378b
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-step.go
@@ -0,0 +1,123 @@
+package emr
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Step AWS CloudFormation Resource (AWS::EMR::Step)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-step.html
+type Step struct {
+
+	// ActionOnFailure AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-step.html#cfn-elasticmapreduce-step-actiononfailure
+	ActionOnFailure *types.Value `json:"ActionOnFailure,omitempty"`
+
+	// HadoopJarStep AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-step.html#cfn-elasticmapreduce-step-hadoopjarstep
+	HadoopJarStep *Step_HadoopJarStepConfig `json:"HadoopJarStep,omitempty"`
+
+	// JobFlowId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-step.html#cfn-elasticmapreduce-step-jobflowid
+	JobFlowId *types.Value `json:"JobFlowId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-step.html#cfn-elasticmapreduce-step-name
+	Name *types.Value `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 *Step) AWSCloudFormationType() string {
+	return "AWS::EMR::Step"
+}
+
+// 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 Step) MarshalJSON() ([]byte, error) {
+	type Properties Step
+	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 *Step) UnmarshalJSON(b []byte) error {
+	type Properties Step
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Step(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/emr/aws-emr-step_hadoopjarstepconfig.go b/goformation/cloudformation/emr/aws-emr-step_hadoopjarstepconfig.go
new file mode 100644
index 0000000000..a1c0a38d88
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-step_hadoopjarstepconfig.go
@@ -0,0 +1,52 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Step_HadoopJarStepConfig AWS CloudFormation Resource (AWS::EMR::Step.HadoopJarStepConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-step-hadoopjarstepconfig.html
+type Step_HadoopJarStepConfig struct {
+
+	// Args AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-step-hadoopjarstepconfig.html#cfn-elasticmapreduce-step-hadoopjarstepconfig-args
+	Args *types.Value `json:"Args,omitempty"`
+
+	// Jar AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-step-hadoopjarstepconfig.html#cfn-elasticmapreduce-step-hadoopjarstepconfig-jar
+	Jar *types.Value `json:"Jar,omitempty"`
+
+	// MainClass AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-step-hadoopjarstepconfig.html#cfn-elasticmapreduce-step-hadoopjarstepconfig-mainclass
+	MainClass *types.Value `json:"MainClass,omitempty"`
+
+	// StepProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-step-hadoopjarstepconfig.html#cfn-elasticmapreduce-step-hadoopjarstepconfig-stepproperties
+	StepProperties []Step_KeyValue `json:"StepProperties,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Step_HadoopJarStepConfig) AWSCloudFormationType() string {
+	return "AWS::EMR::Step.HadoopJarStepConfig"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-step_keyvalue.go b/goformation/cloudformation/emr/aws-emr-step_keyvalue.go
new file mode 100644
index 0000000000..e9a194ee12
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-step_keyvalue.go
@@ -0,0 +1,42 @@
+package emr
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Step_KeyValue AWS CloudFormation Resource (AWS::EMR::Step.KeyValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-step-keyvalue.html
+type Step_KeyValue struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-step-keyvalue.html#cfn-elasticmapreduce-step-keyvalue-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-elasticmapreduce-step-keyvalue.html#cfn-elasticmapreduce-step-keyvalue-value
+	Value *types.Value `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 *Step_KeyValue) AWSCloudFormationType() string {
+	return "AWS::EMR::Step.KeyValue"
+}
diff --git a/goformation/cloudformation/emr/aws-emr-studio.go b/goformation/cloudformation/emr/aws-emr-studio.go
new file mode 100644
index 0000000000..b6c323e6f9
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-studio.go
@@ -0,0 +1,169 @@
+package emr
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Studio AWS CloudFormation Resource (AWS::EMR::Studio)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html
+type Studio struct {
+
+	// AuthMode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-authmode
+	AuthMode *types.Value `json:"AuthMode,omitempty"`
+
+	// DefaultS3Location AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-defaults3location
+	DefaultS3Location *types.Value `json:"DefaultS3Location,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EngineSecurityGroupId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-enginesecuritygroupid
+	EngineSecurityGroupId *types.Value `json:"EngineSecurityGroupId,omitempty"`
+
+	// IdpAuthUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-idpauthurl
+	IdpAuthUrl *types.Value `json:"IdpAuthUrl,omitempty"`
+
+	// IdpRelayStateParameterName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-idprelaystateparametername
+	IdpRelayStateParameterName *types.Value `json:"IdpRelayStateParameterName,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ServiceRole AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-servicerole
+	ServiceRole *types.Value `json:"ServiceRole,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// UserRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-userrole
+	UserRole *types.Value `json:"UserRole,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-vpcid
+	VpcId *types.Value `json:"VpcId,omitempty"`
+
+	// WorkspaceSecurityGroupId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studio.html#cfn-emr-studio-workspacesecuritygroupid
+	WorkspaceSecurityGroupId *types.Value `json:"WorkspaceSecurityGroupId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Studio) AWSCloudFormationType() string {
+	return "AWS::EMR::Studio"
+}
+
+// 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 Studio) MarshalJSON() ([]byte, error) {
+	type Properties Studio
+	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 *Studio) UnmarshalJSON(b []byte) error {
+	type Properties Studio
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Studio(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/emr/aws-emr-studiosessionmapping.go b/goformation/cloudformation/emr/aws-emr-studiosessionmapping.go
new file mode 100644
index 0000000000..53aaddbc61
--- /dev/null
+++ b/goformation/cloudformation/emr/aws-emr-studiosessionmapping.go
@@ -0,0 +1,123 @@
+package emr
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StudioSessionMapping AWS CloudFormation Resource (AWS::EMR::StudioSessionMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studiosessionmapping.html
+type StudioSessionMapping struct {
+
+	// IdentityName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studiosessionmapping.html#cfn-emr-studiosessionmapping-identityname
+	IdentityName *types.Value `json:"IdentityName,omitempty"`
+
+	// IdentityType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studiosessionmapping.html#cfn-emr-studiosessionmapping-identitytype
+	IdentityType *types.Value `json:"IdentityType,omitempty"`
+
+	// SessionPolicyArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studiosessionmapping.html#cfn-emr-studiosessionmapping-sessionpolicyarn
+	SessionPolicyArn *types.Value `json:"SessionPolicyArn,omitempty"`
+
+	// StudioId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emr-studiosessionmapping.html#cfn-emr-studiosessionmapping-studioid
+	StudioId *types.Value `json:"StudioId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StudioSessionMapping) AWSCloudFormationType() string {
+	return "AWS::EMR::StudioSessionMapping"
+}
+
+// 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 StudioSessionMapping) MarshalJSON() ([]byte, error) {
+	type Properties StudioSessionMapping
+	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 *StudioSessionMapping) UnmarshalJSON(b []byte) error {
+	type Properties StudioSessionMapping
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = StudioSessionMapping(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster.go b/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster.go
new file mode 100644
index 0000000000..2d053b1947
--- /dev/null
+++ b/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster.go
@@ -0,0 +1,119 @@
+package emrcontainers
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualCluster AWS CloudFormation Resource (AWS::EMRContainers::VirtualCluster)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emrcontainers-virtualcluster.html
+type VirtualCluster struct {
+
+	// ContainerProvider AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emrcontainers-virtualcluster.html#cfn-emrcontainers-virtualcluster-containerprovider
+	ContainerProvider *VirtualCluster_ContainerProvider `json:"ContainerProvider,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emrcontainers-virtualcluster.html#cfn-emrcontainers-virtualcluster-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-emrcontainers-virtualcluster.html#cfn-emrcontainers-virtualcluster-tags
+	Tags []cloudformation.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 *VirtualCluster) AWSCloudFormationType() string {
+	return "AWS::EMRContainers::VirtualCluster"
+}
+
+// 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 VirtualCluster) MarshalJSON() ([]byte, error) {
+	type Properties VirtualCluster
+	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 *VirtualCluster) UnmarshalJSON(b []byte) error {
+	type Properties VirtualCluster
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VirtualCluster(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerinfo.go b/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerinfo.go
new file mode 100644
index 0000000000..27c052f9e2
--- /dev/null
+++ b/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerinfo.go
@@ -0,0 +1,35 @@
+package emrcontainers
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualCluster_ContainerInfo AWS CloudFormation Resource (AWS::EMRContainers::VirtualCluster.ContainerInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emrcontainers-virtualcluster-containerinfo.html
+type VirtualCluster_ContainerInfo struct {
+
+	// EksInfo AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emrcontainers-virtualcluster-containerinfo.html#cfn-emrcontainers-virtualcluster-containerinfo-eksinfo
+	EksInfo *VirtualCluster_EksInfo `json:"EksInfo,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualCluster_ContainerInfo) AWSCloudFormationType() string {
+	return "AWS::EMRContainers::VirtualCluster.ContainerInfo"
+}
diff --git a/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerprovider.go b/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerprovider.go
new file mode 100644
index 0000000000..7825635621
--- /dev/null
+++ b/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_containerprovider.go
@@ -0,0 +1,47 @@
+package emrcontainers
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualCluster_ContainerProvider AWS CloudFormation Resource (AWS::EMRContainers::VirtualCluster.ContainerProvider)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emrcontainers-virtualcluster-containerprovider.html
+type VirtualCluster_ContainerProvider struct {
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emrcontainers-virtualcluster-containerprovider.html#cfn-emrcontainers-virtualcluster-containerprovider-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Info AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emrcontainers-virtualcluster-containerprovider.html#cfn-emrcontainers-virtualcluster-containerprovider-info
+	Info *VirtualCluster_ContainerInfo `json:"Info,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emrcontainers-virtualcluster-containerprovider.html#cfn-emrcontainers-virtualcluster-containerprovider-type
+	Type *types.Value `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 *VirtualCluster_ContainerProvider) AWSCloudFormationType() string {
+	return "AWS::EMRContainers::VirtualCluster.ContainerProvider"
+}
diff --git a/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_eksinfo.go b/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_eksinfo.go
new file mode 100644
index 0000000000..436e83c609
--- /dev/null
+++ b/goformation/cloudformation/emrcontainers/aws-emrcontainers-virtualcluster_eksinfo.go
@@ -0,0 +1,37 @@
+package emrcontainers
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualCluster_EksInfo AWS CloudFormation Resource (AWS::EMRContainers::VirtualCluster.EksInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emrcontainers-virtualcluster-eksinfo.html
+type VirtualCluster_EksInfo struct {
+
+	// Namespace AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-emrcontainers-virtualcluster-eksinfo.html#cfn-emrcontainers-virtualcluster-eksinfo-namespace
+	Namespace *types.Value `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 *VirtualCluster_EksInfo) AWSCloudFormationType() string {
+	return "AWS::EMRContainers::VirtualCluster.EksInfo"
+}
diff --git a/goformation/cloudformation/events/aws-events-apidestination.go b/goformation/cloudformation/events/aws-events-apidestination.go
new file mode 100644
index 0000000000..8402c72652
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-apidestination.go
@@ -0,0 +1,133 @@
+package events
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApiDestination AWS CloudFormation Resource (AWS::Events::ApiDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-apidestination.html
+type ApiDestination struct {
+
+	// ConnectionArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-apidestination.html#cfn-events-apidestination-connectionarn
+	ConnectionArn *types.Value `json:"ConnectionArn,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-apidestination.html#cfn-events-apidestination-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// HttpMethod AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-apidestination.html#cfn-events-apidestination-httpmethod
+	HttpMethod *types.Value `json:"HttpMethod,omitempty"`
+
+	// InvocationEndpoint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-apidestination.html#cfn-events-apidestination-invocationendpoint
+	InvocationEndpoint *types.Value `json:"InvocationEndpoint,omitempty"`
+
+	// InvocationRateLimitPerSecond AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-apidestination.html#cfn-events-apidestination-invocationratelimitpersecond
+	InvocationRateLimitPerSecond *types.Value `json:"InvocationRateLimitPerSecond,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-apidestination.html#cfn-events-apidestination-name
+	Name *types.Value `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 *ApiDestination) AWSCloudFormationType() string {
+	return "AWS::Events::ApiDestination"
+}
+
+// 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 ApiDestination) MarshalJSON() ([]byte, error) {
+	type Properties ApiDestination
+	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 *ApiDestination) UnmarshalJSON(b []byte) error {
+	type Properties ApiDestination
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ApiDestination(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/events/aws-events-archive.go b/goformation/cloudformation/events/aws-events-archive.go
new file mode 100644
index 0000000000..33718fcd0d
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-archive.go
@@ -0,0 +1,128 @@
+package events
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Archive AWS CloudFormation Resource (AWS::Events::Archive)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-archive.html
+type Archive struct {
+
+	// ArchiveName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-archive.html#cfn-events-archive-archivename
+	ArchiveName *types.Value `json:"ArchiveName,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-archive.html#cfn-events-archive-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EventPattern AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-archive.html#cfn-events-archive-eventpattern
+	EventPattern interface{} `json:"EventPattern,omitempty"`
+
+	// RetentionDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-archive.html#cfn-events-archive-retentiondays
+	RetentionDays *types.Value `json:"RetentionDays,omitempty"`
+
+	// SourceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-archive.html#cfn-events-archive-sourcearn
+	SourceArn *types.Value `json:"SourceArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Archive) AWSCloudFormationType() string {
+	return "AWS::Events::Archive"
+}
+
+// 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 Archive) MarshalJSON() ([]byte, error) {
+	type Properties Archive
+	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 *Archive) UnmarshalJSON(b []byte) error {
+	type Properties Archive
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Archive(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/events/aws-events-connection.go b/goformation/cloudformation/events/aws-events-connection.go
new file mode 100644
index 0000000000..44e3bd6b8f
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-connection.go
@@ -0,0 +1,123 @@
+package events
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Connection AWS CloudFormation Resource (AWS::Events::Connection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-connection.html
+type Connection struct {
+
+	// AuthParameters AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-connection.html#cfn-events-connection-authparameters
+	AuthParameters interface{} `json:"AuthParameters,omitempty"`
+
+	// AuthorizationType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-connection.html#cfn-events-connection-authorizationtype
+	AuthorizationType *types.Value `json:"AuthorizationType,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-connection.html#cfn-events-connection-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-connection.html#cfn-events-connection-name
+	Name *types.Value `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 *Connection) AWSCloudFormationType() string {
+	return "AWS::Events::Connection"
+}
+
+// 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 Connection) MarshalJSON() ([]byte, error) {
+	type Properties Connection
+	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 *Connection) UnmarshalJSON(b []byte) error {
+	type Properties Connection
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Connection(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/events/aws-events-eventbus.go b/goformation/cloudformation/events/aws-events-eventbus.go
new file mode 100644
index 0000000000..ed97911eae
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-eventbus.go
@@ -0,0 +1,113 @@
+package events
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventBus AWS CloudFormation Resource (AWS::Events::EventBus)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-eventbus.html
+type EventBus struct {
+
+	// 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 *types.Value `json:"EventSourceName,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
+	Name *types.Value `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 *EventBus) AWSCloudFormationType() string {
+	return "AWS::Events::EventBus"
+}
+
+// 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 EventBus) MarshalJSON() ([]byte, error) {
+	type Properties EventBus
+	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 *EventBus) UnmarshalJSON(b []byte) error {
+	type Properties EventBus
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = EventBus(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/events/aws-events-eventbuspolicy.go b/goformation/cloudformation/events/aws-events-eventbuspolicy.go
new file mode 100644
index 0000000000..4b0752ce55
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-eventbuspolicy.go
@@ -0,0 +1,133 @@
+package events
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventBusPolicy AWS CloudFormation Resource (AWS::Events::EventBusPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-eventbuspolicy.html
+type EventBusPolicy struct {
+
+	// Action AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-eventbuspolicy.html#cfn-events-eventbuspolicy-action
+	Action *types.Value `json:"Action,omitempty"`
+
+	// Condition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-eventbuspolicy.html#cfn-events-eventbuspolicy-condition
+	Condition *EventBusPolicy_Condition `json:"Condition,omitempty"`
+
+	// EventBusName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-eventbuspolicy.html#cfn-events-eventbuspolicy-eventbusname
+	EventBusName *types.Value `json:"EventBusName,omitempty"`
+
+	// Principal AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-eventbuspolicy.html#cfn-events-eventbuspolicy-principal
+	Principal *types.Value `json:"Principal,omitempty"`
+
+	// Statement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-eventbuspolicy.html#cfn-events-eventbuspolicy-statement
+	Statement interface{} `json:"Statement,omitempty"`
+
+	// StatementId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-eventbuspolicy.html#cfn-events-eventbuspolicy-statementid
+	StatementId *types.Value `json:"StatementId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EventBusPolicy) AWSCloudFormationType() string {
+	return "AWS::Events::EventBusPolicy"
+}
+
+// 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 EventBusPolicy) MarshalJSON() ([]byte, error) {
+	type Properties EventBusPolicy
+	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 *EventBusPolicy) UnmarshalJSON(b []byte) error {
+	type Properties EventBusPolicy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = EventBusPolicy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/events/aws-events-eventbuspolicy_condition.go b/goformation/cloudformation/events/aws-events-eventbuspolicy_condition.go
new file mode 100644
index 0000000000..a31a4005ea
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-eventbuspolicy_condition.go
@@ -0,0 +1,47 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventBusPolicy_Condition AWS CloudFormation Resource (AWS::Events::EventBusPolicy.Condition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-eventbuspolicy-condition.html
+type EventBusPolicy_Condition struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-eventbuspolicy-condition.html#cfn-events-eventbuspolicy-condition-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-eventbuspolicy-condition.html#cfn-events-eventbuspolicy-condition-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-eventbuspolicy-condition.html#cfn-events-eventbuspolicy-condition-value
+	Value *types.Value `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 *EventBusPolicy_Condition) AWSCloudFormationType() string {
+	return "AWS::Events::EventBusPolicy.Condition"
+}
diff --git a/goformation/cloudformation/events/aws-events-rule.go b/goformation/cloudformation/events/aws-events-rule.go
new file mode 100644
index 0000000000..ef5993dd42
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule.go
@@ -0,0 +1,143 @@
+package events
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule AWS CloudFormation Resource (AWS::Events::Rule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-rule.html
+type Rule struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-rule.html#cfn-events-rule-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EventBusName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-rule.html#cfn-events-rule-eventbusname
+	EventBusName *types.Value `json:"EventBusName,omitempty"`
+
+	// EventPattern AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-rule.html#cfn-events-rule-eventpattern
+	EventPattern interface{} `json:"EventPattern,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-rule.html#cfn-events-rule-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-rule.html#cfn-events-rule-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// ScheduleExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-rule.html#cfn-events-rule-scheduleexpression
+	ScheduleExpression *types.Value `json:"ScheduleExpression,omitempty"`
+
+	// State AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-rule.html#cfn-events-rule-state
+	State *types.Value `json:"State,omitempty"`
+
+	// Targets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-events-rule.html#cfn-events-rule-targets
+	Targets []Rule_Target `json:"Targets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::Events::Rule"
+}
+
+// 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 Rule) MarshalJSON() ([]byte, error) {
+	type Properties Rule
+	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 *Rule) UnmarshalJSON(b []byte) error {
+	type Properties Rule
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Rule(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/events/aws-events-rule_awsvpcconfiguration.go b/goformation/cloudformation/events/aws-events-rule_awsvpcconfiguration.go
new file mode 100644
index 0000000000..1da64cafd4
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule_awsvpcconfiguration.go
@@ -0,0 +1,47 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_AwsVpcConfiguration AWS CloudFormation Resource (AWS::Events::Rule.AwsVpcConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-awsvpcconfiguration.html
+type Rule_AwsVpcConfiguration struct {
+
+	// AssignPublicIp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-awsvpcconfiguration.html#cfn-events-rule-awsvpcconfiguration-assignpublicip
+	AssignPublicIp *types.Value `json:"AssignPublicIp,omitempty"`
+
+	// SecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-awsvpcconfiguration.html#cfn-events-rule-awsvpcconfiguration-securitygroups
+	SecurityGroups *types.Value `json:"SecurityGroups,omitempty"`
+
+	// Subnets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-awsvpcconfiguration.html#cfn-events-rule-awsvpcconfiguration-subnets
+	Subnets *types.Value `json:"Subnets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AwsVpcConfiguration) AWSCloudFormationType() string {
+	return "AWS::Events::Rule.AwsVpcConfiguration"
+}
diff --git a/goformation/cloudformation/events/aws-events-rule_batcharrayproperties.go b/goformation/cloudformation/events/aws-events-rule_batcharrayproperties.go
new file mode 100644
index 0000000000..9629fae24c
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule_batcharrayproperties.go
@@ -0,0 +1,37 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_BatchArrayProperties AWS CloudFormation Resource (AWS::Events::Rule.BatchArrayProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-batcharrayproperties.html
+type Rule_BatchArrayProperties struct {
+
+	// Size AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-batcharrayproperties.html#cfn-events-rule-batcharrayproperties-size
+	Size *types.Value `json:"Size,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_BatchArrayProperties) AWSCloudFormationType() string {
+	return "AWS::Events::Rule.BatchArrayProperties"
+}
diff --git a/goformation/cloudformation/events/aws-events-rule_batchparameters.go b/goformation/cloudformation/events/aws-events-rule_batchparameters.go
new file mode 100644
index 0000000000..d0409be49d
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule_batchparameters.go
@@ -0,0 +1,52 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_BatchParameters AWS CloudFormation Resource (AWS::Events::Rule.BatchParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-batchparameters.html
+type Rule_BatchParameters struct {
+
+	// ArrayProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-batchparameters.html#cfn-events-rule-batchparameters-arrayproperties
+	ArrayProperties *Rule_BatchArrayProperties `json:"ArrayProperties,omitempty"`
+
+	// JobDefinition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-batchparameters.html#cfn-events-rule-batchparameters-jobdefinition
+	JobDefinition *types.Value `json:"JobDefinition,omitempty"`
+
+	// JobName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-batchparameters.html#cfn-events-rule-batchparameters-jobname
+	JobName *types.Value `json:"JobName,omitempty"`
+
+	// RetryStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-batchparameters.html#cfn-events-rule-batchparameters-retrystrategy
+	RetryStrategy *Rule_BatchRetryStrategy `json:"RetryStrategy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_BatchParameters) AWSCloudFormationType() string {
+	return "AWS::Events::Rule.BatchParameters"
+}
diff --git a/goformation/cloudformation/events/aws-events-rule_batchretrystrategy.go b/goformation/cloudformation/events/aws-events-rule_batchretrystrategy.go
new file mode 100644
index 0000000000..356ccd5c1f
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule_batchretrystrategy.go
@@ -0,0 +1,37 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_BatchRetryStrategy AWS CloudFormation Resource (AWS::Events::Rule.BatchRetryStrategy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-batchretrystrategy.html
+type Rule_BatchRetryStrategy struct {
+
+	// Attempts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-batchretrystrategy.html#cfn-events-rule-batchretrystrategy-attempts
+	Attempts *types.Value `json:"Attempts,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_BatchRetryStrategy) AWSCloudFormationType() string {
+	return "AWS::Events::Rule.BatchRetryStrategy"
+}
diff --git a/goformation/cloudformation/events/aws-events-rule_capacityproviderstrategyitem.go b/goformation/cloudformation/events/aws-events-rule_capacityproviderstrategyitem.go
new file mode 100644
index 0000000000..2ea01050d7
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule_capacityproviderstrategyitem.go
@@ -0,0 +1,47 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_CapacityProviderStrategyItem AWS CloudFormation Resource (AWS::Events::Rule.CapacityProviderStrategyItem)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-capacityproviderstrategyitem.html
+type Rule_CapacityProviderStrategyItem struct {
+
+	// Base AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-capacityproviderstrategyitem.html#cfn-events-rule-capacityproviderstrategyitem-base
+	Base *types.Value `json:"Base,omitempty"`
+
+	// CapacityProvider AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-capacityproviderstrategyitem.html#cfn-events-rule-capacityproviderstrategyitem-capacityprovider
+	CapacityProvider *types.Value `json:"CapacityProvider,omitempty"`
+
+	// Weight AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-capacityproviderstrategyitem.html#cfn-events-rule-capacityproviderstrategyitem-weight
+	Weight *types.Value `json:"Weight,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CapacityProviderStrategyItem) AWSCloudFormationType() string {
+	return "AWS::Events::Rule.CapacityProviderStrategyItem"
+}
diff --git a/goformation/cloudformation/events/aws-events-rule_deadletterconfig.go b/goformation/cloudformation/events/aws-events-rule_deadletterconfig.go
new file mode 100644
index 0000000000..851446394d
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule_deadletterconfig.go
@@ -0,0 +1,37 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_DeadLetterConfig AWS CloudFormation Resource (AWS::Events::Rule.DeadLetterConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-deadletterconfig.html
+type Rule_DeadLetterConfig struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-deadletterconfig.html#cfn-events-rule-deadletterconfig-arn
+	Arn *types.Value `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 *Rule_DeadLetterConfig) AWSCloudFormationType() string {
+	return "AWS::Events::Rule.DeadLetterConfig"
+}
diff --git a/goformation/cloudformation/events/aws-events-rule_ecsparameters.go b/goformation/cloudformation/events/aws-events-rule_ecsparameters.go
new file mode 100644
index 0000000000..5bfce1113c
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule_ecsparameters.go
@@ -0,0 +1,103 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_EcsParameters AWS CloudFormation Resource (AWS::Events::Rule.EcsParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-ecsparameters.html
+type Rule_EcsParameters struct {
+
+	// CapacityProviderStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-ecsparameters.html#cfn-events-rule-ecsparameters-capacityproviderstrategy
+	CapacityProviderStrategy []Rule_CapacityProviderStrategyItem `json:"CapacityProviderStrategy,omitempty"`
+
+	// EnableECSManagedTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-ecsparameters.html#cfn-events-rule-ecsparameters-enableecsmanagedtags
+	EnableECSManagedTags *types.Value `json:"EnableECSManagedTags,omitempty"`
+
+	// EnableExecuteCommand AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-ecsparameters.html#cfn-events-rule-ecsparameters-enableexecutecommand
+	EnableExecuteCommand *types.Value `json:"EnableExecuteCommand,omitempty"`
+
+	// Group AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-ecsparameters.html#cfn-events-rule-ecsparameters-group
+	Group *types.Value `json:"Group,omitempty"`
+
+	// LaunchType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-ecsparameters.html#cfn-events-rule-ecsparameters-launchtype
+	LaunchType *types.Value `json:"LaunchType,omitempty"`
+
+	// NetworkConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-ecsparameters.html#cfn-events-rule-ecsparameters-networkconfiguration
+	NetworkConfiguration *Rule_NetworkConfiguration `json:"NetworkConfiguration,omitempty"`
+
+	// PlacementConstraints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-ecsparameters.html#cfn-events-rule-ecsparameters-placementconstraints
+	PlacementConstraints []Rule_PlacementConstraint `json:"PlacementConstraints,omitempty"`
+
+	// PlacementStrategies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-ecsparameters.html#cfn-events-rule-ecsparameters-placementstrategies
+	PlacementStrategies []Rule_PlacementStrategy `json:"PlacementStrategies,omitempty"`
+
+	// PlatformVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-ecsparameters.html#cfn-events-rule-ecsparameters-platformversion
+	PlatformVersion *types.Value `json:"PlatformVersion,omitempty"`
+
+	// PropagateTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-ecsparameters.html#cfn-events-rule-ecsparameters-propagatetags
+	PropagateTags *types.Value `json:"PropagateTags,omitempty"`
+
+	// ReferenceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-ecsparameters.html#cfn-events-rule-ecsparameters-referenceid
+	ReferenceId *types.Value `json:"ReferenceId,omitempty"`
+
+	// TagList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-ecsparameters.html#cfn-events-rule-ecsparameters-taglist
+	TagList []cloudformation.Tag `json:"TagList,omitempty"`
+
+	// TaskCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-ecsparameters.html#cfn-events-rule-ecsparameters-taskcount
+	TaskCount *types.Value `json:"TaskCount,omitempty"`
+
+	// TaskDefinitionArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-ecsparameters.html#cfn-events-rule-ecsparameters-taskdefinitionarn
+	TaskDefinitionArn *types.Value `json:"TaskDefinitionArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EcsParameters) AWSCloudFormationType() string {
+	return "AWS::Events::Rule.EcsParameters"
+}
diff --git a/goformation/cloudformation/events/aws-events-rule_httpparameters.go b/goformation/cloudformation/events/aws-events-rule_httpparameters.go
new file mode 100644
index 0000000000..b2c4567378
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule_httpparameters.go
@@ -0,0 +1,47 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_HttpParameters AWS CloudFormation Resource (AWS::Events::Rule.HttpParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-httpparameters.html
+type Rule_HttpParameters struct {
+
+	// HeaderParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-httpparameters.html#cfn-events-rule-httpparameters-headerparameters
+	HeaderParameters map[string]*types.Value `json:"HeaderParameters,omitempty"`
+
+	// PathParameterValues AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-httpparameters.html#cfn-events-rule-httpparameters-pathparametervalues
+	PathParameterValues *types.Value `json:"PathParameterValues,omitempty"`
+
+	// QueryStringParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-httpparameters.html#cfn-events-rule-httpparameters-querystringparameters
+	QueryStringParameters map[string]*types.Value `json:"QueryStringParameters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_HttpParameters) AWSCloudFormationType() string {
+	return "AWS::Events::Rule.HttpParameters"
+}
diff --git a/goformation/cloudformation/events/aws-events-rule_inputtransformer.go b/goformation/cloudformation/events/aws-events-rule_inputtransformer.go
new file mode 100644
index 0000000000..55980afff8
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule_inputtransformer.go
@@ -0,0 +1,42 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_InputTransformer AWS CloudFormation Resource (AWS::Events::Rule.InputTransformer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-inputtransformer.html
+type Rule_InputTransformer struct {
+
+	// InputPathsMap AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-inputtransformer.html#cfn-events-rule-inputtransformer-inputpathsmap
+	InputPathsMap map[string]*types.Value `json:"InputPathsMap,omitempty"`
+
+	// InputTemplate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-inputtransformer.html#cfn-events-rule-inputtransformer-inputtemplate
+	InputTemplate *types.Value `json:"InputTemplate,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InputTransformer) AWSCloudFormationType() string {
+	return "AWS::Events::Rule.InputTransformer"
+}
diff --git a/goformation/cloudformation/events/aws-events-rule_kinesisparameters.go b/goformation/cloudformation/events/aws-events-rule_kinesisparameters.go
new file mode 100644
index 0000000000..2e61733e3b
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule_kinesisparameters.go
@@ -0,0 +1,37 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_KinesisParameters AWS CloudFormation Resource (AWS::Events::Rule.KinesisParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-kinesisparameters.html
+type Rule_KinesisParameters struct {
+
+	// PartitionKeyPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-kinesisparameters.html#cfn-events-rule-kinesisparameters-partitionkeypath
+	PartitionKeyPath *types.Value `json:"PartitionKeyPath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_KinesisParameters) AWSCloudFormationType() string {
+	return "AWS::Events::Rule.KinesisParameters"
+}
diff --git a/goformation/cloudformation/events/aws-events-rule_networkconfiguration.go b/goformation/cloudformation/events/aws-events-rule_networkconfiguration.go
new file mode 100644
index 0000000000..729abb009a
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule_networkconfiguration.go
@@ -0,0 +1,35 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_NetworkConfiguration AWS CloudFormation Resource (AWS::Events::Rule.NetworkConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-networkconfiguration.html
+type Rule_NetworkConfiguration struct {
+
+	// AwsVpcConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-networkconfiguration.html#cfn-events-rule-networkconfiguration-awsvpcconfiguration
+	AwsVpcConfiguration *Rule_AwsVpcConfiguration `json:"AwsVpcConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_NetworkConfiguration) AWSCloudFormationType() string {
+	return "AWS::Events::Rule.NetworkConfiguration"
+}
diff --git a/goformation/cloudformation/events/aws-events-rule_placementconstraint.go b/goformation/cloudformation/events/aws-events-rule_placementconstraint.go
new file mode 100644
index 0000000000..cdadbf1de5
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule_placementconstraint.go
@@ -0,0 +1,42 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_PlacementConstraint AWS CloudFormation Resource (AWS::Events::Rule.PlacementConstraint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-placementconstraint.html
+type Rule_PlacementConstraint struct {
+
+	// Expression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-placementconstraint.html#cfn-events-rule-placementconstraint-expression
+	Expression *types.Value `json:"Expression,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-placementconstraint.html#cfn-events-rule-placementconstraint-type
+	Type *types.Value `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 *Rule_PlacementConstraint) AWSCloudFormationType() string {
+	return "AWS::Events::Rule.PlacementConstraint"
+}
diff --git a/goformation/cloudformation/events/aws-events-rule_placementstrategy.go b/goformation/cloudformation/events/aws-events-rule_placementstrategy.go
new file mode 100644
index 0000000000..8ece929f8f
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule_placementstrategy.go
@@ -0,0 +1,42 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_PlacementStrategy AWS CloudFormation Resource (AWS::Events::Rule.PlacementStrategy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-placementstrategy.html
+type Rule_PlacementStrategy struct {
+
+	// Field AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-placementstrategy.html#cfn-events-rule-placementstrategy-field
+	Field *types.Value `json:"Field,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-placementstrategy.html#cfn-events-rule-placementstrategy-type
+	Type *types.Value `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 *Rule_PlacementStrategy) AWSCloudFormationType() string {
+	return "AWS::Events::Rule.PlacementStrategy"
+}
diff --git a/goformation/cloudformation/events/aws-events-rule_redshiftdataparameters.go b/goformation/cloudformation/events/aws-events-rule_redshiftdataparameters.go
new file mode 100644
index 0000000000..52e32a4eb9
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule_redshiftdataparameters.go
@@ -0,0 +1,62 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_RedshiftDataParameters AWS CloudFormation Resource (AWS::Events::Rule.RedshiftDataParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-redshiftdataparameters.html
+type Rule_RedshiftDataParameters struct {
+
+	// Database AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-redshiftdataparameters.html#cfn-events-rule-redshiftdataparameters-database
+	Database *types.Value `json:"Database,omitempty"`
+
+	// DbUser AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-redshiftdataparameters.html#cfn-events-rule-redshiftdataparameters-dbuser
+	DbUser *types.Value `json:"DbUser,omitempty"`
+
+	// SecretManagerArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-redshiftdataparameters.html#cfn-events-rule-redshiftdataparameters-secretmanagerarn
+	SecretManagerArn *types.Value `json:"SecretManagerArn,omitempty"`
+
+	// Sql AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-redshiftdataparameters.html#cfn-events-rule-redshiftdataparameters-sql
+	Sql *types.Value `json:"Sql,omitempty"`
+
+	// StatementName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-redshiftdataparameters.html#cfn-events-rule-redshiftdataparameters-statementname
+	StatementName *types.Value `json:"StatementName,omitempty"`
+
+	// WithEvent AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-redshiftdataparameters.html#cfn-events-rule-redshiftdataparameters-withevent
+	WithEvent *types.Value `json:"WithEvent,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RedshiftDataParameters) AWSCloudFormationType() string {
+	return "AWS::Events::Rule.RedshiftDataParameters"
+}
diff --git a/goformation/cloudformation/events/aws-events-rule_retrypolicy.go b/goformation/cloudformation/events/aws-events-rule_retrypolicy.go
new file mode 100644
index 0000000000..4a370b552a
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule_retrypolicy.go
@@ -0,0 +1,42 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_RetryPolicy AWS CloudFormation Resource (AWS::Events::Rule.RetryPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-retrypolicy.html
+type Rule_RetryPolicy struct {
+
+	// MaximumEventAgeInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-retrypolicy.html#cfn-events-rule-retrypolicy-maximumeventageinseconds
+	MaximumEventAgeInSeconds *types.Value `json:"MaximumEventAgeInSeconds,omitempty"`
+
+	// MaximumRetryAttempts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-retrypolicy.html#cfn-events-rule-retrypolicy-maximumretryattempts
+	MaximumRetryAttempts *types.Value `json:"MaximumRetryAttempts,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RetryPolicy) AWSCloudFormationType() string {
+	return "AWS::Events::Rule.RetryPolicy"
+}
diff --git a/goformation/cloudformation/events/aws-events-rule_runcommandparameters.go b/goformation/cloudformation/events/aws-events-rule_runcommandparameters.go
new file mode 100644
index 0000000000..a41dfa0bd2
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule_runcommandparameters.go
@@ -0,0 +1,35 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_RunCommandParameters AWS CloudFormation Resource (AWS::Events::Rule.RunCommandParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-runcommandparameters.html
+type Rule_RunCommandParameters struct {
+
+	// RunCommandTargets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-runcommandparameters.html#cfn-events-rule-runcommandparameters-runcommandtargets
+	RunCommandTargets []Rule_RunCommandTarget `json:"RunCommandTargets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RunCommandParameters) AWSCloudFormationType() string {
+	return "AWS::Events::Rule.RunCommandParameters"
+}
diff --git a/goformation/cloudformation/events/aws-events-rule_runcommandtarget.go b/goformation/cloudformation/events/aws-events-rule_runcommandtarget.go
new file mode 100644
index 0000000000..114b344450
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule_runcommandtarget.go
@@ -0,0 +1,42 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_RunCommandTarget AWS CloudFormation Resource (AWS::Events::Rule.RunCommandTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-runcommandtarget.html
+type Rule_RunCommandTarget struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-runcommandtarget.html#cfn-events-rule-runcommandtarget-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-runcommandtarget.html#cfn-events-rule-runcommandtarget-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RunCommandTarget) AWSCloudFormationType() string {
+	return "AWS::Events::Rule.RunCommandTarget"
+}
diff --git a/goformation/cloudformation/events/aws-events-rule_sqsparameters.go b/goformation/cloudformation/events/aws-events-rule_sqsparameters.go
new file mode 100644
index 0000000000..a70e95d7c5
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule_sqsparameters.go
@@ -0,0 +1,37 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_SqsParameters AWS CloudFormation Resource (AWS::Events::Rule.SqsParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-sqsparameters.html
+type Rule_SqsParameters struct {
+
+	// MessageGroupId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-sqsparameters.html#cfn-events-rule-sqsparameters-messagegroupid
+	MessageGroupId *types.Value `json:"MessageGroupId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SqsParameters) AWSCloudFormationType() string {
+	return "AWS::Events::Rule.SqsParameters"
+}
diff --git a/goformation/cloudformation/events/aws-events-rule_tag.go b/goformation/cloudformation/events/aws-events-rule_tag.go
new file mode 100644
index 0000000000..15377f7131
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule_tag.go
@@ -0,0 +1,42 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_Tag AWS CloudFormation Resource (AWS::Events::Rule.Tag)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-tag.html
+type Rule_Tag struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-tag.html#cfn-events-rule-tag-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-tag.html#cfn-events-rule-tag-value
+	Value *types.Value `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 *Rule_Tag) AWSCloudFormationType() string {
+	return "AWS::Events::Rule.Tag"
+}
diff --git a/goformation/cloudformation/events/aws-events-rule_target.go b/goformation/cloudformation/events/aws-events-rule_target.go
new file mode 100644
index 0000000000..6a83a6472e
--- /dev/null
+++ b/goformation/cloudformation/events/aws-events-rule_target.go
@@ -0,0 +1,107 @@
+package events
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_Target AWS CloudFormation Resource (AWS::Events::Rule.Target)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html
+type Rule_Target struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// BatchParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-batchparameters
+	BatchParameters *Rule_BatchParameters `json:"BatchParameters,omitempty"`
+
+	// DeadLetterConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-deadletterconfig
+	DeadLetterConfig *Rule_DeadLetterConfig `json:"DeadLetterConfig,omitempty"`
+
+	// EcsParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-ecsparameters
+	EcsParameters *Rule_EcsParameters `json:"EcsParameters,omitempty"`
+
+	// HttpParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-httpparameters
+	HttpParameters *Rule_HttpParameters `json:"HttpParameters,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Input AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-input
+	Input *types.Value `json:"Input,omitempty"`
+
+	// InputPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-inputpath
+	InputPath *types.Value `json:"InputPath,omitempty"`
+
+	// InputTransformer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-inputtransformer
+	InputTransformer *Rule_InputTransformer `json:"InputTransformer,omitempty"`
+
+	// KinesisParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-kinesisparameters
+	KinesisParameters *Rule_KinesisParameters `json:"KinesisParameters,omitempty"`
+
+	// RedshiftDataParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-redshiftdataparameters
+	RedshiftDataParameters *Rule_RedshiftDataParameters `json:"RedshiftDataParameters,omitempty"`
+
+	// RetryPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-retrypolicy
+	RetryPolicy *Rule_RetryPolicy `json:"RetryPolicy,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// RunCommandParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-runcommandparameters
+	RunCommandParameters *Rule_RunCommandParameters `json:"RunCommandParameters,omitempty"`
+
+	// SqsParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-events-rule-target.html#cfn-events-rule-target-sqsparameters
+	SqsParameters *Rule_SqsParameters `json:"SqsParameters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Target) AWSCloudFormationType() string {
+	return "AWS::Events::Rule.Target"
+}
diff --git a/goformation/cloudformation/eventschemas/aws-eventschemas-discoverer.go b/goformation/cloudformation/eventschemas/aws-eventschemas-discoverer.go
new file mode 100644
index 0000000000..7b192a8066
--- /dev/null
+++ b/goformation/cloudformation/eventschemas/aws-eventschemas-discoverer.go
@@ -0,0 +1,123 @@
+package eventschemas
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Discoverer AWS CloudFormation Resource (AWS::EventSchemas::Discoverer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-discoverer.html
+type Discoverer struct {
+
+	// CrossAccount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-discoverer.html#cfn-eventschemas-discoverer-crossaccount
+	CrossAccount *types.Value `json:"CrossAccount,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-discoverer.html#cfn-eventschemas-discoverer-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// SourceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-discoverer.html#cfn-eventschemas-discoverer-sourcearn
+	SourceArn *types.Value `json:"SourceArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-discoverer.html#cfn-eventschemas-discoverer-tags
+	Tags []Discoverer_TagsEntry `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 *Discoverer) AWSCloudFormationType() string {
+	return "AWS::EventSchemas::Discoverer"
+}
+
+// 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 Discoverer) MarshalJSON() ([]byte, error) {
+	type Properties Discoverer
+	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 *Discoverer) UnmarshalJSON(b []byte) error {
+	type Properties Discoverer
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Discoverer(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/eventschemas/aws-eventschemas-discoverer_tagsentry.go b/goformation/cloudformation/eventschemas/aws-eventschemas-discoverer_tagsentry.go
new file mode 100644
index 0000000000..ee31b5f8fe
--- /dev/null
+++ b/goformation/cloudformation/eventschemas/aws-eventschemas-discoverer_tagsentry.go
@@ -0,0 +1,42 @@
+package eventschemas
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Discoverer_TagsEntry AWS CloudFormation Resource (AWS::EventSchemas::Discoverer.TagsEntry)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eventschemas-discoverer-tagsentry.html
+type Discoverer_TagsEntry struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eventschemas-discoverer-tagsentry.html#cfn-eventschemas-discoverer-tagsentry-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eventschemas-discoverer-tagsentry.html#cfn-eventschemas-discoverer-tagsentry-value
+	Value *types.Value `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 *Discoverer_TagsEntry) AWSCloudFormationType() string {
+	return "AWS::EventSchemas::Discoverer.TagsEntry"
+}
diff --git a/goformation/cloudformation/eventschemas/aws-eventschemas-registry.go b/goformation/cloudformation/eventschemas/aws-eventschemas-registry.go
new file mode 100644
index 0000000000..1d455865a1
--- /dev/null
+++ b/goformation/cloudformation/eventschemas/aws-eventschemas-registry.go
@@ -0,0 +1,118 @@
+package eventschemas
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Registry AWS CloudFormation Resource (AWS::EventSchemas::Registry)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-registry.html
+type Registry struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-registry.html#cfn-eventschemas-registry-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// RegistryName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-registry.html#cfn-eventschemas-registry-registryname
+	RegistryName *types.Value `json:"RegistryName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-registry.html#cfn-eventschemas-registry-tags
+	Tags []Registry_TagsEntry `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 *Registry) AWSCloudFormationType() string {
+	return "AWS::EventSchemas::Registry"
+}
+
+// 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 Registry) MarshalJSON() ([]byte, error) {
+	type Properties Registry
+	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 *Registry) UnmarshalJSON(b []byte) error {
+	type Properties Registry
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Registry(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/eventschemas/aws-eventschemas-registry_tagsentry.go b/goformation/cloudformation/eventschemas/aws-eventschemas-registry_tagsentry.go
new file mode 100644
index 0000000000..ef32f78640
--- /dev/null
+++ b/goformation/cloudformation/eventschemas/aws-eventschemas-registry_tagsentry.go
@@ -0,0 +1,42 @@
+package eventschemas
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Registry_TagsEntry AWS CloudFormation Resource (AWS::EventSchemas::Registry.TagsEntry)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eventschemas-registry-tagsentry.html
+type Registry_TagsEntry struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eventschemas-registry-tagsentry.html#cfn-eventschemas-registry-tagsentry-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eventschemas-registry-tagsentry.html#cfn-eventschemas-registry-tagsentry-value
+	Value *types.Value `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 *Registry_TagsEntry) AWSCloudFormationType() string {
+	return "AWS::EventSchemas::Registry.TagsEntry"
+}
diff --git a/goformation/cloudformation/eventschemas/aws-eventschemas-registrypolicy.go b/goformation/cloudformation/eventschemas/aws-eventschemas-registrypolicy.go
new file mode 100644
index 0000000000..4c9113f8e8
--- /dev/null
+++ b/goformation/cloudformation/eventschemas/aws-eventschemas-registrypolicy.go
@@ -0,0 +1,118 @@
+package eventschemas
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RegistryPolicy AWS CloudFormation Resource (AWS::EventSchemas::RegistryPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-registrypolicy.html
+type RegistryPolicy struct {
+
+	// Policy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-registrypolicy.html#cfn-eventschemas-registrypolicy-policy
+	Policy interface{} `json:"Policy,omitempty"`
+
+	// RegistryName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-registrypolicy.html#cfn-eventschemas-registrypolicy-registryname
+	RegistryName *types.Value `json:"RegistryName,omitempty"`
+
+	// RevisionId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-registrypolicy.html#cfn-eventschemas-registrypolicy-revisionid
+	RevisionId *types.Value `json:"RevisionId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RegistryPolicy) AWSCloudFormationType() string {
+	return "AWS::EventSchemas::RegistryPolicy"
+}
+
+// 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 RegistryPolicy) MarshalJSON() ([]byte, error) {
+	type Properties RegistryPolicy
+	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 *RegistryPolicy) UnmarshalJSON(b []byte) error {
+	type Properties RegistryPolicy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RegistryPolicy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/eventschemas/aws-eventschemas-schema.go b/goformation/cloudformation/eventschemas/aws-eventschemas-schema.go
new file mode 100644
index 0000000000..885a01181e
--- /dev/null
+++ b/goformation/cloudformation/eventschemas/aws-eventschemas-schema.go
@@ -0,0 +1,133 @@
+package eventschemas
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Schema AWS CloudFormation Resource (AWS::EventSchemas::Schema)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-schema.html
+type Schema struct {
+
+	// Content AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-schema.html#cfn-eventschemas-schema-content
+	Content *types.Value `json:"Content,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-schema.html#cfn-eventschemas-schema-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// RegistryName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-schema.html#cfn-eventschemas-schema-registryname
+	RegistryName *types.Value `json:"RegistryName,omitempty"`
+
+	// SchemaName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-schema.html#cfn-eventschemas-schema-schemaname
+	SchemaName *types.Value `json:"SchemaName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-schema.html#cfn-eventschemas-schema-tags
+	Tags []Schema_TagsEntry `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-eventschemas-schema.html#cfn-eventschemas-schema-type
+	Type *types.Value `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 *Schema) AWSCloudFormationType() string {
+	return "AWS::EventSchemas::Schema"
+}
+
+// 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 Schema) MarshalJSON() ([]byte, error) {
+	type Properties Schema
+	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 *Schema) UnmarshalJSON(b []byte) error {
+	type Properties Schema
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Schema(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/eventschemas/aws-eventschemas-schema_tagsentry.go b/goformation/cloudformation/eventschemas/aws-eventschemas-schema_tagsentry.go
new file mode 100644
index 0000000000..9cbcfc1303
--- /dev/null
+++ b/goformation/cloudformation/eventschemas/aws-eventschemas-schema_tagsentry.go
@@ -0,0 +1,42 @@
+package eventschemas
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Schema_TagsEntry AWS CloudFormation Resource (AWS::EventSchemas::Schema.TagsEntry)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eventschemas-schema-tagsentry.html
+type Schema_TagsEntry struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eventschemas-schema-tagsentry.html#cfn-eventschemas-schema-tagsentry-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-eventschemas-schema-tagsentry.html#cfn-eventschemas-schema-tagsentry-value
+	Value *types.Value `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 *Schema_TagsEntry) AWSCloudFormationType() string {
+	return "AWS::EventSchemas::Schema.TagsEntry"
+}
diff --git a/goformation/cloudformation/evidently/aws-evidently-experiment.go b/goformation/cloudformation/evidently/aws-evidently-experiment.go
new file mode 100644
index 0000000000..a8920d84ab
--- /dev/null
+++ b/goformation/cloudformation/evidently/aws-evidently-experiment.go
@@ -0,0 +1,149 @@
+package evidently
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Experiment AWS CloudFormation Resource (AWS::Evidently::Experiment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-experiment.html
+type Experiment struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-experiment.html#cfn-evidently-experiment-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// MetricGoals AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-experiment.html#cfn-evidently-experiment-metricgoals
+	MetricGoals []Experiment_MetricGoalObject `json:"MetricGoals,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-experiment.html#cfn-evidently-experiment-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// OnlineAbConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-experiment.html#cfn-evidently-experiment-onlineabconfig
+	OnlineAbConfig *Experiment_OnlineAbConfigObject `json:"OnlineAbConfig,omitempty"`
+
+	// Project AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-experiment.html#cfn-evidently-experiment-project
+	Project *types.Value `json:"Project,omitempty"`
+
+	// RandomizationSalt AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-experiment.html#cfn-evidently-experiment-randomizationsalt
+	RandomizationSalt *types.Value `json:"RandomizationSalt,omitempty"`
+
+	// SamplingRate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-experiment.html#cfn-evidently-experiment-samplingrate
+	SamplingRate *types.Value `json:"SamplingRate,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-experiment.html#cfn-evidently-experiment-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Treatments AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-experiment.html#cfn-evidently-experiment-treatments
+	Treatments []Experiment_TreatmentObject `json:"Treatments,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Experiment) AWSCloudFormationType() string {
+	return "AWS::Evidently::Experiment"
+}
+
+// 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 Experiment) MarshalJSON() ([]byte, error) {
+	type Properties Experiment
+	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 *Experiment) UnmarshalJSON(b []byte) error {
+	type Properties Experiment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Experiment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/evidently/aws-evidently-experiment_metricgoalobject.go b/goformation/cloudformation/evidently/aws-evidently-experiment_metricgoalobject.go
new file mode 100644
index 0000000000..b16e623fdb
--- /dev/null
+++ b/goformation/cloudformation/evidently/aws-evidently-experiment_metricgoalobject.go
@@ -0,0 +1,62 @@
+package evidently
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Experiment_MetricGoalObject AWS CloudFormation Resource (AWS::Evidently::Experiment.MetricGoalObject)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-experiment-metricgoalobject.html
+type Experiment_MetricGoalObject struct {
+
+	// DesiredChange AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-experiment-metricgoalobject.html#cfn-evidently-experiment-metricgoalobject-desiredchange
+	DesiredChange *types.Value `json:"DesiredChange,omitempty"`
+
+	// EntityIdKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-experiment-metricgoalobject.html#cfn-evidently-experiment-metricgoalobject-entityidkey
+	EntityIdKey *types.Value `json:"EntityIdKey,omitempty"`
+
+	// EventPattern AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-experiment-metricgoalobject.html#cfn-evidently-experiment-metricgoalobject-eventpattern
+	EventPattern *types.Value `json:"EventPattern,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-experiment-metricgoalobject.html#cfn-evidently-experiment-metricgoalobject-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// UnitLabel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-experiment-metricgoalobject.html#cfn-evidently-experiment-metricgoalobject-unitlabel
+	UnitLabel *types.Value `json:"UnitLabel,omitempty"`
+
+	// ValueKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-experiment-metricgoalobject.html#cfn-evidently-experiment-metricgoalobject-valuekey
+	ValueKey *types.Value `json:"ValueKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Experiment_MetricGoalObject) AWSCloudFormationType() string {
+	return "AWS::Evidently::Experiment.MetricGoalObject"
+}
diff --git a/goformation/cloudformation/evidently/aws-evidently-experiment_onlineabconfigobject.go b/goformation/cloudformation/evidently/aws-evidently-experiment_onlineabconfigobject.go
new file mode 100644
index 0000000000..c2b328dc69
--- /dev/null
+++ b/goformation/cloudformation/evidently/aws-evidently-experiment_onlineabconfigobject.go
@@ -0,0 +1,42 @@
+package evidently
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Experiment_OnlineAbConfigObject AWS CloudFormation Resource (AWS::Evidently::Experiment.OnlineAbConfigObject)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-experiment-onlineabconfigobject.html
+type Experiment_OnlineAbConfigObject struct {
+
+	// ControlTreatmentName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-experiment-onlineabconfigobject.html#cfn-evidently-experiment-onlineabconfigobject-controltreatmentname
+	ControlTreatmentName *types.Value `json:"ControlTreatmentName,omitempty"`
+
+	// TreatmentWeights AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-experiment-onlineabconfigobject.html#cfn-evidently-experiment-onlineabconfigobject-treatmentweights
+	TreatmentWeights []Experiment_TreatmentToWeight `json:"TreatmentWeights,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Experiment_OnlineAbConfigObject) AWSCloudFormationType() string {
+	return "AWS::Evidently::Experiment.OnlineAbConfigObject"
+}
diff --git a/goformation/cloudformation/evidently/aws-evidently-experiment_treatmentobject.go b/goformation/cloudformation/evidently/aws-evidently-experiment_treatmentobject.go
new file mode 100644
index 0000000000..e0af698abf
--- /dev/null
+++ b/goformation/cloudformation/evidently/aws-evidently-experiment_treatmentobject.go
@@ -0,0 +1,52 @@
+package evidently
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Experiment_TreatmentObject AWS CloudFormation Resource (AWS::Evidently::Experiment.TreatmentObject)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-experiment-treatmentobject.html
+type Experiment_TreatmentObject struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-experiment-treatmentobject.html#cfn-evidently-experiment-treatmentobject-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Feature AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-experiment-treatmentobject.html#cfn-evidently-experiment-treatmentobject-feature
+	Feature *types.Value `json:"Feature,omitempty"`
+
+	// TreatmentName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-experiment-treatmentobject.html#cfn-evidently-experiment-treatmentobject-treatmentname
+	TreatmentName *types.Value `json:"TreatmentName,omitempty"`
+
+	// Variation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-experiment-treatmentobject.html#cfn-evidently-experiment-treatmentobject-variation
+	Variation *types.Value `json:"Variation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Experiment_TreatmentObject) AWSCloudFormationType() string {
+	return "AWS::Evidently::Experiment.TreatmentObject"
+}
diff --git a/goformation/cloudformation/evidently/aws-evidently-experiment_treatmenttoweight.go b/goformation/cloudformation/evidently/aws-evidently-experiment_treatmenttoweight.go
new file mode 100644
index 0000000000..e92f5f3e5f
--- /dev/null
+++ b/goformation/cloudformation/evidently/aws-evidently-experiment_treatmenttoweight.go
@@ -0,0 +1,42 @@
+package evidently
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Experiment_TreatmentToWeight AWS CloudFormation Resource (AWS::Evidently::Experiment.TreatmentToWeight)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-experiment-treatmenttoweight.html
+type Experiment_TreatmentToWeight struct {
+
+	// SplitWeight AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-experiment-treatmenttoweight.html#cfn-evidently-experiment-treatmenttoweight-splitweight
+	SplitWeight *types.Value `json:"SplitWeight"`
+
+	// Treatment AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-experiment-treatmenttoweight.html#cfn-evidently-experiment-treatmenttoweight-treatment
+	Treatment *types.Value `json:"Treatment,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Experiment_TreatmentToWeight) AWSCloudFormationType() string {
+	return "AWS::Evidently::Experiment.TreatmentToWeight"
+}
diff --git a/goformation/cloudformation/evidently/aws-evidently-feature.go b/goformation/cloudformation/evidently/aws-evidently-feature.go
new file mode 100644
index 0000000000..f6d0c7c9e0
--- /dev/null
+++ b/goformation/cloudformation/evidently/aws-evidently-feature.go
@@ -0,0 +1,144 @@
+package evidently
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Feature AWS CloudFormation Resource (AWS::Evidently::Feature)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-feature.html
+type Feature struct {
+
+	// DefaultVariation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-feature.html#cfn-evidently-feature-defaultvariation
+	DefaultVariation *types.Value `json:"DefaultVariation,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-feature.html#cfn-evidently-feature-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EntityOverrides AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-feature.html#cfn-evidently-feature-entityoverrides
+	EntityOverrides []Feature_EntityOverride `json:"EntityOverrides,omitempty"`
+
+	// EvaluationStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-feature.html#cfn-evidently-feature-evaluationstrategy
+	EvaluationStrategy *types.Value `json:"EvaluationStrategy,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-feature.html#cfn-evidently-feature-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Project AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-feature.html#cfn-evidently-feature-project
+	Project *types.Value `json:"Project,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-feature.html#cfn-evidently-feature-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Variations AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-feature.html#cfn-evidently-feature-variations
+	Variations []Feature_VariationObject `json:"Variations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Feature) AWSCloudFormationType() string {
+	return "AWS::Evidently::Feature"
+}
+
+// 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 Feature) MarshalJSON() ([]byte, error) {
+	type Properties Feature
+	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 *Feature) UnmarshalJSON(b []byte) error {
+	type Properties Feature
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Feature(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/evidently/aws-evidently-feature_entityoverride.go b/goformation/cloudformation/evidently/aws-evidently-feature_entityoverride.go
new file mode 100644
index 0000000000..8f91de0c98
--- /dev/null
+++ b/goformation/cloudformation/evidently/aws-evidently-feature_entityoverride.go
@@ -0,0 +1,42 @@
+package evidently
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Feature_EntityOverride AWS CloudFormation Resource (AWS::Evidently::Feature.EntityOverride)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-feature-entityoverride.html
+type Feature_EntityOverride struct {
+
+	// EntityId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-feature-entityoverride.html#cfn-evidently-feature-entityoverride-entityid
+	EntityId *types.Value `json:"EntityId,omitempty"`
+
+	// Variation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-feature-entityoverride.html#cfn-evidently-feature-entityoverride-variation
+	Variation *types.Value `json:"Variation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Feature_EntityOverride) AWSCloudFormationType() string {
+	return "AWS::Evidently::Feature.EntityOverride"
+}
diff --git a/goformation/cloudformation/evidently/aws-evidently-feature_variationobject.go b/goformation/cloudformation/evidently/aws-evidently-feature_variationobject.go
new file mode 100644
index 0000000000..0cb4c6ee82
--- /dev/null
+++ b/goformation/cloudformation/evidently/aws-evidently-feature_variationobject.go
@@ -0,0 +1,57 @@
+package evidently
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Feature_VariationObject AWS CloudFormation Resource (AWS::Evidently::Feature.VariationObject)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-feature-variationobject.html
+type Feature_VariationObject struct {
+
+	// BooleanValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-feature-variationobject.html#cfn-evidently-feature-variationobject-booleanvalue
+	BooleanValue *types.Value `json:"BooleanValue,omitempty"`
+
+	// DoubleValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-feature-variationobject.html#cfn-evidently-feature-variationobject-doublevalue
+	DoubleValue *types.Value `json:"DoubleValue,omitempty"`
+
+	// LongValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-feature-variationobject.html#cfn-evidently-feature-variationobject-longvalue
+	LongValue *types.Value `json:"LongValue,omitempty"`
+
+	// StringValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-feature-variationobject.html#cfn-evidently-feature-variationobject-stringvalue
+	StringValue *types.Value `json:"StringValue,omitempty"`
+
+	// VariationName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-feature-variationobject.html#cfn-evidently-feature-variationobject-variationname
+	VariationName *types.Value `json:"VariationName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Feature_VariationObject) AWSCloudFormationType() string {
+	return "AWS::Evidently::Feature.VariationObject"
+}
diff --git a/goformation/cloudformation/evidently/aws-evidently-launch.go b/goformation/cloudformation/evidently/aws-evidently-launch.go
new file mode 100644
index 0000000000..34f4df12b4
--- /dev/null
+++ b/goformation/cloudformation/evidently/aws-evidently-launch.go
@@ -0,0 +1,144 @@
+package evidently
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Launch AWS CloudFormation Resource (AWS::Evidently::Launch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-launch.html
+type Launch struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-launch.html#cfn-evidently-launch-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Groups AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-launch.html#cfn-evidently-launch-groups
+	Groups []Launch_LaunchGroupObject `json:"Groups,omitempty"`
+
+	// MetricMonitors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-launch.html#cfn-evidently-launch-metricmonitors
+	MetricMonitors []Launch_MetricDefinitionObject `json:"MetricMonitors,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-launch.html#cfn-evidently-launch-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Project AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-launch.html#cfn-evidently-launch-project
+	Project *types.Value `json:"Project,omitempty"`
+
+	// RandomizationSalt AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-launch.html#cfn-evidently-launch-randomizationsalt
+	RandomizationSalt *types.Value `json:"RandomizationSalt,omitempty"`
+
+	// ScheduledSplitsConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-launch.html#cfn-evidently-launch-scheduledsplitsconfig
+	ScheduledSplitsConfig []Launch_StepConfig `json:"ScheduledSplitsConfig,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-launch.html#cfn-evidently-launch-tags
+	Tags []cloudformation.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 *Launch) AWSCloudFormationType() string {
+	return "AWS::Evidently::Launch"
+}
+
+// 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 Launch) MarshalJSON() ([]byte, error) {
+	type Properties Launch
+	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 *Launch) UnmarshalJSON(b []byte) error {
+	type Properties Launch
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Launch(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/evidently/aws-evidently-launch_grouptoweight.go b/goformation/cloudformation/evidently/aws-evidently-launch_grouptoweight.go
new file mode 100644
index 0000000000..4bee9b14cb
--- /dev/null
+++ b/goformation/cloudformation/evidently/aws-evidently-launch_grouptoweight.go
@@ -0,0 +1,42 @@
+package evidently
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Launch_GroupToWeight AWS CloudFormation Resource (AWS::Evidently::Launch.GroupToWeight)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-launch-grouptoweight.html
+type Launch_GroupToWeight struct {
+
+	// GroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-launch-grouptoweight.html#cfn-evidently-launch-grouptoweight-groupname
+	GroupName *types.Value `json:"GroupName,omitempty"`
+
+	// SplitWeight AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-launch-grouptoweight.html#cfn-evidently-launch-grouptoweight-splitweight
+	SplitWeight *types.Value `json:"SplitWeight"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Launch_GroupToWeight) AWSCloudFormationType() string {
+	return "AWS::Evidently::Launch.GroupToWeight"
+}
diff --git a/goformation/cloudformation/evidently/aws-evidently-launch_launchgroupobject.go b/goformation/cloudformation/evidently/aws-evidently-launch_launchgroupobject.go
new file mode 100644
index 0000000000..5853fd6118
--- /dev/null
+++ b/goformation/cloudformation/evidently/aws-evidently-launch_launchgroupobject.go
@@ -0,0 +1,52 @@
+package evidently
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Launch_LaunchGroupObject AWS CloudFormation Resource (AWS::Evidently::Launch.LaunchGroupObject)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-launch-launchgroupobject.html
+type Launch_LaunchGroupObject struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-launch-launchgroupobject.html#cfn-evidently-launch-launchgroupobject-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Feature AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-launch-launchgroupobject.html#cfn-evidently-launch-launchgroupobject-feature
+	Feature *types.Value `json:"Feature,omitempty"`
+
+	// GroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-launch-launchgroupobject.html#cfn-evidently-launch-launchgroupobject-groupname
+	GroupName *types.Value `json:"GroupName,omitempty"`
+
+	// Variation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-launch-launchgroupobject.html#cfn-evidently-launch-launchgroupobject-variation
+	Variation *types.Value `json:"Variation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Launch_LaunchGroupObject) AWSCloudFormationType() string {
+	return "AWS::Evidently::Launch.LaunchGroupObject"
+}
diff --git a/goformation/cloudformation/evidently/aws-evidently-launch_metricdefinitionobject.go b/goformation/cloudformation/evidently/aws-evidently-launch_metricdefinitionobject.go
new file mode 100644
index 0000000000..6a39c570aa
--- /dev/null
+++ b/goformation/cloudformation/evidently/aws-evidently-launch_metricdefinitionobject.go
@@ -0,0 +1,57 @@
+package evidently
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Launch_MetricDefinitionObject AWS CloudFormation Resource (AWS::Evidently::Launch.MetricDefinitionObject)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-launch-metricdefinitionobject.html
+type Launch_MetricDefinitionObject struct {
+
+	// EntityIdKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-launch-metricdefinitionobject.html#cfn-evidently-launch-metricdefinitionobject-entityidkey
+	EntityIdKey *types.Value `json:"EntityIdKey,omitempty"`
+
+	// EventPattern AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-launch-metricdefinitionobject.html#cfn-evidently-launch-metricdefinitionobject-eventpattern
+	EventPattern *types.Value `json:"EventPattern,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-launch-metricdefinitionobject.html#cfn-evidently-launch-metricdefinitionobject-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// UnitLabel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-launch-metricdefinitionobject.html#cfn-evidently-launch-metricdefinitionobject-unitlabel
+	UnitLabel *types.Value `json:"UnitLabel,omitempty"`
+
+	// ValueKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-launch-metricdefinitionobject.html#cfn-evidently-launch-metricdefinitionobject-valuekey
+	ValueKey *types.Value `json:"ValueKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Launch_MetricDefinitionObject) AWSCloudFormationType() string {
+	return "AWS::Evidently::Launch.MetricDefinitionObject"
+}
diff --git a/goformation/cloudformation/evidently/aws-evidently-launch_stepconfig.go b/goformation/cloudformation/evidently/aws-evidently-launch_stepconfig.go
new file mode 100644
index 0000000000..9c13e49e6e
--- /dev/null
+++ b/goformation/cloudformation/evidently/aws-evidently-launch_stepconfig.go
@@ -0,0 +1,42 @@
+package evidently
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Launch_StepConfig AWS CloudFormation Resource (AWS::Evidently::Launch.StepConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-launch-stepconfig.html
+type Launch_StepConfig struct {
+
+	// GroupWeights AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-launch-stepconfig.html#cfn-evidently-launch-stepconfig-groupweights
+	GroupWeights []Launch_GroupToWeight `json:"GroupWeights,omitempty"`
+
+	// StartTime AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-launch-stepconfig.html#cfn-evidently-launch-stepconfig-starttime
+	StartTime *types.Value `json:"StartTime,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Launch_StepConfig) AWSCloudFormationType() string {
+	return "AWS::Evidently::Launch.StepConfig"
+}
diff --git a/goformation/cloudformation/evidently/aws-evidently-project.go b/goformation/cloudformation/evidently/aws-evidently-project.go
new file mode 100644
index 0000000000..72f600a16b
--- /dev/null
+++ b/goformation/cloudformation/evidently/aws-evidently-project.go
@@ -0,0 +1,124 @@
+package evidently
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project AWS CloudFormation Resource (AWS::Evidently::Project)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-project.html
+type Project struct {
+
+	// DataDelivery AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-project.html#cfn-evidently-project-datadelivery
+	DataDelivery interface{} `json:"DataDelivery,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-project.html#cfn-evidently-project-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-project.html#cfn-evidently-project-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-evidently-project.html#cfn-evidently-project-tags
+	Tags []cloudformation.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 *Project) AWSCloudFormationType() string {
+	return "AWS::Evidently::Project"
+}
+
+// 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 Project) MarshalJSON() ([]byte, error) {
+	type Properties Project
+	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 *Project) UnmarshalJSON(b []byte) error {
+	type Properties Project
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Project(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/evidently/aws-evidently-project_datadeliveryobject.go b/goformation/cloudformation/evidently/aws-evidently-project_datadeliveryobject.go
new file mode 100644
index 0000000000..51aef6c71c
--- /dev/null
+++ b/goformation/cloudformation/evidently/aws-evidently-project_datadeliveryobject.go
@@ -0,0 +1,42 @@
+package evidently
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_DataDeliveryObject AWS CloudFormation Resource (AWS::Evidently::Project.DataDeliveryObject)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-project-datadeliveryobject.html
+type Project_DataDeliveryObject struct {
+
+	// LogGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-project-datadeliveryobject.html#cfn-evidently-project-datadeliveryobject-loggroup
+	LogGroup *types.Value `json:"LogGroup,omitempty"`
+
+	// S3 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-project-datadeliveryobject.html#cfn-evidently-project-datadeliveryobject-s3
+	S3 interface{} `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 *Project_DataDeliveryObject) AWSCloudFormationType() string {
+	return "AWS::Evidently::Project.DataDeliveryObject"
+}
diff --git a/goformation/cloudformation/evidently/aws-evidently-project_s3destination.go b/goformation/cloudformation/evidently/aws-evidently-project_s3destination.go
new file mode 100644
index 0000000000..3e55c2ddcc
--- /dev/null
+++ b/goformation/cloudformation/evidently/aws-evidently-project_s3destination.go
@@ -0,0 +1,42 @@
+package evidently
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_S3Destination AWS CloudFormation Resource (AWS::Evidently::Project.S3Destination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-project-s3destination.html
+type Project_S3Destination struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-project-s3destination.html#cfn-evidently-project-s3destination-bucketname
+	BucketName *types.Value `json:"BucketName,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-evidently-project-s3destination.html#cfn-evidently-project-s3destination-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_S3Destination) AWSCloudFormationType() string {
+	return "AWS::Evidently::Project.S3Destination"
+}
diff --git a/goformation/cloudformation/finspace/aws-finspace-environment.go b/goformation/cloudformation/finspace/aws-finspace-environment.go
new file mode 100644
index 0000000000..6fdc204b56
--- /dev/null
+++ b/goformation/cloudformation/finspace/aws-finspace-environment.go
@@ -0,0 +1,138 @@
+package finspace
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Environment AWS CloudFormation Resource (AWS::FinSpace::Environment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-finspace-environment.html
+type Environment struct {
+
+	// DataBundles AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-finspace-environment.html#cfn-finspace-environment-databundles
+	DataBundles *types.Value `json:"DataBundles,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-finspace-environment.html#cfn-finspace-environment-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// FederationMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-finspace-environment.html#cfn-finspace-environment-federationmode
+	FederationMode *types.Value `json:"FederationMode,omitempty"`
+
+	// FederationParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-finspace-environment.html#cfn-finspace-environment-federationparameters
+	FederationParameters *Environment_FederationParameters `json:"FederationParameters,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-finspace-environment.html#cfn-finspace-environment-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-finspace-environment.html#cfn-finspace-environment-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SuperuserParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-finspace-environment.html#cfn-finspace-environment-superuserparameters
+	SuperuserParameters *Environment_SuperuserParameters `json:"SuperuserParameters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Environment) AWSCloudFormationType() string {
+	return "AWS::FinSpace::Environment"
+}
+
+// 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 Environment) MarshalJSON() ([]byte, error) {
+	type Properties Environment
+	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 *Environment) UnmarshalJSON(b []byte) error {
+	type Properties Environment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Environment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/finspace/aws-finspace-environment_federationparameters.go b/goformation/cloudformation/finspace/aws-finspace-environment_federationparameters.go
new file mode 100644
index 0000000000..e3f3a5b442
--- /dev/null
+++ b/goformation/cloudformation/finspace/aws-finspace-environment_federationparameters.go
@@ -0,0 +1,62 @@
+package finspace
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Environment_FederationParameters AWS CloudFormation Resource (AWS::FinSpace::Environment.FederationParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-finspace-environment-federationparameters.html
+type Environment_FederationParameters struct {
+
+	// ApplicationCallBackURL AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-finspace-environment-federationparameters.html#cfn-finspace-environment-federationparameters-applicationcallbackurl
+	ApplicationCallBackURL *types.Value `json:"ApplicationCallBackURL,omitempty"`
+
+	// AttributeMap AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-finspace-environment-federationparameters.html#cfn-finspace-environment-federationparameters-attributemap
+	AttributeMap interface{} `json:"AttributeMap,omitempty"`
+
+	// FederationProviderName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-finspace-environment-federationparameters.html#cfn-finspace-environment-federationparameters-federationprovidername
+	FederationProviderName *types.Value `json:"FederationProviderName,omitempty"`
+
+	// FederationURN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-finspace-environment-federationparameters.html#cfn-finspace-environment-federationparameters-federationurn
+	FederationURN *types.Value `json:"FederationURN,omitempty"`
+
+	// SamlMetadataDocument AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-finspace-environment-federationparameters.html#cfn-finspace-environment-federationparameters-samlmetadatadocument
+	SamlMetadataDocument *types.Value `json:"SamlMetadataDocument,omitempty"`
+
+	// SamlMetadataURL AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-finspace-environment-federationparameters.html#cfn-finspace-environment-federationparameters-samlmetadataurl
+	SamlMetadataURL *types.Value `json:"SamlMetadataURL,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Environment_FederationParameters) AWSCloudFormationType() string {
+	return "AWS::FinSpace::Environment.FederationParameters"
+}
diff --git a/goformation/cloudformation/finspace/aws-finspace-environment_superuserparameters.go b/goformation/cloudformation/finspace/aws-finspace-environment_superuserparameters.go
new file mode 100644
index 0000000000..de425cec30
--- /dev/null
+++ b/goformation/cloudformation/finspace/aws-finspace-environment_superuserparameters.go
@@ -0,0 +1,47 @@
+package finspace
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Environment_SuperuserParameters AWS CloudFormation Resource (AWS::FinSpace::Environment.SuperuserParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-finspace-environment-superuserparameters.html
+type Environment_SuperuserParameters struct {
+
+	// EmailAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-finspace-environment-superuserparameters.html#cfn-finspace-environment-superuserparameters-emailaddress
+	EmailAddress *types.Value `json:"EmailAddress,omitempty"`
+
+	// FirstName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-finspace-environment-superuserparameters.html#cfn-finspace-environment-superuserparameters-firstname
+	FirstName *types.Value `json:"FirstName,omitempty"`
+
+	// LastName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-finspace-environment-superuserparameters.html#cfn-finspace-environment-superuserparameters-lastname
+	LastName *types.Value `json:"LastName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Environment_SuperuserParameters) AWSCloudFormationType() string {
+	return "AWS::FinSpace::Environment.SuperuserParameters"
+}
diff --git a/goformation/cloudformation/fis/aws-fis-experimenttemplate.go b/goformation/cloudformation/fis/aws-fis-experimenttemplate.go
new file mode 100644
index 0000000000..3d8a1bcefd
--- /dev/null
+++ b/goformation/cloudformation/fis/aws-fis-experimenttemplate.go
@@ -0,0 +1,133 @@
+package fis
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ExperimentTemplate AWS CloudFormation Resource (AWS::FIS::ExperimentTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fis-experimenttemplate.html
+type ExperimentTemplate struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fis-experimenttemplate.html#cfn-fis-experimenttemplate-actions
+	Actions map[string]ExperimentTemplate_ExperimentTemplateAction `json:"Actions,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fis-experimenttemplate.html#cfn-fis-experimenttemplate-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fis-experimenttemplate.html#cfn-fis-experimenttemplate-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// StopConditions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fis-experimenttemplate.html#cfn-fis-experimenttemplate-stopconditions
+	StopConditions []ExperimentTemplate_ExperimentTemplateStopCondition `json:"StopConditions,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fis-experimenttemplate.html#cfn-fis-experimenttemplate-tags
+	Tags map[string]*types.Value `json:"Tags,omitempty"`
+
+	// Targets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fis-experimenttemplate.html#cfn-fis-experimenttemplate-targets
+	Targets map[string]ExperimentTemplate_ExperimentTemplateTarget `json:"Targets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ExperimentTemplate) AWSCloudFormationType() string {
+	return "AWS::FIS::ExperimentTemplate"
+}
+
+// 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 ExperimentTemplate) MarshalJSON() ([]byte, error) {
+	type Properties ExperimentTemplate
+	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 *ExperimentTemplate) UnmarshalJSON(b []byte) error {
+	type Properties ExperimentTemplate
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ExperimentTemplate(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplateaction.go b/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplateaction.go
new file mode 100644
index 0000000000..8101681268
--- /dev/null
+++ b/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplateaction.go
@@ -0,0 +1,57 @@
+package fis
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ExperimentTemplate_ExperimentTemplateAction AWS CloudFormation Resource (AWS::FIS::ExperimentTemplate.ExperimentTemplateAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fis-experimenttemplate-experimenttemplateaction.html
+type ExperimentTemplate_ExperimentTemplateAction struct {
+
+	// ActionId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fis-experimenttemplate-experimenttemplateaction.html#cfn-fis-experimenttemplate-experimenttemplateaction-actionid
+	ActionId *types.Value `json:"ActionId,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fis-experimenttemplate-experimenttemplateaction.html#cfn-fis-experimenttemplate-experimenttemplateaction-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fis-experimenttemplate-experimenttemplateaction.html#cfn-fis-experimenttemplate-experimenttemplateaction-parameters
+	Parameters map[string]*types.Value `json:"Parameters,omitempty"`
+
+	// StartAfter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fis-experimenttemplate-experimenttemplateaction.html#cfn-fis-experimenttemplate-experimenttemplateaction-startafter
+	StartAfter *types.Value `json:"StartAfter,omitempty"`
+
+	// Targets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fis-experimenttemplate-experimenttemplateaction.html#cfn-fis-experimenttemplate-experimenttemplateaction-targets
+	Targets map[string]*types.Value `json:"Targets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ExperimentTemplate_ExperimentTemplateAction) AWSCloudFormationType() string {
+	return "AWS::FIS::ExperimentTemplate.ExperimentTemplateAction"
+}
diff --git a/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatestopcondition.go b/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatestopcondition.go
new file mode 100644
index 0000000000..11579a524e
--- /dev/null
+++ b/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatestopcondition.go
@@ -0,0 +1,42 @@
+package fis
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ExperimentTemplate_ExperimentTemplateStopCondition AWS CloudFormation Resource (AWS::FIS::ExperimentTemplate.ExperimentTemplateStopCondition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fis-experimenttemplate-experimenttemplatestopcondition.html
+type ExperimentTemplate_ExperimentTemplateStopCondition struct {
+
+	// Source AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fis-experimenttemplate-experimenttemplatestopcondition.html#cfn-fis-experimenttemplate-experimenttemplatestopcondition-source
+	Source *types.Value `json:"Source,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fis-experimenttemplate-experimenttemplatestopcondition.html#cfn-fis-experimenttemplate-experimenttemplatestopcondition-value
+	Value *types.Value `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 *ExperimentTemplate_ExperimentTemplateStopCondition) AWSCloudFormationType() string {
+	return "AWS::FIS::ExperimentTemplate.ExperimentTemplateStopCondition"
+}
diff --git a/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetarget.go b/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetarget.go
new file mode 100644
index 0000000000..7b8e4b18be
--- /dev/null
+++ b/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetarget.go
@@ -0,0 +1,57 @@
+package fis
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ExperimentTemplate_ExperimentTemplateTarget AWS CloudFormation Resource (AWS::FIS::ExperimentTemplate.ExperimentTemplateTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fis-experimenttemplate-experimenttemplatetarget.html
+type ExperimentTemplate_ExperimentTemplateTarget struct {
+
+	// Filters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fis-experimenttemplate-experimenttemplatetarget.html#cfn-fis-experimenttemplate-experimenttemplatetarget-filters
+	Filters []ExperimentTemplate_ExperimentTemplateTargetFilter `json:"Filters,omitempty"`
+
+	// ResourceArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fis-experimenttemplate-experimenttemplatetarget.html#cfn-fis-experimenttemplate-experimenttemplatetarget-resourcearns
+	ResourceArns *types.Value `json:"ResourceArns,omitempty"`
+
+	// ResourceTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fis-experimenttemplate-experimenttemplatetarget.html#cfn-fis-experimenttemplate-experimenttemplatetarget-resourcetags
+	ResourceTags map[string]*types.Value `json:"ResourceTags,omitempty"`
+
+	// ResourceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fis-experimenttemplate-experimenttemplatetarget.html#cfn-fis-experimenttemplate-experimenttemplatetarget-resourcetype
+	ResourceType *types.Value `json:"ResourceType,omitempty"`
+
+	// SelectionMode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fis-experimenttemplate-experimenttemplatetarget.html#cfn-fis-experimenttemplate-experimenttemplatetarget-selectionmode
+	SelectionMode *types.Value `json:"SelectionMode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ExperimentTemplate_ExperimentTemplateTarget) AWSCloudFormationType() string {
+	return "AWS::FIS::ExperimentTemplate.ExperimentTemplateTarget"
+}
diff --git a/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetargetfilter.go b/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetargetfilter.go
new file mode 100644
index 0000000000..658a82633f
--- /dev/null
+++ b/goformation/cloudformation/fis/aws-fis-experimenttemplate_experimenttemplatetargetfilter.go
@@ -0,0 +1,42 @@
+package fis
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ExperimentTemplate_ExperimentTemplateTargetFilter AWS CloudFormation Resource (AWS::FIS::ExperimentTemplate.ExperimentTemplateTargetFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fis-experimenttemplate-experimenttemplatetargetfilter.html
+type ExperimentTemplate_ExperimentTemplateTargetFilter struct {
+
+	// Path AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fis-experimenttemplate-experimenttemplatetargetfilter.html#cfn-fis-experimenttemplate-experimenttemplatetargetfilter-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fis-experimenttemplate-experimenttemplatetargetfilter.html#cfn-fis-experimenttemplate-experimenttemplatetargetfilter-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ExperimentTemplate_ExperimentTemplateTargetFilter) AWSCloudFormationType() string {
+	return "AWS::FIS::ExperimentTemplate.ExperimentTemplateTargetFilter"
+}
diff --git a/goformation/cloudformation/fms/aws-fms-notificationchannel.go b/goformation/cloudformation/fms/aws-fms-notificationchannel.go
new file mode 100644
index 0000000000..c59fba65a5
--- /dev/null
+++ b/goformation/cloudformation/fms/aws-fms-notificationchannel.go
@@ -0,0 +1,113 @@
+package fms
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NotificationChannel AWS CloudFormation Resource (AWS::FMS::NotificationChannel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fms-notificationchannel.html
+type NotificationChannel struct {
+
+	// SnsRoleName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fms-notificationchannel.html#cfn-fms-notificationchannel-snsrolename
+	SnsRoleName *types.Value `json:"SnsRoleName,omitempty"`
+
+	// SnsTopicArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fms-notificationchannel.html#cfn-fms-notificationchannel-snstopicarn
+	SnsTopicArn *types.Value `json:"SnsTopicArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NotificationChannel) AWSCloudFormationType() string {
+	return "AWS::FMS::NotificationChannel"
+}
+
+// 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 NotificationChannel) MarshalJSON() ([]byte, error) {
+	type Properties NotificationChannel
+	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 *NotificationChannel) UnmarshalJSON(b []byte) error {
+	type Properties NotificationChannel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = NotificationChannel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/fms/aws-fms-policy.go b/goformation/cloudformation/fms/aws-fms-policy.go
new file mode 100644
index 0000000000..5ab6deb376
--- /dev/null
+++ b/goformation/cloudformation/fms/aws-fms-policy.go
@@ -0,0 +1,163 @@
+package fms
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Policy AWS CloudFormation Resource (AWS::FMS::Policy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fms-policy.html
+type Policy struct {
+
+	// DeleteAllPolicyResources AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fms-policy.html#cfn-fms-policy-deleteallpolicyresources
+	DeleteAllPolicyResources *types.Value `json:"DeleteAllPolicyResources,omitempty"`
+
+	// ExcludeMap AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fms-policy.html#cfn-fms-policy-excludemap
+	ExcludeMap *Policy_IEMap `json:"ExcludeMap,omitempty"`
+
+	// ExcludeResourceTags AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fms-policy.html#cfn-fms-policy-excluderesourcetags
+	ExcludeResourceTags *types.Value `json:"ExcludeResourceTags"`
+
+	// IncludeMap AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fms-policy.html#cfn-fms-policy-includemap
+	IncludeMap *Policy_IEMap `json:"IncludeMap,omitempty"`
+
+	// PolicyName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fms-policy.html#cfn-fms-policy-policyname
+	PolicyName *types.Value `json:"PolicyName,omitempty"`
+
+	// RemediationEnabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fms-policy.html#cfn-fms-policy-remediationenabled
+	RemediationEnabled *types.Value `json:"RemediationEnabled"`
+
+	// ResourceTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fms-policy.html#cfn-fms-policy-resourcetags
+	ResourceTags []Policy_ResourceTag `json:"ResourceTags,omitempty"`
+
+	// ResourceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fms-policy.html#cfn-fms-policy-resourcetype
+	ResourceType *types.Value `json:"ResourceType,omitempty"`
+
+	// ResourceTypeList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fms-policy.html#cfn-fms-policy-resourcetypelist
+	ResourceTypeList *types.Value `json:"ResourceTypeList,omitempty"`
+
+	// ResourcesCleanUp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fms-policy.html#cfn-fms-policy-resourcescleanup
+	ResourcesCleanUp *types.Value `json:"ResourcesCleanUp,omitempty"`
+
+	// SecurityServicePolicyData AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fms-policy.html#cfn-fms-policy-securityservicepolicydata
+	SecurityServicePolicyData interface{} `json:"SecurityServicePolicyData,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fms-policy.html#cfn-fms-policy-tags
+	Tags []Policy_PolicyTag `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 *Policy) AWSCloudFormationType() string {
+	return "AWS::FMS::Policy"
+}
+
+// MarshalJSON is a custom JSON marshalling hook that embeds this object into
+// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
+func (r Policy) MarshalJSON() ([]byte, error) {
+	type Properties Policy
+	return json.Marshal(&struct {
+		Type                string
+		Properties          Properties
+		DependsOn           []string                     `json:"DependsOn,omitempty"`
+		Metadata            map[string]interface{}       `json:"Metadata,omitempty"`
+		DeletionPolicy      policies.DeletionPolicy      `json:"DeletionPolicy,omitempty"`
+		UpdateReplacePolicy policies.UpdateReplacePolicy `json:"UpdateReplacePolicy,omitempty"`
+		Condition           string                       `json:"Condition,omitempty"`
+	}{
+		Type:                r.AWSCloudFormationType(),
+		Properties:          (Properties)(r),
+		DependsOn:           r.AWSCloudFormationDependsOn,
+		Metadata:            r.AWSCloudFormationMetadata,
+		DeletionPolicy:      r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition:           r.AWSCloudFormationCondition,
+	})
+}
+
+// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
+// AWS CloudFormation resource object, and just keeps the 'Properties' field.
+func (r *Policy) UnmarshalJSON(b []byte) error {
+	type Properties Policy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Policy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/fms/aws-fms-policy_iemap.go b/goformation/cloudformation/fms/aws-fms-policy_iemap.go
new file mode 100644
index 0000000000..5d4dd931cb
--- /dev/null
+++ b/goformation/cloudformation/fms/aws-fms-policy_iemap.go
@@ -0,0 +1,42 @@
+package fms
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Policy_IEMap AWS CloudFormation Resource (AWS::FMS::Policy.IEMap)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-iemap.html
+type Policy_IEMap struct {
+
+	// ACCOUNT AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-iemap.html#cfn-fms-policy-iemap-account
+	ACCOUNT *types.Value `json:"ACCOUNT,omitempty"`
+
+	// ORGUNIT AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-iemap.html#cfn-fms-policy-iemap-orgunit
+	ORGUNIT *types.Value `json:"ORGUNIT,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_IEMap) AWSCloudFormationType() string {
+	return "AWS::FMS::Policy.IEMap"
+}
diff --git a/goformation/cloudformation/fms/aws-fms-policy_policytag.go b/goformation/cloudformation/fms/aws-fms-policy_policytag.go
new file mode 100644
index 0000000000..c7c64d6dce
--- /dev/null
+++ b/goformation/cloudformation/fms/aws-fms-policy_policytag.go
@@ -0,0 +1,42 @@
+package fms
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Policy_PolicyTag AWS CloudFormation Resource (AWS::FMS::Policy.PolicyTag)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-policytag.html
+type Policy_PolicyTag struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-policytag.html#cfn-fms-policy-policytag-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-policytag.html#cfn-fms-policy-policytag-value
+	Value *types.Value `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 *Policy_PolicyTag) AWSCloudFormationType() string {
+	return "AWS::FMS::Policy.PolicyTag"
+}
diff --git a/goformation/cloudformation/fms/aws-fms-policy_resourcetag.go b/goformation/cloudformation/fms/aws-fms-policy_resourcetag.go
new file mode 100644
index 0000000000..8971f864ec
--- /dev/null
+++ b/goformation/cloudformation/fms/aws-fms-policy_resourcetag.go
@@ -0,0 +1,42 @@
+package fms
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Policy_ResourceTag AWS CloudFormation Resource (AWS::FMS::Policy.ResourceTag)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-resourcetag.html
+type Policy_ResourceTag struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-resourcetag.html#cfn-fms-policy-resourcetag-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fms-policy-resourcetag.html#cfn-fms-policy-resourcetag-value
+	Value *types.Value `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 *Policy_ResourceTag) AWSCloudFormationType() string {
+	return "AWS::FMS::Policy.ResourceTag"
+}
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-detector.go b/goformation/cloudformation/frauddetector/aws-frauddetector-detector.go
new file mode 100644
index 0000000000..a6547fba4a
--- /dev/null
+++ b/goformation/cloudformation/frauddetector/aws-frauddetector-detector.go
@@ -0,0 +1,144 @@
+package frauddetector
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Detector AWS CloudFormation Resource (AWS::FraudDetector::Detector)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-detector.html
+type Detector struct {
+
+	// AssociatedModels AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-detector.html#cfn-frauddetector-detector-associatedmodels
+	AssociatedModels []Detector_Model `json:"AssociatedModels,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-detector.html#cfn-frauddetector-detector-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DetectorId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-detector.html#cfn-frauddetector-detector-detectorid
+	DetectorId *types.Value `json:"DetectorId,omitempty"`
+
+	// DetectorVersionStatus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-detector.html#cfn-frauddetector-detector-detectorversionstatus
+	DetectorVersionStatus *types.Value `json:"DetectorVersionStatus,omitempty"`
+
+	// EventType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-detector.html#cfn-frauddetector-detector-eventtype
+	EventType *Detector_EventType `json:"EventType,omitempty"`
+
+	// RuleExecutionMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-detector.html#cfn-frauddetector-detector-ruleexecutionmode
+	RuleExecutionMode *types.Value `json:"RuleExecutionMode,omitempty"`
+
+	// Rules AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-detector.html#cfn-frauddetector-detector-rules
+	Rules []Detector_Rule `json:"Rules,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-detector.html#cfn-frauddetector-detector-tags
+	Tags []cloudformation.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 *Detector) AWSCloudFormationType() string {
+	return "AWS::FraudDetector::Detector"
+}
+
+// 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 Detector) MarshalJSON() ([]byte, error) {
+	type Properties Detector
+	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 *Detector) UnmarshalJSON(b []byte) error {
+	type Properties Detector
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Detector(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/frauddetector/aws-frauddetector-detector_entitytype.go b/goformation/cloudformation/frauddetector/aws-frauddetector-detector_entitytype.go
new file mode 100644
index 0000000000..a5135ec645
--- /dev/null
+++ b/goformation/cloudformation/frauddetector/aws-frauddetector-detector_entitytype.go
@@ -0,0 +1,68 @@
+package frauddetector
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Detector_EntityType AWS CloudFormation Resource (AWS::FraudDetector::Detector.EntityType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-entitytype.html
+type Detector_EntityType struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-entitytype.html#cfn-frauddetector-detector-entitytype-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// CreatedTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-entitytype.html#cfn-frauddetector-detector-entitytype-createdtime
+	CreatedTime *types.Value `json:"CreatedTime,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-entitytype.html#cfn-frauddetector-detector-entitytype-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Inline AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-entitytype.html#cfn-frauddetector-detector-entitytype-inline
+	Inline *types.Value `json:"Inline,omitempty"`
+
+	// LastUpdatedTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-entitytype.html#cfn-frauddetector-detector-entitytype-lastupdatedtime
+	LastUpdatedTime *types.Value `json:"LastUpdatedTime,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-entitytype.html#cfn-frauddetector-detector-entitytype-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-entitytype.html#cfn-frauddetector-detector-entitytype-tags
+	Tags []cloudformation.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 *Detector_EntityType) AWSCloudFormationType() string {
+	return "AWS::FraudDetector::Detector.EntityType"
+}
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-detector_eventtype.go b/goformation/cloudformation/frauddetector/aws-frauddetector-detector_eventtype.go
new file mode 100644
index 0000000000..543970738a
--- /dev/null
+++ b/goformation/cloudformation/frauddetector/aws-frauddetector-detector_eventtype.go
@@ -0,0 +1,83 @@
+package frauddetector
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Detector_EventType AWS CloudFormation Resource (AWS::FraudDetector::Detector.EventType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventtype.html
+type Detector_EventType struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventtype.html#cfn-frauddetector-detector-eventtype-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// CreatedTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventtype.html#cfn-frauddetector-detector-eventtype-createdtime
+	CreatedTime *types.Value `json:"CreatedTime,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventtype.html#cfn-frauddetector-detector-eventtype-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EntityTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventtype.html#cfn-frauddetector-detector-eventtype-entitytypes
+	EntityTypes []Detector_EntityType `json:"EntityTypes,omitempty"`
+
+	// EventVariables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventtype.html#cfn-frauddetector-detector-eventtype-eventvariables
+	EventVariables []Detector_EventVariable `json:"EventVariables,omitempty"`
+
+	// Inline AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventtype.html#cfn-frauddetector-detector-eventtype-inline
+	Inline *types.Value `json:"Inline,omitempty"`
+
+	// Labels AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventtype.html#cfn-frauddetector-detector-eventtype-labels
+	Labels []Detector_Label `json:"Labels,omitempty"`
+
+	// LastUpdatedTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventtype.html#cfn-frauddetector-detector-eventtype-lastupdatedtime
+	LastUpdatedTime *types.Value `json:"LastUpdatedTime,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventtype.html#cfn-frauddetector-detector-eventtype-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventtype.html#cfn-frauddetector-detector-eventtype-tags
+	Tags []cloudformation.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 *Detector_EventType) AWSCloudFormationType() string {
+	return "AWS::FraudDetector::Detector.EventType"
+}
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-detector_eventvariable.go b/goformation/cloudformation/frauddetector/aws-frauddetector-detector_eventvariable.go
new file mode 100644
index 0000000000..2009893d9b
--- /dev/null
+++ b/goformation/cloudformation/frauddetector/aws-frauddetector-detector_eventvariable.go
@@ -0,0 +1,88 @@
+package frauddetector
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Detector_EventVariable AWS CloudFormation Resource (AWS::FraudDetector::Detector.EventVariable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventvariable.html
+type Detector_EventVariable struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventvariable.html#cfn-frauddetector-detector-eventvariable-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// CreatedTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventvariable.html#cfn-frauddetector-detector-eventvariable-createdtime
+	CreatedTime *types.Value `json:"CreatedTime,omitempty"`
+
+	// DataSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventvariable.html#cfn-frauddetector-detector-eventvariable-datasource
+	DataSource *types.Value `json:"DataSource,omitempty"`
+
+	// DataType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventvariable.html#cfn-frauddetector-detector-eventvariable-datatype
+	DataType *types.Value `json:"DataType,omitempty"`
+
+	// DefaultValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventvariable.html#cfn-frauddetector-detector-eventvariable-defaultvalue
+	DefaultValue *types.Value `json:"DefaultValue,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventvariable.html#cfn-frauddetector-detector-eventvariable-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Inline AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventvariable.html#cfn-frauddetector-detector-eventvariable-inline
+	Inline *types.Value `json:"Inline,omitempty"`
+
+	// LastUpdatedTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventvariable.html#cfn-frauddetector-detector-eventvariable-lastupdatedtime
+	LastUpdatedTime *types.Value `json:"LastUpdatedTime,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventvariable.html#cfn-frauddetector-detector-eventvariable-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventvariable.html#cfn-frauddetector-detector-eventvariable-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VariableType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-eventvariable.html#cfn-frauddetector-detector-eventvariable-variabletype
+	VariableType *types.Value `json:"VariableType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Detector_EventVariable) AWSCloudFormationType() string {
+	return "AWS::FraudDetector::Detector.EventVariable"
+}
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-detector_label.go b/goformation/cloudformation/frauddetector/aws-frauddetector-detector_label.go
new file mode 100644
index 0000000000..058603aca5
--- /dev/null
+++ b/goformation/cloudformation/frauddetector/aws-frauddetector-detector_label.go
@@ -0,0 +1,68 @@
+package frauddetector
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Detector_Label AWS CloudFormation Resource (AWS::FraudDetector::Detector.Label)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-label.html
+type Detector_Label struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-label.html#cfn-frauddetector-detector-label-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// CreatedTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-label.html#cfn-frauddetector-detector-label-createdtime
+	CreatedTime *types.Value `json:"CreatedTime,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-label.html#cfn-frauddetector-detector-label-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Inline AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-label.html#cfn-frauddetector-detector-label-inline
+	Inline *types.Value `json:"Inline,omitempty"`
+
+	// LastUpdatedTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-label.html#cfn-frauddetector-detector-label-lastupdatedtime
+	LastUpdatedTime *types.Value `json:"LastUpdatedTime,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-label.html#cfn-frauddetector-detector-label-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-label.html#cfn-frauddetector-detector-label-tags
+	Tags []cloudformation.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 *Detector_Label) AWSCloudFormationType() string {
+	return "AWS::FraudDetector::Detector.Label"
+}
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-detector_model.go b/goformation/cloudformation/frauddetector/aws-frauddetector-detector_model.go
new file mode 100644
index 0000000000..1191ba1a56
--- /dev/null
+++ b/goformation/cloudformation/frauddetector/aws-frauddetector-detector_model.go
@@ -0,0 +1,37 @@
+package frauddetector
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Detector_Model AWS CloudFormation Resource (AWS::FraudDetector::Detector.Model)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-model.html
+type Detector_Model struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-model.html#cfn-frauddetector-detector-model-arn
+	Arn *types.Value `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 *Detector_Model) AWSCloudFormationType() string {
+	return "AWS::FraudDetector::Detector.Model"
+}
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-detector_outcome.go b/goformation/cloudformation/frauddetector/aws-frauddetector-detector_outcome.go
new file mode 100644
index 0000000000..dfab4e9cb4
--- /dev/null
+++ b/goformation/cloudformation/frauddetector/aws-frauddetector-detector_outcome.go
@@ -0,0 +1,68 @@
+package frauddetector
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Detector_Outcome AWS CloudFormation Resource (AWS::FraudDetector::Detector.Outcome)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-outcome.html
+type Detector_Outcome struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-outcome.html#cfn-frauddetector-detector-outcome-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// CreatedTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-outcome.html#cfn-frauddetector-detector-outcome-createdtime
+	CreatedTime *types.Value `json:"CreatedTime,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-outcome.html#cfn-frauddetector-detector-outcome-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Inline AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-outcome.html#cfn-frauddetector-detector-outcome-inline
+	Inline *types.Value `json:"Inline,omitempty"`
+
+	// LastUpdatedTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-outcome.html#cfn-frauddetector-detector-outcome-lastupdatedtime
+	LastUpdatedTime *types.Value `json:"LastUpdatedTime,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-outcome.html#cfn-frauddetector-detector-outcome-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-outcome.html#cfn-frauddetector-detector-outcome-tags
+	Tags []cloudformation.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 *Detector_Outcome) AWSCloudFormationType() string {
+	return "AWS::FraudDetector::Detector.Outcome"
+}
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-detector_rule.go b/goformation/cloudformation/frauddetector/aws-frauddetector-detector_rule.go
new file mode 100644
index 0000000000..1e18da7b25
--- /dev/null
+++ b/goformation/cloudformation/frauddetector/aws-frauddetector-detector_rule.go
@@ -0,0 +1,88 @@
+package frauddetector
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Detector_Rule AWS CloudFormation Resource (AWS::FraudDetector::Detector.Rule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-rule.html
+type Detector_Rule struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-rule.html#cfn-frauddetector-detector-rule-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// CreatedTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-rule.html#cfn-frauddetector-detector-rule-createdtime
+	CreatedTime *types.Value `json:"CreatedTime,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-rule.html#cfn-frauddetector-detector-rule-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DetectorId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-rule.html#cfn-frauddetector-detector-rule-detectorid
+	DetectorId *types.Value `json:"DetectorId,omitempty"`
+
+	// Expression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-rule.html#cfn-frauddetector-detector-rule-expression
+	Expression *types.Value `json:"Expression,omitempty"`
+
+	// Language AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-rule.html#cfn-frauddetector-detector-rule-language
+	Language *types.Value `json:"Language,omitempty"`
+
+	// LastUpdatedTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-rule.html#cfn-frauddetector-detector-rule-lastupdatedtime
+	LastUpdatedTime *types.Value `json:"LastUpdatedTime,omitempty"`
+
+	// Outcomes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-rule.html#cfn-frauddetector-detector-rule-outcomes
+	Outcomes []Detector_Outcome `json:"Outcomes,omitempty"`
+
+	// RuleId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-rule.html#cfn-frauddetector-detector-rule-ruleid
+	RuleId *types.Value `json:"RuleId,omitempty"`
+
+	// RuleVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-rule.html#cfn-frauddetector-detector-rule-ruleversion
+	RuleVersion *types.Value `json:"RuleVersion,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-detector-rule.html#cfn-frauddetector-detector-rule-tags
+	Tags []cloudformation.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 *Detector_Rule) AWSCloudFormationType() string {
+	return "AWS::FraudDetector::Detector.Rule"
+}
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-entitytype.go b/goformation/cloudformation/frauddetector/aws-frauddetector-entitytype.go
new file mode 100644
index 0000000000..a36cdf236a
--- /dev/null
+++ b/goformation/cloudformation/frauddetector/aws-frauddetector-entitytype.go
@@ -0,0 +1,119 @@
+package frauddetector
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// EntityType AWS CloudFormation Resource (AWS::FraudDetector::EntityType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-entitytype.html
+type EntityType struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-entitytype.html#cfn-frauddetector-entitytype-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-entitytype.html#cfn-frauddetector-entitytype-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-entitytype.html#cfn-frauddetector-entitytype-tags
+	Tags []cloudformation.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 *EntityType) AWSCloudFormationType() string {
+	return "AWS::FraudDetector::EntityType"
+}
+
+// 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 EntityType) MarshalJSON() ([]byte, error) {
+	type Properties EntityType
+	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 *EntityType) UnmarshalJSON(b []byte) error {
+	type Properties EntityType
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = EntityType(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype.go b/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype.go
new file mode 100644
index 0000000000..519fd054ea
--- /dev/null
+++ b/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype.go
@@ -0,0 +1,134 @@
+package frauddetector
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventType AWS CloudFormation Resource (AWS::FraudDetector::EventType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-eventtype.html
+type EventType struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-eventtype.html#cfn-frauddetector-eventtype-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EntityTypes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-eventtype.html#cfn-frauddetector-eventtype-entitytypes
+	EntityTypes []EventType_EntityType `json:"EntityTypes,omitempty"`
+
+	// EventVariables AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-eventtype.html#cfn-frauddetector-eventtype-eventvariables
+	EventVariables []EventType_EventVariable `json:"EventVariables,omitempty"`
+
+	// Labels AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-eventtype.html#cfn-frauddetector-eventtype-labels
+	Labels []EventType_Label `json:"Labels,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-eventtype.html#cfn-frauddetector-eventtype-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-eventtype.html#cfn-frauddetector-eventtype-tags
+	Tags []cloudformation.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 *EventType) AWSCloudFormationType() string {
+	return "AWS::FraudDetector::EventType"
+}
+
+// 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 EventType) MarshalJSON() ([]byte, error) {
+	type Properties EventType
+	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 *EventType) UnmarshalJSON(b []byte) error {
+	type Properties EventType
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = EventType(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_entitytype.go b/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_entitytype.go
new file mode 100644
index 0000000000..6d01f4283c
--- /dev/null
+++ b/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_entitytype.go
@@ -0,0 +1,68 @@
+package frauddetector
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventType_EntityType AWS CloudFormation Resource (AWS::FraudDetector::EventType.EntityType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-entitytype.html
+type EventType_EntityType struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-entitytype.html#cfn-frauddetector-eventtype-entitytype-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// CreatedTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-entitytype.html#cfn-frauddetector-eventtype-entitytype-createdtime
+	CreatedTime *types.Value `json:"CreatedTime,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-entitytype.html#cfn-frauddetector-eventtype-entitytype-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Inline AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-entitytype.html#cfn-frauddetector-eventtype-entitytype-inline
+	Inline *types.Value `json:"Inline,omitempty"`
+
+	// LastUpdatedTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-entitytype.html#cfn-frauddetector-eventtype-entitytype-lastupdatedtime
+	LastUpdatedTime *types.Value `json:"LastUpdatedTime,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-entitytype.html#cfn-frauddetector-eventtype-entitytype-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-entitytype.html#cfn-frauddetector-eventtype-entitytype-tags
+	Tags []cloudformation.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 *EventType_EntityType) AWSCloudFormationType() string {
+	return "AWS::FraudDetector::EventType.EntityType"
+}
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_eventvariable.go b/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_eventvariable.go
new file mode 100644
index 0000000000..b77cd0d9ad
--- /dev/null
+++ b/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_eventvariable.go
@@ -0,0 +1,88 @@
+package frauddetector
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventType_EventVariable AWS CloudFormation Resource (AWS::FraudDetector::EventType.EventVariable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-eventvariable.html
+type EventType_EventVariable struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-eventvariable.html#cfn-frauddetector-eventtype-eventvariable-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// CreatedTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-eventvariable.html#cfn-frauddetector-eventtype-eventvariable-createdtime
+	CreatedTime *types.Value `json:"CreatedTime,omitempty"`
+
+	// DataSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-eventvariable.html#cfn-frauddetector-eventtype-eventvariable-datasource
+	DataSource *types.Value `json:"DataSource,omitempty"`
+
+	// DataType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-eventvariable.html#cfn-frauddetector-eventtype-eventvariable-datatype
+	DataType *types.Value `json:"DataType,omitempty"`
+
+	// DefaultValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-eventvariable.html#cfn-frauddetector-eventtype-eventvariable-defaultvalue
+	DefaultValue *types.Value `json:"DefaultValue,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-eventvariable.html#cfn-frauddetector-eventtype-eventvariable-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Inline AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-eventvariable.html#cfn-frauddetector-eventtype-eventvariable-inline
+	Inline *types.Value `json:"Inline,omitempty"`
+
+	// LastUpdatedTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-eventvariable.html#cfn-frauddetector-eventtype-eventvariable-lastupdatedtime
+	LastUpdatedTime *types.Value `json:"LastUpdatedTime,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-eventvariable.html#cfn-frauddetector-eventtype-eventvariable-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-eventvariable.html#cfn-frauddetector-eventtype-eventvariable-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VariableType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-eventvariable.html#cfn-frauddetector-eventtype-eventvariable-variabletype
+	VariableType *types.Value `json:"VariableType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EventType_EventVariable) AWSCloudFormationType() string {
+	return "AWS::FraudDetector::EventType.EventVariable"
+}
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_label.go b/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_label.go
new file mode 100644
index 0000000000..b586b88433
--- /dev/null
+++ b/goformation/cloudformation/frauddetector/aws-frauddetector-eventtype_label.go
@@ -0,0 +1,68 @@
+package frauddetector
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventType_Label AWS CloudFormation Resource (AWS::FraudDetector::EventType.Label)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-label.html
+type EventType_Label struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-label.html#cfn-frauddetector-eventtype-label-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// CreatedTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-label.html#cfn-frauddetector-eventtype-label-createdtime
+	CreatedTime *types.Value `json:"CreatedTime,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-label.html#cfn-frauddetector-eventtype-label-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Inline AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-label.html#cfn-frauddetector-eventtype-label-inline
+	Inline *types.Value `json:"Inline,omitempty"`
+
+	// LastUpdatedTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-label.html#cfn-frauddetector-eventtype-label-lastupdatedtime
+	LastUpdatedTime *types.Value `json:"LastUpdatedTime,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-label.html#cfn-frauddetector-eventtype-label-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-frauddetector-eventtype-label.html#cfn-frauddetector-eventtype-label-tags
+	Tags []cloudformation.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 *EventType_Label) AWSCloudFormationType() string {
+	return "AWS::FraudDetector::EventType.Label"
+}
diff --git a/goformation/cloudformation/frauddetector/aws-frauddetector-label.go b/goformation/cloudformation/frauddetector/aws-frauddetector-label.go
new file mode 100644
index 0000000000..0794ec22b9
--- /dev/null
+++ b/goformation/cloudformation/frauddetector/aws-frauddetector-label.go
@@ -0,0 +1,119 @@
+package frauddetector
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Label AWS CloudFormation Resource (AWS::FraudDetector::Label)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-label.html
+type Label struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-label.html#cfn-frauddetector-label-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-label.html#cfn-frauddetector-label-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-label.html#cfn-frauddetector-label-tags
+	Tags []cloudformation.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 *Label) AWSCloudFormationType() string {
+	return "AWS::FraudDetector::Label"
+}
+
+// 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 Label) MarshalJSON() ([]byte, error) {
+	type Properties Label
+	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 *Label) UnmarshalJSON(b []byte) error {
+	type Properties Label
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Label(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/frauddetector/aws-frauddetector-outcome.go b/goformation/cloudformation/frauddetector/aws-frauddetector-outcome.go
new file mode 100644
index 0000000000..a34923b4e9
--- /dev/null
+++ b/goformation/cloudformation/frauddetector/aws-frauddetector-outcome.go
@@ -0,0 +1,119 @@
+package frauddetector
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Outcome AWS CloudFormation Resource (AWS::FraudDetector::Outcome)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-outcome.html
+type Outcome struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-outcome.html#cfn-frauddetector-outcome-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-outcome.html#cfn-frauddetector-outcome-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-outcome.html#cfn-frauddetector-outcome-tags
+	Tags []cloudformation.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 *Outcome) AWSCloudFormationType() string {
+	return "AWS::FraudDetector::Outcome"
+}
+
+// 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 Outcome) MarshalJSON() ([]byte, error) {
+	type Properties Outcome
+	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 *Outcome) UnmarshalJSON(b []byte) error {
+	type Properties Outcome
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Outcome(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/frauddetector/aws-frauddetector-variable.go b/goformation/cloudformation/frauddetector/aws-frauddetector-variable.go
new file mode 100644
index 0000000000..599b326c26
--- /dev/null
+++ b/goformation/cloudformation/frauddetector/aws-frauddetector-variable.go
@@ -0,0 +1,139 @@
+package frauddetector
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Variable AWS CloudFormation Resource (AWS::FraudDetector::Variable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-variable.html
+type Variable struct {
+
+	// DataSource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-variable.html#cfn-frauddetector-variable-datasource
+	DataSource *types.Value `json:"DataSource,omitempty"`
+
+	// DataType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-variable.html#cfn-frauddetector-variable-datatype
+	DataType *types.Value `json:"DataType,omitempty"`
+
+	// DefaultValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-variable.html#cfn-frauddetector-variable-defaultvalue
+	DefaultValue *types.Value `json:"DefaultValue,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-variable.html#cfn-frauddetector-variable-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-variable.html#cfn-frauddetector-variable-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-variable.html#cfn-frauddetector-variable-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VariableType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-frauddetector-variable.html#cfn-frauddetector-variable-variabletype
+	VariableType *types.Value `json:"VariableType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Variable) AWSCloudFormationType() string {
+	return "AWS::FraudDetector::Variable"
+}
+
+// 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 Variable) MarshalJSON() ([]byte, error) {
+	type Properties Variable
+	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 *Variable) UnmarshalJSON(b []byte) error {
+	type Properties Variable
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Variable(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/fsx/aws-fsx-filesystem.go b/goformation/cloudformation/fsx/aws-fsx-filesystem.go
new file mode 100644
index 0000000000..d52f6d52a1
--- /dev/null
+++ b/goformation/cloudformation/fsx/aws-fsx-filesystem.go
@@ -0,0 +1,169 @@
+package fsx
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// FileSystem AWS CloudFormation Resource (AWS::FSx::FileSystem)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html
+type FileSystem struct {
+
+	// BackupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-backupid
+	BackupId *types.Value `json:"BackupId,omitempty"`
+
+	// FileSystemType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-filesystemtype
+	FileSystemType *types.Value `json:"FileSystemType,omitempty"`
+
+	// FileSystemTypeVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-filesystemtypeversion
+	FileSystemTypeVersion *types.Value `json:"FileSystemTypeVersion,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// LustreConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-lustreconfiguration
+	LustreConfiguration *FileSystem_LustreConfiguration `json:"LustreConfiguration,omitempty"`
+
+	// OntapConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-ontapconfiguration
+	OntapConfiguration *FileSystem_OntapConfiguration `json:"OntapConfiguration,omitempty"`
+
+	// OpenZFSConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-openzfsconfiguration
+	OpenZFSConfiguration *FileSystem_OpenZFSConfiguration `json:"OpenZFSConfiguration,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// StorageCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-storagecapacity
+	StorageCapacity *types.Value `json:"StorageCapacity,omitempty"`
+
+	// StorageType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-storagetype
+	StorageType *types.Value `json:"StorageType,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// WindowsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-fsx-filesystem.html#cfn-fsx-filesystem-windowsconfiguration
+	WindowsConfiguration *FileSystem_WindowsConfiguration `json:"WindowsConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::FSx::FileSystem"
+}
+
+// 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 FileSystem) MarshalJSON() ([]byte, error) {
+	type Properties FileSystem
+	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 *FileSystem) UnmarshalJSON(b []byte) error {
+	type Properties FileSystem
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FileSystem(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/fsx/aws-fsx-filesystem_auditlogconfiguration.go b/goformation/cloudformation/fsx/aws-fsx-filesystem_auditlogconfiguration.go
new file mode 100644
index 0000000000..d47194a577
--- /dev/null
+++ b/goformation/cloudformation/fsx/aws-fsx-filesystem_auditlogconfiguration.go
@@ -0,0 +1,47 @@
+package fsx
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FileSystem_AuditLogConfiguration AWS CloudFormation Resource (AWS::FSx::FileSystem.AuditLogConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration-auditlogconfiguration.html
+type FileSystem_AuditLogConfiguration struct {
+
+	// AuditLogDestination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration-auditlogconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-auditlogconfiguration-auditlogdestination
+	AuditLogDestination *types.Value `json:"AuditLogDestination,omitempty"`
+
+	// FileAccessAuditLogLevel AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration-auditlogconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-auditlogconfiguration-fileaccessauditloglevel
+	FileAccessAuditLogLevel *types.Value `json:"FileAccessAuditLogLevel,omitempty"`
+
+	// FileShareAccessAuditLogLevel AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration-auditlogconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-auditlogconfiguration-fileshareaccessauditloglevel
+	FileShareAccessAuditLogLevel *types.Value `json:"FileShareAccessAuditLogLevel,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AuditLogConfiguration) AWSCloudFormationType() string {
+	return "AWS::FSx::FileSystem.AuditLogConfiguration"
+}
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_clientconfigurations.go b/goformation/cloudformation/fsx/aws-fsx-filesystem_clientconfigurations.go
new file mode 100644
index 0000000000..185e3e2d14
--- /dev/null
+++ b/goformation/cloudformation/fsx/aws-fsx-filesystem_clientconfigurations.go
@@ -0,0 +1,42 @@
+package fsx
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FileSystem_ClientConfigurations AWS CloudFormation Resource (AWS::FSx::FileSystem.ClientConfigurations)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration-nfsexports-clientconfigurations.html
+type FileSystem_ClientConfigurations struct {
+
+	// Clients AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration-nfsexports-clientconfigurations.html#cfn-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration-nfsexports-clientconfigurations-clients
+	Clients *types.Value `json:"Clients,omitempty"`
+
+	// Options AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration-nfsexports-clientconfigurations.html#cfn-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration-nfsexports-clientconfigurations-options
+	Options *types.Value `json:"Options,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ClientConfigurations) AWSCloudFormationType() string {
+	return "AWS::FSx::FileSystem.ClientConfigurations"
+}
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_diskiopsconfiguration.go b/goformation/cloudformation/fsx/aws-fsx-filesystem_diskiopsconfiguration.go
new file mode 100644
index 0000000000..0d3b79937f
--- /dev/null
+++ b/goformation/cloudformation/fsx/aws-fsx-filesystem_diskiopsconfiguration.go
@@ -0,0 +1,42 @@
+package fsx
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FileSystem_DiskIopsConfiguration AWS CloudFormation Resource (AWS::FSx::FileSystem.DiskIopsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration-diskiopsconfiguration.html
+type FileSystem_DiskIopsConfiguration struct {
+
+	// Iops AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration-diskiopsconfiguration.html#cfn-fsx-filesystem-openzfsconfiguration-diskiopsconfiguration-iops
+	Iops *types.Value `json:"Iops,omitempty"`
+
+	// Mode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration-diskiopsconfiguration.html#cfn-fsx-filesystem-openzfsconfiguration-diskiopsconfiguration-mode
+	Mode *types.Value `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_DiskIopsConfiguration) AWSCloudFormationType() string {
+	return "AWS::FSx::FileSystem.DiskIopsConfiguration"
+}
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_lustreconfiguration.go b/goformation/cloudformation/fsx/aws-fsx-filesystem_lustreconfiguration.go
new file mode 100644
index 0000000000..05b4e297b0
--- /dev/null
+++ b/goformation/cloudformation/fsx/aws-fsx-filesystem_lustreconfiguration.go
@@ -0,0 +1,92 @@
+package fsx
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FileSystem_LustreConfiguration AWS CloudFormation Resource (AWS::FSx::FileSystem.LustreConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-lustreconfiguration.html
+type FileSystem_LustreConfiguration struct {
+
+	// AutoImportPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-lustreconfiguration.html#cfn-fsx-filesystem-lustreconfiguration-autoimportpolicy
+	AutoImportPolicy *types.Value `json:"AutoImportPolicy,omitempty"`
+
+	// AutomaticBackupRetentionDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-lustreconfiguration.html#cfn-fsx-filesystem-lustreconfiguration-automaticbackupretentiondays
+	AutomaticBackupRetentionDays *types.Value `json:"AutomaticBackupRetentionDays,omitempty"`
+
+	// CopyTagsToBackups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-lustreconfiguration.html#cfn-fsx-filesystem-lustreconfiguration-copytagstobackups
+	CopyTagsToBackups *types.Value `json:"CopyTagsToBackups,omitempty"`
+
+	// DailyAutomaticBackupStartTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-lustreconfiguration.html#cfn-fsx-filesystem-lustreconfiguration-dailyautomaticbackupstarttime
+	DailyAutomaticBackupStartTime *types.Value `json:"DailyAutomaticBackupStartTime,omitempty"`
+
+	// DataCompressionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-lustreconfiguration.html#cfn-fsx-filesystem-lustreconfiguration-datacompressiontype
+	DataCompressionType *types.Value `json:"DataCompressionType,omitempty"`
+
+	// DeploymentType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-lustreconfiguration.html#cfn-fsx-filesystem-lustreconfiguration-deploymenttype
+	DeploymentType *types.Value `json:"DeploymentType,omitempty"`
+
+	// DriveCacheType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-lustreconfiguration.html#cfn-fsx-filesystem-lustreconfiguration-drivecachetype
+	DriveCacheType *types.Value `json:"DriveCacheType,omitempty"`
+
+	// ExportPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-lustreconfiguration.html#cfn-fsx-filesystem-lustreconfiguration-exportpath
+	ExportPath *types.Value `json:"ExportPath,omitempty"`
+
+	// ImportPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-lustreconfiguration.html#cfn-fsx-filesystem-lustreconfiguration-importpath
+	ImportPath *types.Value `json:"ImportPath,omitempty"`
+
+	// ImportedFileChunkSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-lustreconfiguration.html#cfn-fsx-filesystem-lustreconfiguration-importedfilechunksize
+	ImportedFileChunkSize *types.Value `json:"ImportedFileChunkSize,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
+	PerUnitStorageThroughput *types.Value `json:"PerUnitStorageThroughput,omitempty"`
+
+	// WeeklyMaintenanceStartTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-lustreconfiguration.html#cfn-fsx-filesystem-lustreconfiguration-weeklymaintenancestarttime
+	WeeklyMaintenanceStartTime *types.Value `json:"WeeklyMaintenanceStartTime,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LustreConfiguration) AWSCloudFormationType() string {
+	return "AWS::FSx::FileSystem.LustreConfiguration"
+}
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_nfsexports.go b/goformation/cloudformation/fsx/aws-fsx-filesystem_nfsexports.go
new file mode 100644
index 0000000000..94fff9f7a0
--- /dev/null
+++ b/goformation/cloudformation/fsx/aws-fsx-filesystem_nfsexports.go
@@ -0,0 +1,35 @@
+package fsx
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// FileSystem_NfsExports AWS CloudFormation Resource (AWS::FSx::FileSystem.NfsExports)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration-nfsexports.html
+type FileSystem_NfsExports struct {
+
+	// ClientConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration-nfsexports.html#cfn-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration-nfsexports-clientconfigurations
+	ClientConfigurations []FileSystem_ClientConfigurations `json:"ClientConfigurations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_NfsExports) AWSCloudFormationType() string {
+	return "AWS::FSx::FileSystem.NfsExports"
+}
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_ontapconfiguration.go b/goformation/cloudformation/fsx/aws-fsx-filesystem_ontapconfiguration.go
new file mode 100644
index 0000000000..2e35a41587
--- /dev/null
+++ b/goformation/cloudformation/fsx/aws-fsx-filesystem_ontapconfiguration.go
@@ -0,0 +1,82 @@
+package fsx
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FileSystem_OntapConfiguration AWS CloudFormation Resource (AWS::FSx::FileSystem.OntapConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-ontapconfiguration.html
+type FileSystem_OntapConfiguration struct {
+
+	// AutomaticBackupRetentionDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-ontapconfiguration.html#cfn-fsx-filesystem-ontapconfiguration-automaticbackupretentiondays
+	AutomaticBackupRetentionDays *types.Value `json:"AutomaticBackupRetentionDays,omitempty"`
+
+	// DailyAutomaticBackupStartTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-ontapconfiguration.html#cfn-fsx-filesystem-ontapconfiguration-dailyautomaticbackupstarttime
+	DailyAutomaticBackupStartTime *types.Value `json:"DailyAutomaticBackupStartTime,omitempty"`
+
+	// DeploymentType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-ontapconfiguration.html#cfn-fsx-filesystem-ontapconfiguration-deploymenttype
+	DeploymentType *types.Value `json:"DeploymentType,omitempty"`
+
+	// DiskIopsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-ontapconfiguration.html#cfn-fsx-filesystem-ontapconfiguration-diskiopsconfiguration
+	DiskIopsConfiguration *FileSystem_DiskIopsConfiguration `json:"DiskIopsConfiguration,omitempty"`
+
+	// EndpointIpAddressRange AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-ontapconfiguration.html#cfn-fsx-filesystem-ontapconfiguration-endpointipaddressrange
+	EndpointIpAddressRange *types.Value `json:"EndpointIpAddressRange,omitempty"`
+
+	// FsxAdminPassword AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-ontapconfiguration.html#cfn-fsx-filesystem-ontapconfiguration-fsxadminpassword
+	FsxAdminPassword *types.Value `json:"FsxAdminPassword,omitempty"`
+
+	// PreferredSubnetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-ontapconfiguration.html#cfn-fsx-filesystem-ontapconfiguration-preferredsubnetid
+	PreferredSubnetId *types.Value `json:"PreferredSubnetId,omitempty"`
+
+	// RouteTableIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-ontapconfiguration.html#cfn-fsx-filesystem-ontapconfiguration-routetableids
+	RouteTableIds *types.Value `json:"RouteTableIds,omitempty"`
+
+	// ThroughputCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-ontapconfiguration.html#cfn-fsx-filesystem-ontapconfiguration-throughputcapacity
+	ThroughputCapacity *types.Value `json:"ThroughputCapacity,omitempty"`
+
+	// WeeklyMaintenanceStartTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-ontapconfiguration.html#cfn-fsx-filesystem-ontapconfiguration-weeklymaintenancestarttime
+	WeeklyMaintenanceStartTime *types.Value `json:"WeeklyMaintenanceStartTime,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_OntapConfiguration) AWSCloudFormationType() string {
+	return "AWS::FSx::FileSystem.OntapConfiguration"
+}
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_openzfsconfiguration.go b/goformation/cloudformation/fsx/aws-fsx-filesystem_openzfsconfiguration.go
new file mode 100644
index 0000000000..0706d501a3
--- /dev/null
+++ b/goformation/cloudformation/fsx/aws-fsx-filesystem_openzfsconfiguration.go
@@ -0,0 +1,77 @@
+package fsx
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FileSystem_OpenZFSConfiguration AWS CloudFormation Resource (AWS::FSx::FileSystem.OpenZFSConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration.html
+type FileSystem_OpenZFSConfiguration struct {
+
+	// AutomaticBackupRetentionDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration.html#cfn-fsx-filesystem-openzfsconfiguration-automaticbackupretentiondays
+	AutomaticBackupRetentionDays *types.Value `json:"AutomaticBackupRetentionDays,omitempty"`
+
+	// CopyTagsToBackups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration.html#cfn-fsx-filesystem-openzfsconfiguration-copytagstobackups
+	CopyTagsToBackups *types.Value `json:"CopyTagsToBackups,omitempty"`
+
+	// CopyTagsToVolumes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration.html#cfn-fsx-filesystem-openzfsconfiguration-copytagstovolumes
+	CopyTagsToVolumes *types.Value `json:"CopyTagsToVolumes,omitempty"`
+
+	// DailyAutomaticBackupStartTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration.html#cfn-fsx-filesystem-openzfsconfiguration-dailyautomaticbackupstarttime
+	DailyAutomaticBackupStartTime *types.Value `json:"DailyAutomaticBackupStartTime,omitempty"`
+
+	// DeploymentType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration.html#cfn-fsx-filesystem-openzfsconfiguration-deploymenttype
+	DeploymentType *types.Value `json:"DeploymentType,omitempty"`
+
+	// DiskIopsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration.html#cfn-fsx-filesystem-openzfsconfiguration-diskiopsconfiguration
+	DiskIopsConfiguration *FileSystem_DiskIopsConfiguration `json:"DiskIopsConfiguration,omitempty"`
+
+	// RootVolumeConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration.html#cfn-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration
+	RootVolumeConfiguration *FileSystem_RootVolumeConfiguration `json:"RootVolumeConfiguration,omitempty"`
+
+	// ThroughputCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration.html#cfn-fsx-filesystem-openzfsconfiguration-throughputcapacity
+	ThroughputCapacity *types.Value `json:"ThroughputCapacity,omitempty"`
+
+	// WeeklyMaintenanceStartTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration.html#cfn-fsx-filesystem-openzfsconfiguration-weeklymaintenancestarttime
+	WeeklyMaintenanceStartTime *types.Value `json:"WeeklyMaintenanceStartTime,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_OpenZFSConfiguration) AWSCloudFormationType() string {
+	return "AWS::FSx::FileSystem.OpenZFSConfiguration"
+}
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_rootvolumeconfiguration.go b/goformation/cloudformation/fsx/aws-fsx-filesystem_rootvolumeconfiguration.go
new file mode 100644
index 0000000000..b85578dcf4
--- /dev/null
+++ b/goformation/cloudformation/fsx/aws-fsx-filesystem_rootvolumeconfiguration.go
@@ -0,0 +1,57 @@
+package fsx
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FileSystem_RootVolumeConfiguration AWS CloudFormation Resource (AWS::FSx::FileSystem.RootVolumeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration.html
+type FileSystem_RootVolumeConfiguration struct {
+
+	// CopyTagsToSnapshots AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration.html#cfn-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration-copytagstosnapshots
+	CopyTagsToSnapshots *types.Value `json:"CopyTagsToSnapshots,omitempty"`
+
+	// DataCompressionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration.html#cfn-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration-datacompressiontype
+	DataCompressionType *types.Value `json:"DataCompressionType,omitempty"`
+
+	// NfsExports AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration.html#cfn-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration-nfsexports
+	NfsExports []FileSystem_NfsExports `json:"NfsExports,omitempty"`
+
+	// ReadOnly AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration.html#cfn-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration-readonly
+	ReadOnly *types.Value `json:"ReadOnly,omitempty"`
+
+	// UserAndGroupQuotas AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration.html#cfn-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration-userandgroupquotas
+	UserAndGroupQuotas []FileSystem_UserAndGroupQuotas `json:"UserAndGroupQuotas,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RootVolumeConfiguration) AWSCloudFormationType() string {
+	return "AWS::FSx::FileSystem.RootVolumeConfiguration"
+}
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_selfmanagedactivedirectoryconfiguration.go b/goformation/cloudformation/fsx/aws-fsx-filesystem_selfmanagedactivedirectoryconfiguration.go
new file mode 100644
index 0000000000..eee1679e7c
--- /dev/null
+++ b/goformation/cloudformation/fsx/aws-fsx-filesystem_selfmanagedactivedirectoryconfiguration.go
@@ -0,0 +1,62 @@
+package fsx
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FileSystem_SelfManagedActiveDirectoryConfiguration AWS CloudFormation Resource (AWS::FSx::FileSystem.SelfManagedActiveDirectoryConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration-selfmanagedactivedirectoryconfiguration.html
+type FileSystem_SelfManagedActiveDirectoryConfiguration struct {
+
+	// DnsIps AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration-selfmanagedactivedirectoryconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-selfmanagedactivedirectoryconfiguration-dnsips
+	DnsIps *types.Value `json:"DnsIps,omitempty"`
+
+	// DomainName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration-selfmanagedactivedirectoryconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-selfmanagedactivedirectoryconfiguration-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// FileSystemAdministratorsGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration-selfmanagedactivedirectoryconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-selfmanagedactivedirectoryconfiguration-filesystemadministratorsgroup
+	FileSystemAdministratorsGroup *types.Value `json:"FileSystemAdministratorsGroup,omitempty"`
+
+	// OrganizationalUnitDistinguishedName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration-selfmanagedactivedirectoryconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-selfmanagedactivedirectoryconfiguration-organizationalunitdistinguishedname
+	OrganizationalUnitDistinguishedName *types.Value `json:"OrganizationalUnitDistinguishedName,omitempty"`
+
+	// Password AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration-selfmanagedactivedirectoryconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-selfmanagedactivedirectoryconfiguration-password
+	Password *types.Value `json:"Password,omitempty"`
+
+	// UserName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration-selfmanagedactivedirectoryconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-selfmanagedactivedirectoryconfiguration-username
+	UserName *types.Value `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 *FileSystem_SelfManagedActiveDirectoryConfiguration) AWSCloudFormationType() string {
+	return "AWS::FSx::FileSystem.SelfManagedActiveDirectoryConfiguration"
+}
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_userandgroupquotas.go b/goformation/cloudformation/fsx/aws-fsx-filesystem_userandgroupquotas.go
new file mode 100644
index 0000000000..91e837d457
--- /dev/null
+++ b/goformation/cloudformation/fsx/aws-fsx-filesystem_userandgroupquotas.go
@@ -0,0 +1,47 @@
+package fsx
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FileSystem_UserAndGroupQuotas AWS CloudFormation Resource (AWS::FSx::FileSystem.UserAndGroupQuotas)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration-userandgroupquotas.html
+type FileSystem_UserAndGroupQuotas struct {
+
+	// Id AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration-userandgroupquotas.html#cfn-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration-userandgroupquotas-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// StorageCapacityQuotaGiB AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration-userandgroupquotas.html#cfn-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration-userandgroupquotas-storagecapacityquotagib
+	StorageCapacityQuotaGiB *types.Value `json:"StorageCapacityQuotaGiB,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration-userandgroupquotas.html#cfn-fsx-filesystem-openzfsconfiguration-rootvolumeconfiguration-userandgroupquotas-type
+	Type *types.Value `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 *FileSystem_UserAndGroupQuotas) AWSCloudFormationType() string {
+	return "AWS::FSx::FileSystem.UserAndGroupQuotas"
+}
diff --git a/goformation/cloudformation/fsx/aws-fsx-filesystem_windowsconfiguration.go b/goformation/cloudformation/fsx/aws-fsx-filesystem_windowsconfiguration.go
new file mode 100644
index 0000000000..2883976552
--- /dev/null
+++ b/goformation/cloudformation/fsx/aws-fsx-filesystem_windowsconfiguration.go
@@ -0,0 +1,87 @@
+package fsx
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FileSystem_WindowsConfiguration AWS CloudFormation Resource (AWS::FSx::FileSystem.WindowsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration.html
+type FileSystem_WindowsConfiguration struct {
+
+	// ActiveDirectoryId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-activedirectoryid
+	ActiveDirectoryId *types.Value `json:"ActiveDirectoryId,omitempty"`
+
+	// Aliases AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-aliases
+	Aliases *types.Value `json:"Aliases,omitempty"`
+
+	// AuditLogConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-auditlogconfiguration
+	AuditLogConfiguration *FileSystem_AuditLogConfiguration `json:"AuditLogConfiguration,omitempty"`
+
+	// AutomaticBackupRetentionDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-automaticbackupretentiondays
+	AutomaticBackupRetentionDays *types.Value `json:"AutomaticBackupRetentionDays,omitempty"`
+
+	// CopyTagsToBackups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-copytagstobackups
+	CopyTagsToBackups *types.Value `json:"CopyTagsToBackups,omitempty"`
+
+	// DailyAutomaticBackupStartTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-dailyautomaticbackupstarttime
+	DailyAutomaticBackupStartTime *types.Value `json:"DailyAutomaticBackupStartTime,omitempty"`
+
+	// DeploymentType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-deploymenttype
+	DeploymentType *types.Value `json:"DeploymentType,omitempty"`
+
+	// PreferredSubnetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-preferredsubnetid
+	PreferredSubnetId *types.Value `json:"PreferredSubnetId,omitempty"`
+
+	// SelfManagedActiveDirectoryConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-selfmanagedactivedirectoryconfiguration
+	SelfManagedActiveDirectoryConfiguration *FileSystem_SelfManagedActiveDirectoryConfiguration `json:"SelfManagedActiveDirectoryConfiguration,omitempty"`
+
+	// ThroughputCapacity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-throughputcapacity
+	ThroughputCapacity *types.Value `json:"ThroughputCapacity"`
+
+	// WeeklyMaintenanceStartTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-fsx-filesystem-windowsconfiguration.html#cfn-fsx-filesystem-windowsconfiguration-weeklymaintenancestarttime
+	WeeklyMaintenanceStartTime *types.Value `json:"WeeklyMaintenanceStartTime,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_WindowsConfiguration) AWSCloudFormationType() string {
+	return "AWS::FSx::FileSystem.WindowsConfiguration"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-alias.go b/goformation/cloudformation/gamelift/aws-gamelift-alias.go
new file mode 100644
index 0000000000..138d1ff982
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-alias.go
@@ -0,0 +1,118 @@
+package gamelift
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Alias AWS CloudFormation Resource (AWS::GameLift::Alias)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-alias.html
+type Alias struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-alias.html#cfn-gamelift-alias-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-alias.html#cfn-gamelift-alias-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RoutingStrategy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-alias.html#cfn-gamelift-alias-routingstrategy
+	RoutingStrategy *Alias_RoutingStrategy `json:"RoutingStrategy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Alias) AWSCloudFormationType() string {
+	return "AWS::GameLift::Alias"
+}
+
+// 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 Alias) MarshalJSON() ([]byte, error) {
+	type Properties Alias
+	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 *Alias) UnmarshalJSON(b []byte) error {
+	type Properties Alias
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Alias(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/gamelift/aws-gamelift-alias_routingstrategy.go b/goformation/cloudformation/gamelift/aws-gamelift-alias_routingstrategy.go
new file mode 100644
index 0000000000..893d8629d1
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-alias_routingstrategy.go
@@ -0,0 +1,47 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Alias_RoutingStrategy AWS CloudFormation Resource (AWS::GameLift::Alias.RoutingStrategy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-alias-routingstrategy.html
+type Alias_RoutingStrategy struct {
+
+	// FleetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-alias-routingstrategy.html#cfn-gamelift-alias-routingstrategy-fleetid
+	FleetId *types.Value `json:"FleetId,omitempty"`
+
+	// Message AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-alias-routingstrategy.html#cfn-gamelift-alias-routingstrategy-message
+	Message *types.Value `json:"Message,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-alias-routingstrategy.html#cfn-gamelift-alias-routingstrategy-type
+	Type *types.Value `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 *Alias_RoutingStrategy) AWSCloudFormationType() string {
+	return "AWS::GameLift::Alias.RoutingStrategy"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-build.go b/goformation/cloudformation/gamelift/aws-gamelift-build.go
new file mode 100644
index 0000000000..f4f097b96c
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-build.go
@@ -0,0 +1,123 @@
+package gamelift
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Build AWS CloudFormation Resource (AWS::GameLift::Build)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-build.html
+type Build struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-build.html#cfn-gamelift-build-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// OperatingSystem AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-build.html#cfn-gamelift-build-operatingsystem
+	OperatingSystem *types.Value `json:"OperatingSystem,omitempty"`
+
+	// StorageLocation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-build.html#cfn-gamelift-build-storagelocation
+	StorageLocation *Build_S3Location `json:"StorageLocation,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-build.html#cfn-gamelift-build-version
+	Version *types.Value `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 *Build) AWSCloudFormationType() string {
+	return "AWS::GameLift::Build"
+}
+
+// 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 Build) MarshalJSON() ([]byte, error) {
+	type Properties Build
+	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 *Build) UnmarshalJSON(b []byte) error {
+	type Properties Build
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Build(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/gamelift/aws-gamelift-build_s3location.go b/goformation/cloudformation/gamelift/aws-gamelift-build_s3location.go
new file mode 100644
index 0000000000..062c167f47
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-build_s3location.go
@@ -0,0 +1,52 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Build_S3Location AWS CloudFormation Resource (AWS::GameLift::Build.S3Location)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-build-storagelocation.html
+type Build_S3Location struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-build-storagelocation.html#cfn-gamelift-build-storage-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-build-storagelocation.html#cfn-gamelift-build-storage-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// ObjectVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-build-storagelocation.html#cfn-gamelift-build-object-verison
+	ObjectVersion *types.Value `json:"ObjectVersion,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-build-storagelocation.html#cfn-gamelift-build-storage-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Build_S3Location) AWSCloudFormationType() string {
+	return "AWS::GameLift::Build.S3Location"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-fleet.go b/goformation/cloudformation/gamelift/aws-gamelift-fleet.go
new file mode 100644
index 0000000000..0bdebcef1e
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-fleet.go
@@ -0,0 +1,198 @@
+package gamelift
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Fleet AWS CloudFormation Resource (AWS::GameLift::Fleet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html
+type Fleet struct {
+
+	// BuildId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-buildid
+	BuildId *types.Value `json:"BuildId,omitempty"`
+
+	// CertificateConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-certificateconfiguration
+	CertificateConfiguration *Fleet_CertificateConfiguration `json:"CertificateConfiguration,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DesiredEC2Instances AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-desiredec2instances
+	DesiredEC2Instances *types.Value `json:"DesiredEC2Instances,omitempty"`
+
+	// EC2InboundPermissions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-ec2inboundpermissions
+	EC2InboundPermissions []Fleet_IpPermission `json:"EC2InboundPermissions,omitempty"`
+
+	// EC2InstanceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-ec2instancetype
+	EC2InstanceType *types.Value `json:"EC2InstanceType,omitempty"`
+
+	// FleetType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-fleettype
+	FleetType *types.Value `json:"FleetType,omitempty"`
+
+	// InstanceRoleARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-instancerolearn
+	InstanceRoleARN *types.Value `json:"InstanceRoleARN,omitempty"`
+
+	// Locations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-locations
+	Locations []Fleet_LocationConfiguration `json:"Locations,omitempty"`
+
+	// MaxSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-maxsize
+	MaxSize *types.Value `json:"MaxSize,omitempty"`
+
+	// MetricGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-metricgroups
+	MetricGroups *types.Value `json:"MetricGroups,omitempty"`
+
+	// MinSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-minsize
+	MinSize *types.Value `json:"MinSize,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// NewGameSessionProtectionPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-newgamesessionprotectionpolicy
+	NewGameSessionProtectionPolicy *types.Value `json:"NewGameSessionProtectionPolicy,omitempty"`
+
+	// PeerVpcAwsAccountId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-peervpcawsaccountid
+	PeerVpcAwsAccountId *types.Value `json:"PeerVpcAwsAccountId,omitempty"`
+
+	// PeerVpcId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-peervpcid
+	PeerVpcId *types.Value `json:"PeerVpcId,omitempty"`
+
+	// ResourceCreationLimitPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-resourcecreationlimitpolicy
+	ResourceCreationLimitPolicy *Fleet_ResourceCreationLimitPolicy `json:"ResourceCreationLimitPolicy,omitempty"`
+
+	// RuntimeConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-runtimeconfiguration
+	RuntimeConfiguration *Fleet_RuntimeConfiguration `json:"RuntimeConfiguration,omitempty"`
+
+	// ScriptId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-fleet.html#cfn-gamelift-fleet-scriptid
+	ScriptId *types.Value `json:"ScriptId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::GameLift::Fleet"
+}
+
+// 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 Fleet) MarshalJSON() ([]byte, error) {
+	type Properties Fleet
+	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 *Fleet) UnmarshalJSON(b []byte) error {
+	type Properties Fleet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Fleet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/gamelift/aws-gamelift-fleet_certificateconfiguration.go b/goformation/cloudformation/gamelift/aws-gamelift-fleet_certificateconfiguration.go
new file mode 100644
index 0000000000..22ef72f5f4
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-fleet_certificateconfiguration.go
@@ -0,0 +1,37 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Fleet_CertificateConfiguration AWS CloudFormation Resource (AWS::GameLift::Fleet.CertificateConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-certificateconfiguration.html
+type Fleet_CertificateConfiguration struct {
+
+	// CertificateType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-certificateconfiguration.html#cfn-gamelift-fleet-certificateconfiguration-certificatetype
+	CertificateType *types.Value `json:"CertificateType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CertificateConfiguration) AWSCloudFormationType() string {
+	return "AWS::GameLift::Fleet.CertificateConfiguration"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-fleet_ippermission.go b/goformation/cloudformation/gamelift/aws-gamelift-fleet_ippermission.go
new file mode 100644
index 0000000000..296d3121e2
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-fleet_ippermission.go
@@ -0,0 +1,52 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Fleet_IpPermission AWS CloudFormation Resource (AWS::GameLift::Fleet.IpPermission)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-ippermission.html
+type Fleet_IpPermission struct {
+
+	// FromPort AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-ippermission.html#cfn-gamelift-fleet-ippermission-fromport
+	FromPort *types.Value `json:"FromPort"`
+
+	// IpRange AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-ippermission.html#cfn-gamelift-fleet-ippermission-iprange
+	IpRange *types.Value `json:"IpRange,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-ippermission.html#cfn-gamelift-fleet-ippermission-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// ToPort AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-ippermission.html#cfn-gamelift-fleet-ippermission-toport
+	ToPort *types.Value `json:"ToPort"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_IpPermission) AWSCloudFormationType() string {
+	return "AWS::GameLift::Fleet.IpPermission"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-fleet_locationcapacity.go b/goformation/cloudformation/gamelift/aws-gamelift-fleet_locationcapacity.go
new file mode 100644
index 0000000000..6b86927ae7
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-fleet_locationcapacity.go
@@ -0,0 +1,47 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Fleet_LocationCapacity AWS CloudFormation Resource (AWS::GameLift::Fleet.LocationCapacity)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-locationcapacity.html
+type Fleet_LocationCapacity struct {
+
+	// DesiredEC2Instances AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-locationcapacity.html#cfn-gamelift-fleet-locationcapacity-desiredec2instances
+	DesiredEC2Instances *types.Value `json:"DesiredEC2Instances"`
+
+	// MaxSize AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-locationcapacity.html#cfn-gamelift-fleet-locationcapacity-maxsize
+	MaxSize *types.Value `json:"MaxSize"`
+
+	// MinSize AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-locationcapacity.html#cfn-gamelift-fleet-locationcapacity-minsize
+	MinSize *types.Value `json:"MinSize"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LocationCapacity) AWSCloudFormationType() string {
+	return "AWS::GameLift::Fleet.LocationCapacity"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-fleet_locationconfiguration.go b/goformation/cloudformation/gamelift/aws-gamelift-fleet_locationconfiguration.go
new file mode 100644
index 0000000000..7bd5075c17
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-fleet_locationconfiguration.go
@@ -0,0 +1,42 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Fleet_LocationConfiguration AWS CloudFormation Resource (AWS::GameLift::Fleet.LocationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-locationconfiguration.html
+type Fleet_LocationConfiguration struct {
+
+	// Location AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-locationconfiguration.html#cfn-gamelift-fleet-locationconfiguration-location
+	Location *types.Value `json:"Location,omitempty"`
+
+	// LocationCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-locationconfiguration.html#cfn-gamelift-fleet-locationconfiguration-locationcapacity
+	LocationCapacity *Fleet_LocationCapacity `json:"LocationCapacity,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LocationConfiguration) AWSCloudFormationType() string {
+	return "AWS::GameLift::Fleet.LocationConfiguration"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-fleet_resourcecreationlimitpolicy.go b/goformation/cloudformation/gamelift/aws-gamelift-fleet_resourcecreationlimitpolicy.go
new file mode 100644
index 0000000000..2deacdfa23
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-fleet_resourcecreationlimitpolicy.go
@@ -0,0 +1,42 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Fleet_ResourceCreationLimitPolicy AWS CloudFormation Resource (AWS::GameLift::Fleet.ResourceCreationLimitPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-resourcecreationlimitpolicy.html
+type Fleet_ResourceCreationLimitPolicy struct {
+
+	// NewGameSessionsPerCreator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-resourcecreationlimitpolicy.html#cfn-gamelift-fleet-resourcecreationlimitpolicy-newgamesessionspercreator
+	NewGameSessionsPerCreator *types.Value `json:"NewGameSessionsPerCreator,omitempty"`
+
+	// PolicyPeriodInMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-resourcecreationlimitpolicy.html#cfn-gamelift-fleet-resourcecreationlimitpolicy-policyperiodinminutes
+	PolicyPeriodInMinutes *types.Value `json:"PolicyPeriodInMinutes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ResourceCreationLimitPolicy) AWSCloudFormationType() string {
+	return "AWS::GameLift::Fleet.ResourceCreationLimitPolicy"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-fleet_runtimeconfiguration.go b/goformation/cloudformation/gamelift/aws-gamelift-fleet_runtimeconfiguration.go
new file mode 100644
index 0000000000..5b96fe3381
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-fleet_runtimeconfiguration.go
@@ -0,0 +1,47 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Fleet_RuntimeConfiguration AWS CloudFormation Resource (AWS::GameLift::Fleet.RuntimeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-runtimeconfiguration.html
+type Fleet_RuntimeConfiguration struct {
+
+	// GameSessionActivationTimeoutSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-runtimeconfiguration.html#cfn-gamelift-fleet-runtimeconfiguration-gamesessionactivationtimeoutseconds
+	GameSessionActivationTimeoutSeconds *types.Value `json:"GameSessionActivationTimeoutSeconds,omitempty"`
+
+	// MaxConcurrentGameSessionActivations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-runtimeconfiguration.html#cfn-gamelift-fleet-runtimeconfiguration-maxconcurrentgamesessionactivations
+	MaxConcurrentGameSessionActivations *types.Value `json:"MaxConcurrentGameSessionActivations,omitempty"`
+
+	// ServerProcesses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-runtimeconfiguration.html#cfn-gamelift-fleet-runtimeconfiguration-serverprocesses
+	ServerProcesses []Fleet_ServerProcess `json:"ServerProcesses,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RuntimeConfiguration) AWSCloudFormationType() string {
+	return "AWS::GameLift::Fleet.RuntimeConfiguration"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-fleet_serverprocess.go b/goformation/cloudformation/gamelift/aws-gamelift-fleet_serverprocess.go
new file mode 100644
index 0000000000..a0d0322941
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-fleet_serverprocess.go
@@ -0,0 +1,47 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Fleet_ServerProcess AWS CloudFormation Resource (AWS::GameLift::Fleet.ServerProcess)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-serverprocess.html
+type Fleet_ServerProcess struct {
+
+	// ConcurrentExecutions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-serverprocess.html#cfn-gamelift-fleet-serverprocess-concurrentexecutions
+	ConcurrentExecutions *types.Value `json:"ConcurrentExecutions"`
+
+	// LaunchPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-serverprocess.html#cfn-gamelift-fleet-serverprocess-launchpath
+	LaunchPath *types.Value `json:"LaunchPath,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-fleet-serverprocess.html#cfn-gamelift-fleet-serverprocess-parameters
+	Parameters *types.Value `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 *Fleet_ServerProcess) AWSCloudFormationType() string {
+	return "AWS::GameLift::Fleet.ServerProcess"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup.go b/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup.go
new file mode 100644
index 0000000000..dae962d50d
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup.go
@@ -0,0 +1,164 @@
+package gamelift
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// GameServerGroup AWS CloudFormation Resource (AWS::GameLift::GameServerGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gameservergroup.html
+type GameServerGroup struct {
+
+	// AutoScalingPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gameservergroup.html#cfn-gamelift-gameservergroup-autoscalingpolicy
+	AutoScalingPolicy *GameServerGroup_AutoScalingPolicy `json:"AutoScalingPolicy,omitempty"`
+
+	// BalancingStrategy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gameservergroup.html#cfn-gamelift-gameservergroup-balancingstrategy
+	BalancingStrategy *types.Value `json:"BalancingStrategy,omitempty"`
+
+	// DeleteOption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gameservergroup.html#cfn-gamelift-gameservergroup-deleteoption
+	DeleteOption *types.Value `json:"DeleteOption,omitempty"`
+
+	// GameServerGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gameservergroup.html#cfn-gamelift-gameservergroup-gameservergroupname
+	GameServerGroupName *types.Value `json:"GameServerGroupName,omitempty"`
+
+	// GameServerProtectionPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gameservergroup.html#cfn-gamelift-gameservergroup-gameserverprotectionpolicy
+	GameServerProtectionPolicy *types.Value `json:"GameServerProtectionPolicy,omitempty"`
+
+	// InstanceDefinitions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gameservergroup.html#cfn-gamelift-gameservergroup-instancedefinitions
+	InstanceDefinitions []GameServerGroup_InstanceDefinition `json:"InstanceDefinitions,omitempty"`
+
+	// LaunchTemplate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gameservergroup.html#cfn-gamelift-gameservergroup-launchtemplate
+	LaunchTemplate *GameServerGroup_LaunchTemplate `json:"LaunchTemplate,omitempty"`
+
+	// MaxSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gameservergroup.html#cfn-gamelift-gameservergroup-maxsize
+	MaxSize *types.Value `json:"MaxSize,omitempty"`
+
+	// MinSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gameservergroup.html#cfn-gamelift-gameservergroup-minsize
+	MinSize *types.Value `json:"MinSize,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gameservergroup.html#cfn-gamelift-gameservergroup-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gameservergroup.html#cfn-gamelift-gameservergroup-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VpcSubnets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gameservergroup.html#cfn-gamelift-gameservergroup-vpcsubnets
+	VpcSubnets *types.Value `json:"VpcSubnets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GameServerGroup) AWSCloudFormationType() string {
+	return "AWS::GameLift::GameServerGroup"
+}
+
+// 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 GameServerGroup) MarshalJSON() ([]byte, error) {
+	type Properties GameServerGroup
+	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 *GameServerGroup) UnmarshalJSON(b []byte) error {
+	type Properties GameServerGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = GameServerGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_autoscalingpolicy.go b/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_autoscalingpolicy.go
new file mode 100644
index 0000000000..d748dbda7f
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_autoscalingpolicy.go
@@ -0,0 +1,42 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GameServerGroup_AutoScalingPolicy AWS CloudFormation Resource (AWS::GameLift::GameServerGroup.AutoScalingPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gameservergroup-autoscalingpolicy.html
+type GameServerGroup_AutoScalingPolicy struct {
+
+	// EstimatedInstanceWarmup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gameservergroup-autoscalingpolicy.html#cfn-gamelift-gameservergroup-autoscalingpolicy-estimatedinstancewarmup
+	EstimatedInstanceWarmup *types.Value `json:"EstimatedInstanceWarmup,omitempty"`
+
+	// TargetTrackingConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gameservergroup-autoscalingpolicy.html#cfn-gamelift-gameservergroup-autoscalingpolicy-targettrackingconfiguration
+	TargetTrackingConfiguration *GameServerGroup_TargetTrackingConfiguration `json:"TargetTrackingConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GameServerGroup_AutoScalingPolicy) AWSCloudFormationType() string {
+	return "AWS::GameLift::GameServerGroup.AutoScalingPolicy"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinition.go b/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinition.go
new file mode 100644
index 0000000000..c9a8de004b
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinition.go
@@ -0,0 +1,42 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GameServerGroup_InstanceDefinition AWS CloudFormation Resource (AWS::GameLift::GameServerGroup.InstanceDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gameservergroup-instancedefinition.html
+type GameServerGroup_InstanceDefinition struct {
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gameservergroup-instancedefinition.html#cfn-gamelift-gameservergroup-instancedefinition-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// WeightedCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gameservergroup-instancedefinition.html#cfn-gamelift-gameservergroup-instancedefinition-weightedcapacity
+	WeightedCapacity *types.Value `json:"WeightedCapacity,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GameServerGroup_InstanceDefinition) AWSCloudFormationType() string {
+	return "AWS::GameLift::GameServerGroup.InstanceDefinition"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinitions.go b/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinitions.go
new file mode 100644
index 0000000000..03c10863ed
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_instancedefinitions.go
@@ -0,0 +1,35 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// GameServerGroup_InstanceDefinitions AWS CloudFormation Resource (AWS::GameLift::GameServerGroup.InstanceDefinitions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gameservergroup-instancedefinitions.html
+type GameServerGroup_InstanceDefinitions struct {
+
+	// InstanceDefinitions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gameservergroup-instancedefinitions.html#cfn-gamelift-gameservergroup-instancedefinitions-instancedefinitions
+	InstanceDefinitions []GameServerGroup_InstanceDefinition `json:"InstanceDefinitions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GameServerGroup_InstanceDefinitions) AWSCloudFormationType() string {
+	return "AWS::GameLift::GameServerGroup.InstanceDefinitions"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_launchtemplate.go b/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_launchtemplate.go
new file mode 100644
index 0000000000..539a43b564
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_launchtemplate.go
@@ -0,0 +1,47 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GameServerGroup_LaunchTemplate AWS CloudFormation Resource (AWS::GameLift::GameServerGroup.LaunchTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gameservergroup-launchtemplate.html
+type GameServerGroup_LaunchTemplate struct {
+
+	// LaunchTemplateId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gameservergroup-launchtemplate.html#cfn-gamelift-gameservergroup-launchtemplate-launchtemplateid
+	LaunchTemplateId *types.Value `json:"LaunchTemplateId,omitempty"`
+
+	// LaunchTemplateName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gameservergroup-launchtemplate.html#cfn-gamelift-gameservergroup-launchtemplate-launchtemplatename
+	LaunchTemplateName *types.Value `json:"LaunchTemplateName,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gameservergroup-launchtemplate.html#cfn-gamelift-gameservergroup-launchtemplate-version
+	Version *types.Value `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 *GameServerGroup_LaunchTemplate) AWSCloudFormationType() string {
+	return "AWS::GameLift::GameServerGroup.LaunchTemplate"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_tags.go b/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_tags.go
new file mode 100644
index 0000000000..6a0816400b
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_tags.go
@@ -0,0 +1,36 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// GameServerGroup_Tags AWS CloudFormation Resource (AWS::GameLift::GameServerGroup.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gameservergroup-tags.html
+type GameServerGroup_Tags struct {
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gameservergroup-tags.html#cfn-gamelift-gameservergroup-tags-tags
+	Tags []cloudformation.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 *GameServerGroup_Tags) AWSCloudFormationType() string {
+	return "AWS::GameLift::GameServerGroup.Tags"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_targettrackingconfiguration.go b/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_targettrackingconfiguration.go
new file mode 100644
index 0000000000..85bd55e624
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_targettrackingconfiguration.go
@@ -0,0 +1,37 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GameServerGroup_TargetTrackingConfiguration AWS CloudFormation Resource (AWS::GameLift::GameServerGroup.TargetTrackingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gameservergroup-targettrackingconfiguration.html
+type GameServerGroup_TargetTrackingConfiguration struct {
+
+	// TargetValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gameservergroup-targettrackingconfiguration.html#cfn-gamelift-gameservergroup-targettrackingconfiguration-targetvalue
+	TargetValue *types.Value `json:"TargetValue"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GameServerGroup_TargetTrackingConfiguration) AWSCloudFormationType() string {
+	return "AWS::GameLift::GameServerGroup.TargetTrackingConfiguration"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_vpcsubnets.go b/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_vpcsubnets.go
new file mode 100644
index 0000000000..442547955f
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-gameservergroup_vpcsubnets.go
@@ -0,0 +1,37 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GameServerGroup_VpcSubnets AWS CloudFormation Resource (AWS::GameLift::GameServerGroup.VpcSubnets)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gameservergroup-vpcsubnets.html
+type GameServerGroup_VpcSubnets struct {
+
+	// VpcSubnets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gameservergroup-vpcsubnets.html#cfn-gamelift-gameservergroup-vpcsubnets-vpcsubnets
+	VpcSubnets *types.Value `json:"VpcSubnets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GameServerGroup_VpcSubnets) AWSCloudFormationType() string {
+	return "AWS::GameLift::GameServerGroup.VpcSubnets"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue.go b/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue.go
new file mode 100644
index 0000000000..600785e54b
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue.go
@@ -0,0 +1,143 @@
+package gamelift
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GameSessionQueue AWS CloudFormation Resource (AWS::GameLift::GameSessionQueue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gamesessionqueue.html
+type GameSessionQueue struct {
+
+	// CustomEventData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gamesessionqueue.html#cfn-gamelift-gamesessionqueue-customeventdata
+	CustomEventData *types.Value `json:"CustomEventData,omitempty"`
+
+	// Destinations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gamesessionqueue.html#cfn-gamelift-gamesessionqueue-destinations
+	Destinations []GameSessionQueue_Destination `json:"Destinations,omitempty"`
+
+	// FilterConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gamesessionqueue.html#cfn-gamelift-gamesessionqueue-filterconfiguration
+	FilterConfiguration *GameSessionQueue_FilterConfiguration `json:"FilterConfiguration,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gamesessionqueue.html#cfn-gamelift-gamesessionqueue-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// NotificationTarget AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gamesessionqueue.html#cfn-gamelift-gamesessionqueue-notificationtarget
+	NotificationTarget *types.Value `json:"NotificationTarget,omitempty"`
+
+	// PlayerLatencyPolicies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gamesessionqueue.html#cfn-gamelift-gamesessionqueue-playerlatencypolicies
+	PlayerLatencyPolicies []GameSessionQueue_PlayerLatencyPolicy `json:"PlayerLatencyPolicies,omitempty"`
+
+	// PriorityConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gamesessionqueue.html#cfn-gamelift-gamesessionqueue-priorityconfiguration
+	PriorityConfiguration *GameSessionQueue_PriorityConfiguration `json:"PriorityConfiguration,omitempty"`
+
+	// TimeoutInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-gamesessionqueue.html#cfn-gamelift-gamesessionqueue-timeoutinseconds
+	TimeoutInSeconds *types.Value `json:"TimeoutInSeconds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GameSessionQueue) AWSCloudFormationType() string {
+	return "AWS::GameLift::GameSessionQueue"
+}
+
+// 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 GameSessionQueue) MarshalJSON() ([]byte, error) {
+	type Properties GameSessionQueue
+	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 *GameSessionQueue) UnmarshalJSON(b []byte) error {
+	type Properties GameSessionQueue
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = GameSessionQueue(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_destination.go b/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_destination.go
new file mode 100644
index 0000000000..751e139236
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_destination.go
@@ -0,0 +1,37 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GameSessionQueue_Destination AWS CloudFormation Resource (AWS::GameLift::GameSessionQueue.Destination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gamesessionqueue-destination.html
+type GameSessionQueue_Destination struct {
+
+	// DestinationArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gamesessionqueue-destination.html#cfn-gamelift-gamesessionqueue-destination-destinationarn
+	DestinationArn *types.Value `json:"DestinationArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GameSessionQueue_Destination) AWSCloudFormationType() string {
+	return "AWS::GameLift::GameSessionQueue.Destination"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_filterconfiguration.go b/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_filterconfiguration.go
new file mode 100644
index 0000000000..2619482393
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_filterconfiguration.go
@@ -0,0 +1,37 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GameSessionQueue_FilterConfiguration AWS CloudFormation Resource (AWS::GameLift::GameSessionQueue.FilterConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gamesessionqueue-filterconfiguration.html
+type GameSessionQueue_FilterConfiguration struct {
+
+	// AllowedLocations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gamesessionqueue-filterconfiguration.html#cfn-gamelift-gamesessionqueue-filterconfiguration-allowedlocations
+	AllowedLocations *types.Value `json:"AllowedLocations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GameSessionQueue_FilterConfiguration) AWSCloudFormationType() string {
+	return "AWS::GameLift::GameSessionQueue.FilterConfiguration"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_playerlatencypolicy.go b/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_playerlatencypolicy.go
new file mode 100644
index 0000000000..10a4f68ac3
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_playerlatencypolicy.go
@@ -0,0 +1,42 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GameSessionQueue_PlayerLatencyPolicy AWS CloudFormation Resource (AWS::GameLift::GameSessionQueue.PlayerLatencyPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gamesessionqueue-playerlatencypolicy.html
+type GameSessionQueue_PlayerLatencyPolicy struct {
+
+	// MaximumIndividualPlayerLatencyMilliseconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gamesessionqueue-playerlatencypolicy.html#cfn-gamelift-gamesessionqueue-playerlatencypolicy-maximumindividualplayerlatencymilliseconds
+	MaximumIndividualPlayerLatencyMilliseconds *types.Value `json:"MaximumIndividualPlayerLatencyMilliseconds,omitempty"`
+
+	// PolicyDurationSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gamesessionqueue-playerlatencypolicy.html#cfn-gamelift-gamesessionqueue-playerlatencypolicy-policydurationseconds
+	PolicyDurationSeconds *types.Value `json:"PolicyDurationSeconds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GameSessionQueue_PlayerLatencyPolicy) AWSCloudFormationType() string {
+	return "AWS::GameLift::GameSessionQueue.PlayerLatencyPolicy"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_priorityconfiguration.go b/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_priorityconfiguration.go
new file mode 100644
index 0000000000..88d82f1be6
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-gamesessionqueue_priorityconfiguration.go
@@ -0,0 +1,42 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GameSessionQueue_PriorityConfiguration AWS CloudFormation Resource (AWS::GameLift::GameSessionQueue.PriorityConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gamesessionqueue-priorityconfiguration.html
+type GameSessionQueue_PriorityConfiguration struct {
+
+	// LocationOrder AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gamesessionqueue-priorityconfiguration.html#cfn-gamelift-gamesessionqueue-priorityconfiguration-locationorder
+	LocationOrder *types.Value `json:"LocationOrder,omitempty"`
+
+	// PriorityOrder AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-gamesessionqueue-priorityconfiguration.html#cfn-gamelift-gamesessionqueue-priorityconfiguration-priorityorder
+	PriorityOrder *types.Value `json:"PriorityOrder,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GameSessionQueue_PriorityConfiguration) AWSCloudFormationType() string {
+	return "AWS::GameLift::GameSessionQueue.PriorityConfiguration"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration.go b/goformation/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration.go
new file mode 100644
index 0000000000..d500558984
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration.go
@@ -0,0 +1,173 @@
+package gamelift
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MatchmakingConfiguration AWS CloudFormation Resource (AWS::GameLift::MatchmakingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingconfiguration.html
+type MatchmakingConfiguration struct {
+
+	// AcceptanceRequired AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingconfiguration.html#cfn-gamelift-matchmakingconfiguration-acceptancerequired
+	AcceptanceRequired *types.Value `json:"AcceptanceRequired"`
+
+	// AcceptanceTimeoutSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingconfiguration.html#cfn-gamelift-matchmakingconfiguration-acceptancetimeoutseconds
+	AcceptanceTimeoutSeconds *types.Value `json:"AcceptanceTimeoutSeconds,omitempty"`
+
+	// AdditionalPlayerCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingconfiguration.html#cfn-gamelift-matchmakingconfiguration-additionalplayercount
+	AdditionalPlayerCount *types.Value `json:"AdditionalPlayerCount,omitempty"`
+
+	// BackfillMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingconfiguration.html#cfn-gamelift-matchmakingconfiguration-backfillmode
+	BackfillMode *types.Value `json:"BackfillMode,omitempty"`
+
+	// CustomEventData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingconfiguration.html#cfn-gamelift-matchmakingconfiguration-customeventdata
+	CustomEventData *types.Value `json:"CustomEventData,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingconfiguration.html#cfn-gamelift-matchmakingconfiguration-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// FlexMatchMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingconfiguration.html#cfn-gamelift-matchmakingconfiguration-flexmatchmode
+	FlexMatchMode *types.Value `json:"FlexMatchMode,omitempty"`
+
+	// GameProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingconfiguration.html#cfn-gamelift-matchmakingconfiguration-gameproperties
+	GameProperties []MatchmakingConfiguration_GameProperty `json:"GameProperties,omitempty"`
+
+	// GameSessionData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingconfiguration.html#cfn-gamelift-matchmakingconfiguration-gamesessiondata
+	GameSessionData *types.Value `json:"GameSessionData,omitempty"`
+
+	// GameSessionQueueArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingconfiguration.html#cfn-gamelift-matchmakingconfiguration-gamesessionqueuearns
+	GameSessionQueueArns *types.Value `json:"GameSessionQueueArns,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingconfiguration.html#cfn-gamelift-matchmakingconfiguration-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// NotificationTarget AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingconfiguration.html#cfn-gamelift-matchmakingconfiguration-notificationtarget
+	NotificationTarget *types.Value `json:"NotificationTarget,omitempty"`
+
+	// RequestTimeoutSeconds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingconfiguration.html#cfn-gamelift-matchmakingconfiguration-requesttimeoutseconds
+	RequestTimeoutSeconds *types.Value `json:"RequestTimeoutSeconds"`
+
+	// RuleSetName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingconfiguration.html#cfn-gamelift-matchmakingconfiguration-rulesetname
+	RuleSetName *types.Value `json:"RuleSetName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MatchmakingConfiguration) AWSCloudFormationType() string {
+	return "AWS::GameLift::MatchmakingConfiguration"
+}
+
+// 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 MatchmakingConfiguration) MarshalJSON() ([]byte, error) {
+	type Properties MatchmakingConfiguration
+	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 *MatchmakingConfiguration) UnmarshalJSON(b []byte) error {
+	type Properties MatchmakingConfiguration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = MatchmakingConfiguration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration_gameproperty.go b/goformation/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration_gameproperty.go
new file mode 100644
index 0000000000..2e2df4d66b
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-matchmakingconfiguration_gameproperty.go
@@ -0,0 +1,42 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MatchmakingConfiguration_GameProperty AWS CloudFormation Resource (AWS::GameLift::MatchmakingConfiguration.GameProperty)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-matchmakingconfiguration-gameproperty.html
+type MatchmakingConfiguration_GameProperty struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-matchmakingconfiguration-gameproperty.html#cfn-gamelift-matchmakingconfiguration-gameproperty-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-matchmakingconfiguration-gameproperty.html#cfn-gamelift-matchmakingconfiguration-gameproperty-value
+	Value *types.Value `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 *MatchmakingConfiguration_GameProperty) AWSCloudFormationType() string {
+	return "AWS::GameLift::MatchmakingConfiguration.GameProperty"
+}
diff --git a/goformation/cloudformation/gamelift/aws-gamelift-matchmakingruleset.go b/goformation/cloudformation/gamelift/aws-gamelift-matchmakingruleset.go
new file mode 100644
index 0000000000..c1c9be02f0
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-matchmakingruleset.go
@@ -0,0 +1,113 @@
+package gamelift
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MatchmakingRuleSet AWS CloudFormation Resource (AWS::GameLift::MatchmakingRuleSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingruleset.html
+type MatchmakingRuleSet struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingruleset.html#cfn-gamelift-matchmakingruleset-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RuleSetBody AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-matchmakingruleset.html#cfn-gamelift-matchmakingruleset-rulesetbody
+	RuleSetBody *types.Value `json:"RuleSetBody,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MatchmakingRuleSet) AWSCloudFormationType() string {
+	return "AWS::GameLift::MatchmakingRuleSet"
+}
+
+// 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 MatchmakingRuleSet) MarshalJSON() ([]byte, error) {
+	type Properties MatchmakingRuleSet
+	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 *MatchmakingRuleSet) UnmarshalJSON(b []byte) error {
+	type Properties MatchmakingRuleSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = MatchmakingRuleSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/gamelift/aws-gamelift-script.go b/goformation/cloudformation/gamelift/aws-gamelift-script.go
new file mode 100644
index 0000000000..c5948c1dee
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-script.go
@@ -0,0 +1,118 @@
+package gamelift
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Script AWS CloudFormation Resource (AWS::GameLift::Script)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-script.html
+type Script struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-script.html#cfn-gamelift-script-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// StorageLocation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-script.html#cfn-gamelift-script-storagelocation
+	StorageLocation *Script_S3Location `json:"StorageLocation,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-gamelift-script.html#cfn-gamelift-script-version
+	Version *types.Value `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 *Script) AWSCloudFormationType() string {
+	return "AWS::GameLift::Script"
+}
+
+// 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 Script) MarshalJSON() ([]byte, error) {
+	type Properties Script
+	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 *Script) UnmarshalJSON(b []byte) error {
+	type Properties Script
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Script(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/gamelift/aws-gamelift-script_s3location.go b/goformation/cloudformation/gamelift/aws-gamelift-script_s3location.go
new file mode 100644
index 0000000000..bc980ddbeb
--- /dev/null
+++ b/goformation/cloudformation/gamelift/aws-gamelift-script_s3location.go
@@ -0,0 +1,52 @@
+package gamelift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Script_S3Location AWS CloudFormation Resource (AWS::GameLift::Script.S3Location)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-script-s3location.html
+type Script_S3Location struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-script-s3location.html#cfn-gamelift-script-s3location-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-script-s3location.html#cfn-gamelift-script-s3location-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// ObjectVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-script-s3location.html#cfn-gamelift-script-s3location-objectversion
+	ObjectVersion *types.Value `json:"ObjectVersion,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-gamelift-script-s3location.html#cfn-gamelift-script-s3location-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Script_S3Location) AWSCloudFormationType() string {
+	return "AWS::GameLift::Script.S3Location"
+}
diff --git a/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-accelerator.go b/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-accelerator.go
new file mode 100644
index 0000000000..d92a5b2502
--- /dev/null
+++ b/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-accelerator.go
@@ -0,0 +1,129 @@
+package globalaccelerator
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Accelerator AWS CloudFormation Resource (AWS::GlobalAccelerator::Accelerator)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-accelerator.html
+type Accelerator struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-accelerator.html#cfn-globalaccelerator-accelerator-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// IpAddressType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-accelerator.html#cfn-globalaccelerator-accelerator-ipaddresstype
+	IpAddressType *types.Value `json:"IpAddressType,omitempty"`
+
+	// IpAddresses AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-accelerator.html#cfn-globalaccelerator-accelerator-ipaddresses
+	IpAddresses *types.Value `json:"IpAddresses,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-accelerator.html#cfn-globalaccelerator-accelerator-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-accelerator.html#cfn-globalaccelerator-accelerator-tags
+	Tags []cloudformation.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 *Accelerator) AWSCloudFormationType() string {
+	return "AWS::GlobalAccelerator::Accelerator"
+}
+
+// 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 Accelerator) MarshalJSON() ([]byte, error) {
+	type Properties Accelerator
+	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 *Accelerator) UnmarshalJSON(b []byte) error {
+	type Properties Accelerator
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Accelerator(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup.go b/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup.go
new file mode 100644
index 0000000000..9d2f3960f2
--- /dev/null
+++ b/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup.go
@@ -0,0 +1,153 @@
+package globalaccelerator
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EndpointGroup AWS CloudFormation Resource (AWS::GlobalAccelerator::EndpointGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-endpointgroup.html
+type EndpointGroup struct {
+
+	// EndpointConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-endpointgroup.html#cfn-globalaccelerator-endpointgroup-endpointconfigurations
+	EndpointConfigurations []EndpointGroup_EndpointConfiguration `json:"EndpointConfigurations,omitempty"`
+
+	// EndpointGroupRegion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-endpointgroup.html#cfn-globalaccelerator-endpointgroup-endpointgroupregion
+	EndpointGroupRegion *types.Value `json:"EndpointGroupRegion,omitempty"`
+
+	// HealthCheckIntervalSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-endpointgroup.html#cfn-globalaccelerator-endpointgroup-healthcheckintervalseconds
+	HealthCheckIntervalSeconds *types.Value `json:"HealthCheckIntervalSeconds,omitempty"`
+
+	// HealthCheckPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-endpointgroup.html#cfn-globalaccelerator-endpointgroup-healthcheckpath
+	HealthCheckPath *types.Value `json:"HealthCheckPath,omitempty"`
+
+	// HealthCheckPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-endpointgroup.html#cfn-globalaccelerator-endpointgroup-healthcheckport
+	HealthCheckPort *types.Value `json:"HealthCheckPort,omitempty"`
+
+	// HealthCheckProtocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-endpointgroup.html#cfn-globalaccelerator-endpointgroup-healthcheckprotocol
+	HealthCheckProtocol *types.Value `json:"HealthCheckProtocol,omitempty"`
+
+	// ListenerArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-endpointgroup.html#cfn-globalaccelerator-endpointgroup-listenerarn
+	ListenerArn *types.Value `json:"ListenerArn,omitempty"`
+
+	// PortOverrides AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-endpointgroup.html#cfn-globalaccelerator-endpointgroup-portoverrides
+	PortOverrides []EndpointGroup_PortOverride `json:"PortOverrides,omitempty"`
+
+	// ThresholdCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-endpointgroup.html#cfn-globalaccelerator-endpointgroup-thresholdcount
+	ThresholdCount *types.Value `json:"ThresholdCount,omitempty"`
+
+	// TrafficDialPercentage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-endpointgroup.html#cfn-globalaccelerator-endpointgroup-trafficdialpercentage
+	TrafficDialPercentage *types.Value `json:"TrafficDialPercentage,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EndpointGroup) AWSCloudFormationType() string {
+	return "AWS::GlobalAccelerator::EndpointGroup"
+}
+
+// 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 EndpointGroup) MarshalJSON() ([]byte, error) {
+	type Properties EndpointGroup
+	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 *EndpointGroup) UnmarshalJSON(b []byte) error {
+	type Properties EndpointGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = EndpointGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_endpointconfiguration.go b/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_endpointconfiguration.go
new file mode 100644
index 0000000000..5a088d58b4
--- /dev/null
+++ b/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_endpointconfiguration.go
@@ -0,0 +1,47 @@
+package globalaccelerator
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EndpointGroup_EndpointConfiguration AWS CloudFormation Resource (AWS::GlobalAccelerator::EndpointGroup.EndpointConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-globalaccelerator-endpointgroup-endpointconfiguration.html
+type EndpointGroup_EndpointConfiguration struct {
+
+	// ClientIPPreservationEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-globalaccelerator-endpointgroup-endpointconfiguration.html#cfn-globalaccelerator-endpointgroup-endpointconfiguration-clientippreservationenabled
+	ClientIPPreservationEnabled *types.Value `json:"ClientIPPreservationEnabled,omitempty"`
+
+	// EndpointId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-globalaccelerator-endpointgroup-endpointconfiguration.html#cfn-globalaccelerator-endpointgroup-endpointconfiguration-endpointid
+	EndpointId *types.Value `json:"EndpointId,omitempty"`
+
+	// Weight AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-globalaccelerator-endpointgroup-endpointconfiguration.html#cfn-globalaccelerator-endpointgroup-endpointconfiguration-weight
+	Weight *types.Value `json:"Weight,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EndpointGroup_EndpointConfiguration) AWSCloudFormationType() string {
+	return "AWS::GlobalAccelerator::EndpointGroup.EndpointConfiguration"
+}
diff --git a/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_portoverride.go b/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_portoverride.go
new file mode 100644
index 0000000000..b6ded8abc1
--- /dev/null
+++ b/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-endpointgroup_portoverride.go
@@ -0,0 +1,42 @@
+package globalaccelerator
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EndpointGroup_PortOverride AWS CloudFormation Resource (AWS::GlobalAccelerator::EndpointGroup.PortOverride)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-globalaccelerator-endpointgroup-portoverride.html
+type EndpointGroup_PortOverride struct {
+
+	// EndpointPort AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-globalaccelerator-endpointgroup-portoverride.html#cfn-globalaccelerator-endpointgroup-portoverride-endpointport
+	EndpointPort *types.Value `json:"EndpointPort"`
+
+	// ListenerPort AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-globalaccelerator-endpointgroup-portoverride.html#cfn-globalaccelerator-endpointgroup-portoverride-listenerport
+	ListenerPort *types.Value `json:"ListenerPort"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EndpointGroup_PortOverride) AWSCloudFormationType() string {
+	return "AWS::GlobalAccelerator::EndpointGroup.PortOverride"
+}
diff --git a/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-listener.go b/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-listener.go
new file mode 100644
index 0000000000..301a82579d
--- /dev/null
+++ b/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-listener.go
@@ -0,0 +1,123 @@
+package globalaccelerator
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Listener AWS CloudFormation Resource (AWS::GlobalAccelerator::Listener)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-listener.html
+type Listener struct {
+
+	// AcceleratorArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-listener.html#cfn-globalaccelerator-listener-acceleratorarn
+	AcceleratorArn *types.Value `json:"AcceleratorArn,omitempty"`
+
+	// ClientAffinity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-listener.html#cfn-globalaccelerator-listener-clientaffinity
+	ClientAffinity *types.Value `json:"ClientAffinity,omitempty"`
+
+	// PortRanges AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-listener.html#cfn-globalaccelerator-listener-portranges
+	PortRanges []Listener_PortRange `json:"PortRanges,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-globalaccelerator-listener.html#cfn-globalaccelerator-listener-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::GlobalAccelerator::Listener"
+}
+
+// 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 Listener) MarshalJSON() ([]byte, error) {
+	type Properties Listener
+	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 *Listener) UnmarshalJSON(b []byte) error {
+	type Properties Listener
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Listener(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-listener_portrange.go b/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-listener_portrange.go
new file mode 100644
index 0000000000..7a31e13c1e
--- /dev/null
+++ b/goformation/cloudformation/globalaccelerator/aws-globalaccelerator-listener_portrange.go
@@ -0,0 +1,42 @@
+package globalaccelerator
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Listener_PortRange AWS CloudFormation Resource (AWS::GlobalAccelerator::Listener.PortRange)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-globalaccelerator-listener-portrange.html
+type Listener_PortRange struct {
+
+	// FromPort AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-globalaccelerator-listener-portrange.html#cfn-globalaccelerator-listener-portrange-fromport
+	FromPort *types.Value `json:"FromPort"`
+
+	// ToPort AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-globalaccelerator-listener-portrange.html#cfn-globalaccelerator-listener-portrange-toport
+	ToPort *types.Value `json:"ToPort"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PortRange) AWSCloudFormationType() string {
+	return "AWS::GlobalAccelerator::Listener.PortRange"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-classifier.go b/goformation/cloudformation/glue/aws-glue-classifier.go
new file mode 100644
index 0000000000..4b3d3c1f98
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-classifier.go
@@ -0,0 +1,121 @@
+package glue
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Classifier AWS CloudFormation Resource (AWS::Glue::Classifier)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html
+type Classifier struct {
+
+	// CsvClassifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-csvclassifier
+	CsvClassifier *Classifier_CsvClassifier `json:"CsvClassifier,omitempty"`
+
+	// GrokClassifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-grokclassifier
+	GrokClassifier *Classifier_GrokClassifier `json:"GrokClassifier,omitempty"`
+
+	// JsonClassifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-jsonclassifier
+	JsonClassifier *Classifier_JsonClassifier `json:"JsonClassifier,omitempty"`
+
+	// XMLClassifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-classifier.html#cfn-glue-classifier-xmlclassifier
+	XMLClassifier *Classifier_XMLClassifier `json:"XMLClassifier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Classifier) AWSCloudFormationType() string {
+	return "AWS::Glue::Classifier"
+}
+
+// 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 Classifier) MarshalJSON() ([]byte, error) {
+	type Properties Classifier
+	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 *Classifier) UnmarshalJSON(b []byte) error {
+	type Properties Classifier
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Classifier(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/glue/aws-glue-classifier_csvclassifier.go b/goformation/cloudformation/glue/aws-glue-classifier_csvclassifier.go
new file mode 100644
index 0000000000..1860ec77c5
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-classifier_csvclassifier.go
@@ -0,0 +1,67 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Classifier_CsvClassifier AWS CloudFormation Resource (AWS::Glue::Classifier.CsvClassifier)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-csvclassifier.html
+type Classifier_CsvClassifier struct {
+
+	// AllowSingleColumn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-csvclassifier.html#cfn-glue-classifier-csvclassifier-allowsinglecolumn
+	AllowSingleColumn *types.Value `json:"AllowSingleColumn,omitempty"`
+
+	// ContainsHeader AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-csvclassifier.html#cfn-glue-classifier-csvclassifier-containsheader
+	ContainsHeader *types.Value `json:"ContainsHeader,omitempty"`
+
+	// Delimiter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-csvclassifier.html#cfn-glue-classifier-csvclassifier-delimiter
+	Delimiter *types.Value `json:"Delimiter,omitempty"`
+
+	// DisableValueTrimming AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-csvclassifier.html#cfn-glue-classifier-csvclassifier-disablevaluetrimming
+	DisableValueTrimming *types.Value `json:"DisableValueTrimming,omitempty"`
+
+	// Header AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-csvclassifier.html#cfn-glue-classifier-csvclassifier-header
+	Header *types.Value `json:"Header,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-csvclassifier.html#cfn-glue-classifier-csvclassifier-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// QuoteSymbol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-csvclassifier.html#cfn-glue-classifier-csvclassifier-quotesymbol
+	QuoteSymbol *types.Value `json:"QuoteSymbol,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Classifier_CsvClassifier) AWSCloudFormationType() string {
+	return "AWS::Glue::Classifier.CsvClassifier"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-classifier_grokclassifier.go b/goformation/cloudformation/glue/aws-glue-classifier_grokclassifier.go
new file mode 100644
index 0000000000..26e46e3e96
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-classifier_grokclassifier.go
@@ -0,0 +1,52 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Classifier_GrokClassifier AWS CloudFormation Resource (AWS::Glue::Classifier.GrokClassifier)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-grokclassifier.html
+type Classifier_GrokClassifier struct {
+
+	// Classification AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-grokclassifier.html#cfn-glue-classifier-grokclassifier-classification
+	Classification *types.Value `json:"Classification,omitempty"`
+
+	// CustomPatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-grokclassifier.html#cfn-glue-classifier-grokclassifier-custompatterns
+	CustomPatterns *types.Value `json:"CustomPatterns,omitempty"`
+
+	// GrokPattern AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-grokclassifier.html#cfn-glue-classifier-grokclassifier-grokpattern
+	GrokPattern *types.Value `json:"GrokPattern,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-grokclassifier.html#cfn-glue-classifier-grokclassifier-name
+	Name *types.Value `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 *Classifier_GrokClassifier) AWSCloudFormationType() string {
+	return "AWS::Glue::Classifier.GrokClassifier"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-classifier_jsonclassifier.go b/goformation/cloudformation/glue/aws-glue-classifier_jsonclassifier.go
new file mode 100644
index 0000000000..d7166b18f3
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-classifier_jsonclassifier.go
@@ -0,0 +1,42 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Classifier_JsonClassifier AWS CloudFormation Resource (AWS::Glue::Classifier.JsonClassifier)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-jsonclassifier.html
+type Classifier_JsonClassifier struct {
+
+	// JsonPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-jsonclassifier.html#cfn-glue-classifier-jsonclassifier-jsonpath
+	JsonPath *types.Value `json:"JsonPath,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-jsonclassifier.html#cfn-glue-classifier-jsonclassifier-name
+	Name *types.Value `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 *Classifier_JsonClassifier) AWSCloudFormationType() string {
+	return "AWS::Glue::Classifier.JsonClassifier"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-classifier_xmlclassifier.go b/goformation/cloudformation/glue/aws-glue-classifier_xmlclassifier.go
new file mode 100644
index 0000000000..bec40b74d1
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-classifier_xmlclassifier.go
@@ -0,0 +1,47 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Classifier_XMLClassifier AWS CloudFormation Resource (AWS::Glue::Classifier.XMLClassifier)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-xmlclassifier.html
+type Classifier_XMLClassifier struct {
+
+	// Classification AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-xmlclassifier.html#cfn-glue-classifier-xmlclassifier-classification
+	Classification *types.Value `json:"Classification,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-xmlclassifier.html#cfn-glue-classifier-xmlclassifier-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RowTag AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-classifier-xmlclassifier.html#cfn-glue-classifier-xmlclassifier-rowtag
+	RowTag *types.Value `json:"RowTag,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Classifier_XMLClassifier) AWSCloudFormationType() string {
+	return "AWS::Glue::Classifier.XMLClassifier"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-connection.go b/goformation/cloudformation/glue/aws-glue-connection.go
new file mode 100644
index 0000000000..716717ca16
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-connection.go
@@ -0,0 +1,113 @@
+package glue
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Connection AWS CloudFormation Resource (AWS::Glue::Connection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html
+type Connection struct {
+
+	// CatalogId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html#cfn-glue-connection-catalogid
+	CatalogId *types.Value `json:"CatalogId,omitempty"`
+
+	// ConnectionInput AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-connection.html#cfn-glue-connection-connectioninput
+	ConnectionInput *Connection_ConnectionInput `json:"ConnectionInput,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Connection) AWSCloudFormationType() string {
+	return "AWS::Glue::Connection"
+}
+
+// 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 Connection) MarshalJSON() ([]byte, error) {
+	type Properties Connection
+	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 *Connection) UnmarshalJSON(b []byte) error {
+	type Properties Connection
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Connection(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/glue/aws-glue-connection_connectioninput.go b/goformation/cloudformation/glue/aws-glue-connection_connectioninput.go
new file mode 100644
index 0000000000..ab92fd675a
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-connection_connectioninput.go
@@ -0,0 +1,62 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Connection_ConnectionInput AWS CloudFormation Resource (AWS::Glue::Connection.ConnectionInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-connectioninput.html
+type Connection_ConnectionInput struct {
+
+	// ConnectionProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-connectioninput.html#cfn-glue-connection-connectioninput-connectionproperties
+	ConnectionProperties interface{} `json:"ConnectionProperties,omitempty"`
+
+	// ConnectionType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-connectioninput.html#cfn-glue-connection-connectioninput-connectiontype
+	ConnectionType *types.Value `json:"ConnectionType,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-connectioninput.html#cfn-glue-connection-connectioninput-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// MatchCriteria AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-connectioninput.html#cfn-glue-connection-connectioninput-matchcriteria
+	MatchCriteria *types.Value `json:"MatchCriteria,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-connectioninput.html#cfn-glue-connection-connectioninput-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// PhysicalConnectionRequirements AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-connectioninput.html#cfn-glue-connection-connectioninput-physicalconnectionrequirements
+	PhysicalConnectionRequirements *Connection_PhysicalConnectionRequirements `json:"PhysicalConnectionRequirements,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Connection_ConnectionInput) AWSCloudFormationType() string {
+	return "AWS::Glue::Connection.ConnectionInput"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-connection_physicalconnectionrequirements.go b/goformation/cloudformation/glue/aws-glue-connection_physicalconnectionrequirements.go
new file mode 100644
index 0000000000..29da8170a9
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-connection_physicalconnectionrequirements.go
@@ -0,0 +1,47 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Connection_PhysicalConnectionRequirements AWS CloudFormation Resource (AWS::Glue::Connection.PhysicalConnectionRequirements)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-physicalconnectionrequirements.html
+type Connection_PhysicalConnectionRequirements struct {
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-physicalconnectionrequirements.html#cfn-glue-connection-physicalconnectionrequirements-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// SecurityGroupIdList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-physicalconnectionrequirements.html#cfn-glue-connection-physicalconnectionrequirements-securitygroupidlist
+	SecurityGroupIdList *types.Value `json:"SecurityGroupIdList,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-connection-physicalconnectionrequirements.html#cfn-glue-connection-physicalconnectionrequirements-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Connection_PhysicalConnectionRequirements) AWSCloudFormationType() string {
+	return "AWS::Glue::Connection.PhysicalConnectionRequirements"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-crawler.go b/goformation/cloudformation/glue/aws-glue-crawler.go
new file mode 100644
index 0000000000..da5351e937
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-crawler.go
@@ -0,0 +1,168 @@
+package glue
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Crawler AWS CloudFormation Resource (AWS::Glue::Crawler)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html
+type Crawler struct {
+
+	// Classifiers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-classifiers
+	Classifiers *types.Value `json:"Classifiers,omitempty"`
+
+	// Configuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-configuration
+	Configuration *types.Value `json:"Configuration,omitempty"`
+
+	// CrawlerSecurityConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-crawlersecurityconfiguration
+	CrawlerSecurityConfiguration *types.Value `json:"CrawlerSecurityConfiguration,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RecrawlPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-recrawlpolicy
+	RecrawlPolicy *Crawler_RecrawlPolicy `json:"RecrawlPolicy,omitempty"`
+
+	// Role AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-role
+	Role *types.Value `json:"Role,omitempty"`
+
+	// Schedule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-schedule
+	Schedule *Crawler_Schedule `json:"Schedule,omitempty"`
+
+	// SchemaChangePolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-schemachangepolicy
+	SchemaChangePolicy *Crawler_SchemaChangePolicy `json:"SchemaChangePolicy,omitempty"`
+
+	// TablePrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-tableprefix
+	TablePrefix *types.Value `json:"TablePrefix,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-tags
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// Targets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-crawler.html#cfn-glue-crawler-targets
+	Targets *Crawler_Targets `json:"Targets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Crawler) AWSCloudFormationType() string {
+	return "AWS::Glue::Crawler"
+}
+
+// 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 Crawler) MarshalJSON() ([]byte, error) {
+	type Properties Crawler
+	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 *Crawler) UnmarshalJSON(b []byte) error {
+	type Properties Crawler
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Crawler(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/glue/aws-glue-crawler_catalogtarget.go b/goformation/cloudformation/glue/aws-glue-crawler_catalogtarget.go
new file mode 100644
index 0000000000..4f7d43db7a
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-crawler_catalogtarget.go
@@ -0,0 +1,42 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Crawler_CatalogTarget AWS CloudFormation Resource (AWS::Glue::Crawler.CatalogTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-catalogtarget.html
+type Crawler_CatalogTarget struct {
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-catalogtarget.html#cfn-glue-crawler-catalogtarget-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// Tables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-catalogtarget.html#cfn-glue-crawler-catalogtarget-tables
+	Tables *types.Value `json:"Tables,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Crawler_CatalogTarget) AWSCloudFormationType() string {
+	return "AWS::Glue::Crawler.CatalogTarget"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-crawler_dynamodbtarget.go b/goformation/cloudformation/glue/aws-glue-crawler_dynamodbtarget.go
new file mode 100644
index 0000000000..ad931949e3
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-crawler_dynamodbtarget.go
@@ -0,0 +1,37 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Crawler_DynamoDBTarget AWS CloudFormation Resource (AWS::Glue::Crawler.DynamoDBTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-dynamodbtarget.html
+type Crawler_DynamoDBTarget struct {
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-dynamodbtarget.html#cfn-glue-crawler-dynamodbtarget-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Crawler_DynamoDBTarget) AWSCloudFormationType() string {
+	return "AWS::Glue::Crawler.DynamoDBTarget"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-crawler_jdbctarget.go b/goformation/cloudformation/glue/aws-glue-crawler_jdbctarget.go
new file mode 100644
index 0000000000..29030b923e
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-crawler_jdbctarget.go
@@ -0,0 +1,47 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Crawler_JdbcTarget AWS CloudFormation Resource (AWS::Glue::Crawler.JdbcTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-jdbctarget.html
+type Crawler_JdbcTarget struct {
+
+	// ConnectionName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-jdbctarget.html#cfn-glue-crawler-jdbctarget-connectionname
+	ConnectionName *types.Value `json:"ConnectionName,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
+	Exclusions *types.Value `json:"Exclusions,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-jdbctarget.html#cfn-glue-crawler-jdbctarget-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Crawler_JdbcTarget) AWSCloudFormationType() string {
+	return "AWS::Glue::Crawler.JdbcTarget"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-crawler_recrawlpolicy.go b/goformation/cloudformation/glue/aws-glue-crawler_recrawlpolicy.go
new file mode 100644
index 0000000000..9e3a765067
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-crawler_recrawlpolicy.go
@@ -0,0 +1,37 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Crawler_RecrawlPolicy AWS CloudFormation Resource (AWS::Glue::Crawler.RecrawlPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-recrawlpolicy.html
+type Crawler_RecrawlPolicy struct {
+
+	// RecrawlBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-recrawlpolicy.html#cfn-glue-crawler-recrawlpolicy-recrawlbehavior
+	RecrawlBehavior *types.Value `json:"RecrawlBehavior,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Crawler_RecrawlPolicy) AWSCloudFormationType() string {
+	return "AWS::Glue::Crawler.RecrawlPolicy"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-crawler_s3target.go b/goformation/cloudformation/glue/aws-glue-crawler_s3target.go
new file mode 100644
index 0000000000..c69d6eac94
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-crawler_s3target.go
@@ -0,0 +1,47 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Crawler_S3Target AWS CloudFormation Resource (AWS::Glue::Crawler.S3Target)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-s3target.html
+type Crawler_S3Target struct {
+
+	// ConnectionName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-s3target.html#cfn-glue-crawler-s3target-connectionname
+	ConnectionName *types.Value `json:"ConnectionName,omitempty"`
+
+	// Exclusions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-s3target.html#cfn-glue-crawler-s3target-exclusions
+	Exclusions *types.Value `json:"Exclusions,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-s3target.html#cfn-glue-crawler-s3target-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Crawler_S3Target) AWSCloudFormationType() string {
+	return "AWS::Glue::Crawler.S3Target"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-crawler_schedule.go b/goformation/cloudformation/glue/aws-glue-crawler_schedule.go
new file mode 100644
index 0000000000..58cdc48504
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-crawler_schedule.go
@@ -0,0 +1,37 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Crawler_Schedule AWS CloudFormation Resource (AWS::Glue::Crawler.Schedule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-schedule.html
+type Crawler_Schedule struct {
+
+	// ScheduleExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-schedule.html#cfn-glue-crawler-schedule-scheduleexpression
+	ScheduleExpression *types.Value `json:"ScheduleExpression,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Crawler_Schedule) AWSCloudFormationType() string {
+	return "AWS::Glue::Crawler.Schedule"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-crawler_schemachangepolicy.go b/goformation/cloudformation/glue/aws-glue-crawler_schemachangepolicy.go
new file mode 100644
index 0000000000..129b8ba1a4
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-crawler_schemachangepolicy.go
@@ -0,0 +1,42 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Crawler_SchemaChangePolicy AWS CloudFormation Resource (AWS::Glue::Crawler.SchemaChangePolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-schemachangepolicy.html
+type Crawler_SchemaChangePolicy struct {
+
+	// DeleteBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-schemachangepolicy.html#cfn-glue-crawler-schemachangepolicy-deletebehavior
+	DeleteBehavior *types.Value `json:"DeleteBehavior,omitempty"`
+
+	// UpdateBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-schemachangepolicy.html#cfn-glue-crawler-schemachangepolicy-updatebehavior
+	UpdateBehavior *types.Value `json:"UpdateBehavior,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Crawler_SchemaChangePolicy) AWSCloudFormationType() string {
+	return "AWS::Glue::Crawler.SchemaChangePolicy"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-crawler_targets.go b/goformation/cloudformation/glue/aws-glue-crawler_targets.go
new file mode 100644
index 0000000000..628610ecc2
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-crawler_targets.go
@@ -0,0 +1,50 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Crawler_Targets AWS CloudFormation Resource (AWS::Glue::Crawler.Targets)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-targets.html
+type Crawler_Targets struct {
+
+	// CatalogTargets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-targets.html#cfn-glue-crawler-targets-catalogtargets
+	CatalogTargets []Crawler_CatalogTarget `json:"CatalogTargets,omitempty"`
+
+	// DynamoDBTargets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-targets.html#cfn-glue-crawler-targets-dynamodbtargets
+	DynamoDBTargets []Crawler_DynamoDBTarget `json:"DynamoDBTargets,omitempty"`
+
+	// JdbcTargets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-targets.html#cfn-glue-crawler-targets-jdbctargets
+	JdbcTargets []Crawler_JdbcTarget `json:"JdbcTargets,omitempty"`
+
+	// S3Targets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-crawler-targets.html#cfn-glue-crawler-targets-s3targets
+	S3Targets []Crawler_S3Target `json:"S3Targets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Crawler_Targets) AWSCloudFormationType() string {
+	return "AWS::Glue::Crawler.Targets"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-database.go b/goformation/cloudformation/glue/aws-glue-database.go
new file mode 100644
index 0000000000..793315ee9d
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-database.go
@@ -0,0 +1,113 @@
+package glue
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Database AWS CloudFormation Resource (AWS::Glue::Database)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html
+type Database struct {
+
+	// CatalogId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html#cfn-glue-database-catalogid
+	CatalogId *types.Value `json:"CatalogId,omitempty"`
+
+	// DatabaseInput AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-database.html#cfn-glue-database-databaseinput
+	DatabaseInput *Database_DatabaseInput `json:"DatabaseInput,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Database) AWSCloudFormationType() string {
+	return "AWS::Glue::Database"
+}
+
+// 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 Database) MarshalJSON() ([]byte, error) {
+	type Properties Database
+	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 *Database) UnmarshalJSON(b []byte) error {
+	type Properties Database
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Database(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/glue/aws-glue-database_databaseidentifier.go b/goformation/cloudformation/glue/aws-glue-database_databaseidentifier.go
new file mode 100644
index 0000000000..62098f70a7
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-database_databaseidentifier.go
@@ -0,0 +1,42 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Database_DatabaseIdentifier AWS CloudFormation Resource (AWS::Glue::Database.DatabaseIdentifier)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-databaseidentifier.html
+type Database_DatabaseIdentifier struct {
+
+	// CatalogId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-databaseidentifier.html#cfn-glue-database-databaseidentifier-catalogid
+	CatalogId *types.Value `json:"CatalogId,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-databaseidentifier.html#cfn-glue-database-databaseidentifier-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Database_DatabaseIdentifier) AWSCloudFormationType() string {
+	return "AWS::Glue::Database.DatabaseIdentifier"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-database_databaseinput.go b/goformation/cloudformation/glue/aws-glue-database_databaseinput.go
new file mode 100644
index 0000000000..56d7987487
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-database_databaseinput.go
@@ -0,0 +1,62 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Database_DatabaseInput AWS CloudFormation Resource (AWS::Glue::Database.DatabaseInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-databaseinput.html
+type Database_DatabaseInput struct {
+
+	// CreateTableDefaultPermissions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-databaseinput.html#cfn-glue-database-databaseinput-createtabledefaultpermissions
+	CreateTableDefaultPermissions []Database_PrincipalPrivileges `json:"CreateTableDefaultPermissions,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-databaseinput.html#cfn-glue-database-databaseinput-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// LocationUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-databaseinput.html#cfn-glue-database-databaseinput-locationuri
+	LocationUri *types.Value `json:"LocationUri,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-databaseinput.html#cfn-glue-database-databaseinput-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-databaseinput.html#cfn-glue-database-databaseinput-parameters
+	Parameters interface{} `json:"Parameters,omitempty"`
+
+	// TargetDatabase AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-databaseinput.html#cfn-glue-database-databaseinput-targetdatabase
+	TargetDatabase *Database_DatabaseIdentifier `json:"TargetDatabase,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Database_DatabaseInput) AWSCloudFormationType() string {
+	return "AWS::Glue::Database.DatabaseInput"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-database_datalakeprincipal.go b/goformation/cloudformation/glue/aws-glue-database_datalakeprincipal.go
new file mode 100644
index 0000000000..eb02d23ead
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-database_datalakeprincipal.go
@@ -0,0 +1,37 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Database_DataLakePrincipal AWS CloudFormation Resource (AWS::Glue::Database.DataLakePrincipal)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-datalakeprincipal.html
+type Database_DataLakePrincipal struct {
+
+	// DataLakePrincipalIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-datalakeprincipal.html#cfn-glue-database-datalakeprincipal-datalakeprincipalidentifier
+	DataLakePrincipalIdentifier *types.Value `json:"DataLakePrincipalIdentifier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Database_DataLakePrincipal) AWSCloudFormationType() string {
+	return "AWS::Glue::Database.DataLakePrincipal"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-database_principalprivileges.go b/goformation/cloudformation/glue/aws-glue-database_principalprivileges.go
new file mode 100644
index 0000000000..efbb601e47
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-database_principalprivileges.go
@@ -0,0 +1,42 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Database_PrincipalPrivileges AWS CloudFormation Resource (AWS::Glue::Database.PrincipalPrivileges)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-principalprivileges.html
+type Database_PrincipalPrivileges struct {
+
+	// Permissions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-principalprivileges.html#cfn-glue-database-principalprivileges-permissions
+	Permissions *types.Value `json:"Permissions,omitempty"`
+
+	// Principal AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-database-principalprivileges.html#cfn-glue-database-principalprivileges-principal
+	Principal *Database_DataLakePrincipal `json:"Principal,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Database_PrincipalPrivileges) AWSCloudFormationType() string {
+	return "AWS::Glue::Database.PrincipalPrivileges"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings.go b/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings.go
new file mode 100644
index 0000000000..9891b9f7ee
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings.go
@@ -0,0 +1,113 @@
+package glue
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataCatalogEncryptionSettings AWS CloudFormation Resource (AWS::Glue::DataCatalogEncryptionSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html
+type DataCatalogEncryptionSettings struct {
+
+	// CatalogId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html#cfn-glue-datacatalogencryptionsettings-catalogid
+	CatalogId *types.Value `json:"CatalogId,omitempty"`
+
+	// DataCatalogEncryptionSettings AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-datacatalogencryptionsettings.html#cfn-glue-datacatalogencryptionsettings-datacatalogencryptionsettings
+	DataCatalogEncryptionSettings *DataCatalogEncryptionSettings_DataCatalogEncryptionSettings `json:"DataCatalogEncryptionSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataCatalogEncryptionSettings) AWSCloudFormationType() string {
+	return "AWS::Glue::DataCatalogEncryptionSettings"
+}
+
+// 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 DataCatalogEncryptionSettings) MarshalJSON() ([]byte, error) {
+	type Properties DataCatalogEncryptionSettings
+	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 *DataCatalogEncryptionSettings) UnmarshalJSON(b []byte) error {
+	type Properties DataCatalogEncryptionSettings
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DataCatalogEncryptionSettings(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_connectionpasswordencryption.go b/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_connectionpasswordencryption.go
new file mode 100644
index 0000000000..49a7f2dae6
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_connectionpasswordencryption.go
@@ -0,0 +1,42 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataCatalogEncryptionSettings_ConnectionPasswordEncryption AWS CloudFormation Resource (AWS::Glue::DataCatalogEncryptionSettings.ConnectionPasswordEncryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-datacatalogencryptionsettings-connectionpasswordencryption.html
+type DataCatalogEncryptionSettings_ConnectionPasswordEncryption struct {
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-datacatalogencryptionsettings-connectionpasswordencryption.html#cfn-glue-datacatalogencryptionsettings-connectionpasswordencryption-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// ReturnConnectionPasswordEncrypted AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-datacatalogencryptionsettings-connectionpasswordencryption.html#cfn-glue-datacatalogencryptionsettings-connectionpasswordencryption-returnconnectionpasswordencrypted
+	ReturnConnectionPasswordEncrypted *types.Value `json:"ReturnConnectionPasswordEncrypted,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataCatalogEncryptionSettings_ConnectionPasswordEncryption) AWSCloudFormationType() string {
+	return "AWS::Glue::DataCatalogEncryptionSettings.ConnectionPasswordEncryption"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_datacatalogencryptionsettings.go b/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_datacatalogencryptionsettings.go
new file mode 100644
index 0000000000..2cabae215e
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_datacatalogencryptionsettings.go
@@ -0,0 +1,40 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataCatalogEncryptionSettings_DataCatalogEncryptionSettings AWS CloudFormation Resource (AWS::Glue::DataCatalogEncryptionSettings.DataCatalogEncryptionSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-datacatalogencryptionsettings-datacatalogencryptionsettings.html
+type DataCatalogEncryptionSettings_DataCatalogEncryptionSettings struct {
+
+	// ConnectionPasswordEncryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-datacatalogencryptionsettings-datacatalogencryptionsettings.html#cfn-glue-datacatalogencryptionsettings-datacatalogencryptionsettings-connectionpasswordencryption
+	ConnectionPasswordEncryption *DataCatalogEncryptionSettings_ConnectionPasswordEncryption `json:"ConnectionPasswordEncryption,omitempty"`
+
+	// EncryptionAtRest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-datacatalogencryptionsettings-datacatalogencryptionsettings.html#cfn-glue-datacatalogencryptionsettings-datacatalogencryptionsettings-encryptionatrest
+	EncryptionAtRest *DataCatalogEncryptionSettings_EncryptionAtRest `json:"EncryptionAtRest,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataCatalogEncryptionSettings_DataCatalogEncryptionSettings) AWSCloudFormationType() string {
+	return "AWS::Glue::DataCatalogEncryptionSettings.DataCatalogEncryptionSettings"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_encryptionatrest.go b/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_encryptionatrest.go
new file mode 100644
index 0000000000..121b3ac996
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-datacatalogencryptionsettings_encryptionatrest.go
@@ -0,0 +1,42 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataCatalogEncryptionSettings_EncryptionAtRest AWS CloudFormation Resource (AWS::Glue::DataCatalogEncryptionSettings.EncryptionAtRest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-datacatalogencryptionsettings-encryptionatrest.html
+type DataCatalogEncryptionSettings_EncryptionAtRest struct {
+
+	// CatalogEncryptionMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-datacatalogencryptionsettings-encryptionatrest.html#cfn-glue-datacatalogencryptionsettings-encryptionatrest-catalogencryptionmode
+	CatalogEncryptionMode *types.Value `json:"CatalogEncryptionMode,omitempty"`
+
+	// SseAwsKmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-datacatalogencryptionsettings-encryptionatrest.html#cfn-glue-datacatalogencryptionsettings-encryptionatrest-sseawskmskeyid
+	SseAwsKmsKeyId *types.Value `json:"SseAwsKmsKeyId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataCatalogEncryptionSettings_EncryptionAtRest) AWSCloudFormationType() string {
+	return "AWS::Glue::DataCatalogEncryptionSettings.EncryptionAtRest"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-devendpoint.go b/goformation/cloudformation/glue/aws-glue-devendpoint.go
new file mode 100644
index 0000000000..4340e11718
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-devendpoint.go
@@ -0,0 +1,178 @@
+package glue
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DevEndpoint AWS CloudFormation Resource (AWS::Glue::DevEndpoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html
+type DevEndpoint struct {
+
+	// Arguments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-arguments
+	Arguments interface{} `json:"Arguments,omitempty"`
+
+	// EndpointName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-endpointname
+	EndpointName *types.Value `json:"EndpointName,omitempty"`
+
+	// ExtraJarsS3Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-extrajarss3path
+	ExtraJarsS3Path *types.Value `json:"ExtraJarsS3Path,omitempty"`
+
+	// ExtraPythonLibsS3Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-extrapythonlibss3path
+	ExtraPythonLibsS3Path *types.Value `json:"ExtraPythonLibsS3Path,omitempty"`
+
+	// GlueVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-glueversion
+	GlueVersion *types.Value `json:"GlueVersion,omitempty"`
+
+	// NumberOfNodes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-numberofnodes
+	NumberOfNodes *types.Value `json:"NumberOfNodes,omitempty"`
+
+	// NumberOfWorkers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-numberofworkers
+	NumberOfWorkers *types.Value `json:"NumberOfWorkers,omitempty"`
+
+	// PublicKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-publickey
+	PublicKey *types.Value `json:"PublicKey,omitempty"`
+
+	// PublicKeys AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-publickeys
+	PublicKeys *types.Value `json:"PublicKeys,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// SecurityConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-securityconfiguration
+	SecurityConfiguration *types.Value `json:"SecurityConfiguration,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-tags
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// WorkerType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-devendpoint.html#cfn-glue-devendpoint-workertype
+	WorkerType *types.Value `json:"WorkerType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DevEndpoint) AWSCloudFormationType() string {
+	return "AWS::Glue::DevEndpoint"
+}
+
+// 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 DevEndpoint) MarshalJSON() ([]byte, error) {
+	type Properties DevEndpoint
+	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 *DevEndpoint) UnmarshalJSON(b []byte) error {
+	type Properties DevEndpoint
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DevEndpoint(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/glue/aws-glue-job.go b/goformation/cloudformation/glue/aws-glue-job.go
new file mode 100644
index 0000000000..e935e31614
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-job.go
@@ -0,0 +1,193 @@
+package glue
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job AWS CloudFormation Resource (AWS::Glue::Job)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html
+type Job struct {
+
+	// AllocatedCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-allocatedcapacity
+	AllocatedCapacity *types.Value `json:"AllocatedCapacity,omitempty"`
+
+	// Command AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-command
+	Command *Job_JobCommand `json:"Command,omitempty"`
+
+	// Connections AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-connections
+	Connections *Job_ConnectionsList `json:"Connections,omitempty"`
+
+	// DefaultArguments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-defaultarguments
+	DefaultArguments interface{} `json:"DefaultArguments,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// ExecutionProperty AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-executionproperty
+	ExecutionProperty *Job_ExecutionProperty `json:"ExecutionProperty,omitempty"`
+
+	// GlueVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-glueversion
+	GlueVersion *types.Value `json:"GlueVersion,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 *types.Value `json:"LogUri,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
+	MaxCapacity *types.Value `json:"MaxCapacity,omitempty"`
+
+	// MaxRetries AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-maxretries
+	MaxRetries *types.Value `json:"MaxRetries,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// NotificationProperty AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-notificationproperty
+	NotificationProperty *Job_NotificationProperty `json:"NotificationProperty,omitempty"`
+
+	// NumberOfWorkers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-numberofworkers
+	NumberOfWorkers *types.Value `json:"NumberOfWorkers,omitempty"`
+
+	// Role AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-role
+	Role *types.Value `json:"Role,omitempty"`
+
+	// SecurityConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-securityconfiguration
+	SecurityConfiguration *types.Value `json:"SecurityConfiguration,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-tags
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// Timeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-timeout
+	Timeout *types.Value `json:"Timeout,omitempty"`
+
+	// WorkerType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-job.html#cfn-glue-job-workertype
+	WorkerType *types.Value `json:"WorkerType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job) AWSCloudFormationType() string {
+	return "AWS::Glue::Job"
+}
+
+// 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 Job) MarshalJSON() ([]byte, error) {
+	type Properties Job
+	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 *Job) UnmarshalJSON(b []byte) error {
+	type Properties Job
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Job(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/glue/aws-glue-job_connectionslist.go b/goformation/cloudformation/glue/aws-glue-job_connectionslist.go
new file mode 100644
index 0000000000..4bbb9f8b6b
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-job_connectionslist.go
@@ -0,0 +1,37 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_ConnectionsList AWS CloudFormation Resource (AWS::Glue::Job.ConnectionsList)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-job-connectionslist.html
+type Job_ConnectionsList struct {
+
+	// Connections AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-job-connectionslist.html#cfn-glue-job-connectionslist-connections
+	Connections *types.Value `json:"Connections,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_ConnectionsList) AWSCloudFormationType() string {
+	return "AWS::Glue::Job.ConnectionsList"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-job_executionproperty.go b/goformation/cloudformation/glue/aws-glue-job_executionproperty.go
new file mode 100644
index 0000000000..4ad39128c1
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-job_executionproperty.go
@@ -0,0 +1,37 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_ExecutionProperty AWS CloudFormation Resource (AWS::Glue::Job.ExecutionProperty)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-job-executionproperty.html
+type Job_ExecutionProperty struct {
+
+	// MaxConcurrentRuns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-job-executionproperty.html#cfn-glue-job-executionproperty-maxconcurrentruns
+	MaxConcurrentRuns *types.Value `json:"MaxConcurrentRuns,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_ExecutionProperty) AWSCloudFormationType() string {
+	return "AWS::Glue::Job.ExecutionProperty"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-job_jobcommand.go b/goformation/cloudformation/glue/aws-glue-job_jobcommand.go
new file mode 100644
index 0000000000..3fdf302b4e
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-job_jobcommand.go
@@ -0,0 +1,47 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_JobCommand AWS CloudFormation Resource (AWS::Glue::Job.JobCommand)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-job-jobcommand.html
+type Job_JobCommand struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-job-jobcommand.html#cfn-glue-job-jobcommand-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// PythonVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-job-jobcommand.html#cfn-glue-job-jobcommand-pythonversion
+	PythonVersion *types.Value `json:"PythonVersion,omitempty"`
+
+	// ScriptLocation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-job-jobcommand.html#cfn-glue-job-jobcommand-scriptlocation
+	ScriptLocation *types.Value `json:"ScriptLocation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_JobCommand) AWSCloudFormationType() string {
+	return "AWS::Glue::Job.JobCommand"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-job_notificationproperty.go b/goformation/cloudformation/glue/aws-glue-job_notificationproperty.go
new file mode 100644
index 0000000000..f067c07e63
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-job_notificationproperty.go
@@ -0,0 +1,37 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Job_NotificationProperty AWS CloudFormation Resource (AWS::Glue::Job.NotificationProperty)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-job-notificationproperty.html
+type Job_NotificationProperty struct {
+
+	// NotifyDelayAfter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-job-notificationproperty.html#cfn-glue-job-notificationproperty-notifydelayafter
+	NotifyDelayAfter *types.Value `json:"NotifyDelayAfter,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Job_NotificationProperty) AWSCloudFormationType() string {
+	return "AWS::Glue::Job.NotificationProperty"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-mltransform.go b/goformation/cloudformation/glue/aws-glue-mltransform.go
new file mode 100644
index 0000000000..822994ce75
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-mltransform.go
@@ -0,0 +1,168 @@
+package glue
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MLTransform AWS CloudFormation Resource (AWS::Glue::MLTransform)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-mltransform.html
+type MLTransform struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-mltransform.html#cfn-glue-mltransform-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// GlueVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-mltransform.html#cfn-glue-mltransform-glueversion
+	GlueVersion *types.Value `json:"GlueVersion,omitempty"`
+
+	// InputRecordTables AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-mltransform.html#cfn-glue-mltransform-inputrecordtables
+	InputRecordTables *MLTransform_InputRecordTables `json:"InputRecordTables,omitempty"`
+
+	// MaxCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-mltransform.html#cfn-glue-mltransform-maxcapacity
+	MaxCapacity *types.Value `json:"MaxCapacity,omitempty"`
+
+	// MaxRetries AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-mltransform.html#cfn-glue-mltransform-maxretries
+	MaxRetries *types.Value `json:"MaxRetries,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-mltransform.html#cfn-glue-mltransform-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// NumberOfWorkers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-mltransform.html#cfn-glue-mltransform-numberofworkers
+	NumberOfWorkers *types.Value `json:"NumberOfWorkers,omitempty"`
+
+	// Role AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-mltransform.html#cfn-glue-mltransform-role
+	Role *types.Value `json:"Role,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-mltransform.html#cfn-glue-mltransform-tags
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// Timeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-mltransform.html#cfn-glue-mltransform-timeout
+	Timeout *types.Value `json:"Timeout,omitempty"`
+
+	// TransformEncryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-mltransform.html#cfn-glue-mltransform-transformencryption
+	TransformEncryption *MLTransform_TransformEncryption `json:"TransformEncryption,omitempty"`
+
+	// TransformParameters AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-mltransform.html#cfn-glue-mltransform-transformparameters
+	TransformParameters *MLTransform_TransformParameters `json:"TransformParameters,omitempty"`
+
+	// WorkerType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-mltransform.html#cfn-glue-mltransform-workertype
+	WorkerType *types.Value `json:"WorkerType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MLTransform) AWSCloudFormationType() string {
+	return "AWS::Glue::MLTransform"
+}
+
+// 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 MLTransform) MarshalJSON() ([]byte, error) {
+	type Properties MLTransform
+	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 *MLTransform) UnmarshalJSON(b []byte) error {
+	type Properties MLTransform
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = MLTransform(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/glue/aws-glue-mltransform_findmatchesparameters.go b/goformation/cloudformation/glue/aws-glue-mltransform_findmatchesparameters.go
new file mode 100644
index 0000000000..8f49a4a041
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-mltransform_findmatchesparameters.go
@@ -0,0 +1,52 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MLTransform_FindMatchesParameters AWS CloudFormation Resource (AWS::Glue::MLTransform.FindMatchesParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-transformparameters-findmatchesparameters.html
+type MLTransform_FindMatchesParameters struct {
+
+	// AccuracyCostTradeoff AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-transformparameters-findmatchesparameters.html#cfn-glue-mltransform-transformparameters-findmatchesparameters-accuracycosttradeoff
+	AccuracyCostTradeoff *types.Value `json:"AccuracyCostTradeoff,omitempty"`
+
+	// EnforceProvidedLabels AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-transformparameters-findmatchesparameters.html#cfn-glue-mltransform-transformparameters-findmatchesparameters-enforceprovidedlabels
+	EnforceProvidedLabels *types.Value `json:"EnforceProvidedLabels,omitempty"`
+
+	// PrecisionRecallTradeoff AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-transformparameters-findmatchesparameters.html#cfn-glue-mltransform-transformparameters-findmatchesparameters-precisionrecalltradeoff
+	PrecisionRecallTradeoff *types.Value `json:"PrecisionRecallTradeoff,omitempty"`
+
+	// PrimaryKeyColumnName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-transformparameters-findmatchesparameters.html#cfn-glue-mltransform-transformparameters-findmatchesparameters-primarykeycolumnname
+	PrimaryKeyColumnName *types.Value `json:"PrimaryKeyColumnName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MLTransform_FindMatchesParameters) AWSCloudFormationType() string {
+	return "AWS::Glue::MLTransform.FindMatchesParameters"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-mltransform_gluetables.go b/goformation/cloudformation/glue/aws-glue-mltransform_gluetables.go
new file mode 100644
index 0000000000..c742772bab
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-mltransform_gluetables.go
@@ -0,0 +1,52 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MLTransform_GlueTables AWS CloudFormation Resource (AWS::Glue::MLTransform.GlueTables)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-inputrecordtables-gluetables.html
+type MLTransform_GlueTables struct {
+
+	// CatalogId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-inputrecordtables-gluetables.html#cfn-glue-mltransform-inputrecordtables-gluetables-catalogid
+	CatalogId *types.Value `json:"CatalogId,omitempty"`
+
+	// ConnectionName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-inputrecordtables-gluetables.html#cfn-glue-mltransform-inputrecordtables-gluetables-connectionname
+	ConnectionName *types.Value `json:"ConnectionName,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-inputrecordtables-gluetables.html#cfn-glue-mltransform-inputrecordtables-gluetables-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-inputrecordtables-gluetables.html#cfn-glue-mltransform-inputrecordtables-gluetables-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MLTransform_GlueTables) AWSCloudFormationType() string {
+	return "AWS::Glue::MLTransform.GlueTables"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-mltransform_inputrecordtables.go b/goformation/cloudformation/glue/aws-glue-mltransform_inputrecordtables.go
new file mode 100644
index 0000000000..ff660acc2c
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-mltransform_inputrecordtables.go
@@ -0,0 +1,35 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// MLTransform_InputRecordTables AWS CloudFormation Resource (AWS::Glue::MLTransform.InputRecordTables)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-inputrecordtables.html
+type MLTransform_InputRecordTables struct {
+
+	// GlueTables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-inputrecordtables.html#cfn-glue-mltransform-inputrecordtables-gluetables
+	GlueTables []MLTransform_GlueTables `json:"GlueTables,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MLTransform_InputRecordTables) AWSCloudFormationType() string {
+	return "AWS::Glue::MLTransform.InputRecordTables"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-mltransform_mluserdataencryption.go b/goformation/cloudformation/glue/aws-glue-mltransform_mluserdataencryption.go
new file mode 100644
index 0000000000..5194ac005e
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-mltransform_mluserdataencryption.go
@@ -0,0 +1,42 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MLTransform_MLUserDataEncryption AWS CloudFormation Resource (AWS::Glue::MLTransform.MLUserDataEncryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-transformencryption-mluserdataencryption.html
+type MLTransform_MLUserDataEncryption struct {
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-transformencryption-mluserdataencryption.html#cfn-glue-mltransform-transformencryption-mluserdataencryption-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// MLUserDataEncryptionMode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-transformencryption-mluserdataencryption.html#cfn-glue-mltransform-transformencryption-mluserdataencryption-mluserdataencryptionmode
+	MLUserDataEncryptionMode *types.Value `json:"MLUserDataEncryptionMode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MLTransform_MLUserDataEncryption) AWSCloudFormationType() string {
+	return "AWS::Glue::MLTransform.MLUserDataEncryption"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-mltransform_transformencryption.go b/goformation/cloudformation/glue/aws-glue-mltransform_transformencryption.go
new file mode 100644
index 0000000000..7390621d46
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-mltransform_transformencryption.go
@@ -0,0 +1,42 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MLTransform_TransformEncryption AWS CloudFormation Resource (AWS::Glue::MLTransform.TransformEncryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-transformencryption.html
+type MLTransform_TransformEncryption struct {
+
+	// MLUserDataEncryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-transformencryption.html#cfn-glue-mltransform-transformencryption-mluserdataencryption
+	MLUserDataEncryption *MLTransform_MLUserDataEncryption `json:"MLUserDataEncryption,omitempty"`
+
+	// TaskRunSecurityConfigurationName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-transformencryption.html#cfn-glue-mltransform-transformencryption-taskrunsecurityconfigurationname
+	TaskRunSecurityConfigurationName *types.Value `json:"TaskRunSecurityConfigurationName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MLTransform_TransformEncryption) AWSCloudFormationType() string {
+	return "AWS::Glue::MLTransform.TransformEncryption"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-mltransform_transformparameters.go b/goformation/cloudformation/glue/aws-glue-mltransform_transformparameters.go
new file mode 100644
index 0000000000..02a9a4428b
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-mltransform_transformparameters.go
@@ -0,0 +1,42 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MLTransform_TransformParameters AWS CloudFormation Resource (AWS::Glue::MLTransform.TransformParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-transformparameters.html
+type MLTransform_TransformParameters struct {
+
+	// FindMatchesParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-transformparameters.html#cfn-glue-mltransform-transformparameters-findmatchesparameters
+	FindMatchesParameters *MLTransform_FindMatchesParameters `json:"FindMatchesParameters,omitempty"`
+
+	// TransformType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-mltransform-transformparameters.html#cfn-glue-mltransform-transformparameters-transformtype
+	TransformType *types.Value `json:"TransformType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MLTransform_TransformParameters) AWSCloudFormationType() string {
+	return "AWS::Glue::MLTransform.TransformParameters"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-partition.go b/goformation/cloudformation/glue/aws-glue-partition.go
new file mode 100644
index 0000000000..69d963a57b
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-partition.go
@@ -0,0 +1,123 @@
+package glue
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Partition AWS CloudFormation Resource (AWS::Glue::Partition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html
+type Partition struct {
+
+	// CatalogId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-catalogid
+	CatalogId *types.Value `json:"CatalogId,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// PartitionInput AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-partitioninput
+	PartitionInput *Partition_PartitionInput `json:"PartitionInput,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-partition.html#cfn-glue-partition-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Partition) AWSCloudFormationType() string {
+	return "AWS::Glue::Partition"
+}
+
+// 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 Partition) MarshalJSON() ([]byte, error) {
+	type Properties Partition
+	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 *Partition) UnmarshalJSON(b []byte) error {
+	type Properties Partition
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Partition(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/glue/aws-glue-partition_column.go b/goformation/cloudformation/glue/aws-glue-partition_column.go
new file mode 100644
index 0000000000..f032aebbc8
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-partition_column.go
@@ -0,0 +1,47 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Partition_Column AWS CloudFormation Resource (AWS::Glue::Partition.Column)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-column.html
+type Partition_Column struct {
+
+	// Comment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-column.html#cfn-glue-partition-column-comment
+	Comment *types.Value `json:"Comment,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-column.html#cfn-glue-partition-column-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-column.html#cfn-glue-partition-column-type
+	Type *types.Value `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 *Partition_Column) AWSCloudFormationType() string {
+	return "AWS::Glue::Partition.Column"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-partition_order.go b/goformation/cloudformation/glue/aws-glue-partition_order.go
new file mode 100644
index 0000000000..f4a368bdea
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-partition_order.go
@@ -0,0 +1,42 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Partition_Order AWS CloudFormation Resource (AWS::Glue::Partition.Order)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-order.html
+type Partition_Order struct {
+
+	// Column AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-order.html#cfn-glue-partition-order-column
+	Column *types.Value `json:"Column,omitempty"`
+
+	// SortOrder AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-order.html#cfn-glue-partition-order-sortorder
+	SortOrder *types.Value `json:"SortOrder,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Partition_Order) AWSCloudFormationType() string {
+	return "AWS::Glue::Partition.Order"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-partition_partitioninput.go b/goformation/cloudformation/glue/aws-glue-partition_partitioninput.go
new file mode 100644
index 0000000000..86aee55929
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-partition_partitioninput.go
@@ -0,0 +1,47 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Partition_PartitionInput AWS CloudFormation Resource (AWS::Glue::Partition.PartitionInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-partitioninput.html
+type Partition_PartitionInput struct {
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-partitioninput.html#cfn-glue-partition-partitioninput-parameters
+	Parameters interface{} `json:"Parameters,omitempty"`
+
+	// StorageDescriptor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-partitioninput.html#cfn-glue-partition-partitioninput-storagedescriptor
+	StorageDescriptor *Partition_StorageDescriptor `json:"StorageDescriptor,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-partitioninput.html#cfn-glue-partition-partitioninput-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Partition_PartitionInput) AWSCloudFormationType() string {
+	return "AWS::Glue::Partition.PartitionInput"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-partition_schemaid.go b/goformation/cloudformation/glue/aws-glue-partition_schemaid.go
new file mode 100644
index 0000000000..c48fb466bf
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-partition_schemaid.go
@@ -0,0 +1,47 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Partition_SchemaId AWS CloudFormation Resource (AWS::Glue::Partition.SchemaId)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-schemaid.html
+type Partition_SchemaId struct {
+
+	// RegistryName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-schemaid.html#cfn-glue-partition-schemaid-registryname
+	RegistryName *types.Value `json:"RegistryName,omitempty"`
+
+	// SchemaArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-schemaid.html#cfn-glue-partition-schemaid-schemaarn
+	SchemaArn *types.Value `json:"SchemaArn,omitempty"`
+
+	// SchemaName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-schemaid.html#cfn-glue-partition-schemaid-schemaname
+	SchemaName *types.Value `json:"SchemaName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Partition_SchemaId) AWSCloudFormationType() string {
+	return "AWS::Glue::Partition.SchemaId"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-partition_schemareference.go b/goformation/cloudformation/glue/aws-glue-partition_schemareference.go
new file mode 100644
index 0000000000..7c750b0354
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-partition_schemareference.go
@@ -0,0 +1,47 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Partition_SchemaReference AWS CloudFormation Resource (AWS::Glue::Partition.SchemaReference)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-schemareference.html
+type Partition_SchemaReference struct {
+
+	// SchemaId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-schemareference.html#cfn-glue-partition-schemareference-schemaid
+	SchemaId *Partition_SchemaId `json:"SchemaId,omitempty"`
+
+	// SchemaVersionId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-schemareference.html#cfn-glue-partition-schemareference-schemaversionid
+	SchemaVersionId *types.Value `json:"SchemaVersionId,omitempty"`
+
+	// SchemaVersionNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-schemareference.html#cfn-glue-partition-schemareference-schemaversionnumber
+	SchemaVersionNumber *types.Value `json:"SchemaVersionNumber,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Partition_SchemaReference) AWSCloudFormationType() string {
+	return "AWS::Glue::Partition.SchemaReference"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-partition_serdeinfo.go b/goformation/cloudformation/glue/aws-glue-partition_serdeinfo.go
new file mode 100644
index 0000000000..8fa391ae3b
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-partition_serdeinfo.go
@@ -0,0 +1,47 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Partition_SerdeInfo AWS CloudFormation Resource (AWS::Glue::Partition.SerdeInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-serdeinfo.html
+type Partition_SerdeInfo struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-serdeinfo.html#cfn-glue-partition-serdeinfo-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-serdeinfo.html#cfn-glue-partition-serdeinfo-parameters
+	Parameters interface{} `json:"Parameters,omitempty"`
+
+	// SerializationLibrary AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-serdeinfo.html#cfn-glue-partition-serdeinfo-serializationlibrary
+	SerializationLibrary *types.Value `json:"SerializationLibrary,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Partition_SerdeInfo) AWSCloudFormationType() string {
+	return "AWS::Glue::Partition.SerdeInfo"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-partition_skewedinfo.go b/goformation/cloudformation/glue/aws-glue-partition_skewedinfo.go
new file mode 100644
index 0000000000..ebe2b759d9
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-partition_skewedinfo.go
@@ -0,0 +1,47 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Partition_SkewedInfo AWS CloudFormation Resource (AWS::Glue::Partition.SkewedInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-skewedinfo.html
+type Partition_SkewedInfo struct {
+
+	// SkewedColumnNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-skewedinfo.html#cfn-glue-partition-skewedinfo-skewedcolumnnames
+	SkewedColumnNames *types.Value `json:"SkewedColumnNames,omitempty"`
+
+	// SkewedColumnValueLocationMaps AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-skewedinfo.html#cfn-glue-partition-skewedinfo-skewedcolumnvaluelocationmaps
+	SkewedColumnValueLocationMaps interface{} `json:"SkewedColumnValueLocationMaps,omitempty"`
+
+	// SkewedColumnValues AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-skewedinfo.html#cfn-glue-partition-skewedinfo-skewedcolumnvalues
+	SkewedColumnValues *types.Value `json:"SkewedColumnValues,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Partition_SkewedInfo) AWSCloudFormationType() string {
+	return "AWS::Glue::Partition.SkewedInfo"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-partition_storagedescriptor.go b/goformation/cloudformation/glue/aws-glue-partition_storagedescriptor.go
new file mode 100644
index 0000000000..af6920e617
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-partition_storagedescriptor.go
@@ -0,0 +1,97 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Partition_StorageDescriptor AWS CloudFormation Resource (AWS::Glue::Partition.StorageDescriptor)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html
+type Partition_StorageDescriptor struct {
+
+	// BucketColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-bucketcolumns
+	BucketColumns *types.Value `json:"BucketColumns,omitempty"`
+
+	// Columns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-columns
+	Columns []Partition_Column `json:"Columns,omitempty"`
+
+	// Compressed AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-compressed
+	Compressed *types.Value `json:"Compressed,omitempty"`
+
+	// InputFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-inputformat
+	InputFormat *types.Value `json:"InputFormat,omitempty"`
+
+	// Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-location
+	Location *types.Value `json:"Location,omitempty"`
+
+	// NumberOfBuckets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-numberofbuckets
+	NumberOfBuckets *types.Value `json:"NumberOfBuckets,omitempty"`
+
+	// OutputFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-outputformat
+	OutputFormat *types.Value `json:"OutputFormat,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-parameters
+	Parameters interface{} `json:"Parameters,omitempty"`
+
+	// SchemaReference AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-schemareference
+	SchemaReference *Partition_SchemaReference `json:"SchemaReference,omitempty"`
+
+	// SerdeInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-serdeinfo
+	SerdeInfo *Partition_SerdeInfo `json:"SerdeInfo,omitempty"`
+
+	// SkewedInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-skewedinfo
+	SkewedInfo *Partition_SkewedInfo `json:"SkewedInfo,omitempty"`
+
+	// SortColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-sortcolumns
+	SortColumns []Partition_Order `json:"SortColumns,omitempty"`
+
+	// StoredAsSubDirectories AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-partition-storagedescriptor.html#cfn-glue-partition-storagedescriptor-storedassubdirectories
+	StoredAsSubDirectories *types.Value `json:"StoredAsSubDirectories,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Partition_StorageDescriptor) AWSCloudFormationType() string {
+	return "AWS::Glue::Partition.StorageDescriptor"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-registry.go b/goformation/cloudformation/glue/aws-glue-registry.go
new file mode 100644
index 0000000000..a7b2f6504c
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-registry.go
@@ -0,0 +1,119 @@
+package glue
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Registry AWS CloudFormation Resource (AWS::Glue::Registry)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-registry.html
+type Registry struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-registry.html#cfn-glue-registry-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-registry.html#cfn-glue-registry-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-registry.html#cfn-glue-registry-tags
+	Tags []cloudformation.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 *Registry) AWSCloudFormationType() string {
+	return "AWS::Glue::Registry"
+}
+
+// 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 Registry) MarshalJSON() ([]byte, error) {
+	type Properties Registry
+	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 *Registry) UnmarshalJSON(b []byte) error {
+	type Properties Registry
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Registry(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/glue/aws-glue-schema.go b/goformation/cloudformation/glue/aws-glue-schema.go
new file mode 100644
index 0000000000..ec8b07f1d3
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-schema.go
@@ -0,0 +1,144 @@
+package glue
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Schema AWS CloudFormation Resource (AWS::Glue::Schema)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schema.html
+type Schema struct {
+
+	// CheckpointVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schema.html#cfn-glue-schema-checkpointversion
+	CheckpointVersion *Schema_SchemaVersion `json:"CheckpointVersion,omitempty"`
+
+	// Compatibility AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schema.html#cfn-glue-schema-compatibility
+	Compatibility *types.Value `json:"Compatibility,omitempty"`
+
+	// DataFormat AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schema.html#cfn-glue-schema-dataformat
+	DataFormat *types.Value `json:"DataFormat,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schema.html#cfn-glue-schema-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schema.html#cfn-glue-schema-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Registry AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schema.html#cfn-glue-schema-registry
+	Registry *Schema_Registry `json:"Registry,omitempty"`
+
+	// SchemaDefinition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schema.html#cfn-glue-schema-schemadefinition
+	SchemaDefinition *types.Value `json:"SchemaDefinition,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schema.html#cfn-glue-schema-tags
+	Tags []cloudformation.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 *Schema) AWSCloudFormationType() string {
+	return "AWS::Glue::Schema"
+}
+
+// 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 Schema) MarshalJSON() ([]byte, error) {
+	type Properties Schema
+	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 *Schema) UnmarshalJSON(b []byte) error {
+	type Properties Schema
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Schema(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/glue/aws-glue-schema_registry.go b/goformation/cloudformation/glue/aws-glue-schema_registry.go
new file mode 100644
index 0000000000..f59e60bc0c
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-schema_registry.go
@@ -0,0 +1,42 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Schema_Registry AWS CloudFormation Resource (AWS::Glue::Schema.Registry)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-schema-registry.html
+type Schema_Registry struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-schema-registry.html#cfn-glue-schema-registry-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-schema-registry.html#cfn-glue-schema-registry-name
+	Name *types.Value `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 *Schema_Registry) AWSCloudFormationType() string {
+	return "AWS::Glue::Schema.Registry"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-schema_schemaversion.go b/goformation/cloudformation/glue/aws-glue-schema_schemaversion.go
new file mode 100644
index 0000000000..012a6d030a
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-schema_schemaversion.go
@@ -0,0 +1,42 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Schema_SchemaVersion AWS CloudFormation Resource (AWS::Glue::Schema.SchemaVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-schema-schemaversion.html
+type Schema_SchemaVersion struct {
+
+	// IsLatest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-schema-schemaversion.html#cfn-glue-schema-schemaversion-islatest
+	IsLatest *types.Value `json:"IsLatest,omitempty"`
+
+	// VersionNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-schema-schemaversion.html#cfn-glue-schema-schemaversion-versionnumber
+	VersionNumber *types.Value `json:"VersionNumber,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Schema_SchemaVersion) AWSCloudFormationType() string {
+	return "AWS::Glue::Schema.SchemaVersion"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-schemaversion.go b/goformation/cloudformation/glue/aws-glue-schemaversion.go
new file mode 100644
index 0000000000..338ae482fb
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-schemaversion.go
@@ -0,0 +1,113 @@
+package glue
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SchemaVersion AWS CloudFormation Resource (AWS::Glue::SchemaVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schemaversion.html
+type SchemaVersion struct {
+
+	// Schema AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schemaversion.html#cfn-glue-schemaversion-schema
+	Schema *SchemaVersion_Schema `json:"Schema,omitempty"`
+
+	// SchemaDefinition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schemaversion.html#cfn-glue-schemaversion-schemadefinition
+	SchemaDefinition *types.Value `json:"SchemaDefinition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SchemaVersion) AWSCloudFormationType() string {
+	return "AWS::Glue::SchemaVersion"
+}
+
+// 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 SchemaVersion) MarshalJSON() ([]byte, error) {
+	type Properties SchemaVersion
+	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 *SchemaVersion) UnmarshalJSON(b []byte) error {
+	type Properties SchemaVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SchemaVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/glue/aws-glue-schemaversion_schema.go b/goformation/cloudformation/glue/aws-glue-schemaversion_schema.go
new file mode 100644
index 0000000000..ca54730495
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-schemaversion_schema.go
@@ -0,0 +1,47 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SchemaVersion_Schema AWS CloudFormation Resource (AWS::Glue::SchemaVersion.Schema)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-schemaversion-schema.html
+type SchemaVersion_Schema struct {
+
+	// RegistryName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-schemaversion-schema.html#cfn-glue-schemaversion-schema-registryname
+	RegistryName *types.Value `json:"RegistryName,omitempty"`
+
+	// SchemaArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-schemaversion-schema.html#cfn-glue-schemaversion-schema-schemaarn
+	SchemaArn *types.Value `json:"SchemaArn,omitempty"`
+
+	// SchemaName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-schemaversion-schema.html#cfn-glue-schemaversion-schema-schemaname
+	SchemaName *types.Value `json:"SchemaName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SchemaVersion_Schema) AWSCloudFormationType() string {
+	return "AWS::Glue::SchemaVersion.Schema"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-schemaversionmetadata.go b/goformation/cloudformation/glue/aws-glue-schemaversionmetadata.go
new file mode 100644
index 0000000000..d2a584bb69
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-schemaversionmetadata.go
@@ -0,0 +1,118 @@
+package glue
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SchemaVersionMetadata AWS CloudFormation Resource (AWS::Glue::SchemaVersionMetadata)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schemaversionmetadata.html
+type SchemaVersionMetadata struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schemaversionmetadata.html#cfn-glue-schemaversionmetadata-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// SchemaVersionId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schemaversionmetadata.html#cfn-glue-schemaversionmetadata-schemaversionid
+	SchemaVersionId *types.Value `json:"SchemaVersionId,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-schemaversionmetadata.html#cfn-glue-schemaversionmetadata-value
+	Value *types.Value `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 *SchemaVersionMetadata) AWSCloudFormationType() string {
+	return "AWS::Glue::SchemaVersionMetadata"
+}
+
+// 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 SchemaVersionMetadata) MarshalJSON() ([]byte, error) {
+	type Properties SchemaVersionMetadata
+	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 *SchemaVersionMetadata) UnmarshalJSON(b []byte) error {
+	type Properties SchemaVersionMetadata
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SchemaVersionMetadata(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/glue/aws-glue-securityconfiguration.go b/goformation/cloudformation/glue/aws-glue-securityconfiguration.go
new file mode 100644
index 0000000000..c18e14b302
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-securityconfiguration.go
@@ -0,0 +1,113 @@
+package glue
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityConfiguration AWS CloudFormation Resource (AWS::Glue::SecurityConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html
+type SecurityConfiguration struct {
+
+	// EncryptionConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html#cfn-glue-securityconfiguration-encryptionconfiguration
+	EncryptionConfiguration *SecurityConfiguration_EncryptionConfiguration `json:"EncryptionConfiguration,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-securityconfiguration.html#cfn-glue-securityconfiguration-name
+	Name *types.Value `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 *SecurityConfiguration) AWSCloudFormationType() string {
+	return "AWS::Glue::SecurityConfiguration"
+}
+
+// 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 SecurityConfiguration) MarshalJSON() ([]byte, error) {
+	type Properties SecurityConfiguration
+	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 *SecurityConfiguration) UnmarshalJSON(b []byte) error {
+	type Properties SecurityConfiguration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SecurityConfiguration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/glue/aws-glue-securityconfiguration_cloudwatchencryption.go b/goformation/cloudformation/glue/aws-glue-securityconfiguration_cloudwatchencryption.go
new file mode 100644
index 0000000000..19bfa7e365
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-securityconfiguration_cloudwatchencryption.go
@@ -0,0 +1,42 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityConfiguration_CloudWatchEncryption AWS CloudFormation Resource (AWS::Glue::SecurityConfiguration.CloudWatchEncryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-securityconfiguration-cloudwatchencryption.html
+type SecurityConfiguration_CloudWatchEncryption struct {
+
+	// CloudWatchEncryptionMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-securityconfiguration-cloudwatchencryption.html#cfn-glue-securityconfiguration-cloudwatchencryption-cloudwatchencryptionmode
+	CloudWatchEncryptionMode *types.Value `json:"CloudWatchEncryptionMode,omitempty"`
+
+	// KmsKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-securityconfiguration-cloudwatchencryption.html#cfn-glue-securityconfiguration-cloudwatchencryption-kmskeyarn
+	KmsKeyArn *types.Value `json:"KmsKeyArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SecurityConfiguration_CloudWatchEncryption) AWSCloudFormationType() string {
+	return "AWS::Glue::SecurityConfiguration.CloudWatchEncryption"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-securityconfiguration_encryptionconfiguration.go b/goformation/cloudformation/glue/aws-glue-securityconfiguration_encryptionconfiguration.go
new file mode 100644
index 0000000000..170dd18cd5
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-securityconfiguration_encryptionconfiguration.go
@@ -0,0 +1,45 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityConfiguration_EncryptionConfiguration AWS CloudFormation Resource (AWS::Glue::SecurityConfiguration.EncryptionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-securityconfiguration-encryptionconfiguration.html
+type SecurityConfiguration_EncryptionConfiguration struct {
+
+	// CloudWatchEncryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-securityconfiguration-encryptionconfiguration.html#cfn-glue-securityconfiguration-encryptionconfiguration-cloudwatchencryption
+	CloudWatchEncryption *SecurityConfiguration_CloudWatchEncryption `json:"CloudWatchEncryption,omitempty"`
+
+	// JobBookmarksEncryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-securityconfiguration-encryptionconfiguration.html#cfn-glue-securityconfiguration-encryptionconfiguration-jobbookmarksencryption
+	JobBookmarksEncryption *SecurityConfiguration_JobBookmarksEncryption `json:"JobBookmarksEncryption,omitempty"`
+
+	// S3Encryptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-securityconfiguration-encryptionconfiguration.html#cfn-glue-securityconfiguration-encryptionconfiguration-s3encryptions
+	S3Encryptions *SecurityConfiguration_S3Encryptions `json:"S3Encryptions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SecurityConfiguration_EncryptionConfiguration) AWSCloudFormationType() string {
+	return "AWS::Glue::SecurityConfiguration.EncryptionConfiguration"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-securityconfiguration_jobbookmarksencryption.go b/goformation/cloudformation/glue/aws-glue-securityconfiguration_jobbookmarksencryption.go
new file mode 100644
index 0000000000..d5232dfd22
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-securityconfiguration_jobbookmarksencryption.go
@@ -0,0 +1,42 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityConfiguration_JobBookmarksEncryption AWS CloudFormation Resource (AWS::Glue::SecurityConfiguration.JobBookmarksEncryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-securityconfiguration-jobbookmarksencryption.html
+type SecurityConfiguration_JobBookmarksEncryption struct {
+
+	// JobBookmarksEncryptionMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-securityconfiguration-jobbookmarksencryption.html#cfn-glue-securityconfiguration-jobbookmarksencryption-jobbookmarksencryptionmode
+	JobBookmarksEncryptionMode *types.Value `json:"JobBookmarksEncryptionMode,omitempty"`
+
+	// KmsKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-securityconfiguration-jobbookmarksencryption.html#cfn-glue-securityconfiguration-jobbookmarksencryption-kmskeyarn
+	KmsKeyArn *types.Value `json:"KmsKeyArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SecurityConfiguration_JobBookmarksEncryption) AWSCloudFormationType() string {
+	return "AWS::Glue::SecurityConfiguration.JobBookmarksEncryption"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-securityconfiguration_s3encryption.go b/goformation/cloudformation/glue/aws-glue-securityconfiguration_s3encryption.go
new file mode 100644
index 0000000000..5655c08868
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-securityconfiguration_s3encryption.go
@@ -0,0 +1,42 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityConfiguration_S3Encryption AWS CloudFormation Resource (AWS::Glue::SecurityConfiguration.S3Encryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-securityconfiguration-s3encryption.html
+type SecurityConfiguration_S3Encryption struct {
+
+	// KmsKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-securityconfiguration-s3encryption.html#cfn-glue-securityconfiguration-s3encryption-kmskeyarn
+	KmsKeyArn *types.Value `json:"KmsKeyArn,omitempty"`
+
+	// S3EncryptionMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-securityconfiguration-s3encryption.html#cfn-glue-securityconfiguration-s3encryption-s3encryptionmode
+	S3EncryptionMode *types.Value `json:"S3EncryptionMode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SecurityConfiguration_S3Encryption) AWSCloudFormationType() string {
+	return "AWS::Glue::SecurityConfiguration.S3Encryption"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-securityconfiguration_s3encryptions.go b/goformation/cloudformation/glue/aws-glue-securityconfiguration_s3encryptions.go
new file mode 100644
index 0000000000..35268fbeed
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-securityconfiguration_s3encryptions.go
@@ -0,0 +1,30 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityConfiguration_S3Encryptions AWS CloudFormation Resource (AWS::Glue::SecurityConfiguration.S3Encryptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-securityconfiguration-s3encryptions.html
+type SecurityConfiguration_S3Encryptions struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SecurityConfiguration_S3Encryptions) AWSCloudFormationType() string {
+	return "AWS::Glue::SecurityConfiguration.S3Encryptions"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-table.go b/goformation/cloudformation/glue/aws-glue-table.go
new file mode 100644
index 0000000000..19f03a05c4
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-table.go
@@ -0,0 +1,118 @@
+package glue
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table AWS CloudFormation Resource (AWS::Glue::Table)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html
+type Table struct {
+
+	// CatalogId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-catalogid
+	CatalogId *types.Value `json:"CatalogId,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// TableInput AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-table.html#cfn-glue-table-tableinput
+	TableInput *Table_TableInput `json:"TableInput,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::Glue::Table"
+}
+
+// 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 Table) MarshalJSON() ([]byte, error) {
+	type Properties Table
+	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 *Table) UnmarshalJSON(b []byte) error {
+	type Properties Table
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Table(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/glue/aws-glue-table_column.go b/goformation/cloudformation/glue/aws-glue-table_column.go
new file mode 100644
index 0000000000..8b70b4b4e5
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-table_column.go
@@ -0,0 +1,47 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_Column AWS CloudFormation Resource (AWS::Glue::Table.Column)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-column.html
+type Table_Column struct {
+
+	// Comment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-column.html#cfn-glue-table-column-comment
+	Comment *types.Value `json:"Comment,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-column.html#cfn-glue-table-column-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-column.html#cfn-glue-table-column-type
+	Type *types.Value `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 *Table_Column) AWSCloudFormationType() string {
+	return "AWS::Glue::Table.Column"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-table_order.go b/goformation/cloudformation/glue/aws-glue-table_order.go
new file mode 100644
index 0000000000..e97e9aa01f
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-table_order.go
@@ -0,0 +1,42 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_Order AWS CloudFormation Resource (AWS::Glue::Table.Order)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-order.html
+type Table_Order struct {
+
+	// Column AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-order.html#cfn-glue-table-order-column
+	Column *types.Value `json:"Column,omitempty"`
+
+	// SortOrder AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-order.html#cfn-glue-table-order-sortorder
+	SortOrder *types.Value `json:"SortOrder"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Order) AWSCloudFormationType() string {
+	return "AWS::Glue::Table.Order"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-table_schemaid.go b/goformation/cloudformation/glue/aws-glue-table_schemaid.go
new file mode 100644
index 0000000000..4213e94d64
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-table_schemaid.go
@@ -0,0 +1,47 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_SchemaId AWS CloudFormation Resource (AWS::Glue::Table.SchemaId)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-schemaid.html
+type Table_SchemaId struct {
+
+	// RegistryName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-schemaid.html#cfn-glue-table-schemaid-registryname
+	RegistryName *types.Value `json:"RegistryName,omitempty"`
+
+	// SchemaArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-schemaid.html#cfn-glue-table-schemaid-schemaarn
+	SchemaArn *types.Value `json:"SchemaArn,omitempty"`
+
+	// SchemaName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-schemaid.html#cfn-glue-table-schemaid-schemaname
+	SchemaName *types.Value `json:"SchemaName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SchemaId) AWSCloudFormationType() string {
+	return "AWS::Glue::Table.SchemaId"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-table_schemareference.go b/goformation/cloudformation/glue/aws-glue-table_schemareference.go
new file mode 100644
index 0000000000..277cda16b2
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-table_schemareference.go
@@ -0,0 +1,47 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_SchemaReference AWS CloudFormation Resource (AWS::Glue::Table.SchemaReference)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-schemareference.html
+type Table_SchemaReference struct {
+
+	// SchemaId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-schemareference.html#cfn-glue-table-schemareference-schemaid
+	SchemaId *Table_SchemaId `json:"SchemaId,omitempty"`
+
+	// SchemaVersionId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-schemareference.html#cfn-glue-table-schemareference-schemaversionid
+	SchemaVersionId *types.Value `json:"SchemaVersionId,omitempty"`
+
+	// SchemaVersionNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-schemareference.html#cfn-glue-table-schemareference-schemaversionnumber
+	SchemaVersionNumber *types.Value `json:"SchemaVersionNumber,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SchemaReference) AWSCloudFormationType() string {
+	return "AWS::Glue::Table.SchemaReference"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-table_serdeinfo.go b/goformation/cloudformation/glue/aws-glue-table_serdeinfo.go
new file mode 100644
index 0000000000..6d44f5e987
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-table_serdeinfo.go
@@ -0,0 +1,47 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_SerdeInfo AWS CloudFormation Resource (AWS::Glue::Table.SerdeInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-serdeinfo.html
+type Table_SerdeInfo struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-serdeinfo.html#cfn-glue-table-serdeinfo-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-serdeinfo.html#cfn-glue-table-serdeinfo-parameters
+	Parameters interface{} `json:"Parameters,omitempty"`
+
+	// SerializationLibrary AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-serdeinfo.html#cfn-glue-table-serdeinfo-serializationlibrary
+	SerializationLibrary *types.Value `json:"SerializationLibrary,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SerdeInfo) AWSCloudFormationType() string {
+	return "AWS::Glue::Table.SerdeInfo"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-table_skewedinfo.go b/goformation/cloudformation/glue/aws-glue-table_skewedinfo.go
new file mode 100644
index 0000000000..4daa44fd88
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-table_skewedinfo.go
@@ -0,0 +1,47 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_SkewedInfo AWS CloudFormation Resource (AWS::Glue::Table.SkewedInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-skewedinfo.html
+type Table_SkewedInfo struct {
+
+	// SkewedColumnNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-skewedinfo.html#cfn-glue-table-skewedinfo-skewedcolumnnames
+	SkewedColumnNames *types.Value `json:"SkewedColumnNames,omitempty"`
+
+	// SkewedColumnValueLocationMaps AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-skewedinfo.html#cfn-glue-table-skewedinfo-skewedcolumnvaluelocationmaps
+	SkewedColumnValueLocationMaps interface{} `json:"SkewedColumnValueLocationMaps,omitempty"`
+
+	// SkewedColumnValues AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-skewedinfo.html#cfn-glue-table-skewedinfo-skewedcolumnvalues
+	SkewedColumnValues *types.Value `json:"SkewedColumnValues,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SkewedInfo) AWSCloudFormationType() string {
+	return "AWS::Glue::Table.SkewedInfo"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-table_storagedescriptor.go b/goformation/cloudformation/glue/aws-glue-table_storagedescriptor.go
new file mode 100644
index 0000000000..b566bc64aa
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-table_storagedescriptor.go
@@ -0,0 +1,97 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_StorageDescriptor AWS CloudFormation Resource (AWS::Glue::Table.StorageDescriptor)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html
+type Table_StorageDescriptor struct {
+
+	// BucketColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-bucketcolumns
+	BucketColumns *types.Value `json:"BucketColumns,omitempty"`
+
+	// Columns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-columns
+	Columns []Table_Column `json:"Columns,omitempty"`
+
+	// Compressed AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-compressed
+	Compressed *types.Value `json:"Compressed,omitempty"`
+
+	// InputFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-inputformat
+	InputFormat *types.Value `json:"InputFormat,omitempty"`
+
+	// Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-location
+	Location *types.Value `json:"Location,omitempty"`
+
+	// NumberOfBuckets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-numberofbuckets
+	NumberOfBuckets *types.Value `json:"NumberOfBuckets,omitempty"`
+
+	// OutputFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-outputformat
+	OutputFormat *types.Value `json:"OutputFormat,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-parameters
+	Parameters interface{} `json:"Parameters,omitempty"`
+
+	// SchemaReference AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-schemareference
+	SchemaReference *Table_SchemaReference `json:"SchemaReference,omitempty"`
+
+	// SerdeInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-serdeinfo
+	SerdeInfo *Table_SerdeInfo `json:"SerdeInfo,omitempty"`
+
+	// SkewedInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-skewedinfo
+	SkewedInfo *Table_SkewedInfo `json:"SkewedInfo,omitempty"`
+
+	// SortColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-sortcolumns
+	SortColumns []Table_Order `json:"SortColumns,omitempty"`
+
+	// StoredAsSubDirectories AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-storagedescriptor.html#cfn-glue-table-storagedescriptor-storedassubdirectories
+	StoredAsSubDirectories *types.Value `json:"StoredAsSubDirectories,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_StorageDescriptor) AWSCloudFormationType() string {
+	return "AWS::Glue::Table.StorageDescriptor"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-table_tableidentifier.go b/goformation/cloudformation/glue/aws-glue-table_tableidentifier.go
new file mode 100644
index 0000000000..6ec30d3b72
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-table_tableidentifier.go
@@ -0,0 +1,47 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_TableIdentifier AWS CloudFormation Resource (AWS::Glue::Table.TableIdentifier)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableidentifier.html
+type Table_TableIdentifier struct {
+
+	// CatalogId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableidentifier.html#cfn-glue-table-tableidentifier-catalogid
+	CatalogId *types.Value `json:"CatalogId,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableidentifier.html#cfn-glue-table-tableidentifier-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableidentifier.html#cfn-glue-table-tableidentifier-name
+	Name *types.Value `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 *Table_TableIdentifier) AWSCloudFormationType() string {
+	return "AWS::Glue::Table.TableIdentifier"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-table_tableinput.go b/goformation/cloudformation/glue/aws-glue-table_tableinput.go
new file mode 100644
index 0000000000..01e8552a21
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-table_tableinput.go
@@ -0,0 +1,87 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table_TableInput AWS CloudFormation Resource (AWS::Glue::Table.TableInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html
+type Table_TableInput struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Owner AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-owner
+	Owner *types.Value `json:"Owner,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-parameters
+	Parameters interface{} `json:"Parameters,omitempty"`
+
+	// PartitionKeys AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-partitionkeys
+	PartitionKeys []Table_Column `json:"PartitionKeys,omitempty"`
+
+	// Retention AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-retention
+	Retention *types.Value `json:"Retention,omitempty"`
+
+	// StorageDescriptor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-storagedescriptor
+	StorageDescriptor *Table_StorageDescriptor `json:"StorageDescriptor,omitempty"`
+
+	// TableType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-tabletype
+	TableType *types.Value `json:"TableType,omitempty"`
+
+	// TargetTable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-targettable
+	TargetTable *Table_TableIdentifier `json:"TargetTable,omitempty"`
+
+	// ViewExpandedText AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-viewexpandedtext
+	ViewExpandedText *types.Value `json:"ViewExpandedText,omitempty"`
+
+	// ViewOriginalText AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-table-tableinput.html#cfn-glue-table-tableinput-vieworiginaltext
+	ViewOriginalText *types.Value `json:"ViewOriginalText,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TableInput) AWSCloudFormationType() string {
+	return "AWS::Glue::Table.TableInput"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-trigger.go b/goformation/cloudformation/glue/aws-glue-trigger.go
new file mode 100644
index 0000000000..1fd5ef75f0
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-trigger.go
@@ -0,0 +1,148 @@
+package glue
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Trigger AWS CloudFormation Resource (AWS::Glue::Trigger)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html
+type Trigger struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-actions
+	Actions []Trigger_Action `json:"Actions,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Predicate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-predicate
+	Predicate *Trigger_Predicate `json:"Predicate,omitempty"`
+
+	// Schedule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-schedule
+	Schedule *types.Value `json:"Schedule,omitempty"`
+
+	// StartOnCreation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-startoncreation
+	StartOnCreation *types.Value `json:"StartOnCreation,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-tags
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// WorkflowName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-trigger.html#cfn-glue-trigger-workflowname
+	WorkflowName *types.Value `json:"WorkflowName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Trigger) AWSCloudFormationType() string {
+	return "AWS::Glue::Trigger"
+}
+
+// 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 Trigger) MarshalJSON() ([]byte, error) {
+	type Properties Trigger
+	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 *Trigger) UnmarshalJSON(b []byte) error {
+	type Properties Trigger
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Trigger(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/glue/aws-glue-trigger_action.go b/goformation/cloudformation/glue/aws-glue-trigger_action.go
new file mode 100644
index 0000000000..91ff74cfd7
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-trigger_action.go
@@ -0,0 +1,62 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Trigger_Action AWS CloudFormation Resource (AWS::Glue::Trigger.Action)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-action.html
+type Trigger_Action struct {
+
+	// Arguments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-action.html#cfn-glue-trigger-action-arguments
+	Arguments interface{} `json:"Arguments,omitempty"`
+
+	// CrawlerName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-action.html#cfn-glue-trigger-action-crawlername
+	CrawlerName *types.Value `json:"CrawlerName,omitempty"`
+
+	// JobName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-action.html#cfn-glue-trigger-action-jobname
+	JobName *types.Value `json:"JobName,omitempty"`
+
+	// NotificationProperty AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-action.html#cfn-glue-trigger-action-notificationproperty
+	NotificationProperty *Trigger_NotificationProperty `json:"NotificationProperty,omitempty"`
+
+	// SecurityConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-action.html#cfn-glue-trigger-action-securityconfiguration
+	SecurityConfiguration *types.Value `json:"SecurityConfiguration,omitempty"`
+
+	// Timeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-action.html#cfn-glue-trigger-action-timeout
+	Timeout *types.Value `json:"Timeout,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Trigger_Action) AWSCloudFormationType() string {
+	return "AWS::Glue::Trigger.Action"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-trigger_condition.go b/goformation/cloudformation/glue/aws-glue-trigger_condition.go
new file mode 100644
index 0000000000..1409ca0af9
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-trigger_condition.go
@@ -0,0 +1,57 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Trigger_Condition AWS CloudFormation Resource (AWS::Glue::Trigger.Condition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-condition.html
+type Trigger_Condition struct {
+
+	// CrawlState AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-condition.html#cfn-glue-trigger-condition-crawlstate
+	CrawlState *types.Value `json:"CrawlState,omitempty"`
+
+	// CrawlerName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-condition.html#cfn-glue-trigger-condition-crawlername
+	CrawlerName *types.Value `json:"CrawlerName,omitempty"`
+
+	// JobName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-condition.html#cfn-glue-trigger-condition-jobname
+	JobName *types.Value `json:"JobName,omitempty"`
+
+	// LogicalOperator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-condition.html#cfn-glue-trigger-condition-logicaloperator
+	LogicalOperator *types.Value `json:"LogicalOperator,omitempty"`
+
+	// State AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-condition.html#cfn-glue-trigger-condition-state
+	State *types.Value `json:"State,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Trigger_Condition) AWSCloudFormationType() string {
+	return "AWS::Glue::Trigger.Condition"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-trigger_notificationproperty.go b/goformation/cloudformation/glue/aws-glue-trigger_notificationproperty.go
new file mode 100644
index 0000000000..f8abb8e920
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-trigger_notificationproperty.go
@@ -0,0 +1,37 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Trigger_NotificationProperty AWS CloudFormation Resource (AWS::Glue::Trigger.NotificationProperty)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-notificationproperty.html
+type Trigger_NotificationProperty struct {
+
+	// NotifyDelayAfter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-notificationproperty.html#cfn-glue-trigger-notificationproperty-notifydelayafter
+	NotifyDelayAfter *types.Value `json:"NotifyDelayAfter,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Trigger_NotificationProperty) AWSCloudFormationType() string {
+	return "AWS::Glue::Trigger.NotificationProperty"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-trigger_predicate.go b/goformation/cloudformation/glue/aws-glue-trigger_predicate.go
new file mode 100644
index 0000000000..0f4c3e7dc2
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-trigger_predicate.go
@@ -0,0 +1,42 @@
+package glue
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Trigger_Predicate AWS CloudFormation Resource (AWS::Glue::Trigger.Predicate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-predicate.html
+type Trigger_Predicate struct {
+
+	// Conditions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-predicate.html#cfn-glue-trigger-predicate-conditions
+	Conditions []Trigger_Condition `json:"Conditions,omitempty"`
+
+	// Logical AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-glue-trigger-predicate.html#cfn-glue-trigger-predicate-logical
+	Logical *types.Value `json:"Logical,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Trigger_Predicate) AWSCloudFormationType() string {
+	return "AWS::Glue::Trigger.Predicate"
+}
diff --git a/goformation/cloudformation/glue/aws-glue-workflow.go b/goformation/cloudformation/glue/aws-glue-workflow.go
new file mode 100644
index 0000000000..df37fad405
--- /dev/null
+++ b/goformation/cloudformation/glue/aws-glue-workflow.go
@@ -0,0 +1,123 @@
+package glue
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Workflow AWS CloudFormation Resource (AWS::Glue::Workflow)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-workflow.html
+type Workflow struct {
+
+	// DefaultRunProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-workflow.html#cfn-glue-workflow-defaultrunproperties
+	DefaultRunProperties interface{} `json:"DefaultRunProperties,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-workflow.html#cfn-glue-workflow-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-workflow.html#cfn-glue-workflow-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-glue-workflow.html#cfn-glue-workflow-tags
+	Tags interface{} `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 *Workflow) AWSCloudFormationType() string {
+	return "AWS::Glue::Workflow"
+}
+
+// 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 Workflow) MarshalJSON() ([]byte, error) {
+	type Properties Workflow
+	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 *Workflow) UnmarshalJSON(b []byte) error {
+	type Properties Workflow
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Workflow(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition.go b/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition.go
new file mode 100644
index 0000000000..d67e7c177f
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition.go
@@ -0,0 +1,118 @@
+package greengrass
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorDefinition AWS CloudFormation Resource (AWS::Greengrass::ConnectorDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-connectordefinition.html
+type ConnectorDefinition struct {
+
+	// InitialVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-connectordefinition.html#cfn-greengrass-connectordefinition-initialversion
+	InitialVersion *ConnectorDefinition_ConnectorDefinitionVersion `json:"InitialVersion,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-connectordefinition.html#cfn-greengrass-connectordefinition-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-connectordefinition.html#cfn-greengrass-connectordefinition-tags
+	Tags interface{} `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 *ConnectorDefinition) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ConnectorDefinition"
+}
+
+// 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 ConnectorDefinition) MarshalJSON() ([]byte, error) {
+	type Properties ConnectorDefinition
+	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 *ConnectorDefinition) UnmarshalJSON(b []byte) error {
+	type Properties ConnectorDefinition
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ConnectorDefinition(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition_connector.go b/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition_connector.go
new file mode 100644
index 0000000000..7f187cb818
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition_connector.go
@@ -0,0 +1,47 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorDefinition_Connector AWS CloudFormation Resource (AWS::Greengrass::ConnectorDefinition.Connector)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-connectordefinition-connector.html
+type ConnectorDefinition_Connector struct {
+
+	// ConnectorArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-connectordefinition-connector.html#cfn-greengrass-connectordefinition-connector-connectorarn
+	ConnectorArn *types.Value `json:"ConnectorArn,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-connectordefinition-connector.html#cfn-greengrass-connectordefinition-connector-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-connectordefinition-connector.html#cfn-greengrass-connectordefinition-connector-parameters
+	Parameters interface{} `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 *ConnectorDefinition_Connector) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ConnectorDefinition.Connector"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition_connectordefinitionversion.go b/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition_connectordefinitionversion.go
new file mode 100644
index 0000000000..00af1cf658
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-connectordefinition_connectordefinitionversion.go
@@ -0,0 +1,35 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorDefinition_ConnectorDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::ConnectorDefinition.ConnectorDefinitionVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-connectordefinition-connectordefinitionversion.html
+type ConnectorDefinition_ConnectorDefinitionVersion struct {
+
+	// Connectors AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-connectordefinition-connectordefinitionversion.html#cfn-greengrass-connectordefinition-connectordefinitionversion-connectors
+	Connectors []ConnectorDefinition_Connector `json:"Connectors,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorDefinition_ConnectorDefinitionVersion) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ConnectorDefinition.ConnectorDefinitionVersion"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-connectordefinitionversion.go b/goformation/cloudformation/greengrass/aws-greengrass-connectordefinitionversion.go
new file mode 100644
index 0000000000..e3c87ea6c6
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-connectordefinitionversion.go
@@ -0,0 +1,113 @@
+package greengrass
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::ConnectorDefinitionVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-connectordefinitionversion.html
+type ConnectorDefinitionVersion struct {
+
+	// ConnectorDefinitionId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-connectordefinitionversion.html#cfn-greengrass-connectordefinitionversion-connectordefinitionid
+	ConnectorDefinitionId *types.Value `json:"ConnectorDefinitionId,omitempty"`
+
+	// Connectors AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-connectordefinitionversion.html#cfn-greengrass-connectordefinitionversion-connectors
+	Connectors []ConnectorDefinitionVersion_Connector `json:"Connectors,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectorDefinitionVersion) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ConnectorDefinitionVersion"
+}
+
+// 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 ConnectorDefinitionVersion) MarshalJSON() ([]byte, error) {
+	type Properties ConnectorDefinitionVersion
+	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 *ConnectorDefinitionVersion) UnmarshalJSON(b []byte) error {
+	type Properties ConnectorDefinitionVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ConnectorDefinitionVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/greengrass/aws-greengrass-connectordefinitionversion_connector.go b/goformation/cloudformation/greengrass/aws-greengrass-connectordefinitionversion_connector.go
new file mode 100644
index 0000000000..3d0c38b38c
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-connectordefinitionversion_connector.go
@@ -0,0 +1,47 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectorDefinitionVersion_Connector AWS CloudFormation Resource (AWS::Greengrass::ConnectorDefinitionVersion.Connector)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-connectordefinitionversion-connector.html
+type ConnectorDefinitionVersion_Connector struct {
+
+	// ConnectorArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-connectordefinitionversion-connector.html#cfn-greengrass-connectordefinitionversion-connector-connectorarn
+	ConnectorArn *types.Value `json:"ConnectorArn,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-connectordefinitionversion-connector.html#cfn-greengrass-connectordefinitionversion-connector-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-connectordefinitionversion-connector.html#cfn-greengrass-connectordefinitionversion-connector-parameters
+	Parameters interface{} `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 *ConnectorDefinitionVersion_Connector) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ConnectorDefinitionVersion.Connector"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-coredefinition.go b/goformation/cloudformation/greengrass/aws-greengrass-coredefinition.go
new file mode 100644
index 0000000000..245eac29be
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-coredefinition.go
@@ -0,0 +1,118 @@
+package greengrass
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CoreDefinition AWS CloudFormation Resource (AWS::Greengrass::CoreDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-coredefinition.html
+type CoreDefinition struct {
+
+	// InitialVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-coredefinition.html#cfn-greengrass-coredefinition-initialversion
+	InitialVersion *CoreDefinition_CoreDefinitionVersion `json:"InitialVersion,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-coredefinition.html#cfn-greengrass-coredefinition-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-coredefinition.html#cfn-greengrass-coredefinition-tags
+	Tags interface{} `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 *CoreDefinition) AWSCloudFormationType() string {
+	return "AWS::Greengrass::CoreDefinition"
+}
+
+// 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 CoreDefinition) MarshalJSON() ([]byte, error) {
+	type Properties CoreDefinition
+	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 *CoreDefinition) UnmarshalJSON(b []byte) error {
+	type Properties CoreDefinition
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CoreDefinition(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/greengrass/aws-greengrass-coredefinition_core.go b/goformation/cloudformation/greengrass/aws-greengrass-coredefinition_core.go
new file mode 100644
index 0000000000..a1f609e277
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-coredefinition_core.go
@@ -0,0 +1,52 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CoreDefinition_Core AWS CloudFormation Resource (AWS::Greengrass::CoreDefinition.Core)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-coredefinition-core.html
+type CoreDefinition_Core struct {
+
+	// CertificateArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-coredefinition-core.html#cfn-greengrass-coredefinition-core-certificatearn
+	CertificateArn *types.Value `json:"CertificateArn,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-coredefinition-core.html#cfn-greengrass-coredefinition-core-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// SyncShadow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-coredefinition-core.html#cfn-greengrass-coredefinition-core-syncshadow
+	SyncShadow *types.Value `json:"SyncShadow,omitempty"`
+
+	// ThingArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-coredefinition-core.html#cfn-greengrass-coredefinition-core-thingarn
+	ThingArn *types.Value `json:"ThingArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CoreDefinition_Core) AWSCloudFormationType() string {
+	return "AWS::Greengrass::CoreDefinition.Core"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-coredefinition_coredefinitionversion.go b/goformation/cloudformation/greengrass/aws-greengrass-coredefinition_coredefinitionversion.go
new file mode 100644
index 0000000000..5c6bc1afb2
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-coredefinition_coredefinitionversion.go
@@ -0,0 +1,35 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// CoreDefinition_CoreDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::CoreDefinition.CoreDefinitionVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-coredefinition-coredefinitionversion.html
+type CoreDefinition_CoreDefinitionVersion struct {
+
+	// Cores AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-coredefinition-coredefinitionversion.html#cfn-greengrass-coredefinition-coredefinitionversion-cores
+	Cores []CoreDefinition_Core `json:"Cores,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CoreDefinition_CoreDefinitionVersion) AWSCloudFormationType() string {
+	return "AWS::Greengrass::CoreDefinition.CoreDefinitionVersion"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-coredefinitionversion.go b/goformation/cloudformation/greengrass/aws-greengrass-coredefinitionversion.go
new file mode 100644
index 0000000000..f890928a59
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-coredefinitionversion.go
@@ -0,0 +1,113 @@
+package greengrass
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CoreDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::CoreDefinitionVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-coredefinitionversion.html
+type CoreDefinitionVersion struct {
+
+	// CoreDefinitionId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-coredefinitionversion.html#cfn-greengrass-coredefinitionversion-coredefinitionid
+	CoreDefinitionId *types.Value `json:"CoreDefinitionId,omitempty"`
+
+	// Cores AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-coredefinitionversion.html#cfn-greengrass-coredefinitionversion-cores
+	Cores []CoreDefinitionVersion_Core `json:"Cores,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CoreDefinitionVersion) AWSCloudFormationType() string {
+	return "AWS::Greengrass::CoreDefinitionVersion"
+}
+
+// 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 CoreDefinitionVersion) MarshalJSON() ([]byte, error) {
+	type Properties CoreDefinitionVersion
+	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 *CoreDefinitionVersion) UnmarshalJSON(b []byte) error {
+	type Properties CoreDefinitionVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CoreDefinitionVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/greengrass/aws-greengrass-coredefinitionversion_core.go b/goformation/cloudformation/greengrass/aws-greengrass-coredefinitionversion_core.go
new file mode 100644
index 0000000000..5bcaee95d7
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-coredefinitionversion_core.go
@@ -0,0 +1,52 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CoreDefinitionVersion_Core AWS CloudFormation Resource (AWS::Greengrass::CoreDefinitionVersion.Core)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-coredefinitionversion-core.html
+type CoreDefinitionVersion_Core struct {
+
+	// CertificateArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-coredefinitionversion-core.html#cfn-greengrass-coredefinitionversion-core-certificatearn
+	CertificateArn *types.Value `json:"CertificateArn,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-coredefinitionversion-core.html#cfn-greengrass-coredefinitionversion-core-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// SyncShadow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-coredefinitionversion-core.html#cfn-greengrass-coredefinitionversion-core-syncshadow
+	SyncShadow *types.Value `json:"SyncShadow,omitempty"`
+
+	// ThingArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-coredefinitionversion-core.html#cfn-greengrass-coredefinitionversion-core-thingarn
+	ThingArn *types.Value `json:"ThingArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CoreDefinitionVersion_Core) AWSCloudFormationType() string {
+	return "AWS::Greengrass::CoreDefinitionVersion.Core"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition.go b/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition.go
new file mode 100644
index 0000000000..1360858f42
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition.go
@@ -0,0 +1,118 @@
+package greengrass
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeviceDefinition AWS CloudFormation Resource (AWS::Greengrass::DeviceDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-devicedefinition.html
+type DeviceDefinition struct {
+
+	// InitialVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-devicedefinition.html#cfn-greengrass-devicedefinition-initialversion
+	InitialVersion *DeviceDefinition_DeviceDefinitionVersion `json:"InitialVersion,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-devicedefinition.html#cfn-greengrass-devicedefinition-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-devicedefinition.html#cfn-greengrass-devicedefinition-tags
+	Tags interface{} `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 *DeviceDefinition) AWSCloudFormationType() string {
+	return "AWS::Greengrass::DeviceDefinition"
+}
+
+// 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 DeviceDefinition) MarshalJSON() ([]byte, error) {
+	type Properties DeviceDefinition
+	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 *DeviceDefinition) UnmarshalJSON(b []byte) error {
+	type Properties DeviceDefinition
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DeviceDefinition(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition_device.go b/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition_device.go
new file mode 100644
index 0000000000..da3362b5e7
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition_device.go
@@ -0,0 +1,52 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeviceDefinition_Device AWS CloudFormation Resource (AWS::Greengrass::DeviceDefinition.Device)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-devicedefinition-device.html
+type DeviceDefinition_Device struct {
+
+	// CertificateArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-devicedefinition-device.html#cfn-greengrass-devicedefinition-device-certificatearn
+	CertificateArn *types.Value `json:"CertificateArn,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-devicedefinition-device.html#cfn-greengrass-devicedefinition-device-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// SyncShadow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-devicedefinition-device.html#cfn-greengrass-devicedefinition-device-syncshadow
+	SyncShadow *types.Value `json:"SyncShadow,omitempty"`
+
+	// ThingArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-devicedefinition-device.html#cfn-greengrass-devicedefinition-device-thingarn
+	ThingArn *types.Value `json:"ThingArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeviceDefinition_Device) AWSCloudFormationType() string {
+	return "AWS::Greengrass::DeviceDefinition.Device"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition_devicedefinitionversion.go b/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition_devicedefinitionversion.go
new file mode 100644
index 0000000000..b764e6dc7f
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-devicedefinition_devicedefinitionversion.go
@@ -0,0 +1,35 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeviceDefinition_DeviceDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::DeviceDefinition.DeviceDefinitionVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-devicedefinition-devicedefinitionversion.html
+type DeviceDefinition_DeviceDefinitionVersion struct {
+
+	// Devices AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-devicedefinition-devicedefinitionversion.html#cfn-greengrass-devicedefinition-devicedefinitionversion-devices
+	Devices []DeviceDefinition_Device `json:"Devices,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeviceDefinition_DeviceDefinitionVersion) AWSCloudFormationType() string {
+	return "AWS::Greengrass::DeviceDefinition.DeviceDefinitionVersion"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-devicedefinitionversion.go b/goformation/cloudformation/greengrass/aws-greengrass-devicedefinitionversion.go
new file mode 100644
index 0000000000..90c3040884
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-devicedefinitionversion.go
@@ -0,0 +1,113 @@
+package greengrass
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeviceDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::DeviceDefinitionVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-devicedefinitionversion.html
+type DeviceDefinitionVersion struct {
+
+	// DeviceDefinitionId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-devicedefinitionversion.html#cfn-greengrass-devicedefinitionversion-devicedefinitionid
+	DeviceDefinitionId *types.Value `json:"DeviceDefinitionId,omitempty"`
+
+	// Devices AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-devicedefinitionversion.html#cfn-greengrass-devicedefinitionversion-devices
+	Devices []DeviceDefinitionVersion_Device `json:"Devices,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeviceDefinitionVersion) AWSCloudFormationType() string {
+	return "AWS::Greengrass::DeviceDefinitionVersion"
+}
+
+// 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 DeviceDefinitionVersion) MarshalJSON() ([]byte, error) {
+	type Properties DeviceDefinitionVersion
+	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 *DeviceDefinitionVersion) UnmarshalJSON(b []byte) error {
+	type Properties DeviceDefinitionVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DeviceDefinitionVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/greengrass/aws-greengrass-devicedefinitionversion_device.go b/goformation/cloudformation/greengrass/aws-greengrass-devicedefinitionversion_device.go
new file mode 100644
index 0000000000..6bbbe6f436
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-devicedefinitionversion_device.go
@@ -0,0 +1,52 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeviceDefinitionVersion_Device AWS CloudFormation Resource (AWS::Greengrass::DeviceDefinitionVersion.Device)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-devicedefinitionversion-device.html
+type DeviceDefinitionVersion_Device struct {
+
+	// CertificateArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-devicedefinitionversion-device.html#cfn-greengrass-devicedefinitionversion-device-certificatearn
+	CertificateArn *types.Value `json:"CertificateArn,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-devicedefinitionversion-device.html#cfn-greengrass-devicedefinitionversion-device-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// SyncShadow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-devicedefinitionversion-device.html#cfn-greengrass-devicedefinitionversion-device-syncshadow
+	SyncShadow *types.Value `json:"SyncShadow,omitempty"`
+
+	// ThingArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-devicedefinitionversion-device.html#cfn-greengrass-devicedefinitionversion-device-thingarn
+	ThingArn *types.Value `json:"ThingArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeviceDefinitionVersion_Device) AWSCloudFormationType() string {
+	return "AWS::Greengrass::DeviceDefinitionVersion.Device"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition.go b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition.go
new file mode 100644
index 0000000000..6c4718ea5e
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition.go
@@ -0,0 +1,118 @@
+package greengrass
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FunctionDefinition AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-functiondefinition.html
+type FunctionDefinition struct {
+
+	// InitialVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-functiondefinition.html#cfn-greengrass-functiondefinition-initialversion
+	InitialVersion *FunctionDefinition_FunctionDefinitionVersion `json:"InitialVersion,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-functiondefinition.html#cfn-greengrass-functiondefinition-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-functiondefinition.html#cfn-greengrass-functiondefinition-tags
+	Tags interface{} `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 *FunctionDefinition) AWSCloudFormationType() string {
+	return "AWS::Greengrass::FunctionDefinition"
+}
+
+// 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 FunctionDefinition) MarshalJSON() ([]byte, error) {
+	type Properties FunctionDefinition
+	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 *FunctionDefinition) UnmarshalJSON(b []byte) error {
+	type Properties FunctionDefinition
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FunctionDefinition(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_defaultconfig.go b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_defaultconfig.go
new file mode 100644
index 0000000000..0d7ee530f3
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_defaultconfig.go
@@ -0,0 +1,35 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// FunctionDefinition_DefaultConfig AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinition.DefaultConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-defaultconfig.html
+type FunctionDefinition_DefaultConfig struct {
+
+	// Execution AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-defaultconfig.html#cfn-greengrass-functiondefinition-defaultconfig-execution
+	Execution *FunctionDefinition_Execution `json:"Execution,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FunctionDefinition_DefaultConfig) AWSCloudFormationType() string {
+	return "AWS::Greengrass::FunctionDefinition.DefaultConfig"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_environment.go b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_environment.go
new file mode 100644
index 0000000000..8b644e24c7
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_environment.go
@@ -0,0 +1,52 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FunctionDefinition_Environment AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinition.Environment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-environment.html
+type FunctionDefinition_Environment struct {
+
+	// AccessSysfs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-environment.html#cfn-greengrass-functiondefinition-environment-accesssysfs
+	AccessSysfs *types.Value `json:"AccessSysfs,omitempty"`
+
+	// Execution AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-environment.html#cfn-greengrass-functiondefinition-environment-execution
+	Execution *FunctionDefinition_Execution `json:"Execution,omitempty"`
+
+	// ResourceAccessPolicies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-environment.html#cfn-greengrass-functiondefinition-environment-resourceaccesspolicies
+	ResourceAccessPolicies []FunctionDefinition_ResourceAccessPolicy `json:"ResourceAccessPolicies,omitempty"`
+
+	// Variables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-environment.html#cfn-greengrass-functiondefinition-environment-variables
+	Variables interface{} `json:"Variables,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FunctionDefinition_Environment) AWSCloudFormationType() string {
+	return "AWS::Greengrass::FunctionDefinition.Environment"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_execution.go b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_execution.go
new file mode 100644
index 0000000000..9bdc47218c
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_execution.go
@@ -0,0 +1,42 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FunctionDefinition_Execution AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinition.Execution)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-execution.html
+type FunctionDefinition_Execution struct {
+
+	// IsolationMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-execution.html#cfn-greengrass-functiondefinition-execution-isolationmode
+	IsolationMode *types.Value `json:"IsolationMode,omitempty"`
+
+	// RunAs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-execution.html#cfn-greengrass-functiondefinition-execution-runas
+	RunAs *FunctionDefinition_RunAs `json:"RunAs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FunctionDefinition_Execution) AWSCloudFormationType() string {
+	return "AWS::Greengrass::FunctionDefinition.Execution"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_function.go b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_function.go
new file mode 100644
index 0000000000..861d3b5e53
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_function.go
@@ -0,0 +1,47 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FunctionDefinition_Function AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinition.Function)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-function.html
+type FunctionDefinition_Function struct {
+
+	// FunctionArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-function.html#cfn-greengrass-functiondefinition-function-functionarn
+	FunctionArn *types.Value `json:"FunctionArn,omitempty"`
+
+	// FunctionConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-function.html#cfn-greengrass-functiondefinition-function-functionconfiguration
+	FunctionConfiguration *FunctionDefinition_FunctionConfiguration `json:"FunctionConfiguration,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-function.html#cfn-greengrass-functiondefinition-function-id
+	Id *types.Value `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 *FunctionDefinition_Function) AWSCloudFormationType() string {
+	return "AWS::Greengrass::FunctionDefinition.Function"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_functionconfiguration.go b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_functionconfiguration.go
new file mode 100644
index 0000000000..9e8b75fa2b
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_functionconfiguration.go
@@ -0,0 +1,67 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FunctionDefinition_FunctionConfiguration AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinition.FunctionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-functionconfiguration.html
+type FunctionDefinition_FunctionConfiguration struct {
+
+	// EncodingType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-functionconfiguration.html#cfn-greengrass-functiondefinition-functionconfiguration-encodingtype
+	EncodingType *types.Value `json:"EncodingType,omitempty"`
+
+	// Environment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-functionconfiguration.html#cfn-greengrass-functiondefinition-functionconfiguration-environment
+	Environment *FunctionDefinition_Environment `json:"Environment,omitempty"`
+
+	// ExecArgs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-functionconfiguration.html#cfn-greengrass-functiondefinition-functionconfiguration-execargs
+	ExecArgs *types.Value `json:"ExecArgs,omitempty"`
+
+	// Executable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-functionconfiguration.html#cfn-greengrass-functiondefinition-functionconfiguration-executable
+	Executable *types.Value `json:"Executable,omitempty"`
+
+	// MemorySize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-functionconfiguration.html#cfn-greengrass-functiondefinition-functionconfiguration-memorysize
+	MemorySize *types.Value `json:"MemorySize,omitempty"`
+
+	// Pinned AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-functionconfiguration.html#cfn-greengrass-functiondefinition-functionconfiguration-pinned
+	Pinned *types.Value `json:"Pinned,omitempty"`
+
+	// Timeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-functionconfiguration.html#cfn-greengrass-functiondefinition-functionconfiguration-timeout
+	Timeout *types.Value `json:"Timeout,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FunctionDefinition_FunctionConfiguration) AWSCloudFormationType() string {
+	return "AWS::Greengrass::FunctionDefinition.FunctionConfiguration"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_functiondefinitionversion.go b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_functiondefinitionversion.go
new file mode 100644
index 0000000000..43e8d165f2
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_functiondefinitionversion.go
@@ -0,0 +1,40 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// FunctionDefinition_FunctionDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinition.FunctionDefinitionVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-functiondefinitionversion.html
+type FunctionDefinition_FunctionDefinitionVersion struct {
+
+	// DefaultConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-functiondefinitionversion.html#cfn-greengrass-functiondefinition-functiondefinitionversion-defaultconfig
+	DefaultConfig *FunctionDefinition_DefaultConfig `json:"DefaultConfig,omitempty"`
+
+	// Functions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-functiondefinitionversion.html#cfn-greengrass-functiondefinition-functiondefinitionversion-functions
+	Functions []FunctionDefinition_Function `json:"Functions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FunctionDefinition_FunctionDefinitionVersion) AWSCloudFormationType() string {
+	return "AWS::Greengrass::FunctionDefinition.FunctionDefinitionVersion"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_resourceaccesspolicy.go b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_resourceaccesspolicy.go
new file mode 100644
index 0000000000..5360d4cbee
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_resourceaccesspolicy.go
@@ -0,0 +1,42 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FunctionDefinition_ResourceAccessPolicy AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinition.ResourceAccessPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-resourceaccesspolicy.html
+type FunctionDefinition_ResourceAccessPolicy struct {
+
+	// Permission AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-resourceaccesspolicy.html#cfn-greengrass-functiondefinition-resourceaccesspolicy-permission
+	Permission *types.Value `json:"Permission,omitempty"`
+
+	// ResourceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-resourceaccesspolicy.html#cfn-greengrass-functiondefinition-resourceaccesspolicy-resourceid
+	ResourceId *types.Value `json:"ResourceId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FunctionDefinition_ResourceAccessPolicy) AWSCloudFormationType() string {
+	return "AWS::Greengrass::FunctionDefinition.ResourceAccessPolicy"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_runas.go b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_runas.go
new file mode 100644
index 0000000000..c961da02dc
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinition_runas.go
@@ -0,0 +1,42 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FunctionDefinition_RunAs AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinition.RunAs)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-runas.html
+type FunctionDefinition_RunAs struct {
+
+	// Gid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-runas.html#cfn-greengrass-functiondefinition-runas-gid
+	Gid *types.Value `json:"Gid,omitempty"`
+
+	// Uid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinition-runas.html#cfn-greengrass-functiondefinition-runas-uid
+	Uid *types.Value `json:"Uid,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FunctionDefinition_RunAs) AWSCloudFormationType() string {
+	return "AWS::Greengrass::FunctionDefinition.RunAs"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion.go b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion.go
new file mode 100644
index 0000000000..6d77b966c7
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion.go
@@ -0,0 +1,118 @@
+package greengrass
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FunctionDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinitionVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-functiondefinitionversion.html
+type FunctionDefinitionVersion struct {
+
+	// DefaultConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-functiondefinitionversion.html#cfn-greengrass-functiondefinitionversion-defaultconfig
+	DefaultConfig *FunctionDefinitionVersion_DefaultConfig `json:"DefaultConfig,omitempty"`
+
+	// FunctionDefinitionId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-functiondefinitionversion.html#cfn-greengrass-functiondefinitionversion-functiondefinitionid
+	FunctionDefinitionId *types.Value `json:"FunctionDefinitionId,omitempty"`
+
+	// Functions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-functiondefinitionversion.html#cfn-greengrass-functiondefinitionversion-functions
+	Functions []FunctionDefinitionVersion_Function `json:"Functions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FunctionDefinitionVersion) AWSCloudFormationType() string {
+	return "AWS::Greengrass::FunctionDefinitionVersion"
+}
+
+// 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 FunctionDefinitionVersion) MarshalJSON() ([]byte, error) {
+	type Properties FunctionDefinitionVersion
+	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 *FunctionDefinitionVersion) UnmarshalJSON(b []byte) error {
+	type Properties FunctionDefinitionVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FunctionDefinitionVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_defaultconfig.go b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_defaultconfig.go
new file mode 100644
index 0000000000..ae5d1dc74e
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_defaultconfig.go
@@ -0,0 +1,35 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// FunctionDefinitionVersion_DefaultConfig AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinitionVersion.DefaultConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-defaultconfig.html
+type FunctionDefinitionVersion_DefaultConfig struct {
+
+	// Execution AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-defaultconfig.html#cfn-greengrass-functiondefinitionversion-defaultconfig-execution
+	Execution *FunctionDefinitionVersion_Execution `json:"Execution,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FunctionDefinitionVersion_DefaultConfig) AWSCloudFormationType() string {
+	return "AWS::Greengrass::FunctionDefinitionVersion.DefaultConfig"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_environment.go b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_environment.go
new file mode 100644
index 0000000000..73e5c52311
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_environment.go
@@ -0,0 +1,52 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FunctionDefinitionVersion_Environment AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinitionVersion.Environment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-environment.html
+type FunctionDefinitionVersion_Environment struct {
+
+	// AccessSysfs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-environment.html#cfn-greengrass-functiondefinitionversion-environment-accesssysfs
+	AccessSysfs *types.Value `json:"AccessSysfs,omitempty"`
+
+	// Execution AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-environment.html#cfn-greengrass-functiondefinitionversion-environment-execution
+	Execution *FunctionDefinitionVersion_Execution `json:"Execution,omitempty"`
+
+	// ResourceAccessPolicies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-environment.html#cfn-greengrass-functiondefinitionversion-environment-resourceaccesspolicies
+	ResourceAccessPolicies []FunctionDefinitionVersion_ResourceAccessPolicy `json:"ResourceAccessPolicies,omitempty"`
+
+	// Variables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-environment.html#cfn-greengrass-functiondefinitionversion-environment-variables
+	Variables interface{} `json:"Variables,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FunctionDefinitionVersion_Environment) AWSCloudFormationType() string {
+	return "AWS::Greengrass::FunctionDefinitionVersion.Environment"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_execution.go b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_execution.go
new file mode 100644
index 0000000000..9305d88700
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_execution.go
@@ -0,0 +1,42 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FunctionDefinitionVersion_Execution AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinitionVersion.Execution)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-execution.html
+type FunctionDefinitionVersion_Execution struct {
+
+	// IsolationMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-execution.html#cfn-greengrass-functiondefinitionversion-execution-isolationmode
+	IsolationMode *types.Value `json:"IsolationMode,omitempty"`
+
+	// RunAs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-execution.html#cfn-greengrass-functiondefinitionversion-execution-runas
+	RunAs *FunctionDefinitionVersion_RunAs `json:"RunAs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FunctionDefinitionVersion_Execution) AWSCloudFormationType() string {
+	return "AWS::Greengrass::FunctionDefinitionVersion.Execution"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_function.go b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_function.go
new file mode 100644
index 0000000000..8531e884e4
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_function.go
@@ -0,0 +1,47 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FunctionDefinitionVersion_Function AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinitionVersion.Function)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-function.html
+type FunctionDefinitionVersion_Function struct {
+
+	// FunctionArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-function.html#cfn-greengrass-functiondefinitionversion-function-functionarn
+	FunctionArn *types.Value `json:"FunctionArn,omitempty"`
+
+	// FunctionConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-function.html#cfn-greengrass-functiondefinitionversion-function-functionconfiguration
+	FunctionConfiguration *FunctionDefinitionVersion_FunctionConfiguration `json:"FunctionConfiguration,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-function.html#cfn-greengrass-functiondefinitionversion-function-id
+	Id *types.Value `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 *FunctionDefinitionVersion_Function) AWSCloudFormationType() string {
+	return "AWS::Greengrass::FunctionDefinitionVersion.Function"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_functionconfiguration.go b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_functionconfiguration.go
new file mode 100644
index 0000000000..473cceb9b3
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_functionconfiguration.go
@@ -0,0 +1,67 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FunctionDefinitionVersion_FunctionConfiguration AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinitionVersion.FunctionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-functionconfiguration.html
+type FunctionDefinitionVersion_FunctionConfiguration struct {
+
+	// EncodingType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-functionconfiguration.html#cfn-greengrass-functiondefinitionversion-functionconfiguration-encodingtype
+	EncodingType *types.Value `json:"EncodingType,omitempty"`
+
+	// Environment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-functionconfiguration.html#cfn-greengrass-functiondefinitionversion-functionconfiguration-environment
+	Environment *FunctionDefinitionVersion_Environment `json:"Environment,omitempty"`
+
+	// ExecArgs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-functionconfiguration.html#cfn-greengrass-functiondefinitionversion-functionconfiguration-execargs
+	ExecArgs *types.Value `json:"ExecArgs,omitempty"`
+
+	// Executable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-functionconfiguration.html#cfn-greengrass-functiondefinitionversion-functionconfiguration-executable
+	Executable *types.Value `json:"Executable,omitempty"`
+
+	// MemorySize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-functionconfiguration.html#cfn-greengrass-functiondefinitionversion-functionconfiguration-memorysize
+	MemorySize *types.Value `json:"MemorySize,omitempty"`
+
+	// Pinned AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-functionconfiguration.html#cfn-greengrass-functiondefinitionversion-functionconfiguration-pinned
+	Pinned *types.Value `json:"Pinned,omitempty"`
+
+	// Timeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-functionconfiguration.html#cfn-greengrass-functiondefinitionversion-functionconfiguration-timeout
+	Timeout *types.Value `json:"Timeout,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FunctionDefinitionVersion_FunctionConfiguration) AWSCloudFormationType() string {
+	return "AWS::Greengrass::FunctionDefinitionVersion.FunctionConfiguration"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_resourceaccesspolicy.go b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_resourceaccesspolicy.go
new file mode 100644
index 0000000000..c9ab36de07
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_resourceaccesspolicy.go
@@ -0,0 +1,42 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FunctionDefinitionVersion_ResourceAccessPolicy AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinitionVersion.ResourceAccessPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-resourceaccesspolicy.html
+type FunctionDefinitionVersion_ResourceAccessPolicy struct {
+
+	// Permission AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-resourceaccesspolicy.html#cfn-greengrass-functiondefinitionversion-resourceaccesspolicy-permission
+	Permission *types.Value `json:"Permission,omitempty"`
+
+	// ResourceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-resourceaccesspolicy.html#cfn-greengrass-functiondefinitionversion-resourceaccesspolicy-resourceid
+	ResourceId *types.Value `json:"ResourceId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FunctionDefinitionVersion_ResourceAccessPolicy) AWSCloudFormationType() string {
+	return "AWS::Greengrass::FunctionDefinitionVersion.ResourceAccessPolicy"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_runas.go b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_runas.go
new file mode 100644
index 0000000000..8f76751a60
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-functiondefinitionversion_runas.go
@@ -0,0 +1,42 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FunctionDefinitionVersion_RunAs AWS CloudFormation Resource (AWS::Greengrass::FunctionDefinitionVersion.RunAs)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-runas.html
+type FunctionDefinitionVersion_RunAs struct {
+
+	// Gid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-runas.html#cfn-greengrass-functiondefinitionversion-runas-gid
+	Gid *types.Value `json:"Gid,omitempty"`
+
+	// Uid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-functiondefinitionversion-runas.html#cfn-greengrass-functiondefinitionversion-runas-uid
+	Uid *types.Value `json:"Uid,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FunctionDefinitionVersion_RunAs) AWSCloudFormationType() string {
+	return "AWS::Greengrass::FunctionDefinitionVersion.RunAs"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-group.go b/goformation/cloudformation/greengrass/aws-greengrass-group.go
new file mode 100644
index 0000000000..15d61b3863
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-group.go
@@ -0,0 +1,123 @@
+package greengrass
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Group AWS CloudFormation Resource (AWS::Greengrass::Group)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-group.html
+type Group struct {
+
+	// InitialVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-group.html#cfn-greengrass-group-initialversion
+	InitialVersion *Group_GroupVersion `json:"InitialVersion,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-group.html#cfn-greengrass-group-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-group.html#cfn-greengrass-group-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-group.html#cfn-greengrass-group-tags
+	Tags interface{} `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 *Group) AWSCloudFormationType() string {
+	return "AWS::Greengrass::Group"
+}
+
+// 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 Group) MarshalJSON() ([]byte, error) {
+	type Properties Group
+	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 *Group) UnmarshalJSON(b []byte) error {
+	type Properties Group
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Group(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/greengrass/aws-greengrass-group_groupversion.go b/goformation/cloudformation/greengrass/aws-greengrass-group_groupversion.go
new file mode 100644
index 0000000000..fcb01b7ee4
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-group_groupversion.go
@@ -0,0 +1,67 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Group_GroupVersion AWS CloudFormation Resource (AWS::Greengrass::Group.GroupVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-group-groupversion.html
+type Group_GroupVersion struct {
+
+	// ConnectorDefinitionVersionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-group-groupversion.html#cfn-greengrass-group-groupversion-connectordefinitionversionarn
+	ConnectorDefinitionVersionArn *types.Value `json:"ConnectorDefinitionVersionArn,omitempty"`
+
+	// CoreDefinitionVersionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-group-groupversion.html#cfn-greengrass-group-groupversion-coredefinitionversionarn
+	CoreDefinitionVersionArn *types.Value `json:"CoreDefinitionVersionArn,omitempty"`
+
+	// DeviceDefinitionVersionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-group-groupversion.html#cfn-greengrass-group-groupversion-devicedefinitionversionarn
+	DeviceDefinitionVersionArn *types.Value `json:"DeviceDefinitionVersionArn,omitempty"`
+
+	// FunctionDefinitionVersionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-group-groupversion.html#cfn-greengrass-group-groupversion-functiondefinitionversionarn
+	FunctionDefinitionVersionArn *types.Value `json:"FunctionDefinitionVersionArn,omitempty"`
+
+	// LoggerDefinitionVersionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-group-groupversion.html#cfn-greengrass-group-groupversion-loggerdefinitionversionarn
+	LoggerDefinitionVersionArn *types.Value `json:"LoggerDefinitionVersionArn,omitempty"`
+
+	// ResourceDefinitionVersionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-group-groupversion.html#cfn-greengrass-group-groupversion-resourcedefinitionversionarn
+	ResourceDefinitionVersionArn *types.Value `json:"ResourceDefinitionVersionArn,omitempty"`
+
+	// SubscriptionDefinitionVersionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-group-groupversion.html#cfn-greengrass-group-groupversion-subscriptiondefinitionversionarn
+	SubscriptionDefinitionVersionArn *types.Value `json:"SubscriptionDefinitionVersionArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Group_GroupVersion) AWSCloudFormationType() string {
+	return "AWS::Greengrass::Group.GroupVersion"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-groupversion.go b/goformation/cloudformation/greengrass/aws-greengrass-groupversion.go
new file mode 100644
index 0000000000..cf9f13d15e
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-groupversion.go
@@ -0,0 +1,143 @@
+package greengrass
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GroupVersion AWS CloudFormation Resource (AWS::Greengrass::GroupVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-groupversion.html
+type GroupVersion struct {
+
+	// ConnectorDefinitionVersionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-groupversion.html#cfn-greengrass-groupversion-connectordefinitionversionarn
+	ConnectorDefinitionVersionArn *types.Value `json:"ConnectorDefinitionVersionArn,omitempty"`
+
+	// CoreDefinitionVersionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-groupversion.html#cfn-greengrass-groupversion-coredefinitionversionarn
+	CoreDefinitionVersionArn *types.Value `json:"CoreDefinitionVersionArn,omitempty"`
+
+	// DeviceDefinitionVersionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-groupversion.html#cfn-greengrass-groupversion-devicedefinitionversionarn
+	DeviceDefinitionVersionArn *types.Value `json:"DeviceDefinitionVersionArn,omitempty"`
+
+	// FunctionDefinitionVersionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-groupversion.html#cfn-greengrass-groupversion-functiondefinitionversionarn
+	FunctionDefinitionVersionArn *types.Value `json:"FunctionDefinitionVersionArn,omitempty"`
+
+	// GroupId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-groupversion.html#cfn-greengrass-groupversion-groupid
+	GroupId *types.Value `json:"GroupId,omitempty"`
+
+	// LoggerDefinitionVersionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-groupversion.html#cfn-greengrass-groupversion-loggerdefinitionversionarn
+	LoggerDefinitionVersionArn *types.Value `json:"LoggerDefinitionVersionArn,omitempty"`
+
+	// ResourceDefinitionVersionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-groupversion.html#cfn-greengrass-groupversion-resourcedefinitionversionarn
+	ResourceDefinitionVersionArn *types.Value `json:"ResourceDefinitionVersionArn,omitempty"`
+
+	// SubscriptionDefinitionVersionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-groupversion.html#cfn-greengrass-groupversion-subscriptiondefinitionversionarn
+	SubscriptionDefinitionVersionArn *types.Value `json:"SubscriptionDefinitionVersionArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GroupVersion) AWSCloudFormationType() string {
+	return "AWS::Greengrass::GroupVersion"
+}
+
+// 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 GroupVersion) MarshalJSON() ([]byte, error) {
+	type Properties GroupVersion
+	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 *GroupVersion) UnmarshalJSON(b []byte) error {
+	type Properties GroupVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = GroupVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition.go b/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition.go
new file mode 100644
index 0000000000..bd274614df
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition.go
@@ -0,0 +1,118 @@
+package greengrass
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoggerDefinition AWS CloudFormation Resource (AWS::Greengrass::LoggerDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-loggerdefinition.html
+type LoggerDefinition struct {
+
+	// InitialVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-loggerdefinition.html#cfn-greengrass-loggerdefinition-initialversion
+	InitialVersion *LoggerDefinition_LoggerDefinitionVersion `json:"InitialVersion,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-loggerdefinition.html#cfn-greengrass-loggerdefinition-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-loggerdefinition.html#cfn-greengrass-loggerdefinition-tags
+	Tags interface{} `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 *LoggerDefinition) AWSCloudFormationType() string {
+	return "AWS::Greengrass::LoggerDefinition"
+}
+
+// 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 LoggerDefinition) MarshalJSON() ([]byte, error) {
+	type Properties LoggerDefinition
+	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 *LoggerDefinition) UnmarshalJSON(b []byte) error {
+	type Properties LoggerDefinition
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LoggerDefinition(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition_logger.go b/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition_logger.go
new file mode 100644
index 0000000000..c09029deb4
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition_logger.go
@@ -0,0 +1,57 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoggerDefinition_Logger AWS CloudFormation Resource (AWS::Greengrass::LoggerDefinition.Logger)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-loggerdefinition-logger.html
+type LoggerDefinition_Logger struct {
+
+	// Component AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-loggerdefinition-logger.html#cfn-greengrass-loggerdefinition-logger-component
+	Component *types.Value `json:"Component,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-loggerdefinition-logger.html#cfn-greengrass-loggerdefinition-logger-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Level AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-loggerdefinition-logger.html#cfn-greengrass-loggerdefinition-logger-level
+	Level *types.Value `json:"Level,omitempty"`
+
+	// Space AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-loggerdefinition-logger.html#cfn-greengrass-loggerdefinition-logger-space
+	Space *types.Value `json:"Space,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-loggerdefinition-logger.html#cfn-greengrass-loggerdefinition-logger-type
+	Type *types.Value `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 *LoggerDefinition_Logger) AWSCloudFormationType() string {
+	return "AWS::Greengrass::LoggerDefinition.Logger"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition_loggerdefinitionversion.go b/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition_loggerdefinitionversion.go
new file mode 100644
index 0000000000..72cb825f2f
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinition_loggerdefinitionversion.go
@@ -0,0 +1,35 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoggerDefinition_LoggerDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::LoggerDefinition.LoggerDefinitionVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-loggerdefinition-loggerdefinitionversion.html
+type LoggerDefinition_LoggerDefinitionVersion struct {
+
+	// Loggers AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-loggerdefinition-loggerdefinitionversion.html#cfn-greengrass-loggerdefinition-loggerdefinitionversion-loggers
+	Loggers []LoggerDefinition_Logger `json:"Loggers,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LoggerDefinition_LoggerDefinitionVersion) AWSCloudFormationType() string {
+	return "AWS::Greengrass::LoggerDefinition.LoggerDefinitionVersion"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion.go b/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion.go
new file mode 100644
index 0000000000..775db0cff6
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion.go
@@ -0,0 +1,113 @@
+package greengrass
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoggerDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::LoggerDefinitionVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-loggerdefinitionversion.html
+type LoggerDefinitionVersion struct {
+
+	// LoggerDefinitionId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-loggerdefinitionversion.html#cfn-greengrass-loggerdefinitionversion-loggerdefinitionid
+	LoggerDefinitionId *types.Value `json:"LoggerDefinitionId,omitempty"`
+
+	// Loggers AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-loggerdefinitionversion.html#cfn-greengrass-loggerdefinitionversion-loggers
+	Loggers []LoggerDefinitionVersion_Logger `json:"Loggers,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LoggerDefinitionVersion) AWSCloudFormationType() string {
+	return "AWS::Greengrass::LoggerDefinitionVersion"
+}
+
+// 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 LoggerDefinitionVersion) MarshalJSON() ([]byte, error) {
+	type Properties LoggerDefinitionVersion
+	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 *LoggerDefinitionVersion) UnmarshalJSON(b []byte) error {
+	type Properties LoggerDefinitionVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LoggerDefinitionVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion_logger.go b/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion_logger.go
new file mode 100644
index 0000000000..99e74c8921
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-loggerdefinitionversion_logger.go
@@ -0,0 +1,57 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoggerDefinitionVersion_Logger AWS CloudFormation Resource (AWS::Greengrass::LoggerDefinitionVersion.Logger)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-loggerdefinitionversion-logger.html
+type LoggerDefinitionVersion_Logger struct {
+
+	// Component AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-loggerdefinitionversion-logger.html#cfn-greengrass-loggerdefinitionversion-logger-component
+	Component *types.Value `json:"Component,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-loggerdefinitionversion-logger.html#cfn-greengrass-loggerdefinitionversion-logger-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Level AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-loggerdefinitionversion-logger.html#cfn-greengrass-loggerdefinitionversion-logger-level
+	Level *types.Value `json:"Level,omitempty"`
+
+	// Space AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-loggerdefinitionversion-logger.html#cfn-greengrass-loggerdefinitionversion-logger-space
+	Space *types.Value `json:"Space,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-loggerdefinitionversion-logger.html#cfn-greengrass-loggerdefinitionversion-logger-type
+	Type *types.Value `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 *LoggerDefinitionVersion_Logger) AWSCloudFormationType() string {
+	return "AWS::Greengrass::LoggerDefinitionVersion.Logger"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition.go
new file mode 100644
index 0000000000..3cd9fbb699
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition.go
@@ -0,0 +1,118 @@
+package greengrass
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinition AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-resourcedefinition.html
+type ResourceDefinition struct {
+
+	// InitialVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-resourcedefinition.html#cfn-greengrass-resourcedefinition-initialversion
+	InitialVersion *ResourceDefinition_ResourceDefinitionVersion `json:"InitialVersion,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-resourcedefinition.html#cfn-greengrass-resourcedefinition-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-resourcedefinition.html#cfn-greengrass-resourcedefinition-tags
+	Tags interface{} `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 *ResourceDefinition) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinition"
+}
+
+// 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 ResourceDefinition) MarshalJSON() ([]byte, error) {
+	type Properties ResourceDefinition
+	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 *ResourceDefinition) UnmarshalJSON(b []byte) error {
+	type Properties ResourceDefinition
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResourceDefinition(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_groupownersetting.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_groupownersetting.go
new file mode 100644
index 0000000000..4cdd2d175b
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_groupownersetting.go
@@ -0,0 +1,42 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinition_GroupOwnerSetting AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition.GroupOwnerSetting)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-groupownersetting.html
+type ResourceDefinition_GroupOwnerSetting struct {
+
+	// AutoAddGroupOwner AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-groupownersetting.html#cfn-greengrass-resourcedefinition-groupownersetting-autoaddgroupowner
+	AutoAddGroupOwner *types.Value `json:"AutoAddGroupOwner"`
+
+	// GroupOwner AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-groupownersetting.html#cfn-greengrass-resourcedefinition-groupownersetting-groupowner
+	GroupOwner *types.Value `json:"GroupOwner,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefinition_GroupOwnerSetting) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinition.GroupOwnerSetting"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_localdeviceresourcedata.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_localdeviceresourcedata.go
new file mode 100644
index 0000000000..71f980c5fb
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_localdeviceresourcedata.go
@@ -0,0 +1,42 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinition_LocalDeviceResourceData AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition.LocalDeviceResourceData)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-localdeviceresourcedata.html
+type ResourceDefinition_LocalDeviceResourceData struct {
+
+	// GroupOwnerSetting AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-localdeviceresourcedata.html#cfn-greengrass-resourcedefinition-localdeviceresourcedata-groupownersetting
+	GroupOwnerSetting *ResourceDefinition_GroupOwnerSetting `json:"GroupOwnerSetting,omitempty"`
+
+	// SourcePath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-localdeviceresourcedata.html#cfn-greengrass-resourcedefinition-localdeviceresourcedata-sourcepath
+	SourcePath *types.Value `json:"SourcePath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefinition_LocalDeviceResourceData) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinition.LocalDeviceResourceData"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_localvolumeresourcedata.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_localvolumeresourcedata.go
new file mode 100644
index 0000000000..4e9ea889ca
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_localvolumeresourcedata.go
@@ -0,0 +1,47 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinition_LocalVolumeResourceData AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition.LocalVolumeResourceData)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-localvolumeresourcedata.html
+type ResourceDefinition_LocalVolumeResourceData struct {
+
+	// DestinationPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-localvolumeresourcedata.html#cfn-greengrass-resourcedefinition-localvolumeresourcedata-destinationpath
+	DestinationPath *types.Value `json:"DestinationPath,omitempty"`
+
+	// GroupOwnerSetting AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-localvolumeresourcedata.html#cfn-greengrass-resourcedefinition-localvolumeresourcedata-groupownersetting
+	GroupOwnerSetting *ResourceDefinition_GroupOwnerSetting `json:"GroupOwnerSetting,omitempty"`
+
+	// SourcePath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-localvolumeresourcedata.html#cfn-greengrass-resourcedefinition-localvolumeresourcedata-sourcepath
+	SourcePath *types.Value `json:"SourcePath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefinition_LocalVolumeResourceData) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinition.LocalVolumeResourceData"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedatacontainer.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedatacontainer.go
new file mode 100644
index 0000000000..82876c2487
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedatacontainer.go
@@ -0,0 +1,55 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinition_ResourceDataContainer AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition.ResourceDataContainer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-resourcedatacontainer.html
+type ResourceDefinition_ResourceDataContainer struct {
+
+	// LocalDeviceResourceData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-resourcedatacontainer.html#cfn-greengrass-resourcedefinition-resourcedatacontainer-localdeviceresourcedata
+	LocalDeviceResourceData *ResourceDefinition_LocalDeviceResourceData `json:"LocalDeviceResourceData,omitempty"`
+
+	// LocalVolumeResourceData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-resourcedatacontainer.html#cfn-greengrass-resourcedefinition-resourcedatacontainer-localvolumeresourcedata
+	LocalVolumeResourceData *ResourceDefinition_LocalVolumeResourceData `json:"LocalVolumeResourceData,omitempty"`
+
+	// S3MachineLearningModelResourceData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-resourcedatacontainer.html#cfn-greengrass-resourcedefinition-resourcedatacontainer-s3machinelearningmodelresourcedata
+	S3MachineLearningModelResourceData *ResourceDefinition_S3MachineLearningModelResourceData `json:"S3MachineLearningModelResourceData,omitempty"`
+
+	// SageMakerMachineLearningModelResourceData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-resourcedatacontainer.html#cfn-greengrass-resourcedefinition-resourcedatacontainer-sagemakermachinelearningmodelresourcedata
+	SageMakerMachineLearningModelResourceData *ResourceDefinition_SageMakerMachineLearningModelResourceData `json:"SageMakerMachineLearningModelResourceData,omitempty"`
+
+	// SecretsManagerSecretResourceData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-resourcedatacontainer.html#cfn-greengrass-resourcedefinition-resourcedatacontainer-secretsmanagersecretresourcedata
+	SecretsManagerSecretResourceData *ResourceDefinition_SecretsManagerSecretResourceData `json:"SecretsManagerSecretResourceData,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefinition_ResourceDataContainer) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinition.ResourceDataContainer"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedefinitionversion.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedefinitionversion.go
new file mode 100644
index 0000000000..7f00c1d2fd
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedefinitionversion.go
@@ -0,0 +1,35 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinition_ResourceDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition.ResourceDefinitionVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-resourcedefinitionversion.html
+type ResourceDefinition_ResourceDefinitionVersion struct {
+
+	// Resources AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-resourcedefinitionversion.html#cfn-greengrass-resourcedefinition-resourcedefinitionversion-resources
+	Resources []ResourceDefinition_ResourceInstance `json:"Resources,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefinition_ResourceDefinitionVersion) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinition.ResourceDefinitionVersion"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedownloadownersetting.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedownloadownersetting.go
new file mode 100644
index 0000000000..00e0912ea1
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourcedownloadownersetting.go
@@ -0,0 +1,42 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinition_ResourceDownloadOwnerSetting AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition.ResourceDownloadOwnerSetting)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-resourcedownloadownersetting.html
+type ResourceDefinition_ResourceDownloadOwnerSetting struct {
+
+	// GroupOwner AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-resourcedownloadownersetting.html#cfn-greengrass-resourcedefinition-resourcedownloadownersetting-groupowner
+	GroupOwner *types.Value `json:"GroupOwner,omitempty"`
+
+	// GroupPermission AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-resourcedownloadownersetting.html#cfn-greengrass-resourcedefinition-resourcedownloadownersetting-grouppermission
+	GroupPermission *types.Value `json:"GroupPermission,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefinition_ResourceDownloadOwnerSetting) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinition.ResourceDownloadOwnerSetting"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourceinstance.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourceinstance.go
new file mode 100644
index 0000000000..9eabe0295a
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_resourceinstance.go
@@ -0,0 +1,47 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinition_ResourceInstance AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition.ResourceInstance)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-resourceinstance.html
+type ResourceDefinition_ResourceInstance struct {
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-resourceinstance.html#cfn-greengrass-resourcedefinition-resourceinstance-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-resourceinstance.html#cfn-greengrass-resourcedefinition-resourceinstance-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ResourceDataContainer AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-resourceinstance.html#cfn-greengrass-resourcedefinition-resourceinstance-resourcedatacontainer
+	ResourceDataContainer *ResourceDefinition_ResourceDataContainer `json:"ResourceDataContainer,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefinition_ResourceInstance) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinition.ResourceInstance"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_s3machinelearningmodelresourcedata.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_s3machinelearningmodelresourcedata.go
new file mode 100644
index 0000000000..2105d316d0
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_s3machinelearningmodelresourcedata.go
@@ -0,0 +1,47 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinition_S3MachineLearningModelResourceData AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition.S3MachineLearningModelResourceData)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-s3machinelearningmodelresourcedata.html
+type ResourceDefinition_S3MachineLearningModelResourceData struct {
+
+	// DestinationPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-s3machinelearningmodelresourcedata.html#cfn-greengrass-resourcedefinition-s3machinelearningmodelresourcedata-destinationpath
+	DestinationPath *types.Value `json:"DestinationPath,omitempty"`
+
+	// OwnerSetting AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-s3machinelearningmodelresourcedata.html#cfn-greengrass-resourcedefinition-s3machinelearningmodelresourcedata-ownersetting
+	OwnerSetting *ResourceDefinition_ResourceDownloadOwnerSetting `json:"OwnerSetting,omitempty"`
+
+	// S3Uri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-s3machinelearningmodelresourcedata.html#cfn-greengrass-resourcedefinition-s3machinelearningmodelresourcedata-s3uri
+	S3Uri *types.Value `json:"S3Uri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefinition_S3MachineLearningModelResourceData) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinition.S3MachineLearningModelResourceData"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_sagemakermachinelearningmodelresourcedata.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_sagemakermachinelearningmodelresourcedata.go
new file mode 100644
index 0000000000..de57216d9a
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_sagemakermachinelearningmodelresourcedata.go
@@ -0,0 +1,47 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinition_SageMakerMachineLearningModelResourceData AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition.SageMakerMachineLearningModelResourceData)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-sagemakermachinelearningmodelresourcedata.html
+type ResourceDefinition_SageMakerMachineLearningModelResourceData struct {
+
+	// DestinationPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-sagemakermachinelearningmodelresourcedata.html#cfn-greengrass-resourcedefinition-sagemakermachinelearningmodelresourcedata-destinationpath
+	DestinationPath *types.Value `json:"DestinationPath,omitempty"`
+
+	// OwnerSetting AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-sagemakermachinelearningmodelresourcedata.html#cfn-greengrass-resourcedefinition-sagemakermachinelearningmodelresourcedata-ownersetting
+	OwnerSetting *ResourceDefinition_ResourceDownloadOwnerSetting `json:"OwnerSetting,omitempty"`
+
+	// SageMakerJobArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-sagemakermachinelearningmodelresourcedata.html#cfn-greengrass-resourcedefinition-sagemakermachinelearningmodelresourcedata-sagemakerjobarn
+	SageMakerJobArn *types.Value `json:"SageMakerJobArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefinition_SageMakerMachineLearningModelResourceData) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinition.SageMakerMachineLearningModelResourceData"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_secretsmanagersecretresourcedata.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_secretsmanagersecretresourcedata.go
new file mode 100644
index 0000000000..c06b0481e2
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinition_secretsmanagersecretresourcedata.go
@@ -0,0 +1,42 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinition_SecretsManagerSecretResourceData AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinition.SecretsManagerSecretResourceData)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-secretsmanagersecretresourcedata.html
+type ResourceDefinition_SecretsManagerSecretResourceData struct {
+
+	// ARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-secretsmanagersecretresourcedata.html#cfn-greengrass-resourcedefinition-secretsmanagersecretresourcedata-arn
+	ARN *types.Value `json:"ARN,omitempty"`
+
+	// AdditionalStagingLabelsToDownload AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinition-secretsmanagersecretresourcedata.html#cfn-greengrass-resourcedefinition-secretsmanagersecretresourcedata-additionalstaginglabelstodownload
+	AdditionalStagingLabelsToDownload *types.Value `json:"AdditionalStagingLabelsToDownload,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefinition_SecretsManagerSecretResourceData) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinition.SecretsManagerSecretResourceData"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion.go
new file mode 100644
index 0000000000..53b1a915e6
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion.go
@@ -0,0 +1,113 @@
+package greengrass
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinitionVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-resourcedefinitionversion.html
+type ResourceDefinitionVersion struct {
+
+	// ResourceDefinitionId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-resourcedefinitionversion.html#cfn-greengrass-resourcedefinitionversion-resourcedefinitionid
+	ResourceDefinitionId *types.Value `json:"ResourceDefinitionId,omitempty"`
+
+	// Resources AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-resourcedefinitionversion.html#cfn-greengrass-resourcedefinitionversion-resources
+	Resources []ResourceDefinitionVersion_ResourceInstance `json:"Resources,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefinitionVersion) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinitionVersion"
+}
+
+// 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 ResourceDefinitionVersion) MarshalJSON() ([]byte, error) {
+	type Properties ResourceDefinitionVersion
+	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 *ResourceDefinitionVersion) UnmarshalJSON(b []byte) error {
+	type Properties ResourceDefinitionVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResourceDefinitionVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_groupownersetting.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_groupownersetting.go
new file mode 100644
index 0000000000..0582efb2f9
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_groupownersetting.go
@@ -0,0 +1,42 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinitionVersion_GroupOwnerSetting AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinitionVersion.GroupOwnerSetting)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-groupownersetting.html
+type ResourceDefinitionVersion_GroupOwnerSetting struct {
+
+	// AutoAddGroupOwner AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-groupownersetting.html#cfn-greengrass-resourcedefinitionversion-groupownersetting-autoaddgroupowner
+	AutoAddGroupOwner *types.Value `json:"AutoAddGroupOwner"`
+
+	// GroupOwner AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-groupownersetting.html#cfn-greengrass-resourcedefinitionversion-groupownersetting-groupowner
+	GroupOwner *types.Value `json:"GroupOwner,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefinitionVersion_GroupOwnerSetting) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinitionVersion.GroupOwnerSetting"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localdeviceresourcedata.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localdeviceresourcedata.go
new file mode 100644
index 0000000000..45c1a5d5a5
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localdeviceresourcedata.go
@@ -0,0 +1,42 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinitionVersion_LocalDeviceResourceData AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinitionVersion.LocalDeviceResourceData)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-localdeviceresourcedata.html
+type ResourceDefinitionVersion_LocalDeviceResourceData struct {
+
+	// GroupOwnerSetting AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-localdeviceresourcedata.html#cfn-greengrass-resourcedefinitionversion-localdeviceresourcedata-groupownersetting
+	GroupOwnerSetting *ResourceDefinitionVersion_GroupOwnerSetting `json:"GroupOwnerSetting,omitempty"`
+
+	// SourcePath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-localdeviceresourcedata.html#cfn-greengrass-resourcedefinitionversion-localdeviceresourcedata-sourcepath
+	SourcePath *types.Value `json:"SourcePath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefinitionVersion_LocalDeviceResourceData) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinitionVersion.LocalDeviceResourceData"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localvolumeresourcedata.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localvolumeresourcedata.go
new file mode 100644
index 0000000000..dfb64dde32
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_localvolumeresourcedata.go
@@ -0,0 +1,47 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinitionVersion_LocalVolumeResourceData AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinitionVersion.LocalVolumeResourceData)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-localvolumeresourcedata.html
+type ResourceDefinitionVersion_LocalVolumeResourceData struct {
+
+	// DestinationPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-localvolumeresourcedata.html#cfn-greengrass-resourcedefinitionversion-localvolumeresourcedata-destinationpath
+	DestinationPath *types.Value `json:"DestinationPath,omitempty"`
+
+	// GroupOwnerSetting AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-localvolumeresourcedata.html#cfn-greengrass-resourcedefinitionversion-localvolumeresourcedata-groupownersetting
+	GroupOwnerSetting *ResourceDefinitionVersion_GroupOwnerSetting `json:"GroupOwnerSetting,omitempty"`
+
+	// SourcePath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-localvolumeresourcedata.html#cfn-greengrass-resourcedefinitionversion-localvolumeresourcedata-sourcepath
+	SourcePath *types.Value `json:"SourcePath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefinitionVersion_LocalVolumeResourceData) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinitionVersion.LocalVolumeResourceData"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedatacontainer.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedatacontainer.go
new file mode 100644
index 0000000000..25153c5bff
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedatacontainer.go
@@ -0,0 +1,55 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinitionVersion_ResourceDataContainer AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinitionVersion.ResourceDataContainer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-resourcedatacontainer.html
+type ResourceDefinitionVersion_ResourceDataContainer struct {
+
+	// LocalDeviceResourceData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-resourcedatacontainer.html#cfn-greengrass-resourcedefinitionversion-resourcedatacontainer-localdeviceresourcedata
+	LocalDeviceResourceData *ResourceDefinitionVersion_LocalDeviceResourceData `json:"LocalDeviceResourceData,omitempty"`
+
+	// LocalVolumeResourceData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-resourcedatacontainer.html#cfn-greengrass-resourcedefinitionversion-resourcedatacontainer-localvolumeresourcedata
+	LocalVolumeResourceData *ResourceDefinitionVersion_LocalVolumeResourceData `json:"LocalVolumeResourceData,omitempty"`
+
+	// S3MachineLearningModelResourceData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-resourcedatacontainer.html#cfn-greengrass-resourcedefinitionversion-resourcedatacontainer-s3machinelearningmodelresourcedata
+	S3MachineLearningModelResourceData *ResourceDefinitionVersion_S3MachineLearningModelResourceData `json:"S3MachineLearningModelResourceData,omitempty"`
+
+	// SageMakerMachineLearningModelResourceData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-resourcedatacontainer.html#cfn-greengrass-resourcedefinitionversion-resourcedatacontainer-sagemakermachinelearningmodelresourcedata
+	SageMakerMachineLearningModelResourceData *ResourceDefinitionVersion_SageMakerMachineLearningModelResourceData `json:"SageMakerMachineLearningModelResourceData,omitempty"`
+
+	// SecretsManagerSecretResourceData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-resourcedatacontainer.html#cfn-greengrass-resourcedefinitionversion-resourcedatacontainer-secretsmanagersecretresourcedata
+	SecretsManagerSecretResourceData *ResourceDefinitionVersion_SecretsManagerSecretResourceData `json:"SecretsManagerSecretResourceData,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefinitionVersion_ResourceDataContainer) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinitionVersion.ResourceDataContainer"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedownloadownersetting.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedownloadownersetting.go
new file mode 100644
index 0000000000..deda6a97da
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourcedownloadownersetting.go
@@ -0,0 +1,42 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinitionVersion_ResourceDownloadOwnerSetting AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinitionVersion.ResourceDownloadOwnerSetting)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-resourcedownloadownersetting.html
+type ResourceDefinitionVersion_ResourceDownloadOwnerSetting struct {
+
+	// GroupOwner AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-resourcedownloadownersetting.html#cfn-greengrass-resourcedefinitionversion-resourcedownloadownersetting-groupowner
+	GroupOwner *types.Value `json:"GroupOwner,omitempty"`
+
+	// GroupPermission AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-resourcedownloadownersetting.html#cfn-greengrass-resourcedefinitionversion-resourcedownloadownersetting-grouppermission
+	GroupPermission *types.Value `json:"GroupPermission,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefinitionVersion_ResourceDownloadOwnerSetting) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinitionVersion.ResourceDownloadOwnerSetting"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourceinstance.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourceinstance.go
new file mode 100644
index 0000000000..0d22e98148
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_resourceinstance.go
@@ -0,0 +1,47 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinitionVersion_ResourceInstance AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinitionVersion.ResourceInstance)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-resourceinstance.html
+type ResourceDefinitionVersion_ResourceInstance struct {
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-resourceinstance.html#cfn-greengrass-resourcedefinitionversion-resourceinstance-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-resourceinstance.html#cfn-greengrass-resourcedefinitionversion-resourceinstance-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ResourceDataContainer AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-resourceinstance.html#cfn-greengrass-resourcedefinitionversion-resourceinstance-resourcedatacontainer
+	ResourceDataContainer *ResourceDefinitionVersion_ResourceDataContainer `json:"ResourceDataContainer,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefinitionVersion_ResourceInstance) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinitionVersion.ResourceInstance"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_s3machinelearningmodelresourcedata.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_s3machinelearningmodelresourcedata.go
new file mode 100644
index 0000000000..8b369d3f2f
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_s3machinelearningmodelresourcedata.go
@@ -0,0 +1,47 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinitionVersion_S3MachineLearningModelResourceData AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinitionVersion.S3MachineLearningModelResourceData)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-s3machinelearningmodelresourcedata.html
+type ResourceDefinitionVersion_S3MachineLearningModelResourceData struct {
+
+	// DestinationPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-s3machinelearningmodelresourcedata.html#cfn-greengrass-resourcedefinitionversion-s3machinelearningmodelresourcedata-destinationpath
+	DestinationPath *types.Value `json:"DestinationPath,omitempty"`
+
+	// OwnerSetting AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-s3machinelearningmodelresourcedata.html#cfn-greengrass-resourcedefinitionversion-s3machinelearningmodelresourcedata-ownersetting
+	OwnerSetting *ResourceDefinitionVersion_ResourceDownloadOwnerSetting `json:"OwnerSetting,omitempty"`
+
+	// S3Uri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-s3machinelearningmodelresourcedata.html#cfn-greengrass-resourcedefinitionversion-s3machinelearningmodelresourcedata-s3uri
+	S3Uri *types.Value `json:"S3Uri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefinitionVersion_S3MachineLearningModelResourceData) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinitionVersion.S3MachineLearningModelResourceData"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_sagemakermachinelearningmodelresourcedata.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_sagemakermachinelearningmodelresourcedata.go
new file mode 100644
index 0000000000..f9d5e78d8e
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_sagemakermachinelearningmodelresourcedata.go
@@ -0,0 +1,47 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinitionVersion_SageMakerMachineLearningModelResourceData AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinitionVersion.SageMakerMachineLearningModelResourceData)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-sagemakermachinelearningmodelresourcedata.html
+type ResourceDefinitionVersion_SageMakerMachineLearningModelResourceData struct {
+
+	// DestinationPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-sagemakermachinelearningmodelresourcedata.html#cfn-greengrass-resourcedefinitionversion-sagemakermachinelearningmodelresourcedata-destinationpath
+	DestinationPath *types.Value `json:"DestinationPath,omitempty"`
+
+	// OwnerSetting AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-sagemakermachinelearningmodelresourcedata.html#cfn-greengrass-resourcedefinitionversion-sagemakermachinelearningmodelresourcedata-ownersetting
+	OwnerSetting *ResourceDefinitionVersion_ResourceDownloadOwnerSetting `json:"OwnerSetting,omitempty"`
+
+	// SageMakerJobArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-sagemakermachinelearningmodelresourcedata.html#cfn-greengrass-resourcedefinitionversion-sagemakermachinelearningmodelresourcedata-sagemakerjobarn
+	SageMakerJobArn *types.Value `json:"SageMakerJobArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefinitionVersion_SageMakerMachineLearningModelResourceData) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinitionVersion.SageMakerMachineLearningModelResourceData"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_secretsmanagersecretresourcedata.go b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_secretsmanagersecretresourcedata.go
new file mode 100644
index 0000000000..472f6ade5b
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-resourcedefinitionversion_secretsmanagersecretresourcedata.go
@@ -0,0 +1,42 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDefinitionVersion_SecretsManagerSecretResourceData AWS CloudFormation Resource (AWS::Greengrass::ResourceDefinitionVersion.SecretsManagerSecretResourceData)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-secretsmanagersecretresourcedata.html
+type ResourceDefinitionVersion_SecretsManagerSecretResourceData struct {
+
+	// ARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-secretsmanagersecretresourcedata.html#cfn-greengrass-resourcedefinitionversion-secretsmanagersecretresourcedata-arn
+	ARN *types.Value `json:"ARN,omitempty"`
+
+	// AdditionalStagingLabelsToDownload AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-resourcedefinitionversion-secretsmanagersecretresourcedata.html#cfn-greengrass-resourcedefinitionversion-secretsmanagersecretresourcedata-additionalstaginglabelstodownload
+	AdditionalStagingLabelsToDownload *types.Value `json:"AdditionalStagingLabelsToDownload,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDefinitionVersion_SecretsManagerSecretResourceData) AWSCloudFormationType() string {
+	return "AWS::Greengrass::ResourceDefinitionVersion.SecretsManagerSecretResourceData"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition.go b/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition.go
new file mode 100644
index 0000000000..1ad9701b9c
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition.go
@@ -0,0 +1,118 @@
+package greengrass
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SubscriptionDefinition AWS CloudFormation Resource (AWS::Greengrass::SubscriptionDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-subscriptiondefinition.html
+type SubscriptionDefinition struct {
+
+	// InitialVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-subscriptiondefinition.html#cfn-greengrass-subscriptiondefinition-initialversion
+	InitialVersion *SubscriptionDefinition_SubscriptionDefinitionVersion `json:"InitialVersion,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-subscriptiondefinition.html#cfn-greengrass-subscriptiondefinition-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-subscriptiondefinition.html#cfn-greengrass-subscriptiondefinition-tags
+	Tags interface{} `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 *SubscriptionDefinition) AWSCloudFormationType() string {
+	return "AWS::Greengrass::SubscriptionDefinition"
+}
+
+// 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 SubscriptionDefinition) MarshalJSON() ([]byte, error) {
+	type Properties SubscriptionDefinition
+	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 *SubscriptionDefinition) UnmarshalJSON(b []byte) error {
+	type Properties SubscriptionDefinition
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SubscriptionDefinition(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscription.go b/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscription.go
new file mode 100644
index 0000000000..508442174b
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscription.go
@@ -0,0 +1,52 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SubscriptionDefinition_Subscription AWS CloudFormation Resource (AWS::Greengrass::SubscriptionDefinition.Subscription)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-subscriptiondefinition-subscription.html
+type SubscriptionDefinition_Subscription struct {
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-subscriptiondefinition-subscription.html#cfn-greengrass-subscriptiondefinition-subscription-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Source AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-subscriptiondefinition-subscription.html#cfn-greengrass-subscriptiondefinition-subscription-source
+	Source *types.Value `json:"Source,omitempty"`
+
+	// Subject AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-subscriptiondefinition-subscription.html#cfn-greengrass-subscriptiondefinition-subscription-subject
+	Subject *types.Value `json:"Subject,omitempty"`
+
+	// Target AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-subscriptiondefinition-subscription.html#cfn-greengrass-subscriptiondefinition-subscription-target
+	Target *types.Value `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 *SubscriptionDefinition_Subscription) AWSCloudFormationType() string {
+	return "AWS::Greengrass::SubscriptionDefinition.Subscription"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscriptiondefinitionversion.go b/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscriptiondefinitionversion.go
new file mode 100644
index 0000000000..0dcbf0736e
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinition_subscriptiondefinitionversion.go
@@ -0,0 +1,35 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// SubscriptionDefinition_SubscriptionDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::SubscriptionDefinition.SubscriptionDefinitionVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-subscriptiondefinition-subscriptiondefinitionversion.html
+type SubscriptionDefinition_SubscriptionDefinitionVersion struct {
+
+	// Subscriptions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-subscriptiondefinition-subscriptiondefinitionversion.html#cfn-greengrass-subscriptiondefinition-subscriptiondefinitionversion-subscriptions
+	Subscriptions []SubscriptionDefinition_Subscription `json:"Subscriptions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SubscriptionDefinition_SubscriptionDefinitionVersion) AWSCloudFormationType() string {
+	return "AWS::Greengrass::SubscriptionDefinition.SubscriptionDefinitionVersion"
+}
diff --git a/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion.go b/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion.go
new file mode 100644
index 0000000000..fda3b387ac
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion.go
@@ -0,0 +1,113 @@
+package greengrass
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SubscriptionDefinitionVersion AWS CloudFormation Resource (AWS::Greengrass::SubscriptionDefinitionVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-subscriptiondefinitionversion.html
+type SubscriptionDefinitionVersion struct {
+
+	// SubscriptionDefinitionId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-subscriptiondefinitionversion.html#cfn-greengrass-subscriptiondefinitionversion-subscriptiondefinitionid
+	SubscriptionDefinitionId *types.Value `json:"SubscriptionDefinitionId,omitempty"`
+
+	// Subscriptions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrass-subscriptiondefinitionversion.html#cfn-greengrass-subscriptiondefinitionversion-subscriptions
+	Subscriptions []SubscriptionDefinitionVersion_Subscription `json:"Subscriptions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SubscriptionDefinitionVersion) AWSCloudFormationType() string {
+	return "AWS::Greengrass::SubscriptionDefinitionVersion"
+}
+
+// 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 SubscriptionDefinitionVersion) MarshalJSON() ([]byte, error) {
+	type Properties SubscriptionDefinitionVersion
+	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 *SubscriptionDefinitionVersion) UnmarshalJSON(b []byte) error {
+	type Properties SubscriptionDefinitionVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SubscriptionDefinitionVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion_subscription.go b/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion_subscription.go
new file mode 100644
index 0000000000..c266cf9a09
--- /dev/null
+++ b/goformation/cloudformation/greengrass/aws-greengrass-subscriptiondefinitionversion_subscription.go
@@ -0,0 +1,52 @@
+package greengrass
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SubscriptionDefinitionVersion_Subscription AWS CloudFormation Resource (AWS::Greengrass::SubscriptionDefinitionVersion.Subscription)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-subscriptiondefinitionversion-subscription.html
+type SubscriptionDefinitionVersion_Subscription struct {
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-subscriptiondefinitionversion-subscription.html#cfn-greengrass-subscriptiondefinitionversion-subscription-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Source AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-subscriptiondefinitionversion-subscription.html#cfn-greengrass-subscriptiondefinitionversion-subscription-source
+	Source *types.Value `json:"Source,omitempty"`
+
+	// Subject AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-subscriptiondefinitionversion-subscription.html#cfn-greengrass-subscriptiondefinitionversion-subscription-subject
+	Subject *types.Value `json:"Subject,omitempty"`
+
+	// Target AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrass-subscriptiondefinitionversion-subscription.html#cfn-greengrass-subscriptiondefinitionversion-subscription-target
+	Target *types.Value `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 *SubscriptionDefinitionVersion_Subscription) AWSCloudFormationType() string {
+	return "AWS::Greengrass::SubscriptionDefinitionVersion.Subscription"
+}
diff --git a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion.go b/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion.go
new file mode 100644
index 0000000000..3ee15e32e3
--- /dev/null
+++ b/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion.go
@@ -0,0 +1,118 @@
+package greengrassv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ComponentVersion AWS CloudFormation Resource (AWS::GreengrassV2::ComponentVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrassv2-componentversion.html
+type ComponentVersion struct {
+
+	// InlineRecipe AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrassv2-componentversion.html#cfn-greengrassv2-componentversion-inlinerecipe
+	InlineRecipe *types.Value `json:"InlineRecipe,omitempty"`
+
+	// LambdaFunction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrassv2-componentversion.html#cfn-greengrassv2-componentversion-lambdafunction
+	LambdaFunction *ComponentVersion_LambdaFunctionRecipeSource `json:"LambdaFunction,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-greengrassv2-componentversion.html#cfn-greengrassv2-componentversion-tags
+	Tags map[string]*types.Value `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 *ComponentVersion) AWSCloudFormationType() string {
+	return "AWS::GreengrassV2::ComponentVersion"
+}
+
+// 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 ComponentVersion) MarshalJSON() ([]byte, error) {
+	type Properties ComponentVersion
+	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 *ComponentVersion) UnmarshalJSON(b []byte) error {
+	type Properties ComponentVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ComponentVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentdependencyrequirement.go b/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentdependencyrequirement.go
new file mode 100644
index 0000000000..60b52c0884
--- /dev/null
+++ b/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentdependencyrequirement.go
@@ -0,0 +1,42 @@
+package greengrassv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ComponentVersion_ComponentDependencyRequirement AWS CloudFormation Resource (AWS::GreengrassV2::ComponentVersion.ComponentDependencyRequirement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-componentdependencyrequirement.html
+type ComponentVersion_ComponentDependencyRequirement struct {
+
+	// DependencyType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-componentdependencyrequirement.html#cfn-greengrassv2-componentversion-componentdependencyrequirement-dependencytype
+	DependencyType *types.Value `json:"DependencyType,omitempty"`
+
+	// VersionRequirement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-componentdependencyrequirement.html#cfn-greengrassv2-componentversion-componentdependencyrequirement-versionrequirement
+	VersionRequirement *types.Value `json:"VersionRequirement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ComponentVersion_ComponentDependencyRequirement) AWSCloudFormationType() string {
+	return "AWS::GreengrassV2::ComponentVersion.ComponentDependencyRequirement"
+}
diff --git a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentplatform.go b/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentplatform.go
new file mode 100644
index 0000000000..d2b2e3a165
--- /dev/null
+++ b/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_componentplatform.go
@@ -0,0 +1,42 @@
+package greengrassv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ComponentVersion_ComponentPlatform AWS CloudFormation Resource (AWS::GreengrassV2::ComponentVersion.ComponentPlatform)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-componentplatform.html
+type ComponentVersion_ComponentPlatform struct {
+
+	// Attributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-componentplatform.html#cfn-greengrassv2-componentversion-componentplatform-attributes
+	Attributes map[string]*types.Value `json:"Attributes,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-componentplatform.html#cfn-greengrassv2-componentversion-componentplatform-name
+	Name *types.Value `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 *ComponentVersion_ComponentPlatform) AWSCloudFormationType() string {
+	return "AWS::GreengrassV2::ComponentVersion.ComponentPlatform"
+}
diff --git a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdacontainerparams.go b/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdacontainerparams.go
new file mode 100644
index 0000000000..b290787209
--- /dev/null
+++ b/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdacontainerparams.go
@@ -0,0 +1,52 @@
+package greengrassv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ComponentVersion_LambdaContainerParams AWS CloudFormation Resource (AWS::GreengrassV2::ComponentVersion.LambdaContainerParams)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdacontainerparams.html
+type ComponentVersion_LambdaContainerParams struct {
+
+	// Devices AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdacontainerparams.html#cfn-greengrassv2-componentversion-lambdacontainerparams-devices
+	Devices []ComponentVersion_LambdaDeviceMount `json:"Devices,omitempty"`
+
+	// MemorySizeInKB AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdacontainerparams.html#cfn-greengrassv2-componentversion-lambdacontainerparams-memorysizeinkb
+	MemorySizeInKB *types.Value `json:"MemorySizeInKB,omitempty"`
+
+	// MountROSysfs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdacontainerparams.html#cfn-greengrassv2-componentversion-lambdacontainerparams-mountrosysfs
+	MountROSysfs *types.Value `json:"MountROSysfs,omitempty"`
+
+	// Volumes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdacontainerparams.html#cfn-greengrassv2-componentversion-lambdacontainerparams-volumes
+	Volumes []ComponentVersion_LambdaVolumeMount `json:"Volumes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ComponentVersion_LambdaContainerParams) AWSCloudFormationType() string {
+	return "AWS::GreengrassV2::ComponentVersion.LambdaContainerParams"
+}
diff --git a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdadevicemount.go b/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdadevicemount.go
new file mode 100644
index 0000000000..6578af9766
--- /dev/null
+++ b/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdadevicemount.go
@@ -0,0 +1,47 @@
+package greengrassv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ComponentVersion_LambdaDeviceMount AWS CloudFormation Resource (AWS::GreengrassV2::ComponentVersion.LambdaDeviceMount)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdadevicemount.html
+type ComponentVersion_LambdaDeviceMount struct {
+
+	// AddGroupOwner AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdadevicemount.html#cfn-greengrassv2-componentversion-lambdadevicemount-addgroupowner
+	AddGroupOwner *types.Value `json:"AddGroupOwner,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdadevicemount.html#cfn-greengrassv2-componentversion-lambdadevicemount-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// Permission AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdadevicemount.html#cfn-greengrassv2-componentversion-lambdadevicemount-permission
+	Permission *types.Value `json:"Permission,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ComponentVersion_LambdaDeviceMount) AWSCloudFormationType() string {
+	return "AWS::GreengrassV2::ComponentVersion.LambdaDeviceMount"
+}
diff --git a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaeventsource.go b/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaeventsource.go
new file mode 100644
index 0000000000..93cc67feac
--- /dev/null
+++ b/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaeventsource.go
@@ -0,0 +1,42 @@
+package greengrassv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ComponentVersion_LambdaEventSource AWS CloudFormation Resource (AWS::GreengrassV2::ComponentVersion.LambdaEventSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdaeventsource.html
+type ComponentVersion_LambdaEventSource struct {
+
+	// Topic AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdaeventsource.html#cfn-greengrassv2-componentversion-lambdaeventsource-topic
+	Topic *types.Value `json:"Topic,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdaeventsource.html#cfn-greengrassv2-componentversion-lambdaeventsource-type
+	Type *types.Value `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 *ComponentVersion_LambdaEventSource) AWSCloudFormationType() string {
+	return "AWS::GreengrassV2::ComponentVersion.LambdaEventSource"
+}
diff --git a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaexecutionparameters.go b/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaexecutionparameters.go
new file mode 100644
index 0000000000..2a8129ac76
--- /dev/null
+++ b/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdaexecutionparameters.go
@@ -0,0 +1,87 @@
+package greengrassv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ComponentVersion_LambdaExecutionParameters AWS CloudFormation Resource (AWS::GreengrassV2::ComponentVersion.LambdaExecutionParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdaexecutionparameters.html
+type ComponentVersion_LambdaExecutionParameters struct {
+
+	// EnvironmentVariables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdaexecutionparameters.html#cfn-greengrassv2-componentversion-lambdaexecutionparameters-environmentvariables
+	EnvironmentVariables map[string]*types.Value `json:"EnvironmentVariables,omitempty"`
+
+	// EventSources AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdaexecutionparameters.html#cfn-greengrassv2-componentversion-lambdaexecutionparameters-eventsources
+	EventSources []ComponentVersion_LambdaEventSource `json:"EventSources,omitempty"`
+
+	// ExecArgs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdaexecutionparameters.html#cfn-greengrassv2-componentversion-lambdaexecutionparameters-execargs
+	ExecArgs *types.Value `json:"ExecArgs,omitempty"`
+
+	// InputPayloadEncodingType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdaexecutionparameters.html#cfn-greengrassv2-componentversion-lambdaexecutionparameters-inputpayloadencodingtype
+	InputPayloadEncodingType *types.Value `json:"InputPayloadEncodingType,omitempty"`
+
+	// LinuxProcessParams AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdaexecutionparameters.html#cfn-greengrassv2-componentversion-lambdaexecutionparameters-linuxprocessparams
+	LinuxProcessParams *ComponentVersion_LambdaLinuxProcessParams `json:"LinuxProcessParams,omitempty"`
+
+	// MaxIdleTimeInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdaexecutionparameters.html#cfn-greengrassv2-componentversion-lambdaexecutionparameters-maxidletimeinseconds
+	MaxIdleTimeInSeconds *types.Value `json:"MaxIdleTimeInSeconds,omitempty"`
+
+	// MaxInstancesCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdaexecutionparameters.html#cfn-greengrassv2-componentversion-lambdaexecutionparameters-maxinstancescount
+	MaxInstancesCount *types.Value `json:"MaxInstancesCount,omitempty"`
+
+	// MaxQueueSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdaexecutionparameters.html#cfn-greengrassv2-componentversion-lambdaexecutionparameters-maxqueuesize
+	MaxQueueSize *types.Value `json:"MaxQueueSize,omitempty"`
+
+	// Pinned AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdaexecutionparameters.html#cfn-greengrassv2-componentversion-lambdaexecutionparameters-pinned
+	Pinned *types.Value `json:"Pinned,omitempty"`
+
+	// StatusTimeoutInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdaexecutionparameters.html#cfn-greengrassv2-componentversion-lambdaexecutionparameters-statustimeoutinseconds
+	StatusTimeoutInSeconds *types.Value `json:"StatusTimeoutInSeconds,omitempty"`
+
+	// TimeoutInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdaexecutionparameters.html#cfn-greengrassv2-componentversion-lambdaexecutionparameters-timeoutinseconds
+	TimeoutInSeconds *types.Value `json:"TimeoutInSeconds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ComponentVersion_LambdaExecutionParameters) AWSCloudFormationType() string {
+	return "AWS::GreengrassV2::ComponentVersion.LambdaExecutionParameters"
+}
diff --git a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdafunctionrecipesource.go b/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdafunctionrecipesource.go
new file mode 100644
index 0000000000..aff0efbefb
--- /dev/null
+++ b/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdafunctionrecipesource.go
@@ -0,0 +1,62 @@
+package greengrassv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ComponentVersion_LambdaFunctionRecipeSource AWS CloudFormation Resource (AWS::GreengrassV2::ComponentVersion.LambdaFunctionRecipeSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdafunctionrecipesource.html
+type ComponentVersion_LambdaFunctionRecipeSource struct {
+
+	// ComponentDependencies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdafunctionrecipesource.html#cfn-greengrassv2-componentversion-lambdafunctionrecipesource-componentdependencies
+	ComponentDependencies map[string]ComponentVersion_ComponentDependencyRequirement `json:"ComponentDependencies,omitempty"`
+
+	// ComponentLambdaParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdafunctionrecipesource.html#cfn-greengrassv2-componentversion-lambdafunctionrecipesource-componentlambdaparameters
+	ComponentLambdaParameters *ComponentVersion_LambdaExecutionParameters `json:"ComponentLambdaParameters,omitempty"`
+
+	// ComponentName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdafunctionrecipesource.html#cfn-greengrassv2-componentversion-lambdafunctionrecipesource-componentname
+	ComponentName *types.Value `json:"ComponentName,omitempty"`
+
+	// ComponentPlatforms AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdafunctionrecipesource.html#cfn-greengrassv2-componentversion-lambdafunctionrecipesource-componentplatforms
+	ComponentPlatforms []ComponentVersion_ComponentPlatform `json:"ComponentPlatforms,omitempty"`
+
+	// ComponentVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdafunctionrecipesource.html#cfn-greengrassv2-componentversion-lambdafunctionrecipesource-componentversion
+	ComponentVersion *types.Value `json:"ComponentVersion,omitempty"`
+
+	// LambdaArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdafunctionrecipesource.html#cfn-greengrassv2-componentversion-lambdafunctionrecipesource-lambdaarn
+	LambdaArn *types.Value `json:"LambdaArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ComponentVersion_LambdaFunctionRecipeSource) AWSCloudFormationType() string {
+	return "AWS::GreengrassV2::ComponentVersion.LambdaFunctionRecipeSource"
+}
diff --git a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdalinuxprocessparams.go b/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdalinuxprocessparams.go
new file mode 100644
index 0000000000..ac0aef591c
--- /dev/null
+++ b/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdalinuxprocessparams.go
@@ -0,0 +1,42 @@
+package greengrassv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ComponentVersion_LambdaLinuxProcessParams AWS CloudFormation Resource (AWS::GreengrassV2::ComponentVersion.LambdaLinuxProcessParams)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdalinuxprocessparams.html
+type ComponentVersion_LambdaLinuxProcessParams struct {
+
+	// ContainerParams AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdalinuxprocessparams.html#cfn-greengrassv2-componentversion-lambdalinuxprocessparams-containerparams
+	ContainerParams *ComponentVersion_LambdaContainerParams `json:"ContainerParams,omitempty"`
+
+	// IsolationMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdalinuxprocessparams.html#cfn-greengrassv2-componentversion-lambdalinuxprocessparams-isolationmode
+	IsolationMode *types.Value `json:"IsolationMode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ComponentVersion_LambdaLinuxProcessParams) AWSCloudFormationType() string {
+	return "AWS::GreengrassV2::ComponentVersion.LambdaLinuxProcessParams"
+}
diff --git a/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdavolumemount.go b/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdavolumemount.go
new file mode 100644
index 0000000000..c2a5539b34
--- /dev/null
+++ b/goformation/cloudformation/greengrassv2/aws-greengrassv2-componentversion_lambdavolumemount.go
@@ -0,0 +1,52 @@
+package greengrassv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ComponentVersion_LambdaVolumeMount AWS CloudFormation Resource (AWS::GreengrassV2::ComponentVersion.LambdaVolumeMount)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdavolumemount.html
+type ComponentVersion_LambdaVolumeMount struct {
+
+	// AddGroupOwner AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdavolumemount.html#cfn-greengrassv2-componentversion-lambdavolumemount-addgroupowner
+	AddGroupOwner *types.Value `json:"AddGroupOwner,omitempty"`
+
+	// DestinationPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdavolumemount.html#cfn-greengrassv2-componentversion-lambdavolumemount-destinationpath
+	DestinationPath *types.Value `json:"DestinationPath,omitempty"`
+
+	// Permission AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdavolumemount.html#cfn-greengrassv2-componentversion-lambdavolumemount-permission
+	Permission *types.Value `json:"Permission,omitempty"`
+
+	// SourcePath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-greengrassv2-componentversion-lambdavolumemount.html#cfn-greengrassv2-componentversion-lambdavolumemount-sourcepath
+	SourcePath *types.Value `json:"SourcePath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ComponentVersion_LambdaVolumeMount) AWSCloudFormationType() string {
+	return "AWS::GreengrassV2::ComponentVersion.LambdaVolumeMount"
+}
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config.go b/goformation/cloudformation/groundstation/aws-groundstation-config.go
new file mode 100644
index 0000000000..d9097fbdd2
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-config.go
@@ -0,0 +1,119 @@
+package groundstation
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Config AWS CloudFormation Resource (AWS::GroundStation::Config)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-config.html
+type Config struct {
+
+	// ConfigData AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-config.html#cfn-groundstation-config-configdata
+	ConfigData *Config_ConfigData `json:"ConfigData,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-config.html#cfn-groundstation-config-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-config.html#cfn-groundstation-config-tags
+	Tags []cloudformation.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 *Config) AWSCloudFormationType() string {
+	return "AWS::GroundStation::Config"
+}
+
+// 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 Config) MarshalJSON() ([]byte, error) {
+	type Properties Config
+	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 *Config) UnmarshalJSON(b []byte) error {
+	type Properties Config
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Config(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/groundstation/aws-groundstation-config_antennadownlinkconfig.go b/goformation/cloudformation/groundstation/aws-groundstation-config_antennadownlinkconfig.go
new file mode 100644
index 0000000000..d5261d39f8
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-config_antennadownlinkconfig.go
@@ -0,0 +1,35 @@
+package groundstation
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Config_AntennaDownlinkConfig AWS CloudFormation Resource (AWS::GroundStation::Config.AntennaDownlinkConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-antennadownlinkconfig.html
+type Config_AntennaDownlinkConfig struct {
+
+	// SpectrumConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-antennadownlinkconfig.html#cfn-groundstation-config-antennadownlinkconfig-spectrumconfig
+	SpectrumConfig *Config_SpectrumConfig `json:"SpectrumConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Config_AntennaDownlinkConfig) AWSCloudFormationType() string {
+	return "AWS::GroundStation::Config.AntennaDownlinkConfig"
+}
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_antennadownlinkdemoddecodeconfig.go b/goformation/cloudformation/groundstation/aws-groundstation-config_antennadownlinkdemoddecodeconfig.go
new file mode 100644
index 0000000000..f0bb918562
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-config_antennadownlinkdemoddecodeconfig.go
@@ -0,0 +1,45 @@
+package groundstation
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Config_AntennaDownlinkDemodDecodeConfig AWS CloudFormation Resource (AWS::GroundStation::Config.AntennaDownlinkDemodDecodeConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-antennadownlinkdemoddecodeconfig.html
+type Config_AntennaDownlinkDemodDecodeConfig struct {
+
+	// DecodeConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-antennadownlinkdemoddecodeconfig.html#cfn-groundstation-config-antennadownlinkdemoddecodeconfig-decodeconfig
+	DecodeConfig *Config_DecodeConfig `json:"DecodeConfig,omitempty"`
+
+	// DemodulationConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-antennadownlinkdemoddecodeconfig.html#cfn-groundstation-config-antennadownlinkdemoddecodeconfig-demodulationconfig
+	DemodulationConfig *Config_DemodulationConfig `json:"DemodulationConfig,omitempty"`
+
+	// SpectrumConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-antennadownlinkdemoddecodeconfig.html#cfn-groundstation-config-antennadownlinkdemoddecodeconfig-spectrumconfig
+	SpectrumConfig *Config_SpectrumConfig `json:"SpectrumConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Config_AntennaDownlinkDemodDecodeConfig) AWSCloudFormationType() string {
+	return "AWS::GroundStation::Config.AntennaDownlinkDemodDecodeConfig"
+}
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_antennauplinkconfig.go b/goformation/cloudformation/groundstation/aws-groundstation-config_antennauplinkconfig.go
new file mode 100644
index 0000000000..363315c718
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-config_antennauplinkconfig.go
@@ -0,0 +1,47 @@
+package groundstation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Config_AntennaUplinkConfig AWS CloudFormation Resource (AWS::GroundStation::Config.AntennaUplinkConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-antennauplinkconfig.html
+type Config_AntennaUplinkConfig struct {
+
+	// SpectrumConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-antennauplinkconfig.html#cfn-groundstation-config-antennauplinkconfig-spectrumconfig
+	SpectrumConfig *Config_UplinkSpectrumConfig `json:"SpectrumConfig,omitempty"`
+
+	// TargetEirp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-antennauplinkconfig.html#cfn-groundstation-config-antennauplinkconfig-targeteirp
+	TargetEirp *Config_Eirp `json:"TargetEirp,omitempty"`
+
+	// TransmitDisabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-antennauplinkconfig.html#cfn-groundstation-config-antennauplinkconfig-transmitdisabled
+	TransmitDisabled *types.Value `json:"TransmitDisabled,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Config_AntennaUplinkConfig) AWSCloudFormationType() string {
+	return "AWS::GroundStation::Config.AntennaUplinkConfig"
+}
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_configdata.go b/goformation/cloudformation/groundstation/aws-groundstation-config_configdata.go
new file mode 100644
index 0000000000..0b36b66380
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-config_configdata.go
@@ -0,0 +1,65 @@
+package groundstation
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Config_ConfigData AWS CloudFormation Resource (AWS::GroundStation::Config.ConfigData)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-configdata.html
+type Config_ConfigData struct {
+
+	// AntennaDownlinkConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-configdata.html#cfn-groundstation-config-configdata-antennadownlinkconfig
+	AntennaDownlinkConfig *Config_AntennaDownlinkConfig `json:"AntennaDownlinkConfig,omitempty"`
+
+	// AntennaDownlinkDemodDecodeConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-configdata.html#cfn-groundstation-config-configdata-antennadownlinkdemoddecodeconfig
+	AntennaDownlinkDemodDecodeConfig *Config_AntennaDownlinkDemodDecodeConfig `json:"AntennaDownlinkDemodDecodeConfig,omitempty"`
+
+	// AntennaUplinkConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-configdata.html#cfn-groundstation-config-configdata-antennauplinkconfig
+	AntennaUplinkConfig *Config_AntennaUplinkConfig `json:"AntennaUplinkConfig,omitempty"`
+
+	// DataflowEndpointConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-configdata.html#cfn-groundstation-config-configdata-dataflowendpointconfig
+	DataflowEndpointConfig *Config_DataflowEndpointConfig `json:"DataflowEndpointConfig,omitempty"`
+
+	// S3RecordingConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-configdata.html#cfn-groundstation-config-configdata-s3recordingconfig
+	S3RecordingConfig *Config_S3RecordingConfig `json:"S3RecordingConfig,omitempty"`
+
+	// TrackingConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-configdata.html#cfn-groundstation-config-configdata-trackingconfig
+	TrackingConfig *Config_TrackingConfig `json:"TrackingConfig,omitempty"`
+
+	// UplinkEchoConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-configdata.html#cfn-groundstation-config-configdata-uplinkechoconfig
+	UplinkEchoConfig *Config_UplinkEchoConfig `json:"UplinkEchoConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Config_ConfigData) AWSCloudFormationType() string {
+	return "AWS::GroundStation::Config.ConfigData"
+}
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_dataflowendpointconfig.go b/goformation/cloudformation/groundstation/aws-groundstation-config_dataflowendpointconfig.go
new file mode 100644
index 0000000000..8bdd7553eb
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-config_dataflowendpointconfig.go
@@ -0,0 +1,42 @@
+package groundstation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Config_DataflowEndpointConfig AWS CloudFormation Resource (AWS::GroundStation::Config.DataflowEndpointConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-dataflowendpointconfig.html
+type Config_DataflowEndpointConfig struct {
+
+	// DataflowEndpointName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-dataflowendpointconfig.html#cfn-groundstation-config-dataflowendpointconfig-dataflowendpointname
+	DataflowEndpointName *types.Value `json:"DataflowEndpointName,omitempty"`
+
+	// DataflowEndpointRegion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-dataflowendpointconfig.html#cfn-groundstation-config-dataflowendpointconfig-dataflowendpointregion
+	DataflowEndpointRegion *types.Value `json:"DataflowEndpointRegion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Config_DataflowEndpointConfig) AWSCloudFormationType() string {
+	return "AWS::GroundStation::Config.DataflowEndpointConfig"
+}
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_decodeconfig.go b/goformation/cloudformation/groundstation/aws-groundstation-config_decodeconfig.go
new file mode 100644
index 0000000000..e54a6524ec
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-config_decodeconfig.go
@@ -0,0 +1,37 @@
+package groundstation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Config_DecodeConfig AWS CloudFormation Resource (AWS::GroundStation::Config.DecodeConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-decodeconfig.html
+type Config_DecodeConfig struct {
+
+	// UnvalidatedJSON AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-decodeconfig.html#cfn-groundstation-config-decodeconfig-unvalidatedjson
+	UnvalidatedJSON *types.Value `json:"UnvalidatedJSON,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Config_DecodeConfig) AWSCloudFormationType() string {
+	return "AWS::GroundStation::Config.DecodeConfig"
+}
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_demodulationconfig.go b/goformation/cloudformation/groundstation/aws-groundstation-config_demodulationconfig.go
new file mode 100644
index 0000000000..2d0dde53f5
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-config_demodulationconfig.go
@@ -0,0 +1,37 @@
+package groundstation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Config_DemodulationConfig AWS CloudFormation Resource (AWS::GroundStation::Config.DemodulationConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-demodulationconfig.html
+type Config_DemodulationConfig struct {
+
+	// UnvalidatedJSON AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-demodulationconfig.html#cfn-groundstation-config-demodulationconfig-unvalidatedjson
+	UnvalidatedJSON *types.Value `json:"UnvalidatedJSON,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Config_DemodulationConfig) AWSCloudFormationType() string {
+	return "AWS::GroundStation::Config.DemodulationConfig"
+}
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_eirp.go b/goformation/cloudformation/groundstation/aws-groundstation-config_eirp.go
new file mode 100644
index 0000000000..c8435104bc
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-config_eirp.go
@@ -0,0 +1,42 @@
+package groundstation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Config_Eirp AWS CloudFormation Resource (AWS::GroundStation::Config.Eirp)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-eirp.html
+type Config_Eirp struct {
+
+	// Units AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-eirp.html#cfn-groundstation-config-eirp-units
+	Units *types.Value `json:"Units,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-eirp.html#cfn-groundstation-config-eirp-value
+	Value *types.Value `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 *Config_Eirp) AWSCloudFormationType() string {
+	return "AWS::GroundStation::Config.Eirp"
+}
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_frequency.go b/goformation/cloudformation/groundstation/aws-groundstation-config_frequency.go
new file mode 100644
index 0000000000..e19b57d83e
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-config_frequency.go
@@ -0,0 +1,42 @@
+package groundstation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Config_Frequency AWS CloudFormation Resource (AWS::GroundStation::Config.Frequency)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-frequency.html
+type Config_Frequency struct {
+
+	// Units AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-frequency.html#cfn-groundstation-config-frequency-units
+	Units *types.Value `json:"Units,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-frequency.html#cfn-groundstation-config-frequency-value
+	Value *types.Value `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 *Config_Frequency) AWSCloudFormationType() string {
+	return "AWS::GroundStation::Config.Frequency"
+}
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_frequencybandwidth.go b/goformation/cloudformation/groundstation/aws-groundstation-config_frequencybandwidth.go
new file mode 100644
index 0000000000..fdfc416d0c
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-config_frequencybandwidth.go
@@ -0,0 +1,42 @@
+package groundstation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Config_FrequencyBandwidth AWS CloudFormation Resource (AWS::GroundStation::Config.FrequencyBandwidth)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-frequencybandwidth.html
+type Config_FrequencyBandwidth struct {
+
+	// Units AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-frequencybandwidth.html#cfn-groundstation-config-frequencybandwidth-units
+	Units *types.Value `json:"Units,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-frequencybandwidth.html#cfn-groundstation-config-frequencybandwidth-value
+	Value *types.Value `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 *Config_FrequencyBandwidth) AWSCloudFormationType() string {
+	return "AWS::GroundStation::Config.FrequencyBandwidth"
+}
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_s3recordingconfig.go b/goformation/cloudformation/groundstation/aws-groundstation-config_s3recordingconfig.go
new file mode 100644
index 0000000000..4bc7bad7f4
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-config_s3recordingconfig.go
@@ -0,0 +1,47 @@
+package groundstation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Config_S3RecordingConfig AWS CloudFormation Resource (AWS::GroundStation::Config.S3RecordingConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-s3recordingconfig.html
+type Config_S3RecordingConfig struct {
+
+	// BucketArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-s3recordingconfig.html#cfn-groundstation-config-s3recordingconfig-bucketarn
+	BucketArn *types.Value `json:"BucketArn,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-s3recordingconfig.html#cfn-groundstation-config-s3recordingconfig-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-s3recordingconfig.html#cfn-groundstation-config-s3recordingconfig-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Config_S3RecordingConfig) AWSCloudFormationType() string {
+	return "AWS::GroundStation::Config.S3RecordingConfig"
+}
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_spectrumconfig.go b/goformation/cloudformation/groundstation/aws-groundstation-config_spectrumconfig.go
new file mode 100644
index 0000000000..8d98973151
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-config_spectrumconfig.go
@@ -0,0 +1,47 @@
+package groundstation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Config_SpectrumConfig AWS CloudFormation Resource (AWS::GroundStation::Config.SpectrumConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-spectrumconfig.html
+type Config_SpectrumConfig struct {
+
+	// Bandwidth AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-spectrumconfig.html#cfn-groundstation-config-spectrumconfig-bandwidth
+	Bandwidth *Config_FrequencyBandwidth `json:"Bandwidth,omitempty"`
+
+	// CenterFrequency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-spectrumconfig.html#cfn-groundstation-config-spectrumconfig-centerfrequency
+	CenterFrequency *Config_Frequency `json:"CenterFrequency,omitempty"`
+
+	// Polarization AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-spectrumconfig.html#cfn-groundstation-config-spectrumconfig-polarization
+	Polarization *types.Value `json:"Polarization,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Config_SpectrumConfig) AWSCloudFormationType() string {
+	return "AWS::GroundStation::Config.SpectrumConfig"
+}
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_trackingconfig.go b/goformation/cloudformation/groundstation/aws-groundstation-config_trackingconfig.go
new file mode 100644
index 0000000000..d92768face
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-config_trackingconfig.go
@@ -0,0 +1,37 @@
+package groundstation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Config_TrackingConfig AWS CloudFormation Resource (AWS::GroundStation::Config.TrackingConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-trackingconfig.html
+type Config_TrackingConfig struct {
+
+	// Autotrack AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-trackingconfig.html#cfn-groundstation-config-trackingconfig-autotrack
+	Autotrack *types.Value `json:"Autotrack,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Config_TrackingConfig) AWSCloudFormationType() string {
+	return "AWS::GroundStation::Config.TrackingConfig"
+}
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_uplinkechoconfig.go b/goformation/cloudformation/groundstation/aws-groundstation-config_uplinkechoconfig.go
new file mode 100644
index 0000000000..bd2dfa619f
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-config_uplinkechoconfig.go
@@ -0,0 +1,42 @@
+package groundstation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Config_UplinkEchoConfig AWS CloudFormation Resource (AWS::GroundStation::Config.UplinkEchoConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-uplinkechoconfig.html
+type Config_UplinkEchoConfig struct {
+
+	// AntennaUplinkConfigArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-uplinkechoconfig.html#cfn-groundstation-config-uplinkechoconfig-antennauplinkconfigarn
+	AntennaUplinkConfigArn *types.Value `json:"AntennaUplinkConfigArn,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-uplinkechoconfig.html#cfn-groundstation-config-uplinkechoconfig-enabled
+	Enabled *types.Value `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 *Config_UplinkEchoConfig) AWSCloudFormationType() string {
+	return "AWS::GroundStation::Config.UplinkEchoConfig"
+}
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-config_uplinkspectrumconfig.go b/goformation/cloudformation/groundstation/aws-groundstation-config_uplinkspectrumconfig.go
new file mode 100644
index 0000000000..292b8eff64
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-config_uplinkspectrumconfig.go
@@ -0,0 +1,42 @@
+package groundstation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Config_UplinkSpectrumConfig AWS CloudFormation Resource (AWS::GroundStation::Config.UplinkSpectrumConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-uplinkspectrumconfig.html
+type Config_UplinkSpectrumConfig struct {
+
+	// CenterFrequency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-uplinkspectrumconfig.html#cfn-groundstation-config-uplinkspectrumconfig-centerfrequency
+	CenterFrequency *Config_Frequency `json:"CenterFrequency,omitempty"`
+
+	// Polarization AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-config-uplinkspectrumconfig.html#cfn-groundstation-config-uplinkspectrumconfig-polarization
+	Polarization *types.Value `json:"Polarization,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Config_UplinkSpectrumConfig) AWSCloudFormationType() string {
+	return "AWS::GroundStation::Config.UplinkSpectrumConfig"
+}
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup.go b/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup.go
new file mode 100644
index 0000000000..12507163eb
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup.go
@@ -0,0 +1,112 @@
+package groundstation
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataflowEndpointGroup AWS CloudFormation Resource (AWS::GroundStation::DataflowEndpointGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-dataflowendpointgroup.html
+type DataflowEndpointGroup struct {
+
+	// EndpointDetails AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-dataflowendpointgroup.html#cfn-groundstation-dataflowendpointgroup-endpointdetails
+	EndpointDetails []DataflowEndpointGroup_EndpointDetails `json:"EndpointDetails,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-dataflowendpointgroup.html#cfn-groundstation-dataflowendpointgroup-tags
+	Tags []cloudformation.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 *DataflowEndpointGroup) AWSCloudFormationType() string {
+	return "AWS::GroundStation::DataflowEndpointGroup"
+}
+
+// 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 DataflowEndpointGroup) MarshalJSON() ([]byte, error) {
+	type Properties DataflowEndpointGroup
+	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 *DataflowEndpointGroup) UnmarshalJSON(b []byte) error {
+	type Properties DataflowEndpointGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DataflowEndpointGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_dataflowendpoint.go b/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_dataflowendpoint.go
new file mode 100644
index 0000000000..caadc0b7f8
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_dataflowendpoint.go
@@ -0,0 +1,47 @@
+package groundstation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataflowEndpointGroup_DataflowEndpoint AWS CloudFormation Resource (AWS::GroundStation::DataflowEndpointGroup.DataflowEndpoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-dataflowendpointgroup-dataflowendpoint.html
+type DataflowEndpointGroup_DataflowEndpoint struct {
+
+	// Address AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-dataflowendpointgroup-dataflowendpoint.html#cfn-groundstation-dataflowendpointgroup-dataflowendpoint-address
+	Address *DataflowEndpointGroup_SocketAddress `json:"Address,omitempty"`
+
+	// Mtu AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-dataflowendpointgroup-dataflowendpoint.html#cfn-groundstation-dataflowendpointgroup-dataflowendpoint-mtu
+	Mtu *types.Value `json:"Mtu,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-dataflowendpointgroup-dataflowendpoint.html#cfn-groundstation-dataflowendpointgroup-dataflowendpoint-name
+	Name *types.Value `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 *DataflowEndpointGroup_DataflowEndpoint) AWSCloudFormationType() string {
+	return "AWS::GroundStation::DataflowEndpointGroup.DataflowEndpoint"
+}
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_endpointdetails.go b/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_endpointdetails.go
new file mode 100644
index 0000000000..a6540f2a24
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_endpointdetails.go
@@ -0,0 +1,40 @@
+package groundstation
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataflowEndpointGroup_EndpointDetails AWS CloudFormation Resource (AWS::GroundStation::DataflowEndpointGroup.EndpointDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-dataflowendpointgroup-endpointdetails.html
+type DataflowEndpointGroup_EndpointDetails struct {
+
+	// Endpoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-dataflowendpointgroup-endpointdetails.html#cfn-groundstation-dataflowendpointgroup-endpointdetails-endpoint
+	Endpoint *DataflowEndpointGroup_DataflowEndpoint `json:"Endpoint,omitempty"`
+
+	// SecurityDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-dataflowendpointgroup-endpointdetails.html#cfn-groundstation-dataflowendpointgroup-endpointdetails-securitydetails
+	SecurityDetails *DataflowEndpointGroup_SecurityDetails `json:"SecurityDetails,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataflowEndpointGroup_EndpointDetails) AWSCloudFormationType() string {
+	return "AWS::GroundStation::DataflowEndpointGroup.EndpointDetails"
+}
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_securitydetails.go b/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_securitydetails.go
new file mode 100644
index 0000000000..2f7db8e598
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_securitydetails.go
@@ -0,0 +1,47 @@
+package groundstation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataflowEndpointGroup_SecurityDetails AWS CloudFormation Resource (AWS::GroundStation::DataflowEndpointGroup.SecurityDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-dataflowendpointgroup-securitydetails.html
+type DataflowEndpointGroup_SecurityDetails struct {
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-dataflowendpointgroup-securitydetails.html#cfn-groundstation-dataflowendpointgroup-securitydetails-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-dataflowendpointgroup-securitydetails.html#cfn-groundstation-dataflowendpointgroup-securitydetails-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-dataflowendpointgroup-securitydetails.html#cfn-groundstation-dataflowendpointgroup-securitydetails-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataflowEndpointGroup_SecurityDetails) AWSCloudFormationType() string {
+	return "AWS::GroundStation::DataflowEndpointGroup.SecurityDetails"
+}
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_socketaddress.go b/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_socketaddress.go
new file mode 100644
index 0000000000..7fa8ae56c8
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-dataflowendpointgroup_socketaddress.go
@@ -0,0 +1,42 @@
+package groundstation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataflowEndpointGroup_SocketAddress AWS CloudFormation Resource (AWS::GroundStation::DataflowEndpointGroup.SocketAddress)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-dataflowendpointgroup-socketaddress.html
+type DataflowEndpointGroup_SocketAddress struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-dataflowendpointgroup-socketaddress.html#cfn-groundstation-dataflowendpointgroup-socketaddress-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-dataflowendpointgroup-socketaddress.html#cfn-groundstation-dataflowendpointgroup-socketaddress-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataflowEndpointGroup_SocketAddress) AWSCloudFormationType() string {
+	return "AWS::GroundStation::DataflowEndpointGroup.SocketAddress"
+}
diff --git a/goformation/cloudformation/groundstation/aws-groundstation-missionprofile.go b/goformation/cloudformation/groundstation/aws-groundstation-missionprofile.go
new file mode 100644
index 0000000000..854c332192
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-missionprofile.go
@@ -0,0 +1,139 @@
+package groundstation
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// MissionProfile AWS CloudFormation Resource (AWS::GroundStation::MissionProfile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-missionprofile.html
+type MissionProfile struct {
+
+	// ContactPostPassDurationSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-missionprofile.html#cfn-groundstation-missionprofile-contactpostpassdurationseconds
+	ContactPostPassDurationSeconds *types.Value `json:"ContactPostPassDurationSeconds,omitempty"`
+
+	// ContactPrePassDurationSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-missionprofile.html#cfn-groundstation-missionprofile-contactprepassdurationseconds
+	ContactPrePassDurationSeconds *types.Value `json:"ContactPrePassDurationSeconds,omitempty"`
+
+	// DataflowEdges AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-missionprofile.html#cfn-groundstation-missionprofile-dataflowedges
+	DataflowEdges []MissionProfile_DataflowEdge `json:"DataflowEdges,omitempty"`
+
+	// MinimumViableContactDurationSeconds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-missionprofile.html#cfn-groundstation-missionprofile-minimumviablecontactdurationseconds
+	MinimumViableContactDurationSeconds *types.Value `json:"MinimumViableContactDurationSeconds"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-missionprofile.html#cfn-groundstation-missionprofile-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-missionprofile.html#cfn-groundstation-missionprofile-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TrackingConfigArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-groundstation-missionprofile.html#cfn-groundstation-missionprofile-trackingconfigarn
+	TrackingConfigArn *types.Value `json:"TrackingConfigArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MissionProfile) AWSCloudFormationType() string {
+	return "AWS::GroundStation::MissionProfile"
+}
+
+// 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 MissionProfile) MarshalJSON() ([]byte, error) {
+	type Properties MissionProfile
+	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 *MissionProfile) UnmarshalJSON(b []byte) error {
+	type Properties MissionProfile
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = MissionProfile(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/groundstation/aws-groundstation-missionprofile_dataflowedge.go b/goformation/cloudformation/groundstation/aws-groundstation-missionprofile_dataflowedge.go
new file mode 100644
index 0000000000..6435a3cfbc
--- /dev/null
+++ b/goformation/cloudformation/groundstation/aws-groundstation-missionprofile_dataflowedge.go
@@ -0,0 +1,42 @@
+package groundstation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MissionProfile_DataflowEdge AWS CloudFormation Resource (AWS::GroundStation::MissionProfile.DataflowEdge)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-missionprofile-dataflowedge.html
+type MissionProfile_DataflowEdge struct {
+
+	// Destination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-missionprofile-dataflowedge.html#cfn-groundstation-missionprofile-dataflowedge-destination
+	Destination *types.Value `json:"Destination,omitempty"`
+
+	// Source AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-groundstation-missionprofile-dataflowedge.html#cfn-groundstation-missionprofile-dataflowedge-source
+	Source *types.Value `json:"Source,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MissionProfile_DataflowEdge) AWSCloudFormationType() string {
+	return "AWS::GroundStation::MissionProfile.DataflowEdge"
+}
diff --git a/goformation/cloudformation/guardduty/aws-guardduty-detector.go b/goformation/cloudformation/guardduty/aws-guardduty-detector.go
new file mode 100644
index 0000000000..b5aa735024
--- /dev/null
+++ b/goformation/cloudformation/guardduty/aws-guardduty-detector.go
@@ -0,0 +1,118 @@
+package guardduty
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Detector AWS CloudFormation Resource (AWS::GuardDuty::Detector)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-detector.html
+type Detector struct {
+
+	// DataSources AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-detector.html#cfn-guardduty-detector-datasources
+	DataSources *Detector_CFNDataSourceConfigurations `json:"DataSources,omitempty"`
+
+	// Enable AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-detector.html#cfn-guardduty-detector-enable
+	Enable *types.Value `json:"Enable"`
+
+	// FindingPublishingFrequency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-detector.html#cfn-guardduty-detector-findingpublishingfrequency
+	FindingPublishingFrequency *types.Value `json:"FindingPublishingFrequency,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Detector) AWSCloudFormationType() string {
+	return "AWS::GuardDuty::Detector"
+}
+
+// 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 Detector) MarshalJSON() ([]byte, error) {
+	type Properties Detector
+	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 *Detector) UnmarshalJSON(b []byte) error {
+	type Properties Detector
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Detector(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/guardduty/aws-guardduty-detector_cfndatasourceconfigurations.go b/goformation/cloudformation/guardduty/aws-guardduty-detector_cfndatasourceconfigurations.go
new file mode 100644
index 0000000000..bd092528d9
--- /dev/null
+++ b/goformation/cloudformation/guardduty/aws-guardduty-detector_cfndatasourceconfigurations.go
@@ -0,0 +1,35 @@
+package guardduty
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Detector_CFNDataSourceConfigurations AWS CloudFormation Resource (AWS::GuardDuty::Detector.CFNDataSourceConfigurations)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-detector-cfndatasourceconfigurations.html
+type Detector_CFNDataSourceConfigurations struct {
+
+	// S3Logs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-detector-cfndatasourceconfigurations.html#cfn-guardduty-detector-cfndatasourceconfigurations-s3logs
+	S3Logs *Detector_CFNS3LogsConfiguration `json:"S3Logs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Detector_CFNDataSourceConfigurations) AWSCloudFormationType() string {
+	return "AWS::GuardDuty::Detector.CFNDataSourceConfigurations"
+}
diff --git a/goformation/cloudformation/guardduty/aws-guardduty-detector_cfns3logsconfiguration.go b/goformation/cloudformation/guardduty/aws-guardduty-detector_cfns3logsconfiguration.go
new file mode 100644
index 0000000000..b863e7913d
--- /dev/null
+++ b/goformation/cloudformation/guardduty/aws-guardduty-detector_cfns3logsconfiguration.go
@@ -0,0 +1,37 @@
+package guardduty
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Detector_CFNS3LogsConfiguration AWS CloudFormation Resource (AWS::GuardDuty::Detector.CFNS3LogsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-detector-cfns3logsconfiguration.html
+type Detector_CFNS3LogsConfiguration struct {
+
+	// Enable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-detector-cfns3logsconfiguration.html#cfn-guardduty-detector-cfns3logsconfiguration-enable
+	Enable *types.Value `json:"Enable,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Detector_CFNS3LogsConfiguration) AWSCloudFormationType() string {
+	return "AWS::GuardDuty::Detector.CFNS3LogsConfiguration"
+}
diff --git a/goformation/cloudformation/guardduty/aws-guardduty-filter.go b/goformation/cloudformation/guardduty/aws-guardduty-filter.go
new file mode 100644
index 0000000000..09e6585107
--- /dev/null
+++ b/goformation/cloudformation/guardduty/aws-guardduty-filter.go
@@ -0,0 +1,133 @@
+package guardduty
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Filter AWS CloudFormation Resource (AWS::GuardDuty::Filter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html
+type Filter struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-action
+	Action *types.Value `json:"Action,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DetectorId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-detectorid
+	DetectorId *types.Value `json:"DetectorId,omitempty"`
+
+	// FindingCriteria AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-findingcriteria
+	FindingCriteria *Filter_FindingCriteria `json:"FindingCriteria,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Rank AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-filter.html#cfn-guardduty-filter-rank
+	Rank *types.Value `json:"Rank"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Filter) AWSCloudFormationType() string {
+	return "AWS::GuardDuty::Filter"
+}
+
+// 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 Filter) MarshalJSON() ([]byte, error) {
+	type Properties Filter
+	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 *Filter) UnmarshalJSON(b []byte) error {
+	type Properties Filter
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Filter(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/guardduty/aws-guardduty-filter_condition.go b/goformation/cloudformation/guardduty/aws-guardduty-filter_condition.go
new file mode 100644
index 0000000000..3752c3c040
--- /dev/null
+++ b/goformation/cloudformation/guardduty/aws-guardduty-filter_condition.go
@@ -0,0 +1,57 @@
+package guardduty
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Filter_Condition AWS CloudFormation Resource (AWS::GuardDuty::Filter.Condition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-filter-condition.html
+type Filter_Condition struct {
+
+	// Eq AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-filter-condition.html#cfn-guardduty-filter-condition-eq
+	Eq *types.Value `json:"Eq,omitempty"`
+
+	// Gte AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-filter-condition.html#cfn-guardduty-filter-condition-gte
+	Gte *types.Value `json:"Gte,omitempty"`
+
+	// Lt AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-filter-condition.html#cfn-guardduty-filter-condition-lt
+	Lt *types.Value `json:"Lt,omitempty"`
+
+	// Lte AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-filter-condition.html#cfn-guardduty-filter-condition-lte
+	Lte *types.Value `json:"Lte,omitempty"`
+
+	// Neq AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-filter-condition.html#cfn-guardduty-filter-condition-neq
+	Neq *types.Value `json:"Neq,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Filter_Condition) AWSCloudFormationType() string {
+	return "AWS::GuardDuty::Filter.Condition"
+}
diff --git a/goformation/cloudformation/guardduty/aws-guardduty-filter_findingcriteria.go b/goformation/cloudformation/guardduty/aws-guardduty-filter_findingcriteria.go
new file mode 100644
index 0000000000..5ef2eeeb4e
--- /dev/null
+++ b/goformation/cloudformation/guardduty/aws-guardduty-filter_findingcriteria.go
@@ -0,0 +1,40 @@
+package guardduty
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Filter_FindingCriteria AWS CloudFormation Resource (AWS::GuardDuty::Filter.FindingCriteria)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-filter-findingcriteria.html
+type Filter_FindingCriteria struct {
+
+	// Criterion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-filter-findingcriteria.html#cfn-guardduty-filter-findingcriteria-criterion
+	Criterion interface{} `json:"Criterion,omitempty"`
+
+	// ItemType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-guardduty-filter-findingcriteria.html#cfn-guardduty-filter-findingcriteria-itemtype
+	ItemType *Filter_Condition `json:"ItemType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Filter_FindingCriteria) AWSCloudFormationType() string {
+	return "AWS::GuardDuty::Filter.FindingCriteria"
+}
diff --git a/goformation/cloudformation/guardduty/aws-guardduty-ipset.go b/goformation/cloudformation/guardduty/aws-guardduty-ipset.go
new file mode 100644
index 0000000000..2ca3f7a262
--- /dev/null
+++ b/goformation/cloudformation/guardduty/aws-guardduty-ipset.go
@@ -0,0 +1,128 @@
+package guardduty
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// IPSet AWS CloudFormation Resource (AWS::GuardDuty::IPSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html
+type IPSet struct {
+
+	// Activate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-activate
+	Activate *types.Value `json:"Activate"`
+
+	// DetectorId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-detectorid
+	DetectorId *types.Value `json:"DetectorId,omitempty"`
+
+	// Format AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-format
+	Format *types.Value `json:"Format,omitempty"`
+
+	// Location AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-location
+	Location *types.Value `json:"Location,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-ipset.html#cfn-guardduty-ipset-name
+	Name *types.Value `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 *IPSet) AWSCloudFormationType() string {
+	return "AWS::GuardDuty::IPSet"
+}
+
+// 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 IPSet) MarshalJSON() ([]byte, error) {
+	type Properties IPSet
+	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 *IPSet) UnmarshalJSON(b []byte) error {
+	type Properties IPSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = IPSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/guardduty/aws-guardduty-master.go b/goformation/cloudformation/guardduty/aws-guardduty-master.go
new file mode 100644
index 0000000000..0e1e93cf3f
--- /dev/null
+++ b/goformation/cloudformation/guardduty/aws-guardduty-master.go
@@ -0,0 +1,118 @@
+package guardduty
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Master AWS CloudFormation Resource (AWS::GuardDuty::Master)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html
+type Master struct {
+
+	// DetectorId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html#cfn-guardduty-master-detectorid
+	DetectorId *types.Value `json:"DetectorId,omitempty"`
+
+	// InvitationId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html#cfn-guardduty-master-invitationid
+	InvitationId *types.Value `json:"InvitationId,omitempty"`
+
+	// MasterId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-master.html#cfn-guardduty-master-masterid
+	MasterId *types.Value `json:"MasterId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Master) AWSCloudFormationType() string {
+	return "AWS::GuardDuty::Master"
+}
+
+// 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 Master) MarshalJSON() ([]byte, error) {
+	type Properties Master
+	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 *Master) UnmarshalJSON(b []byte) error {
+	type Properties Master
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Master(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/guardduty/aws-guardduty-member.go b/goformation/cloudformation/guardduty/aws-guardduty-member.go
new file mode 100644
index 0000000000..8554233da1
--- /dev/null
+++ b/goformation/cloudformation/guardduty/aws-guardduty-member.go
@@ -0,0 +1,133 @@
+package guardduty
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Member AWS CloudFormation Resource (AWS::GuardDuty::Member)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html
+type Member struct {
+
+	// DetectorId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-detectorid
+	DetectorId *types.Value `json:"DetectorId,omitempty"`
+
+	// DisableEmailNotification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-disableemailnotification
+	DisableEmailNotification *types.Value `json:"DisableEmailNotification,omitempty"`
+
+	// Email AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-email
+	Email *types.Value `json:"Email,omitempty"`
+
+	// MemberId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-memberid
+	MemberId *types.Value `json:"MemberId,omitempty"`
+
+	// Message AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-message
+	Message *types.Value `json:"Message,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-member.html#cfn-guardduty-member-status
+	Status *types.Value `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 *Member) AWSCloudFormationType() string {
+	return "AWS::GuardDuty::Member"
+}
+
+// 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 Member) MarshalJSON() ([]byte, error) {
+	type Properties Member
+	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 *Member) UnmarshalJSON(b []byte) error {
+	type Properties Member
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Member(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/guardduty/aws-guardduty-threatintelset.go b/goformation/cloudformation/guardduty/aws-guardduty-threatintelset.go
new file mode 100644
index 0000000000..486c3b9c7c
--- /dev/null
+++ b/goformation/cloudformation/guardduty/aws-guardduty-threatintelset.go
@@ -0,0 +1,128 @@
+package guardduty
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ThreatIntelSet AWS CloudFormation Resource (AWS::GuardDuty::ThreatIntelSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html
+type ThreatIntelSet struct {
+
+	// Activate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-activate
+	Activate *types.Value `json:"Activate"`
+
+	// DetectorId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-detectorid
+	DetectorId *types.Value `json:"DetectorId,omitempty"`
+
+	// Format AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-format
+	Format *types.Value `json:"Format,omitempty"`
+
+	// Location AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-location
+	Location *types.Value `json:"Location,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-guardduty-threatintelset.html#cfn-guardduty-threatintelset-name
+	Name *types.Value `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 *ThreatIntelSet) AWSCloudFormationType() string {
+	return "AWS::GuardDuty::ThreatIntelSet"
+}
+
+// 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 ThreatIntelSet) MarshalJSON() ([]byte, error) {
+	type Properties ThreatIntelSet
+	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 *ThreatIntelSet) UnmarshalJSON(b []byte) error {
+	type Properties ThreatIntelSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ThreatIntelSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore.go b/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore.go
new file mode 100644
index 0000000000..d2ca6f2f7a
--- /dev/null
+++ b/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore.go
@@ -0,0 +1,129 @@
+package healthlake
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// FHIRDatastore AWS CloudFormation Resource (AWS::HealthLake::FHIRDatastore)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-healthlake-fhirdatastore.html
+type FHIRDatastore struct {
+
+	// DatastoreName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-healthlake-fhirdatastore.html#cfn-healthlake-fhirdatastore-datastorename
+	DatastoreName *types.Value `json:"DatastoreName,omitempty"`
+
+	// DatastoreTypeVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-healthlake-fhirdatastore.html#cfn-healthlake-fhirdatastore-datastoretypeversion
+	DatastoreTypeVersion *types.Value `json:"DatastoreTypeVersion,omitempty"`
+
+	// PreloadDataConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-healthlake-fhirdatastore.html#cfn-healthlake-fhirdatastore-preloaddataconfig
+	PreloadDataConfig *FHIRDatastore_PreloadDataConfig `json:"PreloadDataConfig,omitempty"`
+
+	// SseConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-healthlake-fhirdatastore.html#cfn-healthlake-fhirdatastore-sseconfiguration
+	SseConfiguration *FHIRDatastore_SseConfiguration `json:"SseConfiguration,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-healthlake-fhirdatastore.html#cfn-healthlake-fhirdatastore-tags
+	Tags []cloudformation.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 *FHIRDatastore) AWSCloudFormationType() string {
+	return "AWS::HealthLake::FHIRDatastore"
+}
+
+// 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 FHIRDatastore) MarshalJSON() ([]byte, error) {
+	type Properties FHIRDatastore
+	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 *FHIRDatastore) UnmarshalJSON(b []byte) error {
+	type Properties FHIRDatastore
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FHIRDatastore(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_kmsencryptionconfig.go b/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_kmsencryptionconfig.go
new file mode 100644
index 0000000000..d3c2ab06aa
--- /dev/null
+++ b/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_kmsencryptionconfig.go
@@ -0,0 +1,42 @@
+package healthlake
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FHIRDatastore_KmsEncryptionConfig AWS CloudFormation Resource (AWS::HealthLake::FHIRDatastore.KmsEncryptionConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-healthlake-fhirdatastore-kmsencryptionconfig.html
+type FHIRDatastore_KmsEncryptionConfig struct {
+
+	// CmkType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-healthlake-fhirdatastore-kmsencryptionconfig.html#cfn-healthlake-fhirdatastore-kmsencryptionconfig-cmktype
+	CmkType *types.Value `json:"CmkType,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-healthlake-fhirdatastore-kmsencryptionconfig.html#cfn-healthlake-fhirdatastore-kmsencryptionconfig-kmskeyid
+	KmsKeyId *types.Value `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 *FHIRDatastore_KmsEncryptionConfig) AWSCloudFormationType() string {
+	return "AWS::HealthLake::FHIRDatastore.KmsEncryptionConfig"
+}
diff --git a/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_preloaddataconfig.go b/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_preloaddataconfig.go
new file mode 100644
index 0000000000..22eea23bbd
--- /dev/null
+++ b/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_preloaddataconfig.go
@@ -0,0 +1,37 @@
+package healthlake
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FHIRDatastore_PreloadDataConfig AWS CloudFormation Resource (AWS::HealthLake::FHIRDatastore.PreloadDataConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-healthlake-fhirdatastore-preloaddataconfig.html
+type FHIRDatastore_PreloadDataConfig struct {
+
+	// PreloadDataType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-healthlake-fhirdatastore-preloaddataconfig.html#cfn-healthlake-fhirdatastore-preloaddataconfig-preloaddatatype
+	PreloadDataType *types.Value `json:"PreloadDataType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FHIRDatastore_PreloadDataConfig) AWSCloudFormationType() string {
+	return "AWS::HealthLake::FHIRDatastore.PreloadDataConfig"
+}
diff --git a/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_sseconfiguration.go b/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_sseconfiguration.go
new file mode 100644
index 0000000000..ea8e923214
--- /dev/null
+++ b/goformation/cloudformation/healthlake/aws-healthlake-fhirdatastore_sseconfiguration.go
@@ -0,0 +1,35 @@
+package healthlake
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// FHIRDatastore_SseConfiguration AWS CloudFormation Resource (AWS::HealthLake::FHIRDatastore.SseConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-healthlake-fhirdatastore-sseconfiguration.html
+type FHIRDatastore_SseConfiguration struct {
+
+	// KmsEncryptionConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-healthlake-fhirdatastore-sseconfiguration.html#cfn-healthlake-fhirdatastore-sseconfiguration-kmsencryptionconfig
+	KmsEncryptionConfig *FHIRDatastore_KmsEncryptionConfig `json:"KmsEncryptionConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FHIRDatastore_SseConfiguration) AWSCloudFormationType() string {
+	return "AWS::HealthLake::FHIRDatastore.SseConfiguration"
+}
diff --git a/goformation/cloudformation/iam/aws-iam-accesskey.go b/goformation/cloudformation/iam/aws-iam-accesskey.go
new file mode 100644
index 0000000000..114f3fd9f1
--- /dev/null
+++ b/goformation/cloudformation/iam/aws-iam-accesskey.go
@@ -0,0 +1,118 @@
+package iam
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessKey AWS CloudFormation Resource (AWS::IAM::AccessKey)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-accesskey.html
+type AccessKey struct {
+
+	// Serial AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-accesskey.html#cfn-iam-accesskey-serial
+	Serial *types.Value `json:"Serial,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-accesskey.html#cfn-iam-accesskey-status
+	Status *types.Value `json:"Status,omitempty"`
+
+	// UserName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-accesskey.html#cfn-iam-accesskey-username
+	UserName *types.Value `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 *AccessKey) AWSCloudFormationType() string {
+	return "AWS::IAM::AccessKey"
+}
+
+// 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 AccessKey) MarshalJSON() ([]byte, error) {
+	type Properties AccessKey
+	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 *AccessKey) UnmarshalJSON(b []byte) error {
+	type Properties AccessKey
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AccessKey(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iam/aws-iam-group.go b/goformation/cloudformation/iam/aws-iam-group.go
new file mode 100644
index 0000000000..3659b1f6f4
--- /dev/null
+++ b/goformation/cloudformation/iam/aws-iam-group.go
@@ -0,0 +1,123 @@
+package iam
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Group AWS CloudFormation Resource (AWS::IAM::Group)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html
+type Group struct {
+
+	// GroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html#cfn-iam-group-groupname
+	GroupName *types.Value `json:"GroupName,omitempty"`
+
+	// ManagedPolicyArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html#cfn-iam-group-managepolicyarns
+	ManagedPolicyArns *types.Value `json:"ManagedPolicyArns,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html#cfn-iam-group-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// Policies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-group.html#cfn-iam-group-policies
+	Policies []Group_Policy `json:"Policies,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Group) AWSCloudFormationType() string {
+	return "AWS::IAM::Group"
+}
+
+// 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 Group) MarshalJSON() ([]byte, error) {
+	type Properties Group
+	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 *Group) UnmarshalJSON(b []byte) error {
+	type Properties Group
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Group(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iam/aws-iam-group_policy.go b/goformation/cloudformation/iam/aws-iam-group_policy.go
new file mode 100644
index 0000000000..8d0e9196df
--- /dev/null
+++ b/goformation/cloudformation/iam/aws-iam-group_policy.go
@@ -0,0 +1,42 @@
+package iam
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Group_Policy AWS CloudFormation Resource (AWS::IAM::Group.Policy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html
+type Group_Policy struct {
+
+	// PolicyDocument AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policydocument
+	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
+
+	// PolicyName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname
+	PolicyName *types.Value `json:"PolicyName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Group_Policy) AWSCloudFormationType() string {
+	return "AWS::IAM::Group.Policy"
+}
diff --git a/goformation/cloudformation/iam/aws-iam-instanceprofile.go b/goformation/cloudformation/iam/aws-iam-instanceprofile.go
new file mode 100644
index 0000000000..f259e29804
--- /dev/null
+++ b/goformation/cloudformation/iam/aws-iam-instanceprofile.go
@@ -0,0 +1,118 @@
+package iam
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceProfile AWS CloudFormation Resource (AWS::IAM::InstanceProfile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html
+type InstanceProfile struct {
+
+	// InstanceProfileName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html#cfn-iam-instanceprofile-instanceprofilename
+	InstanceProfileName *types.Value `json:"InstanceProfileName,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html#cfn-iam-instanceprofile-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// Roles AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-instanceprofile.html#cfn-iam-instanceprofile-roles
+	Roles *types.Value `json:"Roles,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InstanceProfile) AWSCloudFormationType() string {
+	return "AWS::IAM::InstanceProfile"
+}
+
+// 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 InstanceProfile) MarshalJSON() ([]byte, error) {
+	type Properties InstanceProfile
+	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 *InstanceProfile) UnmarshalJSON(b []byte) error {
+	type Properties InstanceProfile
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = InstanceProfile(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iam/aws-iam-managedpolicy.go b/goformation/cloudformation/iam/aws-iam-managedpolicy.go
new file mode 100644
index 0000000000..0ecd849bfe
--- /dev/null
+++ b/goformation/cloudformation/iam/aws-iam-managedpolicy.go
@@ -0,0 +1,138 @@
+package iam
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ManagedPolicy AWS CloudFormation Resource (AWS::IAM::ManagedPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-managedpolicy.html
+type ManagedPolicy struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-managedpolicy.html#cfn-iam-managedpolicy-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Groups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-managedpolicy.html#cfn-iam-managedpolicy-groups
+	Groups *types.Value `json:"Groups,omitempty"`
+
+	// ManagedPolicyName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-managedpolicy.html#cfn-iam-managedpolicy-managedpolicyname
+	ManagedPolicyName *types.Value `json:"ManagedPolicyName,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-managedpolicy.html#cfn-ec2-dhcpoptions-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// PolicyDocument AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-managedpolicy.html#cfn-iam-managedpolicy-policydocument
+	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
+
+	// Roles AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-managedpolicy.html#cfn-iam-managedpolicy-roles
+	Roles *types.Value `json:"Roles,omitempty"`
+
+	// Users AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-managedpolicy.html#cfn-iam-managedpolicy-users
+	Users *types.Value `json:"Users,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ManagedPolicy) AWSCloudFormationType() string {
+	return "AWS::IAM::ManagedPolicy"
+}
+
+// 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 ManagedPolicy) MarshalJSON() ([]byte, error) {
+	type Properties ManagedPolicy
+	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 *ManagedPolicy) UnmarshalJSON(b []byte) error {
+	type Properties ManagedPolicy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ManagedPolicy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iam/aws-iam-oidcprovider.go b/goformation/cloudformation/iam/aws-iam-oidcprovider.go
new file mode 100644
index 0000000000..64b5e31850
--- /dev/null
+++ b/goformation/cloudformation/iam/aws-iam-oidcprovider.go
@@ -0,0 +1,124 @@
+package iam
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// OIDCProvider AWS CloudFormation Resource (AWS::IAM::OIDCProvider)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-oidcprovider.html
+type OIDCProvider struct {
+
+	// ClientIdList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-oidcprovider.html#cfn-iam-oidcprovider-clientidlist
+	ClientIdList *types.Value `json:"ClientIdList,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-oidcprovider.html#cfn-iam-oidcprovider-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// ThumbprintList AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-oidcprovider.html#cfn-iam-oidcprovider-thumbprintlist
+	ThumbprintList *types.Value `json:"ThumbprintList,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-oidcprovider.html#cfn-iam-oidcprovider-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *OIDCProvider) AWSCloudFormationType() string {
+	return "AWS::IAM::OIDCProvider"
+}
+
+// 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 OIDCProvider) MarshalJSON() ([]byte, error) {
+	type Properties OIDCProvider
+	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 *OIDCProvider) UnmarshalJSON(b []byte) error {
+	type Properties OIDCProvider
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = OIDCProvider(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iam/aws-iam-policy.go b/goformation/cloudformation/iam/aws-iam-policy.go
new file mode 100644
index 0000000000..b4e74307c5
--- /dev/null
+++ b/goformation/cloudformation/iam/aws-iam-policy.go
@@ -0,0 +1,128 @@
+package iam
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Policy AWS CloudFormation Resource (AWS::IAM::Policy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html
+type Policy struct {
+
+	// Groups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-groups
+	Groups *types.Value `json:"Groups,omitempty"`
+
+	// PolicyDocument AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policydocument
+	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
+
+	// PolicyName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-policyname
+	PolicyName *types.Value `json:"PolicyName,omitempty"`
+
+	// Roles AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-roles
+	Roles *types.Value `json:"Roles,omitempty"`
+
+	// Users AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-policy.html#cfn-iam-policy-users
+	Users *types.Value `json:"Users,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Policy) AWSCloudFormationType() string {
+	return "AWS::IAM::Policy"
+}
+
+// MarshalJSON is a custom JSON marshalling hook that embeds this object into
+// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
+func (r Policy) MarshalJSON() ([]byte, error) {
+	type Properties Policy
+	return json.Marshal(&struct {
+		Type                string
+		Properties          Properties
+		DependsOn           []string                     `json:"DependsOn,omitempty"`
+		Metadata            map[string]interface{}       `json:"Metadata,omitempty"`
+		DeletionPolicy      policies.DeletionPolicy      `json:"DeletionPolicy,omitempty"`
+		UpdateReplacePolicy policies.UpdateReplacePolicy `json:"UpdateReplacePolicy,omitempty"`
+		Condition           string                       `json:"Condition,omitempty"`
+	}{
+		Type:                r.AWSCloudFormationType(),
+		Properties:          (Properties)(r),
+		DependsOn:           r.AWSCloudFormationDependsOn,
+		Metadata:            r.AWSCloudFormationMetadata,
+		DeletionPolicy:      r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition:           r.AWSCloudFormationCondition,
+	})
+}
+
+// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
+// AWS CloudFormation resource object, and just keeps the 'Properties' field.
+func (r *Policy) UnmarshalJSON(b []byte) error {
+	type Properties Policy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Policy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iam/aws-iam-role.go b/goformation/cloudformation/iam/aws-iam-role.go
new file mode 100644
index 0000000000..eed91091e7
--- /dev/null
+++ b/goformation/cloudformation/iam/aws-iam-role.go
@@ -0,0 +1,149 @@
+package iam
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Role AWS CloudFormation Resource (AWS::IAM::Role)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html
+type Role struct {
+
+	// AssumeRolePolicyDocument AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html#cfn-iam-role-assumerolepolicydocument
+	AssumeRolePolicyDocument interface{} `json:"AssumeRolePolicyDocument,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html#cfn-iam-role-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// ManagedPolicyArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html#cfn-iam-role-managepolicyarns
+	ManagedPolicyArns *types.Value `json:"ManagedPolicyArns,omitempty"`
+
+	// MaxSessionDuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html#cfn-iam-role-maxsessionduration
+	MaxSessionDuration *types.Value `json:"MaxSessionDuration,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html#cfn-iam-role-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// PermissionsBoundary AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html#cfn-iam-role-permissionsboundary
+	PermissionsBoundary *types.Value `json:"PermissionsBoundary,omitempty"`
+
+	// Policies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html#cfn-iam-role-policies
+	Policies []Role_Policy `json:"Policies,omitempty"`
+
+	// RoleName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html#cfn-iam-role-rolename
+	RoleName *types.Value `json:"RoleName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-role.html#cfn-iam-role-tags
+	Tags []cloudformation.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 *Role) AWSCloudFormationType() string {
+	return "AWS::IAM::Role"
+}
+
+// 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 Role) MarshalJSON() ([]byte, error) {
+	type Properties Role
+	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 *Role) UnmarshalJSON(b []byte) error {
+	type Properties Role
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Role(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iam/aws-iam-role_policy.go b/goformation/cloudformation/iam/aws-iam-role_policy.go
new file mode 100644
index 0000000000..a286db4692
--- /dev/null
+++ b/goformation/cloudformation/iam/aws-iam-role_policy.go
@@ -0,0 +1,42 @@
+package iam
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Role_Policy AWS CloudFormation Resource (AWS::IAM::Role.Policy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html
+type Role_Policy struct {
+
+	// PolicyDocument AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policydocument
+	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
+
+	// PolicyName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname
+	PolicyName *types.Value `json:"PolicyName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Role_Policy) AWSCloudFormationType() string {
+	return "AWS::IAM::Role.Policy"
+}
diff --git a/goformation/cloudformation/iam/aws-iam-samlprovider.go b/goformation/cloudformation/iam/aws-iam-samlprovider.go
new file mode 100644
index 0000000000..94a19d1ce6
--- /dev/null
+++ b/goformation/cloudformation/iam/aws-iam-samlprovider.go
@@ -0,0 +1,119 @@
+package iam
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// SAMLProvider AWS CloudFormation Resource (AWS::IAM::SAMLProvider)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-samlprovider.html
+type SAMLProvider struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-samlprovider.html#cfn-iam-samlprovider-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SamlMetadataDocument AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-samlprovider.html#cfn-iam-samlprovider-samlmetadatadocument
+	SamlMetadataDocument *types.Value `json:"SamlMetadataDocument,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-samlprovider.html#cfn-iam-samlprovider-tags
+	Tags []cloudformation.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 *SAMLProvider) AWSCloudFormationType() string {
+	return "AWS::IAM::SAMLProvider"
+}
+
+// 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 SAMLProvider) MarshalJSON() ([]byte, error) {
+	type Properties SAMLProvider
+	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 *SAMLProvider) UnmarshalJSON(b []byte) error {
+	type Properties SAMLProvider
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SAMLProvider(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iam/aws-iam-servercertificate.go b/goformation/cloudformation/iam/aws-iam-servercertificate.go
new file mode 100644
index 0000000000..1161cff236
--- /dev/null
+++ b/goformation/cloudformation/iam/aws-iam-servercertificate.go
@@ -0,0 +1,134 @@
+package iam
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ServerCertificate AWS CloudFormation Resource (AWS::IAM::ServerCertificate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-servercertificate.html
+type ServerCertificate struct {
+
+	// CertificateBody AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-servercertificate.html#cfn-iam-servercertificate-certificatebody
+	CertificateBody *types.Value `json:"CertificateBody,omitempty"`
+
+	// CertificateChain AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-servercertificate.html#cfn-iam-servercertificate-certificatechain
+	CertificateChain *types.Value `json:"CertificateChain,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-servercertificate.html#cfn-iam-servercertificate-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// PrivateKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-servercertificate.html#cfn-iam-servercertificate-privatekey
+	PrivateKey *types.Value `json:"PrivateKey,omitempty"`
+
+	// ServerCertificateName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-servercertificate.html#cfn-iam-servercertificate-servercertificatename
+	ServerCertificateName *types.Value `json:"ServerCertificateName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-servercertificate.html#cfn-iam-servercertificate-tags
+	Tags []cloudformation.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 *ServerCertificate) AWSCloudFormationType() string {
+	return "AWS::IAM::ServerCertificate"
+}
+
+// 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 ServerCertificate) MarshalJSON() ([]byte, error) {
+	type Properties ServerCertificate
+	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 *ServerCertificate) UnmarshalJSON(b []byte) error {
+	type Properties ServerCertificate
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ServerCertificate(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iam/aws-iam-servicelinkedrole.go b/goformation/cloudformation/iam/aws-iam-servicelinkedrole.go
new file mode 100644
index 0000000000..f124071343
--- /dev/null
+++ b/goformation/cloudformation/iam/aws-iam-servicelinkedrole.go
@@ -0,0 +1,118 @@
+package iam
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ServiceLinkedRole AWS CloudFormation Resource (AWS::IAM::ServiceLinkedRole)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-servicelinkedrole.html
+type ServiceLinkedRole struct {
+
+	// AWSServiceName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-servicelinkedrole.html#cfn-iam-servicelinkedrole-awsservicename
+	AWSServiceName *types.Value `json:"AWSServiceName,omitempty"`
+
+	// CustomSuffix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-servicelinkedrole.html#cfn-iam-servicelinkedrole-customsuffix
+	CustomSuffix *types.Value `json:"CustomSuffix,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-servicelinkedrole.html#cfn-iam-servicelinkedrole-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ServiceLinkedRole) AWSCloudFormationType() string {
+	return "AWS::IAM::ServiceLinkedRole"
+}
+
+// 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 ServiceLinkedRole) MarshalJSON() ([]byte, error) {
+	type Properties ServiceLinkedRole
+	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 *ServiceLinkedRole) UnmarshalJSON(b []byte) error {
+	type Properties ServiceLinkedRole
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ServiceLinkedRole(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iam/aws-iam-user.go b/goformation/cloudformation/iam/aws-iam-user.go
new file mode 100644
index 0000000000..d0e2824110
--- /dev/null
+++ b/goformation/cloudformation/iam/aws-iam-user.go
@@ -0,0 +1,144 @@
+package iam
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// User AWS CloudFormation Resource (AWS::IAM::User)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html
+type User struct {
+
+	// Groups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html#cfn-iam-user-groups
+	Groups *types.Value `json:"Groups,omitempty"`
+
+	// LoginProfile AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html#cfn-iam-user-loginprofile
+	LoginProfile *User_LoginProfile `json:"LoginProfile,omitempty"`
+
+	// ManagedPolicyArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html#cfn-iam-user-managepolicyarns
+	ManagedPolicyArns *types.Value `json:"ManagedPolicyArns,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html#cfn-iam-user-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// PermissionsBoundary AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html#cfn-iam-user-permissionsboundary
+	PermissionsBoundary *types.Value `json:"PermissionsBoundary,omitempty"`
+
+	// Policies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html#cfn-iam-user-policies
+	Policies []User_Policy `json:"Policies,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html#cfn-iam-user-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// UserName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user.html#cfn-iam-user-username
+	UserName *types.Value `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 *User) AWSCloudFormationType() string {
+	return "AWS::IAM::User"
+}
+
+// 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 User) MarshalJSON() ([]byte, error) {
+	type Properties User
+	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 *User) UnmarshalJSON(b []byte) error {
+	type Properties User
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = User(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iam/aws-iam-user_loginprofile.go b/goformation/cloudformation/iam/aws-iam-user_loginprofile.go
new file mode 100644
index 0000000000..de19ff625f
--- /dev/null
+++ b/goformation/cloudformation/iam/aws-iam-user_loginprofile.go
@@ -0,0 +1,42 @@
+package iam
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// User_LoginProfile AWS CloudFormation Resource (AWS::IAM::User.LoginProfile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user-loginprofile.html
+type User_LoginProfile struct {
+
+	// Password AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user-loginprofile.html#cfn-iam-user-loginprofile-password
+	Password *types.Value `json:"Password,omitempty"`
+
+	// PasswordResetRequired AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-user-loginprofile.html#cfn-iam-user-loginprofile-passwordresetrequired
+	PasswordResetRequired *types.Value `json:"PasswordResetRequired,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *User_LoginProfile) AWSCloudFormationType() string {
+	return "AWS::IAM::User.LoginProfile"
+}
diff --git a/goformation/cloudformation/iam/aws-iam-user_policy.go b/goformation/cloudformation/iam/aws-iam-user_policy.go
new file mode 100644
index 0000000000..5eb9b4e0bd
--- /dev/null
+++ b/goformation/cloudformation/iam/aws-iam-user_policy.go
@@ -0,0 +1,42 @@
+package iam
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// User_Policy AWS CloudFormation Resource (AWS::IAM::User.Policy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html
+type User_Policy struct {
+
+	// PolicyDocument AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policydocument
+	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
+
+	// PolicyName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-policy.html#cfn-iam-policies-policyname
+	PolicyName *types.Value `json:"PolicyName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *User_Policy) AWSCloudFormationType() string {
+	return "AWS::IAM::User.Policy"
+}
diff --git a/goformation/cloudformation/iam/aws-iam-usertogroupaddition.go b/goformation/cloudformation/iam/aws-iam-usertogroupaddition.go
new file mode 100644
index 0000000000..0e3d79b398
--- /dev/null
+++ b/goformation/cloudformation/iam/aws-iam-usertogroupaddition.go
@@ -0,0 +1,113 @@
+package iam
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserToGroupAddition AWS CloudFormation Resource (AWS::IAM::UserToGroupAddition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-addusertogroup.html
+type UserToGroupAddition struct {
+
+	// GroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-addusertogroup.html#cfn-iam-addusertogroup-groupname
+	GroupName *types.Value `json:"GroupName,omitempty"`
+
+	// Users AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iam-addusertogroup.html#cfn-iam-addusertogroup-users
+	Users *types.Value `json:"Users,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *UserToGroupAddition) AWSCloudFormationType() string {
+	return "AWS::IAM::UserToGroupAddition"
+}
+
+// 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 UserToGroupAddition) MarshalJSON() ([]byte, error) {
+	type Properties UserToGroupAddition
+	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 *UserToGroupAddition) UnmarshalJSON(b []byte) error {
+	type Properties UserToGroupAddition
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = UserToGroupAddition(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iam/aws-iam-virtualmfadevice.go b/goformation/cloudformation/iam/aws-iam-virtualmfadevice.go
new file mode 100644
index 0000000000..e132b62fee
--- /dev/null
+++ b/goformation/cloudformation/iam/aws-iam-virtualmfadevice.go
@@ -0,0 +1,124 @@
+package iam
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// VirtualMFADevice AWS CloudFormation Resource (AWS::IAM::VirtualMFADevice)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-virtualmfadevice.html
+type VirtualMFADevice struct {
+
+	// Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-virtualmfadevice.html#cfn-iam-virtualmfadevice-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-virtualmfadevice.html#cfn-iam-virtualmfadevice-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Users AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-virtualmfadevice.html#cfn-iam-virtualmfadevice-users
+	Users *types.Value `json:"Users,omitempty"`
+
+	// VirtualMfaDeviceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iam-virtualmfadevice.html#cfn-iam-virtualmfadevice-virtualmfadevicename
+	VirtualMfaDeviceName *types.Value `json:"VirtualMfaDeviceName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *VirtualMFADevice) AWSCloudFormationType() string {
+	return "AWS::IAM::VirtualMFADevice"
+}
+
+// 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 VirtualMFADevice) MarshalJSON() ([]byte, error) {
+	type Properties VirtualMFADevice
+	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 *VirtualMFADevice) UnmarshalJSON(b []byte) error {
+	type Properties VirtualMFADevice
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VirtualMFADevice(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/imagebuilder/aws-imagebuilder-component.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-component.go
new file mode 100644
index 0000000000..5ab269b146
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-component.go
@@ -0,0 +1,153 @@
+package imagebuilder
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Component AWS CloudFormation Resource (AWS::ImageBuilder::Component)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-component.html
+type Component struct {
+
+	// ChangeDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-component.html#cfn-imagebuilder-component-changedescription
+	ChangeDescription *types.Value `json:"ChangeDescription,omitempty"`
+
+	// Data AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-component.html#cfn-imagebuilder-component-data
+	Data *types.Value `json:"Data,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-component.html#cfn-imagebuilder-component-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-component.html#cfn-imagebuilder-component-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-component.html#cfn-imagebuilder-component-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Platform AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-component.html#cfn-imagebuilder-component-platform
+	Platform *types.Value `json:"Platform,omitempty"`
+
+	// SupportedOsVersions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-component.html#cfn-imagebuilder-component-supportedosversions
+	SupportedOsVersions *types.Value `json:"SupportedOsVersions,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-component.html#cfn-imagebuilder-component-tags
+	Tags map[string]*types.Value `json:"Tags,omitempty"`
+
+	// Uri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-component.html#cfn-imagebuilder-component-uri
+	Uri *types.Value `json:"Uri,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-component.html#cfn-imagebuilder-component-version
+	Version *types.Value `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 *Component) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::Component"
+}
+
+// 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 Component) MarshalJSON() ([]byte, error) {
+	type Properties Component
+	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 *Component) UnmarshalJSON(b []byte) error {
+	type Properties Component
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Component(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe.go
new file mode 100644
index 0000000000..101bdf1501
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe.go
@@ -0,0 +1,178 @@
+package imagebuilder
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ContainerRecipe AWS CloudFormation Resource (AWS::ImageBuilder::ContainerRecipe)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html
+type ContainerRecipe struct {
+
+	// Components AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html#cfn-imagebuilder-containerrecipe-components
+	Components []ContainerRecipe_ComponentConfiguration `json:"Components,omitempty"`
+
+	// ContainerType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html#cfn-imagebuilder-containerrecipe-containertype
+	ContainerType *types.Value `json:"ContainerType,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html#cfn-imagebuilder-containerrecipe-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DockerfileTemplateData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html#cfn-imagebuilder-containerrecipe-dockerfiletemplatedata
+	DockerfileTemplateData *types.Value `json:"DockerfileTemplateData,omitempty"`
+
+	// DockerfileTemplateUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html#cfn-imagebuilder-containerrecipe-dockerfiletemplateuri
+	DockerfileTemplateUri *types.Value `json:"DockerfileTemplateUri,omitempty"`
+
+	// ImageOsVersionOverride AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html#cfn-imagebuilder-containerrecipe-imageosversionoverride
+	ImageOsVersionOverride *types.Value `json:"ImageOsVersionOverride,omitempty"`
+
+	// InstanceConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html#cfn-imagebuilder-containerrecipe-instanceconfiguration
+	InstanceConfiguration *ContainerRecipe_InstanceConfiguration `json:"InstanceConfiguration,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html#cfn-imagebuilder-containerrecipe-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html#cfn-imagebuilder-containerrecipe-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ParentImage AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html#cfn-imagebuilder-containerrecipe-parentimage
+	ParentImage *types.Value `json:"ParentImage,omitempty"`
+
+	// PlatformOverride AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html#cfn-imagebuilder-containerrecipe-platformoverride
+	PlatformOverride *types.Value `json:"PlatformOverride,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html#cfn-imagebuilder-containerrecipe-tags
+	Tags map[string]*types.Value `json:"Tags,omitempty"`
+
+	// TargetRepository AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html#cfn-imagebuilder-containerrecipe-targetrepository
+	TargetRepository *ContainerRecipe_TargetContainerRepository `json:"TargetRepository,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html#cfn-imagebuilder-containerrecipe-version
+	Version *types.Value `json:"Version,omitempty"`
+
+	// WorkingDirectory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-containerrecipe.html#cfn-imagebuilder-containerrecipe-workingdirectory
+	WorkingDirectory *types.Value `json:"WorkingDirectory,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ContainerRecipe) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::ContainerRecipe"
+}
+
+// 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 ContainerRecipe) MarshalJSON() ([]byte, error) {
+	type Properties ContainerRecipe
+	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 *ContainerRecipe) UnmarshalJSON(b []byte) error {
+	type Properties ContainerRecipe
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ContainerRecipe(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_componentconfiguration.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_componentconfiguration.go
new file mode 100644
index 0000000000..eb872db474
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_componentconfiguration.go
@@ -0,0 +1,37 @@
+package imagebuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ContainerRecipe_ComponentConfiguration AWS CloudFormation Resource (AWS::ImageBuilder::ContainerRecipe.ComponentConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-componentconfiguration.html
+type ContainerRecipe_ComponentConfiguration struct {
+
+	// ComponentArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-componentconfiguration.html#cfn-imagebuilder-containerrecipe-componentconfiguration-componentarn
+	ComponentArn *types.Value `json:"ComponentArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ContainerRecipe_ComponentConfiguration) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::ContainerRecipe.ComponentConfiguration"
+}
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_ebsinstanceblockdevicespecification.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_ebsinstanceblockdevicespecification.go
new file mode 100644
index 0000000000..4c071831d4
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_ebsinstanceblockdevicespecification.go
@@ -0,0 +1,72 @@
+package imagebuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ContainerRecipe_EbsInstanceBlockDeviceSpecification AWS CloudFormation Resource (AWS::ImageBuilder::ContainerRecipe.EbsInstanceBlockDeviceSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-ebsinstanceblockdevicespecification.html
+type ContainerRecipe_EbsInstanceBlockDeviceSpecification struct {
+
+	// DeleteOnTermination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-ebsinstanceblockdevicespecification.html#cfn-imagebuilder-containerrecipe-ebsinstanceblockdevicespecification-deleteontermination
+	DeleteOnTermination *types.Value `json:"DeleteOnTermination,omitempty"`
+
+	// Encrypted AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-ebsinstanceblockdevicespecification.html#cfn-imagebuilder-containerrecipe-ebsinstanceblockdevicespecification-encrypted
+	Encrypted *types.Value `json:"Encrypted,omitempty"`
+
+	// Iops AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-ebsinstanceblockdevicespecification.html#cfn-imagebuilder-containerrecipe-ebsinstanceblockdevicespecification-iops
+	Iops *types.Value `json:"Iops,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-ebsinstanceblockdevicespecification.html#cfn-imagebuilder-containerrecipe-ebsinstanceblockdevicespecification-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// SnapshotId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-ebsinstanceblockdevicespecification.html#cfn-imagebuilder-containerrecipe-ebsinstanceblockdevicespecification-snapshotid
+	SnapshotId *types.Value `json:"SnapshotId,omitempty"`
+
+	// Throughput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-ebsinstanceblockdevicespecification.html#cfn-imagebuilder-containerrecipe-ebsinstanceblockdevicespecification-throughput
+	Throughput *types.Value `json:"Throughput,omitempty"`
+
+	// VolumeSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-ebsinstanceblockdevicespecification.html#cfn-imagebuilder-containerrecipe-ebsinstanceblockdevicespecification-volumesize
+	VolumeSize *types.Value `json:"VolumeSize,omitempty"`
+
+	// VolumeType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-ebsinstanceblockdevicespecification.html#cfn-imagebuilder-containerrecipe-ebsinstanceblockdevicespecification-volumetype
+	VolumeType *types.Value `json:"VolumeType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ContainerRecipe_EbsInstanceBlockDeviceSpecification) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::ContainerRecipe.EbsInstanceBlockDeviceSpecification"
+}
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceblockdevicemapping.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceblockdevicemapping.go
new file mode 100644
index 0000000000..2aca683881
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceblockdevicemapping.go
@@ -0,0 +1,52 @@
+package imagebuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ContainerRecipe_InstanceBlockDeviceMapping AWS CloudFormation Resource (AWS::ImageBuilder::ContainerRecipe.InstanceBlockDeviceMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-instanceblockdevicemapping.html
+type ContainerRecipe_InstanceBlockDeviceMapping struct {
+
+	// DeviceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-instanceblockdevicemapping.html#cfn-imagebuilder-containerrecipe-instanceblockdevicemapping-devicename
+	DeviceName *types.Value `json:"DeviceName,omitempty"`
+
+	// Ebs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-instanceblockdevicemapping.html#cfn-imagebuilder-containerrecipe-instanceblockdevicemapping-ebs
+	Ebs *ContainerRecipe_EbsInstanceBlockDeviceSpecification `json:"Ebs,omitempty"`
+
+	// NoDevice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-instanceblockdevicemapping.html#cfn-imagebuilder-containerrecipe-instanceblockdevicemapping-nodevice
+	NoDevice *types.Value `json:"NoDevice,omitempty"`
+
+	// VirtualName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-instanceblockdevicemapping.html#cfn-imagebuilder-containerrecipe-instanceblockdevicemapping-virtualname
+	VirtualName *types.Value `json:"VirtualName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ContainerRecipe_InstanceBlockDeviceMapping) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::ContainerRecipe.InstanceBlockDeviceMapping"
+}
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceconfiguration.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceconfiguration.go
new file mode 100644
index 0000000000..0c478e2bfa
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_instanceconfiguration.go
@@ -0,0 +1,42 @@
+package imagebuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ContainerRecipe_InstanceConfiguration AWS CloudFormation Resource (AWS::ImageBuilder::ContainerRecipe.InstanceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-instanceconfiguration.html
+type ContainerRecipe_InstanceConfiguration struct {
+
+	// BlockDeviceMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-instanceconfiguration.html#cfn-imagebuilder-containerrecipe-instanceconfiguration-blockdevicemappings
+	BlockDeviceMappings []ContainerRecipe_InstanceBlockDeviceMapping `json:"BlockDeviceMappings,omitempty"`
+
+	// Image AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-instanceconfiguration.html#cfn-imagebuilder-containerrecipe-instanceconfiguration-image
+	Image *types.Value `json:"Image,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ContainerRecipe_InstanceConfiguration) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::ContainerRecipe.InstanceConfiguration"
+}
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_targetcontainerrepository.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_targetcontainerrepository.go
new file mode 100644
index 0000000000..eed4e320a3
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-containerrecipe_targetcontainerrepository.go
@@ -0,0 +1,42 @@
+package imagebuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ContainerRecipe_TargetContainerRepository AWS CloudFormation Resource (AWS::ImageBuilder::ContainerRecipe.TargetContainerRepository)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-targetcontainerrepository.html
+type ContainerRecipe_TargetContainerRepository struct {
+
+	// RepositoryName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-targetcontainerrepository.html#cfn-imagebuilder-containerrecipe-targetcontainerrepository-repositoryname
+	RepositoryName *types.Value `json:"RepositoryName,omitempty"`
+
+	// Service AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-containerrecipe-targetcontainerrepository.html#cfn-imagebuilder-containerrecipe-targetcontainerrepository-service
+	Service *types.Value `json:"Service,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ContainerRecipe_TargetContainerRepository) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::ContainerRecipe.TargetContainerRepository"
+}
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration.go
new file mode 100644
index 0000000000..0fba511195
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration.go
@@ -0,0 +1,123 @@
+package imagebuilder
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DistributionConfiguration AWS CloudFormation Resource (AWS::ImageBuilder::DistributionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-distributionconfiguration.html
+type DistributionConfiguration struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-distributionconfiguration.html#cfn-imagebuilder-distributionconfiguration-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Distributions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-distributionconfiguration.html#cfn-imagebuilder-distributionconfiguration-distributions
+	Distributions []DistributionConfiguration_Distribution `json:"Distributions,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-distributionconfiguration.html#cfn-imagebuilder-distributionconfiguration-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-distributionconfiguration.html#cfn-imagebuilder-distributionconfiguration-tags
+	Tags map[string]*types.Value `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 *DistributionConfiguration) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::DistributionConfiguration"
+}
+
+// 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 DistributionConfiguration) MarshalJSON() ([]byte, error) {
+	type Properties DistributionConfiguration
+	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 *DistributionConfiguration) UnmarshalJSON(b []byte) error {
+	type Properties DistributionConfiguration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DistributionConfiguration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_distribution.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_distribution.go
new file mode 100644
index 0000000000..658fc14d2a
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_distribution.go
@@ -0,0 +1,57 @@
+package imagebuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DistributionConfiguration_Distribution AWS CloudFormation Resource (AWS::ImageBuilder::DistributionConfiguration.Distribution)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-distributionconfiguration-distribution.html
+type DistributionConfiguration_Distribution struct {
+
+	// AmiDistributionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-distributionconfiguration-distribution.html#cfn-imagebuilder-distributionconfiguration-distribution-amidistributionconfiguration
+	AmiDistributionConfiguration interface{} `json:"AmiDistributionConfiguration,omitempty"`
+
+	// ContainerDistributionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-distributionconfiguration-distribution.html#cfn-imagebuilder-distributionconfiguration-distribution-containerdistributionconfiguration
+	ContainerDistributionConfiguration interface{} `json:"ContainerDistributionConfiguration,omitempty"`
+
+	// LaunchTemplateConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-distributionconfiguration-distribution.html#cfn-imagebuilder-distributionconfiguration-distribution-launchtemplateconfigurations
+	LaunchTemplateConfigurations []DistributionConfiguration_LaunchTemplateConfiguration `json:"LaunchTemplateConfigurations,omitempty"`
+
+	// LicenseConfigurationArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-distributionconfiguration-distribution.html#cfn-imagebuilder-distributionconfiguration-distribution-licenseconfigurationarns
+	LicenseConfigurationArns *types.Value `json:"LicenseConfigurationArns,omitempty"`
+
+	// Region AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-distributionconfiguration-distribution.html#cfn-imagebuilder-distributionconfiguration-distribution-region
+	Region *types.Value `json:"Region,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DistributionConfiguration_Distribution) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::DistributionConfiguration.Distribution"
+}
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_launchtemplateconfiguration.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_launchtemplateconfiguration.go
new file mode 100644
index 0000000000..dd5010e331
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-distributionconfiguration_launchtemplateconfiguration.go
@@ -0,0 +1,47 @@
+package imagebuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DistributionConfiguration_LaunchTemplateConfiguration AWS CloudFormation Resource (AWS::ImageBuilder::DistributionConfiguration.LaunchTemplateConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-distributionconfiguration-launchtemplateconfiguration.html
+type DistributionConfiguration_LaunchTemplateConfiguration struct {
+
+	// AccountId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-distributionconfiguration-launchtemplateconfiguration.html#cfn-imagebuilder-distributionconfiguration-launchtemplateconfiguration-accountid
+	AccountId *types.Value `json:"AccountId,omitempty"`
+
+	// LaunchTemplateId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-distributionconfiguration-launchtemplateconfiguration.html#cfn-imagebuilder-distributionconfiguration-launchtemplateconfiguration-launchtemplateid
+	LaunchTemplateId *types.Value `json:"LaunchTemplateId,omitempty"`
+
+	// SetDefaultVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-distributionconfiguration-launchtemplateconfiguration.html#cfn-imagebuilder-distributionconfiguration-launchtemplateconfiguration-setdefaultversion
+	SetDefaultVersion *types.Value `json:"SetDefaultVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DistributionConfiguration_LaunchTemplateConfiguration) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::DistributionConfiguration.LaunchTemplateConfiguration"
+}
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-image.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-image.go
new file mode 100644
index 0000000000..0ed6e1da38
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-image.go
@@ -0,0 +1,138 @@
+package imagebuilder
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Image AWS CloudFormation Resource (AWS::ImageBuilder::Image)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-image.html
+type Image struct {
+
+	// ContainerRecipeArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-image.html#cfn-imagebuilder-image-containerrecipearn
+	ContainerRecipeArn *types.Value `json:"ContainerRecipeArn,omitempty"`
+
+	// DistributionConfigurationArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-image.html#cfn-imagebuilder-image-distributionconfigurationarn
+	DistributionConfigurationArn *types.Value `json:"DistributionConfigurationArn,omitempty"`
+
+	// EnhancedImageMetadataEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-image.html#cfn-imagebuilder-image-enhancedimagemetadataenabled
+	EnhancedImageMetadataEnabled *types.Value `json:"EnhancedImageMetadataEnabled,omitempty"`
+
+	// ImageRecipeArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-image.html#cfn-imagebuilder-image-imagerecipearn
+	ImageRecipeArn *types.Value `json:"ImageRecipeArn,omitempty"`
+
+	// ImageTestsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-image.html#cfn-imagebuilder-image-imagetestsconfiguration
+	ImageTestsConfiguration *Image_ImageTestsConfiguration `json:"ImageTestsConfiguration,omitempty"`
+
+	// InfrastructureConfigurationArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-image.html#cfn-imagebuilder-image-infrastructureconfigurationarn
+	InfrastructureConfigurationArn *types.Value `json:"InfrastructureConfigurationArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-image.html#cfn-imagebuilder-image-tags
+	Tags map[string]*types.Value `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 *Image) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::Image"
+}
+
+// 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 Image) MarshalJSON() ([]byte, error) {
+	type Properties Image
+	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 *Image) UnmarshalJSON(b []byte) error {
+	type Properties Image
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Image(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/imagebuilder/aws-imagebuilder-image_imagetestsconfiguration.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-image_imagetestsconfiguration.go
new file mode 100644
index 0000000000..08e2101c4d
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-image_imagetestsconfiguration.go
@@ -0,0 +1,42 @@
+package imagebuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Image_ImageTestsConfiguration AWS CloudFormation Resource (AWS::ImageBuilder::Image.ImageTestsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-image-imagetestsconfiguration.html
+type Image_ImageTestsConfiguration struct {
+
+	// ImageTestsEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-image-imagetestsconfiguration.html#cfn-imagebuilder-image-imagetestsconfiguration-imagetestsenabled
+	ImageTestsEnabled *types.Value `json:"ImageTestsEnabled,omitempty"`
+
+	// TimeoutMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-image-imagetestsconfiguration.html#cfn-imagebuilder-image-imagetestsconfiguration-timeoutminutes
+	TimeoutMinutes *types.Value `json:"TimeoutMinutes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Image_ImageTestsConfiguration) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::Image.ImageTestsConfiguration"
+}
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline.go
new file mode 100644
index 0000000000..faffc3106d
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline.go
@@ -0,0 +1,158 @@
+package imagebuilder
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ImagePipeline AWS CloudFormation Resource (AWS::ImageBuilder::ImagePipeline)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagepipeline.html
+type ImagePipeline struct {
+
+	// ContainerRecipeArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagepipeline.html#cfn-imagebuilder-imagepipeline-containerrecipearn
+	ContainerRecipeArn *types.Value `json:"ContainerRecipeArn,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagepipeline.html#cfn-imagebuilder-imagepipeline-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DistributionConfigurationArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagepipeline.html#cfn-imagebuilder-imagepipeline-distributionconfigurationarn
+	DistributionConfigurationArn *types.Value `json:"DistributionConfigurationArn,omitempty"`
+
+	// EnhancedImageMetadataEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagepipeline.html#cfn-imagebuilder-imagepipeline-enhancedimagemetadataenabled
+	EnhancedImageMetadataEnabled *types.Value `json:"EnhancedImageMetadataEnabled,omitempty"`
+
+	// ImageRecipeArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagepipeline.html#cfn-imagebuilder-imagepipeline-imagerecipearn
+	ImageRecipeArn *types.Value `json:"ImageRecipeArn,omitempty"`
+
+	// ImageTestsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagepipeline.html#cfn-imagebuilder-imagepipeline-imagetestsconfiguration
+	ImageTestsConfiguration *ImagePipeline_ImageTestsConfiguration `json:"ImageTestsConfiguration,omitempty"`
+
+	// InfrastructureConfigurationArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagepipeline.html#cfn-imagebuilder-imagepipeline-infrastructureconfigurationarn
+	InfrastructureConfigurationArn *types.Value `json:"InfrastructureConfigurationArn,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagepipeline.html#cfn-imagebuilder-imagepipeline-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Schedule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagepipeline.html#cfn-imagebuilder-imagepipeline-schedule
+	Schedule *ImagePipeline_Schedule `json:"Schedule,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagepipeline.html#cfn-imagebuilder-imagepipeline-status
+	Status *types.Value `json:"Status,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagepipeline.html#cfn-imagebuilder-imagepipeline-tags
+	Tags map[string]*types.Value `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 *ImagePipeline) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::ImagePipeline"
+}
+
+// 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 ImagePipeline) MarshalJSON() ([]byte, error) {
+	type Properties ImagePipeline
+	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 *ImagePipeline) UnmarshalJSON(b []byte) error {
+	type Properties ImagePipeline
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ImagePipeline(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_imagetestsconfiguration.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_imagetestsconfiguration.go
new file mode 100644
index 0000000000..9c072e8231
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_imagetestsconfiguration.go
@@ -0,0 +1,42 @@
+package imagebuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ImagePipeline_ImageTestsConfiguration AWS CloudFormation Resource (AWS::ImageBuilder::ImagePipeline.ImageTestsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagepipeline-imagetestsconfiguration.html
+type ImagePipeline_ImageTestsConfiguration struct {
+
+	// ImageTestsEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagepipeline-imagetestsconfiguration.html#cfn-imagebuilder-imagepipeline-imagetestsconfiguration-imagetestsenabled
+	ImageTestsEnabled *types.Value `json:"ImageTestsEnabled,omitempty"`
+
+	// TimeoutMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagepipeline-imagetestsconfiguration.html#cfn-imagebuilder-imagepipeline-imagetestsconfiguration-timeoutminutes
+	TimeoutMinutes *types.Value `json:"TimeoutMinutes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ImagePipeline_ImageTestsConfiguration) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::ImagePipeline.ImageTestsConfiguration"
+}
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_schedule.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_schedule.go
new file mode 100644
index 0000000000..24d902227d
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagepipeline_schedule.go
@@ -0,0 +1,42 @@
+package imagebuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ImagePipeline_Schedule AWS CloudFormation Resource (AWS::ImageBuilder::ImagePipeline.Schedule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagepipeline-schedule.html
+type ImagePipeline_Schedule struct {
+
+	// PipelineExecutionStartCondition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagepipeline-schedule.html#cfn-imagebuilder-imagepipeline-schedule-pipelineexecutionstartcondition
+	PipelineExecutionStartCondition *types.Value `json:"PipelineExecutionStartCondition,omitempty"`
+
+	// ScheduleExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagepipeline-schedule.html#cfn-imagebuilder-imagepipeline-schedule-scheduleexpression
+	ScheduleExpression *types.Value `json:"ScheduleExpression,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ImagePipeline_Schedule) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::ImagePipeline.Schedule"
+}
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe.go
new file mode 100644
index 0000000000..3c4bae5191
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe.go
@@ -0,0 +1,148 @@
+package imagebuilder
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ImageRecipe AWS CloudFormation Resource (AWS::ImageBuilder::ImageRecipe)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagerecipe.html
+type ImageRecipe struct {
+
+	// AdditionalInstanceConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagerecipe.html#cfn-imagebuilder-imagerecipe-additionalinstanceconfiguration
+	AdditionalInstanceConfiguration *ImageRecipe_AdditionalInstanceConfiguration `json:"AdditionalInstanceConfiguration,omitempty"`
+
+	// BlockDeviceMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagerecipe.html#cfn-imagebuilder-imagerecipe-blockdevicemappings
+	BlockDeviceMappings []ImageRecipe_InstanceBlockDeviceMapping `json:"BlockDeviceMappings,omitempty"`
+
+	// Components AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagerecipe.html#cfn-imagebuilder-imagerecipe-components
+	Components []ImageRecipe_ComponentConfiguration `json:"Components,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagerecipe.html#cfn-imagebuilder-imagerecipe-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagerecipe.html#cfn-imagebuilder-imagerecipe-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ParentImage AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagerecipe.html#cfn-imagebuilder-imagerecipe-parentimage
+	ParentImage *types.Value `json:"ParentImage,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagerecipe.html#cfn-imagebuilder-imagerecipe-tags
+	Tags map[string]*types.Value `json:"Tags,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagerecipe.html#cfn-imagebuilder-imagerecipe-version
+	Version *types.Value `json:"Version,omitempty"`
+
+	// WorkingDirectory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-imagerecipe.html#cfn-imagebuilder-imagerecipe-workingdirectory
+	WorkingDirectory *types.Value `json:"WorkingDirectory,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ImageRecipe) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::ImageRecipe"
+}
+
+// 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 ImageRecipe) MarshalJSON() ([]byte, error) {
+	type Properties ImageRecipe
+	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 *ImageRecipe) UnmarshalJSON(b []byte) error {
+	type Properties ImageRecipe
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ImageRecipe(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_additionalinstanceconfiguration.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_additionalinstanceconfiguration.go
new file mode 100644
index 0000000000..8716dcd07c
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_additionalinstanceconfiguration.go
@@ -0,0 +1,42 @@
+package imagebuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ImageRecipe_AdditionalInstanceConfiguration AWS CloudFormation Resource (AWS::ImageBuilder::ImageRecipe.AdditionalInstanceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-additionalinstanceconfiguration.html
+type ImageRecipe_AdditionalInstanceConfiguration struct {
+
+	// SystemsManagerAgent AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-additionalinstanceconfiguration.html#cfn-imagebuilder-imagerecipe-additionalinstanceconfiguration-systemsmanageragent
+	SystemsManagerAgent *ImageRecipe_SystemsManagerAgent `json:"SystemsManagerAgent,omitempty"`
+
+	// UserDataOverride AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-additionalinstanceconfiguration.html#cfn-imagebuilder-imagerecipe-additionalinstanceconfiguration-userdataoverride
+	UserDataOverride *types.Value `json:"UserDataOverride,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ImageRecipe_AdditionalInstanceConfiguration) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::ImageRecipe.AdditionalInstanceConfiguration"
+}
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentconfiguration.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentconfiguration.go
new file mode 100644
index 0000000000..4031badb4b
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentconfiguration.go
@@ -0,0 +1,42 @@
+package imagebuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ImageRecipe_ComponentConfiguration AWS CloudFormation Resource (AWS::ImageBuilder::ImageRecipe.ComponentConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-componentconfiguration.html
+type ImageRecipe_ComponentConfiguration struct {
+
+	// ComponentArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-componentconfiguration.html#cfn-imagebuilder-imagerecipe-componentconfiguration-componentarn
+	ComponentArn *types.Value `json:"ComponentArn,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-componentconfiguration.html#cfn-imagebuilder-imagerecipe-componentconfiguration-parameters
+	Parameters []ImageRecipe_ComponentParameter `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 *ImageRecipe_ComponentConfiguration) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::ImageRecipe.ComponentConfiguration"
+}
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentparameter.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentparameter.go
new file mode 100644
index 0000000000..9e4cca14c6
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_componentparameter.go
@@ -0,0 +1,42 @@
+package imagebuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ImageRecipe_ComponentParameter AWS CloudFormation Resource (AWS::ImageBuilder::ImageRecipe.ComponentParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-componentparameter.html
+type ImageRecipe_ComponentParameter struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-componentparameter.html#cfn-imagebuilder-imagerecipe-componentparameter-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-componentparameter.html#cfn-imagebuilder-imagerecipe-componentparameter-value
+	Value *types.Value `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 *ImageRecipe_ComponentParameter) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::ImageRecipe.ComponentParameter"
+}
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_ebsinstanceblockdevicespecification.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_ebsinstanceblockdevicespecification.go
new file mode 100644
index 0000000000..2091c8c92d
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_ebsinstanceblockdevicespecification.go
@@ -0,0 +1,72 @@
+package imagebuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ImageRecipe_EbsInstanceBlockDeviceSpecification AWS CloudFormation Resource (AWS::ImageBuilder::ImageRecipe.EbsInstanceBlockDeviceSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-ebsinstanceblockdevicespecification.html
+type ImageRecipe_EbsInstanceBlockDeviceSpecification struct {
+
+	// DeleteOnTermination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-ebsinstanceblockdevicespecification.html#cfn-imagebuilder-imagerecipe-ebsinstanceblockdevicespecification-deleteontermination
+	DeleteOnTermination *types.Value `json:"DeleteOnTermination,omitempty"`
+
+	// Encrypted AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-ebsinstanceblockdevicespecification.html#cfn-imagebuilder-imagerecipe-ebsinstanceblockdevicespecification-encrypted
+	Encrypted *types.Value `json:"Encrypted,omitempty"`
+
+	// Iops AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-ebsinstanceblockdevicespecification.html#cfn-imagebuilder-imagerecipe-ebsinstanceblockdevicespecification-iops
+	Iops *types.Value `json:"Iops,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-ebsinstanceblockdevicespecification.html#cfn-imagebuilder-imagerecipe-ebsinstanceblockdevicespecification-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// SnapshotId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-ebsinstanceblockdevicespecification.html#cfn-imagebuilder-imagerecipe-ebsinstanceblockdevicespecification-snapshotid
+	SnapshotId *types.Value `json:"SnapshotId,omitempty"`
+
+	// Throughput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-ebsinstanceblockdevicespecification.html#cfn-imagebuilder-imagerecipe-ebsinstanceblockdevicespecification-throughput
+	Throughput *types.Value `json:"Throughput,omitempty"`
+
+	// VolumeSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-ebsinstanceblockdevicespecification.html#cfn-imagebuilder-imagerecipe-ebsinstanceblockdevicespecification-volumesize
+	VolumeSize *types.Value `json:"VolumeSize,omitempty"`
+
+	// VolumeType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-ebsinstanceblockdevicespecification.html#cfn-imagebuilder-imagerecipe-ebsinstanceblockdevicespecification-volumetype
+	VolumeType *types.Value `json:"VolumeType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ImageRecipe_EbsInstanceBlockDeviceSpecification) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::ImageRecipe.EbsInstanceBlockDeviceSpecification"
+}
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_instanceblockdevicemapping.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_instanceblockdevicemapping.go
new file mode 100644
index 0000000000..3766828358
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_instanceblockdevicemapping.go
@@ -0,0 +1,52 @@
+package imagebuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ImageRecipe_InstanceBlockDeviceMapping AWS CloudFormation Resource (AWS::ImageBuilder::ImageRecipe.InstanceBlockDeviceMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-instanceblockdevicemapping.html
+type ImageRecipe_InstanceBlockDeviceMapping struct {
+
+	// DeviceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-instanceblockdevicemapping.html#cfn-imagebuilder-imagerecipe-instanceblockdevicemapping-devicename
+	DeviceName *types.Value `json:"DeviceName,omitempty"`
+
+	// Ebs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-instanceblockdevicemapping.html#cfn-imagebuilder-imagerecipe-instanceblockdevicemapping-ebs
+	Ebs *ImageRecipe_EbsInstanceBlockDeviceSpecification `json:"Ebs,omitempty"`
+
+	// NoDevice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-instanceblockdevicemapping.html#cfn-imagebuilder-imagerecipe-instanceblockdevicemapping-nodevice
+	NoDevice *types.Value `json:"NoDevice,omitempty"`
+
+	// VirtualName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-instanceblockdevicemapping.html#cfn-imagebuilder-imagerecipe-instanceblockdevicemapping-virtualname
+	VirtualName *types.Value `json:"VirtualName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ImageRecipe_InstanceBlockDeviceMapping) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::ImageRecipe.InstanceBlockDeviceMapping"
+}
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_systemsmanageragent.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_systemsmanageragent.go
new file mode 100644
index 0000000000..da40adf0fa
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-imagerecipe_systemsmanageragent.go
@@ -0,0 +1,37 @@
+package imagebuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ImageRecipe_SystemsManagerAgent AWS CloudFormation Resource (AWS::ImageBuilder::ImageRecipe.SystemsManagerAgent)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-systemsmanageragent.html
+type ImageRecipe_SystemsManagerAgent struct {
+
+	// UninstallAfterBuild AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-imagerecipe-systemsmanageragent.html#cfn-imagebuilder-imagerecipe-systemsmanageragent-uninstallafterbuild
+	UninstallAfterBuild *types.Value `json:"UninstallAfterBuild,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ImageRecipe_SystemsManagerAgent) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::ImageRecipe.SystemsManagerAgent"
+}
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration.go
new file mode 100644
index 0000000000..487c29af8e
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration.go
@@ -0,0 +1,168 @@
+package imagebuilder
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InfrastructureConfiguration AWS CloudFormation Resource (AWS::ImageBuilder::InfrastructureConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-infrastructureconfiguration.html
+type InfrastructureConfiguration struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-infrastructureconfiguration.html#cfn-imagebuilder-infrastructureconfiguration-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// InstanceMetadataOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-infrastructureconfiguration.html#cfn-imagebuilder-infrastructureconfiguration-instancemetadataoptions
+	InstanceMetadataOptions *InfrastructureConfiguration_InstanceMetadataOptions `json:"InstanceMetadataOptions,omitempty"`
+
+	// InstanceProfileName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-infrastructureconfiguration.html#cfn-imagebuilder-infrastructureconfiguration-instanceprofilename
+	InstanceProfileName *types.Value `json:"InstanceProfileName,omitempty"`
+
+	// InstanceTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-infrastructureconfiguration.html#cfn-imagebuilder-infrastructureconfiguration-instancetypes
+	InstanceTypes *types.Value `json:"InstanceTypes,omitempty"`
+
+	// KeyPair AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-infrastructureconfiguration.html#cfn-imagebuilder-infrastructureconfiguration-keypair
+	KeyPair *types.Value `json:"KeyPair,omitempty"`
+
+	// Logging AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-infrastructureconfiguration.html#cfn-imagebuilder-infrastructureconfiguration-logging
+	Logging *InfrastructureConfiguration_Logging `json:"Logging,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-infrastructureconfiguration.html#cfn-imagebuilder-infrastructureconfiguration-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ResourceTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-infrastructureconfiguration.html#cfn-imagebuilder-infrastructureconfiguration-resourcetags
+	ResourceTags map[string]*types.Value `json:"ResourceTags,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-infrastructureconfiguration.html#cfn-imagebuilder-infrastructureconfiguration-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SnsTopicArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-infrastructureconfiguration.html#cfn-imagebuilder-infrastructureconfiguration-snstopicarn
+	SnsTopicArn *types.Value `json:"SnsTopicArn,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-infrastructureconfiguration.html#cfn-imagebuilder-infrastructureconfiguration-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-infrastructureconfiguration.html#cfn-imagebuilder-infrastructureconfiguration-tags
+	Tags map[string]*types.Value `json:"Tags,omitempty"`
+
+	// TerminateInstanceOnFailure AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-imagebuilder-infrastructureconfiguration.html#cfn-imagebuilder-infrastructureconfiguration-terminateinstanceonfailure
+	TerminateInstanceOnFailure *types.Value `json:"TerminateInstanceOnFailure,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InfrastructureConfiguration) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::InfrastructureConfiguration"
+}
+
+// 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 InfrastructureConfiguration) MarshalJSON() ([]byte, error) {
+	type Properties InfrastructureConfiguration
+	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 *InfrastructureConfiguration) UnmarshalJSON(b []byte) error {
+	type Properties InfrastructureConfiguration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = InfrastructureConfiguration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_instancemetadataoptions.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_instancemetadataoptions.go
new file mode 100644
index 0000000000..2377546bb0
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_instancemetadataoptions.go
@@ -0,0 +1,42 @@
+package imagebuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InfrastructureConfiguration_InstanceMetadataOptions AWS CloudFormation Resource (AWS::ImageBuilder::InfrastructureConfiguration.InstanceMetadataOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-infrastructureconfiguration-instancemetadataoptions.html
+type InfrastructureConfiguration_InstanceMetadataOptions struct {
+
+	// HttpPutResponseHopLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-infrastructureconfiguration-instancemetadataoptions.html#cfn-imagebuilder-infrastructureconfiguration-instancemetadataoptions-httpputresponsehoplimit
+	HttpPutResponseHopLimit *types.Value `json:"HttpPutResponseHopLimit,omitempty"`
+
+	// HttpTokens AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-infrastructureconfiguration-instancemetadataoptions.html#cfn-imagebuilder-infrastructureconfiguration-instancemetadataoptions-httptokens
+	HttpTokens *types.Value `json:"HttpTokens,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InfrastructureConfiguration_InstanceMetadataOptions) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::InfrastructureConfiguration.InstanceMetadataOptions"
+}
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_logging.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_logging.go
new file mode 100644
index 0000000000..0e862e0a14
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_logging.go
@@ -0,0 +1,35 @@
+package imagebuilder
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// InfrastructureConfiguration_Logging AWS CloudFormation Resource (AWS::ImageBuilder::InfrastructureConfiguration.Logging)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-infrastructureconfiguration-logging.html
+type InfrastructureConfiguration_Logging struct {
+
+	// S3Logs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-infrastructureconfiguration-logging.html#cfn-imagebuilder-infrastructureconfiguration-logging-s3logs
+	S3Logs *InfrastructureConfiguration_S3Logs `json:"S3Logs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InfrastructureConfiguration_Logging) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::InfrastructureConfiguration.Logging"
+}
diff --git a/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_s3logs.go b/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_s3logs.go
new file mode 100644
index 0000000000..7360829fe2
--- /dev/null
+++ b/goformation/cloudformation/imagebuilder/aws-imagebuilder-infrastructureconfiguration_s3logs.go
@@ -0,0 +1,42 @@
+package imagebuilder
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InfrastructureConfiguration_S3Logs AWS CloudFormation Resource (AWS::ImageBuilder::InfrastructureConfiguration.S3Logs)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-infrastructureconfiguration-s3logs.html
+type InfrastructureConfiguration_S3Logs struct {
+
+	// S3BucketName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-infrastructureconfiguration-s3logs.html#cfn-imagebuilder-infrastructureconfiguration-s3logs-s3bucketname
+	S3BucketName *types.Value `json:"S3BucketName,omitempty"`
+
+	// S3KeyPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-imagebuilder-infrastructureconfiguration-s3logs.html#cfn-imagebuilder-infrastructureconfiguration-s3logs-s3keyprefix
+	S3KeyPrefix *types.Value `json:"S3KeyPrefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InfrastructureConfiguration_S3Logs) AWSCloudFormationType() string {
+	return "AWS::ImageBuilder::InfrastructureConfiguration.S3Logs"
+}
diff --git a/goformation/cloudformation/inspector/aws-inspector-assessmenttarget.go b/goformation/cloudformation/inspector/aws-inspector-assessmenttarget.go
new file mode 100644
index 0000000000..ffffd6489e
--- /dev/null
+++ b/goformation/cloudformation/inspector/aws-inspector-assessmenttarget.go
@@ -0,0 +1,113 @@
+package inspector
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AssessmentTarget AWS CloudFormation Resource (AWS::Inspector::AssessmentTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-assessmenttarget.html
+type AssessmentTarget struct {
+
+	// AssessmentTargetName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-assessmenttarget.html#cfn-inspector-assessmenttarget-assessmenttargetname
+	AssessmentTargetName *types.Value `json:"AssessmentTargetName,omitempty"`
+
+	// ResourceGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-assessmenttarget.html#cfn-inspector-assessmenttarget-resourcegrouparn
+	ResourceGroupArn *types.Value `json:"ResourceGroupArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AssessmentTarget) AWSCloudFormationType() string {
+	return "AWS::Inspector::AssessmentTarget"
+}
+
+// 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 AssessmentTarget) MarshalJSON() ([]byte, error) {
+	type Properties AssessmentTarget
+	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 *AssessmentTarget) UnmarshalJSON(b []byte) error {
+	type Properties AssessmentTarget
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AssessmentTarget(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/inspector/aws-inspector-assessmenttemplate.go b/goformation/cloudformation/inspector/aws-inspector-assessmenttemplate.go
new file mode 100644
index 0000000000..ca7e58de3d
--- /dev/null
+++ b/goformation/cloudformation/inspector/aws-inspector-assessmenttemplate.go
@@ -0,0 +1,129 @@
+package inspector
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// AssessmentTemplate AWS CloudFormation Resource (AWS::Inspector::AssessmentTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-assessmenttemplate.html
+type AssessmentTemplate struct {
+
+	// AssessmentTargetArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-assessmenttemplate.html#cfn-inspector-assessmenttemplate-assessmenttargetarn
+	AssessmentTargetArn *types.Value `json:"AssessmentTargetArn,omitempty"`
+
+	// AssessmentTemplateName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-assessmenttemplate.html#cfn-inspector-assessmenttemplate-assessmenttemplatename
+	AssessmentTemplateName *types.Value `json:"AssessmentTemplateName,omitempty"`
+
+	// DurationInSeconds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-assessmenttemplate.html#cfn-inspector-assessmenttemplate-durationinseconds
+	DurationInSeconds *types.Value `json:"DurationInSeconds"`
+
+	// RulesPackageArns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-assessmenttemplate.html#cfn-inspector-assessmenttemplate-rulespackagearns
+	RulesPackageArns *types.Value `json:"RulesPackageArns,omitempty"`
+
+	// UserAttributesForFindings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-assessmenttemplate.html#cfn-inspector-assessmenttemplate-userattributesforfindings
+	UserAttributesForFindings []cloudformation.Tag `json:"UserAttributesForFindings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AssessmentTemplate) AWSCloudFormationType() string {
+	return "AWS::Inspector::AssessmentTemplate"
+}
+
+// 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 AssessmentTemplate) MarshalJSON() ([]byte, error) {
+	type Properties AssessmentTemplate
+	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 *AssessmentTemplate) UnmarshalJSON(b []byte) error {
+	type Properties AssessmentTemplate
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AssessmentTemplate(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/inspector/aws-inspector-resourcegroup.go b/goformation/cloudformation/inspector/aws-inspector-resourcegroup.go
new file mode 100644
index 0000000000..495e13336f
--- /dev/null
+++ b/goformation/cloudformation/inspector/aws-inspector-resourcegroup.go
@@ -0,0 +1,107 @@
+package inspector
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceGroup AWS CloudFormation Resource (AWS::Inspector::ResourceGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-resourcegroup.html
+type ResourceGroup struct {
+
+	// ResourceGroupTags AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-inspector-resourcegroup.html#cfn-inspector-resourcegroup-resourcegrouptags
+	ResourceGroupTags []cloudformation.Tag `json:"ResourceGroupTags,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceGroup) AWSCloudFormationType() string {
+	return "AWS::Inspector::ResourceGroup"
+}
+
+// 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 ResourceGroup) MarshalJSON() ([]byte, error) {
+	type Properties ResourceGroup
+	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 *ResourceGroup) UnmarshalJSON(b []byte) error {
+	type Properties ResourceGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResourceGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/intrinsics.go b/goformation/cloudformation/intrinsics.go
new file mode 100644
index 0000000000..e098f4430c
--- /dev/null
+++ b/goformation/cloudformation/intrinsics.go
@@ -0,0 +1,244 @@
+package cloudformation
+
+import (
+	"encoding/base64"
+	"fmt"
+	"strings"
+
+	"goformation/v4/intrinsics"
+)
+
+func strWrap(fn func(interface{}) string) intrinsics.IntrinsicHandler {
+	return func(name string, input interface{}, template interface{}) interface{} {
+		return fn(input)
+	}
+}
+
+// Splits the string base on a . delimiter
+func strSplit2Wrap(fn func(string, string) string) intrinsics.IntrinsicHandler {
+	delim := "."
+	return func(name string, input interface{}, template interface{}) interface{} {
+		switch v := input.(type) {
+		case string:
+			arr := strings.SplitN(v, delim, 2)
+			if len(arr) != 2 {
+				return nil
+			}
+			return fn(arr[0], arr[1])
+		case []interface{}:
+			if len(v) != 2 {
+				return nil
+			}
+
+			str1, ok := v[0].(string)
+			if !ok {
+				return nil
+			}
+
+			str2, ok := v[1].(string)
+			if !ok {
+				return nil
+			}
+
+			return fn(str1, str2)
+		}
+		return nil
+	}
+}
+
+func str2Wrap(fn func(interface{}, interface{}) string) intrinsics.IntrinsicHandler {
+	return func(name string, input interface{}, template interface{}) interface{} {
+		// Check that the input is an array
+		if arr, ok := input.([]interface{}); ok {
+			if len(arr) != 2 {
+				return nil
+			}
+			return fn(arr[0], arr[1])
+		}
+		return nil
+	}
+}
+
+func str3Wrap(fn func(interface{}, interface{}, interface{}) string) intrinsics.IntrinsicHandler {
+	return func(name string, input interface{}, template interface{}) interface{} {
+		if arr, ok := input.([]interface{}); ok {
+			if len(arr) != 3 {
+				return nil
+			}
+			return fn(arr[0], arr[1], arr[2])
+		}
+		return nil
+	}
+}
+
+func str2AWrap(fn func(interface{}, []string) string) intrinsics.IntrinsicHandler {
+	return func(name string, input interface{}, template interface{}) interface{} {
+		if arr, ok := input.([]interface{}); ok {
+			switch len(arr) {
+			case 0:
+				return nil
+			case 1:
+				return fn(arr[0], []string{})
+			case 2:
+				if ls, ok := arr[1].([]interface{}); ok {
+					return fn(arr[0], interfaceAtostrA(ls))
+				}
+			}
+			return nil
+		}
+		return nil
+	}
+}
+
+func strAWrap(fn func([]string) string) intrinsics.IntrinsicHandler {
+	return func(name string, input interface{}, template interface{}) interface{} {
+		if arr, ok := input.([]interface{}); ok {
+			return fn(interfaceAtostrA(arr))
+		}
+		return nil
+	}
+}
+
+var EncoderIntrinsics = map[string]intrinsics.IntrinsicHandler{
+	"Fn::Base64":      strWrap(Base64),
+	"Fn::And":         strAWrap(And),
+	"Fn::Equals":      str2Wrap(Equals),
+	"Fn::If":          str3Wrap(If),
+	"Fn::Not":         strAWrap(Not),
+	"Fn::Or":          strAWrap(Or),
+	"Fn::FindInMap":   str3Wrap(FindInMap),
+	"Fn::GetAtt":      strSplit2Wrap(GetAtt),
+	"Fn::GetAZs":      strWrap(GetAZs),
+	"Fn::ImportValue": strWrap(ImportValue),
+	"Fn::Join":        str2Wrap(Join),
+	"Fn::Select":      str2AWrap(Select),
+	"Fn::Split":       str2Wrap(Split),
+	"Fn::Sub":         strWrap(Sub),
+	"Ref":             strWrap(Ref),
+	"Fn::Cidr":        str3Wrap(CIDR),
+}
+
+// str -> str fns
+
+// Ref creates a CloudFormation Reference to another resource in the template
+func Ref(logicalName interface{}) string {
+	return encode(fmt.Sprintf(`{ "Ref": %q }`, logicalName))
+}
+
+// ImportValue returns the value of an output exported by another stack. You typically use this function to create cross-stack references. In the following example template snippets, Stack A exports VPC security group values and Stack B imports them.
+func ImportValue(name interface{}) string {
+	return encode(fmt.Sprintf(`{ "Fn::ImportValue": %q }`, name))
+}
+
+// Base64 returns the Base64 representation of the input string. This function is typically used to pass encoded data to Amazon EC2 instances by way of the UserData property
+func Base64(input interface{}) string {
+	return encode(fmt.Sprintf(`{ "Fn::Base64": %q }`, input))
+}
+
+// GetAZs returns an array that lists Availability Zones for a specified region. Because customers have access to different Availability Zones, the intrinsic function Fn::GetAZs enables template authors to write templates that adapt to the calling user's access. That way you don't have to hard-code a full list of Availability Zones for a specified region.
+func GetAZs(region interface{}) string {
+	return encode(fmt.Sprintf(`{ "Fn::GetAZs": %q }`, region))
+}
+
+// Sub substitutes variables in an input string with values that you specify. In your templates, you can use this function to construct commands or outputs that include values that aren't available until you create or update a stack.
+func Sub(value interface{}) string {
+	return encode(fmt.Sprintf(`{ "Fn::Sub" : %q }`, value))
+}
+
+// (str, str) -> str
+
+// GetAtt returns the value of an attribute from a resource in the template.
+func GetAtt(logicalName string, attribute string) string {
+	return encode(fmt.Sprintf(`{ "Fn::GetAtt" : [ %q, %q ] }`, logicalName, attribute))
+}
+
+// Split splits a string into a list of string values so that you can select an element from the resulting string list, use the Fn::Split intrinsic function. Specify the location of splits with a delimiter, such as , (a comma). After you split a string, use the Fn::Select function to pick a specific element.
+func Split(delimiter, source interface{}) string {
+	return encode(fmt.Sprintf(`{ "Fn::Split" : [ %q, %q ] }`, delimiter, source))
+}
+
+// Equals compares if two values are equal. Returns true if the two values are equal or false if they aren't.
+func Equals(value1, value2 interface{}) string {
+	return encode(fmt.Sprintf(`{ "Fn::Equals" : [ %q, %q ] }`, value1, value2))
+}
+
+// (str, str, str) -> str
+
+// CIDR returns an array of CIDR address blocks. The number of CIDR blocks returned is dependent on the count parameter.
+func CIDR(ipBlock, count, cidrBits interface{}) string {
+	return encode(fmt.Sprintf(`{ "Fn::Cidr" : [ %q, %q, %q ] }`, ipBlock, count, cidrBits))
+}
+
+// FindInMap returns the value corresponding to keys in a two-level map that is declared in the Mappings section.
+func FindInMap(mapName, topLevelKey, secondLevelKey interface{}) string {
+	return encode(fmt.Sprintf(`{ "Fn::FindInMap" : [ %q, %q, %q ] }`, mapName, topLevelKey, secondLevelKey))
+}
+
+// If returns one value if the specified condition evaluates to true and another value if the specified condition evaluates to false. Currently, AWS CloudFormation supports the Fn::If intrinsic function in the metadata attribute, update policy attribute, and property values in the Resources section and Outputs sections of a template. You can use the AWS::NoValue pseudo parameter as a return value to remove the corresponding property.
+func If(value, ifEqual, ifNotEqual interface{}) string {
+	return encode(fmt.Sprintf(`{ "Fn::If" : [ %q, %q, %q ] }`, value, ifEqual, ifNotEqual))
+}
+
+// (str, []str) -> str
+
+// Join appends a set of values into a single value, separated by the specified delimiter. If a delimiter is the empty string, the set of values are concatenated with no delimiter.
+func Join(delimiter interface{}, value interface{}) string {
+	switch v := value.(type) {
+	case []string:
+		return encode(fmt.Sprintf(`{ "Fn::Join": [ %q, [ %v ] ] }`, delimiter, printList(value.([]string))))
+	case []interface{}:
+		return encode(fmt.Sprintf(`{ "Fn::Join": [ %q, [ %v ] ] }`, delimiter, printList(interfaceAtostrA(value.([]interface{})))))
+	case string:
+		return encode(fmt.Sprintf(`{ "Fn::Join": [ %q,  %q ] }`, delimiter, value))
+	default:
+		fmt.Printf("Unsupported type for Join: %T\n", v)
+		return encode(fmt.Sprintf(`{ "Fn::Join": [ %q,  %q ] }`, delimiter, value))
+	}
+}
+
+// Select returns a single object from a list of objects by index.
+func Select(index interface{}, list []string) string {
+	if len(list) == 1 {
+		return encode(fmt.Sprintf(`{ "Fn::Select": [ %q,  %q ] }`, index, list[0]))
+	}
+	return encode(fmt.Sprintf(`{ "Fn::Select": [ %q, [ %v ] ] }`, index, printList(list)))
+}
+
+// ([]str) -> str
+
+// And returns true if all the specified conditions evaluate to true, or returns false if any one of the conditions evaluates to false. Fn::And acts as an AND operator. The minimum number of conditions that you can include is 2, and the maximum is 10.
+func And(conditions []string) string {
+	return encode(fmt.Sprintf(`{ "Fn::And": [ %v ] }`, printList(conditions)))
+}
+
+// Not returns true for a condition that evaluates to false or returns false for a condition that evaluates to true. Fn::Not acts as a NOT operator.
+func Not(conditions []string) string {
+	return encode(fmt.Sprintf(`{ "Fn::Not": [ %v ] }`, printList(conditions)))
+}
+
+// Or returns true if any one of the specified conditions evaluate to true, or returns false if all of the conditions evaluates to false. Fn::Or acts as an OR operator. The minimum number of conditions that you can include is 2, and the maximum is 10.
+func Or(conditions []string) string {
+	return encode(fmt.Sprintf(`{ "Fn::Or": [ %v ] }`, printList(conditions)))
+}
+
+// encode takes a string representation of an intrinsic function, and base64 encodes it.
+// This prevents the escaping issues when nesting multiple layers of intrinsic functions.
+func encode(value string) string {
+	return base64.StdEncoding.EncodeToString([]byte(value))
+}
+
+func printList(values []string) string {
+	escaped := make([]string, len(values))
+	for i := range values {
+		escaped[i] = fmt.Sprintf("%q", values[i])
+	}
+	return strings.Join(escaped, `,`)
+}
+
+func interfaceAtostrA(values []interface{}) []string {
+	converted := make([]string, len(values))
+	for i := range values {
+		converted[i] = fmt.Sprintf("%v", values[i])
+	}
+	return converted
+}
diff --git a/goformation/cloudformation/intrinsics_test.go b/goformation/cloudformation/intrinsics_test.go
new file mode 100644
index 0000000000..7746062d7b
--- /dev/null
+++ b/goformation/cloudformation/intrinsics_test.go
@@ -0,0 +1,132 @@
+package cloudformation_test
+
+import (
+	"fmt"
+	"strings"
+
+	"goformation/v4"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Goformation", func() {
+	Context("with a YAML template that contains an intrinsic", func() {
+
+		tests := []struct {
+			Name     string
+			Input    string
+			Expected string
+		}{
+			{
+				Name:     "Ref",
+				Input:    `!Ref tvalue`,
+				Expected: `{"Ref":"tvalue"}`,
+			},
+			{
+				Name:     "ImportValue",
+				Input:    `!ImportValue tvalue`,
+				Expected: `{"Fn::ImportValue":"tvalue"}`,
+			},
+			{
+				Name:     "Base64",
+				Input:    `!Base64 tvalue`,
+				Expected: `{"Fn::Base64":"tvalue"}`,
+			},
+			{
+				Name:     "GetAZs",
+				Input:    `!GetAZs tvalue`,
+				Expected: `{"Fn::GetAZs":"tvalue"}`,
+			},
+			{
+				Name:     "Sub",
+				Input:    `!Sub tvalue`,
+				Expected: `{"Fn::Sub":"tvalue"}`,
+			},
+			{
+				Name:     "GetAtt",
+				Input:    `!GetAtt object.property`,
+				Expected: `{"Fn::GetAtt":["object","property"]}`,
+			},
+			{
+				Name:     "Split",
+				Input:    `!Split [d, sss]`,
+				Expected: `{"Fn::Split":["d","sss"]}`,
+			},
+			{
+				Name:     "Equals",
+				Input:    `!Equals [a, b]`,
+				Expected: `{"Fn::Equals":["a","b"]}`,
+			},
+			{
+				Name:     "CIDR",
+				Input:    `!Cidr [a, b, c]`,
+				Expected: `{"Fn::Cidr":["a","b","c"]}`,
+			},
+			{
+				Name:     "FindInMap",
+				Input:    `!FindInMap [a, b, c]`,
+				Expected: `{"Fn::FindInMap":["a","b","c"]}`,
+			},
+			{
+				Name:     "If",
+				Input:    `!If [a, b, c]`,
+				Expected: `{"Fn::If":["a","b","c"]}`,
+			},
+			{
+				Name:     "Join",
+				Input:    `!Join [a, [b, c]]`,
+				Expected: `{"Fn::Join":["a",["b","c"]]}`,
+			},
+			{
+				Name:     "Select",
+				Input:    `!Select [a, [b, c]]`,
+				Expected: `{"Fn::Select":["a",["b","c"]]}`,
+			},
+			{
+				Name:     "And",
+				Input:    `!And [a, b, c]`,
+				Expected: `{"Fn::And":["a","b","c"]}`,
+			},
+			{
+				Name:     "Not",
+				Input:    `!Not [a, b, c]`,
+				Expected: `{"Fn::Not":["a","b","c"]}`,
+			},
+			{
+				Name:     "Or",
+				Input:    `!Or [a, b, c]`,
+				Expected: `{"Fn::Or":["a","b","c"]}`,
+			},
+		}
+
+		for _, test := range tests {
+			test := test
+
+			It("should replace "+test.Name+" with the JSON expanded value", func() {
+				templateYamlStr := `
+Resources:
+  TestBucket:
+    Type: AWS::S3::Bucket
+    Properties:
+      BucketName: %s`
+				inputTemplate := fmt.Sprintf(templateYamlStr, test.Input)
+				template, err := goformation.ParseYAML([]byte(inputTemplate))
+
+				Expect(err).To(BeNil())
+
+				raw, err := template.JSON()
+				output := string(raw)
+				Expect(err).To(BeNil())
+				output = strings.Replace(output, " ", "", -1)
+				output = strings.Replace(output, "\n", "", -1)
+
+				templateJSON := fmt.Sprintf(
+					`{"Resources":{"TestBucket":{"Type":"AWS::S3::Bucket","Properties":{"BucketName":%s}}}}`,
+					test.Expected,
+				)
+				Expect(output).To(BeEquivalentTo(templateJSON))
+			})
+		}
+	})
+})
diff --git a/goformation/cloudformation/iot/aws-iot-accountauditconfiguration.go b/goformation/cloudformation/iot/aws-iot-accountauditconfiguration.go
new file mode 100644
index 0000000000..801604d129
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-accountauditconfiguration.go
@@ -0,0 +1,123 @@
+package iot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccountAuditConfiguration AWS CloudFormation Resource (AWS::IoT::AccountAuditConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-accountauditconfiguration.html
+type AccountAuditConfiguration struct {
+
+	// AccountId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-accountauditconfiguration.html#cfn-iot-accountauditconfiguration-accountid
+	AccountId *types.Value `json:"AccountId,omitempty"`
+
+	// AuditCheckConfigurations AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-accountauditconfiguration.html#cfn-iot-accountauditconfiguration-auditcheckconfigurations
+	AuditCheckConfigurations *AccountAuditConfiguration_AuditCheckConfigurations `json:"AuditCheckConfigurations,omitempty"`
+
+	// AuditNotificationTargetConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-accountauditconfiguration.html#cfn-iot-accountauditconfiguration-auditnotificationtargetconfigurations
+	AuditNotificationTargetConfigurations *AccountAuditConfiguration_AuditNotificationTargetConfigurations `json:"AuditNotificationTargetConfigurations,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-accountauditconfiguration.html#cfn-iot-accountauditconfiguration-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AccountAuditConfiguration) AWSCloudFormationType() string {
+	return "AWS::IoT::AccountAuditConfiguration"
+}
+
+// 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 AccountAuditConfiguration) MarshalJSON() ([]byte, error) {
+	type Properties AccountAuditConfiguration
+	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 *AccountAuditConfiguration) UnmarshalJSON(b []byte) error {
+	type Properties AccountAuditConfiguration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AccountAuditConfiguration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfiguration.go b/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfiguration.go
new file mode 100644
index 0000000000..2b751c3780
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfiguration.go
@@ -0,0 +1,37 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccountAuditConfiguration_AuditCheckConfiguration AWS CloudFormation Resource (AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditcheckconfiguration.html
+type AccountAuditConfiguration_AuditCheckConfiguration struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditcheckconfiguration.html#cfn-iot-accountauditconfiguration-auditcheckconfiguration-enabled
+	Enabled *types.Value `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 *AccountAuditConfiguration_AuditCheckConfiguration) AWSCloudFormationType() string {
+	return "AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfigurations.go b/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfigurations.go
new file mode 100644
index 0000000000..f1eea672f0
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditcheckconfigurations.go
@@ -0,0 +1,100 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccountAuditConfiguration_AuditCheckConfigurations AWS CloudFormation Resource (AWS::IoT::AccountAuditConfiguration.AuditCheckConfigurations)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditcheckconfigurations.html
+type AccountAuditConfiguration_AuditCheckConfigurations struct {
+
+	// AuthenticatedCognitoRoleOverlyPermissiveCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditcheckconfigurations.html#cfn-iot-accountauditconfiguration-auditcheckconfigurations-authenticatedcognitoroleoverlypermissivecheck
+	AuthenticatedCognitoRoleOverlyPermissiveCheck *AccountAuditConfiguration_AuditCheckConfiguration `json:"AuthenticatedCognitoRoleOverlyPermissiveCheck,omitempty"`
+
+	// CaCertificateExpiringCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditcheckconfigurations.html#cfn-iot-accountauditconfiguration-auditcheckconfigurations-cacertificateexpiringcheck
+	CaCertificateExpiringCheck *AccountAuditConfiguration_AuditCheckConfiguration `json:"CaCertificateExpiringCheck,omitempty"`
+
+	// CaCertificateKeyQualityCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditcheckconfigurations.html#cfn-iot-accountauditconfiguration-auditcheckconfigurations-cacertificatekeyqualitycheck
+	CaCertificateKeyQualityCheck *AccountAuditConfiguration_AuditCheckConfiguration `json:"CaCertificateKeyQualityCheck,omitempty"`
+
+	// ConflictingClientIdsCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditcheckconfigurations.html#cfn-iot-accountauditconfiguration-auditcheckconfigurations-conflictingclientidscheck
+	ConflictingClientIdsCheck *AccountAuditConfiguration_AuditCheckConfiguration `json:"ConflictingClientIdsCheck,omitempty"`
+
+	// DeviceCertificateExpiringCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditcheckconfigurations.html#cfn-iot-accountauditconfiguration-auditcheckconfigurations-devicecertificateexpiringcheck
+	DeviceCertificateExpiringCheck *AccountAuditConfiguration_AuditCheckConfiguration `json:"DeviceCertificateExpiringCheck,omitempty"`
+
+	// DeviceCertificateKeyQualityCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditcheckconfigurations.html#cfn-iot-accountauditconfiguration-auditcheckconfigurations-devicecertificatekeyqualitycheck
+	DeviceCertificateKeyQualityCheck *AccountAuditConfiguration_AuditCheckConfiguration `json:"DeviceCertificateKeyQualityCheck,omitempty"`
+
+	// DeviceCertificateSharedCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditcheckconfigurations.html#cfn-iot-accountauditconfiguration-auditcheckconfigurations-devicecertificatesharedcheck
+	DeviceCertificateSharedCheck *AccountAuditConfiguration_AuditCheckConfiguration `json:"DeviceCertificateSharedCheck,omitempty"`
+
+	// IotPolicyOverlyPermissiveCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditcheckconfigurations.html#cfn-iot-accountauditconfiguration-auditcheckconfigurations-iotpolicyoverlypermissivecheck
+	IotPolicyOverlyPermissiveCheck *AccountAuditConfiguration_AuditCheckConfiguration `json:"IotPolicyOverlyPermissiveCheck,omitempty"`
+
+	// IotRoleAliasAllowsAccessToUnusedServicesCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditcheckconfigurations.html#cfn-iot-accountauditconfiguration-auditcheckconfigurations-iotrolealiasallowsaccesstounusedservicescheck
+	IotRoleAliasAllowsAccessToUnusedServicesCheck *AccountAuditConfiguration_AuditCheckConfiguration `json:"IotRoleAliasAllowsAccessToUnusedServicesCheck,omitempty"`
+
+	// IotRoleAliasOverlyPermissiveCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditcheckconfigurations.html#cfn-iot-accountauditconfiguration-auditcheckconfigurations-iotrolealiasoverlypermissivecheck
+	IotRoleAliasOverlyPermissiveCheck *AccountAuditConfiguration_AuditCheckConfiguration `json:"IotRoleAliasOverlyPermissiveCheck,omitempty"`
+
+	// LoggingDisabledCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditcheckconfigurations.html#cfn-iot-accountauditconfiguration-auditcheckconfigurations-loggingdisabledcheck
+	LoggingDisabledCheck *AccountAuditConfiguration_AuditCheckConfiguration `json:"LoggingDisabledCheck,omitempty"`
+
+	// RevokedCaCertificateStillActiveCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditcheckconfigurations.html#cfn-iot-accountauditconfiguration-auditcheckconfigurations-revokedcacertificatestillactivecheck
+	RevokedCaCertificateStillActiveCheck *AccountAuditConfiguration_AuditCheckConfiguration `json:"RevokedCaCertificateStillActiveCheck,omitempty"`
+
+	// RevokedDeviceCertificateStillActiveCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditcheckconfigurations.html#cfn-iot-accountauditconfiguration-auditcheckconfigurations-revokeddevicecertificatestillactivecheck
+	RevokedDeviceCertificateStillActiveCheck *AccountAuditConfiguration_AuditCheckConfiguration `json:"RevokedDeviceCertificateStillActiveCheck,omitempty"`
+
+	// UnauthenticatedCognitoRoleOverlyPermissiveCheck AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditcheckconfigurations.html#cfn-iot-accountauditconfiguration-auditcheckconfigurations-unauthenticatedcognitoroleoverlypermissivecheck
+	UnauthenticatedCognitoRoleOverlyPermissiveCheck *AccountAuditConfiguration_AuditCheckConfiguration `json:"UnauthenticatedCognitoRoleOverlyPermissiveCheck,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AccountAuditConfiguration_AuditCheckConfigurations) AWSCloudFormationType() string {
+	return "AWS::IoT::AccountAuditConfiguration.AuditCheckConfigurations"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtarget.go b/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtarget.go
new file mode 100644
index 0000000000..a7d9f475a7
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtarget.go
@@ -0,0 +1,47 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccountAuditConfiguration_AuditNotificationTarget AWS CloudFormation Resource (AWS::IoT::AccountAuditConfiguration.AuditNotificationTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditnotificationtarget.html
+type AccountAuditConfiguration_AuditNotificationTarget struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditnotificationtarget.html#cfn-iot-accountauditconfiguration-auditnotificationtarget-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditnotificationtarget.html#cfn-iot-accountauditconfiguration-auditnotificationtarget-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// TargetArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditnotificationtarget.html#cfn-iot-accountauditconfiguration-auditnotificationtarget-targetarn
+	TargetArn *types.Value `json:"TargetArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AccountAuditConfiguration_AuditNotificationTarget) AWSCloudFormationType() string {
+	return "AWS::IoT::AccountAuditConfiguration.AuditNotificationTarget"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtargetconfigurations.go b/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtargetconfigurations.go
new file mode 100644
index 0000000000..7ec1e066b1
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-accountauditconfiguration_auditnotificationtargetconfigurations.go
@@ -0,0 +1,35 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccountAuditConfiguration_AuditNotificationTargetConfigurations AWS CloudFormation Resource (AWS::IoT::AccountAuditConfiguration.AuditNotificationTargetConfigurations)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditnotificationtargetconfigurations.html
+type AccountAuditConfiguration_AuditNotificationTargetConfigurations struct {
+
+	// Sns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-accountauditconfiguration-auditnotificationtargetconfigurations.html#cfn-iot-accountauditconfiguration-auditnotificationtargetconfigurations-sns
+	Sns *AccountAuditConfiguration_AuditNotificationTarget `json:"Sns,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AccountAuditConfiguration_AuditNotificationTargetConfigurations) AWSCloudFormationType() string {
+	return "AWS::IoT::AccountAuditConfiguration.AuditNotificationTargetConfigurations"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-authorizer.go b/goformation/cloudformation/iot/aws-iot-authorizer.go
new file mode 100644
index 0000000000..b22fadc3d4
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-authorizer.go
@@ -0,0 +1,139 @@
+package iot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Authorizer AWS CloudFormation Resource (AWS::IoT::Authorizer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-authorizer.html
+type Authorizer struct {
+
+	// AuthorizerFunctionArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-authorizer.html#cfn-iot-authorizer-authorizerfunctionarn
+	AuthorizerFunctionArn *types.Value `json:"AuthorizerFunctionArn,omitempty"`
+
+	// AuthorizerName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-authorizer.html#cfn-iot-authorizer-authorizername
+	AuthorizerName *types.Value `json:"AuthorizerName,omitempty"`
+
+	// SigningDisabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-authorizer.html#cfn-iot-authorizer-signingdisabled
+	SigningDisabled *types.Value `json:"SigningDisabled,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-authorizer.html#cfn-iot-authorizer-status
+	Status *types.Value `json:"Status,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-authorizer.html#cfn-iot-authorizer-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TokenKeyName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-authorizer.html#cfn-iot-authorizer-tokenkeyname
+	TokenKeyName *types.Value `json:"TokenKeyName,omitempty"`
+
+	// TokenSigningPublicKeys AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-authorizer.html#cfn-iot-authorizer-tokensigningpublickeys
+	TokenSigningPublicKeys map[string]*types.Value `json:"TokenSigningPublicKeys,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Authorizer) AWSCloudFormationType() string {
+	return "AWS::IoT::Authorizer"
+}
+
+// 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 Authorizer) MarshalJSON() ([]byte, error) {
+	type Properties Authorizer
+	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 *Authorizer) UnmarshalJSON(b []byte) error {
+	type Properties Authorizer
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Authorizer(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot/aws-iot-authorizer_tags.go b/goformation/cloudformation/iot/aws-iot-authorizer_tags.go
new file mode 100644
index 0000000000..c41cb39bd2
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-authorizer_tags.go
@@ -0,0 +1,35 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Authorizer_Tags AWS CloudFormation Resource (AWS::IoT::Authorizer.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-authorizer-tags.html
+type Authorizer_Tags struct {
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-authorizer-tags.html#cfn-iot-authorizer-tags-tags
+	Tags []interface{} `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 *Authorizer_Tags) AWSCloudFormationType() string {
+	return "AWS::IoT::Authorizer.Tags"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-authorizer_tokensigningpublickeys.go b/goformation/cloudformation/iot/aws-iot-authorizer_tokensigningpublickeys.go
new file mode 100644
index 0000000000..0e20b1059b
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-authorizer_tokensigningpublickeys.go
@@ -0,0 +1,30 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Authorizer_TokenSigningPublicKeys AWS CloudFormation Resource (AWS::IoT::Authorizer.TokenSigningPublicKeys)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-authorizer-tokensigningpublickeys.html
+type Authorizer_TokenSigningPublicKeys struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Authorizer_TokenSigningPublicKeys) AWSCloudFormationType() string {
+	return "AWS::IoT::Authorizer.TokenSigningPublicKeys"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-certificate.go b/goformation/cloudformation/iot/aws-iot-certificate.go
new file mode 100644
index 0000000000..40d664bf60
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-certificate.go
@@ -0,0 +1,128 @@
+package iot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Certificate AWS CloudFormation Resource (AWS::IoT::Certificate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-certificate.html
+type Certificate struct {
+
+	// CACertificatePem AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-certificate.html#cfn-iot-certificate-cacertificatepem
+	CACertificatePem *types.Value `json:"CACertificatePem,omitempty"`
+
+	// CertificateMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-certificate.html#cfn-iot-certificate-certificatemode
+	CertificateMode *types.Value `json:"CertificateMode,omitempty"`
+
+	// CertificatePem AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-certificate.html#cfn-iot-certificate-certificatepem
+	CertificatePem *types.Value `json:"CertificatePem,omitempty"`
+
+	// CertificateSigningRequest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-certificate.html#cfn-iot-certificate-certificatesigningrequest
+	CertificateSigningRequest *types.Value `json:"CertificateSigningRequest,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-certificate.html#cfn-iot-certificate-status
+	Status *types.Value `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 *Certificate) AWSCloudFormationType() string {
+	return "AWS::IoT::Certificate"
+}
+
+// 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 Certificate) MarshalJSON() ([]byte, error) {
+	type Properties Certificate
+	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 *Certificate) UnmarshalJSON(b []byte) error {
+	type Properties Certificate
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Certificate(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot/aws-iot-custommetric.go b/goformation/cloudformation/iot/aws-iot-custommetric.go
new file mode 100644
index 0000000000..e8ee7dbba0
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-custommetric.go
@@ -0,0 +1,124 @@
+package iot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// CustomMetric AWS CloudFormation Resource (AWS::IoT::CustomMetric)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-custommetric.html
+type CustomMetric struct {
+
+	// DisplayName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-custommetric.html#cfn-iot-custommetric-displayname
+	DisplayName *types.Value `json:"DisplayName,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-custommetric.html#cfn-iot-custommetric-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// MetricType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-custommetric.html#cfn-iot-custommetric-metrictype
+	MetricType *types.Value `json:"MetricType,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-custommetric.html#cfn-iot-custommetric-tags
+	Tags []cloudformation.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 *CustomMetric) AWSCloudFormationType() string {
+	return "AWS::IoT::CustomMetric"
+}
+
+// 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 CustomMetric) MarshalJSON() ([]byte, error) {
+	type Properties CustomMetric
+	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 *CustomMetric) UnmarshalJSON(b []byte) error {
+	type Properties CustomMetric
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CustomMetric(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot/aws-iot-dimension.go b/goformation/cloudformation/iot/aws-iot-dimension.go
new file mode 100644
index 0000000000..49f7649e61
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-dimension.go
@@ -0,0 +1,124 @@
+package iot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dimension AWS CloudFormation Resource (AWS::IoT::Dimension)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-dimension.html
+type Dimension struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-dimension.html#cfn-iot-dimension-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// StringValues AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-dimension.html#cfn-iot-dimension-stringvalues
+	StringValues *types.Value `json:"StringValues,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-dimension.html#cfn-iot-dimension-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-dimension.html#cfn-iot-dimension-type
+	Type *types.Value `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 *Dimension) AWSCloudFormationType() string {
+	return "AWS::IoT::Dimension"
+}
+
+// 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 Dimension) MarshalJSON() ([]byte, error) {
+	type Properties Dimension
+	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 *Dimension) UnmarshalJSON(b []byte) error {
+	type Properties Dimension
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Dimension(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot/aws-iot-domainconfiguration.go b/goformation/cloudformation/iot/aws-iot-domainconfiguration.go
new file mode 100644
index 0000000000..006553efc3
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-domainconfiguration.go
@@ -0,0 +1,144 @@
+package iot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DomainConfiguration AWS CloudFormation Resource (AWS::IoT::DomainConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-domainconfiguration.html
+type DomainConfiguration struct {
+
+	// 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"`
+
+	// DomainConfigurationName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-domainconfiguration.html#cfn-iot-domainconfiguration-domainconfigurationname
+	DomainConfigurationName *types.Value `json:"DomainConfigurationName,omitempty"`
+
+	// DomainConfigurationStatus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-domainconfiguration.html#cfn-iot-domainconfiguration-domainconfigurationstatus
+	DomainConfigurationStatus *types.Value `json:"DomainConfigurationStatus,omitempty"`
+
+	// DomainName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-domainconfiguration.html#cfn-iot-domainconfiguration-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// ServerCertificateArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-domainconfiguration.html#cfn-iot-domainconfiguration-servercertificatearns
+	ServerCertificateArns *types.Value `json:"ServerCertificateArns,omitempty"`
+
+	// ServiceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-domainconfiguration.html#cfn-iot-domainconfiguration-servicetype
+	ServiceType *types.Value `json:"ServiceType,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-domainconfiguration.html#cfn-iot-domainconfiguration-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// ValidationCertificateArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-domainconfiguration.html#cfn-iot-domainconfiguration-validationcertificatearn
+	ValidationCertificateArn *types.Value `json:"ValidationCertificateArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::IoT::DomainConfiguration"
+}
+
+// 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 DomainConfiguration) MarshalJSON() ([]byte, error) {
+	type Properties DomainConfiguration
+	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 *DomainConfiguration) UnmarshalJSON(b []byte) error {
+	type Properties DomainConfiguration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DomainConfiguration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot/aws-iot-domainconfiguration_authorizerconfig.go b/goformation/cloudformation/iot/aws-iot-domainconfiguration_authorizerconfig.go
new file mode 100644
index 0000000000..a2b5b1a156
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-domainconfiguration_authorizerconfig.go
@@ -0,0 +1,42 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DomainConfiguration_AuthorizerConfig AWS CloudFormation Resource (AWS::IoT::DomainConfiguration.AuthorizerConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-domainconfiguration-authorizerconfig.html
+type DomainConfiguration_AuthorizerConfig struct {
+
+	// AllowAuthorizerOverride AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-domainconfiguration-authorizerconfig.html#cfn-iot-domainconfiguration-authorizerconfig-allowauthorizeroverride
+	AllowAuthorizerOverride *types.Value `json:"AllowAuthorizerOverride,omitempty"`
+
+	// DefaultAuthorizerName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-domainconfiguration-authorizerconfig.html#cfn-iot-domainconfiguration-authorizerconfig-defaultauthorizername
+	DefaultAuthorizerName *types.Value `json:"DefaultAuthorizerName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AuthorizerConfig) AWSCloudFormationType() string {
+	return "AWS::IoT::DomainConfiguration.AuthorizerConfig"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-domainconfiguration_servercertificatesummary.go b/goformation/cloudformation/iot/aws-iot-domainconfiguration_servercertificatesummary.go
new file mode 100644
index 0000000000..ee67e40781
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-domainconfiguration_servercertificatesummary.go
@@ -0,0 +1,47 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DomainConfiguration_ServerCertificateSummary AWS CloudFormation Resource (AWS::IoT::DomainConfiguration.ServerCertificateSummary)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-domainconfiguration-servercertificatesummary.html
+type DomainConfiguration_ServerCertificateSummary struct {
+
+	// ServerCertificateArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-domainconfiguration-servercertificatesummary.html#cfn-iot-domainconfiguration-servercertificatesummary-servercertificatearn
+	ServerCertificateArn *types.Value `json:"ServerCertificateArn,omitempty"`
+
+	// ServerCertificateStatus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-domainconfiguration-servercertificatesummary.html#cfn-iot-domainconfiguration-servercertificatesummary-servercertificatestatus
+	ServerCertificateStatus *types.Value `json:"ServerCertificateStatus,omitempty"`
+
+	// ServerCertificateStatusDetail AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-domainconfiguration-servercertificatesummary.html#cfn-iot-domainconfiguration-servercertificatesummary-servercertificatestatusdetail
+	ServerCertificateStatusDetail *types.Value `json:"ServerCertificateStatusDetail,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ServerCertificateSummary) AWSCloudFormationType() string {
+	return "AWS::IoT::DomainConfiguration.ServerCertificateSummary"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-domainconfiguration_tags.go b/goformation/cloudformation/iot/aws-iot-domainconfiguration_tags.go
new file mode 100644
index 0000000000..6cd2210542
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-domainconfiguration_tags.go
@@ -0,0 +1,35 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DomainConfiguration_Tags AWS CloudFormation Resource (AWS::IoT::DomainConfiguration.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-domainconfiguration-tags.html
+type DomainConfiguration_Tags struct {
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-domainconfiguration-tags.html#cfn-iot-domainconfiguration-tags-tags
+	Tags []interface{} `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 *DomainConfiguration_Tags) AWSCloudFormationType() string {
+	return "AWS::IoT::DomainConfiguration.Tags"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-fleetmetric.go b/goformation/cloudformation/iot/aws-iot-fleetmetric.go
new file mode 100644
index 0000000000..01915f349c
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-fleetmetric.go
@@ -0,0 +1,154 @@
+package iot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// FleetMetric AWS CloudFormation Resource (AWS::IoT::FleetMetric)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-fleetmetric.html
+type FleetMetric struct {
+
+	// AggregationField AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-fleetmetric.html#cfn-iot-fleetmetric-aggregationfield
+	AggregationField *types.Value `json:"AggregationField,omitempty"`
+
+	// AggregationType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-fleetmetric.html#cfn-iot-fleetmetric-aggregationtype
+	AggregationType *FleetMetric_AggregationType `json:"AggregationType,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-fleetmetric.html#cfn-iot-fleetmetric-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// IndexName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-fleetmetric.html#cfn-iot-fleetmetric-indexname
+	IndexName *types.Value `json:"IndexName,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-fleetmetric.html#cfn-iot-fleetmetric-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// Period AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-fleetmetric.html#cfn-iot-fleetmetric-period
+	Period *types.Value `json:"Period,omitempty"`
+
+	// QueryString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-fleetmetric.html#cfn-iot-fleetmetric-querystring
+	QueryString *types.Value `json:"QueryString,omitempty"`
+
+	// QueryVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-fleetmetric.html#cfn-iot-fleetmetric-queryversion
+	QueryVersion *types.Value `json:"QueryVersion,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-fleetmetric.html#cfn-iot-fleetmetric-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Unit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-fleetmetric.html#cfn-iot-fleetmetric-unit
+	Unit *types.Value `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 *FleetMetric) AWSCloudFormationType() string {
+	return "AWS::IoT::FleetMetric"
+}
+
+// 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 FleetMetric) MarshalJSON() ([]byte, error) {
+	type Properties FleetMetric
+	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 *FleetMetric) UnmarshalJSON(b []byte) error {
+	type Properties FleetMetric
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FleetMetric(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot/aws-iot-fleetmetric_aggregationtype.go b/goformation/cloudformation/iot/aws-iot-fleetmetric_aggregationtype.go
new file mode 100644
index 0000000000..69f118f8ee
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-fleetmetric_aggregationtype.go
@@ -0,0 +1,42 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FleetMetric_AggregationType AWS CloudFormation Resource (AWS::IoT::FleetMetric.AggregationType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-fleetmetric-aggregationtype.html
+type FleetMetric_AggregationType struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-fleetmetric-aggregationtype.html#cfn-iot-fleetmetric-aggregationtype-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-fleetmetric-aggregationtype.html#cfn-iot-fleetmetric-aggregationtype-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FleetMetric_AggregationType) AWSCloudFormationType() string {
+	return "AWS::IoT::FleetMetric.AggregationType"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-jobtemplate.go b/goformation/cloudformation/iot/aws-iot-jobtemplate.go
new file mode 100644
index 0000000000..57f3ea249d
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-jobtemplate.go
@@ -0,0 +1,154 @@
+package iot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobTemplate AWS CloudFormation Resource (AWS::IoT::JobTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-jobtemplate.html
+type JobTemplate struct {
+
+	// AbortConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-jobtemplate.html#cfn-iot-jobtemplate-abortconfig
+	AbortConfig interface{} `json:"AbortConfig,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-jobtemplate.html#cfn-iot-jobtemplate-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Document AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-jobtemplate.html#cfn-iot-jobtemplate-document
+	Document *types.Value `json:"Document,omitempty"`
+
+	// DocumentSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-jobtemplate.html#cfn-iot-jobtemplate-documentsource
+	DocumentSource *types.Value `json:"DocumentSource,omitempty"`
+
+	// JobArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-jobtemplate.html#cfn-iot-jobtemplate-jobarn
+	JobArn *types.Value `json:"JobArn,omitempty"`
+
+	// JobExecutionsRolloutConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-jobtemplate.html#cfn-iot-jobtemplate-jobexecutionsrolloutconfig
+	JobExecutionsRolloutConfig interface{} `json:"JobExecutionsRolloutConfig,omitempty"`
+
+	// JobTemplateId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-jobtemplate.html#cfn-iot-jobtemplate-jobtemplateid
+	JobTemplateId *types.Value `json:"JobTemplateId,omitempty"`
+
+	// PresignedUrlConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-jobtemplate.html#cfn-iot-jobtemplate-presignedurlconfig
+	PresignedUrlConfig interface{} `json:"PresignedUrlConfig,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-jobtemplate.html#cfn-iot-jobtemplate-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TimeoutConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-jobtemplate.html#cfn-iot-jobtemplate-timeoutconfig
+	TimeoutConfig interface{} `json:"TimeoutConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobTemplate) AWSCloudFormationType() string {
+	return "AWS::IoT::JobTemplate"
+}
+
+// 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 JobTemplate) MarshalJSON() ([]byte, error) {
+	type Properties JobTemplate
+	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 *JobTemplate) UnmarshalJSON(b []byte) error {
+	type Properties JobTemplate
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = JobTemplate(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot/aws-iot-logging.go b/goformation/cloudformation/iot/aws-iot-logging.go
new file mode 100644
index 0000000000..e19dd48418
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-logging.go
@@ -0,0 +1,118 @@
+package iot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Logging AWS CloudFormation Resource (AWS::IoT::Logging)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-logging.html
+type Logging struct {
+
+	// AccountId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-logging.html#cfn-iot-logging-accountid
+	AccountId *types.Value `json:"AccountId,omitempty"`
+
+	// DefaultLogLevel AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-logging.html#cfn-iot-logging-defaultloglevel
+	DefaultLogLevel *types.Value `json:"DefaultLogLevel,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-logging.html#cfn-iot-logging-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Logging) AWSCloudFormationType() string {
+	return "AWS::IoT::Logging"
+}
+
+// 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 Logging) MarshalJSON() ([]byte, error) {
+	type Properties Logging
+	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 *Logging) UnmarshalJSON(b []byte) error {
+	type Properties Logging
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Logging(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot/aws-iot-mitigationaction.go b/goformation/cloudformation/iot/aws-iot-mitigationaction.go
new file mode 100644
index 0000000000..534b45409c
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-mitigationaction.go
@@ -0,0 +1,124 @@
+package iot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// MitigationAction AWS CloudFormation Resource (AWS::IoT::MitigationAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-mitigationaction.html
+type MitigationAction struct {
+
+	// ActionName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-mitigationaction.html#cfn-iot-mitigationaction-actionname
+	ActionName *types.Value `json:"ActionName,omitempty"`
+
+	// ActionParams AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-mitigationaction.html#cfn-iot-mitigationaction-actionparams
+	ActionParams *MitigationAction_ActionParams `json:"ActionParams,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-mitigationaction.html#cfn-iot-mitigationaction-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-mitigationaction.html#cfn-iot-mitigationaction-tags
+	Tags []cloudformation.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 *MitigationAction) AWSCloudFormationType() string {
+	return "AWS::IoT::MitigationAction"
+}
+
+// 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 MitigationAction) MarshalJSON() ([]byte, error) {
+	type Properties MitigationAction
+	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 *MitigationAction) UnmarshalJSON(b []byte) error {
+	type Properties MitigationAction
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = MitigationAction(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot/aws-iot-mitigationaction_actionparams.go b/goformation/cloudformation/iot/aws-iot-mitigationaction_actionparams.go
new file mode 100644
index 0000000000..36d22283c5
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-mitigationaction_actionparams.go
@@ -0,0 +1,60 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// MitigationAction_ActionParams AWS CloudFormation Resource (AWS::IoT::MitigationAction.ActionParams)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-actionparams.html
+type MitigationAction_ActionParams struct {
+
+	// AddThingsToThingGroupParams AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-actionparams.html#cfn-iot-mitigationaction-actionparams-addthingstothinggroupparams
+	AddThingsToThingGroupParams *MitigationAction_AddThingsToThingGroupParams `json:"AddThingsToThingGroupParams,omitempty"`
+
+	// EnableIoTLoggingParams AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-actionparams.html#cfn-iot-mitigationaction-actionparams-enableiotloggingparams
+	EnableIoTLoggingParams *MitigationAction_EnableIoTLoggingParams `json:"EnableIoTLoggingParams,omitempty"`
+
+	// PublishFindingToSnsParams AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-actionparams.html#cfn-iot-mitigationaction-actionparams-publishfindingtosnsparams
+	PublishFindingToSnsParams *MitigationAction_PublishFindingToSnsParams `json:"PublishFindingToSnsParams,omitempty"`
+
+	// ReplaceDefaultPolicyVersionParams AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-actionparams.html#cfn-iot-mitigationaction-actionparams-replacedefaultpolicyversionparams
+	ReplaceDefaultPolicyVersionParams *MitigationAction_ReplaceDefaultPolicyVersionParams `json:"ReplaceDefaultPolicyVersionParams,omitempty"`
+
+	// UpdateCACertificateParams AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-actionparams.html#cfn-iot-mitigationaction-actionparams-updatecacertificateparams
+	UpdateCACertificateParams *MitigationAction_UpdateCACertificateParams `json:"UpdateCACertificateParams,omitempty"`
+
+	// UpdateDeviceCertificateParams AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-actionparams.html#cfn-iot-mitigationaction-actionparams-updatedevicecertificateparams
+	UpdateDeviceCertificateParams *MitigationAction_UpdateDeviceCertificateParams `json:"UpdateDeviceCertificateParams,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MitigationAction_ActionParams) AWSCloudFormationType() string {
+	return "AWS::IoT::MitigationAction.ActionParams"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-mitigationaction_addthingstothinggroupparams.go b/goformation/cloudformation/iot/aws-iot-mitigationaction_addthingstothinggroupparams.go
new file mode 100644
index 0000000000..d671338cfb
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-mitigationaction_addthingstothinggroupparams.go
@@ -0,0 +1,42 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MitigationAction_AddThingsToThingGroupParams AWS CloudFormation Resource (AWS::IoT::MitigationAction.AddThingsToThingGroupParams)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-addthingstothinggroupparams.html
+type MitigationAction_AddThingsToThingGroupParams struct {
+
+	// OverrideDynamicGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-addthingstothinggroupparams.html#cfn-iot-mitigationaction-addthingstothinggroupparams-overridedynamicgroups
+	OverrideDynamicGroups *types.Value `json:"OverrideDynamicGroups,omitempty"`
+
+	// ThingGroupNames AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-addthingstothinggroupparams.html#cfn-iot-mitigationaction-addthingstothinggroupparams-thinggroupnames
+	ThingGroupNames *types.Value `json:"ThingGroupNames,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MitigationAction_AddThingsToThingGroupParams) AWSCloudFormationType() string {
+	return "AWS::IoT::MitigationAction.AddThingsToThingGroupParams"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-mitigationaction_enableiotloggingparams.go b/goformation/cloudformation/iot/aws-iot-mitigationaction_enableiotloggingparams.go
new file mode 100644
index 0000000000..1dd587617b
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-mitigationaction_enableiotloggingparams.go
@@ -0,0 +1,42 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MitigationAction_EnableIoTLoggingParams AWS CloudFormation Resource (AWS::IoT::MitigationAction.EnableIoTLoggingParams)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-enableiotloggingparams.html
+type MitigationAction_EnableIoTLoggingParams struct {
+
+	// LogLevel AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-enableiotloggingparams.html#cfn-iot-mitigationaction-enableiotloggingparams-loglevel
+	LogLevel *types.Value `json:"LogLevel,omitempty"`
+
+	// RoleArnForLogging AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-enableiotloggingparams.html#cfn-iot-mitigationaction-enableiotloggingparams-rolearnforlogging
+	RoleArnForLogging *types.Value `json:"RoleArnForLogging,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MitigationAction_EnableIoTLoggingParams) AWSCloudFormationType() string {
+	return "AWS::IoT::MitigationAction.EnableIoTLoggingParams"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-mitigationaction_publishfindingtosnsparams.go b/goformation/cloudformation/iot/aws-iot-mitigationaction_publishfindingtosnsparams.go
new file mode 100644
index 0000000000..e84183cdec
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-mitigationaction_publishfindingtosnsparams.go
@@ -0,0 +1,37 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MitigationAction_PublishFindingToSnsParams AWS CloudFormation Resource (AWS::IoT::MitigationAction.PublishFindingToSnsParams)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-publishfindingtosnsparams.html
+type MitigationAction_PublishFindingToSnsParams struct {
+
+	// TopicArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-publishfindingtosnsparams.html#cfn-iot-mitigationaction-publishfindingtosnsparams-topicarn
+	TopicArn *types.Value `json:"TopicArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MitigationAction_PublishFindingToSnsParams) AWSCloudFormationType() string {
+	return "AWS::IoT::MitigationAction.PublishFindingToSnsParams"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-mitigationaction_replacedefaultpolicyversionparams.go b/goformation/cloudformation/iot/aws-iot-mitigationaction_replacedefaultpolicyversionparams.go
new file mode 100644
index 0000000000..ae50798eac
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-mitigationaction_replacedefaultpolicyversionparams.go
@@ -0,0 +1,37 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MitigationAction_ReplaceDefaultPolicyVersionParams AWS CloudFormation Resource (AWS::IoT::MitigationAction.ReplaceDefaultPolicyVersionParams)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-replacedefaultpolicyversionparams.html
+type MitigationAction_ReplaceDefaultPolicyVersionParams struct {
+
+	// TemplateName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-replacedefaultpolicyversionparams.html#cfn-iot-mitigationaction-replacedefaultpolicyversionparams-templatename
+	TemplateName *types.Value `json:"TemplateName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MitigationAction_ReplaceDefaultPolicyVersionParams) AWSCloudFormationType() string {
+	return "AWS::IoT::MitigationAction.ReplaceDefaultPolicyVersionParams"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-mitigationaction_updatecacertificateparams.go b/goformation/cloudformation/iot/aws-iot-mitigationaction_updatecacertificateparams.go
new file mode 100644
index 0000000000..64a2054663
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-mitigationaction_updatecacertificateparams.go
@@ -0,0 +1,37 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MitigationAction_UpdateCACertificateParams AWS CloudFormation Resource (AWS::IoT::MitigationAction.UpdateCACertificateParams)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-updatecacertificateparams.html
+type MitigationAction_UpdateCACertificateParams struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-updatecacertificateparams.html#cfn-iot-mitigationaction-updatecacertificateparams-action
+	Action *types.Value `json:"Action,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MitigationAction_UpdateCACertificateParams) AWSCloudFormationType() string {
+	return "AWS::IoT::MitigationAction.UpdateCACertificateParams"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-mitigationaction_updatedevicecertificateparams.go b/goformation/cloudformation/iot/aws-iot-mitigationaction_updatedevicecertificateparams.go
new file mode 100644
index 0000000000..f831b5ca92
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-mitigationaction_updatedevicecertificateparams.go
@@ -0,0 +1,37 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MitigationAction_UpdateDeviceCertificateParams AWS CloudFormation Resource (AWS::IoT::MitigationAction.UpdateDeviceCertificateParams)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-updatedevicecertificateparams.html
+type MitigationAction_UpdateDeviceCertificateParams struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-mitigationaction-updatedevicecertificateparams.html#cfn-iot-mitigationaction-updatedevicecertificateparams-action
+	Action *types.Value `json:"Action,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MitigationAction_UpdateDeviceCertificateParams) AWSCloudFormationType() string {
+	return "AWS::IoT::MitigationAction.UpdateDeviceCertificateParams"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-policy.go b/goformation/cloudformation/iot/aws-iot-policy.go
new file mode 100644
index 0000000000..70f9c2d01d
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-policy.go
@@ -0,0 +1,113 @@
+package iot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Policy AWS CloudFormation Resource (AWS::IoT::Policy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-policy.html
+type Policy struct {
+
+	// PolicyDocument AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-policy.html#cfn-iot-policy-policydocument
+	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
+
+	// PolicyName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-policy.html#cfn-iot-policy-policyname
+	PolicyName *types.Value `json:"PolicyName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Policy) AWSCloudFormationType() string {
+	return "AWS::IoT::Policy"
+}
+
+// MarshalJSON is a custom JSON marshalling hook that embeds this object into
+// an AWS CloudFormation JSON resource's 'Properties' field and adds a 'Type'.
+func (r Policy) MarshalJSON() ([]byte, error) {
+	type Properties Policy
+	return json.Marshal(&struct {
+		Type                string
+		Properties          Properties
+		DependsOn           []string                     `json:"DependsOn,omitempty"`
+		Metadata            map[string]interface{}       `json:"Metadata,omitempty"`
+		DeletionPolicy      policies.DeletionPolicy      `json:"DeletionPolicy,omitempty"`
+		UpdateReplacePolicy policies.UpdateReplacePolicy `json:"UpdateReplacePolicy,omitempty"`
+		Condition           string                       `json:"Condition,omitempty"`
+	}{
+		Type:                r.AWSCloudFormationType(),
+		Properties:          (Properties)(r),
+		DependsOn:           r.AWSCloudFormationDependsOn,
+		Metadata:            r.AWSCloudFormationMetadata,
+		DeletionPolicy:      r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition:           r.AWSCloudFormationCondition,
+	})
+}
+
+// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
+// AWS CloudFormation resource object, and just keeps the 'Properties' field.
+func (r *Policy) UnmarshalJSON(b []byte) error {
+	type Properties Policy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Policy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot/aws-iot-policyprincipalattachment.go b/goformation/cloudformation/iot/aws-iot-policyprincipalattachment.go
new file mode 100644
index 0000000000..fd814b162f
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-policyprincipalattachment.go
@@ -0,0 +1,113 @@
+package iot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PolicyPrincipalAttachment AWS CloudFormation Resource (AWS::IoT::PolicyPrincipalAttachment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-policyprincipalattachment.html
+type PolicyPrincipalAttachment struct {
+
+	// PolicyName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-policyprincipalattachment.html#cfn-iot-policyprincipalattachment-policyname
+	PolicyName *types.Value `json:"PolicyName,omitempty"`
+
+	// Principal AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-policyprincipalattachment.html#cfn-iot-policyprincipalattachment-principal
+	Principal *types.Value `json:"Principal,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PolicyPrincipalAttachment) AWSCloudFormationType() string {
+	return "AWS::IoT::PolicyPrincipalAttachment"
+}
+
+// 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 PolicyPrincipalAttachment) MarshalJSON() ([]byte, error) {
+	type Properties PolicyPrincipalAttachment
+	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 *PolicyPrincipalAttachment) UnmarshalJSON(b []byte) error {
+	type Properties PolicyPrincipalAttachment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PolicyPrincipalAttachment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot/aws-iot-provisioningtemplate.go b/goformation/cloudformation/iot/aws-iot-provisioningtemplate.go
new file mode 100644
index 0000000000..d22340aeb8
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-provisioningtemplate.go
@@ -0,0 +1,139 @@
+package iot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ProvisioningTemplate AWS CloudFormation Resource (AWS::IoT::ProvisioningTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-provisioningtemplate.html
+type ProvisioningTemplate struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-provisioningtemplate.html#cfn-iot-provisioningtemplate-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-provisioningtemplate.html#cfn-iot-provisioningtemplate-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// PreProvisioningHook AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-provisioningtemplate.html#cfn-iot-provisioningtemplate-preprovisioninghook
+	PreProvisioningHook *ProvisioningTemplate_ProvisioningHook `json:"PreProvisioningHook,omitempty"`
+
+	// ProvisioningRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-provisioningtemplate.html#cfn-iot-provisioningtemplate-provisioningrolearn
+	ProvisioningRoleArn *types.Value `json:"ProvisioningRoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-provisioningtemplate.html#cfn-iot-provisioningtemplate-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TemplateBody AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-provisioningtemplate.html#cfn-iot-provisioningtemplate-templatebody
+	TemplateBody *types.Value `json:"TemplateBody,omitempty"`
+
+	// TemplateName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-provisioningtemplate.html#cfn-iot-provisioningtemplate-templatename
+	TemplateName *types.Value `json:"TemplateName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ProvisioningTemplate) AWSCloudFormationType() string {
+	return "AWS::IoT::ProvisioningTemplate"
+}
+
+// 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 ProvisioningTemplate) MarshalJSON() ([]byte, error) {
+	type Properties ProvisioningTemplate
+	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 *ProvisioningTemplate) UnmarshalJSON(b []byte) error {
+	type Properties ProvisioningTemplate
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ProvisioningTemplate(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot/aws-iot-provisioningtemplate_provisioninghook.go b/goformation/cloudformation/iot/aws-iot-provisioningtemplate_provisioninghook.go
new file mode 100644
index 0000000000..5870101343
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-provisioningtemplate_provisioninghook.go
@@ -0,0 +1,42 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ProvisioningTemplate_ProvisioningHook AWS CloudFormation Resource (AWS::IoT::ProvisioningTemplate.ProvisioningHook)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-provisioningtemplate-provisioninghook.html
+type ProvisioningTemplate_ProvisioningHook struct {
+
+	// PayloadVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-provisioningtemplate-provisioninghook.html#cfn-iot-provisioningtemplate-provisioninghook-payloadversion
+	PayloadVersion *types.Value `json:"PayloadVersion,omitempty"`
+
+	// TargetArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-provisioningtemplate-provisioninghook.html#cfn-iot-provisioningtemplate-provisioninghook-targetarn
+	TargetArn *types.Value `json:"TargetArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ProvisioningTemplate_ProvisioningHook) AWSCloudFormationType() string {
+	return "AWS::IoT::ProvisioningTemplate.ProvisioningHook"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-provisioningtemplate_tags.go b/goformation/cloudformation/iot/aws-iot-provisioningtemplate_tags.go
new file mode 100644
index 0000000000..b98e08f424
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-provisioningtemplate_tags.go
@@ -0,0 +1,35 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ProvisioningTemplate_Tags AWS CloudFormation Resource (AWS::IoT::ProvisioningTemplate.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-provisioningtemplate-tags.html
+type ProvisioningTemplate_Tags struct {
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-provisioningtemplate-tags.html#cfn-iot-provisioningtemplate-tags-tags
+	Tags []interface{} `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 *ProvisioningTemplate_Tags) AWSCloudFormationType() string {
+	return "AWS::IoT::ProvisioningTemplate.Tags"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-resourcespecificlogging.go b/goformation/cloudformation/iot/aws-iot-resourcespecificlogging.go
new file mode 100644
index 0000000000..24446955e6
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-resourcespecificlogging.go
@@ -0,0 +1,118 @@
+package iot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceSpecificLogging AWS CloudFormation Resource (AWS::IoT::ResourceSpecificLogging)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-resourcespecificlogging.html
+type ResourceSpecificLogging struct {
+
+	// LogLevel AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-resourcespecificlogging.html#cfn-iot-resourcespecificlogging-loglevel
+	LogLevel *types.Value `json:"LogLevel,omitempty"`
+
+	// TargetName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-resourcespecificlogging.html#cfn-iot-resourcespecificlogging-targetname
+	TargetName *types.Value `json:"TargetName,omitempty"`
+
+	// TargetType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-resourcespecificlogging.html#cfn-iot-resourcespecificlogging-targettype
+	TargetType *types.Value `json:"TargetType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceSpecificLogging) AWSCloudFormationType() string {
+	return "AWS::IoT::ResourceSpecificLogging"
+}
+
+// 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 ResourceSpecificLogging) MarshalJSON() ([]byte, error) {
+	type Properties ResourceSpecificLogging
+	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 *ResourceSpecificLogging) UnmarshalJSON(b []byte) error {
+	type Properties ResourceSpecificLogging
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResourceSpecificLogging(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot/aws-iot-scheduledaudit.go b/goformation/cloudformation/iot/aws-iot-scheduledaudit.go
new file mode 100644
index 0000000000..9c91f2654e
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-scheduledaudit.go
@@ -0,0 +1,134 @@
+package iot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScheduledAudit AWS CloudFormation Resource (AWS::IoT::ScheduledAudit)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-scheduledaudit.html
+type ScheduledAudit struct {
+
+	// DayOfMonth AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-scheduledaudit.html#cfn-iot-scheduledaudit-dayofmonth
+	DayOfMonth *types.Value `json:"DayOfMonth,omitempty"`
+
+	// DayOfWeek AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-scheduledaudit.html#cfn-iot-scheduledaudit-dayofweek
+	DayOfWeek *types.Value `json:"DayOfWeek,omitempty"`
+
+	// Frequency AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-scheduledaudit.html#cfn-iot-scheduledaudit-frequency
+	Frequency *types.Value `json:"Frequency,omitempty"`
+
+	// ScheduledAuditName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-scheduledaudit.html#cfn-iot-scheduledaudit-scheduledauditname
+	ScheduledAuditName *types.Value `json:"ScheduledAuditName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-scheduledaudit.html#cfn-iot-scheduledaudit-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TargetCheckNames AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-scheduledaudit.html#cfn-iot-scheduledaudit-targetchecknames
+	TargetCheckNames *types.Value `json:"TargetCheckNames,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScheduledAudit) AWSCloudFormationType() string {
+	return "AWS::IoT::ScheduledAudit"
+}
+
+// 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 ScheduledAudit) MarshalJSON() ([]byte, error) {
+	type Properties ScheduledAudit
+	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 *ScheduledAudit) UnmarshalJSON(b []byte) error {
+	type Properties ScheduledAudit
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ScheduledAudit(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot/aws-iot-securityprofile.go b/goformation/cloudformation/iot/aws-iot-securityprofile.go
new file mode 100644
index 0000000000..92df9d878f
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-securityprofile.go
@@ -0,0 +1,139 @@
+package iot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityProfile AWS CloudFormation Resource (AWS::IoT::SecurityProfile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-securityprofile.html
+type SecurityProfile struct {
+
+	// AdditionalMetricsToRetainV2 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-securityprofile.html#cfn-iot-securityprofile-additionalmetricstoretainv2
+	AdditionalMetricsToRetainV2 []SecurityProfile_MetricToRetain `json:"AdditionalMetricsToRetainV2,omitempty"`
+
+	// AlertTargets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-securityprofile.html#cfn-iot-securityprofile-alerttargets
+	AlertTargets map[string]SecurityProfile_AlertTarget `json:"AlertTargets,omitempty"`
+
+	// Behaviors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-securityprofile.html#cfn-iot-securityprofile-behaviors
+	Behaviors []SecurityProfile_Behavior `json:"Behaviors,omitempty"`
+
+	// SecurityProfileDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-securityprofile.html#cfn-iot-securityprofile-securityprofiledescription
+	SecurityProfileDescription *types.Value `json:"SecurityProfileDescription,omitempty"`
+
+	// SecurityProfileName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-securityprofile.html#cfn-iot-securityprofile-securityprofilename
+	SecurityProfileName *types.Value `json:"SecurityProfileName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-securityprofile.html#cfn-iot-securityprofile-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TargetArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-securityprofile.html#cfn-iot-securityprofile-targetarns
+	TargetArns *types.Value `json:"TargetArns,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SecurityProfile) AWSCloudFormationType() string {
+	return "AWS::IoT::SecurityProfile"
+}
+
+// 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 SecurityProfile) MarshalJSON() ([]byte, error) {
+	type Properties SecurityProfile
+	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 *SecurityProfile) UnmarshalJSON(b []byte) error {
+	type Properties SecurityProfile
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SecurityProfile(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot/aws-iot-securityprofile_alerttarget.go b/goformation/cloudformation/iot/aws-iot-securityprofile_alerttarget.go
new file mode 100644
index 0000000000..e86a80302e
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-securityprofile_alerttarget.go
@@ -0,0 +1,42 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityProfile_AlertTarget AWS CloudFormation Resource (AWS::IoT::SecurityProfile.AlertTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-alerttarget.html
+type SecurityProfile_AlertTarget struct {
+
+	// AlertTargetArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-alerttarget.html#cfn-iot-securityprofile-alerttarget-alerttargetarn
+	AlertTargetArn *types.Value `json:"AlertTargetArn,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-alerttarget.html#cfn-iot-securityprofile-alerttarget-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SecurityProfile_AlertTarget) AWSCloudFormationType() string {
+	return "AWS::IoT::SecurityProfile.AlertTarget"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-securityprofile_behavior.go b/goformation/cloudformation/iot/aws-iot-securityprofile_behavior.go
new file mode 100644
index 0000000000..498e26ac30
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-securityprofile_behavior.go
@@ -0,0 +1,57 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityProfile_Behavior AWS CloudFormation Resource (AWS::IoT::SecurityProfile.Behavior)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-behavior.html
+type SecurityProfile_Behavior struct {
+
+	// Criteria AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-behavior.html#cfn-iot-securityprofile-behavior-criteria
+	Criteria *SecurityProfile_BehaviorCriteria `json:"Criteria,omitempty"`
+
+	// Metric AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-behavior.html#cfn-iot-securityprofile-behavior-metric
+	Metric *types.Value `json:"Metric,omitempty"`
+
+	// MetricDimension AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-behavior.html#cfn-iot-securityprofile-behavior-metricdimension
+	MetricDimension *SecurityProfile_MetricDimension `json:"MetricDimension,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-behavior.html#cfn-iot-securityprofile-behavior-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SuppressAlerts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-behavior.html#cfn-iot-securityprofile-behavior-suppressalerts
+	SuppressAlerts *types.Value `json:"SuppressAlerts,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SecurityProfile_Behavior) AWSCloudFormationType() string {
+	return "AWS::IoT::SecurityProfile.Behavior"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-securityprofile_behaviorcriteria.go b/goformation/cloudformation/iot/aws-iot-securityprofile_behaviorcriteria.go
new file mode 100644
index 0000000000..93105a5c7e
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-securityprofile_behaviorcriteria.go
@@ -0,0 +1,67 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityProfile_BehaviorCriteria AWS CloudFormation Resource (AWS::IoT::SecurityProfile.BehaviorCriteria)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-behaviorcriteria.html
+type SecurityProfile_BehaviorCriteria struct {
+
+	// ComparisonOperator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-behaviorcriteria.html#cfn-iot-securityprofile-behaviorcriteria-comparisonoperator
+	ComparisonOperator *types.Value `json:"ComparisonOperator,omitempty"`
+
+	// ConsecutiveDatapointsToAlarm AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-behaviorcriteria.html#cfn-iot-securityprofile-behaviorcriteria-consecutivedatapointstoalarm
+	ConsecutiveDatapointsToAlarm *types.Value `json:"ConsecutiveDatapointsToAlarm,omitempty"`
+
+	// ConsecutiveDatapointsToClear AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-behaviorcriteria.html#cfn-iot-securityprofile-behaviorcriteria-consecutivedatapointstoclear
+	ConsecutiveDatapointsToClear *types.Value `json:"ConsecutiveDatapointsToClear,omitempty"`
+
+	// DurationSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-behaviorcriteria.html#cfn-iot-securityprofile-behaviorcriteria-durationseconds
+	DurationSeconds *types.Value `json:"DurationSeconds,omitempty"`
+
+	// MlDetectionConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-behaviorcriteria.html#cfn-iot-securityprofile-behaviorcriteria-mldetectionconfig
+	MlDetectionConfig *SecurityProfile_MachineLearningDetectionConfig `json:"MlDetectionConfig,omitempty"`
+
+	// StatisticalThreshold AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-behaviorcriteria.html#cfn-iot-securityprofile-behaviorcriteria-statisticalthreshold
+	StatisticalThreshold *SecurityProfile_StatisticalThreshold `json:"StatisticalThreshold,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-behaviorcriteria.html#cfn-iot-securityprofile-behaviorcriteria-value
+	Value *SecurityProfile_MetricValue `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 *SecurityProfile_BehaviorCriteria) AWSCloudFormationType() string {
+	return "AWS::IoT::SecurityProfile.BehaviorCriteria"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-securityprofile_machinelearningdetectionconfig.go b/goformation/cloudformation/iot/aws-iot-securityprofile_machinelearningdetectionconfig.go
new file mode 100644
index 0000000000..280ca30fdc
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-securityprofile_machinelearningdetectionconfig.go
@@ -0,0 +1,37 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityProfile_MachineLearningDetectionConfig AWS CloudFormation Resource (AWS::IoT::SecurityProfile.MachineLearningDetectionConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-machinelearningdetectionconfig.html
+type SecurityProfile_MachineLearningDetectionConfig struct {
+
+	// ConfidenceLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-machinelearningdetectionconfig.html#cfn-iot-securityprofile-machinelearningdetectionconfig-confidencelevel
+	ConfidenceLevel *types.Value `json:"ConfidenceLevel,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SecurityProfile_MachineLearningDetectionConfig) AWSCloudFormationType() string {
+	return "AWS::IoT::SecurityProfile.MachineLearningDetectionConfig"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-securityprofile_metricdimension.go b/goformation/cloudformation/iot/aws-iot-securityprofile_metricdimension.go
new file mode 100644
index 0000000000..4ea959c730
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-securityprofile_metricdimension.go
@@ -0,0 +1,42 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityProfile_MetricDimension AWS CloudFormation Resource (AWS::IoT::SecurityProfile.MetricDimension)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-metricdimension.html
+type SecurityProfile_MetricDimension struct {
+
+	// DimensionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-metricdimension.html#cfn-iot-securityprofile-metricdimension-dimensionname
+	DimensionName *types.Value `json:"DimensionName,omitempty"`
+
+	// Operator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-metricdimension.html#cfn-iot-securityprofile-metricdimension-operator
+	Operator *types.Value `json:"Operator,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SecurityProfile_MetricDimension) AWSCloudFormationType() string {
+	return "AWS::IoT::SecurityProfile.MetricDimension"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-securityprofile_metrictoretain.go b/goformation/cloudformation/iot/aws-iot-securityprofile_metrictoretain.go
new file mode 100644
index 0000000000..9989ee80f1
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-securityprofile_metrictoretain.go
@@ -0,0 +1,42 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityProfile_MetricToRetain AWS CloudFormation Resource (AWS::IoT::SecurityProfile.MetricToRetain)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-metrictoretain.html
+type SecurityProfile_MetricToRetain struct {
+
+	// Metric AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-metrictoretain.html#cfn-iot-securityprofile-metrictoretain-metric
+	Metric *types.Value `json:"Metric,omitempty"`
+
+	// MetricDimension AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-metrictoretain.html#cfn-iot-securityprofile-metrictoretain-metricdimension
+	MetricDimension *SecurityProfile_MetricDimension `json:"MetricDimension,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SecurityProfile_MetricToRetain) AWSCloudFormationType() string {
+	return "AWS::IoT::SecurityProfile.MetricToRetain"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-securityprofile_metricvalue.go b/goformation/cloudformation/iot/aws-iot-securityprofile_metricvalue.go
new file mode 100644
index 0000000000..bf1fc14e93
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-securityprofile_metricvalue.go
@@ -0,0 +1,62 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityProfile_MetricValue AWS CloudFormation Resource (AWS::IoT::SecurityProfile.MetricValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-metricvalue.html
+type SecurityProfile_MetricValue struct {
+
+	// Cidrs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-metricvalue.html#cfn-iot-securityprofile-metricvalue-cidrs
+	Cidrs *types.Value `json:"Cidrs,omitempty"`
+
+	// Count AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-metricvalue.html#cfn-iot-securityprofile-metricvalue-count
+	Count *types.Value `json:"Count,omitempty"`
+
+	// Number AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-metricvalue.html#cfn-iot-securityprofile-metricvalue-number
+	Number *types.Value `json:"Number,omitempty"`
+
+	// Numbers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-metricvalue.html#cfn-iot-securityprofile-metricvalue-numbers
+	Numbers *types.Value `json:"Numbers,omitempty"`
+
+	// Ports AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-metricvalue.html#cfn-iot-securityprofile-metricvalue-ports
+	Ports *types.Value `json:"Ports,omitempty"`
+
+	// Strings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-metricvalue.html#cfn-iot-securityprofile-metricvalue-strings
+	Strings *types.Value `json:"Strings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SecurityProfile_MetricValue) AWSCloudFormationType() string {
+	return "AWS::IoT::SecurityProfile.MetricValue"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-securityprofile_statisticalthreshold.go b/goformation/cloudformation/iot/aws-iot-securityprofile_statisticalthreshold.go
new file mode 100644
index 0000000000..a7327f89d8
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-securityprofile_statisticalthreshold.go
@@ -0,0 +1,37 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecurityProfile_StatisticalThreshold AWS CloudFormation Resource (AWS::IoT::SecurityProfile.StatisticalThreshold)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-statisticalthreshold.html
+type SecurityProfile_StatisticalThreshold struct {
+
+	// Statistic AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-securityprofile-statisticalthreshold.html#cfn-iot-securityprofile-statisticalthreshold-statistic
+	Statistic *types.Value `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 *SecurityProfile_StatisticalThreshold) AWSCloudFormationType() string {
+	return "AWS::IoT::SecurityProfile.StatisticalThreshold"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-thing.go b/goformation/cloudformation/iot/aws-iot-thing.go
new file mode 100644
index 0000000000..dd71c4d981
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-thing.go
@@ -0,0 +1,113 @@
+package iot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Thing AWS CloudFormation Resource (AWS::IoT::Thing)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-thing.html
+type Thing struct {
+
+	// AttributePayload AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-thing.html#cfn-iot-thing-attributepayload
+	AttributePayload *Thing_AttributePayload `json:"AttributePayload,omitempty"`
+
+	// ThingName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-thing.html#cfn-iot-thing-thingname
+	ThingName *types.Value `json:"ThingName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Thing) AWSCloudFormationType() string {
+	return "AWS::IoT::Thing"
+}
+
+// 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 Thing) MarshalJSON() ([]byte, error) {
+	type Properties Thing
+	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 *Thing) UnmarshalJSON(b []byte) error {
+	type Properties Thing
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Thing(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot/aws-iot-thing_attributepayload.go b/goformation/cloudformation/iot/aws-iot-thing_attributepayload.go
new file mode 100644
index 0000000000..1a51eaf9f0
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-thing_attributepayload.go
@@ -0,0 +1,37 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Thing_AttributePayload AWS CloudFormation Resource (AWS::IoT::Thing.AttributePayload)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-thing-attributepayload.html
+type Thing_AttributePayload struct {
+
+	// Attributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-thing-attributepayload.html#cfn-iot-thing-attributepayload-attributes
+	Attributes map[string]*types.Value `json:"Attributes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Thing_AttributePayload) AWSCloudFormationType() string {
+	return "AWS::IoT::Thing.AttributePayload"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-thingprincipalattachment.go b/goformation/cloudformation/iot/aws-iot-thingprincipalattachment.go
new file mode 100644
index 0000000000..5fe26deafa
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-thingprincipalattachment.go
@@ -0,0 +1,113 @@
+package iot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ThingPrincipalAttachment AWS CloudFormation Resource (AWS::IoT::ThingPrincipalAttachment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-thingprincipalattachment.html
+type ThingPrincipalAttachment struct {
+
+	// Principal AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-thingprincipalattachment.html#cfn-iot-thingprincipalattachment-principal
+	Principal *types.Value `json:"Principal,omitempty"`
+
+	// ThingName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-thingprincipalattachment.html#cfn-iot-thingprincipalattachment-thingname
+	ThingName *types.Value `json:"ThingName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ThingPrincipalAttachment) AWSCloudFormationType() string {
+	return "AWS::IoT::ThingPrincipalAttachment"
+}
+
+// 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 ThingPrincipalAttachment) MarshalJSON() ([]byte, error) {
+	type Properties ThingPrincipalAttachment
+	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 *ThingPrincipalAttachment) UnmarshalJSON(b []byte) error {
+	type Properties ThingPrincipalAttachment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ThingPrincipalAttachment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot/aws-iot-topicrule.go b/goformation/cloudformation/iot/aws-iot-topicrule.go
new file mode 100644
index 0000000000..be43a673ad
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule.go
@@ -0,0 +1,119 @@
+package iot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule AWS CloudFormation Resource (AWS::IoT::TopicRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-topicrule.html
+type TopicRule struct {
+
+	// RuleName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-topicrule.html#cfn-iot-topicrule-rulename
+	RuleName *types.Value `json:"RuleName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-topicrule.html#cfn-iot-topicrule-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TopicRulePayload AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-topicrule.html#cfn-iot-topicrule-topicrulepayload
+	TopicRulePayload *TopicRule_TopicRulePayload `json:"TopicRulePayload,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule"
+}
+
+// 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 TopicRule) MarshalJSON() ([]byte, error) {
+	type Properties TopicRule
+	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 *TopicRule) UnmarshalJSON(b []byte) error {
+	type Properties TopicRule
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TopicRule(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot/aws-iot-topicrule_action.go b/goformation/cloudformation/iot/aws-iot-topicrule_action.go
new file mode 100644
index 0000000000..786d056d7f
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_action.go
@@ -0,0 +1,135 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_Action AWS CloudFormation Resource (AWS::IoT::TopicRule.Action)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html
+type TopicRule_Action struct {
+
+	// CloudwatchAlarm AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-cloudwatchalarm
+	CloudwatchAlarm *TopicRule_CloudwatchAlarmAction `json:"CloudwatchAlarm,omitempty"`
+
+	// CloudwatchLogs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-cloudwatchlogs
+	CloudwatchLogs *TopicRule_CloudwatchLogsAction `json:"CloudwatchLogs,omitempty"`
+
+	// CloudwatchMetric AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-cloudwatchmetric
+	CloudwatchMetric *TopicRule_CloudwatchMetricAction `json:"CloudwatchMetric,omitempty"`
+
+	// DynamoDB AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-dynamodb
+	DynamoDB *TopicRule_DynamoDBAction `json:"DynamoDB,omitempty"`
+
+	// DynamoDBv2 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-dynamodbv2
+	DynamoDBv2 *TopicRule_DynamoDBv2Action `json:"DynamoDBv2,omitempty"`
+
+	// Elasticsearch AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-elasticsearch
+	Elasticsearch *TopicRule_ElasticsearchAction `json:"Elasticsearch,omitempty"`
+
+	// Firehose AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-firehose
+	Firehose *TopicRule_FirehoseAction `json:"Firehose,omitempty"`
+
+	// Http AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-http
+	Http *TopicRule_HttpAction `json:"Http,omitempty"`
+
+	// IotAnalytics AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-iotanalytics
+	IotAnalytics *TopicRule_IotAnalyticsAction `json:"IotAnalytics,omitempty"`
+
+	// IotEvents AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-iotevents
+	IotEvents *TopicRule_IotEventsAction `json:"IotEvents,omitempty"`
+
+	// IotSiteWise AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-iotsitewise
+	IotSiteWise *TopicRule_IotSiteWiseAction `json:"IotSiteWise,omitempty"`
+
+	// Kafka AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-kafka
+	Kafka *TopicRule_KafkaAction `json:"Kafka,omitempty"`
+
+	// Kinesis AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-kinesis
+	Kinesis *TopicRule_KinesisAction `json:"Kinesis,omitempty"`
+
+	// Lambda AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-lambda
+	Lambda *TopicRule_LambdaAction `json:"Lambda,omitempty"`
+
+	// OpenSearch AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-opensearch
+	OpenSearch *TopicRule_OpenSearchAction `json:"OpenSearch,omitempty"`
+
+	// Republish AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-republish
+	Republish *TopicRule_RepublishAction `json:"Republish,omitempty"`
+
+	// S3 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-s3
+	S3 *TopicRule_S3Action `json:"S3,omitempty"`
+
+	// Sns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-sns
+	Sns *TopicRule_SnsAction `json:"Sns,omitempty"`
+
+	// Sqs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-sqs
+	Sqs *TopicRule_SqsAction `json:"Sqs,omitempty"`
+
+	// StepFunctions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-stepfunctions
+	StepFunctions *TopicRule_StepFunctionsAction `json:"StepFunctions,omitempty"`
+
+	// Timestream AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-action.html#cfn-iot-topicrule-action-timestream
+	Timestream *TopicRule_TimestreamAction `json:"Timestream,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_Action) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.Action"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertytimestamp.go b/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertytimestamp.go
new file mode 100644
index 0000000000..5a222cb783
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertytimestamp.go
@@ -0,0 +1,42 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_AssetPropertyTimestamp AWS CloudFormation Resource (AWS::IoT::TopicRule.AssetPropertyTimestamp)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-assetpropertytimestamp.html
+type TopicRule_AssetPropertyTimestamp struct {
+
+	// OffsetInNanos AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-assetpropertytimestamp.html#cfn-iot-topicrule-assetpropertytimestamp-offsetinnanos
+	OffsetInNanos *types.Value `json:"OffsetInNanos,omitempty"`
+
+	// TimeInSeconds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-assetpropertytimestamp.html#cfn-iot-topicrule-assetpropertytimestamp-timeinseconds
+	TimeInSeconds *types.Value `json:"TimeInSeconds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_AssetPropertyTimestamp) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.AssetPropertyTimestamp"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertyvalue.go b/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertyvalue.go
new file mode 100644
index 0000000000..2da9919077
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertyvalue.go
@@ -0,0 +1,47 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_AssetPropertyValue AWS CloudFormation Resource (AWS::IoT::TopicRule.AssetPropertyValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-assetpropertyvalue.html
+type TopicRule_AssetPropertyValue struct {
+
+	// Quality AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-assetpropertyvalue.html#cfn-iot-topicrule-assetpropertyvalue-quality
+	Quality *types.Value `json:"Quality,omitempty"`
+
+	// Timestamp AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-assetpropertyvalue.html#cfn-iot-topicrule-assetpropertyvalue-timestamp
+	Timestamp *TopicRule_AssetPropertyTimestamp `json:"Timestamp,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-assetpropertyvalue.html#cfn-iot-topicrule-assetpropertyvalue-value
+	Value *TopicRule_AssetPropertyVariant `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 *TopicRule_AssetPropertyValue) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.AssetPropertyValue"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertyvariant.go b/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertyvariant.go
new file mode 100644
index 0000000000..c79dbeb137
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_assetpropertyvariant.go
@@ -0,0 +1,52 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_AssetPropertyVariant AWS CloudFormation Resource (AWS::IoT::TopicRule.AssetPropertyVariant)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-assetpropertyvariant.html
+type TopicRule_AssetPropertyVariant struct {
+
+	// BooleanValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-assetpropertyvariant.html#cfn-iot-topicrule-assetpropertyvariant-booleanvalue
+	BooleanValue *types.Value `json:"BooleanValue,omitempty"`
+
+	// DoubleValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-assetpropertyvariant.html#cfn-iot-topicrule-assetpropertyvariant-doublevalue
+	DoubleValue *types.Value `json:"DoubleValue,omitempty"`
+
+	// IntegerValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-assetpropertyvariant.html#cfn-iot-topicrule-assetpropertyvariant-integervalue
+	IntegerValue *types.Value `json:"IntegerValue,omitempty"`
+
+	// StringValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-assetpropertyvariant.html#cfn-iot-topicrule-assetpropertyvariant-stringvalue
+	StringValue *types.Value `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 *TopicRule_AssetPropertyVariant) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.AssetPropertyVariant"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchalarmaction.go b/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchalarmaction.go
new file mode 100644
index 0000000000..da4755b80a
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchalarmaction.go
@@ -0,0 +1,52 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_CloudwatchAlarmAction AWS CloudFormation Resource (AWS::IoT::TopicRule.CloudwatchAlarmAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchalarmaction.html
+type TopicRule_CloudwatchAlarmAction struct {
+
+	// AlarmName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchalarmaction.html#cfn-iot-topicrule-cloudwatchalarmaction-alarmname
+	AlarmName *types.Value `json:"AlarmName,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchalarmaction.html#cfn-iot-topicrule-cloudwatchalarmaction-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// StateReason AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchalarmaction.html#cfn-iot-topicrule-cloudwatchalarmaction-statereason
+	StateReason *types.Value `json:"StateReason,omitempty"`
+
+	// StateValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchalarmaction.html#cfn-iot-topicrule-cloudwatchalarmaction-statevalue
+	StateValue *types.Value `json:"StateValue,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_CloudwatchAlarmAction) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.CloudwatchAlarmAction"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchlogsaction.go b/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchlogsaction.go
new file mode 100644
index 0000000000..53f012e4b1
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchlogsaction.go
@@ -0,0 +1,42 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_CloudwatchLogsAction AWS CloudFormation Resource (AWS::IoT::TopicRule.CloudwatchLogsAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchlogsaction.html
+type TopicRule_CloudwatchLogsAction struct {
+
+	// LogGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchlogsaction.html#cfn-iot-topicrule-cloudwatchlogsaction-loggroupname
+	LogGroupName *types.Value `json:"LogGroupName,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchlogsaction.html#cfn-iot-topicrule-cloudwatchlogsaction-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_CloudwatchLogsAction) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.CloudwatchLogsAction"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchmetricaction.go b/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchmetricaction.go
new file mode 100644
index 0000000000..b62348f027
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_cloudwatchmetricaction.go
@@ -0,0 +1,62 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_CloudwatchMetricAction AWS CloudFormation Resource (AWS::IoT::TopicRule.CloudwatchMetricAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchmetricaction.html
+type TopicRule_CloudwatchMetricAction struct {
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchmetricaction.html#cfn-iot-topicrule-cloudwatchmetricaction-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// MetricNamespace AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchmetricaction.html#cfn-iot-topicrule-cloudwatchmetricaction-metricnamespace
+	MetricNamespace *types.Value `json:"MetricNamespace,omitempty"`
+
+	// MetricTimestamp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchmetricaction.html#cfn-iot-topicrule-cloudwatchmetricaction-metrictimestamp
+	MetricTimestamp *types.Value `json:"MetricTimestamp,omitempty"`
+
+	// MetricUnit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchmetricaction.html#cfn-iot-topicrule-cloudwatchmetricaction-metricunit
+	MetricUnit *types.Value `json:"MetricUnit,omitempty"`
+
+	// MetricValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchmetricaction.html#cfn-iot-topicrule-cloudwatchmetricaction-metricvalue
+	MetricValue *types.Value `json:"MetricValue,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-cloudwatchmetricaction.html#cfn-iot-topicrule-cloudwatchmetricaction-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_CloudwatchMetricAction) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.CloudwatchMetricAction"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_dynamodbaction.go b/goformation/cloudformation/iot/aws-iot-topicrule_dynamodbaction.go
new file mode 100644
index 0000000000..3e199ba3bf
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_dynamodbaction.go
@@ -0,0 +1,77 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_DynamoDBAction AWS CloudFormation Resource (AWS::IoT::TopicRule.DynamoDBAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbaction.html
+type TopicRule_DynamoDBAction struct {
+
+	// HashKeyField AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbaction.html#cfn-iot-topicrule-dynamodbaction-hashkeyfield
+	HashKeyField *types.Value `json:"HashKeyField,omitempty"`
+
+	// HashKeyType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbaction.html#cfn-iot-topicrule-dynamodbaction-hashkeytype
+	HashKeyType *types.Value `json:"HashKeyType,omitempty"`
+
+	// HashKeyValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbaction.html#cfn-iot-topicrule-dynamodbaction-hashkeyvalue
+	HashKeyValue *types.Value `json:"HashKeyValue,omitempty"`
+
+	// PayloadField AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbaction.html#cfn-iot-topicrule-dynamodbaction-payloadfield
+	PayloadField *types.Value `json:"PayloadField,omitempty"`
+
+	// RangeKeyField AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbaction.html#cfn-iot-topicrule-dynamodbaction-rangekeyfield
+	RangeKeyField *types.Value `json:"RangeKeyField,omitempty"`
+
+	// RangeKeyType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbaction.html#cfn-iot-topicrule-dynamodbaction-rangekeytype
+	RangeKeyType *types.Value `json:"RangeKeyType,omitempty"`
+
+	// RangeKeyValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbaction.html#cfn-iot-topicrule-dynamodbaction-rangekeyvalue
+	RangeKeyValue *types.Value `json:"RangeKeyValue,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbaction.html#cfn-iot-topicrule-dynamodbaction-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbaction.html#cfn-iot-topicrule-dynamodbaction-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_DynamoDBAction) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.DynamoDBAction"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_dynamodbv2action.go b/goformation/cloudformation/iot/aws-iot-topicrule_dynamodbv2action.go
new file mode 100644
index 0000000000..5c508ce2b8
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_dynamodbv2action.go
@@ -0,0 +1,42 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_DynamoDBv2Action AWS CloudFormation Resource (AWS::IoT::TopicRule.DynamoDBv2Action)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbv2action.html
+type TopicRule_DynamoDBv2Action struct {
+
+	// PutItem AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbv2action.html#cfn-iot-topicrule-dynamodbv2action-putitem
+	PutItem *TopicRule_PutItemInput `json:"PutItem,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-dynamodbv2action.html#cfn-iot-topicrule-dynamodbv2action-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_DynamoDBv2Action) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.DynamoDBv2Action"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_elasticsearchaction.go b/goformation/cloudformation/iot/aws-iot-topicrule_elasticsearchaction.go
new file mode 100644
index 0000000000..ea36a7ff83
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_elasticsearchaction.go
@@ -0,0 +1,57 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_ElasticsearchAction AWS CloudFormation Resource (AWS::IoT::TopicRule.ElasticsearchAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-elasticsearchaction.html
+type TopicRule_ElasticsearchAction struct {
+
+	// Endpoint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-elasticsearchaction.html#cfn-iot-topicrule-elasticsearchaction-endpoint
+	Endpoint *types.Value `json:"Endpoint,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-elasticsearchaction.html#cfn-iot-topicrule-elasticsearchaction-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Index AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-elasticsearchaction.html#cfn-iot-topicrule-elasticsearchaction-index
+	Index *types.Value `json:"Index,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-elasticsearchaction.html#cfn-iot-topicrule-elasticsearchaction-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-elasticsearchaction.html#cfn-iot-topicrule-elasticsearchaction-type
+	Type *types.Value `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 *TopicRule_ElasticsearchAction) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.ElasticsearchAction"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_firehoseaction.go b/goformation/cloudformation/iot/aws-iot-topicrule_firehoseaction.go
new file mode 100644
index 0000000000..71cd0f61bc
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_firehoseaction.go
@@ -0,0 +1,52 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_FirehoseAction AWS CloudFormation Resource (AWS::IoT::TopicRule.FirehoseAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-firehoseaction.html
+type TopicRule_FirehoseAction struct {
+
+	// BatchMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-firehoseaction.html#cfn-iot-topicrule-firehoseaction-batchmode
+	BatchMode *types.Value `json:"BatchMode,omitempty"`
+
+	// DeliveryStreamName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-firehoseaction.html#cfn-iot-topicrule-firehoseaction-deliverystreamname
+	DeliveryStreamName *types.Value `json:"DeliveryStreamName,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-firehoseaction.html#cfn-iot-topicrule-firehoseaction-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Separator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-firehoseaction.html#cfn-iot-topicrule-firehoseaction-separator
+	Separator *types.Value `json:"Separator,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_FirehoseAction) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.FirehoseAction"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_httpaction.go b/goformation/cloudformation/iot/aws-iot-topicrule_httpaction.go
new file mode 100644
index 0000000000..a387c2e033
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_httpaction.go
@@ -0,0 +1,52 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_HttpAction AWS CloudFormation Resource (AWS::IoT::TopicRule.HttpAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-httpaction.html
+type TopicRule_HttpAction struct {
+
+	// Auth AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-httpaction.html#cfn-iot-topicrule-httpaction-auth
+	Auth *TopicRule_HttpAuthorization `json:"Auth,omitempty"`
+
+	// ConfirmationUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-httpaction.html#cfn-iot-topicrule-httpaction-confirmationurl
+	ConfirmationUrl *types.Value `json:"ConfirmationUrl,omitempty"`
+
+	// Headers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-httpaction.html#cfn-iot-topicrule-httpaction-headers
+	Headers []TopicRule_HttpActionHeader `json:"Headers,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-httpaction.html#cfn-iot-topicrule-httpaction-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_HttpAction) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.HttpAction"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_httpactionheader.go b/goformation/cloudformation/iot/aws-iot-topicrule_httpactionheader.go
new file mode 100644
index 0000000000..c2e9367cc4
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_httpactionheader.go
@@ -0,0 +1,42 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_HttpActionHeader AWS CloudFormation Resource (AWS::IoT::TopicRule.HttpActionHeader)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-httpactionheader.html
+type TopicRule_HttpActionHeader struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-httpactionheader.html#cfn-iot-topicrule-httpactionheader-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-httpactionheader.html#cfn-iot-topicrule-httpactionheader-value
+	Value *types.Value `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 *TopicRule_HttpActionHeader) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.HttpActionHeader"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_httpauthorization.go b/goformation/cloudformation/iot/aws-iot-topicrule_httpauthorization.go
new file mode 100644
index 0000000000..201a534f07
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_httpauthorization.go
@@ -0,0 +1,35 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_HttpAuthorization AWS CloudFormation Resource (AWS::IoT::TopicRule.HttpAuthorization)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-httpauthorization.html
+type TopicRule_HttpAuthorization struct {
+
+	// Sigv4 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-httpauthorization.html#cfn-iot-topicrule-httpauthorization-sigv4
+	Sigv4 *TopicRule_SigV4Authorization `json:"Sigv4,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_HttpAuthorization) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.HttpAuthorization"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_iotanalyticsaction.go b/goformation/cloudformation/iot/aws-iot-topicrule_iotanalyticsaction.go
new file mode 100644
index 0000000000..9e1b751927
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_iotanalyticsaction.go
@@ -0,0 +1,47 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_IotAnalyticsAction AWS CloudFormation Resource (AWS::IoT::TopicRule.IotAnalyticsAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-iotanalyticsaction.html
+type TopicRule_IotAnalyticsAction struct {
+
+	// BatchMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-iotanalyticsaction.html#cfn-iot-topicrule-iotanalyticsaction-batchmode
+	BatchMode *types.Value `json:"BatchMode,omitempty"`
+
+	// ChannelName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-iotanalyticsaction.html#cfn-iot-topicrule-iotanalyticsaction-channelname
+	ChannelName *types.Value `json:"ChannelName,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-iotanalyticsaction.html#cfn-iot-topicrule-iotanalyticsaction-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_IotAnalyticsAction) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.IotAnalyticsAction"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_ioteventsaction.go b/goformation/cloudformation/iot/aws-iot-topicrule_ioteventsaction.go
new file mode 100644
index 0000000000..7ca78840d3
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_ioteventsaction.go
@@ -0,0 +1,52 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_IotEventsAction AWS CloudFormation Resource (AWS::IoT::TopicRule.IotEventsAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-ioteventsaction.html
+type TopicRule_IotEventsAction struct {
+
+	// BatchMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-ioteventsaction.html#cfn-iot-topicrule-ioteventsaction-batchmode
+	BatchMode *types.Value `json:"BatchMode,omitempty"`
+
+	// InputName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-ioteventsaction.html#cfn-iot-topicrule-ioteventsaction-inputname
+	InputName *types.Value `json:"InputName,omitempty"`
+
+	// MessageId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-ioteventsaction.html#cfn-iot-topicrule-ioteventsaction-messageid
+	MessageId *types.Value `json:"MessageId,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-ioteventsaction.html#cfn-iot-topicrule-ioteventsaction-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_IotEventsAction) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.IotEventsAction"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_iotsitewiseaction.go b/goformation/cloudformation/iot/aws-iot-topicrule_iotsitewiseaction.go
new file mode 100644
index 0000000000..285ae798dd
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_iotsitewiseaction.go
@@ -0,0 +1,42 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_IotSiteWiseAction AWS CloudFormation Resource (AWS::IoT::TopicRule.IotSiteWiseAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-iotsitewiseaction.html
+type TopicRule_IotSiteWiseAction struct {
+
+	// PutAssetPropertyValueEntries AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-iotsitewiseaction.html#cfn-iot-topicrule-iotsitewiseaction-putassetpropertyvalueentries
+	PutAssetPropertyValueEntries []TopicRule_PutAssetPropertyValueEntry `json:"PutAssetPropertyValueEntries,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-iotsitewiseaction.html#cfn-iot-topicrule-iotsitewiseaction-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_IotSiteWiseAction) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.IotSiteWiseAction"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_kafkaaction.go b/goformation/cloudformation/iot/aws-iot-topicrule_kafkaaction.go
new file mode 100644
index 0000000000..6b86f3f051
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_kafkaaction.go
@@ -0,0 +1,57 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_KafkaAction AWS CloudFormation Resource (AWS::IoT::TopicRule.KafkaAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-kafkaaction.html
+type TopicRule_KafkaAction struct {
+
+	// ClientProperties AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-kafkaaction.html#cfn-iot-topicrule-kafkaaction-clientproperties
+	ClientProperties map[string]*types.Value `json:"ClientProperties,omitempty"`
+
+	// DestinationArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-kafkaaction.html#cfn-iot-topicrule-kafkaaction-destinationarn
+	DestinationArn *types.Value `json:"DestinationArn,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-kafkaaction.html#cfn-iot-topicrule-kafkaaction-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Partition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-kafkaaction.html#cfn-iot-topicrule-kafkaaction-partition
+	Partition *types.Value `json:"Partition,omitempty"`
+
+	// Topic AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-kafkaaction.html#cfn-iot-topicrule-kafkaaction-topic
+	Topic *types.Value `json:"Topic,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_KafkaAction) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.KafkaAction"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_kinesisaction.go b/goformation/cloudformation/iot/aws-iot-topicrule_kinesisaction.go
new file mode 100644
index 0000000000..474a9aef46
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_kinesisaction.go
@@ -0,0 +1,47 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_KinesisAction AWS CloudFormation Resource (AWS::IoT::TopicRule.KinesisAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-kinesisaction.html
+type TopicRule_KinesisAction struct {
+
+	// PartitionKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-kinesisaction.html#cfn-iot-topicrule-kinesisaction-partitionkey
+	PartitionKey *types.Value `json:"PartitionKey,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-kinesisaction.html#cfn-iot-topicrule-kinesisaction-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// StreamName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-kinesisaction.html#cfn-iot-topicrule-kinesisaction-streamname
+	StreamName *types.Value `json:"StreamName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_KinesisAction) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.KinesisAction"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_lambdaaction.go b/goformation/cloudformation/iot/aws-iot-topicrule_lambdaaction.go
new file mode 100644
index 0000000000..0394ec0356
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_lambdaaction.go
@@ -0,0 +1,37 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_LambdaAction AWS CloudFormation Resource (AWS::IoT::TopicRule.LambdaAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-lambdaaction.html
+type TopicRule_LambdaAction struct {
+
+	// FunctionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-lambdaaction.html#cfn-iot-topicrule-lambdaaction-functionarn
+	FunctionArn *types.Value `json:"FunctionArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_LambdaAction) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.LambdaAction"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_opensearchaction.go b/goformation/cloudformation/iot/aws-iot-topicrule_opensearchaction.go
new file mode 100644
index 0000000000..af10a0a8c3
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_opensearchaction.go
@@ -0,0 +1,57 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_OpenSearchAction AWS CloudFormation Resource (AWS::IoT::TopicRule.OpenSearchAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-opensearchaction.html
+type TopicRule_OpenSearchAction struct {
+
+	// Endpoint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-opensearchaction.html#cfn-iot-topicrule-opensearchaction-endpoint
+	Endpoint *types.Value `json:"Endpoint,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-opensearchaction.html#cfn-iot-topicrule-opensearchaction-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Index AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-opensearchaction.html#cfn-iot-topicrule-opensearchaction-index
+	Index *types.Value `json:"Index,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-opensearchaction.html#cfn-iot-topicrule-opensearchaction-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-opensearchaction.html#cfn-iot-topicrule-opensearchaction-type
+	Type *types.Value `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 *TopicRule_OpenSearchAction) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.OpenSearchAction"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_putassetpropertyvalueentry.go b/goformation/cloudformation/iot/aws-iot-topicrule_putassetpropertyvalueentry.go
new file mode 100644
index 0000000000..049e10868c
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_putassetpropertyvalueentry.go
@@ -0,0 +1,57 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_PutAssetPropertyValueEntry AWS CloudFormation Resource (AWS::IoT::TopicRule.PutAssetPropertyValueEntry)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-putassetpropertyvalueentry.html
+type TopicRule_PutAssetPropertyValueEntry struct {
+
+	// AssetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-putassetpropertyvalueentry.html#cfn-iot-topicrule-putassetpropertyvalueentry-assetid
+	AssetId *types.Value `json:"AssetId,omitempty"`
+
+	// EntryId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-putassetpropertyvalueentry.html#cfn-iot-topicrule-putassetpropertyvalueentry-entryid
+	EntryId *types.Value `json:"EntryId,omitempty"`
+
+	// PropertyAlias AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-putassetpropertyvalueentry.html#cfn-iot-topicrule-putassetpropertyvalueentry-propertyalias
+	PropertyAlias *types.Value `json:"PropertyAlias,omitempty"`
+
+	// PropertyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-putassetpropertyvalueentry.html#cfn-iot-topicrule-putassetpropertyvalueentry-propertyid
+	PropertyId *types.Value `json:"PropertyId,omitempty"`
+
+	// PropertyValues AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-putassetpropertyvalueentry.html#cfn-iot-topicrule-putassetpropertyvalueentry-propertyvalues
+	PropertyValues []TopicRule_AssetPropertyValue `json:"PropertyValues,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_PutAssetPropertyValueEntry) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.PutAssetPropertyValueEntry"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_putiteminput.go b/goformation/cloudformation/iot/aws-iot-topicrule_putiteminput.go
new file mode 100644
index 0000000000..2fbe81dc10
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_putiteminput.go
@@ -0,0 +1,37 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_PutItemInput AWS CloudFormation Resource (AWS::IoT::TopicRule.PutItemInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-putiteminput.html
+type TopicRule_PutItemInput struct {
+
+	// TableName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-putiteminput.html#cfn-iot-topicrule-putiteminput-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_PutItemInput) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.PutItemInput"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_republishaction.go b/goformation/cloudformation/iot/aws-iot-topicrule_republishaction.go
new file mode 100644
index 0000000000..59434163d9
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_republishaction.go
@@ -0,0 +1,47 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_RepublishAction AWS CloudFormation Resource (AWS::IoT::TopicRule.RepublishAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-republishaction.html
+type TopicRule_RepublishAction struct {
+
+	// Qos AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-republishaction.html#cfn-iot-topicrule-republishaction-qos
+	Qos *types.Value `json:"Qos,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-republishaction.html#cfn-iot-topicrule-republishaction-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Topic AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-republishaction.html#cfn-iot-topicrule-republishaction-topic
+	Topic *types.Value `json:"Topic,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_RepublishAction) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.RepublishAction"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_s3action.go b/goformation/cloudformation/iot/aws-iot-topicrule_s3action.go
new file mode 100644
index 0000000000..a35d3b0cbb
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_s3action.go
@@ -0,0 +1,52 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_S3Action AWS CloudFormation Resource (AWS::IoT::TopicRule.S3Action)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-s3action.html
+type TopicRule_S3Action struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-s3action.html#cfn-iot-topicrule-s3action-bucketname
+	BucketName *types.Value `json:"BucketName,omitempty"`
+
+	// CannedAcl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-s3action.html#cfn-iot-topicrule-s3action-cannedacl
+	CannedAcl *types.Value `json:"CannedAcl,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-s3action.html#cfn-iot-topicrule-s3action-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-s3action.html#cfn-iot-topicrule-s3action-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_S3Action) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.S3Action"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_sigv4authorization.go b/goformation/cloudformation/iot/aws-iot-topicrule_sigv4authorization.go
new file mode 100644
index 0000000000..261482ad2f
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_sigv4authorization.go
@@ -0,0 +1,47 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_SigV4Authorization AWS CloudFormation Resource (AWS::IoT::TopicRule.SigV4Authorization)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-sigv4authorization.html
+type TopicRule_SigV4Authorization struct {
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-sigv4authorization.html#cfn-iot-topicrule-sigv4authorization-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// ServiceName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-sigv4authorization.html#cfn-iot-topicrule-sigv4authorization-servicename
+	ServiceName *types.Value `json:"ServiceName,omitempty"`
+
+	// SigningRegion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-sigv4authorization.html#cfn-iot-topicrule-sigv4authorization-signingregion
+	SigningRegion *types.Value `json:"SigningRegion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_SigV4Authorization) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.SigV4Authorization"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_snsaction.go b/goformation/cloudformation/iot/aws-iot-topicrule_snsaction.go
new file mode 100644
index 0000000000..5ad6d6dbaa
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_snsaction.go
@@ -0,0 +1,47 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_SnsAction AWS CloudFormation Resource (AWS::IoT::TopicRule.SnsAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-snsaction.html
+type TopicRule_SnsAction struct {
+
+	// MessageFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-snsaction.html#cfn-iot-topicrule-snsaction-messageformat
+	MessageFormat *types.Value `json:"MessageFormat,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-snsaction.html#cfn-iot-topicrule-snsaction-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// TargetArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-snsaction.html#cfn-iot-topicrule-snsaction-targetarn
+	TargetArn *types.Value `json:"TargetArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_SnsAction) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.SnsAction"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_sqsaction.go b/goformation/cloudformation/iot/aws-iot-topicrule_sqsaction.go
new file mode 100644
index 0000000000..2fec425d00
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_sqsaction.go
@@ -0,0 +1,47 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_SqsAction AWS CloudFormation Resource (AWS::IoT::TopicRule.SqsAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-sqsaction.html
+type TopicRule_SqsAction struct {
+
+	// QueueUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-sqsaction.html#cfn-iot-topicrule-sqsaction-queueurl
+	QueueUrl *types.Value `json:"QueueUrl,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-sqsaction.html#cfn-iot-topicrule-sqsaction-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// UseBase64 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-sqsaction.html#cfn-iot-topicrule-sqsaction-usebase64
+	UseBase64 *types.Value `json:"UseBase64,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_SqsAction) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.SqsAction"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_stepfunctionsaction.go b/goformation/cloudformation/iot/aws-iot-topicrule_stepfunctionsaction.go
new file mode 100644
index 0000000000..b9862e6f5a
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_stepfunctionsaction.go
@@ -0,0 +1,47 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_StepFunctionsAction AWS CloudFormation Resource (AWS::IoT::TopicRule.StepFunctionsAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-stepfunctionsaction.html
+type TopicRule_StepFunctionsAction struct {
+
+	// ExecutionNamePrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-stepfunctionsaction.html#cfn-iot-topicrule-stepfunctionsaction-executionnameprefix
+	ExecutionNamePrefix *types.Value `json:"ExecutionNamePrefix,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-stepfunctionsaction.html#cfn-iot-topicrule-stepfunctionsaction-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// StateMachineName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-stepfunctionsaction.html#cfn-iot-topicrule-stepfunctionsaction-statemachinename
+	StateMachineName *types.Value `json:"StateMachineName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_StepFunctionsAction) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.StepFunctionsAction"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_timestreamaction.go b/goformation/cloudformation/iot/aws-iot-topicrule_timestreamaction.go
new file mode 100644
index 0000000000..6c0b23ee5e
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_timestreamaction.go
@@ -0,0 +1,62 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_TimestreamAction AWS CloudFormation Resource (AWS::IoT::TopicRule.TimestreamAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-timestreamaction.html
+type TopicRule_TimestreamAction struct {
+
+	// BatchMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-timestreamaction.html#cfn-iot-topicrule-timestreamaction-batchmode
+	BatchMode *types.Value `json:"BatchMode,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-timestreamaction.html#cfn-iot-topicrule-timestreamaction-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// Dimensions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-timestreamaction.html#cfn-iot-topicrule-timestreamaction-dimensions
+	Dimensions []TopicRule_TimestreamDimension `json:"Dimensions,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-timestreamaction.html#cfn-iot-topicrule-timestreamaction-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-timestreamaction.html#cfn-iot-topicrule-timestreamaction-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// Timestamp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-timestreamaction.html#cfn-iot-topicrule-timestreamaction-timestamp
+	Timestamp *TopicRule_TimestreamTimestamp `json:"Timestamp,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_TimestreamAction) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.TimestreamAction"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_timestreamdimension.go b/goformation/cloudformation/iot/aws-iot-topicrule_timestreamdimension.go
new file mode 100644
index 0000000000..52424e1be3
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_timestreamdimension.go
@@ -0,0 +1,42 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_TimestreamDimension AWS CloudFormation Resource (AWS::IoT::TopicRule.TimestreamDimension)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-timestreamdimension.html
+type TopicRule_TimestreamDimension struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-timestreamdimension.html#cfn-iot-topicrule-timestreamdimension-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-timestreamdimension.html#cfn-iot-topicrule-timestreamdimension-value
+	Value *types.Value `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 *TopicRule_TimestreamDimension) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.TimestreamDimension"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_timestreamtimestamp.go b/goformation/cloudformation/iot/aws-iot-topicrule_timestreamtimestamp.go
new file mode 100644
index 0000000000..f204b5a1d2
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_timestreamtimestamp.go
@@ -0,0 +1,42 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_TimestreamTimestamp AWS CloudFormation Resource (AWS::IoT::TopicRule.TimestreamTimestamp)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-timestreamtimestamp.html
+type TopicRule_TimestreamTimestamp struct {
+
+	// Unit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-timestreamtimestamp.html#cfn-iot-topicrule-timestreamtimestamp-unit
+	Unit *types.Value `json:"Unit,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-timestreamtimestamp.html#cfn-iot-topicrule-timestreamtimestamp-value
+	Value *types.Value `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 *TopicRule_TimestreamTimestamp) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.TimestreamTimestamp"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicrule_topicrulepayload.go b/goformation/cloudformation/iot/aws-iot-topicrule_topicrulepayload.go
new file mode 100644
index 0000000000..7b60b9b1dd
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicrule_topicrulepayload.go
@@ -0,0 +1,62 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRule_TopicRulePayload AWS CloudFormation Resource (AWS::IoT::TopicRule.TopicRulePayload)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-topicrulepayload.html
+type TopicRule_TopicRulePayload struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-topicrulepayload.html#cfn-iot-topicrule-topicrulepayload-actions
+	Actions []TopicRule_Action `json:"Actions,omitempty"`
+
+	// AwsIotSqlVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-topicrulepayload.html#cfn-iot-topicrule-topicrulepayload-awsiotsqlversion
+	AwsIotSqlVersion *types.Value `json:"AwsIotSqlVersion,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-topicrulepayload.html#cfn-iot-topicrule-topicrulepayload-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// ErrorAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-topicrulepayload.html#cfn-iot-topicrule-topicrulepayload-erroraction
+	ErrorAction *TopicRule_Action `json:"ErrorAction,omitempty"`
+
+	// RuleDisabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-topicrulepayload.html#cfn-iot-topicrule-topicrulepayload-ruledisabled
+	RuleDisabled *types.Value `json:"RuleDisabled,omitempty"`
+
+	// Sql AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicrule-topicrulepayload.html#cfn-iot-topicrule-topicrulepayload-sql
+	Sql *types.Value `json:"Sql,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRule_TopicRulePayload) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRule.TopicRulePayload"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicruledestination.go b/goformation/cloudformation/iot/aws-iot-topicruledestination.go
new file mode 100644
index 0000000000..08c7d85e36
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicruledestination.go
@@ -0,0 +1,118 @@
+package iot
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRuleDestination AWS CloudFormation Resource (AWS::IoT::TopicRuleDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-topicruledestination.html
+type TopicRuleDestination struct {
+
+	// HttpUrlProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-topicruledestination.html#cfn-iot-topicruledestination-httpurlproperties
+	HttpUrlProperties *TopicRuleDestination_HttpUrlDestinationSummary `json:"HttpUrlProperties,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-topicruledestination.html#cfn-iot-topicruledestination-status
+	Status *types.Value `json:"Status,omitempty"`
+
+	// VpcProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot-topicruledestination.html#cfn-iot-topicruledestination-vpcproperties
+	VpcProperties *TopicRuleDestination_VpcDestinationProperties `json:"VpcProperties,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRuleDestination) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRuleDestination"
+}
+
+// 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 TopicRuleDestination) MarshalJSON() ([]byte, error) {
+	type Properties TopicRuleDestination
+	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 *TopicRuleDestination) UnmarshalJSON(b []byte) error {
+	type Properties TopicRuleDestination
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TopicRuleDestination(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot/aws-iot-topicruledestination_httpurldestinationsummary.go b/goformation/cloudformation/iot/aws-iot-topicruledestination_httpurldestinationsummary.go
new file mode 100644
index 0000000000..cac7189c41
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicruledestination_httpurldestinationsummary.go
@@ -0,0 +1,37 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRuleDestination_HttpUrlDestinationSummary AWS CloudFormation Resource (AWS::IoT::TopicRuleDestination.HttpUrlDestinationSummary)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicruledestination-httpurldestinationsummary.html
+type TopicRuleDestination_HttpUrlDestinationSummary struct {
+
+	// ConfirmationUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicruledestination-httpurldestinationsummary.html#cfn-iot-topicruledestination-httpurldestinationsummary-confirmationurl
+	ConfirmationUrl *types.Value `json:"ConfirmationUrl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicRuleDestination_HttpUrlDestinationSummary) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRuleDestination.HttpUrlDestinationSummary"
+}
diff --git a/goformation/cloudformation/iot/aws-iot-topicruledestination_vpcdestinationproperties.go b/goformation/cloudformation/iot/aws-iot-topicruledestination_vpcdestinationproperties.go
new file mode 100644
index 0000000000..c0b338eae8
--- /dev/null
+++ b/goformation/cloudformation/iot/aws-iot-topicruledestination_vpcdestinationproperties.go
@@ -0,0 +1,52 @@
+package iot
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicRuleDestination_VpcDestinationProperties AWS CloudFormation Resource (AWS::IoT::TopicRuleDestination.VpcDestinationProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicruledestination-vpcdestinationproperties.html
+type TopicRuleDestination_VpcDestinationProperties struct {
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicruledestination-vpcdestinationproperties.html#cfn-iot-topicruledestination-vpcdestinationproperties-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// SecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicruledestination-vpcdestinationproperties.html#cfn-iot-topicruledestination-vpcdestinationproperties-securitygroups
+	SecurityGroups *types.Value `json:"SecurityGroups,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicruledestination-vpcdestinationproperties.html#cfn-iot-topicruledestination-vpcdestinationproperties-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot-topicruledestination-vpcdestinationproperties.html#cfn-iot-topicruledestination-vpcdestinationproperties-vpcid
+	VpcId *types.Value `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 *TopicRuleDestination_VpcDestinationProperties) AWSCloudFormationType() string {
+	return "AWS::IoT::TopicRuleDestination.VpcDestinationProperties"
+}
diff --git a/goformation/cloudformation/iot1click/aws-iot1click-device.go b/goformation/cloudformation/iot1click/aws-iot1click-device.go
new file mode 100644
index 0000000000..ece1cd94dd
--- /dev/null
+++ b/goformation/cloudformation/iot1click/aws-iot1click-device.go
@@ -0,0 +1,113 @@
+package iot1click
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Device AWS CloudFormation Resource (AWS::IoT1Click::Device)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot1click-device.html
+type Device struct {
+
+	// DeviceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot1click-device.html#cfn-iot1click-device-deviceid
+	DeviceId *types.Value `json:"DeviceId,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot1click-device.html#cfn-iot1click-device-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Device) AWSCloudFormationType() string {
+	return "AWS::IoT1Click::Device"
+}
+
+// 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 Device) MarshalJSON() ([]byte, error) {
+	type Properties Device
+	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 *Device) UnmarshalJSON(b []byte) error {
+	type Properties Device
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Device(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot1click/aws-iot1click-placement.go b/goformation/cloudformation/iot1click/aws-iot1click-placement.go
new file mode 100644
index 0000000000..0b5092d19c
--- /dev/null
+++ b/goformation/cloudformation/iot1click/aws-iot1click-placement.go
@@ -0,0 +1,123 @@
+package iot1click
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Placement AWS CloudFormation Resource (AWS::IoT1Click::Placement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot1click-placement.html
+type Placement struct {
+
+	// AssociatedDevices AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot1click-placement.html#cfn-iot1click-placement-associateddevices
+	AssociatedDevices interface{} `json:"AssociatedDevices,omitempty"`
+
+	// Attributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot1click-placement.html#cfn-iot1click-placement-attributes
+	Attributes interface{} `json:"Attributes,omitempty"`
+
+	// PlacementName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot1click-placement.html#cfn-iot1click-placement-placementname
+	PlacementName *types.Value `json:"PlacementName,omitempty"`
+
+	// ProjectName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot1click-placement.html#cfn-iot1click-placement-projectname
+	ProjectName *types.Value `json:"ProjectName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Placement) AWSCloudFormationType() string {
+	return "AWS::IoT1Click::Placement"
+}
+
+// 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 Placement) MarshalJSON() ([]byte, error) {
+	type Properties Placement
+	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 *Placement) UnmarshalJSON(b []byte) error {
+	type Properties Placement
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Placement(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot1click/aws-iot1click-project.go b/goformation/cloudformation/iot1click/aws-iot1click-project.go
new file mode 100644
index 0000000000..2a8a2079ae
--- /dev/null
+++ b/goformation/cloudformation/iot1click/aws-iot1click-project.go
@@ -0,0 +1,118 @@
+package iot1click
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project AWS CloudFormation Resource (AWS::IoT1Click::Project)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot1click-project.html
+type Project struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot1click-project.html#cfn-iot1click-project-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// PlacementTemplate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot1click-project.html#cfn-iot1click-project-placementtemplate
+	PlacementTemplate *Project_PlacementTemplate `json:"PlacementTemplate,omitempty"`
+
+	// ProjectName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iot1click-project.html#cfn-iot1click-project-projectname
+	ProjectName *types.Value `json:"ProjectName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::IoT1Click::Project"
+}
+
+// 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 Project) MarshalJSON() ([]byte, error) {
+	type Properties Project
+	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 *Project) UnmarshalJSON(b []byte) error {
+	type Properties Project
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Project(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iot1click/aws-iot1click-project_devicetemplate.go b/goformation/cloudformation/iot1click/aws-iot1click-project_devicetemplate.go
new file mode 100644
index 0000000000..5914be07ce
--- /dev/null
+++ b/goformation/cloudformation/iot1click/aws-iot1click-project_devicetemplate.go
@@ -0,0 +1,42 @@
+package iot1click
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_DeviceTemplate AWS CloudFormation Resource (AWS::IoT1Click::Project.DeviceTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot1click-project-devicetemplate.html
+type Project_DeviceTemplate struct {
+
+	// CallbackOverrides AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot1click-project-devicetemplate.html#cfn-iot1click-project-devicetemplate-callbackoverrides
+	CallbackOverrides interface{} `json:"CallbackOverrides,omitempty"`
+
+	// DeviceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot1click-project-devicetemplate.html#cfn-iot1click-project-devicetemplate-devicetype
+	DeviceType *types.Value `json:"DeviceType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DeviceTemplate) AWSCloudFormationType() string {
+	return "AWS::IoT1Click::Project.DeviceTemplate"
+}
diff --git a/goformation/cloudformation/iot1click/aws-iot1click-project_placementtemplate.go b/goformation/cloudformation/iot1click/aws-iot1click-project_placementtemplate.go
new file mode 100644
index 0000000000..bfdbda22b1
--- /dev/null
+++ b/goformation/cloudformation/iot1click/aws-iot1click-project_placementtemplate.go
@@ -0,0 +1,40 @@
+package iot1click
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project_PlacementTemplate AWS CloudFormation Resource (AWS::IoT1Click::Project.PlacementTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot1click-project-placementtemplate.html
+type Project_PlacementTemplate struct {
+
+	// DefaultAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot1click-project-placementtemplate.html#cfn-iot1click-project-placementtemplate-defaultattributes
+	DefaultAttributes interface{} `json:"DefaultAttributes,omitempty"`
+
+	// DeviceTemplates AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iot1click-project-placementtemplate.html#cfn-iot1click-project-placementtemplate-devicetemplates
+	DeviceTemplates interface{} `json:"DeviceTemplates,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PlacementTemplate) AWSCloudFormationType() string {
+	return "AWS::IoT1Click::Project.PlacementTemplate"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel.go
new file mode 100644
index 0000000000..f3e1f4b261
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel.go
@@ -0,0 +1,124 @@
+package iotanalytics
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel AWS CloudFormation Resource (AWS::IoTAnalytics::Channel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-channel.html
+type Channel struct {
+
+	// ChannelName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-channel.html#cfn-iotanalytics-channel-channelname
+	ChannelName *types.Value `json:"ChannelName,omitempty"`
+
+	// ChannelStorage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-channel.html#cfn-iotanalytics-channel-channelstorage
+	ChannelStorage *Channel_ChannelStorage `json:"ChannelStorage,omitempty"`
+
+	// RetentionPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-channel.html#cfn-iotanalytics-channel-retentionperiod
+	RetentionPeriod *Channel_RetentionPeriod `json:"RetentionPeriod,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-channel.html#cfn-iotanalytics-channel-tags
+	Tags []cloudformation.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 *Channel) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Channel"
+}
+
+// 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 Channel) MarshalJSON() ([]byte, error) {
+	type Properties Channel
+	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 *Channel) UnmarshalJSON(b []byte) error {
+	type Properties Channel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Channel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_channelstorage.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_channelstorage.go
new file mode 100644
index 0000000000..a8dd69657b
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_channelstorage.go
@@ -0,0 +1,40 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_ChannelStorage AWS CloudFormation Resource (AWS::IoTAnalytics::Channel.ChannelStorage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-channel-channelstorage.html
+type Channel_ChannelStorage struct {
+
+	// CustomerManagedS3 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-channel-channelstorage.html#cfn-iotanalytics-channel-channelstorage-customermanageds3
+	CustomerManagedS3 *Channel_CustomerManagedS3 `json:"CustomerManagedS3,omitempty"`
+
+	// ServiceManagedS3 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-channel-channelstorage.html#cfn-iotanalytics-channel-channelstorage-servicemanageds3
+	ServiceManagedS3 *Channel_ServiceManagedS3 `json:"ServiceManagedS3,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_ChannelStorage) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Channel.ChannelStorage"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_customermanageds3.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_customermanageds3.go
new file mode 100644
index 0000000000..96aad90fad
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_customermanageds3.go
@@ -0,0 +1,47 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_CustomerManagedS3 AWS CloudFormation Resource (AWS::IoTAnalytics::Channel.CustomerManagedS3)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-channel-customermanageds3.html
+type Channel_CustomerManagedS3 struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-channel-customermanageds3.html#cfn-iotanalytics-channel-customermanageds3-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// KeyPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-channel-customermanageds3.html#cfn-iotanalytics-channel-customermanageds3-keyprefix
+	KeyPrefix *types.Value `json:"KeyPrefix,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-channel-customermanageds3.html#cfn-iotanalytics-channel-customermanageds3-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_CustomerManagedS3) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Channel.CustomerManagedS3"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_retentionperiod.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_retentionperiod.go
new file mode 100644
index 0000000000..d71f57b997
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_retentionperiod.go
@@ -0,0 +1,42 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_RetentionPeriod AWS CloudFormation Resource (AWS::IoTAnalytics::Channel.RetentionPeriod)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-channel-retentionperiod.html
+type Channel_RetentionPeriod struct {
+
+	// NumberOfDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-channel-retentionperiod.html#cfn-iotanalytics-channel-retentionperiod-numberofdays
+	NumberOfDays *types.Value `json:"NumberOfDays,omitempty"`
+
+	// Unlimited AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-channel-retentionperiod.html#cfn-iotanalytics-channel-retentionperiod-unlimited
+	Unlimited *types.Value `json:"Unlimited,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_RetentionPeriod) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Channel.RetentionPeriod"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_servicemanageds3.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_servicemanageds3.go
new file mode 100644
index 0000000000..b3b0b7ed96
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-channel_servicemanageds3.go
@@ -0,0 +1,30 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_ServiceManagedS3 AWS CloudFormation Resource (AWS::IoTAnalytics::Channel.ServiceManagedS3)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-channel-servicemanageds3.html
+type Channel_ServiceManagedS3 struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_ServiceManagedS3) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Channel.ServiceManagedS3"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset.go
new file mode 100644
index 0000000000..eba7162718
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset.go
@@ -0,0 +1,144 @@
+package iotanalytics
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-dataset.html
+type Dataset struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-dataset.html#cfn-iotanalytics-dataset-actions
+	Actions []Dataset_Action `json:"Actions,omitempty"`
+
+	// ContentDeliveryRules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-dataset.html#cfn-iotanalytics-dataset-contentdeliveryrules
+	ContentDeliveryRules []Dataset_DatasetContentDeliveryRule `json:"ContentDeliveryRules,omitempty"`
+
+	// DatasetName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-dataset.html#cfn-iotanalytics-dataset-datasetname
+	DatasetName *types.Value `json:"DatasetName,omitempty"`
+
+	// LateDataRules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-dataset.html#cfn-iotanalytics-dataset-latedatarules
+	LateDataRules []Dataset_LateDataRule `json:"LateDataRules,omitempty"`
+
+	// RetentionPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-dataset.html#cfn-iotanalytics-dataset-retentionperiod
+	RetentionPeriod *Dataset_RetentionPeriod `json:"RetentionPeriod,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-dataset.html#cfn-iotanalytics-dataset-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Triggers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-dataset.html#cfn-iotanalytics-dataset-triggers
+	Triggers []Dataset_Trigger `json:"Triggers,omitempty"`
+
+	// VersioningConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-dataset.html#cfn-iotanalytics-dataset-versioningconfiguration
+	VersioningConfiguration *Dataset_VersioningConfiguration `json:"VersioningConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset"
+}
+
+// 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 Dataset) MarshalJSON() ([]byte, error) {
+	type Properties Dataset
+	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 *Dataset) UnmarshalJSON(b []byte) error {
+	type Properties Dataset
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Dataset(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_action.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_action.go
new file mode 100644
index 0000000000..ebe5b3de76
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_action.go
@@ -0,0 +1,47 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_Action AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.Action)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-action.html
+type Dataset_Action struct {
+
+	// ActionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-action.html#cfn-iotanalytics-dataset-action-actionname
+	ActionName *types.Value `json:"ActionName,omitempty"`
+
+	// ContainerAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-action.html#cfn-iotanalytics-dataset-action-containeraction
+	ContainerAction *Dataset_ContainerAction `json:"ContainerAction,omitempty"`
+
+	// QueryAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-action.html#cfn-iotanalytics-dataset-action-queryaction
+	QueryAction *Dataset_QueryAction `json:"QueryAction,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Action) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.Action"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_containeraction.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_containeraction.go
new file mode 100644
index 0000000000..5dcdcb4ff8
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_containeraction.go
@@ -0,0 +1,52 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_ContainerAction AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.ContainerAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-containeraction.html
+type Dataset_ContainerAction struct {
+
+	// ExecutionRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-containeraction.html#cfn-iotanalytics-dataset-containeraction-executionrolearn
+	ExecutionRoleArn *types.Value `json:"ExecutionRoleArn,omitempty"`
+
+	// Image AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-containeraction.html#cfn-iotanalytics-dataset-containeraction-image
+	Image *types.Value `json:"Image,omitempty"`
+
+	// ResourceConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-containeraction.html#cfn-iotanalytics-dataset-containeraction-resourceconfiguration
+	ResourceConfiguration *Dataset_ResourceConfiguration `json:"ResourceConfiguration,omitempty"`
+
+	// Variables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-containeraction.html#cfn-iotanalytics-dataset-containeraction-variables
+	Variables []Dataset_Variable `json:"Variables,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ContainerAction) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.ContainerAction"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryrule.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryrule.go
new file mode 100644
index 0000000000..d9af64c18e
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryrule.go
@@ -0,0 +1,42 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_DatasetContentDeliveryRule AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-datasetcontentdeliveryrule.html
+type Dataset_DatasetContentDeliveryRule struct {
+
+	// Destination AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-datasetcontentdeliveryrule.html#cfn-iotanalytics-dataset-datasetcontentdeliveryrule-destination
+	Destination *Dataset_DatasetContentDeliveryRuleDestination `json:"Destination,omitempty"`
+
+	// EntryName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-datasetcontentdeliveryrule.html#cfn-iotanalytics-dataset-datasetcontentdeliveryrule-entryname
+	EntryName *types.Value `json:"EntryName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DatasetContentDeliveryRule) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRule"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryruledestination.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryruledestination.go
new file mode 100644
index 0000000000..b68788b2fc
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentdeliveryruledestination.go
@@ -0,0 +1,40 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_DatasetContentDeliveryRuleDestination AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRuleDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-datasetcontentdeliveryruledestination.html
+type Dataset_DatasetContentDeliveryRuleDestination struct {
+
+	// IotEventsDestinationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-datasetcontentdeliveryruledestination.html#cfn-iotanalytics-dataset-datasetcontentdeliveryruledestination-ioteventsdestinationconfiguration
+	IotEventsDestinationConfiguration *Dataset_IotEventsDestinationConfiguration `json:"IotEventsDestinationConfiguration,omitempty"`
+
+	// S3DestinationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-datasetcontentdeliveryruledestination.html#cfn-iotanalytics-dataset-datasetcontentdeliveryruledestination-s3destinationconfiguration
+	S3DestinationConfiguration *Dataset_S3DestinationConfiguration `json:"S3DestinationConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DatasetContentDeliveryRuleDestination) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRuleDestination"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentversionvalue.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentversionvalue.go
new file mode 100644
index 0000000000..c946b207fb
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_datasetcontentversionvalue.go
@@ -0,0 +1,37 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_DatasetContentVersionValue AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.DatasetContentVersionValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-variable-datasetcontentversionvalue.html
+type Dataset_DatasetContentVersionValue struct {
+
+	// DatasetName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-variable-datasetcontentversionvalue.html#cfn-iotanalytics-dataset-variable-datasetcontentversionvalue-datasetname
+	DatasetName *types.Value `json:"DatasetName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DatasetContentVersionValue) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.DatasetContentVersionValue"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatime.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatime.go
new file mode 100644
index 0000000000..92c1cb1557
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatime.go
@@ -0,0 +1,42 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_DeltaTime AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.DeltaTime)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-deltatime.html
+type Dataset_DeltaTime struct {
+
+	// OffsetSeconds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-deltatime.html#cfn-iotanalytics-dataset-deltatime-offsetseconds
+	OffsetSeconds *types.Value `json:"OffsetSeconds"`
+
+	// TimeExpression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-deltatime.html#cfn-iotanalytics-dataset-deltatime-timeexpression
+	TimeExpression *types.Value `json:"TimeExpression,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DeltaTime) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.DeltaTime"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatimesessionwindowconfiguration.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatimesessionwindowconfiguration.go
new file mode 100644
index 0000000000..351973c6dc
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_deltatimesessionwindowconfiguration.go
@@ -0,0 +1,37 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_DeltaTimeSessionWindowConfiguration AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.DeltaTimeSessionWindowConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-deltatimesessionwindowconfiguration.html
+type Dataset_DeltaTimeSessionWindowConfiguration struct {
+
+	// TimeoutInMinutes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-deltatimesessionwindowconfiguration.html#cfn-iotanalytics-dataset-deltatimesessionwindowconfiguration-timeoutinminutes
+	TimeoutInMinutes *types.Value `json:"TimeoutInMinutes"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DeltaTimeSessionWindowConfiguration) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.DeltaTimeSessionWindowConfiguration"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_filter.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_filter.go
new file mode 100644
index 0000000000..3440f7dd0a
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_filter.go
@@ -0,0 +1,35 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_Filter AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.Filter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-filter.html
+type Dataset_Filter struct {
+
+	// DeltaTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-filter.html#cfn-iotanalytics-dataset-filter-deltatime
+	DeltaTime *Dataset_DeltaTime `json:"DeltaTime,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Filter) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.Filter"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_glueconfiguration.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_glueconfiguration.go
new file mode 100644
index 0000000000..7c40dfaa49
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_glueconfiguration.go
@@ -0,0 +1,42 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_GlueConfiguration AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.GlueConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-glueconfiguration.html
+type Dataset_GlueConfiguration struct {
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-glueconfiguration.html#cfn-iotanalytics-dataset-glueconfiguration-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-glueconfiguration.html#cfn-iotanalytics-dataset-glueconfiguration-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_GlueConfiguration) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.GlueConfiguration"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_ioteventsdestinationconfiguration.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_ioteventsdestinationconfiguration.go
new file mode 100644
index 0000000000..74492ae8af
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_ioteventsdestinationconfiguration.go
@@ -0,0 +1,42 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_IotEventsDestinationConfiguration AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.IotEventsDestinationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-ioteventsdestinationconfiguration.html
+type Dataset_IotEventsDestinationConfiguration struct {
+
+	// InputName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-ioteventsdestinationconfiguration.html#cfn-iotanalytics-dataset-ioteventsdestinationconfiguration-inputname
+	InputName *types.Value `json:"InputName,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-ioteventsdestinationconfiguration.html#cfn-iotanalytics-dataset-ioteventsdestinationconfiguration-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_IotEventsDestinationConfiguration) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.IotEventsDestinationConfiguration"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedatarule.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedatarule.go
new file mode 100644
index 0000000000..0c0f339394
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedatarule.go
@@ -0,0 +1,42 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_LateDataRule AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.LateDataRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-latedatarule.html
+type Dataset_LateDataRule struct {
+
+	// RuleConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-latedatarule.html#cfn-iotanalytics-dataset-latedatarule-ruleconfiguration
+	RuleConfiguration *Dataset_LateDataRuleConfiguration `json:"RuleConfiguration,omitempty"`
+
+	// RuleName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-latedatarule.html#cfn-iotanalytics-dataset-latedatarule-rulename
+	RuleName *types.Value `json:"RuleName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LateDataRule) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.LateDataRule"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedataruleconfiguration.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedataruleconfiguration.go
new file mode 100644
index 0000000000..e230157bcf
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_latedataruleconfiguration.go
@@ -0,0 +1,35 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_LateDataRuleConfiguration AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.LateDataRuleConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-latedataruleconfiguration.html
+type Dataset_LateDataRuleConfiguration struct {
+
+	// DeltaTimeSessionWindowConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-latedataruleconfiguration.html#cfn-iotanalytics-dataset-latedataruleconfiguration-deltatimesessionwindowconfiguration
+	DeltaTimeSessionWindowConfiguration *Dataset_DeltaTimeSessionWindowConfiguration `json:"DeltaTimeSessionWindowConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LateDataRuleConfiguration) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.LateDataRuleConfiguration"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_outputfileurivalue.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_outputfileurivalue.go
new file mode 100644
index 0000000000..ff25ef7974
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_outputfileurivalue.go
@@ -0,0 +1,37 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_OutputFileUriValue AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.OutputFileUriValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-variable-outputfileurivalue.html
+type Dataset_OutputFileUriValue struct {
+
+	// FileName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-variable-outputfileurivalue.html#cfn-iotanalytics-dataset-variable-outputfileurivalue-filename
+	FileName *types.Value `json:"FileName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_OutputFileUriValue) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.OutputFileUriValue"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_queryaction.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_queryaction.go
new file mode 100644
index 0000000000..be53ea2a2e
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_queryaction.go
@@ -0,0 +1,42 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_QueryAction AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.QueryAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-queryaction.html
+type Dataset_QueryAction struct {
+
+	// Filters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-queryaction.html#cfn-iotanalytics-dataset-queryaction-filters
+	Filters []Dataset_Filter `json:"Filters,omitempty"`
+
+	// SqlQuery AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-queryaction.html#cfn-iotanalytics-dataset-queryaction-sqlquery
+	SqlQuery *types.Value `json:"SqlQuery,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_QueryAction) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.QueryAction"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_resourceconfiguration.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_resourceconfiguration.go
new file mode 100644
index 0000000000..82bb671681
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_resourceconfiguration.go
@@ -0,0 +1,42 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_ResourceConfiguration AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.ResourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-resourceconfiguration.html
+type Dataset_ResourceConfiguration struct {
+
+	// ComputeType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-resourceconfiguration.html#cfn-iotanalytics-dataset-resourceconfiguration-computetype
+	ComputeType *types.Value `json:"ComputeType,omitempty"`
+
+	// VolumeSizeInGB AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-resourceconfiguration.html#cfn-iotanalytics-dataset-resourceconfiguration-volumesizeingb
+	VolumeSizeInGB *types.Value `json:"VolumeSizeInGB"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ResourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.ResourceConfiguration"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_retentionperiod.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_retentionperiod.go
new file mode 100644
index 0000000000..bae4d3c6c7
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_retentionperiod.go
@@ -0,0 +1,42 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_RetentionPeriod AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.RetentionPeriod)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-retentionperiod.html
+type Dataset_RetentionPeriod struct {
+
+	// NumberOfDays AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-retentionperiod.html#cfn-iotanalytics-dataset-retentionperiod-numberofdays
+	NumberOfDays *types.Value `json:"NumberOfDays"`
+
+	// Unlimited AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-retentionperiod.html#cfn-iotanalytics-dataset-retentionperiod-unlimited
+	Unlimited *types.Value `json:"Unlimited"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RetentionPeriod) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.RetentionPeriod"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_s3destinationconfiguration.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_s3destinationconfiguration.go
new file mode 100644
index 0000000000..4727e717ae
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_s3destinationconfiguration.go
@@ -0,0 +1,52 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_S3DestinationConfiguration AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.S3DestinationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-s3destinationconfiguration.html
+type Dataset_S3DestinationConfiguration struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-s3destinationconfiguration.html#cfn-iotanalytics-dataset-s3destinationconfiguration-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// GlueConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-s3destinationconfiguration.html#cfn-iotanalytics-dataset-s3destinationconfiguration-glueconfiguration
+	GlueConfiguration *Dataset_GlueConfiguration `json:"GlueConfiguration,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-s3destinationconfiguration.html#cfn-iotanalytics-dataset-s3destinationconfiguration-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-s3destinationconfiguration.html#cfn-iotanalytics-dataset-s3destinationconfiguration-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_S3DestinationConfiguration) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.S3DestinationConfiguration"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_schedule.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_schedule.go
new file mode 100644
index 0000000000..398c66d2e6
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_schedule.go
@@ -0,0 +1,37 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_Schedule AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.Schedule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-trigger-schedule.html
+type Dataset_Schedule struct {
+
+	// ScheduleExpression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-trigger-schedule.html#cfn-iotanalytics-dataset-trigger-schedule-scheduleexpression
+	ScheduleExpression *types.Value `json:"ScheduleExpression,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Schedule) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.Schedule"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_trigger.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_trigger.go
new file mode 100644
index 0000000000..be995748dd
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_trigger.go
@@ -0,0 +1,40 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_Trigger AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.Trigger)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-trigger.html
+type Dataset_Trigger struct {
+
+	// Schedule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-trigger.html#cfn-iotanalytics-dataset-trigger-schedule
+	Schedule *Dataset_Schedule `json:"Schedule,omitempty"`
+
+	// TriggeringDataset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-trigger.html#cfn-iotanalytics-dataset-trigger-triggeringdataset
+	TriggeringDataset *Dataset_TriggeringDataset `json:"TriggeringDataset,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Trigger) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.Trigger"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_triggeringdataset.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_triggeringdataset.go
new file mode 100644
index 0000000000..6903add83a
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_triggeringdataset.go
@@ -0,0 +1,37 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_TriggeringDataset AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.TriggeringDataset)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-triggeringdataset.html
+type Dataset_TriggeringDataset struct {
+
+	// DatasetName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-triggeringdataset.html#cfn-iotanalytics-dataset-triggeringdataset-datasetname
+	DatasetName *types.Value `json:"DatasetName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TriggeringDataset) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.TriggeringDataset"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_variable.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_variable.go
new file mode 100644
index 0000000000..d6ddb5c9f2
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_variable.go
@@ -0,0 +1,57 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_Variable AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.Variable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-variable.html
+type Dataset_Variable struct {
+
+	// DatasetContentVersionValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-variable.html#cfn-iotanalytics-dataset-variable-datasetcontentversionvalue
+	DatasetContentVersionValue *Dataset_DatasetContentVersionValue `json:"DatasetContentVersionValue,omitempty"`
+
+	// DoubleValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-variable.html#cfn-iotanalytics-dataset-variable-doublevalue
+	DoubleValue *types.Value `json:"DoubleValue,omitempty"`
+
+	// OutputFileUriValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-variable.html#cfn-iotanalytics-dataset-variable-outputfileurivalue
+	OutputFileUriValue *Dataset_OutputFileUriValue `json:"OutputFileUriValue,omitempty"`
+
+	// StringValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-variable.html#cfn-iotanalytics-dataset-variable-stringvalue
+	StringValue *types.Value `json:"StringValue,omitempty"`
+
+	// VariableName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-variable.html#cfn-iotanalytics-dataset-variable-variablename
+	VariableName *types.Value `json:"VariableName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Variable) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.Variable"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_versioningconfiguration.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_versioningconfiguration.go
new file mode 100644
index 0000000000..6d1ef4feb6
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-dataset_versioningconfiguration.go
@@ -0,0 +1,42 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dataset_VersioningConfiguration AWS CloudFormation Resource (AWS::IoTAnalytics::Dataset.VersioningConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-versioningconfiguration.html
+type Dataset_VersioningConfiguration struct {
+
+	// MaxVersions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-versioningconfiguration.html#cfn-iotanalytics-dataset-versioningconfiguration-maxversions
+	MaxVersions *types.Value `json:"MaxVersions,omitempty"`
+
+	// Unlimited AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-dataset-versioningconfiguration.html#cfn-iotanalytics-dataset-versioningconfiguration-unlimited
+	Unlimited *types.Value `json:"Unlimited,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_VersioningConfiguration) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Dataset.VersioningConfiguration"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore.go
new file mode 100644
index 0000000000..de90c4cc1c
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore.go
@@ -0,0 +1,134 @@
+package iotanalytics
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Datastore AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-datastore.html
+type Datastore struct {
+
+	// DatastoreName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-datastore.html#cfn-iotanalytics-datastore-datastorename
+	DatastoreName *types.Value `json:"DatastoreName,omitempty"`
+
+	// DatastorePartitions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-datastore.html#cfn-iotanalytics-datastore-datastorepartitions
+	DatastorePartitions *Datastore_DatastorePartitions `json:"DatastorePartitions,omitempty"`
+
+	// DatastoreStorage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-datastore.html#cfn-iotanalytics-datastore-datastorestorage
+	DatastoreStorage *Datastore_DatastoreStorage `json:"DatastoreStorage,omitempty"`
+
+	// FileFormatConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-datastore.html#cfn-iotanalytics-datastore-fileformatconfiguration
+	FileFormatConfiguration *Datastore_FileFormatConfiguration `json:"FileFormatConfiguration,omitempty"`
+
+	// RetentionPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-datastore.html#cfn-iotanalytics-datastore-retentionperiod
+	RetentionPeriod *Datastore_RetentionPeriod `json:"RetentionPeriod,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-datastore.html#cfn-iotanalytics-datastore-tags
+	Tags []cloudformation.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 *Datastore) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Datastore"
+}
+
+// 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 Datastore) MarshalJSON() ([]byte, error) {
+	type Properties Datastore
+	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 *Datastore) UnmarshalJSON(b []byte) error {
+	type Properties Datastore
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Datastore(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_column.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_column.go
new file mode 100644
index 0000000000..5e00592fa5
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_column.go
@@ -0,0 +1,42 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Datastore_Column AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.Column)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-column.html
+type Datastore_Column struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-column.html#cfn-iotanalytics-datastore-column-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-column.html#cfn-iotanalytics-datastore-column-type
+	Type *types.Value `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 *Datastore_Column) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Datastore.Column"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3.go
new file mode 100644
index 0000000000..bf7e5a26b7
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3.go
@@ -0,0 +1,47 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Datastore_CustomerManagedS3 AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.CustomerManagedS3)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-customermanageds3.html
+type Datastore_CustomerManagedS3 struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-customermanageds3.html#cfn-iotanalytics-datastore-customermanageds3-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// KeyPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-customermanageds3.html#cfn-iotanalytics-datastore-customermanageds3-keyprefix
+	KeyPrefix *types.Value `json:"KeyPrefix,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-customermanageds3.html#cfn-iotanalytics-datastore-customermanageds3-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Datastore_CustomerManagedS3) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Datastore.CustomerManagedS3"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3storage.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3storage.go
new file mode 100644
index 0000000000..ac5a6699c5
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_customermanageds3storage.go
@@ -0,0 +1,42 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Datastore_CustomerManagedS3Storage AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.CustomerManagedS3Storage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-customermanageds3storage.html
+type Datastore_CustomerManagedS3Storage struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-customermanageds3storage.html#cfn-iotanalytics-datastore-customermanageds3storage-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// KeyPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-customermanageds3storage.html#cfn-iotanalytics-datastore-customermanageds3storage-keyprefix
+	KeyPrefix *types.Value `json:"KeyPrefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Datastore_CustomerManagedS3Storage) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Datastore.CustomerManagedS3Storage"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartition.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartition.go
new file mode 100644
index 0000000000..4d0df949ca
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartition.go
@@ -0,0 +1,40 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Datastore_DatastorePartition AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.DatastorePartition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-datastorepartition.html
+type Datastore_DatastorePartition struct {
+
+	// Partition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-datastorepartition.html#cfn-iotanalytics-datastore-datastorepartition-partition
+	Partition *Datastore_Partition `json:"Partition,omitempty"`
+
+	// TimestampPartition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-datastorepartition.html#cfn-iotanalytics-datastore-datastorepartition-timestamppartition
+	TimestampPartition *Datastore_TimestampPartition `json:"TimestampPartition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Datastore_DatastorePartition) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Datastore.DatastorePartition"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartitions.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartitions.go
new file mode 100644
index 0000000000..8fb70352fe
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorepartitions.go
@@ -0,0 +1,35 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Datastore_DatastorePartitions AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.DatastorePartitions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-datastorepartitions.html
+type Datastore_DatastorePartitions struct {
+
+	// Partitions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-datastorepartitions.html#cfn-iotanalytics-datastore-datastorepartitions-partitions
+	Partitions []Datastore_DatastorePartition `json:"Partitions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Datastore_DatastorePartitions) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Datastore.DatastorePartitions"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorestorage.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorestorage.go
new file mode 100644
index 0000000000..00af2ee38c
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_datastorestorage.go
@@ -0,0 +1,45 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Datastore_DatastoreStorage AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.DatastoreStorage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-datastorestorage.html
+type Datastore_DatastoreStorage struct {
+
+	// CustomerManagedS3 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-datastorestorage.html#cfn-iotanalytics-datastore-datastorestorage-customermanageds3
+	CustomerManagedS3 *Datastore_CustomerManagedS3 `json:"CustomerManagedS3,omitempty"`
+
+	// IotSiteWiseMultiLayerStorage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-datastorestorage.html#cfn-iotanalytics-datastore-datastorestorage-iotsitewisemultilayerstorage
+	IotSiteWiseMultiLayerStorage *Datastore_IotSiteWiseMultiLayerStorage `json:"IotSiteWiseMultiLayerStorage,omitempty"`
+
+	// ServiceManagedS3 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-datastorestorage.html#cfn-iotanalytics-datastore-datastorestorage-servicemanageds3
+	ServiceManagedS3 *Datastore_ServiceManagedS3 `json:"ServiceManagedS3,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Datastore_DatastoreStorage) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Datastore.DatastoreStorage"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_fileformatconfiguration.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_fileformatconfiguration.go
new file mode 100644
index 0000000000..452a4559a0
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_fileformatconfiguration.go
@@ -0,0 +1,40 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Datastore_FileFormatConfiguration AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.FileFormatConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-fileformatconfiguration.html
+type Datastore_FileFormatConfiguration struct {
+
+	// JsonConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-fileformatconfiguration.html#cfn-iotanalytics-datastore-fileformatconfiguration-jsonconfiguration
+	JsonConfiguration *Datastore_JsonConfiguration `json:"JsonConfiguration,omitempty"`
+
+	// ParquetConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-fileformatconfiguration.html#cfn-iotanalytics-datastore-fileformatconfiguration-parquetconfiguration
+	ParquetConfiguration *Datastore_ParquetConfiguration `json:"ParquetConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Datastore_FileFormatConfiguration) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Datastore.FileFormatConfiguration"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_iotsitewisemultilayerstorage.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_iotsitewisemultilayerstorage.go
new file mode 100644
index 0000000000..e1a17dde66
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_iotsitewisemultilayerstorage.go
@@ -0,0 +1,35 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Datastore_IotSiteWiseMultiLayerStorage AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.IotSiteWiseMultiLayerStorage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-iotsitewisemultilayerstorage.html
+type Datastore_IotSiteWiseMultiLayerStorage struct {
+
+	// CustomerManagedS3Storage AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-iotsitewisemultilayerstorage.html#cfn-iotanalytics-datastore-iotsitewisemultilayerstorage-customermanageds3storage
+	CustomerManagedS3Storage *Datastore_CustomerManagedS3Storage `json:"CustomerManagedS3Storage,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Datastore_IotSiteWiseMultiLayerStorage) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Datastore.IotSiteWiseMultiLayerStorage"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_jsonconfiguration.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_jsonconfiguration.go
new file mode 100644
index 0000000000..9f99fd6c46
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_jsonconfiguration.go
@@ -0,0 +1,30 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Datastore_JsonConfiguration AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.JsonConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-jsonconfiguration.html
+type Datastore_JsonConfiguration struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Datastore_JsonConfiguration) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Datastore.JsonConfiguration"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_parquetconfiguration.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_parquetconfiguration.go
new file mode 100644
index 0000000000..2765635525
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_parquetconfiguration.go
@@ -0,0 +1,35 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Datastore_ParquetConfiguration AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.ParquetConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-parquetconfiguration.html
+type Datastore_ParquetConfiguration struct {
+
+	// SchemaDefinition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-parquetconfiguration.html#cfn-iotanalytics-datastore-parquetconfiguration-schemadefinition
+	SchemaDefinition *Datastore_SchemaDefinition `json:"SchemaDefinition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Datastore_ParquetConfiguration) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Datastore.ParquetConfiguration"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_partition.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_partition.go
new file mode 100644
index 0000000000..50de892a72
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_partition.go
@@ -0,0 +1,37 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Datastore_Partition AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.Partition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-partition.html
+type Datastore_Partition struct {
+
+	// AttributeName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-partition.html#cfn-iotanalytics-datastore-partition-attributename
+	AttributeName *types.Value `json:"AttributeName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Datastore_Partition) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Datastore.Partition"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_retentionperiod.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_retentionperiod.go
new file mode 100644
index 0000000000..4e2f5857f5
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_retentionperiod.go
@@ -0,0 +1,42 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Datastore_RetentionPeriod AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.RetentionPeriod)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-retentionperiod.html
+type Datastore_RetentionPeriod struct {
+
+	// NumberOfDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-retentionperiod.html#cfn-iotanalytics-datastore-retentionperiod-numberofdays
+	NumberOfDays *types.Value `json:"NumberOfDays,omitempty"`
+
+	// Unlimited AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-retentionperiod.html#cfn-iotanalytics-datastore-retentionperiod-unlimited
+	Unlimited *types.Value `json:"Unlimited,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Datastore_RetentionPeriod) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Datastore.RetentionPeriod"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_schemadefinition.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_schemadefinition.go
new file mode 100644
index 0000000000..71600523a3
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_schemadefinition.go
@@ -0,0 +1,35 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Datastore_SchemaDefinition AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.SchemaDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-schemadefinition.html
+type Datastore_SchemaDefinition struct {
+
+	// Columns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-schemadefinition.html#cfn-iotanalytics-datastore-schemadefinition-columns
+	Columns []Datastore_Column `json:"Columns,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Datastore_SchemaDefinition) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Datastore.SchemaDefinition"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_servicemanageds3.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_servicemanageds3.go
new file mode 100644
index 0000000000..ca7035c83b
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_servicemanageds3.go
@@ -0,0 +1,30 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Datastore_ServiceManagedS3 AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.ServiceManagedS3)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-servicemanageds3.html
+type Datastore_ServiceManagedS3 struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Datastore_ServiceManagedS3) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Datastore.ServiceManagedS3"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_timestamppartition.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_timestamppartition.go
new file mode 100644
index 0000000000..a7bfe16ea8
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-datastore_timestamppartition.go
@@ -0,0 +1,42 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Datastore_TimestampPartition AWS CloudFormation Resource (AWS::IoTAnalytics::Datastore.TimestampPartition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-timestamppartition.html
+type Datastore_TimestampPartition struct {
+
+	// AttributeName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-timestamppartition.html#cfn-iotanalytics-datastore-timestamppartition-attributename
+	AttributeName *types.Value `json:"AttributeName,omitempty"`
+
+	// TimestampFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-datastore-timestamppartition.html#cfn-iotanalytics-datastore-timestamppartition-timestampformat
+	TimestampFormat *types.Value `json:"TimestampFormat,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Datastore_TimestampPartition) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Datastore.TimestampPartition"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline.go
new file mode 100644
index 0000000000..92b5e68e2c
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline.go
@@ -0,0 +1,119 @@
+package iotanalytics
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-pipeline.html
+type Pipeline struct {
+
+	// PipelineActivities AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-pipeline.html#cfn-iotanalytics-pipeline-pipelineactivities
+	PipelineActivities []Pipeline_Activity `json:"PipelineActivities,omitempty"`
+
+	// PipelineName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-pipeline.html#cfn-iotanalytics-pipeline-pipelinename
+	PipelineName *types.Value `json:"PipelineName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotanalytics-pipeline.html#cfn-iotanalytics-pipeline-tags
+	Tags []cloudformation.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 *Pipeline) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Pipeline"
+}
+
+// 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 Pipeline) MarshalJSON() ([]byte, error) {
+	type Properties Pipeline
+	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 *Pipeline) UnmarshalJSON(b []byte) error {
+	type Properties Pipeline
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Pipeline(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_activity.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_activity.go
new file mode 100644
index 0000000000..f0bfa225e7
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_activity.go
@@ -0,0 +1,80 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_Activity AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.Activity)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-activity.html
+type Pipeline_Activity struct {
+
+	// AddAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-activity.html#cfn-iotanalytics-pipeline-activity-addattributes
+	AddAttributes *Pipeline_AddAttributes `json:"AddAttributes,omitempty"`
+
+	// Channel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-activity.html#cfn-iotanalytics-pipeline-activity-channel
+	Channel *Pipeline_Channel `json:"Channel,omitempty"`
+
+	// Datastore AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-activity.html#cfn-iotanalytics-pipeline-activity-datastore
+	Datastore *Pipeline_Datastore `json:"Datastore,omitempty"`
+
+	// DeviceRegistryEnrich AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-activity.html#cfn-iotanalytics-pipeline-activity-deviceregistryenrich
+	DeviceRegistryEnrich *Pipeline_DeviceRegistryEnrich `json:"DeviceRegistryEnrich,omitempty"`
+
+	// DeviceShadowEnrich AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-activity.html#cfn-iotanalytics-pipeline-activity-deviceshadowenrich
+	DeviceShadowEnrich *Pipeline_DeviceShadowEnrich `json:"DeviceShadowEnrich,omitempty"`
+
+	// Filter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-activity.html#cfn-iotanalytics-pipeline-activity-filter
+	Filter *Pipeline_Filter `json:"Filter,omitempty"`
+
+	// Lambda AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-activity.html#cfn-iotanalytics-pipeline-activity-lambda
+	Lambda *Pipeline_Lambda `json:"Lambda,omitempty"`
+
+	// Math AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-activity.html#cfn-iotanalytics-pipeline-activity-math
+	Math *Pipeline_Math `json:"Math,omitempty"`
+
+	// RemoveAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-activity.html#cfn-iotanalytics-pipeline-activity-removeattributes
+	RemoveAttributes *Pipeline_RemoveAttributes `json:"RemoveAttributes,omitempty"`
+
+	// SelectAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-activity.html#cfn-iotanalytics-pipeline-activity-selectattributes
+	SelectAttributes *Pipeline_SelectAttributes `json:"SelectAttributes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Activity) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Pipeline.Activity"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_addattributes.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_addattributes.go
new file mode 100644
index 0000000000..50a12c7da5
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_addattributes.go
@@ -0,0 +1,47 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_AddAttributes AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.AddAttributes)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-addattributes.html
+type Pipeline_AddAttributes struct {
+
+	// Attributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-addattributes.html#cfn-iotanalytics-pipeline-addattributes-attributes
+	Attributes interface{} `json:"Attributes,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-addattributes.html#cfn-iotanalytics-pipeline-addattributes-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Next AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-addattributes.html#cfn-iotanalytics-pipeline-addattributes-next
+	Next *types.Value `json:"Next,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AddAttributes) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Pipeline.AddAttributes"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_channel.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_channel.go
new file mode 100644
index 0000000000..af69e022f4
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_channel.go
@@ -0,0 +1,47 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_Channel AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.Channel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-channel.html
+type Pipeline_Channel struct {
+
+	// ChannelName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-channel.html#cfn-iotanalytics-pipeline-channel-channelname
+	ChannelName *types.Value `json:"ChannelName,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-channel.html#cfn-iotanalytics-pipeline-channel-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Next AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-channel.html#cfn-iotanalytics-pipeline-channel-next
+	Next *types.Value `json:"Next,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Channel) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Pipeline.Channel"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_datastore.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_datastore.go
new file mode 100644
index 0000000000..e69c9ffd37
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_datastore.go
@@ -0,0 +1,42 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_Datastore AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.Datastore)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-datastore.html
+type Pipeline_Datastore struct {
+
+	// DatastoreName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-datastore.html#cfn-iotanalytics-pipeline-datastore-datastorename
+	DatastoreName *types.Value `json:"DatastoreName,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-datastore.html#cfn-iotanalytics-pipeline-datastore-name
+	Name *types.Value `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 *Pipeline_Datastore) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Pipeline.Datastore"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceregistryenrich.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceregistryenrich.go
new file mode 100644
index 0000000000..6a8c0fc6fd
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceregistryenrich.go
@@ -0,0 +1,57 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_DeviceRegistryEnrich AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.DeviceRegistryEnrich)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-deviceregistryenrich.html
+type Pipeline_DeviceRegistryEnrich struct {
+
+	// Attribute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-deviceregistryenrich.html#cfn-iotanalytics-pipeline-deviceregistryenrich-attribute
+	Attribute *types.Value `json:"Attribute,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-deviceregistryenrich.html#cfn-iotanalytics-pipeline-deviceregistryenrich-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Next AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-deviceregistryenrich.html#cfn-iotanalytics-pipeline-deviceregistryenrich-next
+	Next *types.Value `json:"Next,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-deviceregistryenrich.html#cfn-iotanalytics-pipeline-deviceregistryenrich-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// ThingName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-deviceregistryenrich.html#cfn-iotanalytics-pipeline-deviceregistryenrich-thingname
+	ThingName *types.Value `json:"ThingName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DeviceRegistryEnrich) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Pipeline.DeviceRegistryEnrich"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceshadowenrich.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceshadowenrich.go
new file mode 100644
index 0000000000..280b3437ba
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_deviceshadowenrich.go
@@ -0,0 +1,57 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_DeviceShadowEnrich AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.DeviceShadowEnrich)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-deviceshadowenrich.html
+type Pipeline_DeviceShadowEnrich struct {
+
+	// Attribute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-deviceshadowenrich.html#cfn-iotanalytics-pipeline-deviceshadowenrich-attribute
+	Attribute *types.Value `json:"Attribute,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-deviceshadowenrich.html#cfn-iotanalytics-pipeline-deviceshadowenrich-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Next AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-deviceshadowenrich.html#cfn-iotanalytics-pipeline-deviceshadowenrich-next
+	Next *types.Value `json:"Next,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-deviceshadowenrich.html#cfn-iotanalytics-pipeline-deviceshadowenrich-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// ThingName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-deviceshadowenrich.html#cfn-iotanalytics-pipeline-deviceshadowenrich-thingname
+	ThingName *types.Value `json:"ThingName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DeviceShadowEnrich) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Pipeline.DeviceShadowEnrich"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_filter.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_filter.go
new file mode 100644
index 0000000000..2abf639818
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_filter.go
@@ -0,0 +1,47 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_Filter AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.Filter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-filter.html
+type Pipeline_Filter struct {
+
+	// Filter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-filter.html#cfn-iotanalytics-pipeline-filter-filter
+	Filter *types.Value `json:"Filter,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-filter.html#cfn-iotanalytics-pipeline-filter-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Next AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-filter.html#cfn-iotanalytics-pipeline-filter-next
+	Next *types.Value `json:"Next,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Filter) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Pipeline.Filter"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_lambda.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_lambda.go
new file mode 100644
index 0000000000..6b8a8cd949
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_lambda.go
@@ -0,0 +1,52 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_Lambda AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.Lambda)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-lambda.html
+type Pipeline_Lambda struct {
+
+	// BatchSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-lambda.html#cfn-iotanalytics-pipeline-lambda-batchsize
+	BatchSize *types.Value `json:"BatchSize,omitempty"`
+
+	// LambdaName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-lambda.html#cfn-iotanalytics-pipeline-lambda-lambdaname
+	LambdaName *types.Value `json:"LambdaName,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-lambda.html#cfn-iotanalytics-pipeline-lambda-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Next AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-lambda.html#cfn-iotanalytics-pipeline-lambda-next
+	Next *types.Value `json:"Next,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Lambda) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Pipeline.Lambda"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_math.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_math.go
new file mode 100644
index 0000000000..e9815610b2
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_math.go
@@ -0,0 +1,52 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_Math AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.Math)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-math.html
+type Pipeline_Math struct {
+
+	// Attribute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-math.html#cfn-iotanalytics-pipeline-math-attribute
+	Attribute *types.Value `json:"Attribute,omitempty"`
+
+	// Math AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-math.html#cfn-iotanalytics-pipeline-math-math
+	Math *types.Value `json:"Math,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-math.html#cfn-iotanalytics-pipeline-math-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Next AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-math.html#cfn-iotanalytics-pipeline-math-next
+	Next *types.Value `json:"Next,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Math) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Pipeline.Math"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_removeattributes.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_removeattributes.go
new file mode 100644
index 0000000000..b2afeab694
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_removeattributes.go
@@ -0,0 +1,47 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_RemoveAttributes AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.RemoveAttributes)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-removeattributes.html
+type Pipeline_RemoveAttributes struct {
+
+	// Attributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-removeattributes.html#cfn-iotanalytics-pipeline-removeattributes-attributes
+	Attributes *types.Value `json:"Attributes,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-removeattributes.html#cfn-iotanalytics-pipeline-removeattributes-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Next AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-removeattributes.html#cfn-iotanalytics-pipeline-removeattributes-next
+	Next *types.Value `json:"Next,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RemoveAttributes) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Pipeline.RemoveAttributes"
+}
diff --git a/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_selectattributes.go b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_selectattributes.go
new file mode 100644
index 0000000000..f84c5e4497
--- /dev/null
+++ b/goformation/cloudformation/iotanalytics/aws-iotanalytics-pipeline_selectattributes.go
@@ -0,0 +1,47 @@
+package iotanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline_SelectAttributes AWS CloudFormation Resource (AWS::IoTAnalytics::Pipeline.SelectAttributes)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-selectattributes.html
+type Pipeline_SelectAttributes struct {
+
+	// Attributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-selectattributes.html#cfn-iotanalytics-pipeline-selectattributes-attributes
+	Attributes *types.Value `json:"Attributes,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-selectattributes.html#cfn-iotanalytics-pipeline-selectattributes-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Next AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotanalytics-pipeline-selectattributes.html#cfn-iotanalytics-pipeline-selectattributes-next
+	Next *types.Value `json:"Next,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SelectAttributes) AWSCloudFormationType() string {
+	return "AWS::IoTAnalytics::Pipeline.SelectAttributes"
+}
diff --git a/goformation/cloudformation/iotcoredeviceadvisor/aws-iotcoredeviceadvisor-suitedefinition.go b/goformation/cloudformation/iotcoredeviceadvisor/aws-iotcoredeviceadvisor-suitedefinition.go
new file mode 100644
index 0000000000..e9a4672548
--- /dev/null
+++ b/goformation/cloudformation/iotcoredeviceadvisor/aws-iotcoredeviceadvisor-suitedefinition.go
@@ -0,0 +1,112 @@
+package iotcoredeviceadvisor
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// SuiteDefinition AWS CloudFormation Resource (AWS::IoTCoreDeviceAdvisor::SuiteDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotcoredeviceadvisor-suitedefinition.html
+type SuiteDefinition struct {
+
+	// SuiteDefinitionConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotcoredeviceadvisor-suitedefinition.html#cfn-iotcoredeviceadvisor-suitedefinition-suitedefinitionconfiguration
+	SuiteDefinitionConfiguration interface{} `json:"SuiteDefinitionConfiguration,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotcoredeviceadvisor-suitedefinition.html#cfn-iotcoredeviceadvisor-suitedefinition-tags
+	Tags []cloudformation.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 *SuiteDefinition) AWSCloudFormationType() string {
+	return "AWS::IoTCoreDeviceAdvisor::SuiteDefinition"
+}
+
+// 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 SuiteDefinition) MarshalJSON() ([]byte, error) {
+	type Properties SuiteDefinition
+	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 *SuiteDefinition) UnmarshalJSON(b []byte) error {
+	type Properties SuiteDefinition
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SuiteDefinition(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotevents/aws-iotevents-detectormodel.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel.go
new file mode 100644
index 0000000000..404833a55f
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel.go
@@ -0,0 +1,139 @@
+package iotevents
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotevents-detectormodel.html
+type DetectorModel struct {
+
+	// DetectorModelDefinition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotevents-detectormodel.html#cfn-iotevents-detectormodel-detectormodeldefinition
+	DetectorModelDefinition *DetectorModel_DetectorModelDefinition `json:"DetectorModelDefinition,omitempty"`
+
+	// DetectorModelDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotevents-detectormodel.html#cfn-iotevents-detectormodel-detectormodeldescription
+	DetectorModelDescription *types.Value `json:"DetectorModelDescription,omitempty"`
+
+	// DetectorModelName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotevents-detectormodel.html#cfn-iotevents-detectormodel-detectormodelname
+	DetectorModelName *types.Value `json:"DetectorModelName,omitempty"`
+
+	// EvaluationMethod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotevents-detectormodel.html#cfn-iotevents-detectormodel-evaluationmethod
+	EvaluationMethod *types.Value `json:"EvaluationMethod,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotevents-detectormodel.html#cfn-iotevents-detectormodel-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotevents-detectormodel.html#cfn-iotevents-detectormodel-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotevents-detectormodel.html#cfn-iotevents-detectormodel-tags
+	Tags []cloudformation.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 *DetectorModel) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel"
+}
+
+// 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 DetectorModel) MarshalJSON() ([]byte, error) {
+	type Properties DetectorModel
+	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 *DetectorModel) UnmarshalJSON(b []byte) error {
+	type Properties DetectorModel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DetectorModel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_action.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_action.go
new file mode 100644
index 0000000000..1f98cee463
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_action.go
@@ -0,0 +1,95 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_Action AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.Action)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-action.html
+type DetectorModel_Action struct {
+
+	// ClearTimer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-action.html#cfn-iotevents-detectormodel-action-cleartimer
+	ClearTimer *DetectorModel_ClearTimer `json:"ClearTimer,omitempty"`
+
+	// DynamoDB AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-action.html#cfn-iotevents-detectormodel-action-dynamodb
+	DynamoDB *DetectorModel_DynamoDB `json:"DynamoDB,omitempty"`
+
+	// DynamoDBv2 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-action.html#cfn-iotevents-detectormodel-action-dynamodbv2
+	DynamoDBv2 *DetectorModel_DynamoDBv2 `json:"DynamoDBv2,omitempty"`
+
+	// Firehose AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-action.html#cfn-iotevents-detectormodel-action-firehose
+	Firehose *DetectorModel_Firehose `json:"Firehose,omitempty"`
+
+	// IotEvents AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-action.html#cfn-iotevents-detectormodel-action-iotevents
+	IotEvents *DetectorModel_IotEvents `json:"IotEvents,omitempty"`
+
+	// IotSiteWise AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-action.html#cfn-iotevents-detectormodel-action-iotsitewise
+	IotSiteWise *DetectorModel_IotSiteWise `json:"IotSiteWise,omitempty"`
+
+	// IotTopicPublish AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-action.html#cfn-iotevents-detectormodel-action-iottopicpublish
+	IotTopicPublish *DetectorModel_IotTopicPublish `json:"IotTopicPublish,omitempty"`
+
+	// Lambda AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-action.html#cfn-iotevents-detectormodel-action-lambda
+	Lambda *DetectorModel_Lambda `json:"Lambda,omitempty"`
+
+	// ResetTimer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-action.html#cfn-iotevents-detectormodel-action-resettimer
+	ResetTimer *DetectorModel_ResetTimer `json:"ResetTimer,omitempty"`
+
+	// SetTimer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-action.html#cfn-iotevents-detectormodel-action-settimer
+	SetTimer *DetectorModel_SetTimer `json:"SetTimer,omitempty"`
+
+	// SetVariable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-action.html#cfn-iotevents-detectormodel-action-setvariable
+	SetVariable *DetectorModel_SetVariable `json:"SetVariable,omitempty"`
+
+	// Sns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-action.html#cfn-iotevents-detectormodel-action-sns
+	Sns *DetectorModel_Sns `json:"Sns,omitempty"`
+
+	// Sqs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-action.html#cfn-iotevents-detectormodel-action-sqs
+	Sqs *DetectorModel_Sqs `json:"Sqs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_Action) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.Action"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertytimestamp.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertytimestamp.go
new file mode 100644
index 0000000000..42cab15d1c
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertytimestamp.go
@@ -0,0 +1,42 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_AssetPropertyTimestamp AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.AssetPropertyTimestamp)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-assetpropertytimestamp.html
+type DetectorModel_AssetPropertyTimestamp struct {
+
+	// OffsetInNanos AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-assetpropertytimestamp.html#cfn-iotevents-detectormodel-assetpropertytimestamp-offsetinnanos
+	OffsetInNanos *types.Value `json:"OffsetInNanos,omitempty"`
+
+	// TimeInSeconds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-assetpropertytimestamp.html#cfn-iotevents-detectormodel-assetpropertytimestamp-timeinseconds
+	TimeInSeconds *types.Value `json:"TimeInSeconds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_AssetPropertyTimestamp) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.AssetPropertyTimestamp"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvalue.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvalue.go
new file mode 100644
index 0000000000..c7b36580ca
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvalue.go
@@ -0,0 +1,47 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_AssetPropertyValue AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.AssetPropertyValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-assetpropertyvalue.html
+type DetectorModel_AssetPropertyValue struct {
+
+	// Quality AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-assetpropertyvalue.html#cfn-iotevents-detectormodel-assetpropertyvalue-quality
+	Quality *types.Value `json:"Quality,omitempty"`
+
+	// Timestamp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-assetpropertyvalue.html#cfn-iotevents-detectormodel-assetpropertyvalue-timestamp
+	Timestamp *DetectorModel_AssetPropertyTimestamp `json:"Timestamp,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-assetpropertyvalue.html#cfn-iotevents-detectormodel-assetpropertyvalue-value
+	Value *DetectorModel_AssetPropertyVariant `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 *DetectorModel_AssetPropertyValue) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.AssetPropertyValue"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvariant.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvariant.go
new file mode 100644
index 0000000000..7ed4304368
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_assetpropertyvariant.go
@@ -0,0 +1,52 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_AssetPropertyVariant AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.AssetPropertyVariant)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-assetpropertyvariant.html
+type DetectorModel_AssetPropertyVariant struct {
+
+	// BooleanValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-assetpropertyvariant.html#cfn-iotevents-detectormodel-assetpropertyvariant-booleanvalue
+	BooleanValue *types.Value `json:"BooleanValue,omitempty"`
+
+	// DoubleValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-assetpropertyvariant.html#cfn-iotevents-detectormodel-assetpropertyvariant-doublevalue
+	DoubleValue *types.Value `json:"DoubleValue,omitempty"`
+
+	// IntegerValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-assetpropertyvariant.html#cfn-iotevents-detectormodel-assetpropertyvariant-integervalue
+	IntegerValue *types.Value `json:"IntegerValue,omitempty"`
+
+	// StringValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-assetpropertyvariant.html#cfn-iotevents-detectormodel-assetpropertyvariant-stringvalue
+	StringValue *types.Value `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 *DetectorModel_AssetPropertyVariant) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.AssetPropertyVariant"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_cleartimer.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_cleartimer.go
new file mode 100644
index 0000000000..ff7f8a8935
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_cleartimer.go
@@ -0,0 +1,37 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_ClearTimer AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.ClearTimer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-cleartimer.html
+type DetectorModel_ClearTimer struct {
+
+	// TimerName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-cleartimer.html#cfn-iotevents-detectormodel-cleartimer-timername
+	TimerName *types.Value `json:"TimerName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_ClearTimer) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.ClearTimer"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_detectormodeldefinition.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_detectormodeldefinition.go
new file mode 100644
index 0000000000..3c07021700
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_detectormodeldefinition.go
@@ -0,0 +1,42 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_DetectorModelDefinition AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.DetectorModelDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-detectormodeldefinition.html
+type DetectorModel_DetectorModelDefinition struct {
+
+	// InitialStateName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-detectormodeldefinition.html#cfn-iotevents-detectormodel-detectormodeldefinition-initialstatename
+	InitialStateName *types.Value `json:"InitialStateName,omitempty"`
+
+	// States AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-detectormodeldefinition.html#cfn-iotevents-detectormodel-detectormodeldefinition-states
+	States []DetectorModel_State `json:"States,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_DetectorModelDefinition) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.DetectorModelDefinition"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodb.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodb.go
new file mode 100644
index 0000000000..2b7690ce91
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodb.go
@@ -0,0 +1,82 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_DynamoDB AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.DynamoDB)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-dynamodb.html
+type DetectorModel_DynamoDB struct {
+
+	// HashKeyField AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-dynamodb.html#cfn-iotevents-detectormodel-dynamodb-hashkeyfield
+	HashKeyField *types.Value `json:"HashKeyField,omitempty"`
+
+	// HashKeyType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-dynamodb.html#cfn-iotevents-detectormodel-dynamodb-hashkeytype
+	HashKeyType *types.Value `json:"HashKeyType,omitempty"`
+
+	// HashKeyValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-dynamodb.html#cfn-iotevents-detectormodel-dynamodb-hashkeyvalue
+	HashKeyValue *types.Value `json:"HashKeyValue,omitempty"`
+
+	// Operation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-dynamodb.html#cfn-iotevents-detectormodel-dynamodb-operation
+	Operation *types.Value `json:"Operation,omitempty"`
+
+	// Payload AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-dynamodb.html#cfn-iotevents-detectormodel-dynamodb-payload
+	Payload *DetectorModel_Payload `json:"Payload,omitempty"`
+
+	// PayloadField AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-dynamodb.html#cfn-iotevents-detectormodel-dynamodb-payloadfield
+	PayloadField *types.Value `json:"PayloadField,omitempty"`
+
+	// RangeKeyField AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-dynamodb.html#cfn-iotevents-detectormodel-dynamodb-rangekeyfield
+	RangeKeyField *types.Value `json:"RangeKeyField,omitempty"`
+
+	// RangeKeyType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-dynamodb.html#cfn-iotevents-detectormodel-dynamodb-rangekeytype
+	RangeKeyType *types.Value `json:"RangeKeyType,omitempty"`
+
+	// RangeKeyValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-dynamodb.html#cfn-iotevents-detectormodel-dynamodb-rangekeyvalue
+	RangeKeyValue *types.Value `json:"RangeKeyValue,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-dynamodb.html#cfn-iotevents-detectormodel-dynamodb-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_DynamoDB) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.DynamoDB"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodbv2.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodbv2.go
new file mode 100644
index 0000000000..0818788036
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_dynamodbv2.go
@@ -0,0 +1,42 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_DynamoDBv2 AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.DynamoDBv2)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-dynamodbv2.html
+type DetectorModel_DynamoDBv2 struct {
+
+	// Payload AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-dynamodbv2.html#cfn-iotevents-detectormodel-dynamodbv2-payload
+	Payload *DetectorModel_Payload `json:"Payload,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-dynamodbv2.html#cfn-iotevents-detectormodel-dynamodbv2-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_DynamoDBv2) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.DynamoDBv2"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_event.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_event.go
new file mode 100644
index 0000000000..04447c29f7
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_event.go
@@ -0,0 +1,47 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_Event AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.Event)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-event.html
+type DetectorModel_Event struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-event.html#cfn-iotevents-detectormodel-event-actions
+	Actions []DetectorModel_Action `json:"Actions,omitempty"`
+
+	// Condition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-event.html#cfn-iotevents-detectormodel-event-condition
+	Condition *types.Value `json:"Condition,omitempty"`
+
+	// EventName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-event.html#cfn-iotevents-detectormodel-event-eventname
+	EventName *types.Value `json:"EventName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_Event) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.Event"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_firehose.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_firehose.go
new file mode 100644
index 0000000000..7923f83a49
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_firehose.go
@@ -0,0 +1,47 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_Firehose AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.Firehose)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-firehose.html
+type DetectorModel_Firehose struct {
+
+	// DeliveryStreamName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-firehose.html#cfn-iotevents-detectormodel-firehose-deliverystreamname
+	DeliveryStreamName *types.Value `json:"DeliveryStreamName,omitempty"`
+
+	// Payload AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-firehose.html#cfn-iotevents-detectormodel-firehose-payload
+	Payload *DetectorModel_Payload `json:"Payload,omitempty"`
+
+	// Separator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-firehose.html#cfn-iotevents-detectormodel-firehose-separator
+	Separator *types.Value `json:"Separator,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_Firehose) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.Firehose"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iotevents.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iotevents.go
new file mode 100644
index 0000000000..839d6dac9b
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iotevents.go
@@ -0,0 +1,42 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_IotEvents AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.IotEvents)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-iotevents.html
+type DetectorModel_IotEvents struct {
+
+	// InputName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-iotevents.html#cfn-iotevents-detectormodel-iotevents-inputname
+	InputName *types.Value `json:"InputName,omitempty"`
+
+	// Payload AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-iotevents.html#cfn-iotevents-detectormodel-iotevents-payload
+	Payload *DetectorModel_Payload `json:"Payload,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_IotEvents) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.IotEvents"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iotsitewise.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iotsitewise.go
new file mode 100644
index 0000000000..157dfb25e1
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iotsitewise.go
@@ -0,0 +1,57 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_IotSiteWise AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.IotSiteWise)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-iotsitewise.html
+type DetectorModel_IotSiteWise struct {
+
+	// AssetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-iotsitewise.html#cfn-iotevents-detectormodel-iotsitewise-assetid
+	AssetId *types.Value `json:"AssetId,omitempty"`
+
+	// EntryId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-iotsitewise.html#cfn-iotevents-detectormodel-iotsitewise-entryid
+	EntryId *types.Value `json:"EntryId,omitempty"`
+
+	// PropertyAlias AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-iotsitewise.html#cfn-iotevents-detectormodel-iotsitewise-propertyalias
+	PropertyAlias *types.Value `json:"PropertyAlias,omitempty"`
+
+	// PropertyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-iotsitewise.html#cfn-iotevents-detectormodel-iotsitewise-propertyid
+	PropertyId *types.Value `json:"PropertyId,omitempty"`
+
+	// PropertyValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-iotsitewise.html#cfn-iotevents-detectormodel-iotsitewise-propertyvalue
+	PropertyValue *DetectorModel_AssetPropertyValue `json:"PropertyValue,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_IotSiteWise) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.IotSiteWise"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iottopicpublish.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iottopicpublish.go
new file mode 100644
index 0000000000..c818d1d202
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_iottopicpublish.go
@@ -0,0 +1,42 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_IotTopicPublish AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.IotTopicPublish)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-iottopicpublish.html
+type DetectorModel_IotTopicPublish struct {
+
+	// MqttTopic AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-iottopicpublish.html#cfn-iotevents-detectormodel-iottopicpublish-mqtttopic
+	MqttTopic *types.Value `json:"MqttTopic,omitempty"`
+
+	// Payload AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-iottopicpublish.html#cfn-iotevents-detectormodel-iottopicpublish-payload
+	Payload *DetectorModel_Payload `json:"Payload,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_IotTopicPublish) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.IotTopicPublish"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_lambda.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_lambda.go
new file mode 100644
index 0000000000..55771b7d90
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_lambda.go
@@ -0,0 +1,42 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_Lambda AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.Lambda)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-lambda.html
+type DetectorModel_Lambda struct {
+
+	// FunctionArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-lambda.html#cfn-iotevents-detectormodel-lambda-functionarn
+	FunctionArn *types.Value `json:"FunctionArn,omitempty"`
+
+	// Payload AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-lambda.html#cfn-iotevents-detectormodel-lambda-payload
+	Payload *DetectorModel_Payload `json:"Payload,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_Lambda) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.Lambda"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_onenter.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_onenter.go
new file mode 100644
index 0000000000..bef819ddc8
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_onenter.go
@@ -0,0 +1,35 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_OnEnter AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.OnEnter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-onenter.html
+type DetectorModel_OnEnter struct {
+
+	// Events AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-onenter.html#cfn-iotevents-detectormodel-onenter-events
+	Events []DetectorModel_Event `json:"Events,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_OnEnter) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.OnEnter"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_onexit.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_onexit.go
new file mode 100644
index 0000000000..2c30f03e37
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_onexit.go
@@ -0,0 +1,35 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_OnExit AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.OnExit)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-onexit.html
+type DetectorModel_OnExit struct {
+
+	// Events AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-onexit.html#cfn-iotevents-detectormodel-onexit-events
+	Events []DetectorModel_Event `json:"Events,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_OnExit) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.OnExit"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_oninput.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_oninput.go
new file mode 100644
index 0000000000..c412d5d5bc
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_oninput.go
@@ -0,0 +1,40 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_OnInput AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.OnInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-oninput.html
+type DetectorModel_OnInput struct {
+
+	// Events AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-oninput.html#cfn-iotevents-detectormodel-oninput-events
+	Events []DetectorModel_Event `json:"Events,omitempty"`
+
+	// TransitionEvents AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-oninput.html#cfn-iotevents-detectormodel-oninput-transitionevents
+	TransitionEvents []DetectorModel_TransitionEvent `json:"TransitionEvents,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_OnInput) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.OnInput"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_payload.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_payload.go
new file mode 100644
index 0000000000..8cd90e1fb5
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_payload.go
@@ -0,0 +1,42 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_Payload AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.Payload)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-payload.html
+type DetectorModel_Payload struct {
+
+	// ContentExpression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-payload.html#cfn-iotevents-detectormodel-payload-contentexpression
+	ContentExpression *types.Value `json:"ContentExpression,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-payload.html#cfn-iotevents-detectormodel-payload-type
+	Type *types.Value `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 *DetectorModel_Payload) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.Payload"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_resettimer.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_resettimer.go
new file mode 100644
index 0000000000..cd3514a81f
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_resettimer.go
@@ -0,0 +1,37 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_ResetTimer AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.ResetTimer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-resettimer.html
+type DetectorModel_ResetTimer struct {
+
+	// TimerName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-resettimer.html#cfn-iotevents-detectormodel-resettimer-timername
+	TimerName *types.Value `json:"TimerName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_ResetTimer) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.ResetTimer"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_settimer.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_settimer.go
new file mode 100644
index 0000000000..0c1f6c16ee
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_settimer.go
@@ -0,0 +1,47 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_SetTimer AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.SetTimer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-settimer.html
+type DetectorModel_SetTimer struct {
+
+	// DurationExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-settimer.html#cfn-iotevents-detectormodel-settimer-durationexpression
+	DurationExpression *types.Value `json:"DurationExpression,omitempty"`
+
+	// Seconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-settimer.html#cfn-iotevents-detectormodel-settimer-seconds
+	Seconds *types.Value `json:"Seconds,omitempty"`
+
+	// TimerName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-settimer.html#cfn-iotevents-detectormodel-settimer-timername
+	TimerName *types.Value `json:"TimerName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_SetTimer) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.SetTimer"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_setvariable.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_setvariable.go
new file mode 100644
index 0000000000..625528ef13
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_setvariable.go
@@ -0,0 +1,42 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_SetVariable AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.SetVariable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-setvariable.html
+type DetectorModel_SetVariable struct {
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-setvariable.html#cfn-iotevents-detectormodel-setvariable-value
+	Value *types.Value `json:"Value,omitempty"`
+
+	// VariableName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-setvariable.html#cfn-iotevents-detectormodel-setvariable-variablename
+	VariableName *types.Value `json:"VariableName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_SetVariable) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.SetVariable"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_sns.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_sns.go
new file mode 100644
index 0000000000..b640a8ee43
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_sns.go
@@ -0,0 +1,42 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_Sns AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.Sns)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-sns.html
+type DetectorModel_Sns struct {
+
+	// Payload AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-sns.html#cfn-iotevents-detectormodel-sns-payload
+	Payload *DetectorModel_Payload `json:"Payload,omitempty"`
+
+	// TargetArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-sns.html#cfn-iotevents-detectormodel-sns-targetarn
+	TargetArn *types.Value `json:"TargetArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_Sns) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.Sns"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_sqs.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_sqs.go
new file mode 100644
index 0000000000..ef6d92035b
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_sqs.go
@@ -0,0 +1,47 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_Sqs AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.Sqs)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-sqs.html
+type DetectorModel_Sqs struct {
+
+	// Payload AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-sqs.html#cfn-iotevents-detectormodel-sqs-payload
+	Payload *DetectorModel_Payload `json:"Payload,omitempty"`
+
+	// QueueUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-sqs.html#cfn-iotevents-detectormodel-sqs-queueurl
+	QueueUrl *types.Value `json:"QueueUrl,omitempty"`
+
+	// UseBase64 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-sqs.html#cfn-iotevents-detectormodel-sqs-usebase64
+	UseBase64 *types.Value `json:"UseBase64,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_Sqs) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.Sqs"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_state.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_state.go
new file mode 100644
index 0000000000..b505121dfd
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_state.go
@@ -0,0 +1,52 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_State AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.State)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-state.html
+type DetectorModel_State struct {
+
+	// OnEnter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-state.html#cfn-iotevents-detectormodel-state-onenter
+	OnEnter *DetectorModel_OnEnter `json:"OnEnter,omitempty"`
+
+	// OnExit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-state.html#cfn-iotevents-detectormodel-state-onexit
+	OnExit *DetectorModel_OnExit `json:"OnExit,omitempty"`
+
+	// OnInput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-state.html#cfn-iotevents-detectormodel-state-oninput
+	OnInput *DetectorModel_OnInput `json:"OnInput,omitempty"`
+
+	// StateName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-state.html#cfn-iotevents-detectormodel-state-statename
+	StateName *types.Value `json:"StateName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_State) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.State"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_transitionevent.go b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_transitionevent.go
new file mode 100644
index 0000000000..78728003bc
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-detectormodel_transitionevent.go
@@ -0,0 +1,52 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DetectorModel_TransitionEvent AWS CloudFormation Resource (AWS::IoTEvents::DetectorModel.TransitionEvent)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-transitionevent.html
+type DetectorModel_TransitionEvent struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-transitionevent.html#cfn-iotevents-detectormodel-transitionevent-actions
+	Actions []DetectorModel_Action `json:"Actions,omitempty"`
+
+	// Condition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-transitionevent.html#cfn-iotevents-detectormodel-transitionevent-condition
+	Condition *types.Value `json:"Condition,omitempty"`
+
+	// EventName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-transitionevent.html#cfn-iotevents-detectormodel-transitionevent-eventname
+	EventName *types.Value `json:"EventName,omitempty"`
+
+	// NextState AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-detectormodel-transitionevent.html#cfn-iotevents-detectormodel-transitionevent-nextstate
+	NextState *types.Value `json:"NextState,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DetectorModel_TransitionEvent) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::DetectorModel.TransitionEvent"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-input.go b/goformation/cloudformation/iotevents/aws-iotevents-input.go
new file mode 100644
index 0000000000..0736000962
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-input.go
@@ -0,0 +1,124 @@
+package iotevents
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Input AWS CloudFormation Resource (AWS::IoTEvents::Input)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotevents-input.html
+type Input struct {
+
+	// InputDefinition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotevents-input.html#cfn-iotevents-input-inputdefinition
+	InputDefinition *Input_InputDefinition `json:"InputDefinition,omitempty"`
+
+	// InputDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotevents-input.html#cfn-iotevents-input-inputdescription
+	InputDescription *types.Value `json:"InputDescription,omitempty"`
+
+	// InputName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotevents-input.html#cfn-iotevents-input-inputname
+	InputName *types.Value `json:"InputName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotevents-input.html#cfn-iotevents-input-tags
+	Tags []cloudformation.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 *Input) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::Input"
+}
+
+// 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 Input) MarshalJSON() ([]byte, error) {
+	type Properties Input
+	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 *Input) UnmarshalJSON(b []byte) error {
+	type Properties Input
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Input(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotevents/aws-iotevents-input_attribute.go b/goformation/cloudformation/iotevents/aws-iotevents-input_attribute.go
new file mode 100644
index 0000000000..9e42fefb7e
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-input_attribute.go
@@ -0,0 +1,37 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Input_Attribute AWS CloudFormation Resource (AWS::IoTEvents::Input.Attribute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-input-attribute.html
+type Input_Attribute struct {
+
+	// JsonPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-input-attribute.html#cfn-iotevents-input-attribute-jsonpath
+	JsonPath *types.Value `json:"JsonPath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Attribute) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::Input.Attribute"
+}
diff --git a/goformation/cloudformation/iotevents/aws-iotevents-input_inputdefinition.go b/goformation/cloudformation/iotevents/aws-iotevents-input_inputdefinition.go
new file mode 100644
index 0000000000..fa678fc3dc
--- /dev/null
+++ b/goformation/cloudformation/iotevents/aws-iotevents-input_inputdefinition.go
@@ -0,0 +1,35 @@
+package iotevents
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Input_InputDefinition AWS CloudFormation Resource (AWS::IoTEvents::Input.InputDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-input-inputdefinition.html
+type Input_InputDefinition struct {
+
+	// Attributes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotevents-input-inputdefinition.html#cfn-iotevents-input-inputdefinition-attributes
+	Attributes []Input_Attribute `json:"Attributes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InputDefinition) AWSCloudFormationType() string {
+	return "AWS::IoTEvents::Input.InputDefinition"
+}
diff --git a/goformation/cloudformation/iotfleethub/aws-iotfleethub-application.go b/goformation/cloudformation/iotfleethub/aws-iotfleethub-application.go
new file mode 100644
index 0000000000..c9961a87f4
--- /dev/null
+++ b/goformation/cloudformation/iotfleethub/aws-iotfleethub-application.go
@@ -0,0 +1,124 @@
+package iotfleethub
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application AWS CloudFormation Resource (AWS::IoTFleetHub::Application)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotfleethub-application.html
+type Application struct {
+
+	// ApplicationDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotfleethub-application.html#cfn-iotfleethub-application-applicationdescription
+	ApplicationDescription *types.Value `json:"ApplicationDescription,omitempty"`
+
+	// ApplicationName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotfleethub-application.html#cfn-iotfleethub-application-applicationname
+	ApplicationName *types.Value `json:"ApplicationName,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotfleethub-application.html#cfn-iotfleethub-application-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotfleethub-application.html#cfn-iotfleethub-application-tags
+	Tags []cloudformation.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::IoTFleetHub::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy.go
new file mode 100644
index 0000000000..3db71588d4
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy.go
@@ -0,0 +1,118 @@
+package iotsitewise
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPolicy AWS CloudFormation Resource (AWS::IoTSiteWise::AccessPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-accesspolicy.html
+type AccessPolicy struct {
+
+	// AccessPolicyIdentity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-accesspolicy.html#cfn-iotsitewise-accesspolicy-accesspolicyidentity
+	AccessPolicyIdentity *AccessPolicy_AccessPolicyIdentity `json:"AccessPolicyIdentity,omitempty"`
+
+	// AccessPolicyPermission AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-accesspolicy.html#cfn-iotsitewise-accesspolicy-accesspolicypermission
+	AccessPolicyPermission *types.Value `json:"AccessPolicyPermission,omitempty"`
+
+	// AccessPolicyResource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-accesspolicy.html#cfn-iotsitewise-accesspolicy-accesspolicyresource
+	AccessPolicyResource *AccessPolicy_AccessPolicyResource `json:"AccessPolicyResource,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AccessPolicy) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::AccessPolicy"
+}
+
+// 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 AccessPolicy) MarshalJSON() ([]byte, error) {
+	type Properties AccessPolicy
+	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 *AccessPolicy) UnmarshalJSON(b []byte) error {
+	type Properties AccessPolicy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AccessPolicy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyidentity.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyidentity.go
new file mode 100644
index 0000000000..6428c3442e
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyidentity.go
@@ -0,0 +1,45 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPolicy_AccessPolicyIdentity AWS CloudFormation Resource (AWS::IoTSiteWise::AccessPolicy.AccessPolicyIdentity)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-accesspolicy-accesspolicyidentity.html
+type AccessPolicy_AccessPolicyIdentity struct {
+
+	// IamRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-accesspolicy-accesspolicyidentity.html#cfn-iotsitewise-accesspolicy-accesspolicyidentity-iamrole
+	IamRole *AccessPolicy_IamRole `json:"IamRole,omitempty"`
+
+	// IamUser AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-accesspolicy-accesspolicyidentity.html#cfn-iotsitewise-accesspolicy-accesspolicyidentity-iamuser
+	IamUser *AccessPolicy_IamUser `json:"IamUser,omitempty"`
+
+	// User AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-accesspolicy-accesspolicyidentity.html#cfn-iotsitewise-accesspolicy-accesspolicyidentity-user
+	User *AccessPolicy_User `json:"User,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AccessPolicy_AccessPolicyIdentity) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::AccessPolicy.AccessPolicyIdentity"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyresource.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyresource.go
new file mode 100644
index 0000000000..2572ed2d2e
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_accesspolicyresource.go
@@ -0,0 +1,40 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPolicy_AccessPolicyResource AWS CloudFormation Resource (AWS::IoTSiteWise::AccessPolicy.AccessPolicyResource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-accesspolicy-accesspolicyresource.html
+type AccessPolicy_AccessPolicyResource struct {
+
+	// Portal AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-accesspolicy-accesspolicyresource.html#cfn-iotsitewise-accesspolicy-accesspolicyresource-portal
+	Portal *AccessPolicy_Portal `json:"Portal,omitempty"`
+
+	// Project AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-accesspolicy-accesspolicyresource.html#cfn-iotsitewise-accesspolicy-accesspolicyresource-project
+	Project *AccessPolicy_Project `json:"Project,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AccessPolicy_AccessPolicyResource) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::AccessPolicy.AccessPolicyResource"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamrole.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamrole.go
new file mode 100644
index 0000000000..502f78277f
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamrole.go
@@ -0,0 +1,37 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPolicy_IamRole AWS CloudFormation Resource (AWS::IoTSiteWise::AccessPolicy.IamRole)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-accesspolicy-iamrole.html
+type AccessPolicy_IamRole struct {
+
+	// arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-accesspolicy-iamrole.html#cfn-iotsitewise-accesspolicy-iamrole-arn
+	arn *types.Value `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 *AccessPolicy_IamRole) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::AccessPolicy.IamRole"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamuser.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamuser.go
new file mode 100644
index 0000000000..478fcc97b5
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_iamuser.go
@@ -0,0 +1,37 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPolicy_IamUser AWS CloudFormation Resource (AWS::IoTSiteWise::AccessPolicy.IamUser)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-accesspolicy-iamuser.html
+type AccessPolicy_IamUser struct {
+
+	// arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-accesspolicy-iamuser.html#cfn-iotsitewise-accesspolicy-iamuser-arn
+	arn *types.Value `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 *AccessPolicy_IamUser) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::AccessPolicy.IamUser"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_portal.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_portal.go
new file mode 100644
index 0000000000..22879ffac4
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_portal.go
@@ -0,0 +1,37 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPolicy_Portal AWS CloudFormation Resource (AWS::IoTSiteWise::AccessPolicy.Portal)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-accesspolicy-portal.html
+type AccessPolicy_Portal struct {
+
+	// id AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-accesspolicy-portal.html#cfn-iotsitewise-accesspolicy-portal-id
+	id *types.Value `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 *AccessPolicy_Portal) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::AccessPolicy.Portal"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_project.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_project.go
new file mode 100644
index 0000000000..5c9c52c819
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_project.go
@@ -0,0 +1,37 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPolicy_Project AWS CloudFormation Resource (AWS::IoTSiteWise::AccessPolicy.Project)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-accesspolicy-project.html
+type AccessPolicy_Project struct {
+
+	// id AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-accesspolicy-project.html#cfn-iotsitewise-accesspolicy-project-id
+	id *types.Value `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 *AccessPolicy_Project) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::AccessPolicy.Project"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_user.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_user.go
new file mode 100644
index 0000000000..5606c8d9a3
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-accesspolicy_user.go
@@ -0,0 +1,37 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPolicy_User AWS CloudFormation Resource (AWS::IoTSiteWise::AccessPolicy.User)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-accesspolicy-user.html
+type AccessPolicy_User struct {
+
+	// id AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-accesspolicy-user.html#cfn-iotsitewise-accesspolicy-user-id
+	id *types.Value `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 *AccessPolicy_User) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::AccessPolicy.User"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset.go
new file mode 100644
index 0000000000..bb5d712c38
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset.go
@@ -0,0 +1,129 @@
+package iotsitewise
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Asset AWS CloudFormation Resource (AWS::IoTSiteWise::Asset)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-asset.html
+type Asset struct {
+
+	// AssetHierarchies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-asset.html#cfn-iotsitewise-asset-assethierarchies
+	AssetHierarchies []Asset_AssetHierarchy `json:"AssetHierarchies,omitempty"`
+
+	// AssetModelId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-asset.html#cfn-iotsitewise-asset-assetmodelid
+	AssetModelId *types.Value `json:"AssetModelId,omitempty"`
+
+	// AssetName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-asset.html#cfn-iotsitewise-asset-assetname
+	AssetName *types.Value `json:"AssetName,omitempty"`
+
+	// AssetProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-asset.html#cfn-iotsitewise-asset-assetproperties
+	AssetProperties []Asset_AssetProperty `json:"AssetProperties,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-asset.html#cfn-iotsitewise-asset-tags
+	Tags []cloudformation.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 *Asset) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::Asset"
+}
+
+// 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 Asset) MarshalJSON() ([]byte, error) {
+	type Properties Asset
+	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 *Asset) UnmarshalJSON(b []byte) error {
+	type Properties Asset
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Asset(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset_assethierarchy.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset_assethierarchy.go
new file mode 100644
index 0000000000..5d52e053b8
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset_assethierarchy.go
@@ -0,0 +1,42 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Asset_AssetHierarchy AWS CloudFormation Resource (AWS::IoTSiteWise::Asset.AssetHierarchy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-asset-assethierarchy.html
+type Asset_AssetHierarchy struct {
+
+	// ChildAssetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-asset-assethierarchy.html#cfn-iotsitewise-asset-assethierarchy-childassetid
+	ChildAssetId *types.Value `json:"ChildAssetId,omitempty"`
+
+	// LogicalId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-asset-assethierarchy.html#cfn-iotsitewise-asset-assethierarchy-logicalid
+	LogicalId *types.Value `json:"LogicalId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Asset_AssetHierarchy) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::Asset.AssetHierarchy"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset_assetproperty.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset_assetproperty.go
new file mode 100644
index 0000000000..557195bf2d
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-asset_assetproperty.go
@@ -0,0 +1,47 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Asset_AssetProperty AWS CloudFormation Resource (AWS::IoTSiteWise::Asset.AssetProperty)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-asset-assetproperty.html
+type Asset_AssetProperty struct {
+
+	// Alias AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-asset-assetproperty.html#cfn-iotsitewise-asset-assetproperty-alias
+	Alias *types.Value `json:"Alias,omitempty"`
+
+	// LogicalId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-asset-assetproperty.html#cfn-iotsitewise-asset-assetproperty-logicalid
+	LogicalId *types.Value `json:"LogicalId,omitempty"`
+
+	// NotificationState AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-asset-assetproperty.html#cfn-iotsitewise-asset-assetproperty-notificationstate
+	NotificationState *types.Value `json:"NotificationState,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Asset_AssetProperty) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::Asset.AssetProperty"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel.go
new file mode 100644
index 0000000000..356a2d15fe
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel.go
@@ -0,0 +1,134 @@
+package iotsitewise
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// AssetModel AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-assetmodel.html
+type AssetModel struct {
+
+	// AssetModelCompositeModels AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-assetmodel.html#cfn-iotsitewise-assetmodel-assetmodelcompositemodels
+	AssetModelCompositeModels []AssetModel_AssetModelCompositeModel `json:"AssetModelCompositeModels,omitempty"`
+
+	// AssetModelDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-assetmodel.html#cfn-iotsitewise-assetmodel-assetmodeldescription
+	AssetModelDescription *types.Value `json:"AssetModelDescription,omitempty"`
+
+	// AssetModelHierarchies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-assetmodel.html#cfn-iotsitewise-assetmodel-assetmodelhierarchies
+	AssetModelHierarchies []AssetModel_AssetModelHierarchy `json:"AssetModelHierarchies,omitempty"`
+
+	// AssetModelName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-assetmodel.html#cfn-iotsitewise-assetmodel-assetmodelname
+	AssetModelName *types.Value `json:"AssetModelName,omitempty"`
+
+	// AssetModelProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-assetmodel.html#cfn-iotsitewise-assetmodel-assetmodelproperties
+	AssetModelProperties []AssetModel_AssetModelProperty `json:"AssetModelProperties,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-assetmodel.html#cfn-iotsitewise-assetmodel-tags
+	Tags []cloudformation.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 *AssetModel) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::AssetModel"
+}
+
+// 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 AssetModel) MarshalJSON() ([]byte, error) {
+	type Properties AssetModel
+	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 *AssetModel) UnmarshalJSON(b []byte) error {
+	type Properties AssetModel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AssetModel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelcompositemodel.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelcompositemodel.go
new file mode 100644
index 0000000000..dede803c91
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelcompositemodel.go
@@ -0,0 +1,52 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AssetModel_AssetModelCompositeModel AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.AssetModelCompositeModel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-assetmodelcompositemodel.html
+type AssetModel_AssetModelCompositeModel struct {
+
+	// CompositeModelProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-assetmodelcompositemodel.html#cfn-iotsitewise-assetmodel-assetmodelcompositemodel-compositemodelproperties
+	CompositeModelProperties []AssetModel_AssetModelProperty `json:"CompositeModelProperties,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-assetmodelcompositemodel.html#cfn-iotsitewise-assetmodel-assetmodelcompositemodel-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-assetmodelcompositemodel.html#cfn-iotsitewise-assetmodel-assetmodelcompositemodel-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-assetmodelcompositemodel.html#cfn-iotsitewise-assetmodel-assetmodelcompositemodel-type
+	Type *types.Value `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 *AssetModel_AssetModelCompositeModel) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::AssetModel.AssetModelCompositeModel"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelhierarchy.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelhierarchy.go
new file mode 100644
index 0000000000..807f5fd8ed
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelhierarchy.go
@@ -0,0 +1,47 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AssetModel_AssetModelHierarchy AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.AssetModelHierarchy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-assetmodelhierarchy.html
+type AssetModel_AssetModelHierarchy struct {
+
+	// ChildAssetModelId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-assetmodelhierarchy.html#cfn-iotsitewise-assetmodel-assetmodelhierarchy-childassetmodelid
+	ChildAssetModelId *types.Value `json:"ChildAssetModelId,omitempty"`
+
+	// LogicalId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-assetmodelhierarchy.html#cfn-iotsitewise-assetmodel-assetmodelhierarchy-logicalid
+	LogicalId *types.Value `json:"LogicalId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-assetmodelhierarchy.html#cfn-iotsitewise-assetmodel-assetmodelhierarchy-name
+	Name *types.Value `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 *AssetModel_AssetModelHierarchy) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::AssetModel.AssetModelHierarchy"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelproperty.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelproperty.go
new file mode 100644
index 0000000000..a79fee5dc6
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_assetmodelproperty.go
@@ -0,0 +1,62 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AssetModel_AssetModelProperty AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.AssetModelProperty)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-assetmodelproperty.html
+type AssetModel_AssetModelProperty struct {
+
+	// DataType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-assetmodelproperty.html#cfn-iotsitewise-assetmodel-assetmodelproperty-datatype
+	DataType *types.Value `json:"DataType,omitempty"`
+
+	// DataTypeSpec AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-assetmodelproperty.html#cfn-iotsitewise-assetmodel-assetmodelproperty-datatypespec
+	DataTypeSpec *types.Value `json:"DataTypeSpec,omitempty"`
+
+	// LogicalId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-assetmodelproperty.html#cfn-iotsitewise-assetmodel-assetmodelproperty-logicalid
+	LogicalId *types.Value `json:"LogicalId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-assetmodelproperty.html#cfn-iotsitewise-assetmodel-assetmodelproperty-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-assetmodelproperty.html#cfn-iotsitewise-assetmodel-assetmodelproperty-type
+	Type *AssetModel_PropertyType `json:"Type,omitempty"`
+
+	// Unit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-assetmodelproperty.html#cfn-iotsitewise-assetmodel-assetmodelproperty-unit
+	Unit *types.Value `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 *AssetModel_AssetModelProperty) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::AssetModel.AssetModelProperty"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_attribute.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_attribute.go
new file mode 100644
index 0000000000..a03d88d105
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_attribute.go
@@ -0,0 +1,37 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AssetModel_Attribute AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.Attribute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-attribute.html
+type AssetModel_Attribute struct {
+
+	// DefaultValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-attribute.html#cfn-iotsitewise-assetmodel-attribute-defaultvalue
+	DefaultValue *types.Value `json:"DefaultValue,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AssetModel_Attribute) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::AssetModel.Attribute"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_expressionvariable.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_expressionvariable.go
new file mode 100644
index 0000000000..65fd1ae1b2
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_expressionvariable.go
@@ -0,0 +1,42 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AssetModel_ExpressionVariable AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.ExpressionVariable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-expressionvariable.html
+type AssetModel_ExpressionVariable struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-expressionvariable.html#cfn-iotsitewise-assetmodel-expressionvariable-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-expressionvariable.html#cfn-iotsitewise-assetmodel-expressionvariable-value
+	Value *AssetModel_VariableValue `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 *AssetModel_ExpressionVariable) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::AssetModel.ExpressionVariable"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metric.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metric.go
new file mode 100644
index 0000000000..accff1006d
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metric.go
@@ -0,0 +1,47 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AssetModel_Metric AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.Metric)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-metric.html
+type AssetModel_Metric struct {
+
+	// Expression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-metric.html#cfn-iotsitewise-assetmodel-metric-expression
+	Expression *types.Value `json:"Expression,omitempty"`
+
+	// Variables AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-metric.html#cfn-iotsitewise-assetmodel-metric-variables
+	Variables []AssetModel_ExpressionVariable `json:"Variables,omitempty"`
+
+	// Window AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-metric.html#cfn-iotsitewise-assetmodel-metric-window
+	Window *AssetModel_MetricWindow `json:"Window,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AssetModel_Metric) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::AssetModel.Metric"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metricwindow.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metricwindow.go
new file mode 100644
index 0000000000..3a9011eb70
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_metricwindow.go
@@ -0,0 +1,35 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// AssetModel_MetricWindow AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.MetricWindow)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-metricwindow.html
+type AssetModel_MetricWindow struct {
+
+	// Tumbling AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-metricwindow.html#cfn-iotsitewise-assetmodel-metricwindow-tumbling
+	Tumbling *AssetModel_TumblingWindow `json:"Tumbling,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AssetModel_MetricWindow) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::AssetModel.MetricWindow"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_propertytype.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_propertytype.go
new file mode 100644
index 0000000000..690e474a16
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_propertytype.go
@@ -0,0 +1,52 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AssetModel_PropertyType AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.PropertyType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-propertytype.html
+type AssetModel_PropertyType struct {
+
+	// Attribute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-propertytype.html#cfn-iotsitewise-assetmodel-propertytype-attribute
+	Attribute *AssetModel_Attribute `json:"Attribute,omitempty"`
+
+	// Metric AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-propertytype.html#cfn-iotsitewise-assetmodel-propertytype-metric
+	Metric *AssetModel_Metric `json:"Metric,omitempty"`
+
+	// Transform AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-propertytype.html#cfn-iotsitewise-assetmodel-propertytype-transform
+	Transform *AssetModel_Transform `json:"Transform,omitempty"`
+
+	// TypeName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-propertytype.html#cfn-iotsitewise-assetmodel-propertytype-typename
+	TypeName *types.Value `json:"TypeName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AssetModel_PropertyType) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::AssetModel.PropertyType"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_transform.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_transform.go
new file mode 100644
index 0000000000..e16b52b041
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_transform.go
@@ -0,0 +1,42 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AssetModel_Transform AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.Transform)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-transform.html
+type AssetModel_Transform struct {
+
+	// Expression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-transform.html#cfn-iotsitewise-assetmodel-transform-expression
+	Expression *types.Value `json:"Expression,omitempty"`
+
+	// Variables AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-transform.html#cfn-iotsitewise-assetmodel-transform-variables
+	Variables []AssetModel_ExpressionVariable `json:"Variables,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AssetModel_Transform) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::AssetModel.Transform"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_tumblingwindow.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_tumblingwindow.go
new file mode 100644
index 0000000000..44cc11b8dd
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_tumblingwindow.go
@@ -0,0 +1,42 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AssetModel_TumblingWindow AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.TumblingWindow)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-tumblingwindow.html
+type AssetModel_TumblingWindow struct {
+
+	// Interval AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-tumblingwindow.html#cfn-iotsitewise-assetmodel-tumblingwindow-interval
+	Interval *types.Value `json:"Interval,omitempty"`
+
+	// Offset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-tumblingwindow.html#cfn-iotsitewise-assetmodel-tumblingwindow-offset
+	Offset *types.Value `json:"Offset,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AssetModel_TumblingWindow) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::AssetModel.TumblingWindow"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_variablevalue.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_variablevalue.go
new file mode 100644
index 0000000000..7f54f996f8
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-assetmodel_variablevalue.go
@@ -0,0 +1,42 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AssetModel_VariableValue AWS CloudFormation Resource (AWS::IoTSiteWise::AssetModel.VariableValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-variablevalue.html
+type AssetModel_VariableValue struct {
+
+	// HierarchyLogicalId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-variablevalue.html#cfn-iotsitewise-assetmodel-variablevalue-hierarchylogicalid
+	HierarchyLogicalId *types.Value `json:"HierarchyLogicalId,omitempty"`
+
+	// PropertyLogicalId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-assetmodel-variablevalue.html#cfn-iotsitewise-assetmodel-variablevalue-propertylogicalid
+	PropertyLogicalId *types.Value `json:"PropertyLogicalId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AssetModel_VariableValue) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::AssetModel.VariableValue"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-dashboard.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-dashboard.go
new file mode 100644
index 0000000000..270f10edf1
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-dashboard.go
@@ -0,0 +1,129 @@
+package iotsitewise
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dashboard AWS CloudFormation Resource (AWS::IoTSiteWise::Dashboard)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-dashboard.html
+type Dashboard struct {
+
+	// DashboardDefinition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-dashboard.html#cfn-iotsitewise-dashboard-dashboarddefinition
+	DashboardDefinition *types.Value `json:"DashboardDefinition,omitempty"`
+
+	// DashboardDescription AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-dashboard.html#cfn-iotsitewise-dashboard-dashboarddescription
+	DashboardDescription *types.Value `json:"DashboardDescription,omitempty"`
+
+	// DashboardName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-dashboard.html#cfn-iotsitewise-dashboard-dashboardname
+	DashboardName *types.Value `json:"DashboardName,omitempty"`
+
+	// ProjectId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-dashboard.html#cfn-iotsitewise-dashboard-projectid
+	ProjectId *types.Value `json:"ProjectId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-dashboard.html#cfn-iotsitewise-dashboard-tags
+	Tags []cloudformation.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 *Dashboard) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::Dashboard"
+}
+
+// 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 Dashboard) MarshalJSON() ([]byte, error) {
+	type Properties Dashboard
+	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 *Dashboard) UnmarshalJSON(b []byte) error {
+	type Properties Dashboard
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Dashboard(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway.go
new file mode 100644
index 0000000000..5a6735fa1f
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway.go
@@ -0,0 +1,124 @@
+package iotsitewise
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Gateway AWS CloudFormation Resource (AWS::IoTSiteWise::Gateway)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-gateway.html
+type Gateway struct {
+
+	// GatewayCapabilitySummaries AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-gateway.html#cfn-iotsitewise-gateway-gatewaycapabilitysummaries
+	GatewayCapabilitySummaries []Gateway_GatewayCapabilitySummary `json:"GatewayCapabilitySummaries,omitempty"`
+
+	// GatewayName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-gateway.html#cfn-iotsitewise-gateway-gatewayname
+	GatewayName *types.Value `json:"GatewayName,omitempty"`
+
+	// GatewayPlatform AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-gateway.html#cfn-iotsitewise-gateway-gatewayplatform
+	GatewayPlatform *Gateway_GatewayPlatform `json:"GatewayPlatform,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-gateway.html#cfn-iotsitewise-gateway-tags
+	Tags []cloudformation.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 *Gateway) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::Gateway"
+}
+
+// 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 Gateway) MarshalJSON() ([]byte, error) {
+	type Properties Gateway
+	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 *Gateway) UnmarshalJSON(b []byte) error {
+	type Properties Gateway
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Gateway(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewaycapabilitysummary.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewaycapabilitysummary.go
new file mode 100644
index 0000000000..fcbbed1038
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewaycapabilitysummary.go
@@ -0,0 +1,42 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Gateway_GatewayCapabilitySummary AWS CloudFormation Resource (AWS::IoTSiteWise::Gateway.GatewayCapabilitySummary)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-gateway-gatewaycapabilitysummary.html
+type Gateway_GatewayCapabilitySummary struct {
+
+	// CapabilityConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-gateway-gatewaycapabilitysummary.html#cfn-iotsitewise-gateway-gatewaycapabilitysummary-capabilityconfiguration
+	CapabilityConfiguration *types.Value `json:"CapabilityConfiguration,omitempty"`
+
+	// CapabilityNamespace AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-gateway-gatewaycapabilitysummary.html#cfn-iotsitewise-gateway-gatewaycapabilitysummary-capabilitynamespace
+	CapabilityNamespace *types.Value `json:"CapabilityNamespace,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Gateway_GatewayCapabilitySummary) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::Gateway.GatewayCapabilitySummary"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewayplatform.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewayplatform.go
new file mode 100644
index 0000000000..8761fbcdcd
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_gatewayplatform.go
@@ -0,0 +1,35 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Gateway_GatewayPlatform AWS CloudFormation Resource (AWS::IoTSiteWise::Gateway.GatewayPlatform)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-gateway-gatewayplatform.html
+type Gateway_GatewayPlatform struct {
+
+	// Greengrass AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-gateway-gatewayplatform.html#cfn-iotsitewise-gateway-gatewayplatform-greengrass
+	Greengrass *Gateway_Greengrass `json:"Greengrass,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Gateway_GatewayPlatform) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::Gateway.GatewayPlatform"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_greengrass.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_greengrass.go
new file mode 100644
index 0000000000..dbebf7af23
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-gateway_greengrass.go
@@ -0,0 +1,37 @@
+package iotsitewise
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Gateway_Greengrass AWS CloudFormation Resource (AWS::IoTSiteWise::Gateway.Greengrass)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-gateway-greengrass.html
+type Gateway_Greengrass struct {
+
+	// GroupArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotsitewise-gateway-greengrass.html#cfn-iotsitewise-gateway-greengrass-grouparn
+	GroupArn *types.Value `json:"GroupArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Gateway_Greengrass) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::Gateway.Greengrass"
+}
diff --git a/goformation/cloudformation/iotsitewise/aws-iotsitewise-portal.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-portal.go
new file mode 100644
index 0000000000..ce25d6ae37
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-portal.go
@@ -0,0 +1,144 @@
+package iotsitewise
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Portal AWS CloudFormation Resource (AWS::IoTSiteWise::Portal)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-portal.html
+type Portal struct {
+
+	// Alarms AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-portal.html#cfn-iotsitewise-portal-alarms
+	Alarms interface{} `json:"Alarms,omitempty"`
+
+	// NotificationSenderEmail AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-portal.html#cfn-iotsitewise-portal-notificationsenderemail
+	NotificationSenderEmail *types.Value `json:"NotificationSenderEmail,omitempty"`
+
+	// PortalAuthMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-portal.html#cfn-iotsitewise-portal-portalauthmode
+	PortalAuthMode *types.Value `json:"PortalAuthMode,omitempty"`
+
+	// PortalContactEmail AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-portal.html#cfn-iotsitewise-portal-portalcontactemail
+	PortalContactEmail *types.Value `json:"PortalContactEmail,omitempty"`
+
+	// PortalDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-portal.html#cfn-iotsitewise-portal-portaldescription
+	PortalDescription *types.Value `json:"PortalDescription,omitempty"`
+
+	// PortalName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-portal.html#cfn-iotsitewise-portal-portalname
+	PortalName *types.Value `json:"PortalName,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-portal.html#cfn-iotsitewise-portal-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-portal.html#cfn-iotsitewise-portal-tags
+	Tags []cloudformation.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 *Portal) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::Portal"
+}
+
+// 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 Portal) MarshalJSON() ([]byte, error) {
+	type Properties Portal
+	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 *Portal) UnmarshalJSON(b []byte) error {
+	type Properties Portal
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Portal(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotsitewise/aws-iotsitewise-project.go b/goformation/cloudformation/iotsitewise/aws-iotsitewise-project.go
new file mode 100644
index 0000000000..e7acfb0230
--- /dev/null
+++ b/goformation/cloudformation/iotsitewise/aws-iotsitewise-project.go
@@ -0,0 +1,129 @@
+package iotsitewise
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project AWS CloudFormation Resource (AWS::IoTSiteWise::Project)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-project.html
+type Project struct {
+
+	// AssetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-project.html#cfn-iotsitewise-project-assetids
+	AssetIds *types.Value `json:"AssetIds,omitempty"`
+
+	// PortalId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-project.html#cfn-iotsitewise-project-portalid
+	PortalId *types.Value `json:"PortalId,omitempty"`
+
+	// ProjectDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-project.html#cfn-iotsitewise-project-projectdescription
+	ProjectDescription *types.Value `json:"ProjectDescription,omitempty"`
+
+	// ProjectName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-project.html#cfn-iotsitewise-project-projectname
+	ProjectName *types.Value `json:"ProjectName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotsitewise-project.html#cfn-iotsitewise-project-tags
+	Tags []cloudformation.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 *Project) AWSCloudFormationType() string {
+	return "AWS::IoTSiteWise::Project"
+}
+
+// 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 Project) MarshalJSON() ([]byte, error) {
+	type Properties Project
+	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 *Project) UnmarshalJSON(b []byte) error {
+	type Properties Project
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Project(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate.go b/goformation/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate.go
new file mode 100644
index 0000000000..c19eb3c120
--- /dev/null
+++ b/goformation/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate.go
@@ -0,0 +1,113 @@
+package iotthingsgraph
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FlowTemplate AWS CloudFormation Resource (AWS::IoTThingsGraph::FlowTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotthingsgraph-flowtemplate.html
+type FlowTemplate struct {
+
+	// CompatibleNamespaceVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotthingsgraph-flowtemplate.html#cfn-iotthingsgraph-flowtemplate-compatiblenamespaceversion
+	CompatibleNamespaceVersion *types.Value `json:"CompatibleNamespaceVersion,omitempty"`
+
+	// Definition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotthingsgraph-flowtemplate.html#cfn-iotthingsgraph-flowtemplate-definition
+	Definition *FlowTemplate_DefinitionDocument `json:"Definition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FlowTemplate) AWSCloudFormationType() string {
+	return "AWS::IoTThingsGraph::FlowTemplate"
+}
+
+// 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 FlowTemplate) MarshalJSON() ([]byte, error) {
+	type Properties FlowTemplate
+	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 *FlowTemplate) UnmarshalJSON(b []byte) error {
+	type Properties FlowTemplate
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FlowTemplate(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate_definitiondocument.go b/goformation/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate_definitiondocument.go
new file mode 100644
index 0000000000..d3fd675286
--- /dev/null
+++ b/goformation/cloudformation/iotthingsgraph/aws-iotthingsgraph-flowtemplate_definitiondocument.go
@@ -0,0 +1,42 @@
+package iotthingsgraph
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FlowTemplate_DefinitionDocument AWS CloudFormation Resource (AWS::IoTThingsGraph::FlowTemplate.DefinitionDocument)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotthingsgraph-flowtemplate-definitiondocument.html
+type FlowTemplate_DefinitionDocument struct {
+
+	// Language AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotthingsgraph-flowtemplate-definitiondocument.html#cfn-iotthingsgraph-flowtemplate-definitiondocument-language
+	Language *types.Value `json:"Language,omitempty"`
+
+	// Text AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotthingsgraph-flowtemplate-definitiondocument.html#cfn-iotthingsgraph-flowtemplate-definitiondocument-text
+	Text *types.Value `json:"Text,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FlowTemplate_DefinitionDocument) AWSCloudFormationType() string {
+	return "AWS::IoTThingsGraph::FlowTemplate.DefinitionDocument"
+}
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-destination.go b/goformation/cloudformation/iotwireless/aws-iotwireless-destination.go
new file mode 100644
index 0000000000..9155ea1416
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-destination.go
@@ -0,0 +1,134 @@
+package iotwireless
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Destination AWS CloudFormation Resource (AWS::IoTWireless::Destination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-destination.html
+type Destination struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-destination.html#cfn-iotwireless-destination-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Expression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-destination.html#cfn-iotwireless-destination-expression
+	Expression *types.Value `json:"Expression,omitempty"`
+
+	// ExpressionType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-destination.html#cfn-iotwireless-destination-expressiontype
+	ExpressionType *types.Value `json:"ExpressionType,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-destination.html#cfn-iotwireless-destination-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-destination.html#cfn-iotwireless-destination-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-destination.html#cfn-iotwireless-destination-tags
+	Tags []cloudformation.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 *Destination) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::Destination"
+}
+
+// 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 Destination) MarshalJSON() ([]byte, error) {
+	type Properties Destination
+	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 *Destination) UnmarshalJSON(b []byte) error {
+	type Properties Destination
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Destination(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotwireless/aws-iotwireless-deviceprofile.go b/goformation/cloudformation/iotwireless/aws-iotwireless-deviceprofile.go
new file mode 100644
index 0000000000..f93cdb1e8b
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-deviceprofile.go
@@ -0,0 +1,119 @@
+package iotwireless
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeviceProfile AWS CloudFormation Resource (AWS::IoTWireless::DeviceProfile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-deviceprofile.html
+type DeviceProfile struct {
+
+	// LoRaWAN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-deviceprofile.html#cfn-iotwireless-deviceprofile-lorawan
+	LoRaWAN *DeviceProfile_LoRaWANDeviceProfile `json:"LoRaWAN,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-deviceprofile.html#cfn-iotwireless-deviceprofile-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-deviceprofile.html#cfn-iotwireless-deviceprofile-tags
+	Tags []cloudformation.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 *DeviceProfile) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::DeviceProfile"
+}
+
+// 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 DeviceProfile) MarshalJSON() ([]byte, error) {
+	type Properties DeviceProfile
+	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 *DeviceProfile) UnmarshalJSON(b []byte) error {
+	type Properties DeviceProfile
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DeviceProfile(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotwireless/aws-iotwireless-deviceprofile_lorawandeviceprofile.go b/goformation/cloudformation/iotwireless/aws-iotwireless-deviceprofile_lorawandeviceprofile.go
new file mode 100644
index 0000000000..1b84c87c83
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-deviceprofile_lorawandeviceprofile.go
@@ -0,0 +1,102 @@
+package iotwireless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeviceProfile_LoRaWANDeviceProfile AWS CloudFormation Resource (AWS::IoTWireless::DeviceProfile.LoRaWANDeviceProfile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-deviceprofile-lorawandeviceprofile.html
+type DeviceProfile_LoRaWANDeviceProfile struct {
+
+	// ClassBTimeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-deviceprofile-lorawandeviceprofile.html#cfn-iotwireless-deviceprofile-lorawandeviceprofile-classbtimeout
+	ClassBTimeout *types.Value `json:"ClassBTimeout,omitempty"`
+
+	// ClassCTimeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-deviceprofile-lorawandeviceprofile.html#cfn-iotwireless-deviceprofile-lorawandeviceprofile-classctimeout
+	ClassCTimeout *types.Value `json:"ClassCTimeout,omitempty"`
+
+	// MacVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-deviceprofile-lorawandeviceprofile.html#cfn-iotwireless-deviceprofile-lorawandeviceprofile-macversion
+	MacVersion *types.Value `json:"MacVersion,omitempty"`
+
+	// MaxDutyCycle AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-deviceprofile-lorawandeviceprofile.html#cfn-iotwireless-deviceprofile-lorawandeviceprofile-maxdutycycle
+	MaxDutyCycle *types.Value `json:"MaxDutyCycle,omitempty"`
+
+	// MaxEirp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-deviceprofile-lorawandeviceprofile.html#cfn-iotwireless-deviceprofile-lorawandeviceprofile-maxeirp
+	MaxEirp *types.Value `json:"MaxEirp,omitempty"`
+
+	// PingSlotDr AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-deviceprofile-lorawandeviceprofile.html#cfn-iotwireless-deviceprofile-lorawandeviceprofile-pingslotdr
+	PingSlotDr *types.Value `json:"PingSlotDr,omitempty"`
+
+	// PingSlotFreq AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-deviceprofile-lorawandeviceprofile.html#cfn-iotwireless-deviceprofile-lorawandeviceprofile-pingslotfreq
+	PingSlotFreq *types.Value `json:"PingSlotFreq,omitempty"`
+
+	// PingSlotPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-deviceprofile-lorawandeviceprofile.html#cfn-iotwireless-deviceprofile-lorawandeviceprofile-pingslotperiod
+	PingSlotPeriod *types.Value `json:"PingSlotPeriod,omitempty"`
+
+	// RegParamsRevision AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-deviceprofile-lorawandeviceprofile.html#cfn-iotwireless-deviceprofile-lorawandeviceprofile-regparamsrevision
+	RegParamsRevision *types.Value `json:"RegParamsRevision,omitempty"`
+
+	// RfRegion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-deviceprofile-lorawandeviceprofile.html#cfn-iotwireless-deviceprofile-lorawandeviceprofile-rfregion
+	RfRegion *types.Value `json:"RfRegion,omitempty"`
+
+	// Supports32BitFCnt AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-deviceprofile-lorawandeviceprofile.html#cfn-iotwireless-deviceprofile-lorawandeviceprofile-supports32bitfcnt
+	Supports32BitFCnt *types.Value `json:"Supports32BitFCnt,omitempty"`
+
+	// SupportsClassB AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-deviceprofile-lorawandeviceprofile.html#cfn-iotwireless-deviceprofile-lorawandeviceprofile-supportsclassb
+	SupportsClassB *types.Value `json:"SupportsClassB,omitempty"`
+
+	// SupportsClassC AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-deviceprofile-lorawandeviceprofile.html#cfn-iotwireless-deviceprofile-lorawandeviceprofile-supportsclassc
+	SupportsClassC *types.Value `json:"SupportsClassC,omitempty"`
+
+	// SupportsJoin AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-deviceprofile-lorawandeviceprofile.html#cfn-iotwireless-deviceprofile-lorawandeviceprofile-supportsjoin
+	SupportsJoin *types.Value `json:"SupportsJoin,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeviceProfile_LoRaWANDeviceProfile) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::DeviceProfile.LoRaWANDeviceProfile"
+}
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-fuotatask.go b/goformation/cloudformation/iotwireless/aws-iotwireless-fuotatask.go
new file mode 100644
index 0000000000..ff119985bc
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-fuotatask.go
@@ -0,0 +1,154 @@
+package iotwireless
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// FuotaTask AWS CloudFormation Resource (AWS::IoTWireless::FuotaTask)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-fuotatask.html
+type FuotaTask struct {
+
+	// AssociateMulticastGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-fuotatask.html#cfn-iotwireless-fuotatask-associatemulticastgroup
+	AssociateMulticastGroup *types.Value `json:"AssociateMulticastGroup,omitempty"`
+
+	// AssociateWirelessDevice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-fuotatask.html#cfn-iotwireless-fuotatask-associatewirelessdevice
+	AssociateWirelessDevice *types.Value `json:"AssociateWirelessDevice,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-fuotatask.html#cfn-iotwireless-fuotatask-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DisassociateMulticastGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-fuotatask.html#cfn-iotwireless-fuotatask-disassociatemulticastgroup
+	DisassociateMulticastGroup *types.Value `json:"DisassociateMulticastGroup,omitempty"`
+
+	// DisassociateWirelessDevice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-fuotatask.html#cfn-iotwireless-fuotatask-disassociatewirelessdevice
+	DisassociateWirelessDevice *types.Value `json:"DisassociateWirelessDevice,omitempty"`
+
+	// FirmwareUpdateImage AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-fuotatask.html#cfn-iotwireless-fuotatask-firmwareupdateimage
+	FirmwareUpdateImage *types.Value `json:"FirmwareUpdateImage,omitempty"`
+
+	// FirmwareUpdateRole AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-fuotatask.html#cfn-iotwireless-fuotatask-firmwareupdaterole
+	FirmwareUpdateRole *types.Value `json:"FirmwareUpdateRole,omitempty"`
+
+	// LoRaWAN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-fuotatask.html#cfn-iotwireless-fuotatask-lorawan
+	LoRaWAN *FuotaTask_LoRaWAN `json:"LoRaWAN,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-fuotatask.html#cfn-iotwireless-fuotatask-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-fuotatask.html#cfn-iotwireless-fuotatask-tags
+	Tags []cloudformation.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 *FuotaTask) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::FuotaTask"
+}
+
+// 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 FuotaTask) MarshalJSON() ([]byte, error) {
+	type Properties FuotaTask
+	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 *FuotaTask) UnmarshalJSON(b []byte) error {
+	type Properties FuotaTask
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FuotaTask(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotwireless/aws-iotwireless-fuotatask_lorawan.go b/goformation/cloudformation/iotwireless/aws-iotwireless-fuotatask_lorawan.go
new file mode 100644
index 0000000000..b3a4ce808b
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-fuotatask_lorawan.go
@@ -0,0 +1,42 @@
+package iotwireless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FuotaTask_LoRaWAN AWS CloudFormation Resource (AWS::IoTWireless::FuotaTask.LoRaWAN)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-fuotatask-lorawan.html
+type FuotaTask_LoRaWAN struct {
+
+	// RfRegion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-fuotatask-lorawan.html#cfn-iotwireless-fuotatask-lorawan-rfregion
+	RfRegion *types.Value `json:"RfRegion,omitempty"`
+
+	// StartTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-fuotatask-lorawan.html#cfn-iotwireless-fuotatask-lorawan-starttime
+	StartTime *types.Value `json:"StartTime,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FuotaTask_LoRaWAN) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::FuotaTask.LoRaWAN"
+}
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-multicastgroup.go b/goformation/cloudformation/iotwireless/aws-iotwireless-multicastgroup.go
new file mode 100644
index 0000000000..967b5fe3b8
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-multicastgroup.go
@@ -0,0 +1,134 @@
+package iotwireless
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// MulticastGroup AWS CloudFormation Resource (AWS::IoTWireless::MulticastGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-multicastgroup.html
+type MulticastGroup struct {
+
+	// AssociateWirelessDevice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-multicastgroup.html#cfn-iotwireless-multicastgroup-associatewirelessdevice
+	AssociateWirelessDevice *types.Value `json:"AssociateWirelessDevice,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-multicastgroup.html#cfn-iotwireless-multicastgroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DisassociateWirelessDevice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-multicastgroup.html#cfn-iotwireless-multicastgroup-disassociatewirelessdevice
+	DisassociateWirelessDevice *types.Value `json:"DisassociateWirelessDevice,omitempty"`
+
+	// LoRaWAN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-multicastgroup.html#cfn-iotwireless-multicastgroup-lorawan
+	LoRaWAN *MulticastGroup_LoRaWAN `json:"LoRaWAN,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-multicastgroup.html#cfn-iotwireless-multicastgroup-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-multicastgroup.html#cfn-iotwireless-multicastgroup-tags
+	Tags []cloudformation.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 *MulticastGroup) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::MulticastGroup"
+}
+
+// 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 MulticastGroup) MarshalJSON() ([]byte, error) {
+	type Properties MulticastGroup
+	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 *MulticastGroup) UnmarshalJSON(b []byte) error {
+	type Properties MulticastGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = MulticastGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotwireless/aws-iotwireless-multicastgroup_lorawan.go b/goformation/cloudformation/iotwireless/aws-iotwireless-multicastgroup_lorawan.go
new file mode 100644
index 0000000000..1501a0397a
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-multicastgroup_lorawan.go
@@ -0,0 +1,52 @@
+package iotwireless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MulticastGroup_LoRaWAN AWS CloudFormation Resource (AWS::IoTWireless::MulticastGroup.LoRaWAN)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-multicastgroup-lorawan.html
+type MulticastGroup_LoRaWAN struct {
+
+	// DlClass AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-multicastgroup-lorawan.html#cfn-iotwireless-multicastgroup-lorawan-dlclass
+	DlClass *types.Value `json:"DlClass,omitempty"`
+
+	// NumberOfDevicesInGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-multicastgroup-lorawan.html#cfn-iotwireless-multicastgroup-lorawan-numberofdevicesingroup
+	NumberOfDevicesInGroup *types.Value `json:"NumberOfDevicesInGroup,omitempty"`
+
+	// NumberOfDevicesRequested AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-multicastgroup-lorawan.html#cfn-iotwireless-multicastgroup-lorawan-numberofdevicesrequested
+	NumberOfDevicesRequested *types.Value `json:"NumberOfDevicesRequested,omitempty"`
+
+	// RfRegion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-multicastgroup-lorawan.html#cfn-iotwireless-multicastgroup-lorawan-rfregion
+	RfRegion *types.Value `json:"RfRegion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MulticastGroup_LoRaWAN) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::MulticastGroup.LoRaWAN"
+}
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount.go b/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount.go
new file mode 100644
index 0000000000..17737b7904
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount.go
@@ -0,0 +1,139 @@
+package iotwireless
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// PartnerAccount AWS CloudFormation Resource (AWS::IoTWireless::PartnerAccount)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-partneraccount.html
+type PartnerAccount struct {
+
+	// AccountLinked AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-partneraccount.html#cfn-iotwireless-partneraccount-accountlinked
+	AccountLinked *types.Value `json:"AccountLinked,omitempty"`
+
+	// Fingerprint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-partneraccount.html#cfn-iotwireless-partneraccount-fingerprint
+	Fingerprint *types.Value `json:"Fingerprint,omitempty"`
+
+	// PartnerAccountId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-partneraccount.html#cfn-iotwireless-partneraccount-partneraccountid
+	PartnerAccountId *types.Value `json:"PartnerAccountId,omitempty"`
+
+	// PartnerType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-partneraccount.html#cfn-iotwireless-partneraccount-partnertype
+	PartnerType *types.Value `json:"PartnerType,omitempty"`
+
+	// Sidewalk AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-partneraccount.html#cfn-iotwireless-partneraccount-sidewalk
+	Sidewalk *PartnerAccount_SidewalkAccountInfo `json:"Sidewalk,omitempty"`
+
+	// SidewalkUpdate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-partneraccount.html#cfn-iotwireless-partneraccount-sidewalkupdate
+	SidewalkUpdate *PartnerAccount_SidewalkUpdateAccount `json:"SidewalkUpdate,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-partneraccount.html#cfn-iotwireless-partneraccount-tags
+	Tags []cloudformation.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 *PartnerAccount) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::PartnerAccount"
+}
+
+// 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 PartnerAccount) MarshalJSON() ([]byte, error) {
+	type Properties PartnerAccount
+	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 *PartnerAccount) UnmarshalJSON(b []byte) error {
+	type Properties PartnerAccount
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PartnerAccount(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkaccountinfo.go b/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkaccountinfo.go
new file mode 100644
index 0000000000..129e9e2a31
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkaccountinfo.go
@@ -0,0 +1,37 @@
+package iotwireless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PartnerAccount_SidewalkAccountInfo AWS CloudFormation Resource (AWS::IoTWireless::PartnerAccount.SidewalkAccountInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-partneraccount-sidewalkaccountinfo.html
+type PartnerAccount_SidewalkAccountInfo struct {
+
+	// AppServerPrivateKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-partneraccount-sidewalkaccountinfo.html#cfn-iotwireless-partneraccount-sidewalkaccountinfo-appserverprivatekey
+	AppServerPrivateKey *types.Value `json:"AppServerPrivateKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PartnerAccount_SidewalkAccountInfo) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::PartnerAccount.SidewalkAccountInfo"
+}
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkupdateaccount.go b/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkupdateaccount.go
new file mode 100644
index 0000000000..75e094b632
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-partneraccount_sidewalkupdateaccount.go
@@ -0,0 +1,37 @@
+package iotwireless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PartnerAccount_SidewalkUpdateAccount AWS CloudFormation Resource (AWS::IoTWireless::PartnerAccount.SidewalkUpdateAccount)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-partneraccount-sidewalkupdateaccount.html
+type PartnerAccount_SidewalkUpdateAccount struct {
+
+	// AppServerPrivateKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-partneraccount-sidewalkupdateaccount.html#cfn-iotwireless-partneraccount-sidewalkupdateaccount-appserverprivatekey
+	AppServerPrivateKey *types.Value `json:"AppServerPrivateKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PartnerAccount_SidewalkUpdateAccount) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::PartnerAccount.SidewalkUpdateAccount"
+}
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-serviceprofile.go b/goformation/cloudformation/iotwireless/aws-iotwireless-serviceprofile.go
new file mode 100644
index 0000000000..a439d777db
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-serviceprofile.go
@@ -0,0 +1,119 @@
+package iotwireless
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ServiceProfile AWS CloudFormation Resource (AWS::IoTWireless::ServiceProfile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-serviceprofile.html
+type ServiceProfile struct {
+
+	// LoRaWAN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-serviceprofile.html#cfn-iotwireless-serviceprofile-lorawan
+	LoRaWAN *ServiceProfile_LoRaWANServiceProfile `json:"LoRaWAN,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-serviceprofile.html#cfn-iotwireless-serviceprofile-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-serviceprofile.html#cfn-iotwireless-serviceprofile-tags
+	Tags []cloudformation.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 *ServiceProfile) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::ServiceProfile"
+}
+
+// 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 ServiceProfile) MarshalJSON() ([]byte, error) {
+	type Properties ServiceProfile
+	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 *ServiceProfile) UnmarshalJSON(b []byte) error {
+	type Properties ServiceProfile
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ServiceProfile(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotwireless/aws-iotwireless-serviceprofile_lorawanserviceprofile.go b/goformation/cloudformation/iotwireless/aws-iotwireless-serviceprofile_lorawanserviceprofile.go
new file mode 100644
index 0000000000..5991f7388b
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-serviceprofile_lorawanserviceprofile.go
@@ -0,0 +1,127 @@
+package iotwireless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ServiceProfile_LoRaWANServiceProfile AWS CloudFormation Resource (AWS::IoTWireless::ServiceProfile.LoRaWANServiceProfile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-serviceprofile-lorawanserviceprofile.html
+type ServiceProfile_LoRaWANServiceProfile struct {
+
+	// AddGwMetadata AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-serviceprofile-lorawanserviceprofile.html#cfn-iotwireless-serviceprofile-lorawanserviceprofile-addgwmetadata
+	AddGwMetadata *types.Value `json:"AddGwMetadata,omitempty"`
+
+	// ChannelMask AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-serviceprofile-lorawanserviceprofile.html#cfn-iotwireless-serviceprofile-lorawanserviceprofile-channelmask
+	ChannelMask *types.Value `json:"ChannelMask,omitempty"`
+
+	// DevStatusReqFreq AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-serviceprofile-lorawanserviceprofile.html#cfn-iotwireless-serviceprofile-lorawanserviceprofile-devstatusreqfreq
+	DevStatusReqFreq *types.Value `json:"DevStatusReqFreq,omitempty"`
+
+	// DlBucketSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-serviceprofile-lorawanserviceprofile.html#cfn-iotwireless-serviceprofile-lorawanserviceprofile-dlbucketsize
+	DlBucketSize *types.Value `json:"DlBucketSize,omitempty"`
+
+	// DlRate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-serviceprofile-lorawanserviceprofile.html#cfn-iotwireless-serviceprofile-lorawanserviceprofile-dlrate
+	DlRate *types.Value `json:"DlRate,omitempty"`
+
+	// DlRatePolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-serviceprofile-lorawanserviceprofile.html#cfn-iotwireless-serviceprofile-lorawanserviceprofile-dlratepolicy
+	DlRatePolicy *types.Value `json:"DlRatePolicy,omitempty"`
+
+	// DrMax AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-serviceprofile-lorawanserviceprofile.html#cfn-iotwireless-serviceprofile-lorawanserviceprofile-drmax
+	DrMax *types.Value `json:"DrMax,omitempty"`
+
+	// DrMin AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-serviceprofile-lorawanserviceprofile.html#cfn-iotwireless-serviceprofile-lorawanserviceprofile-drmin
+	DrMin *types.Value `json:"DrMin,omitempty"`
+
+	// HrAllowed AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-serviceprofile-lorawanserviceprofile.html#cfn-iotwireless-serviceprofile-lorawanserviceprofile-hrallowed
+	HrAllowed *types.Value `json:"HrAllowed,omitempty"`
+
+	// MinGwDiversity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-serviceprofile-lorawanserviceprofile.html#cfn-iotwireless-serviceprofile-lorawanserviceprofile-mingwdiversity
+	MinGwDiversity *types.Value `json:"MinGwDiversity,omitempty"`
+
+	// NwkGeoLoc AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-serviceprofile-lorawanserviceprofile.html#cfn-iotwireless-serviceprofile-lorawanserviceprofile-nwkgeoloc
+	NwkGeoLoc *types.Value `json:"NwkGeoLoc,omitempty"`
+
+	// PrAllowed AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-serviceprofile-lorawanserviceprofile.html#cfn-iotwireless-serviceprofile-lorawanserviceprofile-prallowed
+	PrAllowed *types.Value `json:"PrAllowed,omitempty"`
+
+	// RaAllowed AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-serviceprofile-lorawanserviceprofile.html#cfn-iotwireless-serviceprofile-lorawanserviceprofile-raallowed
+	RaAllowed *types.Value `json:"RaAllowed,omitempty"`
+
+	// ReportDevStatusBattery AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-serviceprofile-lorawanserviceprofile.html#cfn-iotwireless-serviceprofile-lorawanserviceprofile-reportdevstatusbattery
+	ReportDevStatusBattery *types.Value `json:"ReportDevStatusBattery,omitempty"`
+
+	// ReportDevStatusMargin AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-serviceprofile-lorawanserviceprofile.html#cfn-iotwireless-serviceprofile-lorawanserviceprofile-reportdevstatusmargin
+	ReportDevStatusMargin *types.Value `json:"ReportDevStatusMargin,omitempty"`
+
+	// TargetPer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-serviceprofile-lorawanserviceprofile.html#cfn-iotwireless-serviceprofile-lorawanserviceprofile-targetper
+	TargetPer *types.Value `json:"TargetPer,omitempty"`
+
+	// UlBucketSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-serviceprofile-lorawanserviceprofile.html#cfn-iotwireless-serviceprofile-lorawanserviceprofile-ulbucketsize
+	UlBucketSize *types.Value `json:"UlBucketSize,omitempty"`
+
+	// UlRate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-serviceprofile-lorawanserviceprofile.html#cfn-iotwireless-serviceprofile-lorawanserviceprofile-ulrate
+	UlRate *types.Value `json:"UlRate,omitempty"`
+
+	// UlRatePolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-serviceprofile-lorawanserviceprofile.html#cfn-iotwireless-serviceprofile-lorawanserviceprofile-ulratepolicy
+	UlRatePolicy *types.Value `json:"UlRatePolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ServiceProfile_LoRaWANServiceProfile) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::ServiceProfile.LoRaWANServiceProfile"
+}
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition.go b/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition.go
new file mode 100644
index 0000000000..a28d245876
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition.go
@@ -0,0 +1,134 @@
+package iotwireless
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition AWS CloudFormation Resource (AWS::IoTWireless::TaskDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-taskdefinition.html
+type TaskDefinition struct {
+
+	// AutoCreateTasks AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-taskdefinition.html#cfn-iotwireless-taskdefinition-autocreatetasks
+	AutoCreateTasks *types.Value `json:"AutoCreateTasks"`
+
+	// LoRaWANUpdateGatewayTaskEntry AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-taskdefinition.html#cfn-iotwireless-taskdefinition-lorawanupdategatewaytaskentry
+	LoRaWANUpdateGatewayTaskEntry *TaskDefinition_LoRaWANUpdateGatewayTaskEntry `json:"LoRaWANUpdateGatewayTaskEntry,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-taskdefinition.html#cfn-iotwireless-taskdefinition-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-taskdefinition.html#cfn-iotwireless-taskdefinition-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TaskDefinitionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-taskdefinition.html#cfn-iotwireless-taskdefinition-taskdefinitiontype
+	TaskDefinitionType *types.Value `json:"TaskDefinitionType,omitempty"`
+
+	// Update AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-taskdefinition.html#cfn-iotwireless-taskdefinition-update
+	Update *TaskDefinition_UpdateWirelessGatewayTaskCreate `json:"Update,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::TaskDefinition"
+}
+
+// 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 TaskDefinition) MarshalJSON() ([]byte, error) {
+	type Properties TaskDefinition
+	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 *TaskDefinition) UnmarshalJSON(b []byte) error {
+	type Properties TaskDefinition
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TaskDefinition(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawangatewayversion.go b/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawangatewayversion.go
new file mode 100644
index 0000000000..de48d6b23c
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawangatewayversion.go
@@ -0,0 +1,47 @@
+package iotwireless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_LoRaWANGatewayVersion AWS CloudFormation Resource (AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-taskdefinition-lorawangatewayversion.html
+type TaskDefinition_LoRaWANGatewayVersion struct {
+
+	// Model AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-taskdefinition-lorawangatewayversion.html#cfn-iotwireless-taskdefinition-lorawangatewayversion-model
+	Model *types.Value `json:"Model,omitempty"`
+
+	// PackageVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-taskdefinition-lorawangatewayversion.html#cfn-iotwireless-taskdefinition-lorawangatewayversion-packageversion
+	PackageVersion *types.Value `json:"PackageVersion,omitempty"`
+
+	// Station AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-taskdefinition-lorawangatewayversion.html#cfn-iotwireless-taskdefinition-lorawangatewayversion-station
+	Station *types.Value `json:"Station,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LoRaWANGatewayVersion) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion"
+}
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskcreate.go b/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskcreate.go
new file mode 100644
index 0000000000..86e097999f
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskcreate.go
@@ -0,0 +1,52 @@
+package iotwireless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_LoRaWANUpdateGatewayTaskCreate AWS CloudFormation Resource (AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskCreate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-taskdefinition-lorawanupdategatewaytaskcreate.html
+type TaskDefinition_LoRaWANUpdateGatewayTaskCreate struct {
+
+	// CurrentVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-taskdefinition-lorawanupdategatewaytaskcreate.html#cfn-iotwireless-taskdefinition-lorawanupdategatewaytaskcreate-currentversion
+	CurrentVersion *TaskDefinition_LoRaWANGatewayVersion `json:"CurrentVersion,omitempty"`
+
+	// SigKeyCrc AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-taskdefinition-lorawanupdategatewaytaskcreate.html#cfn-iotwireless-taskdefinition-lorawanupdategatewaytaskcreate-sigkeycrc
+	SigKeyCrc *types.Value `json:"SigKeyCrc,omitempty"`
+
+	// UpdateSignature AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-taskdefinition-lorawanupdategatewaytaskcreate.html#cfn-iotwireless-taskdefinition-lorawanupdategatewaytaskcreate-updatesignature
+	UpdateSignature *types.Value `json:"UpdateSignature,omitempty"`
+
+	// UpdateVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-taskdefinition-lorawanupdategatewaytaskcreate.html#cfn-iotwireless-taskdefinition-lorawanupdategatewaytaskcreate-updateversion
+	UpdateVersion *TaskDefinition_LoRaWANGatewayVersion `json:"UpdateVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LoRaWANUpdateGatewayTaskCreate) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskCreate"
+}
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskentry.go b/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskentry.go
new file mode 100644
index 0000000000..825402c757
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_lorawanupdategatewaytaskentry.go
@@ -0,0 +1,40 @@
+package iotwireless
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_LoRaWANUpdateGatewayTaskEntry AWS CloudFormation Resource (AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskEntry)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-taskdefinition-lorawanupdategatewaytaskentry.html
+type TaskDefinition_LoRaWANUpdateGatewayTaskEntry struct {
+
+	// CurrentVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-taskdefinition-lorawanupdategatewaytaskentry.html#cfn-iotwireless-taskdefinition-lorawanupdategatewaytaskentry-currentversion
+	CurrentVersion *TaskDefinition_LoRaWANGatewayVersion `json:"CurrentVersion,omitempty"`
+
+	// UpdateVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-taskdefinition-lorawanupdategatewaytaskentry.html#cfn-iotwireless-taskdefinition-lorawanupdategatewaytaskentry-updateversion
+	UpdateVersion *TaskDefinition_LoRaWANGatewayVersion `json:"UpdateVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LoRaWANUpdateGatewayTaskEntry) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskEntry"
+}
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_updatewirelessgatewaytaskcreate.go b/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_updatewirelessgatewaytaskcreate.go
new file mode 100644
index 0000000000..8cd818d285
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-taskdefinition_updatewirelessgatewaytaskcreate.go
@@ -0,0 +1,47 @@
+package iotwireless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TaskDefinition_UpdateWirelessGatewayTaskCreate AWS CloudFormation Resource (AWS::IoTWireless::TaskDefinition.UpdateWirelessGatewayTaskCreate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-taskdefinition-updatewirelessgatewaytaskcreate.html
+type TaskDefinition_UpdateWirelessGatewayTaskCreate struct {
+
+	// LoRaWAN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-taskdefinition-updatewirelessgatewaytaskcreate.html#cfn-iotwireless-taskdefinition-updatewirelessgatewaytaskcreate-lorawan
+	LoRaWAN *TaskDefinition_LoRaWANUpdateGatewayTaskCreate `json:"LoRaWAN,omitempty"`
+
+	// UpdateDataRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-taskdefinition-updatewirelessgatewaytaskcreate.html#cfn-iotwireless-taskdefinition-updatewirelessgatewaytaskcreate-updatedatarole
+	UpdateDataRole *types.Value `json:"UpdateDataRole,omitempty"`
+
+	// UpdateDataSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-taskdefinition-updatewirelessgatewaytaskcreate.html#cfn-iotwireless-taskdefinition-updatewirelessgatewaytaskcreate-updatedatasource
+	UpdateDataSource *types.Value `json:"UpdateDataSource,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_UpdateWirelessGatewayTaskCreate) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::TaskDefinition.UpdateWirelessGatewayTaskCreate"
+}
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice.go b/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice.go
new file mode 100644
index 0000000000..5d9b4ba8f5
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice.go
@@ -0,0 +1,144 @@
+package iotwireless
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// WirelessDevice AWS CloudFormation Resource (AWS::IoTWireless::WirelessDevice)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-wirelessdevice.html
+type WirelessDevice struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-wirelessdevice.html#cfn-iotwireless-wirelessdevice-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DestinationName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-wirelessdevice.html#cfn-iotwireless-wirelessdevice-destinationname
+	DestinationName *types.Value `json:"DestinationName,omitempty"`
+
+	// LastUplinkReceivedAt AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-wirelessdevice.html#cfn-iotwireless-wirelessdevice-lastuplinkreceivedat
+	LastUplinkReceivedAt *types.Value `json:"LastUplinkReceivedAt,omitempty"`
+
+	// LoRaWAN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-wirelessdevice.html#cfn-iotwireless-wirelessdevice-lorawan
+	LoRaWAN *WirelessDevice_LoRaWANDevice `json:"LoRaWAN,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-wirelessdevice.html#cfn-iotwireless-wirelessdevice-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-wirelessdevice.html#cfn-iotwireless-wirelessdevice-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// ThingArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-wirelessdevice.html#cfn-iotwireless-wirelessdevice-thingarn
+	ThingArn *types.Value `json:"ThingArn,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-wirelessdevice.html#cfn-iotwireless-wirelessdevice-type
+	Type *types.Value `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 *WirelessDevice) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::WirelessDevice"
+}
+
+// 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 WirelessDevice) MarshalJSON() ([]byte, error) {
+	type Properties WirelessDevice
+	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 *WirelessDevice) UnmarshalJSON(b []byte) error {
+	type Properties WirelessDevice
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = WirelessDevice(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv10x.go b/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv10x.go
new file mode 100644
index 0000000000..d57ca07c65
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv10x.go
@@ -0,0 +1,42 @@
+package iotwireless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WirelessDevice_AbpV10x AWS CloudFormation Resource (AWS::IoTWireless::WirelessDevice.AbpV10x)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-abpv10x.html
+type WirelessDevice_AbpV10x struct {
+
+	// DevAddr AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-abpv10x.html#cfn-iotwireless-wirelessdevice-abpv10x-devaddr
+	DevAddr *types.Value `json:"DevAddr,omitempty"`
+
+	// SessionKeys AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-abpv10x.html#cfn-iotwireless-wirelessdevice-abpv10x-sessionkeys
+	SessionKeys *WirelessDevice_SessionKeysAbpV10x `json:"SessionKeys,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WirelessDevice_AbpV10x) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::WirelessDevice.AbpV10x"
+}
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv11.go b/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv11.go
new file mode 100644
index 0000000000..54ac32191d
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_abpv11.go
@@ -0,0 +1,42 @@
+package iotwireless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WirelessDevice_AbpV11 AWS CloudFormation Resource (AWS::IoTWireless::WirelessDevice.AbpV11)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-abpv11.html
+type WirelessDevice_AbpV11 struct {
+
+	// DevAddr AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-abpv11.html#cfn-iotwireless-wirelessdevice-abpv11-devaddr
+	DevAddr *types.Value `json:"DevAddr,omitempty"`
+
+	// SessionKeys AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-abpv11.html#cfn-iotwireless-wirelessdevice-abpv11-sessionkeys
+	SessionKeys *WirelessDevice_SessionKeysAbpV11 `json:"SessionKeys,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WirelessDevice_AbpV11) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::WirelessDevice.AbpV11"
+}
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_lorawandevice.go b/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_lorawandevice.go
new file mode 100644
index 0000000000..534d5b3653
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_lorawandevice.go
@@ -0,0 +1,67 @@
+package iotwireless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WirelessDevice_LoRaWANDevice AWS CloudFormation Resource (AWS::IoTWireless::WirelessDevice.LoRaWANDevice)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-lorawandevice.html
+type WirelessDevice_LoRaWANDevice struct {
+
+	// AbpV10x AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-lorawandevice.html#cfn-iotwireless-wirelessdevice-lorawandevice-abpv10x
+	AbpV10x *WirelessDevice_AbpV10x `json:"AbpV10x,omitempty"`
+
+	// AbpV11 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-lorawandevice.html#cfn-iotwireless-wirelessdevice-lorawandevice-abpv11
+	AbpV11 *WirelessDevice_AbpV11 `json:"AbpV11,omitempty"`
+
+	// DevEui AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-lorawandevice.html#cfn-iotwireless-wirelessdevice-lorawandevice-deveui
+	DevEui *types.Value `json:"DevEui,omitempty"`
+
+	// DeviceProfileId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-lorawandevice.html#cfn-iotwireless-wirelessdevice-lorawandevice-deviceprofileid
+	DeviceProfileId *types.Value `json:"DeviceProfileId,omitempty"`
+
+	// OtaaV10x AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-lorawandevice.html#cfn-iotwireless-wirelessdevice-lorawandevice-otaav10x
+	OtaaV10x *WirelessDevice_OtaaV10x `json:"OtaaV10x,omitempty"`
+
+	// OtaaV11 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-lorawandevice.html#cfn-iotwireless-wirelessdevice-lorawandevice-otaav11
+	OtaaV11 *WirelessDevice_OtaaV11 `json:"OtaaV11,omitempty"`
+
+	// ServiceProfileId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-lorawandevice.html#cfn-iotwireless-wirelessdevice-lorawandevice-serviceprofileid
+	ServiceProfileId *types.Value `json:"ServiceProfileId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WirelessDevice_LoRaWANDevice) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::WirelessDevice.LoRaWANDevice"
+}
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav10x.go b/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav10x.go
new file mode 100644
index 0000000000..7ac73675d3
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav10x.go
@@ -0,0 +1,42 @@
+package iotwireless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WirelessDevice_OtaaV10x AWS CloudFormation Resource (AWS::IoTWireless::WirelessDevice.OtaaV10x)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-otaav10x.html
+type WirelessDevice_OtaaV10x struct {
+
+	// AppEui AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-otaav10x.html#cfn-iotwireless-wirelessdevice-otaav10x-appeui
+	AppEui *types.Value `json:"AppEui,omitempty"`
+
+	// AppKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-otaav10x.html#cfn-iotwireless-wirelessdevice-otaav10x-appkey
+	AppKey *types.Value `json:"AppKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WirelessDevice_OtaaV10x) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::WirelessDevice.OtaaV10x"
+}
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav11.go b/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav11.go
new file mode 100644
index 0000000000..c52864affe
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_otaav11.go
@@ -0,0 +1,47 @@
+package iotwireless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WirelessDevice_OtaaV11 AWS CloudFormation Resource (AWS::IoTWireless::WirelessDevice.OtaaV11)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-otaav11.html
+type WirelessDevice_OtaaV11 struct {
+
+	// AppKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-otaav11.html#cfn-iotwireless-wirelessdevice-otaav11-appkey
+	AppKey *types.Value `json:"AppKey,omitempty"`
+
+	// JoinEui AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-otaav11.html#cfn-iotwireless-wirelessdevice-otaav11-joineui
+	JoinEui *types.Value `json:"JoinEui,omitempty"`
+
+	// NwkKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-otaav11.html#cfn-iotwireless-wirelessdevice-otaav11-nwkkey
+	NwkKey *types.Value `json:"NwkKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WirelessDevice_OtaaV11) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::WirelessDevice.OtaaV11"
+}
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv10x.go b/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv10x.go
new file mode 100644
index 0000000000..04765c9d52
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv10x.go
@@ -0,0 +1,42 @@
+package iotwireless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WirelessDevice_SessionKeysAbpV10x AWS CloudFormation Resource (AWS::IoTWireless::WirelessDevice.SessionKeysAbpV10x)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-sessionkeysabpv10x.html
+type WirelessDevice_SessionKeysAbpV10x struct {
+
+	// AppSKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-sessionkeysabpv10x.html#cfn-iotwireless-wirelessdevice-sessionkeysabpv10x-appskey
+	AppSKey *types.Value `json:"AppSKey,omitempty"`
+
+	// NwkSKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-sessionkeysabpv10x.html#cfn-iotwireless-wirelessdevice-sessionkeysabpv10x-nwkskey
+	NwkSKey *types.Value `json:"NwkSKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WirelessDevice_SessionKeysAbpV10x) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::WirelessDevice.SessionKeysAbpV10x"
+}
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv11.go b/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv11.go
new file mode 100644
index 0000000000..5c7586faf6
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessdevice_sessionkeysabpv11.go
@@ -0,0 +1,52 @@
+package iotwireless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WirelessDevice_SessionKeysAbpV11 AWS CloudFormation Resource (AWS::IoTWireless::WirelessDevice.SessionKeysAbpV11)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-sessionkeysabpv11.html
+type WirelessDevice_SessionKeysAbpV11 struct {
+
+	// AppSKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-sessionkeysabpv11.html#cfn-iotwireless-wirelessdevice-sessionkeysabpv11-appskey
+	AppSKey *types.Value `json:"AppSKey,omitempty"`
+
+	// FNwkSIntKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-sessionkeysabpv11.html#cfn-iotwireless-wirelessdevice-sessionkeysabpv11-fnwksintkey
+	FNwkSIntKey *types.Value `json:"FNwkSIntKey,omitempty"`
+
+	// NwkSEncKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-sessionkeysabpv11.html#cfn-iotwireless-wirelessdevice-sessionkeysabpv11-nwksenckey
+	NwkSEncKey *types.Value `json:"NwkSEncKey,omitempty"`
+
+	// SNwkSIntKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessdevice-sessionkeysabpv11.html#cfn-iotwireless-wirelessdevice-sessionkeysabpv11-snwksintkey
+	SNwkSIntKey *types.Value `json:"SNwkSIntKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WirelessDevice_SessionKeysAbpV11) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::WirelessDevice.SessionKeysAbpV11"
+}
diff --git a/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessgateway.go b/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessgateway.go
new file mode 100644
index 0000000000..7ed81d28e9
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessgateway.go
@@ -0,0 +1,134 @@
+package iotwireless
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// WirelessGateway AWS CloudFormation Resource (AWS::IoTWireless::WirelessGateway)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-wirelessgateway.html
+type WirelessGateway struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-wirelessgateway.html#cfn-iotwireless-wirelessgateway-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// LastUplinkReceivedAt AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-wirelessgateway.html#cfn-iotwireless-wirelessgateway-lastuplinkreceivedat
+	LastUplinkReceivedAt *types.Value `json:"LastUplinkReceivedAt,omitempty"`
+
+	// LoRaWAN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-wirelessgateway.html#cfn-iotwireless-wirelessgateway-lorawan
+	LoRaWAN *WirelessGateway_LoRaWANGateway `json:"LoRaWAN,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-wirelessgateway.html#cfn-iotwireless-wirelessgateway-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-wirelessgateway.html#cfn-iotwireless-wirelessgateway-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// ThingArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-iotwireless-wirelessgateway.html#cfn-iotwireless-wirelessgateway-thingarn
+	ThingArn *types.Value `json:"ThingArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WirelessGateway) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::WirelessGateway"
+}
+
+// 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 WirelessGateway) MarshalJSON() ([]byte, error) {
+	type Properties WirelessGateway
+	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 *WirelessGateway) UnmarshalJSON(b []byte) error {
+	type Properties WirelessGateway
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = WirelessGateway(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessgateway_lorawangateway.go b/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessgateway_lorawangateway.go
new file mode 100644
index 0000000000..777f738fdf
--- /dev/null
+++ b/goformation/cloudformation/iotwireless/aws-iotwireless-wirelessgateway_lorawangateway.go
@@ -0,0 +1,42 @@
+package iotwireless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WirelessGateway_LoRaWANGateway AWS CloudFormation Resource (AWS::IoTWireless::WirelessGateway.LoRaWANGateway)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessgateway-lorawangateway.html
+type WirelessGateway_LoRaWANGateway struct {
+
+	// GatewayEui AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessgateway-lorawangateway.html#cfn-iotwireless-wirelessgateway-lorawangateway-gatewayeui
+	GatewayEui *types.Value `json:"GatewayEui,omitempty"`
+
+	// RfRegion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-iotwireless-wirelessgateway-lorawangateway.html#cfn-iotwireless-wirelessgateway-lorawangateway-rfregion
+	RfRegion *types.Value `json:"RfRegion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WirelessGateway_LoRaWANGateway) AWSCloudFormationType() string {
+	return "AWS::IoTWireless::WirelessGateway.LoRaWANGateway"
+}
diff --git a/goformation/cloudformation/ivs/aws-ivs-channel.go b/goformation/cloudformation/ivs/aws-ivs-channel.go
new file mode 100644
index 0000000000..98590fb800
--- /dev/null
+++ b/goformation/cloudformation/ivs/aws-ivs-channel.go
@@ -0,0 +1,134 @@
+package ivs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel AWS CloudFormation Resource (AWS::IVS::Channel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-channel.html
+type Channel struct {
+
+	// Authorized AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-channel.html#cfn-ivs-channel-authorized
+	Authorized *types.Value `json:"Authorized,omitempty"`
+
+	// LatencyMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-channel.html#cfn-ivs-channel-latencymode
+	LatencyMode *types.Value `json:"LatencyMode,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-channel.html#cfn-ivs-channel-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RecordingConfigurationArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-channel.html#cfn-ivs-channel-recordingconfigurationarn
+	RecordingConfigurationArn *types.Value `json:"RecordingConfigurationArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-channel.html#cfn-ivs-channel-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-channel.html#cfn-ivs-channel-type
+	Type *types.Value `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 *Channel) AWSCloudFormationType() string {
+	return "AWS::IVS::Channel"
+}
+
+// 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 Channel) MarshalJSON() ([]byte, error) {
+	type Properties Channel
+	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 *Channel) UnmarshalJSON(b []byte) error {
+	type Properties Channel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Channel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ivs/aws-ivs-playbackkeypair.go b/goformation/cloudformation/ivs/aws-ivs-playbackkeypair.go
new file mode 100644
index 0000000000..2c4689633d
--- /dev/null
+++ b/goformation/cloudformation/ivs/aws-ivs-playbackkeypair.go
@@ -0,0 +1,119 @@
+package ivs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// PlaybackKeyPair AWS CloudFormation Resource (AWS::IVS::PlaybackKeyPair)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-playbackkeypair.html
+type PlaybackKeyPair struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-playbackkeypair.html#cfn-ivs-playbackkeypair-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// PublicKeyMaterial AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-playbackkeypair.html#cfn-ivs-playbackkeypair-publickeymaterial
+	PublicKeyMaterial *types.Value `json:"PublicKeyMaterial,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-playbackkeypair.html#cfn-ivs-playbackkeypair-tags
+	Tags []cloudformation.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 *PlaybackKeyPair) AWSCloudFormationType() string {
+	return "AWS::IVS::PlaybackKeyPair"
+}
+
+// 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 PlaybackKeyPair) MarshalJSON() ([]byte, error) {
+	type Properties PlaybackKeyPair
+	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 *PlaybackKeyPair) UnmarshalJSON(b []byte) error {
+	type Properties PlaybackKeyPair
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PlaybackKeyPair(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration.go b/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration.go
new file mode 100644
index 0000000000..a6b0b0fafd
--- /dev/null
+++ b/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration.go
@@ -0,0 +1,119 @@
+package ivs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// RecordingConfiguration AWS CloudFormation Resource (AWS::IVS::RecordingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-recordingconfiguration.html
+type RecordingConfiguration struct {
+
+	// DestinationConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-recordingconfiguration.html#cfn-ivs-recordingconfiguration-destinationconfiguration
+	DestinationConfiguration *RecordingConfiguration_DestinationConfiguration `json:"DestinationConfiguration,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-recordingconfiguration.html#cfn-ivs-recordingconfiguration-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-recordingconfiguration.html#cfn-ivs-recordingconfiguration-tags
+	Tags []cloudformation.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 *RecordingConfiguration) AWSCloudFormationType() string {
+	return "AWS::IVS::RecordingConfiguration"
+}
+
+// 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 RecordingConfiguration) MarshalJSON() ([]byte, error) {
+	type Properties RecordingConfiguration
+	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 *RecordingConfiguration) UnmarshalJSON(b []byte) error {
+	type Properties RecordingConfiguration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RecordingConfiguration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration_destinationconfiguration.go b/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration_destinationconfiguration.go
new file mode 100644
index 0000000000..5994428680
--- /dev/null
+++ b/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration_destinationconfiguration.go
@@ -0,0 +1,35 @@
+package ivs
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RecordingConfiguration_DestinationConfiguration AWS CloudFormation Resource (AWS::IVS::RecordingConfiguration.DestinationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ivs-recordingconfiguration-destinationconfiguration.html
+type RecordingConfiguration_DestinationConfiguration struct {
+
+	// S3 AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ivs-recordingconfiguration-destinationconfiguration.html#cfn-ivs-recordingconfiguration-destinationconfiguration-s3
+	S3 *RecordingConfiguration_S3DestinationConfiguration `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 *RecordingConfiguration_DestinationConfiguration) AWSCloudFormationType() string {
+	return "AWS::IVS::RecordingConfiguration.DestinationConfiguration"
+}
diff --git a/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration_s3destinationconfiguration.go b/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration_s3destinationconfiguration.go
new file mode 100644
index 0000000000..e5591e460e
--- /dev/null
+++ b/goformation/cloudformation/ivs/aws-ivs-recordingconfiguration_s3destinationconfiguration.go
@@ -0,0 +1,37 @@
+package ivs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RecordingConfiguration_S3DestinationConfiguration AWS CloudFormation Resource (AWS::IVS::RecordingConfiguration.S3DestinationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ivs-recordingconfiguration-s3destinationconfiguration.html
+type RecordingConfiguration_S3DestinationConfiguration struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ivs-recordingconfiguration-s3destinationconfiguration.html#cfn-ivs-recordingconfiguration-s3destinationconfiguration-bucketname
+	BucketName *types.Value `json:"BucketName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RecordingConfiguration_S3DestinationConfiguration) AWSCloudFormationType() string {
+	return "AWS::IVS::RecordingConfiguration.S3DestinationConfiguration"
+}
diff --git a/goformation/cloudformation/ivs/aws-ivs-streamkey.go b/goformation/cloudformation/ivs/aws-ivs-streamkey.go
new file mode 100644
index 0000000000..4db1595942
--- /dev/null
+++ b/goformation/cloudformation/ivs/aws-ivs-streamkey.go
@@ -0,0 +1,114 @@
+package ivs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// StreamKey AWS CloudFormation Resource (AWS::IVS::StreamKey)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-streamkey.html
+type StreamKey struct {
+
+	// ChannelArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-streamkey.html#cfn-ivs-streamkey-channelarn
+	ChannelArn *types.Value `json:"ChannelArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ivs-streamkey.html#cfn-ivs-streamkey-tags
+	Tags []cloudformation.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 *StreamKey) AWSCloudFormationType() string {
+	return "AWS::IVS::StreamKey"
+}
+
+// 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 StreamKey) MarshalJSON() ([]byte, error) {
+	type Properties StreamKey
+	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 *StreamKey) UnmarshalJSON(b []byte) error {
+	type Properties StreamKey
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = StreamKey(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/kendra/aws-kendra-datasource.go b/goformation/cloudformation/kendra/aws-kendra-datasource.go
new file mode 100644
index 0000000000..9ad10badb6
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource.go
@@ -0,0 +1,144 @@
+package kendra
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource AWS CloudFormation Resource (AWS::Kendra::DataSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-datasource.html
+type DataSource struct {
+
+	// DataSourceConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-datasource.html#cfn-kendra-datasource-datasourceconfiguration
+	DataSourceConfiguration *DataSource_DataSourceConfiguration `json:"DataSourceConfiguration,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-datasource.html#cfn-kendra-datasource-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// IndexId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-datasource.html#cfn-kendra-datasource-indexid
+	IndexId *types.Value `json:"IndexId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-datasource.html#cfn-kendra-datasource-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-datasource.html#cfn-kendra-datasource-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Schedule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-datasource.html#cfn-kendra-datasource-schedule
+	Schedule *types.Value `json:"Schedule,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-datasource.html#cfn-kendra-datasource-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-datasource.html#cfn-kendra-datasource-type
+	Type *types.Value `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 *DataSource) AWSCloudFormationType() string {
+	return "AWS::Kendra::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/kendra/aws-kendra-datasource_accesscontrollistconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_accesscontrollistconfiguration.go
new file mode 100644
index 0000000000..d340352b3f
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_accesscontrollistconfiguration.go
@@ -0,0 +1,37 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_AccessControlListConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.AccessControlListConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-accesscontrollistconfiguration.html
+type DataSource_AccessControlListConfiguration struct {
+
+	// KeyPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-accesscontrollistconfiguration.html#cfn-kendra-datasource-accesscontrollistconfiguration-keypath
+	KeyPath *types.Value `json:"KeyPath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AccessControlListConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.AccessControlListConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_aclconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_aclconfiguration.go
new file mode 100644
index 0000000000..22ad509a6f
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_aclconfiguration.go
@@ -0,0 +1,37 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_AclConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.AclConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-aclconfiguration.html
+type DataSource_AclConfiguration struct {
+
+	// AllowedGroupsColumnName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-aclconfiguration.html#cfn-kendra-datasource-aclconfiguration-allowedgroupscolumnname
+	AllowedGroupsColumnName *types.Value `json:"AllowedGroupsColumnName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AclConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.AclConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_changedetectingcolumns.go b/goformation/cloudformation/kendra/aws-kendra-datasource_changedetectingcolumns.go
new file mode 100644
index 0000000000..fdaeb8ab19
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_changedetectingcolumns.go
@@ -0,0 +1,37 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_ChangeDetectingColumns AWS CloudFormation Resource (AWS::Kendra::DataSource.ChangeDetectingColumns)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-changedetectingcolumns.html
+type DataSource_ChangeDetectingColumns struct {
+
+	// ChangeDetectingColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-changedetectingcolumns.html#cfn-kendra-datasource-changedetectingcolumns-changedetectingcolumns
+	ChangeDetectingColumns *types.Value `json:"ChangeDetectingColumns,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ChangeDetectingColumns) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.ChangeDetectingColumns"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_columnconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_columnconfiguration.go
new file mode 100644
index 0000000000..d9700bb46f
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_columnconfiguration.go
@@ -0,0 +1,57 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_ColumnConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ColumnConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-columnconfiguration.html
+type DataSource_ColumnConfiguration struct {
+
+	// ChangeDetectingColumns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-columnconfiguration.html#cfn-kendra-datasource-columnconfiguration-changedetectingcolumns
+	ChangeDetectingColumns *types.Value `json:"ChangeDetectingColumns,omitempty"`
+
+	// DocumentDataColumnName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-columnconfiguration.html#cfn-kendra-datasource-columnconfiguration-documentdatacolumnname
+	DocumentDataColumnName *types.Value `json:"DocumentDataColumnName,omitempty"`
+
+	// DocumentIdColumnName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-columnconfiguration.html#cfn-kendra-datasource-columnconfiguration-documentidcolumnname
+	DocumentIdColumnName *types.Value `json:"DocumentIdColumnName,omitempty"`
+
+	// DocumentTitleColumnName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-columnconfiguration.html#cfn-kendra-datasource-columnconfiguration-documenttitlecolumnname
+	DocumentTitleColumnName *types.Value `json:"DocumentTitleColumnName,omitempty"`
+
+	// FieldMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-columnconfiguration.html#cfn-kendra-datasource-columnconfiguration-fieldmappings
+	FieldMappings []DataSource_DataSourceToIndexFieldMapping `json:"FieldMappings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ColumnConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.ColumnConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceattachmentconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceattachmentconfiguration.go
new file mode 100644
index 0000000000..c7fe22d184
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceattachmentconfiguration.go
@@ -0,0 +1,42 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_ConfluenceAttachmentConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ConfluenceAttachmentConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceattachmentconfiguration.html
+type DataSource_ConfluenceAttachmentConfiguration struct {
+
+	// AttachmentFieldMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceattachmentconfiguration.html#cfn-kendra-datasource-confluenceattachmentconfiguration-attachmentfieldmappings
+	AttachmentFieldMappings []DataSource_ConfluenceAttachmentToIndexFieldMapping `json:"AttachmentFieldMappings,omitempty"`
+
+	// CrawlAttachments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceattachmentconfiguration.html#cfn-kendra-datasource-confluenceattachmentconfiguration-crawlattachments
+	CrawlAttachments *types.Value `json:"CrawlAttachments,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ConfluenceAttachmentConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.ConfluenceAttachmentConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceattachmenttoindexfieldmapping.go b/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceattachmenttoindexfieldmapping.go
new file mode 100644
index 0000000000..cc971222c4
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceattachmenttoindexfieldmapping.go
@@ -0,0 +1,47 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_ConfluenceAttachmentToIndexFieldMapping AWS CloudFormation Resource (AWS::Kendra::DataSource.ConfluenceAttachmentToIndexFieldMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceattachmenttoindexfieldmapping.html
+type DataSource_ConfluenceAttachmentToIndexFieldMapping struct {
+
+	// DataSourceFieldName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceattachmenttoindexfieldmapping.html#cfn-kendra-datasource-confluenceattachmenttoindexfieldmapping-datasourcefieldname
+	DataSourceFieldName *types.Value `json:"DataSourceFieldName,omitempty"`
+
+	// DateFieldFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceattachmenttoindexfieldmapping.html#cfn-kendra-datasource-confluenceattachmenttoindexfieldmapping-datefieldformat
+	DateFieldFormat *types.Value `json:"DateFieldFormat,omitempty"`
+
+	// IndexFieldName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceattachmenttoindexfieldmapping.html#cfn-kendra-datasource-confluenceattachmenttoindexfieldmapping-indexfieldname
+	IndexFieldName *types.Value `json:"IndexFieldName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ConfluenceAttachmentToIndexFieldMapping) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.ConfluenceAttachmentToIndexFieldMapping"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceblogconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceblogconfiguration.go
new file mode 100644
index 0000000000..72b15a735c
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceblogconfiguration.go
@@ -0,0 +1,35 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_ConfluenceBlogConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ConfluenceBlogConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceblogconfiguration.html
+type DataSource_ConfluenceBlogConfiguration struct {
+
+	// BlogFieldMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceblogconfiguration.html#cfn-kendra-datasource-confluenceblogconfiguration-blogfieldmappings
+	BlogFieldMappings []DataSource_ConfluenceBlogToIndexFieldMapping `json:"BlogFieldMappings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ConfluenceBlogConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.ConfluenceBlogConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceblogtoindexfieldmapping.go b/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceblogtoindexfieldmapping.go
new file mode 100644
index 0000000000..dea0fb0157
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceblogtoindexfieldmapping.go
@@ -0,0 +1,47 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_ConfluenceBlogToIndexFieldMapping AWS CloudFormation Resource (AWS::Kendra::DataSource.ConfluenceBlogToIndexFieldMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceblogtoindexfieldmapping.html
+type DataSource_ConfluenceBlogToIndexFieldMapping struct {
+
+	// DataSourceFieldName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceblogtoindexfieldmapping.html#cfn-kendra-datasource-confluenceblogtoindexfieldmapping-datasourcefieldname
+	DataSourceFieldName *types.Value `json:"DataSourceFieldName,omitempty"`
+
+	// DateFieldFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceblogtoindexfieldmapping.html#cfn-kendra-datasource-confluenceblogtoindexfieldmapping-datefieldformat
+	DateFieldFormat *types.Value `json:"DateFieldFormat,omitempty"`
+
+	// IndexFieldName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceblogtoindexfieldmapping.html#cfn-kendra-datasource-confluenceblogtoindexfieldmapping-indexfieldname
+	IndexFieldName *types.Value `json:"IndexFieldName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ConfluenceBlogToIndexFieldMapping) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.ConfluenceBlogToIndexFieldMapping"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceconfiguration.go
new file mode 100644
index 0000000000..55ed73767b
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_confluenceconfiguration.go
@@ -0,0 +1,82 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_ConfluenceConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ConfluenceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceconfiguration.html
+type DataSource_ConfluenceConfiguration struct {
+
+	// AttachmentConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceconfiguration.html#cfn-kendra-datasource-confluenceconfiguration-attachmentconfiguration
+	AttachmentConfiguration *DataSource_ConfluenceAttachmentConfiguration `json:"AttachmentConfiguration,omitempty"`
+
+	// BlogConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceconfiguration.html#cfn-kendra-datasource-confluenceconfiguration-blogconfiguration
+	BlogConfiguration *DataSource_ConfluenceBlogConfiguration `json:"BlogConfiguration,omitempty"`
+
+	// ExclusionPatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceconfiguration.html#cfn-kendra-datasource-confluenceconfiguration-exclusionpatterns
+	ExclusionPatterns *types.Value `json:"ExclusionPatterns,omitempty"`
+
+	// InclusionPatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceconfiguration.html#cfn-kendra-datasource-confluenceconfiguration-inclusionpatterns
+	InclusionPatterns *types.Value `json:"InclusionPatterns,omitempty"`
+
+	// PageConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceconfiguration.html#cfn-kendra-datasource-confluenceconfiguration-pageconfiguration
+	PageConfiguration *DataSource_ConfluencePageConfiguration `json:"PageConfiguration,omitempty"`
+
+	// SecretArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceconfiguration.html#cfn-kendra-datasource-confluenceconfiguration-secretarn
+	SecretArn *types.Value `json:"SecretArn,omitempty"`
+
+	// ServerUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceconfiguration.html#cfn-kendra-datasource-confluenceconfiguration-serverurl
+	ServerUrl *types.Value `json:"ServerUrl,omitempty"`
+
+	// SpaceConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceconfiguration.html#cfn-kendra-datasource-confluenceconfiguration-spaceconfiguration
+	SpaceConfiguration *DataSource_ConfluenceSpaceConfiguration `json:"SpaceConfiguration,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceconfiguration.html#cfn-kendra-datasource-confluenceconfiguration-version
+	Version *types.Value `json:"Version,omitempty"`
+
+	// VpcConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluenceconfiguration.html#cfn-kendra-datasource-confluenceconfiguration-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_ConfluenceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.ConfluenceConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_confluencepageconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_confluencepageconfiguration.go
new file mode 100644
index 0000000000..243c7b53f4
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_confluencepageconfiguration.go
@@ -0,0 +1,35 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_ConfluencePageConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ConfluencePageConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluencepageconfiguration.html
+type DataSource_ConfluencePageConfiguration struct {
+
+	// PageFieldMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluencepageconfiguration.html#cfn-kendra-datasource-confluencepageconfiguration-pagefieldmappings
+	PageFieldMappings []DataSource_ConfluencePageToIndexFieldMapping `json:"PageFieldMappings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ConfluencePageConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.ConfluencePageConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_confluencepagetoindexfieldmapping.go b/goformation/cloudformation/kendra/aws-kendra-datasource_confluencepagetoindexfieldmapping.go
new file mode 100644
index 0000000000..fb815f9f95
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_confluencepagetoindexfieldmapping.go
@@ -0,0 +1,47 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_ConfluencePageToIndexFieldMapping AWS CloudFormation Resource (AWS::Kendra::DataSource.ConfluencePageToIndexFieldMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluencepagetoindexfieldmapping.html
+type DataSource_ConfluencePageToIndexFieldMapping struct {
+
+	// DataSourceFieldName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluencepagetoindexfieldmapping.html#cfn-kendra-datasource-confluencepagetoindexfieldmapping-datasourcefieldname
+	DataSourceFieldName *types.Value `json:"DataSourceFieldName,omitempty"`
+
+	// DateFieldFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluencepagetoindexfieldmapping.html#cfn-kendra-datasource-confluencepagetoindexfieldmapping-datefieldformat
+	DateFieldFormat *types.Value `json:"DateFieldFormat,omitempty"`
+
+	// IndexFieldName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluencepagetoindexfieldmapping.html#cfn-kendra-datasource-confluencepagetoindexfieldmapping-indexfieldname
+	IndexFieldName *types.Value `json:"IndexFieldName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ConfluencePageToIndexFieldMapping) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.ConfluencePageToIndexFieldMapping"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_confluencespaceconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_confluencespaceconfiguration.go
new file mode 100644
index 0000000000..463553eb80
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_confluencespaceconfiguration.go
@@ -0,0 +1,57 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_ConfluenceSpaceConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ConfluenceSpaceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluencespaceconfiguration.html
+type DataSource_ConfluenceSpaceConfiguration struct {
+
+	// CrawlArchivedSpaces AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluencespaceconfiguration.html#cfn-kendra-datasource-confluencespaceconfiguration-crawlarchivedspaces
+	CrawlArchivedSpaces *types.Value `json:"CrawlArchivedSpaces,omitempty"`
+
+	// CrawlPersonalSpaces AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluencespaceconfiguration.html#cfn-kendra-datasource-confluencespaceconfiguration-crawlpersonalspaces
+	CrawlPersonalSpaces *types.Value `json:"CrawlPersonalSpaces,omitempty"`
+
+	// ExcludeSpaces AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluencespaceconfiguration.html#cfn-kendra-datasource-confluencespaceconfiguration-excludespaces
+	ExcludeSpaces *types.Value `json:"ExcludeSpaces,omitempty"`
+
+	// IncludeSpaces AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluencespaceconfiguration.html#cfn-kendra-datasource-confluencespaceconfiguration-includespaces
+	IncludeSpaces *types.Value `json:"IncludeSpaces,omitempty"`
+
+	// SpaceFieldMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluencespaceconfiguration.html#cfn-kendra-datasource-confluencespaceconfiguration-spacefieldmappings
+	SpaceFieldMappings []DataSource_ConfluenceSpaceToIndexFieldMapping `json:"SpaceFieldMappings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ConfluenceSpaceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.ConfluenceSpaceConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_confluencespacetoindexfieldmapping.go b/goformation/cloudformation/kendra/aws-kendra-datasource_confluencespacetoindexfieldmapping.go
new file mode 100644
index 0000000000..255bdc545d
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_confluencespacetoindexfieldmapping.go
@@ -0,0 +1,47 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_ConfluenceSpaceToIndexFieldMapping AWS CloudFormation Resource (AWS::Kendra::DataSource.ConfluenceSpaceToIndexFieldMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluencespacetoindexfieldmapping.html
+type DataSource_ConfluenceSpaceToIndexFieldMapping struct {
+
+	// DataSourceFieldName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluencespacetoindexfieldmapping.html#cfn-kendra-datasource-confluencespacetoindexfieldmapping-datasourcefieldname
+	DataSourceFieldName *types.Value `json:"DataSourceFieldName,omitempty"`
+
+	// DateFieldFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluencespacetoindexfieldmapping.html#cfn-kendra-datasource-confluencespacetoindexfieldmapping-datefieldformat
+	DateFieldFormat *types.Value `json:"DateFieldFormat,omitempty"`
+
+	// IndexFieldName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-confluencespacetoindexfieldmapping.html#cfn-kendra-datasource-confluencespacetoindexfieldmapping-indexfieldname
+	IndexFieldName *types.Value `json:"IndexFieldName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ConfluenceSpaceToIndexFieldMapping) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.ConfluenceSpaceToIndexFieldMapping"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_connectionconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_connectionconfiguration.go
new file mode 100644
index 0000000000..cd2a563e9b
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_connectionconfiguration.go
@@ -0,0 +1,57 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_ConnectionConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ConnectionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-connectionconfiguration.html
+type DataSource_ConnectionConfiguration struct {
+
+	// DatabaseHost AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-connectionconfiguration.html#cfn-kendra-datasource-connectionconfiguration-databasehost
+	DatabaseHost *types.Value `json:"DatabaseHost,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-connectionconfiguration.html#cfn-kendra-datasource-connectionconfiguration-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// DatabasePort AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-connectionconfiguration.html#cfn-kendra-datasource-connectionconfiguration-databaseport
+	DatabasePort *types.Value `json:"DatabasePort"`
+
+	// SecretArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-connectionconfiguration.html#cfn-kendra-datasource-connectionconfiguration-secretarn
+	SecretArn *types.Value `json:"SecretArn,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-connectionconfiguration.html#cfn-kendra-datasource-connectionconfiguration-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ConnectionConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.ConnectionConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_databaseconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_databaseconfiguration.go
new file mode 100644
index 0000000000..f84ddb81b5
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_databaseconfiguration.go
@@ -0,0 +1,62 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_DatabaseConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.DatabaseConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-databaseconfiguration.html
+type DataSource_DatabaseConfiguration struct {
+
+	// AclConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-databaseconfiguration.html#cfn-kendra-datasource-databaseconfiguration-aclconfiguration
+	AclConfiguration *DataSource_AclConfiguration `json:"AclConfiguration,omitempty"`
+
+	// ColumnConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-databaseconfiguration.html#cfn-kendra-datasource-databaseconfiguration-columnconfiguration
+	ColumnConfiguration *DataSource_ColumnConfiguration `json:"ColumnConfiguration,omitempty"`
+
+	// ConnectionConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-databaseconfiguration.html#cfn-kendra-datasource-databaseconfiguration-connectionconfiguration
+	ConnectionConfiguration *DataSource_ConnectionConfiguration `json:"ConnectionConfiguration,omitempty"`
+
+	// DatabaseEngineType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-databaseconfiguration.html#cfn-kendra-datasource-databaseconfiguration-databaseenginetype
+	DatabaseEngineType *types.Value `json:"DatabaseEngineType,omitempty"`
+
+	// SqlConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-databaseconfiguration.html#cfn-kendra-datasource-databaseconfiguration-sqlconfiguration
+	SqlConfiguration *DataSource_SqlConfiguration `json:"SqlConfiguration,omitempty"`
+
+	// VpcConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-databaseconfiguration.html#cfn-kendra-datasource-databaseconfiguration-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_DatabaseConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.DatabaseConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_datasourceconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_datasourceconfiguration.go
new file mode 100644
index 0000000000..5694b4c963
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_datasourceconfiguration.go
@@ -0,0 +1,80 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_DataSourceConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.DataSourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourceconfiguration.html
+type DataSource_DataSourceConfiguration struct {
+
+	// ConfluenceConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourceconfiguration.html#cfn-kendra-datasource-datasourceconfiguration-confluenceconfiguration
+	ConfluenceConfiguration *DataSource_ConfluenceConfiguration `json:"ConfluenceConfiguration,omitempty"`
+
+	// DatabaseConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourceconfiguration.html#cfn-kendra-datasource-datasourceconfiguration-databaseconfiguration
+	DatabaseConfiguration *DataSource_DatabaseConfiguration `json:"DatabaseConfiguration,omitempty"`
+
+	// GoogleDriveConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourceconfiguration.html#cfn-kendra-datasource-datasourceconfiguration-googledriveconfiguration
+	GoogleDriveConfiguration *DataSource_GoogleDriveConfiguration `json:"GoogleDriveConfiguration,omitempty"`
+
+	// OneDriveConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourceconfiguration.html#cfn-kendra-datasource-datasourceconfiguration-onedriveconfiguration
+	OneDriveConfiguration *DataSource_OneDriveConfiguration `json:"OneDriveConfiguration,omitempty"`
+
+	// S3Configuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourceconfiguration.html#cfn-kendra-datasource-datasourceconfiguration-s3configuration
+	S3Configuration *DataSource_S3DataSourceConfiguration `json:"S3Configuration,omitempty"`
+
+	// SalesforceConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourceconfiguration.html#cfn-kendra-datasource-datasourceconfiguration-salesforceconfiguration
+	SalesforceConfiguration *DataSource_SalesforceConfiguration `json:"SalesforceConfiguration,omitempty"`
+
+	// ServiceNowConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourceconfiguration.html#cfn-kendra-datasource-datasourceconfiguration-servicenowconfiguration
+	ServiceNowConfiguration *DataSource_ServiceNowConfiguration `json:"ServiceNowConfiguration,omitempty"`
+
+	// SharePointConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourceconfiguration.html#cfn-kendra-datasource-datasourceconfiguration-sharepointconfiguration
+	SharePointConfiguration *DataSource_SharePointConfiguration `json:"SharePointConfiguration,omitempty"`
+
+	// WebCrawlerConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourceconfiguration.html#cfn-kendra-datasource-datasourceconfiguration-webcrawlerconfiguration
+	WebCrawlerConfiguration *DataSource_WebCrawlerConfiguration `json:"WebCrawlerConfiguration,omitempty"`
+
+	// WorkDocsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourceconfiguration.html#cfn-kendra-datasource-datasourceconfiguration-workdocsconfiguration
+	WorkDocsConfiguration *DataSource_WorkDocsConfiguration `json:"WorkDocsConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DataSourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.DataSourceConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_datasourceinclusionsexclusionsstrings.go b/goformation/cloudformation/kendra/aws-kendra-datasource_datasourceinclusionsexclusionsstrings.go
new file mode 100644
index 0000000000..056b63673d
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_datasourceinclusionsexclusionsstrings.go
@@ -0,0 +1,37 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_DataSourceInclusionsExclusionsStrings AWS CloudFormation Resource (AWS::Kendra::DataSource.DataSourceInclusionsExclusionsStrings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourceinclusionsexclusionsstrings.html
+type DataSource_DataSourceInclusionsExclusionsStrings struct {
+
+	// DataSourceInclusionsExclusionsStrings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourceinclusionsexclusionsstrings.html#cfn-kendra-datasource-datasourceinclusionsexclusionsstrings-datasourceinclusionsexclusionsstrings
+	DataSourceInclusionsExclusionsStrings *types.Value `json:"DataSourceInclusionsExclusionsStrings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DataSourceInclusionsExclusionsStrings) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.DataSourceInclusionsExclusionsStrings"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmapping.go b/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmapping.go
new file mode 100644
index 0000000000..19af6286c6
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmapping.go
@@ -0,0 +1,47 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_DataSourceToIndexFieldMapping AWS CloudFormation Resource (AWS::Kendra::DataSource.DataSourceToIndexFieldMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourcetoindexfieldmapping.html
+type DataSource_DataSourceToIndexFieldMapping struct {
+
+	// DataSourceFieldName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourcetoindexfieldmapping.html#cfn-kendra-datasource-datasourcetoindexfieldmapping-datasourcefieldname
+	DataSourceFieldName *types.Value `json:"DataSourceFieldName,omitempty"`
+
+	// DateFieldFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourcetoindexfieldmapping.html#cfn-kendra-datasource-datasourcetoindexfieldmapping-datefieldformat
+	DateFieldFormat *types.Value `json:"DateFieldFormat,omitempty"`
+
+	// IndexFieldName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourcetoindexfieldmapping.html#cfn-kendra-datasource-datasourcetoindexfieldmapping-indexfieldname
+	IndexFieldName *types.Value `json:"IndexFieldName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DataSourceToIndexFieldMapping) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmappinglist.go b/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmappinglist.go
new file mode 100644
index 0000000000..ed328ea52f
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcetoindexfieldmappinglist.go
@@ -0,0 +1,35 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_DataSourceToIndexFieldMappingList AWS CloudFormation Resource (AWS::Kendra::DataSource.DataSourceToIndexFieldMappingList)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourcetoindexfieldmappinglist.html
+type DataSource_DataSourceToIndexFieldMappingList struct {
+
+	// DataSourceToIndexFieldMappingList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourcetoindexfieldmappinglist.html#cfn-kendra-datasource-datasourcetoindexfieldmappinglist-datasourcetoindexfieldmappinglist
+	DataSourceToIndexFieldMappingList []DataSource_DataSourceToIndexFieldMapping `json:"DataSourceToIndexFieldMappingList,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DataSourceToIndexFieldMappingList) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.DataSourceToIndexFieldMappingList"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcevpcconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcevpcconfiguration.go
new file mode 100644
index 0000000000..5409933243
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_datasourcevpcconfiguration.go
@@ -0,0 +1,42 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_DataSourceVpcConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.DataSourceVpcConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourcevpcconfiguration.html
+type DataSource_DataSourceVpcConfiguration struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourcevpcconfiguration.html#cfn-kendra-datasource-datasourcevpcconfiguration-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-datasourcevpcconfiguration.html#cfn-kendra-datasource-datasourcevpcconfiguration-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataSource_DataSourceVpcConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.DataSourceVpcConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_documentsmetadataconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_documentsmetadataconfiguration.go
new file mode 100644
index 0000000000..aa796f1a45
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_documentsmetadataconfiguration.go
@@ -0,0 +1,37 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_DocumentsMetadataConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.DocumentsMetadataConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-documentsmetadataconfiguration.html
+type DataSource_DocumentsMetadataConfiguration struct {
+
+	// S3Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-documentsmetadataconfiguration.html#cfn-kendra-datasource-documentsmetadataconfiguration-s3prefix
+	S3Prefix *types.Value `json:"S3Prefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DocumentsMetadataConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.DocumentsMetadataConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_googledriveconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_googledriveconfiguration.go
new file mode 100644
index 0000000000..7706ef34c9
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_googledriveconfiguration.go
@@ -0,0 +1,67 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_GoogleDriveConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.GoogleDriveConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-googledriveconfiguration.html
+type DataSource_GoogleDriveConfiguration struct {
+
+	// ExcludeMimeTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-googledriveconfiguration.html#cfn-kendra-datasource-googledriveconfiguration-excludemimetypes
+	ExcludeMimeTypes *types.Value `json:"ExcludeMimeTypes,omitempty"`
+
+	// ExcludeSharedDrives AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-googledriveconfiguration.html#cfn-kendra-datasource-googledriveconfiguration-excludeshareddrives
+	ExcludeSharedDrives *types.Value `json:"ExcludeSharedDrives,omitempty"`
+
+	// ExcludeUserAccounts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-googledriveconfiguration.html#cfn-kendra-datasource-googledriveconfiguration-excludeuseraccounts
+	ExcludeUserAccounts *types.Value `json:"ExcludeUserAccounts,omitempty"`
+
+	// ExclusionPatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-googledriveconfiguration.html#cfn-kendra-datasource-googledriveconfiguration-exclusionpatterns
+	ExclusionPatterns *types.Value `json:"ExclusionPatterns,omitempty"`
+
+	// FieldMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-googledriveconfiguration.html#cfn-kendra-datasource-googledriveconfiguration-fieldmappings
+	FieldMappings []DataSource_DataSourceToIndexFieldMapping `json:"FieldMappings,omitempty"`
+
+	// InclusionPatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-googledriveconfiguration.html#cfn-kendra-datasource-googledriveconfiguration-inclusionpatterns
+	InclusionPatterns *types.Value `json:"InclusionPatterns,omitempty"`
+
+	// SecretArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-googledriveconfiguration.html#cfn-kendra-datasource-googledriveconfiguration-secretarn
+	SecretArn *types.Value `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 *DataSource_GoogleDriveConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.GoogleDriveConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveconfiguration.go
new file mode 100644
index 0000000000..072c5fda06
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveconfiguration.go
@@ -0,0 +1,67 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_OneDriveConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.OneDriveConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-onedriveconfiguration.html
+type DataSource_OneDriveConfiguration struct {
+
+	// DisableLocalGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-onedriveconfiguration.html#cfn-kendra-datasource-onedriveconfiguration-disablelocalgroups
+	DisableLocalGroups *types.Value `json:"DisableLocalGroups,omitempty"`
+
+	// ExclusionPatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-onedriveconfiguration.html#cfn-kendra-datasource-onedriveconfiguration-exclusionpatterns
+	ExclusionPatterns *types.Value `json:"ExclusionPatterns,omitempty"`
+
+	// FieldMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-onedriveconfiguration.html#cfn-kendra-datasource-onedriveconfiguration-fieldmappings
+	FieldMappings []DataSource_DataSourceToIndexFieldMapping `json:"FieldMappings,omitempty"`
+
+	// InclusionPatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-onedriveconfiguration.html#cfn-kendra-datasource-onedriveconfiguration-inclusionpatterns
+	InclusionPatterns *types.Value `json:"InclusionPatterns,omitempty"`
+
+	// OneDriveUsers AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-onedriveconfiguration.html#cfn-kendra-datasource-onedriveconfiguration-onedriveusers
+	OneDriveUsers *DataSource_OneDriveUsers `json:"OneDriveUsers,omitempty"`
+
+	// SecretArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-onedriveconfiguration.html#cfn-kendra-datasource-onedriveconfiguration-secretarn
+	SecretArn *types.Value `json:"SecretArn,omitempty"`
+
+	// TenantDomain AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-onedriveconfiguration.html#cfn-kendra-datasource-onedriveconfiguration-tenantdomain
+	TenantDomain *types.Value `json:"TenantDomain,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_OneDriveConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.OneDriveConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveuserlist.go b/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveuserlist.go
new file mode 100644
index 0000000000..db5087bda6
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveuserlist.go
@@ -0,0 +1,37 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_OneDriveUserList AWS CloudFormation Resource (AWS::Kendra::DataSource.OneDriveUserList)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-onedriveuserlist.html
+type DataSource_OneDriveUserList struct {
+
+	// OneDriveUserList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-onedriveuserlist.html#cfn-kendra-datasource-onedriveuserlist-onedriveuserlist
+	OneDriveUserList *types.Value `json:"OneDriveUserList,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_OneDriveUserList) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.OneDriveUserList"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveusers.go b/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveusers.go
new file mode 100644
index 0000000000..8079722d48
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_onedriveusers.go
@@ -0,0 +1,42 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_OneDriveUsers AWS CloudFormation Resource (AWS::Kendra::DataSource.OneDriveUsers)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-onedriveusers.html
+type DataSource_OneDriveUsers struct {
+
+	// OneDriveUserList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-onedriveusers.html#cfn-kendra-datasource-onedriveusers-onedriveuserlist
+	OneDriveUserList *types.Value `json:"OneDriveUserList,omitempty"`
+
+	// OneDriveUserS3Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-onedriveusers.html#cfn-kendra-datasource-onedriveusers-onedriveusers3path
+	OneDriveUserS3Path *DataSource_S3Path `json:"OneDriveUserS3Path,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_OneDriveUsers) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.OneDriveUsers"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_proxyconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_proxyconfiguration.go
new file mode 100644
index 0000000000..baf637c95d
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_proxyconfiguration.go
@@ -0,0 +1,47 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_ProxyConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ProxyConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-proxyconfiguration.html
+type DataSource_ProxyConfiguration struct {
+
+	// Credentials AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-proxyconfiguration.html#cfn-kendra-datasource-proxyconfiguration-credentials
+	Credentials *types.Value `json:"Credentials,omitempty"`
+
+	// Host AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-proxyconfiguration.html#cfn-kendra-datasource-proxyconfiguration-host
+	Host *types.Value `json:"Host,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-proxyconfiguration.html#cfn-kendra-datasource-proxyconfiguration-port
+	Port *types.Value `json:"Port"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ProxyConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.ProxyConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_s3datasourceconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_s3datasourceconfiguration.go
new file mode 100644
index 0000000000..ac00467299
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_s3datasourceconfiguration.go
@@ -0,0 +1,62 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_S3DataSourceConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.S3DataSourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-s3datasourceconfiguration.html
+type DataSource_S3DataSourceConfiguration struct {
+
+	// AccessControlListConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-s3datasourceconfiguration.html#cfn-kendra-datasource-s3datasourceconfiguration-accesscontrollistconfiguration
+	AccessControlListConfiguration *DataSource_AccessControlListConfiguration `json:"AccessControlListConfiguration,omitempty"`
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-s3datasourceconfiguration.html#cfn-kendra-datasource-s3datasourceconfiguration-bucketname
+	BucketName *types.Value `json:"BucketName,omitempty"`
+
+	// DocumentsMetadataConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-s3datasourceconfiguration.html#cfn-kendra-datasource-s3datasourceconfiguration-documentsmetadataconfiguration
+	DocumentsMetadataConfiguration *DataSource_DocumentsMetadataConfiguration `json:"DocumentsMetadataConfiguration,omitempty"`
+
+	// ExclusionPatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-s3datasourceconfiguration.html#cfn-kendra-datasource-s3datasourceconfiguration-exclusionpatterns
+	ExclusionPatterns *types.Value `json:"ExclusionPatterns,omitempty"`
+
+	// InclusionPatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-s3datasourceconfiguration.html#cfn-kendra-datasource-s3datasourceconfiguration-inclusionpatterns
+	InclusionPatterns *types.Value `json:"InclusionPatterns,omitempty"`
+
+	// InclusionPrefixes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-s3datasourceconfiguration.html#cfn-kendra-datasource-s3datasourceconfiguration-inclusionprefixes
+	InclusionPrefixes *types.Value `json:"InclusionPrefixes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_S3DataSourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.S3DataSourceConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_s3path.go b/goformation/cloudformation/kendra/aws-kendra-datasource_s3path.go
new file mode 100644
index 0000000000..77cd78ddf3
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_s3path.go
@@ -0,0 +1,42 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_S3Path AWS CloudFormation Resource (AWS::Kendra::DataSource.S3Path)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-s3path.html
+type DataSource_S3Path struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-s3path.html#cfn-kendra-datasource-s3path-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-s3path.html#cfn-kendra-datasource-s3path-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_S3Path) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.S3Path"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedconfiguration.go
new file mode 100644
index 0000000000..7314348e86
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedconfiguration.go
@@ -0,0 +1,52 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_SalesforceChatterFeedConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceChatterFeedConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcechatterfeedconfiguration.html
+type DataSource_SalesforceChatterFeedConfiguration struct {
+
+	// DocumentDataFieldName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcechatterfeedconfiguration.html#cfn-kendra-datasource-salesforcechatterfeedconfiguration-documentdatafieldname
+	DocumentDataFieldName *types.Value `json:"DocumentDataFieldName,omitempty"`
+
+	// DocumentTitleFieldName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcechatterfeedconfiguration.html#cfn-kendra-datasource-salesforcechatterfeedconfiguration-documenttitlefieldname
+	DocumentTitleFieldName *types.Value `json:"DocumentTitleFieldName,omitempty"`
+
+	// FieldMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcechatterfeedconfiguration.html#cfn-kendra-datasource-salesforcechatterfeedconfiguration-fieldmappings
+	FieldMappings []DataSource_DataSourceToIndexFieldMapping `json:"FieldMappings,omitempty"`
+
+	// IncludeFilterTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcechatterfeedconfiguration.html#cfn-kendra-datasource-salesforcechatterfeedconfiguration-includefiltertypes
+	IncludeFilterTypes *types.Value `json:"IncludeFilterTypes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SalesforceChatterFeedConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.SalesforceChatterFeedConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedincludefiltertypes.go b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedincludefiltertypes.go
new file mode 100644
index 0000000000..5cc570478f
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcechatterfeedincludefiltertypes.go
@@ -0,0 +1,37 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_SalesforceChatterFeedIncludeFilterTypes AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceChatterFeedIncludeFilterTypes)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcechatterfeedincludefiltertypes.html
+type DataSource_SalesforceChatterFeedIncludeFilterTypes struct {
+
+	// SalesforceChatterFeedIncludeFilterTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcechatterfeedincludefiltertypes.html#cfn-kendra-datasource-salesforcechatterfeedincludefiltertypes-salesforcechatterfeedincludefiltertypes
+	SalesforceChatterFeedIncludeFilterTypes *types.Value `json:"SalesforceChatterFeedIncludeFilterTypes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SalesforceChatterFeedIncludeFilterTypes) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.SalesforceChatterFeedIncludeFilterTypes"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceconfiguration.go
new file mode 100644
index 0000000000..8e5daf4efa
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceconfiguration.go
@@ -0,0 +1,77 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_SalesforceConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforceconfiguration.html
+type DataSource_SalesforceConfiguration struct {
+
+	// ChatterFeedConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforceconfiguration.html#cfn-kendra-datasource-salesforceconfiguration-chatterfeedconfiguration
+	ChatterFeedConfiguration *DataSource_SalesforceChatterFeedConfiguration `json:"ChatterFeedConfiguration,omitempty"`
+
+	// CrawlAttachments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforceconfiguration.html#cfn-kendra-datasource-salesforceconfiguration-crawlattachments
+	CrawlAttachments *types.Value `json:"CrawlAttachments,omitempty"`
+
+	// ExcludeAttachmentFilePatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforceconfiguration.html#cfn-kendra-datasource-salesforceconfiguration-excludeattachmentfilepatterns
+	ExcludeAttachmentFilePatterns *types.Value `json:"ExcludeAttachmentFilePatterns,omitempty"`
+
+	// IncludeAttachmentFilePatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforceconfiguration.html#cfn-kendra-datasource-salesforceconfiguration-includeattachmentfilepatterns
+	IncludeAttachmentFilePatterns *types.Value `json:"IncludeAttachmentFilePatterns,omitempty"`
+
+	// KnowledgeArticleConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforceconfiguration.html#cfn-kendra-datasource-salesforceconfiguration-knowledgearticleconfiguration
+	KnowledgeArticleConfiguration *DataSource_SalesforceKnowledgeArticleConfiguration `json:"KnowledgeArticleConfiguration,omitempty"`
+
+	// SecretArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforceconfiguration.html#cfn-kendra-datasource-salesforceconfiguration-secretarn
+	SecretArn *types.Value `json:"SecretArn,omitempty"`
+
+	// ServerUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforceconfiguration.html#cfn-kendra-datasource-salesforceconfiguration-serverurl
+	ServerUrl *types.Value `json:"ServerUrl,omitempty"`
+
+	// StandardObjectAttachmentConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforceconfiguration.html#cfn-kendra-datasource-salesforceconfiguration-standardobjectattachmentconfiguration
+	StandardObjectAttachmentConfiguration *DataSource_SalesforceStandardObjectAttachmentConfiguration `json:"StandardObjectAttachmentConfiguration,omitempty"`
+
+	// StandardObjectConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforceconfiguration.html#cfn-kendra-datasource-salesforceconfiguration-standardobjectconfigurations
+	StandardObjectConfigurations []DataSource_SalesforceStandardObjectConfiguration `json:"StandardObjectConfigurations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SalesforceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.SalesforceConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfiguration.go
new file mode 100644
index 0000000000..8092a7ea4e
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfiguration.go
@@ -0,0 +1,52 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_SalesforceCustomKnowledgeArticleTypeConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceCustomKnowledgeArticleTypeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcecustomknowledgearticletypeconfiguration.html
+type DataSource_SalesforceCustomKnowledgeArticleTypeConfiguration struct {
+
+	// DocumentDataFieldName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcecustomknowledgearticletypeconfiguration.html#cfn-kendra-datasource-salesforcecustomknowledgearticletypeconfiguration-documentdatafieldname
+	DocumentDataFieldName *types.Value `json:"DocumentDataFieldName,omitempty"`
+
+	// DocumentTitleFieldName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcecustomknowledgearticletypeconfiguration.html#cfn-kendra-datasource-salesforcecustomknowledgearticletypeconfiguration-documenttitlefieldname
+	DocumentTitleFieldName *types.Value `json:"DocumentTitleFieldName,omitempty"`
+
+	// FieldMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcecustomknowledgearticletypeconfiguration.html#cfn-kendra-datasource-salesforcecustomknowledgearticletypeconfiguration-fieldmappings
+	FieldMappings []DataSource_DataSourceToIndexFieldMapping `json:"FieldMappings,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcecustomknowledgearticletypeconfiguration.html#cfn-kendra-datasource-salesforcecustomknowledgearticletypeconfiguration-name
+	Name *types.Value `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 *DataSource_SalesforceCustomKnowledgeArticleTypeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.SalesforceCustomKnowledgeArticleTypeConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfigurationlist.go b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfigurationlist.go
new file mode 100644
index 0000000000..f2f550526d
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcecustomknowledgearticletypeconfigurationlist.go
@@ -0,0 +1,35 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_SalesforceCustomKnowledgeArticleTypeConfigurationList AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceCustomKnowledgeArticleTypeConfigurationList)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcecustomknowledgearticletypeconfigurationlist.html
+type DataSource_SalesforceCustomKnowledgeArticleTypeConfigurationList struct {
+
+	// SalesforceCustomKnowledgeArticleTypeConfigurationList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcecustomknowledgearticletypeconfigurationlist.html#cfn-kendra-datasource-salesforcecustomknowledgearticletypeconfigurationlist-salesforcecustomknowledgearticletypeconfigurationlist
+	SalesforceCustomKnowledgeArticleTypeConfigurationList []DataSource_SalesforceCustomKnowledgeArticleTypeConfiguration `json:"SalesforceCustomKnowledgeArticleTypeConfigurationList,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SalesforceCustomKnowledgeArticleTypeConfigurationList) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.SalesforceCustomKnowledgeArticleTypeConfigurationList"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticleconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticleconfiguration.go
new file mode 100644
index 0000000000..632a406efc
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticleconfiguration.go
@@ -0,0 +1,47 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_SalesforceKnowledgeArticleConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceKnowledgeArticleConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforceknowledgearticleconfiguration.html
+type DataSource_SalesforceKnowledgeArticleConfiguration struct {
+
+	// CustomKnowledgeArticleTypeConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforceknowledgearticleconfiguration.html#cfn-kendra-datasource-salesforceknowledgearticleconfiguration-customknowledgearticletypeconfigurations
+	CustomKnowledgeArticleTypeConfigurations []DataSource_SalesforceCustomKnowledgeArticleTypeConfiguration `json:"CustomKnowledgeArticleTypeConfigurations,omitempty"`
+
+	// IncludedStates AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforceknowledgearticleconfiguration.html#cfn-kendra-datasource-salesforceknowledgearticleconfiguration-includedstates
+	IncludedStates *types.Value `json:"IncludedStates,omitempty"`
+
+	// StandardKnowledgeArticleTypeConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforceknowledgearticleconfiguration.html#cfn-kendra-datasource-salesforceknowledgearticleconfiguration-standardknowledgearticletypeconfiguration
+	StandardKnowledgeArticleTypeConfiguration *DataSource_SalesforceStandardKnowledgeArticleTypeConfiguration `json:"StandardKnowledgeArticleTypeConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SalesforceKnowledgeArticleConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.SalesforceKnowledgeArticleConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticlestatelist.go b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticlestatelist.go
new file mode 100644
index 0000000000..ae5fe72f23
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforceknowledgearticlestatelist.go
@@ -0,0 +1,37 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_SalesforceKnowledgeArticleStateList AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceKnowledgeArticleStateList)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforceknowledgearticlestatelist.html
+type DataSource_SalesforceKnowledgeArticleStateList struct {
+
+	// SalesforceKnowledgeArticleStateList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforceknowledgearticlestatelist.html#cfn-kendra-datasource-salesforceknowledgearticlestatelist-salesforceknowledgearticlestatelist
+	SalesforceKnowledgeArticleStateList *types.Value `json:"SalesforceKnowledgeArticleStateList,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SalesforceKnowledgeArticleStateList) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.SalesforceKnowledgeArticleStateList"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardknowledgearticletypeconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardknowledgearticletypeconfiguration.go
new file mode 100644
index 0000000000..f8a708c895
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardknowledgearticletypeconfiguration.go
@@ -0,0 +1,47 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_SalesforceStandardKnowledgeArticleTypeConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceStandardKnowledgeArticleTypeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcestandardknowledgearticletypeconfiguration.html
+type DataSource_SalesforceStandardKnowledgeArticleTypeConfiguration struct {
+
+	// DocumentDataFieldName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcestandardknowledgearticletypeconfiguration.html#cfn-kendra-datasource-salesforcestandardknowledgearticletypeconfiguration-documentdatafieldname
+	DocumentDataFieldName *types.Value `json:"DocumentDataFieldName,omitempty"`
+
+	// DocumentTitleFieldName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcestandardknowledgearticletypeconfiguration.html#cfn-kendra-datasource-salesforcestandardknowledgearticletypeconfiguration-documenttitlefieldname
+	DocumentTitleFieldName *types.Value `json:"DocumentTitleFieldName,omitempty"`
+
+	// FieldMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcestandardknowledgearticletypeconfiguration.html#cfn-kendra-datasource-salesforcestandardknowledgearticletypeconfiguration-fieldmappings
+	FieldMappings []DataSource_DataSourceToIndexFieldMapping `json:"FieldMappings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SalesforceStandardKnowledgeArticleTypeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.SalesforceStandardKnowledgeArticleTypeConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectattachmentconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectattachmentconfiguration.go
new file mode 100644
index 0000000000..4ce0967701
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectattachmentconfiguration.go
@@ -0,0 +1,42 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_SalesforceStandardObjectAttachmentConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceStandardObjectAttachmentConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcestandardobjectattachmentconfiguration.html
+type DataSource_SalesforceStandardObjectAttachmentConfiguration struct {
+
+	// DocumentTitleFieldName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcestandardobjectattachmentconfiguration.html#cfn-kendra-datasource-salesforcestandardobjectattachmentconfiguration-documenttitlefieldname
+	DocumentTitleFieldName *types.Value `json:"DocumentTitleFieldName,omitempty"`
+
+	// FieldMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcestandardobjectattachmentconfiguration.html#cfn-kendra-datasource-salesforcestandardobjectattachmentconfiguration-fieldmappings
+	FieldMappings []DataSource_DataSourceToIndexFieldMapping `json:"FieldMappings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SalesforceStandardObjectAttachmentConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.SalesforceStandardObjectAttachmentConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfiguration.go
new file mode 100644
index 0000000000..78f1514e39
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfiguration.go
@@ -0,0 +1,52 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_SalesforceStandardObjectConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceStandardObjectConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcestandardobjectconfiguration.html
+type DataSource_SalesforceStandardObjectConfiguration struct {
+
+	// DocumentDataFieldName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcestandardobjectconfiguration.html#cfn-kendra-datasource-salesforcestandardobjectconfiguration-documentdatafieldname
+	DocumentDataFieldName *types.Value `json:"DocumentDataFieldName,omitempty"`
+
+	// DocumentTitleFieldName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcestandardobjectconfiguration.html#cfn-kendra-datasource-salesforcestandardobjectconfiguration-documenttitlefieldname
+	DocumentTitleFieldName *types.Value `json:"DocumentTitleFieldName,omitempty"`
+
+	// FieldMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcestandardobjectconfiguration.html#cfn-kendra-datasource-salesforcestandardobjectconfiguration-fieldmappings
+	FieldMappings []DataSource_DataSourceToIndexFieldMapping `json:"FieldMappings,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcestandardobjectconfiguration.html#cfn-kendra-datasource-salesforcestandardobjectconfiguration-name
+	Name *types.Value `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 *DataSource_SalesforceStandardObjectConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.SalesforceStandardObjectConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfigurationlist.go b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfigurationlist.go
new file mode 100644
index 0000000000..9a03ed1927
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_salesforcestandardobjectconfigurationlist.go
@@ -0,0 +1,35 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_SalesforceStandardObjectConfigurationList AWS CloudFormation Resource (AWS::Kendra::DataSource.SalesforceStandardObjectConfigurationList)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcestandardobjectconfigurationlist.html
+type DataSource_SalesforceStandardObjectConfigurationList struct {
+
+	// SalesforceStandardObjectConfigurationList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-salesforcestandardobjectconfigurationlist.html#cfn-kendra-datasource-salesforcestandardobjectconfigurationlist-salesforcestandardobjectconfigurationlist
+	SalesforceStandardObjectConfigurationList []DataSource_SalesforceStandardObjectConfiguration `json:"SalesforceStandardObjectConfigurationList,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SalesforceStandardObjectConfigurationList) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.SalesforceStandardObjectConfigurationList"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowconfiguration.go
new file mode 100644
index 0000000000..54d5c589a0
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowconfiguration.go
@@ -0,0 +1,62 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_ServiceNowConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ServiceNowConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowconfiguration.html
+type DataSource_ServiceNowConfiguration struct {
+
+	// AuthenticationType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowconfiguration.html#cfn-kendra-datasource-servicenowconfiguration-authenticationtype
+	AuthenticationType *types.Value `json:"AuthenticationType,omitempty"`
+
+	// HostUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowconfiguration.html#cfn-kendra-datasource-servicenowconfiguration-hosturl
+	HostUrl *types.Value `json:"HostUrl,omitempty"`
+
+	// KnowledgeArticleConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowconfiguration.html#cfn-kendra-datasource-servicenowconfiguration-knowledgearticleconfiguration
+	KnowledgeArticleConfiguration *DataSource_ServiceNowKnowledgeArticleConfiguration `json:"KnowledgeArticleConfiguration,omitempty"`
+
+	// SecretArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowconfiguration.html#cfn-kendra-datasource-servicenowconfiguration-secretarn
+	SecretArn *types.Value `json:"SecretArn,omitempty"`
+
+	// ServiceCatalogConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowconfiguration.html#cfn-kendra-datasource-servicenowconfiguration-servicecatalogconfiguration
+	ServiceCatalogConfiguration *DataSource_ServiceNowServiceCatalogConfiguration `json:"ServiceCatalogConfiguration,omitempty"`
+
+	// ServiceNowBuildVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowconfiguration.html#cfn-kendra-datasource-servicenowconfiguration-servicenowbuildversion
+	ServiceNowBuildVersion *types.Value `json:"ServiceNowBuildVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ServiceNowConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.ServiceNowConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowknowledgearticleconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowknowledgearticleconfiguration.go
new file mode 100644
index 0000000000..82b2e40403
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowknowledgearticleconfiguration.go
@@ -0,0 +1,67 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_ServiceNowKnowledgeArticleConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ServiceNowKnowledgeArticleConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowknowledgearticleconfiguration.html
+type DataSource_ServiceNowKnowledgeArticleConfiguration struct {
+
+	// CrawlAttachments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowknowledgearticleconfiguration.html#cfn-kendra-datasource-servicenowknowledgearticleconfiguration-crawlattachments
+	CrawlAttachments *types.Value `json:"CrawlAttachments,omitempty"`
+
+	// DocumentDataFieldName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowknowledgearticleconfiguration.html#cfn-kendra-datasource-servicenowknowledgearticleconfiguration-documentdatafieldname
+	DocumentDataFieldName *types.Value `json:"DocumentDataFieldName,omitempty"`
+
+	// DocumentTitleFieldName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowknowledgearticleconfiguration.html#cfn-kendra-datasource-servicenowknowledgearticleconfiguration-documenttitlefieldname
+	DocumentTitleFieldName *types.Value `json:"DocumentTitleFieldName,omitempty"`
+
+	// ExcludeAttachmentFilePatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowknowledgearticleconfiguration.html#cfn-kendra-datasource-servicenowknowledgearticleconfiguration-excludeattachmentfilepatterns
+	ExcludeAttachmentFilePatterns *types.Value `json:"ExcludeAttachmentFilePatterns,omitempty"`
+
+	// FieldMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowknowledgearticleconfiguration.html#cfn-kendra-datasource-servicenowknowledgearticleconfiguration-fieldmappings
+	FieldMappings []DataSource_DataSourceToIndexFieldMapping `json:"FieldMappings,omitempty"`
+
+	// FilterQuery AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowknowledgearticleconfiguration.html#cfn-kendra-datasource-servicenowknowledgearticleconfiguration-filterquery
+	FilterQuery *types.Value `json:"FilterQuery,omitempty"`
+
+	// IncludeAttachmentFilePatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowknowledgearticleconfiguration.html#cfn-kendra-datasource-servicenowknowledgearticleconfiguration-includeattachmentfilepatterns
+	IncludeAttachmentFilePatterns *types.Value `json:"IncludeAttachmentFilePatterns,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ServiceNowKnowledgeArticleConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.ServiceNowKnowledgeArticleConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowservicecatalogconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowservicecatalogconfiguration.go
new file mode 100644
index 0000000000..8d3c3d0cbf
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_servicenowservicecatalogconfiguration.go
@@ -0,0 +1,62 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_ServiceNowServiceCatalogConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.ServiceNowServiceCatalogConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowservicecatalogconfiguration.html
+type DataSource_ServiceNowServiceCatalogConfiguration struct {
+
+	// CrawlAttachments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowservicecatalogconfiguration.html#cfn-kendra-datasource-servicenowservicecatalogconfiguration-crawlattachments
+	CrawlAttachments *types.Value `json:"CrawlAttachments,omitempty"`
+
+	// DocumentDataFieldName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowservicecatalogconfiguration.html#cfn-kendra-datasource-servicenowservicecatalogconfiguration-documentdatafieldname
+	DocumentDataFieldName *types.Value `json:"DocumentDataFieldName,omitempty"`
+
+	// DocumentTitleFieldName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowservicecatalogconfiguration.html#cfn-kendra-datasource-servicenowservicecatalogconfiguration-documenttitlefieldname
+	DocumentTitleFieldName *types.Value `json:"DocumentTitleFieldName,omitempty"`
+
+	// ExcludeAttachmentFilePatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowservicecatalogconfiguration.html#cfn-kendra-datasource-servicenowservicecatalogconfiguration-excludeattachmentfilepatterns
+	ExcludeAttachmentFilePatterns *types.Value `json:"ExcludeAttachmentFilePatterns,omitempty"`
+
+	// FieldMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowservicecatalogconfiguration.html#cfn-kendra-datasource-servicenowservicecatalogconfiguration-fieldmappings
+	FieldMappings []DataSource_DataSourceToIndexFieldMapping `json:"FieldMappings,omitempty"`
+
+	// IncludeAttachmentFilePatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-servicenowservicecatalogconfiguration.html#cfn-kendra-datasource-servicenowservicecatalogconfiguration-includeattachmentfilepatterns
+	IncludeAttachmentFilePatterns *types.Value `json:"IncludeAttachmentFilePatterns,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ServiceNowServiceCatalogConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.ServiceNowServiceCatalogConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_sharepointconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_sharepointconfiguration.go
new file mode 100644
index 0000000000..b001738a34
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_sharepointconfiguration.go
@@ -0,0 +1,92 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_SharePointConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.SharePointConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-sharepointconfiguration.html
+type DataSource_SharePointConfiguration struct {
+
+	// CrawlAttachments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-sharepointconfiguration.html#cfn-kendra-datasource-sharepointconfiguration-crawlattachments
+	CrawlAttachments *types.Value `json:"CrawlAttachments,omitempty"`
+
+	// DisableLocalGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-sharepointconfiguration.html#cfn-kendra-datasource-sharepointconfiguration-disablelocalgroups
+	DisableLocalGroups *types.Value `json:"DisableLocalGroups,omitempty"`
+
+	// DocumentTitleFieldName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-sharepointconfiguration.html#cfn-kendra-datasource-sharepointconfiguration-documenttitlefieldname
+	DocumentTitleFieldName *types.Value `json:"DocumentTitleFieldName,omitempty"`
+
+	// ExclusionPatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-sharepointconfiguration.html#cfn-kendra-datasource-sharepointconfiguration-exclusionpatterns
+	ExclusionPatterns *types.Value `json:"ExclusionPatterns,omitempty"`
+
+	// FieldMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-sharepointconfiguration.html#cfn-kendra-datasource-sharepointconfiguration-fieldmappings
+	FieldMappings []DataSource_DataSourceToIndexFieldMapping `json:"FieldMappings,omitempty"`
+
+	// InclusionPatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-sharepointconfiguration.html#cfn-kendra-datasource-sharepointconfiguration-inclusionpatterns
+	InclusionPatterns *types.Value `json:"InclusionPatterns,omitempty"`
+
+	// SecretArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-sharepointconfiguration.html#cfn-kendra-datasource-sharepointconfiguration-secretarn
+	SecretArn *types.Value `json:"SecretArn,omitempty"`
+
+	// SharePointVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-sharepointconfiguration.html#cfn-kendra-datasource-sharepointconfiguration-sharepointversion
+	SharePointVersion *types.Value `json:"SharePointVersion,omitempty"`
+
+	// SslCertificateS3Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-sharepointconfiguration.html#cfn-kendra-datasource-sharepointconfiguration-sslcertificates3path
+	SslCertificateS3Path *DataSource_S3Path `json:"SslCertificateS3Path,omitempty"`
+
+	// Urls AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-sharepointconfiguration.html#cfn-kendra-datasource-sharepointconfiguration-urls
+	Urls *types.Value `json:"Urls,omitempty"`
+
+	// UseChangeLog AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-sharepointconfiguration.html#cfn-kendra-datasource-sharepointconfiguration-usechangelog
+	UseChangeLog *types.Value `json:"UseChangeLog,omitempty"`
+
+	// VpcConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-sharepointconfiguration.html#cfn-kendra-datasource-sharepointconfiguration-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_SharePointConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.SharePointConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_sqlconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_sqlconfiguration.go
new file mode 100644
index 0000000000..29635e633b
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_sqlconfiguration.go
@@ -0,0 +1,37 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_SqlConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.SqlConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-sqlconfiguration.html
+type DataSource_SqlConfiguration struct {
+
+	// QueryIdentifiersEnclosingOption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-sqlconfiguration.html#cfn-kendra-datasource-sqlconfiguration-queryidentifiersenclosingoption
+	QueryIdentifiersEnclosingOption *types.Value `json:"QueryIdentifiersEnclosingOption,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SqlConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.SqlConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_taglist.go b/goformation/cloudformation/kendra/aws-kendra-datasource_taglist.go
new file mode 100644
index 0000000000..2ad0b014d0
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_taglist.go
@@ -0,0 +1,36 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_TagList AWS CloudFormation Resource (AWS::Kendra::DataSource.TagList)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-taglist.html
+type DataSource_TagList struct {
+
+	// TagList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-taglist.html#cfn-kendra-datasource-taglist-taglist
+	TagList []cloudformation.Tag `json:"TagList,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TagList) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.TagList"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerauthenticationconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerauthenticationconfiguration.go
new file mode 100644
index 0000000000..a9285451fb
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerauthenticationconfiguration.go
@@ -0,0 +1,35 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_WebCrawlerAuthenticationConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.WebCrawlerAuthenticationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerauthenticationconfiguration.html
+type DataSource_WebCrawlerAuthenticationConfiguration struct {
+
+	// BasicAuthentication AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerauthenticationconfiguration.html#cfn-kendra-datasource-webcrawlerauthenticationconfiguration-basicauthentication
+	BasicAuthentication []DataSource_WebCrawlerBasicAuthentication `json:"BasicAuthentication,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_WebCrawlerAuthenticationConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.WebCrawlerAuthenticationConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerbasicauthentication.go b/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerbasicauthentication.go
new file mode 100644
index 0000000000..097406d30f
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerbasicauthentication.go
@@ -0,0 +1,47 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_WebCrawlerBasicAuthentication AWS CloudFormation Resource (AWS::Kendra::DataSource.WebCrawlerBasicAuthentication)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerbasicauthentication.html
+type DataSource_WebCrawlerBasicAuthentication struct {
+
+	// Credentials AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerbasicauthentication.html#cfn-kendra-datasource-webcrawlerbasicauthentication-credentials
+	Credentials *types.Value `json:"Credentials,omitempty"`
+
+	// Host AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerbasicauthentication.html#cfn-kendra-datasource-webcrawlerbasicauthentication-host
+	Host *types.Value `json:"Host,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerbasicauthentication.html#cfn-kendra-datasource-webcrawlerbasicauthentication-port
+	Port *types.Value `json:"Port"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_WebCrawlerBasicAuthentication) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.WebCrawlerBasicAuthentication"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerconfiguration.go
new file mode 100644
index 0000000000..e4bcb493fc
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerconfiguration.go
@@ -0,0 +1,77 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_WebCrawlerConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.WebCrawlerConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerconfiguration.html
+type DataSource_WebCrawlerConfiguration struct {
+
+	// AuthenticationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerconfiguration.html#cfn-kendra-datasource-webcrawlerconfiguration-authenticationconfiguration
+	AuthenticationConfiguration *DataSource_WebCrawlerAuthenticationConfiguration `json:"AuthenticationConfiguration,omitempty"`
+
+	// CrawlDepth AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerconfiguration.html#cfn-kendra-datasource-webcrawlerconfiguration-crawldepth
+	CrawlDepth *types.Value `json:"CrawlDepth,omitempty"`
+
+	// MaxContentSizePerPageInMegaBytes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerconfiguration.html#cfn-kendra-datasource-webcrawlerconfiguration-maxcontentsizeperpageinmegabytes
+	MaxContentSizePerPageInMegaBytes *types.Value `json:"MaxContentSizePerPageInMegaBytes,omitempty"`
+
+	// MaxLinksPerPage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerconfiguration.html#cfn-kendra-datasource-webcrawlerconfiguration-maxlinksperpage
+	MaxLinksPerPage *types.Value `json:"MaxLinksPerPage,omitempty"`
+
+	// MaxUrlsPerMinuteCrawlRate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerconfiguration.html#cfn-kendra-datasource-webcrawlerconfiguration-maxurlsperminutecrawlrate
+	MaxUrlsPerMinuteCrawlRate *types.Value `json:"MaxUrlsPerMinuteCrawlRate,omitempty"`
+
+	// ProxyConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerconfiguration.html#cfn-kendra-datasource-webcrawlerconfiguration-proxyconfiguration
+	ProxyConfiguration *DataSource_ProxyConfiguration `json:"ProxyConfiguration,omitempty"`
+
+	// UrlExclusionPatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerconfiguration.html#cfn-kendra-datasource-webcrawlerconfiguration-urlexclusionpatterns
+	UrlExclusionPatterns *types.Value `json:"UrlExclusionPatterns,omitempty"`
+
+	// UrlInclusionPatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerconfiguration.html#cfn-kendra-datasource-webcrawlerconfiguration-urlinclusionpatterns
+	UrlInclusionPatterns *types.Value `json:"UrlInclusionPatterns,omitempty"`
+
+	// Urls AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerconfiguration.html#cfn-kendra-datasource-webcrawlerconfiguration-urls
+	Urls *DataSource_WebCrawlerUrls `json:"Urls,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::Kendra::DataSource.WebCrawlerConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerseedurlconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerseedurlconfiguration.go
new file mode 100644
index 0000000000..f1efdf56f5
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerseedurlconfiguration.go
@@ -0,0 +1,42 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_WebCrawlerSeedUrlConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.WebCrawlerSeedUrlConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerseedurlconfiguration.html
+type DataSource_WebCrawlerSeedUrlConfiguration struct {
+
+	// SeedUrls AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerseedurlconfiguration.html#cfn-kendra-datasource-webcrawlerseedurlconfiguration-seedurls
+	SeedUrls *types.Value `json:"SeedUrls,omitempty"`
+
+	// WebCrawlerMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerseedurlconfiguration.html#cfn-kendra-datasource-webcrawlerseedurlconfiguration-webcrawlermode
+	WebCrawlerMode *types.Value `json:"WebCrawlerMode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_WebCrawlerSeedUrlConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.WebCrawlerSeedUrlConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlersitemapsconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlersitemapsconfiguration.go
new file mode 100644
index 0000000000..9e393912e5
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlersitemapsconfiguration.go
@@ -0,0 +1,37 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_WebCrawlerSiteMapsConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.WebCrawlerSiteMapsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlersitemapsconfiguration.html
+type DataSource_WebCrawlerSiteMapsConfiguration struct {
+
+	// SiteMaps AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlersitemapsconfiguration.html#cfn-kendra-datasource-webcrawlersitemapsconfiguration-sitemaps
+	SiteMaps *types.Value `json:"SiteMaps,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_WebCrawlerSiteMapsConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.WebCrawlerSiteMapsConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerurls.go b/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerurls.go
new file mode 100644
index 0000000000..8b5c0f0e88
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_webcrawlerurls.go
@@ -0,0 +1,40 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_WebCrawlerUrls AWS CloudFormation Resource (AWS::Kendra::DataSource.WebCrawlerUrls)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerurls.html
+type DataSource_WebCrawlerUrls struct {
+
+	// SeedUrlConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerurls.html#cfn-kendra-datasource-webcrawlerurls-seedurlconfiguration
+	SeedUrlConfiguration *DataSource_WebCrawlerSeedUrlConfiguration `json:"SeedUrlConfiguration,omitempty"`
+
+	// SiteMapsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-webcrawlerurls.html#cfn-kendra-datasource-webcrawlerurls-sitemapsconfiguration
+	SiteMapsConfiguration *DataSource_WebCrawlerSiteMapsConfiguration `json:"SiteMapsConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_WebCrawlerUrls) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.WebCrawlerUrls"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-datasource_workdocsconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-datasource_workdocsconfiguration.go
new file mode 100644
index 0000000000..3099997d34
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-datasource_workdocsconfiguration.go
@@ -0,0 +1,62 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_WorkDocsConfiguration AWS CloudFormation Resource (AWS::Kendra::DataSource.WorkDocsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-workdocsconfiguration.html
+type DataSource_WorkDocsConfiguration struct {
+
+	// CrawlComments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-workdocsconfiguration.html#cfn-kendra-datasource-workdocsconfiguration-crawlcomments
+	CrawlComments *types.Value `json:"CrawlComments,omitempty"`
+
+	// ExclusionPatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-workdocsconfiguration.html#cfn-kendra-datasource-workdocsconfiguration-exclusionpatterns
+	ExclusionPatterns *types.Value `json:"ExclusionPatterns,omitempty"`
+
+	// FieldMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-workdocsconfiguration.html#cfn-kendra-datasource-workdocsconfiguration-fieldmappings
+	FieldMappings []DataSource_DataSourceToIndexFieldMapping `json:"FieldMappings,omitempty"`
+
+	// InclusionPatterns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-workdocsconfiguration.html#cfn-kendra-datasource-workdocsconfiguration-inclusionpatterns
+	InclusionPatterns *types.Value `json:"InclusionPatterns,omitempty"`
+
+	// OrganizationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-workdocsconfiguration.html#cfn-kendra-datasource-workdocsconfiguration-organizationid
+	OrganizationId *types.Value `json:"OrganizationId,omitempty"`
+
+	// UseChangeLog AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-datasource-workdocsconfiguration.html#cfn-kendra-datasource-workdocsconfiguration-usechangelog
+	UseChangeLog *types.Value `json:"UseChangeLog,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_WorkDocsConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::DataSource.WorkDocsConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-faq.go b/goformation/cloudformation/kendra/aws-kendra-faq.go
new file mode 100644
index 0000000000..f79699bf6b
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-faq.go
@@ -0,0 +1,139 @@
+package kendra
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Faq AWS CloudFormation Resource (AWS::Kendra::Faq)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-faq.html
+type Faq struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-faq.html#cfn-kendra-faq-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// FileFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-faq.html#cfn-kendra-faq-fileformat
+	FileFormat *types.Value `json:"FileFormat,omitempty"`
+
+	// IndexId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-faq.html#cfn-kendra-faq-indexid
+	IndexId *types.Value `json:"IndexId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-faq.html#cfn-kendra-faq-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-faq.html#cfn-kendra-faq-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// S3Path AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-faq.html#cfn-kendra-faq-s3path
+	S3Path *Faq_S3Path `json:"S3Path,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-faq.html#cfn-kendra-faq-tags
+	Tags []cloudformation.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 *Faq) AWSCloudFormationType() string {
+	return "AWS::Kendra::Faq"
+}
+
+// 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 Faq) MarshalJSON() ([]byte, error) {
+	type Properties Faq
+	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 *Faq) UnmarshalJSON(b []byte) error {
+	type Properties Faq
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Faq(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/kendra/aws-kendra-faq_s3path.go b/goformation/cloudformation/kendra/aws-kendra-faq_s3path.go
new file mode 100644
index 0000000000..fbd99aa1eb
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-faq_s3path.go
@@ -0,0 +1,42 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Faq_S3Path AWS CloudFormation Resource (AWS::Kendra::Faq.S3Path)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-faq-s3path.html
+type Faq_S3Path struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-faq-s3path.html#cfn-kendra-faq-s3path-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-faq-s3path.html#cfn-kendra-faq-s3path-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Faq_S3Path) AWSCloudFormationType() string {
+	return "AWS::Kendra::Faq.S3Path"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-faq_taglist.go b/goformation/cloudformation/kendra/aws-kendra-faq_taglist.go
new file mode 100644
index 0000000000..e62e8863dc
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-faq_taglist.go
@@ -0,0 +1,36 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Faq_TagList AWS CloudFormation Resource (AWS::Kendra::Faq.TagList)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-faq-taglist.html
+type Faq_TagList struct {
+
+	// TagList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-faq-taglist.html#cfn-kendra-faq-taglist-taglist
+	TagList []cloudformation.Tag `json:"TagList,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Faq_TagList) AWSCloudFormationType() string {
+	return "AWS::Kendra::Faq.TagList"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-index.go b/goformation/cloudformation/kendra/aws-kendra-index.go
new file mode 100644
index 0000000000..09c8988673
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-index.go
@@ -0,0 +1,154 @@
+package kendra
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Index AWS CloudFormation Resource (AWS::Kendra::Index)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-index.html
+type Index struct {
+
+	// CapacityUnits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-index.html#cfn-kendra-index-capacityunits
+	CapacityUnits *Index_CapacityUnitsConfiguration `json:"CapacityUnits,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-index.html#cfn-kendra-index-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DocumentMetadataConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-index.html#cfn-kendra-index-documentmetadataconfigurations
+	DocumentMetadataConfigurations []Index_DocumentMetadataConfiguration `json:"DocumentMetadataConfigurations,omitempty"`
+
+	// Edition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-index.html#cfn-kendra-index-edition
+	Edition *types.Value `json:"Edition,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-index.html#cfn-kendra-index-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-index.html#cfn-kendra-index-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// ServerSideEncryptionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-index.html#cfn-kendra-index-serversideencryptionconfiguration
+	ServerSideEncryptionConfiguration *Index_ServerSideEncryptionConfiguration `json:"ServerSideEncryptionConfiguration,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-index.html#cfn-kendra-index-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// UserContextPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-index.html#cfn-kendra-index-usercontextpolicy
+	UserContextPolicy *types.Value `json:"UserContextPolicy,omitempty"`
+
+	// UserTokenConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kendra-index.html#cfn-kendra-index-usertokenconfigurations
+	UserTokenConfigurations []Index_UserTokenConfiguration `json:"UserTokenConfigurations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::Kendra::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/kendra/aws-kendra-index_capacityunitsconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-index_capacityunitsconfiguration.go
new file mode 100644
index 0000000000..99e34420e6
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-index_capacityunitsconfiguration.go
@@ -0,0 +1,42 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Index_CapacityUnitsConfiguration AWS CloudFormation Resource (AWS::Kendra::Index.CapacityUnitsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-capacityunitsconfiguration.html
+type Index_CapacityUnitsConfiguration struct {
+
+	// QueryCapacityUnits AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-capacityunitsconfiguration.html#cfn-kendra-index-capacityunitsconfiguration-querycapacityunits
+	QueryCapacityUnits *types.Value `json:"QueryCapacityUnits"`
+
+	// StorageCapacityUnits AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-capacityunitsconfiguration.html#cfn-kendra-index-capacityunitsconfiguration-storagecapacityunits
+	StorageCapacityUnits *types.Value `json:"StorageCapacityUnits"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CapacityUnitsConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::Index.CapacityUnitsConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_documentmetadataconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-index_documentmetadataconfiguration.go
new file mode 100644
index 0000000000..4f86621bb8
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-index_documentmetadataconfiguration.go
@@ -0,0 +1,52 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Index_DocumentMetadataConfiguration AWS CloudFormation Resource (AWS::Kendra::Index.DocumentMetadataConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-documentmetadataconfiguration.html
+type Index_DocumentMetadataConfiguration struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-documentmetadataconfiguration.html#cfn-kendra-index-documentmetadataconfiguration-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Relevance AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-documentmetadataconfiguration.html#cfn-kendra-index-documentmetadataconfiguration-relevance
+	Relevance *Index_Relevance `json:"Relevance,omitempty"`
+
+	// Search AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-documentmetadataconfiguration.html#cfn-kendra-index-documentmetadataconfiguration-search
+	Search *Index_Search `json:"Search,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-documentmetadataconfiguration.html#cfn-kendra-index-documentmetadataconfiguration-type
+	Type *types.Value `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_DocumentMetadataConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::Index.DocumentMetadataConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_documentmetadataconfigurationlist.go b/goformation/cloudformation/kendra/aws-kendra-index_documentmetadataconfigurationlist.go
new file mode 100644
index 0000000000..b302044e91
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-index_documentmetadataconfigurationlist.go
@@ -0,0 +1,35 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Index_DocumentMetadataConfigurationList AWS CloudFormation Resource (AWS::Kendra::Index.DocumentMetadataConfigurationList)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-documentmetadataconfigurationlist.html
+type Index_DocumentMetadataConfigurationList struct {
+
+	// DocumentMetadataConfigurationList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-documentmetadataconfigurationlist.html#cfn-kendra-index-documentmetadataconfigurationlist-documentmetadataconfigurationlist
+	DocumentMetadataConfigurationList []Index_DocumentMetadataConfiguration `json:"DocumentMetadataConfigurationList,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DocumentMetadataConfigurationList) AWSCloudFormationType() string {
+	return "AWS::Kendra::Index.DocumentMetadataConfigurationList"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_jsontokentypeconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-index_jsontokentypeconfiguration.go
new file mode 100644
index 0000000000..6e5f0ee7d0
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-index_jsontokentypeconfiguration.go
@@ -0,0 +1,42 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Index_JsonTokenTypeConfiguration AWS CloudFormation Resource (AWS::Kendra::Index.JsonTokenTypeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-jsontokentypeconfiguration.html
+type Index_JsonTokenTypeConfiguration struct {
+
+	// GroupAttributeField AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-jsontokentypeconfiguration.html#cfn-kendra-index-jsontokentypeconfiguration-groupattributefield
+	GroupAttributeField *types.Value `json:"GroupAttributeField,omitempty"`
+
+	// UserNameAttributeField AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-jsontokentypeconfiguration.html#cfn-kendra-index-jsontokentypeconfiguration-usernameattributefield
+	UserNameAttributeField *types.Value `json:"UserNameAttributeField,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_JsonTokenTypeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::Index.JsonTokenTypeConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_jwttokentypeconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-index_jwttokentypeconfiguration.go
new file mode 100644
index 0000000000..9e4a133c1d
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-index_jwttokentypeconfiguration.go
@@ -0,0 +1,67 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Index_JwtTokenTypeConfiguration AWS CloudFormation Resource (AWS::Kendra::Index.JwtTokenTypeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-jwttokentypeconfiguration.html
+type Index_JwtTokenTypeConfiguration struct {
+
+	// ClaimRegex AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-jwttokentypeconfiguration.html#cfn-kendra-index-jwttokentypeconfiguration-claimregex
+	ClaimRegex *types.Value `json:"ClaimRegex,omitempty"`
+
+	// GroupAttributeField AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-jwttokentypeconfiguration.html#cfn-kendra-index-jwttokentypeconfiguration-groupattributefield
+	GroupAttributeField *types.Value `json:"GroupAttributeField,omitempty"`
+
+	// Issuer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-jwttokentypeconfiguration.html#cfn-kendra-index-jwttokentypeconfiguration-issuer
+	Issuer *types.Value `json:"Issuer,omitempty"`
+
+	// KeyLocation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-jwttokentypeconfiguration.html#cfn-kendra-index-jwttokentypeconfiguration-keylocation
+	KeyLocation *types.Value `json:"KeyLocation,omitempty"`
+
+	// SecretManagerArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-jwttokentypeconfiguration.html#cfn-kendra-index-jwttokentypeconfiguration-secretmanagerarn
+	SecretManagerArn *types.Value `json:"SecretManagerArn,omitempty"`
+
+	// URL AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-jwttokentypeconfiguration.html#cfn-kendra-index-jwttokentypeconfiguration-url
+	URL *types.Value `json:"URL,omitempty"`
+
+	// UserNameAttributeField AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-jwttokentypeconfiguration.html#cfn-kendra-index-jwttokentypeconfiguration-usernameattributefield
+	UserNameAttributeField *types.Value `json:"UserNameAttributeField,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_JwtTokenTypeConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::Index.JwtTokenTypeConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_relevance.go b/goformation/cloudformation/kendra/aws-kendra-index_relevance.go
new file mode 100644
index 0000000000..027c534f86
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-index_relevance.go
@@ -0,0 +1,57 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Index_Relevance AWS CloudFormation Resource (AWS::Kendra::Index.Relevance)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-relevance.html
+type Index_Relevance struct {
+
+	// Duration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-relevance.html#cfn-kendra-index-relevance-duration
+	Duration *types.Value `json:"Duration,omitempty"`
+
+	// Freshness AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-relevance.html#cfn-kendra-index-relevance-freshness
+	Freshness *types.Value `json:"Freshness,omitempty"`
+
+	// Importance AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-relevance.html#cfn-kendra-index-relevance-importance
+	Importance *types.Value `json:"Importance,omitempty"`
+
+	// RankOrder AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-relevance.html#cfn-kendra-index-relevance-rankorder
+	RankOrder *types.Value `json:"RankOrder,omitempty"`
+
+	// ValueImportanceItems AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-relevance.html#cfn-kendra-index-relevance-valueimportanceitems
+	ValueImportanceItems []Index_ValueImportanceItem `json:"ValueImportanceItems,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Relevance) AWSCloudFormationType() string {
+	return "AWS::Kendra::Index.Relevance"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_search.go b/goformation/cloudformation/kendra/aws-kendra-index_search.go
new file mode 100644
index 0000000000..d69b58640d
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-index_search.go
@@ -0,0 +1,52 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Index_Search AWS CloudFormation Resource (AWS::Kendra::Index.Search)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-search.html
+type Index_Search struct {
+
+	// Displayable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-search.html#cfn-kendra-index-search-displayable
+	Displayable *types.Value `json:"Displayable,omitempty"`
+
+	// Facetable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-search.html#cfn-kendra-index-search-facetable
+	Facetable *types.Value `json:"Facetable,omitempty"`
+
+	// Searchable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-search.html#cfn-kendra-index-search-searchable
+	Searchable *types.Value `json:"Searchable,omitempty"`
+
+	// Sortable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-search.html#cfn-kendra-index-search-sortable
+	Sortable *types.Value `json:"Sortable,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Search) AWSCloudFormationType() string {
+	return "AWS::Kendra::Index.Search"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_serversideencryptionconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-index_serversideencryptionconfiguration.go
new file mode 100644
index 0000000000..464d83c763
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-index_serversideencryptionconfiguration.go
@@ -0,0 +1,37 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Index_ServerSideEncryptionConfiguration AWS CloudFormation Resource (AWS::Kendra::Index.ServerSideEncryptionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-serversideencryptionconfiguration.html
+type Index_ServerSideEncryptionConfiguration struct {
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-serversideencryptionconfiguration.html#cfn-kendra-index-serversideencryptionconfiguration-kmskeyid
+	KmsKeyId *types.Value `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 *Index_ServerSideEncryptionConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::Index.ServerSideEncryptionConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_taglist.go b/goformation/cloudformation/kendra/aws-kendra-index_taglist.go
new file mode 100644
index 0000000000..80667f8061
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-index_taglist.go
@@ -0,0 +1,36 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Index_TagList AWS CloudFormation Resource (AWS::Kendra::Index.TagList)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-taglist.html
+type Index_TagList struct {
+
+	// TagList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-taglist.html#cfn-kendra-index-taglist-taglist
+	TagList []cloudformation.Tag `json:"TagList,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TagList) AWSCloudFormationType() string {
+	return "AWS::Kendra::Index.TagList"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_usertokenconfiguration.go b/goformation/cloudformation/kendra/aws-kendra-index_usertokenconfiguration.go
new file mode 100644
index 0000000000..55282ed6ab
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-index_usertokenconfiguration.go
@@ -0,0 +1,40 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Index_UserTokenConfiguration AWS CloudFormation Resource (AWS::Kendra::Index.UserTokenConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-usertokenconfiguration.html
+type Index_UserTokenConfiguration struct {
+
+	// JsonTokenTypeConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-usertokenconfiguration.html#cfn-kendra-index-usertokenconfiguration-jsontokentypeconfiguration
+	JsonTokenTypeConfiguration *Index_JsonTokenTypeConfiguration `json:"JsonTokenTypeConfiguration,omitempty"`
+
+	// JwtTokenTypeConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-usertokenconfiguration.html#cfn-kendra-index-usertokenconfiguration-jwttokentypeconfiguration
+	JwtTokenTypeConfiguration *Index_JwtTokenTypeConfiguration `json:"JwtTokenTypeConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_UserTokenConfiguration) AWSCloudFormationType() string {
+	return "AWS::Kendra::Index.UserTokenConfiguration"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_valueimportanceitem.go b/goformation/cloudformation/kendra/aws-kendra-index_valueimportanceitem.go
new file mode 100644
index 0000000000..6c7b861af3
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-index_valueimportanceitem.go
@@ -0,0 +1,42 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Index_ValueImportanceItem AWS CloudFormation Resource (AWS::Kendra::Index.ValueImportanceItem)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-valueimportanceitem.html
+type Index_ValueImportanceItem struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-valueimportanceitem.html#cfn-kendra-index-valueimportanceitem-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-valueimportanceitem.html#cfn-kendra-index-valueimportanceitem-value
+	Value *types.Value `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 *Index_ValueImportanceItem) AWSCloudFormationType() string {
+	return "AWS::Kendra::Index.ValueImportanceItem"
+}
diff --git a/goformation/cloudformation/kendra/aws-kendra-index_valueimportanceitems.go b/goformation/cloudformation/kendra/aws-kendra-index_valueimportanceitems.go
new file mode 100644
index 0000000000..e46f758188
--- /dev/null
+++ b/goformation/cloudformation/kendra/aws-kendra-index_valueimportanceitems.go
@@ -0,0 +1,35 @@
+package kendra
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Index_ValueImportanceItems AWS CloudFormation Resource (AWS::Kendra::Index.ValueImportanceItems)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-valueimportanceitems.html
+type Index_ValueImportanceItems struct {
+
+	// ValueImportanceItems AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kendra-index-valueimportanceitems.html#cfn-kendra-index-valueimportanceitems-valueimportanceitems
+	ValueImportanceItems []Index_ValueImportanceItem `json:"ValueImportanceItems,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ValueImportanceItems) AWSCloudFormationType() string {
+	return "AWS::Kendra::Index.ValueImportanceItems"
+}
diff --git a/goformation/cloudformation/kinesis/aws-kinesis-stream.go b/goformation/cloudformation/kinesis/aws-kinesis-stream.go
new file mode 100644
index 0000000000..3de5d31e31
--- /dev/null
+++ b/goformation/cloudformation/kinesis/aws-kinesis-stream.go
@@ -0,0 +1,129 @@
+package kinesis
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stream AWS CloudFormation Resource (AWS::Kinesis::Stream)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesis-stream.html
+type Stream struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesis-stream.html#cfn-kinesis-stream-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RetentionPeriodHours AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesis-stream.html#cfn-kinesis-stream-retentionperiodhours
+	RetentionPeriodHours *types.Value `json:"RetentionPeriodHours,omitempty"`
+
+	// ShardCount AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesis-stream.html#cfn-kinesis-stream-shardcount
+	ShardCount *types.Value `json:"ShardCount"`
+
+	// StreamEncryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesis-stream.html#cfn-kinesis-stream-streamencryption
+	StreamEncryption *Stream_StreamEncryption `json:"StreamEncryption,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesis-stream.html#cfn-kinesis-stream-tags
+	Tags []cloudformation.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 *Stream) AWSCloudFormationType() string {
+	return "AWS::Kinesis::Stream"
+}
+
+// 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 Stream) MarshalJSON() ([]byte, error) {
+	type Properties Stream
+	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 *Stream) UnmarshalJSON(b []byte) error {
+	type Properties Stream
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Stream(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/kinesis/aws-kinesis-stream_streamencryption.go b/goformation/cloudformation/kinesis/aws-kinesis-stream_streamencryption.go
new file mode 100644
index 0000000000..136f7ab6bd
--- /dev/null
+++ b/goformation/cloudformation/kinesis/aws-kinesis-stream_streamencryption.go
@@ -0,0 +1,42 @@
+package kinesis
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stream_StreamEncryption AWS CloudFormation Resource (AWS::Kinesis::Stream.StreamEncryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesis-stream-streamencryption.html
+type Stream_StreamEncryption struct {
+
+	// EncryptionType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesis-stream-streamencryption.html#cfn-kinesis-stream-streamencryption-encryptiontype
+	EncryptionType *types.Value `json:"EncryptionType,omitempty"`
+
+	// KeyId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesis-stream-streamencryption.html#cfn-kinesis-stream-streamencryption-keyid
+	KeyId *types.Value `json:"KeyId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Stream_StreamEncryption) AWSCloudFormationType() string {
+	return "AWS::Kinesis::Stream.StreamEncryption"
+}
diff --git a/goformation/cloudformation/kinesis/aws-kinesis-streamconsumer.go b/goformation/cloudformation/kinesis/aws-kinesis-streamconsumer.go
new file mode 100644
index 0000000000..eaf31edadf
--- /dev/null
+++ b/goformation/cloudformation/kinesis/aws-kinesis-streamconsumer.go
@@ -0,0 +1,113 @@
+package kinesis
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StreamConsumer AWS CloudFormation Resource (AWS::Kinesis::StreamConsumer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesis-streamconsumer.html
+type StreamConsumer struct {
+
+	// ConsumerName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesis-streamconsumer.html#cfn-kinesis-streamconsumer-consumername
+	ConsumerName *types.Value `json:"ConsumerName,omitempty"`
+
+	// StreamARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesis-streamconsumer.html#cfn-kinesis-streamconsumer-streamarn
+	StreamARN *types.Value `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 *StreamConsumer) AWSCloudFormationType() string {
+	return "AWS::Kinesis::StreamConsumer"
+}
+
+// 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 StreamConsumer) MarshalJSON() ([]byte, error) {
+	type Properties StreamConsumer
+	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 *StreamConsumer) UnmarshalJSON(b []byte) error {
+	type Properties StreamConsumer
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = StreamConsumer(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application.go
new file mode 100644
index 0000000000..f7b3c286a1
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application.go
@@ -0,0 +1,123 @@
+package kinesisanalytics
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application AWS CloudFormation Resource (AWS::KinesisAnalytics::Application)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-application.html
+type Application struct {
+
+	// ApplicationCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-application.html#cfn-kinesisanalytics-application-applicationcode
+	ApplicationCode *types.Value `json:"ApplicationCode,omitempty"`
+
+	// ApplicationDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-application.html#cfn-kinesisanalytics-application-applicationdescription
+	ApplicationDescription *types.Value `json:"ApplicationDescription,omitempty"`
+
+	// ApplicationName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-application.html#cfn-kinesisanalytics-application-applicationname
+	ApplicationName *types.Value `json:"ApplicationName,omitempty"`
+
+	// Inputs AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-application.html#cfn-kinesisanalytics-application-inputs
+	Inputs []Application_Input `json:"Inputs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::KinesisAnalytics::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_csvmappingparameters.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_csvmappingparameters.go
new file mode 100644
index 0000000000..d485dee31f
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_csvmappingparameters.go
@@ -0,0 +1,42 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_CSVMappingParameters AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.CSVMappingParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-csvmappingparameters.html
+type Application_CSVMappingParameters struct {
+
+	// RecordColumnDelimiter AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-csvmappingparameters.html#cfn-kinesisanalytics-application-csvmappingparameters-recordcolumndelimiter
+	RecordColumnDelimiter *types.Value `json:"RecordColumnDelimiter,omitempty"`
+
+	// RecordRowDelimiter AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-csvmappingparameters.html#cfn-kinesisanalytics-application-csvmappingparameters-recordrowdelimiter
+	RecordRowDelimiter *types.Value `json:"RecordRowDelimiter,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CSVMappingParameters) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::Application.CSVMappingParameters"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_input.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_input.go
new file mode 100644
index 0000000000..0e0ce2060b
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_input.go
@@ -0,0 +1,62 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_Input AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.Input)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-input.html
+type Application_Input struct {
+
+	// InputParallelism AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-input.html#cfn-kinesisanalytics-application-input-inputparallelism
+	InputParallelism *Application_InputParallelism `json:"InputParallelism,omitempty"`
+
+	// InputProcessingConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-input.html#cfn-kinesisanalytics-application-input-inputprocessingconfiguration
+	InputProcessingConfiguration *Application_InputProcessingConfiguration `json:"InputProcessingConfiguration,omitempty"`
+
+	// InputSchema AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-input.html#cfn-kinesisanalytics-application-input-inputschema
+	InputSchema *Application_InputSchema `json:"InputSchema,omitempty"`
+
+	// KinesisFirehoseInput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-input.html#cfn-kinesisanalytics-application-input-kinesisfirehoseinput
+	KinesisFirehoseInput *Application_KinesisFirehoseInput `json:"KinesisFirehoseInput,omitempty"`
+
+	// KinesisStreamsInput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-input.html#cfn-kinesisanalytics-application-input-kinesisstreamsinput
+	KinesisStreamsInput *Application_KinesisStreamsInput `json:"KinesisStreamsInput,omitempty"`
+
+	// NamePrefix AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-input.html#cfn-kinesisanalytics-application-input-nameprefix
+	NamePrefix *types.Value `json:"NamePrefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Input) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::Application.Input"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputlambdaprocessor.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputlambdaprocessor.go
new file mode 100644
index 0000000000..1e1482a38e
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputlambdaprocessor.go
@@ -0,0 +1,42 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_InputLambdaProcessor AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.InputLambdaProcessor)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-inputlambdaprocessor.html
+type Application_InputLambdaProcessor struct {
+
+	// ResourceARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-inputlambdaprocessor.html#cfn-kinesisanalytics-application-inputlambdaprocessor-resourcearn
+	ResourceARN *types.Value `json:"ResourceARN,omitempty"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-inputlambdaprocessor.html#cfn-kinesisanalytics-application-inputlambdaprocessor-rolearn
+	RoleARN *types.Value `json:"RoleARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InputLambdaProcessor) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::Application.InputLambdaProcessor"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputparallelism.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputparallelism.go
new file mode 100644
index 0000000000..de9833d6f9
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputparallelism.go
@@ -0,0 +1,37 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_InputParallelism AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.InputParallelism)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-inputparallelism.html
+type Application_InputParallelism struct {
+
+	// Count AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-inputparallelism.html#cfn-kinesisanalytics-application-inputparallelism-count
+	Count *types.Value `json:"Count,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InputParallelism) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::Application.InputParallelism"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputprocessingconfiguration.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputprocessingconfiguration.go
new file mode 100644
index 0000000000..8e9a9d1067
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputprocessingconfiguration.go
@@ -0,0 +1,35 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_InputProcessingConfiguration AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.InputProcessingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-inputprocessingconfiguration.html
+type Application_InputProcessingConfiguration struct {
+
+	// InputLambdaProcessor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-inputprocessingconfiguration.html#cfn-kinesisanalytics-application-inputprocessingconfiguration-inputlambdaprocessor
+	InputLambdaProcessor *Application_InputLambdaProcessor `json:"InputLambdaProcessor,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InputProcessingConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::Application.InputProcessingConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputschema.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputschema.go
new file mode 100644
index 0000000000..42719840a1
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_inputschema.go
@@ -0,0 +1,47 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_InputSchema AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.InputSchema)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-inputschema.html
+type Application_InputSchema struct {
+
+	// RecordColumns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-inputschema.html#cfn-kinesisanalytics-application-inputschema-recordcolumns
+	RecordColumns []Application_RecordColumn `json:"RecordColumns,omitempty"`
+
+	// RecordEncoding AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-inputschema.html#cfn-kinesisanalytics-application-inputschema-recordencoding
+	RecordEncoding *types.Value `json:"RecordEncoding,omitempty"`
+
+	// RecordFormat AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-inputschema.html#cfn-kinesisanalytics-application-inputschema-recordformat
+	RecordFormat *Application_RecordFormat `json:"RecordFormat,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InputSchema) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::Application.InputSchema"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_jsonmappingparameters.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_jsonmappingparameters.go
new file mode 100644
index 0000000000..777168f541
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_jsonmappingparameters.go
@@ -0,0 +1,37 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_JSONMappingParameters AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.JSONMappingParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-jsonmappingparameters.html
+type Application_JSONMappingParameters struct {
+
+	// RecordRowPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-jsonmappingparameters.html#cfn-kinesisanalytics-application-jsonmappingparameters-recordrowpath
+	RecordRowPath *types.Value `json:"RecordRowPath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_JSONMappingParameters) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::Application.JSONMappingParameters"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisfirehoseinput.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisfirehoseinput.go
new file mode 100644
index 0000000000..7626fb3047
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisfirehoseinput.go
@@ -0,0 +1,42 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_KinesisFirehoseInput AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.KinesisFirehoseInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-kinesisfirehoseinput.html
+type Application_KinesisFirehoseInput struct {
+
+	// ResourceARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-kinesisfirehoseinput.html#cfn-kinesisanalytics-application-kinesisfirehoseinput-resourcearn
+	ResourceARN *types.Value `json:"ResourceARN,omitempty"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-kinesisfirehoseinput.html#cfn-kinesisanalytics-application-kinesisfirehoseinput-rolearn
+	RoleARN *types.Value `json:"RoleARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_KinesisFirehoseInput) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::Application.KinesisFirehoseInput"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisstreamsinput.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisstreamsinput.go
new file mode 100644
index 0000000000..2da175c69c
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_kinesisstreamsinput.go
@@ -0,0 +1,42 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_KinesisStreamsInput AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.KinesisStreamsInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-kinesisstreamsinput.html
+type Application_KinesisStreamsInput struct {
+
+	// ResourceARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-kinesisstreamsinput.html#cfn-kinesisanalytics-application-kinesisstreamsinput-resourcearn
+	ResourceARN *types.Value `json:"ResourceARN,omitempty"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-kinesisstreamsinput.html#cfn-kinesisanalytics-application-kinesisstreamsinput-rolearn
+	RoleARN *types.Value `json:"RoleARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_KinesisStreamsInput) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::Application.KinesisStreamsInput"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_mappingparameters.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_mappingparameters.go
new file mode 100644
index 0000000000..2d97ca4e47
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_mappingparameters.go
@@ -0,0 +1,40 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_MappingParameters AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.MappingParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-mappingparameters.html
+type Application_MappingParameters struct {
+
+	// CSVMappingParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-mappingparameters.html#cfn-kinesisanalytics-application-mappingparameters-csvmappingparameters
+	CSVMappingParameters *Application_CSVMappingParameters `json:"CSVMappingParameters,omitempty"`
+
+	// JSONMappingParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-mappingparameters.html#cfn-kinesisanalytics-application-mappingparameters-jsonmappingparameters
+	JSONMappingParameters *Application_JSONMappingParameters `json:"JSONMappingParameters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_MappingParameters) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::Application.MappingParameters"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordcolumn.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordcolumn.go
new file mode 100644
index 0000000000..c16eb978ee
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordcolumn.go
@@ -0,0 +1,47 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_RecordColumn AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.RecordColumn)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-recordcolumn.html
+type Application_RecordColumn struct {
+
+	// Mapping AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-recordcolumn.html#cfn-kinesisanalytics-application-recordcolumn-mapping
+	Mapping *types.Value `json:"Mapping,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-recordcolumn.html#cfn-kinesisanalytics-application-recordcolumn-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SqlType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-recordcolumn.html#cfn-kinesisanalytics-application-recordcolumn-sqltype
+	SqlType *types.Value `json:"SqlType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RecordColumn) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::Application.RecordColumn"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordformat.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordformat.go
new file mode 100644
index 0000000000..aef1d14aab
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-application_recordformat.go
@@ -0,0 +1,42 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_RecordFormat AWS CloudFormation Resource (AWS::KinesisAnalytics::Application.RecordFormat)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-recordformat.html
+type Application_RecordFormat struct {
+
+	// MappingParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-recordformat.html#cfn-kinesisanalytics-application-recordformat-mappingparameters
+	MappingParameters *Application_MappingParameters `json:"MappingParameters,omitempty"`
+
+	// RecordFormatType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-application-recordformat.html#cfn-kinesisanalytics-application-recordformat-recordformattype
+	RecordFormatType *types.Value `json:"RecordFormatType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RecordFormat) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::Application.RecordFormat"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput.go
new file mode 100644
index 0000000000..ac89331f46
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput.go
@@ -0,0 +1,113 @@
+package kinesisanalytics
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationOutput AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationOutput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-applicationoutput.html
+type ApplicationOutput struct {
+
+	// ApplicationName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-applicationoutput.html#cfn-kinesisanalytics-applicationoutput-applicationname
+	ApplicationName *types.Value `json:"ApplicationName,omitempty"`
+
+	// Output AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-applicationoutput.html#cfn-kinesisanalytics-applicationoutput-output
+	Output *ApplicationOutput_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 *ApplicationOutput) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::ApplicationOutput"
+}
+
+// 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 ApplicationOutput) MarshalJSON() ([]byte, error) {
+	type Properties ApplicationOutput
+	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 *ApplicationOutput) UnmarshalJSON(b []byte) error {
+	type Properties ApplicationOutput
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ApplicationOutput(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_destinationschema.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_destinationschema.go
new file mode 100644
index 0000000000..93c1edf282
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_destinationschema.go
@@ -0,0 +1,37 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationOutput_DestinationSchema AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationOutput.DestinationSchema)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-destinationschema.html
+type ApplicationOutput_DestinationSchema struct {
+
+	// RecordFormatType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-destinationschema.html#cfn-kinesisanalytics-applicationoutput-destinationschema-recordformattype
+	RecordFormatType *types.Value `json:"RecordFormatType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationOutput_DestinationSchema) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::ApplicationOutput.DestinationSchema"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisfirehoseoutput.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisfirehoseoutput.go
new file mode 100644
index 0000000000..297feba382
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisfirehoseoutput.go
@@ -0,0 +1,42 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationOutput_KinesisFirehoseOutput AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationOutput.KinesisFirehoseOutput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-kinesisfirehoseoutput.html
+type ApplicationOutput_KinesisFirehoseOutput struct {
+
+	// ResourceARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-kinesisfirehoseoutput.html#cfn-kinesisanalytics-applicationoutput-kinesisfirehoseoutput-resourcearn
+	ResourceARN *types.Value `json:"ResourceARN,omitempty"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-kinesisfirehoseoutput.html#cfn-kinesisanalytics-applicationoutput-kinesisfirehoseoutput-rolearn
+	RoleARN *types.Value `json:"RoleARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationOutput_KinesisFirehoseOutput) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::ApplicationOutput.KinesisFirehoseOutput"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisstreamsoutput.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisstreamsoutput.go
new file mode 100644
index 0000000000..b7c82ea5ea
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_kinesisstreamsoutput.go
@@ -0,0 +1,42 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationOutput_KinesisStreamsOutput AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationOutput.KinesisStreamsOutput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-kinesisstreamsoutput.html
+type ApplicationOutput_KinesisStreamsOutput struct {
+
+	// ResourceARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-kinesisstreamsoutput.html#cfn-kinesisanalytics-applicationoutput-kinesisstreamsoutput-resourcearn
+	ResourceARN *types.Value `json:"ResourceARN,omitempty"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-kinesisstreamsoutput.html#cfn-kinesisanalytics-applicationoutput-kinesisstreamsoutput-rolearn
+	RoleARN *types.Value `json:"RoleARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationOutput_KinesisStreamsOutput) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::ApplicationOutput.KinesisStreamsOutput"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_lambdaoutput.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_lambdaoutput.go
new file mode 100644
index 0000000000..31f9f43026
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_lambdaoutput.go
@@ -0,0 +1,42 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationOutput_LambdaOutput AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationOutput.LambdaOutput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-lambdaoutput.html
+type ApplicationOutput_LambdaOutput struct {
+
+	// ResourceARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-lambdaoutput.html#cfn-kinesisanalytics-applicationoutput-lambdaoutput-resourcearn
+	ResourceARN *types.Value `json:"ResourceARN,omitempty"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-lambdaoutput.html#cfn-kinesisanalytics-applicationoutput-lambdaoutput-rolearn
+	RoleARN *types.Value `json:"RoleARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationOutput_LambdaOutput) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::ApplicationOutput.LambdaOutput"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_output.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_output.go
new file mode 100644
index 0000000000..05d4cd5189
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationoutput_output.go
@@ -0,0 +1,57 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationOutput_Output AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationOutput.Output)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-output.html
+type ApplicationOutput_Output struct {
+
+	// DestinationSchema AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-output.html#cfn-kinesisanalytics-applicationoutput-output-destinationschema
+	DestinationSchema *ApplicationOutput_DestinationSchema `json:"DestinationSchema,omitempty"`
+
+	// KinesisFirehoseOutput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-output.html#cfn-kinesisanalytics-applicationoutput-output-kinesisfirehoseoutput
+	KinesisFirehoseOutput *ApplicationOutput_KinesisFirehoseOutput `json:"KinesisFirehoseOutput,omitempty"`
+
+	// KinesisStreamsOutput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-output.html#cfn-kinesisanalytics-applicationoutput-output-kinesisstreamsoutput
+	KinesisStreamsOutput *ApplicationOutput_KinesisStreamsOutput `json:"KinesisStreamsOutput,omitempty"`
+
+	// LambdaOutput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-output.html#cfn-kinesisanalytics-applicationoutput-output-lambdaoutput
+	LambdaOutput *ApplicationOutput_LambdaOutput `json:"LambdaOutput,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationoutput-output.html#cfn-kinesisanalytics-applicationoutput-output-name
+	Name *types.Value `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 *ApplicationOutput_Output) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::ApplicationOutput.Output"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource.go
new file mode 100644
index 0000000000..5a087997dc
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource.go
@@ -0,0 +1,113 @@
+package kinesisanalytics
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationReferenceDataSource AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-applicationreferencedatasource.html
+type ApplicationReferenceDataSource struct {
+
+	// ApplicationName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-applicationreferencedatasource.html#cfn-kinesisanalytics-applicationreferencedatasource-applicationname
+	ApplicationName *types.Value `json:"ApplicationName,omitempty"`
+
+	// ReferenceDataSource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalytics-applicationreferencedatasource.html#cfn-kinesisanalytics-applicationreferencedatasource-referencedatasource
+	ReferenceDataSource *ApplicationReferenceDataSource_ReferenceDataSource `json:"ReferenceDataSource,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationReferenceDataSource) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::ApplicationReferenceDataSource"
+}
+
+// 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 ApplicationReferenceDataSource) MarshalJSON() ([]byte, error) {
+	type Properties ApplicationReferenceDataSource
+	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 *ApplicationReferenceDataSource) UnmarshalJSON(b []byte) error {
+	type Properties ApplicationReferenceDataSource
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ApplicationReferenceDataSource(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_csvmappingparameters.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_csvmappingparameters.go
new file mode 100644
index 0000000000..907bc75dab
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_csvmappingparameters.go
@@ -0,0 +1,42 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationReferenceDataSource_CSVMappingParameters AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.CSVMappingParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-csvmappingparameters.html
+type ApplicationReferenceDataSource_CSVMappingParameters struct {
+
+	// RecordColumnDelimiter AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-csvmappingparameters.html#cfn-kinesisanalytics-applicationreferencedatasource-csvmappingparameters-recordcolumndelimiter
+	RecordColumnDelimiter *types.Value `json:"RecordColumnDelimiter,omitempty"`
+
+	// RecordRowDelimiter AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-csvmappingparameters.html#cfn-kinesisanalytics-applicationreferencedatasource-csvmappingparameters-recordrowdelimiter
+	RecordRowDelimiter *types.Value `json:"RecordRowDelimiter,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationReferenceDataSource_CSVMappingParameters) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::ApplicationReferenceDataSource.CSVMappingParameters"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_jsonmappingparameters.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_jsonmappingparameters.go
new file mode 100644
index 0000000000..a0374e18bc
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_jsonmappingparameters.go
@@ -0,0 +1,37 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationReferenceDataSource_JSONMappingParameters AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.JSONMappingParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-jsonmappingparameters.html
+type ApplicationReferenceDataSource_JSONMappingParameters struct {
+
+	// RecordRowPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-jsonmappingparameters.html#cfn-kinesisanalytics-applicationreferencedatasource-jsonmappingparameters-recordrowpath
+	RecordRowPath *types.Value `json:"RecordRowPath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationReferenceDataSource_JSONMappingParameters) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::ApplicationReferenceDataSource.JSONMappingParameters"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_mappingparameters.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_mappingparameters.go
new file mode 100644
index 0000000000..0c2bf17b5b
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_mappingparameters.go
@@ -0,0 +1,40 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationReferenceDataSource_MappingParameters AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.MappingParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-mappingparameters.html
+type ApplicationReferenceDataSource_MappingParameters struct {
+
+	// CSVMappingParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-mappingparameters.html#cfn-kinesisanalytics-applicationreferencedatasource-mappingparameters-csvmappingparameters
+	CSVMappingParameters *ApplicationReferenceDataSource_CSVMappingParameters `json:"CSVMappingParameters,omitempty"`
+
+	// JSONMappingParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-mappingparameters.html#cfn-kinesisanalytics-applicationreferencedatasource-mappingparameters-jsonmappingparameters
+	JSONMappingParameters *ApplicationReferenceDataSource_JSONMappingParameters `json:"JSONMappingParameters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationReferenceDataSource_MappingParameters) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::ApplicationReferenceDataSource.MappingParameters"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordcolumn.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordcolumn.go
new file mode 100644
index 0000000000..fd878484a9
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordcolumn.go
@@ -0,0 +1,47 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationReferenceDataSource_RecordColumn AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordColumn)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-recordcolumn.html
+type ApplicationReferenceDataSource_RecordColumn struct {
+
+	// Mapping AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-recordcolumn.html#cfn-kinesisanalytics-applicationreferencedatasource-recordcolumn-mapping
+	Mapping *types.Value `json:"Mapping,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-recordcolumn.html#cfn-kinesisanalytics-applicationreferencedatasource-recordcolumn-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SqlType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-recordcolumn.html#cfn-kinesisanalytics-applicationreferencedatasource-recordcolumn-sqltype
+	SqlType *types.Value `json:"SqlType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationReferenceDataSource_RecordColumn) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordColumn"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordformat.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordformat.go
new file mode 100644
index 0000000000..bcdd39d9e9
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_recordformat.go
@@ -0,0 +1,42 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationReferenceDataSource_RecordFormat AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordFormat)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-recordformat.html
+type ApplicationReferenceDataSource_RecordFormat struct {
+
+	// MappingParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-recordformat.html#cfn-kinesisanalytics-applicationreferencedatasource-recordformat-mappingparameters
+	MappingParameters *ApplicationReferenceDataSource_MappingParameters `json:"MappingParameters,omitempty"`
+
+	// RecordFormatType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-recordformat.html#cfn-kinesisanalytics-applicationreferencedatasource-recordformat-recordformattype
+	RecordFormatType *types.Value `json:"RecordFormatType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationReferenceDataSource_RecordFormat) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordFormat"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referencedatasource.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referencedatasource.go
new file mode 100644
index 0000000000..adb20f5035
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referencedatasource.go
@@ -0,0 +1,47 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationReferenceDataSource_ReferenceDataSource AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceDataSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-referencedatasource.html
+type ApplicationReferenceDataSource_ReferenceDataSource struct {
+
+	// ReferenceSchema AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-referencedatasource.html#cfn-kinesisanalytics-applicationreferencedatasource-referencedatasource-referenceschema
+	ReferenceSchema *ApplicationReferenceDataSource_ReferenceSchema `json:"ReferenceSchema,omitempty"`
+
+	// S3ReferenceDataSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-referencedatasource.html#cfn-kinesisanalytics-applicationreferencedatasource-referencedatasource-s3referencedatasource
+	S3ReferenceDataSource *ApplicationReferenceDataSource_S3ReferenceDataSource `json:"S3ReferenceDataSource,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-referencedatasource.html#cfn-kinesisanalytics-applicationreferencedatasource-referencedatasource-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationReferenceDataSource_ReferenceDataSource) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceDataSource"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referenceschema.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referenceschema.go
new file mode 100644
index 0000000000..82589ae83a
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_referenceschema.go
@@ -0,0 +1,47 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationReferenceDataSource_ReferenceSchema AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceSchema)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-referenceschema.html
+type ApplicationReferenceDataSource_ReferenceSchema struct {
+
+	// RecordColumns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-referenceschema.html#cfn-kinesisanalytics-applicationreferencedatasource-referenceschema-recordcolumns
+	RecordColumns []ApplicationReferenceDataSource_RecordColumn `json:"RecordColumns,omitempty"`
+
+	// RecordEncoding AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-referenceschema.html#cfn-kinesisanalytics-applicationreferencedatasource-referenceschema-recordencoding
+	RecordEncoding *types.Value `json:"RecordEncoding,omitempty"`
+
+	// RecordFormat AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-referenceschema.html#cfn-kinesisanalytics-applicationreferencedatasource-referenceschema-recordformat
+	RecordFormat *ApplicationReferenceDataSource_RecordFormat `json:"RecordFormat,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationReferenceDataSource_ReferenceSchema) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceSchema"
+}
diff --git a/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_s3referencedatasource.go b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_s3referencedatasource.go
new file mode 100644
index 0000000000..3cdba42192
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalytics/aws-kinesisanalytics-applicationreferencedatasource_s3referencedatasource.go
@@ -0,0 +1,47 @@
+package kinesisanalytics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationReferenceDataSource_S3ReferenceDataSource AWS CloudFormation Resource (AWS::KinesisAnalytics::ApplicationReferenceDataSource.S3ReferenceDataSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-s3referencedatasource.html
+type ApplicationReferenceDataSource_S3ReferenceDataSource struct {
+
+	// BucketARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-s3referencedatasource.html#cfn-kinesisanalytics-applicationreferencedatasource-s3referencedatasource-bucketarn
+	BucketARN *types.Value `json:"BucketARN,omitempty"`
+
+	// FileKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-s3referencedatasource.html#cfn-kinesisanalytics-applicationreferencedatasource-s3referencedatasource-filekey
+	FileKey *types.Value `json:"FileKey,omitempty"`
+
+	// ReferenceRoleARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalytics-applicationreferencedatasource-s3referencedatasource.html#cfn-kinesisanalytics-applicationreferencedatasource-s3referencedatasource-referencerolearn
+	ReferenceRoleARN *types.Value `json:"ReferenceRoleARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationReferenceDataSource_S3ReferenceDataSource) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalytics::ApplicationReferenceDataSource.S3ReferenceDataSource"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application.go
new file mode 100644
index 0000000000..16ce075b3b
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application.go
@@ -0,0 +1,139 @@
+package kinesisanalyticsv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalyticsv2-application.html
+type Application struct {
+
+	// ApplicationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalyticsv2-application.html#cfn-kinesisanalyticsv2-application-applicationconfiguration
+	ApplicationConfiguration *Application_ApplicationConfiguration `json:"ApplicationConfiguration,omitempty"`
+
+	// ApplicationDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalyticsv2-application.html#cfn-kinesisanalyticsv2-application-applicationdescription
+	ApplicationDescription *types.Value `json:"ApplicationDescription,omitempty"`
+
+	// ApplicationMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalyticsv2-application.html#cfn-kinesisanalyticsv2-application-applicationmode
+	ApplicationMode *types.Value `json:"ApplicationMode,omitempty"`
+
+	// ApplicationName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalyticsv2-application.html#cfn-kinesisanalyticsv2-application-applicationname
+	ApplicationName *types.Value `json:"ApplicationName,omitempty"`
+
+	// RuntimeEnvironment AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalyticsv2-application.html#cfn-kinesisanalyticsv2-application-runtimeenvironment
+	RuntimeEnvironment *types.Value `json:"RuntimeEnvironment,omitempty"`
+
+	// ServiceExecutionRole AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalyticsv2-application.html#cfn-kinesisanalyticsv2-application-serviceexecutionrole
+	ServiceExecutionRole *types.Value `json:"ServiceExecutionRole,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalyticsv2-application.html#cfn-kinesisanalyticsv2-application-tags
+	Tags []cloudformation.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::KinesisAnalyticsV2::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationcodeconfiguration.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationcodeconfiguration.go
new file mode 100644
index 0000000000..21744238f8
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationcodeconfiguration.go
@@ -0,0 +1,42 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_ApplicationCodeConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.ApplicationCodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-applicationcodeconfiguration.html
+type Application_ApplicationCodeConfiguration struct {
+
+	// CodeContent AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-applicationcodeconfiguration.html#cfn-kinesisanalyticsv2-application-applicationcodeconfiguration-codecontent
+	CodeContent *Application_CodeContent `json:"CodeContent,omitempty"`
+
+	// CodeContentType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-applicationcodeconfiguration.html#cfn-kinesisanalyticsv2-application-applicationcodeconfiguration-codecontenttype
+	CodeContentType *types.Value `json:"CodeContentType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ApplicationCodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.ApplicationCodeConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationconfiguration.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationconfiguration.go
new file mode 100644
index 0000000000..de63f9013b
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationconfiguration.go
@@ -0,0 +1,60 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_ApplicationConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.ApplicationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-applicationconfiguration.html
+type Application_ApplicationConfiguration struct {
+
+	// ApplicationCodeConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-applicationconfiguration.html#cfn-kinesisanalyticsv2-application-applicationconfiguration-applicationcodeconfiguration
+	ApplicationCodeConfiguration *Application_ApplicationCodeConfiguration `json:"ApplicationCodeConfiguration,omitempty"`
+
+	// ApplicationSnapshotConfiguration AWS CloudFormation Property
+	// Required: false
+	// 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"`
+
+	// 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
+	EnvironmentProperties *Application_EnvironmentProperties `json:"EnvironmentProperties,omitempty"`
+
+	// FlinkApplicationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-applicationconfiguration.html#cfn-kinesisanalyticsv2-application-applicationconfiguration-flinkapplicationconfiguration
+	FlinkApplicationConfiguration *Application_FlinkApplicationConfiguration `json:"FlinkApplicationConfiguration,omitempty"`
+
+	// SqlApplicationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-applicationconfiguration.html#cfn-kinesisanalyticsv2-application-applicationconfiguration-sqlapplicationconfiguration
+	SqlApplicationConfiguration *Application_SqlApplicationConfiguration `json:"SqlApplicationConfiguration,omitempty"`
+
+	// ZeppelinApplicationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-applicationconfiguration.html#cfn-kinesisanalyticsv2-application-applicationconfiguration-zeppelinapplicationconfiguration
+	ZeppelinApplicationConfiguration *Application_ZeppelinApplicationConfiguration `json:"ZeppelinApplicationConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ApplicationConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.ApplicationConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationsnapshotconfiguration.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationsnapshotconfiguration.go
new file mode 100644
index 0000000000..44a9c587ac
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_applicationsnapshotconfiguration.go
@@ -0,0 +1,37 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_ApplicationSnapshotConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.ApplicationSnapshotConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-applicationsnapshotconfiguration.html
+type Application_ApplicationSnapshotConfiguration struct {
+
+	// SnapshotsEnabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-applicationsnapshotconfiguration.html#cfn-kinesisanalyticsv2-application-applicationsnapshotconfiguration-snapshotsenabled
+	SnapshotsEnabled *types.Value `json:"SnapshotsEnabled"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ApplicationSnapshotConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.ApplicationSnapshotConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_catalogconfiguration.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_catalogconfiguration.go
new file mode 100644
index 0000000000..b862b44eca
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_catalogconfiguration.go
@@ -0,0 +1,35 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_CatalogConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.CatalogConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-catalogconfiguration.html
+type Application_CatalogConfiguration struct {
+
+	// GlueDataCatalogConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-catalogconfiguration.html#cfn-kinesisanalyticsv2-application-catalogconfiguration-gluedatacatalogconfiguration
+	GlueDataCatalogConfiguration *Application_GlueDataCatalogConfiguration `json:"GlueDataCatalogConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CatalogConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.CatalogConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_checkpointconfiguration.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_checkpointconfiguration.go
new file mode 100644
index 0000000000..2ba8910bd0
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_checkpointconfiguration.go
@@ -0,0 +1,52 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_CheckpointConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.CheckpointConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-checkpointconfiguration.html
+type Application_CheckpointConfiguration struct {
+
+	// CheckpointInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-checkpointconfiguration.html#cfn-kinesisanalyticsv2-application-checkpointconfiguration-checkpointinterval
+	CheckpointInterval *types.Value `json:"CheckpointInterval,omitempty"`
+
+	// CheckpointingEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-checkpointconfiguration.html#cfn-kinesisanalyticsv2-application-checkpointconfiguration-checkpointingenabled
+	CheckpointingEnabled *types.Value `json:"CheckpointingEnabled,omitempty"`
+
+	// ConfigurationType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-checkpointconfiguration.html#cfn-kinesisanalyticsv2-application-checkpointconfiguration-configurationtype
+	ConfigurationType *types.Value `json:"ConfigurationType,omitempty"`
+
+	// MinPauseBetweenCheckpoints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-checkpointconfiguration.html#cfn-kinesisanalyticsv2-application-checkpointconfiguration-minpausebetweencheckpoints
+	MinPauseBetweenCheckpoints *types.Value `json:"MinPauseBetweenCheckpoints,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CheckpointConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.CheckpointConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_codecontent.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_codecontent.go
new file mode 100644
index 0000000000..e6543d444a
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_codecontent.go
@@ -0,0 +1,47 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_CodeContent AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.CodeContent)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-codecontent.html
+type Application_CodeContent struct {
+
+	// S3ContentLocation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-codecontent.html#cfn-kinesisanalyticsv2-application-codecontent-s3contentlocation
+	S3ContentLocation *Application_S3ContentLocation `json:"S3ContentLocation,omitempty"`
+
+	// TextContent AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-codecontent.html#cfn-kinesisanalyticsv2-application-codecontent-textcontent
+	TextContent *types.Value `json:"TextContent,omitempty"`
+
+	// ZipFileContent AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-codecontent.html#cfn-kinesisanalyticsv2-application-codecontent-zipfilecontent
+	ZipFileContent *types.Value `json:"ZipFileContent,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CodeContent) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.CodeContent"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_csvmappingparameters.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_csvmappingparameters.go
new file mode 100644
index 0000000000..48e7987202
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_csvmappingparameters.go
@@ -0,0 +1,42 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_CSVMappingParameters AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.CSVMappingParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-csvmappingparameters.html
+type Application_CSVMappingParameters struct {
+
+	// RecordColumnDelimiter AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-csvmappingparameters.html#cfn-kinesisanalyticsv2-application-csvmappingparameters-recordcolumndelimiter
+	RecordColumnDelimiter *types.Value `json:"RecordColumnDelimiter,omitempty"`
+
+	// RecordRowDelimiter AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-csvmappingparameters.html#cfn-kinesisanalyticsv2-application-csvmappingparameters-recordrowdelimiter
+	RecordRowDelimiter *types.Value `json:"RecordRowDelimiter,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CSVMappingParameters) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.CSVMappingParameters"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactconfiguration.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactconfiguration.go
new file mode 100644
index 0000000000..e04152343c
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactconfiguration.go
@@ -0,0 +1,47 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_CustomArtifactConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.CustomArtifactConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-customartifactconfiguration.html
+type Application_CustomArtifactConfiguration struct {
+
+	// ArtifactType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-customartifactconfiguration.html#cfn-kinesisanalyticsv2-application-customartifactconfiguration-artifacttype
+	ArtifactType *types.Value `json:"ArtifactType,omitempty"`
+
+	// MavenReference AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-customartifactconfiguration.html#cfn-kinesisanalyticsv2-application-customartifactconfiguration-mavenreference
+	MavenReference *Application_MavenReference `json:"MavenReference,omitempty"`
+
+	// S3ContentLocation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-customartifactconfiguration.html#cfn-kinesisanalyticsv2-application-customartifactconfiguration-s3contentlocation
+	S3ContentLocation *Application_S3ContentLocation `json:"S3ContentLocation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CustomArtifactConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.CustomArtifactConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactsconfiguration.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactsconfiguration.go
new file mode 100644
index 0000000000..45d673048e
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_customartifactsconfiguration.go
@@ -0,0 +1,30 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_CustomArtifactsConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.CustomArtifactsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-customartifactsconfiguration.html
+type Application_CustomArtifactsConfiguration struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CustomArtifactsConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.CustomArtifactsConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_deployasapplicationconfiguration.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_deployasapplicationconfiguration.go
new file mode 100644
index 0000000000..83917ae551
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_deployasapplicationconfiguration.go
@@ -0,0 +1,35 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_DeployAsApplicationConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.DeployAsApplicationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-deployasapplicationconfiguration.html
+type Application_DeployAsApplicationConfiguration struct {
+
+	// S3ContentLocation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-deployasapplicationconfiguration.html#cfn-kinesisanalyticsv2-application-deployasapplicationconfiguration-s3contentlocation
+	S3ContentLocation *Application_S3ContentBaseLocation `json:"S3ContentLocation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DeployAsApplicationConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.DeployAsApplicationConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_environmentproperties.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_environmentproperties.go
new file mode 100644
index 0000000000..6ddf2f3e02
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_environmentproperties.go
@@ -0,0 +1,35 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_EnvironmentProperties AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.EnvironmentProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-environmentproperties.html
+type Application_EnvironmentProperties struct {
+
+	// PropertyGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-environmentproperties.html#cfn-kinesisanalyticsv2-application-environmentproperties-propertygroups
+	PropertyGroups []Application_PropertyGroup `json:"PropertyGroups,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EnvironmentProperties) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.EnvironmentProperties"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_flinkapplicationconfiguration.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_flinkapplicationconfiguration.go
new file mode 100644
index 0000000000..69af80ed0c
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_flinkapplicationconfiguration.go
@@ -0,0 +1,45 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_FlinkApplicationConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.FlinkApplicationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-flinkapplicationconfiguration.html
+type Application_FlinkApplicationConfiguration struct {
+
+	// CheckpointConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-flinkapplicationconfiguration.html#cfn-kinesisanalyticsv2-application-flinkapplicationconfiguration-checkpointconfiguration
+	CheckpointConfiguration *Application_CheckpointConfiguration `json:"CheckpointConfiguration,omitempty"`
+
+	// MonitoringConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-flinkapplicationconfiguration.html#cfn-kinesisanalyticsv2-application-flinkapplicationconfiguration-monitoringconfiguration
+	MonitoringConfiguration *Application_MonitoringConfiguration `json:"MonitoringConfiguration,omitempty"`
+
+	// ParallelismConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-flinkapplicationconfiguration.html#cfn-kinesisanalyticsv2-application-flinkapplicationconfiguration-parallelismconfiguration
+	ParallelismConfiguration *Application_ParallelismConfiguration `json:"ParallelismConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_FlinkApplicationConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.FlinkApplicationConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_gluedatacatalogconfiguration.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_gluedatacatalogconfiguration.go
new file mode 100644
index 0000000000..6b61bb92a6
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_gluedatacatalogconfiguration.go
@@ -0,0 +1,37 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_GlueDataCatalogConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.GlueDataCatalogConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-gluedatacatalogconfiguration.html
+type Application_GlueDataCatalogConfiguration struct {
+
+	// DatabaseARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-gluedatacatalogconfiguration.html#cfn-kinesisanalyticsv2-application-gluedatacatalogconfiguration-databasearn
+	DatabaseARN *types.Value `json:"DatabaseARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_GlueDataCatalogConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.GlueDataCatalogConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_input.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_input.go
new file mode 100644
index 0000000000..47c4db0d5b
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_input.go
@@ -0,0 +1,62 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_Input AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.Input)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-input.html
+type Application_Input struct {
+
+	// InputParallelism AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-input.html#cfn-kinesisanalyticsv2-application-input-inputparallelism
+	InputParallelism *Application_InputParallelism `json:"InputParallelism,omitempty"`
+
+	// InputProcessingConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-input.html#cfn-kinesisanalyticsv2-application-input-inputprocessingconfiguration
+	InputProcessingConfiguration *Application_InputProcessingConfiguration `json:"InputProcessingConfiguration,omitempty"`
+
+	// InputSchema AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-input.html#cfn-kinesisanalyticsv2-application-input-inputschema
+	InputSchema *Application_InputSchema `json:"InputSchema,omitempty"`
+
+	// KinesisFirehoseInput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-input.html#cfn-kinesisanalyticsv2-application-input-kinesisfirehoseinput
+	KinesisFirehoseInput *Application_KinesisFirehoseInput `json:"KinesisFirehoseInput,omitempty"`
+
+	// KinesisStreamsInput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-input.html#cfn-kinesisanalyticsv2-application-input-kinesisstreamsinput
+	KinesisStreamsInput *Application_KinesisStreamsInput `json:"KinesisStreamsInput,omitempty"`
+
+	// NamePrefix AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-input.html#cfn-kinesisanalyticsv2-application-input-nameprefix
+	NamePrefix *types.Value `json:"NamePrefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Input) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.Input"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputlambdaprocessor.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputlambdaprocessor.go
new file mode 100644
index 0000000000..6482aac350
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputlambdaprocessor.go
@@ -0,0 +1,37 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_InputLambdaProcessor AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.InputLambdaProcessor)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-inputlambdaprocessor.html
+type Application_InputLambdaProcessor struct {
+
+	// ResourceARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-inputlambdaprocessor.html#cfn-kinesisanalyticsv2-application-inputlambdaprocessor-resourcearn
+	ResourceARN *types.Value `json:"ResourceARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InputLambdaProcessor) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.InputLambdaProcessor"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputparallelism.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputparallelism.go
new file mode 100644
index 0000000000..aa2facc6da
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputparallelism.go
@@ -0,0 +1,37 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_InputParallelism AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.InputParallelism)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-inputparallelism.html
+type Application_InputParallelism struct {
+
+	// Count AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-inputparallelism.html#cfn-kinesisanalyticsv2-application-inputparallelism-count
+	Count *types.Value `json:"Count,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InputParallelism) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.InputParallelism"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputprocessingconfiguration.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputprocessingconfiguration.go
new file mode 100644
index 0000000000..aad4813135
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputprocessingconfiguration.go
@@ -0,0 +1,35 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_InputProcessingConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.InputProcessingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-inputprocessingconfiguration.html
+type Application_InputProcessingConfiguration struct {
+
+	// InputLambdaProcessor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-inputprocessingconfiguration.html#cfn-kinesisanalyticsv2-application-inputprocessingconfiguration-inputlambdaprocessor
+	InputLambdaProcessor *Application_InputLambdaProcessor `json:"InputLambdaProcessor,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InputProcessingConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.InputProcessingConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputschema.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputschema.go
new file mode 100644
index 0000000000..f0c2b4af66
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_inputschema.go
@@ -0,0 +1,47 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_InputSchema AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.InputSchema)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-inputschema.html
+type Application_InputSchema struct {
+
+	// RecordColumns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-inputschema.html#cfn-kinesisanalyticsv2-application-inputschema-recordcolumns
+	RecordColumns []Application_RecordColumn `json:"RecordColumns,omitempty"`
+
+	// RecordEncoding AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-inputschema.html#cfn-kinesisanalyticsv2-application-inputschema-recordencoding
+	RecordEncoding *types.Value `json:"RecordEncoding,omitempty"`
+
+	// RecordFormat AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-inputschema.html#cfn-kinesisanalyticsv2-application-inputschema-recordformat
+	RecordFormat *Application_RecordFormat `json:"RecordFormat,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InputSchema) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.InputSchema"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_jsonmappingparameters.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_jsonmappingparameters.go
new file mode 100644
index 0000000000..4975674e23
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_jsonmappingparameters.go
@@ -0,0 +1,37 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_JSONMappingParameters AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.JSONMappingParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-jsonmappingparameters.html
+type Application_JSONMappingParameters struct {
+
+	// RecordRowPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-jsonmappingparameters.html#cfn-kinesisanalyticsv2-application-jsonmappingparameters-recordrowpath
+	RecordRowPath *types.Value `json:"RecordRowPath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_JSONMappingParameters) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.JSONMappingParameters"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisfirehoseinput.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisfirehoseinput.go
new file mode 100644
index 0000000000..64c661a95d
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisfirehoseinput.go
@@ -0,0 +1,37 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_KinesisFirehoseInput AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.KinesisFirehoseInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-kinesisfirehoseinput.html
+type Application_KinesisFirehoseInput struct {
+
+	// ResourceARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-kinesisfirehoseinput.html#cfn-kinesisanalyticsv2-application-kinesisfirehoseinput-resourcearn
+	ResourceARN *types.Value `json:"ResourceARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_KinesisFirehoseInput) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.KinesisFirehoseInput"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisstreamsinput.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisstreamsinput.go
new file mode 100644
index 0000000000..59a12901b7
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_kinesisstreamsinput.go
@@ -0,0 +1,37 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_KinesisStreamsInput AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.KinesisStreamsInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-kinesisstreamsinput.html
+type Application_KinesisStreamsInput struct {
+
+	// ResourceARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-kinesisstreamsinput.html#cfn-kinesisanalyticsv2-application-kinesisstreamsinput-resourcearn
+	ResourceARN *types.Value `json:"ResourceARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_KinesisStreamsInput) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.KinesisStreamsInput"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mappingparameters.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mappingparameters.go
new file mode 100644
index 0000000000..cc34a9ea65
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mappingparameters.go
@@ -0,0 +1,40 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_MappingParameters AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.MappingParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-mappingparameters.html
+type Application_MappingParameters struct {
+
+	// CSVMappingParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-mappingparameters.html#cfn-kinesisanalyticsv2-application-mappingparameters-csvmappingparameters
+	CSVMappingParameters *Application_CSVMappingParameters `json:"CSVMappingParameters,omitempty"`
+
+	// JSONMappingParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-mappingparameters.html#cfn-kinesisanalyticsv2-application-mappingparameters-jsonmappingparameters
+	JSONMappingParameters *Application_JSONMappingParameters `json:"JSONMappingParameters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_MappingParameters) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.MappingParameters"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mavenreference.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mavenreference.go
new file mode 100644
index 0000000000..8553f9903e
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_mavenreference.go
@@ -0,0 +1,47 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_MavenReference AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.MavenReference)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-mavenreference.html
+type Application_MavenReference struct {
+
+	// ArtifactId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-mavenreference.html#cfn-kinesisanalyticsv2-application-mavenreference-artifactid
+	ArtifactId *types.Value `json:"ArtifactId,omitempty"`
+
+	// GroupId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-mavenreference.html#cfn-kinesisanalyticsv2-application-mavenreference-groupid
+	GroupId *types.Value `json:"GroupId,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-mavenreference.html#cfn-kinesisanalyticsv2-application-mavenreference-version
+	Version *types.Value `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 *Application_MavenReference) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.MavenReference"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_monitoringconfiguration.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_monitoringconfiguration.go
new file mode 100644
index 0000000000..bd514a72f7
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_monitoringconfiguration.go
@@ -0,0 +1,47 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_MonitoringConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.MonitoringConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-monitoringconfiguration.html
+type Application_MonitoringConfiguration struct {
+
+	// ConfigurationType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-monitoringconfiguration.html#cfn-kinesisanalyticsv2-application-monitoringconfiguration-configurationtype
+	ConfigurationType *types.Value `json:"ConfigurationType,omitempty"`
+
+	// LogLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-monitoringconfiguration.html#cfn-kinesisanalyticsv2-application-monitoringconfiguration-loglevel
+	LogLevel *types.Value `json:"LogLevel,omitempty"`
+
+	// MetricsLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-monitoringconfiguration.html#cfn-kinesisanalyticsv2-application-monitoringconfiguration-metricslevel
+	MetricsLevel *types.Value `json:"MetricsLevel,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_MonitoringConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.MonitoringConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_parallelismconfiguration.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_parallelismconfiguration.go
new file mode 100644
index 0000000000..3c19e34656
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_parallelismconfiguration.go
@@ -0,0 +1,52 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_ParallelismConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.ParallelismConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-parallelismconfiguration.html
+type Application_ParallelismConfiguration struct {
+
+	// AutoScalingEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-parallelismconfiguration.html#cfn-kinesisanalyticsv2-application-parallelismconfiguration-autoscalingenabled
+	AutoScalingEnabled *types.Value `json:"AutoScalingEnabled,omitempty"`
+
+	// ConfigurationType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-parallelismconfiguration.html#cfn-kinesisanalyticsv2-application-parallelismconfiguration-configurationtype
+	ConfigurationType *types.Value `json:"ConfigurationType,omitempty"`
+
+	// Parallelism AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-parallelismconfiguration.html#cfn-kinesisanalyticsv2-application-parallelismconfiguration-parallelism
+	Parallelism *types.Value `json:"Parallelism,omitempty"`
+
+	// ParallelismPerKPU AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-parallelismconfiguration.html#cfn-kinesisanalyticsv2-application-parallelismconfiguration-parallelismperkpu
+	ParallelismPerKPU *types.Value `json:"ParallelismPerKPU,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ParallelismConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.ParallelismConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_propertygroup.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_propertygroup.go
new file mode 100644
index 0000000000..b54bb7128d
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_propertygroup.go
@@ -0,0 +1,42 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_PropertyGroup AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.PropertyGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-propertygroup.html
+type Application_PropertyGroup struct {
+
+	// PropertyGroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-propertygroup.html#cfn-kinesisanalyticsv2-application-propertygroup-propertygroupid
+	PropertyGroupId *types.Value `json:"PropertyGroupId,omitempty"`
+
+	// PropertyMap AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-propertygroup.html#cfn-kinesisanalyticsv2-application-propertygroup-propertymap
+	PropertyMap interface{} `json:"PropertyMap,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PropertyGroup) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.PropertyGroup"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordcolumn.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordcolumn.go
new file mode 100644
index 0000000000..0d1b028e44
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordcolumn.go
@@ -0,0 +1,47 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_RecordColumn AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.RecordColumn)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-recordcolumn.html
+type Application_RecordColumn struct {
+
+	// Mapping AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-recordcolumn.html#cfn-kinesisanalyticsv2-application-recordcolumn-mapping
+	Mapping *types.Value `json:"Mapping,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-recordcolumn.html#cfn-kinesisanalyticsv2-application-recordcolumn-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SqlType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-recordcolumn.html#cfn-kinesisanalyticsv2-application-recordcolumn-sqltype
+	SqlType *types.Value `json:"SqlType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RecordColumn) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.RecordColumn"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordformat.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordformat.go
new file mode 100644
index 0000000000..426f454523
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_recordformat.go
@@ -0,0 +1,42 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_RecordFormat AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.RecordFormat)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-recordformat.html
+type Application_RecordFormat struct {
+
+	// MappingParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-recordformat.html#cfn-kinesisanalyticsv2-application-recordformat-mappingparameters
+	MappingParameters *Application_MappingParameters `json:"MappingParameters,omitempty"`
+
+	// RecordFormatType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-recordformat.html#cfn-kinesisanalyticsv2-application-recordformat-recordformattype
+	RecordFormatType *types.Value `json:"RecordFormatType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RecordFormat) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.RecordFormat"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentbaselocation.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentbaselocation.go
new file mode 100644
index 0000000000..7b3dde5ba0
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentbaselocation.go
@@ -0,0 +1,42 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_S3ContentBaseLocation AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.S3ContentBaseLocation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-s3contentbaselocation.html
+type Application_S3ContentBaseLocation struct {
+
+	// BasePath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-s3contentbaselocation.html#cfn-kinesisanalyticsv2-application-s3contentbaselocation-basepath
+	BasePath *types.Value `json:"BasePath,omitempty"`
+
+	// BucketARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-s3contentbaselocation.html#cfn-kinesisanalyticsv2-application-s3contentbaselocation-bucketarn
+	BucketARN *types.Value `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 *Application_S3ContentBaseLocation) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.S3ContentBaseLocation"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentlocation.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentlocation.go
new file mode 100644
index 0000000000..dd66949926
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_s3contentlocation.go
@@ -0,0 +1,47 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_S3ContentLocation AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.S3ContentLocation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-s3contentlocation.html
+type Application_S3ContentLocation struct {
+
+	// BucketARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-s3contentlocation.html#cfn-kinesisanalyticsv2-application-s3contentlocation-bucketarn
+	BucketARN *types.Value `json:"BucketARN,omitempty"`
+
+	// FileKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-s3contentlocation.html#cfn-kinesisanalyticsv2-application-s3contentlocation-filekey
+	FileKey *types.Value `json:"FileKey,omitempty"`
+
+	// ObjectVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-s3contentlocation.html#cfn-kinesisanalyticsv2-application-s3contentlocation-objectversion
+	ObjectVersion *types.Value `json:"ObjectVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_S3ContentLocation) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.S3ContentLocation"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_sqlapplicationconfiguration.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_sqlapplicationconfiguration.go
new file mode 100644
index 0000000000..14ed17781b
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_sqlapplicationconfiguration.go
@@ -0,0 +1,35 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_SqlApplicationConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.SqlApplicationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-sqlapplicationconfiguration.html
+type Application_SqlApplicationConfiguration struct {
+
+	// Inputs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-sqlapplicationconfiguration.html#cfn-kinesisanalyticsv2-application-sqlapplicationconfiguration-inputs
+	Inputs []Application_Input `json:"Inputs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SqlApplicationConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.SqlApplicationConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinapplicationconfiguration.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinapplicationconfiguration.go
new file mode 100644
index 0000000000..9bfd36db24
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinapplicationconfiguration.go
@@ -0,0 +1,50 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_ZeppelinApplicationConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.ZeppelinApplicationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-zeppelinapplicationconfiguration.html
+type Application_ZeppelinApplicationConfiguration struct {
+
+	// CatalogConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-zeppelinapplicationconfiguration.html#cfn-kinesisanalyticsv2-application-zeppelinapplicationconfiguration-catalogconfiguration
+	CatalogConfiguration *Application_CatalogConfiguration `json:"CatalogConfiguration,omitempty"`
+
+	// CustomArtifactsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-zeppelinapplicationconfiguration.html#cfn-kinesisanalyticsv2-application-zeppelinapplicationconfiguration-customartifactsconfiguration
+	CustomArtifactsConfiguration *Application_CustomArtifactsConfiguration `json:"CustomArtifactsConfiguration,omitempty"`
+
+	// DeployAsApplicationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-zeppelinapplicationconfiguration.html#cfn-kinesisanalyticsv2-application-zeppelinapplicationconfiguration-deployasapplicationconfiguration
+	DeployAsApplicationConfiguration *Application_DeployAsApplicationConfiguration `json:"DeployAsApplicationConfiguration,omitempty"`
+
+	// MonitoringConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-zeppelinapplicationconfiguration.html#cfn-kinesisanalyticsv2-application-zeppelinapplicationconfiguration-monitoringconfiguration
+	MonitoringConfiguration *Application_ZeppelinMonitoringConfiguration `json:"MonitoringConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ZeppelinApplicationConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.ZeppelinApplicationConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinmonitoringconfiguration.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinmonitoringconfiguration.go
new file mode 100644
index 0000000000..6b16170565
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-application_zeppelinmonitoringconfiguration.go
@@ -0,0 +1,37 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_ZeppelinMonitoringConfiguration AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::Application.ZeppelinMonitoringConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-zeppelinmonitoringconfiguration.html
+type Application_ZeppelinMonitoringConfiguration struct {
+
+	// LogLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-application-zeppelinmonitoringconfiguration.html#cfn-kinesisanalyticsv2-application-zeppelinmonitoringconfiguration-loglevel
+	LogLevel *types.Value `json:"LogLevel,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ZeppelinMonitoringConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::Application.ZeppelinMonitoringConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption.go
new file mode 100644
index 0000000000..13533452a6
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption.go
@@ -0,0 +1,113 @@
+package kinesisanalyticsv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationCloudWatchLoggingOption AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalyticsv2-applicationcloudwatchloggingoption.html
+type ApplicationCloudWatchLoggingOption struct {
+
+	// ApplicationName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalyticsv2-applicationcloudwatchloggingoption.html#cfn-kinesisanalyticsv2-applicationcloudwatchloggingoption-applicationname
+	ApplicationName *types.Value `json:"ApplicationName,omitempty"`
+
+	// CloudWatchLoggingOption AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalyticsv2-applicationcloudwatchloggingoption.html#cfn-kinesisanalyticsv2-applicationcloudwatchloggingoption-cloudwatchloggingoption
+	CloudWatchLoggingOption *ApplicationCloudWatchLoggingOption_CloudWatchLoggingOption `json:"CloudWatchLoggingOption,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationCloudWatchLoggingOption) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption"
+}
+
+// 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 ApplicationCloudWatchLoggingOption) MarshalJSON() ([]byte, error) {
+	type Properties ApplicationCloudWatchLoggingOption
+	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 *ApplicationCloudWatchLoggingOption) UnmarshalJSON(b []byte) error {
+	type Properties ApplicationCloudWatchLoggingOption
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ApplicationCloudWatchLoggingOption(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption_cloudwatchloggingoption.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption_cloudwatchloggingoption.go
new file mode 100644
index 0000000000..94c34d26a6
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationcloudwatchloggingoption_cloudwatchloggingoption.go
@@ -0,0 +1,37 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationCloudWatchLoggingOption_CloudWatchLoggingOption AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption.CloudWatchLoggingOption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationcloudwatchloggingoption-cloudwatchloggingoption.html
+type ApplicationCloudWatchLoggingOption_CloudWatchLoggingOption struct {
+
+	// LogStreamARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationcloudwatchloggingoption-cloudwatchloggingoption.html#cfn-kinesisanalyticsv2-applicationcloudwatchloggingoption-cloudwatchloggingoption-logstreamarn
+	LogStreamARN *types.Value `json:"LogStreamARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationCloudWatchLoggingOption_CloudWatchLoggingOption) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption.CloudWatchLoggingOption"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput.go
new file mode 100644
index 0000000000..c916876071
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput.go
@@ -0,0 +1,113 @@
+package kinesisanalyticsv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationOutput AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationOutput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalyticsv2-applicationoutput.html
+type ApplicationOutput struct {
+
+	// ApplicationName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalyticsv2-applicationoutput.html#cfn-kinesisanalyticsv2-applicationoutput-applicationname
+	ApplicationName *types.Value `json:"ApplicationName,omitempty"`
+
+	// Output AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalyticsv2-applicationoutput.html#cfn-kinesisanalyticsv2-applicationoutput-output
+	Output *ApplicationOutput_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 *ApplicationOutput) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::ApplicationOutput"
+}
+
+// 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 ApplicationOutput) MarshalJSON() ([]byte, error) {
+	type Properties ApplicationOutput
+	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 *ApplicationOutput) UnmarshalJSON(b []byte) error {
+	type Properties ApplicationOutput
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ApplicationOutput(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_destinationschema.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_destinationschema.go
new file mode 100644
index 0000000000..772c8358ea
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_destinationschema.go
@@ -0,0 +1,37 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationOutput_DestinationSchema AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationOutput.DestinationSchema)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationoutput-destinationschema.html
+type ApplicationOutput_DestinationSchema struct {
+
+	// RecordFormatType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationoutput-destinationschema.html#cfn-kinesisanalyticsv2-applicationoutput-destinationschema-recordformattype
+	RecordFormatType *types.Value `json:"RecordFormatType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationOutput_DestinationSchema) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::ApplicationOutput.DestinationSchema"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisfirehoseoutput.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisfirehoseoutput.go
new file mode 100644
index 0000000000..3da7cc4506
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisfirehoseoutput.go
@@ -0,0 +1,37 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationOutput_KinesisFirehoseOutput AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisFirehoseOutput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationoutput-kinesisfirehoseoutput.html
+type ApplicationOutput_KinesisFirehoseOutput struct {
+
+	// ResourceARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationoutput-kinesisfirehoseoutput.html#cfn-kinesisanalyticsv2-applicationoutput-kinesisfirehoseoutput-resourcearn
+	ResourceARN *types.Value `json:"ResourceARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationOutput_KinesisFirehoseOutput) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisFirehoseOutput"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisstreamsoutput.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisstreamsoutput.go
new file mode 100644
index 0000000000..96bd7cb35b
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_kinesisstreamsoutput.go
@@ -0,0 +1,37 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationOutput_KinesisStreamsOutput AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisStreamsOutput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationoutput-kinesisstreamsoutput.html
+type ApplicationOutput_KinesisStreamsOutput struct {
+
+	// ResourceARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationoutput-kinesisstreamsoutput.html#cfn-kinesisanalyticsv2-applicationoutput-kinesisstreamsoutput-resourcearn
+	ResourceARN *types.Value `json:"ResourceARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationOutput_KinesisStreamsOutput) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisStreamsOutput"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_lambdaoutput.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_lambdaoutput.go
new file mode 100644
index 0000000000..c89f3f194f
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_lambdaoutput.go
@@ -0,0 +1,37 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationOutput_LambdaOutput AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationOutput.LambdaOutput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationoutput-lambdaoutput.html
+type ApplicationOutput_LambdaOutput struct {
+
+	// ResourceARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationoutput-lambdaoutput.html#cfn-kinesisanalyticsv2-applicationoutput-lambdaoutput-resourcearn
+	ResourceARN *types.Value `json:"ResourceARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationOutput_LambdaOutput) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::ApplicationOutput.LambdaOutput"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_output.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_output.go
new file mode 100644
index 0000000000..40770e0f12
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationoutput_output.go
@@ -0,0 +1,57 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationOutput_Output AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationOutput.Output)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationoutput-output.html
+type ApplicationOutput_Output struct {
+
+	// DestinationSchema AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationoutput-output.html#cfn-kinesisanalyticsv2-applicationoutput-output-destinationschema
+	DestinationSchema *ApplicationOutput_DestinationSchema `json:"DestinationSchema,omitempty"`
+
+	// KinesisFirehoseOutput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationoutput-output.html#cfn-kinesisanalyticsv2-applicationoutput-output-kinesisfirehoseoutput
+	KinesisFirehoseOutput *ApplicationOutput_KinesisFirehoseOutput `json:"KinesisFirehoseOutput,omitempty"`
+
+	// KinesisStreamsOutput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationoutput-output.html#cfn-kinesisanalyticsv2-applicationoutput-output-kinesisstreamsoutput
+	KinesisStreamsOutput *ApplicationOutput_KinesisStreamsOutput `json:"KinesisStreamsOutput,omitempty"`
+
+	// LambdaOutput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationoutput-output.html#cfn-kinesisanalyticsv2-applicationoutput-output-lambdaoutput
+	LambdaOutput *ApplicationOutput_LambdaOutput `json:"LambdaOutput,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationoutput-output.html#cfn-kinesisanalyticsv2-applicationoutput-output-name
+	Name *types.Value `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 *ApplicationOutput_Output) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::ApplicationOutput.Output"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource.go
new file mode 100644
index 0000000000..19090ddd8c
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource.go
@@ -0,0 +1,113 @@
+package kinesisanalyticsv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationReferenceDataSource AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalyticsv2-applicationreferencedatasource.html
+type ApplicationReferenceDataSource struct {
+
+	// ApplicationName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalyticsv2-applicationreferencedatasource.html#cfn-kinesisanalyticsv2-applicationreferencedatasource-applicationname
+	ApplicationName *types.Value `json:"ApplicationName,omitempty"`
+
+	// ReferenceDataSource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisanalyticsv2-applicationreferencedatasource.html#cfn-kinesisanalyticsv2-applicationreferencedatasource-referencedatasource
+	ReferenceDataSource *ApplicationReferenceDataSource_ReferenceDataSource `json:"ReferenceDataSource,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationReferenceDataSource) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource"
+}
+
+// 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 ApplicationReferenceDataSource) MarshalJSON() ([]byte, error) {
+	type Properties ApplicationReferenceDataSource
+	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 *ApplicationReferenceDataSource) UnmarshalJSON(b []byte) error {
+	type Properties ApplicationReferenceDataSource
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ApplicationReferenceDataSource(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_csvmappingparameters.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_csvmappingparameters.go
new file mode 100644
index 0000000000..8178492eb8
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_csvmappingparameters.go
@@ -0,0 +1,42 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationReferenceDataSource_CSVMappingParameters AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.CSVMappingParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-csvmappingparameters.html
+type ApplicationReferenceDataSource_CSVMappingParameters struct {
+
+	// RecordColumnDelimiter AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-csvmappingparameters.html#cfn-kinesisanalyticsv2-applicationreferencedatasource-csvmappingparameters-recordcolumndelimiter
+	RecordColumnDelimiter *types.Value `json:"RecordColumnDelimiter,omitempty"`
+
+	// RecordRowDelimiter AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-csvmappingparameters.html#cfn-kinesisanalyticsv2-applicationreferencedatasource-csvmappingparameters-recordrowdelimiter
+	RecordRowDelimiter *types.Value `json:"RecordRowDelimiter,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationReferenceDataSource_CSVMappingParameters) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.CSVMappingParameters"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_jsonmappingparameters.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_jsonmappingparameters.go
new file mode 100644
index 0000000000..3bd7c8ae2a
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_jsonmappingparameters.go
@@ -0,0 +1,37 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationReferenceDataSource_JSONMappingParameters AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.JSONMappingParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-jsonmappingparameters.html
+type ApplicationReferenceDataSource_JSONMappingParameters struct {
+
+	// RecordRowPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-jsonmappingparameters.html#cfn-kinesisanalyticsv2-applicationreferencedatasource-jsonmappingparameters-recordrowpath
+	RecordRowPath *types.Value `json:"RecordRowPath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationReferenceDataSource_JSONMappingParameters) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.JSONMappingParameters"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_mappingparameters.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_mappingparameters.go
new file mode 100644
index 0000000000..61a7a6334e
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_mappingparameters.go
@@ -0,0 +1,40 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationReferenceDataSource_MappingParameters AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.MappingParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-mappingparameters.html
+type ApplicationReferenceDataSource_MappingParameters struct {
+
+	// CSVMappingParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-mappingparameters.html#cfn-kinesisanalyticsv2-applicationreferencedatasource-mappingparameters-csvmappingparameters
+	CSVMappingParameters *ApplicationReferenceDataSource_CSVMappingParameters `json:"CSVMappingParameters,omitempty"`
+
+	// JSONMappingParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-mappingparameters.html#cfn-kinesisanalyticsv2-applicationreferencedatasource-mappingparameters-jsonmappingparameters
+	JSONMappingParameters *ApplicationReferenceDataSource_JSONMappingParameters `json:"JSONMappingParameters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationReferenceDataSource_MappingParameters) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.MappingParameters"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordcolumn.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordcolumn.go
new file mode 100644
index 0000000000..7badcc98c6
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordcolumn.go
@@ -0,0 +1,47 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationReferenceDataSource_RecordColumn AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordColumn)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-recordcolumn.html
+type ApplicationReferenceDataSource_RecordColumn struct {
+
+	// Mapping AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-recordcolumn.html#cfn-kinesisanalyticsv2-applicationreferencedatasource-recordcolumn-mapping
+	Mapping *types.Value `json:"Mapping,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-recordcolumn.html#cfn-kinesisanalyticsv2-applicationreferencedatasource-recordcolumn-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SqlType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-recordcolumn.html#cfn-kinesisanalyticsv2-applicationreferencedatasource-recordcolumn-sqltype
+	SqlType *types.Value `json:"SqlType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationReferenceDataSource_RecordColumn) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordColumn"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordformat.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordformat.go
new file mode 100644
index 0000000000..243f7c78fb
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_recordformat.go
@@ -0,0 +1,42 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationReferenceDataSource_RecordFormat AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordFormat)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-recordformat.html
+type ApplicationReferenceDataSource_RecordFormat struct {
+
+	// MappingParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-recordformat.html#cfn-kinesisanalyticsv2-applicationreferencedatasource-recordformat-mappingparameters
+	MappingParameters *ApplicationReferenceDataSource_MappingParameters `json:"MappingParameters,omitempty"`
+
+	// RecordFormatType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-recordformat.html#cfn-kinesisanalyticsv2-applicationreferencedatasource-recordformat-recordformattype
+	RecordFormatType *types.Value `json:"RecordFormatType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationReferenceDataSource_RecordFormat) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordFormat"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referencedatasource.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referencedatasource.go
new file mode 100644
index 0000000000..a20fada916
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referencedatasource.go
@@ -0,0 +1,47 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationReferenceDataSource_ReferenceDataSource AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceDataSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-referencedatasource.html
+type ApplicationReferenceDataSource_ReferenceDataSource struct {
+
+	// ReferenceSchema AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-referencedatasource.html#cfn-kinesisanalyticsv2-applicationreferencedatasource-referencedatasource-referenceschema
+	ReferenceSchema *ApplicationReferenceDataSource_ReferenceSchema `json:"ReferenceSchema,omitempty"`
+
+	// S3ReferenceDataSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-referencedatasource.html#cfn-kinesisanalyticsv2-applicationreferencedatasource-referencedatasource-s3referencedatasource
+	S3ReferenceDataSource *ApplicationReferenceDataSource_S3ReferenceDataSource `json:"S3ReferenceDataSource,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-referencedatasource.html#cfn-kinesisanalyticsv2-applicationreferencedatasource-referencedatasource-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationReferenceDataSource_ReferenceDataSource) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceDataSource"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referenceschema.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referenceschema.go
new file mode 100644
index 0000000000..01f86fc95f
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_referenceschema.go
@@ -0,0 +1,47 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationReferenceDataSource_ReferenceSchema AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceSchema)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-referenceschema.html
+type ApplicationReferenceDataSource_ReferenceSchema struct {
+
+	// RecordColumns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-referenceschema.html#cfn-kinesisanalyticsv2-applicationreferencedatasource-referenceschema-recordcolumns
+	RecordColumns []ApplicationReferenceDataSource_RecordColumn `json:"RecordColumns,omitempty"`
+
+	// RecordEncoding AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-referenceschema.html#cfn-kinesisanalyticsv2-applicationreferencedatasource-referenceschema-recordencoding
+	RecordEncoding *types.Value `json:"RecordEncoding,omitempty"`
+
+	// RecordFormat AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-referenceschema.html#cfn-kinesisanalyticsv2-applicationreferencedatasource-referenceschema-recordformat
+	RecordFormat *ApplicationReferenceDataSource_RecordFormat `json:"RecordFormat,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationReferenceDataSource_ReferenceSchema) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceSchema"
+}
diff --git a/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_s3referencedatasource.go b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_s3referencedatasource.go
new file mode 100644
index 0000000000..03d7d776f8
--- /dev/null
+++ b/goformation/cloudformation/kinesisanalyticsv2/aws-kinesisanalyticsv2-applicationreferencedatasource_s3referencedatasource.go
@@ -0,0 +1,42 @@
+package kinesisanalyticsv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationReferenceDataSource_S3ReferenceDataSource AWS CloudFormation Resource (AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.S3ReferenceDataSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-s3referencedatasource.html
+type ApplicationReferenceDataSource_S3ReferenceDataSource struct {
+
+	// BucketARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-s3referencedatasource.html#cfn-kinesisanalyticsv2-applicationreferencedatasource-s3referencedatasource-bucketarn
+	BucketARN *types.Value `json:"BucketARN,omitempty"`
+
+	// FileKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisanalyticsv2-applicationreferencedatasource-s3referencedatasource.html#cfn-kinesisanalyticsv2-applicationreferencedatasource-s3referencedatasource-filekey
+	FileKey *types.Value `json:"FileKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationReferenceDataSource_S3ReferenceDataSource) AWSCloudFormationType() string {
+	return "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.S3ReferenceDataSource"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream.go
new file mode 100644
index 0000000000..e4c7d6bb35
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream.go
@@ -0,0 +1,164 @@
+package kinesisfirehose
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html
+type DeliveryStream struct {
+
+	// AmazonopensearchserviceDestinationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration
+	AmazonopensearchserviceDestinationConfiguration *DeliveryStream_AmazonopensearchserviceDestinationConfiguration `json:"AmazonopensearchserviceDestinationConfiguration,omitempty"`
+
+	// DeliveryStreamEncryptionConfigurationInput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-deliverystreamencryptionconfigurationinput
+	DeliveryStreamEncryptionConfigurationInput *DeliveryStream_DeliveryStreamEncryptionConfigurationInput `json:"DeliveryStreamEncryptionConfigurationInput,omitempty"`
+
+	// DeliveryStreamName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-deliverystreamname
+	DeliveryStreamName *types.Value `json:"DeliveryStreamName,omitempty"`
+
+	// DeliveryStreamType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-deliverystreamtype
+	DeliveryStreamType *types.Value `json:"DeliveryStreamType,omitempty"`
+
+	// ElasticsearchDestinationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration
+	ElasticsearchDestinationConfiguration *DeliveryStream_ElasticsearchDestinationConfiguration `json:"ElasticsearchDestinationConfiguration,omitempty"`
+
+	// ExtendedS3DestinationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration
+	ExtendedS3DestinationConfiguration *DeliveryStream_ExtendedS3DestinationConfiguration `json:"ExtendedS3DestinationConfiguration,omitempty"`
+
+	// HttpEndpointDestinationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration
+	HttpEndpointDestinationConfiguration *DeliveryStream_HttpEndpointDestinationConfiguration `json:"HttpEndpointDestinationConfiguration,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
+	KinesisStreamSourceConfiguration *DeliveryStream_KinesisStreamSourceConfiguration `json:"KinesisStreamSourceConfiguration,omitempty"`
+
+	// RedshiftDestinationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration
+	RedshiftDestinationConfiguration *DeliveryStream_RedshiftDestinationConfiguration `json:"RedshiftDestinationConfiguration,omitempty"`
+
+	// S3DestinationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-s3destinationconfiguration
+	S3DestinationConfiguration *DeliveryStream_S3DestinationConfiguration `json:"S3DestinationConfiguration,omitempty"`
+
+	// SplunkDestinationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-splunkdestinationconfiguration
+	SplunkDestinationConfiguration *DeliveryStream_SplunkDestinationConfiguration `json:"SplunkDestinationConfiguration,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kinesisfirehose-deliverystream.html#cfn-kinesisfirehose-deliverystream-tags
+	Tags []cloudformation.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 *DeliveryStream) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream"
+}
+
+// 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 DeliveryStream) MarshalJSON() ([]byte, error) {
+	type Properties DeliveryStream
+	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 *DeliveryStream) UnmarshalJSON(b []byte) error {
+	type Properties DeliveryStream
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DeliveryStream(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicebufferinghints.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicebufferinghints.go
new file mode 100644
index 0000000000..8c818dc325
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicebufferinghints.go
@@ -0,0 +1,42 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_AmazonopensearchserviceBufferingHints AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceBufferingHints)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-amazonopensearchservicebufferinghints.html
+type DeliveryStream_AmazonopensearchserviceBufferingHints struct {
+
+	// IntervalInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-amazonopensearchservicebufferinghints.html#cfn-kinesisfirehose-deliverystream-amazonopensearchservicebufferinghints-intervalinseconds
+	IntervalInSeconds *types.Value `json:"IntervalInSeconds,omitempty"`
+
+	// SizeInMBs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-amazonopensearchservicebufferinghints.html#cfn-kinesisfirehose-deliverystream-amazonopensearchservicebufferinghints-sizeinmbs
+	SizeInMBs *types.Value `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_AmazonopensearchserviceBufferingHints) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceBufferingHints"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicedestinationconfiguration.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicedestinationconfiguration.go
new file mode 100644
index 0000000000..72fbd90d04
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchservicedestinationconfiguration.go
@@ -0,0 +1,97 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_AmazonopensearchserviceDestinationConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceDestinationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration.html
+type DeliveryStream_AmazonopensearchserviceDestinationConfiguration struct {
+
+	// BufferingHints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration-bufferinghints
+	BufferingHints *DeliveryStream_AmazonopensearchserviceBufferingHints `json:"BufferingHints,omitempty"`
+
+	// CloudWatchLoggingOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration-cloudwatchloggingoptions
+	CloudWatchLoggingOptions *DeliveryStream_CloudWatchLoggingOptions `json:"CloudWatchLoggingOptions,omitempty"`
+
+	// ClusterEndpoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration-clusterendpoint
+	ClusterEndpoint *types.Value `json:"ClusterEndpoint,omitempty"`
+
+	// DomainARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration-domainarn
+	DomainARN *types.Value `json:"DomainARN,omitempty"`
+
+	// IndexName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration-indexname
+	IndexName *types.Value `json:"IndexName,omitempty"`
+
+	// IndexRotationPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration-indexrotationperiod
+	IndexRotationPeriod *types.Value `json:"IndexRotationPeriod,omitempty"`
+
+	// ProcessingConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration-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-amazonopensearchservicedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration-retryoptions
+	RetryOptions *DeliveryStream_AmazonopensearchserviceRetryOptions `json:"RetryOptions,omitempty"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration-rolearn
+	RoleARN *types.Value `json:"RoleARN,omitempty"`
+
+	// S3BackupMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration-s3backupmode
+	S3BackupMode *types.Value `json:"S3BackupMode,omitempty"`
+
+	// S3Configuration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration-s3configuration
+	S3Configuration *DeliveryStream_S3DestinationConfiguration `json:"S3Configuration,omitempty"`
+
+	// TypeName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration-typename
+	TypeName *types.Value `json:"TypeName,omitempty"`
+
+	// VpcConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-amazonopensearchservicedestinationconfiguration-vpcconfiguration
+	VpcConfiguration *DeliveryStream_VpcConfiguration `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 *DeliveryStream_AmazonopensearchserviceDestinationConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceDestinationConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchserviceretryoptions.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchserviceretryoptions.go
new file mode 100644
index 0000000000..115968a244
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_amazonopensearchserviceretryoptions.go
@@ -0,0 +1,37 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_AmazonopensearchserviceRetryOptions AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceRetryOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-amazonopensearchserviceretryoptions.html
+type DeliveryStream_AmazonopensearchserviceRetryOptions struct {
+
+	// DurationInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-amazonopensearchserviceretryoptions.html#cfn-kinesisfirehose-deliverystream-amazonopensearchserviceretryoptions-durationinseconds
+	DurationInSeconds *types.Value `json:"DurationInSeconds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AmazonopensearchserviceRetryOptions) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceRetryOptions"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_bufferinghints.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_bufferinghints.go
new file mode 100644
index 0000000000..f12e92e987
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_bufferinghints.go
@@ -0,0 +1,42 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_BufferingHints AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.BufferingHints)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-bufferinghints.html
+type DeliveryStream_BufferingHints struct {
+
+	// IntervalInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-bufferinghints.html#cfn-kinesisfirehose-deliverystream-bufferinghints-intervalinseconds
+	IntervalInSeconds *types.Value `json:"IntervalInSeconds,omitempty"`
+
+	// SizeInMBs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-bufferinghints.html#cfn-kinesisfirehose-deliverystream-bufferinghints-sizeinmbs
+	SizeInMBs *types.Value `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_BufferingHints) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.BufferingHints"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_cloudwatchloggingoptions.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_cloudwatchloggingoptions.go
new file mode 100644
index 0000000000..7d33847d6e
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_cloudwatchloggingoptions.go
@@ -0,0 +1,47 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_CloudWatchLoggingOptions AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-cloudwatchloggingoptions.html
+type DeliveryStream_CloudWatchLoggingOptions struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-cloudwatchloggingoptions.html#cfn-kinesisfirehose-deliverystream-cloudwatchloggingoptions-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// LogGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-cloudwatchloggingoptions.html#cfn-kinesisfirehose-deliverystream-cloudwatchloggingoptions-loggroupname
+	LogGroupName *types.Value `json:"LogGroupName,omitempty"`
+
+	// LogStreamName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-cloudwatchloggingoptions.html#cfn-kinesisfirehose-deliverystream-cloudwatchloggingoptions-logstreamname
+	LogStreamName *types.Value `json:"LogStreamName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CloudWatchLoggingOptions) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_copycommand.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_copycommand.go
new file mode 100644
index 0000000000..80bde8dfdf
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_copycommand.go
@@ -0,0 +1,47 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_CopyCommand AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.CopyCommand)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-copycommand.html
+type DeliveryStream_CopyCommand struct {
+
+	// CopyOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-copycommand.html#cfn-kinesisfirehose-deliverystream-copycommand-copyoptions
+	CopyOptions *types.Value `json:"CopyOptions,omitempty"`
+
+	// DataTableColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-copycommand.html#cfn-kinesisfirehose-deliverystream-copycommand-datatablecolumns
+	DataTableColumns *types.Value `json:"DataTableColumns,omitempty"`
+
+	// DataTableName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-copycommand.html#cfn-kinesisfirehose-deliverystream-copycommand-datatablename
+	DataTableName *types.Value `json:"DataTableName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CopyCommand) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.CopyCommand"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dataformatconversionconfiguration.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dataformatconversionconfiguration.go
new file mode 100644
index 0000000000..24d2805807
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dataformatconversionconfiguration.go
@@ -0,0 +1,52 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_DataFormatConversionConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.DataFormatConversionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-dataformatconversionconfiguration.html
+type DeliveryStream_DataFormatConversionConfiguration struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-dataformatconversionconfiguration.html#cfn-kinesisfirehose-deliverystream-dataformatconversionconfiguration-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// InputFormatConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-dataformatconversionconfiguration.html#cfn-kinesisfirehose-deliverystream-dataformatconversionconfiguration-inputformatconfiguration
+	InputFormatConfiguration *DeliveryStream_InputFormatConfiguration `json:"InputFormatConfiguration,omitempty"`
+
+	// OutputFormatConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-dataformatconversionconfiguration.html#cfn-kinesisfirehose-deliverystream-dataformatconversionconfiguration-outputformatconfiguration
+	OutputFormatConfiguration *DeliveryStream_OutputFormatConfiguration `json:"OutputFormatConfiguration,omitempty"`
+
+	// SchemaConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-dataformatconversionconfiguration.html#cfn-kinesisfirehose-deliverystream-dataformatconversionconfiguration-schemaconfiguration
+	SchemaConfiguration *DeliveryStream_SchemaConfiguration `json:"SchemaConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DataFormatConversionConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.DataFormatConversionConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deliverystreamencryptionconfigurationinput.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deliverystreamencryptionconfigurationinput.go
new file mode 100644
index 0000000000..1e1e21e395
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deliverystreamencryptionconfigurationinput.go
@@ -0,0 +1,42 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_DeliveryStreamEncryptionConfigurationInput AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.DeliveryStreamEncryptionConfigurationInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-deliverystreamencryptionconfigurationinput.html
+type DeliveryStream_DeliveryStreamEncryptionConfigurationInput struct {
+
+	// KeyARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-deliverystreamencryptionconfigurationinput.html#cfn-kinesisfirehose-deliverystream-deliverystreamencryptionconfigurationinput-keyarn
+	KeyARN *types.Value `json:"KeyARN,omitempty"`
+
+	// KeyType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-deliverystreamencryptionconfigurationinput.html#cfn-kinesisfirehose-deliverystream-deliverystreamencryptionconfigurationinput-keytype
+	KeyType *types.Value `json:"KeyType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DeliveryStreamEncryptionConfigurationInput) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.DeliveryStreamEncryptionConfigurationInput"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deserializer.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deserializer.go
new file mode 100644
index 0000000000..9654d8062b
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_deserializer.go
@@ -0,0 +1,40 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_Deserializer AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.Deserializer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-deserializer.html
+type DeliveryStream_Deserializer struct {
+
+	// HiveJsonSerDe AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-deserializer.html#cfn-kinesisfirehose-deliverystream-deserializer-hivejsonserde
+	HiveJsonSerDe *DeliveryStream_HiveJsonSerDe `json:"HiveJsonSerDe,omitempty"`
+
+	// OpenXJsonSerDe AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-deserializer.html#cfn-kinesisfirehose-deliverystream-deserializer-openxjsonserde
+	OpenXJsonSerDe *DeliveryStream_OpenXJsonSerDe `json:"OpenXJsonSerDe,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Deserializer) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.Deserializer"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dynamicpartitioningconfiguration.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dynamicpartitioningconfiguration.go
new file mode 100644
index 0000000000..8f56f56c64
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_dynamicpartitioningconfiguration.go
@@ -0,0 +1,42 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_DynamicPartitioningConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.DynamicPartitioningConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-dynamicpartitioningconfiguration.html
+type DeliveryStream_DynamicPartitioningConfiguration struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-dynamicpartitioningconfiguration.html#cfn-kinesisfirehose-deliverystream-dynamicpartitioningconfiguration-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// RetryOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-dynamicpartitioningconfiguration.html#cfn-kinesisfirehose-deliverystream-dynamicpartitioningconfiguration-retryoptions
+	RetryOptions *DeliveryStream_RetryOptions `json:"RetryOptions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DynamicPartitioningConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.DynamicPartitioningConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchbufferinghints.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchbufferinghints.go
new file mode 100644
index 0000000000..841e74450a
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchbufferinghints.go
@@ -0,0 +1,42 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_ElasticsearchBufferingHints AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.ElasticsearchBufferingHints)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchbufferinghints.html
+type DeliveryStream_ElasticsearchBufferingHints struct {
+
+	// IntervalInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchbufferinghints.html#cfn-kinesisfirehose-deliverystream-elasticsearchbufferinghints-intervalinseconds
+	IntervalInSeconds *types.Value `json:"IntervalInSeconds,omitempty"`
+
+	// SizeInMBs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchbufferinghints.html#cfn-kinesisfirehose-deliverystream-elasticsearchbufferinghints-sizeinmbs
+	SizeInMBs *types.Value `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_ElasticsearchBufferingHints) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.ElasticsearchBufferingHints"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchdestinationconfiguration.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchdestinationconfiguration.go
new file mode 100644
index 0000000000..988feb121b
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchdestinationconfiguration.go
@@ -0,0 +1,97 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_ElasticsearchDestinationConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.ElasticsearchDestinationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html
+type DeliveryStream_ElasticsearchDestinationConfiguration struct {
+
+	// BufferingHints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-bufferinghints
+	BufferingHints *DeliveryStream_ElasticsearchBufferingHints `json:"BufferingHints,omitempty"`
+
+	// CloudWatchLoggingOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-cloudwatchloggingoptions
+	CloudWatchLoggingOptions *DeliveryStream_CloudWatchLoggingOptions `json:"CloudWatchLoggingOptions,omitempty"`
+
+	// ClusterEndpoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-clusterendpoint
+	ClusterEndpoint *types.Value `json:"ClusterEndpoint,omitempty"`
+
+	// DomainARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-domainarn
+	DomainARN *types.Value `json:"DomainARN,omitempty"`
+
+	// IndexName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-indexname
+	IndexName *types.Value `json:"IndexName,omitempty"`
+
+	// IndexRotationPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-indexrotationperiod
+	IndexRotationPeriod *types.Value `json:"IndexRotationPeriod,omitempty"`
+
+	// ProcessingConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-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-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-retryoptions
+	RetryOptions *DeliveryStream_ElasticsearchRetryOptions `json:"RetryOptions,omitempty"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-rolearn
+	RoleARN *types.Value `json:"RoleARN,omitempty"`
+
+	// S3BackupMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-s3backupmode
+	S3BackupMode *types.Value `json:"S3BackupMode,omitempty"`
+
+	// S3Configuration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-s3configuration
+	S3Configuration *DeliveryStream_S3DestinationConfiguration `json:"S3Configuration,omitempty"`
+
+	// TypeName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-typename
+	TypeName *types.Value `json:"TypeName,omitempty"`
+
+	// VpcConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-elasticsearchdestinationconfiguration-vpcconfiguration
+	VpcConfiguration *DeliveryStream_VpcConfiguration `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 *DeliveryStream_ElasticsearchDestinationConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.ElasticsearchDestinationConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchretryoptions.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchretryoptions.go
new file mode 100644
index 0000000000..aa539f6a81
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_elasticsearchretryoptions.go
@@ -0,0 +1,37 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_ElasticsearchRetryOptions AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.ElasticsearchRetryOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchretryoptions.html
+type DeliveryStream_ElasticsearchRetryOptions struct {
+
+	// DurationInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-elasticsearchretryoptions.html#cfn-kinesisfirehose-deliverystream-elasticsearchretryoptions-durationinseconds
+	DurationInSeconds *types.Value `json:"DurationInSeconds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ElasticsearchRetryOptions) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.ElasticsearchRetryOptions"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_encryptionconfiguration.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_encryptionconfiguration.go
new file mode 100644
index 0000000000..4ddd8bd658
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_encryptionconfiguration.go
@@ -0,0 +1,42 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_EncryptionConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.EncryptionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-encryptionconfiguration.html
+type DeliveryStream_EncryptionConfiguration struct {
+
+	// KMSEncryptionConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-encryptionconfiguration.html#cfn-kinesisfirehose-deliverystream-encryptionconfiguration-kmsencryptionconfig
+	KMSEncryptionConfig *DeliveryStream_KMSEncryptionConfig `json:"KMSEncryptionConfig,omitempty"`
+
+	// NoEncryptionConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-encryptionconfiguration.html#cfn-kinesisfirehose-deliverystream-encryptionconfiguration-noencryptionconfig
+	NoEncryptionConfig *types.Value `json:"NoEncryptionConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EncryptionConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.EncryptionConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_extendeds3destinationconfiguration.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_extendeds3destinationconfiguration.go
new file mode 100644
index 0000000000..dc81107a0e
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_extendeds3destinationconfiguration.go
@@ -0,0 +1,97 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_ExtendedS3DestinationConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.ExtendedS3DestinationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html
+type DeliveryStream_ExtendedS3DestinationConfiguration struct {
+
+	// BucketARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-bucketarn
+	BucketARN *types.Value `json:"BucketARN,omitempty"`
+
+	// BufferingHints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-bufferinghints
+	BufferingHints *DeliveryStream_BufferingHints `json:"BufferingHints,omitempty"`
+
+	// CloudWatchLoggingOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-cloudwatchloggingoptions
+	CloudWatchLoggingOptions *DeliveryStream_CloudWatchLoggingOptions `json:"CloudWatchLoggingOptions,omitempty"`
+
+	// CompressionFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-compressionformat
+	CompressionFormat *types.Value `json:"CompressionFormat,omitempty"`
+
+	// DataFormatConversionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-dataformatconversionconfiguration
+	DataFormatConversionConfiguration *DeliveryStream_DataFormatConversionConfiguration `json:"DataFormatConversionConfiguration,omitempty"`
+
+	// DynamicPartitioningConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-dynamicpartitioningconfiguration
+	DynamicPartitioningConfiguration *DeliveryStream_DynamicPartitioningConfiguration `json:"DynamicPartitioningConfiguration,omitempty"`
+
+	// EncryptionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-encryptionconfiguration
+	EncryptionConfiguration *DeliveryStream_EncryptionConfiguration `json:"EncryptionConfiguration,omitempty"`
+
+	// ErrorOutputPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-erroroutputprefix
+	ErrorOutputPrefix *types.Value `json:"ErrorOutputPrefix,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// ProcessingConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-processingconfiguration
+	ProcessingConfiguration *DeliveryStream_ProcessingConfiguration `json:"ProcessingConfiguration,omitempty"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-rolearn
+	RoleARN *types.Value `json:"RoleARN,omitempty"`
+
+	// S3BackupConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-s3backupconfiguration
+	S3BackupConfiguration *DeliveryStream_S3DestinationConfiguration `json:"S3BackupConfiguration,omitempty"`
+
+	// S3BackupMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-extendeds3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-extendeds3destinationconfiguration-s3backupmode
+	S3BackupMode *types.Value `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_ExtendedS3DestinationConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.ExtendedS3DestinationConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_hivejsonserde.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_hivejsonserde.go
new file mode 100644
index 0000000000..15a9815edc
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_hivejsonserde.go
@@ -0,0 +1,37 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_HiveJsonSerDe AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.HiveJsonSerDe)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-hivejsonserde.html
+type DeliveryStream_HiveJsonSerDe struct {
+
+	// TimestampFormats AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-hivejsonserde.html#cfn-kinesisfirehose-deliverystream-hivejsonserde-timestampformats
+	TimestampFormats *types.Value `json:"TimestampFormats,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_HiveJsonSerDe) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.HiveJsonSerDe"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointcommonattribute.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointcommonattribute.go
new file mode 100644
index 0000000000..b6546596c1
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointcommonattribute.go
@@ -0,0 +1,42 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_HttpEndpointCommonAttribute AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.HttpEndpointCommonAttribute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointcommonattribute.html
+type DeliveryStream_HttpEndpointCommonAttribute struct {
+
+	// AttributeName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointcommonattribute.html#cfn-kinesisfirehose-deliverystream-httpendpointcommonattribute-attributename
+	AttributeName *types.Value `json:"AttributeName,omitempty"`
+
+	// AttributeValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointcommonattribute.html#cfn-kinesisfirehose-deliverystream-httpendpointcommonattribute-attributevalue
+	AttributeValue *types.Value `json:"AttributeValue,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_HttpEndpointCommonAttribute) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.HttpEndpointCommonAttribute"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointconfiguration.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointconfiguration.go
new file mode 100644
index 0000000000..34a49a2515
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointconfiguration.go
@@ -0,0 +1,47 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_HttpEndpointConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.HttpEndpointConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointconfiguration.html
+type DeliveryStream_HttpEndpointConfiguration struct {
+
+	// AccessKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointconfiguration.html#cfn-kinesisfirehose-deliverystream-httpendpointconfiguration-accesskey
+	AccessKey *types.Value `json:"AccessKey,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointconfiguration.html#cfn-kinesisfirehose-deliverystream-httpendpointconfiguration-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointconfiguration.html#cfn-kinesisfirehose-deliverystream-httpendpointconfiguration-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_HttpEndpointConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.HttpEndpointConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointdestinationconfiguration.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointdestinationconfiguration.go
new file mode 100644
index 0000000000..4458a2e5e3
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointdestinationconfiguration.go
@@ -0,0 +1,77 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_HttpEndpointDestinationConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.HttpEndpointDestinationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration.html
+type DeliveryStream_HttpEndpointDestinationConfiguration struct {
+
+	// BufferingHints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration-bufferinghints
+	BufferingHints *DeliveryStream_BufferingHints `json:"BufferingHints,omitempty"`
+
+	// CloudWatchLoggingOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration-cloudwatchloggingoptions
+	CloudWatchLoggingOptions *DeliveryStream_CloudWatchLoggingOptions `json:"CloudWatchLoggingOptions,omitempty"`
+
+	// EndpointConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration-endpointconfiguration
+	EndpointConfiguration *DeliveryStream_HttpEndpointConfiguration `json:"EndpointConfiguration,omitempty"`
+
+	// ProcessingConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration-processingconfiguration
+	ProcessingConfiguration *DeliveryStream_ProcessingConfiguration `json:"ProcessingConfiguration,omitempty"`
+
+	// RequestConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration-requestconfiguration
+	RequestConfiguration *DeliveryStream_HttpEndpointRequestConfiguration `json:"RequestConfiguration,omitempty"`
+
+	// RetryOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration-retryoptions
+	RetryOptions *DeliveryStream_RetryOptions `json:"RetryOptions,omitempty"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration-rolearn
+	RoleARN *types.Value `json:"RoleARN,omitempty"`
+
+	// S3BackupMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-httpendpointdestinationconfiguration-s3backupmode
+	S3BackupMode *types.Value `json:"S3BackupMode,omitempty"`
+
+	// S3Configuration AWS CloudFormation Property
+	// Required: true
+	// 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,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_HttpEndpointDestinationConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.HttpEndpointDestinationConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointrequestconfiguration.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointrequestconfiguration.go
new file mode 100644
index 0000000000..81558a2091
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_httpendpointrequestconfiguration.go
@@ -0,0 +1,42 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_HttpEndpointRequestConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.HttpEndpointRequestConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointrequestconfiguration.html
+type DeliveryStream_HttpEndpointRequestConfiguration struct {
+
+	// CommonAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointrequestconfiguration.html#cfn-kinesisfirehose-deliverystream-httpendpointrequestconfiguration-commonattributes
+	CommonAttributes []DeliveryStream_HttpEndpointCommonAttribute `json:"CommonAttributes,omitempty"`
+
+	// ContentEncoding AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-httpendpointrequestconfiguration.html#cfn-kinesisfirehose-deliverystream-httpendpointrequestconfiguration-contentencoding
+	ContentEncoding *types.Value `json:"ContentEncoding,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_HttpEndpointRequestConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.HttpEndpointRequestConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_inputformatconfiguration.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_inputformatconfiguration.go
new file mode 100644
index 0000000000..85505c8a33
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_inputformatconfiguration.go
@@ -0,0 +1,35 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_InputFormatConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.InputFormatConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-inputformatconfiguration.html
+type DeliveryStream_InputFormatConfiguration struct {
+
+	// Deserializer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-inputformatconfiguration.html#cfn-kinesisfirehose-deliverystream-inputformatconfiguration-deserializer
+	Deserializer *DeliveryStream_Deserializer `json:"Deserializer,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InputFormatConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.InputFormatConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kinesisstreamsourceconfiguration.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kinesisstreamsourceconfiguration.go
new file mode 100644
index 0000000000..3b28ec893d
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kinesisstreamsourceconfiguration.go
@@ -0,0 +1,42 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_KinesisStreamSourceConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.KinesisStreamSourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-kinesisstreamsourceconfiguration.html
+type DeliveryStream_KinesisStreamSourceConfiguration struct {
+
+	// KinesisStreamARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-kinesisstreamsourceconfiguration.html#cfn-kinesisfirehose-deliverystream-kinesisstreamsourceconfiguration-kinesisstreamarn
+	KinesisStreamARN *types.Value `json:"KinesisStreamARN,omitempty"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-kinesisstreamsourceconfiguration.html#cfn-kinesisfirehose-deliverystream-kinesisstreamsourceconfiguration-rolearn
+	RoleARN *types.Value `json:"RoleARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_KinesisStreamSourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.KinesisStreamSourceConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kmsencryptionconfig.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kmsencryptionconfig.go
new file mode 100644
index 0000000000..0586336219
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_kmsencryptionconfig.go
@@ -0,0 +1,37 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_KMSEncryptionConfig AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.KMSEncryptionConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-kmsencryptionconfig.html
+type DeliveryStream_KMSEncryptionConfig struct {
+
+	// AWSKMSKeyARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-kmsencryptionconfig.html#cfn-kinesisfirehose-deliverystream-kmsencryptionconfig-awskmskeyarn
+	AWSKMSKeyARN *types.Value `json:"AWSKMSKeyARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_KMSEncryptionConfig) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.KMSEncryptionConfig"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_openxjsonserde.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_openxjsonserde.go
new file mode 100644
index 0000000000..af95efad5e
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_openxjsonserde.go
@@ -0,0 +1,47 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_OpenXJsonSerDe AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.OpenXJsonSerDe)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-openxjsonserde.html
+type DeliveryStream_OpenXJsonSerDe struct {
+
+	// CaseInsensitive AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-openxjsonserde.html#cfn-kinesisfirehose-deliverystream-openxjsonserde-caseinsensitive
+	CaseInsensitive *types.Value `json:"CaseInsensitive,omitempty"`
+
+	// ColumnToJsonKeyMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-openxjsonserde.html#cfn-kinesisfirehose-deliverystream-openxjsonserde-columntojsonkeymappings
+	ColumnToJsonKeyMappings map[string]*types.Value `json:"ColumnToJsonKeyMappings,omitempty"`
+
+	// ConvertDotsInJsonKeysToUnderscores AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-openxjsonserde.html#cfn-kinesisfirehose-deliverystream-openxjsonserde-convertdotsinjsonkeystounderscores
+	ConvertDotsInJsonKeysToUnderscores *types.Value `json:"ConvertDotsInJsonKeysToUnderscores,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_OpenXJsonSerDe) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.OpenXJsonSerDe"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_orcserde.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_orcserde.go
new file mode 100644
index 0000000000..ef92a7daf0
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_orcserde.go
@@ -0,0 +1,82 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_OrcSerDe AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.OrcSerDe)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-orcserde.html
+type DeliveryStream_OrcSerDe struct {
+
+	// BlockSizeBytes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-orcserde.html#cfn-kinesisfirehose-deliverystream-orcserde-blocksizebytes
+	BlockSizeBytes *types.Value `json:"BlockSizeBytes,omitempty"`
+
+	// BloomFilterColumns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-orcserde.html#cfn-kinesisfirehose-deliverystream-orcserde-bloomfiltercolumns
+	BloomFilterColumns *types.Value `json:"BloomFilterColumns,omitempty"`
+
+	// BloomFilterFalsePositiveProbability AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-orcserde.html#cfn-kinesisfirehose-deliverystream-orcserde-bloomfilterfalsepositiveprobability
+	BloomFilterFalsePositiveProbability *types.Value `json:"BloomFilterFalsePositiveProbability,omitempty"`
+
+	// Compression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-orcserde.html#cfn-kinesisfirehose-deliverystream-orcserde-compression
+	Compression *types.Value `json:"Compression,omitempty"`
+
+	// DictionaryKeyThreshold AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-orcserde.html#cfn-kinesisfirehose-deliverystream-orcserde-dictionarykeythreshold
+	DictionaryKeyThreshold *types.Value `json:"DictionaryKeyThreshold,omitempty"`
+
+	// EnablePadding AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-orcserde.html#cfn-kinesisfirehose-deliverystream-orcserde-enablepadding
+	EnablePadding *types.Value `json:"EnablePadding,omitempty"`
+
+	// FormatVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-orcserde.html#cfn-kinesisfirehose-deliverystream-orcserde-formatversion
+	FormatVersion *types.Value `json:"FormatVersion,omitempty"`
+
+	// PaddingTolerance AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-orcserde.html#cfn-kinesisfirehose-deliverystream-orcserde-paddingtolerance
+	PaddingTolerance *types.Value `json:"PaddingTolerance,omitempty"`
+
+	// RowIndexStride AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-orcserde.html#cfn-kinesisfirehose-deliverystream-orcserde-rowindexstride
+	RowIndexStride *types.Value `json:"RowIndexStride,omitempty"`
+
+	// StripeSizeBytes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-orcserde.html#cfn-kinesisfirehose-deliverystream-orcserde-stripesizebytes
+	StripeSizeBytes *types.Value `json:"StripeSizeBytes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_OrcSerDe) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.OrcSerDe"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_outputformatconfiguration.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_outputformatconfiguration.go
new file mode 100644
index 0000000000..147352405d
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_outputformatconfiguration.go
@@ -0,0 +1,35 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_OutputFormatConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.OutputFormatConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-outputformatconfiguration.html
+type DeliveryStream_OutputFormatConfiguration struct {
+
+	// Serializer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-outputformatconfiguration.html#cfn-kinesisfirehose-deliverystream-outputformatconfiguration-serializer
+	Serializer *DeliveryStream_Serializer `json:"Serializer,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_OutputFormatConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.OutputFormatConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_parquetserde.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_parquetserde.go
new file mode 100644
index 0000000000..6c8af4391d
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_parquetserde.go
@@ -0,0 +1,62 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_ParquetSerDe AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.ParquetSerDe)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-parquetserde.html
+type DeliveryStream_ParquetSerDe struct {
+
+	// BlockSizeBytes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-parquetserde.html#cfn-kinesisfirehose-deliverystream-parquetserde-blocksizebytes
+	BlockSizeBytes *types.Value `json:"BlockSizeBytes,omitempty"`
+
+	// Compression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-parquetserde.html#cfn-kinesisfirehose-deliverystream-parquetserde-compression
+	Compression *types.Value `json:"Compression,omitempty"`
+
+	// EnableDictionaryCompression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-parquetserde.html#cfn-kinesisfirehose-deliverystream-parquetserde-enabledictionarycompression
+	EnableDictionaryCompression *types.Value `json:"EnableDictionaryCompression,omitempty"`
+
+	// MaxPaddingBytes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-parquetserde.html#cfn-kinesisfirehose-deliverystream-parquetserde-maxpaddingbytes
+	MaxPaddingBytes *types.Value `json:"MaxPaddingBytes,omitempty"`
+
+	// PageSizeBytes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-parquetserde.html#cfn-kinesisfirehose-deliverystream-parquetserde-pagesizebytes
+	PageSizeBytes *types.Value `json:"PageSizeBytes,omitempty"`
+
+	// WriterVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-parquetserde.html#cfn-kinesisfirehose-deliverystream-parquetserde-writerversion
+	WriterVersion *types.Value `json:"WriterVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ParquetSerDe) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.ParquetSerDe"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processingconfiguration.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processingconfiguration.go
new file mode 100644
index 0000000000..9cd36b61b2
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processingconfiguration.go
@@ -0,0 +1,42 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_ProcessingConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-processingconfiguration.html
+type DeliveryStream_ProcessingConfiguration struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-processingconfiguration.html#cfn-kinesisfirehose-deliverystream-processingconfiguration-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// Processors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-processingconfiguration.html#cfn-kinesisfirehose-deliverystream-processingconfiguration-processors
+	Processors []DeliveryStream_Processor `json:"Processors,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ProcessingConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processor.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processor.go
new file mode 100644
index 0000000000..17876e506f
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processor.go
@@ -0,0 +1,42 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_Processor AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.Processor)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-processor.html
+type DeliveryStream_Processor struct {
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-processor.html#cfn-kinesisfirehose-deliverystream-processor-parameters
+	Parameters []DeliveryStream_ProcessorParameter `json:"Parameters,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-processor.html#cfn-kinesisfirehose-deliverystream-processor-type
+	Type *types.Value `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 *DeliveryStream_Processor) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.Processor"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processorparameter.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processorparameter.go
new file mode 100644
index 0000000000..3b679992e5
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_processorparameter.go
@@ -0,0 +1,42 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_ProcessorParameter AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.ProcessorParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-processorparameter.html
+type DeliveryStream_ProcessorParameter struct {
+
+	// ParameterName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-processorparameter.html#cfn-kinesisfirehose-deliverystream-processorparameter-parametername
+	ParameterName *types.Value `json:"ParameterName,omitempty"`
+
+	// ParameterValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-processorparameter.html#cfn-kinesisfirehose-deliverystream-processorparameter-parametervalue
+	ParameterValue *types.Value `json:"ParameterValue,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ProcessorParameter) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.ProcessorParameter"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftdestinationconfiguration.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftdestinationconfiguration.go
new file mode 100644
index 0000000000..0376fed9f8
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftdestinationconfiguration.go
@@ -0,0 +1,87 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_RedshiftDestinationConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.RedshiftDestinationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html
+type DeliveryStream_RedshiftDestinationConfiguration struct {
+
+	// CloudWatchLoggingOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-cloudwatchloggingoptions
+	CloudWatchLoggingOptions *DeliveryStream_CloudWatchLoggingOptions `json:"CloudWatchLoggingOptions,omitempty"`
+
+	// ClusterJDBCURL AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-clusterjdbcurl
+	ClusterJDBCURL *types.Value `json:"ClusterJDBCURL,omitempty"`
+
+	// CopyCommand AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-copycommand
+	CopyCommand *DeliveryStream_CopyCommand `json:"CopyCommand,omitempty"`
+
+	// Password AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-password
+	Password *types.Value `json:"Password,omitempty"`
+
+	// ProcessingConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-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-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-retryoptions
+	RetryOptions *DeliveryStream_RedshiftRetryOptions `json:"RetryOptions,omitempty"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-rolearn
+	RoleARN *types.Value `json:"RoleARN,omitempty"`
+
+	// S3BackupConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-s3backupconfiguration
+	S3BackupConfiguration *DeliveryStream_S3DestinationConfiguration `json:"S3BackupConfiguration,omitempty"`
+
+	// S3BackupMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-s3backupmode
+	S3BackupMode *types.Value `json:"S3BackupMode,omitempty"`
+
+	// S3Configuration AWS CloudFormation Property
+	// Required: true
+	// 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,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-redshiftdestinationconfiguration-username
+	Username *types.Value `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 *DeliveryStream_RedshiftDestinationConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.RedshiftDestinationConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftretryoptions.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftretryoptions.go
new file mode 100644
index 0000000000..03d377678e
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_redshiftretryoptions.go
@@ -0,0 +1,37 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_RedshiftRetryOptions AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.RedshiftRetryOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftretryoptions.html
+type DeliveryStream_RedshiftRetryOptions struct {
+
+	// DurationInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-redshiftretryoptions.html#cfn-kinesisfirehose-deliverystream-redshiftretryoptions-durationinseconds
+	DurationInSeconds *types.Value `json:"DurationInSeconds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RedshiftRetryOptions) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.RedshiftRetryOptions"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_retryoptions.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_retryoptions.go
new file mode 100644
index 0000000000..ce2ecb595d
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_retryoptions.go
@@ -0,0 +1,37 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_RetryOptions AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.RetryOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-retryoptions.html
+type DeliveryStream_RetryOptions struct {
+
+	// DurationInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-retryoptions.html#cfn-kinesisfirehose-deliverystream-retryoptions-durationinseconds
+	DurationInSeconds *types.Value `json:"DurationInSeconds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RetryOptions) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.RetryOptions"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_s3destinationconfiguration.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_s3destinationconfiguration.go
new file mode 100644
index 0000000000..eb3e223633
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_s3destinationconfiguration.go
@@ -0,0 +1,72 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_S3DestinationConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-s3destinationconfiguration.html
+type DeliveryStream_S3DestinationConfiguration struct {
+
+	// BucketARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-s3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-s3destinationconfiguration-bucketarn
+	BucketARN *types.Value `json:"BucketARN,omitempty"`
+
+	// BufferingHints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-s3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-s3destinationconfiguration-bufferinghints
+	BufferingHints *DeliveryStream_BufferingHints `json:"BufferingHints,omitempty"`
+
+	// CloudWatchLoggingOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-s3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-s3destinationconfiguration-cloudwatchloggingoptions
+	CloudWatchLoggingOptions *DeliveryStream_CloudWatchLoggingOptions `json:"CloudWatchLoggingOptions,omitempty"`
+
+	// CompressionFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-s3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-s3destinationconfiguration-compressionformat
+	CompressionFormat *types.Value `json:"CompressionFormat,omitempty"`
+
+	// EncryptionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-s3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-s3destinationconfiguration-encryptionconfiguration
+	EncryptionConfiguration *DeliveryStream_EncryptionConfiguration `json:"EncryptionConfiguration,omitempty"`
+
+	// ErrorOutputPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-s3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-s3destinationconfiguration-erroroutputprefix
+	ErrorOutputPrefix *types.Value `json:"ErrorOutputPrefix,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-s3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-s3destinationconfiguration-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-s3destinationconfiguration.html#cfn-kinesisfirehose-deliverystream-s3destinationconfiguration-rolearn
+	RoleARN *types.Value `json:"RoleARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_S3DestinationConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_schemaconfiguration.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_schemaconfiguration.go
new file mode 100644
index 0000000000..6cc53e4563
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_schemaconfiguration.go
@@ -0,0 +1,62 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_SchemaConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.SchemaConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-schemaconfiguration.html
+type DeliveryStream_SchemaConfiguration struct {
+
+	// CatalogId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-schemaconfiguration.html#cfn-kinesisfirehose-deliverystream-schemaconfiguration-catalogid
+	CatalogId *types.Value `json:"CatalogId,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-schemaconfiguration.html#cfn-kinesisfirehose-deliverystream-schemaconfiguration-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// Region AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-schemaconfiguration.html#cfn-kinesisfirehose-deliverystream-schemaconfiguration-region
+	Region *types.Value `json:"Region,omitempty"`
+
+	// RoleARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-schemaconfiguration.html#cfn-kinesisfirehose-deliverystream-schemaconfiguration-rolearn
+	RoleARN *types.Value `json:"RoleARN,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-schemaconfiguration.html#cfn-kinesisfirehose-deliverystream-schemaconfiguration-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// VersionId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-schemaconfiguration.html#cfn-kinesisfirehose-deliverystream-schemaconfiguration-versionid
+	VersionId *types.Value `json:"VersionId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SchemaConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.SchemaConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_serializer.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_serializer.go
new file mode 100644
index 0000000000..4d12dd5c37
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_serializer.go
@@ -0,0 +1,40 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_Serializer AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.Serializer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-serializer.html
+type DeliveryStream_Serializer struct {
+
+	// OrcSerDe AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-serializer.html#cfn-kinesisfirehose-deliverystream-serializer-orcserde
+	OrcSerDe *DeliveryStream_OrcSerDe `json:"OrcSerDe,omitempty"`
+
+	// ParquetSerDe AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-serializer.html#cfn-kinesisfirehose-deliverystream-serializer-parquetserde
+	ParquetSerDe *DeliveryStream_ParquetSerDe `json:"ParquetSerDe,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Serializer) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.Serializer"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkdestinationconfiguration.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkdestinationconfiguration.go
new file mode 100644
index 0000000000..c28345d949
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkdestinationconfiguration.go
@@ -0,0 +1,77 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_SplunkDestinationConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.SplunkDestinationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-splunkdestinationconfiguration.html
+type DeliveryStream_SplunkDestinationConfiguration struct {
+
+	// CloudWatchLoggingOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-splunkdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-splunkdestinationconfiguration-cloudwatchloggingoptions
+	CloudWatchLoggingOptions *DeliveryStream_CloudWatchLoggingOptions `json:"CloudWatchLoggingOptions,omitempty"`
+
+	// HECAcknowledgmentTimeoutInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-splunkdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-splunkdestinationconfiguration-hecacknowledgmenttimeoutinseconds
+	HECAcknowledgmentTimeoutInSeconds *types.Value `json:"HECAcknowledgmentTimeoutInSeconds,omitempty"`
+
+	// HECEndpoint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-splunkdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-splunkdestinationconfiguration-hecendpoint
+	HECEndpoint *types.Value `json:"HECEndpoint,omitempty"`
+
+	// HECEndpointType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-splunkdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-splunkdestinationconfiguration-hecendpointtype
+	HECEndpointType *types.Value `json:"HECEndpointType,omitempty"`
+
+	// HECToken AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-splunkdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-splunkdestinationconfiguration-hectoken
+	HECToken *types.Value `json:"HECToken,omitempty"`
+
+	// ProcessingConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-splunkdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-splunkdestinationconfiguration-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-splunkdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-splunkdestinationconfiguration-retryoptions
+	RetryOptions *DeliveryStream_SplunkRetryOptions `json:"RetryOptions,omitempty"`
+
+	// S3BackupMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-splunkdestinationconfiguration.html#cfn-kinesisfirehose-deliverystream-splunkdestinationconfiguration-s3backupmode
+	S3BackupMode *types.Value `json:"S3BackupMode,omitempty"`
+
+	// S3Configuration AWS CloudFormation Property
+	// Required: true
+	// 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,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SplunkDestinationConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.SplunkDestinationConfiguration"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkretryoptions.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkretryoptions.go
new file mode 100644
index 0000000000..bfcbe57274
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_splunkretryoptions.go
@@ -0,0 +1,37 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_SplunkRetryOptions AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.SplunkRetryOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-splunkretryoptions.html
+type DeliveryStream_SplunkRetryOptions struct {
+
+	// DurationInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-splunkretryoptions.html#cfn-kinesisfirehose-deliverystream-splunkretryoptions-durationinseconds
+	DurationInSeconds *types.Value `json:"DurationInSeconds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SplunkRetryOptions) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.SplunkRetryOptions"
+}
diff --git a/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_vpcconfiguration.go b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_vpcconfiguration.go
new file mode 100644
index 0000000000..19a76fa72d
--- /dev/null
+++ b/goformation/cloudformation/kinesisfirehose/aws-kinesisfirehose-deliverystream_vpcconfiguration.go
@@ -0,0 +1,47 @@
+package kinesisfirehose
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeliveryStream_VpcConfiguration AWS CloudFormation Resource (AWS::KinesisFirehose::DeliveryStream.VpcConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-vpcconfiguration.html
+type DeliveryStream_VpcConfiguration struct {
+
+	// RoleARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-vpcconfiguration.html#cfn-kinesisfirehose-deliverystream-vpcconfiguration-rolearn
+	RoleARN *types.Value `json:"RoleARN,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-vpcconfiguration.html#cfn-kinesisfirehose-deliverystream-vpcconfiguration-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-kinesisfirehose-deliverystream-vpcconfiguration.html#cfn-kinesisfirehose-deliverystream-vpcconfiguration-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeliveryStream_VpcConfiguration) AWSCloudFormationType() string {
+	return "AWS::KinesisFirehose::DeliveryStream.VpcConfiguration"
+}
diff --git a/goformation/cloudformation/kms/aws-kms-alias.go b/goformation/cloudformation/kms/aws-kms-alias.go
new file mode 100644
index 0000000000..9771531229
--- /dev/null
+++ b/goformation/cloudformation/kms/aws-kms-alias.go
@@ -0,0 +1,113 @@
+package kms
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Alias AWS CloudFormation Resource (AWS::KMS::Alias)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-alias.html
+type Alias struct {
+
+	// AliasName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-alias.html#cfn-kms-alias-aliasname
+	AliasName *types.Value `json:"AliasName,omitempty"`
+
+	// TargetKeyId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-alias.html#cfn-kms-alias-targetkeyid
+	TargetKeyId *types.Value `json:"TargetKeyId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Alias) AWSCloudFormationType() string {
+	return "AWS::KMS::Alias"
+}
+
+// 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 Alias) MarshalJSON() ([]byte, error) {
+	type Properties Alias
+	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 *Alias) UnmarshalJSON(b []byte) error {
+	type Properties Alias
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Alias(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/kms/aws-kms-key.go b/goformation/cloudformation/kms/aws-kms-key.go
new file mode 100644
index 0000000000..729917bfd1
--- /dev/null
+++ b/goformation/cloudformation/kms/aws-kms-key.go
@@ -0,0 +1,149 @@
+package kms
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Key AWS CloudFormation Resource (AWS::KMS::Key)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html
+type Key struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html#cfn-kms-key-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EnableKeyRotation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html#cfn-kms-key-enablekeyrotation
+	EnableKeyRotation *types.Value `json:"EnableKeyRotation,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html#cfn-kms-key-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// KeyPolicy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html#cfn-kms-key-keypolicy
+	KeyPolicy interface{} `json:"KeyPolicy,omitempty"`
+
+	// KeySpec AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html#cfn-kms-key-keyspec
+	KeySpec *types.Value `json:"KeySpec,omitempty"`
+
+	// KeyUsage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html#cfn-kms-key-keyusage
+	KeyUsage *types.Value `json:"KeyUsage,omitempty"`
+
+	// MultiRegion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html#cfn-kms-key-multiregion
+	MultiRegion *types.Value `json:"MultiRegion,omitempty"`
+
+	// PendingWindowInDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html#cfn-kms-key-pendingwindowindays
+	PendingWindowInDays *types.Value `json:"PendingWindowInDays,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-key.html#cfn-kms-key-tags
+	Tags []cloudformation.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 *Key) AWSCloudFormationType() string {
+	return "AWS::KMS::Key"
+}
+
+// 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 Key) MarshalJSON() ([]byte, error) {
+	type Properties Key
+	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 *Key) UnmarshalJSON(b []byte) error {
+	type Properties Key
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Key(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/kms/aws-kms-replicakey.go b/goformation/cloudformation/kms/aws-kms-replicakey.go
new file mode 100644
index 0000000000..f609e89ff5
--- /dev/null
+++ b/goformation/cloudformation/kms/aws-kms-replicakey.go
@@ -0,0 +1,134 @@
+package kms
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReplicaKey AWS CloudFormation Resource (AWS::KMS::ReplicaKey)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-replicakey.html
+type ReplicaKey struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-replicakey.html#cfn-kms-replicakey-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-replicakey.html#cfn-kms-replicakey-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// KeyPolicy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-replicakey.html#cfn-kms-replicakey-keypolicy
+	KeyPolicy interface{} `json:"KeyPolicy,omitempty"`
+
+	// PendingWindowInDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-replicakey.html#cfn-kms-replicakey-pendingwindowindays
+	PendingWindowInDays *types.Value `json:"PendingWindowInDays,omitempty"`
+
+	// PrimaryKeyArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-replicakey.html#cfn-kms-replicakey-primarykeyarn
+	PrimaryKeyArn *types.Value `json:"PrimaryKeyArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-kms-replicakey.html#cfn-kms-replicakey-tags
+	Tags []cloudformation.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 *ReplicaKey) AWSCloudFormationType() string {
+	return "AWS::KMS::ReplicaKey"
+}
+
+// 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 ReplicaKey) MarshalJSON() ([]byte, error) {
+	type Properties ReplicaKey
+	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 *ReplicaKey) UnmarshalJSON(b []byte) error {
+	type Properties ReplicaKey
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ReplicaKey(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings.go b/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings.go
new file mode 100644
index 0000000000..5ee644e79f
--- /dev/null
+++ b/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings.go
@@ -0,0 +1,113 @@
+package lakeformation
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataLakeSettings AWS CloudFormation Resource (AWS::LakeFormation::DataLakeSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-datalakesettings.html
+type DataLakeSettings struct {
+
+	// Admins AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-datalakesettings.html#cfn-lakeformation-datalakesettings-admins
+	Admins *DataLakeSettings_Admins `json:"Admins,omitempty"`
+
+	// TrustedResourceOwners AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-datalakesettings.html#cfn-lakeformation-datalakesettings-trustedresourceowners
+	TrustedResourceOwners *types.Value `json:"TrustedResourceOwners,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataLakeSettings) AWSCloudFormationType() string {
+	return "AWS::LakeFormation::DataLakeSettings"
+}
+
+// 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 DataLakeSettings) MarshalJSON() ([]byte, error) {
+	type Properties DataLakeSettings
+	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 *DataLakeSettings) UnmarshalJSON(b []byte) error {
+	type Properties DataLakeSettings
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DataLakeSettings(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings_admins.go b/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings_admins.go
new file mode 100644
index 0000000000..06f90ff14d
--- /dev/null
+++ b/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings_admins.go
@@ -0,0 +1,30 @@
+package lakeformation
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataLakeSettings_Admins AWS CloudFormation Resource (AWS::LakeFormation::DataLakeSettings.Admins)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-datalakesettings-admins.html
+type DataLakeSettings_Admins struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataLakeSettings_Admins) AWSCloudFormationType() string {
+	return "AWS::LakeFormation::DataLakeSettings.Admins"
+}
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings_datalakeprincipal.go b/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings_datalakeprincipal.go
new file mode 100644
index 0000000000..f4a3115fe6
--- /dev/null
+++ b/goformation/cloudformation/lakeformation/aws-lakeformation-datalakesettings_datalakeprincipal.go
@@ -0,0 +1,37 @@
+package lakeformation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataLakeSettings_DataLakePrincipal AWS CloudFormation Resource (AWS::LakeFormation::DataLakeSettings.DataLakePrincipal)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-datalakesettings-datalakeprincipal.html
+type DataLakeSettings_DataLakePrincipal struct {
+
+	// DataLakePrincipalIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-datalakesettings-datalakeprincipal.html#cfn-lakeformation-datalakesettings-datalakeprincipal-datalakeprincipalidentifier
+	DataLakePrincipalIdentifier *types.Value `json:"DataLakePrincipalIdentifier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataLakeSettings_DataLakePrincipal) AWSCloudFormationType() string {
+	return "AWS::LakeFormation::DataLakeSettings.DataLakePrincipal"
+}
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions.go b/goformation/cloudformation/lakeformation/aws-lakeformation-permissions.go
new file mode 100644
index 0000000000..0096c5442e
--- /dev/null
+++ b/goformation/cloudformation/lakeformation/aws-lakeformation-permissions.go
@@ -0,0 +1,123 @@
+package lakeformation
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Permissions AWS CloudFormation Resource (AWS::LakeFormation::Permissions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-permissions.html
+type Permissions struct {
+
+	// DataLakePrincipal AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-permissions.html#cfn-lakeformation-permissions-datalakeprincipal
+	DataLakePrincipal *Permissions_DataLakePrincipal `json:"DataLakePrincipal,omitempty"`
+
+	// Permissions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-permissions.html#cfn-lakeformation-permissions-permissions
+	Permissions *types.Value `json:"Permissions,omitempty"`
+
+	// PermissionsWithGrantOption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-permissions.html#cfn-lakeformation-permissions-permissionswithgrantoption
+	PermissionsWithGrantOption *types.Value `json:"PermissionsWithGrantOption,omitempty"`
+
+	// Resource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-permissions.html#cfn-lakeformation-permissions-resource
+	Resource *Permissions_Resource `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 *Permissions) AWSCloudFormationType() string {
+	return "AWS::LakeFormation::Permissions"
+}
+
+// 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 Permissions) MarshalJSON() ([]byte, error) {
+	type Properties Permissions
+	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 *Permissions) UnmarshalJSON(b []byte) error {
+	type Properties Permissions
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Permissions(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_columnwildcard.go b/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_columnwildcard.go
new file mode 100644
index 0000000000..15ce587932
--- /dev/null
+++ b/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_columnwildcard.go
@@ -0,0 +1,37 @@
+package lakeformation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Permissions_ColumnWildcard AWS CloudFormation Resource (AWS::LakeFormation::Permissions.ColumnWildcard)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-columnwildcard.html
+type Permissions_ColumnWildcard struct {
+
+	// ExcludedColumnNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-columnwildcard.html#cfn-lakeformation-permissions-columnwildcard-excludedcolumnnames
+	ExcludedColumnNames *types.Value `json:"ExcludedColumnNames,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Permissions_ColumnWildcard) AWSCloudFormationType() string {
+	return "AWS::LakeFormation::Permissions.ColumnWildcard"
+}
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_databaseresource.go b/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_databaseresource.go
new file mode 100644
index 0000000000..47ff894c72
--- /dev/null
+++ b/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_databaseresource.go
@@ -0,0 +1,42 @@
+package lakeformation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Permissions_DatabaseResource AWS CloudFormation Resource (AWS::LakeFormation::Permissions.DatabaseResource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-databaseresource.html
+type Permissions_DatabaseResource struct {
+
+	// CatalogId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-databaseresource.html#cfn-lakeformation-permissions-databaseresource-catalogid
+	CatalogId *types.Value `json:"CatalogId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-databaseresource.html#cfn-lakeformation-permissions-databaseresource-name
+	Name *types.Value `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 *Permissions_DatabaseResource) AWSCloudFormationType() string {
+	return "AWS::LakeFormation::Permissions.DatabaseResource"
+}
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_datalakeprincipal.go b/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_datalakeprincipal.go
new file mode 100644
index 0000000000..5444935cdd
--- /dev/null
+++ b/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_datalakeprincipal.go
@@ -0,0 +1,37 @@
+package lakeformation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Permissions_DataLakePrincipal AWS CloudFormation Resource (AWS::LakeFormation::Permissions.DataLakePrincipal)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-datalakeprincipal.html
+type Permissions_DataLakePrincipal struct {
+
+	// DataLakePrincipalIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-datalakeprincipal.html#cfn-lakeformation-permissions-datalakeprincipal-datalakeprincipalidentifier
+	DataLakePrincipalIdentifier *types.Value `json:"DataLakePrincipalIdentifier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Permissions_DataLakePrincipal) AWSCloudFormationType() string {
+	return "AWS::LakeFormation::Permissions.DataLakePrincipal"
+}
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_datalocationresource.go b/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_datalocationresource.go
new file mode 100644
index 0000000000..d1fbea354b
--- /dev/null
+++ b/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_datalocationresource.go
@@ -0,0 +1,42 @@
+package lakeformation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Permissions_DataLocationResource AWS CloudFormation Resource (AWS::LakeFormation::Permissions.DataLocationResource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-datalocationresource.html
+type Permissions_DataLocationResource struct {
+
+	// CatalogId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-datalocationresource.html#cfn-lakeformation-permissions-datalocationresource-catalogid
+	CatalogId *types.Value `json:"CatalogId,omitempty"`
+
+	// S3Resource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-datalocationresource.html#cfn-lakeformation-permissions-datalocationresource-s3resource
+	S3Resource *types.Value `json:"S3Resource,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Permissions_DataLocationResource) AWSCloudFormationType() string {
+	return "AWS::LakeFormation::Permissions.DataLocationResource"
+}
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_resource.go b/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_resource.go
new file mode 100644
index 0000000000..e8cdfada32
--- /dev/null
+++ b/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_resource.go
@@ -0,0 +1,50 @@
+package lakeformation
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Permissions_Resource AWS CloudFormation Resource (AWS::LakeFormation::Permissions.Resource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-resource.html
+type Permissions_Resource struct {
+
+	// DataLocationResource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-resource.html#cfn-lakeformation-permissions-resource-datalocationresource
+	DataLocationResource *Permissions_DataLocationResource `json:"DataLocationResource,omitempty"`
+
+	// DatabaseResource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-resource.html#cfn-lakeformation-permissions-resource-databaseresource
+	DatabaseResource *Permissions_DatabaseResource `json:"DatabaseResource,omitempty"`
+
+	// TableResource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-resource.html#cfn-lakeformation-permissions-resource-tableresource
+	TableResource *Permissions_TableResource `json:"TableResource,omitempty"`
+
+	// TableWithColumnsResource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-resource.html#cfn-lakeformation-permissions-resource-tablewithcolumnsresource
+	TableWithColumnsResource *Permissions_TableWithColumnsResource `json:"TableWithColumnsResource,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Permissions_Resource) AWSCloudFormationType() string {
+	return "AWS::LakeFormation::Permissions.Resource"
+}
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tableresource.go b/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tableresource.go
new file mode 100644
index 0000000000..4044f6d6dd
--- /dev/null
+++ b/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tableresource.go
@@ -0,0 +1,52 @@
+package lakeformation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Permissions_TableResource AWS CloudFormation Resource (AWS::LakeFormation::Permissions.TableResource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-tableresource.html
+type Permissions_TableResource struct {
+
+	// CatalogId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-tableresource.html#cfn-lakeformation-permissions-tableresource-catalogid
+	CatalogId *types.Value `json:"CatalogId,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-tableresource.html#cfn-lakeformation-permissions-tableresource-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-tableresource.html#cfn-lakeformation-permissions-tableresource-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// TableWildcard AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-tableresource.html#cfn-lakeformation-permissions-tableresource-tablewildcard
+	TableWildcard *Permissions_TableWildcard `json:"TableWildcard,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Permissions_TableResource) AWSCloudFormationType() string {
+	return "AWS::LakeFormation::Permissions.TableResource"
+}
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tablewildcard.go b/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tablewildcard.go
new file mode 100644
index 0000000000..eb1c0e3f06
--- /dev/null
+++ b/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tablewildcard.go
@@ -0,0 +1,30 @@
+package lakeformation
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Permissions_TableWildcard AWS CloudFormation Resource (AWS::LakeFormation::Permissions.TableWildcard)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-tablewildcard.html
+type Permissions_TableWildcard struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Permissions_TableWildcard) AWSCloudFormationType() string {
+	return "AWS::LakeFormation::Permissions.TableWildcard"
+}
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tablewithcolumnsresource.go b/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tablewithcolumnsresource.go
new file mode 100644
index 0000000000..535e4b9952
--- /dev/null
+++ b/goformation/cloudformation/lakeformation/aws-lakeformation-permissions_tablewithcolumnsresource.go
@@ -0,0 +1,57 @@
+package lakeformation
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Permissions_TableWithColumnsResource AWS CloudFormation Resource (AWS::LakeFormation::Permissions.TableWithColumnsResource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-tablewithcolumnsresource.html
+type Permissions_TableWithColumnsResource struct {
+
+	// CatalogId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-tablewithcolumnsresource.html#cfn-lakeformation-permissions-tablewithcolumnsresource-catalogid
+	CatalogId *types.Value `json:"CatalogId,omitempty"`
+
+	// ColumnNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-tablewithcolumnsresource.html#cfn-lakeformation-permissions-tablewithcolumnsresource-columnnames
+	ColumnNames *types.Value `json:"ColumnNames,omitempty"`
+
+	// ColumnWildcard AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-tablewithcolumnsresource.html#cfn-lakeformation-permissions-tablewithcolumnsresource-columnwildcard
+	ColumnWildcard *Permissions_ColumnWildcard `json:"ColumnWildcard,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-tablewithcolumnsresource.html#cfn-lakeformation-permissions-tablewithcolumnsresource-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lakeformation-permissions-tablewithcolumnsresource.html#cfn-lakeformation-permissions-tablewithcolumnsresource-name
+	Name *types.Value `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 *Permissions_TableWithColumnsResource) AWSCloudFormationType() string {
+	return "AWS::LakeFormation::Permissions.TableWithColumnsResource"
+}
diff --git a/goformation/cloudformation/lakeformation/aws-lakeformation-resource.go b/goformation/cloudformation/lakeformation/aws-lakeformation-resource.go
new file mode 100644
index 0000000000..1d228518b5
--- /dev/null
+++ b/goformation/cloudformation/lakeformation/aws-lakeformation-resource.go
@@ -0,0 +1,118 @@
+package lakeformation
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Resource AWS CloudFormation Resource (AWS::LakeFormation::Resource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-resource.html
+type Resource struct {
+
+	// ResourceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-resource.html#cfn-lakeformation-resource-resourcearn
+	ResourceArn *types.Value `json:"ResourceArn,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-resource.html#cfn-lakeformation-resource-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// UseServiceLinkedRole AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lakeformation-resource.html#cfn-lakeformation-resource-useservicelinkedrole
+	UseServiceLinkedRole *types.Value `json:"UseServiceLinkedRole"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Resource) AWSCloudFormationType() string {
+	return "AWS::LakeFormation::Resource"
+}
+
+// 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 Resource) MarshalJSON() ([]byte, error) {
+	type Properties Resource
+	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 *Resource) UnmarshalJSON(b []byte) error {
+	type Properties Resource
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Resource(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/lambda/aws-lambda-alias.go b/goformation/cloudformation/lambda/aws-lambda-alias.go
new file mode 100644
index 0000000000..74278a81b2
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-alias.go
@@ -0,0 +1,143 @@
+package lambda
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Alias AWS CloudFormation Resource (AWS::Lambda::Alias)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-alias.html
+type Alias struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-alias.html#cfn-lambda-alias-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// FunctionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-alias.html#cfn-lambda-alias-functionname
+	FunctionName *types.Value `json:"FunctionName,omitempty"`
+
+	// FunctionVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-alias.html#cfn-lambda-alias-functionversion
+	FunctionVersion *types.Value `json:"FunctionVersion,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-alias.html#cfn-lambda-alias-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ProvisionedConcurrencyConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-alias.html#cfn-lambda-alias-provisionedconcurrencyconfig
+	ProvisionedConcurrencyConfig *Alias_ProvisionedConcurrencyConfiguration `json:"ProvisionedConcurrencyConfig,omitempty"`
+
+	// RoutingConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-alias.html#cfn-lambda-alias-routingconfig
+	RoutingConfig *Alias_AliasRoutingConfiguration `json:"RoutingConfig,omitempty"`
+
+	// AWSCloudFormationUpdatePolicy represents a CloudFormation UpdatePolicy
+	AWSCloudFormationUpdatePolicy *policies.UpdatePolicy `json:"-"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Alias) AWSCloudFormationType() string {
+	return "AWS::Lambda::Alias"
+}
+
+// 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 Alias) MarshalJSON() ([]byte, error) {
+	type Properties Alias
+	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"`
+		UpdatePolicy        *policies.UpdatePolicy       `json:"UpdatePolicy,omitempty"`
+	}{
+		Type:                r.AWSCloudFormationType(),
+		Properties:          (Properties)(r),
+		DependsOn:           r.AWSCloudFormationDependsOn,
+		Metadata:            r.AWSCloudFormationMetadata,
+		DeletionPolicy:      r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition:           r.AWSCloudFormationCondition,
+		UpdatePolicy:        r.AWSCloudFormationUpdatePolicy,
+	})
+}
+
+// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
+// AWS CloudFormation resource object, and just keeps the 'Properties' field.
+func (r *Alias) UnmarshalJSON(b []byte) error {
+	type Properties Alias
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		Metadata            map[string]interface{}
+		DeletionPolicy      string
+		UpdateReplacePolicy string
+		Condition           string
+		UpdatePolicy        *policies.UpdatePolicy
+	}{}
+
+	dec := json.NewDecoder(bytes.NewReader(b))
+	dec.DisallowUnknownFields() // Force error if unknown field is found
+
+	if err := dec.Decode(&res); err != nil {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Alias(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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
+	}
+	if res.UpdatePolicy != nil {
+		r.AWSCloudFormationUpdatePolicy = res.UpdatePolicy
+	}
+
+	return nil
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-alias_aliasroutingconfiguration.go b/goformation/cloudformation/lambda/aws-lambda-alias_aliasroutingconfiguration.go
new file mode 100644
index 0000000000..59dcc3cd18
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-alias_aliasroutingconfiguration.go
@@ -0,0 +1,35 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Alias_AliasRoutingConfiguration AWS CloudFormation Resource (AWS::Lambda::Alias.AliasRoutingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-alias-aliasroutingconfiguration.html
+type Alias_AliasRoutingConfiguration struct {
+
+	// AdditionalVersionWeights AWS CloudFormation Property
+	// Required: true
+	// 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,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Alias_AliasRoutingConfiguration) AWSCloudFormationType() string {
+	return "AWS::Lambda::Alias.AliasRoutingConfiguration"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-alias_provisionedconcurrencyconfiguration.go b/goformation/cloudformation/lambda/aws-lambda-alias_provisionedconcurrencyconfiguration.go
new file mode 100644
index 0000000000..9b11d1b2ab
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-alias_provisionedconcurrencyconfiguration.go
@@ -0,0 +1,37 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Alias_ProvisionedConcurrencyConfiguration AWS CloudFormation Resource (AWS::Lambda::Alias.ProvisionedConcurrencyConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-alias-provisionedconcurrencyconfiguration.html
+type Alias_ProvisionedConcurrencyConfiguration struct {
+
+	// ProvisionedConcurrentExecutions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-alias-provisionedconcurrencyconfiguration.html#cfn-lambda-alias-provisionedconcurrencyconfiguration-provisionedconcurrentexecutions
+	ProvisionedConcurrentExecutions *types.Value `json:"ProvisionedConcurrentExecutions"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Alias_ProvisionedConcurrencyConfiguration) AWSCloudFormationType() string {
+	return "AWS::Lambda::Alias.ProvisionedConcurrencyConfiguration"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-alias_versionweight.go b/goformation/cloudformation/lambda/aws-lambda-alias_versionweight.go
new file mode 100644
index 0000000000..92c9ea2d45
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-alias_versionweight.go
@@ -0,0 +1,42 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Alias_VersionWeight AWS CloudFormation Resource (AWS::Lambda::Alias.VersionWeight)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-alias-versionweight.html
+type Alias_VersionWeight struct {
+
+	// FunctionVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-alias-versionweight.html#cfn-lambda-alias-versionweight-functionversion
+	FunctionVersion *types.Value `json:"FunctionVersion,omitempty"`
+
+	// FunctionWeight AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-alias-versionweight.html#cfn-lambda-alias-versionweight-functionweight
+	FunctionWeight *types.Value `json:"FunctionWeight"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Alias_VersionWeight) AWSCloudFormationType() string {
+	return "AWS::Lambda::Alias.VersionWeight"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-codesigningconfig.go b/goformation/cloudformation/lambda/aws-lambda-codesigningconfig.go
new file mode 100644
index 0000000000..4b8a18bbbc
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-codesigningconfig.go
@@ -0,0 +1,118 @@
+package lambda
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CodeSigningConfig AWS CloudFormation Resource (AWS::Lambda::CodeSigningConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-codesigningconfig.html
+type CodeSigningConfig struct {
+
+	// AllowedPublishers AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-codesigningconfig.html#cfn-lambda-codesigningconfig-allowedpublishers
+	AllowedPublishers *CodeSigningConfig_AllowedPublishers `json:"AllowedPublishers,omitempty"`
+
+	// CodeSigningPolicies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-codesigningconfig.html#cfn-lambda-codesigningconfig-codesigningpolicies
+	CodeSigningPolicies *CodeSigningConfig_CodeSigningPolicies `json:"CodeSigningPolicies,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-codesigningconfig.html#cfn-lambda-codesigningconfig-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CodeSigningConfig) AWSCloudFormationType() string {
+	return "AWS::Lambda::CodeSigningConfig"
+}
+
+// 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 CodeSigningConfig) MarshalJSON() ([]byte, error) {
+	type Properties CodeSigningConfig
+	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 *CodeSigningConfig) UnmarshalJSON(b []byte) error {
+	type Properties CodeSigningConfig
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CodeSigningConfig(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/lambda/aws-lambda-codesigningconfig_allowedpublishers.go b/goformation/cloudformation/lambda/aws-lambda-codesigningconfig_allowedpublishers.go
new file mode 100644
index 0000000000..b7a731561f
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-codesigningconfig_allowedpublishers.go
@@ -0,0 +1,37 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CodeSigningConfig_AllowedPublishers AWS CloudFormation Resource (AWS::Lambda::CodeSigningConfig.AllowedPublishers)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-codesigningconfig-allowedpublishers.html
+type CodeSigningConfig_AllowedPublishers struct {
+
+	// SigningProfileVersionArns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-codesigningconfig-allowedpublishers.html#cfn-lambda-codesigningconfig-allowedpublishers-signingprofileversionarns
+	SigningProfileVersionArns *types.Value `json:"SigningProfileVersionArns,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CodeSigningConfig_AllowedPublishers) AWSCloudFormationType() string {
+	return "AWS::Lambda::CodeSigningConfig.AllowedPublishers"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-codesigningconfig_codesigningpolicies.go b/goformation/cloudformation/lambda/aws-lambda-codesigningconfig_codesigningpolicies.go
new file mode 100644
index 0000000000..9693fa3398
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-codesigningconfig_codesigningpolicies.go
@@ -0,0 +1,37 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CodeSigningConfig_CodeSigningPolicies AWS CloudFormation Resource (AWS::Lambda::CodeSigningConfig.CodeSigningPolicies)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-codesigningconfig-codesigningpolicies.html
+type CodeSigningConfig_CodeSigningPolicies struct {
+
+	// UntrustedArtifactOnDeployment AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-codesigningconfig-codesigningpolicies.html#cfn-lambda-codesigningconfig-codesigningpolicies-untrustedartifactondeployment
+	UntrustedArtifactOnDeployment *types.Value `json:"UntrustedArtifactOnDeployment,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CodeSigningConfig_CodeSigningPolicies) AWSCloudFormationType() string {
+	return "AWS::Lambda::CodeSigningConfig.CodeSigningPolicies"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig.go b/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig.go
new file mode 100644
index 0000000000..4430974156
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig.go
@@ -0,0 +1,128 @@
+package lambda
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventInvokeConfig AWS CloudFormation Resource (AWS::Lambda::EventInvokeConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventinvokeconfig.html
+type EventInvokeConfig struct {
+
+	// DestinationConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventinvokeconfig.html#cfn-lambda-eventinvokeconfig-destinationconfig
+	DestinationConfig *EventInvokeConfig_DestinationConfig `json:"DestinationConfig,omitempty"`
+
+	// FunctionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventinvokeconfig.html#cfn-lambda-eventinvokeconfig-functionname
+	FunctionName *types.Value `json:"FunctionName,omitempty"`
+
+	// MaximumEventAgeInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventinvokeconfig.html#cfn-lambda-eventinvokeconfig-maximumeventageinseconds
+	MaximumEventAgeInSeconds *types.Value `json:"MaximumEventAgeInSeconds,omitempty"`
+
+	// MaximumRetryAttempts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventinvokeconfig.html#cfn-lambda-eventinvokeconfig-maximumretryattempts
+	MaximumRetryAttempts *types.Value `json:"MaximumRetryAttempts,omitempty"`
+
+	// Qualifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventinvokeconfig.html#cfn-lambda-eventinvokeconfig-qualifier
+	Qualifier *types.Value `json:"Qualifier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EventInvokeConfig) AWSCloudFormationType() string {
+	return "AWS::Lambda::EventInvokeConfig"
+}
+
+// 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 EventInvokeConfig) MarshalJSON() ([]byte, error) {
+	type Properties EventInvokeConfig
+	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 *EventInvokeConfig) UnmarshalJSON(b []byte) error {
+	type Properties EventInvokeConfig
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = EventInvokeConfig(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_destinationconfig.go b/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_destinationconfig.go
new file mode 100644
index 0000000000..b90d8e52f6
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_destinationconfig.go
@@ -0,0 +1,40 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventInvokeConfig_DestinationConfig AWS CloudFormation Resource (AWS::Lambda::EventInvokeConfig.DestinationConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventinvokeconfig-destinationconfig.html
+type EventInvokeConfig_DestinationConfig struct {
+
+	// OnFailure AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventinvokeconfig-destinationconfig.html#cfn-lambda-eventinvokeconfig-destinationconfig-onfailure
+	OnFailure *EventInvokeConfig_OnFailure `json:"OnFailure,omitempty"`
+
+	// OnSuccess AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventinvokeconfig-destinationconfig.html#cfn-lambda-eventinvokeconfig-destinationconfig-onsuccess
+	OnSuccess *EventInvokeConfig_OnSuccess `json:"OnSuccess,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EventInvokeConfig_DestinationConfig) AWSCloudFormationType() string {
+	return "AWS::Lambda::EventInvokeConfig.DestinationConfig"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_onfailure.go b/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_onfailure.go
new file mode 100644
index 0000000000..83f0d92a56
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_onfailure.go
@@ -0,0 +1,37 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventInvokeConfig_OnFailure AWS CloudFormation Resource (AWS::Lambda::EventInvokeConfig.OnFailure)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventinvokeconfig-destinationconfig-onfailure.html
+type EventInvokeConfig_OnFailure struct {
+
+	// Destination AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventinvokeconfig-destinationconfig-onfailure.html#cfn-lambda-eventinvokeconfig-destinationconfig-onfailure-destination
+	Destination *types.Value `json:"Destination,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EventInvokeConfig_OnFailure) AWSCloudFormationType() string {
+	return "AWS::Lambda::EventInvokeConfig.OnFailure"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_onsuccess.go b/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_onsuccess.go
new file mode 100644
index 0000000000..be37eadb0f
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-eventinvokeconfig_onsuccess.go
@@ -0,0 +1,37 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventInvokeConfig_OnSuccess AWS CloudFormation Resource (AWS::Lambda::EventInvokeConfig.OnSuccess)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventinvokeconfig-destinationconfig-onsuccess.html
+type EventInvokeConfig_OnSuccess struct {
+
+	// Destination AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventinvokeconfig-destinationconfig-onsuccess.html#cfn-lambda-eventinvokeconfig-destinationconfig-onsuccess-destination
+	Destination *types.Value `json:"Destination,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EventInvokeConfig_OnSuccess) AWSCloudFormationType() string {
+	return "AWS::Lambda::EventInvokeConfig.OnSuccess"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping.go b/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping.go
new file mode 100644
index 0000000000..6b46dddb70
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping.go
@@ -0,0 +1,198 @@
+package lambda
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventSourceMapping AWS CloudFormation Resource (AWS::Lambda::EventSourceMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html
+type EventSourceMapping struct {
+
+	// BatchSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-batchsize
+	BatchSize *types.Value `json:"BatchSize,omitempty"`
+
+	// BisectBatchOnFunctionError AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-bisectbatchonfunctionerror
+	BisectBatchOnFunctionError *types.Value `json:"BisectBatchOnFunctionError,omitempty"`
+
+	// DestinationConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-destinationconfig
+	DestinationConfig *EventSourceMapping_DestinationConfig `json:"DestinationConfig,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// EventSourceArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-eventsourcearn
+	EventSourceArn *types.Value `json:"EventSourceArn,omitempty"`
+
+	// FilterCriteria AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-filtercriteria
+	FilterCriteria interface{} `json:"FilterCriteria,omitempty"`
+
+	// FunctionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-functionname
+	FunctionName *types.Value `json:"FunctionName,omitempty"`
+
+	// FunctionResponseTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-functionresponsetypes
+	FunctionResponseTypes *types.Value `json:"FunctionResponseTypes,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
+	MaximumBatchingWindowInSeconds *types.Value `json:"MaximumBatchingWindowInSeconds,omitempty"`
+
+	// MaximumRecordAgeInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-maximumrecordageinseconds
+	MaximumRecordAgeInSeconds *types.Value `json:"MaximumRecordAgeInSeconds,omitempty"`
+
+	// MaximumRetryAttempts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-maximumretryattempts
+	MaximumRetryAttempts *types.Value `json:"MaximumRetryAttempts,omitempty"`
+
+	// ParallelizationFactor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-parallelizationfactor
+	ParallelizationFactor *types.Value `json:"ParallelizationFactor,omitempty"`
+
+	// Queues AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-queues
+	Queues *types.Value `json:"Queues,omitempty"`
+
+	// SelfManagedEventSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-selfmanagedeventsource
+	SelfManagedEventSource *EventSourceMapping_SelfManagedEventSource `json:"SelfManagedEventSource,omitempty"`
+
+	// SourceAccessConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-sourceaccessconfigurations
+	SourceAccessConfigurations []EventSourceMapping_SourceAccessConfiguration `json:"SourceAccessConfigurations,omitempty"`
+
+	// StartingPosition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-startingposition
+	StartingPosition *types.Value `json:"StartingPosition,omitempty"`
+
+	// StartingPositionTimestamp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-startingpositiontimestamp
+	StartingPositionTimestamp *types.Value `json:"StartingPositionTimestamp,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
+	Topics *types.Value `json:"Topics,omitempty"`
+
+	// TumblingWindowInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-eventsourcemapping.html#cfn-lambda-eventsourcemapping-tumblingwindowinseconds
+	TumblingWindowInSeconds *types.Value `json:"TumblingWindowInSeconds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EventSourceMapping) AWSCloudFormationType() string {
+	return "AWS::Lambda::EventSourceMapping"
+}
+
+// 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 EventSourceMapping) MarshalJSON() ([]byte, error) {
+	type Properties EventSourceMapping
+	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 *EventSourceMapping) UnmarshalJSON(b []byte) error {
+	type Properties EventSourceMapping
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = EventSourceMapping(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_destinationconfig.go b/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_destinationconfig.go
new file mode 100644
index 0000000000..7f239ff334
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_destinationconfig.go
@@ -0,0 +1,35 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventSourceMapping_DestinationConfig AWS CloudFormation Resource (AWS::Lambda::EventSourceMapping.DestinationConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-destinationconfig.html
+type EventSourceMapping_DestinationConfig struct {
+
+	// OnFailure AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-destinationconfig.html#cfn-lambda-eventsourcemapping-destinationconfig-onfailure
+	OnFailure *EventSourceMapping_OnFailure `json:"OnFailure,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EventSourceMapping_DestinationConfig) AWSCloudFormationType() string {
+	return "AWS::Lambda::EventSourceMapping.DestinationConfig"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_endpoints.go b/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_endpoints.go
new file mode 100644
index 0000000000..457c1c108c
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_endpoints.go
@@ -0,0 +1,37 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventSourceMapping_Endpoints AWS CloudFormation Resource (AWS::Lambda::EventSourceMapping.Endpoints)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-endpoints.html
+type EventSourceMapping_Endpoints struct {
+
+	// KafkaBootstrapServers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-endpoints.html#cfn-lambda-eventsourcemapping-endpoints-kafkabootstrapservers
+	KafkaBootstrapServers *types.Value `json:"KafkaBootstrapServers,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EventSourceMapping_Endpoints) AWSCloudFormationType() string {
+	return "AWS::Lambda::EventSourceMapping.Endpoints"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_onfailure.go b/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_onfailure.go
new file mode 100644
index 0000000000..e3d55ad531
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_onfailure.go
@@ -0,0 +1,37 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventSourceMapping_OnFailure AWS CloudFormation Resource (AWS::Lambda::EventSourceMapping.OnFailure)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-onfailure.html
+type EventSourceMapping_OnFailure struct {
+
+	// Destination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-onfailure.html#cfn-lambda-eventsourcemapping-onfailure-destination
+	Destination *types.Value `json:"Destination,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EventSourceMapping_OnFailure) AWSCloudFormationType() string {
+	return "AWS::Lambda::EventSourceMapping.OnFailure"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_selfmanagedeventsource.go b/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_selfmanagedeventsource.go
new file mode 100644
index 0000000000..06749e4bae
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_selfmanagedeventsource.go
@@ -0,0 +1,35 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventSourceMapping_SelfManagedEventSource AWS CloudFormation Resource (AWS::Lambda::EventSourceMapping.SelfManagedEventSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-selfmanagedeventsource.html
+type EventSourceMapping_SelfManagedEventSource struct {
+
+	// Endpoints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-selfmanagedeventsource.html#cfn-lambda-eventsourcemapping-selfmanagedeventsource-endpoints
+	Endpoints *EventSourceMapping_Endpoints `json:"Endpoints,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EventSourceMapping_SelfManagedEventSource) AWSCloudFormationType() string {
+	return "AWS::Lambda::EventSourceMapping.SelfManagedEventSource"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_sourceaccessconfiguration.go b/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_sourceaccessconfiguration.go
new file mode 100644
index 0000000000..b3f96729f3
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-eventsourcemapping_sourceaccessconfiguration.go
@@ -0,0 +1,42 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventSourceMapping_SourceAccessConfiguration AWS CloudFormation Resource (AWS::Lambda::EventSourceMapping.SourceAccessConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-sourceaccessconfiguration.html
+type EventSourceMapping_SourceAccessConfiguration struct {
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-sourceaccessconfiguration.html#cfn-lambda-eventsourcemapping-sourceaccessconfiguration-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// URI AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-eventsourcemapping-sourceaccessconfiguration.html#cfn-lambda-eventsourcemapping-sourceaccessconfiguration-uri
+	URI *types.Value `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 *EventSourceMapping_SourceAccessConfiguration) AWSCloudFormationType() string {
+	return "AWS::Lambda::EventSourceMapping.SourceAccessConfiguration"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-function.go b/goformation/cloudformation/lambda/aws-lambda-function.go
new file mode 100644
index 0000000000..bb7b1fe86f
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-function.go
@@ -0,0 +1,209 @@
+package lambda
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function AWS CloudFormation Resource (AWS::Lambda::Function)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html
+type Function struct {
+
+	// Architectures AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-architectures
+	Architectures *types.Value `json:"Architectures,omitempty"`
+
+	// Code AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-code
+	Code *Function_Code `json:"Code,omitempty"`
+
+	// CodeSigningConfigArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-codesigningconfigarn
+	CodeSigningConfigArn *types.Value `json:"CodeSigningConfigArn,omitempty"`
+
+	// DeadLetterConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-deadletterconfig
+	DeadLetterConfig *Function_DeadLetterConfig `json:"DeadLetterConfig,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Environment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-environment
+	Environment *Function_Environment `json:"Environment,omitempty"`
+
+	// FileSystemConfigs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-filesystemconfigs
+	FileSystemConfigs []Function_FileSystemConfig `json:"FileSystemConfigs,omitempty"`
+
+	// FunctionName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-functionname
+	FunctionName *types.Value `json:"FunctionName,omitempty"`
+
+	// Handler AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-handler
+	Handler *types.Value `json:"Handler,omitempty"`
+
+	// ImageConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-imageconfig
+	ImageConfig *Function_ImageConfig `json:"ImageConfig,omitempty"`
+
+	// KmsKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-kmskeyarn
+	KmsKeyArn *types.Value `json:"KmsKeyArn,omitempty"`
+
+	// Layers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-layers
+	Layers *types.Value `json:"Layers,omitempty"`
+
+	// MemorySize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-memorysize
+	MemorySize *types.Value `json:"MemorySize,omitempty"`
+
+	// PackageType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-packagetype
+	PackageType *types.Value `json:"PackageType,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
+	ReservedConcurrentExecutions *types.Value `json:"ReservedConcurrentExecutions,omitempty"`
+
+	// Role AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-role
+	Role *types.Value `json:"Role,omitempty"`
+
+	// Runtime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-runtime
+	Runtime *types.Value `json:"Runtime,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Timeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-timeout
+	Timeout *types.Value `json:"Timeout,omitempty"`
+
+	// TracingConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-tracingconfig
+	TracingConfig *Function_TracingConfig `json:"TracingConfig,omitempty"`
+
+	// VpcConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-function.html#cfn-lambda-function-vpcconfig
+	VpcConfig *Function_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 *Function) AWSCloudFormationType() string {
+	return "AWS::Lambda::Function"
+}
+
+// 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 Function) MarshalJSON() ([]byte, error) {
+	type Properties Function
+	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 *Function) UnmarshalJSON(b []byte) error {
+	type Properties Function
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Function(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/lambda/aws-lambda-function_code.go b/goformation/cloudformation/lambda/aws-lambda-function_code.go
new file mode 100644
index 0000000000..f4b049bee6
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-function_code.go
@@ -0,0 +1,57 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_Code AWS CloudFormation Resource (AWS::Lambda::Function.Code)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-code.html
+type Function_Code struct {
+
+	// ImageUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-code.html#cfn-lambda-function-code-imageuri
+	ImageUri *types.Value `json:"ImageUri,omitempty"`
+
+	// S3Bucket AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-code.html#cfn-lambda-function-code-s3bucket
+	S3Bucket *types.Value `json:"S3Bucket,omitempty"`
+
+	// S3Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-code.html#cfn-lambda-function-code-s3key
+	S3Key *types.Value `json:"S3Key,omitempty"`
+
+	// S3ObjectVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-code.html#cfn-lambda-function-code-s3objectversion
+	S3ObjectVersion *types.Value `json:"S3ObjectVersion,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
+	ZipFile *types.Value `json:"ZipFile,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_Code) AWSCloudFormationType() string {
+	return "AWS::Lambda::Function.Code"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-function_deadletterconfig.go b/goformation/cloudformation/lambda/aws-lambda-function_deadletterconfig.go
new file mode 100644
index 0000000000..2e15a5d3ec
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-function_deadletterconfig.go
@@ -0,0 +1,37 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_DeadLetterConfig AWS CloudFormation Resource (AWS::Lambda::Function.DeadLetterConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-deadletterconfig.html
+type Function_DeadLetterConfig struct {
+
+	// TargetArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-deadletterconfig.html#cfn-lambda-function-deadletterconfig-targetarn
+	TargetArn *types.Value `json:"TargetArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_DeadLetterConfig) AWSCloudFormationType() string {
+	return "AWS::Lambda::Function.DeadLetterConfig"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-function_environment.go b/goformation/cloudformation/lambda/aws-lambda-function_environment.go
new file mode 100644
index 0000000000..c843b6c471
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-function_environment.go
@@ -0,0 +1,37 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_Environment AWS CloudFormation Resource (AWS::Lambda::Function.Environment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-environment.html
+type Function_Environment struct {
+
+	// Variables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-environment.html#cfn-lambda-function-environment-variables
+	Variables map[string]*types.Value `json:"Variables,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_Environment) AWSCloudFormationType() string {
+	return "AWS::Lambda::Function.Environment"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-function_filesystemconfig.go b/goformation/cloudformation/lambda/aws-lambda-function_filesystemconfig.go
new file mode 100644
index 0000000000..a2c07e631f
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-function_filesystemconfig.go
@@ -0,0 +1,42 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_FileSystemConfig AWS CloudFormation Resource (AWS::Lambda::Function.FileSystemConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-filesystemconfig.html
+type Function_FileSystemConfig struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-filesystemconfig.html#cfn-lambda-function-filesystemconfig-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// LocalMountPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-filesystemconfig.html#cfn-lambda-function-filesystemconfig-localmountpath
+	LocalMountPath *types.Value `json:"LocalMountPath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_FileSystemConfig) AWSCloudFormationType() string {
+	return "AWS::Lambda::Function.FileSystemConfig"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-function_imageconfig.go b/goformation/cloudformation/lambda/aws-lambda-function_imageconfig.go
new file mode 100644
index 0000000000..cbd30a0778
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-function_imageconfig.go
@@ -0,0 +1,47 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_ImageConfig AWS CloudFormation Resource (AWS::Lambda::Function.ImageConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-imageconfig.html
+type Function_ImageConfig struct {
+
+	// Command AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-imageconfig.html#cfn-lambda-function-imageconfig-command
+	Command *types.Value `json:"Command,omitempty"`
+
+	// EntryPoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-imageconfig.html#cfn-lambda-function-imageconfig-entrypoint
+	EntryPoint *types.Value `json:"EntryPoint,omitempty"`
+
+	// WorkingDirectory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-imageconfig.html#cfn-lambda-function-imageconfig-workingdirectory
+	WorkingDirectory *types.Value `json:"WorkingDirectory,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_ImageConfig) AWSCloudFormationType() string {
+	return "AWS::Lambda::Function.ImageConfig"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-function_tracingconfig.go b/goformation/cloudformation/lambda/aws-lambda-function_tracingconfig.go
new file mode 100644
index 0000000000..80f673e29c
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-function_tracingconfig.go
@@ -0,0 +1,37 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_TracingConfig AWS CloudFormation Resource (AWS::Lambda::Function.TracingConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-tracingconfig.html
+type Function_TracingConfig struct {
+
+	// Mode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-tracingconfig.html#cfn-lambda-function-tracingconfig-mode
+	Mode *types.Value `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 *Function_TracingConfig) AWSCloudFormationType() string {
+	return "AWS::Lambda::Function.TracingConfig"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-function_vpcconfig.go b/goformation/cloudformation/lambda/aws-lambda-function_vpcconfig.go
new file mode 100644
index 0000000000..f6b8748951
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-function_vpcconfig.go
@@ -0,0 +1,42 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_VpcConfig AWS CloudFormation Resource (AWS::Lambda::Function.VpcConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-vpcconfig.html
+type Function_VpcConfig struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-vpcconfig.html#cfn-lambda-function-vpcconfig-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-vpcconfig.html#cfn-lambda-function-vpcconfig-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_VpcConfig) AWSCloudFormationType() string {
+	return "AWS::Lambda::Function.VpcConfig"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-layerversion.go b/goformation/cloudformation/lambda/aws-lambda-layerversion.go
new file mode 100644
index 0000000000..2853a850aa
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-layerversion.go
@@ -0,0 +1,133 @@
+package lambda
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LayerVersion AWS CloudFormation Resource (AWS::Lambda::LayerVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-layerversion.html
+type LayerVersion struct {
+
+	// CompatibleArchitectures AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-layerversion.html#cfn-lambda-layerversion-compatiblearchitectures
+	CompatibleArchitectures *types.Value `json:"CompatibleArchitectures,omitempty"`
+
+	// CompatibleRuntimes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-layerversion.html#cfn-lambda-layerversion-compatibleruntimes
+	CompatibleRuntimes *types.Value `json:"CompatibleRuntimes,omitempty"`
+
+	// Content AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-layerversion.html#cfn-lambda-layerversion-content
+	Content *LayerVersion_Content `json:"Content,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-layerversion.html#cfn-lambda-layerversion-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// LayerName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-layerversion.html#cfn-lambda-layerversion-layername
+	LayerName *types.Value `json:"LayerName,omitempty"`
+
+	// LicenseInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-layerversion.html#cfn-lambda-layerversion-licenseinfo
+	LicenseInfo *types.Value `json:"LicenseInfo,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LayerVersion) AWSCloudFormationType() string {
+	return "AWS::Lambda::LayerVersion"
+}
+
+// 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 LayerVersion) MarshalJSON() ([]byte, error) {
+	type Properties LayerVersion
+	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 *LayerVersion) UnmarshalJSON(b []byte) error {
+	type Properties LayerVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LayerVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/lambda/aws-lambda-layerversion_content.go b/goformation/cloudformation/lambda/aws-lambda-layerversion_content.go
new file mode 100644
index 0000000000..0c80c988a3
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-layerversion_content.go
@@ -0,0 +1,47 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LayerVersion_Content AWS CloudFormation Resource (AWS::Lambda::LayerVersion.Content)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-layerversion-content.html
+type LayerVersion_Content struct {
+
+	// S3Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-layerversion-content.html#cfn-lambda-layerversion-content-s3bucket
+	S3Bucket *types.Value `json:"S3Bucket,omitempty"`
+
+	// S3Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-layerversion-content.html#cfn-lambda-layerversion-content-s3key
+	S3Key *types.Value `json:"S3Key,omitempty"`
+
+	// S3ObjectVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-layerversion-content.html#cfn-lambda-layerversion-content-s3objectversion
+	S3ObjectVersion *types.Value `json:"S3ObjectVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LayerVersion_Content) AWSCloudFormationType() string {
+	return "AWS::Lambda::LayerVersion.Content"
+}
diff --git a/goformation/cloudformation/lambda/aws-lambda-layerversionpermission.go b/goformation/cloudformation/lambda/aws-lambda-layerversionpermission.go
new file mode 100644
index 0000000000..3eee3a02f5
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-layerversionpermission.go
@@ -0,0 +1,123 @@
+package lambda
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LayerVersionPermission AWS CloudFormation Resource (AWS::Lambda::LayerVersionPermission)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-layerversionpermission.html
+type LayerVersionPermission struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-layerversionpermission.html#cfn-lambda-layerversionpermission-action
+	Action *types.Value `json:"Action,omitempty"`
+
+	// LayerVersionArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-layerversionpermission.html#cfn-lambda-layerversionpermission-layerversionarn
+	LayerVersionArn *types.Value `json:"LayerVersionArn,omitempty"`
+
+	// OrganizationId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-layerversionpermission.html#cfn-lambda-layerversionpermission-organizationid
+	OrganizationId *types.Value `json:"OrganizationId,omitempty"`
+
+	// Principal AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-layerversionpermission.html#cfn-lambda-layerversionpermission-principal
+	Principal *types.Value `json:"Principal,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LayerVersionPermission) AWSCloudFormationType() string {
+	return "AWS::Lambda::LayerVersionPermission"
+}
+
+// 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 LayerVersionPermission) MarshalJSON() ([]byte, error) {
+	type Properties LayerVersionPermission
+	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 *LayerVersionPermission) UnmarshalJSON(b []byte) error {
+	type Properties LayerVersionPermission
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LayerVersionPermission(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/lambda/aws-lambda-permission.go b/goformation/cloudformation/lambda/aws-lambda-permission.go
new file mode 100644
index 0000000000..8a09e367d4
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-permission.go
@@ -0,0 +1,133 @@
+package lambda
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Permission AWS CloudFormation Resource (AWS::Lambda::Permission)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-permission.html
+type Permission struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-permission.html#cfn-lambda-permission-action
+	Action *types.Value `json:"Action,omitempty"`
+
+	// EventSourceToken AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-permission.html#cfn-lambda-permission-eventsourcetoken
+	EventSourceToken *types.Value `json:"EventSourceToken,omitempty"`
+
+	// FunctionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-permission.html#cfn-lambda-permission-functionname
+	FunctionName *types.Value `json:"FunctionName,omitempty"`
+
+	// Principal AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-permission.html#cfn-lambda-permission-principal
+	Principal *types.Value `json:"Principal,omitempty"`
+
+	// SourceAccount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-permission.html#cfn-lambda-permission-sourceaccount
+	SourceAccount *types.Value `json:"SourceAccount,omitempty"`
+
+	// SourceArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-permission.html#cfn-lambda-permission-sourcearn
+	SourceArn *types.Value `json:"SourceArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Permission) AWSCloudFormationType() string {
+	return "AWS::Lambda::Permission"
+}
+
+// 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 Permission) MarshalJSON() ([]byte, error) {
+	type Properties Permission
+	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 *Permission) UnmarshalJSON(b []byte) error {
+	type Properties Permission
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Permission(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/lambda/aws-lambda-version.go b/goformation/cloudformation/lambda/aws-lambda-version.go
new file mode 100644
index 0000000000..a80f2807cf
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-version.go
@@ -0,0 +1,123 @@
+package lambda
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Version AWS CloudFormation Resource (AWS::Lambda::Version)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-version.html
+type Version struct {
+
+	// CodeSha256 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-version.html#cfn-lambda-version-codesha256
+	CodeSha256 *types.Value `json:"CodeSha256,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-version.html#cfn-lambda-version-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// FunctionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lambda-version.html#cfn-lambda-version-functionname
+	FunctionName *types.Value `json:"FunctionName,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
+	ProvisionedConcurrencyConfig *Version_ProvisionedConcurrencyConfiguration `json:"ProvisionedConcurrencyConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Version) AWSCloudFormationType() string {
+	return "AWS::Lambda::Version"
+}
+
+// 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 Version) MarshalJSON() ([]byte, error) {
+	type Properties Version
+	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 *Version) UnmarshalJSON(b []byte) error {
+	type Properties Version
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Version(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/lambda/aws-lambda-version_provisionedconcurrencyconfiguration.go b/goformation/cloudformation/lambda/aws-lambda-version_provisionedconcurrencyconfiguration.go
new file mode 100644
index 0000000000..ae318c6f26
--- /dev/null
+++ b/goformation/cloudformation/lambda/aws-lambda-version_provisionedconcurrencyconfiguration.go
@@ -0,0 +1,37 @@
+package lambda
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Version_ProvisionedConcurrencyConfiguration AWS CloudFormation Resource (AWS::Lambda::Version.ProvisionedConcurrencyConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-version-provisionedconcurrencyconfiguration.html
+type Version_ProvisionedConcurrencyConfiguration struct {
+
+	// ProvisionedConcurrentExecutions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-version-provisionedconcurrencyconfiguration.html#cfn-lambda-version-provisionedconcurrencyconfiguration-provisionedconcurrentexecutions
+	ProvisionedConcurrentExecutions *types.Value `json:"ProvisionedConcurrentExecutions"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Version_ProvisionedConcurrencyConfiguration) AWSCloudFormationType() string {
+	return "AWS::Lambda::Version.ProvisionedConcurrencyConfiguration"
+}
diff --git a/goformation/cloudformation/licensemanager/aws-licensemanager-grant.go b/goformation/cloudformation/licensemanager/aws-licensemanager-grant.go
new file mode 100644
index 0000000000..0b199125ae
--- /dev/null
+++ b/goformation/cloudformation/licensemanager/aws-licensemanager-grant.go
@@ -0,0 +1,133 @@
+package licensemanager
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Grant AWS CloudFormation Resource (AWS::LicenseManager::Grant)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-grant.html
+type Grant struct {
+
+	// AllowedOperations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-grant.html#cfn-licensemanager-grant-allowedoperations
+	AllowedOperations *types.Value `json:"AllowedOperations,omitempty"`
+
+	// GrantName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-grant.html#cfn-licensemanager-grant-grantname
+	GrantName *types.Value `json:"GrantName,omitempty"`
+
+	// HomeRegion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-grant.html#cfn-licensemanager-grant-homeregion
+	HomeRegion *types.Value `json:"HomeRegion,omitempty"`
+
+	// LicenseArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-grant.html#cfn-licensemanager-grant-licensearn
+	LicenseArn *types.Value `json:"LicenseArn,omitempty"`
+
+	// Principals AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-grant.html#cfn-licensemanager-grant-principals
+	Principals *types.Value `json:"Principals,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-grant.html#cfn-licensemanager-grant-status
+	Status *types.Value `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 *Grant) AWSCloudFormationType() string {
+	return "AWS::LicenseManager::Grant"
+}
+
+// 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 Grant) MarshalJSON() ([]byte, error) {
+	type Properties Grant
+	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 *Grant) UnmarshalJSON(b []byte) error {
+	type Properties Grant
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Grant(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/licensemanager/aws-licensemanager-license.go b/goformation/cloudformation/licensemanager/aws-licensemanager-license.go
new file mode 100644
index 0000000000..7769b31e79
--- /dev/null
+++ b/goformation/cloudformation/licensemanager/aws-licensemanager-license.go
@@ -0,0 +1,158 @@
+package licensemanager
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// License AWS CloudFormation Resource (AWS::LicenseManager::License)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-license.html
+type License struct {
+
+	// Beneficiary AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-license.html#cfn-licensemanager-license-beneficiary
+	Beneficiary *types.Value `json:"Beneficiary,omitempty"`
+
+	// ConsumptionConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-license.html#cfn-licensemanager-license-consumptionconfiguration
+	ConsumptionConfiguration *License_ConsumptionConfiguration `json:"ConsumptionConfiguration,omitempty"`
+
+	// Entitlements AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-license.html#cfn-licensemanager-license-entitlements
+	Entitlements []License_Entitlement `json:"Entitlements,omitempty"`
+
+	// HomeRegion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-license.html#cfn-licensemanager-license-homeregion
+	HomeRegion *types.Value `json:"HomeRegion,omitempty"`
+
+	// Issuer AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-license.html#cfn-licensemanager-license-issuer
+	Issuer *License_IssuerData `json:"Issuer,omitempty"`
+
+	// LicenseMetadata AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-license.html#cfn-licensemanager-license-licensemetadata
+	LicenseMetadata []License_Metadata `json:"LicenseMetadata,omitempty"`
+
+	// LicenseName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-license.html#cfn-licensemanager-license-licensename
+	LicenseName *types.Value `json:"LicenseName,omitempty"`
+
+	// ProductName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-license.html#cfn-licensemanager-license-productname
+	ProductName *types.Value `json:"ProductName,omitempty"`
+
+	// ProductSKU AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-license.html#cfn-licensemanager-license-productsku
+	ProductSKU *types.Value `json:"ProductSKU,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-license.html#cfn-licensemanager-license-status
+	Status *types.Value `json:"Status,omitempty"`
+
+	// Validity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-licensemanager-license.html#cfn-licensemanager-license-validity
+	Validity *License_ValidityDateFormat `json:"Validity,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *License) AWSCloudFormationType() string {
+	return "AWS::LicenseManager::License"
+}
+
+// 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 License) MarshalJSON() ([]byte, error) {
+	type Properties License
+	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 *License) UnmarshalJSON(b []byte) error {
+	type Properties License
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = License(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/licensemanager/aws-licensemanager-license_borrowconfiguration.go b/goformation/cloudformation/licensemanager/aws-licensemanager-license_borrowconfiguration.go
new file mode 100644
index 0000000000..27ea4ba088
--- /dev/null
+++ b/goformation/cloudformation/licensemanager/aws-licensemanager-license_borrowconfiguration.go
@@ -0,0 +1,42 @@
+package licensemanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// License_BorrowConfiguration AWS CloudFormation Resource (AWS::LicenseManager::License.BorrowConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-borrowconfiguration.html
+type License_BorrowConfiguration struct {
+
+	// AllowEarlyCheckIn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-borrowconfiguration.html#cfn-licensemanager-license-borrowconfiguration-allowearlycheckin
+	AllowEarlyCheckIn *types.Value `json:"AllowEarlyCheckIn"`
+
+	// MaxTimeToLiveInMinutes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-borrowconfiguration.html#cfn-licensemanager-license-borrowconfiguration-maxtimetoliveinminutes
+	MaxTimeToLiveInMinutes *types.Value `json:"MaxTimeToLiveInMinutes"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *License_BorrowConfiguration) AWSCloudFormationType() string {
+	return "AWS::LicenseManager::License.BorrowConfiguration"
+}
diff --git a/goformation/cloudformation/licensemanager/aws-licensemanager-license_consumptionconfiguration.go b/goformation/cloudformation/licensemanager/aws-licensemanager-license_consumptionconfiguration.go
new file mode 100644
index 0000000000..28e2657f63
--- /dev/null
+++ b/goformation/cloudformation/licensemanager/aws-licensemanager-license_consumptionconfiguration.go
@@ -0,0 +1,47 @@
+package licensemanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// License_ConsumptionConfiguration AWS CloudFormation Resource (AWS::LicenseManager::License.ConsumptionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-consumptionconfiguration.html
+type License_ConsumptionConfiguration struct {
+
+	// BorrowConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-consumptionconfiguration.html#cfn-licensemanager-license-consumptionconfiguration-borrowconfiguration
+	BorrowConfiguration *License_BorrowConfiguration `json:"BorrowConfiguration,omitempty"`
+
+	// ProvisionalConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-consumptionconfiguration.html#cfn-licensemanager-license-consumptionconfiguration-provisionalconfiguration
+	ProvisionalConfiguration *License_ProvisionalConfiguration `json:"ProvisionalConfiguration,omitempty"`
+
+	// RenewType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-consumptionconfiguration.html#cfn-licensemanager-license-consumptionconfiguration-renewtype
+	RenewType *types.Value `json:"RenewType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *License_ConsumptionConfiguration) AWSCloudFormationType() string {
+	return "AWS::LicenseManager::License.ConsumptionConfiguration"
+}
diff --git a/goformation/cloudformation/licensemanager/aws-licensemanager-license_entitlement.go b/goformation/cloudformation/licensemanager/aws-licensemanager-license_entitlement.go
new file mode 100644
index 0000000000..4819523043
--- /dev/null
+++ b/goformation/cloudformation/licensemanager/aws-licensemanager-license_entitlement.go
@@ -0,0 +1,62 @@
+package licensemanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// License_Entitlement AWS CloudFormation Resource (AWS::LicenseManager::License.Entitlement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-entitlement.html
+type License_Entitlement struct {
+
+	// AllowCheckIn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-entitlement.html#cfn-licensemanager-license-entitlement-allowcheckin
+	AllowCheckIn *types.Value `json:"AllowCheckIn,omitempty"`
+
+	// MaxCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-entitlement.html#cfn-licensemanager-license-entitlement-maxcount
+	MaxCount *types.Value `json:"MaxCount,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-entitlement.html#cfn-licensemanager-license-entitlement-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Overage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-entitlement.html#cfn-licensemanager-license-entitlement-overage
+	Overage *types.Value `json:"Overage,omitempty"`
+
+	// Unit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-entitlement.html#cfn-licensemanager-license-entitlement-unit
+	Unit *types.Value `json:"Unit,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-entitlement.html#cfn-licensemanager-license-entitlement-value
+	Value *types.Value `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 *License_Entitlement) AWSCloudFormationType() string {
+	return "AWS::LicenseManager::License.Entitlement"
+}
diff --git a/goformation/cloudformation/licensemanager/aws-licensemanager-license_issuerdata.go b/goformation/cloudformation/licensemanager/aws-licensemanager-license_issuerdata.go
new file mode 100644
index 0000000000..e7ebeb886a
--- /dev/null
+++ b/goformation/cloudformation/licensemanager/aws-licensemanager-license_issuerdata.go
@@ -0,0 +1,42 @@
+package licensemanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// License_IssuerData AWS CloudFormation Resource (AWS::LicenseManager::License.IssuerData)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-issuerdata.html
+type License_IssuerData struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-issuerdata.html#cfn-licensemanager-license-issuerdata-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SignKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-issuerdata.html#cfn-licensemanager-license-issuerdata-signkey
+	SignKey *types.Value `json:"SignKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *License_IssuerData) AWSCloudFormationType() string {
+	return "AWS::LicenseManager::License.IssuerData"
+}
diff --git a/goformation/cloudformation/licensemanager/aws-licensemanager-license_metadata.go b/goformation/cloudformation/licensemanager/aws-licensemanager-license_metadata.go
new file mode 100644
index 0000000000..f881122a51
--- /dev/null
+++ b/goformation/cloudformation/licensemanager/aws-licensemanager-license_metadata.go
@@ -0,0 +1,42 @@
+package licensemanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// License_Metadata AWS CloudFormation Resource (AWS::LicenseManager::License.Metadata)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-metadata.html
+type License_Metadata struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-metadata.html#cfn-licensemanager-license-metadata-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-metadata.html#cfn-licensemanager-license-metadata-value
+	Value *types.Value `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 *License_Metadata) AWSCloudFormationType() string {
+	return "AWS::LicenseManager::License.Metadata"
+}
diff --git a/goformation/cloudformation/licensemanager/aws-licensemanager-license_provisionalconfiguration.go b/goformation/cloudformation/licensemanager/aws-licensemanager-license_provisionalconfiguration.go
new file mode 100644
index 0000000000..f301554356
--- /dev/null
+++ b/goformation/cloudformation/licensemanager/aws-licensemanager-license_provisionalconfiguration.go
@@ -0,0 +1,37 @@
+package licensemanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// License_ProvisionalConfiguration AWS CloudFormation Resource (AWS::LicenseManager::License.ProvisionalConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-provisionalconfiguration.html
+type License_ProvisionalConfiguration struct {
+
+	// MaxTimeToLiveInMinutes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-provisionalconfiguration.html#cfn-licensemanager-license-provisionalconfiguration-maxtimetoliveinminutes
+	MaxTimeToLiveInMinutes *types.Value `json:"MaxTimeToLiveInMinutes"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *License_ProvisionalConfiguration) AWSCloudFormationType() string {
+	return "AWS::LicenseManager::License.ProvisionalConfiguration"
+}
diff --git a/goformation/cloudformation/licensemanager/aws-licensemanager-license_validitydateformat.go b/goformation/cloudformation/licensemanager/aws-licensemanager-license_validitydateformat.go
new file mode 100644
index 0000000000..23fabf9888
--- /dev/null
+++ b/goformation/cloudformation/licensemanager/aws-licensemanager-license_validitydateformat.go
@@ -0,0 +1,42 @@
+package licensemanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// License_ValidityDateFormat AWS CloudFormation Resource (AWS::LicenseManager::License.ValidityDateFormat)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-validitydateformat.html
+type License_ValidityDateFormat struct {
+
+	// Begin AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-validitydateformat.html#cfn-licensemanager-license-validitydateformat-begin
+	Begin *types.Value `json:"Begin,omitempty"`
+
+	// End AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-licensemanager-license-validitydateformat.html#cfn-licensemanager-license-validitydateformat-end
+	End *types.Value `json:"End,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *License_ValidityDateFormat) AWSCloudFormationType() string {
+	return "AWS::LicenseManager::License.ValidityDateFormat"
+}
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-database.go b/goformation/cloudformation/lightsail/aws-lightsail-database.go
new file mode 100644
index 0000000000..1679577c5c
--- /dev/null
+++ b/goformation/cloudformation/lightsail/aws-lightsail-database.go
@@ -0,0 +1,179 @@
+package lightsail
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Database AWS CloudFormation Resource (AWS::Lightsail::Database)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-database.html
+type Database struct {
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-database.html#cfn-lightsail-database-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// BackupRetention AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-database.html#cfn-lightsail-database-backupretention
+	BackupRetention *types.Value `json:"BackupRetention,omitempty"`
+
+	// CaCertificateIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-database.html#cfn-lightsail-database-cacertificateidentifier
+	CaCertificateIdentifier *types.Value `json:"CaCertificateIdentifier,omitempty"`
+
+	// MasterDatabaseName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-database.html#cfn-lightsail-database-masterdatabasename
+	MasterDatabaseName *types.Value `json:"MasterDatabaseName,omitempty"`
+
+	// MasterUserPassword AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-database.html#cfn-lightsail-database-masteruserpassword
+	MasterUserPassword *types.Value `json:"MasterUserPassword,omitempty"`
+
+	// MasterUsername AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-database.html#cfn-lightsail-database-masterusername
+	MasterUsername *types.Value `json:"MasterUsername,omitempty"`
+
+	// PreferredBackupWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-database.html#cfn-lightsail-database-preferredbackupwindow
+	PreferredBackupWindow *types.Value `json:"PreferredBackupWindow,omitempty"`
+
+	// PreferredMaintenanceWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-database.html#cfn-lightsail-database-preferredmaintenancewindow
+	PreferredMaintenanceWindow *types.Value `json:"PreferredMaintenanceWindow,omitempty"`
+
+	// PubliclyAccessible AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-database.html#cfn-lightsail-database-publiclyaccessible
+	PubliclyAccessible *types.Value `json:"PubliclyAccessible,omitempty"`
+
+	// RelationalDatabaseBlueprintId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-database.html#cfn-lightsail-database-relationaldatabaseblueprintid
+	RelationalDatabaseBlueprintId *types.Value `json:"RelationalDatabaseBlueprintId,omitempty"`
+
+	// RelationalDatabaseBundleId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-database.html#cfn-lightsail-database-relationaldatabasebundleid
+	RelationalDatabaseBundleId *types.Value `json:"RelationalDatabaseBundleId,omitempty"`
+
+	// RelationalDatabaseName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-database.html#cfn-lightsail-database-relationaldatabasename
+	RelationalDatabaseName *types.Value `json:"RelationalDatabaseName,omitempty"`
+
+	// RelationalDatabaseParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-database.html#cfn-lightsail-database-relationaldatabaseparameters
+	RelationalDatabaseParameters []Database_RelationalDatabaseParameter `json:"RelationalDatabaseParameters,omitempty"`
+
+	// RotateMasterUserPassword AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-database.html#cfn-lightsail-database-rotatemasteruserpassword
+	RotateMasterUserPassword *types.Value `json:"RotateMasterUserPassword,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-database.html#cfn-lightsail-database-tags
+	Tags []cloudformation.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 *Database) AWSCloudFormationType() string {
+	return "AWS::Lightsail::Database"
+}
+
+// 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 Database) MarshalJSON() ([]byte, error) {
+	type Properties Database
+	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 *Database) UnmarshalJSON(b []byte) error {
+	type Properties Database
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Database(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/lightsail/aws-lightsail-database_relationaldatabaseparameter.go b/goformation/cloudformation/lightsail/aws-lightsail-database_relationaldatabaseparameter.go
new file mode 100644
index 0000000000..365b404225
--- /dev/null
+++ b/goformation/cloudformation/lightsail/aws-lightsail-database_relationaldatabaseparameter.go
@@ -0,0 +1,72 @@
+package lightsail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Database_RelationalDatabaseParameter AWS CloudFormation Resource (AWS::Lightsail::Database.RelationalDatabaseParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-database-relationaldatabaseparameter.html
+type Database_RelationalDatabaseParameter struct {
+
+	// AllowedValues AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-database-relationaldatabaseparameter.html#cfn-lightsail-database-relationaldatabaseparameter-allowedvalues
+	AllowedValues *types.Value `json:"AllowedValues,omitempty"`
+
+	// ApplyMethod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-database-relationaldatabaseparameter.html#cfn-lightsail-database-relationaldatabaseparameter-applymethod
+	ApplyMethod *types.Value `json:"ApplyMethod,omitempty"`
+
+	// ApplyType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-database-relationaldatabaseparameter.html#cfn-lightsail-database-relationaldatabaseparameter-applytype
+	ApplyType *types.Value `json:"ApplyType,omitempty"`
+
+	// DataType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-database-relationaldatabaseparameter.html#cfn-lightsail-database-relationaldatabaseparameter-datatype
+	DataType *types.Value `json:"DataType,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-database-relationaldatabaseparameter.html#cfn-lightsail-database-relationaldatabaseparameter-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// IsModifiable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-database-relationaldatabaseparameter.html#cfn-lightsail-database-relationaldatabaseparameter-ismodifiable
+	IsModifiable *types.Value `json:"IsModifiable,omitempty"`
+
+	// ParameterName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-database-relationaldatabaseparameter.html#cfn-lightsail-database-relationaldatabaseparameter-parametername
+	ParameterName *types.Value `json:"ParameterName,omitempty"`
+
+	// ParameterValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-database-relationaldatabaseparameter.html#cfn-lightsail-database-relationaldatabaseparameter-parametervalue
+	ParameterValue *types.Value `json:"ParameterValue,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Database_RelationalDatabaseParameter) AWSCloudFormationType() string {
+	return "AWS::Lightsail::Database.RelationalDatabaseParameter"
+}
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-disk.go b/goformation/cloudformation/lightsail/aws-lightsail-disk.go
new file mode 100644
index 0000000000..a549f12cc0
--- /dev/null
+++ b/goformation/cloudformation/lightsail/aws-lightsail-disk.go
@@ -0,0 +1,129 @@
+package lightsail
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Disk AWS CloudFormation Resource (AWS::Lightsail::Disk)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-disk.html
+type Disk struct {
+
+	// AddOns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-disk.html#cfn-lightsail-disk-addons
+	AddOns []Disk_AddOn `json:"AddOns,omitempty"`
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-disk.html#cfn-lightsail-disk-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// DiskName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-disk.html#cfn-lightsail-disk-diskname
+	DiskName *types.Value `json:"DiskName,omitempty"`
+
+	// SizeInGb AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-disk.html#cfn-lightsail-disk-sizeingb
+	SizeInGb *types.Value `json:"SizeInGb"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-disk.html#cfn-lightsail-disk-tags
+	Tags []cloudformation.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 *Disk) AWSCloudFormationType() string {
+	return "AWS::Lightsail::Disk"
+}
+
+// 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 Disk) MarshalJSON() ([]byte, error) {
+	type Properties Disk
+	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 *Disk) UnmarshalJSON(b []byte) error {
+	type Properties Disk
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Disk(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/lightsail/aws-lightsail-disk_addon.go b/goformation/cloudformation/lightsail/aws-lightsail-disk_addon.go
new file mode 100644
index 0000000000..03d3033f0c
--- /dev/null
+++ b/goformation/cloudformation/lightsail/aws-lightsail-disk_addon.go
@@ -0,0 +1,47 @@
+package lightsail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Disk_AddOn AWS CloudFormation Resource (AWS::Lightsail::Disk.AddOn)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-disk-addon.html
+type Disk_AddOn struct {
+
+	// AddOnType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-disk-addon.html#cfn-lightsail-disk-addon-addontype
+	AddOnType *types.Value `json:"AddOnType,omitempty"`
+
+	// AutoSnapshotAddOnRequest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-disk-addon.html#cfn-lightsail-disk-addon-autosnapshotaddonrequest
+	AutoSnapshotAddOnRequest *Disk_AutoSnapshotAddOn `json:"AutoSnapshotAddOnRequest,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-disk-addon.html#cfn-lightsail-disk-addon-status
+	Status *types.Value `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 *Disk_AddOn) AWSCloudFormationType() string {
+	return "AWS::Lightsail::Disk.AddOn"
+}
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-disk_autosnapshotaddon.go b/goformation/cloudformation/lightsail/aws-lightsail-disk_autosnapshotaddon.go
new file mode 100644
index 0000000000..5ffcaa4e98
--- /dev/null
+++ b/goformation/cloudformation/lightsail/aws-lightsail-disk_autosnapshotaddon.go
@@ -0,0 +1,37 @@
+package lightsail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Disk_AutoSnapshotAddOn AWS CloudFormation Resource (AWS::Lightsail::Disk.AutoSnapshotAddOn)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-disk-autosnapshotaddon.html
+type Disk_AutoSnapshotAddOn struct {
+
+	// SnapshotTimeOfDay AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-disk-autosnapshotaddon.html#cfn-lightsail-disk-autosnapshotaddon-snapshottimeofday
+	SnapshotTimeOfDay *types.Value `json:"SnapshotTimeOfDay,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Disk_AutoSnapshotAddOn) AWSCloudFormationType() string {
+	return "AWS::Lightsail::Disk.AutoSnapshotAddOn"
+}
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-instance.go b/goformation/cloudformation/lightsail/aws-lightsail-instance.go
new file mode 100644
index 0000000000..17f923084c
--- /dev/null
+++ b/goformation/cloudformation/lightsail/aws-lightsail-instance.go
@@ -0,0 +1,154 @@
+package lightsail
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance AWS CloudFormation Resource (AWS::Lightsail::Instance)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-instance.html
+type Instance struct {
+
+	// AddOns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-instance.html#cfn-lightsail-instance-addons
+	AddOns []Instance_AddOn `json:"AddOns,omitempty"`
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-instance.html#cfn-lightsail-instance-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// BlueprintId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-instance.html#cfn-lightsail-instance-blueprintid
+	BlueprintId *types.Value `json:"BlueprintId,omitempty"`
+
+	// BundleId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-instance.html#cfn-lightsail-instance-bundleid
+	BundleId *types.Value `json:"BundleId,omitempty"`
+
+	// Hardware AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-instance.html#cfn-lightsail-instance-hardware
+	Hardware *Instance_Hardware `json:"Hardware,omitempty"`
+
+	// InstanceName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-instance.html#cfn-lightsail-instance-instancename
+	InstanceName *types.Value `json:"InstanceName,omitempty"`
+
+	// KeyPairName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-instance.html#cfn-lightsail-instance-keypairname
+	KeyPairName *types.Value `json:"KeyPairName,omitempty"`
+
+	// Networking AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-instance.html#cfn-lightsail-instance-networking
+	Networking *Instance_Networking `json:"Networking,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-instance.html#cfn-lightsail-instance-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// UserData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-instance.html#cfn-lightsail-instance-userdata
+	UserData *types.Value `json:"UserData,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::Lightsail::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/lightsail/aws-lightsail-instance_addon.go b/goformation/cloudformation/lightsail/aws-lightsail-instance_addon.go
new file mode 100644
index 0000000000..bb66313702
--- /dev/null
+++ b/goformation/cloudformation/lightsail/aws-lightsail-instance_addon.go
@@ -0,0 +1,47 @@
+package lightsail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_AddOn AWS CloudFormation Resource (AWS::Lightsail::Instance.AddOn)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-addon.html
+type Instance_AddOn struct {
+
+	// AddOnType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-addon.html#cfn-lightsail-instance-addon-addontype
+	AddOnType *types.Value `json:"AddOnType,omitempty"`
+
+	// AutoSnapshotAddOnRequest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-addon.html#cfn-lightsail-instance-addon-autosnapshotaddonrequest
+	AutoSnapshotAddOnRequest *Instance_AutoSnapshotAddOn `json:"AutoSnapshotAddOnRequest,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-addon.html#cfn-lightsail-instance-addon-status
+	Status *types.Value `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 *Instance_AddOn) AWSCloudFormationType() string {
+	return "AWS::Lightsail::Instance.AddOn"
+}
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-instance_autosnapshotaddon.go b/goformation/cloudformation/lightsail/aws-lightsail-instance_autosnapshotaddon.go
new file mode 100644
index 0000000000..da83c33f9e
--- /dev/null
+++ b/goformation/cloudformation/lightsail/aws-lightsail-instance_autosnapshotaddon.go
@@ -0,0 +1,37 @@
+package lightsail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_AutoSnapshotAddOn AWS CloudFormation Resource (AWS::Lightsail::Instance.AutoSnapshotAddOn)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-autosnapshotaddon.html
+type Instance_AutoSnapshotAddOn struct {
+
+	// SnapshotTimeOfDay AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-autosnapshotaddon.html#cfn-lightsail-instance-autosnapshotaddon-snapshottimeofday
+	SnapshotTimeOfDay *types.Value `json:"SnapshotTimeOfDay,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AutoSnapshotAddOn) AWSCloudFormationType() string {
+	return "AWS::Lightsail::Instance.AutoSnapshotAddOn"
+}
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-instance_disk.go b/goformation/cloudformation/lightsail/aws-lightsail-instance_disk.go
new file mode 100644
index 0000000000..b662b81ab3
--- /dev/null
+++ b/goformation/cloudformation/lightsail/aws-lightsail-instance_disk.go
@@ -0,0 +1,67 @@
+package lightsail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_Disk AWS CloudFormation Resource (AWS::Lightsail::Instance.Disk)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-disk.html
+type Instance_Disk struct {
+
+	// AttachedTo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-disk.html#cfn-lightsail-instance-disk-attachedto
+	AttachedTo *types.Value `json:"AttachedTo,omitempty"`
+
+	// AttachmentState AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-disk.html#cfn-lightsail-instance-disk-attachmentstate
+	AttachmentState *types.Value `json:"AttachmentState,omitempty"`
+
+	// DiskName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-disk.html#cfn-lightsail-instance-disk-diskname
+	DiskName *types.Value `json:"DiskName,omitempty"`
+
+	// IOPS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-disk.html#cfn-lightsail-instance-disk-iops
+	IOPS *types.Value `json:"IOPS,omitempty"`
+
+	// IsSystemDisk AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-disk.html#cfn-lightsail-instance-disk-issystemdisk
+	IsSystemDisk *types.Value `json:"IsSystemDisk,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-disk.html#cfn-lightsail-instance-disk-path
+	Path *types.Value `json:"Path,omitempty"`
+
+	// SizeInGb AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-disk.html#cfn-lightsail-instance-disk-sizeingb
+	SizeInGb *types.Value `json:"SizeInGb,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Disk) AWSCloudFormationType() string {
+	return "AWS::Lightsail::Instance.Disk"
+}
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-instance_hardware.go b/goformation/cloudformation/lightsail/aws-lightsail-instance_hardware.go
new file mode 100644
index 0000000000..56a7b3375f
--- /dev/null
+++ b/goformation/cloudformation/lightsail/aws-lightsail-instance_hardware.go
@@ -0,0 +1,47 @@
+package lightsail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_Hardware AWS CloudFormation Resource (AWS::Lightsail::Instance.Hardware)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-hardware.html
+type Instance_Hardware struct {
+
+	// CpuCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-hardware.html#cfn-lightsail-instance-hardware-cpucount
+	CpuCount *types.Value `json:"CpuCount,omitempty"`
+
+	// Disks AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-hardware.html#cfn-lightsail-instance-hardware-disks
+	Disks []Instance_Disk `json:"Disks,omitempty"`
+
+	// RamSizeInGb AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-hardware.html#cfn-lightsail-instance-hardware-ramsizeingb
+	RamSizeInGb *types.Value `json:"RamSizeInGb,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Hardware) AWSCloudFormationType() string {
+	return "AWS::Lightsail::Instance.Hardware"
+}
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-instance_location.go b/goformation/cloudformation/lightsail/aws-lightsail-instance_location.go
new file mode 100644
index 0000000000..96ccdc2262
--- /dev/null
+++ b/goformation/cloudformation/lightsail/aws-lightsail-instance_location.go
@@ -0,0 +1,42 @@
+package lightsail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_Location AWS CloudFormation Resource (AWS::Lightsail::Instance.Location)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-location.html
+type Instance_Location struct {
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-location.html#cfn-lightsail-instance-location-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// RegionName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-location.html#cfn-lightsail-instance-location-regionname
+	RegionName *types.Value `json:"RegionName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Location) AWSCloudFormationType() string {
+	return "AWS::Lightsail::Instance.Location"
+}
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-instance_monthlytransfer.go b/goformation/cloudformation/lightsail/aws-lightsail-instance_monthlytransfer.go
new file mode 100644
index 0000000000..ad0d39b925
--- /dev/null
+++ b/goformation/cloudformation/lightsail/aws-lightsail-instance_monthlytransfer.go
@@ -0,0 +1,37 @@
+package lightsail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_MonthlyTransfer AWS CloudFormation Resource (AWS::Lightsail::Instance.MonthlyTransfer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-monthlytransfer.html
+type Instance_MonthlyTransfer struct {
+
+	// GbPerMonthAllocated AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-monthlytransfer.html#cfn-lightsail-instance-monthlytransfer-gbpermonthallocated
+	GbPerMonthAllocated *types.Value `json:"GbPerMonthAllocated,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_MonthlyTransfer) AWSCloudFormationType() string {
+	return "AWS::Lightsail::Instance.MonthlyTransfer"
+}
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-instance_networking.go b/goformation/cloudformation/lightsail/aws-lightsail-instance_networking.go
new file mode 100644
index 0000000000..4d069eee4b
--- /dev/null
+++ b/goformation/cloudformation/lightsail/aws-lightsail-instance_networking.go
@@ -0,0 +1,40 @@
+package lightsail
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_Networking AWS CloudFormation Resource (AWS::Lightsail::Instance.Networking)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-networking.html
+type Instance_Networking struct {
+
+	// MonthlyTransfer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-networking.html#cfn-lightsail-instance-networking-monthlytransfer
+	MonthlyTransfer *Instance_MonthlyTransfer `json:"MonthlyTransfer,omitempty"`
+
+	// Ports AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-networking.html#cfn-lightsail-instance-networking-ports
+	Ports []Instance_Port `json:"Ports,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Networking) AWSCloudFormationType() string {
+	return "AWS::Lightsail::Instance.Networking"
+}
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-instance_port.go b/goformation/cloudformation/lightsail/aws-lightsail-instance_port.go
new file mode 100644
index 0000000000..8876218fcb
--- /dev/null
+++ b/goformation/cloudformation/lightsail/aws-lightsail-instance_port.go
@@ -0,0 +1,82 @@
+package lightsail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_Port AWS CloudFormation Resource (AWS::Lightsail::Instance.Port)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-port.html
+type Instance_Port struct {
+
+	// AccessDirection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-port.html#cfn-lightsail-instance-port-accessdirection
+	AccessDirection *types.Value `json:"AccessDirection,omitempty"`
+
+	// AccessFrom AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-port.html#cfn-lightsail-instance-port-accessfrom
+	AccessFrom *types.Value `json:"AccessFrom,omitempty"`
+
+	// AccessType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-port.html#cfn-lightsail-instance-port-accesstype
+	AccessType *types.Value `json:"AccessType,omitempty"`
+
+	// CidrListAliases AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-port.html#cfn-lightsail-instance-port-cidrlistaliases
+	CidrListAliases *types.Value `json:"CidrListAliases,omitempty"`
+
+	// Cidrs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-port.html#cfn-lightsail-instance-port-cidrs
+	Cidrs *types.Value `json:"Cidrs,omitempty"`
+
+	// CommonName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-port.html#cfn-lightsail-instance-port-commonname
+	CommonName *types.Value `json:"CommonName,omitempty"`
+
+	// FromPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-port.html#cfn-lightsail-instance-port-fromport
+	FromPort *types.Value `json:"FromPort,omitempty"`
+
+	// Ipv6Cidrs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-port.html#cfn-lightsail-instance-port-ipv6cidrs
+	Ipv6Cidrs *types.Value `json:"Ipv6Cidrs,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-port.html#cfn-lightsail-instance-port-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// ToPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-port.html#cfn-lightsail-instance-port-toport
+	ToPort *types.Value `json:"ToPort,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Port) AWSCloudFormationType() string {
+	return "AWS::Lightsail::Instance.Port"
+}
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-instance_state.go b/goformation/cloudformation/lightsail/aws-lightsail-instance_state.go
new file mode 100644
index 0000000000..2324f3a0ca
--- /dev/null
+++ b/goformation/cloudformation/lightsail/aws-lightsail-instance_state.go
@@ -0,0 +1,42 @@
+package lightsail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_State AWS CloudFormation Resource (AWS::Lightsail::Instance.State)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-state.html
+type Instance_State struct {
+
+	// Code AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-state.html#cfn-lightsail-instance-state-code
+	Code *types.Value `json:"Code,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lightsail-instance-state.html#cfn-lightsail-instance-state-name
+	Name *types.Value `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::Lightsail::Instance.State"
+}
diff --git a/goformation/cloudformation/lightsail/aws-lightsail-staticip.go b/goformation/cloudformation/lightsail/aws-lightsail-staticip.go
new file mode 100644
index 0000000000..c38124f1e4
--- /dev/null
+++ b/goformation/cloudformation/lightsail/aws-lightsail-staticip.go
@@ -0,0 +1,113 @@
+package lightsail
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StaticIp AWS CloudFormation Resource (AWS::Lightsail::StaticIp)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-staticip.html
+type StaticIp struct {
+
+	// AttachedTo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-staticip.html#cfn-lightsail-staticip-attachedto
+	AttachedTo *types.Value `json:"AttachedTo,omitempty"`
+
+	// StaticIpName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lightsail-staticip.html#cfn-lightsail-staticip-staticipname
+	StaticIpName *types.Value `json:"StaticIpName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StaticIp) AWSCloudFormationType() string {
+	return "AWS::Lightsail::StaticIp"
+}
+
+// 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 StaticIp) MarshalJSON() ([]byte, error) {
+	type Properties StaticIp
+	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 *StaticIp) UnmarshalJSON(b []byte) error {
+	type Properties StaticIp
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = StaticIp(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/location/aws-location-geofencecollection.go b/goformation/cloudformation/location/aws-location-geofencecollection.go
new file mode 100644
index 0000000000..9f7599bfb8
--- /dev/null
+++ b/goformation/cloudformation/location/aws-location-geofencecollection.go
@@ -0,0 +1,128 @@
+package location
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GeofenceCollection AWS CloudFormation Resource (AWS::Location::GeofenceCollection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-geofencecollection.html
+type GeofenceCollection struct {
+
+	// CollectionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-geofencecollection.html#cfn-location-geofencecollection-collectionname
+	CollectionName *types.Value `json:"CollectionName,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-geofencecollection.html#cfn-location-geofencecollection-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-geofencecollection.html#cfn-location-geofencecollection-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// PricingPlan AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-geofencecollection.html#cfn-location-geofencecollection-pricingplan
+	PricingPlan *types.Value `json:"PricingPlan,omitempty"`
+
+	// PricingPlanDataSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-geofencecollection.html#cfn-location-geofencecollection-pricingplandatasource
+	PricingPlanDataSource *types.Value `json:"PricingPlanDataSource,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GeofenceCollection) AWSCloudFormationType() string {
+	return "AWS::Location::GeofenceCollection"
+}
+
+// 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 GeofenceCollection) MarshalJSON() ([]byte, error) {
+	type Properties GeofenceCollection
+	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 *GeofenceCollection) UnmarshalJSON(b []byte) error {
+	type Properties GeofenceCollection
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = GeofenceCollection(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/location/aws-location-map.go b/goformation/cloudformation/location/aws-location-map.go
new file mode 100644
index 0000000000..a3120e0f4c
--- /dev/null
+++ b/goformation/cloudformation/location/aws-location-map.go
@@ -0,0 +1,123 @@
+package location
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Map AWS CloudFormation Resource (AWS::Location::Map)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-map.html
+type Map struct {
+
+	// Configuration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-map.html#cfn-location-map-configuration
+	Configuration *Map_MapConfiguration `json:"Configuration,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-map.html#cfn-location-map-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// MapName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-map.html#cfn-location-map-mapname
+	MapName *types.Value `json:"MapName,omitempty"`
+
+	// PricingPlan AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-map.html#cfn-location-map-pricingplan
+	PricingPlan *types.Value `json:"PricingPlan,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Map) AWSCloudFormationType() string {
+	return "AWS::Location::Map"
+}
+
+// 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 Map) MarshalJSON() ([]byte, error) {
+	type Properties Map
+	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 *Map) UnmarshalJSON(b []byte) error {
+	type Properties Map
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Map(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/location/aws-location-map_mapconfiguration.go b/goformation/cloudformation/location/aws-location-map_mapconfiguration.go
new file mode 100644
index 0000000000..2a0cd0420c
--- /dev/null
+++ b/goformation/cloudformation/location/aws-location-map_mapconfiguration.go
@@ -0,0 +1,37 @@
+package location
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Map_MapConfiguration AWS CloudFormation Resource (AWS::Location::Map.MapConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-location-map-mapconfiguration.html
+type Map_MapConfiguration struct {
+
+	// Style AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-location-map-mapconfiguration.html#cfn-location-map-mapconfiguration-style
+	Style *types.Value `json:"Style,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Map_MapConfiguration) AWSCloudFormationType() string {
+	return "AWS::Location::Map.MapConfiguration"
+}
diff --git a/goformation/cloudformation/location/aws-location-placeindex.go b/goformation/cloudformation/location/aws-location-placeindex.go
new file mode 100644
index 0000000000..dc80d6ab51
--- /dev/null
+++ b/goformation/cloudformation/location/aws-location-placeindex.go
@@ -0,0 +1,128 @@
+package location
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PlaceIndex AWS CloudFormation Resource (AWS::Location::PlaceIndex)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-placeindex.html
+type PlaceIndex struct {
+
+	// DataSource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-placeindex.html#cfn-location-placeindex-datasource
+	DataSource *types.Value `json:"DataSource,omitempty"`
+
+	// DataSourceConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-placeindex.html#cfn-location-placeindex-datasourceconfiguration
+	DataSourceConfiguration *PlaceIndex_DataSourceConfiguration `json:"DataSourceConfiguration,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-placeindex.html#cfn-location-placeindex-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// IndexName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-placeindex.html#cfn-location-placeindex-indexname
+	IndexName *types.Value `json:"IndexName,omitempty"`
+
+	// PricingPlan AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-placeindex.html#cfn-location-placeindex-pricingplan
+	PricingPlan *types.Value `json:"PricingPlan,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PlaceIndex) AWSCloudFormationType() string {
+	return "AWS::Location::PlaceIndex"
+}
+
+// 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 PlaceIndex) MarshalJSON() ([]byte, error) {
+	type Properties PlaceIndex
+	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 *PlaceIndex) UnmarshalJSON(b []byte) error {
+	type Properties PlaceIndex
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PlaceIndex(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/location/aws-location-placeindex_datasourceconfiguration.go b/goformation/cloudformation/location/aws-location-placeindex_datasourceconfiguration.go
new file mode 100644
index 0000000000..ba395ec10a
--- /dev/null
+++ b/goformation/cloudformation/location/aws-location-placeindex_datasourceconfiguration.go
@@ -0,0 +1,37 @@
+package location
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PlaceIndex_DataSourceConfiguration AWS CloudFormation Resource (AWS::Location::PlaceIndex.DataSourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-location-placeindex-datasourceconfiguration.html
+type PlaceIndex_DataSourceConfiguration struct {
+
+	// IntendedUse AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-location-placeindex-datasourceconfiguration.html#cfn-location-placeindex-datasourceconfiguration-intendeduse
+	IntendedUse *types.Value `json:"IntendedUse,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PlaceIndex_DataSourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Location::PlaceIndex.DataSourceConfiguration"
+}
diff --git a/goformation/cloudformation/location/aws-location-routecalculator.go b/goformation/cloudformation/location/aws-location-routecalculator.go
new file mode 100644
index 0000000000..3be2b89cd0
--- /dev/null
+++ b/goformation/cloudformation/location/aws-location-routecalculator.go
@@ -0,0 +1,123 @@
+package location
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RouteCalculator AWS CloudFormation Resource (AWS::Location::RouteCalculator)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-routecalculator.html
+type RouteCalculator struct {
+
+	// CalculatorName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-routecalculator.html#cfn-location-routecalculator-calculatorname
+	CalculatorName *types.Value `json:"CalculatorName,omitempty"`
+
+	// DataSource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-routecalculator.html#cfn-location-routecalculator-datasource
+	DataSource *types.Value `json:"DataSource,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-routecalculator.html#cfn-location-routecalculator-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// PricingPlan AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-routecalculator.html#cfn-location-routecalculator-pricingplan
+	PricingPlan *types.Value `json:"PricingPlan,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RouteCalculator) AWSCloudFormationType() string {
+	return "AWS::Location::RouteCalculator"
+}
+
+// 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 RouteCalculator) MarshalJSON() ([]byte, error) {
+	type Properties RouteCalculator
+	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 *RouteCalculator) UnmarshalJSON(b []byte) error {
+	type Properties RouteCalculator
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RouteCalculator(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/location/aws-location-tracker.go b/goformation/cloudformation/location/aws-location-tracker.go
new file mode 100644
index 0000000000..73c97f0dca
--- /dev/null
+++ b/goformation/cloudformation/location/aws-location-tracker.go
@@ -0,0 +1,133 @@
+package location
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Tracker AWS CloudFormation Resource (AWS::Location::Tracker)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-tracker.html
+type Tracker struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-tracker.html#cfn-location-tracker-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-tracker.html#cfn-location-tracker-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// PositionFiltering AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-tracker.html#cfn-location-tracker-positionfiltering
+	PositionFiltering *types.Value `json:"PositionFiltering,omitempty"`
+
+	// PricingPlan AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-tracker.html#cfn-location-tracker-pricingplan
+	PricingPlan *types.Value `json:"PricingPlan,omitempty"`
+
+	// PricingPlanDataSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-tracker.html#cfn-location-tracker-pricingplandatasource
+	PricingPlanDataSource *types.Value `json:"PricingPlanDataSource,omitempty"`
+
+	// TrackerName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-tracker.html#cfn-location-tracker-trackername
+	TrackerName *types.Value `json:"TrackerName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Tracker) AWSCloudFormationType() string {
+	return "AWS::Location::Tracker"
+}
+
+// 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 Tracker) MarshalJSON() ([]byte, error) {
+	type Properties Tracker
+	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 *Tracker) UnmarshalJSON(b []byte) error {
+	type Properties Tracker
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Tracker(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/location/aws-location-trackerconsumer.go b/goformation/cloudformation/location/aws-location-trackerconsumer.go
new file mode 100644
index 0000000000..e03f1ac61b
--- /dev/null
+++ b/goformation/cloudformation/location/aws-location-trackerconsumer.go
@@ -0,0 +1,113 @@
+package location
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TrackerConsumer AWS CloudFormation Resource (AWS::Location::TrackerConsumer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-trackerconsumer.html
+type TrackerConsumer struct {
+
+	// ConsumerArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-trackerconsumer.html#cfn-location-trackerconsumer-consumerarn
+	ConsumerArn *types.Value `json:"ConsumerArn,omitempty"`
+
+	// TrackerName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-location-trackerconsumer.html#cfn-location-trackerconsumer-trackername
+	TrackerName *types.Value `json:"TrackerName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TrackerConsumer) AWSCloudFormationType() string {
+	return "AWS::Location::TrackerConsumer"
+}
+
+// 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 TrackerConsumer) MarshalJSON() ([]byte, error) {
+	type Properties TrackerConsumer
+	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 *TrackerConsumer) UnmarshalJSON(b []byte) error {
+	type Properties TrackerConsumer
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TrackerConsumer(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/logs/aws-logs-destination.go b/goformation/cloudformation/logs/aws-logs-destination.go
new file mode 100644
index 0000000000..51c17f3758
--- /dev/null
+++ b/goformation/cloudformation/logs/aws-logs-destination.go
@@ -0,0 +1,123 @@
+package logs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Destination AWS CloudFormation Resource (AWS::Logs::Destination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-destination.html
+type Destination struct {
+
+	// DestinationName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-destination.html#cfn-logs-destination-destinationname
+	DestinationName *types.Value `json:"DestinationName,omitempty"`
+
+	// DestinationPolicy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-destination.html#cfn-logs-destination-destinationpolicy
+	DestinationPolicy *types.Value `json:"DestinationPolicy,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-destination.html#cfn-logs-destination-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// TargetArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-destination.html#cfn-logs-destination-targetarn
+	TargetArn *types.Value `json:"TargetArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Destination) AWSCloudFormationType() string {
+	return "AWS::Logs::Destination"
+}
+
+// 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 Destination) MarshalJSON() ([]byte, error) {
+	type Properties Destination
+	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 *Destination) UnmarshalJSON(b []byte) error {
+	type Properties Destination
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Destination(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/logs/aws-logs-loggroup.go b/goformation/cloudformation/logs/aws-logs-loggroup.go
new file mode 100644
index 0000000000..541f992f4e
--- /dev/null
+++ b/goformation/cloudformation/logs/aws-logs-loggroup.go
@@ -0,0 +1,124 @@
+package logs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// LogGroup AWS CloudFormation Resource (AWS::Logs::LogGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html
+type LogGroup struct {
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html#cfn-logs-loggroup-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// LogGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html#cfn-logs-loggroup-loggroupname
+	LogGroupName *types.Value `json:"LogGroupName,omitempty"`
+
+	// RetentionInDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html#cfn-logs-loggroup-retentionindays
+	RetentionInDays *types.Value `json:"RetentionInDays,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-loggroup.html#cfn-logs-loggroup-tags
+	Tags []cloudformation.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 *LogGroup) AWSCloudFormationType() string {
+	return "AWS::Logs::LogGroup"
+}
+
+// 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 LogGroup) MarshalJSON() ([]byte, error) {
+	type Properties LogGroup
+	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 *LogGroup) UnmarshalJSON(b []byte) error {
+	type Properties LogGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LogGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/logs/aws-logs-logstream.go b/goformation/cloudformation/logs/aws-logs-logstream.go
new file mode 100644
index 0000000000..f7bc2b7b2a
--- /dev/null
+++ b/goformation/cloudformation/logs/aws-logs-logstream.go
@@ -0,0 +1,113 @@
+package logs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LogStream AWS CloudFormation Resource (AWS::Logs::LogStream)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-logstream.html
+type LogStream struct {
+
+	// LogGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-logstream.html#cfn-logs-logstream-loggroupname
+	LogGroupName *types.Value `json:"LogGroupName,omitempty"`
+
+	// LogStreamName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-logstream.html#cfn-logs-logstream-logstreamname
+	LogStreamName *types.Value `json:"LogStreamName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LogStream) AWSCloudFormationType() string {
+	return "AWS::Logs::LogStream"
+}
+
+// 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 LogStream) MarshalJSON() ([]byte, error) {
+	type Properties LogStream
+	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 *LogStream) UnmarshalJSON(b []byte) error {
+	type Properties LogStream
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LogStream(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/logs/aws-logs-metricfilter.go b/goformation/cloudformation/logs/aws-logs-metricfilter.go
new file mode 100644
index 0000000000..70238570b8
--- /dev/null
+++ b/goformation/cloudformation/logs/aws-logs-metricfilter.go
@@ -0,0 +1,118 @@
+package logs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MetricFilter AWS CloudFormation Resource (AWS::Logs::MetricFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-metricfilter.html
+type MetricFilter struct {
+
+	// FilterPattern AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-metricfilter.html#cfn-cwl-metricfilter-filterpattern
+	FilterPattern *types.Value `json:"FilterPattern,omitempty"`
+
+	// LogGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-metricfilter.html#cfn-cwl-metricfilter-loggroupname
+	LogGroupName *types.Value `json:"LogGroupName,omitempty"`
+
+	// MetricTransformations AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-metricfilter.html#cfn-cwl-metricfilter-metrictransformations
+	MetricTransformations []MetricFilter_MetricTransformation `json:"MetricTransformations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MetricFilter) AWSCloudFormationType() string {
+	return "AWS::Logs::MetricFilter"
+}
+
+// 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 MetricFilter) MarshalJSON() ([]byte, error) {
+	type Properties MetricFilter
+	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 *MetricFilter) UnmarshalJSON(b []byte) error {
+	type Properties MetricFilter
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = MetricFilter(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/logs/aws-logs-metricfilter_metrictransformation.go b/goformation/cloudformation/logs/aws-logs-metricfilter_metrictransformation.go
new file mode 100644
index 0000000000..68a3566e31
--- /dev/null
+++ b/goformation/cloudformation/logs/aws-logs-metricfilter_metrictransformation.go
@@ -0,0 +1,52 @@
+package logs
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MetricFilter_MetricTransformation AWS CloudFormation Resource (AWS::Logs::MetricFilter.MetricTransformation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-logs-metricfilter-metrictransformation.html
+type MetricFilter_MetricTransformation struct {
+
+	// DefaultValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-logs-metricfilter-metrictransformation.html#cfn-cwl-metricfilter-metrictransformation-defaultvalue
+	DefaultValue *types.Value `json:"DefaultValue,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-logs-metricfilter-metrictransformation.html#cfn-cwl-metricfilter-metrictransformation-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// MetricNamespace AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-logs-metricfilter-metrictransformation.html#cfn-cwl-metricfilter-metrictransformation-metricnamespace
+	MetricNamespace *types.Value `json:"MetricNamespace,omitempty"`
+
+	// MetricValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-logs-metricfilter-metrictransformation.html#cfn-cwl-metricfilter-metrictransformation-metricvalue
+	MetricValue *types.Value `json:"MetricValue,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MetricFilter_MetricTransformation) AWSCloudFormationType() string {
+	return "AWS::Logs::MetricFilter.MetricTransformation"
+}
diff --git a/goformation/cloudformation/logs/aws-logs-querydefinition.go b/goformation/cloudformation/logs/aws-logs-querydefinition.go
new file mode 100644
index 0000000000..12da665a7f
--- /dev/null
+++ b/goformation/cloudformation/logs/aws-logs-querydefinition.go
@@ -0,0 +1,118 @@
+package logs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// QueryDefinition AWS CloudFormation Resource (AWS::Logs::QueryDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-querydefinition.html
+type QueryDefinition struct {
+
+	// LogGroupNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-querydefinition.html#cfn-logs-querydefinition-loggroupnames
+	LogGroupNames *types.Value `json:"LogGroupNames,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-querydefinition.html#cfn-logs-querydefinition-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// QueryString AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-querydefinition.html#cfn-logs-querydefinition-querystring
+	QueryString *types.Value `json:"QueryString,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *QueryDefinition) AWSCloudFormationType() string {
+	return "AWS::Logs::QueryDefinition"
+}
+
+// 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 QueryDefinition) MarshalJSON() ([]byte, error) {
+	type Properties QueryDefinition
+	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 *QueryDefinition) UnmarshalJSON(b []byte) error {
+	type Properties QueryDefinition
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = QueryDefinition(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/logs/aws-logs-resourcepolicy.go b/goformation/cloudformation/logs/aws-logs-resourcepolicy.go
new file mode 100644
index 0000000000..0ae50dd739
--- /dev/null
+++ b/goformation/cloudformation/logs/aws-logs-resourcepolicy.go
@@ -0,0 +1,113 @@
+package logs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourcePolicy AWS CloudFormation Resource (AWS::Logs::ResourcePolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-resourcepolicy.html
+type ResourcePolicy struct {
+
+	// PolicyDocument AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-resourcepolicy.html#cfn-logs-resourcepolicy-policydocument
+	PolicyDocument *types.Value `json:"PolicyDocument,omitempty"`
+
+	// PolicyName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-resourcepolicy.html#cfn-logs-resourcepolicy-policyname
+	PolicyName *types.Value `json:"PolicyName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::Logs::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/logs/aws-logs-subscriptionfilter.go b/goformation/cloudformation/logs/aws-logs-subscriptionfilter.go
new file mode 100644
index 0000000000..0946f3c181
--- /dev/null
+++ b/goformation/cloudformation/logs/aws-logs-subscriptionfilter.go
@@ -0,0 +1,123 @@
+package logs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SubscriptionFilter AWS CloudFormation Resource (AWS::Logs::SubscriptionFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html
+type SubscriptionFilter struct {
+
+	// DestinationArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html#cfn-cwl-subscriptionfilter-destinationarn
+	DestinationArn *types.Value `json:"DestinationArn,omitempty"`
+
+	// FilterPattern AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html#cfn-cwl-subscriptionfilter-filterpattern
+	FilterPattern *types.Value `json:"FilterPattern,omitempty"`
+
+	// LogGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html#cfn-cwl-subscriptionfilter-loggroupname
+	LogGroupName *types.Value `json:"LogGroupName,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-logs-subscriptionfilter.html#cfn-cwl-subscriptionfilter-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SubscriptionFilter) AWSCloudFormationType() string {
+	return "AWS::Logs::SubscriptionFilter"
+}
+
+// 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 SubscriptionFilter) MarshalJSON() ([]byte, error) {
+	type Properties SubscriptionFilter
+	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 *SubscriptionFilter) UnmarshalJSON(b []byte) error {
+	type Properties SubscriptionFilter
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SubscriptionFilter(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/lookoutequipment/aws-lookoutequipment-inferencescheduler.go b/goformation/cloudformation/lookoutequipment/aws-lookoutequipment-inferencescheduler.go
new file mode 100644
index 0000000000..65e6815c5f
--- /dev/null
+++ b/goformation/cloudformation/lookoutequipment/aws-lookoutequipment-inferencescheduler.go
@@ -0,0 +1,149 @@
+package lookoutequipment
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// InferenceScheduler AWS CloudFormation Resource (AWS::LookoutEquipment::InferenceScheduler)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutequipment-inferencescheduler.html
+type InferenceScheduler struct {
+
+	// DataDelayOffsetInMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutequipment-inferencescheduler.html#cfn-lookoutequipment-inferencescheduler-datadelayoffsetinminutes
+	DataDelayOffsetInMinutes *types.Value `json:"DataDelayOffsetInMinutes,omitempty"`
+
+	// DataInputConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutequipment-inferencescheduler.html#cfn-lookoutequipment-inferencescheduler-datainputconfiguration
+	DataInputConfiguration interface{} `json:"DataInputConfiguration,omitempty"`
+
+	// DataOutputConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutequipment-inferencescheduler.html#cfn-lookoutequipment-inferencescheduler-dataoutputconfiguration
+	DataOutputConfiguration interface{} `json:"DataOutputConfiguration,omitempty"`
+
+	// DataUploadFrequency AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutequipment-inferencescheduler.html#cfn-lookoutequipment-inferencescheduler-datauploadfrequency
+	DataUploadFrequency *types.Value `json:"DataUploadFrequency,omitempty"`
+
+	// InferenceSchedulerName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutequipment-inferencescheduler.html#cfn-lookoutequipment-inferencescheduler-inferenceschedulername
+	InferenceSchedulerName *types.Value `json:"InferenceSchedulerName,omitempty"`
+
+	// ModelName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutequipment-inferencescheduler.html#cfn-lookoutequipment-inferencescheduler-modelname
+	ModelName *types.Value `json:"ModelName,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutequipment-inferencescheduler.html#cfn-lookoutequipment-inferencescheduler-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// ServerSideKmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutequipment-inferencescheduler.html#cfn-lookoutequipment-inferencescheduler-serversidekmskeyid
+	ServerSideKmsKeyId *types.Value `json:"ServerSideKmsKeyId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutequipment-inferencescheduler.html#cfn-lookoutequipment-inferencescheduler-tags
+	Tags []cloudformation.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 *InferenceScheduler) AWSCloudFormationType() string {
+	return "AWS::LookoutEquipment::InferenceScheduler"
+}
+
+// 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 InferenceScheduler) MarshalJSON() ([]byte, error) {
+	type Properties InferenceScheduler
+	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 *InferenceScheduler) UnmarshalJSON(b []byte) error {
+	type Properties InferenceScheduler
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = InferenceScheduler(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert.go b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert.go
new file mode 100644
index 0000000000..bfcf02c64b
--- /dev/null
+++ b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert.go
@@ -0,0 +1,128 @@
+package lookoutmetrics
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Alert AWS CloudFormation Resource (AWS::LookoutMetrics::Alert)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutmetrics-alert.html
+type Alert struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutmetrics-alert.html#cfn-lookoutmetrics-alert-action
+	Action *Alert_Action `json:"Action,omitempty"`
+
+	// AlertDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutmetrics-alert.html#cfn-lookoutmetrics-alert-alertdescription
+	AlertDescription *types.Value `json:"AlertDescription,omitempty"`
+
+	// AlertName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutmetrics-alert.html#cfn-lookoutmetrics-alert-alertname
+	AlertName *types.Value `json:"AlertName,omitempty"`
+
+	// AlertSensitivityThreshold AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutmetrics-alert.html#cfn-lookoutmetrics-alert-alertsensitivitythreshold
+	AlertSensitivityThreshold *types.Value `json:"AlertSensitivityThreshold"`
+
+	// AnomalyDetectorArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutmetrics-alert.html#cfn-lookoutmetrics-alert-anomalydetectorarn
+	AnomalyDetectorArn *types.Value `json:"AnomalyDetectorArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Alert) AWSCloudFormationType() string {
+	return "AWS::LookoutMetrics::Alert"
+}
+
+// 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 Alert) MarshalJSON() ([]byte, error) {
+	type Properties Alert
+	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 *Alert) UnmarshalJSON(b []byte) error {
+	type Properties Alert
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Alert(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_action.go b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_action.go
new file mode 100644
index 0000000000..f9a5e98a01
--- /dev/null
+++ b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_action.go
@@ -0,0 +1,40 @@
+package lookoutmetrics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Alert_Action AWS CloudFormation Resource (AWS::LookoutMetrics::Alert.Action)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-alert-action.html
+type Alert_Action struct {
+
+	// LambdaConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-alert-action.html#cfn-lookoutmetrics-alert-action-lambdaconfiguration
+	LambdaConfiguration *Alert_LambdaConfiguration `json:"LambdaConfiguration,omitempty"`
+
+	// SNSConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-alert-action.html#cfn-lookoutmetrics-alert-action-snsconfiguration
+	SNSConfiguration *Alert_SNSConfiguration `json:"SNSConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Alert_Action) AWSCloudFormationType() string {
+	return "AWS::LookoutMetrics::Alert.Action"
+}
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_lambdaconfiguration.go b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_lambdaconfiguration.go
new file mode 100644
index 0000000000..e5bbb38200
--- /dev/null
+++ b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_lambdaconfiguration.go
@@ -0,0 +1,42 @@
+package lookoutmetrics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Alert_LambdaConfiguration AWS CloudFormation Resource (AWS::LookoutMetrics::Alert.LambdaConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-alert-lambdaconfiguration.html
+type Alert_LambdaConfiguration struct {
+
+	// LambdaArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-alert-lambdaconfiguration.html#cfn-lookoutmetrics-alert-lambdaconfiguration-lambdaarn
+	LambdaArn *types.Value `json:"LambdaArn,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-alert-lambdaconfiguration.html#cfn-lookoutmetrics-alert-lambdaconfiguration-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Alert_LambdaConfiguration) AWSCloudFormationType() string {
+	return "AWS::LookoutMetrics::Alert.LambdaConfiguration"
+}
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_snsconfiguration.go b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_snsconfiguration.go
new file mode 100644
index 0000000000..a6916c1775
--- /dev/null
+++ b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-alert_snsconfiguration.go
@@ -0,0 +1,42 @@
+package lookoutmetrics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Alert_SNSConfiguration AWS CloudFormation Resource (AWS::LookoutMetrics::Alert.SNSConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-alert-snsconfiguration.html
+type Alert_SNSConfiguration struct {
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-alert-snsconfiguration.html#cfn-lookoutmetrics-alert-snsconfiguration-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// SnsTopicArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-alert-snsconfiguration.html#cfn-lookoutmetrics-alert-snsconfiguration-snstopicarn
+	SnsTopicArn *types.Value `json:"SnsTopicArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Alert_SNSConfiguration) AWSCloudFormationType() string {
+	return "AWS::LookoutMetrics::Alert.SNSConfiguration"
+}
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector.go b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector.go
new file mode 100644
index 0000000000..d30f9b7f64
--- /dev/null
+++ b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector.go
@@ -0,0 +1,128 @@
+package lookoutmetrics
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutmetrics-anomalydetector.html
+type AnomalyDetector struct {
+
+	// AnomalyDetectorConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutmetrics-anomalydetector.html#cfn-lookoutmetrics-anomalydetector-anomalydetectorconfig
+	AnomalyDetectorConfig *AnomalyDetector_AnomalyDetectorConfig `json:"AnomalyDetectorConfig,omitempty"`
+
+	// AnomalyDetectorDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutmetrics-anomalydetector.html#cfn-lookoutmetrics-anomalydetector-anomalydetectordescription
+	AnomalyDetectorDescription *types.Value `json:"AnomalyDetectorDescription,omitempty"`
+
+	// AnomalyDetectorName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutmetrics-anomalydetector.html#cfn-lookoutmetrics-anomalydetector-anomalydetectorname
+	AnomalyDetectorName *types.Value `json:"AnomalyDetectorName,omitempty"`
+
+	// KmsKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutmetrics-anomalydetector.html#cfn-lookoutmetrics-anomalydetector-kmskeyarn
+	KmsKeyArn *types.Value `json:"KmsKeyArn,omitempty"`
+
+	// MetricSetList AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutmetrics-anomalydetector.html#cfn-lookoutmetrics-anomalydetector-metricsetlist
+	MetricSetList []AnomalyDetector_MetricSet `json:"MetricSetList,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AnomalyDetector) AWSCloudFormationType() string {
+	return "AWS::LookoutMetrics::AnomalyDetector"
+}
+
+// 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 AnomalyDetector) MarshalJSON() ([]byte, error) {
+	type Properties AnomalyDetector
+	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 *AnomalyDetector) UnmarshalJSON(b []byte) error {
+	type Properties AnomalyDetector
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AnomalyDetector(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_anomalydetectorconfig.go b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_anomalydetectorconfig.go
new file mode 100644
index 0000000000..435856e552
--- /dev/null
+++ b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_anomalydetectorconfig.go
@@ -0,0 +1,37 @@
+package lookoutmetrics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_AnomalyDetectorConfig AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.AnomalyDetectorConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-anomalydetectorconfig.html
+type AnomalyDetector_AnomalyDetectorConfig struct {
+
+	// AnomalyDetectorFrequency AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-anomalydetectorconfig.html#cfn-lookoutmetrics-anomalydetector-anomalydetectorconfig-anomalydetectorfrequency
+	AnomalyDetectorFrequency *types.Value `json:"AnomalyDetectorFrequency,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AnomalyDetector_AnomalyDetectorConfig) AWSCloudFormationType() string {
+	return "AWS::LookoutMetrics::AnomalyDetector.AnomalyDetectorConfig"
+}
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_appflowconfig.go b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_appflowconfig.go
new file mode 100644
index 0000000000..d05399d5b3
--- /dev/null
+++ b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_appflowconfig.go
@@ -0,0 +1,42 @@
+package lookoutmetrics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_AppFlowConfig AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.AppFlowConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-appflowconfig.html
+type AnomalyDetector_AppFlowConfig struct {
+
+	// FlowName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-appflowconfig.html#cfn-lookoutmetrics-anomalydetector-appflowconfig-flowname
+	FlowName *types.Value `json:"FlowName,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-appflowconfig.html#cfn-lookoutmetrics-anomalydetector-appflowconfig-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AnomalyDetector_AppFlowConfig) AWSCloudFormationType() string {
+	return "AWS::LookoutMetrics::AnomalyDetector.AppFlowConfig"
+}
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_cloudwatchconfig.go b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_cloudwatchconfig.go
new file mode 100644
index 0000000000..8ed9d7a7fc
--- /dev/null
+++ b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_cloudwatchconfig.go
@@ -0,0 +1,37 @@
+package lookoutmetrics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_CloudwatchConfig AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.CloudwatchConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-cloudwatchconfig.html
+type AnomalyDetector_CloudwatchConfig struct {
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-cloudwatchconfig.html#cfn-lookoutmetrics-anomalydetector-cloudwatchconfig-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AnomalyDetector_CloudwatchConfig) AWSCloudFormationType() string {
+	return "AWS::LookoutMetrics::AnomalyDetector.CloudwatchConfig"
+}
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_csvformatdescriptor.go b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_csvformatdescriptor.go
new file mode 100644
index 0000000000..dbcb73a50e
--- /dev/null
+++ b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_csvformatdescriptor.go
@@ -0,0 +1,62 @@
+package lookoutmetrics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_CsvFormatDescriptor AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.CsvFormatDescriptor)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-csvformatdescriptor.html
+type AnomalyDetector_CsvFormatDescriptor struct {
+
+	// Charset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-csvformatdescriptor.html#cfn-lookoutmetrics-anomalydetector-csvformatdescriptor-charset
+	Charset *types.Value `json:"Charset,omitempty"`
+
+	// ContainsHeader AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-csvformatdescriptor.html#cfn-lookoutmetrics-anomalydetector-csvformatdescriptor-containsheader
+	ContainsHeader *types.Value `json:"ContainsHeader,omitempty"`
+
+	// Delimiter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-csvformatdescriptor.html#cfn-lookoutmetrics-anomalydetector-csvformatdescriptor-delimiter
+	Delimiter *types.Value `json:"Delimiter,omitempty"`
+
+	// FileCompression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-csvformatdescriptor.html#cfn-lookoutmetrics-anomalydetector-csvformatdescriptor-filecompression
+	FileCompression *types.Value `json:"FileCompression,omitempty"`
+
+	// HeaderList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-csvformatdescriptor.html#cfn-lookoutmetrics-anomalydetector-csvformatdescriptor-headerlist
+	HeaderList *types.Value `json:"HeaderList,omitempty"`
+
+	// QuoteSymbol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-csvformatdescriptor.html#cfn-lookoutmetrics-anomalydetector-csvformatdescriptor-quotesymbol
+	QuoteSymbol *types.Value `json:"QuoteSymbol,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AnomalyDetector_CsvFormatDescriptor) AWSCloudFormationType() string {
+	return "AWS::LookoutMetrics::AnomalyDetector.CsvFormatDescriptor"
+}
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_fileformatdescriptor.go b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_fileformatdescriptor.go
new file mode 100644
index 0000000000..103db78072
--- /dev/null
+++ b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_fileformatdescriptor.go
@@ -0,0 +1,40 @@
+package lookoutmetrics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_FileFormatDescriptor AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.FileFormatDescriptor)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-fileformatdescriptor.html
+type AnomalyDetector_FileFormatDescriptor struct {
+
+	// CsvFormatDescriptor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-fileformatdescriptor.html#cfn-lookoutmetrics-anomalydetector-fileformatdescriptor-csvformatdescriptor
+	CsvFormatDescriptor *AnomalyDetector_CsvFormatDescriptor `json:"CsvFormatDescriptor,omitempty"`
+
+	// JsonFormatDescriptor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-fileformatdescriptor.html#cfn-lookoutmetrics-anomalydetector-fileformatdescriptor-jsonformatdescriptor
+	JsonFormatDescriptor *AnomalyDetector_JsonFormatDescriptor `json:"JsonFormatDescriptor,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AnomalyDetector_FileFormatDescriptor) AWSCloudFormationType() string {
+	return "AWS::LookoutMetrics::AnomalyDetector.FileFormatDescriptor"
+}
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_jsonformatdescriptor.go b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_jsonformatdescriptor.go
new file mode 100644
index 0000000000..3000450125
--- /dev/null
+++ b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_jsonformatdescriptor.go
@@ -0,0 +1,42 @@
+package lookoutmetrics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_JsonFormatDescriptor AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.JsonFormatDescriptor)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-jsonformatdescriptor.html
+type AnomalyDetector_JsonFormatDescriptor struct {
+
+	// Charset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-jsonformatdescriptor.html#cfn-lookoutmetrics-anomalydetector-jsonformatdescriptor-charset
+	Charset *types.Value `json:"Charset,omitempty"`
+
+	// FileCompression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-jsonformatdescriptor.html#cfn-lookoutmetrics-anomalydetector-jsonformatdescriptor-filecompression
+	FileCompression *types.Value `json:"FileCompression,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AnomalyDetector_JsonFormatDescriptor) AWSCloudFormationType() string {
+	return "AWS::LookoutMetrics::AnomalyDetector.JsonFormatDescriptor"
+}
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metric.go b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metric.go
new file mode 100644
index 0000000000..e9b68ff72e
--- /dev/null
+++ b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metric.go
@@ -0,0 +1,47 @@
+package lookoutmetrics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_Metric AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.Metric)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-metric.html
+type AnomalyDetector_Metric struct {
+
+	// AggregationFunction AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-metric.html#cfn-lookoutmetrics-anomalydetector-metric-aggregationfunction
+	AggregationFunction *types.Value `json:"AggregationFunction,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-metric.html#cfn-lookoutmetrics-anomalydetector-metric-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// Namespace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-metric.html#cfn-lookoutmetrics-anomalydetector-metric-namespace
+	Namespace *types.Value `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 *AnomalyDetector_Metric) AWSCloudFormationType() string {
+	return "AWS::LookoutMetrics::AnomalyDetector.Metric"
+}
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricset.go b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricset.go
new file mode 100644
index 0000000000..b9e4618c13
--- /dev/null
+++ b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricset.go
@@ -0,0 +1,77 @@
+package lookoutmetrics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_MetricSet AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.MetricSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-metricset.html
+type AnomalyDetector_MetricSet struct {
+
+	// DimensionList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-metricset.html#cfn-lookoutmetrics-anomalydetector-metricset-dimensionlist
+	DimensionList *types.Value `json:"DimensionList,omitempty"`
+
+	// MetricList AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-metricset.html#cfn-lookoutmetrics-anomalydetector-metricset-metriclist
+	MetricList []AnomalyDetector_Metric `json:"MetricList,omitempty"`
+
+	// MetricSetDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-metricset.html#cfn-lookoutmetrics-anomalydetector-metricset-metricsetdescription
+	MetricSetDescription *types.Value `json:"MetricSetDescription,omitempty"`
+
+	// MetricSetFrequency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-metricset.html#cfn-lookoutmetrics-anomalydetector-metricset-metricsetfrequency
+	MetricSetFrequency *types.Value `json:"MetricSetFrequency,omitempty"`
+
+	// MetricSetName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-metricset.html#cfn-lookoutmetrics-anomalydetector-metricset-metricsetname
+	MetricSetName *types.Value `json:"MetricSetName,omitempty"`
+
+	// MetricSource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-metricset.html#cfn-lookoutmetrics-anomalydetector-metricset-metricsource
+	MetricSource *AnomalyDetector_MetricSource `json:"MetricSource,omitempty"`
+
+	// Offset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-metricset.html#cfn-lookoutmetrics-anomalydetector-metricset-offset
+	Offset *types.Value `json:"Offset,omitempty"`
+
+	// TimestampColumn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-metricset.html#cfn-lookoutmetrics-anomalydetector-metricset-timestampcolumn
+	TimestampColumn *AnomalyDetector_TimestampColumn `json:"TimestampColumn,omitempty"`
+
+	// Timezone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-metricset.html#cfn-lookoutmetrics-anomalydetector-metricset-timezone
+	Timezone *types.Value `json:"Timezone,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AnomalyDetector_MetricSet) AWSCloudFormationType() string {
+	return "AWS::LookoutMetrics::AnomalyDetector.MetricSet"
+}
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricsource.go b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricsource.go
new file mode 100644
index 0000000000..07f5231c97
--- /dev/null
+++ b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_metricsource.go
@@ -0,0 +1,55 @@
+package lookoutmetrics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_MetricSource AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.MetricSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-metricsource.html
+type AnomalyDetector_MetricSource struct {
+
+	// AppFlowConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-metricsource.html#cfn-lookoutmetrics-anomalydetector-metricsource-appflowconfig
+	AppFlowConfig *AnomalyDetector_AppFlowConfig `json:"AppFlowConfig,omitempty"`
+
+	// CloudwatchConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-metricsource.html#cfn-lookoutmetrics-anomalydetector-metricsource-cloudwatchconfig
+	CloudwatchConfig *AnomalyDetector_CloudwatchConfig `json:"CloudwatchConfig,omitempty"`
+
+	// RDSSourceConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-metricsource.html#cfn-lookoutmetrics-anomalydetector-metricsource-rdssourceconfig
+	RDSSourceConfig *AnomalyDetector_RDSSourceConfig `json:"RDSSourceConfig,omitempty"`
+
+	// RedshiftSourceConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-metricsource.html#cfn-lookoutmetrics-anomalydetector-metricsource-redshiftsourceconfig
+	RedshiftSourceConfig *AnomalyDetector_RedshiftSourceConfig `json:"RedshiftSourceConfig,omitempty"`
+
+	// S3SourceConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-metricsource.html#cfn-lookoutmetrics-anomalydetector-metricsource-s3sourceconfig
+	S3SourceConfig *AnomalyDetector_S3SourceConfig `json:"S3SourceConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AnomalyDetector_MetricSource) AWSCloudFormationType() string {
+	return "AWS::LookoutMetrics::AnomalyDetector.MetricSource"
+}
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_rdssourceconfig.go b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_rdssourceconfig.go
new file mode 100644
index 0000000000..413b6aeaa4
--- /dev/null
+++ b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_rdssourceconfig.go
@@ -0,0 +1,72 @@
+package lookoutmetrics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_RDSSourceConfig AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.RDSSourceConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-rdssourceconfig.html
+type AnomalyDetector_RDSSourceConfig struct {
+
+	// DBInstanceIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-rdssourceconfig.html#cfn-lookoutmetrics-anomalydetector-rdssourceconfig-dbinstanceidentifier
+	DBInstanceIdentifier *types.Value `json:"DBInstanceIdentifier,omitempty"`
+
+	// DatabaseHost AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-rdssourceconfig.html#cfn-lookoutmetrics-anomalydetector-rdssourceconfig-databasehost
+	DatabaseHost *types.Value `json:"DatabaseHost,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-rdssourceconfig.html#cfn-lookoutmetrics-anomalydetector-rdssourceconfig-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// DatabasePort AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-rdssourceconfig.html#cfn-lookoutmetrics-anomalydetector-rdssourceconfig-databaseport
+	DatabasePort *types.Value `json:"DatabasePort"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-rdssourceconfig.html#cfn-lookoutmetrics-anomalydetector-rdssourceconfig-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// SecretManagerArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-rdssourceconfig.html#cfn-lookoutmetrics-anomalydetector-rdssourceconfig-secretmanagerarn
+	SecretManagerArn *types.Value `json:"SecretManagerArn,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-rdssourceconfig.html#cfn-lookoutmetrics-anomalydetector-rdssourceconfig-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// VpcConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-rdssourceconfig.html#cfn-lookoutmetrics-anomalydetector-rdssourceconfig-vpcconfiguration
+	VpcConfiguration *AnomalyDetector_VpcConfiguration `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 *AnomalyDetector_RDSSourceConfig) AWSCloudFormationType() string {
+	return "AWS::LookoutMetrics::AnomalyDetector.RDSSourceConfig"
+}
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_redshiftsourceconfig.go b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_redshiftsourceconfig.go
new file mode 100644
index 0000000000..fb63a61eea
--- /dev/null
+++ b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_redshiftsourceconfig.go
@@ -0,0 +1,72 @@
+package lookoutmetrics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_RedshiftSourceConfig AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.RedshiftSourceConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-redshiftsourceconfig.html
+type AnomalyDetector_RedshiftSourceConfig struct {
+
+	// ClusterIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-redshiftsourceconfig.html#cfn-lookoutmetrics-anomalydetector-redshiftsourceconfig-clusteridentifier
+	ClusterIdentifier *types.Value `json:"ClusterIdentifier,omitempty"`
+
+	// DatabaseHost AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-redshiftsourceconfig.html#cfn-lookoutmetrics-anomalydetector-redshiftsourceconfig-databasehost
+	DatabaseHost *types.Value `json:"DatabaseHost,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-redshiftsourceconfig.html#cfn-lookoutmetrics-anomalydetector-redshiftsourceconfig-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// DatabasePort AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-redshiftsourceconfig.html#cfn-lookoutmetrics-anomalydetector-redshiftsourceconfig-databaseport
+	DatabasePort *types.Value `json:"DatabasePort"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-redshiftsourceconfig.html#cfn-lookoutmetrics-anomalydetector-redshiftsourceconfig-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// SecretManagerArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-redshiftsourceconfig.html#cfn-lookoutmetrics-anomalydetector-redshiftsourceconfig-secretmanagerarn
+	SecretManagerArn *types.Value `json:"SecretManagerArn,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-redshiftsourceconfig.html#cfn-lookoutmetrics-anomalydetector-redshiftsourceconfig-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// VpcConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-redshiftsourceconfig.html#cfn-lookoutmetrics-anomalydetector-redshiftsourceconfig-vpcconfiguration
+	VpcConfiguration *AnomalyDetector_VpcConfiguration `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 *AnomalyDetector_RedshiftSourceConfig) AWSCloudFormationType() string {
+	return "AWS::LookoutMetrics::AnomalyDetector.RedshiftSourceConfig"
+}
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_s3sourceconfig.go b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_s3sourceconfig.go
new file mode 100644
index 0000000000..96a2e5dd39
--- /dev/null
+++ b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_s3sourceconfig.go
@@ -0,0 +1,52 @@
+package lookoutmetrics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_S3SourceConfig AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.S3SourceConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-s3sourceconfig.html
+type AnomalyDetector_S3SourceConfig struct {
+
+	// FileFormatDescriptor AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-s3sourceconfig.html#cfn-lookoutmetrics-anomalydetector-s3sourceconfig-fileformatdescriptor
+	FileFormatDescriptor *AnomalyDetector_FileFormatDescriptor `json:"FileFormatDescriptor,omitempty"`
+
+	// HistoricalDataPathList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-s3sourceconfig.html#cfn-lookoutmetrics-anomalydetector-s3sourceconfig-historicaldatapathlist
+	HistoricalDataPathList *types.Value `json:"HistoricalDataPathList,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-s3sourceconfig.html#cfn-lookoutmetrics-anomalydetector-s3sourceconfig-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// TemplatedPathList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-s3sourceconfig.html#cfn-lookoutmetrics-anomalydetector-s3sourceconfig-templatedpathlist
+	TemplatedPathList *types.Value `json:"TemplatedPathList,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AnomalyDetector_S3SourceConfig) AWSCloudFormationType() string {
+	return "AWS::LookoutMetrics::AnomalyDetector.S3SourceConfig"
+}
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_timestampcolumn.go b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_timestampcolumn.go
new file mode 100644
index 0000000000..ca43e681ff
--- /dev/null
+++ b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_timestampcolumn.go
@@ -0,0 +1,42 @@
+package lookoutmetrics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_TimestampColumn AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.TimestampColumn)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-timestampcolumn.html
+type AnomalyDetector_TimestampColumn struct {
+
+	// ColumnFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-timestampcolumn.html#cfn-lookoutmetrics-anomalydetector-timestampcolumn-columnformat
+	ColumnFormat *types.Value `json:"ColumnFormat,omitempty"`
+
+	// ColumnName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-timestampcolumn.html#cfn-lookoutmetrics-anomalydetector-timestampcolumn-columnname
+	ColumnName *types.Value `json:"ColumnName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AnomalyDetector_TimestampColumn) AWSCloudFormationType() string {
+	return "AWS::LookoutMetrics::AnomalyDetector.TimestampColumn"
+}
diff --git a/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_vpcconfiguration.go b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_vpcconfiguration.go
new file mode 100644
index 0000000000..8035ea7f6f
--- /dev/null
+++ b/goformation/cloudformation/lookoutmetrics/aws-lookoutmetrics-anomalydetector_vpcconfiguration.go
@@ -0,0 +1,42 @@
+package lookoutmetrics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AnomalyDetector_VpcConfiguration AWS CloudFormation Resource (AWS::LookoutMetrics::AnomalyDetector.VpcConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-vpcconfiguration.html
+type AnomalyDetector_VpcConfiguration struct {
+
+	// SecurityGroupIdList AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-vpcconfiguration.html#cfn-lookoutmetrics-anomalydetector-vpcconfiguration-securitygroupidlist
+	SecurityGroupIdList *types.Value `json:"SecurityGroupIdList,omitempty"`
+
+	// SubnetIdList AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lookoutmetrics-anomalydetector-vpcconfiguration.html#cfn-lookoutmetrics-anomalydetector-vpcconfiguration-subnetidlist
+	SubnetIdList *types.Value `json:"SubnetIdList,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AnomalyDetector_VpcConfiguration) AWSCloudFormationType() string {
+	return "AWS::LookoutMetrics::AnomalyDetector.VpcConfiguration"
+}
diff --git a/goformation/cloudformation/lookoutvision/aws-lookoutvision-project.go b/goformation/cloudformation/lookoutvision/aws-lookoutvision-project.go
new file mode 100644
index 0000000000..ba3dd98bbd
--- /dev/null
+++ b/goformation/cloudformation/lookoutvision/aws-lookoutvision-project.go
@@ -0,0 +1,108 @@
+package lookoutvision
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project AWS CloudFormation Resource (AWS::LookoutVision::Project)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutvision-project.html
+type Project struct {
+
+	// ProjectName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-lookoutvision-project.html#cfn-lookoutvision-project-projectname
+	ProjectName *types.Value `json:"ProjectName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::LookoutVision::Project"
+}
+
+// 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 Project) MarshalJSON() ([]byte, error) {
+	type Properties Project
+	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 *Project) UnmarshalJSON(b []byte) error {
+	type Properties Project
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Project(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/macie/aws-macie-customdataidentifier.go b/goformation/cloudformation/macie/aws-macie-customdataidentifier.go
new file mode 100644
index 0000000000..a8aa4d2064
--- /dev/null
+++ b/goformation/cloudformation/macie/aws-macie-customdataidentifier.go
@@ -0,0 +1,133 @@
+package macie
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CustomDataIdentifier AWS CloudFormation Resource (AWS::Macie::CustomDataIdentifier)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-macie-customdataidentifier.html
+type CustomDataIdentifier struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-macie-customdataidentifier.html#cfn-macie-customdataidentifier-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// IgnoreWords AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-macie-customdataidentifier.html#cfn-macie-customdataidentifier-ignorewords
+	IgnoreWords *types.Value `json:"IgnoreWords,omitempty"`
+
+	// Keywords AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-macie-customdataidentifier.html#cfn-macie-customdataidentifier-keywords
+	Keywords *types.Value `json:"Keywords,omitempty"`
+
+	// MaximumMatchDistance AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-macie-customdataidentifier.html#cfn-macie-customdataidentifier-maximummatchdistance
+	MaximumMatchDistance *types.Value `json:"MaximumMatchDistance,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-macie-customdataidentifier.html#cfn-macie-customdataidentifier-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Regex AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-macie-customdataidentifier.html#cfn-macie-customdataidentifier-regex
+	Regex *types.Value `json:"Regex,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CustomDataIdentifier) AWSCloudFormationType() string {
+	return "AWS::Macie::CustomDataIdentifier"
+}
+
+// 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 CustomDataIdentifier) MarshalJSON() ([]byte, error) {
+	type Properties CustomDataIdentifier
+	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 *CustomDataIdentifier) UnmarshalJSON(b []byte) error {
+	type Properties CustomDataIdentifier
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CustomDataIdentifier(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/macie/aws-macie-findingsfilter.go b/goformation/cloudformation/macie/aws-macie-findingsfilter.go
new file mode 100644
index 0000000000..979d22241d
--- /dev/null
+++ b/goformation/cloudformation/macie/aws-macie-findingsfilter.go
@@ -0,0 +1,128 @@
+package macie
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FindingsFilter AWS CloudFormation Resource (AWS::Macie::FindingsFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-macie-findingsfilter.html
+type FindingsFilter struct {
+
+	// Action AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-macie-findingsfilter.html#cfn-macie-findingsfilter-action
+	Action *types.Value `json:"Action,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-macie-findingsfilter.html#cfn-macie-findingsfilter-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// FindingCriteria AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-macie-findingsfilter.html#cfn-macie-findingsfilter-findingcriteria
+	FindingCriteria *FindingsFilter_FindingCriteria `json:"FindingCriteria,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-macie-findingsfilter.html#cfn-macie-findingsfilter-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Position AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-macie-findingsfilter.html#cfn-macie-findingsfilter-position
+	Position *types.Value `json:"Position,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FindingsFilter) AWSCloudFormationType() string {
+	return "AWS::Macie::FindingsFilter"
+}
+
+// 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 FindingsFilter) MarshalJSON() ([]byte, error) {
+	type Properties FindingsFilter
+	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 *FindingsFilter) UnmarshalJSON(b []byte) error {
+	type Properties FindingsFilter
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FindingsFilter(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/macie/aws-macie-findingsfilter_criterion.go b/goformation/cloudformation/macie/aws-macie-findingsfilter_criterion.go
new file mode 100644
index 0000000000..3969afa58d
--- /dev/null
+++ b/goformation/cloudformation/macie/aws-macie-findingsfilter_criterion.go
@@ -0,0 +1,30 @@
+package macie
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// FindingsFilter_Criterion AWS CloudFormation Resource (AWS::Macie::FindingsFilter.Criterion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-macie-findingsfilter-criterion.html
+type FindingsFilter_Criterion struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FindingsFilter_Criterion) AWSCloudFormationType() string {
+	return "AWS::Macie::FindingsFilter.Criterion"
+}
diff --git a/goformation/cloudformation/macie/aws-macie-findingsfilter_findingcriteria.go b/goformation/cloudformation/macie/aws-macie-findingsfilter_findingcriteria.go
new file mode 100644
index 0000000000..5ce19439a3
--- /dev/null
+++ b/goformation/cloudformation/macie/aws-macie-findingsfilter_findingcriteria.go
@@ -0,0 +1,35 @@
+package macie
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// FindingsFilter_FindingCriteria AWS CloudFormation Resource (AWS::Macie::FindingsFilter.FindingCriteria)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-macie-findingsfilter-findingcriteria.html
+type FindingsFilter_FindingCriteria struct {
+
+	// Criterion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-macie-findingsfilter-findingcriteria.html#cfn-macie-findingsfilter-findingcriteria-criterion
+	Criterion *FindingsFilter_Criterion `json:"Criterion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FindingsFilter_FindingCriteria) AWSCloudFormationType() string {
+	return "AWS::Macie::FindingsFilter.FindingCriteria"
+}
diff --git a/goformation/cloudformation/macie/aws-macie-findingsfilter_findingsfilterlistitem.go b/goformation/cloudformation/macie/aws-macie-findingsfilter_findingsfilterlistitem.go
new file mode 100644
index 0000000000..68a1f9eb09
--- /dev/null
+++ b/goformation/cloudformation/macie/aws-macie-findingsfilter_findingsfilterlistitem.go
@@ -0,0 +1,42 @@
+package macie
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FindingsFilter_FindingsFilterListItem AWS CloudFormation Resource (AWS::Macie::FindingsFilter.FindingsFilterListItem)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-macie-findingsfilter-findingsfilterlistitem.html
+type FindingsFilter_FindingsFilterListItem struct {
+
+	// Id AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-macie-findingsfilter-findingsfilterlistitem.html#cfn-macie-findingsfilter-findingsfilterlistitem-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-macie-findingsfilter-findingsfilterlistitem.html#cfn-macie-findingsfilter-findingsfilterlistitem-name
+	Name *types.Value `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 *FindingsFilter_FindingsFilterListItem) AWSCloudFormationType() string {
+	return "AWS::Macie::FindingsFilter.FindingsFilterListItem"
+}
diff --git a/goformation/cloudformation/macie/aws-macie-session.go b/goformation/cloudformation/macie/aws-macie-session.go
new file mode 100644
index 0000000000..d7e2515cc7
--- /dev/null
+++ b/goformation/cloudformation/macie/aws-macie-session.go
@@ -0,0 +1,113 @@
+package macie
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Session AWS CloudFormation Resource (AWS::Macie::Session)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-macie-session.html
+type Session struct {
+
+	// FindingPublishingFrequency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-macie-session.html#cfn-macie-session-findingpublishingfrequency
+	FindingPublishingFrequency *types.Value `json:"FindingPublishingFrequency,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-macie-session.html#cfn-macie-session-status
+	Status *types.Value `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 *Session) AWSCloudFormationType() string {
+	return "AWS::Macie::Session"
+}
+
+// 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 Session) MarshalJSON() ([]byte, error) {
+	type Properties Session
+	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 *Session) UnmarshalJSON(b []byte) error {
+	type Properties Session
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Session(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/managedblockchain/aws-managedblockchain-member.go b/goformation/cloudformation/managedblockchain/aws-managedblockchain-member.go
new file mode 100644
index 0000000000..ec70a639d2
--- /dev/null
+++ b/goformation/cloudformation/managedblockchain/aws-managedblockchain-member.go
@@ -0,0 +1,123 @@
+package managedblockchain
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Member AWS CloudFormation Resource (AWS::ManagedBlockchain::Member)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-managedblockchain-member.html
+type Member struct {
+
+	// InvitationId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-managedblockchain-member.html#cfn-managedblockchain-member-invitationid
+	InvitationId *types.Value `json:"InvitationId,omitempty"`
+
+	// MemberConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-managedblockchain-member.html#cfn-managedblockchain-member-memberconfiguration
+	MemberConfiguration *Member_MemberConfiguration `json:"MemberConfiguration,omitempty"`
+
+	// NetworkConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-managedblockchain-member.html#cfn-managedblockchain-member-networkconfiguration
+	NetworkConfiguration *Member_NetworkConfiguration `json:"NetworkConfiguration,omitempty"`
+
+	// NetworkId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-managedblockchain-member.html#cfn-managedblockchain-member-networkid
+	NetworkId *types.Value `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 *Member) AWSCloudFormationType() string {
+	return "AWS::ManagedBlockchain::Member"
+}
+
+// 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 Member) MarshalJSON() ([]byte, error) {
+	type Properties Member
+	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 *Member) UnmarshalJSON(b []byte) error {
+	type Properties Member
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Member(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_approvalthresholdpolicy.go b/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_approvalthresholdpolicy.go
new file mode 100644
index 0000000000..2dcf656f1f
--- /dev/null
+++ b/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_approvalthresholdpolicy.go
@@ -0,0 +1,47 @@
+package managedblockchain
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Member_ApprovalThresholdPolicy AWS CloudFormation Resource (AWS::ManagedBlockchain::Member.ApprovalThresholdPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-approvalthresholdpolicy.html
+type Member_ApprovalThresholdPolicy struct {
+
+	// ProposalDurationInHours AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-approvalthresholdpolicy.html#cfn-managedblockchain-member-approvalthresholdpolicy-proposaldurationinhours
+	ProposalDurationInHours *types.Value `json:"ProposalDurationInHours,omitempty"`
+
+	// ThresholdComparator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-approvalthresholdpolicy.html#cfn-managedblockchain-member-approvalthresholdpolicy-thresholdcomparator
+	ThresholdComparator *types.Value `json:"ThresholdComparator,omitempty"`
+
+	// ThresholdPercentage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-approvalthresholdpolicy.html#cfn-managedblockchain-member-approvalthresholdpolicy-thresholdpercentage
+	ThresholdPercentage *types.Value `json:"ThresholdPercentage,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Member_ApprovalThresholdPolicy) AWSCloudFormationType() string {
+	return "AWS::ManagedBlockchain::Member.ApprovalThresholdPolicy"
+}
diff --git a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberconfiguration.go b/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberconfiguration.go
new file mode 100644
index 0000000000..b9957d1df2
--- /dev/null
+++ b/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberconfiguration.go
@@ -0,0 +1,47 @@
+package managedblockchain
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Member_MemberConfiguration AWS CloudFormation Resource (AWS::ManagedBlockchain::Member.MemberConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-memberconfiguration.html
+type Member_MemberConfiguration struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-memberconfiguration.html#cfn-managedblockchain-member-memberconfiguration-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// MemberFrameworkConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-memberconfiguration.html#cfn-managedblockchain-member-memberconfiguration-memberframeworkconfiguration
+	MemberFrameworkConfiguration *Member_MemberFrameworkConfiguration `json:"MemberFrameworkConfiguration,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-memberconfiguration.html#cfn-managedblockchain-member-memberconfiguration-name
+	Name *types.Value `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 *Member_MemberConfiguration) AWSCloudFormationType() string {
+	return "AWS::ManagedBlockchain::Member.MemberConfiguration"
+}
diff --git a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberfabricconfiguration.go b/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberfabricconfiguration.go
new file mode 100644
index 0000000000..cbe1d4b954
--- /dev/null
+++ b/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberfabricconfiguration.go
@@ -0,0 +1,42 @@
+package managedblockchain
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Member_MemberFabricConfiguration AWS CloudFormation Resource (AWS::ManagedBlockchain::Member.MemberFabricConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-memberfabricconfiguration.html
+type Member_MemberFabricConfiguration struct {
+
+	// AdminPassword AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-memberfabricconfiguration.html#cfn-managedblockchain-member-memberfabricconfiguration-adminpassword
+	AdminPassword *types.Value `json:"AdminPassword,omitempty"`
+
+	// AdminUsername AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-memberfabricconfiguration.html#cfn-managedblockchain-member-memberfabricconfiguration-adminusername
+	AdminUsername *types.Value `json:"AdminUsername,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Member_MemberFabricConfiguration) AWSCloudFormationType() string {
+	return "AWS::ManagedBlockchain::Member.MemberFabricConfiguration"
+}
diff --git a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberframeworkconfiguration.go b/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberframeworkconfiguration.go
new file mode 100644
index 0000000000..d9b6491f85
--- /dev/null
+++ b/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_memberframeworkconfiguration.go
@@ -0,0 +1,35 @@
+package managedblockchain
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Member_MemberFrameworkConfiguration AWS CloudFormation Resource (AWS::ManagedBlockchain::Member.MemberFrameworkConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-memberframeworkconfiguration.html
+type Member_MemberFrameworkConfiguration struct {
+
+	// MemberFabricConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-memberframeworkconfiguration.html#cfn-managedblockchain-member-memberframeworkconfiguration-memberfabricconfiguration
+	MemberFabricConfiguration *Member_MemberFabricConfiguration `json:"MemberFabricConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Member_MemberFrameworkConfiguration) AWSCloudFormationType() string {
+	return "AWS::ManagedBlockchain::Member.MemberFrameworkConfiguration"
+}
diff --git a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkconfiguration.go b/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkconfiguration.go
new file mode 100644
index 0000000000..aab6e7da8d
--- /dev/null
+++ b/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkconfiguration.go
@@ -0,0 +1,62 @@
+package managedblockchain
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Member_NetworkConfiguration AWS CloudFormation Resource (AWS::ManagedBlockchain::Member.NetworkConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-networkconfiguration.html
+type Member_NetworkConfiguration struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-networkconfiguration.html#cfn-managedblockchain-member-networkconfiguration-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Framework AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-networkconfiguration.html#cfn-managedblockchain-member-networkconfiguration-framework
+	Framework *types.Value `json:"Framework,omitempty"`
+
+	// FrameworkVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-networkconfiguration.html#cfn-managedblockchain-member-networkconfiguration-frameworkversion
+	FrameworkVersion *types.Value `json:"FrameworkVersion,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-networkconfiguration.html#cfn-managedblockchain-member-networkconfiguration-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// NetworkFrameworkConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-networkconfiguration.html#cfn-managedblockchain-member-networkconfiguration-networkframeworkconfiguration
+	NetworkFrameworkConfiguration *Member_NetworkFrameworkConfiguration `json:"NetworkFrameworkConfiguration,omitempty"`
+
+	// VotingPolicy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-networkconfiguration.html#cfn-managedblockchain-member-networkconfiguration-votingpolicy
+	VotingPolicy *Member_VotingPolicy `json:"VotingPolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Member_NetworkConfiguration) AWSCloudFormationType() string {
+	return "AWS::ManagedBlockchain::Member.NetworkConfiguration"
+}
diff --git a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkfabricconfiguration.go b/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkfabricconfiguration.go
new file mode 100644
index 0000000000..a09c4f7b33
--- /dev/null
+++ b/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkfabricconfiguration.go
@@ -0,0 +1,37 @@
+package managedblockchain
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Member_NetworkFabricConfiguration AWS CloudFormation Resource (AWS::ManagedBlockchain::Member.NetworkFabricConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-networkfabricconfiguration.html
+type Member_NetworkFabricConfiguration struct {
+
+	// Edition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-networkfabricconfiguration.html#cfn-managedblockchain-member-networkfabricconfiguration-edition
+	Edition *types.Value `json:"Edition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Member_NetworkFabricConfiguration) AWSCloudFormationType() string {
+	return "AWS::ManagedBlockchain::Member.NetworkFabricConfiguration"
+}
diff --git a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkframeworkconfiguration.go b/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkframeworkconfiguration.go
new file mode 100644
index 0000000000..48e011ab85
--- /dev/null
+++ b/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_networkframeworkconfiguration.go
@@ -0,0 +1,35 @@
+package managedblockchain
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Member_NetworkFrameworkConfiguration AWS CloudFormation Resource (AWS::ManagedBlockchain::Member.NetworkFrameworkConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-networkframeworkconfiguration.html
+type Member_NetworkFrameworkConfiguration struct {
+
+	// NetworkFabricConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-networkframeworkconfiguration.html#cfn-managedblockchain-member-networkframeworkconfiguration-networkfabricconfiguration
+	NetworkFabricConfiguration *Member_NetworkFabricConfiguration `json:"NetworkFabricConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Member_NetworkFrameworkConfiguration) AWSCloudFormationType() string {
+	return "AWS::ManagedBlockchain::Member.NetworkFrameworkConfiguration"
+}
diff --git a/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_votingpolicy.go b/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_votingpolicy.go
new file mode 100644
index 0000000000..d39c9e7339
--- /dev/null
+++ b/goformation/cloudformation/managedblockchain/aws-managedblockchain-member_votingpolicy.go
@@ -0,0 +1,35 @@
+package managedblockchain
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Member_VotingPolicy AWS CloudFormation Resource (AWS::ManagedBlockchain::Member.VotingPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-votingpolicy.html
+type Member_VotingPolicy struct {
+
+	// ApprovalThresholdPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-member-votingpolicy.html#cfn-managedblockchain-member-votingpolicy-approvalthresholdpolicy
+	ApprovalThresholdPolicy *Member_ApprovalThresholdPolicy `json:"ApprovalThresholdPolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Member_VotingPolicy) AWSCloudFormationType() string {
+	return "AWS::ManagedBlockchain::Member.VotingPolicy"
+}
diff --git a/goformation/cloudformation/managedblockchain/aws-managedblockchain-node.go b/goformation/cloudformation/managedblockchain/aws-managedblockchain-node.go
new file mode 100644
index 0000000000..68a7972076
--- /dev/null
+++ b/goformation/cloudformation/managedblockchain/aws-managedblockchain-node.go
@@ -0,0 +1,118 @@
+package managedblockchain
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Node AWS CloudFormation Resource (AWS::ManagedBlockchain::Node)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-managedblockchain-node.html
+type Node struct {
+
+	// MemberId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-managedblockchain-node.html#cfn-managedblockchain-node-memberid
+	MemberId *types.Value `json:"MemberId,omitempty"`
+
+	// NetworkId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-managedblockchain-node.html#cfn-managedblockchain-node-networkid
+	NetworkId *types.Value `json:"NetworkId,omitempty"`
+
+	// NodeConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-managedblockchain-node.html#cfn-managedblockchain-node-nodeconfiguration
+	NodeConfiguration *Node_NodeConfiguration `json:"NodeConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Node) AWSCloudFormationType() string {
+	return "AWS::ManagedBlockchain::Node"
+}
+
+// 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 Node) MarshalJSON() ([]byte, error) {
+	type Properties Node
+	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 *Node) UnmarshalJSON(b []byte) error {
+	type Properties Node
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Node(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/managedblockchain/aws-managedblockchain-node_nodeconfiguration.go b/goformation/cloudformation/managedblockchain/aws-managedblockchain-node_nodeconfiguration.go
new file mode 100644
index 0000000000..8b863eb04b
--- /dev/null
+++ b/goformation/cloudformation/managedblockchain/aws-managedblockchain-node_nodeconfiguration.go
@@ -0,0 +1,42 @@
+package managedblockchain
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Node_NodeConfiguration AWS CloudFormation Resource (AWS::ManagedBlockchain::Node.NodeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-node-nodeconfiguration.html
+type Node_NodeConfiguration struct {
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-node-nodeconfiguration.html#cfn-managedblockchain-node-nodeconfiguration-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-managedblockchain-node-nodeconfiguration.html#cfn-managedblockchain-node-nodeconfiguration-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Node_NodeConfiguration) AWSCloudFormationType() string {
+	return "AWS::ManagedBlockchain::Node.NodeConfiguration"
+}
diff --git a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow.go b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow.go
new file mode 100644
index 0000000000..4d7a7d48db
--- /dev/null
+++ b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow.go
@@ -0,0 +1,123 @@
+package mediaconnect
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow AWS CloudFormation Resource (AWS::MediaConnect::Flow)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flow.html
+type Flow struct {
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flow.html#cfn-mediaconnect-flow-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,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
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Source AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flow.html#cfn-mediaconnect-flow-source
+	Source *Flow_Source `json:"Source,omitempty"`
+
+	// SourceFailoverConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flow.html#cfn-mediaconnect-flow-sourcefailoverconfig
+	SourceFailoverConfig *Flow_FailoverConfig `json:"SourceFailoverConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::MediaConnect::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_encryption.go b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_encryption.go
new file mode 100644
index 0000000000..23f1957ac5
--- /dev/null
+++ b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_encryption.go
@@ -0,0 +1,77 @@
+package mediaconnect
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_Encryption AWS CloudFormation Resource (AWS::MediaConnect::Flow.Encryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-encryption.html
+type Flow_Encryption struct {
+
+	// Algorithm AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-encryption.html#cfn-mediaconnect-flow-encryption-algorithm
+	Algorithm *types.Value `json:"Algorithm,omitempty"`
+
+	// ConstantInitializationVector AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-encryption.html#cfn-mediaconnect-flow-encryption-constantinitializationvector
+	ConstantInitializationVector *types.Value `json:"ConstantInitializationVector,omitempty"`
+
+	// DeviceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-encryption.html#cfn-mediaconnect-flow-encryption-deviceid
+	DeviceId *types.Value `json:"DeviceId,omitempty"`
+
+	// KeyType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-encryption.html#cfn-mediaconnect-flow-encryption-keytype
+	KeyType *types.Value `json:"KeyType,omitempty"`
+
+	// Region AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-encryption.html#cfn-mediaconnect-flow-encryption-region
+	Region *types.Value `json:"Region,omitempty"`
+
+	// ResourceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-encryption.html#cfn-mediaconnect-flow-encryption-resourceid
+	ResourceId *types.Value `json:"ResourceId,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-encryption.html#cfn-mediaconnect-flow-encryption-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// SecretArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-encryption.html#cfn-mediaconnect-flow-encryption-secretarn
+	SecretArn *types.Value `json:"SecretArn,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-encryption.html#cfn-mediaconnect-flow-encryption-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Encryption) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::Flow.Encryption"
+}
diff --git a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_failoverconfig.go b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_failoverconfig.go
new file mode 100644
index 0000000000..784fc94214
--- /dev/null
+++ b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_failoverconfig.go
@@ -0,0 +1,42 @@
+package mediaconnect
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_FailoverConfig AWS CloudFormation Resource (AWS::MediaConnect::Flow.FailoverConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-failoverconfig.html
+type Flow_FailoverConfig struct {
+
+	// RecoveryWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-failoverconfig.html#cfn-mediaconnect-flow-failoverconfig-recoverywindow
+	RecoveryWindow *types.Value `json:"RecoveryWindow,omitempty"`
+
+	// State AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-failoverconfig.html#cfn-mediaconnect-flow-failoverconfig-state
+	State *types.Value `json:"State,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_FailoverConfig) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::Flow.FailoverConfig"
+}
diff --git a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_source.go b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_source.go
new file mode 100644
index 0000000000..a923343109
--- /dev/null
+++ b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flow_source.go
@@ -0,0 +1,107 @@
+package mediaconnect
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Flow_Source AWS CloudFormation Resource (AWS::MediaConnect::Flow.Source)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-source.html
+type Flow_Source struct {
+
+	// Decryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-source.html#cfn-mediaconnect-flow-source-decryption
+	Decryption *Flow_Encryption `json:"Decryption,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-source.html#cfn-mediaconnect-flow-source-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EntitlementArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-source.html#cfn-mediaconnect-flow-source-entitlementarn
+	EntitlementArn *types.Value `json:"EntitlementArn,omitempty"`
+
+	// IngestIp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-source.html#cfn-mediaconnect-flow-source-ingestip
+	IngestIp *types.Value `json:"IngestIp,omitempty"`
+
+	// IngestPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-source.html#cfn-mediaconnect-flow-source-ingestport
+	IngestPort *types.Value `json:"IngestPort,omitempty"`
+
+	// MaxBitrate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-source.html#cfn-mediaconnect-flow-source-maxbitrate
+	MaxBitrate *types.Value `json:"MaxBitrate,omitempty"`
+
+	// MaxLatency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-source.html#cfn-mediaconnect-flow-source-maxlatency
+	MaxLatency *types.Value `json:"MaxLatency,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
+	MinLatency *types.Value `json:"MinLatency,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-source.html#cfn-mediaconnect-flow-source-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-source.html#cfn-mediaconnect-flow-source-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// SourceArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-source.html#cfn-mediaconnect-flow-source-sourcearn
+	SourceArn *types.Value `json:"SourceArn,omitempty"`
+
+	// SourceIngestPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-source.html#cfn-mediaconnect-flow-source-sourceingestport
+	SourceIngestPort *types.Value `json:"SourceIngestPort,omitempty"`
+
+	// StreamId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-source.html#cfn-mediaconnect-flow-source-streamid
+	StreamId *types.Value `json:"StreamId,omitempty"`
+
+	// VpcInterfaceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-source.html#cfn-mediaconnect-flow-source-vpcinterfacename
+	VpcInterfaceName *types.Value `json:"VpcInterfaceName,omitempty"`
+
+	// WhitelistCidr AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flow-source.html#cfn-mediaconnect-flow-source-whitelistcidr
+	WhitelistCidr *types.Value `json:"WhitelistCidr,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Source) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::Flow.Source"
+}
diff --git a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement.go b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement.go
new file mode 100644
index 0000000000..ce348635a6
--- /dev/null
+++ b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement.go
@@ -0,0 +1,138 @@
+package mediaconnect
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FlowEntitlement AWS CloudFormation Resource (AWS::MediaConnect::FlowEntitlement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowentitlement.html
+type FlowEntitlement struct {
+
+	// DataTransferSubscriberFeePercent AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowentitlement.html#cfn-mediaconnect-flowentitlement-datatransfersubscriberfeepercent
+	DataTransferSubscriberFeePercent *types.Value `json:"DataTransferSubscriberFeePercent,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowentitlement.html#cfn-mediaconnect-flowentitlement-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Encryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowentitlement.html#cfn-mediaconnect-flowentitlement-encryption
+	Encryption *FlowEntitlement_Encryption `json:"Encryption,omitempty"`
+
+	// EntitlementStatus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowentitlement.html#cfn-mediaconnect-flowentitlement-entitlementstatus
+	EntitlementStatus *types.Value `json:"EntitlementStatus,omitempty"`
+
+	// FlowArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowentitlement.html#cfn-mediaconnect-flowentitlement-flowarn
+	FlowArn *types.Value `json:"FlowArn,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowentitlement.html#cfn-mediaconnect-flowentitlement-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Subscribers AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowentitlement.html#cfn-mediaconnect-flowentitlement-subscribers
+	Subscribers *types.Value `json:"Subscribers,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FlowEntitlement) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::FlowEntitlement"
+}
+
+// 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 FlowEntitlement) MarshalJSON() ([]byte, error) {
+	type Properties FlowEntitlement
+	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 *FlowEntitlement) UnmarshalJSON(b []byte) error {
+	type Properties FlowEntitlement
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FlowEntitlement(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement_encryption.go b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement_encryption.go
new file mode 100644
index 0000000000..b70a8260ce
--- /dev/null
+++ b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowentitlement_encryption.go
@@ -0,0 +1,77 @@
+package mediaconnect
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FlowEntitlement_Encryption AWS CloudFormation Resource (AWS::MediaConnect::FlowEntitlement.Encryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowentitlement-encryption.html
+type FlowEntitlement_Encryption struct {
+
+	// Algorithm AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowentitlement-encryption.html#cfn-mediaconnect-flowentitlement-encryption-algorithm
+	Algorithm *types.Value `json:"Algorithm,omitempty"`
+
+	// ConstantInitializationVector AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowentitlement-encryption.html#cfn-mediaconnect-flowentitlement-encryption-constantinitializationvector
+	ConstantInitializationVector *types.Value `json:"ConstantInitializationVector,omitempty"`
+
+	// DeviceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowentitlement-encryption.html#cfn-mediaconnect-flowentitlement-encryption-deviceid
+	DeviceId *types.Value `json:"DeviceId,omitempty"`
+
+	// KeyType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowentitlement-encryption.html#cfn-mediaconnect-flowentitlement-encryption-keytype
+	KeyType *types.Value `json:"KeyType,omitempty"`
+
+	// Region AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowentitlement-encryption.html#cfn-mediaconnect-flowentitlement-encryption-region
+	Region *types.Value `json:"Region,omitempty"`
+
+	// ResourceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowentitlement-encryption.html#cfn-mediaconnect-flowentitlement-encryption-resourceid
+	ResourceId *types.Value `json:"ResourceId,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowentitlement-encryption.html#cfn-mediaconnect-flowentitlement-encryption-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// SecretArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowentitlement-encryption.html#cfn-mediaconnect-flowentitlement-encryption-secretarn
+	SecretArn *types.Value `json:"SecretArn,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowentitlement-encryption.html#cfn-mediaconnect-flowentitlement-encryption-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FlowEntitlement_Encryption) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::FlowEntitlement.Encryption"
+}
diff --git a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput.go b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput.go
new file mode 100644
index 0000000000..c7494e1c1a
--- /dev/null
+++ b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput.go
@@ -0,0 +1,173 @@
+package mediaconnect
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FlowOutput AWS CloudFormation Resource (AWS::MediaConnect::FlowOutput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowoutput.html
+type FlowOutput struct {
+
+	// CidrAllowList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowoutput.html#cfn-mediaconnect-flowoutput-cidrallowlist
+	CidrAllowList *types.Value `json:"CidrAllowList,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowoutput.html#cfn-mediaconnect-flowoutput-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Destination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowoutput.html#cfn-mediaconnect-flowoutput-destination
+	Destination *types.Value `json:"Destination,omitempty"`
+
+	// Encryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowoutput.html#cfn-mediaconnect-flowoutput-encryption
+	Encryption *FlowOutput_Encryption `json:"Encryption,omitempty"`
+
+	// FlowArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowoutput.html#cfn-mediaconnect-flowoutput-flowarn
+	FlowArn *types.Value `json:"FlowArn,omitempty"`
+
+	// MaxLatency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowoutput.html#cfn-mediaconnect-flowoutput-maxlatency
+	MaxLatency *types.Value `json:"MaxLatency,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
+	MinLatency *types.Value `json:"MinLatency,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowoutput.html#cfn-mediaconnect-flowoutput-name
+	Name *types.Value `json:"Name,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
+	Port *types.Value `json:"Port,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowoutput.html#cfn-mediaconnect-flowoutput-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// RemoteId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowoutput.html#cfn-mediaconnect-flowoutput-remoteid
+	RemoteId *types.Value `json:"RemoteId,omitempty"`
+
+	// SmoothingLatency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowoutput.html#cfn-mediaconnect-flowoutput-smoothinglatency
+	SmoothingLatency *types.Value `json:"SmoothingLatency,omitempty"`
+
+	// StreamId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowoutput.html#cfn-mediaconnect-flowoutput-streamid
+	StreamId *types.Value `json:"StreamId,omitempty"`
+
+	// VpcInterfaceAttachment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowoutput.html#cfn-mediaconnect-flowoutput-vpcinterfaceattachment
+	VpcInterfaceAttachment *FlowOutput_VpcInterfaceAttachment `json:"VpcInterfaceAttachment,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::FlowOutput"
+}
+
+// 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 FlowOutput) MarshalJSON() ([]byte, error) {
+	type Properties FlowOutput
+	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 *FlowOutput) UnmarshalJSON(b []byte) error {
+	type Properties FlowOutput
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FlowOutput(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_encryption.go b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_encryption.go
new file mode 100644
index 0000000000..111f64f4b9
--- /dev/null
+++ b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_encryption.go
@@ -0,0 +1,52 @@
+package mediaconnect
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FlowOutput_Encryption AWS CloudFormation Resource (AWS::MediaConnect::FlowOutput.Encryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-encryption.html
+type FlowOutput_Encryption struct {
+
+	// Algorithm AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-encryption.html#cfn-mediaconnect-flowoutput-encryption-algorithm
+	Algorithm *types.Value `json:"Algorithm,omitempty"`
+
+	// KeyType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-encryption.html#cfn-mediaconnect-flowoutput-encryption-keytype
+	KeyType *types.Value `json:"KeyType,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-encryption.html#cfn-mediaconnect-flowoutput-encryption-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// SecretArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-encryption.html#cfn-mediaconnect-flowoutput-encryption-secretarn
+	SecretArn *types.Value `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 *FlowOutput_Encryption) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::FlowOutput.Encryption"
+}
diff --git a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_vpcinterfaceattachment.go b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_vpcinterfaceattachment.go
new file mode 100644
index 0000000000..14305a54d3
--- /dev/null
+++ b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowoutput_vpcinterfaceattachment.go
@@ -0,0 +1,37 @@
+package mediaconnect
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FlowOutput_VpcInterfaceAttachment AWS CloudFormation Resource (AWS::MediaConnect::FlowOutput.VpcInterfaceAttachment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-vpcinterfaceattachment.html
+type FlowOutput_VpcInterfaceAttachment struct {
+
+	// VpcInterfaceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowoutput-vpcinterfaceattachment.html#cfn-mediaconnect-flowoutput-vpcinterfaceattachment-vpcinterfacename
+	VpcInterfaceName *types.Value `json:"VpcInterfaceName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_VpcInterfaceAttachment) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::FlowOutput.VpcInterfaceAttachment"
+}
diff --git a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowsource.go b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowsource.go
new file mode 100644
index 0000000000..ed5d9bb375
--- /dev/null
+++ b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowsource.go
@@ -0,0 +1,163 @@
+package mediaconnect
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FlowSource AWS CloudFormation Resource (AWS::MediaConnect::FlowSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowsource.html
+type FlowSource struct {
+
+	// Decryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowsource.html#cfn-mediaconnect-flowsource-decryption
+	Decryption *FlowSource_Encryption `json:"Decryption,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowsource.html#cfn-mediaconnect-flowsource-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EntitlementArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowsource.html#cfn-mediaconnect-flowsource-entitlementarn
+	EntitlementArn *types.Value `json:"EntitlementArn,omitempty"`
+
+	// FlowArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowsource.html#cfn-mediaconnect-flowsource-flowarn
+	FlowArn *types.Value `json:"FlowArn,omitempty"`
+
+	// IngestPort AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowsource.html#cfn-mediaconnect-flowsource-ingestport
+	IngestPort *types.Value `json:"IngestPort,omitempty"`
+
+	// MaxBitrate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowsource.html#cfn-mediaconnect-flowsource-maxbitrate
+	MaxBitrate *types.Value `json:"MaxBitrate,omitempty"`
+
+	// MaxLatency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowsource.html#cfn-mediaconnect-flowsource-maxlatency
+	MaxLatency *types.Value `json:"MaxLatency,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowsource.html#cfn-mediaconnect-flowsource-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowsource.html#cfn-mediaconnect-flowsource-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// StreamId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowsource.html#cfn-mediaconnect-flowsource-streamid
+	StreamId *types.Value `json:"StreamId,omitempty"`
+
+	// VpcInterfaceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowsource.html#cfn-mediaconnect-flowsource-vpcinterfacename
+	VpcInterfaceName *types.Value `json:"VpcInterfaceName,omitempty"`
+
+	// WhitelistCidr AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowsource.html#cfn-mediaconnect-flowsource-whitelistcidr
+	WhitelistCidr *types.Value `json:"WhitelistCidr,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FlowSource) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::FlowSource"
+}
+
+// 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 FlowSource) MarshalJSON() ([]byte, error) {
+	type Properties FlowSource
+	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 *FlowSource) UnmarshalJSON(b []byte) error {
+	type Properties FlowSource
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FlowSource(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowsource_encryption.go b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowsource_encryption.go
new file mode 100644
index 0000000000..759f7d91fe
--- /dev/null
+++ b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowsource_encryption.go
@@ -0,0 +1,77 @@
+package mediaconnect
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FlowSource_Encryption AWS CloudFormation Resource (AWS::MediaConnect::FlowSource.Encryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowsource-encryption.html
+type FlowSource_Encryption struct {
+
+	// Algorithm AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowsource-encryption.html#cfn-mediaconnect-flowsource-encryption-algorithm
+	Algorithm *types.Value `json:"Algorithm,omitempty"`
+
+	// ConstantInitializationVector AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowsource-encryption.html#cfn-mediaconnect-flowsource-encryption-constantinitializationvector
+	ConstantInitializationVector *types.Value `json:"ConstantInitializationVector,omitempty"`
+
+	// DeviceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowsource-encryption.html#cfn-mediaconnect-flowsource-encryption-deviceid
+	DeviceId *types.Value `json:"DeviceId,omitempty"`
+
+	// KeyType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowsource-encryption.html#cfn-mediaconnect-flowsource-encryption-keytype
+	KeyType *types.Value `json:"KeyType,omitempty"`
+
+	// Region AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowsource-encryption.html#cfn-mediaconnect-flowsource-encryption-region
+	Region *types.Value `json:"Region,omitempty"`
+
+	// ResourceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowsource-encryption.html#cfn-mediaconnect-flowsource-encryption-resourceid
+	ResourceId *types.Value `json:"ResourceId,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowsource-encryption.html#cfn-mediaconnect-flowsource-encryption-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// SecretArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowsource-encryption.html#cfn-mediaconnect-flowsource-encryption-secretarn
+	SecretArn *types.Value `json:"SecretArn,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconnect-flowsource-encryption.html#cfn-mediaconnect-flowsource-encryption-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FlowSource_Encryption) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::FlowSource.Encryption"
+}
diff --git a/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowvpcinterface.go b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowvpcinterface.go
new file mode 100644
index 0000000000..5ada12b3da
--- /dev/null
+++ b/goformation/cloudformation/mediaconnect/aws-mediaconnect-flowvpcinterface.go
@@ -0,0 +1,128 @@
+package mediaconnect
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FlowVpcInterface AWS CloudFormation Resource (AWS::MediaConnect::FlowVpcInterface)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowvpcinterface.html
+type FlowVpcInterface struct {
+
+	// FlowArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowvpcinterface.html#cfn-mediaconnect-flowvpcinterface-flowarn
+	FlowArn *types.Value `json:"FlowArn,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowvpcinterface.html#cfn-mediaconnect-flowvpcinterface-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowvpcinterface.html#cfn-mediaconnect-flowvpcinterface-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowvpcinterface.html#cfn-mediaconnect-flowvpcinterface-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconnect-flowvpcinterface.html#cfn-mediaconnect-flowvpcinterface-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FlowVpcInterface) AWSCloudFormationType() string {
+	return "AWS::MediaConnect::FlowVpcInterface"
+}
+
+// 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 FlowVpcInterface) MarshalJSON() ([]byte, error) {
+	type Properties FlowVpcInterface
+	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 *FlowVpcInterface) UnmarshalJSON(b []byte) error {
+	type Properties FlowVpcInterface
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FlowVpcInterface(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate.go b/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate.go
new file mode 100644
index 0000000000..c0a22d6314
--- /dev/null
+++ b/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate.go
@@ -0,0 +1,153 @@
+package mediaconvert
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobTemplate AWS CloudFormation Resource (AWS::MediaConvert::JobTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-jobtemplate.html
+type JobTemplate struct {
+
+	// AccelerationSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-jobtemplate.html#cfn-mediaconvert-jobtemplate-accelerationsettings
+	AccelerationSettings *JobTemplate_AccelerationSettings `json:"AccelerationSettings,omitempty"`
+
+	// Category AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-jobtemplate.html#cfn-mediaconvert-jobtemplate-category
+	Category *types.Value `json:"Category,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-jobtemplate.html#cfn-mediaconvert-jobtemplate-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// HopDestinations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-jobtemplate.html#cfn-mediaconvert-jobtemplate-hopdestinations
+	HopDestinations []JobTemplate_HopDestination `json:"HopDestinations,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-jobtemplate.html#cfn-mediaconvert-jobtemplate-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Priority AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-jobtemplate.html#cfn-mediaconvert-jobtemplate-priority
+	Priority *types.Value `json:"Priority,omitempty"`
+
+	// Queue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-jobtemplate.html#cfn-mediaconvert-jobtemplate-queue
+	Queue *types.Value `json:"Queue,omitempty"`
+
+	// SettingsJson AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-jobtemplate.html#cfn-mediaconvert-jobtemplate-settingsjson
+	SettingsJson interface{} `json:"SettingsJson,omitempty"`
+
+	// StatusUpdateInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-jobtemplate.html#cfn-mediaconvert-jobtemplate-statusupdateinterval
+	StatusUpdateInterval *types.Value `json:"StatusUpdateInterval,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-jobtemplate.html#cfn-mediaconvert-jobtemplate-tags
+	Tags interface{} `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 *JobTemplate) AWSCloudFormationType() string {
+	return "AWS::MediaConvert::JobTemplate"
+}
+
+// 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 JobTemplate) MarshalJSON() ([]byte, error) {
+	type Properties JobTemplate
+	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 *JobTemplate) UnmarshalJSON(b []byte) error {
+	type Properties JobTemplate
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = JobTemplate(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_accelerationsettings.go b/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_accelerationsettings.go
new file mode 100644
index 0000000000..c180cf29ff
--- /dev/null
+++ b/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_accelerationsettings.go
@@ -0,0 +1,37 @@
+package mediaconvert
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobTemplate_AccelerationSettings AWS CloudFormation Resource (AWS::MediaConvert::JobTemplate.AccelerationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconvert-jobtemplate-accelerationsettings.html
+type JobTemplate_AccelerationSettings struct {
+
+	// Mode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconvert-jobtemplate-accelerationsettings.html#cfn-mediaconvert-jobtemplate-accelerationsettings-mode
+	Mode *types.Value `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 *JobTemplate_AccelerationSettings) AWSCloudFormationType() string {
+	return "AWS::MediaConvert::JobTemplate.AccelerationSettings"
+}
diff --git a/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_hopdestination.go b/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_hopdestination.go
new file mode 100644
index 0000000000..847983f115
--- /dev/null
+++ b/goformation/cloudformation/mediaconvert/aws-mediaconvert-jobtemplate_hopdestination.go
@@ -0,0 +1,47 @@
+package mediaconvert
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// JobTemplate_HopDestination AWS CloudFormation Resource (AWS::MediaConvert::JobTemplate.HopDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconvert-jobtemplate-hopdestination.html
+type JobTemplate_HopDestination struct {
+
+	// Priority AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconvert-jobtemplate-hopdestination.html#cfn-mediaconvert-jobtemplate-hopdestination-priority
+	Priority *types.Value `json:"Priority,omitempty"`
+
+	// Queue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconvert-jobtemplate-hopdestination.html#cfn-mediaconvert-jobtemplate-hopdestination-queue
+	Queue *types.Value `json:"Queue,omitempty"`
+
+	// WaitMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediaconvert-jobtemplate-hopdestination.html#cfn-mediaconvert-jobtemplate-hopdestination-waitminutes
+	WaitMinutes *types.Value `json:"WaitMinutes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *JobTemplate_HopDestination) AWSCloudFormationType() string {
+	return "AWS::MediaConvert::JobTemplate.HopDestination"
+}
diff --git a/goformation/cloudformation/mediaconvert/aws-mediaconvert-preset.go b/goformation/cloudformation/mediaconvert/aws-mediaconvert-preset.go
new file mode 100644
index 0000000000..3aca79adbb
--- /dev/null
+++ b/goformation/cloudformation/mediaconvert/aws-mediaconvert-preset.go
@@ -0,0 +1,128 @@
+package mediaconvert
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Preset AWS CloudFormation Resource (AWS::MediaConvert::Preset)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-preset.html
+type Preset struct {
+
+	// Category AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-preset.html#cfn-mediaconvert-preset-category
+	Category *types.Value `json:"Category,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-preset.html#cfn-mediaconvert-preset-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-preset.html#cfn-mediaconvert-preset-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SettingsJson AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-preset.html#cfn-mediaconvert-preset-settingsjson
+	SettingsJson interface{} `json:"SettingsJson,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-preset.html#cfn-mediaconvert-preset-tags
+	Tags interface{} `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 *Preset) AWSCloudFormationType() string {
+	return "AWS::MediaConvert::Preset"
+}
+
+// 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 Preset) MarshalJSON() ([]byte, error) {
+	type Properties Preset
+	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 *Preset) UnmarshalJSON(b []byte) error {
+	type Properties Preset
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Preset(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/mediaconvert/aws-mediaconvert-queue.go b/goformation/cloudformation/mediaconvert/aws-mediaconvert-queue.go
new file mode 100644
index 0000000000..c33b4f1d99
--- /dev/null
+++ b/goformation/cloudformation/mediaconvert/aws-mediaconvert-queue.go
@@ -0,0 +1,128 @@
+package mediaconvert
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Queue AWS CloudFormation Resource (AWS::MediaConvert::Queue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-queue.html
+type Queue struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-queue.html#cfn-mediaconvert-queue-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-queue.html#cfn-mediaconvert-queue-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// PricingPlan AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-queue.html#cfn-mediaconvert-queue-pricingplan
+	PricingPlan *types.Value `json:"PricingPlan,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-queue.html#cfn-mediaconvert-queue-status
+	Status *types.Value `json:"Status,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediaconvert-queue.html#cfn-mediaconvert-queue-tags
+	Tags interface{} `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 *Queue) AWSCloudFormationType() string {
+	return "AWS::MediaConvert::Queue"
+}
+
+// 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 Queue) MarshalJSON() ([]byte, error) {
+	type Properties Queue
+	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 *Queue) UnmarshalJSON(b []byte) error {
+	type Properties Queue
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Queue(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/medialive/aws-medialive-channel.go b/goformation/cloudformation/medialive/aws-medialive-channel.go
new file mode 100644
index 0000000000..332e3c4689
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel.go
@@ -0,0 +1,158 @@
+package medialive
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel AWS CloudFormation Resource (AWS::MediaLive::Channel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-channel.html
+type Channel struct {
+
+	// CdiInputSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-channel.html#cfn-medialive-channel-cdiinputspecification
+	CdiInputSpecification *Channel_CdiInputSpecification `json:"CdiInputSpecification,omitempty"`
+
+	// ChannelClass AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-channel.html#cfn-medialive-channel-channelclass
+	ChannelClass *types.Value `json:"ChannelClass,omitempty"`
+
+	// Destinations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-channel.html#cfn-medialive-channel-destinations
+	Destinations []Channel_OutputDestination `json:"Destinations,omitempty"`
+
+	// EncoderSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-channel.html#cfn-medialive-channel-encodersettings
+	EncoderSettings *Channel_EncoderSettings `json:"EncoderSettings,omitempty"`
+
+	// InputAttachments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-channel.html#cfn-medialive-channel-inputattachments
+	InputAttachments []Channel_InputAttachment `json:"InputAttachments,omitempty"`
+
+	// InputSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-channel.html#cfn-medialive-channel-inputspecification
+	InputSpecification *Channel_InputSpecification `json:"InputSpecification,omitempty"`
+
+	// LogLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-channel.html#cfn-medialive-channel-loglevel
+	LogLevel *types.Value `json:"LogLevel,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-channel.html#cfn-medialive-channel-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-channel.html#cfn-medialive-channel-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-channel.html#cfn-medialive-channel-tags
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// Vpc AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-channel.html#cfn-medialive-channel-vpc
+	Vpc *Channel_VpcOutputSettings `json:"Vpc,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel"
+}
+
+// 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 Channel) MarshalJSON() ([]byte, error) {
+	type Properties Channel
+	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 *Channel) UnmarshalJSON(b []byte) error {
+	type Properties Channel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Channel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/medialive/aws-medialive-channel_aacsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_aacsettings.go
new file mode 100644
index 0000000000..8201015d06
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_aacsettings.go
@@ -0,0 +1,77 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AacSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AacSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-aacsettings.html
+type Channel_AacSettings struct {
+
+	// Bitrate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-aacsettings.html#cfn-medialive-channel-aacsettings-bitrate
+	Bitrate *types.Value `json:"Bitrate,omitempty"`
+
+	// CodingMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-aacsettings.html#cfn-medialive-channel-aacsettings-codingmode
+	CodingMode *types.Value `json:"CodingMode,omitempty"`
+
+	// InputType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-aacsettings.html#cfn-medialive-channel-aacsettings-inputtype
+	InputType *types.Value `json:"InputType,omitempty"`
+
+	// Profile AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-aacsettings.html#cfn-medialive-channel-aacsettings-profile
+	Profile *types.Value `json:"Profile,omitempty"`
+
+	// RateControlMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-aacsettings.html#cfn-medialive-channel-aacsettings-ratecontrolmode
+	RateControlMode *types.Value `json:"RateControlMode,omitempty"`
+
+	// RawFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-aacsettings.html#cfn-medialive-channel-aacsettings-rawformat
+	RawFormat *types.Value `json:"RawFormat,omitempty"`
+
+	// SampleRate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-aacsettings.html#cfn-medialive-channel-aacsettings-samplerate
+	SampleRate *types.Value `json:"SampleRate,omitempty"`
+
+	// Spec AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-aacsettings.html#cfn-medialive-channel-aacsettings-spec
+	Spec *types.Value `json:"Spec,omitempty"`
+
+	// VbrQuality AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-aacsettings.html#cfn-medialive-channel-aacsettings-vbrquality
+	VbrQuality *types.Value `json:"VbrQuality,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AacSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AacSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_ac3settings.go b/goformation/cloudformation/medialive/aws-medialive-channel_ac3settings.go
new file mode 100644
index 0000000000..93826b2c9a
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_ac3settings.go
@@ -0,0 +1,67 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_Ac3Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.Ac3Settings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-ac3settings.html
+type Channel_Ac3Settings struct {
+
+	// Bitrate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-ac3settings.html#cfn-medialive-channel-ac3settings-bitrate
+	Bitrate *types.Value `json:"Bitrate,omitempty"`
+
+	// BitstreamMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-ac3settings.html#cfn-medialive-channel-ac3settings-bitstreammode
+	BitstreamMode *types.Value `json:"BitstreamMode,omitempty"`
+
+	// CodingMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-ac3settings.html#cfn-medialive-channel-ac3settings-codingmode
+	CodingMode *types.Value `json:"CodingMode,omitempty"`
+
+	// Dialnorm AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-ac3settings.html#cfn-medialive-channel-ac3settings-dialnorm
+	Dialnorm *types.Value `json:"Dialnorm,omitempty"`
+
+	// DrcProfile AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-ac3settings.html#cfn-medialive-channel-ac3settings-drcprofile
+	DrcProfile *types.Value `json:"DrcProfile,omitempty"`
+
+	// LfeFilter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-ac3settings.html#cfn-medialive-channel-ac3settings-lfefilter
+	LfeFilter *types.Value `json:"LfeFilter,omitempty"`
+
+	// MetadataControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-ac3settings.html#cfn-medialive-channel-ac3settings-metadatacontrol
+	MetadataControl *types.Value `json:"MetadataControl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_Ac3Settings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.Ac3Settings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_ancillarysourcesettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_ancillarysourcesettings.go
new file mode 100644
index 0000000000..6979aa3e0c
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_ancillarysourcesettings.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AncillarySourceSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AncillarySourceSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-ancillarysourcesettings.html
+type Channel_AncillarySourceSettings struct {
+
+	// SourceAncillaryChannelNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-ancillarysourcesettings.html#cfn-medialive-channel-ancillarysourcesettings-sourceancillarychannelnumber
+	SourceAncillaryChannelNumber *types.Value `json:"SourceAncillaryChannelNumber,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AncillarySourceSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AncillarySourceSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_archivecdnsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_archivecdnsettings.go
new file mode 100644
index 0000000000..04a354a981
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_archivecdnsettings.go
@@ -0,0 +1,35 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_ArchiveCdnSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.ArchiveCdnSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-archivecdnsettings.html
+type Channel_ArchiveCdnSettings struct {
+
+	// ArchiveS3Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-archivecdnsettings.html#cfn-medialive-channel-archivecdnsettings-archives3settings
+	ArchiveS3Settings *Channel_ArchiveS3Settings `json:"ArchiveS3Settings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_ArchiveCdnSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.ArchiveCdnSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_archivecontainersettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_archivecontainersettings.go
new file mode 100644
index 0000000000..2b13bd6ee4
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_archivecontainersettings.go
@@ -0,0 +1,40 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_ArchiveContainerSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.ArchiveContainerSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-archivecontainersettings.html
+type Channel_ArchiveContainerSettings struct {
+
+	// M2tsSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-archivecontainersettings.html#cfn-medialive-channel-archivecontainersettings-m2tssettings
+	M2tsSettings *Channel_M2tsSettings `json:"M2tsSettings,omitempty"`
+
+	// RawSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-archivecontainersettings.html#cfn-medialive-channel-archivecontainersettings-rawsettings
+	RawSettings *Channel_RawSettings `json:"RawSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_ArchiveContainerSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.ArchiveContainerSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_archivegroupsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_archivegroupsettings.go
new file mode 100644
index 0000000000..620b6f8de5
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_archivegroupsettings.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_ArchiveGroupSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.ArchiveGroupSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-archivegroupsettings.html
+type Channel_ArchiveGroupSettings struct {
+
+	// ArchiveCdnSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-archivegroupsettings.html#cfn-medialive-channel-archivegroupsettings-archivecdnsettings
+	ArchiveCdnSettings *Channel_ArchiveCdnSettings `json:"ArchiveCdnSettings,omitempty"`
+
+	// Destination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-archivegroupsettings.html#cfn-medialive-channel-archivegroupsettings-destination
+	Destination *Channel_OutputLocationRef `json:"Destination,omitempty"`
+
+	// RolloverInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-archivegroupsettings.html#cfn-medialive-channel-archivegroupsettings-rolloverinterval
+	RolloverInterval *types.Value `json:"RolloverInterval,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_ArchiveGroupSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.ArchiveGroupSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_archiveoutputsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_archiveoutputsettings.go
new file mode 100644
index 0000000000..63ddec1dee
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_archiveoutputsettings.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_ArchiveOutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.ArchiveOutputSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-archiveoutputsettings.html
+type Channel_ArchiveOutputSettings struct {
+
+	// ContainerSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-archiveoutputsettings.html#cfn-medialive-channel-archiveoutputsettings-containersettings
+	ContainerSettings *Channel_ArchiveContainerSettings `json:"ContainerSettings,omitempty"`
+
+	// Extension AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-archiveoutputsettings.html#cfn-medialive-channel-archiveoutputsettings-extension
+	Extension *types.Value `json:"Extension,omitempty"`
+
+	// NameModifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-archiveoutputsettings.html#cfn-medialive-channel-archiveoutputsettings-namemodifier
+	NameModifier *types.Value `json:"NameModifier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_ArchiveOutputSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.ArchiveOutputSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_archives3settings.go b/goformation/cloudformation/medialive/aws-medialive-channel_archives3settings.go
new file mode 100644
index 0000000000..ae1989aebd
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_archives3settings.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_ArchiveS3Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.ArchiveS3Settings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-archives3settings.html
+type Channel_ArchiveS3Settings struct {
+
+	// CannedAcl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-archives3settings.html#cfn-medialive-channel-archives3settings-cannedacl
+	CannedAcl *types.Value `json:"CannedAcl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_ArchiveS3Settings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.ArchiveS3Settings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_aribdestinationsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_aribdestinationsettings.go
new file mode 100644
index 0000000000..6aaf2b17dc
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_aribdestinationsettings.go
@@ -0,0 +1,30 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AribDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AribDestinationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-aribdestinationsettings.html
+type Channel_AribDestinationSettings struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AribDestinationSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AribDestinationSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_aribsourcesettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_aribsourcesettings.go
new file mode 100644
index 0000000000..26a1407af3
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_aribsourcesettings.go
@@ -0,0 +1,30 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AribSourceSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AribSourceSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-aribsourcesettings.html
+type Channel_AribSourceSettings struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AribSourceSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AribSourceSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audiochannelmapping.go b/goformation/cloudformation/medialive/aws-medialive-channel_audiochannelmapping.go
new file mode 100644
index 0000000000..89356fb0a5
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_audiochannelmapping.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AudioChannelMapping AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioChannelMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiochannelmapping.html
+type Channel_AudioChannelMapping struct {
+
+	// InputChannelLevels AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiochannelmapping.html#cfn-medialive-channel-audiochannelmapping-inputchannellevels
+	InputChannelLevels []Channel_InputChannelLevel `json:"InputChannelLevels,omitempty"`
+
+	// OutputChannel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiochannelmapping.html#cfn-medialive-channel-audiochannelmapping-outputchannel
+	OutputChannel *types.Value `json:"OutputChannel,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AudioChannelMapping) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AudioChannelMapping"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audiocodecsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_audiocodecsettings.go
new file mode 100644
index 0000000000..993d32db59
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_audiocodecsettings.go
@@ -0,0 +1,60 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AudioCodecSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioCodecSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiocodecsettings.html
+type Channel_AudioCodecSettings struct {
+
+	// AacSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiocodecsettings.html#cfn-medialive-channel-audiocodecsettings-aacsettings
+	AacSettings *Channel_AacSettings `json:"AacSettings,omitempty"`
+
+	// Ac3Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiocodecsettings.html#cfn-medialive-channel-audiocodecsettings-ac3settings
+	Ac3Settings *Channel_Ac3Settings `json:"Ac3Settings,omitempty"`
+
+	// Eac3Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiocodecsettings.html#cfn-medialive-channel-audiocodecsettings-eac3settings
+	Eac3Settings *Channel_Eac3Settings `json:"Eac3Settings,omitempty"`
+
+	// Mp2Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiocodecsettings.html#cfn-medialive-channel-audiocodecsettings-mp2settings
+	Mp2Settings *Channel_Mp2Settings `json:"Mp2Settings,omitempty"`
+
+	// PassThroughSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiocodecsettings.html#cfn-medialive-channel-audiocodecsettings-passthroughsettings
+	PassThroughSettings *Channel_PassThroughSettings `json:"PassThroughSettings,omitempty"`
+
+	// WavSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiocodecsettings.html#cfn-medialive-channel-audiocodecsettings-wavsettings
+	WavSettings *Channel_WavSettings `json:"WavSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AudioCodecSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AudioCodecSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audiodescription.go b/goformation/cloudformation/medialive/aws-medialive-channel_audiodescription.go
new file mode 100644
index 0000000000..c84e325012
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_audiodescription.go
@@ -0,0 +1,87 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AudioDescription AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioDescription)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiodescription.html
+type Channel_AudioDescription struct {
+
+	// AudioNormalizationSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiodescription.html#cfn-medialive-channel-audiodescription-audionormalizationsettings
+	AudioNormalizationSettings *Channel_AudioNormalizationSettings `json:"AudioNormalizationSettings,omitempty"`
+
+	// AudioSelectorName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiodescription.html#cfn-medialive-channel-audiodescription-audioselectorname
+	AudioSelectorName *types.Value `json:"AudioSelectorName,omitempty"`
+
+	// AudioType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiodescription.html#cfn-medialive-channel-audiodescription-audiotype
+	AudioType *types.Value `json:"AudioType,omitempty"`
+
+	// AudioTypeControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiodescription.html#cfn-medialive-channel-audiodescription-audiotypecontrol
+	AudioTypeControl *types.Value `json:"AudioTypeControl,omitempty"`
+
+	// AudioWatermarkingSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiodescription.html#cfn-medialive-channel-audiodescription-audiowatermarkingsettings
+	AudioWatermarkingSettings *Channel_AudioWatermarkSettings `json:"AudioWatermarkingSettings,omitempty"`
+
+	// CodecSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiodescription.html#cfn-medialive-channel-audiodescription-codecsettings
+	CodecSettings *Channel_AudioCodecSettings `json:"CodecSettings,omitempty"`
+
+	// LanguageCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiodescription.html#cfn-medialive-channel-audiodescription-languagecode
+	LanguageCode *types.Value `json:"LanguageCode,omitempty"`
+
+	// LanguageCodeControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiodescription.html#cfn-medialive-channel-audiodescription-languagecodecontrol
+	LanguageCodeControl *types.Value `json:"LanguageCodeControl,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiodescription.html#cfn-medialive-channel-audiodescription-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RemixSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiodescription.html#cfn-medialive-channel-audiodescription-remixsettings
+	RemixSettings *Channel_RemixSettings `json:"RemixSettings,omitempty"`
+
+	// StreamName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiodescription.html#cfn-medialive-channel-audiodescription-streamname
+	StreamName *types.Value `json:"StreamName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AudioDescription) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AudioDescription"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audiohlsrenditionselection.go b/goformation/cloudformation/medialive/aws-medialive-channel_audiohlsrenditionselection.go
new file mode 100644
index 0000000000..c095b6c928
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_audiohlsrenditionselection.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AudioHlsRenditionSelection AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioHlsRenditionSelection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiohlsrenditionselection.html
+type Channel_AudioHlsRenditionSelection struct {
+
+	// GroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiohlsrenditionselection.html#cfn-medialive-channel-audiohlsrenditionselection-groupid
+	GroupId *types.Value `json:"GroupId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiohlsrenditionselection.html#cfn-medialive-channel-audiohlsrenditionselection-name
+	Name *types.Value `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 *Channel_AudioHlsRenditionSelection) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AudioHlsRenditionSelection"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audiolanguageselection.go b/goformation/cloudformation/medialive/aws-medialive-channel_audiolanguageselection.go
new file mode 100644
index 0000000000..cfe56c0e0d
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_audiolanguageselection.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AudioLanguageSelection AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioLanguageSelection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiolanguageselection.html
+type Channel_AudioLanguageSelection struct {
+
+	// LanguageCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiolanguageselection.html#cfn-medialive-channel-audiolanguageselection-languagecode
+	LanguageCode *types.Value `json:"LanguageCode,omitempty"`
+
+	// LanguageSelectionPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiolanguageselection.html#cfn-medialive-channel-audiolanguageselection-languageselectionpolicy
+	LanguageSelectionPolicy *types.Value `json:"LanguageSelectionPolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AudioLanguageSelection) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AudioLanguageSelection"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audionormalizationsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_audionormalizationsettings.go
new file mode 100644
index 0000000000..81d9d3d412
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_audionormalizationsettings.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AudioNormalizationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioNormalizationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audionormalizationsettings.html
+type Channel_AudioNormalizationSettings struct {
+
+	// Algorithm AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audionormalizationsettings.html#cfn-medialive-channel-audionormalizationsettings-algorithm
+	Algorithm *types.Value `json:"Algorithm,omitempty"`
+
+	// AlgorithmControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audionormalizationsettings.html#cfn-medialive-channel-audionormalizationsettings-algorithmcontrol
+	AlgorithmControl *types.Value `json:"AlgorithmControl,omitempty"`
+
+	// TargetLkfs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audionormalizationsettings.html#cfn-medialive-channel-audionormalizationsettings-targetlkfs
+	TargetLkfs *types.Value `json:"TargetLkfs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AudioNormalizationSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AudioNormalizationSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audioonlyhlssettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_audioonlyhlssettings.go
new file mode 100644
index 0000000000..5d58fb85b6
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_audioonlyhlssettings.go
@@ -0,0 +1,52 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AudioOnlyHlsSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioOnlyHlsSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioonlyhlssettings.html
+type Channel_AudioOnlyHlsSettings struct {
+
+	// AudioGroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioonlyhlssettings.html#cfn-medialive-channel-audioonlyhlssettings-audiogroupid
+	AudioGroupId *types.Value `json:"AudioGroupId,omitempty"`
+
+	// AudioOnlyImage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioonlyhlssettings.html#cfn-medialive-channel-audioonlyhlssettings-audioonlyimage
+	AudioOnlyImage *Channel_InputLocation `json:"AudioOnlyImage,omitempty"`
+
+	// AudioTrackType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioonlyhlssettings.html#cfn-medialive-channel-audioonlyhlssettings-audiotracktype
+	AudioTrackType *types.Value `json:"AudioTrackType,omitempty"`
+
+	// SegmentType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioonlyhlssettings.html#cfn-medialive-channel-audioonlyhlssettings-segmenttype
+	SegmentType *types.Value `json:"SegmentType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AudioOnlyHlsSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AudioOnlyHlsSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audiopidselection.go b/goformation/cloudformation/medialive/aws-medialive-channel_audiopidselection.go
new file mode 100644
index 0000000000..99d3aae143
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_audiopidselection.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AudioPidSelection AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioPidSelection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiopidselection.html
+type Channel_AudioPidSelection struct {
+
+	// Pid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiopidselection.html#cfn-medialive-channel-audiopidselection-pid
+	Pid *types.Value `json:"Pid,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AudioPidSelection) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AudioPidSelection"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audioselector.go b/goformation/cloudformation/medialive/aws-medialive-channel_audioselector.go
new file mode 100644
index 0000000000..0ea01a1712
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_audioselector.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AudioSelector AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioSelector)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselector.html
+type Channel_AudioSelector struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselector.html#cfn-medialive-channel-audioselector-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SelectorSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselector.html#cfn-medialive-channel-audioselector-selectorsettings
+	SelectorSettings *Channel_AudioSelectorSettings `json:"SelectorSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AudioSelector) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AudioSelector"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audioselectorsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_audioselectorsettings.go
new file mode 100644
index 0000000000..69d8020847
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_audioselectorsettings.go
@@ -0,0 +1,50 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AudioSelectorSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioSelectorSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselectorsettings.html
+type Channel_AudioSelectorSettings struct {
+
+	// AudioHlsRenditionSelection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselectorsettings.html#cfn-medialive-channel-audioselectorsettings-audiohlsrenditionselection
+	AudioHlsRenditionSelection *Channel_AudioHlsRenditionSelection `json:"AudioHlsRenditionSelection,omitempty"`
+
+	// AudioLanguageSelection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselectorsettings.html#cfn-medialive-channel-audioselectorsettings-audiolanguageselection
+	AudioLanguageSelection *Channel_AudioLanguageSelection `json:"AudioLanguageSelection,omitempty"`
+
+	// AudioPidSelection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselectorsettings.html#cfn-medialive-channel-audioselectorsettings-audiopidselection
+	AudioPidSelection *Channel_AudioPidSelection `json:"AudioPidSelection,omitempty"`
+
+	// AudioTrackSelection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audioselectorsettings.html#cfn-medialive-channel-audioselectorsettings-audiotrackselection
+	AudioTrackSelection *Channel_AudioTrackSelection `json:"AudioTrackSelection,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AudioSelectorSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AudioSelectorSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audiosilencefailoversettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_audiosilencefailoversettings.go
new file mode 100644
index 0000000000..64fb25d86f
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_audiosilencefailoversettings.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AudioSilenceFailoverSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioSilenceFailoverSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiosilencefailoversettings.html
+type Channel_AudioSilenceFailoverSettings struct {
+
+	// AudioSelectorName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiosilencefailoversettings.html#cfn-medialive-channel-audiosilencefailoversettings-audioselectorname
+	AudioSelectorName *types.Value `json:"AudioSelectorName,omitempty"`
+
+	// AudioSilenceThresholdMsec AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiosilencefailoversettings.html#cfn-medialive-channel-audiosilencefailoversettings-audiosilencethresholdmsec
+	AudioSilenceThresholdMsec *types.Value `json:"AudioSilenceThresholdMsec,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AudioSilenceFailoverSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AudioSilenceFailoverSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audiotrack.go b/goformation/cloudformation/medialive/aws-medialive-channel_audiotrack.go
new file mode 100644
index 0000000000..45f2d76af6
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_audiotrack.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AudioTrack AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioTrack)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiotrack.html
+type Channel_AudioTrack struct {
+
+	// Track AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiotrack.html#cfn-medialive-channel-audiotrack-track
+	Track *types.Value `json:"Track,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AudioTrack) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AudioTrack"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audiotrackselection.go b/goformation/cloudformation/medialive/aws-medialive-channel_audiotrackselection.go
new file mode 100644
index 0000000000..6ef94810bf
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_audiotrackselection.go
@@ -0,0 +1,35 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AudioTrackSelection AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioTrackSelection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiotrackselection.html
+type Channel_AudioTrackSelection struct {
+
+	// Tracks AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiotrackselection.html#cfn-medialive-channel-audiotrackselection-tracks
+	Tracks []Channel_AudioTrack `json:"Tracks,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AudioTrackSelection) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AudioTrackSelection"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_audiowatermarksettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_audiowatermarksettings.go
new file mode 100644
index 0000000000..a9cb2ddab0
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_audiowatermarksettings.go
@@ -0,0 +1,35 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AudioWatermarkSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AudioWatermarkSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiowatermarksettings.html
+type Channel_AudioWatermarkSettings struct {
+
+	// NielsenWatermarksSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-audiowatermarksettings.html#cfn-medialive-channel-audiowatermarksettings-nielsenwatermarkssettings
+	NielsenWatermarksSettings *Channel_NielsenWatermarksSettings `json:"NielsenWatermarksSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AudioWatermarkSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AudioWatermarkSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_automaticinputfailoversettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_automaticinputfailoversettings.go
new file mode 100644
index 0000000000..d63cac8f50
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_automaticinputfailoversettings.go
@@ -0,0 +1,52 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AutomaticInputFailoverSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AutomaticInputFailoverSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-automaticinputfailoversettings.html
+type Channel_AutomaticInputFailoverSettings struct {
+
+	// ErrorClearTimeMsec AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-automaticinputfailoversettings.html#cfn-medialive-channel-automaticinputfailoversettings-errorcleartimemsec
+	ErrorClearTimeMsec *types.Value `json:"ErrorClearTimeMsec,omitempty"`
+
+	// FailoverConditions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-automaticinputfailoversettings.html#cfn-medialive-channel-automaticinputfailoversettings-failoverconditions
+	FailoverConditions []Channel_FailoverCondition `json:"FailoverConditions,omitempty"`
+
+	// InputPreference AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-automaticinputfailoversettings.html#cfn-medialive-channel-automaticinputfailoversettings-inputpreference
+	InputPreference *types.Value `json:"InputPreference,omitempty"`
+
+	// SecondaryInputId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-automaticinputfailoversettings.html#cfn-medialive-channel-automaticinputfailoversettings-secondaryinputid
+	SecondaryInputId *types.Value `json:"SecondaryInputId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AutomaticInputFailoverSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AutomaticInputFailoverSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_availblanking.go b/goformation/cloudformation/medialive/aws-medialive-channel_availblanking.go
new file mode 100644
index 0000000000..3e1aa4d42d
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_availblanking.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AvailBlanking AWS CloudFormation Resource (AWS::MediaLive::Channel.AvailBlanking)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-availblanking.html
+type Channel_AvailBlanking struct {
+
+	// AvailBlankingImage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-availblanking.html#cfn-medialive-channel-availblanking-availblankingimage
+	AvailBlankingImage *Channel_InputLocation `json:"AvailBlankingImage,omitempty"`
+
+	// State AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-availblanking.html#cfn-medialive-channel-availblanking-state
+	State *types.Value `json:"State,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AvailBlanking) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AvailBlanking"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_availconfiguration.go b/goformation/cloudformation/medialive/aws-medialive-channel_availconfiguration.go
new file mode 100644
index 0000000000..98bb49da8a
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_availconfiguration.go
@@ -0,0 +1,35 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AvailConfiguration AWS CloudFormation Resource (AWS::MediaLive::Channel.AvailConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-availconfiguration.html
+type Channel_AvailConfiguration struct {
+
+	// AvailSettings AWS CloudFormation Property
+	// Required: false
+	// 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"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AvailConfiguration) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AvailConfiguration"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_availsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_availsettings.go
new file mode 100644
index 0000000000..f76d73ba14
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_availsettings.go
@@ -0,0 +1,40 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_AvailSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.AvailSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-availsettings.html
+type Channel_AvailSettings struct {
+
+	// Scte35SpliceInsert AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-availsettings.html#cfn-medialive-channel-availsettings-scte35spliceinsert
+	Scte35SpliceInsert *Channel_Scte35SpliceInsert `json:"Scte35SpliceInsert,omitempty"`
+
+	// Scte35TimeSignalApos AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-availsettings.html#cfn-medialive-channel-availsettings-scte35timesignalapos
+	Scte35TimeSignalApos *Channel_Scte35TimeSignalApos `json:"Scte35TimeSignalApos,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_AvailSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.AvailSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_blackoutslate.go b/goformation/cloudformation/medialive/aws-medialive-channel_blackoutslate.go
new file mode 100644
index 0000000000..bdd111d52c
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_blackoutslate.go
@@ -0,0 +1,57 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_BlackoutSlate AWS CloudFormation Resource (AWS::MediaLive::Channel.BlackoutSlate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-blackoutslate.html
+type Channel_BlackoutSlate struct {
+
+	// BlackoutSlateImage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-blackoutslate.html#cfn-medialive-channel-blackoutslate-blackoutslateimage
+	BlackoutSlateImage *Channel_InputLocation `json:"BlackoutSlateImage,omitempty"`
+
+	// NetworkEndBlackout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-blackoutslate.html#cfn-medialive-channel-blackoutslate-networkendblackout
+	NetworkEndBlackout *types.Value `json:"NetworkEndBlackout,omitempty"`
+
+	// NetworkEndBlackoutImage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-blackoutslate.html#cfn-medialive-channel-blackoutslate-networkendblackoutimage
+	NetworkEndBlackoutImage *Channel_InputLocation `json:"NetworkEndBlackoutImage,omitempty"`
+
+	// NetworkId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-blackoutslate.html#cfn-medialive-channel-blackoutslate-networkid
+	NetworkId *types.Value `json:"NetworkId,omitempty"`
+
+	// State AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-blackoutslate.html#cfn-medialive-channel-blackoutslate-state
+	State *types.Value `json:"State,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_BlackoutSlate) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.BlackoutSlate"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_burnindestinationsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_burnindestinationsettings.go
new file mode 100644
index 0000000000..d908d98f18
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_burnindestinationsettings.go
@@ -0,0 +1,117 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_BurnInDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.BurnInDestinationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-burnindestinationsettings.html
+type Channel_BurnInDestinationSettings struct {
+
+	// Alignment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-burnindestinationsettings.html#cfn-medialive-channel-burnindestinationsettings-alignment
+	Alignment *types.Value `json:"Alignment,omitempty"`
+
+	// BackgroundColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-burnindestinationsettings.html#cfn-medialive-channel-burnindestinationsettings-backgroundcolor
+	BackgroundColor *types.Value `json:"BackgroundColor,omitempty"`
+
+	// BackgroundOpacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-burnindestinationsettings.html#cfn-medialive-channel-burnindestinationsettings-backgroundopacity
+	BackgroundOpacity *types.Value `json:"BackgroundOpacity,omitempty"`
+
+	// Font AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-burnindestinationsettings.html#cfn-medialive-channel-burnindestinationsettings-font
+	Font *Channel_InputLocation `json:"Font,omitempty"`
+
+	// FontColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-burnindestinationsettings.html#cfn-medialive-channel-burnindestinationsettings-fontcolor
+	FontColor *types.Value `json:"FontColor,omitempty"`
+
+	// FontOpacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-burnindestinationsettings.html#cfn-medialive-channel-burnindestinationsettings-fontopacity
+	FontOpacity *types.Value `json:"FontOpacity,omitempty"`
+
+	// FontResolution AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-burnindestinationsettings.html#cfn-medialive-channel-burnindestinationsettings-fontresolution
+	FontResolution *types.Value `json:"FontResolution,omitempty"`
+
+	// FontSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-burnindestinationsettings.html#cfn-medialive-channel-burnindestinationsettings-fontsize
+	FontSize *types.Value `json:"FontSize,omitempty"`
+
+	// OutlineColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-burnindestinationsettings.html#cfn-medialive-channel-burnindestinationsettings-outlinecolor
+	OutlineColor *types.Value `json:"OutlineColor,omitempty"`
+
+	// OutlineSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-burnindestinationsettings.html#cfn-medialive-channel-burnindestinationsettings-outlinesize
+	OutlineSize *types.Value `json:"OutlineSize,omitempty"`
+
+	// ShadowColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-burnindestinationsettings.html#cfn-medialive-channel-burnindestinationsettings-shadowcolor
+	ShadowColor *types.Value `json:"ShadowColor,omitempty"`
+
+	// ShadowOpacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-burnindestinationsettings.html#cfn-medialive-channel-burnindestinationsettings-shadowopacity
+	ShadowOpacity *types.Value `json:"ShadowOpacity,omitempty"`
+
+	// ShadowXOffset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-burnindestinationsettings.html#cfn-medialive-channel-burnindestinationsettings-shadowxoffset
+	ShadowXOffset *types.Value `json:"ShadowXOffset,omitempty"`
+
+	// ShadowYOffset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-burnindestinationsettings.html#cfn-medialive-channel-burnindestinationsettings-shadowyoffset
+	ShadowYOffset *types.Value `json:"ShadowYOffset,omitempty"`
+
+	// TeletextGridControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-burnindestinationsettings.html#cfn-medialive-channel-burnindestinationsettings-teletextgridcontrol
+	TeletextGridControl *types.Value `json:"TeletextGridControl,omitempty"`
+
+	// XPosition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-burnindestinationsettings.html#cfn-medialive-channel-burnindestinationsettings-xposition
+	XPosition *types.Value `json:"XPosition,omitempty"`
+
+	// YPosition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-burnindestinationsettings.html#cfn-medialive-channel-burnindestinationsettings-yposition
+	YPosition *types.Value `json:"YPosition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_BurnInDestinationSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.BurnInDestinationSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_captiondescription.go b/goformation/cloudformation/medialive/aws-medialive-channel_captiondescription.go
new file mode 100644
index 0000000000..f41a48fd68
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_captiondescription.go
@@ -0,0 +1,57 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_CaptionDescription AWS CloudFormation Resource (AWS::MediaLive::Channel.CaptionDescription)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captiondescription.html
+type Channel_CaptionDescription struct {
+
+	// CaptionSelectorName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captiondescription.html#cfn-medialive-channel-captiondescription-captionselectorname
+	CaptionSelectorName *types.Value `json:"CaptionSelectorName,omitempty"`
+
+	// DestinationSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captiondescription.html#cfn-medialive-channel-captiondescription-destinationsettings
+	DestinationSettings *Channel_CaptionDestinationSettings `json:"DestinationSettings,omitempty"`
+
+	// LanguageCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captiondescription.html#cfn-medialive-channel-captiondescription-languagecode
+	LanguageCode *types.Value `json:"LanguageCode,omitempty"`
+
+	// LanguageDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captiondescription.html#cfn-medialive-channel-captiondescription-languagedescription
+	LanguageDescription *types.Value `json:"LanguageDescription,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captiondescription.html#cfn-medialive-channel-captiondescription-name
+	Name *types.Value `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 *Channel_CaptionDescription) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.CaptionDescription"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_captiondestinationsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_captiondestinationsettings.go
new file mode 100644
index 0000000000..2c8d9e1a8f
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_captiondestinationsettings.go
@@ -0,0 +1,95 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_CaptionDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.CaptionDestinationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captiondestinationsettings.html
+type Channel_CaptionDestinationSettings struct {
+
+	// AribDestinationSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captiondestinationsettings.html#cfn-medialive-channel-captiondestinationsettings-aribdestinationsettings
+	AribDestinationSettings *Channel_AribDestinationSettings `json:"AribDestinationSettings,omitempty"`
+
+	// BurnInDestinationSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captiondestinationsettings.html#cfn-medialive-channel-captiondestinationsettings-burnindestinationsettings
+	BurnInDestinationSettings *Channel_BurnInDestinationSettings `json:"BurnInDestinationSettings,omitempty"`
+
+	// DvbSubDestinationSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captiondestinationsettings.html#cfn-medialive-channel-captiondestinationsettings-dvbsubdestinationsettings
+	DvbSubDestinationSettings *Channel_DvbSubDestinationSettings `json:"DvbSubDestinationSettings,omitempty"`
+
+	// EbuTtDDestinationSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captiondestinationsettings.html#cfn-medialive-channel-captiondestinationsettings-ebuttddestinationsettings
+	EbuTtDDestinationSettings *Channel_EbuTtDDestinationSettings `json:"EbuTtDDestinationSettings,omitempty"`
+
+	// EmbeddedDestinationSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captiondestinationsettings.html#cfn-medialive-channel-captiondestinationsettings-embeddeddestinationsettings
+	EmbeddedDestinationSettings *Channel_EmbeddedDestinationSettings `json:"EmbeddedDestinationSettings,omitempty"`
+
+	// EmbeddedPlusScte20DestinationSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captiondestinationsettings.html#cfn-medialive-channel-captiondestinationsettings-embeddedplusscte20destinationsettings
+	EmbeddedPlusScte20DestinationSettings *Channel_EmbeddedPlusScte20DestinationSettings `json:"EmbeddedPlusScte20DestinationSettings,omitempty"`
+
+	// RtmpCaptionInfoDestinationSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captiondestinationsettings.html#cfn-medialive-channel-captiondestinationsettings-rtmpcaptioninfodestinationsettings
+	RtmpCaptionInfoDestinationSettings *Channel_RtmpCaptionInfoDestinationSettings `json:"RtmpCaptionInfoDestinationSettings,omitempty"`
+
+	// Scte20PlusEmbeddedDestinationSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captiondestinationsettings.html#cfn-medialive-channel-captiondestinationsettings-scte20plusembeddeddestinationsettings
+	Scte20PlusEmbeddedDestinationSettings *Channel_Scte20PlusEmbeddedDestinationSettings `json:"Scte20PlusEmbeddedDestinationSettings,omitempty"`
+
+	// Scte27DestinationSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captiondestinationsettings.html#cfn-medialive-channel-captiondestinationsettings-scte27destinationsettings
+	Scte27DestinationSettings *Channel_Scte27DestinationSettings `json:"Scte27DestinationSettings,omitempty"`
+
+	// SmpteTtDestinationSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captiondestinationsettings.html#cfn-medialive-channel-captiondestinationsettings-smptettdestinationsettings
+	SmpteTtDestinationSettings *Channel_SmpteTtDestinationSettings `json:"SmpteTtDestinationSettings,omitempty"`
+
+	// TeletextDestinationSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captiondestinationsettings.html#cfn-medialive-channel-captiondestinationsettings-teletextdestinationsettings
+	TeletextDestinationSettings *Channel_TeletextDestinationSettings `json:"TeletextDestinationSettings,omitempty"`
+
+	// TtmlDestinationSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captiondestinationsettings.html#cfn-medialive-channel-captiondestinationsettings-ttmldestinationsettings
+	TtmlDestinationSettings *Channel_TtmlDestinationSettings `json:"TtmlDestinationSettings,omitempty"`
+
+	// WebvttDestinationSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captiondestinationsettings.html#cfn-medialive-channel-captiondestinationsettings-webvttdestinationsettings
+	WebvttDestinationSettings *Channel_WebvttDestinationSettings `json:"WebvttDestinationSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_CaptionDestinationSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.CaptionDestinationSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_captionlanguagemapping.go b/goformation/cloudformation/medialive/aws-medialive-channel_captionlanguagemapping.go
new file mode 100644
index 0000000000..2e52988c37
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_captionlanguagemapping.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_CaptionLanguageMapping AWS CloudFormation Resource (AWS::MediaLive::Channel.CaptionLanguageMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionlanguagemapping.html
+type Channel_CaptionLanguageMapping struct {
+
+	// CaptionChannel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionlanguagemapping.html#cfn-medialive-channel-captionlanguagemapping-captionchannel
+	CaptionChannel *types.Value `json:"CaptionChannel,omitempty"`
+
+	// LanguageCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionlanguagemapping.html#cfn-medialive-channel-captionlanguagemapping-languagecode
+	LanguageCode *types.Value `json:"LanguageCode,omitempty"`
+
+	// LanguageDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionlanguagemapping.html#cfn-medialive-channel-captionlanguagemapping-languagedescription
+	LanguageDescription *types.Value `json:"LanguageDescription,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_CaptionLanguageMapping) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.CaptionLanguageMapping"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_captionrectangle.go b/goformation/cloudformation/medialive/aws-medialive-channel_captionrectangle.go
new file mode 100644
index 0000000000..098a43ab3f
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_captionrectangle.go
@@ -0,0 +1,52 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_CaptionRectangle AWS CloudFormation Resource (AWS::MediaLive::Channel.CaptionRectangle)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionrectangle.html
+type Channel_CaptionRectangle struct {
+
+	// Height AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionrectangle.html#cfn-medialive-channel-captionrectangle-height
+	Height *types.Value `json:"Height,omitempty"`
+
+	// LeftOffset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionrectangle.html#cfn-medialive-channel-captionrectangle-leftoffset
+	LeftOffset *types.Value `json:"LeftOffset,omitempty"`
+
+	// TopOffset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionrectangle.html#cfn-medialive-channel-captionrectangle-topoffset
+	TopOffset *types.Value `json:"TopOffset,omitempty"`
+
+	// Width AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionrectangle.html#cfn-medialive-channel-captionrectangle-width
+	Width *types.Value `json:"Width,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_CaptionRectangle) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.CaptionRectangle"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_captionselector.go b/goformation/cloudformation/medialive/aws-medialive-channel_captionselector.go
new file mode 100644
index 0000000000..e6ef7b8fbd
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_captionselector.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_CaptionSelector AWS CloudFormation Resource (AWS::MediaLive::Channel.CaptionSelector)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselector.html
+type Channel_CaptionSelector struct {
+
+	// LanguageCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselector.html#cfn-medialive-channel-captionselector-languagecode
+	LanguageCode *types.Value `json:"LanguageCode,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselector.html#cfn-medialive-channel-captionselector-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SelectorSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselector.html#cfn-medialive-channel-captionselector-selectorsettings
+	SelectorSettings *Channel_CaptionSelectorSettings `json:"SelectorSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_CaptionSelector) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.CaptionSelector"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_captionselectorsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_captionselectorsettings.go
new file mode 100644
index 0000000000..bfce7d1e77
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_captionselectorsettings.go
@@ -0,0 +1,65 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_CaptionSelectorSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.CaptionSelectorSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html
+type Channel_CaptionSelectorSettings struct {
+
+	// AncillarySourceSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-ancillarysourcesettings
+	AncillarySourceSettings *Channel_AncillarySourceSettings `json:"AncillarySourceSettings,omitempty"`
+
+	// AribSourceSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-aribsourcesettings
+	AribSourceSettings *Channel_AribSourceSettings `json:"AribSourceSettings,omitempty"`
+
+	// DvbSubSourceSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-dvbsubsourcesettings
+	DvbSubSourceSettings *Channel_DvbSubSourceSettings `json:"DvbSubSourceSettings,omitempty"`
+
+	// EmbeddedSourceSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-embeddedsourcesettings
+	EmbeddedSourceSettings *Channel_EmbeddedSourceSettings `json:"EmbeddedSourceSettings,omitempty"`
+
+	// Scte20SourceSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-scte20sourcesettings
+	Scte20SourceSettings *Channel_Scte20SourceSettings `json:"Scte20SourceSettings,omitempty"`
+
+	// Scte27SourceSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-scte27sourcesettings
+	Scte27SourceSettings *Channel_Scte27SourceSettings `json:"Scte27SourceSettings,omitempty"`
+
+	// TeletextSourceSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-captionselectorsettings.html#cfn-medialive-channel-captionselectorsettings-teletextsourcesettings
+	TeletextSourceSettings *Channel_TeletextSourceSettings `json:"TeletextSourceSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_CaptionSelectorSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.CaptionSelectorSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_cdiinputspecification.go b/goformation/cloudformation/medialive/aws-medialive-channel_cdiinputspecification.go
new file mode 100644
index 0000000000..3255c6473c
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_cdiinputspecification.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_CdiInputSpecification AWS CloudFormation Resource (AWS::MediaLive::Channel.CdiInputSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-cdiinputspecification.html
+type Channel_CdiInputSpecification struct {
+
+	// Resolution AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-cdiinputspecification.html#cfn-medialive-channel-cdiinputspecification-resolution
+	Resolution *types.Value `json:"Resolution,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_CdiInputSpecification) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.CdiInputSpecification"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_colorspacepassthroughsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_colorspacepassthroughsettings.go
new file mode 100644
index 0000000000..15b6728a5e
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_colorspacepassthroughsettings.go
@@ -0,0 +1,30 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_ColorSpacePassthroughSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.ColorSpacePassthroughSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-colorspacepassthroughsettings.html
+type Channel_ColorSpacePassthroughSettings struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_ColorSpacePassthroughSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.ColorSpacePassthroughSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_dvbnitsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_dvbnitsettings.go
new file mode 100644
index 0000000000..cfdf1b2109
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_dvbnitsettings.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_DvbNitSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.DvbNitSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbnitsettings.html
+type Channel_DvbNitSettings struct {
+
+	// NetworkId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbnitsettings.html#cfn-medialive-channel-dvbnitsettings-networkid
+	NetworkId *types.Value `json:"NetworkId,omitempty"`
+
+	// NetworkName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbnitsettings.html#cfn-medialive-channel-dvbnitsettings-networkname
+	NetworkName *types.Value `json:"NetworkName,omitempty"`
+
+	// RepInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbnitsettings.html#cfn-medialive-channel-dvbnitsettings-repinterval
+	RepInterval *types.Value `json:"RepInterval,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_DvbNitSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.DvbNitSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_dvbsdtsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_dvbsdtsettings.go
new file mode 100644
index 0000000000..4ce544ab5f
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_dvbsdtsettings.go
@@ -0,0 +1,52 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_DvbSdtSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.DvbSdtSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsdtsettings.html
+type Channel_DvbSdtSettings struct {
+
+	// OutputSdt AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsdtsettings.html#cfn-medialive-channel-dvbsdtsettings-outputsdt
+	OutputSdt *types.Value `json:"OutputSdt,omitempty"`
+
+	// RepInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsdtsettings.html#cfn-medialive-channel-dvbsdtsettings-repinterval
+	RepInterval *types.Value `json:"RepInterval,omitempty"`
+
+	// ServiceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsdtsettings.html#cfn-medialive-channel-dvbsdtsettings-servicename
+	ServiceName *types.Value `json:"ServiceName,omitempty"`
+
+	// ServiceProviderName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsdtsettings.html#cfn-medialive-channel-dvbsdtsettings-serviceprovidername
+	ServiceProviderName *types.Value `json:"ServiceProviderName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_DvbSdtSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.DvbSdtSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_dvbsubdestinationsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_dvbsubdestinationsettings.go
new file mode 100644
index 0000000000..b17b4abf40
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_dvbsubdestinationsettings.go
@@ -0,0 +1,117 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_DvbSubDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.DvbSubDestinationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubdestinationsettings.html
+type Channel_DvbSubDestinationSettings struct {
+
+	// Alignment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubdestinationsettings.html#cfn-medialive-channel-dvbsubdestinationsettings-alignment
+	Alignment *types.Value `json:"Alignment,omitempty"`
+
+	// BackgroundColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubdestinationsettings.html#cfn-medialive-channel-dvbsubdestinationsettings-backgroundcolor
+	BackgroundColor *types.Value `json:"BackgroundColor,omitempty"`
+
+	// BackgroundOpacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubdestinationsettings.html#cfn-medialive-channel-dvbsubdestinationsettings-backgroundopacity
+	BackgroundOpacity *types.Value `json:"BackgroundOpacity,omitempty"`
+
+	// Font AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubdestinationsettings.html#cfn-medialive-channel-dvbsubdestinationsettings-font
+	Font *Channel_InputLocation `json:"Font,omitempty"`
+
+	// FontColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubdestinationsettings.html#cfn-medialive-channel-dvbsubdestinationsettings-fontcolor
+	FontColor *types.Value `json:"FontColor,omitempty"`
+
+	// FontOpacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubdestinationsettings.html#cfn-medialive-channel-dvbsubdestinationsettings-fontopacity
+	FontOpacity *types.Value `json:"FontOpacity,omitempty"`
+
+	// FontResolution AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubdestinationsettings.html#cfn-medialive-channel-dvbsubdestinationsettings-fontresolution
+	FontResolution *types.Value `json:"FontResolution,omitempty"`
+
+	// FontSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubdestinationsettings.html#cfn-medialive-channel-dvbsubdestinationsettings-fontsize
+	FontSize *types.Value `json:"FontSize,omitempty"`
+
+	// OutlineColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubdestinationsettings.html#cfn-medialive-channel-dvbsubdestinationsettings-outlinecolor
+	OutlineColor *types.Value `json:"OutlineColor,omitempty"`
+
+	// OutlineSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubdestinationsettings.html#cfn-medialive-channel-dvbsubdestinationsettings-outlinesize
+	OutlineSize *types.Value `json:"OutlineSize,omitempty"`
+
+	// ShadowColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubdestinationsettings.html#cfn-medialive-channel-dvbsubdestinationsettings-shadowcolor
+	ShadowColor *types.Value `json:"ShadowColor,omitempty"`
+
+	// ShadowOpacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubdestinationsettings.html#cfn-medialive-channel-dvbsubdestinationsettings-shadowopacity
+	ShadowOpacity *types.Value `json:"ShadowOpacity,omitempty"`
+
+	// ShadowXOffset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubdestinationsettings.html#cfn-medialive-channel-dvbsubdestinationsettings-shadowxoffset
+	ShadowXOffset *types.Value `json:"ShadowXOffset,omitempty"`
+
+	// ShadowYOffset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubdestinationsettings.html#cfn-medialive-channel-dvbsubdestinationsettings-shadowyoffset
+	ShadowYOffset *types.Value `json:"ShadowYOffset,omitempty"`
+
+	// TeletextGridControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubdestinationsettings.html#cfn-medialive-channel-dvbsubdestinationsettings-teletextgridcontrol
+	TeletextGridControl *types.Value `json:"TeletextGridControl,omitempty"`
+
+	// XPosition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubdestinationsettings.html#cfn-medialive-channel-dvbsubdestinationsettings-xposition
+	XPosition *types.Value `json:"XPosition,omitempty"`
+
+	// YPosition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubdestinationsettings.html#cfn-medialive-channel-dvbsubdestinationsettings-yposition
+	YPosition *types.Value `json:"YPosition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_DvbSubDestinationSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.DvbSubDestinationSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_dvbsubsourcesettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_dvbsubsourcesettings.go
new file mode 100644
index 0000000000..d7d31ebcc6
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_dvbsubsourcesettings.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_DvbSubSourceSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.DvbSubSourceSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubsourcesettings.html
+type Channel_DvbSubSourceSettings struct {
+
+	// OcrLanguage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubsourcesettings.html#cfn-medialive-channel-dvbsubsourcesettings-ocrlanguage
+	OcrLanguage *types.Value `json:"OcrLanguage,omitempty"`
+
+	// Pid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbsubsourcesettings.html#cfn-medialive-channel-dvbsubsourcesettings-pid
+	Pid *types.Value `json:"Pid,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_DvbSubSourceSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.DvbSubSourceSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_dvbtdtsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_dvbtdtsettings.go
new file mode 100644
index 0000000000..a2166b2fe9
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_dvbtdtsettings.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_DvbTdtSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.DvbTdtSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbtdtsettings.html
+type Channel_DvbTdtSettings struct {
+
+	// RepInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-dvbtdtsettings.html#cfn-medialive-channel-dvbtdtsettings-repinterval
+	RepInterval *types.Value `json:"RepInterval,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_DvbTdtSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.DvbTdtSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_eac3settings.go b/goformation/cloudformation/medialive/aws-medialive-channel_eac3settings.go
new file mode 100644
index 0000000000..75121dd8fa
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_eac3settings.go
@@ -0,0 +1,132 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_Eac3Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.Eac3Settings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html
+type Channel_Eac3Settings struct {
+
+	// AttenuationControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html#cfn-medialive-channel-eac3settings-attenuationcontrol
+	AttenuationControl *types.Value `json:"AttenuationControl,omitempty"`
+
+	// Bitrate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html#cfn-medialive-channel-eac3settings-bitrate
+	Bitrate *types.Value `json:"Bitrate,omitempty"`
+
+	// BitstreamMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html#cfn-medialive-channel-eac3settings-bitstreammode
+	BitstreamMode *types.Value `json:"BitstreamMode,omitempty"`
+
+	// CodingMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html#cfn-medialive-channel-eac3settings-codingmode
+	CodingMode *types.Value `json:"CodingMode,omitempty"`
+
+	// DcFilter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html#cfn-medialive-channel-eac3settings-dcfilter
+	DcFilter *types.Value `json:"DcFilter,omitempty"`
+
+	// Dialnorm AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html#cfn-medialive-channel-eac3settings-dialnorm
+	Dialnorm *types.Value `json:"Dialnorm,omitempty"`
+
+	// DrcLine AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html#cfn-medialive-channel-eac3settings-drcline
+	DrcLine *types.Value `json:"DrcLine,omitempty"`
+
+	// DrcRf AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html#cfn-medialive-channel-eac3settings-drcrf
+	DrcRf *types.Value `json:"DrcRf,omitempty"`
+
+	// LfeControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html#cfn-medialive-channel-eac3settings-lfecontrol
+	LfeControl *types.Value `json:"LfeControl,omitempty"`
+
+	// LfeFilter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html#cfn-medialive-channel-eac3settings-lfefilter
+	LfeFilter *types.Value `json:"LfeFilter,omitempty"`
+
+	// LoRoCenterMixLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html#cfn-medialive-channel-eac3settings-lorocentermixlevel
+	LoRoCenterMixLevel *types.Value `json:"LoRoCenterMixLevel,omitempty"`
+
+	// LoRoSurroundMixLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html#cfn-medialive-channel-eac3settings-lorosurroundmixlevel
+	LoRoSurroundMixLevel *types.Value `json:"LoRoSurroundMixLevel,omitempty"`
+
+	// LtRtCenterMixLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html#cfn-medialive-channel-eac3settings-ltrtcentermixlevel
+	LtRtCenterMixLevel *types.Value `json:"LtRtCenterMixLevel,omitempty"`
+
+	// LtRtSurroundMixLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html#cfn-medialive-channel-eac3settings-ltrtsurroundmixlevel
+	LtRtSurroundMixLevel *types.Value `json:"LtRtSurroundMixLevel,omitempty"`
+
+	// MetadataControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html#cfn-medialive-channel-eac3settings-metadatacontrol
+	MetadataControl *types.Value `json:"MetadataControl,omitempty"`
+
+	// PassthroughControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html#cfn-medialive-channel-eac3settings-passthroughcontrol
+	PassthroughControl *types.Value `json:"PassthroughControl,omitempty"`
+
+	// PhaseControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html#cfn-medialive-channel-eac3settings-phasecontrol
+	PhaseControl *types.Value `json:"PhaseControl,omitempty"`
+
+	// StereoDownmix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html#cfn-medialive-channel-eac3settings-stereodownmix
+	StereoDownmix *types.Value `json:"StereoDownmix,omitempty"`
+
+	// SurroundExMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html#cfn-medialive-channel-eac3settings-surroundexmode
+	SurroundExMode *types.Value `json:"SurroundExMode,omitempty"`
+
+	// SurroundMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-eac3settings.html#cfn-medialive-channel-eac3settings-surroundmode
+	SurroundMode *types.Value `json:"SurroundMode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_Eac3Settings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.Eac3Settings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_ebuttddestinationsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_ebuttddestinationsettings.go
new file mode 100644
index 0000000000..2b4bca01de
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_ebuttddestinationsettings.go
@@ -0,0 +1,52 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_EbuTtDDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.EbuTtDDestinationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-ebuttddestinationsettings.html
+type Channel_EbuTtDDestinationSettings struct {
+
+	// CopyrightHolder AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-ebuttddestinationsettings.html#cfn-medialive-channel-ebuttddestinationsettings-copyrightholder
+	CopyrightHolder *types.Value `json:"CopyrightHolder,omitempty"`
+
+	// FillLineGap AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-ebuttddestinationsettings.html#cfn-medialive-channel-ebuttddestinationsettings-filllinegap
+	FillLineGap *types.Value `json:"FillLineGap,omitempty"`
+
+	// FontFamily AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-ebuttddestinationsettings.html#cfn-medialive-channel-ebuttddestinationsettings-fontfamily
+	FontFamily *types.Value `json:"FontFamily,omitempty"`
+
+	// StyleControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-ebuttddestinationsettings.html#cfn-medialive-channel-ebuttddestinationsettings-stylecontrol
+	StyleControl *types.Value `json:"StyleControl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_EbuTtDDestinationSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.EbuTtDDestinationSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_embeddeddestinationsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_embeddeddestinationsettings.go
new file mode 100644
index 0000000000..21e34c5afb
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_embeddeddestinationsettings.go
@@ -0,0 +1,30 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_EmbeddedDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.EmbeddedDestinationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddeddestinationsettings.html
+type Channel_EmbeddedDestinationSettings struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_EmbeddedDestinationSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.EmbeddedDestinationSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_embeddedplusscte20destinationsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_embeddedplusscte20destinationsettings.go
new file mode 100644
index 0000000000..e204a6aee8
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_embeddedplusscte20destinationsettings.go
@@ -0,0 +1,30 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_EmbeddedPlusScte20DestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.EmbeddedPlusScte20DestinationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedplusscte20destinationsettings.html
+type Channel_EmbeddedPlusScte20DestinationSettings struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_EmbeddedPlusScte20DestinationSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.EmbeddedPlusScte20DestinationSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_embeddedsourcesettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_embeddedsourcesettings.go
new file mode 100644
index 0000000000..0d26fbc329
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_embeddedsourcesettings.go
@@ -0,0 +1,52 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_EmbeddedSourceSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.EmbeddedSourceSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedsourcesettings.html
+type Channel_EmbeddedSourceSettings struct {
+
+	// Convert608To708 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedsourcesettings.html#cfn-medialive-channel-embeddedsourcesettings-convert608to708
+	Convert608To708 *types.Value `json:"Convert608To708,omitempty"`
+
+	// Scte20Detection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedsourcesettings.html#cfn-medialive-channel-embeddedsourcesettings-scte20detection
+	Scte20Detection *types.Value `json:"Scte20Detection,omitempty"`
+
+	// Source608ChannelNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedsourcesettings.html#cfn-medialive-channel-embeddedsourcesettings-source608channelnumber
+	Source608ChannelNumber *types.Value `json:"Source608ChannelNumber,omitempty"`
+
+	// Source608TrackNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-embeddedsourcesettings.html#cfn-medialive-channel-embeddedsourcesettings-source608tracknumber
+	Source608TrackNumber *types.Value `json:"Source608TrackNumber,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_EmbeddedSourceSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.EmbeddedSourceSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_encodersettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_encodersettings.go
new file mode 100644
index 0000000000..e7c3e00227
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_encodersettings.go
@@ -0,0 +1,90 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_EncoderSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.EncoderSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-encodersettings.html
+type Channel_EncoderSettings struct {
+
+	// AudioDescriptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-encodersettings.html#cfn-medialive-channel-encodersettings-audiodescriptions
+	AudioDescriptions []Channel_AudioDescription `json:"AudioDescriptions,omitempty"`
+
+	// AvailBlanking AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-encodersettings.html#cfn-medialive-channel-encodersettings-availblanking
+	AvailBlanking *Channel_AvailBlanking `json:"AvailBlanking,omitempty"`
+
+	// AvailConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-encodersettings.html#cfn-medialive-channel-encodersettings-availconfiguration
+	AvailConfiguration *Channel_AvailConfiguration `json:"AvailConfiguration,omitempty"`
+
+	// BlackoutSlate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-encodersettings.html#cfn-medialive-channel-encodersettings-blackoutslate
+	BlackoutSlate *Channel_BlackoutSlate `json:"BlackoutSlate,omitempty"`
+
+	// CaptionDescriptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-encodersettings.html#cfn-medialive-channel-encodersettings-captiondescriptions
+	CaptionDescriptions []Channel_CaptionDescription `json:"CaptionDescriptions,omitempty"`
+
+	// FeatureActivations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-encodersettings.html#cfn-medialive-channel-encodersettings-featureactivations
+	FeatureActivations *Channel_FeatureActivations `json:"FeatureActivations,omitempty"`
+
+	// GlobalConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-encodersettings.html#cfn-medialive-channel-encodersettings-globalconfiguration
+	GlobalConfiguration *Channel_GlobalConfiguration `json:"GlobalConfiguration,omitempty"`
+
+	// MotionGraphicsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-encodersettings.html#cfn-medialive-channel-encodersettings-motiongraphicsconfiguration
+	MotionGraphicsConfiguration *Channel_MotionGraphicsConfiguration `json:"MotionGraphicsConfiguration,omitempty"`
+
+	// NielsenConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-encodersettings.html#cfn-medialive-channel-encodersettings-nielsenconfiguration
+	NielsenConfiguration *Channel_NielsenConfiguration `json:"NielsenConfiguration,omitempty"`
+
+	// OutputGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-encodersettings.html#cfn-medialive-channel-encodersettings-outputgroups
+	OutputGroups []Channel_OutputGroup `json:"OutputGroups,omitempty"`
+
+	// TimecodeConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-encodersettings.html#cfn-medialive-channel-encodersettings-timecodeconfig
+	TimecodeConfig *Channel_TimecodeConfig `json:"TimecodeConfig,omitempty"`
+
+	// VideoDescriptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-encodersettings.html#cfn-medialive-channel-encodersettings-videodescriptions
+	VideoDescriptions []Channel_VideoDescription `json:"VideoDescriptions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_EncoderSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.EncoderSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_failovercondition.go b/goformation/cloudformation/medialive/aws-medialive-channel_failovercondition.go
new file mode 100644
index 0000000000..0843f1653b
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_failovercondition.go
@@ -0,0 +1,35 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_FailoverCondition AWS CloudFormation Resource (AWS::MediaLive::Channel.FailoverCondition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-failovercondition.html
+type Channel_FailoverCondition struct {
+
+	// FailoverConditionSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-failovercondition.html#cfn-medialive-channel-failovercondition-failoverconditionsettings
+	FailoverConditionSettings *Channel_FailoverConditionSettings `json:"FailoverConditionSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_FailoverCondition) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.FailoverCondition"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_failoverconditionsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_failoverconditionsettings.go
new file mode 100644
index 0000000000..6f36abf44d
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_failoverconditionsettings.go
@@ -0,0 +1,45 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_FailoverConditionSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.FailoverConditionSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-failoverconditionsettings.html
+type Channel_FailoverConditionSettings struct {
+
+	// AudioSilenceSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-failoverconditionsettings.html#cfn-medialive-channel-failoverconditionsettings-audiosilencesettings
+	AudioSilenceSettings *Channel_AudioSilenceFailoverSettings `json:"AudioSilenceSettings,omitempty"`
+
+	// InputLossSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-failoverconditionsettings.html#cfn-medialive-channel-failoverconditionsettings-inputlosssettings
+	InputLossSettings *Channel_InputLossFailoverSettings `json:"InputLossSettings,omitempty"`
+
+	// VideoBlackSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-failoverconditionsettings.html#cfn-medialive-channel-failoverconditionsettings-videoblacksettings
+	VideoBlackSettings *Channel_VideoBlackFailoverSettings `json:"VideoBlackSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_FailoverConditionSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.FailoverConditionSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_featureactivations.go b/goformation/cloudformation/medialive/aws-medialive-channel_featureactivations.go
new file mode 100644
index 0000000000..25cb68d1ec
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_featureactivations.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_FeatureActivations AWS CloudFormation Resource (AWS::MediaLive::Channel.FeatureActivations)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-featureactivations.html
+type Channel_FeatureActivations struct {
+
+	// InputPrepareScheduleActions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-featureactivations.html#cfn-medialive-channel-featureactivations-inputpreparescheduleactions
+	InputPrepareScheduleActions *types.Value `json:"InputPrepareScheduleActions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_FeatureActivations) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.FeatureActivations"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_fecoutputsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_fecoutputsettings.go
new file mode 100644
index 0000000000..e443bec2e4
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_fecoutputsettings.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_FecOutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.FecOutputSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-fecoutputsettings.html
+type Channel_FecOutputSettings struct {
+
+	// ColumnDepth AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-fecoutputsettings.html#cfn-medialive-channel-fecoutputsettings-columndepth
+	ColumnDepth *types.Value `json:"ColumnDepth,omitempty"`
+
+	// IncludeFec AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-fecoutputsettings.html#cfn-medialive-channel-fecoutputsettings-includefec
+	IncludeFec *types.Value `json:"IncludeFec,omitempty"`
+
+	// RowLength AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-fecoutputsettings.html#cfn-medialive-channel-fecoutputsettings-rowlength
+	RowLength *types.Value `json:"RowLength,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_FecOutputSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.FecOutputSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_fmp4hlssettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_fmp4hlssettings.go
new file mode 100644
index 0000000000..807fac810f
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_fmp4hlssettings.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_Fmp4HlsSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.Fmp4HlsSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-fmp4hlssettings.html
+type Channel_Fmp4HlsSettings struct {
+
+	// AudioRenditionSets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-fmp4hlssettings.html#cfn-medialive-channel-fmp4hlssettings-audiorenditionsets
+	AudioRenditionSets *types.Value `json:"AudioRenditionSets,omitempty"`
+
+	// NielsenId3Behavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-fmp4hlssettings.html#cfn-medialive-channel-fmp4hlssettings-nielsenid3behavior
+	NielsenId3Behavior *types.Value `json:"NielsenId3Behavior,omitempty"`
+
+	// TimedMetadataBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-fmp4hlssettings.html#cfn-medialive-channel-fmp4hlssettings-timedmetadatabehavior
+	TimedMetadataBehavior *types.Value `json:"TimedMetadataBehavior,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_Fmp4HlsSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.Fmp4HlsSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_framecapturecdnsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_framecapturecdnsettings.go
new file mode 100644
index 0000000000..beb410a4dd
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_framecapturecdnsettings.go
@@ -0,0 +1,35 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_FrameCaptureCdnSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.FrameCaptureCdnSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-framecapturecdnsettings.html
+type Channel_FrameCaptureCdnSettings struct {
+
+	// FrameCaptureS3Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-framecapturecdnsettings.html#cfn-medialive-channel-framecapturecdnsettings-framecaptures3settings
+	FrameCaptureS3Settings *Channel_FrameCaptureS3Settings `json:"FrameCaptureS3Settings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_FrameCaptureCdnSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.FrameCaptureCdnSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_framecapturegroupsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_framecapturegroupsettings.go
new file mode 100644
index 0000000000..56dcb3eee2
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_framecapturegroupsettings.go
@@ -0,0 +1,40 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_FrameCaptureGroupSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.FrameCaptureGroupSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-framecapturegroupsettings.html
+type Channel_FrameCaptureGroupSettings struct {
+
+	// Destination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-framecapturegroupsettings.html#cfn-medialive-channel-framecapturegroupsettings-destination
+	Destination *Channel_OutputLocationRef `json:"Destination,omitempty"`
+
+	// FrameCaptureCdnSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-framecapturegroupsettings.html#cfn-medialive-channel-framecapturegroupsettings-framecapturecdnsettings
+	FrameCaptureCdnSettings *Channel_FrameCaptureCdnSettings `json:"FrameCaptureCdnSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_FrameCaptureGroupSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.FrameCaptureGroupSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_framecapturehlssettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_framecapturehlssettings.go
new file mode 100644
index 0000000000..946143ed84
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_framecapturehlssettings.go
@@ -0,0 +1,30 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_FrameCaptureHlsSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.FrameCaptureHlsSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-framecapturehlssettings.html
+type Channel_FrameCaptureHlsSettings struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_FrameCaptureHlsSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.FrameCaptureHlsSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_framecaptureoutputsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_framecaptureoutputsettings.go
new file mode 100644
index 0000000000..9787b17f7e
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_framecaptureoutputsettings.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_FrameCaptureOutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.FrameCaptureOutputSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-framecaptureoutputsettings.html
+type Channel_FrameCaptureOutputSettings struct {
+
+	// NameModifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-framecaptureoutputsettings.html#cfn-medialive-channel-framecaptureoutputsettings-namemodifier
+	NameModifier *types.Value `json:"NameModifier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_FrameCaptureOutputSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.FrameCaptureOutputSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_framecaptures3settings.go b/goformation/cloudformation/medialive/aws-medialive-channel_framecaptures3settings.go
new file mode 100644
index 0000000000..4dc08bf035
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_framecaptures3settings.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_FrameCaptureS3Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.FrameCaptureS3Settings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-framecaptures3settings.html
+type Channel_FrameCaptureS3Settings struct {
+
+	// CannedAcl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-framecaptures3settings.html#cfn-medialive-channel-framecaptures3settings-cannedacl
+	CannedAcl *types.Value `json:"CannedAcl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_FrameCaptureS3Settings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.FrameCaptureS3Settings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_framecapturesettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_framecapturesettings.go
new file mode 100644
index 0000000000..bc0656e57b
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_framecapturesettings.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_FrameCaptureSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.FrameCaptureSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-framecapturesettings.html
+type Channel_FrameCaptureSettings struct {
+
+	// CaptureInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-framecapturesettings.html#cfn-medialive-channel-framecapturesettings-captureinterval
+	CaptureInterval *types.Value `json:"CaptureInterval,omitempty"`
+
+	// CaptureIntervalUnits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-framecapturesettings.html#cfn-medialive-channel-framecapturesettings-captureintervalunits
+	CaptureIntervalUnits *types.Value `json:"CaptureIntervalUnits,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_FrameCaptureSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.FrameCaptureSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_globalconfiguration.go b/goformation/cloudformation/medialive/aws-medialive-channel_globalconfiguration.go
new file mode 100644
index 0000000000..076afb2692
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_globalconfiguration.go
@@ -0,0 +1,62 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_GlobalConfiguration AWS CloudFormation Resource (AWS::MediaLive::Channel.GlobalConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-globalconfiguration.html
+type Channel_GlobalConfiguration struct {
+
+	// InitialAudioGain AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-globalconfiguration.html#cfn-medialive-channel-globalconfiguration-initialaudiogain
+	InitialAudioGain *types.Value `json:"InitialAudioGain,omitempty"`
+
+	// InputEndAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-globalconfiguration.html#cfn-medialive-channel-globalconfiguration-inputendaction
+	InputEndAction *types.Value `json:"InputEndAction,omitempty"`
+
+	// InputLossBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-globalconfiguration.html#cfn-medialive-channel-globalconfiguration-inputlossbehavior
+	InputLossBehavior *Channel_InputLossBehavior `json:"InputLossBehavior,omitempty"`
+
+	// OutputLockingMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-globalconfiguration.html#cfn-medialive-channel-globalconfiguration-outputlockingmode
+	OutputLockingMode *types.Value `json:"OutputLockingMode,omitempty"`
+
+	// OutputTimingSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-globalconfiguration.html#cfn-medialive-channel-globalconfiguration-outputtimingsource
+	OutputTimingSource *types.Value `json:"OutputTimingSource,omitempty"`
+
+	// SupportLowFramerateInputs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-globalconfiguration.html#cfn-medialive-channel-globalconfiguration-supportlowframerateinputs
+	SupportLowFramerateInputs *types.Value `json:"SupportLowFramerateInputs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_GlobalConfiguration) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.GlobalConfiguration"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_h264colorspacesettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_h264colorspacesettings.go
new file mode 100644
index 0000000000..c1b3e2fb14
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_h264colorspacesettings.go
@@ -0,0 +1,45 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_H264ColorSpaceSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.H264ColorSpaceSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264colorspacesettings.html
+type Channel_H264ColorSpaceSettings struct {
+
+	// ColorSpacePassthroughSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264colorspacesettings.html#cfn-medialive-channel-h264colorspacesettings-colorspacepassthroughsettings
+	ColorSpacePassthroughSettings *Channel_ColorSpacePassthroughSettings `json:"ColorSpacePassthroughSettings,omitempty"`
+
+	// Rec601Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264colorspacesettings.html#cfn-medialive-channel-h264colorspacesettings-rec601settings
+	Rec601Settings *Channel_Rec601Settings `json:"Rec601Settings,omitempty"`
+
+	// Rec709Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264colorspacesettings.html#cfn-medialive-channel-h264colorspacesettings-rec709settings
+	Rec709Settings *Channel_Rec709Settings `json:"Rec709Settings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_H264ColorSpaceSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.H264ColorSpaceSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_h264filtersettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_h264filtersettings.go
new file mode 100644
index 0000000000..81900a4df5
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_h264filtersettings.go
@@ -0,0 +1,35 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_H264FilterSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.H264FilterSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264filtersettings.html
+type Channel_H264FilterSettings struct {
+
+	// TemporalFilterSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264filtersettings.html#cfn-medialive-channel-h264filtersettings-temporalfiltersettings
+	TemporalFilterSettings *Channel_TemporalFilterSettings `json:"TemporalFilterSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_H264FilterSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.H264FilterSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_h264settings.go b/goformation/cloudformation/medialive/aws-medialive-channel_h264settings.go
new file mode 100644
index 0000000000..1d29162ab7
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_h264settings.go
@@ -0,0 +1,237 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_H264Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.H264Settings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html
+type Channel_H264Settings struct {
+
+	// AdaptiveQuantization AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-adaptivequantization
+	AdaptiveQuantization *types.Value `json:"AdaptiveQuantization,omitempty"`
+
+	// AfdSignaling AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-afdsignaling
+	AfdSignaling *types.Value `json:"AfdSignaling,omitempty"`
+
+	// Bitrate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-bitrate
+	Bitrate *types.Value `json:"Bitrate,omitempty"`
+
+	// BufFillPct AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-buffillpct
+	BufFillPct *types.Value `json:"BufFillPct,omitempty"`
+
+	// BufSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-bufsize
+	BufSize *types.Value `json:"BufSize,omitempty"`
+
+	// ColorMetadata AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-colormetadata
+	ColorMetadata *types.Value `json:"ColorMetadata,omitempty"`
+
+	// ColorSpaceSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-colorspacesettings
+	ColorSpaceSettings *Channel_H264ColorSpaceSettings `json:"ColorSpaceSettings,omitempty"`
+
+	// EntropyEncoding AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-entropyencoding
+	EntropyEncoding *types.Value `json:"EntropyEncoding,omitempty"`
+
+	// FilterSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-filtersettings
+	FilterSettings *Channel_H264FilterSettings `json:"FilterSettings,omitempty"`
+
+	// FixedAfd AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-fixedafd
+	FixedAfd *types.Value `json:"FixedAfd,omitempty"`
+
+	// FlickerAq AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-flickeraq
+	FlickerAq *types.Value `json:"FlickerAq,omitempty"`
+
+	// ForceFieldPictures AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-forcefieldpictures
+	ForceFieldPictures *types.Value `json:"ForceFieldPictures,omitempty"`
+
+	// FramerateControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-frameratecontrol
+	FramerateControl *types.Value `json:"FramerateControl,omitempty"`
+
+	// FramerateDenominator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-frameratedenominator
+	FramerateDenominator *types.Value `json:"FramerateDenominator,omitempty"`
+
+	// FramerateNumerator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-frameratenumerator
+	FramerateNumerator *types.Value `json:"FramerateNumerator,omitempty"`
+
+	// GopBReference AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-gopbreference
+	GopBReference *types.Value `json:"GopBReference,omitempty"`
+
+	// GopClosedCadence AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-gopclosedcadence
+	GopClosedCadence *types.Value `json:"GopClosedCadence,omitempty"`
+
+	// GopNumBFrames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-gopnumbframes
+	GopNumBFrames *types.Value `json:"GopNumBFrames,omitempty"`
+
+	// GopSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-gopsize
+	GopSize *types.Value `json:"GopSize,omitempty"`
+
+	// GopSizeUnits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-gopsizeunits
+	GopSizeUnits *types.Value `json:"GopSizeUnits,omitempty"`
+
+	// Level AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-level
+	Level *types.Value `json:"Level,omitempty"`
+
+	// LookAheadRateControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-lookaheadratecontrol
+	LookAheadRateControl *types.Value `json:"LookAheadRateControl,omitempty"`
+
+	// MaxBitrate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-maxbitrate
+	MaxBitrate *types.Value `json:"MaxBitrate,omitempty"`
+
+	// MinIInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-miniinterval
+	MinIInterval *types.Value `json:"MinIInterval,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
+	NumRefFrames *types.Value `json:"NumRefFrames,omitempty"`
+
+	// ParControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-parcontrol
+	ParControl *types.Value `json:"ParControl,omitempty"`
+
+	// ParDenominator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-pardenominator
+	ParDenominator *types.Value `json:"ParDenominator,omitempty"`
+
+	// ParNumerator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-parnumerator
+	ParNumerator *types.Value `json:"ParNumerator,omitempty"`
+
+	// Profile AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-profile
+	Profile *types.Value `json:"Profile,omitempty"`
+
+	// QualityLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-qualitylevel
+	QualityLevel *types.Value `json:"QualityLevel,omitempty"`
+
+	// QvbrQualityLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-qvbrqualitylevel
+	QvbrQualityLevel *types.Value `json:"QvbrQualityLevel,omitempty"`
+
+	// RateControlMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-ratecontrolmode
+	RateControlMode *types.Value `json:"RateControlMode,omitempty"`
+
+	// ScanType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-scantype
+	ScanType *types.Value `json:"ScanType,omitempty"`
+
+	// SceneChangeDetect AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-scenechangedetect
+	SceneChangeDetect *types.Value `json:"SceneChangeDetect,omitempty"`
+
+	// Slices AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-slices
+	Slices *types.Value `json:"Slices,omitempty"`
+
+	// Softness AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-softness
+	Softness *types.Value `json:"Softness,omitempty"`
+
+	// SpatialAq AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-spatialaq
+	SpatialAq *types.Value `json:"SpatialAq,omitempty"`
+
+	// SubgopLength AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-subgoplength
+	SubgopLength *types.Value `json:"SubgopLength,omitempty"`
+
+	// Syntax AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-syntax
+	Syntax *types.Value `json:"Syntax,omitempty"`
+
+	// TemporalAq AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-temporalaq
+	TemporalAq *types.Value `json:"TemporalAq,omitempty"`
+
+	// TimecodeInsertion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h264settings.html#cfn-medialive-channel-h264settings-timecodeinsertion
+	TimecodeInsertion *types.Value `json:"TimecodeInsertion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_H264Settings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.H264Settings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_h265colorspacesettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_h265colorspacesettings.go
new file mode 100644
index 0000000000..d2df833fdf
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_h265colorspacesettings.go
@@ -0,0 +1,50 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_H265ColorSpaceSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.H265ColorSpaceSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265colorspacesettings.html
+type Channel_H265ColorSpaceSettings struct {
+
+	// ColorSpacePassthroughSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265colorspacesettings.html#cfn-medialive-channel-h265colorspacesettings-colorspacepassthroughsettings
+	ColorSpacePassthroughSettings *Channel_ColorSpacePassthroughSettings `json:"ColorSpacePassthroughSettings,omitempty"`
+
+	// Hdr10Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265colorspacesettings.html#cfn-medialive-channel-h265colorspacesettings-hdr10settings
+	Hdr10Settings *Channel_Hdr10Settings `json:"Hdr10Settings,omitempty"`
+
+	// Rec601Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265colorspacesettings.html#cfn-medialive-channel-h265colorspacesettings-rec601settings
+	Rec601Settings *Channel_Rec601Settings `json:"Rec601Settings,omitempty"`
+
+	// Rec709Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265colorspacesettings.html#cfn-medialive-channel-h265colorspacesettings-rec709settings
+	Rec709Settings *Channel_Rec709Settings `json:"Rec709Settings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_H265ColorSpaceSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.H265ColorSpaceSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_h265filtersettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_h265filtersettings.go
new file mode 100644
index 0000000000..9eefc9a82f
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_h265filtersettings.go
@@ -0,0 +1,35 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_H265FilterSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.H265FilterSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265filtersettings.html
+type Channel_H265FilterSettings struct {
+
+	// TemporalFilterSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265filtersettings.html#cfn-medialive-channel-h265filtersettings-temporalfiltersettings
+	TemporalFilterSettings *Channel_TemporalFilterSettings `json:"TemporalFilterSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_H265FilterSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.H265FilterSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_h265settings.go b/goformation/cloudformation/medialive/aws-medialive-channel_h265settings.go
new file mode 100644
index 0000000000..c09f1271a7
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_h265settings.go
@@ -0,0 +1,177 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_H265Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.H265Settings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html
+type Channel_H265Settings struct {
+
+	// AdaptiveQuantization AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-adaptivequantization
+	AdaptiveQuantization *types.Value `json:"AdaptiveQuantization,omitempty"`
+
+	// AfdSignaling AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-afdsignaling
+	AfdSignaling *types.Value `json:"AfdSignaling,omitempty"`
+
+	// AlternativeTransferFunction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-alternativetransferfunction
+	AlternativeTransferFunction *types.Value `json:"AlternativeTransferFunction,omitempty"`
+
+	// Bitrate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-bitrate
+	Bitrate *types.Value `json:"Bitrate,omitempty"`
+
+	// BufSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-bufsize
+	BufSize *types.Value `json:"BufSize,omitempty"`
+
+	// ColorMetadata AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-colormetadata
+	ColorMetadata *types.Value `json:"ColorMetadata,omitempty"`
+
+	// ColorSpaceSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-colorspacesettings
+	ColorSpaceSettings *Channel_H265ColorSpaceSettings `json:"ColorSpaceSettings,omitempty"`
+
+	// FilterSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-filtersettings
+	FilterSettings *Channel_H265FilterSettings `json:"FilterSettings,omitempty"`
+
+	// FixedAfd AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-fixedafd
+	FixedAfd *types.Value `json:"FixedAfd,omitempty"`
+
+	// FlickerAq AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-flickeraq
+	FlickerAq *types.Value `json:"FlickerAq,omitempty"`
+
+	// FramerateDenominator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-frameratedenominator
+	FramerateDenominator *types.Value `json:"FramerateDenominator,omitempty"`
+
+	// FramerateNumerator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-frameratenumerator
+	FramerateNumerator *types.Value `json:"FramerateNumerator,omitempty"`
+
+	// GopClosedCadence AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-gopclosedcadence
+	GopClosedCadence *types.Value `json:"GopClosedCadence,omitempty"`
+
+	// GopSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-gopsize
+	GopSize *types.Value `json:"GopSize,omitempty"`
+
+	// GopSizeUnits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-gopsizeunits
+	GopSizeUnits *types.Value `json:"GopSizeUnits,omitempty"`
+
+	// Level AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-level
+	Level *types.Value `json:"Level,omitempty"`
+
+	// LookAheadRateControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-lookaheadratecontrol
+	LookAheadRateControl *types.Value `json:"LookAheadRateControl,omitempty"`
+
+	// MaxBitrate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-maxbitrate
+	MaxBitrate *types.Value `json:"MaxBitrate,omitempty"`
+
+	// MinIInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-miniinterval
+	MinIInterval *types.Value `json:"MinIInterval,omitempty"`
+
+	// ParDenominator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-pardenominator
+	ParDenominator *types.Value `json:"ParDenominator,omitempty"`
+
+	// ParNumerator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-parnumerator
+	ParNumerator *types.Value `json:"ParNumerator,omitempty"`
+
+	// Profile AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-profile
+	Profile *types.Value `json:"Profile,omitempty"`
+
+	// QvbrQualityLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-qvbrqualitylevel
+	QvbrQualityLevel *types.Value `json:"QvbrQualityLevel,omitempty"`
+
+	// RateControlMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-ratecontrolmode
+	RateControlMode *types.Value `json:"RateControlMode,omitempty"`
+
+	// ScanType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-scantype
+	ScanType *types.Value `json:"ScanType,omitempty"`
+
+	// SceneChangeDetect AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-scenechangedetect
+	SceneChangeDetect *types.Value `json:"SceneChangeDetect,omitempty"`
+
+	// Slices AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-slices
+	Slices *types.Value `json:"Slices,omitempty"`
+
+	// Tier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-tier
+	Tier *types.Value `json:"Tier,omitempty"`
+
+	// TimecodeInsertion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-h265settings.html#cfn-medialive-channel-h265settings-timecodeinsertion
+	TimecodeInsertion *types.Value `json:"TimecodeInsertion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_H265Settings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.H265Settings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hdr10settings.go b/goformation/cloudformation/medialive/aws-medialive-channel_hdr10settings.go
new file mode 100644
index 0000000000..fd2c091f78
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_hdr10settings.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_Hdr10Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.Hdr10Settings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hdr10settings.html
+type Channel_Hdr10Settings struct {
+
+	// MaxCll AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hdr10settings.html#cfn-medialive-channel-hdr10settings-maxcll
+	MaxCll *types.Value `json:"MaxCll,omitempty"`
+
+	// MaxFall AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hdr10settings.html#cfn-medialive-channel-hdr10settings-maxfall
+	MaxFall *types.Value `json:"MaxFall,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_Hdr10Settings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.Hdr10Settings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hlsakamaisettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_hlsakamaisettings.go
new file mode 100644
index 0000000000..f73670248e
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_hlsakamaisettings.go
@@ -0,0 +1,67 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_HlsAkamaiSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.HlsAkamaiSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsakamaisettings.html
+type Channel_HlsAkamaiSettings struct {
+
+	// ConnectionRetryInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsakamaisettings.html#cfn-medialive-channel-hlsakamaisettings-connectionretryinterval
+	ConnectionRetryInterval *types.Value `json:"ConnectionRetryInterval,omitempty"`
+
+	// FilecacheDuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsakamaisettings.html#cfn-medialive-channel-hlsakamaisettings-filecacheduration
+	FilecacheDuration *types.Value `json:"FilecacheDuration,omitempty"`
+
+	// HttpTransferMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsakamaisettings.html#cfn-medialive-channel-hlsakamaisettings-httptransfermode
+	HttpTransferMode *types.Value `json:"HttpTransferMode,omitempty"`
+
+	// NumRetries AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsakamaisettings.html#cfn-medialive-channel-hlsakamaisettings-numretries
+	NumRetries *types.Value `json:"NumRetries,omitempty"`
+
+	// RestartDelay AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsakamaisettings.html#cfn-medialive-channel-hlsakamaisettings-restartdelay
+	RestartDelay *types.Value `json:"RestartDelay,omitempty"`
+
+	// Salt AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsakamaisettings.html#cfn-medialive-channel-hlsakamaisettings-salt
+	Salt *types.Value `json:"Salt,omitempty"`
+
+	// Token AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsakamaisettings.html#cfn-medialive-channel-hlsakamaisettings-token
+	Token *types.Value `json:"Token,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_HlsAkamaiSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.HlsAkamaiSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hlsbasicputsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_hlsbasicputsettings.go
new file mode 100644
index 0000000000..675a8285d1
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_hlsbasicputsettings.go
@@ -0,0 +1,52 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_HlsBasicPutSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.HlsBasicPutSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsbasicputsettings.html
+type Channel_HlsBasicPutSettings struct {
+
+	// ConnectionRetryInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsbasicputsettings.html#cfn-medialive-channel-hlsbasicputsettings-connectionretryinterval
+	ConnectionRetryInterval *types.Value `json:"ConnectionRetryInterval,omitempty"`
+
+	// FilecacheDuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsbasicputsettings.html#cfn-medialive-channel-hlsbasicputsettings-filecacheduration
+	FilecacheDuration *types.Value `json:"FilecacheDuration,omitempty"`
+
+	// NumRetries AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsbasicputsettings.html#cfn-medialive-channel-hlsbasicputsettings-numretries
+	NumRetries *types.Value `json:"NumRetries,omitempty"`
+
+	// RestartDelay AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsbasicputsettings.html#cfn-medialive-channel-hlsbasicputsettings-restartdelay
+	RestartDelay *types.Value `json:"RestartDelay,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_HlsBasicPutSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.HlsBasicPutSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hlscdnsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_hlscdnsettings.go
new file mode 100644
index 0000000000..071c6f7644
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_hlscdnsettings.go
@@ -0,0 +1,55 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_HlsCdnSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.HlsCdnSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlscdnsettings.html
+type Channel_HlsCdnSettings struct {
+
+	// HlsAkamaiSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlscdnsettings.html#cfn-medialive-channel-hlscdnsettings-hlsakamaisettings
+	HlsAkamaiSettings *Channel_HlsAkamaiSettings `json:"HlsAkamaiSettings,omitempty"`
+
+	// HlsBasicPutSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlscdnsettings.html#cfn-medialive-channel-hlscdnsettings-hlsbasicputsettings
+	HlsBasicPutSettings *Channel_HlsBasicPutSettings `json:"HlsBasicPutSettings,omitempty"`
+
+	// HlsMediaStoreSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlscdnsettings.html#cfn-medialive-channel-hlscdnsettings-hlsmediastoresettings
+	HlsMediaStoreSettings *Channel_HlsMediaStoreSettings `json:"HlsMediaStoreSettings,omitempty"`
+
+	// HlsS3Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlscdnsettings.html#cfn-medialive-channel-hlscdnsettings-hlss3settings
+	HlsS3Settings *Channel_HlsS3Settings `json:"HlsS3Settings,omitempty"`
+
+	// HlsWebdavSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlscdnsettings.html#cfn-medialive-channel-hlscdnsettings-hlswebdavsettings
+	HlsWebdavSettings *Channel_HlsWebdavSettings `json:"HlsWebdavSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_HlsCdnSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.HlsCdnSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hlsgroupsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_hlsgroupsettings.go
new file mode 100644
index 0000000000..0a30600c3d
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_hlsgroupsettings.go
@@ -0,0 +1,242 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_HlsGroupSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.HlsGroupSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html
+type Channel_HlsGroupSettings struct {
+
+	// AdMarkers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-admarkers
+	AdMarkers *types.Value `json:"AdMarkers,omitempty"`
+
+	// BaseUrlContent AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-baseurlcontent
+	BaseUrlContent *types.Value `json:"BaseUrlContent,omitempty"`
+
+	// BaseUrlContent1 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-baseurlcontent1
+	BaseUrlContent1 *types.Value `json:"BaseUrlContent1,omitempty"`
+
+	// BaseUrlManifest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-baseurlmanifest
+	BaseUrlManifest *types.Value `json:"BaseUrlManifest,omitempty"`
+
+	// BaseUrlManifest1 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-baseurlmanifest1
+	BaseUrlManifest1 *types.Value `json:"BaseUrlManifest1,omitempty"`
+
+	// CaptionLanguageMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-captionlanguagemappings
+	CaptionLanguageMappings []Channel_CaptionLanguageMapping `json:"CaptionLanguageMappings,omitempty"`
+
+	// CaptionLanguageSetting AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-captionlanguagesetting
+	CaptionLanguageSetting *types.Value `json:"CaptionLanguageSetting,omitempty"`
+
+	// ClientCache AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-clientcache
+	ClientCache *types.Value `json:"ClientCache,omitempty"`
+
+	// CodecSpecification AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-codecspecification
+	CodecSpecification *types.Value `json:"CodecSpecification,omitempty"`
+
+	// ConstantIv AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-constantiv
+	ConstantIv *types.Value `json:"ConstantIv,omitempty"`
+
+	// Destination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-destination
+	Destination *Channel_OutputLocationRef `json:"Destination,omitempty"`
+
+	// DirectoryStructure AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-directorystructure
+	DirectoryStructure *types.Value `json:"DirectoryStructure,omitempty"`
+
+	// DiscontinuityTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-discontinuitytags
+	DiscontinuityTags *types.Value `json:"DiscontinuityTags,omitempty"`
+
+	// EncryptionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-encryptiontype
+	EncryptionType *types.Value `json:"EncryptionType,omitempty"`
+
+	// HlsCdnSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-hlscdnsettings
+	HlsCdnSettings *Channel_HlsCdnSettings `json:"HlsCdnSettings,omitempty"`
+
+	// HlsId3SegmentTagging AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-hlsid3segmenttagging
+	HlsId3SegmentTagging *types.Value `json:"HlsId3SegmentTagging,omitempty"`
+
+	// IFrameOnlyPlaylists AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-iframeonlyplaylists
+	IFrameOnlyPlaylists *types.Value `json:"IFrameOnlyPlaylists,omitempty"`
+
+	// IncompleteSegmentBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-incompletesegmentbehavior
+	IncompleteSegmentBehavior *types.Value `json:"IncompleteSegmentBehavior,omitempty"`
+
+	// IndexNSegments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-indexnsegments
+	IndexNSegments *types.Value `json:"IndexNSegments,omitempty"`
+
+	// InputLossAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-inputlossaction
+	InputLossAction *types.Value `json:"InputLossAction,omitempty"`
+
+	// IvInManifest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-ivinmanifest
+	IvInManifest *types.Value `json:"IvInManifest,omitempty"`
+
+	// IvSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-ivsource
+	IvSource *types.Value `json:"IvSource,omitempty"`
+
+	// KeepSegments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-keepsegments
+	KeepSegments *types.Value `json:"KeepSegments,omitempty"`
+
+	// KeyFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-keyformat
+	KeyFormat *types.Value `json:"KeyFormat,omitempty"`
+
+	// KeyFormatVersions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-keyformatversions
+	KeyFormatVersions *types.Value `json:"KeyFormatVersions,omitempty"`
+
+	// KeyProviderSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-keyprovidersettings
+	KeyProviderSettings *Channel_KeyProviderSettings `json:"KeyProviderSettings,omitempty"`
+
+	// ManifestCompression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-manifestcompression
+	ManifestCompression *types.Value `json:"ManifestCompression,omitempty"`
+
+	// ManifestDurationFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-manifestdurationformat
+	ManifestDurationFormat *types.Value `json:"ManifestDurationFormat,omitempty"`
+
+	// MinSegmentLength AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-minsegmentlength
+	MinSegmentLength *types.Value `json:"MinSegmentLength,omitempty"`
+
+	// Mode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-mode
+	Mode *types.Value `json:"Mode,omitempty"`
+
+	// OutputSelection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-outputselection
+	OutputSelection *types.Value `json:"OutputSelection,omitempty"`
+
+	// ProgramDateTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-programdatetime
+	ProgramDateTime *types.Value `json:"ProgramDateTime,omitempty"`
+
+	// ProgramDateTimePeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-programdatetimeperiod
+	ProgramDateTimePeriod *types.Value `json:"ProgramDateTimePeriod,omitempty"`
+
+	// RedundantManifest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-redundantmanifest
+	RedundantManifest *types.Value `json:"RedundantManifest,omitempty"`
+
+	// SegmentLength AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-segmentlength
+	SegmentLength *types.Value `json:"SegmentLength,omitempty"`
+
+	// SegmentationMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-segmentationmode
+	SegmentationMode *types.Value `json:"SegmentationMode,omitempty"`
+
+	// SegmentsPerSubdirectory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-segmentspersubdirectory
+	SegmentsPerSubdirectory *types.Value `json:"SegmentsPerSubdirectory,omitempty"`
+
+	// StreamInfResolution AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-streaminfresolution
+	StreamInfResolution *types.Value `json:"StreamInfResolution,omitempty"`
+
+	// TimedMetadataId3Frame AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-timedmetadataid3frame
+	TimedMetadataId3Frame *types.Value `json:"TimedMetadataId3Frame,omitempty"`
+
+	// TimedMetadataId3Period AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-timedmetadataid3period
+	TimedMetadataId3Period *types.Value `json:"TimedMetadataId3Period,omitempty"`
+
+	// TimestampDeltaMilliseconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-timestampdeltamilliseconds
+	TimestampDeltaMilliseconds *types.Value `json:"TimestampDeltaMilliseconds,omitempty"`
+
+	// TsFileMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsgroupsettings.html#cfn-medialive-channel-hlsgroupsettings-tsfilemode
+	TsFileMode *types.Value `json:"TsFileMode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_HlsGroupSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.HlsGroupSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hlsinputsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_hlsinputsettings.go
new file mode 100644
index 0000000000..5c9051c740
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_hlsinputsettings.go
@@ -0,0 +1,57 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_HlsInputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.HlsInputSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html
+type Channel_HlsInputSettings struct {
+
+	// Bandwidth AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html#cfn-medialive-channel-hlsinputsettings-bandwidth
+	Bandwidth *types.Value `json:"Bandwidth,omitempty"`
+
+	// BufferSegments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html#cfn-medialive-channel-hlsinputsettings-buffersegments
+	BufferSegments *types.Value `json:"BufferSegments,omitempty"`
+
+	// Retries AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html#cfn-medialive-channel-hlsinputsettings-retries
+	Retries *types.Value `json:"Retries,omitempty"`
+
+	// RetryInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html#cfn-medialive-channel-hlsinputsettings-retryinterval
+	RetryInterval *types.Value `json:"RetryInterval,omitempty"`
+
+	// Scte35Source AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsinputsettings.html#cfn-medialive-channel-hlsinputsettings-scte35source
+	Scte35Source *types.Value `json:"Scte35Source,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_HlsInputSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.HlsInputSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hlsmediastoresettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_hlsmediastoresettings.go
new file mode 100644
index 0000000000..4b05d5edbf
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_hlsmediastoresettings.go
@@ -0,0 +1,57 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_HlsMediaStoreSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.HlsMediaStoreSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsmediastoresettings.html
+type Channel_HlsMediaStoreSettings struct {
+
+	// ConnectionRetryInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsmediastoresettings.html#cfn-medialive-channel-hlsmediastoresettings-connectionretryinterval
+	ConnectionRetryInterval *types.Value `json:"ConnectionRetryInterval,omitempty"`
+
+	// FilecacheDuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsmediastoresettings.html#cfn-medialive-channel-hlsmediastoresettings-filecacheduration
+	FilecacheDuration *types.Value `json:"FilecacheDuration,omitempty"`
+
+	// MediaStoreStorageClass AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsmediastoresettings.html#cfn-medialive-channel-hlsmediastoresettings-mediastorestorageclass
+	MediaStoreStorageClass *types.Value `json:"MediaStoreStorageClass,omitempty"`
+
+	// NumRetries AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsmediastoresettings.html#cfn-medialive-channel-hlsmediastoresettings-numretries
+	NumRetries *types.Value `json:"NumRetries,omitempty"`
+
+	// RestartDelay AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsmediastoresettings.html#cfn-medialive-channel-hlsmediastoresettings-restartdelay
+	RestartDelay *types.Value `json:"RestartDelay,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_HlsMediaStoreSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.HlsMediaStoreSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hlsoutputsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_hlsoutputsettings.go
new file mode 100644
index 0000000000..b7f8087674
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_hlsoutputsettings.go
@@ -0,0 +1,52 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_HlsOutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.HlsOutputSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsoutputsettings.html
+type Channel_HlsOutputSettings struct {
+
+	// H265PackagingType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsoutputsettings.html#cfn-medialive-channel-hlsoutputsettings-h265packagingtype
+	H265PackagingType *types.Value `json:"H265PackagingType,omitempty"`
+
+	// HlsSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsoutputsettings.html#cfn-medialive-channel-hlsoutputsettings-hlssettings
+	HlsSettings *Channel_HlsSettings `json:"HlsSettings,omitempty"`
+
+	// NameModifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsoutputsettings.html#cfn-medialive-channel-hlsoutputsettings-namemodifier
+	NameModifier *types.Value `json:"NameModifier,omitempty"`
+
+	// SegmentModifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlsoutputsettings.html#cfn-medialive-channel-hlsoutputsettings-segmentmodifier
+	SegmentModifier *types.Value `json:"SegmentModifier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_HlsOutputSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.HlsOutputSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hlss3settings.go b/goformation/cloudformation/medialive/aws-medialive-channel_hlss3settings.go
new file mode 100644
index 0000000000..e1cf51ad21
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_hlss3settings.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_HlsS3Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.HlsS3Settings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlss3settings.html
+type Channel_HlsS3Settings struct {
+
+	// CannedAcl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlss3settings.html#cfn-medialive-channel-hlss3settings-cannedacl
+	CannedAcl *types.Value `json:"CannedAcl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_HlsS3Settings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.HlsS3Settings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hlssettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_hlssettings.go
new file mode 100644
index 0000000000..2e17962b97
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_hlssettings.go
@@ -0,0 +1,50 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_HlsSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.HlsSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlssettings.html
+type Channel_HlsSettings struct {
+
+	// AudioOnlyHlsSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlssettings.html#cfn-medialive-channel-hlssettings-audioonlyhlssettings
+	AudioOnlyHlsSettings *Channel_AudioOnlyHlsSettings `json:"AudioOnlyHlsSettings,omitempty"`
+
+	// Fmp4HlsSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlssettings.html#cfn-medialive-channel-hlssettings-fmp4hlssettings
+	Fmp4HlsSettings *Channel_Fmp4HlsSettings `json:"Fmp4HlsSettings,omitempty"`
+
+	// FrameCaptureHlsSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlssettings.html#cfn-medialive-channel-hlssettings-framecapturehlssettings
+	FrameCaptureHlsSettings *Channel_FrameCaptureHlsSettings `json:"FrameCaptureHlsSettings,omitempty"`
+
+	// StandardHlsSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlssettings.html#cfn-medialive-channel-hlssettings-standardhlssettings
+	StandardHlsSettings *Channel_StandardHlsSettings `json:"StandardHlsSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_HlsSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.HlsSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_hlswebdavsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_hlswebdavsettings.go
new file mode 100644
index 0000000000..0d66d76454
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_hlswebdavsettings.go
@@ -0,0 +1,57 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_HlsWebdavSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.HlsWebdavSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlswebdavsettings.html
+type Channel_HlsWebdavSettings struct {
+
+	// ConnectionRetryInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlswebdavsettings.html#cfn-medialive-channel-hlswebdavsettings-connectionretryinterval
+	ConnectionRetryInterval *types.Value `json:"ConnectionRetryInterval,omitempty"`
+
+	// FilecacheDuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlswebdavsettings.html#cfn-medialive-channel-hlswebdavsettings-filecacheduration
+	FilecacheDuration *types.Value `json:"FilecacheDuration,omitempty"`
+
+	// HttpTransferMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlswebdavsettings.html#cfn-medialive-channel-hlswebdavsettings-httptransfermode
+	HttpTransferMode *types.Value `json:"HttpTransferMode,omitempty"`
+
+	// NumRetries AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlswebdavsettings.html#cfn-medialive-channel-hlswebdavsettings-numretries
+	NumRetries *types.Value `json:"NumRetries,omitempty"`
+
+	// RestartDelay AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-hlswebdavsettings.html#cfn-medialive-channel-hlswebdavsettings-restartdelay
+	RestartDelay *types.Value `json:"RestartDelay,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_HlsWebdavSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.HlsWebdavSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_htmlmotiongraphicssettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_htmlmotiongraphicssettings.go
new file mode 100644
index 0000000000..e41f551236
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_htmlmotiongraphicssettings.go
@@ -0,0 +1,30 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_HtmlMotionGraphicsSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.HtmlMotionGraphicsSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-htmlmotiongraphicssettings.html
+type Channel_HtmlMotionGraphicsSettings struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_HtmlMotionGraphicsSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.HtmlMotionGraphicsSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_inputattachment.go b/goformation/cloudformation/medialive/aws-medialive-channel_inputattachment.go
new file mode 100644
index 0000000000..7d5e1361be
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_inputattachment.go
@@ -0,0 +1,52 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_InputAttachment AWS CloudFormation Resource (AWS::MediaLive::Channel.InputAttachment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputattachment.html
+type Channel_InputAttachment struct {
+
+	// AutomaticInputFailoverSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputattachment.html#cfn-medialive-channel-inputattachment-automaticinputfailoversettings
+	AutomaticInputFailoverSettings *Channel_AutomaticInputFailoverSettings `json:"AutomaticInputFailoverSettings,omitempty"`
+
+	// InputAttachmentName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputattachment.html#cfn-medialive-channel-inputattachment-inputattachmentname
+	InputAttachmentName *types.Value `json:"InputAttachmentName,omitempty"`
+
+	// InputId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputattachment.html#cfn-medialive-channel-inputattachment-inputid
+	InputId *types.Value `json:"InputId,omitempty"`
+
+	// InputSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputattachment.html#cfn-medialive-channel-inputattachment-inputsettings
+	InputSettings *Channel_InputSettings `json:"InputSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_InputAttachment) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.InputAttachment"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_inputchannellevel.go b/goformation/cloudformation/medialive/aws-medialive-channel_inputchannellevel.go
new file mode 100644
index 0000000000..0ffd669221
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_inputchannellevel.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_InputChannelLevel AWS CloudFormation Resource (AWS::MediaLive::Channel.InputChannelLevel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputchannellevel.html
+type Channel_InputChannelLevel struct {
+
+	// Gain AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputchannellevel.html#cfn-medialive-channel-inputchannellevel-gain
+	Gain *types.Value `json:"Gain,omitempty"`
+
+	// InputChannel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputchannellevel.html#cfn-medialive-channel-inputchannellevel-inputchannel
+	InputChannel *types.Value `json:"InputChannel,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_InputChannelLevel) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.InputChannelLevel"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_inputlocation.go b/goformation/cloudformation/medialive/aws-medialive-channel_inputlocation.go
new file mode 100644
index 0000000000..7c6210f776
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_inputlocation.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_InputLocation AWS CloudFormation Resource (AWS::MediaLive::Channel.InputLocation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputlocation.html
+type Channel_InputLocation struct {
+
+	// PasswordParam AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputlocation.html#cfn-medialive-channel-inputlocation-passwordparam
+	PasswordParam *types.Value `json:"PasswordParam,omitempty"`
+
+	// Uri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputlocation.html#cfn-medialive-channel-inputlocation-uri
+	Uri *types.Value `json:"Uri,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputlocation.html#cfn-medialive-channel-inputlocation-username
+	Username *types.Value `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 *Channel_InputLocation) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.InputLocation"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_inputlossbehavior.go b/goformation/cloudformation/medialive/aws-medialive-channel_inputlossbehavior.go
new file mode 100644
index 0000000000..e540e51f13
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_inputlossbehavior.go
@@ -0,0 +1,57 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_InputLossBehavior AWS CloudFormation Resource (AWS::MediaLive::Channel.InputLossBehavior)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputlossbehavior.html
+type Channel_InputLossBehavior struct {
+
+	// BlackFrameMsec AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputlossbehavior.html#cfn-medialive-channel-inputlossbehavior-blackframemsec
+	BlackFrameMsec *types.Value `json:"BlackFrameMsec,omitempty"`
+
+	// InputLossImageColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputlossbehavior.html#cfn-medialive-channel-inputlossbehavior-inputlossimagecolor
+	InputLossImageColor *types.Value `json:"InputLossImageColor,omitempty"`
+
+	// InputLossImageSlate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputlossbehavior.html#cfn-medialive-channel-inputlossbehavior-inputlossimageslate
+	InputLossImageSlate *Channel_InputLocation `json:"InputLossImageSlate,omitempty"`
+
+	// InputLossImageType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputlossbehavior.html#cfn-medialive-channel-inputlossbehavior-inputlossimagetype
+	InputLossImageType *types.Value `json:"InputLossImageType,omitempty"`
+
+	// RepeatFrameMsec AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputlossbehavior.html#cfn-medialive-channel-inputlossbehavior-repeatframemsec
+	RepeatFrameMsec *types.Value `json:"RepeatFrameMsec,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_InputLossBehavior) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.InputLossBehavior"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_inputlossfailoversettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_inputlossfailoversettings.go
new file mode 100644
index 0000000000..517c7ec567
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_inputlossfailoversettings.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_InputLossFailoverSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.InputLossFailoverSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputlossfailoversettings.html
+type Channel_InputLossFailoverSettings struct {
+
+	// InputLossThresholdMsec AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputlossfailoversettings.html#cfn-medialive-channel-inputlossfailoversettings-inputlossthresholdmsec
+	InputLossThresholdMsec *types.Value `json:"InputLossThresholdMsec,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_InputLossFailoverSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.InputLossFailoverSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_inputsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_inputsettings.go
new file mode 100644
index 0000000000..a9933098af
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_inputsettings.go
@@ -0,0 +1,82 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_InputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.InputSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html
+type Channel_InputSettings struct {
+
+	// AudioSelectors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-audioselectors
+	AudioSelectors []Channel_AudioSelector `json:"AudioSelectors,omitempty"`
+
+	// CaptionSelectors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-captionselectors
+	CaptionSelectors []Channel_CaptionSelector `json:"CaptionSelectors,omitempty"`
+
+	// DeblockFilter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-deblockfilter
+	DeblockFilter *types.Value `json:"DeblockFilter,omitempty"`
+
+	// DenoiseFilter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-denoisefilter
+	DenoiseFilter *types.Value `json:"DenoiseFilter,omitempty"`
+
+	// FilterStrength AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-filterstrength
+	FilterStrength *types.Value `json:"FilterStrength,omitempty"`
+
+	// InputFilter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-inputfilter
+	InputFilter *types.Value `json:"InputFilter,omitempty"`
+
+	// NetworkInputSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-networkinputsettings
+	NetworkInputSettings *Channel_NetworkInputSettings `json:"NetworkInputSettings,omitempty"`
+
+	// Smpte2038DataPreference AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-smpte2038datapreference
+	Smpte2038DataPreference *types.Value `json:"Smpte2038DataPreference,omitempty"`
+
+	// SourceEndBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-sourceendbehavior
+	SourceEndBehavior *types.Value `json:"SourceEndBehavior,omitempty"`
+
+	// VideoSelector AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputsettings.html#cfn-medialive-channel-inputsettings-videoselector
+	VideoSelector *Channel_VideoSelector `json:"VideoSelector,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_InputSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.InputSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_inputspecification.go b/goformation/cloudformation/medialive/aws-medialive-channel_inputspecification.go
new file mode 100644
index 0000000000..cf98918b29
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_inputspecification.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_InputSpecification AWS CloudFormation Resource (AWS::MediaLive::Channel.InputSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputspecification.html
+type Channel_InputSpecification struct {
+
+	// Codec AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputspecification.html#cfn-medialive-channel-inputspecification-codec
+	Codec *types.Value `json:"Codec,omitempty"`
+
+	// MaximumBitrate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputspecification.html#cfn-medialive-channel-inputspecification-maximumbitrate
+	MaximumBitrate *types.Value `json:"MaximumBitrate,omitempty"`
+
+	// Resolution AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-inputspecification.html#cfn-medialive-channel-inputspecification-resolution
+	Resolution *types.Value `json:"Resolution,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_InputSpecification) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.InputSpecification"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_keyprovidersettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_keyprovidersettings.go
new file mode 100644
index 0000000000..eacb76d2c8
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_keyprovidersettings.go
@@ -0,0 +1,35 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_KeyProviderSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.KeyProviderSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-keyprovidersettings.html
+type Channel_KeyProviderSettings struct {
+
+	// StaticKeySettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-keyprovidersettings.html#cfn-medialive-channel-keyprovidersettings-statickeysettings
+	StaticKeySettings *Channel_StaticKeySettings `json:"StaticKeySettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_KeyProviderSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.KeyProviderSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_m2tssettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_m2tssettings.go
new file mode 100644
index 0000000000..b9a0af893f
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_m2tssettings.go
@@ -0,0 +1,267 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_M2tsSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.M2tsSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html
+type Channel_M2tsSettings struct {
+
+	// AbsentInputAudioBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-absentinputaudiobehavior
+	AbsentInputAudioBehavior *types.Value `json:"AbsentInputAudioBehavior,omitempty"`
+
+	// Arib AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-arib
+	Arib *types.Value `json:"Arib,omitempty"`
+
+	// AribCaptionsPid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-aribcaptionspid
+	AribCaptionsPid *types.Value `json:"AribCaptionsPid,omitempty"`
+
+	// AribCaptionsPidControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-aribcaptionspidcontrol
+	AribCaptionsPidControl *types.Value `json:"AribCaptionsPidControl,omitempty"`
+
+	// AudioBufferModel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-audiobuffermodel
+	AudioBufferModel *types.Value `json:"AudioBufferModel,omitempty"`
+
+	// AudioFramesPerPes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-audioframesperpes
+	AudioFramesPerPes *types.Value `json:"AudioFramesPerPes,omitempty"`
+
+	// AudioPids AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-audiopids
+	AudioPids *types.Value `json:"AudioPids,omitempty"`
+
+	// AudioStreamType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-audiostreamtype
+	AudioStreamType *types.Value `json:"AudioStreamType,omitempty"`
+
+	// Bitrate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-bitrate
+	Bitrate *types.Value `json:"Bitrate,omitempty"`
+
+	// BufferModel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-buffermodel
+	BufferModel *types.Value `json:"BufferModel,omitempty"`
+
+	// CcDescriptor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-ccdescriptor
+	CcDescriptor *types.Value `json:"CcDescriptor,omitempty"`
+
+	// DvbNitSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-dvbnitsettings
+	DvbNitSettings *Channel_DvbNitSettings `json:"DvbNitSettings,omitempty"`
+
+	// DvbSdtSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-dvbsdtsettings
+	DvbSdtSettings *Channel_DvbSdtSettings `json:"DvbSdtSettings,omitempty"`
+
+	// DvbSubPids AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-dvbsubpids
+	DvbSubPids *types.Value `json:"DvbSubPids,omitempty"`
+
+	// DvbTdtSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-dvbtdtsettings
+	DvbTdtSettings *Channel_DvbTdtSettings `json:"DvbTdtSettings,omitempty"`
+
+	// DvbTeletextPid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-dvbteletextpid
+	DvbTeletextPid *types.Value `json:"DvbTeletextPid,omitempty"`
+
+	// Ebif AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-ebif
+	Ebif *types.Value `json:"Ebif,omitempty"`
+
+	// EbpAudioInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-ebpaudiointerval
+	EbpAudioInterval *types.Value `json:"EbpAudioInterval,omitempty"`
+
+	// EbpLookaheadMs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-ebplookaheadms
+	EbpLookaheadMs *types.Value `json:"EbpLookaheadMs,omitempty"`
+
+	// EbpPlacement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-ebpplacement
+	EbpPlacement *types.Value `json:"EbpPlacement,omitempty"`
+
+	// EcmPid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-ecmpid
+	EcmPid *types.Value `json:"EcmPid,omitempty"`
+
+	// EsRateInPes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-esrateinpes
+	EsRateInPes *types.Value `json:"EsRateInPes,omitempty"`
+
+	// EtvPlatformPid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-etvplatformpid
+	EtvPlatformPid *types.Value `json:"EtvPlatformPid,omitempty"`
+
+	// EtvSignalPid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-etvsignalpid
+	EtvSignalPid *types.Value `json:"EtvSignalPid,omitempty"`
+
+	// FragmentTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-fragmenttime
+	FragmentTime *types.Value `json:"FragmentTime,omitempty"`
+
+	// Klv AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-klv
+	Klv *types.Value `json:"Klv,omitempty"`
+
+	// KlvDataPids AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-klvdatapids
+	KlvDataPids *types.Value `json:"KlvDataPids,omitempty"`
+
+	// NielsenId3Behavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-nielsenid3behavior
+	NielsenId3Behavior *types.Value `json:"NielsenId3Behavior,omitempty"`
+
+	// NullPacketBitrate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-nullpacketbitrate
+	NullPacketBitrate *types.Value `json:"NullPacketBitrate,omitempty"`
+
+	// PatInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-patinterval
+	PatInterval *types.Value `json:"PatInterval,omitempty"`
+
+	// PcrControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-pcrcontrol
+	PcrControl *types.Value `json:"PcrControl,omitempty"`
+
+	// PcrPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-pcrperiod
+	PcrPeriod *types.Value `json:"PcrPeriod,omitempty"`
+
+	// PcrPid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-pcrpid
+	PcrPid *types.Value `json:"PcrPid,omitempty"`
+
+	// PmtInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-pmtinterval
+	PmtInterval *types.Value `json:"PmtInterval,omitempty"`
+
+	// PmtPid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-pmtpid
+	PmtPid *types.Value `json:"PmtPid,omitempty"`
+
+	// ProgramNum AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-programnum
+	ProgramNum *types.Value `json:"ProgramNum,omitempty"`
+
+	// RateMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-ratemode
+	RateMode *types.Value `json:"RateMode,omitempty"`
+
+	// Scte27Pids AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-scte27pids
+	Scte27Pids *types.Value `json:"Scte27Pids,omitempty"`
+
+	// Scte35Control AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-scte35control
+	Scte35Control *types.Value `json:"Scte35Control,omitempty"`
+
+	// Scte35Pid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-scte35pid
+	Scte35Pid *types.Value `json:"Scte35Pid,omitempty"`
+
+	// SegmentationMarkers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-segmentationmarkers
+	SegmentationMarkers *types.Value `json:"SegmentationMarkers,omitempty"`
+
+	// SegmentationStyle AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-segmentationstyle
+	SegmentationStyle *types.Value `json:"SegmentationStyle,omitempty"`
+
+	// SegmentationTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-segmentationtime
+	SegmentationTime *types.Value `json:"SegmentationTime,omitempty"`
+
+	// TimedMetadataBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-timedmetadatabehavior
+	TimedMetadataBehavior *types.Value `json:"TimedMetadataBehavior,omitempty"`
+
+	// TimedMetadataPid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-timedmetadatapid
+	TimedMetadataPid *types.Value `json:"TimedMetadataPid,omitempty"`
+
+	// TransportStreamId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-transportstreamid
+	TransportStreamId *types.Value `json:"TransportStreamId,omitempty"`
+
+	// VideoPid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m2tssettings.html#cfn-medialive-channel-m2tssettings-videopid
+	VideoPid *types.Value `json:"VideoPid,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_M2tsSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.M2tsSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_m3u8settings.go b/goformation/cloudformation/medialive/aws-medialive-channel_m3u8settings.go
new file mode 100644
index 0000000000..e42c67a8cf
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_m3u8settings.go
@@ -0,0 +1,117 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_M3u8Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.M3u8Settings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m3u8settings.html
+type Channel_M3u8Settings struct {
+
+	// AudioFramesPerPes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m3u8settings.html#cfn-medialive-channel-m3u8settings-audioframesperpes
+	AudioFramesPerPes *types.Value `json:"AudioFramesPerPes,omitempty"`
+
+	// AudioPids AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m3u8settings.html#cfn-medialive-channel-m3u8settings-audiopids
+	AudioPids *types.Value `json:"AudioPids,omitempty"`
+
+	// EcmPid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m3u8settings.html#cfn-medialive-channel-m3u8settings-ecmpid
+	EcmPid *types.Value `json:"EcmPid,omitempty"`
+
+	// NielsenId3Behavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m3u8settings.html#cfn-medialive-channel-m3u8settings-nielsenid3behavior
+	NielsenId3Behavior *types.Value `json:"NielsenId3Behavior,omitempty"`
+
+	// PatInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m3u8settings.html#cfn-medialive-channel-m3u8settings-patinterval
+	PatInterval *types.Value `json:"PatInterval,omitempty"`
+
+	// PcrControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m3u8settings.html#cfn-medialive-channel-m3u8settings-pcrcontrol
+	PcrControl *types.Value `json:"PcrControl,omitempty"`
+
+	// PcrPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m3u8settings.html#cfn-medialive-channel-m3u8settings-pcrperiod
+	PcrPeriod *types.Value `json:"PcrPeriod,omitempty"`
+
+	// PcrPid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m3u8settings.html#cfn-medialive-channel-m3u8settings-pcrpid
+	PcrPid *types.Value `json:"PcrPid,omitempty"`
+
+	// PmtInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m3u8settings.html#cfn-medialive-channel-m3u8settings-pmtinterval
+	PmtInterval *types.Value `json:"PmtInterval,omitempty"`
+
+	// PmtPid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m3u8settings.html#cfn-medialive-channel-m3u8settings-pmtpid
+	PmtPid *types.Value `json:"PmtPid,omitempty"`
+
+	// ProgramNum AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m3u8settings.html#cfn-medialive-channel-m3u8settings-programnum
+	ProgramNum *types.Value `json:"ProgramNum,omitempty"`
+
+	// Scte35Behavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m3u8settings.html#cfn-medialive-channel-m3u8settings-scte35behavior
+	Scte35Behavior *types.Value `json:"Scte35Behavior,omitempty"`
+
+	// Scte35Pid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m3u8settings.html#cfn-medialive-channel-m3u8settings-scte35pid
+	Scte35Pid *types.Value `json:"Scte35Pid,omitempty"`
+
+	// TimedMetadataBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m3u8settings.html#cfn-medialive-channel-m3u8settings-timedmetadatabehavior
+	TimedMetadataBehavior *types.Value `json:"TimedMetadataBehavior,omitempty"`
+
+	// TimedMetadataPid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m3u8settings.html#cfn-medialive-channel-m3u8settings-timedmetadatapid
+	TimedMetadataPid *types.Value `json:"TimedMetadataPid,omitempty"`
+
+	// TransportStreamId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m3u8settings.html#cfn-medialive-channel-m3u8settings-transportstreamid
+	TransportStreamId *types.Value `json:"TransportStreamId,omitempty"`
+
+	// VideoPid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-m3u8settings.html#cfn-medialive-channel-m3u8settings-videopid
+	VideoPid *types.Value `json:"VideoPid,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_M3u8Settings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.M3u8Settings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_mediapackagegroupsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_mediapackagegroupsettings.go
new file mode 100644
index 0000000000..d2bb643aa8
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_mediapackagegroupsettings.go
@@ -0,0 +1,35 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_MediaPackageGroupSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.MediaPackageGroupSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mediapackagegroupsettings.html
+type Channel_MediaPackageGroupSettings struct {
+
+	// Destination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mediapackagegroupsettings.html#cfn-medialive-channel-mediapackagegroupsettings-destination
+	Destination *Channel_OutputLocationRef `json:"Destination,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_MediaPackageGroupSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.MediaPackageGroupSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_mediapackageoutputdestinationsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_mediapackageoutputdestinationsettings.go
new file mode 100644
index 0000000000..76c4992576
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_mediapackageoutputdestinationsettings.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_MediaPackageOutputDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.MediaPackageOutputDestinationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mediapackageoutputdestinationsettings.html
+type Channel_MediaPackageOutputDestinationSettings struct {
+
+	// ChannelId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mediapackageoutputdestinationsettings.html#cfn-medialive-channel-mediapackageoutputdestinationsettings-channelid
+	ChannelId *types.Value `json:"ChannelId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_MediaPackageOutputDestinationSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.MediaPackageOutputDestinationSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_mediapackageoutputsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_mediapackageoutputsettings.go
new file mode 100644
index 0000000000..e5e70b3677
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_mediapackageoutputsettings.go
@@ -0,0 +1,30 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_MediaPackageOutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.MediaPackageOutputSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mediapackageoutputsettings.html
+type Channel_MediaPackageOutputSettings struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_MediaPackageOutputSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.MediaPackageOutputSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_motiongraphicsconfiguration.go b/goformation/cloudformation/medialive/aws-medialive-channel_motiongraphicsconfiguration.go
new file mode 100644
index 0000000000..652f3033b6
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_motiongraphicsconfiguration.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_MotionGraphicsConfiguration AWS CloudFormation Resource (AWS::MediaLive::Channel.MotionGraphicsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-motiongraphicsconfiguration.html
+type Channel_MotionGraphicsConfiguration struct {
+
+	// MotionGraphicsInsertion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-motiongraphicsconfiguration.html#cfn-medialive-channel-motiongraphicsconfiguration-motiongraphicsinsertion
+	MotionGraphicsInsertion *types.Value `json:"MotionGraphicsInsertion,omitempty"`
+
+	// MotionGraphicsSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-motiongraphicsconfiguration.html#cfn-medialive-channel-motiongraphicsconfiguration-motiongraphicssettings
+	MotionGraphicsSettings *Channel_MotionGraphicsSettings `json:"MotionGraphicsSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_MotionGraphicsConfiguration) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.MotionGraphicsConfiguration"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_motiongraphicssettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_motiongraphicssettings.go
new file mode 100644
index 0000000000..a7697f9da8
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_motiongraphicssettings.go
@@ -0,0 +1,35 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_MotionGraphicsSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.MotionGraphicsSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-motiongraphicssettings.html
+type Channel_MotionGraphicsSettings struct {
+
+	// HtmlMotionGraphicsSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-motiongraphicssettings.html#cfn-medialive-channel-motiongraphicssettings-htmlmotiongraphicssettings
+	HtmlMotionGraphicsSettings *Channel_HtmlMotionGraphicsSettings `json:"HtmlMotionGraphicsSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_MotionGraphicsSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.MotionGraphicsSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_mp2settings.go b/goformation/cloudformation/medialive/aws-medialive-channel_mp2settings.go
new file mode 100644
index 0000000000..aee056f74d
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_mp2settings.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_Mp2Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.Mp2Settings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mp2settings.html
+type Channel_Mp2Settings struct {
+
+	// Bitrate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mp2settings.html#cfn-medialive-channel-mp2settings-bitrate
+	Bitrate *types.Value `json:"Bitrate,omitempty"`
+
+	// CodingMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mp2settings.html#cfn-medialive-channel-mp2settings-codingmode
+	CodingMode *types.Value `json:"CodingMode,omitempty"`
+
+	// SampleRate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mp2settings.html#cfn-medialive-channel-mp2settings-samplerate
+	SampleRate *types.Value `json:"SampleRate,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_Mp2Settings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.Mp2Settings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_mpeg2filtersettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_mpeg2filtersettings.go
new file mode 100644
index 0000000000..f3c0fd7bac
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_mpeg2filtersettings.go
@@ -0,0 +1,35 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_Mpeg2FilterSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.Mpeg2FilterSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mpeg2filtersettings.html
+type Channel_Mpeg2FilterSettings struct {
+
+	// TemporalFilterSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mpeg2filtersettings.html#cfn-medialive-channel-mpeg2filtersettings-temporalfiltersettings
+	TemporalFilterSettings *Channel_TemporalFilterSettings `json:"TemporalFilterSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_Mpeg2FilterSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.Mpeg2FilterSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_mpeg2settings.go b/goformation/cloudformation/medialive/aws-medialive-channel_mpeg2settings.go
new file mode 100644
index 0000000000..2c28a0e153
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_mpeg2settings.go
@@ -0,0 +1,112 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_Mpeg2Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.Mpeg2Settings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mpeg2settings.html
+type Channel_Mpeg2Settings struct {
+
+	// AdaptiveQuantization AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mpeg2settings.html#cfn-medialive-channel-mpeg2settings-adaptivequantization
+	AdaptiveQuantization *types.Value `json:"AdaptiveQuantization,omitempty"`
+
+	// AfdSignaling AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mpeg2settings.html#cfn-medialive-channel-mpeg2settings-afdsignaling
+	AfdSignaling *types.Value `json:"AfdSignaling,omitempty"`
+
+	// ColorMetadata AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mpeg2settings.html#cfn-medialive-channel-mpeg2settings-colormetadata
+	ColorMetadata *types.Value `json:"ColorMetadata,omitempty"`
+
+	// ColorSpace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mpeg2settings.html#cfn-medialive-channel-mpeg2settings-colorspace
+	ColorSpace *types.Value `json:"ColorSpace,omitempty"`
+
+	// DisplayAspectRatio AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mpeg2settings.html#cfn-medialive-channel-mpeg2settings-displayaspectratio
+	DisplayAspectRatio *types.Value `json:"DisplayAspectRatio,omitempty"`
+
+	// FilterSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mpeg2settings.html#cfn-medialive-channel-mpeg2settings-filtersettings
+	FilterSettings *Channel_Mpeg2FilterSettings `json:"FilterSettings,omitempty"`
+
+	// FixedAfd AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mpeg2settings.html#cfn-medialive-channel-mpeg2settings-fixedafd
+	FixedAfd *types.Value `json:"FixedAfd,omitempty"`
+
+	// FramerateDenominator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mpeg2settings.html#cfn-medialive-channel-mpeg2settings-frameratedenominator
+	FramerateDenominator *types.Value `json:"FramerateDenominator,omitempty"`
+
+	// FramerateNumerator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mpeg2settings.html#cfn-medialive-channel-mpeg2settings-frameratenumerator
+	FramerateNumerator *types.Value `json:"FramerateNumerator,omitempty"`
+
+	// GopClosedCadence AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mpeg2settings.html#cfn-medialive-channel-mpeg2settings-gopclosedcadence
+	GopClosedCadence *types.Value `json:"GopClosedCadence,omitempty"`
+
+	// GopNumBFrames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mpeg2settings.html#cfn-medialive-channel-mpeg2settings-gopnumbframes
+	GopNumBFrames *types.Value `json:"GopNumBFrames,omitempty"`
+
+	// GopSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mpeg2settings.html#cfn-medialive-channel-mpeg2settings-gopsize
+	GopSize *types.Value `json:"GopSize,omitempty"`
+
+	// GopSizeUnits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mpeg2settings.html#cfn-medialive-channel-mpeg2settings-gopsizeunits
+	GopSizeUnits *types.Value `json:"GopSizeUnits,omitempty"`
+
+	// ScanType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mpeg2settings.html#cfn-medialive-channel-mpeg2settings-scantype
+	ScanType *types.Value `json:"ScanType,omitempty"`
+
+	// SubgopLength AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mpeg2settings.html#cfn-medialive-channel-mpeg2settings-subgoplength
+	SubgopLength *types.Value `json:"SubgopLength,omitempty"`
+
+	// TimecodeInsertion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mpeg2settings.html#cfn-medialive-channel-mpeg2settings-timecodeinsertion
+	TimecodeInsertion *types.Value `json:"TimecodeInsertion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_Mpeg2Settings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.Mpeg2Settings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_mssmoothgroupsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_mssmoothgroupsettings.go
new file mode 100644
index 0000000000..59c3baaac9
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_mssmoothgroupsettings.go
@@ -0,0 +1,127 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_MsSmoothGroupSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.MsSmoothGroupSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothgroupsettings.html
+type Channel_MsSmoothGroupSettings struct {
+
+	// AcquisitionPointId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothgroupsettings.html#cfn-medialive-channel-mssmoothgroupsettings-acquisitionpointid
+	AcquisitionPointId *types.Value `json:"AcquisitionPointId,omitempty"`
+
+	// AudioOnlyTimecodeControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothgroupsettings.html#cfn-medialive-channel-mssmoothgroupsettings-audioonlytimecodecontrol
+	AudioOnlyTimecodeControl *types.Value `json:"AudioOnlyTimecodeControl,omitempty"`
+
+	// CertificateMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothgroupsettings.html#cfn-medialive-channel-mssmoothgroupsettings-certificatemode
+	CertificateMode *types.Value `json:"CertificateMode,omitempty"`
+
+	// ConnectionRetryInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothgroupsettings.html#cfn-medialive-channel-mssmoothgroupsettings-connectionretryinterval
+	ConnectionRetryInterval *types.Value `json:"ConnectionRetryInterval,omitempty"`
+
+	// Destination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothgroupsettings.html#cfn-medialive-channel-mssmoothgroupsettings-destination
+	Destination *Channel_OutputLocationRef `json:"Destination,omitempty"`
+
+	// EventId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothgroupsettings.html#cfn-medialive-channel-mssmoothgroupsettings-eventid
+	EventId *types.Value `json:"EventId,omitempty"`
+
+	// EventIdMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothgroupsettings.html#cfn-medialive-channel-mssmoothgroupsettings-eventidmode
+	EventIdMode *types.Value `json:"EventIdMode,omitempty"`
+
+	// EventStopBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothgroupsettings.html#cfn-medialive-channel-mssmoothgroupsettings-eventstopbehavior
+	EventStopBehavior *types.Value `json:"EventStopBehavior,omitempty"`
+
+	// FilecacheDuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothgroupsettings.html#cfn-medialive-channel-mssmoothgroupsettings-filecacheduration
+	FilecacheDuration *types.Value `json:"FilecacheDuration,omitempty"`
+
+	// FragmentLength AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothgroupsettings.html#cfn-medialive-channel-mssmoothgroupsettings-fragmentlength
+	FragmentLength *types.Value `json:"FragmentLength,omitempty"`
+
+	// InputLossAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothgroupsettings.html#cfn-medialive-channel-mssmoothgroupsettings-inputlossaction
+	InputLossAction *types.Value `json:"InputLossAction,omitempty"`
+
+	// NumRetries AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothgroupsettings.html#cfn-medialive-channel-mssmoothgroupsettings-numretries
+	NumRetries *types.Value `json:"NumRetries,omitempty"`
+
+	// RestartDelay AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothgroupsettings.html#cfn-medialive-channel-mssmoothgroupsettings-restartdelay
+	RestartDelay *types.Value `json:"RestartDelay,omitempty"`
+
+	// SegmentationMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothgroupsettings.html#cfn-medialive-channel-mssmoothgroupsettings-segmentationmode
+	SegmentationMode *types.Value `json:"SegmentationMode,omitempty"`
+
+	// SendDelayMs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothgroupsettings.html#cfn-medialive-channel-mssmoothgroupsettings-senddelayms
+	SendDelayMs *types.Value `json:"SendDelayMs,omitempty"`
+
+	// SparseTrackType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothgroupsettings.html#cfn-medialive-channel-mssmoothgroupsettings-sparsetracktype
+	SparseTrackType *types.Value `json:"SparseTrackType,omitempty"`
+
+	// StreamManifestBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothgroupsettings.html#cfn-medialive-channel-mssmoothgroupsettings-streammanifestbehavior
+	StreamManifestBehavior *types.Value `json:"StreamManifestBehavior,omitempty"`
+
+	// TimestampOffset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothgroupsettings.html#cfn-medialive-channel-mssmoothgroupsettings-timestampoffset
+	TimestampOffset *types.Value `json:"TimestampOffset,omitempty"`
+
+	// TimestampOffsetMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothgroupsettings.html#cfn-medialive-channel-mssmoothgroupsettings-timestampoffsetmode
+	TimestampOffsetMode *types.Value `json:"TimestampOffsetMode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_MsSmoothGroupSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.MsSmoothGroupSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_mssmoothoutputsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_mssmoothoutputsettings.go
new file mode 100644
index 0000000000..3e934c366e
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_mssmoothoutputsettings.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_MsSmoothOutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.MsSmoothOutputSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothoutputsettings.html
+type Channel_MsSmoothOutputSettings struct {
+
+	// H265PackagingType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothoutputsettings.html#cfn-medialive-channel-mssmoothoutputsettings-h265packagingtype
+	H265PackagingType *types.Value `json:"H265PackagingType,omitempty"`
+
+	// NameModifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-mssmoothoutputsettings.html#cfn-medialive-channel-mssmoothoutputsettings-namemodifier
+	NameModifier *types.Value `json:"NameModifier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_MsSmoothOutputSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.MsSmoothOutputSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_multiplexgroupsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_multiplexgroupsettings.go
new file mode 100644
index 0000000000..72a0766ad2
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_multiplexgroupsettings.go
@@ -0,0 +1,30 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_MultiplexGroupSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.MultiplexGroupSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-multiplexgroupsettings.html
+type Channel_MultiplexGroupSettings struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_MultiplexGroupSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.MultiplexGroupSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_multiplexoutputsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_multiplexoutputsettings.go
new file mode 100644
index 0000000000..bb314343ef
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_multiplexoutputsettings.go
@@ -0,0 +1,35 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_MultiplexOutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.MultiplexOutputSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-multiplexoutputsettings.html
+type Channel_MultiplexOutputSettings struct {
+
+	// Destination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-multiplexoutputsettings.html#cfn-medialive-channel-multiplexoutputsettings-destination
+	Destination *Channel_OutputLocationRef `json:"Destination,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_MultiplexOutputSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.MultiplexOutputSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_multiplexprogramchanneldestinationsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_multiplexprogramchanneldestinationsettings.go
new file mode 100644
index 0000000000..a2ab67d5fa
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_multiplexprogramchanneldestinationsettings.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_MultiplexProgramChannelDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.MultiplexProgramChannelDestinationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-multiplexprogramchanneldestinationsettings.html
+type Channel_MultiplexProgramChannelDestinationSettings struct {
+
+	// MultiplexId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-multiplexprogramchanneldestinationsettings.html#cfn-medialive-channel-multiplexprogramchanneldestinationsettings-multiplexid
+	MultiplexId *types.Value `json:"MultiplexId,omitempty"`
+
+	// ProgramName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-multiplexprogramchanneldestinationsettings.html#cfn-medialive-channel-multiplexprogramchanneldestinationsettings-programname
+	ProgramName *types.Value `json:"ProgramName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_MultiplexProgramChannelDestinationSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.MultiplexProgramChannelDestinationSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_networkinputsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_networkinputsettings.go
new file mode 100644
index 0000000000..df01216dd5
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_networkinputsettings.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_NetworkInputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.NetworkInputSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-networkinputsettings.html
+type Channel_NetworkInputSettings struct {
+
+	// HlsInputSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-networkinputsettings.html#cfn-medialive-channel-networkinputsettings-hlsinputsettings
+	HlsInputSettings *Channel_HlsInputSettings `json:"HlsInputSettings,omitempty"`
+
+	// ServerValidation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-networkinputsettings.html#cfn-medialive-channel-networkinputsettings-servervalidation
+	ServerValidation *types.Value `json:"ServerValidation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_NetworkInputSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.NetworkInputSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_nielsencbet.go b/goformation/cloudformation/medialive/aws-medialive-channel_nielsencbet.go
new file mode 100644
index 0000000000..838e29a121
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_nielsencbet.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_NielsenCBET AWS CloudFormation Resource (AWS::MediaLive::Channel.NielsenCBET)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-nielsencbet.html
+type Channel_NielsenCBET struct {
+
+	// CbetCheckDigitString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-nielsencbet.html#cfn-medialive-channel-nielsencbet-cbetcheckdigitstring
+	CbetCheckDigitString *types.Value `json:"CbetCheckDigitString,omitempty"`
+
+	// CbetStepaside AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-nielsencbet.html#cfn-medialive-channel-nielsencbet-cbetstepaside
+	CbetStepaside *types.Value `json:"CbetStepaside,omitempty"`
+
+	// Csid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-nielsencbet.html#cfn-medialive-channel-nielsencbet-csid
+	Csid *types.Value `json:"Csid,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_NielsenCBET) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.NielsenCBET"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_nielsenconfiguration.go b/goformation/cloudformation/medialive/aws-medialive-channel_nielsenconfiguration.go
new file mode 100644
index 0000000000..5df3fdbf1a
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_nielsenconfiguration.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_NielsenConfiguration AWS CloudFormation Resource (AWS::MediaLive::Channel.NielsenConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-nielsenconfiguration.html
+type Channel_NielsenConfiguration struct {
+
+	// DistributorId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-nielsenconfiguration.html#cfn-medialive-channel-nielsenconfiguration-distributorid
+	DistributorId *types.Value `json:"DistributorId,omitempty"`
+
+	// NielsenPcmToId3Tagging AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-nielsenconfiguration.html#cfn-medialive-channel-nielsenconfiguration-nielsenpcmtoid3tagging
+	NielsenPcmToId3Tagging *types.Value `json:"NielsenPcmToId3Tagging,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_NielsenConfiguration) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.NielsenConfiguration"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_nielsennaesiinw.go b/goformation/cloudformation/medialive/aws-medialive-channel_nielsennaesiinw.go
new file mode 100644
index 0000000000..d938d42501
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_nielsennaesiinw.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_NielsenNaesIiNw AWS CloudFormation Resource (AWS::MediaLive::Channel.NielsenNaesIiNw)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-nielsennaesiinw.html
+type Channel_NielsenNaesIiNw struct {
+
+	// CheckDigitString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-nielsennaesiinw.html#cfn-medialive-channel-nielsennaesiinw-checkdigitstring
+	CheckDigitString *types.Value `json:"CheckDigitString,omitempty"`
+
+	// Sid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-nielsennaesiinw.html#cfn-medialive-channel-nielsennaesiinw-sid
+	Sid *types.Value `json:"Sid,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_NielsenNaesIiNw) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.NielsenNaesIiNw"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_nielsenwatermarkssettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_nielsenwatermarkssettings.go
new file mode 100644
index 0000000000..9bb54c76a8
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_nielsenwatermarkssettings.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_NielsenWatermarksSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.NielsenWatermarksSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-nielsenwatermarkssettings.html
+type Channel_NielsenWatermarksSettings struct {
+
+	// NielsenCbetSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-nielsenwatermarkssettings.html#cfn-medialive-channel-nielsenwatermarkssettings-nielsencbetsettings
+	NielsenCbetSettings *Channel_NielsenCBET `json:"NielsenCbetSettings,omitempty"`
+
+	// NielsenDistributionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-nielsenwatermarkssettings.html#cfn-medialive-channel-nielsenwatermarkssettings-nielsendistributiontype
+	NielsenDistributionType *types.Value `json:"NielsenDistributionType,omitempty"`
+
+	// NielsenNaesIiNwSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-nielsenwatermarkssettings.html#cfn-medialive-channel-nielsenwatermarkssettings-nielsennaesiinwsettings
+	NielsenNaesIiNwSettings *Channel_NielsenNaesIiNw `json:"NielsenNaesIiNwSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_NielsenWatermarksSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.NielsenWatermarksSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_output.go b/goformation/cloudformation/medialive/aws-medialive-channel_output.go
new file mode 100644
index 0000000000..ea05a8c89a
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_output.go
@@ -0,0 +1,57 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_Output AWS CloudFormation Resource (AWS::MediaLive::Channel.Output)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-output.html
+type Channel_Output struct {
+
+	// AudioDescriptionNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-output.html#cfn-medialive-channel-output-audiodescriptionnames
+	AudioDescriptionNames *types.Value `json:"AudioDescriptionNames,omitempty"`
+
+	// CaptionDescriptionNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-output.html#cfn-medialive-channel-output-captiondescriptionnames
+	CaptionDescriptionNames *types.Value `json:"CaptionDescriptionNames,omitempty"`
+
+	// OutputName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-output.html#cfn-medialive-channel-output-outputname
+	OutputName *types.Value `json:"OutputName,omitempty"`
+
+	// OutputSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-output.html#cfn-medialive-channel-output-outputsettings
+	OutputSettings *Channel_OutputSettings `json:"OutputSettings,omitempty"`
+
+	// VideoDescriptionName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-output.html#cfn-medialive-channel-output-videodescriptionname
+	VideoDescriptionName *types.Value `json:"VideoDescriptionName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_Output) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.Output"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_outputdestination.go b/goformation/cloudformation/medialive/aws-medialive-channel_outputdestination.go
new file mode 100644
index 0000000000..b23cc5ad81
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_outputdestination.go
@@ -0,0 +1,52 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_OutputDestination AWS CloudFormation Resource (AWS::MediaLive::Channel.OutputDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestination.html
+type Channel_OutputDestination struct {
+
+	// Id AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestination.html#cfn-medialive-channel-outputdestination-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// MediaPackageSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestination.html#cfn-medialive-channel-outputdestination-mediapackagesettings
+	MediaPackageSettings []Channel_MediaPackageOutputDestinationSettings `json:"MediaPackageSettings,omitempty"`
+
+	// MultiplexSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestination.html#cfn-medialive-channel-outputdestination-multiplexsettings
+	MultiplexSettings *Channel_MultiplexProgramChannelDestinationSettings `json:"MultiplexSettings,omitempty"`
+
+	// Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestination.html#cfn-medialive-channel-outputdestination-settings
+	Settings []Channel_OutputDestinationSettings `json:"Settings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_OutputDestination) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.OutputDestination"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_outputdestinationsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_outputdestinationsettings.go
new file mode 100644
index 0000000000..c04ce0bea0
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_outputdestinationsettings.go
@@ -0,0 +1,52 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_OutputDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.OutputDestinationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestinationsettings.html
+type Channel_OutputDestinationSettings struct {
+
+	// PasswordParam AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestinationsettings.html#cfn-medialive-channel-outputdestinationsettings-passwordparam
+	PasswordParam *types.Value `json:"PasswordParam,omitempty"`
+
+	// StreamName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestinationsettings.html#cfn-medialive-channel-outputdestinationsettings-streamname
+	StreamName *types.Value `json:"StreamName,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestinationsettings.html#cfn-medialive-channel-outputdestinationsettings-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputdestinationsettings.html#cfn-medialive-channel-outputdestinationsettings-username
+	Username *types.Value `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 *Channel_OutputDestinationSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.OutputDestinationSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_outputgroup.go b/goformation/cloudformation/medialive/aws-medialive-channel_outputgroup.go
new file mode 100644
index 0000000000..123647346b
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_outputgroup.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_OutputGroup AWS CloudFormation Resource (AWS::MediaLive::Channel.OutputGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputgroup.html
+type Channel_OutputGroup struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputgroup.html#cfn-medialive-channel-outputgroup-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// OutputGroupSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputgroup.html#cfn-medialive-channel-outputgroup-outputgroupsettings
+	OutputGroupSettings *Channel_OutputGroupSettings `json:"OutputGroupSettings,omitempty"`
+
+	// Outputs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputgroup.html#cfn-medialive-channel-outputgroup-outputs
+	Outputs []Channel_Output `json:"Outputs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_OutputGroup) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.OutputGroup"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_outputgroupsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_outputgroupsettings.go
new file mode 100644
index 0000000000..9d7754710c
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_outputgroupsettings.go
@@ -0,0 +1,70 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_OutputGroupSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.OutputGroupSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputgroupsettings.html
+type Channel_OutputGroupSettings struct {
+
+	// ArchiveGroupSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputgroupsettings.html#cfn-medialive-channel-outputgroupsettings-archivegroupsettings
+	ArchiveGroupSettings *Channel_ArchiveGroupSettings `json:"ArchiveGroupSettings,omitempty"`
+
+	// FrameCaptureGroupSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputgroupsettings.html#cfn-medialive-channel-outputgroupsettings-framecapturegroupsettings
+	FrameCaptureGroupSettings *Channel_FrameCaptureGroupSettings `json:"FrameCaptureGroupSettings,omitempty"`
+
+	// HlsGroupSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputgroupsettings.html#cfn-medialive-channel-outputgroupsettings-hlsgroupsettings
+	HlsGroupSettings *Channel_HlsGroupSettings `json:"HlsGroupSettings,omitempty"`
+
+	// MediaPackageGroupSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputgroupsettings.html#cfn-medialive-channel-outputgroupsettings-mediapackagegroupsettings
+	MediaPackageGroupSettings *Channel_MediaPackageGroupSettings `json:"MediaPackageGroupSettings,omitempty"`
+
+	// MsSmoothGroupSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputgroupsettings.html#cfn-medialive-channel-outputgroupsettings-mssmoothgroupsettings
+	MsSmoothGroupSettings *Channel_MsSmoothGroupSettings `json:"MsSmoothGroupSettings,omitempty"`
+
+	// MultiplexGroupSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputgroupsettings.html#cfn-medialive-channel-outputgroupsettings-multiplexgroupsettings
+	MultiplexGroupSettings *Channel_MultiplexGroupSettings `json:"MultiplexGroupSettings,omitempty"`
+
+	// RtmpGroupSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputgroupsettings.html#cfn-medialive-channel-outputgroupsettings-rtmpgroupsettings
+	RtmpGroupSettings *Channel_RtmpGroupSettings `json:"RtmpGroupSettings,omitempty"`
+
+	// UdpGroupSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputgroupsettings.html#cfn-medialive-channel-outputgroupsettings-udpgroupsettings
+	UdpGroupSettings *Channel_UdpGroupSettings `json:"UdpGroupSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_OutputGroupSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.OutputGroupSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_outputlocationref.go b/goformation/cloudformation/medialive/aws-medialive-channel_outputlocationref.go
new file mode 100644
index 0000000000..ed6323d552
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_outputlocationref.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_OutputLocationRef AWS CloudFormation Resource (AWS::MediaLive::Channel.OutputLocationRef)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputlocationref.html
+type Channel_OutputLocationRef struct {
+
+	// DestinationRefId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputlocationref.html#cfn-medialive-channel-outputlocationref-destinationrefid
+	DestinationRefId *types.Value `json:"DestinationRefId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_OutputLocationRef) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.OutputLocationRef"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_outputsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_outputsettings.go
new file mode 100644
index 0000000000..281dea3458
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_outputsettings.go
@@ -0,0 +1,70 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_OutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.OutputSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputsettings.html
+type Channel_OutputSettings struct {
+
+	// ArchiveOutputSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputsettings.html#cfn-medialive-channel-outputsettings-archiveoutputsettings
+	ArchiveOutputSettings *Channel_ArchiveOutputSettings `json:"ArchiveOutputSettings,omitempty"`
+
+	// FrameCaptureOutputSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputsettings.html#cfn-medialive-channel-outputsettings-framecaptureoutputsettings
+	FrameCaptureOutputSettings *Channel_FrameCaptureOutputSettings `json:"FrameCaptureOutputSettings,omitempty"`
+
+	// HlsOutputSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputsettings.html#cfn-medialive-channel-outputsettings-hlsoutputsettings
+	HlsOutputSettings *Channel_HlsOutputSettings `json:"HlsOutputSettings,omitempty"`
+
+	// MediaPackageOutputSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputsettings.html#cfn-medialive-channel-outputsettings-mediapackageoutputsettings
+	MediaPackageOutputSettings *Channel_MediaPackageOutputSettings `json:"MediaPackageOutputSettings,omitempty"`
+
+	// MsSmoothOutputSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputsettings.html#cfn-medialive-channel-outputsettings-mssmoothoutputsettings
+	MsSmoothOutputSettings *Channel_MsSmoothOutputSettings `json:"MsSmoothOutputSettings,omitempty"`
+
+	// MultiplexOutputSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputsettings.html#cfn-medialive-channel-outputsettings-multiplexoutputsettings
+	MultiplexOutputSettings *Channel_MultiplexOutputSettings `json:"MultiplexOutputSettings,omitempty"`
+
+	// RtmpOutputSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputsettings.html#cfn-medialive-channel-outputsettings-rtmpoutputsettings
+	RtmpOutputSettings *Channel_RtmpOutputSettings `json:"RtmpOutputSettings,omitempty"`
+
+	// UdpOutputSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-outputsettings.html#cfn-medialive-channel-outputsettings-udpoutputsettings
+	UdpOutputSettings *Channel_UdpOutputSettings `json:"UdpOutputSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_OutputSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.OutputSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_passthroughsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_passthroughsettings.go
new file mode 100644
index 0000000000..af2837f531
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_passthroughsettings.go
@@ -0,0 +1,30 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_PassThroughSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.PassThroughSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-passthroughsettings.html
+type Channel_PassThroughSettings struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_PassThroughSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.PassThroughSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_rawsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_rawsettings.go
new file mode 100644
index 0000000000..44307ba3ba
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_rawsettings.go
@@ -0,0 +1,30 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_RawSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.RawSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-rawsettings.html
+type Channel_RawSettings struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_RawSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.RawSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_rec601settings.go b/goformation/cloudformation/medialive/aws-medialive-channel_rec601settings.go
new file mode 100644
index 0000000000..144ed7cce6
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_rec601settings.go
@@ -0,0 +1,30 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_Rec601Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.Rec601Settings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-rec601settings.html
+type Channel_Rec601Settings struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_Rec601Settings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.Rec601Settings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_rec709settings.go b/goformation/cloudformation/medialive/aws-medialive-channel_rec709settings.go
new file mode 100644
index 0000000000..70fd8f3281
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_rec709settings.go
@@ -0,0 +1,30 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_Rec709Settings AWS CloudFormation Resource (AWS::MediaLive::Channel.Rec709Settings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-rec709settings.html
+type Channel_Rec709Settings struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_Rec709Settings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.Rec709Settings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_remixsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_remixsettings.go
new file mode 100644
index 0000000000..2b382f4133
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_remixsettings.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_RemixSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.RemixSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-remixsettings.html
+type Channel_RemixSettings struct {
+
+	// ChannelMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-remixsettings.html#cfn-medialive-channel-remixsettings-channelmappings
+	ChannelMappings []Channel_AudioChannelMapping `json:"ChannelMappings,omitempty"`
+
+	// ChannelsIn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-remixsettings.html#cfn-medialive-channel-remixsettings-channelsin
+	ChannelsIn *types.Value `json:"ChannelsIn,omitempty"`
+
+	// ChannelsOut AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-remixsettings.html#cfn-medialive-channel-remixsettings-channelsout
+	ChannelsOut *types.Value `json:"ChannelsOut,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_RemixSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.RemixSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_rtmpcaptioninfodestinationsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_rtmpcaptioninfodestinationsettings.go
new file mode 100644
index 0000000000..a3c5bd6749
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_rtmpcaptioninfodestinationsettings.go
@@ -0,0 +1,30 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_RtmpCaptionInfoDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.RtmpCaptionInfoDestinationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-rtmpcaptioninfodestinationsettings.html
+type Channel_RtmpCaptionInfoDestinationSettings struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_RtmpCaptionInfoDestinationSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.RtmpCaptionInfoDestinationSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_rtmpgroupsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_rtmpgroupsettings.go
new file mode 100644
index 0000000000..f10119ba09
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_rtmpgroupsettings.go
@@ -0,0 +1,67 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_RtmpGroupSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.RtmpGroupSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-rtmpgroupsettings.html
+type Channel_RtmpGroupSettings struct {
+
+	// AdMarkers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-rtmpgroupsettings.html#cfn-medialive-channel-rtmpgroupsettings-admarkers
+	AdMarkers *types.Value `json:"AdMarkers,omitempty"`
+
+	// AuthenticationScheme AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-rtmpgroupsettings.html#cfn-medialive-channel-rtmpgroupsettings-authenticationscheme
+	AuthenticationScheme *types.Value `json:"AuthenticationScheme,omitempty"`
+
+	// CacheFullBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-rtmpgroupsettings.html#cfn-medialive-channel-rtmpgroupsettings-cachefullbehavior
+	CacheFullBehavior *types.Value `json:"CacheFullBehavior,omitempty"`
+
+	// CacheLength AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-rtmpgroupsettings.html#cfn-medialive-channel-rtmpgroupsettings-cachelength
+	CacheLength *types.Value `json:"CacheLength,omitempty"`
+
+	// CaptionData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-rtmpgroupsettings.html#cfn-medialive-channel-rtmpgroupsettings-captiondata
+	CaptionData *types.Value `json:"CaptionData,omitempty"`
+
+	// InputLossAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-rtmpgroupsettings.html#cfn-medialive-channel-rtmpgroupsettings-inputlossaction
+	InputLossAction *types.Value `json:"InputLossAction,omitempty"`
+
+	// RestartDelay AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-rtmpgroupsettings.html#cfn-medialive-channel-rtmpgroupsettings-restartdelay
+	RestartDelay *types.Value `json:"RestartDelay,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_RtmpGroupSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.RtmpGroupSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_rtmpoutputsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_rtmpoutputsettings.go
new file mode 100644
index 0000000000..0951cf718f
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_rtmpoutputsettings.go
@@ -0,0 +1,52 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_RtmpOutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.RtmpOutputSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-rtmpoutputsettings.html
+type Channel_RtmpOutputSettings struct {
+
+	// CertificateMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-rtmpoutputsettings.html#cfn-medialive-channel-rtmpoutputsettings-certificatemode
+	CertificateMode *types.Value `json:"CertificateMode,omitempty"`
+
+	// ConnectionRetryInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-rtmpoutputsettings.html#cfn-medialive-channel-rtmpoutputsettings-connectionretryinterval
+	ConnectionRetryInterval *types.Value `json:"ConnectionRetryInterval,omitempty"`
+
+	// Destination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-rtmpoutputsettings.html#cfn-medialive-channel-rtmpoutputsettings-destination
+	Destination *Channel_OutputLocationRef `json:"Destination,omitempty"`
+
+	// NumRetries AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-rtmpoutputsettings.html#cfn-medialive-channel-rtmpoutputsettings-numretries
+	NumRetries *types.Value `json:"NumRetries,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_RtmpOutputSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.RtmpOutputSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_scte20plusembeddeddestinationsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_scte20plusembeddeddestinationsettings.go
new file mode 100644
index 0000000000..addffc3f42
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_scte20plusembeddeddestinationsettings.go
@@ -0,0 +1,30 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_Scte20PlusEmbeddedDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.Scte20PlusEmbeddedDestinationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte20plusembeddeddestinationsettings.html
+type Channel_Scte20PlusEmbeddedDestinationSettings struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_Scte20PlusEmbeddedDestinationSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.Scte20PlusEmbeddedDestinationSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_scte20sourcesettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_scte20sourcesettings.go
new file mode 100644
index 0000000000..76fcba5320
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_scte20sourcesettings.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_Scte20SourceSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.Scte20SourceSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte20sourcesettings.html
+type Channel_Scte20SourceSettings struct {
+
+	// Convert608To708 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte20sourcesettings.html#cfn-medialive-channel-scte20sourcesettings-convert608to708
+	Convert608To708 *types.Value `json:"Convert608To708,omitempty"`
+
+	// Source608ChannelNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte20sourcesettings.html#cfn-medialive-channel-scte20sourcesettings-source608channelnumber
+	Source608ChannelNumber *types.Value `json:"Source608ChannelNumber,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_Scte20SourceSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.Scte20SourceSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_scte27destinationsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_scte27destinationsettings.go
new file mode 100644
index 0000000000..4ad8de88d0
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_scte27destinationsettings.go
@@ -0,0 +1,30 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_Scte27DestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.Scte27DestinationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte27destinationsettings.html
+type Channel_Scte27DestinationSettings struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_Scte27DestinationSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.Scte27DestinationSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_scte27sourcesettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_scte27sourcesettings.go
new file mode 100644
index 0000000000..7982afbf29
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_scte27sourcesettings.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_Scte27SourceSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.Scte27SourceSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte27sourcesettings.html
+type Channel_Scte27SourceSettings struct {
+
+	// OcrLanguage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte27sourcesettings.html#cfn-medialive-channel-scte27sourcesettings-ocrlanguage
+	OcrLanguage *types.Value `json:"OcrLanguage,omitempty"`
+
+	// Pid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte27sourcesettings.html#cfn-medialive-channel-scte27sourcesettings-pid
+	Pid *types.Value `json:"Pid,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_Scte27SourceSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.Scte27SourceSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_scte35spliceinsert.go b/goformation/cloudformation/medialive/aws-medialive-channel_scte35spliceinsert.go
new file mode 100644
index 0000000000..9d9f44f3a0
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_scte35spliceinsert.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_Scte35SpliceInsert AWS CloudFormation Resource (AWS::MediaLive::Channel.Scte35SpliceInsert)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte35spliceinsert.html
+type Channel_Scte35SpliceInsert struct {
+
+	// AdAvailOffset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte35spliceinsert.html#cfn-medialive-channel-scte35spliceinsert-adavailoffset
+	AdAvailOffset *types.Value `json:"AdAvailOffset,omitempty"`
+
+	// NoRegionalBlackoutFlag AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte35spliceinsert.html#cfn-medialive-channel-scte35spliceinsert-noregionalblackoutflag
+	NoRegionalBlackoutFlag *types.Value `json:"NoRegionalBlackoutFlag,omitempty"`
+
+	// WebDeliveryAllowedFlag AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte35spliceinsert.html#cfn-medialive-channel-scte35spliceinsert-webdeliveryallowedflag
+	WebDeliveryAllowedFlag *types.Value `json:"WebDeliveryAllowedFlag,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_Scte35SpliceInsert) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.Scte35SpliceInsert"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_scte35timesignalapos.go b/goformation/cloudformation/medialive/aws-medialive-channel_scte35timesignalapos.go
new file mode 100644
index 0000000000..d42509f37b
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_scte35timesignalapos.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_Scte35TimeSignalApos AWS CloudFormation Resource (AWS::MediaLive::Channel.Scte35TimeSignalApos)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte35timesignalapos.html
+type Channel_Scte35TimeSignalApos struct {
+
+	// AdAvailOffset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte35timesignalapos.html#cfn-medialive-channel-scte35timesignalapos-adavailoffset
+	AdAvailOffset *types.Value `json:"AdAvailOffset,omitempty"`
+
+	// NoRegionalBlackoutFlag AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte35timesignalapos.html#cfn-medialive-channel-scte35timesignalapos-noregionalblackoutflag
+	NoRegionalBlackoutFlag *types.Value `json:"NoRegionalBlackoutFlag,omitempty"`
+
+	// WebDeliveryAllowedFlag AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-scte35timesignalapos.html#cfn-medialive-channel-scte35timesignalapos-webdeliveryallowedflag
+	WebDeliveryAllowedFlag *types.Value `json:"WebDeliveryAllowedFlag,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_Scte35TimeSignalApos) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.Scte35TimeSignalApos"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_smptettdestinationsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_smptettdestinationsettings.go
new file mode 100644
index 0000000000..0c56ab8d10
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_smptettdestinationsettings.go
@@ -0,0 +1,30 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_SmpteTtDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.SmpteTtDestinationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-smptettdestinationsettings.html
+type Channel_SmpteTtDestinationSettings struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_SmpteTtDestinationSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.SmpteTtDestinationSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_standardhlssettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_standardhlssettings.go
new file mode 100644
index 0000000000..b4f940a7a6
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_standardhlssettings.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_StandardHlsSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.StandardHlsSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-standardhlssettings.html
+type Channel_StandardHlsSettings struct {
+
+	// AudioRenditionSets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-standardhlssettings.html#cfn-medialive-channel-standardhlssettings-audiorenditionsets
+	AudioRenditionSets *types.Value `json:"AudioRenditionSets,omitempty"`
+
+	// M3u8Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-standardhlssettings.html#cfn-medialive-channel-standardhlssettings-m3u8settings
+	M3u8Settings *Channel_M3u8Settings `json:"M3u8Settings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_StandardHlsSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.StandardHlsSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_statickeysettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_statickeysettings.go
new file mode 100644
index 0000000000..576267e7d7
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_statickeysettings.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_StaticKeySettings AWS CloudFormation Resource (AWS::MediaLive::Channel.StaticKeySettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-statickeysettings.html
+type Channel_StaticKeySettings struct {
+
+	// KeyProviderServer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-statickeysettings.html#cfn-medialive-channel-statickeysettings-keyproviderserver
+	KeyProviderServer *Channel_InputLocation `json:"KeyProviderServer,omitempty"`
+
+	// StaticKeyValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-statickeysettings.html#cfn-medialive-channel-statickeysettings-statickeyvalue
+	StaticKeyValue *types.Value `json:"StaticKeyValue,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_StaticKeySettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.StaticKeySettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_teletextdestinationsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_teletextdestinationsettings.go
new file mode 100644
index 0000000000..6b758e2bf3
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_teletextdestinationsettings.go
@@ -0,0 +1,30 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_TeletextDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.TeletextDestinationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-teletextdestinationsettings.html
+type Channel_TeletextDestinationSettings struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_TeletextDestinationSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.TeletextDestinationSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_teletextsourcesettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_teletextsourcesettings.go
new file mode 100644
index 0000000000..7d77bea380
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_teletextsourcesettings.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_TeletextSourceSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.TeletextSourceSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-teletextsourcesettings.html
+type Channel_TeletextSourceSettings struct {
+
+	// OutputRectangle AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-teletextsourcesettings.html#cfn-medialive-channel-teletextsourcesettings-outputrectangle
+	OutputRectangle *Channel_CaptionRectangle `json:"OutputRectangle,omitempty"`
+
+	// PageNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-teletextsourcesettings.html#cfn-medialive-channel-teletextsourcesettings-pagenumber
+	PageNumber *types.Value `json:"PageNumber,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_TeletextSourceSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.TeletextSourceSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_temporalfiltersettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_temporalfiltersettings.go
new file mode 100644
index 0000000000..776a0f279c
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_temporalfiltersettings.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_TemporalFilterSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.TemporalFilterSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-temporalfiltersettings.html
+type Channel_TemporalFilterSettings struct {
+
+	// PostFilterSharpening AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-temporalfiltersettings.html#cfn-medialive-channel-temporalfiltersettings-postfiltersharpening
+	PostFilterSharpening *types.Value `json:"PostFilterSharpening,omitempty"`
+
+	// Strength AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-temporalfiltersettings.html#cfn-medialive-channel-temporalfiltersettings-strength
+	Strength *types.Value `json:"Strength,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_TemporalFilterSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.TemporalFilterSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_timecodeconfig.go b/goformation/cloudformation/medialive/aws-medialive-channel_timecodeconfig.go
new file mode 100644
index 0000000000..19d2e7b214
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_timecodeconfig.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_TimecodeConfig AWS CloudFormation Resource (AWS::MediaLive::Channel.TimecodeConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-timecodeconfig.html
+type Channel_TimecodeConfig struct {
+
+	// Source AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-timecodeconfig.html#cfn-medialive-channel-timecodeconfig-source
+	Source *types.Value `json:"Source,omitempty"`
+
+	// SyncThreshold AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-timecodeconfig.html#cfn-medialive-channel-timecodeconfig-syncthreshold
+	SyncThreshold *types.Value `json:"SyncThreshold,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_TimecodeConfig) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.TimecodeConfig"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_ttmldestinationsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_ttmldestinationsettings.go
new file mode 100644
index 0000000000..ce9bea5269
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_ttmldestinationsettings.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_TtmlDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.TtmlDestinationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-ttmldestinationsettings.html
+type Channel_TtmlDestinationSettings struct {
+
+	// StyleControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-ttmldestinationsettings.html#cfn-medialive-channel-ttmldestinationsettings-stylecontrol
+	StyleControl *types.Value `json:"StyleControl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_TtmlDestinationSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.TtmlDestinationSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_udpcontainersettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_udpcontainersettings.go
new file mode 100644
index 0000000000..140f5795be
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_udpcontainersettings.go
@@ -0,0 +1,35 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_UdpContainerSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.UdpContainerSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-udpcontainersettings.html
+type Channel_UdpContainerSettings struct {
+
+	// M2tsSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-udpcontainersettings.html#cfn-medialive-channel-udpcontainersettings-m2tssettings
+	M2tsSettings *Channel_M2tsSettings `json:"M2tsSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_UdpContainerSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.UdpContainerSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_udpgroupsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_udpgroupsettings.go
new file mode 100644
index 0000000000..090b04f238
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_udpgroupsettings.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_UdpGroupSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.UdpGroupSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-udpgroupsettings.html
+type Channel_UdpGroupSettings struct {
+
+	// InputLossAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-udpgroupsettings.html#cfn-medialive-channel-udpgroupsettings-inputlossaction
+	InputLossAction *types.Value `json:"InputLossAction,omitempty"`
+
+	// TimedMetadataId3Frame AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-udpgroupsettings.html#cfn-medialive-channel-udpgroupsettings-timedmetadataid3frame
+	TimedMetadataId3Frame *types.Value `json:"TimedMetadataId3Frame,omitempty"`
+
+	// TimedMetadataId3Period AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-udpgroupsettings.html#cfn-medialive-channel-udpgroupsettings-timedmetadataid3period
+	TimedMetadataId3Period *types.Value `json:"TimedMetadataId3Period,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_UdpGroupSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.UdpGroupSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_udpoutputsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_udpoutputsettings.go
new file mode 100644
index 0000000000..a1cfe76130
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_udpoutputsettings.go
@@ -0,0 +1,52 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_UdpOutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.UdpOutputSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-udpoutputsettings.html
+type Channel_UdpOutputSettings struct {
+
+	// BufferMsec AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-udpoutputsettings.html#cfn-medialive-channel-udpoutputsettings-buffermsec
+	BufferMsec *types.Value `json:"BufferMsec,omitempty"`
+
+	// ContainerSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-udpoutputsettings.html#cfn-medialive-channel-udpoutputsettings-containersettings
+	ContainerSettings *Channel_UdpContainerSettings `json:"ContainerSettings,omitempty"`
+
+	// Destination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-udpoutputsettings.html#cfn-medialive-channel-udpoutputsettings-destination
+	Destination *Channel_OutputLocationRef `json:"Destination,omitempty"`
+
+	// FecOutputSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-udpoutputsettings.html#cfn-medialive-channel-udpoutputsettings-fecoutputsettings
+	FecOutputSettings *Channel_FecOutputSettings `json:"FecOutputSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_UdpOutputSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.UdpOutputSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_videoblackfailoversettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_videoblackfailoversettings.go
new file mode 100644
index 0000000000..c095de629d
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_videoblackfailoversettings.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_VideoBlackFailoverSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.VideoBlackFailoverSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoblackfailoversettings.html
+type Channel_VideoBlackFailoverSettings struct {
+
+	// BlackDetectThreshold AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoblackfailoversettings.html#cfn-medialive-channel-videoblackfailoversettings-blackdetectthreshold
+	BlackDetectThreshold *types.Value `json:"BlackDetectThreshold,omitempty"`
+
+	// VideoBlackThresholdMsec AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoblackfailoversettings.html#cfn-medialive-channel-videoblackfailoversettings-videoblackthresholdmsec
+	VideoBlackThresholdMsec *types.Value `json:"VideoBlackThresholdMsec,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_VideoBlackFailoverSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.VideoBlackFailoverSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_videocodecsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_videocodecsettings.go
new file mode 100644
index 0000000000..d7220d1442
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_videocodecsettings.go
@@ -0,0 +1,50 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_VideoCodecSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.VideoCodecSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videocodecsettings.html
+type Channel_VideoCodecSettings struct {
+
+	// FrameCaptureSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videocodecsettings.html#cfn-medialive-channel-videocodecsettings-framecapturesettings
+	FrameCaptureSettings *Channel_FrameCaptureSettings `json:"FrameCaptureSettings,omitempty"`
+
+	// H264Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videocodecsettings.html#cfn-medialive-channel-videocodecsettings-h264settings
+	H264Settings *Channel_H264Settings `json:"H264Settings,omitempty"`
+
+	// H265Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videocodecsettings.html#cfn-medialive-channel-videocodecsettings-h265settings
+	H265Settings *Channel_H265Settings `json:"H265Settings,omitempty"`
+
+	// Mpeg2Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videocodecsettings.html#cfn-medialive-channel-videocodecsettings-mpeg2settings
+	Mpeg2Settings *Channel_Mpeg2Settings `json:"Mpeg2Settings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_VideoCodecSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.VideoCodecSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_videodescription.go b/goformation/cloudformation/medialive/aws-medialive-channel_videodescription.go
new file mode 100644
index 0000000000..64d2cfc786
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_videodescription.go
@@ -0,0 +1,67 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_VideoDescription AWS CloudFormation Resource (AWS::MediaLive::Channel.VideoDescription)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videodescription.html
+type Channel_VideoDescription struct {
+
+	// CodecSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videodescription.html#cfn-medialive-channel-videodescription-codecsettings
+	CodecSettings *Channel_VideoCodecSettings `json:"CodecSettings,omitempty"`
+
+	// Height AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videodescription.html#cfn-medialive-channel-videodescription-height
+	Height *types.Value `json:"Height,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videodescription.html#cfn-medialive-channel-videodescription-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RespondToAfd AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videodescription.html#cfn-medialive-channel-videodescription-respondtoafd
+	RespondToAfd *types.Value `json:"RespondToAfd,omitempty"`
+
+	// ScalingBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videodescription.html#cfn-medialive-channel-videodescription-scalingbehavior
+	ScalingBehavior *types.Value `json:"ScalingBehavior,omitempty"`
+
+	// Sharpness AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videodescription.html#cfn-medialive-channel-videodescription-sharpness
+	Sharpness *types.Value `json:"Sharpness,omitempty"`
+
+	// Width AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videodescription.html#cfn-medialive-channel-videodescription-width
+	Width *types.Value `json:"Width,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_VideoDescription) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.VideoDescription"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_videoselector.go b/goformation/cloudformation/medialive/aws-medialive-channel_videoselector.go
new file mode 100644
index 0000000000..ddc9870bcc
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_videoselector.go
@@ -0,0 +1,52 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_VideoSelector AWS CloudFormation Resource (AWS::MediaLive::Channel.VideoSelector)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselector.html
+type Channel_VideoSelector struct {
+
+	// ColorSpace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselector.html#cfn-medialive-channel-videoselector-colorspace
+	ColorSpace *types.Value `json:"ColorSpace,omitempty"`
+
+	// ColorSpaceSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselector.html#cfn-medialive-channel-videoselector-colorspacesettings
+	ColorSpaceSettings *Channel_VideoSelectorColorSpaceSettings `json:"ColorSpaceSettings,omitempty"`
+
+	// ColorSpaceUsage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselector.html#cfn-medialive-channel-videoselector-colorspaceusage
+	ColorSpaceUsage *types.Value `json:"ColorSpaceUsage,omitempty"`
+
+	// SelectorSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselector.html#cfn-medialive-channel-videoselector-selectorsettings
+	SelectorSettings *Channel_VideoSelectorSettings `json:"SelectorSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_VideoSelector) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.VideoSelector"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorcolorspacesettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorcolorspacesettings.go
new file mode 100644
index 0000000000..df32cabc47
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorcolorspacesettings.go
@@ -0,0 +1,35 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_VideoSelectorColorSpaceSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.VideoSelectorColorSpaceSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorcolorspacesettings.html
+type Channel_VideoSelectorColorSpaceSettings struct {
+
+	// Hdr10Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorcolorspacesettings.html#cfn-medialive-channel-videoselectorcolorspacesettings-hdr10settings
+	Hdr10Settings *Channel_Hdr10Settings `json:"Hdr10Settings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_VideoSelectorColorSpaceSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.VideoSelectorColorSpaceSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorpid.go b/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorpid.go
new file mode 100644
index 0000000000..0d2674bb2a
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorpid.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_VideoSelectorPid AWS CloudFormation Resource (AWS::MediaLive::Channel.VideoSelectorPid)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorpid.html
+type Channel_VideoSelectorPid struct {
+
+	// Pid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorpid.html#cfn-medialive-channel-videoselectorpid-pid
+	Pid *types.Value `json:"Pid,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_VideoSelectorPid) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.VideoSelectorPid"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorprogramid.go b/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorprogramid.go
new file mode 100644
index 0000000000..025756db9c
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorprogramid.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_VideoSelectorProgramId AWS CloudFormation Resource (AWS::MediaLive::Channel.VideoSelectorProgramId)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorprogramid.html
+type Channel_VideoSelectorProgramId struct {
+
+	// ProgramId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorprogramid.html#cfn-medialive-channel-videoselectorprogramid-programid
+	ProgramId *types.Value `json:"ProgramId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_VideoSelectorProgramId) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.VideoSelectorProgramId"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorsettings.go
new file mode 100644
index 0000000000..421bf7dba5
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_videoselectorsettings.go
@@ -0,0 +1,40 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_VideoSelectorSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.VideoSelectorSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorsettings.html
+type Channel_VideoSelectorSettings struct {
+
+	// VideoSelectorPid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorsettings.html#cfn-medialive-channel-videoselectorsettings-videoselectorpid
+	VideoSelectorPid *Channel_VideoSelectorPid `json:"VideoSelectorPid,omitempty"`
+
+	// VideoSelectorProgramId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-videoselectorsettings.html#cfn-medialive-channel-videoselectorsettings-videoselectorprogramid
+	VideoSelectorProgramId *Channel_VideoSelectorProgramId `json:"VideoSelectorProgramId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_VideoSelectorSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.VideoSelectorSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_vpcoutputsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_vpcoutputsettings.go
new file mode 100644
index 0000000000..ddfa5c5c8d
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_vpcoutputsettings.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_VpcOutputSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.VpcOutputSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-vpcoutputsettings.html
+type Channel_VpcOutputSettings struct {
+
+	// PublicAddressAllocationIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-vpcoutputsettings.html#cfn-medialive-channel-vpcoutputsettings-publicaddressallocationids
+	PublicAddressAllocationIds *types.Value `json:"PublicAddressAllocationIds,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-vpcoutputsettings.html#cfn-medialive-channel-vpcoutputsettings-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-vpcoutputsettings.html#cfn-medialive-channel-vpcoutputsettings-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_VpcOutputSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.VpcOutputSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_wavsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_wavsettings.go
new file mode 100644
index 0000000000..a54b7f3846
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_wavsettings.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_WavSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.WavSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-wavsettings.html
+type Channel_WavSettings struct {
+
+	// BitDepth AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-wavsettings.html#cfn-medialive-channel-wavsettings-bitdepth
+	BitDepth *types.Value `json:"BitDepth,omitempty"`
+
+	// CodingMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-wavsettings.html#cfn-medialive-channel-wavsettings-codingmode
+	CodingMode *types.Value `json:"CodingMode,omitempty"`
+
+	// SampleRate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-wavsettings.html#cfn-medialive-channel-wavsettings-samplerate
+	SampleRate *types.Value `json:"SampleRate,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_WavSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.WavSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-channel_webvttdestinationsettings.go b/goformation/cloudformation/medialive/aws-medialive-channel_webvttdestinationsettings.go
new file mode 100644
index 0000000000..d8b48f7c66
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-channel_webvttdestinationsettings.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_WebvttDestinationSettings AWS CloudFormation Resource (AWS::MediaLive::Channel.WebvttDestinationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-webvttdestinationsettings.html
+type Channel_WebvttDestinationSettings struct {
+
+	// StyleControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-channel-webvttdestinationsettings.html#cfn-medialive-channel-webvttdestinationsettings-stylecontrol
+	StyleControl *types.Value `json:"StyleControl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_WebvttDestinationSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Channel.WebvttDestinationSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-input.go b/goformation/cloudformation/medialive/aws-medialive-input.go
new file mode 100644
index 0000000000..dc3a9190c0
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-input.go
@@ -0,0 +1,153 @@
+package medialive
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Input AWS CloudFormation Resource (AWS::MediaLive::Input)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-input.html
+type Input struct {
+
+	// Destinations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-input.html#cfn-medialive-input-destinations
+	Destinations []Input_InputDestinationRequest `json:"Destinations,omitempty"`
+
+	// InputDevices AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-input.html#cfn-medialive-input-inputdevices
+	InputDevices []Input_InputDeviceSettings `json:"InputDevices,omitempty"`
+
+	// InputSecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-input.html#cfn-medialive-input-inputsecuritygroups
+	InputSecurityGroups *types.Value `json:"InputSecurityGroups,omitempty"`
+
+	// MediaConnectFlows AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-input.html#cfn-medialive-input-mediaconnectflows
+	MediaConnectFlows []Input_MediaConnectFlowRequest `json:"MediaConnectFlows,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-input.html#cfn-medialive-input-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-input.html#cfn-medialive-input-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Sources AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-input.html#cfn-medialive-input-sources
+	Sources []Input_InputSourceRequest `json:"Sources,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
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-input.html#cfn-medialive-input-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Vpc AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-input.html#cfn-medialive-input-vpc
+	Vpc *Input_InputVpcRequest `json:"Vpc,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Input"
+}
+
+// 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 Input) MarshalJSON() ([]byte, error) {
+	type Properties Input
+	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 *Input) UnmarshalJSON(b []byte) error {
+	type Properties Input
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Input(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/medialive/aws-medialive-input_inputdestinationrequest.go b/goformation/cloudformation/medialive/aws-medialive-input_inputdestinationrequest.go
new file mode 100644
index 0000000000..69f9a86e85
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-input_inputdestinationrequest.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Input_InputDestinationRequest AWS CloudFormation Resource (AWS::MediaLive::Input.InputDestinationRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputdestinationrequest.html
+type Input_InputDestinationRequest struct {
+
+	// StreamName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputdestinationrequest.html#cfn-medialive-input-inputdestinationrequest-streamname
+	StreamName *types.Value `json:"StreamName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InputDestinationRequest) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Input.InputDestinationRequest"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-input_inputdevicerequest.go b/goformation/cloudformation/medialive/aws-medialive-input_inputdevicerequest.go
new file mode 100644
index 0000000000..7db50bb053
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-input_inputdevicerequest.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Input_InputDeviceRequest AWS CloudFormation Resource (AWS::MediaLive::Input.InputDeviceRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputdevicerequest.html
+type Input_InputDeviceRequest struct {
+
+	// Id AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputdevicerequest.html#cfn-medialive-input-inputdevicerequest-id
+	Id *types.Value `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 *Input_InputDeviceRequest) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Input.InputDeviceRequest"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-input_inputdevicesettings.go b/goformation/cloudformation/medialive/aws-medialive-input_inputdevicesettings.go
new file mode 100644
index 0000000000..bc34d10d7c
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-input_inputdevicesettings.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Input_InputDeviceSettings AWS CloudFormation Resource (AWS::MediaLive::Input.InputDeviceSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputdevicesettings.html
+type Input_InputDeviceSettings struct {
+
+	// Id AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputdevicesettings.html#cfn-medialive-input-inputdevicesettings-id
+	Id *types.Value `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 *Input_InputDeviceSettings) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Input.InputDeviceSettings"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-input_inputsourcerequest.go b/goformation/cloudformation/medialive/aws-medialive-input_inputsourcerequest.go
new file mode 100644
index 0000000000..c124269749
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-input_inputsourcerequest.go
@@ -0,0 +1,47 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Input_InputSourceRequest AWS CloudFormation Resource (AWS::MediaLive::Input.InputSourceRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputsourcerequest.html
+type Input_InputSourceRequest struct {
+
+	// PasswordParam AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputsourcerequest.html#cfn-medialive-input-inputsourcerequest-passwordparam
+	PasswordParam *types.Value `json:"PasswordParam,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputsourcerequest.html#cfn-medialive-input-inputsourcerequest-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputsourcerequest.html#cfn-medialive-input-inputsourcerequest-username
+	Username *types.Value `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 *Input_InputSourceRequest) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Input.InputSourceRequest"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-input_inputvpcrequest.go b/goformation/cloudformation/medialive/aws-medialive-input_inputvpcrequest.go
new file mode 100644
index 0000000000..b9fc7b1c09
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-input_inputvpcrequest.go
@@ -0,0 +1,42 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Input_InputVpcRequest AWS CloudFormation Resource (AWS::MediaLive::Input.InputVpcRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputvpcrequest.html
+type Input_InputVpcRequest struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputvpcrequest.html#cfn-medialive-input-inputvpcrequest-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-inputvpcrequest.html#cfn-medialive-input-inputvpcrequest-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Input_InputVpcRequest) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Input.InputVpcRequest"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-input_mediaconnectflowrequest.go b/goformation/cloudformation/medialive/aws-medialive-input_mediaconnectflowrequest.go
new file mode 100644
index 0000000000..ede4dd4193
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-input_mediaconnectflowrequest.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Input_MediaConnectFlowRequest AWS CloudFormation Resource (AWS::MediaLive::Input.MediaConnectFlowRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-mediaconnectflowrequest.html
+type Input_MediaConnectFlowRequest struct {
+
+	// FlowArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-input-mediaconnectflowrequest.html#cfn-medialive-input-mediaconnectflowrequest-flowarn
+	FlowArn *types.Value `json:"FlowArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_MediaConnectFlowRequest) AWSCloudFormationType() string {
+	return "AWS::MediaLive::Input.MediaConnectFlowRequest"
+}
diff --git a/goformation/cloudformation/medialive/aws-medialive-inputsecuritygroup.go b/goformation/cloudformation/medialive/aws-medialive-inputsecuritygroup.go
new file mode 100644
index 0000000000..52909979b3
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-inputsecuritygroup.go
@@ -0,0 +1,111 @@
+package medialive
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InputSecurityGroup AWS CloudFormation Resource (AWS::MediaLive::InputSecurityGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-inputsecuritygroup.html
+type InputSecurityGroup struct {
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-inputsecuritygroup.html#cfn-medialive-inputsecuritygroup-tags
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// WhitelistRules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-medialive-inputsecuritygroup.html#cfn-medialive-inputsecuritygroup-whitelistrules
+	WhitelistRules []InputSecurityGroup_InputWhitelistRuleCidr `json:"WhitelistRules,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InputSecurityGroup) AWSCloudFormationType() string {
+	return "AWS::MediaLive::InputSecurityGroup"
+}
+
+// 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 InputSecurityGroup) MarshalJSON() ([]byte, error) {
+	type Properties InputSecurityGroup
+	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 *InputSecurityGroup) UnmarshalJSON(b []byte) error {
+	type Properties InputSecurityGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = InputSecurityGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/medialive/aws-medialive-inputsecuritygroup_inputwhitelistrulecidr.go b/goformation/cloudformation/medialive/aws-medialive-inputsecuritygroup_inputwhitelistrulecidr.go
new file mode 100644
index 0000000000..a38fa407fd
--- /dev/null
+++ b/goformation/cloudformation/medialive/aws-medialive-inputsecuritygroup_inputwhitelistrulecidr.go
@@ -0,0 +1,37 @@
+package medialive
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InputSecurityGroup_InputWhitelistRuleCidr AWS CloudFormation Resource (AWS::MediaLive::InputSecurityGroup.InputWhitelistRuleCidr)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-inputsecuritygroup-inputwhitelistrulecidr.html
+type InputSecurityGroup_InputWhitelistRuleCidr struct {
+
+	// Cidr AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-medialive-inputsecuritygroup-inputwhitelistrulecidr.html#cfn-medialive-inputsecuritygroup-inputwhitelistrulecidr-cidr
+	Cidr *types.Value `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 *InputSecurityGroup_InputWhitelistRuleCidr) AWSCloudFormationType() string {
+	return "AWS::MediaLive::InputSecurityGroup.InputWhitelistRuleCidr"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-asset.go b/goformation/cloudformation/mediapackage/aws-mediapackage-asset.go
new file mode 100644
index 0000000000..55141a2e75
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-asset.go
@@ -0,0 +1,134 @@
+package mediapackage
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Asset AWS CloudFormation Resource (AWS::MediaPackage::Asset)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-asset.html
+type Asset struct {
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-asset.html#cfn-mediapackage-asset-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// PackagingGroupId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-asset.html#cfn-mediapackage-asset-packaginggroupid
+	PackagingGroupId *types.Value `json:"PackagingGroupId,omitempty"`
+
+	// ResourceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-asset.html#cfn-mediapackage-asset-resourceid
+	ResourceId *types.Value `json:"ResourceId,omitempty"`
+
+	// SourceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-asset.html#cfn-mediapackage-asset-sourcearn
+	SourceArn *types.Value `json:"SourceArn,omitempty"`
+
+	// SourceRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-asset.html#cfn-mediapackage-asset-sourcerolearn
+	SourceRoleArn *types.Value `json:"SourceRoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-asset.html#cfn-mediapackage-asset-tags
+	Tags []cloudformation.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 *Asset) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::Asset"
+}
+
+// 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 Asset) MarshalJSON() ([]byte, error) {
+	type Properties Asset
+	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 *Asset) UnmarshalJSON(b []byte) error {
+	type Properties Asset
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Asset(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/mediapackage/aws-mediapackage-asset_egressendpoint.go b/goformation/cloudformation/mediapackage/aws-mediapackage-asset_egressendpoint.go
new file mode 100644
index 0000000000..771ad7d778
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-asset_egressendpoint.go
@@ -0,0 +1,42 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Asset_EgressEndpoint AWS CloudFormation Resource (AWS::MediaPackage::Asset.EgressEndpoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-asset-egressendpoint.html
+type Asset_EgressEndpoint struct {
+
+	// PackagingConfigurationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-asset-egressendpoint.html#cfn-mediapackage-asset-egressendpoint-packagingconfigurationid
+	PackagingConfigurationId *types.Value `json:"PackagingConfigurationId,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-asset-egressendpoint.html#cfn-mediapackage-asset-egressendpoint-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Asset_EgressEndpoint) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::Asset.EgressEndpoint"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-channel.go b/goformation/cloudformation/mediapackage/aws-mediapackage-channel.go
new file mode 100644
index 0000000000..c437717a09
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-channel.go
@@ -0,0 +1,129 @@
+package mediapackage
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel AWS CloudFormation Resource (AWS::MediaPackage::Channel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-channel.html
+type Channel struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-channel.html#cfn-mediapackage-channel-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EgressAccessLogs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-channel.html#cfn-mediapackage-channel-egressaccesslogs
+	EgressAccessLogs *Channel_LogConfiguration `json:"EgressAccessLogs,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-channel.html#cfn-mediapackage-channel-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// IngressAccessLogs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-channel.html#cfn-mediapackage-channel-ingressaccesslogs
+	IngressAccessLogs *Channel_LogConfiguration `json:"IngressAccessLogs,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-channel.html#cfn-mediapackage-channel-tags
+	Tags []cloudformation.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 *Channel) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::Channel"
+}
+
+// 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 Channel) MarshalJSON() ([]byte, error) {
+	type Properties Channel
+	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 *Channel) UnmarshalJSON(b []byte) error {
+	type Properties Channel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Channel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/mediapackage/aws-mediapackage-channel_hlsingest.go b/goformation/cloudformation/mediapackage/aws-mediapackage-channel_hlsingest.go
new file mode 100644
index 0000000000..c0526eeece
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-channel_hlsingest.go
@@ -0,0 +1,35 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_HlsIngest AWS CloudFormation Resource (AWS::MediaPackage::Channel.HlsIngest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-channel-hlsingest.html
+type Channel_HlsIngest struct {
+
+	// ingestEndpoints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-channel-hlsingest.html#cfn-mediapackage-channel-hlsingest-ingestendpoints
+	ingestEndpoints []Channel_IngestEndpoint `json:"ingestEndpoints,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_HlsIngest) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::Channel.HlsIngest"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-channel_ingestendpoint.go b/goformation/cloudformation/mediapackage/aws-mediapackage-channel_ingestendpoint.go
new file mode 100644
index 0000000000..eb9b159fd1
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-channel_ingestendpoint.go
@@ -0,0 +1,52 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_IngestEndpoint AWS CloudFormation Resource (AWS::MediaPackage::Channel.IngestEndpoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-channel-ingestendpoint.html
+type Channel_IngestEndpoint struct {
+
+	// Id AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-channel-ingestendpoint.html#cfn-mediapackage-channel-ingestendpoint-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Password AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-channel-ingestendpoint.html#cfn-mediapackage-channel-ingestendpoint-password
+	Password *types.Value `json:"Password,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-channel-ingestendpoint.html#cfn-mediapackage-channel-ingestendpoint-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-channel-ingestendpoint.html#cfn-mediapackage-channel-ingestendpoint-username
+	Username *types.Value `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 *Channel_IngestEndpoint) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::Channel.IngestEndpoint"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-channel_logconfiguration.go b/goformation/cloudformation/mediapackage/aws-mediapackage-channel_logconfiguration.go
new file mode 100644
index 0000000000..169a9fe260
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-channel_logconfiguration.go
@@ -0,0 +1,37 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Channel_LogConfiguration AWS CloudFormation Resource (AWS::MediaPackage::Channel.LogConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-channel-logconfiguration.html
+type Channel_LogConfiguration struct {
+
+	// LogGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-channel-logconfiguration.html#cfn-mediapackage-channel-logconfiguration-loggroupname
+	LogGroupName *types.Value `json:"LogGroupName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Channel_LogConfiguration) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::Channel.LogConfiguration"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint.go b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint.go
new file mode 100644
index 0000000000..af89b9b56a
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint.go
@@ -0,0 +1,174 @@
+package mediapackage
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// OriginEndpoint AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html
+type OriginEndpoint struct {
+
+	// Authorization AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-authorization
+	Authorization *OriginEndpoint_Authorization `json:"Authorization,omitempty"`
+
+	// ChannelId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-channelid
+	ChannelId *types.Value `json:"ChannelId,omitempty"`
+
+	// CmafPackage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-cmafpackage
+	CmafPackage *OriginEndpoint_CmafPackage `json:"CmafPackage,omitempty"`
+
+	// DashPackage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-dashpackage
+	DashPackage *OriginEndpoint_DashPackage `json:"DashPackage,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// HlsPackage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-hlspackage
+	HlsPackage *OriginEndpoint_HlsPackage `json:"HlsPackage,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// ManifestName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-manifestname
+	ManifestName *types.Value `json:"ManifestName,omitempty"`
+
+	// MssPackage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-msspackage
+	MssPackage *OriginEndpoint_MssPackage `json:"MssPackage,omitempty"`
+
+	// Origination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-origination
+	Origination *types.Value `json:"Origination,omitempty"`
+
+	// StartoverWindowSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-startoverwindowseconds
+	StartoverWindowSeconds *types.Value `json:"StartoverWindowSeconds,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TimeDelaySeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-timedelayseconds
+	TimeDelaySeconds *types.Value `json:"TimeDelaySeconds,omitempty"`
+
+	// Whitelist AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-originendpoint.html#cfn-mediapackage-originendpoint-whitelist
+	Whitelist *types.Value `json:"Whitelist,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::OriginEndpoint"
+}
+
+// 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 OriginEndpoint) MarshalJSON() ([]byte, error) {
+	type Properties OriginEndpoint
+	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 *OriginEndpoint) UnmarshalJSON(b []byte) error {
+	type Properties OriginEndpoint
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = OriginEndpoint(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_adtriggers.go b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_adtriggers.go
new file mode 100644
index 0000000000..f9992713d2
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_adtriggers.go
@@ -0,0 +1,35 @@
+package mediapackage
+
+import (
+	"github.com/awslabs/goformation/v4/cloudformation/policies"
+)
+
+// OriginEndpoint_AdTriggers AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.AdTriggers)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-adtriggers.html
+type OriginEndpoint_AdTriggers struct {
+
+	// AdTriggers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-adtriggers.html#cfn-mediapackage-originendpoint-adtriggers-adtriggers
+	AdTriggers []string `json:"AdTriggers,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AdTriggers) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::OriginEndpoint.AdTriggers"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_authorization.go b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_authorization.go
new file mode 100644
index 0000000000..ca12eda684
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_authorization.go
@@ -0,0 +1,42 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OriginEndpoint_Authorization AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.Authorization)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-authorization.html
+type OriginEndpoint_Authorization struct {
+
+	// CdnIdentifierSecret AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-authorization.html#cfn-mediapackage-originendpoint-authorization-cdnidentifiersecret
+	CdnIdentifierSecret *types.Value `json:"CdnIdentifierSecret,omitempty"`
+
+	// SecretsRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-authorization.html#cfn-mediapackage-originendpoint-authorization-secretsrolearn
+	SecretsRoleArn *types.Value `json:"SecretsRoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Authorization) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::OriginEndpoint.Authorization"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafencryption.go b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafencryption.go
new file mode 100644
index 0000000000..cf48082f2e
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafencryption.go
@@ -0,0 +1,47 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OriginEndpoint_CmafEncryption AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.CmafEncryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-cmafencryption.html
+type OriginEndpoint_CmafEncryption struct {
+
+	// ConstantInitializationVector AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-cmafencryption.html#cfn-mediapackage-originendpoint-cmafencryption-constantinitializationvector
+	ConstantInitializationVector *types.Value `json:"ConstantInitializationVector,omitempty"`
+
+	// KeyRotationIntervalSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-cmafencryption.html#cfn-mediapackage-originendpoint-cmafencryption-keyrotationintervalseconds
+	KeyRotationIntervalSeconds *types.Value `json:"KeyRotationIntervalSeconds,omitempty"`
+
+	// SpekeKeyProvider AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-cmafencryption.html#cfn-mediapackage-originendpoint-cmafencryption-spekekeyprovider
+	SpekeKeyProvider *OriginEndpoint_SpekeKeyProvider `json:"SpekeKeyProvider,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CmafEncryption) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::OriginEndpoint.CmafEncryption"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafpackage.go b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafpackage.go
new file mode 100644
index 0000000000..3f93b78ec8
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_cmafpackage.go
@@ -0,0 +1,57 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OriginEndpoint_CmafPackage AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.CmafPackage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-cmafpackage.html
+type OriginEndpoint_CmafPackage struct {
+
+	// Encryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-cmafpackage.html#cfn-mediapackage-originendpoint-cmafpackage-encryption
+	Encryption *OriginEndpoint_CmafEncryption `json:"Encryption,omitempty"`
+
+	// HlsManifests AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-cmafpackage.html#cfn-mediapackage-originendpoint-cmafpackage-hlsmanifests
+	HlsManifests []OriginEndpoint_HlsManifest `json:"HlsManifests,omitempty"`
+
+	// SegmentDurationSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-cmafpackage.html#cfn-mediapackage-originendpoint-cmafpackage-segmentdurationseconds
+	SegmentDurationSeconds *types.Value `json:"SegmentDurationSeconds,omitempty"`
+
+	// SegmentPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-cmafpackage.html#cfn-mediapackage-originendpoint-cmafpackage-segmentprefix
+	SegmentPrefix *types.Value `json:"SegmentPrefix,omitempty"`
+
+	// StreamSelection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-cmafpackage.html#cfn-mediapackage-originendpoint-cmafpackage-streamselection
+	StreamSelection *OriginEndpoint_StreamSelection `json:"StreamSelection,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CmafPackage) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::OriginEndpoint.CmafPackage"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashencryption.go b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashencryption.go
new file mode 100644
index 0000000000..ce89b97231
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashencryption.go
@@ -0,0 +1,42 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OriginEndpoint_DashEncryption AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.DashEncryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashencryption.html
+type OriginEndpoint_DashEncryption struct {
+
+	// KeyRotationIntervalSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashencryption.html#cfn-mediapackage-originendpoint-dashencryption-keyrotationintervalseconds
+	KeyRotationIntervalSeconds *types.Value `json:"KeyRotationIntervalSeconds,omitempty"`
+
+	// SpekeKeyProvider AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashencryption.html#cfn-mediapackage-originendpoint-dashencryption-spekekeyprovider
+	SpekeKeyProvider *OriginEndpoint_SpekeKeyProvider `json:"SpekeKeyProvider,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DashEncryption) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::OriginEndpoint.DashEncryption"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashpackage.go b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashpackage.go
new file mode 100644
index 0000000000..701baf061f
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_dashpackage.go
@@ -0,0 +1,107 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OriginEndpoint_DashPackage AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.DashPackage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html
+type OriginEndpoint_DashPackage struct {
+
+	// AdTriggers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-adtriggers
+	AdTriggers *types.Value `json:"AdTriggers,omitempty"`
+
+	// AdsOnDeliveryRestrictions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-adsondeliveryrestrictions
+	AdsOnDeliveryRestrictions *types.Value `json:"AdsOnDeliveryRestrictions,omitempty"`
+
+	// Encryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-encryption
+	Encryption *OriginEndpoint_DashEncryption `json:"Encryption,omitempty"`
+
+	// ManifestLayout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-manifestlayout
+	ManifestLayout *types.Value `json:"ManifestLayout,omitempty"`
+
+	// ManifestWindowSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-manifestwindowseconds
+	ManifestWindowSeconds *types.Value `json:"ManifestWindowSeconds,omitempty"`
+
+	// MinBufferTimeSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-minbuffertimeseconds
+	MinBufferTimeSeconds *types.Value `json:"MinBufferTimeSeconds,omitempty"`
+
+	// MinUpdatePeriodSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-minupdateperiodseconds
+	MinUpdatePeriodSeconds *types.Value `json:"MinUpdatePeriodSeconds,omitempty"`
+
+	// PeriodTriggers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-periodtriggers
+	PeriodTriggers *types.Value `json:"PeriodTriggers,omitempty"`
+
+	// Profile AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-profile
+	Profile *types.Value `json:"Profile,omitempty"`
+
+	// SegmentDurationSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-segmentdurationseconds
+	SegmentDurationSeconds *types.Value `json:"SegmentDurationSeconds,omitempty"`
+
+	// SegmentTemplateFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-segmenttemplateformat
+	SegmentTemplateFormat *types.Value `json:"SegmentTemplateFormat,omitempty"`
+
+	// StreamSelection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-streamselection
+	StreamSelection *OriginEndpoint_StreamSelection `json:"StreamSelection,omitempty"`
+
+	// SuggestedPresentationDelaySeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-suggestedpresentationdelayseconds
+	SuggestedPresentationDelaySeconds *types.Value `json:"SuggestedPresentationDelaySeconds,omitempty"`
+
+	// UtcTiming AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-utctiming
+	UtcTiming *types.Value `json:"UtcTiming,omitempty"`
+
+	// UtcTimingUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-dashpackage.html#cfn-mediapackage-originendpoint-dashpackage-utctiminguri
+	UtcTimingUri *types.Value `json:"UtcTimingUri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DashPackage) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::OriginEndpoint.DashPackage"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsencryption.go b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsencryption.go
new file mode 100644
index 0000000000..748f297365
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsencryption.go
@@ -0,0 +1,57 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OriginEndpoint_HlsEncryption AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.HlsEncryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsencryption.html
+type OriginEndpoint_HlsEncryption struct {
+
+	// ConstantInitializationVector AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsencryption.html#cfn-mediapackage-originendpoint-hlsencryption-constantinitializationvector
+	ConstantInitializationVector *types.Value `json:"ConstantInitializationVector,omitempty"`
+
+	// EncryptionMethod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsencryption.html#cfn-mediapackage-originendpoint-hlsencryption-encryptionmethod
+	EncryptionMethod *types.Value `json:"EncryptionMethod,omitempty"`
+
+	// KeyRotationIntervalSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsencryption.html#cfn-mediapackage-originendpoint-hlsencryption-keyrotationintervalseconds
+	KeyRotationIntervalSeconds *types.Value `json:"KeyRotationIntervalSeconds,omitempty"`
+
+	// RepeatExtXKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsencryption.html#cfn-mediapackage-originendpoint-hlsencryption-repeatextxkey
+	RepeatExtXKey *types.Value `json:"RepeatExtXKey,omitempty"`
+
+	// SpekeKeyProvider AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsencryption.html#cfn-mediapackage-originendpoint-hlsencryption-spekekeyprovider
+	SpekeKeyProvider *OriginEndpoint_SpekeKeyProvider `json:"SpekeKeyProvider,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_HlsEncryption) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::OriginEndpoint.HlsEncryption"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsmanifest.go b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsmanifest.go
new file mode 100644
index 0000000000..cfe1d88836
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlsmanifest.go
@@ -0,0 +1,82 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OriginEndpoint_HlsManifest AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.HlsManifest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html
+type OriginEndpoint_HlsManifest struct {
+
+	// AdMarkers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html#cfn-mediapackage-originendpoint-hlsmanifest-admarkers
+	AdMarkers *types.Value `json:"AdMarkers,omitempty"`
+
+	// AdTriggers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html#cfn-mediapackage-originendpoint-hlsmanifest-adtriggers
+	AdTriggers *types.Value `json:"AdTriggers,omitempty"`
+
+	// AdsOnDeliveryRestrictions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html#cfn-mediapackage-originendpoint-hlsmanifest-adsondeliveryrestrictions
+	AdsOnDeliveryRestrictions *types.Value `json:"AdsOnDeliveryRestrictions,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html#cfn-mediapackage-originendpoint-hlsmanifest-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// IncludeIframeOnlyStream AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html#cfn-mediapackage-originendpoint-hlsmanifest-includeiframeonlystream
+	IncludeIframeOnlyStream *types.Value `json:"IncludeIframeOnlyStream,omitempty"`
+
+	// ManifestName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html#cfn-mediapackage-originendpoint-hlsmanifest-manifestname
+	ManifestName *types.Value `json:"ManifestName,omitempty"`
+
+	// PlaylistType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html#cfn-mediapackage-originendpoint-hlsmanifest-playlisttype
+	PlaylistType *types.Value `json:"PlaylistType,omitempty"`
+
+	// PlaylistWindowSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html#cfn-mediapackage-originendpoint-hlsmanifest-playlistwindowseconds
+	PlaylistWindowSeconds *types.Value `json:"PlaylistWindowSeconds,omitempty"`
+
+	// ProgramDateTimeIntervalSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html#cfn-mediapackage-originendpoint-hlsmanifest-programdatetimeintervalseconds
+	ProgramDateTimeIntervalSeconds *types.Value `json:"ProgramDateTimeIntervalSeconds,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlsmanifest.html#cfn-mediapackage-originendpoint-hlsmanifest-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_HlsManifest) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::OriginEndpoint.HlsManifest"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlspackage.go b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlspackage.go
new file mode 100644
index 0000000000..fd1bf2309b
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_hlspackage.go
@@ -0,0 +1,87 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OriginEndpoint_HlsPackage AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.HlsPackage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html
+type OriginEndpoint_HlsPackage struct {
+
+	// AdMarkers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html#cfn-mediapackage-originendpoint-hlspackage-admarkers
+	AdMarkers *types.Value `json:"AdMarkers,omitempty"`
+
+	// AdTriggers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html#cfn-mediapackage-originendpoint-hlspackage-adtriggers
+	AdTriggers *types.Value `json:"AdTriggers,omitempty"`
+
+	// AdsOnDeliveryRestrictions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html#cfn-mediapackage-originendpoint-hlspackage-adsondeliveryrestrictions
+	AdsOnDeliveryRestrictions *types.Value `json:"AdsOnDeliveryRestrictions,omitempty"`
+
+	// Encryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html#cfn-mediapackage-originendpoint-hlspackage-encryption
+	Encryption *OriginEndpoint_HlsEncryption `json:"Encryption,omitempty"`
+
+	// IncludeIframeOnlyStream AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html#cfn-mediapackage-originendpoint-hlspackage-includeiframeonlystream
+	IncludeIframeOnlyStream *types.Value `json:"IncludeIframeOnlyStream,omitempty"`
+
+	// PlaylistType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html#cfn-mediapackage-originendpoint-hlspackage-playlisttype
+	PlaylistType *types.Value `json:"PlaylistType,omitempty"`
+
+	// PlaylistWindowSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html#cfn-mediapackage-originendpoint-hlspackage-playlistwindowseconds
+	PlaylistWindowSeconds *types.Value `json:"PlaylistWindowSeconds,omitempty"`
+
+	// ProgramDateTimeIntervalSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html#cfn-mediapackage-originendpoint-hlspackage-programdatetimeintervalseconds
+	ProgramDateTimeIntervalSeconds *types.Value `json:"ProgramDateTimeIntervalSeconds,omitempty"`
+
+	// SegmentDurationSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html#cfn-mediapackage-originendpoint-hlspackage-segmentdurationseconds
+	SegmentDurationSeconds *types.Value `json:"SegmentDurationSeconds,omitempty"`
+
+	// StreamSelection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html#cfn-mediapackage-originendpoint-hlspackage-streamselection
+	StreamSelection *OriginEndpoint_StreamSelection `json:"StreamSelection,omitempty"`
+
+	// UseAudioRenditionGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-hlspackage.html#cfn-mediapackage-originendpoint-hlspackage-useaudiorenditiongroup
+	UseAudioRenditionGroup *types.Value `json:"UseAudioRenditionGroup,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_HlsPackage) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::OriginEndpoint.HlsPackage"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_mssencryption.go b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_mssencryption.go
new file mode 100644
index 0000000000..a31e753608
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_mssencryption.go
@@ -0,0 +1,35 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// OriginEndpoint_MssEncryption AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.MssEncryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-mssencryption.html
+type OriginEndpoint_MssEncryption struct {
+
+	// SpekeKeyProvider AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-mssencryption.html#cfn-mediapackage-originendpoint-mssencryption-spekekeyprovider
+	SpekeKeyProvider *OriginEndpoint_SpekeKeyProvider `json:"SpekeKeyProvider,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_MssEncryption) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::OriginEndpoint.MssEncryption"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_msspackage.go b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_msspackage.go
new file mode 100644
index 0000000000..a9e81b8085
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_msspackage.go
@@ -0,0 +1,52 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OriginEndpoint_MssPackage AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.MssPackage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-msspackage.html
+type OriginEndpoint_MssPackage struct {
+
+	// Encryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-msspackage.html#cfn-mediapackage-originendpoint-msspackage-encryption
+	Encryption *OriginEndpoint_MssEncryption `json:"Encryption,omitempty"`
+
+	// ManifestWindowSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-msspackage.html#cfn-mediapackage-originendpoint-msspackage-manifestwindowseconds
+	ManifestWindowSeconds *types.Value `json:"ManifestWindowSeconds,omitempty"`
+
+	// SegmentDurationSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-msspackage.html#cfn-mediapackage-originendpoint-msspackage-segmentdurationseconds
+	SegmentDurationSeconds *types.Value `json:"SegmentDurationSeconds,omitempty"`
+
+	// StreamSelection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-msspackage.html#cfn-mediapackage-originendpoint-msspackage-streamselection
+	StreamSelection *OriginEndpoint_StreamSelection `json:"StreamSelection,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_MssPackage) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::OriginEndpoint.MssPackage"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_spekekeyprovider.go b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_spekekeyprovider.go
new file mode 100644
index 0000000000..610fb647b8
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_spekekeyprovider.go
@@ -0,0 +1,57 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OriginEndpoint_SpekeKeyProvider AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-spekekeyprovider.html
+type OriginEndpoint_SpekeKeyProvider struct {
+
+	// CertificateArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-spekekeyprovider.html#cfn-mediapackage-originendpoint-spekekeyprovider-certificatearn
+	CertificateArn *types.Value `json:"CertificateArn,omitempty"`
+
+	// ResourceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-spekekeyprovider.html#cfn-mediapackage-originendpoint-spekekeyprovider-resourceid
+	ResourceId *types.Value `json:"ResourceId,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-spekekeyprovider.html#cfn-mediapackage-originendpoint-spekekeyprovider-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// SystemIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-spekekeyprovider.html#cfn-mediapackage-originendpoint-spekekeyprovider-systemids
+	SystemIds *types.Value `json:"SystemIds,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-spekekeyprovider.html#cfn-mediapackage-originendpoint-spekekeyprovider-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SpekeKeyProvider) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_streamselection.go b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_streamselection.go
new file mode 100644
index 0000000000..6f14c88343
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-originendpoint_streamselection.go
@@ -0,0 +1,47 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OriginEndpoint_StreamSelection AWS CloudFormation Resource (AWS::MediaPackage::OriginEndpoint.StreamSelection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-streamselection.html
+type OriginEndpoint_StreamSelection struct {
+
+	// MaxVideoBitsPerSecond AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-streamselection.html#cfn-mediapackage-originendpoint-streamselection-maxvideobitspersecond
+	MaxVideoBitsPerSecond *types.Value `json:"MaxVideoBitsPerSecond,omitempty"`
+
+	// MinVideoBitsPerSecond AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-streamselection.html#cfn-mediapackage-originendpoint-streamselection-minvideobitspersecond
+	MinVideoBitsPerSecond *types.Value `json:"MinVideoBitsPerSecond,omitempty"`
+
+	// StreamOrder AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-originendpoint-streamselection.html#cfn-mediapackage-originendpoint-streamselection-streamorder
+	StreamOrder *types.Value `json:"StreamOrder,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_StreamSelection) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::OriginEndpoint.StreamSelection"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration.go b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration.go
new file mode 100644
index 0000000000..82bf86bb30
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration.go
@@ -0,0 +1,139 @@
+package mediapackage
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// PackagingConfiguration AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packagingconfiguration.html
+type PackagingConfiguration struct {
+
+	// CmafPackage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packagingconfiguration.html#cfn-mediapackage-packagingconfiguration-cmafpackage
+	CmafPackage *PackagingConfiguration_CmafPackage `json:"CmafPackage,omitempty"`
+
+	// DashPackage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packagingconfiguration.html#cfn-mediapackage-packagingconfiguration-dashpackage
+	DashPackage *PackagingConfiguration_DashPackage `json:"DashPackage,omitempty"`
+
+	// HlsPackage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packagingconfiguration.html#cfn-mediapackage-packagingconfiguration-hlspackage
+	HlsPackage *PackagingConfiguration_HlsPackage `json:"HlsPackage,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packagingconfiguration.html#cfn-mediapackage-packagingconfiguration-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// MssPackage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packagingconfiguration.html#cfn-mediapackage-packagingconfiguration-msspackage
+	MssPackage *PackagingConfiguration_MssPackage `json:"MssPackage,omitempty"`
+
+	// PackagingGroupId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packagingconfiguration.html#cfn-mediapackage-packagingconfiguration-packaginggroupid
+	PackagingGroupId *types.Value `json:"PackagingGroupId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packagingconfiguration.html#cfn-mediapackage-packagingconfiguration-tags
+	Tags []cloudformation.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 *PackagingConfiguration) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::PackagingConfiguration"
+}
+
+// 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 PackagingConfiguration) MarshalJSON() ([]byte, error) {
+	type Properties PackagingConfiguration
+	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 *PackagingConfiguration) UnmarshalJSON(b []byte) error {
+	type Properties PackagingConfiguration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PackagingConfiguration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafencryption.go b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafencryption.go
new file mode 100644
index 0000000000..eed4527ac7
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafencryption.go
@@ -0,0 +1,35 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// PackagingConfiguration_CmafEncryption AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.CmafEncryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-cmafencryption.html
+type PackagingConfiguration_CmafEncryption struct {
+
+	// SpekeKeyProvider AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-cmafencryption.html#cfn-mediapackage-packagingconfiguration-cmafencryption-spekekeyprovider
+	SpekeKeyProvider *PackagingConfiguration_SpekeKeyProvider `json:"SpekeKeyProvider,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PackagingConfiguration_CmafEncryption) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::PackagingConfiguration.CmafEncryption"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafpackage.go b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafpackage.go
new file mode 100644
index 0000000000..b45933a7ac
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_cmafpackage.go
@@ -0,0 +1,52 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PackagingConfiguration_CmafPackage AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.CmafPackage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-cmafpackage.html
+type PackagingConfiguration_CmafPackage struct {
+
+	// Encryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-cmafpackage.html#cfn-mediapackage-packagingconfiguration-cmafpackage-encryption
+	Encryption *PackagingConfiguration_CmafEncryption `json:"Encryption,omitempty"`
+
+	// HlsManifests AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-cmafpackage.html#cfn-mediapackage-packagingconfiguration-cmafpackage-hlsmanifests
+	HlsManifests []PackagingConfiguration_HlsManifest `json:"HlsManifests,omitempty"`
+
+	// IncludeEncoderConfigurationInSegments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-cmafpackage.html#cfn-mediapackage-packagingconfiguration-cmafpackage-includeencoderconfigurationinsegments
+	IncludeEncoderConfigurationInSegments *types.Value `json:"IncludeEncoderConfigurationInSegments,omitempty"`
+
+	// SegmentDurationSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-cmafpackage.html#cfn-mediapackage-packagingconfiguration-cmafpackage-segmentdurationseconds
+	SegmentDurationSeconds *types.Value `json:"SegmentDurationSeconds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PackagingConfiguration_CmafPackage) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::PackagingConfiguration.CmafPackage"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashencryption.go b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashencryption.go
new file mode 100644
index 0000000000..0752e0376f
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashencryption.go
@@ -0,0 +1,35 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// PackagingConfiguration_DashEncryption AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.DashEncryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashencryption.html
+type PackagingConfiguration_DashEncryption struct {
+
+	// SpekeKeyProvider AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashencryption.html#cfn-mediapackage-packagingconfiguration-dashencryption-spekekeyprovider
+	SpekeKeyProvider *PackagingConfiguration_SpekeKeyProvider `json:"SpekeKeyProvider,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PackagingConfiguration_DashEncryption) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::PackagingConfiguration.DashEncryption"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashmanifest.go b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashmanifest.go
new file mode 100644
index 0000000000..45a2cbd5cb
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashmanifest.go
@@ -0,0 +1,57 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PackagingConfiguration_DashManifest AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.DashManifest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashmanifest.html
+type PackagingConfiguration_DashManifest struct {
+
+	// ManifestLayout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashmanifest.html#cfn-mediapackage-packagingconfiguration-dashmanifest-manifestlayout
+	ManifestLayout *types.Value `json:"ManifestLayout,omitempty"`
+
+	// ManifestName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashmanifest.html#cfn-mediapackage-packagingconfiguration-dashmanifest-manifestname
+	ManifestName *types.Value `json:"ManifestName,omitempty"`
+
+	// MinBufferTimeSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashmanifest.html#cfn-mediapackage-packagingconfiguration-dashmanifest-minbuffertimeseconds
+	MinBufferTimeSeconds *types.Value `json:"MinBufferTimeSeconds,omitempty"`
+
+	// Profile AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashmanifest.html#cfn-mediapackage-packagingconfiguration-dashmanifest-profile
+	Profile *types.Value `json:"Profile,omitempty"`
+
+	// StreamSelection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashmanifest.html#cfn-mediapackage-packagingconfiguration-dashmanifest-streamselection
+	StreamSelection *PackagingConfiguration_StreamSelection `json:"StreamSelection,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PackagingConfiguration_DashManifest) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::PackagingConfiguration.DashManifest"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashpackage.go b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashpackage.go
new file mode 100644
index 0000000000..a1b91163ee
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_dashpackage.go
@@ -0,0 +1,62 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PackagingConfiguration_DashPackage AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.DashPackage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashpackage.html
+type PackagingConfiguration_DashPackage struct {
+
+	// DashManifests AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashpackage.html#cfn-mediapackage-packagingconfiguration-dashpackage-dashmanifests
+	DashManifests []PackagingConfiguration_DashManifest `json:"DashManifests,omitempty"`
+
+	// Encryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashpackage.html#cfn-mediapackage-packagingconfiguration-dashpackage-encryption
+	Encryption *PackagingConfiguration_DashEncryption `json:"Encryption,omitempty"`
+
+	// IncludeEncoderConfigurationInSegments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashpackage.html#cfn-mediapackage-packagingconfiguration-dashpackage-includeencoderconfigurationinsegments
+	IncludeEncoderConfigurationInSegments *types.Value `json:"IncludeEncoderConfigurationInSegments,omitempty"`
+
+	// PeriodTriggers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashpackage.html#cfn-mediapackage-packagingconfiguration-dashpackage-periodtriggers
+	PeriodTriggers *types.Value `json:"PeriodTriggers,omitempty"`
+
+	// SegmentDurationSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashpackage.html#cfn-mediapackage-packagingconfiguration-dashpackage-segmentdurationseconds
+	SegmentDurationSeconds *types.Value `json:"SegmentDurationSeconds,omitempty"`
+
+	// SegmentTemplateFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-dashpackage.html#cfn-mediapackage-packagingconfiguration-dashpackage-segmenttemplateformat
+	SegmentTemplateFormat *types.Value `json:"SegmentTemplateFormat,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PackagingConfiguration_DashPackage) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::PackagingConfiguration.DashPackage"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsencryption.go b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsencryption.go
new file mode 100644
index 0000000000..f180557e22
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsencryption.go
@@ -0,0 +1,47 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PackagingConfiguration_HlsEncryption AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.HlsEncryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsencryption.html
+type PackagingConfiguration_HlsEncryption struct {
+
+	// ConstantInitializationVector AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsencryption.html#cfn-mediapackage-packagingconfiguration-hlsencryption-constantinitializationvector
+	ConstantInitializationVector *types.Value `json:"ConstantInitializationVector,omitempty"`
+
+	// EncryptionMethod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsencryption.html#cfn-mediapackage-packagingconfiguration-hlsencryption-encryptionmethod
+	EncryptionMethod *types.Value `json:"EncryptionMethod,omitempty"`
+
+	// SpekeKeyProvider AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsencryption.html#cfn-mediapackage-packagingconfiguration-hlsencryption-spekekeyprovider
+	SpekeKeyProvider *PackagingConfiguration_SpekeKeyProvider `json:"SpekeKeyProvider,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PackagingConfiguration_HlsEncryption) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::PackagingConfiguration.HlsEncryption"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsmanifest.go b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsmanifest.go
new file mode 100644
index 0000000000..c177651ee6
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlsmanifest.go
@@ -0,0 +1,62 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PackagingConfiguration_HlsManifest AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.HlsManifest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsmanifest.html
+type PackagingConfiguration_HlsManifest struct {
+
+	// AdMarkers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsmanifest.html#cfn-mediapackage-packagingconfiguration-hlsmanifest-admarkers
+	AdMarkers *types.Value `json:"AdMarkers,omitempty"`
+
+	// IncludeIframeOnlyStream AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsmanifest.html#cfn-mediapackage-packagingconfiguration-hlsmanifest-includeiframeonlystream
+	IncludeIframeOnlyStream *types.Value `json:"IncludeIframeOnlyStream,omitempty"`
+
+	// ManifestName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsmanifest.html#cfn-mediapackage-packagingconfiguration-hlsmanifest-manifestname
+	ManifestName *types.Value `json:"ManifestName,omitempty"`
+
+	// ProgramDateTimeIntervalSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsmanifest.html#cfn-mediapackage-packagingconfiguration-hlsmanifest-programdatetimeintervalseconds
+	ProgramDateTimeIntervalSeconds *types.Value `json:"ProgramDateTimeIntervalSeconds,omitempty"`
+
+	// RepeatExtXKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsmanifest.html#cfn-mediapackage-packagingconfiguration-hlsmanifest-repeatextxkey
+	RepeatExtXKey *types.Value `json:"RepeatExtXKey,omitempty"`
+
+	// StreamSelection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlsmanifest.html#cfn-mediapackage-packagingconfiguration-hlsmanifest-streamselection
+	StreamSelection *PackagingConfiguration_StreamSelection `json:"StreamSelection,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PackagingConfiguration_HlsManifest) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::PackagingConfiguration.HlsManifest"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlspackage.go b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlspackage.go
new file mode 100644
index 0000000000..30a94afcc7
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_hlspackage.go
@@ -0,0 +1,52 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PackagingConfiguration_HlsPackage AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.HlsPackage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlspackage.html
+type PackagingConfiguration_HlsPackage struct {
+
+	// Encryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlspackage.html#cfn-mediapackage-packagingconfiguration-hlspackage-encryption
+	Encryption *PackagingConfiguration_HlsEncryption `json:"Encryption,omitempty"`
+
+	// HlsManifests AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlspackage.html#cfn-mediapackage-packagingconfiguration-hlspackage-hlsmanifests
+	HlsManifests []PackagingConfiguration_HlsManifest `json:"HlsManifests,omitempty"`
+
+	// SegmentDurationSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlspackage.html#cfn-mediapackage-packagingconfiguration-hlspackage-segmentdurationseconds
+	SegmentDurationSeconds *types.Value `json:"SegmentDurationSeconds,omitempty"`
+
+	// UseAudioRenditionGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-hlspackage.html#cfn-mediapackage-packagingconfiguration-hlspackage-useaudiorenditiongroup
+	UseAudioRenditionGroup *types.Value `json:"UseAudioRenditionGroup,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PackagingConfiguration_HlsPackage) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::PackagingConfiguration.HlsPackage"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssencryption.go b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssencryption.go
new file mode 100644
index 0000000000..d4d79ad9d1
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssencryption.go
@@ -0,0 +1,35 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// PackagingConfiguration_MssEncryption AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.MssEncryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-mssencryption.html
+type PackagingConfiguration_MssEncryption struct {
+
+	// SpekeKeyProvider AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-mssencryption.html#cfn-mediapackage-packagingconfiguration-mssencryption-spekekeyprovider
+	SpekeKeyProvider *PackagingConfiguration_SpekeKeyProvider `json:"SpekeKeyProvider,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PackagingConfiguration_MssEncryption) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::PackagingConfiguration.MssEncryption"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssmanifest.go b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssmanifest.go
new file mode 100644
index 0000000000..0a28673973
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_mssmanifest.go
@@ -0,0 +1,42 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PackagingConfiguration_MssManifest AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.MssManifest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-mssmanifest.html
+type PackagingConfiguration_MssManifest struct {
+
+	// ManifestName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-mssmanifest.html#cfn-mediapackage-packagingconfiguration-mssmanifest-manifestname
+	ManifestName *types.Value `json:"ManifestName,omitempty"`
+
+	// StreamSelection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-mssmanifest.html#cfn-mediapackage-packagingconfiguration-mssmanifest-streamselection
+	StreamSelection *PackagingConfiguration_StreamSelection `json:"StreamSelection,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PackagingConfiguration_MssManifest) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::PackagingConfiguration.MssManifest"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_msspackage.go b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_msspackage.go
new file mode 100644
index 0000000000..97653f3aa8
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_msspackage.go
@@ -0,0 +1,47 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PackagingConfiguration_MssPackage AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.MssPackage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-msspackage.html
+type PackagingConfiguration_MssPackage struct {
+
+	// Encryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-msspackage.html#cfn-mediapackage-packagingconfiguration-msspackage-encryption
+	Encryption *PackagingConfiguration_MssEncryption `json:"Encryption,omitempty"`
+
+	// MssManifests AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-msspackage.html#cfn-mediapackage-packagingconfiguration-msspackage-mssmanifests
+	MssManifests []PackagingConfiguration_MssManifest `json:"MssManifests,omitempty"`
+
+	// SegmentDurationSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-msspackage.html#cfn-mediapackage-packagingconfiguration-msspackage-segmentdurationseconds
+	SegmentDurationSeconds *types.Value `json:"SegmentDurationSeconds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PackagingConfiguration_MssPackage) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::PackagingConfiguration.MssPackage"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_spekekeyprovider.go b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_spekekeyprovider.go
new file mode 100644
index 0000000000..7e135e1360
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_spekekeyprovider.go
@@ -0,0 +1,47 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PackagingConfiguration_SpekeKeyProvider AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-spekekeyprovider.html
+type PackagingConfiguration_SpekeKeyProvider struct {
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-spekekeyprovider.html#cfn-mediapackage-packagingconfiguration-spekekeyprovider-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// SystemIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-spekekeyprovider.html#cfn-mediapackage-packagingconfiguration-spekekeyprovider-systemids
+	SystemIds *types.Value `json:"SystemIds,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-spekekeyprovider.html#cfn-mediapackage-packagingconfiguration-spekekeyprovider-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PackagingConfiguration_SpekeKeyProvider) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_streamselection.go b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_streamselection.go
new file mode 100644
index 0000000000..0e4c6a5cba
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-packagingconfiguration_streamselection.go
@@ -0,0 +1,47 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PackagingConfiguration_StreamSelection AWS CloudFormation Resource (AWS::MediaPackage::PackagingConfiguration.StreamSelection)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-streamselection.html
+type PackagingConfiguration_StreamSelection struct {
+
+	// MaxVideoBitsPerSecond AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-streamselection.html#cfn-mediapackage-packagingconfiguration-streamselection-maxvideobitspersecond
+	MaxVideoBitsPerSecond *types.Value `json:"MaxVideoBitsPerSecond,omitempty"`
+
+	// MinVideoBitsPerSecond AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-streamselection.html#cfn-mediapackage-packagingconfiguration-streamselection-minvideobitspersecond
+	MinVideoBitsPerSecond *types.Value `json:"MinVideoBitsPerSecond,omitempty"`
+
+	// StreamOrder AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packagingconfiguration-streamselection.html#cfn-mediapackage-packagingconfiguration-streamselection-streamorder
+	StreamOrder *types.Value `json:"StreamOrder,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PackagingConfiguration_StreamSelection) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::PackagingConfiguration.StreamSelection"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup.go b/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup.go
new file mode 100644
index 0000000000..aa661fd5ff
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup.go
@@ -0,0 +1,124 @@
+package mediapackage
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// PackagingGroup AWS CloudFormation Resource (AWS::MediaPackage::PackagingGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packaginggroup.html
+type PackagingGroup struct {
+
+	// Authorization AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packaginggroup.html#cfn-mediapackage-packaginggroup-authorization
+	Authorization *PackagingGroup_Authorization `json:"Authorization,omitempty"`
+
+	// EgressAccessLogs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packaginggroup.html#cfn-mediapackage-packaginggroup-egressaccesslogs
+	EgressAccessLogs *PackagingGroup_LogConfiguration `json:"EgressAccessLogs,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packaginggroup.html#cfn-mediapackage-packaginggroup-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediapackage-packaginggroup.html#cfn-mediapackage-packaginggroup-tags
+	Tags []cloudformation.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 *PackagingGroup) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::PackagingGroup"
+}
+
+// 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 PackagingGroup) MarshalJSON() ([]byte, error) {
+	type Properties PackagingGroup
+	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 *PackagingGroup) UnmarshalJSON(b []byte) error {
+	type Properties PackagingGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PackagingGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup_authorization.go b/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup_authorization.go
new file mode 100644
index 0000000000..2a791449ed
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup_authorization.go
@@ -0,0 +1,42 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PackagingGroup_Authorization AWS CloudFormation Resource (AWS::MediaPackage::PackagingGroup.Authorization)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packaginggroup-authorization.html
+type PackagingGroup_Authorization struct {
+
+	// CdnIdentifierSecret AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packaginggroup-authorization.html#cfn-mediapackage-packaginggroup-authorization-cdnidentifiersecret
+	CdnIdentifierSecret *types.Value `json:"CdnIdentifierSecret,omitempty"`
+
+	// SecretsRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packaginggroup-authorization.html#cfn-mediapackage-packaginggroup-authorization-secretsrolearn
+	SecretsRoleArn *types.Value `json:"SecretsRoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PackagingGroup_Authorization) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::PackagingGroup.Authorization"
+}
diff --git a/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup_logconfiguration.go b/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup_logconfiguration.go
new file mode 100644
index 0000000000..2bd4113d32
--- /dev/null
+++ b/goformation/cloudformation/mediapackage/aws-mediapackage-packaginggroup_logconfiguration.go
@@ -0,0 +1,37 @@
+package mediapackage
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PackagingGroup_LogConfiguration AWS CloudFormation Resource (AWS::MediaPackage::PackagingGroup.LogConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packaginggroup-logconfiguration.html
+type PackagingGroup_LogConfiguration struct {
+
+	// LogGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediapackage-packaginggroup-logconfiguration.html#cfn-mediapackage-packaginggroup-logconfiguration-loggroupname
+	LogGroupName *types.Value `json:"LogGroupName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PackagingGroup_LogConfiguration) AWSCloudFormationType() string {
+	return "AWS::MediaPackage::PackagingGroup.LogConfiguration"
+}
diff --git a/goformation/cloudformation/mediastore/aws-mediastore-container.go b/goformation/cloudformation/mediastore/aws-mediastore-container.go
new file mode 100644
index 0000000000..684d5c6663
--- /dev/null
+++ b/goformation/cloudformation/mediastore/aws-mediastore-container.go
@@ -0,0 +1,139 @@
+package mediastore
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Container AWS CloudFormation Resource (AWS::MediaStore::Container)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediastore-container.html
+type Container struct {
+
+	// AccessLoggingEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediastore-container.html#cfn-mediastore-container-accessloggingenabled
+	AccessLoggingEnabled *types.Value `json:"AccessLoggingEnabled,omitempty"`
+
+	// ContainerName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediastore-container.html#cfn-mediastore-container-containername
+	ContainerName *types.Value `json:"ContainerName,omitempty"`
+
+	// CorsPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediastore-container.html#cfn-mediastore-container-corspolicy
+	CorsPolicy []Container_CorsRule `json:"CorsPolicy,omitempty"`
+
+	// LifecyclePolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediastore-container.html#cfn-mediastore-container-lifecyclepolicy
+	LifecyclePolicy *types.Value `json:"LifecyclePolicy,omitempty"`
+
+	// MetricPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediastore-container.html#cfn-mediastore-container-metricpolicy
+	MetricPolicy *Container_MetricPolicy `json:"MetricPolicy,omitempty"`
+
+	// Policy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediastore-container.html#cfn-mediastore-container-policy
+	Policy *types.Value `json:"Policy,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mediastore-container.html#cfn-mediastore-container-tags
+	Tags []cloudformation.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 *Container) AWSCloudFormationType() string {
+	return "AWS::MediaStore::Container"
+}
+
+// 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 Container) MarshalJSON() ([]byte, error) {
+	type Properties Container
+	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 *Container) UnmarshalJSON(b []byte) error {
+	type Properties Container
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Container(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/mediastore/aws-mediastore-container_corsrule.go b/goformation/cloudformation/mediastore/aws-mediastore-container_corsrule.go
new file mode 100644
index 0000000000..41fce56dff
--- /dev/null
+++ b/goformation/cloudformation/mediastore/aws-mediastore-container_corsrule.go
@@ -0,0 +1,57 @@
+package mediastore
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Container_CorsRule AWS CloudFormation Resource (AWS::MediaStore::Container.CorsRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediastore-container-corsrule.html
+type Container_CorsRule struct {
+
+	// AllowedHeaders AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediastore-container-corsrule.html#cfn-mediastore-container-corsrule-allowedheaders
+	AllowedHeaders *types.Value `json:"AllowedHeaders,omitempty"`
+
+	// AllowedMethods AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediastore-container-corsrule.html#cfn-mediastore-container-corsrule-allowedmethods
+	AllowedMethods *types.Value `json:"AllowedMethods,omitempty"`
+
+	// AllowedOrigins AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediastore-container-corsrule.html#cfn-mediastore-container-corsrule-allowedorigins
+	AllowedOrigins *types.Value `json:"AllowedOrigins,omitempty"`
+
+	// ExposeHeaders AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediastore-container-corsrule.html#cfn-mediastore-container-corsrule-exposeheaders
+	ExposeHeaders *types.Value `json:"ExposeHeaders,omitempty"`
+
+	// MaxAgeSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediastore-container-corsrule.html#cfn-mediastore-container-corsrule-maxageseconds
+	MaxAgeSeconds *types.Value `json:"MaxAgeSeconds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Container_CorsRule) AWSCloudFormationType() string {
+	return "AWS::MediaStore::Container.CorsRule"
+}
diff --git a/goformation/cloudformation/mediastore/aws-mediastore-container_metricpolicy.go b/goformation/cloudformation/mediastore/aws-mediastore-container_metricpolicy.go
new file mode 100644
index 0000000000..b81b0a7830
--- /dev/null
+++ b/goformation/cloudformation/mediastore/aws-mediastore-container_metricpolicy.go
@@ -0,0 +1,42 @@
+package mediastore
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Container_MetricPolicy AWS CloudFormation Resource (AWS::MediaStore::Container.MetricPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediastore-container-metricpolicy.html
+type Container_MetricPolicy struct {
+
+	// ContainerLevelMetrics AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediastore-container-metricpolicy.html#cfn-mediastore-container-metricpolicy-containerlevelmetrics
+	ContainerLevelMetrics *types.Value `json:"ContainerLevelMetrics,omitempty"`
+
+	// MetricPolicyRules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediastore-container-metricpolicy.html#cfn-mediastore-container-metricpolicy-metricpolicyrules
+	MetricPolicyRules []Container_MetricPolicyRule `json:"MetricPolicyRules,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Container_MetricPolicy) AWSCloudFormationType() string {
+	return "AWS::MediaStore::Container.MetricPolicy"
+}
diff --git a/goformation/cloudformation/mediastore/aws-mediastore-container_metricpolicyrule.go b/goformation/cloudformation/mediastore/aws-mediastore-container_metricpolicyrule.go
new file mode 100644
index 0000000000..00b6b6b699
--- /dev/null
+++ b/goformation/cloudformation/mediastore/aws-mediastore-container_metricpolicyrule.go
@@ -0,0 +1,42 @@
+package mediastore
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Container_MetricPolicyRule AWS CloudFormation Resource (AWS::MediaStore::Container.MetricPolicyRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediastore-container-metricpolicyrule.html
+type Container_MetricPolicyRule struct {
+
+	// ObjectGroup AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediastore-container-metricpolicyrule.html#cfn-mediastore-container-metricpolicyrule-objectgroup
+	ObjectGroup *types.Value `json:"ObjectGroup,omitempty"`
+
+	// ObjectGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mediastore-container-metricpolicyrule.html#cfn-mediastore-container-metricpolicyrule-objectgroupname
+	ObjectGroupName *types.Value `json:"ObjectGroupName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Container_MetricPolicyRule) AWSCloudFormationType() string {
+	return "AWS::MediaStore::Container.MetricPolicyRule"
+}
diff --git a/goformation/cloudformation/memorydb/aws-memorydb-acl.go b/goformation/cloudformation/memorydb/aws-memorydb-acl.go
new file mode 100644
index 0000000000..a47e788b4c
--- /dev/null
+++ b/goformation/cloudformation/memorydb/aws-memorydb-acl.go
@@ -0,0 +1,119 @@
+package memorydb
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ACL AWS CloudFormation Resource (AWS::MemoryDB::ACL)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-acl.html
+type ACL struct {
+
+	// ACLName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-acl.html#cfn-memorydb-acl-aclname
+	ACLName *types.Value `json:"ACLName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-acl.html#cfn-memorydb-acl-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// UserNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-acl.html#cfn-memorydb-acl-usernames
+	UserNames *types.Value `json:"UserNames,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ACL) AWSCloudFormationType() string {
+	return "AWS::MemoryDB::ACL"
+}
+
+// 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 ACL) MarshalJSON() ([]byte, error) {
+	type Properties ACL
+	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 *ACL) UnmarshalJSON(b []byte) error {
+	type Properties ACL
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ACL(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/memorydb/aws-memorydb-cluster.go b/goformation/cloudformation/memorydb/aws-memorydb-cluster.go
new file mode 100644
index 0000000000..8eed05039c
--- /dev/null
+++ b/goformation/cloudformation/memorydb/aws-memorydb-cluster.go
@@ -0,0 +1,219 @@
+package memorydb
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster AWS CloudFormation Resource (AWS::MemoryDB::Cluster)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html
+type Cluster struct {
+
+	// ACLName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-aclname
+	ACLName *types.Value `json:"ACLName,omitempty"`
+
+	// AutoMinorVersionUpgrade AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-autominorversionupgrade
+	AutoMinorVersionUpgrade *types.Value `json:"AutoMinorVersionUpgrade,omitempty"`
+
+	// ClusterName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-clustername
+	ClusterName *types.Value `json:"ClusterName,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EngineVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-engineversion
+	EngineVersion *types.Value `json:"EngineVersion,omitempty"`
+
+	// FinalSnapshotName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-finalsnapshotname
+	FinalSnapshotName *types.Value `json:"FinalSnapshotName,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// MaintenanceWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-maintenancewindow
+	MaintenanceWindow *types.Value `json:"MaintenanceWindow,omitempty"`
+
+	// NodeType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-nodetype
+	NodeType *types.Value `json:"NodeType,omitempty"`
+
+	// NumReplicasPerShard AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-numreplicaspershard
+	NumReplicasPerShard *types.Value `json:"NumReplicasPerShard,omitempty"`
+
+	// NumShards AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-numshards
+	NumShards *types.Value `json:"NumShards,omitempty"`
+
+	// ParameterGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-parametergroupname
+	ParameterGroupName *types.Value `json:"ParameterGroupName,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SnapshotArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-snapshotarns
+	SnapshotArns *types.Value `json:"SnapshotArns,omitempty"`
+
+	// SnapshotName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-snapshotname
+	SnapshotName *types.Value `json:"SnapshotName,omitempty"`
+
+	// SnapshotRetentionLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-snapshotretentionlimit
+	SnapshotRetentionLimit *types.Value `json:"SnapshotRetentionLimit,omitempty"`
+
+	// SnapshotWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-snapshotwindow
+	SnapshotWindow *types.Value `json:"SnapshotWindow,omitempty"`
+
+	// SnsTopicArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-snstopicarn
+	SnsTopicArn *types.Value `json:"SnsTopicArn,omitempty"`
+
+	// SnsTopicStatus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-snstopicstatus
+	SnsTopicStatus *types.Value `json:"SnsTopicStatus,omitempty"`
+
+	// SubnetGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-subnetgroupname
+	SubnetGroupName *types.Value `json:"SubnetGroupName,omitempty"`
+
+	// TLSEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-tlsenabled
+	TLSEnabled *types.Value `json:"TLSEnabled,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-cluster.html#cfn-memorydb-cluster-tags
+	Tags []cloudformation.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 *Cluster) AWSCloudFormationType() string {
+	return "AWS::MemoryDB::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/memorydb/aws-memorydb-cluster_endpoint.go b/goformation/cloudformation/memorydb/aws-memorydb-cluster_endpoint.go
new file mode 100644
index 0000000000..53ce2efc8b
--- /dev/null
+++ b/goformation/cloudformation/memorydb/aws-memorydb-cluster_endpoint.go
@@ -0,0 +1,42 @@
+package memorydb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_Endpoint AWS CloudFormation Resource (AWS::MemoryDB::Cluster.Endpoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-memorydb-cluster-endpoint.html
+type Cluster_Endpoint struct {
+
+	// Address AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-memorydb-cluster-endpoint.html#cfn-memorydb-cluster-endpoint-address
+	Address *types.Value `json:"Address,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-memorydb-cluster-endpoint.html#cfn-memorydb-cluster-endpoint-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Endpoint) AWSCloudFormationType() string {
+	return "AWS::MemoryDB::Cluster.Endpoint"
+}
diff --git a/goformation/cloudformation/memorydb/aws-memorydb-parametergroup.go b/goformation/cloudformation/memorydb/aws-memorydb-parametergroup.go
new file mode 100644
index 0000000000..dc92b0940f
--- /dev/null
+++ b/goformation/cloudformation/memorydb/aws-memorydb-parametergroup.go
@@ -0,0 +1,129 @@
+package memorydb
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ParameterGroup AWS CloudFormation Resource (AWS::MemoryDB::ParameterGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-parametergroup.html
+type ParameterGroup struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-parametergroup.html#cfn-memorydb-parametergroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Family AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-parametergroup.html#cfn-memorydb-parametergroup-family
+	Family *types.Value `json:"Family,omitempty"`
+
+	// ParameterGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-parametergroup.html#cfn-memorydb-parametergroup-parametergroupname
+	ParameterGroupName *types.Value `json:"ParameterGroupName,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-parametergroup.html#cfn-memorydb-parametergroup-parameters
+	Parameters interface{} `json:"Parameters,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-parametergroup.html#cfn-memorydb-parametergroup-tags
+	Tags []cloudformation.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 *ParameterGroup) AWSCloudFormationType() string {
+	return "AWS::MemoryDB::ParameterGroup"
+}
+
+// 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 ParameterGroup) MarshalJSON() ([]byte, error) {
+	type Properties ParameterGroup
+	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 *ParameterGroup) UnmarshalJSON(b []byte) error {
+	type Properties ParameterGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ParameterGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/memorydb/aws-memorydb-subnetgroup.go b/goformation/cloudformation/memorydb/aws-memorydb-subnetgroup.go
new file mode 100644
index 0000000000..2c439372e9
--- /dev/null
+++ b/goformation/cloudformation/memorydb/aws-memorydb-subnetgroup.go
@@ -0,0 +1,124 @@
+package memorydb
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// SubnetGroup AWS CloudFormation Resource (AWS::MemoryDB::SubnetGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-subnetgroup.html
+type SubnetGroup struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-subnetgroup.html#cfn-memorydb-subnetgroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// SubnetGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-subnetgroup.html#cfn-memorydb-subnetgroup-subnetgroupname
+	SubnetGroupName *types.Value `json:"SubnetGroupName,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-subnetgroup.html#cfn-memorydb-subnetgroup-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-subnetgroup.html#cfn-memorydb-subnetgroup-tags
+	Tags []cloudformation.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 *SubnetGroup) AWSCloudFormationType() string {
+	return "AWS::MemoryDB::SubnetGroup"
+}
+
+// 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 SubnetGroup) MarshalJSON() ([]byte, error) {
+	type Properties SubnetGroup
+	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 *SubnetGroup) UnmarshalJSON(b []byte) error {
+	type Properties SubnetGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SubnetGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/memorydb/aws-memorydb-user.go b/goformation/cloudformation/memorydb/aws-memorydb-user.go
new file mode 100644
index 0000000000..ceb63e48e9
--- /dev/null
+++ b/goformation/cloudformation/memorydb/aws-memorydb-user.go
@@ -0,0 +1,124 @@
+package memorydb
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// User AWS CloudFormation Resource (AWS::MemoryDB::User)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-user.html
+type User struct {
+
+	// AccessString AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-user.html#cfn-memorydb-user-accessstring
+	AccessString *types.Value `json:"AccessString,omitempty"`
+
+	// AuthenticationMode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-user.html#cfn-memorydb-user-authenticationmode
+	AuthenticationMode interface{} `json:"AuthenticationMode,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-user.html#cfn-memorydb-user-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// UserName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-memorydb-user.html#cfn-memorydb-user-username
+	UserName *types.Value `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 *User) AWSCloudFormationType() string {
+	return "AWS::MemoryDB::User"
+}
+
+// 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 User) MarshalJSON() ([]byte, error) {
+	type Properties User
+	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 *User) UnmarshalJSON(b []byte) error {
+	type Properties User
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = User(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/msk/aws-msk-cluster.go b/goformation/cloudformation/msk/aws-msk-cluster.go
new file mode 100644
index 0000000000..83054039be
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster.go
@@ -0,0 +1,158 @@
+package msk
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster AWS CloudFormation Resource (AWS::MSK::Cluster)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-cluster.html
+type Cluster struct {
+
+	// BrokerNodeGroupInfo AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-cluster.html#cfn-msk-cluster-brokernodegroupinfo
+	BrokerNodeGroupInfo *Cluster_BrokerNodeGroupInfo `json:"BrokerNodeGroupInfo,omitempty"`
+
+	// ClientAuthentication AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-cluster.html#cfn-msk-cluster-clientauthentication
+	ClientAuthentication *Cluster_ClientAuthentication `json:"ClientAuthentication,omitempty"`
+
+	// ClusterName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-cluster.html#cfn-msk-cluster-clustername
+	ClusterName *types.Value `json:"ClusterName,omitempty"`
+
+	// ConfigurationInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-cluster.html#cfn-msk-cluster-configurationinfo
+	ConfigurationInfo *Cluster_ConfigurationInfo `json:"ConfigurationInfo,omitempty"`
+
+	// EncryptionInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-cluster.html#cfn-msk-cluster-encryptioninfo
+	EncryptionInfo *Cluster_EncryptionInfo `json:"EncryptionInfo,omitempty"`
+
+	// EnhancedMonitoring AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-cluster.html#cfn-msk-cluster-enhancedmonitoring
+	EnhancedMonitoring *types.Value `json:"EnhancedMonitoring,omitempty"`
+
+	// KafkaVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-cluster.html#cfn-msk-cluster-kafkaversion
+	KafkaVersion *types.Value `json:"KafkaVersion,omitempty"`
+
+	// LoggingInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-cluster.html#cfn-msk-cluster-logginginfo
+	LoggingInfo *Cluster_LoggingInfo `json:"LoggingInfo,omitempty"`
+
+	// NumberOfBrokerNodes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-cluster.html#cfn-msk-cluster-numberofbrokernodes
+	NumberOfBrokerNodes *types.Value `json:"NumberOfBrokerNodes"`
+
+	// OpenMonitoring AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-cluster.html#cfn-msk-cluster-openmonitoring
+	OpenMonitoring *Cluster_OpenMonitoring `json:"OpenMonitoring,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-msk-cluster.html#cfn-msk-cluster-tags
+	Tags interface{} `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::MSK::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/msk/aws-msk-cluster_brokerlogs.go b/goformation/cloudformation/msk/aws-msk-cluster_brokerlogs.go
new file mode 100644
index 0000000000..c516b62eef
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_brokerlogs.go
@@ -0,0 +1,45 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_BrokerLogs AWS CloudFormation Resource (AWS::MSK::Cluster.BrokerLogs)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-brokerlogs.html
+type Cluster_BrokerLogs struct {
+
+	// CloudWatchLogs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-brokerlogs.html#cfn-msk-cluster-brokerlogs-cloudwatchlogs
+	CloudWatchLogs *Cluster_CloudWatchLogs `json:"CloudWatchLogs,omitempty"`
+
+	// Firehose AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-brokerlogs.html#cfn-msk-cluster-brokerlogs-firehose
+	Firehose *Cluster_Firehose `json:"Firehose,omitempty"`
+
+	// S3 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-brokerlogs.html#cfn-msk-cluster-brokerlogs-s3
+	S3 *Cluster_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 *Cluster_BrokerLogs) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.BrokerLogs"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_brokernodegroupinfo.go b/goformation/cloudformation/msk/aws-msk-cluster_brokernodegroupinfo.go
new file mode 100644
index 0000000000..6fb34989ea
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_brokernodegroupinfo.go
@@ -0,0 +1,62 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_BrokerNodeGroupInfo AWS CloudFormation Resource (AWS::MSK::Cluster.BrokerNodeGroupInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-brokernodegroupinfo.html
+type Cluster_BrokerNodeGroupInfo struct {
+
+	// BrokerAZDistribution AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-brokernodegroupinfo.html#cfn-msk-cluster-brokernodegroupinfo-brokerazdistribution
+	BrokerAZDistribution *types.Value `json:"BrokerAZDistribution,omitempty"`
+
+	// ClientSubnets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-brokernodegroupinfo.html#cfn-msk-cluster-brokernodegroupinfo-clientsubnets
+	ClientSubnets *types.Value `json:"ClientSubnets,omitempty"`
+
+	// ConnectivityInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-brokernodegroupinfo.html#cfn-msk-cluster-brokernodegroupinfo-connectivityinfo
+	ConnectivityInfo *Cluster_ConnectivityInfo `json:"ConnectivityInfo,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-brokernodegroupinfo.html#cfn-msk-cluster-brokernodegroupinfo-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// SecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-brokernodegroupinfo.html#cfn-msk-cluster-brokernodegroupinfo-securitygroups
+	SecurityGroups *types.Value `json:"SecurityGroups,omitempty"`
+
+	// StorageInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-brokernodegroupinfo.html#cfn-msk-cluster-brokernodegroupinfo-storageinfo
+	StorageInfo *Cluster_StorageInfo `json:"StorageInfo,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_BrokerNodeGroupInfo) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.BrokerNodeGroupInfo"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_clientauthentication.go b/goformation/cloudformation/msk/aws-msk-cluster_clientauthentication.go
new file mode 100644
index 0000000000..412865140d
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_clientauthentication.go
@@ -0,0 +1,45 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_ClientAuthentication AWS CloudFormation Resource (AWS::MSK::Cluster.ClientAuthentication)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-clientauthentication.html
+type Cluster_ClientAuthentication struct {
+
+	// Sasl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-clientauthentication.html#cfn-msk-cluster-clientauthentication-sasl
+	Sasl *Cluster_Sasl `json:"Sasl,omitempty"`
+
+	// Tls AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-clientauthentication.html#cfn-msk-cluster-clientauthentication-tls
+	Tls *Cluster_Tls `json:"Tls,omitempty"`
+
+	// Unauthenticated AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-clientauthentication.html#cfn-msk-cluster-clientauthentication-unauthenticated
+	Unauthenticated *Cluster_Unauthenticated `json:"Unauthenticated,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ClientAuthentication) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.ClientAuthentication"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_cloudwatchlogs.go b/goformation/cloudformation/msk/aws-msk-cluster_cloudwatchlogs.go
new file mode 100644
index 0000000000..7d8ecc859d
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_cloudwatchlogs.go
@@ -0,0 +1,42 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_CloudWatchLogs AWS CloudFormation Resource (AWS::MSK::Cluster.CloudWatchLogs)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-cloudwatchlogs.html
+type Cluster_CloudWatchLogs struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-cloudwatchlogs.html#cfn-msk-cluster-cloudwatchlogs-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// LogGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-cloudwatchlogs.html#cfn-msk-cluster-cloudwatchlogs-loggroup
+	LogGroup *types.Value `json:"LogGroup,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CloudWatchLogs) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.CloudWatchLogs"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_configurationinfo.go b/goformation/cloudformation/msk/aws-msk-cluster_configurationinfo.go
new file mode 100644
index 0000000000..036ad881da
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_configurationinfo.go
@@ -0,0 +1,42 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_ConfigurationInfo AWS CloudFormation Resource (AWS::MSK::Cluster.ConfigurationInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-configurationinfo.html
+type Cluster_ConfigurationInfo struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-configurationinfo.html#cfn-msk-cluster-configurationinfo-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// Revision AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-configurationinfo.html#cfn-msk-cluster-configurationinfo-revision
+	Revision *types.Value `json:"Revision"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ConfigurationInfo) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.ConfigurationInfo"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_connectivityinfo.go b/goformation/cloudformation/msk/aws-msk-cluster_connectivityinfo.go
new file mode 100644
index 0000000000..45fcc7ac44
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_connectivityinfo.go
@@ -0,0 +1,35 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_ConnectivityInfo AWS CloudFormation Resource (AWS::MSK::Cluster.ConnectivityInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-connectivityinfo.html
+type Cluster_ConnectivityInfo struct {
+
+	// PublicAccess AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-connectivityinfo.html#cfn-msk-cluster-connectivityinfo-publicaccess
+	PublicAccess *Cluster_PublicAccess `json:"PublicAccess,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ConnectivityInfo) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.ConnectivityInfo"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_ebsstorageinfo.go b/goformation/cloudformation/msk/aws-msk-cluster_ebsstorageinfo.go
new file mode 100644
index 0000000000..465dc981c8
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_ebsstorageinfo.go
@@ -0,0 +1,37 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_EBSStorageInfo AWS CloudFormation Resource (AWS::MSK::Cluster.EBSStorageInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-ebsstorageinfo.html
+type Cluster_EBSStorageInfo struct {
+
+	// VolumeSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-ebsstorageinfo.html#cfn-msk-cluster-ebsstorageinfo-volumesize
+	VolumeSize *types.Value `json:"VolumeSize,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EBSStorageInfo) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.EBSStorageInfo"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_encryptionatrest.go b/goformation/cloudformation/msk/aws-msk-cluster_encryptionatrest.go
new file mode 100644
index 0000000000..4bd2faba14
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_encryptionatrest.go
@@ -0,0 +1,37 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_EncryptionAtRest AWS CloudFormation Resource (AWS::MSK::Cluster.EncryptionAtRest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-encryptionatrest.html
+type Cluster_EncryptionAtRest struct {
+
+	// DataVolumeKMSKeyId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-encryptionatrest.html#cfn-msk-cluster-encryptionatrest-datavolumekmskeyid
+	DataVolumeKMSKeyId *types.Value `json:"DataVolumeKMSKeyId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EncryptionAtRest) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.EncryptionAtRest"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_encryptioninfo.go b/goformation/cloudformation/msk/aws-msk-cluster_encryptioninfo.go
new file mode 100644
index 0000000000..668ce565ad
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_encryptioninfo.go
@@ -0,0 +1,40 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_EncryptionInfo AWS CloudFormation Resource (AWS::MSK::Cluster.EncryptionInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-encryptioninfo.html
+type Cluster_EncryptionInfo struct {
+
+	// EncryptionAtRest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-encryptioninfo.html#cfn-msk-cluster-encryptioninfo-encryptionatrest
+	EncryptionAtRest *Cluster_EncryptionAtRest `json:"EncryptionAtRest,omitempty"`
+
+	// EncryptionInTransit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-encryptioninfo.html#cfn-msk-cluster-encryptioninfo-encryptionintransit
+	EncryptionInTransit *Cluster_EncryptionInTransit `json:"EncryptionInTransit,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EncryptionInfo) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.EncryptionInfo"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_encryptionintransit.go b/goformation/cloudformation/msk/aws-msk-cluster_encryptionintransit.go
new file mode 100644
index 0000000000..a1d79fe167
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_encryptionintransit.go
@@ -0,0 +1,42 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_EncryptionInTransit AWS CloudFormation Resource (AWS::MSK::Cluster.EncryptionInTransit)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-encryptionintransit.html
+type Cluster_EncryptionInTransit struct {
+
+	// ClientBroker AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-encryptionintransit.html#cfn-msk-cluster-encryptionintransit-clientbroker
+	ClientBroker *types.Value `json:"ClientBroker,omitempty"`
+
+	// InCluster AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-encryptionintransit.html#cfn-msk-cluster-encryptionintransit-incluster
+	InCluster *types.Value `json:"InCluster,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EncryptionInTransit) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.EncryptionInTransit"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_firehose.go b/goformation/cloudformation/msk/aws-msk-cluster_firehose.go
new file mode 100644
index 0000000000..dfc2add7f2
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_firehose.go
@@ -0,0 +1,42 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_Firehose AWS CloudFormation Resource (AWS::MSK::Cluster.Firehose)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-firehose.html
+type Cluster_Firehose struct {
+
+	// DeliveryStream AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-firehose.html#cfn-msk-cluster-firehose-deliverystream
+	DeliveryStream *types.Value `json:"DeliveryStream,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-firehose.html#cfn-msk-cluster-firehose-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Firehose) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.Firehose"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_iam.go b/goformation/cloudformation/msk/aws-msk-cluster_iam.go
new file mode 100644
index 0000000000..748fd13e77
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_iam.go
@@ -0,0 +1,37 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_Iam AWS CloudFormation Resource (AWS::MSK::Cluster.Iam)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-iam.html
+type Cluster_Iam struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-iam.html#cfn-msk-cluster-iam-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Iam) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.Iam"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_jmxexporter.go b/goformation/cloudformation/msk/aws-msk-cluster_jmxexporter.go
new file mode 100644
index 0000000000..c02d15d509
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_jmxexporter.go
@@ -0,0 +1,37 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_JmxExporter AWS CloudFormation Resource (AWS::MSK::Cluster.JmxExporter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-jmxexporter.html
+type Cluster_JmxExporter struct {
+
+	// EnabledInBroker AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-jmxexporter.html#cfn-msk-cluster-jmxexporter-enabledinbroker
+	EnabledInBroker *types.Value `json:"EnabledInBroker"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_JmxExporter) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.JmxExporter"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_logginginfo.go b/goformation/cloudformation/msk/aws-msk-cluster_logginginfo.go
new file mode 100644
index 0000000000..f183eb6837
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_logginginfo.go
@@ -0,0 +1,35 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_LoggingInfo AWS CloudFormation Resource (AWS::MSK::Cluster.LoggingInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-logginginfo.html
+type Cluster_LoggingInfo struct {
+
+	// BrokerLogs AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-logginginfo.html#cfn-msk-cluster-logginginfo-brokerlogs
+	BrokerLogs *Cluster_BrokerLogs `json:"BrokerLogs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LoggingInfo) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.LoggingInfo"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_nodeexporter.go b/goformation/cloudformation/msk/aws-msk-cluster_nodeexporter.go
new file mode 100644
index 0000000000..f386419efb
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_nodeexporter.go
@@ -0,0 +1,37 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_NodeExporter AWS CloudFormation Resource (AWS::MSK::Cluster.NodeExporter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-nodeexporter.html
+type Cluster_NodeExporter struct {
+
+	// EnabledInBroker AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-nodeexporter.html#cfn-msk-cluster-nodeexporter-enabledinbroker
+	EnabledInBroker *types.Value `json:"EnabledInBroker"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_NodeExporter) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.NodeExporter"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_openmonitoring.go b/goformation/cloudformation/msk/aws-msk-cluster_openmonitoring.go
new file mode 100644
index 0000000000..613c586957
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_openmonitoring.go
@@ -0,0 +1,35 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_OpenMonitoring AWS CloudFormation Resource (AWS::MSK::Cluster.OpenMonitoring)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-openmonitoring.html
+type Cluster_OpenMonitoring struct {
+
+	// Prometheus AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-openmonitoring.html#cfn-msk-cluster-openmonitoring-prometheus
+	Prometheus *Cluster_Prometheus `json:"Prometheus,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_OpenMonitoring) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.OpenMonitoring"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_prometheus.go b/goformation/cloudformation/msk/aws-msk-cluster_prometheus.go
new file mode 100644
index 0000000000..f7ef20ccd8
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_prometheus.go
@@ -0,0 +1,40 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_Prometheus AWS CloudFormation Resource (AWS::MSK::Cluster.Prometheus)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-prometheus.html
+type Cluster_Prometheus struct {
+
+	// JmxExporter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-prometheus.html#cfn-msk-cluster-prometheus-jmxexporter
+	JmxExporter *Cluster_JmxExporter `json:"JmxExporter,omitempty"`
+
+	// NodeExporter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-prometheus.html#cfn-msk-cluster-prometheus-nodeexporter
+	NodeExporter *Cluster_NodeExporter `json:"NodeExporter,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Prometheus) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.Prometheus"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_publicaccess.go b/goformation/cloudformation/msk/aws-msk-cluster_publicaccess.go
new file mode 100644
index 0000000000..3ff5f7d16e
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_publicaccess.go
@@ -0,0 +1,37 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_PublicAccess AWS CloudFormation Resource (AWS::MSK::Cluster.PublicAccess)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-publicaccess.html
+type Cluster_PublicAccess struct {
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-publicaccess.html#cfn-msk-cluster-publicaccess-type
+	Type *types.Value `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 *Cluster_PublicAccess) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.PublicAccess"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_s3.go b/goformation/cloudformation/msk/aws-msk-cluster_s3.go
new file mode 100644
index 0000000000..72afa24bff
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_s3.go
@@ -0,0 +1,47 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_S3 AWS CloudFormation Resource (AWS::MSK::Cluster.S3)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-s3.html
+type Cluster_S3 struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-s3.html#cfn-msk-cluster-s3-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-s3.html#cfn-msk-cluster-s3-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-s3.html#cfn-msk-cluster-s3-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_S3) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.S3"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_sasl.go b/goformation/cloudformation/msk/aws-msk-cluster_sasl.go
new file mode 100644
index 0000000000..e520d75221
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_sasl.go
@@ -0,0 +1,40 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_Sasl AWS CloudFormation Resource (AWS::MSK::Cluster.Sasl)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-sasl.html
+type Cluster_Sasl struct {
+
+	// Iam AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-sasl.html#cfn-msk-cluster-sasl-iam
+	Iam *Cluster_Iam `json:"Iam,omitempty"`
+
+	// Scram AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-sasl.html#cfn-msk-cluster-sasl-scram
+	Scram *Cluster_Scram `json:"Scram,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Sasl) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.Sasl"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_scram.go b/goformation/cloudformation/msk/aws-msk-cluster_scram.go
new file mode 100644
index 0000000000..65f67dae9b
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_scram.go
@@ -0,0 +1,37 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_Scram AWS CloudFormation Resource (AWS::MSK::Cluster.Scram)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-scram.html
+type Cluster_Scram struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-scram.html#cfn-msk-cluster-scram-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Scram) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.Scram"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_storageinfo.go b/goformation/cloudformation/msk/aws-msk-cluster_storageinfo.go
new file mode 100644
index 0000000000..5888f23def
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_storageinfo.go
@@ -0,0 +1,35 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_StorageInfo AWS CloudFormation Resource (AWS::MSK::Cluster.StorageInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-storageinfo.html
+type Cluster_StorageInfo struct {
+
+	// EBSStorageInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-storageinfo.html#cfn-msk-cluster-storageinfo-ebsstorageinfo
+	EBSStorageInfo *Cluster_EBSStorageInfo `json:"EBSStorageInfo,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_StorageInfo) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.StorageInfo"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_tls.go b/goformation/cloudformation/msk/aws-msk-cluster_tls.go
new file mode 100644
index 0000000000..359757eaf7
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_tls.go
@@ -0,0 +1,42 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_Tls AWS CloudFormation Resource (AWS::MSK::Cluster.Tls)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-tls.html
+type Cluster_Tls struct {
+
+	// CertificateAuthorityArnList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-tls.html#cfn-msk-cluster-tls-certificateauthorityarnlist
+	CertificateAuthorityArnList *types.Value `json:"CertificateAuthorityArnList,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-tls.html#cfn-msk-cluster-tls-enabled
+	Enabled *types.Value `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_Tls) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.Tls"
+}
diff --git a/goformation/cloudformation/msk/aws-msk-cluster_unauthenticated.go b/goformation/cloudformation/msk/aws-msk-cluster_unauthenticated.go
new file mode 100644
index 0000000000..40f270cfb6
--- /dev/null
+++ b/goformation/cloudformation/msk/aws-msk-cluster_unauthenticated.go
@@ -0,0 +1,37 @@
+package msk
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_Unauthenticated AWS CloudFormation Resource (AWS::MSK::Cluster.Unauthenticated)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-unauthenticated.html
+type Cluster_Unauthenticated struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-msk-cluster-unauthenticated.html#cfn-msk-cluster-unauthenticated-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Unauthenticated) AWSCloudFormationType() string {
+	return "AWS::MSK::Cluster.Unauthenticated"
+}
diff --git a/goformation/cloudformation/mwaa/aws-mwaa-environment.go b/goformation/cloudformation/mwaa/aws-mwaa-environment.go
new file mode 100644
index 0000000000..af11368308
--- /dev/null
+++ b/goformation/cloudformation/mwaa/aws-mwaa-environment.go
@@ -0,0 +1,203 @@
+package mwaa
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Environment AWS CloudFormation Resource (AWS::MWAA::Environment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html
+type Environment struct {
+
+	// AirflowConfigurationOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-airflowconfigurationoptions
+	AirflowConfigurationOptions interface{} `json:"AirflowConfigurationOptions,omitempty"`
+
+	// AirflowVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-airflowversion
+	AirflowVersion *types.Value `json:"AirflowVersion,omitempty"`
+
+	// DagS3Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-dags3path
+	DagS3Path *types.Value `json:"DagS3Path,omitempty"`
+
+	// EnvironmentClass AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-environmentclass
+	EnvironmentClass *types.Value `json:"EnvironmentClass,omitempty"`
+
+	// ExecutionRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-executionrolearn
+	ExecutionRoleArn *types.Value `json:"ExecutionRoleArn,omitempty"`
+
+	// KmsKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-kmskey
+	KmsKey *types.Value `json:"KmsKey,omitempty"`
+
+	// LoggingConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-loggingconfiguration
+	LoggingConfiguration *Environment_LoggingConfiguration `json:"LoggingConfiguration,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 *types.Value `json:"MaxWorkers,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
+	MinWorkers *types.Value `json:"MinWorkers,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// NetworkConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-networkconfiguration
+	NetworkConfiguration *Environment_NetworkConfiguration `json:"NetworkConfiguration,omitempty"`
+
+	// PluginsS3ObjectVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-pluginss3objectversion
+	PluginsS3ObjectVersion *types.Value `json:"PluginsS3ObjectVersion,omitempty"`
+
+	// PluginsS3Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-pluginss3path
+	PluginsS3Path *types.Value `json:"PluginsS3Path,omitempty"`
+
+	// RequirementsS3ObjectVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-requirementss3objectversion
+	RequirementsS3ObjectVersion *types.Value `json:"RequirementsS3ObjectVersion,omitempty"`
+
+	// RequirementsS3Path AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-requirementss3path
+	RequirementsS3Path *types.Value `json:"RequirementsS3Path,omitempty"`
+
+	// Schedulers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-schedulers
+	Schedulers *types.Value `json:"Schedulers,omitempty"`
+
+	// SourceBucketArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-sourcebucketarn
+	SourceBucketArn *types.Value `json:"SourceBucketArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-tags
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// WebserverAccessMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-webserveraccessmode
+	WebserverAccessMode *types.Value `json:"WebserverAccessMode,omitempty"`
+
+	// WeeklyMaintenanceWindowStart AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-mwaa-environment.html#cfn-mwaa-environment-weeklymaintenancewindowstart
+	WeeklyMaintenanceWindowStart *types.Value `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 *Environment) AWSCloudFormationType() string {
+	return "AWS::MWAA::Environment"
+}
+
+// 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 Environment) MarshalJSON() ([]byte, error) {
+	type Properties Environment
+	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 *Environment) UnmarshalJSON(b []byte) error {
+	type Properties Environment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Environment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/mwaa/aws-mwaa-environment_loggingconfiguration.go b/goformation/cloudformation/mwaa/aws-mwaa-environment_loggingconfiguration.go
new file mode 100644
index 0000000000..160a7d83dc
--- /dev/null
+++ b/goformation/cloudformation/mwaa/aws-mwaa-environment_loggingconfiguration.go
@@ -0,0 +1,55 @@
+package mwaa
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Environment_LoggingConfiguration AWS CloudFormation Resource (AWS::MWAA::Environment.LoggingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mwaa-environment-loggingconfiguration.html
+type Environment_LoggingConfiguration struct {
+
+	// DagProcessingLogs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mwaa-environment-loggingconfiguration.html#cfn-mwaa-environment-loggingconfiguration-dagprocessinglogs
+	DagProcessingLogs *Environment_ModuleLoggingConfiguration `json:"DagProcessingLogs,omitempty"`
+
+	// SchedulerLogs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mwaa-environment-loggingconfiguration.html#cfn-mwaa-environment-loggingconfiguration-schedulerlogs
+	SchedulerLogs *Environment_ModuleLoggingConfiguration `json:"SchedulerLogs,omitempty"`
+
+	// TaskLogs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mwaa-environment-loggingconfiguration.html#cfn-mwaa-environment-loggingconfiguration-tasklogs
+	TaskLogs *Environment_ModuleLoggingConfiguration `json:"TaskLogs,omitempty"`
+
+	// WebserverLogs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mwaa-environment-loggingconfiguration.html#cfn-mwaa-environment-loggingconfiguration-webserverlogs
+	WebserverLogs *Environment_ModuleLoggingConfiguration `json:"WebserverLogs,omitempty"`
+
+	// WorkerLogs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mwaa-environment-loggingconfiguration.html#cfn-mwaa-environment-loggingconfiguration-workerlogs
+	WorkerLogs *Environment_ModuleLoggingConfiguration `json:"WorkerLogs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Environment_LoggingConfiguration) AWSCloudFormationType() string {
+	return "AWS::MWAA::Environment.LoggingConfiguration"
+}
diff --git a/goformation/cloudformation/mwaa/aws-mwaa-environment_moduleloggingconfiguration.go b/goformation/cloudformation/mwaa/aws-mwaa-environment_moduleloggingconfiguration.go
new file mode 100644
index 0000000000..11213a16b6
--- /dev/null
+++ b/goformation/cloudformation/mwaa/aws-mwaa-environment_moduleloggingconfiguration.go
@@ -0,0 +1,47 @@
+package mwaa
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Environment_ModuleLoggingConfiguration AWS CloudFormation Resource (AWS::MWAA::Environment.ModuleLoggingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mwaa-environment-moduleloggingconfiguration.html
+type Environment_ModuleLoggingConfiguration struct {
+
+	// CloudWatchLogGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mwaa-environment-moduleloggingconfiguration.html#cfn-mwaa-environment-moduleloggingconfiguration-cloudwatchloggrouparn
+	CloudWatchLogGroupArn *types.Value `json:"CloudWatchLogGroupArn,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mwaa-environment-moduleloggingconfiguration.html#cfn-mwaa-environment-moduleloggingconfiguration-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// LogLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mwaa-environment-moduleloggingconfiguration.html#cfn-mwaa-environment-moduleloggingconfiguration-loglevel
+	LogLevel *types.Value `json:"LogLevel,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Environment_ModuleLoggingConfiguration) AWSCloudFormationType() string {
+	return "AWS::MWAA::Environment.ModuleLoggingConfiguration"
+}
diff --git a/goformation/cloudformation/mwaa/aws-mwaa-environment_networkconfiguration.go b/goformation/cloudformation/mwaa/aws-mwaa-environment_networkconfiguration.go
new file mode 100644
index 0000000000..50a48e97e8
--- /dev/null
+++ b/goformation/cloudformation/mwaa/aws-mwaa-environment_networkconfiguration.go
@@ -0,0 +1,42 @@
+package mwaa
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Environment_NetworkConfiguration AWS CloudFormation Resource (AWS::MWAA::Environment.NetworkConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mwaa-environment-networkconfiguration.html
+type Environment_NetworkConfiguration struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mwaa-environment-networkconfiguration.html#cfn-mwaa-environment-networkconfiguration-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-mwaa-environment-networkconfiguration.html#cfn-mwaa-environment-networkconfiguration-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Environment_NetworkConfiguration) AWSCloudFormationType() string {
+	return "AWS::MWAA::Environment.NetworkConfiguration"
+}
diff --git a/goformation/cloudformation/neptune/aws-neptune-dbcluster.go b/goformation/cloudformation/neptune/aws-neptune-dbcluster.go
new file mode 100644
index 0000000000..a2bfa55fef
--- /dev/null
+++ b/goformation/cloudformation/neptune/aws-neptune-dbcluster.go
@@ -0,0 +1,214 @@
+package neptune
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBCluster AWS CloudFormation Resource (AWS::Neptune::DBCluster)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html
+type DBCluster struct {
+
+	// AssociatedRoles AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-associatedroles
+	AssociatedRoles []DBCluster_DBClusterRole `json:"AssociatedRoles,omitempty"`
+
+	// AvailabilityZones AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-availabilityzones
+	AvailabilityZones *types.Value `json:"AvailabilityZones,omitempty"`
+
+	// BackupRetentionPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-backupretentionperiod
+	BackupRetentionPeriod *types.Value `json:"BackupRetentionPeriod,omitempty"`
+
+	// DBClusterIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-dbclusteridentifier
+	DBClusterIdentifier *types.Value `json:"DBClusterIdentifier,omitempty"`
+
+	// DBClusterParameterGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-dbclusterparametergroupname
+	DBClusterParameterGroupName *types.Value `json:"DBClusterParameterGroupName,omitempty"`
+
+	// DBSubnetGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-dbsubnetgroupname
+	DBSubnetGroupName *types.Value `json:"DBSubnetGroupName,omitempty"`
+
+	// DeletionProtection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-deletionprotection
+	DeletionProtection *types.Value `json:"DeletionProtection,omitempty"`
+
+	// EnableCloudwatchLogsExports AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-enablecloudwatchlogsexports
+	EnableCloudwatchLogsExports *types.Value `json:"EnableCloudwatchLogsExports,omitempty"`
+
+	// EngineVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-engineversion
+	EngineVersion *types.Value `json:"EngineVersion,omitempty"`
+
+	// IamAuthEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-iamauthenabled
+	IamAuthEnabled *types.Value `json:"IamAuthEnabled,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// PreferredBackupWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-preferredbackupwindow
+	PreferredBackupWindow *types.Value `json:"PreferredBackupWindow,omitempty"`
+
+	// PreferredMaintenanceWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-preferredmaintenancewindow
+	PreferredMaintenanceWindow *types.Value `json:"PreferredMaintenanceWindow,omitempty"`
+
+	// RestoreToTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-restoretotime
+	RestoreToTime *types.Value `json:"RestoreToTime,omitempty"`
+
+	// RestoreType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-restoretype
+	RestoreType *types.Value `json:"RestoreType,omitempty"`
+
+	// SnapshotIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-snapshotidentifier
+	SnapshotIdentifier *types.Value `json:"SnapshotIdentifier,omitempty"`
+
+	// SourceDBClusterIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-sourcedbclusteridentifier
+	SourceDBClusterIdentifier *types.Value `json:"SourceDBClusterIdentifier,omitempty"`
+
+	// StorageEncrypted AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-storageencrypted
+	StorageEncrypted *types.Value `json:"StorageEncrypted,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// UseLatestRestorableTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-uselatestrestorabletime
+	UseLatestRestorableTime *types.Value `json:"UseLatestRestorableTime,omitempty"`
+
+	// VpcSecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbcluster.html#cfn-neptune-dbcluster-vpcsecuritygroupids
+	VpcSecurityGroupIds *types.Value `json:"VpcSecurityGroupIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DBCluster) AWSCloudFormationType() string {
+	return "AWS::Neptune::DBCluster"
+}
+
+// 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 DBCluster) MarshalJSON() ([]byte, error) {
+	type Properties DBCluster
+	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 *DBCluster) UnmarshalJSON(b []byte) error {
+	type Properties DBCluster
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DBCluster(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/neptune/aws-neptune-dbcluster_dbclusterrole.go b/goformation/cloudformation/neptune/aws-neptune-dbcluster_dbclusterrole.go
new file mode 100644
index 0000000000..82de667abd
--- /dev/null
+++ b/goformation/cloudformation/neptune/aws-neptune-dbcluster_dbclusterrole.go
@@ -0,0 +1,42 @@
+package neptune
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBCluster_DBClusterRole AWS CloudFormation Resource (AWS::Neptune::DBCluster.DBClusterRole)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-neptune-dbcluster-dbclusterrole.html
+type DBCluster_DBClusterRole struct {
+
+	// FeatureName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-neptune-dbcluster-dbclusterrole.html#cfn-neptune-dbcluster-dbclusterrole-featurename
+	FeatureName *types.Value `json:"FeatureName,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-neptune-dbcluster-dbclusterrole.html#cfn-neptune-dbcluster-dbclusterrole-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DBCluster_DBClusterRole) AWSCloudFormationType() string {
+	return "AWS::Neptune::DBCluster.DBClusterRole"
+}
diff --git a/goformation/cloudformation/neptune/aws-neptune-dbclusterparametergroup.go b/goformation/cloudformation/neptune/aws-neptune-dbclusterparametergroup.go
new file mode 100644
index 0000000000..b077129802
--- /dev/null
+++ b/goformation/cloudformation/neptune/aws-neptune-dbclusterparametergroup.go
@@ -0,0 +1,129 @@
+package neptune
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBClusterParameterGroup AWS CloudFormation Resource (AWS::Neptune::DBClusterParameterGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbclusterparametergroup.html
+type DBClusterParameterGroup struct {
+
+	// Description AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbclusterparametergroup.html#cfn-neptune-dbclusterparametergroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Family AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbclusterparametergroup.html#cfn-neptune-dbclusterparametergroup-family
+	Family *types.Value `json:"Family,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbclusterparametergroup.html#cfn-neptune-dbclusterparametergroup-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbclusterparametergroup.html#cfn-neptune-dbclusterparametergroup-parameters
+	Parameters interface{} `json:"Parameters,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbclusterparametergroup.html#cfn-neptune-dbclusterparametergroup-tags
+	Tags []cloudformation.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 *DBClusterParameterGroup) AWSCloudFormationType() string {
+	return "AWS::Neptune::DBClusterParameterGroup"
+}
+
+// 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 DBClusterParameterGroup) MarshalJSON() ([]byte, error) {
+	type Properties DBClusterParameterGroup
+	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 *DBClusterParameterGroup) UnmarshalJSON(b []byte) error {
+	type Properties DBClusterParameterGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DBClusterParameterGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/neptune/aws-neptune-dbinstance.go b/goformation/cloudformation/neptune/aws-neptune-dbinstance.go
new file mode 100644
index 0000000000..d6af0e932d
--- /dev/null
+++ b/goformation/cloudformation/neptune/aws-neptune-dbinstance.go
@@ -0,0 +1,159 @@
+package neptune
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBInstance AWS CloudFormation Resource (AWS::Neptune::DBInstance)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbinstance.html
+type DBInstance struct {
+
+	// AllowMajorVersionUpgrade AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbinstance.html#cfn-neptune-dbinstance-allowmajorversionupgrade
+	AllowMajorVersionUpgrade *types.Value `json:"AllowMajorVersionUpgrade,omitempty"`
+
+	// AutoMinorVersionUpgrade AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbinstance.html#cfn-neptune-dbinstance-autominorversionupgrade
+	AutoMinorVersionUpgrade *types.Value `json:"AutoMinorVersionUpgrade,omitempty"`
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbinstance.html#cfn-neptune-dbinstance-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// DBClusterIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbinstance.html#cfn-neptune-dbinstance-dbclusteridentifier
+	DBClusterIdentifier *types.Value `json:"DBClusterIdentifier,omitempty"`
+
+	// DBInstanceClass AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbinstance.html#cfn-neptune-dbinstance-dbinstanceclass
+	DBInstanceClass *types.Value `json:"DBInstanceClass,omitempty"`
+
+	// DBInstanceIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbinstance.html#cfn-neptune-dbinstance-dbinstanceidentifier
+	DBInstanceIdentifier *types.Value `json:"DBInstanceIdentifier,omitempty"`
+
+	// DBParameterGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbinstance.html#cfn-neptune-dbinstance-dbparametergroupname
+	DBParameterGroupName *types.Value `json:"DBParameterGroupName,omitempty"`
+
+	// DBSnapshotIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbinstance.html#cfn-neptune-dbinstance-dbsnapshotidentifier
+	DBSnapshotIdentifier *types.Value `json:"DBSnapshotIdentifier,omitempty"`
+
+	// DBSubnetGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbinstance.html#cfn-neptune-dbinstance-dbsubnetgroupname
+	DBSubnetGroupName *types.Value `json:"DBSubnetGroupName,omitempty"`
+
+	// PreferredMaintenanceWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbinstance.html#cfn-neptune-dbinstance-preferredmaintenancewindow
+	PreferredMaintenanceWindow *types.Value `json:"PreferredMaintenanceWindow,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbinstance.html#cfn-neptune-dbinstance-tags
+	Tags []cloudformation.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 *DBInstance) AWSCloudFormationType() string {
+	return "AWS::Neptune::DBInstance"
+}
+
+// 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 DBInstance) MarshalJSON() ([]byte, error) {
+	type Properties DBInstance
+	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 *DBInstance) UnmarshalJSON(b []byte) error {
+	type Properties DBInstance
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DBInstance(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/neptune/aws-neptune-dbparametergroup.go b/goformation/cloudformation/neptune/aws-neptune-dbparametergroup.go
new file mode 100644
index 0000000000..05bb8d8e06
--- /dev/null
+++ b/goformation/cloudformation/neptune/aws-neptune-dbparametergroup.go
@@ -0,0 +1,129 @@
+package neptune
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBParameterGroup AWS CloudFormation Resource (AWS::Neptune::DBParameterGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbparametergroup.html
+type DBParameterGroup struct {
+
+	// Description AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbparametergroup.html#cfn-neptune-dbparametergroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Family AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbparametergroup.html#cfn-neptune-dbparametergroup-family
+	Family *types.Value `json:"Family,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbparametergroup.html#cfn-neptune-dbparametergroup-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbparametergroup.html#cfn-neptune-dbparametergroup-parameters
+	Parameters interface{} `json:"Parameters,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbparametergroup.html#cfn-neptune-dbparametergroup-tags
+	Tags []cloudformation.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 *DBParameterGroup) AWSCloudFormationType() string {
+	return "AWS::Neptune::DBParameterGroup"
+}
+
+// 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 DBParameterGroup) MarshalJSON() ([]byte, error) {
+	type Properties DBParameterGroup
+	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 *DBParameterGroup) UnmarshalJSON(b []byte) error {
+	type Properties DBParameterGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DBParameterGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/neptune/aws-neptune-dbsubnetgroup.go b/goformation/cloudformation/neptune/aws-neptune-dbsubnetgroup.go
new file mode 100644
index 0000000000..368ff3c206
--- /dev/null
+++ b/goformation/cloudformation/neptune/aws-neptune-dbsubnetgroup.go
@@ -0,0 +1,124 @@
+package neptune
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBSubnetGroup AWS CloudFormation Resource (AWS::Neptune::DBSubnetGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbsubnetgroup.html
+type DBSubnetGroup struct {
+
+	// DBSubnetGroupDescription AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbsubnetgroup.html#cfn-neptune-dbsubnetgroup-dbsubnetgroupdescription
+	DBSubnetGroupDescription *types.Value `json:"DBSubnetGroupDescription,omitempty"`
+
+	// DBSubnetGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbsubnetgroup.html#cfn-neptune-dbsubnetgroup-dbsubnetgroupname
+	DBSubnetGroupName *types.Value `json:"DBSubnetGroupName,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbsubnetgroup.html#cfn-neptune-dbsubnetgroup-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-neptune-dbsubnetgroup.html#cfn-neptune-dbsubnetgroup-tags
+	Tags []cloudformation.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 *DBSubnetGroup) AWSCloudFormationType() string {
+	return "AWS::Neptune::DBSubnetGroup"
+}
+
+// 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 DBSubnetGroup) MarshalJSON() ([]byte, error) {
+	type Properties DBSubnetGroup
+	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 *DBSubnetGroup) UnmarshalJSON(b []byte) error {
+	type Properties DBSubnetGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DBSubnetGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewall.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewall.go
new file mode 100644
index 0000000000..343b81cd1b
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewall.go
@@ -0,0 +1,149 @@
+package networkfirewall
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Firewall AWS CloudFormation Resource (AWS::NetworkFirewall::Firewall)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewall.html
+type Firewall struct {
+
+	// DeleteProtection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewall.html#cfn-networkfirewall-firewall-deleteprotection
+	DeleteProtection *types.Value `json:"DeleteProtection,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewall.html#cfn-networkfirewall-firewall-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// FirewallName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewall.html#cfn-networkfirewall-firewall-firewallname
+	FirewallName *types.Value `json:"FirewallName,omitempty"`
+
+	// FirewallPolicyArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewall.html#cfn-networkfirewall-firewall-firewallpolicyarn
+	FirewallPolicyArn *types.Value `json:"FirewallPolicyArn,omitempty"`
+
+	// FirewallPolicyChangeProtection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewall.html#cfn-networkfirewall-firewall-firewallpolicychangeprotection
+	FirewallPolicyChangeProtection *types.Value `json:"FirewallPolicyChangeProtection,omitempty"`
+
+	// SubnetChangeProtection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewall.html#cfn-networkfirewall-firewall-subnetchangeprotection
+	SubnetChangeProtection *types.Value `json:"SubnetChangeProtection,omitempty"`
+
+	// SubnetMappings AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewall.html#cfn-networkfirewall-firewall-subnetmappings
+	SubnetMappings []Firewall_SubnetMapping `json:"SubnetMappings,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewall.html#cfn-networkfirewall-firewall-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewall.html#cfn-networkfirewall-firewall-vpcid
+	VpcId *types.Value `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 *Firewall) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::Firewall"
+}
+
+// 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 Firewall) MarshalJSON() ([]byte, error) {
+	type Properties Firewall
+	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 *Firewall) UnmarshalJSON(b []byte) error {
+	type Properties Firewall
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Firewall(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewall_subnetmapping.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewall_subnetmapping.go
new file mode 100644
index 0000000000..3379151dd9
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewall_subnetmapping.go
@@ -0,0 +1,37 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Firewall_SubnetMapping AWS CloudFormation Resource (AWS::NetworkFirewall::Firewall.SubnetMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewall-subnetmapping.html
+type Firewall_SubnetMapping struct {
+
+	// SubnetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewall-subnetmapping.html#cfn-networkfirewall-firewall-subnetmapping-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Firewall_SubnetMapping) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::Firewall.SubnetMapping"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy.go
new file mode 100644
index 0000000000..31041f1db2
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy.go
@@ -0,0 +1,124 @@
+package networkfirewall
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// FirewallPolicy AWS CloudFormation Resource (AWS::NetworkFirewall::FirewallPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewallpolicy.html
+type FirewallPolicy struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewallpolicy.html#cfn-networkfirewall-firewallpolicy-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// FirewallPolicy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewallpolicy.html#cfn-networkfirewall-firewallpolicy-firewallpolicy
+	FirewallPolicy *FirewallPolicy_FirewallPolicy `json:"FirewallPolicy,omitempty"`
+
+	// FirewallPolicyName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewallpolicy.html#cfn-networkfirewall-firewallpolicy-firewallpolicyname
+	FirewallPolicyName *types.Value `json:"FirewallPolicyName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-firewallpolicy.html#cfn-networkfirewall-firewallpolicy-tags
+	Tags []cloudformation.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 *FirewallPolicy) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::FirewallPolicy"
+}
+
+// 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 FirewallPolicy) MarshalJSON() ([]byte, error) {
+	type Properties FirewallPolicy
+	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 *FirewallPolicy) UnmarshalJSON(b []byte) error {
+	type Properties FirewallPolicy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FirewallPolicy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_actiondefinition.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_actiondefinition.go
new file mode 100644
index 0000000000..95075a0ab4
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_actiondefinition.go
@@ -0,0 +1,35 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// FirewallPolicy_ActionDefinition AWS CloudFormation Resource (AWS::NetworkFirewall::FirewallPolicy.ActionDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-actiondefinition.html
+type FirewallPolicy_ActionDefinition struct {
+
+	// PublishMetricAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-actiondefinition.html#cfn-networkfirewall-firewallpolicy-actiondefinition-publishmetricaction
+	PublishMetricAction *FirewallPolicy_PublishMetricAction `json:"PublishMetricAction,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ActionDefinition) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::FirewallPolicy.ActionDefinition"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_customaction.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_customaction.go
new file mode 100644
index 0000000000..342e8a532b
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_customaction.go
@@ -0,0 +1,42 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FirewallPolicy_CustomAction AWS CloudFormation Resource (AWS::NetworkFirewall::FirewallPolicy.CustomAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-customaction.html
+type FirewallPolicy_CustomAction struct {
+
+	// ActionDefinition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-customaction.html#cfn-networkfirewall-firewallpolicy-customaction-actiondefinition
+	ActionDefinition *FirewallPolicy_ActionDefinition `json:"ActionDefinition,omitempty"`
+
+	// ActionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-customaction.html#cfn-networkfirewall-firewallpolicy-customaction-actionname
+	ActionName *types.Value `json:"ActionName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CustomAction) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::FirewallPolicy.CustomAction"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_dimension.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_dimension.go
new file mode 100644
index 0000000000..f0c21b8b2d
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_dimension.go
@@ -0,0 +1,37 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FirewallPolicy_Dimension AWS CloudFormation Resource (AWS::NetworkFirewall::FirewallPolicy.Dimension)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-dimension.html
+type FirewallPolicy_Dimension struct {
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-dimension.html#cfn-networkfirewall-firewallpolicy-dimension-value
+	Value *types.Value `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 *FirewallPolicy_Dimension) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::FirewallPolicy.Dimension"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_firewallpolicy.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_firewallpolicy.go
new file mode 100644
index 0000000000..47eafa95d7
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_firewallpolicy.go
@@ -0,0 +1,67 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FirewallPolicy_FirewallPolicy AWS CloudFormation Resource (AWS::NetworkFirewall::FirewallPolicy.FirewallPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-firewallpolicy.html
+type FirewallPolicy_FirewallPolicy struct {
+
+	// StatefulDefaultActions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-firewallpolicy.html#cfn-networkfirewall-firewallpolicy-firewallpolicy-statefuldefaultactions
+	StatefulDefaultActions *types.Value `json:"StatefulDefaultActions,omitempty"`
+
+	// StatefulEngineOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-firewallpolicy.html#cfn-networkfirewall-firewallpolicy-firewallpolicy-statefulengineoptions
+	StatefulEngineOptions *FirewallPolicy_StatefulEngineOptions `json:"StatefulEngineOptions,omitempty"`
+
+	// StatefulRuleGroupReferences AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-firewallpolicy.html#cfn-networkfirewall-firewallpolicy-firewallpolicy-statefulrulegroupreferences
+	StatefulRuleGroupReferences []FirewallPolicy_StatefulRuleGroupReference `json:"StatefulRuleGroupReferences,omitempty"`
+
+	// StatelessCustomActions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-firewallpolicy.html#cfn-networkfirewall-firewallpolicy-firewallpolicy-statelesscustomactions
+	StatelessCustomActions []FirewallPolicy_CustomAction `json:"StatelessCustomActions,omitempty"`
+
+	// StatelessDefaultActions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-firewallpolicy.html#cfn-networkfirewall-firewallpolicy-firewallpolicy-statelessdefaultactions
+	StatelessDefaultActions *types.Value `json:"StatelessDefaultActions,omitempty"`
+
+	// StatelessFragmentDefaultActions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-firewallpolicy.html#cfn-networkfirewall-firewallpolicy-firewallpolicy-statelessfragmentdefaultactions
+	StatelessFragmentDefaultActions *types.Value `json:"StatelessFragmentDefaultActions,omitempty"`
+
+	// StatelessRuleGroupReferences AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-firewallpolicy.html#cfn-networkfirewall-firewallpolicy-firewallpolicy-statelessrulegroupreferences
+	StatelessRuleGroupReferences []FirewallPolicy_StatelessRuleGroupReference `json:"StatelessRuleGroupReferences,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_FirewallPolicy) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::FirewallPolicy.FirewallPolicy"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_publishmetricaction.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_publishmetricaction.go
new file mode 100644
index 0000000000..ed97479e2a
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_publishmetricaction.go
@@ -0,0 +1,35 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// FirewallPolicy_PublishMetricAction AWS CloudFormation Resource (AWS::NetworkFirewall::FirewallPolicy.PublishMetricAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-publishmetricaction.html
+type FirewallPolicy_PublishMetricAction struct {
+
+	// Dimensions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-publishmetricaction.html#cfn-networkfirewall-firewallpolicy-publishmetricaction-dimensions
+	Dimensions []FirewallPolicy_Dimension `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 *FirewallPolicy_PublishMetricAction) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::FirewallPolicy.PublishMetricAction"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulengineoptions.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulengineoptions.go
new file mode 100644
index 0000000000..0b926c7717
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulengineoptions.go
@@ -0,0 +1,37 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FirewallPolicy_StatefulEngineOptions AWS CloudFormation Resource (AWS::NetworkFirewall::FirewallPolicy.StatefulEngineOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-statefulengineoptions.html
+type FirewallPolicy_StatefulEngineOptions struct {
+
+	// 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
+	RuleOrder *types.Value `json:"RuleOrder,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_StatefulEngineOptions) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::FirewallPolicy.StatefulEngineOptions"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulrulegroupreference.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulrulegroupreference.go
new file mode 100644
index 0000000000..dc4f0ddc53
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statefulrulegroupreference.go
@@ -0,0 +1,42 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FirewallPolicy_StatefulRuleGroupReference AWS CloudFormation Resource (AWS::NetworkFirewall::FirewallPolicy.StatefulRuleGroupReference)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-statefulrulegroupreference.html
+type FirewallPolicy_StatefulRuleGroupReference struct {
+
+	// Priority AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-statefulrulegroupreference.html#cfn-networkfirewall-firewallpolicy-statefulrulegroupreference-priority
+	Priority *types.Value `json:"Priority,omitempty"`
+
+	// ResourceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-statefulrulegroupreference.html#cfn-networkfirewall-firewallpolicy-statefulrulegroupreference-resourcearn
+	ResourceArn *types.Value `json:"ResourceArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_StatefulRuleGroupReference) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::FirewallPolicy.StatefulRuleGroupReference"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statelessrulegroupreference.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statelessrulegroupreference.go
new file mode 100644
index 0000000000..0b35d17cbb
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-firewallpolicy_statelessrulegroupreference.go
@@ -0,0 +1,42 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FirewallPolicy_StatelessRuleGroupReference AWS CloudFormation Resource (AWS::NetworkFirewall::FirewallPolicy.StatelessRuleGroupReference)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-statelessrulegroupreference.html
+type FirewallPolicy_StatelessRuleGroupReference struct {
+
+	// Priority AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-statelessrulegroupreference.html#cfn-networkfirewall-firewallpolicy-statelessrulegroupreference-priority
+	Priority *types.Value `json:"Priority"`
+
+	// ResourceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-firewallpolicy-statelessrulegroupreference.html#cfn-networkfirewall-firewallpolicy-statelessrulegroupreference-resourcearn
+	ResourceArn *types.Value `json:"ResourceArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_StatelessRuleGroupReference) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::FirewallPolicy.StatelessRuleGroupReference"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration.go
new file mode 100644
index 0000000000..e16da94f10
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration.go
@@ -0,0 +1,118 @@
+package networkfirewall
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoggingConfiguration AWS CloudFormation Resource (AWS::NetworkFirewall::LoggingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-loggingconfiguration.html
+type LoggingConfiguration struct {
+
+	// FirewallArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-loggingconfiguration.html#cfn-networkfirewall-loggingconfiguration-firewallarn
+	FirewallArn *types.Value `json:"FirewallArn,omitempty"`
+
+	// FirewallName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-loggingconfiguration.html#cfn-networkfirewall-loggingconfiguration-firewallname
+	FirewallName *types.Value `json:"FirewallName,omitempty"`
+
+	// LoggingConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-loggingconfiguration.html#cfn-networkfirewall-loggingconfiguration-loggingconfiguration
+	LoggingConfiguration *LoggingConfiguration_LoggingConfiguration `json:"LoggingConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LoggingConfiguration) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::LoggingConfiguration"
+}
+
+// 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 LoggingConfiguration) MarshalJSON() ([]byte, error) {
+	type Properties LoggingConfiguration
+	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 *LoggingConfiguration) UnmarshalJSON(b []byte) error {
+	type Properties LoggingConfiguration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LoggingConfiguration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_logdestinationconfig.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_logdestinationconfig.go
new file mode 100644
index 0000000000..0db3e99da3
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_logdestinationconfig.go
@@ -0,0 +1,47 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoggingConfiguration_LogDestinationConfig AWS CloudFormation Resource (AWS::NetworkFirewall::LoggingConfiguration.LogDestinationConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-loggingconfiguration-logdestinationconfig.html
+type LoggingConfiguration_LogDestinationConfig struct {
+
+	// LogDestination AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-loggingconfiguration-logdestinationconfig.html#cfn-networkfirewall-loggingconfiguration-logdestinationconfig-logdestination
+	LogDestination map[string]*types.Value `json:"LogDestination,omitempty"`
+
+	// LogDestinationType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-loggingconfiguration-logdestinationconfig.html#cfn-networkfirewall-loggingconfiguration-logdestinationconfig-logdestinationtype
+	LogDestinationType *types.Value `json:"LogDestinationType,omitempty"`
+
+	// LogType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-loggingconfiguration-logdestinationconfig.html#cfn-networkfirewall-loggingconfiguration-logdestinationconfig-logtype
+	LogType *types.Value `json:"LogType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LoggingConfiguration_LogDestinationConfig) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::LoggingConfiguration.LogDestinationConfig"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_loggingconfiguration.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_loggingconfiguration.go
new file mode 100644
index 0000000000..0d012338d4
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-loggingconfiguration_loggingconfiguration.go
@@ -0,0 +1,35 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoggingConfiguration_LoggingConfiguration AWS CloudFormation Resource (AWS::NetworkFirewall::LoggingConfiguration.LoggingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-loggingconfiguration-loggingconfiguration.html
+type LoggingConfiguration_LoggingConfiguration struct {
+
+	// LogDestinationConfigs AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-loggingconfiguration-loggingconfiguration.html#cfn-networkfirewall-loggingconfiguration-loggingconfiguration-logdestinationconfigs
+	LogDestinationConfigs []LoggingConfiguration_LogDestinationConfig `json:"LogDestinationConfigs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LoggingConfiguration_LoggingConfiguration) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::LoggingConfiguration.LoggingConfiguration"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup.go
new file mode 100644
index 0000000000..bc5a490adb
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup.go
@@ -0,0 +1,134 @@
+package networkfirewall
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-rulegroup.html
+type RuleGroup struct {
+
+	// Capacity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-rulegroup.html#cfn-networkfirewall-rulegroup-capacity
+	Capacity *types.Value `json:"Capacity"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-rulegroup.html#cfn-networkfirewall-rulegroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// RuleGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-rulegroup.html#cfn-networkfirewall-rulegroup-rulegroup
+	RuleGroup *RuleGroup_RuleGroup `json:"RuleGroup,omitempty"`
+
+	// RuleGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-rulegroup.html#cfn-networkfirewall-rulegroup-rulegroupname
+	RuleGroupName *types.Value `json:"RuleGroupName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-rulegroup.html#cfn-networkfirewall-rulegroup-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkfirewall-rulegroup.html#cfn-networkfirewall-rulegroup-type
+	Type *types.Value `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 *RuleGroup) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup"
+}
+
+// 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 RuleGroup) MarshalJSON() ([]byte, error) {
+	type Properties RuleGroup
+	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 *RuleGroup) UnmarshalJSON(b []byte) error {
+	type Properties RuleGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RuleGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_actiondefinition.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_actiondefinition.go
new file mode 100644
index 0000000000..d2989a48bd
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_actiondefinition.go
@@ -0,0 +1,35 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_ActionDefinition AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.ActionDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-actiondefinition.html
+type RuleGroup_ActionDefinition struct {
+
+	// PublishMetricAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-actiondefinition.html#cfn-networkfirewall-rulegroup-actiondefinition-publishmetricaction
+	PublishMetricAction *RuleGroup_PublishMetricAction `json:"PublishMetricAction,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_ActionDefinition) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.ActionDefinition"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_address.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_address.go
new file mode 100644
index 0000000000..248b1bd72a
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_address.go
@@ -0,0 +1,37 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_Address AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.Address)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-address.html
+type RuleGroup_Address struct {
+
+	// AddressDefinition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-address.html#cfn-networkfirewall-rulegroup-address-addressdefinition
+	AddressDefinition *types.Value `json:"AddressDefinition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_Address) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.Address"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_customaction.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_customaction.go
new file mode 100644
index 0000000000..6497d05c39
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_customaction.go
@@ -0,0 +1,42 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_CustomAction AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.CustomAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-customaction.html
+type RuleGroup_CustomAction struct {
+
+	// ActionDefinition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-customaction.html#cfn-networkfirewall-rulegroup-customaction-actiondefinition
+	ActionDefinition *RuleGroup_ActionDefinition `json:"ActionDefinition,omitempty"`
+
+	// ActionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-customaction.html#cfn-networkfirewall-rulegroup-customaction-actionname
+	ActionName *types.Value `json:"ActionName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_CustomAction) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.CustomAction"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_dimension.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_dimension.go
new file mode 100644
index 0000000000..0bdd5e1260
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_dimension.go
@@ -0,0 +1,37 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_Dimension AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.Dimension)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-dimension.html
+type RuleGroup_Dimension struct {
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-dimension.html#cfn-networkfirewall-rulegroup-dimension-value
+	Value *types.Value `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 *RuleGroup_Dimension) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.Dimension"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_header.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_header.go
new file mode 100644
index 0000000000..c2f3daf165
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_header.go
@@ -0,0 +1,62 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_Header AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.Header)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-header.html
+type RuleGroup_Header struct {
+
+	// Destination AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-header.html#cfn-networkfirewall-rulegroup-header-destination
+	Destination *types.Value `json:"Destination,omitempty"`
+
+	// DestinationPort AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-header.html#cfn-networkfirewall-rulegroup-header-destinationport
+	DestinationPort *types.Value `json:"DestinationPort,omitempty"`
+
+	// Direction AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-header.html#cfn-networkfirewall-rulegroup-header-direction
+	Direction *types.Value `json:"Direction,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-header.html#cfn-networkfirewall-rulegroup-header-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// Source AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-header.html#cfn-networkfirewall-rulegroup-header-source
+	Source *types.Value `json:"Source,omitempty"`
+
+	// SourcePort AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-header.html#cfn-networkfirewall-rulegroup-header-sourceport
+	SourcePort *types.Value `json:"SourcePort,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_Header) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.Header"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ipset.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ipset.go
new file mode 100644
index 0000000000..bbf6c2e375
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ipset.go
@@ -0,0 +1,37 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_IPSet AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.IPSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-ipset.html
+type RuleGroup_IPSet struct {
+
+	// Definition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-ipset.html#cfn-networkfirewall-rulegroup-ipset-definition
+	Definition *types.Value `json:"Definition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_IPSet) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.IPSet"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_matchattributes.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_matchattributes.go
new file mode 100644
index 0000000000..c3901a4d72
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_matchattributes.go
@@ -0,0 +1,62 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_MatchAttributes AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.MatchAttributes)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-matchattributes.html
+type RuleGroup_MatchAttributes struct {
+
+	// DestinationPorts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-matchattributes.html#cfn-networkfirewall-rulegroup-matchattributes-destinationports
+	DestinationPorts []RuleGroup_PortRange `json:"DestinationPorts,omitempty"`
+
+	// Destinations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-matchattributes.html#cfn-networkfirewall-rulegroup-matchattributes-destinations
+	Destinations []RuleGroup_Address `json:"Destinations,omitempty"`
+
+	// Protocols AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-matchattributes.html#cfn-networkfirewall-rulegroup-matchattributes-protocols
+	Protocols *types.Value `json:"Protocols,omitempty"`
+
+	// SourcePorts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-matchattributes.html#cfn-networkfirewall-rulegroup-matchattributes-sourceports
+	SourcePorts []RuleGroup_PortRange `json:"SourcePorts,omitempty"`
+
+	// Sources AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-matchattributes.html#cfn-networkfirewall-rulegroup-matchattributes-sources
+	Sources []RuleGroup_Address `json:"Sources,omitempty"`
+
+	// TCPFlags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-matchattributes.html#cfn-networkfirewall-rulegroup-matchattributes-tcpflags
+	TCPFlags []RuleGroup_TCPFlagField `json:"TCPFlags,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_MatchAttributes) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.MatchAttributes"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portrange.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portrange.go
new file mode 100644
index 0000000000..7a74399f64
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portrange.go
@@ -0,0 +1,42 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_PortRange AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.PortRange)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-portrange.html
+type RuleGroup_PortRange struct {
+
+	// FromPort AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-portrange.html#cfn-networkfirewall-rulegroup-portrange-fromport
+	FromPort *types.Value `json:"FromPort"`
+
+	// ToPort AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-portrange.html#cfn-networkfirewall-rulegroup-portrange-toport
+	ToPort *types.Value `json:"ToPort"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_PortRange) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.PortRange"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portset.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portset.go
new file mode 100644
index 0000000000..a4fa626156
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_portset.go
@@ -0,0 +1,37 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_PortSet AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.PortSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-portset.html
+type RuleGroup_PortSet struct {
+
+	// Definition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-portset.html#cfn-networkfirewall-rulegroup-portset-definition
+	Definition *types.Value `json:"Definition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_PortSet) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.PortSet"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_publishmetricaction.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_publishmetricaction.go
new file mode 100644
index 0000000000..fc17dd6fcd
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_publishmetricaction.go
@@ -0,0 +1,35 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_PublishMetricAction AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.PublishMetricAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-publishmetricaction.html
+type RuleGroup_PublishMetricAction struct {
+
+	// Dimensions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-publishmetricaction.html#cfn-networkfirewall-rulegroup-publishmetricaction-dimensions
+	Dimensions []RuleGroup_Dimension `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 *RuleGroup_PublishMetricAction) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.PublishMetricAction"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruledefinition.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruledefinition.go
new file mode 100644
index 0000000000..ecd3bd2845
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruledefinition.go
@@ -0,0 +1,42 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_RuleDefinition AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.RuleDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-ruledefinition.html
+type RuleGroup_RuleDefinition struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-ruledefinition.html#cfn-networkfirewall-rulegroup-ruledefinition-actions
+	Actions *types.Value `json:"Actions,omitempty"`
+
+	// MatchAttributes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-ruledefinition.html#cfn-networkfirewall-rulegroup-ruledefinition-matchattributes
+	MatchAttributes *RuleGroup_MatchAttributes `json:"MatchAttributes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_RuleDefinition) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.RuleDefinition"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulegroup.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulegroup.go
new file mode 100644
index 0000000000..0787d289ca
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulegroup.go
@@ -0,0 +1,45 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_RuleGroup AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.RuleGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-rulegroup.html
+type RuleGroup_RuleGroup struct {
+
+	// RuleVariables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-rulegroup.html#cfn-networkfirewall-rulegroup-rulegroup-rulevariables
+	RuleVariables *RuleGroup_RuleVariables `json:"RuleVariables,omitempty"`
+
+	// RulesSource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-rulegroup.html#cfn-networkfirewall-rulegroup-rulegroup-rulessource
+	RulesSource *RuleGroup_RulesSource `json:"RulesSource,omitempty"`
+
+	// StatefulRuleOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-rulegroup.html#cfn-networkfirewall-rulegroup-rulegroup-statefulruleoptions
+	StatefulRuleOptions *RuleGroup_StatefulRuleOptions `json:"StatefulRuleOptions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_RuleGroup) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.RuleGroup"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruleoption.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruleoption.go
new file mode 100644
index 0000000000..71134fa415
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_ruleoption.go
@@ -0,0 +1,42 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_RuleOption AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.RuleOption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-ruleoption.html
+type RuleGroup_RuleOption struct {
+
+	// Keyword AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-ruleoption.html#cfn-networkfirewall-rulegroup-ruleoption-keyword
+	Keyword *types.Value `json:"Keyword,omitempty"`
+
+	// Settings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-ruleoption.html#cfn-networkfirewall-rulegroup-ruleoption-settings
+	Settings *types.Value `json:"Settings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_RuleOption) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.RuleOption"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessource.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessource.go
new file mode 100644
index 0000000000..eda9fd4015
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessource.go
@@ -0,0 +1,52 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_RulesSource AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.RulesSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-rulessource.html
+type RuleGroup_RulesSource struct {
+
+	// RulesSourceList AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-rulessource.html#cfn-networkfirewall-rulegroup-rulessource-rulessourcelist
+	RulesSourceList *RuleGroup_RulesSourceList `json:"RulesSourceList,omitempty"`
+
+	// RulesString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-rulessource.html#cfn-networkfirewall-rulegroup-rulessource-rulesstring
+	RulesString *types.Value `json:"RulesString,omitempty"`
+
+	// StatefulRules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-rulessource.html#cfn-networkfirewall-rulegroup-rulessource-statefulrules
+	StatefulRules []RuleGroup_StatefulRule `json:"StatefulRules,omitempty"`
+
+	// StatelessRulesAndCustomActions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-rulessource.html#cfn-networkfirewall-rulegroup-rulessource-statelessrulesandcustomactions
+	StatelessRulesAndCustomActions *RuleGroup_StatelessRulesAndCustomActions `json:"StatelessRulesAndCustomActions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_RulesSource) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.RulesSource"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessourcelist.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessourcelist.go
new file mode 100644
index 0000000000..481ccf034a
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulessourcelist.go
@@ -0,0 +1,47 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_RulesSourceList AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.RulesSourceList)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-rulessourcelist.html
+type RuleGroup_RulesSourceList struct {
+
+	// GeneratedRulesType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-rulessourcelist.html#cfn-networkfirewall-rulegroup-rulessourcelist-generatedrulestype
+	GeneratedRulesType *types.Value `json:"GeneratedRulesType,omitempty"`
+
+	// TargetTypes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-rulessourcelist.html#cfn-networkfirewall-rulegroup-rulessourcelist-targettypes
+	TargetTypes *types.Value `json:"TargetTypes,omitempty"`
+
+	// Targets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-rulessourcelist.html#cfn-networkfirewall-rulegroup-rulessourcelist-targets
+	Targets *types.Value `json:"Targets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_RulesSourceList) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.RulesSourceList"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulevariables.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulevariables.go
new file mode 100644
index 0000000000..8e515b7bf2
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_rulevariables.go
@@ -0,0 +1,40 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_RuleVariables AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.RuleVariables)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-rulevariables.html
+type RuleGroup_RuleVariables struct {
+
+	// IPSets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-rulevariables.html#cfn-networkfirewall-rulegroup-rulevariables-ipsets
+	IPSets map[string]RuleGroup_IPSet `json:"IPSets,omitempty"`
+
+	// PortSets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-rulevariables.html#cfn-networkfirewall-rulegroup-rulevariables-portsets
+	PortSets map[string]RuleGroup_PortSet `json:"PortSets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_RuleVariables) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.RuleVariables"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulrule.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulrule.go
new file mode 100644
index 0000000000..ce5701c6c3
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulrule.go
@@ -0,0 +1,47 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_StatefulRule AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.StatefulRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-statefulrule.html
+type RuleGroup_StatefulRule struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-statefulrule.html#cfn-networkfirewall-rulegroup-statefulrule-action
+	Action *types.Value `json:"Action,omitempty"`
+
+	// Header AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-statefulrule.html#cfn-networkfirewall-rulegroup-statefulrule-header
+	Header *RuleGroup_Header `json:"Header,omitempty"`
+
+	// RuleOptions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-statefulrule.html#cfn-networkfirewall-rulegroup-statefulrule-ruleoptions
+	RuleOptions []RuleGroup_RuleOption `json:"RuleOptions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_StatefulRule) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.StatefulRule"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulruleoptions.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulruleoptions.go
new file mode 100644
index 0000000000..8d8d760cad
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statefulruleoptions.go
@@ -0,0 +1,37 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_StatefulRuleOptions AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.StatefulRuleOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-statefulruleoptions.html
+type RuleGroup_StatefulRuleOptions struct {
+
+	// RuleOrder AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-statefulruleoptions.html#cfn-networkfirewall-rulegroup-statefulruleoptions-ruleorder
+	RuleOrder *types.Value `json:"RuleOrder,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_StatefulRuleOptions) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.StatefulRuleOptions"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrule.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrule.go
new file mode 100644
index 0000000000..6d1b3faf12
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrule.go
@@ -0,0 +1,42 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_StatelessRule AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.StatelessRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-statelessrule.html
+type RuleGroup_StatelessRule struct {
+
+	// Priority AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-statelessrule.html#cfn-networkfirewall-rulegroup-statelessrule-priority
+	Priority *types.Value `json:"Priority"`
+
+	// RuleDefinition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-statelessrule.html#cfn-networkfirewall-rulegroup-statelessrule-ruledefinition
+	RuleDefinition *RuleGroup_RuleDefinition `json:"RuleDefinition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_StatelessRule) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.StatelessRule"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrulesandcustomactions.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrulesandcustomactions.go
new file mode 100644
index 0000000000..9a635d36a1
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_statelessrulesandcustomactions.go
@@ -0,0 +1,40 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_StatelessRulesAndCustomActions AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.StatelessRulesAndCustomActions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-statelessrulesandcustomactions.html
+type RuleGroup_StatelessRulesAndCustomActions struct {
+
+	// CustomActions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-statelessrulesandcustomactions.html#cfn-networkfirewall-rulegroup-statelessrulesandcustomactions-customactions
+	CustomActions []RuleGroup_CustomAction `json:"CustomActions,omitempty"`
+
+	// StatelessRules AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-statelessrulesandcustomactions.html#cfn-networkfirewall-rulegroup-statelessrulesandcustomactions-statelessrules
+	StatelessRules []RuleGroup_StatelessRule `json:"StatelessRules,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_StatelessRulesAndCustomActions) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.StatelessRulesAndCustomActions"
+}
diff --git a/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_tcpflagfield.go b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_tcpflagfield.go
new file mode 100644
index 0000000000..2e46ca93ee
--- /dev/null
+++ b/goformation/cloudformation/networkfirewall/aws-networkfirewall-rulegroup_tcpflagfield.go
@@ -0,0 +1,42 @@
+package networkfirewall
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_TCPFlagField AWS CloudFormation Resource (AWS::NetworkFirewall::RuleGroup.TCPFlagField)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-tcpflagfield.html
+type RuleGroup_TCPFlagField struct {
+
+	// Flags AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-tcpflagfield.html#cfn-networkfirewall-rulegroup-tcpflagfield-flags
+	Flags *types.Value `json:"Flags,omitempty"`
+
+	// Masks AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkfirewall-rulegroup-tcpflagfield.html#cfn-networkfirewall-rulegroup-tcpflagfield-masks
+	Masks *types.Value `json:"Masks,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_TCPFlagField) AWSCloudFormationType() string {
+	return "AWS::NetworkFirewall::RuleGroup.TCPFlagField"
+}
diff --git a/goformation/cloudformation/networkmanager/aws-networkmanager-customergatewayassociation.go b/goformation/cloudformation/networkmanager/aws-networkmanager-customergatewayassociation.go
new file mode 100644
index 0000000000..ba7cdf7425
--- /dev/null
+++ b/goformation/cloudformation/networkmanager/aws-networkmanager-customergatewayassociation.go
@@ -0,0 +1,123 @@
+package networkmanager
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CustomerGatewayAssociation AWS CloudFormation Resource (AWS::NetworkManager::CustomerGatewayAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-customergatewayassociation.html
+type CustomerGatewayAssociation struct {
+
+	// CustomerGatewayArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-customergatewayassociation.html#cfn-networkmanager-customergatewayassociation-customergatewayarn
+	CustomerGatewayArn *types.Value `json:"CustomerGatewayArn,omitempty"`
+
+	// DeviceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-customergatewayassociation.html#cfn-networkmanager-customergatewayassociation-deviceid
+	DeviceId *types.Value `json:"DeviceId,omitempty"`
+
+	// GlobalNetworkId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-customergatewayassociation.html#cfn-networkmanager-customergatewayassociation-globalnetworkid
+	GlobalNetworkId *types.Value `json:"GlobalNetworkId,omitempty"`
+
+	// LinkId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-customergatewayassociation.html#cfn-networkmanager-customergatewayassociation-linkid
+	LinkId *types.Value `json:"LinkId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CustomerGatewayAssociation) AWSCloudFormationType() string {
+	return "AWS::NetworkManager::CustomerGatewayAssociation"
+}
+
+// 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 CustomerGatewayAssociation) MarshalJSON() ([]byte, error) {
+	type Properties CustomerGatewayAssociation
+	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 *CustomerGatewayAssociation) UnmarshalJSON(b []byte) error {
+	type Properties CustomerGatewayAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CustomerGatewayAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/networkmanager/aws-networkmanager-device.go b/goformation/cloudformation/networkmanager/aws-networkmanager-device.go
new file mode 100644
index 0000000000..eaab9f32c7
--- /dev/null
+++ b/goformation/cloudformation/networkmanager/aws-networkmanager-device.go
@@ -0,0 +1,149 @@
+package networkmanager
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Device AWS CloudFormation Resource (AWS::NetworkManager::Device)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-device.html
+type Device struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-device.html#cfn-networkmanager-device-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// GlobalNetworkId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-device.html#cfn-networkmanager-device-globalnetworkid
+	GlobalNetworkId *types.Value `json:"GlobalNetworkId,omitempty"`
+
+	// Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-device.html#cfn-networkmanager-device-location
+	Location *Device_Location `json:"Location,omitempty"`
+
+	// Model AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-device.html#cfn-networkmanager-device-model
+	Model *types.Value `json:"Model,omitempty"`
+
+	// SerialNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-device.html#cfn-networkmanager-device-serialnumber
+	SerialNumber *types.Value `json:"SerialNumber,omitempty"`
+
+	// SiteId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-device.html#cfn-networkmanager-device-siteid
+	SiteId *types.Value `json:"SiteId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-device.html#cfn-networkmanager-device-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-device.html#cfn-networkmanager-device-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Vendor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-device.html#cfn-networkmanager-device-vendor
+	Vendor *types.Value `json:"Vendor,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Device) AWSCloudFormationType() string {
+	return "AWS::NetworkManager::Device"
+}
+
+// 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 Device) MarshalJSON() ([]byte, error) {
+	type Properties Device
+	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 *Device) UnmarshalJSON(b []byte) error {
+	type Properties Device
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Device(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/networkmanager/aws-networkmanager-device_location.go b/goformation/cloudformation/networkmanager/aws-networkmanager-device_location.go
new file mode 100644
index 0000000000..9d5552995d
--- /dev/null
+++ b/goformation/cloudformation/networkmanager/aws-networkmanager-device_location.go
@@ -0,0 +1,47 @@
+package networkmanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Device_Location AWS CloudFormation Resource (AWS::NetworkManager::Device.Location)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-device-location.html
+type Device_Location struct {
+
+	// Address AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-device-location.html#cfn-networkmanager-device-location-address
+	Address *types.Value `json:"Address,omitempty"`
+
+	// Latitude AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-device-location.html#cfn-networkmanager-device-location-latitude
+	Latitude *types.Value `json:"Latitude,omitempty"`
+
+	// Longitude AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-device-location.html#cfn-networkmanager-device-location-longitude
+	Longitude *types.Value `json:"Longitude,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Device_Location) AWSCloudFormationType() string {
+	return "AWS::NetworkManager::Device.Location"
+}
diff --git a/goformation/cloudformation/networkmanager/aws-networkmanager-globalnetwork.go b/goformation/cloudformation/networkmanager/aws-networkmanager-globalnetwork.go
new file mode 100644
index 0000000000..d8031dfdef
--- /dev/null
+++ b/goformation/cloudformation/networkmanager/aws-networkmanager-globalnetwork.go
@@ -0,0 +1,114 @@
+package networkmanager
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalNetwork AWS CloudFormation Resource (AWS::NetworkManager::GlobalNetwork)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-globalnetwork.html
+type GlobalNetwork struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-globalnetwork.html#cfn-networkmanager-globalnetwork-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-globalnetwork.html#cfn-networkmanager-globalnetwork-tags
+	Tags []cloudformation.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 *GlobalNetwork) AWSCloudFormationType() string {
+	return "AWS::NetworkManager::GlobalNetwork"
+}
+
+// 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 GlobalNetwork) MarshalJSON() ([]byte, error) {
+	type Properties GlobalNetwork
+	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 *GlobalNetwork) UnmarshalJSON(b []byte) error {
+	type Properties GlobalNetwork
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = GlobalNetwork(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/networkmanager/aws-networkmanager-link.go b/goformation/cloudformation/networkmanager/aws-networkmanager-link.go
new file mode 100644
index 0000000000..47b9712c75
--- /dev/null
+++ b/goformation/cloudformation/networkmanager/aws-networkmanager-link.go
@@ -0,0 +1,139 @@
+package networkmanager
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Link AWS CloudFormation Resource (AWS::NetworkManager::Link)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-link.html
+type Link struct {
+
+	// Bandwidth AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-link.html#cfn-networkmanager-link-bandwidth
+	Bandwidth *Link_Bandwidth `json:"Bandwidth,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-link.html#cfn-networkmanager-link-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// GlobalNetworkId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-link.html#cfn-networkmanager-link-globalnetworkid
+	GlobalNetworkId *types.Value `json:"GlobalNetworkId,omitempty"`
+
+	// Provider AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-link.html#cfn-networkmanager-link-provider
+	Provider *types.Value `json:"Provider,omitempty"`
+
+	// SiteId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-link.html#cfn-networkmanager-link-siteid
+	SiteId *types.Value `json:"SiteId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-link.html#cfn-networkmanager-link-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-link.html#cfn-networkmanager-link-type
+	Type *types.Value `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 *Link) AWSCloudFormationType() string {
+	return "AWS::NetworkManager::Link"
+}
+
+// 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 Link) MarshalJSON() ([]byte, error) {
+	type Properties Link
+	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 *Link) UnmarshalJSON(b []byte) error {
+	type Properties Link
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Link(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/networkmanager/aws-networkmanager-link_bandwidth.go b/goformation/cloudformation/networkmanager/aws-networkmanager-link_bandwidth.go
new file mode 100644
index 0000000000..2b84f8a94d
--- /dev/null
+++ b/goformation/cloudformation/networkmanager/aws-networkmanager-link_bandwidth.go
@@ -0,0 +1,42 @@
+package networkmanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Link_Bandwidth AWS CloudFormation Resource (AWS::NetworkManager::Link.Bandwidth)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-link-bandwidth.html
+type Link_Bandwidth struct {
+
+	// DownloadSpeed AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-link-bandwidth.html#cfn-networkmanager-link-bandwidth-downloadspeed
+	DownloadSpeed *types.Value `json:"DownloadSpeed,omitempty"`
+
+	// UploadSpeed AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-link-bandwidth.html#cfn-networkmanager-link-bandwidth-uploadspeed
+	UploadSpeed *types.Value `json:"UploadSpeed,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Link_Bandwidth) AWSCloudFormationType() string {
+	return "AWS::NetworkManager::Link.Bandwidth"
+}
diff --git a/goformation/cloudformation/networkmanager/aws-networkmanager-linkassociation.go b/goformation/cloudformation/networkmanager/aws-networkmanager-linkassociation.go
new file mode 100644
index 0000000000..ad06e809d7
--- /dev/null
+++ b/goformation/cloudformation/networkmanager/aws-networkmanager-linkassociation.go
@@ -0,0 +1,118 @@
+package networkmanager
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LinkAssociation AWS CloudFormation Resource (AWS::NetworkManager::LinkAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-linkassociation.html
+type LinkAssociation struct {
+
+	// DeviceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-linkassociation.html#cfn-networkmanager-linkassociation-deviceid
+	DeviceId *types.Value `json:"DeviceId,omitempty"`
+
+	// GlobalNetworkId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-linkassociation.html#cfn-networkmanager-linkassociation-globalnetworkid
+	GlobalNetworkId *types.Value `json:"GlobalNetworkId,omitempty"`
+
+	// LinkId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-linkassociation.html#cfn-networkmanager-linkassociation-linkid
+	LinkId *types.Value `json:"LinkId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LinkAssociation) AWSCloudFormationType() string {
+	return "AWS::NetworkManager::LinkAssociation"
+}
+
+// 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 LinkAssociation) MarshalJSON() ([]byte, error) {
+	type Properties LinkAssociation
+	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 *LinkAssociation) UnmarshalJSON(b []byte) error {
+	type Properties LinkAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LinkAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/networkmanager/aws-networkmanager-site.go b/goformation/cloudformation/networkmanager/aws-networkmanager-site.go
new file mode 100644
index 0000000000..ca675b0c06
--- /dev/null
+++ b/goformation/cloudformation/networkmanager/aws-networkmanager-site.go
@@ -0,0 +1,124 @@
+package networkmanager
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Site AWS CloudFormation Resource (AWS::NetworkManager::Site)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-site.html
+type Site struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-site.html#cfn-networkmanager-site-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// GlobalNetworkId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-site.html#cfn-networkmanager-site-globalnetworkid
+	GlobalNetworkId *types.Value `json:"GlobalNetworkId,omitempty"`
+
+	// Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-site.html#cfn-networkmanager-site-location
+	Location *Site_Location `json:"Location,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-site.html#cfn-networkmanager-site-tags
+	Tags []cloudformation.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 *Site) AWSCloudFormationType() string {
+	return "AWS::NetworkManager::Site"
+}
+
+// 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 Site) MarshalJSON() ([]byte, error) {
+	type Properties Site
+	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 *Site) UnmarshalJSON(b []byte) error {
+	type Properties Site
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Site(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/networkmanager/aws-networkmanager-site_location.go b/goformation/cloudformation/networkmanager/aws-networkmanager-site_location.go
new file mode 100644
index 0000000000..5aac7146ba
--- /dev/null
+++ b/goformation/cloudformation/networkmanager/aws-networkmanager-site_location.go
@@ -0,0 +1,47 @@
+package networkmanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Site_Location AWS CloudFormation Resource (AWS::NetworkManager::Site.Location)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-site-location.html
+type Site_Location struct {
+
+	// Address AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-site-location.html#cfn-networkmanager-site-location-address
+	Address *types.Value `json:"Address,omitempty"`
+
+	// Latitude AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-site-location.html#cfn-networkmanager-site-location-latitude
+	Latitude *types.Value `json:"Latitude,omitempty"`
+
+	// Longitude AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-networkmanager-site-location.html#cfn-networkmanager-site-location-longitude
+	Longitude *types.Value `json:"Longitude,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Site_Location) AWSCloudFormationType() string {
+	return "AWS::NetworkManager::Site.Location"
+}
diff --git a/goformation/cloudformation/networkmanager/aws-networkmanager-transitgatewayregistration.go b/goformation/cloudformation/networkmanager/aws-networkmanager-transitgatewayregistration.go
new file mode 100644
index 0000000000..8719bd08f0
--- /dev/null
+++ b/goformation/cloudformation/networkmanager/aws-networkmanager-transitgatewayregistration.go
@@ -0,0 +1,113 @@
+package networkmanager
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TransitGatewayRegistration AWS CloudFormation Resource (AWS::NetworkManager::TransitGatewayRegistration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-transitgatewayregistration.html
+type TransitGatewayRegistration struct {
+
+	// GlobalNetworkId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-transitgatewayregistration.html#cfn-networkmanager-transitgatewayregistration-globalnetworkid
+	GlobalNetworkId *types.Value `json:"GlobalNetworkId,omitempty"`
+
+	// TransitGatewayArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-networkmanager-transitgatewayregistration.html#cfn-networkmanager-transitgatewayregistration-transitgatewayarn
+	TransitGatewayArn *types.Value `json:"TransitGatewayArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TransitGatewayRegistration) AWSCloudFormationType() string {
+	return "AWS::NetworkManager::TransitGatewayRegistration"
+}
+
+// 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 TransitGatewayRegistration) MarshalJSON() ([]byte, error) {
+	type Properties TransitGatewayRegistration
+	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 *TransitGatewayRegistration) UnmarshalJSON(b []byte) error {
+	type Properties TransitGatewayRegistration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TransitGatewayRegistration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/nimblestudio/aws-nimblestudio-launchprofile.go b/goformation/cloudformation/nimblestudio/aws-nimblestudio-launchprofile.go
new file mode 100644
index 0000000000..53831de25e
--- /dev/null
+++ b/goformation/cloudformation/nimblestudio/aws-nimblestudio-launchprofile.go
@@ -0,0 +1,143 @@
+package nimblestudio
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchProfile AWS CloudFormation Resource (AWS::NimbleStudio::LaunchProfile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-launchprofile.html
+type LaunchProfile struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-launchprofile.html#cfn-nimblestudio-launchprofile-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Ec2SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-launchprofile.html#cfn-nimblestudio-launchprofile-ec2subnetids
+	Ec2SubnetIds *types.Value `json:"Ec2SubnetIds,omitempty"`
+
+	// LaunchProfileProtocolVersions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-launchprofile.html#cfn-nimblestudio-launchprofile-launchprofileprotocolversions
+	LaunchProfileProtocolVersions *types.Value `json:"LaunchProfileProtocolVersions,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-launchprofile.html#cfn-nimblestudio-launchprofile-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// StreamConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-launchprofile.html#cfn-nimblestudio-launchprofile-streamconfiguration
+	StreamConfiguration *LaunchProfile_StreamConfiguration `json:"StreamConfiguration,omitempty"`
+
+	// StudioComponentIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-launchprofile.html#cfn-nimblestudio-launchprofile-studiocomponentids
+	StudioComponentIds *types.Value `json:"StudioComponentIds,omitempty"`
+
+	// StudioId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-launchprofile.html#cfn-nimblestudio-launchprofile-studioid
+	StudioId *types.Value `json:"StudioId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-launchprofile.html#cfn-nimblestudio-launchprofile-tags
+	Tags map[string]*types.Value `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 *LaunchProfile) AWSCloudFormationType() string {
+	return "AWS::NimbleStudio::LaunchProfile"
+}
+
+// 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 LaunchProfile) MarshalJSON() ([]byte, error) {
+	type Properties LaunchProfile
+	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 *LaunchProfile) UnmarshalJSON(b []byte) error {
+	type Properties LaunchProfile
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LaunchProfile(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/nimblestudio/aws-nimblestudio-launchprofile_streamconfiguration.go b/goformation/cloudformation/nimblestudio/aws-nimblestudio-launchprofile_streamconfiguration.go
new file mode 100644
index 0000000000..ccdcbbed4d
--- /dev/null
+++ b/goformation/cloudformation/nimblestudio/aws-nimblestudio-launchprofile_streamconfiguration.go
@@ -0,0 +1,52 @@
+package nimblestudio
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchProfile_StreamConfiguration AWS CloudFormation Resource (AWS::NimbleStudio::LaunchProfile.StreamConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-launchprofile-streamconfiguration.html
+type LaunchProfile_StreamConfiguration struct {
+
+	// ClipboardMode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-launchprofile-streamconfiguration.html#cfn-nimblestudio-launchprofile-streamconfiguration-clipboardmode
+	ClipboardMode *types.Value `json:"ClipboardMode,omitempty"`
+
+	// Ec2InstanceTypes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-launchprofile-streamconfiguration.html#cfn-nimblestudio-launchprofile-streamconfiguration-ec2instancetypes
+	Ec2InstanceTypes *types.Value `json:"Ec2InstanceTypes,omitempty"`
+
+	// MaxSessionLengthInMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-launchprofile-streamconfiguration.html#cfn-nimblestudio-launchprofile-streamconfiguration-maxsessionlengthinminutes
+	MaxSessionLengthInMinutes *types.Value `json:"MaxSessionLengthInMinutes,omitempty"`
+
+	// StreamingImageIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-launchprofile-streamconfiguration.html#cfn-nimblestudio-launchprofile-streamconfiguration-streamingimageids
+	StreamingImageIds *types.Value `json:"StreamingImageIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchProfile_StreamConfiguration) AWSCloudFormationType() string {
+	return "AWS::NimbleStudio::LaunchProfile.StreamConfiguration"
+}
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-streamingimage.go b/goformation/cloudformation/nimblestudio/aws-nimblestudio-streamingimage.go
new file mode 100644
index 0000000000..68a4354f49
--- /dev/null
+++ b/goformation/cloudformation/nimblestudio/aws-nimblestudio-streamingimage.go
@@ -0,0 +1,128 @@
+package nimblestudio
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StreamingImage AWS CloudFormation Resource (AWS::NimbleStudio::StreamingImage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-streamingimage.html
+type StreamingImage struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-streamingimage.html#cfn-nimblestudio-streamingimage-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Ec2ImageId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-streamingimage.html#cfn-nimblestudio-streamingimage-ec2imageid
+	Ec2ImageId *types.Value `json:"Ec2ImageId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-streamingimage.html#cfn-nimblestudio-streamingimage-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// StudioId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-streamingimage.html#cfn-nimblestudio-streamingimage-studioid
+	StudioId *types.Value `json:"StudioId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-streamingimage.html#cfn-nimblestudio-streamingimage-tags
+	Tags map[string]*types.Value `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 *StreamingImage) AWSCloudFormationType() string {
+	return "AWS::NimbleStudio::StreamingImage"
+}
+
+// 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 StreamingImage) MarshalJSON() ([]byte, error) {
+	type Properties StreamingImage
+	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 *StreamingImage) UnmarshalJSON(b []byte) error {
+	type Properties StreamingImage
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = StreamingImage(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/nimblestudio/aws-nimblestudio-studio.go b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studio.go
new file mode 100644
index 0000000000..4a7db66355
--- /dev/null
+++ b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studio.go
@@ -0,0 +1,133 @@
+package nimblestudio
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Studio AWS CloudFormation Resource (AWS::NimbleStudio::Studio)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-studio.html
+type Studio struct {
+
+	// AdminRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-studio.html#cfn-nimblestudio-studio-adminrolearn
+	AdminRoleArn *types.Value `json:"AdminRoleArn,omitempty"`
+
+	// DisplayName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-studio.html#cfn-nimblestudio-studio-displayname
+	DisplayName *types.Value `json:"DisplayName,omitempty"`
+
+	// StudioEncryptionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-studio.html#cfn-nimblestudio-studio-studioencryptionconfiguration
+	StudioEncryptionConfiguration *Studio_StudioEncryptionConfiguration `json:"StudioEncryptionConfiguration,omitempty"`
+
+	// StudioName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-studio.html#cfn-nimblestudio-studio-studioname
+	StudioName *types.Value `json:"StudioName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-studio.html#cfn-nimblestudio-studio-tags
+	Tags map[string]*types.Value `json:"Tags,omitempty"`
+
+	// UserRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-studio.html#cfn-nimblestudio-studio-userrolearn
+	UserRoleArn *types.Value `json:"UserRoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Studio) AWSCloudFormationType() string {
+	return "AWS::NimbleStudio::Studio"
+}
+
+// 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 Studio) MarshalJSON() ([]byte, error) {
+	type Properties Studio
+	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 *Studio) UnmarshalJSON(b []byte) error {
+	type Properties Studio
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Studio(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/nimblestudio/aws-nimblestudio-studio_studioencryptionconfiguration.go b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studio_studioencryptionconfiguration.go
new file mode 100644
index 0000000000..3dcb40516a
--- /dev/null
+++ b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studio_studioencryptionconfiguration.go
@@ -0,0 +1,42 @@
+package nimblestudio
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Studio_StudioEncryptionConfiguration AWS CloudFormation Resource (AWS::NimbleStudio::Studio.StudioEncryptionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studio-studioencryptionconfiguration.html
+type Studio_StudioEncryptionConfiguration struct {
+
+	// KeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studio-studioencryptionconfiguration.html#cfn-nimblestudio-studio-studioencryptionconfiguration-keyarn
+	KeyArn *types.Value `json:"KeyArn,omitempty"`
+
+	// KeyType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studio-studioencryptionconfiguration.html#cfn-nimblestudio-studio-studioencryptionconfiguration-keytype
+	KeyType *types.Value `json:"KeyType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Studio_StudioEncryptionConfiguration) AWSCloudFormationType() string {
+	return "AWS::NimbleStudio::Studio.StudioEncryptionConfiguration"
+}
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent.go b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent.go
new file mode 100644
index 0000000000..9d1bde756e
--- /dev/null
+++ b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent.go
@@ -0,0 +1,153 @@
+package nimblestudio
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StudioComponent AWS CloudFormation Resource (AWS::NimbleStudio::StudioComponent)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-studiocomponent.html
+type StudioComponent struct {
+
+	// Configuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-studiocomponent.html#cfn-nimblestudio-studiocomponent-configuration
+	Configuration *StudioComponent_StudioComponentConfiguration `json:"Configuration,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-studiocomponent.html#cfn-nimblestudio-studiocomponent-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Ec2SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-studiocomponent.html#cfn-nimblestudio-studiocomponent-ec2securitygroupids
+	Ec2SecurityGroupIds *types.Value `json:"Ec2SecurityGroupIds,omitempty"`
+
+	// InitializationScripts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-studiocomponent.html#cfn-nimblestudio-studiocomponent-initializationscripts
+	InitializationScripts []StudioComponent_StudioComponentInitializationScript `json:"InitializationScripts,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-studiocomponent.html#cfn-nimblestudio-studiocomponent-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ScriptParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-studiocomponent.html#cfn-nimblestudio-studiocomponent-scriptparameters
+	ScriptParameters []StudioComponent_ScriptParameterKeyValue `json:"ScriptParameters,omitempty"`
+
+	// StudioId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-studiocomponent.html#cfn-nimblestudio-studiocomponent-studioid
+	StudioId *types.Value `json:"StudioId,omitempty"`
+
+	// Subtype AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-studiocomponent.html#cfn-nimblestudio-studiocomponent-subtype
+	Subtype *types.Value `json:"Subtype,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-studiocomponent.html#cfn-nimblestudio-studiocomponent-tags
+	Tags map[string]*types.Value `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-nimblestudio-studiocomponent.html#cfn-nimblestudio-studiocomponent-type
+	Type *types.Value `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 *StudioComponent) AWSCloudFormationType() string {
+	return "AWS::NimbleStudio::StudioComponent"
+}
+
+// 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 StudioComponent) MarshalJSON() ([]byte, error) {
+	type Properties StudioComponent
+	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 *StudioComponent) UnmarshalJSON(b []byte) error {
+	type Properties StudioComponent
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = StudioComponent(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectorycomputerattribute.go b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectorycomputerattribute.go
new file mode 100644
index 0000000000..8b8c428e73
--- /dev/null
+++ b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectorycomputerattribute.go
@@ -0,0 +1,42 @@
+package nimblestudio
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StudioComponent_ActiveDirectoryComputerAttribute AWS CloudFormation Resource (AWS::NimbleStudio::StudioComponent.ActiveDirectoryComputerAttribute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-activedirectorycomputerattribute.html
+type StudioComponent_ActiveDirectoryComputerAttribute struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-activedirectorycomputerattribute.html#cfn-nimblestudio-studiocomponent-activedirectorycomputerattribute-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-activedirectorycomputerattribute.html#cfn-nimblestudio-studiocomponent-activedirectorycomputerattribute-value
+	Value *types.Value `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 *StudioComponent_ActiveDirectoryComputerAttribute) AWSCloudFormationType() string {
+	return "AWS::NimbleStudio::StudioComponent.ActiveDirectoryComputerAttribute"
+}
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectoryconfiguration.go b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectoryconfiguration.go
new file mode 100644
index 0000000000..6c4d114696
--- /dev/null
+++ b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_activedirectoryconfiguration.go
@@ -0,0 +1,47 @@
+package nimblestudio
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StudioComponent_ActiveDirectoryConfiguration AWS CloudFormation Resource (AWS::NimbleStudio::StudioComponent.ActiveDirectoryConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-activedirectoryconfiguration.html
+type StudioComponent_ActiveDirectoryConfiguration struct {
+
+	// ComputerAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-activedirectoryconfiguration.html#cfn-nimblestudio-studiocomponent-activedirectoryconfiguration-computerattributes
+	ComputerAttributes []StudioComponent_ActiveDirectoryComputerAttribute `json:"ComputerAttributes,omitempty"`
+
+	// DirectoryId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-activedirectoryconfiguration.html#cfn-nimblestudio-studiocomponent-activedirectoryconfiguration-directoryid
+	DirectoryId *types.Value `json:"DirectoryId,omitempty"`
+
+	// OrganizationalUnitDistinguishedName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-activedirectoryconfiguration.html#cfn-nimblestudio-studiocomponent-activedirectoryconfiguration-organizationalunitdistinguishedname
+	OrganizationalUnitDistinguishedName *types.Value `json:"OrganizationalUnitDistinguishedName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StudioComponent_ActiveDirectoryConfiguration) AWSCloudFormationType() string {
+	return "AWS::NimbleStudio::StudioComponent.ActiveDirectoryConfiguration"
+}
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_computefarmconfiguration.go b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_computefarmconfiguration.go
new file mode 100644
index 0000000000..1afcf49706
--- /dev/null
+++ b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_computefarmconfiguration.go
@@ -0,0 +1,42 @@
+package nimblestudio
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StudioComponent_ComputeFarmConfiguration AWS CloudFormation Resource (AWS::NimbleStudio::StudioComponent.ComputeFarmConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-computefarmconfiguration.html
+type StudioComponent_ComputeFarmConfiguration struct {
+
+	// ActiveDirectoryUser AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-computefarmconfiguration.html#cfn-nimblestudio-studiocomponent-computefarmconfiguration-activedirectoryuser
+	ActiveDirectoryUser *types.Value `json:"ActiveDirectoryUser,omitempty"`
+
+	// Endpoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-computefarmconfiguration.html#cfn-nimblestudio-studiocomponent-computefarmconfiguration-endpoint
+	Endpoint *types.Value `json:"Endpoint,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StudioComponent_ComputeFarmConfiguration) AWSCloudFormationType() string {
+	return "AWS::NimbleStudio::StudioComponent.ComputeFarmConfiguration"
+}
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_licenseserviceconfiguration.go b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_licenseserviceconfiguration.go
new file mode 100644
index 0000000000..f88b920c57
--- /dev/null
+++ b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_licenseserviceconfiguration.go
@@ -0,0 +1,37 @@
+package nimblestudio
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StudioComponent_LicenseServiceConfiguration AWS CloudFormation Resource (AWS::NimbleStudio::StudioComponent.LicenseServiceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-licenseserviceconfiguration.html
+type StudioComponent_LicenseServiceConfiguration struct {
+
+	// Endpoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-licenseserviceconfiguration.html#cfn-nimblestudio-studiocomponent-licenseserviceconfiguration-endpoint
+	Endpoint *types.Value `json:"Endpoint,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StudioComponent_LicenseServiceConfiguration) AWSCloudFormationType() string {
+	return "AWS::NimbleStudio::StudioComponent.LicenseServiceConfiguration"
+}
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_scriptparameterkeyvalue.go b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_scriptparameterkeyvalue.go
new file mode 100644
index 0000000000..1e9d04b5f0
--- /dev/null
+++ b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_scriptparameterkeyvalue.go
@@ -0,0 +1,42 @@
+package nimblestudio
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StudioComponent_ScriptParameterKeyValue AWS CloudFormation Resource (AWS::NimbleStudio::StudioComponent.ScriptParameterKeyValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-scriptparameterkeyvalue.html
+type StudioComponent_ScriptParameterKeyValue struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-scriptparameterkeyvalue.html#cfn-nimblestudio-studiocomponent-scriptparameterkeyvalue-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-scriptparameterkeyvalue.html#cfn-nimblestudio-studiocomponent-scriptparameterkeyvalue-value
+	Value *types.Value `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 *StudioComponent_ScriptParameterKeyValue) AWSCloudFormationType() string {
+	return "AWS::NimbleStudio::StudioComponent.ScriptParameterKeyValue"
+}
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_sharedfilesystemconfiguration.go b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_sharedfilesystemconfiguration.go
new file mode 100644
index 0000000000..4a6a6d4b2a
--- /dev/null
+++ b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_sharedfilesystemconfiguration.go
@@ -0,0 +1,57 @@
+package nimblestudio
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StudioComponent_SharedFileSystemConfiguration AWS CloudFormation Resource (AWS::NimbleStudio::StudioComponent.SharedFileSystemConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-sharedfilesystemconfiguration.html
+type StudioComponent_SharedFileSystemConfiguration struct {
+
+	// Endpoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-sharedfilesystemconfiguration.html#cfn-nimblestudio-studiocomponent-sharedfilesystemconfiguration-endpoint
+	Endpoint *types.Value `json:"Endpoint,omitempty"`
+
+	// FileSystemId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-sharedfilesystemconfiguration.html#cfn-nimblestudio-studiocomponent-sharedfilesystemconfiguration-filesystemid
+	FileSystemId *types.Value `json:"FileSystemId,omitempty"`
+
+	// LinuxMountPoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-sharedfilesystemconfiguration.html#cfn-nimblestudio-studiocomponent-sharedfilesystemconfiguration-linuxmountpoint
+	LinuxMountPoint *types.Value `json:"LinuxMountPoint,omitempty"`
+
+	// ShareName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-sharedfilesystemconfiguration.html#cfn-nimblestudio-studiocomponent-sharedfilesystemconfiguration-sharename
+	ShareName *types.Value `json:"ShareName,omitempty"`
+
+	// WindowsMountDrive AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-sharedfilesystemconfiguration.html#cfn-nimblestudio-studiocomponent-sharedfilesystemconfiguration-windowsmountdrive
+	WindowsMountDrive *types.Value `json:"WindowsMountDrive,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StudioComponent_SharedFileSystemConfiguration) AWSCloudFormationType() string {
+	return "AWS::NimbleStudio::StudioComponent.SharedFileSystemConfiguration"
+}
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentconfiguration.go b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentconfiguration.go
new file mode 100644
index 0000000000..94725b501b
--- /dev/null
+++ b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentconfiguration.go
@@ -0,0 +1,50 @@
+package nimblestudio
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// StudioComponent_StudioComponentConfiguration AWS CloudFormation Resource (AWS::NimbleStudio::StudioComponent.StudioComponentConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-studiocomponentconfiguration.html
+type StudioComponent_StudioComponentConfiguration struct {
+
+	// ActiveDirectoryConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-studiocomponentconfiguration.html#cfn-nimblestudio-studiocomponent-studiocomponentconfiguration-activedirectoryconfiguration
+	ActiveDirectoryConfiguration *StudioComponent_ActiveDirectoryConfiguration `json:"ActiveDirectoryConfiguration,omitempty"`
+
+	// ComputeFarmConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-studiocomponentconfiguration.html#cfn-nimblestudio-studiocomponent-studiocomponentconfiguration-computefarmconfiguration
+	ComputeFarmConfiguration *StudioComponent_ComputeFarmConfiguration `json:"ComputeFarmConfiguration,omitempty"`
+
+	// LicenseServiceConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-studiocomponentconfiguration.html#cfn-nimblestudio-studiocomponent-studiocomponentconfiguration-licenseserviceconfiguration
+	LicenseServiceConfiguration *StudioComponent_LicenseServiceConfiguration `json:"LicenseServiceConfiguration,omitempty"`
+
+	// SharedFileSystemConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-studiocomponentconfiguration.html#cfn-nimblestudio-studiocomponent-studiocomponentconfiguration-sharedfilesystemconfiguration
+	SharedFileSystemConfiguration *StudioComponent_SharedFileSystemConfiguration `json:"SharedFileSystemConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StudioComponent_StudioComponentConfiguration) AWSCloudFormationType() string {
+	return "AWS::NimbleStudio::StudioComponent.StudioComponentConfiguration"
+}
diff --git a/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentinitializationscript.go b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentinitializationscript.go
new file mode 100644
index 0000000000..829d2b1e03
--- /dev/null
+++ b/goformation/cloudformation/nimblestudio/aws-nimblestudio-studiocomponent_studiocomponentinitializationscript.go
@@ -0,0 +1,52 @@
+package nimblestudio
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StudioComponent_StudioComponentInitializationScript AWS CloudFormation Resource (AWS::NimbleStudio::StudioComponent.StudioComponentInitializationScript)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-studiocomponentinitializationscript.html
+type StudioComponent_StudioComponentInitializationScript struct {
+
+	// LaunchProfileProtocolVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-studiocomponentinitializationscript.html#cfn-nimblestudio-studiocomponent-studiocomponentinitializationscript-launchprofileprotocolversion
+	LaunchProfileProtocolVersion *types.Value `json:"LaunchProfileProtocolVersion,omitempty"`
+
+	// Platform AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-studiocomponentinitializationscript.html#cfn-nimblestudio-studiocomponent-studiocomponentinitializationscript-platform
+	Platform *types.Value `json:"Platform,omitempty"`
+
+	// RunContext AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-studiocomponentinitializationscript.html#cfn-nimblestudio-studiocomponent-studiocomponentinitializationscript-runcontext
+	RunContext *types.Value `json:"RunContext,omitempty"`
+
+	// Script AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-nimblestudio-studiocomponent-studiocomponentinitializationscript.html#cfn-nimblestudio-studiocomponent-studiocomponentinitializationscript-script
+	Script *types.Value `json:"Script,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StudioComponent_StudioComponentInitializationScript) AWSCloudFormationType() string {
+	return "AWS::NimbleStudio::StudioComponent.StudioComponentInitializationScript"
+}
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain.go b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain.go
new file mode 100644
index 0000000000..d2dd19bf38
--- /dev/null
+++ b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain.go
@@ -0,0 +1,179 @@
+package opensearchservice
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain AWS CloudFormation Resource (AWS::OpenSearchService::Domain)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchservice-domain.html
+type Domain struct {
+
+	// AccessPolicies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchservice-domain.html#cfn-opensearchservice-domain-accesspolicies
+	AccessPolicies interface{} `json:"AccessPolicies,omitempty"`
+
+	// AdvancedOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchservice-domain.html#cfn-opensearchservice-domain-advancedoptions
+	AdvancedOptions map[string]*types.Value `json:"AdvancedOptions,omitempty"`
+
+	// AdvancedSecurityOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchservice-domain.html#cfn-opensearchservice-domain-advancedsecurityoptions
+	AdvancedSecurityOptions *Domain_AdvancedSecurityOptionsInput `json:"AdvancedSecurityOptions,omitempty"`
+
+	// ClusterConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchservice-domain.html#cfn-opensearchservice-domain-clusterconfig
+	ClusterConfig *Domain_ClusterConfig `json:"ClusterConfig,omitempty"`
+
+	// CognitoOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchservice-domain.html#cfn-opensearchservice-domain-cognitooptions
+	CognitoOptions *Domain_CognitoOptions `json:"CognitoOptions,omitempty"`
+
+	// DomainEndpointOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchservice-domain.html#cfn-opensearchservice-domain-domainendpointoptions
+	DomainEndpointOptions *Domain_DomainEndpointOptions `json:"DomainEndpointOptions,omitempty"`
+
+	// DomainName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchservice-domain.html#cfn-opensearchservice-domain-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// EBSOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchservice-domain.html#cfn-opensearchservice-domain-ebsoptions
+	EBSOptions *Domain_EBSOptions `json:"EBSOptions,omitempty"`
+
+	// EncryptionAtRestOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchservice-domain.html#cfn-opensearchservice-domain-encryptionatrestoptions
+	EncryptionAtRestOptions *Domain_EncryptionAtRestOptions `json:"EncryptionAtRestOptions,omitempty"`
+
+	// EngineVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchservice-domain.html#cfn-opensearchservice-domain-engineversion
+	EngineVersion *types.Value `json:"EngineVersion,omitempty"`
+
+	// LogPublishingOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchservice-domain.html#cfn-opensearchservice-domain-logpublishingoptions
+	LogPublishingOptions map[string]Domain_LogPublishingOption `json:"LogPublishingOptions,omitempty"`
+
+	// NodeToNodeEncryptionOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchservice-domain.html#cfn-opensearchservice-domain-nodetonodeencryptionoptions
+	NodeToNodeEncryptionOptions *Domain_NodeToNodeEncryptionOptions `json:"NodeToNodeEncryptionOptions,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
+	SnapshotOptions *Domain_SnapshotOptions `json:"SnapshotOptions,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchservice-domain.html#cfn-opensearchservice-domain-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VPCOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opensearchservice-domain.html#cfn-opensearchservice-domain-vpcoptions
+	VPCOptions *Domain_VPCOptions `json:"VPCOptions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::OpenSearchService::Domain"
+}
+
+// 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 Domain) MarshalJSON() ([]byte, error) {
+	type Properties Domain
+	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 *Domain) UnmarshalJSON(b []byte) error {
+	type Properties Domain
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Domain(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_advancedsecurityoptionsinput.go b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_advancedsecurityoptionsinput.go
new file mode 100644
index 0000000000..1f55ce650b
--- /dev/null
+++ b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_advancedsecurityoptionsinput.go
@@ -0,0 +1,47 @@
+package opensearchservice
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_AdvancedSecurityOptionsInput AWS CloudFormation Resource (AWS::OpenSearchService::Domain.AdvancedSecurityOptionsInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-advancedsecurityoptionsinput.html
+type Domain_AdvancedSecurityOptionsInput struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-advancedsecurityoptionsinput.html#cfn-opensearchservice-domain-advancedsecurityoptionsinput-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// InternalUserDatabaseEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-advancedsecurityoptionsinput.html#cfn-opensearchservice-domain-advancedsecurityoptionsinput-internaluserdatabaseenabled
+	InternalUserDatabaseEnabled *types.Value `json:"InternalUserDatabaseEnabled,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
+	MasterUserOptions *Domain_MasterUserOptions `json:"MasterUserOptions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AdvancedSecurityOptionsInput) AWSCloudFormationType() string {
+	return "AWS::OpenSearchService::Domain.AdvancedSecurityOptionsInput"
+}
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_clusterconfig.go b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_clusterconfig.go
new file mode 100644
index 0000000000..8f287f628b
--- /dev/null
+++ b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_clusterconfig.go
@@ -0,0 +1,82 @@
+package opensearchservice
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_ClusterConfig AWS CloudFormation Resource (AWS::OpenSearchService::Domain.ClusterConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-clusterconfig.html
+type Domain_ClusterConfig struct {
+
+	// DedicatedMasterCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-clusterconfig.html#cfn-opensearchservice-domain-clusterconfig-dedicatedmastercount
+	DedicatedMasterCount *types.Value `json:"DedicatedMasterCount,omitempty"`
+
+	// DedicatedMasterEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-clusterconfig.html#cfn-opensearchservice-domain-clusterconfig-dedicatedmasterenabled
+	DedicatedMasterEnabled *types.Value `json:"DedicatedMasterEnabled,omitempty"`
+
+	// DedicatedMasterType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-clusterconfig.html#cfn-opensearchservice-domain-clusterconfig-dedicatedmastertype
+	DedicatedMasterType *types.Value `json:"DedicatedMasterType,omitempty"`
+
+	// InstanceCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-clusterconfig.html#cfn-opensearchservice-domain-clusterconfig-instancecount
+	InstanceCount *types.Value `json:"InstanceCount,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-clusterconfig.html#cfn-opensearchservice-domain-clusterconfig-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// WarmCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-clusterconfig.html#cfn-opensearchservice-domain-clusterconfig-warmcount
+	WarmCount *types.Value `json:"WarmCount,omitempty"`
+
+	// WarmEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-clusterconfig.html#cfn-opensearchservice-domain-clusterconfig-warmenabled
+	WarmEnabled *types.Value `json:"WarmEnabled,omitempty"`
+
+	// WarmType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-clusterconfig.html#cfn-opensearchservice-domain-clusterconfig-warmtype
+	WarmType *types.Value `json:"WarmType,omitempty"`
+
+	// ZoneAwarenessConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-clusterconfig.html#cfn-opensearchservice-domain-clusterconfig-zoneawarenessconfig
+	ZoneAwarenessConfig *Domain_ZoneAwarenessConfig `json:"ZoneAwarenessConfig,omitempty"`
+
+	// ZoneAwarenessEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-clusterconfig.html#cfn-opensearchservice-domain-clusterconfig-zoneawarenessenabled
+	ZoneAwarenessEnabled *types.Value `json:"ZoneAwarenessEnabled,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ClusterConfig) AWSCloudFormationType() string {
+	return "AWS::OpenSearchService::Domain.ClusterConfig"
+}
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_cognitooptions.go b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_cognitooptions.go
new file mode 100644
index 0000000000..13df1dc124
--- /dev/null
+++ b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_cognitooptions.go
@@ -0,0 +1,52 @@
+package opensearchservice
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_CognitoOptions AWS CloudFormation Resource (AWS::OpenSearchService::Domain.CognitoOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-cognitooptions.html
+type Domain_CognitoOptions struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-cognitooptions.html#cfn-opensearchservice-domain-cognitooptions-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// IdentityPoolId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-cognitooptions.html#cfn-opensearchservice-domain-cognitooptions-identitypoolid
+	IdentityPoolId *types.Value `json:"IdentityPoolId,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-cognitooptions.html#cfn-opensearchservice-domain-cognitooptions-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// UserPoolId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-cognitooptions.html#cfn-opensearchservice-domain-cognitooptions-userpoolid
+	UserPoolId *types.Value `json:"UserPoolId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CognitoOptions) AWSCloudFormationType() string {
+	return "AWS::OpenSearchService::Domain.CognitoOptions"
+}
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_domainendpointoptions.go b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_domainendpointoptions.go
new file mode 100644
index 0000000000..66e0841b6d
--- /dev/null
+++ b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_domainendpointoptions.go
@@ -0,0 +1,57 @@
+package opensearchservice
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_DomainEndpointOptions AWS CloudFormation Resource (AWS::OpenSearchService::Domain.DomainEndpointOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-domainendpointoptions.html
+type Domain_DomainEndpointOptions struct {
+
+	// CustomEndpoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-domainendpointoptions.html#cfn-opensearchservice-domain-domainendpointoptions-customendpoint
+	CustomEndpoint *types.Value `json:"CustomEndpoint,omitempty"`
+
+	// CustomEndpointCertificateArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-domainendpointoptions.html#cfn-opensearchservice-domain-domainendpointoptions-customendpointcertificatearn
+	CustomEndpointCertificateArn *types.Value `json:"CustomEndpointCertificateArn,omitempty"`
+
+	// CustomEndpointEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-domainendpointoptions.html#cfn-opensearchservice-domain-domainendpointoptions-customendpointenabled
+	CustomEndpointEnabled *types.Value `json:"CustomEndpointEnabled,omitempty"`
+
+	// EnforceHTTPS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-domainendpointoptions.html#cfn-opensearchservice-domain-domainendpointoptions-enforcehttps
+	EnforceHTTPS *types.Value `json:"EnforceHTTPS,omitempty"`
+
+	// TLSSecurityPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-domainendpointoptions.html#cfn-opensearchservice-domain-domainendpointoptions-tlssecuritypolicy
+	TLSSecurityPolicy *types.Value `json:"TLSSecurityPolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DomainEndpointOptions) AWSCloudFormationType() string {
+	return "AWS::OpenSearchService::Domain.DomainEndpointOptions"
+}
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_ebsoptions.go b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_ebsoptions.go
new file mode 100644
index 0000000000..f8a03af634
--- /dev/null
+++ b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_ebsoptions.go
@@ -0,0 +1,52 @@
+package opensearchservice
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_EBSOptions AWS CloudFormation Resource (AWS::OpenSearchService::Domain.EBSOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-ebsoptions.html
+type Domain_EBSOptions struct {
+
+	// EBSEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-ebsoptions.html#cfn-opensearchservice-domain-ebsoptions-ebsenabled
+	EBSEnabled *types.Value `json:"EBSEnabled,omitempty"`
+
+	// Iops AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-ebsoptions.html#cfn-opensearchservice-domain-ebsoptions-iops
+	Iops *types.Value `json:"Iops,omitempty"`
+
+	// VolumeSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-ebsoptions.html#cfn-opensearchservice-domain-ebsoptions-volumesize
+	VolumeSize *types.Value `json:"VolumeSize,omitempty"`
+
+	// VolumeType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-ebsoptions.html#cfn-opensearchservice-domain-ebsoptions-volumetype
+	VolumeType *types.Value `json:"VolumeType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EBSOptions) AWSCloudFormationType() string {
+	return "AWS::OpenSearchService::Domain.EBSOptions"
+}
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_encryptionatrestoptions.go b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_encryptionatrestoptions.go
new file mode 100644
index 0000000000..a2be8796f9
--- /dev/null
+++ b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_encryptionatrestoptions.go
@@ -0,0 +1,42 @@
+package opensearchservice
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_EncryptionAtRestOptions AWS CloudFormation Resource (AWS::OpenSearchService::Domain.EncryptionAtRestOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-encryptionatrestoptions.html
+type Domain_EncryptionAtRestOptions struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-encryptionatrestoptions.html#cfn-opensearchservice-domain-encryptionatrestoptions-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-encryptionatrestoptions.html#cfn-opensearchservice-domain-encryptionatrestoptions-kmskeyid
+	KmsKeyId *types.Value `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 *Domain_EncryptionAtRestOptions) AWSCloudFormationType() string {
+	return "AWS::OpenSearchService::Domain.EncryptionAtRestOptions"
+}
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_logpublishingoption.go b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_logpublishingoption.go
new file mode 100644
index 0000000000..a1769fff17
--- /dev/null
+++ b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_logpublishingoption.go
@@ -0,0 +1,42 @@
+package opensearchservice
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_LogPublishingOption AWS CloudFormation Resource (AWS::OpenSearchService::Domain.LogPublishingOption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-logpublishingoption.html
+type Domain_LogPublishingOption struct {
+
+	// CloudWatchLogsLogGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-logpublishingoption.html#cfn-opensearchservice-domain-logpublishingoption-cloudwatchlogsloggrouparn
+	CloudWatchLogsLogGroupArn *types.Value `json:"CloudWatchLogsLogGroupArn,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-logpublishingoption.html#cfn-opensearchservice-domain-logpublishingoption-enabled
+	Enabled *types.Value `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 *Domain_LogPublishingOption) AWSCloudFormationType() string {
+	return "AWS::OpenSearchService::Domain.LogPublishingOption"
+}
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_masteruseroptions.go b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_masteruseroptions.go
new file mode 100644
index 0000000000..b511f56c19
--- /dev/null
+++ b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_masteruseroptions.go
@@ -0,0 +1,47 @@
+package opensearchservice
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_MasterUserOptions AWS CloudFormation Resource (AWS::OpenSearchService::Domain.MasterUserOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-masteruseroptions.html
+type Domain_MasterUserOptions struct {
+
+	// MasterUserARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-masteruseroptions.html#cfn-opensearchservice-domain-masteruseroptions-masteruserarn
+	MasterUserARN *types.Value `json:"MasterUserARN,omitempty"`
+
+	// MasterUserName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-masteruseroptions.html#cfn-opensearchservice-domain-masteruseroptions-masterusername
+	MasterUserName *types.Value `json:"MasterUserName,omitempty"`
+
+	// MasterUserPassword AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-masteruseroptions.html#cfn-opensearchservice-domain-masteruseroptions-masteruserpassword
+	MasterUserPassword *types.Value `json:"MasterUserPassword,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_MasterUserOptions) AWSCloudFormationType() string {
+	return "AWS::OpenSearchService::Domain.MasterUserOptions"
+}
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_nodetonodeencryptionoptions.go b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_nodetonodeencryptionoptions.go
new file mode 100644
index 0000000000..2d740416da
--- /dev/null
+++ b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_nodetonodeencryptionoptions.go
@@ -0,0 +1,37 @@
+package opensearchservice
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_NodeToNodeEncryptionOptions AWS CloudFormation Resource (AWS::OpenSearchService::Domain.NodeToNodeEncryptionOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-nodetonodeencryptionoptions.html
+type Domain_NodeToNodeEncryptionOptions struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-nodetonodeencryptionoptions.html#cfn-opensearchservice-domain-nodetonodeencryptionoptions-enabled
+	Enabled *types.Value `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 *Domain_NodeToNodeEncryptionOptions) AWSCloudFormationType() string {
+	return "AWS::OpenSearchService::Domain.NodeToNodeEncryptionOptions"
+}
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_snapshotoptions.go b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_snapshotoptions.go
new file mode 100644
index 0000000000..c86b2ec314
--- /dev/null
+++ b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_snapshotoptions.go
@@ -0,0 +1,37 @@
+package opensearchservice
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_SnapshotOptions AWS CloudFormation Resource (AWS::OpenSearchService::Domain.SnapshotOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-snapshotoptions.html
+type Domain_SnapshotOptions struct {
+
+	// AutomatedSnapshotStartHour AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-snapshotoptions.html#cfn-opensearchservice-domain-snapshotoptions-automatedsnapshotstarthour
+	AutomatedSnapshotStartHour *types.Value `json:"AutomatedSnapshotStartHour,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SnapshotOptions) AWSCloudFormationType() string {
+	return "AWS::OpenSearchService::Domain.SnapshotOptions"
+}
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_vpcoptions.go b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_vpcoptions.go
new file mode 100644
index 0000000000..53827844bb
--- /dev/null
+++ b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_vpcoptions.go
@@ -0,0 +1,42 @@
+package opensearchservice
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_VPCOptions AWS CloudFormation Resource (AWS::OpenSearchService::Domain.VPCOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-vpcoptions.html
+type Domain_VPCOptions struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-vpcoptions.html#cfn-opensearchservice-domain-vpcoptions-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-vpcoptions.html#cfn-opensearchservice-domain-vpcoptions-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Domain_VPCOptions) AWSCloudFormationType() string {
+	return "AWS::OpenSearchService::Domain.VPCOptions"
+}
diff --git a/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_zoneawarenessconfig.go b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_zoneawarenessconfig.go
new file mode 100644
index 0000000000..886605b7a8
--- /dev/null
+++ b/goformation/cloudformation/opensearchservice/aws-opensearchservice-domain_zoneawarenessconfig.go
@@ -0,0 +1,37 @@
+package opensearchservice
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_ZoneAwarenessConfig AWS CloudFormation Resource (AWS::OpenSearchService::Domain.ZoneAwarenessConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-zoneawarenessconfig.html
+type Domain_ZoneAwarenessConfig struct {
+
+	// AvailabilityZoneCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opensearchservice-domain-zoneawarenessconfig.html#cfn-opensearchservice-domain-zoneawarenessconfig-availabilityzonecount
+	AvailabilityZoneCount *types.Value `json:"AvailabilityZoneCount,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ZoneAwarenessConfig) AWSCloudFormationType() string {
+	return "AWS::OpenSearchService::Domain.ZoneAwarenessConfig"
+}
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-app.go b/goformation/cloudformation/opsworks/aws-opsworks-app.go
new file mode 100644
index 0000000000..8166b2068c
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-app.go
@@ -0,0 +1,163 @@
+package opsworks
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// App AWS CloudFormation Resource (AWS::OpsWorks::App)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html
+type App struct {
+
+	// AppSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-appsource
+	AppSource *App_Source `json:"AppSource,omitempty"`
+
+	// Attributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-attributes
+	Attributes map[string]*types.Value `json:"Attributes,omitempty"`
+
+	// DataSources AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-datasources
+	DataSources []App_DataSource `json:"DataSources,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Domains AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-domains
+	Domains *types.Value `json:"Domains,omitempty"`
+
+	// EnableSsl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-enablessl
+	EnableSsl *types.Value `json:"EnableSsl,omitempty"`
+
+	// Environment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-environment
+	Environment []App_EnvironmentVariable `json:"Environment,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Shortname AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-shortname
+	Shortname *types.Value `json:"Shortname,omitempty"`
+
+	// SslConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-sslconfiguration
+	SslConfiguration *App_SslConfiguration `json:"SslConfiguration,omitempty"`
+
+	// StackId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-stackid
+	StackId *types.Value `json:"StackId,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-app.html#cfn-opsworks-app-type
+	Type *types.Value `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) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::App"
+}
+
+// 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 App) MarshalJSON() ([]byte, error) {
+	type Properties App
+	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 *App) UnmarshalJSON(b []byte) error {
+	type Properties App
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = App(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/opsworks/aws-opsworks-app_datasource.go b/goformation/cloudformation/opsworks/aws-opsworks-app_datasource.go
new file mode 100644
index 0000000000..fab1e5c036
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-app_datasource.go
@@ -0,0 +1,47 @@
+package opsworks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// App_DataSource AWS CloudFormation Resource (AWS::OpsWorks::App.DataSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-datasource.html
+type App_DataSource struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-datasource.html#cfn-opsworks-app-datasource-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-datasource.html#cfn-opsworks-app-datasource-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-datasource.html#cfn-opsworks-app-datasource-type
+	Type *types.Value `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_DataSource) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::App.DataSource"
+}
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-app_environmentvariable.go b/goformation/cloudformation/opsworks/aws-opsworks-app_environmentvariable.go
new file mode 100644
index 0000000000..4c357f32b3
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-app_environmentvariable.go
@@ -0,0 +1,47 @@
+package opsworks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// App_EnvironmentVariable AWS CloudFormation Resource (AWS::OpsWorks::App.EnvironmentVariable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-environment.html
+type App_EnvironmentVariable struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-environment.html#cfn-opsworks-app-environment-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Secure AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-environment.html#cfn-opsworks-app-environment-secure
+	Secure *types.Value `json:"Secure,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-environment.html#value
+	Value *types.Value `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 *App_EnvironmentVariable) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::App.EnvironmentVariable"
+}
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-app_source.go b/goformation/cloudformation/opsworks/aws-opsworks-app_source.go
new file mode 100644
index 0000000000..5bc81dcdc4
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-app_source.go
@@ -0,0 +1,62 @@
+package opsworks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// App_Source AWS CloudFormation Resource (AWS::OpsWorks::App.Source)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html
+type App_Source struct {
+
+	// Password AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-pw
+	Password *types.Value `json:"Password,omitempty"`
+
+	// Revision AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-revision
+	Revision *types.Value `json:"Revision,omitempty"`
+
+	// SshKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-sshkey
+	SshKey *types.Value `json:"SshKey,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-username
+	Username *types.Value `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 *App_Source) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::App.Source"
+}
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-app_sslconfiguration.go b/goformation/cloudformation/opsworks/aws-opsworks-app_sslconfiguration.go
new file mode 100644
index 0000000000..6fa3cd2029
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-app_sslconfiguration.go
@@ -0,0 +1,47 @@
+package opsworks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// App_SslConfiguration AWS CloudFormation Resource (AWS::OpsWorks::App.SslConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-sslconfiguration.html
+type App_SslConfiguration struct {
+
+	// Certificate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-sslconfiguration.html#cfn-opsworks-app-sslconfig-certificate
+	Certificate *types.Value `json:"Certificate,omitempty"`
+
+	// Chain AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-sslconfiguration.html#cfn-opsworks-app-sslconfig-chain
+	Chain *types.Value `json:"Chain,omitempty"`
+
+	// PrivateKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-app-sslconfiguration.html#cfn-opsworks-app-sslconfig-privatekey
+	PrivateKey *types.Value `json:"PrivateKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SslConfiguration) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::App.SslConfiguration"
+}
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-elasticloadbalancerattachment.go b/goformation/cloudformation/opsworks/aws-opsworks-elasticloadbalancerattachment.go
new file mode 100644
index 0000000000..6c41c7c046
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-elasticloadbalancerattachment.go
@@ -0,0 +1,113 @@
+package opsworks
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ElasticLoadBalancerAttachment AWS CloudFormation Resource (AWS::OpsWorks::ElasticLoadBalancerAttachment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-elbattachment.html
+type ElasticLoadBalancerAttachment struct {
+
+	// ElasticLoadBalancerName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-elbattachment.html#cfn-opsworks-elbattachment-elbname
+	ElasticLoadBalancerName *types.Value `json:"ElasticLoadBalancerName,omitempty"`
+
+	// LayerId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-elbattachment.html#cfn-opsworks-elbattachment-layerid
+	LayerId *types.Value `json:"LayerId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ElasticLoadBalancerAttachment) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::ElasticLoadBalancerAttachment"
+}
+
+// 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 ElasticLoadBalancerAttachment) MarshalJSON() ([]byte, error) {
+	type Properties ElasticLoadBalancerAttachment
+	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 *ElasticLoadBalancerAttachment) UnmarshalJSON(b []byte) error {
+	type Properties ElasticLoadBalancerAttachment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ElasticLoadBalancerAttachment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/opsworks/aws-opsworks-instance.go b/goformation/cloudformation/opsworks/aws-opsworks-instance.go
new file mode 100644
index 0000000000..78b0631b28
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-instance.go
@@ -0,0 +1,208 @@
+package opsworks
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance AWS CloudFormation Resource (AWS::OpsWorks::Instance)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html
+type Instance struct {
+
+	// AgentVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-agentversion
+	AgentVersion *types.Value `json:"AgentVersion,omitempty"`
+
+	// AmiId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-amiid
+	AmiId *types.Value `json:"AmiId,omitempty"`
+
+	// Architecture AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-architecture
+	Architecture *types.Value `json:"Architecture,omitempty"`
+
+	// AutoScalingType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-autoscalingtype
+	AutoScalingType *types.Value `json:"AutoScalingType,omitempty"`
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// BlockDeviceMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-blockdevicemappings
+	BlockDeviceMappings []Instance_BlockDeviceMapping `json:"BlockDeviceMappings,omitempty"`
+
+	// EbsOptimized AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-ebsoptimized
+	EbsOptimized *types.Value `json:"EbsOptimized,omitempty"`
+
+	// ElasticIps AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-elasticips
+	ElasticIps *types.Value `json:"ElasticIps,omitempty"`
+
+	// Hostname AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-hostname
+	Hostname *types.Value `json:"Hostname,omitempty"`
+
+	// InstallUpdatesOnBoot AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-installupdatesonboot
+	InstallUpdatesOnBoot *types.Value `json:"InstallUpdatesOnBoot,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// LayerIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-layerids
+	LayerIds *types.Value `json:"LayerIds,omitempty"`
+
+	// Os AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-os
+	Os *types.Value `json:"Os,omitempty"`
+
+	// RootDeviceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-rootdevicetype
+	RootDeviceType *types.Value `json:"RootDeviceType,omitempty"`
+
+	// SshKeyName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-sshkeyname
+	SshKeyName *types.Value `json:"SshKeyName,omitempty"`
+
+	// StackId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-stackid
+	StackId *types.Value `json:"StackId,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// Tenancy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-tenancy
+	Tenancy *types.Value `json:"Tenancy,omitempty"`
+
+	// TimeBasedAutoScaling AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-timebasedautoscaling
+	TimeBasedAutoScaling *Instance_TimeBasedAutoScaling `json:"TimeBasedAutoScaling,omitempty"`
+
+	// VirtualizationType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-virtualizationtype
+	VirtualizationType *types.Value `json:"VirtualizationType,omitempty"`
+
+	// Volumes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-instance.html#cfn-opsworks-instance-volumes
+	Volumes *types.Value `json:"Volumes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::OpsWorks::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/opsworks/aws-opsworks-instance_blockdevicemapping.go b/goformation/cloudformation/opsworks/aws-opsworks-instance_blockdevicemapping.go
new file mode 100644
index 0000000000..79a6b0b9ed
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-instance_blockdevicemapping.go
@@ -0,0 +1,52 @@
+package opsworks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_BlockDeviceMapping AWS CloudFormation Resource (AWS::OpsWorks::Instance.BlockDeviceMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-blockdevicemapping.html
+type Instance_BlockDeviceMapping struct {
+
+	// DeviceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-blockdevicemapping.html#cfn-opsworks-instance-blockdevicemapping-devicename
+	DeviceName *types.Value `json:"DeviceName,omitempty"`
+
+	// Ebs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-blockdevicemapping.html#cfn-opsworks-instance-blockdevicemapping-ebs
+	Ebs *Instance_EbsBlockDevice `json:"Ebs,omitempty"`
+
+	// NoDevice AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-blockdevicemapping.html#cfn-opsworks-instance-blockdevicemapping-nodevice
+	NoDevice *types.Value `json:"NoDevice,omitempty"`
+
+	// VirtualName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-blockdevicemapping.html#cfn-opsworks-instance-blockdevicemapping-virtualname
+	VirtualName *types.Value `json:"VirtualName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_BlockDeviceMapping) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::Instance.BlockDeviceMapping"
+}
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-instance_ebsblockdevice.go b/goformation/cloudformation/opsworks/aws-opsworks-instance_ebsblockdevice.go
new file mode 100644
index 0000000000..b29a88d166
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-instance_ebsblockdevice.go
@@ -0,0 +1,57 @@
+package opsworks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_EbsBlockDevice AWS CloudFormation Resource (AWS::OpsWorks::Instance.EbsBlockDevice)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-ebsblockdevice.html
+type Instance_EbsBlockDevice struct {
+
+	// DeleteOnTermination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-ebsblockdevice.html#cfn-opsworks-instance-ebsblockdevice-deleteontermination
+	DeleteOnTermination *types.Value `json:"DeleteOnTermination,omitempty"`
+
+	// Iops AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-ebsblockdevice.html#cfn-opsworks-instance-ebsblockdevice-iops
+	Iops *types.Value `json:"Iops,omitempty"`
+
+	// SnapshotId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-ebsblockdevice.html#cfn-opsworks-instance-ebsblockdevice-snapshotid
+	SnapshotId *types.Value `json:"SnapshotId,omitempty"`
+
+	// VolumeSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-ebsblockdevice.html#cfn-opsworks-instance-ebsblockdevice-volumesize
+	VolumeSize *types.Value `json:"VolumeSize,omitempty"`
+
+	// VolumeType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-ebsblockdevice.html#cfn-opsworks-instance-ebsblockdevice-volumetype
+	VolumeType *types.Value `json:"VolumeType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EbsBlockDevice) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::Instance.EbsBlockDevice"
+}
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-instance_timebasedautoscaling.go b/goformation/cloudformation/opsworks/aws-opsworks-instance_timebasedautoscaling.go
new file mode 100644
index 0000000000..3cf533f99f
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-instance_timebasedautoscaling.go
@@ -0,0 +1,67 @@
+package opsworks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance_TimeBasedAutoScaling AWS CloudFormation Resource (AWS::OpsWorks::Instance.TimeBasedAutoScaling)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-timebasedautoscaling.html
+type Instance_TimeBasedAutoScaling struct {
+
+	// Friday AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-timebasedautoscaling.html#cfn-opsworks-instance-timebasedautoscaling-friday
+	Friday map[string]*types.Value `json:"Friday,omitempty"`
+
+	// Monday AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-timebasedautoscaling.html#cfn-opsworks-instance-timebasedautoscaling-monday
+	Monday map[string]*types.Value `json:"Monday,omitempty"`
+
+	// Saturday AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-timebasedautoscaling.html#cfn-opsworks-instance-timebasedautoscaling-saturday
+	Saturday map[string]*types.Value `json:"Saturday,omitempty"`
+
+	// Sunday AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-timebasedautoscaling.html#cfn-opsworks-instance-timebasedautoscaling-sunday
+	Sunday map[string]*types.Value `json:"Sunday,omitempty"`
+
+	// Thursday AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-timebasedautoscaling.html#cfn-opsworks-instance-timebasedautoscaling-thursday
+	Thursday map[string]*types.Value `json:"Thursday,omitempty"`
+
+	// Tuesday AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-timebasedautoscaling.html#cfn-opsworks-instance-timebasedautoscaling-tuesday
+	Tuesday map[string]*types.Value `json:"Tuesday,omitempty"`
+
+	// Wednesday AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-instance-timebasedautoscaling.html#cfn-opsworks-instance-timebasedautoscaling-wednesday
+	Wednesday map[string]*types.Value `json:"Wednesday,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TimeBasedAutoScaling) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::Instance.TimeBasedAutoScaling"
+}
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-layer.go b/goformation/cloudformation/opsworks/aws-opsworks-layer.go
new file mode 100644
index 0000000000..de0552f6f6
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-layer.go
@@ -0,0 +1,199 @@
+package opsworks
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Layer AWS CloudFormation Resource (AWS::OpsWorks::Layer)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html
+type Layer struct {
+
+	// Attributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-attributes
+	Attributes map[string]*types.Value `json:"Attributes,omitempty"`
+
+	// AutoAssignElasticIps AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-autoassignelasticips
+	AutoAssignElasticIps *types.Value `json:"AutoAssignElasticIps"`
+
+	// AutoAssignPublicIps AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-autoassignpublicips
+	AutoAssignPublicIps *types.Value `json:"AutoAssignPublicIps"`
+
+	// CustomInstanceProfileArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-custominstanceprofilearn
+	CustomInstanceProfileArn *types.Value `json:"CustomInstanceProfileArn,omitempty"`
+
+	// CustomJson AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-customjson
+	CustomJson interface{} `json:"CustomJson,omitempty"`
+
+	// CustomRecipes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-customrecipes
+	CustomRecipes *Layer_Recipes `json:"CustomRecipes,omitempty"`
+
+	// CustomSecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-customsecuritygroupids
+	CustomSecurityGroupIds *types.Value `json:"CustomSecurityGroupIds,omitempty"`
+
+	// EnableAutoHealing AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-enableautohealing
+	EnableAutoHealing *types.Value `json:"EnableAutoHealing"`
+
+	// InstallUpdatesOnBoot AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-installupdatesonboot
+	InstallUpdatesOnBoot *types.Value `json:"InstallUpdatesOnBoot,omitempty"`
+
+	// LifecycleEventConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-lifecycleeventconfiguration
+	LifecycleEventConfiguration *Layer_LifecycleEventConfiguration `json:"LifecycleEventConfiguration,omitempty"`
+
+	// LoadBasedAutoScaling AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-loadbasedautoscaling
+	LoadBasedAutoScaling *Layer_LoadBasedAutoScaling `json:"LoadBasedAutoScaling,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Packages AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-packages
+	Packages *types.Value `json:"Packages,omitempty"`
+
+	// Shortname AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-shortname
+	Shortname *types.Value `json:"Shortname,omitempty"`
+
+	// StackId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-stackid
+	StackId *types.Value `json:"StackId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// UseEbsOptimizedInstances AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-useebsoptimizedinstances
+	UseEbsOptimizedInstances *types.Value `json:"UseEbsOptimizedInstances,omitempty"`
+
+	// VolumeConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-layer.html#cfn-opsworks-layer-volumeconfigurations
+	VolumeConfigurations []Layer_VolumeConfiguration `json:"VolumeConfigurations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Layer) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::Layer"
+}
+
+// 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 Layer) MarshalJSON() ([]byte, error) {
+	type Properties Layer
+	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 *Layer) UnmarshalJSON(b []byte) error {
+	type Properties Layer
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Layer(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/opsworks/aws-opsworks-layer_autoscalingthresholds.go b/goformation/cloudformation/opsworks/aws-opsworks-layer_autoscalingthresholds.go
new file mode 100644
index 0000000000..5f6d809a53
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-layer_autoscalingthresholds.go
@@ -0,0 +1,62 @@
+package opsworks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Layer_AutoScalingThresholds AWS CloudFormation Resource (AWS::OpsWorks::Layer.AutoScalingThresholds)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling-autoscalingthresholds.html
+type Layer_AutoScalingThresholds struct {
+
+	// CpuThreshold AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling-autoscalingthresholds.html#cfn-opsworks-layer-loadbasedautoscaling-autoscalingthresholds-cputhreshold
+	CpuThreshold *types.Value `json:"CpuThreshold,omitempty"`
+
+	// IgnoreMetricsTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling-autoscalingthresholds.html#cfn-opsworks-layer-loadbasedautoscaling-autoscalingthresholds-ignoremetricstime
+	IgnoreMetricsTime *types.Value `json:"IgnoreMetricsTime,omitempty"`
+
+	// InstanceCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling-autoscalingthresholds.html#cfn-opsworks-layer-loadbasedautoscaling-autoscalingthresholds-instancecount
+	InstanceCount *types.Value `json:"InstanceCount,omitempty"`
+
+	// LoadThreshold AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling-autoscalingthresholds.html#cfn-opsworks-layer-loadbasedautoscaling-autoscalingthresholds-loadthreshold
+	LoadThreshold *types.Value `json:"LoadThreshold,omitempty"`
+
+	// MemoryThreshold AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling-autoscalingthresholds.html#cfn-opsworks-layer-loadbasedautoscaling-autoscalingthresholds-memorythreshold
+	MemoryThreshold *types.Value `json:"MemoryThreshold,omitempty"`
+
+	// ThresholdsWaitTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling-autoscalingthresholds.html#cfn-opsworks-layer-loadbasedautoscaling-autoscalingthresholds-thresholdwaittime
+	ThresholdsWaitTime *types.Value `json:"ThresholdsWaitTime,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Layer_AutoScalingThresholds) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::Layer.AutoScalingThresholds"
+}
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-layer_lifecycleeventconfiguration.go b/goformation/cloudformation/opsworks/aws-opsworks-layer_lifecycleeventconfiguration.go
new file mode 100644
index 0000000000..e68b5c89ba
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-layer_lifecycleeventconfiguration.go
@@ -0,0 +1,35 @@
+package opsworks
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Layer_LifecycleEventConfiguration AWS CloudFormation Resource (AWS::OpsWorks::Layer.LifecycleEventConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-lifecycleeventconfiguration.html
+type Layer_LifecycleEventConfiguration struct {
+
+	// ShutdownEventConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-lifecycleeventconfiguration.html#cfn-opsworks-layer-lifecycleconfiguration-shutdowneventconfiguration
+	ShutdownEventConfiguration *Layer_ShutdownEventConfiguration `json:"ShutdownEventConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Layer_LifecycleEventConfiguration) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::Layer.LifecycleEventConfiguration"
+}
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-layer_loadbasedautoscaling.go b/goformation/cloudformation/opsworks/aws-opsworks-layer_loadbasedautoscaling.go
new file mode 100644
index 0000000000..1ff63dd761
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-layer_loadbasedautoscaling.go
@@ -0,0 +1,47 @@
+package opsworks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Layer_LoadBasedAutoScaling AWS CloudFormation Resource (AWS::OpsWorks::Layer.LoadBasedAutoScaling)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling.html
+type Layer_LoadBasedAutoScaling struct {
+
+	// DownScaling AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling.html#cfn-opsworks-layer-loadbasedautoscaling-downscaling
+	DownScaling *Layer_AutoScalingThresholds `json:"DownScaling,omitempty"`
+
+	// Enable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling.html#cfn-opsworks-layer-loadbasedautoscaling-enable
+	Enable *types.Value `json:"Enable,omitempty"`
+
+	// UpScaling AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-loadbasedautoscaling.html#cfn-opsworks-layer-loadbasedautoscaling-upscaling
+	UpScaling *Layer_AutoScalingThresholds `json:"UpScaling,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Layer_LoadBasedAutoScaling) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::Layer.LoadBasedAutoScaling"
+}
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-layer_recipes.go b/goformation/cloudformation/opsworks/aws-opsworks-layer_recipes.go
new file mode 100644
index 0000000000..cd499e7aee
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-layer_recipes.go
@@ -0,0 +1,57 @@
+package opsworks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Layer_Recipes AWS CloudFormation Resource (AWS::OpsWorks::Layer.Recipes)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-recipes.html
+type Layer_Recipes struct {
+
+	// Configure AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-recipes.html#cfn-opsworks-layer-customrecipes-configure
+	Configure *types.Value `json:"Configure,omitempty"`
+
+	// Deploy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-recipes.html#cfn-opsworks-layer-customrecipes-deploy
+	Deploy *types.Value `json:"Deploy,omitempty"`
+
+	// Setup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-recipes.html#cfn-opsworks-layer-customrecipes-setup
+	Setup *types.Value `json:"Setup,omitempty"`
+
+	// Shutdown AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-recipes.html#cfn-opsworks-layer-customrecipes-shutdown
+	Shutdown *types.Value `json:"Shutdown,omitempty"`
+
+	// Undeploy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-recipes.html#cfn-opsworks-layer-customrecipes-undeploy
+	Undeploy *types.Value `json:"Undeploy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Layer_Recipes) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::Layer.Recipes"
+}
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-layer_shutdowneventconfiguration.go b/goformation/cloudformation/opsworks/aws-opsworks-layer_shutdowneventconfiguration.go
new file mode 100644
index 0000000000..6aa2dd7ca1
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-layer_shutdowneventconfiguration.go
@@ -0,0 +1,42 @@
+package opsworks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Layer_ShutdownEventConfiguration AWS CloudFormation Resource (AWS::OpsWorks::Layer.ShutdownEventConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-lifecycleeventconfiguration-shutdowneventconfiguration.html
+type Layer_ShutdownEventConfiguration struct {
+
+	// DelayUntilElbConnectionsDrained AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-lifecycleeventconfiguration-shutdowneventconfiguration.html#cfn-opsworks-layer-lifecycleconfiguration-shutdowneventconfiguration-delayuntilelbconnectionsdrained
+	DelayUntilElbConnectionsDrained *types.Value `json:"DelayUntilElbConnectionsDrained,omitempty"`
+
+	// ExecutionTimeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-lifecycleeventconfiguration-shutdowneventconfiguration.html#cfn-opsworks-layer-lifecycleconfiguration-shutdowneventconfiguration-executiontimeout
+	ExecutionTimeout *types.Value `json:"ExecutionTimeout,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Layer_ShutdownEventConfiguration) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::Layer.ShutdownEventConfiguration"
+}
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-layer_volumeconfiguration.go b/goformation/cloudformation/opsworks/aws-opsworks-layer_volumeconfiguration.go
new file mode 100644
index 0000000000..051b7a9b29
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-layer_volumeconfiguration.go
@@ -0,0 +1,67 @@
+package opsworks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Layer_VolumeConfiguration AWS CloudFormation Resource (AWS::OpsWorks::Layer.VolumeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-volumeconfiguration.html
+type Layer_VolumeConfiguration struct {
+
+	// Encrypted AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-volumeconfiguration.html#cfn-opsworks-layer-volumeconfiguration-encrypted
+	Encrypted *types.Value `json:"Encrypted,omitempty"`
+
+	// Iops AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-volumeconfiguration.html#cfn-opsworks-layer-volconfig-iops
+	Iops *types.Value `json:"Iops,omitempty"`
+
+	// MountPoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-volumeconfiguration.html#cfn-opsworks-layer-volconfig-mountpoint
+	MountPoint *types.Value `json:"MountPoint,omitempty"`
+
+	// NumberOfDisks AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-volumeconfiguration.html#cfn-opsworks-layer-volconfig-numberofdisks
+	NumberOfDisks *types.Value `json:"NumberOfDisks,omitempty"`
+
+	// RaidLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-volumeconfiguration.html#cfn-opsworks-layer-volconfig-raidlevel
+	RaidLevel *types.Value `json:"RaidLevel,omitempty"`
+
+	// Size AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-volumeconfiguration.html#cfn-opsworks-layer-volconfig-size
+	Size *types.Value `json:"Size,omitempty"`
+
+	// VolumeType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-layer-volumeconfiguration.html#cfn-opsworks-layer-volconfig-volumetype
+	VolumeType *types.Value `json:"VolumeType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Layer_VolumeConfiguration) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::Layer.VolumeConfiguration"
+}
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-stack.go b/goformation/cloudformation/opsworks/aws-opsworks-stack.go
new file mode 100644
index 0000000000..f60611fb57
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-stack.go
@@ -0,0 +1,229 @@
+package opsworks
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stack AWS CloudFormation Resource (AWS::OpsWorks::Stack)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html
+type Stack struct {
+
+	// AgentVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-agentversion
+	AgentVersion *types.Value `json:"AgentVersion,omitempty"`
+
+	// Attributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-attributes
+	Attributes map[string]*types.Value `json:"Attributes,omitempty"`
+
+	// ChefConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-chefconfiguration
+	ChefConfiguration *Stack_ChefConfiguration `json:"ChefConfiguration,omitempty"`
+
+	// CloneAppIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-cloneappids
+	CloneAppIds *types.Value `json:"CloneAppIds,omitempty"`
+
+	// ClonePermissions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-clonepermissions
+	ClonePermissions *types.Value `json:"ClonePermissions,omitempty"`
+
+	// ConfigurationManager AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-configmanager
+	ConfigurationManager *Stack_StackConfigurationManager `json:"ConfigurationManager,omitempty"`
+
+	// CustomCookbooksSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-custcookbooksource
+	CustomCookbooksSource *Stack_Source `json:"CustomCookbooksSource,omitempty"`
+
+	// CustomJson AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-custjson
+	CustomJson interface{} `json:"CustomJson,omitempty"`
+
+	// DefaultAvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-defaultaz
+	DefaultAvailabilityZone *types.Value `json:"DefaultAvailabilityZone,omitempty"`
+
+	// DefaultInstanceProfileArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-defaultinstanceprof
+	DefaultInstanceProfileArn *types.Value `json:"DefaultInstanceProfileArn,omitempty"`
+
+	// DefaultOs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-defaultos
+	DefaultOs *types.Value `json:"DefaultOs,omitempty"`
+
+	// DefaultRootDeviceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-defaultrootdevicetype
+	DefaultRootDeviceType *types.Value `json:"DefaultRootDeviceType,omitempty"`
+
+	// DefaultSshKeyName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-defaultsshkeyname
+	DefaultSshKeyName *types.Value `json:"DefaultSshKeyName,omitempty"`
+
+	// DefaultSubnetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#defaultsubnet
+	DefaultSubnetId *types.Value `json:"DefaultSubnetId,omitempty"`
+
+	// EcsClusterArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-ecsclusterarn
+	EcsClusterArn *types.Value `json:"EcsClusterArn,omitempty"`
+
+	// ElasticIps AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-elasticips
+	ElasticIps []Stack_ElasticIp `json:"ElasticIps,omitempty"`
+
+	// HostnameTheme AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-hostnametheme
+	HostnameTheme *types.Value `json:"HostnameTheme,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RdsDbInstances AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-rdsdbinstances
+	RdsDbInstances []Stack_RdsDbInstance `json:"RdsDbInstances,omitempty"`
+
+	// ServiceRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-servicerolearn
+	ServiceRoleArn *types.Value `json:"ServiceRoleArn,omitempty"`
+
+	// SourceStackId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-sourcestackid
+	SourceStackId *types.Value `json:"SourceStackId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// UseCustomCookbooks AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#usecustcookbooks
+	UseCustomCookbooks *types.Value `json:"UseCustomCookbooks,omitempty"`
+
+	// UseOpsworksSecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-useopsworkssecuritygroups
+	UseOpsworksSecurityGroups *types.Value `json:"UseOpsworksSecurityGroups,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-stack.html#cfn-opsworks-stack-vpcid
+	VpcId *types.Value `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 *Stack) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::Stack"
+}
+
+// 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 Stack) MarshalJSON() ([]byte, error) {
+	type Properties Stack
+	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 *Stack) UnmarshalJSON(b []byte) error {
+	type Properties Stack
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Stack(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/opsworks/aws-opsworks-stack_chefconfiguration.go b/goformation/cloudformation/opsworks/aws-opsworks-stack_chefconfiguration.go
new file mode 100644
index 0000000000..4e194c9ca0
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-stack_chefconfiguration.go
@@ -0,0 +1,42 @@
+package opsworks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stack_ChefConfiguration AWS CloudFormation Resource (AWS::OpsWorks::Stack.ChefConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-chefconfiguration.html
+type Stack_ChefConfiguration struct {
+
+	// BerkshelfVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-chefconfiguration.html#cfn-opsworks-chefconfiguration-berkshelfversion
+	BerkshelfVersion *types.Value `json:"BerkshelfVersion,omitempty"`
+
+	// ManageBerkshelf AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-chefconfiguration.html#cfn-opsworks-chefconfiguration-berkshelfversion
+	ManageBerkshelf *types.Value `json:"ManageBerkshelf,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Stack_ChefConfiguration) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::Stack.ChefConfiguration"
+}
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-stack_elasticip.go b/goformation/cloudformation/opsworks/aws-opsworks-stack_elasticip.go
new file mode 100644
index 0000000000..79e5174723
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-stack_elasticip.go
@@ -0,0 +1,42 @@
+package opsworks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stack_ElasticIp AWS CloudFormation Resource (AWS::OpsWorks::Stack.ElasticIp)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-elasticip.html
+type Stack_ElasticIp struct {
+
+	// Ip AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-elasticip.html#cfn-opsworks-stack-elasticip-ip
+	Ip *types.Value `json:"Ip,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-elasticip.html#cfn-opsworks-stack-elasticip-name
+	Name *types.Value `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 *Stack_ElasticIp) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::Stack.ElasticIp"
+}
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-stack_rdsdbinstance.go b/goformation/cloudformation/opsworks/aws-opsworks-stack_rdsdbinstance.go
new file mode 100644
index 0000000000..00f00b8704
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-stack_rdsdbinstance.go
@@ -0,0 +1,47 @@
+package opsworks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stack_RdsDbInstance AWS CloudFormation Resource (AWS::OpsWorks::Stack.RdsDbInstance)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-rdsdbinstance.html
+type Stack_RdsDbInstance struct {
+
+	// DbPassword AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-rdsdbinstance.html#cfn-opsworks-stack-rdsdbinstance-dbpassword
+	DbPassword *types.Value `json:"DbPassword,omitempty"`
+
+	// DbUser AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-rdsdbinstance.html#cfn-opsworks-stack-rdsdbinstance-dbuser
+	DbUser *types.Value `json:"DbUser,omitempty"`
+
+	// RdsDbInstanceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-rdsdbinstance.html#cfn-opsworks-stack-rdsdbinstance-rdsdbinstancearn
+	RdsDbInstanceArn *types.Value `json:"RdsDbInstanceArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Stack_RdsDbInstance) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::Stack.RdsDbInstance"
+}
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-stack_source.go b/goformation/cloudformation/opsworks/aws-opsworks-stack_source.go
new file mode 100644
index 0000000000..9396483ade
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-stack_source.go
@@ -0,0 +1,62 @@
+package opsworks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stack_Source AWS CloudFormation Resource (AWS::OpsWorks::Stack.Source)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html
+type Stack_Source struct {
+
+	// Password AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-password
+	Password *types.Value `json:"Password,omitempty"`
+
+	// Revision AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-revision
+	Revision *types.Value `json:"Revision,omitempty"`
+
+	// SshKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-sshkey
+	SshKey *types.Value `json:"SshKey,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-source.html#cfn-opsworks-custcookbooksource-username
+	Username *types.Value `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 *Stack_Source) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::Stack.Source"
+}
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-stack_stackconfigurationmanager.go b/goformation/cloudformation/opsworks/aws-opsworks-stack_stackconfigurationmanager.go
new file mode 100644
index 0000000000..be40df2537
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-stack_stackconfigurationmanager.go
@@ -0,0 +1,42 @@
+package opsworks
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stack_StackConfigurationManager AWS CloudFormation Resource (AWS::OpsWorks::Stack.StackConfigurationManager)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-stackconfigmanager.html
+type Stack_StackConfigurationManager struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-stackconfigmanager.html#cfn-opsworks-configmanager-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworks-stack-stackconfigmanager.html#cfn-opsworks-configmanager-version
+	Version *types.Value `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 *Stack_StackConfigurationManager) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::Stack.StackConfigurationManager"
+}
diff --git a/goformation/cloudformation/opsworks/aws-opsworks-userprofile.go b/goformation/cloudformation/opsworks/aws-opsworks-userprofile.go
new file mode 100644
index 0000000000..58d890f8dc
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-userprofile.go
@@ -0,0 +1,123 @@
+package opsworks
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserProfile AWS CloudFormation Resource (AWS::OpsWorks::UserProfile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-userprofile.html
+type UserProfile struct {
+
+	// AllowSelfManagement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-userprofile.html#cfn-opsworks-userprofile-allowselfmanagement
+	AllowSelfManagement *types.Value `json:"AllowSelfManagement,omitempty"`
+
+	// IamUserArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-userprofile.html#cfn-opsworks-userprofile-iamuserarn
+	IamUserArn *types.Value `json:"IamUserArn,omitempty"`
+
+	// SshPublicKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-userprofile.html#cfn-opsworks-userprofile-sshpublickey
+	SshPublicKey *types.Value `json:"SshPublicKey,omitempty"`
+
+	// SshUsername AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-userprofile.html#cfn-opsworks-userprofile-sshusername
+	SshUsername *types.Value `json:"SshUsername,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::OpsWorks::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/opsworks/aws-opsworks-volume.go b/goformation/cloudformation/opsworks/aws-opsworks-volume.go
new file mode 100644
index 0000000000..0d346f28c6
--- /dev/null
+++ b/goformation/cloudformation/opsworks/aws-opsworks-volume.go
@@ -0,0 +1,123 @@
+package opsworks
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Volume AWS CloudFormation Resource (AWS::OpsWorks::Volume)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-volume.html
+type Volume struct {
+
+	// Ec2VolumeId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-volume.html#cfn-opsworks-volume-ec2volumeid
+	Ec2VolumeId *types.Value `json:"Ec2VolumeId,omitempty"`
+
+	// MountPoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-volume.html#cfn-opsworks-volume-mountpoint
+	MountPoint *types.Value `json:"MountPoint,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-volume.html#cfn-opsworks-volume-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// StackId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworks-volume.html#cfn-opsworks-volume-stackid
+	StackId *types.Value `json:"StackId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Volume) AWSCloudFormationType() string {
+	return "AWS::OpsWorks::Volume"
+}
+
+// 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 Volume) MarshalJSON() ([]byte, error) {
+	type Properties Volume
+	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 *Volume) UnmarshalJSON(b []byte) error {
+	type Properties Volume
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Volume(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/opsworkscm/aws-opsworkscm-server.go b/goformation/cloudformation/opsworkscm/aws-opsworkscm-server.go
new file mode 100644
index 0000000000..6745dffbf5
--- /dev/null
+++ b/goformation/cloudformation/opsworkscm/aws-opsworkscm-server.go
@@ -0,0 +1,209 @@
+package opsworkscm
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Server AWS CloudFormation Resource (AWS::OpsWorksCM::Server)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html
+type Server struct {
+
+	// AssociatePublicIpAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-associatepublicipaddress
+	AssociatePublicIpAddress *types.Value `json:"AssociatePublicIpAddress,omitempty"`
+
+	// BackupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-backupid
+	BackupId *types.Value `json:"BackupId,omitempty"`
+
+	// BackupRetentionCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-backupretentioncount
+	BackupRetentionCount *types.Value `json:"BackupRetentionCount,omitempty"`
+
+	// CustomCertificate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-customcertificate
+	CustomCertificate *types.Value `json:"CustomCertificate,omitempty"`
+
+	// CustomDomain AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-customdomain
+	CustomDomain *types.Value `json:"CustomDomain,omitempty"`
+
+	// CustomPrivateKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-customprivatekey
+	CustomPrivateKey *types.Value `json:"CustomPrivateKey,omitempty"`
+
+	// DisableAutomatedBackup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-disableautomatedbackup
+	DisableAutomatedBackup *types.Value `json:"DisableAutomatedBackup,omitempty"`
+
+	// Engine AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-engine
+	Engine *types.Value `json:"Engine,omitempty"`
+
+	// EngineAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-engineattributes
+	EngineAttributes []Server_EngineAttribute `json:"EngineAttributes,omitempty"`
+
+	// EngineModel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-enginemodel
+	EngineModel *types.Value `json:"EngineModel,omitempty"`
+
+	// EngineVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-engineversion
+	EngineVersion *types.Value `json:"EngineVersion,omitempty"`
+
+	// InstanceProfileArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-instanceprofilearn
+	InstanceProfileArn *types.Value `json:"InstanceProfileArn,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// KeyPair AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-keypair
+	KeyPair *types.Value `json:"KeyPair,omitempty"`
+
+	// PreferredBackupWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-preferredbackupwindow
+	PreferredBackupWindow *types.Value `json:"PreferredBackupWindow,omitempty"`
+
+	// PreferredMaintenanceWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-preferredmaintenancewindow
+	PreferredMaintenanceWindow *types.Value `json:"PreferredMaintenanceWindow,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// ServerName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-servername
+	ServerName *types.Value `json:"ServerName,omitempty"`
+
+	// ServiceRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-servicerolearn
+	ServiceRoleArn *types.Value `json:"ServiceRoleArn,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-opsworkscm-server.html#cfn-opsworkscm-server-tags
+	Tags []cloudformation.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 *Server) AWSCloudFormationType() string {
+	return "AWS::OpsWorksCM::Server"
+}
+
+// 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 Server) MarshalJSON() ([]byte, error) {
+	type Properties Server
+	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 *Server) UnmarshalJSON(b []byte) error {
+	type Properties Server
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Server(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/opsworkscm/aws-opsworkscm-server_engineattribute.go b/goformation/cloudformation/opsworkscm/aws-opsworkscm-server_engineattribute.go
new file mode 100644
index 0000000000..f155341461
--- /dev/null
+++ b/goformation/cloudformation/opsworkscm/aws-opsworkscm-server_engineattribute.go
@@ -0,0 +1,42 @@
+package opsworkscm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Server_EngineAttribute AWS CloudFormation Resource (AWS::OpsWorksCM::Server.EngineAttribute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworkscm-server-engineattribute.html
+type Server_EngineAttribute struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworkscm-server-engineattribute.html#cfn-opsworkscm-server-engineattribute-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-opsworkscm-server-engineattribute.html#cfn-opsworkscm-server-engineattribute-value
+	Value *types.Value `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 *Server_EngineAttribute) AWSCloudFormationType() string {
+	return "AWS::OpsWorksCM::Server.EngineAttribute"
+}
diff --git a/goformation/cloudformation/panorama/aws-panorama-applicationinstance.go b/goformation/cloudformation/panorama/aws-panorama-applicationinstance.go
new file mode 100644
index 0000000000..d9823ebb18
--- /dev/null
+++ b/goformation/cloudformation/panorama/aws-panorama-applicationinstance.go
@@ -0,0 +1,154 @@
+package panorama
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationInstance AWS CloudFormation Resource (AWS::Panorama::ApplicationInstance)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-applicationinstance.html
+type ApplicationInstance struct {
+
+	// ApplicationInstanceIdToReplace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-applicationinstance.html#cfn-panorama-applicationinstance-applicationinstanceidtoreplace
+	ApplicationInstanceIdToReplace *types.Value `json:"ApplicationInstanceIdToReplace,omitempty"`
+
+	// DefaultRuntimeContextDevice AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-applicationinstance.html#cfn-panorama-applicationinstance-defaultruntimecontextdevice
+	DefaultRuntimeContextDevice *types.Value `json:"DefaultRuntimeContextDevice,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-applicationinstance.html#cfn-panorama-applicationinstance-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DeviceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-applicationinstance.html#cfn-panorama-applicationinstance-deviceid
+	DeviceId *types.Value `json:"DeviceId,omitempty"`
+
+	// ManifestOverridesPayload AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-applicationinstance.html#cfn-panorama-applicationinstance-manifestoverridespayload
+	ManifestOverridesPayload *ApplicationInstance_ManifestOverridesPayload `json:"ManifestOverridesPayload,omitempty"`
+
+	// ManifestPayload AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-applicationinstance.html#cfn-panorama-applicationinstance-manifestpayload
+	ManifestPayload *ApplicationInstance_ManifestPayload `json:"ManifestPayload,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-applicationinstance.html#cfn-panorama-applicationinstance-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RuntimeRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-applicationinstance.html#cfn-panorama-applicationinstance-runtimerolearn
+	RuntimeRoleArn *types.Value `json:"RuntimeRoleArn,omitempty"`
+
+	// StatusFilter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-applicationinstance.html#cfn-panorama-applicationinstance-statusfilter
+	StatusFilter *types.Value `json:"StatusFilter,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-applicationinstance.html#cfn-panorama-applicationinstance-tags
+	Tags []cloudformation.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 *ApplicationInstance) AWSCloudFormationType() string {
+	return "AWS::Panorama::ApplicationInstance"
+}
+
+// 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 ApplicationInstance) MarshalJSON() ([]byte, error) {
+	type Properties ApplicationInstance
+	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 *ApplicationInstance) UnmarshalJSON(b []byte) error {
+	type Properties ApplicationInstance
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ApplicationInstance(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/panorama/aws-panorama-applicationinstance_manifestoverridespayload.go b/goformation/cloudformation/panorama/aws-panorama-applicationinstance_manifestoverridespayload.go
new file mode 100644
index 0000000000..f015b9e0a9
--- /dev/null
+++ b/goformation/cloudformation/panorama/aws-panorama-applicationinstance_manifestoverridespayload.go
@@ -0,0 +1,37 @@
+package panorama
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationInstance_ManifestOverridesPayload AWS CloudFormation Resource (AWS::Panorama::ApplicationInstance.ManifestOverridesPayload)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-panorama-applicationinstance-manifestoverridespayload.html
+type ApplicationInstance_ManifestOverridesPayload struct {
+
+	// PayloadData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-panorama-applicationinstance-manifestoverridespayload.html#cfn-panorama-applicationinstance-manifestoverridespayload-payloaddata
+	PayloadData *types.Value `json:"PayloadData,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationInstance_ManifestOverridesPayload) AWSCloudFormationType() string {
+	return "AWS::Panorama::ApplicationInstance.ManifestOverridesPayload"
+}
diff --git a/goformation/cloudformation/panorama/aws-panorama-applicationinstance_manifestpayload.go b/goformation/cloudformation/panorama/aws-panorama-applicationinstance_manifestpayload.go
new file mode 100644
index 0000000000..8d8d2d4eb2
--- /dev/null
+++ b/goformation/cloudformation/panorama/aws-panorama-applicationinstance_manifestpayload.go
@@ -0,0 +1,37 @@
+package panorama
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationInstance_ManifestPayload AWS CloudFormation Resource (AWS::Panorama::ApplicationInstance.ManifestPayload)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-panorama-applicationinstance-manifestpayload.html
+type ApplicationInstance_ManifestPayload struct {
+
+	// PayloadData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-panorama-applicationinstance-manifestpayload.html#cfn-panorama-applicationinstance-manifestpayload-payloaddata
+	PayloadData *types.Value `json:"PayloadData,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationInstance_ManifestPayload) AWSCloudFormationType() string {
+	return "AWS::Panorama::ApplicationInstance.ManifestPayload"
+}
diff --git a/goformation/cloudformation/panorama/aws-panorama-package.go b/goformation/cloudformation/panorama/aws-panorama-package.go
new file mode 100644
index 0000000000..3c9082d789
--- /dev/null
+++ b/goformation/cloudformation/panorama/aws-panorama-package.go
@@ -0,0 +1,114 @@
+package panorama
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Package AWS CloudFormation Resource (AWS::Panorama::Package)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-package.html
+type Package struct {
+
+	// PackageName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-package.html#cfn-panorama-package-packagename
+	PackageName *types.Value `json:"PackageName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-package.html#cfn-panorama-package-tags
+	Tags []cloudformation.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 *Package) AWSCloudFormationType() string {
+	return "AWS::Panorama::Package"
+}
+
+// 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 Package) MarshalJSON() ([]byte, error) {
+	type Properties Package
+	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 *Package) UnmarshalJSON(b []byte) error {
+	type Properties Package
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Package(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/panorama/aws-panorama-packageversion.go b/goformation/cloudformation/panorama/aws-panorama-packageversion.go
new file mode 100644
index 0000000000..14f00eb687
--- /dev/null
+++ b/goformation/cloudformation/panorama/aws-panorama-packageversion.go
@@ -0,0 +1,133 @@
+package panorama
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PackageVersion AWS CloudFormation Resource (AWS::Panorama::PackageVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-packageversion.html
+type PackageVersion struct {
+
+	// MarkLatest AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-packageversion.html#cfn-panorama-packageversion-marklatest
+	MarkLatest *types.Value `json:"MarkLatest,omitempty"`
+
+	// OwnerAccount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-packageversion.html#cfn-panorama-packageversion-owneraccount
+	OwnerAccount *types.Value `json:"OwnerAccount,omitempty"`
+
+	// PackageId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-packageversion.html#cfn-panorama-packageversion-packageid
+	PackageId *types.Value `json:"PackageId,omitempty"`
+
+	// PackageVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-packageversion.html#cfn-panorama-packageversion-packageversion
+	PackageVersion *types.Value `json:"PackageVersion,omitempty"`
+
+	// PatchVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-packageversion.html#cfn-panorama-packageversion-patchversion
+	PatchVersion *types.Value `json:"PatchVersion,omitempty"`
+
+	// UpdatedLatestPatchVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-panorama-packageversion.html#cfn-panorama-packageversion-updatedlatestpatchversion
+	UpdatedLatestPatchVersion *types.Value `json:"UpdatedLatestPatchVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PackageVersion) AWSCloudFormationType() string {
+	return "AWS::Panorama::PackageVersion"
+}
+
+// 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 PackageVersion) MarshalJSON() ([]byte, error) {
+	type Properties PackageVersion
+	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 *PackageVersion) UnmarshalJSON(b []byte) error {
+	type Properties PackageVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PackageVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpoint/aws-pinpoint-admchannel.go b/goformation/cloudformation/pinpoint/aws-pinpoint-admchannel.go
new file mode 100644
index 0000000000..6b7e51276c
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-admchannel.go
@@ -0,0 +1,123 @@
+package pinpoint
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ADMChannel AWS CloudFormation Resource (AWS::Pinpoint::ADMChannel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-admchannel.html
+type ADMChannel struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-admchannel.html#cfn-pinpoint-admchannel-applicationid
+	ApplicationId *types.Value `json:"ApplicationId,omitempty"`
+
+	// ClientId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-admchannel.html#cfn-pinpoint-admchannel-clientid
+	ClientId *types.Value `json:"ClientId,omitempty"`
+
+	// ClientSecret AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-admchannel.html#cfn-pinpoint-admchannel-clientsecret
+	ClientSecret *types.Value `json:"ClientSecret,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-admchannel.html#cfn-pinpoint-admchannel-enabled
+	Enabled *types.Value `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 *ADMChannel) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::ADMChannel"
+}
+
+// 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 ADMChannel) MarshalJSON() ([]byte, error) {
+	type Properties ADMChannel
+	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 *ADMChannel) UnmarshalJSON(b []byte) error {
+	type Properties ADMChannel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ADMChannel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpoint/aws-pinpoint-apnschannel.go b/goformation/cloudformation/pinpoint/aws-pinpoint-apnschannel.go
new file mode 100644
index 0000000000..7d5cd07902
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-apnschannel.go
@@ -0,0 +1,148 @@
+package pinpoint
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// APNSChannel AWS CloudFormation Resource (AWS::Pinpoint::APNSChannel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnschannel.html
+type APNSChannel struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnschannel.html#cfn-pinpoint-apnschannel-applicationid
+	ApplicationId *types.Value `json:"ApplicationId,omitempty"`
+
+	// BundleId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnschannel.html#cfn-pinpoint-apnschannel-bundleid
+	BundleId *types.Value `json:"BundleId,omitempty"`
+
+	// Certificate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnschannel.html#cfn-pinpoint-apnschannel-certificate
+	Certificate *types.Value `json:"Certificate,omitempty"`
+
+	// DefaultAuthenticationMethod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnschannel.html#cfn-pinpoint-apnschannel-defaultauthenticationmethod
+	DefaultAuthenticationMethod *types.Value `json:"DefaultAuthenticationMethod,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnschannel.html#cfn-pinpoint-apnschannel-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// PrivateKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnschannel.html#cfn-pinpoint-apnschannel-privatekey
+	PrivateKey *types.Value `json:"PrivateKey,omitempty"`
+
+	// TeamId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnschannel.html#cfn-pinpoint-apnschannel-teamid
+	TeamId *types.Value `json:"TeamId,omitempty"`
+
+	// TokenKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnschannel.html#cfn-pinpoint-apnschannel-tokenkey
+	TokenKey *types.Value `json:"TokenKey,omitempty"`
+
+	// TokenKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnschannel.html#cfn-pinpoint-apnschannel-tokenkeyid
+	TokenKeyId *types.Value `json:"TokenKeyId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *APNSChannel) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::APNSChannel"
+}
+
+// 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 APNSChannel) MarshalJSON() ([]byte, error) {
+	type Properties APNSChannel
+	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 *APNSChannel) UnmarshalJSON(b []byte) error {
+	type Properties APNSChannel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = APNSChannel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpoint/aws-pinpoint-apnssandboxchannel.go b/goformation/cloudformation/pinpoint/aws-pinpoint-apnssandboxchannel.go
new file mode 100644
index 0000000000..910e8d0f77
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-apnssandboxchannel.go
@@ -0,0 +1,148 @@
+package pinpoint
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// APNSSandboxChannel AWS CloudFormation Resource (AWS::Pinpoint::APNSSandboxChannel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnssandboxchannel.html
+type APNSSandboxChannel struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnssandboxchannel.html#cfn-pinpoint-apnssandboxchannel-applicationid
+	ApplicationId *types.Value `json:"ApplicationId,omitempty"`
+
+	// BundleId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnssandboxchannel.html#cfn-pinpoint-apnssandboxchannel-bundleid
+	BundleId *types.Value `json:"BundleId,omitempty"`
+
+	// Certificate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnssandboxchannel.html#cfn-pinpoint-apnssandboxchannel-certificate
+	Certificate *types.Value `json:"Certificate,omitempty"`
+
+	// DefaultAuthenticationMethod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnssandboxchannel.html#cfn-pinpoint-apnssandboxchannel-defaultauthenticationmethod
+	DefaultAuthenticationMethod *types.Value `json:"DefaultAuthenticationMethod,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnssandboxchannel.html#cfn-pinpoint-apnssandboxchannel-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// PrivateKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnssandboxchannel.html#cfn-pinpoint-apnssandboxchannel-privatekey
+	PrivateKey *types.Value `json:"PrivateKey,omitempty"`
+
+	// TeamId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnssandboxchannel.html#cfn-pinpoint-apnssandboxchannel-teamid
+	TeamId *types.Value `json:"TeamId,omitempty"`
+
+	// TokenKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnssandboxchannel.html#cfn-pinpoint-apnssandboxchannel-tokenkey
+	TokenKey *types.Value `json:"TokenKey,omitempty"`
+
+	// TokenKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnssandboxchannel.html#cfn-pinpoint-apnssandboxchannel-tokenkeyid
+	TokenKeyId *types.Value `json:"TokenKeyId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *APNSSandboxChannel) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::APNSSandboxChannel"
+}
+
+// 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 APNSSandboxChannel) MarshalJSON() ([]byte, error) {
+	type Properties APNSSandboxChannel
+	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 *APNSSandboxChannel) UnmarshalJSON(b []byte) error {
+	type Properties APNSSandboxChannel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = APNSSandboxChannel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpoint/aws-pinpoint-apnsvoipchannel.go b/goformation/cloudformation/pinpoint/aws-pinpoint-apnsvoipchannel.go
new file mode 100644
index 0000000000..1887faeb00
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-apnsvoipchannel.go
@@ -0,0 +1,148 @@
+package pinpoint
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// APNSVoipChannel AWS CloudFormation Resource (AWS::Pinpoint::APNSVoipChannel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnsvoipchannel.html
+type APNSVoipChannel struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnsvoipchannel.html#cfn-pinpoint-apnsvoipchannel-applicationid
+	ApplicationId *types.Value `json:"ApplicationId,omitempty"`
+
+	// BundleId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnsvoipchannel.html#cfn-pinpoint-apnsvoipchannel-bundleid
+	BundleId *types.Value `json:"BundleId,omitempty"`
+
+	// Certificate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnsvoipchannel.html#cfn-pinpoint-apnsvoipchannel-certificate
+	Certificate *types.Value `json:"Certificate,omitempty"`
+
+	// DefaultAuthenticationMethod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnsvoipchannel.html#cfn-pinpoint-apnsvoipchannel-defaultauthenticationmethod
+	DefaultAuthenticationMethod *types.Value `json:"DefaultAuthenticationMethod,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnsvoipchannel.html#cfn-pinpoint-apnsvoipchannel-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// PrivateKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnsvoipchannel.html#cfn-pinpoint-apnsvoipchannel-privatekey
+	PrivateKey *types.Value `json:"PrivateKey,omitempty"`
+
+	// TeamId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnsvoipchannel.html#cfn-pinpoint-apnsvoipchannel-teamid
+	TeamId *types.Value `json:"TeamId,omitempty"`
+
+	// TokenKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnsvoipchannel.html#cfn-pinpoint-apnsvoipchannel-tokenkey
+	TokenKey *types.Value `json:"TokenKey,omitempty"`
+
+	// TokenKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnsvoipchannel.html#cfn-pinpoint-apnsvoipchannel-tokenkeyid
+	TokenKeyId *types.Value `json:"TokenKeyId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *APNSVoipChannel) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::APNSVoipChannel"
+}
+
+// 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 APNSVoipChannel) MarshalJSON() ([]byte, error) {
+	type Properties APNSVoipChannel
+	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 *APNSVoipChannel) UnmarshalJSON(b []byte) error {
+	type Properties APNSVoipChannel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = APNSVoipChannel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpoint/aws-pinpoint-apnsvoipsandboxchannel.go b/goformation/cloudformation/pinpoint/aws-pinpoint-apnsvoipsandboxchannel.go
new file mode 100644
index 0000000000..b0691ec630
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-apnsvoipsandboxchannel.go
@@ -0,0 +1,148 @@
+package pinpoint
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// APNSVoipSandboxChannel AWS CloudFormation Resource (AWS::Pinpoint::APNSVoipSandboxChannel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnsvoipsandboxchannel.html
+type APNSVoipSandboxChannel struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnsvoipsandboxchannel.html#cfn-pinpoint-apnsvoipsandboxchannel-applicationid
+	ApplicationId *types.Value `json:"ApplicationId,omitempty"`
+
+	// BundleId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnsvoipsandboxchannel.html#cfn-pinpoint-apnsvoipsandboxchannel-bundleid
+	BundleId *types.Value `json:"BundleId,omitempty"`
+
+	// Certificate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnsvoipsandboxchannel.html#cfn-pinpoint-apnsvoipsandboxchannel-certificate
+	Certificate *types.Value `json:"Certificate,omitempty"`
+
+	// DefaultAuthenticationMethod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnsvoipsandboxchannel.html#cfn-pinpoint-apnsvoipsandboxchannel-defaultauthenticationmethod
+	DefaultAuthenticationMethod *types.Value `json:"DefaultAuthenticationMethod,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnsvoipsandboxchannel.html#cfn-pinpoint-apnsvoipsandboxchannel-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// PrivateKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnsvoipsandboxchannel.html#cfn-pinpoint-apnsvoipsandboxchannel-privatekey
+	PrivateKey *types.Value `json:"PrivateKey,omitempty"`
+
+	// TeamId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnsvoipsandboxchannel.html#cfn-pinpoint-apnsvoipsandboxchannel-teamid
+	TeamId *types.Value `json:"TeamId,omitempty"`
+
+	// TokenKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnsvoipsandboxchannel.html#cfn-pinpoint-apnsvoipsandboxchannel-tokenkey
+	TokenKey *types.Value `json:"TokenKey,omitempty"`
+
+	// TokenKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-apnsvoipsandboxchannel.html#cfn-pinpoint-apnsvoipsandboxchannel-tokenkeyid
+	TokenKeyId *types.Value `json:"TokenKeyId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *APNSVoipSandboxChannel) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::APNSVoipSandboxChannel"
+}
+
+// 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 APNSVoipSandboxChannel) MarshalJSON() ([]byte, error) {
+	type Properties APNSVoipSandboxChannel
+	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 *APNSVoipSandboxChannel) UnmarshalJSON(b []byte) error {
+	type Properties APNSVoipSandboxChannel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = APNSVoipSandboxChannel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpoint/aws-pinpoint-app.go b/goformation/cloudformation/pinpoint/aws-pinpoint-app.go
new file mode 100644
index 0000000000..887bbbdda8
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-app.go
@@ -0,0 +1,113 @@
+package pinpoint
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// App AWS CloudFormation Resource (AWS::Pinpoint::App)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-app.html
+type App struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-app.html#cfn-pinpoint-app-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-app.html#cfn-pinpoint-app-tags
+	Tags interface{} `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 *App) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::App"
+}
+
+// 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 App) MarshalJSON() ([]byte, error) {
+	type Properties App
+	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 *App) UnmarshalJSON(b []byte) error {
+	type Properties App
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = App(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings.go b/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings.go
new file mode 100644
index 0000000000..02349a5fd3
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings.go
@@ -0,0 +1,128 @@
+package pinpoint
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationSettings AWS CloudFormation Resource (AWS::Pinpoint::ApplicationSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-applicationsettings.html
+type ApplicationSettings struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-applicationsettings.html#cfn-pinpoint-applicationsettings-applicationid
+	ApplicationId *types.Value `json:"ApplicationId,omitempty"`
+
+	// CampaignHook AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-applicationsettings.html#cfn-pinpoint-applicationsettings-campaignhook
+	CampaignHook *ApplicationSettings_CampaignHook `json:"CampaignHook,omitempty"`
+
+	// CloudWatchMetricsEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-applicationsettings.html#cfn-pinpoint-applicationsettings-cloudwatchmetricsenabled
+	CloudWatchMetricsEnabled *types.Value `json:"CloudWatchMetricsEnabled,omitempty"`
+
+	// Limits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-applicationsettings.html#cfn-pinpoint-applicationsettings-limits
+	Limits *ApplicationSettings_Limits `json:"Limits,omitempty"`
+
+	// QuietTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-applicationsettings.html#cfn-pinpoint-applicationsettings-quiettime
+	QuietTime *ApplicationSettings_QuietTime `json:"QuietTime,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationSettings) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::ApplicationSettings"
+}
+
+// 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 ApplicationSettings) MarshalJSON() ([]byte, error) {
+	type Properties ApplicationSettings
+	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 *ApplicationSettings) UnmarshalJSON(b []byte) error {
+	type Properties ApplicationSettings
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ApplicationSettings(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_campaignhook.go b/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_campaignhook.go
new file mode 100644
index 0000000000..b9dd0099ca
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_campaignhook.go
@@ -0,0 +1,47 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationSettings_CampaignHook AWS CloudFormation Resource (AWS::Pinpoint::ApplicationSettings.CampaignHook)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-applicationsettings-campaignhook.html
+type ApplicationSettings_CampaignHook struct {
+
+	// LambdaFunctionName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-applicationsettings-campaignhook.html#cfn-pinpoint-applicationsettings-campaignhook-lambdafunctionname
+	LambdaFunctionName *types.Value `json:"LambdaFunctionName,omitempty"`
+
+	// Mode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-applicationsettings-campaignhook.html#cfn-pinpoint-applicationsettings-campaignhook-mode
+	Mode *types.Value `json:"Mode,omitempty"`
+
+	// WebUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-applicationsettings-campaignhook.html#cfn-pinpoint-applicationsettings-campaignhook-weburl
+	WebUrl *types.Value `json:"WebUrl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationSettings_CampaignHook) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::ApplicationSettings.CampaignHook"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_limits.go b/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_limits.go
new file mode 100644
index 0000000000..65df7d7403
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_limits.go
@@ -0,0 +1,52 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationSettings_Limits AWS CloudFormation Resource (AWS::Pinpoint::ApplicationSettings.Limits)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-applicationsettings-limits.html
+type ApplicationSettings_Limits struct {
+
+	// Daily AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-applicationsettings-limits.html#cfn-pinpoint-applicationsettings-limits-daily
+	Daily *types.Value `json:"Daily,omitempty"`
+
+	// MaximumDuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-applicationsettings-limits.html#cfn-pinpoint-applicationsettings-limits-maximumduration
+	MaximumDuration *types.Value `json:"MaximumDuration,omitempty"`
+
+	// MessagesPerSecond AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-applicationsettings-limits.html#cfn-pinpoint-applicationsettings-limits-messagespersecond
+	MessagesPerSecond *types.Value `json:"MessagesPerSecond,omitempty"`
+
+	// Total AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-applicationsettings-limits.html#cfn-pinpoint-applicationsettings-limits-total
+	Total *types.Value `json:"Total,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationSettings_Limits) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::ApplicationSettings.Limits"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_quiettime.go b/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_quiettime.go
new file mode 100644
index 0000000000..6a3564428a
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-applicationsettings_quiettime.go
@@ -0,0 +1,42 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ApplicationSettings_QuietTime AWS CloudFormation Resource (AWS::Pinpoint::ApplicationSettings.QuietTime)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-applicationsettings-quiettime.html
+type ApplicationSettings_QuietTime struct {
+
+	// End AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-applicationsettings-quiettime.html#cfn-pinpoint-applicationsettings-quiettime-end
+	End *types.Value `json:"End,omitempty"`
+
+	// Start AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-applicationsettings-quiettime.html#cfn-pinpoint-applicationsettings-quiettime-start
+	Start *types.Value `json:"Start,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ApplicationSettings_QuietTime) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::ApplicationSettings.QuietTime"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-baiduchannel.go b/goformation/cloudformation/pinpoint/aws-pinpoint-baiduchannel.go
new file mode 100644
index 0000000000..5dbbeb57b4
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-baiduchannel.go
@@ -0,0 +1,123 @@
+package pinpoint
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BaiduChannel AWS CloudFormation Resource (AWS::Pinpoint::BaiduChannel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-baiduchannel.html
+type BaiduChannel struct {
+
+	// ApiKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-baiduchannel.html#cfn-pinpoint-baiduchannel-apikey
+	ApiKey *types.Value `json:"ApiKey,omitempty"`
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-baiduchannel.html#cfn-pinpoint-baiduchannel-applicationid
+	ApplicationId *types.Value `json:"ApplicationId,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-baiduchannel.html#cfn-pinpoint-baiduchannel-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// SecretKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-baiduchannel.html#cfn-pinpoint-baiduchannel-secretkey
+	SecretKey *types.Value `json:"SecretKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *BaiduChannel) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::BaiduChannel"
+}
+
+// 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 BaiduChannel) MarshalJSON() ([]byte, error) {
+	type Properties BaiduChannel
+	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 *BaiduChannel) UnmarshalJSON(b []byte) error {
+	type Properties BaiduChannel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = BaiduChannel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpoint/aws-pinpoint-campaign.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign.go
new file mode 100644
index 0000000000..26a07528a8
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign.go
@@ -0,0 +1,183 @@
+package pinpoint
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign AWS CloudFormation Resource (AWS::Pinpoint::Campaign)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-campaign.html
+type Campaign struct {
+
+	// AdditionalTreatments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-campaign.html#cfn-pinpoint-campaign-additionaltreatments
+	AdditionalTreatments []Campaign_WriteTreatmentResource `json:"AdditionalTreatments,omitempty"`
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-campaign.html#cfn-pinpoint-campaign-applicationid
+	ApplicationId *types.Value `json:"ApplicationId,omitempty"`
+
+	// CampaignHook AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-campaign.html#cfn-pinpoint-campaign-campaignhook
+	CampaignHook *Campaign_CampaignHook `json:"CampaignHook,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-campaign.html#cfn-pinpoint-campaign-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// HoldoutPercent AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-campaign.html#cfn-pinpoint-campaign-holdoutpercent
+	HoldoutPercent *types.Value `json:"HoldoutPercent,omitempty"`
+
+	// IsPaused AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-campaign.html#cfn-pinpoint-campaign-ispaused
+	IsPaused *types.Value `json:"IsPaused,omitempty"`
+
+	// Limits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-campaign.html#cfn-pinpoint-campaign-limits
+	Limits *Campaign_Limits `json:"Limits,omitempty"`
+
+	// MessageConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-campaign.html#cfn-pinpoint-campaign-messageconfiguration
+	MessageConfiguration *Campaign_MessageConfiguration `json:"MessageConfiguration,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-campaign.html#cfn-pinpoint-campaign-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Priority AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-campaign.html#cfn-pinpoint-campaign-priority
+	Priority *types.Value `json:"Priority,omitempty"`
+
+	// Schedule AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-campaign.html#cfn-pinpoint-campaign-schedule
+	Schedule *Campaign_Schedule `json:"Schedule,omitempty"`
+
+	// SegmentId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-campaign.html#cfn-pinpoint-campaign-segmentid
+	SegmentId *types.Value `json:"SegmentId,omitempty"`
+
+	// SegmentVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-campaign.html#cfn-pinpoint-campaign-segmentversion
+	SegmentVersion *types.Value `json:"SegmentVersion,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-campaign.html#cfn-pinpoint-campaign-tags
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// TreatmentDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-campaign.html#cfn-pinpoint-campaign-treatmentdescription
+	TreatmentDescription *types.Value `json:"TreatmentDescription,omitempty"`
+
+	// TreatmentName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-campaign.html#cfn-pinpoint-campaign-treatmentname
+	TreatmentName *types.Value `json:"TreatmentName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign"
+}
+
+// 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 Campaign) MarshalJSON() ([]byte, error) {
+	type Properties Campaign
+	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 *Campaign) UnmarshalJSON(b []byte) error {
+	type Properties Campaign
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Campaign(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_attributedimension.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_attributedimension.go
new file mode 100644
index 0000000000..ef1cc563bd
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_attributedimension.go
@@ -0,0 +1,42 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_AttributeDimension AWS CloudFormation Resource (AWS::Pinpoint::Campaign.AttributeDimension)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-attributedimension.html
+type Campaign_AttributeDimension struct {
+
+	// AttributeType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-attributedimension.html#cfn-pinpoint-campaign-attributedimension-attributetype
+	AttributeType *types.Value `json:"AttributeType,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-attributedimension.html#cfn-pinpoint-campaign-attributedimension-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AttributeDimension) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.AttributeDimension"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignemailmessage.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignemailmessage.go
new file mode 100644
index 0000000000..f3859243bd
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignemailmessage.go
@@ -0,0 +1,52 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_CampaignEmailMessage AWS CloudFormation Resource (AWS::Pinpoint::Campaign.CampaignEmailMessage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaignemailmessage.html
+type Campaign_CampaignEmailMessage struct {
+
+	// Body AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaignemailmessage.html#cfn-pinpoint-campaign-campaignemailmessage-body
+	Body *types.Value `json:"Body,omitempty"`
+
+	// FromAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaignemailmessage.html#cfn-pinpoint-campaign-campaignemailmessage-fromaddress
+	FromAddress *types.Value `json:"FromAddress,omitempty"`
+
+	// HtmlBody AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaignemailmessage.html#cfn-pinpoint-campaign-campaignemailmessage-htmlbody
+	HtmlBody *types.Value `json:"HtmlBody,omitempty"`
+
+	// Title AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaignemailmessage.html#cfn-pinpoint-campaign-campaignemailmessage-title
+	Title *types.Value `json:"Title,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CampaignEmailMessage) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.CampaignEmailMessage"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaigneventfilter.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaigneventfilter.go
new file mode 100644
index 0000000000..5cd50e0c18
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaigneventfilter.go
@@ -0,0 +1,42 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_CampaignEventFilter AWS CloudFormation Resource (AWS::Pinpoint::Campaign.CampaignEventFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaigneventfilter.html
+type Campaign_CampaignEventFilter struct {
+
+	// Dimensions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaigneventfilter.html#cfn-pinpoint-campaign-campaigneventfilter-dimensions
+	Dimensions *Campaign_EventDimensions `json:"Dimensions,omitempty"`
+
+	// FilterType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaigneventfilter.html#cfn-pinpoint-campaign-campaigneventfilter-filtertype
+	FilterType *types.Value `json:"FilterType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CampaignEventFilter) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.CampaignEventFilter"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignhook.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignhook.go
new file mode 100644
index 0000000000..d935845fef
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignhook.go
@@ -0,0 +1,47 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_CampaignHook AWS CloudFormation Resource (AWS::Pinpoint::Campaign.CampaignHook)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaignhook.html
+type Campaign_CampaignHook struct {
+
+	// LambdaFunctionName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaignhook.html#cfn-pinpoint-campaign-campaignhook-lambdafunctionname
+	LambdaFunctionName *types.Value `json:"LambdaFunctionName,omitempty"`
+
+	// Mode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaignhook.html#cfn-pinpoint-campaign-campaignhook-mode
+	Mode *types.Value `json:"Mode,omitempty"`
+
+	// WebUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaignhook.html#cfn-pinpoint-campaign-campaignhook-weburl
+	WebUrl *types.Value `json:"WebUrl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CampaignHook) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.CampaignHook"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaigninappmessage.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaigninappmessage.go
new file mode 100644
index 0000000000..ede3173d53
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaigninappmessage.go
@@ -0,0 +1,47 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_CampaignInAppMessage AWS CloudFormation Resource (AWS::Pinpoint::Campaign.CampaignInAppMessage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaigninappmessage.html
+type Campaign_CampaignInAppMessage struct {
+
+	// Content AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaigninappmessage.html#cfn-pinpoint-campaign-campaigninappmessage-content
+	Content []Campaign_InAppMessageContent `json:"Content,omitempty"`
+
+	// CustomConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaigninappmessage.html#cfn-pinpoint-campaign-campaigninappmessage-customconfig
+	CustomConfig interface{} `json:"CustomConfig,omitempty"`
+
+	// Layout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaigninappmessage.html#cfn-pinpoint-campaign-campaigninappmessage-layout
+	Layout *types.Value `json:"Layout,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CampaignInAppMessage) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.CampaignInAppMessage"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignsmsmessage.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignsmsmessage.go
new file mode 100644
index 0000000000..cfe0c1ffea
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_campaignsmsmessage.go
@@ -0,0 +1,62 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_CampaignSmsMessage AWS CloudFormation Resource (AWS::Pinpoint::Campaign.CampaignSmsMessage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaignsmsmessage.html
+type Campaign_CampaignSmsMessage struct {
+
+	// Body AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaignsmsmessage.html#cfn-pinpoint-campaign-campaignsmsmessage-body
+	Body *types.Value `json:"Body,omitempty"`
+
+	// EntityId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaignsmsmessage.html#cfn-pinpoint-campaign-campaignsmsmessage-entityid
+	EntityId *types.Value `json:"EntityId,omitempty"`
+
+	// MessageType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaignsmsmessage.html#cfn-pinpoint-campaign-campaignsmsmessage-messagetype
+	MessageType *types.Value `json:"MessageType,omitempty"`
+
+	// OriginationNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaignsmsmessage.html#cfn-pinpoint-campaign-campaignsmsmessage-originationnumber
+	OriginationNumber *types.Value `json:"OriginationNumber,omitempty"`
+
+	// SenderId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaignsmsmessage.html#cfn-pinpoint-campaign-campaignsmsmessage-senderid
+	SenderId *types.Value `json:"SenderId,omitempty"`
+
+	// TemplateId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-campaignsmsmessage.html#cfn-pinpoint-campaign-campaignsmsmessage-templateid
+	TemplateId *types.Value `json:"TemplateId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CampaignSmsMessage) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.CampaignSmsMessage"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_defaultbuttonconfiguration.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_defaultbuttonconfiguration.go
new file mode 100644
index 0000000000..85cd183406
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_defaultbuttonconfiguration.go
@@ -0,0 +1,62 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_DefaultButtonConfiguration AWS CloudFormation Resource (AWS::Pinpoint::Campaign.DefaultButtonConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-defaultbuttonconfiguration.html
+type Campaign_DefaultButtonConfiguration struct {
+
+	// BackgroundColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-defaultbuttonconfiguration.html#cfn-pinpoint-campaign-defaultbuttonconfiguration-backgroundcolor
+	BackgroundColor *types.Value `json:"BackgroundColor,omitempty"`
+
+	// BorderRadius AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-defaultbuttonconfiguration.html#cfn-pinpoint-campaign-defaultbuttonconfiguration-borderradius
+	BorderRadius *types.Value `json:"BorderRadius,omitempty"`
+
+	// ButtonAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-defaultbuttonconfiguration.html#cfn-pinpoint-campaign-defaultbuttonconfiguration-buttonaction
+	ButtonAction *types.Value `json:"ButtonAction,omitempty"`
+
+	// Link AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-defaultbuttonconfiguration.html#cfn-pinpoint-campaign-defaultbuttonconfiguration-link
+	Link *types.Value `json:"Link,omitempty"`
+
+	// Text AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-defaultbuttonconfiguration.html#cfn-pinpoint-campaign-defaultbuttonconfiguration-text
+	Text *types.Value `json:"Text,omitempty"`
+
+	// TextColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-defaultbuttonconfiguration.html#cfn-pinpoint-campaign-defaultbuttonconfiguration-textcolor
+	TextColor *types.Value `json:"TextColor,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DefaultButtonConfiguration) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.DefaultButtonConfiguration"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_eventdimensions.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_eventdimensions.go
new file mode 100644
index 0000000000..d20dfb725a
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_eventdimensions.go
@@ -0,0 +1,45 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_EventDimensions AWS CloudFormation Resource (AWS::Pinpoint::Campaign.EventDimensions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-eventdimensions.html
+type Campaign_EventDimensions struct {
+
+	// Attributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-eventdimensions.html#cfn-pinpoint-campaign-eventdimensions-attributes
+	Attributes interface{} `json:"Attributes,omitempty"`
+
+	// EventType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-eventdimensions.html#cfn-pinpoint-campaign-eventdimensions-eventtype
+	EventType *Campaign_SetDimension `json:"EventType,omitempty"`
+
+	// Metrics AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-eventdimensions.html#cfn-pinpoint-campaign-eventdimensions-metrics
+	Metrics interface{} `json:"Metrics,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EventDimensions) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.EventDimensions"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebodyconfig.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebodyconfig.go
new file mode 100644
index 0000000000..2ddb76dd89
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebodyconfig.go
@@ -0,0 +1,47 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_InAppMessageBodyConfig AWS CloudFormation Resource (AWS::Pinpoint::Campaign.InAppMessageBodyConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-inappmessagebodyconfig.html
+type Campaign_InAppMessageBodyConfig struct {
+
+	// Alignment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-inappmessagebodyconfig.html#cfn-pinpoint-campaign-inappmessagebodyconfig-alignment
+	Alignment *types.Value `json:"Alignment,omitempty"`
+
+	// Body AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-inappmessagebodyconfig.html#cfn-pinpoint-campaign-inappmessagebodyconfig-body
+	Body *types.Value `json:"Body,omitempty"`
+
+	// TextColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-inappmessagebodyconfig.html#cfn-pinpoint-campaign-inappmessagebodyconfig-textcolor
+	TextColor *types.Value `json:"TextColor,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InAppMessageBodyConfig) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.InAppMessageBodyConfig"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebutton.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebutton.go
new file mode 100644
index 0000000000..601dc5f465
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagebutton.go
@@ -0,0 +1,50 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_InAppMessageButton AWS CloudFormation Resource (AWS::Pinpoint::Campaign.InAppMessageButton)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-inappmessagebutton.html
+type Campaign_InAppMessageButton struct {
+
+	// Android AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-inappmessagebutton.html#cfn-pinpoint-campaign-inappmessagebutton-android
+	Android *Campaign_OverrideButtonConfiguration `json:"Android,omitempty"`
+
+	// DefaultConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-inappmessagebutton.html#cfn-pinpoint-campaign-inappmessagebutton-defaultconfig
+	DefaultConfig *Campaign_DefaultButtonConfiguration `json:"DefaultConfig,omitempty"`
+
+	// IOS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-inappmessagebutton.html#cfn-pinpoint-campaign-inappmessagebutton-ios
+	IOS *Campaign_OverrideButtonConfiguration `json:"IOS,omitempty"`
+
+	// Web AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-inappmessagebutton.html#cfn-pinpoint-campaign-inappmessagebutton-web
+	Web *Campaign_OverrideButtonConfiguration `json:"Web,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InAppMessageButton) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.InAppMessageButton"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagecontent.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagecontent.go
new file mode 100644
index 0000000000..58cee7c125
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessagecontent.go
@@ -0,0 +1,62 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_InAppMessageContent AWS CloudFormation Resource (AWS::Pinpoint::Campaign.InAppMessageContent)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-inappmessagecontent.html
+type Campaign_InAppMessageContent struct {
+
+	// BackgroundColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-inappmessagecontent.html#cfn-pinpoint-campaign-inappmessagecontent-backgroundcolor
+	BackgroundColor *types.Value `json:"BackgroundColor,omitempty"`
+
+	// BodyConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-inappmessagecontent.html#cfn-pinpoint-campaign-inappmessagecontent-bodyconfig
+	BodyConfig *Campaign_InAppMessageBodyConfig `json:"BodyConfig,omitempty"`
+
+	// HeaderConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-inappmessagecontent.html#cfn-pinpoint-campaign-inappmessagecontent-headerconfig
+	HeaderConfig *Campaign_InAppMessageHeaderConfig `json:"HeaderConfig,omitempty"`
+
+	// ImageUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-inappmessagecontent.html#cfn-pinpoint-campaign-inappmessagecontent-imageurl
+	ImageUrl *types.Value `json:"ImageUrl,omitempty"`
+
+	// PrimaryBtn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-inappmessagecontent.html#cfn-pinpoint-campaign-inappmessagecontent-primarybtn
+	PrimaryBtn *Campaign_InAppMessageButton `json:"PrimaryBtn,omitempty"`
+
+	// SecondaryBtn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-inappmessagecontent.html#cfn-pinpoint-campaign-inappmessagecontent-secondarybtn
+	SecondaryBtn *Campaign_InAppMessageButton `json:"SecondaryBtn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InAppMessageContent) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.InAppMessageContent"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessageheaderconfig.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessageheaderconfig.go
new file mode 100644
index 0000000000..fd29397786
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_inappmessageheaderconfig.go
@@ -0,0 +1,47 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_InAppMessageHeaderConfig AWS CloudFormation Resource (AWS::Pinpoint::Campaign.InAppMessageHeaderConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-inappmessageheaderconfig.html
+type Campaign_InAppMessageHeaderConfig struct {
+
+	// Alignment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-inappmessageheaderconfig.html#cfn-pinpoint-campaign-inappmessageheaderconfig-alignment
+	Alignment *types.Value `json:"Alignment,omitempty"`
+
+	// Header AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-inappmessageheaderconfig.html#cfn-pinpoint-campaign-inappmessageheaderconfig-header
+	Header *types.Value `json:"Header,omitempty"`
+
+	// TextColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-inappmessageheaderconfig.html#cfn-pinpoint-campaign-inappmessageheaderconfig-textcolor
+	TextColor *types.Value `json:"TextColor,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_InAppMessageHeaderConfig) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.InAppMessageHeaderConfig"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_limits.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_limits.go
new file mode 100644
index 0000000000..1b53c522c7
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_limits.go
@@ -0,0 +1,57 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_Limits AWS CloudFormation Resource (AWS::Pinpoint::Campaign.Limits)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-limits.html
+type Campaign_Limits struct {
+
+	// Daily AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-limits.html#cfn-pinpoint-campaign-limits-daily
+	Daily *types.Value `json:"Daily,omitempty"`
+
+	// MaximumDuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-limits.html#cfn-pinpoint-campaign-limits-maximumduration
+	MaximumDuration *types.Value `json:"MaximumDuration,omitempty"`
+
+	// MessagesPerSecond AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-limits.html#cfn-pinpoint-campaign-limits-messagespersecond
+	MessagesPerSecond *types.Value `json:"MessagesPerSecond,omitempty"`
+
+	// Session AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-limits.html#cfn-pinpoint-campaign-limits-session
+	Session *types.Value `json:"Session,omitempty"`
+
+	// Total AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-limits.html#cfn-pinpoint-campaign-limits-total
+	Total *types.Value `json:"Total,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Limits) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.Limits"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_message.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_message.go
new file mode 100644
index 0000000000..98ced4bec8
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_message.go
@@ -0,0 +1,92 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_Message AWS CloudFormation Resource (AWS::Pinpoint::Campaign.Message)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-message.html
+type Campaign_Message struct {
+
+	// Action AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-message.html#cfn-pinpoint-campaign-message-action
+	Action *types.Value `json:"Action,omitempty"`
+
+	// Body AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-message.html#cfn-pinpoint-campaign-message-body
+	Body *types.Value `json:"Body,omitempty"`
+
+	// ImageIconUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-message.html#cfn-pinpoint-campaign-message-imageiconurl
+	ImageIconUrl *types.Value `json:"ImageIconUrl,omitempty"`
+
+	// ImageSmallIconUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-message.html#cfn-pinpoint-campaign-message-imagesmalliconurl
+	ImageSmallIconUrl *types.Value `json:"ImageSmallIconUrl,omitempty"`
+
+	// ImageUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-message.html#cfn-pinpoint-campaign-message-imageurl
+	ImageUrl *types.Value `json:"ImageUrl,omitempty"`
+
+	// JsonBody AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-message.html#cfn-pinpoint-campaign-message-jsonbody
+	JsonBody *types.Value `json:"JsonBody,omitempty"`
+
+	// MediaUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-message.html#cfn-pinpoint-campaign-message-mediaurl
+	MediaUrl *types.Value `json:"MediaUrl,omitempty"`
+
+	// RawContent AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-message.html#cfn-pinpoint-campaign-message-rawcontent
+	RawContent *types.Value `json:"RawContent,omitempty"`
+
+	// SilentPush AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-message.html#cfn-pinpoint-campaign-message-silentpush
+	SilentPush *types.Value `json:"SilentPush,omitempty"`
+
+	// TimeToLive AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-message.html#cfn-pinpoint-campaign-message-timetolive
+	TimeToLive *types.Value `json:"TimeToLive,omitempty"`
+
+	// Title AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-message.html#cfn-pinpoint-campaign-message-title
+	Title *types.Value `json:"Title,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-message.html#cfn-pinpoint-campaign-message-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Message) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.Message"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_messageconfiguration.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_messageconfiguration.go
new file mode 100644
index 0000000000..6e3de32ac1
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_messageconfiguration.go
@@ -0,0 +1,70 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_MessageConfiguration AWS CloudFormation Resource (AWS::Pinpoint::Campaign.MessageConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-messageconfiguration.html
+type Campaign_MessageConfiguration struct {
+
+	// ADMMessage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-messageconfiguration.html#cfn-pinpoint-campaign-messageconfiguration-admmessage
+	ADMMessage *Campaign_Message `json:"ADMMessage,omitempty"`
+
+	// APNSMessage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-messageconfiguration.html#cfn-pinpoint-campaign-messageconfiguration-apnsmessage
+	APNSMessage *Campaign_Message `json:"APNSMessage,omitempty"`
+
+	// BaiduMessage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-messageconfiguration.html#cfn-pinpoint-campaign-messageconfiguration-baidumessage
+	BaiduMessage *Campaign_Message `json:"BaiduMessage,omitempty"`
+
+	// DefaultMessage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-messageconfiguration.html#cfn-pinpoint-campaign-messageconfiguration-defaultmessage
+	DefaultMessage *Campaign_Message `json:"DefaultMessage,omitempty"`
+
+	// EmailMessage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-messageconfiguration.html#cfn-pinpoint-campaign-messageconfiguration-emailmessage
+	EmailMessage *Campaign_CampaignEmailMessage `json:"EmailMessage,omitempty"`
+
+	// GCMMessage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-messageconfiguration.html#cfn-pinpoint-campaign-messageconfiguration-gcmmessage
+	GCMMessage *Campaign_Message `json:"GCMMessage,omitempty"`
+
+	// InAppMessage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-messageconfiguration.html#cfn-pinpoint-campaign-messageconfiguration-inappmessage
+	InAppMessage *Campaign_CampaignInAppMessage `json:"InAppMessage,omitempty"`
+
+	// SMSMessage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-messageconfiguration.html#cfn-pinpoint-campaign-messageconfiguration-smsmessage
+	SMSMessage *Campaign_CampaignSmsMessage `json:"SMSMessage,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_MessageConfiguration) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.MessageConfiguration"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_metricdimension.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_metricdimension.go
new file mode 100644
index 0000000000..2eb9a99b51
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_metricdimension.go
@@ -0,0 +1,42 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_MetricDimension AWS CloudFormation Resource (AWS::Pinpoint::Campaign.MetricDimension)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-metricdimension.html
+type Campaign_MetricDimension struct {
+
+	// ComparisonOperator AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-metricdimension.html#cfn-pinpoint-campaign-metricdimension-comparisonoperator
+	ComparisonOperator *types.Value `json:"ComparisonOperator,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-metricdimension.html#cfn-pinpoint-campaign-metricdimension-value
+	Value *types.Value `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 *Campaign_MetricDimension) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.MetricDimension"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_overridebuttonconfiguration.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_overridebuttonconfiguration.go
new file mode 100644
index 0000000000..9bda276791
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_overridebuttonconfiguration.go
@@ -0,0 +1,42 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_OverrideButtonConfiguration AWS CloudFormation Resource (AWS::Pinpoint::Campaign.OverrideButtonConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-overridebuttonconfiguration.html
+type Campaign_OverrideButtonConfiguration struct {
+
+	// ButtonAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-overridebuttonconfiguration.html#cfn-pinpoint-campaign-overridebuttonconfiguration-buttonaction
+	ButtonAction *types.Value `json:"ButtonAction,omitempty"`
+
+	// Link AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-overridebuttonconfiguration.html#cfn-pinpoint-campaign-overridebuttonconfiguration-link
+	Link *types.Value `json:"Link,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_OverrideButtonConfiguration) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.OverrideButtonConfiguration"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_quiettime.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_quiettime.go
new file mode 100644
index 0000000000..f58ae58f5b
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_quiettime.go
@@ -0,0 +1,42 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_QuietTime AWS CloudFormation Resource (AWS::Pinpoint::Campaign.QuietTime)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-schedule-quiettime.html
+type Campaign_QuietTime struct {
+
+	// End AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-schedule-quiettime.html#cfn-pinpoint-campaign-schedule-quiettime-end
+	End *types.Value `json:"End,omitempty"`
+
+	// Start AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-schedule-quiettime.html#cfn-pinpoint-campaign-schedule-quiettime-start
+	Start *types.Value `json:"Start,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_QuietTime) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.QuietTime"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_schedule.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_schedule.go
new file mode 100644
index 0000000000..3a2e64300c
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_schedule.go
@@ -0,0 +1,67 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_Schedule AWS CloudFormation Resource (AWS::Pinpoint::Campaign.Schedule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-schedule.html
+type Campaign_Schedule struct {
+
+	// EndTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-schedule.html#cfn-pinpoint-campaign-schedule-endtime
+	EndTime *types.Value `json:"EndTime,omitempty"`
+
+	// EventFilter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-schedule.html#cfn-pinpoint-campaign-schedule-eventfilter
+	EventFilter *Campaign_CampaignEventFilter `json:"EventFilter,omitempty"`
+
+	// Frequency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-schedule.html#cfn-pinpoint-campaign-schedule-frequency
+	Frequency *types.Value `json:"Frequency,omitempty"`
+
+	// IsLocalTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-schedule.html#cfn-pinpoint-campaign-schedule-islocaltime
+	IsLocalTime *types.Value `json:"IsLocalTime,omitempty"`
+
+	// QuietTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-schedule.html#cfn-pinpoint-campaign-schedule-quiettime
+	QuietTime *Campaign_QuietTime `json:"QuietTime,omitempty"`
+
+	// StartTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-schedule.html#cfn-pinpoint-campaign-schedule-starttime
+	StartTime *types.Value `json:"StartTime,omitempty"`
+
+	// TimeZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-schedule.html#cfn-pinpoint-campaign-schedule-timezone
+	TimeZone *types.Value `json:"TimeZone,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Schedule) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.Schedule"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_setdimension.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_setdimension.go
new file mode 100644
index 0000000000..3c5b352bdf
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_setdimension.go
@@ -0,0 +1,42 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_SetDimension AWS CloudFormation Resource (AWS::Pinpoint::Campaign.SetDimension)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-setdimension.html
+type Campaign_SetDimension struct {
+
+	// DimensionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-setdimension.html#cfn-pinpoint-campaign-setdimension-dimensiontype
+	DimensionType *types.Value `json:"DimensionType,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-setdimension.html#cfn-pinpoint-campaign-setdimension-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SetDimension) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.SetDimension"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_writetreatmentresource.go b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_writetreatmentresource.go
new file mode 100644
index 0000000000..c3c0030bc1
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-campaign_writetreatmentresource.go
@@ -0,0 +1,57 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Campaign_WriteTreatmentResource AWS CloudFormation Resource (AWS::Pinpoint::Campaign.WriteTreatmentResource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-writetreatmentresource.html
+type Campaign_WriteTreatmentResource struct {
+
+	// MessageConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-writetreatmentresource.html#cfn-pinpoint-campaign-writetreatmentresource-messageconfiguration
+	MessageConfiguration *Campaign_MessageConfiguration `json:"MessageConfiguration,omitempty"`
+
+	// Schedule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-writetreatmentresource.html#cfn-pinpoint-campaign-writetreatmentresource-schedule
+	Schedule *Campaign_Schedule `json:"Schedule,omitempty"`
+
+	// SizePercent AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-writetreatmentresource.html#cfn-pinpoint-campaign-writetreatmentresource-sizepercent
+	SizePercent *types.Value `json:"SizePercent,omitempty"`
+
+	// TreatmentDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-writetreatmentresource.html#cfn-pinpoint-campaign-writetreatmentresource-treatmentdescription
+	TreatmentDescription *types.Value `json:"TreatmentDescription,omitempty"`
+
+	// TreatmentName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-campaign-writetreatmentresource.html#cfn-pinpoint-campaign-writetreatmentresource-treatmentname
+	TreatmentName *types.Value `json:"TreatmentName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_WriteTreatmentResource) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Campaign.WriteTreatmentResource"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-emailchannel.go b/goformation/cloudformation/pinpoint/aws-pinpoint-emailchannel.go
new file mode 100644
index 0000000000..f8ba44719f
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-emailchannel.go
@@ -0,0 +1,133 @@
+package pinpoint
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EmailChannel AWS CloudFormation Resource (AWS::Pinpoint::EmailChannel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-emailchannel.html
+type EmailChannel struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-emailchannel.html#cfn-pinpoint-emailchannel-applicationid
+	ApplicationId *types.Value `json:"ApplicationId,omitempty"`
+
+	// ConfigurationSet AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-emailchannel.html#cfn-pinpoint-emailchannel-configurationset
+	ConfigurationSet *types.Value `json:"ConfigurationSet,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-emailchannel.html#cfn-pinpoint-emailchannel-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// FromAddress AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-emailchannel.html#cfn-pinpoint-emailchannel-fromaddress
+	FromAddress *types.Value `json:"FromAddress,omitempty"`
+
+	// Identity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-emailchannel.html#cfn-pinpoint-emailchannel-identity
+	Identity *types.Value `json:"Identity,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-emailchannel.html#cfn-pinpoint-emailchannel-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EmailChannel) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::EmailChannel"
+}
+
+// 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 EmailChannel) MarshalJSON() ([]byte, error) {
+	type Properties EmailChannel
+	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 *EmailChannel) UnmarshalJSON(b []byte) error {
+	type Properties EmailChannel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = EmailChannel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpoint/aws-pinpoint-emailtemplate.go b/goformation/cloudformation/pinpoint/aws-pinpoint-emailtemplate.go
new file mode 100644
index 0000000000..beba67d880
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-emailtemplate.go
@@ -0,0 +1,138 @@
+package pinpoint
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EmailTemplate AWS CloudFormation Resource (AWS::Pinpoint::EmailTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-emailtemplate.html
+type EmailTemplate struct {
+
+	// DefaultSubstitutions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-emailtemplate.html#cfn-pinpoint-emailtemplate-defaultsubstitutions
+	DefaultSubstitutions *types.Value `json:"DefaultSubstitutions,omitempty"`
+
+	// HtmlPart AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-emailtemplate.html#cfn-pinpoint-emailtemplate-htmlpart
+	HtmlPart *types.Value `json:"HtmlPart,omitempty"`
+
+	// Subject AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-emailtemplate.html#cfn-pinpoint-emailtemplate-subject
+	Subject *types.Value `json:"Subject,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-emailtemplate.html#cfn-pinpoint-emailtemplate-tags
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// TemplateDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-emailtemplate.html#cfn-pinpoint-emailtemplate-templatedescription
+	TemplateDescription *types.Value `json:"TemplateDescription,omitempty"`
+
+	// TemplateName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-emailtemplate.html#cfn-pinpoint-emailtemplate-templatename
+	TemplateName *types.Value `json:"TemplateName,omitempty"`
+
+	// TextPart AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-emailtemplate.html#cfn-pinpoint-emailtemplate-textpart
+	TextPart *types.Value `json:"TextPart,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EmailTemplate) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::EmailTemplate"
+}
+
+// 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 EmailTemplate) MarshalJSON() ([]byte, error) {
+	type Properties EmailTemplate
+	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 *EmailTemplate) UnmarshalJSON(b []byte) error {
+	type Properties EmailTemplate
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = EmailTemplate(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpoint/aws-pinpoint-eventstream.go b/goformation/cloudformation/pinpoint/aws-pinpoint-eventstream.go
new file mode 100644
index 0000000000..03b6a4f9e8
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-eventstream.go
@@ -0,0 +1,118 @@
+package pinpoint
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventStream AWS CloudFormation Resource (AWS::Pinpoint::EventStream)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-eventstream.html
+type EventStream struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-eventstream.html#cfn-pinpoint-eventstream-applicationid
+	ApplicationId *types.Value `json:"ApplicationId,omitempty"`
+
+	// DestinationStreamArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-eventstream.html#cfn-pinpoint-eventstream-destinationstreamarn
+	DestinationStreamArn *types.Value `json:"DestinationStreamArn,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-eventstream.html#cfn-pinpoint-eventstream-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EventStream) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::EventStream"
+}
+
+// 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 EventStream) MarshalJSON() ([]byte, error) {
+	type Properties EventStream
+	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 *EventStream) UnmarshalJSON(b []byte) error {
+	type Properties EventStream
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = EventStream(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpoint/aws-pinpoint-gcmchannel.go b/goformation/cloudformation/pinpoint/aws-pinpoint-gcmchannel.go
new file mode 100644
index 0000000000..54d0800b88
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-gcmchannel.go
@@ -0,0 +1,118 @@
+package pinpoint
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GCMChannel AWS CloudFormation Resource (AWS::Pinpoint::GCMChannel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-gcmchannel.html
+type GCMChannel struct {
+
+	// ApiKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-gcmchannel.html#cfn-pinpoint-gcmchannel-apikey
+	ApiKey *types.Value `json:"ApiKey,omitempty"`
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-gcmchannel.html#cfn-pinpoint-gcmchannel-applicationid
+	ApplicationId *types.Value `json:"ApplicationId,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-gcmchannel.html#cfn-pinpoint-gcmchannel-enabled
+	Enabled *types.Value `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 *GCMChannel) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::GCMChannel"
+}
+
+// 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 GCMChannel) MarshalJSON() ([]byte, error) {
+	type Properties GCMChannel
+	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 *GCMChannel) UnmarshalJSON(b []byte) error {
+	type Properties GCMChannel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = GCMChannel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate.go b/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate.go
new file mode 100644
index 0000000000..ac770271b6
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate.go
@@ -0,0 +1,133 @@
+package pinpoint
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InAppTemplate AWS CloudFormation Resource (AWS::Pinpoint::InAppTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-inapptemplate.html
+type InAppTemplate struct {
+
+	// Content AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-inapptemplate.html#cfn-pinpoint-inapptemplate-content
+	Content []InAppTemplate_InAppMessageContent `json:"Content,omitempty"`
+
+	// CustomConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-inapptemplate.html#cfn-pinpoint-inapptemplate-customconfig
+	CustomConfig interface{} `json:"CustomConfig,omitempty"`
+
+	// Layout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-inapptemplate.html#cfn-pinpoint-inapptemplate-layout
+	Layout *types.Value `json:"Layout,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-inapptemplate.html#cfn-pinpoint-inapptemplate-tags
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// TemplateDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-inapptemplate.html#cfn-pinpoint-inapptemplate-templatedescription
+	TemplateDescription *types.Value `json:"TemplateDescription,omitempty"`
+
+	// TemplateName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-inapptemplate.html#cfn-pinpoint-inapptemplate-templatename
+	TemplateName *types.Value `json:"TemplateName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InAppTemplate) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::InAppTemplate"
+}
+
+// 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 InAppTemplate) MarshalJSON() ([]byte, error) {
+	type Properties InAppTemplate
+	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 *InAppTemplate) UnmarshalJSON(b []byte) error {
+	type Properties InAppTemplate
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = InAppTemplate(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_bodyconfig.go b/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_bodyconfig.go
new file mode 100644
index 0000000000..e67a0c686a
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_bodyconfig.go
@@ -0,0 +1,47 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InAppTemplate_BodyConfig AWS CloudFormation Resource (AWS::Pinpoint::InAppTemplate.BodyConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-bodyconfig.html
+type InAppTemplate_BodyConfig struct {
+
+	// Alignment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-bodyconfig.html#cfn-pinpoint-inapptemplate-bodyconfig-alignment
+	Alignment *types.Value `json:"Alignment,omitempty"`
+
+	// Body AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-bodyconfig.html#cfn-pinpoint-inapptemplate-bodyconfig-body
+	Body *types.Value `json:"Body,omitempty"`
+
+	// TextColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-bodyconfig.html#cfn-pinpoint-inapptemplate-bodyconfig-textcolor
+	TextColor *types.Value `json:"TextColor,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InAppTemplate_BodyConfig) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::InAppTemplate.BodyConfig"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_buttonconfig.go b/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_buttonconfig.go
new file mode 100644
index 0000000000..56081a3259
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_buttonconfig.go
@@ -0,0 +1,50 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// InAppTemplate_ButtonConfig AWS CloudFormation Resource (AWS::Pinpoint::InAppTemplate.ButtonConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-buttonconfig.html
+type InAppTemplate_ButtonConfig struct {
+
+	// Android AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-buttonconfig.html#cfn-pinpoint-inapptemplate-buttonconfig-android
+	Android *InAppTemplate_OverrideButtonConfiguration `json:"Android,omitempty"`
+
+	// DefaultConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-buttonconfig.html#cfn-pinpoint-inapptemplate-buttonconfig-defaultconfig
+	DefaultConfig *InAppTemplate_DefaultButtonConfiguration `json:"DefaultConfig,omitempty"`
+
+	// IOS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-buttonconfig.html#cfn-pinpoint-inapptemplate-buttonconfig-ios
+	IOS *InAppTemplate_OverrideButtonConfiguration `json:"IOS,omitempty"`
+
+	// Web AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-buttonconfig.html#cfn-pinpoint-inapptemplate-buttonconfig-web
+	Web *InAppTemplate_OverrideButtonConfiguration `json:"Web,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InAppTemplate_ButtonConfig) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::InAppTemplate.ButtonConfig"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_defaultbuttonconfiguration.go b/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_defaultbuttonconfiguration.go
new file mode 100644
index 0000000000..7f79ed1636
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_defaultbuttonconfiguration.go
@@ -0,0 +1,62 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InAppTemplate_DefaultButtonConfiguration AWS CloudFormation Resource (AWS::Pinpoint::InAppTemplate.DefaultButtonConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-defaultbuttonconfiguration.html
+type InAppTemplate_DefaultButtonConfiguration struct {
+
+	// BackgroundColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-defaultbuttonconfiguration.html#cfn-pinpoint-inapptemplate-defaultbuttonconfiguration-backgroundcolor
+	BackgroundColor *types.Value `json:"BackgroundColor,omitempty"`
+
+	// BorderRadius AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-defaultbuttonconfiguration.html#cfn-pinpoint-inapptemplate-defaultbuttonconfiguration-borderradius
+	BorderRadius *types.Value `json:"BorderRadius,omitempty"`
+
+	// ButtonAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-defaultbuttonconfiguration.html#cfn-pinpoint-inapptemplate-defaultbuttonconfiguration-buttonaction
+	ButtonAction *types.Value `json:"ButtonAction,omitempty"`
+
+	// Link AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-defaultbuttonconfiguration.html#cfn-pinpoint-inapptemplate-defaultbuttonconfiguration-link
+	Link *types.Value `json:"Link,omitempty"`
+
+	// Text AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-defaultbuttonconfiguration.html#cfn-pinpoint-inapptemplate-defaultbuttonconfiguration-text
+	Text *types.Value `json:"Text,omitempty"`
+
+	// TextColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-defaultbuttonconfiguration.html#cfn-pinpoint-inapptemplate-defaultbuttonconfiguration-textcolor
+	TextColor *types.Value `json:"TextColor,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InAppTemplate_DefaultButtonConfiguration) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::InAppTemplate.DefaultButtonConfiguration"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_headerconfig.go b/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_headerconfig.go
new file mode 100644
index 0000000000..0a2a36df18
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_headerconfig.go
@@ -0,0 +1,47 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InAppTemplate_HeaderConfig AWS CloudFormation Resource (AWS::Pinpoint::InAppTemplate.HeaderConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-headerconfig.html
+type InAppTemplate_HeaderConfig struct {
+
+	// Alignment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-headerconfig.html#cfn-pinpoint-inapptemplate-headerconfig-alignment
+	Alignment *types.Value `json:"Alignment,omitempty"`
+
+	// Header AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-headerconfig.html#cfn-pinpoint-inapptemplate-headerconfig-header
+	Header *types.Value `json:"Header,omitempty"`
+
+	// TextColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-headerconfig.html#cfn-pinpoint-inapptemplate-headerconfig-textcolor
+	TextColor *types.Value `json:"TextColor,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InAppTemplate_HeaderConfig) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::InAppTemplate.HeaderConfig"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_inappmessagecontent.go b/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_inappmessagecontent.go
new file mode 100644
index 0000000000..f1bb947979
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_inappmessagecontent.go
@@ -0,0 +1,62 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InAppTemplate_InAppMessageContent AWS CloudFormation Resource (AWS::Pinpoint::InAppTemplate.InAppMessageContent)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-inappmessagecontent.html
+type InAppTemplate_InAppMessageContent struct {
+
+	// BackgroundColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-inappmessagecontent.html#cfn-pinpoint-inapptemplate-inappmessagecontent-backgroundcolor
+	BackgroundColor *types.Value `json:"BackgroundColor,omitempty"`
+
+	// BodyConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-inappmessagecontent.html#cfn-pinpoint-inapptemplate-inappmessagecontent-bodyconfig
+	BodyConfig *InAppTemplate_BodyConfig `json:"BodyConfig,omitempty"`
+
+	// HeaderConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-inappmessagecontent.html#cfn-pinpoint-inapptemplate-inappmessagecontent-headerconfig
+	HeaderConfig *InAppTemplate_HeaderConfig `json:"HeaderConfig,omitempty"`
+
+	// ImageUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-inappmessagecontent.html#cfn-pinpoint-inapptemplate-inappmessagecontent-imageurl
+	ImageUrl *types.Value `json:"ImageUrl,omitempty"`
+
+	// PrimaryBtn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-inappmessagecontent.html#cfn-pinpoint-inapptemplate-inappmessagecontent-primarybtn
+	PrimaryBtn *InAppTemplate_ButtonConfig `json:"PrimaryBtn,omitempty"`
+
+	// SecondaryBtn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-inappmessagecontent.html#cfn-pinpoint-inapptemplate-inappmessagecontent-secondarybtn
+	SecondaryBtn *InAppTemplate_ButtonConfig `json:"SecondaryBtn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InAppTemplate_InAppMessageContent) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::InAppTemplate.InAppMessageContent"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_overridebuttonconfiguration.go b/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_overridebuttonconfiguration.go
new file mode 100644
index 0000000000..0148eced4b
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-inapptemplate_overridebuttonconfiguration.go
@@ -0,0 +1,42 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InAppTemplate_OverrideButtonConfiguration AWS CloudFormation Resource (AWS::Pinpoint::InAppTemplate.OverrideButtonConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-overridebuttonconfiguration.html
+type InAppTemplate_OverrideButtonConfiguration struct {
+
+	// ButtonAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-overridebuttonconfiguration.html#cfn-pinpoint-inapptemplate-overridebuttonconfiguration-buttonaction
+	ButtonAction *types.Value `json:"ButtonAction,omitempty"`
+
+	// Link AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-inapptemplate-overridebuttonconfiguration.html#cfn-pinpoint-inapptemplate-overridebuttonconfiguration-link
+	Link *types.Value `json:"Link,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InAppTemplate_OverrideButtonConfiguration) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::InAppTemplate.OverrideButtonConfiguration"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate.go b/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate.go
new file mode 100644
index 0000000000..de7e7379bc
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate.go
@@ -0,0 +1,148 @@
+package pinpoint
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PushTemplate AWS CloudFormation Resource (AWS::Pinpoint::PushTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-pushtemplate.html
+type PushTemplate struct {
+
+	// ADM AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-pushtemplate.html#cfn-pinpoint-pushtemplate-adm
+	ADM *PushTemplate_AndroidPushNotificationTemplate `json:"ADM,omitempty"`
+
+	// APNS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-pushtemplate.html#cfn-pinpoint-pushtemplate-apns
+	APNS *PushTemplate_APNSPushNotificationTemplate `json:"APNS,omitempty"`
+
+	// Baidu AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-pushtemplate.html#cfn-pinpoint-pushtemplate-baidu
+	Baidu *PushTemplate_AndroidPushNotificationTemplate `json:"Baidu,omitempty"`
+
+	// Default AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-pushtemplate.html#cfn-pinpoint-pushtemplate-default
+	Default *PushTemplate_DefaultPushNotificationTemplate `json:"Default,omitempty"`
+
+	// DefaultSubstitutions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-pushtemplate.html#cfn-pinpoint-pushtemplate-defaultsubstitutions
+	DefaultSubstitutions *types.Value `json:"DefaultSubstitutions,omitempty"`
+
+	// GCM AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-pushtemplate.html#cfn-pinpoint-pushtemplate-gcm
+	GCM *PushTemplate_AndroidPushNotificationTemplate `json:"GCM,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-pushtemplate.html#cfn-pinpoint-pushtemplate-tags
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// TemplateDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-pushtemplate.html#cfn-pinpoint-pushtemplate-templatedescription
+	TemplateDescription *types.Value `json:"TemplateDescription,omitempty"`
+
+	// TemplateName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-pushtemplate.html#cfn-pinpoint-pushtemplate-templatename
+	TemplateName *types.Value `json:"TemplateName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PushTemplate) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::PushTemplate"
+}
+
+// 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 PushTemplate) MarshalJSON() ([]byte, error) {
+	type Properties PushTemplate
+	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 *PushTemplate) UnmarshalJSON(b []byte) error {
+	type Properties PushTemplate
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PushTemplate(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_androidpushnotificationtemplate.go b/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_androidpushnotificationtemplate.go
new file mode 100644
index 0000000000..d3bd2fc559
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_androidpushnotificationtemplate.go
@@ -0,0 +1,72 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PushTemplate_AndroidPushNotificationTemplate AWS CloudFormation Resource (AWS::Pinpoint::PushTemplate.AndroidPushNotificationTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-androidpushnotificationtemplate.html
+type PushTemplate_AndroidPushNotificationTemplate struct {
+
+	// Action AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-androidpushnotificationtemplate.html#cfn-pinpoint-pushtemplate-androidpushnotificationtemplate-action
+	Action *types.Value `json:"Action,omitempty"`
+
+	// Body AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-androidpushnotificationtemplate.html#cfn-pinpoint-pushtemplate-androidpushnotificationtemplate-body
+	Body *types.Value `json:"Body,omitempty"`
+
+	// ImageIconUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-androidpushnotificationtemplate.html#cfn-pinpoint-pushtemplate-androidpushnotificationtemplate-imageiconurl
+	ImageIconUrl *types.Value `json:"ImageIconUrl,omitempty"`
+
+	// ImageUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-androidpushnotificationtemplate.html#cfn-pinpoint-pushtemplate-androidpushnotificationtemplate-imageurl
+	ImageUrl *types.Value `json:"ImageUrl,omitempty"`
+
+	// SmallImageIconUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-androidpushnotificationtemplate.html#cfn-pinpoint-pushtemplate-androidpushnotificationtemplate-smallimageiconurl
+	SmallImageIconUrl *types.Value `json:"SmallImageIconUrl,omitempty"`
+
+	// Sound AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-androidpushnotificationtemplate.html#cfn-pinpoint-pushtemplate-androidpushnotificationtemplate-sound
+	Sound *types.Value `json:"Sound,omitempty"`
+
+	// Title AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-androidpushnotificationtemplate.html#cfn-pinpoint-pushtemplate-androidpushnotificationtemplate-title
+	Title *types.Value `json:"Title,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-androidpushnotificationtemplate.html#cfn-pinpoint-pushtemplate-androidpushnotificationtemplate-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PushTemplate_AndroidPushNotificationTemplate) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::PushTemplate.AndroidPushNotificationTemplate"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_apnspushnotificationtemplate.go b/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_apnspushnotificationtemplate.go
new file mode 100644
index 0000000000..0a1f2453cb
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_apnspushnotificationtemplate.go
@@ -0,0 +1,62 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PushTemplate_APNSPushNotificationTemplate AWS CloudFormation Resource (AWS::Pinpoint::PushTemplate.APNSPushNotificationTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-apnspushnotificationtemplate.html
+type PushTemplate_APNSPushNotificationTemplate struct {
+
+	// Action AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-apnspushnotificationtemplate.html#cfn-pinpoint-pushtemplate-apnspushnotificationtemplate-action
+	Action *types.Value `json:"Action,omitempty"`
+
+	// Body AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-apnspushnotificationtemplate.html#cfn-pinpoint-pushtemplate-apnspushnotificationtemplate-body
+	Body *types.Value `json:"Body,omitempty"`
+
+	// MediaUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-apnspushnotificationtemplate.html#cfn-pinpoint-pushtemplate-apnspushnotificationtemplate-mediaurl
+	MediaUrl *types.Value `json:"MediaUrl,omitempty"`
+
+	// Sound AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-apnspushnotificationtemplate.html#cfn-pinpoint-pushtemplate-apnspushnotificationtemplate-sound
+	Sound *types.Value `json:"Sound,omitempty"`
+
+	// Title AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-apnspushnotificationtemplate.html#cfn-pinpoint-pushtemplate-apnspushnotificationtemplate-title
+	Title *types.Value `json:"Title,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-apnspushnotificationtemplate.html#cfn-pinpoint-pushtemplate-apnspushnotificationtemplate-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PushTemplate_APNSPushNotificationTemplate) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::PushTemplate.APNSPushNotificationTemplate"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_defaultpushnotificationtemplate.go b/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_defaultpushnotificationtemplate.go
new file mode 100644
index 0000000000..1def30472c
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-pushtemplate_defaultpushnotificationtemplate.go
@@ -0,0 +1,57 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PushTemplate_DefaultPushNotificationTemplate AWS CloudFormation Resource (AWS::Pinpoint::PushTemplate.DefaultPushNotificationTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-defaultpushnotificationtemplate.html
+type PushTemplate_DefaultPushNotificationTemplate struct {
+
+	// Action AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-defaultpushnotificationtemplate.html#cfn-pinpoint-pushtemplate-defaultpushnotificationtemplate-action
+	Action *types.Value `json:"Action,omitempty"`
+
+	// Body AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-defaultpushnotificationtemplate.html#cfn-pinpoint-pushtemplate-defaultpushnotificationtemplate-body
+	Body *types.Value `json:"Body,omitempty"`
+
+	// Sound AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-defaultpushnotificationtemplate.html#cfn-pinpoint-pushtemplate-defaultpushnotificationtemplate-sound
+	Sound *types.Value `json:"Sound,omitempty"`
+
+	// Title AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-defaultpushnotificationtemplate.html#cfn-pinpoint-pushtemplate-defaultpushnotificationtemplate-title
+	Title *types.Value `json:"Title,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-pushtemplate-defaultpushnotificationtemplate.html#cfn-pinpoint-pushtemplate-defaultpushnotificationtemplate-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PushTemplate_DefaultPushNotificationTemplate) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::PushTemplate.DefaultPushNotificationTemplate"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment.go b/goformation/cloudformation/pinpoint/aws-pinpoint-segment.go
new file mode 100644
index 0000000000..b35c6dd89c
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-segment.go
@@ -0,0 +1,128 @@
+package pinpoint
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Segment AWS CloudFormation Resource (AWS::Pinpoint::Segment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-segment.html
+type Segment struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-segment.html#cfn-pinpoint-segment-applicationid
+	ApplicationId *types.Value `json:"ApplicationId,omitempty"`
+
+	// Dimensions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-segment.html#cfn-pinpoint-segment-dimensions
+	Dimensions *Segment_SegmentDimensions `json:"Dimensions,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-segment.html#cfn-pinpoint-segment-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SegmentGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-segment.html#cfn-pinpoint-segment-segmentgroups
+	SegmentGroups *Segment_SegmentGroups `json:"SegmentGroups,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-segment.html#cfn-pinpoint-segment-tags
+	Tags interface{} `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 *Segment) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Segment"
+}
+
+// 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 Segment) MarshalJSON() ([]byte, error) {
+	type Properties Segment
+	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 *Segment) UnmarshalJSON(b []byte) error {
+	type Properties Segment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Segment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpoint/aws-pinpoint-segment_attributedimension.go b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_attributedimension.go
new file mode 100644
index 0000000000..24a9dfa375
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_attributedimension.go
@@ -0,0 +1,42 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Segment_AttributeDimension AWS CloudFormation Resource (AWS::Pinpoint::Segment.AttributeDimension)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-attributedimension.html
+type Segment_AttributeDimension struct {
+
+	// AttributeType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-attributedimension.html#cfn-pinpoint-segment-attributedimension-attributetype
+	AttributeType *types.Value `json:"AttributeType,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-attributedimension.html#cfn-pinpoint-segment-attributedimension-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Segment_AttributeDimension) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Segment.AttributeDimension"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_behavior.go b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_behavior.go
new file mode 100644
index 0000000000..47dd8ad26c
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_behavior.go
@@ -0,0 +1,35 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Segment_Behavior AWS CloudFormation Resource (AWS::Pinpoint::Segment.Behavior)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-behavior.html
+type Segment_Behavior struct {
+
+	// Recency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-behavior.html#cfn-pinpoint-segment-segmentdimensions-behavior-recency
+	Recency *Segment_Recency `json:"Recency,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Segment_Behavior) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Segment.Behavior"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_coordinates.go b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_coordinates.go
new file mode 100644
index 0000000000..cf8d5eea89
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_coordinates.go
@@ -0,0 +1,42 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Segment_Coordinates AWS CloudFormation Resource (AWS::Pinpoint::Segment.Coordinates)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-location-gpspoint-coordinates.html
+type Segment_Coordinates struct {
+
+	// Latitude AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-location-gpspoint-coordinates.html#cfn-pinpoint-segment-segmentdimensions-location-gpspoint-coordinates-latitude
+	Latitude *types.Value `json:"Latitude"`
+
+	// Longitude AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-location-gpspoint-coordinates.html#cfn-pinpoint-segment-segmentdimensions-location-gpspoint-coordinates-longitude
+	Longitude *types.Value `json:"Longitude"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Segment_Coordinates) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Segment.Coordinates"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_demographic.go b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_demographic.go
new file mode 100644
index 0000000000..e047fa8fb6
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_demographic.go
@@ -0,0 +1,60 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Segment_Demographic AWS CloudFormation Resource (AWS::Pinpoint::Segment.Demographic)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-demographic.html
+type Segment_Demographic struct {
+
+	// AppVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-demographic.html#cfn-pinpoint-segment-segmentdimensions-demographic-appversion
+	AppVersion *Segment_SetDimension `json:"AppVersion,omitempty"`
+
+	// Channel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-demographic.html#cfn-pinpoint-segment-segmentdimensions-demographic-channel
+	Channel *Segment_SetDimension `json:"Channel,omitempty"`
+
+	// DeviceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-demographic.html#cfn-pinpoint-segment-segmentdimensions-demographic-devicetype
+	DeviceType *Segment_SetDimension `json:"DeviceType,omitempty"`
+
+	// Make AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-demographic.html#cfn-pinpoint-segment-segmentdimensions-demographic-make
+	Make *Segment_SetDimension `json:"Make,omitempty"`
+
+	// Model AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-demographic.html#cfn-pinpoint-segment-segmentdimensions-demographic-model
+	Model *Segment_SetDimension `json:"Model,omitempty"`
+
+	// Platform AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-demographic.html#cfn-pinpoint-segment-segmentdimensions-demographic-platform
+	Platform *Segment_SetDimension `json:"Platform,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Segment_Demographic) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Segment.Demographic"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_gpspoint.go b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_gpspoint.go
new file mode 100644
index 0000000000..d52b4c45f0
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_gpspoint.go
@@ -0,0 +1,42 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Segment_GPSPoint AWS CloudFormation Resource (AWS::Pinpoint::Segment.GPSPoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-location-gpspoint.html
+type Segment_GPSPoint struct {
+
+	// Coordinates AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-location-gpspoint.html#cfn-pinpoint-segment-segmentdimensions-location-gpspoint-coordinates
+	Coordinates *Segment_Coordinates `json:"Coordinates,omitempty"`
+
+	// RangeInKilometers AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-location-gpspoint.html#cfn-pinpoint-segment-segmentdimensions-location-gpspoint-rangeinkilometers
+	RangeInKilometers *types.Value `json:"RangeInKilometers"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Segment_GPSPoint) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Segment.GPSPoint"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_groups.go b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_groups.go
new file mode 100644
index 0000000000..9099e655a5
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_groups.go
@@ -0,0 +1,52 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Segment_Groups AWS CloudFormation Resource (AWS::Pinpoint::Segment.Groups)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentgroups-groups.html
+type Segment_Groups struct {
+
+	// Dimensions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentgroups-groups.html#cfn-pinpoint-segment-segmentgroups-groups-dimensions
+	Dimensions []Segment_SegmentDimensions `json:"Dimensions,omitempty"`
+
+	// SourceSegments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentgroups-groups.html#cfn-pinpoint-segment-segmentgroups-groups-sourcesegments
+	SourceSegments []Segment_SourceSegments `json:"SourceSegments,omitempty"`
+
+	// SourceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentgroups-groups.html#cfn-pinpoint-segment-segmentgroups-groups-sourcetype
+	SourceType *types.Value `json:"SourceType,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentgroups-groups.html#cfn-pinpoint-segment-segmentgroups-groups-type
+	Type *types.Value `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 *Segment_Groups) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Segment.Groups"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_location.go b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_location.go
new file mode 100644
index 0000000000..2c50b5c569
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_location.go
@@ -0,0 +1,40 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Segment_Location AWS CloudFormation Resource (AWS::Pinpoint::Segment.Location)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-location.html
+type Segment_Location struct {
+
+	// Country AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-location.html#cfn-pinpoint-segment-segmentdimensions-location-country
+	Country *Segment_SetDimension `json:"Country,omitempty"`
+
+	// GPSPoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-location.html#cfn-pinpoint-segment-segmentdimensions-location-gpspoint
+	GPSPoint *Segment_GPSPoint `json:"GPSPoint,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Segment_Location) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Segment.Location"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_recency.go b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_recency.go
new file mode 100644
index 0000000000..b2a294b2cc
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_recency.go
@@ -0,0 +1,42 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Segment_Recency AWS CloudFormation Resource (AWS::Pinpoint::Segment.Recency)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-behavior-recency.html
+type Segment_Recency struct {
+
+	// Duration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-behavior-recency.html#cfn-pinpoint-segment-segmentdimensions-behavior-recency-duration
+	Duration *types.Value `json:"Duration,omitempty"`
+
+	// RecencyType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions-behavior-recency.html#cfn-pinpoint-segment-segmentdimensions-behavior-recency-recencytype
+	RecencyType *types.Value `json:"RecencyType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Segment_Recency) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Segment.Recency"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_segmentdimensions.go b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_segmentdimensions.go
new file mode 100644
index 0000000000..d7a9c3985b
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_segmentdimensions.go
@@ -0,0 +1,60 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Segment_SegmentDimensions AWS CloudFormation Resource (AWS::Pinpoint::Segment.SegmentDimensions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions.html
+type Segment_SegmentDimensions struct {
+
+	// Attributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions.html#cfn-pinpoint-segment-segmentdimensions-attributes
+	Attributes interface{} `json:"Attributes,omitempty"`
+
+	// Behavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions.html#cfn-pinpoint-segment-segmentdimensions-behavior
+	Behavior *Segment_Behavior `json:"Behavior,omitempty"`
+
+	// Demographic AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions.html#cfn-pinpoint-segment-segmentdimensions-demographic
+	Demographic *Segment_Demographic `json:"Demographic,omitempty"`
+
+	// Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions.html#cfn-pinpoint-segment-segmentdimensions-location
+	Location *Segment_Location `json:"Location,omitempty"`
+
+	// Metrics AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions.html#cfn-pinpoint-segment-segmentdimensions-metrics
+	Metrics interface{} `json:"Metrics,omitempty"`
+
+	// UserAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentdimensions.html#cfn-pinpoint-segment-segmentdimensions-userattributes
+	UserAttributes interface{} `json:"UserAttributes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Segment_SegmentDimensions) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Segment.SegmentDimensions"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_segmentgroups.go b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_segmentgroups.go
new file mode 100644
index 0000000000..dd8d418957
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_segmentgroups.go
@@ -0,0 +1,42 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Segment_SegmentGroups AWS CloudFormation Resource (AWS::Pinpoint::Segment.SegmentGroups)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentgroups.html
+type Segment_SegmentGroups struct {
+
+	// Groups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentgroups.html#cfn-pinpoint-segment-segmentgroups-groups
+	Groups []Segment_Groups `json:"Groups,omitempty"`
+
+	// Include AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentgroups.html#cfn-pinpoint-segment-segmentgroups-include
+	Include *types.Value `json:"Include,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Segment_SegmentGroups) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Segment.SegmentGroups"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_setdimension.go b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_setdimension.go
new file mode 100644
index 0000000000..a1167e6375
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_setdimension.go
@@ -0,0 +1,42 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Segment_SetDimension AWS CloudFormation Resource (AWS::Pinpoint::Segment.SetDimension)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-setdimension.html
+type Segment_SetDimension struct {
+
+	// DimensionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-setdimension.html#cfn-pinpoint-segment-setdimension-dimensiontype
+	DimensionType *types.Value `json:"DimensionType,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-setdimension.html#cfn-pinpoint-segment-setdimension-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Segment_SetDimension) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Segment.SetDimension"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-segment_sourcesegments.go b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_sourcesegments.go
new file mode 100644
index 0000000000..bc6c1e52cd
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-segment_sourcesegments.go
@@ -0,0 +1,42 @@
+package pinpoint
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Segment_SourceSegments AWS CloudFormation Resource (AWS::Pinpoint::Segment.SourceSegments)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentgroups-groups-sourcesegments.html
+type Segment_SourceSegments struct {
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentgroups-groups-sourcesegments.html#cfn-pinpoint-segment-segmentgroups-groups-sourcesegments-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpoint-segment-segmentgroups-groups-sourcesegments.html#cfn-pinpoint-segment-segmentgroups-groups-sourcesegments-version
+	Version *types.Value `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 *Segment_SourceSegments) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::Segment.SourceSegments"
+}
diff --git a/goformation/cloudformation/pinpoint/aws-pinpoint-smschannel.go b/goformation/cloudformation/pinpoint/aws-pinpoint-smschannel.go
new file mode 100644
index 0000000000..648640ef74
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-smschannel.go
@@ -0,0 +1,123 @@
+package pinpoint
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SMSChannel AWS CloudFormation Resource (AWS::Pinpoint::SMSChannel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-smschannel.html
+type SMSChannel struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-smschannel.html#cfn-pinpoint-smschannel-applicationid
+	ApplicationId *types.Value `json:"ApplicationId,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-smschannel.html#cfn-pinpoint-smschannel-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// SenderId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-smschannel.html#cfn-pinpoint-smschannel-senderid
+	SenderId *types.Value `json:"SenderId,omitempty"`
+
+	// ShortCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-smschannel.html#cfn-pinpoint-smschannel-shortcode
+	ShortCode *types.Value `json:"ShortCode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SMSChannel) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::SMSChannel"
+}
+
+// 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 SMSChannel) MarshalJSON() ([]byte, error) {
+	type Properties SMSChannel
+	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 *SMSChannel) UnmarshalJSON(b []byte) error {
+	type Properties SMSChannel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SMSChannel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpoint/aws-pinpoint-smstemplate.go b/goformation/cloudformation/pinpoint/aws-pinpoint-smstemplate.go
new file mode 100644
index 0000000000..483491efc0
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-smstemplate.go
@@ -0,0 +1,128 @@
+package pinpoint
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SmsTemplate AWS CloudFormation Resource (AWS::Pinpoint::SmsTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-smstemplate.html
+type SmsTemplate struct {
+
+	// Body AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-smstemplate.html#cfn-pinpoint-smstemplate-body
+	Body *types.Value `json:"Body,omitempty"`
+
+	// DefaultSubstitutions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-smstemplate.html#cfn-pinpoint-smstemplate-defaultsubstitutions
+	DefaultSubstitutions *types.Value `json:"DefaultSubstitutions,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-smstemplate.html#cfn-pinpoint-smstemplate-tags
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// TemplateDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-smstemplate.html#cfn-pinpoint-smstemplate-templatedescription
+	TemplateDescription *types.Value `json:"TemplateDescription,omitempty"`
+
+	// TemplateName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-smstemplate.html#cfn-pinpoint-smstemplate-templatename
+	TemplateName *types.Value `json:"TemplateName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SmsTemplate) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::SmsTemplate"
+}
+
+// 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 SmsTemplate) MarshalJSON() ([]byte, error) {
+	type Properties SmsTemplate
+	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 *SmsTemplate) UnmarshalJSON(b []byte) error {
+	type Properties SmsTemplate
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SmsTemplate(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpoint/aws-pinpoint-voicechannel.go b/goformation/cloudformation/pinpoint/aws-pinpoint-voicechannel.go
new file mode 100644
index 0000000000..ba67f62bc0
--- /dev/null
+++ b/goformation/cloudformation/pinpoint/aws-pinpoint-voicechannel.go
@@ -0,0 +1,113 @@
+package pinpoint
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// VoiceChannel AWS CloudFormation Resource (AWS::Pinpoint::VoiceChannel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-voicechannel.html
+type VoiceChannel struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-voicechannel.html#cfn-pinpoint-voicechannel-applicationid
+	ApplicationId *types.Value `json:"ApplicationId,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpoint-voicechannel.html#cfn-pinpoint-voicechannel-enabled
+	Enabled *types.Value `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 *VoiceChannel) AWSCloudFormationType() string {
+	return "AWS::Pinpoint::VoiceChannel"
+}
+
+// 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 VoiceChannel) MarshalJSON() ([]byte, error) {
+	type Properties VoiceChannel
+	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 *VoiceChannel) UnmarshalJSON(b []byte) error {
+	type Properties VoiceChannel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = VoiceChannel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset.go b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset.go
new file mode 100644
index 0000000000..9ac3ed7827
--- /dev/null
+++ b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset.go
@@ -0,0 +1,133 @@
+package pinpointemail
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationSet AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpointemail-configurationset.html
+type ConfigurationSet struct {
+
+	// DeliveryOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpointemail-configurationset.html#cfn-pinpointemail-configurationset-deliveryoptions
+	DeliveryOptions *ConfigurationSet_DeliveryOptions `json:"DeliveryOptions,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpointemail-configurationset.html#cfn-pinpointemail-configurationset-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ReputationOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpointemail-configurationset.html#cfn-pinpointemail-configurationset-reputationoptions
+	ReputationOptions *ConfigurationSet_ReputationOptions `json:"ReputationOptions,omitempty"`
+
+	// SendingOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpointemail-configurationset.html#cfn-pinpointemail-configurationset-sendingoptions
+	SendingOptions *ConfigurationSet_SendingOptions `json:"SendingOptions,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpointemail-configurationset.html#cfn-pinpointemail-configurationset-tags
+	Tags []ConfigurationSet_Tags `json:"Tags,omitempty"`
+
+	// TrackingOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpointemail-configurationset.html#cfn-pinpointemail-configurationset-trackingoptions
+	TrackingOptions *ConfigurationSet_TrackingOptions `json:"TrackingOptions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConfigurationSet) AWSCloudFormationType() string {
+	return "AWS::PinpointEmail::ConfigurationSet"
+}
+
+// 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 ConfigurationSet) MarshalJSON() ([]byte, error) {
+	type Properties ConfigurationSet
+	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 *ConfigurationSet) UnmarshalJSON(b []byte) error {
+	type Properties ConfigurationSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ConfigurationSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_deliveryoptions.go b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_deliveryoptions.go
new file mode 100644
index 0000000000..265299e453
--- /dev/null
+++ b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_deliveryoptions.go
@@ -0,0 +1,37 @@
+package pinpointemail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationSet_DeliveryOptions AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSet.DeliveryOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationset-deliveryoptions.html
+type ConfigurationSet_DeliveryOptions struct {
+
+	// SendingPoolName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationset-deliveryoptions.html#cfn-pinpointemail-configurationset-deliveryoptions-sendingpoolname
+	SendingPoolName *types.Value `json:"SendingPoolName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConfigurationSet_DeliveryOptions) AWSCloudFormationType() string {
+	return "AWS::PinpointEmail::ConfigurationSet.DeliveryOptions"
+}
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_reputationoptions.go b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_reputationoptions.go
new file mode 100644
index 0000000000..7e8687c605
--- /dev/null
+++ b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_reputationoptions.go
@@ -0,0 +1,37 @@
+package pinpointemail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationSet_ReputationOptions AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSet.ReputationOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationset-reputationoptions.html
+type ConfigurationSet_ReputationOptions struct {
+
+	// ReputationMetricsEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationset-reputationoptions.html#cfn-pinpointemail-configurationset-reputationoptions-reputationmetricsenabled
+	ReputationMetricsEnabled *types.Value `json:"ReputationMetricsEnabled,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConfigurationSet_ReputationOptions) AWSCloudFormationType() string {
+	return "AWS::PinpointEmail::ConfigurationSet.ReputationOptions"
+}
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_sendingoptions.go b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_sendingoptions.go
new file mode 100644
index 0000000000..19492cb81f
--- /dev/null
+++ b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_sendingoptions.go
@@ -0,0 +1,37 @@
+package pinpointemail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationSet_SendingOptions AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSet.SendingOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationset-sendingoptions.html
+type ConfigurationSet_SendingOptions struct {
+
+	// SendingEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationset-sendingoptions.html#cfn-pinpointemail-configurationset-sendingoptions-sendingenabled
+	SendingEnabled *types.Value `json:"SendingEnabled,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConfigurationSet_SendingOptions) AWSCloudFormationType() string {
+	return "AWS::PinpointEmail::ConfigurationSet.SendingOptions"
+}
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_tags.go b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_tags.go
new file mode 100644
index 0000000000..8dbdd055b5
--- /dev/null
+++ b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_tags.go
@@ -0,0 +1,42 @@
+package pinpointemail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationSet_Tags AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSet.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationset-tags.html
+type ConfigurationSet_Tags struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationset-tags.html#cfn-pinpointemail-configurationset-tags-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationset-tags.html#cfn-pinpointemail-configurationset-tags-value
+	Value *types.Value `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 *ConfigurationSet_Tags) AWSCloudFormationType() string {
+	return "AWS::PinpointEmail::ConfigurationSet.Tags"
+}
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_trackingoptions.go b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_trackingoptions.go
new file mode 100644
index 0000000000..4b5f6c90c1
--- /dev/null
+++ b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationset_trackingoptions.go
@@ -0,0 +1,37 @@
+package pinpointemail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationSet_TrackingOptions AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSet.TrackingOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationset-trackingoptions.html
+type ConfigurationSet_TrackingOptions struct {
+
+	// CustomRedirectDomain AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationset-trackingoptions.html#cfn-pinpointemail-configurationset-trackingoptions-customredirectdomain
+	CustomRedirectDomain *types.Value `json:"CustomRedirectDomain,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConfigurationSet_TrackingOptions) AWSCloudFormationType() string {
+	return "AWS::PinpointEmail::ConfigurationSet.TrackingOptions"
+}
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination.go b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination.go
new file mode 100644
index 0000000000..99f9aca4bf
--- /dev/null
+++ b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination.go
@@ -0,0 +1,118 @@
+package pinpointemail
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationSetEventDestination AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSetEventDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpointemail-configurationseteventdestination.html
+type ConfigurationSetEventDestination struct {
+
+	// ConfigurationSetName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpointemail-configurationseteventdestination.html#cfn-pinpointemail-configurationseteventdestination-configurationsetname
+	ConfigurationSetName *types.Value `json:"ConfigurationSetName,omitempty"`
+
+	// EventDestination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpointemail-configurationseteventdestination.html#cfn-pinpointemail-configurationseteventdestination-eventdestination
+	EventDestination *ConfigurationSetEventDestination_EventDestination `json:"EventDestination,omitempty"`
+
+	// EventDestinationName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpointemail-configurationseteventdestination.html#cfn-pinpointemail-configurationseteventdestination-eventdestinationname
+	EventDestinationName *types.Value `json:"EventDestinationName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::PinpointEmail::ConfigurationSetEventDestination"
+}
+
+// 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 ConfigurationSetEventDestination) MarshalJSON() ([]byte, error) {
+	type Properties ConfigurationSetEventDestination
+	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 *ConfigurationSetEventDestination) UnmarshalJSON(b []byte) error {
+	type Properties ConfigurationSetEventDestination
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ConfigurationSetEventDestination(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_cloudwatchdestination.go b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_cloudwatchdestination.go
new file mode 100644
index 0000000000..36efe82b9d
--- /dev/null
+++ b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_cloudwatchdestination.go
@@ -0,0 +1,35 @@
+package pinpointemail
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationSetEventDestination_CloudWatchDestination AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSetEventDestination.CloudWatchDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationseteventdestination-cloudwatchdestination.html
+type ConfigurationSetEventDestination_CloudWatchDestination struct {
+
+	// DimensionConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationseteventdestination-cloudwatchdestination.html#cfn-pinpointemail-configurationseteventdestination-cloudwatchdestination-dimensionconfigurations
+	DimensionConfigurations []ConfigurationSetEventDestination_DimensionConfiguration `json:"DimensionConfigurations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CloudWatchDestination) AWSCloudFormationType() string {
+	return "AWS::PinpointEmail::ConfigurationSetEventDestination.CloudWatchDestination"
+}
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_dimensionconfiguration.go b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_dimensionconfiguration.go
new file mode 100644
index 0000000000..983c2926ee
--- /dev/null
+++ b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_dimensionconfiguration.go
@@ -0,0 +1,47 @@
+package pinpointemail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationSetEventDestination_DimensionConfiguration AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSetEventDestination.DimensionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationseteventdestination-dimensionconfiguration.html
+type ConfigurationSetEventDestination_DimensionConfiguration struct {
+
+	// DefaultDimensionValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationseteventdestination-dimensionconfiguration.html#cfn-pinpointemail-configurationseteventdestination-dimensionconfiguration-defaultdimensionvalue
+	DefaultDimensionValue *types.Value `json:"DefaultDimensionValue,omitempty"`
+
+	// DimensionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationseteventdestination-dimensionconfiguration.html#cfn-pinpointemail-configurationseteventdestination-dimensionconfiguration-dimensionname
+	DimensionName *types.Value `json:"DimensionName,omitempty"`
+
+	// DimensionValueSource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationseteventdestination-dimensionconfiguration.html#cfn-pinpointemail-configurationseteventdestination-dimensionconfiguration-dimensionvaluesource
+	DimensionValueSource *types.Value `json:"DimensionValueSource,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DimensionConfiguration) AWSCloudFormationType() string {
+	return "AWS::PinpointEmail::ConfigurationSetEventDestination.DimensionConfiguration"
+}
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_eventdestination.go b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_eventdestination.go
new file mode 100644
index 0000000000..28b4586a35
--- /dev/null
+++ b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_eventdestination.go
@@ -0,0 +1,62 @@
+package pinpointemail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationSetEventDestination_EventDestination AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSetEventDestination.EventDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationseteventdestination-eventdestination.html
+type ConfigurationSetEventDestination_EventDestination struct {
+
+	// CloudWatchDestination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationseteventdestination-eventdestination.html#cfn-pinpointemail-configurationseteventdestination-eventdestination-cloudwatchdestination
+	CloudWatchDestination *ConfigurationSetEventDestination_CloudWatchDestination `json:"CloudWatchDestination,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationseteventdestination-eventdestination.html#cfn-pinpointemail-configurationseteventdestination-eventdestination-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// KinesisFirehoseDestination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationseteventdestination-eventdestination.html#cfn-pinpointemail-configurationseteventdestination-eventdestination-kinesisfirehosedestination
+	KinesisFirehoseDestination *ConfigurationSetEventDestination_KinesisFirehoseDestination `json:"KinesisFirehoseDestination,omitempty"`
+
+	// MatchingEventTypes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationseteventdestination-eventdestination.html#cfn-pinpointemail-configurationseteventdestination-eventdestination-matchingeventtypes
+	MatchingEventTypes *types.Value `json:"MatchingEventTypes,omitempty"`
+
+	// PinpointDestination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationseteventdestination-eventdestination.html#cfn-pinpointemail-configurationseteventdestination-eventdestination-pinpointdestination
+	PinpointDestination *ConfigurationSetEventDestination_PinpointDestination `json:"PinpointDestination,omitempty"`
+
+	// SnsDestination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationseteventdestination-eventdestination.html#cfn-pinpointemail-configurationseteventdestination-eventdestination-snsdestination
+	SnsDestination *ConfigurationSetEventDestination_SnsDestination `json:"SnsDestination,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EventDestination) AWSCloudFormationType() string {
+	return "AWS::PinpointEmail::ConfigurationSetEventDestination.EventDestination"
+}
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_kinesisfirehosedestination.go b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_kinesisfirehosedestination.go
new file mode 100644
index 0000000000..f19beb7287
--- /dev/null
+++ b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_kinesisfirehosedestination.go
@@ -0,0 +1,42 @@
+package pinpointemail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationSetEventDestination_KinesisFirehoseDestination AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSetEventDestination.KinesisFirehoseDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationseteventdestination-kinesisfirehosedestination.html
+type ConfigurationSetEventDestination_KinesisFirehoseDestination struct {
+
+	// DeliveryStreamArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationseteventdestination-kinesisfirehosedestination.html#cfn-pinpointemail-configurationseteventdestination-kinesisfirehosedestination-deliverystreamarn
+	DeliveryStreamArn *types.Value `json:"DeliveryStreamArn,omitempty"`
+
+	// IamRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationseteventdestination-kinesisfirehosedestination.html#cfn-pinpointemail-configurationseteventdestination-kinesisfirehosedestination-iamrolearn
+	IamRoleArn *types.Value `json:"IamRoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_KinesisFirehoseDestination) AWSCloudFormationType() string {
+	return "AWS::PinpointEmail::ConfigurationSetEventDestination.KinesisFirehoseDestination"
+}
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_pinpointdestination.go b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_pinpointdestination.go
new file mode 100644
index 0000000000..3d48039891
--- /dev/null
+++ b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_pinpointdestination.go
@@ -0,0 +1,37 @@
+package pinpointemail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationSetEventDestination_PinpointDestination AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSetEventDestination.PinpointDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationseteventdestination-pinpointdestination.html
+type ConfigurationSetEventDestination_PinpointDestination struct {
+
+	// ApplicationArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationseteventdestination-pinpointdestination.html#cfn-pinpointemail-configurationseteventdestination-pinpointdestination-applicationarn
+	ApplicationArn *types.Value `json:"ApplicationArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PinpointDestination) AWSCloudFormationType() string {
+	return "AWS::PinpointEmail::ConfigurationSetEventDestination.PinpointDestination"
+}
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_snsdestination.go b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_snsdestination.go
new file mode 100644
index 0000000000..6be4690828
--- /dev/null
+++ b/goformation/cloudformation/pinpointemail/aws-pinpointemail-configurationseteventdestination_snsdestination.go
@@ -0,0 +1,37 @@
+package pinpointemail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationSetEventDestination_SnsDestination AWS CloudFormation Resource (AWS::PinpointEmail::ConfigurationSetEventDestination.SnsDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationseteventdestination-snsdestination.html
+type ConfigurationSetEventDestination_SnsDestination struct {
+
+	// TopicArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-configurationseteventdestination-snsdestination.html#cfn-pinpointemail-configurationseteventdestination-snsdestination-topicarn
+	TopicArn *types.Value `json:"TopicArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SnsDestination) AWSCloudFormationType() string {
+	return "AWS::PinpointEmail::ConfigurationSetEventDestination.SnsDestination"
+}
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool.go b/goformation/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool.go
new file mode 100644
index 0000000000..7c794a9fbb
--- /dev/null
+++ b/goformation/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool.go
@@ -0,0 +1,113 @@
+package pinpointemail
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DedicatedIpPool AWS CloudFormation Resource (AWS::PinpointEmail::DedicatedIpPool)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpointemail-dedicatedippool.html
+type DedicatedIpPool struct {
+
+	// PoolName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpointemail-dedicatedippool.html#cfn-pinpointemail-dedicatedippool-poolname
+	PoolName *types.Value `json:"PoolName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpointemail-dedicatedippool.html#cfn-pinpointemail-dedicatedippool-tags
+	Tags []DedicatedIpPool_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 *DedicatedIpPool) AWSCloudFormationType() string {
+	return "AWS::PinpointEmail::DedicatedIpPool"
+}
+
+// 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 DedicatedIpPool) MarshalJSON() ([]byte, error) {
+	type Properties DedicatedIpPool
+	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 *DedicatedIpPool) UnmarshalJSON(b []byte) error {
+	type Properties DedicatedIpPool
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DedicatedIpPool(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool_tags.go b/goformation/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool_tags.go
new file mode 100644
index 0000000000..8b9e547655
--- /dev/null
+++ b/goformation/cloudformation/pinpointemail/aws-pinpointemail-dedicatedippool_tags.go
@@ -0,0 +1,42 @@
+package pinpointemail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DedicatedIpPool_Tags AWS CloudFormation Resource (AWS::PinpointEmail::DedicatedIpPool.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-dedicatedippool-tags.html
+type DedicatedIpPool_Tags struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-dedicatedippool-tags.html#cfn-pinpointemail-dedicatedippool-tags-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-dedicatedippool-tags.html#cfn-pinpointemail-dedicatedippool-tags-value
+	Value *types.Value `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 *DedicatedIpPool_Tags) AWSCloudFormationType() string {
+	return "AWS::PinpointEmail::DedicatedIpPool.Tags"
+}
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity.go b/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity.go
new file mode 100644
index 0000000000..210663aa93
--- /dev/null
+++ b/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity.go
@@ -0,0 +1,128 @@
+package pinpointemail
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Identity AWS CloudFormation Resource (AWS::PinpointEmail::Identity)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpointemail-identity.html
+type Identity struct {
+
+	// DkimSigningEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpointemail-identity.html#cfn-pinpointemail-identity-dkimsigningenabled
+	DkimSigningEnabled *types.Value `json:"DkimSigningEnabled,omitempty"`
+
+	// FeedbackForwardingEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpointemail-identity.html#cfn-pinpointemail-identity-feedbackforwardingenabled
+	FeedbackForwardingEnabled *types.Value `json:"FeedbackForwardingEnabled,omitempty"`
+
+	// MailFromAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpointemail-identity.html#cfn-pinpointemail-identity-mailfromattributes
+	MailFromAttributes *Identity_MailFromAttributes `json:"MailFromAttributes,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpointemail-identity.html#cfn-pinpointemail-identity-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-pinpointemail-identity.html#cfn-pinpointemail-identity-tags
+	Tags []Identity_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 *Identity) AWSCloudFormationType() string {
+	return "AWS::PinpointEmail::Identity"
+}
+
+// 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 Identity) MarshalJSON() ([]byte, error) {
+	type Properties Identity
+	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 *Identity) UnmarshalJSON(b []byte) error {
+	type Properties Identity
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Identity(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity_mailfromattributes.go b/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity_mailfromattributes.go
new file mode 100644
index 0000000000..233c7234da
--- /dev/null
+++ b/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity_mailfromattributes.go
@@ -0,0 +1,42 @@
+package pinpointemail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Identity_MailFromAttributes AWS CloudFormation Resource (AWS::PinpointEmail::Identity.MailFromAttributes)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-identity-mailfromattributes.html
+type Identity_MailFromAttributes struct {
+
+	// BehaviorOnMxFailure AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-identity-mailfromattributes.html#cfn-pinpointemail-identity-mailfromattributes-behavioronmxfailure
+	BehaviorOnMxFailure *types.Value `json:"BehaviorOnMxFailure,omitempty"`
+
+	// MailFromDomain AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-identity-mailfromattributes.html#cfn-pinpointemail-identity-mailfromattributes-mailfromdomain
+	MailFromDomain *types.Value `json:"MailFromDomain,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Identity_MailFromAttributes) AWSCloudFormationType() string {
+	return "AWS::PinpointEmail::Identity.MailFromAttributes"
+}
diff --git a/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity_tags.go b/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity_tags.go
new file mode 100644
index 0000000000..061d0a121c
--- /dev/null
+++ b/goformation/cloudformation/pinpointemail/aws-pinpointemail-identity_tags.go
@@ -0,0 +1,42 @@
+package pinpointemail
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Identity_Tags AWS CloudFormation Resource (AWS::PinpointEmail::Identity.Tags)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-identity-tags.html
+type Identity_Tags struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-identity-tags.html#cfn-pinpointemail-identity-tags-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-pinpointemail-identity-tags.html#cfn-pinpointemail-identity-tags-value
+	Value *types.Value `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 *Identity_Tags) AWSCloudFormationType() string {
+	return "AWS::PinpointEmail::Identity.Tags"
+}
diff --git a/goformation/cloudformation/policies/policies.go b/goformation/cloudformation/policies/policies.go
new file mode 100644
index 0000000000..ab71a13653
--- /dev/null
+++ b/goformation/cloudformation/policies/policies.go
@@ -0,0 +1,118 @@
+package policies
+
+import "goformation/v4/cloudformation/types"
+
+// CreationPolicy prevents a resource status from reaching create complete until AWS CloudFormation receives a specified number of success signals or the timeout period is exceeded. To signal a resource, you can use the cfn-signal helper script or SignalResource API. AWS CloudFormation publishes valid signals to the stack events so that you track the number of signals sent.
+type CreationPolicy struct {
+
+	// AutoScalingCreationPolicy specifies how many instances must signal success for the update to succeed.
+	AutoScalingCreationPolicy *AutoScalingCreationPolicy `json:"AutoScalingCreationPolicy,omitempty"`
+
+	// ResourceSignal configures the number of required success signals and the length of time that AWS CloudFormation waits for those signals.
+	ResourceSignal *ResourceSignal `json:"ResourceSignal,omitempty"`
+}
+
+// AutoScalingCreationPolicy specifies how many instances must signal success for the update to succeed.
+type AutoScalingCreationPolicy struct {
+
+	// MinSuccessfulInstancesPercent specifies the percentage of instances in an Auto Scaling replacement update that must signal success for the update to succeed. You can specify a value from 0 to 100. AWS CloudFormation rounds to the nearest tenth of a percent. For example, if you update five instances with a minimum successful percentage of 50, three instances must signal success. If an instance doesn't send a signal within the time specified by the Timeout property, AWS CloudFormation assumes that the instance wasn't created.
+	MinSuccessfulInstancesPercent float64 `json:"MinSuccessfulInstancesPercent,omitempty"`
+}
+
+// ResourceSignal configures the number of required success signals and the length of time that AWS CloudFormation waits for those signals.
+type ResourceSignal struct {
+
+	// Count is the number of success signals AWS CloudFormation must receive before it sets the resource status as CREATE_COMPLETE. If the resource receives a failure signal or doesn't receive the specified number of signals before the timeout period expires, the resource creation fails and AWS CloudFormation rolls the stack back.
+	Count float64 `json:"Count,omitempty"`
+
+	// Timeout is the length of time that AWS CloudFormation waits for the number of signals that was specified in the Count property. The timeout period starts after AWS CloudFormation starts creating the resource, and the timeout expires no sooner than the time you specify but can occur shortly thereafter. The maximum time that you can specify is 12 hours.
+	// The value must be in ISO8601 duration format, in the form: "PT#H#M#S", where each # is the number of hours, minutes, and seconds, respectively. For best results, specify a period of time that gives your instances plenty of time to get up and running. A shorter timeout can cause a rollback.
+	Timeout string `json:"Timeout,omitempty"`
+}
+
+// DeletionPolicy can preserve or (in some cases) backup a resource when its stack is deleted. You specify a DeletionPolicy attribute for each resource that you want to control. If a resource has no DeletionPolicy attribute, AWS CloudFormation deletes the resource by default.
+// Either "Delete", "Retain" or "Snapshot".
+// see: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-deletionpolicy.html
+type DeletionPolicy string
+
+// UpdateReplacePolicy can retain or (in some cases) backup the existing physical instance of a resource when it is replaced during a stack update operation.
+// You specify a UpdateReplacePolicy attribute for each resource that you want to control. If a resource has no UpdateReplacePolicy attribute, AWS CloudFormation deletes the resource by default.
+// Either "Delete", "Retain" or "Snapshot".
+// see: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-updatereplacepolicy.html
+type UpdateReplacePolicy string
+
+// UpdatePolicy specifies how AWS CloudFormation handles updates to the AWS::AutoScaling::AutoScalingGroup or AWS::Lambda::Alias resource.
+// For AWS::AutoScaling::AutoScalingGroup resources, AWS CloudFormation invokes one of three update policies depending on the type of change you make or whether a scheduled action is associated with the Auto Scaling group.
+// The AutoScalingReplacingUpdate and AutoScalingRollingUpdate policies apply only when you do one or more of the following:
+// - Change the Auto Scaling group's AWS::AutoScaling::LaunchConfiguration.
+// - Change the Auto Scaling group's VPCZoneIdentifier property
+// - Change the Auto Scaling group's LaunchTemplate property
+// - Update an Auto Scaling group that contains instances that don't match the current LaunchConfiguration.
+// If both the AutoScalingReplacingUpdate and AutoScalingRollingUpdate policies are specified, setting the WillReplace property to true gives AutoScalingReplacingUpdate precedence.
+// The AutoScalingScheduledAction policy applies when you update a stack that includes an Auto Scaling group with an associated scheduled action.
+// For AWS::Lambda::Alias resources, AWS CloudFormation performs an AWS CodeDeploy deployment when the version changes on the alias. For more information, see CodeDeployLambdaAliasUpdate Policy.
+type UpdatePolicy struct {
+
+	// AutoScalingReplacingUpdate specifies whether AWS CloudFormation replaces an Auto Scaling group with a new one or replaces only the instances in the Auto Scaling group.
+	AutoScalingReplacingUpdate *AutoScalingReplacingUpdate `json:"AutoScalingReplacingUpdate,omitempty"`
+
+	// AutoScalingRollingUpdate enable you to specify whether AWS CloudFormation updates instances that are in an Auto Scaling group in batches or all at once.
+	AutoScalingRollingUpdate *AutoScalingRollingUpdate `json:"AutoScalingRollingUpdate,omitempty"`
+
+	// AutoScalingScheduledAction specifies how AWS CloudFormation handles updates for the MinSize, MaxSize, and DesiredCapacity properties when the AWS::AutoScaling::AutoScalingGroup resource has an associated scheduled action.
+	AutoScalingScheduledAction *AutoScalingScheduledAction `json:"AutoScalingScheduledAction,omitempty"`
+
+	// CodeDeployLambdaAliasUpdate performs an AWS CodeDeploy deployment when the version changes on an AWS::Lambda::Alias resource.
+	CodeDeployLambdaAliasUpdate *CodeDeployLambdaAliasUpdate `json:"CodeDeployLambdaAliasUpdate,omitempty"`
+}
+
+// AutoScalingScheduledAction specifies how AWS CloudFormation handles updates for the MinSize, MaxSize, and DesiredCapacity properties when the AWS::AutoScaling::AutoScalingGroup resource has an associated scheduled action, use the AutoScalingScheduledAction policy.
+// With scheduled actions, the group size properties of an Auto Scaling group can change at any time. When you update a stack with an Auto Scaling group and scheduled action, AWS CloudFormation always sets the group size property values of your Auto Scaling group to the values that are defined in the AWS::AutoScaling::AutoScalingGroup resource of your template, even if a scheduled action is in effect.
+// If you do not want AWS CloudFormation to change any of the group size property values when you have a scheduled action in effect, use the AutoScalingScheduledAction update policy to prevent AWS CloudFormation from changing the MinSize, MaxSize, or DesiredCapacity properties unless you have modified these values in your template.
+type AutoScalingScheduledAction struct {
+	// Specifies whether AWS CloudFormation ignores differences in group size properties between your current Auto Scaling group and the Auto Scaling group described in the AWS::AutoScaling::AutoScalingGroup resource of your template during a stack update. If you modify any of the group size property values in your template, AWS CloudFormation uses the modified values and updates your Auto Scaling group. (default: false)
+	IgnoreUnmodifiedGroupSizeProperties bool `json:"IgnoreUnmodifiedGroupSizeProperties,omitempty"`
+}
+
+// AutoScalingReplacingUpdate specifies whether AWS CloudFormation replaces an Auto Scaling group with a new one or replaces only the instances in the Auto Scaling group.
+type AutoScalingReplacingUpdate struct {
+	WillReplace bool `json:"WillReplace,omitempty"`
+}
+
+// AutoScalingRollingUpdate enable you to specify whether AWS CloudFormation updates instances that are in an Auto Scaling group in batches or all at once.
+type AutoScalingRollingUpdate struct {
+
+	// MaxBatchSize specifies the maximum number of instances that AWS CloudFormation updates.
+	MaxBatchSize *types.Value `json:"MaxBatchSize,omitempty"`
+
+	// MinInstancesInService specifies the minimum number of instances that must be in service within the Auto Scaling group while AWS CloudFormation updates old instances.
+	MinInstancesInService *types.Value `json:"MinInstancesInService,omitempty"`
+
+	// MinSuccessfulInstancesPercent specifies the percentage of instances in an Auto Scaling rolling update that must signal success for an update to succeed. You can specify a value from 0 to 100. AWS CloudFormation rounds to the nearest tenth of a percent. For example, if you update five instances with a minimum successful percentage of 50, three instances must signal success.
+	MinSuccessfulInstancesPercent float64 `json:"MinSuccessfulInstancesPercent,omitempty"`
+
+	// PauseTime is the amount of time that AWS CloudFormation pauses after making a change to a batch of instances to give those instances time to start software applications. For example, you might need to specify PauseTime when scaling up the number of instances in an Auto Scaling group.
+	PauseTime string `json:"PauseTime,omitempty"`
+
+	// SuspendProcesses specifies the Auto Scaling processes to suspend during a stack update. Suspending processes prevents Auto Scaling from interfering with a stack update. For example, you can suspend alarming so that Amazon EC2 Auto Scaling doesn't execute scaling policies associated with an alarm. For valid values, see the ScalingProcesses.member.N parameter for the SuspendProcesses action in the Amazon EC2 Auto Scaling API Reference.
+	SuspendProcesses []string `json:"SuspendProcesses,omitempty"`
+
+	// WaitOnResourceSignals specifies whether the Auto Scaling group waits on signals from new instances during an update. Use this property to ensure that instances have completed installing and configuring applications before the Auto Scaling group update proceeds. AWS CloudFormation suspends the update of an Auto Scaling group after new EC2 instances are launched into the group. AWS CloudFormation must receive a signal from each new instance within the specified PauseTime before continuing the update. To signal the Auto Scaling group, use the cfn-signal helper script or SignalResource API.
+	WaitOnResourceSignals bool `json:"WaitOnResourceSignals,omitempty"`
+}
+
+// CodeDeployLambdaAliasUpdate performs an AWS CodeDeploy deployment when the version changes on an AWS::Lambda::Alias resource.
+type CodeDeployLambdaAliasUpdate struct {
+
+	// AfterAllowTrafficHook is the name of the Lambda function to run after traffic routing completes.
+	AfterAllowTrafficHook string `json:"AfterAllowTrafficHook,omitempty"`
+
+	// ApplicationName is the name of the AWS CodeDeploy application.
+	ApplicationName string `json:"ApplicationName"`
+
+	// BeforeAllowTrafficHook is the name of the Lambda function to run before traffic routing starts.
+	BeforeAllowTrafficHook string `json:"BeforeAllowTrafficHook,omitempty"`
+
+	// DeploymentGroupName is the name of the AWS CodeDeploy deployment group. This is where the traffic-shifting policy is set.
+	DeploymentGroupName string `json:"DeploymentGroupName"`
+}
diff --git a/goformation/cloudformation/policies_test.go b/goformation/cloudformation/policies_test.go
new file mode 100644
index 0000000000..60632a6ae4
--- /dev/null
+++ b/goformation/cloudformation/policies_test.go
@@ -0,0 +1,257 @@
+package cloudformation_test
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"github.com/sanathkr/yaml"
+
+	"goformation/v4/cloudformation"
+	"goformation/v4/cloudformation/autoscaling"
+	"goformation/v4/cloudformation/policies"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Goformation", func() {
+
+	Context("with a template that contains an UpdatePolicy", func() {
+
+		tests := []struct {
+			Name     string
+			Input    *policies.UpdatePolicy
+			Expected interface{}
+		}{
+			{
+				Name: "AutoScalingReplacingUpdate",
+				Input: &policies.UpdatePolicy{
+					AutoScalingReplacingUpdate: &policies.AutoScalingReplacingUpdate{
+						WillReplace: true,
+					},
+				},
+				Expected: map[string]interface{}{
+					"AutoScalingReplacingUpdate": map[string]interface{}{
+						"WillReplace": true,
+					},
+				},
+			},
+			{
+				Name: "AutoScalingReplacingUpdate",
+				Input: &policies.UpdatePolicy{
+					AutoScalingRollingUpdate: &policies.AutoScalingRollingUpdate{
+						MaxBatchSize:                  types.NewInteger(10),
+						MinInstancesInService:         types.NewInteger(11),
+						MinSuccessfulInstancesPercent: float64(12),
+						PauseTime:                     "test-pause-time",
+						SuspendProcesses:              []string{"test-suspend1", "test-suspend2"},
+						WaitOnResourceSignals:         true,
+					},
+				},
+				Expected: map[string]interface{}{
+					"AutoScalingRollingUpdate": map[string]interface{}{
+						"MaxBatchSize":                  float64(10),
+						"MinInstancesInService":         float64(11),
+						"MinSuccessfulInstancesPercent": float64(12),
+						"PauseTime":                     "test-pause-time",
+						"SuspendProcesses":              []interface{}{"test-suspend1", "test-suspend2"},
+						"WaitOnResourceSignals":         true,
+					},
+				},
+			},
+			{
+				Name: "AutoScalingScheduledAction",
+				Input: &policies.UpdatePolicy{
+					AutoScalingScheduledAction: &policies.AutoScalingScheduledAction{
+						IgnoreUnmodifiedGroupSizeProperties: true,
+					},
+				},
+				Expected: map[string]interface{}{
+					"AutoScalingScheduledAction": map[string]interface{}{
+						"IgnoreUnmodifiedGroupSizeProperties": true,
+					},
+				},
+			},
+			{
+				Name: "CodeDeployLambdaAliasUpdate",
+				Input: &policies.UpdatePolicy{
+					CodeDeployLambdaAliasUpdate: &policies.CodeDeployLambdaAliasUpdate{
+						ApplicationName:        "test-application-name",
+						DeploymentGroupName:    "test-deployment-group-name",
+						AfterAllowTrafficHook:  "test-after-allow-traffic-hook",
+						BeforeAllowTrafficHook: "test-before-allow-traffic-hook",
+					},
+				},
+				Expected: map[string]interface{}{
+					"CodeDeployLambdaAliasUpdate": map[string]interface{}{
+						"ApplicationName":        "test-application-name",
+						"DeploymentGroupName":    "test-deployment-group-name",
+						"AfterAllowTrafficHook":  "test-after-allow-traffic-hook",
+						"BeforeAllowTrafficHook": "test-before-allow-traffic-hook",
+					},
+				},
+			},
+		}
+
+		for _, test := range tests {
+			test := test
+
+			It("should have the correct values for "+test.Name, func() {
+
+				asg := autoscaling.AutoScalingGroup{}
+				asg.AWSCloudFormationUpdatePolicy = test.Input
+
+				template := &cloudformation.Template{
+					Resources: cloudformation.Resources{"AutoScalingGroup": &asg},
+				}
+
+				data, err := template.JSON()
+				Expect(err).To(BeNil())
+
+				var result map[string]interface{}
+				if err := yaml.Unmarshal(data, &result); err != nil {
+					Fail(err.Error())
+				}
+
+				resources, ok := result["Resources"].(map[string]interface{})
+				Expect(ok).To(BeTrue())
+
+				bucket, ok := resources["AutoScalingGroup"].(map[string]interface{})
+				Expect(ok).To(BeTrue())
+
+				policy, ok := bucket["UpdatePolicy"].(map[string]interface{})
+				Expect(ok).To(BeTrue())
+				Expect(policy).To(BeEquivalentTo(test.Expected))
+
+			})
+
+		}
+
+	})
+
+	Context("with a template that contains an CreationPolicy", func() {
+
+		tests := []struct {
+			Name     string
+			Input    *policies.CreationPolicy
+			Expected interface{}
+		}{
+			{
+				Name: "CreationPolicy",
+				Input: &policies.CreationPolicy{
+					AutoScalingCreationPolicy: &policies.AutoScalingCreationPolicy{
+						MinSuccessfulInstancesPercent: 10,
+					},
+					ResourceSignal: &policies.ResourceSignal{
+						Count:   11,
+						Timeout: "test-timeout",
+					},
+				},
+				Expected: map[string]interface{}{
+					"AutoScalingCreationPolicy": map[string]interface{}{
+						"MinSuccessfulInstancesPercent": float64(10),
+					},
+					"ResourceSignal": map[string]interface{}{
+						"Count":   float64(11),
+						"Timeout": "test-timeout",
+					},
+				},
+			},
+		}
+
+		for _, test := range tests {
+			test := test
+
+			It("should have the correct values for "+test.Name, func() {
+
+				asg := autoscaling.AutoScalingGroup{}
+				asg.AWSCloudFormationCreationPolicy = test.Input
+
+				template := &cloudformation.Template{
+					Resources: cloudformation.Resources{"AutoScalingGroup": &asg},
+				}
+
+				data, err := template.JSON()
+				Expect(err).To(BeNil())
+
+				var result map[string]interface{}
+				if err := yaml.Unmarshal(data, &result); err != nil {
+					Fail(err.Error())
+				}
+
+				resources, ok := result["Resources"].(map[string]interface{})
+				Expect(ok).To(BeTrue())
+
+				bucket, ok := resources["AutoScalingGroup"].(map[string]interface{})
+				Expect(ok).To(BeTrue())
+
+				policy, ok := bucket["CreationPolicy"].(map[string]interface{})
+				Expect(ok).To(BeTrue())
+				Expect(policy).To(BeEquivalentTo(test.Expected))
+
+			})
+
+		}
+
+	})
+
+	Context("with a template that contains an DeletionPolicy", func() {
+
+		tests := []struct {
+			Name     string
+			Input    policies.DeletionPolicy
+			Expected interface{}
+		}{
+			{
+				Name:     "DeletionPolicy-Delete",
+				Input:    "Delete",
+				Expected: "Delete",
+			},
+			{
+				Name:     "DeletionPolicy-Retain",
+				Input:    "Retain",
+				Expected: "Retain",
+			},
+			{
+				Name:     "DeletionPolicy-Snapshot",
+				Input:    "Snapshot",
+				Expected: "Snapshot",
+			},
+		}
+
+		for _, test := range tests {
+			test := test
+
+			It("should have the correct values for "+test.Name, func() {
+
+				asg := autoscaling.AutoScalingGroup{}
+				asg.AWSCloudFormationDeletionPolicy = test.Input
+
+				template := &cloudformation.Template{
+					Resources: cloudformation.Resources{"AutoScalingGroup": &asg},
+				}
+
+				data, err := template.JSON()
+				Expect(err).To(BeNil())
+
+				var result map[string]interface{}
+				if err := yaml.Unmarshal(data, &result); err != nil {
+					Fail(err.Error())
+				}
+
+				resources, ok := result["Resources"].(map[string]interface{})
+				Expect(ok).To(BeTrue())
+
+				bucket, ok := resources["AutoScalingGroup"].(map[string]interface{})
+				Expect(ok).To(BeTrue())
+
+				policy, ok := bucket["DeletionPolicy"].(string)
+				Expect(ok).To(BeTrue())
+				Expect(policy).To(Equal(test.Expected))
+
+			})
+
+		}
+
+	})
+
+})
diff --git a/goformation/cloudformation/qldb/aws-qldb-ledger.go b/goformation/cloudformation/qldb/aws-qldb-ledger.go
new file mode 100644
index 0000000000..ae1997a8bf
--- /dev/null
+++ b/goformation/cloudformation/qldb/aws-qldb-ledger.go
@@ -0,0 +1,129 @@
+package qldb
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Ledger AWS CloudFormation Resource (AWS::QLDB::Ledger)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qldb-ledger.html
+type Ledger struct {
+
+	// DeletionProtection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qldb-ledger.html#cfn-qldb-ledger-deletionprotection
+	DeletionProtection *types.Value `json:"DeletionProtection,omitempty"`
+
+	// KmsKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qldb-ledger.html#cfn-qldb-ledger-kmskey
+	KmsKey *types.Value `json:"KmsKey,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qldb-ledger.html#cfn-qldb-ledger-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// PermissionsMode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qldb-ledger.html#cfn-qldb-ledger-permissionsmode
+	PermissionsMode *types.Value `json:"PermissionsMode,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qldb-ledger.html#cfn-qldb-ledger-tags
+	Tags []cloudformation.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 *Ledger) AWSCloudFormationType() string {
+	return "AWS::QLDB::Ledger"
+}
+
+// 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 Ledger) MarshalJSON() ([]byte, error) {
+	type Properties Ledger
+	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 *Ledger) UnmarshalJSON(b []byte) error {
+	type Properties Ledger
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Ledger(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/qldb/aws-qldb-stream.go b/goformation/cloudformation/qldb/aws-qldb-stream.go
new file mode 100644
index 0000000000..577490ee22
--- /dev/null
+++ b/goformation/cloudformation/qldb/aws-qldb-stream.go
@@ -0,0 +1,139 @@
+package qldb
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stream AWS CloudFormation Resource (AWS::QLDB::Stream)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qldb-stream.html
+type Stream struct {
+
+	// ExclusiveEndTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qldb-stream.html#cfn-qldb-stream-exclusiveendtime
+	ExclusiveEndTime *types.Value `json:"ExclusiveEndTime,omitempty"`
+
+	// InclusiveStartTime AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qldb-stream.html#cfn-qldb-stream-inclusivestarttime
+	InclusiveStartTime *types.Value `json:"InclusiveStartTime,omitempty"`
+
+	// KinesisConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qldb-stream.html#cfn-qldb-stream-kinesisconfiguration
+	KinesisConfiguration *Stream_KinesisConfiguration `json:"KinesisConfiguration,omitempty"`
+
+	// LedgerName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qldb-stream.html#cfn-qldb-stream-ledgername
+	LedgerName *types.Value `json:"LedgerName,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qldb-stream.html#cfn-qldb-stream-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// StreamName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qldb-stream.html#cfn-qldb-stream-streamname
+	StreamName *types.Value `json:"StreamName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-qldb-stream.html#cfn-qldb-stream-tags
+	Tags []cloudformation.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 *Stream) AWSCloudFormationType() string {
+	return "AWS::QLDB::Stream"
+}
+
+// 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 Stream) MarshalJSON() ([]byte, error) {
+	type Properties Stream
+	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 *Stream) UnmarshalJSON(b []byte) error {
+	type Properties Stream
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Stream(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/qldb/aws-qldb-stream_kinesisconfiguration.go b/goformation/cloudformation/qldb/aws-qldb-stream_kinesisconfiguration.go
new file mode 100644
index 0000000000..88c3e91a78
--- /dev/null
+++ b/goformation/cloudformation/qldb/aws-qldb-stream_kinesisconfiguration.go
@@ -0,0 +1,42 @@
+package qldb
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Stream_KinesisConfiguration AWS CloudFormation Resource (AWS::QLDB::Stream.KinesisConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qldb-stream-kinesisconfiguration.html
+type Stream_KinesisConfiguration struct {
+
+	// AggregationEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qldb-stream-kinesisconfiguration.html#cfn-qldb-stream-kinesisconfiguration-aggregationenabled
+	AggregationEnabled *types.Value `json:"AggregationEnabled,omitempty"`
+
+	// StreamArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-qldb-stream-kinesisconfiguration.html#cfn-qldb-stream-kinesisconfiguration-streamarn
+	StreamArn *types.Value `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 *Stream_KinesisConfiguration) AWSCloudFormationType() string {
+	return "AWS::QLDB::Stream.KinesisConfiguration"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis.go b/goformation/cloudformation/quicksight/aws-quicksight-analysis.go
new file mode 100644
index 0000000000..0e971f804e
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-analysis.go
@@ -0,0 +1,149 @@
+package quicksight
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Analysis AWS CloudFormation Resource (AWS::QuickSight::Analysis)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-analysis.html
+type Analysis struct {
+
+	// AnalysisId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-analysis.html#cfn-quicksight-analysis-analysisid
+	AnalysisId *types.Value `json:"AnalysisId,omitempty"`
+
+	// AwsAccountId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-analysis.html#cfn-quicksight-analysis-awsaccountid
+	AwsAccountId *types.Value `json:"AwsAccountId,omitempty"`
+
+	// Errors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-analysis.html#cfn-quicksight-analysis-errors
+	Errors []Analysis_AnalysisError `json:"Errors,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-analysis.html#cfn-quicksight-analysis-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-analysis.html#cfn-quicksight-analysis-parameters
+	Parameters *Analysis_Parameters `json:"Parameters,omitempty"`
+
+	// Permissions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-analysis.html#cfn-quicksight-analysis-permissions
+	Permissions []Analysis_ResourcePermission `json:"Permissions,omitempty"`
+
+	// SourceEntity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-analysis.html#cfn-quicksight-analysis-sourceentity
+	SourceEntity *Analysis_AnalysisSourceEntity `json:"SourceEntity,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-analysis.html#cfn-quicksight-analysis-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// ThemeArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-analysis.html#cfn-quicksight-analysis-themearn
+	ThemeArn *types.Value `json:"ThemeArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis"
+}
+
+// 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 Analysis) MarshalJSON() ([]byte, error) {
+	type Properties Analysis
+	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 *Analysis) UnmarshalJSON(b []byte) error {
+	type Properties Analysis
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Analysis(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysiserror.go b/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysiserror.go
new file mode 100644
index 0000000000..f3bbce0aa7
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysiserror.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Analysis_AnalysisError AWS CloudFormation Resource (AWS::QuickSight::Analysis.AnalysisError)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-analysiserror.html
+type Analysis_AnalysisError struct {
+
+	// Message AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-analysiserror.html#cfn-quicksight-analysis-analysiserror-message
+	Message *types.Value `json:"Message,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-analysiserror.html#cfn-quicksight-analysis-analysiserror-type
+	Type *types.Value `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 *Analysis_AnalysisError) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.AnalysisError"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysissourceentity.go b/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysissourceentity.go
new file mode 100644
index 0000000000..a609239401
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysissourceentity.go
@@ -0,0 +1,35 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Analysis_AnalysisSourceEntity AWS CloudFormation Resource (AWS::QuickSight::Analysis.AnalysisSourceEntity)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-analysissourceentity.html
+type Analysis_AnalysisSourceEntity struct {
+
+	// SourceTemplate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-analysissourceentity.html#cfn-quicksight-analysis-analysissourceentity-sourcetemplate
+	SourceTemplate *Analysis_AnalysisSourceTemplate `json:"SourceTemplate,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AnalysisSourceEntity) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.AnalysisSourceEntity"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysissourcetemplate.go b/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysissourcetemplate.go
new file mode 100644
index 0000000000..2e17d3ba65
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-analysis_analysissourcetemplate.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Analysis_AnalysisSourceTemplate AWS CloudFormation Resource (AWS::QuickSight::Analysis.AnalysisSourceTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-analysissourcetemplate.html
+type Analysis_AnalysisSourceTemplate struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-analysissourcetemplate.html#cfn-quicksight-analysis-analysissourcetemplate-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// DataSetReferences AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-analysissourcetemplate.html#cfn-quicksight-analysis-analysissourcetemplate-datasetreferences
+	DataSetReferences []Analysis_DataSetReference `json:"DataSetReferences,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AnalysisSourceTemplate) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.AnalysisSourceTemplate"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_datasetreference.go b/goformation/cloudformation/quicksight/aws-quicksight-analysis_datasetreference.go
new file mode 100644
index 0000000000..e6669dc2e4
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-analysis_datasetreference.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Analysis_DataSetReference AWS CloudFormation Resource (AWS::QuickSight::Analysis.DataSetReference)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-datasetreference.html
+type Analysis_DataSetReference struct {
+
+	// DataSetArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-datasetreference.html#cfn-quicksight-analysis-datasetreference-datasetarn
+	DataSetArn *types.Value `json:"DataSetArn,omitempty"`
+
+	// DataSetPlaceholder AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-datasetreference.html#cfn-quicksight-analysis-datasetreference-datasetplaceholder
+	DataSetPlaceholder *types.Value `json:"DataSetPlaceholder,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DataSetReference) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.DataSetReference"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_datetimeparameter.go b/goformation/cloudformation/quicksight/aws-quicksight-analysis_datetimeparameter.go
new file mode 100644
index 0000000000..06e91d16c0
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-analysis_datetimeparameter.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Analysis_DateTimeParameter AWS CloudFormation Resource (AWS::QuickSight::Analysis.DateTimeParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-datetimeparameter.html
+type Analysis_DateTimeParameter struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-datetimeparameter.html#cfn-quicksight-analysis-datetimeparameter-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-datetimeparameter.html#cfn-quicksight-analysis-datetimeparameter-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DateTimeParameter) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.DateTimeParameter"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_decimalparameter.go b/goformation/cloudformation/quicksight/aws-quicksight-analysis_decimalparameter.go
new file mode 100644
index 0000000000..329c7c82d2
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-analysis_decimalparameter.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Analysis_DecimalParameter AWS CloudFormation Resource (AWS::QuickSight::Analysis.DecimalParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-decimalparameter.html
+type Analysis_DecimalParameter struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-decimalparameter.html#cfn-quicksight-analysis-decimalparameter-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-decimalparameter.html#cfn-quicksight-analysis-decimalparameter-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DecimalParameter) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.DecimalParameter"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_integerparameter.go b/goformation/cloudformation/quicksight/aws-quicksight-analysis_integerparameter.go
new file mode 100644
index 0000000000..bc155fdf44
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-analysis_integerparameter.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Analysis_IntegerParameter AWS CloudFormation Resource (AWS::QuickSight::Analysis.IntegerParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-integerparameter.html
+type Analysis_IntegerParameter struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-integerparameter.html#cfn-quicksight-analysis-integerparameter-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-integerparameter.html#cfn-quicksight-analysis-integerparameter-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_IntegerParameter) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.IntegerParameter"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_parameters.go b/goformation/cloudformation/quicksight/aws-quicksight-analysis_parameters.go
new file mode 100644
index 0000000000..2433d8870e
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-analysis_parameters.go
@@ -0,0 +1,50 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Analysis_Parameters AWS CloudFormation Resource (AWS::QuickSight::Analysis.Parameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-parameters.html
+type Analysis_Parameters struct {
+
+	// DateTimeParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-parameters.html#cfn-quicksight-analysis-parameters-datetimeparameters
+	DateTimeParameters []Analysis_DateTimeParameter `json:"DateTimeParameters,omitempty"`
+
+	// DecimalParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-parameters.html#cfn-quicksight-analysis-parameters-decimalparameters
+	DecimalParameters []Analysis_DecimalParameter `json:"DecimalParameters,omitempty"`
+
+	// IntegerParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-parameters.html#cfn-quicksight-analysis-parameters-integerparameters
+	IntegerParameters []Analysis_IntegerParameter `json:"IntegerParameters,omitempty"`
+
+	// StringParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-parameters.html#cfn-quicksight-analysis-parameters-stringparameters
+	StringParameters []Analysis_StringParameter `json:"StringParameters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Parameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.Parameters"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_resourcepermission.go b/goformation/cloudformation/quicksight/aws-quicksight-analysis_resourcepermission.go
new file mode 100644
index 0000000000..e12330a72e
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-analysis_resourcepermission.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Analysis_ResourcePermission AWS CloudFormation Resource (AWS::QuickSight::Analysis.ResourcePermission)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-resourcepermission.html
+type Analysis_ResourcePermission struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-resourcepermission.html#cfn-quicksight-analysis-resourcepermission-actions
+	Actions *types.Value `json:"Actions,omitempty"`
+
+	// Principal AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-resourcepermission.html#cfn-quicksight-analysis-resourcepermission-principal
+	Principal *types.Value `json:"Principal,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ResourcePermission) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.ResourcePermission"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_sheet.go b/goformation/cloudformation/quicksight/aws-quicksight-analysis_sheet.go
new file mode 100644
index 0000000000..9fb8068ef9
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-analysis_sheet.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Analysis_Sheet AWS CloudFormation Resource (AWS::QuickSight::Analysis.Sheet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-sheet.html
+type Analysis_Sheet struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-sheet.html#cfn-quicksight-analysis-sheet-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SheetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-sheet.html#cfn-quicksight-analysis-sheet-sheetid
+	SheetId *types.Value `json:"SheetId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Sheet) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.Sheet"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-analysis_stringparameter.go b/goformation/cloudformation/quicksight/aws-quicksight-analysis_stringparameter.go
new file mode 100644
index 0000000000..2d5e582651
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-analysis_stringparameter.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Analysis_StringParameter AWS CloudFormation Resource (AWS::QuickSight::Analysis.StringParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-stringparameter.html
+type Analysis_StringParameter struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-stringparameter.html#cfn-quicksight-analysis-stringparameter-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-analysis-stringparameter.html#cfn-quicksight-analysis-stringparameter-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_StringParameter) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Analysis.StringParameter"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard.go b/goformation/cloudformation/quicksight/aws-quicksight-dashboard.go
new file mode 100644
index 0000000000..61ad391010
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dashboard.go
@@ -0,0 +1,154 @@
+package quicksight
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dashboard AWS CloudFormation Resource (AWS::QuickSight::Dashboard)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dashboard.html
+type Dashboard struct {
+
+	// AwsAccountId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dashboard.html#cfn-quicksight-dashboard-awsaccountid
+	AwsAccountId *types.Value `json:"AwsAccountId,omitempty"`
+
+	// DashboardId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dashboard.html#cfn-quicksight-dashboard-dashboardid
+	DashboardId *types.Value `json:"DashboardId,omitempty"`
+
+	// DashboardPublishOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dashboard.html#cfn-quicksight-dashboard-dashboardpublishoptions
+	DashboardPublishOptions *Dashboard_DashboardPublishOptions `json:"DashboardPublishOptions,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dashboard.html#cfn-quicksight-dashboard-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dashboard.html#cfn-quicksight-dashboard-parameters
+	Parameters *Dashboard_Parameters `json:"Parameters,omitempty"`
+
+	// Permissions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dashboard.html#cfn-quicksight-dashboard-permissions
+	Permissions []Dashboard_ResourcePermission `json:"Permissions,omitempty"`
+
+	// SourceEntity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dashboard.html#cfn-quicksight-dashboard-sourceentity
+	SourceEntity *Dashboard_DashboardSourceEntity `json:"SourceEntity,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dashboard.html#cfn-quicksight-dashboard-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// ThemeArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dashboard.html#cfn-quicksight-dashboard-themearn
+	ThemeArn *types.Value `json:"ThemeArn,omitempty"`
+
+	// VersionDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dashboard.html#cfn-quicksight-dashboard-versiondescription
+	VersionDescription *types.Value `json:"VersionDescription,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard"
+}
+
+// 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 Dashboard) MarshalJSON() ([]byte, error) {
+	type Properties Dashboard
+	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 *Dashboard) UnmarshalJSON(b []byte) error {
+	type Properties Dashboard
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Dashboard(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/quicksight/aws-quicksight-dashboard_adhocfilteringoption.go b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_adhocfilteringoption.go
new file mode 100644
index 0000000000..f384e19038
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_adhocfilteringoption.go
@@ -0,0 +1,37 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dashboard_AdHocFilteringOption AWS CloudFormation Resource (AWS::QuickSight::Dashboard.AdHocFilteringOption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-adhocfilteringoption.html
+type Dashboard_AdHocFilteringOption struct {
+
+	// AvailabilityStatus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-adhocfilteringoption.html#cfn-quicksight-dashboard-adhocfilteringoption-availabilitystatus
+	AvailabilityStatus *types.Value `json:"AvailabilityStatus,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AdHocFilteringOption) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.AdHocFilteringOption"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardpublishoptions.go b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardpublishoptions.go
new file mode 100644
index 0000000000..5bf744d1f7
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardpublishoptions.go
@@ -0,0 +1,45 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dashboard_DashboardPublishOptions AWS CloudFormation Resource (AWS::QuickSight::Dashboard.DashboardPublishOptions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-dashboardpublishoptions.html
+type Dashboard_DashboardPublishOptions struct {
+
+	// AdHocFilteringOption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-dashboardpublishoptions.html#cfn-quicksight-dashboard-dashboardpublishoptions-adhocfilteringoption
+	AdHocFilteringOption *Dashboard_AdHocFilteringOption `json:"AdHocFilteringOption,omitempty"`
+
+	// ExportToCSVOption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-dashboardpublishoptions.html#cfn-quicksight-dashboard-dashboardpublishoptions-exporttocsvoption
+	ExportToCSVOption *Dashboard_ExportToCSVOption `json:"ExportToCSVOption,omitempty"`
+
+	// SheetControlsOption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-dashboardpublishoptions.html#cfn-quicksight-dashboard-dashboardpublishoptions-sheetcontrolsoption
+	SheetControlsOption *Dashboard_SheetControlsOption `json:"SheetControlsOption,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DashboardPublishOptions) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.DashboardPublishOptions"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourceentity.go b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourceentity.go
new file mode 100644
index 0000000000..b793db02ec
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourceentity.go
@@ -0,0 +1,35 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dashboard_DashboardSourceEntity AWS CloudFormation Resource (AWS::QuickSight::Dashboard.DashboardSourceEntity)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-dashboardsourceentity.html
+type Dashboard_DashboardSourceEntity struct {
+
+	// SourceTemplate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-dashboardsourceentity.html#cfn-quicksight-dashboard-dashboardsourceentity-sourcetemplate
+	SourceTemplate *Dashboard_DashboardSourceTemplate `json:"SourceTemplate,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DashboardSourceEntity) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.DashboardSourceEntity"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourcetemplate.go b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourcetemplate.go
new file mode 100644
index 0000000000..11d5ed273a
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_dashboardsourcetemplate.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dashboard_DashboardSourceTemplate AWS CloudFormation Resource (AWS::QuickSight::Dashboard.DashboardSourceTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-dashboardsourcetemplate.html
+type Dashboard_DashboardSourceTemplate struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-dashboardsourcetemplate.html#cfn-quicksight-dashboard-dashboardsourcetemplate-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// DataSetReferences AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-dashboardsourcetemplate.html#cfn-quicksight-dashboard-dashboardsourcetemplate-datasetreferences
+	DataSetReferences []Dashboard_DataSetReference `json:"DataSetReferences,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DashboardSourceTemplate) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.DashboardSourceTemplate"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_datasetreference.go b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_datasetreference.go
new file mode 100644
index 0000000000..b14fefbe75
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_datasetreference.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dashboard_DataSetReference AWS CloudFormation Resource (AWS::QuickSight::Dashboard.DataSetReference)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-datasetreference.html
+type Dashboard_DataSetReference struct {
+
+	// DataSetArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-datasetreference.html#cfn-quicksight-dashboard-datasetreference-datasetarn
+	DataSetArn *types.Value `json:"DataSetArn,omitempty"`
+
+	// DataSetPlaceholder AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-datasetreference.html#cfn-quicksight-dashboard-datasetreference-datasetplaceholder
+	DataSetPlaceholder *types.Value `json:"DataSetPlaceholder,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DataSetReference) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.DataSetReference"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_datetimeparameter.go b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_datetimeparameter.go
new file mode 100644
index 0000000000..db6f531918
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_datetimeparameter.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dashboard_DateTimeParameter AWS CloudFormation Resource (AWS::QuickSight::Dashboard.DateTimeParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-datetimeparameter.html
+type Dashboard_DateTimeParameter struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-datetimeparameter.html#cfn-quicksight-dashboard-datetimeparameter-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-datetimeparameter.html#cfn-quicksight-dashboard-datetimeparameter-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DateTimeParameter) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.DateTimeParameter"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_decimalparameter.go b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_decimalparameter.go
new file mode 100644
index 0000000000..c085921242
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_decimalparameter.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dashboard_DecimalParameter AWS CloudFormation Resource (AWS::QuickSight::Dashboard.DecimalParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-decimalparameter.html
+type Dashboard_DecimalParameter struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-decimalparameter.html#cfn-quicksight-dashboard-decimalparameter-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-decimalparameter.html#cfn-quicksight-dashboard-decimalparameter-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DecimalParameter) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.DecimalParameter"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_exporttocsvoption.go b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_exporttocsvoption.go
new file mode 100644
index 0000000000..930b553b39
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_exporttocsvoption.go
@@ -0,0 +1,37 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dashboard_ExportToCSVOption AWS CloudFormation Resource (AWS::QuickSight::Dashboard.ExportToCSVOption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-exporttocsvoption.html
+type Dashboard_ExportToCSVOption struct {
+
+	// AvailabilityStatus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-exporttocsvoption.html#cfn-quicksight-dashboard-exporttocsvoption-availabilitystatus
+	AvailabilityStatus *types.Value `json:"AvailabilityStatus,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ExportToCSVOption) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.ExportToCSVOption"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_integerparameter.go b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_integerparameter.go
new file mode 100644
index 0000000000..dac771b962
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_integerparameter.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dashboard_IntegerParameter AWS CloudFormation Resource (AWS::QuickSight::Dashboard.IntegerParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-integerparameter.html
+type Dashboard_IntegerParameter struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-integerparameter.html#cfn-quicksight-dashboard-integerparameter-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-integerparameter.html#cfn-quicksight-dashboard-integerparameter-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_IntegerParameter) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.IntegerParameter"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_parameters.go b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_parameters.go
new file mode 100644
index 0000000000..11674a2ed8
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_parameters.go
@@ -0,0 +1,50 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dashboard_Parameters AWS CloudFormation Resource (AWS::QuickSight::Dashboard.Parameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-parameters.html
+type Dashboard_Parameters struct {
+
+	// DateTimeParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-parameters.html#cfn-quicksight-dashboard-parameters-datetimeparameters
+	DateTimeParameters []Dashboard_DateTimeParameter `json:"DateTimeParameters,omitempty"`
+
+	// DecimalParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-parameters.html#cfn-quicksight-dashboard-parameters-decimalparameters
+	DecimalParameters []Dashboard_DecimalParameter `json:"DecimalParameters,omitempty"`
+
+	// IntegerParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-parameters.html#cfn-quicksight-dashboard-parameters-integerparameters
+	IntegerParameters []Dashboard_IntegerParameter `json:"IntegerParameters,omitempty"`
+
+	// StringParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-parameters.html#cfn-quicksight-dashboard-parameters-stringparameters
+	StringParameters []Dashboard_StringParameter `json:"StringParameters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Parameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.Parameters"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_resourcepermission.go b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_resourcepermission.go
new file mode 100644
index 0000000000..585f18c304
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_resourcepermission.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dashboard_ResourcePermission AWS CloudFormation Resource (AWS::QuickSight::Dashboard.ResourcePermission)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-resourcepermission.html
+type Dashboard_ResourcePermission struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-resourcepermission.html#cfn-quicksight-dashboard-resourcepermission-actions
+	Actions *types.Value `json:"Actions,omitempty"`
+
+	// Principal AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-resourcepermission.html#cfn-quicksight-dashboard-resourcepermission-principal
+	Principal *types.Value `json:"Principal,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ResourcePermission) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.ResourcePermission"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_sheetcontrolsoption.go b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_sheetcontrolsoption.go
new file mode 100644
index 0000000000..21e8d1395f
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_sheetcontrolsoption.go
@@ -0,0 +1,37 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dashboard_SheetControlsOption AWS CloudFormation Resource (AWS::QuickSight::Dashboard.SheetControlsOption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-sheetcontrolsoption.html
+type Dashboard_SheetControlsOption struct {
+
+	// VisibilityState AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-sheetcontrolsoption.html#cfn-quicksight-dashboard-sheetcontrolsoption-visibilitystate
+	VisibilityState *types.Value `json:"VisibilityState,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SheetControlsOption) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.SheetControlsOption"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dashboard_stringparameter.go b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_stringparameter.go
new file mode 100644
index 0000000000..7a291ea30a
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dashboard_stringparameter.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Dashboard_StringParameter AWS CloudFormation Resource (AWS::QuickSight::Dashboard.StringParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-stringparameter.html
+type Dashboard_StringParameter struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-stringparameter.html#cfn-quicksight-dashboard-stringparameter-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dashboard-stringparameter.html#cfn-quicksight-dashboard-stringparameter-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_StringParameter) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Dashboard.StringParameter"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset.go
new file mode 100644
index 0000000000..248fbcf89b
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset.go
@@ -0,0 +1,169 @@
+package quicksight
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet AWS CloudFormation Resource (AWS::QuickSight::DataSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dataset.html
+type DataSet struct {
+
+	// AwsAccountId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dataset.html#cfn-quicksight-dataset-awsaccountid
+	AwsAccountId *types.Value `json:"AwsAccountId,omitempty"`
+
+	// ColumnGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dataset.html#cfn-quicksight-dataset-columngroups
+	ColumnGroups []DataSet_ColumnGroup `json:"ColumnGroups,omitempty"`
+
+	// ColumnLevelPermissionRules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dataset.html#cfn-quicksight-dataset-columnlevelpermissionrules
+	ColumnLevelPermissionRules []DataSet_ColumnLevelPermissionRule `json:"ColumnLevelPermissionRules,omitempty"`
+
+	// DataSetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dataset.html#cfn-quicksight-dataset-datasetid
+	DataSetId *types.Value `json:"DataSetId,omitempty"`
+
+	// FieldFolders AWS CloudFormation Property
+	// Required: false
+	// 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"`
+
+	// ImportMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dataset.html#cfn-quicksight-dataset-importmode
+	ImportMode *types.Value `json:"ImportMode,omitempty"`
+
+	// IngestionWaitPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dataset.html#cfn-quicksight-dataset-ingestionwaitpolicy
+	IngestionWaitPolicy *DataSet_IngestionWaitPolicy `json:"IngestionWaitPolicy,omitempty"`
+
+	// LogicalTableMap AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dataset.html#cfn-quicksight-dataset-logicaltablemap
+	LogicalTableMap map[string]DataSet_LogicalTable `json:"LogicalTableMap,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dataset.html#cfn-quicksight-dataset-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Permissions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dataset.html#cfn-quicksight-dataset-permissions
+	Permissions []DataSet_ResourcePermission `json:"Permissions,omitempty"`
+
+	// PhysicalTableMap AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dataset.html#cfn-quicksight-dataset-physicaltablemap
+	PhysicalTableMap map[string]DataSet_PhysicalTable `json:"PhysicalTableMap,omitempty"`
+
+	// RowLevelPermissionDataSet AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dataset.html#cfn-quicksight-dataset-rowlevelpermissiondataset
+	RowLevelPermissionDataSet *DataSet_RowLevelPermissionDataSet `json:"RowLevelPermissionDataSet,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-dataset.html#cfn-quicksight-dataset-tags
+	Tags []cloudformation.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 *DataSet) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet"
+}
+
+// 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 DataSet) MarshalJSON() ([]byte, error) {
+	type Properties DataSet
+	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 *DataSet) UnmarshalJSON(b []byte) error {
+	type Properties DataSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DataSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/quicksight/aws-quicksight-dataset_calculatedcolumn.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_calculatedcolumn.go
new file mode 100644
index 0000000000..fada5e1d6d
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_calculatedcolumn.go
@@ -0,0 +1,47 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_CalculatedColumn AWS CloudFormation Resource (AWS::QuickSight::DataSet.CalculatedColumn)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-calculatedcolumn.html
+type DataSet_CalculatedColumn struct {
+
+	// ColumnId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-calculatedcolumn.html#cfn-quicksight-dataset-calculatedcolumn-columnid
+	ColumnId *types.Value `json:"ColumnId,omitempty"`
+
+	// ColumnName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-calculatedcolumn.html#cfn-quicksight-dataset-calculatedcolumn-columnname
+	ColumnName *types.Value `json:"ColumnName,omitempty"`
+
+	// Expression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-calculatedcolumn.html#cfn-quicksight-dataset-calculatedcolumn-expression
+	Expression *types.Value `json:"Expression,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CalculatedColumn) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.CalculatedColumn"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_castcolumntypeoperation.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_castcolumntypeoperation.go
new file mode 100644
index 0000000000..edd7b3a671
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_castcolumntypeoperation.go
@@ -0,0 +1,47 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_CastColumnTypeOperation AWS CloudFormation Resource (AWS::QuickSight::DataSet.CastColumnTypeOperation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-castcolumntypeoperation.html
+type DataSet_CastColumnTypeOperation struct {
+
+	// ColumnName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-castcolumntypeoperation.html#cfn-quicksight-dataset-castcolumntypeoperation-columnname
+	ColumnName *types.Value `json:"ColumnName,omitempty"`
+
+	// Format AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-castcolumntypeoperation.html#cfn-quicksight-dataset-castcolumntypeoperation-format
+	Format *types.Value `json:"Format,omitempty"`
+
+	// NewColumnType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-castcolumntypeoperation.html#cfn-quicksight-dataset-castcolumntypeoperation-newcolumntype
+	NewColumnType *types.Value `json:"NewColumnType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CastColumnTypeOperation) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.CastColumnTypeOperation"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_columndescription.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_columndescription.go
new file mode 100644
index 0000000000..b771d6aca3
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_columndescription.go
@@ -0,0 +1,37 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_ColumnDescription AWS CloudFormation Resource (AWS::QuickSight::DataSet.ColumnDescription)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-columndescription.html
+type DataSet_ColumnDescription struct {
+
+	// Text AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-columndescription.html#cfn-quicksight-dataset-columndescription-text
+	Text *types.Value `json:"Text,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ColumnDescription) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.ColumnDescription"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_columngroup.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_columngroup.go
new file mode 100644
index 0000000000..7d4144ce63
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_columngroup.go
@@ -0,0 +1,35 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_ColumnGroup AWS CloudFormation Resource (AWS::QuickSight::DataSet.ColumnGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-columngroup.html
+type DataSet_ColumnGroup struct {
+
+	// GeoSpatialColumnGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-columngroup.html#cfn-quicksight-dataset-columngroup-geospatialcolumngroup
+	GeoSpatialColumnGroup *DataSet_GeoSpatialColumnGroup `json:"GeoSpatialColumnGroup,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ColumnGroup) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.ColumnGroup"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_columnlevelpermissionrule.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_columnlevelpermissionrule.go
new file mode 100644
index 0000000000..889e841c80
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_columnlevelpermissionrule.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_ColumnLevelPermissionRule AWS CloudFormation Resource (AWS::QuickSight::DataSet.ColumnLevelPermissionRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-columnlevelpermissionrule.html
+type DataSet_ColumnLevelPermissionRule struct {
+
+	// ColumnNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-columnlevelpermissionrule.html#cfn-quicksight-dataset-columnlevelpermissionrule-columnnames
+	ColumnNames *types.Value `json:"ColumnNames,omitempty"`
+
+	// Principals AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-columnlevelpermissionrule.html#cfn-quicksight-dataset-columnlevelpermissionrule-principals
+	Principals *types.Value `json:"Principals,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ColumnLevelPermissionRule) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.ColumnLevelPermissionRule"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_columntag.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_columntag.go
new file mode 100644
index 0000000000..aa3cc639cd
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_columntag.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_ColumnTag AWS CloudFormation Resource (AWS::QuickSight::DataSet.ColumnTag)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-columntag.html
+type DataSet_ColumnTag struct {
+
+	// ColumnDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-columntag.html#cfn-quicksight-dataset-columntag-columndescription
+	ColumnDescription *DataSet_ColumnDescription `json:"ColumnDescription,omitempty"`
+
+	// ColumnGeographicRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-columntag.html#cfn-quicksight-dataset-columntag-columngeographicrole
+	ColumnGeographicRole *types.Value `json:"ColumnGeographicRole,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ColumnTag) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.ColumnTag"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_createcolumnsoperation.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_createcolumnsoperation.go
new file mode 100644
index 0000000000..02bb0c7861
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_createcolumnsoperation.go
@@ -0,0 +1,35 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_CreateColumnsOperation AWS CloudFormation Resource (AWS::QuickSight::DataSet.CreateColumnsOperation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-createcolumnsoperation.html
+type DataSet_CreateColumnsOperation struct {
+
+	// Columns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-createcolumnsoperation.html#cfn-quicksight-dataset-createcolumnsoperation-columns
+	Columns []DataSet_CalculatedColumn `json:"Columns,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CreateColumnsOperation) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.CreateColumnsOperation"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_customsql.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_customsql.go
new file mode 100644
index 0000000000..94a4f5a8f5
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_customsql.go
@@ -0,0 +1,52 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_CustomSql AWS CloudFormation Resource (AWS::QuickSight::DataSet.CustomSql)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-customsql.html
+type DataSet_CustomSql struct {
+
+	// Columns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-customsql.html#cfn-quicksight-dataset-customsql-columns
+	Columns []DataSet_InputColumn `json:"Columns,omitempty"`
+
+	// DataSourceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-customsql.html#cfn-quicksight-dataset-customsql-datasourcearn
+	DataSourceArn *types.Value `json:"DataSourceArn,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-customsql.html#cfn-quicksight-dataset-customsql-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SqlQuery AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-customsql.html#cfn-quicksight-dataset-customsql-sqlquery
+	SqlQuery *types.Value `json:"SqlQuery,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CustomSql) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.CustomSql"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_fieldfolder.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_fieldfolder.go
new file mode 100644
index 0000000000..b91f7c84df
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_fieldfolder.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_FieldFolder AWS CloudFormation Resource (AWS::QuickSight::DataSet.FieldFolder)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-fieldfolder.html
+type DataSet_FieldFolder struct {
+
+	// Columns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-fieldfolder.html#cfn-quicksight-dataset-fieldfolder-columns
+	Columns *types.Value `json:"Columns,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-fieldfolder.html#cfn-quicksight-dataset-fieldfolder-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_FieldFolder) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.FieldFolder"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_filteroperation.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_filteroperation.go
new file mode 100644
index 0000000000..7f78f26d83
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_filteroperation.go
@@ -0,0 +1,37 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_FilterOperation AWS CloudFormation Resource (AWS::QuickSight::DataSet.FilterOperation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-filteroperation.html
+type DataSet_FilterOperation struct {
+
+	// ConditionExpression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-filteroperation.html#cfn-quicksight-dataset-filteroperation-conditionexpression
+	ConditionExpression *types.Value `json:"ConditionExpression,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_FilterOperation) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.FilterOperation"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_geospatialcolumngroup.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_geospatialcolumngroup.go
new file mode 100644
index 0000000000..24f3582b40
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_geospatialcolumngroup.go
@@ -0,0 +1,47 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_GeoSpatialColumnGroup AWS CloudFormation Resource (AWS::QuickSight::DataSet.GeoSpatialColumnGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-geospatialcolumngroup.html
+type DataSet_GeoSpatialColumnGroup struct {
+
+	// Columns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-geospatialcolumngroup.html#cfn-quicksight-dataset-geospatialcolumngroup-columns
+	Columns *types.Value `json:"Columns,omitempty"`
+
+	// CountryCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-geospatialcolumngroup.html#cfn-quicksight-dataset-geospatialcolumngroup-countrycode
+	CountryCode *types.Value `json:"CountryCode,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-geospatialcolumngroup.html#cfn-quicksight-dataset-geospatialcolumngroup-name
+	Name *types.Value `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 *DataSet_GeoSpatialColumnGroup) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.GeoSpatialColumnGroup"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_ingestionwaitpolicy.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_ingestionwaitpolicy.go
new file mode 100644
index 0000000000..3d94581748
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_ingestionwaitpolicy.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_IngestionWaitPolicy AWS CloudFormation Resource (AWS::QuickSight::DataSet.IngestionWaitPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-ingestionwaitpolicy.html
+type DataSet_IngestionWaitPolicy struct {
+
+	// IngestionWaitTimeInHours AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-ingestionwaitpolicy.html#cfn-quicksight-dataset-ingestionwaitpolicy-ingestionwaittimeinhours
+	IngestionWaitTimeInHours *types.Value `json:"IngestionWaitTimeInHours,omitempty"`
+
+	// WaitForSpiceIngestion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-ingestionwaitpolicy.html#cfn-quicksight-dataset-ingestionwaitpolicy-waitforspiceingestion
+	WaitForSpiceIngestion *types.Value `json:"WaitForSpiceIngestion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_IngestionWaitPolicy) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.IngestionWaitPolicy"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_inputcolumn.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_inputcolumn.go
new file mode 100644
index 0000000000..4ede5b491c
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_inputcolumn.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_InputColumn AWS CloudFormation Resource (AWS::QuickSight::DataSet.InputColumn)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-inputcolumn.html
+type DataSet_InputColumn struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-inputcolumn.html#cfn-quicksight-dataset-inputcolumn-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-inputcolumn.html#cfn-quicksight-dataset-inputcolumn-type
+	Type *types.Value `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 *DataSet_InputColumn) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.InputColumn"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_joininstruction.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_joininstruction.go
new file mode 100644
index 0000000000..b53c751027
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_joininstruction.go
@@ -0,0 +1,62 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_JoinInstruction AWS CloudFormation Resource (AWS::QuickSight::DataSet.JoinInstruction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-joininstruction.html
+type DataSet_JoinInstruction struct {
+
+	// LeftJoinKeyProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-joininstruction.html#cfn-quicksight-dataset-joininstruction-leftjoinkeyproperties
+	LeftJoinKeyProperties *DataSet_JoinKeyProperties `json:"LeftJoinKeyProperties,omitempty"`
+
+	// LeftOperand AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-joininstruction.html#cfn-quicksight-dataset-joininstruction-leftoperand
+	LeftOperand *types.Value `json:"LeftOperand,omitempty"`
+
+	// OnClause AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-joininstruction.html#cfn-quicksight-dataset-joininstruction-onclause
+	OnClause *types.Value `json:"OnClause,omitempty"`
+
+	// RightJoinKeyProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-joininstruction.html#cfn-quicksight-dataset-joininstruction-rightjoinkeyproperties
+	RightJoinKeyProperties *DataSet_JoinKeyProperties `json:"RightJoinKeyProperties,omitempty"`
+
+	// RightOperand AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-joininstruction.html#cfn-quicksight-dataset-joininstruction-rightoperand
+	RightOperand *types.Value `json:"RightOperand,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-joininstruction.html#cfn-quicksight-dataset-joininstruction-type
+	Type *types.Value `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 *DataSet_JoinInstruction) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.JoinInstruction"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_joinkeyproperties.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_joinkeyproperties.go
new file mode 100644
index 0000000000..a08d3267ba
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_joinkeyproperties.go
@@ -0,0 +1,37 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_JoinKeyProperties AWS CloudFormation Resource (AWS::QuickSight::DataSet.JoinKeyProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-joinkeyproperties.html
+type DataSet_JoinKeyProperties struct {
+
+	// UniqueKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-joinkeyproperties.html#cfn-quicksight-dataset-joinkeyproperties-uniquekey
+	UniqueKey *types.Value `json:"UniqueKey,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_JoinKeyProperties) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.JoinKeyProperties"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_logicaltable.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_logicaltable.go
new file mode 100644
index 0000000000..9d4c8103f0
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_logicaltable.go
@@ -0,0 +1,47 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_LogicalTable AWS CloudFormation Resource (AWS::QuickSight::DataSet.LogicalTable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-logicaltable.html
+type DataSet_LogicalTable struct {
+
+	// Alias AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-logicaltable.html#cfn-quicksight-dataset-logicaltable-alias
+	Alias *types.Value `json:"Alias,omitempty"`
+
+	// DataTransforms AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-logicaltable.html#cfn-quicksight-dataset-logicaltable-datatransforms
+	DataTransforms []DataSet_TransformOperation `json:"DataTransforms,omitempty"`
+
+	// Source AWS CloudFormation Property
+	// Required: true
+	// 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,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LogicalTable) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.LogicalTable"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_logicaltablesource.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_logicaltablesource.go
new file mode 100644
index 0000000000..a35d0e99d5
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_logicaltablesource.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_LogicalTableSource AWS CloudFormation Resource (AWS::QuickSight::DataSet.LogicalTableSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-logicaltablesource.html
+type DataSet_LogicalTableSource struct {
+
+	// JoinInstruction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-logicaltablesource.html#cfn-quicksight-dataset-logicaltablesource-joininstruction
+	JoinInstruction *DataSet_JoinInstruction `json:"JoinInstruction,omitempty"`
+
+	// PhysicalTableId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-logicaltablesource.html#cfn-quicksight-dataset-logicaltablesource-physicaltableid
+	PhysicalTableId *types.Value `json:"PhysicalTableId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LogicalTableSource) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.LogicalTableSource"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_outputcolumn.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_outputcolumn.go
new file mode 100644
index 0000000000..015f53ffca
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_outputcolumn.go
@@ -0,0 +1,47 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_OutputColumn AWS CloudFormation Resource (AWS::QuickSight::DataSet.OutputColumn)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-outputcolumn.html
+type DataSet_OutputColumn struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-outputcolumn.html#cfn-quicksight-dataset-outputcolumn-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-outputcolumn.html#cfn-quicksight-dataset-outputcolumn-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-outputcolumn.html#cfn-quicksight-dataset-outputcolumn-type
+	Type *types.Value `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 *DataSet_OutputColumn) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.OutputColumn"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_physicaltable.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_physicaltable.go
new file mode 100644
index 0000000000..187f3f4926
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_physicaltable.go
@@ -0,0 +1,45 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_PhysicalTable AWS CloudFormation Resource (AWS::QuickSight::DataSet.PhysicalTable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-physicaltable.html
+type DataSet_PhysicalTable struct {
+
+	// CustomSql AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-physicaltable.html#cfn-quicksight-dataset-physicaltable-customsql
+	CustomSql *DataSet_CustomSql `json:"CustomSql,omitempty"`
+
+	// RelationalTable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-physicaltable.html#cfn-quicksight-dataset-physicaltable-relationaltable
+	RelationalTable *DataSet_RelationalTable `json:"RelationalTable,omitempty"`
+
+	// S3Source AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-physicaltable.html#cfn-quicksight-dataset-physicaltable-s3source
+	S3Source *DataSet_S3Source `json:"S3Source,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PhysicalTable) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.PhysicalTable"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_projectoperation.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_projectoperation.go
new file mode 100644
index 0000000000..db9a280389
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_projectoperation.go
@@ -0,0 +1,37 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_ProjectOperation AWS CloudFormation Resource (AWS::QuickSight::DataSet.ProjectOperation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-projectoperation.html
+type DataSet_ProjectOperation struct {
+
+	// ProjectedColumns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-projectoperation.html#cfn-quicksight-dataset-projectoperation-projectedcolumns
+	ProjectedColumns *types.Value `json:"ProjectedColumns,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ProjectOperation) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.ProjectOperation"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_relationaltable.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_relationaltable.go
new file mode 100644
index 0000000000..75baa6033e
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_relationaltable.go
@@ -0,0 +1,57 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_RelationalTable AWS CloudFormation Resource (AWS::QuickSight::DataSet.RelationalTable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-relationaltable.html
+type DataSet_RelationalTable struct {
+
+	// Catalog AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-relationaltable.html#cfn-quicksight-dataset-relationaltable-catalog
+	Catalog *types.Value `json:"Catalog,omitempty"`
+
+	// DataSourceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-relationaltable.html#cfn-quicksight-dataset-relationaltable-datasourcearn
+	DataSourceArn *types.Value `json:"DataSourceArn,omitempty"`
+
+	// InputColumns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-relationaltable.html#cfn-quicksight-dataset-relationaltable-inputcolumns
+	InputColumns []DataSet_InputColumn `json:"InputColumns,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-relationaltable.html#cfn-quicksight-dataset-relationaltable-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Schema AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-relationaltable.html#cfn-quicksight-dataset-relationaltable-schema
+	Schema *types.Value `json:"Schema,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RelationalTable) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.RelationalTable"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_renamecolumnoperation.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_renamecolumnoperation.go
new file mode 100644
index 0000000000..f5c9d95e0f
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_renamecolumnoperation.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_RenameColumnOperation AWS CloudFormation Resource (AWS::QuickSight::DataSet.RenameColumnOperation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-renamecolumnoperation.html
+type DataSet_RenameColumnOperation struct {
+
+	// ColumnName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-renamecolumnoperation.html#cfn-quicksight-dataset-renamecolumnoperation-columnname
+	ColumnName *types.Value `json:"ColumnName,omitempty"`
+
+	// NewColumnName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-renamecolumnoperation.html#cfn-quicksight-dataset-renamecolumnoperation-newcolumnname
+	NewColumnName *types.Value `json:"NewColumnName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RenameColumnOperation) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.RenameColumnOperation"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_resourcepermission.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_resourcepermission.go
new file mode 100644
index 0000000000..0062a16c79
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_resourcepermission.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_ResourcePermission AWS CloudFormation Resource (AWS::QuickSight::DataSet.ResourcePermission)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-resourcepermission.html
+type DataSet_ResourcePermission struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-resourcepermission.html#cfn-quicksight-dataset-resourcepermission-actions
+	Actions *types.Value `json:"Actions,omitempty"`
+
+	// Principal AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-resourcepermission.html#cfn-quicksight-dataset-resourcepermission-principal
+	Principal *types.Value `json:"Principal,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ResourcePermission) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.ResourcePermission"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_rowlevelpermissiondataset.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_rowlevelpermissiondataset.go
new file mode 100644
index 0000000000..fb19539fd8
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_rowlevelpermissiondataset.go
@@ -0,0 +1,52 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_RowLevelPermissionDataSet AWS CloudFormation Resource (AWS::QuickSight::DataSet.RowLevelPermissionDataSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-rowlevelpermissiondataset.html
+type DataSet_RowLevelPermissionDataSet struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-rowlevelpermissiondataset.html#cfn-quicksight-dataset-rowlevelpermissiondataset-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// FormatVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-rowlevelpermissiondataset.html#cfn-quicksight-dataset-rowlevelpermissiondataset-formatversion
+	FormatVersion *types.Value `json:"FormatVersion,omitempty"`
+
+	// Namespace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-rowlevelpermissiondataset.html#cfn-quicksight-dataset-rowlevelpermissiondataset-namespace
+	Namespace *types.Value `json:"Namespace,omitempty"`
+
+	// PermissionPolicy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-rowlevelpermissiondataset.html#cfn-quicksight-dataset-rowlevelpermissiondataset-permissionpolicy
+	PermissionPolicy *types.Value `json:"PermissionPolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RowLevelPermissionDataSet) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.RowLevelPermissionDataSet"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_s3source.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_s3source.go
new file mode 100644
index 0000000000..a7483d57ac
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_s3source.go
@@ -0,0 +1,47 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_S3Source AWS CloudFormation Resource (AWS::QuickSight::DataSet.S3Source)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-s3source.html
+type DataSet_S3Source struct {
+
+	// DataSourceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-s3source.html#cfn-quicksight-dataset-s3source-datasourcearn
+	DataSourceArn *types.Value `json:"DataSourceArn,omitempty"`
+
+	// InputColumns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-s3source.html#cfn-quicksight-dataset-s3source-inputcolumns
+	InputColumns []DataSet_InputColumn `json:"InputColumns,omitempty"`
+
+	// UploadSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-s3source.html#cfn-quicksight-dataset-s3source-uploadsettings
+	UploadSettings *DataSet_UploadSettings `json:"UploadSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_S3Source) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.S3Source"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_tagcolumnoperation.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_tagcolumnoperation.go
new file mode 100644
index 0000000000..408c1f1fcd
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_tagcolumnoperation.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_TagColumnOperation AWS CloudFormation Resource (AWS::QuickSight::DataSet.TagColumnOperation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-tagcolumnoperation.html
+type DataSet_TagColumnOperation struct {
+
+	// ColumnName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-tagcolumnoperation.html#cfn-quicksight-dataset-tagcolumnoperation-columnname
+	ColumnName *types.Value `json:"ColumnName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-tagcolumnoperation.html#cfn-quicksight-dataset-tagcolumnoperation-tags
+	Tags []DataSet_ColumnTag `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 *DataSet_TagColumnOperation) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.TagColumnOperation"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_transformoperation.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_transformoperation.go
new file mode 100644
index 0000000000..50a857c535
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_transformoperation.go
@@ -0,0 +1,60 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_TransformOperation AWS CloudFormation Resource (AWS::QuickSight::DataSet.TransformOperation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-transformoperation.html
+type DataSet_TransformOperation struct {
+
+	// CastColumnTypeOperation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-transformoperation.html#cfn-quicksight-dataset-transformoperation-castcolumntypeoperation
+	CastColumnTypeOperation *DataSet_CastColumnTypeOperation `json:"CastColumnTypeOperation,omitempty"`
+
+	// CreateColumnsOperation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-transformoperation.html#cfn-quicksight-dataset-transformoperation-createcolumnsoperation
+	CreateColumnsOperation *DataSet_CreateColumnsOperation `json:"CreateColumnsOperation,omitempty"`
+
+	// FilterOperation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-transformoperation.html#cfn-quicksight-dataset-transformoperation-filteroperation
+	FilterOperation *DataSet_FilterOperation `json:"FilterOperation,omitempty"`
+
+	// ProjectOperation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-transformoperation.html#cfn-quicksight-dataset-transformoperation-projectoperation
+	ProjectOperation *DataSet_ProjectOperation `json:"ProjectOperation,omitempty"`
+
+	// RenameColumnOperation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-transformoperation.html#cfn-quicksight-dataset-transformoperation-renamecolumnoperation
+	RenameColumnOperation *DataSet_RenameColumnOperation `json:"RenameColumnOperation,omitempty"`
+
+	// TagColumnOperation AWS CloudFormation Property
+	// Required: false
+	// 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"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TransformOperation) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.TransformOperation"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-dataset_uploadsettings.go b/goformation/cloudformation/quicksight/aws-quicksight-dataset_uploadsettings.go
new file mode 100644
index 0000000000..52f4143690
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-dataset_uploadsettings.go
@@ -0,0 +1,57 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSet_UploadSettings AWS CloudFormation Resource (AWS::QuickSight::DataSet.UploadSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-uploadsettings.html
+type DataSet_UploadSettings struct {
+
+	// ContainsHeader AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-uploadsettings.html#cfn-quicksight-dataset-uploadsettings-containsheader
+	ContainsHeader *types.Value `json:"ContainsHeader,omitempty"`
+
+	// Delimiter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-uploadsettings.html#cfn-quicksight-dataset-uploadsettings-delimiter
+	Delimiter *types.Value `json:"Delimiter,omitempty"`
+
+	// Format AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-uploadsettings.html#cfn-quicksight-dataset-uploadsettings-format
+	Format *types.Value `json:"Format,omitempty"`
+
+	// StartFromRow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-uploadsettings.html#cfn-quicksight-dataset-uploadsettings-startfromrow
+	StartFromRow *types.Value `json:"StartFromRow,omitempty"`
+
+	// TextQualifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-dataset-uploadsettings.html#cfn-quicksight-dataset-uploadsettings-textqualifier
+	TextQualifier *types.Value `json:"TextQualifier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_UploadSettings) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSet.UploadSettings"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource.go
new file mode 100644
index 0000000000..2871f5e729
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource.go
@@ -0,0 +1,164 @@
+package quicksight
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource AWS CloudFormation Resource (AWS::QuickSight::DataSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-datasource.html
+type DataSource struct {
+
+	// AlternateDataSourceParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-datasource.html#cfn-quicksight-datasource-alternatedatasourceparameters
+	AlternateDataSourceParameters []DataSource_DataSourceParameters `json:"AlternateDataSourceParameters,omitempty"`
+
+	// AwsAccountId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-datasource.html#cfn-quicksight-datasource-awsaccountid
+	AwsAccountId *types.Value `json:"AwsAccountId,omitempty"`
+
+	// Credentials AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-datasource.html#cfn-quicksight-datasource-credentials
+	Credentials *DataSource_DataSourceCredentials `json:"Credentials,omitempty"`
+
+	// DataSourceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-datasource.html#cfn-quicksight-datasource-datasourceid
+	DataSourceId *types.Value `json:"DataSourceId,omitempty"`
+
+	// DataSourceParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-datasource.html#cfn-quicksight-datasource-datasourceparameters
+	DataSourceParameters *DataSource_DataSourceParameters `json:"DataSourceParameters,omitempty"`
+
+	// ErrorInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-datasource.html#cfn-quicksight-datasource-errorinfo
+	ErrorInfo *DataSource_DataSourceErrorInfo `json:"ErrorInfo,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-datasource.html#cfn-quicksight-datasource-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Permissions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-datasource.html#cfn-quicksight-datasource-permissions
+	Permissions []DataSource_ResourcePermission `json:"Permissions,omitempty"`
+
+	// SslProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-datasource.html#cfn-quicksight-datasource-sslproperties
+	SslProperties *DataSource_SslProperties `json:"SslProperties,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-datasource.html#cfn-quicksight-datasource-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-datasource.html#cfn-quicksight-datasource-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// VpcConnectionProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-datasource.html#cfn-quicksight-datasource-vpcconnectionproperties
+	VpcConnectionProperties *DataSource_VpcConnectionProperties `json:"VpcConnectionProperties,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::QuickSight::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/quicksight/aws-quicksight-datasource_amazonelasticsearchparameters.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_amazonelasticsearchparameters.go
new file mode 100644
index 0000000000..71146c4051
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_amazonelasticsearchparameters.go
@@ -0,0 +1,37 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_AmazonElasticsearchParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.AmazonElasticsearchParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-amazonelasticsearchparameters.html
+type DataSource_AmazonElasticsearchParameters struct {
+
+	// Domain AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-amazonelasticsearchparameters.html#cfn-quicksight-datasource-amazonelasticsearchparameters-domain
+	Domain *types.Value `json:"Domain,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AmazonElasticsearchParameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.AmazonElasticsearchParameters"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_amazonopensearchparameters.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_amazonopensearchparameters.go
new file mode 100644
index 0000000000..e3d8b60ca3
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_amazonopensearchparameters.go
@@ -0,0 +1,37 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_AmazonOpenSearchParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.AmazonOpenSearchParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-amazonopensearchparameters.html
+type DataSource_AmazonOpenSearchParameters struct {
+
+	// Domain AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-amazonopensearchparameters.html#cfn-quicksight-datasource-amazonopensearchparameters-domain
+	Domain *types.Value `json:"Domain,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AmazonOpenSearchParameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.AmazonOpenSearchParameters"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_athenaparameters.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_athenaparameters.go
new file mode 100644
index 0000000000..f5c5d9a350
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_athenaparameters.go
@@ -0,0 +1,37 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_AthenaParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.AthenaParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-athenaparameters.html
+type DataSource_AthenaParameters struct {
+
+	// WorkGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-athenaparameters.html#cfn-quicksight-datasource-athenaparameters-workgroup
+	WorkGroup *types.Value `json:"WorkGroup,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AthenaParameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.AthenaParameters"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_auroraparameters.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_auroraparameters.go
new file mode 100644
index 0000000000..0cdeed362e
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_auroraparameters.go
@@ -0,0 +1,47 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_AuroraParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.AuroraParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-auroraparameters.html
+type DataSource_AuroraParameters struct {
+
+	// Database AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-auroraparameters.html#cfn-quicksight-datasource-auroraparameters-database
+	Database *types.Value `json:"Database,omitempty"`
+
+	// Host AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-auroraparameters.html#cfn-quicksight-datasource-auroraparameters-host
+	Host *types.Value `json:"Host,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-auroraparameters.html#cfn-quicksight-datasource-auroraparameters-port
+	Port *types.Value `json:"Port"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AuroraParameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.AuroraParameters"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_aurorapostgresqlparameters.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_aurorapostgresqlparameters.go
new file mode 100644
index 0000000000..05171d99eb
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_aurorapostgresqlparameters.go
@@ -0,0 +1,47 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_AuroraPostgreSqlParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.AuroraPostgreSqlParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-aurorapostgresqlparameters.html
+type DataSource_AuroraPostgreSqlParameters struct {
+
+	// Database AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-aurorapostgresqlparameters.html#cfn-quicksight-datasource-aurorapostgresqlparameters-database
+	Database *types.Value `json:"Database,omitempty"`
+
+	// Host AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-aurorapostgresqlparameters.html#cfn-quicksight-datasource-aurorapostgresqlparameters-host
+	Host *types.Value `json:"Host,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-aurorapostgresqlparameters.html#cfn-quicksight-datasource-aurorapostgresqlparameters-port
+	Port *types.Value `json:"Port"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AuroraPostgreSqlParameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.AuroraPostgreSqlParameters"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_credentialpair.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_credentialpair.go
new file mode 100644
index 0000000000..3321d578ad
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_credentialpair.go
@@ -0,0 +1,47 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_CredentialPair AWS CloudFormation Resource (AWS::QuickSight::DataSource.CredentialPair)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-credentialpair.html
+type DataSource_CredentialPair struct {
+
+	// AlternateDataSourceParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-credentialpair.html#cfn-quicksight-datasource-credentialpair-alternatedatasourceparameters
+	AlternateDataSourceParameters []DataSource_DataSourceParameters `json:"AlternateDataSourceParameters,omitempty"`
+
+	// Password AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-credentialpair.html#cfn-quicksight-datasource-credentialpair-password
+	Password *types.Value `json:"Password,omitempty"`
+
+	// Username AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-credentialpair.html#cfn-quicksight-datasource-credentialpair-username
+	Username *types.Value `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 *DataSource_CredentialPair) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.CredentialPair"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourcecredentials.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourcecredentials.go
new file mode 100644
index 0000000000..c75a2271cc
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourcecredentials.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_DataSourceCredentials AWS CloudFormation Resource (AWS::QuickSight::DataSource.DataSourceCredentials)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourcecredentials.html
+type DataSource_DataSourceCredentials struct {
+
+	// CopySourceArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourcecredentials.html#cfn-quicksight-datasource-datasourcecredentials-copysourcearn
+	CopySourceArn *types.Value `json:"CopySourceArn,omitempty"`
+
+	// CredentialPair AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourcecredentials.html#cfn-quicksight-datasource-datasourcecredentials-credentialpair
+	CredentialPair *DataSource_CredentialPair `json:"CredentialPair,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DataSourceCredentials) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.DataSourceCredentials"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourceerrorinfo.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourceerrorinfo.go
new file mode 100644
index 0000000000..412e719180
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourceerrorinfo.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_DataSourceErrorInfo AWS CloudFormation Resource (AWS::QuickSight::DataSource.DataSourceErrorInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceerrorinfo.html
+type DataSource_DataSourceErrorInfo struct {
+
+	// Message AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceerrorinfo.html#cfn-quicksight-datasource-datasourceerrorinfo-message
+	Message *types.Value `json:"Message,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceerrorinfo.html#cfn-quicksight-datasource-datasourceerrorinfo-type
+	Type *types.Value `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 *DataSource_DataSourceErrorInfo) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.DataSourceErrorInfo"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourceparameters.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourceparameters.go
new file mode 100644
index 0000000000..94b1a69058
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_datasourceparameters.go
@@ -0,0 +1,115 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_DataSourceParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.DataSourceParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html
+type DataSource_DataSourceParameters struct {
+
+	// AmazonElasticsearchParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html#cfn-quicksight-datasource-datasourceparameters-amazonelasticsearchparameters
+	AmazonElasticsearchParameters *DataSource_AmazonElasticsearchParameters `json:"AmazonElasticsearchParameters,omitempty"`
+
+	// AmazonOpenSearchParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html#cfn-quicksight-datasource-datasourceparameters-amazonopensearchparameters
+	AmazonOpenSearchParameters *DataSource_AmazonOpenSearchParameters `json:"AmazonOpenSearchParameters,omitempty"`
+
+	// AthenaParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html#cfn-quicksight-datasource-datasourceparameters-athenaparameters
+	AthenaParameters *DataSource_AthenaParameters `json:"AthenaParameters,omitempty"`
+
+	// AuroraParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html#cfn-quicksight-datasource-datasourceparameters-auroraparameters
+	AuroraParameters *DataSource_AuroraParameters `json:"AuroraParameters,omitempty"`
+
+	// AuroraPostgreSqlParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html#cfn-quicksight-datasource-datasourceparameters-aurorapostgresqlparameters
+	AuroraPostgreSqlParameters *DataSource_AuroraPostgreSqlParameters `json:"AuroraPostgreSqlParameters,omitempty"`
+
+	// MariaDbParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html#cfn-quicksight-datasource-datasourceparameters-mariadbparameters
+	MariaDbParameters *DataSource_MariaDbParameters `json:"MariaDbParameters,omitempty"`
+
+	// MySqlParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html#cfn-quicksight-datasource-datasourceparameters-mysqlparameters
+	MySqlParameters *DataSource_MySqlParameters `json:"MySqlParameters,omitempty"`
+
+	// OracleParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html#cfn-quicksight-datasource-datasourceparameters-oracleparameters
+	OracleParameters *DataSource_OracleParameters `json:"OracleParameters,omitempty"`
+
+	// PostgreSqlParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html#cfn-quicksight-datasource-datasourceparameters-postgresqlparameters
+	PostgreSqlParameters *DataSource_PostgreSqlParameters `json:"PostgreSqlParameters,omitempty"`
+
+	// PrestoParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html#cfn-quicksight-datasource-datasourceparameters-prestoparameters
+	PrestoParameters *DataSource_PrestoParameters `json:"PrestoParameters,omitempty"`
+
+	// RdsParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html#cfn-quicksight-datasource-datasourceparameters-rdsparameters
+	RdsParameters *DataSource_RdsParameters `json:"RdsParameters,omitempty"`
+
+	// RedshiftParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html#cfn-quicksight-datasource-datasourceparameters-redshiftparameters
+	RedshiftParameters *DataSource_RedshiftParameters `json:"RedshiftParameters,omitempty"`
+
+	// S3Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html#cfn-quicksight-datasource-datasourceparameters-s3parameters
+	S3Parameters *DataSource_S3Parameters `json:"S3Parameters,omitempty"`
+
+	// SnowflakeParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html#cfn-quicksight-datasource-datasourceparameters-snowflakeparameters
+	SnowflakeParameters *DataSource_SnowflakeParameters `json:"SnowflakeParameters,omitempty"`
+
+	// SparkParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html#cfn-quicksight-datasource-datasourceparameters-sparkparameters
+	SparkParameters *DataSource_SparkParameters `json:"SparkParameters,omitempty"`
+
+	// SqlServerParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html#cfn-quicksight-datasource-datasourceparameters-sqlserverparameters
+	SqlServerParameters *DataSource_SqlServerParameters `json:"SqlServerParameters,omitempty"`
+
+	// TeradataParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-datasourceparameters.html#cfn-quicksight-datasource-datasourceparameters-teradataparameters
+	TeradataParameters *DataSource_TeradataParameters `json:"TeradataParameters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DataSourceParameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.DataSourceParameters"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_manifestfilelocation.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_manifestfilelocation.go
new file mode 100644
index 0000000000..9b8130d93d
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_manifestfilelocation.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_ManifestFileLocation AWS CloudFormation Resource (AWS::QuickSight::DataSource.ManifestFileLocation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-manifestfilelocation.html
+type DataSource_ManifestFileLocation struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-manifestfilelocation.html#cfn-quicksight-datasource-manifestfilelocation-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-manifestfilelocation.html#cfn-quicksight-datasource-manifestfilelocation-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ManifestFileLocation) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.ManifestFileLocation"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_mariadbparameters.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_mariadbparameters.go
new file mode 100644
index 0000000000..528a1d6d73
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_mariadbparameters.go
@@ -0,0 +1,47 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_MariaDbParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.MariaDbParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-mariadbparameters.html
+type DataSource_MariaDbParameters struct {
+
+	// Database AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-mariadbparameters.html#cfn-quicksight-datasource-mariadbparameters-database
+	Database *types.Value `json:"Database,omitempty"`
+
+	// Host AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-mariadbparameters.html#cfn-quicksight-datasource-mariadbparameters-host
+	Host *types.Value `json:"Host,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-mariadbparameters.html#cfn-quicksight-datasource-mariadbparameters-port
+	Port *types.Value `json:"Port"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_MariaDbParameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.MariaDbParameters"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_mysqlparameters.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_mysqlparameters.go
new file mode 100644
index 0000000000..802cc4f915
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_mysqlparameters.go
@@ -0,0 +1,47 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_MySqlParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.MySqlParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-mysqlparameters.html
+type DataSource_MySqlParameters struct {
+
+	// Database AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-mysqlparameters.html#cfn-quicksight-datasource-mysqlparameters-database
+	Database *types.Value `json:"Database,omitempty"`
+
+	// Host AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-mysqlparameters.html#cfn-quicksight-datasource-mysqlparameters-host
+	Host *types.Value `json:"Host,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-mysqlparameters.html#cfn-quicksight-datasource-mysqlparameters-port
+	Port *types.Value `json:"Port"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_MySqlParameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.MySqlParameters"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_oracleparameters.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_oracleparameters.go
new file mode 100644
index 0000000000..2774c0a6de
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_oracleparameters.go
@@ -0,0 +1,47 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_OracleParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.OracleParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-oracleparameters.html
+type DataSource_OracleParameters struct {
+
+	// Database AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-oracleparameters.html#cfn-quicksight-datasource-oracleparameters-database
+	Database *types.Value `json:"Database,omitempty"`
+
+	// Host AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-oracleparameters.html#cfn-quicksight-datasource-oracleparameters-host
+	Host *types.Value `json:"Host,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-oracleparameters.html#cfn-quicksight-datasource-oracleparameters-port
+	Port *types.Value `json:"Port"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_OracleParameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.OracleParameters"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_postgresqlparameters.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_postgresqlparameters.go
new file mode 100644
index 0000000000..ee1be8b629
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_postgresqlparameters.go
@@ -0,0 +1,47 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_PostgreSqlParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.PostgreSqlParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-postgresqlparameters.html
+type DataSource_PostgreSqlParameters struct {
+
+	// Database AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-postgresqlparameters.html#cfn-quicksight-datasource-postgresqlparameters-database
+	Database *types.Value `json:"Database,omitempty"`
+
+	// Host AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-postgresqlparameters.html#cfn-quicksight-datasource-postgresqlparameters-host
+	Host *types.Value `json:"Host,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-postgresqlparameters.html#cfn-quicksight-datasource-postgresqlparameters-port
+	Port *types.Value `json:"Port"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PostgreSqlParameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.PostgreSqlParameters"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_prestoparameters.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_prestoparameters.go
new file mode 100644
index 0000000000..0625dc831f
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_prestoparameters.go
@@ -0,0 +1,47 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_PrestoParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.PrestoParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-prestoparameters.html
+type DataSource_PrestoParameters struct {
+
+	// Catalog AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-prestoparameters.html#cfn-quicksight-datasource-prestoparameters-catalog
+	Catalog *types.Value `json:"Catalog,omitempty"`
+
+	// Host AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-prestoparameters.html#cfn-quicksight-datasource-prestoparameters-host
+	Host *types.Value `json:"Host,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-prestoparameters.html#cfn-quicksight-datasource-prestoparameters-port
+	Port *types.Value `json:"Port"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_PrestoParameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.PrestoParameters"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_rdsparameters.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_rdsparameters.go
new file mode 100644
index 0000000000..1697eedfcf
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_rdsparameters.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_RdsParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.RdsParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-rdsparameters.html
+type DataSource_RdsParameters struct {
+
+	// Database AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-rdsparameters.html#cfn-quicksight-datasource-rdsparameters-database
+	Database *types.Value `json:"Database,omitempty"`
+
+	// InstanceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-rdsparameters.html#cfn-quicksight-datasource-rdsparameters-instanceid
+	InstanceId *types.Value `json:"InstanceId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RdsParameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.RdsParameters"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_redshiftparameters.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_redshiftparameters.go
new file mode 100644
index 0000000000..57bb63515f
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_redshiftparameters.go
@@ -0,0 +1,52 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_RedshiftParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.RedshiftParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-redshiftparameters.html
+type DataSource_RedshiftParameters struct {
+
+	// ClusterId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-redshiftparameters.html#cfn-quicksight-datasource-redshiftparameters-clusterid
+	ClusterId *types.Value `json:"ClusterId,omitempty"`
+
+	// Database AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-redshiftparameters.html#cfn-quicksight-datasource-redshiftparameters-database
+	Database *types.Value `json:"Database,omitempty"`
+
+	// Host AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-redshiftparameters.html#cfn-quicksight-datasource-redshiftparameters-host
+	Host *types.Value `json:"Host,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
+	Port *types.Value `json:"Port,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RedshiftParameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.RedshiftParameters"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_resourcepermission.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_resourcepermission.go
new file mode 100644
index 0000000000..67d9f49ead
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_resourcepermission.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_ResourcePermission AWS CloudFormation Resource (AWS::QuickSight::DataSource.ResourcePermission)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-resourcepermission.html
+type DataSource_ResourcePermission struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-resourcepermission.html#cfn-quicksight-datasource-resourcepermission-actions
+	Actions *types.Value `json:"Actions,omitempty"`
+
+	// Principal AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-resourcepermission.html#cfn-quicksight-datasource-resourcepermission-principal
+	Principal *types.Value `json:"Principal,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ResourcePermission) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.ResourcePermission"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_s3parameters.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_s3parameters.go
new file mode 100644
index 0000000000..483647f0e9
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_s3parameters.go
@@ -0,0 +1,35 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_S3Parameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.S3Parameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-s3parameters.html
+type DataSource_S3Parameters struct {
+
+	// ManifestFileLocation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-s3parameters.html#cfn-quicksight-datasource-s3parameters-manifestfilelocation
+	ManifestFileLocation *DataSource_ManifestFileLocation `json:"ManifestFileLocation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_S3Parameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.S3Parameters"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_snowflakeparameters.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_snowflakeparameters.go
new file mode 100644
index 0000000000..c69bb1343a
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_snowflakeparameters.go
@@ -0,0 +1,47 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_SnowflakeParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.SnowflakeParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-snowflakeparameters.html
+type DataSource_SnowflakeParameters struct {
+
+	// Database AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-snowflakeparameters.html#cfn-quicksight-datasource-snowflakeparameters-database
+	Database *types.Value `json:"Database,omitempty"`
+
+	// Host AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-snowflakeparameters.html#cfn-quicksight-datasource-snowflakeparameters-host
+	Host *types.Value `json:"Host,omitempty"`
+
+	// Warehouse AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-snowflakeparameters.html#cfn-quicksight-datasource-snowflakeparameters-warehouse
+	Warehouse *types.Value `json:"Warehouse,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SnowflakeParameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.SnowflakeParameters"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_sparkparameters.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_sparkparameters.go
new file mode 100644
index 0000000000..90a8b53314
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_sparkparameters.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_SparkParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.SparkParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-sparkparameters.html
+type DataSource_SparkParameters struct {
+
+	// Host AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-sparkparameters.html#cfn-quicksight-datasource-sparkparameters-host
+	Host *types.Value `json:"Host,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-sparkparameters.html#cfn-quicksight-datasource-sparkparameters-port
+	Port *types.Value `json:"Port"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SparkParameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.SparkParameters"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_sqlserverparameters.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_sqlserverparameters.go
new file mode 100644
index 0000000000..cddb65cdf1
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_sqlserverparameters.go
@@ -0,0 +1,47 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_SqlServerParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.SqlServerParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-sqlserverparameters.html
+type DataSource_SqlServerParameters struct {
+
+	// Database AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-sqlserverparameters.html#cfn-quicksight-datasource-sqlserverparameters-database
+	Database *types.Value `json:"Database,omitempty"`
+
+	// Host AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-sqlserverparameters.html#cfn-quicksight-datasource-sqlserverparameters-host
+	Host *types.Value `json:"Host,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-sqlserverparameters.html#cfn-quicksight-datasource-sqlserverparameters-port
+	Port *types.Value `json:"Port"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SqlServerParameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.SqlServerParameters"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_sslproperties.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_sslproperties.go
new file mode 100644
index 0000000000..ccd29120fa
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_sslproperties.go
@@ -0,0 +1,37 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_SslProperties AWS CloudFormation Resource (AWS::QuickSight::DataSource.SslProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-sslproperties.html
+type DataSource_SslProperties struct {
+
+	// DisableSsl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-sslproperties.html#cfn-quicksight-datasource-sslproperties-disablessl
+	DisableSsl *types.Value `json:"DisableSsl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SslProperties) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.SslProperties"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_teradataparameters.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_teradataparameters.go
new file mode 100644
index 0000000000..7781c5e606
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_teradataparameters.go
@@ -0,0 +1,47 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_TeradataParameters AWS CloudFormation Resource (AWS::QuickSight::DataSource.TeradataParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-teradataparameters.html
+type DataSource_TeradataParameters struct {
+
+	// Database AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-teradataparameters.html#cfn-quicksight-datasource-teradataparameters-database
+	Database *types.Value `json:"Database,omitempty"`
+
+	// Host AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-teradataparameters.html#cfn-quicksight-datasource-teradataparameters-host
+	Host *types.Value `json:"Host,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-teradataparameters.html#cfn-quicksight-datasource-teradataparameters-port
+	Port *types.Value `json:"Port"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TeradataParameters) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.TeradataParameters"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-datasource_vpcconnectionproperties.go b/goformation/cloudformation/quicksight/aws-quicksight-datasource_vpcconnectionproperties.go
new file mode 100644
index 0000000000..dfbc186244
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-datasource_vpcconnectionproperties.go
@@ -0,0 +1,37 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataSource_VpcConnectionProperties AWS CloudFormation Resource (AWS::QuickSight::DataSource.VpcConnectionProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-vpcconnectionproperties.html
+type DataSource_VpcConnectionProperties struct {
+
+	// VpcConnectionArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-datasource-vpcconnectionproperties.html#cfn-quicksight-datasource-vpcconnectionproperties-vpcconnectionarn
+	VpcConnectionArn *types.Value `json:"VpcConnectionArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_VpcConnectionProperties) AWSCloudFormationType() string {
+	return "AWS::QuickSight::DataSource.VpcConnectionProperties"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-template.go b/goformation/cloudformation/quicksight/aws-quicksight-template.go
new file mode 100644
index 0000000000..d5098641c1
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-template.go
@@ -0,0 +1,139 @@
+package quicksight
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Template AWS CloudFormation Resource (AWS::QuickSight::Template)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-template.html
+type Template struct {
+
+	// AwsAccountId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-template.html#cfn-quicksight-template-awsaccountid
+	AwsAccountId *types.Value `json:"AwsAccountId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-template.html#cfn-quicksight-template-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Permissions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-template.html#cfn-quicksight-template-permissions
+	Permissions []Template_ResourcePermission `json:"Permissions,omitempty"`
+
+	// SourceEntity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-template.html#cfn-quicksight-template-sourceentity
+	SourceEntity *Template_TemplateSourceEntity `json:"SourceEntity,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-template.html#cfn-quicksight-template-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TemplateId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-template.html#cfn-quicksight-template-templateid
+	TemplateId *types.Value `json:"TemplateId,omitempty"`
+
+	// VersionDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-template.html#cfn-quicksight-template-versiondescription
+	VersionDescription *types.Value `json:"VersionDescription,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Template"
+}
+
+// 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 Template) MarshalJSON() ([]byte, error) {
+	type Properties Template
+	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 *Template) UnmarshalJSON(b []byte) error {
+	type Properties Template
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Template(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/quicksight/aws-quicksight-template_datasetreference.go b/goformation/cloudformation/quicksight/aws-quicksight-template_datasetreference.go
new file mode 100644
index 0000000000..efaa056a2f
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-template_datasetreference.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Template_DataSetReference AWS CloudFormation Resource (AWS::QuickSight::Template.DataSetReference)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-datasetreference.html
+type Template_DataSetReference struct {
+
+	// DataSetArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-datasetreference.html#cfn-quicksight-template-datasetreference-datasetarn
+	DataSetArn *types.Value `json:"DataSetArn,omitempty"`
+
+	// DataSetPlaceholder AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-datasetreference.html#cfn-quicksight-template-datasetreference-datasetplaceholder
+	DataSetPlaceholder *types.Value `json:"DataSetPlaceholder,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DataSetReference) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Template.DataSetReference"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-template_resourcepermission.go b/goformation/cloudformation/quicksight/aws-quicksight-template_resourcepermission.go
new file mode 100644
index 0000000000..86cb3538b9
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-template_resourcepermission.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Template_ResourcePermission AWS CloudFormation Resource (AWS::QuickSight::Template.ResourcePermission)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-resourcepermission.html
+type Template_ResourcePermission struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-resourcepermission.html#cfn-quicksight-template-resourcepermission-actions
+	Actions *types.Value `json:"Actions,omitempty"`
+
+	// Principal AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-resourcepermission.html#cfn-quicksight-template-resourcepermission-principal
+	Principal *types.Value `json:"Principal,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ResourcePermission) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Template.ResourcePermission"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourceanalysis.go b/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourceanalysis.go
new file mode 100644
index 0000000000..b6b6cc8748
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourceanalysis.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Template_TemplateSourceAnalysis AWS CloudFormation Resource (AWS::QuickSight::Template.TemplateSourceAnalysis)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-templatesourceanalysis.html
+type Template_TemplateSourceAnalysis struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-templatesourceanalysis.html#cfn-quicksight-template-templatesourceanalysis-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// DataSetReferences AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-templatesourceanalysis.html#cfn-quicksight-template-templatesourceanalysis-datasetreferences
+	DataSetReferences []Template_DataSetReference `json:"DataSetReferences,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TemplateSourceAnalysis) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Template.TemplateSourceAnalysis"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourceentity.go b/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourceentity.go
new file mode 100644
index 0000000000..18e1449312
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourceentity.go
@@ -0,0 +1,40 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Template_TemplateSourceEntity AWS CloudFormation Resource (AWS::QuickSight::Template.TemplateSourceEntity)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-templatesourceentity.html
+type Template_TemplateSourceEntity struct {
+
+	// SourceAnalysis AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-templatesourceentity.html#cfn-quicksight-template-templatesourceentity-sourceanalysis
+	SourceAnalysis *Template_TemplateSourceAnalysis `json:"SourceAnalysis,omitempty"`
+
+	// SourceTemplate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-templatesourceentity.html#cfn-quicksight-template-templatesourceentity-sourcetemplate
+	SourceTemplate *Template_TemplateSourceTemplate `json:"SourceTemplate,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_TemplateSourceEntity) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Template.TemplateSourceEntity"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourcetemplate.go b/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourcetemplate.go
new file mode 100644
index 0000000000..c43c18f7d6
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-template_templatesourcetemplate.go
@@ -0,0 +1,37 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Template_TemplateSourceTemplate AWS CloudFormation Resource (AWS::QuickSight::Template.TemplateSourceTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-templatesourcetemplate.html
+type Template_TemplateSourceTemplate struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-template-templatesourcetemplate.html#cfn-quicksight-template-templatesourcetemplate-arn
+	Arn *types.Value `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 *Template_TemplateSourceTemplate) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Template.TemplateSourceTemplate"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme.go b/goformation/cloudformation/quicksight/aws-quicksight-theme.go
new file mode 100644
index 0000000000..add453092b
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-theme.go
@@ -0,0 +1,144 @@
+package quicksight
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Theme AWS CloudFormation Resource (AWS::QuickSight::Theme)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-theme.html
+type Theme struct {
+
+	// AwsAccountId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-theme.html#cfn-quicksight-theme-awsaccountid
+	AwsAccountId *types.Value `json:"AwsAccountId,omitempty"`
+
+	// BaseThemeId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-theme.html#cfn-quicksight-theme-basethemeid
+	BaseThemeId *types.Value `json:"BaseThemeId,omitempty"`
+
+	// Configuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-theme.html#cfn-quicksight-theme-configuration
+	Configuration *Theme_ThemeConfiguration `json:"Configuration,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-theme.html#cfn-quicksight-theme-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Permissions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-theme.html#cfn-quicksight-theme-permissions
+	Permissions []Theme_ResourcePermission `json:"Permissions,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-theme.html#cfn-quicksight-theme-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// ThemeId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-theme.html#cfn-quicksight-theme-themeid
+	ThemeId *types.Value `json:"ThemeId,omitempty"`
+
+	// VersionDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-quicksight-theme.html#cfn-quicksight-theme-versiondescription
+	VersionDescription *types.Value `json:"VersionDescription,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Theme) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Theme"
+}
+
+// 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 Theme) MarshalJSON() ([]byte, error) {
+	type Properties Theme
+	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 *Theme) UnmarshalJSON(b []byte) error {
+	type Properties Theme
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Theme(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/quicksight/aws-quicksight-theme_borderstyle.go b/goformation/cloudformation/quicksight/aws-quicksight-theme_borderstyle.go
new file mode 100644
index 0000000000..6a36d08816
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-theme_borderstyle.go
@@ -0,0 +1,37 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Theme_BorderStyle AWS CloudFormation Resource (AWS::QuickSight::Theme.BorderStyle)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-borderstyle.html
+type Theme_BorderStyle struct {
+
+	// Show AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-borderstyle.html#cfn-quicksight-theme-borderstyle-show
+	Show *types.Value `json:"Show,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Theme_BorderStyle) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Theme.BorderStyle"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_datacolorpalette.go b/goformation/cloudformation/quicksight/aws-quicksight-theme_datacolorpalette.go
new file mode 100644
index 0000000000..c711bfa978
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-theme_datacolorpalette.go
@@ -0,0 +1,47 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Theme_DataColorPalette AWS CloudFormation Resource (AWS::QuickSight::Theme.DataColorPalette)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-datacolorpalette.html
+type Theme_DataColorPalette struct {
+
+	// Colors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-datacolorpalette.html#cfn-quicksight-theme-datacolorpalette-colors
+	Colors *types.Value `json:"Colors,omitempty"`
+
+	// EmptyFillColor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-datacolorpalette.html#cfn-quicksight-theme-datacolorpalette-emptyfillcolor
+	EmptyFillColor *types.Value `json:"EmptyFillColor,omitempty"`
+
+	// MinMaxGradient AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-datacolorpalette.html#cfn-quicksight-theme-datacolorpalette-minmaxgradient
+	MinMaxGradient *types.Value `json:"MinMaxGradient,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Theme_DataColorPalette) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Theme.DataColorPalette"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_font.go b/goformation/cloudformation/quicksight/aws-quicksight-theme_font.go
new file mode 100644
index 0000000000..16e0ecf56c
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-theme_font.go
@@ -0,0 +1,37 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Theme_Font AWS CloudFormation Resource (AWS::QuickSight::Theme.Font)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-font.html
+type Theme_Font struct {
+
+	// FontFamily AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-font.html#cfn-quicksight-theme-font-fontfamily
+	FontFamily *types.Value `json:"FontFamily,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Theme_Font) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Theme.Font"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_gutterstyle.go b/goformation/cloudformation/quicksight/aws-quicksight-theme_gutterstyle.go
new file mode 100644
index 0000000000..72de575458
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-theme_gutterstyle.go
@@ -0,0 +1,37 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Theme_GutterStyle AWS CloudFormation Resource (AWS::QuickSight::Theme.GutterStyle)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-gutterstyle.html
+type Theme_GutterStyle struct {
+
+	// Show AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-gutterstyle.html#cfn-quicksight-theme-gutterstyle-show
+	Show *types.Value `json:"Show,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Theme_GutterStyle) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Theme.GutterStyle"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_marginstyle.go b/goformation/cloudformation/quicksight/aws-quicksight-theme_marginstyle.go
new file mode 100644
index 0000000000..6ad3c3a74e
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-theme_marginstyle.go
@@ -0,0 +1,37 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Theme_MarginStyle AWS CloudFormation Resource (AWS::QuickSight::Theme.MarginStyle)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-marginstyle.html
+type Theme_MarginStyle struct {
+
+	// Show AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-marginstyle.html#cfn-quicksight-theme-marginstyle-show
+	Show *types.Value `json:"Show,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Theme_MarginStyle) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Theme.MarginStyle"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_resourcepermission.go b/goformation/cloudformation/quicksight/aws-quicksight-theme_resourcepermission.go
new file mode 100644
index 0000000000..5de23f9382
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-theme_resourcepermission.go
@@ -0,0 +1,42 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Theme_ResourcePermission AWS CloudFormation Resource (AWS::QuickSight::Theme.ResourcePermission)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-resourcepermission.html
+type Theme_ResourcePermission struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-resourcepermission.html#cfn-quicksight-theme-resourcepermission-actions
+	Actions *types.Value `json:"Actions,omitempty"`
+
+	// Principal AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-resourcepermission.html#cfn-quicksight-theme-resourcepermission-principal
+	Principal *types.Value `json:"Principal,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Theme_ResourcePermission) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Theme.ResourcePermission"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_sheetstyle.go b/goformation/cloudformation/quicksight/aws-quicksight-theme_sheetstyle.go
new file mode 100644
index 0000000000..b16e6ba0e0
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-theme_sheetstyle.go
@@ -0,0 +1,40 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Theme_SheetStyle AWS CloudFormation Resource (AWS::QuickSight::Theme.SheetStyle)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-sheetstyle.html
+type Theme_SheetStyle struct {
+
+	// Tile AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-sheetstyle.html#cfn-quicksight-theme-sheetstyle-tile
+	Tile *Theme_TileStyle `json:"Tile,omitempty"`
+
+	// TileLayout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-sheetstyle.html#cfn-quicksight-theme-sheetstyle-tilelayout
+	TileLayout *Theme_TileLayoutStyle `json:"TileLayout,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Theme_SheetStyle) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Theme.SheetStyle"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_themeconfiguration.go b/goformation/cloudformation/quicksight/aws-quicksight-theme_themeconfiguration.go
new file mode 100644
index 0000000000..0b52d96d25
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-theme_themeconfiguration.go
@@ -0,0 +1,50 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Theme_ThemeConfiguration AWS CloudFormation Resource (AWS::QuickSight::Theme.ThemeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-themeconfiguration.html
+type Theme_ThemeConfiguration struct {
+
+	// DataColorPalette AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-themeconfiguration.html#cfn-quicksight-theme-themeconfiguration-datacolorpalette
+	DataColorPalette *Theme_DataColorPalette `json:"DataColorPalette,omitempty"`
+
+	// Sheet AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-themeconfiguration.html#cfn-quicksight-theme-themeconfiguration-sheet
+	Sheet *Theme_SheetStyle `json:"Sheet,omitempty"`
+
+	// Typography AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-themeconfiguration.html#cfn-quicksight-theme-themeconfiguration-typography
+	Typography *Theme_Typography `json:"Typography,omitempty"`
+
+	// UIColorPalette AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-themeconfiguration.html#cfn-quicksight-theme-themeconfiguration-uicolorpalette
+	UIColorPalette *Theme_UIColorPalette `json:"UIColorPalette,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Theme_ThemeConfiguration) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Theme.ThemeConfiguration"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_tilelayoutstyle.go b/goformation/cloudformation/quicksight/aws-quicksight-theme_tilelayoutstyle.go
new file mode 100644
index 0000000000..ead78b33aa
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-theme_tilelayoutstyle.go
@@ -0,0 +1,40 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Theme_TileLayoutStyle AWS CloudFormation Resource (AWS::QuickSight::Theme.TileLayoutStyle)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-tilelayoutstyle.html
+type Theme_TileLayoutStyle struct {
+
+	// Gutter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-tilelayoutstyle.html#cfn-quicksight-theme-tilelayoutstyle-gutter
+	Gutter *Theme_GutterStyle `json:"Gutter,omitempty"`
+
+	// Margin AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-tilelayoutstyle.html#cfn-quicksight-theme-tilelayoutstyle-margin
+	Margin *Theme_MarginStyle `json:"Margin,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Theme_TileLayoutStyle) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Theme.TileLayoutStyle"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_tilestyle.go b/goformation/cloudformation/quicksight/aws-quicksight-theme_tilestyle.go
new file mode 100644
index 0000000000..8a2a0ab332
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-theme_tilestyle.go
@@ -0,0 +1,35 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Theme_TileStyle AWS CloudFormation Resource (AWS::QuickSight::Theme.TileStyle)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-tilestyle.html
+type Theme_TileStyle struct {
+
+	// Border AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-tilestyle.html#cfn-quicksight-theme-tilestyle-border
+	Border *Theme_BorderStyle `json:"Border,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Theme_TileStyle) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Theme.TileStyle"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_typography.go b/goformation/cloudformation/quicksight/aws-quicksight-theme_typography.go
new file mode 100644
index 0000000000..0720a457d4
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-theme_typography.go
@@ -0,0 +1,35 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Theme_Typography AWS CloudFormation Resource (AWS::QuickSight::Theme.Typography)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-typography.html
+type Theme_Typography struct {
+
+	// FontFamilies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-typography.html#cfn-quicksight-theme-typography-fontfamilies
+	FontFamilies []Theme_Font `json:"FontFamilies,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Theme_Typography) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Theme.Typography"
+}
diff --git a/goformation/cloudformation/quicksight/aws-quicksight-theme_uicolorpalette.go b/goformation/cloudformation/quicksight/aws-quicksight-theme_uicolorpalette.go
new file mode 100644
index 0000000000..93bb12280c
--- /dev/null
+++ b/goformation/cloudformation/quicksight/aws-quicksight-theme_uicolorpalette.go
@@ -0,0 +1,112 @@
+package quicksight
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Theme_UIColorPalette AWS CloudFormation Resource (AWS::QuickSight::Theme.UIColorPalette)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-uicolorpalette.html
+type Theme_UIColorPalette struct {
+
+	// Accent AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-uicolorpalette.html#cfn-quicksight-theme-uicolorpalette-accent
+	Accent *types.Value `json:"Accent,omitempty"`
+
+	// AccentForeground AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-uicolorpalette.html#cfn-quicksight-theme-uicolorpalette-accentforeground
+	AccentForeground *types.Value `json:"AccentForeground,omitempty"`
+
+	// Danger AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-uicolorpalette.html#cfn-quicksight-theme-uicolorpalette-danger
+	Danger *types.Value `json:"Danger,omitempty"`
+
+	// DangerForeground AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-uicolorpalette.html#cfn-quicksight-theme-uicolorpalette-dangerforeground
+	DangerForeground *types.Value `json:"DangerForeground,omitempty"`
+
+	// Dimension AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-uicolorpalette.html#cfn-quicksight-theme-uicolorpalette-dimension
+	Dimension *types.Value `json:"Dimension,omitempty"`
+
+	// DimensionForeground AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-uicolorpalette.html#cfn-quicksight-theme-uicolorpalette-dimensionforeground
+	DimensionForeground *types.Value `json:"DimensionForeground,omitempty"`
+
+	// Measure AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-uicolorpalette.html#cfn-quicksight-theme-uicolorpalette-measure
+	Measure *types.Value `json:"Measure,omitempty"`
+
+	// MeasureForeground AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-uicolorpalette.html#cfn-quicksight-theme-uicolorpalette-measureforeground
+	MeasureForeground *types.Value `json:"MeasureForeground,omitempty"`
+
+	// PrimaryBackground AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-uicolorpalette.html#cfn-quicksight-theme-uicolorpalette-primarybackground
+	PrimaryBackground *types.Value `json:"PrimaryBackground,omitempty"`
+
+	// PrimaryForeground AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-uicolorpalette.html#cfn-quicksight-theme-uicolorpalette-primaryforeground
+	PrimaryForeground *types.Value `json:"PrimaryForeground,omitempty"`
+
+	// SecondaryBackground AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-uicolorpalette.html#cfn-quicksight-theme-uicolorpalette-secondarybackground
+	SecondaryBackground *types.Value `json:"SecondaryBackground,omitempty"`
+
+	// SecondaryForeground AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-uicolorpalette.html#cfn-quicksight-theme-uicolorpalette-secondaryforeground
+	SecondaryForeground *types.Value `json:"SecondaryForeground,omitempty"`
+
+	// Success AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-uicolorpalette.html#cfn-quicksight-theme-uicolorpalette-success
+	Success *types.Value `json:"Success,omitempty"`
+
+	// SuccessForeground AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-uicolorpalette.html#cfn-quicksight-theme-uicolorpalette-successforeground
+	SuccessForeground *types.Value `json:"SuccessForeground,omitempty"`
+
+	// Warning AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-uicolorpalette.html#cfn-quicksight-theme-uicolorpalette-warning
+	Warning *types.Value `json:"Warning,omitempty"`
+
+	// WarningForeground AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-quicksight-theme-uicolorpalette.html#cfn-quicksight-theme-uicolorpalette-warningforeground
+	WarningForeground *types.Value `json:"WarningForeground,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Theme_UIColorPalette) AWSCloudFormationType() string {
+	return "AWS::QuickSight::Theme.UIColorPalette"
+}
diff --git a/goformation/cloudformation/ram/aws-ram-resourceshare.go b/goformation/cloudformation/ram/aws-ram-resourceshare.go
new file mode 100644
index 0000000000..5369a24b86
--- /dev/null
+++ b/goformation/cloudformation/ram/aws-ram-resourceshare.go
@@ -0,0 +1,134 @@
+package ram
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceShare AWS CloudFormation Resource (AWS::RAM::ResourceShare)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ram-resourceshare.html
+type ResourceShare struct {
+
+	// AllowExternalPrincipals AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ram-resourceshare.html#cfn-ram-resourceshare-allowexternalprincipals
+	AllowExternalPrincipals *types.Value `json:"AllowExternalPrincipals,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ram-resourceshare.html#cfn-ram-resourceshare-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// PermissionArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ram-resourceshare.html#cfn-ram-resourceshare-permissionarns
+	PermissionArns *types.Value `json:"PermissionArns,omitempty"`
+
+	// Principals AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ram-resourceshare.html#cfn-ram-resourceshare-principals
+	Principals *types.Value `json:"Principals,omitempty"`
+
+	// ResourceArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ram-resourceshare.html#cfn-ram-resourceshare-resourcearns
+	ResourceArns *types.Value `json:"ResourceArns,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ram-resourceshare.html#cfn-ram-resourceshare-tags
+	Tags []cloudformation.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 *ResourceShare) AWSCloudFormationType() string {
+	return "AWS::RAM::ResourceShare"
+}
+
+// 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 ResourceShare) MarshalJSON() ([]byte, error) {
+	type Properties ResourceShare
+	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 *ResourceShare) UnmarshalJSON(b []byte) error {
+	type Properties ResourceShare
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResourceShare(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/rds/aws-rds-dbcluster.go b/goformation/cloudformation/rds/aws-rds-dbcluster.go
new file mode 100644
index 0000000000..009d3da467
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-dbcluster.go
@@ -0,0 +1,269 @@
+package rds
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBCluster AWS CloudFormation Resource (AWS::RDS::DBCluster)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html
+type DBCluster struct {
+
+	// AssociatedRoles AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-associatedroles
+	AssociatedRoles []DBCluster_DBClusterRole `json:"AssociatedRoles,omitempty"`
+
+	// AvailabilityZones AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-availabilityzones
+	AvailabilityZones *types.Value `json:"AvailabilityZones,omitempty"`
+
+	// BacktrackWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-backtrackwindow
+	BacktrackWindow *types.Value `json:"BacktrackWindow,omitempty"`
+
+	// BackupRetentionPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-backuprententionperiod
+	BackupRetentionPeriod *types.Value `json:"BackupRetentionPeriod,omitempty"`
+
+	// CopyTagsToSnapshot AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-copytagstosnapshot
+	CopyTagsToSnapshot *types.Value `json:"CopyTagsToSnapshot,omitempty"`
+
+	// DBClusterIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-dbclusteridentifier
+	DBClusterIdentifier *types.Value `json:"DBClusterIdentifier,omitempty"`
+
+	// DBClusterParameterGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-dbclusterparametergroupname
+	DBClusterParameterGroupName *types.Value `json:"DBClusterParameterGroupName,omitempty"`
+
+	// DBSubnetGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-dbsubnetgroupname
+	DBSubnetGroupName *types.Value `json:"DBSubnetGroupName,omitempty"`
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// DeletionProtection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-deletionprotection
+	DeletionProtection *types.Value `json:"DeletionProtection,omitempty"`
+
+	// EnableCloudwatchLogsExports AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-enablecloudwatchlogsexports
+	EnableCloudwatchLogsExports *types.Value `json:"EnableCloudwatchLogsExports,omitempty"`
+
+	// EnableHttpEndpoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-enablehttpendpoint
+	EnableHttpEndpoint *types.Value `json:"EnableHttpEndpoint,omitempty"`
+
+	// EnableIAMDatabaseAuthentication AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-enableiamdatabaseauthentication
+	EnableIAMDatabaseAuthentication *types.Value `json:"EnableIAMDatabaseAuthentication,omitempty"`
+
+	// Engine AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-engine
+	Engine *types.Value `json:"Engine,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
+	EngineMode *types.Value `json:"EngineMode,omitempty"`
+
+	// EngineVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-engineversion
+	EngineVersion *types.Value `json:"EngineVersion,omitempty"`
+
+	// GlobalClusterIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-globalclusteridentifier
+	GlobalClusterIdentifier *types.Value `json:"GlobalClusterIdentifier,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// MasterUserPassword AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-masteruserpassword
+	MasterUserPassword *types.Value `json:"MasterUserPassword,omitempty"`
+
+	// MasterUsername AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-masterusername
+	MasterUsername *types.Value `json:"MasterUsername,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// PreferredBackupWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-preferredbackupwindow
+	PreferredBackupWindow *types.Value `json:"PreferredBackupWindow,omitempty"`
+
+	// PreferredMaintenanceWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-preferredmaintenancewindow
+	PreferredMaintenanceWindow *types.Value `json:"PreferredMaintenanceWindow,omitempty"`
+
+	// ReplicationSourceIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-replicationsourceidentifier
+	ReplicationSourceIdentifier *types.Value `json:"ReplicationSourceIdentifier,omitempty"`
+
+	// RestoreType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-restoretype
+	RestoreType *types.Value `json:"RestoreType,omitempty"`
+
+	// ScalingConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-scalingconfiguration
+	ScalingConfiguration *DBCluster_ScalingConfiguration `json:"ScalingConfiguration,omitempty"`
+
+	// SnapshotIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-snapshotidentifier
+	SnapshotIdentifier *types.Value `json:"SnapshotIdentifier,omitempty"`
+
+	// SourceDBClusterIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-sourcedbclusteridentifier
+	SourceDBClusterIdentifier *types.Value `json:"SourceDBClusterIdentifier,omitempty"`
+
+	// SourceRegion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-sourceregion
+	SourceRegion *types.Value `json:"SourceRegion,omitempty"`
+
+	// StorageEncrypted AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-storageencrypted
+	StorageEncrypted *types.Value `json:"StorageEncrypted,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// UseLatestRestorableTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-uselatestrestorabletime
+	UseLatestRestorableTime *types.Value `json:"UseLatestRestorableTime,omitempty"`
+
+	// VpcSecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbcluster.html#cfn-rds-dbcluster-vpcsecuritygroupids
+	VpcSecurityGroupIds *types.Value `json:"VpcSecurityGroupIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DBCluster) AWSCloudFormationType() string {
+	return "AWS::RDS::DBCluster"
+}
+
+// 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 DBCluster) MarshalJSON() ([]byte, error) {
+	type Properties DBCluster
+	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 *DBCluster) UnmarshalJSON(b []byte) error {
+	type Properties DBCluster
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DBCluster(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/rds/aws-rds-dbcluster_dbclusterrole.go b/goformation/cloudformation/rds/aws-rds-dbcluster_dbclusterrole.go
new file mode 100644
index 0000000000..947b9f8fa6
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-dbcluster_dbclusterrole.go
@@ -0,0 +1,42 @@
+package rds
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBCluster_DBClusterRole AWS CloudFormation Resource (AWS::RDS::DBCluster.DBClusterRole)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbcluster-dbclusterrole.html
+type DBCluster_DBClusterRole struct {
+
+	// FeatureName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbcluster-dbclusterrole.html#cfn-rds-dbcluster-dbclusterrole-featurename
+	FeatureName *types.Value `json:"FeatureName,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbcluster-dbclusterrole.html#cfn-rds-dbcluster-dbclusterrole-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DBCluster_DBClusterRole) AWSCloudFormationType() string {
+	return "AWS::RDS::DBCluster.DBClusterRole"
+}
diff --git a/goformation/cloudformation/rds/aws-rds-dbcluster_scalingconfiguration.go b/goformation/cloudformation/rds/aws-rds-dbcluster_scalingconfiguration.go
new file mode 100644
index 0000000000..0a944890c8
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-dbcluster_scalingconfiguration.go
@@ -0,0 +1,52 @@
+package rds
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBCluster_ScalingConfiguration AWS CloudFormation Resource (AWS::RDS::DBCluster.ScalingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbcluster-scalingconfiguration.html
+type DBCluster_ScalingConfiguration struct {
+
+	// AutoPause AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbcluster-scalingconfiguration.html#cfn-rds-dbcluster-scalingconfiguration-autopause
+	AutoPause *types.Value `json:"AutoPause,omitempty"`
+
+	// MaxCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbcluster-scalingconfiguration.html#cfn-rds-dbcluster-scalingconfiguration-maxcapacity
+	MaxCapacity *types.Value `json:"MaxCapacity,omitempty"`
+
+	// MinCapacity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbcluster-scalingconfiguration.html#cfn-rds-dbcluster-scalingconfiguration-mincapacity
+	MinCapacity *types.Value `json:"MinCapacity,omitempty"`
+
+	// SecondsUntilAutoPause AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbcluster-scalingconfiguration.html#cfn-rds-dbcluster-scalingconfiguration-secondsuntilautopause
+	SecondsUntilAutoPause *types.Value `json:"SecondsUntilAutoPause,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DBCluster_ScalingConfiguration) AWSCloudFormationType() string {
+	return "AWS::RDS::DBCluster.ScalingConfiguration"
+}
diff --git a/goformation/cloudformation/rds/aws-rds-dbclusterparametergroup.go b/goformation/cloudformation/rds/aws-rds-dbclusterparametergroup.go
new file mode 100644
index 0000000000..c8652831d0
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-dbclusterparametergroup.go
@@ -0,0 +1,124 @@
+package rds
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBClusterParameterGroup AWS CloudFormation Resource (AWS::RDS::DBClusterParameterGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbclusterparametergroup.html
+type DBClusterParameterGroup struct {
+
+	// Description AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbclusterparametergroup.html#cfn-rds-dbclusterparametergroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Family AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbclusterparametergroup.html#cfn-rds-dbclusterparametergroup-family
+	Family *types.Value `json:"Family,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbclusterparametergroup.html#cfn-rds-dbclusterparametergroup-parameters
+	Parameters interface{} `json:"Parameters,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbclusterparametergroup.html#cfn-rds-dbclusterparametergroup-tags
+	Tags []cloudformation.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 *DBClusterParameterGroup) AWSCloudFormationType() string {
+	return "AWS::RDS::DBClusterParameterGroup"
+}
+
+// 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 DBClusterParameterGroup) MarshalJSON() ([]byte, error) {
+	type Properties DBClusterParameterGroup
+	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 *DBClusterParameterGroup) UnmarshalJSON(b []byte) error {
+	type Properties DBClusterParameterGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DBClusterParameterGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/rds/aws-rds-dbinstance.go b/goformation/cloudformation/rds/aws-rds-dbinstance.go
new file mode 100644
index 0000000000..02f13d8501
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-dbinstance.go
@@ -0,0 +1,364 @@
+package rds
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBInstance AWS CloudFormation Resource (AWS::RDS::DBInstance)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html
+type DBInstance struct {
+
+	// AllocatedStorage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-allocatedstorage
+	AllocatedStorage *types.Value `json:"AllocatedStorage,omitempty"`
+
+	// AllowMajorVersionUpgrade AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-allowmajorversionupgrade
+	AllowMajorVersionUpgrade *types.Value `json:"AllowMajorVersionUpgrade,omitempty"`
+
+	// AssociatedRoles AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-associatedroles
+	AssociatedRoles []DBInstance_DBInstanceRole `json:"AssociatedRoles,omitempty"`
+
+	// AutoMinorVersionUpgrade AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-autominorversionupgrade
+	AutoMinorVersionUpgrade *types.Value `json:"AutoMinorVersionUpgrade,omitempty"`
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// BackupRetentionPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-backupretentionperiod
+	BackupRetentionPeriod *types.Value `json:"BackupRetentionPeriod,omitempty"`
+
+	// CACertificateIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-cacertificateidentifier
+	CACertificateIdentifier *types.Value `json:"CACertificateIdentifier,omitempty"`
+
+	// CharacterSetName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-charactersetname
+	CharacterSetName *types.Value `json:"CharacterSetName,omitempty"`
+
+	// CopyTagsToSnapshot AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-copytagstosnapshot
+	CopyTagsToSnapshot *types.Value `json:"CopyTagsToSnapshot,omitempty"`
+
+	// DBClusterIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-dbclusteridentifier
+	DBClusterIdentifier *types.Value `json:"DBClusterIdentifier,omitempty"`
+
+	// DBInstanceClass AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-dbinstanceclass
+	DBInstanceClass *types.Value `json:"DBInstanceClass,omitempty"`
+
+	// DBInstanceIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-dbinstanceidentifier
+	DBInstanceIdentifier *types.Value `json:"DBInstanceIdentifier,omitempty"`
+
+	// DBName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-dbname
+	DBName *types.Value `json:"DBName,omitempty"`
+
+	// DBParameterGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-dbparametergroupname
+	DBParameterGroupName *types.Value `json:"DBParameterGroupName,omitempty"`
+
+	// DBSecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-dbsecuritygroups
+	DBSecurityGroups *types.Value `json:"DBSecurityGroups,omitempty"`
+
+	// DBSnapshotIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-dbsnapshotidentifier
+	DBSnapshotIdentifier *types.Value `json:"DBSnapshotIdentifier,omitempty"`
+
+	// DBSubnetGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-dbsubnetgroupname
+	DBSubnetGroupName *types.Value `json:"DBSubnetGroupName,omitempty"`
+
+	// DeleteAutomatedBackups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-deleteautomatedbackups
+	DeleteAutomatedBackups *types.Value `json:"DeleteAutomatedBackups,omitempty"`
+
+	// DeletionProtection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-deletionprotection
+	DeletionProtection *types.Value `json:"DeletionProtection,omitempty"`
+
+	// Domain AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-domain
+	Domain *types.Value `json:"Domain,omitempty"`
+
+	// DomainIAMRoleName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-domainiamrolename
+	DomainIAMRoleName *types.Value `json:"DomainIAMRoleName,omitempty"`
+
+	// EnableCloudwatchLogsExports AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-enablecloudwatchlogsexports
+	EnableCloudwatchLogsExports *types.Value `json:"EnableCloudwatchLogsExports,omitempty"`
+
+	// EnableIAMDatabaseAuthentication AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-enableiamdatabaseauthentication
+	EnableIAMDatabaseAuthentication *types.Value `json:"EnableIAMDatabaseAuthentication,omitempty"`
+
+	// EnablePerformanceInsights AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-enableperformanceinsights
+	EnablePerformanceInsights *types.Value `json:"EnablePerformanceInsights,omitempty"`
+
+	// Engine AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-engine
+	Engine *types.Value `json:"Engine,omitempty"`
+
+	// EngineVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-engineversion
+	EngineVersion *types.Value `json:"EngineVersion,omitempty"`
+
+	// Iops AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-iops
+	Iops *types.Value `json:"Iops,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// LicenseModel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-licensemodel
+	LicenseModel *types.Value `json:"LicenseModel,omitempty"`
+
+	// MasterUserPassword AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-masteruserpassword
+	MasterUserPassword *types.Value `json:"MasterUserPassword,omitempty"`
+
+	// MasterUsername AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-masterusername
+	MasterUsername *types.Value `json:"MasterUsername,omitempty"`
+
+	// MaxAllocatedStorage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-maxallocatedstorage
+	MaxAllocatedStorage *types.Value `json:"MaxAllocatedStorage,omitempty"`
+
+	// MonitoringInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-monitoringinterval
+	MonitoringInterval *types.Value `json:"MonitoringInterval,omitempty"`
+
+	// MonitoringRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-monitoringrolearn
+	MonitoringRoleArn *types.Value `json:"MonitoringRoleArn,omitempty"`
+
+	// MultiAZ AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-multiaz
+	MultiAZ *types.Value `json:"MultiAZ,omitempty"`
+
+	// OptionGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-optiongroupname
+	OptionGroupName *types.Value `json:"OptionGroupName,omitempty"`
+
+	// PerformanceInsightsKMSKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-performanceinsightskmskeyid
+	PerformanceInsightsKMSKeyId *types.Value `json:"PerformanceInsightsKMSKeyId,omitempty"`
+
+	// PerformanceInsightsRetentionPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-performanceinsightsretentionperiod
+	PerformanceInsightsRetentionPeriod *types.Value `json:"PerformanceInsightsRetentionPeriod,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// PreferredBackupWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-preferredbackupwindow
+	PreferredBackupWindow *types.Value `json:"PreferredBackupWindow,omitempty"`
+
+	// PreferredMaintenanceWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-preferredmaintenancewindow
+	PreferredMaintenanceWindow *types.Value `json:"PreferredMaintenanceWindow,omitempty"`
+
+	// ProcessorFeatures AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-processorfeatures
+	ProcessorFeatures []DBInstance_ProcessorFeature `json:"ProcessorFeatures,omitempty"`
+
+	// PromotionTier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-promotiontier
+	PromotionTier *types.Value `json:"PromotionTier,omitempty"`
+
+	// PubliclyAccessible AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-publiclyaccessible
+	PubliclyAccessible *types.Value `json:"PubliclyAccessible,omitempty"`
+
+	// SourceDBInstanceIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-sourcedbinstanceidentifier
+	SourceDBInstanceIdentifier *types.Value `json:"SourceDBInstanceIdentifier,omitempty"`
+
+	// SourceRegion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-sourceregion
+	SourceRegion *types.Value `json:"SourceRegion,omitempty"`
+
+	// StorageEncrypted AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-storageencrypted
+	StorageEncrypted *types.Value `json:"StorageEncrypted,omitempty"`
+
+	// StorageType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-storagetype
+	StorageType *types.Value `json:"StorageType,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Timezone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-timezone
+	Timezone *types.Value `json:"Timezone,omitempty"`
+
+	// UseDefaultProcessorFeatures AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-usedefaultprocessorfeatures
+	UseDefaultProcessorFeatures *types.Value `json:"UseDefaultProcessorFeatures,omitempty"`
+
+	// VPCSecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-database-instance.html#cfn-rds-dbinstance-vpcsecuritygroups
+	VPCSecurityGroups *types.Value `json:"VPCSecurityGroups,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DBInstance) AWSCloudFormationType() string {
+	return "AWS::RDS::DBInstance"
+}
+
+// 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 DBInstance) MarshalJSON() ([]byte, error) {
+	type Properties DBInstance
+	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 *DBInstance) UnmarshalJSON(b []byte) error {
+	type Properties DBInstance
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DBInstance(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/rds/aws-rds-dbinstance_dbinstancerole.go b/goformation/cloudformation/rds/aws-rds-dbinstance_dbinstancerole.go
new file mode 100644
index 0000000000..054e7d0115
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-dbinstance_dbinstancerole.go
@@ -0,0 +1,42 @@
+package rds
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBInstance_DBInstanceRole AWS CloudFormation Resource (AWS::RDS::DBInstance.DBInstanceRole)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbinstance-dbinstancerole.html
+type DBInstance_DBInstanceRole struct {
+
+	// FeatureName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbinstance-dbinstancerole.html#cfn-rds-dbinstance-dbinstancerole-featurename
+	FeatureName *types.Value `json:"FeatureName,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbinstance-dbinstancerole.html#cfn-rds-dbinstance-dbinstancerole-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DBInstance_DBInstanceRole) AWSCloudFormationType() string {
+	return "AWS::RDS::DBInstance.DBInstanceRole"
+}
diff --git a/goformation/cloudformation/rds/aws-rds-dbinstance_processorfeature.go b/goformation/cloudformation/rds/aws-rds-dbinstance_processorfeature.go
new file mode 100644
index 0000000000..b79fe21e37
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-dbinstance_processorfeature.go
@@ -0,0 +1,42 @@
+package rds
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBInstance_ProcessorFeature AWS CloudFormation Resource (AWS::RDS::DBInstance.ProcessorFeature)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbinstance-processorfeature.html
+type DBInstance_ProcessorFeature struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbinstance-processorfeature.html#cfn-rds-dbinstance-processorfeature-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbinstance-processorfeature.html#cfn-rds-dbinstance-processorfeature-value
+	Value *types.Value `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 *DBInstance_ProcessorFeature) AWSCloudFormationType() string {
+	return "AWS::RDS::DBInstance.ProcessorFeature"
+}
diff --git a/goformation/cloudformation/rds/aws-rds-dbparametergroup.go b/goformation/cloudformation/rds/aws-rds-dbparametergroup.go
new file mode 100644
index 0000000000..7b2b4db4fc
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-dbparametergroup.go
@@ -0,0 +1,124 @@
+package rds
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBParameterGroup AWS CloudFormation Resource (AWS::RDS::DBParameterGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbparametergroup.html
+type DBParameterGroup struct {
+
+	// Description AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbparametergroup.html#cfn-rds-dbparametergroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Family AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbparametergroup.html#cfn-rds-dbparametergroup-family
+	Family *types.Value `json:"Family,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbparametergroup.html#cfn-rds-dbparametergroup-parameters
+	Parameters map[string]*types.Value `json:"Parameters,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbparametergroup.html#cfn-rds-dbparametergroup-tags
+	Tags []cloudformation.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 *DBParameterGroup) AWSCloudFormationType() string {
+	return "AWS::RDS::DBParameterGroup"
+}
+
+// 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 DBParameterGroup) MarshalJSON() ([]byte, error) {
+	type Properties DBParameterGroup
+	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 *DBParameterGroup) UnmarshalJSON(b []byte) error {
+	type Properties DBParameterGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DBParameterGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/rds/aws-rds-dbproxy.go b/goformation/cloudformation/rds/aws-rds-dbproxy.go
new file mode 100644
index 0000000000..59051c25f7
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-dbproxy.go
@@ -0,0 +1,153 @@
+package rds
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBProxy AWS CloudFormation Resource (AWS::RDS::DBProxy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxy.html
+type DBProxy struct {
+
+	// Auth AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxy.html#cfn-rds-dbproxy-auth
+	Auth []DBProxy_AuthFormat `json:"Auth,omitempty"`
+
+	// DBProxyName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxy.html#cfn-rds-dbproxy-dbproxyname
+	DBProxyName *types.Value `json:"DBProxyName,omitempty"`
+
+	// DebugLogging AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxy.html#cfn-rds-dbproxy-debuglogging
+	DebugLogging *types.Value `json:"DebugLogging,omitempty"`
+
+	// EngineFamily AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxy.html#cfn-rds-dbproxy-enginefamily
+	EngineFamily *types.Value `json:"EngineFamily,omitempty"`
+
+	// IdleClientTimeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxy.html#cfn-rds-dbproxy-idleclienttimeout
+	IdleClientTimeout *types.Value `json:"IdleClientTimeout,omitempty"`
+
+	// RequireTLS AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxy.html#cfn-rds-dbproxy-requiretls
+	RequireTLS *types.Value `json:"RequireTLS,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxy.html#cfn-rds-dbproxy-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxy.html#cfn-rds-dbproxy-tags
+	Tags []DBProxy_TagFormat `json:"Tags,omitempty"`
+
+	// VpcSecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxy.html#cfn-rds-dbproxy-vpcsecuritygroupids
+	VpcSecurityGroupIds *types.Value `json:"VpcSecurityGroupIds,omitempty"`
+
+	// VpcSubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxy.html#cfn-rds-dbproxy-vpcsubnetids
+	VpcSubnetIds *types.Value `json:"VpcSubnetIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DBProxy) AWSCloudFormationType() string {
+	return "AWS::RDS::DBProxy"
+}
+
+// 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 DBProxy) MarshalJSON() ([]byte, error) {
+	type Properties DBProxy
+	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 *DBProxy) UnmarshalJSON(b []byte) error {
+	type Properties DBProxy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DBProxy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/rds/aws-rds-dbproxy_authformat.go b/goformation/cloudformation/rds/aws-rds-dbproxy_authformat.go
new file mode 100644
index 0000000000..9baeda9ebe
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-dbproxy_authformat.go
@@ -0,0 +1,57 @@
+package rds
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBProxy_AuthFormat AWS CloudFormation Resource (AWS::RDS::DBProxy.AuthFormat)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxy-authformat.html
+type DBProxy_AuthFormat struct {
+
+	// AuthScheme AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxy-authformat.html#cfn-rds-dbproxy-authformat-authscheme
+	AuthScheme *types.Value `json:"AuthScheme,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxy-authformat.html#cfn-rds-dbproxy-authformat-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// IAMAuth AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxy-authformat.html#cfn-rds-dbproxy-authformat-iamauth
+	IAMAuth *types.Value `json:"IAMAuth,omitempty"`
+
+	// SecretArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxy-authformat.html#cfn-rds-dbproxy-authformat-secretarn
+	SecretArn *types.Value `json:"SecretArn,omitempty"`
+
+	// UserName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxy-authformat.html#cfn-rds-dbproxy-authformat-username
+	UserName *types.Value `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 *DBProxy_AuthFormat) AWSCloudFormationType() string {
+	return "AWS::RDS::DBProxy.AuthFormat"
+}
diff --git a/goformation/cloudformation/rds/aws-rds-dbproxy_tagformat.go b/goformation/cloudformation/rds/aws-rds-dbproxy_tagformat.go
new file mode 100644
index 0000000000..c50ac4f51a
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-dbproxy_tagformat.go
@@ -0,0 +1,42 @@
+package rds
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBProxy_TagFormat AWS CloudFormation Resource (AWS::RDS::DBProxy.TagFormat)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxy-tagformat.html
+type DBProxy_TagFormat struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxy-tagformat.html#cfn-rds-dbproxy-tagformat-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxy-tagformat.html#cfn-rds-dbproxy-tagformat-value
+	Value *types.Value `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 *DBProxy_TagFormat) AWSCloudFormationType() string {
+	return "AWS::RDS::DBProxy.TagFormat"
+}
diff --git a/goformation/cloudformation/rds/aws-rds-dbproxyendpoint.go b/goformation/cloudformation/rds/aws-rds-dbproxyendpoint.go
new file mode 100644
index 0000000000..8d2704bbe9
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-dbproxyendpoint.go
@@ -0,0 +1,133 @@
+package rds
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBProxyEndpoint AWS CloudFormation Resource (AWS::RDS::DBProxyEndpoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxyendpoint.html
+type DBProxyEndpoint struct {
+
+	// DBProxyEndpointName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxyendpoint.html#cfn-rds-dbproxyendpoint-dbproxyendpointname
+	DBProxyEndpointName *types.Value `json:"DBProxyEndpointName,omitempty"`
+
+	// DBProxyName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxyendpoint.html#cfn-rds-dbproxyendpoint-dbproxyname
+	DBProxyName *types.Value `json:"DBProxyName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxyendpoint.html#cfn-rds-dbproxyendpoint-tags
+	Tags []DBProxyEndpoint_TagFormat `json:"Tags,omitempty"`
+
+	// TargetRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxyendpoint.html#cfn-rds-dbproxyendpoint-targetrole
+	TargetRole *types.Value `json:"TargetRole,omitempty"`
+
+	// VpcSecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxyendpoint.html#cfn-rds-dbproxyendpoint-vpcsecuritygroupids
+	VpcSecurityGroupIds *types.Value `json:"VpcSecurityGroupIds,omitempty"`
+
+	// VpcSubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxyendpoint.html#cfn-rds-dbproxyendpoint-vpcsubnetids
+	VpcSubnetIds *types.Value `json:"VpcSubnetIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DBProxyEndpoint) AWSCloudFormationType() string {
+	return "AWS::RDS::DBProxyEndpoint"
+}
+
+// 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 DBProxyEndpoint) MarshalJSON() ([]byte, error) {
+	type Properties DBProxyEndpoint
+	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 *DBProxyEndpoint) UnmarshalJSON(b []byte) error {
+	type Properties DBProxyEndpoint
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DBProxyEndpoint(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/rds/aws-rds-dbproxyendpoint_tagformat.go b/goformation/cloudformation/rds/aws-rds-dbproxyendpoint_tagformat.go
new file mode 100644
index 0000000000..1acc643d00
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-dbproxyendpoint_tagformat.go
@@ -0,0 +1,42 @@
+package rds
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBProxyEndpoint_TagFormat AWS CloudFormation Resource (AWS::RDS::DBProxyEndpoint.TagFormat)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxyendpoint-tagformat.html
+type DBProxyEndpoint_TagFormat struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxyendpoint-tagformat.html#cfn-rds-dbproxyendpoint-tagformat-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxyendpoint-tagformat.html#cfn-rds-dbproxyendpoint-tagformat-value
+	Value *types.Value `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 *DBProxyEndpoint_TagFormat) AWSCloudFormationType() string {
+	return "AWS::RDS::DBProxyEndpoint.TagFormat"
+}
diff --git a/goformation/cloudformation/rds/aws-rds-dbproxytargetgroup.go b/goformation/cloudformation/rds/aws-rds-dbproxytargetgroup.go
new file mode 100644
index 0000000000..cbf57a50e6
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-dbproxytargetgroup.go
@@ -0,0 +1,128 @@
+package rds
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBProxyTargetGroup AWS CloudFormation Resource (AWS::RDS::DBProxyTargetGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxytargetgroup.html
+type DBProxyTargetGroup struct {
+
+	// ConnectionPoolConfigurationInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxytargetgroup.html#cfn-rds-dbproxytargetgroup-connectionpoolconfigurationinfo
+	ConnectionPoolConfigurationInfo *DBProxyTargetGroup_ConnectionPoolConfigurationInfoFormat `json:"ConnectionPoolConfigurationInfo,omitempty"`
+
+	// DBClusterIdentifiers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxytargetgroup.html#cfn-rds-dbproxytargetgroup-dbclusteridentifiers
+	DBClusterIdentifiers *types.Value `json:"DBClusterIdentifiers,omitempty"`
+
+	// DBInstanceIdentifiers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxytargetgroup.html#cfn-rds-dbproxytargetgroup-dbinstanceidentifiers
+	DBInstanceIdentifiers *types.Value `json:"DBInstanceIdentifiers,omitempty"`
+
+	// DBProxyName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxytargetgroup.html#cfn-rds-dbproxytargetgroup-dbproxyname
+	DBProxyName *types.Value `json:"DBProxyName,omitempty"`
+
+	// TargetGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbproxytargetgroup.html#cfn-rds-dbproxytargetgroup-targetgroupname
+	TargetGroupName *types.Value `json:"TargetGroupName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DBProxyTargetGroup) AWSCloudFormationType() string {
+	return "AWS::RDS::DBProxyTargetGroup"
+}
+
+// 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 DBProxyTargetGroup) MarshalJSON() ([]byte, error) {
+	type Properties DBProxyTargetGroup
+	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 *DBProxyTargetGroup) UnmarshalJSON(b []byte) error {
+	type Properties DBProxyTargetGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DBProxyTargetGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/rds/aws-rds-dbproxytargetgroup_connectionpoolconfigurationinfoformat.go b/goformation/cloudformation/rds/aws-rds-dbproxytargetgroup_connectionpoolconfigurationinfoformat.go
new file mode 100644
index 0000000000..bc3e74e3b3
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-dbproxytargetgroup_connectionpoolconfigurationinfoformat.go
@@ -0,0 +1,57 @@
+package rds
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBProxyTargetGroup_ConnectionPoolConfigurationInfoFormat AWS CloudFormation Resource (AWS::RDS::DBProxyTargetGroup.ConnectionPoolConfigurationInfoFormat)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxytargetgroup-connectionpoolconfigurationinfoformat.html
+type DBProxyTargetGroup_ConnectionPoolConfigurationInfoFormat struct {
+
+	// ConnectionBorrowTimeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxytargetgroup-connectionpoolconfigurationinfoformat.html#cfn-rds-dbproxytargetgroup-connectionpoolconfigurationinfoformat-connectionborrowtimeout
+	ConnectionBorrowTimeout *types.Value `json:"ConnectionBorrowTimeout,omitempty"`
+
+	// InitQuery AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxytargetgroup-connectionpoolconfigurationinfoformat.html#cfn-rds-dbproxytargetgroup-connectionpoolconfigurationinfoformat-initquery
+	InitQuery *types.Value `json:"InitQuery,omitempty"`
+
+	// MaxConnectionsPercent AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxytargetgroup-connectionpoolconfigurationinfoformat.html#cfn-rds-dbproxytargetgroup-connectionpoolconfigurationinfoformat-maxconnectionspercent
+	MaxConnectionsPercent *types.Value `json:"MaxConnectionsPercent,omitempty"`
+
+	// MaxIdleConnectionsPercent AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxytargetgroup-connectionpoolconfigurationinfoformat.html#cfn-rds-dbproxytargetgroup-connectionpoolconfigurationinfoformat-maxidleconnectionspercent
+	MaxIdleConnectionsPercent *types.Value `json:"MaxIdleConnectionsPercent,omitempty"`
+
+	// SessionPinningFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-dbproxytargetgroup-connectionpoolconfigurationinfoformat.html#cfn-rds-dbproxytargetgroup-connectionpoolconfigurationinfoformat-sessionpinningfilters
+	SessionPinningFilters *types.Value `json:"SessionPinningFilters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DBProxyTargetGroup_ConnectionPoolConfigurationInfoFormat) AWSCloudFormationType() string {
+	return "AWS::RDS::DBProxyTargetGroup.ConnectionPoolConfigurationInfoFormat"
+}
diff --git a/goformation/cloudformation/rds/aws-rds-dbsecuritygroup.go b/goformation/cloudformation/rds/aws-rds-dbsecuritygroup.go
new file mode 100644
index 0000000000..9f972811c2
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-dbsecuritygroup.go
@@ -0,0 +1,124 @@
+package rds
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBSecurityGroup AWS CloudFormation Resource (AWS::RDS::DBSecurityGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group.html
+type DBSecurityGroup struct {
+
+	// DBSecurityGroupIngress AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group.html#cfn-rds-dbsecuritygroup-dbsecuritygroupingress
+	DBSecurityGroupIngress []DBSecurityGroup_Ingress `json:"DBSecurityGroupIngress,omitempty"`
+
+	// EC2VpcId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group.html#cfn-rds-dbsecuritygroup-ec2vpcid
+	EC2VpcId *types.Value `json:"EC2VpcId,omitempty"`
+
+	// GroupDescription AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group.html#cfn-rds-dbsecuritygroup-groupdescription
+	GroupDescription *types.Value `json:"GroupDescription,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group.html#cfn-rds-dbsecuritygroup-tags
+	Tags []cloudformation.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 *DBSecurityGroup) AWSCloudFormationType() string {
+	return "AWS::RDS::DBSecurityGroup"
+}
+
+// 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 DBSecurityGroup) MarshalJSON() ([]byte, error) {
+	type Properties DBSecurityGroup
+	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 *DBSecurityGroup) UnmarshalJSON(b []byte) error {
+	type Properties DBSecurityGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DBSecurityGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/rds/aws-rds-dbsecuritygroup_ingress.go b/goformation/cloudformation/rds/aws-rds-dbsecuritygroup_ingress.go
new file mode 100644
index 0000000000..e40dcecd10
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-dbsecuritygroup_ingress.go
@@ -0,0 +1,52 @@
+package rds
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBSecurityGroup_Ingress AWS CloudFormation Resource (AWS::RDS::DBSecurityGroup.Ingress)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group-rule.html
+type DBSecurityGroup_Ingress struct {
+
+	// CIDRIP AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group-rule.html#cfn-rds-securitygroup-cidrip
+	CIDRIP *types.Value `json:"CIDRIP,omitempty"`
+
+	// EC2SecurityGroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group-rule.html#cfn-rds-securitygroup-ec2securitygroupid
+	EC2SecurityGroupId *types.Value `json:"EC2SecurityGroupId,omitempty"`
+
+	// EC2SecurityGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group-rule.html#cfn-rds-securitygroup-ec2securitygroupname
+	EC2SecurityGroupName *types.Value `json:"EC2SecurityGroupName,omitempty"`
+
+	// EC2SecurityGroupOwnerId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-security-group-rule.html#cfn-rds-securitygroup-ec2securitygroupownerid
+	EC2SecurityGroupOwnerId *types.Value `json:"EC2SecurityGroupOwnerId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DBSecurityGroup_Ingress) AWSCloudFormationType() string {
+	return "AWS::RDS::DBSecurityGroup.Ingress"
+}
diff --git a/goformation/cloudformation/rds/aws-rds-dbsecuritygroupingress.go b/goformation/cloudformation/rds/aws-rds-dbsecuritygroupingress.go
new file mode 100644
index 0000000000..af54c30e53
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-dbsecuritygroupingress.go
@@ -0,0 +1,128 @@
+package rds
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBSecurityGroupIngress AWS CloudFormation Resource (AWS::RDS::DBSecurityGroupIngress)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-security-group-ingress.html
+type DBSecurityGroupIngress struct {
+
+	// CIDRIP AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-security-group-ingress.html#cfn-rds-securitygroup-ingress-cidrip
+	CIDRIP *types.Value `json:"CIDRIP,omitempty"`
+
+	// DBSecurityGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-security-group-ingress.html#cfn-rds-securitygroup-ingress-dbsecuritygroupname
+	DBSecurityGroupName *types.Value `json:"DBSecurityGroupName,omitempty"`
+
+	// EC2SecurityGroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-security-group-ingress.html#cfn-rds-securitygroup-ingress-ec2securitygroupid
+	EC2SecurityGroupId *types.Value `json:"EC2SecurityGroupId,omitempty"`
+
+	// EC2SecurityGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-security-group-ingress.html#cfn-rds-securitygroup-ingress-ec2securitygroupname
+	EC2SecurityGroupName *types.Value `json:"EC2SecurityGroupName,omitempty"`
+
+	// EC2SecurityGroupOwnerId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-security-group-ingress.html#cfn-rds-securitygroup-ingress-ec2securitygroupownerid
+	EC2SecurityGroupOwnerId *types.Value `json:"EC2SecurityGroupOwnerId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DBSecurityGroupIngress) AWSCloudFormationType() string {
+	return "AWS::RDS::DBSecurityGroupIngress"
+}
+
+// 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 DBSecurityGroupIngress) MarshalJSON() ([]byte, error) {
+	type Properties DBSecurityGroupIngress
+	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 *DBSecurityGroupIngress) UnmarshalJSON(b []byte) error {
+	type Properties DBSecurityGroupIngress
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DBSecurityGroupIngress(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/rds/aws-rds-dbsubnetgroup.go b/goformation/cloudformation/rds/aws-rds-dbsubnetgroup.go
new file mode 100644
index 0000000000..db3fbd227c
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-dbsubnetgroup.go
@@ -0,0 +1,124 @@
+package rds
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DBSubnetGroup AWS CloudFormation Resource (AWS::RDS::DBSubnetGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbsubnet-group.html
+type DBSubnetGroup struct {
+
+	// DBSubnetGroupDescription AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbsubnet-group.html#cfn-rds-dbsubnetgroup-dbsubnetgroupdescription
+	DBSubnetGroupDescription *types.Value `json:"DBSubnetGroupDescription,omitempty"`
+
+	// DBSubnetGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbsubnet-group.html#cfn-rds-dbsubnetgroup-dbsubnetgroupname
+	DBSubnetGroupName *types.Value `json:"DBSubnetGroupName,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbsubnet-group.html#cfn-rds-dbsubnetgroup-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-dbsubnet-group.html#cfn-rds-dbsubnetgroup-tags
+	Tags []cloudformation.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 *DBSubnetGroup) AWSCloudFormationType() string {
+	return "AWS::RDS::DBSubnetGroup"
+}
+
+// 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 DBSubnetGroup) MarshalJSON() ([]byte, error) {
+	type Properties DBSubnetGroup
+	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 *DBSubnetGroup) UnmarshalJSON(b []byte) error {
+	type Properties DBSubnetGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DBSubnetGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/rds/aws-rds-eventsubscription.go b/goformation/cloudformation/rds/aws-rds-eventsubscription.go
new file mode 100644
index 0000000000..dfa39a2081
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-eventsubscription.go
@@ -0,0 +1,128 @@
+package rds
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventSubscription AWS CloudFormation Resource (AWS::RDS::EventSubscription)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-eventsubscription.html
+type EventSubscription struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-eventsubscription.html#cfn-rds-eventsubscription-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// EventCategories AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-eventsubscription.html#cfn-rds-eventsubscription-eventcategories
+	EventCategories *types.Value `json:"EventCategories,omitempty"`
+
+	// SnsTopicArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-eventsubscription.html#cfn-rds-eventsubscription-snstopicarn
+	SnsTopicArn *types.Value `json:"SnsTopicArn,omitempty"`
+
+	// SourceIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-eventsubscription.html#cfn-rds-eventsubscription-sourceids
+	SourceIds *types.Value `json:"SourceIds,omitempty"`
+
+	// SourceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-eventsubscription.html#cfn-rds-eventsubscription-sourcetype
+	SourceType *types.Value `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::RDS::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/rds/aws-rds-globalcluster.go b/goformation/cloudformation/rds/aws-rds-globalcluster.go
new file mode 100644
index 0000000000..df730bac78
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-globalcluster.go
@@ -0,0 +1,133 @@
+package rds
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GlobalCluster AWS CloudFormation Resource (AWS::RDS::GlobalCluster)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-globalcluster.html
+type GlobalCluster struct {
+
+	// DeletionProtection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-globalcluster.html#cfn-rds-globalcluster-deletionprotection
+	DeletionProtection *types.Value `json:"DeletionProtection,omitempty"`
+
+	// Engine AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-globalcluster.html#cfn-rds-globalcluster-engine
+	Engine *types.Value `json:"Engine,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
+	EngineVersion *types.Value `json:"EngineVersion,omitempty"`
+
+	// GlobalClusterIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-globalcluster.html#cfn-rds-globalcluster-globalclusteridentifier
+	GlobalClusterIdentifier *types.Value `json:"GlobalClusterIdentifier,omitempty"`
+
+	// SourceDBClusterIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-globalcluster.html#cfn-rds-globalcluster-sourcedbclusteridentifier
+	SourceDBClusterIdentifier *types.Value `json:"SourceDBClusterIdentifier,omitempty"`
+
+	// StorageEncrypted AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-globalcluster.html#cfn-rds-globalcluster-storageencrypted
+	StorageEncrypted *types.Value `json:"StorageEncrypted,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *GlobalCluster) AWSCloudFormationType() string {
+	return "AWS::RDS::GlobalCluster"
+}
+
+// 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 GlobalCluster) MarshalJSON() ([]byte, error) {
+	type Properties GlobalCluster
+	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 *GlobalCluster) UnmarshalJSON(b []byte) error {
+	type Properties GlobalCluster
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = GlobalCluster(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/rds/aws-rds-optiongroup.go b/goformation/cloudformation/rds/aws-rds-optiongroup.go
new file mode 100644
index 0000000000..ad3b5fd9a2
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-optiongroup.go
@@ -0,0 +1,129 @@
+package rds
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// OptionGroup AWS CloudFormation Resource (AWS::RDS::OptionGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-optiongroup.html
+type OptionGroup struct {
+
+	// EngineName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-optiongroup.html#cfn-rds-optiongroup-enginename
+	EngineName *types.Value `json:"EngineName,omitempty"`
+
+	// MajorEngineVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-optiongroup.html#cfn-rds-optiongroup-majorengineversion
+	MajorEngineVersion *types.Value `json:"MajorEngineVersion,omitempty"`
+
+	// OptionConfigurations AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-optiongroup.html#cfn-rds-optiongroup-optionconfigurations
+	OptionConfigurations []OptionGroup_OptionConfiguration `json:"OptionConfigurations,omitempty"`
+
+	// OptionGroupDescription AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-optiongroup.html#cfn-rds-optiongroup-optiongroupdescription
+	OptionGroupDescription *types.Value `json:"OptionGroupDescription,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rds-optiongroup.html#cfn-rds-optiongroup-tags
+	Tags []cloudformation.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 *OptionGroup) AWSCloudFormationType() string {
+	return "AWS::RDS::OptionGroup"
+}
+
+// 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 OptionGroup) MarshalJSON() ([]byte, error) {
+	type Properties OptionGroup
+	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 *OptionGroup) UnmarshalJSON(b []byte) error {
+	type Properties OptionGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = OptionGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/rds/aws-rds-optiongroup_optionconfiguration.go b/goformation/cloudformation/rds/aws-rds-optiongroup_optionconfiguration.go
new file mode 100644
index 0000000000..4169569a47
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-optiongroup_optionconfiguration.go
@@ -0,0 +1,62 @@
+package rds
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OptionGroup_OptionConfiguration AWS CloudFormation Resource (AWS::RDS::OptionGroup.OptionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionconfigurations.html
+type OptionGroup_OptionConfiguration struct {
+
+	// DBSecurityGroupMemberships AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionconfigurations.html#cfn-rds-optiongroup-optionconfigurations-dbsecuritygroupmemberships
+	DBSecurityGroupMemberships *types.Value `json:"DBSecurityGroupMemberships,omitempty"`
+
+	// OptionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionconfigurations.html#cfn-rds-optiongroup-optionconfigurations-optionname
+	OptionName *types.Value `json:"OptionName,omitempty"`
+
+	// OptionSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionconfigurations.html#cfn-rds-optiongroup-optionconfigurations-optionsettings
+	OptionSettings []OptionGroup_OptionSetting `json:"OptionSettings,omitempty"`
+
+	// OptionVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionconfigurations.html#cfn-rds-optiongroup-optionconfiguration-optionversion
+	OptionVersion *types.Value `json:"OptionVersion,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionconfigurations.html#cfn-rds-optiongroup-optionconfigurations-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// VpcSecurityGroupMemberships AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionconfigurations.html#cfn-rds-optiongroup-optionconfigurations-vpcsecuritygroupmemberships
+	VpcSecurityGroupMemberships *types.Value `json:"VpcSecurityGroupMemberships,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *OptionGroup_OptionConfiguration) AWSCloudFormationType() string {
+	return "AWS::RDS::OptionGroup.OptionConfiguration"
+}
diff --git a/goformation/cloudformation/rds/aws-rds-optiongroup_optionsetting.go b/goformation/cloudformation/rds/aws-rds-optiongroup_optionsetting.go
new file mode 100644
index 0000000000..e63831d6eb
--- /dev/null
+++ b/goformation/cloudformation/rds/aws-rds-optiongroup_optionsetting.go
@@ -0,0 +1,42 @@
+package rds
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// OptionGroup_OptionSetting AWS CloudFormation Resource (AWS::RDS::OptionGroup.OptionSetting)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionconfigurations-optionsettings.html
+type OptionGroup_OptionSetting struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionconfigurations-optionsettings.html#cfn-rds-optiongroup-optionconfigurations-optionsettings-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rds-optiongroup-optionconfigurations-optionsettings.html#cfn-rds-optiongroup-optionconfigurations-optionsettings-value
+	Value *types.Value `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 *OptionGroup_OptionSetting) AWSCloudFormationType() string {
+	return "AWS::RDS::OptionGroup.OptionSetting"
+}
diff --git a/goformation/cloudformation/redshift/aws-redshift-cluster.go b/goformation/cloudformation/redshift/aws-redshift-cluster.go
new file mode 100644
index 0000000000..6e1e23688f
--- /dev/null
+++ b/goformation/cloudformation/redshift/aws-redshift-cluster.go
@@ -0,0 +1,339 @@
+package redshift
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster AWS CloudFormation Resource (AWS::Redshift::Cluster)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html
+type Cluster struct {
+
+	// AllowVersionUpgrade AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-allowversionupgrade
+	AllowVersionUpgrade *types.Value `json:"AllowVersionUpgrade,omitempty"`
+
+	// AquaConfigurationStatus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-aquaconfigurationstatus
+	AquaConfigurationStatus *types.Value `json:"AquaConfigurationStatus,omitempty"`
+
+	// AutomatedSnapshotRetentionPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-automatedsnapshotretentionperiod
+	AutomatedSnapshotRetentionPeriod *types.Value `json:"AutomatedSnapshotRetentionPeriod,omitempty"`
+
+	// AvailabilityZone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-availabilityzone
+	AvailabilityZone *types.Value `json:"AvailabilityZone,omitempty"`
+
+	// AvailabilityZoneRelocation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-availabilityzonerelocation
+	AvailabilityZoneRelocation *types.Value `json:"AvailabilityZoneRelocation,omitempty"`
+
+	// AvailabilityZoneRelocationStatus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-availabilityzonerelocationstatus
+	AvailabilityZoneRelocationStatus *types.Value `json:"AvailabilityZoneRelocationStatus,omitempty"`
+
+	// Classic AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-classic
+	Classic *types.Value `json:"Classic,omitempty"`
+
+	// ClusterIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-clusteridentifier
+	ClusterIdentifier *types.Value `json:"ClusterIdentifier,omitempty"`
+
+	// ClusterParameterGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-clusterparametergroupname
+	ClusterParameterGroupName *types.Value `json:"ClusterParameterGroupName,omitempty"`
+
+	// ClusterSecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-clustersecuritygroups
+	ClusterSecurityGroups *types.Value `json:"ClusterSecurityGroups,omitempty"`
+
+	// ClusterSubnetGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-clustersubnetgroupname
+	ClusterSubnetGroupName *types.Value `json:"ClusterSubnetGroupName,omitempty"`
+
+	// ClusterType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-clustertype
+	ClusterType *types.Value `json:"ClusterType,omitempty"`
+
+	// ClusterVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-clusterversion
+	ClusterVersion *types.Value `json:"ClusterVersion,omitempty"`
+
+	// DBName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-dbname
+	DBName *types.Value `json:"DBName,omitempty"`
+
+	// DeferMaintenance AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-defermaintenance
+	DeferMaintenance *types.Value `json:"DeferMaintenance,omitempty"`
+
+	// DeferMaintenanceDuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-defermaintenanceduration
+	DeferMaintenanceDuration *types.Value `json:"DeferMaintenanceDuration,omitempty"`
+
+	// DeferMaintenanceEndTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-defermaintenanceendtime
+	DeferMaintenanceEndTime *types.Value `json:"DeferMaintenanceEndTime,omitempty"`
+
+	// DeferMaintenanceStartTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-defermaintenancestarttime
+	DeferMaintenanceStartTime *types.Value `json:"DeferMaintenanceStartTime,omitempty"`
+
+	// DestinationRegion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-destinationregion
+	DestinationRegion *types.Value `json:"DestinationRegion,omitempty"`
+
+	// ElasticIp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-elasticip
+	ElasticIp *types.Value `json:"ElasticIp,omitempty"`
+
+	// Encrypted AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-encrypted
+	Encrypted *types.Value `json:"Encrypted,omitempty"`
+
+	// EnhancedVpcRouting AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-enhancedvpcrouting
+	EnhancedVpcRouting *types.Value `json:"EnhancedVpcRouting,omitempty"`
+
+	// HsmClientCertificateIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-hsmclientcertificateidentifier
+	HsmClientCertificateIdentifier *types.Value `json:"HsmClientCertificateIdentifier,omitempty"`
+
+	// HsmConfigurationIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-hsmconfigurationidentifier
+	HsmConfigurationIdentifier *types.Value `json:"HsmConfigurationIdentifier,omitempty"`
+
+	// IamRoles AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-iamroles
+	IamRoles *types.Value `json:"IamRoles,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// LoggingProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-loggingproperties
+	LoggingProperties *Cluster_LoggingProperties `json:"LoggingProperties,omitempty"`
+
+	// MaintenanceTrackName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-maintenancetrackname
+	MaintenanceTrackName *types.Value `json:"MaintenanceTrackName,omitempty"`
+
+	// ManualSnapshotRetentionPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-manualsnapshotretentionperiod
+	ManualSnapshotRetentionPeriod *types.Value `json:"ManualSnapshotRetentionPeriod,omitempty"`
+
+	// MasterUserPassword AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-masteruserpassword
+	MasterUserPassword *types.Value `json:"MasterUserPassword,omitempty"`
+
+	// MasterUsername AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-masterusername
+	MasterUsername *types.Value `json:"MasterUsername,omitempty"`
+
+	// NodeType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-nodetype
+	NodeType *types.Value `json:"NodeType,omitempty"`
+
+	// NumberOfNodes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-numberofnodes
+	NumberOfNodes *types.Value `json:"NumberOfNodes,omitempty"`
+
+	// OwnerAccount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-owneraccount
+	OwnerAccount *types.Value `json:"OwnerAccount,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// PreferredMaintenanceWindow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-preferredmaintenancewindow
+	PreferredMaintenanceWindow *types.Value `json:"PreferredMaintenanceWindow,omitempty"`
+
+	// PubliclyAccessible AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-publiclyaccessible
+	PubliclyAccessible *types.Value `json:"PubliclyAccessible,omitempty"`
+
+	// ResourceAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-resourceaction
+	ResourceAction *types.Value `json:"ResourceAction,omitempty"`
+
+	// RevisionTarget AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-revisiontarget
+	RevisionTarget *types.Value `json:"RevisionTarget,omitempty"`
+
+	// RotateEncryptionKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-rotateencryptionkey
+	RotateEncryptionKey *types.Value `json:"RotateEncryptionKey,omitempty"`
+
+	// SnapshotClusterIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-snapshotclusteridentifier
+	SnapshotClusterIdentifier *types.Value `json:"SnapshotClusterIdentifier,omitempty"`
+
+	// SnapshotCopyGrantName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-snapshotcopygrantname
+	SnapshotCopyGrantName *types.Value `json:"SnapshotCopyGrantName,omitempty"`
+
+	// SnapshotCopyManual AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-snapshotcopymanual
+	SnapshotCopyManual *types.Value `json:"SnapshotCopyManual,omitempty"`
+
+	// SnapshotCopyRetentionPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-snapshotcopyretentionperiod
+	SnapshotCopyRetentionPeriod *types.Value `json:"SnapshotCopyRetentionPeriod,omitempty"`
+
+	// SnapshotIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-snapshotidentifier
+	SnapshotIdentifier *types.Value `json:"SnapshotIdentifier,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VpcSecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-cluster.html#cfn-redshift-cluster-vpcsecuritygroupids
+	VpcSecurityGroupIds *types.Value `json:"VpcSecurityGroupIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::Redshift::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/redshift/aws-redshift-cluster_endpoint.go b/goformation/cloudformation/redshift/aws-redshift-cluster_endpoint.go
new file mode 100644
index 0000000000..87de808ddc
--- /dev/null
+++ b/goformation/cloudformation/redshift/aws-redshift-cluster_endpoint.go
@@ -0,0 +1,42 @@
+package redshift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_Endpoint AWS CloudFormation Resource (AWS::Redshift::Cluster.Endpoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-cluster-endpoint.html
+type Cluster_Endpoint struct {
+
+	// Address AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-cluster-endpoint.html#cfn-redshift-cluster-endpoint-address
+	Address *types.Value `json:"Address,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-cluster-endpoint.html#cfn-redshift-cluster-endpoint-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Endpoint) AWSCloudFormationType() string {
+	return "AWS::Redshift::Cluster.Endpoint"
+}
diff --git a/goformation/cloudformation/redshift/aws-redshift-cluster_loggingproperties.go b/goformation/cloudformation/redshift/aws-redshift-cluster_loggingproperties.go
new file mode 100644
index 0000000000..3ead0e6280
--- /dev/null
+++ b/goformation/cloudformation/redshift/aws-redshift-cluster_loggingproperties.go
@@ -0,0 +1,42 @@
+package redshift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_LoggingProperties AWS CloudFormation Resource (AWS::Redshift::Cluster.LoggingProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-cluster-loggingproperties.html
+type Cluster_LoggingProperties struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-cluster-loggingproperties.html#cfn-redshift-cluster-loggingproperties-bucketname
+	BucketName *types.Value `json:"BucketName,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
+	S3KeyPrefix *types.Value `json:"S3KeyPrefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LoggingProperties) AWSCloudFormationType() string {
+	return "AWS::Redshift::Cluster.LoggingProperties"
+}
diff --git a/goformation/cloudformation/redshift/aws-redshift-clusterparametergroup.go b/goformation/cloudformation/redshift/aws-redshift-clusterparametergroup.go
new file mode 100644
index 0000000000..74e2a73d65
--- /dev/null
+++ b/goformation/cloudformation/redshift/aws-redshift-clusterparametergroup.go
@@ -0,0 +1,124 @@
+package redshift
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ClusterParameterGroup AWS CloudFormation Resource (AWS::Redshift::ClusterParameterGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clusterparametergroup.html
+type ClusterParameterGroup struct {
+
+	// Description AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clusterparametergroup.html#cfn-redshift-clusterparametergroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// ParameterGroupFamily AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clusterparametergroup.html#cfn-redshift-clusterparametergroup-parametergroupfamily
+	ParameterGroupFamily *types.Value `json:"ParameterGroupFamily,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clusterparametergroup.html#cfn-redshift-clusterparametergroup-parameters
+	Parameters []ClusterParameterGroup_Parameter `json:"Parameters,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clusterparametergroup.html#cfn-redshift-clusterparametergroup-tags
+	Tags []cloudformation.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 *ClusterParameterGroup) AWSCloudFormationType() string {
+	return "AWS::Redshift::ClusterParameterGroup"
+}
+
+// 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 ClusterParameterGroup) MarshalJSON() ([]byte, error) {
+	type Properties ClusterParameterGroup
+	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 *ClusterParameterGroup) UnmarshalJSON(b []byte) error {
+	type Properties ClusterParameterGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ClusterParameterGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/redshift/aws-redshift-clusterparametergroup_parameter.go b/goformation/cloudformation/redshift/aws-redshift-clusterparametergroup_parameter.go
new file mode 100644
index 0000000000..fe782535f8
--- /dev/null
+++ b/goformation/cloudformation/redshift/aws-redshift-clusterparametergroup_parameter.go
@@ -0,0 +1,42 @@
+package redshift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ClusterParameterGroup_Parameter AWS CloudFormation Resource (AWS::Redshift::ClusterParameterGroup.Parameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-property-redshift-clusterparametergroup-parameter.html
+type ClusterParameterGroup_Parameter struct {
+
+	// ParameterName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-property-redshift-clusterparametergroup-parameter.html#cfn-redshift-clusterparametergroup-parameter-parametername
+	ParameterName *types.Value `json:"ParameterName,omitempty"`
+
+	// ParameterValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-property-redshift-clusterparametergroup-parameter.html#cfn-redshift-clusterparametergroup-parameter-parametervalue
+	ParameterValue *types.Value `json:"ParameterValue,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ClusterParameterGroup_Parameter) AWSCloudFormationType() string {
+	return "AWS::Redshift::ClusterParameterGroup.Parameter"
+}
diff --git a/goformation/cloudformation/redshift/aws-redshift-clustersecuritygroup.go b/goformation/cloudformation/redshift/aws-redshift-clustersecuritygroup.go
new file mode 100644
index 0000000000..12067a1cda
--- /dev/null
+++ b/goformation/cloudformation/redshift/aws-redshift-clustersecuritygroup.go
@@ -0,0 +1,114 @@
+package redshift
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ClusterSecurityGroup AWS CloudFormation Resource (AWS::Redshift::ClusterSecurityGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersecuritygroup.html
+type ClusterSecurityGroup struct {
+
+	// Description AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersecuritygroup.html#cfn-redshift-clustersecuritygroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersecuritygroup.html#cfn-redshift-clustersecuritygroup-tags
+	Tags []cloudformation.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 *ClusterSecurityGroup) AWSCloudFormationType() string {
+	return "AWS::Redshift::ClusterSecurityGroup"
+}
+
+// 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 ClusterSecurityGroup) MarshalJSON() ([]byte, error) {
+	type Properties ClusterSecurityGroup
+	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 *ClusterSecurityGroup) UnmarshalJSON(b []byte) error {
+	type Properties ClusterSecurityGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ClusterSecurityGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/redshift/aws-redshift-clustersecuritygroupingress.go b/goformation/cloudformation/redshift/aws-redshift-clustersecuritygroupingress.go
new file mode 100644
index 0000000000..67b2b757d7
--- /dev/null
+++ b/goformation/cloudformation/redshift/aws-redshift-clustersecuritygroupingress.go
@@ -0,0 +1,123 @@
+package redshift
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ClusterSecurityGroupIngress AWS CloudFormation Resource (AWS::Redshift::ClusterSecurityGroupIngress)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersecuritygroupingress.html
+type ClusterSecurityGroupIngress struct {
+
+	// CIDRIP AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersecuritygroupingress.html#cfn-redshift-clustersecuritygroupingress-cidrip
+	CIDRIP *types.Value `json:"CIDRIP,omitempty"`
+
+	// ClusterSecurityGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersecuritygroupingress.html#cfn-redshift-clustersecuritygroupingress-clustersecuritygroupname
+	ClusterSecurityGroupName *types.Value `json:"ClusterSecurityGroupName,omitempty"`
+
+	// EC2SecurityGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersecuritygroupingress.html#cfn-redshift-clustersecuritygroupingress-ec2securitygroupname
+	EC2SecurityGroupName *types.Value `json:"EC2SecurityGroupName,omitempty"`
+
+	// EC2SecurityGroupOwnerId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersecuritygroupingress.html#cfn-redshift-clustersecuritygroupingress-ec2securitygroupownerid
+	EC2SecurityGroupOwnerId *types.Value `json:"EC2SecurityGroupOwnerId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ClusterSecurityGroupIngress) AWSCloudFormationType() string {
+	return "AWS::Redshift::ClusterSecurityGroupIngress"
+}
+
+// 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 ClusterSecurityGroupIngress) MarshalJSON() ([]byte, error) {
+	type Properties ClusterSecurityGroupIngress
+	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 *ClusterSecurityGroupIngress) UnmarshalJSON(b []byte) error {
+	type Properties ClusterSecurityGroupIngress
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ClusterSecurityGroupIngress(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/redshift/aws-redshift-clustersubnetgroup.go b/goformation/cloudformation/redshift/aws-redshift-clustersubnetgroup.go
new file mode 100644
index 0000000000..3be15d6bfe
--- /dev/null
+++ b/goformation/cloudformation/redshift/aws-redshift-clustersubnetgroup.go
@@ -0,0 +1,119 @@
+package redshift
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ClusterSubnetGroup AWS CloudFormation Resource (AWS::Redshift::ClusterSubnetGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersubnetgroup.html
+type ClusterSubnetGroup struct {
+
+	// Description AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersubnetgroup.html#cfn-redshift-clustersubnetgroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersubnetgroup.html#cfn-redshift-clustersubnetgroup-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-clustersubnetgroup.html#cfn-redshift-clustersubnetgroup-tags
+	Tags []cloudformation.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 *ClusterSubnetGroup) AWSCloudFormationType() string {
+	return "AWS::Redshift::ClusterSubnetGroup"
+}
+
+// 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 ClusterSubnetGroup) MarshalJSON() ([]byte, error) {
+	type Properties ClusterSubnetGroup
+	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 *ClusterSubnetGroup) UnmarshalJSON(b []byte) error {
+	type Properties ClusterSubnetGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ClusterSubnetGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/redshift/aws-redshift-endpointaccess.go b/goformation/cloudformation/redshift/aws-redshift-endpointaccess.go
new file mode 100644
index 0000000000..78b3c9699c
--- /dev/null
+++ b/goformation/cloudformation/redshift/aws-redshift-endpointaccess.go
@@ -0,0 +1,128 @@
+package redshift
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EndpointAccess AWS CloudFormation Resource (AWS::Redshift::EndpointAccess)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointaccess.html
+type EndpointAccess struct {
+
+	// ClusterIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointaccess.html#cfn-redshift-endpointaccess-clusteridentifier
+	ClusterIdentifier *types.Value `json:"ClusterIdentifier,omitempty"`
+
+	// EndpointName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointaccess.html#cfn-redshift-endpointaccess-endpointname
+	EndpointName *types.Value `json:"EndpointName,omitempty"`
+
+	// ResourceOwner AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointaccess.html#cfn-redshift-endpointaccess-resourceowner
+	ResourceOwner *types.Value `json:"ResourceOwner,omitempty"`
+
+	// SubnetGroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointaccess.html#cfn-redshift-endpointaccess-subnetgroupname
+	SubnetGroupName *types.Value `json:"SubnetGroupName,omitempty"`
+
+	// VpcSecurityGroupIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointaccess.html#cfn-redshift-endpointaccess-vpcsecuritygroupids
+	VpcSecurityGroupIds *types.Value `json:"VpcSecurityGroupIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EndpointAccess) AWSCloudFormationType() string {
+	return "AWS::Redshift::EndpointAccess"
+}
+
+// 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 EndpointAccess) MarshalJSON() ([]byte, error) {
+	type Properties EndpointAccess
+	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 *EndpointAccess) UnmarshalJSON(b []byte) error {
+	type Properties EndpointAccess
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = EndpointAccess(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/redshift/aws-redshift-endpointaccess_vpcsecuritygroup.go b/goformation/cloudformation/redshift/aws-redshift-endpointaccess_vpcsecuritygroup.go
new file mode 100644
index 0000000000..fc609a18cd
--- /dev/null
+++ b/goformation/cloudformation/redshift/aws-redshift-endpointaccess_vpcsecuritygroup.go
@@ -0,0 +1,42 @@
+package redshift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EndpointAccess_VpcSecurityGroup AWS CloudFormation Resource (AWS::Redshift::EndpointAccess.VpcSecurityGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-endpointaccess-vpcsecuritygroup.html
+type EndpointAccess_VpcSecurityGroup struct {
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-endpointaccess-vpcsecuritygroup.html#cfn-redshift-endpointaccess-vpcsecuritygroup-status
+	Status *types.Value `json:"Status,omitempty"`
+
+	// VpcSecurityGroupId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-endpointaccess-vpcsecuritygroup.html#cfn-redshift-endpointaccess-vpcsecuritygroup-vpcsecuritygroupid
+	VpcSecurityGroupId *types.Value `json:"VpcSecurityGroupId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EndpointAccess_VpcSecurityGroup) AWSCloudFormationType() string {
+	return "AWS::Redshift::EndpointAccess.VpcSecurityGroup"
+}
diff --git a/goformation/cloudformation/redshift/aws-redshift-endpointauthorization.go b/goformation/cloudformation/redshift/aws-redshift-endpointauthorization.go
new file mode 100644
index 0000000000..02a8b44111
--- /dev/null
+++ b/goformation/cloudformation/redshift/aws-redshift-endpointauthorization.go
@@ -0,0 +1,123 @@
+package redshift
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EndpointAuthorization AWS CloudFormation Resource (AWS::Redshift::EndpointAuthorization)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointauthorization.html
+type EndpointAuthorization struct {
+
+	// Account AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointauthorization.html#cfn-redshift-endpointauthorization-account
+	Account *types.Value `json:"Account,omitempty"`
+
+	// ClusterIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointauthorization.html#cfn-redshift-endpointauthorization-clusteridentifier
+	ClusterIdentifier *types.Value `json:"ClusterIdentifier,omitempty"`
+
+	// Force AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointauthorization.html#cfn-redshift-endpointauthorization-force
+	Force *types.Value `json:"Force,omitempty"`
+
+	// VpcIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-endpointauthorization.html#cfn-redshift-endpointauthorization-vpcids
+	VpcIds *types.Value `json:"VpcIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EndpointAuthorization) AWSCloudFormationType() string {
+	return "AWS::Redshift::EndpointAuthorization"
+}
+
+// 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 EndpointAuthorization) MarshalJSON() ([]byte, error) {
+	type Properties EndpointAuthorization
+	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 *EndpointAuthorization) UnmarshalJSON(b []byte) error {
+	type Properties EndpointAuthorization
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = EndpointAuthorization(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/redshift/aws-redshift-eventsubscription.go b/goformation/cloudformation/redshift/aws-redshift-eventsubscription.go
new file mode 100644
index 0000000000..014ad62116
--- /dev/null
+++ b/goformation/cloudformation/redshift/aws-redshift-eventsubscription.go
@@ -0,0 +1,144 @@
+package redshift
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// EventSubscription AWS CloudFormation Resource (AWS::Redshift::EventSubscription)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-eventsubscription.html
+type EventSubscription struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-eventsubscription.html#cfn-redshift-eventsubscription-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// EventCategories AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-eventsubscription.html#cfn-redshift-eventsubscription-eventcategories
+	EventCategories *types.Value `json:"EventCategories,omitempty"`
+
+	// Severity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-eventsubscription.html#cfn-redshift-eventsubscription-severity
+	Severity *types.Value `json:"Severity,omitempty"`
+
+	// SnsTopicArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-eventsubscription.html#cfn-redshift-eventsubscription-snstopicarn
+	SnsTopicArn *types.Value `json:"SnsTopicArn,omitempty"`
+
+	// SourceIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-eventsubscription.html#cfn-redshift-eventsubscription-sourceids
+	SourceIds *types.Value `json:"SourceIds,omitempty"`
+
+	// SourceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-eventsubscription.html#cfn-redshift-eventsubscription-sourcetype
+	SourceType *types.Value `json:"SourceType,omitempty"`
+
+	// SubscriptionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-eventsubscription.html#cfn-redshift-eventsubscription-subscriptionname
+	SubscriptionName *types.Value `json:"SubscriptionName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-eventsubscription.html#cfn-redshift-eventsubscription-tags
+	Tags []cloudformation.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 *EventSubscription) AWSCloudFormationType() string {
+	return "AWS::Redshift::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/redshift/aws-redshift-scheduledaction.go b/goformation/cloudformation/redshift/aws-redshift-scheduledaction.go
new file mode 100644
index 0000000000..13cfab96c6
--- /dev/null
+++ b/goformation/cloudformation/redshift/aws-redshift-scheduledaction.go
@@ -0,0 +1,143 @@
+package redshift
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScheduledAction AWS CloudFormation Resource (AWS::Redshift::ScheduledAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-scheduledaction.html
+type ScheduledAction struct {
+
+	// Enable AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-scheduledaction.html#cfn-redshift-scheduledaction-enable
+	Enable *types.Value `json:"Enable,omitempty"`
+
+	// EndTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-scheduledaction.html#cfn-redshift-scheduledaction-endtime
+	EndTime *types.Value `json:"EndTime,omitempty"`
+
+	// IamRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-scheduledaction.html#cfn-redshift-scheduledaction-iamrole
+	IamRole *types.Value `json:"IamRole,omitempty"`
+
+	// Schedule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-scheduledaction.html#cfn-redshift-scheduledaction-schedule
+	Schedule *types.Value `json:"Schedule,omitempty"`
+
+	// ScheduledActionDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-scheduledaction.html#cfn-redshift-scheduledaction-scheduledactiondescription
+	ScheduledActionDescription *types.Value `json:"ScheduledActionDescription,omitempty"`
+
+	// ScheduledActionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-scheduledaction.html#cfn-redshift-scheduledaction-scheduledactionname
+	ScheduledActionName *types.Value `json:"ScheduledActionName,omitempty"`
+
+	// StartTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-scheduledaction.html#cfn-redshift-scheduledaction-starttime
+	StartTime *types.Value `json:"StartTime,omitempty"`
+
+	// TargetAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-redshift-scheduledaction.html#cfn-redshift-scheduledaction-targetaction
+	TargetAction *ScheduledAction_ScheduledActionType `json:"TargetAction,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScheduledAction) AWSCloudFormationType() string {
+	return "AWS::Redshift::ScheduledAction"
+}
+
+// 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 ScheduledAction) MarshalJSON() ([]byte, error) {
+	type Properties ScheduledAction
+	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 *ScheduledAction) UnmarshalJSON(b []byte) error {
+	type Properties ScheduledAction
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ScheduledAction(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/redshift/aws-redshift-scheduledaction_pauseclustermessage.go b/goformation/cloudformation/redshift/aws-redshift-scheduledaction_pauseclustermessage.go
new file mode 100644
index 0000000000..32df3bbba5
--- /dev/null
+++ b/goformation/cloudformation/redshift/aws-redshift-scheduledaction_pauseclustermessage.go
@@ -0,0 +1,37 @@
+package redshift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScheduledAction_PauseClusterMessage AWS CloudFormation Resource (AWS::Redshift::ScheduledAction.PauseClusterMessage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-scheduledaction-pauseclustermessage.html
+type ScheduledAction_PauseClusterMessage struct {
+
+	// ClusterIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-scheduledaction-pauseclustermessage.html#cfn-redshift-scheduledaction-pauseclustermessage-clusteridentifier
+	ClusterIdentifier *types.Value `json:"ClusterIdentifier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScheduledAction_PauseClusterMessage) AWSCloudFormationType() string {
+	return "AWS::Redshift::ScheduledAction.PauseClusterMessage"
+}
diff --git a/goformation/cloudformation/redshift/aws-redshift-scheduledaction_resizeclustermessage.go b/goformation/cloudformation/redshift/aws-redshift-scheduledaction_resizeclustermessage.go
new file mode 100644
index 0000000000..5d65a7c150
--- /dev/null
+++ b/goformation/cloudformation/redshift/aws-redshift-scheduledaction_resizeclustermessage.go
@@ -0,0 +1,57 @@
+package redshift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScheduledAction_ResizeClusterMessage AWS CloudFormation Resource (AWS::Redshift::ScheduledAction.ResizeClusterMessage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-scheduledaction-resizeclustermessage.html
+type ScheduledAction_ResizeClusterMessage struct {
+
+	// Classic AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-scheduledaction-resizeclustermessage.html#cfn-redshift-scheduledaction-resizeclustermessage-classic
+	Classic *types.Value `json:"Classic,omitempty"`
+
+	// ClusterIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-scheduledaction-resizeclustermessage.html#cfn-redshift-scheduledaction-resizeclustermessage-clusteridentifier
+	ClusterIdentifier *types.Value `json:"ClusterIdentifier,omitempty"`
+
+	// ClusterType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-scheduledaction-resizeclustermessage.html#cfn-redshift-scheduledaction-resizeclustermessage-clustertype
+	ClusterType *types.Value `json:"ClusterType,omitempty"`
+
+	// NodeType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-scheduledaction-resizeclustermessage.html#cfn-redshift-scheduledaction-resizeclustermessage-nodetype
+	NodeType *types.Value `json:"NodeType,omitempty"`
+
+	// NumberOfNodes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-scheduledaction-resizeclustermessage.html#cfn-redshift-scheduledaction-resizeclustermessage-numberofnodes
+	NumberOfNodes *types.Value `json:"NumberOfNodes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScheduledAction_ResizeClusterMessage) AWSCloudFormationType() string {
+	return "AWS::Redshift::ScheduledAction.ResizeClusterMessage"
+}
diff --git a/goformation/cloudformation/redshift/aws-redshift-scheduledaction_resumeclustermessage.go b/goformation/cloudformation/redshift/aws-redshift-scheduledaction_resumeclustermessage.go
new file mode 100644
index 0000000000..312d13c5e3
--- /dev/null
+++ b/goformation/cloudformation/redshift/aws-redshift-scheduledaction_resumeclustermessage.go
@@ -0,0 +1,37 @@
+package redshift
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScheduledAction_ResumeClusterMessage AWS CloudFormation Resource (AWS::Redshift::ScheduledAction.ResumeClusterMessage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-scheduledaction-resumeclustermessage.html
+type ScheduledAction_ResumeClusterMessage struct {
+
+	// ClusterIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-scheduledaction-resumeclustermessage.html#cfn-redshift-scheduledaction-resumeclustermessage-clusteridentifier
+	ClusterIdentifier *types.Value `json:"ClusterIdentifier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScheduledAction_ResumeClusterMessage) AWSCloudFormationType() string {
+	return "AWS::Redshift::ScheduledAction.ResumeClusterMessage"
+}
diff --git a/goformation/cloudformation/redshift/aws-redshift-scheduledaction_scheduledactiontype.go b/goformation/cloudformation/redshift/aws-redshift-scheduledaction_scheduledactiontype.go
new file mode 100644
index 0000000000..d1a73b6043
--- /dev/null
+++ b/goformation/cloudformation/redshift/aws-redshift-scheduledaction_scheduledactiontype.go
@@ -0,0 +1,45 @@
+package redshift
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScheduledAction_ScheduledActionType AWS CloudFormation Resource (AWS::Redshift::ScheduledAction.ScheduledActionType)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-scheduledaction-scheduledactiontype.html
+type ScheduledAction_ScheduledActionType struct {
+
+	// PauseCluster AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-scheduledaction-scheduledactiontype.html#cfn-redshift-scheduledaction-scheduledactiontype-pausecluster
+	PauseCluster *ScheduledAction_PauseClusterMessage `json:"PauseCluster,omitempty"`
+
+	// ResizeCluster AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-scheduledaction-scheduledactiontype.html#cfn-redshift-scheduledaction-scheduledactiontype-resizecluster
+	ResizeCluster *ScheduledAction_ResizeClusterMessage `json:"ResizeCluster,omitempty"`
+
+	// ResumeCluster AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-redshift-scheduledaction-scheduledactiontype.html#cfn-redshift-scheduledaction-scheduledactiontype-resumecluster
+	ResumeCluster *ScheduledAction_ResumeClusterMessage `json:"ResumeCluster,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScheduledAction_ScheduledActionType) AWSCloudFormationType() string {
+	return "AWS::Redshift::ScheduledAction.ScheduledActionType"
+}
diff --git a/goformation/cloudformation/refactorspaces/aws-refactorspaces-application.go b/goformation/cloudformation/refactorspaces/aws-refactorspaces-application.go
new file mode 100644
index 0000000000..e193fd9ed4
--- /dev/null
+++ b/goformation/cloudformation/refactorspaces/aws-refactorspaces-application.go
@@ -0,0 +1,134 @@
+package refactorspaces
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application AWS CloudFormation Resource (AWS::RefactorSpaces::Application)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-application.html
+type Application struct {
+
+	// ApiGatewayProxy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-application.html#cfn-refactorspaces-application-apigatewayproxy
+	ApiGatewayProxy *Application_ApiGatewayProxyInput `json:"ApiGatewayProxy,omitempty"`
+
+	// EnvironmentIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-application.html#cfn-refactorspaces-application-environmentidentifier
+	EnvironmentIdentifier *types.Value `json:"EnvironmentIdentifier,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-application.html#cfn-refactorspaces-application-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ProxyType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-application.html#cfn-refactorspaces-application-proxytype
+	ProxyType *types.Value `json:"ProxyType,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-application.html#cfn-refactorspaces-application-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-application.html#cfn-refactorspaces-application-vpcid
+	VpcId *types.Value `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 *Application) AWSCloudFormationType() string {
+	return "AWS::RefactorSpaces::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/refactorspaces/aws-refactorspaces-application_apigatewayproxyinput.go b/goformation/cloudformation/refactorspaces/aws-refactorspaces-application_apigatewayproxyinput.go
new file mode 100644
index 0000000000..9efb9f3964
--- /dev/null
+++ b/goformation/cloudformation/refactorspaces/aws-refactorspaces-application_apigatewayproxyinput.go
@@ -0,0 +1,42 @@
+package refactorspaces
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_ApiGatewayProxyInput AWS CloudFormation Resource (AWS::RefactorSpaces::Application.ApiGatewayProxyInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-refactorspaces-application-apigatewayproxyinput.html
+type Application_ApiGatewayProxyInput struct {
+
+	// EndpointType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-refactorspaces-application-apigatewayproxyinput.html#cfn-refactorspaces-application-apigatewayproxyinput-endpointtype
+	EndpointType *types.Value `json:"EndpointType,omitempty"`
+
+	// StageName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-refactorspaces-application-apigatewayproxyinput.html#cfn-refactorspaces-application-apigatewayproxyinput-stagename
+	StageName *types.Value `json:"StageName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ApiGatewayProxyInput) AWSCloudFormationType() string {
+	return "AWS::RefactorSpaces::Application.ApiGatewayProxyInput"
+}
diff --git a/goformation/cloudformation/refactorspaces/aws-refactorspaces-environment.go b/goformation/cloudformation/refactorspaces/aws-refactorspaces-environment.go
new file mode 100644
index 0000000000..ead31fc38e
--- /dev/null
+++ b/goformation/cloudformation/refactorspaces/aws-refactorspaces-environment.go
@@ -0,0 +1,124 @@
+package refactorspaces
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Environment AWS CloudFormation Resource (AWS::RefactorSpaces::Environment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-environment.html
+type Environment struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-environment.html#cfn-refactorspaces-environment-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-environment.html#cfn-refactorspaces-environment-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// NetworkFabricType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-environment.html#cfn-refactorspaces-environment-networkfabrictype
+	NetworkFabricType *types.Value `json:"NetworkFabricType,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-environment.html#cfn-refactorspaces-environment-tags
+	Tags []cloudformation.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 *Environment) AWSCloudFormationType() string {
+	return "AWS::RefactorSpaces::Environment"
+}
+
+// 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 Environment) MarshalJSON() ([]byte, error) {
+	type Properties Environment
+	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 *Environment) UnmarshalJSON(b []byte) error {
+	type Properties Environment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Environment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/refactorspaces/aws-refactorspaces-route.go b/goformation/cloudformation/refactorspaces/aws-refactorspaces-route.go
new file mode 100644
index 0000000000..63830ebe26
--- /dev/null
+++ b/goformation/cloudformation/refactorspaces/aws-refactorspaces-route.go
@@ -0,0 +1,134 @@
+package refactorspaces
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route AWS CloudFormation Resource (AWS::RefactorSpaces::Route)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-route.html
+type Route struct {
+
+	// ApplicationIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-route.html#cfn-refactorspaces-route-applicationidentifier
+	ApplicationIdentifier *types.Value `json:"ApplicationIdentifier,omitempty"`
+
+	// EnvironmentIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-route.html#cfn-refactorspaces-route-environmentidentifier
+	EnvironmentIdentifier *types.Value `json:"EnvironmentIdentifier,omitempty"`
+
+	// RouteType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-route.html#cfn-refactorspaces-route-routetype
+	RouteType *types.Value `json:"RouteType,omitempty"`
+
+	// ServiceIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-route.html#cfn-refactorspaces-route-serviceidentifier
+	ServiceIdentifier *types.Value `json:"ServiceIdentifier,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-route.html#cfn-refactorspaces-route-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// UriPathRoute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-route.html#cfn-refactorspaces-route-uripathroute
+	UriPathRoute *Route_UriPathRouteInput `json:"UriPathRoute,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route) AWSCloudFormationType() string {
+	return "AWS::RefactorSpaces::Route"
+}
+
+// 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 Route) MarshalJSON() ([]byte, error) {
+	type Properties Route
+	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 *Route) UnmarshalJSON(b []byte) error {
+	type Properties Route
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Route(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/refactorspaces/aws-refactorspaces-route_uripathrouteinput.go b/goformation/cloudformation/refactorspaces/aws-refactorspaces-route_uripathrouteinput.go
new file mode 100644
index 0000000000..5b9ecdfff7
--- /dev/null
+++ b/goformation/cloudformation/refactorspaces/aws-refactorspaces-route_uripathrouteinput.go
@@ -0,0 +1,52 @@
+package refactorspaces
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Route_UriPathRouteInput AWS CloudFormation Resource (AWS::RefactorSpaces::Route.UriPathRouteInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-refactorspaces-route-uripathrouteinput.html
+type Route_UriPathRouteInput struct {
+
+	// ActivationState AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-refactorspaces-route-uripathrouteinput.html#cfn-refactorspaces-route-uripathrouteinput-activationstate
+	ActivationState *types.Value `json:"ActivationState,omitempty"`
+
+	// IncludeChildPaths AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-refactorspaces-route-uripathrouteinput.html#cfn-refactorspaces-route-uripathrouteinput-includechildpaths
+	IncludeChildPaths *types.Value `json:"IncludeChildPaths,omitempty"`
+
+	// Methods AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-refactorspaces-route-uripathrouteinput.html#cfn-refactorspaces-route-uripathrouteinput-methods
+	Methods *types.Value `json:"Methods,omitempty"`
+
+	// SourcePath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-refactorspaces-route-uripathrouteinput.html#cfn-refactorspaces-route-uripathrouteinput-sourcepath
+	SourcePath *types.Value `json:"SourcePath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Route_UriPathRouteInput) AWSCloudFormationType() string {
+	return "AWS::RefactorSpaces::Route.UriPathRouteInput"
+}
diff --git a/goformation/cloudformation/refactorspaces/aws-refactorspaces-service.go b/goformation/cloudformation/refactorspaces/aws-refactorspaces-service.go
new file mode 100644
index 0000000000..0a437cb9fa
--- /dev/null
+++ b/goformation/cloudformation/refactorspaces/aws-refactorspaces-service.go
@@ -0,0 +1,149 @@
+package refactorspaces
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service AWS CloudFormation Resource (AWS::RefactorSpaces::Service)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-service.html
+type Service struct {
+
+	// ApplicationIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-service.html#cfn-refactorspaces-service-applicationidentifier
+	ApplicationIdentifier *types.Value `json:"ApplicationIdentifier,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-service.html#cfn-refactorspaces-service-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EndpointType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-service.html#cfn-refactorspaces-service-endpointtype
+	EndpointType *types.Value `json:"EndpointType,omitempty"`
+
+	// EnvironmentIdentifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-service.html#cfn-refactorspaces-service-environmentidentifier
+	EnvironmentIdentifier *types.Value `json:"EnvironmentIdentifier,omitempty"`
+
+	// LambdaEndpoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-service.html#cfn-refactorspaces-service-lambdaendpoint
+	LambdaEndpoint *Service_LambdaEndpointInput `json:"LambdaEndpoint,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-service.html#cfn-refactorspaces-service-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-service.html#cfn-refactorspaces-service-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// UrlEndpoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-service.html#cfn-refactorspaces-service-urlendpoint
+	UrlEndpoint *Service_UrlEndpointInput `json:"UrlEndpoint,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-refactorspaces-service.html#cfn-refactorspaces-service-vpcid
+	VpcId *types.Value `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 *Service) AWSCloudFormationType() string {
+	return "AWS::RefactorSpaces::Service"
+}
+
+// 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 Service) MarshalJSON() ([]byte, error) {
+	type Properties Service
+	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 *Service) UnmarshalJSON(b []byte) error {
+	type Properties Service
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Service(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/refactorspaces/aws-refactorspaces-service_lambdaendpointinput.go b/goformation/cloudformation/refactorspaces/aws-refactorspaces-service_lambdaendpointinput.go
new file mode 100644
index 0000000000..bf5f31e75a
--- /dev/null
+++ b/goformation/cloudformation/refactorspaces/aws-refactorspaces-service_lambdaendpointinput.go
@@ -0,0 +1,37 @@
+package refactorspaces
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_LambdaEndpointInput AWS CloudFormation Resource (AWS::RefactorSpaces::Service.LambdaEndpointInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-refactorspaces-service-lambdaendpointinput.html
+type Service_LambdaEndpointInput struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-refactorspaces-service-lambdaendpointinput.html#cfn-refactorspaces-service-lambdaendpointinput-arn
+	Arn *types.Value `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 *Service_LambdaEndpointInput) AWSCloudFormationType() string {
+	return "AWS::RefactorSpaces::Service.LambdaEndpointInput"
+}
diff --git a/goformation/cloudformation/refactorspaces/aws-refactorspaces-service_urlendpointinput.go b/goformation/cloudformation/refactorspaces/aws-refactorspaces-service_urlendpointinput.go
new file mode 100644
index 0000000000..4d91ff0d4a
--- /dev/null
+++ b/goformation/cloudformation/refactorspaces/aws-refactorspaces-service_urlendpointinput.go
@@ -0,0 +1,42 @@
+package refactorspaces
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_UrlEndpointInput AWS CloudFormation Resource (AWS::RefactorSpaces::Service.UrlEndpointInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-refactorspaces-service-urlendpointinput.html
+type Service_UrlEndpointInput struct {
+
+	// HealthUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-refactorspaces-service-urlendpointinput.html#cfn-refactorspaces-service-urlendpointinput-healthurl
+	HealthUrl *types.Value `json:"HealthUrl,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-refactorspaces-service-urlendpointinput.html#cfn-refactorspaces-service-urlendpointinput-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service_UrlEndpointInput) AWSCloudFormationType() string {
+	return "AWS::RefactorSpaces::Service.UrlEndpointInput"
+}
diff --git a/goformation/cloudformation/rekognition/aws-rekognition-project.go b/goformation/cloudformation/rekognition/aws-rekognition-project.go
new file mode 100644
index 0000000000..436f2770f8
--- /dev/null
+++ b/goformation/cloudformation/rekognition/aws-rekognition-project.go
@@ -0,0 +1,108 @@
+package rekognition
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project AWS CloudFormation Resource (AWS::Rekognition::Project)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rekognition-project.html
+type Project struct {
+
+	// ProjectName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rekognition-project.html#cfn-rekognition-project-projectname
+	ProjectName *types.Value `json:"ProjectName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::Rekognition::Project"
+}
+
+// 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 Project) MarshalJSON() ([]byte, error) {
+	type Properties Project
+	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 *Project) UnmarshalJSON(b []byte) error {
+	type Properties Project
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Project(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/resiliencehub/aws-resiliencehub-app.go b/goformation/cloudformation/resiliencehub/aws-resiliencehub-app.go
new file mode 100644
index 0000000000..da992f3c6b
--- /dev/null
+++ b/goformation/cloudformation/resiliencehub/aws-resiliencehub-app.go
@@ -0,0 +1,133 @@
+package resiliencehub
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// App AWS CloudFormation Resource (AWS::ResilienceHub::App)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resiliencehub-app.html
+type App struct {
+
+	// AppTemplateBody AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resiliencehub-app.html#cfn-resiliencehub-app-apptemplatebody
+	AppTemplateBody *types.Value `json:"AppTemplateBody,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resiliencehub-app.html#cfn-resiliencehub-app-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resiliencehub-app.html#cfn-resiliencehub-app-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ResiliencyPolicyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resiliencehub-app.html#cfn-resiliencehub-app-resiliencypolicyarn
+	ResiliencyPolicyArn *types.Value `json:"ResiliencyPolicyArn,omitempty"`
+
+	// ResourceMappings AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resiliencehub-app.html#cfn-resiliencehub-app-resourcemappings
+	ResourceMappings []App_ResourceMapping `json:"ResourceMappings,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resiliencehub-app.html#cfn-resiliencehub-app-tags
+	Tags map[string]*types.Value `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 *App) AWSCloudFormationType() string {
+	return "AWS::ResilienceHub::App"
+}
+
+// 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 App) MarshalJSON() ([]byte, error) {
+	type Properties App
+	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 *App) UnmarshalJSON(b []byte) error {
+	type Properties App
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = App(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/resiliencehub/aws-resiliencehub-app_physicalresourceid.go b/goformation/cloudformation/resiliencehub/aws-resiliencehub-app_physicalresourceid.go
new file mode 100644
index 0000000000..93c661c414
--- /dev/null
+++ b/goformation/cloudformation/resiliencehub/aws-resiliencehub-app_physicalresourceid.go
@@ -0,0 +1,52 @@
+package resiliencehub
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// App_PhysicalResourceId AWS CloudFormation Resource (AWS::ResilienceHub::App.PhysicalResourceId)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resiliencehub-app-physicalresourceid.html
+type App_PhysicalResourceId struct {
+
+	// AwsAccountId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resiliencehub-app-physicalresourceid.html#cfn-resiliencehub-app-physicalresourceid-awsaccountid
+	AwsAccountId *types.Value `json:"AwsAccountId,omitempty"`
+
+	// AwsRegion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resiliencehub-app-physicalresourceid.html#cfn-resiliencehub-app-physicalresourceid-awsregion
+	AwsRegion *types.Value `json:"AwsRegion,omitempty"`
+
+	// Identifier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resiliencehub-app-physicalresourceid.html#cfn-resiliencehub-app-physicalresourceid-identifier
+	Identifier *types.Value `json:"Identifier,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resiliencehub-app-physicalresourceid.html#cfn-resiliencehub-app-physicalresourceid-type
+	Type *types.Value `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_PhysicalResourceId) AWSCloudFormationType() string {
+	return "AWS::ResilienceHub::App.PhysicalResourceId"
+}
diff --git a/goformation/cloudformation/resiliencehub/aws-resiliencehub-app_resourcemapping.go b/goformation/cloudformation/resiliencehub/aws-resiliencehub-app_resourcemapping.go
new file mode 100644
index 0000000000..2ce7d0686c
--- /dev/null
+++ b/goformation/cloudformation/resiliencehub/aws-resiliencehub-app_resourcemapping.go
@@ -0,0 +1,52 @@
+package resiliencehub
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// App_ResourceMapping AWS CloudFormation Resource (AWS::ResilienceHub::App.ResourceMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resiliencehub-app-resourcemapping.html
+type App_ResourceMapping struct {
+
+	// LogicalStackName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resiliencehub-app-resourcemapping.html#cfn-resiliencehub-app-resourcemapping-logicalstackname
+	LogicalStackName *types.Value `json:"LogicalStackName,omitempty"`
+
+	// MappingType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resiliencehub-app-resourcemapping.html#cfn-resiliencehub-app-resourcemapping-mappingtype
+	MappingType *types.Value `json:"MappingType,omitempty"`
+
+	// PhysicalResourceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resiliencehub-app-resourcemapping.html#cfn-resiliencehub-app-resourcemapping-physicalresourceid
+	PhysicalResourceId *App_PhysicalResourceId `json:"PhysicalResourceId,omitempty"`
+
+	// ResourceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resiliencehub-app-resourcemapping.html#cfn-resiliencehub-app-resourcemapping-resourcename
+	ResourceName *types.Value `json:"ResourceName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ResourceMapping) AWSCloudFormationType() string {
+	return "AWS::ResilienceHub::App.ResourceMapping"
+}
diff --git a/goformation/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy.go b/goformation/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy.go
new file mode 100644
index 0000000000..4be07c873a
--- /dev/null
+++ b/goformation/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy.go
@@ -0,0 +1,133 @@
+package resiliencehub
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResiliencyPolicy AWS CloudFormation Resource (AWS::ResilienceHub::ResiliencyPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resiliencehub-resiliencypolicy.html
+type ResiliencyPolicy struct {
+
+	// DataLocationConstraint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resiliencehub-resiliencypolicy.html#cfn-resiliencehub-resiliencypolicy-datalocationconstraint
+	DataLocationConstraint *types.Value `json:"DataLocationConstraint,omitempty"`
+
+	// Policy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resiliencehub-resiliencypolicy.html#cfn-resiliencehub-resiliencypolicy-policy
+	Policy map[string]ResiliencyPolicy_FailurePolicy `json:"Policy,omitempty"`
+
+	// PolicyDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resiliencehub-resiliencypolicy.html#cfn-resiliencehub-resiliencypolicy-policydescription
+	PolicyDescription *types.Value `json:"PolicyDescription,omitempty"`
+
+	// PolicyName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resiliencehub-resiliencypolicy.html#cfn-resiliencehub-resiliencypolicy-policyname
+	PolicyName *types.Value `json:"PolicyName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resiliencehub-resiliencypolicy.html#cfn-resiliencehub-resiliencypolicy-tags
+	Tags map[string]*types.Value `json:"Tags,omitempty"`
+
+	// Tier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resiliencehub-resiliencypolicy.html#cfn-resiliencehub-resiliencypolicy-tier
+	Tier *types.Value `json:"Tier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResiliencyPolicy) AWSCloudFormationType() string {
+	return "AWS::ResilienceHub::ResiliencyPolicy"
+}
+
+// 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 ResiliencyPolicy) MarshalJSON() ([]byte, error) {
+	type Properties ResiliencyPolicy
+	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 *ResiliencyPolicy) UnmarshalJSON(b []byte) error {
+	type Properties ResiliencyPolicy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResiliencyPolicy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy_failurepolicy.go b/goformation/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy_failurepolicy.go
new file mode 100644
index 0000000000..0b3df16d7d
--- /dev/null
+++ b/goformation/cloudformation/resiliencehub/aws-resiliencehub-resiliencypolicy_failurepolicy.go
@@ -0,0 +1,42 @@
+package resiliencehub
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResiliencyPolicy_FailurePolicy AWS CloudFormation Resource (AWS::ResilienceHub::ResiliencyPolicy.FailurePolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resiliencehub-resiliencypolicy-failurepolicy.html
+type ResiliencyPolicy_FailurePolicy struct {
+
+	// RpoInSecs AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resiliencehub-resiliencypolicy-failurepolicy.html#cfn-resiliencehub-resiliencypolicy-failurepolicy-rpoinsecs
+	RpoInSecs *types.Value `json:"RpoInSecs"`
+
+	// RtoInSecs AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resiliencehub-resiliencypolicy-failurepolicy.html#cfn-resiliencehub-resiliencypolicy-failurepolicy-rtoinsecs
+	RtoInSecs *types.Value `json:"RtoInSecs"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResiliencyPolicy_FailurePolicy) AWSCloudFormationType() string {
+	return "AWS::ResilienceHub::ResiliencyPolicy.FailurePolicy"
+}
diff --git a/goformation/cloudformation/resourcegroups/aws-resourcegroups-group.go b/goformation/cloudformation/resourcegroups/aws-resourcegroups-group.go
new file mode 100644
index 0000000000..ee0ca9b140
--- /dev/null
+++ b/goformation/cloudformation/resourcegroups/aws-resourcegroups-group.go
@@ -0,0 +1,134 @@
+package resourcegroups
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Group AWS CloudFormation Resource (AWS::ResourceGroups::Group)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resourcegroups-group.html
+type Group struct {
+
+	// Configuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resourcegroups-group.html#cfn-resourcegroups-group-configuration
+	Configuration []Group_ConfigurationItem `json:"Configuration,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resourcegroups-group.html#cfn-resourcegroups-group-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resourcegroups-group.html#cfn-resourcegroups-group-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ResourceQuery AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resourcegroups-group.html#cfn-resourcegroups-group-resourcequery
+	ResourceQuery *Group_ResourceQuery `json:"ResourceQuery,omitempty"`
+
+	// Resources AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resourcegroups-group.html#cfn-resourcegroups-group-resources
+	Resources *types.Value `json:"Resources,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-resourcegroups-group.html#cfn-resourcegroups-group-tags
+	Tags []cloudformation.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 *Group) AWSCloudFormationType() string {
+	return "AWS::ResourceGroups::Group"
+}
+
+// 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 Group) MarshalJSON() ([]byte, error) {
+	type Properties Group
+	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 *Group) UnmarshalJSON(b []byte) error {
+	type Properties Group
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Group(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_configurationitem.go b/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_configurationitem.go
new file mode 100644
index 0000000000..d47837f37c
--- /dev/null
+++ b/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_configurationitem.go
@@ -0,0 +1,42 @@
+package resourcegroups
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Group_ConfigurationItem AWS CloudFormation Resource (AWS::ResourceGroups::Group.ConfigurationItem)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resourcegroups-group-configurationitem.html
+type Group_ConfigurationItem struct {
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resourcegroups-group-configurationitem.html#cfn-resourcegroups-group-configurationitem-parameters
+	Parameters []Group_ConfigurationParameter `json:"Parameters,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resourcegroups-group-configurationitem.html#cfn-resourcegroups-group-configurationitem-type
+	Type *types.Value `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 *Group_ConfigurationItem) AWSCloudFormationType() string {
+	return "AWS::ResourceGroups::Group.ConfigurationItem"
+}
diff --git a/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_configurationparameter.go b/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_configurationparameter.go
new file mode 100644
index 0000000000..ac0aa1ce7d
--- /dev/null
+++ b/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_configurationparameter.go
@@ -0,0 +1,42 @@
+package resourcegroups
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Group_ConfigurationParameter AWS CloudFormation Resource (AWS::ResourceGroups::Group.ConfigurationParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resourcegroups-group-configurationparameter.html
+type Group_ConfigurationParameter struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resourcegroups-group-configurationparameter.html#cfn-resourcegroups-group-configurationparameter-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resourcegroups-group-configurationparameter.html#cfn-resourcegroups-group-configurationparameter-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Group_ConfigurationParameter) AWSCloudFormationType() string {
+	return "AWS::ResourceGroups::Group.ConfigurationParameter"
+}
diff --git a/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_query.go b/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_query.go
new file mode 100644
index 0000000000..09010e1335
--- /dev/null
+++ b/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_query.go
@@ -0,0 +1,47 @@
+package resourcegroups
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Group_Query AWS CloudFormation Resource (AWS::ResourceGroups::Group.Query)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resourcegroups-group-query.html
+type Group_Query struct {
+
+	// ResourceTypeFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resourcegroups-group-query.html#cfn-resourcegroups-group-query-resourcetypefilters
+	ResourceTypeFilters *types.Value `json:"ResourceTypeFilters,omitempty"`
+
+	// StackIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resourcegroups-group-query.html#cfn-resourcegroups-group-query-stackidentifier
+	StackIdentifier *types.Value `json:"StackIdentifier,omitempty"`
+
+	// TagFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resourcegroups-group-query.html#cfn-resourcegroups-group-query-tagfilters
+	TagFilters []Group_TagFilter `json:"TagFilters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Group_Query) AWSCloudFormationType() string {
+	return "AWS::ResourceGroups::Group.Query"
+}
diff --git a/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_resourcequery.go b/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_resourcequery.go
new file mode 100644
index 0000000000..bfa525fefb
--- /dev/null
+++ b/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_resourcequery.go
@@ -0,0 +1,42 @@
+package resourcegroups
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Group_ResourceQuery AWS CloudFormation Resource (AWS::ResourceGroups::Group.ResourceQuery)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resourcegroups-group-resourcequery.html
+type Group_ResourceQuery struct {
+
+	// Query AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resourcegroups-group-resourcequery.html#cfn-resourcegroups-group-resourcequery-query
+	Query *Group_Query `json:"Query,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resourcegroups-group-resourcequery.html#cfn-resourcegroups-group-resourcequery-type
+	Type *types.Value `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 *Group_ResourceQuery) AWSCloudFormationType() string {
+	return "AWS::ResourceGroups::Group.ResourceQuery"
+}
diff --git a/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_tagfilter.go b/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_tagfilter.go
new file mode 100644
index 0000000000..eeb721c503
--- /dev/null
+++ b/goformation/cloudformation/resourcegroups/aws-resourcegroups-group_tagfilter.go
@@ -0,0 +1,42 @@
+package resourcegroups
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Group_TagFilter AWS CloudFormation Resource (AWS::ResourceGroups::Group.TagFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resourcegroups-group-tagfilter.html
+type Group_TagFilter struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resourcegroups-group-tagfilter.html#cfn-resourcegroups-group-tagfilter-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-resourcegroups-group-tagfilter.html#cfn-resourcegroups-group-tagfilter-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Group_TagFilter) AWSCloudFormationType() string {
+	return "AWS::ResourceGroups::Group.TagFilter"
+}
diff --git a/goformation/cloudformation/robomaker/aws-robomaker-fleet.go b/goformation/cloudformation/robomaker/aws-robomaker-fleet.go
new file mode 100644
index 0000000000..85f3e2153b
--- /dev/null
+++ b/goformation/cloudformation/robomaker/aws-robomaker-fleet.go
@@ -0,0 +1,113 @@
+package robomaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Fleet AWS CloudFormation Resource (AWS::RoboMaker::Fleet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-fleet.html
+type Fleet struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-fleet.html#cfn-robomaker-fleet-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-fleet.html#cfn-robomaker-fleet-tags
+	Tags map[string]*types.Value `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 *Fleet) AWSCloudFormationType() string {
+	return "AWS::RoboMaker::Fleet"
+}
+
+// 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 Fleet) MarshalJSON() ([]byte, error) {
+	type Properties Fleet
+	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 *Fleet) UnmarshalJSON(b []byte) error {
+	type Properties Fleet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Fleet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/robomaker/aws-robomaker-robot.go b/goformation/cloudformation/robomaker/aws-robomaker-robot.go
new file mode 100644
index 0000000000..514f223268
--- /dev/null
+++ b/goformation/cloudformation/robomaker/aws-robomaker-robot.go
@@ -0,0 +1,128 @@
+package robomaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Robot AWS CloudFormation Resource (AWS::RoboMaker::Robot)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-robot.html
+type Robot struct {
+
+	// Architecture AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-robot.html#cfn-robomaker-robot-architecture
+	Architecture *types.Value `json:"Architecture,omitempty"`
+
+	// Fleet AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-robot.html#cfn-robomaker-robot-fleet
+	Fleet *types.Value `json:"Fleet,omitempty"`
+
+	// GreengrassGroupId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-robot.html#cfn-robomaker-robot-greengrassgroupid
+	GreengrassGroupId *types.Value `json:"GreengrassGroupId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-robot.html#cfn-robomaker-robot-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-robot.html#cfn-robomaker-robot-tags
+	Tags map[string]*types.Value `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 *Robot) AWSCloudFormationType() string {
+	return "AWS::RoboMaker::Robot"
+}
+
+// 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 Robot) MarshalJSON() ([]byte, error) {
+	type Properties Robot
+	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 *Robot) UnmarshalJSON(b []byte) error {
+	type Properties Robot
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Robot(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/robomaker/aws-robomaker-robotapplication.go b/goformation/cloudformation/robomaker/aws-robomaker-robotapplication.go
new file mode 100644
index 0000000000..b01b53af2e
--- /dev/null
+++ b/goformation/cloudformation/robomaker/aws-robomaker-robotapplication.go
@@ -0,0 +1,128 @@
+package robomaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RobotApplication AWS CloudFormation Resource (AWS::RoboMaker::RobotApplication)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-robotapplication.html
+type RobotApplication struct {
+
+	// CurrentRevisionId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-robotapplication.html#cfn-robomaker-robotapplication-currentrevisionid
+	CurrentRevisionId *types.Value `json:"CurrentRevisionId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-robotapplication.html#cfn-robomaker-robotapplication-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RobotSoftwareSuite AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-robotapplication.html#cfn-robomaker-robotapplication-robotsoftwaresuite
+	RobotSoftwareSuite *RobotApplication_RobotSoftwareSuite `json:"RobotSoftwareSuite,omitempty"`
+
+	// Sources AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-robotapplication.html#cfn-robomaker-robotapplication-sources
+	Sources []RobotApplication_SourceConfig `json:"Sources,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-robotapplication.html#cfn-robomaker-robotapplication-tags
+	Tags interface{} `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 *RobotApplication) AWSCloudFormationType() string {
+	return "AWS::RoboMaker::RobotApplication"
+}
+
+// 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 RobotApplication) MarshalJSON() ([]byte, error) {
+	type Properties RobotApplication
+	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 *RobotApplication) UnmarshalJSON(b []byte) error {
+	type Properties RobotApplication
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RobotApplication(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/robomaker/aws-robomaker-robotapplication_robotsoftwaresuite.go b/goformation/cloudformation/robomaker/aws-robomaker-robotapplication_robotsoftwaresuite.go
new file mode 100644
index 0000000000..90bfd89c48
--- /dev/null
+++ b/goformation/cloudformation/robomaker/aws-robomaker-robotapplication_robotsoftwaresuite.go
@@ -0,0 +1,42 @@
+package robomaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RobotApplication_RobotSoftwareSuite AWS CloudFormation Resource (AWS::RoboMaker::RobotApplication.RobotSoftwareSuite)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-robotapplication-robotsoftwaresuite.html
+type RobotApplication_RobotSoftwareSuite struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-robotapplication-robotsoftwaresuite.html#cfn-robomaker-robotapplication-robotsoftwaresuite-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-robotapplication-robotsoftwaresuite.html#cfn-robomaker-robotapplication-robotsoftwaresuite-version
+	Version *types.Value `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 *RobotApplication_RobotSoftwareSuite) AWSCloudFormationType() string {
+	return "AWS::RoboMaker::RobotApplication.RobotSoftwareSuite"
+}
diff --git a/goformation/cloudformation/robomaker/aws-robomaker-robotapplication_sourceconfig.go b/goformation/cloudformation/robomaker/aws-robomaker-robotapplication_sourceconfig.go
new file mode 100644
index 0000000000..f366ed2144
--- /dev/null
+++ b/goformation/cloudformation/robomaker/aws-robomaker-robotapplication_sourceconfig.go
@@ -0,0 +1,47 @@
+package robomaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RobotApplication_SourceConfig AWS CloudFormation Resource (AWS::RoboMaker::RobotApplication.SourceConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-robotapplication-sourceconfig.html
+type RobotApplication_SourceConfig struct {
+
+	// Architecture AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-robotapplication-sourceconfig.html#cfn-robomaker-robotapplication-sourceconfig-architecture
+	Architecture *types.Value `json:"Architecture,omitempty"`
+
+	// S3Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-robotapplication-sourceconfig.html#cfn-robomaker-robotapplication-sourceconfig-s3bucket
+	S3Bucket *types.Value `json:"S3Bucket,omitempty"`
+
+	// S3Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-robotapplication-sourceconfig.html#cfn-robomaker-robotapplication-sourceconfig-s3key
+	S3Key *types.Value `json:"S3Key,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RobotApplication_SourceConfig) AWSCloudFormationType() string {
+	return "AWS::RoboMaker::RobotApplication.SourceConfig"
+}
diff --git a/goformation/cloudformation/robomaker/aws-robomaker-robotapplicationversion.go b/goformation/cloudformation/robomaker/aws-robomaker-robotapplicationversion.go
new file mode 100644
index 0000000000..3a8a97695f
--- /dev/null
+++ b/goformation/cloudformation/robomaker/aws-robomaker-robotapplicationversion.go
@@ -0,0 +1,113 @@
+package robomaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RobotApplicationVersion AWS CloudFormation Resource (AWS::RoboMaker::RobotApplicationVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-robotapplicationversion.html
+type RobotApplicationVersion struct {
+
+	// Application AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-robotapplicationversion.html#cfn-robomaker-robotapplicationversion-application
+	Application *types.Value `json:"Application,omitempty"`
+
+	// CurrentRevisionId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-robotapplicationversion.html#cfn-robomaker-robotapplicationversion-currentrevisionid
+	CurrentRevisionId *types.Value `json:"CurrentRevisionId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RobotApplicationVersion) AWSCloudFormationType() string {
+	return "AWS::RoboMaker::RobotApplicationVersion"
+}
+
+// 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 RobotApplicationVersion) MarshalJSON() ([]byte, error) {
+	type Properties RobotApplicationVersion
+	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 *RobotApplicationVersion) UnmarshalJSON(b []byte) error {
+	type Properties RobotApplicationVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RobotApplicationVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication.go b/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication.go
new file mode 100644
index 0000000000..35d9117627
--- /dev/null
+++ b/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication.go
@@ -0,0 +1,143 @@
+package robomaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SimulationApplication AWS CloudFormation Resource (AWS::RoboMaker::SimulationApplication)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-simulationapplication.html
+type SimulationApplication struct {
+
+	// CurrentRevisionId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-simulationapplication.html#cfn-robomaker-simulationapplication-currentrevisionid
+	CurrentRevisionId *types.Value `json:"CurrentRevisionId,omitempty"`
+
+	// Environment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-simulationapplication.html#cfn-robomaker-simulationapplication-environment
+	Environment *types.Value `json:"Environment,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-simulationapplication.html#cfn-robomaker-simulationapplication-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RenderingEngine AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-simulationapplication.html#cfn-robomaker-simulationapplication-renderingengine
+	RenderingEngine *SimulationApplication_RenderingEngine `json:"RenderingEngine,omitempty"`
+
+	// RobotSoftwareSuite AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-simulationapplication.html#cfn-robomaker-simulationapplication-robotsoftwaresuite
+	RobotSoftwareSuite *SimulationApplication_RobotSoftwareSuite `json:"RobotSoftwareSuite,omitempty"`
+
+	// SimulationSoftwareSuite AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-simulationapplication.html#cfn-robomaker-simulationapplication-simulationsoftwaresuite
+	SimulationSoftwareSuite *SimulationApplication_SimulationSoftwareSuite `json:"SimulationSoftwareSuite,omitempty"`
+
+	// Sources AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-simulationapplication.html#cfn-robomaker-simulationapplication-sources
+	Sources []SimulationApplication_SourceConfig `json:"Sources,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-simulationapplication.html#cfn-robomaker-simulationapplication-tags
+	Tags map[string]*types.Value `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 *SimulationApplication) AWSCloudFormationType() string {
+	return "AWS::RoboMaker::SimulationApplication"
+}
+
+// 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 SimulationApplication) MarshalJSON() ([]byte, error) {
+	type Properties SimulationApplication
+	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 *SimulationApplication) UnmarshalJSON(b []byte) error {
+	type Properties SimulationApplication
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SimulationApplication(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_renderingengine.go b/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_renderingengine.go
new file mode 100644
index 0000000000..1fb3729498
--- /dev/null
+++ b/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_renderingengine.go
@@ -0,0 +1,42 @@
+package robomaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SimulationApplication_RenderingEngine AWS CloudFormation Resource (AWS::RoboMaker::SimulationApplication.RenderingEngine)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-simulationapplication-renderingengine.html
+type SimulationApplication_RenderingEngine struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-simulationapplication-renderingengine.html#cfn-robomaker-simulationapplication-renderingengine-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-simulationapplication-renderingengine.html#cfn-robomaker-simulationapplication-renderingengine-version
+	Version *types.Value `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 *SimulationApplication_RenderingEngine) AWSCloudFormationType() string {
+	return "AWS::RoboMaker::SimulationApplication.RenderingEngine"
+}
diff --git a/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_robotsoftwaresuite.go b/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_robotsoftwaresuite.go
new file mode 100644
index 0000000000..763edbb8ad
--- /dev/null
+++ b/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_robotsoftwaresuite.go
@@ -0,0 +1,42 @@
+package robomaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SimulationApplication_RobotSoftwareSuite AWS CloudFormation Resource (AWS::RoboMaker::SimulationApplication.RobotSoftwareSuite)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-simulationapplication-robotsoftwaresuite.html
+type SimulationApplication_RobotSoftwareSuite struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-simulationapplication-robotsoftwaresuite.html#cfn-robomaker-simulationapplication-robotsoftwaresuite-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-simulationapplication-robotsoftwaresuite.html#cfn-robomaker-simulationapplication-robotsoftwaresuite-version
+	Version *types.Value `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 *SimulationApplication_RobotSoftwareSuite) AWSCloudFormationType() string {
+	return "AWS::RoboMaker::SimulationApplication.RobotSoftwareSuite"
+}
diff --git a/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_simulationsoftwaresuite.go b/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_simulationsoftwaresuite.go
new file mode 100644
index 0000000000..7acb98a949
--- /dev/null
+++ b/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_simulationsoftwaresuite.go
@@ -0,0 +1,42 @@
+package robomaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SimulationApplication_SimulationSoftwareSuite AWS CloudFormation Resource (AWS::RoboMaker::SimulationApplication.SimulationSoftwareSuite)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-simulationapplication-simulationsoftwaresuite.html
+type SimulationApplication_SimulationSoftwareSuite struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-simulationapplication-simulationsoftwaresuite.html#cfn-robomaker-simulationapplication-simulationsoftwaresuite-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-simulationapplication-simulationsoftwaresuite.html#cfn-robomaker-simulationapplication-simulationsoftwaresuite-version
+	Version *types.Value `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 *SimulationApplication_SimulationSoftwareSuite) AWSCloudFormationType() string {
+	return "AWS::RoboMaker::SimulationApplication.SimulationSoftwareSuite"
+}
diff --git a/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_sourceconfig.go b/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_sourceconfig.go
new file mode 100644
index 0000000000..71fb908fa2
--- /dev/null
+++ b/goformation/cloudformation/robomaker/aws-robomaker-simulationapplication_sourceconfig.go
@@ -0,0 +1,47 @@
+package robomaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SimulationApplication_SourceConfig AWS CloudFormation Resource (AWS::RoboMaker::SimulationApplication.SourceConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-simulationapplication-sourceconfig.html
+type SimulationApplication_SourceConfig struct {
+
+	// Architecture AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-simulationapplication-sourceconfig.html#cfn-robomaker-simulationapplication-sourceconfig-architecture
+	Architecture *types.Value `json:"Architecture,omitempty"`
+
+	// S3Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-simulationapplication-sourceconfig.html#cfn-robomaker-simulationapplication-sourceconfig-s3bucket
+	S3Bucket *types.Value `json:"S3Bucket,omitempty"`
+
+	// S3Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-robomaker-simulationapplication-sourceconfig.html#cfn-robomaker-simulationapplication-sourceconfig-s3key
+	S3Key *types.Value `json:"S3Key,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SimulationApplication_SourceConfig) AWSCloudFormationType() string {
+	return "AWS::RoboMaker::SimulationApplication.SourceConfig"
+}
diff --git a/goformation/cloudformation/robomaker/aws-robomaker-simulationapplicationversion.go b/goformation/cloudformation/robomaker/aws-robomaker-simulationapplicationversion.go
new file mode 100644
index 0000000000..548ce281ad
--- /dev/null
+++ b/goformation/cloudformation/robomaker/aws-robomaker-simulationapplicationversion.go
@@ -0,0 +1,113 @@
+package robomaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SimulationApplicationVersion AWS CloudFormation Resource (AWS::RoboMaker::SimulationApplicationVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-simulationapplicationversion.html
+type SimulationApplicationVersion struct {
+
+	// Application AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-simulationapplicationversion.html#cfn-robomaker-simulationapplicationversion-application
+	Application *types.Value `json:"Application,omitempty"`
+
+	// CurrentRevisionId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-robomaker-simulationapplicationversion.html#cfn-robomaker-simulationapplicationversion-currentrevisionid
+	CurrentRevisionId *types.Value `json:"CurrentRevisionId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SimulationApplicationVersion) AWSCloudFormationType() string {
+	return "AWS::RoboMaker::SimulationApplicationVersion"
+}
+
+// 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 SimulationApplicationVersion) MarshalJSON() ([]byte, error) {
+	type Properties SimulationApplicationVersion
+	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 *SimulationApplicationVersion) UnmarshalJSON(b []byte) error {
+	type Properties SimulationApplicationVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SimulationApplicationVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-crl.go b/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-crl.go
new file mode 100644
index 0000000000..5ade327e2e
--- /dev/null
+++ b/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-crl.go
@@ -0,0 +1,138 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package rolesanywhere
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/awslabs/goformation/v4/cloudformation/tags"
+)
+
+// CRL AWS CloudFormation Resource (AWS::RolesAnywhere::CRL)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-crl.html
+type CRL struct {
+
+	// CrlData AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-crl.html#cfn-rolesanywhere-crl-crldata
+	CrlData string `json:"CrlData"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-crl.html#cfn-rolesanywhere-crl-enabled
+	Enabled *bool `json:"Enabled,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-crl.html#cfn-rolesanywhere-crl-name
+	Name string `json:"Name"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-crl.html#cfn-rolesanywhere-crl-tags
+	Tags []tags.Tag `json:"Tags,omitempty"`
+
+	// TrustAnchorArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-crl.html#cfn-rolesanywhere-crl-trustanchorarn
+	TrustAnchorArn *string `json:"TrustAnchorArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CRL) AWSCloudFormationType() string {
+	return "AWS::RolesAnywhere::CRL"
+}
+
+// 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 CRL) MarshalJSON() ([]byte, error) {
+	type Properties CRL
+	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 *CRL) UnmarshalJSON(b []byte) error {
+	type Properties CRL
+	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 = CRL(*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/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-profile.go b/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-profile.go
new file mode 100644
index 0000000000..01244b2451
--- /dev/null
+++ b/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-profile.go
@@ -0,0 +1,159 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package rolesanywhere
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"goformation/v4/cloudformation/types"
+
+	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/awslabs/goformation/v4/cloudformation/tags"
+)
+
+// Profile AWS CloudFormation Resource (AWS::RolesAnywhere::Profile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-profile.html
+type Profile struct {
+	// AcceptRoleSessionName AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-profile.html#cfn-rolesanywhere-profile-acceptrolesessionname
+	AcceptRoleSessionName *types.Value `json:"acceptRoleSessionName,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
+	DurationSeconds *float64 `json:"DurationSeconds,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-profile.html#cfn-rolesanywhere-profile-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// ManagedPolicyArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-profile.html#cfn-rolesanywhere-profile-managedpolicyarns
+	ManagedPolicyArns []string `json:"ManagedPolicyArns,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-profile.html#cfn-rolesanywhere-profile-name
+	Name *types.Value `json:"Name"`
+
+	// RequireInstanceProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-profile.html#cfn-rolesanywhere-profile-requireinstanceproperties
+	RequireInstanceProperties *bool `json:"RequireInstanceProperties,omitempty"`
+
+	// RoleArns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-profile.html#cfn-rolesanywhere-profile-rolearns
+	RoleArns *types.Value `json:"RoleArns"`
+
+	// SessionPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-profile.html#cfn-rolesanywhere-profile-sessionpolicy
+	SessionPolicy *string `json:"SessionPolicy,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-profile.html#cfn-rolesanywhere-profile-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 *Profile) AWSCloudFormationType() string {
+	return "AWS::RolesAnywhere::Profile"
+}
+
+// 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 Profile) MarshalJSON() ([]byte, error) {
+	type Properties Profile
+	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 *Profile) UnmarshalJSON(b []byte) error {
+	type Properties Profile
+	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 = Profile(*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/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor.go b/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor.go
new file mode 100644
index 0000000000..de74e72907
--- /dev/null
+++ b/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor.go
@@ -0,0 +1,140 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package rolesanywhere
+
+import (
+	"bytes"
+	"encoding/json"
+
+	"goformation/v4/cloudformation/types"
+
+	"github.com/awslabs/goformation/v4/cloudformation/policies"
+	"github.com/awslabs/goformation/v4/cloudformation/tags"
+)
+
+// TrustAnchor AWS CloudFormation Resource (AWS::RolesAnywhere::TrustAnchor)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-trustanchor.html
+type TrustAnchor struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-trustanchor.html#cfn-rolesanywhere-trustanchor-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-trustanchor.html#cfn-rolesanywhere-trustanchor-name
+	Name *types.Value `json:"Name"`
+
+	// NotificationSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-trustanchor.html#cfn-rolesanywhere-trustanchor-notificationsettings
+	NotificationSettings []TrustAnchor_NotificationSetting `json:"NotificationSettings,omitempty"`
+
+	// Source AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-trustanchor.html#cfn-rolesanywhere-trustanchor-source
+	Source *TrustAnchor_Source `json:"Source"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rolesanywhere-trustanchor.html#cfn-rolesanywhere-trustanchor-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 *TrustAnchor) AWSCloudFormationType() string {
+	return "AWS::RolesAnywhere::TrustAnchor"
+}
+
+// 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 TrustAnchor) MarshalJSON() ([]byte, error) {
+	type Properties TrustAnchor
+	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 *TrustAnchor) UnmarshalJSON(b []byte) error {
+	type Properties TrustAnchor
+	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 = TrustAnchor(*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/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_notificationsetting.go b/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_notificationsetting.go
new file mode 100644
index 0000000000..7e18a488a7
--- /dev/null
+++ b/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_notificationsetting.go
@@ -0,0 +1,52 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package rolesanywhere
+
+import (
+	"github.com/awslabs/goformation/v4/cloudformation/policies"
+)
+
+// TrustAnchor_NotificationSetting AWS CloudFormation Resource (AWS::RolesAnywhere::TrustAnchor.NotificationSetting)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rolesanywhere-trustanchor-notificationsetting.html
+type TrustAnchor_NotificationSetting struct {
+
+	// Channel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rolesanywhere-trustanchor-notificationsetting.html#cfn-rolesanywhere-trustanchor-notificationsetting-channel
+	Channel *string `json:"Channel,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rolesanywhere-trustanchor-notificationsetting.html#cfn-rolesanywhere-trustanchor-notificationsetting-enabled
+	Enabled bool `json:"Enabled"`
+
+	// Event AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rolesanywhere-trustanchor-notificationsetting.html#cfn-rolesanywhere-trustanchor-notificationsetting-event
+	Event string `json:"Event"`
+
+	// Threshold AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rolesanywhere-trustanchor-notificationsetting.html#cfn-rolesanywhere-trustanchor-notificationsetting-threshold
+	Threshold *float64 `json:"Threshold,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TrustAnchor_NotificationSetting) AWSCloudFormationType() string {
+	return "AWS::RolesAnywhere::TrustAnchor.NotificationSetting"
+}
diff --git a/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_source.go b/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_source.go
new file mode 100644
index 0000000000..e465492843
--- /dev/null
+++ b/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_source.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package rolesanywhere
+
+import (
+	"github.com/awslabs/goformation/v4/cloudformation/policies"
+)
+
+// TrustAnchor_Source AWS CloudFormation Resource (AWS::RolesAnywhere::TrustAnchor.Source)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rolesanywhere-trustanchor-source.html
+type TrustAnchor_Source struct {
+
+	// SourceData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rolesanywhere-trustanchor-source.html#cfn-rolesanywhere-trustanchor-source-sourcedata
+	SourceData *TrustAnchor_SourceData `json:"SourceData,omitempty"`
+
+	// SourceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rolesanywhere-trustanchor-source.html#cfn-rolesanywhere-trustanchor-source-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 *TrustAnchor_Source) AWSCloudFormationType() string {
+	return "AWS::RolesAnywhere::TrustAnchor.Source"
+}
diff --git a/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_sourcedata.go b/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_sourcedata.go
new file mode 100644
index 0000000000..24fe6dd39c
--- /dev/null
+++ b/goformation/cloudformation/rolesanywhere/aws-rolesanywhere-trustanchor_sourcedata.go
@@ -0,0 +1,42 @@
+// Code generated by "go generate". Please don't change this file directly.
+
+package rolesanywhere
+
+import (
+	"github.com/awslabs/goformation/v4/cloudformation/policies"
+)
+
+// TrustAnchor_SourceData AWS CloudFormation Resource (AWS::RolesAnywhere::TrustAnchor.SourceData)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rolesanywhere-trustanchor-sourcedata.html
+type TrustAnchor_SourceData struct {
+
+	// AcmPcaArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rolesanywhere-trustanchor-sourcedata.html#cfn-rolesanywhere-trustanchor-sourcedata-acmpcaarn
+	AcmPcaArn *string `json:"AcmPcaArn,omitempty"`
+
+	// X509CertificateData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rolesanywhere-trustanchor-sourcedata.html#cfn-rolesanywhere-trustanchor-sourcedata-x509certificatedata
+	X509CertificateData *string `json:"X509CertificateData,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TrustAnchor_SourceData) AWSCloudFormationType() string {
+	return "AWS::RolesAnywhere::TrustAnchor.SourceData"
+}
diff --git a/goformation/cloudformation/route53/aws-route53-dnssec.go b/goformation/cloudformation/route53/aws-route53-dnssec.go
new file mode 100644
index 0000000000..2f8882a3ec
--- /dev/null
+++ b/goformation/cloudformation/route53/aws-route53-dnssec.go
@@ -0,0 +1,108 @@
+package route53
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DNSSEC AWS CloudFormation Resource (AWS::Route53::DNSSEC)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-dnssec.html
+type DNSSEC struct {
+
+	// HostedZoneId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-dnssec.html#cfn-route53-dnssec-hostedzoneid
+	HostedZoneId *types.Value `json:"HostedZoneId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DNSSEC) AWSCloudFormationType() string {
+	return "AWS::Route53::DNSSEC"
+}
+
+// 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 DNSSEC) MarshalJSON() ([]byte, error) {
+	type Properties DNSSEC
+	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 *DNSSEC) UnmarshalJSON(b []byte) error {
+	type Properties DNSSEC
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DNSSEC(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53/aws-route53-healthcheck.go b/goformation/cloudformation/route53/aws-route53-healthcheck.go
new file mode 100644
index 0000000000..92dfae0fe8
--- /dev/null
+++ b/goformation/cloudformation/route53/aws-route53-healthcheck.go
@@ -0,0 +1,111 @@
+package route53
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// HealthCheck AWS CloudFormation Resource (AWS::Route53::HealthCheck)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-healthcheck.html
+type HealthCheck struct {
+
+	// HealthCheckConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-healthcheck.html#cfn-route53-healthcheck-healthcheckconfig
+	HealthCheckConfig interface{} `json:"HealthCheckConfig,omitempty"`
+
+	// HealthCheckTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-healthcheck.html#cfn-route53-healthcheck-healthchecktags
+	HealthCheckTags []HealthCheck_HealthCheckTag `json:"HealthCheckTags,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *HealthCheck) AWSCloudFormationType() string {
+	return "AWS::Route53::HealthCheck"
+}
+
+// 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 HealthCheck) MarshalJSON() ([]byte, error) {
+	type Properties HealthCheck
+	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 *HealthCheck) UnmarshalJSON(b []byte) error {
+	type Properties HealthCheck
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = HealthCheck(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53/aws-route53-healthcheck_alarmidentifier.go b/goformation/cloudformation/route53/aws-route53-healthcheck_alarmidentifier.go
new file mode 100644
index 0000000000..27514bf978
--- /dev/null
+++ b/goformation/cloudformation/route53/aws-route53-healthcheck_alarmidentifier.go
@@ -0,0 +1,42 @@
+package route53
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// HealthCheck_AlarmIdentifier AWS CloudFormation Resource (AWS::Route53::HealthCheck.AlarmIdentifier)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-alarmidentifier.html
+type HealthCheck_AlarmIdentifier struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-alarmidentifier.html#cfn-route53-healthcheck-alarmidentifier-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Region AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-alarmidentifier.html#cfn-route53-healthcheck-alarmidentifier-region
+	Region *types.Value `json:"Region,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *HealthCheck_AlarmIdentifier) AWSCloudFormationType() string {
+	return "AWS::Route53::HealthCheck.AlarmIdentifier"
+}
diff --git a/goformation/cloudformation/route53/aws-route53-healthcheck_healthcheckconfig.go b/goformation/cloudformation/route53/aws-route53-healthcheck_healthcheckconfig.go
new file mode 100644
index 0000000000..b9c2895423
--- /dev/null
+++ b/goformation/cloudformation/route53/aws-route53-healthcheck_healthcheckconfig.go
@@ -0,0 +1,112 @@
+package route53
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// HealthCheck_HealthCheckConfig AWS CloudFormation Resource (AWS::Route53::HealthCheck.HealthCheckConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html
+type HealthCheck_HealthCheckConfig struct {
+
+	// AlarmIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-alarmidentifier
+	AlarmIdentifier *HealthCheck_AlarmIdentifier `json:"AlarmIdentifier,omitempty"`
+
+	// ChildHealthChecks AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-childhealthchecks
+	ChildHealthChecks *types.Value `json:"ChildHealthChecks,omitempty"`
+
+	// EnableSNI AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-enablesni
+	EnableSNI *types.Value `json:"EnableSNI,omitempty"`
+
+	// FailureThreshold AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-failurethreshold
+	FailureThreshold *types.Value `json:"FailureThreshold,omitempty"`
+
+	// FullyQualifiedDomainName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-fullyqualifieddomainname
+	FullyQualifiedDomainName *types.Value `json:"FullyQualifiedDomainName,omitempty"`
+
+	// HealthThreshold AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-healththreshold
+	HealthThreshold *types.Value `json:"HealthThreshold,omitempty"`
+
+	// IPAddress AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-ipaddress
+	IPAddress *types.Value `json:"IPAddress,omitempty"`
+
+	// InsufficientDataHealthStatus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-insufficientdatahealthstatus
+	InsufficientDataHealthStatus *types.Value `json:"InsufficientDataHealthStatus,omitempty"`
+
+	// Inverted AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-inverted
+	Inverted *types.Value `json:"Inverted,omitempty"`
+
+	// MeasureLatency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-measurelatency
+	MeasureLatency *types.Value `json:"MeasureLatency,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// Regions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-regions
+	Regions *types.Value `json:"Regions,omitempty"`
+
+	// RequestInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-requestinterval
+	RequestInterval *types.Value `json:"RequestInterval,omitempty"`
+
+	// ResourcePath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-resourcepath
+	ResourcePath *types.Value `json:"ResourcePath,omitempty"`
+
+	// SearchString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-searchstring
+	SearchString *types.Value `json:"SearchString,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthcheckconfig.html#cfn-route53-healthcheck-healthcheckconfig-type
+	Type *types.Value `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 *HealthCheck_HealthCheckConfig) AWSCloudFormationType() string {
+	return "AWS::Route53::HealthCheck.HealthCheckConfig"
+}
diff --git a/goformation/cloudformation/route53/aws-route53-healthcheck_healthchecktag.go b/goformation/cloudformation/route53/aws-route53-healthcheck_healthchecktag.go
new file mode 100644
index 0000000000..83e2244939
--- /dev/null
+++ b/goformation/cloudformation/route53/aws-route53-healthcheck_healthchecktag.go
@@ -0,0 +1,42 @@
+package route53
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// HealthCheck_HealthCheckTag AWS CloudFormation Resource (AWS::Route53::HealthCheck.HealthCheckTag)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthchecktag.html
+type HealthCheck_HealthCheckTag struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthchecktag.html#cfn-route53-healthcheck-healthchecktag-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-healthcheck-healthchecktag.html#cfn-route53-healthcheck-healthchecktag-value
+	Value *types.Value `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 *HealthCheck_HealthCheckTag) AWSCloudFormationType() string {
+	return "AWS::Route53::HealthCheck.HealthCheckTag"
+}
diff --git a/goformation/cloudformation/route53/aws-route53-hostedzone.go b/goformation/cloudformation/route53/aws-route53-hostedzone.go
new file mode 100644
index 0000000000..7d893812b6
--- /dev/null
+++ b/goformation/cloudformation/route53/aws-route53-hostedzone.go
@@ -0,0 +1,128 @@
+package route53
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// HostedZone AWS CloudFormation Resource (AWS::Route53::HostedZone)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone.html
+type HostedZone struct {
+
+	// HostedZoneConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone.html#cfn-route53-hostedzone-hostedzoneconfig
+	HostedZoneConfig *HostedZone_HostedZoneConfig `json:"HostedZoneConfig,omitempty"`
+
+	// HostedZoneTags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone.html#cfn-route53-hostedzone-hostedzonetags
+	HostedZoneTags []HostedZone_HostedZoneTag `json:"HostedZoneTags,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone.html#cfn-route53-hostedzone-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// QueryLoggingConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone.html#cfn-route53-hostedzone-queryloggingconfig
+	QueryLoggingConfig *HostedZone_QueryLoggingConfig `json:"QueryLoggingConfig,omitempty"`
+
+	// VPCs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-hostedzone.html#cfn-route53-hostedzone-vpcs
+	VPCs []HostedZone_VPC `json:"VPCs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *HostedZone) AWSCloudFormationType() string {
+	return "AWS::Route53::HostedZone"
+}
+
+// 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 HostedZone) MarshalJSON() ([]byte, error) {
+	type Properties HostedZone
+	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 *HostedZone) UnmarshalJSON(b []byte) error {
+	type Properties HostedZone
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = HostedZone(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53/aws-route53-hostedzone_hostedzoneconfig.go b/goformation/cloudformation/route53/aws-route53-hostedzone_hostedzoneconfig.go
new file mode 100644
index 0000000000..adaed980f1
--- /dev/null
+++ b/goformation/cloudformation/route53/aws-route53-hostedzone_hostedzoneconfig.go
@@ -0,0 +1,37 @@
+package route53
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// HostedZone_HostedZoneConfig AWS CloudFormation Resource (AWS::Route53::HostedZone.HostedZoneConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-hostedzoneconfig.html
+type HostedZone_HostedZoneConfig struct {
+
+	// Comment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-hostedzoneconfig.html#cfn-route53-hostedzone-hostedzoneconfig-comment
+	Comment *types.Value `json:"Comment,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *HostedZone_HostedZoneConfig) AWSCloudFormationType() string {
+	return "AWS::Route53::HostedZone.HostedZoneConfig"
+}
diff --git a/goformation/cloudformation/route53/aws-route53-hostedzone_hostedzonetag.go b/goformation/cloudformation/route53/aws-route53-hostedzone_hostedzonetag.go
new file mode 100644
index 0000000000..cd4062a31e
--- /dev/null
+++ b/goformation/cloudformation/route53/aws-route53-hostedzone_hostedzonetag.go
@@ -0,0 +1,42 @@
+package route53
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// HostedZone_HostedZoneTag AWS CloudFormation Resource (AWS::Route53::HostedZone.HostedZoneTag)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-hostedzonetag.html
+type HostedZone_HostedZoneTag struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-hostedzonetag.html#cfn-route53-hostedzone-hostedzonetag-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-hostedzonetag.html#cfn-route53-hostedzone-hostedzonetag-value
+	Value *types.Value `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 *HostedZone_HostedZoneTag) AWSCloudFormationType() string {
+	return "AWS::Route53::HostedZone.HostedZoneTag"
+}
diff --git a/goformation/cloudformation/route53/aws-route53-hostedzone_queryloggingconfig.go b/goformation/cloudformation/route53/aws-route53-hostedzone_queryloggingconfig.go
new file mode 100644
index 0000000000..367230cc99
--- /dev/null
+++ b/goformation/cloudformation/route53/aws-route53-hostedzone_queryloggingconfig.go
@@ -0,0 +1,37 @@
+package route53
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// HostedZone_QueryLoggingConfig AWS CloudFormation Resource (AWS::Route53::HostedZone.QueryLoggingConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-queryloggingconfig.html
+type HostedZone_QueryLoggingConfig struct {
+
+	// CloudWatchLogsLogGroupArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-queryloggingconfig.html#cfn-route53-hostedzone-queryloggingconfig-cloudwatchlogsloggrouparn
+	CloudWatchLogsLogGroupArn *types.Value `json:"CloudWatchLogsLogGroupArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *HostedZone_QueryLoggingConfig) AWSCloudFormationType() string {
+	return "AWS::Route53::HostedZone.QueryLoggingConfig"
+}
diff --git a/goformation/cloudformation/route53/aws-route53-hostedzone_vpc.go b/goformation/cloudformation/route53/aws-route53-hostedzone_vpc.go
new file mode 100644
index 0000000000..abb9d3bdeb
--- /dev/null
+++ b/goformation/cloudformation/route53/aws-route53-hostedzone_vpc.go
@@ -0,0 +1,42 @@
+package route53
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// HostedZone_VPC AWS CloudFormation Resource (AWS::Route53::HostedZone.VPC)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-vpc.html
+type HostedZone_VPC struct {
+
+	// VPCId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-vpc.html#cfn-route53-hostedzone-vpc-vpcid
+	VPCId *types.Value `json:"VPCId,omitempty"`
+
+	// VPCRegion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-hostedzone-vpc.html#cfn-route53-hostedzone-vpc-vpcregion
+	VPCRegion *types.Value `json:"VPCRegion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *HostedZone_VPC) AWSCloudFormationType() string {
+	return "AWS::Route53::HostedZone.VPC"
+}
diff --git a/goformation/cloudformation/route53/aws-route53-keysigningkey.go b/goformation/cloudformation/route53/aws-route53-keysigningkey.go
new file mode 100644
index 0000000000..c995d65346
--- /dev/null
+++ b/goformation/cloudformation/route53/aws-route53-keysigningkey.go
@@ -0,0 +1,123 @@
+package route53
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// KeySigningKey AWS CloudFormation Resource (AWS::Route53::KeySigningKey)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-keysigningkey.html
+type KeySigningKey struct {
+
+	// HostedZoneId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-keysigningkey.html#cfn-route53-keysigningkey-hostedzoneid
+	HostedZoneId *types.Value `json:"HostedZoneId,omitempty"`
+
+	// KeyManagementServiceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-keysigningkey.html#cfn-route53-keysigningkey-keymanagementservicearn
+	KeyManagementServiceArn *types.Value `json:"KeyManagementServiceArn,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-keysigningkey.html#cfn-route53-keysigningkey-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-keysigningkey.html#cfn-route53-keysigningkey-status
+	Status *types.Value `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 *KeySigningKey) AWSCloudFormationType() string {
+	return "AWS::Route53::KeySigningKey"
+}
+
+// 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 KeySigningKey) MarshalJSON() ([]byte, error) {
+	type Properties KeySigningKey
+	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 *KeySigningKey) UnmarshalJSON(b []byte) error {
+	type Properties KeySigningKey
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = KeySigningKey(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53/aws-route53-recordset.go b/goformation/cloudformation/route53/aws-route53-recordset.go
new file mode 100644
index 0000000000..5f5c0978a1
--- /dev/null
+++ b/goformation/cloudformation/route53/aws-route53-recordset.go
@@ -0,0 +1,178 @@
+package route53
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RecordSet AWS CloudFormation Resource (AWS::Route53::RecordSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html
+type RecordSet struct {
+
+	// AliasTarget AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-aliastarget
+	AliasTarget *RecordSet_AliasTarget `json:"AliasTarget,omitempty"`
+
+	// Comment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-comment
+	Comment *types.Value `json:"Comment,omitempty"`
+
+	// Failover AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-failover
+	Failover *types.Value `json:"Failover,omitempty"`
+
+	// GeoLocation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-geolocation
+	GeoLocation *RecordSet_GeoLocation `json:"GeoLocation,omitempty"`
+
+	// HealthCheckId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-healthcheckid
+	HealthCheckId *types.Value `json:"HealthCheckId,omitempty"`
+
+	// HostedZoneId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-hostedzoneid
+	HostedZoneId *types.Value `json:"HostedZoneId,omitempty"`
+
+	// HostedZoneName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-hostedzonename
+	HostedZoneName *types.Value `json:"HostedZoneName,omitempty"`
+
+	// MultiValueAnswer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-multivalueanswer
+	MultiValueAnswer *types.Value `json:"MultiValueAnswer,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Region AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-region
+	Region *types.Value `json:"Region,omitempty"`
+
+	// ResourceRecords AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-resourcerecords
+	ResourceRecords *types.Value `json:"ResourceRecords,omitempty"`
+
+	// SetIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-setidentifier
+	SetIdentifier *types.Value `json:"SetIdentifier,omitempty"`
+
+	// TTL AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-ttl
+	TTL *types.Value `json:"TTL,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Weight AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-weight
+	Weight *types.Value `json:"Weight,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RecordSet) AWSCloudFormationType() string {
+	return "AWS::Route53::RecordSet"
+}
+
+// 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 RecordSet) MarshalJSON() ([]byte, error) {
+	type Properties RecordSet
+	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 *RecordSet) UnmarshalJSON(b []byte) error {
+	type Properties RecordSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RecordSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53/aws-route53-recordset_aliastarget.go b/goformation/cloudformation/route53/aws-route53-recordset_aliastarget.go
new file mode 100644
index 0000000000..ab6e4d7753
--- /dev/null
+++ b/goformation/cloudformation/route53/aws-route53-recordset_aliastarget.go
@@ -0,0 +1,47 @@
+package route53
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RecordSet_AliasTarget AWS CloudFormation Resource (AWS::Route53::RecordSet.AliasTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-aliastarget.html
+type RecordSet_AliasTarget struct {
+
+	// DNSName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-aliastarget.html#cfn-route53-aliastarget-dnshostname
+	DNSName *types.Value `json:"DNSName,omitempty"`
+
+	// EvaluateTargetHealth AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-aliastarget.html#cfn-route53-aliastarget-evaluatetargethealth
+	EvaluateTargetHealth *types.Value `json:"EvaluateTargetHealth,omitempty"`
+
+	// HostedZoneId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-aliastarget.html#cfn-route53-aliastarget-hostedzoneid
+	HostedZoneId *types.Value `json:"HostedZoneId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RecordSet_AliasTarget) AWSCloudFormationType() string {
+	return "AWS::Route53::RecordSet.AliasTarget"
+}
diff --git a/goformation/cloudformation/route53/aws-route53-recordset_geolocation.go b/goformation/cloudformation/route53/aws-route53-recordset_geolocation.go
new file mode 100644
index 0000000000..4aab01e686
--- /dev/null
+++ b/goformation/cloudformation/route53/aws-route53-recordset_geolocation.go
@@ -0,0 +1,47 @@
+package route53
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RecordSet_GeoLocation AWS CloudFormation Resource (AWS::Route53::RecordSet.GeoLocation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset-geolocation.html
+type RecordSet_GeoLocation struct {
+
+	// ContinentCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset-geolocation.html#cfn-route53-recordset-geolocation-continentcode
+	ContinentCode *types.Value `json:"ContinentCode,omitempty"`
+
+	// CountryCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset-geolocation.html#cfn-route53-recordset-geolocation-countrycode
+	CountryCode *types.Value `json:"CountryCode,omitempty"`
+
+	// SubdivisionCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset-geolocation.html#cfn-route53-recordset-geolocation-subdivisioncode
+	SubdivisionCode *types.Value `json:"SubdivisionCode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RecordSet_GeoLocation) AWSCloudFormationType() string {
+	return "AWS::Route53::RecordSet.GeoLocation"
+}
diff --git a/goformation/cloudformation/route53/aws-route53-recordsetgroup.go b/goformation/cloudformation/route53/aws-route53-recordsetgroup.go
new file mode 100644
index 0000000000..d670bfb403
--- /dev/null
+++ b/goformation/cloudformation/route53/aws-route53-recordsetgroup.go
@@ -0,0 +1,123 @@
+package route53
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RecordSetGroup AWS CloudFormation Resource (AWS::Route53::RecordSetGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-recordsetgroup.html
+type RecordSetGroup struct {
+
+	// Comment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-recordsetgroup.html#cfn-route53-recordsetgroup-comment
+	Comment *types.Value `json:"Comment,omitempty"`
+
+	// HostedZoneId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-recordsetgroup.html#cfn-route53-recordsetgroup-hostedzoneid
+	HostedZoneId *types.Value `json:"HostedZoneId,omitempty"`
+
+	// HostedZoneName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-recordsetgroup.html#cfn-route53-recordsetgroup-hostedzonename
+	HostedZoneName *types.Value `json:"HostedZoneName,omitempty"`
+
+	// RecordSets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53-recordsetgroup.html#cfn-route53-recordsetgroup-recordsets
+	RecordSets []RecordSetGroup_RecordSet `json:"RecordSets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RecordSetGroup) AWSCloudFormationType() string {
+	return "AWS::Route53::RecordSetGroup"
+}
+
+// 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 RecordSetGroup) MarshalJSON() ([]byte, error) {
+	type Properties RecordSetGroup
+	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 *RecordSetGroup) UnmarshalJSON(b []byte) error {
+	type Properties RecordSetGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RecordSetGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53/aws-route53-recordsetgroup_aliastarget.go b/goformation/cloudformation/route53/aws-route53-recordsetgroup_aliastarget.go
new file mode 100644
index 0000000000..e0539b96a0
--- /dev/null
+++ b/goformation/cloudformation/route53/aws-route53-recordsetgroup_aliastarget.go
@@ -0,0 +1,47 @@
+package route53
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RecordSetGroup_AliasTarget AWS CloudFormation Resource (AWS::Route53::RecordSetGroup.AliasTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-aliastarget.html
+type RecordSetGroup_AliasTarget struct {
+
+	// DNSName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-aliastarget.html#cfn-route53-aliastarget-dnshostname
+	DNSName *types.Value `json:"DNSName,omitempty"`
+
+	// EvaluateTargetHealth AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-aliastarget.html#cfn-route53-aliastarget-evaluatetargethealth
+	EvaluateTargetHealth *types.Value `json:"EvaluateTargetHealth,omitempty"`
+
+	// HostedZoneId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-aliastarget.html#cfn-route53-aliastarget-hostedzoneid
+	HostedZoneId *types.Value `json:"HostedZoneId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RecordSetGroup_AliasTarget) AWSCloudFormationType() string {
+	return "AWS::Route53::RecordSetGroup.AliasTarget"
+}
diff --git a/goformation/cloudformation/route53/aws-route53-recordsetgroup_geolocation.go b/goformation/cloudformation/route53/aws-route53-recordsetgroup_geolocation.go
new file mode 100644
index 0000000000..f310385be5
--- /dev/null
+++ b/goformation/cloudformation/route53/aws-route53-recordsetgroup_geolocation.go
@@ -0,0 +1,47 @@
+package route53
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RecordSetGroup_GeoLocation AWS CloudFormation Resource (AWS::Route53::RecordSetGroup.GeoLocation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset-geolocation.html
+type RecordSetGroup_GeoLocation struct {
+
+	// ContinentCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset-geolocation.html#cfn-route53-recordsetgroup-geolocation-continentcode
+	ContinentCode *types.Value `json:"ContinentCode,omitempty"`
+
+	// CountryCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset-geolocation.html#cfn-route53-recordset-geolocation-countrycode
+	CountryCode *types.Value `json:"CountryCode,omitempty"`
+
+	// SubdivisionCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset-geolocation.html#cfn-route53-recordset-geolocation-subdivisioncode
+	SubdivisionCode *types.Value `json:"SubdivisionCode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RecordSetGroup_GeoLocation) AWSCloudFormationType() string {
+	return "AWS::Route53::RecordSetGroup.GeoLocation"
+}
diff --git a/goformation/cloudformation/route53/aws-route53-recordsetgroup_recordset.go b/goformation/cloudformation/route53/aws-route53-recordsetgroup_recordset.go
new file mode 100644
index 0000000000..35b08672ab
--- /dev/null
+++ b/goformation/cloudformation/route53/aws-route53-recordsetgroup_recordset.go
@@ -0,0 +1,107 @@
+package route53
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RecordSetGroup_RecordSet AWS CloudFormation Resource (AWS::Route53::RecordSetGroup.RecordSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html
+type RecordSetGroup_RecordSet struct {
+
+	// AliasTarget AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-aliastarget
+	AliasTarget *RecordSetGroup_AliasTarget `json:"AliasTarget,omitempty"`
+
+	// Comment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-comment
+	Comment *types.Value `json:"Comment,omitempty"`
+
+	// Failover AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-failover
+	Failover *types.Value `json:"Failover,omitempty"`
+
+	// GeoLocation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-geolocation
+	GeoLocation *RecordSetGroup_GeoLocation `json:"GeoLocation,omitempty"`
+
+	// HealthCheckId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-healthcheckid
+	HealthCheckId *types.Value `json:"HealthCheckId,omitempty"`
+
+	// HostedZoneId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-hostedzoneid
+	HostedZoneId *types.Value `json:"HostedZoneId,omitempty"`
+
+	// HostedZoneName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-hostedzonename
+	HostedZoneName *types.Value `json:"HostedZoneName,omitempty"`
+
+	// MultiValueAnswer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-multivalueanswer
+	MultiValueAnswer *types.Value `json:"MultiValueAnswer,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Region AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-region
+	Region *types.Value `json:"Region,omitempty"`
+
+	// ResourceRecords AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-resourcerecords
+	ResourceRecords *types.Value `json:"ResourceRecords,omitempty"`
+
+	// SetIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-setidentifier
+	SetIdentifier *types.Value `json:"SetIdentifier,omitempty"`
+
+	// TTL AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-ttl
+	TTL *types.Value `json:"TTL,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Weight AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53-recordset.html#cfn-route53-recordset-weight
+	Weight *types.Value `json:"Weight,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RecordSetGroup_RecordSet) AWSCloudFormationType() string {
+	return "AWS::Route53::RecordSetGroup.RecordSet"
+}
diff --git a/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster.go b/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster.go
new file mode 100644
index 0000000000..c359b9a5a0
--- /dev/null
+++ b/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster.go
@@ -0,0 +1,114 @@
+package route53recoverycontrol
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster AWS CloudFormation Resource (AWS::Route53RecoveryControl::Cluster)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-cluster.html
+type Cluster struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-cluster.html#cfn-route53recoverycontrol-cluster-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-cluster.html#cfn-route53recoverycontrol-cluster-tags
+	Tags []cloudformation.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 *Cluster) AWSCloudFormationType() string {
+	return "AWS::Route53RecoveryControl::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster_clusterendpoint.go b/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster_clusterendpoint.go
new file mode 100644
index 0000000000..876bb31dde
--- /dev/null
+++ b/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-cluster_clusterendpoint.go
@@ -0,0 +1,42 @@
+package route53recoverycontrol
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cluster_ClusterEndpoint AWS CloudFormation Resource (AWS::Route53RecoveryControl::Cluster.ClusterEndpoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoverycontrol-cluster-clusterendpoint.html
+type Cluster_ClusterEndpoint struct {
+
+	// Endpoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoverycontrol-cluster-clusterendpoint.html#cfn-route53recoverycontrol-cluster-clusterendpoint-endpoint
+	Endpoint *types.Value `json:"Endpoint,omitempty"`
+
+	// Region AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoverycontrol-cluster-clusterendpoint.html#cfn-route53recoverycontrol-cluster-clusterendpoint-region
+	Region *types.Value `json:"Region,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ClusterEndpoint) AWSCloudFormationType() string {
+	return "AWS::Route53RecoveryControl::Cluster.ClusterEndpoint"
+}
diff --git a/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-controlpanel.go b/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-controlpanel.go
new file mode 100644
index 0000000000..393ea7f0c0
--- /dev/null
+++ b/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-controlpanel.go
@@ -0,0 +1,119 @@
+package route53recoverycontrol
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ControlPanel AWS CloudFormation Resource (AWS::Route53RecoveryControl::ControlPanel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-controlpanel.html
+type ControlPanel struct {
+
+	// ClusterArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-controlpanel.html#cfn-route53recoverycontrol-controlpanel-clusterarn
+	ClusterArn *types.Value `json:"ClusterArn,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-controlpanel.html#cfn-route53recoverycontrol-controlpanel-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-controlpanel.html#cfn-route53recoverycontrol-controlpanel-tags
+	Tags []cloudformation.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 *ControlPanel) AWSCloudFormationType() string {
+	return "AWS::Route53RecoveryControl::ControlPanel"
+}
+
+// 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 ControlPanel) MarshalJSON() ([]byte, error) {
+	type Properties ControlPanel
+	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 *ControlPanel) UnmarshalJSON(b []byte) error {
+	type Properties ControlPanel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ControlPanel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-routingcontrol.go b/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-routingcontrol.go
new file mode 100644
index 0000000000..97533dac99
--- /dev/null
+++ b/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-routingcontrol.go
@@ -0,0 +1,118 @@
+package route53recoverycontrol
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RoutingControl AWS CloudFormation Resource (AWS::Route53RecoveryControl::RoutingControl)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-routingcontrol.html
+type RoutingControl struct {
+
+	// ClusterArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-routingcontrol.html#cfn-route53recoverycontrol-routingcontrol-clusterarn
+	ClusterArn *types.Value `json:"ClusterArn,omitempty"`
+
+	// ControlPanelArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-routingcontrol.html#cfn-route53recoverycontrol-routingcontrol-controlpanelarn
+	ControlPanelArn *types.Value `json:"ControlPanelArn,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-routingcontrol.html#cfn-route53recoverycontrol-routingcontrol-name
+	Name *types.Value `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 *RoutingControl) AWSCloudFormationType() string {
+	return "AWS::Route53RecoveryControl::RoutingControl"
+}
+
+// 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 RoutingControl) MarshalJSON() ([]byte, error) {
+	type Properties RoutingControl
+	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 *RoutingControl) UnmarshalJSON(b []byte) error {
+	type Properties RoutingControl
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RoutingControl(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule.go b/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule.go
new file mode 100644
index 0000000000..832050b962
--- /dev/null
+++ b/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule.go
@@ -0,0 +1,134 @@
+package route53recoverycontrol
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// SafetyRule AWS CloudFormation Resource (AWS::Route53RecoveryControl::SafetyRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-safetyrule.html
+type SafetyRule struct {
+
+	// AssertionRule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-safetyrule.html#cfn-route53recoverycontrol-safetyrule-assertionrule
+	AssertionRule *SafetyRule_AssertionRule `json:"AssertionRule,omitempty"`
+
+	// ControlPanelArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-safetyrule.html#cfn-route53recoverycontrol-safetyrule-controlpanelarn
+	ControlPanelArn *types.Value `json:"ControlPanelArn,omitempty"`
+
+	// GatingRule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-safetyrule.html#cfn-route53recoverycontrol-safetyrule-gatingrule
+	GatingRule *SafetyRule_GatingRule `json:"GatingRule,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-safetyrule.html#cfn-route53recoverycontrol-safetyrule-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RuleConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-safetyrule.html#cfn-route53recoverycontrol-safetyrule-ruleconfig
+	RuleConfig *SafetyRule_RuleConfig `json:"RuleConfig,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoverycontrol-safetyrule.html#cfn-route53recoverycontrol-safetyrule-tags
+	Tags []cloudformation.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 *SafetyRule) AWSCloudFormationType() string {
+	return "AWS::Route53RecoveryControl::SafetyRule"
+}
+
+// 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 SafetyRule) MarshalJSON() ([]byte, error) {
+	type Properties SafetyRule
+	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 *SafetyRule) UnmarshalJSON(b []byte) error {
+	type Properties SafetyRule
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SafetyRule(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_assertionrule.go b/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_assertionrule.go
new file mode 100644
index 0000000000..8d46b85a4c
--- /dev/null
+++ b/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_assertionrule.go
@@ -0,0 +1,42 @@
+package route53recoverycontrol
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SafetyRule_AssertionRule AWS CloudFormation Resource (AWS::Route53RecoveryControl::SafetyRule.AssertionRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoverycontrol-safetyrule-assertionrule.html
+type SafetyRule_AssertionRule struct {
+
+	// AssertedControls AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoverycontrol-safetyrule-assertionrule.html#cfn-route53recoverycontrol-safetyrule-assertionrule-assertedcontrols
+	AssertedControls *types.Value `json:"AssertedControls,omitempty"`
+
+	// WaitPeriodMs AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoverycontrol-safetyrule-assertionrule.html#cfn-route53recoverycontrol-safetyrule-assertionrule-waitperiodms
+	WaitPeriodMs *types.Value `json:"WaitPeriodMs"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SafetyRule_AssertionRule) AWSCloudFormationType() string {
+	return "AWS::Route53RecoveryControl::SafetyRule.AssertionRule"
+}
diff --git a/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_gatingrule.go b/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_gatingrule.go
new file mode 100644
index 0000000000..5bf7dc1f78
--- /dev/null
+++ b/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_gatingrule.go
@@ -0,0 +1,47 @@
+package route53recoverycontrol
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SafetyRule_GatingRule AWS CloudFormation Resource (AWS::Route53RecoveryControl::SafetyRule.GatingRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoverycontrol-safetyrule-gatingrule.html
+type SafetyRule_GatingRule struct {
+
+	// GatingControls AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoverycontrol-safetyrule-gatingrule.html#cfn-route53recoverycontrol-safetyrule-gatingrule-gatingcontrols
+	GatingControls *types.Value `json:"GatingControls,omitempty"`
+
+	// TargetControls AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoverycontrol-safetyrule-gatingrule.html#cfn-route53recoverycontrol-safetyrule-gatingrule-targetcontrols
+	TargetControls *types.Value `json:"TargetControls,omitempty"`
+
+	// WaitPeriodMs AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoverycontrol-safetyrule-gatingrule.html#cfn-route53recoverycontrol-safetyrule-gatingrule-waitperiodms
+	WaitPeriodMs *types.Value `json:"WaitPeriodMs"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SafetyRule_GatingRule) AWSCloudFormationType() string {
+	return "AWS::Route53RecoveryControl::SafetyRule.GatingRule"
+}
diff --git a/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_ruleconfig.go b/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_ruleconfig.go
new file mode 100644
index 0000000000..e940ee102e
--- /dev/null
+++ b/goformation/cloudformation/route53recoverycontrol/aws-route53recoverycontrol-safetyrule_ruleconfig.go
@@ -0,0 +1,47 @@
+package route53recoverycontrol
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SafetyRule_RuleConfig AWS CloudFormation Resource (AWS::Route53RecoveryControl::SafetyRule.RuleConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoverycontrol-safetyrule-ruleconfig.html
+type SafetyRule_RuleConfig struct {
+
+	// Inverted AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoverycontrol-safetyrule-ruleconfig.html#cfn-route53recoverycontrol-safetyrule-ruleconfig-inverted
+	Inverted *types.Value `json:"Inverted"`
+
+	// Threshold AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoverycontrol-safetyrule-ruleconfig.html#cfn-route53recoverycontrol-safetyrule-ruleconfig-threshold
+	Threshold *types.Value `json:"Threshold"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoverycontrol-safetyrule-ruleconfig.html#cfn-route53recoverycontrol-safetyrule-ruleconfig-type
+	Type *types.Value `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 *SafetyRule_RuleConfig) AWSCloudFormationType() string {
+	return "AWS::Route53RecoveryControl::SafetyRule.RuleConfig"
+}
diff --git a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-cell.go b/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-cell.go
new file mode 100644
index 0000000000..999175b1df
--- /dev/null
+++ b/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-cell.go
@@ -0,0 +1,119 @@
+package route53recoveryreadiness
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Cell AWS CloudFormation Resource (AWS::Route53RecoveryReadiness::Cell)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-cell.html
+type Cell struct {
+
+	// CellName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-cell.html#cfn-route53recoveryreadiness-cell-cellname
+	CellName *types.Value `json:"CellName,omitempty"`
+
+	// Cells AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-cell.html#cfn-route53recoveryreadiness-cell-cells
+	Cells *types.Value `json:"Cells,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-cell.html#cfn-route53recoveryreadiness-cell-tags
+	Tags []cloudformation.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 *Cell) AWSCloudFormationType() string {
+	return "AWS::Route53RecoveryReadiness::Cell"
+}
+
+// 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 Cell) MarshalJSON() ([]byte, error) {
+	type Properties Cell
+	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 *Cell) UnmarshalJSON(b []byte) error {
+	type Properties Cell
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Cell(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-readinesscheck.go b/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-readinesscheck.go
new file mode 100644
index 0000000000..fb1cb03457
--- /dev/null
+++ b/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-readinesscheck.go
@@ -0,0 +1,119 @@
+package route53recoveryreadiness
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReadinessCheck AWS CloudFormation Resource (AWS::Route53RecoveryReadiness::ReadinessCheck)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-readinesscheck.html
+type ReadinessCheck struct {
+
+	// ReadinessCheckName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-readinesscheck.html#cfn-route53recoveryreadiness-readinesscheck-readinesscheckname
+	ReadinessCheckName *types.Value `json:"ReadinessCheckName,omitempty"`
+
+	// ResourceSetName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-readinesscheck.html#cfn-route53recoveryreadiness-readinesscheck-resourcesetname
+	ResourceSetName *types.Value `json:"ResourceSetName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-readinesscheck.html#cfn-route53recoveryreadiness-readinesscheck-tags
+	Tags []cloudformation.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 *ReadinessCheck) AWSCloudFormationType() string {
+	return "AWS::Route53RecoveryReadiness::ReadinessCheck"
+}
+
+// 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 ReadinessCheck) MarshalJSON() ([]byte, error) {
+	type Properties ReadinessCheck
+	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 *ReadinessCheck) UnmarshalJSON(b []byte) error {
+	type Properties ReadinessCheck
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ReadinessCheck(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-recoverygroup.go b/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-recoverygroup.go
new file mode 100644
index 0000000000..b4ba148b0c
--- /dev/null
+++ b/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-recoverygroup.go
@@ -0,0 +1,119 @@
+package route53recoveryreadiness
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// RecoveryGroup AWS CloudFormation Resource (AWS::Route53RecoveryReadiness::RecoveryGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-recoverygroup.html
+type RecoveryGroup struct {
+
+	// Cells AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-recoverygroup.html#cfn-route53recoveryreadiness-recoverygroup-cells
+	Cells *types.Value `json:"Cells,omitempty"`
+
+	// RecoveryGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-recoverygroup.html#cfn-route53recoveryreadiness-recoverygroup-recoverygroupname
+	RecoveryGroupName *types.Value `json:"RecoveryGroupName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-recoverygroup.html#cfn-route53recoveryreadiness-recoverygroup-tags
+	Tags []cloudformation.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 *RecoveryGroup) AWSCloudFormationType() string {
+	return "AWS::Route53RecoveryReadiness::RecoveryGroup"
+}
+
+// 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 RecoveryGroup) MarshalJSON() ([]byte, error) {
+	type Properties RecoveryGroup
+	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 *RecoveryGroup) UnmarshalJSON(b []byte) error {
+	type Properties RecoveryGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RecoveryGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset.go b/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset.go
new file mode 100644
index 0000000000..8984fbcd9d
--- /dev/null
+++ b/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset.go
@@ -0,0 +1,124 @@
+package route53recoveryreadiness
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceSet AWS CloudFormation Resource (AWS::Route53RecoveryReadiness::ResourceSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-resourceset.html
+type ResourceSet struct {
+
+	// ResourceSetName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-resourceset.html#cfn-route53recoveryreadiness-resourceset-resourcesetname
+	ResourceSetName *types.Value `json:"ResourceSetName,omitempty"`
+
+	// ResourceSetType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-resourceset.html#cfn-route53recoveryreadiness-resourceset-resourcesettype
+	ResourceSetType *types.Value `json:"ResourceSetType,omitempty"`
+
+	// Resources AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-resourceset.html#cfn-route53recoveryreadiness-resourceset-resources
+	Resources []ResourceSet_Resource `json:"Resources,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53recoveryreadiness-resourceset.html#cfn-route53recoveryreadiness-resourceset-tags
+	Tags []cloudformation.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 *ResourceSet) AWSCloudFormationType() string {
+	return "AWS::Route53RecoveryReadiness::ResourceSet"
+}
+
+// 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 ResourceSet) MarshalJSON() ([]byte, error) {
+	type Properties ResourceSet
+	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 *ResourceSet) UnmarshalJSON(b []byte) error {
+	type Properties ResourceSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResourceSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_dnstargetresource.go b/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_dnstargetresource.go
new file mode 100644
index 0000000000..a7797a782c
--- /dev/null
+++ b/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_dnstargetresource.go
@@ -0,0 +1,57 @@
+package route53recoveryreadiness
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceSet_DNSTargetResource AWS CloudFormation Resource (AWS::Route53RecoveryReadiness::ResourceSet.DNSTargetResource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoveryreadiness-resourceset-dnstargetresource.html
+type ResourceSet_DNSTargetResource struct {
+
+	// DomainName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoveryreadiness-resourceset-dnstargetresource.html#cfn-route53recoveryreadiness-resourceset-dnstargetresource-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// HostedZoneArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoveryreadiness-resourceset-dnstargetresource.html#cfn-route53recoveryreadiness-resourceset-dnstargetresource-hostedzonearn
+	HostedZoneArn *types.Value `json:"HostedZoneArn,omitempty"`
+
+	// RecordSetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoveryreadiness-resourceset-dnstargetresource.html#cfn-route53recoveryreadiness-resourceset-dnstargetresource-recordsetid
+	RecordSetId *types.Value `json:"RecordSetId,omitempty"`
+
+	// RecordType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoveryreadiness-resourceset-dnstargetresource.html#cfn-route53recoveryreadiness-resourceset-dnstargetresource-recordtype
+	RecordType *types.Value `json:"RecordType,omitempty"`
+
+	// TargetResource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoveryreadiness-resourceset-dnstargetresource.html#cfn-route53recoveryreadiness-resourceset-dnstargetresource-targetresource
+	TargetResource *ResourceSet_TargetResource `json:"TargetResource,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceSet_DNSTargetResource) AWSCloudFormationType() string {
+	return "AWS::Route53RecoveryReadiness::ResourceSet.DNSTargetResource"
+}
diff --git a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_nlbresource.go b/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_nlbresource.go
new file mode 100644
index 0000000000..55a270b10e
--- /dev/null
+++ b/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_nlbresource.go
@@ -0,0 +1,37 @@
+package route53recoveryreadiness
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceSet_NLBResource AWS CloudFormation Resource (AWS::Route53RecoveryReadiness::ResourceSet.NLBResource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoveryreadiness-resourceset-nlbresource.html
+type ResourceSet_NLBResource struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoveryreadiness-resourceset-nlbresource.html#cfn-route53recoveryreadiness-resourceset-nlbresource-arn
+	Arn *types.Value `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 *ResourceSet_NLBResource) AWSCloudFormationType() string {
+	return "AWS::Route53RecoveryReadiness::ResourceSet.NLBResource"
+}
diff --git a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_r53resourcerecord.go b/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_r53resourcerecord.go
new file mode 100644
index 0000000000..c1eebdb678
--- /dev/null
+++ b/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_r53resourcerecord.go
@@ -0,0 +1,42 @@
+package route53recoveryreadiness
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceSet_R53ResourceRecord AWS CloudFormation Resource (AWS::Route53RecoveryReadiness::ResourceSet.R53ResourceRecord)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoveryreadiness-resourceset-r53resourcerecord.html
+type ResourceSet_R53ResourceRecord struct {
+
+	// DomainName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoveryreadiness-resourceset-r53resourcerecord.html#cfn-route53recoveryreadiness-resourceset-r53resourcerecord-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// RecordSetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoveryreadiness-resourceset-r53resourcerecord.html#cfn-route53recoveryreadiness-resourceset-r53resourcerecord-recordsetid
+	RecordSetId *types.Value `json:"RecordSetId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceSet_R53ResourceRecord) AWSCloudFormationType() string {
+	return "AWS::Route53RecoveryReadiness::ResourceSet.R53ResourceRecord"
+}
diff --git a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_resource.go b/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_resource.go
new file mode 100644
index 0000000000..12c80b5501
--- /dev/null
+++ b/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_resource.go
@@ -0,0 +1,52 @@
+package route53recoveryreadiness
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceSet_Resource AWS CloudFormation Resource (AWS::Route53RecoveryReadiness::ResourceSet.Resource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoveryreadiness-resourceset-resource.html
+type ResourceSet_Resource struct {
+
+	// ComponentId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoveryreadiness-resourceset-resource.html#cfn-route53recoveryreadiness-resourceset-resource-componentid
+	ComponentId *types.Value `json:"ComponentId,omitempty"`
+
+	// DnsTargetResource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoveryreadiness-resourceset-resource.html#cfn-route53recoveryreadiness-resourceset-resource-dnstargetresource
+	DnsTargetResource *ResourceSet_DNSTargetResource `json:"DnsTargetResource,omitempty"`
+
+	// ReadinessScopes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoveryreadiness-resourceset-resource.html#cfn-route53recoveryreadiness-resourceset-resource-readinessscopes
+	ReadinessScopes *types.Value `json:"ReadinessScopes,omitempty"`
+
+	// ResourceArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoveryreadiness-resourceset-resource.html#cfn-route53recoveryreadiness-resourceset-resource-resourcearn
+	ResourceArn *types.Value `json:"ResourceArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceSet_Resource) AWSCloudFormationType() string {
+	return "AWS::Route53RecoveryReadiness::ResourceSet.Resource"
+}
diff --git a/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_targetresource.go b/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_targetresource.go
new file mode 100644
index 0000000000..3ec568de3c
--- /dev/null
+++ b/goformation/cloudformation/route53recoveryreadiness/aws-route53recoveryreadiness-resourceset_targetresource.go
@@ -0,0 +1,40 @@
+package route53recoveryreadiness
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceSet_TargetResource AWS CloudFormation Resource (AWS::Route53RecoveryReadiness::ResourceSet.TargetResource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoveryreadiness-resourceset-targetresource.html
+type ResourceSet_TargetResource struct {
+
+	// NLBResource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoveryreadiness-resourceset-targetresource.html#cfn-route53recoveryreadiness-resourceset-targetresource-nlbresource
+	NLBResource *ResourceSet_NLBResource `json:"NLBResource,omitempty"`
+
+	// R53Resource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53recoveryreadiness-resourceset-targetresource.html#cfn-route53recoveryreadiness-resourceset-targetresource-r53resource
+	R53Resource *ResourceSet_R53ResourceRecord `json:"R53Resource,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceSet_TargetResource) AWSCloudFormationType() string {
+	return "AWS::Route53RecoveryReadiness::ResourceSet.TargetResource"
+}
diff --git a/goformation/cloudformation/route53resolver/aws-route53resolver-firewalldomainlist.go b/goformation/cloudformation/route53resolver/aws-route53resolver-firewalldomainlist.go
new file mode 100644
index 0000000000..54c6698686
--- /dev/null
+++ b/goformation/cloudformation/route53resolver/aws-route53resolver-firewalldomainlist.go
@@ -0,0 +1,124 @@
+package route53resolver
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// FirewallDomainList AWS CloudFormation Resource (AWS::Route53Resolver::FirewallDomainList)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewalldomainlist.html
+type FirewallDomainList struct {
+
+	// DomainFileUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewalldomainlist.html#cfn-route53resolver-firewalldomainlist-domainfileurl
+	DomainFileUrl *types.Value `json:"DomainFileUrl,omitempty"`
+
+	// Domains AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewalldomainlist.html#cfn-route53resolver-firewalldomainlist-domains
+	Domains *types.Value `json:"Domains,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewalldomainlist.html#cfn-route53resolver-firewalldomainlist-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewalldomainlist.html#cfn-route53resolver-firewalldomainlist-tags
+	Tags []cloudformation.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 *FirewallDomainList) AWSCloudFormationType() string {
+	return "AWS::Route53Resolver::FirewallDomainList"
+}
+
+// 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 FirewallDomainList) MarshalJSON() ([]byte, error) {
+	type Properties FirewallDomainList
+	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 *FirewallDomainList) UnmarshalJSON(b []byte) error {
+	type Properties FirewallDomainList
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FirewallDomainList(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup.go b/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup.go
new file mode 100644
index 0000000000..326d440fff
--- /dev/null
+++ b/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup.go
@@ -0,0 +1,119 @@
+package route53resolver
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// FirewallRuleGroup AWS CloudFormation Resource (AWS::Route53Resolver::FirewallRuleGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewallrulegroup.html
+type FirewallRuleGroup struct {
+
+	// FirewallRules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewallrulegroup.html#cfn-route53resolver-firewallrulegroup-firewallrules
+	FirewallRules []FirewallRuleGroup_FirewallRule `json:"FirewallRules,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewallrulegroup.html#cfn-route53resolver-firewallrulegroup-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewallrulegroup.html#cfn-route53resolver-firewallrulegroup-tags
+	Tags []cloudformation.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 *FirewallRuleGroup) AWSCloudFormationType() string {
+	return "AWS::Route53Resolver::FirewallRuleGroup"
+}
+
+// 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 FirewallRuleGroup) MarshalJSON() ([]byte, error) {
+	type Properties FirewallRuleGroup
+	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 *FirewallRuleGroup) UnmarshalJSON(b []byte) error {
+	type Properties FirewallRuleGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FirewallRuleGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup_firewallrule.go b/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup_firewallrule.go
new file mode 100644
index 0000000000..b9a32ee4c7
--- /dev/null
+++ b/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroup_firewallrule.go
@@ -0,0 +1,67 @@
+package route53resolver
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FirewallRuleGroup_FirewallRule AWS CloudFormation Resource (AWS::Route53Resolver::FirewallRuleGroup.FirewallRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53resolver-firewallrulegroup-firewallrule.html
+type FirewallRuleGroup_FirewallRule struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53resolver-firewallrulegroup-firewallrule.html#cfn-route53resolver-firewallrulegroup-firewallrule-action
+	Action *types.Value `json:"Action,omitempty"`
+
+	// BlockOverrideDnsType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53resolver-firewallrulegroup-firewallrule.html#cfn-route53resolver-firewallrulegroup-firewallrule-blockoverridednstype
+	BlockOverrideDnsType *types.Value `json:"BlockOverrideDnsType,omitempty"`
+
+	// BlockOverrideDomain AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53resolver-firewallrulegroup-firewallrule.html#cfn-route53resolver-firewallrulegroup-firewallrule-blockoverridedomain
+	BlockOverrideDomain *types.Value `json:"BlockOverrideDomain,omitempty"`
+
+	// BlockOverrideTtl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53resolver-firewallrulegroup-firewallrule.html#cfn-route53resolver-firewallrulegroup-firewallrule-blockoverridettl
+	BlockOverrideTtl *types.Value `json:"BlockOverrideTtl,omitempty"`
+
+	// BlockResponse AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53resolver-firewallrulegroup-firewallrule.html#cfn-route53resolver-firewallrulegroup-firewallrule-blockresponse
+	BlockResponse *types.Value `json:"BlockResponse,omitempty"`
+
+	// FirewallDomainListId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53resolver-firewallrulegroup-firewallrule.html#cfn-route53resolver-firewallrulegroup-firewallrule-firewalldomainlistid
+	FirewallDomainListId *types.Value `json:"FirewallDomainListId,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
+	Priority *types.Value `json:"Priority"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FirewallRuleGroup_FirewallRule) AWSCloudFormationType() string {
+	return "AWS::Route53Resolver::FirewallRuleGroup.FirewallRule"
+}
diff --git a/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroupassociation.go b/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroupassociation.go
new file mode 100644
index 0000000000..f9f516b4ef
--- /dev/null
+++ b/goformation/cloudformation/route53resolver/aws-route53resolver-firewallrulegroupassociation.go
@@ -0,0 +1,134 @@
+package route53resolver
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// FirewallRuleGroupAssociation AWS CloudFormation Resource (AWS::Route53Resolver::FirewallRuleGroupAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewallrulegroupassociation.html
+type FirewallRuleGroupAssociation struct {
+
+	// FirewallRuleGroupId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewallrulegroupassociation.html#cfn-route53resolver-firewallrulegroupassociation-firewallrulegroupid
+	FirewallRuleGroupId *types.Value `json:"FirewallRuleGroupId,omitempty"`
+
+	// MutationProtection AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewallrulegroupassociation.html#cfn-route53resolver-firewallrulegroupassociation-mutationprotection
+	MutationProtection *types.Value `json:"MutationProtection,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewallrulegroupassociation.html#cfn-route53resolver-firewallrulegroupassociation-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Priority AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewallrulegroupassociation.html#cfn-route53resolver-firewallrulegroupassociation-priority
+	Priority *types.Value `json:"Priority"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewallrulegroupassociation.html#cfn-route53resolver-firewallrulegroupassociation-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-firewallrulegroupassociation.html#cfn-route53resolver-firewallrulegroupassociation-vpcid
+	VpcId *types.Value `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 *FirewallRuleGroupAssociation) AWSCloudFormationType() string {
+	return "AWS::Route53Resolver::FirewallRuleGroupAssociation"
+}
+
+// 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 FirewallRuleGroupAssociation) MarshalJSON() ([]byte, error) {
+	type Properties FirewallRuleGroupAssociation
+	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 *FirewallRuleGroupAssociation) UnmarshalJSON(b []byte) error {
+	type Properties FirewallRuleGroupAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FirewallRuleGroupAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53resolver/aws-route53resolver-resolverconfig.go b/goformation/cloudformation/route53resolver/aws-route53resolver-resolverconfig.go
new file mode 100644
index 0000000000..76191c7400
--- /dev/null
+++ b/goformation/cloudformation/route53resolver/aws-route53resolver-resolverconfig.go
@@ -0,0 +1,113 @@
+package route53resolver
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResolverConfig AWS CloudFormation Resource (AWS::Route53Resolver::ResolverConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverconfig.html
+type ResolverConfig struct {
+
+	// AutodefinedReverseFlag AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverconfig.html#cfn-route53resolver-resolverconfig-autodefinedreverseflag
+	AutodefinedReverseFlag *types.Value `json:"AutodefinedReverseFlag,omitempty"`
+
+	// ResourceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverconfig.html#cfn-route53resolver-resolverconfig-resourceid
+	ResourceId *types.Value `json:"ResourceId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResolverConfig) AWSCloudFormationType() string {
+	return "AWS::Route53Resolver::ResolverConfig"
+}
+
+// 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 ResolverConfig) MarshalJSON() ([]byte, error) {
+	type Properties ResolverConfig
+	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 *ResolverConfig) UnmarshalJSON(b []byte) error {
+	type Properties ResolverConfig
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResolverConfig(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53resolver/aws-route53resolver-resolverdnssecconfig.go b/goformation/cloudformation/route53resolver/aws-route53resolver-resolverdnssecconfig.go
new file mode 100644
index 0000000000..0b0e9ba2c2
--- /dev/null
+++ b/goformation/cloudformation/route53resolver/aws-route53resolver-resolverdnssecconfig.go
@@ -0,0 +1,108 @@
+package route53resolver
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResolverDNSSECConfig AWS CloudFormation Resource (AWS::Route53Resolver::ResolverDNSSECConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverdnssecconfig.html
+type ResolverDNSSECConfig struct {
+
+	// ResourceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverdnssecconfig.html#cfn-route53resolver-resolverdnssecconfig-resourceid
+	ResourceId *types.Value `json:"ResourceId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResolverDNSSECConfig) AWSCloudFormationType() string {
+	return "AWS::Route53Resolver::ResolverDNSSECConfig"
+}
+
+// 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 ResolverDNSSECConfig) MarshalJSON() ([]byte, error) {
+	type Properties ResolverDNSSECConfig
+	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 *ResolverDNSSECConfig) UnmarshalJSON(b []byte) error {
+	type Properties ResolverDNSSECConfig
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResolverDNSSECConfig(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53resolver/aws-route53resolver-resolverendpoint.go b/goformation/cloudformation/route53resolver/aws-route53resolver-resolverendpoint.go
new file mode 100644
index 0000000000..16af774210
--- /dev/null
+++ b/goformation/cloudformation/route53resolver/aws-route53resolver-resolverendpoint.go
@@ -0,0 +1,129 @@
+package route53resolver
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResolverEndpoint AWS CloudFormation Resource (AWS::Route53Resolver::ResolverEndpoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html
+type ResolverEndpoint struct {
+
+	// Direction AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-direction
+	Direction *types.Value `json:"Direction,omitempty"`
+
+	// IpAddresses AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-ipaddresses
+	IpAddresses []ResolverEndpoint_IpAddressRequest `json:"IpAddresses,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverendpoint.html#cfn-route53resolver-resolverendpoint-tags
+	Tags []cloudformation.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 *ResolverEndpoint) AWSCloudFormationType() string {
+	return "AWS::Route53Resolver::ResolverEndpoint"
+}
+
+// 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 ResolverEndpoint) MarshalJSON() ([]byte, error) {
+	type Properties ResolverEndpoint
+	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 *ResolverEndpoint) UnmarshalJSON(b []byte) error {
+	type Properties ResolverEndpoint
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResolverEndpoint(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53resolver/aws-route53resolver-resolverendpoint_ipaddressrequest.go b/goformation/cloudformation/route53resolver/aws-route53resolver-resolverendpoint_ipaddressrequest.go
new file mode 100644
index 0000000000..5e5aae18e4
--- /dev/null
+++ b/goformation/cloudformation/route53resolver/aws-route53resolver-resolverendpoint_ipaddressrequest.go
@@ -0,0 +1,42 @@
+package route53resolver
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResolverEndpoint_IpAddressRequest AWS CloudFormation Resource (AWS::Route53Resolver::ResolverEndpoint.IpAddressRequest)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53resolver-resolverendpoint-ipaddressrequest.html
+type ResolverEndpoint_IpAddressRequest struct {
+
+	// Ip AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53resolver-resolverendpoint-ipaddressrequest.html#cfn-route53resolver-resolverendpoint-ipaddressrequest-ip
+	Ip *types.Value `json:"Ip,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53resolver-resolverendpoint-ipaddressrequest.html#cfn-route53resolver-resolverendpoint-ipaddressrequest-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResolverEndpoint_IpAddressRequest) AWSCloudFormationType() string {
+	return "AWS::Route53Resolver::ResolverEndpoint.IpAddressRequest"
+}
diff --git a/goformation/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfig.go b/goformation/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfig.go
new file mode 100644
index 0000000000..fc3daf884c
--- /dev/null
+++ b/goformation/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfig.go
@@ -0,0 +1,113 @@
+package route53resolver
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResolverQueryLoggingConfig AWS CloudFormation Resource (AWS::Route53Resolver::ResolverQueryLoggingConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverqueryloggingconfig.html
+type ResolverQueryLoggingConfig struct {
+
+	// DestinationArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverqueryloggingconfig.html#cfn-route53resolver-resolverqueryloggingconfig-destinationarn
+	DestinationArn *types.Value `json:"DestinationArn,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverqueryloggingconfig.html#cfn-route53resolver-resolverqueryloggingconfig-name
+	Name *types.Value `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 *ResolverQueryLoggingConfig) AWSCloudFormationType() string {
+	return "AWS::Route53Resolver::ResolverQueryLoggingConfig"
+}
+
+// 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 ResolverQueryLoggingConfig) MarshalJSON() ([]byte, error) {
+	type Properties ResolverQueryLoggingConfig
+	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 *ResolverQueryLoggingConfig) UnmarshalJSON(b []byte) error {
+	type Properties ResolverQueryLoggingConfig
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResolverQueryLoggingConfig(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfigassociation.go b/goformation/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfigassociation.go
new file mode 100644
index 0000000000..806fba34a7
--- /dev/null
+++ b/goformation/cloudformation/route53resolver/aws-route53resolver-resolverqueryloggingconfigassociation.go
@@ -0,0 +1,113 @@
+package route53resolver
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResolverQueryLoggingConfigAssociation AWS CloudFormation Resource (AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverqueryloggingconfigassociation.html
+type ResolverQueryLoggingConfigAssociation struct {
+
+	// ResolverQueryLogConfigId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverqueryloggingconfigassociation.html#cfn-route53resolver-resolverqueryloggingconfigassociation-resolverquerylogconfigid
+	ResolverQueryLogConfigId *types.Value `json:"ResolverQueryLogConfigId,omitempty"`
+
+	// ResourceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverqueryloggingconfigassociation.html#cfn-route53resolver-resolverqueryloggingconfigassociation-resourceid
+	ResourceId *types.Value `json:"ResourceId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResolverQueryLoggingConfigAssociation) AWSCloudFormationType() string {
+	return "AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation"
+}
+
+// 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 ResolverQueryLoggingConfigAssociation) MarshalJSON() ([]byte, error) {
+	type Properties ResolverQueryLoggingConfigAssociation
+	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 *ResolverQueryLoggingConfigAssociation) UnmarshalJSON(b []byte) error {
+	type Properties ResolverQueryLoggingConfigAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResolverQueryLoggingConfigAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53resolver/aws-route53resolver-resolverrule.go b/goformation/cloudformation/route53resolver/aws-route53resolver-resolverrule.go
new file mode 100644
index 0000000000..9d5cee618c
--- /dev/null
+++ b/goformation/cloudformation/route53resolver/aws-route53resolver-resolverrule.go
@@ -0,0 +1,134 @@
+package route53resolver
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResolverRule AWS CloudFormation Resource (AWS::Route53Resolver::ResolverRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html
+type ResolverRule struct {
+
+	// DomainName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ResolverEndpointId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-resolverendpointid
+	ResolverEndpointId *types.Value `json:"ResolverEndpointId,omitempty"`
+
+	// RuleType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-ruletype
+	RuleType *types.Value `json:"RuleType,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TargetIps AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverrule.html#cfn-route53resolver-resolverrule-targetips
+	TargetIps []ResolverRule_TargetAddress `json:"TargetIps,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResolverRule) AWSCloudFormationType() string {
+	return "AWS::Route53Resolver::ResolverRule"
+}
+
+// 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 ResolverRule) MarshalJSON() ([]byte, error) {
+	type Properties ResolverRule
+	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 *ResolverRule) UnmarshalJSON(b []byte) error {
+	type Properties ResolverRule
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResolverRule(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/route53resolver/aws-route53resolver-resolverrule_targetaddress.go b/goformation/cloudformation/route53resolver/aws-route53resolver-resolverrule_targetaddress.go
new file mode 100644
index 0000000000..bbb0987ca1
--- /dev/null
+++ b/goformation/cloudformation/route53resolver/aws-route53resolver-resolverrule_targetaddress.go
@@ -0,0 +1,42 @@
+package route53resolver
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResolverRule_TargetAddress AWS CloudFormation Resource (AWS::Route53Resolver::ResolverRule.TargetAddress)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53resolver-resolverrule-targetaddress.html
+type ResolverRule_TargetAddress struct {
+
+	// Ip AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53resolver-resolverrule-targetaddress.html#cfn-route53resolver-resolverrule-targetaddress-ip
+	Ip *types.Value `json:"Ip,omitempty"`
+
+	// Port AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-route53resolver-resolverrule-targetaddress.html#cfn-route53resolver-resolverrule-targetaddress-port
+	Port *types.Value `json:"Port,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResolverRule_TargetAddress) AWSCloudFormationType() string {
+	return "AWS::Route53Resolver::ResolverRule.TargetAddress"
+}
diff --git a/goformation/cloudformation/route53resolver/aws-route53resolver-resolverruleassociation.go b/goformation/cloudformation/route53resolver/aws-route53resolver-resolverruleassociation.go
new file mode 100644
index 0000000000..8cef6b72c1
--- /dev/null
+++ b/goformation/cloudformation/route53resolver/aws-route53resolver-resolverruleassociation.go
@@ -0,0 +1,118 @@
+package route53resolver
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResolverRuleAssociation AWS CloudFormation Resource (AWS::Route53Resolver::ResolverRuleAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html
+type ResolverRuleAssociation struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html#cfn-route53resolver-resolverruleassociation-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ResolverRuleId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html#cfn-route53resolver-resolverruleassociation-resolverruleid
+	ResolverRuleId *types.Value `json:"ResolverRuleId,omitempty"`
+
+	// VPCId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-route53resolver-resolverruleassociation.html#cfn-route53resolver-resolverruleassociation-vpcid
+	VPCId *types.Value `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 *ResolverRuleAssociation) AWSCloudFormationType() string {
+	return "AWS::Route53Resolver::ResolverRuleAssociation"
+}
+
+// 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 ResolverRuleAssociation) MarshalJSON() ([]byte, error) {
+	type Properties ResolverRuleAssociation
+	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 *ResolverRuleAssociation) UnmarshalJSON(b []byte) error {
+	type Properties ResolverRuleAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResolverRuleAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/rum/aws-rum-appmonitor.go b/goformation/cloudformation/rum/aws-rum-appmonitor.go
new file mode 100644
index 0000000000..83677545c4
--- /dev/null
+++ b/goformation/cloudformation/rum/aws-rum-appmonitor.go
@@ -0,0 +1,129 @@
+package rum
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// AppMonitor AWS CloudFormation Resource (AWS::RUM::AppMonitor)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rum-appmonitor.html
+type AppMonitor struct {
+
+	// AppMonitorConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rum-appmonitor.html#cfn-rum-appmonitor-appmonitorconfiguration
+	AppMonitorConfiguration *AppMonitor_AppMonitorConfiguration `json:"AppMonitorConfiguration,omitempty"`
+
+	// CwLogEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rum-appmonitor.html#cfn-rum-appmonitor-cwlogenabled
+	CwLogEnabled *types.Value `json:"CwLogEnabled,omitempty"`
+
+	// Domain AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rum-appmonitor.html#cfn-rum-appmonitor-domain
+	Domain *types.Value `json:"Domain,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rum-appmonitor.html#cfn-rum-appmonitor-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-rum-appmonitor.html#cfn-rum-appmonitor-tags
+	Tags []cloudformation.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 *AppMonitor) AWSCloudFormationType() string {
+	return "AWS::RUM::AppMonitor"
+}
+
+// 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 AppMonitor) MarshalJSON() ([]byte, error) {
+	type Properties AppMonitor
+	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 *AppMonitor) UnmarshalJSON(b []byte) error {
+	type Properties AppMonitor
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AppMonitor(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/rum/aws-rum-appmonitor_appmonitorconfiguration.go b/goformation/cloudformation/rum/aws-rum-appmonitor_appmonitorconfiguration.go
new file mode 100644
index 0000000000..a54f27ce66
--- /dev/null
+++ b/goformation/cloudformation/rum/aws-rum-appmonitor_appmonitorconfiguration.go
@@ -0,0 +1,77 @@
+package rum
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AppMonitor_AppMonitorConfiguration AWS CloudFormation Resource (AWS::RUM::AppMonitor.AppMonitorConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rum-appmonitor-appmonitorconfiguration.html
+type AppMonitor_AppMonitorConfiguration struct {
+
+	// AllowCookies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rum-appmonitor-appmonitorconfiguration.html#cfn-rum-appmonitor-appmonitorconfiguration-allowcookies
+	AllowCookies *types.Value `json:"AllowCookies,omitempty"`
+
+	// EnableXRay AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rum-appmonitor-appmonitorconfiguration.html#cfn-rum-appmonitor-appmonitorconfiguration-enablexray
+	EnableXRay *types.Value `json:"EnableXRay,omitempty"`
+
+	// ExcludedPages AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rum-appmonitor-appmonitorconfiguration.html#cfn-rum-appmonitor-appmonitorconfiguration-excludedpages
+	ExcludedPages *types.Value `json:"ExcludedPages,omitempty"`
+
+	// FavoritePages AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rum-appmonitor-appmonitorconfiguration.html#cfn-rum-appmonitor-appmonitorconfiguration-favoritepages
+	FavoritePages *types.Value `json:"FavoritePages,omitempty"`
+
+	// GuestRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rum-appmonitor-appmonitorconfiguration.html#cfn-rum-appmonitor-appmonitorconfiguration-guestrolearn
+	GuestRoleArn *types.Value `json:"GuestRoleArn,omitempty"`
+
+	// IdentityPoolId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rum-appmonitor-appmonitorconfiguration.html#cfn-rum-appmonitor-appmonitorconfiguration-identitypoolid
+	IdentityPoolId *types.Value `json:"IdentityPoolId,omitempty"`
+
+	// IncludedPages AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rum-appmonitor-appmonitorconfiguration.html#cfn-rum-appmonitor-appmonitorconfiguration-includedpages
+	IncludedPages *types.Value `json:"IncludedPages,omitempty"`
+
+	// SessionSampleRate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rum-appmonitor-appmonitorconfiguration.html#cfn-rum-appmonitor-appmonitorconfiguration-sessionsamplerate
+	SessionSampleRate *types.Value `json:"SessionSampleRate,omitempty"`
+
+	// Telemetries AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-rum-appmonitor-appmonitorconfiguration.html#cfn-rum-appmonitor-appmonitorconfiguration-telemetries
+	Telemetries *types.Value `json:"Telemetries,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AppMonitor_AppMonitorConfiguration) AWSCloudFormationType() string {
+	return "AWS::RUM::AppMonitor.AppMonitorConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-accesspoint.go b/goformation/cloudformation/s3/aws-s3-accesspoint.go
new file mode 100644
index 0000000000..b0e6e08244
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-accesspoint.go
@@ -0,0 +1,133 @@
+package s3
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPoint AWS CloudFormation Resource (AWS::S3::AccessPoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-accesspoint.html
+type AccessPoint struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-accesspoint.html#cfn-s3-accesspoint-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-accesspoint.html#cfn-s3-accesspoint-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Policy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-accesspoint.html#cfn-s3-accesspoint-policy
+	Policy interface{} `json:"Policy,omitempty"`
+
+	// PolicyStatus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-accesspoint.html#cfn-s3-accesspoint-policystatus
+	PolicyStatus interface{} `json:"PolicyStatus,omitempty"`
+
+	// PublicAccessBlockConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-accesspoint.html#cfn-s3-accesspoint-publicaccessblockconfiguration
+	PublicAccessBlockConfiguration *AccessPoint_PublicAccessBlockConfiguration `json:"PublicAccessBlockConfiguration,omitempty"`
+
+	// VpcConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-accesspoint.html#cfn-s3-accesspoint-vpcconfiguration
+	VpcConfiguration *AccessPoint_VpcConfiguration `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 *AccessPoint) AWSCloudFormationType() string {
+	return "AWS::S3::AccessPoint"
+}
+
+// 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 AccessPoint) MarshalJSON() ([]byte, error) {
+	type Properties AccessPoint
+	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 *AccessPoint) UnmarshalJSON(b []byte) error {
+	type Properties AccessPoint
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AccessPoint(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/s3/aws-s3-accesspoint_publicaccessblockconfiguration.go b/goformation/cloudformation/s3/aws-s3-accesspoint_publicaccessblockconfiguration.go
new file mode 100644
index 0000000000..b60726d007
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-accesspoint_publicaccessblockconfiguration.go
@@ -0,0 +1,52 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPoint_PublicAccessBlockConfiguration AWS CloudFormation Resource (AWS::S3::AccessPoint.PublicAccessBlockConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-accesspoint-publicaccessblockconfiguration.html
+type AccessPoint_PublicAccessBlockConfiguration struct {
+
+	// BlockPublicAcls AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-accesspoint-publicaccessblockconfiguration.html#cfn-s3-accesspoint-publicaccessblockconfiguration-blockpublicacls
+	BlockPublicAcls *types.Value `json:"BlockPublicAcls,omitempty"`
+
+	// BlockPublicPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-accesspoint-publicaccessblockconfiguration.html#cfn-s3-accesspoint-publicaccessblockconfiguration-blockpublicpolicy
+	BlockPublicPolicy *types.Value `json:"BlockPublicPolicy,omitempty"`
+
+	// IgnorePublicAcls AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-accesspoint-publicaccessblockconfiguration.html#cfn-s3-accesspoint-publicaccessblockconfiguration-ignorepublicacls
+	IgnorePublicAcls *types.Value `json:"IgnorePublicAcls,omitempty"`
+
+	// RestrictPublicBuckets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-accesspoint-publicaccessblockconfiguration.html#cfn-s3-accesspoint-publicaccessblockconfiguration-restrictpublicbuckets
+	RestrictPublicBuckets *types.Value `json:"RestrictPublicBuckets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AccessPoint_PublicAccessBlockConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::AccessPoint.PublicAccessBlockConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-accesspoint_vpcconfiguration.go b/goformation/cloudformation/s3/aws-s3-accesspoint_vpcconfiguration.go
new file mode 100644
index 0000000000..abefb8b802
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-accesspoint_vpcconfiguration.go
@@ -0,0 +1,37 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPoint_VpcConfiguration AWS CloudFormation Resource (AWS::S3::AccessPoint.VpcConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-accesspoint-vpcconfiguration.html
+type AccessPoint_VpcConfiguration struct {
+
+	// VpcId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-accesspoint-vpcconfiguration.html#cfn-s3-accesspoint-vpcconfiguration-vpcid
+	VpcId *types.Value `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 *AccessPoint_VpcConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::AccessPoint.VpcConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket.go b/goformation/cloudformation/s3/aws-s3-bucket.go
new file mode 100644
index 0000000000..b1f360984e
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket.go
@@ -0,0 +1,204 @@
+package s3
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket AWS CloudFormation Resource (AWS::S3::Bucket)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html
+type Bucket struct {
+
+	// AccelerateConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-accelerateconfiguration
+	AccelerateConfiguration *Bucket_AccelerateConfiguration `json:"AccelerateConfiguration,omitempty"`
+
+	// AccessControl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-accesscontrol
+	AccessControl *types.Value `json:"AccessControl,omitempty"`
+
+	// AnalyticsConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-analyticsconfigurations
+	AnalyticsConfigurations []Bucket_AnalyticsConfiguration `json:"AnalyticsConfigurations,omitempty"`
+
+	// BucketEncryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-bucketencryption
+	BucketEncryption *Bucket_BucketEncryption `json:"BucketEncryption,omitempty"`
+
+	// BucketName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-name
+	BucketName *types.Value `json:"BucketName,omitempty"`
+
+	// CorsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-crossoriginconfig
+	CorsConfiguration *Bucket_CorsConfiguration `json:"CorsConfiguration,omitempty"`
+
+	// IntelligentTieringConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-intelligenttieringconfigurations
+	IntelligentTieringConfigurations []Bucket_IntelligentTieringConfiguration `json:"IntelligentTieringConfigurations,omitempty"`
+
+	// InventoryConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-inventoryconfigurations
+	InventoryConfigurations []Bucket_InventoryConfiguration `json:"InventoryConfigurations,omitempty"`
+
+	// LifecycleConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-lifecycleconfig
+	LifecycleConfiguration *Bucket_LifecycleConfiguration `json:"LifecycleConfiguration,omitempty"`
+
+	// LoggingConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-loggingconfig
+	LoggingConfiguration *Bucket_LoggingConfiguration `json:"LoggingConfiguration,omitempty"`
+
+	// MetricsConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-metricsconfigurations
+	MetricsConfigurations []Bucket_MetricsConfiguration `json:"MetricsConfigurations,omitempty"`
+
+	// NotificationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-notification
+	NotificationConfiguration *Bucket_NotificationConfiguration `json:"NotificationConfiguration,omitempty"`
+
+	// ObjectLockConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-objectlockconfiguration
+	ObjectLockConfiguration *Bucket_ObjectLockConfiguration `json:"ObjectLockConfiguration,omitempty"`
+
+	// ObjectLockEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-objectlockenabled
+	ObjectLockEnabled *types.Value `json:"ObjectLockEnabled,omitempty"`
+
+	// OwnershipControls AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-ownershipcontrols
+	OwnershipControls *Bucket_OwnershipControls `json:"OwnershipControls,omitempty"`
+
+	// PublicAccessBlockConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-publicaccessblockconfiguration
+	PublicAccessBlockConfiguration *Bucket_PublicAccessBlockConfiguration `json:"PublicAccessBlockConfiguration,omitempty"`
+
+	// ReplicationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-replicationconfiguration
+	ReplicationConfiguration *Bucket_ReplicationConfiguration `json:"ReplicationConfiguration,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VersioningConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-versioning
+	VersioningConfiguration *Bucket_VersioningConfiguration `json:"VersioningConfiguration,omitempty"`
+
+	// WebsiteConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket.html#cfn-s3-bucket-websiteconfiguration
+	WebsiteConfiguration *Bucket_WebsiteConfiguration `json:"WebsiteConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket"
+}
+
+// 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 Bucket) MarshalJSON() ([]byte, error) {
+	type Properties Bucket
+	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 *Bucket) UnmarshalJSON(b []byte) error {
+	type Properties Bucket
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Bucket(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/s3/aws-s3-bucket_abortincompletemultipartupload.go b/goformation/cloudformation/s3/aws-s3-bucket_abortincompletemultipartupload.go
new file mode 100644
index 0000000000..dd07618cad
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_abortincompletemultipartupload.go
@@ -0,0 +1,37 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_AbortIncompleteMultipartUpload AWS CloudFormation Resource (AWS::S3::Bucket.AbortIncompleteMultipartUpload)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-abortincompletemultipartupload.html
+type Bucket_AbortIncompleteMultipartUpload struct {
+
+	// DaysAfterInitiation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-abortincompletemultipartupload.html#cfn-s3-bucket-abortincompletemultipartupload-daysafterinitiation
+	DaysAfterInitiation *types.Value `json:"DaysAfterInitiation"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_AbortIncompleteMultipartUpload) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.AbortIncompleteMultipartUpload"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_accelerateconfiguration.go b/goformation/cloudformation/s3/aws-s3-bucket_accelerateconfiguration.go
new file mode 100644
index 0000000000..73d2474cac
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_accelerateconfiguration.go
@@ -0,0 +1,37 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_AccelerateConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.AccelerateConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-accelerateconfiguration.html
+type Bucket_AccelerateConfiguration struct {
+
+	// AccelerationStatus AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-accelerateconfiguration.html#cfn-s3-bucket-accelerateconfiguration-accelerationstatus
+	AccelerationStatus *types.Value `json:"AccelerationStatus,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_AccelerateConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.AccelerateConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_accesscontroltranslation.go b/goformation/cloudformation/s3/aws-s3-bucket_accesscontroltranslation.go
new file mode 100644
index 0000000000..1b6da06b72
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_accesscontroltranslation.go
@@ -0,0 +1,37 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_AccessControlTranslation AWS CloudFormation Resource (AWS::S3::Bucket.AccessControlTranslation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-accesscontroltranslation.html
+type Bucket_AccessControlTranslation struct {
+
+	// Owner AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-accesscontroltranslation.html#cfn-s3-bucket-accesscontroltranslation-owner
+	Owner *types.Value `json:"Owner,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_AccessControlTranslation) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.AccessControlTranslation"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_analyticsconfiguration.go b/goformation/cloudformation/s3/aws-s3-bucket_analyticsconfiguration.go
new file mode 100644
index 0000000000..f2292839ae
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_analyticsconfiguration.go
@@ -0,0 +1,52 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_AnalyticsConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.AnalyticsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-analyticsconfiguration.html
+type Bucket_AnalyticsConfiguration struct {
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-analyticsconfiguration.html#cfn-s3-bucket-analyticsconfiguration-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-analyticsconfiguration.html#cfn-s3-bucket-analyticsconfiguration-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// StorageClassAnalysis AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-analyticsconfiguration.html#cfn-s3-bucket-analyticsconfiguration-storageclassanalysis
+	StorageClassAnalysis *Bucket_StorageClassAnalysis `json:"StorageClassAnalysis,omitempty"`
+
+	// TagFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-analyticsconfiguration.html#cfn-s3-bucket-analyticsconfiguration-tagfilters
+	TagFilters []Bucket_TagFilter `json:"TagFilters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_AnalyticsConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.AnalyticsConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_bucketencryption.go b/goformation/cloudformation/s3/aws-s3-bucket_bucketencryption.go
new file mode 100644
index 0000000000..615b099849
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_bucketencryption.go
@@ -0,0 +1,35 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_BucketEncryption AWS CloudFormation Resource (AWS::S3::Bucket.BucketEncryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-bucketencryption.html
+type Bucket_BucketEncryption struct {
+
+	// ServerSideEncryptionConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-bucketencryption.html#cfn-s3-bucket-bucketencryption-serversideencryptionconfiguration
+	ServerSideEncryptionConfiguration []Bucket_ServerSideEncryptionRule `json:"ServerSideEncryptionConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_BucketEncryption) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.BucketEncryption"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_corsconfiguration.go b/goformation/cloudformation/s3/aws-s3-bucket_corsconfiguration.go
new file mode 100644
index 0000000000..2aade6ab04
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_corsconfiguration.go
@@ -0,0 +1,35 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_CorsConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.CorsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-cors.html
+type Bucket_CorsConfiguration struct {
+
+	// CorsRules AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-cors.html#cfn-s3-bucket-cors-corsrule
+	CorsRules []Bucket_CorsRule `json:"CorsRules,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_CorsConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.CorsConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_corsrule.go b/goformation/cloudformation/s3/aws-s3-bucket_corsrule.go
new file mode 100644
index 0000000000..c122071756
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_corsrule.go
@@ -0,0 +1,62 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_CorsRule AWS CloudFormation Resource (AWS::S3::Bucket.CorsRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-cors-corsrule.html
+type Bucket_CorsRule struct {
+
+	// AllowedHeaders AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-cors-corsrule.html#cfn-s3-bucket-cors-corsrule-allowedheaders
+	AllowedHeaders *types.Value `json:"AllowedHeaders,omitempty"`
+
+	// AllowedMethods AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-cors-corsrule.html#cfn-s3-bucket-cors-corsrule-allowedmethods
+	AllowedMethods *types.Value `json:"AllowedMethods,omitempty"`
+
+	// AllowedOrigins AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-cors-corsrule.html#cfn-s3-bucket-cors-corsrule-allowedorigins
+	AllowedOrigins *types.Value `json:"AllowedOrigins,omitempty"`
+
+	// ExposedHeaders AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-cors-corsrule.html#cfn-s3-bucket-cors-corsrule-exposedheaders
+	ExposedHeaders *types.Value `json:"ExposedHeaders,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-cors-corsrule.html#cfn-s3-bucket-cors-corsrule-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// MaxAge AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-cors-corsrule.html#cfn-s3-bucket-cors-corsrule-maxage
+	MaxAge *types.Value `json:"MaxAge,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_CorsRule) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.CorsRule"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_dataexport.go b/goformation/cloudformation/s3/aws-s3-bucket_dataexport.go
new file mode 100644
index 0000000000..22667c7246
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_dataexport.go
@@ -0,0 +1,42 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_DataExport AWS CloudFormation Resource (AWS::S3::Bucket.DataExport)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-dataexport.html
+type Bucket_DataExport struct {
+
+	// Destination AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-dataexport.html#cfn-s3-bucket-dataexport-destination
+	Destination *Bucket_Destination `json:"Destination,omitempty"`
+
+	// OutputSchemaVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-dataexport.html#cfn-s3-bucket-dataexport-outputschemaversion
+	OutputSchemaVersion *types.Value `json:"OutputSchemaVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_DataExport) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.DataExport"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_defaultretention.go b/goformation/cloudformation/s3/aws-s3-bucket_defaultretention.go
new file mode 100644
index 0000000000..dca635db8a
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_defaultretention.go
@@ -0,0 +1,47 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_DefaultRetention AWS CloudFormation Resource (AWS::S3::Bucket.DefaultRetention)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-defaultretention.html
+type Bucket_DefaultRetention struct {
+
+	// Days AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-defaultretention.html#cfn-s3-bucket-defaultretention-days
+	Days *types.Value `json:"Days,omitempty"`
+
+	// Mode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-defaultretention.html#cfn-s3-bucket-defaultretention-mode
+	Mode *types.Value `json:"Mode,omitempty"`
+
+	// Years AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-defaultretention.html#cfn-s3-bucket-defaultretention-years
+	Years *types.Value `json:"Years,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_DefaultRetention) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.DefaultRetention"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_deletemarkerreplication.go b/goformation/cloudformation/s3/aws-s3-bucket_deletemarkerreplication.go
new file mode 100644
index 0000000000..df1745f09a
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_deletemarkerreplication.go
@@ -0,0 +1,37 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_DeleteMarkerReplication AWS CloudFormation Resource (AWS::S3::Bucket.DeleteMarkerReplication)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-deletemarkerreplication.html
+type Bucket_DeleteMarkerReplication struct {
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-deletemarkerreplication.html#cfn-s3-bucket-deletemarkerreplication-status
+	Status *types.Value `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 *Bucket_DeleteMarkerReplication) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.DeleteMarkerReplication"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_destination.go b/goformation/cloudformation/s3/aws-s3-bucket_destination.go
new file mode 100644
index 0000000000..6c4b1682a3
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_destination.go
@@ -0,0 +1,52 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_Destination AWS CloudFormation Resource (AWS::S3::Bucket.Destination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-destination.html
+type Bucket_Destination struct {
+
+	// BucketAccountId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-destination.html#cfn-s3-bucket-destination-bucketaccountid
+	BucketAccountId *types.Value `json:"BucketAccountId,omitempty"`
+
+	// BucketArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-destination.html#cfn-s3-bucket-destination-bucketarn
+	BucketArn *types.Value `json:"BucketArn,omitempty"`
+
+	// Format AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-destination.html#cfn-s3-bucket-destination-format
+	Format *types.Value `json:"Format,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-destination.html#cfn-s3-bucket-destination-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_Destination) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.Destination"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_encryptionconfiguration.go b/goformation/cloudformation/s3/aws-s3-bucket_encryptionconfiguration.go
new file mode 100644
index 0000000000..6a7bcc1060
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_encryptionconfiguration.go
@@ -0,0 +1,37 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_EncryptionConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.EncryptionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-encryptionconfiguration.html
+type Bucket_EncryptionConfiguration struct {
+
+	// ReplicaKmsKeyID AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-encryptionconfiguration.html#cfn-s3-bucket-encryptionconfiguration-replicakmskeyid
+	ReplicaKmsKeyID *types.Value `json:"ReplicaKmsKeyID,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_EncryptionConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.EncryptionConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_eventbridgeconfiguration.go b/goformation/cloudformation/s3/aws-s3-bucket_eventbridgeconfiguration.go
new file mode 100644
index 0000000000..ee8ae3e867
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_eventbridgeconfiguration.go
@@ -0,0 +1,37 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_EventBridgeConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.EventBridgeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-eventbridgeconfig.html
+type Bucket_EventBridgeConfiguration struct {
+
+	// EventBridgeEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-eventbridgeconfig.html#cfn-s3-bucket-eventbridgeconfiguration-eventbridgeenabled
+	EventBridgeEnabled *types.Value `json:"EventBridgeEnabled,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_EventBridgeConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.EventBridgeConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_filterrule.go b/goformation/cloudformation/s3/aws-s3-bucket_filterrule.go
new file mode 100644
index 0000000000..fb3e2b959d
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_filterrule.go
@@ -0,0 +1,42 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_FilterRule AWS CloudFormation Resource (AWS::S3::Bucket.FilterRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter-s3key-rules.html
+type Bucket_FilterRule struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter-s3key-rules.html#cfn-s3-bucket-notificationconfiguraiton-config-filter-s3key-rules-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter-s3key-rules.html#cfn-s3-bucket-notificationconfiguraiton-config-filter-s3key-rules-value
+	Value *types.Value `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 *Bucket_FilterRule) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.FilterRule"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_intelligenttieringconfiguration.go b/goformation/cloudformation/s3/aws-s3-bucket_intelligenttieringconfiguration.go
new file mode 100644
index 0000000000..69405c5ed9
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_intelligenttieringconfiguration.go
@@ -0,0 +1,57 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_IntelligentTieringConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.IntelligentTieringConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-intelligenttieringconfiguration.html
+type Bucket_IntelligentTieringConfiguration struct {
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-intelligenttieringconfiguration.html#cfn-s3-bucket-intelligenttieringconfiguration-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-intelligenttieringconfiguration.html#cfn-s3-bucket-intelligenttieringconfiguration-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-intelligenttieringconfiguration.html#cfn-s3-bucket-intelligenttieringconfiguration-status
+	Status *types.Value `json:"Status,omitempty"`
+
+	// TagFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-intelligenttieringconfiguration.html#cfn-s3-bucket-intelligenttieringconfiguration-tagfilters
+	TagFilters []Bucket_TagFilter `json:"TagFilters,omitempty"`
+
+	// Tierings AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-intelligenttieringconfiguration.html#cfn-s3-bucket-intelligenttieringconfiguration-tierings
+	Tierings []Bucket_Tiering `json:"Tierings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_IntelligentTieringConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.IntelligentTieringConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_inventoryconfiguration.go b/goformation/cloudformation/s3/aws-s3-bucket_inventoryconfiguration.go
new file mode 100644
index 0000000000..be36b53183
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_inventoryconfiguration.go
@@ -0,0 +1,67 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_InventoryConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.InventoryConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-inventoryconfiguration.html
+type Bucket_InventoryConfiguration struct {
+
+	// Destination AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-inventoryconfiguration.html#cfn-s3-bucket-inventoryconfiguration-destination
+	Destination *Bucket_Destination `json:"Destination,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-inventoryconfiguration.html#cfn-s3-bucket-inventoryconfiguration-enabled
+	Enabled *types.Value `json:"Enabled"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-inventoryconfiguration.html#cfn-s3-bucket-inventoryconfiguration-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// IncludedObjectVersions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-inventoryconfiguration.html#cfn-s3-bucket-inventoryconfiguration-includedobjectversions
+	IncludedObjectVersions *types.Value `json:"IncludedObjectVersions,omitempty"`
+
+	// OptionalFields AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-inventoryconfiguration.html#cfn-s3-bucket-inventoryconfiguration-optionalfields
+	OptionalFields *types.Value `json:"OptionalFields,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-inventoryconfiguration.html#cfn-s3-bucket-inventoryconfiguration-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// ScheduleFrequency AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-inventoryconfiguration.html#cfn-s3-bucket-inventoryconfiguration-schedulefrequency
+	ScheduleFrequency *types.Value `json:"ScheduleFrequency,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_InventoryConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.InventoryConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_lambdaconfiguration.go b/goformation/cloudformation/s3/aws-s3-bucket_lambdaconfiguration.go
new file mode 100644
index 0000000000..1732a4afd8
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_lambdaconfiguration.go
@@ -0,0 +1,47 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_LambdaConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.LambdaConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-lambdaconfig.html
+type Bucket_LambdaConfiguration struct {
+
+	// Event AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-lambdaconfig.html#cfn-s3-bucket-notificationconfig-lambdaconfig-event
+	Event *types.Value `json:"Event,omitempty"`
+
+	// Filter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-lambdaconfig.html#cfn-s3-bucket-notificationconfig-lambdaconfig-filter
+	Filter *Bucket_NotificationFilter `json:"Filter,omitempty"`
+
+	// Function AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-lambdaconfig.html#cfn-s3-bucket-notificationconfig-lambdaconfig-function
+	Function *types.Value `json:"Function,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_LambdaConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.LambdaConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_lifecycleconfiguration.go b/goformation/cloudformation/s3/aws-s3-bucket_lifecycleconfiguration.go
new file mode 100644
index 0000000000..1442da3a07
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_lifecycleconfiguration.go
@@ -0,0 +1,35 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_LifecycleConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.LifecycleConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig.html
+type Bucket_LifecycleConfiguration struct {
+
+	// Rules AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig.html#cfn-s3-bucket-lifecycleconfig-rules
+	Rules []Bucket_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 *Bucket_LifecycleConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.LifecycleConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_loggingconfiguration.go b/goformation/cloudformation/s3/aws-s3-bucket_loggingconfiguration.go
new file mode 100644
index 0000000000..294a73d7dc
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_loggingconfiguration.go
@@ -0,0 +1,42 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_LoggingConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.LoggingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-loggingconfig.html
+type Bucket_LoggingConfiguration struct {
+
+	// DestinationBucketName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-loggingconfig.html#cfn-s3-bucket-loggingconfig-destinationbucketname
+	DestinationBucketName *types.Value `json:"DestinationBucketName,omitempty"`
+
+	// LogFilePrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-loggingconfig.html#cfn-s3-bucket-loggingconfig-logfileprefix
+	LogFilePrefix *types.Value `json:"LogFilePrefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_LoggingConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.LoggingConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_metrics.go b/goformation/cloudformation/s3/aws-s3-bucket_metrics.go
new file mode 100644
index 0000000000..383c30a8dd
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_metrics.go
@@ -0,0 +1,42 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_Metrics AWS CloudFormation Resource (AWS::S3::Bucket.Metrics)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-metrics.html
+type Bucket_Metrics struct {
+
+	// EventThreshold AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-metrics.html#cfn-s3-bucket-metrics-eventthreshold
+	EventThreshold *Bucket_ReplicationTimeValue `json:"EventThreshold,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-metrics.html#cfn-s3-bucket-metrics-status
+	Status *types.Value `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 *Bucket_Metrics) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.Metrics"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_metricsconfiguration.go b/goformation/cloudformation/s3/aws-s3-bucket_metricsconfiguration.go
new file mode 100644
index 0000000000..ef3bcc213b
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_metricsconfiguration.go
@@ -0,0 +1,52 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_MetricsConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.MetricsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-metricsconfiguration.html
+type Bucket_MetricsConfiguration struct {
+
+	// AccessPointArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-metricsconfiguration.html#cfn-s3-bucket-metricsconfiguration-accesspointarn
+	AccessPointArn *types.Value `json:"AccessPointArn,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-metricsconfiguration.html#cfn-s3-bucket-metricsconfiguration-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-metricsconfiguration.html#cfn-s3-bucket-metricsconfiguration-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// TagFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-metricsconfiguration.html#cfn-s3-bucket-metricsconfiguration-tagfilters
+	TagFilters []Bucket_TagFilter `json:"TagFilters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_MetricsConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.MetricsConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_noncurrentversionexpiration.go b/goformation/cloudformation/s3/aws-s3-bucket_noncurrentversionexpiration.go
new file mode 100644
index 0000000000..4f6693dc8a
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_noncurrentversionexpiration.go
@@ -0,0 +1,42 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_NoncurrentVersionExpiration AWS CloudFormation Resource (AWS::S3::Bucket.NoncurrentVersionExpiration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule-noncurrentversionexpiration.html
+type Bucket_NoncurrentVersionExpiration struct {
+
+	// NewerNoncurrentVersions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule-noncurrentversionexpiration.html#cfn-s3-bucket-lifecycleconfig-rule-noncurrentversionexpiration-newernoncurrentversions
+	NewerNoncurrentVersions *types.Value `json:"NewerNoncurrentVersions,omitempty"`
+
+	// NoncurrentDays AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule-noncurrentversionexpiration.html#cfn-s3-bucket-lifecycleconfig-rule-noncurrentversionexpiration-noncurrentdays
+	NoncurrentDays *types.Value `json:"NoncurrentDays"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_NoncurrentVersionExpiration) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.NoncurrentVersionExpiration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_noncurrentversiontransition.go b/goformation/cloudformation/s3/aws-s3-bucket_noncurrentversiontransition.go
new file mode 100644
index 0000000000..a3c94c2110
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_noncurrentversiontransition.go
@@ -0,0 +1,47 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_NoncurrentVersionTransition AWS CloudFormation Resource (AWS::S3::Bucket.NoncurrentVersionTransition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule-noncurrentversiontransition.html
+type Bucket_NoncurrentVersionTransition struct {
+
+	// NewerNoncurrentVersions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule-noncurrentversiontransition.html#cfn-s3-bucket-lifecycleconfig-rule-noncurrentversiontransition-newernoncurrentversions
+	NewerNoncurrentVersions *types.Value `json:"NewerNoncurrentVersions,omitempty"`
+
+	// StorageClass AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule-noncurrentversiontransition.html#cfn-s3-bucket-lifecycleconfig-rule-noncurrentversiontransition-storageclass
+	StorageClass *types.Value `json:"StorageClass,omitempty"`
+
+	// TransitionInDays AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule-noncurrentversiontransition.html#cfn-s3-bucket-lifecycleconfig-rule-noncurrentversiontransition-transitionindays
+	TransitionInDays *types.Value `json:"TransitionInDays"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_NoncurrentVersionTransition) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.NoncurrentVersionTransition"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_notificationconfiguration.go b/goformation/cloudformation/s3/aws-s3-bucket_notificationconfiguration.go
new file mode 100644
index 0000000000..6a95b43dc9
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_notificationconfiguration.go
@@ -0,0 +1,50 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_NotificationConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.NotificationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig.html
+type Bucket_NotificationConfiguration struct {
+
+	// EventBridgeConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig.html#cfn-s3-bucket-notificationconfig-eventbridgeconfig
+	EventBridgeConfiguration *Bucket_EventBridgeConfiguration `json:"EventBridgeConfiguration,omitempty"`
+
+	// LambdaConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig.html#cfn-s3-bucket-notificationconfig-lambdaconfig
+	LambdaConfigurations []Bucket_LambdaConfiguration `json:"LambdaConfigurations,omitempty"`
+
+	// QueueConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig.html#cfn-s3-bucket-notificationconfig-queueconfig
+	QueueConfigurations []Bucket_QueueConfiguration `json:"QueueConfigurations,omitempty"`
+
+	// TopicConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig.html#cfn-s3-bucket-notificationconfig-topicconfig
+	TopicConfigurations []Bucket_TopicConfiguration `json:"TopicConfigurations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_NotificationConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.NotificationConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_notificationfilter.go b/goformation/cloudformation/s3/aws-s3-bucket_notificationfilter.go
new file mode 100644
index 0000000000..6ceaf9dceb
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_notificationfilter.go
@@ -0,0 +1,35 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_NotificationFilter AWS CloudFormation Resource (AWS::S3::Bucket.NotificationFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter.html
+type Bucket_NotificationFilter struct {
+
+	// S3Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter.html#cfn-s3-bucket-notificationconfiguraiton-config-filter-s3key
+	S3Key *Bucket_S3KeyFilter `json:"S3Key,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_NotificationFilter) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.NotificationFilter"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_objectlockconfiguration.go b/goformation/cloudformation/s3/aws-s3-bucket_objectlockconfiguration.go
new file mode 100644
index 0000000000..6cb41186b3
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_objectlockconfiguration.go
@@ -0,0 +1,42 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_ObjectLockConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.ObjectLockConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-objectlockconfiguration.html
+type Bucket_ObjectLockConfiguration struct {
+
+	// ObjectLockEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-objectlockconfiguration.html#cfn-s3-bucket-objectlockconfiguration-objectlockenabled
+	ObjectLockEnabled *types.Value `json:"ObjectLockEnabled,omitempty"`
+
+	// Rule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-objectlockconfiguration.html#cfn-s3-bucket-objectlockconfiguration-rule
+	Rule *Bucket_ObjectLockRule `json:"Rule,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_ObjectLockConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.ObjectLockConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_objectlockrule.go b/goformation/cloudformation/s3/aws-s3-bucket_objectlockrule.go
new file mode 100644
index 0000000000..bb55d11201
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_objectlockrule.go
@@ -0,0 +1,35 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_ObjectLockRule AWS CloudFormation Resource (AWS::S3::Bucket.ObjectLockRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-objectlockrule.html
+type Bucket_ObjectLockRule struct {
+
+	// DefaultRetention AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-objectlockrule.html#cfn-s3-bucket-objectlockrule-defaultretention
+	DefaultRetention *Bucket_DefaultRetention `json:"DefaultRetention,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_ObjectLockRule) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.ObjectLockRule"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_ownershipcontrols.go b/goformation/cloudformation/s3/aws-s3-bucket_ownershipcontrols.go
new file mode 100644
index 0000000000..bf0c16a0e2
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_ownershipcontrols.go
@@ -0,0 +1,35 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_OwnershipControls AWS CloudFormation Resource (AWS::S3::Bucket.OwnershipControls)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-ownershipcontrols.html
+type Bucket_OwnershipControls struct {
+
+	// Rules AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-ownershipcontrols.html#cfn-s3-bucket-ownershipcontrols-rules
+	Rules []Bucket_OwnershipControlsRule `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 *Bucket_OwnershipControls) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.OwnershipControls"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_ownershipcontrolsrule.go b/goformation/cloudformation/s3/aws-s3-bucket_ownershipcontrolsrule.go
new file mode 100644
index 0000000000..78fd0c8ee3
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_ownershipcontrolsrule.go
@@ -0,0 +1,37 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_OwnershipControlsRule AWS CloudFormation Resource (AWS::S3::Bucket.OwnershipControlsRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-ownershipcontrolsrule.html
+type Bucket_OwnershipControlsRule struct {
+
+	// ObjectOwnership AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-ownershipcontrolsrule.html#cfn-s3-bucket-ownershipcontrolsrule-objectownership
+	ObjectOwnership *types.Value `json:"ObjectOwnership,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_OwnershipControlsRule) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.OwnershipControlsRule"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_publicaccessblockconfiguration.go b/goformation/cloudformation/s3/aws-s3-bucket_publicaccessblockconfiguration.go
new file mode 100644
index 0000000000..863e128b30
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_publicaccessblockconfiguration.go
@@ -0,0 +1,52 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_PublicAccessBlockConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.PublicAccessBlockConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-publicaccessblockconfiguration.html
+type Bucket_PublicAccessBlockConfiguration struct {
+
+	// BlockPublicAcls AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-publicaccessblockconfiguration.html#cfn-s3-bucket-publicaccessblockconfiguration-blockpublicacls
+	BlockPublicAcls *types.Value `json:"BlockPublicAcls,omitempty"`
+
+	// BlockPublicPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-publicaccessblockconfiguration.html#cfn-s3-bucket-publicaccessblockconfiguration-blockpublicpolicy
+	BlockPublicPolicy *types.Value `json:"BlockPublicPolicy,omitempty"`
+
+	// IgnorePublicAcls AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-publicaccessblockconfiguration.html#cfn-s3-bucket-publicaccessblockconfiguration-ignorepublicacls
+	IgnorePublicAcls *types.Value `json:"IgnorePublicAcls,omitempty"`
+
+	// RestrictPublicBuckets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-publicaccessblockconfiguration.html#cfn-s3-bucket-publicaccessblockconfiguration-restrictpublicbuckets
+	RestrictPublicBuckets *types.Value `json:"RestrictPublicBuckets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_PublicAccessBlockConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.PublicAccessBlockConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_queueconfiguration.go b/goformation/cloudformation/s3/aws-s3-bucket_queueconfiguration.go
new file mode 100644
index 0000000000..b04fb6c303
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_queueconfiguration.go
@@ -0,0 +1,47 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_QueueConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.QueueConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-queueconfig.html
+type Bucket_QueueConfiguration struct {
+
+	// Event AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-queueconfig.html#cfn-s3-bucket-notificationconfig-queueconfig-event
+	Event *types.Value `json:"Event,omitempty"`
+
+	// Filter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-queueconfig.html#cfn-s3-bucket-notificationconfig-queueconfig-filter
+	Filter *Bucket_NotificationFilter `json:"Filter,omitempty"`
+
+	// Queue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-queueconfig.html#cfn-s3-bucket-notificationconfig-queueconfig-queue
+	Queue *types.Value `json:"Queue,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_QueueConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.QueueConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_redirectallrequeststo.go b/goformation/cloudformation/s3/aws-s3-bucket_redirectallrequeststo.go
new file mode 100644
index 0000000000..e79df2504d
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_redirectallrequeststo.go
@@ -0,0 +1,42 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_RedirectAllRequestsTo AWS CloudFormation Resource (AWS::S3::Bucket.RedirectAllRequestsTo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-redirectallrequeststo.html
+type Bucket_RedirectAllRequestsTo struct {
+
+	// HostName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-redirectallrequeststo.html#cfn-s3-websiteconfiguration-redirectallrequeststo-hostname
+	HostName *types.Value `json:"HostName,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-redirectallrequeststo.html#cfn-s3-websiteconfiguration-redirectallrequeststo-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_RedirectAllRequestsTo) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.RedirectAllRequestsTo"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_redirectrule.go b/goformation/cloudformation/s3/aws-s3-bucket_redirectrule.go
new file mode 100644
index 0000000000..6c327f0b52
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_redirectrule.go
@@ -0,0 +1,57 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_RedirectRule AWS CloudFormation Resource (AWS::S3::Bucket.RedirectRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules-redirectrule.html
+type Bucket_RedirectRule struct {
+
+	// HostName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules-redirectrule.html#cfn-s3-websiteconfiguration-redirectrule-hostname
+	HostName *types.Value `json:"HostName,omitempty"`
+
+	// HttpRedirectCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules-redirectrule.html#cfn-s3-websiteconfiguration-redirectrule-httpredirectcode
+	HttpRedirectCode *types.Value `json:"HttpRedirectCode,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules-redirectrule.html#cfn-s3-websiteconfiguration-redirectrule-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// ReplaceKeyPrefixWith AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules-redirectrule.html#cfn-s3-websiteconfiguration-redirectrule-replacekeyprefixwith
+	ReplaceKeyPrefixWith *types.Value `json:"ReplaceKeyPrefixWith,omitempty"`
+
+	// ReplaceKeyWith AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules-redirectrule.html#cfn-s3-websiteconfiguration-redirectrule-replacekeywith
+	ReplaceKeyWith *types.Value `json:"ReplaceKeyWith,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_RedirectRule) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.RedirectRule"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_replicamodifications.go b/goformation/cloudformation/s3/aws-s3-bucket_replicamodifications.go
new file mode 100644
index 0000000000..54670dcc1a
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_replicamodifications.go
@@ -0,0 +1,37 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_ReplicaModifications AWS CloudFormation Resource (AWS::S3::Bucket.ReplicaModifications)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicamodifications.html
+type Bucket_ReplicaModifications struct {
+
+	// Status AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicamodifications.html#cfn-s3-bucket-replicamodifications-status
+	Status *types.Value `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 *Bucket_ReplicaModifications) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.ReplicaModifications"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_replicationconfiguration.go b/goformation/cloudformation/s3/aws-s3-bucket_replicationconfiguration.go
new file mode 100644
index 0000000000..84d66c9298
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_replicationconfiguration.go
@@ -0,0 +1,42 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_ReplicationConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.ReplicationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration.html
+type Bucket_ReplicationConfiguration struct {
+
+	// Role AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration.html#cfn-s3-bucket-replicationconfiguration-role
+	Role *types.Value `json:"Role,omitempty"`
+
+	// Rules AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration.html#cfn-s3-bucket-replicationconfiguration-rules
+	Rules []Bucket_ReplicationRule `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 *Bucket_ReplicationConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.ReplicationConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_replicationdestination.go b/goformation/cloudformation/s3/aws-s3-bucket_replicationdestination.go
new file mode 100644
index 0000000000..40ead3c5e6
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_replicationdestination.go
@@ -0,0 +1,67 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_ReplicationDestination AWS CloudFormation Resource (AWS::S3::Bucket.ReplicationDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules-destination.html
+type Bucket_ReplicationDestination struct {
+
+	// AccessControlTranslation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules-destination.html#cfn-s3-bucket-replicationdestination-accesscontroltranslation
+	AccessControlTranslation *Bucket_AccessControlTranslation `json:"AccessControlTranslation,omitempty"`
+
+	// Account AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules-destination.html#cfn-s3-bucket-replicationdestination-account
+	Account *types.Value `json:"Account,omitempty"`
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules-destination.html#cfn-s3-bucket-replicationconfiguration-rules-destination-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// EncryptionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules-destination.html#cfn-s3-bucket-replicationdestination-encryptionconfiguration
+	EncryptionConfiguration *Bucket_EncryptionConfiguration `json:"EncryptionConfiguration,omitempty"`
+
+	// Metrics AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules-destination.html#cfn-s3-bucket-replicationdestination-metrics
+	Metrics *Bucket_Metrics `json:"Metrics,omitempty"`
+
+	// ReplicationTime AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules-destination.html#cfn-s3-bucket-replicationdestination-replicationtime
+	ReplicationTime *Bucket_ReplicationTime `json:"ReplicationTime,omitempty"`
+
+	// StorageClass AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules-destination.html#cfn-s3-bucket-replicationconfiguration-rules-destination-storageclass
+	StorageClass *types.Value `json:"StorageClass,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_ReplicationDestination) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.ReplicationDestination"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_replicationrule.go b/goformation/cloudformation/s3/aws-s3-bucket_replicationrule.go
new file mode 100644
index 0000000000..d63cd6e395
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_replicationrule.go
@@ -0,0 +1,72 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_ReplicationRule AWS CloudFormation Resource (AWS::S3::Bucket.ReplicationRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules.html
+type Bucket_ReplicationRule struct {
+
+	// DeleteMarkerReplication AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules.html#cfn-s3-bucket-replicationrule-deletemarkerreplication
+	DeleteMarkerReplication *Bucket_DeleteMarkerReplication `json:"DeleteMarkerReplication,omitempty"`
+
+	// Destination AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules.html#cfn-s3-bucket-replicationconfiguration-rules-destination
+	Destination *Bucket_ReplicationDestination `json:"Destination,omitempty"`
+
+	// Filter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules.html#cfn-s3-bucket-replicationrule-filter
+	Filter *Bucket_ReplicationRuleFilter `json:"Filter,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules.html#cfn-s3-bucket-replicationconfiguration-rules-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules.html#cfn-s3-bucket-replicationconfiguration-rules-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// Priority AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules.html#cfn-s3-bucket-replicationrule-priority
+	Priority *types.Value `json:"Priority,omitempty"`
+
+	// SourceSelectionCriteria AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules.html#cfn-s3-bucket-replicationrule-sourceselectioncriteria
+	SourceSelectionCriteria *Bucket_SourceSelectionCriteria `json:"SourceSelectionCriteria,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationconfiguration-rules.html#cfn-s3-bucket-replicationconfiguration-rules-status
+	Status *types.Value `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 *Bucket_ReplicationRule) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.ReplicationRule"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_replicationruleandoperator.go b/goformation/cloudformation/s3/aws-s3-bucket_replicationruleandoperator.go
new file mode 100644
index 0000000000..5dda6eb24e
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_replicationruleandoperator.go
@@ -0,0 +1,42 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_ReplicationRuleAndOperator AWS CloudFormation Resource (AWS::S3::Bucket.ReplicationRuleAndOperator)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationruleandoperator.html
+type Bucket_ReplicationRuleAndOperator struct {
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationruleandoperator.html#cfn-s3-bucket-replicationruleandoperator-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// TagFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationruleandoperator.html#cfn-s3-bucket-replicationruleandoperator-tagfilters
+	TagFilters []Bucket_TagFilter `json:"TagFilters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_ReplicationRuleAndOperator) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.ReplicationRuleAndOperator"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_replicationrulefilter.go b/goformation/cloudformation/s3/aws-s3-bucket_replicationrulefilter.go
new file mode 100644
index 0000000000..20881acee4
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_replicationrulefilter.go
@@ -0,0 +1,47 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_ReplicationRuleFilter AWS CloudFormation Resource (AWS::S3::Bucket.ReplicationRuleFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationrulefilter.html
+type Bucket_ReplicationRuleFilter struct {
+
+	// And AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationrulefilter.html#cfn-s3-bucket-replicationrulefilter-and
+	And *Bucket_ReplicationRuleAndOperator `json:"And,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationrulefilter.html#cfn-s3-bucket-replicationrulefilter-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// TagFilter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationrulefilter.html#cfn-s3-bucket-replicationrulefilter-tagfilter
+	TagFilter *Bucket_TagFilter `json:"TagFilter,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_ReplicationRuleFilter) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.ReplicationRuleFilter"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_replicationtime.go b/goformation/cloudformation/s3/aws-s3-bucket_replicationtime.go
new file mode 100644
index 0000000000..3bc7465f4b
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_replicationtime.go
@@ -0,0 +1,42 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_ReplicationTime AWS CloudFormation Resource (AWS::S3::Bucket.ReplicationTime)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationtime.html
+type Bucket_ReplicationTime struct {
+
+	// Status AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationtime.html#cfn-s3-bucket-replicationtime-status
+	Status *types.Value `json:"Status,omitempty"`
+
+	// Time AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationtime.html#cfn-s3-bucket-replicationtime-time
+	Time *Bucket_ReplicationTimeValue `json:"Time,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_ReplicationTime) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.ReplicationTime"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_replicationtimevalue.go b/goformation/cloudformation/s3/aws-s3-bucket_replicationtimevalue.go
new file mode 100644
index 0000000000..b78bd751d5
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_replicationtimevalue.go
@@ -0,0 +1,37 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_ReplicationTimeValue AWS CloudFormation Resource (AWS::S3::Bucket.ReplicationTimeValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationtimevalue.html
+type Bucket_ReplicationTimeValue struct {
+
+	// Minutes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-replicationtimevalue.html#cfn-s3-bucket-replicationtimevalue-minutes
+	Minutes *types.Value `json:"Minutes"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_ReplicationTimeValue) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.ReplicationTimeValue"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_routingrule.go b/goformation/cloudformation/s3/aws-s3-bucket_routingrule.go
new file mode 100644
index 0000000000..ef8e9ed830
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_routingrule.go
@@ -0,0 +1,40 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_RoutingRule AWS CloudFormation Resource (AWS::S3::Bucket.RoutingRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules.html
+type Bucket_RoutingRule struct {
+
+	// RedirectRule AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules.html#cfn-s3-websiteconfiguration-routingrules-redirectrule
+	RedirectRule *Bucket_RedirectRule `json:"RedirectRule,omitempty"`
+
+	// RoutingRuleCondition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules.html#cfn-s3-websiteconfiguration-routingrules-routingrulecondition
+	RoutingRuleCondition *Bucket_RoutingRuleCondition `json:"RoutingRuleCondition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_RoutingRule) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.RoutingRule"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_routingrulecondition.go b/goformation/cloudformation/s3/aws-s3-bucket_routingrulecondition.go
new file mode 100644
index 0000000000..3406bd4cb5
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_routingrulecondition.go
@@ -0,0 +1,42 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_RoutingRuleCondition AWS CloudFormation Resource (AWS::S3::Bucket.RoutingRuleCondition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules-routingrulecondition.html
+type Bucket_RoutingRuleCondition struct {
+
+	// HttpErrorCodeReturnedEquals AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules-routingrulecondition.html#cfn-s3-websiteconfiguration-routingrules-routingrulecondition-httperrorcodereturnedequals
+	HttpErrorCodeReturnedEquals *types.Value `json:"HttpErrorCodeReturnedEquals,omitempty"`
+
+	// KeyPrefixEquals AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration-routingrules-routingrulecondition.html#cfn-s3-websiteconfiguration-routingrules-routingrulecondition-keyprefixequals
+	KeyPrefixEquals *types.Value `json:"KeyPrefixEquals,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_RoutingRuleCondition) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.RoutingRuleCondition"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_rule.go b/goformation/cloudformation/s3/aws-s3-bucket_rule.go
new file mode 100644
index 0000000000..22322203ad
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_rule.go
@@ -0,0 +1,112 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_Rule AWS CloudFormation Resource (AWS::S3::Bucket.Rule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html
+type Bucket_Rule struct {
+
+	// AbortIncompleteMultipartUpload AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-rule-abortincompletemultipartupload
+	AbortIncompleteMultipartUpload *Bucket_AbortIncompleteMultipartUpload `json:"AbortIncompleteMultipartUpload,omitempty"`
+
+	// ExpirationDate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-expirationdate
+	ExpirationDate string `json:"ExpirationDate,omitempty"`
+
+	// ExpirationInDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-expirationindays
+	ExpirationInDays *types.Value `json:"ExpirationInDays,omitempty"`
+
+	// ExpiredObjectDeleteMarker AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-rule-expiredobjectdeletemarker
+	ExpiredObjectDeleteMarker *types.Value `json:"ExpiredObjectDeleteMarker,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// NoncurrentVersionExpiration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-noncurrentversionexpiration
+	NoncurrentVersionExpiration *Bucket_NoncurrentVersionExpiration `json:"NoncurrentVersionExpiration,omitempty"`
+
+	// NoncurrentVersionExpirationInDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-noncurrentversionexpirationindays
+	NoncurrentVersionExpirationInDays *types.Value `json:"NoncurrentVersionExpirationInDays,omitempty"`
+
+	// NoncurrentVersionTransition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-noncurrentversiontransition
+	NoncurrentVersionTransition *Bucket_NoncurrentVersionTransition `json:"NoncurrentVersionTransition,omitempty"`
+
+	// NoncurrentVersionTransitions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-noncurrentversiontransitions
+	NoncurrentVersionTransitions []Bucket_NoncurrentVersionTransition `json:"NoncurrentVersionTransitions,omitempty"`
+
+	// ObjectSizeGreaterThan AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-objectsizegreaterthan
+	ObjectSizeGreaterThan *types.Value `json:"ObjectSizeGreaterThan,omitempty"`
+
+	// ObjectSizeLessThan AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-objectsizelessthan
+	ObjectSizeLessThan *types.Value `json:"ObjectSizeLessThan,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-status
+	Status *types.Value `json:"Status,omitempty"`
+
+	// TagFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-rule-tagfilters
+	TagFilters []Bucket_TagFilter `json:"TagFilters,omitempty"`
+
+	// Transition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-transition
+	Transition *Bucket_Transition `json:"Transition,omitempty"`
+
+	// Transitions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule.html#cfn-s3-bucket-lifecycleconfig-rule-transitions
+	Transitions []Bucket_Transition `json:"Transitions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_Rule) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.Rule"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_s3keyfilter.go b/goformation/cloudformation/s3/aws-s3-bucket_s3keyfilter.go
new file mode 100644
index 0000000000..7163e59b37
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_s3keyfilter.go
@@ -0,0 +1,35 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_S3KeyFilter AWS CloudFormation Resource (AWS::S3::Bucket.S3KeyFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter-s3key.html
+type Bucket_S3KeyFilter struct {
+
+	// Rules AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter-s3key.html#cfn-s3-bucket-notificationconfiguraiton-config-filter-s3key-rules
+	Rules []Bucket_FilterRule `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 *Bucket_S3KeyFilter) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.S3KeyFilter"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_serversideencryptionbydefault.go b/goformation/cloudformation/s3/aws-s3-bucket_serversideencryptionbydefault.go
new file mode 100644
index 0000000000..68ee512bae
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_serversideencryptionbydefault.go
@@ -0,0 +1,42 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_ServerSideEncryptionByDefault AWS CloudFormation Resource (AWS::S3::Bucket.ServerSideEncryptionByDefault)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-serversideencryptionbydefault.html
+type Bucket_ServerSideEncryptionByDefault struct {
+
+	// KMSMasterKeyID AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-serversideencryptionbydefault.html#cfn-s3-bucket-serversideencryptionbydefault-kmsmasterkeyid
+	KMSMasterKeyID *types.Value `json:"KMSMasterKeyID,omitempty"`
+
+	// SSEAlgorithm AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-serversideencryptionbydefault.html#cfn-s3-bucket-serversideencryptionbydefault-ssealgorithm
+	SSEAlgorithm *types.Value `json:"SSEAlgorithm,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_ServerSideEncryptionByDefault) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.ServerSideEncryptionByDefault"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_serversideencryptionrule.go b/goformation/cloudformation/s3/aws-s3-bucket_serversideencryptionrule.go
new file mode 100644
index 0000000000..ffcc3c8d21
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_serversideencryptionrule.go
@@ -0,0 +1,42 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_ServerSideEncryptionRule AWS CloudFormation Resource (AWS::S3::Bucket.ServerSideEncryptionRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-serversideencryptionrule.html
+type Bucket_ServerSideEncryptionRule struct {
+
+	// BucketKeyEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-serversideencryptionrule.html#cfn-s3-bucket-serversideencryptionrule-bucketkeyenabled
+	BucketKeyEnabled *types.Value `json:"BucketKeyEnabled,omitempty"`
+
+	// ServerSideEncryptionByDefault AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-serversideencryptionrule.html#cfn-s3-bucket-serversideencryptionrule-serversideencryptionbydefault
+	ServerSideEncryptionByDefault *Bucket_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 *Bucket_ServerSideEncryptionRule) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.ServerSideEncryptionRule"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_sourceselectioncriteria.go b/goformation/cloudformation/s3/aws-s3-bucket_sourceselectioncriteria.go
new file mode 100644
index 0000000000..62903294bf
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_sourceselectioncriteria.go
@@ -0,0 +1,40 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_SourceSelectionCriteria AWS CloudFormation Resource (AWS::S3::Bucket.SourceSelectionCriteria)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-sourceselectioncriteria.html
+type Bucket_SourceSelectionCriteria struct {
+
+	// ReplicaModifications AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-sourceselectioncriteria.html#cfn-s3-bucket-sourceselectioncriteria-replicamodifications
+	ReplicaModifications *Bucket_ReplicaModifications `json:"ReplicaModifications,omitempty"`
+
+	// SseKmsEncryptedObjects AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-sourceselectioncriteria.html#cfn-s3-bucket-sourceselectioncriteria-ssekmsencryptedobjects
+	SseKmsEncryptedObjects *Bucket_SseKmsEncryptedObjects `json:"SseKmsEncryptedObjects,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_SourceSelectionCriteria) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.SourceSelectionCriteria"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_ssekmsencryptedobjects.go b/goformation/cloudformation/s3/aws-s3-bucket_ssekmsencryptedobjects.go
new file mode 100644
index 0000000000..e30059bc6a
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_ssekmsencryptedobjects.go
@@ -0,0 +1,37 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_SseKmsEncryptedObjects AWS CloudFormation Resource (AWS::S3::Bucket.SseKmsEncryptedObjects)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-ssekmsencryptedobjects.html
+type Bucket_SseKmsEncryptedObjects struct {
+
+	// Status AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-ssekmsencryptedobjects.html#cfn-s3-bucket-ssekmsencryptedobjects-status
+	Status *types.Value `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 *Bucket_SseKmsEncryptedObjects) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.SseKmsEncryptedObjects"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_storageclassanalysis.go b/goformation/cloudformation/s3/aws-s3-bucket_storageclassanalysis.go
new file mode 100644
index 0000000000..6d5b7bd10a
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_storageclassanalysis.go
@@ -0,0 +1,35 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_StorageClassAnalysis AWS CloudFormation Resource (AWS::S3::Bucket.StorageClassAnalysis)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-storageclassanalysis.html
+type Bucket_StorageClassAnalysis struct {
+
+	// DataExport AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-storageclassanalysis.html#cfn-s3-bucket-storageclassanalysis-dataexport
+	DataExport *Bucket_DataExport `json:"DataExport,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_StorageClassAnalysis) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.StorageClassAnalysis"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_tagfilter.go b/goformation/cloudformation/s3/aws-s3-bucket_tagfilter.go
new file mode 100644
index 0000000000..277219579f
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_tagfilter.go
@@ -0,0 +1,42 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_TagFilter AWS CloudFormation Resource (AWS::S3::Bucket.TagFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-tagfilter.html
+type Bucket_TagFilter struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-tagfilter.html#cfn-s3-bucket-tagfilter-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-tagfilter.html#cfn-s3-bucket-tagfilter-value
+	Value *types.Value `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 *Bucket_TagFilter) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.TagFilter"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_tiering.go b/goformation/cloudformation/s3/aws-s3-bucket_tiering.go
new file mode 100644
index 0000000000..a4574dd606
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_tiering.go
@@ -0,0 +1,42 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_Tiering AWS CloudFormation Resource (AWS::S3::Bucket.Tiering)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-tiering.html
+type Bucket_Tiering struct {
+
+	// AccessTier AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-tiering.html#cfn-s3-bucket-tiering-accesstier
+	AccessTier *types.Value `json:"AccessTier,omitempty"`
+
+	// Days AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-tiering.html#cfn-s3-bucket-tiering-days
+	Days *types.Value `json:"Days"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_Tiering) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.Tiering"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_topicconfiguration.go b/goformation/cloudformation/s3/aws-s3-bucket_topicconfiguration.go
new file mode 100644
index 0000000000..b7d86f94f5
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_topicconfiguration.go
@@ -0,0 +1,47 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_TopicConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.TopicConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-topicconfig.html
+type Bucket_TopicConfiguration struct {
+
+	// Event AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-topicconfig.html#cfn-s3-bucket-notificationconfig-topicconfig-event
+	Event *types.Value `json:"Event,omitempty"`
+
+	// Filter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-topicconfig.html#cfn-s3-bucket-notificationconfig-topicconfig-filter
+	Filter *Bucket_NotificationFilter `json:"Filter,omitempty"`
+
+	// Topic AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfig-topicconfig.html#cfn-s3-bucket-notificationconfig-topicconfig-topic
+	Topic *types.Value `json:"Topic,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_TopicConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.TopicConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_transition.go b/goformation/cloudformation/s3/aws-s3-bucket_transition.go
new file mode 100644
index 0000000000..8b17ee73fc
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_transition.go
@@ -0,0 +1,47 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_Transition AWS CloudFormation Resource (AWS::S3::Bucket.Transition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule-transition.html
+type Bucket_Transition struct {
+
+	// StorageClass AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule-transition.html#cfn-s3-bucket-lifecycleconfig-rule-transition-storageclass
+	StorageClass *types.Value `json:"StorageClass,omitempty"`
+
+	// TransitionDate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule-transition.html#cfn-s3-bucket-lifecycleconfig-rule-transition-transitiondate
+	TransitionDate string `json:"TransitionDate,omitempty"`
+
+	// TransitionInDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-lifecycleconfig-rule-transition.html#cfn-s3-bucket-lifecycleconfig-rule-transition-transitionindays
+	TransitionInDays *types.Value `json:"TransitionInDays,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_Transition) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.Transition"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_versioningconfiguration.go b/goformation/cloudformation/s3/aws-s3-bucket_versioningconfiguration.go
new file mode 100644
index 0000000000..982f8a1a72
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_versioningconfiguration.go
@@ -0,0 +1,37 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_VersioningConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.VersioningConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-versioningconfig.html
+type Bucket_VersioningConfiguration struct {
+
+	// Status AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-versioningconfig.html#cfn-s3-bucket-versioningconfig-status
+	Status *types.Value `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 *Bucket_VersioningConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.VersioningConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucket_websiteconfiguration.go b/goformation/cloudformation/s3/aws-s3-bucket_websiteconfiguration.go
new file mode 100644
index 0000000000..5456931d78
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucket_websiteconfiguration.go
@@ -0,0 +1,52 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_WebsiteConfiguration AWS CloudFormation Resource (AWS::S3::Bucket.WebsiteConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration.html
+type Bucket_WebsiteConfiguration struct {
+
+	// ErrorDocument AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration.html#cfn-s3-websiteconfiguration-errordocument
+	ErrorDocument *types.Value `json:"ErrorDocument,omitempty"`
+
+	// IndexDocument AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration.html#cfn-s3-websiteconfiguration-indexdocument
+	IndexDocument *types.Value `json:"IndexDocument,omitempty"`
+
+	// RedirectAllRequestsTo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration.html#cfn-s3-websiteconfiguration-redirectallrequeststo
+	RedirectAllRequestsTo *Bucket_RedirectAllRequestsTo `json:"RedirectAllRequestsTo,omitempty"`
+
+	// RoutingRules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-websiteconfiguration.html#cfn-s3-websiteconfiguration-routingrules
+	RoutingRules []Bucket_RoutingRule `json:"RoutingRules,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_WebsiteConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::Bucket.WebsiteConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-bucketpolicy.go b/goformation/cloudformation/s3/aws-s3-bucketpolicy.go
new file mode 100644
index 0000000000..0000ca5d8e
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-bucketpolicy.go
@@ -0,0 +1,113 @@
+package s3
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BucketPolicy AWS CloudFormation Resource (AWS::S3::BucketPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-policy.html
+type BucketPolicy struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-policy.html#aws-properties-s3-policy-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// PolicyDocument AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-policy.html#aws-properties-s3-policy-policydocument
+	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *BucketPolicy) AWSCloudFormationType() string {
+	return "AWS::S3::BucketPolicy"
+}
+
+// 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 BucketPolicy) MarshalJSON() ([]byte, error) {
+	type Properties BucketPolicy
+	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 *BucketPolicy) UnmarshalJSON(b []byte) error {
+	type Properties BucketPolicy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = BucketPolicy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint.go b/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint.go
new file mode 100644
index 0000000000..260ef468a4
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint.go
@@ -0,0 +1,118 @@
+package s3
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MultiRegionAccessPoint AWS CloudFormation Resource (AWS::S3::MultiRegionAccessPoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-multiregionaccesspoint.html
+type MultiRegionAccessPoint struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-multiregionaccesspoint.html#cfn-s3-multiregionaccesspoint-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// PublicAccessBlockConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-multiregionaccesspoint.html#cfn-s3-multiregionaccesspoint-publicaccessblockconfiguration
+	PublicAccessBlockConfiguration *MultiRegionAccessPoint_PublicAccessBlockConfiguration `json:"PublicAccessBlockConfiguration,omitempty"`
+
+	// Regions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-multiregionaccesspoint.html#cfn-s3-multiregionaccesspoint-regions
+	Regions []MultiRegionAccessPoint_Region `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 *MultiRegionAccessPoint) AWSCloudFormationType() string {
+	return "AWS::S3::MultiRegionAccessPoint"
+}
+
+// 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 MultiRegionAccessPoint) MarshalJSON() ([]byte, error) {
+	type Properties MultiRegionAccessPoint
+	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 *MultiRegionAccessPoint) UnmarshalJSON(b []byte) error {
+	type Properties MultiRegionAccessPoint
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = MultiRegionAccessPoint(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint_publicaccessblockconfiguration.go b/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint_publicaccessblockconfiguration.go
new file mode 100644
index 0000000000..f9e72ca8f4
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint_publicaccessblockconfiguration.go
@@ -0,0 +1,52 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MultiRegionAccessPoint_PublicAccessBlockConfiguration AWS CloudFormation Resource (AWS::S3::MultiRegionAccessPoint.PublicAccessBlockConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-multiregionaccesspoint-publicaccessblockconfiguration.html
+type MultiRegionAccessPoint_PublicAccessBlockConfiguration struct {
+
+	// BlockPublicAcls AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-multiregionaccesspoint-publicaccessblockconfiguration.html#cfn-s3-multiregionaccesspoint-publicaccessblockconfiguration-blockpublicacls
+	BlockPublicAcls *types.Value `json:"BlockPublicAcls,omitempty"`
+
+	// BlockPublicPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-multiregionaccesspoint-publicaccessblockconfiguration.html#cfn-s3-multiregionaccesspoint-publicaccessblockconfiguration-blockpublicpolicy
+	BlockPublicPolicy *types.Value `json:"BlockPublicPolicy,omitempty"`
+
+	// IgnorePublicAcls AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-multiregionaccesspoint-publicaccessblockconfiguration.html#cfn-s3-multiregionaccesspoint-publicaccessblockconfiguration-ignorepublicacls
+	IgnorePublicAcls *types.Value `json:"IgnorePublicAcls,omitempty"`
+
+	// RestrictPublicBuckets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-multiregionaccesspoint-publicaccessblockconfiguration.html#cfn-s3-multiregionaccesspoint-publicaccessblockconfiguration-restrictpublicbuckets
+	RestrictPublicBuckets *types.Value `json:"RestrictPublicBuckets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MultiRegionAccessPoint_PublicAccessBlockConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::MultiRegionAccessPoint.PublicAccessBlockConfiguration"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint_region.go b/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint_region.go
new file mode 100644
index 0000000000..83d3736e59
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-multiregionaccesspoint_region.go
@@ -0,0 +1,37 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MultiRegionAccessPoint_Region AWS CloudFormation Resource (AWS::S3::MultiRegionAccessPoint.Region)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-multiregionaccesspoint-region.html
+type MultiRegionAccessPoint_Region struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-multiregionaccesspoint-region.html#cfn-s3-multiregionaccesspoint-region-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MultiRegionAccessPoint_Region) AWSCloudFormationType() string {
+	return "AWS::S3::MultiRegionAccessPoint.Region"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-multiregionaccesspointpolicy.go b/goformation/cloudformation/s3/aws-s3-multiregionaccesspointpolicy.go
new file mode 100644
index 0000000000..a5227df6b7
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-multiregionaccesspointpolicy.go
@@ -0,0 +1,113 @@
+package s3
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MultiRegionAccessPointPolicy AWS CloudFormation Resource (AWS::S3::MultiRegionAccessPointPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-multiregionaccesspointpolicy.html
+type MultiRegionAccessPointPolicy struct {
+
+	// MrapName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-multiregionaccesspointpolicy.html#cfn-s3-multiregionaccesspointpolicy-mrapname
+	MrapName *types.Value `json:"MrapName,omitempty"`
+
+	// Policy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-multiregionaccesspointpolicy.html#cfn-s3-multiregionaccesspointpolicy-policy
+	Policy interface{} `json:"Policy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MultiRegionAccessPointPolicy) AWSCloudFormationType() string {
+	return "AWS::S3::MultiRegionAccessPointPolicy"
+}
+
+// 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 MultiRegionAccessPointPolicy) MarshalJSON() ([]byte, error) {
+	type Properties MultiRegionAccessPointPolicy
+	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 *MultiRegionAccessPointPolicy) UnmarshalJSON(b []byte) error {
+	type Properties MultiRegionAccessPointPolicy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = MultiRegionAccessPointPolicy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/s3/aws-s3-storagelens.go b/goformation/cloudformation/s3/aws-s3-storagelens.go
new file mode 100644
index 0000000000..a7f0438cc2
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-storagelens.go
@@ -0,0 +1,112 @@
+package s3
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// StorageLens AWS CloudFormation Resource (AWS::S3::StorageLens)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-storagelens.html
+type StorageLens struct {
+
+	// StorageLensConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-storagelens.html#cfn-s3-storagelens-storagelensconfiguration
+	StorageLensConfiguration *StorageLens_StorageLensConfiguration `json:"StorageLensConfiguration,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3-storagelens.html#cfn-s3-storagelens-tags
+	Tags []cloudformation.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 *StorageLens) AWSCloudFormationType() string {
+	return "AWS::S3::StorageLens"
+}
+
+// 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 StorageLens) MarshalJSON() ([]byte, error) {
+	type Properties StorageLens
+	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 *StorageLens) UnmarshalJSON(b []byte) error {
+	type Properties StorageLens
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = StorageLens(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/s3/aws-s3-storagelens_accountlevel.go b/goformation/cloudformation/s3/aws-s3-storagelens_accountlevel.go
new file mode 100644
index 0000000000..3e3463179d
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-storagelens_accountlevel.go
@@ -0,0 +1,40 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// StorageLens_AccountLevel AWS CloudFormation Resource (AWS::S3::StorageLens.AccountLevel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-accountlevel.html
+type StorageLens_AccountLevel struct {
+
+	// ActivityMetrics AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-accountlevel.html#cfn-s3-storagelens-accountlevel-activitymetrics
+	ActivityMetrics *StorageLens_ActivityMetrics `json:"ActivityMetrics,omitempty"`
+
+	// BucketLevel AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-accountlevel.html#cfn-s3-storagelens-accountlevel-bucketlevel
+	BucketLevel *StorageLens_BucketLevel `json:"BucketLevel,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StorageLens_AccountLevel) AWSCloudFormationType() string {
+	return "AWS::S3::StorageLens.AccountLevel"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_activitymetrics.go b/goformation/cloudformation/s3/aws-s3-storagelens_activitymetrics.go
new file mode 100644
index 0000000000..81ebd6f25a
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-storagelens_activitymetrics.go
@@ -0,0 +1,37 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StorageLens_ActivityMetrics AWS CloudFormation Resource (AWS::S3::StorageLens.ActivityMetrics)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-activitymetrics.html
+type StorageLens_ActivityMetrics struct {
+
+	// IsEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-activitymetrics.html#cfn-s3-storagelens-activitymetrics-isenabled
+	IsEnabled *types.Value `json:"IsEnabled,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StorageLens_ActivityMetrics) AWSCloudFormationType() string {
+	return "AWS::S3::StorageLens.ActivityMetrics"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_awsorg.go b/goformation/cloudformation/s3/aws-s3-storagelens_awsorg.go
new file mode 100644
index 0000000000..6dcba0543d
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-storagelens_awsorg.go
@@ -0,0 +1,37 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StorageLens_AwsOrg AWS CloudFormation Resource (AWS::S3::StorageLens.AwsOrg)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-awsorg.html
+type StorageLens_AwsOrg struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-awsorg.html#cfn-s3-storagelens-awsorg-arn
+	Arn *types.Value `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 *StorageLens_AwsOrg) AWSCloudFormationType() string {
+	return "AWS::S3::StorageLens.AwsOrg"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_bucketlevel.go b/goformation/cloudformation/s3/aws-s3-storagelens_bucketlevel.go
new file mode 100644
index 0000000000..ce61ea99b6
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-storagelens_bucketlevel.go
@@ -0,0 +1,40 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// StorageLens_BucketLevel AWS CloudFormation Resource (AWS::S3::StorageLens.BucketLevel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-bucketlevel.html
+type StorageLens_BucketLevel struct {
+
+	// ActivityMetrics AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-bucketlevel.html#cfn-s3-storagelens-bucketlevel-activitymetrics
+	ActivityMetrics *StorageLens_ActivityMetrics `json:"ActivityMetrics,omitempty"`
+
+	// PrefixLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-bucketlevel.html#cfn-s3-storagelens-bucketlevel-prefixlevel
+	PrefixLevel *StorageLens_PrefixLevel `json:"PrefixLevel,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StorageLens_BucketLevel) AWSCloudFormationType() string {
+	return "AWS::S3::StorageLens.BucketLevel"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_bucketsandregions.go b/goformation/cloudformation/s3/aws-s3-storagelens_bucketsandregions.go
new file mode 100644
index 0000000000..d3feac78bb
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-storagelens_bucketsandregions.go
@@ -0,0 +1,42 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StorageLens_BucketsAndRegions AWS CloudFormation Resource (AWS::S3::StorageLens.BucketsAndRegions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-bucketsandregions.html
+type StorageLens_BucketsAndRegions struct {
+
+	// Buckets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-bucketsandregions.html#cfn-s3-storagelens-bucketsandregions-buckets
+	Buckets *types.Value `json:"Buckets,omitempty"`
+
+	// Regions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-bucketsandregions.html#cfn-s3-storagelens-bucketsandregions-regions
+	Regions *types.Value `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 *StorageLens_BucketsAndRegions) AWSCloudFormationType() string {
+	return "AWS::S3::StorageLens.BucketsAndRegions"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_cloudwatchmetrics.go b/goformation/cloudformation/s3/aws-s3-storagelens_cloudwatchmetrics.go
new file mode 100644
index 0000000000..a53cb1136a
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-storagelens_cloudwatchmetrics.go
@@ -0,0 +1,37 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StorageLens_CloudWatchMetrics AWS CloudFormation Resource (AWS::S3::StorageLens.CloudWatchMetrics)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-cloudwatchmetrics.html
+type StorageLens_CloudWatchMetrics struct {
+
+	// IsEnabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-cloudwatchmetrics.html#cfn-s3-storagelens-cloudwatchmetrics-isenabled
+	IsEnabled *types.Value `json:"IsEnabled"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StorageLens_CloudWatchMetrics) AWSCloudFormationType() string {
+	return "AWS::S3::StorageLens.CloudWatchMetrics"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_dataexport.go b/goformation/cloudformation/s3/aws-s3-storagelens_dataexport.go
new file mode 100644
index 0000000000..5ffbc2a5b8
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-storagelens_dataexport.go
@@ -0,0 +1,40 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// StorageLens_DataExport AWS CloudFormation Resource (AWS::S3::StorageLens.DataExport)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-dataexport.html
+type StorageLens_DataExport struct {
+
+	// CloudWatchMetrics AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-dataexport.html#cfn-s3-storagelens-dataexport-cloudwatchmetrics
+	CloudWatchMetrics *StorageLens_CloudWatchMetrics `json:"CloudWatchMetrics,omitempty"`
+
+	// S3BucketDestination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-dataexport.html#cfn-s3-storagelens-dataexport-s3bucketdestination
+	S3BucketDestination *StorageLens_S3BucketDestination `json:"S3BucketDestination,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StorageLens_DataExport) AWSCloudFormationType() string {
+	return "AWS::S3::StorageLens.DataExport"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_encryption.go b/goformation/cloudformation/s3/aws-s3-storagelens_encryption.go
new file mode 100644
index 0000000000..62ff2fed99
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-storagelens_encryption.go
@@ -0,0 +1,30 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// StorageLens_Encryption AWS CloudFormation Resource (AWS::S3::StorageLens.Encryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-encryption.html
+type StorageLens_Encryption struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StorageLens_Encryption) AWSCloudFormationType() string {
+	return "AWS::S3::StorageLens.Encryption"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_prefixlevel.go b/goformation/cloudformation/s3/aws-s3-storagelens_prefixlevel.go
new file mode 100644
index 0000000000..89a6e871e1
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-storagelens_prefixlevel.go
@@ -0,0 +1,35 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// StorageLens_PrefixLevel AWS CloudFormation Resource (AWS::S3::StorageLens.PrefixLevel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-prefixlevel.html
+type StorageLens_PrefixLevel struct {
+
+	// StorageMetrics AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-prefixlevel.html#cfn-s3-storagelens-prefixlevel-storagemetrics
+	StorageMetrics *StorageLens_PrefixLevelStorageMetrics `json:"StorageMetrics,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StorageLens_PrefixLevel) AWSCloudFormationType() string {
+	return "AWS::S3::StorageLens.PrefixLevel"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_prefixlevelstoragemetrics.go b/goformation/cloudformation/s3/aws-s3-storagelens_prefixlevelstoragemetrics.go
new file mode 100644
index 0000000000..c6585409e2
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-storagelens_prefixlevelstoragemetrics.go
@@ -0,0 +1,42 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StorageLens_PrefixLevelStorageMetrics AWS CloudFormation Resource (AWS::S3::StorageLens.PrefixLevelStorageMetrics)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-prefixlevelstoragemetrics.html
+type StorageLens_PrefixLevelStorageMetrics struct {
+
+	// IsEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-prefixlevelstoragemetrics.html#cfn-s3-storagelens-prefixlevelstoragemetrics-isenabled
+	IsEnabled *types.Value `json:"IsEnabled,omitempty"`
+
+	// SelectionCriteria AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-prefixlevelstoragemetrics.html#cfn-s3-storagelens-prefixlevelstoragemetrics-selectioncriteria
+	SelectionCriteria *StorageLens_SelectionCriteria `json:"SelectionCriteria,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StorageLens_PrefixLevelStorageMetrics) AWSCloudFormationType() string {
+	return "AWS::S3::StorageLens.PrefixLevelStorageMetrics"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_s3bucketdestination.go b/goformation/cloudformation/s3/aws-s3-storagelens_s3bucketdestination.go
new file mode 100644
index 0000000000..79652ca3ef
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-storagelens_s3bucketdestination.go
@@ -0,0 +1,62 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StorageLens_S3BucketDestination AWS CloudFormation Resource (AWS::S3::StorageLens.S3BucketDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-s3bucketdestination.html
+type StorageLens_S3BucketDestination struct {
+
+	// AccountId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-s3bucketdestination.html#cfn-s3-storagelens-s3bucketdestination-accountid
+	AccountId *types.Value `json:"AccountId,omitempty"`
+
+	// Arn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-s3bucketdestination.html#cfn-s3-storagelens-s3bucketdestination-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// Encryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-s3bucketdestination.html#cfn-s3-storagelens-s3bucketdestination-encryption
+	Encryption *StorageLens_Encryption `json:"Encryption,omitempty"`
+
+	// Format AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-s3bucketdestination.html#cfn-s3-storagelens-s3bucketdestination-format
+	Format *types.Value `json:"Format,omitempty"`
+
+	// OutputSchemaVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-s3bucketdestination.html#cfn-s3-storagelens-s3bucketdestination-outputschemaversion
+	OutputSchemaVersion *types.Value `json:"OutputSchemaVersion,omitempty"`
+
+	// Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-s3bucketdestination.html#cfn-s3-storagelens-s3bucketdestination-prefix
+	Prefix *types.Value `json:"Prefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StorageLens_S3BucketDestination) AWSCloudFormationType() string {
+	return "AWS::S3::StorageLens.S3BucketDestination"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_selectioncriteria.go b/goformation/cloudformation/s3/aws-s3-storagelens_selectioncriteria.go
new file mode 100644
index 0000000000..dcd3c33179
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-storagelens_selectioncriteria.go
@@ -0,0 +1,47 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StorageLens_SelectionCriteria AWS CloudFormation Resource (AWS::S3::StorageLens.SelectionCriteria)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-selectioncriteria.html
+type StorageLens_SelectionCriteria struct {
+
+	// Delimiter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-selectioncriteria.html#cfn-s3-storagelens-selectioncriteria-delimiter
+	Delimiter *types.Value `json:"Delimiter,omitempty"`
+
+	// MaxDepth AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-selectioncriteria.html#cfn-s3-storagelens-selectioncriteria-maxdepth
+	MaxDepth *types.Value `json:"MaxDepth,omitempty"`
+
+	// MinStorageBytesPercentage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-selectioncriteria.html#cfn-s3-storagelens-selectioncriteria-minstoragebytespercentage
+	MinStorageBytesPercentage *types.Value `json:"MinStorageBytesPercentage,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StorageLens_SelectionCriteria) AWSCloudFormationType() string {
+	return "AWS::S3::StorageLens.SelectionCriteria"
+}
diff --git a/goformation/cloudformation/s3/aws-s3-storagelens_storagelensconfiguration.go b/goformation/cloudformation/s3/aws-s3-storagelens_storagelensconfiguration.go
new file mode 100644
index 0000000000..3ba3749b89
--- /dev/null
+++ b/goformation/cloudformation/s3/aws-s3-storagelens_storagelensconfiguration.go
@@ -0,0 +1,72 @@
+package s3
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StorageLens_StorageLensConfiguration AWS CloudFormation Resource (AWS::S3::StorageLens.StorageLensConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-storagelensconfiguration.html
+type StorageLens_StorageLensConfiguration struct {
+
+	// AccountLevel AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-storagelensconfiguration.html#cfn-s3-storagelens-storagelensconfiguration-accountlevel
+	AccountLevel *StorageLens_AccountLevel `json:"AccountLevel,omitempty"`
+
+	// AwsOrg AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-storagelensconfiguration.html#cfn-s3-storagelens-storagelensconfiguration-awsorg
+	AwsOrg *StorageLens_AwsOrg `json:"AwsOrg,omitempty"`
+
+	// DataExport AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-storagelensconfiguration.html#cfn-s3-storagelens-storagelensconfiguration-dataexport
+	DataExport *StorageLens_DataExport `json:"DataExport,omitempty"`
+
+	// Exclude AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-storagelensconfiguration.html#cfn-s3-storagelens-storagelensconfiguration-exclude
+	Exclude *StorageLens_BucketsAndRegions `json:"Exclude,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-storagelensconfiguration.html#cfn-s3-storagelens-storagelensconfiguration-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Include AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-storagelensconfiguration.html#cfn-s3-storagelens-storagelensconfiguration-include
+	Include *StorageLens_BucketsAndRegions `json:"Include,omitempty"`
+
+	// IsEnabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-storagelensconfiguration.html#cfn-s3-storagelens-storagelensconfiguration-isenabled
+	IsEnabled *types.Value `json:"IsEnabled"`
+
+	// StorageLensArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-storagelens-storagelensconfiguration.html#cfn-s3-storagelens-storagelensconfiguration-storagelensarn
+	StorageLensArn *types.Value `json:"StorageLensArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StorageLens_StorageLensConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3::StorageLens.StorageLensConfiguration"
+}
diff --git a/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint.go b/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint.go
new file mode 100644
index 0000000000..6aa31e9aab
--- /dev/null
+++ b/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint.go
@@ -0,0 +1,113 @@
+package s3objectlambda
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPoint AWS CloudFormation Resource (AWS::S3ObjectLambda::AccessPoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3objectlambda-accesspoint.html
+type AccessPoint struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3objectlambda-accesspoint.html#cfn-s3objectlambda-accesspoint-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ObjectLambdaConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3objectlambda-accesspoint.html#cfn-s3objectlambda-accesspoint-objectlambdaconfiguration
+	ObjectLambdaConfiguration *AccessPoint_ObjectLambdaConfiguration `json:"ObjectLambdaConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AccessPoint) AWSCloudFormationType() string {
+	return "AWS::S3ObjectLambda::AccessPoint"
+}
+
+// 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 AccessPoint) MarshalJSON() ([]byte, error) {
+	type Properties AccessPoint
+	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 *AccessPoint) UnmarshalJSON(b []byte) error {
+	type Properties AccessPoint
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AccessPoint(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_objectlambdaconfiguration.go b/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_objectlambdaconfiguration.go
new file mode 100644
index 0000000000..e50a2b7c76
--- /dev/null
+++ b/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_objectlambdaconfiguration.go
@@ -0,0 +1,52 @@
+package s3objectlambda
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPoint_ObjectLambdaConfiguration AWS CloudFormation Resource (AWS::S3ObjectLambda::AccessPoint.ObjectLambdaConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3objectlambda-accesspoint-objectlambdaconfiguration.html
+type AccessPoint_ObjectLambdaConfiguration struct {
+
+	// AllowedFeatures AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3objectlambda-accesspoint-objectlambdaconfiguration.html#cfn-s3objectlambda-accesspoint-objectlambdaconfiguration-allowedfeatures
+	AllowedFeatures *types.Value `json:"AllowedFeatures,omitempty"`
+
+	// CloudWatchMetricsEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3objectlambda-accesspoint-objectlambdaconfiguration.html#cfn-s3objectlambda-accesspoint-objectlambdaconfiguration-cloudwatchmetricsenabled
+	CloudWatchMetricsEnabled *types.Value `json:"CloudWatchMetricsEnabled,omitempty"`
+
+	// SupportingAccessPoint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3objectlambda-accesspoint-objectlambdaconfiguration.html#cfn-s3objectlambda-accesspoint-objectlambdaconfiguration-supportingaccesspoint
+	SupportingAccessPoint *types.Value `json:"SupportingAccessPoint,omitempty"`
+
+	// TransformationConfigurations AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3objectlambda-accesspoint-objectlambdaconfiguration.html#cfn-s3objectlambda-accesspoint-objectlambdaconfiguration-transformationconfigurations
+	TransformationConfigurations []AccessPoint_TransformationConfiguration `json:"TransformationConfigurations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AccessPoint_ObjectLambdaConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3ObjectLambda::AccessPoint.ObjectLambdaConfiguration"
+}
diff --git a/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_transformationconfiguration.go b/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_transformationconfiguration.go
new file mode 100644
index 0000000000..4bce7ac1f7
--- /dev/null
+++ b/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspoint_transformationconfiguration.go
@@ -0,0 +1,42 @@
+package s3objectlambda
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPoint_TransformationConfiguration AWS CloudFormation Resource (AWS::S3ObjectLambda::AccessPoint.TransformationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3objectlambda-accesspoint-transformationconfiguration.html
+type AccessPoint_TransformationConfiguration struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3objectlambda-accesspoint-transformationconfiguration.html#cfn-s3objectlambda-accesspoint-transformationconfiguration-actions
+	Actions *types.Value `json:"Actions,omitempty"`
+
+	// ContentTransformation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3objectlambda-accesspoint-transformationconfiguration.html#cfn-s3objectlambda-accesspoint-transformationconfiguration-contenttransformation
+	ContentTransformation interface{} `json:"ContentTransformation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AccessPoint_TransformationConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3ObjectLambda::AccessPoint.TransformationConfiguration"
+}
diff --git a/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspointpolicy.go b/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspointpolicy.go
new file mode 100644
index 0000000000..e941440305
--- /dev/null
+++ b/goformation/cloudformation/s3objectlambda/aws-s3objectlambda-accesspointpolicy.go
@@ -0,0 +1,113 @@
+package s3objectlambda
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPointPolicy AWS CloudFormation Resource (AWS::S3ObjectLambda::AccessPointPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3objectlambda-accesspointpolicy.html
+type AccessPointPolicy struct {
+
+	// ObjectLambdaAccessPoint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3objectlambda-accesspointpolicy.html#cfn-s3objectlambda-accesspointpolicy-objectlambdaaccesspoint
+	ObjectLambdaAccessPoint *types.Value `json:"ObjectLambdaAccessPoint,omitempty"`
+
+	// PolicyDocument AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3objectlambda-accesspointpolicy.html#cfn-s3objectlambda-accesspointpolicy-policydocument
+	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AccessPointPolicy) AWSCloudFormationType() string {
+	return "AWS::S3ObjectLambda::AccessPointPolicy"
+}
+
+// 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 AccessPointPolicy) MarshalJSON() ([]byte, error) {
+	type Properties AccessPointPolicy
+	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 *AccessPointPolicy) UnmarshalJSON(b []byte) error {
+	type Properties AccessPointPolicy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AccessPointPolicy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/s3outposts/aws-s3outposts-accesspoint.go b/goformation/cloudformation/s3outposts/aws-s3outposts-accesspoint.go
new file mode 100644
index 0000000000..e83d32d53c
--- /dev/null
+++ b/goformation/cloudformation/s3outposts/aws-s3outposts-accesspoint.go
@@ -0,0 +1,123 @@
+package s3outposts
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPoint AWS CloudFormation Resource (AWS::S3Outposts::AccessPoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-accesspoint.html
+type AccessPoint struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-accesspoint.html#cfn-s3outposts-accesspoint-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-accesspoint.html#cfn-s3outposts-accesspoint-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Policy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-accesspoint.html#cfn-s3outposts-accesspoint-policy
+	Policy interface{} `json:"Policy,omitempty"`
+
+	// VpcConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-accesspoint.html#cfn-s3outposts-accesspoint-vpcconfiguration
+	VpcConfiguration *AccessPoint_VpcConfiguration `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 *AccessPoint) AWSCloudFormationType() string {
+	return "AWS::S3Outposts::AccessPoint"
+}
+
+// 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 AccessPoint) MarshalJSON() ([]byte, error) {
+	type Properties AccessPoint
+	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 *AccessPoint) UnmarshalJSON(b []byte) error {
+	type Properties AccessPoint
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AccessPoint(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/s3outposts/aws-s3outposts-accesspoint_vpcconfiguration.go b/goformation/cloudformation/s3outposts/aws-s3outposts-accesspoint_vpcconfiguration.go
new file mode 100644
index 0000000000..39dabe5377
--- /dev/null
+++ b/goformation/cloudformation/s3outposts/aws-s3outposts-accesspoint_vpcconfiguration.go
@@ -0,0 +1,37 @@
+package s3outposts
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AccessPoint_VpcConfiguration AWS CloudFormation Resource (AWS::S3Outposts::AccessPoint.VpcConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3outposts-accesspoint-vpcconfiguration.html
+type AccessPoint_VpcConfiguration struct {
+
+	// VpcId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3outposts-accesspoint-vpcconfiguration.html#cfn-s3outposts-accesspoint-vpcconfiguration-vpcid
+	VpcId *types.Value `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 *AccessPoint_VpcConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3Outposts::AccessPoint.VpcConfiguration"
+}
diff --git a/goformation/cloudformation/s3outposts/aws-s3outposts-bucket.go b/goformation/cloudformation/s3outposts/aws-s3outposts-bucket.go
new file mode 100644
index 0000000000..cb67ece42b
--- /dev/null
+++ b/goformation/cloudformation/s3outposts/aws-s3outposts-bucket.go
@@ -0,0 +1,124 @@
+package s3outposts
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket AWS CloudFormation Resource (AWS::S3Outposts::Bucket)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-bucket.html
+type Bucket struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-bucket.html#cfn-s3outposts-bucket-bucketname
+	BucketName *types.Value `json:"BucketName,omitempty"`
+
+	// LifecycleConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-bucket.html#cfn-s3outposts-bucket-lifecycleconfiguration
+	LifecycleConfiguration *Bucket_LifecycleConfiguration `json:"LifecycleConfiguration,omitempty"`
+
+	// OutpostId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-bucket.html#cfn-s3outposts-bucket-outpostid
+	OutpostId *types.Value `json:"OutpostId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-bucket.html#cfn-s3outposts-bucket-tags
+	Tags []cloudformation.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 *Bucket) AWSCloudFormationType() string {
+	return "AWS::S3Outposts::Bucket"
+}
+
+// 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 Bucket) MarshalJSON() ([]byte, error) {
+	type Properties Bucket
+	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 *Bucket) UnmarshalJSON(b []byte) error {
+	type Properties Bucket
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Bucket(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_abortincompletemultipartupload.go b/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_abortincompletemultipartupload.go
new file mode 100644
index 0000000000..792c176c95
--- /dev/null
+++ b/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_abortincompletemultipartupload.go
@@ -0,0 +1,37 @@
+package s3outposts
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_AbortIncompleteMultipartUpload AWS CloudFormation Resource (AWS::S3Outposts::Bucket.AbortIncompleteMultipartUpload)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3outposts-bucket-abortincompletemultipartupload.html
+type Bucket_AbortIncompleteMultipartUpload struct {
+
+	// DaysAfterInitiation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3outposts-bucket-abortincompletemultipartupload.html#cfn-s3outposts-bucket-abortincompletemultipartupload-daysafterinitiation
+	DaysAfterInitiation *types.Value `json:"DaysAfterInitiation"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Bucket_AbortIncompleteMultipartUpload) AWSCloudFormationType() string {
+	return "AWS::S3Outposts::Bucket.AbortIncompleteMultipartUpload"
+}
diff --git a/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_lifecycleconfiguration.go b/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_lifecycleconfiguration.go
new file mode 100644
index 0000000000..6189ae6c2b
--- /dev/null
+++ b/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_lifecycleconfiguration.go
@@ -0,0 +1,35 @@
+package s3outposts
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_LifecycleConfiguration AWS CloudFormation Resource (AWS::S3Outposts::Bucket.LifecycleConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3outposts-bucket-lifecycleconfiguration.html
+type Bucket_LifecycleConfiguration struct {
+
+	// Rules AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3outposts-bucket-lifecycleconfiguration.html#cfn-s3outposts-bucket-lifecycleconfiguration-rules
+	Rules []Bucket_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 *Bucket_LifecycleConfiguration) AWSCloudFormationType() string {
+	return "AWS::S3Outposts::Bucket.LifecycleConfiguration"
+}
diff --git a/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_rule.go b/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_rule.go
new file mode 100644
index 0000000000..fd9877322b
--- /dev/null
+++ b/goformation/cloudformation/s3outposts/aws-s3outposts-bucket_rule.go
@@ -0,0 +1,62 @@
+package s3outposts
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Bucket_Rule AWS CloudFormation Resource (AWS::S3Outposts::Bucket.Rule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3outposts-bucket-rule.html
+type Bucket_Rule struct {
+
+	// AbortIncompleteMultipartUpload AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3outposts-bucket-rule.html#cfn-s3outposts-bucket-rule-abortincompletemultipartupload
+	AbortIncompleteMultipartUpload *Bucket_AbortIncompleteMultipartUpload `json:"AbortIncompleteMultipartUpload,omitempty"`
+
+	// ExpirationDate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3outposts-bucket-rule.html#cfn-s3outposts-bucket-rule-expirationdate
+	ExpirationDate *types.Value `json:"ExpirationDate,omitempty"`
+
+	// ExpirationInDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3outposts-bucket-rule.html#cfn-s3outposts-bucket-rule-expirationindays
+	ExpirationInDays *types.Value `json:"ExpirationInDays,omitempty"`
+
+	// Filter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3outposts-bucket-rule.html#cfn-s3outposts-bucket-rule-filter
+	Filter interface{} `json:"Filter,omitempty"`
+
+	// Id AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3outposts-bucket-rule.html#cfn-s3outposts-bucket-rule-id
+	Id *types.Value `json:"Id,omitempty"`
+
+	// Status AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3outposts-bucket-rule.html#cfn-s3outposts-bucket-rule-status
+	Status *types.Value `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 *Bucket_Rule) AWSCloudFormationType() string {
+	return "AWS::S3Outposts::Bucket.Rule"
+}
diff --git a/goformation/cloudformation/s3outposts/aws-s3outposts-bucketpolicy.go b/goformation/cloudformation/s3outposts/aws-s3outposts-bucketpolicy.go
new file mode 100644
index 0000000000..31e0ade548
--- /dev/null
+++ b/goformation/cloudformation/s3outposts/aws-s3outposts-bucketpolicy.go
@@ -0,0 +1,113 @@
+package s3outposts
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// BucketPolicy AWS CloudFormation Resource (AWS::S3Outposts::BucketPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-bucketpolicy.html
+type BucketPolicy struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-bucketpolicy.html#cfn-s3outposts-bucketpolicy-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// PolicyDocument AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-bucketpolicy.html#cfn-s3outposts-bucketpolicy-policydocument
+	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *BucketPolicy) AWSCloudFormationType() string {
+	return "AWS::S3Outposts::BucketPolicy"
+}
+
+// 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 BucketPolicy) MarshalJSON() ([]byte, error) {
+	type Properties BucketPolicy
+	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 *BucketPolicy) UnmarshalJSON(b []byte) error {
+	type Properties BucketPolicy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = BucketPolicy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/s3outposts/aws-s3outposts-endpoint.go b/goformation/cloudformation/s3outposts/aws-s3outposts-endpoint.go
new file mode 100644
index 0000000000..c84e31e521
--- /dev/null
+++ b/goformation/cloudformation/s3outposts/aws-s3outposts-endpoint.go
@@ -0,0 +1,128 @@
+package s3outposts
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint AWS CloudFormation Resource (AWS::S3Outposts::Endpoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-endpoint.html
+type Endpoint struct {
+
+	// AccessType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-endpoint.html#cfn-s3outposts-endpoint-accesstype
+	AccessType *types.Value `json:"AccessType,omitempty"`
+
+	// CustomerOwnedIpv4Pool AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-endpoint.html#cfn-s3outposts-endpoint-customerownedipv4pool
+	CustomerOwnedIpv4Pool *types.Value `json:"CustomerOwnedIpv4Pool,omitempty"`
+
+	// OutpostId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-endpoint.html#cfn-s3outposts-endpoint-outpostid
+	OutpostId *types.Value `json:"OutpostId,omitempty"`
+
+	// SecurityGroupId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-endpoint.html#cfn-s3outposts-endpoint-securitygroupid
+	SecurityGroupId *types.Value `json:"SecurityGroupId,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-s3outposts-endpoint.html#cfn-s3outposts-endpoint-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint) AWSCloudFormationType() string {
+	return "AWS::S3Outposts::Endpoint"
+}
+
+// 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 Endpoint) MarshalJSON() ([]byte, error) {
+	type Properties Endpoint
+	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 *Endpoint) UnmarshalJSON(b []byte) error {
+	type Properties Endpoint
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Endpoint(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/s3outposts/aws-s3outposts-endpoint_networkinterface.go b/goformation/cloudformation/s3outposts/aws-s3outposts-endpoint_networkinterface.go
new file mode 100644
index 0000000000..50be1afc53
--- /dev/null
+++ b/goformation/cloudformation/s3outposts/aws-s3outposts-endpoint_networkinterface.go
@@ -0,0 +1,37 @@
+package s3outposts
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_NetworkInterface AWS CloudFormation Resource (AWS::S3Outposts::Endpoint.NetworkInterface)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3outposts-endpoint-networkinterface.html
+type Endpoint_NetworkInterface struct {
+
+	// NetworkInterfaceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3outposts-endpoint-networkinterface.html#cfn-s3outposts-endpoint-networkinterface-networkinterfaceid
+	NetworkInterfaceId *types.Value `json:"NetworkInterfaceId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_NetworkInterface) AWSCloudFormationType() string {
+	return "AWS::S3Outposts::Endpoint.NetworkInterface"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-app.go b/goformation/cloudformation/sagemaker/aws-sagemaker-app.go
new file mode 100644
index 0000000000..d43041983f
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-app.go
@@ -0,0 +1,134 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// App AWS CloudFormation Resource (AWS::SageMaker::App)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-app.html
+type App struct {
+
+	// AppName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-app.html#cfn-sagemaker-app-appname
+	AppName *types.Value `json:"AppName,omitempty"`
+
+	// AppType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-app.html#cfn-sagemaker-app-apptype
+	AppType *types.Value `json:"AppType,omitempty"`
+
+	// DomainId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-app.html#cfn-sagemaker-app-domainid
+	DomainId *types.Value `json:"DomainId,omitempty"`
+
+	// ResourceSpec AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-app.html#cfn-sagemaker-app-resourcespec
+	ResourceSpec *App_ResourceSpec `json:"ResourceSpec,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-app.html#cfn-sagemaker-app-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// UserProfileName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-app.html#cfn-sagemaker-app-userprofilename
+	UserProfileName *types.Value `json:"UserProfileName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::SageMaker::App"
+}
+
+// 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 App) MarshalJSON() ([]byte, error) {
+	type Properties App
+	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 *App) UnmarshalJSON(b []byte) error {
+	type Properties App
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = App(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-app_resourcespec.go b/goformation/cloudformation/sagemaker/aws-sagemaker-app_resourcespec.go
new file mode 100644
index 0000000000..9257d72006
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-app_resourcespec.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// App_ResourceSpec AWS CloudFormation Resource (AWS::SageMaker::App.ResourceSpec)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-app-resourcespec.html
+type App_ResourceSpec struct {
+
+	// InstanceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-app-resourcespec.html#cfn-sagemaker-app-resourcespec-instancetype
+	InstanceType *types.Value `json:"InstanceType,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
+	SageMakerImageArn *types.Value `json:"SageMakerImageArn,omitempty"`
+
+	// SageMakerImageVersionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-app-resourcespec.html#cfn-sagemaker-app-resourcespec-sagemakerimageversionarn
+	SageMakerImageVersionArn *types.Value `json:"SageMakerImageVersionArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ResourceSpec) AWSCloudFormationType() string {
+	return "AWS::SageMaker::App.ResourceSpec"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig.go
new file mode 100644
index 0000000000..a8a8ffa5c5
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig.go
@@ -0,0 +1,119 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// AppImageConfig AWS CloudFormation Resource (AWS::SageMaker::AppImageConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-appimageconfig.html
+type AppImageConfig struct {
+
+	// AppImageConfigName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-appimageconfig.html#cfn-sagemaker-appimageconfig-appimageconfigname
+	AppImageConfigName *types.Value `json:"AppImageConfigName,omitempty"`
+
+	// KernelGatewayImageConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-appimageconfig.html#cfn-sagemaker-appimageconfig-kernelgatewayimageconfig
+	KernelGatewayImageConfig *AppImageConfig_KernelGatewayImageConfig `json:"KernelGatewayImageConfig,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-appimageconfig.html#cfn-sagemaker-appimageconfig-tags
+	Tags []cloudformation.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 *AppImageConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::AppImageConfig"
+}
+
+// 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 AppImageConfig) MarshalJSON() ([]byte, error) {
+	type Properties AppImageConfig
+	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 *AppImageConfig) UnmarshalJSON(b []byte) error {
+	type Properties AppImageConfig
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AppImageConfig(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_filesystemconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_filesystemconfig.go
new file mode 100644
index 0000000000..8fc304ba44
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_filesystemconfig.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AppImageConfig_FileSystemConfig AWS CloudFormation Resource (AWS::SageMaker::AppImageConfig.FileSystemConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-appimageconfig-filesystemconfig.html
+type AppImageConfig_FileSystemConfig struct {
+
+	// DefaultGid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-appimageconfig-filesystemconfig.html#cfn-sagemaker-appimageconfig-filesystemconfig-defaultgid
+	DefaultGid *types.Value `json:"DefaultGid,omitempty"`
+
+	// DefaultUid AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-appimageconfig-filesystemconfig.html#cfn-sagemaker-appimageconfig-filesystemconfig-defaultuid
+	DefaultUid *types.Value `json:"DefaultUid,omitempty"`
+
+	// MountPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-appimageconfig-filesystemconfig.html#cfn-sagemaker-appimageconfig-filesystemconfig-mountpath
+	MountPath *types.Value `json:"MountPath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AppImageConfig_FileSystemConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::AppImageConfig.FileSystemConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelgatewayimageconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelgatewayimageconfig.go
new file mode 100644
index 0000000000..c7452534d1
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelgatewayimageconfig.go
@@ -0,0 +1,40 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// AppImageConfig_KernelGatewayImageConfig AWS CloudFormation Resource (AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-appimageconfig-kernelgatewayimageconfig.html
+type AppImageConfig_KernelGatewayImageConfig struct {
+
+	// FileSystemConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-appimageconfig-kernelgatewayimageconfig.html#cfn-sagemaker-appimageconfig-kernelgatewayimageconfig-filesystemconfig
+	FileSystemConfig *AppImageConfig_FileSystemConfig `json:"FileSystemConfig,omitempty"`
+
+	// KernelSpecs AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-appimageconfig-kernelgatewayimageconfig.html#cfn-sagemaker-appimageconfig-kernelgatewayimageconfig-kernelspecs
+	KernelSpecs []AppImageConfig_KernelSpec `json:"KernelSpecs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AppImageConfig_KernelGatewayImageConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelspec.go b/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelspec.go
new file mode 100644
index 0000000000..75121df335
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-appimageconfig_kernelspec.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AppImageConfig_KernelSpec AWS CloudFormation Resource (AWS::SageMaker::AppImageConfig.KernelSpec)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-appimageconfig-kernelspec.html
+type AppImageConfig_KernelSpec struct {
+
+	// DisplayName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-appimageconfig-kernelspec.html#cfn-sagemaker-appimageconfig-kernelspec-displayname
+	DisplayName *types.Value `json:"DisplayName,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-appimageconfig-kernelspec.html#cfn-sagemaker-appimageconfig-kernelspec-name
+	Name *types.Value `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 *AppImageConfig_KernelSpec) AWSCloudFormationType() string {
+	return "AWS::SageMaker::AppImageConfig.KernelSpec"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-coderepository.go b/goformation/cloudformation/sagemaker/aws-sagemaker-coderepository.go
new file mode 100644
index 0000000000..323df62662
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-coderepository.go
@@ -0,0 +1,119 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// CodeRepository AWS CloudFormation Resource (AWS::SageMaker::CodeRepository)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-coderepository.html
+type CodeRepository struct {
+
+	// CodeRepositoryName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-coderepository.html#cfn-sagemaker-coderepository-coderepositoryname
+	CodeRepositoryName *types.Value `json:"CodeRepositoryName,omitempty"`
+
+	// GitConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-coderepository.html#cfn-sagemaker-coderepository-gitconfig
+	GitConfig *CodeRepository_GitConfig `json:"GitConfig,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-coderepository.html#cfn-sagemaker-coderepository-tags
+	Tags []cloudformation.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 *CodeRepository) AWSCloudFormationType() string {
+	return "AWS::SageMaker::CodeRepository"
+}
+
+// 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 CodeRepository) MarshalJSON() ([]byte, error) {
+	type Properties CodeRepository
+	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 *CodeRepository) UnmarshalJSON(b []byte) error {
+	type Properties CodeRepository
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CodeRepository(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-coderepository_gitconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-coderepository_gitconfig.go
new file mode 100644
index 0000000000..4c67ff5eed
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-coderepository_gitconfig.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CodeRepository_GitConfig AWS CloudFormation Resource (AWS::SageMaker::CodeRepository.GitConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-coderepository-gitconfig.html
+type CodeRepository_GitConfig struct {
+
+	// Branch AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-coderepository-gitconfig.html#cfn-sagemaker-coderepository-gitconfig-branch
+	Branch *types.Value `json:"Branch,omitempty"`
+
+	// RepositoryUrl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-coderepository-gitconfig.html#cfn-sagemaker-coderepository-gitconfig-repositoryurl
+	RepositoryUrl *types.Value `json:"RepositoryUrl,omitempty"`
+
+	// SecretArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-coderepository-gitconfig.html#cfn-sagemaker-coderepository-gitconfig-secretarn
+	SecretArn *types.Value `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 *CodeRepository_GitConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::CodeRepository.GitConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition.go b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition.go
new file mode 100644
index 0000000000..485564d122
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition.go
@@ -0,0 +1,154 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataQualityJobDefinition AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-dataqualityjobdefinition.html
+type DataQualityJobDefinition struct {
+
+	// DataQualityAppSpecification AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-dataqualityjobdefinition.html#cfn-sagemaker-dataqualityjobdefinition-dataqualityappspecification
+	DataQualityAppSpecification *DataQualityJobDefinition_DataQualityAppSpecification `json:"DataQualityAppSpecification,omitempty"`
+
+	// DataQualityBaselineConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-dataqualityjobdefinition.html#cfn-sagemaker-dataqualityjobdefinition-dataqualitybaselineconfig
+	DataQualityBaselineConfig *DataQualityJobDefinition_DataQualityBaselineConfig `json:"DataQualityBaselineConfig,omitempty"`
+
+	// DataQualityJobInput AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-dataqualityjobdefinition.html#cfn-sagemaker-dataqualityjobdefinition-dataqualityjobinput
+	DataQualityJobInput *DataQualityJobDefinition_DataQualityJobInput `json:"DataQualityJobInput,omitempty"`
+
+	// DataQualityJobOutputConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-dataqualityjobdefinition.html#cfn-sagemaker-dataqualityjobdefinition-dataqualityjoboutputconfig
+	DataQualityJobOutputConfig *DataQualityJobDefinition_MonitoringOutputConfig `json:"DataQualityJobOutputConfig,omitempty"`
+
+	// JobDefinitionName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-dataqualityjobdefinition.html#cfn-sagemaker-dataqualityjobdefinition-jobdefinitionname
+	JobDefinitionName *types.Value `json:"JobDefinitionName,omitempty"`
+
+	// JobResources AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-dataqualityjobdefinition.html#cfn-sagemaker-dataqualityjobdefinition-jobresources
+	JobResources *DataQualityJobDefinition_MonitoringResources `json:"JobResources,omitempty"`
+
+	// NetworkConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-dataqualityjobdefinition.html#cfn-sagemaker-dataqualityjobdefinition-networkconfig
+	NetworkConfig *DataQualityJobDefinition_NetworkConfig `json:"NetworkConfig,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-dataqualityjobdefinition.html#cfn-sagemaker-dataqualityjobdefinition-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// StoppingCondition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-dataqualityjobdefinition.html#cfn-sagemaker-dataqualityjobdefinition-stoppingcondition
+	StoppingCondition *DataQualityJobDefinition_StoppingCondition `json:"StoppingCondition,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-dataqualityjobdefinition.html#cfn-sagemaker-dataqualityjobdefinition-tags
+	Tags []cloudformation.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 *DataQualityJobDefinition) AWSCloudFormationType() string {
+	return "AWS::SageMaker::DataQualityJobDefinition"
+}
+
+// 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 DataQualityJobDefinition) MarshalJSON() ([]byte, error) {
+	type Properties DataQualityJobDefinition
+	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 *DataQualityJobDefinition) UnmarshalJSON(b []byte) error {
+	type Properties DataQualityJobDefinition
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DataQualityJobDefinition(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_clusterconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_clusterconfig.go
new file mode 100644
index 0000000000..5490320578
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_clusterconfig.go
@@ -0,0 +1,52 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataQualityJobDefinition_ClusterConfig AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.ClusterConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-clusterconfig.html
+type DataQualityJobDefinition_ClusterConfig struct {
+
+	// InstanceCount AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-clusterconfig.html#cfn-sagemaker-dataqualityjobdefinition-clusterconfig-instancecount
+	InstanceCount *types.Value `json:"InstanceCount"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-clusterconfig.html#cfn-sagemaker-dataqualityjobdefinition-clusterconfig-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// VolumeKmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-clusterconfig.html#cfn-sagemaker-dataqualityjobdefinition-clusterconfig-volumekmskeyid
+	VolumeKmsKeyId *types.Value `json:"VolumeKmsKeyId,omitempty"`
+
+	// VolumeSizeInGB AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-clusterconfig.html#cfn-sagemaker-dataqualityjobdefinition-clusterconfig-volumesizeingb
+	VolumeSizeInGB *types.Value `json:"VolumeSizeInGB"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataQualityJobDefinition_ClusterConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::DataQualityJobDefinition.ClusterConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_constraintsresource.go b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_constraintsresource.go
new file mode 100644
index 0000000000..a4eecf0a89
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_constraintsresource.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataQualityJobDefinition_ConstraintsResource AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.ConstraintsResource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-constraintsresource.html
+type DataQualityJobDefinition_ConstraintsResource struct {
+
+	// S3Uri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-constraintsresource.html#cfn-sagemaker-dataqualityjobdefinition-constraintsresource-s3uri
+	S3Uri *types.Value `json:"S3Uri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataQualityJobDefinition_ConstraintsResource) AWSCloudFormationType() string {
+	return "AWS::SageMaker::DataQualityJobDefinition.ConstraintsResource"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityappspecification.go b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityappspecification.go
new file mode 100644
index 0000000000..9180671fda
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityappspecification.go
@@ -0,0 +1,62 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataQualityJobDefinition_DataQualityAppSpecification AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.DataQualityAppSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-dataqualityappspecification.html
+type DataQualityJobDefinition_DataQualityAppSpecification struct {
+
+	// ContainerArguments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-dataqualityappspecification.html#cfn-sagemaker-dataqualityjobdefinition-dataqualityappspecification-containerarguments
+	ContainerArguments *types.Value `json:"ContainerArguments,omitempty"`
+
+	// ContainerEntrypoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-dataqualityappspecification.html#cfn-sagemaker-dataqualityjobdefinition-dataqualityappspecification-containerentrypoint
+	ContainerEntrypoint *types.Value `json:"ContainerEntrypoint,omitempty"`
+
+	// Environment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-dataqualityappspecification.html#cfn-sagemaker-dataqualityjobdefinition-dataqualityappspecification-environment
+	Environment map[string]*types.Value `json:"Environment,omitempty"`
+
+	// ImageUri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-dataqualityappspecification.html#cfn-sagemaker-dataqualityjobdefinition-dataqualityappspecification-imageuri
+	ImageUri *types.Value `json:"ImageUri,omitempty"`
+
+	// PostAnalyticsProcessorSourceUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-dataqualityappspecification.html#cfn-sagemaker-dataqualityjobdefinition-dataqualityappspecification-postanalyticsprocessorsourceuri
+	PostAnalyticsProcessorSourceUri *types.Value `json:"PostAnalyticsProcessorSourceUri,omitempty"`
+
+	// RecordPreprocessorSourceUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-dataqualityappspecification.html#cfn-sagemaker-dataqualityjobdefinition-dataqualityappspecification-recordpreprocessorsourceuri
+	RecordPreprocessorSourceUri *types.Value `json:"RecordPreprocessorSourceUri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataQualityJobDefinition_DataQualityAppSpecification) AWSCloudFormationType() string {
+	return "AWS::SageMaker::DataQualityJobDefinition.DataQualityAppSpecification"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualitybaselineconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualitybaselineconfig.go
new file mode 100644
index 0000000000..448c569bb6
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualitybaselineconfig.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataQualityJobDefinition_DataQualityBaselineConfig AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.DataQualityBaselineConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-dataqualitybaselineconfig.html
+type DataQualityJobDefinition_DataQualityBaselineConfig struct {
+
+	// BaseliningJobName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-dataqualitybaselineconfig.html#cfn-sagemaker-dataqualityjobdefinition-dataqualitybaselineconfig-baseliningjobname
+	BaseliningJobName *types.Value `json:"BaseliningJobName,omitempty"`
+
+	// ConstraintsResource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-dataqualitybaselineconfig.html#cfn-sagemaker-dataqualityjobdefinition-dataqualitybaselineconfig-constraintsresource
+	ConstraintsResource *DataQualityJobDefinition_ConstraintsResource `json:"ConstraintsResource,omitempty"`
+
+	// StatisticsResource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-dataqualitybaselineconfig.html#cfn-sagemaker-dataqualityjobdefinition-dataqualitybaselineconfig-statisticsresource
+	StatisticsResource *DataQualityJobDefinition_StatisticsResource `json:"StatisticsResource,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataQualityJobDefinition_DataQualityBaselineConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::DataQualityJobDefinition.DataQualityBaselineConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityjobinput.go b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityjobinput.go
new file mode 100644
index 0000000000..5a092d6bec
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_dataqualityjobinput.go
@@ -0,0 +1,35 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataQualityJobDefinition_DataQualityJobInput AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.DataQualityJobInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-dataqualityjobinput.html
+type DataQualityJobDefinition_DataQualityJobInput struct {
+
+	// EndpointInput AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-dataqualityjobinput.html#cfn-sagemaker-dataqualityjobdefinition-dataqualityjobinput-endpointinput
+	EndpointInput *DataQualityJobDefinition_EndpointInput `json:"EndpointInput,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataQualityJobDefinition_DataQualityJobInput) AWSCloudFormationType() string {
+	return "AWS::SageMaker::DataQualityJobDefinition.DataQualityJobInput"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_endpointinput.go b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_endpointinput.go
new file mode 100644
index 0000000000..4fd58f9d99
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_endpointinput.go
@@ -0,0 +1,52 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataQualityJobDefinition_EndpointInput AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.EndpointInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-endpointinput.html
+type DataQualityJobDefinition_EndpointInput struct {
+
+	// EndpointName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-endpointinput.html#cfn-sagemaker-dataqualityjobdefinition-endpointinput-endpointname
+	EndpointName *types.Value `json:"EndpointName,omitempty"`
+
+	// LocalPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-endpointinput.html#cfn-sagemaker-dataqualityjobdefinition-endpointinput-localpath
+	LocalPath *types.Value `json:"LocalPath,omitempty"`
+
+	// S3DataDistributionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-endpointinput.html#cfn-sagemaker-dataqualityjobdefinition-endpointinput-s3datadistributiontype
+	S3DataDistributionType *types.Value `json:"S3DataDistributionType,omitempty"`
+
+	// S3InputMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-endpointinput.html#cfn-sagemaker-dataqualityjobdefinition-endpointinput-s3inputmode
+	S3InputMode *types.Value `json:"S3InputMode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataQualityJobDefinition_EndpointInput) AWSCloudFormationType() string {
+	return "AWS::SageMaker::DataQualityJobDefinition.EndpointInput"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutput.go b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutput.go
new file mode 100644
index 0000000000..28e2de7ef1
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutput.go
@@ -0,0 +1,35 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataQualityJobDefinition_MonitoringOutput AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.MonitoringOutput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-monitoringoutput.html
+type DataQualityJobDefinition_MonitoringOutput struct {
+
+	// S3Output AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-monitoringoutput.html#cfn-sagemaker-dataqualityjobdefinition-monitoringoutput-s3output
+	S3Output *DataQualityJobDefinition_S3Output `json:"S3Output,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataQualityJobDefinition_MonitoringOutput) AWSCloudFormationType() string {
+	return "AWS::SageMaker::DataQualityJobDefinition.MonitoringOutput"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutputconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutputconfig.go
new file mode 100644
index 0000000000..dde3f75cc1
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringoutputconfig.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataQualityJobDefinition_MonitoringOutputConfig AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.MonitoringOutputConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-monitoringoutputconfig.html
+type DataQualityJobDefinition_MonitoringOutputConfig struct {
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-monitoringoutputconfig.html#cfn-sagemaker-dataqualityjobdefinition-monitoringoutputconfig-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// MonitoringOutputs AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-monitoringoutputconfig.html#cfn-sagemaker-dataqualityjobdefinition-monitoringoutputconfig-monitoringoutputs
+	MonitoringOutputs []DataQualityJobDefinition_MonitoringOutput `json:"MonitoringOutputs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataQualityJobDefinition_MonitoringOutputConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::DataQualityJobDefinition.MonitoringOutputConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringresources.go b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringresources.go
new file mode 100644
index 0000000000..3919bb58a6
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_monitoringresources.go
@@ -0,0 +1,35 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataQualityJobDefinition_MonitoringResources AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.MonitoringResources)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-monitoringresources.html
+type DataQualityJobDefinition_MonitoringResources struct {
+
+	// ClusterConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-monitoringresources.html#cfn-sagemaker-dataqualityjobdefinition-monitoringresources-clusterconfig
+	ClusterConfig *DataQualityJobDefinition_ClusterConfig `json:"ClusterConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataQualityJobDefinition_MonitoringResources) AWSCloudFormationType() string {
+	return "AWS::SageMaker::DataQualityJobDefinition.MonitoringResources"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_networkconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_networkconfig.go
new file mode 100644
index 0000000000..09800b460c
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_networkconfig.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataQualityJobDefinition_NetworkConfig AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.NetworkConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-networkconfig.html
+type DataQualityJobDefinition_NetworkConfig struct {
+
+	// EnableInterContainerTrafficEncryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-networkconfig.html#cfn-sagemaker-dataqualityjobdefinition-networkconfig-enableintercontainertrafficencryption
+	EnableInterContainerTrafficEncryption *types.Value `json:"EnableInterContainerTrafficEncryption,omitempty"`
+
+	// EnableNetworkIsolation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-networkconfig.html#cfn-sagemaker-dataqualityjobdefinition-networkconfig-enablenetworkisolation
+	EnableNetworkIsolation *types.Value `json:"EnableNetworkIsolation,omitempty"`
+
+	// VpcConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-networkconfig.html#cfn-sagemaker-dataqualityjobdefinition-networkconfig-vpcconfig
+	VpcConfig *DataQualityJobDefinition_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 *DataQualityJobDefinition_NetworkConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::DataQualityJobDefinition.NetworkConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_s3output.go b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_s3output.go
new file mode 100644
index 0000000000..f337b85f23
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_s3output.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataQualityJobDefinition_S3Output AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.S3Output)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-s3output.html
+type DataQualityJobDefinition_S3Output struct {
+
+	// LocalPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-s3output.html#cfn-sagemaker-dataqualityjobdefinition-s3output-localpath
+	LocalPath *types.Value `json:"LocalPath,omitempty"`
+
+	// S3UploadMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-s3output.html#cfn-sagemaker-dataqualityjobdefinition-s3output-s3uploadmode
+	S3UploadMode *types.Value `json:"S3UploadMode,omitempty"`
+
+	// S3Uri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-s3output.html#cfn-sagemaker-dataqualityjobdefinition-s3output-s3uri
+	S3Uri *types.Value `json:"S3Uri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataQualityJobDefinition_S3Output) AWSCloudFormationType() string {
+	return "AWS::SageMaker::DataQualityJobDefinition.S3Output"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_statisticsresource.go b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_statisticsresource.go
new file mode 100644
index 0000000000..8e73ca616b
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_statisticsresource.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataQualityJobDefinition_StatisticsResource AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.StatisticsResource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-statisticsresource.html
+type DataQualityJobDefinition_StatisticsResource struct {
+
+	// S3Uri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-statisticsresource.html#cfn-sagemaker-dataqualityjobdefinition-statisticsresource-s3uri
+	S3Uri *types.Value `json:"S3Uri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataQualityJobDefinition_StatisticsResource) AWSCloudFormationType() string {
+	return "AWS::SageMaker::DataQualityJobDefinition.StatisticsResource"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_stoppingcondition.go b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_stoppingcondition.go
new file mode 100644
index 0000000000..e36903eb87
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_stoppingcondition.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataQualityJobDefinition_StoppingCondition AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.StoppingCondition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-stoppingcondition.html
+type DataQualityJobDefinition_StoppingCondition struct {
+
+	// MaxRuntimeInSeconds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-stoppingcondition.html#cfn-sagemaker-dataqualityjobdefinition-stoppingcondition-maxruntimeinseconds
+	MaxRuntimeInSeconds *types.Value `json:"MaxRuntimeInSeconds"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataQualityJobDefinition_StoppingCondition) AWSCloudFormationType() string {
+	return "AWS::SageMaker::DataQualityJobDefinition.StoppingCondition"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_vpcconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_vpcconfig.go
new file mode 100644
index 0000000000..6dc85ad752
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-dataqualityjobdefinition_vpcconfig.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DataQualityJobDefinition_VpcConfig AWS CloudFormation Resource (AWS::SageMaker::DataQualityJobDefinition.VpcConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-vpcconfig.html
+type DataQualityJobDefinition_VpcConfig struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-vpcconfig.html#cfn-sagemaker-dataqualityjobdefinition-vpcconfig-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// Subnets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-dataqualityjobdefinition-vpcconfig.html#cfn-sagemaker-dataqualityjobdefinition-vpcconfig-subnets
+	Subnets *types.Value `json:"Subnets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DataQualityJobDefinition_VpcConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::DataQualityJobDefinition.VpcConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-device.go b/goformation/cloudformation/sagemaker/aws-sagemaker-device.go
new file mode 100644
index 0000000000..93b481d83f
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-device.go
@@ -0,0 +1,119 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Device AWS CloudFormation Resource (AWS::SageMaker::Device)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-device.html
+type Device struct {
+
+	// Device AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-device.html#cfn-sagemaker-device-device
+	Device interface{} `json:"Device,omitempty"`
+
+	// DeviceFleetName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-device.html#cfn-sagemaker-device-devicefleetname
+	DeviceFleetName *types.Value `json:"DeviceFleetName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-device.html#cfn-sagemaker-device-tags
+	Tags []cloudformation.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 *Device) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Device"
+}
+
+// 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 Device) MarshalJSON() ([]byte, error) {
+	type Properties Device
+	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 *Device) UnmarshalJSON(b []byte) error {
+	type Properties Device
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Device(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-device_device.go b/goformation/cloudformation/sagemaker/aws-sagemaker-device_device.go
new file mode 100644
index 0000000000..dcaf173694
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-device_device.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Device_Device AWS CloudFormation Resource (AWS::SageMaker::Device.Device)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-device-device.html
+type Device_Device struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-device-device.html#cfn-sagemaker-device-device-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DeviceName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-device-device.html#cfn-sagemaker-device-device-devicename
+	DeviceName *types.Value `json:"DeviceName,omitempty"`
+
+	// IotThingName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-device-device.html#cfn-sagemaker-device-device-iotthingname
+	IotThingName *types.Value `json:"IotThingName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Device_Device) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Device.Device"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-devicefleet.go b/goformation/cloudformation/sagemaker/aws-sagemaker-devicefleet.go
new file mode 100644
index 0000000000..f2f648b09d
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-devicefleet.go
@@ -0,0 +1,129 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeviceFleet AWS CloudFormation Resource (AWS::SageMaker::DeviceFleet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-devicefleet.html
+type DeviceFleet struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-devicefleet.html#cfn-sagemaker-devicefleet-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DeviceFleetName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-devicefleet.html#cfn-sagemaker-devicefleet-devicefleetname
+	DeviceFleetName *types.Value `json:"DeviceFleetName,omitempty"`
+
+	// OutputConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-devicefleet.html#cfn-sagemaker-devicefleet-outputconfig
+	OutputConfig *DeviceFleet_EdgeOutputConfig `json:"OutputConfig,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-devicefleet.html#cfn-sagemaker-devicefleet-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-devicefleet.html#cfn-sagemaker-devicefleet-tags
+	Tags []cloudformation.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 *DeviceFleet) AWSCloudFormationType() string {
+	return "AWS::SageMaker::DeviceFleet"
+}
+
+// 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 DeviceFleet) MarshalJSON() ([]byte, error) {
+	type Properties DeviceFleet
+	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 *DeviceFleet) UnmarshalJSON(b []byte) error {
+	type Properties DeviceFleet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = DeviceFleet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-devicefleet_edgeoutputconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-devicefleet_edgeoutputconfig.go
new file mode 100644
index 0000000000..be424223de
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-devicefleet_edgeoutputconfig.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// DeviceFleet_EdgeOutputConfig AWS CloudFormation Resource (AWS::SageMaker::DeviceFleet.EdgeOutputConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-devicefleet-edgeoutputconfig.html
+type DeviceFleet_EdgeOutputConfig struct {
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-devicefleet-edgeoutputconfig.html#cfn-sagemaker-devicefleet-edgeoutputconfig-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// S3OutputLocation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-devicefleet-edgeoutputconfig.html#cfn-sagemaker-devicefleet-edgeoutputconfig-s3outputlocation
+	S3OutputLocation *types.Value `json:"S3OutputLocation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *DeviceFleet_EdgeOutputConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::DeviceFleet.EdgeOutputConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-domain.go b/goformation/cloudformation/sagemaker/aws-sagemaker-domain.go
new file mode 100644
index 0000000000..d742027e73
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-domain.go
@@ -0,0 +1,144 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain AWS CloudFormation Resource (AWS::SageMaker::Domain)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-domain.html
+type Domain struct {
+
+	// AppNetworkAccessType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-domain.html#cfn-sagemaker-domain-appnetworkaccesstype
+	AppNetworkAccessType *types.Value `json:"AppNetworkAccessType,omitempty"`
+
+	// AuthMode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-domain.html#cfn-sagemaker-domain-authmode
+	AuthMode *types.Value `json:"AuthMode,omitempty"`
+
+	// DefaultUserSettings AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-domain.html#cfn-sagemaker-domain-defaultusersettings
+	DefaultUserSettings *Domain_UserSettings `json:"DefaultUserSettings,omitempty"`
+
+	// DomainName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-domain.html#cfn-sagemaker-domain-domainname
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-domain.html#cfn-sagemaker-domain-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-domain.html#cfn-sagemaker-domain-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-domain.html#cfn-sagemaker-domain-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-domain.html#cfn-sagemaker-domain-vpcid
+	VpcId *types.Value `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 *Domain) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Domain"
+}
+
+// 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 Domain) MarshalJSON() ([]byte, error) {
+	type Properties Domain
+	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 *Domain) UnmarshalJSON(b []byte) error {
+	type Properties Domain
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Domain(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-domain_customimage.go b/goformation/cloudformation/sagemaker/aws-sagemaker-domain_customimage.go
new file mode 100644
index 0000000000..c484ad99af
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-domain_customimage.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_CustomImage AWS CloudFormation Resource (AWS::SageMaker::Domain.CustomImage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-customimage.html
+type Domain_CustomImage struct {
+
+	// AppImageConfigName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-customimage.html#cfn-sagemaker-domain-customimage-appimageconfigname
+	AppImageConfigName *types.Value `json:"AppImageConfigName,omitempty"`
+
+	// ImageName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-customimage.html#cfn-sagemaker-domain-customimage-imagename
+	ImageName *types.Value `json:"ImageName,omitempty"`
+
+	// ImageVersionNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-customimage.html#cfn-sagemaker-domain-customimage-imageversionnumber
+	ImageVersionNumber *types.Value `json:"ImageVersionNumber,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CustomImage) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Domain.CustomImage"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-domain_jupyterserverappsettings.go b/goformation/cloudformation/sagemaker/aws-sagemaker-domain_jupyterserverappsettings.go
new file mode 100644
index 0000000000..d658a93bcd
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-domain_jupyterserverappsettings.go
@@ -0,0 +1,35 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_JupyterServerAppSettings AWS CloudFormation Resource (AWS::SageMaker::Domain.JupyterServerAppSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-jupyterserverappsettings.html
+type Domain_JupyterServerAppSettings struct {
+
+	// DefaultResourceSpec AWS CloudFormation Property
+	// Required: false
+	// 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"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_JupyterServerAppSettings) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Domain.JupyterServerAppSettings"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-domain_kernelgatewayappsettings.go b/goformation/cloudformation/sagemaker/aws-sagemaker-domain_kernelgatewayappsettings.go
new file mode 100644
index 0000000000..8b8fd080c6
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-domain_kernelgatewayappsettings.go
@@ -0,0 +1,40 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_KernelGatewayAppSettings AWS CloudFormation Resource (AWS::SageMaker::Domain.KernelGatewayAppSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-kernelgatewayappsettings.html
+type Domain_KernelGatewayAppSettings struct {
+
+	// CustomImages AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-kernelgatewayappsettings.html#cfn-sagemaker-domain-kernelgatewayappsettings-customimages
+	CustomImages []Domain_CustomImage `json:"CustomImages,omitempty"`
+
+	// DefaultResourceSpec AWS CloudFormation Property
+	// Required: false
+	// 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"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_KernelGatewayAppSettings) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Domain.KernelGatewayAppSettings"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-domain_resourcespec.go b/goformation/cloudformation/sagemaker/aws-sagemaker-domain_resourcespec.go
new file mode 100644
index 0000000000..c54612f7fe
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-domain_resourcespec.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_ResourceSpec AWS CloudFormation Resource (AWS::SageMaker::Domain.ResourceSpec)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-resourcespec.html
+type Domain_ResourceSpec struct {
+
+	// InstanceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-resourcespec.html#cfn-sagemaker-domain-resourcespec-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// SageMakerImageArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-resourcespec.html#cfn-sagemaker-domain-resourcespec-sagemakerimagearn
+	SageMakerImageArn *types.Value `json:"SageMakerImageArn,omitempty"`
+
+	// SageMakerImageVersionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-resourcespec.html#cfn-sagemaker-domain-resourcespec-sagemakerimageversionarn
+	SageMakerImageVersionArn *types.Value `json:"SageMakerImageVersionArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ResourceSpec) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Domain.ResourceSpec"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-domain_sharingsettings.go b/goformation/cloudformation/sagemaker/aws-sagemaker-domain_sharingsettings.go
new file mode 100644
index 0000000000..5eda9f41ca
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-domain_sharingsettings.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_SharingSettings AWS CloudFormation Resource (AWS::SageMaker::Domain.SharingSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-sharingsettings.html
+type Domain_SharingSettings struct {
+
+	// NotebookOutputOption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-sharingsettings.html#cfn-sagemaker-domain-sharingsettings-notebookoutputoption
+	NotebookOutputOption *types.Value `json:"NotebookOutputOption,omitempty"`
+
+	// S3KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-sharingsettings.html#cfn-sagemaker-domain-sharingsettings-s3kmskeyid
+	S3KmsKeyId *types.Value `json:"S3KmsKeyId,omitempty"`
+
+	// S3OutputPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-sharingsettings.html#cfn-sagemaker-domain-sharingsettings-s3outputpath
+	S3OutputPath *types.Value `json:"S3OutputPath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SharingSettings) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Domain.SharingSettings"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-domain_usersettings.go b/goformation/cloudformation/sagemaker/aws-sagemaker-domain_usersettings.go
new file mode 100644
index 0000000000..6607a64be2
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-domain_usersettings.go
@@ -0,0 +1,57 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain_UserSettings AWS CloudFormation Resource (AWS::SageMaker::Domain.UserSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-usersettings.html
+type Domain_UserSettings struct {
+
+	// ExecutionRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-usersettings.html#cfn-sagemaker-domain-usersettings-executionrole
+	ExecutionRole *types.Value `json:"ExecutionRole,omitempty"`
+
+	// JupyterServerAppSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-usersettings.html#cfn-sagemaker-domain-usersettings-jupyterserverappsettings
+	JupyterServerAppSettings *Domain_JupyterServerAppSettings `json:"JupyterServerAppSettings,omitempty"`
+
+	// KernelGatewayAppSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-usersettings.html#cfn-sagemaker-domain-usersettings-kernelgatewayappsettings
+	KernelGatewayAppSettings *Domain_KernelGatewayAppSettings `json:"KernelGatewayAppSettings,omitempty"`
+
+	// SecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-usersettings.html#cfn-sagemaker-domain-usersettings-securitygroups
+	SecurityGroups *types.Value `json:"SecurityGroups,omitempty"`
+
+	// SharingSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-domain-usersettings.html#cfn-sagemaker-domain-usersettings-sharingsettings
+	SharingSettings *Domain_SharingSettings `json:"SharingSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_UserSettings) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Domain.UserSettings"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint.go b/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint.go
new file mode 100644
index 0000000000..0e833c4073
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint.go
@@ -0,0 +1,139 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint AWS CloudFormation Resource (AWS::SageMaker::Endpoint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-endpoint.html
+type Endpoint struct {
+
+	// DeploymentConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-endpoint.html#cfn-sagemaker-endpoint-deploymentconfig
+	DeploymentConfig *Endpoint_DeploymentConfig `json:"DeploymentConfig,omitempty"`
+
+	// EndpointConfigName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-endpoint.html#cfn-sagemaker-endpoint-endpointconfigname
+	EndpointConfigName *types.Value `json:"EndpointConfigName,omitempty"`
+
+	// EndpointName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-endpoint.html#cfn-sagemaker-endpoint-endpointname
+	EndpointName *types.Value `json:"EndpointName,omitempty"`
+
+	// ExcludeRetainedVariantProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-endpoint.html#cfn-sagemaker-endpoint-excluderetainedvariantproperties
+	ExcludeRetainedVariantProperties []Endpoint_VariantProperty `json:"ExcludeRetainedVariantProperties,omitempty"`
+
+	// RetainAllVariantProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-endpoint.html#cfn-sagemaker-endpoint-retainallvariantproperties
+	RetainAllVariantProperties *types.Value `json:"RetainAllVariantProperties,omitempty"`
+
+	// RetainDeploymentConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-endpoint.html#cfn-sagemaker-endpoint-retaindeploymentconfig
+	RetainDeploymentConfig *types.Value `json:"RetainDeploymentConfig,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-endpoint.html#cfn-sagemaker-endpoint-tags
+	Tags []cloudformation.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 *Endpoint) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Endpoint"
+}
+
+// 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 Endpoint) MarshalJSON() ([]byte, error) {
+	type Properties Endpoint
+	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 *Endpoint) UnmarshalJSON(b []byte) error {
+	type Properties Endpoint
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Endpoint(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_alarm.go b/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_alarm.go
new file mode 100644
index 0000000000..c2e5f50087
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_alarm.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_Alarm AWS CloudFormation Resource (AWS::SageMaker::Endpoint.Alarm)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-alarm.html
+type Endpoint_Alarm struct {
+
+	// AlarmName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-alarm.html#cfn-sagemaker-endpoint-alarm-alarmname
+	AlarmName *types.Value `json:"AlarmName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_Alarm) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Endpoint.Alarm"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_autorollbackconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_autorollbackconfig.go
new file mode 100644
index 0000000000..e6452593b1
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_autorollbackconfig.go
@@ -0,0 +1,35 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_AutoRollbackConfig AWS CloudFormation Resource (AWS::SageMaker::Endpoint.AutoRollbackConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-autorollbackconfig.html
+type Endpoint_AutoRollbackConfig struct {
+
+	// Alarms AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-autorollbackconfig.html#cfn-sagemaker-endpoint-autorollbackconfig-alarms
+	Alarms []Endpoint_Alarm `json:"Alarms,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_AutoRollbackConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Endpoint.AutoRollbackConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_bluegreenupdatepolicy.go b/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_bluegreenupdatepolicy.go
new file mode 100644
index 0000000000..f23fffe955
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_bluegreenupdatepolicy.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_BlueGreenUpdatePolicy AWS CloudFormation Resource (AWS::SageMaker::Endpoint.BlueGreenUpdatePolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-bluegreenupdatepolicy.html
+type Endpoint_BlueGreenUpdatePolicy struct {
+
+	// MaximumExecutionTimeoutInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-bluegreenupdatepolicy.html#cfn-sagemaker-endpoint-bluegreenupdatepolicy-maximumexecutiontimeoutinseconds
+	MaximumExecutionTimeoutInSeconds *types.Value `json:"MaximumExecutionTimeoutInSeconds,omitempty"`
+
+	// TerminationWaitInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-bluegreenupdatepolicy.html#cfn-sagemaker-endpoint-bluegreenupdatepolicy-terminationwaitinseconds
+	TerminationWaitInSeconds *types.Value `json:"TerminationWaitInSeconds,omitempty"`
+
+	// TrafficRoutingConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-bluegreenupdatepolicy.html#cfn-sagemaker-endpoint-bluegreenupdatepolicy-trafficroutingconfiguration
+	TrafficRoutingConfiguration *Endpoint_TrafficRoutingConfig `json:"TrafficRoutingConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_BlueGreenUpdatePolicy) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Endpoint.BlueGreenUpdatePolicy"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_capacitysize.go b/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_capacitysize.go
new file mode 100644
index 0000000000..93bf9eb75d
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_capacitysize.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_CapacitySize AWS CloudFormation Resource (AWS::SageMaker::Endpoint.CapacitySize)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-capacitysize.html
+type Endpoint_CapacitySize struct {
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-capacitysize.html#cfn-sagemaker-endpoint-capacitysize-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-capacitysize.html#cfn-sagemaker-endpoint-capacitysize-value
+	Value *types.Value `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 *Endpoint_CapacitySize) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Endpoint.CapacitySize"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_deploymentconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_deploymentconfig.go
new file mode 100644
index 0000000000..dd8e40fc86
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_deploymentconfig.go
@@ -0,0 +1,40 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_DeploymentConfig AWS CloudFormation Resource (AWS::SageMaker::Endpoint.DeploymentConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-deploymentconfig.html
+type Endpoint_DeploymentConfig struct {
+
+	// AutoRollbackConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-deploymentconfig.html#cfn-sagemaker-endpoint-deploymentconfig-autorollbackconfiguration
+	AutoRollbackConfiguration *Endpoint_AutoRollbackConfig `json:"AutoRollbackConfiguration,omitempty"`
+
+	// BlueGreenUpdatePolicy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-deploymentconfig.html#cfn-sagemaker-endpoint-deploymentconfig-bluegreenupdatepolicy
+	BlueGreenUpdatePolicy *Endpoint_BlueGreenUpdatePolicy `json:"BlueGreenUpdatePolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_DeploymentConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Endpoint.DeploymentConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_trafficroutingconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_trafficroutingconfig.go
new file mode 100644
index 0000000000..4f46777623
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_trafficroutingconfig.go
@@ -0,0 +1,52 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_TrafficRoutingConfig AWS CloudFormation Resource (AWS::SageMaker::Endpoint.TrafficRoutingConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-trafficroutingconfig.html
+type Endpoint_TrafficRoutingConfig struct {
+
+	// CanarySize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-trafficroutingconfig.html#cfn-sagemaker-endpoint-trafficroutingconfig-canarysize
+	CanarySize *Endpoint_CapacitySize `json:"CanarySize,omitempty"`
+
+	// LinearStepSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-trafficroutingconfig.html#cfn-sagemaker-endpoint-trafficroutingconfig-linearstepsize
+	LinearStepSize *Endpoint_CapacitySize `json:"LinearStepSize,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-trafficroutingconfig.html#cfn-sagemaker-endpoint-trafficroutingconfig-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// WaitIntervalInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-trafficroutingconfig.html#cfn-sagemaker-endpoint-trafficroutingconfig-waitintervalinseconds
+	WaitIntervalInSeconds *types.Value `json:"WaitIntervalInSeconds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_TrafficRoutingConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Endpoint.TrafficRoutingConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_variantproperty.go b/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_variantproperty.go
new file mode 100644
index 0000000000..eb4ba99976
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-endpoint_variantproperty.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Endpoint_VariantProperty AWS CloudFormation Resource (AWS::SageMaker::Endpoint.VariantProperty)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-variantproperty.html
+type Endpoint_VariantProperty struct {
+
+	// VariantPropertyType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpoint-variantproperty.html#cfn-sagemaker-endpoint-variantproperty-variantpropertytype
+	VariantPropertyType *types.Value `json:"VariantPropertyType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Endpoint_VariantProperty) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Endpoint.VariantProperty"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig.go
new file mode 100644
index 0000000000..ce3b9ae863
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig.go
@@ -0,0 +1,134 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// EndpointConfig AWS CloudFormation Resource (AWS::SageMaker::EndpointConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-endpointconfig.html
+type EndpointConfig struct {
+
+	// AsyncInferenceConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-endpointconfig.html#cfn-sagemaker-endpointconfig-asyncinferenceconfig
+	AsyncInferenceConfig *EndpointConfig_AsyncInferenceConfig `json:"AsyncInferenceConfig,omitempty"`
+
+	// DataCaptureConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-endpointconfig.html#cfn-sagemaker-endpointconfig-datacaptureconfig
+	DataCaptureConfig *EndpointConfig_DataCaptureConfig `json:"DataCaptureConfig,omitempty"`
+
+	// EndpointConfigName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-endpointconfig.html#cfn-sagemaker-endpointconfig-endpointconfigname
+	EndpointConfigName *types.Value `json:"EndpointConfigName,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-endpointconfig.html#cfn-sagemaker-endpointconfig-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// ProductionVariants AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-endpointconfig.html#cfn-sagemaker-endpointconfig-productionvariants
+	ProductionVariants []EndpointConfig_ProductionVariant `json:"ProductionVariants,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-endpointconfig.html#cfn-sagemaker-endpointconfig-tags
+	Tags []cloudformation.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 *EndpointConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::EndpointConfig"
+}
+
+// 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 EndpointConfig) MarshalJSON() ([]byte, error) {
+	type Properties EndpointConfig
+	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 *EndpointConfig) UnmarshalJSON(b []byte) error {
+	type Properties EndpointConfig
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = EndpointConfig(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceclientconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceclientconfig.go
new file mode 100644
index 0000000000..5c105ed69d
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceclientconfig.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EndpointConfig_AsyncInferenceClientConfig AWS CloudFormation Resource (AWS::SageMaker::EndpointConfig.AsyncInferenceClientConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-asyncinferenceclientconfig.html
+type EndpointConfig_AsyncInferenceClientConfig struct {
+
+	// MaxConcurrentInvocationsPerInstance AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-asyncinferenceclientconfig.html#cfn-sagemaker-endpointconfig-asyncinferenceclientconfig-maxconcurrentinvocationsperinstance
+	MaxConcurrentInvocationsPerInstance *types.Value `json:"MaxConcurrentInvocationsPerInstance,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EndpointConfig_AsyncInferenceClientConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::EndpointConfig.AsyncInferenceClientConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceconfig.go
new file mode 100644
index 0000000000..68b16d1724
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceconfig.go
@@ -0,0 +1,40 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// EndpointConfig_AsyncInferenceConfig AWS CloudFormation Resource (AWS::SageMaker::EndpointConfig.AsyncInferenceConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-asyncinferenceconfig.html
+type EndpointConfig_AsyncInferenceConfig struct {
+
+	// ClientConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-asyncinferenceconfig.html#cfn-sagemaker-endpointconfig-asyncinferenceconfig-clientconfig
+	ClientConfig *EndpointConfig_AsyncInferenceClientConfig `json:"ClientConfig,omitempty"`
+
+	// OutputConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-asyncinferenceconfig.html#cfn-sagemaker-endpointconfig-asyncinferenceconfig-outputconfig
+	OutputConfig *EndpointConfig_AsyncInferenceOutputConfig `json:"OutputConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EndpointConfig_AsyncInferenceConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::EndpointConfig.AsyncInferenceConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferencenotificationconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferencenotificationconfig.go
new file mode 100644
index 0000000000..7f8d68ade8
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferencenotificationconfig.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EndpointConfig_AsyncInferenceNotificationConfig AWS CloudFormation Resource (AWS::SageMaker::EndpointConfig.AsyncInferenceNotificationConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-asyncinferencenotificationconfig.html
+type EndpointConfig_AsyncInferenceNotificationConfig struct {
+
+	// ErrorTopic AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-asyncinferencenotificationconfig.html#cfn-sagemaker-endpointconfig-asyncinferencenotificationconfig-errortopic
+	ErrorTopic *types.Value `json:"ErrorTopic,omitempty"`
+
+	// SuccessTopic AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-asyncinferencenotificationconfig.html#cfn-sagemaker-endpointconfig-asyncinferencenotificationconfig-successtopic
+	SuccessTopic *types.Value `json:"SuccessTopic,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EndpointConfig_AsyncInferenceNotificationConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::EndpointConfig.AsyncInferenceNotificationConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceoutputconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceoutputconfig.go
new file mode 100644
index 0000000000..0654a0a0f6
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_asyncinferenceoutputconfig.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EndpointConfig_AsyncInferenceOutputConfig AWS CloudFormation Resource (AWS::SageMaker::EndpointConfig.AsyncInferenceOutputConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-asyncinferenceoutputconfig.html
+type EndpointConfig_AsyncInferenceOutputConfig struct {
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-asyncinferenceoutputconfig.html#cfn-sagemaker-endpointconfig-asyncinferenceoutputconfig-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// NotificationConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-asyncinferenceoutputconfig.html#cfn-sagemaker-endpointconfig-asyncinferenceoutputconfig-notificationconfig
+	NotificationConfig *EndpointConfig_AsyncInferenceNotificationConfig `json:"NotificationConfig,omitempty"`
+
+	// S3OutputPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-asyncinferenceoutputconfig.html#cfn-sagemaker-endpointconfig-asyncinferenceoutputconfig-s3outputpath
+	S3OutputPath *types.Value `json:"S3OutputPath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EndpointConfig_AsyncInferenceOutputConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::EndpointConfig.AsyncInferenceOutputConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_capturecontenttypeheader.go b/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_capturecontenttypeheader.go
new file mode 100644
index 0000000000..3dca751685
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_capturecontenttypeheader.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EndpointConfig_CaptureContentTypeHeader AWS CloudFormation Resource (AWS::SageMaker::EndpointConfig.CaptureContentTypeHeader)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-datacaptureconfig-capturecontenttypeheader.html
+type EndpointConfig_CaptureContentTypeHeader struct {
+
+	// CsvContentTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-datacaptureconfig-capturecontenttypeheader.html#cfn-sagemaker-endpointconfig-datacaptureconfig-capturecontenttypeheader-csvcontenttypes
+	CsvContentTypes *types.Value `json:"CsvContentTypes,omitempty"`
+
+	// JsonContentTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-datacaptureconfig-capturecontenttypeheader.html#cfn-sagemaker-endpointconfig-datacaptureconfig-capturecontenttypeheader-jsoncontenttypes
+	JsonContentTypes *types.Value `json:"JsonContentTypes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EndpointConfig_CaptureContentTypeHeader) AWSCloudFormationType() string {
+	return "AWS::SageMaker::EndpointConfig.CaptureContentTypeHeader"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_captureoption.go b/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_captureoption.go
new file mode 100644
index 0000000000..56c11717a4
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_captureoption.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EndpointConfig_CaptureOption AWS CloudFormation Resource (AWS::SageMaker::EndpointConfig.CaptureOption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-captureoption.html
+type EndpointConfig_CaptureOption struct {
+
+	// CaptureMode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-captureoption.html#cfn-sagemaker-endpointconfig-captureoption-capturemode
+	CaptureMode *types.Value `json:"CaptureMode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EndpointConfig_CaptureOption) AWSCloudFormationType() string {
+	return "AWS::SageMaker::EndpointConfig.CaptureOption"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_datacaptureconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_datacaptureconfig.go
new file mode 100644
index 0000000000..e6ab499845
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_datacaptureconfig.go
@@ -0,0 +1,62 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EndpointConfig_DataCaptureConfig AWS CloudFormation Resource (AWS::SageMaker::EndpointConfig.DataCaptureConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-datacaptureconfig.html
+type EndpointConfig_DataCaptureConfig struct {
+
+	// CaptureContentTypeHeader AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-datacaptureconfig.html#cfn-sagemaker-endpointconfig-datacaptureconfig-capturecontenttypeheader
+	CaptureContentTypeHeader *EndpointConfig_CaptureContentTypeHeader `json:"CaptureContentTypeHeader,omitempty"`
+
+	// CaptureOptions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-datacaptureconfig.html#cfn-sagemaker-endpointconfig-datacaptureconfig-captureoptions
+	CaptureOptions []EndpointConfig_CaptureOption `json:"CaptureOptions,omitempty"`
+
+	// DestinationS3Uri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-datacaptureconfig.html#cfn-sagemaker-endpointconfig-datacaptureconfig-destinations3uri
+	DestinationS3Uri *types.Value `json:"DestinationS3Uri,omitempty"`
+
+	// EnableCapture AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-datacaptureconfig.html#cfn-sagemaker-endpointconfig-datacaptureconfig-enablecapture
+	EnableCapture *types.Value `json:"EnableCapture,omitempty"`
+
+	// InitialSamplingPercentage AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-datacaptureconfig.html#cfn-sagemaker-endpointconfig-datacaptureconfig-initialsamplingpercentage
+	InitialSamplingPercentage *types.Value `json:"InitialSamplingPercentage"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-datacaptureconfig.html#cfn-sagemaker-endpointconfig-datacaptureconfig-kmskeyid
+	KmsKeyId *types.Value `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 *EndpointConfig_DataCaptureConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::EndpointConfig.DataCaptureConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_productionvariant.go b/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_productionvariant.go
new file mode 100644
index 0000000000..c67a9a39ea
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_productionvariant.go
@@ -0,0 +1,67 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EndpointConfig_ProductionVariant AWS CloudFormation Resource (AWS::SageMaker::EndpointConfig.ProductionVariant)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-productionvariant.html
+type EndpointConfig_ProductionVariant struct {
+
+	// AcceleratorType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-productionvariant.html#cfn-sagemaker-endpointconfig-productionvariant-acceleratortype
+	AcceleratorType *types.Value `json:"AcceleratorType,omitempty"`
+
+	// InitialInstanceCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-productionvariant.html#cfn-sagemaker-endpointconfig-productionvariant-initialinstancecount
+	InitialInstanceCount *types.Value `json:"InitialInstanceCount,omitempty"`
+
+	// InitialVariantWeight AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-productionvariant.html#cfn-sagemaker-endpointconfig-productionvariant-initialvariantweight
+	InitialVariantWeight *types.Value `json:"InitialVariantWeight"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-productionvariant.html#cfn-sagemaker-endpointconfig-productionvariant-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// ModelName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-productionvariant.html#cfn-sagemaker-endpointconfig-productionvariant-modelname
+	ModelName *types.Value `json:"ModelName,omitempty"`
+
+	// ServerlessConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-productionvariant.html#cfn-sagemaker-endpointconfig-productionvariant-serverlessconfig
+	ServerlessConfig *EndpointConfig_ServerlessConfig `json:"ServerlessConfig,omitempty"`
+
+	// VariantName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-productionvariant.html#cfn-sagemaker-endpointconfig-productionvariant-variantname
+	VariantName *types.Value `json:"VariantName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EndpointConfig_ProductionVariant) AWSCloudFormationType() string {
+	return "AWS::SageMaker::EndpointConfig.ProductionVariant"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_serverlessconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_serverlessconfig.go
new file mode 100644
index 0000000000..a991723912
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-endpointconfig_serverlessconfig.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// EndpointConfig_ServerlessConfig AWS CloudFormation Resource (AWS::SageMaker::EndpointConfig.ServerlessConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-productionvariant-serverlessconfig.html
+type EndpointConfig_ServerlessConfig struct {
+
+	// MaxConcurrency AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-productionvariant-serverlessconfig.html#cfn-sagemaker-endpointconfig-productionvariant-serverlessconfig-maxconcurrency
+	MaxConcurrency *types.Value `json:"MaxConcurrency"`
+
+	// MemorySizeInMB AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-endpointconfig-productionvariant-serverlessconfig.html#cfn-sagemaker-endpointconfig-productionvariant-serverlessconfig-memorysizeinmb
+	MemorySizeInMB *types.Value `json:"MemorySizeInMB"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *EndpointConfig_ServerlessConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::EndpointConfig.ServerlessConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-featuregroup.go b/goformation/cloudformation/sagemaker/aws-sagemaker-featuregroup.go
new file mode 100644
index 0000000000..537cafa307
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-featuregroup.go
@@ -0,0 +1,149 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// FeatureGroup AWS CloudFormation Resource (AWS::SageMaker::FeatureGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-featuregroup.html
+type FeatureGroup struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-featuregroup.html#cfn-sagemaker-featuregroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// EventTimeFeatureName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-featuregroup.html#cfn-sagemaker-featuregroup-eventtimefeaturename
+	EventTimeFeatureName *types.Value `json:"EventTimeFeatureName,omitempty"`
+
+	// FeatureDefinitions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-featuregroup.html#cfn-sagemaker-featuregroup-featuredefinitions
+	FeatureDefinitions []FeatureGroup_FeatureDefinition `json:"FeatureDefinitions,omitempty"`
+
+	// FeatureGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-featuregroup.html#cfn-sagemaker-featuregroup-featuregroupname
+	FeatureGroupName *types.Value `json:"FeatureGroupName,omitempty"`
+
+	// OfflineStoreConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-featuregroup.html#cfn-sagemaker-featuregroup-offlinestoreconfig
+	OfflineStoreConfig interface{} `json:"OfflineStoreConfig,omitempty"`
+
+	// OnlineStoreConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-featuregroup.html#cfn-sagemaker-featuregroup-onlinestoreconfig
+	OnlineStoreConfig interface{} `json:"OnlineStoreConfig,omitempty"`
+
+	// RecordIdentifierFeatureName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-featuregroup.html#cfn-sagemaker-featuregroup-recordidentifierfeaturename
+	RecordIdentifierFeatureName *types.Value `json:"RecordIdentifierFeatureName,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-featuregroup.html#cfn-sagemaker-featuregroup-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-featuregroup.html#cfn-sagemaker-featuregroup-tags
+	Tags []cloudformation.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 *FeatureGroup) AWSCloudFormationType() string {
+	return "AWS::SageMaker::FeatureGroup"
+}
+
+// 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 FeatureGroup) MarshalJSON() ([]byte, error) {
+	type Properties FeatureGroup
+	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 *FeatureGroup) UnmarshalJSON(b []byte) error {
+	type Properties FeatureGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = FeatureGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-featuregroup_featuredefinition.go b/goformation/cloudformation/sagemaker/aws-sagemaker-featuregroup_featuredefinition.go
new file mode 100644
index 0000000000..f65647e5be
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-featuregroup_featuredefinition.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// FeatureGroup_FeatureDefinition AWS CloudFormation Resource (AWS::SageMaker::FeatureGroup.FeatureDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-featuregroup-featuredefinition.html
+type FeatureGroup_FeatureDefinition struct {
+
+	// FeatureName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-featuregroup-featuredefinition.html#cfn-sagemaker-featuregroup-featuredefinition-featurename
+	FeatureName *types.Value `json:"FeatureName,omitempty"`
+
+	// FeatureType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-featuregroup-featuredefinition.html#cfn-sagemaker-featuregroup-featuredefinition-featuretype
+	FeatureType *types.Value `json:"FeatureType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *FeatureGroup_FeatureDefinition) AWSCloudFormationType() string {
+	return "AWS::SageMaker::FeatureGroup.FeatureDefinition"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-image.go b/goformation/cloudformation/sagemaker/aws-sagemaker-image.go
new file mode 100644
index 0000000000..1e80235cde
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-image.go
@@ -0,0 +1,129 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Image AWS CloudFormation Resource (AWS::SageMaker::Image)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-image.html
+type Image struct {
+
+	// ImageDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-image.html#cfn-sagemaker-image-imagedescription
+	ImageDescription *types.Value `json:"ImageDescription,omitempty"`
+
+	// ImageDisplayName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-image.html#cfn-sagemaker-image-imagedisplayname
+	ImageDisplayName *types.Value `json:"ImageDisplayName,omitempty"`
+
+	// ImageName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-image.html#cfn-sagemaker-image-imagename
+	ImageName *types.Value `json:"ImageName,omitempty"`
+
+	// ImageRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-image.html#cfn-sagemaker-image-imagerolearn
+	ImageRoleArn *types.Value `json:"ImageRoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-image.html#cfn-sagemaker-image-tags
+	Tags []cloudformation.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 *Image) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Image"
+}
+
+// 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 Image) MarshalJSON() ([]byte, error) {
+	type Properties Image
+	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 *Image) UnmarshalJSON(b []byte) error {
+	type Properties Image
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Image(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-imageversion.go b/goformation/cloudformation/sagemaker/aws-sagemaker-imageversion.go
new file mode 100644
index 0000000000..2bc198bc93
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-imageversion.go
@@ -0,0 +1,113 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ImageVersion AWS CloudFormation Resource (AWS::SageMaker::ImageVersion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-imageversion.html
+type ImageVersion struct {
+
+	// BaseImage AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-imageversion.html#cfn-sagemaker-imageversion-baseimage
+	BaseImage *types.Value `json:"BaseImage,omitempty"`
+
+	// ImageName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-imageversion.html#cfn-sagemaker-imageversion-imagename
+	ImageName *types.Value `json:"ImageName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ImageVersion) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ImageVersion"
+}
+
+// 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 ImageVersion) MarshalJSON() ([]byte, error) {
+	type Properties ImageVersion
+	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 *ImageVersion) UnmarshalJSON(b []byte) error {
+	type Properties ImageVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ImageVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-model.go b/goformation/cloudformation/sagemaker/aws-sagemaker-model.go
new file mode 100644
index 0000000000..5056d8a331
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-model.go
@@ -0,0 +1,144 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Model AWS CloudFormation Resource (AWS::SageMaker::Model)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-model.html
+type Model struct {
+
+	// Containers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-model.html#cfn-sagemaker-model-containers
+	Containers []Model_ContainerDefinition `json:"Containers,omitempty"`
+
+	// EnableNetworkIsolation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-model.html#cfn-sagemaker-model-enablenetworkisolation
+	EnableNetworkIsolation *types.Value `json:"EnableNetworkIsolation,omitempty"`
+
+	// ExecutionRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-model.html#cfn-sagemaker-model-executionrolearn
+	ExecutionRoleArn *types.Value `json:"ExecutionRoleArn,omitempty"`
+
+	// InferenceExecutionConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-model.html#cfn-sagemaker-model-inferenceexecutionconfig
+	InferenceExecutionConfig *Model_InferenceExecutionConfig `json:"InferenceExecutionConfig,omitempty"`
+
+	// ModelName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-model.html#cfn-sagemaker-model-modelname
+	ModelName *types.Value `json:"ModelName,omitempty"`
+
+	// PrimaryContainer AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-model.html#cfn-sagemaker-model-primarycontainer
+	PrimaryContainer *Model_ContainerDefinition `json:"PrimaryContainer,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-model.html#cfn-sagemaker-model-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VpcConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-model.html#cfn-sagemaker-model-vpcconfig
+	VpcConfig *Model_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 *Model) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Model"
+}
+
+// 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 Model) MarshalJSON() ([]byte, error) {
+	type Properties Model
+	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 *Model) UnmarshalJSON(b []byte) error {
+	type Properties Model
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Model(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-model_containerdefinition.go b/goformation/cloudformation/sagemaker/aws-sagemaker-model_containerdefinition.go
new file mode 100644
index 0000000000..c6d0e89ad0
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-model_containerdefinition.go
@@ -0,0 +1,77 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Model_ContainerDefinition AWS CloudFormation Resource (AWS::SageMaker::Model.ContainerDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition.html
+type Model_ContainerDefinition struct {
+
+	// ContainerHostname AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition.html#cfn-sagemaker-model-containerdefinition-containerhostname
+	ContainerHostname *types.Value `json:"ContainerHostname,omitempty"`
+
+	// Environment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition.html#cfn-sagemaker-model-containerdefinition-environment
+	Environment interface{} `json:"Environment,omitempty"`
+
+	// Image AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition.html#cfn-sagemaker-model-containerdefinition-image
+	Image *types.Value `json:"Image,omitempty"`
+
+	// ImageConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition.html#cfn-sagemaker-model-containerdefinition-imageconfig
+	ImageConfig *Model_ImageConfig `json:"ImageConfig,omitempty"`
+
+	// InferenceSpecificationName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition.html#cfn-sagemaker-model-containerdefinition-inferencespecificationname
+	InferenceSpecificationName *types.Value `json:"InferenceSpecificationName,omitempty"`
+
+	// Mode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition.html#cfn-sagemaker-model-containerdefinition-mode
+	Mode *types.Value `json:"Mode,omitempty"`
+
+	// ModelDataUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition.html#cfn-sagemaker-model-containerdefinition-modeldataurl
+	ModelDataUrl *types.Value `json:"ModelDataUrl,omitempty"`
+
+	// ModelPackageName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition.html#cfn-sagemaker-model-containerdefinition-modelpackagename
+	ModelPackageName *types.Value `json:"ModelPackageName,omitempty"`
+
+	// MultiModelConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition.html#cfn-sagemaker-model-containerdefinition-multimodelconfig
+	MultiModelConfig *Model_MultiModelConfig `json:"MultiModelConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ContainerDefinition) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Model.ContainerDefinition"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-model_imageconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-model_imageconfig.go
new file mode 100644
index 0000000000..83ca0e97ca
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-model_imageconfig.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Model_ImageConfig AWS CloudFormation Resource (AWS::SageMaker::Model.ImageConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition-imageconfig.html
+type Model_ImageConfig struct {
+
+	// RepositoryAccessMode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition-imageconfig.html#cfn-sagemaker-model-containerdefinition-imageconfig-repositoryaccessmode
+	RepositoryAccessMode *types.Value `json:"RepositoryAccessMode,omitempty"`
+
+	// RepositoryAuthConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition-imageconfig.html#cfn-sagemaker-model-containerdefinition-imageconfig-repositoryauthconfig
+	RepositoryAuthConfig *Model_RepositoryAuthConfig `json:"RepositoryAuthConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ImageConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Model.ImageConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-model_inferenceexecutionconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-model_inferenceexecutionconfig.go
new file mode 100644
index 0000000000..5438c3d4c9
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-model_inferenceexecutionconfig.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Model_InferenceExecutionConfig AWS CloudFormation Resource (AWS::SageMaker::Model.InferenceExecutionConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-inferenceexecutionconfig.html
+type Model_InferenceExecutionConfig struct {
+
+	// Mode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-inferenceexecutionconfig.html#cfn-sagemaker-model-inferenceexecutionconfig-mode
+	Mode *types.Value `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 *Model_InferenceExecutionConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Model.InferenceExecutionConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-model_multimodelconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-model_multimodelconfig.go
new file mode 100644
index 0000000000..74dc7d140a
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-model_multimodelconfig.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Model_MultiModelConfig AWS CloudFormation Resource (AWS::SageMaker::Model.MultiModelConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition-multimodelconfig.html
+type Model_MultiModelConfig struct {
+
+	// ModelCacheSetting AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition-multimodelconfig.html#cfn-sagemaker-model-containerdefinition-multimodelconfig-modelcachesetting
+	ModelCacheSetting *types.Value `json:"ModelCacheSetting,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_MultiModelConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Model.MultiModelConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-model_repositoryauthconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-model_repositoryauthconfig.go
new file mode 100644
index 0000000000..d7da20d50a
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-model_repositoryauthconfig.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Model_RepositoryAuthConfig AWS CloudFormation Resource (AWS::SageMaker::Model.RepositoryAuthConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition-imageconfig-repositoryauthconfig.html
+type Model_RepositoryAuthConfig struct {
+
+	// RepositoryCredentialsProviderArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-containerdefinition-imageconfig-repositoryauthconfig.html#cfn-sagemaker-model-containerdefinition-imageconfig-repositoryauthconfig-repositorycredentialsproviderarn
+	RepositoryCredentialsProviderArn *types.Value `json:"RepositoryCredentialsProviderArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RepositoryAuthConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Model.RepositoryAuthConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-model_vpcconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-model_vpcconfig.go
new file mode 100644
index 0000000000..003570b087
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-model_vpcconfig.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Model_VpcConfig AWS CloudFormation Resource (AWS::SageMaker::Model.VpcConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-vpcconfig.html
+type Model_VpcConfig struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-vpcconfig.html#cfn-sagemaker-model-vpcconfig-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// Subnets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-model-vpcconfig.html#cfn-sagemaker-model-vpcconfig-subnets
+	Subnets *types.Value `json:"Subnets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_VpcConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Model.VpcConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition.go
new file mode 100644
index 0000000000..21d68b43c0
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition.go
@@ -0,0 +1,154 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelBiasJobDefinition AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelbiasjobdefinition.html
+type ModelBiasJobDefinition struct {
+
+	// JobDefinitionName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelbiasjobdefinition.html#cfn-sagemaker-modelbiasjobdefinition-jobdefinitionname
+	JobDefinitionName *types.Value `json:"JobDefinitionName,omitempty"`
+
+	// JobResources AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelbiasjobdefinition.html#cfn-sagemaker-modelbiasjobdefinition-jobresources
+	JobResources *ModelBiasJobDefinition_MonitoringResources `json:"JobResources,omitempty"`
+
+	// ModelBiasAppSpecification AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelbiasjobdefinition.html#cfn-sagemaker-modelbiasjobdefinition-modelbiasappspecification
+	ModelBiasAppSpecification *ModelBiasJobDefinition_ModelBiasAppSpecification `json:"ModelBiasAppSpecification,omitempty"`
+
+	// ModelBiasBaselineConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelbiasjobdefinition.html#cfn-sagemaker-modelbiasjobdefinition-modelbiasbaselineconfig
+	ModelBiasBaselineConfig *ModelBiasJobDefinition_ModelBiasBaselineConfig `json:"ModelBiasBaselineConfig,omitempty"`
+
+	// ModelBiasJobInput AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelbiasjobdefinition.html#cfn-sagemaker-modelbiasjobdefinition-modelbiasjobinput
+	ModelBiasJobInput *ModelBiasJobDefinition_ModelBiasJobInput `json:"ModelBiasJobInput,omitempty"`
+
+	// ModelBiasJobOutputConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelbiasjobdefinition.html#cfn-sagemaker-modelbiasjobdefinition-modelbiasjoboutputconfig
+	ModelBiasJobOutputConfig *ModelBiasJobDefinition_MonitoringOutputConfig `json:"ModelBiasJobOutputConfig,omitempty"`
+
+	// NetworkConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelbiasjobdefinition.html#cfn-sagemaker-modelbiasjobdefinition-networkconfig
+	NetworkConfig *ModelBiasJobDefinition_NetworkConfig `json:"NetworkConfig,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelbiasjobdefinition.html#cfn-sagemaker-modelbiasjobdefinition-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// StoppingCondition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelbiasjobdefinition.html#cfn-sagemaker-modelbiasjobdefinition-stoppingcondition
+	StoppingCondition *ModelBiasJobDefinition_StoppingCondition `json:"StoppingCondition,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelbiasjobdefinition.html#cfn-sagemaker-modelbiasjobdefinition-tags
+	Tags []cloudformation.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 *ModelBiasJobDefinition) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelBiasJobDefinition"
+}
+
+// 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 ModelBiasJobDefinition) MarshalJSON() ([]byte, error) {
+	type Properties ModelBiasJobDefinition
+	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 *ModelBiasJobDefinition) UnmarshalJSON(b []byte) error {
+	type Properties ModelBiasJobDefinition
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ModelBiasJobDefinition(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_clusterconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_clusterconfig.go
new file mode 100644
index 0000000000..1d165e0cc8
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_clusterconfig.go
@@ -0,0 +1,52 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelBiasJobDefinition_ClusterConfig AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.ClusterConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-clusterconfig.html
+type ModelBiasJobDefinition_ClusterConfig struct {
+
+	// InstanceCount AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-clusterconfig.html#cfn-sagemaker-modelbiasjobdefinition-clusterconfig-instancecount
+	InstanceCount *types.Value `json:"InstanceCount"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-clusterconfig.html#cfn-sagemaker-modelbiasjobdefinition-clusterconfig-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// VolumeKmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-clusterconfig.html#cfn-sagemaker-modelbiasjobdefinition-clusterconfig-volumekmskeyid
+	VolumeKmsKeyId *types.Value `json:"VolumeKmsKeyId,omitempty"`
+
+	// VolumeSizeInGB AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-clusterconfig.html#cfn-sagemaker-modelbiasjobdefinition-clusterconfig-volumesizeingb
+	VolumeSizeInGB *types.Value `json:"VolumeSizeInGB"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelBiasJobDefinition_ClusterConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelBiasJobDefinition.ClusterConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_constraintsresource.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_constraintsresource.go
new file mode 100644
index 0000000000..2c9c2a9bd3
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_constraintsresource.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelBiasJobDefinition_ConstraintsResource AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.ConstraintsResource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-constraintsresource.html
+type ModelBiasJobDefinition_ConstraintsResource struct {
+
+	// S3Uri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-constraintsresource.html#cfn-sagemaker-modelbiasjobdefinition-constraintsresource-s3uri
+	S3Uri *types.Value `json:"S3Uri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelBiasJobDefinition_ConstraintsResource) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelBiasJobDefinition.ConstraintsResource"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_endpointinput.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_endpointinput.go
new file mode 100644
index 0000000000..467901ee99
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_endpointinput.go
@@ -0,0 +1,82 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelBiasJobDefinition_EndpointInput AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.EndpointInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-endpointinput.html
+type ModelBiasJobDefinition_EndpointInput struct {
+
+	// EndTimeOffset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-endpointinput.html#cfn-sagemaker-modelbiasjobdefinition-endpointinput-endtimeoffset
+	EndTimeOffset *types.Value `json:"EndTimeOffset,omitempty"`
+
+	// EndpointName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-endpointinput.html#cfn-sagemaker-modelbiasjobdefinition-endpointinput-endpointname
+	EndpointName *types.Value `json:"EndpointName,omitempty"`
+
+	// FeaturesAttribute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-endpointinput.html#cfn-sagemaker-modelbiasjobdefinition-endpointinput-featuresattribute
+	FeaturesAttribute *types.Value `json:"FeaturesAttribute,omitempty"`
+
+	// InferenceAttribute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-endpointinput.html#cfn-sagemaker-modelbiasjobdefinition-endpointinput-inferenceattribute
+	InferenceAttribute *types.Value `json:"InferenceAttribute,omitempty"`
+
+	// LocalPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-endpointinput.html#cfn-sagemaker-modelbiasjobdefinition-endpointinput-localpath
+	LocalPath *types.Value `json:"LocalPath,omitempty"`
+
+	// ProbabilityAttribute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-endpointinput.html#cfn-sagemaker-modelbiasjobdefinition-endpointinput-probabilityattribute
+	ProbabilityAttribute *types.Value `json:"ProbabilityAttribute,omitempty"`
+
+	// ProbabilityThresholdAttribute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-endpointinput.html#cfn-sagemaker-modelbiasjobdefinition-endpointinput-probabilitythresholdattribute
+	ProbabilityThresholdAttribute *types.Value `json:"ProbabilityThresholdAttribute,omitempty"`
+
+	// S3DataDistributionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-endpointinput.html#cfn-sagemaker-modelbiasjobdefinition-endpointinput-s3datadistributiontype
+	S3DataDistributionType *types.Value `json:"S3DataDistributionType,omitempty"`
+
+	// S3InputMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-endpointinput.html#cfn-sagemaker-modelbiasjobdefinition-endpointinput-s3inputmode
+	S3InputMode *types.Value `json:"S3InputMode,omitempty"`
+
+	// StartTimeOffset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-endpointinput.html#cfn-sagemaker-modelbiasjobdefinition-endpointinput-starttimeoffset
+	StartTimeOffset *types.Value `json:"StartTimeOffset,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelBiasJobDefinition_EndpointInput) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelBiasJobDefinition.EndpointInput"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasappspecification.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasappspecification.go
new file mode 100644
index 0000000000..4cb685d382
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasappspecification.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelBiasJobDefinition_ModelBiasAppSpecification AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.ModelBiasAppSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-modelbiasappspecification.html
+type ModelBiasJobDefinition_ModelBiasAppSpecification struct {
+
+	// ConfigUri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-modelbiasappspecification.html#cfn-sagemaker-modelbiasjobdefinition-modelbiasappspecification-configuri
+	ConfigUri *types.Value `json:"ConfigUri,omitempty"`
+
+	// Environment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-modelbiasappspecification.html#cfn-sagemaker-modelbiasjobdefinition-modelbiasappspecification-environment
+	Environment map[string]*types.Value `json:"Environment,omitempty"`
+
+	// ImageUri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-modelbiasappspecification.html#cfn-sagemaker-modelbiasjobdefinition-modelbiasappspecification-imageuri
+	ImageUri *types.Value `json:"ImageUri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelBiasJobDefinition_ModelBiasAppSpecification) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelBiasJobDefinition.ModelBiasAppSpecification"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasbaselineconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasbaselineconfig.go
new file mode 100644
index 0000000000..93440d8cd3
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasbaselineconfig.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelBiasJobDefinition_ModelBiasBaselineConfig AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.ModelBiasBaselineConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-modelbiasbaselineconfig.html
+type ModelBiasJobDefinition_ModelBiasBaselineConfig struct {
+
+	// BaseliningJobName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-modelbiasbaselineconfig.html#cfn-sagemaker-modelbiasjobdefinition-modelbiasbaselineconfig-baseliningjobname
+	BaseliningJobName *types.Value `json:"BaseliningJobName,omitempty"`
+
+	// ConstraintsResource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-modelbiasbaselineconfig.html#cfn-sagemaker-modelbiasjobdefinition-modelbiasbaselineconfig-constraintsresource
+	ConstraintsResource *ModelBiasJobDefinition_ConstraintsResource `json:"ConstraintsResource,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelBiasJobDefinition_ModelBiasBaselineConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelBiasJobDefinition.ModelBiasBaselineConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasjobinput.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasjobinput.go
new file mode 100644
index 0000000000..5c14b2fb6e
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_modelbiasjobinput.go
@@ -0,0 +1,40 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelBiasJobDefinition_ModelBiasJobInput AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.ModelBiasJobInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-modelbiasjobinput.html
+type ModelBiasJobDefinition_ModelBiasJobInput struct {
+
+	// EndpointInput AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-modelbiasjobinput.html#cfn-sagemaker-modelbiasjobdefinition-modelbiasjobinput-endpointinput
+	EndpointInput *ModelBiasJobDefinition_EndpointInput `json:"EndpointInput,omitempty"`
+
+	// GroundTruthS3Input AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-modelbiasjobinput.html#cfn-sagemaker-modelbiasjobdefinition-modelbiasjobinput-groundtruths3input
+	GroundTruthS3Input *ModelBiasJobDefinition_MonitoringGroundTruthS3Input `json:"GroundTruthS3Input,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelBiasJobDefinition_ModelBiasJobInput) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelBiasJobDefinition.ModelBiasJobInput"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringgroundtruths3input.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringgroundtruths3input.go
new file mode 100644
index 0000000000..25c56ea7a4
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringgroundtruths3input.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelBiasJobDefinition_MonitoringGroundTruthS3Input AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.MonitoringGroundTruthS3Input)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-monitoringgroundtruths3input.html
+type ModelBiasJobDefinition_MonitoringGroundTruthS3Input struct {
+
+	// S3Uri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-monitoringgroundtruths3input.html#cfn-sagemaker-modelbiasjobdefinition-monitoringgroundtruths3input-s3uri
+	S3Uri *types.Value `json:"S3Uri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelBiasJobDefinition_MonitoringGroundTruthS3Input) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelBiasJobDefinition.MonitoringGroundTruthS3Input"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutput.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutput.go
new file mode 100644
index 0000000000..b3a7239a04
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutput.go
@@ -0,0 +1,35 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelBiasJobDefinition_MonitoringOutput AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-monitoringoutput.html
+type ModelBiasJobDefinition_MonitoringOutput struct {
+
+	// S3Output AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-monitoringoutput.html#cfn-sagemaker-modelbiasjobdefinition-monitoringoutput-s3output
+	S3Output *ModelBiasJobDefinition_S3Output `json:"S3Output,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelBiasJobDefinition_MonitoringOutput) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutput"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutputconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutputconfig.go
new file mode 100644
index 0000000000..c758ca32be
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringoutputconfig.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelBiasJobDefinition_MonitoringOutputConfig AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutputConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-monitoringoutputconfig.html
+type ModelBiasJobDefinition_MonitoringOutputConfig struct {
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-monitoringoutputconfig.html#cfn-sagemaker-modelbiasjobdefinition-monitoringoutputconfig-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// MonitoringOutputs AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-monitoringoutputconfig.html#cfn-sagemaker-modelbiasjobdefinition-monitoringoutputconfig-monitoringoutputs
+	MonitoringOutputs []ModelBiasJobDefinition_MonitoringOutput `json:"MonitoringOutputs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelBiasJobDefinition_MonitoringOutputConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutputConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringresources.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringresources.go
new file mode 100644
index 0000000000..d6983701d3
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_monitoringresources.go
@@ -0,0 +1,35 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelBiasJobDefinition_MonitoringResources AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.MonitoringResources)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-monitoringresources.html
+type ModelBiasJobDefinition_MonitoringResources struct {
+
+	// ClusterConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-monitoringresources.html#cfn-sagemaker-modelbiasjobdefinition-monitoringresources-clusterconfig
+	ClusterConfig *ModelBiasJobDefinition_ClusterConfig `json:"ClusterConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelBiasJobDefinition_MonitoringResources) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelBiasJobDefinition.MonitoringResources"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_networkconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_networkconfig.go
new file mode 100644
index 0000000000..759380f030
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_networkconfig.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelBiasJobDefinition_NetworkConfig AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.NetworkConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-networkconfig.html
+type ModelBiasJobDefinition_NetworkConfig struct {
+
+	// EnableInterContainerTrafficEncryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-networkconfig.html#cfn-sagemaker-modelbiasjobdefinition-networkconfig-enableintercontainertrafficencryption
+	EnableInterContainerTrafficEncryption *types.Value `json:"EnableInterContainerTrafficEncryption,omitempty"`
+
+	// EnableNetworkIsolation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-networkconfig.html#cfn-sagemaker-modelbiasjobdefinition-networkconfig-enablenetworkisolation
+	EnableNetworkIsolation *types.Value `json:"EnableNetworkIsolation,omitempty"`
+
+	// VpcConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-networkconfig.html#cfn-sagemaker-modelbiasjobdefinition-networkconfig-vpcconfig
+	VpcConfig *ModelBiasJobDefinition_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 *ModelBiasJobDefinition_NetworkConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelBiasJobDefinition.NetworkConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_s3output.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_s3output.go
new file mode 100644
index 0000000000..03347e2c7e
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_s3output.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelBiasJobDefinition_S3Output AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.S3Output)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-s3output.html
+type ModelBiasJobDefinition_S3Output struct {
+
+	// LocalPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-s3output.html#cfn-sagemaker-modelbiasjobdefinition-s3output-localpath
+	LocalPath *types.Value `json:"LocalPath,omitempty"`
+
+	// S3UploadMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-s3output.html#cfn-sagemaker-modelbiasjobdefinition-s3output-s3uploadmode
+	S3UploadMode *types.Value `json:"S3UploadMode,omitempty"`
+
+	// S3Uri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-s3output.html#cfn-sagemaker-modelbiasjobdefinition-s3output-s3uri
+	S3Uri *types.Value `json:"S3Uri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelBiasJobDefinition_S3Output) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelBiasJobDefinition.S3Output"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_stoppingcondition.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_stoppingcondition.go
new file mode 100644
index 0000000000..5443de9a1a
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_stoppingcondition.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelBiasJobDefinition_StoppingCondition AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.StoppingCondition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-stoppingcondition.html
+type ModelBiasJobDefinition_StoppingCondition struct {
+
+	// MaxRuntimeInSeconds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-stoppingcondition.html#cfn-sagemaker-modelbiasjobdefinition-stoppingcondition-maxruntimeinseconds
+	MaxRuntimeInSeconds *types.Value `json:"MaxRuntimeInSeconds"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelBiasJobDefinition_StoppingCondition) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelBiasJobDefinition.StoppingCondition"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_vpcconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_vpcconfig.go
new file mode 100644
index 0000000000..55e9465c21
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelbiasjobdefinition_vpcconfig.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelBiasJobDefinition_VpcConfig AWS CloudFormation Resource (AWS::SageMaker::ModelBiasJobDefinition.VpcConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-vpcconfig.html
+type ModelBiasJobDefinition_VpcConfig struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-vpcconfig.html#cfn-sagemaker-modelbiasjobdefinition-vpcconfig-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// Subnets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelbiasjobdefinition-vpcconfig.html#cfn-sagemaker-modelbiasjobdefinition-vpcconfig-subnets
+	Subnets *types.Value `json:"Subnets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelBiasJobDefinition_VpcConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelBiasJobDefinition.VpcConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition.go
new file mode 100644
index 0000000000..3219f32f70
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition.go
@@ -0,0 +1,154 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelExplainabilityJobDefinition AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelexplainabilityjobdefinition.html
+type ModelExplainabilityJobDefinition struct {
+
+	// JobDefinitionName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelexplainabilityjobdefinition.html#cfn-sagemaker-modelexplainabilityjobdefinition-jobdefinitionname
+	JobDefinitionName *types.Value `json:"JobDefinitionName,omitempty"`
+
+	// JobResources AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelexplainabilityjobdefinition.html#cfn-sagemaker-modelexplainabilityjobdefinition-jobresources
+	JobResources *ModelExplainabilityJobDefinition_MonitoringResources `json:"JobResources,omitempty"`
+
+	// ModelExplainabilityAppSpecification AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelexplainabilityjobdefinition.html#cfn-sagemaker-modelexplainabilityjobdefinition-modelexplainabilityappspecification
+	ModelExplainabilityAppSpecification *ModelExplainabilityJobDefinition_ModelExplainabilityAppSpecification `json:"ModelExplainabilityAppSpecification,omitempty"`
+
+	// ModelExplainabilityBaselineConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelexplainabilityjobdefinition.html#cfn-sagemaker-modelexplainabilityjobdefinition-modelexplainabilitybaselineconfig
+	ModelExplainabilityBaselineConfig *ModelExplainabilityJobDefinition_ModelExplainabilityBaselineConfig `json:"ModelExplainabilityBaselineConfig,omitempty"`
+
+	// ModelExplainabilityJobInput AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelexplainabilityjobdefinition.html#cfn-sagemaker-modelexplainabilityjobdefinition-modelexplainabilityjobinput
+	ModelExplainabilityJobInput *ModelExplainabilityJobDefinition_ModelExplainabilityJobInput `json:"ModelExplainabilityJobInput,omitempty"`
+
+	// ModelExplainabilityJobOutputConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelexplainabilityjobdefinition.html#cfn-sagemaker-modelexplainabilityjobdefinition-modelexplainabilityjoboutputconfig
+	ModelExplainabilityJobOutputConfig *ModelExplainabilityJobDefinition_MonitoringOutputConfig `json:"ModelExplainabilityJobOutputConfig,omitempty"`
+
+	// NetworkConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelexplainabilityjobdefinition.html#cfn-sagemaker-modelexplainabilityjobdefinition-networkconfig
+	NetworkConfig *ModelExplainabilityJobDefinition_NetworkConfig `json:"NetworkConfig,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelexplainabilityjobdefinition.html#cfn-sagemaker-modelexplainabilityjobdefinition-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// StoppingCondition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelexplainabilityjobdefinition.html#cfn-sagemaker-modelexplainabilityjobdefinition-stoppingcondition
+	StoppingCondition *ModelExplainabilityJobDefinition_StoppingCondition `json:"StoppingCondition,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelexplainabilityjobdefinition.html#cfn-sagemaker-modelexplainabilityjobdefinition-tags
+	Tags []cloudformation.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 *ModelExplainabilityJobDefinition) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelExplainabilityJobDefinition"
+}
+
+// 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 ModelExplainabilityJobDefinition) MarshalJSON() ([]byte, error) {
+	type Properties ModelExplainabilityJobDefinition
+	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 *ModelExplainabilityJobDefinition) UnmarshalJSON(b []byte) error {
+	type Properties ModelExplainabilityJobDefinition
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ModelExplainabilityJobDefinition(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_clusterconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_clusterconfig.go
new file mode 100644
index 0000000000..0d62c6fcb4
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_clusterconfig.go
@@ -0,0 +1,52 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelExplainabilityJobDefinition_ClusterConfig AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.ClusterConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-clusterconfig.html
+type ModelExplainabilityJobDefinition_ClusterConfig struct {
+
+	// InstanceCount AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-clusterconfig.html#cfn-sagemaker-modelexplainabilityjobdefinition-clusterconfig-instancecount
+	InstanceCount *types.Value `json:"InstanceCount"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-clusterconfig.html#cfn-sagemaker-modelexplainabilityjobdefinition-clusterconfig-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// VolumeKmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-clusterconfig.html#cfn-sagemaker-modelexplainabilityjobdefinition-clusterconfig-volumekmskeyid
+	VolumeKmsKeyId *types.Value `json:"VolumeKmsKeyId,omitempty"`
+
+	// VolumeSizeInGB AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-clusterconfig.html#cfn-sagemaker-modelexplainabilityjobdefinition-clusterconfig-volumesizeingb
+	VolumeSizeInGB *types.Value `json:"VolumeSizeInGB"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelExplainabilityJobDefinition_ClusterConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelExplainabilityJobDefinition.ClusterConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_constraintsresource.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_constraintsresource.go
new file mode 100644
index 0000000000..f34829792e
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_constraintsresource.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelExplainabilityJobDefinition_ConstraintsResource AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.ConstraintsResource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-constraintsresource.html
+type ModelExplainabilityJobDefinition_ConstraintsResource struct {
+
+	// S3Uri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-constraintsresource.html#cfn-sagemaker-modelexplainabilityjobdefinition-constraintsresource-s3uri
+	S3Uri *types.Value `json:"S3Uri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelExplainabilityJobDefinition_ConstraintsResource) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelExplainabilityJobDefinition.ConstraintsResource"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_endpointinput.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_endpointinput.go
new file mode 100644
index 0000000000..256c42a2f5
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_endpointinput.go
@@ -0,0 +1,67 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelExplainabilityJobDefinition_EndpointInput AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.EndpointInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-endpointinput.html
+type ModelExplainabilityJobDefinition_EndpointInput struct {
+
+	// EndpointName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-endpointinput.html#cfn-sagemaker-modelexplainabilityjobdefinition-endpointinput-endpointname
+	EndpointName *types.Value `json:"EndpointName,omitempty"`
+
+	// FeaturesAttribute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-endpointinput.html#cfn-sagemaker-modelexplainabilityjobdefinition-endpointinput-featuresattribute
+	FeaturesAttribute *types.Value `json:"FeaturesAttribute,omitempty"`
+
+	// InferenceAttribute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-endpointinput.html#cfn-sagemaker-modelexplainabilityjobdefinition-endpointinput-inferenceattribute
+	InferenceAttribute *types.Value `json:"InferenceAttribute,omitempty"`
+
+	// LocalPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-endpointinput.html#cfn-sagemaker-modelexplainabilityjobdefinition-endpointinput-localpath
+	LocalPath *types.Value `json:"LocalPath,omitempty"`
+
+	// ProbabilityAttribute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-endpointinput.html#cfn-sagemaker-modelexplainabilityjobdefinition-endpointinput-probabilityattribute
+	ProbabilityAttribute *types.Value `json:"ProbabilityAttribute,omitempty"`
+
+	// S3DataDistributionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-endpointinput.html#cfn-sagemaker-modelexplainabilityjobdefinition-endpointinput-s3datadistributiontype
+	S3DataDistributionType *types.Value `json:"S3DataDistributionType,omitempty"`
+
+	// S3InputMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-endpointinput.html#cfn-sagemaker-modelexplainabilityjobdefinition-endpointinput-s3inputmode
+	S3InputMode *types.Value `json:"S3InputMode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelExplainabilityJobDefinition_EndpointInput) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelExplainabilityJobDefinition.EndpointInput"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityappspecification.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityappspecification.go
new file mode 100644
index 0000000000..833749b516
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityappspecification.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelExplainabilityJobDefinition_ModelExplainabilityAppSpecification AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityAppSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-modelexplainabilityappspecification.html
+type ModelExplainabilityJobDefinition_ModelExplainabilityAppSpecification struct {
+
+	// ConfigUri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-modelexplainabilityappspecification.html#cfn-sagemaker-modelexplainabilityjobdefinition-modelexplainabilityappspecification-configuri
+	ConfigUri *types.Value `json:"ConfigUri,omitempty"`
+
+	// Environment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-modelexplainabilityappspecification.html#cfn-sagemaker-modelexplainabilityjobdefinition-modelexplainabilityappspecification-environment
+	Environment map[string]*types.Value `json:"Environment,omitempty"`
+
+	// ImageUri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-modelexplainabilityappspecification.html#cfn-sagemaker-modelexplainabilityjobdefinition-modelexplainabilityappspecification-imageuri
+	ImageUri *types.Value `json:"ImageUri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelExplainabilityJobDefinition_ModelExplainabilityAppSpecification) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityAppSpecification"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilitybaselineconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilitybaselineconfig.go
new file mode 100644
index 0000000000..9d8b0962eb
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilitybaselineconfig.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelExplainabilityJobDefinition_ModelExplainabilityBaselineConfig AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityBaselineConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-modelexplainabilitybaselineconfig.html
+type ModelExplainabilityJobDefinition_ModelExplainabilityBaselineConfig struct {
+
+	// BaseliningJobName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-modelexplainabilitybaselineconfig.html#cfn-sagemaker-modelexplainabilityjobdefinition-modelexplainabilitybaselineconfig-baseliningjobname
+	BaseliningJobName *types.Value `json:"BaseliningJobName,omitempty"`
+
+	// ConstraintsResource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-modelexplainabilitybaselineconfig.html#cfn-sagemaker-modelexplainabilityjobdefinition-modelexplainabilitybaselineconfig-constraintsresource
+	ConstraintsResource *ModelExplainabilityJobDefinition_ConstraintsResource `json:"ConstraintsResource,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelExplainabilityJobDefinition_ModelExplainabilityBaselineConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityBaselineConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityjobinput.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityjobinput.go
new file mode 100644
index 0000000000..a33aa5be26
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_modelexplainabilityjobinput.go
@@ -0,0 +1,35 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelExplainabilityJobDefinition_ModelExplainabilityJobInput AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityJobInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-modelexplainabilityjobinput.html
+type ModelExplainabilityJobDefinition_ModelExplainabilityJobInput struct {
+
+	// EndpointInput AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-modelexplainabilityjobinput.html#cfn-sagemaker-modelexplainabilityjobdefinition-modelexplainabilityjobinput-endpointinput
+	EndpointInput *ModelExplainabilityJobDefinition_EndpointInput `json:"EndpointInput,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelExplainabilityJobDefinition_ModelExplainabilityJobInput) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityJobInput"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutput.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutput.go
new file mode 100644
index 0000000000..8cf307fb24
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutput.go
@@ -0,0 +1,35 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelExplainabilityJobDefinition_MonitoringOutput AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-monitoringoutput.html
+type ModelExplainabilityJobDefinition_MonitoringOutput struct {
+
+	// S3Output AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-monitoringoutput.html#cfn-sagemaker-modelexplainabilityjobdefinition-monitoringoutput-s3output
+	S3Output *ModelExplainabilityJobDefinition_S3Output `json:"S3Output,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelExplainabilityJobDefinition_MonitoringOutput) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutput"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutputconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutputconfig.go
new file mode 100644
index 0000000000..13e7db80f0
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringoutputconfig.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelExplainabilityJobDefinition_MonitoringOutputConfig AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutputConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-monitoringoutputconfig.html
+type ModelExplainabilityJobDefinition_MonitoringOutputConfig struct {
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-monitoringoutputconfig.html#cfn-sagemaker-modelexplainabilityjobdefinition-monitoringoutputconfig-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// MonitoringOutputs AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-monitoringoutputconfig.html#cfn-sagemaker-modelexplainabilityjobdefinition-monitoringoutputconfig-monitoringoutputs
+	MonitoringOutputs []ModelExplainabilityJobDefinition_MonitoringOutput `json:"MonitoringOutputs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelExplainabilityJobDefinition_MonitoringOutputConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutputConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringresources.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringresources.go
new file mode 100644
index 0000000000..8f2652e894
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_monitoringresources.go
@@ -0,0 +1,35 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelExplainabilityJobDefinition_MonitoringResources AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringResources)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-monitoringresources.html
+type ModelExplainabilityJobDefinition_MonitoringResources struct {
+
+	// ClusterConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-monitoringresources.html#cfn-sagemaker-modelexplainabilityjobdefinition-monitoringresources-clusterconfig
+	ClusterConfig *ModelExplainabilityJobDefinition_ClusterConfig `json:"ClusterConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelExplainabilityJobDefinition_MonitoringResources) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringResources"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_networkconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_networkconfig.go
new file mode 100644
index 0000000000..d90a8e00bb
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_networkconfig.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelExplainabilityJobDefinition_NetworkConfig AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.NetworkConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-networkconfig.html
+type ModelExplainabilityJobDefinition_NetworkConfig struct {
+
+	// EnableInterContainerTrafficEncryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-networkconfig.html#cfn-sagemaker-modelexplainabilityjobdefinition-networkconfig-enableintercontainertrafficencryption
+	EnableInterContainerTrafficEncryption *types.Value `json:"EnableInterContainerTrafficEncryption,omitempty"`
+
+	// EnableNetworkIsolation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-networkconfig.html#cfn-sagemaker-modelexplainabilityjobdefinition-networkconfig-enablenetworkisolation
+	EnableNetworkIsolation *types.Value `json:"EnableNetworkIsolation,omitempty"`
+
+	// VpcConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-networkconfig.html#cfn-sagemaker-modelexplainabilityjobdefinition-networkconfig-vpcconfig
+	VpcConfig *ModelExplainabilityJobDefinition_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 *ModelExplainabilityJobDefinition_NetworkConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelExplainabilityJobDefinition.NetworkConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_s3output.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_s3output.go
new file mode 100644
index 0000000000..dca7d517ca
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_s3output.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelExplainabilityJobDefinition_S3Output AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.S3Output)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-s3output.html
+type ModelExplainabilityJobDefinition_S3Output struct {
+
+	// LocalPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-s3output.html#cfn-sagemaker-modelexplainabilityjobdefinition-s3output-localpath
+	LocalPath *types.Value `json:"LocalPath,omitempty"`
+
+	// S3UploadMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-s3output.html#cfn-sagemaker-modelexplainabilityjobdefinition-s3output-s3uploadmode
+	S3UploadMode *types.Value `json:"S3UploadMode,omitempty"`
+
+	// S3Uri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-s3output.html#cfn-sagemaker-modelexplainabilityjobdefinition-s3output-s3uri
+	S3Uri *types.Value `json:"S3Uri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelExplainabilityJobDefinition_S3Output) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelExplainabilityJobDefinition.S3Output"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_stoppingcondition.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_stoppingcondition.go
new file mode 100644
index 0000000000..c3584908a4
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_stoppingcondition.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelExplainabilityJobDefinition_StoppingCondition AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.StoppingCondition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-stoppingcondition.html
+type ModelExplainabilityJobDefinition_StoppingCondition struct {
+
+	// MaxRuntimeInSeconds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-stoppingcondition.html#cfn-sagemaker-modelexplainabilityjobdefinition-stoppingcondition-maxruntimeinseconds
+	MaxRuntimeInSeconds *types.Value `json:"MaxRuntimeInSeconds"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelExplainabilityJobDefinition_StoppingCondition) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelExplainabilityJobDefinition.StoppingCondition"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_vpcconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_vpcconfig.go
new file mode 100644
index 0000000000..6e240ca567
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelexplainabilityjobdefinition_vpcconfig.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelExplainabilityJobDefinition_VpcConfig AWS CloudFormation Resource (AWS::SageMaker::ModelExplainabilityJobDefinition.VpcConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-vpcconfig.html
+type ModelExplainabilityJobDefinition_VpcConfig struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-vpcconfig.html#cfn-sagemaker-modelexplainabilityjobdefinition-vpcconfig-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// Subnets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelexplainabilityjobdefinition-vpcconfig.html#cfn-sagemaker-modelexplainabilityjobdefinition-vpcconfig-subnets
+	Subnets *types.Value `json:"Subnets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelExplainabilityJobDefinition_VpcConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelExplainabilityJobDefinition.VpcConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelpackagegroup.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelpackagegroup.go
new file mode 100644
index 0000000000..a9373d0823
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelpackagegroup.go
@@ -0,0 +1,124 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelPackageGroup AWS CloudFormation Resource (AWS::SageMaker::ModelPackageGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackagegroup.html
+type ModelPackageGroup struct {
+
+	// ModelPackageGroupDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackagegroup.html#cfn-sagemaker-modelpackagegroup-modelpackagegroupdescription
+	ModelPackageGroupDescription *types.Value `json:"ModelPackageGroupDescription,omitempty"`
+
+	// ModelPackageGroupName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackagegroup.html#cfn-sagemaker-modelpackagegroup-modelpackagegroupname
+	ModelPackageGroupName *types.Value `json:"ModelPackageGroupName,omitempty"`
+
+	// ModelPackageGroupPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackagegroup.html#cfn-sagemaker-modelpackagegroup-modelpackagegrouppolicy
+	ModelPackageGroupPolicy interface{} `json:"ModelPackageGroupPolicy,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelpackagegroup.html#cfn-sagemaker-modelpackagegroup-tags
+	Tags []cloudformation.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 *ModelPackageGroup) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelPackageGroup"
+}
+
+// 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 ModelPackageGroup) MarshalJSON() ([]byte, error) {
+	type Properties ModelPackageGroup
+	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 *ModelPackageGroup) UnmarshalJSON(b []byte) error {
+	type Properties ModelPackageGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ModelPackageGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition.go
new file mode 100644
index 0000000000..35c294e439
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition.go
@@ -0,0 +1,154 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelQualityJobDefinition AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelqualityjobdefinition.html
+type ModelQualityJobDefinition struct {
+
+	// JobDefinitionName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelqualityjobdefinition.html#cfn-sagemaker-modelqualityjobdefinition-jobdefinitionname
+	JobDefinitionName *types.Value `json:"JobDefinitionName,omitempty"`
+
+	// JobResources AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelqualityjobdefinition.html#cfn-sagemaker-modelqualityjobdefinition-jobresources
+	JobResources *ModelQualityJobDefinition_MonitoringResources `json:"JobResources,omitempty"`
+
+	// ModelQualityAppSpecification AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelqualityjobdefinition.html#cfn-sagemaker-modelqualityjobdefinition-modelqualityappspecification
+	ModelQualityAppSpecification *ModelQualityJobDefinition_ModelQualityAppSpecification `json:"ModelQualityAppSpecification,omitempty"`
+
+	// ModelQualityBaselineConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelqualityjobdefinition.html#cfn-sagemaker-modelqualityjobdefinition-modelqualitybaselineconfig
+	ModelQualityBaselineConfig *ModelQualityJobDefinition_ModelQualityBaselineConfig `json:"ModelQualityBaselineConfig,omitempty"`
+
+	// ModelQualityJobInput AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelqualityjobdefinition.html#cfn-sagemaker-modelqualityjobdefinition-modelqualityjobinput
+	ModelQualityJobInput *ModelQualityJobDefinition_ModelQualityJobInput `json:"ModelQualityJobInput,omitempty"`
+
+	// ModelQualityJobOutputConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelqualityjobdefinition.html#cfn-sagemaker-modelqualityjobdefinition-modelqualityjoboutputconfig
+	ModelQualityJobOutputConfig *ModelQualityJobDefinition_MonitoringOutputConfig `json:"ModelQualityJobOutputConfig,omitempty"`
+
+	// NetworkConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelqualityjobdefinition.html#cfn-sagemaker-modelqualityjobdefinition-networkconfig
+	NetworkConfig *ModelQualityJobDefinition_NetworkConfig `json:"NetworkConfig,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelqualityjobdefinition.html#cfn-sagemaker-modelqualityjobdefinition-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// StoppingCondition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelqualityjobdefinition.html#cfn-sagemaker-modelqualityjobdefinition-stoppingcondition
+	StoppingCondition *ModelQualityJobDefinition_StoppingCondition `json:"StoppingCondition,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-modelqualityjobdefinition.html#cfn-sagemaker-modelqualityjobdefinition-tags
+	Tags []cloudformation.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 *ModelQualityJobDefinition) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelQualityJobDefinition"
+}
+
+// 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 ModelQualityJobDefinition) MarshalJSON() ([]byte, error) {
+	type Properties ModelQualityJobDefinition
+	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 *ModelQualityJobDefinition) UnmarshalJSON(b []byte) error {
+	type Properties ModelQualityJobDefinition
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ModelQualityJobDefinition(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_clusterconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_clusterconfig.go
new file mode 100644
index 0000000000..308c367f6b
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_clusterconfig.go
@@ -0,0 +1,52 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelQualityJobDefinition_ClusterConfig AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.ClusterConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-clusterconfig.html
+type ModelQualityJobDefinition_ClusterConfig struct {
+
+	// InstanceCount AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-clusterconfig.html#cfn-sagemaker-modelqualityjobdefinition-clusterconfig-instancecount
+	InstanceCount *types.Value `json:"InstanceCount"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-clusterconfig.html#cfn-sagemaker-modelqualityjobdefinition-clusterconfig-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// VolumeKmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-clusterconfig.html#cfn-sagemaker-modelqualityjobdefinition-clusterconfig-volumekmskeyid
+	VolumeKmsKeyId *types.Value `json:"VolumeKmsKeyId,omitempty"`
+
+	// VolumeSizeInGB AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-clusterconfig.html#cfn-sagemaker-modelqualityjobdefinition-clusterconfig-volumesizeingb
+	VolumeSizeInGB *types.Value `json:"VolumeSizeInGB"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelQualityJobDefinition_ClusterConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelQualityJobDefinition.ClusterConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_constraintsresource.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_constraintsresource.go
new file mode 100644
index 0000000000..3bf28fdea5
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_constraintsresource.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelQualityJobDefinition_ConstraintsResource AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.ConstraintsResource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-constraintsresource.html
+type ModelQualityJobDefinition_ConstraintsResource struct {
+
+	// S3Uri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-constraintsresource.html#cfn-sagemaker-modelqualityjobdefinition-constraintsresource-s3uri
+	S3Uri *types.Value `json:"S3Uri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelQualityJobDefinition_ConstraintsResource) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelQualityJobDefinition.ConstraintsResource"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_endpointinput.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_endpointinput.go
new file mode 100644
index 0000000000..c86fbf95d1
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_endpointinput.go
@@ -0,0 +1,77 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelQualityJobDefinition_EndpointInput AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.EndpointInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-endpointinput.html
+type ModelQualityJobDefinition_EndpointInput struct {
+
+	// EndTimeOffset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-endpointinput.html#cfn-sagemaker-modelqualityjobdefinition-endpointinput-endtimeoffset
+	EndTimeOffset *types.Value `json:"EndTimeOffset,omitempty"`
+
+	// EndpointName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-endpointinput.html#cfn-sagemaker-modelqualityjobdefinition-endpointinput-endpointname
+	EndpointName *types.Value `json:"EndpointName,omitempty"`
+
+	// InferenceAttribute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-endpointinput.html#cfn-sagemaker-modelqualityjobdefinition-endpointinput-inferenceattribute
+	InferenceAttribute *types.Value `json:"InferenceAttribute,omitempty"`
+
+	// LocalPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-endpointinput.html#cfn-sagemaker-modelqualityjobdefinition-endpointinput-localpath
+	LocalPath *types.Value `json:"LocalPath,omitempty"`
+
+	// ProbabilityAttribute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-endpointinput.html#cfn-sagemaker-modelqualityjobdefinition-endpointinput-probabilityattribute
+	ProbabilityAttribute *types.Value `json:"ProbabilityAttribute,omitempty"`
+
+	// ProbabilityThresholdAttribute AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-endpointinput.html#cfn-sagemaker-modelqualityjobdefinition-endpointinput-probabilitythresholdattribute
+	ProbabilityThresholdAttribute *types.Value `json:"ProbabilityThresholdAttribute,omitempty"`
+
+	// S3DataDistributionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-endpointinput.html#cfn-sagemaker-modelqualityjobdefinition-endpointinput-s3datadistributiontype
+	S3DataDistributionType *types.Value `json:"S3DataDistributionType,omitempty"`
+
+	// S3InputMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-endpointinput.html#cfn-sagemaker-modelqualityjobdefinition-endpointinput-s3inputmode
+	S3InputMode *types.Value `json:"S3InputMode,omitempty"`
+
+	// StartTimeOffset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-endpointinput.html#cfn-sagemaker-modelqualityjobdefinition-endpointinput-starttimeoffset
+	StartTimeOffset *types.Value `json:"StartTimeOffset,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelQualityJobDefinition_EndpointInput) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelQualityJobDefinition.EndpointInput"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityappspecification.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityappspecification.go
new file mode 100644
index 0000000000..1d534660be
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityappspecification.go
@@ -0,0 +1,67 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelQualityJobDefinition_ModelQualityAppSpecification AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.ModelQualityAppSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-modelqualityappspecification.html
+type ModelQualityJobDefinition_ModelQualityAppSpecification struct {
+
+	// ContainerArguments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-modelqualityappspecification.html#cfn-sagemaker-modelqualityjobdefinition-modelqualityappspecification-containerarguments
+	ContainerArguments *types.Value `json:"ContainerArguments,omitempty"`
+
+	// ContainerEntrypoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-modelqualityappspecification.html#cfn-sagemaker-modelqualityjobdefinition-modelqualityappspecification-containerentrypoint
+	ContainerEntrypoint *types.Value `json:"ContainerEntrypoint,omitempty"`
+
+	// Environment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-modelqualityappspecification.html#cfn-sagemaker-modelqualityjobdefinition-modelqualityappspecification-environment
+	Environment map[string]*types.Value `json:"Environment,omitempty"`
+
+	// ImageUri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-modelqualityappspecification.html#cfn-sagemaker-modelqualityjobdefinition-modelqualityappspecification-imageuri
+	ImageUri *types.Value `json:"ImageUri,omitempty"`
+
+	// PostAnalyticsProcessorSourceUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-modelqualityappspecification.html#cfn-sagemaker-modelqualityjobdefinition-modelqualityappspecification-postanalyticsprocessorsourceuri
+	PostAnalyticsProcessorSourceUri *types.Value `json:"PostAnalyticsProcessorSourceUri,omitempty"`
+
+	// ProblemType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-modelqualityappspecification.html#cfn-sagemaker-modelqualityjobdefinition-modelqualityappspecification-problemtype
+	ProblemType *types.Value `json:"ProblemType,omitempty"`
+
+	// RecordPreprocessorSourceUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-modelqualityappspecification.html#cfn-sagemaker-modelqualityjobdefinition-modelqualityappspecification-recordpreprocessorsourceuri
+	RecordPreprocessorSourceUri *types.Value `json:"RecordPreprocessorSourceUri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelQualityJobDefinition_ModelQualityAppSpecification) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelQualityJobDefinition.ModelQualityAppSpecification"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualitybaselineconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualitybaselineconfig.go
new file mode 100644
index 0000000000..27b6b84721
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualitybaselineconfig.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelQualityJobDefinition_ModelQualityBaselineConfig AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.ModelQualityBaselineConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-modelqualitybaselineconfig.html
+type ModelQualityJobDefinition_ModelQualityBaselineConfig struct {
+
+	// BaseliningJobName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-modelqualitybaselineconfig.html#cfn-sagemaker-modelqualityjobdefinition-modelqualitybaselineconfig-baseliningjobname
+	BaseliningJobName *types.Value `json:"BaseliningJobName,omitempty"`
+
+	// ConstraintsResource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-modelqualitybaselineconfig.html#cfn-sagemaker-modelqualityjobdefinition-modelqualitybaselineconfig-constraintsresource
+	ConstraintsResource *ModelQualityJobDefinition_ConstraintsResource `json:"ConstraintsResource,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelQualityJobDefinition_ModelQualityBaselineConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelQualityJobDefinition.ModelQualityBaselineConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityjobinput.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityjobinput.go
new file mode 100644
index 0000000000..96f8d058de
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_modelqualityjobinput.go
@@ -0,0 +1,40 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelQualityJobDefinition_ModelQualityJobInput AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.ModelQualityJobInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-modelqualityjobinput.html
+type ModelQualityJobDefinition_ModelQualityJobInput struct {
+
+	// EndpointInput AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-modelqualityjobinput.html#cfn-sagemaker-modelqualityjobdefinition-modelqualityjobinput-endpointinput
+	EndpointInput *ModelQualityJobDefinition_EndpointInput `json:"EndpointInput,omitempty"`
+
+	// GroundTruthS3Input AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-modelqualityjobinput.html#cfn-sagemaker-modelqualityjobdefinition-modelqualityjobinput-groundtruths3input
+	GroundTruthS3Input *ModelQualityJobDefinition_MonitoringGroundTruthS3Input `json:"GroundTruthS3Input,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelQualityJobDefinition_ModelQualityJobInput) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelQualityJobDefinition.ModelQualityJobInput"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringgroundtruths3input.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringgroundtruths3input.go
new file mode 100644
index 0000000000..4310e49b97
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringgroundtruths3input.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelQualityJobDefinition_MonitoringGroundTruthS3Input AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.MonitoringGroundTruthS3Input)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-monitoringgroundtruths3input.html
+type ModelQualityJobDefinition_MonitoringGroundTruthS3Input struct {
+
+	// S3Uri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-monitoringgroundtruths3input.html#cfn-sagemaker-modelqualityjobdefinition-monitoringgroundtruths3input-s3uri
+	S3Uri *types.Value `json:"S3Uri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelQualityJobDefinition_MonitoringGroundTruthS3Input) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelQualityJobDefinition.MonitoringGroundTruthS3Input"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutput.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutput.go
new file mode 100644
index 0000000000..f00ed33f27
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutput.go
@@ -0,0 +1,35 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelQualityJobDefinition_MonitoringOutput AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-monitoringoutput.html
+type ModelQualityJobDefinition_MonitoringOutput struct {
+
+	// S3Output AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-monitoringoutput.html#cfn-sagemaker-modelqualityjobdefinition-monitoringoutput-s3output
+	S3Output *ModelQualityJobDefinition_S3Output `json:"S3Output,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelQualityJobDefinition_MonitoringOutput) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutput"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutputconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutputconfig.go
new file mode 100644
index 0000000000..02514b13bd
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringoutputconfig.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelQualityJobDefinition_MonitoringOutputConfig AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutputConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-monitoringoutputconfig.html
+type ModelQualityJobDefinition_MonitoringOutputConfig struct {
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-monitoringoutputconfig.html#cfn-sagemaker-modelqualityjobdefinition-monitoringoutputconfig-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// MonitoringOutputs AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-monitoringoutputconfig.html#cfn-sagemaker-modelqualityjobdefinition-monitoringoutputconfig-monitoringoutputs
+	MonitoringOutputs []ModelQualityJobDefinition_MonitoringOutput `json:"MonitoringOutputs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelQualityJobDefinition_MonitoringOutputConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutputConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringresources.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringresources.go
new file mode 100644
index 0000000000..3a47302928
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_monitoringresources.go
@@ -0,0 +1,35 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelQualityJobDefinition_MonitoringResources AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.MonitoringResources)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-monitoringresources.html
+type ModelQualityJobDefinition_MonitoringResources struct {
+
+	// ClusterConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-monitoringresources.html#cfn-sagemaker-modelqualityjobdefinition-monitoringresources-clusterconfig
+	ClusterConfig *ModelQualityJobDefinition_ClusterConfig `json:"ClusterConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelQualityJobDefinition_MonitoringResources) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelQualityJobDefinition.MonitoringResources"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_networkconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_networkconfig.go
new file mode 100644
index 0000000000..3240b8ddbe
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_networkconfig.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelQualityJobDefinition_NetworkConfig AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.NetworkConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-networkconfig.html
+type ModelQualityJobDefinition_NetworkConfig struct {
+
+	// EnableInterContainerTrafficEncryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-networkconfig.html#cfn-sagemaker-modelqualityjobdefinition-networkconfig-enableintercontainertrafficencryption
+	EnableInterContainerTrafficEncryption *types.Value `json:"EnableInterContainerTrafficEncryption,omitempty"`
+
+	// EnableNetworkIsolation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-networkconfig.html#cfn-sagemaker-modelqualityjobdefinition-networkconfig-enablenetworkisolation
+	EnableNetworkIsolation *types.Value `json:"EnableNetworkIsolation,omitempty"`
+
+	// VpcConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-networkconfig.html#cfn-sagemaker-modelqualityjobdefinition-networkconfig-vpcconfig
+	VpcConfig *ModelQualityJobDefinition_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 *ModelQualityJobDefinition_NetworkConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelQualityJobDefinition.NetworkConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_s3output.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_s3output.go
new file mode 100644
index 0000000000..c97145f392
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_s3output.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelQualityJobDefinition_S3Output AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.S3Output)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-s3output.html
+type ModelQualityJobDefinition_S3Output struct {
+
+	// LocalPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-s3output.html#cfn-sagemaker-modelqualityjobdefinition-s3output-localpath
+	LocalPath *types.Value `json:"LocalPath,omitempty"`
+
+	// S3UploadMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-s3output.html#cfn-sagemaker-modelqualityjobdefinition-s3output-s3uploadmode
+	S3UploadMode *types.Value `json:"S3UploadMode,omitempty"`
+
+	// S3Uri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-s3output.html#cfn-sagemaker-modelqualityjobdefinition-s3output-s3uri
+	S3Uri *types.Value `json:"S3Uri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelQualityJobDefinition_S3Output) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelQualityJobDefinition.S3Output"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_stoppingcondition.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_stoppingcondition.go
new file mode 100644
index 0000000000..85e185fd83
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_stoppingcondition.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelQualityJobDefinition_StoppingCondition AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.StoppingCondition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-stoppingcondition.html
+type ModelQualityJobDefinition_StoppingCondition struct {
+
+	// MaxRuntimeInSeconds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-stoppingcondition.html#cfn-sagemaker-modelqualityjobdefinition-stoppingcondition-maxruntimeinseconds
+	MaxRuntimeInSeconds *types.Value `json:"MaxRuntimeInSeconds"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelQualityJobDefinition_StoppingCondition) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelQualityJobDefinition.StoppingCondition"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_vpcconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_vpcconfig.go
new file mode 100644
index 0000000000..fd44bae2cb
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-modelqualityjobdefinition_vpcconfig.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ModelQualityJobDefinition_VpcConfig AWS CloudFormation Resource (AWS::SageMaker::ModelQualityJobDefinition.VpcConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-vpcconfig.html
+type ModelQualityJobDefinition_VpcConfig struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-vpcconfig.html#cfn-sagemaker-modelqualityjobdefinition-vpcconfig-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// Subnets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-modelqualityjobdefinition-vpcconfig.html#cfn-sagemaker-modelqualityjobdefinition-vpcconfig-subnets
+	Subnets *types.Value `json:"Subnets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ModelQualityJobDefinition_VpcConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::ModelQualityJobDefinition.VpcConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule.go
new file mode 100644
index 0000000000..f5610b85a2
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule.go
@@ -0,0 +1,139 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-monitoringschedule.html
+type MonitoringSchedule struct {
+
+	// EndpointName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-monitoringschedule.html#cfn-sagemaker-monitoringschedule-endpointname
+	EndpointName *types.Value `json:"EndpointName,omitempty"`
+
+	// FailureReason AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-monitoringschedule.html#cfn-sagemaker-monitoringschedule-failurereason
+	FailureReason *types.Value `json:"FailureReason,omitempty"`
+
+	// LastMonitoringExecutionSummary AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-monitoringschedule.html#cfn-sagemaker-monitoringschedule-lastmonitoringexecutionsummary
+	LastMonitoringExecutionSummary *MonitoringSchedule_MonitoringExecutionSummary `json:"LastMonitoringExecutionSummary,omitempty"`
+
+	// MonitoringScheduleConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-monitoringschedule.html#cfn-sagemaker-monitoringschedule-monitoringscheduleconfig
+	MonitoringScheduleConfig *MonitoringSchedule_MonitoringScheduleConfig `json:"MonitoringScheduleConfig,omitempty"`
+
+	// MonitoringScheduleName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-monitoringschedule.html#cfn-sagemaker-monitoringschedule-monitoringschedulename
+	MonitoringScheduleName *types.Value `json:"MonitoringScheduleName,omitempty"`
+
+	// MonitoringScheduleStatus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-monitoringschedule.html#cfn-sagemaker-monitoringschedule-monitoringschedulestatus
+	MonitoringScheduleStatus *types.Value `json:"MonitoringScheduleStatus,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-monitoringschedule.html#cfn-sagemaker-monitoringschedule-tags
+	Tags []cloudformation.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 *MonitoringSchedule) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule"
+}
+
+// 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 MonitoringSchedule) MarshalJSON() ([]byte, error) {
+	type Properties MonitoringSchedule
+	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 *MonitoringSchedule) UnmarshalJSON(b []byte) error {
+	type Properties MonitoringSchedule
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = MonitoringSchedule(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_baselineconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_baselineconfig.go
new file mode 100644
index 0000000000..d38e41e8ac
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_baselineconfig.go
@@ -0,0 +1,40 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule_BaselineConfig AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.BaselineConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-baselineconfig.html
+type MonitoringSchedule_BaselineConfig struct {
+
+	// ConstraintsResource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-baselineconfig.html#cfn-sagemaker-monitoringschedule-baselineconfig-constraintsresource
+	ConstraintsResource *MonitoringSchedule_ConstraintsResource `json:"ConstraintsResource,omitempty"`
+
+	// StatisticsResource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-baselineconfig.html#cfn-sagemaker-monitoringschedule-baselineconfig-statisticsresource
+	StatisticsResource *MonitoringSchedule_StatisticsResource `json:"StatisticsResource,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MonitoringSchedule_BaselineConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule.BaselineConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_clusterconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_clusterconfig.go
new file mode 100644
index 0000000000..ba96bfd3a9
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_clusterconfig.go
@@ -0,0 +1,52 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule_ClusterConfig AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.ClusterConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-clusterconfig.html
+type MonitoringSchedule_ClusterConfig struct {
+
+	// InstanceCount AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-clusterconfig.html#cfn-sagemaker-monitoringschedule-clusterconfig-instancecount
+	InstanceCount *types.Value `json:"InstanceCount"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-clusterconfig.html#cfn-sagemaker-monitoringschedule-clusterconfig-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// VolumeKmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-clusterconfig.html#cfn-sagemaker-monitoringschedule-clusterconfig-volumekmskeyid
+	VolumeKmsKeyId *types.Value `json:"VolumeKmsKeyId,omitempty"`
+
+	// VolumeSizeInGB AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-clusterconfig.html#cfn-sagemaker-monitoringschedule-clusterconfig-volumesizeingb
+	VolumeSizeInGB *types.Value `json:"VolumeSizeInGB"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MonitoringSchedule_ClusterConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule.ClusterConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_constraintsresource.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_constraintsresource.go
new file mode 100644
index 0000000000..ee93c7a459
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_constraintsresource.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule_ConstraintsResource AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.ConstraintsResource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-constraintsresource.html
+type MonitoringSchedule_ConstraintsResource struct {
+
+	// S3Uri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-constraintsresource.html#cfn-sagemaker-monitoringschedule-constraintsresource-s3uri
+	S3Uri *types.Value `json:"S3Uri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MonitoringSchedule_ConstraintsResource) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule.ConstraintsResource"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_endpointinput.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_endpointinput.go
new file mode 100644
index 0000000000..dca49cde29
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_endpointinput.go
@@ -0,0 +1,52 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule_EndpointInput AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.EndpointInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-endpointinput.html
+type MonitoringSchedule_EndpointInput struct {
+
+	// EndpointName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-endpointinput.html#cfn-sagemaker-monitoringschedule-endpointinput-endpointname
+	EndpointName *types.Value `json:"EndpointName,omitempty"`
+
+	// LocalPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-endpointinput.html#cfn-sagemaker-monitoringschedule-endpointinput-localpath
+	LocalPath *types.Value `json:"LocalPath,omitempty"`
+
+	// S3DataDistributionType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-endpointinput.html#cfn-sagemaker-monitoringschedule-endpointinput-s3datadistributiontype
+	S3DataDistributionType *types.Value `json:"S3DataDistributionType,omitempty"`
+
+	// S3InputMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-endpointinput.html#cfn-sagemaker-monitoringschedule-endpointinput-s3inputmode
+	S3InputMode *types.Value `json:"S3InputMode,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MonitoringSchedule_EndpointInput) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule.EndpointInput"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_environment.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_environment.go
new file mode 100644
index 0000000000..6b85a424a7
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_environment.go
@@ -0,0 +1,30 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule_Environment AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.Environment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-environment.html
+type MonitoringSchedule_Environment struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MonitoringSchedule_Environment) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule.Environment"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringappspecification.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringappspecification.go
new file mode 100644
index 0000000000..38d3e2e4e0
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringappspecification.go
@@ -0,0 +1,57 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule_MonitoringAppSpecification AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.MonitoringAppSpecification)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringappspecification.html
+type MonitoringSchedule_MonitoringAppSpecification struct {
+
+	// ContainerArguments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringappspecification.html#cfn-sagemaker-monitoringschedule-monitoringappspecification-containerarguments
+	ContainerArguments *types.Value `json:"ContainerArguments,omitempty"`
+
+	// ContainerEntrypoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringappspecification.html#cfn-sagemaker-monitoringschedule-monitoringappspecification-containerentrypoint
+	ContainerEntrypoint *types.Value `json:"ContainerEntrypoint,omitempty"`
+
+	// ImageUri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringappspecification.html#cfn-sagemaker-monitoringschedule-monitoringappspecification-imageuri
+	ImageUri *types.Value `json:"ImageUri,omitempty"`
+
+	// PostAnalyticsProcessorSourceUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringappspecification.html#cfn-sagemaker-monitoringschedule-monitoringappspecification-postanalyticsprocessorsourceuri
+	PostAnalyticsProcessorSourceUri *types.Value `json:"PostAnalyticsProcessorSourceUri,omitempty"`
+
+	// RecordPreprocessorSourceUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringappspecification.html#cfn-sagemaker-monitoringschedule-monitoringappspecification-recordpreprocessorsourceuri
+	RecordPreprocessorSourceUri *types.Value `json:"RecordPreprocessorSourceUri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MonitoringSchedule_MonitoringAppSpecification) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule.MonitoringAppSpecification"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringexecutionsummary.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringexecutionsummary.go
new file mode 100644
index 0000000000..683b5c0909
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringexecutionsummary.go
@@ -0,0 +1,72 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule_MonitoringExecutionSummary AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.MonitoringExecutionSummary)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringexecutionsummary.html
+type MonitoringSchedule_MonitoringExecutionSummary struct {
+
+	// CreationTime AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringexecutionsummary.html#cfn-sagemaker-monitoringschedule-monitoringexecutionsummary-creationtime
+	CreationTime *types.Value `json:"CreationTime,omitempty"`
+
+	// EndpointName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringexecutionsummary.html#cfn-sagemaker-monitoringschedule-monitoringexecutionsummary-endpointname
+	EndpointName *types.Value `json:"EndpointName,omitempty"`
+
+	// FailureReason AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringexecutionsummary.html#cfn-sagemaker-monitoringschedule-monitoringexecutionsummary-failurereason
+	FailureReason *types.Value `json:"FailureReason,omitempty"`
+
+	// LastModifiedTime AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringexecutionsummary.html#cfn-sagemaker-monitoringschedule-monitoringexecutionsummary-lastmodifiedtime
+	LastModifiedTime *types.Value `json:"LastModifiedTime,omitempty"`
+
+	// MonitoringExecutionStatus AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringexecutionsummary.html#cfn-sagemaker-monitoringschedule-monitoringexecutionsummary-monitoringexecutionstatus
+	MonitoringExecutionStatus *types.Value `json:"MonitoringExecutionStatus,omitempty"`
+
+	// MonitoringScheduleName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringexecutionsummary.html#cfn-sagemaker-monitoringschedule-monitoringexecutionsummary-monitoringschedulename
+	MonitoringScheduleName *types.Value `json:"MonitoringScheduleName,omitempty"`
+
+	// ProcessingJobArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringexecutionsummary.html#cfn-sagemaker-monitoringschedule-monitoringexecutionsummary-processingjobarn
+	ProcessingJobArn *types.Value `json:"ProcessingJobArn,omitempty"`
+
+	// ScheduledTime AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringexecutionsummary.html#cfn-sagemaker-monitoringschedule-monitoringexecutionsummary-scheduledtime
+	ScheduledTime *types.Value `json:"ScheduledTime,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MonitoringSchedule_MonitoringExecutionSummary) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule.MonitoringExecutionSummary"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinput.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinput.go
new file mode 100644
index 0000000000..bdc164db28
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinput.go
@@ -0,0 +1,35 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule_MonitoringInput AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.MonitoringInput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringinput.html
+type MonitoringSchedule_MonitoringInput struct {
+
+	// EndpointInput AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringinput.html#cfn-sagemaker-monitoringschedule-monitoringinput-endpointinput
+	EndpointInput *MonitoringSchedule_EndpointInput `json:"EndpointInput,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MonitoringSchedule_MonitoringInput) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule.MonitoringInput"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinputs.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinputs.go
new file mode 100644
index 0000000000..3a3c7b9d0d
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringinputs.go
@@ -0,0 +1,35 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule_MonitoringInputs AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.MonitoringInputs)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringinputs.html
+type MonitoringSchedule_MonitoringInputs struct {
+
+	// MonitoringInputs AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringinputs.html#cfn-sagemaker-monitoringschedule-monitoringinputs-monitoringinputs
+	MonitoringInputs []MonitoringSchedule_MonitoringInput `json:"MonitoringInputs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MonitoringSchedule_MonitoringInputs) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule.MonitoringInputs"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringjobdefinition.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringjobdefinition.go
new file mode 100644
index 0000000000..a1afffecc2
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringjobdefinition.go
@@ -0,0 +1,77 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule_MonitoringJobDefinition AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.MonitoringJobDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringjobdefinition.html
+type MonitoringSchedule_MonitoringJobDefinition struct {
+
+	// BaselineConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringjobdefinition.html#cfn-sagemaker-monitoringschedule-monitoringjobdefinition-baselineconfig
+	BaselineConfig *MonitoringSchedule_BaselineConfig `json:"BaselineConfig,omitempty"`
+
+	// Environment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringjobdefinition.html#cfn-sagemaker-monitoringschedule-monitoringjobdefinition-environment
+	Environment map[string]*types.Value `json:"Environment,omitempty"`
+
+	// MonitoringAppSpecification AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringjobdefinition.html#cfn-sagemaker-monitoringschedule-monitoringjobdefinition-monitoringappspecification
+	MonitoringAppSpecification *MonitoringSchedule_MonitoringAppSpecification `json:"MonitoringAppSpecification,omitempty"`
+
+	// MonitoringInputs AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringjobdefinition.html#cfn-sagemaker-monitoringschedule-monitoringjobdefinition-monitoringinputs
+	MonitoringInputs []MonitoringSchedule_MonitoringInput `json:"MonitoringInputs,omitempty"`
+
+	// MonitoringOutputConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringjobdefinition.html#cfn-sagemaker-monitoringschedule-monitoringjobdefinition-monitoringoutputconfig
+	MonitoringOutputConfig *MonitoringSchedule_MonitoringOutputConfig `json:"MonitoringOutputConfig,omitempty"`
+
+	// MonitoringResources AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringjobdefinition.html#cfn-sagemaker-monitoringschedule-monitoringjobdefinition-monitoringresources
+	MonitoringResources *MonitoringSchedule_MonitoringResources `json:"MonitoringResources,omitempty"`
+
+	// NetworkConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringjobdefinition.html#cfn-sagemaker-monitoringschedule-monitoringjobdefinition-networkconfig
+	NetworkConfig *MonitoringSchedule_NetworkConfig `json:"NetworkConfig,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringjobdefinition.html#cfn-sagemaker-monitoringschedule-monitoringjobdefinition-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// StoppingCondition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringjobdefinition.html#cfn-sagemaker-monitoringschedule-monitoringjobdefinition-stoppingcondition
+	StoppingCondition *MonitoringSchedule_StoppingCondition `json:"StoppingCondition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MonitoringSchedule_MonitoringJobDefinition) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule.MonitoringJobDefinition"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutput.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutput.go
new file mode 100644
index 0000000000..5ed97daafc
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutput.go
@@ -0,0 +1,35 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule_MonitoringOutput AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.MonitoringOutput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringoutput.html
+type MonitoringSchedule_MonitoringOutput struct {
+
+	// S3Output AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringoutput.html#cfn-sagemaker-monitoringschedule-monitoringoutput-s3output
+	S3Output *MonitoringSchedule_S3Output `json:"S3Output,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MonitoringSchedule_MonitoringOutput) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule.MonitoringOutput"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutputconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutputconfig.go
new file mode 100644
index 0000000000..a6088e94c7
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringoutputconfig.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule_MonitoringOutputConfig AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.MonitoringOutputConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringoutputconfig.html
+type MonitoringSchedule_MonitoringOutputConfig struct {
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringoutputconfig.html#cfn-sagemaker-monitoringschedule-monitoringoutputconfig-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// MonitoringOutputs AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringoutputconfig.html#cfn-sagemaker-monitoringschedule-monitoringoutputconfig-monitoringoutputs
+	MonitoringOutputs []MonitoringSchedule_MonitoringOutput `json:"MonitoringOutputs,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MonitoringSchedule_MonitoringOutputConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule.MonitoringOutputConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringresources.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringresources.go
new file mode 100644
index 0000000000..6549a80dc8
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringresources.go
@@ -0,0 +1,35 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule_MonitoringResources AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.MonitoringResources)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringresources.html
+type MonitoringSchedule_MonitoringResources struct {
+
+	// ClusterConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringresources.html#cfn-sagemaker-monitoringschedule-monitoringresources-clusterconfig
+	ClusterConfig *MonitoringSchedule_ClusterConfig `json:"ClusterConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MonitoringSchedule_MonitoringResources) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule.MonitoringResources"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringscheduleconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringscheduleconfig.go
new file mode 100644
index 0000000000..ac3a561788
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_monitoringscheduleconfig.go
@@ -0,0 +1,52 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule_MonitoringScheduleConfig AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.MonitoringScheduleConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringscheduleconfig.html
+type MonitoringSchedule_MonitoringScheduleConfig struct {
+
+	// MonitoringJobDefinition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringscheduleconfig.html#cfn-sagemaker-monitoringschedule-monitoringscheduleconfig-monitoringjobdefinition
+	MonitoringJobDefinition *MonitoringSchedule_MonitoringJobDefinition `json:"MonitoringJobDefinition,omitempty"`
+
+	// MonitoringJobDefinitionName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringscheduleconfig.html#cfn-sagemaker-monitoringschedule-monitoringscheduleconfig-monitoringjobdefinitionname
+	MonitoringJobDefinitionName *types.Value `json:"MonitoringJobDefinitionName,omitempty"`
+
+	// MonitoringType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringscheduleconfig.html#cfn-sagemaker-monitoringschedule-monitoringscheduleconfig-monitoringtype
+	MonitoringType *types.Value `json:"MonitoringType,omitempty"`
+
+	// ScheduleConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-monitoringscheduleconfig.html#cfn-sagemaker-monitoringschedule-monitoringscheduleconfig-scheduleconfig
+	ScheduleConfig *MonitoringSchedule_ScheduleConfig `json:"ScheduleConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MonitoringSchedule_MonitoringScheduleConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule.MonitoringScheduleConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_networkconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_networkconfig.go
new file mode 100644
index 0000000000..40011aa5ab
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_networkconfig.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule_NetworkConfig AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.NetworkConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-networkconfig.html
+type MonitoringSchedule_NetworkConfig struct {
+
+	// EnableInterContainerTrafficEncryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-networkconfig.html#cfn-sagemaker-monitoringschedule-networkconfig-enableintercontainertrafficencryption
+	EnableInterContainerTrafficEncryption *types.Value `json:"EnableInterContainerTrafficEncryption,omitempty"`
+
+	// EnableNetworkIsolation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-networkconfig.html#cfn-sagemaker-monitoringschedule-networkconfig-enablenetworkisolation
+	EnableNetworkIsolation *types.Value `json:"EnableNetworkIsolation,omitempty"`
+
+	// VpcConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-networkconfig.html#cfn-sagemaker-monitoringschedule-networkconfig-vpcconfig
+	VpcConfig *MonitoringSchedule_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 *MonitoringSchedule_NetworkConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule.NetworkConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_s3output.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_s3output.go
new file mode 100644
index 0000000000..1475fb9be8
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_s3output.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule_S3Output AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.S3Output)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-s3output.html
+type MonitoringSchedule_S3Output struct {
+
+	// LocalPath AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-s3output.html#cfn-sagemaker-monitoringschedule-s3output-localpath
+	LocalPath *types.Value `json:"LocalPath,omitempty"`
+
+	// S3UploadMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-s3output.html#cfn-sagemaker-monitoringschedule-s3output-s3uploadmode
+	S3UploadMode *types.Value `json:"S3UploadMode,omitempty"`
+
+	// S3Uri AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-s3output.html#cfn-sagemaker-monitoringschedule-s3output-s3uri
+	S3Uri *types.Value `json:"S3Uri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MonitoringSchedule_S3Output) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule.S3Output"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_scheduleconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_scheduleconfig.go
new file mode 100644
index 0000000000..6c361a164a
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_scheduleconfig.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule_ScheduleConfig AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.ScheduleConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-scheduleconfig.html
+type MonitoringSchedule_ScheduleConfig struct {
+
+	// ScheduleExpression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-scheduleconfig.html#cfn-sagemaker-monitoringschedule-scheduleconfig-scheduleexpression
+	ScheduleExpression *types.Value `json:"ScheduleExpression,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MonitoringSchedule_ScheduleConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule.ScheduleConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_statisticsresource.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_statisticsresource.go
new file mode 100644
index 0000000000..f35109fd27
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_statisticsresource.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule_StatisticsResource AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.StatisticsResource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-statisticsresource.html
+type MonitoringSchedule_StatisticsResource struct {
+
+	// S3Uri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-statisticsresource.html#cfn-sagemaker-monitoringschedule-statisticsresource-s3uri
+	S3Uri *types.Value `json:"S3Uri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MonitoringSchedule_StatisticsResource) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule.StatisticsResource"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_stoppingcondition.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_stoppingcondition.go
new file mode 100644
index 0000000000..e0d8cc96a1
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_stoppingcondition.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule_StoppingCondition AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.StoppingCondition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-stoppingcondition.html
+type MonitoringSchedule_StoppingCondition struct {
+
+	// MaxRuntimeInSeconds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-stoppingcondition.html#cfn-sagemaker-monitoringschedule-stoppingcondition-maxruntimeinseconds
+	MaxRuntimeInSeconds *types.Value `json:"MaxRuntimeInSeconds"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MonitoringSchedule_StoppingCondition) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule.StoppingCondition"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_vpcconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_vpcconfig.go
new file mode 100644
index 0000000000..88df2ce956
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-monitoringschedule_vpcconfig.go
@@ -0,0 +1,42 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MonitoringSchedule_VpcConfig AWS CloudFormation Resource (AWS::SageMaker::MonitoringSchedule.VpcConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-vpcconfig.html
+type MonitoringSchedule_VpcConfig struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-vpcconfig.html#cfn-sagemaker-monitoringschedule-vpcconfig-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// Subnets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-monitoringschedule-vpcconfig.html#cfn-sagemaker-monitoringschedule-vpcconfig-subnets
+	Subnets *types.Value `json:"Subnets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MonitoringSchedule_VpcConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::MonitoringSchedule.VpcConfig"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstance.go b/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstance.go
new file mode 100644
index 0000000000..25ae4877ef
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstance.go
@@ -0,0 +1,179 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// NotebookInstance AWS CloudFormation Resource (AWS::SageMaker::NotebookInstance)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstance.html
+type NotebookInstance struct {
+
+	// AcceleratorTypes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstance.html#cfn-sagemaker-notebookinstance-acceleratortypes
+	AcceleratorTypes *types.Value `json:"AcceleratorTypes,omitempty"`
+
+	// AdditionalCodeRepositories AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstance.html#cfn-sagemaker-notebookinstance-additionalcoderepositories
+	AdditionalCodeRepositories *types.Value `json:"AdditionalCodeRepositories,omitempty"`
+
+	// DefaultCodeRepository AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstance.html#cfn-sagemaker-notebookinstance-defaultcoderepository
+	DefaultCodeRepository *types.Value `json:"DefaultCodeRepository,omitempty"`
+
+	// DirectInternetAccess AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstance.html#cfn-sagemaker-notebookinstance-directinternetaccess
+	DirectInternetAccess *types.Value `json:"DirectInternetAccess,omitempty"`
+
+	// InstanceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstance.html#cfn-sagemaker-notebookinstance-instancetype
+	InstanceType *types.Value `json:"InstanceType,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstance.html#cfn-sagemaker-notebookinstance-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// LifecycleConfigName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstance.html#cfn-sagemaker-notebookinstance-lifecycleconfigname
+	LifecycleConfigName *types.Value `json:"LifecycleConfigName,omitempty"`
+
+	// NotebookInstanceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstance.html#cfn-sagemaker-notebookinstance-notebookinstancename
+	NotebookInstanceName *types.Value `json:"NotebookInstanceName,omitempty"`
+
+	// PlatformIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstance.html#cfn-sagemaker-notebookinstance-platformidentifier
+	PlatformIdentifier *types.Value `json:"PlatformIdentifier,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstance.html#cfn-sagemaker-notebookinstance-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// RootAccess AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstance.html#cfn-sagemaker-notebookinstance-rootaccess
+	RootAccess *types.Value `json:"RootAccess,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstance.html#cfn-sagemaker-notebookinstance-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstance.html#cfn-sagemaker-notebookinstance-subnetid
+	SubnetId *types.Value `json:"SubnetId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstance.html#cfn-sagemaker-notebookinstance-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VolumeSizeInGB AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstance.html#cfn-sagemaker-notebookinstance-volumesizeingb
+	VolumeSizeInGB *types.Value `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 *NotebookInstance) AWSCloudFormationType() string {
+	return "AWS::SageMaker::NotebookInstance"
+}
+
+// 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 NotebookInstance) MarshalJSON() ([]byte, error) {
+	type Properties NotebookInstance
+	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 *NotebookInstance) UnmarshalJSON(b []byte) error {
+	type Properties NotebookInstance
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = NotebookInstance(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig.go b/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig.go
new file mode 100644
index 0000000000..797edc078b
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig.go
@@ -0,0 +1,118 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NotebookInstanceLifecycleConfig AWS CloudFormation Resource (AWS::SageMaker::NotebookInstanceLifecycleConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstancelifecycleconfig.html
+type NotebookInstanceLifecycleConfig struct {
+
+	// NotebookInstanceLifecycleConfigName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstancelifecycleconfig.html#cfn-sagemaker-notebookinstancelifecycleconfig-notebookinstancelifecycleconfigname
+	NotebookInstanceLifecycleConfigName *types.Value `json:"NotebookInstanceLifecycleConfigName,omitempty"`
+
+	// OnCreate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstancelifecycleconfig.html#cfn-sagemaker-notebookinstancelifecycleconfig-oncreate
+	OnCreate []NotebookInstanceLifecycleConfig_NotebookInstanceLifecycleHook `json:"OnCreate,omitempty"`
+
+	// OnStart AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-notebookinstancelifecycleconfig.html#cfn-sagemaker-notebookinstancelifecycleconfig-onstart
+	OnStart []NotebookInstanceLifecycleConfig_NotebookInstanceLifecycleHook `json:"OnStart,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NotebookInstanceLifecycleConfig) AWSCloudFormationType() string {
+	return "AWS::SageMaker::NotebookInstanceLifecycleConfig"
+}
+
+// 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 NotebookInstanceLifecycleConfig) MarshalJSON() ([]byte, error) {
+	type Properties NotebookInstanceLifecycleConfig
+	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 *NotebookInstanceLifecycleConfig) UnmarshalJSON(b []byte) error {
+	type Properties NotebookInstanceLifecycleConfig
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = NotebookInstanceLifecycleConfig(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig_notebookinstancelifecyclehook.go b/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig_notebookinstancelifecyclehook.go
new file mode 100644
index 0000000000..af3bd7d282
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-notebookinstancelifecycleconfig_notebookinstancelifecyclehook.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// NotebookInstanceLifecycleConfig_NotebookInstanceLifecycleHook AWS CloudFormation Resource (AWS::SageMaker::NotebookInstanceLifecycleConfig.NotebookInstanceLifecycleHook)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-notebookinstancelifecycleconfig-notebookinstancelifecyclehook.html
+type NotebookInstanceLifecycleConfig_NotebookInstanceLifecycleHook struct {
+
+	// Content AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-notebookinstancelifecycleconfig-notebookinstancelifecyclehook.html#cfn-sagemaker-notebookinstancelifecycleconfig-notebookinstancelifecyclehook-content
+	Content *types.Value `json:"Content,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *NotebookInstanceLifecycleConfig_NotebookInstanceLifecycleHook) AWSCloudFormationType() string {
+	return "AWS::SageMaker::NotebookInstanceLifecycleConfig.NotebookInstanceLifecycleHook"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-pipeline.go b/goformation/cloudformation/sagemaker/aws-sagemaker-pipeline.go
new file mode 100644
index 0000000000..9b4253cfde
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-pipeline.go
@@ -0,0 +1,134 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Pipeline AWS CloudFormation Resource (AWS::SageMaker::Pipeline)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-pipeline.html
+type Pipeline struct {
+
+	// PipelineDefinition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-pipeline.html#cfn-sagemaker-pipeline-pipelinedefinition
+	PipelineDefinition interface{} `json:"PipelineDefinition,omitempty"`
+
+	// PipelineDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-pipeline.html#cfn-sagemaker-pipeline-pipelinedescription
+	PipelineDescription *types.Value `json:"PipelineDescription,omitempty"`
+
+	// PipelineDisplayName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-pipeline.html#cfn-sagemaker-pipeline-pipelinedisplayname
+	PipelineDisplayName *types.Value `json:"PipelineDisplayName,omitempty"`
+
+	// PipelineName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-pipeline.html#cfn-sagemaker-pipeline-pipelinename
+	PipelineName *types.Value `json:"PipelineName,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-pipeline.html#cfn-sagemaker-pipeline-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-pipeline.html#cfn-sagemaker-pipeline-tags
+	Tags []cloudformation.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 *Pipeline) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Pipeline"
+}
+
+// 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 Pipeline) MarshalJSON() ([]byte, error) {
+	type Properties Pipeline
+	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 *Pipeline) UnmarshalJSON(b []byte) error {
+	type Properties Pipeline
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Pipeline(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-project.go b/goformation/cloudformation/sagemaker/aws-sagemaker-project.go
new file mode 100644
index 0000000000..ca3a0f6198
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-project.go
@@ -0,0 +1,124 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Project AWS CloudFormation Resource (AWS::SageMaker::Project)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-project.html
+type Project struct {
+
+	// ProjectDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-project.html#cfn-sagemaker-project-projectdescription
+	ProjectDescription *types.Value `json:"ProjectDescription,omitempty"`
+
+	// ProjectName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-project.html#cfn-sagemaker-project-projectname
+	ProjectName *types.Value `json:"ProjectName,omitempty"`
+
+	// ServiceCatalogProvisioningDetails AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-project.html#cfn-sagemaker-project-servicecatalogprovisioningdetails
+	ServiceCatalogProvisioningDetails interface{} `json:"ServiceCatalogProvisioningDetails,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-project.html#cfn-sagemaker-project-tags
+	Tags []cloudformation.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 *Project) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Project"
+}
+
+// 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 Project) MarshalJSON() ([]byte, error) {
+	type Properties Project
+	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 *Project) UnmarshalJSON(b []byte) error {
+	type Properties Project
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Project(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile.go b/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile.go
new file mode 100644
index 0000000000..087a4e0973
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile.go
@@ -0,0 +1,134 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserProfile AWS CloudFormation Resource (AWS::SageMaker::UserProfile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-userprofile.html
+type UserProfile struct {
+
+	// DomainId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-userprofile.html#cfn-sagemaker-userprofile-domainid
+	DomainId *types.Value `json:"DomainId,omitempty"`
+
+	// SingleSignOnUserIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-userprofile.html#cfn-sagemaker-userprofile-singlesignonuseridentifier
+	SingleSignOnUserIdentifier *types.Value `json:"SingleSignOnUserIdentifier,omitempty"`
+
+	// SingleSignOnUserValue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-userprofile.html#cfn-sagemaker-userprofile-singlesignonuservalue
+	SingleSignOnUserValue *types.Value `json:"SingleSignOnUserValue,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-userprofile.html#cfn-sagemaker-userprofile-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// UserProfileName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-userprofile.html#cfn-sagemaker-userprofile-userprofilename
+	UserProfileName *types.Value `json:"UserProfileName,omitempty"`
+
+	// UserSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-userprofile.html#cfn-sagemaker-userprofile-usersettings
+	UserSettings *UserProfile_UserSettings `json:"UserSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::SageMaker::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_customimage.go b/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_customimage.go
new file mode 100644
index 0000000000..53d8725078
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_customimage.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserProfile_CustomImage AWS CloudFormation Resource (AWS::SageMaker::UserProfile.CustomImage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-customimage.html
+type UserProfile_CustomImage struct {
+
+	// AppImageConfigName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-customimage.html#cfn-sagemaker-userprofile-customimage-appimageconfigname
+	AppImageConfigName *types.Value `json:"AppImageConfigName,omitempty"`
+
+	// ImageName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-customimage.html#cfn-sagemaker-userprofile-customimage-imagename
+	ImageName *types.Value `json:"ImageName,omitempty"`
+
+	// ImageVersionNumber AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-customimage.html#cfn-sagemaker-userprofile-customimage-imageversionnumber
+	ImageVersionNumber *types.Value `json:"ImageVersionNumber,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CustomImage) AWSCloudFormationType() string {
+	return "AWS::SageMaker::UserProfile.CustomImage"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_jupyterserverappsettings.go b/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_jupyterserverappsettings.go
new file mode 100644
index 0000000000..6ddb8a6d20
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_jupyterserverappsettings.go
@@ -0,0 +1,35 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserProfile_JupyterServerAppSettings AWS CloudFormation Resource (AWS::SageMaker::UserProfile.JupyterServerAppSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-jupyterserverappsettings.html
+type UserProfile_JupyterServerAppSettings struct {
+
+	// DefaultResourceSpec AWS CloudFormation Property
+	// Required: false
+	// 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"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_JupyterServerAppSettings) AWSCloudFormationType() string {
+	return "AWS::SageMaker::UserProfile.JupyterServerAppSettings"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_kernelgatewayappsettings.go b/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_kernelgatewayappsettings.go
new file mode 100644
index 0000000000..a1f6912098
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_kernelgatewayappsettings.go
@@ -0,0 +1,40 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserProfile_KernelGatewayAppSettings AWS CloudFormation Resource (AWS::SageMaker::UserProfile.KernelGatewayAppSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-kernelgatewayappsettings.html
+type UserProfile_KernelGatewayAppSettings struct {
+
+	// CustomImages AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-kernelgatewayappsettings.html#cfn-sagemaker-userprofile-kernelgatewayappsettings-customimages
+	CustomImages []UserProfile_CustomImage `json:"CustomImages,omitempty"`
+
+	// DefaultResourceSpec AWS CloudFormation Property
+	// Required: false
+	// 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"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_KernelGatewayAppSettings) AWSCloudFormationType() string {
+	return "AWS::SageMaker::UserProfile.KernelGatewayAppSettings"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_resourcespec.go b/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_resourcespec.go
new file mode 100644
index 0000000000..c76345b325
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_resourcespec.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserProfile_ResourceSpec AWS CloudFormation Resource (AWS::SageMaker::UserProfile.ResourceSpec)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-resourcespec.html
+type UserProfile_ResourceSpec struct {
+
+	// InstanceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-resourcespec.html#cfn-sagemaker-userprofile-resourcespec-instancetype
+	InstanceType *types.Value `json:"InstanceType,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
+	SageMakerImageArn *types.Value `json:"SageMakerImageArn,omitempty"`
+
+	// SageMakerImageVersionArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-resourcespec.html#cfn-sagemaker-userprofile-resourcespec-sagemakerimageversionarn
+	SageMakerImageVersionArn *types.Value `json:"SageMakerImageVersionArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ResourceSpec) AWSCloudFormationType() string {
+	return "AWS::SageMaker::UserProfile.ResourceSpec"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_sharingsettings.go b/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_sharingsettings.go
new file mode 100644
index 0000000000..d80671d066
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_sharingsettings.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserProfile_SharingSettings AWS CloudFormation Resource (AWS::SageMaker::UserProfile.SharingSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-sharingsettings.html
+type UserProfile_SharingSettings struct {
+
+	// NotebookOutputOption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-sharingsettings.html#cfn-sagemaker-userprofile-sharingsettings-notebookoutputoption
+	NotebookOutputOption *types.Value `json:"NotebookOutputOption,omitempty"`
+
+	// S3KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-sharingsettings.html#cfn-sagemaker-userprofile-sharingsettings-s3kmskeyid
+	S3KmsKeyId *types.Value `json:"S3KmsKeyId,omitempty"`
+
+	// S3OutputPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-sharingsettings.html#cfn-sagemaker-userprofile-sharingsettings-s3outputpath
+	S3OutputPath *types.Value `json:"S3OutputPath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SharingSettings) AWSCloudFormationType() string {
+	return "AWS::SageMaker::UserProfile.SharingSettings"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_usersettings.go b/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_usersettings.go
new file mode 100644
index 0000000000..9b77ed97d6
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-userprofile_usersettings.go
@@ -0,0 +1,57 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// UserProfile_UserSettings AWS CloudFormation Resource (AWS::SageMaker::UserProfile.UserSettings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-usersettings.html
+type UserProfile_UserSettings struct {
+
+	// ExecutionRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-usersettings.html#cfn-sagemaker-userprofile-usersettings-executionrole
+	ExecutionRole *types.Value `json:"ExecutionRole,omitempty"`
+
+	// JupyterServerAppSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-usersettings.html#cfn-sagemaker-userprofile-usersettings-jupyterserverappsettings
+	JupyterServerAppSettings *UserProfile_JupyterServerAppSettings `json:"JupyterServerAppSettings,omitempty"`
+
+	// KernelGatewayAppSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-usersettings.html#cfn-sagemaker-userprofile-usersettings-kernelgatewayappsettings
+	KernelGatewayAppSettings *UserProfile_KernelGatewayAppSettings `json:"KernelGatewayAppSettings,omitempty"`
+
+	// SecurityGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-usersettings.html#cfn-sagemaker-userprofile-usersettings-securitygroups
+	SecurityGroups *types.Value `json:"SecurityGroups,omitempty"`
+
+	// SharingSettings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-userprofile-usersettings.html#cfn-sagemaker-userprofile-usersettings-sharingsettings
+	SharingSettings *UserProfile_SharingSettings `json:"SharingSettings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_UserSettings) AWSCloudFormationType() string {
+	return "AWS::SageMaker::UserProfile.UserSettings"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-workteam.go b/goformation/cloudformation/sagemaker/aws-sagemaker-workteam.go
new file mode 100644
index 0000000000..300eb2fb5f
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-workteam.go
@@ -0,0 +1,129 @@
+package sagemaker
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Workteam AWS CloudFormation Resource (AWS::SageMaker::Workteam)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-workteam.html
+type Workteam struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-workteam.html#cfn-sagemaker-workteam-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// MemberDefinitions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-workteam.html#cfn-sagemaker-workteam-memberdefinitions
+	MemberDefinitions []Workteam_MemberDefinition `json:"MemberDefinitions,omitempty"`
+
+	// NotificationConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-workteam.html#cfn-sagemaker-workteam-notificationconfiguration
+	NotificationConfiguration *Workteam_NotificationConfiguration `json:"NotificationConfiguration,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-workteam.html#cfn-sagemaker-workteam-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// WorkteamName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sagemaker-workteam.html#cfn-sagemaker-workteam-workteamname
+	WorkteamName *types.Value `json:"WorkteamName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Workteam) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Workteam"
+}
+
+// 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 Workteam) MarshalJSON() ([]byte, error) {
+	type Properties Workteam
+	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 *Workteam) UnmarshalJSON(b []byte) error {
+	type Properties Workteam
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Workteam(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_cognitomemberdefinition.go b/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_cognitomemberdefinition.go
new file mode 100644
index 0000000000..8027a24df4
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_cognitomemberdefinition.go
@@ -0,0 +1,47 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Workteam_CognitoMemberDefinition AWS CloudFormation Resource (AWS::SageMaker::Workteam.CognitoMemberDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-workteam-cognitomemberdefinition.html
+type Workteam_CognitoMemberDefinition struct {
+
+	// CognitoClientId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-workteam-cognitomemberdefinition.html#cfn-sagemaker-workteam-cognitomemberdefinition-cognitoclientid
+	CognitoClientId *types.Value `json:"CognitoClientId,omitempty"`
+
+	// CognitoUserGroup AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-workteam-cognitomemberdefinition.html#cfn-sagemaker-workteam-cognitomemberdefinition-cognitousergroup
+	CognitoUserGroup *types.Value `json:"CognitoUserGroup,omitempty"`
+
+	// CognitoUserPool AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-workteam-cognitomemberdefinition.html#cfn-sagemaker-workteam-cognitomemberdefinition-cognitouserpool
+	CognitoUserPool *types.Value `json:"CognitoUserPool,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Workteam_CognitoMemberDefinition) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Workteam.CognitoMemberDefinition"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_memberdefinition.go b/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_memberdefinition.go
new file mode 100644
index 0000000000..22bccfb4c6
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_memberdefinition.go
@@ -0,0 +1,35 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Workteam_MemberDefinition AWS CloudFormation Resource (AWS::SageMaker::Workteam.MemberDefinition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-workteam-memberdefinition.html
+type Workteam_MemberDefinition struct {
+
+	// CognitoMemberDefinition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-workteam-memberdefinition.html#cfn-sagemaker-workteam-memberdefinition-cognitomemberdefinition
+	CognitoMemberDefinition *Workteam_CognitoMemberDefinition `json:"CognitoMemberDefinition,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Workteam_MemberDefinition) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Workteam.MemberDefinition"
+}
diff --git a/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_notificationconfiguration.go b/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_notificationconfiguration.go
new file mode 100644
index 0000000000..8b1dffd0f5
--- /dev/null
+++ b/goformation/cloudformation/sagemaker/aws-sagemaker-workteam_notificationconfiguration.go
@@ -0,0 +1,37 @@
+package sagemaker
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Workteam_NotificationConfiguration AWS CloudFormation Resource (AWS::SageMaker::Workteam.NotificationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-workteam-notificationconfiguration.html
+type Workteam_NotificationConfiguration struct {
+
+	// NotificationTopicArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sagemaker-workteam-notificationconfiguration.html#cfn-sagemaker-workteam-notificationconfiguration-notificationtopicarn
+	NotificationTopicArn *types.Value `json:"NotificationTopicArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Workteam_NotificationConfiguration) AWSCloudFormationType() string {
+	return "AWS::SageMaker::Workteam.NotificationConfiguration"
+}
diff --git a/goformation/cloudformation/sdb/aws-sdb-domain.go b/goformation/cloudformation/sdb/aws-sdb-domain.go
new file mode 100644
index 0000000000..4051583d7d
--- /dev/null
+++ b/goformation/cloudformation/sdb/aws-sdb-domain.go
@@ -0,0 +1,108 @@
+package sdb
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Domain AWS CloudFormation Resource (AWS::SDB::Domain)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-simpledb.html
+type Domain struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-simpledb.html#cfn-sdb-domain-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::SDB::Domain"
+}
+
+// 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 Domain) MarshalJSON() ([]byte, error) {
+	type Properties Domain
+	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 *Domain) UnmarshalJSON(b []byte) error {
+	type Properties Domain
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Domain(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/secretsmanager/aws-secretsmanager-resourcepolicy.go b/goformation/cloudformation/secretsmanager/aws-secretsmanager-resourcepolicy.go
new file mode 100644
index 0000000000..10ae20fe9d
--- /dev/null
+++ b/goformation/cloudformation/secretsmanager/aws-secretsmanager-resourcepolicy.go
@@ -0,0 +1,118 @@
+package secretsmanager
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourcePolicy AWS CloudFormation Resource (AWS::SecretsManager::ResourcePolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-resourcepolicy.html
+type ResourcePolicy struct {
+
+	// BlockPublicPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-resourcepolicy.html#cfn-secretsmanager-resourcepolicy-blockpublicpolicy
+	BlockPublicPolicy *types.Value `json:"BlockPublicPolicy,omitempty"`
+
+	// ResourcePolicy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-resourcepolicy.html#cfn-secretsmanager-resourcepolicy-resourcepolicy
+	ResourcePolicy interface{} `json:"ResourcePolicy,omitempty"`
+
+	// SecretId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-resourcepolicy.html#cfn-secretsmanager-resourcepolicy-secretid
+	SecretId *types.Value `json:"SecretId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::SecretsManager::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule.go b/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule.go
new file mode 100644
index 0000000000..0e4b91ff1b
--- /dev/null
+++ b/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule.go
@@ -0,0 +1,123 @@
+package secretsmanager
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RotationSchedule AWS CloudFormation Resource (AWS::SecretsManager::RotationSchedule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-rotationschedule.html
+type RotationSchedule struct {
+
+	// HostedRotationLambda AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-rotationschedule.html#cfn-secretsmanager-rotationschedule-hostedrotationlambda
+	HostedRotationLambda *RotationSchedule_HostedRotationLambda `json:"HostedRotationLambda,omitempty"`
+
+	// RotationLambdaARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-rotationschedule.html#cfn-secretsmanager-rotationschedule-rotationlambdaarn
+	RotationLambdaARN *types.Value `json:"RotationLambdaARN,omitempty"`
+
+	// RotationRules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-rotationschedule.html#cfn-secretsmanager-rotationschedule-rotationrules
+	RotationRules *RotationSchedule_RotationRules `json:"RotationRules,omitempty"`
+
+	// SecretId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-rotationschedule.html#cfn-secretsmanager-rotationschedule-secretid
+	SecretId *types.Value `json:"SecretId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RotationSchedule) AWSCloudFormationType() string {
+	return "AWS::SecretsManager::RotationSchedule"
+}
+
+// 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 RotationSchedule) MarshalJSON() ([]byte, error) {
+	type Properties RotationSchedule
+	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 *RotationSchedule) UnmarshalJSON(b []byte) error {
+	type Properties RotationSchedule
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RotationSchedule(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_hostedrotationlambda.go b/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_hostedrotationlambda.go
new file mode 100644
index 0000000000..937aa61db0
--- /dev/null
+++ b/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_hostedrotationlambda.go
@@ -0,0 +1,77 @@
+package secretsmanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RotationSchedule_HostedRotationLambda AWS CloudFormation Resource (AWS::SecretsManager::RotationSchedule.HostedRotationLambda)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-rotationschedule-hostedrotationlambda.html
+type RotationSchedule_HostedRotationLambda struct {
+
+	// KmsKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-rotationschedule-hostedrotationlambda.html#cfn-secretsmanager-rotationschedule-hostedrotationlambda-kmskeyarn
+	KmsKeyArn *types.Value `json:"KmsKeyArn,omitempty"`
+
+	// MasterSecretArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-rotationschedule-hostedrotationlambda.html#cfn-secretsmanager-rotationschedule-hostedrotationlambda-mastersecretarn
+	MasterSecretArn *types.Value `json:"MasterSecretArn,omitempty"`
+
+	// MasterSecretKmsKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-rotationschedule-hostedrotationlambda.html#cfn-secretsmanager-rotationschedule-hostedrotationlambda-mastersecretkmskeyarn
+	MasterSecretKmsKeyArn *types.Value `json:"MasterSecretKmsKeyArn,omitempty"`
+
+	// RotationLambdaName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-rotationschedule-hostedrotationlambda.html#cfn-secretsmanager-rotationschedule-hostedrotationlambda-rotationlambdaname
+	RotationLambdaName *types.Value `json:"RotationLambdaName,omitempty"`
+
+	// RotationType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-rotationschedule-hostedrotationlambda.html#cfn-secretsmanager-rotationschedule-hostedrotationlambda-rotationtype
+	RotationType *types.Value `json:"RotationType,omitempty"`
+
+	// SuperuserSecretArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-rotationschedule-hostedrotationlambda.html#cfn-secretsmanager-rotationschedule-hostedrotationlambda-superusersecretarn
+	SuperuserSecretArn *types.Value `json:"SuperuserSecretArn,omitempty"`
+
+	// SuperuserSecretKmsKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-rotationschedule-hostedrotationlambda.html#cfn-secretsmanager-rotationschedule-hostedrotationlambda-superusersecretkmskeyarn
+	SuperuserSecretKmsKeyArn *types.Value `json:"SuperuserSecretKmsKeyArn,omitempty"`
+
+	// VpcSecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-rotationschedule-hostedrotationlambda.html#cfn-secretsmanager-rotationschedule-hostedrotationlambda-vpcsecuritygroupids
+	VpcSecurityGroupIds *types.Value `json:"VpcSecurityGroupIds,omitempty"`
+
+	// VpcSubnetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-rotationschedule-hostedrotationlambda.html#cfn-secretsmanager-rotationschedule-hostedrotationlambda-vpcsubnetids
+	VpcSubnetIds *types.Value `json:"VpcSubnetIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RotationSchedule_HostedRotationLambda) AWSCloudFormationType() string {
+	return "AWS::SecretsManager::RotationSchedule.HostedRotationLambda"
+}
diff --git a/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_rotationrules.go b/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_rotationrules.go
new file mode 100644
index 0000000000..00fba4e1c6
--- /dev/null
+++ b/goformation/cloudformation/secretsmanager/aws-secretsmanager-rotationschedule_rotationrules.go
@@ -0,0 +1,37 @@
+package secretsmanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RotationSchedule_RotationRules AWS CloudFormation Resource (AWS::SecretsManager::RotationSchedule.RotationRules)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-rotationschedule-rotationrules.html
+type RotationSchedule_RotationRules struct {
+
+	// AutomaticallyAfterDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-rotationschedule-rotationrules.html#cfn-secretsmanager-rotationschedule-rotationrules-automaticallyafterdays
+	AutomaticallyAfterDays *types.Value `json:"AutomaticallyAfterDays,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RotationSchedule_RotationRules) AWSCloudFormationType() string {
+	return "AWS::SecretsManager::RotationSchedule.RotationRules"
+}
diff --git a/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret.go b/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret.go
new file mode 100644
index 0000000000..dce132dc96
--- /dev/null
+++ b/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret.go
@@ -0,0 +1,139 @@
+package secretsmanager
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Secret AWS CloudFormation Resource (AWS::SecretsManager::Secret)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html
+type Secret struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html#cfn-secretsmanager-secret-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// GenerateSecretString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html#cfn-secretsmanager-secret-generatesecretstring
+	GenerateSecretString *Secret_GenerateSecretString `json:"GenerateSecretString,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html#cfn-secretsmanager-secret-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html#cfn-secretsmanager-secret-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ReplicaRegions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html#cfn-secretsmanager-secret-replicaregions
+	ReplicaRegions []Secret_ReplicaRegion `json:"ReplicaRegions,omitempty"`
+
+	// SecretString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html#cfn-secretsmanager-secret-secretstring
+	SecretString *types.Value `json:"SecretString,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secret.html#cfn-secretsmanager-secret-tags
+	Tags []cloudformation.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 *Secret) AWSCloudFormationType() string {
+	return "AWS::SecretsManager::Secret"
+}
+
+// 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 Secret) MarshalJSON() ([]byte, error) {
+	type Properties Secret
+	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 *Secret) UnmarshalJSON(b []byte) error {
+	type Properties Secret
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Secret(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret_generatesecretstring.go b/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret_generatesecretstring.go
new file mode 100644
index 0000000000..894da959fa
--- /dev/null
+++ b/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret_generatesecretstring.go
@@ -0,0 +1,82 @@
+package secretsmanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Secret_GenerateSecretString AWS CloudFormation Resource (AWS::SecretsManager::Secret.GenerateSecretString)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-secret-generatesecretstring.html
+type Secret_GenerateSecretString struct {
+
+	// ExcludeCharacters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-secret-generatesecretstring.html#cfn-secretsmanager-secret-generatesecretstring-excludecharacters
+	ExcludeCharacters *types.Value `json:"ExcludeCharacters,omitempty"`
+
+	// ExcludeLowercase AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-secret-generatesecretstring.html#cfn-secretsmanager-secret-generatesecretstring-excludelowercase
+	ExcludeLowercase *types.Value `json:"ExcludeLowercase,omitempty"`
+
+	// ExcludeNumbers AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-secret-generatesecretstring.html#cfn-secretsmanager-secret-generatesecretstring-excludenumbers
+	ExcludeNumbers *types.Value `json:"ExcludeNumbers,omitempty"`
+
+	// ExcludePunctuation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-secret-generatesecretstring.html#cfn-secretsmanager-secret-generatesecretstring-excludepunctuation
+	ExcludePunctuation *types.Value `json:"ExcludePunctuation,omitempty"`
+
+	// ExcludeUppercase AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-secret-generatesecretstring.html#cfn-secretsmanager-secret-generatesecretstring-excludeuppercase
+	ExcludeUppercase *types.Value `json:"ExcludeUppercase,omitempty"`
+
+	// GenerateStringKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-secret-generatesecretstring.html#cfn-secretsmanager-secret-generatesecretstring-generatestringkey
+	GenerateStringKey *types.Value `json:"GenerateStringKey,omitempty"`
+
+	// IncludeSpace AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-secret-generatesecretstring.html#cfn-secretsmanager-secret-generatesecretstring-includespace
+	IncludeSpace *types.Value `json:"IncludeSpace,omitempty"`
+
+	// PasswordLength AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-secret-generatesecretstring.html#cfn-secretsmanager-secret-generatesecretstring-passwordlength
+	PasswordLength *types.Value `json:"PasswordLength,omitempty"`
+
+	// RequireEachIncludedType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-secret-generatesecretstring.html#cfn-secretsmanager-secret-generatesecretstring-requireeachincludedtype
+	RequireEachIncludedType *types.Value `json:"RequireEachIncludedType,omitempty"`
+
+	// SecretStringTemplate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-secret-generatesecretstring.html#cfn-secretsmanager-secret-generatesecretstring-secretstringtemplate
+	SecretStringTemplate *types.Value `json:"SecretStringTemplate,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Secret_GenerateSecretString) AWSCloudFormationType() string {
+	return "AWS::SecretsManager::Secret.GenerateSecretString"
+}
diff --git a/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret_replicaregion.go b/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret_replicaregion.go
new file mode 100644
index 0000000000..3e052e77c9
--- /dev/null
+++ b/goformation/cloudformation/secretsmanager/aws-secretsmanager-secret_replicaregion.go
@@ -0,0 +1,42 @@
+package secretsmanager
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Secret_ReplicaRegion AWS CloudFormation Resource (AWS::SecretsManager::Secret.ReplicaRegion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-secret-replicaregion.html
+type Secret_ReplicaRegion struct {
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-secret-replicaregion.html#cfn-secretsmanager-secret-replicaregion-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// Region AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-secretsmanager-secret-replicaregion.html#cfn-secretsmanager-secret-replicaregion-region
+	Region *types.Value `json:"Region,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Secret_ReplicaRegion) AWSCloudFormationType() string {
+	return "AWS::SecretsManager::Secret.ReplicaRegion"
+}
diff --git a/goformation/cloudformation/secretsmanager/aws-secretsmanager-secrettargetattachment.go b/goformation/cloudformation/secretsmanager/aws-secretsmanager-secrettargetattachment.go
new file mode 100644
index 0000000000..eb31603c42
--- /dev/null
+++ b/goformation/cloudformation/secretsmanager/aws-secretsmanager-secrettargetattachment.go
@@ -0,0 +1,118 @@
+package secretsmanager
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SecretTargetAttachment AWS CloudFormation Resource (AWS::SecretsManager::SecretTargetAttachment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secrettargetattachment.html
+type SecretTargetAttachment struct {
+
+	// SecretId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secrettargetattachment.html#cfn-secretsmanager-secrettargetattachment-secretid
+	SecretId *types.Value `json:"SecretId,omitempty"`
+
+	// TargetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secrettargetattachment.html#cfn-secretsmanager-secrettargetattachment-targetid
+	TargetId *types.Value `json:"TargetId,omitempty"`
+
+	// TargetType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-secretsmanager-secrettargetattachment.html#cfn-secretsmanager-secrettargetattachment-targettype
+	TargetType *types.Value `json:"TargetType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SecretTargetAttachment) AWSCloudFormationType() string {
+	return "AWS::SecretsManager::SecretTargetAttachment"
+}
+
+// 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 SecretTargetAttachment) MarshalJSON() ([]byte, error) {
+	type Properties SecretTargetAttachment
+	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 *SecretTargetAttachment) UnmarshalJSON(b []byte) error {
+	type Properties SecretTargetAttachment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SecretTargetAttachment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/securityhub/aws-securityhub-hub.go b/goformation/cloudformation/securityhub/aws-securityhub-hub.go
new file mode 100644
index 0000000000..b743b6153c
--- /dev/null
+++ b/goformation/cloudformation/securityhub/aws-securityhub-hub.go
@@ -0,0 +1,106 @@
+package securityhub
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Hub AWS CloudFormation Resource (AWS::SecurityHub::Hub)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-hub.html
+type Hub struct {
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-securityhub-hub.html#cfn-securityhub-hub-tags
+	Tags interface{} `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 *Hub) AWSCloudFormationType() string {
+	return "AWS::SecurityHub::Hub"
+}
+
+// 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 Hub) MarshalJSON() ([]byte, error) {
+	type Properties Hub
+	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 *Hub) UnmarshalJSON(b []byte) error {
+	type Properties Hub
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Hub(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/serverless/api_cors.go b/goformation/cloudformation/serverless/api_cors.go
new file mode 100644
index 0000000000..bfed100566
--- /dev/null
+++ b/goformation/cloudformation/serverless/api_cors.go
@@ -0,0 +1,69 @@
+package serverless
+
+import (
+	"encoding/json"
+	"sort"
+
+	"goformation/v4/cloudformation/types"
+	"goformation/v4/cloudformation/utils"
+)
+
+// Api_Cors is a helper struct that can hold either a String or CorsConfiguration value
+type Api_Cors struct {
+	String **types.Value
+
+	CorsConfiguration *Api_CorsConfiguration
+}
+
+func (r Api_Cors) value() interface{} {
+	ret := []interface{}{}
+
+	if r.String != nil {
+		ret = append(ret, r.String)
+	}
+
+	if r.CorsConfiguration != nil {
+		ret = append(ret, *r.CorsConfiguration)
+	}
+
+	sort.Sort(utils.ByJSONLength(ret)) // Heuristic to select best attribute
+	if len(ret) > 0 {
+		return ret[0]
+	}
+
+	return nil
+}
+
+func (r Api_Cors) MarshalJSON() ([]byte, error) {
+	return json.Marshal(r.value())
+}
+
+// Hook into the marshaller
+func (r *Api_Cors) UnmarshalJSON(b []byte) error {
+
+	// Unmarshal into interface{} to check it's type
+	var typecheck interface{}
+	if err := json.Unmarshal(b, &typecheck); err != nil {
+		return err
+	}
+
+	switch val := typecheck.(type) {
+
+	case string:
+		v, err := types.NewValueFromPrimitive(val)
+		if err != nil {
+			return err
+		}
+		r.String = &v
+
+	case map[string]interface{}:
+		val = val // This ensures val is used to stop an error
+
+		json.Unmarshal(b, &r.CorsConfiguration)
+
+	case []interface{}:
+
+	}
+
+	return nil
+}
diff --git a/goformation/cloudformation/serverless/api_definitionuri.go b/goformation/cloudformation/serverless/api_definitionuri.go
new file mode 100644
index 0000000000..a0d81fe372
--- /dev/null
+++ b/goformation/cloudformation/serverless/api_definitionuri.go
@@ -0,0 +1,69 @@
+package serverless
+
+import (
+	"encoding/json"
+	"sort"
+
+	"goformation/v4/cloudformation/types"
+	"goformation/v4/cloudformation/utils"
+)
+
+// Api_DefinitionUri is a helper struct that can hold either a String or S3Location value
+type Api_DefinitionUri struct {
+	String **types.Value
+
+	S3Location *Api_S3Location
+}
+
+func (r Api_DefinitionUri) value() interface{} {
+	ret := []interface{}{}
+
+	if r.String != nil {
+		ret = append(ret, r.String)
+	}
+
+	if r.S3Location != nil {
+		ret = append(ret, *r.S3Location)
+	}
+
+	sort.Sort(utils.ByJSONLength(ret)) // Heuristic to select best attribute
+	if len(ret) > 0 {
+		return ret[0]
+	}
+
+	return nil
+}
+
+func (r Api_DefinitionUri) MarshalJSON() ([]byte, error) {
+	return json.Marshal(r.value())
+}
+
+// Hook into the marshaller
+func (r *Api_DefinitionUri) UnmarshalJSON(b []byte) error {
+
+	// Unmarshal into interface{} to check it's type
+	var typecheck interface{}
+	if err := json.Unmarshal(b, &typecheck); err != nil {
+		return err
+	}
+
+	switch val := typecheck.(type) {
+
+	case string:
+		v, err := types.NewValueFromPrimitive(val)
+		if err != nil {
+			return err
+		}
+		r.String = &v
+
+	case map[string]interface{}:
+		val = val // This ensures val is used to stop an error
+
+		json.Unmarshal(b, &r.S3Location)
+
+	case []interface{}:
+
+	}
+
+	return nil
+}
diff --git a/goformation/cloudformation/serverless/application_location.go b/goformation/cloudformation/serverless/application_location.go
new file mode 100644
index 0000000000..a088f93f29
--- /dev/null
+++ b/goformation/cloudformation/serverless/application_location.go
@@ -0,0 +1,69 @@
+package serverless
+
+import (
+	"encoding/json"
+	"sort"
+
+	"goformation/v4/cloudformation/types"
+	"goformation/v4/cloudformation/utils"
+)
+
+// Application_Location is a helper struct that can hold either a String or ApplicationLocation value
+type Application_Location struct {
+	String **types.Value
+
+	ApplicationLocation *Application_ApplicationLocation
+}
+
+func (r Application_Location) value() interface{} {
+	ret := []interface{}{}
+
+	if r.String != nil {
+		ret = append(ret, r.String)
+	}
+
+	if r.ApplicationLocation != nil {
+		ret = append(ret, *r.ApplicationLocation)
+	}
+
+	sort.Sort(utils.ByJSONLength(ret)) // Heuristic to select best attribute
+	if len(ret) > 0 {
+		return ret[0]
+	}
+
+	return nil
+}
+
+func (r Application_Location) MarshalJSON() ([]byte, error) {
+	return json.Marshal(r.value())
+}
+
+// Hook into the marshaller
+func (r *Application_Location) UnmarshalJSON(b []byte) error {
+
+	// Unmarshal into interface{} to check it's type
+	var typecheck interface{}
+	if err := json.Unmarshal(b, &typecheck); err != nil {
+		return err
+	}
+
+	switch val := typecheck.(type) {
+
+	case string:
+		v, err := types.NewValueFromPrimitive(val)
+		if err != nil {
+			return err
+		}
+		r.String = &v
+
+	case map[string]interface{}:
+		val = val // This ensures val is used to stop an error
+
+		json.Unmarshal(b, &r.ApplicationLocation)
+
+	case []interface{}:
+
+	}
+
+	return nil
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-api.go b/goformation/cloudformation/serverless/aws-serverless-api.go
new file mode 100644
index 0000000000..2d1579f80a
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-api.go
@@ -0,0 +1,178 @@
+package serverless
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Api AWS CloudFormation Resource (AWS::Serverless::Api)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
+type Api struct {
+
+	// AccessLogSetting AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
+	AccessLogSetting *Api_AccessLogSetting `json:"AccessLogSetting,omitempty"`
+
+	// Auth AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
+	Auth *Api_Auth `json:"Auth,omitempty"`
+
+	// BinaryMediaTypes AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
+	BinaryMediaTypes *types.Value `json:"BinaryMediaTypes,omitempty"`
+
+	// CacheClusterEnabled AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
+	CacheClusterEnabled *types.Value `json:"CacheClusterEnabled,omitempty"`
+
+	// CacheClusterSize AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
+	CacheClusterSize *types.Value `json:"CacheClusterSize,omitempty"`
+
+	// Cors AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
+	Cors *Api_Cors `json:"Cors,omitempty"`
+
+	// DefinitionBody AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
+	DefinitionBody interface{} `json:"DefinitionBody,omitempty"`
+
+	// DefinitionUri AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
+	DefinitionUri *Api_DefinitionUri `json:"DefinitionUri,omitempty"`
+
+	// EndpointConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
+	EndpointConfiguration *types.Value `json:"EndpointConfiguration,omitempty"`
+
+	// MethodSettings AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
+	MethodSettings []interface{} `json:"MethodSettings,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
+	Name *types.Value `json:"Name,omitempty"`
+
+	// OpenApiVersion AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
+	OpenApiVersion *types.Value `json:"OpenApiVersion,omitempty"`
+
+	// StageName AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
+	StageName *types.Value `json:"StageName,omitempty"`
+
+	// TracingEnabled AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
+	TracingEnabled *types.Value `json:"TracingEnabled,omitempty"`
+
+	// Variables AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi
+	Variables map[string]*types.Value `json:"Variables,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Api) AWSCloudFormationType() string {
+	return "AWS::Serverless::Api"
+}
+
+// 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 Api) MarshalJSON() ([]byte, error) {
+	type Properties Api
+	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 *Api) UnmarshalJSON(b []byte) error {
+	type Properties Api
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Api(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/serverless/aws-serverless-api_accesslogsetting.go b/goformation/cloudformation/serverless/aws-serverless-api_accesslogsetting.go
new file mode 100644
index 0000000000..23a2ef39ef
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-api_accesslogsetting.go
@@ -0,0 +1,42 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Api_AccessLogSetting AWS CloudFormation Resource (AWS::Serverless::Api.AccessLogSetting)
+// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-accesslogsetting.html
+type Api_AccessLogSetting struct {
+
+	// DestinationArn AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-accesslogsetting.html#cfn-apigateway-stage-accesslogsetting-destinationarn
+	DestinationArn *types.Value `json:"DestinationArn,omitempty"`
+
+	// Format AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-accesslogsetting.html#cfn-apigateway-stage-accesslogsetting-format
+	Format *types.Value `json:"Format,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Api_AccessLogSetting) AWSCloudFormationType() string {
+	return "AWS::Serverless::Api.AccessLogSetting"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-api_auth.go b/goformation/cloudformation/serverless/aws-serverless-api_auth.go
new file mode 100644
index 0000000000..0f1b86fc20
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-api_auth.go
@@ -0,0 +1,42 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Api_Auth AWS CloudFormation Resource (AWS::Serverless::Api.Auth)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api-auth-object
+type Api_Auth struct {
+
+	// Authorizers AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api-auth-object
+	Authorizers interface{} `json:"Authorizers,omitempty"`
+
+	// DefaultAuthorizer AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api-auth-object
+	DefaultAuthorizer *types.Value `json:"DefaultAuthorizer,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Api_Auth) AWSCloudFormationType() string {
+	return "AWS::Serverless::Api.Auth"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-api_corsconfiguration.go b/goformation/cloudformation/serverless/aws-serverless-api_corsconfiguration.go
new file mode 100644
index 0000000000..9cb324988a
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-api_corsconfiguration.go
@@ -0,0 +1,57 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Api_CorsConfiguration AWS CloudFormation Resource (AWS::Serverless::Api.CorsConfiguration)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cors-configuration
+type Api_CorsConfiguration struct {
+
+	// AllowCredentials AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cors-configuration
+	AllowCredentials *types.Value `json:"AllowCredentials,omitempty"`
+
+	// AllowHeaders AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cors-configuration
+	AllowHeaders *types.Value `json:"AllowHeaders,omitempty"`
+
+	// AllowMethods AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cors-configuration
+	AllowMethods *types.Value `json:"AllowMethods,omitempty"`
+
+	// AllowOrigin AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cors-configuration
+	AllowOrigin *types.Value `json:"AllowOrigin,omitempty"`
+
+	// MaxAge AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cors-configuration
+	MaxAge *types.Value `json:"MaxAge,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Api_CorsConfiguration) AWSCloudFormationType() string {
+	return "AWS::Serverless::Api.CorsConfiguration"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-api_s3location.go b/goformation/cloudformation/serverless/aws-serverless-api_s3location.go
new file mode 100644
index 0000000000..344b30561a
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-api_s3location.go
@@ -0,0 +1,47 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Api_S3Location AWS CloudFormation Resource (AWS::Serverless::Api.S3Location)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object
+type Api_S3Location struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Version *types.Value `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 *Api_S3Location) AWSCloudFormationType() string {
+	return "AWS::Serverless::Api.S3Location"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-application.go b/goformation/cloudformation/serverless/aws-serverless-application.go
new file mode 100644
index 0000000000..27c0a99b3c
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-application.go
@@ -0,0 +1,128 @@
+package serverless
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application AWS CloudFormation Resource (AWS::Serverless::Application)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication
+type Application struct {
+
+	// Location AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication
+	Location *Application_Location `json:"Location,omitempty"`
+
+	// NotificationArns AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication
+	NotificationArns *types.Value `json:"NotificationArns,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication
+	Parameters map[string]*types.Value `json:"Parameters,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication
+	Tags map[string]*types.Value `json:"Tags,omitempty"`
+
+	// TimeoutInMinutes AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication
+	TimeoutInMinutes *types.Value `json:"TimeoutInMinutes,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::Serverless::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/serverless/aws-serverless-application_applicationlocation.go b/goformation/cloudformation/serverless/aws-serverless-application_applicationlocation.go
new file mode 100644
index 0000000000..e4538536bc
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-application_applicationlocation.go
@@ -0,0 +1,42 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application_ApplicationLocation AWS CloudFormation Resource (AWS::Serverless::Application.ApplicationLocation)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication
+type Application_ApplicationLocation struct {
+
+	// ApplicationId AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication
+	ApplicationId *types.Value `json:"ApplicationId,omitempty"`
+
+	// SemanticVersion AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication
+	SemanticVersion *types.Value `json:"SemanticVersion,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ApplicationLocation) AWSCloudFormationType() string {
+	return "AWS::Serverless::Application.ApplicationLocation"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function.go b/goformation/cloudformation/serverless/aws-serverless-function.go
new file mode 100644
index 0000000000..4889de3102
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function.go
@@ -0,0 +1,213 @@
+package serverless
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function AWS CloudFormation Resource (AWS::Serverless::Function)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+type Function struct {
+
+	// AutoPublishAlias AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	AutoPublishAlias *types.Value `json:"AutoPublishAlias,omitempty"`
+
+	// CodeUri AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	CodeUri *Function_CodeUri `json:"CodeUri,omitempty"`
+
+	// DeadLetterQueue AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	DeadLetterQueue *Function_DeadLetterQueue `json:"DeadLetterQueue,omitempty"`
+
+	// DeploymentPreference AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	DeploymentPreference *Function_DeploymentPreference `json:"DeploymentPreference,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Environment AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Environment *Function_FunctionEnvironment `json:"Environment,omitempty"`
+
+	// Events AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Events map[string]Function_EventSource `json:"Events,omitempty"`
+
+	// FileSystemConfigs AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html
+	FileSystemConfigs []Function_FileSystemConfig `json:"FileSystemConfigs,omitempty"`
+
+	// FunctionName AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	FunctionName *types.Value `json:"FunctionName,omitempty"`
+
+	// Handler AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Handler *types.Value `json:"Handler,omitempty"`
+
+	// KmsKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	KmsKeyArn *types.Value `json:"KmsKeyArn,omitempty"`
+
+	// Layers AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Layers *types.Value `json:"Layers,omitempty"`
+
+	// MemorySize AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	MemorySize *types.Value `json:"MemorySize,omitempty"`
+
+	// PermissionsBoundary AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	PermissionsBoundary *types.Value `json:"PermissionsBoundary,omitempty"`
+
+	// Policies AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Policies *Function_Policies `json:"Policies,omitempty"`
+
+	// ReservedConcurrentExecutions AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	ReservedConcurrentExecutions *types.Value `json:"ReservedConcurrentExecutions,omitempty"`
+
+	// Role AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Role *types.Value `json:"Role,omitempty"`
+
+	// Runtime AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Runtime *types.Value `json:"Runtime,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Tags map[string]*types.Value `json:"Tags,omitempty"`
+
+	// Timeout AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Timeout *types.Value `json:"Timeout,omitempty"`
+
+	// Tracing AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Tracing *types.Value `json:"Tracing,omitempty"`
+
+	// VpcConfig AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	VpcConfig *Function_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 *Function) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function"
+}
+
+// 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 Function) MarshalJSON() ([]byte, error) {
+	type Properties Function
+	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 *Function) UnmarshalJSON(b []byte) error {
+	type Properties Function
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Function(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/serverless/aws-serverless-function_alexaskillevent.go b/goformation/cloudformation/serverless/aws-serverless-function_alexaskillevent.go
new file mode 100644
index 0000000000..ec21c8f372
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_alexaskillevent.go
@@ -0,0 +1,37 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_AlexaSkillEvent AWS CloudFormation Resource (AWS::Serverless::Function.AlexaSkillEvent)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#alexaskill
+type Function_AlexaSkillEvent struct {
+
+	// Variables AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#alexaskill
+	Variables map[string]*types.Value `json:"Variables,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_AlexaSkillEvent) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.AlexaSkillEvent"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_apievent.go b/goformation/cloudformation/serverless/aws-serverless-function_apievent.go
new file mode 100644
index 0000000000..1e56bbd4bd
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_apievent.go
@@ -0,0 +1,47 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_ApiEvent AWS CloudFormation Resource (AWS::Serverless::Function.ApiEvent)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+type Function_ApiEvent struct {
+
+	// Method AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+	Method *types.Value `json:"Method,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+	Path *types.Value `json:"Path,omitempty"`
+
+	// RestApiId AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+	RestApiId *types.Value `json:"RestApiId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_ApiEvent) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.ApiEvent"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_bucketsampt.go b/goformation/cloudformation/serverless/aws-serverless-function_bucketsampt.go
new file mode 100644
index 0000000000..8f2c3be9b6
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_bucketsampt.go
@@ -0,0 +1,37 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_BucketSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.BucketSAMPT)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+type Function_BucketSAMPT struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	BucketName *types.Value `json:"BucketName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_BucketSAMPT) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.BucketSAMPT"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_cloudwatcheventevent.go b/goformation/cloudformation/serverless/aws-serverless-function_cloudwatcheventevent.go
new file mode 100644
index 0000000000..08fe9e5115
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_cloudwatcheventevent.go
@@ -0,0 +1,47 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_CloudWatchEventEvent AWS CloudFormation Resource (AWS::Serverless::Function.CloudWatchEventEvent)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cloudwatchevent
+type Function_CloudWatchEventEvent struct {
+
+	// Input AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cloudwatchevent
+	Input *types.Value `json:"Input,omitempty"`
+
+	// InputPath AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cloudwatchevent
+	InputPath *types.Value `json:"InputPath,omitempty"`
+
+	// Pattern AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AmazonCloudWatch/latest/events/CloudWatchEventsandEventPatterns.html
+	Pattern interface{} `json:"Pattern,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_CloudWatchEventEvent) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.CloudWatchEventEvent"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_cloudwatchlogsevent.go b/goformation/cloudformation/serverless/aws-serverless-function_cloudwatchlogsevent.go
new file mode 100644
index 0000000000..59ebae36bc
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_cloudwatchlogsevent.go
@@ -0,0 +1,42 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_CloudWatchLogsEvent AWS CloudFormation Resource (AWS::Serverless::Function.CloudWatchLogsEvent)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cloudwatchevent
+type Function_CloudWatchLogsEvent struct {
+
+	// FilterPattern AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cloudwatchlogs
+	FilterPattern *types.Value `json:"FilterPattern,omitempty"`
+
+	// LogGroupName AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cloudwatchlogs
+	LogGroupName *types.Value `json:"LogGroupName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_CloudWatchLogsEvent) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.CloudWatchLogsEvent"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_collectionsampt.go b/goformation/cloudformation/serverless/aws-serverless-function_collectionsampt.go
new file mode 100644
index 0000000000..f5edb3504b
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_collectionsampt.go
@@ -0,0 +1,37 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_CollectionSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.CollectionSAMPT)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+type Function_CollectionSAMPT struct {
+
+	// CollectionId AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	CollectionId *types.Value `json:"CollectionId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_CollectionSAMPT) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.CollectionSAMPT"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_deadletterqueue.go b/goformation/cloudformation/serverless/aws-serverless-function_deadletterqueue.go
new file mode 100644
index 0000000000..52a983b753
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_deadletterqueue.go
@@ -0,0 +1,42 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_DeadLetterQueue AWS CloudFormation Resource (AWS::Serverless::Function.DeadLetterQueue)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#deadletterqueue-object
+type Function_DeadLetterQueue struct {
+
+	// TargetArn AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	TargetArn *types.Value `json:"TargetArn,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Type *types.Value `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 *Function_DeadLetterQueue) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.DeadLetterQueue"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_deploymentpreference.go b/goformation/cloudformation/serverless/aws-serverless-function_deploymentpreference.go
new file mode 100644
index 0000000000..bd536587e5
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_deploymentpreference.go
@@ -0,0 +1,57 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_DeploymentPreference AWS CloudFormation Resource (AWS::Serverless::Function.DeploymentPreference)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#deploymentpreference-object
+type Function_DeploymentPreference struct {
+
+	// Alarms AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#deploymentpreference-object
+	Alarms *types.Value `json:"Alarms,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#deploymentpreference-object
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// Hooks AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#deploymentpreference-object
+	Hooks map[string]*types.Value `json:"Hooks,omitempty"`
+
+	// Role AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#deploymentpreference-object
+	Role *types.Value `json:"Role,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#deploymentpreference-object
+	Type *types.Value `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 *Function_DeploymentPreference) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.DeploymentPreference"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_destinationconfig.go b/goformation/cloudformation/serverless/aws-serverless-function_destinationconfig.go
new file mode 100644
index 0000000000..3d057781b4
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_destinationconfig.go
@@ -0,0 +1,35 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_DestinationConfig AWS CloudFormation Resource (AWS::Serverless::Function.DestinationConfig)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#destination-config-object
+type Function_DestinationConfig struct {
+
+	// OnFailure AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#destination-config-object
+	OnFailure *Function_OnFailure `json:"OnFailure,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_DestinationConfig) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.DestinationConfig"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_domainsampt.go b/goformation/cloudformation/serverless/aws-serverless-function_domainsampt.go
new file mode 100644
index 0000000000..2e55d4780d
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_domainsampt.go
@@ -0,0 +1,37 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_DomainSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.DomainSAMPT)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+type Function_DomainSAMPT struct {
+
+	// DomainName AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	DomainName *types.Value `json:"DomainName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_DomainSAMPT) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.DomainSAMPT"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_dynamodbevent.go b/goformation/cloudformation/serverless/aws-serverless-function_dynamodbevent.go
new file mode 100644
index 0000000000..7a507508dd
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_dynamodbevent.go
@@ -0,0 +1,82 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_DynamoDBEvent AWS CloudFormation Resource (AWS::Serverless::Function.DynamoDBEvent)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb
+type Function_DynamoDBEvent struct {
+
+	// BatchSize AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb
+	BatchSize *types.Value `json:"BatchSize,omitempty"`
+
+	// BisectBatchOnFunctionError AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb
+	BisectBatchOnFunctionError *types.Value `json:"BisectBatchOnFunctionError,omitempty"`
+
+	// DestinationConfig AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb
+	DestinationConfig *Function_DestinationConfig `json:"DestinationConfig,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// MaximumBatchingWindowInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb
+	MaximumBatchingWindowInSeconds *types.Value `json:"MaximumBatchingWindowInSeconds,omitempty"`
+
+	// MaximumRecordAgeInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb
+	MaximumRecordAgeInSeconds *types.Value `json:"MaximumRecordAgeInSeconds,omitempty"`
+
+	// MaximumRetryAttempts AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb
+	MaximumRetryAttempts *types.Value `json:"MaximumRetryAttempts,omitempty"`
+
+	// ParallelizationFactor AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb
+	ParallelizationFactor *types.Value `json:"ParallelizationFactor,omitempty"`
+
+	// StartingPosition AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb
+	StartingPosition *types.Value `json:"StartingPosition,omitempty"`
+
+	// Stream AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb
+	Stream *types.Value `json:"Stream,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_DynamoDBEvent) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.DynamoDBEvent"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_emptysampt.go b/goformation/cloudformation/serverless/aws-serverless-function_emptysampt.go
new file mode 100644
index 0000000000..caa70ba80a
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_emptysampt.go
@@ -0,0 +1,30 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_EmptySAMPT AWS CloudFormation Resource (AWS::Serverless::Function.EmptySAMPT)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+type Function_EmptySAMPT struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_EmptySAMPT) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.EmptySAMPT"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_eventbridgeruleevent.go b/goformation/cloudformation/serverless/aws-serverless-function_eventbridgeruleevent.go
new file mode 100644
index 0000000000..16ab0bd076
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_eventbridgeruleevent.go
@@ -0,0 +1,52 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_EventBridgeRuleEvent AWS CloudFormation Resource (AWS::Serverless::Function.EventBridgeRuleEvent)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#eventbridgerule
+type Function_EventBridgeRuleEvent struct {
+
+	// EventBusName AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#eventbridgerule
+	EventBusName *types.Value `json:"EventBusName,omitempty"`
+
+	// Input AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#eventbridgerule
+	Input *types.Value `json:"Input,omitempty"`
+
+	// InputPath AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#eventbridgerule
+	InputPath *types.Value `json:"InputPath,omitempty"`
+
+	// Pattern AWS CloudFormation Property
+	// Required: true
+	// See: https://docs.aws.amazon.com/eventbridge/latest/userguide/filtering-examples-structure.html
+	Pattern interface{} `json:"Pattern,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_EventBridgeRuleEvent) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.EventBridgeRuleEvent"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_eventsource.go b/goformation/cloudformation/serverless/aws-serverless-function_eventsource.go
new file mode 100644
index 0000000000..afff72ed6d
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_eventsource.go
@@ -0,0 +1,42 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_EventSource AWS CloudFormation Resource (AWS::Serverless::Function.EventSource)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#event-source-object
+type Function_EventSource struct {
+
+	// Properties AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#event-source-types
+	Properties *Function_Properties `json:"Properties,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#event-source-object
+	Type *types.Value `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 *Function_EventSource) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.EventSource"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_filesystemconfig.go b/goformation/cloudformation/serverless/aws-serverless-function_filesystemconfig.go
new file mode 100644
index 0000000000..6a3d443ba4
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_filesystemconfig.go
@@ -0,0 +1,42 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_FileSystemConfig AWS CloudFormation Resource (AWS::Serverless::Function.FileSystemConfig)
+// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-filesystemconfig.html#cfn-lambda-function-filesystemconfig-localmountpath
+type Function_FileSystemConfig struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-filesystemconfig.html#cfn-lambda-function-filesystemconfig-localmountpath
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// LocalMountPath AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-filesystemconfig.html#cfn-lambda-function-filesystemconfig-localmountpath
+	LocalMountPath *types.Value `json:"LocalMountPath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_FileSystemConfig) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.FileSystemConfig"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_functionenvironment.go b/goformation/cloudformation/serverless/aws-serverless-function_functionenvironment.go
new file mode 100644
index 0000000000..12543407f6
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_functionenvironment.go
@@ -0,0 +1,37 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_FunctionEnvironment AWS CloudFormation Resource (AWS::Serverless::Function.FunctionEnvironment)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object
+type Function_FunctionEnvironment struct {
+
+	// Variables AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object
+	Variables map[string]*types.Value `json:"Variables,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_FunctionEnvironment) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.FunctionEnvironment"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_functionsampt.go b/goformation/cloudformation/serverless/aws-serverless-function_functionsampt.go
new file mode 100644
index 0000000000..8de34e1078
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_functionsampt.go
@@ -0,0 +1,37 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_FunctionSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.FunctionSAMPT)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+type Function_FunctionSAMPT struct {
+
+	// FunctionName AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	FunctionName *types.Value `json:"FunctionName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_FunctionSAMPT) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.FunctionSAMPT"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_iampolicydocument.go b/goformation/cloudformation/serverless/aws-serverless-function_iampolicydocument.go
new file mode 100644
index 0000000000..ff33b50e9d
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_iampolicydocument.go
@@ -0,0 +1,35 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_IAMPolicyDocument AWS CloudFormation Resource (AWS::Serverless::Function.IAMPolicyDocument)
+// See: http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies.html
+type Function_IAMPolicyDocument struct {
+
+	// Statement AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies.html
+	Statement interface{} `json:"Statement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_IAMPolicyDocument) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.IAMPolicyDocument"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_identitysampt.go b/goformation/cloudformation/serverless/aws-serverless-function_identitysampt.go
new file mode 100644
index 0000000000..a0f683f151
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_identitysampt.go
@@ -0,0 +1,37 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_IdentitySAMPT AWS CloudFormation Resource (AWS::Serverless::Function.IdentitySAMPT)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+type Function_IdentitySAMPT struct {
+
+	// IdentityName AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	IdentityName *types.Value `json:"IdentityName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_IdentitySAMPT) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.IdentitySAMPT"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_iotruleevent.go b/goformation/cloudformation/serverless/aws-serverless-function_iotruleevent.go
new file mode 100644
index 0000000000..120575f159
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_iotruleevent.go
@@ -0,0 +1,42 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_IoTRuleEvent AWS CloudFormation Resource (AWS::Serverless::Function.IoTRuleEvent)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#iotrule
+type Function_IoTRuleEvent struct {
+
+	// AwsIotSqlVersion AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#iotrule
+	AwsIotSqlVersion *types.Value `json:"AwsIotSqlVersion,omitempty"`
+
+	// Sql AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#iotrule
+	Sql *types.Value `json:"Sql,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_IoTRuleEvent) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.IoTRuleEvent"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_keysampt.go b/goformation/cloudformation/serverless/aws-serverless-function_keysampt.go
new file mode 100644
index 0000000000..eedf0fb0c6
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_keysampt.go
@@ -0,0 +1,37 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_KeySAMPT AWS CloudFormation Resource (AWS::Serverless::Function.KeySAMPT)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+type Function_KeySAMPT struct {
+
+	// KeyId AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	KeyId *types.Value `json:"KeyId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_KeySAMPT) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.KeySAMPT"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_kinesisevent.go b/goformation/cloudformation/serverless/aws-serverless-function_kinesisevent.go
new file mode 100644
index 0000000000..2aaafc02e7
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_kinesisevent.go
@@ -0,0 +1,52 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_KinesisEvent AWS CloudFormation Resource (AWS::Serverless::Function.KinesisEvent)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#kinesis
+type Function_KinesisEvent struct {
+
+	// BatchSize AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#kinesis
+	BatchSize *types.Value `json:"BatchSize,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#kinesis
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// StartingPosition AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#kinesis
+	StartingPosition *types.Value `json:"StartingPosition,omitempty"`
+
+	// Stream AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#kinesis
+	Stream *types.Value `json:"Stream,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_KinesisEvent) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.KinesisEvent"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_loggroupsampt.go b/goformation/cloudformation/serverless/aws-serverless-function_loggroupsampt.go
new file mode 100644
index 0000000000..5be0c54cdc
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_loggroupsampt.go
@@ -0,0 +1,37 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_LogGroupSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.LogGroupSAMPT)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+type Function_LogGroupSAMPT struct {
+
+	// LogGroupName AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	LogGroupName *types.Value `json:"LogGroupName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_LogGroupSAMPT) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.LogGroupSAMPT"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_onfailure.go b/goformation/cloudformation/serverless/aws-serverless-function_onfailure.go
new file mode 100644
index 0000000000..12045c8f79
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_onfailure.go
@@ -0,0 +1,42 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_OnFailure AWS CloudFormation Resource (AWS::Serverless::Function.OnFailure)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#destination-config-object
+type Function_OnFailure struct {
+
+	// Destination AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#destination-config-object
+	Destination *types.Value `json:"Destination,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#destination-config-object
+	Type *types.Value `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 *Function_OnFailure) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.OnFailure"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_queuesampt.go b/goformation/cloudformation/serverless/aws-serverless-function_queuesampt.go
new file mode 100644
index 0000000000..a30c413ed0
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_queuesampt.go
@@ -0,0 +1,37 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_QueueSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.QueueSAMPT)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+type Function_QueueSAMPT struct {
+
+	// QueueName AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	QueueName *types.Value `json:"QueueName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_QueueSAMPT) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.QueueSAMPT"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_s3event.go b/goformation/cloudformation/serverless/aws-serverless-function_s3event.go
new file mode 100644
index 0000000000..a2e7f4ee6e
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_s3event.go
@@ -0,0 +1,47 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_S3Event AWS CloudFormation Resource (AWS::Serverless::Function.S3Event)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3
+type Function_S3Event struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Events AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3
+	Events *Function_Events `json:"Events,omitempty"`
+
+	// Filter AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3
+	Filter *Function_S3NotificationFilter `json:"Filter,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_S3Event) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.S3Event"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_s3keyfilter.go b/goformation/cloudformation/serverless/aws-serverless-function_s3keyfilter.go
new file mode 100644
index 0000000000..b2c7e71601
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_s3keyfilter.go
@@ -0,0 +1,35 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_S3KeyFilter AWS CloudFormation Resource (AWS::Serverless::Function.S3KeyFilter)
+// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter.html
+type Function_S3KeyFilter struct {
+
+	// Rules AWS CloudFormation Property
+	// Required: true
+	// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter.html
+	Rules []Function_S3KeyFilterRule `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 *Function_S3KeyFilter) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.S3KeyFilter"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_s3keyfilterrule.go b/goformation/cloudformation/serverless/aws-serverless-function_s3keyfilterrule.go
new file mode 100644
index 0000000000..54ce8614a9
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_s3keyfilterrule.go
@@ -0,0 +1,42 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_S3KeyFilterRule AWS CloudFormation Resource (AWS::Serverless::Function.S3KeyFilterRule)
+// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter-s3key-rules.html
+type Function_S3KeyFilterRule struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter-s3key-rules.html
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter-s3key-rules.html
+	Value *types.Value `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 *Function_S3KeyFilterRule) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.S3KeyFilterRule"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_s3location.go b/goformation/cloudformation/serverless/aws-serverless-function_s3location.go
new file mode 100644
index 0000000000..ec87d7c6d0
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_s3location.go
@@ -0,0 +1,47 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_S3Location AWS CloudFormation Resource (AWS::Serverless::Function.S3Location)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object
+type Function_S3Location struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Version *types.Value `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 *Function_S3Location) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.S3Location"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_s3notificationfilter.go b/goformation/cloudformation/serverless/aws-serverless-function_s3notificationfilter.go
new file mode 100644
index 0000000000..76778280cd
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_s3notificationfilter.go
@@ -0,0 +1,35 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_S3NotificationFilter AWS CloudFormation Resource (AWS::Serverless::Function.S3NotificationFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter.html
+type Function_S3NotificationFilter struct {
+
+	// S3Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter.html
+	S3Key *Function_S3KeyFilter `json:"S3Key,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_S3NotificationFilter) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.S3NotificationFilter"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_sampolicytemplate.go b/goformation/cloudformation/serverless/aws-serverless-function_sampolicytemplate.go
new file mode 100644
index 0000000000..59da77ac80
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_sampolicytemplate.go
@@ -0,0 +1,180 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_SAMPolicyTemplate AWS CloudFormation Resource (AWS::Serverless::Function.SAMPolicyTemplate)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+type Function_SAMPolicyTemplate struct {
+
+	// AMIDescribePolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	AMIDescribePolicy *Function_EmptySAMPT `json:"AMIDescribePolicy,omitempty"`
+
+	// CloudFormationDescribeStacksPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	CloudFormationDescribeStacksPolicy *Function_EmptySAMPT `json:"CloudFormationDescribeStacksPolicy,omitempty"`
+
+	// CloudWatchPutMetricPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	CloudWatchPutMetricPolicy *Function_EmptySAMPT `json:"CloudWatchPutMetricPolicy,omitempty"`
+
+	// DynamoDBCrudPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	DynamoDBCrudPolicy *Function_TableSAMPT `json:"DynamoDBCrudPolicy,omitempty"`
+
+	// DynamoDBReadPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	DynamoDBReadPolicy *Function_TableSAMPT `json:"DynamoDBReadPolicy,omitempty"`
+
+	// DynamoDBStreamReadPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	DynamoDBStreamReadPolicy *Function_TableStreamSAMPT `json:"DynamoDBStreamReadPolicy,omitempty"`
+
+	// EC2DescribePolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	EC2DescribePolicy *Function_EmptySAMPT `json:"EC2DescribePolicy,omitempty"`
+
+	// ElasticsearchHttpPostPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	ElasticsearchHttpPostPolicy *Function_DomainSAMPT `json:"ElasticsearchHttpPostPolicy,omitempty"`
+
+	// FilterLogEventsPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	FilterLogEventsPolicy *Function_LogGroupSAMPT `json:"FilterLogEventsPolicy,omitempty"`
+
+	// KMSDecryptPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	KMSDecryptPolicy *Function_KeySAMPT `json:"KMSDecryptPolicy,omitempty"`
+
+	// KinesisCrudPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	KinesisCrudPolicy *Function_StreamSAMPT `json:"KinesisCrudPolicy,omitempty"`
+
+	// KinesisStreamReadPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	KinesisStreamReadPolicy *Function_StreamSAMPT `json:"KinesisStreamReadPolicy,omitempty"`
+
+	// LambdaInvokePolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	LambdaInvokePolicy *Function_FunctionSAMPT `json:"LambdaInvokePolicy,omitempty"`
+
+	// RekognitionDetectOnlyPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	RekognitionDetectOnlyPolicy *Function_EmptySAMPT `json:"RekognitionDetectOnlyPolicy,omitempty"`
+
+	// RekognitionLabelsPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	RekognitionLabelsPolicy *Function_EmptySAMPT `json:"RekognitionLabelsPolicy,omitempty"`
+
+	// RekognitionNoDataAccessPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	RekognitionNoDataAccessPolicy *Function_CollectionSAMPT `json:"RekognitionNoDataAccessPolicy,omitempty"`
+
+	// RekognitionReadPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	RekognitionReadPolicy *Function_CollectionSAMPT `json:"RekognitionReadPolicy,omitempty"`
+
+	// RekognitionWriteOnlyAccessPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	RekognitionWriteOnlyAccessPolicy *Function_CollectionSAMPT `json:"RekognitionWriteOnlyAccessPolicy,omitempty"`
+
+	// S3CrudPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	S3CrudPolicy *Function_BucketSAMPT `json:"S3CrudPolicy,omitempty"`
+
+	// S3ReadPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	S3ReadPolicy *Function_BucketSAMPT `json:"S3ReadPolicy,omitempty"`
+
+	// SESBulkTemplatedCrudPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	SESBulkTemplatedCrudPolicy *Function_IdentitySAMPT `json:"SESBulkTemplatedCrudPolicy,omitempty"`
+
+	// SESCrudPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	SESCrudPolicy *Function_IdentitySAMPT `json:"SESCrudPolicy,omitempty"`
+
+	// SESEmailTemplateCrudPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	SESEmailTemplateCrudPolicy *Function_EmptySAMPT `json:"SESEmailTemplateCrudPolicy,omitempty"`
+
+	// SESSendBouncePolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	SESSendBouncePolicy *Function_IdentitySAMPT `json:"SESSendBouncePolicy,omitempty"`
+
+	// SNSCrudPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	SNSCrudPolicy *Function_TopicSAMPT `json:"SNSCrudPolicy,omitempty"`
+
+	// SNSPublishMessagePolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	SNSPublishMessagePolicy *Function_TopicSAMPT `json:"SNSPublishMessagePolicy,omitempty"`
+
+	// SQSPollerPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	SQSPollerPolicy *Function_QueueSAMPT `json:"SQSPollerPolicy,omitempty"`
+
+	// SQSSendMessagePolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	SQSSendMessagePolicy *Function_QueueSAMPT `json:"SQSSendMessagePolicy,omitempty"`
+
+	// StepFunctionsExecutionPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	StepFunctionsExecutionPolicy *Function_StateMachineSAMPT `json:"StepFunctionsExecutionPolicy,omitempty"`
+
+	// VPCAccessPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	VPCAccessPolicy *Function_EmptySAMPT `json:"VPCAccessPolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_SAMPolicyTemplate) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.SAMPolicyTemplate"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_scheduleevent.go b/goformation/cloudformation/serverless/aws-serverless-function_scheduleevent.go
new file mode 100644
index 0000000000..fc10807a5f
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_scheduleevent.go
@@ -0,0 +1,42 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_ScheduleEvent AWS CloudFormation Resource (AWS::Serverless::Function.ScheduleEvent)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#schedule
+type Function_ScheduleEvent struct {
+
+	// Input AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#schedule
+	Input *types.Value `json:"Input,omitempty"`
+
+	// Schedule AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#schedule
+	Schedule *types.Value `json:"Schedule,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_ScheduleEvent) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.ScheduleEvent"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_snsevent.go b/goformation/cloudformation/serverless/aws-serverless-function_snsevent.go
new file mode 100644
index 0000000000..39ebd6374e
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_snsevent.go
@@ -0,0 +1,37 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_SNSEvent AWS CloudFormation Resource (AWS::Serverless::Function.SNSEvent)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#sns
+type Function_SNSEvent struct {
+
+	// Topic AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#sns
+	Topic *types.Value `json:"Topic,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_SNSEvent) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.SNSEvent"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_sqsevent.go b/goformation/cloudformation/serverless/aws-serverless-function_sqsevent.go
new file mode 100644
index 0000000000..5ebe3d74dd
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_sqsevent.go
@@ -0,0 +1,47 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_SQSEvent AWS CloudFormation Resource (AWS::Serverless::Function.SQSEvent)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#sqs
+type Function_SQSEvent struct {
+
+	// BatchSize AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#sqs
+	BatchSize *types.Value `json:"BatchSize,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#sqs
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// Queue AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#sqs
+	Queue *types.Value `json:"Queue,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_SQSEvent) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.SQSEvent"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_statemachinesampt.go b/goformation/cloudformation/serverless/aws-serverless-function_statemachinesampt.go
new file mode 100644
index 0000000000..cc59f9297d
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_statemachinesampt.go
@@ -0,0 +1,37 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_StateMachineSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.StateMachineSAMPT)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+type Function_StateMachineSAMPT struct {
+
+	// StateMachineName AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	StateMachineName *types.Value `json:"StateMachineName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_StateMachineSAMPT) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.StateMachineSAMPT"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_streamsampt.go b/goformation/cloudformation/serverless/aws-serverless-function_streamsampt.go
new file mode 100644
index 0000000000..73b79231ed
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_streamsampt.go
@@ -0,0 +1,37 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_StreamSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.StreamSAMPT)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+type Function_StreamSAMPT struct {
+
+	// StreamName AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	StreamName *types.Value `json:"StreamName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_StreamSAMPT) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.StreamSAMPT"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_tablesampt.go b/goformation/cloudformation/serverless/aws-serverless-function_tablesampt.go
new file mode 100644
index 0000000000..48a945649e
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_tablesampt.go
@@ -0,0 +1,37 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_TableSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.TableSAMPT)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+type Function_TableSAMPT struct {
+
+	// TableName AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_TableSAMPT) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.TableSAMPT"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_tablestreamsampt.go b/goformation/cloudformation/serverless/aws-serverless-function_tablestreamsampt.go
new file mode 100644
index 0000000000..5316993643
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_tablestreamsampt.go
@@ -0,0 +1,42 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_TableStreamSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.TableStreamSAMPT)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+type Function_TableStreamSAMPT struct {
+
+	// StreamName AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	StreamName *types.Value `json:"StreamName,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_TableStreamSAMPT) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.TableStreamSAMPT"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_topicsampt.go b/goformation/cloudformation/serverless/aws-serverless-function_topicsampt.go
new file mode 100644
index 0000000000..1dcd95e82a
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_topicsampt.go
@@ -0,0 +1,37 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_TopicSAMPT AWS CloudFormation Resource (AWS::Serverless::Function.TopicSAMPT)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+type Function_TopicSAMPT struct {
+
+	// TopicName AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	TopicName *types.Value `json:"TopicName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_TopicSAMPT) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.TopicSAMPT"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-function_vpcconfig.go b/goformation/cloudformation/serverless/aws-serverless-function_vpcconfig.go
new file mode 100644
index 0000000000..3aeed3fb67
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-function_vpcconfig.go
@@ -0,0 +1,42 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Function_VpcConfig AWS CloudFormation Resource (AWS::Serverless::Function.VpcConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-vpcconfig.html
+type Function_VpcConfig struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-vpcconfig.html
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-vpcconfig.html
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Function_VpcConfig) AWSCloudFormationType() string {
+	return "AWS::Serverless::Function.VpcConfig"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-layerversion.go b/goformation/cloudformation/serverless/aws-serverless-layerversion.go
new file mode 100644
index 0000000000..6f0419e17c
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-layerversion.go
@@ -0,0 +1,133 @@
+package serverless
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LayerVersion AWS CloudFormation Resource (AWS::Serverless::LayerVersion)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesslayerversion
+type LayerVersion struct {
+
+	// CompatibleRuntimes AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesslayerversion
+	CompatibleRuntimes *types.Value `json:"CompatibleRuntimes,omitempty"`
+
+	// ContentUri AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesslayerversion
+	ContentUri *types.Value `json:"ContentUri,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesslayerversion
+	Description *types.Value `json:"Description,omitempty"`
+
+	// LayerName AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesslayerversion
+	LayerName *types.Value `json:"LayerName,omitempty"`
+
+	// LicenseInfo AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesslayerversion
+	LicenseInfo *types.Value `json:"LicenseInfo,omitempty"`
+
+	// RetentionPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesslayerversion
+	RetentionPolicy *types.Value `json:"RetentionPolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LayerVersion) AWSCloudFormationType() string {
+	return "AWS::Serverless::LayerVersion"
+}
+
+// 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 LayerVersion) MarshalJSON() ([]byte, error) {
+	type Properties LayerVersion
+	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 *LayerVersion) UnmarshalJSON(b []byte) error {
+	type Properties LayerVersion
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LayerVersion(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/serverless/aws-serverless-simpletable.go b/goformation/cloudformation/serverless/aws-serverless-simpletable.go
new file mode 100644
index 0000000000..abeb062d0e
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-simpletable.go
@@ -0,0 +1,128 @@
+package serverless
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SimpleTable AWS CloudFormation Resource (AWS::Serverless::SimpleTable)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesssimpletable
+type SimpleTable struct {
+
+	// PrimaryKey AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#primary-key-object
+	PrimaryKey *SimpleTable_PrimaryKey `json:"PrimaryKey,omitempty"`
+
+	// ProvisionedThroughput AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-provisionedthroughput.html
+	ProvisionedThroughput *SimpleTable_ProvisionedThroughput `json:"ProvisionedThroughput,omitempty"`
+
+	// SSESpecification AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesssimpletable
+	SSESpecification *SimpleTable_SSESpecification `json:"SSESpecification,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesssimpletable
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesssimpletable
+	Tags map[string]*types.Value `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 *SimpleTable) AWSCloudFormationType() string {
+	return "AWS::Serverless::SimpleTable"
+}
+
+// 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 SimpleTable) MarshalJSON() ([]byte, error) {
+	type Properties SimpleTable
+	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 *SimpleTable) UnmarshalJSON(b []byte) error {
+	type Properties SimpleTable
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SimpleTable(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/serverless/aws-serverless-simpletable_primarykey.go b/goformation/cloudformation/serverless/aws-serverless-simpletable_primarykey.go
new file mode 100644
index 0000000000..56adab047c
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-simpletable_primarykey.go
@@ -0,0 +1,42 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SimpleTable_PrimaryKey AWS CloudFormation Resource (AWS::Serverless::SimpleTable.PrimaryKey)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#primary-key-object
+type SimpleTable_PrimaryKey struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#primary-key-object
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#primary-key-object
+	Type *types.Value `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 *SimpleTable_PrimaryKey) AWSCloudFormationType() string {
+	return "AWS::Serverless::SimpleTable.PrimaryKey"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-simpletable_provisionedthroughput.go b/goformation/cloudformation/serverless/aws-serverless-simpletable_provisionedthroughput.go
new file mode 100644
index 0000000000..86716fa25f
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-simpletable_provisionedthroughput.go
@@ -0,0 +1,42 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SimpleTable_ProvisionedThroughput AWS CloudFormation Resource (AWS::Serverless::SimpleTable.ProvisionedThroughput)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-provisionedthroughput.html
+type SimpleTable_ProvisionedThroughput struct {
+
+	// ReadCapacityUnits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-provisionedthroughput.html
+	ReadCapacityUnits *types.Value `json:"ReadCapacityUnits,omitempty"`
+
+	// WriteCapacityUnits AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-provisionedthroughput.html
+	WriteCapacityUnits *types.Value `json:"WriteCapacityUnits"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SimpleTable_ProvisionedThroughput) AWSCloudFormationType() string {
+	return "AWS::Serverless::SimpleTable.ProvisionedThroughput"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-simpletable_ssespecification.go b/goformation/cloudformation/serverless/aws-serverless-simpletable_ssespecification.go
new file mode 100644
index 0000000000..b29942bc19
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-simpletable_ssespecification.go
@@ -0,0 +1,37 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SimpleTable_SSESpecification AWS CloudFormation Resource (AWS::Serverless::SimpleTable.SSESpecification)
+// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-ssespecification.html
+type SimpleTable_SSESpecification struct {
+
+	// SSEEnabled AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-ssespecification.html
+	SSEEnabled *types.Value `json:"SSEEnabled,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SimpleTable_SSESpecification) AWSCloudFormationType() string {
+	return "AWS::Serverless::SimpleTable.SSESpecification"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine.go b/goformation/cloudformation/serverless/aws-serverless-statemachine.go
new file mode 100644
index 0000000000..a9021de3b7
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-statemachine.go
@@ -0,0 +1,153 @@
+package serverless
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine AWS CloudFormation Resource (AWS::Serverless::StateMachine)
+// See: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html
+type StateMachine struct {
+
+	// Definition AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html
+	Definition interface{} `json:"Definition,omitempty"`
+
+	// DefinitionSubstitutions AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html
+	DefinitionSubstitutions map[string]*types.Value `json:"DefinitionSubstitutions,omitempty"`
+
+	// DefinitionUri AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html
+	DefinitionUri *StateMachine_DefinitionUri `json:"DefinitionUri,omitempty"`
+
+	// Events AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html
+	Events map[string]StateMachine_EventSource `json:"Events,omitempty"`
+
+	// Logging AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html
+	Logging *StateMachine_LoggingConfiguration `json:"Logging,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Policies AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html
+	Policies *StateMachine_Policies `json:"Policies,omitempty"`
+
+	// Role AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html
+	Role *types.Value `json:"Role,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html
+	Tags map[string]*types.Value `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html
+	Type *types.Value `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 *StateMachine) AWSCloudFormationType() string {
+	return "AWS::Serverless::StateMachine"
+}
+
+// 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 StateMachine) MarshalJSON() ([]byte, error) {
+	type Properties StateMachine
+	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 *StateMachine) UnmarshalJSON(b []byte) error {
+	type Properties StateMachine
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = StateMachine(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/serverless/aws-serverless-statemachine_apievent.go b/goformation/cloudformation/serverless/aws-serverless-statemachine_apievent.go
new file mode 100644
index 0000000000..587356c1a4
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-statemachine_apievent.go
@@ -0,0 +1,47 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_ApiEvent AWS CloudFormation Resource (AWS::Serverless::StateMachine.ApiEvent)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+type StateMachine_ApiEvent struct {
+
+	// Method AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+	Method *types.Value `json:"Method,omitempty"`
+
+	// Path AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+	Path *types.Value `json:"Path,omitempty"`
+
+	// RestApiId AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api
+	RestApiId *types.Value `json:"RestApiId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ApiEvent) AWSCloudFormationType() string {
+	return "AWS::Serverless::StateMachine.ApiEvent"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_cloudwatcheventevent.go b/goformation/cloudformation/serverless/aws-serverless-statemachine_cloudwatcheventevent.go
new file mode 100644
index 0000000000..912c218abf
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-statemachine_cloudwatcheventevent.go
@@ -0,0 +1,52 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_CloudWatchEventEvent AWS CloudFormation Resource (AWS::Serverless::StateMachine.CloudWatchEventEvent)
+// See: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-statemachine-cloudwatchevent.html
+type StateMachine_CloudWatchEventEvent struct {
+
+	// EventBusName AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-statemachine-cloudwatchevent.html
+	EventBusName *types.Value `json:"EventBusName,omitempty"`
+
+	// Input AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-statemachine-cloudwatchevent.html
+	Input *types.Value `json:"Input,omitempty"`
+
+	// InputPath AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-statemachine-cloudwatchevent.html
+	InputPath *types.Value `json:"InputPath,omitempty"`
+
+	// Pattern AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AmazonCloudWatch/latest/events/CloudWatchEventsandEventPatterns.html
+	Pattern interface{} `json:"Pattern,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CloudWatchEventEvent) AWSCloudFormationType() string {
+	return "AWS::Serverless::StateMachine.CloudWatchEventEvent"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_cloudwatchlogsloggroup.go b/goformation/cloudformation/serverless/aws-serverless-statemachine_cloudwatchlogsloggroup.go
new file mode 100644
index 0000000000..21b6ee5e43
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-statemachine_cloudwatchlogsloggroup.go
@@ -0,0 +1,37 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_CloudWatchLogsLogGroup AWS CloudFormation Resource (AWS::Serverless::StateMachine.CloudWatchLogsLogGroup)
+// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-logdestination-cloudwatchlogsloggroup.html
+type StateMachine_CloudWatchLogsLogGroup struct {
+
+	// LogGroupArn AWS CloudFormation Property
+	// Required: true
+	// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-logdestination-cloudwatchlogsloggroup.html
+	LogGroupArn *types.Value `json:"LogGroupArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CloudWatchLogsLogGroup) AWSCloudFormationType() string {
+	return "AWS::Serverless::StateMachine.CloudWatchLogsLogGroup"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_eventbridgeruleevent.go b/goformation/cloudformation/serverless/aws-serverless-statemachine_eventbridgeruleevent.go
new file mode 100644
index 0000000000..d9f826ff18
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-statemachine_eventbridgeruleevent.go
@@ -0,0 +1,52 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_EventBridgeRuleEvent AWS CloudFormation Resource (AWS::Serverless::StateMachine.EventBridgeRuleEvent)
+// See: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-statemachine-cloudwatchevent.html
+type StateMachine_EventBridgeRuleEvent struct {
+
+	// EventBusName AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-statemachine-cloudwatchevent.html
+	EventBusName *types.Value `json:"EventBusName,omitempty"`
+
+	// Input AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-statemachine-cloudwatchevent.html
+	Input *types.Value `json:"Input,omitempty"`
+
+	// InputPath AWS CloudFormation Property
+	// Required: false
+	// See: https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-statemachine-cloudwatchevent.html
+	InputPath *types.Value `json:"InputPath,omitempty"`
+
+	// Pattern AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AmazonCloudWatch/latest/events/CloudWatchEventsandEventPatterns.html
+	Pattern interface{} `json:"Pattern,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_EventBridgeRuleEvent) AWSCloudFormationType() string {
+	return "AWS::Serverless::StateMachine.EventBridgeRuleEvent"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_eventsource.go b/goformation/cloudformation/serverless/aws-serverless-statemachine_eventsource.go
new file mode 100644
index 0000000000..b01c463b4a
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-statemachine_eventsource.go
@@ -0,0 +1,42 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_EventSource AWS CloudFormation Resource (AWS::Serverless::StateMachine.EventSource)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#event-source-object
+type StateMachine_EventSource struct {
+
+	// Properties AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#event-source-types
+	Properties *StateMachine_Properties `json:"Properties,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#event-source-object
+	Type *types.Value `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 *StateMachine_EventSource) AWSCloudFormationType() string {
+	return "AWS::Serverless::StateMachine.EventSource"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_functionsampt.go b/goformation/cloudformation/serverless/aws-serverless-statemachine_functionsampt.go
new file mode 100644
index 0000000000..2746063f6d
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-statemachine_functionsampt.go
@@ -0,0 +1,37 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_FunctionSAMPT AWS CloudFormation Resource (AWS::Serverless::StateMachine.FunctionSAMPT)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+type StateMachine_FunctionSAMPT struct {
+
+	// FunctionName AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	FunctionName *types.Value `json:"FunctionName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_FunctionSAMPT) AWSCloudFormationType() string {
+	return "AWS::Serverless::StateMachine.FunctionSAMPT"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_iampolicydocument.go b/goformation/cloudformation/serverless/aws-serverless-statemachine_iampolicydocument.go
new file mode 100644
index 0000000000..e71f458f69
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-statemachine_iampolicydocument.go
@@ -0,0 +1,35 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_IAMPolicyDocument AWS CloudFormation Resource (AWS::Serverless::StateMachine.IAMPolicyDocument)
+// See: http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies.html
+type StateMachine_IAMPolicyDocument struct {
+
+	// Statement AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies.html
+	Statement interface{} `json:"Statement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_IAMPolicyDocument) AWSCloudFormationType() string {
+	return "AWS::Serverless::StateMachine.IAMPolicyDocument"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_logdestination.go b/goformation/cloudformation/serverless/aws-serverless-statemachine_logdestination.go
new file mode 100644
index 0000000000..13e86902f1
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-statemachine_logdestination.go
@@ -0,0 +1,35 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_LogDestination AWS CloudFormation Resource (AWS::Serverless::StateMachine.LogDestination)
+// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-logdestination.html#cfn-stepfunctions-statemachine-logdestination-cloudwatchlogsloggroup
+type StateMachine_LogDestination struct {
+
+	// CloudWatchLogsLogGroup AWS CloudFormation Property
+	// Required: true
+	// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-logdestination.html#cfn-stepfunctions-statemachine-logdestination-cloudwatchlogsloggroup
+	CloudWatchLogsLogGroup *StateMachine_CloudWatchLogsLogGroup `json:"CloudWatchLogsLogGroup,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LogDestination) AWSCloudFormationType() string {
+	return "AWS::Serverless::StateMachine.LogDestination"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_loggingconfiguration.go b/goformation/cloudformation/serverless/aws-serverless-statemachine_loggingconfiguration.go
new file mode 100644
index 0000000000..f1d9bce881
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-statemachine_loggingconfiguration.go
@@ -0,0 +1,47 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_LoggingConfiguration AWS CloudFormation Resource (AWS::Serverless::StateMachine.LoggingConfiguration)
+// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-loggingconfiguration.html
+type StateMachine_LoggingConfiguration struct {
+
+	// Destinations AWS CloudFormation Property
+	// Required: true
+	// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-loggingconfiguration.html
+	Destinations []StateMachine_LogDestination `json:"Destinations,omitempty"`
+
+	// IncludeExecutionData AWS CloudFormation Property
+	// Required: true
+	// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-loggingconfiguration.html
+	IncludeExecutionData *types.Value `json:"IncludeExecutionData"`
+
+	// Level AWS CloudFormation Property
+	// Required: true
+	// See: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-loggingconfiguration.html
+	Level *types.Value `json:"Level,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LoggingConfiguration) AWSCloudFormationType() string {
+	return "AWS::Serverless::StateMachine.LoggingConfiguration"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_s3location.go b/goformation/cloudformation/serverless/aws-serverless-statemachine_s3location.go
new file mode 100644
index 0000000000..da7fd7011f
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-statemachine_s3location.go
@@ -0,0 +1,47 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_S3Location AWS CloudFormation Resource (AWS::Serverless::StateMachine.S3Location)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object
+type StateMachine_S3Location struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction
+	Version *types.Value `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 *StateMachine_S3Location) AWSCloudFormationType() string {
+	return "AWS::Serverless::StateMachine.S3Location"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_sampolicytemplate.go b/goformation/cloudformation/serverless/aws-serverless-statemachine_sampolicytemplate.go
new file mode 100644
index 0000000000..28bc0a5573
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-statemachine_sampolicytemplate.go
@@ -0,0 +1,40 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_SAMPolicyTemplate AWS CloudFormation Resource (AWS::Serverless::StateMachine.SAMPolicyTemplate)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+type StateMachine_SAMPolicyTemplate struct {
+
+	// LambdaInvokePolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	LambdaInvokePolicy *StateMachine_FunctionSAMPT `json:"LambdaInvokePolicy,omitempty"`
+
+	// StepFunctionsExecutionPolicy AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	StepFunctionsExecutionPolicy *StateMachine_StateMachineSAMPT `json:"StepFunctionsExecutionPolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SAMPolicyTemplate) AWSCloudFormationType() string {
+	return "AWS::Serverless::StateMachine.SAMPolicyTemplate"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_scheduleevent.go b/goformation/cloudformation/serverless/aws-serverless-statemachine_scheduleevent.go
new file mode 100644
index 0000000000..16f0017442
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-statemachine_scheduleevent.go
@@ -0,0 +1,42 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_ScheduleEvent AWS CloudFormation Resource (AWS::Serverless::StateMachine.ScheduleEvent)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#schedule
+type StateMachine_ScheduleEvent struct {
+
+	// Input AWS CloudFormation Property
+	// Required: false
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#schedule
+	Input *types.Value `json:"Input,omitempty"`
+
+	// Schedule AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#schedule
+	Schedule *types.Value `json:"Schedule,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_ScheduleEvent) AWSCloudFormationType() string {
+	return "AWS::Serverless::StateMachine.ScheduleEvent"
+}
diff --git a/goformation/cloudformation/serverless/aws-serverless-statemachine_statemachinesampt.go b/goformation/cloudformation/serverless/aws-serverless-statemachine_statemachinesampt.go
new file mode 100644
index 0000000000..65ff239d24
--- /dev/null
+++ b/goformation/cloudformation/serverless/aws-serverless-statemachine_statemachinesampt.go
@@ -0,0 +1,37 @@
+package serverless
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_StateMachineSAMPT AWS CloudFormation Resource (AWS::Serverless::StateMachine.StateMachineSAMPT)
+// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+type StateMachine_StateMachineSAMPT struct {
+
+	// StateMachineName AWS CloudFormation Property
+	// Required: true
+	// See: https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst
+	StateMachineName *types.Value `json:"StateMachineName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_StateMachineSAMPT) AWSCloudFormationType() string {
+	return "AWS::Serverless::StateMachine.StateMachineSAMPT"
+}
diff --git a/goformation/cloudformation/serverless/function_codeuri.go b/goformation/cloudformation/serverless/function_codeuri.go
new file mode 100644
index 0000000000..626e993890
--- /dev/null
+++ b/goformation/cloudformation/serverless/function_codeuri.go
@@ -0,0 +1,69 @@
+package serverless
+
+import (
+	"encoding/json"
+	"sort"
+
+	"goformation/v4/cloudformation/types"
+	"goformation/v4/cloudformation/utils"
+)
+
+// Function_CodeUri is a helper struct that can hold either a String or S3Location value
+type Function_CodeUri struct {
+	String **types.Value
+
+	S3Location *Function_S3Location
+}
+
+func (r Function_CodeUri) value() interface{} {
+	ret := []interface{}{}
+
+	if r.String != nil {
+		ret = append(ret, r.String)
+	}
+
+	if r.S3Location != nil {
+		ret = append(ret, *r.S3Location)
+	}
+
+	sort.Sort(utils.ByJSONLength(ret)) // Heuristic to select best attribute
+	if len(ret) > 0 {
+		return ret[0]
+	}
+
+	return nil
+}
+
+func (r Function_CodeUri) MarshalJSON() ([]byte, error) {
+	return json.Marshal(r.value())
+}
+
+// Hook into the marshaller
+func (r *Function_CodeUri) UnmarshalJSON(b []byte) error {
+
+	// Unmarshal into interface{} to check it's type
+	var typecheck interface{}
+	if err := json.Unmarshal(b, &typecheck); err != nil {
+		return err
+	}
+
+	switch val := typecheck.(type) {
+
+	case string:
+		v, err := types.NewValueFromPrimitive(val)
+		if err != nil {
+			return err
+		}
+		r.String = &v
+
+	case map[string]interface{}:
+		val = val // This ensures val is used to stop an error
+
+		json.Unmarshal(b, &r.S3Location)
+
+	case []interface{}:
+
+	}
+
+	return nil
+}
diff --git a/goformation/cloudformation/serverless/function_events.go b/goformation/cloudformation/serverless/function_events.go
new file mode 100644
index 0000000000..f672cac621
--- /dev/null
+++ b/goformation/cloudformation/serverless/function_events.go
@@ -0,0 +1,80 @@
+package serverless
+
+import (
+	"encoding/json"
+	"sort"
+
+	"goformation/v4/cloudformation/types"
+	"goformation/v4/cloudformation/utils"
+)
+
+// Function_Events is a helper struct that can hold either a String or String value
+type Function_Events struct {
+	String **types.Value
+
+	StringArray *[]*types.Value
+}
+
+func (r Function_Events) value() interface{} {
+	ret := []interface{}{}
+
+	if r.String != nil {
+		ret = append(ret, r.String)
+	}
+
+	if r.StringArray != nil {
+		ret = append(ret, r.StringArray)
+	}
+
+	sort.Sort(utils.ByJSONLength(ret)) // Heuristic to select best attribute
+	if len(ret) > 0 {
+		return ret[0]
+	}
+
+	return nil
+}
+
+func (r Function_Events) MarshalJSON() ([]byte, error) {
+	return json.Marshal(r.value())
+}
+
+// Hook into the marshaller
+func (r *Function_Events) UnmarshalJSON(b []byte) error {
+
+	// Unmarshal into interface{} to check it's type
+	var typecheck interface{}
+	if err := json.Unmarshal(b, &typecheck); err != nil {
+		return err
+	}
+
+	switch val := typecheck.(type) {
+
+	case string:
+		v, err := types.NewValueFromPrimitive(val)
+		if err != nil {
+			return err
+		}
+		r.String = &v
+
+	case []string:
+		var values []*types.Value
+		for _, vv := range val {
+			vvv, err := types.NewValueFromPrimitive(vv)
+			if err != nil {
+				return err
+			}
+			values = append(values, vvv)
+		}
+		r.StringArray = &values
+
+	case map[string]interface{}:
+		val = val // This ensures val is used to stop an error
+
+	case []interface{}:
+
+		json.Unmarshal(b, &r.StringArray)
+
+	}
+
+	return nil
+}
diff --git a/goformation/cloudformation/serverless/function_policies.go b/goformation/cloudformation/serverless/function_policies.go
new file mode 100644
index 0000000000..8b93ddd797
--- /dev/null
+++ b/goformation/cloudformation/serverless/function_policies.go
@@ -0,0 +1,103 @@
+package serverless
+
+import (
+	"encoding/json"
+	"sort"
+
+	"goformation/v4/cloudformation/types"
+	"goformation/v4/cloudformation/utils"
+)
+
+// Function_Policies is a helper struct that can hold either a String, String, IAMPolicyDocument, SAMPolicyTemplate, or IAMPolicyDocument value
+type Function_Policies struct {
+	String **types.Value
+
+	StringArray *[]*types.Value
+
+	IAMPolicyDocument *Function_IAMPolicyDocument
+
+	IAMPolicyDocumentArray *[]Function_IAMPolicyDocument
+	SAMPolicyTemplateArray *[]Function_SAMPolicyTemplate
+}
+
+func (r Function_Policies) value() interface{} {
+	ret := []interface{}{}
+
+	if r.String != nil {
+		ret = append(ret, r.String)
+	}
+
+	if r.StringArray != nil {
+		ret = append(ret, r.StringArray)
+	}
+
+	if r.IAMPolicyDocument != nil {
+		ret = append(ret, *r.IAMPolicyDocument)
+	}
+
+	if r.IAMPolicyDocumentArray != nil {
+		ret = append(ret, r.IAMPolicyDocumentArray)
+	}
+
+	if r.SAMPolicyTemplateArray != nil {
+		ret = append(ret, r.SAMPolicyTemplateArray)
+	}
+
+	sort.Sort(utils.ByJSONLength(ret)) // Heuristic to select best attribute
+	if len(ret) > 0 {
+		return ret[0]
+	}
+
+	return nil
+}
+
+func (r Function_Policies) MarshalJSON() ([]byte, error) {
+	return json.Marshal(r.value())
+}
+
+// Hook into the marshaller
+func (r *Function_Policies) UnmarshalJSON(b []byte) error {
+
+	// Unmarshal into interface{} to check it's type
+	var typecheck interface{}
+	if err := json.Unmarshal(b, &typecheck); err != nil {
+		return err
+	}
+
+	switch val := typecheck.(type) {
+
+	case string:
+		v, err := types.NewValueFromPrimitive(val)
+		if err != nil {
+			return err
+		}
+		r.String = &v
+
+	case []string:
+		var values []*types.Value
+		for _, vv := range val {
+			vvv, err := types.NewValueFromPrimitive(vv)
+			if err != nil {
+				return err
+			}
+			values = append(values, vvv)
+		}
+		r.StringArray = &values
+
+	case map[string]interface{}:
+		val = val // This ensures val is used to stop an error
+
+		json.Unmarshal(b, &r.IAMPolicyDocument)
+
+	case []interface{}:
+
+		json.Unmarshal(b, &r.StringArray)
+
+		json.Unmarshal(b, &r.IAMPolicyDocumentArray)
+
+		json.Unmarshal(b, &r.SAMPolicyTemplateArray)
+
+	}
+
+	return nil
+}
diff --git a/goformation/cloudformation/serverless/function_properties.go b/goformation/cloudformation/serverless/function_properties.go
new file mode 100644
index 0000000000..4ed6681945
--- /dev/null
+++ b/goformation/cloudformation/serverless/function_properties.go
@@ -0,0 +1,132 @@
+package serverless
+
+import (
+	"encoding/json"
+	"sort"
+
+	"goformation/v4/cloudformation/utils"
+)
+
+// Function_Properties is a helper struct that can hold either a S3Event, SNSEvent, SQSEvent, KinesisEvent, DynamoDBEvent, ApiEvent, ScheduleEvent, CloudWatchEventEvent, CloudWatchLogsEvent, IoTRuleEvent, AlexaSkillEvent, or EventBridgeRuleEvent value
+type Function_Properties struct {
+	S3Event              *Function_S3Event
+	SNSEvent             *Function_SNSEvent
+	SQSEvent             *Function_SQSEvent
+	KinesisEvent         *Function_KinesisEvent
+	DynamoDBEvent        *Function_DynamoDBEvent
+	ApiEvent             *Function_ApiEvent
+	ScheduleEvent        *Function_ScheduleEvent
+	CloudWatchEventEvent *Function_CloudWatchEventEvent
+	CloudWatchLogsEvent  *Function_CloudWatchLogsEvent
+	IoTRuleEvent         *Function_IoTRuleEvent
+	AlexaSkillEvent      *Function_AlexaSkillEvent
+	EventBridgeRuleEvent *Function_EventBridgeRuleEvent
+}
+
+func (r Function_Properties) value() interface{} {
+	ret := []interface{}{}
+
+	if r.S3Event != nil {
+		ret = append(ret, *r.S3Event)
+	}
+
+	if r.SNSEvent != nil {
+		ret = append(ret, *r.SNSEvent)
+	}
+
+	if r.SQSEvent != nil {
+		ret = append(ret, *r.SQSEvent)
+	}
+
+	if r.KinesisEvent != nil {
+		ret = append(ret, *r.KinesisEvent)
+	}
+
+	if r.DynamoDBEvent != nil {
+		ret = append(ret, *r.DynamoDBEvent)
+	}
+
+	if r.ApiEvent != nil {
+		ret = append(ret, *r.ApiEvent)
+	}
+
+	if r.ScheduleEvent != nil {
+		ret = append(ret, *r.ScheduleEvent)
+	}
+
+	if r.CloudWatchEventEvent != nil {
+		ret = append(ret, *r.CloudWatchEventEvent)
+	}
+
+	if r.CloudWatchLogsEvent != nil {
+		ret = append(ret, *r.CloudWatchLogsEvent)
+	}
+
+	if r.IoTRuleEvent != nil {
+		ret = append(ret, *r.IoTRuleEvent)
+	}
+
+	if r.AlexaSkillEvent != nil {
+		ret = append(ret, *r.AlexaSkillEvent)
+	}
+
+	if r.EventBridgeRuleEvent != nil {
+		ret = append(ret, *r.EventBridgeRuleEvent)
+	}
+
+	sort.Sort(utils.ByJSONLength(ret)) // Heuristic to select best attribute
+	if len(ret) > 0 {
+		return ret[0]
+	}
+
+	return nil
+}
+
+func (r Function_Properties) MarshalJSON() ([]byte, error) {
+	return json.Marshal(r.value())
+}
+
+// Hook into the marshaller
+func (r *Function_Properties) UnmarshalJSON(b []byte) error {
+
+	// Unmarshal into interface{} to check it's type
+	var typecheck interface{}
+	if err := json.Unmarshal(b, &typecheck); err != nil {
+		return err
+	}
+
+	switch val := typecheck.(type) {
+
+	case map[string]interface{}:
+		val = val // This ensures val is used to stop an error
+
+		json.Unmarshal(b, &r.S3Event)
+
+		json.Unmarshal(b, &r.SNSEvent)
+
+		json.Unmarshal(b, &r.SQSEvent)
+
+		json.Unmarshal(b, &r.KinesisEvent)
+
+		json.Unmarshal(b, &r.DynamoDBEvent)
+
+		json.Unmarshal(b, &r.ApiEvent)
+
+		json.Unmarshal(b, &r.ScheduleEvent)
+
+		json.Unmarshal(b, &r.CloudWatchEventEvent)
+
+		json.Unmarshal(b, &r.CloudWatchLogsEvent)
+
+		json.Unmarshal(b, &r.IoTRuleEvent)
+
+		json.Unmarshal(b, &r.AlexaSkillEvent)
+
+		json.Unmarshal(b, &r.EventBridgeRuleEvent)
+
+	case []interface{}:
+
+	}
+
+	return nil
+}
diff --git a/goformation/cloudformation/serverless/statemachine_definitionuri.go b/goformation/cloudformation/serverless/statemachine_definitionuri.go
new file mode 100644
index 0000000000..3fde8bc84f
--- /dev/null
+++ b/goformation/cloudformation/serverless/statemachine_definitionuri.go
@@ -0,0 +1,69 @@
+package serverless
+
+import (
+	"encoding/json"
+	"sort"
+
+	"goformation/v4/cloudformation/types"
+	"goformation/v4/cloudformation/utils"
+)
+
+// StateMachine_DefinitionUri is a helper struct that can hold either a String or S3Location value
+type StateMachine_DefinitionUri struct {
+	String **types.Value
+
+	S3Location *StateMachine_S3Location
+}
+
+func (r StateMachine_DefinitionUri) value() interface{} {
+	ret := []interface{}{}
+
+	if r.String != nil {
+		ret = append(ret, r.String)
+	}
+
+	if r.S3Location != nil {
+		ret = append(ret, *r.S3Location)
+	}
+
+	sort.Sort(utils.ByJSONLength(ret)) // Heuristic to select best attribute
+	if len(ret) > 0 {
+		return ret[0]
+	}
+
+	return nil
+}
+
+func (r StateMachine_DefinitionUri) MarshalJSON() ([]byte, error) {
+	return json.Marshal(r.value())
+}
+
+// Hook into the marshaller
+func (r *StateMachine_DefinitionUri) UnmarshalJSON(b []byte) error {
+
+	// Unmarshal into interface{} to check it's type
+	var typecheck interface{}
+	if err := json.Unmarshal(b, &typecheck); err != nil {
+		return err
+	}
+
+	switch val := typecheck.(type) {
+
+	case string:
+		v, err := types.NewValueFromPrimitive(val)
+		if err != nil {
+			return err
+		}
+		r.String = &v
+
+	case map[string]interface{}:
+		val = val // This ensures val is used to stop an error
+
+		json.Unmarshal(b, &r.S3Location)
+
+	case []interface{}:
+
+	}
+
+	return nil
+}
diff --git a/goformation/cloudformation/serverless/statemachine_policies.go b/goformation/cloudformation/serverless/statemachine_policies.go
new file mode 100644
index 0000000000..ef2f0935c1
--- /dev/null
+++ b/goformation/cloudformation/serverless/statemachine_policies.go
@@ -0,0 +1,103 @@
+package serverless
+
+import (
+	"encoding/json"
+	"sort"
+
+	"goformation/v4/cloudformation/types"
+	"goformation/v4/cloudformation/utils"
+)
+
+// StateMachine_Policies is a helper struct that can hold either a String, String, IAMPolicyDocument, SAMPolicyTemplate, or IAMPolicyDocument value
+type StateMachine_Policies struct {
+	String **types.Value
+
+	StringArray *[]*types.Value
+
+	IAMPolicyDocument *StateMachine_IAMPolicyDocument
+
+	IAMPolicyDocumentArray *[]StateMachine_IAMPolicyDocument
+	SAMPolicyTemplateArray *[]StateMachine_SAMPolicyTemplate
+}
+
+func (r StateMachine_Policies) value() interface{} {
+	ret := []interface{}{}
+
+	if r.String != nil {
+		ret = append(ret, r.String)
+	}
+
+	if r.StringArray != nil {
+		ret = append(ret, r.StringArray)
+	}
+
+	if r.IAMPolicyDocument != nil {
+		ret = append(ret, *r.IAMPolicyDocument)
+	}
+
+	if r.IAMPolicyDocumentArray != nil {
+		ret = append(ret, r.IAMPolicyDocumentArray)
+	}
+
+	if r.SAMPolicyTemplateArray != nil {
+		ret = append(ret, r.SAMPolicyTemplateArray)
+	}
+
+	sort.Sort(utils.ByJSONLength(ret)) // Heuristic to select best attribute
+	if len(ret) > 0 {
+		return ret[0]
+	}
+
+	return nil
+}
+
+func (r StateMachine_Policies) MarshalJSON() ([]byte, error) {
+	return json.Marshal(r.value())
+}
+
+// Hook into the marshaller
+func (r *StateMachine_Policies) UnmarshalJSON(b []byte) error {
+
+	// Unmarshal into interface{} to check it's type
+	var typecheck interface{}
+	if err := json.Unmarshal(b, &typecheck); err != nil {
+		return err
+	}
+
+	switch val := typecheck.(type) {
+
+	case string:
+		v, err := types.NewValueFromPrimitive(val)
+		if err != nil {
+			return err
+		}
+		r.String = &v
+
+	case []string:
+		var values []*types.Value
+		for _, vv := range val {
+			vvv, err := types.NewValueFromPrimitive(vv)
+			if err != nil {
+				return err
+			}
+			values = append(values, vvv)
+		}
+		r.StringArray = &values
+
+	case map[string]interface{}:
+		val = val // This ensures val is used to stop an error
+
+		json.Unmarshal(b, &r.IAMPolicyDocument)
+
+	case []interface{}:
+
+		json.Unmarshal(b, &r.StringArray)
+
+		json.Unmarshal(b, &r.IAMPolicyDocumentArray)
+
+		json.Unmarshal(b, &r.SAMPolicyTemplateArray)
+
+	}
+
+	return nil
+}
diff --git a/goformation/cloudformation/serverless/statemachine_properties.go b/goformation/cloudformation/serverless/statemachine_properties.go
new file mode 100644
index 0000000000..30fe5a1afe
--- /dev/null
+++ b/goformation/cloudformation/serverless/statemachine_properties.go
@@ -0,0 +1,76 @@
+package serverless
+
+import (
+	"encoding/json"
+	"sort"
+
+	"goformation/v4/cloudformation/utils"
+)
+
+// StateMachine_Properties is a helper struct that can hold either a CloudWatchEventEvent, EventBridgeRuleEvent, ScheduleEvent, or ApiEvent value
+type StateMachine_Properties struct {
+	CloudWatchEventEvent *StateMachine_CloudWatchEventEvent
+	EventBridgeRuleEvent *StateMachine_EventBridgeRuleEvent
+	ScheduleEvent        *StateMachine_ScheduleEvent
+	ApiEvent             *StateMachine_ApiEvent
+}
+
+func (r StateMachine_Properties) value() interface{} {
+	ret := []interface{}{}
+
+	if r.CloudWatchEventEvent != nil {
+		ret = append(ret, *r.CloudWatchEventEvent)
+	}
+
+	if r.EventBridgeRuleEvent != nil {
+		ret = append(ret, *r.EventBridgeRuleEvent)
+	}
+
+	if r.ScheduleEvent != nil {
+		ret = append(ret, *r.ScheduleEvent)
+	}
+
+	if r.ApiEvent != nil {
+		ret = append(ret, *r.ApiEvent)
+	}
+
+	sort.Sort(utils.ByJSONLength(ret)) // Heuristic to select best attribute
+	if len(ret) > 0 {
+		return ret[0]
+	}
+
+	return nil
+}
+
+func (r StateMachine_Properties) MarshalJSON() ([]byte, error) {
+	return json.Marshal(r.value())
+}
+
+// Hook into the marshaller
+func (r *StateMachine_Properties) UnmarshalJSON(b []byte) error {
+
+	// Unmarshal into interface{} to check it's type
+	var typecheck interface{}
+	if err := json.Unmarshal(b, &typecheck); err != nil {
+		return err
+	}
+
+	switch val := typecheck.(type) {
+
+	case map[string]interface{}:
+		val = val // This ensures val is used to stop an error
+
+		json.Unmarshal(b, &r.CloudWatchEventEvent)
+
+		json.Unmarshal(b, &r.EventBridgeRuleEvent)
+
+		json.Unmarshal(b, &r.ScheduleEvent)
+
+		json.Unmarshal(b, &r.ApiEvent)
+
+	case []interface{}:
+
+	}
+
+	return nil
+}
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-acceptedportfolioshare.go b/goformation/cloudformation/servicecatalog/aws-servicecatalog-acceptedportfolioshare.go
new file mode 100644
index 0000000000..0217deaafc
--- /dev/null
+++ b/goformation/cloudformation/servicecatalog/aws-servicecatalog-acceptedportfolioshare.go
@@ -0,0 +1,113 @@
+package servicecatalog
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AcceptedPortfolioShare AWS CloudFormation Resource (AWS::ServiceCatalog::AcceptedPortfolioShare)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-acceptedportfolioshare.html
+type AcceptedPortfolioShare struct {
+
+	// AcceptLanguage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-acceptedportfolioshare.html#cfn-servicecatalog-acceptedportfolioshare-acceptlanguage
+	AcceptLanguage *types.Value `json:"AcceptLanguage,omitempty"`
+
+	// PortfolioId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-acceptedportfolioshare.html#cfn-servicecatalog-acceptedportfolioshare-portfolioid
+	PortfolioId *types.Value `json:"PortfolioId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AcceptedPortfolioShare) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalog::AcceptedPortfolioShare"
+}
+
+// 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 AcceptedPortfolioShare) MarshalJSON() ([]byte, error) {
+	type Properties AcceptedPortfolioShare
+	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 *AcceptedPortfolioShare) UnmarshalJSON(b []byte) error {
+	type Properties AcceptedPortfolioShare
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AcceptedPortfolioShare(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct.go b/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct.go
new file mode 100644
index 0000000000..ca572886d1
--- /dev/null
+++ b/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct.go
@@ -0,0 +1,159 @@
+package servicecatalog
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// CloudFormationProduct AWS CloudFormation Resource (AWS::ServiceCatalog::CloudFormationProduct)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationproduct.html
+type CloudFormationProduct struct {
+
+	// AcceptLanguage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationproduct.html#cfn-servicecatalog-cloudformationproduct-acceptlanguage
+	AcceptLanguage *types.Value `json:"AcceptLanguage,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationproduct.html#cfn-servicecatalog-cloudformationproduct-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Distributor AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationproduct.html#cfn-servicecatalog-cloudformationproduct-distributor
+	Distributor *types.Value `json:"Distributor,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationproduct.html#cfn-servicecatalog-cloudformationproduct-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Owner AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationproduct.html#cfn-servicecatalog-cloudformationproduct-owner
+	Owner *types.Value `json:"Owner,omitempty"`
+
+	// ProvisioningArtifactParameters AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationproduct.html#cfn-servicecatalog-cloudformationproduct-provisioningartifactparameters
+	ProvisioningArtifactParameters []CloudFormationProduct_ProvisioningArtifactProperties `json:"ProvisioningArtifactParameters,omitempty"`
+
+	// ReplaceProvisioningArtifacts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationproduct.html#cfn-servicecatalog-cloudformationproduct-replaceprovisioningartifacts
+	ReplaceProvisioningArtifacts *types.Value `json:"ReplaceProvisioningArtifacts,omitempty"`
+
+	// SupportDescription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationproduct.html#cfn-servicecatalog-cloudformationproduct-supportdescription
+	SupportDescription *types.Value `json:"SupportDescription,omitempty"`
+
+	// SupportEmail AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationproduct.html#cfn-servicecatalog-cloudformationproduct-supportemail
+	SupportEmail *types.Value `json:"SupportEmail,omitempty"`
+
+	// SupportUrl AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationproduct.html#cfn-servicecatalog-cloudformationproduct-supporturl
+	SupportUrl *types.Value `json:"SupportUrl,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationproduct.html#cfn-servicecatalog-cloudformationproduct-tags
+	Tags []cloudformation.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 *CloudFormationProduct) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalog::CloudFormationProduct"
+}
+
+// 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 CloudFormationProduct) MarshalJSON() ([]byte, error) {
+	type Properties CloudFormationProduct
+	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 *CloudFormationProduct) UnmarshalJSON(b []byte) error {
+	type Properties CloudFormationProduct
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CloudFormationProduct(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct_provisioningartifactproperties.go b/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct_provisioningartifactproperties.go
new file mode 100644
index 0000000000..2b1c66a9e3
--- /dev/null
+++ b/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationproduct_provisioningartifactproperties.go
@@ -0,0 +1,52 @@
+package servicecatalog
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CloudFormationProduct_ProvisioningArtifactProperties AWS CloudFormation Resource (AWS::ServiceCatalog::CloudFormationProduct.ProvisioningArtifactProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicecatalog-cloudformationproduct-provisioningartifactproperties.html
+type CloudFormationProduct_ProvisioningArtifactProperties struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicecatalog-cloudformationproduct-provisioningartifactproperties.html#cfn-servicecatalog-cloudformationproduct-provisioningartifactproperties-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DisableTemplateValidation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicecatalog-cloudformationproduct-provisioningartifactproperties.html#cfn-servicecatalog-cloudformationproduct-provisioningartifactproperties-disabletemplatevalidation
+	DisableTemplateValidation *types.Value `json:"DisableTemplateValidation,omitempty"`
+
+	// Info AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicecatalog-cloudformationproduct-provisioningartifactproperties.html#cfn-servicecatalog-cloudformationproduct-provisioningartifactproperties-info
+	Info interface{} `json:"Info,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicecatalog-cloudformationproduct-provisioningartifactproperties.html#cfn-servicecatalog-cloudformationproduct-provisioningartifactproperties-name
+	Name *types.Value `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 *CloudFormationProduct_ProvisioningArtifactProperties) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalog::CloudFormationProduct.ProvisioningArtifactProperties"
+}
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct.go b/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct.go
new file mode 100644
index 0000000000..d775a46713
--- /dev/null
+++ b/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct.go
@@ -0,0 +1,164 @@
+package servicecatalog
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// CloudFormationProvisionedProduct AWS CloudFormation Resource (AWS::ServiceCatalog::CloudFormationProvisionedProduct)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationprovisionedproduct.html
+type CloudFormationProvisionedProduct struct {
+
+	// AcceptLanguage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationprovisionedproduct.html#cfn-servicecatalog-cloudformationprovisionedproduct-acceptlanguage
+	AcceptLanguage *types.Value `json:"AcceptLanguage,omitempty"`
+
+	// NotificationArns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationprovisionedproduct.html#cfn-servicecatalog-cloudformationprovisionedproduct-notificationarns
+	NotificationArns *types.Value `json:"NotificationArns,omitempty"`
+
+	// PathId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationprovisionedproduct.html#cfn-servicecatalog-cloudformationprovisionedproduct-pathid
+	PathId *types.Value `json:"PathId,omitempty"`
+
+	// PathName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationprovisionedproduct.html#cfn-servicecatalog-cloudformationprovisionedproduct-pathname
+	PathName *types.Value `json:"PathName,omitempty"`
+
+	// ProductId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationprovisionedproduct.html#cfn-servicecatalog-cloudformationprovisionedproduct-productid
+	ProductId *types.Value `json:"ProductId,omitempty"`
+
+	// ProductName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationprovisionedproduct.html#cfn-servicecatalog-cloudformationprovisionedproduct-productname
+	ProductName *types.Value `json:"ProductName,omitempty"`
+
+	// ProvisionedProductName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationprovisionedproduct.html#cfn-servicecatalog-cloudformationprovisionedproduct-provisionedproductname
+	ProvisionedProductName *types.Value `json:"ProvisionedProductName,omitempty"`
+
+	// ProvisioningArtifactId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationprovisionedproduct.html#cfn-servicecatalog-cloudformationprovisionedproduct-provisioningartifactid
+	ProvisioningArtifactId *types.Value `json:"ProvisioningArtifactId,omitempty"`
+
+	// ProvisioningArtifactName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationprovisionedproduct.html#cfn-servicecatalog-cloudformationprovisionedproduct-provisioningartifactname
+	ProvisioningArtifactName *types.Value `json:"ProvisioningArtifactName,omitempty"`
+
+	// ProvisioningParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationprovisionedproduct.html#cfn-servicecatalog-cloudformationprovisionedproduct-provisioningparameters
+	ProvisioningParameters []CloudFormationProvisionedProduct_ProvisioningParameter `json:"ProvisioningParameters,omitempty"`
+
+	// ProvisioningPreferences AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationprovisionedproduct.html#cfn-servicecatalog-cloudformationprovisionedproduct-provisioningpreferences
+	ProvisioningPreferences *CloudFormationProvisionedProduct_ProvisioningPreferences `json:"ProvisioningPreferences,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-cloudformationprovisionedproduct.html#cfn-servicecatalog-cloudformationprovisionedproduct-tags
+	Tags []cloudformation.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 *CloudFormationProvisionedProduct) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalog::CloudFormationProvisionedProduct"
+}
+
+// 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 CloudFormationProvisionedProduct) MarshalJSON() ([]byte, error) {
+	type Properties CloudFormationProvisionedProduct
+	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 *CloudFormationProvisionedProduct) UnmarshalJSON(b []byte) error {
+	type Properties CloudFormationProvisionedProduct
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = CloudFormationProvisionedProduct(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningparameter.go b/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningparameter.go
new file mode 100644
index 0000000000..4c61a889ba
--- /dev/null
+++ b/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningparameter.go
@@ -0,0 +1,42 @@
+package servicecatalog
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CloudFormationProvisionedProduct_ProvisioningParameter AWS CloudFormation Resource (AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicecatalog-cloudformationprovisionedproduct-provisioningparameter.html
+type CloudFormationProvisionedProduct_ProvisioningParameter struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicecatalog-cloudformationprovisionedproduct-provisioningparameter.html#cfn-servicecatalog-cloudformationprovisionedproduct-provisioningparameter-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicecatalog-cloudformationprovisionedproduct-provisioningparameter.html#cfn-servicecatalog-cloudformationprovisionedproduct-provisioningparameter-value
+	Value *types.Value `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 *CloudFormationProvisionedProduct_ProvisioningParameter) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningParameter"
+}
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningpreferences.go b/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningpreferences.go
new file mode 100644
index 0000000000..510207973a
--- /dev/null
+++ b/goformation/cloudformation/servicecatalog/aws-servicecatalog-cloudformationprovisionedproduct_provisioningpreferences.go
@@ -0,0 +1,67 @@
+package servicecatalog
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// CloudFormationProvisionedProduct_ProvisioningPreferences AWS CloudFormation Resource (AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningPreferences)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicecatalog-cloudformationprovisionedproduct-provisioningpreferences.html
+type CloudFormationProvisionedProduct_ProvisioningPreferences struct {
+
+	// StackSetAccounts AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicecatalog-cloudformationprovisionedproduct-provisioningpreferences.html#cfn-servicecatalog-cloudformationprovisionedproduct-provisioningpreferences-stacksetaccounts
+	StackSetAccounts *types.Value `json:"StackSetAccounts,omitempty"`
+
+	// StackSetFailureToleranceCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicecatalog-cloudformationprovisionedproduct-provisioningpreferences.html#cfn-servicecatalog-cloudformationprovisionedproduct-provisioningpreferences-stacksetfailuretolerancecount
+	StackSetFailureToleranceCount *types.Value `json:"StackSetFailureToleranceCount,omitempty"`
+
+	// StackSetFailureTolerancePercentage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicecatalog-cloudformationprovisionedproduct-provisioningpreferences.html#cfn-servicecatalog-cloudformationprovisionedproduct-provisioningpreferences-stacksetfailuretolerancepercentage
+	StackSetFailureTolerancePercentage *types.Value `json:"StackSetFailureTolerancePercentage,omitempty"`
+
+	// StackSetMaxConcurrencyCount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicecatalog-cloudformationprovisionedproduct-provisioningpreferences.html#cfn-servicecatalog-cloudformationprovisionedproduct-provisioningpreferences-stacksetmaxconcurrencycount
+	StackSetMaxConcurrencyCount *types.Value `json:"StackSetMaxConcurrencyCount,omitempty"`
+
+	// StackSetMaxConcurrencyPercentage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicecatalog-cloudformationprovisionedproduct-provisioningpreferences.html#cfn-servicecatalog-cloudformationprovisionedproduct-provisioningpreferences-stacksetmaxconcurrencypercentage
+	StackSetMaxConcurrencyPercentage *types.Value `json:"StackSetMaxConcurrencyPercentage,omitempty"`
+
+	// StackSetOperationType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicecatalog-cloudformationprovisionedproduct-provisioningpreferences.html#cfn-servicecatalog-cloudformationprovisionedproduct-provisioningpreferences-stacksetoperationtype
+	StackSetOperationType *types.Value `json:"StackSetOperationType,omitempty"`
+
+	// StackSetRegions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicecatalog-cloudformationprovisionedproduct-provisioningpreferences.html#cfn-servicecatalog-cloudformationprovisionedproduct-provisioningpreferences-stacksetregions
+	StackSetRegions *types.Value `json:"StackSetRegions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *CloudFormationProvisionedProduct_ProvisioningPreferences) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningPreferences"
+}
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchnotificationconstraint.go b/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchnotificationconstraint.go
new file mode 100644
index 0000000000..0e8f6499d7
--- /dev/null
+++ b/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchnotificationconstraint.go
@@ -0,0 +1,128 @@
+package servicecatalog
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchNotificationConstraint AWS CloudFormation Resource (AWS::ServiceCatalog::LaunchNotificationConstraint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-launchnotificationconstraint.html
+type LaunchNotificationConstraint struct {
+
+	// AcceptLanguage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-launchnotificationconstraint.html#cfn-servicecatalog-launchnotificationconstraint-acceptlanguage
+	AcceptLanguage *types.Value `json:"AcceptLanguage,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-launchnotificationconstraint.html#cfn-servicecatalog-launchnotificationconstraint-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// NotificationArns AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-launchnotificationconstraint.html#cfn-servicecatalog-launchnotificationconstraint-notificationarns
+	NotificationArns *types.Value `json:"NotificationArns,omitempty"`
+
+	// PortfolioId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-launchnotificationconstraint.html#cfn-servicecatalog-launchnotificationconstraint-portfolioid
+	PortfolioId *types.Value `json:"PortfolioId,omitempty"`
+
+	// ProductId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-launchnotificationconstraint.html#cfn-servicecatalog-launchnotificationconstraint-productid
+	ProductId *types.Value `json:"ProductId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchNotificationConstraint) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalog::LaunchNotificationConstraint"
+}
+
+// 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 LaunchNotificationConstraint) MarshalJSON() ([]byte, error) {
+	type Properties LaunchNotificationConstraint
+	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 *LaunchNotificationConstraint) UnmarshalJSON(b []byte) error {
+	type Properties LaunchNotificationConstraint
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LaunchNotificationConstraint(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchroleconstraint.go b/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchroleconstraint.go
new file mode 100644
index 0000000000..80abbcdd0f
--- /dev/null
+++ b/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchroleconstraint.go
@@ -0,0 +1,133 @@
+package servicecatalog
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchRoleConstraint AWS CloudFormation Resource (AWS::ServiceCatalog::LaunchRoleConstraint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-launchroleconstraint.html
+type LaunchRoleConstraint struct {
+
+	// AcceptLanguage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-launchroleconstraint.html#cfn-servicecatalog-launchroleconstraint-acceptlanguage
+	AcceptLanguage *types.Value `json:"AcceptLanguage,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-launchroleconstraint.html#cfn-servicecatalog-launchroleconstraint-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// LocalRoleName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-launchroleconstraint.html#cfn-servicecatalog-launchroleconstraint-localrolename
+	LocalRoleName *types.Value `json:"LocalRoleName,omitempty"`
+
+	// PortfolioId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-launchroleconstraint.html#cfn-servicecatalog-launchroleconstraint-portfolioid
+	PortfolioId *types.Value `json:"PortfolioId,omitempty"`
+
+	// ProductId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-launchroleconstraint.html#cfn-servicecatalog-launchroleconstraint-productid
+	ProductId *types.Value `json:"ProductId,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-launchroleconstraint.html#cfn-servicecatalog-launchroleconstraint-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LaunchRoleConstraint) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalog::LaunchRoleConstraint"
+}
+
+// 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 LaunchRoleConstraint) MarshalJSON() ([]byte, error) {
+	type Properties LaunchRoleConstraint
+	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 *LaunchRoleConstraint) UnmarshalJSON(b []byte) error {
+	type Properties LaunchRoleConstraint
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LaunchRoleConstraint(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchtemplateconstraint.go b/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchtemplateconstraint.go
new file mode 100644
index 0000000000..973721feed
--- /dev/null
+++ b/goformation/cloudformation/servicecatalog/aws-servicecatalog-launchtemplateconstraint.go
@@ -0,0 +1,128 @@
+package servicecatalog
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LaunchTemplateConstraint AWS CloudFormation Resource (AWS::ServiceCatalog::LaunchTemplateConstraint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-launchtemplateconstraint.html
+type LaunchTemplateConstraint struct {
+
+	// AcceptLanguage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-launchtemplateconstraint.html#cfn-servicecatalog-launchtemplateconstraint-acceptlanguage
+	AcceptLanguage *types.Value `json:"AcceptLanguage,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-launchtemplateconstraint.html#cfn-servicecatalog-launchtemplateconstraint-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// PortfolioId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-launchtemplateconstraint.html#cfn-servicecatalog-launchtemplateconstraint-portfolioid
+	PortfolioId *types.Value `json:"PortfolioId,omitempty"`
+
+	// ProductId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-launchtemplateconstraint.html#cfn-servicecatalog-launchtemplateconstraint-productid
+	ProductId *types.Value `json:"ProductId,omitempty"`
+
+	// Rules AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-launchtemplateconstraint.html#cfn-servicecatalog-launchtemplateconstraint-rules
+	Rules *types.Value `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 *LaunchTemplateConstraint) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalog::LaunchTemplateConstraint"
+}
+
+// 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 LaunchTemplateConstraint) MarshalJSON() ([]byte, error) {
+	type Properties LaunchTemplateConstraint
+	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 *LaunchTemplateConstraint) UnmarshalJSON(b []byte) error {
+	type Properties LaunchTemplateConstraint
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LaunchTemplateConstraint(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolio.go b/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolio.go
new file mode 100644
index 0000000000..295339eba4
--- /dev/null
+++ b/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolio.go
@@ -0,0 +1,129 @@
+package servicecatalog
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Portfolio AWS CloudFormation Resource (AWS::ServiceCatalog::Portfolio)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolio.html
+type Portfolio struct {
+
+	// AcceptLanguage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolio.html#cfn-servicecatalog-portfolio-acceptlanguage
+	AcceptLanguage *types.Value `json:"AcceptLanguage,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolio.html#cfn-servicecatalog-portfolio-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DisplayName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolio.html#cfn-servicecatalog-portfolio-displayname
+	DisplayName *types.Value `json:"DisplayName,omitempty"`
+
+	// ProviderName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolio.html#cfn-servicecatalog-portfolio-providername
+	ProviderName *types.Value `json:"ProviderName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolio.html#cfn-servicecatalog-portfolio-tags
+	Tags []cloudformation.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 *Portfolio) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalog::Portfolio"
+}
+
+// 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 Portfolio) MarshalJSON() ([]byte, error) {
+	type Properties Portfolio
+	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 *Portfolio) UnmarshalJSON(b []byte) error {
+	type Properties Portfolio
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Portfolio(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioprincipalassociation.go b/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioprincipalassociation.go
new file mode 100644
index 0000000000..5bcbbf16dc
--- /dev/null
+++ b/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioprincipalassociation.go
@@ -0,0 +1,123 @@
+package servicecatalog
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PortfolioPrincipalAssociation AWS CloudFormation Resource (AWS::ServiceCatalog::PortfolioPrincipalAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolioprincipalassociation.html
+type PortfolioPrincipalAssociation struct {
+
+	// AcceptLanguage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolioprincipalassociation.html#cfn-servicecatalog-portfolioprincipalassociation-acceptlanguage
+	AcceptLanguage *types.Value `json:"AcceptLanguage,omitempty"`
+
+	// PortfolioId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolioprincipalassociation.html#cfn-servicecatalog-portfolioprincipalassociation-portfolioid
+	PortfolioId *types.Value `json:"PortfolioId,omitempty"`
+
+	// PrincipalARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolioprincipalassociation.html#cfn-servicecatalog-portfolioprincipalassociation-principalarn
+	PrincipalARN *types.Value `json:"PrincipalARN,omitempty"`
+
+	// PrincipalType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolioprincipalassociation.html#cfn-servicecatalog-portfolioprincipalassociation-principaltype
+	PrincipalType *types.Value `json:"PrincipalType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PortfolioPrincipalAssociation) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalog::PortfolioPrincipalAssociation"
+}
+
+// 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 PortfolioPrincipalAssociation) MarshalJSON() ([]byte, error) {
+	type Properties PortfolioPrincipalAssociation
+	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 *PortfolioPrincipalAssociation) UnmarshalJSON(b []byte) error {
+	type Properties PortfolioPrincipalAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PortfolioPrincipalAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioproductassociation.go b/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioproductassociation.go
new file mode 100644
index 0000000000..748d78f5d3
--- /dev/null
+++ b/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioproductassociation.go
@@ -0,0 +1,123 @@
+package servicecatalog
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PortfolioProductAssociation AWS CloudFormation Resource (AWS::ServiceCatalog::PortfolioProductAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolioproductassociation.html
+type PortfolioProductAssociation struct {
+
+	// AcceptLanguage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolioproductassociation.html#cfn-servicecatalog-portfolioproductassociation-acceptlanguage
+	AcceptLanguage *types.Value `json:"AcceptLanguage,omitempty"`
+
+	// PortfolioId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolioproductassociation.html#cfn-servicecatalog-portfolioproductassociation-portfolioid
+	PortfolioId *types.Value `json:"PortfolioId,omitempty"`
+
+	// ProductId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolioproductassociation.html#cfn-servicecatalog-portfolioproductassociation-productid
+	ProductId *types.Value `json:"ProductId,omitempty"`
+
+	// SourcePortfolioId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolioproductassociation.html#cfn-servicecatalog-portfolioproductassociation-sourceportfolioid
+	SourcePortfolioId *types.Value `json:"SourcePortfolioId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PortfolioProductAssociation) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalog::PortfolioProductAssociation"
+}
+
+// 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 PortfolioProductAssociation) MarshalJSON() ([]byte, error) {
+	type Properties PortfolioProductAssociation
+	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 *PortfolioProductAssociation) UnmarshalJSON(b []byte) error {
+	type Properties PortfolioProductAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PortfolioProductAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioshare.go b/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioshare.go
new file mode 100644
index 0000000000..b0926ef3a8
--- /dev/null
+++ b/goformation/cloudformation/servicecatalog/aws-servicecatalog-portfolioshare.go
@@ -0,0 +1,123 @@
+package servicecatalog
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PortfolioShare AWS CloudFormation Resource (AWS::ServiceCatalog::PortfolioShare)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolioshare.html
+type PortfolioShare struct {
+
+	// AcceptLanguage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolioshare.html#cfn-servicecatalog-portfolioshare-acceptlanguage
+	AcceptLanguage *types.Value `json:"AcceptLanguage,omitempty"`
+
+	// AccountId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolioshare.html#cfn-servicecatalog-portfolioshare-accountid
+	AccountId *types.Value `json:"AccountId,omitempty"`
+
+	// PortfolioId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolioshare.html#cfn-servicecatalog-portfolioshare-portfolioid
+	PortfolioId *types.Value `json:"PortfolioId,omitempty"`
+
+	// ShareTagOptions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-portfolioshare.html#cfn-servicecatalog-portfolioshare-sharetagoptions
+	ShareTagOptions *types.Value `json:"ShareTagOptions,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PortfolioShare) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalog::PortfolioShare"
+}
+
+// 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 PortfolioShare) MarshalJSON() ([]byte, error) {
+	type Properties PortfolioShare
+	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 *PortfolioShare) UnmarshalJSON(b []byte) error {
+	type Properties PortfolioShare
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PortfolioShare(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicecatalog/aws-servicecatalog-resourceupdateconstraint.go b/goformation/cloudformation/servicecatalog/aws-servicecatalog-resourceupdateconstraint.go
new file mode 100644
index 0000000000..dad1a2b224
--- /dev/null
+++ b/goformation/cloudformation/servicecatalog/aws-servicecatalog-resourceupdateconstraint.go
@@ -0,0 +1,128 @@
+package servicecatalog
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceUpdateConstraint AWS CloudFormation Resource (AWS::ServiceCatalog::ResourceUpdateConstraint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-resourceupdateconstraint.html
+type ResourceUpdateConstraint struct {
+
+	// AcceptLanguage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-resourceupdateconstraint.html#cfn-servicecatalog-resourceupdateconstraint-acceptlanguage
+	AcceptLanguage *types.Value `json:"AcceptLanguage,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-resourceupdateconstraint.html#cfn-servicecatalog-resourceupdateconstraint-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// PortfolioId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-resourceupdateconstraint.html#cfn-servicecatalog-resourceupdateconstraint-portfolioid
+	PortfolioId *types.Value `json:"PortfolioId,omitempty"`
+
+	// ProductId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-resourceupdateconstraint.html#cfn-servicecatalog-resourceupdateconstraint-productid
+	ProductId *types.Value `json:"ProductId,omitempty"`
+
+	// TagUpdateOnProvisionedProduct AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-resourceupdateconstraint.html#cfn-servicecatalog-resourceupdateconstraint-tagupdateonprovisionedproduct
+	TagUpdateOnProvisionedProduct *types.Value `json:"TagUpdateOnProvisionedProduct,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceUpdateConstraint) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalog::ResourceUpdateConstraint"
+}
+
+// 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 ResourceUpdateConstraint) MarshalJSON() ([]byte, error) {
+	type Properties ResourceUpdateConstraint
+	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 *ResourceUpdateConstraint) UnmarshalJSON(b []byte) error {
+	type Properties ResourceUpdateConstraint
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResourceUpdateConstraint(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceaction.go b/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceaction.go
new file mode 100644
index 0000000000..498eed5f1b
--- /dev/null
+++ b/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceaction.go
@@ -0,0 +1,128 @@
+package servicecatalog
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ServiceAction AWS CloudFormation Resource (AWS::ServiceCatalog::ServiceAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-serviceaction.html
+type ServiceAction struct {
+
+	// AcceptLanguage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-serviceaction.html#cfn-servicecatalog-serviceaction-acceptlanguage
+	AcceptLanguage *types.Value `json:"AcceptLanguage,omitempty"`
+
+	// Definition AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-serviceaction.html#cfn-servicecatalog-serviceaction-definition
+	Definition []ServiceAction_DefinitionParameter `json:"Definition,omitempty"`
+
+	// DefinitionType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-serviceaction.html#cfn-servicecatalog-serviceaction-definitiontype
+	DefinitionType *types.Value `json:"DefinitionType,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-serviceaction.html#cfn-servicecatalog-serviceaction-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-serviceaction.html#cfn-servicecatalog-serviceaction-name
+	Name *types.Value `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 *ServiceAction) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalog::ServiceAction"
+}
+
+// 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 ServiceAction) MarshalJSON() ([]byte, error) {
+	type Properties ServiceAction
+	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 *ServiceAction) UnmarshalJSON(b []byte) error {
+	type Properties ServiceAction
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ServiceAction(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceaction_definitionparameter.go b/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceaction_definitionparameter.go
new file mode 100644
index 0000000000..9e9b6607ad
--- /dev/null
+++ b/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceaction_definitionparameter.go
@@ -0,0 +1,42 @@
+package servicecatalog
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ServiceAction_DefinitionParameter AWS CloudFormation Resource (AWS::ServiceCatalog::ServiceAction.DefinitionParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicecatalog-serviceaction-definitionparameter.html
+type ServiceAction_DefinitionParameter struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicecatalog-serviceaction-definitionparameter.html#cfn-servicecatalog-serviceaction-definitionparameter-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicecatalog-serviceaction-definitionparameter.html#cfn-servicecatalog-serviceaction-definitionparameter-value
+	Value *types.Value `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 *ServiceAction_DefinitionParameter) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalog::ServiceAction.DefinitionParameter"
+}
diff --git a/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceactionassociation.go b/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceactionassociation.go
new file mode 100644
index 0000000000..6ad5cb476e
--- /dev/null
+++ b/goformation/cloudformation/servicecatalog/aws-servicecatalog-serviceactionassociation.go
@@ -0,0 +1,118 @@
+package servicecatalog
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ServiceActionAssociation AWS CloudFormation Resource (AWS::ServiceCatalog::ServiceActionAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-serviceactionassociation.html
+type ServiceActionAssociation struct {
+
+	// ProductId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-serviceactionassociation.html#cfn-servicecatalog-serviceactionassociation-productid
+	ProductId *types.Value `json:"ProductId,omitempty"`
+
+	// ProvisioningArtifactId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-serviceactionassociation.html#cfn-servicecatalog-serviceactionassociation-provisioningartifactid
+	ProvisioningArtifactId *types.Value `json:"ProvisioningArtifactId,omitempty"`
+
+	// ServiceActionId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-serviceactionassociation.html#cfn-servicecatalog-serviceactionassociation-serviceactionid
+	ServiceActionId *types.Value `json:"ServiceActionId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ServiceActionAssociation) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalog::ServiceActionAssociation"
+}
+
+// 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 ServiceActionAssociation) MarshalJSON() ([]byte, error) {
+	type Properties ServiceActionAssociation
+	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 *ServiceActionAssociation) UnmarshalJSON(b []byte) error {
+	type Properties ServiceActionAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ServiceActionAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicecatalog/aws-servicecatalog-stacksetconstraint.go b/goformation/cloudformation/servicecatalog/aws-servicecatalog-stacksetconstraint.go
new file mode 100644
index 0000000000..de751b5536
--- /dev/null
+++ b/goformation/cloudformation/servicecatalog/aws-servicecatalog-stacksetconstraint.go
@@ -0,0 +1,148 @@
+package servicecatalog
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StackSetConstraint AWS CloudFormation Resource (AWS::ServiceCatalog::StackSetConstraint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-stacksetconstraint.html
+type StackSetConstraint struct {
+
+	// AcceptLanguage AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-stacksetconstraint.html#cfn-servicecatalog-stacksetconstraint-acceptlanguage
+	AcceptLanguage *types.Value `json:"AcceptLanguage,omitempty"`
+
+	// AccountList AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-stacksetconstraint.html#cfn-servicecatalog-stacksetconstraint-accountlist
+	AccountList *types.Value `json:"AccountList,omitempty"`
+
+	// AdminRole AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-stacksetconstraint.html#cfn-servicecatalog-stacksetconstraint-adminrole
+	AdminRole *types.Value `json:"AdminRole,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-stacksetconstraint.html#cfn-servicecatalog-stacksetconstraint-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// ExecutionRole AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-stacksetconstraint.html#cfn-servicecatalog-stacksetconstraint-executionrole
+	ExecutionRole *types.Value `json:"ExecutionRole,omitempty"`
+
+	// PortfolioId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-stacksetconstraint.html#cfn-servicecatalog-stacksetconstraint-portfolioid
+	PortfolioId *types.Value `json:"PortfolioId,omitempty"`
+
+	// ProductId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-stacksetconstraint.html#cfn-servicecatalog-stacksetconstraint-productid
+	ProductId *types.Value `json:"ProductId,omitempty"`
+
+	// RegionList AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-stacksetconstraint.html#cfn-servicecatalog-stacksetconstraint-regionlist
+	RegionList *types.Value `json:"RegionList,omitempty"`
+
+	// StackInstanceControl AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-stacksetconstraint.html#cfn-servicecatalog-stacksetconstraint-stackinstancecontrol
+	StackInstanceControl *types.Value `json:"StackInstanceControl,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *StackSetConstraint) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalog::StackSetConstraint"
+}
+
+// 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 StackSetConstraint) MarshalJSON() ([]byte, error) {
+	type Properties StackSetConstraint
+	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 *StackSetConstraint) UnmarshalJSON(b []byte) error {
+	type Properties StackSetConstraint
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = StackSetConstraint(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicecatalog/aws-servicecatalog-tagoption.go b/goformation/cloudformation/servicecatalog/aws-servicecatalog-tagoption.go
new file mode 100644
index 0000000000..4c59c8acac
--- /dev/null
+++ b/goformation/cloudformation/servicecatalog/aws-servicecatalog-tagoption.go
@@ -0,0 +1,118 @@
+package servicecatalog
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TagOption AWS CloudFormation Resource (AWS::ServiceCatalog::TagOption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-tagoption.html
+type TagOption struct {
+
+	// Active AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-tagoption.html#cfn-servicecatalog-tagoption-active
+	Active *types.Value `json:"Active,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-tagoption.html#cfn-servicecatalog-tagoption-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-tagoption.html#cfn-servicecatalog-tagoption-value
+	Value *types.Value `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 *TagOption) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalog::TagOption"
+}
+
+// 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 TagOption) MarshalJSON() ([]byte, error) {
+	type Properties TagOption
+	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 *TagOption) UnmarshalJSON(b []byte) error {
+	type Properties TagOption
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TagOption(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicecatalog/aws-servicecatalog-tagoptionassociation.go b/goformation/cloudformation/servicecatalog/aws-servicecatalog-tagoptionassociation.go
new file mode 100644
index 0000000000..6c69896124
--- /dev/null
+++ b/goformation/cloudformation/servicecatalog/aws-servicecatalog-tagoptionassociation.go
@@ -0,0 +1,113 @@
+package servicecatalog
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TagOptionAssociation AWS CloudFormation Resource (AWS::ServiceCatalog::TagOptionAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-tagoptionassociation.html
+type TagOptionAssociation struct {
+
+	// ResourceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-tagoptionassociation.html#cfn-servicecatalog-tagoptionassociation-resourceid
+	ResourceId *types.Value `json:"ResourceId,omitempty"`
+
+	// TagOptionId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalog-tagoptionassociation.html#cfn-servicecatalog-tagoptionassociation-tagoptionid
+	TagOptionId *types.Value `json:"TagOptionId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TagOptionAssociation) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalog::TagOptionAssociation"
+}
+
+// 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 TagOptionAssociation) MarshalJSON() ([]byte, error) {
+	type Properties TagOptionAssociation
+	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 *TagOptionAssociation) UnmarshalJSON(b []byte) error {
+	type Properties TagOptionAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TagOptionAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-application.go b/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-application.go
new file mode 100644
index 0000000000..7e4562604a
--- /dev/null
+++ b/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-application.go
@@ -0,0 +1,118 @@
+package servicecatalogappregistry
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Application AWS CloudFormation Resource (AWS::ServiceCatalogAppRegistry::Application)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalogappregistry-application.html
+type Application struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalogappregistry-application.html#cfn-servicecatalogappregistry-application-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalogappregistry-application.html#cfn-servicecatalogappregistry-application-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalogappregistry-application.html#cfn-servicecatalogappregistry-application-tags
+	Tags map[string]*types.Value `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::ServiceCatalogAppRegistry::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroup.go b/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroup.go
new file mode 100644
index 0000000000..f7acbdc79d
--- /dev/null
+++ b/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroup.go
@@ -0,0 +1,123 @@
+package servicecatalogappregistry
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AttributeGroup AWS CloudFormation Resource (AWS::ServiceCatalogAppRegistry::AttributeGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalogappregistry-attributegroup.html
+type AttributeGroup struct {
+
+	// Attributes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalogappregistry-attributegroup.html#cfn-servicecatalogappregistry-attributegroup-attributes
+	Attributes interface{} `json:"Attributes,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalogappregistry-attributegroup.html#cfn-servicecatalogappregistry-attributegroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalogappregistry-attributegroup.html#cfn-servicecatalogappregistry-attributegroup-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalogappregistry-attributegroup.html#cfn-servicecatalogappregistry-attributegroup-tags
+	Tags map[string]*types.Value `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 *AttributeGroup) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalogAppRegistry::AttributeGroup"
+}
+
+// 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 AttributeGroup) MarshalJSON() ([]byte, error) {
+	type Properties AttributeGroup
+	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 *AttributeGroup) UnmarshalJSON(b []byte) error {
+	type Properties AttributeGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AttributeGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroupassociation.go b/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroupassociation.go
new file mode 100644
index 0000000000..c03095b176
--- /dev/null
+++ b/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-attributegroupassociation.go
@@ -0,0 +1,113 @@
+package servicecatalogappregistry
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AttributeGroupAssociation AWS CloudFormation Resource (AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalogappregistry-attributegroupassociation.html
+type AttributeGroupAssociation struct {
+
+	// Application AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalogappregistry-attributegroupassociation.html#cfn-servicecatalogappregistry-attributegroupassociation-application
+	Application *types.Value `json:"Application,omitempty"`
+
+	// AttributeGroup AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalogappregistry-attributegroupassociation.html#cfn-servicecatalogappregistry-attributegroupassociation-attributegroup
+	AttributeGroup *types.Value `json:"AttributeGroup,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AttributeGroupAssociation) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation"
+}
+
+// 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 AttributeGroupAssociation) MarshalJSON() ([]byte, error) {
+	type Properties AttributeGroupAssociation
+	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 *AttributeGroupAssociation) UnmarshalJSON(b []byte) error {
+	type Properties AttributeGroupAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AttributeGroupAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-resourceassociation.go b/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-resourceassociation.go
new file mode 100644
index 0000000000..bb9dff5546
--- /dev/null
+++ b/goformation/cloudformation/servicecatalogappregistry/aws-servicecatalogappregistry-resourceassociation.go
@@ -0,0 +1,118 @@
+package servicecatalogappregistry
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceAssociation AWS CloudFormation Resource (AWS::ServiceCatalogAppRegistry::ResourceAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalogappregistry-resourceassociation.html
+type ResourceAssociation struct {
+
+	// Application AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalogappregistry-resourceassociation.html#cfn-servicecatalogappregistry-resourceassociation-application
+	Application *types.Value `json:"Application,omitempty"`
+
+	// Resource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalogappregistry-resourceassociation.html#cfn-servicecatalogappregistry-resourceassociation-resource
+	Resource *types.Value `json:"Resource,omitempty"`
+
+	// ResourceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicecatalogappregistry-resourceassociation.html#cfn-servicecatalogappregistry-resourceassociation-resourcetype
+	ResourceType *types.Value `json:"ResourceType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceAssociation) AWSCloudFormationType() string {
+	return "AWS::ServiceCatalogAppRegistry::ResourceAssociation"
+}
+
+// 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 ResourceAssociation) MarshalJSON() ([]byte, error) {
+	type Properties ResourceAssociation
+	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 *ResourceAssociation) UnmarshalJSON(b []byte) error {
+	type Properties ResourceAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResourceAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicediscovery/aws-servicediscovery-httpnamespace.go b/goformation/cloudformation/servicediscovery/aws-servicediscovery-httpnamespace.go
new file mode 100644
index 0000000000..fe0464b4c9
--- /dev/null
+++ b/goformation/cloudformation/servicediscovery/aws-servicediscovery-httpnamespace.go
@@ -0,0 +1,119 @@
+package servicediscovery
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// HttpNamespace AWS CloudFormation Resource (AWS::ServiceDiscovery::HttpNamespace)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-httpnamespace.html
+type HttpNamespace struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-httpnamespace.html#cfn-servicediscovery-httpnamespace-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-httpnamespace.html#cfn-servicediscovery-httpnamespace-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-httpnamespace.html#cfn-servicediscovery-httpnamespace-tags
+	Tags []cloudformation.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 *HttpNamespace) AWSCloudFormationType() string {
+	return "AWS::ServiceDiscovery::HttpNamespace"
+}
+
+// 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 HttpNamespace) MarshalJSON() ([]byte, error) {
+	type Properties HttpNamespace
+	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 *HttpNamespace) UnmarshalJSON(b []byte) error {
+	type Properties HttpNamespace
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = HttpNamespace(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicediscovery/aws-servicediscovery-instance.go b/goformation/cloudformation/servicediscovery/aws-servicediscovery-instance.go
new file mode 100644
index 0000000000..9535bf50e4
--- /dev/null
+++ b/goformation/cloudformation/servicediscovery/aws-servicediscovery-instance.go
@@ -0,0 +1,118 @@
+package servicediscovery
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Instance AWS CloudFormation Resource (AWS::ServiceDiscovery::Instance)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-instance.html
+type Instance struct {
+
+	// InstanceAttributes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-instance.html#cfn-servicediscovery-instance-instanceattributes
+	InstanceAttributes interface{} `json:"InstanceAttributes,omitempty"`
+
+	// InstanceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-instance.html#cfn-servicediscovery-instance-instanceid
+	InstanceId *types.Value `json:"InstanceId,omitempty"`
+
+	// ServiceId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-instance.html#cfn-servicediscovery-instance-serviceid
+	ServiceId *types.Value `json:"ServiceId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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::ServiceDiscovery::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           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		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 {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace.go b/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace.go
new file mode 100644
index 0000000000..562e7523f3
--- /dev/null
+++ b/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace.go
@@ -0,0 +1,129 @@
+package servicediscovery
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// PrivateDnsNamespace AWS CloudFormation Resource (AWS::ServiceDiscovery::PrivateDnsNamespace)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-privatednsnamespace.html
+type PrivateDnsNamespace struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-privatednsnamespace.html#cfn-servicediscovery-privatednsnamespace-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-privatednsnamespace.html#cfn-servicediscovery-privatednsnamespace-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Properties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-privatednsnamespace.html#cfn-servicediscovery-privatednsnamespace-properties
+	Properties *PrivateDnsNamespace_Properties `json:"Properties,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-privatednsnamespace.html#cfn-servicediscovery-privatednsnamespace-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Vpc AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-privatednsnamespace.html#cfn-servicediscovery-privatednsnamespace-vpc
+	Vpc *types.Value `json:"Vpc,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PrivateDnsNamespace) AWSCloudFormationType() string {
+	return "AWS::ServiceDiscovery::PrivateDnsNamespace"
+}
+
+// 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 PrivateDnsNamespace) MarshalJSON() ([]byte, error) {
+	type Properties PrivateDnsNamespace
+	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 *PrivateDnsNamespace) UnmarshalJSON(b []byte) error {
+	type Properties PrivateDnsNamespace
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PrivateDnsNamespace(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_privatednspropertiesmutable.go b/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_privatednspropertiesmutable.go
new file mode 100644
index 0000000000..dede7ed366
--- /dev/null
+++ b/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_privatednspropertiesmutable.go
@@ -0,0 +1,35 @@
+package servicediscovery
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// PrivateDnsNamespace_PrivateDnsPropertiesMutable AWS CloudFormation Resource (AWS::ServiceDiscovery::PrivateDnsNamespace.PrivateDnsPropertiesMutable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-privatednsnamespace-privatednspropertiesmutable.html
+type PrivateDnsNamespace_PrivateDnsPropertiesMutable struct {
+
+	// SOA AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-privatednsnamespace-privatednspropertiesmutable.html#cfn-servicediscovery-privatednsnamespace-privatednspropertiesmutable-soa
+	SOA *PrivateDnsNamespace_SOA `json:"SOA,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PrivateDnsNamespace_PrivateDnsPropertiesMutable) AWSCloudFormationType() string {
+	return "AWS::ServiceDiscovery::PrivateDnsNamespace.PrivateDnsPropertiesMutable"
+}
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_properties.go b/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_properties.go
new file mode 100644
index 0000000000..41a2baed54
--- /dev/null
+++ b/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_properties.go
@@ -0,0 +1,35 @@
+package servicediscovery
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// PrivateDnsNamespace_Properties AWS CloudFormation Resource (AWS::ServiceDiscovery::PrivateDnsNamespace.Properties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-privatednsnamespace-properties.html
+type PrivateDnsNamespace_Properties struct {
+
+	// DnsProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-privatednsnamespace-properties.html#cfn-servicediscovery-privatednsnamespace-properties-dnsproperties
+	DnsProperties *PrivateDnsNamespace_PrivateDnsPropertiesMutable `json:"DnsProperties,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PrivateDnsNamespace_Properties) AWSCloudFormationType() string {
+	return "AWS::ServiceDiscovery::PrivateDnsNamespace.Properties"
+}
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_soa.go b/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_soa.go
new file mode 100644
index 0000000000..b3953f3653
--- /dev/null
+++ b/goformation/cloudformation/servicediscovery/aws-servicediscovery-privatednsnamespace_soa.go
@@ -0,0 +1,37 @@
+package servicediscovery
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PrivateDnsNamespace_SOA AWS CloudFormation Resource (AWS::ServiceDiscovery::PrivateDnsNamespace.SOA)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-privatednsnamespace-soa.html
+type PrivateDnsNamespace_SOA struct {
+
+	// TTL AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-privatednsnamespace-soa.html#cfn-servicediscovery-privatednsnamespace-soa-ttl
+	TTL *types.Value `json:"TTL,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PrivateDnsNamespace_SOA) AWSCloudFormationType() string {
+	return "AWS::ServiceDiscovery::PrivateDnsNamespace.SOA"
+}
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace.go b/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace.go
new file mode 100644
index 0000000000..9df9bbbf5e
--- /dev/null
+++ b/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace.go
@@ -0,0 +1,124 @@
+package servicediscovery
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// PublicDnsNamespace AWS CloudFormation Resource (AWS::ServiceDiscovery::PublicDnsNamespace)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-publicdnsnamespace.html
+type PublicDnsNamespace struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-publicdnsnamespace.html#cfn-servicediscovery-publicdnsnamespace-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-publicdnsnamespace.html#cfn-servicediscovery-publicdnsnamespace-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Properties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-publicdnsnamespace.html#cfn-servicediscovery-publicdnsnamespace-properties
+	Properties *PublicDnsNamespace_Properties `json:"Properties,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-publicdnsnamespace.html#cfn-servicediscovery-publicdnsnamespace-tags
+	Tags []cloudformation.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 *PublicDnsNamespace) AWSCloudFormationType() string {
+	return "AWS::ServiceDiscovery::PublicDnsNamespace"
+}
+
+// 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 PublicDnsNamespace) MarshalJSON() ([]byte, error) {
+	type Properties PublicDnsNamespace
+	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 *PublicDnsNamespace) UnmarshalJSON(b []byte) error {
+	type Properties PublicDnsNamespace
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PublicDnsNamespace(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_properties.go b/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_properties.go
new file mode 100644
index 0000000000..ff8100fc38
--- /dev/null
+++ b/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_properties.go
@@ -0,0 +1,35 @@
+package servicediscovery
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// PublicDnsNamespace_Properties AWS CloudFormation Resource (AWS::ServiceDiscovery::PublicDnsNamespace.Properties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-publicdnsnamespace-properties.html
+type PublicDnsNamespace_Properties struct {
+
+	// DnsProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-publicdnsnamespace-properties.html#cfn-servicediscovery-publicdnsnamespace-properties-dnsproperties
+	DnsProperties *PublicDnsNamespace_PublicDnsPropertiesMutable `json:"DnsProperties,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PublicDnsNamespace_Properties) AWSCloudFormationType() string {
+	return "AWS::ServiceDiscovery::PublicDnsNamespace.Properties"
+}
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_publicdnspropertiesmutable.go b/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_publicdnspropertiesmutable.go
new file mode 100644
index 0000000000..5f32b16ad6
--- /dev/null
+++ b/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_publicdnspropertiesmutable.go
@@ -0,0 +1,35 @@
+package servicediscovery
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// PublicDnsNamespace_PublicDnsPropertiesMutable AWS CloudFormation Resource (AWS::ServiceDiscovery::PublicDnsNamespace.PublicDnsPropertiesMutable)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-publicdnsnamespace-publicdnspropertiesmutable.html
+type PublicDnsNamespace_PublicDnsPropertiesMutable struct {
+
+	// SOA AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-publicdnsnamespace-publicdnspropertiesmutable.html#cfn-servicediscovery-publicdnsnamespace-publicdnspropertiesmutable-soa
+	SOA *PublicDnsNamespace_SOA `json:"SOA,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PublicDnsNamespace_PublicDnsPropertiesMutable) AWSCloudFormationType() string {
+	return "AWS::ServiceDiscovery::PublicDnsNamespace.PublicDnsPropertiesMutable"
+}
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_soa.go b/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_soa.go
new file mode 100644
index 0000000000..92699dcb34
--- /dev/null
+++ b/goformation/cloudformation/servicediscovery/aws-servicediscovery-publicdnsnamespace_soa.go
@@ -0,0 +1,37 @@
+package servicediscovery
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PublicDnsNamespace_SOA AWS CloudFormation Resource (AWS::ServiceDiscovery::PublicDnsNamespace.SOA)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-publicdnsnamespace-soa.html
+type PublicDnsNamespace_SOA struct {
+
+	// TTL AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-publicdnsnamespace-soa.html#cfn-servicediscovery-publicdnsnamespace-soa-ttl
+	TTL *types.Value `json:"TTL,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PublicDnsNamespace_SOA) AWSCloudFormationType() string {
+	return "AWS::ServiceDiscovery::PublicDnsNamespace.SOA"
+}
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-service.go b/goformation/cloudformation/servicediscovery/aws-servicediscovery-service.go
new file mode 100644
index 0000000000..af4246596f
--- /dev/null
+++ b/goformation/cloudformation/servicediscovery/aws-servicediscovery-service.go
@@ -0,0 +1,144 @@
+package servicediscovery
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service AWS CloudFormation Resource (AWS::ServiceDiscovery::Service)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html
+type Service struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html#cfn-servicediscovery-service-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DnsConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html#cfn-servicediscovery-service-dnsconfig
+	DnsConfig *Service_DnsConfig `json:"DnsConfig,omitempty"`
+
+	// HealthCheckConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html#cfn-servicediscovery-service-healthcheckconfig
+	HealthCheckConfig *Service_HealthCheckConfig `json:"HealthCheckConfig,omitempty"`
+
+	// HealthCheckCustomConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html#cfn-servicediscovery-service-healthcheckcustomconfig
+	HealthCheckCustomConfig *Service_HealthCheckCustomConfig `json:"HealthCheckCustomConfig,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html#cfn-servicediscovery-service-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// NamespaceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html#cfn-servicediscovery-service-namespaceid
+	NamespaceId *types.Value `json:"NamespaceId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html#cfn-servicediscovery-service-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-servicediscovery-service.html#cfn-servicediscovery-service-type
+	Type *types.Value `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 *Service) AWSCloudFormationType() string {
+	return "AWS::ServiceDiscovery::Service"
+}
+
+// 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 Service) MarshalJSON() ([]byte, error) {
+	type Properties Service
+	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 *Service) UnmarshalJSON(b []byte) error {
+	type Properties Service
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Service(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_dnsconfig.go b/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_dnsconfig.go
new file mode 100644
index 0000000000..55e5359f05
--- /dev/null
+++ b/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_dnsconfig.go
@@ -0,0 +1,47 @@
+package servicediscovery
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_DnsConfig AWS CloudFormation Resource (AWS::ServiceDiscovery::Service.DnsConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-service-dnsconfig.html
+type Service_DnsConfig struct {
+
+	// DnsRecords AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-service-dnsconfig.html#cfn-servicediscovery-service-dnsconfig-dnsrecords
+	DnsRecords []Service_DnsRecord `json:"DnsRecords,omitempty"`
+
+	// NamespaceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-service-dnsconfig.html#cfn-servicediscovery-service-dnsconfig-namespaceid
+	NamespaceId *types.Value `json:"NamespaceId,omitempty"`
+
+	// RoutingPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-service-dnsconfig.html#cfn-servicediscovery-service-dnsconfig-routingpolicy
+	RoutingPolicy *types.Value `json:"RoutingPolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service_DnsConfig) AWSCloudFormationType() string {
+	return "AWS::ServiceDiscovery::Service.DnsConfig"
+}
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_dnsrecord.go b/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_dnsrecord.go
new file mode 100644
index 0000000000..88c3fb97ce
--- /dev/null
+++ b/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_dnsrecord.go
@@ -0,0 +1,42 @@
+package servicediscovery
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_DnsRecord AWS CloudFormation Resource (AWS::ServiceDiscovery::Service.DnsRecord)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-service-dnsrecord.html
+type Service_DnsRecord struct {
+
+	// TTL AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-service-dnsrecord.html#cfn-servicediscovery-service-dnsrecord-ttl
+	TTL *types.Value `json:"TTL"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-service-dnsrecord.html#cfn-servicediscovery-service-dnsrecord-type
+	Type *types.Value `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 *Service_DnsRecord) AWSCloudFormationType() string {
+	return "AWS::ServiceDiscovery::Service.DnsRecord"
+}
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckconfig.go b/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckconfig.go
new file mode 100644
index 0000000000..4597ee7a55
--- /dev/null
+++ b/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckconfig.go
@@ -0,0 +1,47 @@
+package servicediscovery
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_HealthCheckConfig AWS CloudFormation Resource (AWS::ServiceDiscovery::Service.HealthCheckConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-service-healthcheckconfig.html
+type Service_HealthCheckConfig struct {
+
+	// FailureThreshold AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-service-healthcheckconfig.html#cfn-servicediscovery-service-healthcheckconfig-failurethreshold
+	FailureThreshold *types.Value `json:"FailureThreshold,omitempty"`
+
+	// ResourcePath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-service-healthcheckconfig.html#cfn-servicediscovery-service-healthcheckconfig-resourcepath
+	ResourcePath *types.Value `json:"ResourcePath,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-service-healthcheckconfig.html#cfn-servicediscovery-service-healthcheckconfig-type
+	Type *types.Value `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 *Service_HealthCheckConfig) AWSCloudFormationType() string {
+	return "AWS::ServiceDiscovery::Service.HealthCheckConfig"
+}
diff --git a/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckcustomconfig.go b/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckcustomconfig.go
new file mode 100644
index 0000000000..d8db20fed2
--- /dev/null
+++ b/goformation/cloudformation/servicediscovery/aws-servicediscovery-service_healthcheckcustomconfig.go
@@ -0,0 +1,37 @@
+package servicediscovery
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Service_HealthCheckCustomConfig AWS CloudFormation Resource (AWS::ServiceDiscovery::Service.HealthCheckCustomConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-service-healthcheckcustomconfig.html
+type Service_HealthCheckCustomConfig struct {
+
+	// FailureThreshold AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-servicediscovery-service-healthcheckcustomconfig.html#cfn-servicediscovery-service-healthcheckcustomconfig-failurethreshold
+	FailureThreshold *types.Value `json:"FailureThreshold,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Service_HealthCheckCustomConfig) AWSCloudFormationType() string {
+	return "AWS::ServiceDiscovery::Service.HealthCheckCustomConfig"
+}
diff --git a/goformation/cloudformation/ses/aws-ses-configurationset.go b/goformation/cloudformation/ses/aws-ses-configurationset.go
new file mode 100644
index 0000000000..127f317687
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-configurationset.go
@@ -0,0 +1,108 @@
+package ses
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationSet AWS CloudFormation Resource (AWS::SES::ConfigurationSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-configurationset.html
+type ConfigurationSet struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-configurationset.html#cfn-ses-configurationset-name
+	Name *types.Value `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 *ConfigurationSet) AWSCloudFormationType() string {
+	return "AWS::SES::ConfigurationSet"
+}
+
+// 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 ConfigurationSet) MarshalJSON() ([]byte, error) {
+	type Properties ConfigurationSet
+	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 *ConfigurationSet) UnmarshalJSON(b []byte) error {
+	type Properties ConfigurationSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ConfigurationSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ses/aws-ses-configurationseteventdestination.go b/goformation/cloudformation/ses/aws-ses-configurationseteventdestination.go
new file mode 100644
index 0000000000..8131d3382b
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-configurationseteventdestination.go
@@ -0,0 +1,113 @@
+package ses
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationSetEventDestination AWS CloudFormation Resource (AWS::SES::ConfigurationSetEventDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-configurationseteventdestination.html
+type ConfigurationSetEventDestination struct {
+
+	// ConfigurationSetName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-configurationseteventdestination.html#cfn-ses-configurationseteventdestination-configurationsetname
+	ConfigurationSetName *types.Value `json:"ConfigurationSetName,omitempty"`
+
+	// EventDestination AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-configurationseteventdestination.html#cfn-ses-configurationseteventdestination-eventdestination
+	EventDestination *ConfigurationSetEventDestination_EventDestination `json:"EventDestination,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::SES::ConfigurationSetEventDestination"
+}
+
+// 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 ConfigurationSetEventDestination) MarshalJSON() ([]byte, error) {
+	type Properties ConfigurationSetEventDestination
+	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 *ConfigurationSetEventDestination) UnmarshalJSON(b []byte) error {
+	type Properties ConfigurationSetEventDestination
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ConfigurationSetEventDestination(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_cloudwatchdestination.go b/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_cloudwatchdestination.go
new file mode 100644
index 0000000000..f0a671b5f6
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_cloudwatchdestination.go
@@ -0,0 +1,35 @@
+package ses
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationSetEventDestination_CloudWatchDestination AWS CloudFormation Resource (AWS::SES::ConfigurationSetEventDestination.CloudWatchDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-cloudwatchdestination.html
+type ConfigurationSetEventDestination_CloudWatchDestination struct {
+
+	// DimensionConfigurations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-cloudwatchdestination.html#cfn-ses-configurationseteventdestination-cloudwatchdestination-dimensionconfigurations
+	DimensionConfigurations []ConfigurationSetEventDestination_DimensionConfiguration `json:"DimensionConfigurations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CloudWatchDestination) AWSCloudFormationType() string {
+	return "AWS::SES::ConfigurationSetEventDestination.CloudWatchDestination"
+}
diff --git a/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_dimensionconfiguration.go b/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_dimensionconfiguration.go
new file mode 100644
index 0000000000..4ea3acbd24
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_dimensionconfiguration.go
@@ -0,0 +1,47 @@
+package ses
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationSetEventDestination_DimensionConfiguration AWS CloudFormation Resource (AWS::SES::ConfigurationSetEventDestination.DimensionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-dimensionconfiguration.html
+type ConfigurationSetEventDestination_DimensionConfiguration struct {
+
+	// DefaultDimensionValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-dimensionconfiguration.html#cfn-ses-configurationseteventdestination-dimensionconfiguration-defaultdimensionvalue
+	DefaultDimensionValue *types.Value `json:"DefaultDimensionValue,omitempty"`
+
+	// DimensionName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-dimensionconfiguration.html#cfn-ses-configurationseteventdestination-dimensionconfiguration-dimensionname
+	DimensionName *types.Value `json:"DimensionName,omitempty"`
+
+	// DimensionValueSource AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-dimensionconfiguration.html#cfn-ses-configurationseteventdestination-dimensionconfiguration-dimensionvaluesource
+	DimensionValueSource *types.Value `json:"DimensionValueSource,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DimensionConfiguration) AWSCloudFormationType() string {
+	return "AWS::SES::ConfigurationSetEventDestination.DimensionConfiguration"
+}
diff --git a/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_eventdestination.go b/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_eventdestination.go
new file mode 100644
index 0000000000..ce5cb58f66
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_eventdestination.go
@@ -0,0 +1,57 @@
+package ses
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationSetEventDestination_EventDestination AWS CloudFormation Resource (AWS::SES::ConfigurationSetEventDestination.EventDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-eventdestination.html
+type ConfigurationSetEventDestination_EventDestination struct {
+
+	// CloudWatchDestination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-eventdestination.html#cfn-ses-configurationseteventdestination-eventdestination-cloudwatchdestination
+	CloudWatchDestination *ConfigurationSetEventDestination_CloudWatchDestination `json:"CloudWatchDestination,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-eventdestination.html#cfn-ses-configurationseteventdestination-eventdestination-enabled
+	Enabled *types.Value `json:"Enabled,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
+	KinesisFirehoseDestination *ConfigurationSetEventDestination_KinesisFirehoseDestination `json:"KinesisFirehoseDestination,omitempty"`
+
+	// MatchingEventTypes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-eventdestination.html#cfn-ses-configurationseteventdestination-eventdestination-matchingeventtypes
+	MatchingEventTypes *types.Value `json:"MatchingEventTypes,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-eventdestination.html#cfn-ses-configurationseteventdestination-eventdestination-name
+	Name *types.Value `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 *ConfigurationSetEventDestination_EventDestination) AWSCloudFormationType() string {
+	return "AWS::SES::ConfigurationSetEventDestination.EventDestination"
+}
diff --git a/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_kinesisfirehosedestination.go b/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_kinesisfirehosedestination.go
new file mode 100644
index 0000000000..2b95eb3be4
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-configurationseteventdestination_kinesisfirehosedestination.go
@@ -0,0 +1,42 @@
+package ses
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConfigurationSetEventDestination_KinesisFirehoseDestination AWS CloudFormation Resource (AWS::SES::ConfigurationSetEventDestination.KinesisFirehoseDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-kinesisfirehosedestination.html
+type ConfigurationSetEventDestination_KinesisFirehoseDestination struct {
+
+	// DeliveryStreamARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-kinesisfirehosedestination.html#cfn-ses-configurationseteventdestination-kinesisfirehosedestination-deliverystreamarn
+	DeliveryStreamARN *types.Value `json:"DeliveryStreamARN,omitempty"`
+
+	// IAMRoleARN AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-configurationseteventdestination-kinesisfirehosedestination.html#cfn-ses-configurationseteventdestination-kinesisfirehosedestination-iamrolearn
+	IAMRoleARN *types.Value `json:"IAMRoleARN,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_KinesisFirehoseDestination) AWSCloudFormationType() string {
+	return "AWS::SES::ConfigurationSetEventDestination.KinesisFirehoseDestination"
+}
diff --git a/goformation/cloudformation/ses/aws-ses-contactlist.go b/goformation/cloudformation/ses/aws-ses-contactlist.go
new file mode 100644
index 0000000000..e1621db37a
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-contactlist.go
@@ -0,0 +1,124 @@
+package ses
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ContactList AWS CloudFormation Resource (AWS::SES::ContactList)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-contactlist.html
+type ContactList struct {
+
+	// ContactListName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-contactlist.html#cfn-ses-contactlist-contactlistname
+	ContactListName *types.Value `json:"ContactListName,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-contactlist.html#cfn-ses-contactlist-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-contactlist.html#cfn-ses-contactlist-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Topics AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-contactlist.html#cfn-ses-contactlist-topics
+	Topics []ContactList_Topic `json:"Topics,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ContactList) AWSCloudFormationType() string {
+	return "AWS::SES::ContactList"
+}
+
+// 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 ContactList) MarshalJSON() ([]byte, error) {
+	type Properties ContactList
+	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 *ContactList) UnmarshalJSON(b []byte) error {
+	type Properties ContactList
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ContactList(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ses/aws-ses-contactlist_topic.go b/goformation/cloudformation/ses/aws-ses-contactlist_topic.go
new file mode 100644
index 0000000000..135f470380
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-contactlist_topic.go
@@ -0,0 +1,52 @@
+package ses
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ContactList_Topic AWS CloudFormation Resource (AWS::SES::ContactList.Topic)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-contactlist-topic.html
+type ContactList_Topic struct {
+
+	// DefaultSubscriptionStatus AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-contactlist-topic.html#cfn-ses-contactlist-topic-defaultsubscriptionstatus
+	DefaultSubscriptionStatus *types.Value `json:"DefaultSubscriptionStatus,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-contactlist-topic.html#cfn-ses-contactlist-topic-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// DisplayName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-contactlist-topic.html#cfn-ses-contactlist-topic-displayname
+	DisplayName *types.Value `json:"DisplayName,omitempty"`
+
+	// TopicName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-contactlist-topic.html#cfn-ses-contactlist-topic-topicname
+	TopicName *types.Value `json:"TopicName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ContactList_Topic) AWSCloudFormationType() string {
+	return "AWS::SES::ContactList.Topic"
+}
diff --git a/goformation/cloudformation/ses/aws-ses-receiptfilter.go b/goformation/cloudformation/ses/aws-ses-receiptfilter.go
new file mode 100644
index 0000000000..73d3670f1f
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-receiptfilter.go
@@ -0,0 +1,106 @@
+package ses
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReceiptFilter AWS CloudFormation Resource (AWS::SES::ReceiptFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-receiptfilter.html
+type ReceiptFilter struct {
+
+	// Filter AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-receiptfilter.html#cfn-ses-receiptfilter-filter
+	Filter *ReceiptFilter_Filter `json:"Filter,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReceiptFilter) AWSCloudFormationType() string {
+	return "AWS::SES::ReceiptFilter"
+}
+
+// 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 ReceiptFilter) MarshalJSON() ([]byte, error) {
+	type Properties ReceiptFilter
+	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 *ReceiptFilter) UnmarshalJSON(b []byte) error {
+	type Properties ReceiptFilter
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ReceiptFilter(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ses/aws-ses-receiptfilter_filter.go b/goformation/cloudformation/ses/aws-ses-receiptfilter_filter.go
new file mode 100644
index 0000000000..f688b63716
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-receiptfilter_filter.go
@@ -0,0 +1,42 @@
+package ses
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReceiptFilter_Filter AWS CloudFormation Resource (AWS::SES::ReceiptFilter.Filter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptfilter-filter.html
+type ReceiptFilter_Filter struct {
+
+	// IpFilter AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptfilter-filter.html#cfn-ses-receiptfilter-filter-ipfilter
+	IpFilter *ReceiptFilter_IpFilter `json:"IpFilter,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptfilter-filter.html#cfn-ses-receiptfilter-filter-name
+	Name *types.Value `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 *ReceiptFilter_Filter) AWSCloudFormationType() string {
+	return "AWS::SES::ReceiptFilter.Filter"
+}
diff --git a/goformation/cloudformation/ses/aws-ses-receiptfilter_ipfilter.go b/goformation/cloudformation/ses/aws-ses-receiptfilter_ipfilter.go
new file mode 100644
index 0000000000..ec84021dc7
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-receiptfilter_ipfilter.go
@@ -0,0 +1,42 @@
+package ses
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReceiptFilter_IpFilter AWS CloudFormation Resource (AWS::SES::ReceiptFilter.IpFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptfilter-ipfilter.html
+type ReceiptFilter_IpFilter struct {
+
+	// Cidr AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptfilter-ipfilter.html#cfn-ses-receiptfilter-ipfilter-cidr
+	Cidr *types.Value `json:"Cidr,omitempty"`
+
+	// Policy AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptfilter-ipfilter.html#cfn-ses-receiptfilter-ipfilter-policy
+	Policy *types.Value `json:"Policy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReceiptFilter_IpFilter) AWSCloudFormationType() string {
+	return "AWS::SES::ReceiptFilter.IpFilter"
+}
diff --git a/goformation/cloudformation/ses/aws-ses-receiptrule.go b/goformation/cloudformation/ses/aws-ses-receiptrule.go
new file mode 100644
index 0000000000..5c7ae112cf
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-receiptrule.go
@@ -0,0 +1,118 @@
+package ses
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReceiptRule AWS CloudFormation Resource (AWS::SES::ReceiptRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-receiptrule.html
+type ReceiptRule struct {
+
+	// After AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-receiptrule.html#cfn-ses-receiptrule-after
+	After *types.Value `json:"After,omitempty"`
+
+	// Rule AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-receiptrule.html#cfn-ses-receiptrule-rule
+	Rule *ReceiptRule_Rule `json:"Rule,omitempty"`
+
+	// RuleSetName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-receiptrule.html#cfn-ses-receiptrule-rulesetname
+	RuleSetName *types.Value `json:"RuleSetName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReceiptRule) AWSCloudFormationType() string {
+	return "AWS::SES::ReceiptRule"
+}
+
+// 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 ReceiptRule) MarshalJSON() ([]byte, error) {
+	type Properties ReceiptRule
+	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 *ReceiptRule) UnmarshalJSON(b []byte) error {
+	type Properties ReceiptRule
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ReceiptRule(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ses/aws-ses-receiptrule_action.go b/goformation/cloudformation/ses/aws-ses-receiptrule_action.go
new file mode 100644
index 0000000000..349e33b1da
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-receiptrule_action.go
@@ -0,0 +1,65 @@
+package ses
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReceiptRule_Action AWS CloudFormation Resource (AWS::SES::ReceiptRule.Action)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-action.html
+type ReceiptRule_Action struct {
+
+	// AddHeaderAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-action.html#cfn-ses-receiptrule-action-addheaderaction
+	AddHeaderAction *ReceiptRule_AddHeaderAction `json:"AddHeaderAction,omitempty"`
+
+	// BounceAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-action.html#cfn-ses-receiptrule-action-bounceaction
+	BounceAction *ReceiptRule_BounceAction `json:"BounceAction,omitempty"`
+
+	// LambdaAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-action.html#cfn-ses-receiptrule-action-lambdaaction
+	LambdaAction *ReceiptRule_LambdaAction `json:"LambdaAction,omitempty"`
+
+	// S3Action AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-action.html#cfn-ses-receiptrule-action-s3action
+	S3Action *ReceiptRule_S3Action `json:"S3Action,omitempty"`
+
+	// SNSAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-action.html#cfn-ses-receiptrule-action-snsaction
+	SNSAction *ReceiptRule_SNSAction `json:"SNSAction,omitempty"`
+
+	// StopAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-action.html#cfn-ses-receiptrule-action-stopaction
+	StopAction *ReceiptRule_StopAction `json:"StopAction,omitempty"`
+
+	// WorkmailAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-action.html#cfn-ses-receiptrule-action-workmailaction
+	WorkmailAction *ReceiptRule_WorkmailAction `json:"WorkmailAction,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReceiptRule_Action) AWSCloudFormationType() string {
+	return "AWS::SES::ReceiptRule.Action"
+}
diff --git a/goformation/cloudformation/ses/aws-ses-receiptrule_addheaderaction.go b/goformation/cloudformation/ses/aws-ses-receiptrule_addheaderaction.go
new file mode 100644
index 0000000000..28c225cf89
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-receiptrule_addheaderaction.go
@@ -0,0 +1,42 @@
+package ses
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReceiptRule_AddHeaderAction AWS CloudFormation Resource (AWS::SES::ReceiptRule.AddHeaderAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-addheaderaction.html
+type ReceiptRule_AddHeaderAction struct {
+
+	// HeaderName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-addheaderaction.html#cfn-ses-receiptrule-addheaderaction-headername
+	HeaderName *types.Value `json:"HeaderName,omitempty"`
+
+	// HeaderValue AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-addheaderaction.html#cfn-ses-receiptrule-addheaderaction-headervalue
+	HeaderValue *types.Value `json:"HeaderValue,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReceiptRule_AddHeaderAction) AWSCloudFormationType() string {
+	return "AWS::SES::ReceiptRule.AddHeaderAction"
+}
diff --git a/goformation/cloudformation/ses/aws-ses-receiptrule_bounceaction.go b/goformation/cloudformation/ses/aws-ses-receiptrule_bounceaction.go
new file mode 100644
index 0000000000..14cbb32783
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-receiptrule_bounceaction.go
@@ -0,0 +1,57 @@
+package ses
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReceiptRule_BounceAction AWS CloudFormation Resource (AWS::SES::ReceiptRule.BounceAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-bounceaction.html
+type ReceiptRule_BounceAction struct {
+
+	// Message AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-bounceaction.html#cfn-ses-receiptrule-bounceaction-message
+	Message *types.Value `json:"Message,omitempty"`
+
+	// Sender AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-bounceaction.html#cfn-ses-receiptrule-bounceaction-sender
+	Sender *types.Value `json:"Sender,omitempty"`
+
+	// SmtpReplyCode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-bounceaction.html#cfn-ses-receiptrule-bounceaction-smtpreplycode
+	SmtpReplyCode *types.Value `json:"SmtpReplyCode,omitempty"`
+
+	// StatusCode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-bounceaction.html#cfn-ses-receiptrule-bounceaction-statuscode
+	StatusCode *types.Value `json:"StatusCode,omitempty"`
+
+	// TopicArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-bounceaction.html#cfn-ses-receiptrule-bounceaction-topicarn
+	TopicArn *types.Value `json:"TopicArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReceiptRule_BounceAction) AWSCloudFormationType() string {
+	return "AWS::SES::ReceiptRule.BounceAction"
+}
diff --git a/goformation/cloudformation/ses/aws-ses-receiptrule_lambdaaction.go b/goformation/cloudformation/ses/aws-ses-receiptrule_lambdaaction.go
new file mode 100644
index 0000000000..2980ca2364
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-receiptrule_lambdaaction.go
@@ -0,0 +1,47 @@
+package ses
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReceiptRule_LambdaAction AWS CloudFormation Resource (AWS::SES::ReceiptRule.LambdaAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-lambdaaction.html
+type ReceiptRule_LambdaAction struct {
+
+	// FunctionArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-lambdaaction.html#cfn-ses-receiptrule-lambdaaction-functionarn
+	FunctionArn *types.Value `json:"FunctionArn,omitempty"`
+
+	// InvocationType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-lambdaaction.html#cfn-ses-receiptrule-lambdaaction-invocationtype
+	InvocationType *types.Value `json:"InvocationType,omitempty"`
+
+	// TopicArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-lambdaaction.html#cfn-ses-receiptrule-lambdaaction-topicarn
+	TopicArn *types.Value `json:"TopicArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReceiptRule_LambdaAction) AWSCloudFormationType() string {
+	return "AWS::SES::ReceiptRule.LambdaAction"
+}
diff --git a/goformation/cloudformation/ses/aws-ses-receiptrule_rule.go b/goformation/cloudformation/ses/aws-ses-receiptrule_rule.go
new file mode 100644
index 0000000000..18bb2513cc
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-receiptrule_rule.go
@@ -0,0 +1,62 @@
+package ses
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReceiptRule_Rule AWS CloudFormation Resource (AWS::SES::ReceiptRule.Rule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-rule.html
+type ReceiptRule_Rule struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-rule.html#cfn-ses-receiptrule-rule-actions
+	Actions []ReceiptRule_Action `json:"Actions,omitempty"`
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-rule.html#cfn-ses-receiptrule-rule-enabled
+	Enabled *types.Value `json:"Enabled,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-rule.html#cfn-ses-receiptrule-rule-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Recipients AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-rule.html#cfn-ses-receiptrule-rule-recipients
+	Recipients *types.Value `json:"Recipients,omitempty"`
+
+	// ScanEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-rule.html#cfn-ses-receiptrule-rule-scanenabled
+	ScanEnabled *types.Value `json:"ScanEnabled,omitempty"`
+
+	// TlsPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-rule.html#cfn-ses-receiptrule-rule-tlspolicy
+	TlsPolicy *types.Value `json:"TlsPolicy,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReceiptRule_Rule) AWSCloudFormationType() string {
+	return "AWS::SES::ReceiptRule.Rule"
+}
diff --git a/goformation/cloudformation/ses/aws-ses-receiptrule_s3action.go b/goformation/cloudformation/ses/aws-ses-receiptrule_s3action.go
new file mode 100644
index 0000000000..2839dd853c
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-receiptrule_s3action.go
@@ -0,0 +1,52 @@
+package ses
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReceiptRule_S3Action AWS CloudFormation Resource (AWS::SES::ReceiptRule.S3Action)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-s3action.html
+type ReceiptRule_S3Action struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-s3action.html#cfn-ses-receiptrule-s3action-bucketname
+	BucketName *types.Value `json:"BucketName,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
+	KmsKeyArn *types.Value `json:"KmsKeyArn,omitempty"`
+
+	// ObjectKeyPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-s3action.html#cfn-ses-receiptrule-s3action-objectkeyprefix
+	ObjectKeyPrefix *types.Value `json:"ObjectKeyPrefix,omitempty"`
+
+	// TopicArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-s3action.html#cfn-ses-receiptrule-s3action-topicarn
+	TopicArn *types.Value `json:"TopicArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReceiptRule_S3Action) AWSCloudFormationType() string {
+	return "AWS::SES::ReceiptRule.S3Action"
+}
diff --git a/goformation/cloudformation/ses/aws-ses-receiptrule_snsaction.go b/goformation/cloudformation/ses/aws-ses-receiptrule_snsaction.go
new file mode 100644
index 0000000000..f393615919
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-receiptrule_snsaction.go
@@ -0,0 +1,42 @@
+package ses
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReceiptRule_SNSAction AWS CloudFormation Resource (AWS::SES::ReceiptRule.SNSAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-snsaction.html
+type ReceiptRule_SNSAction struct {
+
+	// Encoding AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-snsaction.html#cfn-ses-receiptrule-snsaction-encoding
+	Encoding *types.Value `json:"Encoding,omitempty"`
+
+	// TopicArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-snsaction.html#cfn-ses-receiptrule-snsaction-topicarn
+	TopicArn *types.Value `json:"TopicArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReceiptRule_SNSAction) AWSCloudFormationType() string {
+	return "AWS::SES::ReceiptRule.SNSAction"
+}
diff --git a/goformation/cloudformation/ses/aws-ses-receiptrule_stopaction.go b/goformation/cloudformation/ses/aws-ses-receiptrule_stopaction.go
new file mode 100644
index 0000000000..5dc9366060
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-receiptrule_stopaction.go
@@ -0,0 +1,42 @@
+package ses
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReceiptRule_StopAction AWS CloudFormation Resource (AWS::SES::ReceiptRule.StopAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-stopaction.html
+type ReceiptRule_StopAction struct {
+
+	// Scope AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-stopaction.html#cfn-ses-receiptrule-stopaction-scope
+	Scope *types.Value `json:"Scope,omitempty"`
+
+	// TopicArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-stopaction.html#cfn-ses-receiptrule-stopaction-topicarn
+	TopicArn *types.Value `json:"TopicArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReceiptRule_StopAction) AWSCloudFormationType() string {
+	return "AWS::SES::ReceiptRule.StopAction"
+}
diff --git a/goformation/cloudformation/ses/aws-ses-receiptrule_workmailaction.go b/goformation/cloudformation/ses/aws-ses-receiptrule_workmailaction.go
new file mode 100644
index 0000000000..38358c0ea9
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-receiptrule_workmailaction.go
@@ -0,0 +1,42 @@
+package ses
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReceiptRule_WorkmailAction AWS CloudFormation Resource (AWS::SES::ReceiptRule.WorkmailAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-workmailaction.html
+type ReceiptRule_WorkmailAction struct {
+
+	// OrganizationArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-workmailaction.html#cfn-ses-receiptrule-workmailaction-organizationarn
+	OrganizationArn *types.Value `json:"OrganizationArn,omitempty"`
+
+	// TopicArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-receiptrule-workmailaction.html#cfn-ses-receiptrule-workmailaction-topicarn
+	TopicArn *types.Value `json:"TopicArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReceiptRule_WorkmailAction) AWSCloudFormationType() string {
+	return "AWS::SES::ReceiptRule.WorkmailAction"
+}
diff --git a/goformation/cloudformation/ses/aws-ses-receiptruleset.go b/goformation/cloudformation/ses/aws-ses-receiptruleset.go
new file mode 100644
index 0000000000..979c76bfa8
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-receiptruleset.go
@@ -0,0 +1,108 @@
+package ses
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReceiptRuleSet AWS CloudFormation Resource (AWS::SES::ReceiptRuleSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-receiptruleset.html
+type ReceiptRuleSet struct {
+
+	// RuleSetName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-receiptruleset.html#cfn-ses-receiptruleset-rulesetname
+	RuleSetName *types.Value `json:"RuleSetName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReceiptRuleSet) AWSCloudFormationType() string {
+	return "AWS::SES::ReceiptRuleSet"
+}
+
+// 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 ReceiptRuleSet) MarshalJSON() ([]byte, error) {
+	type Properties ReceiptRuleSet
+	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 *ReceiptRuleSet) UnmarshalJSON(b []byte) error {
+	type Properties ReceiptRuleSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ReceiptRuleSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ses/aws-ses-template.go b/goformation/cloudformation/ses/aws-ses-template.go
new file mode 100644
index 0000000000..45fd920d6e
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-template.go
@@ -0,0 +1,106 @@
+package ses
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Template AWS CloudFormation Resource (AWS::SES::Template)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-template.html
+type Template struct {
+
+	// Template AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ses-template.html#cfn-ses-template-template
+	Template *Template_Template `json:"Template,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::SES::Template"
+}
+
+// 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 Template) MarshalJSON() ([]byte, error) {
+	type Properties Template
+	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 *Template) UnmarshalJSON(b []byte) error {
+	type Properties Template
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Template(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ses/aws-ses-template_template.go b/goformation/cloudformation/ses/aws-ses-template_template.go
new file mode 100644
index 0000000000..1a100a41a9
--- /dev/null
+++ b/goformation/cloudformation/ses/aws-ses-template_template.go
@@ -0,0 +1,52 @@
+package ses
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Template_Template AWS CloudFormation Resource (AWS::SES::Template.Template)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-template-template.html
+type Template_Template struct {
+
+	// HtmlPart AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-template-template.html#cfn-ses-template-template-htmlpart
+	HtmlPart *types.Value `json:"HtmlPart,omitempty"`
+
+	// SubjectPart AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-template-template.html#cfn-ses-template-template-subjectpart
+	SubjectPart *types.Value `json:"SubjectPart,omitempty"`
+
+	// TemplateName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-template-template.html#cfn-ses-template-template-templatename
+	TemplateName *types.Value `json:"TemplateName,omitempty"`
+
+	// TextPart AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ses-template-template.html#cfn-ses-template-template-textpart
+	TextPart *types.Value `json:"TextPart,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Template) AWSCloudFormationType() string {
+	return "AWS::SES::Template.Template"
+}
diff --git a/goformation/cloudformation/signer/aws-signer-profilepermission.go b/goformation/cloudformation/signer/aws-signer-profilepermission.go
new file mode 100644
index 0000000000..5d7f45c78c
--- /dev/null
+++ b/goformation/cloudformation/signer/aws-signer-profilepermission.go
@@ -0,0 +1,128 @@
+package signer
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ProfilePermission AWS CloudFormation Resource (AWS::Signer::ProfilePermission)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-signer-profilepermission.html
+type ProfilePermission struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-signer-profilepermission.html#cfn-signer-profilepermission-action
+	Action *types.Value `json:"Action,omitempty"`
+
+	// Principal AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-signer-profilepermission.html#cfn-signer-profilepermission-principal
+	Principal *types.Value `json:"Principal,omitempty"`
+
+	// ProfileName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-signer-profilepermission.html#cfn-signer-profilepermission-profilename
+	ProfileName *types.Value `json:"ProfileName,omitempty"`
+
+	// ProfileVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-signer-profilepermission.html#cfn-signer-profilepermission-profileversion
+	ProfileVersion *types.Value `json:"ProfileVersion,omitempty"`
+
+	// StatementId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-signer-profilepermission.html#cfn-signer-profilepermission-statementid
+	StatementId *types.Value `json:"StatementId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ProfilePermission) AWSCloudFormationType() string {
+	return "AWS::Signer::ProfilePermission"
+}
+
+// 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 ProfilePermission) MarshalJSON() ([]byte, error) {
+	type Properties ProfilePermission
+	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 *ProfilePermission) UnmarshalJSON(b []byte) error {
+	type Properties ProfilePermission
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ProfilePermission(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/signer/aws-signer-signingprofile.go b/goformation/cloudformation/signer/aws-signer-signingprofile.go
new file mode 100644
index 0000000000..dceccce04e
--- /dev/null
+++ b/goformation/cloudformation/signer/aws-signer-signingprofile.go
@@ -0,0 +1,119 @@
+package signer
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// SigningProfile AWS CloudFormation Resource (AWS::Signer::SigningProfile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-signer-signingprofile.html
+type SigningProfile struct {
+
+	// PlatformId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-signer-signingprofile.html#cfn-signer-signingprofile-platformid
+	PlatformId *types.Value `json:"PlatformId,omitempty"`
+
+	// SignatureValidityPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-signer-signingprofile.html#cfn-signer-signingprofile-signaturevalidityperiod
+	SignatureValidityPeriod *SigningProfile_SignatureValidityPeriod `json:"SignatureValidityPeriod,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-signer-signingprofile.html#cfn-signer-signingprofile-tags
+	Tags []cloudformation.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 *SigningProfile) AWSCloudFormationType() string {
+	return "AWS::Signer::SigningProfile"
+}
+
+// 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 SigningProfile) MarshalJSON() ([]byte, error) {
+	type Properties SigningProfile
+	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 *SigningProfile) UnmarshalJSON(b []byte) error {
+	type Properties SigningProfile
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SigningProfile(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/signer/aws-signer-signingprofile_signaturevalidityperiod.go b/goformation/cloudformation/signer/aws-signer-signingprofile_signaturevalidityperiod.go
new file mode 100644
index 0000000000..f458ec91b6
--- /dev/null
+++ b/goformation/cloudformation/signer/aws-signer-signingprofile_signaturevalidityperiod.go
@@ -0,0 +1,42 @@
+package signer
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SigningProfile_SignatureValidityPeriod AWS CloudFormation Resource (AWS::Signer::SigningProfile.SignatureValidityPeriod)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-signer-signingprofile-signaturevalidityperiod.html
+type SigningProfile_SignatureValidityPeriod struct {
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-signer-signingprofile-signaturevalidityperiod.html#cfn-signer-signingprofile-signaturevalidityperiod-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-signer-signingprofile-signaturevalidityperiod.html#cfn-signer-signingprofile-signaturevalidityperiod-value
+	Value *types.Value `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 *SigningProfile_SignatureValidityPeriod) AWSCloudFormationType() string {
+	return "AWS::Signer::SigningProfile.SignatureValidityPeriod"
+}
diff --git a/goformation/cloudformation/sns/aws-sns-subscription.go b/goformation/cloudformation/sns/aws-sns-subscription.go
new file mode 100644
index 0000000000..5425eb51db
--- /dev/null
+++ b/goformation/cloudformation/sns/aws-sns-subscription.go
@@ -0,0 +1,148 @@
+package sns
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Subscription AWS CloudFormation Resource (AWS::SNS::Subscription)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html
+type Subscription struct {
+
+	// DeliveryPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-subscription-deliverypolicy
+	DeliveryPolicy interface{} `json:"DeliveryPolicy,omitempty"`
+
+	// Endpoint AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-endpoint
+	Endpoint *types.Value `json:"Endpoint,omitempty"`
+
+	// FilterPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-subscription-filterpolicy
+	FilterPolicy interface{} `json:"FilterPolicy,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// RawMessageDelivery AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-subscription-rawmessagedelivery
+	RawMessageDelivery *types.Value `json:"RawMessageDelivery,omitempty"`
+
+	// RedrivePolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-subscription-redrivepolicy
+	RedrivePolicy interface{} `json:"RedrivePolicy,omitempty"`
+
+	// Region AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-subscription-region
+	Region *types.Value `json:"Region,omitempty"`
+
+	// SubscriptionRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#cfn-sns-subscription-subscriptionrolearn
+	SubscriptionRoleArn *types.Value `json:"SubscriptionRoleArn,omitempty"`
+
+	// TopicArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sns-subscription.html#topicarn
+	TopicArn *types.Value `json:"TopicArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Subscription) AWSCloudFormationType() string {
+	return "AWS::SNS::Subscription"
+}
+
+// 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 Subscription) MarshalJSON() ([]byte, error) {
+	type Properties Subscription
+	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 *Subscription) UnmarshalJSON(b []byte) error {
+	type Properties Subscription
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Subscription(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sns/aws-sns-topic.go b/goformation/cloudformation/sns/aws-sns-topic.go
new file mode 100644
index 0000000000..f348ffb926
--- /dev/null
+++ b/goformation/cloudformation/sns/aws-sns-topic.go
@@ -0,0 +1,139 @@
+package sns
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Topic AWS CloudFormation Resource (AWS::SNS::Topic)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-topic.html
+type Topic struct {
+
+	// ContentBasedDeduplication AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-topic.html#cfn-sns-topic-contentbaseddeduplication
+	ContentBasedDeduplication *types.Value `json:"ContentBasedDeduplication,omitempty"`
+
+	// DisplayName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-topic.html#cfn-sns-topic-displayname
+	DisplayName *types.Value `json:"DisplayName,omitempty"`
+
+	// FifoTopic AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-topic.html#cfn-sns-topic-fifotopic
+	FifoTopic *types.Value `json:"FifoTopic,omitempty"`
+
+	// KmsMasterKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-topic.html#cfn-sns-topic-kmsmasterkeyid
+	KmsMasterKeyId *types.Value `json:"KmsMasterKeyId,omitempty"`
+
+	// Subscription AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-topic.html#cfn-sns-topic-subscription
+	Subscription []Topic_Subscription `json:"Subscription,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-topic.html#cfn-sns-topic-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TopicName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-topic.html#cfn-sns-topic-topicname
+	TopicName *types.Value `json:"TopicName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Topic) AWSCloudFormationType() string {
+	return "AWS::SNS::Topic"
+}
+
+// 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 Topic) MarshalJSON() ([]byte, error) {
+	type Properties Topic
+	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 *Topic) UnmarshalJSON(b []byte) error {
+	type Properties Topic
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Topic(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sns/aws-sns-topic_subscription.go b/goformation/cloudformation/sns/aws-sns-topic_subscription.go
new file mode 100644
index 0000000000..504939727b
--- /dev/null
+++ b/goformation/cloudformation/sns/aws-sns-topic_subscription.go
@@ -0,0 +1,42 @@
+package sns
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Topic_Subscription AWS CloudFormation Resource (AWS::SNS::Topic.Subscription)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-subscription.html
+type Topic_Subscription struct {
+
+	// Endpoint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-subscription.html#cfn-sns-topic-subscription-endpoint
+	Endpoint *types.Value `json:"Endpoint,omitempty"`
+
+	// Protocol AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-subscription.html#cfn-sns-topic-subscription-protocol
+	Protocol *types.Value `json:"Protocol,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Topic_Subscription) AWSCloudFormationType() string {
+	return "AWS::SNS::Topic.Subscription"
+}
diff --git a/goformation/cloudformation/sns/aws-sns-topicpolicy.go b/goformation/cloudformation/sns/aws-sns-topicpolicy.go
new file mode 100644
index 0000000000..11bb261cc2
--- /dev/null
+++ b/goformation/cloudformation/sns/aws-sns-topicpolicy.go
@@ -0,0 +1,113 @@
+package sns
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// TopicPolicy AWS CloudFormation Resource (AWS::SNS::TopicPolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-policy.html
+type TopicPolicy struct {
+
+	// PolicyDocument AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-policy.html#cfn-sns-topicpolicy-policydocument
+	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
+
+	// Topics AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sns-policy.html#cfn-sns-topicpolicy-topics
+	Topics *types.Value `json:"Topics,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *TopicPolicy) AWSCloudFormationType() string {
+	return "AWS::SNS::TopicPolicy"
+}
+
+// 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 TopicPolicy) MarshalJSON() ([]byte, error) {
+	type Properties TopicPolicy
+	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 *TopicPolicy) UnmarshalJSON(b []byte) error {
+	type Properties TopicPolicy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = TopicPolicy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sqs/aws-sqs-queue.go b/goformation/cloudformation/sqs/aws-sqs-queue.go
new file mode 100644
index 0000000000..de7fe1391a
--- /dev/null
+++ b/goformation/cloudformation/sqs/aws-sqs-queue.go
@@ -0,0 +1,179 @@
+package sqs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Queue AWS CloudFormation Resource (AWS::SQS::Queue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html
+type Queue struct {
+
+	// ContentBasedDeduplication AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-contentbaseddeduplication
+	ContentBasedDeduplication *types.Value `json:"ContentBasedDeduplication,omitempty"`
+
+	// DeduplicationScope AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-deduplicationscope
+	DeduplicationScope *types.Value `json:"DeduplicationScope,omitempty"`
+
+	// DelaySeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-delayseconds
+	DelaySeconds *types.Value `json:"DelaySeconds,omitempty"`
+
+	// FifoQueue AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-fifoqueue
+	FifoQueue *types.Value `json:"FifoQueue,omitempty"`
+
+	// FifoThroughputLimit AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-fifothroughputlimit
+	FifoThroughputLimit *types.Value `json:"FifoThroughputLimit,omitempty"`
+
+	// KmsDataKeyReusePeriodSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-kmsdatakeyreuseperiodseconds
+	KmsDataKeyReusePeriodSeconds *types.Value `json:"KmsDataKeyReusePeriodSeconds,omitempty"`
+
+	// KmsMasterKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-kmsmasterkeyid
+	KmsMasterKeyId *types.Value `json:"KmsMasterKeyId,omitempty"`
+
+	// MaximumMessageSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-maxmesgsize
+	MaximumMessageSize *types.Value `json:"MaximumMessageSize,omitempty"`
+
+	// MessageRetentionPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-msgretentionperiod
+	MessageRetentionPeriod *types.Value `json:"MessageRetentionPeriod,omitempty"`
+
+	// QueueName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-name
+	QueueName *types.Value `json:"QueueName,omitempty"`
+
+	// ReceiveMessageWaitTimeSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-receivemsgwaittime
+	ReceiveMessageWaitTimeSeconds *types.Value `json:"ReceiveMessageWaitTimeSeconds,omitempty"`
+
+	// RedriveAllowPolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-redriveallowpolicy
+	RedriveAllowPolicy interface{} `json:"RedriveAllowPolicy,omitempty"`
+
+	// RedrivePolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-redrive
+	RedrivePolicy interface{} `json:"RedrivePolicy,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#cfn-sqs-queue-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VisibilityTimeout AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sqs-queues.html#aws-sqs-queue-visiblitytimeout
+	VisibilityTimeout *types.Value `json:"VisibilityTimeout,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Queue) AWSCloudFormationType() string {
+	return "AWS::SQS::Queue"
+}
+
+// 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 Queue) MarshalJSON() ([]byte, error) {
+	type Properties Queue
+	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 *Queue) UnmarshalJSON(b []byte) error {
+	type Properties Queue
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Queue(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sqs/aws-sqs-queuepolicy.go b/goformation/cloudformation/sqs/aws-sqs-queuepolicy.go
new file mode 100644
index 0000000000..2bf508e93d
--- /dev/null
+++ b/goformation/cloudformation/sqs/aws-sqs-queuepolicy.go
@@ -0,0 +1,113 @@
+package sqs
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// QueuePolicy AWS CloudFormation Resource (AWS::SQS::QueuePolicy)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sqs-queuepolicy.html
+type QueuePolicy struct {
+
+	// PolicyDocument AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sqs-queuepolicy.html#cfn-sqs-queuepolicy-policydocument
+	PolicyDocument interface{} `json:"PolicyDocument,omitempty"`
+
+	// Queues AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sqs-queuepolicy.html#cfn-sqs-queuepolicy-queues
+	Queues *types.Value `json:"Queues,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *QueuePolicy) AWSCloudFormationType() string {
+	return "AWS::SQS::QueuePolicy"
+}
+
+// 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 QueuePolicy) MarshalJSON() ([]byte, error) {
+	type Properties QueuePolicy
+	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 *QueuePolicy) UnmarshalJSON(b []byte) error {
+	type Properties QueuePolicy
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = QueuePolicy(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ssm/aws-ssm-association.go b/goformation/cloudformation/ssm/aws-ssm-association.go
new file mode 100644
index 0000000000..ef566261b5
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-association.go
@@ -0,0 +1,183 @@
+package ssm
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Association AWS CloudFormation Resource (AWS::SSM::Association)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html
+type Association struct {
+
+	// ApplyOnlyAtCronInterval AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-applyonlyatcroninterval
+	ApplyOnlyAtCronInterval *types.Value `json:"ApplyOnlyAtCronInterval,omitempty"`
+
+	// AssociationName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-associationname
+	AssociationName *types.Value `json:"AssociationName,omitempty"`
+
+	// AutomationTargetParameterName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-automationtargetparametername
+	AutomationTargetParameterName *types.Value `json:"AutomationTargetParameterName,omitempty"`
+
+	// CalendarNames AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-calendarnames
+	CalendarNames *types.Value `json:"CalendarNames,omitempty"`
+
+	// ComplianceSeverity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-complianceseverity
+	ComplianceSeverity *types.Value `json:"ComplianceSeverity,omitempty"`
+
+	// DocumentVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-documentversion
+	DocumentVersion *types.Value `json:"DocumentVersion,omitempty"`
+
+	// InstanceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-instanceid
+	InstanceId *types.Value `json:"InstanceId,omitempty"`
+
+	// MaxConcurrency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-maxconcurrency
+	MaxConcurrency *types.Value `json:"MaxConcurrency,omitempty"`
+
+	// MaxErrors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-maxerrors
+	MaxErrors *types.Value `json:"MaxErrors,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// OutputLocation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-outputlocation
+	OutputLocation *Association_InstanceAssociationOutputLocation `json:"OutputLocation,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-parameters
+	Parameters map[string]interface{} `json:"Parameters,omitempty"`
+
+	// ScheduleExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-scheduleexpression
+	ScheduleExpression *types.Value `json:"ScheduleExpression,omitempty"`
+
+	// SyncCompliance AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-synccompliance
+	SyncCompliance *types.Value `json:"SyncCompliance,omitempty"`
+
+	// Targets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-targets
+	Targets []Association_Target `json:"Targets,omitempty"`
+
+	// WaitForSuccessTimeoutSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-association.html#cfn-ssm-association-waitforsuccesstimeoutseconds
+	WaitForSuccessTimeoutSeconds *types.Value `json:"WaitForSuccessTimeoutSeconds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Association) AWSCloudFormationType() string {
+	return "AWS::SSM::Association"
+}
+
+// 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 Association) MarshalJSON() ([]byte, error) {
+	type Properties Association
+	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 *Association) UnmarshalJSON(b []byte) error {
+	type Properties Association
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Association(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ssm/aws-ssm-association_instanceassociationoutputlocation.go b/goformation/cloudformation/ssm/aws-ssm-association_instanceassociationoutputlocation.go
new file mode 100644
index 0000000000..2956f3c201
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-association_instanceassociationoutputlocation.go
@@ -0,0 +1,35 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Association_InstanceAssociationOutputLocation AWS CloudFormation Resource (AWS::SSM::Association.InstanceAssociationOutputLocation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-association-instanceassociationoutputlocation.html
+type Association_InstanceAssociationOutputLocation struct {
+
+	// S3Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-association-instanceassociationoutputlocation.html#cfn-ssm-association-instanceassociationoutputlocation-s3location
+	S3Location *Association_S3OutputLocation `json:"S3Location,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Association_InstanceAssociationOutputLocation) AWSCloudFormationType() string {
+	return "AWS::SSM::Association.InstanceAssociationOutputLocation"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-association_parametervalues.go b/goformation/cloudformation/ssm/aws-ssm-association_parametervalues.go
new file mode 100644
index 0000000000..0ebea201b9
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-association_parametervalues.go
@@ -0,0 +1,37 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Association_ParameterValues AWS CloudFormation Resource (AWS::SSM::Association.ParameterValues)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-association-parametervalues.html
+type Association_ParameterValues struct {
+
+	// ParameterValues AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-association-parametervalues.html#cfn-ssm-association-parametervalues-parametervalues
+	ParameterValues *types.Value `json:"ParameterValues,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Association_ParameterValues) AWSCloudFormationType() string {
+	return "AWS::SSM::Association.ParameterValues"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-association_s3outputlocation.go b/goformation/cloudformation/ssm/aws-ssm-association_s3outputlocation.go
new file mode 100644
index 0000000000..60d1e41af1
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-association_s3outputlocation.go
@@ -0,0 +1,47 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Association_S3OutputLocation AWS CloudFormation Resource (AWS::SSM::Association.S3OutputLocation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-association-s3outputlocation.html
+type Association_S3OutputLocation struct {
+
+	// OutputS3BucketName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-association-s3outputlocation.html#cfn-ssm-association-s3outputlocation-outputs3bucketname
+	OutputS3BucketName *types.Value `json:"OutputS3BucketName,omitempty"`
+
+	// OutputS3KeyPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-association-s3outputlocation.html#cfn-ssm-association-s3outputlocation-outputs3keyprefix
+	OutputS3KeyPrefix *types.Value `json:"OutputS3KeyPrefix,omitempty"`
+
+	// OutputS3Region AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-association-s3outputlocation.html#cfn-ssm-association-s3outputlocation-outputs3region
+	OutputS3Region *types.Value `json:"OutputS3Region,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Association_S3OutputLocation) AWSCloudFormationType() string {
+	return "AWS::SSM::Association.S3OutputLocation"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-association_target.go b/goformation/cloudformation/ssm/aws-ssm-association_target.go
new file mode 100644
index 0000000000..3079fc675d
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-association_target.go
@@ -0,0 +1,42 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Association_Target AWS CloudFormation Resource (AWS::SSM::Association.Target)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-association-target.html
+type Association_Target struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-association-target.html#cfn-ssm-association-target-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-association-target.html#cfn-ssm-association-target-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Association_Target) AWSCloudFormationType() string {
+	return "AWS::SSM::Association.Target"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-document.go b/goformation/cloudformation/ssm/aws-ssm-document.go
new file mode 100644
index 0000000000..e19f4be0d0
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-document.go
@@ -0,0 +1,149 @@
+package ssm
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Document AWS CloudFormation Resource (AWS::SSM::Document)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-document.html
+type Document struct {
+
+	// Attachments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-document.html#cfn-ssm-document-attachments
+	Attachments []Document_AttachmentsSource `json:"Attachments,omitempty"`
+
+	// Content AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-document.html#cfn-ssm-document-content
+	Content interface{} `json:"Content,omitempty"`
+
+	// DocumentFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-document.html#cfn-ssm-document-documentformat
+	DocumentFormat *types.Value `json:"DocumentFormat,omitempty"`
+
+	// DocumentType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-document.html#cfn-ssm-document-documenttype
+	DocumentType *types.Value `json:"DocumentType,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-document.html#cfn-ssm-document-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Requires AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-document.html#cfn-ssm-document-requires
+	Requires []Document_DocumentRequires `json:"Requires,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-document.html#cfn-ssm-document-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TargetType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-document.html#cfn-ssm-document-targettype
+	TargetType *types.Value `json:"TargetType,omitempty"`
+
+	// VersionName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-document.html#cfn-ssm-document-versionname
+	VersionName *types.Value `json:"VersionName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Document) AWSCloudFormationType() string {
+	return "AWS::SSM::Document"
+}
+
+// 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 Document) MarshalJSON() ([]byte, error) {
+	type Properties Document
+	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 *Document) UnmarshalJSON(b []byte) error {
+	type Properties Document
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Document(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ssm/aws-ssm-document_attachmentssource.go b/goformation/cloudformation/ssm/aws-ssm-document_attachmentssource.go
new file mode 100644
index 0000000000..1e4e7d332d
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-document_attachmentssource.go
@@ -0,0 +1,47 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Document_AttachmentsSource AWS CloudFormation Resource (AWS::SSM::Document.AttachmentsSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-document-attachmentssource.html
+type Document_AttachmentsSource struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-document-attachmentssource.html#cfn-ssm-document-attachmentssource-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-document-attachmentssource.html#cfn-ssm-document-attachmentssource-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-document-attachmentssource.html#cfn-ssm-document-attachmentssource-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Document_AttachmentsSource) AWSCloudFormationType() string {
+	return "AWS::SSM::Document.AttachmentsSource"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-document_documentrequires.go b/goformation/cloudformation/ssm/aws-ssm-document_documentrequires.go
new file mode 100644
index 0000000000..dc642c3b1e
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-document_documentrequires.go
@@ -0,0 +1,42 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Document_DocumentRequires AWS CloudFormation Resource (AWS::SSM::Document.DocumentRequires)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-document-documentrequires.html
+type Document_DocumentRequires struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-document-documentrequires.html#cfn-ssm-document-documentrequires-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-document-documentrequires.html#cfn-ssm-document-documentrequires-version
+	Version *types.Value `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 *Document_DocumentRequires) AWSCloudFormationType() string {
+	return "AWS::SSM::Document.DocumentRequires"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindow.go b/goformation/cloudformation/ssm/aws-ssm-maintenancewindow.go
new file mode 100644
index 0000000000..84d136833a
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-maintenancewindow.go
@@ -0,0 +1,159 @@
+package ssm
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// MaintenanceWindow AWS CloudFormation Resource (AWS::SSM::MaintenanceWindow)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindow.html
+type MaintenanceWindow struct {
+
+	// AllowUnassociatedTargets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindow.html#cfn-ssm-maintenancewindow-allowunassociatedtargets
+	AllowUnassociatedTargets *types.Value `json:"AllowUnassociatedTargets"`
+
+	// Cutoff AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindow.html#cfn-ssm-maintenancewindow-cutoff
+	Cutoff *types.Value `json:"Cutoff"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindow.html#cfn-ssm-maintenancewindow-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Duration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindow.html#cfn-ssm-maintenancewindow-duration
+	Duration *types.Value `json:"Duration"`
+
+	// EndDate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindow.html#cfn-ssm-maintenancewindow-enddate
+	EndDate *types.Value `json:"EndDate,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindow.html#cfn-ssm-maintenancewindow-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Schedule AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindow.html#cfn-ssm-maintenancewindow-schedule
+	Schedule *types.Value `json:"Schedule,omitempty"`
+
+	// ScheduleOffset AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindow.html#cfn-ssm-maintenancewindow-scheduleoffset
+	ScheduleOffset *types.Value `json:"ScheduleOffset,omitempty"`
+
+	// ScheduleTimezone AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindow.html#cfn-ssm-maintenancewindow-scheduletimezone
+	ScheduleTimezone *types.Value `json:"ScheduleTimezone,omitempty"`
+
+	// StartDate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindow.html#cfn-ssm-maintenancewindow-startdate
+	StartDate *types.Value `json:"StartDate,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindow.html#cfn-ssm-maintenancewindow-tags
+	Tags []cloudformation.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 *MaintenanceWindow) AWSCloudFormationType() string {
+	return "AWS::SSM::MaintenanceWindow"
+}
+
+// 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 MaintenanceWindow) MarshalJSON() ([]byte, error) {
+	type Properties MaintenanceWindow
+	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 *MaintenanceWindow) UnmarshalJSON(b []byte) error {
+	type Properties MaintenanceWindow
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = MaintenanceWindow(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtarget.go b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtarget.go
new file mode 100644
index 0000000000..f68c54feb7
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtarget.go
@@ -0,0 +1,133 @@
+package ssm
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MaintenanceWindowTarget AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTarget)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtarget.html
+type MaintenanceWindowTarget struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtarget.html#cfn-ssm-maintenancewindowtarget-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtarget.html#cfn-ssm-maintenancewindowtarget-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// OwnerInformation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtarget.html#cfn-ssm-maintenancewindowtarget-ownerinformation
+	OwnerInformation *types.Value `json:"OwnerInformation,omitempty"`
+
+	// ResourceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtarget.html#cfn-ssm-maintenancewindowtarget-resourcetype
+	ResourceType *types.Value `json:"ResourceType,omitempty"`
+
+	// Targets AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtarget.html#cfn-ssm-maintenancewindowtarget-targets
+	Targets []MaintenanceWindowTarget_Targets `json:"Targets,omitempty"`
+
+	// WindowId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtarget.html#cfn-ssm-maintenancewindowtarget-windowid
+	WindowId *types.Value `json:"WindowId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MaintenanceWindowTarget) AWSCloudFormationType() string {
+	return "AWS::SSM::MaintenanceWindowTarget"
+}
+
+// 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 MaintenanceWindowTarget) MarshalJSON() ([]byte, error) {
+	type Properties MaintenanceWindowTarget
+	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 *MaintenanceWindowTarget) UnmarshalJSON(b []byte) error {
+	type Properties MaintenanceWindowTarget
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = MaintenanceWindowTarget(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtarget_targets.go b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtarget_targets.go
new file mode 100644
index 0000000000..8f721783fe
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtarget_targets.go
@@ -0,0 +1,42 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MaintenanceWindowTarget_Targets AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTarget.Targets)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtarget-targets.html
+type MaintenanceWindowTarget_Targets struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtarget-targets.html#cfn-ssm-maintenancewindowtarget-targets-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtarget-targets.html#cfn-ssm-maintenancewindowtarget-targets-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MaintenanceWindowTarget_Targets) AWSCloudFormationType() string {
+	return "AWS::SSM::MaintenanceWindowTarget.Targets"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask.go b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask.go
new file mode 100644
index 0000000000..9cad78840c
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask.go
@@ -0,0 +1,173 @@
+package ssm
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MaintenanceWindowTask AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html
+type MaintenanceWindowTask struct {
+
+	// CutoffBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-cutoffbehavior
+	CutoffBehavior *types.Value `json:"CutoffBehavior,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// LoggingInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-logginginfo
+	LoggingInfo *MaintenanceWindowTask_LoggingInfo `json:"LoggingInfo,omitempty"`
+
+	// MaxConcurrency AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-maxconcurrency
+	MaxConcurrency *types.Value `json:"MaxConcurrency,omitempty"`
+
+	// MaxErrors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-maxerrors
+	MaxErrors *types.Value `json:"MaxErrors,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Priority AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-priority
+	Priority *types.Value `json:"Priority"`
+
+	// ServiceRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-servicerolearn
+	ServiceRoleArn *types.Value `json:"ServiceRoleArn,omitempty"`
+
+	// Targets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-targets
+	Targets []MaintenanceWindowTask_Target `json:"Targets,omitempty"`
+
+	// TaskArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-taskarn
+	TaskArn *types.Value `json:"TaskArn,omitempty"`
+
+	// TaskInvocationParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-taskinvocationparameters
+	TaskInvocationParameters *MaintenanceWindowTask_TaskInvocationParameters `json:"TaskInvocationParameters,omitempty"`
+
+	// TaskParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-taskparameters
+	TaskParameters interface{} `json:"TaskParameters,omitempty"`
+
+	// TaskType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-tasktype
+	TaskType *types.Value `json:"TaskType,omitempty"`
+
+	// WindowId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-maintenancewindowtask.html#cfn-ssm-maintenancewindowtask-windowid
+	WindowId *types.Value `json:"WindowId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MaintenanceWindowTask) AWSCloudFormationType() string {
+	return "AWS::SSM::MaintenanceWindowTask"
+}
+
+// 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 MaintenanceWindowTask) MarshalJSON() ([]byte, error) {
+	type Properties MaintenanceWindowTask
+	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 *MaintenanceWindowTask) UnmarshalJSON(b []byte) error {
+	type Properties MaintenanceWindowTask
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = MaintenanceWindowTask(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_logginginfo.go b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_logginginfo.go
new file mode 100644
index 0000000000..223e15eb9f
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_logginginfo.go
@@ -0,0 +1,47 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MaintenanceWindowTask_LoggingInfo AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.LoggingInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-logginginfo.html
+type MaintenanceWindowTask_LoggingInfo struct {
+
+	// Region AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-logginginfo.html#cfn-ssm-maintenancewindowtask-logginginfo-region
+	Region *types.Value `json:"Region,omitempty"`
+
+	// S3Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-logginginfo.html#cfn-ssm-maintenancewindowtask-logginginfo-s3bucket
+	S3Bucket *types.Value `json:"S3Bucket,omitempty"`
+
+	// S3Prefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-logginginfo.html#cfn-ssm-maintenancewindowtask-logginginfo-s3prefix
+	S3Prefix *types.Value `json:"S3Prefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MaintenanceWindowTask_LoggingInfo) AWSCloudFormationType() string {
+	return "AWS::SSM::MaintenanceWindowTask.LoggingInfo"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowautomationparameters.go b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowautomationparameters.go
new file mode 100644
index 0000000000..7f180250fa
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowautomationparameters.go
@@ -0,0 +1,42 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MaintenanceWindowTask_MaintenanceWindowAutomationParameters AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.MaintenanceWindowAutomationParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowautomationparameters.html
+type MaintenanceWindowTask_MaintenanceWindowAutomationParameters struct {
+
+	// DocumentVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowautomationparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowautomationparameters-documentversion
+	DocumentVersion *types.Value `json:"DocumentVersion,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowautomationparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowautomationparameters-parameters
+	Parameters interface{} `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 *MaintenanceWindowTask_MaintenanceWindowAutomationParameters) AWSCloudFormationType() string {
+	return "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowAutomationParameters"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowlambdaparameters.go b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowlambdaparameters.go
new file mode 100644
index 0000000000..04b235fd4b
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowlambdaparameters.go
@@ -0,0 +1,47 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MaintenanceWindowTask_MaintenanceWindowLambdaParameters AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.MaintenanceWindowLambdaParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowlambdaparameters.html
+type MaintenanceWindowTask_MaintenanceWindowLambdaParameters struct {
+
+	// ClientContext AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowlambdaparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowlambdaparameters-clientcontext
+	ClientContext *types.Value `json:"ClientContext,omitempty"`
+
+	// Payload AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowlambdaparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowlambdaparameters-payload
+	Payload *types.Value `json:"Payload,omitempty"`
+
+	// Qualifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowlambdaparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowlambdaparameters-qualifier
+	Qualifier *types.Value `json:"Qualifier,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MaintenanceWindowTask_MaintenanceWindowLambdaParameters) AWSCloudFormationType() string {
+	return "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowLambdaParameters"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowruncommandparameters.go b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowruncommandparameters.go
new file mode 100644
index 0000000000..79c3a9ff53
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowruncommandparameters.go
@@ -0,0 +1,77 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MaintenanceWindowTask_MaintenanceWindowRunCommandParameters AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.MaintenanceWindowRunCommandParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowruncommandparameters.html
+type MaintenanceWindowTask_MaintenanceWindowRunCommandParameters struct {
+
+	// Comment AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowruncommandparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowruncommandparameters-comment
+	Comment *types.Value `json:"Comment,omitempty"`
+
+	// DocumentHash AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowruncommandparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowruncommandparameters-documenthash
+	DocumentHash *types.Value `json:"DocumentHash,omitempty"`
+
+	// DocumentHashType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowruncommandparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowruncommandparameters-documenthashtype
+	DocumentHashType *types.Value `json:"DocumentHashType,omitempty"`
+
+	// NotificationConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowruncommandparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowruncommandparameters-notificationconfig
+	NotificationConfig *MaintenanceWindowTask_NotificationConfig `json:"NotificationConfig,omitempty"`
+
+	// OutputS3BucketName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowruncommandparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowruncommandparameters-outputs3bucketname
+	OutputS3BucketName *types.Value `json:"OutputS3BucketName,omitempty"`
+
+	// OutputS3KeyPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowruncommandparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowruncommandparameters-outputs3keyprefix
+	OutputS3KeyPrefix *types.Value `json:"OutputS3KeyPrefix,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowruncommandparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowruncommandparameters-parameters
+	Parameters interface{} `json:"Parameters,omitempty"`
+
+	// ServiceRoleArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowruncommandparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowruncommandparameters-servicerolearn
+	ServiceRoleArn *types.Value `json:"ServiceRoleArn,omitempty"`
+
+	// TimeoutSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowruncommandparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowruncommandparameters-timeoutseconds
+	TimeoutSeconds *types.Value `json:"TimeoutSeconds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MaintenanceWindowTask_MaintenanceWindowRunCommandParameters) AWSCloudFormationType() string {
+	return "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowRunCommandParameters"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowstepfunctionsparameters.go b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowstepfunctionsparameters.go
new file mode 100644
index 0000000000..67eaa0d59f
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_maintenancewindowstepfunctionsparameters.go
@@ -0,0 +1,42 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MaintenanceWindowTask_MaintenanceWindowStepFunctionsParameters AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.MaintenanceWindowStepFunctionsParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowstepfunctionsparameters.html
+type MaintenanceWindowTask_MaintenanceWindowStepFunctionsParameters struct {
+
+	// Input AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowstepfunctionsparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowstepfunctionsparameters-input
+	Input *types.Value `json:"Input,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-maintenancewindowstepfunctionsparameters.html#cfn-ssm-maintenancewindowtask-maintenancewindowstepfunctionsparameters-name
+	Name *types.Value `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 *MaintenanceWindowTask_MaintenanceWindowStepFunctionsParameters) AWSCloudFormationType() string {
+	return "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowStepFunctionsParameters"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_notificationconfig.go b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_notificationconfig.go
new file mode 100644
index 0000000000..77a6965cf8
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_notificationconfig.go
@@ -0,0 +1,47 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MaintenanceWindowTask_NotificationConfig AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.NotificationConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-notificationconfig.html
+type MaintenanceWindowTask_NotificationConfig struct {
+
+	// NotificationArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-notificationconfig.html#cfn-ssm-maintenancewindowtask-notificationconfig-notificationarn
+	NotificationArn *types.Value `json:"NotificationArn,omitempty"`
+
+	// NotificationEvents AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-notificationconfig.html#cfn-ssm-maintenancewindowtask-notificationconfig-notificationevents
+	NotificationEvents *types.Value `json:"NotificationEvents,omitempty"`
+
+	// NotificationType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-notificationconfig.html#cfn-ssm-maintenancewindowtask-notificationconfig-notificationtype
+	NotificationType *types.Value `json:"NotificationType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MaintenanceWindowTask_NotificationConfig) AWSCloudFormationType() string {
+	return "AWS::SSM::MaintenanceWindowTask.NotificationConfig"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_target.go b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_target.go
new file mode 100644
index 0000000000..68efb556b5
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_target.go
@@ -0,0 +1,42 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// MaintenanceWindowTask_Target AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.Target)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-target.html
+type MaintenanceWindowTask_Target struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-target.html#cfn-ssm-maintenancewindowtask-target-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-target.html#cfn-ssm-maintenancewindowtask-target-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MaintenanceWindowTask_Target) AWSCloudFormationType() string {
+	return "AWS::SSM::MaintenanceWindowTask.Target"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_taskinvocationparameters.go b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_taskinvocationparameters.go
new file mode 100644
index 0000000000..e1ba1cddb6
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-maintenancewindowtask_taskinvocationparameters.go
@@ -0,0 +1,50 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// MaintenanceWindowTask_TaskInvocationParameters AWS CloudFormation Resource (AWS::SSM::MaintenanceWindowTask.TaskInvocationParameters)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-taskinvocationparameters.html
+type MaintenanceWindowTask_TaskInvocationParameters struct {
+
+	// MaintenanceWindowAutomationParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-taskinvocationparameters.html#cfn-ssm-maintenancewindowtask-taskinvocationparameters-maintenancewindowautomationparameters
+	MaintenanceWindowAutomationParameters *MaintenanceWindowTask_MaintenanceWindowAutomationParameters `json:"MaintenanceWindowAutomationParameters,omitempty"`
+
+	// MaintenanceWindowLambdaParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-taskinvocationparameters.html#cfn-ssm-maintenancewindowtask-taskinvocationparameters-maintenancewindowlambdaparameters
+	MaintenanceWindowLambdaParameters *MaintenanceWindowTask_MaintenanceWindowLambdaParameters `json:"MaintenanceWindowLambdaParameters,omitempty"`
+
+	// MaintenanceWindowRunCommandParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-taskinvocationparameters.html#cfn-ssm-maintenancewindowtask-taskinvocationparameters-maintenancewindowruncommandparameters
+	MaintenanceWindowRunCommandParameters *MaintenanceWindowTask_MaintenanceWindowRunCommandParameters `json:"MaintenanceWindowRunCommandParameters,omitempty"`
+
+	// MaintenanceWindowStepFunctionsParameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-maintenancewindowtask-taskinvocationparameters.html#cfn-ssm-maintenancewindowtask-taskinvocationparameters-maintenancewindowstepfunctionsparameters
+	MaintenanceWindowStepFunctionsParameters *MaintenanceWindowTask_MaintenanceWindowStepFunctionsParameters `json:"MaintenanceWindowStepFunctionsParameters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *MaintenanceWindowTask_TaskInvocationParameters) AWSCloudFormationType() string {
+	return "AWS::SSM::MaintenanceWindowTask.TaskInvocationParameters"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-parameter.go b/goformation/cloudformation/ssm/aws-ssm-parameter.go
new file mode 100644
index 0000000000..2ff8e2cc3e
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-parameter.go
@@ -0,0 +1,148 @@
+package ssm
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Parameter AWS CloudFormation Resource (AWS::SSM::Parameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-parameter.html
+type Parameter struct {
+
+	// AllowedPattern AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-parameter.html#cfn-ssm-parameter-allowedpattern
+	AllowedPattern *types.Value `json:"AllowedPattern,omitempty"`
+
+	// DataType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-parameter.html#cfn-ssm-parameter-datatype
+	DataType *types.Value `json:"DataType,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-parameter.html#cfn-ssm-parameter-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-parameter.html#cfn-ssm-parameter-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Policies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-parameter.html#cfn-ssm-parameter-policies
+	Policies *types.Value `json:"Policies,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-parameter.html#cfn-ssm-parameter-tags
+	Tags interface{} `json:"Tags,omitempty"`
+
+	// Tier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-parameter.html#cfn-ssm-parameter-tier
+	Tier *types.Value `json:"Tier,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-parameter.html#cfn-ssm-parameter-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-parameter.html#cfn-ssm-parameter-value
+	Value *types.Value `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 *Parameter) AWSCloudFormationType() string {
+	return "AWS::SSM::Parameter"
+}
+
+// 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 Parameter) MarshalJSON() ([]byte, error) {
+	type Properties Parameter
+	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 *Parameter) UnmarshalJSON(b []byte) error {
+	type Properties Parameter
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Parameter(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ssm/aws-ssm-patchbaseline.go b/goformation/cloudformation/ssm/aws-ssm-patchbaseline.go
new file mode 100644
index 0000000000..f9589dc497
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-patchbaseline.go
@@ -0,0 +1,169 @@
+package ssm
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// PatchBaseline AWS CloudFormation Resource (AWS::SSM::PatchBaseline)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html
+type PatchBaseline struct {
+
+	// ApprovalRules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-approvalrules
+	ApprovalRules *PatchBaseline_RuleGroup `json:"ApprovalRules,omitempty"`
+
+	// ApprovedPatches AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-approvedpatches
+	ApprovedPatches *types.Value `json:"ApprovedPatches,omitempty"`
+
+	// ApprovedPatchesComplianceLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-approvedpatchescompliancelevel
+	ApprovedPatchesComplianceLevel *types.Value `json:"ApprovedPatchesComplianceLevel,omitempty"`
+
+	// ApprovedPatchesEnableNonSecurity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-approvedpatchesenablenonsecurity
+	ApprovedPatchesEnableNonSecurity *types.Value `json:"ApprovedPatchesEnableNonSecurity,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// GlobalFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-globalfilters
+	GlobalFilters *PatchBaseline_PatchFilterGroup `json:"GlobalFilters,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// OperatingSystem AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-operatingsystem
+	OperatingSystem *types.Value `json:"OperatingSystem,omitempty"`
+
+	// PatchGroups AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-patchgroups
+	PatchGroups *types.Value `json:"PatchGroups,omitempty"`
+
+	// RejectedPatches AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-rejectedpatches
+	RejectedPatches *types.Value `json:"RejectedPatches,omitempty"`
+
+	// RejectedPatchesAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-rejectedpatchesaction
+	RejectedPatchesAction *types.Value `json:"RejectedPatchesAction,omitempty"`
+
+	// Sources AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-sources
+	Sources []PatchBaseline_PatchSource `json:"Sources,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-patchbaseline.html#cfn-ssm-patchbaseline-tags
+	Tags []cloudformation.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 *PatchBaseline) AWSCloudFormationType() string {
+	return "AWS::SSM::PatchBaseline"
+}
+
+// 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 PatchBaseline) MarshalJSON() ([]byte, error) {
+	type Properties PatchBaseline
+	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 *PatchBaseline) UnmarshalJSON(b []byte) error {
+	type Properties PatchBaseline
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PatchBaseline(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchfilter.go b/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchfilter.go
new file mode 100644
index 0000000000..38afcc82d1
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchfilter.go
@@ -0,0 +1,42 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PatchBaseline_PatchFilter AWS CloudFormation Resource (AWS::SSM::PatchBaseline.PatchFilter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-patchfilter.html
+type PatchBaseline_PatchFilter struct {
+
+	// Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-patchfilter.html#cfn-ssm-patchbaseline-patchfilter-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-patchfilter.html#cfn-ssm-patchbaseline-patchfilter-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PatchBaseline_PatchFilter) AWSCloudFormationType() string {
+	return "AWS::SSM::PatchBaseline.PatchFilter"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchfiltergroup.go b/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchfiltergroup.go
new file mode 100644
index 0000000000..26220265aa
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchfiltergroup.go
@@ -0,0 +1,35 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// PatchBaseline_PatchFilterGroup AWS CloudFormation Resource (AWS::SSM::PatchBaseline.PatchFilterGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-patchfiltergroup.html
+type PatchBaseline_PatchFilterGroup struct {
+
+	// PatchFilters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-patchfiltergroup.html#cfn-ssm-patchbaseline-patchfiltergroup-patchfilters
+	PatchFilters []PatchBaseline_PatchFilter `json:"PatchFilters,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PatchBaseline_PatchFilterGroup) AWSCloudFormationType() string {
+	return "AWS::SSM::PatchBaseline.PatchFilterGroup"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchsource.go b/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchsource.go
new file mode 100644
index 0000000000..55102dab7a
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchsource.go
@@ -0,0 +1,47 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PatchBaseline_PatchSource AWS CloudFormation Resource (AWS::SSM::PatchBaseline.PatchSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-patchsource.html
+type PatchBaseline_PatchSource struct {
+
+	// Configuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-patchsource.html#cfn-ssm-patchbaseline-patchsource-configuration
+	Configuration *types.Value `json:"Configuration,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-patchsource.html#cfn-ssm-patchbaseline-patchsource-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Products AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-patchsource.html#cfn-ssm-patchbaseline-patchsource-products
+	Products *types.Value `json:"Products,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PatchBaseline_PatchSource) AWSCloudFormationType() string {
+	return "AWS::SSM::PatchBaseline.PatchSource"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchstringdate.go b/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchstringdate.go
new file mode 100644
index 0000000000..640d1bc4e4
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-patchbaseline_patchstringdate.go
@@ -0,0 +1,30 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// PatchBaseline_PatchStringDate AWS CloudFormation Resource (AWS::SSM::PatchBaseline.PatchStringDate)
+// See:
+type PatchBaseline_PatchStringDate struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PatchBaseline_PatchStringDate) AWSCloudFormationType() string {
+	return "AWS::SSM::PatchBaseline.PatchStringDate"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-patchbaseline_rule.go b/goformation/cloudformation/ssm/aws-ssm-patchbaseline_rule.go
new file mode 100644
index 0000000000..2156f41701
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-patchbaseline_rule.go
@@ -0,0 +1,57 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// PatchBaseline_Rule AWS CloudFormation Resource (AWS::SSM::PatchBaseline.Rule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-rule.html
+type PatchBaseline_Rule struct {
+
+	// ApproveAfterDays AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-rule.html#cfn-ssm-patchbaseline-rule-approveafterdays
+	ApproveAfterDays *types.Value `json:"ApproveAfterDays,omitempty"`
+
+	// ApproveUntilDate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-rule.html#cfn-ssm-patchbaseline-rule-approveuntildate
+	ApproveUntilDate *PatchBaseline_PatchStringDate `json:"ApproveUntilDate,omitempty"`
+
+	// ComplianceLevel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-rule.html#cfn-ssm-patchbaseline-rule-compliancelevel
+	ComplianceLevel *types.Value `json:"ComplianceLevel,omitempty"`
+
+	// EnableNonSecurity AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-rule.html#cfn-ssm-patchbaseline-rule-enablenonsecurity
+	EnableNonSecurity *types.Value `json:"EnableNonSecurity,omitempty"`
+
+	// PatchFilterGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-rule.html#cfn-ssm-patchbaseline-rule-patchfiltergroup
+	PatchFilterGroup *PatchBaseline_PatchFilterGroup `json:"PatchFilterGroup,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PatchBaseline_Rule) AWSCloudFormationType() string {
+	return "AWS::SSM::PatchBaseline.Rule"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-patchbaseline_rulegroup.go b/goformation/cloudformation/ssm/aws-ssm-patchbaseline_rulegroup.go
new file mode 100644
index 0000000000..ad7959ca00
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-patchbaseline_rulegroup.go
@@ -0,0 +1,35 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// PatchBaseline_RuleGroup AWS CloudFormation Resource (AWS::SSM::PatchBaseline.RuleGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-rulegroup.html
+type PatchBaseline_RuleGroup struct {
+
+	// PatchRules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-patchbaseline-rulegroup.html#cfn-ssm-patchbaseline-rulegroup-patchrules
+	PatchRules []PatchBaseline_Rule `json:"PatchRules,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *PatchBaseline_RuleGroup) AWSCloudFormationType() string {
+	return "AWS::SSM::PatchBaseline.RuleGroup"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-resourcedatasync.go b/goformation/cloudformation/ssm/aws-ssm-resourcedatasync.go
new file mode 100644
index 0000000000..312ee6e8f1
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-resourcedatasync.go
@@ -0,0 +1,148 @@
+package ssm
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDataSync AWS CloudFormation Resource (AWS::SSM::ResourceDataSync)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-resourcedatasync.html
+type ResourceDataSync struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-resourcedatasync.html#cfn-ssm-resourcedatasync-bucketname
+	BucketName *types.Value `json:"BucketName,omitempty"`
+
+	// BucketPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-resourcedatasync.html#cfn-ssm-resourcedatasync-bucketprefix
+	BucketPrefix *types.Value `json:"BucketPrefix,omitempty"`
+
+	// BucketRegion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-resourcedatasync.html#cfn-ssm-resourcedatasync-bucketregion
+	BucketRegion *types.Value `json:"BucketRegion,omitempty"`
+
+	// KMSKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-resourcedatasync.html#cfn-ssm-resourcedatasync-kmskeyarn
+	KMSKeyArn *types.Value `json:"KMSKeyArn,omitempty"`
+
+	// S3Destination AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-resourcedatasync.html#cfn-ssm-resourcedatasync-s3destination
+	S3Destination *ResourceDataSync_S3Destination `json:"S3Destination,omitempty"`
+
+	// SyncFormat AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-resourcedatasync.html#cfn-ssm-resourcedatasync-syncformat
+	SyncFormat *types.Value `json:"SyncFormat,omitempty"`
+
+	// SyncName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-resourcedatasync.html#cfn-ssm-resourcedatasync-syncname
+	SyncName *types.Value `json:"SyncName,omitempty"`
+
+	// SyncSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-resourcedatasync.html#cfn-ssm-resourcedatasync-syncsource
+	SyncSource *ResourceDataSync_SyncSource `json:"SyncSource,omitempty"`
+
+	// SyncType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssm-resourcedatasync.html#cfn-ssm-resourcedatasync-synctype
+	SyncType *types.Value `json:"SyncType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDataSync) AWSCloudFormationType() string {
+	return "AWS::SSM::ResourceDataSync"
+}
+
+// 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 ResourceDataSync) MarshalJSON() ([]byte, error) {
+	type Properties ResourceDataSync
+	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 *ResourceDataSync) UnmarshalJSON(b []byte) error {
+	type Properties ResourceDataSync
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResourceDataSync(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_awsorganizationssource.go b/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_awsorganizationssource.go
new file mode 100644
index 0000000000..8fa75403d6
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_awsorganizationssource.go
@@ -0,0 +1,42 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDataSync_AwsOrganizationsSource AWS CloudFormation Resource (AWS::SSM::ResourceDataSync.AwsOrganizationsSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-resourcedatasync-awsorganizationssource.html
+type ResourceDataSync_AwsOrganizationsSource struct {
+
+	// OrganizationSourceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-resourcedatasync-awsorganizationssource.html#cfn-ssm-resourcedatasync-awsorganizationssource-organizationsourcetype
+	OrganizationSourceType *types.Value `json:"OrganizationSourceType,omitempty"`
+
+	// OrganizationalUnits AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-resourcedatasync-awsorganizationssource.html#cfn-ssm-resourcedatasync-awsorganizationssource-organizationalunits
+	OrganizationalUnits *types.Value `json:"OrganizationalUnits,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDataSync_AwsOrganizationsSource) AWSCloudFormationType() string {
+	return "AWS::SSM::ResourceDataSync.AwsOrganizationsSource"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_s3destination.go b/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_s3destination.go
new file mode 100644
index 0000000000..065acdb29c
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_s3destination.go
@@ -0,0 +1,57 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDataSync_S3Destination AWS CloudFormation Resource (AWS::SSM::ResourceDataSync.S3Destination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-resourcedatasync-s3destination.html
+type ResourceDataSync_S3Destination struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-resourcedatasync-s3destination.html#cfn-ssm-resourcedatasync-s3destination-bucketname
+	BucketName *types.Value `json:"BucketName,omitempty"`
+
+	// BucketPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-resourcedatasync-s3destination.html#cfn-ssm-resourcedatasync-s3destination-bucketprefix
+	BucketPrefix *types.Value `json:"BucketPrefix,omitempty"`
+
+	// BucketRegion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-resourcedatasync-s3destination.html#cfn-ssm-resourcedatasync-s3destination-bucketregion
+	BucketRegion *types.Value `json:"BucketRegion,omitempty"`
+
+	// KMSKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-resourcedatasync-s3destination.html#cfn-ssm-resourcedatasync-s3destination-kmskeyarn
+	KMSKeyArn *types.Value `json:"KMSKeyArn,omitempty"`
+
+	// SyncFormat AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-resourcedatasync-s3destination.html#cfn-ssm-resourcedatasync-s3destination-syncformat
+	SyncFormat *types.Value `json:"SyncFormat,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResourceDataSync_S3Destination) AWSCloudFormationType() string {
+	return "AWS::SSM::ResourceDataSync.S3Destination"
+}
diff --git a/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_syncsource.go b/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_syncsource.go
new file mode 100644
index 0000000000..c269a98ed0
--- /dev/null
+++ b/goformation/cloudformation/ssm/aws-ssm-resourcedatasync_syncsource.go
@@ -0,0 +1,52 @@
+package ssm
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResourceDataSync_SyncSource AWS CloudFormation Resource (AWS::SSM::ResourceDataSync.SyncSource)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-resourcedatasync-syncsource.html
+type ResourceDataSync_SyncSource struct {
+
+	// AwsOrganizationsSource AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-resourcedatasync-syncsource.html#cfn-ssm-resourcedatasync-syncsource-awsorganizationssource
+	AwsOrganizationsSource *ResourceDataSync_AwsOrganizationsSource `json:"AwsOrganizationsSource,omitempty"`
+
+	// IncludeFutureRegions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-resourcedatasync-syncsource.html#cfn-ssm-resourcedatasync-syncsource-includefutureregions
+	IncludeFutureRegions *types.Value `json:"IncludeFutureRegions,omitempty"`
+
+	// SourceRegions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-resourcedatasync-syncsource.html#cfn-ssm-resourcedatasync-syncsource-sourceregions
+	SourceRegions *types.Value `json:"SourceRegions,omitempty"`
+
+	// SourceType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssm-resourcedatasync-syncsource.html#cfn-ssm-resourcedatasync-syncsource-sourcetype
+	SourceType *types.Value `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 *ResourceDataSync_SyncSource) AWSCloudFormationType() string {
+	return "AWS::SSM::ResourceDataSync.SyncSource"
+}
diff --git a/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact.go b/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact.go
new file mode 100644
index 0000000000..a4e148ea83
--- /dev/null
+++ b/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact.go
@@ -0,0 +1,123 @@
+package ssmcontacts
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Contact AWS CloudFormation Resource (AWS::SSMContacts::Contact)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmcontacts-contact.html
+type Contact struct {
+
+	// Alias AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmcontacts-contact.html#cfn-ssmcontacts-contact-alias
+	Alias *types.Value `json:"Alias,omitempty"`
+
+	// DisplayName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmcontacts-contact.html#cfn-ssmcontacts-contact-displayname
+	DisplayName *types.Value `json:"DisplayName,omitempty"`
+
+	// Plan AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmcontacts-contact.html#cfn-ssmcontacts-contact-plan
+	Plan []Contact_Stage `json:"Plan,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmcontacts-contact.html#cfn-ssmcontacts-contact-type
+	Type *types.Value `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 *Contact) AWSCloudFormationType() string {
+	return "AWS::SSMContacts::Contact"
+}
+
+// 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 Contact) MarshalJSON() ([]byte, error) {
+	type Properties Contact
+	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 *Contact) UnmarshalJSON(b []byte) error {
+	type Properties Contact
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Contact(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_channeltargetinfo.go b/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_channeltargetinfo.go
new file mode 100644
index 0000000000..e6cf14acb9
--- /dev/null
+++ b/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_channeltargetinfo.go
@@ -0,0 +1,42 @@
+package ssmcontacts
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Contact_ChannelTargetInfo AWS CloudFormation Resource (AWS::SSMContacts::Contact.ChannelTargetInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmcontacts-contact-channeltargetinfo.html
+type Contact_ChannelTargetInfo struct {
+
+	// ChannelId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmcontacts-contact-channeltargetinfo.html#cfn-ssmcontacts-contact-channeltargetinfo-channelid
+	ChannelId *types.Value `json:"ChannelId,omitempty"`
+
+	// RetryIntervalInMinutes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmcontacts-contact-channeltargetinfo.html#cfn-ssmcontacts-contact-channeltargetinfo-retryintervalinminutes
+	RetryIntervalInMinutes *types.Value `json:"RetryIntervalInMinutes"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Contact_ChannelTargetInfo) AWSCloudFormationType() string {
+	return "AWS::SSMContacts::Contact.ChannelTargetInfo"
+}
diff --git a/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_contacttargetinfo.go b/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_contacttargetinfo.go
new file mode 100644
index 0000000000..b8490e08cc
--- /dev/null
+++ b/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_contacttargetinfo.go
@@ -0,0 +1,42 @@
+package ssmcontacts
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Contact_ContactTargetInfo AWS CloudFormation Resource (AWS::SSMContacts::Contact.ContactTargetInfo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmcontacts-contact-contacttargetinfo.html
+type Contact_ContactTargetInfo struct {
+
+	// ContactId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmcontacts-contact-contacttargetinfo.html#cfn-ssmcontacts-contact-contacttargetinfo-contactid
+	ContactId *types.Value `json:"ContactId,omitempty"`
+
+	// IsEssential AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmcontacts-contact-contacttargetinfo.html#cfn-ssmcontacts-contact-contacttargetinfo-isessential
+	IsEssential *types.Value `json:"IsEssential"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Contact_ContactTargetInfo) AWSCloudFormationType() string {
+	return "AWS::SSMContacts::Contact.ContactTargetInfo"
+}
diff --git a/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_stage.go b/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_stage.go
new file mode 100644
index 0000000000..8e8bab8575
--- /dev/null
+++ b/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_stage.go
@@ -0,0 +1,42 @@
+package ssmcontacts
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Contact_Stage AWS CloudFormation Resource (AWS::SSMContacts::Contact.Stage)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmcontacts-contact-stage.html
+type Contact_Stage struct {
+
+	// DurationInMinutes AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmcontacts-contact-stage.html#cfn-ssmcontacts-contact-stage-durationinminutes
+	DurationInMinutes *types.Value `json:"DurationInMinutes"`
+
+	// Targets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmcontacts-contact-stage.html#cfn-ssmcontacts-contact-stage-targets
+	Targets []Contact_Targets `json:"Targets,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Contact_Stage) AWSCloudFormationType() string {
+	return "AWS::SSMContacts::Contact.Stage"
+}
diff --git a/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_targets.go b/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_targets.go
new file mode 100644
index 0000000000..6316500e8f
--- /dev/null
+++ b/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contact_targets.go
@@ -0,0 +1,40 @@
+package ssmcontacts
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Contact_Targets AWS CloudFormation Resource (AWS::SSMContacts::Contact.Targets)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmcontacts-contact-targets.html
+type Contact_Targets struct {
+
+	// ChannelTargetInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmcontacts-contact-targets.html#cfn-ssmcontacts-contact-targets-channeltargetinfo
+	ChannelTargetInfo *Contact_ChannelTargetInfo `json:"ChannelTargetInfo,omitempty"`
+
+	// ContactTargetInfo AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmcontacts-contact-targets.html#cfn-ssmcontacts-contact-targets-contacttargetinfo
+	ContactTargetInfo *Contact_ContactTargetInfo `json:"ContactTargetInfo,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Contact_Targets) AWSCloudFormationType() string {
+	return "AWS::SSMContacts::Contact.Targets"
+}
diff --git a/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contactchannel.go b/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contactchannel.go
new file mode 100644
index 0000000000..4cab4d7149
--- /dev/null
+++ b/goformation/cloudformation/ssmcontacts/aws-ssmcontacts-contactchannel.go
@@ -0,0 +1,128 @@
+package ssmcontacts
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ContactChannel AWS CloudFormation Resource (AWS::SSMContacts::ContactChannel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmcontacts-contactchannel.html
+type ContactChannel struct {
+
+	// ChannelAddress AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmcontacts-contactchannel.html#cfn-ssmcontacts-contactchannel-channeladdress
+	ChannelAddress *types.Value `json:"ChannelAddress,omitempty"`
+
+	// ChannelName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmcontacts-contactchannel.html#cfn-ssmcontacts-contactchannel-channelname
+	ChannelName *types.Value `json:"ChannelName,omitempty"`
+
+	// ChannelType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmcontacts-contactchannel.html#cfn-ssmcontacts-contactchannel-channeltype
+	ChannelType *types.Value `json:"ChannelType,omitempty"`
+
+	// ContactId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmcontacts-contactchannel.html#cfn-ssmcontacts-contactchannel-contactid
+	ContactId *types.Value `json:"ContactId,omitempty"`
+
+	// DeferActivation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmcontacts-contactchannel.html#cfn-ssmcontacts-contactchannel-deferactivation
+	DeferActivation *types.Value `json:"DeferActivation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ContactChannel) AWSCloudFormationType() string {
+	return "AWS::SSMContacts::ContactChannel"
+}
+
+// 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 ContactChannel) MarshalJSON() ([]byte, error) {
+	type Properties ContactChannel
+	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 *ContactChannel) UnmarshalJSON(b []byte) error {
+	type Properties ContactChannel
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ContactChannel(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset.go b/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset.go
new file mode 100644
index 0000000000..5ab98df9be
--- /dev/null
+++ b/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset.go
@@ -0,0 +1,113 @@
+package ssmincidents
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReplicationSet AWS CloudFormation Resource (AWS::SSMIncidents::ReplicationSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmincidents-replicationset.html
+type ReplicationSet struct {
+
+	// DeletionProtected AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmincidents-replicationset.html#cfn-ssmincidents-replicationset-deletionprotected
+	DeletionProtected *types.Value `json:"DeletionProtected,omitempty"`
+
+	// Regions AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmincidents-replicationset.html#cfn-ssmincidents-replicationset-regions
+	Regions []ReplicationSet_ReplicationRegion `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 *ReplicationSet) AWSCloudFormationType() string {
+	return "AWS::SSMIncidents::ReplicationSet"
+}
+
+// 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 ReplicationSet) MarshalJSON() ([]byte, error) {
+	type Properties ReplicationSet
+	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 *ReplicationSet) UnmarshalJSON(b []byte) error {
+	type Properties ReplicationSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ReplicationSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset_regionconfiguration.go b/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset_regionconfiguration.go
new file mode 100644
index 0000000000..2c1b47d6b3
--- /dev/null
+++ b/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset_regionconfiguration.go
@@ -0,0 +1,37 @@
+package ssmincidents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReplicationSet_RegionConfiguration AWS CloudFormation Resource (AWS::SSMIncidents::ReplicationSet.RegionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-replicationset-regionconfiguration.html
+type ReplicationSet_RegionConfiguration struct {
+
+	// SseKmsKeyId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-replicationset-regionconfiguration.html#cfn-ssmincidents-replicationset-regionconfiguration-ssekmskeyid
+	SseKmsKeyId *types.Value `json:"SseKmsKeyId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReplicationSet_RegionConfiguration) AWSCloudFormationType() string {
+	return "AWS::SSMIncidents::ReplicationSet.RegionConfiguration"
+}
diff --git a/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset_replicationregion.go b/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset_replicationregion.go
new file mode 100644
index 0000000000..bdfd4c52af
--- /dev/null
+++ b/goformation/cloudformation/ssmincidents/aws-ssmincidents-replicationset_replicationregion.go
@@ -0,0 +1,42 @@
+package ssmincidents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ReplicationSet_ReplicationRegion AWS CloudFormation Resource (AWS::SSMIncidents::ReplicationSet.ReplicationRegion)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-replicationset-replicationregion.html
+type ReplicationSet_ReplicationRegion struct {
+
+	// RegionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-replicationset-replicationregion.html#cfn-ssmincidents-replicationset-replicationregion-regionconfiguration
+	RegionConfiguration *ReplicationSet_RegionConfiguration `json:"RegionConfiguration,omitempty"`
+
+	// RegionName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-replicationset-replicationregion.html#cfn-ssmincidents-replicationset-replicationregion-regionname
+	RegionName *types.Value `json:"RegionName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ReplicationSet_ReplicationRegion) AWSCloudFormationType() string {
+	return "AWS::SSMIncidents::ReplicationSet.ReplicationRegion"
+}
diff --git a/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan.go b/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan.go
new file mode 100644
index 0000000000..f90317dacf
--- /dev/null
+++ b/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan.go
@@ -0,0 +1,139 @@
+package ssmincidents
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponsePlan AWS CloudFormation Resource (AWS::SSMIncidents::ResponsePlan)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmincidents-responseplan.html
+type ResponsePlan struct {
+
+	// Actions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmincidents-responseplan.html#cfn-ssmincidents-responseplan-actions
+	Actions []ResponsePlan_Action `json:"Actions,omitempty"`
+
+	// ChatChannel AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmincidents-responseplan.html#cfn-ssmincidents-responseplan-chatchannel
+	ChatChannel *ResponsePlan_ChatChannel `json:"ChatChannel,omitempty"`
+
+	// DisplayName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmincidents-responseplan.html#cfn-ssmincidents-responseplan-displayname
+	DisplayName *types.Value `json:"DisplayName,omitempty"`
+
+	// Engagements AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmincidents-responseplan.html#cfn-ssmincidents-responseplan-engagements
+	Engagements *types.Value `json:"Engagements,omitempty"`
+
+	// IncidentTemplate AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmincidents-responseplan.html#cfn-ssmincidents-responseplan-incidenttemplate
+	IncidentTemplate *ResponsePlan_IncidentTemplate `json:"IncidentTemplate,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmincidents-responseplan.html#cfn-ssmincidents-responseplan-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-ssmincidents-responseplan.html#cfn-ssmincidents-responseplan-tags
+	Tags []cloudformation.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 *ResponsePlan) AWSCloudFormationType() string {
+	return "AWS::SSMIncidents::ResponsePlan"
+}
+
+// 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 ResponsePlan) MarshalJSON() ([]byte, error) {
+	type Properties ResponsePlan
+	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 *ResponsePlan) UnmarshalJSON(b []byte) error {
+	type Properties ResponsePlan
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ResponsePlan(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_action.go b/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_action.go
new file mode 100644
index 0000000000..d8cbb9ec89
--- /dev/null
+++ b/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_action.go
@@ -0,0 +1,35 @@
+package ssmincidents
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponsePlan_Action AWS CloudFormation Resource (AWS::SSMIncidents::ResponsePlan.Action)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-action.html
+type ResponsePlan_Action struct {
+
+	// SsmAutomation AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-action.html#cfn-ssmincidents-responseplan-action-ssmautomation
+	SsmAutomation *ResponsePlan_SsmAutomation `json:"SsmAutomation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponsePlan_Action) AWSCloudFormationType() string {
+	return "AWS::SSMIncidents::ResponsePlan.Action"
+}
diff --git a/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_chatchannel.go b/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_chatchannel.go
new file mode 100644
index 0000000000..4da076daaa
--- /dev/null
+++ b/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_chatchannel.go
@@ -0,0 +1,37 @@
+package ssmincidents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponsePlan_ChatChannel AWS CloudFormation Resource (AWS::SSMIncidents::ResponsePlan.ChatChannel)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-chatchannel.html
+type ResponsePlan_ChatChannel struct {
+
+	// ChatbotSns AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-chatchannel.html#cfn-ssmincidents-responseplan-chatchannel-chatbotsns
+	ChatbotSns *types.Value `json:"ChatbotSns,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponsePlan_ChatChannel) AWSCloudFormationType() string {
+	return "AWS::SSMIncidents::ResponsePlan.ChatChannel"
+}
diff --git a/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_incidenttemplate.go b/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_incidenttemplate.go
new file mode 100644
index 0000000000..afd9d2bed4
--- /dev/null
+++ b/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_incidenttemplate.go
@@ -0,0 +1,57 @@
+package ssmincidents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponsePlan_IncidentTemplate AWS CloudFormation Resource (AWS::SSMIncidents::ResponsePlan.IncidentTemplate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-incidenttemplate.html
+type ResponsePlan_IncidentTemplate struct {
+
+	// DedupeString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-incidenttemplate.html#cfn-ssmincidents-responseplan-incidenttemplate-dedupestring
+	DedupeString *types.Value `json:"DedupeString,omitempty"`
+
+	// Impact AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-incidenttemplate.html#cfn-ssmincidents-responseplan-incidenttemplate-impact
+	Impact *types.Value `json:"Impact"`
+
+	// NotificationTargets AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-incidenttemplate.html#cfn-ssmincidents-responseplan-incidenttemplate-notificationtargets
+	NotificationTargets []ResponsePlan_NotificationTargetItem `json:"NotificationTargets,omitempty"`
+
+	// Summary AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-incidenttemplate.html#cfn-ssmincidents-responseplan-incidenttemplate-summary
+	Summary *types.Value `json:"Summary,omitempty"`
+
+	// Title AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-incidenttemplate.html#cfn-ssmincidents-responseplan-incidenttemplate-title
+	Title *types.Value `json:"Title,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponsePlan_IncidentTemplate) AWSCloudFormationType() string {
+	return "AWS::SSMIncidents::ResponsePlan.IncidentTemplate"
+}
diff --git a/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_notificationtargetitem.go b/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_notificationtargetitem.go
new file mode 100644
index 0000000000..2806af2b36
--- /dev/null
+++ b/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_notificationtargetitem.go
@@ -0,0 +1,37 @@
+package ssmincidents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponsePlan_NotificationTargetItem AWS CloudFormation Resource (AWS::SSMIncidents::ResponsePlan.NotificationTargetItem)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-notificationtargetitem.html
+type ResponsePlan_NotificationTargetItem struct {
+
+	// SnsTopicArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-notificationtargetitem.html#cfn-ssmincidents-responseplan-notificationtargetitem-snstopicarn
+	SnsTopicArn *types.Value `json:"SnsTopicArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponsePlan_NotificationTargetItem) AWSCloudFormationType() string {
+	return "AWS::SSMIncidents::ResponsePlan.NotificationTargetItem"
+}
diff --git a/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmautomation.go b/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmautomation.go
new file mode 100644
index 0000000000..634577bf8a
--- /dev/null
+++ b/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmautomation.go
@@ -0,0 +1,57 @@
+package ssmincidents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponsePlan_SsmAutomation AWS CloudFormation Resource (AWS::SSMIncidents::ResponsePlan.SsmAutomation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-ssmautomation.html
+type ResponsePlan_SsmAutomation struct {
+
+	// DocumentName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-ssmautomation.html#cfn-ssmincidents-responseplan-ssmautomation-documentname
+	DocumentName *types.Value `json:"DocumentName,omitempty"`
+
+	// DocumentVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-ssmautomation.html#cfn-ssmincidents-responseplan-ssmautomation-documentversion
+	DocumentVersion *types.Value `json:"DocumentVersion,omitempty"`
+
+	// Parameters AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-ssmautomation.html#cfn-ssmincidents-responseplan-ssmautomation-parameters
+	Parameters []ResponsePlan_SsmParameter `json:"Parameters,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-ssmautomation.html#cfn-ssmincidents-responseplan-ssmautomation-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// TargetAccount AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-ssmautomation.html#cfn-ssmincidents-responseplan-ssmautomation-targetaccount
+	TargetAccount *types.Value `json:"TargetAccount,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponsePlan_SsmAutomation) AWSCloudFormationType() string {
+	return "AWS::SSMIncidents::ResponsePlan.SsmAutomation"
+}
diff --git a/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmparameter.go b/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmparameter.go
new file mode 100644
index 0000000000..2acacdf64f
--- /dev/null
+++ b/goformation/cloudformation/ssmincidents/aws-ssmincidents-responseplan_ssmparameter.go
@@ -0,0 +1,42 @@
+package ssmincidents
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ResponsePlan_SsmParameter AWS CloudFormation Resource (AWS::SSMIncidents::ResponsePlan.SsmParameter)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-ssmparameter.html
+type ResponsePlan_SsmParameter struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-ssmparameter.html#cfn-ssmincidents-responseplan-ssmparameter-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Values AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ssmincidents-responseplan-ssmparameter.html#cfn-ssmincidents-responseplan-ssmparameter-values
+	Values *types.Value `json:"Values,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ResponsePlan_SsmParameter) AWSCloudFormationType() string {
+	return "AWS::SSMIncidents::ResponsePlan.SsmParameter"
+}
diff --git a/goformation/cloudformation/sso/aws-sso-assignment.go b/goformation/cloudformation/sso/aws-sso-assignment.go
new file mode 100644
index 0000000000..4dbb8a35b5
--- /dev/null
+++ b/goformation/cloudformation/sso/aws-sso-assignment.go
@@ -0,0 +1,133 @@
+package sso
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Assignment AWS CloudFormation Resource (AWS::SSO::Assignment)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-assignment.html
+type Assignment struct {
+
+	// InstanceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-assignment.html#cfn-sso-assignment-instancearn
+	InstanceArn *types.Value `json:"InstanceArn,omitempty"`
+
+	// PermissionSetArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-assignment.html#cfn-sso-assignment-permissionsetarn
+	PermissionSetArn *types.Value `json:"PermissionSetArn,omitempty"`
+
+	// PrincipalId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-assignment.html#cfn-sso-assignment-principalid
+	PrincipalId *types.Value `json:"PrincipalId,omitempty"`
+
+	// PrincipalType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-assignment.html#cfn-sso-assignment-principaltype
+	PrincipalType *types.Value `json:"PrincipalType,omitempty"`
+
+	// TargetId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-assignment.html#cfn-sso-assignment-targetid
+	TargetId *types.Value `json:"TargetId,omitempty"`
+
+	// TargetType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-assignment.html#cfn-sso-assignment-targettype
+	TargetType *types.Value `json:"TargetType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Assignment) AWSCloudFormationType() string {
+	return "AWS::SSO::Assignment"
+}
+
+// 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 Assignment) MarshalJSON() ([]byte, error) {
+	type Properties Assignment
+	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 *Assignment) UnmarshalJSON(b []byte) error {
+	type Properties Assignment
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Assignment(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration.go b/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration.go
new file mode 100644
index 0000000000..7fe75ffeaa
--- /dev/null
+++ b/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration.go
@@ -0,0 +1,113 @@
+package sso
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceAccessControlAttributeConfiguration AWS CloudFormation Resource (AWS::SSO::InstanceAccessControlAttributeConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-instanceaccesscontrolattributeconfiguration.html
+type InstanceAccessControlAttributeConfiguration struct {
+
+	// AccessControlAttributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-instanceaccesscontrolattributeconfiguration.html#cfn-sso-instanceaccesscontrolattributeconfiguration-accesscontrolattributes
+	AccessControlAttributes []InstanceAccessControlAttributeConfiguration_AccessControlAttribute `json:"AccessControlAttributes,omitempty"`
+
+	// InstanceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-instanceaccesscontrolattributeconfiguration.html#cfn-sso-instanceaccesscontrolattributeconfiguration-instancearn
+	InstanceArn *types.Value `json:"InstanceArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InstanceAccessControlAttributeConfiguration) AWSCloudFormationType() string {
+	return "AWS::SSO::InstanceAccessControlAttributeConfiguration"
+}
+
+// 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 InstanceAccessControlAttributeConfiguration) MarshalJSON() ([]byte, error) {
+	type Properties InstanceAccessControlAttributeConfiguration
+	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 *InstanceAccessControlAttributeConfiguration) UnmarshalJSON(b []byte) error {
+	type Properties InstanceAccessControlAttributeConfiguration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = InstanceAccessControlAttributeConfiguration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattribute.go b/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattribute.go
new file mode 100644
index 0000000000..0d365d28c0
--- /dev/null
+++ b/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattribute.go
@@ -0,0 +1,42 @@
+package sso
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceAccessControlAttributeConfiguration_AccessControlAttribute AWS CloudFormation Resource (AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttribute)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sso-instanceaccesscontrolattributeconfiguration-accesscontrolattribute.html
+type InstanceAccessControlAttributeConfiguration_AccessControlAttribute struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sso-instanceaccesscontrolattributeconfiguration-accesscontrolattribute.html#cfn-sso-instanceaccesscontrolattributeconfiguration-accesscontrolattribute-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sso-instanceaccesscontrolattributeconfiguration-accesscontrolattribute.html#cfn-sso-instanceaccesscontrolattributeconfiguration-accesscontrolattribute-value
+	Value *InstanceAccessControlAttributeConfiguration_AccessControlAttributeValue `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 *InstanceAccessControlAttributeConfiguration_AccessControlAttribute) AWSCloudFormationType() string {
+	return "AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttribute"
+}
diff --git a/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattributevalue.go b/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattributevalue.go
new file mode 100644
index 0000000000..67d8b0f212
--- /dev/null
+++ b/goformation/cloudformation/sso/aws-sso-instanceaccesscontrolattributeconfiguration_accesscontrolattributevalue.go
@@ -0,0 +1,37 @@
+package sso
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// InstanceAccessControlAttributeConfiguration_AccessControlAttributeValue AWS CloudFormation Resource (AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttributeValue)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sso-instanceaccesscontrolattributeconfiguration-accesscontrolattributevalue.html
+type InstanceAccessControlAttributeConfiguration_AccessControlAttributeValue struct {
+
+	// Source AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-sso-instanceaccesscontrolattributeconfiguration-accesscontrolattributevalue.html#cfn-sso-instanceaccesscontrolattributeconfiguration-accesscontrolattributevalue-source
+	Source *types.Value `json:"Source,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *InstanceAccessControlAttributeConfiguration_AccessControlAttributeValue) AWSCloudFormationType() string {
+	return "AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttributeValue"
+}
diff --git a/goformation/cloudformation/sso/aws-sso-permissionset.go b/goformation/cloudformation/sso/aws-sso-permissionset.go
new file mode 100644
index 0000000000..411c72b922
--- /dev/null
+++ b/goformation/cloudformation/sso/aws-sso-permissionset.go
@@ -0,0 +1,144 @@
+package sso
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// PermissionSet AWS CloudFormation Resource (AWS::SSO::PermissionSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-permissionset.html
+type PermissionSet struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-permissionset.html#cfn-sso-permissionset-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// InlinePolicy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-permissionset.html#cfn-sso-permissionset-inlinepolicy
+	InlinePolicy interface{} `json:"InlinePolicy,omitempty"`
+
+	// InstanceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-permissionset.html#cfn-sso-permissionset-instancearn
+	InstanceArn *types.Value `json:"InstanceArn,omitempty"`
+
+	// ManagedPolicies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-permissionset.html#cfn-sso-permissionset-managedpolicies
+	ManagedPolicies *types.Value `json:"ManagedPolicies,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-permissionset.html#cfn-sso-permissionset-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RelayStateType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-permissionset.html#cfn-sso-permissionset-relaystatetype
+	RelayStateType *types.Value `json:"RelayStateType,omitempty"`
+
+	// SessionDuration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-permissionset.html#cfn-sso-permissionset-sessionduration
+	SessionDuration *types.Value `json:"SessionDuration,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-sso-permissionset.html#cfn-sso-permissionset-tags
+	Tags []cloudformation.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 *PermissionSet) AWSCloudFormationType() string {
+	return "AWS::SSO::PermissionSet"
+}
+
+// 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 PermissionSet) MarshalJSON() ([]byte, error) {
+	type Properties PermissionSet
+	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 *PermissionSet) UnmarshalJSON(b []byte) error {
+	type Properties PermissionSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = PermissionSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/stepfunctions/aws-stepfunctions-activity.go b/goformation/cloudformation/stepfunctions/aws-stepfunctions-activity.go
new file mode 100644
index 0000000000..d71de0e261
--- /dev/null
+++ b/goformation/cloudformation/stepfunctions/aws-stepfunctions-activity.go
@@ -0,0 +1,113 @@
+package stepfunctions
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Activity AWS CloudFormation Resource (AWS::StepFunctions::Activity)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html
+type Activity struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-activity.html#cfn-stepfunctions-activity-tags
+	Tags []Activity_TagsEntry `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 *Activity) AWSCloudFormationType() string {
+	return "AWS::StepFunctions::Activity"
+}
+
+// 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 Activity) MarshalJSON() ([]byte, error) {
+	type Properties Activity
+	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 *Activity) UnmarshalJSON(b []byte) error {
+	type Properties Activity
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Activity(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/stepfunctions/aws-stepfunctions-activity_tagsentry.go b/goformation/cloudformation/stepfunctions/aws-stepfunctions-activity_tagsentry.go
new file mode 100644
index 0000000000..c1f37cbfc0
--- /dev/null
+++ b/goformation/cloudformation/stepfunctions/aws-stepfunctions-activity_tagsentry.go
@@ -0,0 +1,42 @@
+package stepfunctions
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Activity_TagsEntry AWS CloudFormation Resource (AWS::StepFunctions::Activity.TagsEntry)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-activity-tagsentry.html
+type Activity_TagsEntry struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-activity-tagsentry.html#cfn-stepfunctions-activity-tagsentry-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-activity-tagsentry.html#cfn-stepfunctions-activity-tagsentry-value
+	Value *types.Value `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 *Activity_TagsEntry) AWSCloudFormationType() string {
+	return "AWS::StepFunctions::Activity.TagsEntry"
+}
diff --git a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine.go b/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine.go
new file mode 100644
index 0000000000..09857033c5
--- /dev/null
+++ b/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine.go
@@ -0,0 +1,153 @@
+package stepfunctions
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine AWS CloudFormation Resource (AWS::StepFunctions::StateMachine)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html
+type StateMachine struct {
+
+	// Definition AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definition
+	Definition *StateMachine_Definition `json:"Definition,omitempty"`
+
+	// DefinitionS3Location AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitions3location
+	DefinitionS3Location *StateMachine_S3Location `json:"DefinitionS3Location,omitempty"`
+
+	// DefinitionString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionstring
+	DefinitionString *types.Value `json:"DefinitionString,omitempty"`
+
+	// DefinitionSubstitutions AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-definitionsubstitutions
+	DefinitionSubstitutions map[string]*types.Value `json:"DefinitionSubstitutions,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
+	LoggingConfiguration *StateMachine_LoggingConfiguration `json:"LoggingConfiguration,omitempty"`
+
+	// RoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-rolearn
+	RoleArn *types.Value `json:"RoleArn,omitempty"`
+
+	// StateMachineName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinename
+	StateMachineName *types.Value `json:"StateMachineName,omitempty"`
+
+	// StateMachineType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-statemachinetype
+	StateMachineType *types.Value `json:"StateMachineType,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tags
+	Tags []StateMachine_TagsEntry `json:"Tags,omitempty"`
+
+	// TracingConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-stepfunctions-statemachine.html#cfn-stepfunctions-statemachine-tracingconfiguration
+	TracingConfiguration *StateMachine_TracingConfiguration `json:"TracingConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::StepFunctions::StateMachine"
+}
+
+// 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 StateMachine) MarshalJSON() ([]byte, error) {
+	type Properties StateMachine
+	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 *StateMachine) UnmarshalJSON(b []byte) error {
+	type Properties StateMachine
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = StateMachine(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_cloudwatchlogsloggroup.go b/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_cloudwatchlogsloggroup.go
new file mode 100644
index 0000000000..bbc57a8d1a
--- /dev/null
+++ b/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_cloudwatchlogsloggroup.go
@@ -0,0 +1,37 @@
+package stepfunctions
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_CloudWatchLogsLogGroup AWS CloudFormation Resource (AWS::StepFunctions::StateMachine.CloudWatchLogsLogGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-cloudwatchlogsloggroup.html
+type StateMachine_CloudWatchLogsLogGroup struct {
+
+	// LogGroupArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-cloudwatchlogsloggroup.html#cfn-stepfunctions-statemachine-cloudwatchlogsloggroup-loggrouparn
+	LogGroupArn *types.Value `json:"LogGroupArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_CloudWatchLogsLogGroup) AWSCloudFormationType() string {
+	return "AWS::StepFunctions::StateMachine.CloudWatchLogsLogGroup"
+}
diff --git a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definition.go b/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definition.go
new file mode 100644
index 0000000000..4dc4536b5f
--- /dev/null
+++ b/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definition.go
@@ -0,0 +1,30 @@
+package stepfunctions
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_Definition AWS CloudFormation Resource (AWS::StepFunctions::StateMachine.Definition)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-definition.html
+type StateMachine_Definition struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_Definition) AWSCloudFormationType() string {
+	return "AWS::StepFunctions::StateMachine.Definition"
+}
diff --git a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definitionsubstitutions.go b/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definitionsubstitutions.go
new file mode 100644
index 0000000000..9c2f5381e3
--- /dev/null
+++ b/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_definitionsubstitutions.go
@@ -0,0 +1,30 @@
+package stepfunctions
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_DefinitionSubstitutions AWS CloudFormation Resource (AWS::StepFunctions::StateMachine.DefinitionSubstitutions)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-definitionsubstitutions.html
+type StateMachine_DefinitionSubstitutions struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_DefinitionSubstitutions) AWSCloudFormationType() string {
+	return "AWS::StepFunctions::StateMachine.DefinitionSubstitutions"
+}
diff --git a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_logdestination.go b/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_logdestination.go
new file mode 100644
index 0000000000..8b6404c449
--- /dev/null
+++ b/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_logdestination.go
@@ -0,0 +1,35 @@
+package stepfunctions
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_LogDestination AWS CloudFormation Resource (AWS::StepFunctions::StateMachine.LogDestination)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-logdestination.html
+type StateMachine_LogDestination struct {
+
+	// CloudWatchLogsLogGroup AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-logdestination.html#cfn-stepfunctions-statemachine-logdestination-cloudwatchlogsloggroup
+	CloudWatchLogsLogGroup *StateMachine_CloudWatchLogsLogGroup `json:"CloudWatchLogsLogGroup,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LogDestination) AWSCloudFormationType() string {
+	return "AWS::StepFunctions::StateMachine.LogDestination"
+}
diff --git a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_loggingconfiguration.go b/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_loggingconfiguration.go
new file mode 100644
index 0000000000..63bfbcb092
--- /dev/null
+++ b/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_loggingconfiguration.go
@@ -0,0 +1,47 @@
+package stepfunctions
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_LoggingConfiguration AWS CloudFormation Resource (AWS::StepFunctions::StateMachine.LoggingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-loggingconfiguration.html
+type StateMachine_LoggingConfiguration struct {
+
+	// Destinations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-loggingconfiguration.html#cfn-stepfunctions-statemachine-loggingconfiguration-destinations
+	Destinations []StateMachine_LogDestination `json:"Destinations,omitempty"`
+
+	// IncludeExecutionData AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-loggingconfiguration.html#cfn-stepfunctions-statemachine-loggingconfiguration-includeexecutiondata
+	IncludeExecutionData *types.Value `json:"IncludeExecutionData,omitempty"`
+
+	// Level AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-loggingconfiguration.html#cfn-stepfunctions-statemachine-loggingconfiguration-level
+	Level *types.Value `json:"Level,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_LoggingConfiguration) AWSCloudFormationType() string {
+	return "AWS::StepFunctions::StateMachine.LoggingConfiguration"
+}
diff --git a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_s3location.go b/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_s3location.go
new file mode 100644
index 0000000000..63b85052d8
--- /dev/null
+++ b/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_s3location.go
@@ -0,0 +1,47 @@
+package stepfunctions
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_S3Location AWS CloudFormation Resource (AWS::StepFunctions::StateMachine.S3Location)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-s3location.html
+type StateMachine_S3Location struct {
+
+	// Bucket AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-s3location.html#cfn-stepfunctions-statemachine-s3location-bucket
+	Bucket *types.Value `json:"Bucket,omitempty"`
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-s3location.html#cfn-stepfunctions-statemachine-s3location-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-s3location.html#cfn-stepfunctions-statemachine-s3location-version
+	Version *types.Value `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 *StateMachine_S3Location) AWSCloudFormationType() string {
+	return "AWS::StepFunctions::StateMachine.S3Location"
+}
diff --git a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tagsentry.go b/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tagsentry.go
new file mode 100644
index 0000000000..0f8e67aec0
--- /dev/null
+++ b/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tagsentry.go
@@ -0,0 +1,42 @@
+package stepfunctions
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_TagsEntry AWS CloudFormation Resource (AWS::StepFunctions::StateMachine.TagsEntry)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-tagsentry.html
+type StateMachine_TagsEntry struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-tagsentry.html#cfn-stepfunctions-statemachine-tagsentry-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-tagsentry.html#cfn-stepfunctions-statemachine-tagsentry-value
+	Value *types.Value `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 *StateMachine_TagsEntry) AWSCloudFormationType() string {
+	return "AWS::StepFunctions::StateMachine.TagsEntry"
+}
diff --git a/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tracingconfiguration.go b/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tracingconfiguration.go
new file mode 100644
index 0000000000..3b1f1c4058
--- /dev/null
+++ b/goformation/cloudformation/stepfunctions/aws-stepfunctions-statemachine_tracingconfiguration.go
@@ -0,0 +1,37 @@
+package stepfunctions
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// StateMachine_TracingConfiguration AWS CloudFormation Resource (AWS::StepFunctions::StateMachine.TracingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-tracingconfiguration.html
+type StateMachine_TracingConfiguration struct {
+
+	// Enabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-tracingconfiguration.html#cfn-stepfunctions-statemachine-tracingconfiguration-enabled
+	Enabled *types.Value `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 *StateMachine_TracingConfiguration) AWSCloudFormationType() string {
+	return "AWS::StepFunctions::StateMachine.TracingConfiguration"
+}
diff --git a/goformation/cloudformation/synthetics/aws-synthetics-canary.go b/goformation/cloudformation/synthetics/aws-synthetics-canary.go
new file mode 100644
index 0000000000..8d3a440210
--- /dev/null
+++ b/goformation/cloudformation/synthetics/aws-synthetics-canary.go
@@ -0,0 +1,174 @@
+package synthetics
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Canary AWS CloudFormation Resource (AWS::Synthetics::Canary)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-synthetics-canary.html
+type Canary struct {
+
+	// ArtifactConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-synthetics-canary.html#cfn-synthetics-canary-artifactconfig
+	ArtifactConfig *Canary_ArtifactConfig `json:"ArtifactConfig,omitempty"`
+
+	// ArtifactS3Location AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-synthetics-canary.html#cfn-synthetics-canary-artifacts3location
+	ArtifactS3Location *types.Value `json:"ArtifactS3Location,omitempty"`
+
+	// Code AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-synthetics-canary.html#cfn-synthetics-canary-code
+	Code *Canary_Code `json:"Code,omitempty"`
+
+	// ExecutionRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-synthetics-canary.html#cfn-synthetics-canary-executionrolearn
+	ExecutionRoleArn *types.Value `json:"ExecutionRoleArn,omitempty"`
+
+	// FailureRetentionPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-synthetics-canary.html#cfn-synthetics-canary-failureretentionperiod
+	FailureRetentionPeriod *types.Value `json:"FailureRetentionPeriod,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-synthetics-canary.html#cfn-synthetics-canary-name
+	Name *types.Value `json:"Name,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
+	RunConfig *Canary_RunConfig `json:"RunConfig,omitempty"`
+
+	// RuntimeVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-synthetics-canary.html#cfn-synthetics-canary-runtimeversion
+	RuntimeVersion *types.Value `json:"RuntimeVersion,omitempty"`
+
+	// Schedule AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-synthetics-canary.html#cfn-synthetics-canary-schedule
+	Schedule *Canary_Schedule `json:"Schedule,omitempty"`
+
+	// StartCanaryAfterCreation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-synthetics-canary.html#cfn-synthetics-canary-startcanaryaftercreation
+	StartCanaryAfterCreation *types.Value `json:"StartCanaryAfterCreation"`
+
+	// SuccessRetentionPeriod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-synthetics-canary.html#cfn-synthetics-canary-successretentionperiod
+	SuccessRetentionPeriod *types.Value `json:"SuccessRetentionPeriod,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-synthetics-canary.html#cfn-synthetics-canary-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VPCConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-synthetics-canary.html#cfn-synthetics-canary-vpcconfig
+	VPCConfig *Canary_VPCConfig `json:"VPCConfig,omitempty"`
+
+	// VisualReference AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-synthetics-canary.html#cfn-synthetics-canary-visualreference
+	VisualReference *Canary_VisualReference `json:"VisualReference,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Canary) AWSCloudFormationType() string {
+	return "AWS::Synthetics::Canary"
+}
+
+// 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 Canary) MarshalJSON() ([]byte, error) {
+	type Properties Canary
+	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 *Canary) UnmarshalJSON(b []byte) error {
+	type Properties Canary
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Canary(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/synthetics/aws-synthetics-canary_artifactconfig.go b/goformation/cloudformation/synthetics/aws-synthetics-canary_artifactconfig.go
new file mode 100644
index 0000000000..7f2ce10c48
--- /dev/null
+++ b/goformation/cloudformation/synthetics/aws-synthetics-canary_artifactconfig.go
@@ -0,0 +1,35 @@
+package synthetics
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Canary_ArtifactConfig AWS CloudFormation Resource (AWS::Synthetics::Canary.ArtifactConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-artifactconfig.html
+type Canary_ArtifactConfig struct {
+
+	// S3Encryption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-artifactconfig.html#cfn-synthetics-canary-artifactconfig-s3encryption
+	S3Encryption *Canary_S3Encryption `json:"S3Encryption,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Canary_ArtifactConfig) AWSCloudFormationType() string {
+	return "AWS::Synthetics::Canary.ArtifactConfig"
+}
diff --git a/goformation/cloudformation/synthetics/aws-synthetics-canary_basescreenshot.go b/goformation/cloudformation/synthetics/aws-synthetics-canary_basescreenshot.go
new file mode 100644
index 0000000000..f250995cef
--- /dev/null
+++ b/goformation/cloudformation/synthetics/aws-synthetics-canary_basescreenshot.go
@@ -0,0 +1,42 @@
+package synthetics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Canary_BaseScreenshot AWS CloudFormation Resource (AWS::Synthetics::Canary.BaseScreenshot)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-basescreenshot.html
+type Canary_BaseScreenshot struct {
+
+	// IgnoreCoordinates AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-basescreenshot.html#cfn-synthetics-canary-basescreenshot-ignorecoordinates
+	IgnoreCoordinates *types.Value `json:"IgnoreCoordinates,omitempty"`
+
+	// ScreenshotName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-basescreenshot.html#cfn-synthetics-canary-basescreenshot-screenshotname
+	ScreenshotName *types.Value `json:"ScreenshotName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Canary_BaseScreenshot) AWSCloudFormationType() string {
+	return "AWS::Synthetics::Canary.BaseScreenshot"
+}
diff --git a/goformation/cloudformation/synthetics/aws-synthetics-canary_code.go b/goformation/cloudformation/synthetics/aws-synthetics-canary_code.go
new file mode 100644
index 0000000000..2f43589fec
--- /dev/null
+++ b/goformation/cloudformation/synthetics/aws-synthetics-canary_code.go
@@ -0,0 +1,57 @@
+package synthetics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Canary_Code AWS CloudFormation Resource (AWS::Synthetics::Canary.Code)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-code.html
+type Canary_Code struct {
+
+	// Handler AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-code.html#cfn-synthetics-canary-code-handler
+	Handler *types.Value `json:"Handler,omitempty"`
+
+	// S3Bucket AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-code.html#cfn-synthetics-canary-code-s3bucket
+	S3Bucket *types.Value `json:"S3Bucket,omitempty"`
+
+	// S3Key AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-code.html#cfn-synthetics-canary-code-s3key
+	S3Key *types.Value `json:"S3Key,omitempty"`
+
+	// S3ObjectVersion AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-code.html#cfn-synthetics-canary-code-s3objectversion
+	S3ObjectVersion *types.Value `json:"S3ObjectVersion,omitempty"`
+
+	// Script AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-code.html#cfn-synthetics-canary-code-script
+	Script *types.Value `json:"Script,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Canary_Code) AWSCloudFormationType() string {
+	return "AWS::Synthetics::Canary.Code"
+}
diff --git a/goformation/cloudformation/synthetics/aws-synthetics-canary_runconfig.go b/goformation/cloudformation/synthetics/aws-synthetics-canary_runconfig.go
new file mode 100644
index 0000000000..cae8b00611
--- /dev/null
+++ b/goformation/cloudformation/synthetics/aws-synthetics-canary_runconfig.go
@@ -0,0 +1,52 @@
+package synthetics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Canary_RunConfig AWS CloudFormation Resource (AWS::Synthetics::Canary.RunConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-runconfig.html
+type Canary_RunConfig struct {
+
+	// ActiveTracing AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-runconfig.html#cfn-synthetics-canary-runconfig-activetracing
+	ActiveTracing *types.Value `json:"ActiveTracing,omitempty"`
+
+	// EnvironmentVariables AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-runconfig.html#cfn-synthetics-canary-runconfig-environmentvariables
+	EnvironmentVariables map[string]*types.Value `json:"EnvironmentVariables,omitempty"`
+
+	// MemoryInMB AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-runconfig.html#cfn-synthetics-canary-runconfig-memoryinmb
+	MemoryInMB *types.Value `json:"MemoryInMB,omitempty"`
+
+	// TimeoutInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-runconfig.html#cfn-synthetics-canary-runconfig-timeoutinseconds
+	TimeoutInSeconds *types.Value `json:"TimeoutInSeconds,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Canary_RunConfig) AWSCloudFormationType() string {
+	return "AWS::Synthetics::Canary.RunConfig"
+}
diff --git a/goformation/cloudformation/synthetics/aws-synthetics-canary_s3encryption.go b/goformation/cloudformation/synthetics/aws-synthetics-canary_s3encryption.go
new file mode 100644
index 0000000000..41439638a1
--- /dev/null
+++ b/goformation/cloudformation/synthetics/aws-synthetics-canary_s3encryption.go
@@ -0,0 +1,42 @@
+package synthetics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Canary_S3Encryption AWS CloudFormation Resource (AWS::Synthetics::Canary.S3Encryption)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-s3encryption.html
+type Canary_S3Encryption struct {
+
+	// EncryptionMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-s3encryption.html#cfn-synthetics-canary-s3encryption-encryptionmode
+	EncryptionMode *types.Value `json:"EncryptionMode,omitempty"`
+
+	// KmsKeyArn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-s3encryption.html#cfn-synthetics-canary-s3encryption-kmskeyarn
+	KmsKeyArn *types.Value `json:"KmsKeyArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Canary_S3Encryption) AWSCloudFormationType() string {
+	return "AWS::Synthetics::Canary.S3Encryption"
+}
diff --git a/goformation/cloudformation/synthetics/aws-synthetics-canary_schedule.go b/goformation/cloudformation/synthetics/aws-synthetics-canary_schedule.go
new file mode 100644
index 0000000000..1acc92b554
--- /dev/null
+++ b/goformation/cloudformation/synthetics/aws-synthetics-canary_schedule.go
@@ -0,0 +1,42 @@
+package synthetics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Canary_Schedule AWS CloudFormation Resource (AWS::Synthetics::Canary.Schedule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-schedule.html
+type Canary_Schedule struct {
+
+	// DurationInSeconds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-schedule.html#cfn-synthetics-canary-schedule-durationinseconds
+	DurationInSeconds *types.Value `json:"DurationInSeconds,omitempty"`
+
+	// Expression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-schedule.html#cfn-synthetics-canary-schedule-expression
+	Expression *types.Value `json:"Expression,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Canary_Schedule) AWSCloudFormationType() string {
+	return "AWS::Synthetics::Canary.Schedule"
+}
diff --git a/goformation/cloudformation/synthetics/aws-synthetics-canary_visualreference.go b/goformation/cloudformation/synthetics/aws-synthetics-canary_visualreference.go
new file mode 100644
index 0000000000..9164d57d04
--- /dev/null
+++ b/goformation/cloudformation/synthetics/aws-synthetics-canary_visualreference.go
@@ -0,0 +1,42 @@
+package synthetics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Canary_VisualReference AWS CloudFormation Resource (AWS::Synthetics::Canary.VisualReference)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-visualreference.html
+type Canary_VisualReference struct {
+
+	// BaseCanaryRunId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-visualreference.html#cfn-synthetics-canary-visualreference-basecanaryrunid
+	BaseCanaryRunId *types.Value `json:"BaseCanaryRunId,omitempty"`
+
+	// BaseScreenshots AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-visualreference.html#cfn-synthetics-canary-visualreference-basescreenshots
+	BaseScreenshots []Canary_BaseScreenshot `json:"BaseScreenshots,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Canary_VisualReference) AWSCloudFormationType() string {
+	return "AWS::Synthetics::Canary.VisualReference"
+}
diff --git a/goformation/cloudformation/synthetics/aws-synthetics-canary_vpcconfig.go b/goformation/cloudformation/synthetics/aws-synthetics-canary_vpcconfig.go
new file mode 100644
index 0000000000..0e9c99d11f
--- /dev/null
+++ b/goformation/cloudformation/synthetics/aws-synthetics-canary_vpcconfig.go
@@ -0,0 +1,47 @@
+package synthetics
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Canary_VPCConfig AWS CloudFormation Resource (AWS::Synthetics::Canary.VPCConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-vpcconfig.html
+type Canary_VPCConfig struct {
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-vpcconfig.html#cfn-synthetics-canary-vpcconfig-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-vpcconfig.html#cfn-synthetics-canary-vpcconfig-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-synthetics-canary-vpcconfig.html#cfn-synthetics-canary-vpcconfig-vpcid
+	VpcId *types.Value `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 *Canary_VPCConfig) AWSCloudFormationType() string {
+	return "AWS::Synthetics::Canary.VPCConfig"
+}
diff --git a/goformation/cloudformation/template.go b/goformation/cloudformation/template.go
new file mode 100644
index 0000000000..3946c2e7a0
--- /dev/null
+++ b/goformation/cloudformation/template.go
@@ -0,0 +1,200 @@
+package cloudformation
+
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+
+	"goformation/v4/cloudformation/types"
+
+	"github.com/sanathkr/yaml"
+)
+
+// Template represents an AWS CloudFormation template
+// see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/template-anatomy.html
+type Template struct {
+	AWSTemplateFormatVersion string                 `json:"AWSTemplateFormatVersion,omitempty"`
+	Transform                *Transform             `json:"Transform,omitempty"`
+	Description              string                 `json:"Description,omitempty"`
+	Metadata                 map[string]interface{} `json:"Metadata,omitempty"`
+	Parameters               Parameters             `json:"Parameters,omitempty"`
+	Mappings                 map[string]interface{} `json:"Mappings,omitempty"`
+	Conditions               map[string]interface{} `json:"Conditions,omitempty"`
+	Resources                Resources              `json:"Resources,omitempty"`
+	Outputs                  Outputs                `json:"Outputs,omitempty"`
+}
+
+type Parameter struct {
+	Type                  string      `json:"Type"`
+	Description           string      `json:"Description,omitempty"`
+	Default               interface{} `json:"Default,omitempty"`
+	AllowedPattern        string      `json:"AllowedPattern,omitempty"`
+	AllowedValues         []string    `json:"AllowedValues,omitempty"`
+	ConstraintDescription string      `json:"ConstraintDescription,omitempty"`
+	MaxLength             int         `json:"MaxLength,omitempty"`
+	MinLength             int         `json:"MinLength,omitempty"`
+	MaxValue              float64     `json:"MaxValue,omitempty"`
+	MinValue              float64     `json:"MinValue,omitempty"`
+	NoEcho                bool        `json:"NoEcho,omitempty"`
+}
+
+type Output struct {
+	Value       interface{} `json:"Value"`
+	Description string      `json:"Description,omitempty"`
+	Export      *Export     `json:"Export,omitempty"`
+}
+
+type Export struct {
+	Name *types.Value `json:"Name,omitempty"`
+}
+
+type Resource interface {
+	AWSCloudFormationType() string
+}
+
+type Parameters map[string]Parameter
+type Resources map[string]Resource
+type Outputs map[string]Output
+
+func (resources *Resources) UnmarshalJSON(b []byte) error {
+	// Resources
+	var rawResources map[string]*json.RawMessage
+	err := json.Unmarshal(b, &rawResources)
+
+	if err != nil {
+		return err
+	}
+
+	newResources := Resources{}
+	for name, raw := range rawResources {
+		res, err := unmarshallResource(name, raw)
+		if err != nil {
+			return err
+		}
+		newResources[name] = res
+	}
+
+	*resources = newResources
+	return nil
+}
+
+func unmarshallResource(name string, raw_json *json.RawMessage) (Resource, error) {
+	var err error
+
+	type rType struct {
+		Type string
+	}
+
+	var rtype rType
+	if err = json.Unmarshal(*raw_json, &rtype); err != nil {
+		return nil, err
+	}
+
+	if rtype.Type == "" {
+		return nil, fmt.Errorf("Cannot find Type for %v", name)
+	}
+
+	// Custom Resource Handler
+	var resourceStruct Resource
+
+	if strings.HasPrefix(rtype.Type, "Custom::") {
+		resourceStruct = &CustomResource{Type: rtype.Type}
+	} else {
+		resourceStruct = AllResources()[rtype.Type]
+	}
+
+	err = json.Unmarshal(*raw_json, resourceStruct)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return resourceStruct, nil
+}
+
+type Transform struct {
+	String *string
+
+	StringArray *[]string
+}
+
+func (t Transform) value() interface{} {
+	if t.String != nil {
+		return t.String
+	}
+
+	if t.StringArray != nil {
+		return t.StringArray
+	}
+
+	return nil
+}
+
+func (t *Transform) MarshalJSON() ([]byte, error) {
+	return json.Marshal(t.value())
+}
+
+func (t *Transform) UnmarshalJSON(b []byte) error {
+	var typecheck interface{}
+	if err := json.Unmarshal(b, &typecheck); err != nil {
+		return err
+	}
+
+	switch val := typecheck.(type) {
+
+	case string:
+		t.String = &val
+
+	case []string:
+		t.StringArray = &val
+
+	case []interface{}:
+		var strslice []string
+		for _, i := range val {
+			switch str := i.(type) {
+			case string:
+				strslice = append(strslice, str)
+			}
+		}
+		t.StringArray = &strslice
+	}
+
+	return nil
+}
+
+// NewTemplate creates a new AWS CloudFormation template struct
+func NewTemplate() *Template {
+	return &Template{
+		AWSTemplateFormatVersion: "2010-09-09",
+		Description:              "",
+		Metadata:                 map[string]interface{}{},
+		Parameters:               Parameters{},
+		Mappings:                 map[string]interface{}{},
+		Conditions:               map[string]interface{}{},
+		Resources:                Resources{},
+		Outputs:                  Outputs{},
+	}
+}
+
+// JSON converts an AWS CloudFormation template object to JSON
+func (t *Template) JSON() ([]byte, error) {
+
+	j, err := json.MarshalIndent(t, "", "  ")
+	if err != nil {
+		return nil, err
+	}
+
+	return j, nil
+}
+
+// YAML converts an AWS CloudFormation template object to YAML
+func (t *Template) YAML() ([]byte, error) {
+
+	j, err := t.JSON()
+	if err != nil {
+		return nil, err
+	}
+
+	return yaml.JSONToYAML(j)
+
+}
diff --git a/goformation/cloudformation/timestream/aws-timestream-database.go b/goformation/cloudformation/timestream/aws-timestream-database.go
new file mode 100644
index 0000000000..231e8dfa21
--- /dev/null
+++ b/goformation/cloudformation/timestream/aws-timestream-database.go
@@ -0,0 +1,119 @@
+package timestream
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Database AWS CloudFormation Resource (AWS::Timestream::Database)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-database.html
+type Database struct {
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-database.html#cfn-timestream-database-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-database.html#cfn-timestream-database-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-database.html#cfn-timestream-database-tags
+	Tags []cloudformation.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 *Database) AWSCloudFormationType() string {
+	return "AWS::Timestream::Database"
+}
+
+// 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 Database) MarshalJSON() ([]byte, error) {
+	type Properties Database
+	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 *Database) UnmarshalJSON(b []byte) error {
+	type Properties Database
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Database(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/timestream/aws-timestream-scheduledquery.go b/goformation/cloudformation/timestream/aws-timestream-scheduledquery.go
new file mode 100644
index 0000000000..a5b3dc08f1
--- /dev/null
+++ b/goformation/cloudformation/timestream/aws-timestream-scheduledquery.go
@@ -0,0 +1,154 @@
+package timestream
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScheduledQuery AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-scheduledquery.html
+type ScheduledQuery struct {
+
+	// ClientToken AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-scheduledquery.html#cfn-timestream-scheduledquery-clienttoken
+	ClientToken *types.Value `json:"ClientToken,omitempty"`
+
+	// ErrorReportConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-scheduledquery.html#cfn-timestream-scheduledquery-errorreportconfiguration
+	ErrorReportConfiguration *ScheduledQuery_ErrorReportConfiguration `json:"ErrorReportConfiguration,omitempty"`
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-scheduledquery.html#cfn-timestream-scheduledquery-kmskeyid
+	KmsKeyId *types.Value `json:"KmsKeyId,omitempty"`
+
+	// NotificationConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-scheduledquery.html#cfn-timestream-scheduledquery-notificationconfiguration
+	NotificationConfiguration *ScheduledQuery_NotificationConfiguration `json:"NotificationConfiguration,omitempty"`
+
+	// QueryString AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-scheduledquery.html#cfn-timestream-scheduledquery-querystring
+	QueryString *types.Value `json:"QueryString,omitempty"`
+
+	// ScheduleConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-scheduledquery.html#cfn-timestream-scheduledquery-scheduleconfiguration
+	ScheduleConfiguration *ScheduledQuery_ScheduleConfiguration `json:"ScheduleConfiguration,omitempty"`
+
+	// ScheduledQueryExecutionRoleArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-scheduledquery.html#cfn-timestream-scheduledquery-scheduledqueryexecutionrolearn
+	ScheduledQueryExecutionRoleArn *types.Value `json:"ScheduledQueryExecutionRoleArn,omitempty"`
+
+	// ScheduledQueryName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-scheduledquery.html#cfn-timestream-scheduledquery-scheduledqueryname
+	ScheduledQueryName *types.Value `json:"ScheduledQueryName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-scheduledquery.html#cfn-timestream-scheduledquery-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// TargetConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-scheduledquery.html#cfn-timestream-scheduledquery-targetconfiguration
+	TargetConfiguration *ScheduledQuery_TargetConfiguration `json:"TargetConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScheduledQuery) AWSCloudFormationType() string {
+	return "AWS::Timestream::ScheduledQuery"
+}
+
+// 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 ScheduledQuery) MarshalJSON() ([]byte, error) {
+	type Properties ScheduledQuery
+	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 *ScheduledQuery) UnmarshalJSON(b []byte) error {
+	type Properties ScheduledQuery
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ScheduledQuery(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/timestream/aws-timestream-scheduledquery_dimensionmapping.go b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_dimensionmapping.go
new file mode 100644
index 0000000000..3405356c16
--- /dev/null
+++ b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_dimensionmapping.go
@@ -0,0 +1,42 @@
+package timestream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScheduledQuery_DimensionMapping AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.DimensionMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-dimensionmapping.html
+type ScheduledQuery_DimensionMapping struct {
+
+	// DimensionValueType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-dimensionmapping.html#cfn-timestream-scheduledquery-dimensionmapping-dimensionvaluetype
+	DimensionValueType *types.Value `json:"DimensionValueType,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-dimensionmapping.html#cfn-timestream-scheduledquery-dimensionmapping-name
+	Name *types.Value `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 *ScheduledQuery_DimensionMapping) AWSCloudFormationType() string {
+	return "AWS::Timestream::ScheduledQuery.DimensionMapping"
+}
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_errorreportconfiguration.go b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_errorreportconfiguration.go
new file mode 100644
index 0000000000..847ac013ae
--- /dev/null
+++ b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_errorreportconfiguration.go
@@ -0,0 +1,35 @@
+package timestream
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScheduledQuery_ErrorReportConfiguration AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.ErrorReportConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-errorreportconfiguration.html
+type ScheduledQuery_ErrorReportConfiguration struct {
+
+	// S3Configuration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-errorreportconfiguration.html#cfn-timestream-scheduledquery-errorreportconfiguration-s3configuration
+	S3Configuration *ScheduledQuery_S3Configuration `json:"S3Configuration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScheduledQuery_ErrorReportConfiguration) AWSCloudFormationType() string {
+	return "AWS::Timestream::ScheduledQuery.ErrorReportConfiguration"
+}
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_mixedmeasuremapping.go b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_mixedmeasuremapping.go
new file mode 100644
index 0000000000..01a94fbcb9
--- /dev/null
+++ b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_mixedmeasuremapping.go
@@ -0,0 +1,57 @@
+package timestream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScheduledQuery_MixedMeasureMapping AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.MixedMeasureMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-mixedmeasuremapping.html
+type ScheduledQuery_MixedMeasureMapping struct {
+
+	// MeasureName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-mixedmeasuremapping.html#cfn-timestream-scheduledquery-mixedmeasuremapping-measurename
+	MeasureName *types.Value `json:"MeasureName,omitempty"`
+
+	// MeasureValueType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-mixedmeasuremapping.html#cfn-timestream-scheduledquery-mixedmeasuremapping-measurevaluetype
+	MeasureValueType *types.Value `json:"MeasureValueType,omitempty"`
+
+	// MultiMeasureAttributeMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-mixedmeasuremapping.html#cfn-timestream-scheduledquery-mixedmeasuremapping-multimeasureattributemappings
+	MultiMeasureAttributeMappings []ScheduledQuery_MultiMeasureAttributeMapping `json:"MultiMeasureAttributeMappings,omitempty"`
+
+	// SourceColumn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-mixedmeasuremapping.html#cfn-timestream-scheduledquery-mixedmeasuremapping-sourcecolumn
+	SourceColumn *types.Value `json:"SourceColumn,omitempty"`
+
+	// TargetMeasureName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-mixedmeasuremapping.html#cfn-timestream-scheduledquery-mixedmeasuremapping-targetmeasurename
+	TargetMeasureName *types.Value `json:"TargetMeasureName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScheduledQuery_MixedMeasureMapping) AWSCloudFormationType() string {
+	return "AWS::Timestream::ScheduledQuery.MixedMeasureMapping"
+}
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_multimeasureattributemapping.go b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_multimeasureattributemapping.go
new file mode 100644
index 0000000000..9969b3607f
--- /dev/null
+++ b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_multimeasureattributemapping.go
@@ -0,0 +1,47 @@
+package timestream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScheduledQuery_MultiMeasureAttributeMapping AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.MultiMeasureAttributeMapping)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-multimeasureattributemapping.html
+type ScheduledQuery_MultiMeasureAttributeMapping struct {
+
+	// MeasureValueType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-multimeasureattributemapping.html#cfn-timestream-scheduledquery-multimeasureattributemapping-measurevaluetype
+	MeasureValueType *types.Value `json:"MeasureValueType,omitempty"`
+
+	// SourceColumn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-multimeasureattributemapping.html#cfn-timestream-scheduledquery-multimeasureattributemapping-sourcecolumn
+	SourceColumn *types.Value `json:"SourceColumn,omitempty"`
+
+	// TargetMultiMeasureAttributeName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-multimeasureattributemapping.html#cfn-timestream-scheduledquery-multimeasureattributemapping-targetmultimeasureattributename
+	TargetMultiMeasureAttributeName *types.Value `json:"TargetMultiMeasureAttributeName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScheduledQuery_MultiMeasureAttributeMapping) AWSCloudFormationType() string {
+	return "AWS::Timestream::ScheduledQuery.MultiMeasureAttributeMapping"
+}
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_multimeasuremappings.go b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_multimeasuremappings.go
new file mode 100644
index 0000000000..ee6c4ca31c
--- /dev/null
+++ b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_multimeasuremappings.go
@@ -0,0 +1,42 @@
+package timestream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScheduledQuery_MultiMeasureMappings AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.MultiMeasureMappings)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-multimeasuremappings.html
+type ScheduledQuery_MultiMeasureMappings struct {
+
+	// MultiMeasureAttributeMappings AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-multimeasuremappings.html#cfn-timestream-scheduledquery-multimeasuremappings-multimeasureattributemappings
+	MultiMeasureAttributeMappings []ScheduledQuery_MultiMeasureAttributeMapping `json:"MultiMeasureAttributeMappings,omitempty"`
+
+	// TargetMultiMeasureName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-multimeasuremappings.html#cfn-timestream-scheduledquery-multimeasuremappings-targetmultimeasurename
+	TargetMultiMeasureName *types.Value `json:"TargetMultiMeasureName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScheduledQuery_MultiMeasureMappings) AWSCloudFormationType() string {
+	return "AWS::Timestream::ScheduledQuery.MultiMeasureMappings"
+}
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_notificationconfiguration.go b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_notificationconfiguration.go
new file mode 100644
index 0000000000..610d0a146a
--- /dev/null
+++ b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_notificationconfiguration.go
@@ -0,0 +1,35 @@
+package timestream
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScheduledQuery_NotificationConfiguration AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.NotificationConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-notificationconfiguration.html
+type ScheduledQuery_NotificationConfiguration struct {
+
+	// SnsConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-notificationconfiguration.html#cfn-timestream-scheduledquery-notificationconfiguration-snsconfiguration
+	SnsConfiguration *ScheduledQuery_SnsConfiguration `json:"SnsConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScheduledQuery_NotificationConfiguration) AWSCloudFormationType() string {
+	return "AWS::Timestream::ScheduledQuery.NotificationConfiguration"
+}
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_s3configuration.go b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_s3configuration.go
new file mode 100644
index 0000000000..347d7da032
--- /dev/null
+++ b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_s3configuration.go
@@ -0,0 +1,47 @@
+package timestream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScheduledQuery_S3Configuration AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.S3Configuration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-s3configuration.html
+type ScheduledQuery_S3Configuration struct {
+
+	// BucketName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-s3configuration.html#cfn-timestream-scheduledquery-s3configuration-bucketname
+	BucketName *types.Value `json:"BucketName,omitempty"`
+
+	// EncryptionOption AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-s3configuration.html#cfn-timestream-scheduledquery-s3configuration-encryptionoption
+	EncryptionOption *types.Value `json:"EncryptionOption,omitempty"`
+
+	// ObjectKeyPrefix AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-s3configuration.html#cfn-timestream-scheduledquery-s3configuration-objectkeyprefix
+	ObjectKeyPrefix *types.Value `json:"ObjectKeyPrefix,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScheduledQuery_S3Configuration) AWSCloudFormationType() string {
+	return "AWS::Timestream::ScheduledQuery.S3Configuration"
+}
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_scheduleconfiguration.go b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_scheduleconfiguration.go
new file mode 100644
index 0000000000..2a37bce352
--- /dev/null
+++ b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_scheduleconfiguration.go
@@ -0,0 +1,37 @@
+package timestream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScheduledQuery_ScheduleConfiguration AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.ScheduleConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-scheduleconfiguration.html
+type ScheduledQuery_ScheduleConfiguration struct {
+
+	// ScheduleExpression AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-scheduleconfiguration.html#cfn-timestream-scheduledquery-scheduleconfiguration-scheduleexpression
+	ScheduleExpression *types.Value `json:"ScheduleExpression,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScheduledQuery_ScheduleConfiguration) AWSCloudFormationType() string {
+	return "AWS::Timestream::ScheduledQuery.ScheduleConfiguration"
+}
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_snsconfiguration.go b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_snsconfiguration.go
new file mode 100644
index 0000000000..5368941580
--- /dev/null
+++ b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_snsconfiguration.go
@@ -0,0 +1,37 @@
+package timestream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScheduledQuery_SnsConfiguration AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.SnsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-snsconfiguration.html
+type ScheduledQuery_SnsConfiguration struct {
+
+	// TopicArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-snsconfiguration.html#cfn-timestream-scheduledquery-snsconfiguration-topicarn
+	TopicArn *types.Value `json:"TopicArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScheduledQuery_SnsConfiguration) AWSCloudFormationType() string {
+	return "AWS::Timestream::ScheduledQuery.SnsConfiguration"
+}
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_targetconfiguration.go b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_targetconfiguration.go
new file mode 100644
index 0000000000..7bade54838
--- /dev/null
+++ b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_targetconfiguration.go
@@ -0,0 +1,35 @@
+package timestream
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScheduledQuery_TargetConfiguration AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.TargetConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-targetconfiguration.html
+type ScheduledQuery_TargetConfiguration struct {
+
+	// TimestreamConfiguration AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-targetconfiguration.html#cfn-timestream-scheduledquery-targetconfiguration-timestreamconfiguration
+	TimestreamConfiguration *ScheduledQuery_TimestreamConfiguration `json:"TimestreamConfiguration,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScheduledQuery_TargetConfiguration) AWSCloudFormationType() string {
+	return "AWS::Timestream::ScheduledQuery.TargetConfiguration"
+}
diff --git a/goformation/cloudformation/timestream/aws-timestream-scheduledquery_timestreamconfiguration.go b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_timestreamconfiguration.go
new file mode 100644
index 0000000000..1e39a6c68c
--- /dev/null
+++ b/goformation/cloudformation/timestream/aws-timestream-scheduledquery_timestreamconfiguration.go
@@ -0,0 +1,67 @@
+package timestream
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ScheduledQuery_TimestreamConfiguration AWS CloudFormation Resource (AWS::Timestream::ScheduledQuery.TimestreamConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-timestreamconfiguration.html
+type ScheduledQuery_TimestreamConfiguration struct {
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-timestreamconfiguration.html#cfn-timestream-scheduledquery-timestreamconfiguration-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// DimensionMappings AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-timestreamconfiguration.html#cfn-timestream-scheduledquery-timestreamconfiguration-dimensionmappings
+	DimensionMappings []ScheduledQuery_DimensionMapping `json:"DimensionMappings,omitempty"`
+
+	// MeasureNameColumn AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-timestreamconfiguration.html#cfn-timestream-scheduledquery-timestreamconfiguration-measurenamecolumn
+	MeasureNameColumn *types.Value `json:"MeasureNameColumn,omitempty"`
+
+	// MixedMeasureMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-timestreamconfiguration.html#cfn-timestream-scheduledquery-timestreamconfiguration-mixedmeasuremappings
+	MixedMeasureMappings []ScheduledQuery_MixedMeasureMapping `json:"MixedMeasureMappings,omitempty"`
+
+	// MultiMeasureMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-timestreamconfiguration.html#cfn-timestream-scheduledquery-timestreamconfiguration-multimeasuremappings
+	MultiMeasureMappings *ScheduledQuery_MultiMeasureMappings `json:"MultiMeasureMappings,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-timestreamconfiguration.html#cfn-timestream-scheduledquery-timestreamconfiguration-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// TimeColumn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-timestream-scheduledquery-timestreamconfiguration.html#cfn-timestream-scheduledquery-timestreamconfiguration-timecolumn
+	TimeColumn *types.Value `json:"TimeColumn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ScheduledQuery_TimestreamConfiguration) AWSCloudFormationType() string {
+	return "AWS::Timestream::ScheduledQuery.TimestreamConfiguration"
+}
diff --git a/goformation/cloudformation/timestream/aws-timestream-table.go b/goformation/cloudformation/timestream/aws-timestream-table.go
new file mode 100644
index 0000000000..b63bf92733
--- /dev/null
+++ b/goformation/cloudformation/timestream/aws-timestream-table.go
@@ -0,0 +1,124 @@
+package timestream
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Table AWS CloudFormation Resource (AWS::Timestream::Table)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-table.html
+type Table struct {
+
+	// DatabaseName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-table.html#cfn-timestream-table-databasename
+	DatabaseName *types.Value `json:"DatabaseName,omitempty"`
+
+	// RetentionProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-table.html#cfn-timestream-table-retentionproperties
+	RetentionProperties interface{} `json:"RetentionProperties,omitempty"`
+
+	// TableName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-table.html#cfn-timestream-table-tablename
+	TableName *types.Value `json:"TableName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-timestream-table.html#cfn-timestream-table-tags
+	Tags []cloudformation.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 *Table) AWSCloudFormationType() string {
+	return "AWS::Timestream::Table"
+}
+
+// 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 Table) MarshalJSON() ([]byte, error) {
+	type Properties Table
+	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 *Table) UnmarshalJSON(b []byte) error {
+	type Properties Table
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Table(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/transfer/aws-transfer-server.go b/goformation/cloudformation/transfer/aws-transfer-server.go
new file mode 100644
index 0000000000..08c8e4869d
--- /dev/null
+++ b/goformation/cloudformation/transfer/aws-transfer-server.go
@@ -0,0 +1,164 @@
+package transfer
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Server AWS CloudFormation Resource (AWS::Transfer::Server)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-server.html
+type Server struct {
+
+	// Certificate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-server.html#cfn-transfer-server-certificate
+	Certificate *types.Value `json:"Certificate,omitempty"`
+
+	// Domain AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-server.html#cfn-transfer-server-domain
+	Domain *types.Value `json:"Domain,omitempty"`
+
+	// EndpointDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-server.html#cfn-transfer-server-endpointdetails
+	EndpointDetails *Server_EndpointDetails `json:"EndpointDetails,omitempty"`
+
+	// EndpointType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-server.html#cfn-transfer-server-endpointtype
+	EndpointType *types.Value `json:"EndpointType,omitempty"`
+
+	// IdentityProviderDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-server.html#cfn-transfer-server-identityproviderdetails
+	IdentityProviderDetails *Server_IdentityProviderDetails `json:"IdentityProviderDetails,omitempty"`
+
+	// IdentityProviderType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-server.html#cfn-transfer-server-identityprovidertype
+	IdentityProviderType *types.Value `json:"IdentityProviderType,omitempty"`
+
+	// LoggingRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-server.html#cfn-transfer-server-loggingrole
+	LoggingRole *types.Value `json:"LoggingRole,omitempty"`
+
+	// ProtocolDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-server.html#cfn-transfer-server-protocoldetails
+	ProtocolDetails *Server_ProtocolDetails `json:"ProtocolDetails,omitempty"`
+
+	// Protocols AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-server.html#cfn-transfer-server-protocols
+	Protocols []Server_Protocol `json:"Protocols,omitempty"`
+
+	// SecurityPolicyName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-server.html#cfn-transfer-server-securitypolicyname
+	SecurityPolicyName *types.Value `json:"SecurityPolicyName,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-server.html#cfn-transfer-server-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// WorkflowDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-server.html#cfn-transfer-server-workflowdetails
+	WorkflowDetails *Server_WorkflowDetails `json:"WorkflowDetails,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Server) AWSCloudFormationType() string {
+	return "AWS::Transfer::Server"
+}
+
+// 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 Server) MarshalJSON() ([]byte, error) {
+	type Properties Server
+	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 *Server) UnmarshalJSON(b []byte) error {
+	type Properties Server
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Server(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/transfer/aws-transfer-server_endpointdetails.go b/goformation/cloudformation/transfer/aws-transfer-server_endpointdetails.go
new file mode 100644
index 0000000000..609b9403bf
--- /dev/null
+++ b/goformation/cloudformation/transfer/aws-transfer-server_endpointdetails.go
@@ -0,0 +1,57 @@
+package transfer
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Server_EndpointDetails AWS CloudFormation Resource (AWS::Transfer::Server.EndpointDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-endpointdetails.html
+type Server_EndpointDetails struct {
+
+	// AddressAllocationIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-endpointdetails.html#cfn-transfer-server-endpointdetails-addressallocationids
+	AddressAllocationIds *types.Value `json:"AddressAllocationIds,omitempty"`
+
+	// SecurityGroupIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-endpointdetails.html#cfn-transfer-server-endpointdetails-securitygroupids
+	SecurityGroupIds *types.Value `json:"SecurityGroupIds,omitempty"`
+
+	// SubnetIds AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-endpointdetails.html#cfn-transfer-server-endpointdetails-subnetids
+	SubnetIds *types.Value `json:"SubnetIds,omitempty"`
+
+	// VpcEndpointId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-endpointdetails.html#cfn-transfer-server-endpointdetails-vpcendpointid
+	VpcEndpointId *types.Value `json:"VpcEndpointId,omitempty"`
+
+	// VpcId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-endpointdetails.html#cfn-transfer-server-endpointdetails-vpcid
+	VpcId *types.Value `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 *Server_EndpointDetails) AWSCloudFormationType() string {
+	return "AWS::Transfer::Server.EndpointDetails"
+}
diff --git a/goformation/cloudformation/transfer/aws-transfer-server_identityproviderdetails.go b/goformation/cloudformation/transfer/aws-transfer-server_identityproviderdetails.go
new file mode 100644
index 0000000000..9b0c075237
--- /dev/null
+++ b/goformation/cloudformation/transfer/aws-transfer-server_identityproviderdetails.go
@@ -0,0 +1,52 @@
+package transfer
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Server_IdentityProviderDetails AWS CloudFormation Resource (AWS::Transfer::Server.IdentityProviderDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-identityproviderdetails.html
+type Server_IdentityProviderDetails struct {
+
+	// DirectoryId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-identityproviderdetails.html#cfn-transfer-server-identityproviderdetails-directoryid
+	DirectoryId *types.Value `json:"DirectoryId,omitempty"`
+
+	// Function AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-identityproviderdetails.html#cfn-transfer-server-identityproviderdetails-function
+	Function *types.Value `json:"Function,omitempty"`
+
+	// InvocationRole AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-identityproviderdetails.html#cfn-transfer-server-identityproviderdetails-invocationrole
+	InvocationRole *types.Value `json:"InvocationRole,omitempty"`
+
+	// Url AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-identityproviderdetails.html#cfn-transfer-server-identityproviderdetails-url
+	Url *types.Value `json:"Url,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Server_IdentityProviderDetails) AWSCloudFormationType() string {
+	return "AWS::Transfer::Server.IdentityProviderDetails"
+}
diff --git a/goformation/cloudformation/transfer/aws-transfer-server_protocol.go b/goformation/cloudformation/transfer/aws-transfer-server_protocol.go
new file mode 100644
index 0000000000..4151a670f0
--- /dev/null
+++ b/goformation/cloudformation/transfer/aws-transfer-server_protocol.go
@@ -0,0 +1,30 @@
+package transfer
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Server_Protocol AWS CloudFormation Resource (AWS::Transfer::Server.Protocol)
+// See:
+type Server_Protocol struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Server_Protocol) AWSCloudFormationType() string {
+	return "AWS::Transfer::Server.Protocol"
+}
diff --git a/goformation/cloudformation/transfer/aws-transfer-server_protocoldetails.go b/goformation/cloudformation/transfer/aws-transfer-server_protocoldetails.go
new file mode 100644
index 0000000000..faa301b109
--- /dev/null
+++ b/goformation/cloudformation/transfer/aws-transfer-server_protocoldetails.go
@@ -0,0 +1,37 @@
+package transfer
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Server_ProtocolDetails AWS CloudFormation Resource (AWS::Transfer::Server.ProtocolDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-protocoldetails.html
+type Server_ProtocolDetails struct {
+
+	// PassiveIp AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-protocoldetails.html#cfn-transfer-server-protocoldetails-passiveip
+	PassiveIp *types.Value `json:"PassiveIp,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Server_ProtocolDetails) AWSCloudFormationType() string {
+	return "AWS::Transfer::Server.ProtocolDetails"
+}
diff --git a/goformation/cloudformation/transfer/aws-transfer-server_securitygroupid.go b/goformation/cloudformation/transfer/aws-transfer-server_securitygroupid.go
new file mode 100644
index 0000000000..533c804a54
--- /dev/null
+++ b/goformation/cloudformation/transfer/aws-transfer-server_securitygroupid.go
@@ -0,0 +1,30 @@
+package transfer
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Server_SecurityGroupId AWS CloudFormation Resource (AWS::Transfer::Server.SecurityGroupId)
+// See:
+type Server_SecurityGroupId struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Server_SecurityGroupId) AWSCloudFormationType() string {
+	return "AWS::Transfer::Server.SecurityGroupId"
+}
diff --git a/goformation/cloudformation/transfer/aws-transfer-server_workflowdetail.go b/goformation/cloudformation/transfer/aws-transfer-server_workflowdetail.go
new file mode 100644
index 0000000000..13c5b52f34
--- /dev/null
+++ b/goformation/cloudformation/transfer/aws-transfer-server_workflowdetail.go
@@ -0,0 +1,42 @@
+package transfer
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Server_WorkflowDetail AWS CloudFormation Resource (AWS::Transfer::Server.WorkflowDetail)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-workflowdetail.html
+type Server_WorkflowDetail struct {
+
+	// ExecutionRole AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-workflowdetail.html#cfn-transfer-server-workflowdetail-executionrole
+	ExecutionRole *types.Value `json:"ExecutionRole,omitempty"`
+
+	// WorkflowId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-workflowdetail.html#cfn-transfer-server-workflowdetail-workflowid
+	WorkflowId *types.Value `json:"WorkflowId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Server_WorkflowDetail) AWSCloudFormationType() string {
+	return "AWS::Transfer::Server.WorkflowDetail"
+}
diff --git a/goformation/cloudformation/transfer/aws-transfer-server_workflowdetails.go b/goformation/cloudformation/transfer/aws-transfer-server_workflowdetails.go
new file mode 100644
index 0000000000..3230824777
--- /dev/null
+++ b/goformation/cloudformation/transfer/aws-transfer-server_workflowdetails.go
@@ -0,0 +1,35 @@
+package transfer
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// Server_WorkflowDetails AWS CloudFormation Resource (AWS::Transfer::Server.WorkflowDetails)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-workflowdetails.html
+type Server_WorkflowDetails struct {
+
+	// OnUpload AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-server-workflowdetails.html#cfn-transfer-server-workflowdetails-onupload
+	OnUpload []Server_WorkflowDetail `json:"OnUpload,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Server_WorkflowDetails) AWSCloudFormationType() string {
+	return "AWS::Transfer::Server.WorkflowDetails"
+}
diff --git a/goformation/cloudformation/transfer/aws-transfer-user.go b/goformation/cloudformation/transfer/aws-transfer-user.go
new file mode 100644
index 0000000000..2980a135f5
--- /dev/null
+++ b/goformation/cloudformation/transfer/aws-transfer-user.go
@@ -0,0 +1,154 @@
+package transfer
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// User AWS CloudFormation Resource (AWS::Transfer::User)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-user.html
+type User struct {
+
+	// HomeDirectory AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-user.html#cfn-transfer-user-homedirectory
+	HomeDirectory *types.Value `json:"HomeDirectory,omitempty"`
+
+	// HomeDirectoryMappings AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-user.html#cfn-transfer-user-homedirectorymappings
+	HomeDirectoryMappings []User_HomeDirectoryMapEntry `json:"HomeDirectoryMappings,omitempty"`
+
+	// HomeDirectoryType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-user.html#cfn-transfer-user-homedirectorytype
+	HomeDirectoryType *types.Value `json:"HomeDirectoryType,omitempty"`
+
+	// Policy AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-user.html#cfn-transfer-user-policy
+	Policy *types.Value `json:"Policy,omitempty"`
+
+	// PosixProfile AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-user.html#cfn-transfer-user-posixprofile
+	PosixProfile *User_PosixProfile `json:"PosixProfile,omitempty"`
+
+	// Role AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-user.html#cfn-transfer-user-role
+	Role *types.Value `json:"Role,omitempty"`
+
+	// ServerId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-user.html#cfn-transfer-user-serverid
+	ServerId *types.Value `json:"ServerId,omitempty"`
+
+	// SshPublicKeys AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-user.html#cfn-transfer-user-sshpublickeys
+	SshPublicKeys []User_SshPublicKey `json:"SshPublicKeys,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-user.html#cfn-transfer-user-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// UserName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-user.html#cfn-transfer-user-username
+	UserName *types.Value `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 *User) AWSCloudFormationType() string {
+	return "AWS::Transfer::User"
+}
+
+// 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 User) MarshalJSON() ([]byte, error) {
+	type Properties User
+	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 *User) UnmarshalJSON(b []byte) error {
+	type Properties User
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = User(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/transfer/aws-transfer-user_homedirectorymapentry.go b/goformation/cloudformation/transfer/aws-transfer-user_homedirectorymapentry.go
new file mode 100644
index 0000000000..3d1bef66b5
--- /dev/null
+++ b/goformation/cloudformation/transfer/aws-transfer-user_homedirectorymapentry.go
@@ -0,0 +1,42 @@
+package transfer
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// User_HomeDirectoryMapEntry AWS CloudFormation Resource (AWS::Transfer::User.HomeDirectoryMapEntry)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-user-homedirectorymapentry.html
+type User_HomeDirectoryMapEntry struct {
+
+	// Entry AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-user-homedirectorymapentry.html#cfn-transfer-user-homedirectorymapentry-entry
+	Entry *types.Value `json:"Entry,omitempty"`
+
+	// Target AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-user-homedirectorymapentry.html#cfn-transfer-user-homedirectorymapentry-target
+	Target *types.Value `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 *User_HomeDirectoryMapEntry) AWSCloudFormationType() string {
+	return "AWS::Transfer::User.HomeDirectoryMapEntry"
+}
diff --git a/goformation/cloudformation/transfer/aws-transfer-user_posixprofile.go b/goformation/cloudformation/transfer/aws-transfer-user_posixprofile.go
new file mode 100644
index 0000000000..70d8a40606
--- /dev/null
+++ b/goformation/cloudformation/transfer/aws-transfer-user_posixprofile.go
@@ -0,0 +1,47 @@
+package transfer
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// User_PosixProfile AWS CloudFormation Resource (AWS::Transfer::User.PosixProfile)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-user-posixprofile.html
+type User_PosixProfile struct {
+
+	// Gid AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-user-posixprofile.html#cfn-transfer-user-posixprofile-gid
+	Gid *types.Value `json:"Gid"`
+
+	// SecondaryGids AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-user-posixprofile.html#cfn-transfer-user-posixprofile-secondarygids
+	SecondaryGids *types.Value `json:"SecondaryGids,omitempty"`
+
+	// Uid AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-user-posixprofile.html#cfn-transfer-user-posixprofile-uid
+	Uid *types.Value `json:"Uid"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *User_PosixProfile) AWSCloudFormationType() string {
+	return "AWS::Transfer::User.PosixProfile"
+}
diff --git a/goformation/cloudformation/transfer/aws-transfer-user_sshpublickey.go b/goformation/cloudformation/transfer/aws-transfer-user_sshpublickey.go
new file mode 100644
index 0000000000..17862bddf1
--- /dev/null
+++ b/goformation/cloudformation/transfer/aws-transfer-user_sshpublickey.go
@@ -0,0 +1,30 @@
+package transfer
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// User_SshPublicKey AWS CloudFormation Resource (AWS::Transfer::User.SshPublicKey)
+// See:
+type User_SshPublicKey struct {
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *User_SshPublicKey) AWSCloudFormationType() string {
+	return "AWS::Transfer::User.SshPublicKey"
+}
diff --git a/goformation/cloudformation/transfer/aws-transfer-workflow.go b/goformation/cloudformation/transfer/aws-transfer-workflow.go
new file mode 100644
index 0000000000..63ad9eb3a2
--- /dev/null
+++ b/goformation/cloudformation/transfer/aws-transfer-workflow.go
@@ -0,0 +1,124 @@
+package transfer
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Workflow AWS CloudFormation Resource (AWS::Transfer::Workflow)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-workflow.html
+type Workflow struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-workflow.html#cfn-transfer-workflow-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// OnExceptionSteps AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-workflow.html#cfn-transfer-workflow-onexceptionsteps
+	OnExceptionSteps []Workflow_WorkflowStep `json:"OnExceptionSteps,omitempty"`
+
+	// Steps AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-workflow.html#cfn-transfer-workflow-steps
+	Steps []Workflow_WorkflowStep `json:"Steps,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-transfer-workflow.html#cfn-transfer-workflow-tags
+	Tags []cloudformation.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 *Workflow) AWSCloudFormationType() string {
+	return "AWS::Transfer::Workflow"
+}
+
+// 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 Workflow) MarshalJSON() ([]byte, error) {
+	type Properties Workflow
+	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 *Workflow) UnmarshalJSON(b []byte) error {
+	type Properties Workflow
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Workflow(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/transfer/aws-transfer-workflow_workflowstep.go b/goformation/cloudformation/transfer/aws-transfer-workflow_workflowstep.go
new file mode 100644
index 0000000000..c4152b74dd
--- /dev/null
+++ b/goformation/cloudformation/transfer/aws-transfer-workflow_workflowstep.go
@@ -0,0 +1,57 @@
+package transfer
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Workflow_WorkflowStep AWS CloudFormation Resource (AWS::Transfer::Workflow.WorkflowStep)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-workflow-workflowstep.html
+type Workflow_WorkflowStep struct {
+
+	// CopyStepDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-workflow-workflowstep.html#cfn-transfer-workflow-workflowstep-copystepdetails
+	CopyStepDetails interface{} `json:"CopyStepDetails,omitempty"`
+
+	// CustomStepDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-workflow-workflowstep.html#cfn-transfer-workflow-workflowstep-customstepdetails
+	CustomStepDetails interface{} `json:"CustomStepDetails,omitempty"`
+
+	// DeleteStepDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-workflow-workflowstep.html#cfn-transfer-workflow-workflowstep-deletestepdetails
+	DeleteStepDetails interface{} `json:"DeleteStepDetails,omitempty"`
+
+	// TagStepDetails AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-workflow-workflowstep.html#cfn-transfer-workflow-workflowstep-tagstepdetails
+	TagStepDetails interface{} `json:"TagStepDetails,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-transfer-workflow-workflowstep.html#cfn-transfer-workflow-workflowstep-type
+	Type *types.Value `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 *Workflow_WorkflowStep) AWSCloudFormationType() string {
+	return "AWS::Transfer::Workflow.WorkflowStep"
+}
diff --git a/goformation/cloudformation/types/intrinsics.go b/goformation/cloudformation/types/intrinsics.go
new file mode 100644
index 0000000000..58f15c2ba0
--- /dev/null
+++ b/goformation/cloudformation/types/intrinsics.go
@@ -0,0 +1,299 @@
+package types
+
+import (
+	"encoding/json"
+	"fmt"
+	"strings"
+)
+
+var (
+	Ref           = "Ref"
+	FnBase64      = "Fn::Base64"
+	FnCIDR        = "Fn::Cidr"
+	FnAnd         = "Fn::And"
+	FnEquals      = "Fn::Equals"
+	FnIf          = "Fn::If"
+	FnNot         = "Fn::Not"
+	FnOr          = "Fn::Or"
+	FnFindInMap   = "Fn::FindInMap"
+	FnGetAtt      = "Fn::GetAtt"
+	FnGetAZs      = "Fn::GetAZs"
+	FnImportValue = "Fn::ImportValue"
+	FnJoin        = "Fn::Join"
+	FnSub         = "Fn::Sub"
+	FnSelect      = "Fn::Select"
+	FnSplit       = "Fn::Split"
+)
+
+var (
+	RefAccountID        = MakeRef(AccountID)
+	RefNotificationARNs = MakeRef(NotificationARNs)
+	RefNoValue          = MakeRef(NoValue)
+	RefPartition        = MakeRef(Partition)
+	RefRegion           = MakeRef(Region)
+	RefStackID          = MakeRef(StackID)
+	RefStackName        = MakeRef(StackName)
+)
+
+type Intrinsic struct {
+	Value map[string]interface{}
+}
+
+func MakeIntrinsic(k string, v interface{}) *Value {
+	return NewValue(
+		Intrinsic{
+			map[string]interface{}{
+				k: v,
+			},
+		},
+	)
+}
+
+func MakeRef(r string) *Value { return MakeIntrinsic(Ref, r) }
+
+func MakeFnCIDR(arg, n, l *Value) *Value {
+	return MakeIntrinsic(FnCIDR,
+		[]*Value{
+			arg,
+			n,
+			l,
+		},
+	)
+}
+
+func MakeFnEquals(value1, value2 *Value) *Value {
+	return MakeIntrinsic(FnEquals, []*Value{value1, value2})
+}
+
+func MakeFnGetAtt(name string, attr *Value) *Value {
+	return MakeIntrinsic(FnGetAtt, []interface{}{name, attr})
+}
+func MakeFnGetAttString(name string, attr string) *Value {
+	return MakeFnGetAtt(name, NewString(attr))
+}
+
+func MakeFnImportValue(arg *Value) *Value       { return MakeIntrinsic(FnImportValue, arg) }
+func MakeFnImportValueString(arg string) *Value { return MakeFnImportValue(NewString(arg)) }
+
+func MakeFnJoin(sep string, args []*Value) *Value {
+	return MakeIntrinsic(FnJoin,
+		[]interface{}{
+			sep,
+			args,
+		},
+	)
+}
+
+func MakeFnSubString(arg string) *Value { return MakeIntrinsic(FnSub, arg) }
+
+func MakeFnSelect(i, arg *Value) *Value {
+	return MakeIntrinsic(FnSelect,
+		[]interface{}{
+			i,
+			arg,
+		},
+	)
+}
+
+func MakeFnSplit(sep string, arg *Value) *Value {
+	return MakeIntrinsic(FnSplit,
+		[]interface{}{sep, arg},
+	)
+}
+
+func MakeFnSplitString(sep string, arg string) *Value {
+	return MakeFnSplit(sep, NewString(arg))
+}
+
+func MakeFnFindInMap(mapName *Value, topLevelKey *Value, secondLevelKey *Value) *Value {
+	return MakeIntrinsic(
+		FnFindInMap,
+		[]interface{}{mapName, topLevelKey, secondLevelKey},
+	)
+}
+
+// TODO MakeFnBase64
+// TODO MakeFnGetAZs
+// TODO MakeFnIf
+// TODO MakeFnNot
+// TODO MakeFnAnd
+// TODO MakeFnOr
+
+func (v Intrinsic) MarshalJSON() ([]byte, error) { return json.Marshal(&v.Value) }
+
+func makeIntrinsic(typ string, arg interface{}) (*Value, error) {
+	switch typ {
+	case Ref:
+		switch a := arg.(type) {
+		case string:
+			return MakeRef(a), nil
+		default:
+			return nil, fmt.Errorf("Cannot create Ref")
+		}
+	case FnGetAtt:
+		switch a := arg.(type) {
+		case []interface{}:
+			if len(a) != 2 {
+				return nil, fmt.Errorf("Cannot parse FnGetAtt")
+			}
+			logicalName, ok := a[0].(string)
+			if !ok {
+				return nil, fmt.Errorf("Cannot parse FnGetAtt")
+			}
+			attr, err := NewValueFromPrimitive(a[1])
+			if err != nil {
+				return nil, err
+			}
+			return MakeFnGetAtt(logicalName, attr), nil
+		case string:
+			splits := strings.Split(a, ".")
+			if len(splits) != 2 {
+				return nil, fmt.Errorf("Cannot parse parameters for FnGetAtt")
+			}
+			return MakeFnGetAtt(splits[0], NewString(splits[1])), nil
+		default:
+			return nil, fmt.Errorf("Cannot parse FnGetAtt")
+		}
+	case FnImportValue:
+		argV, err := NewValueFromPrimitive(arg)
+		if err != nil {
+			return nil, err
+		}
+		return MakeIntrinsic(typ, argV), nil
+	case FnCIDR:
+		switch a := arg.(type) {
+		case []interface{}:
+			if len(a) != 3 {
+				return nil, fmt.Errorf("Cannot parse FnGetAtt")
+			}
+			var vs []*Value
+			for _, v := range a {
+				vv, err := NewValueFromPrimitive(v)
+				if err != nil {
+					return nil, err
+				}
+				vs = append(vs, vv)
+			}
+			return MakeFnCIDR(vs[0], vs[1], vs[2]), nil
+		}
+		return nil, fmt.Errorf("Expected array as argument for Fn::CIDR")
+	case FnJoin:
+		switch a := arg.(type) {
+		case []interface{}:
+			if len(a) != 2 {
+				return nil, fmt.Errorf("Couldn't parse Fn::Join")
+			}
+			del, ok := a[0].(string)
+			if !ok {
+				return nil, fmt.Errorf("Couldn't parse delimiter")
+			}
+			rawVs, ok := a[1].([]interface{})
+			if !ok {
+				return nil, fmt.Errorf("Couldn't parse delimiter")
+			}
+			var vs []*Value
+			for _, v := range rawVs {
+				vv, err := NewValueFromPrimitive(v)
+				if err != nil {
+					return nil, err
+				}
+				vs = append(vs, vv)
+			}
+			return MakeFnJoin(del, vs), nil
+		}
+		return nil, fmt.Errorf("Expected array as argument for Fn::CIDR")
+	case FnEquals:
+		switch a := arg.(type) {
+		case []interface{}:
+			if len(a) != 2 {
+				return nil, fmt.Errorf("Cannot parse FnEquals")
+			}
+			var vs []*Value
+			for _, v := range a {
+				vv, err := NewValueFromPrimitive(v)
+				if err != nil {
+					return nil, err
+				}
+				vs = append(vs, vv)
+			}
+			return MakeFnEquals(vs[0], vs[1]), nil
+		}
+		return nil, fmt.Errorf("Expected array as argument for Fn::CIDR")
+	case FnSelect:
+		switch a := arg.(type) {
+		case []interface{}:
+			if len(a) != 2 {
+				return nil, fmt.Errorf("Cannot parse Fn::Select")
+			}
+			var vs []*Value
+			for _, v := range a {
+				vv, err := NewValueFromPrimitive(v)
+				if err != nil {
+					return nil, err
+				}
+				vs = append(vs, vv)
+			}
+			return MakeFnSelect(vs[0], vs[1]), nil
+		}
+		return nil, fmt.Errorf("Expected array as argument for Fn::Select")
+	case FnSub:
+		return MakeIntrinsic(typ, arg), nil
+	case FnSplit:
+		switch a := arg.(type) {
+		case []interface{}:
+			if len(a) != 2 {
+				return nil, fmt.Errorf("Couldn't parse Fn::Split")
+			}
+			del, ok := a[0].(string)
+			if !ok {
+				return nil, fmt.Errorf("Couldn't parse delimiter")
+			}
+			src, err := NewValueFromPrimitive(a[1])
+			if err != nil {
+				return nil, err
+			}
+			return MakeFnSplit(del, src), nil
+		}
+		return nil, fmt.Errorf("Expected array as argument for Fn::CIDR")
+	case FnFindInMap:
+		switch a := arg.(type) {
+		case []interface{}:
+			if len(a) != 3 {
+				return nil, fmt.Errorf("Cannot parse %s intrinsic arguments as list", FnFindInMap)
+			}
+			var vs []*Value
+			for _, v := range a {
+				vv, err := NewValueFromPrimitive(v)
+				if err != nil {
+					return nil, err
+				}
+				vs = append(vs, vv)
+			}
+			return MakeFnFindInMap(vs[0], vs[1], vs[2]), nil
+		}
+		return nil, fmt.Errorf("Expected array as argument for %s", FnFindInMap)
+	// "Unsupported" intrinsics
+	case FnBase64, FnGetAZs, FnAnd, FnIf, FnNot, FnOr:
+		return MakeIntrinsic(typ, arg), nil
+	default:
+		return nil, nil
+	}
+}
+
+// IntrinsicFromMap attempts to parse a map to an intrinsic function
+func IntrinsicFromMap(raw map[string]interface{}) (*Value, error) {
+	if len(raw) != 1 {
+		return nil, fmt.Errorf("map must contain one key")
+	}
+	for k, v := range raw {
+		intr, err := makeIntrinsic(k, v)
+		if err != nil {
+			return nil, err
+		}
+		if intr != nil {
+			return intr, nil
+		}
+		return nil, fmt.Errorf("map didn't contain intrinsic function key")
+	}
+	panic("Unreachable!")
+}
diff --git a/goformation/cloudformation/types/types.go b/goformation/cloudformation/types/types.go
new file mode 100644
index 0000000000..e8738f2467
--- /dev/null
+++ b/goformation/cloudformation/types/types.go
@@ -0,0 +1,194 @@
+package types
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"reflect"
+)
+
+const (
+	AccountID        = "AWS::AccountId"
+	NotificationARNs = "AWS::NotificationARNs"
+	NoValue          = "AWS::NoValue"
+	Partition        = "AWS::Partition"
+	Region           = "AWS::Region"
+	StackID          = "AWS::StackId"
+	StackName        = "AWS::StackName"
+)
+
+type Value struct {
+	value json.Marshaler
+}
+
+func NewValue(v json.Marshaler) *Value { return &Value{value: v} }
+
+func NewValueFromPrimitive(raw interface{}) (*Value, error) {
+	switch p := raw.(type) {
+	case string:
+		return NewString(p), nil
+	case float64:
+		return NewDouble(p), nil
+	case json.Number:
+		i, err := p.Int64()
+		if err == nil {
+			if i <= int64(^uint(0) >> 1) {
+				return NewInteger(int(i)), nil
+			}
+			return NewLong(i), nil
+		}
+		f, err := p.Float64()
+		if err == nil {
+			return NewDouble(f), nil
+		}
+		return NewString(p.String()), nil
+	case int:
+		return NewInteger(p), nil
+	case int64:
+		return NewLong(p), nil
+	case bool:
+		return NewBoolean(p), nil
+	case map[string]interface{}:
+		asIntr, err := IntrinsicFromMap(p)
+		if err == nil {
+			return asIntr, nil
+		}
+		return NewValue(AnythingMap(p)), nil
+	case []interface{}:
+		var vs []*Value
+		for _, s := range p {
+			v, err := NewValueFromPrimitive(s)
+			if err != nil {
+				return nil, err
+			}
+			vs = append(vs, v)
+		}
+		return NewSlice(vs...), nil
+	default:
+		return nil, fmt.Errorf("cannot handle type %s", reflect.ValueOf(p).Kind())
+	}
+
+}
+
+func (v *Value) Raw() interface{} { return v.value }
+
+func (v *Value) String() string {
+	if v == nil {
+		return "<nil>"
+	}
+	if x, ok := v.Raw().(string); ok {
+		return x
+	}
+	return fmt.Sprintf("%v", v.value)
+}
+
+func (v *Value) UnmarshalJSON(b []byte) error {
+	var raw interface{}
+	decoder := json.NewDecoder(bytes.NewReader(b))
+	decoder.UseNumber()
+	if err := decoder.Decode(&raw); err != nil {
+		return err
+	}
+
+	newV, err := NewValueFromPrimitive(raw)
+	if err != nil {
+		return err
+	}
+	*v = *newV
+	return nil
+}
+
+func (v Value) MarshalJSON() ([]byte, error) {
+	return v.value.MarshalJSON()
+}
+
+type String string
+
+func NewString(v string) *Value { return NewValue(String(v)) }
+
+func (v String) MarshalJSON() ([]byte, error) {
+	x := string(v)
+	return json.Marshal(&x)
+}
+
+type Slice []*Value
+
+// NewSlice returns nil if it would otherwise be empty
+func NewSlice(v ...*Value) *Value {
+	if len(v) == 0 {
+		return nil
+	}
+	return NewValue(Slice(v))
+}
+
+func (v Slice) MarshalJSON() ([]byte, error) {
+	return json.Marshal([]*Value(v))
+}
+
+func NewStringSlice(ss ...string) *Value {
+	var vs []*Value
+	for _, s := range ss {
+		vs = append(vs, NewString(s))
+	}
+	return NewSlice(vs...)
+}
+
+type AnythingMap map[string]interface{}
+
+func (v AnythingMap) MarshalJSON() ([]byte, error) {
+	return json.Marshal(map[string]interface{}(v))
+}
+
+func (v AnythingMap) Convert(obj interface{}) error {
+	x := map[string]interface{}{}
+	x = v
+	data, err := json.Marshal(x)
+	if err != nil {
+		return err
+	}
+	return json.Unmarshal(data, obj)
+}
+
+type Long int64
+
+func NewLong(v int64) *Value { return NewValue(Long(v)) }
+
+func (v Long) MarshalJSON() ([]byte, error) {
+	x := int64(v)
+	return json.Marshal(&x)
+}
+
+type Integer int
+
+func NewInteger(v int) *Value { return NewValue(Integer(v)) }
+
+func (v Integer) MarshalJSON() ([]byte, error) {
+	x := int(v)
+	return json.Marshal(&x)
+}
+
+type Double float64
+
+func NewDouble(v float64) *Value { return NewValue(Double(v)) }
+
+func (v Double) MarshalJSON() ([]byte, error) {
+	x := float64(v)
+	return json.Marshal(&x)
+}
+
+type Boolean bool
+
+var (
+	trueValue  = NewBoolean(true)
+	falseValue = NewBoolean(false)
+)
+
+func True() *Value  { return trueValue }
+func False() *Value { return falseValue }
+
+func NewBoolean(v bool) *Value { return NewValue(Boolean(v)) }
+
+func (v Boolean) MarshalJSON() ([]byte, error) {
+	x := bool(v)
+	return json.Marshal(&x)
+}
diff --git a/goformation/cloudformation/utils/utils.go b/goformation/cloudformation/utils/utils.go
new file mode 100644
index 0000000000..f220a5ae28
--- /dev/null
+++ b/goformation/cloudformation/utils/utils.go
@@ -0,0 +1,37 @@
+package utils
+
+import (
+	"encoding/json"
+)
+
+// ByJSONLength implements the sort interface and enables sorting by JSON length
+type ByJSONLength []interface{}
+
+func (s ByJSONLength) Len() int {
+	return len(s)
+}
+
+func (s ByJSONLength) Swap(i, j int) {
+	s[i], s[j] = s[j], s[i]
+}
+
+func (s ByJSONLength) Less(i, j int) bool {
+	// Nil is always at the end
+	if s[i] == nil {
+		return false
+	}
+	if s[j] == nil {
+		return true
+	}
+	jsoni, _ := json.Marshal(s[i])
+	jsonj, _ := json.Marshal(s[j])
+
+	if jsoni == nil {
+		return false
+	}
+	if jsonj == nil {
+		return true
+	}
+
+	return len(jsoni) > len(jsonj)
+}
diff --git a/goformation/cloudformation/waf/aws-waf-bytematchset.go b/goformation/cloudformation/waf/aws-waf-bytematchset.go
new file mode 100644
index 0000000000..30603dbc15
--- /dev/null
+++ b/goformation/cloudformation/waf/aws-waf-bytematchset.go
@@ -0,0 +1,113 @@
+package waf
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ByteMatchSet AWS CloudFormation Resource (AWS::WAF::ByteMatchSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-bytematchset.html
+type ByteMatchSet struct {
+
+	// ByteMatchTuples AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-bytematchset.html#cfn-waf-bytematchset-bytematchtuples
+	ByteMatchTuples []ByteMatchSet_ByteMatchTuple `json:"ByteMatchTuples,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-bytematchset.html#cfn-waf-bytematchset-name
+	Name *types.Value `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 *ByteMatchSet) AWSCloudFormationType() string {
+	return "AWS::WAF::ByteMatchSet"
+}
+
+// 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 ByteMatchSet) MarshalJSON() ([]byte, error) {
+	type Properties ByteMatchSet
+	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 *ByteMatchSet) UnmarshalJSON(b []byte) error {
+	type Properties ByteMatchSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ByteMatchSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/waf/aws-waf-bytematchset_bytematchtuple.go b/goformation/cloudformation/waf/aws-waf-bytematchset_bytematchtuple.go
new file mode 100644
index 0000000000..af594efefa
--- /dev/null
+++ b/goformation/cloudformation/waf/aws-waf-bytematchset_bytematchtuple.go
@@ -0,0 +1,57 @@
+package waf
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ByteMatchSet_ByteMatchTuple AWS CloudFormation Resource (AWS::WAF::ByteMatchSet.ByteMatchTuple)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples.html
+type ByteMatchSet_ByteMatchTuple struct {
+
+	// FieldToMatch AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples.html#cfn-waf-bytematchset-bytematchtuples-fieldtomatch
+	FieldToMatch *ByteMatchSet_FieldToMatch `json:"FieldToMatch,omitempty"`
+
+	// PositionalConstraint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples.html#cfn-waf-bytematchset-bytematchtuples-positionalconstraint
+	PositionalConstraint *types.Value `json:"PositionalConstraint,omitempty"`
+
+	// TargetString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples.html#cfn-waf-bytematchset-bytematchtuples-targetstring
+	TargetString *types.Value `json:"TargetString,omitempty"`
+
+	// TargetStringBase64 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples.html#cfn-waf-bytematchset-bytematchtuples-targetstringbase64
+	TargetStringBase64 *types.Value `json:"TargetStringBase64,omitempty"`
+
+	// TextTransformation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples.html#cfn-waf-bytematchset-bytematchtuples-texttransformation
+	TextTransformation *types.Value `json:"TextTransformation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ByteMatchSet_ByteMatchTuple) AWSCloudFormationType() string {
+	return "AWS::WAF::ByteMatchSet.ByteMatchTuple"
+}
diff --git a/goformation/cloudformation/waf/aws-waf-bytematchset_fieldtomatch.go b/goformation/cloudformation/waf/aws-waf-bytematchset_fieldtomatch.go
new file mode 100644
index 0000000000..1022173512
--- /dev/null
+++ b/goformation/cloudformation/waf/aws-waf-bytematchset_fieldtomatch.go
@@ -0,0 +1,42 @@
+package waf
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ByteMatchSet_FieldToMatch AWS CloudFormation Resource (AWS::WAF::ByteMatchSet.FieldToMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples-fieldtomatch.html
+type ByteMatchSet_FieldToMatch struct {
+
+	// Data AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples-fieldtomatch.html#cfn-waf-bytematchset-bytematchtuples-fieldtomatch-data
+	Data *types.Value `json:"Data,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples-fieldtomatch.html#cfn-waf-bytematchset-bytematchtuples-fieldtomatch-type
+	Type *types.Value `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 *ByteMatchSet_FieldToMatch) AWSCloudFormationType() string {
+	return "AWS::WAF::ByteMatchSet.FieldToMatch"
+}
diff --git a/goformation/cloudformation/waf/aws-waf-ipset.go b/goformation/cloudformation/waf/aws-waf-ipset.go
new file mode 100644
index 0000000000..fb866e1190
--- /dev/null
+++ b/goformation/cloudformation/waf/aws-waf-ipset.go
@@ -0,0 +1,113 @@
+package waf
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// IPSet AWS CloudFormation Resource (AWS::WAF::IPSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-ipset.html
+type IPSet struct {
+
+	// IPSetDescriptors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-ipset.html#cfn-waf-ipset-ipsetdescriptors
+	IPSetDescriptors []IPSet_IPSetDescriptor `json:"IPSetDescriptors,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-ipset.html#cfn-waf-ipset-name
+	Name *types.Value `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 *IPSet) AWSCloudFormationType() string {
+	return "AWS::WAF::IPSet"
+}
+
+// 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 IPSet) MarshalJSON() ([]byte, error) {
+	type Properties IPSet
+	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 *IPSet) UnmarshalJSON(b []byte) error {
+	type Properties IPSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = IPSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/waf/aws-waf-ipset_ipsetdescriptor.go b/goformation/cloudformation/waf/aws-waf-ipset_ipsetdescriptor.go
new file mode 100644
index 0000000000..82312ce694
--- /dev/null
+++ b/goformation/cloudformation/waf/aws-waf-ipset_ipsetdescriptor.go
@@ -0,0 +1,42 @@
+package waf
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// IPSet_IPSetDescriptor AWS CloudFormation Resource (AWS::WAF::IPSet.IPSetDescriptor)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-ipset-ipsetdescriptors.html
+type IPSet_IPSetDescriptor struct {
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-ipset-ipsetdescriptors.html#cfn-waf-ipset-ipsetdescriptors-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-ipset-ipsetdescriptors.html#cfn-waf-ipset-ipsetdescriptors-value
+	Value *types.Value `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 *IPSet_IPSetDescriptor) AWSCloudFormationType() string {
+	return "AWS::WAF::IPSet.IPSetDescriptor"
+}
diff --git a/goformation/cloudformation/waf/aws-waf-rule.go b/goformation/cloudformation/waf/aws-waf-rule.go
new file mode 100644
index 0000000000..7b30a4f7f5
--- /dev/null
+++ b/goformation/cloudformation/waf/aws-waf-rule.go
@@ -0,0 +1,118 @@
+package waf
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule AWS CloudFormation Resource (AWS::WAF::Rule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-rule.html
+type Rule struct {
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-rule.html#cfn-waf-rule-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-rule.html#cfn-waf-rule-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Predicates AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-rule.html#cfn-waf-rule-predicates
+	Predicates []Rule_Predicate `json:"Predicates,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::WAF::Rule"
+}
+
+// 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 Rule) MarshalJSON() ([]byte, error) {
+	type Properties Rule
+	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 *Rule) UnmarshalJSON(b []byte) error {
+	type Properties Rule
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Rule(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/waf/aws-waf-rule_predicate.go b/goformation/cloudformation/waf/aws-waf-rule_predicate.go
new file mode 100644
index 0000000000..5e0b486d9b
--- /dev/null
+++ b/goformation/cloudformation/waf/aws-waf-rule_predicate.go
@@ -0,0 +1,47 @@
+package waf
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_Predicate AWS CloudFormation Resource (AWS::WAF::Rule.Predicate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-rule-predicates.html
+type Rule_Predicate struct {
+
+	// DataId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-rule-predicates.html#cfn-waf-rule-predicates-dataid
+	DataId *types.Value `json:"DataId,omitempty"`
+
+	// Negated AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-rule-predicates.html#cfn-waf-rule-predicates-negated
+	Negated *types.Value `json:"Negated"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-rule-predicates.html#cfn-waf-rule-predicates-type
+	Type *types.Value `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 *Rule_Predicate) AWSCloudFormationType() string {
+	return "AWS::WAF::Rule.Predicate"
+}
diff --git a/goformation/cloudformation/waf/aws-waf-sizeconstraintset.go b/goformation/cloudformation/waf/aws-waf-sizeconstraintset.go
new file mode 100644
index 0000000000..ccebe4eaeb
--- /dev/null
+++ b/goformation/cloudformation/waf/aws-waf-sizeconstraintset.go
@@ -0,0 +1,113 @@
+package waf
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SizeConstraintSet AWS CloudFormation Resource (AWS::WAF::SizeConstraintSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-sizeconstraintset.html
+type SizeConstraintSet struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-sizeconstraintset.html#cfn-waf-sizeconstraintset-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SizeConstraints AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-sizeconstraintset.html#cfn-waf-sizeconstraintset-sizeconstraints
+	SizeConstraints []SizeConstraintSet_SizeConstraint `json:"SizeConstraints,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SizeConstraintSet) AWSCloudFormationType() string {
+	return "AWS::WAF::SizeConstraintSet"
+}
+
+// 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 SizeConstraintSet) MarshalJSON() ([]byte, error) {
+	type Properties SizeConstraintSet
+	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 *SizeConstraintSet) UnmarshalJSON(b []byte) error {
+	type Properties SizeConstraintSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SizeConstraintSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/waf/aws-waf-sizeconstraintset_fieldtomatch.go b/goformation/cloudformation/waf/aws-waf-sizeconstraintset_fieldtomatch.go
new file mode 100644
index 0000000000..9c651ff8f1
--- /dev/null
+++ b/goformation/cloudformation/waf/aws-waf-sizeconstraintset_fieldtomatch.go
@@ -0,0 +1,42 @@
+package waf
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SizeConstraintSet_FieldToMatch AWS CloudFormation Resource (AWS::WAF::SizeConstraintSet.FieldToMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sizeconstraintset-sizeconstraint-fieldtomatch.html
+type SizeConstraintSet_FieldToMatch struct {
+
+	// Data AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sizeconstraintset-sizeconstraint-fieldtomatch.html#cfn-waf-sizeconstraintset-sizeconstraint-fieldtomatch-data
+	Data *types.Value `json:"Data,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sizeconstraintset-sizeconstraint-fieldtomatch.html#cfn-waf-sizeconstraintset-sizeconstraint-fieldtomatch-type
+	Type *types.Value `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 *SizeConstraintSet_FieldToMatch) AWSCloudFormationType() string {
+	return "AWS::WAF::SizeConstraintSet.FieldToMatch"
+}
diff --git a/goformation/cloudformation/waf/aws-waf-sizeconstraintset_sizeconstraint.go b/goformation/cloudformation/waf/aws-waf-sizeconstraintset_sizeconstraint.go
new file mode 100644
index 0000000000..c49d343edf
--- /dev/null
+++ b/goformation/cloudformation/waf/aws-waf-sizeconstraintset_sizeconstraint.go
@@ -0,0 +1,52 @@
+package waf
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SizeConstraintSet_SizeConstraint AWS CloudFormation Resource (AWS::WAF::SizeConstraintSet.SizeConstraint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sizeconstraintset-sizeconstraint.html
+type SizeConstraintSet_SizeConstraint struct {
+
+	// ComparisonOperator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sizeconstraintset-sizeconstraint.html#cfn-waf-sizeconstraintset-sizeconstraint-comparisonoperator
+	ComparisonOperator *types.Value `json:"ComparisonOperator,omitempty"`
+
+	// FieldToMatch AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sizeconstraintset-sizeconstraint.html#cfn-waf-sizeconstraintset-sizeconstraint-fieldtomatch
+	FieldToMatch *SizeConstraintSet_FieldToMatch `json:"FieldToMatch,omitempty"`
+
+	// Size AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sizeconstraintset-sizeconstraint.html#cfn-waf-sizeconstraintset-sizeconstraint-size
+	Size *types.Value `json:"Size"`
+
+	// TextTransformation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sizeconstraintset-sizeconstraint.html#cfn-waf-sizeconstraintset-sizeconstraint-texttransformation
+	TextTransformation *types.Value `json:"TextTransformation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SizeConstraintSet_SizeConstraint) AWSCloudFormationType() string {
+	return "AWS::WAF::SizeConstraintSet.SizeConstraint"
+}
diff --git a/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset.go b/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset.go
new file mode 100644
index 0000000000..4fe81bfe38
--- /dev/null
+++ b/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset.go
@@ -0,0 +1,113 @@
+package waf
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SqlInjectionMatchSet AWS CloudFormation Resource (AWS::WAF::SqlInjectionMatchSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-sqlinjectionmatchset.html
+type SqlInjectionMatchSet struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-sqlinjectionmatchset.html#cfn-waf-sqlinjectionmatchset-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SqlInjectionMatchTuples AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-sqlinjectionmatchset.html#cfn-waf-sqlinjectionmatchset-sqlinjectionmatchtuples
+	SqlInjectionMatchTuples []SqlInjectionMatchSet_SqlInjectionMatchTuple `json:"SqlInjectionMatchTuples,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SqlInjectionMatchSet) AWSCloudFormationType() string {
+	return "AWS::WAF::SqlInjectionMatchSet"
+}
+
+// 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 SqlInjectionMatchSet) MarshalJSON() ([]byte, error) {
+	type Properties SqlInjectionMatchSet
+	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 *SqlInjectionMatchSet) UnmarshalJSON(b []byte) error {
+	type Properties SqlInjectionMatchSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SqlInjectionMatchSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset_fieldtomatch.go b/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset_fieldtomatch.go
new file mode 100644
index 0000000000..a603057f70
--- /dev/null
+++ b/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset_fieldtomatch.go
@@ -0,0 +1,42 @@
+package waf
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SqlInjectionMatchSet_FieldToMatch AWS CloudFormation Resource (AWS::WAF::SqlInjectionMatchSet.FieldToMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples-fieldtomatch.html
+type SqlInjectionMatchSet_FieldToMatch struct {
+
+	// Data AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples-fieldtomatch.html#cfn-waf-sizeconstraintset-sizeconstraint-fieldtomatch-data
+	Data *types.Value `json:"Data,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-bytematchset-bytematchtuples-fieldtomatch.html#cfn-waf-sizeconstraintset-sizeconstraint-fieldtomatch-type
+	Type *types.Value `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 *SqlInjectionMatchSet_FieldToMatch) AWSCloudFormationType() string {
+	return "AWS::WAF::SqlInjectionMatchSet.FieldToMatch"
+}
diff --git a/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset_sqlinjectionmatchtuple.go b/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset_sqlinjectionmatchtuple.go
new file mode 100644
index 0000000000..584d4ac5af
--- /dev/null
+++ b/goformation/cloudformation/waf/aws-waf-sqlinjectionmatchset_sqlinjectionmatchtuple.go
@@ -0,0 +1,42 @@
+package waf
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SqlInjectionMatchSet_SqlInjectionMatchTuple AWS CloudFormation Resource (AWS::WAF::SqlInjectionMatchSet.SqlInjectionMatchTuple)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sqlinjectionmatchset-sqlinjectionmatchtuples.html
+type SqlInjectionMatchSet_SqlInjectionMatchTuple struct {
+
+	// FieldToMatch AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sqlinjectionmatchset-sqlinjectionmatchtuples.html#cfn-waf-sqlinjectionmatchset-sqlinjectionmatchtuples-fieldtomatch
+	FieldToMatch *SqlInjectionMatchSet_FieldToMatch `json:"FieldToMatch,omitempty"`
+
+	// TextTransformation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-sqlinjectionmatchset-sqlinjectionmatchtuples.html#cfn-waf-sqlinjectionmatchset-sqlinjectionmatchtuples-texttransformation
+	TextTransformation *types.Value `json:"TextTransformation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SqlInjectionMatchSet_SqlInjectionMatchTuple) AWSCloudFormationType() string {
+	return "AWS::WAF::SqlInjectionMatchSet.SqlInjectionMatchTuple"
+}
diff --git a/goformation/cloudformation/waf/aws-waf-webacl.go b/goformation/cloudformation/waf/aws-waf-webacl.go
new file mode 100644
index 0000000000..ae62dd4ef0
--- /dev/null
+++ b/goformation/cloudformation/waf/aws-waf-webacl.go
@@ -0,0 +1,123 @@
+package waf
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL AWS CloudFormation Resource (AWS::WAF::WebACL)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-webacl.html
+type WebACL struct {
+
+	// DefaultAction AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-webacl.html#cfn-waf-webacl-defaultaction
+	DefaultAction *WebACL_WafAction `json:"DefaultAction,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-webacl.html#cfn-waf-webacl-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-webacl.html#cfn-waf-webacl-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Rules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-webacl.html#cfn-waf-webacl-rules
+	Rules []WebACL_ActivatedRule `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 *WebACL) AWSCloudFormationType() string {
+	return "AWS::WAF::WebACL"
+}
+
+// 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 WebACL) MarshalJSON() ([]byte, error) {
+	type Properties WebACL
+	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 *WebACL) UnmarshalJSON(b []byte) error {
+	type Properties WebACL
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = WebACL(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/waf/aws-waf-webacl_activatedrule.go b/goformation/cloudformation/waf/aws-waf-webacl_activatedrule.go
new file mode 100644
index 0000000000..f55cf684e8
--- /dev/null
+++ b/goformation/cloudformation/waf/aws-waf-webacl_activatedrule.go
@@ -0,0 +1,47 @@
+package waf
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_ActivatedRule AWS CloudFormation Resource (AWS::WAF::WebACL.ActivatedRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-webacl-rules.html
+type WebACL_ActivatedRule struct {
+
+	// Action AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-webacl-rules.html#cfn-waf-webacl-rules-action
+	Action *WebACL_WafAction `json:"Action,omitempty"`
+
+	// Priority AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-webacl-rules.html#cfn-waf-webacl-rules-priority
+	Priority *types.Value `json:"Priority"`
+
+	// RuleId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-webacl-rules.html#cfn-waf-webacl-rules-ruleid
+	RuleId *types.Value `json:"RuleId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_ActivatedRule) AWSCloudFormationType() string {
+	return "AWS::WAF::WebACL.ActivatedRule"
+}
diff --git a/goformation/cloudformation/waf/aws-waf-webacl_wafaction.go b/goformation/cloudformation/waf/aws-waf-webacl_wafaction.go
new file mode 100644
index 0000000000..cc87fdb0e9
--- /dev/null
+++ b/goformation/cloudformation/waf/aws-waf-webacl_wafaction.go
@@ -0,0 +1,37 @@
+package waf
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_WafAction AWS CloudFormation Resource (AWS::WAF::WebACL.WafAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-webacl-action.html
+type WebACL_WafAction struct {
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-webacl-action.html#cfn-waf-webacl-action-type
+	Type *types.Value `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 *WebACL_WafAction) AWSCloudFormationType() string {
+	return "AWS::WAF::WebACL.WafAction"
+}
diff --git a/goformation/cloudformation/waf/aws-waf-xssmatchset.go b/goformation/cloudformation/waf/aws-waf-xssmatchset.go
new file mode 100644
index 0000000000..8a95a35fe3
--- /dev/null
+++ b/goformation/cloudformation/waf/aws-waf-xssmatchset.go
@@ -0,0 +1,113 @@
+package waf
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// XssMatchSet AWS CloudFormation Resource (AWS::WAF::XssMatchSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-xssmatchset.html
+type XssMatchSet struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-xssmatchset.html#cfn-waf-xssmatchset-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// XssMatchTuples AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-waf-xssmatchset.html#cfn-waf-xssmatchset-xssmatchtuples
+	XssMatchTuples []XssMatchSet_XssMatchTuple `json:"XssMatchTuples,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *XssMatchSet) AWSCloudFormationType() string {
+	return "AWS::WAF::XssMatchSet"
+}
+
+// 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 XssMatchSet) MarshalJSON() ([]byte, error) {
+	type Properties XssMatchSet
+	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 *XssMatchSet) UnmarshalJSON(b []byte) error {
+	type Properties XssMatchSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = XssMatchSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/waf/aws-waf-xssmatchset_fieldtomatch.go b/goformation/cloudformation/waf/aws-waf-xssmatchset_fieldtomatch.go
new file mode 100644
index 0000000000..da18144f34
--- /dev/null
+++ b/goformation/cloudformation/waf/aws-waf-xssmatchset_fieldtomatch.go
@@ -0,0 +1,42 @@
+package waf
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// XssMatchSet_FieldToMatch AWS CloudFormation Resource (AWS::WAF::XssMatchSet.FieldToMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-xssmatchset-xssmatchtuple-fieldtomatch.html
+type XssMatchSet_FieldToMatch struct {
+
+	// Data AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-xssmatchset-xssmatchtuple-fieldtomatch.html#cfn-waf-xssmatchset-xssmatchtuple-fieldtomatch-data
+	Data *types.Value `json:"Data,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-xssmatchset-xssmatchtuple-fieldtomatch.html#cfn-waf-xssmatchset-xssmatchtuple-fieldtomatch-type
+	Type *types.Value `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 *XssMatchSet_FieldToMatch) AWSCloudFormationType() string {
+	return "AWS::WAF::XssMatchSet.FieldToMatch"
+}
diff --git a/goformation/cloudformation/waf/aws-waf-xssmatchset_xssmatchtuple.go b/goformation/cloudformation/waf/aws-waf-xssmatchset_xssmatchtuple.go
new file mode 100644
index 0000000000..cbd53bf128
--- /dev/null
+++ b/goformation/cloudformation/waf/aws-waf-xssmatchset_xssmatchtuple.go
@@ -0,0 +1,42 @@
+package waf
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// XssMatchSet_XssMatchTuple AWS CloudFormation Resource (AWS::WAF::XssMatchSet.XssMatchTuple)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-xssmatchset-xssmatchtuple.html
+type XssMatchSet_XssMatchTuple struct {
+
+	// FieldToMatch AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-xssmatchset-xssmatchtuple.html#cfn-waf-xssmatchset-xssmatchtuple-fieldtomatch
+	FieldToMatch *XssMatchSet_FieldToMatch `json:"FieldToMatch,omitempty"`
+
+	// TextTransformation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-waf-xssmatchset-xssmatchtuple.html#cfn-waf-xssmatchset-xssmatchtuple-texttransformation
+	TextTransformation *types.Value `json:"TextTransformation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *XssMatchSet_XssMatchTuple) AWSCloudFormationType() string {
+	return "AWS::WAF::XssMatchSet.XssMatchTuple"
+}
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-bytematchset.go b/goformation/cloudformation/wafregional/aws-wafregional-bytematchset.go
new file mode 100644
index 0000000000..67ea5287b4
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-bytematchset.go
@@ -0,0 +1,113 @@
+package wafregional
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ByteMatchSet AWS CloudFormation Resource (AWS::WAFRegional::ByteMatchSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-bytematchset.html
+type ByteMatchSet struct {
+
+	// ByteMatchTuples AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-bytematchset.html#cfn-wafregional-bytematchset-bytematchtuples
+	ByteMatchTuples []ByteMatchSet_ByteMatchTuple `json:"ByteMatchTuples,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-bytematchset.html#cfn-wafregional-bytematchset-name
+	Name *types.Value `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 *ByteMatchSet) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::ByteMatchSet"
+}
+
+// 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 ByteMatchSet) MarshalJSON() ([]byte, error) {
+	type Properties ByteMatchSet
+	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 *ByteMatchSet) UnmarshalJSON(b []byte) error {
+	type Properties ByteMatchSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ByteMatchSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/wafregional/aws-wafregional-bytematchset_bytematchtuple.go b/goformation/cloudformation/wafregional/aws-wafregional-bytematchset_bytematchtuple.go
new file mode 100644
index 0000000000..6c2c605cc0
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-bytematchset_bytematchtuple.go
@@ -0,0 +1,57 @@
+package wafregional
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ByteMatchSet_ByteMatchTuple AWS CloudFormation Resource (AWS::WAFRegional::ByteMatchSet.ByteMatchTuple)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-bytematchset-bytematchtuple.html
+type ByteMatchSet_ByteMatchTuple struct {
+
+	// FieldToMatch AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-bytematchset-bytematchtuple.html#cfn-wafregional-bytematchset-bytematchtuple-fieldtomatch
+	FieldToMatch *ByteMatchSet_FieldToMatch `json:"FieldToMatch,omitempty"`
+
+	// PositionalConstraint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-bytematchset-bytematchtuple.html#cfn-wafregional-bytematchset-bytematchtuple-positionalconstraint
+	PositionalConstraint *types.Value `json:"PositionalConstraint,omitempty"`
+
+	// TargetString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-bytematchset-bytematchtuple.html#cfn-wafregional-bytematchset-bytematchtuple-targetstring
+	TargetString *types.Value `json:"TargetString,omitempty"`
+
+	// TargetStringBase64 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-bytematchset-bytematchtuple.html#cfn-wafregional-bytematchset-bytematchtuple-targetstringbase64
+	TargetStringBase64 *types.Value `json:"TargetStringBase64,omitempty"`
+
+	// TextTransformation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-bytematchset-bytematchtuple.html#cfn-wafregional-bytematchset-bytematchtuple-texttransformation
+	TextTransformation *types.Value `json:"TextTransformation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ByteMatchSet_ByteMatchTuple) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::ByteMatchSet.ByteMatchTuple"
+}
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-bytematchset_fieldtomatch.go b/goformation/cloudformation/wafregional/aws-wafregional-bytematchset_fieldtomatch.go
new file mode 100644
index 0000000000..4fb6eb9455
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-bytematchset_fieldtomatch.go
@@ -0,0 +1,42 @@
+package wafregional
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ByteMatchSet_FieldToMatch AWS CloudFormation Resource (AWS::WAFRegional::ByteMatchSet.FieldToMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-bytematchset-fieldtomatch.html
+type ByteMatchSet_FieldToMatch struct {
+
+	// Data AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-bytematchset-fieldtomatch.html#cfn-wafregional-bytematchset-fieldtomatch-data
+	Data *types.Value `json:"Data,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-bytematchset-fieldtomatch.html#cfn-wafregional-bytematchset-fieldtomatch-type
+	Type *types.Value `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 *ByteMatchSet_FieldToMatch) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::ByteMatchSet.FieldToMatch"
+}
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-geomatchset.go b/goformation/cloudformation/wafregional/aws-wafregional-geomatchset.go
new file mode 100644
index 0000000000..8661980f35
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-geomatchset.go
@@ -0,0 +1,113 @@
+package wafregional
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GeoMatchSet AWS CloudFormation Resource (AWS::WAFRegional::GeoMatchSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-geomatchset.html
+type GeoMatchSet struct {
+
+	// GeoMatchConstraints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-geomatchset.html#cfn-wafregional-geomatchset-geomatchconstraints
+	GeoMatchConstraints []GeoMatchSet_GeoMatchConstraint `json:"GeoMatchConstraints,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-geomatchset.html#cfn-wafregional-geomatchset-name
+	Name *types.Value `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 *GeoMatchSet) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::GeoMatchSet"
+}
+
+// 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 GeoMatchSet) MarshalJSON() ([]byte, error) {
+	type Properties GeoMatchSet
+	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 *GeoMatchSet) UnmarshalJSON(b []byte) error {
+	type Properties GeoMatchSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = GeoMatchSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/wafregional/aws-wafregional-geomatchset_geomatchconstraint.go b/goformation/cloudformation/wafregional/aws-wafregional-geomatchset_geomatchconstraint.go
new file mode 100644
index 0000000000..cc84f743f1
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-geomatchset_geomatchconstraint.go
@@ -0,0 +1,42 @@
+package wafregional
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// GeoMatchSet_GeoMatchConstraint AWS CloudFormation Resource (AWS::WAFRegional::GeoMatchSet.GeoMatchConstraint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-geomatchset-geomatchconstraint.html
+type GeoMatchSet_GeoMatchConstraint struct {
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-geomatchset-geomatchconstraint.html#cfn-wafregional-geomatchset-geomatchconstraint-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-geomatchset-geomatchconstraint.html#cfn-wafregional-geomatchset-geomatchconstraint-value
+	Value *types.Value `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 *GeoMatchSet_GeoMatchConstraint) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::GeoMatchSet.GeoMatchConstraint"
+}
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-ipset.go b/goformation/cloudformation/wafregional/aws-wafregional-ipset.go
new file mode 100644
index 0000000000..00671f7e68
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-ipset.go
@@ -0,0 +1,113 @@
+package wafregional
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// IPSet AWS CloudFormation Resource (AWS::WAFRegional::IPSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ipset.html
+type IPSet struct {
+
+	// IPSetDescriptors AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ipset.html#cfn-wafregional-ipset-ipsetdescriptors
+	IPSetDescriptors []IPSet_IPSetDescriptor `json:"IPSetDescriptors,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ipset.html#cfn-wafregional-ipset-name
+	Name *types.Value `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 *IPSet) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::IPSet"
+}
+
+// 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 IPSet) MarshalJSON() ([]byte, error) {
+	type Properties IPSet
+	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 *IPSet) UnmarshalJSON(b []byte) error {
+	type Properties IPSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = IPSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/wafregional/aws-wafregional-ipset_ipsetdescriptor.go b/goformation/cloudformation/wafregional/aws-wafregional-ipset_ipsetdescriptor.go
new file mode 100644
index 0000000000..1a82b8057c
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-ipset_ipsetdescriptor.go
@@ -0,0 +1,42 @@
+package wafregional
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// IPSet_IPSetDescriptor AWS CloudFormation Resource (AWS::WAFRegional::IPSet.IPSetDescriptor)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-ipset-ipsetdescriptor.html
+type IPSet_IPSetDescriptor struct {
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-ipset-ipsetdescriptor.html#cfn-wafregional-ipset-ipsetdescriptor-type
+	Type *types.Value `json:"Type,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-ipset-ipsetdescriptor.html#cfn-wafregional-ipset-ipsetdescriptor-value
+	Value *types.Value `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 *IPSet_IPSetDescriptor) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::IPSet.IPSetDescriptor"
+}
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-ratebasedrule.go b/goformation/cloudformation/wafregional/aws-wafregional-ratebasedrule.go
new file mode 100644
index 0000000000..d197f35939
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-ratebasedrule.go
@@ -0,0 +1,128 @@
+package wafregional
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RateBasedRule AWS CloudFormation Resource (AWS::WAFRegional::RateBasedRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ratebasedrule.html
+type RateBasedRule struct {
+
+	// MatchPredicates AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ratebasedrule.html#cfn-wafregional-ratebasedrule-matchpredicates
+	MatchPredicates []RateBasedRule_Predicate `json:"MatchPredicates,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ratebasedrule.html#cfn-wafregional-ratebasedrule-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ratebasedrule.html#cfn-wafregional-ratebasedrule-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RateKey AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ratebasedrule.html#cfn-wafregional-ratebasedrule-ratekey
+	RateKey *types.Value `json:"RateKey,omitempty"`
+
+	// RateLimit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-ratebasedrule.html#cfn-wafregional-ratebasedrule-ratelimit
+	RateLimit *types.Value `json:"RateLimit"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RateBasedRule) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::RateBasedRule"
+}
+
+// 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 RateBasedRule) MarshalJSON() ([]byte, error) {
+	type Properties RateBasedRule
+	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 *RateBasedRule) UnmarshalJSON(b []byte) error {
+	type Properties RateBasedRule
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RateBasedRule(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/wafregional/aws-wafregional-ratebasedrule_predicate.go b/goformation/cloudformation/wafregional/aws-wafregional-ratebasedrule_predicate.go
new file mode 100644
index 0000000000..48f2ca7e57
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-ratebasedrule_predicate.go
@@ -0,0 +1,47 @@
+package wafregional
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RateBasedRule_Predicate AWS CloudFormation Resource (AWS::WAFRegional::RateBasedRule.Predicate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-ratebasedrule-predicate.html
+type RateBasedRule_Predicate struct {
+
+	// DataId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-ratebasedrule-predicate.html#cfn-wafregional-ratebasedrule-predicate-dataid
+	DataId *types.Value `json:"DataId,omitempty"`
+
+	// Negated AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-ratebasedrule-predicate.html#cfn-wafregional-ratebasedrule-predicate-negated
+	Negated *types.Value `json:"Negated"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-ratebasedrule-predicate.html#cfn-wafregional-ratebasedrule-predicate-type
+	Type *types.Value `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 *RateBasedRule_Predicate) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::RateBasedRule.Predicate"
+}
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-regexpatternset.go b/goformation/cloudformation/wafregional/aws-wafregional-regexpatternset.go
new file mode 100644
index 0000000000..a5394720ad
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-regexpatternset.go
@@ -0,0 +1,113 @@
+package wafregional
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RegexPatternSet AWS CloudFormation Resource (AWS::WAFRegional::RegexPatternSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-regexpatternset.html
+type RegexPatternSet struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-regexpatternset.html#cfn-wafregional-regexpatternset-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RegexPatternStrings AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-regexpatternset.html#cfn-wafregional-regexpatternset-regexpatternstrings
+	RegexPatternStrings *types.Value `json:"RegexPatternStrings,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RegexPatternSet) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::RegexPatternSet"
+}
+
+// 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 RegexPatternSet) MarshalJSON() ([]byte, error) {
+	type Properties RegexPatternSet
+	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 *RegexPatternSet) UnmarshalJSON(b []byte) error {
+	type Properties RegexPatternSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RegexPatternSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/wafregional/aws-wafregional-rule.go b/goformation/cloudformation/wafregional/aws-wafregional-rule.go
new file mode 100644
index 0000000000..06e98c66b8
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-rule.go
@@ -0,0 +1,118 @@
+package wafregional
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule AWS CloudFormation Resource (AWS::WAFRegional::Rule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-rule.html
+type Rule struct {
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-rule.html#cfn-wafregional-rule-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-rule.html#cfn-wafregional-rule-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Predicates AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-rule.html#cfn-wafregional-rule-predicates
+	Predicates []Rule_Predicate `json:"Predicates,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::Rule"
+}
+
+// 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 Rule) MarshalJSON() ([]byte, error) {
+	type Properties Rule
+	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 *Rule) UnmarshalJSON(b []byte) error {
+	type Properties Rule
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Rule(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/wafregional/aws-wafregional-rule_predicate.go b/goformation/cloudformation/wafregional/aws-wafregional-rule_predicate.go
new file mode 100644
index 0000000000..91f4ddd0e7
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-rule_predicate.go
@@ -0,0 +1,47 @@
+package wafregional
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Rule_Predicate AWS CloudFormation Resource (AWS::WAFRegional::Rule.Predicate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-rule-predicate.html
+type Rule_Predicate struct {
+
+	// DataId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-rule-predicate.html#cfn-wafregional-rule-predicate-dataid
+	DataId *types.Value `json:"DataId,omitempty"`
+
+	// Negated AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-rule-predicate.html#cfn-wafregional-rule-predicate-negated
+	Negated *types.Value `json:"Negated"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-rule-predicate.html#cfn-wafregional-rule-predicate-type
+	Type *types.Value `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 *Rule_Predicate) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::Rule.Predicate"
+}
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset.go b/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset.go
new file mode 100644
index 0000000000..2f7f7fa063
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset.go
@@ -0,0 +1,113 @@
+package wafregional
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SizeConstraintSet AWS CloudFormation Resource (AWS::WAFRegional::SizeConstraintSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-sizeconstraintset.html
+type SizeConstraintSet struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-sizeconstraintset.html#cfn-wafregional-sizeconstraintset-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SizeConstraints AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-sizeconstraintset.html#cfn-wafregional-sizeconstraintset-sizeconstraints
+	SizeConstraints []SizeConstraintSet_SizeConstraint `json:"SizeConstraints,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SizeConstraintSet) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::SizeConstraintSet"
+}
+
+// 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 SizeConstraintSet) MarshalJSON() ([]byte, error) {
+	type Properties SizeConstraintSet
+	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 *SizeConstraintSet) UnmarshalJSON(b []byte) error {
+	type Properties SizeConstraintSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SizeConstraintSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset_fieldtomatch.go b/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset_fieldtomatch.go
new file mode 100644
index 0000000000..3d04d1773d
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset_fieldtomatch.go
@@ -0,0 +1,42 @@
+package wafregional
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SizeConstraintSet_FieldToMatch AWS CloudFormation Resource (AWS::WAFRegional::SizeConstraintSet.FieldToMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sizeconstraintset-fieldtomatch.html
+type SizeConstraintSet_FieldToMatch struct {
+
+	// Data AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sizeconstraintset-fieldtomatch.html#cfn-wafregional-sizeconstraintset-fieldtomatch-data
+	Data *types.Value `json:"Data,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sizeconstraintset-fieldtomatch.html#cfn-wafregional-sizeconstraintset-fieldtomatch-type
+	Type *types.Value `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 *SizeConstraintSet_FieldToMatch) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::SizeConstraintSet.FieldToMatch"
+}
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset_sizeconstraint.go b/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset_sizeconstraint.go
new file mode 100644
index 0000000000..d0ce5ba27d
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-sizeconstraintset_sizeconstraint.go
@@ -0,0 +1,52 @@
+package wafregional
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SizeConstraintSet_SizeConstraint AWS CloudFormation Resource (AWS::WAFRegional::SizeConstraintSet.SizeConstraint)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sizeconstraintset-sizeconstraint.html
+type SizeConstraintSet_SizeConstraint struct {
+
+	// ComparisonOperator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sizeconstraintset-sizeconstraint.html#cfn-wafregional-sizeconstraintset-sizeconstraint-comparisonoperator
+	ComparisonOperator *types.Value `json:"ComparisonOperator,omitempty"`
+
+	// FieldToMatch AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sizeconstraintset-sizeconstraint.html#cfn-wafregional-sizeconstraintset-sizeconstraint-fieldtomatch
+	FieldToMatch *SizeConstraintSet_FieldToMatch `json:"FieldToMatch,omitempty"`
+
+	// Size AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sizeconstraintset-sizeconstraint.html#cfn-wafregional-sizeconstraintset-sizeconstraint-size
+	Size *types.Value `json:"Size"`
+
+	// TextTransformation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sizeconstraintset-sizeconstraint.html#cfn-wafregional-sizeconstraintset-sizeconstraint-texttransformation
+	TextTransformation *types.Value `json:"TextTransformation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SizeConstraintSet_SizeConstraint) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::SizeConstraintSet.SizeConstraint"
+}
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset.go b/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset.go
new file mode 100644
index 0000000000..0df9218fd7
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset.go
@@ -0,0 +1,113 @@
+package wafregional
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SqlInjectionMatchSet AWS CloudFormation Resource (AWS::WAFRegional::SqlInjectionMatchSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-sqlinjectionmatchset.html
+type SqlInjectionMatchSet struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-sqlinjectionmatchset.html#cfn-wafregional-sqlinjectionmatchset-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// SqlInjectionMatchTuples AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-sqlinjectionmatchset.html#cfn-wafregional-sqlinjectionmatchset-sqlinjectionmatchtuples
+	SqlInjectionMatchTuples []SqlInjectionMatchSet_SqlInjectionMatchTuple `json:"SqlInjectionMatchTuples,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SqlInjectionMatchSet) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::SqlInjectionMatchSet"
+}
+
+// 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 SqlInjectionMatchSet) MarshalJSON() ([]byte, error) {
+	type Properties SqlInjectionMatchSet
+	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 *SqlInjectionMatchSet) UnmarshalJSON(b []byte) error {
+	type Properties SqlInjectionMatchSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SqlInjectionMatchSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_fieldtomatch.go b/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_fieldtomatch.go
new file mode 100644
index 0000000000..2859f4101a
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_fieldtomatch.go
@@ -0,0 +1,42 @@
+package wafregional
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SqlInjectionMatchSet_FieldToMatch AWS CloudFormation Resource (AWS::WAFRegional::SqlInjectionMatchSet.FieldToMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sqlinjectionmatchset-fieldtomatch.html
+type SqlInjectionMatchSet_FieldToMatch struct {
+
+	// Data AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sqlinjectionmatchset-fieldtomatch.html#cfn-wafregional-sqlinjectionmatchset-fieldtomatch-data
+	Data *types.Value `json:"Data,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sqlinjectionmatchset-fieldtomatch.html#cfn-wafregional-sqlinjectionmatchset-fieldtomatch-type
+	Type *types.Value `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 *SqlInjectionMatchSet_FieldToMatch) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::SqlInjectionMatchSet.FieldToMatch"
+}
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_sqlinjectionmatchtuple.go b/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_sqlinjectionmatchtuple.go
new file mode 100644
index 0000000000..cf54fdb677
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-sqlinjectionmatchset_sqlinjectionmatchtuple.go
@@ -0,0 +1,42 @@
+package wafregional
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SqlInjectionMatchSet_SqlInjectionMatchTuple AWS CloudFormation Resource (AWS::WAFRegional::SqlInjectionMatchSet.SqlInjectionMatchTuple)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sqlinjectionmatchset-sqlinjectionmatchtuple.html
+type SqlInjectionMatchSet_SqlInjectionMatchTuple struct {
+
+	// FieldToMatch AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sqlinjectionmatchset-sqlinjectionmatchtuple.html#cfn-wafregional-sqlinjectionmatchset-sqlinjectionmatchtuple-fieldtomatch
+	FieldToMatch *SqlInjectionMatchSet_FieldToMatch `json:"FieldToMatch,omitempty"`
+
+	// TextTransformation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-sqlinjectionmatchset-sqlinjectionmatchtuple.html#cfn-wafregional-sqlinjectionmatchset-sqlinjectionmatchtuple-texttransformation
+	TextTransformation *types.Value `json:"TextTransformation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SqlInjectionMatchSet_SqlInjectionMatchTuple) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::SqlInjectionMatchSet.SqlInjectionMatchTuple"
+}
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-webacl.go b/goformation/cloudformation/wafregional/aws-wafregional-webacl.go
new file mode 100644
index 0000000000..e726b9dc51
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-webacl.go
@@ -0,0 +1,123 @@
+package wafregional
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL AWS CloudFormation Resource (AWS::WAFRegional::WebACL)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-webacl.html
+type WebACL struct {
+
+	// DefaultAction AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-webacl.html#cfn-wafregional-webacl-defaultaction
+	DefaultAction *WebACL_Action `json:"DefaultAction,omitempty"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-webacl.html#cfn-wafregional-webacl-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-webacl.html#cfn-wafregional-webacl-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Rules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-webacl.html#cfn-wafregional-webacl-rules
+	Rules []WebACL_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 *WebACL) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::WebACL"
+}
+
+// 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 WebACL) MarshalJSON() ([]byte, error) {
+	type Properties WebACL
+	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 *WebACL) UnmarshalJSON(b []byte) error {
+	type Properties WebACL
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = WebACL(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/wafregional/aws-wafregional-webacl_action.go b/goformation/cloudformation/wafregional/aws-wafregional-webacl_action.go
new file mode 100644
index 0000000000..06447d5fa8
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-webacl_action.go
@@ -0,0 +1,37 @@
+package wafregional
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_Action AWS CloudFormation Resource (AWS::WAFRegional::WebACL.Action)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-webacl-action.html
+type WebACL_Action struct {
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-webacl-action.html#cfn-wafregional-webacl-action-type
+	Type *types.Value `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 *WebACL_Action) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::WebACL.Action"
+}
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-webacl_rule.go b/goformation/cloudformation/wafregional/aws-wafregional-webacl_rule.go
new file mode 100644
index 0000000000..d29eb5fc1e
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-webacl_rule.go
@@ -0,0 +1,47 @@
+package wafregional
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_Rule AWS CloudFormation Resource (AWS::WAFRegional::WebACL.Rule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-webacl-rule.html
+type WebACL_Rule struct {
+
+	// Action AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-webacl-rule.html#cfn-wafregional-webacl-rule-action
+	Action *WebACL_Action `json:"Action,omitempty"`
+
+	// Priority AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-webacl-rule.html#cfn-wafregional-webacl-rule-priority
+	Priority *types.Value `json:"Priority"`
+
+	// RuleId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-webacl-rule.html#cfn-wafregional-webacl-rule-ruleid
+	RuleId *types.Value `json:"RuleId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_Rule) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::WebACL.Rule"
+}
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-webaclassociation.go b/goformation/cloudformation/wafregional/aws-wafregional-webaclassociation.go
new file mode 100644
index 0000000000..da58b3a042
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-webaclassociation.go
@@ -0,0 +1,113 @@
+package wafregional
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACLAssociation AWS CloudFormation Resource (AWS::WAFRegional::WebACLAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-webaclassociation.html
+type WebACLAssociation struct {
+
+	// ResourceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-webaclassociation.html#cfn-wafregional-webaclassociation-resourcearn
+	ResourceArn *types.Value `json:"ResourceArn,omitempty"`
+
+	// WebACLId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-webaclassociation.html#cfn-wafregional-webaclassociation-webaclid
+	WebACLId *types.Value `json:"WebACLId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACLAssociation) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::WebACLAssociation"
+}
+
+// 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 WebACLAssociation) MarshalJSON() ([]byte, error) {
+	type Properties WebACLAssociation
+	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 *WebACLAssociation) UnmarshalJSON(b []byte) error {
+	type Properties WebACLAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = WebACLAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset.go b/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset.go
new file mode 100644
index 0000000000..2733773454
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset.go
@@ -0,0 +1,113 @@
+package wafregional
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// XssMatchSet AWS CloudFormation Resource (AWS::WAFRegional::XssMatchSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-xssmatchset.html
+type XssMatchSet struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-xssmatchset.html#cfn-wafregional-xssmatchset-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// XssMatchTuples AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafregional-xssmatchset.html#cfn-wafregional-xssmatchset-xssmatchtuples
+	XssMatchTuples []XssMatchSet_XssMatchTuple `json:"XssMatchTuples,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *XssMatchSet) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::XssMatchSet"
+}
+
+// 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 XssMatchSet) MarshalJSON() ([]byte, error) {
+	type Properties XssMatchSet
+	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 *XssMatchSet) UnmarshalJSON(b []byte) error {
+	type Properties XssMatchSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = XssMatchSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset_fieldtomatch.go b/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset_fieldtomatch.go
new file mode 100644
index 0000000000..5915212f33
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset_fieldtomatch.go
@@ -0,0 +1,42 @@
+package wafregional
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// XssMatchSet_FieldToMatch AWS CloudFormation Resource (AWS::WAFRegional::XssMatchSet.FieldToMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-xssmatchset-fieldtomatch.html
+type XssMatchSet_FieldToMatch struct {
+
+	// Data AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-xssmatchset-fieldtomatch.html#cfn-wafregional-xssmatchset-fieldtomatch-data
+	Data *types.Value `json:"Data,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-xssmatchset-fieldtomatch.html#cfn-wafregional-xssmatchset-fieldtomatch-type
+	Type *types.Value `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 *XssMatchSet_FieldToMatch) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::XssMatchSet.FieldToMatch"
+}
diff --git a/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset_xssmatchtuple.go b/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset_xssmatchtuple.go
new file mode 100644
index 0000000000..a2e8ff6639
--- /dev/null
+++ b/goformation/cloudformation/wafregional/aws-wafregional-xssmatchset_xssmatchtuple.go
@@ -0,0 +1,42 @@
+package wafregional
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// XssMatchSet_XssMatchTuple AWS CloudFormation Resource (AWS::WAFRegional::XssMatchSet.XssMatchTuple)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-xssmatchset-xssmatchtuple.html
+type XssMatchSet_XssMatchTuple struct {
+
+	// FieldToMatch AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-xssmatchset-xssmatchtuple.html#cfn-wafregional-xssmatchset-xssmatchtuple-fieldtomatch
+	FieldToMatch *XssMatchSet_FieldToMatch `json:"FieldToMatch,omitempty"`
+
+	// TextTransformation AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafregional-xssmatchset-xssmatchtuple.html#cfn-wafregional-xssmatchset-xssmatchtuple-texttransformation
+	TextTransformation *types.Value `json:"TextTransformation,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *XssMatchSet_XssMatchTuple) AWSCloudFormationType() string {
+	return "AWS::WAFRegional::XssMatchSet.XssMatchTuple"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-ipset.go b/goformation/cloudformation/wafv2/aws-wafv2-ipset.go
new file mode 100644
index 0000000000..178e2a586e
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-ipset.go
@@ -0,0 +1,134 @@
+package wafv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// IPSet AWS CloudFormation Resource (AWS::WAFv2::IPSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-ipset.html
+type IPSet struct {
+
+	// Addresses AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-ipset.html#cfn-wafv2-ipset-addresses
+	Addresses *types.Value `json:"Addresses,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-ipset.html#cfn-wafv2-ipset-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// IPAddressVersion AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-ipset.html#cfn-wafv2-ipset-ipaddressversion
+	IPAddressVersion *types.Value `json:"IPAddressVersion,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-ipset.html#cfn-wafv2-ipset-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Scope AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-ipset.html#cfn-wafv2-ipset-scope
+	Scope *types.Value `json:"Scope,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-ipset.html#cfn-wafv2-ipset-tags
+	Tags []cloudformation.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 *IPSet) AWSCloudFormationType() string {
+	return "AWS::WAFv2::IPSet"
+}
+
+// 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 IPSet) MarshalJSON() ([]byte, error) {
+	type Properties IPSet
+	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 *IPSet) UnmarshalJSON(b []byte) error {
+	type Properties IPSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = IPSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/wafv2/aws-wafv2-loggingconfiguration.go b/goformation/cloudformation/wafv2/aws-wafv2-loggingconfiguration.go
new file mode 100644
index 0000000000..812ddf6a06
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-loggingconfiguration.go
@@ -0,0 +1,123 @@
+package wafv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoggingConfiguration AWS CloudFormation Resource (AWS::WAFv2::LoggingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-loggingconfiguration.html
+type LoggingConfiguration struct {
+
+	// LogDestinationConfigs AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-loggingconfiguration.html#cfn-wafv2-loggingconfiguration-logdestinationconfigs
+	LogDestinationConfigs *types.Value `json:"LogDestinationConfigs,omitempty"`
+
+	// LoggingFilter AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-loggingconfiguration.html#cfn-wafv2-loggingconfiguration-loggingfilter
+	LoggingFilter interface{} `json:"LoggingFilter,omitempty"`
+
+	// RedactedFields AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-loggingconfiguration.html#cfn-wafv2-loggingconfiguration-redactedfields
+	RedactedFields []LoggingConfiguration_FieldToMatch `json:"RedactedFields,omitempty"`
+
+	// ResourceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-loggingconfiguration.html#cfn-wafv2-loggingconfiguration-resourcearn
+	ResourceArn *types.Value `json:"ResourceArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LoggingConfiguration) AWSCloudFormationType() string {
+	return "AWS::WAFv2::LoggingConfiguration"
+}
+
+// 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 LoggingConfiguration) MarshalJSON() ([]byte, error) {
+	type Properties LoggingConfiguration
+	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 *LoggingConfiguration) UnmarshalJSON(b []byte) error {
+	type Properties LoggingConfiguration
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = LoggingConfiguration(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/wafv2/aws-wafv2-loggingconfiguration_fieldtomatch.go b/goformation/cloudformation/wafv2/aws-wafv2-loggingconfiguration_fieldtomatch.go
new file mode 100644
index 0000000000..0c0fc517b4
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-loggingconfiguration_fieldtomatch.go
@@ -0,0 +1,55 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// LoggingConfiguration_FieldToMatch AWS CloudFormation Resource (AWS::WAFv2::LoggingConfiguration.FieldToMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-loggingconfiguration-fieldtomatch.html
+type LoggingConfiguration_FieldToMatch struct {
+
+	// JsonBody AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-loggingconfiguration-fieldtomatch.html#cfn-wafv2-loggingconfiguration-fieldtomatch-jsonbody
+	JsonBody interface{} `json:"JsonBody,omitempty"`
+
+	// Method AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-loggingconfiguration-fieldtomatch.html#cfn-wafv2-loggingconfiguration-fieldtomatch-method
+	Method interface{} `json:"Method,omitempty"`
+
+	// QueryString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-loggingconfiguration-fieldtomatch.html#cfn-wafv2-loggingconfiguration-fieldtomatch-querystring
+	QueryString interface{} `json:"QueryString,omitempty"`
+
+	// SingleHeader AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-loggingconfiguration-fieldtomatch.html#cfn-wafv2-loggingconfiguration-fieldtomatch-singleheader
+	SingleHeader interface{} `json:"SingleHeader,omitempty"`
+
+	// UriPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-loggingconfiguration-fieldtomatch.html#cfn-wafv2-loggingconfiguration-fieldtomatch-uripath
+	UriPath interface{} `json:"UriPath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *LoggingConfiguration_FieldToMatch) AWSCloudFormationType() string {
+	return "AWS::WAFv2::LoggingConfiguration.FieldToMatch"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-regexpatternset.go b/goformation/cloudformation/wafv2/aws-wafv2-regexpatternset.go
new file mode 100644
index 0000000000..6fbea22d97
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-regexpatternset.go
@@ -0,0 +1,129 @@
+package wafv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// RegexPatternSet AWS CloudFormation Resource (AWS::WAFv2::RegexPatternSet)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-regexpatternset.html
+type RegexPatternSet struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-regexpatternset.html#cfn-wafv2-regexpatternset-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-regexpatternset.html#cfn-wafv2-regexpatternset-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RegularExpressionList AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-regexpatternset.html#cfn-wafv2-regexpatternset-regularexpressionlist
+	RegularExpressionList *types.Value `json:"RegularExpressionList,omitempty"`
+
+	// Scope AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-regexpatternset.html#cfn-wafv2-regexpatternset-scope
+	Scope *types.Value `json:"Scope,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-regexpatternset.html#cfn-wafv2-regexpatternset-tags
+	Tags []cloudformation.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 *RegexPatternSet) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RegexPatternSet"
+}
+
+// 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 RegexPatternSet) MarshalJSON() ([]byte, error) {
+	type Properties RegexPatternSet
+	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 *RegexPatternSet) UnmarshalJSON(b []byte) error {
+	type Properties RegexPatternSet
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RegexPatternSet(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/wafv2/aws-wafv2-rulegroup.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup.go
new file mode 100644
index 0000000000..4e46c1b723
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup.go
@@ -0,0 +1,144 @@
+package wafv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup AWS CloudFormation Resource (AWS::WAFv2::RuleGroup)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-rulegroup.html
+type RuleGroup struct {
+
+	// Capacity AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-rulegroup.html#cfn-wafv2-rulegroup-capacity
+	Capacity *types.Value `json:"Capacity"`
+
+	// CustomResponseBodies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-rulegroup.html#cfn-wafv2-rulegroup-customresponsebodies
+	CustomResponseBodies map[string]RuleGroup_CustomResponseBody `json:"CustomResponseBodies,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-rulegroup.html#cfn-wafv2-rulegroup-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-rulegroup.html#cfn-wafv2-rulegroup-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Rules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-rulegroup.html#cfn-wafv2-rulegroup-rules
+	Rules []RuleGroup_Rule `json:"Rules,omitempty"`
+
+	// Scope AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-rulegroup.html#cfn-wafv2-rulegroup-scope
+	Scope *types.Value `json:"Scope,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-rulegroup.html#cfn-wafv2-rulegroup-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VisibilityConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-rulegroup.html#cfn-wafv2-rulegroup-visibilityconfig
+	VisibilityConfig *RuleGroup_VisibilityConfig `json:"VisibilityConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup"
+}
+
+// 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 RuleGroup) MarshalJSON() ([]byte, error) {
+	type Properties RuleGroup
+	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 *RuleGroup) UnmarshalJSON(b []byte) error {
+	type Properties RuleGroup
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = RuleGroup(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatement.go
new file mode 100644
index 0000000000..05b0b9a6f2
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatement.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_AndStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.AndStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-andstatement.html
+type RuleGroup_AndStatement struct {
+
+	// Statements AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-andstatement.html#cfn-wafv2-rulegroup-andstatement-statements
+	Statements []RuleGroup_Statement `json:"Statements,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_AndStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.AndStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementone.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementone.go
new file mode 100644
index 0000000000..c8dd87133a
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementone.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_AndStatementOne AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.AndStatementOne)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-andstatementone.html
+type RuleGroup_AndStatementOne struct {
+
+	// Statements AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-andstatementone.html#cfn-wafv2-rulegroup-andstatementone-statements
+	Statements []RuleGroup_StatementTwo `json:"Statements,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_AndStatementOne) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.AndStatementOne"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementtwo.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementtwo.go
new file mode 100644
index 0000000000..cba38379de
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_andstatementtwo.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_AndStatementTwo AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.AndStatementTwo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-andstatementtwo.html
+type RuleGroup_AndStatementTwo struct {
+
+	// Statements AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-andstatementtwo.html#cfn-wafv2-rulegroup-andstatementtwo-statements
+	Statements []RuleGroup_StatementThree `json:"Statements,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_AndStatementTwo) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.AndStatementTwo"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_bytematchstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_bytematchstatement.go
new file mode 100644
index 0000000000..c23ec8c7e0
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_bytematchstatement.go
@@ -0,0 +1,57 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_ByteMatchStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.ByteMatchStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-bytematchstatement.html
+type RuleGroup_ByteMatchStatement struct {
+
+	// FieldToMatch AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-bytematchstatement.html#cfn-wafv2-rulegroup-bytematchstatement-fieldtomatch
+	FieldToMatch *RuleGroup_FieldToMatch `json:"FieldToMatch,omitempty"`
+
+	// PositionalConstraint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-bytematchstatement.html#cfn-wafv2-rulegroup-bytematchstatement-positionalconstraint
+	PositionalConstraint *types.Value `json:"PositionalConstraint,omitempty"`
+
+	// SearchString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-bytematchstatement.html#cfn-wafv2-rulegroup-bytematchstatement-searchstring
+	SearchString *types.Value `json:"SearchString,omitempty"`
+
+	// SearchStringBase64 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-bytematchstatement.html#cfn-wafv2-rulegroup-bytematchstatement-searchstringbase64
+	SearchStringBase64 *types.Value `json:"SearchStringBase64,omitempty"`
+
+	// TextTransformations AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-bytematchstatement.html#cfn-wafv2-rulegroup-bytematchstatement-texttransformations
+	TextTransformations []RuleGroup_TextTransformation `json:"TextTransformations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_ByteMatchStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.ByteMatchStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_customresponsebody.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_customresponsebody.go
new file mode 100644
index 0000000000..238d985dc7
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_customresponsebody.go
@@ -0,0 +1,42 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_CustomResponseBody AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.CustomResponseBody)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-customresponsebody.html
+type RuleGroup_CustomResponseBody struct {
+
+	// Content AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-customresponsebody.html#cfn-wafv2-rulegroup-customresponsebody-content
+	Content *types.Value `json:"Content,omitempty"`
+
+	// ContentType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-customresponsebody.html#cfn-wafv2-rulegroup-customresponsebody-contenttype
+	ContentType *types.Value `json:"ContentType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_CustomResponseBody) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.CustomResponseBody"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_fieldtomatch.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_fieldtomatch.go
new file mode 100644
index 0000000000..38c819da2f
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_fieldtomatch.go
@@ -0,0 +1,70 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_FieldToMatch AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.FieldToMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-fieldtomatch.html
+type RuleGroup_FieldToMatch struct {
+
+	// AllQueryArguments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-fieldtomatch.html#cfn-wafv2-rulegroup-fieldtomatch-allqueryarguments
+	AllQueryArguments interface{} `json:"AllQueryArguments,omitempty"`
+
+	// Body AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-fieldtomatch.html#cfn-wafv2-rulegroup-fieldtomatch-body
+	Body interface{} `json:"Body,omitempty"`
+
+	// JsonBody AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-fieldtomatch.html#cfn-wafv2-rulegroup-fieldtomatch-jsonbody
+	JsonBody *RuleGroup_JsonBody `json:"JsonBody,omitempty"`
+
+	// Method AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-fieldtomatch.html#cfn-wafv2-rulegroup-fieldtomatch-method
+	Method interface{} `json:"Method,omitempty"`
+
+	// QueryString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-fieldtomatch.html#cfn-wafv2-rulegroup-fieldtomatch-querystring
+	QueryString interface{} `json:"QueryString,omitempty"`
+
+	// SingleHeader AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-fieldtomatch.html#cfn-wafv2-rulegroup-fieldtomatch-singleheader
+	SingleHeader interface{} `json:"SingleHeader,omitempty"`
+
+	// SingleQueryArgument AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-fieldtomatch.html#cfn-wafv2-rulegroup-fieldtomatch-singlequeryargument
+	SingleQueryArgument interface{} `json:"SingleQueryArgument,omitempty"`
+
+	// UriPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-fieldtomatch.html#cfn-wafv2-rulegroup-fieldtomatch-uripath
+	UriPath interface{} `json:"UriPath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_FieldToMatch) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.FieldToMatch"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_forwardedipconfiguration.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_forwardedipconfiguration.go
new file mode 100644
index 0000000000..dfb3d6341f
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_forwardedipconfiguration.go
@@ -0,0 +1,42 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_ForwardedIPConfiguration AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.ForwardedIPConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-forwardedipconfiguration.html
+type RuleGroup_ForwardedIPConfiguration struct {
+
+	// FallbackBehavior AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-forwardedipconfiguration.html#cfn-wafv2-rulegroup-forwardedipconfiguration-fallbackbehavior
+	FallbackBehavior *types.Value `json:"FallbackBehavior,omitempty"`
+
+	// HeaderName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-forwardedipconfiguration.html#cfn-wafv2-rulegroup-forwardedipconfiguration-headername
+	HeaderName *types.Value `json:"HeaderName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_ForwardedIPConfiguration) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.ForwardedIPConfiguration"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_geomatchstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_geomatchstatement.go
new file mode 100644
index 0000000000..b3047a2b8a
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_geomatchstatement.go
@@ -0,0 +1,42 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_GeoMatchStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.GeoMatchStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-geomatchstatement.html
+type RuleGroup_GeoMatchStatement struct {
+
+	// CountryCodes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-geomatchstatement.html#cfn-wafv2-rulegroup-geomatchstatement-countrycodes
+	CountryCodes *types.Value `json:"CountryCodes,omitempty"`
+
+	// ForwardedIPConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-geomatchstatement.html#cfn-wafv2-rulegroup-geomatchstatement-forwardedipconfig
+	ForwardedIPConfig *RuleGroup_ForwardedIPConfiguration `json:"ForwardedIPConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_GeoMatchStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.GeoMatchStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetforwardedipconfiguration.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetforwardedipconfiguration.go
new file mode 100644
index 0000000000..0da9e5fc9d
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetforwardedipconfiguration.go
@@ -0,0 +1,47 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_IPSetForwardedIPConfiguration AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.IPSetForwardedIPConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ipsetforwardedipconfiguration.html
+type RuleGroup_IPSetForwardedIPConfiguration struct {
+
+	// FallbackBehavior AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ipsetforwardedipconfiguration.html#cfn-wafv2-rulegroup-ipsetforwardedipconfiguration-fallbackbehavior
+	FallbackBehavior *types.Value `json:"FallbackBehavior,omitempty"`
+
+	// HeaderName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ipsetforwardedipconfiguration.html#cfn-wafv2-rulegroup-ipsetforwardedipconfiguration-headername
+	HeaderName *types.Value `json:"HeaderName,omitempty"`
+
+	// Position AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ipsetforwardedipconfiguration.html#cfn-wafv2-rulegroup-ipsetforwardedipconfiguration-position
+	Position *types.Value `json:"Position,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_IPSetForwardedIPConfiguration) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.IPSetForwardedIPConfiguration"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetreferencestatement.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetreferencestatement.go
new file mode 100644
index 0000000000..01b9adc396
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ipsetreferencestatement.go
@@ -0,0 +1,42 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_IPSetReferenceStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.IPSetReferenceStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ipsetreferencestatement.html
+type RuleGroup_IPSetReferenceStatement struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ipsetreferencestatement.html#cfn-wafv2-rulegroup-ipsetreferencestatement-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// IPSetForwardedIPConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ipsetreferencestatement.html#cfn-wafv2-rulegroup-ipsetreferencestatement-ipsetforwardedipconfig
+	IPSetForwardedIPConfig *RuleGroup_IPSetForwardedIPConfiguration `json:"IPSetForwardedIPConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_IPSetReferenceStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.IPSetReferenceStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_jsonbody.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_jsonbody.go
new file mode 100644
index 0000000000..c74d4b025f
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_jsonbody.go
@@ -0,0 +1,47 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_JsonBody AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.JsonBody)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-jsonbody.html
+type RuleGroup_JsonBody struct {
+
+	// InvalidFallbackBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-jsonbody.html#cfn-wafv2-rulegroup-jsonbody-invalidfallbackbehavior
+	InvalidFallbackBehavior *types.Value `json:"InvalidFallbackBehavior,omitempty"`
+
+	// MatchPattern AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-jsonbody.html#cfn-wafv2-rulegroup-jsonbody-matchpattern
+	MatchPattern *RuleGroup_JsonMatchPattern `json:"MatchPattern,omitempty"`
+
+	// MatchScope AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-jsonbody.html#cfn-wafv2-rulegroup-jsonbody-matchscope
+	MatchScope *types.Value `json:"MatchScope,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_JsonBody) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.JsonBody"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_jsonmatchpattern.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_jsonmatchpattern.go
new file mode 100644
index 0000000000..00557f1665
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_jsonmatchpattern.go
@@ -0,0 +1,42 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_JsonMatchPattern AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.JsonMatchPattern)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-jsonmatchpattern.html
+type RuleGroup_JsonMatchPattern struct {
+
+	// All AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-jsonmatchpattern.html#cfn-wafv2-rulegroup-jsonmatchpattern-all
+	All interface{} `json:"All,omitempty"`
+
+	// IncludedPaths AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-jsonmatchpattern.html#cfn-wafv2-rulegroup-jsonmatchpattern-includedpaths
+	IncludedPaths *types.Value `json:"IncludedPaths,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_JsonMatchPattern) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.JsonMatchPattern"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_label.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_label.go
new file mode 100644
index 0000000000..9f5f9eb20c
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_label.go
@@ -0,0 +1,37 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_Label AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.Label)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-label.html
+type RuleGroup_Label struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-label.html#cfn-wafv2-rulegroup-label-name
+	Name *types.Value `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 *RuleGroup_Label) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.Label"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_labelmatchstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_labelmatchstatement.go
new file mode 100644
index 0000000000..5ebf0629b5
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_labelmatchstatement.go
@@ -0,0 +1,42 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_LabelMatchStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.LabelMatchStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-labelmatchstatement.html
+type RuleGroup_LabelMatchStatement struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-labelmatchstatement.html#cfn-wafv2-rulegroup-labelmatchstatement-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Scope AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-labelmatchstatement.html#cfn-wafv2-rulegroup-labelmatchstatement-scope
+	Scope *types.Value `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 *RuleGroup_LabelMatchStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.LabelMatchStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_labelsummary.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_labelsummary.go
new file mode 100644
index 0000000000..083dac8611
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_labelsummary.go
@@ -0,0 +1,37 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_LabelSummary AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.LabelSummary)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-labelsummary.html
+type RuleGroup_LabelSummary struct {
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-labelsummary.html#cfn-wafv2-rulegroup-labelsummary-name
+	Name *types.Value `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 *RuleGroup_LabelSummary) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.LabelSummary"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatement.go
new file mode 100644
index 0000000000..b2d9c01bc0
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatement.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_NotStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.NotStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-notstatement.html
+type RuleGroup_NotStatement struct {
+
+	// Statement AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-notstatement.html#cfn-wafv2-rulegroup-notstatement-statement
+	Statement *RuleGroup_Statement `json:"Statement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_NotStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.NotStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementone.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementone.go
new file mode 100644
index 0000000000..52b59c0f48
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementone.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_NotStatementOne AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.NotStatementOne)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-notstatementone.html
+type RuleGroup_NotStatementOne struct {
+
+	// Statement AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-notstatementone.html#cfn-wafv2-rulegroup-notstatementone-statement
+	Statement *RuleGroup_StatementTwo `json:"Statement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_NotStatementOne) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.NotStatementOne"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementtwo.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementtwo.go
new file mode 100644
index 0000000000..d0a3355e7f
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_notstatementtwo.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_NotStatementTwo AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.NotStatementTwo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-notstatementtwo.html
+type RuleGroup_NotStatementTwo struct {
+
+	// Statement AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-notstatementtwo.html#cfn-wafv2-rulegroup-notstatementtwo-statement
+	Statement *RuleGroup_StatementThree `json:"Statement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_NotStatementTwo) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.NotStatementTwo"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatement.go
new file mode 100644
index 0000000000..a61099116a
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatement.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_OrStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.OrStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-orstatement.html
+type RuleGroup_OrStatement struct {
+
+	// Statements AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-orstatement.html#cfn-wafv2-rulegroup-orstatement-statements
+	Statements []RuleGroup_Statement `json:"Statements,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_OrStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.OrStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementone.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementone.go
new file mode 100644
index 0000000000..e9495d7e4c
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementone.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_OrStatementOne AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.OrStatementOne)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-orstatementone.html
+type RuleGroup_OrStatementOne struct {
+
+	// Statements AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-orstatementone.html#cfn-wafv2-rulegroup-orstatementone-statements
+	Statements []RuleGroup_StatementTwo `json:"Statements,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_OrStatementOne) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.OrStatementOne"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementtwo.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementtwo.go
new file mode 100644
index 0000000000..6fc348cfe5
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_orstatementtwo.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_OrStatementTwo AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.OrStatementTwo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-orstatementtwo.html
+type RuleGroup_OrStatementTwo struct {
+
+	// Statements AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-orstatementtwo.html#cfn-wafv2-rulegroup-orstatementtwo-statements
+	Statements []RuleGroup_StatementThree `json:"Statements,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_OrStatementTwo) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.OrStatementTwo"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatement.go
new file mode 100644
index 0000000000..b74b26ef1b
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatement.go
@@ -0,0 +1,52 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_RateBasedStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.RateBasedStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatement.html
+type RuleGroup_RateBasedStatement struct {
+
+	// AggregateKeyType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatement.html#cfn-wafv2-rulegroup-ratebasedstatement-aggregatekeytype
+	AggregateKeyType *types.Value `json:"AggregateKeyType,omitempty"`
+
+	// ForwardedIPConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatement.html#cfn-wafv2-rulegroup-ratebasedstatement-forwardedipconfig
+	ForwardedIPConfig *RuleGroup_ForwardedIPConfiguration `json:"ForwardedIPConfig,omitempty"`
+
+	// Limit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatement.html#cfn-wafv2-rulegroup-ratebasedstatement-limit
+	Limit *types.Value `json:"Limit"`
+
+	// ScopeDownStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatement.html#cfn-wafv2-rulegroup-ratebasedstatement-scopedownstatement
+	ScopeDownStatement *RuleGroup_Statement `json:"ScopeDownStatement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_RateBasedStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.RateBasedStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementone.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementone.go
new file mode 100644
index 0000000000..5172527735
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementone.go
@@ -0,0 +1,52 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_RateBasedStatementOne AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.RateBasedStatementOne)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementone.html
+type RuleGroup_RateBasedStatementOne struct {
+
+	// AggregateKeyType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementone.html#cfn-wafv2-rulegroup-ratebasedstatementone-aggregatekeytype
+	AggregateKeyType *types.Value `json:"AggregateKeyType,omitempty"`
+
+	// ForwardedIPConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementone.html#cfn-wafv2-rulegroup-ratebasedstatementone-forwardedipconfig
+	ForwardedIPConfig *RuleGroup_ForwardedIPConfiguration `json:"ForwardedIPConfig,omitempty"`
+
+	// Limit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementone.html#cfn-wafv2-rulegroup-ratebasedstatementone-limit
+	Limit *types.Value `json:"Limit"`
+
+	// ScopeDownStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementone.html#cfn-wafv2-rulegroup-ratebasedstatementone-scopedownstatement
+	ScopeDownStatement *RuleGroup_StatementTwo `json:"ScopeDownStatement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_RateBasedStatementOne) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.RateBasedStatementOne"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementtwo.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementtwo.go
new file mode 100644
index 0000000000..1219b15d1e
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ratebasedstatementtwo.go
@@ -0,0 +1,52 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_RateBasedStatementTwo AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.RateBasedStatementTwo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementtwo.html
+type RuleGroup_RateBasedStatementTwo struct {
+
+	// AggregateKeyType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementtwo.html#cfn-wafv2-rulegroup-ratebasedstatementtwo-aggregatekeytype
+	AggregateKeyType *types.Value `json:"AggregateKeyType,omitempty"`
+
+	// ForwardedIPConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementtwo.html#cfn-wafv2-rulegroup-ratebasedstatementtwo-forwardedipconfig
+	ForwardedIPConfig *RuleGroup_ForwardedIPConfiguration `json:"ForwardedIPConfig,omitempty"`
+
+	// Limit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementtwo.html#cfn-wafv2-rulegroup-ratebasedstatementtwo-limit
+	Limit *types.Value `json:"Limit"`
+
+	// ScopeDownStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ratebasedstatementtwo.html#cfn-wafv2-rulegroup-ratebasedstatementtwo-scopedownstatement
+	ScopeDownStatement *RuleGroup_StatementThree `json:"ScopeDownStatement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_RateBasedStatementTwo) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.RateBasedStatementTwo"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_regexpatternsetreferencestatement.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_regexpatternsetreferencestatement.go
new file mode 100644
index 0000000000..bee3cc478a
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_regexpatternsetreferencestatement.go
@@ -0,0 +1,47 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_RegexPatternSetReferenceStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.RegexPatternSetReferenceStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-regexpatternsetreferencestatement.html
+type RuleGroup_RegexPatternSetReferenceStatement struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-regexpatternsetreferencestatement.html#cfn-wafv2-rulegroup-regexpatternsetreferencestatement-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// FieldToMatch AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-regexpatternsetreferencestatement.html#cfn-wafv2-rulegroup-regexpatternsetreferencestatement-fieldtomatch
+	FieldToMatch *RuleGroup_FieldToMatch `json:"FieldToMatch,omitempty"`
+
+	// TextTransformations AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-regexpatternsetreferencestatement.html#cfn-wafv2-rulegroup-regexpatternsetreferencestatement-texttransformations
+	TextTransformations []RuleGroup_TextTransformation `json:"TextTransformations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_RegexPatternSetReferenceStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.RegexPatternSetReferenceStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_rule.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_rule.go
new file mode 100644
index 0000000000..18ada3aa92
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_rule.go
@@ -0,0 +1,62 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_Rule AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.Rule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-rule.html
+type RuleGroup_Rule struct {
+
+	// Action AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-rule.html#cfn-wafv2-rulegroup-rule-action
+	Action *RuleGroup_RuleAction `json:"Action,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-rule.html#cfn-wafv2-rulegroup-rule-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Priority AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-rule.html#cfn-wafv2-rulegroup-rule-priority
+	Priority *types.Value `json:"Priority"`
+
+	// RuleLabels AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-rule.html#cfn-wafv2-rulegroup-rule-rulelabels
+	RuleLabels []RuleGroup_Label `json:"RuleLabels,omitempty"`
+
+	// Statement AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-rule.html#cfn-wafv2-rulegroup-rule-statement
+	Statement *RuleGroup_Statement `json:"Statement,omitempty"`
+
+	// VisibilityConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-rule.html#cfn-wafv2-rulegroup-rule-visibilityconfig
+	VisibilityConfig *RuleGroup_VisibilityConfig `json:"VisibilityConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_Rule) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.Rule"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ruleaction.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ruleaction.go
new file mode 100644
index 0000000000..b472f98373
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_ruleaction.go
@@ -0,0 +1,45 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_RuleAction AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.RuleAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ruleaction.html
+type RuleGroup_RuleAction struct {
+
+	// Allow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ruleaction.html#cfn-wafv2-rulegroup-ruleaction-allow
+	Allow interface{} `json:"Allow,omitempty"`
+
+	// Block AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ruleaction.html#cfn-wafv2-rulegroup-ruleaction-block
+	Block interface{} `json:"Block,omitempty"`
+
+	// Count AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-ruleaction.html#cfn-wafv2-rulegroup-ruleaction-count
+	Count interface{} `json:"Count,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_RuleAction) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.RuleAction"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_sizeconstraintstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_sizeconstraintstatement.go
new file mode 100644
index 0000000000..25ff002bea
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_sizeconstraintstatement.go
@@ -0,0 +1,52 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_SizeConstraintStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.SizeConstraintStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-sizeconstraintstatement.html
+type RuleGroup_SizeConstraintStatement struct {
+
+	// ComparisonOperator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-sizeconstraintstatement.html#cfn-wafv2-rulegroup-sizeconstraintstatement-comparisonoperator
+	ComparisonOperator *types.Value `json:"ComparisonOperator,omitempty"`
+
+	// FieldToMatch AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-sizeconstraintstatement.html#cfn-wafv2-rulegroup-sizeconstraintstatement-fieldtomatch
+	FieldToMatch *RuleGroup_FieldToMatch `json:"FieldToMatch,omitempty"`
+
+	// Size AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-sizeconstraintstatement.html#cfn-wafv2-rulegroup-sizeconstraintstatement-size
+	Size *types.Value `json:"Size"`
+
+	// TextTransformations AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-sizeconstraintstatement.html#cfn-wafv2-rulegroup-sizeconstraintstatement-texttransformations
+	TextTransformations []RuleGroup_TextTransformation `json:"TextTransformations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_SizeConstraintStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.SizeConstraintStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_sqlimatchstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_sqlimatchstatement.go
new file mode 100644
index 0000000000..ee809db429
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_sqlimatchstatement.go
@@ -0,0 +1,40 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_SqliMatchStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.SqliMatchStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-sqlimatchstatement.html
+type RuleGroup_SqliMatchStatement struct {
+
+	// FieldToMatch AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-sqlimatchstatement.html#cfn-wafv2-rulegroup-sqlimatchstatement-fieldtomatch
+	FieldToMatch *RuleGroup_FieldToMatch `json:"FieldToMatch,omitempty"`
+
+	// TextTransformations AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-sqlimatchstatement.html#cfn-wafv2-rulegroup-sqlimatchstatement-texttransformations
+	TextTransformations []RuleGroup_TextTransformation `json:"TextTransformations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_SqliMatchStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.SqliMatchStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statement.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statement.go
new file mode 100644
index 0000000000..1d205475b8
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statement.go
@@ -0,0 +1,90 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_Statement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.Statement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statement.html
+type RuleGroup_Statement struct {
+
+	// AndStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statement.html#cfn-wafv2-rulegroup-statement-andstatement
+	AndStatement *RuleGroup_AndStatement `json:"AndStatement,omitempty"`
+
+	// ByteMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statement.html#cfn-wafv2-rulegroup-statement-bytematchstatement
+	ByteMatchStatement *RuleGroup_ByteMatchStatement `json:"ByteMatchStatement,omitempty"`
+
+	// GeoMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statement.html#cfn-wafv2-rulegroup-statement-geomatchstatement
+	GeoMatchStatement *RuleGroup_GeoMatchStatement `json:"GeoMatchStatement,omitempty"`
+
+	// IPSetReferenceStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statement.html#cfn-wafv2-rulegroup-statement-ipsetreferencestatement
+	IPSetReferenceStatement *RuleGroup_IPSetReferenceStatement `json:"IPSetReferenceStatement,omitempty"`
+
+	// LabelMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statement.html#cfn-wafv2-rulegroup-statement-labelmatchstatement
+	LabelMatchStatement *RuleGroup_LabelMatchStatement `json:"LabelMatchStatement,omitempty"`
+
+	// NotStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statement.html#cfn-wafv2-rulegroup-statement-notstatement
+	NotStatement *RuleGroup_NotStatement `json:"NotStatement,omitempty"`
+
+	// OrStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statement.html#cfn-wafv2-rulegroup-statement-orstatement
+	OrStatement *RuleGroup_OrStatement `json:"OrStatement,omitempty"`
+
+	// RateBasedStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statement.html#cfn-wafv2-rulegroup-statement-ratebasedstatement
+	RateBasedStatement *RuleGroup_RateBasedStatement `json:"RateBasedStatement,omitempty"`
+
+	// RegexPatternSetReferenceStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statement.html#cfn-wafv2-rulegroup-statement-regexpatternsetreferencestatement
+	RegexPatternSetReferenceStatement *RuleGroup_RegexPatternSetReferenceStatement `json:"RegexPatternSetReferenceStatement,omitempty"`
+
+	// SizeConstraintStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statement.html#cfn-wafv2-rulegroup-statement-sizeconstraintstatement
+	SizeConstraintStatement *RuleGroup_SizeConstraintStatement `json:"SizeConstraintStatement,omitempty"`
+
+	// SqliMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statement.html#cfn-wafv2-rulegroup-statement-sqlimatchstatement
+	SqliMatchStatement *RuleGroup_SqliMatchStatement `json:"SqliMatchStatement,omitempty"`
+
+	// XssMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statement.html#cfn-wafv2-rulegroup-statement-xssmatchstatement
+	XssMatchStatement *RuleGroup_XssMatchStatement `json:"XssMatchStatement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_Statement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.Statement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementone.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementone.go
new file mode 100644
index 0000000000..8791fbe71c
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementone.go
@@ -0,0 +1,85 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_StatementOne AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.StatementOne)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementone.html
+type RuleGroup_StatementOne struct {
+
+	// AndStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementone.html#cfn-wafv2-rulegroup-statementone-andstatement
+	AndStatement *RuleGroup_AndStatementOne `json:"AndStatement,omitempty"`
+
+	// ByteMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementone.html#cfn-wafv2-rulegroup-statementone-bytematchstatement
+	ByteMatchStatement *RuleGroup_ByteMatchStatement `json:"ByteMatchStatement,omitempty"`
+
+	// GeoMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementone.html#cfn-wafv2-rulegroup-statementone-geomatchstatement
+	GeoMatchStatement *RuleGroup_GeoMatchStatement `json:"GeoMatchStatement,omitempty"`
+
+	// IPSetReferenceStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementone.html#cfn-wafv2-rulegroup-statementone-ipsetreferencestatement
+	IPSetReferenceStatement *RuleGroup_IPSetReferenceStatement `json:"IPSetReferenceStatement,omitempty"`
+
+	// NotStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementone.html#cfn-wafv2-rulegroup-statementone-notstatement
+	NotStatement *RuleGroup_NotStatementOne `json:"NotStatement,omitempty"`
+
+	// OrStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementone.html#cfn-wafv2-rulegroup-statementone-orstatement
+	OrStatement *RuleGroup_OrStatementOne `json:"OrStatement,omitempty"`
+
+	// RateBasedStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementone.html#cfn-wafv2-rulegroup-statementone-ratebasedstatement
+	RateBasedStatement *RuleGroup_RateBasedStatementOne `json:"RateBasedStatement,omitempty"`
+
+	// RegexPatternSetReferenceStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementone.html#cfn-wafv2-rulegroup-statementone-regexpatternsetreferencestatement
+	RegexPatternSetReferenceStatement *RuleGroup_RegexPatternSetReferenceStatement `json:"RegexPatternSetReferenceStatement,omitempty"`
+
+	// SizeConstraintStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementone.html#cfn-wafv2-rulegroup-statementone-sizeconstraintstatement
+	SizeConstraintStatement *RuleGroup_SizeConstraintStatement `json:"SizeConstraintStatement,omitempty"`
+
+	// SqliMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementone.html#cfn-wafv2-rulegroup-statementone-sqlimatchstatement
+	SqliMatchStatement *RuleGroup_SqliMatchStatement `json:"SqliMatchStatement,omitempty"`
+
+	// XssMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementone.html#cfn-wafv2-rulegroup-statementone-xssmatchstatement
+	XssMatchStatement *RuleGroup_XssMatchStatement `json:"XssMatchStatement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_StatementOne) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.StatementOne"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementthree.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementthree.go
new file mode 100644
index 0000000000..4b623b5015
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementthree.go
@@ -0,0 +1,65 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_StatementThree AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.StatementThree)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementthree.html
+type RuleGroup_StatementThree struct {
+
+	// ByteMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementthree.html#cfn-wafv2-rulegroup-statementthree-bytematchstatement
+	ByteMatchStatement *RuleGroup_ByteMatchStatement `json:"ByteMatchStatement,omitempty"`
+
+	// GeoMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementthree.html#cfn-wafv2-rulegroup-statementthree-geomatchstatement
+	GeoMatchStatement *RuleGroup_GeoMatchStatement `json:"GeoMatchStatement,omitempty"`
+
+	// IPSetReferenceStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementthree.html#cfn-wafv2-rulegroup-statementthree-ipsetreferencestatement
+	IPSetReferenceStatement *RuleGroup_IPSetReferenceStatement `json:"IPSetReferenceStatement,omitempty"`
+
+	// RegexPatternSetReferenceStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementthree.html#cfn-wafv2-rulegroup-statementthree-regexpatternsetreferencestatement
+	RegexPatternSetReferenceStatement *RuleGroup_RegexPatternSetReferenceStatement `json:"RegexPatternSetReferenceStatement,omitempty"`
+
+	// SizeConstraintStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementthree.html#cfn-wafv2-rulegroup-statementthree-sizeconstraintstatement
+	SizeConstraintStatement *RuleGroup_SizeConstraintStatement `json:"SizeConstraintStatement,omitempty"`
+
+	// SqliMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementthree.html#cfn-wafv2-rulegroup-statementthree-sqlimatchstatement
+	SqliMatchStatement *RuleGroup_SqliMatchStatement `json:"SqliMatchStatement,omitempty"`
+
+	// XssMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementthree.html#cfn-wafv2-rulegroup-statementthree-xssmatchstatement
+	XssMatchStatement *RuleGroup_XssMatchStatement `json:"XssMatchStatement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_StatementThree) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.StatementThree"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementtwo.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementtwo.go
new file mode 100644
index 0000000000..89e1d87e26
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_statementtwo.go
@@ -0,0 +1,85 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_StatementTwo AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.StatementTwo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementtwo.html
+type RuleGroup_StatementTwo struct {
+
+	// AndStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementtwo.html#cfn-wafv2-rulegroup-statementtwo-andstatement
+	AndStatement *RuleGroup_AndStatementTwo `json:"AndStatement,omitempty"`
+
+	// ByteMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementtwo.html#cfn-wafv2-rulegroup-statementtwo-bytematchstatement
+	ByteMatchStatement *RuleGroup_ByteMatchStatement `json:"ByteMatchStatement,omitempty"`
+
+	// GeoMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementtwo.html#cfn-wafv2-rulegroup-statementtwo-geomatchstatement
+	GeoMatchStatement *RuleGroup_GeoMatchStatement `json:"GeoMatchStatement,omitempty"`
+
+	// IPSetReferenceStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementtwo.html#cfn-wafv2-rulegroup-statementtwo-ipsetreferencestatement
+	IPSetReferenceStatement *RuleGroup_IPSetReferenceStatement `json:"IPSetReferenceStatement,omitempty"`
+
+	// NotStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementtwo.html#cfn-wafv2-rulegroup-statementtwo-notstatement
+	NotStatement *RuleGroup_NotStatementTwo `json:"NotStatement,omitempty"`
+
+	// OrStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementtwo.html#cfn-wafv2-rulegroup-statementtwo-orstatement
+	OrStatement *RuleGroup_OrStatementTwo `json:"OrStatement,omitempty"`
+
+	// RateBasedStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementtwo.html#cfn-wafv2-rulegroup-statementtwo-ratebasedstatement
+	RateBasedStatement *RuleGroup_RateBasedStatementTwo `json:"RateBasedStatement,omitempty"`
+
+	// RegexPatternSetReferenceStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementtwo.html#cfn-wafv2-rulegroup-statementtwo-regexpatternsetreferencestatement
+	RegexPatternSetReferenceStatement *RuleGroup_RegexPatternSetReferenceStatement `json:"RegexPatternSetReferenceStatement,omitempty"`
+
+	// SizeConstraintStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementtwo.html#cfn-wafv2-rulegroup-statementtwo-sizeconstraintstatement
+	SizeConstraintStatement *RuleGroup_SizeConstraintStatement `json:"SizeConstraintStatement,omitempty"`
+
+	// SqliMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementtwo.html#cfn-wafv2-rulegroup-statementtwo-sqlimatchstatement
+	SqliMatchStatement *RuleGroup_SqliMatchStatement `json:"SqliMatchStatement,omitempty"`
+
+	// XssMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-statementtwo.html#cfn-wafv2-rulegroup-statementtwo-xssmatchstatement
+	XssMatchStatement *RuleGroup_XssMatchStatement `json:"XssMatchStatement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_StatementTwo) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.StatementTwo"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_texttransformation.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_texttransformation.go
new file mode 100644
index 0000000000..7cc43af305
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_texttransformation.go
@@ -0,0 +1,42 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_TextTransformation AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.TextTransformation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-texttransformation.html
+type RuleGroup_TextTransformation struct {
+
+	// Priority AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-texttransformation.html#cfn-wafv2-rulegroup-texttransformation-priority
+	Priority *types.Value `json:"Priority"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-texttransformation.html#cfn-wafv2-rulegroup-texttransformation-type
+	Type *types.Value `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 *RuleGroup_TextTransformation) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.TextTransformation"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_visibilityconfig.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_visibilityconfig.go
new file mode 100644
index 0000000000..5df3ae10c5
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_visibilityconfig.go
@@ -0,0 +1,47 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_VisibilityConfig AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.VisibilityConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-visibilityconfig.html
+type RuleGroup_VisibilityConfig struct {
+
+	// CloudWatchMetricsEnabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-visibilityconfig.html#cfn-wafv2-rulegroup-visibilityconfig-cloudwatchmetricsenabled
+	CloudWatchMetricsEnabled *types.Value `json:"CloudWatchMetricsEnabled"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-visibilityconfig.html#cfn-wafv2-rulegroup-visibilityconfig-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// SampledRequestsEnabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-visibilityconfig.html#cfn-wafv2-rulegroup-visibilityconfig-sampledrequestsenabled
+	SampledRequestsEnabled *types.Value `json:"SampledRequestsEnabled"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_VisibilityConfig) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.VisibilityConfig"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_xssmatchstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_xssmatchstatement.go
new file mode 100644
index 0000000000..1052d90c2a
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-rulegroup_xssmatchstatement.go
@@ -0,0 +1,40 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// RuleGroup_XssMatchStatement AWS CloudFormation Resource (AWS::WAFv2::RuleGroup.XssMatchStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-xssmatchstatement.html
+type RuleGroup_XssMatchStatement struct {
+
+	// FieldToMatch AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-xssmatchstatement.html#cfn-wafv2-rulegroup-xssmatchstatement-fieldtomatch
+	FieldToMatch *RuleGroup_FieldToMatch `json:"FieldToMatch,omitempty"`
+
+	// TextTransformations AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-rulegroup-xssmatchstatement.html#cfn-wafv2-rulegroup-xssmatchstatement-texttransformations
+	TextTransformations []RuleGroup_TextTransformation `json:"TextTransformations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *RuleGroup_XssMatchStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::RuleGroup.XssMatchStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl.go
new file mode 100644
index 0000000000..b61b1da8cd
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl.go
@@ -0,0 +1,144 @@
+package wafv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL AWS CloudFormation Resource (AWS::WAFv2::WebACL)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-webacl.html
+type WebACL struct {
+
+	// CustomResponseBodies AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-webacl.html#cfn-wafv2-webacl-customresponsebodies
+	CustomResponseBodies map[string]WebACL_CustomResponseBody `json:"CustomResponseBodies,omitempty"`
+
+	// DefaultAction AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-webacl.html#cfn-wafv2-webacl-defaultaction
+	DefaultAction *WebACL_DefaultAction `json:"DefaultAction,omitempty"`
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-webacl.html#cfn-wafv2-webacl-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-webacl.html#cfn-wafv2-webacl-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Rules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-webacl.html#cfn-wafv2-webacl-rules
+	Rules []WebACL_Rule `json:"Rules,omitempty"`
+
+	// Scope AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-webacl.html#cfn-wafv2-webacl-scope
+	Scope *types.Value `json:"Scope,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-webacl.html#cfn-wafv2-webacl-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// VisibilityConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-webacl.html#cfn-wafv2-webacl-visibilityconfig
+	VisibilityConfig *WebACL_VisibilityConfig `json:"VisibilityConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL"
+}
+
+// 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 WebACL) MarshalJSON() ([]byte, error) {
+	type Properties WebACL
+	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 *WebACL) UnmarshalJSON(b []byte) error {
+	type Properties WebACL
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = WebACL(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/wafv2/aws-wafv2-webacl_allowaction.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_allowaction.go
new file mode 100644
index 0000000000..addeca8c20
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_allowaction.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_AllowAction AWS CloudFormation Resource (AWS::WAFv2::WebACL.AllowAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-allowaction.html
+type WebACL_AllowAction struct {
+
+	// CustomRequestHandling AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-allowaction.html#cfn-wafv2-webacl-allowaction-customrequesthandling
+	CustomRequestHandling *WebACL_CustomRequestHandling `json:"CustomRequestHandling,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_AllowAction) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.AllowAction"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatement.go
new file mode 100644
index 0000000000..f9df29e6fd
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatement.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_AndStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.AndStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-andstatement.html
+type WebACL_AndStatement struct {
+
+	// Statements AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-andstatement.html#cfn-wafv2-webacl-andstatement-statements
+	Statements []WebACL_Statement `json:"Statements,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_AndStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.AndStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatementone.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatementone.go
new file mode 100644
index 0000000000..baa457339a
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatementone.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_AndStatementOne AWS CloudFormation Resource (AWS::WAFv2::WebACL.AndStatementOne)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-andstatementone.html
+type WebACL_AndStatementOne struct {
+
+	// Statements AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-andstatementone.html#cfn-wafv2-webacl-andstatementone-statements
+	Statements []WebACL_StatementTwo `json:"Statements,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_AndStatementOne) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.AndStatementOne"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatementtwo.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatementtwo.go
new file mode 100644
index 0000000000..d0b4f073b4
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_andstatementtwo.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_AndStatementTwo AWS CloudFormation Resource (AWS::WAFv2::WebACL.AndStatementTwo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-andstatementtwo.html
+type WebACL_AndStatementTwo struct {
+
+	// Statements AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-andstatementtwo.html#cfn-wafv2-webacl-andstatementtwo-statements
+	Statements []WebACL_StatementThree `json:"Statements,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_AndStatementTwo) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.AndStatementTwo"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_blockaction.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_blockaction.go
new file mode 100644
index 0000000000..0fbf067597
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_blockaction.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_BlockAction AWS CloudFormation Resource (AWS::WAFv2::WebACL.BlockAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-blockaction.html
+type WebACL_BlockAction struct {
+
+	// CustomResponse AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-blockaction.html#cfn-wafv2-webacl-blockaction-customresponse
+	CustomResponse *WebACL_CustomResponse `json:"CustomResponse,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_BlockAction) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.BlockAction"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_bytematchstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_bytematchstatement.go
new file mode 100644
index 0000000000..2d38c7d652
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_bytematchstatement.go
@@ -0,0 +1,57 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_ByteMatchStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.ByteMatchStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-bytematchstatement.html
+type WebACL_ByteMatchStatement struct {
+
+	// FieldToMatch AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-bytematchstatement.html#cfn-wafv2-webacl-bytematchstatement-fieldtomatch
+	FieldToMatch *WebACL_FieldToMatch `json:"FieldToMatch,omitempty"`
+
+	// PositionalConstraint AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-bytematchstatement.html#cfn-wafv2-webacl-bytematchstatement-positionalconstraint
+	PositionalConstraint *types.Value `json:"PositionalConstraint,omitempty"`
+
+	// SearchString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-bytematchstatement.html#cfn-wafv2-webacl-bytematchstatement-searchstring
+	SearchString *types.Value `json:"SearchString,omitempty"`
+
+	// SearchStringBase64 AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-bytematchstatement.html#cfn-wafv2-webacl-bytematchstatement-searchstringbase64
+	SearchStringBase64 *types.Value `json:"SearchStringBase64,omitempty"`
+
+	// TextTransformations AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-bytematchstatement.html#cfn-wafv2-webacl-bytematchstatement-texttransformations
+	TextTransformations []WebACL_TextTransformation `json:"TextTransformations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_ByteMatchStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.ByteMatchStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_countaction.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_countaction.go
new file mode 100644
index 0000000000..7ec061e560
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_countaction.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_CountAction AWS CloudFormation Resource (AWS::WAFv2::WebACL.CountAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-countaction.html
+type WebACL_CountAction struct {
+
+	// CustomRequestHandling AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-countaction.html#cfn-wafv2-webacl-countaction-customrequesthandling
+	CustomRequestHandling *WebACL_CustomRequestHandling `json:"CustomRequestHandling,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_CountAction) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.CountAction"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_customhttpheader.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_customhttpheader.go
new file mode 100644
index 0000000000..b0c97d7fda
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_customhttpheader.go
@@ -0,0 +1,42 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_CustomHTTPHeader AWS CloudFormation Resource (AWS::WAFv2::WebACL.CustomHTTPHeader)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-customhttpheader.html
+type WebACL_CustomHTTPHeader struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-customhttpheader.html#cfn-wafv2-webacl-customhttpheader-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// Value AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-customhttpheader.html#cfn-wafv2-webacl-customhttpheader-value
+	Value *types.Value `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 *WebACL_CustomHTTPHeader) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.CustomHTTPHeader"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_customrequesthandling.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_customrequesthandling.go
new file mode 100644
index 0000000000..647dff912e
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_customrequesthandling.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_CustomRequestHandling AWS CloudFormation Resource (AWS::WAFv2::WebACL.CustomRequestHandling)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-customrequesthandling.html
+type WebACL_CustomRequestHandling struct {
+
+	// InsertHeaders AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-customrequesthandling.html#cfn-wafv2-webacl-customrequesthandling-insertheaders
+	InsertHeaders []WebACL_CustomHTTPHeader `json:"InsertHeaders,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_CustomRequestHandling) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.CustomRequestHandling"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_customresponse.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_customresponse.go
new file mode 100644
index 0000000000..72cac50929
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_customresponse.go
@@ -0,0 +1,47 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_CustomResponse AWS CloudFormation Resource (AWS::WAFv2::WebACL.CustomResponse)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-customresponse.html
+type WebACL_CustomResponse struct {
+
+	// CustomResponseBodyKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-customresponse.html#cfn-wafv2-webacl-customresponse-customresponsebodykey
+	CustomResponseBodyKey *types.Value `json:"CustomResponseBodyKey,omitempty"`
+
+	// ResponseCode AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-customresponse.html#cfn-wafv2-webacl-customresponse-responsecode
+	ResponseCode *types.Value `json:"ResponseCode"`
+
+	// ResponseHeaders AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-customresponse.html#cfn-wafv2-webacl-customresponse-responseheaders
+	ResponseHeaders []WebACL_CustomHTTPHeader `json:"ResponseHeaders,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_CustomResponse) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.CustomResponse"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_customresponsebody.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_customresponsebody.go
new file mode 100644
index 0000000000..e355a3c51f
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_customresponsebody.go
@@ -0,0 +1,42 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_CustomResponseBody AWS CloudFormation Resource (AWS::WAFv2::WebACL.CustomResponseBody)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-customresponsebody.html
+type WebACL_CustomResponseBody struct {
+
+	// Content AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-customresponsebody.html#cfn-wafv2-webacl-customresponsebody-content
+	Content *types.Value `json:"Content,omitempty"`
+
+	// ContentType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-customresponsebody.html#cfn-wafv2-webacl-customresponsebody-contenttype
+	ContentType *types.Value `json:"ContentType,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_CustomResponseBody) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.CustomResponseBody"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_defaultaction.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_defaultaction.go
new file mode 100644
index 0000000000..aebd7ad997
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_defaultaction.go
@@ -0,0 +1,40 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_DefaultAction AWS CloudFormation Resource (AWS::WAFv2::WebACL.DefaultAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-defaultaction.html
+type WebACL_DefaultAction struct {
+
+	// Allow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-defaultaction.html#cfn-wafv2-webacl-defaultaction-allow
+	Allow *WebACL_AllowAction `json:"Allow,omitempty"`
+
+	// Block AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-defaultaction.html#cfn-wafv2-webacl-defaultaction-block
+	Block *WebACL_BlockAction `json:"Block,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_DefaultAction) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.DefaultAction"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_excludedrule.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_excludedrule.go
new file mode 100644
index 0000000000..90098b0ec6
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_excludedrule.go
@@ -0,0 +1,37 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_ExcludedRule AWS CloudFormation Resource (AWS::WAFv2::WebACL.ExcludedRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-excludedrule.html
+type WebACL_ExcludedRule struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-excludedrule.html#cfn-wafv2-webacl-excludedrule-name
+	Name *types.Value `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 *WebACL_ExcludedRule) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.ExcludedRule"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_fieldtomatch.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_fieldtomatch.go
new file mode 100644
index 0000000000..730adf026c
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_fieldtomatch.go
@@ -0,0 +1,70 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_FieldToMatch AWS CloudFormation Resource (AWS::WAFv2::WebACL.FieldToMatch)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-fieldtomatch.html
+type WebACL_FieldToMatch struct {
+
+	// AllQueryArguments AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-fieldtomatch.html#cfn-wafv2-webacl-fieldtomatch-allqueryarguments
+	AllQueryArguments interface{} `json:"AllQueryArguments,omitempty"`
+
+	// Body AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-fieldtomatch.html#cfn-wafv2-webacl-fieldtomatch-body
+	Body interface{} `json:"Body,omitempty"`
+
+	// JsonBody AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-fieldtomatch.html#cfn-wafv2-webacl-fieldtomatch-jsonbody
+	JsonBody *WebACL_JsonBody `json:"JsonBody,omitempty"`
+
+	// Method AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-fieldtomatch.html#cfn-wafv2-webacl-fieldtomatch-method
+	Method interface{} `json:"Method,omitempty"`
+
+	// QueryString AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-fieldtomatch.html#cfn-wafv2-webacl-fieldtomatch-querystring
+	QueryString interface{} `json:"QueryString,omitempty"`
+
+	// SingleHeader AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-fieldtomatch.html#cfn-wafv2-webacl-fieldtomatch-singleheader
+	SingleHeader interface{} `json:"SingleHeader,omitempty"`
+
+	// SingleQueryArgument AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-fieldtomatch.html#cfn-wafv2-webacl-fieldtomatch-singlequeryargument
+	SingleQueryArgument interface{} `json:"SingleQueryArgument,omitempty"`
+
+	// UriPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-fieldtomatch.html#cfn-wafv2-webacl-fieldtomatch-uripath
+	UriPath interface{} `json:"UriPath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_FieldToMatch) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.FieldToMatch"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_forwardedipconfiguration.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_forwardedipconfiguration.go
new file mode 100644
index 0000000000..900978efc2
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_forwardedipconfiguration.go
@@ -0,0 +1,42 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_ForwardedIPConfiguration AWS CloudFormation Resource (AWS::WAFv2::WebACL.ForwardedIPConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-forwardedipconfiguration.html
+type WebACL_ForwardedIPConfiguration struct {
+
+	// FallbackBehavior AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-forwardedipconfiguration.html#cfn-wafv2-webacl-forwardedipconfiguration-fallbackbehavior
+	FallbackBehavior *types.Value `json:"FallbackBehavior,omitempty"`
+
+	// HeaderName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-forwardedipconfiguration.html#cfn-wafv2-webacl-forwardedipconfiguration-headername
+	HeaderName *types.Value `json:"HeaderName,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_ForwardedIPConfiguration) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.ForwardedIPConfiguration"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_geomatchstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_geomatchstatement.go
new file mode 100644
index 0000000000..34be298da7
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_geomatchstatement.go
@@ -0,0 +1,42 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_GeoMatchStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.GeoMatchStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-geomatchstatement.html
+type WebACL_GeoMatchStatement struct {
+
+	// CountryCodes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-geomatchstatement.html#cfn-wafv2-webacl-geomatchstatement-countrycodes
+	CountryCodes *types.Value `json:"CountryCodes,omitempty"`
+
+	// ForwardedIPConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-geomatchstatement.html#cfn-wafv2-webacl-geomatchstatement-forwardedipconfig
+	ForwardedIPConfig *WebACL_ForwardedIPConfiguration `json:"ForwardedIPConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_GeoMatchStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.GeoMatchStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_ipsetforwardedipconfiguration.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_ipsetforwardedipconfiguration.go
new file mode 100644
index 0000000000..e4f086e544
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_ipsetforwardedipconfiguration.go
@@ -0,0 +1,47 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_IPSetForwardedIPConfiguration AWS CloudFormation Resource (AWS::WAFv2::WebACL.IPSetForwardedIPConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ipsetforwardedipconfiguration.html
+type WebACL_IPSetForwardedIPConfiguration struct {
+
+	// FallbackBehavior AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ipsetforwardedipconfiguration.html#cfn-wafv2-webacl-ipsetforwardedipconfiguration-fallbackbehavior
+	FallbackBehavior *types.Value `json:"FallbackBehavior,omitempty"`
+
+	// HeaderName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ipsetforwardedipconfiguration.html#cfn-wafv2-webacl-ipsetforwardedipconfiguration-headername
+	HeaderName *types.Value `json:"HeaderName,omitempty"`
+
+	// Position AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ipsetforwardedipconfiguration.html#cfn-wafv2-webacl-ipsetforwardedipconfiguration-position
+	Position *types.Value `json:"Position,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_IPSetForwardedIPConfiguration) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.IPSetForwardedIPConfiguration"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_ipsetreferencestatement.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_ipsetreferencestatement.go
new file mode 100644
index 0000000000..2251b337fc
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_ipsetreferencestatement.go
@@ -0,0 +1,42 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_IPSetReferenceStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.IPSetReferenceStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ipsetreferencestatement.html
+type WebACL_IPSetReferenceStatement struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ipsetreferencestatement.html#cfn-wafv2-webacl-ipsetreferencestatement-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// IPSetForwardedIPConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ipsetreferencestatement.html#cfn-wafv2-webacl-ipsetreferencestatement-ipsetforwardedipconfig
+	IPSetForwardedIPConfig *WebACL_IPSetForwardedIPConfiguration `json:"IPSetForwardedIPConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_IPSetReferenceStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.IPSetReferenceStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_jsonbody.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_jsonbody.go
new file mode 100644
index 0000000000..8b875ee707
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_jsonbody.go
@@ -0,0 +1,47 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_JsonBody AWS CloudFormation Resource (AWS::WAFv2::WebACL.JsonBody)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-jsonbody.html
+type WebACL_JsonBody struct {
+
+	// InvalidFallbackBehavior AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-jsonbody.html#cfn-wafv2-webacl-jsonbody-invalidfallbackbehavior
+	InvalidFallbackBehavior *types.Value `json:"InvalidFallbackBehavior,omitempty"`
+
+	// MatchPattern AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-jsonbody.html#cfn-wafv2-webacl-jsonbody-matchpattern
+	MatchPattern *WebACL_JsonMatchPattern `json:"MatchPattern,omitempty"`
+
+	// MatchScope AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-jsonbody.html#cfn-wafv2-webacl-jsonbody-matchscope
+	MatchScope *types.Value `json:"MatchScope,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_JsonBody) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.JsonBody"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_jsonmatchpattern.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_jsonmatchpattern.go
new file mode 100644
index 0000000000..4646ea3709
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_jsonmatchpattern.go
@@ -0,0 +1,42 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_JsonMatchPattern AWS CloudFormation Resource (AWS::WAFv2::WebACL.JsonMatchPattern)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-jsonmatchpattern.html
+type WebACL_JsonMatchPattern struct {
+
+	// All AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-jsonmatchpattern.html#cfn-wafv2-webacl-jsonmatchpattern-all
+	All interface{} `json:"All,omitempty"`
+
+	// IncludedPaths AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-jsonmatchpattern.html#cfn-wafv2-webacl-jsonmatchpattern-includedpaths
+	IncludedPaths *types.Value `json:"IncludedPaths,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_JsonMatchPattern) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.JsonMatchPattern"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_label.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_label.go
new file mode 100644
index 0000000000..373ac31cde
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_label.go
@@ -0,0 +1,37 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_Label AWS CloudFormation Resource (AWS::WAFv2::WebACL.Label)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-label.html
+type WebACL_Label struct {
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-label.html#cfn-wafv2-webacl-label-name
+	Name *types.Value `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 *WebACL_Label) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.Label"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_labelmatchstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_labelmatchstatement.go
new file mode 100644
index 0000000000..513eebc022
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_labelmatchstatement.go
@@ -0,0 +1,42 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_LabelMatchStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.LabelMatchStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-labelmatchstatement.html
+type WebACL_LabelMatchStatement struct {
+
+	// Key AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-labelmatchstatement.html#cfn-wafv2-webacl-labelmatchstatement-key
+	Key *types.Value `json:"Key,omitempty"`
+
+	// Scope AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-labelmatchstatement.html#cfn-wafv2-webacl-labelmatchstatement-scope
+	Scope *types.Value `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 *WebACL_LabelMatchStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.LabelMatchStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_managedrulegroupstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_managedrulegroupstatement.go
new file mode 100644
index 0000000000..3792c423a7
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_managedrulegroupstatement.go
@@ -0,0 +1,57 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_ManagedRuleGroupStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.ManagedRuleGroupStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-managedrulegroupstatement.html
+type WebACL_ManagedRuleGroupStatement struct {
+
+	// ExcludedRules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-managedrulegroupstatement.html#cfn-wafv2-webacl-managedrulegroupstatement-excludedrules
+	ExcludedRules []WebACL_ExcludedRule `json:"ExcludedRules,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-managedrulegroupstatement.html#cfn-wafv2-webacl-managedrulegroupstatement-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ScopeDownStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-managedrulegroupstatement.html#cfn-wafv2-webacl-managedrulegroupstatement-scopedownstatement
+	ScopeDownStatement *WebACL_Statement `json:"ScopeDownStatement,omitempty"`
+
+	// VendorName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-managedrulegroupstatement.html#cfn-wafv2-webacl-managedrulegroupstatement-vendorname
+	VendorName *types.Value `json:"VendorName,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-managedrulegroupstatement.html#cfn-wafv2-webacl-managedrulegroupstatement-version
+	Version *types.Value `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 *WebACL_ManagedRuleGroupStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.ManagedRuleGroupStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatement.go
new file mode 100644
index 0000000000..303121257d
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatement.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_NotStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.NotStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-notstatement.html
+type WebACL_NotStatement struct {
+
+	// Statement AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-notstatement.html#cfn-wafv2-webacl-notstatement-statement
+	Statement *WebACL_Statement `json:"Statement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_NotStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.NotStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatementone.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatementone.go
new file mode 100644
index 0000000000..09f9418395
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatementone.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_NotStatementOne AWS CloudFormation Resource (AWS::WAFv2::WebACL.NotStatementOne)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-notstatementone.html
+type WebACL_NotStatementOne struct {
+
+	// Statement AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-notstatementone.html#cfn-wafv2-webacl-notstatementone-statement
+	Statement *WebACL_StatementTwo `json:"Statement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_NotStatementOne) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.NotStatementOne"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatementtwo.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatementtwo.go
new file mode 100644
index 0000000000..44c51834eb
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_notstatementtwo.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_NotStatementTwo AWS CloudFormation Resource (AWS::WAFv2::WebACL.NotStatementTwo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-notstatementtwo.html
+type WebACL_NotStatementTwo struct {
+
+	// Statement AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-notstatementtwo.html#cfn-wafv2-webacl-notstatementtwo-statement
+	Statement *WebACL_StatementThree `json:"Statement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_NotStatementTwo) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.NotStatementTwo"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatement.go
new file mode 100644
index 0000000000..637a067522
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatement.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_OrStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.OrStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-orstatement.html
+type WebACL_OrStatement struct {
+
+	// Statements AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-orstatement.html#cfn-wafv2-webacl-orstatement-statements
+	Statements []WebACL_Statement `json:"Statements,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_OrStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.OrStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatementone.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatementone.go
new file mode 100644
index 0000000000..dca69ddb46
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatementone.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_OrStatementOne AWS CloudFormation Resource (AWS::WAFv2::WebACL.OrStatementOne)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-orstatementone.html
+type WebACL_OrStatementOne struct {
+
+	// Statements AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-orstatementone.html#cfn-wafv2-webacl-orstatementone-statements
+	Statements []WebACL_StatementTwo `json:"Statements,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_OrStatementOne) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.OrStatementOne"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatementtwo.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatementtwo.go
new file mode 100644
index 0000000000..a6f471951d
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_orstatementtwo.go
@@ -0,0 +1,35 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_OrStatementTwo AWS CloudFormation Resource (AWS::WAFv2::WebACL.OrStatementTwo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-orstatementtwo.html
+type WebACL_OrStatementTwo struct {
+
+	// Statements AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-orstatementtwo.html#cfn-wafv2-webacl-orstatementtwo-statements
+	Statements []WebACL_StatementThree `json:"Statements,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_OrStatementTwo) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.OrStatementTwo"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_overrideaction.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_overrideaction.go
new file mode 100644
index 0000000000..02263a657a
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_overrideaction.go
@@ -0,0 +1,40 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_OverrideAction AWS CloudFormation Resource (AWS::WAFv2::WebACL.OverrideAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-overrideaction.html
+type WebACL_OverrideAction struct {
+
+	// Count AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-overrideaction.html#cfn-wafv2-webacl-overrideaction-count
+	Count interface{} `json:"Count,omitempty"`
+
+	// None AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-overrideaction.html#cfn-wafv2-webacl-overrideaction-none
+	None interface{} `json:"None,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_OverrideAction) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.OverrideAction"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatement.go
new file mode 100644
index 0000000000..ec47d050dd
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatement.go
@@ -0,0 +1,52 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_RateBasedStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.RateBasedStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatement.html
+type WebACL_RateBasedStatement struct {
+
+	// AggregateKeyType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatement.html#cfn-wafv2-webacl-ratebasedstatement-aggregatekeytype
+	AggregateKeyType *types.Value `json:"AggregateKeyType,omitempty"`
+
+	// ForwardedIPConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatement.html#cfn-wafv2-webacl-ratebasedstatement-forwardedipconfig
+	ForwardedIPConfig *WebACL_ForwardedIPConfiguration `json:"ForwardedIPConfig,omitempty"`
+
+	// Limit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatement.html#cfn-wafv2-webacl-ratebasedstatement-limit
+	Limit *types.Value `json:"Limit"`
+
+	// ScopeDownStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatement.html#cfn-wafv2-webacl-ratebasedstatement-scopedownstatement
+	ScopeDownStatement *WebACL_Statement `json:"ScopeDownStatement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_RateBasedStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.RateBasedStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementone.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementone.go
new file mode 100644
index 0000000000..ce51534f54
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementone.go
@@ -0,0 +1,52 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_RateBasedStatementOne AWS CloudFormation Resource (AWS::WAFv2::WebACL.RateBasedStatementOne)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementone.html
+type WebACL_RateBasedStatementOne struct {
+
+	// AggregateKeyType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementone.html#cfn-wafv2-webacl-ratebasedstatementone-aggregatekeytype
+	AggregateKeyType *types.Value `json:"AggregateKeyType,omitempty"`
+
+	// ForwardedIPConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementone.html#cfn-wafv2-webacl-ratebasedstatementone-forwardedipconfig
+	ForwardedIPConfig *WebACL_ForwardedIPConfiguration `json:"ForwardedIPConfig,omitempty"`
+
+	// Limit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementone.html#cfn-wafv2-webacl-ratebasedstatementone-limit
+	Limit *types.Value `json:"Limit"`
+
+	// ScopeDownStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementone.html#cfn-wafv2-webacl-ratebasedstatementone-scopedownstatement
+	ScopeDownStatement *WebACL_StatementTwo `json:"ScopeDownStatement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_RateBasedStatementOne) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.RateBasedStatementOne"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementtwo.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementtwo.go
new file mode 100644
index 0000000000..a15b82e863
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_ratebasedstatementtwo.go
@@ -0,0 +1,52 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_RateBasedStatementTwo AWS CloudFormation Resource (AWS::WAFv2::WebACL.RateBasedStatementTwo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementtwo.html
+type WebACL_RateBasedStatementTwo struct {
+
+	// AggregateKeyType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementtwo.html#cfn-wafv2-webacl-ratebasedstatementtwo-aggregatekeytype
+	AggregateKeyType *types.Value `json:"AggregateKeyType,omitempty"`
+
+	// ForwardedIPConfig AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementtwo.html#cfn-wafv2-webacl-ratebasedstatementtwo-forwardedipconfig
+	ForwardedIPConfig *WebACL_ForwardedIPConfiguration `json:"ForwardedIPConfig,omitempty"`
+
+	// Limit AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementtwo.html#cfn-wafv2-webacl-ratebasedstatementtwo-limit
+	Limit *types.Value `json:"Limit"`
+
+	// ScopeDownStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ratebasedstatementtwo.html#cfn-wafv2-webacl-ratebasedstatementtwo-scopedownstatement
+	ScopeDownStatement *WebACL_StatementThree `json:"ScopeDownStatement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_RateBasedStatementTwo) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.RateBasedStatementTwo"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_regexpatternsetreferencestatement.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_regexpatternsetreferencestatement.go
new file mode 100644
index 0000000000..df1de5936d
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_regexpatternsetreferencestatement.go
@@ -0,0 +1,47 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_RegexPatternSetReferenceStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.RegexPatternSetReferenceStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-regexpatternsetreferencestatement.html
+type WebACL_RegexPatternSetReferenceStatement struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-regexpatternsetreferencestatement.html#cfn-wafv2-webacl-regexpatternsetreferencestatement-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// FieldToMatch AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-regexpatternsetreferencestatement.html#cfn-wafv2-webacl-regexpatternsetreferencestatement-fieldtomatch
+	FieldToMatch *WebACL_FieldToMatch `json:"FieldToMatch,omitempty"`
+
+	// TextTransformations AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-regexpatternsetreferencestatement.html#cfn-wafv2-webacl-regexpatternsetreferencestatement-texttransformations
+	TextTransformations []WebACL_TextTransformation `json:"TextTransformations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_RegexPatternSetReferenceStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.RegexPatternSetReferenceStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_rule.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_rule.go
new file mode 100644
index 0000000000..f371a650ca
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_rule.go
@@ -0,0 +1,67 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_Rule AWS CloudFormation Resource (AWS::WAFv2::WebACL.Rule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-rule.html
+type WebACL_Rule struct {
+
+	// Action AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-rule.html#cfn-wafv2-webacl-rule-action
+	Action *WebACL_RuleAction `json:"Action,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-rule.html#cfn-wafv2-webacl-rule-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// OverrideAction AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-rule.html#cfn-wafv2-webacl-rule-overrideaction
+	OverrideAction *WebACL_OverrideAction `json:"OverrideAction,omitempty"`
+
+	// Priority AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-rule.html#cfn-wafv2-webacl-rule-priority
+	Priority *types.Value `json:"Priority"`
+
+	// RuleLabels AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-rule.html#cfn-wafv2-webacl-rule-rulelabels
+	RuleLabels []WebACL_Label `json:"RuleLabels,omitempty"`
+
+	// Statement AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-rule.html#cfn-wafv2-webacl-rule-statement
+	Statement *WebACL_Statement `json:"Statement,omitempty"`
+
+	// VisibilityConfig AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-rule.html#cfn-wafv2-webacl-rule-visibilityconfig
+	VisibilityConfig *WebACL_VisibilityConfig `json:"VisibilityConfig,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_Rule) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.Rule"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_ruleaction.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_ruleaction.go
new file mode 100644
index 0000000000..b06122bbb3
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_ruleaction.go
@@ -0,0 +1,45 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_RuleAction AWS CloudFormation Resource (AWS::WAFv2::WebACL.RuleAction)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ruleaction.html
+type WebACL_RuleAction struct {
+
+	// Allow AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ruleaction.html#cfn-wafv2-webacl-ruleaction-allow
+	Allow *WebACL_AllowAction `json:"Allow,omitempty"`
+
+	// Block AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ruleaction.html#cfn-wafv2-webacl-ruleaction-block
+	Block *WebACL_BlockAction `json:"Block,omitempty"`
+
+	// Count AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-ruleaction.html#cfn-wafv2-webacl-ruleaction-count
+	Count *WebACL_CountAction `json:"Count,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_RuleAction) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.RuleAction"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_rulegroupreferencestatement.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_rulegroupreferencestatement.go
new file mode 100644
index 0000000000..7e4c62abad
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_rulegroupreferencestatement.go
@@ -0,0 +1,42 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_RuleGroupReferenceStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.RuleGroupReferenceStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-rulegroupreferencestatement.html
+type WebACL_RuleGroupReferenceStatement struct {
+
+	// Arn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-rulegroupreferencestatement.html#cfn-wafv2-webacl-rulegroupreferencestatement-arn
+	Arn *types.Value `json:"Arn,omitempty"`
+
+	// ExcludedRules AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-rulegroupreferencestatement.html#cfn-wafv2-webacl-rulegroupreferencestatement-excludedrules
+	ExcludedRules []WebACL_ExcludedRule `json:"ExcludedRules,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_RuleGroupReferenceStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.RuleGroupReferenceStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_sizeconstraintstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_sizeconstraintstatement.go
new file mode 100644
index 0000000000..304fb33048
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_sizeconstraintstatement.go
@@ -0,0 +1,52 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_SizeConstraintStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.SizeConstraintStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-sizeconstraintstatement.html
+type WebACL_SizeConstraintStatement struct {
+
+	// ComparisonOperator AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-sizeconstraintstatement.html#cfn-wafv2-webacl-sizeconstraintstatement-comparisonoperator
+	ComparisonOperator *types.Value `json:"ComparisonOperator,omitempty"`
+
+	// FieldToMatch AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-sizeconstraintstatement.html#cfn-wafv2-webacl-sizeconstraintstatement-fieldtomatch
+	FieldToMatch *WebACL_FieldToMatch `json:"FieldToMatch,omitempty"`
+
+	// Size AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-sizeconstraintstatement.html#cfn-wafv2-webacl-sizeconstraintstatement-size
+	Size *types.Value `json:"Size"`
+
+	// TextTransformations AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-sizeconstraintstatement.html#cfn-wafv2-webacl-sizeconstraintstatement-texttransformations
+	TextTransformations []WebACL_TextTransformation `json:"TextTransformations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_SizeConstraintStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.SizeConstraintStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_sqlimatchstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_sqlimatchstatement.go
new file mode 100644
index 0000000000..32f3f3e07b
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_sqlimatchstatement.go
@@ -0,0 +1,40 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_SqliMatchStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.SqliMatchStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-sqlimatchstatement.html
+type WebACL_SqliMatchStatement struct {
+
+	// FieldToMatch AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-sqlimatchstatement.html#cfn-wafv2-webacl-sqlimatchstatement-fieldtomatch
+	FieldToMatch *WebACL_FieldToMatch `json:"FieldToMatch,omitempty"`
+
+	// TextTransformations AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-sqlimatchstatement.html#cfn-wafv2-webacl-sqlimatchstatement-texttransformations
+	TextTransformations []WebACL_TextTransformation `json:"TextTransformations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_SqliMatchStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.SqliMatchStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_statement.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_statement.go
new file mode 100644
index 0000000000..c9b699daf9
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_statement.go
@@ -0,0 +1,100 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_Statement AWS CloudFormation Resource (AWS::WAFv2::WebACL.Statement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statement.html
+type WebACL_Statement struct {
+
+	// AndStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statement.html#cfn-wafv2-webacl-statement-andstatement
+	AndStatement *WebACL_AndStatement `json:"AndStatement,omitempty"`
+
+	// ByteMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statement.html#cfn-wafv2-webacl-statement-bytematchstatement
+	ByteMatchStatement *WebACL_ByteMatchStatement `json:"ByteMatchStatement,omitempty"`
+
+	// GeoMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statement.html#cfn-wafv2-webacl-statement-geomatchstatement
+	GeoMatchStatement *WebACL_GeoMatchStatement `json:"GeoMatchStatement,omitempty"`
+
+	// IPSetReferenceStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statement.html#cfn-wafv2-webacl-statement-ipsetreferencestatement
+	IPSetReferenceStatement *WebACL_IPSetReferenceStatement `json:"IPSetReferenceStatement,omitempty"`
+
+	// LabelMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statement.html#cfn-wafv2-webacl-statement-labelmatchstatement
+	LabelMatchStatement *WebACL_LabelMatchStatement `json:"LabelMatchStatement,omitempty"`
+
+	// ManagedRuleGroupStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statement.html#cfn-wafv2-webacl-statement-managedrulegroupstatement
+	ManagedRuleGroupStatement *WebACL_ManagedRuleGroupStatement `json:"ManagedRuleGroupStatement,omitempty"`
+
+	// NotStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statement.html#cfn-wafv2-webacl-statement-notstatement
+	NotStatement *WebACL_NotStatement `json:"NotStatement,omitempty"`
+
+	// OrStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statement.html#cfn-wafv2-webacl-statement-orstatement
+	OrStatement *WebACL_OrStatement `json:"OrStatement,omitempty"`
+
+	// RateBasedStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statement.html#cfn-wafv2-webacl-statement-ratebasedstatement
+	RateBasedStatement *WebACL_RateBasedStatement `json:"RateBasedStatement,omitempty"`
+
+	// RegexPatternSetReferenceStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statement.html#cfn-wafv2-webacl-statement-regexpatternsetreferencestatement
+	RegexPatternSetReferenceStatement *WebACL_RegexPatternSetReferenceStatement `json:"RegexPatternSetReferenceStatement,omitempty"`
+
+	// RuleGroupReferenceStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statement.html#cfn-wafv2-webacl-statement-rulegroupreferencestatement
+	RuleGroupReferenceStatement *WebACL_RuleGroupReferenceStatement `json:"RuleGroupReferenceStatement,omitempty"`
+
+	// SizeConstraintStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statement.html#cfn-wafv2-webacl-statement-sizeconstraintstatement
+	SizeConstraintStatement *WebACL_SizeConstraintStatement `json:"SizeConstraintStatement,omitempty"`
+
+	// SqliMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statement.html#cfn-wafv2-webacl-statement-sqlimatchstatement
+	SqliMatchStatement *WebACL_SqliMatchStatement `json:"SqliMatchStatement,omitempty"`
+
+	// XssMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statement.html#cfn-wafv2-webacl-statement-xssmatchstatement
+	XssMatchStatement *WebACL_XssMatchStatement `json:"XssMatchStatement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_Statement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.Statement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementone.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementone.go
new file mode 100644
index 0000000000..942270a040
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementone.go
@@ -0,0 +1,95 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_StatementOne AWS CloudFormation Resource (AWS::WAFv2::WebACL.StatementOne)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementone.html
+type WebACL_StatementOne struct {
+
+	// AndStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementone.html#cfn-wafv2-webacl-statementone-andstatement
+	AndStatement *WebACL_AndStatementOne `json:"AndStatement,omitempty"`
+
+	// ByteMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementone.html#cfn-wafv2-webacl-statementone-bytematchstatement
+	ByteMatchStatement *WebACL_ByteMatchStatement `json:"ByteMatchStatement,omitempty"`
+
+	// GeoMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementone.html#cfn-wafv2-webacl-statementone-geomatchstatement
+	GeoMatchStatement *WebACL_GeoMatchStatement `json:"GeoMatchStatement,omitempty"`
+
+	// IPSetReferenceStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementone.html#cfn-wafv2-webacl-statementone-ipsetreferencestatement
+	IPSetReferenceStatement *WebACL_IPSetReferenceStatement `json:"IPSetReferenceStatement,omitempty"`
+
+	// ManagedRuleGroupStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementone.html#cfn-wafv2-webacl-statementone-managedrulegroupstatement
+	ManagedRuleGroupStatement *WebACL_ManagedRuleGroupStatement `json:"ManagedRuleGroupStatement,omitempty"`
+
+	// NotStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementone.html#cfn-wafv2-webacl-statementone-notstatement
+	NotStatement *WebACL_NotStatementOne `json:"NotStatement,omitempty"`
+
+	// OrStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementone.html#cfn-wafv2-webacl-statementone-orstatement
+	OrStatement *WebACL_OrStatementOne `json:"OrStatement,omitempty"`
+
+	// RateBasedStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementone.html#cfn-wafv2-webacl-statementone-ratebasedstatement
+	RateBasedStatement *WebACL_RateBasedStatementOne `json:"RateBasedStatement,omitempty"`
+
+	// RegexPatternSetReferenceStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementone.html#cfn-wafv2-webacl-statementone-regexpatternsetreferencestatement
+	RegexPatternSetReferenceStatement *WebACL_RegexPatternSetReferenceStatement `json:"RegexPatternSetReferenceStatement,omitempty"`
+
+	// RuleGroupReferenceStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementone.html#cfn-wafv2-webacl-statementone-rulegroupreferencestatement
+	RuleGroupReferenceStatement *WebACL_RuleGroupReferenceStatement `json:"RuleGroupReferenceStatement,omitempty"`
+
+	// SizeConstraintStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementone.html#cfn-wafv2-webacl-statementone-sizeconstraintstatement
+	SizeConstraintStatement *WebACL_SizeConstraintStatement `json:"SizeConstraintStatement,omitempty"`
+
+	// SqliMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementone.html#cfn-wafv2-webacl-statementone-sqlimatchstatement
+	SqliMatchStatement *WebACL_SqliMatchStatement `json:"SqliMatchStatement,omitempty"`
+
+	// XssMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementone.html#cfn-wafv2-webacl-statementone-xssmatchstatement
+	XssMatchStatement *WebACL_XssMatchStatement `json:"XssMatchStatement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_StatementOne) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.StatementOne"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementthree.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementthree.go
new file mode 100644
index 0000000000..4da6be5e4e
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementthree.go
@@ -0,0 +1,75 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_StatementThree AWS CloudFormation Resource (AWS::WAFv2::WebACL.StatementThree)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementthree.html
+type WebACL_StatementThree struct {
+
+	// ByteMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementthree.html#cfn-wafv2-webacl-statementthree-bytematchstatement
+	ByteMatchStatement *WebACL_ByteMatchStatement `json:"ByteMatchStatement,omitempty"`
+
+	// GeoMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementthree.html#cfn-wafv2-webacl-statementthree-geomatchstatement
+	GeoMatchStatement *WebACL_GeoMatchStatement `json:"GeoMatchStatement,omitempty"`
+
+	// IPSetReferenceStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementthree.html#cfn-wafv2-webacl-statementthree-ipsetreferencestatement
+	IPSetReferenceStatement *WebACL_IPSetReferenceStatement `json:"IPSetReferenceStatement,omitempty"`
+
+	// ManagedRuleGroupStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementthree.html#cfn-wafv2-webacl-statementthree-managedrulegroupstatement
+	ManagedRuleGroupStatement *WebACL_ManagedRuleGroupStatement `json:"ManagedRuleGroupStatement,omitempty"`
+
+	// RegexPatternSetReferenceStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementthree.html#cfn-wafv2-webacl-statementthree-regexpatternsetreferencestatement
+	RegexPatternSetReferenceStatement *WebACL_RegexPatternSetReferenceStatement `json:"RegexPatternSetReferenceStatement,omitempty"`
+
+	// RuleGroupReferenceStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementthree.html#cfn-wafv2-webacl-statementthree-rulegroupreferencestatement
+	RuleGroupReferenceStatement *WebACL_RuleGroupReferenceStatement `json:"RuleGroupReferenceStatement,omitempty"`
+
+	// SizeConstraintStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementthree.html#cfn-wafv2-webacl-statementthree-sizeconstraintstatement
+	SizeConstraintStatement *WebACL_SizeConstraintStatement `json:"SizeConstraintStatement,omitempty"`
+
+	// SqliMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementthree.html#cfn-wafv2-webacl-statementthree-sqlimatchstatement
+	SqliMatchStatement *WebACL_SqliMatchStatement `json:"SqliMatchStatement,omitempty"`
+
+	// XssMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementthree.html#cfn-wafv2-webacl-statementthree-xssmatchstatement
+	XssMatchStatement *WebACL_XssMatchStatement `json:"XssMatchStatement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_StatementThree) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.StatementThree"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementtwo.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementtwo.go
new file mode 100644
index 0000000000..d7b1548c97
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_statementtwo.go
@@ -0,0 +1,95 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_StatementTwo AWS CloudFormation Resource (AWS::WAFv2::WebACL.StatementTwo)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementtwo.html
+type WebACL_StatementTwo struct {
+
+	// AndStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementtwo.html#cfn-wafv2-webacl-statementtwo-andstatement
+	AndStatement *WebACL_AndStatementTwo `json:"AndStatement,omitempty"`
+
+	// ByteMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementtwo.html#cfn-wafv2-webacl-statementtwo-bytematchstatement
+	ByteMatchStatement *WebACL_ByteMatchStatement `json:"ByteMatchStatement,omitempty"`
+
+	// GeoMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementtwo.html#cfn-wafv2-webacl-statementtwo-geomatchstatement
+	GeoMatchStatement *WebACL_GeoMatchStatement `json:"GeoMatchStatement,omitempty"`
+
+	// IPSetReferenceStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementtwo.html#cfn-wafv2-webacl-statementtwo-ipsetreferencestatement
+	IPSetReferenceStatement *WebACL_IPSetReferenceStatement `json:"IPSetReferenceStatement,omitempty"`
+
+	// ManagedRuleGroupStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementtwo.html#cfn-wafv2-webacl-statementtwo-managedrulegroupstatement
+	ManagedRuleGroupStatement *WebACL_ManagedRuleGroupStatement `json:"ManagedRuleGroupStatement,omitempty"`
+
+	// NotStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementtwo.html#cfn-wafv2-webacl-statementtwo-notstatement
+	NotStatement *WebACL_NotStatementTwo `json:"NotStatement,omitempty"`
+
+	// OrStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementtwo.html#cfn-wafv2-webacl-statementtwo-orstatement
+	OrStatement *WebACL_OrStatementTwo `json:"OrStatement,omitempty"`
+
+	// RateBasedStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementtwo.html#cfn-wafv2-webacl-statementtwo-ratebasedstatement
+	RateBasedStatement *WebACL_RateBasedStatementTwo `json:"RateBasedStatement,omitempty"`
+
+	// RegexPatternSetReferenceStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementtwo.html#cfn-wafv2-webacl-statementtwo-regexpatternsetreferencestatement
+	RegexPatternSetReferenceStatement *WebACL_RegexPatternSetReferenceStatement `json:"RegexPatternSetReferenceStatement,omitempty"`
+
+	// RuleGroupReferenceStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementtwo.html#cfn-wafv2-webacl-statementtwo-rulegroupreferencestatement
+	RuleGroupReferenceStatement *WebACL_RuleGroupReferenceStatement `json:"RuleGroupReferenceStatement,omitempty"`
+
+	// SizeConstraintStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementtwo.html#cfn-wafv2-webacl-statementtwo-sizeconstraintstatement
+	SizeConstraintStatement *WebACL_SizeConstraintStatement `json:"SizeConstraintStatement,omitempty"`
+
+	// SqliMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementtwo.html#cfn-wafv2-webacl-statementtwo-sqlimatchstatement
+	SqliMatchStatement *WebACL_SqliMatchStatement `json:"SqliMatchStatement,omitempty"`
+
+	// XssMatchStatement AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-statementtwo.html#cfn-wafv2-webacl-statementtwo-xssmatchstatement
+	XssMatchStatement *WebACL_XssMatchStatement `json:"XssMatchStatement,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_StatementTwo) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.StatementTwo"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_texttransformation.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_texttransformation.go
new file mode 100644
index 0000000000..10950fd952
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_texttransformation.go
@@ -0,0 +1,42 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_TextTransformation AWS CloudFormation Resource (AWS::WAFv2::WebACL.TextTransformation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-texttransformation.html
+type WebACL_TextTransformation struct {
+
+	// Priority AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-texttransformation.html#cfn-wafv2-webacl-texttransformation-priority
+	Priority *types.Value `json:"Priority"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-texttransformation.html#cfn-wafv2-webacl-texttransformation-type
+	Type *types.Value `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 *WebACL_TextTransformation) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.TextTransformation"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_visibilityconfig.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_visibilityconfig.go
new file mode 100644
index 0000000000..73d416c606
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_visibilityconfig.go
@@ -0,0 +1,47 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_VisibilityConfig AWS CloudFormation Resource (AWS::WAFv2::WebACL.VisibilityConfig)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-visibilityconfig.html
+type WebACL_VisibilityConfig struct {
+
+	// CloudWatchMetricsEnabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-visibilityconfig.html#cfn-wafv2-webacl-visibilityconfig-cloudwatchmetricsenabled
+	CloudWatchMetricsEnabled *types.Value `json:"CloudWatchMetricsEnabled"`
+
+	// MetricName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-visibilityconfig.html#cfn-wafv2-webacl-visibilityconfig-metricname
+	MetricName *types.Value `json:"MetricName,omitempty"`
+
+	// SampledRequestsEnabled AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-visibilityconfig.html#cfn-wafv2-webacl-visibilityconfig-sampledrequestsenabled
+	SampledRequestsEnabled *types.Value `json:"SampledRequestsEnabled"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_VisibilityConfig) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.VisibilityConfig"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webacl_xssmatchstatement.go b/goformation/cloudformation/wafv2/aws-wafv2-webacl_xssmatchstatement.go
new file mode 100644
index 0000000000..fd94773834
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webacl_xssmatchstatement.go
@@ -0,0 +1,40 @@
+package wafv2
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACL_XssMatchStatement AWS CloudFormation Resource (AWS::WAFv2::WebACL.XssMatchStatement)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-xssmatchstatement.html
+type WebACL_XssMatchStatement struct {
+
+	// FieldToMatch AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-xssmatchstatement.html#cfn-wafv2-webacl-xssmatchstatement-fieldtomatch
+	FieldToMatch *WebACL_FieldToMatch `json:"FieldToMatch,omitempty"`
+
+	// TextTransformations AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wafv2-webacl-xssmatchstatement.html#cfn-wafv2-webacl-xssmatchstatement-texttransformations
+	TextTransformations []WebACL_TextTransformation `json:"TextTransformations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACL_XssMatchStatement) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACL.XssMatchStatement"
+}
diff --git a/goformation/cloudformation/wafv2/aws-wafv2-webaclassociation.go b/goformation/cloudformation/wafv2/aws-wafv2-webaclassociation.go
new file mode 100644
index 0000000000..6eb34a509b
--- /dev/null
+++ b/goformation/cloudformation/wafv2/aws-wafv2-webaclassociation.go
@@ -0,0 +1,113 @@
+package wafv2
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// WebACLAssociation AWS CloudFormation Resource (AWS::WAFv2::WebACLAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-webaclassociation.html
+type WebACLAssociation struct {
+
+	// ResourceArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-webaclassociation.html#cfn-wafv2-webaclassociation-resourcearn
+	ResourceArn *types.Value `json:"ResourceArn,omitempty"`
+
+	// WebACLArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wafv2-webaclassociation.html#cfn-wafv2-webaclassociation-webaclarn
+	WebACLArn *types.Value `json:"WebACLArn,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *WebACLAssociation) AWSCloudFormationType() string {
+	return "AWS::WAFv2::WebACLAssociation"
+}
+
+// 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 WebACLAssociation) MarshalJSON() ([]byte, error) {
+	type Properties WebACLAssociation
+	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 *WebACLAssociation) UnmarshalJSON(b []byte) error {
+	type Properties WebACLAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = WebACLAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/wisdom/aws-wisdom-assistant.go b/goformation/cloudformation/wisdom/aws-wisdom-assistant.go
new file mode 100644
index 0000000000..2bad0ab431
--- /dev/null
+++ b/goformation/cloudformation/wisdom/aws-wisdom-assistant.go
@@ -0,0 +1,129 @@
+package wisdom
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Assistant AWS CloudFormation Resource (AWS::Wisdom::Assistant)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-assistant.html
+type Assistant struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-assistant.html#cfn-wisdom-assistant-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-assistant.html#cfn-wisdom-assistant-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// ServerSideEncryptionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-assistant.html#cfn-wisdom-assistant-serversideencryptionconfiguration
+	ServerSideEncryptionConfiguration *Assistant_ServerSideEncryptionConfiguration `json:"ServerSideEncryptionConfiguration,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-assistant.html#cfn-wisdom-assistant-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// Type AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-assistant.html#cfn-wisdom-assistant-type
+	Type *types.Value `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 *Assistant) AWSCloudFormationType() string {
+	return "AWS::Wisdom::Assistant"
+}
+
+// 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 Assistant) MarshalJSON() ([]byte, error) {
+	type Properties Assistant
+	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 *Assistant) UnmarshalJSON(b []byte) error {
+	type Properties Assistant
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Assistant(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/wisdom/aws-wisdom-assistant_serversideencryptionconfiguration.go b/goformation/cloudformation/wisdom/aws-wisdom-assistant_serversideencryptionconfiguration.go
new file mode 100644
index 0000000000..3c3ab5d6d4
--- /dev/null
+++ b/goformation/cloudformation/wisdom/aws-wisdom-assistant_serversideencryptionconfiguration.go
@@ -0,0 +1,37 @@
+package wisdom
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Assistant_ServerSideEncryptionConfiguration AWS CloudFormation Resource (AWS::Wisdom::Assistant.ServerSideEncryptionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wisdom-assistant-serversideencryptionconfiguration.html
+type Assistant_ServerSideEncryptionConfiguration struct {
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wisdom-assistant-serversideencryptionconfiguration.html#cfn-wisdom-assistant-serversideencryptionconfiguration-kmskeyid
+	KmsKeyId *types.Value `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 *Assistant_ServerSideEncryptionConfiguration) AWSCloudFormationType() string {
+	return "AWS::Wisdom::Assistant.ServerSideEncryptionConfiguration"
+}
diff --git a/goformation/cloudformation/wisdom/aws-wisdom-assistantassociation.go b/goformation/cloudformation/wisdom/aws-wisdom-assistantassociation.go
new file mode 100644
index 0000000000..8ef13468e9
--- /dev/null
+++ b/goformation/cloudformation/wisdom/aws-wisdom-assistantassociation.go
@@ -0,0 +1,124 @@
+package wisdom
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// AssistantAssociation AWS CloudFormation Resource (AWS::Wisdom::AssistantAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-assistantassociation.html
+type AssistantAssociation struct {
+
+	// AssistantId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-assistantassociation.html#cfn-wisdom-assistantassociation-assistantid
+	AssistantId *types.Value `json:"AssistantId,omitempty"`
+
+	// Association AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-assistantassociation.html#cfn-wisdom-assistantassociation-association
+	Association *AssistantAssociation_AssociationData `json:"Association,omitempty"`
+
+	// AssociationType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-assistantassociation.html#cfn-wisdom-assistantassociation-associationtype
+	AssociationType *types.Value `json:"AssociationType,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-assistantassociation.html#cfn-wisdom-assistantassociation-tags
+	Tags []cloudformation.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 *AssistantAssociation) AWSCloudFormationType() string {
+	return "AWS::Wisdom::AssistantAssociation"
+}
+
+// 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 AssistantAssociation) MarshalJSON() ([]byte, error) {
+	type Properties AssistantAssociation
+	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 *AssistantAssociation) UnmarshalJSON(b []byte) error {
+	type Properties AssistantAssociation
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = AssistantAssociation(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/wisdom/aws-wisdom-assistantassociation_associationdata.go b/goformation/cloudformation/wisdom/aws-wisdom-assistantassociation_associationdata.go
new file mode 100644
index 0000000000..789af979ad
--- /dev/null
+++ b/goformation/cloudformation/wisdom/aws-wisdom-assistantassociation_associationdata.go
@@ -0,0 +1,37 @@
+package wisdom
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// AssistantAssociation_AssociationData AWS CloudFormation Resource (AWS::Wisdom::AssistantAssociation.AssociationData)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wisdom-assistantassociation-associationdata.html
+type AssistantAssociation_AssociationData struct {
+
+	// KnowledgeBaseId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wisdom-assistantassociation-associationdata.html#cfn-wisdom-assistantassociation-associationdata-knowledgebaseid
+	KnowledgeBaseId *types.Value `json:"KnowledgeBaseId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *AssistantAssociation_AssociationData) AWSCloudFormationType() string {
+	return "AWS::Wisdom::AssistantAssociation.AssociationData"
+}
diff --git a/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase.go b/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase.go
new file mode 100644
index 0000000000..2b536b7cdf
--- /dev/null
+++ b/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase.go
@@ -0,0 +1,139 @@
+package wisdom
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// KnowledgeBase AWS CloudFormation Resource (AWS::Wisdom::KnowledgeBase)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-knowledgebase.html
+type KnowledgeBase struct {
+
+	// Description AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-knowledgebase.html#cfn-wisdom-knowledgebase-description
+	Description *types.Value `json:"Description,omitempty"`
+
+	// KnowledgeBaseType AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-knowledgebase.html#cfn-wisdom-knowledgebase-knowledgebasetype
+	KnowledgeBaseType *types.Value `json:"KnowledgeBaseType,omitempty"`
+
+	// Name AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-knowledgebase.html#cfn-wisdom-knowledgebase-name
+	Name *types.Value `json:"Name,omitempty"`
+
+	// RenderingConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-knowledgebase.html#cfn-wisdom-knowledgebase-renderingconfiguration
+	RenderingConfiguration *KnowledgeBase_RenderingConfiguration `json:"RenderingConfiguration,omitempty"`
+
+	// ServerSideEncryptionConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-knowledgebase.html#cfn-wisdom-knowledgebase-serversideencryptionconfiguration
+	ServerSideEncryptionConfiguration *KnowledgeBase_ServerSideEncryptionConfiguration `json:"ServerSideEncryptionConfiguration,omitempty"`
+
+	// SourceConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-knowledgebase.html#cfn-wisdom-knowledgebase-sourceconfiguration
+	SourceConfiguration *KnowledgeBase_SourceConfiguration `json:"SourceConfiguration,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-wisdom-knowledgebase.html#cfn-wisdom-knowledgebase-tags
+	Tags []cloudformation.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 *KnowledgeBase) AWSCloudFormationType() string {
+	return "AWS::Wisdom::KnowledgeBase"
+}
+
+// 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 KnowledgeBase) MarshalJSON() ([]byte, error) {
+	type Properties KnowledgeBase
+	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 *KnowledgeBase) UnmarshalJSON(b []byte) error {
+	type Properties KnowledgeBase
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = KnowledgeBase(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_appintegrationsconfiguration.go b/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_appintegrationsconfiguration.go
new file mode 100644
index 0000000000..194a4d4e26
--- /dev/null
+++ b/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_appintegrationsconfiguration.go
@@ -0,0 +1,42 @@
+package wisdom
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// KnowledgeBase_AppIntegrationsConfiguration AWS CloudFormation Resource (AWS::Wisdom::KnowledgeBase.AppIntegrationsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wisdom-knowledgebase-appintegrationsconfiguration.html
+type KnowledgeBase_AppIntegrationsConfiguration struct {
+
+	// AppIntegrationArn AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wisdom-knowledgebase-appintegrationsconfiguration.html#cfn-wisdom-knowledgebase-appintegrationsconfiguration-appintegrationarn
+	AppIntegrationArn *types.Value `json:"AppIntegrationArn,omitempty"`
+
+	// ObjectFields AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wisdom-knowledgebase-appintegrationsconfiguration.html#cfn-wisdom-knowledgebase-appintegrationsconfiguration-objectfields
+	ObjectFields *types.Value `json:"ObjectFields,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_AppIntegrationsConfiguration) AWSCloudFormationType() string {
+	return "AWS::Wisdom::KnowledgeBase.AppIntegrationsConfiguration"
+}
diff --git a/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_renderingconfiguration.go b/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_renderingconfiguration.go
new file mode 100644
index 0000000000..e813577e04
--- /dev/null
+++ b/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_renderingconfiguration.go
@@ -0,0 +1,37 @@
+package wisdom
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// KnowledgeBase_RenderingConfiguration AWS CloudFormation Resource (AWS::Wisdom::KnowledgeBase.RenderingConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wisdom-knowledgebase-renderingconfiguration.html
+type KnowledgeBase_RenderingConfiguration struct {
+
+	// TemplateUri AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wisdom-knowledgebase-renderingconfiguration.html#cfn-wisdom-knowledgebase-renderingconfiguration-templateuri
+	TemplateUri *types.Value `json:"TemplateUri,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_RenderingConfiguration) AWSCloudFormationType() string {
+	return "AWS::Wisdom::KnowledgeBase.RenderingConfiguration"
+}
diff --git a/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_serversideencryptionconfiguration.go b/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_serversideencryptionconfiguration.go
new file mode 100644
index 0000000000..d5a9b09058
--- /dev/null
+++ b/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_serversideencryptionconfiguration.go
@@ -0,0 +1,37 @@
+package wisdom
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// KnowledgeBase_ServerSideEncryptionConfiguration AWS CloudFormation Resource (AWS::Wisdom::KnowledgeBase.ServerSideEncryptionConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wisdom-knowledgebase-serversideencryptionconfiguration.html
+type KnowledgeBase_ServerSideEncryptionConfiguration struct {
+
+	// KmsKeyId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wisdom-knowledgebase-serversideencryptionconfiguration.html#cfn-wisdom-knowledgebase-serversideencryptionconfiguration-kmskeyid
+	KmsKeyId *types.Value `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 *KnowledgeBase_ServerSideEncryptionConfiguration) AWSCloudFormationType() string {
+	return "AWS::Wisdom::KnowledgeBase.ServerSideEncryptionConfiguration"
+}
diff --git a/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_sourceconfiguration.go b/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_sourceconfiguration.go
new file mode 100644
index 0000000000..c09d46cd47
--- /dev/null
+++ b/goformation/cloudformation/wisdom/aws-wisdom-knowledgebase_sourceconfiguration.go
@@ -0,0 +1,35 @@
+package wisdom
+
+import (
+	"goformation/v4/cloudformation/policies"
+)
+
+// KnowledgeBase_SourceConfiguration AWS CloudFormation Resource (AWS::Wisdom::KnowledgeBase.SourceConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wisdom-knowledgebase-sourceconfiguration.html
+type KnowledgeBase_SourceConfiguration struct {
+
+	// AppIntegrations AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-wisdom-knowledgebase-sourceconfiguration.html#cfn-wisdom-knowledgebase-sourceconfiguration-appintegrations
+	AppIntegrations *KnowledgeBase_AppIntegrationsConfiguration `json:"AppIntegrations,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of 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_SourceConfiguration) AWSCloudFormationType() string {
+	return "AWS::Wisdom::KnowledgeBase.SourceConfiguration"
+}
diff --git a/goformation/cloudformation/workspaces/aws-workspaces-connectionalias.go b/goformation/cloudformation/workspaces/aws-workspaces-connectionalias.go
new file mode 100644
index 0000000000..8ad65cbf28
--- /dev/null
+++ b/goformation/cloudformation/workspaces/aws-workspaces-connectionalias.go
@@ -0,0 +1,114 @@
+package workspaces
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectionAlias AWS CloudFormation Resource (AWS::WorkSpaces::ConnectionAlias)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-connectionalias.html
+type ConnectionAlias struct {
+
+	// ConnectionString AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-connectionalias.html#cfn-workspaces-connectionalias-connectionstring
+	ConnectionString *types.Value `json:"ConnectionString,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-connectionalias.html#cfn-workspaces-connectionalias-tags
+	Tags []cloudformation.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 *ConnectionAlias) AWSCloudFormationType() string {
+	return "AWS::WorkSpaces::ConnectionAlias"
+}
+
+// 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 ConnectionAlias) MarshalJSON() ([]byte, error) {
+	type Properties ConnectionAlias
+	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 *ConnectionAlias) UnmarshalJSON(b []byte) error {
+	type Properties ConnectionAlias
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = ConnectionAlias(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/workspaces/aws-workspaces-connectionalias_connectionaliasassociation.go b/goformation/cloudformation/workspaces/aws-workspaces-connectionalias_connectionaliasassociation.go
new file mode 100644
index 0000000000..c4aea45fc4
--- /dev/null
+++ b/goformation/cloudformation/workspaces/aws-workspaces-connectionalias_connectionaliasassociation.go
@@ -0,0 +1,52 @@
+package workspaces
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// ConnectionAlias_ConnectionAliasAssociation AWS CloudFormation Resource (AWS::WorkSpaces::ConnectionAlias.ConnectionAliasAssociation)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-connectionalias-connectionaliasassociation.html
+type ConnectionAlias_ConnectionAliasAssociation struct {
+
+	// AssociatedAccountId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-connectionalias-connectionaliasassociation.html#cfn-workspaces-connectionalias-connectionaliasassociation-associatedaccountid
+	AssociatedAccountId *types.Value `json:"AssociatedAccountId,omitempty"`
+
+	// AssociationStatus AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-connectionalias-connectionaliasassociation.html#cfn-workspaces-connectionalias-connectionaliasassociation-associationstatus
+	AssociationStatus *types.Value `json:"AssociationStatus,omitempty"`
+
+	// ConnectionIdentifier AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-connectionalias-connectionaliasassociation.html#cfn-workspaces-connectionalias-connectionaliasassociation-connectionidentifier
+	ConnectionIdentifier *types.Value `json:"ConnectionIdentifier,omitempty"`
+
+	// ResourceId AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-connectionalias-connectionaliasassociation.html#cfn-workspaces-connectionalias-connectionaliasassociation-resourceid
+	ResourceId *types.Value `json:"ResourceId,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *ConnectionAlias_ConnectionAliasAssociation) AWSCloudFormationType() string {
+	return "AWS::WorkSpaces::ConnectionAlias.ConnectionAliasAssociation"
+}
diff --git a/goformation/cloudformation/workspaces/aws-workspaces-workspace.go b/goformation/cloudformation/workspaces/aws-workspaces-workspace.go
new file mode 100644
index 0000000000..00491192bc
--- /dev/null
+++ b/goformation/cloudformation/workspaces/aws-workspaces-workspace.go
@@ -0,0 +1,144 @@
+package workspaces
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/cloudformation"
+	"goformation/v4/cloudformation/policies"
+)
+
+// Workspace AWS CloudFormation Resource (AWS::WorkSpaces::Workspace)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspace.html
+type Workspace struct {
+
+	// BundleId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspace.html#cfn-workspaces-workspace-bundleid
+	BundleId *types.Value `json:"BundleId,omitempty"`
+
+	// DirectoryId AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspace.html#cfn-workspaces-workspace-directoryid
+	DirectoryId *types.Value `json:"DirectoryId,omitempty"`
+
+	// RootVolumeEncryptionEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspace.html#cfn-workspaces-workspace-rootvolumeencryptionenabled
+	RootVolumeEncryptionEnabled *types.Value `json:"RootVolumeEncryptionEnabled,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspace.html#cfn-workspaces-workspace-tags
+	Tags []cloudformation.Tag `json:"Tags,omitempty"`
+
+	// UserName AWS CloudFormation Property
+	// Required: true
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspace.html#cfn-workspaces-workspace-username
+	UserName *types.Value `json:"UserName,omitempty"`
+
+	// UserVolumeEncryptionEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspace.html#cfn-workspaces-workspace-uservolumeencryptionenabled
+	UserVolumeEncryptionEnabled *types.Value `json:"UserVolumeEncryptionEnabled,omitempty"`
+
+	// VolumeEncryptionKey AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspace.html#cfn-workspaces-workspace-volumeencryptionkey
+	VolumeEncryptionKey *types.Value `json:"VolumeEncryptionKey,omitempty"`
+
+	// WorkspaceProperties AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-workspaces-workspace.html#cfn-workspaces-workspace-workspaceproperties
+	WorkspaceProperties *Workspace_WorkspaceProperties `json:"WorkspaceProperties,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Workspace) AWSCloudFormationType() string {
+	return "AWS::WorkSpaces::Workspace"
+}
+
+// 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 Workspace) MarshalJSON() ([]byte, error) {
+	type Properties Workspace
+	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 *Workspace) UnmarshalJSON(b []byte) error {
+	type Properties Workspace
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Workspace(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/workspaces/aws-workspaces-workspace_workspaceproperties.go b/goformation/cloudformation/workspaces/aws-workspaces-workspace_workspaceproperties.go
new file mode 100644
index 0000000000..fc4fa0f858
--- /dev/null
+++ b/goformation/cloudformation/workspaces/aws-workspaces-workspace_workspaceproperties.go
@@ -0,0 +1,57 @@
+package workspaces
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Workspace_WorkspaceProperties AWS CloudFormation Resource (AWS::WorkSpaces::Workspace.WorkspaceProperties)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html
+type Workspace_WorkspaceProperties struct {
+
+	// ComputeTypeName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-computetypename
+	ComputeTypeName *types.Value `json:"ComputeTypeName,omitempty"`
+
+	// RootVolumeSizeGib AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-rootvolumesizegib
+	RootVolumeSizeGib *types.Value `json:"RootVolumeSizeGib,omitempty"`
+
+	// RunningMode AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmode
+	RunningMode *types.Value `json:"RunningMode,omitempty"`
+
+	// RunningModeAutoStopTimeoutInMinutes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-runningmodeautostoptimeoutinminutes
+	RunningModeAutoStopTimeoutInMinutes *types.Value `json:"RunningModeAutoStopTimeoutInMinutes,omitempty"`
+
+	// UserVolumeSizeGib AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-workspaces-workspace-workspaceproperties.html#cfn-workspaces-workspace-workspaceproperties-uservolumesizegib
+	UserVolumeSizeGib *types.Value `json:"UserVolumeSizeGib,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Workspace_WorkspaceProperties) AWSCloudFormationType() string {
+	return "AWS::WorkSpaces::Workspace.WorkspaceProperties"
+}
diff --git a/goformation/cloudformation/xray/aws-xray-group.go b/goformation/cloudformation/xray/aws-xray-group.go
new file mode 100644
index 0000000000..d9313eb2d6
--- /dev/null
+++ b/goformation/cloudformation/xray/aws-xray-group.go
@@ -0,0 +1,123 @@
+package xray
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Group AWS CloudFormation Resource (AWS::XRay::Group)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-xray-group.html
+type Group struct {
+
+	// FilterExpression AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-xray-group.html#cfn-xray-group-filterexpression
+	FilterExpression *types.Value `json:"FilterExpression,omitempty"`
+
+	// GroupName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-xray-group.html#cfn-xray-group-groupname
+	GroupName *types.Value `json:"GroupName,omitempty"`
+
+	// InsightsConfiguration AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-xray-group.html#cfn-xray-group-insightsconfiguration
+	InsightsConfiguration *Group_InsightsConfiguration `json:"InsightsConfiguration,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-xray-group.html#cfn-xray-group-tags
+	Tags []interface{} `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 *Group) AWSCloudFormationType() string {
+	return "AWS::XRay::Group"
+}
+
+// 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 Group) MarshalJSON() ([]byte, error) {
+	type Properties Group
+	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 *Group) UnmarshalJSON(b []byte) error {
+	type Properties Group
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = Group(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/xray/aws-xray-group_insightsconfiguration.go b/goformation/cloudformation/xray/aws-xray-group_insightsconfiguration.go
new file mode 100644
index 0000000000..79026e817a
--- /dev/null
+++ b/goformation/cloudformation/xray/aws-xray-group_insightsconfiguration.go
@@ -0,0 +1,42 @@
+package xray
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// Group_InsightsConfiguration AWS CloudFormation Resource (AWS::XRay::Group.InsightsConfiguration)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-group-insightsconfiguration.html
+type Group_InsightsConfiguration struct {
+
+	// InsightsEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-group-insightsconfiguration.html#cfn-xray-group-insightsconfiguration-insightsenabled
+	InsightsEnabled *types.Value `json:"InsightsEnabled,omitempty"`
+
+	// NotificationsEnabled AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-group-insightsconfiguration.html#cfn-xray-group-insightsconfiguration-notificationsenabled
+	NotificationsEnabled *types.Value `json:"NotificationsEnabled,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *Group_InsightsConfiguration) AWSCloudFormationType() string {
+	return "AWS::XRay::Group.InsightsConfiguration"
+}
diff --git a/goformation/cloudformation/xray/aws-xray-samplingrule.go b/goformation/cloudformation/xray/aws-xray-samplingrule.go
new file mode 100644
index 0000000000..ce4fbdfdd0
--- /dev/null
+++ b/goformation/cloudformation/xray/aws-xray-samplingrule.go
@@ -0,0 +1,128 @@
+package xray
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SamplingRule AWS CloudFormation Resource (AWS::XRay::SamplingRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-xray-samplingrule.html
+type SamplingRule struct {
+
+	// RuleName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-xray-samplingrule.html#cfn-xray-samplingrule-rulename
+	RuleName *types.Value `json:"RuleName,omitempty"`
+
+	// SamplingRule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-xray-samplingrule.html#cfn-xray-samplingrule-samplingrule
+	SamplingRule *SamplingRule_SamplingRule `json:"SamplingRule,omitempty"`
+
+	// SamplingRuleRecord AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-xray-samplingrule.html#cfn-xray-samplingrule-samplingrulerecord
+	SamplingRuleRecord *SamplingRule_SamplingRuleRecord `json:"SamplingRuleRecord,omitempty"`
+
+	// SamplingRuleUpdate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-xray-samplingrule.html#cfn-xray-samplingrule-samplingruleupdate
+	SamplingRuleUpdate *SamplingRule_SamplingRuleUpdate `json:"SamplingRuleUpdate,omitempty"`
+
+	// Tags AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-resource-xray-samplingrule.html#cfn-xray-samplingrule-tags
+	Tags []interface{} `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 *SamplingRule) AWSCloudFormationType() string {
+	return "AWS::XRay::SamplingRule"
+}
+
+// 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 SamplingRule) MarshalJSON() ([]byte, error) {
+	type Properties SamplingRule
+	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 *SamplingRule) UnmarshalJSON(b []byte) error {
+	type Properties SamplingRule
+	res := &struct {
+		Type                string
+		Properties          *Properties
+		DependsOn           []string
+		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 {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = SamplingRule(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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/goformation/cloudformation/xray/aws-xray-samplingrule_samplingrule.go b/goformation/cloudformation/xray/aws-xray-samplingrule_samplingrule.go
new file mode 100644
index 0000000000..d5ccd72fa7
--- /dev/null
+++ b/goformation/cloudformation/xray/aws-xray-samplingrule_samplingrule.go
@@ -0,0 +1,97 @@
+package xray
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SamplingRule_SamplingRule AWS CloudFormation Resource (AWS::XRay::SamplingRule.SamplingRule)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingrule.html
+type SamplingRule_SamplingRule struct {
+
+	// Attributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingrule.html#cfn-xray-samplingrule-samplingrule-attributes
+	Attributes map[string]*types.Value `json:"Attributes,omitempty"`
+
+	// FixedRate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingrule.html#cfn-xray-samplingrule-samplingrule-fixedrate
+	FixedRate *types.Value `json:"FixedRate,omitempty"`
+
+	// HTTPMethod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingrule.html#cfn-xray-samplingrule-samplingrule-httpmethod
+	HTTPMethod *types.Value `json:"HTTPMethod,omitempty"`
+
+	// Host AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingrule.html#cfn-xray-samplingrule-samplingrule-host
+	Host *types.Value `json:"Host,omitempty"`
+
+	// Priority AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingrule.html#cfn-xray-samplingrule-samplingrule-priority
+	Priority *types.Value `json:"Priority,omitempty"`
+
+	// ReservoirSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingrule.html#cfn-xray-samplingrule-samplingrule-reservoirsize
+	ReservoirSize *types.Value `json:"ReservoirSize,omitempty"`
+
+	// ResourceARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingrule.html#cfn-xray-samplingrule-samplingrule-resourcearn
+	ResourceARN *types.Value `json:"ResourceARN,omitempty"`
+
+	// RuleARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingrule.html#cfn-xray-samplingrule-samplingrule-rulearn
+	RuleARN *types.Value `json:"RuleARN,omitempty"`
+
+	// RuleName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingrule.html#cfn-xray-samplingrule-samplingrule-rulename
+	RuleName *types.Value `json:"RuleName,omitempty"`
+
+	// ServiceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingrule.html#cfn-xray-samplingrule-samplingrule-servicename
+	ServiceName *types.Value `json:"ServiceName,omitempty"`
+
+	// ServiceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingrule.html#cfn-xray-samplingrule-samplingrule-servicetype
+	ServiceType *types.Value `json:"ServiceType,omitempty"`
+
+	// URLPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingrule.html#cfn-xray-samplingrule-samplingrule-urlpath
+	URLPath *types.Value `json:"URLPath,omitempty"`
+
+	// Version AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingrule.html#cfn-xray-samplingrule-samplingrule-version
+	Version *types.Value `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 *SamplingRule_SamplingRule) AWSCloudFormationType() string {
+	return "AWS::XRay::SamplingRule.SamplingRule"
+}
diff --git a/goformation/cloudformation/xray/aws-xray-samplingrule_samplingrulerecord.go b/goformation/cloudformation/xray/aws-xray-samplingrule_samplingrulerecord.go
new file mode 100644
index 0000000000..7ed716e9d5
--- /dev/null
+++ b/goformation/cloudformation/xray/aws-xray-samplingrule_samplingrulerecord.go
@@ -0,0 +1,47 @@
+package xray
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SamplingRule_SamplingRuleRecord AWS CloudFormation Resource (AWS::XRay::SamplingRule.SamplingRuleRecord)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingrulerecord.html
+type SamplingRule_SamplingRuleRecord struct {
+
+	// CreatedAt AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingrulerecord.html#cfn-xray-samplingrule-samplingrulerecord-createdat
+	CreatedAt *types.Value `json:"CreatedAt,omitempty"`
+
+	// ModifiedAt AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingrulerecord.html#cfn-xray-samplingrule-samplingrulerecord-modifiedat
+	ModifiedAt *types.Value `json:"ModifiedAt,omitempty"`
+
+	// SamplingRule AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingrulerecord.html#cfn-xray-samplingrule-samplingrulerecord-samplingrule
+	SamplingRule *SamplingRule_SamplingRule `json:"SamplingRule,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SamplingRule_SamplingRuleRecord) AWSCloudFormationType() string {
+	return "AWS::XRay::SamplingRule.SamplingRuleRecord"
+}
diff --git a/goformation/cloudformation/xray/aws-xray-samplingrule_samplingruleupdate.go b/goformation/cloudformation/xray/aws-xray-samplingrule_samplingruleupdate.go
new file mode 100644
index 0000000000..a44b810f4c
--- /dev/null
+++ b/goformation/cloudformation/xray/aws-xray-samplingrule_samplingruleupdate.go
@@ -0,0 +1,92 @@
+package xray
+
+import (
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/policies"
+)
+
+// SamplingRule_SamplingRuleUpdate AWS CloudFormation Resource (AWS::XRay::SamplingRule.SamplingRuleUpdate)
+// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingruleupdate.html
+type SamplingRule_SamplingRuleUpdate struct {
+
+	// Attributes AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingruleupdate.html#cfn-xray-samplingrule-samplingruleupdate-attributes
+	Attributes map[string]*types.Value `json:"Attributes,omitempty"`
+
+	// FixedRate AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingruleupdate.html#cfn-xray-samplingrule-samplingruleupdate-fixedrate
+	FixedRate *types.Value `json:"FixedRate,omitempty"`
+
+	// HTTPMethod AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingruleupdate.html#cfn-xray-samplingrule-samplingruleupdate-httpmethod
+	HTTPMethod *types.Value `json:"HTTPMethod,omitempty"`
+
+	// Host AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingruleupdate.html#cfn-xray-samplingrule-samplingruleupdate-host
+	Host *types.Value `json:"Host,omitempty"`
+
+	// Priority AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingruleupdate.html#cfn-xray-samplingrule-samplingruleupdate-priority
+	Priority *types.Value `json:"Priority,omitempty"`
+
+	// ReservoirSize AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingruleupdate.html#cfn-xray-samplingrule-samplingruleupdate-reservoirsize
+	ReservoirSize *types.Value `json:"ReservoirSize,omitempty"`
+
+	// ResourceARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingruleupdate.html#cfn-xray-samplingrule-samplingruleupdate-resourcearn
+	ResourceARN *types.Value `json:"ResourceARN,omitempty"`
+
+	// RuleARN AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingruleupdate.html#cfn-xray-samplingrule-samplingruleupdate-rulearn
+	RuleARN *types.Value `json:"RuleARN,omitempty"`
+
+	// RuleName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingruleupdate.html#cfn-xray-samplingrule-samplingruleupdate-rulename
+	RuleName *types.Value `json:"RuleName,omitempty"`
+
+	// ServiceName AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingruleupdate.html#cfn-xray-samplingrule-samplingruleupdate-servicename
+	ServiceName *types.Value `json:"ServiceName,omitempty"`
+
+	// ServiceType AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingruleupdate.html#cfn-xray-samplingrule-samplingruleupdate-servicetype
+	ServiceType *types.Value `json:"ServiceType,omitempty"`
+
+	// URLPath AWS CloudFormation Property
+	// Required: false
+	// See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-xray-samplingrule-samplingruleupdate.html#cfn-xray-samplingrule-samplingruleupdate-urlpath
+	URLPath *types.Value `json:"URLPath,omitempty"`
+
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+	// AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+	AWSCloudFormationDependsOn []string `json:"-"`
+
+	// AWSCloudFormationMetadata stores structured data associated with this resource
+	AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+	// AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+	AWSCloudFormationCondition string `json:"-"`
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *SamplingRule_SamplingRuleUpdate) AWSCloudFormationType() string {
+	return "AWS::XRay::SamplingRule.SamplingRuleUpdate"
+}
diff --git a/goformation/example/go-to-yaml/main.go b/goformation/example/go-to-yaml/main.go
new file mode 100644
index 0000000000..78ffe4a83d
--- /dev/null
+++ b/goformation/example/go-to-yaml/main.go
@@ -0,0 +1,45 @@
+package main
+
+import (
+	"fmt"
+	"strconv"
+	"time"
+
+	"goformation/v4/cloudformation"
+	"goformation/v4/cloudformation/sns"
+	"goformation/v4/cloudformation/types"
+)
+
+func main() {
+
+	// Create a new CloudFormation template
+	template := cloudformation.NewTemplate()
+
+	// Create an Amazon SNS topic, with a unique name based off the current timestamp
+	template.Resources["MyTopic"] = &sns.Topic{
+		TopicName: types.NewString("my-topic-" + strconv.FormatInt(time.Now().Unix(), 10)),
+	}
+
+	// Create a subscription, connected to our topic, that forwards notifications to an email address
+	template.Resources["MyTopicSubscription"] = &sns.Subscription{
+		TopicArn: types.MakeRef("MyTopic"),
+		Protocol: types.NewString("email"),
+		Endpoint: types.NewString("some.email@example.com"),
+	}
+
+	// Let's see the JSON
+	j, err := template.JSON()
+	if err != nil {
+		fmt.Printf("Failed to generate JSON: %s\n", err)
+	} else {
+		fmt.Printf("%s\n", string(j))
+	}
+
+	y, err := template.YAML()
+	if err != nil {
+		fmt.Printf("Failed to generate YAML: %s\n", err)
+	} else {
+		fmt.Printf("%s\n", string(y))
+	}
+
+}
diff --git a/goformation/example/yaml-to-go/main.go b/goformation/example/yaml-to-go/main.go
new file mode 100644
index 0000000000..a8a92d0fc0
--- /dev/null
+++ b/goformation/example/yaml-to-go/main.go
@@ -0,0 +1,37 @@
+package main
+
+import (
+	"log"
+
+	"goformation/v4"
+)
+
+func main() {
+
+	// Open a template from file (can be JSON or YAML)
+	template, err := goformation.Open("template.yaml")
+	if err != nil {
+		log.Fatalf("There was an error processing the template: %s", err)
+	}
+
+	// You can extract all resources of a certain type
+	// Each AWS CloudFormation resource is a strongly typed struct
+	topics := template.GetAllSNSTopicResources()
+	for name, topic := range topics {
+
+		// E.g. Found a AWS::SNS::Topic with Logical ID ExampleTopic and TopicName 'example'
+		log.Printf("Found a %s with Logical ID %s and TopicName %s\n", topic.AWSCloudFormationType(), name, topic.TopicName)
+
+	}
+
+	// You can also search for specific resources by their logicalId
+	search := "ExampleTopic"
+	topic, err := template.GetSNSTopicWithName(search)
+	if err != nil {
+		log.Fatalf("SNS topic with logical ID %s not found", search)
+	}
+
+	// E.g. Found a AWS::Serverless::Function named GetHelloWorld (runtime: nodejs6.10)
+	log.Printf("Found a %s with Logical ID %s and TopicName %s\n", topic.AWSCloudFormationType(), search, topic.TopicName)
+
+}
diff --git a/goformation/example/yaml-to-go/template.yaml b/goformation/example/yaml-to-go/template.yaml
new file mode 100644
index 0000000000..dc8cc6861a
--- /dev/null
+++ b/goformation/example/yaml-to-go/template.yaml
@@ -0,0 +1,7 @@
+AWSTemplateFormatVersion: 2010-09-09
+
+Resources:
+  ExampleTopic:
+    Type: AWS::SNS::Topic
+    Properties:
+      TopicName: example
diff --git a/goformation/generate/create-pull-request.sh b/goformation/generate/create-pull-request.sh
new file mode 100755
index 0000000000..04bd9948b4
--- /dev/null
+++ b/goformation/generate/create-pull-request.sh
@@ -0,0 +1,88 @@
+#!/bin/bash
+
+# This script is run on a daily basis via GitHub Actions. It is responsible for
+# automatically updating all of goformation's CloudFormation resources to match
+# what is currently supported in AWS CloudFormation.
+# 
+# It does the following:
+# 
+# 1. Clone github.com/goformation/goformation to local filesystem
+# 2. Switch to aws-goformation-updates branch (creating it if necessary)
+# 3. Merge in any changes from github.com/awslabs/goformation (upstream)
+# 4. Run 'go generate'
+# 5. Check whether any resources changed
+# 6. Run 'go test' to ensure all tests pass
+# 7. Commit any changes and push to github.com/goformation/goformation
+# 8. Create a pull request from github.com/goformation/goformation (branch: aws-goformation-updates) to github.com/awslabs/goformation (master)
+#
+# It relies on the environment GITHUB_TOKEN containing a Personal Access Token for the github.com/goformation user.
+
+# Bomb out on errors
+set -e
+
+# The repo/branch to create the PR against
+SRC_REPO="aws-goformation/goformation"
+SRC_BRANCH="master"
+DST_REPO="awslabs/goformation"
+DST_BRANCH="master"
+
+# Git details (for the commit)
+COMMIT_NAME="AWS GoFormation"
+COMMIT_EMAIL="goformation@amazon.com"
+COMMIT_MSG="feat(schema): AWS CloudFormation Update ($(date +%F))"
+
+# Configure the Git user for any commits
+git config --global user.name "${COMMIT_NAME}"
+git config --global user.email "${COMMIT_EMAIL}"
+
+echo "Checking out github.com/${SRC_REPO}..."
+UPSTREAM_DIR=/tmp/upstream/src/github.com/awslabs/goformation
+mkdir -p ${UPSTREAM_DIR}
+git clone https://github.com/${SRC_REPO}.git ${UPSTREAM_DIR} > /dev/null 2>&1
+GOPATH=/tmp/upstream
+cd ${UPSTREAM_DIR}
+
+CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+REQUEST_BRANCH="aws-goformation-updates"
+echo "Creating new branch: ${REQUEST_BRANCH} tracking origin/${SRC_BRANCH}"
+git checkout -b ${REQUEST_BRANCH} origin/${SRC_BRANCH}
+git pull --rebase origin ${REQUEST_BRANCH} || true
+
+# Merging in any changes from upstream
+git remote add upstream https://github.com/${DST_REPO}.git
+git pull --rebase upstream ${SRC_BRANCH} || true
+
+ 
+echo "Auto-generating AWS CloudFormation resources..."
+go generate
+
+# Don't proceed if there were no new resources generated/updated
+if [[ -z $(git status -s | grep "cloudformation/") ]]; then
+    echo "No changes - no pull request necessary."
+    exit 0;
+fi
+  
+echo "Changes found:"
+git status -s
+
+echo "Running tests..."
+go test -v ./...
+
+echo "Committing changes..."
+git add cloudformation/*
+git add schema/*
+git commit -m "${COMMIT_MSG}" 
+
+echo "Pushing changes..."
+git remote add origin-push https://x-access-token:${GITHUB_TOKEN}@github.com/${SRC_REPO}.git > /dev/null 2>&1
+git push --quiet --set-upstream origin-push ${REQUEST_BRANCH}
+
+echo "Installing GitHub Hub"
+git clone https://github.com/github/hub.git /tmp/hub
+cd /tmp/hub
+go get ./...
+./script/build 
+
+echo "Generating Pull Request for merging ${REPO}/${REQUEST_BRANCH} to ${REPO}/${DST_BRANCH}..."
+cd ${UPSTREAM_DIR}
+echo "${COMMIT_MSG}" | /tmp/hub/bin/hub pull-request -F --head aws-goformation:${REQUEST_BRANCH} - /dev/null 2>&1 || true
diff --git a/goformation/generate/generate.go b/goformation/generate/generate.go
new file mode 100644
index 0000000000..c3ef36ce44
--- /dev/null
+++ b/goformation/generate/generate.go
@@ -0,0 +1,525 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"go/format"
+	"io/ioutil"
+	"net/http"
+	"net/url"
+	"os"
+	"sort"
+	"strings"
+	"text/template"
+)
+
+// ResourceGenerator takes AWS CloudFormation Resource Specification
+// documents, and generates Go structs and a JSON Schema from them.
+type ResourceGenerator struct {
+	primaryURL   string
+	fragmentUrls map[string]string
+	Results      *ResourceGeneratorResults
+}
+
+// GeneratedResource represents a CloudFormation resource that has been generated
+// and includes the name (e.g. AWS::S3::Bucket), Package Name (e.g. s3) and struct name (e.g. Bucket)
+type GeneratedResource struct {
+	Name        string
+	BaseName    string
+	PackageName string
+	StructName  string
+}
+
+// ResourceGeneratorResults contains a summary of the items generated
+type ResourceGeneratorResults struct {
+	AllResources     []GeneratedResource
+	UpdatedResources []GeneratedResource
+	UpdatedSchemas   map[string]string
+	ProcessedCount   int
+}
+
+var (
+	// ResourcesThatSupportUpdatePolicies defines which CloudFormation resources support UpdatePolicies
+	// see: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-updatepolicy.html
+	ResourcesThatSupportUpdatePolicies = []string{
+		"AWS::AutoScaling::AutoScalingGroup",
+		"AWS::Lambda::Alias",
+	}
+
+	// ResourcesThatSupportCreationPolicies defines which CloudFormation resources support CreationPolicies
+	// see: https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-attribute-creationpolicy.html
+	ResourcesThatSupportCreationPolicies = []string{
+		"AWS::AutoScaling::AutoScalingGroup",
+		"AWS::EC2::Instance",
+		"AWS::CloudFormation::WaitCondition",
+	}
+)
+
+// NewResourceGenerator contains a primary AWS CloudFormation Resource Specification
+// document and an array of fragment Resource Specification documents (such as transforms),
+// and generates Go structs and a JSON Schema from them.
+// The input can be a mix of URLs (https://) or files (file://).
+func NewResourceGenerator(primaryURL string, fragmentUrls map[string]string) (*ResourceGenerator, error) {
+
+	rg := &ResourceGenerator{
+		primaryURL:   primaryURL,
+		fragmentUrls: fragmentUrls,
+		Results: &ResourceGeneratorResults{
+			UpdatedResources: []GeneratedResource{},
+			AllResources:     []GeneratedResource{},
+			UpdatedSchemas:   map[string]string{},
+			ProcessedCount:   0,
+		},
+	}
+
+	return rg, nil
+}
+
+// Generate generates Go structs and a JSON Schema from the AWS CloudFormation
+// Resource Specifications provided to NewResourceGenerator
+func (rg *ResourceGenerator) Generate() error {
+
+	// Process the primary template first, since the primary template resources
+	// are added to the JSON schema for fragment transform specs
+	fmt.Printf("Downloading cloudformation specification from %s\n", rg.primaryURL)
+	primaryData, err := rg.downloadSpec(rg.primaryURL)
+	if err != nil {
+		return err
+	}
+	primarySpec, err := rg.processSpec("cloudformation", primaryData)
+	if err != nil {
+		return err
+	}
+	if err := rg.generateJSONSchema("cloudformation", primarySpec); err != nil {
+		return err
+	}
+
+	for name, url := range rg.fragmentUrls {
+		fmt.Printf("Downloading %s specification from %s\n", name, url)
+		data, err := rg.downloadSpec(url)
+		if err != nil {
+			return err
+		}
+		spec, err := rg.processSpec(name, data)
+		if err != nil {
+			return err
+		}
+		// Append main CloudFormation schema resource types and property types to this fragment
+		for k, v := range primarySpec.Resources {
+			spec.Resources[k] = v
+		}
+		for k, v := range primarySpec.Properties {
+			spec.Properties[k] = v
+		}
+		if err := rg.generateJSONSchema(name, spec); err != nil {
+			return err
+		}
+	}
+
+	if err := rg.generateAllResourcesMap(rg.Results.AllResources); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func (rg *ResourceGenerator) downloadSpec(location string) ([]byte, error) {
+	uri, err := url.Parse(location)
+	if err != nil {
+		return nil, err
+	}
+
+	switch uri.Scheme {
+	case "https", "http":
+		uri := uri.String()
+		response, err := http.Get(uri)
+		if err != nil {
+			return nil, err
+		}
+
+		data, err := ioutil.ReadAll(response.Body)
+		if err != nil {
+			return nil, err
+		}
+
+		return data, nil
+	case "file":
+		data, err := ioutil.ReadFile(strings.Replace(location, "file://", "", -1))
+		if err != nil {
+			return nil, err
+		}
+
+		return data, nil
+	}
+
+	return nil, fmt.Errorf("invalid URL scheme %s", uri.Scheme)
+}
+
+func (rg *ResourceGenerator) processSpec(specname string, data []byte) (*CloudFormationResourceSpecification, error) {
+
+	// Unmarshall the JSON specification
+	spec := &CloudFormationResourceSpecification{}
+	if err := json.Unmarshal(data, spec); err != nil {
+		return nil, err
+	}
+
+	// Add the resources processed to the ResourceGenerator output
+	for name := range spec.Resources {
+
+		sname, err := structName(name)
+		if err != nil {
+			return nil, err
+		}
+
+		pname, err := packageName(name, true)
+		if err != nil {
+			return nil, err
+		}
+
+		basename, err := packageName(name, false)
+		if err != nil {
+			return nil, err
+		}
+
+		rg.Results.AllResources = append(rg.Results.AllResources, GeneratedResource{
+			Name:        name,
+			BaseName:    basename,
+			PackageName: pname,
+			StructName:  sname,
+		})
+	}
+
+	// Write all of the resources in the spec file
+	for name, resource := range spec.Resources {
+		if err := rg.generateResources(name, resource, false, spec); err != nil {
+			return nil, err
+		}
+	}
+
+	// Write all of the custom types in the spec file
+	for name, resource := range spec.Properties {
+		if err := rg.generateResources(name, resource, true, spec); err != nil {
+			return nil, err
+		}
+	}
+
+	return spec, nil
+
+}
+
+func (rg *ResourceGenerator) generateAllResourcesMap(resources []GeneratedResource) error {
+
+	// Open the all resources template
+	tmpl, err := template.ParseFiles("generate/templates/all.template")
+	if err != nil {
+		return fmt.Errorf("failed to load resource template: %s", err)
+	}
+
+	// Sort the resources by cloudformation type, so that they don't rearrange
+	// every time the all.go file is generated
+	sort.Slice(resources, func(i, j int) bool {
+		return resources[i].Name < resources[j].Name
+	})
+
+	templateData := struct {
+		Resources []GeneratedResource
+	}{
+		Resources: resources,
+	}
+
+	// Execute the template, writing it to a buffer
+	var buf bytes.Buffer
+	err = tmpl.Execute(&buf, templateData)
+	if err != nil {
+		return fmt.Errorf("failed to generate iterable map of all resources: %s", err)
+	}
+
+	// Format the generated Go code with gofmt
+	formatted, err := format.Source(buf.Bytes())
+	if err != nil {
+		return fmt.Errorf("failed to format Go file for iterable map of all resources: %s", err)
+	}
+
+	// Write the file contents out
+	if err := ioutil.WriteFile("cloudformation/all.go", formatted, 0644); err != nil {
+		return fmt.Errorf("failed to write Go file for iterable map of all resources: %s", err)
+	}
+
+	return nil
+
+}
+
+func (rg *ResourceGenerator) generateResources(name string, resource Resource, isCustomProperty bool, spec *CloudFormationResourceSpecification) error {
+
+	// Open the resource template
+	tmpl, err := template.ParseFiles("generate/templates/resource.template")
+	if err != nil {
+		return fmt.Errorf("failed to load resource template: %s", err)
+	}
+
+	// Check if this resource type allows specifying a CloudFormation UpdatePolicy
+	hasUpdatePolicy := false
+	for _, res := range ResourcesThatSupportUpdatePolicies {
+		if name == res {
+			hasUpdatePolicy = true
+			break
+		}
+	}
+
+	// Check if this resource type allows specifying a CloudFormation CreationPolicy
+	hasCreationPolicy := false
+	for _, res := range ResourcesThatSupportCreationPolicies {
+		if name == res {
+			hasCreationPolicy = true
+			break
+		}
+	}
+
+	// Pass in the following information into the template
+	sname, err := structName(name)
+	if err != nil {
+		return err
+	}
+
+	pname, err := packageName(name, true)
+	if err != nil {
+		return err
+	}
+
+	// Check if this resource has any tag properties (and if it's not in the
+	// same package as the `Tag` type
+	// note: the property might not always be called 'Tags'
+	// see: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dlm-lifecyclepolicy-schedule.html#cfn-dlm-lifecyclepolicy-schedule-tagstoadd
+	hasTags := false
+	for _, property := range resource.Properties {
+		if property.ItemType == "Tag" {
+			hasTags = true && pname != "cloudformation"
+			break
+		}
+	}
+
+	nameParts := strings.Split(name, "::")
+	nameParts = strings.Split(nameParts[len(nameParts)-1], ".")
+	basename := nameParts[0]
+
+	templateData := struct {
+		Name              string
+		PackageName       string
+		StructName        string
+		Basename          string
+		Resource          Resource
+		IsCustomProperty  bool
+		Version           string
+		HasUpdatePolicy   bool
+		HasCreationPolicy bool
+		HasTags           bool
+	}{
+		Name:              name,
+		PackageName:       pname,
+		StructName:        sname,
+		Basename:          basename,
+		Resource:          resource,
+		IsCustomProperty:  isCustomProperty,
+		Version:           spec.ResourceSpecificationVersion,
+		HasUpdatePolicy:   hasUpdatePolicy,
+		HasCreationPolicy: hasCreationPolicy,
+		HasTags:           hasTags,
+	}
+
+	// Execute the template, writing it to a buffer
+	var buf bytes.Buffer
+	err = tmpl.Execute(&buf, templateData)
+	if err != nil {
+		return fmt.Errorf("failed to generate resource %s: %s", name, err)
+	}
+
+	// Format the generated Go code with gofmt
+	formatted, err := format.Source(buf.Bytes())
+	if err != nil {
+		fmt.Println(string(buf.Bytes()))
+		return fmt.Errorf("failed to format Go file for resource %s: %s", name, err)
+	}
+
+	// Check if the file has changed since the last time generate ran
+	dir := "cloudformation/" + pname
+	fn := dir + "/" + filename(name)
+	current, err := ioutil.ReadFile(fn)
+
+	if err != nil || bytes.Compare(formatted, current) != 0 {
+
+		// Create the directory if it doesn't exist
+		if _, err := os.Stat(dir); os.IsNotExist(err) {
+			os.Mkdir(dir, 0755)
+		}
+
+		// Write the file contents out
+		if err := ioutil.WriteFile(fn, formatted, 0644); err != nil {
+			return fmt.Errorf("failed to write resource file %s: %s", fn, err)
+		}
+		// Log the updated resource name to the results
+		rg.Results.UpdatedResources = append(rg.Results.UpdatedResources, GeneratedResource{
+			Name:        name,
+			BaseName:    basename,
+			PackageName: pname,
+			StructName:  sname,
+		})
+
+	}
+
+	rg.Results.ProcessedCount++
+
+	return nil
+
+}
+
+func (rg *ResourceGenerator) generateJSONSchema(specname string, spec *CloudFormationResourceSpecification) error {
+
+	// Open the schema template and setup a counter function that will
+	// available in the template to be used to detect when trailing commas
+	// are required in the JSON when looping through maps
+	tmpl, err := template.New("schema.template").Funcs(template.FuncMap{
+		"counter": counter,
+	}).ParseFiles("generate/templates/schema.template")
+
+	var buf bytes.Buffer
+
+	// Execute the template, writing it to file
+	err = tmpl.Execute(&buf, spec)
+	if err != nil {
+		return fmt.Errorf("failed to generate JSON Schema: %s", err)
+	}
+
+	// Parse it to JSON objects and back again to format it
+	var j interface{}
+	if err := json.Unmarshal(buf.Bytes(), &j); err != nil {
+		return fmt.Errorf("failed to unmarshal JSON Schema: %s", err)
+	}
+
+	formatted, err := json.MarshalIndent(j, "", "    ")
+	if err != nil {
+		return fmt.Errorf("failed to marshal JSON Schema: %s", err)
+
+	}
+
+	filename := fmt.Sprintf("schema/%s.schema.json", specname)
+	if err := ioutil.WriteFile(filename, formatted, 0644); err != nil {
+		return fmt.Errorf("failed to write JSON Schema: %s", err)
+	}
+
+	// Also create a Go importable version
+	var gocode []byte
+	gocode = append(gocode, []byte("package schema\n")...)
+	gocode = append(gocode, []byte("\n")...)
+	gocode = append(gocode, []byte("// "+strings.Title(specname)+"Schema defined a JSON Schema that can be used to validate CloudFormation/SAM templates\n")...)
+	gocode = append(gocode, []byte("var "+strings.Title(specname)+"Schema = `")...)
+	gocode = append(gocode, formatted...)
+	gocode = append(gocode, []byte("`\n")...)
+	gofilename := fmt.Sprintf("schema/%s.go", specname)
+	if err := ioutil.WriteFile(gofilename, gocode, 0644); err != nil {
+		return fmt.Errorf("failed to write Go version of JSON Schema: %s", err)
+	}
+
+	rg.Results.UpdatedSchemas[filename] = specname
+
+	return nil
+
+}
+
+func generatePolymorphicProperty(typename string, name string, property Property) {
+
+	// Open the polymorphic property template
+	tmpl, err := template.New("polymorphic-property.template").Funcs(template.FuncMap{
+		"convertToGoType": convertTypeToGo,
+		"convertToPureGoType": convertTypeToPureGo,
+	}).ParseFiles("generate/templates/polymorphic-property.template")
+
+	nameParts := strings.Split(name, "_")
+
+	types := append([]string{}, property.PrimitiveTypes...)
+	types = append(types, property.PrimitiveItemTypes...)
+	types = append(types, property.ItemTypes...)
+	types = append(types, property.Types...)
+
+	packageName, err := packageName(typename, true)
+	if err != nil {
+		fmt.Printf("Error: Invalid CloudFormation resource %s\n%s\n", typename, err)
+		os.Exit(1)
+	}
+
+	templateData := struct {
+		Name        string
+		PackageName string
+		Basename    string
+		Property    Property
+		Types       []string
+		TypesJoined string
+	}{
+		Name:        name,
+		PackageName: packageName,
+		Basename:    nameParts[0],
+		Property:    property,
+		Types:       types,
+		TypesJoined: conjoin("or", types),
+	}
+
+	// Execute the template, writing it to file
+	var buf bytes.Buffer
+	err = tmpl.Execute(&buf, templateData)
+	if err != nil {
+		fmt.Printf("Error: Failed to generate polymorphic property %s\n%s\n", name, err)
+		os.Exit(1)
+	}
+
+	// Format the generated Go file with gofmt
+	formatted, err := format.Source(buf.Bytes())
+	if err != nil {
+		fmt.Printf("Error: Failed to format Go file for resource %s\n%s\n", name, err)
+		os.Exit(1)
+	}
+
+	// Ensure the package directory exists
+	dir := "cloudformation/" + packageName
+	if _, err := os.Stat(dir); os.IsNotExist(err) {
+		os.Mkdir(dir, 0755)
+	}
+
+	// Write the file out
+	if err := ioutil.WriteFile(dir+"/"+filename(name), formatted, 0644); err != nil {
+		fmt.Printf("Error: Failed to write JSON Schema\n%s\n", err)
+		os.Exit(1)
+	}
+
+}
+
+// counter is used within the JSON Schema template to determin whether or not
+// to put a comma after a JSON resource (i.e. if it's the last element, then no comma)
+// see: http://android.wekeepcoding.com/article/10126058/Go+template+remove+the+last+comma+in+range+loop
+func counter(length int) func() int {
+	i := length
+	return func() int {
+		i--
+		return i
+	}
+}
+
+func conjoin(conj string, items []string) string {
+	if len(items) == 0 {
+		return ""
+	}
+	if len(items) == 1 {
+		return items[0]
+	}
+	if len(items) == 2 { // "a and b" not "a, and b"
+		return items[0] + " " + conj + " " + items[1]
+	}
+
+	sep := ", "
+	pieces := []string{items[0]}
+	for _, item := range items[1 : len(items)-1] {
+		pieces = append(pieces, sep, item)
+	}
+	pieces = append(pieces, sep, conj, " ", items[len(items)-1])
+
+	return strings.Join(pieces, "")
+}
diff --git a/goformation/generate/generate.sh b/goformation/generate/generate.sh
new file mode 100755
index 0000000000..a632e1e0aa
--- /dev/null
+++ b/goformation/generate/generate.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+
+# Quit on any errors
+set -e
+
+# Build the generator
+GENERATOR=$(mktemp)
+go build -o $GENERATOR ./generate
+
+# Run the generator
+$GENERATOR
+
+# Remove it afterwards
+rm $GENERATOR
diff --git a/goformation/generate/generate_suite_test.go b/goformation/generate/generate_suite_test.go
new file mode 100644
index 0000000000..7661369437
--- /dev/null
+++ b/goformation/generate/generate_suite_test.go
@@ -0,0 +1,13 @@
+package main_test
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	"testing"
+)
+
+func TestGenerate(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Generate Suite")
+}
diff --git a/goformation/generate/main.go b/goformation/generate/main.go
new file mode 100644
index 0000000000..14690ab169
--- /dev/null
+++ b/goformation/generate/main.go
@@ -0,0 +1,42 @@
+package main
+
+import (
+	"fmt"
+	"os"
+)
+
+func main() {
+
+	fmt.Printf("GoFormation Resource Generator\n")
+
+	// Fetch and process the AWS published CloudFormation Resource Specification
+	cloudformationSpec := "https://d1uauaxba7bl26.cloudfront.net/latest/gzip/CloudFormationResourceSpecification.json"
+
+	otherSpecs := map[string]string{
+		// We have a manually generated SAM specification in this repo too
+		// which needs to be manually updated when the SAM spec changes
+		"sam": "file://generate/sam-2016-10-31.json",
+	}
+
+	rg, err := NewResourceGenerator(cloudformationSpec, otherSpecs)
+	if err != nil {
+		fmt.Printf("ERROR: %s\n", err)
+		os.Exit(1)
+	}
+
+	if err := rg.Generate(); err != nil {
+		fmt.Printf("ERROR: Failed to generate resources: %s\n", err)
+		os.Exit(1)
+	}
+
+	if len(rg.Results.UpdatedResources) > 0 {
+		fmt.Printf("\nUpdated the following AWS CloudFormation resources:\n\n")
+		for _, updated := range rg.Results.UpdatedResources {
+			fmt.Printf(" - %s\n", updated.Name)
+		}
+		fmt.Printf("\n")
+	}
+
+	fmt.Printf("Processed %d resources\n", rg.Results.ProcessedCount)
+
+}
diff --git a/goformation/generate/naming.go b/goformation/generate/naming.go
new file mode 100644
index 0000000000..42ddd74ebe
--- /dev/null
+++ b/goformation/generate/naming.go
@@ -0,0 +1,70 @@
+package main
+
+import (
+	"errors"
+	"strings"
+)
+
+// filename takes a resource or property name (e.g. AWS::CloudFront::Distribution.Restrictions)
+// and returns an appropriate filename for the generated struct (e.g. aws-cloudfront-distribution_restrictions.go)
+func filename(input string) string {
+
+	// Convert to lowercase
+	output := strings.ToLower(input)
+
+	// Replace :: with -
+	output = strings.Replace(output, "::", "-", -1)
+
+	// Replace . with _
+	output = strings.Replace(output, ".", "_", -1)
+
+	// Suffix with .go
+	output += ".go"
+
+	return output
+
+}
+
+// structName takes a resource or property name (e.g. AWS::CloudFront::Distribution.Restrictions)
+// and returns an appropriate struct name for the generated struct (e.g. AWSCloudfrontDistributionRestrictions)
+func structName(input string) (string, error) {
+
+	// Remove ::
+	//output := strings.Replace(input, "::", "", -1)
+
+	if input == "Tag" {
+		return "Tag", nil
+	}
+
+	parts := strings.Split(input, "::")
+	if len(parts) < 2 {
+		return "", errors.New("invalid CloudFormation resource type: " + input)
+	}
+
+	// Remove .
+	output := strings.Replace(parts[2], ".", "_", -1)
+
+	return output, nil
+
+}
+
+// packageName generates a go package name based on the AWS CloudFormation resource type
+// For example, AWS::S3::Bucket would generate a package named 's3'
+func packageName(input string, lowercase bool) (string, error) {
+
+	if input == "Tag" {
+		return "cloudformation", nil
+	}
+
+	parts := strings.Split(input, "::")
+	if len(parts) < 2 {
+		return "", errors.New("invalid CloudFormation resource type: " + input)
+	}
+
+	if lowercase {
+		return strings.ToLower(parts[1]), nil
+	}
+
+	return parts[1], nil
+
+}
diff --git a/goformation/generate/property.go b/goformation/generate/property.go
new file mode 100644
index 0000000000..00b13877a1
--- /dev/null
+++ b/goformation/generate/property.go
@@ -0,0 +1,349 @@
+package main
+
+import (
+	"bytes"
+	"encoding/json"
+	"fmt"
+	"os"
+	"strings"
+	"text/template"
+)
+
+var typeToGo = map[string]string{
+	"String":    "*types.Value",
+	"Long":      "*types.Value",
+	"Integer":   "*types.Value",
+	"Double":    "*types.Value",
+	"Boolean":   "*types.Value",
+	"Timestamp": "string",
+	"Json":      "interface{}",
+	"Map":       "*types.Value",
+
+	// Overrides to fix CF errors
+	"ParameterValues": "interface{}", // fix for AWS::SSM::Association
+}
+
+var typeToPureGo = map[string]string{
+	"String":    "string",
+	"Long":      "int64",
+	"Integer":   "int",
+	"Double":    "float64",
+	"Boolean":   "bool",
+	"Timestamp": "string",
+	"Json":      "interface{}",
+	"Map":       "interface{}",
+
+	// Overrides to fix CF errors
+	"ParameterValues": "interface{}", // fix for AWS::SSM::Association
+}
+
+var typeToJSON = map[string]string{
+	"String":    "string",
+	"Long":      "number",
+	"Integer":   "number",
+	"Double":    "number",
+	"Boolean":   "boolean",
+	"Timestamp": "string",
+	"Json":      "object",
+	"Map":       "object",
+
+	// Overrides to fix CF errors
+	"ParameterValues": "object", // fix for AWS::SSM::Association
+}
+
+// Property represents an AWS CloudFormation resource property
+type Property struct {
+
+	// Documentation - A link to the AWS CloudFormation User Guide that provides information about the property.
+	Documentation string `json:"Documentation"`
+
+	// DuplicatesAllowed - If the value of the Type field is List, indicates whether AWS CloudFormation allows duplicate values.
+	// If the value is true, AWS CloudFormation ignores duplicate values. If the value is false,
+	// AWS CloudFormation returns an error if you submit duplicate values.
+	DuplicatesAllowed bool `json:"DuplicatesAllowed"`
+
+	// ItemType - If the value of the Type field is List or Map, indicates the type of list or map if they contain
+	// non-primitive types. Otherwise, this field is omitted. For lists or maps that contain primitive
+	// types, the PrimitiveItemType property indicates the valid value type.
+	//
+	// A subproperty name is a valid item type. For example, if the type value is List and the item type
+	//  value is PortMapping, you can specify a list of port mapping properties.
+	ItemType string `json:"ItemType"`
+
+	// PrimitiveItemType - If the value of the Type field is List or Map, indicates the type of list or map
+	// if they contain primitive types. Otherwise, this field is omitted. For lists or maps that contain
+	// non-primitive types, the ItemType property indicates the valid value type.
+	// The valid primitive types for lists and maps are String, Long, Integer, Double, Boolean, or Timestamp.
+	// For example, if the type value is List and the item type value is String, you can specify a list of strings
+	// for the property. If the type value is Map and the item type value is Boolean, you can specify a string
+	// to Boolean mapping for the property.
+	PrimitiveItemType string `json:"PrimitiveItemType"`
+
+	// PrimitiveType - For primitive values, the valid primitive type for the property. A primitive type is a
+	// basic data type for resource property values.
+	// The valid primitive types are String, Long, Integer, Double, Boolean, Timestamp or Json.
+	// If valid values are a non-primitive type, this field is omitted and the Type field indicates the valid value type.
+	PrimitiveType string `json:"PrimitiveType"`
+
+	// Required indicates whether the property is required.
+	Required bool `json:"Required"`
+
+	// Type - For non-primitive types, valid values for the property. The valid types are a subproperty name,
+	// List or Map. If valid values are a primitive type, this field is omitted and the PrimitiveType field
+	// indicates the valid value type. A list is a comma-separated list of values. A map is a set of key-value pairs,
+	// where the keys are always strings. The value type for lists and maps are indicated by the ItemType
+	// or PrimitiveItemType field.
+	Type string `json:"Type"`
+
+	// UpdateType - During a stack update, the update behavior when you add, remove, or modify the property.
+	// AWS CloudFormation replaces the resource when you change Immutable properties. AWS CloudFormation doesn't
+	// replace the resource when you change mutable properties. Conditional updates can be mutable or immutable,
+	// depending on, for example, which other properties you updated. For more information, see the relevant
+	// resource type documentation.
+	UpdateType string `json:"UpdateType"`
+
+	// Types - if a property can be different types, they will be listed here
+	PrimitiveTypes     []string `json:"PrimitiveTypes"`
+	PrimitiveItemTypes []string `json:"PrimitiveItemTypes"`
+	ItemTypes          []string `json:"ItemTypes"`
+	Types              []string `json:"Types"`
+}
+
+// Schema returns a JSON Schema for the resource (as a string)
+func (p Property) Schema(name, parent string) string {
+
+	// Open the schema template and setup a counter function that will
+	// available in the template to be used to detect when trailing commas
+	// are required in the JSON when looping through maps
+	tmpl, err := template.New("schema-property.template").Funcs(template.FuncMap{
+		"counter":           counter,
+		"convertToJSONType": convertTypeToJSON,
+	}).ParseFiles("generate/templates/schema-property.template")
+
+	var buf bytes.Buffer
+	parentpaths := strings.Split(parent, ".")
+
+	templateData := struct {
+		Name     string
+		Parent   string
+		Property Property
+	}{
+		Name:     name,
+		Parent:   parentpaths[0],
+		Property: p,
+	}
+
+	// Execute the template, writing it to the buffer
+	err = tmpl.Execute(&buf, templateData)
+	if err != nil {
+		fmt.Printf("Error: Failed to generate property %s\n%s\n", name, err)
+		os.Exit(1)
+	}
+
+	return buf.String()
+
+}
+
+// UnmarshalJSON is a custom unmarshaller for CloudFormation Properties.
+// It's only purpose, is to validate that every property has a valid type
+// set in the CloudFormation Resource Specification. This is required as
+// on occasions in the past, errors in the published spec have meant that some
+// properties are missing types. See github.com/awslabs/goformation/issues/300.
+// This method sets any properties that have missing types to 'Json' - which in
+// turn defines them as interface{} in the generated Go structs.
+func (p *Property) UnmarshalJSON(data []byte) error {
+
+	// see: https://stackoverflow.com/questions/52433467/how-to-call-json-unmarshal-inside-unmarshaljson-without-causing-stack-overflow
+	type TmpProperty Property
+
+	var unmarshalled TmpProperty
+	err := json.Unmarshal(data, &unmarshalled)
+	if err != nil {
+		return err
+	}
+
+	*p = Property(unmarshalled)
+
+	if !p.HasValidType() {
+		fmt.Printf("Warning: auto-fixing missing property type to 'Json' for %s\n", p.Documentation)
+		p.PrimitiveType = "Json"
+	}
+
+	return nil
+
+}
+
+// HasValidType checks whether a property has a valid type defined
+// It is possible that an invalid CloudFormation Resource Specification is published
+// that does not have any type information for a property. If this happens, then
+// generation should fail with an error message.
+func (p Property) HasValidType() bool {
+	invalid := p.ItemType == "" &&
+		p.PrimitiveType == "" &&
+		p.PrimitiveItemType == "" &&
+		p.Type == "" &&
+		len(p.ItemTypes) == 0 &&
+		len(p.PrimitiveTypes) == 0 &&
+		len(p.PrimitiveItemTypes) == 0 &&
+		len(p.Types) == 0
+	return !invalid
+}
+
+// IsPolymorphic checks whether a property can be multiple different types
+func (p Property) IsPolymorphic() bool {
+	return len(p.PrimitiveTypes) > 0 || len(p.PrimitiveItemTypes) > 0 || len(p.PrimitiveItemTypes) > 0 || len(p.ItemTypes) > 0 || len(p.Types) > 0
+}
+
+// IsPrimitive checks whether a property is a primitive type
+func (p Property) IsPrimitive() bool {
+	return p.PrimitiveType != ""
+}
+
+// IsNumeric checks whether a property is numeric
+func (p Property) IsNumeric() bool {
+	return p.IsPrimitive() &&
+		(p.PrimitiveType == "Long" ||
+			p.PrimitiveType == "Integer" ||
+			p.PrimitiveType == "Double" ||
+			p.PrimitiveType == "Boolean")
+}
+
+// IsMap checks whether a property should be a map (map[string]...)
+func (p Property) IsMap() bool {
+	return p.Type == "Map"
+}
+
+// IsList checks whether a property should be a list ([]...)
+func (p Property) IsList() bool {
+	return p.Type == "List"
+}
+
+// IsCustomType checks wither a property is a custom type
+func (p Property) IsCustomType() bool {
+	return p.PrimitiveType == "" && p.ItemType == "" && p.PrimitiveItemType == ""
+}
+
+// GoType returns the correct type for this property
+// within a Go struct. For example, []string or map[string]AWSLambdaFunction_VpcConfig
+func (p Property) GoType(typename, basename, name, packageName string) string {
+
+	if p.ItemType == "Tag" {
+		if packageName == "cloudformation" {
+			return "[]Tag"
+		}
+		return "[]cloudformation.Tag"
+	}
+
+	if p.IsPolymorphic() {
+
+		generatePolymorphicProperty(typename, basename+"_"+name, p)
+		return basename + "_" + name
+
+	}
+
+	if p.IsMap() {
+
+		if p.convertTypeToGo() != "" {
+			return "map[string]" + p.convertTypeToGo()
+		}
+
+		return "map[string]" + basename + "_" + p.ItemType
+
+	}
+
+	if p.IsList() {
+
+		if p.convertTypeToGo() != "" {
+			if p.GoTypeIsValue() {
+				return p.convertTypeToGo()
+			}
+			return "[]" + p.convertTypeToGo()
+		}
+
+		return "[]" + basename + "_" + p.ItemType
+
+	}
+
+	if p.IsCustomType() {
+		return basename + "_" + p.Type
+	}
+
+	// Must be a primitive value
+	return convertTypeToGo(p.PrimitiveType)
+
+}
+
+// GetJSONPrimitiveType returns the correct primitive property type for a JSON Schema.
+// If the property is a list/map, then it will return the type of the items.
+func (p Property) GetJSONPrimitiveType() string {
+	return p.convertTypeToJSON()
+}
+
+// HasJSONPrimitiveType if GetJSONPrimitiveType is not ""
+func (p Property) HasJSONPrimitiveType() bool {
+	return p.convertTypeToJSON() != ""
+}
+
+func (p Property) convertTypeToGo() string {
+	if p.PrimitiveType != "" {
+		return convertTypeToGo(p.PrimitiveType)
+	} else if p.PrimitiveItemType != "" {
+		return convertTypeToGo(p.PrimitiveItemType)
+	} else {
+		return convertTypeToGo(p.ItemType)
+	}
+}
+
+func (p Property) GoTypeIsValue() bool {
+	var goType string
+	if p.PrimitiveType != "" {
+		goType = convertTypeToGo(p.PrimitiveType)
+	} else if p.PrimitiveItemType != "" {
+		goType = convertTypeToGo(p.PrimitiveItemType)
+	} else {
+		goType = convertTypeToGo(p.ItemType)
+	}
+	if strings.Contains(goType, "Value") {
+		return true
+	}
+	for _, t := range append(append(p.PrimitiveTypes, p.PrimitiveItemTypes...), p.ItemTypes...) {
+		if strings.Contains(convertTypeToGo(t), "Value") {
+			return true
+		}
+	}
+	return false
+}
+
+func (p Property) convertTypeToJSON() string {
+	if p.PrimitiveType != "" {
+		return convertTypeToJSON(p.PrimitiveType)
+	} else if p.PrimitiveItemType != "" {
+		return convertTypeToJSON(p.PrimitiveItemType)
+	} else {
+		return convertTypeToJSON(p.ItemType)
+	}
+}
+
+func convertTypeToGo(name string) string {
+	t, ok := typeToGo[name]
+	if !ok {
+		return ""
+	}
+	return t
+}
+
+func convertTypeToPureGo(name string) string {
+	t, ok := typeToPureGo[name]
+	if !ok {
+		return ""
+	}
+	return t
+}
+
+func convertTypeToJSON(name string) string {
+	t, ok := typeToJSON[name]
+	if !ok {
+		return ""
+	}
+	return t
+}
diff --git a/goformation/generate/property_test.go b/goformation/generate/property_test.go
new file mode 100644
index 0000000000..b1173871fc
--- /dev/null
+++ b/goformation/generate/property_test.go
@@ -0,0 +1,192 @@
+package main_test
+
+import (
+	"encoding/json"
+
+	"goformation/v4/cloudformation/serverless"
+	"goformation/v4/cloudformation/types"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Goformation Code Generator", func() {
+
+	Context("with a single generated custom property", func() {
+
+		Context("specified as a Go struct", func() {
+
+			property := &serverless.Function_S3Location{
+				Bucket:  types.NewString("test-bucket"),
+				Key:     types.NewString("test-key"),
+				Version: types.NewInteger(123),
+			}
+			expected := []byte(`{"Bucket":"test-bucket","Key":"test-key","Version":123}`)
+
+			result, err := json.Marshal(property)
+			It("should marshal to JSON successfully", func() {
+				Expect(err).ToNot(HaveOccurred())
+				Expect(result).To(Equal(expected))
+			})
+
+		})
+		Context("specified as JSON", func() {
+
+			property := []byte(`{"Bucket":"test-bucket","Key":"test-key","Version":123}`)
+			expected := serverless.Function_S3Location{
+				Bucket:  types.NewString("test-bucket"),
+				Key:     types.NewString("test-key"),
+				Version: types.NewInteger(123),
+			}
+
+			result := serverless.Function_S3Location{}
+			err := json.Unmarshal(property, &result)
+			It("should unmarshal to a Go struct successfully", func() {
+				Expect(err).ToNot(HaveOccurred())
+				Expect(result).To(Equal(expected))
+			})
+
+		})
+
+	})
+
+	Context("with a polymorphic property", func() {
+
+		Context("with multiple types", func() {
+
+			Context("properly marshals and unmarshals values", func() {
+
+				property := []byte(`{"Properties":{"BatchSize":10,"StartingPosition":"LATEST","Stream":"arn"},"Type":"Kinesis"}`)
+
+				result := &serverless.Function_EventSource{}
+				err := json.Unmarshal(property, result)
+				output, err2 := json.Marshal(result)
+
+				It("should marshal and unmarhal to same value", func() {
+					Expect(err).To(BeNil())
+					Expect(err2).To(BeNil())
+					Expect(output).To(Equal(property))
+				})
+
+			})
+
+			Context("properly marshals and unmarshals polymorphic values", func() {
+
+				property := []byte(`{"Properties":{"Bucket":"asd","Events":"LATEST"},"Type":"S3"}`)
+
+				result := &serverless.Function_EventSource{}
+				err := json.Unmarshal(property, result)
+				output, err2 := json.Marshal(result)
+
+				It("should marshal and unmarhal to same value", func() {
+					Expect(err).To(BeNil())
+					Expect(err2).To(BeNil())
+					Expect(output).To(Equal(property))
+				})
+
+			})
+
+			Context("properly Marshals best value", func() {
+				expected := []byte(`{"BatchSize":10,"Stream":"arn"}`)
+
+				result := &serverless.Function_Properties{
+					SQSEvent:     &serverless.Function_SQSEvent{BatchSize: types.NewInteger(10)},
+					KinesisEvent: &serverless.Function_KinesisEvent{BatchSize: types.NewInteger(10), Stream: types.NewString("arn")},
+				}
+
+				output, err := result.MarshalJSON()
+
+				It("should marshal and unmarhal to same value", func() {
+					Expect(err).To(BeNil())
+					Expect(output).To(Equal(expected))
+				})
+
+			})
+
+		})
+
+		Context("with a primitive value", func() {
+
+			Context("specified as a Go struct", func() {
+
+				value := types.NewString("test-primitive-value")
+				property := &serverless.Function_CodeUri{
+					String: &value,
+				}
+
+				expected := []byte(`"test-primitive-value"`)
+				result, err := json.Marshal(property)
+				It("should marshal to JSON successfully", func() {
+					Expect(result).To(Equal(expected))
+					Expect(err).To(BeNil())
+				})
+
+			})
+
+			Context("specified as JSON", func() {
+
+				property := []byte(`"test-primitive-value"`)
+				value := types.NewString("test-primitive-value")
+				expected := &serverless.Function_CodeUri{
+					String: &value,
+				}
+
+				result := &serverless.Function_CodeUri{}
+				err := json.Unmarshal(property, result)
+				It("should unmarshal to a Go struct successfully", func() {
+					Expect(result).To(Equal(expected))
+					Expect(err).To(BeNil())
+				})
+
+			})
+
+		})
+
+		Context("with a custom type value", func() {
+
+			Context("specified as a Go struct", func() {
+
+				property := &serverless.Function_CodeUri{
+					S3Location: &serverless.Function_S3Location{
+						Bucket:  types.NewString("test-bucket"),
+						Key:     types.NewString("test-key"),
+						Version: types.NewInteger(123),
+					},
+				}
+
+				expected := []byte(`{"Bucket":"test-bucket","Key":"test-key","Version":123}`)
+
+				result, err := json.Marshal(property)
+				It("should marshal to JSON successfully", func() {
+					Expect(result).To(Equal(expected))
+					Expect(err).To(BeNil())
+				})
+
+			})
+
+			Context("specified as JSON", func() {
+
+				property := []byte(`{"Bucket":"test-bucket","Key":"test-key","Version":123}`)
+
+				expected := &serverless.Function_CodeUri{
+					S3Location: &serverless.Function_S3Location{
+						Bucket:  types.NewString("test-bucket"),
+						Key:     types.NewString("test-key"),
+						Version: types.NewInteger(123),
+					},
+				}
+
+				result := &serverless.Function_CodeUri{}
+				err := json.Unmarshal(property, result)
+				It("should unmarshal to a Go struct successfully", func() {
+					Expect(result).To(Equal(expected))
+					Expect(err).To(BeNil())
+				})
+
+			})
+
+		})
+
+	})
+
+})
diff --git a/goformation/generate/resource.go b/goformation/generate/resource.go
new file mode 100644
index 0000000000..089a40d3e0
--- /dev/null
+++ b/goformation/generate/resource.go
@@ -0,0 +1,81 @@
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+	"sort"
+	"strings"
+	"text/template"
+)
+
+// Resource represents an AWS CloudFormation resource such as AWS::EC2::Instance
+type Resource struct {
+
+	// Documentation is a link to the AWS CloudFormation User Guide for information about the resource.
+	Documentation string `json:"Documentation"`
+
+	// Properties are a list of property specifications for the resource. For details, see:
+	// http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-resource-specification-format.html#cfn-resource-specification-format-propertytypes
+	Properties map[string]Property
+}
+
+func (r Resource) HasValueProperty() bool {
+	for _, p := range r.Properties {
+		if p.GoTypeIsValue() {
+			return true
+		}
+	}
+	return false
+}
+
+// Schema returns a JSON Schema for the resource (as a string)
+func (r Resource) Schema(name string, isCustomProperty bool) string {
+
+	// Open the schema template and setup a counter function that will
+	// available in the template to be used to detect when trailing commas
+	// are required in the JSON when looping through maps
+	tmpl, err := template.New("schema-resource.template").Funcs(template.FuncMap{
+		"counter": counter,
+	}).ParseFiles("generate/templates/schema-resource.template")
+
+	var buf bytes.Buffer
+
+	templateData := struct {
+		Name             string
+		Resource         Resource
+		IsCustomProperty bool
+	}{
+		Name:             name,
+		Resource:         r,
+		IsCustomProperty: isCustomProperty,
+	}
+
+	// Execute the template, writing it to the buffer
+	err = tmpl.Execute(&buf, templateData)
+	if err != nil {
+		fmt.Printf("Error: Failed to generate resource %s\n%s\n", name, err)
+		os.Exit(1)
+	}
+
+	return buf.String()
+
+}
+
+// Required returns a comma separated list of the required properties for this resource
+func (r Resource) Required() string {
+	required := []string{}
+
+	for name, property := range r.Properties {
+		if property.Required {
+			required = append(required, `"`+name+`"`)
+		}
+	}
+
+	// As Go doesn't provide ordering guarentees for maps, we should
+	// sort the required property names by alphabetical order so that
+	// they don't shuffle on every generation, and cause annoying commit diffs
+	sort.Strings(required)
+
+	return strings.Join(required, ", ")
+}
diff --git a/goformation/generate/resource_test.go b/goformation/generate/resource_test.go
new file mode 100644
index 0000000000..a461a387df
--- /dev/null
+++ b/goformation/generate/resource_test.go
@@ -0,0 +1,229 @@
+package main_test
+
+import (
+	"encoding/json"
+
+	"goformation/v4/cloudformation/rds"
+	"goformation/v4/cloudformation/types"
+
+	"goformation/v4/cloudformation/ec2"
+	"goformation/v4/cloudformation/s3"
+	"goformation/v4/cloudformation/serverless"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+)
+
+var _ = Describe("Resource", func() {
+
+	Context("with a resource that contains a mix of primitive, custom and polymorphic properties", func() {
+
+		Context("described as Go structs", func() {
+
+			Context("with a simple primitive used for a polymorphic property", func() {
+
+				codeuri := types.NewString("s3://bucket/key")
+				resource := &serverless.Function{
+					Runtime: types.NewString("nodejs6.10"),
+					CodeUri: &serverless.Function_CodeUri{
+						String: &codeuri,
+					},
+				}
+
+				expected := []byte(`{"Type":"AWS::Serverless::Function","Properties":{"CodeUri":"s3://bucket/key","Runtime":"nodejs6.10"}}`)
+
+				result, err := json.Marshal(resource)
+				It("should marshal to JSON successfully", func() {
+					Expect(result).To(Equal(expected))
+					Expect(err).To(BeNil())
+				})
+
+			})
+
+			Context("with a custom type used for a polymorphic property", func() {
+
+				resource := &serverless.Function{
+					Runtime: types.NewString("nodejs6.10"),
+					CodeUri: &serverless.Function_CodeUri{
+						S3Location: &serverless.Function_S3Location{
+							Bucket:  types.NewString("test-bucket"),
+							Key:     types.NewString("test-key"),
+							Version: types.NewInteger(123),
+						},
+					},
+				}
+
+				expected := []byte(`{"Type":"AWS::Serverless::Function","Properties":{"CodeUri":{"Bucket":"test-bucket","Key":"test-key","Version":123},"Runtime":"nodejs6.10"}}`)
+
+				result, err := json.Marshal(resource)
+				It("should marshal to JSON successfully", func() {
+					Expect(result).To(Equal(expected))
+					Expect(err).To(BeNil())
+				})
+
+			})
+
+		})
+
+	})
+
+	Context("with a resource that has some resource attributes defined", func() {
+
+		Context("described as Go structs", func() {
+
+			Context("with a dependency on another resource", func() {
+
+				resource := &ec2.Instance{
+					ImageId: types.NewString("ami-0123456789"),
+				}
+				resource.AWSCloudFormationDependsOn = []string{"MyDependency"}
+
+				expected := []byte(`{"Type":"AWS::EC2::Instance","Properties":{"ImageId":"ami-0123456789"},"DependsOn":["MyDependency"]}`)
+
+				result, err := json.Marshal(resource)
+				It("should marshal to JSON successfully", func() {
+					Expect(result).To(Equal(expected))
+					Expect(err).To(BeNil())
+				})
+
+			})
+
+			Context("with a metadata attribute", func() {
+
+				resource := &s3.Bucket{
+					BucketName: types.NewString("MyBucket"),
+				}
+				resource.AWSCloudFormationMetadata = map[string]interface{}{"Object1": "Location1", "Object2": "Location2"}
+
+				expected := []byte(`{"Type":"AWS::S3::Bucket","Properties":{"BucketName":"MyBucket"},"Metadata":{"Object1":"Location1","Object2":"Location2"}}`)
+
+				result, err := json.Marshal(resource)
+				It("should marshal to JSON successfully", func() {
+					Expect(result).To(Equal(expected))
+					Expect(err).To(BeNil())
+				})
+
+			})
+
+			Context("with a condition attribute", func() {
+
+				resource := &rds.DBCluster{
+					DatabaseName: types.NewString("MyDatabase"),
+				}
+				resource.AWSCloudFormationCondition = "MyCondition"
+
+				expected := []byte(`{"Type":"AWS::RDS::DBCluster","Properties":{"DatabaseName":"MyDatabase"},"Condition":"MyCondition"}`)
+
+				result, err := json.Marshal(resource)
+				It("should marshal to JSON successfully", func() {
+					Expect(result).To(Equal(expected))
+					Expect(err).To(BeNil())
+				})
+
+			})
+
+		})
+
+		Context("specified as JSON", func() {
+
+			Context("with a dependency on another resource", func() {
+
+				property := []byte(`{"Type":"AWS::EC2::Instance","Properties":{"ImageId":"ami-0123456789"},"DependsOn":["MyDependency"]}`)
+				expected := &ec2.Instance{
+					ImageId: types.NewString("ami-0123456789"),
+				}
+				expected.AWSCloudFormationDependsOn = []string{"MyDependency"}
+
+				result := &ec2.Instance{}
+				err := json.Unmarshal(property, result)
+				It("should unmarshal to a Go struct successfully", func() {
+					Expect(result).To(Equal(expected))
+					Expect(err).To(BeNil())
+				})
+
+			})
+
+			Context("with a metadata attribute", func() {
+
+				property := []byte(`{"Type":"AWS::S3::Bucket","Properties":{"BucketName":"MyBucket"},"Metadata":{"Object1":"Location1","Object2":"Location2"}}`)
+				expected := &s3.Bucket{
+					BucketName: types.NewString("MyBucket"),
+				}
+				expected.AWSCloudFormationMetadata = map[string]interface{}{"Object1": "Location1", "Object2": "Location2"}
+
+				result := &s3.Bucket{}
+				err := json.Unmarshal(property, result)
+				It("should unmarshal to a Go struct successfully", func() {
+					Expect(result).To(Equal(expected))
+					Expect(err).To(BeNil())
+				})
+
+			})
+
+			Context("with a condition attribute", func() {
+
+				property := []byte(`{"Type":"AWS::RDS::DBCluster","Properties":{"DatabaseName":"MyDatabase"},"Condition":"MyCondition"}`)
+				expected := &rds.DBCluster{
+					DatabaseName: types.NewString("MyDatabase"),
+				}
+				expected.AWSCloudFormationCondition = "MyCondition"
+
+				result := &rds.DBCluster{}
+				err := json.Unmarshal(property, result)
+				It("should unmarshal to a Go struct successfully", func() {
+					Expect(result).To(Equal(expected))
+					Expect(err).To(BeNil())
+				})
+
+			})
+
+		})
+
+	})
+
+	Context("with a custom property type resource", func() {
+
+		Context("described as Go structs", func() {
+
+			Context("with a list type", func() {
+
+				subproperty := &serverless.Function_S3Event{
+					Bucket: types.NewString("my-bucket"),
+					Events: &serverless.Function_Events{
+						StringArray: &[]*types.Value{types.NewString("s3:ObjectCreated:*"), types.NewString("s3:ObjectRemoved:*")},
+					},
+				}
+
+				expected := []byte(`{"Bucket":"my-bucket","Events":["s3:ObjectCreated:*","s3:ObjectRemoved:*"]}`)
+
+				result, err := json.Marshal(subproperty)
+				It("should marshal to JSON successfully", func() {
+					Expect(result).To(Equal(expected))
+					Expect(err).To(BeNil())
+				})
+
+			})
+
+			Context("with a primitive type", func() {
+
+				event := types.NewString("s3:ObjectCreated:*")
+				subproperty := &serverless.Function_S3Event{
+					Bucket: types.NewString("my-bucket"),
+					Events: &serverless.Function_Events{
+						String: &event,
+					},
+				}
+
+				expected := []byte(`{"Bucket":"my-bucket","Events":"s3:ObjectCreated:*"}`)
+
+				result, err := json.Marshal(subproperty)
+				It("should marshal to JSON successfully", func() {
+					Expect(result).To(Equal(expected))
+					Expect(err).To(BeNil())
+				})
+
+			})
+
+		})
+	})
+})
diff --git a/goformation/generate/sam-2016-10-31.json b/goformation/generate/sam-2016-10-31.json
new file mode 100644
index 0000000000..1b0527d8c8
--- /dev/null
+++ b/goformation/generate/sam-2016-10-31.json
@@ -0,0 +1,1706 @@
+{
+    "ResourceSpecificationVersion": "2016-10-31",
+    "ResourceSpecificationTransform": "AWS::Serverless-2016-10-31",
+    "ResourceTypes": {
+        "AWS::Serverless::Function": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+            "Properties": {
+                "Handler": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Runtime": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "CodeUri": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": true,
+                    "PrimitiveTypes": [
+                        "String"
+                    ],
+                    "Types": [
+                        "S3Location"
+                    ],
+                    "UpdateType": "Immutable"
+                },
+                "FunctionName": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "FileSystemConfigs": {
+                    "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-function.html",
+                    "Required": false,
+                    "Type": "List",
+                    "ItemType": "FileSystemConfig",
+                    "UpdateType": "Immutable"
+                },
+                "Description": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "MemorySize": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "PrimitiveType": "Integer",
+                    "UpdateType": "Immutable"
+                },
+                "Timeout": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "PrimitiveType": "Integer",
+                    "UpdateType": "Immutable"
+                },
+                "Role": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Policies": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "PrimitiveTypes": [
+                        "String"
+                    ],
+                    "PrimitiveItemTypes": [
+                        "String"
+                    ],
+                    "Types": [
+                        "IAMPolicyDocument"
+                    ],
+                    "ItemTypes": [
+                        "IAMPolicyDocument",
+                        "SAMPolicyTemplate"
+                    ],
+                    "UpdateType": "Immutable"
+                },
+                "PermissionsBoundary": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Environment": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "Type": "FunctionEnvironment",
+                    "UpdateType": "Immutable"
+                },
+                "VpcConfig": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "Type": "VpcConfig",
+                    "UpdateType": "Immutable"
+                },
+                "Events": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "Type": "Map",
+                    "ItemType": "EventSource",
+                    "UpdateType": "Immutable"
+                },
+                "Tags": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "Type": "Map",
+                    "PrimitiveItemType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Tracing": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "KmsKeyArn": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "DeadLetterQueue": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "Type": "DeadLetterQueue",
+                    "UpdateType": "Immutable"
+                },
+                "DeploymentPreference": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "Type": "DeploymentPreference",
+                    "UpdateType": "Immutable"
+                },
+                "Layers": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "Type": "List",
+                    "PrimitiveItemType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "AutoPublishAlias": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "ReservedConcurrentExecutions": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "PrimitiveType": "Integer",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Api": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi",
+            "Properties": {
+                "Name": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "StageName": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "DefinitionUri": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi",
+                    "Required": false,
+                    "PrimitiveTypes": [
+                        "String"
+                    ],
+                    "Types": [
+                        "S3Location"
+                    ],
+                    "UpdateType": "Immutable"
+                },
+                "DefinitionBody": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi",
+                    "Required": false,
+                    "PrimitiveType": "Json",
+                    "UpdateType": "Immutable"
+                },
+                "CacheClusterEnabled": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi",
+                    "Required": false,
+                    "PrimitiveType": "Boolean",
+                    "UpdateType": "Immutable"
+                },
+                "CacheClusterSize": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Variables": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi",
+                    "Required": false,
+                    "Type": "Map",
+                    "PrimitiveItemType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "MethodSettings": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi",
+                    "Required": false,
+                    "PrimitiveItemType": "Json",
+                    "Type": "List",
+                    "UpdateType": "Immutable"
+                },
+                "EndpointConfiguration": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "BinaryMediaTypes": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi",
+                    "Required": false,
+                    "Type": "List",
+                    "PrimitiveItemType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Cors": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi",
+                    "Required": false,
+                    "PrimitiveTypes": [
+                        "String"
+                    ],
+                    "Types": [
+                        "CorsConfiguration"
+                    ],
+                    "UpdateType": "Immutable"
+                },
+                "Auth": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi",
+                    "Required": false,
+                    "Type": "Auth",
+                    "UpdateType": "Immutable"
+                },
+                "TracingEnabled": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi",
+                    "Required": false,
+                    "PrimitiveType": "Boolean",
+                    "UpdateType": "Immutable"
+                },
+                "AccessLogSetting": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi",
+                    "Required": false,
+                    "Type": "AccessLogSetting",
+                    "UpdateType": "Immutable"
+                },
+                "OpenApiVersion": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapi",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Application": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication",
+            "Properties": {
+                "Location": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication",
+                    "Required": true,
+                    "PrimitiveTypes": [
+                        "String"
+                    ],
+                    "Types": [
+                        "ApplicationLocation"
+                    ],
+                    "UpdateType": "Immutable"
+                },
+                "Parameters": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication",
+                    "Required": false,
+                    "Type": "Map",
+                    "PrimitiveItemType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "NotificationArns": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication",
+                    "Required": false,
+                    "Type": "List",
+                    "PrimitiveItemType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Tags": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication",
+                    "Required": false,
+                    "Type": "Map",
+                    "PrimitiveItemType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "TimeoutInMinutes": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication",
+                    "Required": false,
+                    "PrimitiveType": "Integer",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::SimpleTable": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesssimpletable",
+            "Properties": {
+                "PrimaryKey": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#primary-key-object",
+                    "Required": false,
+                    "Type": "PrimaryKey",
+                    "UpdateType": "Immutable"
+                },
+                "ProvisionedThroughput": {
+                    "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-provisionedthroughput.html",
+                    "Required": false,
+                    "Type": "ProvisionedThroughput",
+                    "UpdateType": "Immutable"
+                },
+                "Tags": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesssimpletable",
+                    "Required": false,
+                    "Type": "Map",
+                    "PrimitiveItemType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "TableName": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesssimpletable",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "SSESpecification": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesssimpletable",
+                    "Required": false,
+                    "Type": "SSESpecification",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::LayerVersion": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesslayerversion",
+            "Properties": {
+                "LayerName": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesslayerversion",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Description": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesslayerversion",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "ContentUri": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesslayerversion",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "CompatibleRuntimes": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesslayerversion",
+                    "Required": false,
+                    "Type": "List",
+                    "PrimitiveItemType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "LicenseInfo": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesslayerversion",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "RetentionPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlesslayerversion",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::StateMachine": {
+            "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html",
+            "Properties": {
+                "Definition": {
+                    "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html",
+                    "Required": false,
+                    "PrimitiveType": "Json",
+                    "UpdateType": "Immutable"
+                },
+                "DefinitionSubstitutions": {
+                    "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html",
+                    "Required": false,
+                    "Type": "Map",
+                    "PrimitiveItemType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "DefinitionUri": {
+                    "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html",
+                    "Required": false,
+                    "PrimitiveTypes": [
+                        "String"
+                    ],
+                    "Types": [
+                        "S3Location"
+                    ],
+                    "UpdateType": "Immutable"
+                },
+                "Events": {
+                    "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html",
+                    "Required": false,
+                    "Type": "Map",
+                    "ItemType": "EventSource",
+                    "UpdateType": "Immutable"
+                },
+                "Logging": {
+                    "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html",
+                    "Required": false,
+                    "Type": "LoggingConfiguration",
+                    "UpdateType": "Immutable"
+                },
+                "Name": {
+                    "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Policies": {
+                    "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html",
+                    "Required": false,
+                    "PrimitiveTypes": [
+                        "String"
+                    ],
+                    "PrimitiveItemTypes": [
+                        "String"
+                    ],
+                    "Types": [
+                        "IAMPolicyDocument"
+                    ],
+                    "ItemTypes": [
+                        "IAMPolicyDocument",
+                        "SAMPolicyTemplate"
+                    ],
+                    "UpdateType": "Immutable"
+                },
+                "Role": {
+                    "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Tags": {
+                    "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html",
+                    "Required": false,
+                    "Type": "Map",
+                    "PrimitiveItemType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Type": {
+                    "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-resource-statemachine.html",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        }
+    },
+    "PropertyTypes": {
+        "AWS::Serverless::Application.ApplicationLocation": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication",
+            "Properties": {
+                "ApplicationId": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication",
+                    "PrimitiveType": "String",
+                    "Required": true,
+                    "UpdateType": "Immutable"
+                },
+                "SemanticVersion": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessapplication",
+                    "PrimitiveType": "String",
+                    "Required": true,
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.S3Location": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object",
+            "Properties": {
+                "Bucket": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Key": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Version": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "PrimitiveType": "Integer",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.FileSystemConfig": {
+            "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-filesystemconfig.html#cfn-lambda-function-filesystemconfig-localmountpath",
+            "Properties": {
+                "Arn": {
+                    "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-filesystemconfig.html#cfn-lambda-function-filesystemconfig-localmountpath",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "LocalMountPath": {
+                    "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-filesystemconfig.html#cfn-lambda-function-filesystemconfig-localmountpath",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.EventSource": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#event-source-object",
+            "Properties": {
+                "Type": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#event-source-object",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Properties": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#event-source-types",
+                    "Required": true,
+                    "Types": [
+                        "S3Event",
+                        "SNSEvent",
+                        "SQSEvent",
+                        "KinesisEvent",
+                        "DynamoDBEvent",
+                        "ApiEvent",
+                        "ScheduleEvent",
+                        "CloudWatchEventEvent",
+                        "CloudWatchLogsEvent",
+                        "IoTRuleEvent",
+                        "AlexaSkillEvent",
+                        "EventBridgeRuleEvent"
+                    ],
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.S3Event": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3",
+            "Properties": {
+                "Bucket": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Events": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3",
+                    "Required": true,
+                    "PrimitiveTypes": [
+                        "String"
+                    ],
+                    "PrimitiveItemTypes": [
+                        "String"
+                    ]
+                },
+                "Filter": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3",
+                    "Required": false,
+                    "Type": "S3NotificationFilter",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.S3NotificationFilter": {
+            "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter.html",
+            "Properties": {
+                "S3Key": {
+                    "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter.html",
+                    "Required": true,
+                    "Type": "S3KeyFilter",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.SNSEvent": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#sns",
+            "Properties": {
+                "Topic": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#sns",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.KinesisEvent": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#kinesis",
+            "Properties": {
+                "Stream": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#kinesis",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "StartingPosition": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#kinesis",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "BatchSize": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#kinesis",
+                    "Required": false,
+                    "PrimitiveType": "Integer",
+                    "UpdateType": "Immutable"
+                },
+                "Enabled": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#kinesis",
+                    "Required": false,
+                    "PrimitiveType": "Boolean",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.DynamoDBEvent": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb",
+            "Properties": {
+                "Stream": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "StartingPosition": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "BatchSize": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb",
+                    "Required": false,
+                    "PrimitiveType": "Integer",
+                    "UpdateType": "Immutable"
+                },
+                "Enabled": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb",
+                    "Required": false,
+                    "PrimitiveType": "Boolean",
+                    "UpdateType": "Immutable"
+                },
+		"MaximumBatchingWindowInSeconds": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb",
+                    "Required": false,
+                    "PrimitiveType": "Integer",
+                    "UpdateType": "Immutable"
+		},
+		"MaximumRetryAttempts": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb",
+                    "Required": false,
+                    "PrimitiveType": "Integer",
+                    "UpdateType": "Immutable"
+		},
+		"BisectBatchOnFunctionError": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb",
+                    "Required": false,
+                    "PrimitiveType": "Boolean",
+                    "UpdateType": "Immutable"
+		},
+		"MaximumRecordAgeInSeconds": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb",
+                    "Required": false,
+                    "PrimitiveType": "Integer",
+                    "UpdateType": "Immutable"
+		},
+		"DestinationConfig": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb",
+                    "Required": false,
+                    "Type": "DestinationConfig",
+                    "UpdateType": "Immutable"
+		},
+		"ParallelizationFactor": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#dynamodb",
+                    "Required": false,
+                    "PrimitiveType": "Integer",
+                    "UpdateType": "Immutable"
+		}
+            }
+        },
+        "AWS::Serverless::Function.SQSEvent": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#sqs",
+            "Properties": {
+                "Queue": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#sqs",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "BatchSize": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#sqs",
+                    "Required": false,
+                    "PrimitiveType": "Integer",
+                    "UpdateType": "Immutable"
+                },
+                "Enabled": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#sqs",
+                    "Required": false,
+                    "PrimitiveType": "Boolean",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.ApiEvent": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api",
+            "Properties": {
+                "Path": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Method": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "RestApiId": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.ScheduleEvent": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#schedule",
+            "Properties": {
+                "Schedule": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#schedule",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Input": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#schedule",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.CloudWatchEventEvent": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cloudwatchevent",
+            "Properties": {
+                "Pattern": {
+                    "Documentation": "http://docs.aws.amazon.com/AmazonCloudWatch/latest/events/CloudWatchEventsandEventPatterns.html",
+                    "Required": true,
+                    "PrimitiveType": "Json",
+                    "UpdateType": "Immutable"
+                },
+                "Input": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cloudwatchevent",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "InputPath": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cloudwatchevent",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.CloudWatchLogsEvent": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cloudwatchevent",
+            "Properties": {
+                "LogGroupName": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cloudwatchlogs",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+               "FilterPattern": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cloudwatchlogs",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.IoTRuleEvent": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#iotrule",
+            "Properties": {
+                "Sql": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#iotrule",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "AwsIotSqlVersion": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#iotrule",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.AlexaSkillEvent": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#alexaskill",
+            "Properties": {
+                "Variables": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#alexaskill",
+                    "Required": false,
+                    "Type": "Map",
+                    "PrimitiveItemType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+	"AWS::Serverless::Function.DestinationConfig": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#destination-config-object",
+            "Properties": {
+                "OnFailure": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#destination-config-object",
+                    "Required": true,
+                    "Type": "OnFailure",
+                    "UpdateType": "Immutable"
+                }
+            }
+	},
+	"AWS::Serverless::Function.OnFailure": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#destination-config-object",
+            "Properties": {
+                "Type": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#destination-config-object",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Destination": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#destination-config-object",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+	},
+        "AWS::Serverless::Function.EventBridgeRuleEvent": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#eventbridgerule",
+            "Properties": {
+                "Pattern": {
+                    "Documentation": "https://docs.aws.amazon.com/eventbridge/latest/userguide/filtering-examples-structure.html",
+                    "Required": true,
+                    "PrimitiveType": "Json",
+                    "UpdateType": "Immutable"
+                },
+                "EventBusName": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#eventbridgerule",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Input": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#eventbridgerule",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "InputPath": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#eventbridgerule",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.VpcConfig": {
+            "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-vpcconfig.html",
+            "Properties": {
+                "SecurityGroupIds": {
+                    "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-vpcconfig.html",
+                    "Required": true,
+                    "Type": "List",
+                    "PrimitiveItemType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "SubnetIds": {
+                    "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-lambda-function-vpcconfig.html",
+                    "Required": true,
+                    "Type": "List",
+                    "PrimitiveItemType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.IAMPolicyDocument": {
+            "Documentation": "http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies.html",
+            "Properties": {
+                "Statement": {
+                    "Documentation": "http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies.html",
+                    "PrimitiveType": "Json",
+                    "Required": true,
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.SAMPolicyTemplate": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+            "Properties": {
+                "CloudWatchPutMetricPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "EmptySAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "EC2DescribePolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "EmptySAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "AMIDescribePolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "EmptySAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "CloudFormationDescribeStacksPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "EmptySAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "RekognitionDetectOnlyPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "EmptySAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "RekognitionLabelsPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "EmptySAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "VPCAccessPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "EmptySAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "SESEmailTemplateCrudPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "EmptySAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "SQSPollerPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "QueueSAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "SQSSendMessagePolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "QueueSAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "LambdaInvokePolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "FunctionSAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "DynamoDBCrudPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "TableSAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "DynamoDBReadPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "TableSAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "DynamoDBStreamReadPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "TableStreamSAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "SESSendBouncePolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "IdentitySAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "SESCrudPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "IdentitySAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "SESBulkTemplatedCrudPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "IdentitySAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "ElasticsearchHttpPostPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "DomainSAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "S3ReadPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "BucketSAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "S3CrudPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "BucketSAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "RekognitionNoDataAccessPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "CollectionSAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "RekognitionReadPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "CollectionSAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "RekognitionWriteOnlyAccessPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "CollectionSAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "SNSCrudPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "TopicSAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "SNSPublishMessagePolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "TopicSAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "KinesisStreamReadPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "StreamSAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "KinesisCrudPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "StreamSAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "KMSDecryptPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "KeySAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "FilterLogEventsPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "LogGroupSAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "StepFunctionsExecutionPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "StateMachineSAMPT",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.EmptySAMPT": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+            "Properties": {}
+        },
+        "AWS::Serverless::Function.QueueSAMPT": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+            "Properties": {
+                "QueueName": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.FunctionSAMPT": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+            "Properties": {
+                "FunctionName": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.TableStreamSAMPT": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+            "Properties": {
+                "TableName": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "StreamName": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.TableSAMPT": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+            "Properties": {
+                "TableName": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.IdentitySAMPT": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+            "Properties": {
+                "IdentityName": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.DomainSAMPT": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+            "Properties": {
+                "DomainName": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.BucketSAMPT": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+            "Properties": {
+                "BucketName": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.CollectionSAMPT": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+            "Properties": {
+                "CollectionId": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.TopicSAMPT": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+            "Properties": {
+                "TopicName": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.StreamSAMPT": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+            "Properties": {
+                "StreamName": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.KeySAMPT": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+            "Properties": {
+                "KeyId": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.LogGroupSAMPT": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+            "Properties": {
+                "LogGroupName": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.StateMachineSAMPT": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+            "Properties": {
+                "StateMachineName": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.FunctionEnvironment": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object",
+            "Properties": {
+                "Variables": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#environment-object",
+                    "Required": true,
+                    "Type": "Map",
+                    "PrimitiveItemType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.DeadLetterQueue": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#deadletterqueue-object",
+            "Properties": {
+                "Type": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "TargetArn": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.DeploymentPreference": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#deploymentpreference-object",
+            "Properties": {
+                "Type": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#deploymentpreference-object",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Alarms": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#deploymentpreference-object",
+                    "Required": false,
+                    "Type": "List",
+                    "PrimitiveItemType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Hooks": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#deploymentpreference-object",
+                    "Required": false,
+                    "Type": "Map",
+                    "PrimitiveItemType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Role": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#deploymentpreference-object",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Enabled": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#deploymentpreference-object",
+                    "Required": false,
+                    "PrimitiveType": "Boolean",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.S3KeyFilter": {
+            "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter.html",
+            "Properties": {
+                "Rules": {
+                    "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter.html",
+                    "Required": true,
+                    "Type": "List",
+                    "ItemType": "S3KeyFilterRule",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Function.S3KeyFilterRule": {
+            "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter-s3key-rules.html",
+            "Properties": {
+                "Name": {
+                    "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter-s3key-rules.html",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Value": {
+                    "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-s3-bucket-notificationconfiguration-config-filter-s3key-rules.html",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::StateMachine.LoggingConfiguration": {
+            "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-loggingconfiguration.html",
+            "Properties": {
+                "Destinations": {
+                    "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-loggingconfiguration.html",
+                    "Required": true,
+                    "Type": "List",
+                    "ItemType": "LogDestination",
+                    "UpdateType": "Immutable"
+                },
+                "IncludeExecutionData": {
+                    "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-loggingconfiguration.html",
+                    "Required": true,
+                    "PrimitiveType": "Boolean",
+                    "UpdateType": "Immutable"
+                },
+                "Level": {
+                    "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-loggingconfiguration.html",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::StateMachine.LogDestination": {
+            "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-logdestination.html#cfn-stepfunctions-statemachine-logdestination-cloudwatchlogsloggroup",
+            "Properties": {
+                "CloudWatchLogsLogGroup": {
+                    "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-logdestination.html#cfn-stepfunctions-statemachine-logdestination-cloudwatchlogsloggroup",
+                    "Required": true,
+                    "Type": "CloudWatchLogsLogGroup",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::StateMachine.CloudWatchLogsLogGroup": {
+            "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-logdestination-cloudwatchlogsloggroup.html",
+            "Properties": {
+                "LogGroupArn": {
+                    "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-stepfunctions-statemachine-logdestination-cloudwatchlogsloggroup.html",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Api.S3Location": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object",
+            "Properties": {
+                "Bucket": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Key": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Version": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": true,
+                    "PrimitiveType": "Integer",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Api.Auth": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api-auth-object",
+            "Properties": {
+                "DefaultAuthorizer": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api-auth-object",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Authorizers": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api-auth-object",
+                    "Required": false,
+                    "PrimitiveType": "Json",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Api.AccessLogSetting": {
+            "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-accesslogsetting.html",
+            "Properties": {
+                "DestinationArn": {
+                    "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-accesslogsetting.html#cfn-apigateway-stage-accesslogsetting-destinationarn",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Format": {
+                    "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-apigateway-stage-accesslogsetting.html#cfn-apigateway-stage-accesslogsetting-format",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::Api.CorsConfiguration": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cors-configuration",
+            "Properties": {
+                "AllowMethods": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cors-configuration",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "AllowHeaders": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cors-configuration",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "AllowOrigin": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cors-configuration",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "MaxAge": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cors-configuration",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "AllowCredentials": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#cors-configuration",
+                    "Required": false,
+                    "PrimitiveType": "Boolean",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::SimpleTable.PrimaryKey": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#primary-key-object",
+            "Properties": {
+                "Name": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#primary-key-object",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Type": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#primary-key-object",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::SimpleTable.ProvisionedThroughput": {
+            "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-provisionedthroughput.html",
+            "Properties": {
+                "ReadCapacityUnits": {
+                    "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-provisionedthroughput.html",
+                    "Required": false,
+                    "PrimitiveType": "Integer",
+                    "UpdateType": "Immutable"
+                },
+                "WriteCapacityUnits": {
+                    "Documentation": "http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-provisionedthroughput.html",
+                    "Required": true,
+                    "PrimitiveType": "Integer",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::SimpleTable.SSESpecification": {
+            "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-ssespecification.html",
+            "Properties": {
+                "SSEEnabled": {
+                    "Documentation": "https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-dynamodb-table-ssespecification.html",
+                    "Required": false,
+                    "PrimitiveType": "Boolean",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::StateMachine.IAMPolicyDocument": {
+            "Documentation": "http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies.html",
+            "Properties": {
+                "Statement": {
+                    "Documentation": "http://docs.aws.amazon.com/IAM/latest/UserGuide/reference_policies.html",
+                    "PrimitiveType": "Json",
+                    "Required": true,
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::StateMachine.SAMPolicyTemplate": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+            "Properties": {
+                "LambdaInvokePolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "FunctionSAMPT",
+                    "UpdateType": "Immutable"
+                },
+                "StepFunctionsExecutionPolicy": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Type": "StateMachineSAMPT",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::StateMachine.StateMachineSAMPT": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+            "Properties": {
+                "StateMachineName": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::StateMachine.FunctionSAMPT": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+            "Properties": {
+                "FunctionName": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/docs/policy_templates.rst",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::StateMachine.S3Location": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#s3-location-object",
+            "Properties": {
+                "Bucket": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Key": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Version": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#awsserverlessfunction",
+                    "Required": false,
+                    "PrimitiveType": "Integer",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::StateMachine.EventSource": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#event-source-object",
+            "Properties": {
+                "Type": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#event-source-object",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Properties": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#event-source-types",
+                    "Required": true,
+                    "Types": [
+                        "CloudWatchEventEvent",
+                        "EventBridgeRuleEvent",
+                        "ScheduleEvent",
+                        "ApiEvent"
+                    ],
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::StateMachine.CloudWatchEventEvent": {
+            "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-statemachine-cloudwatchevent.html",
+            "Properties": {
+                "Pattern": {
+                    "Documentation": "http://docs.aws.amazon.com/AmazonCloudWatch/latest/events/CloudWatchEventsandEventPatterns.html",
+                    "Required": true,
+                    "PrimitiveType": "Json",
+                    "UpdateType": "Immutable"
+                },
+                "EventBusName": {
+                    "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-statemachine-cloudwatchevent.html",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Input": {
+                    "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-statemachine-cloudwatchevent.html",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "InputPath": {
+                    "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-statemachine-cloudwatchevent.html",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::StateMachine.EventBridgeRuleEvent": {
+            "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-statemachine-cloudwatchevent.html",
+            "Properties": {
+                "Pattern": {
+                    "Documentation": "http://docs.aws.amazon.com/AmazonCloudWatch/latest/events/CloudWatchEventsandEventPatterns.html",
+                    "Required": true,
+                    "PrimitiveType": "Json",
+                    "UpdateType": "Immutable"
+                },
+                "EventBusName": {
+                    "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-statemachine-cloudwatchevent.html",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Input": {
+                    "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-statemachine-cloudwatchevent.html",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "InputPath": {
+                    "Documentation": "https://docs.aws.amazon.com/serverless-application-model/latest/developerguide/sam-property-statemachine-cloudwatchevent.html",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::StateMachine.ScheduleEvent": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#schedule",
+            "Properties": {
+                "Schedule": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#schedule",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Input": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#schedule",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        },
+        "AWS::Serverless::StateMachine.ApiEvent": {
+            "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api",
+            "Properties": {
+                "Path": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "Method": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api",
+                    "Required": true,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                },
+                "RestApiId": {
+                    "Documentation": "https://github.com/awslabs/serverless-application-model/blob/master/versions/2016-10-31.md#api",
+                    "Required": false,
+                    "PrimitiveType": "String",
+                    "UpdateType": "Immutable"
+                }
+            }
+        }
+    }
+}
diff --git a/goformation/generate/spec.go b/goformation/generate/spec.go
new file mode 100644
index 0000000000..f28e038209
--- /dev/null
+++ b/goformation/generate/spec.go
@@ -0,0 +1,37 @@
+package main
+
+// CloudFormationResourceSpecification represents a resource specification document as
+// published by the AWS CloudFormation team
+type CloudFormationResourceSpecification struct {
+
+	// ResourceSpecificationVersion is the AWS CloudFormation Specification Version
+	// The version format is majorVersion.minorVersion.patch, where each release increments
+	// the version number. All resources have the same version number regardless of whether
+	// the resource was updated.
+	//
+	// AWS CloudFormation increments the patch number when the service makes a backwards-compatible
+	// bug fix, such as fixing a broken documentation link. When AWS CloudFormation adds resources
+	// or properties that are backwards compatible, it increments the minor version number.
+	// For example, later versions of a specification might add additional resource properties to
+	// support new features of an AWS service.
+	//
+	// Backwards incompatible changes increment the major version number. A backwards incompatible
+	//  change can result from a change in the resource specification, such as a name change to a
+	// field, or a change to a resource, such as the making an optional resource property required.
+	ResourceSpecificationVersion string
+
+	// ResourceSpecificationTransform is not a valid key in the official AWS CloudFormation
+	// Specification.  It is used in this package to indicate the relevant Transform value to use
+	// for the resources in this spec.
+	ResourceSpecificationTransform string
+
+	// The list of resources and information about each resource's properties, such as its property names,
+	//  which properties are requires, and their update behavior. For more information, see
+	// http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/cfn-resource-specification-format.html#cfn-resource-specification-format-resourcetype
+	Resources map[string]Resource `json:"ResourceTypes"`
+
+	// For resources that have properties within a property (also known as subproperties), a list of
+	// subproperty specifications, such as which properties are required, the type of allowed value
+	// for each property, and their update behavior. For more information, see Property Specification.
+	Properties map[string]Resource `json:"PropertyTypes"`
+}
diff --git a/goformation/generate/templates/all.template b/goformation/generate/templates/all.template
new file mode 100644
index 0000000000..4294a0bd1e
--- /dev/null
+++ b/goformation/generate/templates/all.template
@@ -0,0 +1,40 @@
+package cloudformation
+
+import (
+	"fmt"{{range $resource := .Resources}}
+	"goformation/v4/cloudformation/{{$resource.PackageName}}"{{end}}
+)
+
+// AllResources fetches an iterable map all CloudFormation and SAM resources
+func AllResources() map[string]Resource {
+    return map[string]Resource{ {{range $resource := .Resources}}
+        "{{$resource.Name}}": &{{$resource.PackageName}}.{{$resource.StructName}}{},{{end}}
+    }
+}
+
+{{range $resource := .Resources}}
+// GetAll{{$resource.BaseName}}{{$resource.StructName}}Resources retrieves all {{$resource.PackageName}}.{{$resource.StructName}} items from an AWS CloudFormation template
+func (t *Template) GetAll{{$resource.BaseName}}{{$resource.StructName}}Resources () map[string]*{{$resource.PackageName}}.{{$resource.StructName}} {
+    results := map[string]*{{$resource.PackageName}}.{{$resource.StructName}}{}
+	for name, untyped := range t.Resources {
+		switch resource := untyped.(type) {
+		case *{{$resource.PackageName}}.{{$resource.StructName}}:
+			results[name] = resource
+		}
+	}
+	return results
+}
+
+// Get{{$resource.BaseName}}{{$resource.StructName}}WithName retrieves all {{$resource.PackageName}}.{{$resource.StructName}} items from an AWS CloudFormation template
+// whose logical ID matches the provided name. Returns an error if not found.
+func (t *Template) Get{{$resource.BaseName}}{{$resource.StructName}}WithName (name string) (*{{$resource.PackageName}}.{{$resource.StructName}}, error) {
+	if untyped, ok := t.Resources[name]; ok {
+		switch resource := untyped.(type) {
+		case *{{$resource.PackageName}}.{{$resource.StructName}}:
+			return resource, nil
+		}
+	}
+    return nil, fmt.Errorf("resource %q of type {{$resource.PackageName}}.{{$resource.StructName}} not found", name)
+}
+
+{{end}}
diff --git a/goformation/generate/templates/polymorphic-property.template b/goformation/generate/templates/polymorphic-property.template
new file mode 100644
index 0000000000..7e646a2359
--- /dev/null
+++ b/goformation/generate/templates/polymorphic-property.template
@@ -0,0 +1,118 @@
+package {{.PackageName}}
+
+import (
+	"sort"
+	"encoding/json"
+
+	{{if .Property.GoTypeIsValue}}
+	"goformation/v4/cloudformation/types"{{end}}
+	"goformation/v4/cloudformation/utils"
+)
+
+// {{.Name}} is a helper struct that can hold either a {{.TypesJoined}} value
+type {{.Name}} struct {
+	{{range $type := $.Property.PrimitiveTypes}}
+	{{$type}} *{{convertToGoType $type}}{{end}}
+
+	{{range $type := $.Property.PrimitiveItemTypes}}
+	{{$type}}Array *[]{{convertToGoType $type}}{{end}}
+
+	{{range $type := $.Property.Types}}
+	{{$type}} *{{$.Basename}}_{{$type}}{{end}}
+
+	{{range $type := $.Property.ItemTypes}}
+	{{$type}}Array *[]{{$.Basename}}_{{$type}}{{end}}
+}
+
+func (r {{.Name}}) value() interface{} {
+	ret := []interface{}{}
+
+	{{range $type := $.Property.PrimitiveTypes}}
+		if r.{{$type}} != nil {
+			ret = append(ret, r.{{$type}})
+		}
+	{{end}}
+
+	{{range $type := $.Property.PrimitiveItemTypes}}
+		if r.{{$type}}Array != nil {
+			ret = append(ret, r.{{$type}}Array)
+		}
+	{{end}}
+
+	{{ if (.Property.Types) }}
+		{{range $type := $.Property.Types}}
+			if r.{{$type}} != nil {
+				ret = append(ret, *r.{{$type}})
+			}
+		{{end}}
+	{{end}}
+
+	{{range $type := $.Property.ItemTypes}}
+		if r.{{$type}}Array != nil {
+			ret = append(ret, r.{{$type}}Array)
+		}
+	{{end}}
+
+	sort.Sort(utils.ByJSONLength(ret)) // Heuristic to select best attribute
+	if len(ret) > 0 {
+		return ret[0]
+	}
+
+	return nil
+}
+
+func (r {{.Name}}) MarshalJSON() ([]byte, error) {
+	return json.Marshal(r.value())
+}
+
+// Hook into the marshaller
+func (r *{{.Name}}) UnmarshalJSON(b []byte) error {
+
+	// Unmarshal into interface{} to check it's type
+	var typecheck interface{}
+	if err := json.Unmarshal(b, &typecheck); err != nil {
+		return err
+	}
+
+	switch val := typecheck.(type) {
+
+		{{range $type := $.Property.PrimitiveTypes}}
+			case {{convertToPureGoType $type}}:
+			v, err := types.NewValueFromPrimitive(val)
+			if err != nil {
+				return err
+			}
+			r.{{$type}} = &v
+		{{end}}
+
+		{{range $type := $.Property.PrimitiveItemTypes}}
+			case []{{convertToPureGoType $type}}:
+			var values []*types.Value
+			for _, vv := range val {
+			    vvv, err := types.NewValueFromPrimitive(vv)
+			    if err != nil {
+			        return err
+			    }
+			    values = append(values, vvv)
+			}
+			r.{{$type}}Array = &values
+		{{end}}
+
+		case map[string]interface{}:
+			val = val // This ensures val is used to stop an error
+		{{range $type := $.Property.Types}}
+			json.Unmarshal(b, &r.{{$type}})
+		{{end}}
+
+		case []interface{}:
+		{{range $type := $.Property.PrimitiveItemTypes}}
+			json.Unmarshal(b, &r.{{$type}}Array)
+		{{end}}
+		{{range $type := $.Property.ItemTypes}}
+			json.Unmarshal(b, &r.{{$type}}Array)
+		{{end}}
+
+	}
+
+	return nil
+}
diff --git a/goformation/generate/templates/resource.template b/goformation/generate/templates/resource.template
new file mode 100644
index 0000000000..bfb99cee6e
--- /dev/null
+++ b/goformation/generate/templates/resource.template
@@ -0,0 +1,142 @@
+package {{.PackageName}}
+
+{{if not .IsCustomProperty}}
+import (
+	"encoding/json"
+	"fmt"
+	"bytes"
+	{{if .Resource.HasValueProperty}}
+	"goformation/v4/cloudformation/types"{{end}}
+	{{if .HasTags}}
+	"goformation/v4/cloudformation/cloudformation"{{end}}
+	"goformation/v4/cloudformation/policies"
+)
+{{else}}
+import ({{if .Resource.HasValueProperty}}
+	"goformation/v4/cloudformation/types"{{end}}
+	{{if .HasTags}}
+	"goformation/v4/cloudformation/cloudformation"{{end}}
+	"goformation/v4/cloudformation/policies"
+)
+{{end}}
+
+// {{.StructName}} AWS CloudFormation Resource ({{.Name}})
+// See: {{.Resource.Documentation}}
+type {{.StructName}} struct {
+    {{range $name, $property := .Resource.Properties}}
+    {{$prop_name := $name}}
+    {{if (eq ($prop_name) ("DependsOn"))}}{{$prop_name = "DependsOnProp"}}{{end}}
+    // {{$name}} AWS CloudFormation Property
+    // Required: {{$property.Required}}
+    // See: {{$property.Documentation}}
+    {{$prop_name}} {{if (or ($property.IsPolymorphic) ($property.IsCustomType) )}}*{{end}}{{$property.GoType $.Name $.Basename $name $.PackageName}} `json:"{{$name}}{{if (not (and ($property.IsNumeric) ($property.Required)))}},omitempty{{end}}"`
+    {{end}}
+	{{if .HasUpdatePolicy }}// AWSCloudFormationUpdatePolicy represents a CloudFormation UpdatePolicy
+	AWSCloudFormationUpdatePolicy *policies.UpdatePolicy `json:"-"`{{ end }}
+
+	{{if .HasCreationPolicy }}// AWSCloudFormationCreationPolicy represents a CloudFormation CreationPolicy
+	AWSCloudFormationCreationPolicy *policies.CreationPolicy `json:"-"`
+	{{ end }}
+	// AWSCloudFormationDeletionPolicy represents a CloudFormation DeletionPolicy
+	AWSCloudFormationDeletionPolicy policies.DeletionPolicy `json:"-"`
+
+	// AWSCloudFormationUpdateReplacePolicy represents a CloudFormation UpdateReplacePolicy
+	AWSCloudFormationUpdateReplacePolicy policies.UpdateReplacePolicy `json:"-"`
+
+    // AWSCloudFormationDependsOn stores the logical ID of the resources to be created before this resource
+    AWSCloudFormationDependsOn []string `json:"-"`
+
+    // AWSCloudFormationMetadata stores structured data associated with this resource
+    AWSCloudFormationMetadata map[string]interface{} `json:"-"`
+
+    // AWSCloudFormationCondition stores the logical ID of the condition that must be satisfied for this resource to be created
+    AWSCloudFormationCondition string `json:"-"`
+
+}
+
+// AWSCloudFormationType returns the AWS CloudFormation resource type
+func (r *{{.StructName}}) AWSCloudFormationType() string {
+    return "{{.Name}}"
+}
+
+{{if not .IsCustomProperty}}
+// 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 {{.StructName}}) MarshalJSON() ([]byte, error) {
+	type Properties {{.StructName}}
+	return json.Marshal(&struct{
+		Type string
+		{{if .IsCustomProperty}}Properties{{else}}Properties Properties{{end}}
+		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"`
+		{{if .HasUpdatePolicy}}UpdatePolicy *policies.UpdatePolicy `json:"UpdatePolicy,omitempty"`{{end}}
+		{{if .HasCreationPolicy}}CreationPolicy *policies.CreationPolicy `json:"CreationPolicy,omitempty"`{{end}}
+	}{
+		Type: r.AWSCloudFormationType(),
+		Properties: (Properties)(r),
+		DependsOn: r.AWSCloudFormationDependsOn,
+		Metadata: r.AWSCloudFormationMetadata,
+		DeletionPolicy: r.AWSCloudFormationDeletionPolicy,
+		UpdateReplacePolicy: r.AWSCloudFormationUpdateReplacePolicy,
+		Condition: r.AWSCloudFormationCondition,
+		{{if .HasUpdatePolicy}}UpdatePolicy: r.AWSCloudFormationUpdatePolicy,{{end}}
+		{{if .HasCreationPolicy}}CreationPolicy: r.AWSCloudFormationCreationPolicy,{{end}}
+	})
+}
+
+
+
+// UnmarshalJSON is a custom JSON unmarshalling hook that strips the outer
+// AWS CloudFormation resource object, and just keeps the 'Properties' field.
+func (r *{{.StructName}}) UnmarshalJSON(b []byte) error {
+	type Properties {{.StructName}}
+	res := &struct {
+		Type string
+		{{if .IsCustomProperty}}Properties{{else}}Properties *Properties{{end}}
+		DependsOn []string
+		Metadata map[string]interface{}
+		DeletionPolicy string
+		UpdateReplacePolicy string
+		Condition string
+		{{if .HasUpdatePolicy}}UpdatePolicy *policies.UpdatePolicy {{end}}
+		{{if .HasCreationPolicy}}CreationPolicy *policies.CreationPolicy{{end}}
+	}{}
+
+	dec := json.NewDecoder(bytes.NewReader(b))
+	dec.DisallowUnknownFields() // Force error if unknown field is found
+
+	if err := dec.Decode(&res); err != nil {
+		fmt.Printf("ERROR: %s\n", err)
+		return err
+	}
+
+	// If the resource has no Properties set, it could be nil
+	if res.Properties != nil {
+		*r = {{.StructName}}(*res.Properties)
+	}
+	if res.DependsOn != nil {
+		r.AWSCloudFormationDependsOn = res.DependsOn
+	}
+	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
+	} {{if .HasUpdatePolicy }}
+		if res.UpdatePolicy != nil { r.AWSCloudFormationUpdatePolicy = res.UpdatePolicy }
+	{{end}} {{if .HasCreationPolicy}}
+		if res.CreationPolicy != nil { r.AWSCloudFormationCreationPolicy = res.CreationPolicy }
+	{{end}}
+	return nil
+}
+
+{{end}}
diff --git a/goformation/generate/templates/schema-property.template b/goformation/generate/templates/schema-property.template
new file mode 100644
index 0000000000..ab2d4bec7d
--- /dev/null
+++ b/goformation/generate/templates/schema-property.template
@@ -0,0 +1,94 @@
+"{{.Name}}": {
+
+{{if .Property.IsPolymorphic}}
+    "anyOf": [
+        {{if .Property.PrimitiveTypes}}
+            {
+                "type": [
+                    {{$length := len .Property.PrimitiveTypes}}{{$rc := counter $length}}{{range $index, $primitiveType := .Property.PrimitiveTypes}}
+                        "{{convertToJSONType $primitiveType}}"{{if call $rc}},{{end}}
+                    {{end}}
+                ]
+            }{{if (or .Property.PrimitiveItemTypes (or .Property.Types .Property.ItemTypes))}},{{end}}
+        {{end}}
+
+        {{if .Property.PrimitiveItemTypes}}
+            {{$length := len .Property.PrimitiveItemTypes}}{{$rc := counter $length}}{{range $index, $primitiveItemType := .Property.PrimitiveItemTypes}}
+                {
+                    "type": "array",
+                    "items": {
+                        "type": "{{convertToJSONType $primitiveItemType}}"
+                    }
+                }{{if (or (call $rc) (or $.Property.Types $.Property.ItemTypes))}},{{end}}
+            {{end}}
+        {{end}}
+
+        {{if .Property.Types}}
+            {{$length := len .Property.Types}}{{$rc := counter $length}}{{range $index, $customType := .Property.Types}}
+                { "$ref": "#/definitions/{{$.Parent}}.{{$customType}}" }{{if (or (call $rc) $.Property.ItemTypes)}},{{end}}
+            {{end}}
+        {{end}}
+
+        {{if .Property.ItemTypes}}
+            {{$length := len .Property.ItemTypes}}{{$rc := counter $length}}{{range $index, $itemType := .Property.ItemTypes}}
+                {
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/{{$.Parent}}.{{$itemType}}"
+                    }
+                }{{if call $rc}},{{end}}
+            {{end}}
+        {{end}}
+    ]
+{{else}}
+
+    {{if .Property.IsCustomType}}
+        "$ref": "#/definitions/{{.Parent}}.{{.Property.Type}}"
+    {{end}}
+
+    {{if .Property.IsPrimitive}}
+        "type": "{{.Property.GetJSONPrimitiveType}}"
+    {{end}}
+
+    {{if .Property.IsMap}}
+        "type": "object",
+        {{if .Property.HasJSONPrimitiveType}}
+        "patternProperties": {
+            "^[a-zA-Z0-9]+$": {
+                "type": "{{.Property.GetJSONPrimitiveType}}"
+            }
+        },
+        "additionalProperties": true
+        {{else}}
+        "patternProperties": {
+            "^[a-zA-Z0-9]+$": {
+                {{ if eq .Property.ItemType "Tag" }}
+                    "$ref": "#/definitions/Tag"
+                {{else}}
+                    "$ref": "#/definitions/{{.Parent}}.{{.Property.ItemType}}"
+                {{end}}
+            }
+        },
+        "additionalProperties": false
+        {{end}}
+    {{end}}
+
+    {{if .Property.IsList}}
+        "type": "array",
+        {{if .Property.HasJSONPrimitiveType}}
+        "items": {
+            "type": "{{.Property.GetJSONPrimitiveType}}"
+        }
+        {{else}}
+        "items": {
+            {{ if eq .Property.ItemType "Tag" }}
+                "$ref": "#/definitions/Tag"
+             {{else}}
+                "$ref": "#/definitions/{{.Parent}}.{{.Property.ItemType}}"
+            {{end}}
+        }
+        {{end}}
+    {{end}}
+
+{{end}}
+}
diff --git a/goformation/generate/templates/schema-resource.template b/goformation/generate/templates/schema-resource.template
new file mode 100644
index 0000000000..2144d235a1
--- /dev/null
+++ b/goformation/generate/templates/schema-resource.template
@@ -0,0 +1,76 @@
+"{{.Name}}": {
+    "type": "object",
+    {{if .IsCustomProperty}}
+    {{if .Resource.Required}}"required": [{{.Resource.Required}}],{{end}}
+    "properties": {
+        {{$length := len .Resource.Properties}}{{$pc := counter $length}}{{range $name, $property := .Resource.Properties}}
+        {{$property.Schema $name $.Name}}{{if call $pc}},{{end}}
+        {{end}}
+    },
+    {{else}}
+    "required": {{if .Resource.Required}}["Type", "Properties"]{{else}}["Type"]{{end}},
+    "properties": {
+        "Properties": {
+            "type": "object",
+            "properties": {
+                {{$length := len .Resource.Properties}}{{$pc := counter $length}}{{range $name, $property := .Resource.Properties}}
+                {{$property.Schema $name $.Name}}{{if call $pc}},{{end}}
+                {{end}}
+             },
+             {{if .Resource.Required}}"required": [{{.Resource.Required}}],{{end}}
+            "additionalProperties": false
+        },
+        "Type": {
+            "type": "string",
+            "enum": [
+                "{{.Name}}"
+            ]
+        },
+        {{if eq .Name "AWS::AutoScaling::AutoScalingGroup" "AWS::EC2::Instance" "AWS::CloudFormation::WaitCondition"}}
+        "CreationPolicy": {
+            "type": "object"
+        },
+        {{end}}
+        {{if eq .Name "AWS::AutoScaling::AutoScalingGroup"}}
+        "UpdatePolicy": {
+            "type": "object"
+        },
+        {{end}}
+        "DeletionPolicy": {
+            "type": "string",
+            "enum": [
+                "Delete",
+                "Retain",
+                "Snapshot"
+            ]
+        },
+        "UpdateReplacePolicy": {
+            "type": "string",
+            "enum": [
+                "Delete",
+                "Retain",
+                "Snapshot"
+            ]
+        },
+        "DependsOn": {
+            "anyOf": [
+                {
+                    "type": "string",
+                    "pattern": "^[a-zA-Z0-9]+$"
+                },
+                {
+                    "items": {
+                        "type": "string",
+                        "pattern": "^[a-zA-Z0-9]+$"
+                    },
+                    "type": "array"
+                }
+            ]
+        },
+        "Metadata": {
+            "type": "object"
+        }
+    },
+    {{end}}
+    "additionalProperties": false
+}
\ No newline at end of file
diff --git a/goformation/generate/templates/schema.template b/goformation/generate/templates/schema.template
new file mode 100644
index 0000000000..a520d43f98
--- /dev/null
+++ b/goformation/generate/templates/schema.template
@@ -0,0 +1,205 @@
+{
+    "$id": "http://json-schema.org/draft-04/schema#",
+    "type": "object",
+    "properties": {
+
+        "AWSTemplateFormatVersion": {
+            "type": "string",
+            "enum": [
+                "2010-09-09"
+            ]
+        },
+
+        "Description": {
+            "description": "Template description",
+            "type": "string",
+            "maxLength": 1024
+        },
+
+        "Metadata": {
+            "type": "object"
+        },
+
+        "Transform": {
+        {{if .ResourceSpecificationTransform}}
+            "type": "string",
+            "enum": [
+                "{{.ResourceSpecificationTransform}}"
+            ]
+        {{else}}
+            "oneOf": [
+                {"type": ["string"]},
+                {"type": "array", "items": {"type": "string"}}
+            ]
+        {{end}}
+        },
+
+        "Parameters": {
+            "type": "object",
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "$ref": "#/definitions/Parameter"
+                }
+            },
+            "maxProperties": 50,
+            "additionalProperties": false
+        },
+
+        "Mappings": {
+            "type": "object",
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "type": "object"
+                }
+            },
+            "additionalProperties": false
+        },
+
+        "Conditions": {
+            "type": "object",
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "type": "object"
+                }
+            },
+            "additionalProperties": false
+        },
+
+        "Outputs": {
+            "type": "object",
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "type": "object"
+                }
+            },
+            "minProperties": 1,
+            "maxProperties": 60,
+            "additionalProperties": false
+        },
+
+        "Resources": {
+            "type": "object",
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "anyOf": [
+                        {{$length := len .Resources}}{{$c := counter $length}}{{range $name, $resources := .Resources}} { "$ref": "#/definitions/{{$name}}" }{{if call $c}}, {{end}}
+                        {{end}}
+                    ]
+                }
+            },
+            "additionalProperties": false
+        }
+    },
+    "required": [
+        {{if .ResourceSpecificationTransform}}
+            "Transform",
+        {{end}}
+
+        "Resources"
+    ],
+    "additionalProperties": false,
+    "definitions": {
+        "Parameter": {
+            "type": "object",
+            "properties": {
+                "Type": {
+                    "type": "string",
+                    "enum": [
+                        "String",
+                        "Number",
+                        "List<Number>",
+                        "CommaDelimitedList",
+                        "AWS::EC2::AvailabilityZone::Name",
+                        "AWS::EC2::Image::Id",
+                        "AWS::EC2::Instance::Id",
+                        "AWS::EC2::KeyPair::KeyName",
+                        "AWS::EC2::SecurityGroup::GroupName",
+                        "AWS::EC2::SecurityGroup::Id",
+                        "AWS::EC2::Subnet::Id",
+                        "AWS::EC2::Volume::Id",
+                        "AWS::EC2::VPC::Id",
+                        "AWS::Route53::HostedZone::Id",
+                        "List<AWS::EC2::AvailabilityZone::Name>",
+                        "List<AWS::EC2::Image::Id>",
+                        "List<AWS::EC2::Instance::Id>",
+                        "List<AWS::EC2::SecurityGroup::GroupName>",
+                        "List<AWS::EC2::SecurityGroup::Id>",
+                        "List<AWS::EC2::Subnet::Id>",
+                        "List<AWS::EC2::Volume::Id>",
+                        "List<AWS::EC2::VPC::Id>",
+                        "List<AWS::Route53::HostedZone::Id>",
+                        "List<String>",
+                        "AWS::SSM::Parameter::Name",
+                        "AWS::SSM::Parameter::Value<String>",
+                        "AWS::SSM::Parameter::Value<List<String>>",
+                        "AWS::SSM::Parameter::Value<CommaDelimitedList>",
+                        "AWS::SSM::Parameter::Value<AWS::EC2::AvailabilityZone::Name>",
+                        "AWS::SSM::Parameter::Value<AWS::EC2::Image::Id>",
+                        "AWS::SSM::Parameter::Value<AWS::EC2::Instance::Id>",
+                        "AWS::SSM::Parameter::Value<AWS::EC2::SecurityGroup::GroupName>",
+                        "AWS::SSM::Parameter::Value<AWS::EC2::SecurityGroup::Id>",
+                        "AWS::SSM::Parameter::Value<AWS::EC2::Subnet::Id>",
+                        "AWS::SSM::Parameter::Value<AWS::EC2::Volume::Id>",
+                        "AWS::SSM::Parameter::Value<AWS::EC2::VPC::Id>",
+                        "AWS::SSM::Parameter::Value<AWS::Route53::HostedZone::Id>",
+                        "AWS::SSM::Parameter::Value<List<AWS::EC2::AvailabilityZone::Name>>",
+                        "AWS::SSM::Parameter::Value<List<AWS::EC2::Image::Id>>",
+                        "AWS::SSM::Parameter::Value<List<AWS::EC2::Instance::Id>>",
+                        "AWS::SSM::Parameter::Value<List<AWS::EC2::SecurityGroup::GroupName>>",
+                        "AWS::SSM::Parameter::Value<List<AWS::EC2::SecurityGroup::Id>>",
+                        "AWS::SSM::Parameter::Value<List<AWS::EC2::Subnet::Id>>",
+                        "AWS::SSM::Parameter::Value<List<AWS::EC2::Volume::Id>>",
+                        "AWS::SSM::Parameter::Value<List<AWS::EC2::VPC::Id>>",
+                        "AWS::SSM::Parameter::Value<List<AWS::Route53::HostedZone::Id>>"
+                    ]
+                },
+                "AllowedPattern": {
+                    "type": "string"
+                },
+                "AllowedValues": {
+                    "type": "array"
+                },
+                "ConstraintDescription": {
+                    "type": "string"
+                },
+                "Default": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "MaxLength": {
+                    "type": "string"
+                },
+                "MaxValue": {
+                    "type": "string"
+                },
+                "MinLength": {
+                    "type": "string"
+                },
+                "MinValue": {
+                    "type": "string"
+                },
+                "NoEcho": {
+                    "type": [
+                        "string",
+                        "boolean"
+                    ]
+                }
+            },
+            "additionalProperties": false,
+            "required": [
+                "Type"
+            ]
+        },
+
+        {{range $name, $resource := .Resources}}
+            {{$resource.Schema $name false}},
+        {{end}}
+
+        {{$length := len .Properties}}{{$rc := counter $length}}{{range $name, $resource := .Properties}}
+            {{$resource.Schema $name true}}{{if call $rc}},{{end}}
+        {{end}}
+
+    }
+}
diff --git a/goformation/go.mod b/goformation/go.mod
new file mode 100644
index 0000000000..dc5bfe9489
--- /dev/null
+++ b/goformation/go.mod
@@ -0,0 +1,25 @@
+module goformation/v4
+
+require (
+	github.com/awslabs/goformation/v4 v4.15.5
+	github.com/onsi/ginkgo v1.14.2
+	github.com/onsi/gomega v1.10.3
+	github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b
+	github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522
+	github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56
+)
+
+require (
+	github.com/fsnotify/fsnotify v1.4.9 // indirect
+	github.com/nxadm/tail v1.4.4 // indirect
+	github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect
+	github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect
+	golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0 // indirect
+	golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f // indirect
+	golang.org/x/text v0.3.3 // indirect
+	golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 // indirect
+	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
+	gopkg.in/yaml.v2 v2.3.0 // indirect
+)
+
+go 1.20
diff --git a/goformation/go.sum b/goformation/go.sum
new file mode 100644
index 0000000000..cad41e4a74
--- /dev/null
+++ b/goformation/go.sum
@@ -0,0 +1,87 @@
+github.com/awslabs/goformation/v4 v4.15.5 h1:q3lm7oj4yqqJ76ZcaFThUACT3MQLD6yBcJRKuZ6g87w=
+github.com/awslabs/goformation/v4 v4.15.5/go.mod h1:wB5lKZf1J0MYH1Lt4B9w3opqz0uIjP7MMCAcib3QkwA=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
+github.com/nxadm/tail v1.4.4 h1:DQuhQpB1tVlglWS2hLQ5OV6B5r8aGxSrPc5Qo6uTN78=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.14.2 h1:8mVmC9kjFFmA8H4pKMUhcblgifdkOIXPvbhN1T36q1M=
+github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.10.3 h1:gph6h/qe9GSUw1NhH1gp+qb+h8rXD8Cy60Z32Qw3ELA=
+github.com/onsi/gomega v1.10.3/go.mod h1:V9xEwhxec5O8UDM77eCW8vLymOMltsqPVYWrpDsH8xc=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b h1:jUK33OXuZP/l6babJtnLo1qsGvq6G9so9KMflGAm4YA=
+github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b/go.mod h1:8458kAagoME2+LN5//WxE71ysZ3B7r22fdgb7qVmXSY=
+github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522 h1:fOCp11H0yuyAt2wqlbJtbyPzSgaxHTv8uN1pMpkG1t8=
+github.com/sanathkr/yaml v0.0.0-20170819201035-0056894fa522/go.mod h1:tQTYKOQgxoH3v6dEmdHiz4JG+nbxWwM5fgPQUpSZqVQ=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
+github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
+github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0=
+github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ=
+github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56 h1:yhqBHs09SmmUoNOHc9jgK4a60T3XFRtPAkYxVnqgY50=
+github.com/xeipuuv/gojsonschema v0.0.0-20181112162635-ac52e6811b56/go.mod h1:5yf86TLmAcydyeJq5YvxkGPE2fm/u4myDekKRoLuqhs=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0 h1:wBouT66WTYFXdxfVdz9sVWARVd/2vfGcmI45D2gj45M=
+golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
+golang.org/x/text v0.3.3 h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c h1:dUUwHk2QECo/6vqA44rthZ8ie2QXMNeKRTHCNY2nXvo=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/goformation/goformation.go b/goformation/goformation.go
new file mode 100644
index 0000000000..c3fb1af17a
--- /dev/null
+++ b/goformation/goformation.go
@@ -0,0 +1,77 @@
+package goformation
+
+import (
+	"encoding/json"
+	"io/ioutil"
+	"strings"
+
+	"goformation/v4/cloudformation"
+	"goformation/v4/intrinsics"
+)
+
+//go:generate generate/generate.sh
+
+// Open and parse a AWS CloudFormation template from file.
+// Works with either JSON or YAML formatted templates.
+func Open(filename string) (*cloudformation.Template, error) {
+	return OpenWithOptions(filename, nil)
+}
+
+// OpenWithOptions opens and parse a AWS CloudFormation template from file.
+// Works with either JSON or YAML formatted templates.
+// Parsing can be tweaked via the specified options.
+func OpenWithOptions(filename string, options *intrinsics.ProcessorOptions) (*cloudformation.Template, error) {
+
+	data, err := ioutil.ReadFile(filename)
+	if err != nil {
+		return nil, err
+	}
+
+	if strings.HasSuffix(filename, ".json") {
+		// This is definitely JSON
+		return ParseJSONWithOptions(data, options)
+	}
+
+	return ParseYAMLWithOptions(data, options)
+}
+
+// ParseYAML an AWS CloudFormation template (expects a []byte of valid YAML)
+func ParseYAML(data []byte) (*cloudformation.Template, error) {
+	return ParseYAMLWithOptions(data, nil)
+}
+
+// ParseYAMLWithOptions an AWS CloudFormation template (expects a []byte of valid YAML)
+// Parsing can be tweaked via the specified options.
+func ParseYAMLWithOptions(data []byte, options *intrinsics.ProcessorOptions) (*cloudformation.Template, error) {
+	// Process all AWS CloudFormation intrinsic functions (e.g. Fn::Join)
+	intrinsified, err := intrinsics.ProcessYAML(data, options)
+	if err != nil {
+		return nil, err
+	}
+
+	return unmarshal(intrinsified)
+
+}
+
+// ParseJSON an AWS CloudFormation template (expects a []byte of valid JSON)
+func ParseJSON(data []byte) (*cloudformation.Template, error) {
+	return ParseJSONWithOptions(data, nil)
+}
+
+// ParseJSONWithOptions an AWS CloudFormation template (expects a []byte of valid JSON)
+// Parsing can be tweaked via the specified options.
+func ParseJSONWithOptions(data []byte, options *intrinsics.ProcessorOptions) (*cloudformation.Template, error) {
+	return unmarshal(data)
+
+}
+
+func unmarshal(data []byte) (*cloudformation.Template, error) {
+
+	template := &cloudformation.Template{}
+	if err := json.Unmarshal(data, template); err != nil {
+		return nil, err
+	}
+
+	return template, nil
+
+}
diff --git a/goformation/goformation_schema_test.go b/goformation/goformation_schema_test.go
new file mode 100644
index 0000000000..25411f0744
--- /dev/null
+++ b/goformation/goformation_schema_test.go
@@ -0,0 +1,187 @@
+package goformation_test
+
+import (
+	// Note that this is a fork of the main repo: github.com/xeipuuv/gojsonschema
+	// CloudFormation uses nested schema def references, which is currently broken
+	// in the main repo: https://github.com/xeipuuv/gojsonschema/pull/146
+	"os"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	. "github.com/xeipuuv/gojsonschema"
+)
+
+var _ = Describe("Goformation-generated JSON schemas", func() {
+
+	Context("with a valid CloudFormation template", func() {
+
+		pwd, _ := os.Getwd()
+		schemaLoader := NewReferenceLoader("file://" + pwd + "/schema/cloudformation.schema.json")
+
+		It("should successfully validate the CloudFormation template", func() {
+			documentLoader := NewReferenceLoader("file://" + pwd + "/test/json/valid-template.json")
+			result, err := Validate(schemaLoader, documentLoader)
+
+			Expect(err).To(BeNil())
+			Expect(result).ShouldNot(BeNil())
+			Expect(result.Errors()).Should(BeEmpty())
+			Expect(result.Valid()).Should(BeTrue())
+		})
+
+		It("should successfully validate a template with resource attributes", func() {
+			documentLoader := NewReferenceLoader("file://" + pwd + "/test/json/valid-template-resource-attributes.json")
+			result, err := Validate(schemaLoader, documentLoader)
+
+			Expect(err).To(BeNil())
+			Expect(result).ShouldNot(BeNil())
+			Expect(result.Errors()).Should(BeEmpty())
+			Expect(result.Valid()).Should(BeTrue())
+		})
+	})
+
+	Context("with a valid SAM template", func() {
+
+		pwd, _ := os.Getwd()
+		schemaLoader := NewReferenceLoader("file://" + pwd + "/schema/sam.schema.json")
+		documentLoader := NewReferenceLoader("file://" + pwd + "/test/json/valid-sam-template.json")
+
+		result, err := Validate(schemaLoader, documentLoader)
+		It("should successfully validate the SAM template", func() {
+			Expect(err).To(BeNil())
+			Expect(result).ShouldNot(BeNil())
+			Expect(result.Errors()).Should(BeEmpty())
+			Expect(result.Valid()).Should(BeTrue())
+		})
+	})
+
+	Context("with a valid template, but which contains attributes not yet supported by the generated schema", func() {
+
+		pwd, _ := os.Getwd()
+		schemaLoader := NewReferenceLoader("file://" + pwd + "/schema/cloudformation.schema.json")
+
+		It("should report that a template with intrinsic functions is invalid", func() {
+			documentLoader := NewReferenceLoader("file://" + pwd + "/test/json/valid-template-with-fns.json")
+			result, err := Validate(schemaLoader, documentLoader)
+
+			Expect(err).To(BeNil())
+			Expect(result).ShouldNot(BeNil())
+			Expect(result.Valid()).Should(BeFalse())
+		})
+	})
+
+	Context("with an invalid CloudFormation template", func() {
+
+		pwd, _ := os.Getwd()
+		schemaLoader := NewReferenceLoader("file://" + pwd + "/schema/cloudformation.schema.json")
+
+		It("should report that a template missing required root properties is invalid", func() {
+			documentLoader := NewReferenceLoader("file://" + pwd + "/test/json/invalid-template-missing-resources.json")
+			result, err := Validate(schemaLoader, documentLoader)
+			Expect(err).To(BeNil())
+			Expect(result).ShouldNot(BeNil())
+			Expect(result.Valid()).Should(BeFalse())
+		})
+
+		It("should report that a template missing required resource properties is invalid", func() {
+			documentLoader := NewReferenceLoader("file://" + pwd + "/test/json/invalid-template-missing-resource-properties.json")
+			result, err := Validate(schemaLoader, documentLoader)
+			Expect(err).To(BeNil())
+			Expect(result).ShouldNot(BeNil())
+			Expect(result.Valid()).Should(BeFalse())
+		})
+
+		It("should report that a template with missing single required resource property is invalid", func() {
+			documentLoader := NewReferenceLoader("file://" + pwd + "/test/json/invalid-template-empty-resource-properties.json")
+			result, err := Validate(schemaLoader, documentLoader)
+			Expect(err).To(BeNil())
+			Expect(result).ShouldNot(BeNil())
+			Expect(result.Valid()).Should(BeFalse())
+		})
+
+		It("should report that a template with a non-alphanumeric resource key is invalid", func() {
+			documentLoader := NewReferenceLoader("file://" + pwd + "/test/json/invalid-template-invalid-resource-name.json")
+			result, err := Validate(schemaLoader, documentLoader)
+			Expect(err).To(BeNil())
+			Expect(result).ShouldNot(BeNil())
+			Expect(result.Valid()).Should(BeFalse())
+		})
+
+		It("should report that a template with unknown root properties is invalid", func() {
+			documentLoader := NewReferenceLoader("file://" + pwd + "/test/json/invalid-template-additional-property.json")
+			result, err := Validate(schemaLoader, documentLoader)
+			Expect(err).To(BeNil())
+			Expect(result).ShouldNot(BeNil())
+			Expect(result.Valid()).Should(BeFalse())
+		})
+
+		It("should report that a template with unknown resource type is invalid", func() {
+			documentLoader := NewReferenceLoader("file://" + pwd + "/test/json/invalid-template-unknown-resource-type.json")
+			result, err := Validate(schemaLoader, documentLoader)
+			Expect(err).To(BeNil())
+			Expect(result).ShouldNot(BeNil())
+			Expect(result.Valid()).Should(BeFalse())
+		})
+
+		It("should report that a template with unknown resource type is invalid", func() {
+			documentLoader := NewReferenceLoader("file://" + pwd + "/test/json/invalid-template-missing-resource-type.json")
+			result, err := Validate(schemaLoader, documentLoader)
+			Expect(err).To(BeNil())
+			Expect(result).ShouldNot(BeNil())
+			Expect(result.Valid()).Should(BeFalse())
+		})
+
+		It("should report that a template with unknown resource properties is invalid", func() {
+			documentLoader := NewReferenceLoader("file://" + pwd + "/test/json/invalid-template-additional-resource-property.json")
+			result, err := Validate(schemaLoader, documentLoader)
+			Expect(err).To(BeNil())
+			Expect(result).ShouldNot(BeNil())
+			Expect(result.Valid()).Should(BeFalse())
+		})
+
+		It("should report that a template with an unknown subproperty property is invalid", func() {
+			documentLoader := NewReferenceLoader("file://" + pwd + "/test/json/invalid-template-unknown-subproperty-property.json")
+			result, err := Validate(schemaLoader, documentLoader)
+			Expect(err).To(BeNil())
+			Expect(result).ShouldNot(BeNil())
+			Expect(result.Valid()).Should(BeFalse())
+		})
+
+		It("should report that a template with a wrong subproperty type is invalid", func() {
+			documentLoader := NewReferenceLoader("file://" + pwd + "/test/json/invalid-template-invalid-resource-subproperty.json")
+			result, err := Validate(schemaLoader, documentLoader)
+			Expect(err).To(BeNil())
+			Expect(result).ShouldNot(BeNil())
+			Expect(result.Valid()).Should(BeFalse())
+		})
+
+		It("should report that a template with a subproperty that is missing a required property is invalid", func() {
+			documentLoader := NewReferenceLoader("file://" + pwd + "/test/json/invalid-template-subproperty-missing-property.json")
+			result, err := Validate(schemaLoader, documentLoader)
+			Expect(err).To(BeNil())
+			Expect(result).ShouldNot(BeNil())
+			Expect(result.Valid()).Should(BeFalse())
+		})
+	})
+
+	Context("with an invalid SAM template", func() {
+
+		pwd, _ := os.Getwd()
+		schemaLoader := NewReferenceLoader("file://" + pwd + "/schema/sam.schema.json")
+
+		It("should report that a template missing the Transform property is invalid", func() {
+			documentLoader := NewReferenceLoader("file://" + pwd + "/test/json/invalid-sam-template-no-transform.json")
+			result, err := Validate(schemaLoader, documentLoader)
+			Expect(err).To(BeNil())
+			Expect(result).ShouldNot(BeNil())
+			Expect(result.Valid()).Should(BeFalse())
+		})
+
+		It("should report that a template with a non-SAM Transform value is invalid", func() {
+			documentLoader := NewReferenceLoader("file://" + pwd + "/test/json/invalid-sam-template-wrong-transform.json")
+			result, err := Validate(schemaLoader, documentLoader)
+			Expect(err).To(BeNil())
+			Expect(result).ShouldNot(BeNil())
+			Expect(result.Valid()).Should(BeFalse())
+		})
+	})
+})
diff --git a/goformation/goformation_suite_test.go b/goformation/goformation_suite_test.go
new file mode 100644
index 0000000000..6394169d35
--- /dev/null
+++ b/goformation/goformation_suite_test.go
@@ -0,0 +1,13 @@
+package goformation_test
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	"testing"
+)
+
+func TestGoformation(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Goformation Suite")
+}
diff --git a/goformation/goformation_test.go b/goformation/goformation_test.go
new file mode 100644
index 0000000000..2b2b0b4e99
--- /dev/null
+++ b/goformation/goformation_test.go
@@ -0,0 +1,1228 @@
+package goformation_test
+
+import (
+	"fmt"
+
+	"encoding/json"
+
+	"github.com/sanathkr/yaml"
+
+	"goformation/v4"
+	"goformation/v4/cloudformation"
+
+	"goformation/v4/cloudformation/lambda"
+	"goformation/v4/cloudformation/policies"
+	"goformation/v4/cloudformation/route53"
+	"goformation/v4/cloudformation/s3"
+
+	"goformation/v4/cloudformation/serverless"
+	"goformation/v4/cloudformation/sns"
+	. "goformation/v4/cloudformation/types"
+
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+	. "github.com/onsi/gomega/gstruct"
+)
+
+func Example_to_json() {
+
+	// Create a new CloudFormation template
+	template := cloudformation.NewTemplate()
+
+	// Create an Amazon SNS topic, with a unique name based off the current timestamp
+	template.Resources["MyTopic"] = &sns.Topic{
+		TopicName: NewString("my-topic-1575143839"),
+	}
+
+	// Create a subscription, connected to our topic, that forwards notifications to an email address
+	template.Resources["MyTopicSubscription"] = &sns.Subscription{
+		TopicArn: MakeRef("MyTopic"),
+		Protocol: NewString("email"),
+		Endpoint: NewString("some.email@example.com"),
+	}
+
+	// Let's see the JSON AWS CloudFormation template
+	j, err := template.JSON()
+	if err != nil {
+		fmt.Printf("Failed to generate JSON: %s\n", err)
+	} else {
+		fmt.Printf("%s\n", string(j))
+	}
+
+	// Output:
+	// {
+	//   "AWSTemplateFormatVersion": "2010-09-09",
+	//   "Resources": {
+	//     "MyTopic": {
+	//       "Type": "AWS::SNS::Topic",
+	//       "Properties": {
+	//         "TopicName": "my-topic-1575143839"
+	//       }
+	//     },
+	//     "MyTopicSubscription": {
+	//       "Type": "AWS::SNS::Subscription",
+	//       "Properties": {
+	//         "Endpoint": "some.email@example.com",
+	//         "Protocol": "email",
+	//         "TopicArn": {
+	//           "Ref": "MyTopic"
+	//         }
+	//       }
+	//     }
+	//   }
+	// }
+}
+
+func Example_to_yaml() {
+
+	// Create a new CloudFormation template
+	template := cloudformation.NewTemplate()
+
+	// Create an Amazon SNS topic, with a unique name based off the current timestamp
+	template.Resources["MyTopic"] = &sns.Topic{
+		TopicName: NewString("my-topic-1575143970"),
+	}
+
+	// Create a subscription, connected to our topic, that forwards notifications to an email address
+	template.Resources["MyTopicSubscription"] = &sns.Subscription{
+		TopicArn: MakeRef("MyTopic"),
+		Protocol: NewString("email"),
+		Endpoint: NewString("some.email@example.com"),
+	}
+
+	// Let's see the YAML AWS CloudFormation template
+	y, err := template.YAML()
+	if err != nil {
+		fmt.Printf("Failed to generate YAML: %s\n", err)
+	} else {
+		fmt.Printf("%s\n", string(y))
+	}
+
+	// Output:
+	// AWSTemplateFormatVersion: 2010-09-09
+	// Resources:
+	//   MyTopic:
+	//     Properties:
+	//       TopicName: my-topic-1575143970
+	//     Type: AWS::SNS::Topic
+	//   MyTopicSubscription:
+	//     Properties:
+	//       Endpoint: some.email@example.com
+	//       Protocol: email
+	//       TopicArn:
+	//         Ref: MyTopic
+	//     Type: AWS::SNS::Subscription
+
+}
+
+func Example_to_go() {
+
+	// Open a template from file (can be JSON or YAML)
+	template, err := goformation.Open("example/yaml-to-go/template.yaml")
+	if err != nil {
+		fmt.Printf("There was an error processing the template: %s", err)
+		return
+	}
+
+	// You can extract all resources of a certain type
+	// Each AWS CloudFormation resource is a strongly typed struct
+	topics := template.GetAllSNSTopicResources()
+	for name, topic := range topics {
+
+		// E.g. Found a AWS::SNS::Topic with Logical ID ExampleTopic and TopicName 'example'
+		fmt.Printf("Found a %s with Logical ID %s and TopicName %s\n", topic.AWSCloudFormationType(), name, topic.TopicName)
+
+	}
+
+	// You can also search for specific resources by their logicalId
+	search := "ExampleTopic"
+	topic, err := template.GetSNSTopicWithName(search)
+	if err != nil {
+		fmt.Printf("SNS topic with logical ID %s not found", search)
+		return
+	}
+
+	// E.g. Found a AWS::Serverless::Function named GetHelloWorld (runtime: nodejs6.10)
+	fmt.Printf("Found a %s with Logical ID %s and TopicName %s\n", topic.AWSCloudFormationType(), search, topic.TopicName)
+
+	// Output:
+	// Found a AWS::SNS::Topic with Logical ID ExampleTopic and TopicName example
+	// Found a AWS::SNS::Topic with Logical ID ExampleTopic and TopicName example
+
+}
+
+var _ = Describe("Goformation", func() {
+
+	Context("with a Serverless function matching 2016-10-31 specification", func() {
+
+		template, err := goformation.Open("test/yaml/aws-serverless-function-2016-10-31.yaml")
+		It("should successfully validate the SAM template", func() {
+			Expect(err).To(BeNil())
+			Expect(template).ShouldNot(BeNil())
+		})
+
+		functions := template.GetAllServerlessFunctionResources()
+
+		It("should have exactly one function", func() {
+			Expect(functions).To(HaveLen(1))
+			Expect(functions).To(HaveKey("Function20161031"))
+		})
+
+		f := functions["Function20161031"]
+
+		It("should correctly parse all of the function properties", func() {
+
+			Expect(f.Handler).To(Equal(NewString("file.method")))
+			Expect(f.Runtime).To(Equal(NewString("nodejs")))
+			Expect(f.FunctionName).To(Equal(NewString("functionname")))
+			Expect(f.Description).To(Equal(NewString("description")))
+			Expect(f.MemorySize).To(Equal(NewInteger(128)))
+			Expect(f.Timeout).To(Equal(NewInteger(30)))
+			Expect(f.Role).To(Equal(NewString("aws::arn::123456789012::some/role")))
+			Expect((*f.Policies.SAMPolicyTemplateArray)[0].DynamoDBCrudPolicy.TableName).To(Equal(NewString("table_arn")))
+			Expect(f.Environment).ToNot(BeNil())
+			Expect(f.Environment.Variables).To(HaveKeyWithValue("NAME", NewString("VALUE")))
+
+		})
+
+		It("should correctly parse all of the function API event sources/endpoints", func() {
+
+			Expect(f.Events).ToNot(BeNil())
+			Expect(f.Events).To(HaveKey("TestApi"))
+			Expect(f.Events["TestApi"].Type).To(Equal(NewString("Api")))
+			Expect(f.Events["TestApi"].Properties.ApiEvent).ToNot(BeNil())
+
+			event := f.Events["TestApi"].Properties.ApiEvent
+			Expect(event.Method).To(Equal(NewString("any")))
+			Expect(event.Path).To(Equal(NewString("/testing")))
+
+		})
+
+		It("should correctly parse all of the function S3 event source", func() {
+			Expect(f.Events).ToNot(BeNil())
+			Expect(f.Events).To(HaveKey("TestS3"))
+			Expect(f.Events["TestS3"].Type).To(Equal(NewString("S3")))
+			Expect(f.Events["TestS3"].Properties.S3Event).ToNot(BeNil())
+
+			event := f.Events["TestS3"].Properties.S3Event
+			Expect(event.Bucket).To(Equal(NewString("my-photo-bucket")))
+			Expect(event.Events.String).To(PointTo(BeEquivalentTo(NewString("s3:ObjectCreated:*"))))
+			Expect(event.Filter.S3Key.Rules).To(HaveLen(1))
+			Expect(event.Filter.S3Key.Rules[0].Name).To(Equal(NewString("prefix|suffix")))
+			Expect(event.Filter.S3Key.Rules[0].Value).To(Equal(NewString("my-prefix|my-suffix")))
+
+		})
+
+	})
+
+	Context("with a JSON template that contains a resource with tags", func() {
+
+		template, err := goformation.Open("test/json/resource-with-tags.json")
+		It("should successfully validate the template", func() {
+			Expect(err).To(BeNil())
+			Expect(template).ShouldNot(BeNil())
+		})
+
+		resources := template.GetAllAutoScalingAutoScalingGroupResources()
+		It("should have exactly one resource", func() {
+			Expect(resources).To(HaveLen(1))
+			Expect(resources).To(HaveKey("EcsClusterDefaultAutoScalingGroupASGC1A785DB"))
+		})
+
+		asg := resources["EcsClusterDefaultAutoScalingGroupASGC1A785DB"]
+		It("should have exactly one tag defined", func() {
+			Expect(asg.Tags).To(HaveLen(1))
+		})
+
+		It("should have the correct tag properties set", func() {
+			Expect(asg.Tags[0].PropagateAtLaunch).To(Equal(NewBoolean(true)))
+			Expect(asg.Tags[0].Key).To(Equal(NewString("Name")))
+			Expect(asg.Tags[0].Value).To(Equal(NewString("aws-ecs-integ-ecs/EcsCluster/DefaultAutoScalingGroup")))
+		})
+
+	})
+
+	Context("with a Custom Resource template", func() {
+
+		template, err := goformation.Open("test/yaml/custom-resource.yaml")
+		It("should successfully validate the template", func() {
+			Expect(err).To(BeNil())
+			Expect(template).ShouldNot(BeNil())
+		})
+
+		resources := template.GetAllCustomResources()
+
+		It("should have exactly one resource", func() {
+			Expect(resources).To(HaveLen(1))
+			Expect(resources).To(HaveKey("MyCustomResource"))
+		})
+
+		It("should correctly Marshal the custom resource", func() {
+			data, err := template.JSON()
+			Expect(err).To(BeNil())
+
+			var result map[string]interface{}
+			if err := json.Unmarshal(data, &result); err != nil {
+				Fail(err.Error())
+			}
+
+			resources, ok := result["Resources"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+			Expect(resources).To(HaveLen(1))
+			Expect(resources).To(HaveKey("MyCustomResource"))
+
+			mcr := resources["MyCustomResource"].(map[string]interface{})
+			Expect(mcr["Properties"]).To(HaveKey("CustomProperty"))
+		})
+	})
+
+	Context("with an AWS CloudFormation template that contains multiple resources", func() {
+
+		Context("described as Go structs", func() {
+
+			template := cloudformation.NewTemplate()
+
+			template.Resources["MySNSTopic"] = &sns.Topic{
+				DisplayName: NewString("test-sns-topic-display-name"),
+				TopicName:   NewString("test-sns-topic-name"),
+				Subscription: []sns.Topic_Subscription{
+					sns.Topic_Subscription{
+						Endpoint: NewString("test-sns-topic-subscription-endpoint"),
+						Protocol: NewString("test-sns-topic-subscription-protocol"),
+					},
+				},
+			}
+
+			template.Resources["MyRoute53HostedZone"] = &route53.HostedZone{
+				Name: NewString("example.com"),
+			}
+
+			topics := template.GetAllSNSTopicResources()
+			It("should have one AWS::SNS::Topic resource", func() {
+				Expect(topics).To(HaveLen(1))
+				Expect(topics).To(HaveKey("MySNSTopic"))
+			})
+
+			topic, err := template.GetSNSTopicWithName("MySNSTopic")
+			It("should be able to find the AWS::SNS::Topic by name", func() {
+				Expect(topic).ToNot(BeNil())
+				Expect(err).To(BeNil())
+			})
+
+			It("should have the correct AWS::SNS::Topic values", func() {
+				Expect(topic.DisplayName).To(Equal(NewString("test-sns-topic-display-name")))
+				Expect(topic.TopicName).To(Equal(NewString("test-sns-topic-name")))
+				Expect(topic.Subscription).To(HaveLen(1))
+				Expect(topic.Subscription[0].Endpoint).To(Equal(NewString("test-sns-topic-subscription-endpoint")))
+				Expect(topic.Subscription[0].Protocol).To(Equal(NewString("test-sns-topic-subscription-protocol")))
+			})
+
+			zones := template.GetAllRoute53HostedZoneResources()
+			It("should have one AWS::Route53::HostedZone resource", func() {
+				Expect(zones).To(HaveLen(1))
+				Expect(zones).To(HaveKey("MyRoute53HostedZone"))
+			})
+
+			zone, err := template.GetRoute53HostedZoneWithName("MyRoute53HostedZone")
+			It("should be able to find the AWS::Route53::HostedZone by name", func() {
+				Expect(zone).ToNot(BeNil())
+				Expect(err).To(BeNil())
+			})
+
+			It("should have the correct AWS::Route53::HostedZone values", func() {
+				Expect(zone.Name).To(Equal(NewString("example.com")))
+			})
+
+		})
+
+		Context("described as JSON", func() {
+
+			template := []byte(`{"AWSTemplateFormatVersion":"2010-09-09","Resources":{"MyRoute53HostedZone":{"Type":"AWS::Route53::HostedZone","Properties":{"Name":"example.com"}},"MySNSTopic":{"Type":"AWS::SNS::Topic","Properties":{"DisplayName":"test-sns-topic-display-name","Subscription":[{"Endpoint":"test-sns-topic-subscription-endpoint","Protocol":"test-sns-topic-subscription-protocol"}],"TopicName":"test-sns-topic-name"}}}}`)
+
+			expected := cloudformation.NewTemplate()
+
+			expected.Resources["MySNSTopic"] = &sns.Topic{
+				DisplayName: NewString("test-sns-topic-display-name"),
+				TopicName:   NewString("test-sns-topic-name"),
+				Subscription: []sns.Topic_Subscription{
+					sns.Topic_Subscription{
+						Endpoint: NewString("test-sns-topic-subscription-endpoint"),
+						Protocol: NewString("test-sns-topic-subscription-protocol"),
+					},
+				},
+			}
+
+			expected.Resources["MyRoute53HostedZone"] = &route53.HostedZone{
+				Name: NewString("example.com"),
+			}
+
+			result, err := goformation.ParseJSON(template)
+			It("should marshal to Go structs successfully", func() {
+				Expect(err).To(BeNil())
+			})
+
+			topics := result.GetAllSNSTopicResources()
+			It("should have one AWS::SNS::Topic resource", func() {
+				Expect(topics).To(HaveLen(1))
+				Expect(topics).To(HaveKey("MySNSTopic"))
+			})
+
+			topic, err := result.GetSNSTopicWithName("MySNSTopic")
+			It("should be able to find the AWS::SNS::Topic by name", func() {
+				Expect(topic).ToNot(BeNil())
+				Expect(err).To(BeNil())
+			})
+
+			It("should have the correct AWS::SNS::Topic values", func() {
+				Expect(topic.DisplayName).To(Equal(NewString("test-sns-topic-display-name")))
+				Expect(topic.TopicName).To(Equal(NewString("test-sns-topic-name")))
+				Expect(topic.Subscription).To(HaveLen(1))
+				Expect(topic.Subscription[0].Endpoint).To(Equal(NewString("test-sns-topic-subscription-endpoint")))
+				Expect(topic.Subscription[0].Protocol).To(Equal(NewString("test-sns-topic-subscription-protocol")))
+			})
+
+			zones := result.GetAllRoute53HostedZoneResources()
+			It("should have one AWS::Route53::HostedZone resource", func() {
+				Expect(zones).To(HaveLen(1))
+				Expect(zones).To(HaveKey("MyRoute53HostedZone"))
+			})
+
+			zone, err := result.GetRoute53HostedZoneWithName("MyRoute53HostedZone")
+			It("should be able to find the AWS::Route53::HostedZone by name", func() {
+				Expect(zone).ToNot(BeNil())
+				Expect(err).To(BeNil())
+			})
+
+			It("should have the correct AWS::Route53::HostedZone values", func() {
+				Expect(zone.Name).To(Equal(NewString("example.com")))
+			})
+
+		})
+
+	})
+
+	Context("with the official AWS SAM example templates", func() {
+
+		inputs := []string{
+			"test/yaml/sam-official-samples/alexa_skill/template.yaml",
+			"test/yaml/sam-official-samples/api_backend/template.yaml",
+			"test/yaml/sam-official-samples/api_swagger_cors/template.yaml",
+			"test/yaml/sam-official-samples/encryption_proxy/template.yaml",
+			"test/yaml/sam-official-samples/hello_world/template.yaml",
+			"test/yaml/sam-official-samples/inline_swagger/template.yaml",
+			"test/yaml/sam-official-samples/iot_backend/template.yaml",
+			"test/yaml/sam-official-samples/s3_processor/template.yaml",
+			"test/yaml/sam-official-samples/schedule/template.yaml",
+			"test/yaml/sam-official-samples/stream_processor/template.yaml",
+		}
+
+		for _, filename := range inputs {
+			Context("including "+filename, func() {
+				template, err := goformation.Open(filename)
+				It("should successfully parse the SAM template", func() {
+					Expect(err).To(BeNil())
+					Expect(template).ShouldNot(BeNil())
+				})
+			})
+		}
+
+	})
+
+	Context("with the default AWS CodeStar templates", func() {
+
+		inputs := []string{
+			"test/yaml/codestar/nodejs.yml",
+			"test/yaml/codestar/python.yml",
+			"test/yaml/codestar/java.yml",
+		}
+
+		for _, filename := range inputs {
+			Context("including "+filename, func() {
+				template, err := goformation.Open(filename)
+				It("should successfully validate the SAM template", func() {
+					Expect(err).To(BeNil())
+					Expect(template).ShouldNot(BeNil())
+				})
+			})
+		}
+	})
+
+	Context("with a YAML template containing intrinsic tags (e.g. !Sub)", func() {
+
+		template, err := goformation.Open("test/yaml/yaml-intrinsic-tags.yaml")
+		It("should successfully validate the SAM template", func() {
+			Expect(err).To(BeNil())
+			Expect(template).ShouldNot(PointTo(BeNil()))
+		})
+
+		function, err := template.GetServerlessFunctionWithName("IntrinsicFunctionTest")
+		It("should have a function named 'IntrinsicFunctionTest'", func() {
+			Expect(function).To(Not(BeNil()))
+			Expect(err).To(BeNil())
+		})
+
+		It("it should have the correct values", func() {
+			Expect(function.Runtime).To(Equal(MakeFnSubString("${ParamNotExists}4.3")))
+			Expect(function.Timeout).To(Equal(MakeRef("TimeoutParam")))
+		})
+
+	})
+
+	Context("with a Serverless template containing different CORS configuration formats", func() {
+
+		template, err := goformation.Open("test/yaml/aws-serverless-api-string-or-cors-configuration.yaml")
+		It("should successfully parse the template", func() {
+			Expect(err).To(BeNil())
+			Expect(template).ShouldNot(BeNil())
+		})
+
+		apis := template.GetAllServerlessApiResources()
+
+		It("should have exactly two APIs", func() {
+			Expect(apis).To(HaveLen(2))
+			Expect(apis).To(HaveKey("RestApiWithCorsConfiguration"))
+			Expect(apis).To(HaveKey("RestApiWithCorsString"))
+		})
+
+		api1 := apis["RestApiWithCorsConfiguration"]
+		It("should parse a Cors configuration object", func() {
+			Expect(api1.Cors.CorsConfiguration.AllowHeaders).To(Equal(NewString("'Authorization,authorization'")))
+			Expect(api1.Cors.CorsConfiguration.AllowOrigin).To(Equal(NewString("'*'")))
+		})
+
+		api2 := apis["RestApiWithCorsString"]
+		It("should parse a Cors string", func() {
+			Expect(api2.Cors.String).To(PointTo(Equal(NewString("'www.example.com'"))))
+		})
+
+	})
+
+	Context("with a Serverless template containing different CodeUri formats", func() {
+
+		template, err := goformation.Open("test/yaml/aws-serverless-function-string-or-s3-location.yaml")
+		It("should successfully parse the template", func() {
+			Expect(err).To(BeNil())
+			Expect(template).ShouldNot(BeNil())
+		})
+
+		functions := template.GetAllServerlessFunctionResources()
+
+		It("should have exactly three functions", func() {
+			Expect(functions).To(HaveLen(3))
+			Expect(functions).To(HaveKey("CodeUriWithS3LocationSpecifiedAsString"))
+			Expect(functions).To(HaveKey("CodeUriWithS3LocationSpecifiedAsObject"))
+			Expect(functions).To(HaveKey("CodeUriWithString"))
+		})
+
+		f1 := functions["CodeUriWithS3LocationSpecifiedAsString"]
+		It("should parse a CodeUri property with an S3 location specified as a string", func() {
+			Expect(f1.CodeUri.String).To(PointTo(Equal(NewString("s3://testbucket/testkey.zip"))))
+		})
+
+		f2 := functions["CodeUriWithS3LocationSpecifiedAsObject"]
+		It("should parse a CodeUri property with an S3 location specified as an object", func() {
+			Expect(f2.CodeUri.S3Location.Key).To(Equal(NewString("testkey.zip")))
+			Expect(f2.CodeUri.S3Location.Version).To(Equal(NewDouble(5.5)))
+		})
+
+		f3 := functions["CodeUriWithString"]
+		It("should parse a CodeUri property with a string", func() {
+			Expect(f3.CodeUri.String).To(PointTo(Equal(NewString("./testfolder"))))
+		})
+
+	})
+
+	Context("with a template defined as Go code", func() {
+
+		template := &cloudformation.Template{
+			Resources: cloudformation.Resources{
+				"MyLambdaFunction": &lambda.Function{
+					Handler: NewString("nodejs6.10"),
+				},
+			},
+		}
+
+		functions := template.GetAllLambdaFunctionResources()
+		It("should be able to retrieve all Lambda functions with GetAllLambdaFunction(template)", func() {
+			Expect(functions).To(HaveLen(1))
+		})
+
+		function, err := template.GetLambdaFunctionWithName("MyLambdaFunction")
+		It("should be able to retrieve a specific Lambda function with GetLambdaFunctionWithName(template, name)", func() {
+			Expect(err).To(BeNil())
+			Expect(function).To(BeAssignableToTypeOf(&lambda.Function{}))
+		})
+
+		It("should have the correct Handler property", func() {
+			Expect(function.Handler).To(Equal(NewString("nodejs6.10")))
+		})
+
+	})
+
+	Context("with a template that defines an AWS::Serverless::Function", func() {
+
+		Context("that has a CodeUri property set as an S3 Location", func() {
+
+			template := &cloudformation.Template{
+				Resources: cloudformation.Resources{
+					"MySAMFunction": &serverless.Function{
+						Handler: NewString("nodejs6.10"),
+						CodeUri: &serverless.Function_CodeUri{
+							S3Location: &serverless.Function_S3Location{
+								Bucket:  NewString("test-bucket"),
+								Key:     NewString("test-key"),
+								Version: NewInteger(100),
+							},
+						},
+					},
+				},
+			}
+
+			function, err := template.GetServerlessFunctionWithName("MySAMFunction")
+			It("should have an AWS::Serverless::Function called MySAMFunction", func() {
+				Expect(function).ToNot(BeNil())
+				Expect(err).To(BeNil())
+			})
+
+			It("should have the correct S3 bucket/key/version", func() {
+				Expect(function.CodeUri.S3Location.Bucket).To(Equal(NewString("test-bucket")))
+				Expect(function.CodeUri.S3Location.Key).To(Equal(NewString("test-key")))
+				Expect(function.CodeUri.S3Location.Version).To(Equal(NewInteger(100)))
+			})
+
+		})
+
+		Context("that has a CodeUri property set as a string", func() {
+
+			codeuri := NewString("./some-folder")
+			template := &cloudformation.Template{
+				Resources: cloudformation.Resources{
+					"MySAMFunction": &serverless.Function{
+						Handler: NewString("nodejs6.10"),
+						CodeUri: &serverless.Function_CodeUri{
+							String: &codeuri,
+						},
+					},
+				},
+			}
+
+			function, err := template.GetServerlessFunctionWithName("MySAMFunction")
+			It("should have an AWS::Serverless::Function called MySAMFunction", func() {
+				Expect(function).ToNot(BeNil())
+				Expect(err).To(BeNil())
+			})
+
+			It("should have the correct CodeUri", func() {
+				Expect(function.CodeUri.String).To(PointTo(Equal(NewString("./some-folder"))))
+			})
+
+		})
+
+	})
+
+	Context("with a YAML template that contains AWS::Serverless::SimpleTable resource(s)", func() {
+
+		template, err := goformation.Open("test/yaml/aws-serverless-simpletable.yaml")
+
+		It("should parse the template successfully", func() {
+			Expect(template).ToNot(BeNil())
+			Expect(err).To(BeNil())
+		})
+
+		table, err := template.GetServerlessSimpleTableWithName("TestSimpleTable")
+		It("should have a table named 'TestSimpleTable'", func() {
+			Expect(table).ToNot(BeNil())
+			Expect(err).To(BeNil())
+		})
+
+		It("should have a primary key set", func() {
+			Expect(table.PrimaryKey).ToNot(BeNil())
+		})
+
+		It("should have the correct value for the primary key name", func() {
+			Expect(table.PrimaryKey.Name).To(Equal(NewString("test-primary-key-name")))
+		})
+
+		It("should have the correct value for the primary key type", func() {
+			Expect(table.PrimaryKey.Type).To(Equal(NewString("test-primary-key-type")))
+		})
+
+		It("should have provisioned throughput set", func() {
+			Expect(table.ProvisionedThroughput).ToNot(BeNil())
+		})
+
+		It("should have the correct value for ReadCapacityUnits", func() {
+			Expect(table.ProvisionedThroughput.ReadCapacityUnits).To(Equal(NewInteger(100)))
+		})
+
+		It("should have the correct value for WriteCapacityUnits", func() {
+			Expect(table.ProvisionedThroughput.WriteCapacityUnits).To(Equal(NewInteger(200)))
+		})
+
+		It("should have a table named 'TestSimpleTableNoProperties'", func() {
+			nopropertiesTable, err := template.GetServerlessSimpleTableWithName("TestSimpleTableNoProperties")
+			Expect(nopropertiesTable).ToNot(BeNil())
+			Expect(err).To(BeNil())
+		})
+
+		It("should have the correct DeletionPolicy", func() {
+			Expect(table.AWSCloudFormationDeletionPolicy).To(Equal(policies.DeletionPolicy("Retain")))
+		})
+	})
+
+	Context("with a YAML template that contains AWS::Serverless::Api resource(s)", func() {
+
+		template, err := goformation.Open("test/yaml/aws-serverless-api.yaml")
+
+		It("should parse the template successfully", func() {
+			Expect(template).ToNot(BeNil())
+			Expect(err).To(BeNil())
+		})
+
+		api1, err := template.GetServerlessApiWithName("ServerlessApiWithDefinitionUriAsString")
+		It("should have an AWS::Serverless::Api named 'ServerlessApiWithDefinitionUriAsString'", func() {
+			Expect(api1).ToNot(BeNil())
+			Expect(err).To(BeNil())
+		})
+
+		It("should have the correct value for Name", func() {
+			Expect(api1.Name).To(Equal(NewString("test-name")))
+		})
+
+		It("should have the correct value for StageName", func() {
+			Expect(api1.StageName).To(Equal(NewString("test-stage-name")))
+		})
+
+		It("should have the correct value for DefinitionUri", func() {
+			Expect(api1.DefinitionUri.String).To(PointTo(Equal(NewString("test-definition-uri"))))
+		})
+
+		It("should have the correct value for CacheClusterEnabled", func() {
+			Expect(api1.CacheClusterEnabled).To(Equal(NewBoolean(true)))
+		})
+
+		It("should have the correct value for CacheClusterSize", func() {
+			Expect(api1.CacheClusterSize).To(Equal(NewString("test-cache-cluster-size")))
+		})
+
+		It("should have the correct value for Variables", func() {
+			Expect(api1.Variables).To(HaveKeyWithValue("NAME", NewString("VALUE")))
+		})
+
+		api2, err := template.GetServerlessApiWithName("ServerlessApiWithDefinitionUriAsS3Location")
+		It("should have an AWS::Serverless::Api named 'ServerlessApiWithDefinitionUriAsS3Location'", func() {
+			Expect(api2).ToNot(BeNil())
+			Expect(err).To(BeNil())
+		})
+
+		It("should have the correct value for DefinitionUri", func() {
+			Expect(api2.DefinitionUri.S3Location.Bucket).To(Equal(NewString("test-bucket")))
+			Expect(api2.DefinitionUri.S3Location.Key).To(Equal(NewString("test-key")))
+			Expect(api2.DefinitionUri.S3Location.Version).To(Equal(NewInteger(1)))
+		})
+
+		api3, err := template.GetServerlessApiWithName("ServerlessApiWithDefinitionBodyAsJSON")
+		It("should have an AWS::Serverless::Api named 'ServerlessApiWithDefinitionBodyAsJSON'", func() {
+			Expect(api3).ToNot(BeNil())
+			Expect(err).To(BeNil())
+		})
+
+		It("should have the correct value for DefinitionBody", func() {
+			Expect(api3.DefinitionBody).To(Equal("{\n  \"DefinitionKey\": \"test-definition-value\"\n}\n"))
+		})
+
+		api4, err := template.GetServerlessApiWithName("ServerlessApiWithDefinitionBodyAsYAML")
+		It("should have an AWS::Serverless::Api named 'ServerlessApiWithDefinitionBodyAsYAML'", func() {
+			Expect(api4).ToNot(BeNil())
+			Expect(err).To(BeNil())
+		})
+
+		It("should have the correct value for DefinitionBody", func() {
+			var expected map[string]interface{}
+			expected = map[string]interface{}{
+				"DefinitionKey": "test-definition-value",
+			}
+			Expect(api4.DefinitionBody).To(Equal(expected))
+		})
+
+		api5, err := template.GetServerlessApiWithName("ServerlessApiWithAccessLogSettingAsYAML")
+		It("should have an AWS::Serverless::Api named 'ServerlessApiWithAccessLogSettingAsYAML'", func() {
+			Expect(api5).ToNot(BeNil())
+			Expect(err).To(BeNil())
+		})
+
+		It("should have the correct value for AccessLogSetting", func() {
+			Expect(api5.AccessLogSetting.DestinationArn).To(Equal(NewString("arn:test")))
+			Expect(api5.AccessLogSetting.Format).To(Equal(NewString("{customKey: $context.Key}")))
+		})
+
+	})
+
+	Context("with a YAML template with single transform macro", func() {
+		template, err := goformation.Open("test/yaml/transform-single.yaml")
+
+		It("should parse the template successfully", func() {
+			Expect(template).ToNot(BeNil())
+			Expect(err).To(BeNil())
+		})
+
+		It("should parse transform macro into String field", func() {
+			Expect(*template.Transform.String).To(Equal("MyTranformMacro"))
+		})
+
+		It("should StringArray remain nil", func() {
+			Expect(template.Transform.StringArray).To(BeNil())
+		})
+
+	})
+
+	Context("with a YAML template with multiple transform macros", func() {
+		template, err := goformation.Open("test/yaml/transform-multiple.yaml")
+
+		It("should parse the template successfully", func() {
+			Expect(template).ToNot(BeNil())
+			Expect(err).To(BeNil())
+		})
+
+		It("should parse transform macro into StringArray field", func() {
+			Expect(*template.Transform.StringArray).To(Equal([]string{"FirstMacro", "SecondMacro"}))
+		})
+
+		It("should String remain nil", func() {
+			Expect(template.Transform.String).To(BeNil())
+		})
+
+	})
+
+	Context("with a SNS event source", func() {
+		event := serverless.Function_Properties{
+			SNSEvent: &serverless.Function_SNSEvent{
+				Topic: NewString("MyTopic"),
+			},
+		}
+
+		It("should marshal properties correctly", func() {
+			bytes, err := event.MarshalJSON()
+			Expect(err).To(BeNil())
+			Expect(string(bytes)).To(Equal(`{"Topic":"MyTopic"}`))
+		})
+	})
+
+	Context("with an SNS event source created from JSON", func() {
+		eventString := `{"Topic":"MyTopic"}`
+		eventJson := []byte(eventString)
+		event := serverless.Function_Properties{}
+		event.UnmarshalJSON(eventJson)
+
+		It("should marshal properties correctly", func() {
+			bytes, err := event.MarshalJSON()
+			Expect(err).To(BeNil())
+			Expect(string(bytes)).To(Equal(eventString))
+		})
+	})
+
+	Context("with a template that contains a reference to another resource within the template", func() {
+
+		template := &cloudformation.Template{
+			Resources: cloudformation.Resources{
+				"TestBucket": &s3.Bucket{
+					BucketName: NewString("test-bucket"),
+				},
+				"TestBucketPolicy": &s3.BucketPolicy{
+					Bucket: MakeRef("TestBucket"),
+				},
+			},
+		}
+
+		It("should have the correct reference object when converted to JSON", func() {
+
+			data, err := template.JSON()
+			Expect(err).To(BeNil())
+
+			var result map[string]interface{}
+			if err := json.Unmarshal(data, &result); err != nil {
+				Fail(err.Error())
+			}
+
+			resources, ok := result["Resources"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			bucket, ok := resources["TestBucketPolicy"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			properties, ok := bucket["Properties"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			reference, ok := properties["Bucket"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			Expect(reference["Ref"]).To(Equal("TestBucket"))
+
+		})
+
+		It("should have the correct reference object when converted to YAML", func() {
+
+			data, err := template.YAML()
+			Expect(err).To(BeNil())
+
+			var result map[string]interface{}
+			if err := yaml.Unmarshal(data, &result); err != nil {
+				Fail(err.Error())
+			}
+
+			resources, ok := result["Resources"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			bucket, ok := resources["TestBucketPolicy"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			properties, ok := bucket["Properties"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			reference, ok := properties["Bucket"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			Expect(reference["Ref"]).To(Equal("TestBucket"))
+
+		})
+
+	})
+
+	Context("with a template that is composed with all of the intrinsics", func() {
+
+		tests := []struct {
+			Name     string
+			Input    *Value
+			Expected *Value
+		}{
+			{
+				Name:  "Ref",
+				Input: MakeRef("test-reference"),
+				Expected: MakeRef(
+					"test-reference",
+				),
+			},
+			{
+				Name:  "Fn::GetAtt",
+				Input: MakeFnGetAtt("resource", NewString("property")),
+				Expected: MakeFnGetAttString(
+					"resource", "property",
+				),
+			},
+			{
+				Name:  "Fn::ImportValue",
+				Input: MakeFnImportValue(NewString("test-import")),
+				Expected: MakeFnImportValueString(
+					"test-import",
+				),
+			},
+			{
+				Name:  "Fn::Cidr",
+				Input: MakeFnCIDR(NewString("test-ip-block"), NewInteger(2), NewInteger(3)),
+				Expected: MakeFnCIDR(
+					NewString("test-ip-block"), NewInteger(2), NewInteger(3),
+				),
+			},
+			{
+				Name: "Fn::Join",
+				Input: MakeFnJoin("test-delimiter", []*Value{
+					NewString("test-join-value-1"), NewString("test-join-value-2"),
+				}),
+				Expected: MakeFnJoin(
+					"test-delimiter",
+					[]*Value{
+						NewString("test-join-value-1"),
+						NewString("test-join-value-2"),
+					},
+				),
+			},
+			{
+				Name: "Fn::Select",
+				Input: MakeFnSelect(NewString(""), NewStringSlice(
+					"test-select-value-1", "test-select-value-2",
+				)),
+				Expected: MakeFnSelect(NewString(""), NewStringSlice(
+					"test-select-value-1", "test-select-value-2",
+				)),
+			},
+			{
+				Name:     "Fn::Split",
+				Input:    MakeFnSplit("test-delimiter", NewString("test-split-source")),
+				Expected: MakeFnSplit("test-delimiter", NewString("test-split-source")),
+			},
+			{
+				Name:  "Fn::Sub",
+				Input: MakeFnSubString("test-sub"),
+				Expected: MakeFnSubString(
+					"test-sub",
+				),
+			},
+			{
+				Name:     "Fn::Equals",
+				Input:    MakeFnEquals(NewString("test-equals-value1"), NewString("test-equals-value2")),
+				Expected: MakeFnEquals(NewString("test-equals-value1"), NewString("test-equals-value2")),
+			},
+			{
+				Name:     "Fn::FindInMap",
+				Input:    MakeFnFindInMap(NewString("test-map"), NewString("test-top-level-key"), NewString("test-second-level-key")),
+				Expected: MakeFnFindInMap(NewString("test-map"), NewString("test-top-level-key"), NewString("test-second-level-key")),
+			},
+			/*{
+				Name:  "Fn::Base64",
+				Input: MakeFnBase64("test-base64"),
+				Expected: map[string]interface{}{
+					"Fn::Base64": "test-base64",
+				},
+			},
+			{
+				Name:  "Fn::GetAZs",
+				Input: MakeFnGetAZs("test-region"),
+				Expected: map[string]interface{}{
+					"Fn::GetAZs": "test-region",
+				},
+			},
+			{
+				Name:  "Fn::And",
+				Input: MakeFnAnd([]string{"test-and-first", "test-and-second", "test-and-third"}),
+				Expected: map[string]interface{}{
+					"Fn::And": []interface{}{"test-and-first", "test-and-second", "test-and-third"},
+				},
+			},
+			{
+				Name:  "Fn::If",
+				Input: MakeFnIf("test-if-value1", "test-iftrue-value", "test-ifnottrue-value"),
+				Expected: map[string]interface{}{
+					"Fn::If": []interface{}{"test-if-value1", "test-iftrue-value", "test-ifnottrue-value"},
+				},
+			},
+			{
+				Name:  "Fn::Not",
+				Input: MakeFnNot([]string{"test-not-value1", "test-not-value2", "test-not-value3"}),
+				Expected: map[string]interface{}{
+					"Fn::Not": []interface{}{"test-not-value1", "test-not-value2", "test-not-value3"},
+				},
+			},
+			{
+				Name:  "Fn::Or",
+				Input: MakeFnOr([]string{"test-or-value1", "test-or-value2", "test-or-value3"}),
+				Expected: map[string]interface{}{
+					"Fn::Or": []interface{}{"test-or-value1", "test-or-value2", "test-or-value3"},
+				},
+			},*/
+		}
+
+		for _, test := range tests {
+			test := test // https://github.com/onsi/ginkgo/issues/175
+			It(test.Name+" should have the correct values", func() {
+
+				template := &cloudformation.Template{
+					Resources: cloudformation.Resources{
+						"TestBucket": &s3.Bucket{
+							BucketName: test.Input,
+						},
+					},
+				}
+
+				data, _ := template.JSON()
+				var result cloudformation.Template
+				err := json.Unmarshal(data, &result)
+				Expect(err).ToNot(HaveOccurred())
+				bucketResource, ok := result.Resources["TestBucket"]
+				Expect(ok).To(BeTrue())
+				bucket, ok := bucketResource.(*s3.Bucket)
+				Expect(ok).To(BeTrue())
+				Expect(bucket.BucketName).To(Equal(test.Expected))
+
+			})
+		}
+
+	})
+
+	Context("with a template that contains nested intrinsics", func() {
+
+		template := &cloudformation.Template{
+			Resources: cloudformation.Resources{
+				"TestBucket": &s3.Bucket{
+					BucketName: MakeFnJoin("/", []*Value{
+						MakeFnJoin("-", []*Value{NewString("test"), NewString("bucket")}),
+					}),
+				},
+			},
+		}
+
+		It("should have the correct nested intrinsics reference object when converted to JSON", func() {
+
+			data, err := template.JSON()
+			Expect(err).To(BeNil())
+
+			var result map[string]interface{}
+			if err := json.Unmarshal(data, &result); err != nil {
+				Fail(err.Error())
+			}
+
+			resources, ok := result["Resources"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			bucket, ok := resources["TestBucket"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			properties, ok := bucket["Properties"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			value, ok := properties["BucketName"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			firstJoin, ok := value["Fn::Join"].([]interface{})
+			Expect(ok).To(BeTrue())
+			Expect(firstJoin).To(HaveLen(2))
+			Expect(firstJoin[0]).To(Equal("/"))
+
+			firstJoinElements, ok := firstJoin[1].([]interface{})
+			Expect(ok).To(BeTrue())
+			Expect(firstJoinElements).To(HaveLen(1))
+
+			firstJoinFirstElement, ok := firstJoinElements[0].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+			Expect(firstJoinFirstElement).To(HaveLen(1))
+
+			secondJoin, ok := firstJoinFirstElement["Fn::Join"].([]interface{})
+			Expect(ok).To(BeTrue())
+			Expect(secondJoin).To(HaveLen(2))
+			Expect(secondJoin[0]).To(Equal("-"))
+
+			secondJoinElements, ok := secondJoin[1].([]interface{})
+			Expect(secondJoinElements).To(HaveLen(2))
+			Expect(secondJoinElements[0]).To(Equal("test"))
+			Expect(secondJoinElements[1]).To(Equal("bucket"))
+
+		})
+
+	})
+
+	Context("with a template that contains a Fn::GetAtt reference to another resource within the template", func() {
+
+		template := &cloudformation.Template{
+			Resources: cloudformation.Resources{
+				"TestBucket": &s3.Bucket{
+					BucketName: NewString("test-bucket"),
+				},
+				"TestBucketPolicy": &s3.BucketPolicy{
+					Bucket: MakeFnGetAtt("TestBucket", NewString("WebsiteURL")),
+				},
+			},
+		}
+
+		It("should have the correct Fn::GetAtt reference object when converted to JSON", func() {
+
+			data, err := template.JSON()
+			Expect(err).To(BeNil())
+
+			var result map[string]interface{}
+			if err := json.Unmarshal(data, &result); err != nil {
+				Fail(err.Error())
+			}
+
+			resources, ok := result["Resources"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			bucket, ok := resources["TestBucketPolicy"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			properties, ok := bucket["Properties"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			reference, ok := properties["Bucket"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			Expect(reference["Fn::GetAtt"]).To(ContainElement("TestBucket"))
+			Expect(reference["Fn::GetAtt"]).To(ContainElement("WebsiteURL"))
+
+		})
+
+		It("should have the correct Fn::GetAtt reference object when converted to YAML", func() {
+
+			data, err := template.YAML()
+			Expect(err).To(BeNil())
+
+			var result map[string]interface{}
+			if err := yaml.Unmarshal(data, &result); err != nil {
+				Fail(err.Error())
+			}
+
+			resources, ok := result["Resources"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			bucket, ok := resources["TestBucketPolicy"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			properties, ok := bucket["Properties"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			reference, ok := properties["Bucket"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			Expect(reference["Fn::GetAtt"]).To(ContainElement("TestBucket"))
+			Expect(reference["Fn::GetAtt"]).To(ContainElement("WebsiteURL"))
+
+		})
+
+	})
+
+	Context("with a template that contains conditional resources", func() {
+
+		template := &cloudformation.Template{
+			Conditions: map[string]interface{}{
+				"MyCondition": MakeFnEquals(MakeRef("MyParam"), NewString("test")),
+			},
+			Resources: cloudformation.Resources{
+				"MySNSTopic": &sns.Topic{
+					TopicName:                  NewString("test-sns-topic-name"),
+					AWSCloudFormationCondition: "MyCondition",
+				},
+			},
+		}
+
+		It("should correctly keep conditional intrinsics", func() {
+			data, err := template.JSON()
+			Expect(err).To(BeNil())
+
+			var result map[string]interface{}
+			if err := json.Unmarshal(data, &result); err != nil {
+				Fail(err.Error())
+			}
+
+			conditions, ok := result["Conditions"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			condition, ok := conditions["MyCondition"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			equal, ok := condition["Fn::Equals"].([]interface{})
+			Expect(ok).To(BeTrue())
+			Expect(equal).To(HaveLen(2))
+
+			refMap, ok := equal[0].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			ref, ok := refMap["Ref"].(interface{})
+			Expect(ok).To(BeTrue())
+			Expect(ref).To(Equal("MyParam"))
+
+			Expect(equal[1]).To(Equal("test"))
+
+			resources, ok := result["Resources"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+
+			topic, ok := resources["MySNSTopic"].(map[string]interface{})
+			Expect(ok).To(BeTrue())
+			Expect(topic).Should(HaveLen(3))
+
+			resCondition, ok := topic["Condition"].(interface{})
+			Expect(ok).To(BeTrue())
+			Expect(resCondition).To(Equal("MyCondition"))
+
+		})
+
+	})
+
+})
diff --git a/goformation/intrinsics/intrinsics.go b/goformation/intrinsics/intrinsics.go
new file mode 100644
index 0000000000..d12f44284e
--- /dev/null
+++ b/goformation/intrinsics/intrinsics.go
@@ -0,0 +1,40 @@
+package intrinsics
+
+import (
+	"fmt"
+
+	yamlwrapper "github.com/sanathkr/yaml"
+)
+
+// IntrinsicHandler is a function that applies an intrinsic function and returns
+// the response that should be placed in it's place. An intrinsic handler function
+// is passed the name of the intrinsic function (e.g. Fn::Join), and the object
+// to apply it to (as an interface{}), and should return the resolved object (as an interface{}).
+type IntrinsicHandler func(string, interface{}, interface{}) interface{}
+
+// ProcessorOptions allows customisation of the intrinsic function processor behaviour.
+// This allows disabling the processing of intrinsics,
+// overriding of the handlers for each intrinsic function type,
+// and overriding template parameters.
+type ProcessorOptions struct {
+	IntrinsicHandlerOverrides map[string]IntrinsicHandler
+	ParameterOverrides        map[string]interface{}
+	NoProcess                 bool
+	ProcessOnlyGlobals        bool
+	EvaluateConditions        bool
+}
+
+// ProcessYAML recursively searches through a byte array of JSON data for all
+// AWS CloudFormation intrinsic functions, resolves them, and then returns
+// the resulting  interface{} object.
+func ProcessYAML(input []byte, options *ProcessorOptions) ([]byte, error) {
+
+	// Convert short form intrinsic functions (e.g. !Sub) to long form
+	registerTagMarshallers()
+
+	data, err := yamlwrapper.YAMLToJSON(input)
+	if err != nil {
+		return nil, fmt.Errorf("invalid YAML template: %s", err)
+	}
+	return data, nil
+}
diff --git a/goformation/intrinsics/intrinsics_suite_test.go b/goformation/intrinsics/intrinsics_suite_test.go
new file mode 100644
index 0000000000..eb6cfd9fed
--- /dev/null
+++ b/goformation/intrinsics/intrinsics_suite_test.go
@@ -0,0 +1,13 @@
+package intrinsics_test
+
+import (
+	. "github.com/onsi/ginkgo"
+	. "github.com/onsi/gomega"
+
+	"testing"
+)
+
+func TestIntrinsics(t *testing.T) {
+	RegisterFailHandler(Fail)
+	RunSpecs(t, "Intrinsics Suite")
+}
diff --git a/goformation/intrinsics/tags.go b/goformation/intrinsics/tags.go
new file mode 100644
index 0000000000..151f99983a
--- /dev/null
+++ b/goformation/intrinsics/tags.go
@@ -0,0 +1,47 @@
+package intrinsics
+
+import (
+	"reflect"
+
+	yaml "github.com/sanathkr/go-yaml"
+)
+
+var allTags = []string{
+	"Ref", "GetAtt", "Base64", "FindInMap", "GetAZs",
+	"ImportValue", "Join", "Select", "Split", "Sub",
+	"Equals", "Cidr", "And", "If", "Not", "Or",
+}
+
+type tagUnmarshalerType struct {
+}
+
+func (t *tagUnmarshalerType) UnmarshalYAMLTag(tag string, fieldValue reflect.Value) reflect.Value {
+
+	prefix := "Fn::"
+	if tag == "Ref" || tag == "Condition" {
+		prefix = ""
+	}
+
+	tag = prefix + tag
+
+	output := reflect.ValueOf(make(map[interface{}]interface{}))
+	key := reflect.ValueOf(tag)
+
+	output.SetMapIndex(key, fieldValue)
+
+	return output
+}
+
+var tagUnmarshaller = &tagUnmarshalerType{}
+
+func registerTagMarshallers() {
+	for _, tag := range allTags {
+		yaml.RegisterTagUnmarshaler("!"+tag, tagUnmarshaller)
+	}
+}
+
+func unregisterTagMarshallers() {
+	for _, tag := range allTags {
+		yaml.UnRegisterTagUnmarshaler("!" + tag)
+	}
+}
diff --git a/goformation/schema/README.md b/goformation/schema/README.md
new file mode 100644
index 0000000000..64136ad107
--- /dev/null
+++ b/goformation/schema/README.md
@@ -0,0 +1,5 @@
+### Important
+
+The JSON Schema in this directory is auto-generated by running 'go generate' in the repository root directory.
+
+Do not manually edit it.
\ No newline at end of file
diff --git a/goformation/schema/cloudformation.go b/goformation/schema/cloudformation.go
new file mode 100644
index 0000000000..35a26e65c2
--- /dev/null
+++ b/goformation/schema/cloudformation.go
@@ -0,0 +1,124432 @@
+package schema
+
+// CloudformationSchema defined a JSON Schema that can be used to validate CloudFormation/SAM templates
+var CloudformationSchema = `{
+    "$id": "http://json-schema.org/draft-04/schema#",
+    "additionalProperties": false,
+    "definitions": {
+        "AWS::ACMPCA::Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiPassthrough": {
+                            "$ref": "#/definitions/AWS::ACMPCA::Certificate.ApiPassthrough"
+                        },
+                        "CertificateAuthorityArn": {
+                            "type": "string"
+                        },
+                        "CertificateSigningRequest": {
+                            "type": "string"
+                        },
+                        "SigningAlgorithm": {
+                            "type": "string"
+                        },
+                        "TemplateArn": {
+                            "type": "string"
+                        },
+                        "Validity": {
+                            "$ref": "#/definitions/AWS::ACMPCA::Certificate.Validity"
+                        },
+                        "ValidityNotBefore": {
+                            "$ref": "#/definitions/AWS::ACMPCA::Certificate.Validity"
+                        }
+                    },
+                    "required": [
+                        "CertificateAuthorityArn",
+                        "CertificateSigningRequest",
+                        "SigningAlgorithm",
+                        "Validity"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ACMPCA::Certificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.ApiPassthrough": {
+            "additionalProperties": false,
+            "properties": {
+                "Extensions": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.Extensions"
+                },
+                "Subject": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.Subject"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.EdiPartyName": {
+            "additionalProperties": false,
+            "properties": {
+                "NameAssigner": {
+                    "type": "string"
+                },
+                "PartyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NameAssigner",
+                "PartyName"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.ExtendedKeyUsage": {
+            "additionalProperties": false,
+            "properties": {
+                "ExtendedKeyUsageObjectIdentifier": {
+                    "type": "string"
+                },
+                "ExtendedKeyUsageType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.Extensions": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificatePolicies": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ACMPCA::Certificate.PolicyInformation"
+                    },
+                    "type": "array"
+                },
+                "ExtendedKeyUsage": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ACMPCA::Certificate.ExtendedKeyUsage"
+                    },
+                    "type": "array"
+                },
+                "KeyUsage": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.KeyUsage"
+                },
+                "SubjectAlternativeNames": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ACMPCA::Certificate.GeneralName"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.GeneralName": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.Subject"
+                },
+                "DnsName": {
+                    "type": "string"
+                },
+                "EdiPartyName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.EdiPartyName"
+                },
+                "IpAddress": {
+                    "type": "string"
+                },
+                "OtherName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.OtherName"
+                },
+                "RegisteredId": {
+                    "type": "string"
+                },
+                "Rfc822Name": {
+                    "type": "string"
+                },
+                "UniformResourceIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.KeyUsage": {
+            "additionalProperties": false,
+            "properties": {
+                "CRLSign": {
+                    "type": "boolean"
+                },
+                "DataEncipherment": {
+                    "type": "boolean"
+                },
+                "DecipherOnly": {
+                    "type": "boolean"
+                },
+                "DigitalSignature": {
+                    "type": "boolean"
+                },
+                "EncipherOnly": {
+                    "type": "boolean"
+                },
+                "KeyAgreement": {
+                    "type": "boolean"
+                },
+                "KeyCertSign": {
+                    "type": "boolean"
+                },
+                "KeyEncipherment": {
+                    "type": "boolean"
+                },
+                "NonRepudiation": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.OtherName": {
+            "additionalProperties": false,
+            "properties": {
+                "TypeId": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TypeId",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.PolicyInformation": {
+            "additionalProperties": false,
+            "properties": {
+                "CertPolicyId": {
+                    "type": "string"
+                },
+                "PolicyQualifiers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ACMPCA::Certificate.PolicyQualifierInfo"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CertPolicyId"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.PolicyQualifierInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "PolicyQualifierId": {
+                    "type": "string"
+                },
+                "Qualifier": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.Qualifier"
+                }
+            },
+            "required": [
+                "PolicyQualifierId",
+                "Qualifier"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.Qualifier": {
+            "additionalProperties": false,
+            "properties": {
+                "CpsUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CpsUri"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.Subject": {
+            "additionalProperties": false,
+            "properties": {
+                "CommonName": {
+                    "type": "string"
+                },
+                "Country": {
+                    "type": "string"
+                },
+                "DistinguishedNameQualifier": {
+                    "type": "string"
+                },
+                "GenerationQualifier": {
+                    "type": "string"
+                },
+                "GivenName": {
+                    "type": "string"
+                },
+                "Initials": {
+                    "type": "string"
+                },
+                "Locality": {
+                    "type": "string"
+                },
+                "Organization": {
+                    "type": "string"
+                },
+                "OrganizationalUnit": {
+                    "type": "string"
+                },
+                "Pseudonym": {
+                    "type": "string"
+                },
+                "SerialNumber": {
+                    "type": "string"
+                },
+                "State": {
+                    "type": "string"
+                },
+                "Surname": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.Validity": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CsrExtensions": {
+                            "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.CsrExtensions"
+                        },
+                        "KeyAlgorithm": {
+                            "type": "string"
+                        },
+                        "KeyStorageSecurityStandard": {
+                            "type": "string"
+                        },
+                        "RevocationConfiguration": {
+                            "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.RevocationConfiguration"
+                        },
+                        "SigningAlgorithm": {
+                            "type": "string"
+                        },
+                        "Subject": {
+                            "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.Subject"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "KeyAlgorithm",
+                        "SigningAlgorithm",
+                        "Subject",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ACMPCA::CertificateAuthority"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.AccessDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessLocation": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.GeneralName"
+                },
+                "AccessMethod": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.AccessMethod"
+                }
+            },
+            "required": [
+                "AccessLocation",
+                "AccessMethod"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.AccessMethod": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessMethodType": {
+                    "type": "string"
+                },
+                "CustomObjectIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.CrlConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomCname": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "ExpirationInDays": {
+                    "type": "number"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3ObjectAcl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.CsrExtensions": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyUsage": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.KeyUsage"
+                },
+                "SubjectInformationAccess": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.AccessDescription"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.EdiPartyName": {
+            "additionalProperties": false,
+            "properties": {
+                "NameAssigner": {
+                    "type": "string"
+                },
+                "PartyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NameAssigner",
+                "PartyName"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.GeneralName": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.Subject"
+                },
+                "DnsName": {
+                    "type": "string"
+                },
+                "EdiPartyName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.EdiPartyName"
+                },
+                "IpAddress": {
+                    "type": "string"
+                },
+                "OtherName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.OtherName"
+                },
+                "RegisteredId": {
+                    "type": "string"
+                },
+                "Rfc822Name": {
+                    "type": "string"
+                },
+                "UniformResourceIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.KeyUsage": {
+            "additionalProperties": false,
+            "properties": {
+                "CRLSign": {
+                    "type": "boolean"
+                },
+                "DataEncipherment": {
+                    "type": "boolean"
+                },
+                "DecipherOnly": {
+                    "type": "boolean"
+                },
+                "DigitalSignature": {
+                    "type": "boolean"
+                },
+                "EncipherOnly": {
+                    "type": "boolean"
+                },
+                "KeyAgreement": {
+                    "type": "boolean"
+                },
+                "KeyCertSign": {
+                    "type": "boolean"
+                },
+                "KeyEncipherment": {
+                    "type": "boolean"
+                },
+                "NonRepudiation": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.OcspConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "OcspCustomCname": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.OtherName": {
+            "additionalProperties": false,
+            "properties": {
+                "TypeId": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TypeId",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.RevocationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrlConfiguration": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.CrlConfiguration"
+                },
+                "OcspConfiguration": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.OcspConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.Subject": {
+            "additionalProperties": false,
+            "properties": {
+                "CommonName": {
+                    "type": "string"
+                },
+                "Country": {
+                    "type": "string"
+                },
+                "DistinguishedNameQualifier": {
+                    "type": "string"
+                },
+                "GenerationQualifier": {
+                    "type": "string"
+                },
+                "GivenName": {
+                    "type": "string"
+                },
+                "Initials": {
+                    "type": "string"
+                },
+                "Locality": {
+                    "type": "string"
+                },
+                "Organization": {
+                    "type": "string"
+                },
+                "OrganizationalUnit": {
+                    "type": "string"
+                },
+                "Pseudonym": {
+                    "type": "string"
+                },
+                "SerialNumber": {
+                    "type": "string"
+                },
+                "State": {
+                    "type": "string"
+                },
+                "Surname": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthorityActivation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "CertificateAuthorityArn": {
+                            "type": "string"
+                        },
+                        "CertificateChain": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Certificate",
+                        "CertificateAuthorityArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ACMPCA::CertificateAuthorityActivation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Permission": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "CertificateAuthorityArn": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        },
+                        "SourceAccount": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Actions",
+                        "CertificateAuthorityArn",
+                        "Principal"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ACMPCA::Permission"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::APS::RuleGroupsNamespace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Data": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Workspace": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Data",
+                        "Name",
+                        "Workspace"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::APS::RuleGroupsNamespace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::APS::Workspace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AlertManagerDefinition": {
+                            "type": "string"
+                        },
+                        "Alias": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::APS::Workspace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AccessAnalyzer::Analyzer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AnalyzerName": {
+                            "type": "string"
+                        },
+                        "ArchiveRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AccessAnalyzer::Analyzer.ArchiveRule"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AccessAnalyzer::Analyzer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AccessAnalyzer::Analyzer.ArchiveRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Filter": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AccessAnalyzer::Analyzer.Filter"
+                    },
+                    "type": "array"
+                },
+                "RuleName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Filter",
+                "RuleName"
+            ],
+            "type": "object"
+        },
+        "AWS::AccessAnalyzer::Analyzer.Filter": {
+            "additionalProperties": false,
+            "properties": {
+                "Contains": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Eq": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Exists": {
+                    "type": "boolean"
+                },
+                "Neq": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Property": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Property"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationStrategy": {
+                            "type": "string"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "BrokerName": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker.ConfigurationId"
+                        },
+                        "DeploymentMode": {
+                            "type": "string"
+                        },
+                        "EncryptionOptions": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker.EncryptionOptions"
+                        },
+                        "EngineType": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "HostInstanceType": {
+                            "type": "string"
+                        },
+                        "LdapServerMetadata": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker.LdapServerMetadata"
+                        },
+                        "Logs": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker.LogList"
+                        },
+                        "MaintenanceWindowStartTime": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker.MaintenanceWindow"
+                        },
+                        "PubliclyAccessible": {
+                            "type": "boolean"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "StorageType": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmazonMQ::Broker.TagsEntry"
+                            },
+                            "type": "array"
+                        },
+                        "Users": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmazonMQ::Broker.User"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AutoMinorVersionUpgrade",
+                        "BrokerName",
+                        "DeploymentMode",
+                        "EngineType",
+                        "EngineVersion",
+                        "HostInstanceType",
+                        "PubliclyAccessible",
+                        "Users"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AmazonMQ::Broker"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.ConfigurationId": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Revision": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Id",
+                "Revision"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.EncryptionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "UseAwsOwnedKey": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "UseAwsOwnedKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.LdapServerMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Hosts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RoleBase": {
+                    "type": "string"
+                },
+                "RoleName": {
+                    "type": "string"
+                },
+                "RoleSearchMatching": {
+                    "type": "string"
+                },
+                "RoleSearchSubtree": {
+                    "type": "boolean"
+                },
+                "ServiceAccountPassword": {
+                    "type": "string"
+                },
+                "ServiceAccountUsername": {
+                    "type": "string"
+                },
+                "UserBase": {
+                    "type": "string"
+                },
+                "UserRoleName": {
+                    "type": "string"
+                },
+                "UserSearchMatching": {
+                    "type": "string"
+                },
+                "UserSearchSubtree": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Hosts",
+                "RoleBase",
+                "RoleSearchMatching",
+                "ServiceAccountPassword",
+                "ServiceAccountUsername",
+                "UserBase",
+                "UserSearchMatching"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.LogList": {
+            "additionalProperties": false,
+            "properties": {
+                "Audit": {
+                    "type": "boolean"
+                },
+                "General": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.MaintenanceWindow": {
+            "additionalProperties": false,
+            "properties": {
+                "DayOfWeek": {
+                    "type": "string"
+                },
+                "TimeOfDay": {
+                    "type": "string"
+                },
+                "TimeZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DayOfWeek",
+                "TimeOfDay",
+                "TimeZone"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.User": {
+            "additionalProperties": false,
+            "properties": {
+                "ConsoleAccess": {
+                    "type": "boolean"
+                },
+                "Groups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationStrategy": {
+                            "type": "string"
+                        },
+                        "Data": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EngineType": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmazonMQ::Configuration.TagsEntry"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Data",
+                        "EngineType",
+                        "EngineVersion",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AmazonMQ::Configuration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Configuration.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::ConfigurationAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Broker": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::ConfigurationAssociation.ConfigurationId"
+                        }
+                    },
+                    "required": [
+                        "Broker",
+                        "Configuration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AmazonMQ::ConfigurationAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::ConfigurationAssociation.ConfigurationId": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Revision": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Id",
+                "Revision"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::App": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessToken": {
+                            "type": "string"
+                        },
+                        "AutoBranchCreationConfig": {
+                            "$ref": "#/definitions/AWS::Amplify::App.AutoBranchCreationConfig"
+                        },
+                        "BasicAuthConfig": {
+                            "$ref": "#/definitions/AWS::Amplify::App.BasicAuthConfig"
+                        },
+                        "BuildSpec": {
+                            "type": "string"
+                        },
+                        "CustomHeaders": {
+                            "type": "string"
+                        },
+                        "CustomRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Amplify::App.CustomRule"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnableBranchAutoDeletion": {
+                            "type": "boolean"
+                        },
+                        "EnvironmentVariables": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Amplify::App.EnvironmentVariable"
+                            },
+                            "type": "array"
+                        },
+                        "IAMServiceRole": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OauthToken": {
+                            "type": "string"
+                        },
+                        "Repository": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Amplify::App"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::App.AutoBranchCreationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoBranchCreationPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BasicAuthConfig": {
+                    "$ref": "#/definitions/AWS::Amplify::App.BasicAuthConfig"
+                },
+                "BuildSpec": {
+                    "type": "string"
+                },
+                "EnableAutoBranchCreation": {
+                    "type": "boolean"
+                },
+                "EnableAutoBuild": {
+                    "type": "boolean"
+                },
+                "EnablePerformanceMode": {
+                    "type": "boolean"
+                },
+                "EnablePullRequestPreview": {
+                    "type": "boolean"
+                },
+                "EnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Amplify::App.EnvironmentVariable"
+                    },
+                    "type": "array"
+                },
+                "PullRequestEnvironmentName": {
+                    "type": "string"
+                },
+                "Stage": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Amplify::App.BasicAuthConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableBasicAuth": {
+                    "type": "boolean"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Amplify::App.CustomRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Source",
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::App.EnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::Branch": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppId": {
+                            "type": "string"
+                        },
+                        "BasicAuthConfig": {
+                            "$ref": "#/definitions/AWS::Amplify::Branch.BasicAuthConfig"
+                        },
+                        "BranchName": {
+                            "type": "string"
+                        },
+                        "BuildSpec": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnableAutoBuild": {
+                            "type": "boolean"
+                        },
+                        "EnablePerformanceMode": {
+                            "type": "boolean"
+                        },
+                        "EnablePullRequestPreview": {
+                            "type": "boolean"
+                        },
+                        "EnvironmentVariables": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Amplify::Branch.EnvironmentVariable"
+                            },
+                            "type": "array"
+                        },
+                        "PullRequestEnvironmentName": {
+                            "type": "string"
+                        },
+                        "Stage": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AppId",
+                        "BranchName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Amplify::Branch"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::Branch.BasicAuthConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableBasicAuth": {
+                    "type": "boolean"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::Branch.EnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppId": {
+                            "type": "string"
+                        },
+                        "AutoSubDomainCreationPatterns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AutoSubDomainIAMRole": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EnableAutoSubDomain": {
+                            "type": "boolean"
+                        },
+                        "SubDomainSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Amplify::Domain.SubDomainSetting"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AppId",
+                        "DomainName",
+                        "SubDomainSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Amplify::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::Domain.SubDomainSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "BranchName": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BranchName",
+                "Prefix"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BindingProperties": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValue"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Children": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentChild"
+                            },
+                            "type": "array"
+                        },
+                        "CollectionProperties": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentDataConfiguration"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ComponentType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Overrides": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentOverridesValue"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Properties": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentProperty"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "SourceId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Variants": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentVariant"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AmplifyUIBuilder::Component"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValue": {
+            "additionalProperties": false,
+            "properties": {
+                "BindingProperties": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValueProperties"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValueProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Field": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Model": {
+                    "type": "string"
+                },
+                "Predicates": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.Predicate"
+                    },
+                    "type": "array"
+                },
+                "UserAttribute": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentChild": {
+            "additionalProperties": false,
+            "properties": {
+                "Children": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentChild"
+                    },
+                    "type": "array"
+                },
+                "ComponentType": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Properties": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentProperties"
+                }
+            },
+            "required": [
+                "ComponentType",
+                "Name",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentConditionProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Else": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentProperty"
+                },
+                "Field": {
+                    "type": "string"
+                },
+                "Operand": {
+                    "type": "string"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Property": {
+                    "type": "string"
+                },
+                "Then": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentProperty"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentDataConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Identifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Model": {
+                    "type": "string"
+                },
+                "Predicate": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.Predicate"
+                },
+                "Sort": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.SortProperty"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Model"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentOverrides": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentOverridesValue": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentProperties": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "BindingProperties": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentPropertyBindingProperties"
+                },
+                "Bindings": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.FormBindings"
+                },
+                "CollectionBindingProperties": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentPropertyBindingProperties"
+                },
+                "Concat": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentProperty"
+                    },
+                    "type": "array"
+                },
+                "Condition": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentConditionProperty"
+                },
+                "Configured": {
+                    "type": "boolean"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Event": {
+                    "type": "string"
+                },
+                "ImportedValue": {
+                    "type": "string"
+                },
+                "Model": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "UserAttribute": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentPropertyBindingProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Field": {
+                    "type": "string"
+                },
+                "Property": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Property"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "Overrides": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentOverrides"
+                },
+                "VariantValues": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentVariantValues"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentVariantValues": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.FormBindings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.Predicate": {
+            "additionalProperties": false,
+            "properties": {
+                "And": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.Predicate"
+                    },
+                    "type": "array"
+                },
+                "Field": {
+                    "type": "string"
+                },
+                "Operand": {
+                    "type": "string"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Or": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.Predicate"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.SortProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Direction": {
+                    "type": "string"
+                },
+                "Field": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Direction",
+                "Field"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Theme": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Overrides": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmplifyUIBuilder::Theme.ThemeValues"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Values": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmplifyUIBuilder::Theme.ThemeValues"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Values"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AmplifyUIBuilder::Theme"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Theme.ThemeValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Children": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Theme.ThemeValues"
+                    },
+                    "type": "array"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Theme.ThemeValues": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Theme.ThemeValue"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Account": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CloudWatchRoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Account"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::ApiKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomerId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "GenerateDistinctId": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "StageKeys": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApiGateway::ApiKey.StageKey"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Value": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::ApiKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::ApiKey.StageKey": {
+            "additionalProperties": false,
+            "properties": {
+                "RestApiId": {
+                    "type": "string"
+                },
+                "StageName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Authorizer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthType": {
+                            "type": "string"
+                        },
+                        "AuthorizerCredentials": {
+                            "type": "string"
+                        },
+                        "AuthorizerResultTtlInSeconds": {
+                            "type": "number"
+                        },
+                        "AuthorizerUri": {
+                            "type": "string"
+                        },
+                        "IdentitySource": {
+                            "type": "string"
+                        },
+                        "IdentityValidationExpression": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ProviderARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "RestApiId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Authorizer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::BasePathMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BasePath": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "Stage": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::BasePathMapping"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::ClientCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::ClientCertificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeploymentCanarySettings": {
+                            "$ref": "#/definitions/AWS::ApiGateway::Deployment.DeploymentCanarySettings"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "StageDescription": {
+                            "$ref": "#/definitions/AWS::ApiGateway::Deployment.StageDescription"
+                        },
+                        "StageName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Deployment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment.AccessLogSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment.CanarySetting": {
+            "additionalProperties": false,
+            "properties": {
+                "PercentTraffic": {
+                    "type": "number"
+                },
+                "StageVariableOverrides": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "UseStageCache": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment.DeploymentCanarySettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PercentTraffic": {
+                    "type": "number"
+                },
+                "StageVariableOverrides": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "UseStageCache": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment.MethodSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "CacheDataEncrypted": {
+                    "type": "boolean"
+                },
+                "CacheTtlInSeconds": {
+                    "type": "number"
+                },
+                "CachingEnabled": {
+                    "type": "boolean"
+                },
+                "DataTraceEnabled": {
+                    "type": "boolean"
+                },
+                "HttpMethod": {
+                    "type": "string"
+                },
+                "LoggingLevel": {
+                    "type": "string"
+                },
+                "MetricsEnabled": {
+                    "type": "boolean"
+                },
+                "ResourcePath": {
+                    "type": "string"
+                },
+                "ThrottlingBurstLimit": {
+                    "type": "number"
+                },
+                "ThrottlingRateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment.StageDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessLogSetting": {
+                    "$ref": "#/definitions/AWS::ApiGateway::Deployment.AccessLogSetting"
+                },
+                "CacheClusterEnabled": {
+                    "type": "boolean"
+                },
+                "CacheClusterSize": {
+                    "type": "string"
+                },
+                "CacheDataEncrypted": {
+                    "type": "boolean"
+                },
+                "CacheTtlInSeconds": {
+                    "type": "number"
+                },
+                "CachingEnabled": {
+                    "type": "boolean"
+                },
+                "CanarySetting": {
+                    "$ref": "#/definitions/AWS::ApiGateway::Deployment.CanarySetting"
+                },
+                "ClientCertificateId": {
+                    "type": "string"
+                },
+                "DataTraceEnabled": {
+                    "type": "boolean"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DocumentationVersion": {
+                    "type": "string"
+                },
+                "LoggingLevel": {
+                    "type": "string"
+                },
+                "MethodSettings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApiGateway::Deployment.MethodSetting"
+                    },
+                    "type": "array"
+                },
+                "MetricsEnabled": {
+                    "type": "boolean"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                },
+                "ThrottlingBurstLimit": {
+                    "type": "number"
+                },
+                "ThrottlingRateLimit": {
+                    "type": "number"
+                },
+                "TracingEnabled": {
+                    "type": "boolean"
+                },
+                "Variables": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::DocumentationPart": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Location": {
+                            "$ref": "#/definitions/AWS::ApiGateway::DocumentationPart.Location"
+                        },
+                        "Properties": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Location",
+                        "Properties",
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::DocumentationPart"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::DocumentationPart.Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Method": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::DocumentationVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DocumentationVersion": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DocumentationVersion",
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::DocumentationVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::DomainName": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CertificateArn": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EndpointConfiguration": {
+                            "$ref": "#/definitions/AWS::ApiGateway::DomainName.EndpointConfiguration"
+                        },
+                        "MutualTlsAuthentication": {
+                            "$ref": "#/definitions/AWS::ApiGateway::DomainName.MutualTlsAuthentication"
+                        },
+                        "OwnershipVerificationCertificateArn": {
+                            "type": "string"
+                        },
+                        "RegionalCertificateArn": {
+                            "type": "string"
+                        },
+                        "SecurityPolicy": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::DomainName"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::DomainName.EndpointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Types": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::DomainName.MutualTlsAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "TruststoreUri": {
+                    "type": "string"
+                },
+                "TruststoreVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::GatewayResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResponseParameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ResponseTemplates": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ResponseType": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "StatusCode": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResponseType",
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::GatewayResponse"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Method": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiKeyRequired": {
+                            "type": "boolean"
+                        },
+                        "AuthorizationScopes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AuthorizationType": {
+                            "type": "string"
+                        },
+                        "AuthorizerId": {
+                            "type": "string"
+                        },
+                        "HttpMethod": {
+                            "type": "string"
+                        },
+                        "Integration": {
+                            "$ref": "#/definitions/AWS::ApiGateway::Method.Integration"
+                        },
+                        "MethodResponses": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApiGateway::Method.MethodResponse"
+                            },
+                            "type": "array"
+                        },
+                        "OperationName": {
+                            "type": "string"
+                        },
+                        "RequestModels": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "RequestParameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "boolean"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "RequestValidatorId": {
+                            "type": "string"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "HttpMethod",
+                        "ResourceId",
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Method"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Method.Integration": {
+            "additionalProperties": false,
+            "properties": {
+                "CacheKeyParameters": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CacheNamespace": {
+                    "type": "string"
+                },
+                "ConnectionId": {
+                    "type": "string"
+                },
+                "ConnectionType": {
+                    "type": "string"
+                },
+                "ContentHandling": {
+                    "type": "string"
+                },
+                "Credentials": {
+                    "type": "string"
+                },
+                "IntegrationHttpMethod": {
+                    "type": "string"
+                },
+                "IntegrationResponses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApiGateway::Method.IntegrationResponse"
+                    },
+                    "type": "array"
+                },
+                "PassthroughBehavior": {
+                    "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"
+                },
+                "TimeoutInMillis": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Method.IntegrationResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentHandling": {
+                    "type": "string"
+                },
+                "ResponseParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ResponseTemplates": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "SelectionPattern": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Method.MethodResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "ResponseModels": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ResponseParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "boolean"
+                        }
+                    },
+                    "type": "object"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Model": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContentType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "Schema": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Model"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::RequestValidator": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "ValidateRequestBody": {
+                            "type": "boolean"
+                        },
+                        "ValidateRequestParameters": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::RequestValidator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Resource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ParentId": {
+                            "type": "string"
+                        },
+                        "PathPart": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ParentId",
+                        "PathPart",
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Resource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::RestApi": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiKeySourceType": {
+                            "type": "string"
+                        },
+                        "BinaryMediaTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Body": {
+                            "type": "object"
+                        },
+                        "BodyS3Location": {
+                            "$ref": "#/definitions/AWS::ApiGateway::RestApi.S3Location"
+                        },
+                        "CloneFrom": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisableExecuteApiEndpoint": {
+                            "type": "boolean"
+                        },
+                        "EndpointConfiguration": {
+                            "$ref": "#/definitions/AWS::ApiGateway::RestApi.EndpointConfiguration"
+                        },
+                        "FailOnWarnings": {
+                            "type": "boolean"
+                        },
+                        "MinimumCompressionSize": {
+                            "type": "number"
+                        },
+                        "Mode": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Policy": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::RestApi"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::RestApi.EndpointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Types": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcEndpointIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::RestApi.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "ETag": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Stage": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessLogSetting": {
+                            "$ref": "#/definitions/AWS::ApiGateway::Stage.AccessLogSetting"
+                        },
+                        "CacheClusterEnabled": {
+                            "type": "boolean"
+                        },
+                        "CacheClusterSize": {
+                            "type": "string"
+                        },
+                        "CanarySetting": {
+                            "$ref": "#/definitions/AWS::ApiGateway::Stage.CanarySetting"
+                        },
+                        "ClientCertificateId": {
+                            "type": "string"
+                        },
+                        "DeploymentId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DocumentationVersion": {
+                            "type": "string"
+                        },
+                        "MethodSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApiGateway::Stage.MethodSetting"
+                            },
+                            "type": "array"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "StageName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TracingEnabled": {
+                            "type": "boolean"
+                        },
+                        "Variables": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Stage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Stage.AccessLogSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Stage.CanarySetting": {
+            "additionalProperties": false,
+            "properties": {
+                "DeploymentId": {
+                    "type": "string"
+                },
+                "PercentTraffic": {
+                    "type": "number"
+                },
+                "StageVariableOverrides": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "UseStageCache": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Stage.MethodSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "CacheDataEncrypted": {
+                    "type": "boolean"
+                },
+                "CacheTtlInSeconds": {
+                    "type": "number"
+                },
+                "CachingEnabled": {
+                    "type": "boolean"
+                },
+                "DataTraceEnabled": {
+                    "type": "boolean"
+                },
+                "HttpMethod": {
+                    "type": "string"
+                },
+                "LoggingLevel": {
+                    "type": "string"
+                },
+                "MetricsEnabled": {
+                    "type": "boolean"
+                },
+                "ResourcePath": {
+                    "type": "string"
+                },
+                "ThrottlingBurstLimit": {
+                    "type": "number"
+                },
+                "ThrottlingRateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::UsagePlan": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiStages": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApiGateway::UsagePlan.ApiStage"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Quota": {
+                            "$ref": "#/definitions/AWS::ApiGateway::UsagePlan.QuotaSettings"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Throttle": {
+                            "$ref": "#/definitions/AWS::ApiGateway::UsagePlan.ThrottleSettings"
+                        },
+                        "UsagePlanName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::UsagePlan"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::UsagePlan.ApiStage": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiId": {
+                    "type": "string"
+                },
+                "Stage": {
+                    "type": "string"
+                },
+                "Throttle": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::ApiGateway::UsagePlan.ThrottleSettings"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::UsagePlan.QuotaSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Limit": {
+                    "type": "number"
+                },
+                "Offset": {
+                    "type": "number"
+                },
+                "Period": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::UsagePlan.ThrottleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "BurstLimit": {
+                    "type": "number"
+                },
+                "RateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::UsagePlanKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "KeyId": {
+                            "type": "string"
+                        },
+                        "KeyType": {
+                            "type": "string"
+                        },
+                        "UsagePlanId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "KeyId",
+                        "KeyType",
+                        "UsagePlanId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::UsagePlanKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::VpcLink": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "TargetArns"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::VpcLink"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Api": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiKeySelectionExpression": {
+                            "type": "string"
+                        },
+                        "BasePath": {
+                            "type": "string"
+                        },
+                        "Body": {
+                            "type": "object"
+                        },
+                        "BodyS3Location": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Api.BodyS3Location"
+                        },
+                        "CorsConfiguration": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Api.Cors"
+                        },
+                        "CredentialsArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisableExecuteApiEndpoint": {
+                            "type": "boolean"
+                        },
+                        "DisableSchemaValidation": {
+                            "type": "boolean"
+                        },
+                        "FailOnWarnings": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ProtocolType": {
+                            "type": "string"
+                        },
+                        "RouteKey": {
+                            "type": "string"
+                        },
+                        "RouteSelectionExpression": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Target": {
+                            "type": "string"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Api"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Api.BodyS3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Etag": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Api.Cors": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowCredentials": {
+                    "type": "boolean"
+                },
+                "AllowHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowOrigins": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExposeHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaxAge": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "Integration": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides.IntegrationOverrides"
+                        },
+                        "Route": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteOverrides"
+                        },
+                        "Stage": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides.StageOverrides"
+                        }
+                    },
+                    "required": [
+                        "ApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.AccessLogSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.IntegrationOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "IntegrationMethod": {
+                    "type": "string"
+                },
+                "PayloadFormatVersion": {
+                    "type": "string"
+                },
+                "TimeoutInMillis": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationScopes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AuthorizationType": {
+                    "type": "string"
+                },
+                "AuthorizerId": {
+                    "type": "string"
+                },
+                "OperationName": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DataTraceEnabled": {
+                    "type": "boolean"
+                },
+                "DetailedMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "LoggingLevel": {
+                    "type": "string"
+                },
+                "ThrottlingBurstLimit": {
+                    "type": "number"
+                },
+                "ThrottlingRateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.StageOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessLogSettings": {
+                    "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides.AccessLogSettings"
+                },
+                "AutoDeploy": {
+                    "type": "boolean"
+                },
+                "DefaultRouteSettings": {
+                    "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteSettings"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "RouteSettings": {
+                    "type": "object"
+                },
+                "StageVariables": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ApiMappingKey": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "Stage": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "DomainName",
+                        "Stage"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::ApiMapping"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Authorizer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "AuthorizerCredentialsArn": {
+                            "type": "string"
+                        },
+                        "AuthorizerPayloadFormatVersion": {
+                            "type": "string"
+                        },
+                        "AuthorizerResultTtlInSeconds": {
+                            "type": "number"
+                        },
+                        "AuthorizerType": {
+                            "type": "string"
+                        },
+                        "AuthorizerUri": {
+                            "type": "string"
+                        },
+                        "EnableSimpleResponses": {
+                            "type": "boolean"
+                        },
+                        "IdentitySource": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "IdentityValidationExpression": {
+                            "type": "string"
+                        },
+                        "JwtConfiguration": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Authorizer.JWTConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "AuthorizerType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Authorizer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Authorizer.JWTConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Audience": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Issuer": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Deployment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "StageName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Deployment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::DomainName": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DomainNameConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApiGatewayV2::DomainName.DomainNameConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "MutualTlsAuthentication": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::DomainName.MutualTlsAuthentication"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::DomainName"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::DomainName.DomainNameConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "CertificateName": {
+                    "type": "string"
+                },
+                "EndpointType": {
+                    "type": "string"
+                },
+                "OwnershipVerificationCertificateArn": {
+                    "type": "string"
+                },
+                "SecurityPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::DomainName.MutualTlsAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "TruststoreUri": {
+                    "type": "string"
+                },
+                "TruststoreVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Integration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ConnectionId": {
+                            "type": "string"
+                        },
+                        "ConnectionType": {
+                            "type": "string"
+                        },
+                        "ContentHandlingStrategy": {
+                            "type": "string"
+                        },
+                        "CredentialsArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IntegrationMethod": {
+                            "type": "string"
+                        },
+                        "IntegrationSubtype": {
+                            "type": "string"
+                        },
+                        "IntegrationType": {
+                            "type": "string"
+                        },
+                        "IntegrationUri": {
+                            "type": "string"
+                        },
+                        "PassthroughBehavior": {
+                            "type": "string"
+                        },
+                        "PayloadFormatVersion": {
+                            "type": "string"
+                        },
+                        "RequestParameters": {
+                            "type": "object"
+                        },
+                        "RequestTemplates": {
+                            "type": "object"
+                        },
+                        "ResponseParameters": {
+                            "type": "object"
+                        },
+                        "TemplateSelectionExpression": {
+                            "type": "string"
+                        },
+                        "TimeoutInMillis": {
+                            "type": "number"
+                        },
+                        "TlsConfig": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Integration.TlsConfig"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "IntegrationType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Integration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Integration.ResponseParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination",
+                "Source"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Integration.ResponseParameterList": {
+            "additionalProperties": false,
+            "properties": {
+                "ResponseParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApiGatewayV2::Integration.ResponseParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Integration.TlsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ServerNameToVerify": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::IntegrationResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ContentHandlingStrategy": {
+                            "type": "string"
+                        },
+                        "IntegrationId": {
+                            "type": "string"
+                        },
+                        "IntegrationResponseKey": {
+                            "type": "string"
+                        },
+                        "ResponseParameters": {
+                            "type": "object"
+                        },
+                        "ResponseTemplates": {
+                            "type": "object"
+                        },
+                        "TemplateSelectionExpression": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "IntegrationId",
+                        "IntegrationResponseKey"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::IntegrationResponse"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Model": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ContentType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Schema": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "Name",
+                        "Schema"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Model"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Route": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ApiKeyRequired": {
+                            "type": "boolean"
+                        },
+                        "AuthorizationScopes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AuthorizationType": {
+                            "type": "string"
+                        },
+                        "AuthorizerId": {
+                            "type": "string"
+                        },
+                        "ModelSelectionExpression": {
+                            "type": "string"
+                        },
+                        "OperationName": {
+                            "type": "string"
+                        },
+                        "RequestModels": {
+                            "type": "object"
+                        },
+                        "RequestParameters": {
+                            "type": "object"
+                        },
+                        "RouteKey": {
+                            "type": "string"
+                        },
+                        "RouteResponseSelectionExpression": {
+                            "type": "string"
+                        },
+                        "Target": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "RouteKey"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Route"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Route.ParameterConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "Required": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Required"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::RouteResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ModelSelectionExpression": {
+                            "type": "string"
+                        },
+                        "ResponseModels": {
+                            "type": "object"
+                        },
+                        "ResponseParameters": {
+                            "type": "object"
+                        },
+                        "RouteId": {
+                            "type": "string"
+                        },
+                        "RouteResponseKey": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "RouteId",
+                        "RouteResponseKey"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::RouteResponse"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::RouteResponse.ParameterConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "Required": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Required"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Stage": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessLogSettings": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Stage.AccessLogSettings"
+                        },
+                        "AccessPolicyId": {
+                            "type": "string"
+                        },
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "AutoDeploy": {
+                            "type": "boolean"
+                        },
+                        "ClientCertificateId": {
+                            "type": "string"
+                        },
+                        "DefaultRouteSettings": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Stage.RouteSettings"
+                        },
+                        "DeploymentId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "RouteSettings": {
+                            "type": "object"
+                        },
+                        "StageName": {
+                            "type": "string"
+                        },
+                        "StageVariables": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "StageName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Stage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Stage.AccessLogSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Stage.RouteSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DataTraceEnabled": {
+                    "type": "boolean"
+                },
+                "DetailedMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "LoggingLevel": {
+                    "type": "string"
+                },
+                "ThrottlingBurstLimit": {
+                    "type": "number"
+                },
+                "ThrottlingRateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::VpcLink": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::VpcLink"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::Application.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::Application.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::ConfigurationProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LocationUri": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RetrievalRoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::ConfigurationProfile.Tags"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Validators": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::ConfigurationProfile.Validators"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "LocationUri",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::ConfigurationProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::ConfigurationProfile.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::ConfigurationProfile.Validators": {
+            "additionalProperties": false,
+            "properties": {
+                "Content": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::Deployment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ConfigurationProfileId": {
+                            "type": "string"
+                        },
+                        "ConfigurationVersion": {
+                            "type": "string"
+                        },
+                        "DeploymentStrategyId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnvironmentId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::Deployment.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "ConfigurationProfileId",
+                        "ConfigurationVersion",
+                        "DeploymentStrategyId",
+                        "EnvironmentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::Deployment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::Deployment.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::DeploymentStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeploymentDurationInMinutes": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FinalBakeTimeInMinutes": {
+                            "type": "number"
+                        },
+                        "GrowthFactor": {
+                            "type": "number"
+                        },
+                        "GrowthType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ReplicateTo": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::DeploymentStrategy.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DeploymentDurationInMinutes",
+                        "GrowthFactor",
+                        "Name",
+                        "ReplicateTo"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::DeploymentStrategy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::DeploymentStrategy.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Monitors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::Environment.Monitors"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::Environment.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::Environment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::Environment.Monitors": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmArn": {
+                    "type": "string"
+                },
+                "AlarmRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::Environment.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::HostedConfigurationVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ConfigurationProfileId": {
+                            "type": "string"
+                        },
+                        "Content": {
+                            "type": "string"
+                        },
+                        "ContentType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LatestVersionNumber": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "ConfigurationProfileId",
+                        "Content",
+                        "ContentType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::HostedConfigurationVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionMode": {
+                            "type": "string"
+                        },
+                        "ConnectorProfileConfig": {
+                            "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorProfileConfig"
+                        },
+                        "ConnectorProfileName": {
+                            "type": "string"
+                        },
+                        "ConnectorType": {
+                            "type": "string"
+                        },
+                        "KMSArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConnectionMode",
+                        "ConnectorProfileName",
+                        "ConnectorType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppFlow::ConnectorProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.AmplitudeConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiKey": {
+                    "type": "string"
+                },
+                "SecretKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiKey",
+                "SecretKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthCode": {
+                    "type": "string"
+                },
+                "RedirectUri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ConnectorProfileConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorProfileCredentials": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorProfileCredentials"
+                },
+                "ConnectorProfileProperties": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorProfileProperties"
+                }
+            },
+            "required": [
+                "ConnectorProfileCredentials"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "Amplitude": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.AmplitudeConnectorProfileCredentials"
+                },
+                "Datadog": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileCredentials"
+                },
+                "Dynatrace": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileCredentials"
+                },
+                "GoogleAnalytics": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.GoogleAnalyticsConnectorProfileCredentials"
+                },
+                "InforNexus": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileCredentials"
+                },
+                "Marketo": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileCredentials"
+                },
+                "Redshift": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileCredentials"
+                },
+                "SAPOData": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileCredentials"
+                },
+                "Salesforce": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileCredentials"
+                },
+                "ServiceNow": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileCredentials"
+                },
+                "Singular": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SingularConnectorProfileCredentials"
+                },
+                "Slack": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SlackConnectorProfileCredentials"
+                },
+                "Snowflake": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileCredentials"
+                },
+                "Trendmicro": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.TrendmicroConnectorProfileCredentials"
+                },
+                "Veeva": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileCredentials"
+                },
+                "Zendesk": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileCredentials"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Datadog": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileProperties"
+                },
+                "Dynatrace": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileProperties"
+                },
+                "InforNexus": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileProperties"
+                },
+                "Marketo": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileProperties"
+                },
+                "Redshift": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileProperties"
+                },
+                "SAPOData": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileProperties"
+                },
+                "Salesforce": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileProperties"
+                },
+                "ServiceNow": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileProperties"
+                },
+                "Slack": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SlackConnectorProfileProperties"
+                },
+                "Snowflake": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileProperties"
+                },
+                "Veeva": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileProperties"
+                },
+                "Zendesk": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiKey": {
+                    "type": "string"
+                },
+                "ApplicationKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiKey",
+                "ApplicationKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiToken": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiToken"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.GoogleAnalyticsConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "ConnectorOAuthRequest": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+                },
+                "RefreshToken": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClientId",
+                "ClientSecret"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessKeyId": {
+                    "type": "string"
+                },
+                "Datakey": {
+                    "type": "string"
+                },
+                "SecretAccessKey": {
+                    "type": "string"
+                },
+                "UserId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AccessKeyId",
+                "Datakey",
+                "SecretAccessKey",
+                "UserId"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "ConnectorOAuthRequest": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+                }
+            },
+            "required": [
+                "ClientId",
+                "ClientSecret"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.OAuthProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthCodeUrl": {
+                    "type": "string"
+                },
+                "OAuthScopes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TokenUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "DatabaseUrl": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName",
+                "DatabaseUrl",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "BasicAuthCredentials": {
+                    "type": "object"
+                },
+                "OAuthCredentials": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationHostUrl": {
+                    "type": "string"
+                },
+                "ApplicationServicePath": {
+                    "type": "string"
+                },
+                "ClientNumber": {
+                    "type": "string"
+                },
+                "LogonLanguage": {
+                    "type": "string"
+                },
+                "OAuthProperties": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.OAuthProperties"
+                },
+                "PortNumber": {
+                    "type": "number"
+                },
+                "PrivateLinkServiceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "ClientCredentialsArn": {
+                    "type": "string"
+                },
+                "ConnectorOAuthRequest": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+                },
+                "RefreshToken": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                },
+                "isSandboxEnvironment": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SingularConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SlackConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "ConnectorOAuthRequest": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+                }
+            },
+            "required": [
+                "ClientId",
+                "ClientSecret"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SlackConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountName": {
+                    "type": "string"
+                },
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "PrivateLinkServiceName": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "Stage": {
+                    "type": "string"
+                },
+                "Warehouse": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName",
+                "Stage",
+                "Warehouse"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.TrendmicroConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiSecretKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiSecretKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "ConnectorOAuthRequest": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+                }
+            },
+            "required": [
+                "ClientId",
+                "ClientSecret"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DestinationFlowConfigList": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppFlow::Flow.DestinationFlowConfig"
+                            },
+                            "type": "array"
+                        },
+                        "FlowName": {
+                            "type": "string"
+                        },
+                        "KMSArn": {
+                            "type": "string"
+                        },
+                        "SourceFlowConfig": {
+                            "$ref": "#/definitions/AWS::AppFlow::Flow.SourceFlowConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Tasks": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppFlow::Flow.Task"
+                            },
+                            "type": "array"
+                        },
+                        "TriggerConfig": {
+                            "$ref": "#/definitions/AWS::AppFlow::Flow.TriggerConfig"
+                        }
+                    },
+                    "required": [
+                        "DestinationFlowConfigList",
+                        "FlowName",
+                        "SourceFlowConfig",
+                        "Tasks",
+                        "TriggerConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppFlow::Flow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.AggregationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregationType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.AmplitudeSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ConnectorOperator": {
+            "additionalProperties": false,
+            "properties": {
+                "Amplitude": {
+                    "type": "string"
+                },
+                "Datadog": {
+                    "type": "string"
+                },
+                "Dynatrace": {
+                    "type": "string"
+                },
+                "GoogleAnalytics": {
+                    "type": "string"
+                },
+                "InforNexus": {
+                    "type": "string"
+                },
+                "Marketo": {
+                    "type": "string"
+                },
+                "S3": {
+                    "type": "string"
+                },
+                "SAPOData": {
+                    "type": "string"
+                },
+                "Salesforce": {
+                    "type": "string"
+                },
+                "ServiceNow": {
+                    "type": "string"
+                },
+                "Singular": {
+                    "type": "string"
+                },
+                "Slack": {
+                    "type": "string"
+                },
+                "Trendmicro": {
+                    "type": "string"
+                },
+                "Veeva": {
+                    "type": "string"
+                },
+                "Zendesk": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.DatadogSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.DestinationConnectorProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBridge": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.EventBridgeDestinationProperties"
+                },
+                "LookoutMetrics": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.LookoutMetricsDestinationProperties"
+                },
+                "Redshift": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.RedshiftDestinationProperties"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.S3DestinationProperties"
+                },
+                "Salesforce": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SalesforceDestinationProperties"
+                },
+                "Snowflake": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SnowflakeDestinationProperties"
+                },
+                "Upsolver": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.UpsolverDestinationProperties"
+                },
+                "Zendesk": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ZendeskDestinationProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.DestinationFlowConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorProfileName": {
+                    "type": "string"
+                },
+                "ConnectorType": {
+                    "type": "string"
+                },
+                "DestinationConnectorProperties": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.DestinationConnectorProperties"
+                }
+            },
+            "required": [
+                "ConnectorType",
+                "DestinationConnectorProperties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.DynatraceSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ErrorHandlingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "FailOnFirstError": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.EventBridgeDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorHandlingConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ErrorHandlingConfig"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.GoogleAnalyticsSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.IncrementalPullConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DatetimeTypeFieldName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.InforNexusSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.LookoutMetricsDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.MarketoSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.PrefixConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "PrefixFormat": {
+                    "type": "string"
+                },
+                "PrefixType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.RedshiftDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "ErrorHandlingConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ErrorHandlingConfig"
+                },
+                "IntermediateBucketName": {
+                    "type": "string"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IntermediateBucketName",
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.S3DestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "S3OutputFormatConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.S3OutputFormatConfig"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.S3InputFormatConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "S3InputFileType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.S3OutputFormatConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregationConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.AggregationConfig"
+                },
+                "FileType": {
+                    "type": "string"
+                },
+                "PrefixConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.PrefixConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.S3SourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "S3InputFormatConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.S3InputFormatConfig"
+                }
+            },
+            "required": [
+                "BucketName",
+                "BucketPrefix"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SAPODataSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ObjectPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ObjectPath"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SalesforceDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorHandlingConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ErrorHandlingConfig"
+                },
+                "IdFieldNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Object": {
+                    "type": "string"
+                },
+                "WriteOperationType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SalesforceSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableDynamicFieldUpdate": {
+                    "type": "boolean"
+                },
+                "IncludeDeletedRecords": {
+                    "type": "boolean"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ScheduledTriggerProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DataPullMode": {
+                    "type": "string"
+                },
+                "ScheduleEndTime": {
+                    "type": "number"
+                },
+                "ScheduleExpression": {
+                    "type": "string"
+                },
+                "ScheduleOffset": {
+                    "type": "number"
+                },
+                "ScheduleStartTime": {
+                    "type": "number"
+                },
+                "TimeZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ServiceNowSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SingularSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SlackSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SnowflakeDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "ErrorHandlingConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ErrorHandlingConfig"
+                },
+                "IntermediateBucketName": {
+                    "type": "string"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IntermediateBucketName",
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SourceConnectorProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Amplitude": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.AmplitudeSourceProperties"
+                },
+                "Datadog": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.DatadogSourceProperties"
+                },
+                "Dynatrace": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.DynatraceSourceProperties"
+                },
+                "GoogleAnalytics": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.GoogleAnalyticsSourceProperties"
+                },
+                "InforNexus": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.InforNexusSourceProperties"
+                },
+                "Marketo": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.MarketoSourceProperties"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.S3SourceProperties"
+                },
+                "SAPOData": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SAPODataSourceProperties"
+                },
+                "Salesforce": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SalesforceSourceProperties"
+                },
+                "ServiceNow": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ServiceNowSourceProperties"
+                },
+                "Singular": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SingularSourceProperties"
+                },
+                "Slack": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SlackSourceProperties"
+                },
+                "Trendmicro": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.TrendmicroSourceProperties"
+                },
+                "Veeva": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.VeevaSourceProperties"
+                },
+                "Zendesk": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ZendeskSourceProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SourceFlowConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorProfileName": {
+                    "type": "string"
+                },
+                "ConnectorType": {
+                    "type": "string"
+                },
+                "IncrementalPullConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.IncrementalPullConfig"
+                },
+                "SourceConnectorProperties": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SourceConnectorProperties"
+                }
+            },
+            "required": [
+                "ConnectorType",
+                "SourceConnectorProperties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.Task": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorOperator": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ConnectorOperator"
+                },
+                "DestinationField": {
+                    "type": "string"
+                },
+                "SourceFields": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TaskProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppFlow::Flow.TaskPropertiesObject"
+                    },
+                    "type": "array"
+                },
+                "TaskType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourceFields",
+                "TaskType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.TaskPropertiesObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.TrendmicroSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.TriggerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TriggerProperties": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ScheduledTriggerProperties"
+                },
+                "TriggerType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TriggerType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.UpsolverDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "S3OutputFormatConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.UpsolverS3OutputFormatConfig"
+                }
+            },
+            "required": [
+                "BucketName",
+                "S3OutputFormatConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.UpsolverS3OutputFormatConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregationConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.AggregationConfig"
+                },
+                "FileType": {
+                    "type": "string"
+                },
+                "PrefixConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.PrefixConfig"
+                }
+            },
+            "required": [
+                "PrefixConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.VeevaSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentType": {
+                    "type": "string"
+                },
+                "IncludeAllVersions": {
+                    "type": "boolean"
+                },
+                "IncludeRenditions": {
+                    "type": "boolean"
+                },
+                "IncludeSourceFiles": {
+                    "type": "boolean"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ZendeskDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorHandlingConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ErrorHandlingConfig"
+                },
+                "IdFieldNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Object": {
+                    "type": "string"
+                },
+                "WriteOperationType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ZendeskSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppIntegrations::EventIntegration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EventBridgeBus": {
+                            "type": "string"
+                        },
+                        "EventFilter": {
+                            "$ref": "#/definitions/AWS::AppIntegrations::EventIntegration.EventFilter"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EventBridgeBus",
+                        "EventFilter",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppIntegrations::EventIntegration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppIntegrations::EventIntegration.EventFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Source": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Source"
+            ],
+            "type": "object"
+        },
+        "AWS::AppIntegrations::EventIntegration.EventIntegrationAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientAssociationMetadata": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppIntegrations::EventIntegration.Metadata"
+                    },
+                    "type": "array"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "EventBridgeRuleName": {
+                    "type": "string"
+                },
+                "EventIntegrationAssociationArn": {
+                    "type": "string"
+                },
+                "EventIntegrationAssociationId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppIntegrations::EventIntegration.Metadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GatewayRouteName": {
+                            "type": "string"
+                        },
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualGatewayName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec",
+                        "VirtualGatewayName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::GatewayRoute"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteHostnameMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Suffix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteHostnameRewrite": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultTargetHostname": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteMetadataMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Range": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteRangeMatch"
+                },
+                "Regex": {
+                    "type": "string"
+                },
+                "Suffix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteRangeMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "End": {
+                    "type": "number"
+                },
+                "Start": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "End",
+                "Start"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "GrpcRoute": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GrpcGatewayRoute"
+                },
+                "Http2Route": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRoute"
+                },
+                "HttpRoute": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRoute"
+                },
+                "Priority": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualService": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteVirtualService"
+                }
+            },
+            "required": [
+                "VirtualService"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteVirtualService": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VirtualServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GrpcGatewayRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GrpcGatewayRouteAction"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMatch"
+                }
+            },
+            "required": [
+                "Action",
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Rewrite": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GrpcGatewayRouteRewrite"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteHostnameMatch"
+                },
+                "Metadata": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMetadata"
+                    },
+                    "type": "array"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Invert": {
+                    "type": "boolean"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteMetadataMatch"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteRewrite": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteHostnameRewrite"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRouteAction"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRouteMatch"
+                }
+            },
+            "required": [
+                "Action",
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRouteAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Rewrite": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRouteRewrite"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "Invert": {
+                    "type": "boolean"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeaderMatch"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeaderMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Range": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteRangeMatch"
+                },
+                "Regex": {
+                    "type": "string"
+                },
+                "Suffix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRouteMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Headers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeader"
+                    },
+                    "type": "array"
+                },
+                "Hostname": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteHostnameMatch"
+                },
+                "Method": {
+                    "type": "string"
+                },
+                "Path": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpPathMatch"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "QueryParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.QueryParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRoutePathRewrite": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRoutePrefixRewrite": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultPrefix": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRouteRewrite": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteHostnameRewrite"
+                },
+                "Path": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRoutePathRewrite"
+                },
+                "Prefix": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRoutePrefixRewrite"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpPathMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Regex": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpQueryParameterMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.QueryParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpQueryParameterMatch"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Mesh": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::Mesh.MeshSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::Mesh"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Mesh.EgressFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Mesh.MeshSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "EgressFilter": {
+                    "$ref": "#/definitions/AWS::AppMesh::Mesh.EgressFilter"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "RouteName": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::Route.RouteSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualRouterName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec",
+                        "VirtualRouterName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::Route"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.Duration": {
+            "additionalProperties": false,
+            "properties": {
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Unit",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRetryPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "GrpcRetryEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "HttpRetryEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaxRetries": {
+                    "type": "number"
+                },
+                "PerRetryTimeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                },
+                "TcpRetryEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MaxRetries",
+                "PerRetryTimeout"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRouteAction"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRouteMatch"
+                },
+                "RetryPolicy": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRetryPolicy"
+                },
+                "Timeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcTimeout"
+                }
+            },
+            "required": [
+                "Action",
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRouteAction": {
+            "additionalProperties": false,
+            "properties": {
+                "WeightedTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.WeightedTarget"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "WeightedTargets"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRouteMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Metadata": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRouteMetadata"
+                    },
+                    "type": "array"
+                },
+                "MethodName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRouteMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Invert": {
+                    "type": "boolean"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRouteMetadataMatchMethod"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRouteMetadataMatchMethod": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Range": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.MatchRange"
+                },
+                "Regex": {
+                    "type": "string"
+                },
+                "Suffix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                },
+                "PerRequest": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HeaderMatchMethod": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Range": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.MatchRange"
+                },
+                "Regex": {
+                    "type": "string"
+                },
+                "Suffix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpPathMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Regex": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpQueryParameterMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpRetryPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpRetryEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaxRetries": {
+                    "type": "number"
+                },
+                "PerRetryTimeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                },
+                "TcpRetryEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MaxRetries",
+                "PerRetryTimeout"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpRouteAction"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpRouteMatch"
+                },
+                "RetryPolicy": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpRetryPolicy"
+                },
+                "Timeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpTimeout"
+                }
+            },
+            "required": [
+                "Action",
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpRouteAction": {
+            "additionalProperties": false,
+            "properties": {
+                "WeightedTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.WeightedTarget"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "WeightedTargets"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpRouteHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "Invert": {
+                    "type": "boolean"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HeaderMatchMethod"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpRouteMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Headers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.HttpRouteHeader"
+                    },
+                    "type": "array"
+                },
+                "Method": {
+                    "type": "string"
+                },
+                "Path": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpPathMatch"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "QueryParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.QueryParameter"
+                    },
+                    "type": "array"
+                },
+                "Scheme": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                },
+                "PerRequest": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.MatchRange": {
+            "additionalProperties": false,
+            "properties": {
+                "End": {
+                    "type": "number"
+                },
+                "Start": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "End",
+                "Start"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.QueryParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpQueryParameterMatch"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.RouteSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "GrpcRoute": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRoute"
+                },
+                "Http2Route": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpRoute"
+                },
+                "HttpRoute": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpRoute"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "TcpRoute": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.TcpRoute"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.TcpRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.TcpRouteAction"
+                },
+                "Timeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.TcpTimeout"
+                }
+            },
+            "required": [
+                "Action"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.TcpRouteAction": {
+            "additionalProperties": false,
+            "properties": {
+                "WeightedTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.WeightedTarget"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "WeightedTargets"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.TcpTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.WeightedTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualNode": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "VirtualNode",
+                "Weight"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewaySpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualGatewayName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::VirtualGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.SubjectAlternativeNameMatchers": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.SubjectAlternativeNames": {
+            "additionalProperties": false,
+            "properties": {
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.SubjectAlternativeNameMatchers"
+                }
+            },
+            "required": [
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayAccessLog": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayFileAccessLog"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayBackendDefaults": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientPolicy": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "TLS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicyTls"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicyTls": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayClientTlsCertificate"
+                },
+                "Enforce": {
+                    "type": "boolean"
+                },
+                "Ports": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Validation": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContext"
+                }
+            },
+            "required": [
+                "Validation"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayClientTlsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsFileCertificate"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsSdsCertificate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "GRPC": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayGrpcConnectionPool"
+                },
+                "HTTP": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayHttpConnectionPool"
+                },
+                "HTTP2": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayHttp2ConnectionPool"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayFileAccessLog": {
+            "additionalProperties": false,
+            "properties": {
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Path"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayGrpcConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRequests"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayHealthCheckPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "HealthyThreshold": {
+                    "type": "number"
+                },
+                "IntervalMillis": {
+                    "type": "number"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "TimeoutMillis": {
+                    "type": "number"
+                },
+                "UnhealthyThreshold": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "HealthyThreshold",
+                "IntervalMillis",
+                "Protocol",
+                "TimeoutMillis",
+                "UnhealthyThreshold"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayHttp2ConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRequests"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayHttpConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConnections": {
+                    "type": "number"
+                },
+                "MaxPendingRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxConnections"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListener": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionPool": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayConnectionPool"
+                },
+                "HealthCheck": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayHealthCheckPolicy"
+                },
+                "PortMapping": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayPortMapping"
+                },
+                "TLS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTls"
+                }
+            },
+            "required": [
+                "PortMapping"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTls": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsCertificate"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "Validation": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContext"
+                }
+            },
+            "required": [
+                "Certificate",
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsAcmCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "ACM": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsAcmCertificate"
+                },
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsFileCertificate"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsSdsCertificate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsFileCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateChain": {
+                    "type": "string"
+                },
+                "PrivateKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateChain",
+                "PrivateKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsSdsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContext": {
+            "additionalProperties": false,
+            "properties": {
+                "SubjectAlternativeNames": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.SubjectAlternativeNames"
+                },
+                "Trust": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContextTrust"
+                }
+            },
+            "required": [
+                "Trust"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContextTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextFileTrust"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextSdsTrust"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayLogging": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessLog": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayAccessLog"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayPortMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "Port": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Port",
+                "Protocol"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewaySpec": {
+            "additionalProperties": false,
+            "properties": {
+                "BackendDefaults": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayBackendDefaults"
+                },
+                "Listeners": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListener"
+                    },
+                    "type": "array"
+                },
+                "Logging": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayLogging"
+                }
+            },
+            "required": [
+                "Listeners"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContext": {
+            "additionalProperties": false,
+            "properties": {
+                "SubjectAlternativeNames": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.SubjectAlternativeNames"
+                },
+                "Trust": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextTrust"
+                }
+            },
+            "required": [
+                "Trust"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextAcmTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateAuthorityArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CertificateAuthorityArns"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextFileTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateChain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateChain"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextSdsTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "ACM": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextAcmTrust"
+                },
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextFileTrust"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextSdsTrust"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualNodeName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::VirtualNode"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.AccessLog": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.FileAccessLog"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.AwsCloudMapInstanceAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.AwsCloudMapServiceDiscovery": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::VirtualNode.AwsCloudMapInstanceAttribute"
+                    },
+                    "type": "array"
+                },
+                "NamespaceName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NamespaceName",
+                "ServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.Backend": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualService": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualServiceBackend"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.BackendDefaults": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientPolicy": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ClientPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ClientPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "TLS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ClientPolicyTls"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ClientPolicyTls": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ClientTlsCertificate"
+                },
+                "Enforce": {
+                    "type": "boolean"
+                },
+                "Ports": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Validation": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContext"
+                }
+            },
+            "required": [
+                "Validation"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ClientTlsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsFileCertificate"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsSdsCertificate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.DnsServiceDiscovery": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "type": "string"
+                },
+                "ResponseType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Hostname"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.Duration": {
+            "additionalProperties": false,
+            "properties": {
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Unit",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.FileAccessLog": {
+            "additionalProperties": false,
+            "properties": {
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Path"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.GrpcTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                },
+                "PerRequest": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.HealthCheck": {
+            "additionalProperties": false,
+            "properties": {
+                "HealthyThreshold": {
+                    "type": "number"
+                },
+                "IntervalMillis": {
+                    "type": "number"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "TimeoutMillis": {
+                    "type": "number"
+                },
+                "UnhealthyThreshold": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "HealthyThreshold",
+                "IntervalMillis",
+                "Protocol",
+                "TimeoutMillis",
+                "UnhealthyThreshold"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.HttpTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                },
+                "PerRequest": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.Listener": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionPool": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeConnectionPool"
+                },
+                "HealthCheck": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.HealthCheck"
+                },
+                "OutlierDetection": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.OutlierDetection"
+                },
+                "PortMapping": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.PortMapping"
+                },
+                "TLS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTls"
+                },
+                "Timeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTimeout"
+                }
+            },
+            "required": [
+                "PortMapping"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "GRPC": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.GrpcTimeout"
+                },
+                "HTTP": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.HttpTimeout"
+                },
+                "HTTP2": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.HttpTimeout"
+                },
+                "TCP": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TcpTimeout"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTls": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsCertificate"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "Validation": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsValidationContext"
+                }
+            },
+            "required": [
+                "Certificate",
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsAcmCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "ACM": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsAcmCertificate"
+                },
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsFileCertificate"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsSdsCertificate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsFileCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateChain": {
+                    "type": "string"
+                },
+                "PrivateKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateChain",
+                "PrivateKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsSdsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsValidationContext": {
+            "additionalProperties": false,
+            "properties": {
+                "SubjectAlternativeNames": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.SubjectAlternativeNames"
+                },
+                "Trust": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsValidationContextTrust"
+                }
+            },
+            "required": [
+                "Trust"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsValidationContextTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextFileTrust"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextSdsTrust"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessLog": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.AccessLog"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.OutlierDetection": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseEjectionDuration": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                },
+                "Interval": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                },
+                "MaxEjectionPercent": {
+                    "type": "number"
+                },
+                "MaxServerErrors": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "BaseEjectionDuration",
+                "Interval",
+                "MaxEjectionPercent",
+                "MaxServerErrors"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.PortMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "Port": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Port",
+                "Protocol"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ServiceDiscovery": {
+            "additionalProperties": false,
+            "properties": {
+                "AWSCloudMap": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.AwsCloudMapServiceDiscovery"
+                },
+                "DNS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.DnsServiceDiscovery"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.SubjectAlternativeNameMatchers": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.SubjectAlternativeNames": {
+            "additionalProperties": false,
+            "properties": {
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.SubjectAlternativeNameMatchers"
+                }
+            },
+            "required": [
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TcpTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TlsValidationContext": {
+            "additionalProperties": false,
+            "properties": {
+                "SubjectAlternativeNames": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.SubjectAlternativeNames"
+                },
+                "Trust": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextTrust"
+                }
+            },
+            "required": [
+                "Trust"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TlsValidationContextAcmTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateAuthorityArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CertificateAuthorityArns"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TlsValidationContextFileTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateChain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateChain"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TlsValidationContextSdsTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TlsValidationContextTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "ACM": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextAcmTrust"
+                },
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextFileTrust"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextSdsTrust"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "GRPC": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeGrpcConnectionPool"
+                },
+                "HTTP": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeHttpConnectionPool"
+                },
+                "HTTP2": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeHttp2ConnectionPool"
+                },
+                "TCP": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeTcpConnectionPool"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeGrpcConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRequests"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeHttp2ConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRequests"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeHttpConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConnections": {
+                    "type": "number"
+                },
+                "MaxPendingRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxConnections"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "BackendDefaults": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.BackendDefaults"
+                },
+                "Backends": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Backend"
+                    },
+                    "type": "array"
+                },
+                "Listeners": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Listener"
+                    },
+                    "type": "array"
+                },
+                "Logging": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Logging"
+                },
+                "ServiceDiscovery": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ServiceDiscovery"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeTcpConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConnections": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxConnections"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualServiceBackend": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientPolicy": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ClientPolicy"
+                },
+                "VirtualServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VirtualServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualRouter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualRouter.VirtualRouterSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualRouterName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::VirtualRouter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualRouter.PortMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "Port": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Port",
+                "Protocol"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualRouter.VirtualRouterListener": {
+            "additionalProperties": false,
+            "properties": {
+                "PortMapping": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualRouter.PortMapping"
+                }
+            },
+            "required": [
+                "PortMapping"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualRouter.VirtualRouterSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "Listeners": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::VirtualRouter.VirtualRouterListener"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Listeners"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualService": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualService.VirtualServiceSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualServiceName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec",
+                        "VirtualServiceName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::VirtualService"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualService.VirtualNodeServiceProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualNodeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VirtualNodeName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualService.VirtualRouterServiceProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualRouterName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VirtualRouterName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualService.VirtualServiceProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualNode": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualService.VirtualNodeServiceProvider"
+                },
+                "VirtualRouter": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualService.VirtualRouterServiceProvider"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualService.VirtualServiceSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "Provider": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualService.VirtualServiceProvider"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingConfigurationArn": {
+                            "type": "string"
+                        },
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::AppRunner::Service.EncryptionConfiguration"
+                        },
+                        "HealthCheckConfiguration": {
+                            "$ref": "#/definitions/AWS::AppRunner::Service.HealthCheckConfiguration"
+                        },
+                        "InstanceConfiguration": {
+                            "$ref": "#/definitions/AWS::AppRunner::Service.InstanceConfiguration"
+                        },
+                        "ServiceName": {
+                            "type": "string"
+                        },
+                        "SourceConfiguration": {
+                            "$ref": "#/definitions/AWS::AppRunner::Service.SourceConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SourceConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppRunner::Service"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.AuthenticationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessRoleArn": {
+                    "type": "string"
+                },
+                "ConnectionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.CodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CodeConfigurationValues": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.CodeConfigurationValues"
+                },
+                "ConfigurationSource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConfigurationSource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.CodeConfigurationValues": {
+            "additionalProperties": false,
+            "properties": {
+                "BuildCommand": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "string"
+                },
+                "Runtime": {
+                    "type": "string"
+                },
+                "RuntimeEnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppRunner::Service.KeyValuePair"
+                    },
+                    "type": "array"
+                },
+                "StartCommand": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Runtime"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.CodeRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "CodeConfiguration": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.CodeConfiguration"
+                },
+                "RepositoryUrl": {
+                    "type": "string"
+                },
+                "SourceCodeVersion": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.SourceCodeVersion"
+                }
+            },
+            "required": [
+                "RepositoryUrl",
+                "SourceCodeVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KmsKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.HealthCheckConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HealthyThreshold": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "Timeout": {
+                    "type": "number"
+                },
+                "UnhealthyThreshold": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.ImageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Port": {
+                    "type": "string"
+                },
+                "RuntimeEnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppRunner::Service.KeyValuePair"
+                    },
+                    "type": "array"
+                },
+                "StartCommand": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.ImageRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "ImageConfiguration": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.ImageConfiguration"
+                },
+                "ImageIdentifier": {
+                    "type": "string"
+                },
+                "ImageRepositoryType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ImageIdentifier",
+                "ImageRepositoryType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.InstanceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Cpu": {
+                    "type": "string"
+                },
+                "InstanceRoleArn": {
+                    "type": "string"
+                },
+                "Memory": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.KeyValuePair": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.SourceCodeVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.SourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationConfiguration": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.AuthenticationConfiguration"
+                },
+                "AutoDeploymentsEnabled": {
+                    "type": "boolean"
+                },
+                "CodeRepository": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.CodeRepository"
+                },
+                "ImageRepository": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.ImageRepository"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::AppBlock": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SetupScriptDetails": {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlock.ScriptDetails"
+                        },
+                        "SourceS3Location": {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlock.S3Location"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "SetupScriptDetails",
+                        "SourceS3Location"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::AppBlock"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::AppBlock.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::AppBlock.ScriptDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutableParameters": {
+                    "type": "string"
+                },
+                "ExecutablePath": {
+                    "type": "string"
+                },
+                "ScriptS3Location": {
+                    "$ref": "#/definitions/AWS::AppStream::AppBlock.S3Location"
+                },
+                "TimeoutInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ExecutablePath",
+                "ScriptS3Location",
+                "TimeoutInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppBlockArn": {
+                            "type": "string"
+                        },
+                        "AttributesToDelete": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "IconS3Location": {
+                            "$ref": "#/definitions/AWS::AppStream::Application.S3Location"
+                        },
+                        "InstanceFamilies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchParameters": {
+                            "type": "string"
+                        },
+                        "LaunchPath": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Platforms": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkingDirectory": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AppBlockArn",
+                        "IconS3Location",
+                        "InstanceFamilies",
+                        "LaunchPath",
+                        "Name",
+                        "Platforms"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Application.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::ApplicationFleetAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationArn": {
+                            "type": "string"
+                        },
+                        "FleetName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationArn",
+                        "FleetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::ApplicationFleetAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::DirectoryConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DirectoryName": {
+                            "type": "string"
+                        },
+                        "OrganizationalUnitDistinguishedNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceAccountCredentials": {
+                            "$ref": "#/definitions/AWS::AppStream::DirectoryConfig.ServiceAccountCredentials"
+                        }
+                    },
+                    "required": [
+                        "DirectoryName",
+                        "OrganizationalUnitDistinguishedNames",
+                        "ServiceAccountCredentials"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::DirectoryConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::DirectoryConfig.ServiceAccountCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountName": {
+                    "type": "string"
+                },
+                "AccountPassword": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AccountName",
+                "AccountPassword"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Fleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ComputeCapacity": {
+                            "$ref": "#/definitions/AWS::AppStream::Fleet.ComputeCapacity"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisconnectTimeoutInSeconds": {
+                            "type": "number"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "DomainJoinInfo": {
+                            "$ref": "#/definitions/AWS::AppStream::Fleet.DomainJoinInfo"
+                        },
+                        "EnableDefaultInternetAccess": {
+                            "type": "boolean"
+                        },
+                        "FleetType": {
+                            "type": "string"
+                        },
+                        "IamRoleArn": {
+                            "type": "string"
+                        },
+                        "IdleDisconnectTimeoutInSeconds": {
+                            "type": "number"
+                        },
+                        "ImageArn": {
+                            "type": "string"
+                        },
+                        "ImageName": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "MaxConcurrentSessions": {
+                            "type": "number"
+                        },
+                        "MaxUserDurationInSeconds": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Platform": {
+                            "type": "string"
+                        },
+                        "StreamView": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UsbDeviceFilterStrings": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::AppStream::Fleet.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "InstanceType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::Fleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Fleet.ComputeCapacity": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredInstances": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DesiredInstances"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Fleet.DomainJoinInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryName": {
+                    "type": "string"
+                },
+                "OrganizationalUnitDistinguishedName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::Fleet.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::ImageBuilder": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessEndpoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::ImageBuilder.AccessEndpoint"
+                            },
+                            "type": "array"
+                        },
+                        "AppstreamAgentVersion": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "DomainJoinInfo": {
+                            "$ref": "#/definitions/AWS::AppStream::ImageBuilder.DomainJoinInfo"
+                        },
+                        "EnableDefaultInternetAccess": {
+                            "type": "boolean"
+                        },
+                        "IamRoleArn": {
+                            "type": "string"
+                        },
+                        "ImageArn": {
+                            "type": "string"
+                        },
+                        "ImageName": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::AppStream::ImageBuilder.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "InstanceType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::ImageBuilder"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::ImageBuilder.AccessEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointType": {
+                    "type": "string"
+                },
+                "VpceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointType",
+                "VpceId"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::ImageBuilder.DomainJoinInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryName": {
+                    "type": "string"
+                },
+                "OrganizationalUnitDistinguishedName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::ImageBuilder.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::Stack": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessEndpoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::Stack.AccessEndpoint"
+                            },
+                            "type": "array"
+                        },
+                        "ApplicationSettings": {
+                            "$ref": "#/definitions/AWS::AppStream::Stack.ApplicationSettings"
+                        },
+                        "AttributesToDelete": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DeleteStorageConnectors": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "EmbedHostDomains": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "FeedbackURL": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RedirectURL": {
+                            "type": "string"
+                        },
+                        "StorageConnectors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::Stack.StorageConnector"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::Stack.UserSetting"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::Stack"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Stack.AccessEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointType": {
+                    "type": "string"
+                },
+                "VpceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointType",
+                "VpceId"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Stack.ApplicationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "SettingsGroup": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Stack.StorageConnector": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorType": {
+                    "type": "string"
+                },
+                "Domains": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ResourceIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConnectorType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Stack.UserSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Permission": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action",
+                "Permission"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::StackFleetAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FleetName": {
+                            "type": "string"
+                        },
+                        "StackName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FleetName",
+                        "StackName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::StackFleetAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::StackUserAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
+                        "SendEmailNotification": {
+                            "type": "boolean"
+                        },
+                        "StackName": {
+                            "type": "string"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthenticationType",
+                        "StackName",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::StackUserAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
+                        "FirstName": {
+                            "type": "string"
+                        },
+                        "LastName": {
+                            "type": "string"
+                        },
+                        "MessageAction": {
+                            "type": "string"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthenticationType",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::ApiCache": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiCachingBehavior": {
+                            "type": "string"
+                        },
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "AtRestEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "TransitEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "Ttl": {
+                            "type": "number"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiCachingBehavior",
+                        "ApiId",
+                        "Ttl",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::ApiCache"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::ApiKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ApiKeyId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Expires": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "ApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::ApiKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DynamoDBConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.DynamoDBConfig"
+                        },
+                        "ElasticsearchConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.ElasticsearchConfig"
+                        },
+                        "HttpConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.HttpConfig"
+                        },
+                        "LambdaConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.LambdaConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OpenSearchServiceConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.OpenSearchServiceConfig"
+                        },
+                        "RelationalDatabaseConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.RelationalDatabaseConfig"
+                        },
+                        "ServiceRoleArn": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::DataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.AuthorizationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationType": {
+                    "type": "string"
+                },
+                "AwsIamConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::DataSource.AwsIamConfig"
+                }
+            },
+            "required": [
+                "AuthorizationType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.AwsIamConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SigningRegion": {
+                    "type": "string"
+                },
+                "SigningServiceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.DeltaSyncConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseTableTTL": {
+                    "type": "string"
+                },
+                "DeltaSyncTableName": {
+                    "type": "string"
+                },
+                "DeltaSyncTableTTL": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BaseTableTTL",
+                "DeltaSyncTableName",
+                "DeltaSyncTableTTL"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.DynamoDBConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "DeltaSyncConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::DataSource.DeltaSyncConfig"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "UseCallerCredentials": {
+                    "type": "boolean"
+                },
+                "Versioned": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AwsRegion",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.ElasticsearchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "Endpoint": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AwsRegion",
+                "Endpoint"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.HttpConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::DataSource.AuthorizationConfig"
+                },
+                "Endpoint": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.LambdaConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaFunctionArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaFunctionArn"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.OpenSearchServiceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "Endpoint": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AwsRegion",
+                "Endpoint"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.RdsHttpEndpointConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "AwsSecretStoreArn": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DbClusterIdentifier": {
+                    "type": "string"
+                },
+                "Schema": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AwsRegion",
+                "AwsSecretStoreArn",
+                "DbClusterIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.RelationalDatabaseConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RdsHttpEndpointConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::DataSource.RdsHttpEndpointConfig"
+                },
+                "RelationalDatabaseSourceType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RelationalDatabaseSourceType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::FunctionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "DataSourceName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FunctionVersion": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RequestMappingTemplate": {
+                            "type": "string"
+                        },
+                        "RequestMappingTemplateS3Location": {
+                            "type": "string"
+                        },
+                        "ResponseMappingTemplate": {
+                            "type": "string"
+                        },
+                        "ResponseMappingTemplateS3Location": {
+                            "type": "string"
+                        },
+                        "SyncConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::FunctionConfiguration.SyncConfig"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "DataSourceName",
+                        "FunctionVersion",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::FunctionConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::FunctionConfiguration.LambdaConflictHandlerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaConflictHandlerArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::FunctionConfiguration.SyncConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConflictDetection": {
+                    "type": "string"
+                },
+                "ConflictHandler": {
+                    "type": "string"
+                },
+                "LambdaConflictHandlerConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::FunctionConfiguration.LambdaConflictHandlerConfig"
+                }
+            },
+            "required": [
+                "ConflictDetection"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdditionalAuthenticationProviders": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.AdditionalAuthenticationProviders"
+                        },
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
+                        "LambdaAuthorizerConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.LambdaAuthorizerConfig"
+                        },
+                        "LogConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.LogConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OpenIDConnectConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.OpenIDConnectConfig"
+                        },
+                        "Tags": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.Tags"
+                        },
+                        "UserPoolConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.UserPoolConfig"
+                        },
+                        "XrayEnabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "AuthenticationType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::GraphQLApi"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.AdditionalAuthenticationProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationType": {
+                    "type": "string"
+                },
+                "LambdaAuthorizerConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::GraphQLApi.LambdaAuthorizerConfig"
+                },
+                "OpenIDConnectConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::GraphQLApi.OpenIDConnectConfig"
+                },
+                "UserPoolConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::GraphQLApi.CognitoUserPoolConfig"
+                }
+            },
+            "required": [
+                "AuthenticationType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.AdditionalAuthenticationProviders": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.CognitoUserPoolConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AppIdClientRegex": {
+                    "type": "string"
+                },
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "UserPoolId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.LambdaAuthorizerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizerResultTtlInSeconds": {
+                    "type": "number"
+                },
+                "AuthorizerUri": {
+                    "type": "string"
+                },
+                "IdentityValidationExpression": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.LogConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsRoleArn": {
+                    "type": "string"
+                },
+                "ExcludeVerboseContent": {
+                    "type": "boolean"
+                },
+                "FieldLogLevel": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.OpenIDConnectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthTTL": {
+                    "type": "number"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "IatTTL": {
+                    "type": "number"
+                },
+                "Issuer": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.Tags": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.UserPoolConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AppIdClientRegex": {
+                    "type": "string"
+                },
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "DefaultAction": {
+                    "type": "string"
+                },
+                "UserPoolId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "Definition": {
+                            "type": "string"
+                        },
+                        "DefinitionS3Location": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::GraphQLSchema"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::Resolver": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "CachingConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::Resolver.CachingConfig"
+                        },
+                        "DataSourceName": {
+                            "type": "string"
+                        },
+                        "FieldName": {
+                            "type": "string"
+                        },
+                        "Kind": {
+                            "type": "string"
+                        },
+                        "PipelineConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::Resolver.PipelineConfig"
+                        },
+                        "RequestMappingTemplate": {
+                            "type": "string"
+                        },
+                        "RequestMappingTemplateS3Location": {
+                            "type": "string"
+                        },
+                        "ResponseMappingTemplate": {
+                            "type": "string"
+                        },
+                        "ResponseMappingTemplateS3Location": {
+                            "type": "string"
+                        },
+                        "SyncConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::Resolver.SyncConfig"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "FieldName",
+                        "TypeName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::Resolver"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::Resolver.CachingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CachingKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Ttl": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::Resolver.LambdaConflictHandlerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaConflictHandlerArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::Resolver.PipelineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Functions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::Resolver.SyncConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConflictDetection": {
+                    "type": "string"
+                },
+                "ConflictHandler": {
+                    "type": "string"
+                },
+                "LambdaConflictHandlerConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::Resolver.LambdaConflictHandlerConfig"
+                }
+            },
+            "required": [
+                "ConflictDetection"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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",
+                        "RoleARN",
+                        "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyName": {
+                            "type": "string"
+                        },
+                        "PolicyType": {
+                            "type": "string"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "ScalableDimension": {
+                            "type": "string"
+                        },
+                        "ScalingTargetId": {
+                            "type": "string"
+                        },
+                        "ServiceNamespace": {
+                            "type": "string"
+                        },
+                        "StepScalingPolicyConfiguration": {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.StepScalingPolicyConfiguration"
+                        },
+                        "TargetTrackingScalingPolicyConfiguration": {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.TargetTrackingScalingPolicyConfiguration"
+                        }
+                    },
+                    "required": [
+                        "PolicyName",
+                        "PolicyType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApplicationAutoScaling::ScalingPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.CustomizedMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "Namespace",
+                "Statistic"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.PredefinedMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.StepAdjustment": {
+            "additionalProperties": false,
+            "properties": {
+                "MetricIntervalLowerBound": {
+                    "type": "number"
+                },
+                "MetricIntervalUpperBound": {
+                    "type": "number"
+                },
+                "ScalingAdjustment": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ScalingAdjustment"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.StepScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AdjustmentType": {
+                    "type": "string"
+                },
+                "Cooldown": {
+                    "type": "number"
+                },
+                "MetricAggregationType": {
+                    "type": "string"
+                },
+                "MinAdjustmentMagnitude": {
+                    "type": "number"
+                },
+                "StepAdjustments": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.StepAdjustment"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.TargetTrackingScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomizedMetricSpecification": {
+                    "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.CustomizedMetricSpecification"
+                },
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "PredefinedMetricSpecification": {
+                    "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.PredefinedMetricSpecification"
+                },
+                "ScaleInCooldown": {
+                    "type": "number"
+                },
+                "ScaleOutCooldown": {
+                    "type": "number"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoConfigurationEnabled": {
+                            "type": "boolean"
+                        },
+                        "CWEMonitorEnabled": {
+                            "type": "boolean"
+                        },
+                        "ComponentMonitoringSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApplicationInsights::Application.ComponentMonitoringSetting"
+                            },
+                            "type": "array"
+                        },
+                        "CustomComponents": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApplicationInsights::Application.CustomComponent"
+                            },
+                            "type": "array"
+                        },
+                        "LogPatternSets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApplicationInsights::Application.LogPatternSet"
+                            },
+                            "type": "array"
+                        },
+                        "OpsCenterEnabled": {
+                            "type": "boolean"
+                        },
+                        "OpsItemSNSTopicArn": {
+                            "type": "string"
+                        },
+                        "ResourceGroupName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ResourceGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApplicationInsights::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.Alarm": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmName": {
+                    "type": "string"
+                },
+                "Severity": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AlarmName"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.AlarmMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmMetricName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AlarmMetricName"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.ComponentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfigurationDetails": {
+                    "$ref": "#/definitions/AWS::ApplicationInsights::Application.ConfigurationDetails"
+                },
+                "SubComponentTypeConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.SubComponentTypeConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.ComponentMonitoringSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentARN": {
+                    "type": "string"
+                },
+                "ComponentConfigurationMode": {
+                    "type": "string"
+                },
+                "ComponentName": {
+                    "type": "string"
+                },
+                "CustomComponentConfiguration": {
+                    "$ref": "#/definitions/AWS::ApplicationInsights::Application.ComponentConfiguration"
+                },
+                "DefaultOverwriteComponentConfiguration": {
+                    "$ref": "#/definitions/AWS::ApplicationInsights::Application.ComponentConfiguration"
+                },
+                "Tier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComponentConfigurationMode",
+                "Tier"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.ConfigurationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmMetrics": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.AlarmMetric"
+                    },
+                    "type": "array"
+                },
+                "Alarms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.Alarm"
+                    },
+                    "type": "array"
+                },
+                "JMXPrometheusExporter": {
+                    "$ref": "#/definitions/AWS::ApplicationInsights::Application.JMXPrometheusExporter"
+                },
+                "Logs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.Log"
+                    },
+                    "type": "array"
+                },
+                "WindowsEvents": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.WindowsEvent"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.CustomComponent": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentName": {
+                    "type": "string"
+                },
+                "ResourceList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ComponentName",
+                "ResourceList"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.JMXPrometheusExporter": {
+            "additionalProperties": false,
+            "properties": {
+                "HostPort": {
+                    "type": "string"
+                },
+                "JMXURL": {
+                    "type": "string"
+                },
+                "PrometheusPort": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.Log": {
+            "additionalProperties": false,
+            "properties": {
+                "Encoding": {
+                    "type": "string"
+                },
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "LogPath": {
+                    "type": "string"
+                },
+                "LogType": {
+                    "type": "string"
+                },
+                "PatternSet": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogType"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.LogPattern": {
+            "additionalProperties": false,
+            "properties": {
+                "Pattern": {
+                    "type": "string"
+                },
+                "PatternName": {
+                    "type": "string"
+                },
+                "Rank": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Pattern",
+                "PatternName",
+                "Rank"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.LogPatternSet": {
+            "additionalProperties": false,
+            "properties": {
+                "LogPatterns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.LogPattern"
+                    },
+                    "type": "array"
+                },
+                "PatternSetName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogPatterns",
+                "PatternSetName"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.SubComponentConfigurationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmMetrics": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.AlarmMetric"
+                    },
+                    "type": "array"
+                },
+                "Logs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.Log"
+                    },
+                    "type": "array"
+                },
+                "WindowsEvents": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.WindowsEvent"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.SubComponentTypeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SubComponentConfigurationDetails": {
+                    "$ref": "#/definitions/AWS::ApplicationInsights::Application.SubComponentConfigurationDetails"
+                },
+                "SubComponentType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubComponentConfigurationDetails",
+                "SubComponentType"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.WindowsEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "EventLevels": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EventName": {
+                    "type": "string"
+                },
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "PatternSet": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventLevels",
+                "EventName",
+                "LogGroupName"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::DataCatalog": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::DataCatalog"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::NamedQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Database": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QueryString": {
+                            "type": "string"
+                        },
+                        "WorkGroup": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Database",
+                        "QueryString"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::NamedQuery"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::PreparedStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "QueryStatement": {
+                            "type": "string"
+                        },
+                        "StatementName": {
+                            "type": "string"
+                        },
+                        "WorkGroup": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "QueryStatement",
+                        "StatementName",
+                        "WorkGroup"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::PreparedStatement"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RecursiveDeleteOption": {
+                            "type": "boolean"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkGroupConfiguration": {
+                            "$ref": "#/definitions/AWS::Athena::WorkGroup.WorkGroupConfiguration"
+                        },
+                        "WorkGroupConfigurationUpdates": {
+                            "$ref": "#/definitions/AWS::Athena::WorkGroup.WorkGroupConfigurationUpdates"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::WorkGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionOption": {
+                    "type": "string"
+                },
+                "KmsKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionOption"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.EngineVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "EffectiveEngineVersion": {
+                    "type": "string"
+                },
+                "SelectedEngineVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.ResultConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.EncryptionConfiguration"
+                },
+                "OutputLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.ResultConfigurationUpdates": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.EncryptionConfiguration"
+                },
+                "OutputLocation": {
+                    "type": "string"
+                },
+                "RemoveEncryptionConfiguration": {
+                    "type": "boolean"
+                },
+                "RemoveOutputLocation": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.WorkGroupConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BytesScannedCutoffPerQuery": {
+                    "type": "number"
+                },
+                "EnforceWorkGroupConfiguration": {
+                    "type": "boolean"
+                },
+                "EngineVersion": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.EngineVersion"
+                },
+                "PublishCloudWatchMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "RequesterPaysEnabled": {
+                    "type": "boolean"
+                },
+                "ResultConfiguration": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.ResultConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.WorkGroupConfigurationUpdates": {
+            "additionalProperties": false,
+            "properties": {
+                "BytesScannedCutoffPerQuery": {
+                    "type": "number"
+                },
+                "EnforceWorkGroupConfiguration": {
+                    "type": "boolean"
+                },
+                "EngineVersion": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.EngineVersion"
+                },
+                "PublishCloudWatchMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "RemoveBytesScannedCutoffPerQuery": {
+                    "type": "boolean"
+                },
+                "RequesterPaysEnabled": {
+                    "type": "boolean"
+                },
+                "ResultConfigurationUpdates": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.ResultConfigurationUpdates"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssessmentReportsDestination": {
+                            "$ref": "#/definitions/AWS::AuditManager::Assessment.AssessmentReportsDestination"
+                        },
+                        "AwsAccount": {
+                            "$ref": "#/definitions/AWS::AuditManager::Assessment.AWSAccount"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FrameworkId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Roles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AuditManager::Assessment.Role"
+                            },
+                            "type": "array"
+                        },
+                        "Scope": {
+                            "$ref": "#/definitions/AWS::AuditManager::Assessment.Scope"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AuditManager::Assessment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.AWSAccount": {
+            "additionalProperties": false,
+            "properties": {
+                "EmailAddress": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.AWSService": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.AssessmentReportsDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                },
+                "DestinationType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.Delegation": {
+            "additionalProperties": false,
+            "properties": {
+                "AssessmentId": {
+                    "type": "string"
+                },
+                "AssessmentName": {
+                    "type": "string"
+                },
+                "Comment": {
+                    "type": "string"
+                },
+                "ControlSetId": {
+                    "type": "string"
+                },
+                "CreatedBy": {
+                    "type": "string"
+                },
+                "CreationTime": {
+                    "type": "number"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "LastUpdated": {
+                    "type": "number"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RoleType": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.Role": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RoleType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.Scope": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsAccounts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AuditManager::Assessment.AWSAccount"
+                    },
+                    "type": "array"
+                },
+                "AwsServices": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AuditManager::Assessment.AWSService"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "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": {
+                        "AutoScalingGroupName": {
+                            "type": "string"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CapacityRebalance": {
+                            "type": "boolean"
+                        },
+                        "Context": {
+                            "type": "string"
+                        },
+                        "Cooldown": {
+                            "type": "string"
+                        },
+                        "DesiredCapacity": {
+                            "type": "string"
+                        },
+                        "DesiredCapacityType": {
+                            "type": "string"
+                        },
+                        "HealthCheckGracePeriod": {
+                            "type": "number"
+                        },
+                        "HealthCheckType": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "LaunchConfigurationName": {
+                            "type": "string"
+                        },
+                        "LaunchTemplate": {
+                            "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LaunchTemplateSpecification"
+                        },
+                        "LifecycleHookSpecificationList": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LifecycleHookSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "LoadBalancerNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MaxInstanceLifetime": {
+                            "type": "number"
+                        },
+                        "MaxSize": {
+                            "type": "string"
+                        },
+                        "MetricsCollection": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.MetricsCollection"
+                            },
+                            "type": "array"
+                        },
+                        "MinSize": {
+                            "type": "string"
+                        },
+                        "MixedInstancesPolicy": {
+                            "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.MixedInstancesPolicy"
+                        },
+                        "NewInstancesProtectedFromScaleIn": {
+                            "type": "boolean"
+                        },
+                        "NotificationConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.NotificationConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "PlacementGroup": {
+                            "type": "string"
+                        },
+                        "ServiceLinkedRoleARN": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.TagProperty"
+                            },
+                            "type": "array"
+                        },
+                        "TargetGroupARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "TerminationPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VPCZoneIdentifier": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MaxSize",
+                        "MinSize"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::AutoScalingGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdatePolicy": {
+                    "type": "object"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.AcceleratorCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.AcceleratorTotalMemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.BaselineEbsBandwidthMbpsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.InstanceRequirements": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceleratorCount": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.AcceleratorCountRequest"
+                },
+                "AcceleratorManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorTotalMemoryMiB": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.AcceleratorTotalMemoryMiBRequest"
+                },
+                "AcceleratorTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BareMetal": {
+                    "type": "string"
+                },
+                "BaselineEbsBandwidthMbps": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.BaselineEbsBandwidthMbpsRequest"
+                },
+                "BurstablePerformance": {
+                    "type": "string"
+                },
+                "CpuManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExcludedInstanceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InstanceGenerations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LocalStorage": {
+                    "type": "string"
+                },
+                "LocalStorageTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MemoryGiBPerVCpu": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.MemoryGiBPerVCpuRequest"
+                },
+                "MemoryMiB": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.MemoryMiBRequest"
+                },
+                "NetworkInterfaceCount": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.NetworkInterfaceCountRequest"
+                },
+                "OnDemandMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "RequireHibernateSupport": {
+                    "type": "boolean"
+                },
+                "SpotMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "TotalLocalStorageGB": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.TotalLocalStorageGBRequest"
+                },
+                "VCpuCount": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.VCpuCountRequest"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.InstancesDistribution": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandAllocationStrategy": {
+                    "type": "string"
+                },
+                "OnDemandBaseCapacity": {
+                    "type": "number"
+                },
+                "OnDemandPercentageAboveBaseCapacity": {
+                    "type": "number"
+                },
+                "SpotAllocationStrategy": {
+                    "type": "string"
+                },
+                "SpotInstancePools": {
+                    "type": "number"
+                },
+                "SpotMaxPrice": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.LaunchTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LaunchTemplateSpecification"
+                },
+                "Overrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LaunchTemplateOverrides"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LaunchTemplateSpecification"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.LaunchTemplateOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceRequirements": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.InstanceRequirements"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "LaunchTemplateSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LaunchTemplateSpecification"
+                },
+                "WeightedCapacity": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.LaunchTemplateSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.LifecycleHookSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultResult": {
+                    "type": "string"
+                },
+                "HeartbeatTimeout": {
+                    "type": "number"
+                },
+                "LifecycleHookName": {
+                    "type": "string"
+                },
+                "LifecycleTransition": {
+                    "type": "string"
+                },
+                "NotificationMetadata": {
+                    "type": "string"
+                },
+                "NotificationTargetARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LifecycleHookName",
+                "LifecycleTransition"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.MemoryGiBPerVCpuRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.MemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.MetricsCollection": {
+            "additionalProperties": false,
+            "properties": {
+                "Granularity": {
+                    "type": "string"
+                },
+                "Metrics": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Granularity"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.MixedInstancesPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "InstancesDistribution": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.InstancesDistribution"
+                },
+                "LaunchTemplate": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LaunchTemplate"
+                }
+            },
+            "required": [
+                "LaunchTemplate"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.NetworkInterfaceCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NotificationTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TopicARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TopicARN"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.TagProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "PropagateAtLaunch": {
+                    "type": "boolean"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "PropagateAtLaunch",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.TotalLocalStorageGBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.VCpuCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::LaunchConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatePublicIpAddress": {
+                            "type": "boolean"
+                        },
+                        "BlockDeviceMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::LaunchConfiguration.BlockDeviceMapping"
+                            },
+                            "type": "array"
+                        },
+                        "ClassicLinkVPCId": {
+                            "type": "string"
+                        },
+                        "ClassicLinkVPCSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EbsOptimized": {
+                            "type": "boolean"
+                        },
+                        "IamInstanceProfile": {
+                            "type": "string"
+                        },
+                        "ImageId": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "InstanceMonitoring": {
+                            "type": "boolean"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "KernelId": {
+                            "type": "string"
+                        },
+                        "KeyName": {
+                            "type": "string"
+                        },
+                        "LaunchConfigurationName": {
+                            "type": "string"
+                        },
+                        "MetadataOptions": {
+                            "$ref": "#/definitions/AWS::AutoScaling::LaunchConfiguration.MetadataOptions"
+                        },
+                        "PlacementTenancy": {
+                            "type": "string"
+                        },
+                        "RamDiskId": {
+                            "type": "string"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SpotPrice": {
+                            "type": "string"
+                        },
+                        "UserData": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ImageId",
+                        "InstanceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::LaunchConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::LaunchConfiguration.BlockDevice": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "Throughput": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::LaunchConfiguration.BlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::AutoScaling::LaunchConfiguration.BlockDevice"
+                },
+                "NoDevice": {
+                    "type": "boolean"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeviceName"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::LaunchConfiguration.MetadataOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpEndpoint": {
+                    "type": "string"
+                },
+                "HttpPutResponseHopLimit": {
+                    "type": "number"
+                },
+                "HttpTokens": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::LifecycleHook": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DefaultResult": {
+                            "type": "string"
+                        },
+                        "HeartbeatTimeout": {
+                            "type": "number"
+                        },
+                        "LifecycleHookName": {
+                            "type": "string"
+                        },
+                        "LifecycleTransition": {
+                            "type": "string"
+                        },
+                        "NotificationMetadata": {
+                            "type": "string"
+                        },
+                        "NotificationTargetARN": {
+                            "type": "string"
+                        },
+                        "RoleARN": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupName",
+                        "LifecycleTransition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::LifecycleHook"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdjustmentType": {
+                            "type": "string"
+                        },
+                        "AutoScalingGroupName": {
+                            "type": "string"
+                        },
+                        "Cooldown": {
+                            "type": "string"
+                        },
+                        "EstimatedInstanceWarmup": {
+                            "type": "number"
+                        },
+                        "MetricAggregationType": {
+                            "type": "string"
+                        },
+                        "MinAdjustmentMagnitude": {
+                            "type": "number"
+                        },
+                        "PolicyType": {
+                            "type": "string"
+                        },
+                        "PredictiveScalingConfiguration": {
+                            "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredictiveScalingConfiguration"
+                        },
+                        "ScalingAdjustment": {
+                            "type": "number"
+                        },
+                        "StepAdjustments": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.StepAdjustment"
+                            },
+                            "type": "array"
+                        },
+                        "TargetTrackingConfiguration": {
+                            "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.TargetTrackingConfiguration"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::ScalingPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.CustomizedMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "Namespace",
+                "Statistic"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredefinedMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredictiveScalingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacityBreachBehavior": {
+                    "type": "string"
+                },
+                "MaxCapacityBuffer": {
+                    "type": "number"
+                },
+                "MetricSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredictiveScalingMetricSpecification"
+                    },
+                    "type": "array"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "SchedulingBufferTime": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MetricSpecifications"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredictiveScalingMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedLoadMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedLoadMetric"
+                },
+                "PredefinedMetricPairSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedMetricPair"
+                },
+                "PredefinedScalingMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedScalingMetric"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedLoadMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedMetricPair": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedScalingMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.StepAdjustment": {
+            "additionalProperties": false,
+            "properties": {
+                "MetricIntervalLowerBound": {
+                    "type": "number"
+                },
+                "MetricIntervalUpperBound": {
+                    "type": "number"
+                },
+                "ScalingAdjustment": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ScalingAdjustment"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.TargetTrackingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomizedMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.CustomizedMetricSpecification"
+                },
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "PredefinedMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredefinedMetricSpecification"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScheduledAction": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "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::AutoScalingPlans::ScalingPlan": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationSource": {
+                            "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.ApplicationSource"
+                        },
+                        "ScalingInstructions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.ScalingInstruction"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationSource",
+                        "ScalingInstructions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScalingPlans::ScalingPlan"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.ApplicationSource": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudFormationStackARN": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.CustomizedLoadMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "Namespace",
+                "Statistic"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.CustomizedScalingMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "Namespace",
+                "Statistic"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.PredefinedLoadMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedLoadMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedLoadMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.PredefinedScalingMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedScalingMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedScalingMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.ScalingInstruction": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomizedLoadMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.CustomizedLoadMetricSpecification"
+                },
+                "DisableDynamicScaling": {
+                    "type": "boolean"
+                },
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                },
+                "PredefinedLoadMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.PredefinedLoadMetricSpecification"
+                },
+                "PredictiveScalingMaxCapacityBehavior": {
+                    "type": "string"
+                },
+                "PredictiveScalingMaxCapacityBuffer": {
+                    "type": "number"
+                },
+                "PredictiveScalingMode": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                },
+                "ScalableDimension": {
+                    "type": "string"
+                },
+                "ScalingPolicyUpdateBehavior": {
+                    "type": "string"
+                },
+                "ScheduledActionBufferTime": {
+                    "type": "number"
+                },
+                "ServiceNamespace": {
+                    "type": "string"
+                },
+                "TargetTrackingConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.TargetTrackingConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity",
+                "ResourceId",
+                "ScalableDimension",
+                "ServiceNamespace",
+                "TargetTrackingConfigurations"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.TagFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.TargetTrackingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomizedScalingMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.CustomizedScalingMetricSpecification"
+                },
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "EstimatedInstanceWarmup": {
+                    "type": "number"
+                },
+                "PredefinedScalingMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.PredefinedScalingMetricSpecification"
+                },
+                "ScaleInCooldown": {
+                    "type": "number"
+                },
+                "ScaleOutCooldown": {
+                    "type": "number"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BackupPlan": {
+                            "$ref": "#/definitions/AWS::Backup::BackupPlan.BackupPlanResourceType"
+                        },
+                        "BackupPlanTags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "BackupPlan"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Backup::BackupPlan"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan.AdvancedBackupSettingResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "BackupOptions": {
+                    "type": "object"
+                },
+                "ResourceType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BackupOptions",
+                "ResourceType"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan.BackupPlanResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "AdvancedBackupSettings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Backup::BackupPlan.AdvancedBackupSettingResourceType"
+                    },
+                    "type": "array"
+                },
+                "BackupPlanName": {
+                    "type": "string"
+                },
+                "BackupPlanRule": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Backup::BackupPlan.BackupRuleResourceType"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "BackupPlanName",
+                "BackupPlanRule"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan.BackupRuleResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "CompletionWindowMinutes": {
+                    "type": "number"
+                },
+                "CopyActions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Backup::BackupPlan.CopyActionResourceType"
+                    },
+                    "type": "array"
+                },
+                "EnableContinuousBackup": {
+                    "type": "boolean"
+                },
+                "Lifecycle": {
+                    "$ref": "#/definitions/AWS::Backup::BackupPlan.LifecycleResourceType"
+                },
+                "RecoveryPointTags": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "RuleName": {
+                    "type": "string"
+                },
+                "ScheduleExpression": {
+                    "type": "string"
+                },
+                "StartWindowMinutes": {
+                    "type": "number"
+                },
+                "TargetBackupVault": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RuleName",
+                "TargetBackupVault"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan.CopyActionResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationBackupVaultArn": {
+                    "type": "string"
+                },
+                "Lifecycle": {
+                    "$ref": "#/definitions/AWS::Backup::BackupPlan.LifecycleResourceType"
+                }
+            },
+            "required": [
+                "DestinationBackupVaultArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan.LifecycleResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteAfterDays": {
+                    "type": "number"
+                },
+                "MoveToColdStorageAfterDays": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Backup::BackupSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BackupPlanId": {
+                            "type": "string"
+                        },
+                        "BackupSelection": {
+                            "$ref": "#/definitions/AWS::Backup::BackupSelection.BackupSelectionResourceType"
+                        }
+                    },
+                    "required": [
+                        "BackupPlanId",
+                        "BackupSelection"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Backup::BackupSelection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupSelection.BackupSelectionResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "type": "object"
+                },
+                "IamRoleArn": {
+                    "type": "string"
+                },
+                "ListOfTags": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Backup::BackupSelection.ConditionResourceType"
+                    },
+                    "type": "array"
+                },
+                "NotResources": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Resources": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SelectionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IamRoleArn",
+                "SelectionName"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupSelection.ConditionResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "ConditionKey": {
+                    "type": "string"
+                },
+                "ConditionType": {
+                    "type": "string"
+                },
+                "ConditionValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConditionKey",
+                "ConditionType",
+                "ConditionValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupVault": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessPolicy": {
+                            "type": "object"
+                        },
+                        "BackupVaultName": {
+                            "type": "string"
+                        },
+                        "BackupVaultTags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "EncryptionKeyArn": {
+                            "type": "string"
+                        },
+                        "LockConfiguration": {
+                            "$ref": "#/definitions/AWS::Backup::BackupVault.LockConfigurationType"
+                        },
+                        "Notifications": {
+                            "$ref": "#/definitions/AWS::Backup::BackupVault.NotificationObjectType"
+                        }
+                    },
+                    "required": [
+                        "BackupVaultName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Backup::BackupVault"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupVault.LockConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "ChangeableForDays": {
+                    "type": "number"
+                },
+                "MaxRetentionDays": {
+                    "type": "number"
+                },
+                "MinRetentionDays": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MinRetentionDays"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupVault.NotificationObjectType": {
+            "additionalProperties": false,
+            "properties": {
+                "BackupVaultEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SNSTopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BackupVaultEvents",
+                "SNSTopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::Framework": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FrameworkControls": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Backup::Framework.FrameworkControl"
+                            },
+                            "type": "array"
+                        },
+                        "FrameworkDescription": {
+                            "type": "string"
+                        },
+                        "FrameworkName": {
+                            "type": "string"
+                        },
+                        "FrameworkTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FrameworkControls"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Backup::Framework"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::Framework.ControlInputParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ParameterName",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::Framework.FrameworkControl": {
+            "additionalProperties": false,
+            "properties": {
+                "ControlInputParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Backup::Framework.ControlInputParameter"
+                    },
+                    "type": "array"
+                },
+                "ControlName": {
+                    "type": "string"
+                },
+                "ControlScope": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "ControlName"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::ReportPlan": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ReportDeliveryChannel": {
+                            "type": "object"
+                        },
+                        "ReportPlanDescription": {
+                            "type": "string"
+                        },
+                        "ReportPlanName": {
+                            "type": "string"
+                        },
+                        "ReportPlanTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ReportSetting": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ReportDeliveryChannel",
+                        "ReportSetting"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Backup::ReportPlan"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::ComputeEnvironment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ComputeEnvironmentName": {
+                            "type": "string"
+                        },
+                        "ComputeResources": {
+                            "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.ComputeResources"
+                        },
+                        "ServiceRole": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "UnmanagedvCpus": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Batch::ComputeEnvironment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::ComputeEnvironment.ComputeResources": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "BidPercentage": {
+                    "type": "number"
+                },
+                "DesiredvCpus": {
+                    "type": "number"
+                },
+                "Ec2Configuration": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.Ec2ConfigurationObject"
+                    },
+                    "type": "array"
+                },
+                "Ec2KeyPair": {
+                    "type": "string"
+                },
+                "ImageId": {
+                    "type": "string"
+                },
+                "InstanceRole": {
+                    "type": "string"
+                },
+                "InstanceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LaunchTemplate": {
+                    "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.LaunchTemplateSpecification"
+                },
+                "MaxvCpus": {
+                    "type": "number"
+                },
+                "MinvCpus": {
+                    "type": "number"
+                },
+                "PlacementGroup": {
+                    "type": "string"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SpotIamFleetRole": {
+                    "type": "string"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Tags": {
+                    "type": "object"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MaxvCpus",
+                "Subnets",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::ComputeEnvironment.Ec2ConfigurationObject": {
+            "additionalProperties": false,
+            "properties": {
+                "ImageIdOverride": {
+                    "type": "string"
+                },
+                "ImageType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ImageType"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::ComputeEnvironment.LaunchTemplateSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContainerProperties": {
+                            "$ref": "#/definitions/AWS::Batch::JobDefinition.ContainerProperties"
+                        },
+                        "JobDefinitionName": {
+                            "type": "string"
+                        },
+                        "NodeProperties": {
+                            "$ref": "#/definitions/AWS::Batch::JobDefinition.NodeProperties"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "PlatformCapabilities": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PropagateTags": {
+                            "type": "boolean"
+                        },
+                        "RetryStrategy": {
+                            "$ref": "#/definitions/AWS::Batch::JobDefinition.RetryStrategy"
+                        },
+                        "SchedulingPriority": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Timeout": {
+                            "$ref": "#/definitions/AWS::Batch::JobDefinition.Timeout"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Batch::JobDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.AuthorizationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessPointId": {
+                    "type": "string"
+                },
+                "Iam": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.ContainerProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Command": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Environment": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Environment"
+                    },
+                    "type": "array"
+                },
+                "ExecutionRoleArn": {
+                    "type": "string"
+                },
+                "FargatePlatformConfiguration": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.FargatePlatformConfiguration"
+                },
+                "Image": {
+                    "type": "string"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "JobRoleArn": {
+                    "type": "string"
+                },
+                "LinuxParameters": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.LinuxParameters"
+                },
+                "LogConfiguration": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.LogConfiguration"
+                },
+                "Memory": {
+                    "type": "number"
+                },
+                "MountPoints": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.MountPoints"
+                    },
+                    "type": "array"
+                },
+                "NetworkConfiguration": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.NetworkConfiguration"
+                },
+                "Privileged": {
+                    "type": "boolean"
+                },
+                "ReadonlyRootFilesystem": {
+                    "type": "boolean"
+                },
+                "ResourceRequirements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.ResourceRequirement"
+                    },
+                    "type": "array"
+                },
+                "Secrets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Secret"
+                    },
+                    "type": "array"
+                },
+                "Ulimits": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Ulimit"
+                    },
+                    "type": "array"
+                },
+                "User": {
+                    "type": "string"
+                },
+                "Vcpus": {
+                    "type": "number"
+                },
+                "Volumes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Volumes"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Image"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Device": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "HostPath": {
+                    "type": "string"
+                },
+                "Permissions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.EfsVolumeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationConfig": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.AuthorizationConfig"
+                },
+                "FileSystemId": {
+                    "type": "string"
+                },
+                "RootDirectory": {
+                    "type": "string"
+                },
+                "TransitEncryption": {
+                    "type": "string"
+                },
+                "TransitEncryptionPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FileSystemId"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.EvaluateOnExit": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "OnExitCode": {
+                    "type": "string"
+                },
+                "OnReason": {
+                    "type": "string"
+                },
+                "OnStatusReason": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.FargatePlatformConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "PlatformVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.LinuxParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Devices": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Device"
+                    },
+                    "type": "array"
+                },
+                "InitProcessEnabled": {
+                    "type": "boolean"
+                },
+                "MaxSwap": {
+                    "type": "number"
+                },
+                "SharedMemorySize": {
+                    "type": "number"
+                },
+                "Swappiness": {
+                    "type": "number"
+                },
+                "Tmpfs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Tmpfs"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.LogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogDriver": {
+                    "type": "string"
+                },
+                "Options": {
+                    "type": "object"
+                },
+                "SecretOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Secret"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LogDriver"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.MountPoints": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "ReadOnly": {
+                    "type": "boolean"
+                },
+                "SourceVolume": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AssignPublicIp": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.NodeProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "MainNode": {
+                    "type": "number"
+                },
+                "NodeRangeProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.NodeRangeProperty"
+                    },
+                    "type": "array"
+                },
+                "NumNodes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MainNode",
+                "NodeRangeProperties",
+                "NumNodes"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.NodeRangeProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Container": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.ContainerProperties"
+                },
+                "TargetNodes": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TargetNodes"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.ResourceRequirement": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.RetryStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "Attempts": {
+                    "type": "number"
+                },
+                "EvaluateOnExit": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.EvaluateOnExit"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Secret": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "ValueFrom": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "ValueFrom"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Timeout": {
+            "additionalProperties": false,
+            "properties": {
+                "AttemptDurationSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Tmpfs": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "MountOptions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Size": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ContainerPath",
+                "Size"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Ulimit": {
+            "additionalProperties": false,
+            "properties": {
+                "HardLimit": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SoftLimit": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "HardLimit",
+                "Name",
+                "SoftLimit"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Volumes": {
+            "additionalProperties": false,
+            "properties": {
+                "EfsVolumeConfiguration": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.EfsVolumeConfiguration"
+                },
+                "Host": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.VolumesHost"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.VolumesHost": {
+            "additionalProperties": false,
+            "properties": {
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobQueue": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ComputeEnvironmentOrder": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Batch::JobQueue.ComputeEnvironmentOrder"
+                            },
+                            "type": "array"
+                        },
+                        "JobQueueName": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        },
+                        "SchedulingPolicyArn": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ComputeEnvironmentOrder",
+                        "Priority"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Batch::JobQueue"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobQueue.ComputeEnvironmentOrder": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeEnvironment": {
+                    "type": "string"
+                },
+                "Order": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ComputeEnvironment",
+                "Order"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::SchedulingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FairsharePolicy": {
+                            "$ref": "#/definitions/AWS::Batch::SchedulingPolicy.FairsharePolicy"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Batch::SchedulingPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::SchedulingPolicy.FairsharePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeReservation": {
+                    "type": "number"
+                },
+                "ShareDecaySeconds": {
+                    "type": "number"
+                },
+                "ShareDistribution": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::SchedulingPolicy.ShareAttributes"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::SchedulingPolicy.ShareAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "ShareIdentifier": {
+                    "type": "string"
+                },
+                "WeightFactor": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Budgets::Budget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.BudgetData": {
+            "additionalProperties": false,
+            "properties": {
+                "BudgetLimit": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.Spend"
+                },
+                "BudgetName": {
+                    "type": "string"
+                },
+                "BudgetType": {
+                    "type": "string"
+                },
+                "CostFilters": {
+                    "type": "object"
+                },
+                "CostTypes": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.CostTypes"
+                },
+                "PlannedBudgetLimits": {
+                    "type": "object"
+                },
+                "TimePeriod": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.TimePeriod"
+                },
+                "TimeUnit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BudgetType",
+                "TimeUnit"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.CostTypes": {
+            "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"
+                },
+                "UseBlended": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.Notification": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "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.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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ActionThreshold": {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ActionThreshold"
+                        },
+                        "ActionType": {
+                            "type": "string"
+                        },
+                        "ApprovalModel": {
+                            "type": "string"
+                        },
+                        "BudgetName": {
+                            "type": "string"
+                        },
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Definition"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "NotificationType": {
+                            "type": "string"
+                        },
+                        "Subscribers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Subscriber"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ActionThreshold",
+                        "ActionType",
+                        "BudgetName",
+                        "Definition",
+                        "ExecutionRoleArn",
+                        "NotificationType",
+                        "Subscribers"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Budgets::BudgetsAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.ActionThreshold": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.Definition": {
+            "additionalProperties": false,
+            "properties": {
+                "IamActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.IamActionDefinition"
+                },
+                "ScpActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ScpActionDefinition"
+                },
+                "SsmActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.SsmActionDefinition"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.IamActionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Groups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PolicyArn": {
+                    "type": "string"
+                },
+                "Roles": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Users": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "PolicyArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.ScpActionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "PolicyId": {
+                    "type": "string"
+                },
+                "TargetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "PolicyId",
+                "TargetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.SsmActionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "Subtype": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceIds",
+                "Region",
+                "Subtype"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.Subscriber": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Address",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CE::AnomalyMonitor": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        }
+                    },
+                    "required": [
+                        "MonitorName",
+                        "MonitorType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CE::AnomalyMonitor"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CE::AnomalySubscription": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Subscribers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.Subscriber"
+                            },
+                            "type": "array"
+                        },
+                        "SubscriptionName": {
+                            "type": "string"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Frequency",
+                        "MonitorArnList",
+                        "Subscribers",
+                        "SubscriptionName",
+                        "Threshold"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CE::AnomalySubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CE::AnomalySubscription.Subscriber": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Address",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CE::CostCategory": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "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"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CUR::ReportDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CUR::ReportDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Keyspace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cassandra::Keyspace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BillingMode": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.BillingMode"
+                        },
+                        "ClusteringKeyColumns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.ClusteringKeyColumn"
+                            },
+                            "type": "array"
+                        },
+                        "DefaultTimeToLive": {
+                            "type": "number"
+                        },
+                        "EncryptionSpecification": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.EncryptionSpecification"
+                        },
+                        "KeyspaceName": {
+                            "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"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "KeyspaceName",
+                        "PartitionKeyColumns"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cassandra::Table"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "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::CertificateManager::Account": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExpiryEventsConfiguration": {
+                            "$ref": "#/definitions/AWS::CertificateManager::Account.ExpiryEventsConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ExpiryEventsConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CertificateManager::Account"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CertificateManager::Account.ExpiryEventsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DaysBeforeExpiry": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CertificateManager::Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "CertificateTransparencyLoggingPreference": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "DomainValidationOptions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CertificateManager::Certificate.DomainValidationOption"
+                            },
+                            "type": "array"
+                        },
+                        "SubjectAlternativeNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ValidationMethod": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CertificateManager::Certificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CertificateManager::Certificate.DomainValidationOption": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                },
+                "ValidationDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DomainName"
+            ],
+            "type": "object"
+        },
+        "AWS::Chatbot::SlackChannelConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigurationName": {
+                            "type": "string"
+                        },
+                        "GuardrailPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "IamRoleArn": {
+                            "type": "string"
+                        },
+                        "LoggingLevel": {
+                            "type": "string"
+                        },
+                        "SlackChannelId": {
+                            "type": "string"
+                        },
+                        "SlackWorkspaceId": {
+                            "type": "string"
+                        },
+                        "SnsTopicArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "UserRoleRequired": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationName",
+                        "IamRoleArn",
+                        "SlackChannelId",
+                        "SlackWorkspaceId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Chatbot::SlackChannelConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cloud9::EnvironmentEC2": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": [
+                        "InstanceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cloud9::EnvironmentEC2"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cloud9::EnvironmentEC2.Repository": {
+            "additionalProperties": false,
+            "properties": {
+                "PathComponent": {
+                    "type": "string"
+                },
+                "RepositoryUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PathComponent",
+                "RepositoryUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::CustomResource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::Macro": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "LogRoleARN": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FunctionName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::Macro"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::ModuleDefaultVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ModuleDefaultVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::ModuleVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ModuleName": {
+                            "type": "string"
+                        },
+                        "ModulePackage": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ModuleName",
+                        "ModulePackage"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ModuleVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::PublicTypeVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::Publisher": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptTermsAndConditions": {
+                            "type": "boolean"
+                        },
+                        "ConnectionArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AcceptTermsAndConditions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::Publisher"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::ResourceDefaultVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeVersionArn": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ResourceDefaultVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::ResourceVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::ResourceVersion.LoggingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "LogRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::Stack": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "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": {
+                            "type": "string"
+                        },
+                        "ManagedExecution": {
+                            "type": "object"
+                        },
+                        "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": [
+                        "PermissionModel",
+                        "StackSetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::StackSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.AutoDeployment": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "RetainStacksOnAccountRemoval": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.DeploymentTargets": {
+            "additionalProperties": false,
+            "properties": {
+                "Accounts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OrganizationalUnitIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.OperationPreferences": {
+            "additionalProperties": false,
+            "properties": {
+                "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": [
+                "ParameterKey",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::Distribution": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                },
+                "OriginProtocolPolicy": {
+                    "type": "string"
+                },
+                "OriginReadTimeout": {
+                    "type": "number"
+                },
+                "OriginSSLProtocols": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "OriginProtocolPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.DefaultCacheBehavior": {
+            "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"
+                },
+                "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": [
+                "TargetOriginId",
+                "ViewerProtocolPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.DistributionConfig": {
+            "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"
+                },
+                "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"
+                },
+                "ViewerCertificate": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ViewerCertificate"
+                },
+                "WebACLId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.ForwardedValues": {
+            "additionalProperties": false,
+            "properties": {
+                "Cookies": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.Cookies"
+                },
+                "Headers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "QueryString": {
+                    "type": "boolean"
+                },
+                "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"
+                },
+                "OriginProtocolPolicy": {
+                    "type": "string"
+                },
+                "OriginSSLProtocols": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DNSName",
+                "OriginProtocolPolicy",
+                "OriginSSLProtocols"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.LegacyS3Origin": {
+            "additionalProperties": false,
+            "properties": {
+                "DNSName": {
+                    "type": "string"
+                },
+                "OriginAccessIdentity": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DNSName"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "IncludeCookies": {
+                    "type": "boolean"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.Origin": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionAttempts": {
+                    "type": "number"
+                },
+                "ConnectionTimeout": {
+                    "type": "number"
+                },
+                "CustomOriginConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.CustomOriginConfig"
+                },
+                "DomainName": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "OriginCustomHeaders": {
+                    "items": {
+                        "$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": [
+                "DomainName",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.OriginCustomHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderName": {
+                    "type": "string"
+                },
+                "HeaderValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HeaderName",
+                "HeaderValue"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.OriginGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "FailoverCriteria": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroupFailoverCriteria"
+                },
+                "Id": {
+                    "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": {
+                    "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"
+                },
+                "Quantity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Quantity"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.OriginShield": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "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"
+                    },
+                    "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"
+                },
+                "MinimumProtocolVersion": {
+                    "type": "string"
+                },
+                "SslSupportMethod": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFront::Function": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoPublish": {
+                            "type": "boolean"
+                        },
+                        "FunctionCode": {
+                            "type": "string"
+                        },
+                        "FunctionConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::Function.FunctionConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::Function"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Function.FunctionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "Runtime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Comment",
+                "Runtime"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Function.FunctionMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionARN": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFront::KeyGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "KeyGroupConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::KeyGroup.KeyGroupConfig"
+                        }
+                    },
+                    "required": [
+                        "KeyGroupConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::KeyGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "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::OriginRequestPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "OriginRequestPolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.OriginRequestPolicyConfig"
+                        }
+                    },
+                    "required": [
+                        "OriginRequestPolicyConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::OriginRequestPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::OriginRequestPolicy.CookiesConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CookieBehavior": {
+                    "type": "string"
+                },
+                "Cookies": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CookieBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::OriginRequestPolicy.HeadersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderBehavior": {
+                    "type": "string"
+                },
+                "Headers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "HeaderBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::OriginRequestPolicy.OriginRequestPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "CookiesConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.CookiesConfig"
+                },
+                "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::CloudFront::OriginRequestPolicy.QueryStringsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryStringBehavior": {
+                    "type": "string"
+                },
+                "QueryStrings": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "QueryStringBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::PublicKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PublicKeyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::PublicKey.PublicKeyConfig"
+                        }
+                    },
+                    "required": [
+                        "PublicKeyConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::PublicKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::PublicKey.PublicKeyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CallerReference": {
+                    "type": "string"
+                },
+                "Comment": {
+                    "type": "string"
+                },
+                "EncodedKey": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CallerReference",
+                "EncodedKey",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::RealtimeLogConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        }
+                    },
+                    "required": [
+                        "EndPoints",
+                        "Fields",
+                        "Name",
+                        "SamplingRate"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::RealtimeLogConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::RealtimeLogConfig.EndPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "KinesisStreamConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::RealtimeLogConfig.KinesisStreamConfig"
+                },
+                "StreamType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KinesisStreamConfig",
+                "StreamType"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::RealtimeLogConfig.KinesisStreamConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "StreamArn"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResponseHeadersPolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ResponseHeadersPolicyConfig"
+                        }
+                    },
+                    "required": [
+                        "ResponseHeadersPolicyConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::ResponseHeadersPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "Items": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Items"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowMethods": {
+            "additionalProperties": false,
+            "properties": {
+                "Items": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Items"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowOrigins": {
+            "additionalProperties": false,
+            "properties": {
+                "Items": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Items"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlExposeHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "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::CloudFront::ResponseHeadersPolicy.ContentTypeOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Override": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Override"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.CorsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessControlAllowCredentials": {
+                    "type": "boolean"
+                },
+                "AccessControlAllowHeaders": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowHeaders"
+                },
+                "AccessControlAllowMethods": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowMethods"
+                },
+                "AccessControlAllowOrigins": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowOrigins"
+                },
+                "AccessControlExposeHeaders": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlExposeHeaders"
+                },
+                "AccessControlMaxAgeSec": {
+                    "type": "number"
+                },
+                "OriginOverride": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AccessControlAllowCredentials",
+                "AccessControlAllowHeaders",
+                "AccessControlAllowMethods",
+                "AccessControlAllowOrigins",
+                "OriginOverride"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.CustomHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "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::CloudFront::ResponseHeadersPolicy.CustomHeader"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Items"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.FrameOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "FrameOption": {
+                    "type": "string"
+                },
+                "Override": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "FrameOption",
+                "Override"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.ReferrerPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Override": {
+                    "type": "boolean"
+                },
+                "ReferrerPolicy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Override",
+                "ReferrerPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.ResponseHeadersPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "CorsConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.CorsConfig"
+                },
+                "CustomHeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.CustomHeadersConfig"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SecurityHeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.SecurityHeadersConfig"
+                }
+            },
+            "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.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::CloudFront::StreamingDistribution": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "StreamingDistributionConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution.StreamingDistributionConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "StreamingDistributionConfig",
+                        "Tags"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::StreamingDistribution"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "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::Trail": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "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"
+                        }
+                    },
+                    "required": [
+                        "IsLogging",
+                        "S3BucketName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudTrail::Trail"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudTrail::Trail.DataResource": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "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"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        },
+                        "ThresholdMetricId": {
+                            "type": "string"
+                        },
+                        "TreatMissingData": {
+                            "type": "string"
+                        },
+                        "Unit": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ComparisonOperator",
+                        "EvaluationPeriods"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::Alarm"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Configuration"
+                        },
+                        "Dimensions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
+                            },
+                            "type": "array"
+                        },
+                        "MetricMathAnomalyDetector": {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricMathAnomalyDetector"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Namespace": {
+                            "type": "string"
+                        },
+                        "SingleMetricAnomalyDetector": {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector"
+                        },
+                        "Stat": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::AnomalyDetector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "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": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.Metric": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "Namespace"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.MetricDataQueries": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.MetricDataQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Label": {
+                    "type": "string"
+                },
+                "MetricStat": {
+                    "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricStat"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "ReturnData": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "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": {
+                "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ActionsEnabled": {
+                            "type": "boolean"
+                        },
+                        "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"
+                        }
+                    },
+                    "required": [
+                        "AlarmName",
+                        "AlarmRule"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::CompositeAlarm"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::Dashboard": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DashboardBody": {
+                            "type": "string"
+                        },
+                        "DashboardName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DashboardBody"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::Dashboard"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::InsightRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RuleBody": {
+                            "type": "string"
+                        },
+                        "RuleName": {
+                            "type": "string"
+                        },
+                        "RuleState": {
+                            "type": "string"
+                        },
+                        "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExcludeFilters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamFilter"
+                            },
+                            "type": "array"
+                        },
+                        "FirehoseArn": {
+                            "type": "string"
+                        },
+                        "IncludeFilters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamFilter"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OutputFormat": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FirehoseArn",
+                        "OutputFormat",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::MetricStream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::MetricStream.MetricStreamFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Namespace"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeArtifact::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::Repository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                    "type": "string"
+                },
+                "EnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeBuild::Project.EnvironmentVariable"
+                    },
+                    "type": "array"
+                },
+                "Image": {
+                    "type": "string"
+                },
+                "ImagePullCredentialsType": {
+                    "type": "string"
+                },
+                "PrivilegedMode": {
+                    "type": "boolean"
+                },
+                "RegistryCredential": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.RegistryCredential"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComputeType",
+                "Image",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.EnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.FilterGroup": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.GitSubmodulesConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FetchSubmodules": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "FetchSubmodules"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.LogsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogs": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.CloudWatchLogsConfig"
+                },
+                "S3Logs": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.S3LogsConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.ProjectBuildBatchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchReportMode": {
+                    "type": "string"
+                },
+                "CombineArtifacts": {
+                    "type": "boolean"
+                },
+                "Restrictions": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.BatchRestrictions"
+                },
+                "ServiceRole": {
+                    "type": "string"
+                },
+                "TimeoutInMins": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.ProjectCache": {
+            "additionalProperties": false,
+            "properties": {
+                "Location": {
+                    "type": "string"
+                },
+                "Modes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.ProjectFileSystemLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "Identifier": {
+                    "type": "string"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "MountOptions": {
+                    "type": "string"
+                },
+                "MountPoint": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Identifier",
+                "Location",
+                "MountPoint",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.ProjectSourceVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceIdentifier": {
+                    "type": "string"
+                },
+                "SourceVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourceIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.ProjectTriggers": {
+            "additionalProperties": false,
+            "properties": {
+                "BuildType": {
+                    "type": "string"
+                },
+                "FilterGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeBuild::Project.FilterGroup"
+                    },
+                    "type": "array"
+                },
+                "Webhook": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.RegistryCredential": {
+            "additionalProperties": false,
+            "properties": {
+                "Credential": {
+                    "type": "string"
+                },
+                "CredentialProvider": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Credential",
+                "CredentialProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.S3LogsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionDisabled": {
+                    "type": "boolean"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.Source": {
+            "additionalProperties": false,
+            "properties": {
+                "Auth": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.SourceAuth"
+                },
+                "BuildSpec": {
+                    "type": "string"
+                },
+                "BuildStatusConfig": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.BuildStatusConfig"
+                },
+                "GitCloneDepth": {
+                    "type": "number"
+                },
+                "GitSubmodulesConfig": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.GitSubmodulesConfig"
+                },
+                "InsecureSsl": {
+                    "type": "boolean"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "ReportBuildStatus": {
+                    "type": "boolean"
+                },
+                "SourceIdentifier": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.SourceAuth": {
+            "additionalProperties": false,
+            "properties": {
+                "Resource": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.WebhookFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludeMatchedPattern": {
+                    "type": "boolean"
+                },
+                "Pattern": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Pattern",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::ReportGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeleteReports": {
+                            "type": "boolean"
+                        },
+                        "ExportConfig": {
+                            "$ref": "#/definitions/AWS::CodeBuild::ReportGroup.ReportExportConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ExportConfig",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeBuild::ReportGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::ReportGroup.ReportExportConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ExportConfigType": {
+                    "type": "string"
+                },
+                "S3Destination": {
+                    "$ref": "#/definitions/AWS::CodeBuild::ReportGroup.S3ReportExportConfig"
+                }
+            },
+            "required": [
+                "ExportConfigType"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::ReportGroup.S3ReportExportConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "BucketOwner": {
+                    "type": "string"
+                },
+                "EncryptionDisabled": {
+                    "type": "boolean"
+                },
+                "EncryptionKey": {
+                    "type": "string"
+                },
+                "Packaging": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::SourceCredential": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthType": {
+                            "type": "string"
+                        },
+                        "ServerType": {
+                            "type": "string"
+                        },
+                        "Token": {
+                            "type": "string"
+                        },
+                        "Username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthType",
+                        "ServerType",
+                        "Token"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeBuild::SourceCredential"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeCommit::Repository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Code": {
+                            "$ref": "#/definitions/AWS::CodeCommit::Repository.Code"
+                        },
+                        "RepositoryDescription": {
+                            "type": "string"
+                        },
+                        "RepositoryName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Triggers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeCommit::Repository.RepositoryTrigger"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RepositoryName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeCommit::Repository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeCommit::Repository.Code": {
+            "additionalProperties": false,
+            "properties": {
+                "BranchName": {
+                    "type": "string"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::CodeCommit::Repository.S3"
+                }
+            },
+            "required": [
+                "S3"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeCommit::Repository.RepositoryTrigger": {
+            "additionalProperties": false,
+            "properties": {
+                "Branches": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CustomData": {
+                    "type": "string"
+                },
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Events": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationArn",
+                "Events",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeCommit::Repository.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "ComputePlatform": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeDeploy::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ComputePlatform": {
+                            "type": "string"
+                        },
+                        "DeploymentConfigName": {
+                            "type": "string"
+                        },
+                        "MinimumHealthyHosts": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentConfig.MinimumHealthyHosts"
+                        },
+                        "TrafficRoutingConfig": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentConfig.TrafficRoutingConfig"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeDeploy::DeploymentConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentConfig.MinimumHealthyHosts": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentConfig.TimeBasedCanary": {
+            "additionalProperties": false,
+            "properties": {
+                "CanaryInterval": {
+                    "type": "number"
+                },
+                "CanaryPercentage": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "CanaryInterval",
+                "CanaryPercentage"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentConfig.TimeBasedLinear": {
+            "additionalProperties": false,
+            "properties": {
+                "LinearInterval": {
+                    "type": "number"
+                },
+                "LinearPercentage": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "LinearInterval",
+                "LinearPercentage"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentConfig.TrafficRoutingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TimeBasedCanary": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentConfig.TimeBasedCanary"
+                },
+                "TimeBasedLinear": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentConfig.TimeBasedLinear"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AlarmConfiguration": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.AlarmConfiguration"
+                        },
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "AutoRollbackConfiguration": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.AutoRollbackConfiguration"
+                        },
+                        "AutoScalingGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BlueGreenDeploymentConfiguration": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.BlueGreenDeploymentConfiguration"
+                        },
+                        "Deployment": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.Deployment"
+                        },
+                        "DeploymentConfigName": {
+                            "type": "string"
+                        },
+                        "DeploymentGroupName": {
+                            "type": "string"
+                        },
+                        "DeploymentStyle": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.DeploymentStyle"
+                        },
+                        "ECSServices": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.ECSService"
+                            },
+                            "type": "array"
+                        },
+                        "Ec2TagFilters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.EC2TagFilter"
+                            },
+                            "type": "array"
+                        },
+                        "Ec2TagSet": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.EC2TagSet"
+                        },
+                        "LoadBalancerInfo": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.LoadBalancerInfo"
+                        },
+                        "OnPremisesInstanceTagFilters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.TagFilter"
+                            },
+                            "type": "array"
+                        },
+                        "OnPremisesTagSet": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSet"
+                        },
+                        "ServiceRoleArn": {
+                            "type": "string"
+                        },
+                        "TriggerConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.TriggerConfig"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "ServiceRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeDeploy::DeploymentGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.Alarm": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.AlarmConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Alarms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.Alarm"
+                    },
+                    "type": "array"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "IgnorePollAlarmFailure": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.AutoRollbackConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Events": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.BlueGreenDeploymentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeploymentReadyOption": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.DeploymentReadyOption"
+                },
+                "GreenFleetProvisioningOption": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.GreenFleetProvisioningOption"
+                },
+                "TerminateBlueInstancesOnDeploymentSuccess": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.BlueInstanceTerminationOption"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.BlueInstanceTerminationOption": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "TerminationWaitTimeInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.Deployment": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "IgnoreApplicationStopFailures": {
+                    "type": "boolean"
+                },
+                "Revision": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.RevisionLocation"
+                }
+            },
+            "required": [
+                "Revision"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.DeploymentReadyOption": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionOnTimeout": {
+                    "type": "string"
+                },
+                "WaitTimeInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.DeploymentStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "DeploymentOption": {
+                    "type": "string"
+                },
+                "DeploymentType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.EC2TagFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.EC2TagSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Ec2TagSetList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.EC2TagSetListObject"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.EC2TagSetListObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Ec2TagGroup": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.EC2TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.ECSService": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClusterName",
+                "ServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.ELBInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.GitHubLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "CommitId": {
+                    "type": "string"
+                },
+                "Repository": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CommitId",
+                "Repository"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.GreenFleetProvisioningOption": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.LoadBalancerInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "ElbInfoList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.ELBInfo"
+                    },
+                    "type": "array"
+                },
+                "TargetGroupInfoList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.TargetGroupInfo"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSet": {
+            "additionalProperties": false,
+            "properties": {
+                "OnPremisesTagSetList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSetListObject"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSetListObject": {
+            "additionalProperties": false,
+            "properties": {
+                "OnPremisesTagGroup": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.RevisionLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "GitHubLocation": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.GitHubLocation"
+                },
+                "RevisionType": {
+                    "type": "string"
+                },
+                "S3Location": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.S3Location"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "BundleType": {
+                    "type": "string"
+                },
+                "ETag": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.TagFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.TargetGroupInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.TriggerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TriggerEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TriggerName": {
+                    "type": "string"
+                },
+                "TriggerTargetArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeGuruProfiler::ProfilingGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AgentPermissions": {
+                            "type": "object"
+                        },
+                        "AnomalyDetectionNotificationConfiguration": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeGuruProfiler::ProfilingGroup.Channel"
+                            },
+                            "type": "array"
+                        },
+                        "ComputePlatform": {
+                            "type": "string"
+                        },
+                        "ProfilingGroupName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ProfilingGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeGuruProfiler::ProfilingGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeGuruProfiler::ProfilingGroup.Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "channelId": {
+                    "type": "string"
+                },
+                "channelUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "channelUri"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeGuruReviewer::RepositoryAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BucketName": {
+                            "type": "string"
+                        },
+                        "ConnectionArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Owner": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeGuruReviewer::RepositoryAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::CustomActionType": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Category": {
+                            "type": "string"
+                        },
+                        "ConfigurationProperties": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodePipeline::CustomActionType.ConfigurationProperties"
+                            },
+                            "type": "array"
+                        },
+                        "InputArtifactDetails": {
+                            "$ref": "#/definitions/AWS::CodePipeline::CustomActionType.ArtifactDetails"
+                        },
+                        "OutputArtifactDetails": {
+                            "$ref": "#/definitions/AWS::CodePipeline::CustomActionType.ArtifactDetails"
+                        },
+                        "Provider": {
+                            "type": "string"
+                        },
+                        "Settings": {
+                            "$ref": "#/definitions/AWS::CodePipeline::CustomActionType.Settings"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Category",
+                        "InputArtifactDetails",
+                        "OutputArtifactDetails",
+                        "Provider",
+                        "Version"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodePipeline::CustomActionType"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::CustomActionType.ArtifactDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumCount": {
+                    "type": "number"
+                },
+                "MinimumCount": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaximumCount",
+                "MinimumCount"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::CustomActionType.ConfigurationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Queryable": {
+                    "type": "boolean"
+                },
+                "Required": {
+                    "type": "boolean"
+                },
+                "Secret": {
+                    "type": "boolean"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Name",
+                "Required",
+                "Secret"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::CustomActionType.Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "EntityUrlTemplate": {
+                    "type": "string"
+                },
+                "ExecutionUrlTemplate": {
+                    "type": "string"
+                },
+                "RevisionUrlTemplate": {
+                    "type": "string"
+                },
+                "ThirdPartyConfigurationUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ArtifactStore": {
+                            "$ref": "#/definitions/AWS::CodePipeline::Pipeline.ArtifactStore"
+                        },
+                        "ArtifactStores": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodePipeline::Pipeline.ArtifactStoreMap"
+                            },
+                            "type": "array"
+                        },
+                        "DisableInboundStageTransitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodePipeline::Pipeline.StageTransition"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RestartExecutionOnUpdate": {
+                            "type": "boolean"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Stages": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodePipeline::Pipeline.StageDeclaration"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RoleArn",
+                        "Stages"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodePipeline::Pipeline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.ActionDeclaration": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionTypeId": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.ActionTypeId"
+                },
+                "Configuration": {
+                    "type": "object"
+                },
+                "InputArtifacts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.InputArtifact"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "OutputArtifacts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.OutputArtifact"
+                    },
+                    "type": "array"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RunOrder": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ActionTypeId",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.ActionTypeId": {
+            "additionalProperties": false,
+            "properties": {
+                "Category": {
+                    "type": "string"
+                },
+                "Owner": {
+                    "type": "string"
+                },
+                "Provider": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Category",
+                "Owner",
+                "Provider",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.ArtifactStore": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionKey": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.EncryptionKey"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Location",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.ArtifactStoreMap": {
+            "additionalProperties": false,
+            "properties": {
+                "ArtifactStore": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.ArtifactStore"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ArtifactStore",
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.BlockerDeclaration": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.EncryptionKey": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.InputArtifact": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.OutputArtifact": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.StageDeclaration": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.ActionDeclaration"
+                    },
+                    "type": "array"
+                },
+                "Blockers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.BlockerDeclaration"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.StageTransition": {
+            "additionalProperties": false,
+            "properties": {
+                "Reason": {
+                    "type": "string"
+                },
+                "StageName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Reason",
+                "StageName"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Webhook": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "type": "string"
+                        },
+                        "AuthenticationConfiguration": {
+                            "$ref": "#/definitions/AWS::CodePipeline::Webhook.WebhookAuthConfiguration"
+                        },
+                        "Filters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodePipeline::Webhook.WebhookFilterRule"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RegisterWithThirdParty": {
+                            "type": "boolean"
+                        },
+                        "TargetAction": {
+                            "type": "string"
+                        },
+                        "TargetPipeline": {
+                            "type": "string"
+                        },
+                        "TargetPipelineVersion": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Authentication",
+                        "AuthenticationConfiguration",
+                        "Filters",
+                        "TargetAction",
+                        "TargetPipeline",
+                        "TargetPipelineVersion"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodePipeline::Webhook"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Webhook.WebhookAuthConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedIPRange": {
+                    "type": "string"
+                },
+                "SecretToken": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodePipeline::Webhook.WebhookFilterRule": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonPath": {
+                    "type": "string"
+                },
+                "MatchEquals": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "JsonPath"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStar::GitHubRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Code": {
+                            "$ref": "#/definitions/AWS::CodeStar::GitHubRepository.Code"
+                        },
+                        "ConnectionArn": {
+                            "type": "string"
+                        },
+                        "EnableIssues": {
+                            "type": "boolean"
+                        },
+                        "IsPrivate": {
+                            "type": "boolean"
+                        },
+                        "RepositoryAccessToken": {
+                            "type": "string"
+                        },
+                        "RepositoryDescription": {
+                            "type": "string"
+                        },
+                        "RepositoryName": {
+                            "type": "string"
+                        },
+                        "RepositoryOwner": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RepositoryName",
+                        "RepositoryOwner"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeStar::GitHubRepository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStar::GitHubRepository.Code": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::CodeStar::GitHubRepository.S3"
+                }
+            },
+            "required": [
+                "S3"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStar::GitHubRepository.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStarConnections::Connection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionName": {
+                            "type": "string"
+                        },
+                        "HostArn": {
+                            "type": "string"
+                        },
+                        "ProviderType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConnectionName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeStarConnections::Connection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStarNotifications::NotificationRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CreatedBy": {
+                            "type": "string"
+                        },
+                        "DetailType": {
+                            "type": "string"
+                        },
+                        "EventTypeId": {
+                            "type": "string"
+                        },
+                        "EventTypeIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Resource": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TargetAddress": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeStarNotifications::NotificationRule.Target"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DetailType",
+                        "EventTypeIds",
+                        "Name",
+                        "Resource",
+                        "Targets"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeStarNotifications::NotificationRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStarNotifications::NotificationRule.Target": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetAddress": {
+                    "type": "string"
+                },
+                "TargetType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TargetAddress",
+                "TargetType"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPool": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowClassicFlow": {
+                            "type": "boolean"
+                        },
+                        "AllowUnauthenticatedIdentities": {
+                            "type": "boolean"
+                        },
+                        "CognitoEvents": {
+                            "type": "object"
+                        },
+                        "CognitoIdentityProviders": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cognito::IdentityPool.CognitoIdentityProvider"
+                            },
+                            "type": "array"
+                        },
+                        "CognitoStreams": {
+                            "$ref": "#/definitions/AWS::Cognito::IdentityPool.CognitoStreams"
+                        },
+                        "DeveloperProviderName": {
+                            "type": "string"
+                        },
+                        "IdentityPoolName": {
+                            "type": "string"
+                        },
+                        "OpenIdConnectProviderARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PushSync": {
+                            "$ref": "#/definitions/AWS::Cognito::IdentityPool.PushSync"
+                        },
+                        "SamlProviderARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SupportedLoginProviders": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "AllowUnauthenticatedIdentities"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::IdentityPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPool.CognitoIdentityProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientId": {
+                    "type": "string"
+                },
+                "ProviderName": {
+                    "type": "string"
+                },
+                "ServerSideTokenCheck": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPool.CognitoStreams": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StreamName": {
+                    "type": "string"
+                },
+                "StreamingStatus": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPool.PushSync": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPoolRoleAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "IdentityPoolId": {
+                            "type": "string"
+                        },
+                        "RoleMappings": {
+                            "type": "object"
+                        },
+                        "Roles": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "IdentityPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::IdentityPoolRoleAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPoolRoleAttachment.MappingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Claim": {
+                    "type": "string"
+                },
+                "MatchType": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Claim",
+                "MatchType",
+                "RoleARN",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPoolRoleAttachment.RoleMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "AmbiguousRoleResolution": {
+                    "type": "string"
+                },
+                "IdentityProvider": {
+                    "type": "string"
+                },
+                "RulesConfiguration": {
+                    "$ref": "#/definitions/AWS::Cognito::IdentityPoolRoleAttachment.RulesConfigurationType"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPoolRoleAttachment.RulesConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Cognito::IdentityPoolRoleAttachment.MappingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountRecoverySetting": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.AccountRecoverySetting"
+                        },
+                        "AdminCreateUserConfig": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.AdminCreateUserConfig"
+                        },
+                        "AliasAttributes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AutoVerifiedAttributes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DeviceConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.DeviceConfiguration"
+                        },
+                        "EmailConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.EmailConfiguration"
+                        },
+                        "EmailVerificationMessage": {
+                            "type": "string"
+                        },
+                        "EmailVerificationSubject": {
+                            "type": "string"
+                        },
+                        "EnabledMfas": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LambdaConfig": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.LambdaConfig"
+                        },
+                        "MfaConfiguration": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.Policies"
+                        },
+                        "Schema": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cognito::UserPool.SchemaAttribute"
+                            },
+                            "type": "array"
+                        },
+                        "SmsAuthenticationMessage": {
+                            "type": "string"
+                        },
+                        "SmsConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.SmsConfiguration"
+                        },
+                        "SmsVerificationMessage": {
+                            "type": "string"
+                        },
+                        "UserPoolAddOns": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.UserPoolAddOns"
+                        },
+                        "UserPoolName": {
+                            "type": "string"
+                        },
+                        "UserPoolTags": {
+                            "type": "object"
+                        },
+                        "UsernameAttributes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "UsernameConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.UsernameConfiguration"
+                        },
+                        "VerificationMessageTemplate": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.VerificationMessageTemplate"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.AccountRecoverySetting": {
+            "additionalProperties": false,
+            "properties": {
+                "RecoveryMechanisms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Cognito::UserPool.RecoveryOption"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.AdminCreateUserConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowAdminCreateUserOnly": {
+                    "type": "boolean"
+                },
+                "InviteMessageTemplate": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.InviteMessageTemplate"
+                },
+                "UnusedAccountValidityDays": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.CustomEmailSender": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                },
+                "LambdaVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.CustomSMSSender": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                },
+                "LambdaVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.DeviceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChallengeRequiredOnNewDevice": {
+                    "type": "boolean"
+                },
+                "DeviceOnlyRememberedOnUserPrompt": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.EmailConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfigurationSet": {
+                    "type": "string"
+                },
+                "EmailSendingAccount": {
+                    "type": "string"
+                },
+                "From": {
+                    "type": "string"
+                },
+                "ReplyToEmailAddress": {
+                    "type": "string"
+                },
+                "SourceArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.InviteMessageTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "EmailMessage": {
+                    "type": "string"
+                },
+                "EmailSubject": {
+                    "type": "string"
+                },
+                "SMSMessage": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.LambdaConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CreateAuthChallenge": {
+                    "type": "string"
+                },
+                "CustomEmailSender": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.CustomEmailSender"
+                },
+                "CustomMessage": {
+                    "type": "string"
+                },
+                "CustomSMSSender": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.CustomSMSSender"
+                },
+                "DefineAuthChallenge": {
+                    "type": "string"
+                },
+                "KMSKeyID": {
+                    "type": "string"
+                },
+                "PostAuthentication": {
+                    "type": "string"
+                },
+                "PostConfirmation": {
+                    "type": "string"
+                },
+                "PreAuthentication": {
+                    "type": "string"
+                },
+                "PreSignUp": {
+                    "type": "string"
+                },
+                "PreTokenGeneration": {
+                    "type": "string"
+                },
+                "UserMigration": {
+                    "type": "string"
+                },
+                "VerifyAuthChallengeResponse": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.NumberAttributeConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxValue": {
+                    "type": "string"
+                },
+                "MinValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.PasswordPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "MinimumLength": {
+                    "type": "number"
+                },
+                "RequireLowercase": {
+                    "type": "boolean"
+                },
+                "RequireNumbers": {
+                    "type": "boolean"
+                },
+                "RequireSymbols": {
+                    "type": "boolean"
+                },
+                "RequireUppercase": {
+                    "type": "boolean"
+                },
+                "TemporaryPasswordValidityDays": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.Policies": {
+            "additionalProperties": false,
+            "properties": {
+                "PasswordPolicy": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.PasswordPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.RecoveryOption": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.SchemaAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeDataType": {
+                    "type": "string"
+                },
+                "DeveloperOnlyAttribute": {
+                    "type": "boolean"
+                },
+                "Mutable": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "NumberAttributeConstraints": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.NumberAttributeConstraints"
+                },
+                "Required": {
+                    "type": "boolean"
+                },
+                "StringAttributeConstraints": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.StringAttributeConstraints"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.SmsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ExternalId": {
+                    "type": "string"
+                },
+                "SnsCallerArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.StringAttributeConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxLength": {
+                    "type": "string"
+                },
+                "MinLength": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.UserPoolAddOns": {
+            "additionalProperties": false,
+            "properties": {
+                "AdvancedSecurityMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.UsernameConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CaseSensitive": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.VerificationMessageTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultEmailOption": {
+                    "type": "string"
+                },
+                "EmailMessage": {
+                    "type": "string"
+                },
+                "EmailMessageByLink": {
+                    "type": "string"
+                },
+                "EmailSubject": {
+                    "type": "string"
+                },
+                "EmailSubjectByLink": {
+                    "type": "string"
+                },
+                "SmsMessage": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolClient": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessTokenValidity": {
+                            "type": "number"
+                        },
+                        "AllowedOAuthFlows": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AllowedOAuthFlowsUserPoolClient": {
+                            "type": "boolean"
+                        },
+                        "AllowedOAuthScopes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AnalyticsConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolClient.AnalyticsConfiguration"
+                        },
+                        "CallbackURLs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ClientName": {
+                            "type": "string"
+                        },
+                        "DefaultRedirectURI": {
+                            "type": "string"
+                        },
+                        "EnableTokenRevocation": {
+                            "type": "boolean"
+                        },
+                        "ExplicitAuthFlows": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "GenerateSecret": {
+                            "type": "boolean"
+                        },
+                        "IdTokenValidity": {
+                            "type": "number"
+                        },
+                        "LogoutURLs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PreventUserExistenceErrors": {
+                            "type": "string"
+                        },
+                        "ReadAttributes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RefreshTokenValidity": {
+                            "type": "number"
+                        },
+                        "SupportedIdentityProviders": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "TokenValidityUnits": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolClient.TokenValidityUnits"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        },
+                        "WriteAttributes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolClient"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolClient.AnalyticsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationArn": {
+                    "type": "string"
+                },
+                "ApplicationId": {
+                    "type": "string"
+                },
+                "ExternalId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "UserDataShared": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolClient.TokenValidityUnits": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "IdToken": {
+                    "type": "string"
+                },
+                "RefreshToken": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolDomain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomDomainConfig": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolDomain.CustomDomainConfigType"
+                        },
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Domain",
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolDomain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolDomain.CustomDomainConfigType": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "Precedence": {
+                            "type": "number"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolIdentityProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AttributeMapping": {
+                            "type": "object"
+                        },
+                        "IdpIdentifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ProviderDetails": {
+                            "type": "object"
+                        },
+                        "ProviderName": {
+                            "type": "string"
+                        },
+                        "ProviderType": {
+                            "type": "string"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProviderName",
+                        "ProviderType",
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolIdentityProvider"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolResourceServer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Identifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Scopes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cognito::UserPoolResourceServer.ResourceServerScopeType"
+                            },
+                            "type": "array"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Identifier",
+                        "Name",
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolResourceServer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolResourceServer.ResourceServerScopeType": {
+            "additionalProperties": false,
+            "properties": {
+                "ScopeDescription": {
+                    "type": "string"
+                },
+                "ScopeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScopeDescription",
+                "ScopeName"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountTakeoverRiskConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverRiskConfigurationType"
+                        },
+                        "ClientId": {
+                            "type": "string"
+                        },
+                        "CompromisedCredentialsRiskConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsRiskConfigurationType"
+                        },
+                        "RiskExceptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.RiskExceptionConfigurationType"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClientId",
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolRiskConfigurationAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionType": {
+            "additionalProperties": false,
+            "properties": {
+                "EventAction": {
+                    "type": "string"
+                },
+                "Notify": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "EventAction",
+                "Notify"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionsType": {
+            "additionalProperties": false,
+            "properties": {
+                "HighAction": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionType"
+                },
+                "LowAction": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionType"
+                },
+                "MediumAction": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionType"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverRiskConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionsType"
+                },
+                "NotifyConfiguration": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyConfigurationType"
+                }
+            },
+            "required": [
+                "Actions"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsActionsType": {
+            "additionalProperties": false,
+            "properties": {
+                "EventAction": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventAction"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsRiskConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsActionsType"
+                },
+                "EventFilter": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Actions"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockEmail": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyEmailType"
+                },
+                "From": {
+                    "type": "string"
+                },
+                "MfaEmail": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyEmailType"
+                },
+                "NoActionEmail": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyEmailType"
+                },
+                "ReplyTo": {
+                    "type": "string"
+                },
+                "SourceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyEmailType": {
+            "additionalProperties": false,
+            "properties": {
+                "HtmlBody": {
+                    "type": "string"
+                },
+                "Subject": {
+                    "type": "string"
+                },
+                "TextBody": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Subject"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.RiskExceptionConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockedIPRangeList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SkippedIPRangeList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolUICustomizationAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CSS": {
+                            "type": "string"
+                        },
+                        "ClientId": {
+                            "type": "string"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClientId",
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolUICustomizationAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolUser": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClientMetadata": {
+                            "type": "object"
+                        },
+                        "DesiredDeliveryMediums": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ForceAliasCreation": {
+                            "type": "boolean"
+                        },
+                        "MessageAction": {
+                            "type": "string"
+                        },
+                        "UserAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cognito::UserPoolUser.AttributeType"
+                            },
+                            "type": "array"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        },
+                        "Username": {
+                            "type": "string"
+                        },
+                        "ValidationData": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cognito::UserPoolUser.AttributeType"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolUser"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolUser.AttributeType": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolUserToGroupAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        },
+                        "Username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GroupName",
+                        "UserPoolId",
+                        "Username"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolUserToGroupAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::AggregationAuthorization": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthorizedAccountId": {
+                            "type": "string"
+                        },
+                        "AuthorizedAwsRegion": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AuthorizedAccountId",
+                        "AuthorizedAwsRegion"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::AggregationAuthorization"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigRuleName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InputParameters": {
+                            "type": "object"
+                        },
+                        "MaximumExecutionFrequency": {
+                            "type": "string"
+                        },
+                        "Scope": {
+                            "$ref": "#/definitions/AWS::Config::ConfigRule.Scope"
+                        },
+                        "Source": {
+                            "$ref": "#/definitions/AWS::Config::ConfigRule.Source"
+                        }
+                    },
+                    "required": [
+                        "Source"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::ConfigRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigRule.Scope": {
+            "additionalProperties": false,
+            "properties": {
+                "ComplianceResourceId": {
+                    "type": "string"
+                },
+                "ComplianceResourceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TagKey": {
+                    "type": "string"
+                },
+                "TagValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::ConfigRule.Source": {
+            "additionalProperties": false,
+            "properties": {
+                "Owner": {
+                    "type": "string"
+                },
+                "SourceDetails": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Config::ConfigRule.SourceDetail"
+                    },
+                    "type": "array"
+                },
+                "SourceIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Owner",
+                "SourceIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigRule.SourceDetail": {
+            "additionalProperties": false,
+            "properties": {
+                "EventSource": {
+                    "type": "string"
+                },
+                "MaximumExecutionFrequency": {
+                    "type": "string"
+                },
+                "MessageType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventSource",
+                "MessageType"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigurationAggregator": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountAggregationSources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Config::ConfigurationAggregator.AccountAggregationSource"
+                            },
+                            "type": "array"
+                        },
+                        "ConfigurationAggregatorName": {
+                            "type": "string"
+                        },
+                        "OrganizationAggregationSource": {
+                            "$ref": "#/definitions/AWS::Config::ConfigurationAggregator.OrganizationAggregationSource"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::ConfigurationAggregator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigurationAggregator.AccountAggregationSource": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllAwsRegions": {
+                    "type": "boolean"
+                },
+                "AwsRegions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AccountIds"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigurationAggregator.OrganizationAggregationSource": {
+            "additionalProperties": false,
+            "properties": {
+                "AllAwsRegions": {
+                    "type": "boolean"
+                },
+                "AwsRegions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigurationRecorder": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RecordingGroup": {
+                            "$ref": "#/definitions/AWS::Config::ConfigurationRecorder.RecordingGroup"
+                        },
+                        "RoleARN": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RoleARN"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::ConfigurationRecorder"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigurationRecorder.RecordingGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "AllSupported": {
+                    "type": "boolean"
+                },
+                "IncludeGlobalResourceTypes": {
+                    "type": "boolean"
+                },
+                "ResourceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::ConformancePack": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConformancePackInputParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Config::ConformancePack.ConformancePackInputParameter"
+                            },
+                            "type": "array"
+                        },
+                        "ConformancePackName": {
+                            "type": "string"
+                        },
+                        "DeliveryS3Bucket": {
+                            "type": "string"
+                        },
+                        "DeliveryS3KeyPrefix": {
+                            "type": "string"
+                        },
+                        "TemplateBody": {
+                            "type": "string"
+                        },
+                        "TemplateS3Uri": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConformancePackName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::ConformancePack"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConformancePack.ConformancePackInputParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ParameterName",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::DeliveryChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigSnapshotDeliveryProperties": {
+                            "$ref": "#/definitions/AWS::Config::DeliveryChannel.ConfigSnapshotDeliveryProperties"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "S3BucketName": {
+                            "type": "string"
+                        },
+                        "S3KeyPrefix": {
+                            "type": "string"
+                        },
+                        "S3KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "SnsTopicARN": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "S3BucketName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::DeliveryChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::DeliveryChannel.ConfigSnapshotDeliveryProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryFrequency": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::OrganizationConfigRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExcludedAccounts": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "OrganizationConfigRuleName": {
+                            "type": "string"
+                        },
+                        "OrganizationCustomRuleMetadata": {
+                            "$ref": "#/definitions/AWS::Config::OrganizationConfigRule.OrganizationCustomRuleMetadata"
+                        },
+                        "OrganizationManagedRuleMetadata": {
+                            "$ref": "#/definitions/AWS::Config::OrganizationConfigRule.OrganizationManagedRuleMetadata"
+                        }
+                    },
+                    "required": [
+                        "OrganizationConfigRuleName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::OrganizationConfigRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::OrganizationConfigRule.OrganizationCustomRuleMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "InputParameters": {
+                    "type": "string"
+                },
+                "LambdaFunctionArn": {
+                    "type": "string"
+                },
+                "MaximumExecutionFrequency": {
+                    "type": "string"
+                },
+                "OrganizationConfigRuleTriggerTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ResourceIdScope": {
+                    "type": "string"
+                },
+                "ResourceTypesScope": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TagKeyScope": {
+                    "type": "string"
+                },
+                "TagValueScope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaFunctionArn",
+                "OrganizationConfigRuleTriggerTypes"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::OrganizationConfigRule.OrganizationManagedRuleMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "InputParameters": {
+                    "type": "string"
+                },
+                "MaximumExecutionFrequency": {
+                    "type": "string"
+                },
+                "ResourceIdScope": {
+                    "type": "string"
+                },
+                "ResourceTypesScope": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RuleIdentifier": {
+                    "type": "string"
+                },
+                "TagKeyScope": {
+                    "type": "string"
+                },
+                "TagValueScope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RuleIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::OrganizationConformancePack": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConformancePackInputParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Config::OrganizationConformancePack.ConformancePackInputParameter"
+                            },
+                            "type": "array"
+                        },
+                        "DeliveryS3Bucket": {
+                            "type": "string"
+                        },
+                        "DeliveryS3KeyPrefix": {
+                            "type": "string"
+                        },
+                        "ExcludedAccounts": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "OrganizationConformancePackName": {
+                            "type": "string"
+                        },
+                        "TemplateBody": {
+                            "type": "string"
+                        },
+                        "TemplateS3Uri": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "OrganizationConformancePackName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::OrganizationConformancePack"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::OrganizationConformancePack.ConformancePackInputParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ParameterName",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Automatic": {
+                            "type": "boolean"
+                        },
+                        "ConfigRuleName": {
+                            "type": "string"
+                        },
+                        "ExecutionControls": {
+                            "$ref": "#/definitions/AWS::Config::RemediationConfiguration.ExecutionControls"
+                        },
+                        "MaximumAutomaticAttempts": {
+                            "type": "number"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "ResourceType": {
+                            "type": "string"
+                        },
+                        "RetryAttemptSeconds": {
+                            "type": "number"
+                        },
+                        "TargetId": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        },
+                        "TargetVersion": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConfigRuleName",
+                        "TargetId",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::RemediationConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration.ExecutionControls": {
+            "additionalProperties": false,
+            "properties": {
+                "SsmControls": {
+                    "$ref": "#/definitions/AWS::Config::RemediationConfiguration.SsmControls"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration.RemediationParameterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceValue": {
+                    "$ref": "#/definitions/AWS::Config::RemediationConfiguration.ResourceValue"
+                },
+                "StaticValue": {
+                    "$ref": "#/definitions/AWS::Config::RemediationConfiguration.StaticValue"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration.ResourceValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration.SsmControls": {
+            "additionalProperties": false,
+            "properties": {
+                "ConcurrentExecutionRatePercentage": {
+                    "type": "number"
+                },
+                "ErrorPercentage": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration.StaticValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::StoredQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "QueryDescription": {
+                            "type": "string"
+                        },
+                        "QueryExpression": {
+                            "type": "string"
+                        },
+                        "QueryName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "QueryExpression",
+                        "QueryName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::StoredQuery"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::ContactFlow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Content": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Content",
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::ContactFlow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::ContactFlowModule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Content": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Content",
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::ContactFlowModule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::HoursOfOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Config": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Connect::HoursOfOperation.HoursOfOperationConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeZone": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Config",
+                        "InstanceArn",
+                        "Name",
+                        "TimeZone"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::HoursOfOperation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::HoursOfOperation.HoursOfOperationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Day": {
+                    "type": "string"
+                },
+                "EndTime": {
+                    "$ref": "#/definitions/AWS::Connect::HoursOfOperation.HoursOfOperationTimeSlice"
+                },
+                "StartTime": {
+                    "$ref": "#/definitions/AWS::Connect::HoursOfOperation.HoursOfOperationTimeSlice"
+                }
+            },
+            "required": [
+                "Day",
+                "EndTime",
+                "StartTime"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::HoursOfOperation.HoursOfOperationTimeSlice": {
+            "additionalProperties": false,
+            "properties": {
+                "Hours": {
+                    "type": "number"
+                },
+                "Minutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Hours",
+                "Minutes"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::QuickConnect": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QuickConnectConfig": {
+                            "$ref": "#/definitions/AWS::Connect::QuickConnect.QuickConnectConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "Name",
+                        "QuickConnectConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::QuickConnect"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::QuickConnect.PhoneNumberQuickConnectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "PhoneNumber": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PhoneNumber"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::QuickConnect.QueueQuickConnectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContactFlowArn": {
+                    "type": "string"
+                },
+                "QueueArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ContactFlowArn",
+                "QueueArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::QuickConnect.QuickConnectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "PhoneConfig": {
+                    "$ref": "#/definitions/AWS::Connect::QuickConnect.PhoneNumberQuickConnectConfig"
+                },
+                "QueueConfig": {
+                    "$ref": "#/definitions/AWS::Connect::QuickConnect.QueueQuickConnectConfig"
+                },
+                "QuickConnectType": {
+                    "type": "string"
+                },
+                "UserConfig": {
+                    "$ref": "#/definitions/AWS::Connect::QuickConnect.UserQuickConnectConfig"
+                }
+            },
+            "required": [
+                "QuickConnectType"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::QuickConnect.UserQuickConnectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContactFlowArn": {
+                    "type": "string"
+                },
+                "UserArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ContactFlowArn",
+                "UserArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DirectoryUserId": {
+                            "type": "string"
+                        },
+                        "HierarchyGroupArn": {
+                            "type": "string"
+                        },
+                        "IdentityInfo": {
+                            "$ref": "#/definitions/AWS::Connect::User.UserIdentityInfo"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "PhoneConfig": {
+                            "$ref": "#/definitions/AWS::Connect::User.UserPhoneConfig"
+                        },
+                        "RoutingProfileArn": {
+                            "type": "string"
+                        },
+                        "SecurityProfileArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "PhoneConfig",
+                        "RoutingProfileArn",
+                        "SecurityProfileArns",
+                        "Username"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::User.UserIdentityInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Email": {
+                    "type": "string"
+                },
+                "FirstName": {
+                    "type": "string"
+                },
+                "LastName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Connect::User.UserPhoneConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AfterContactWorkTimeLimit": {
+                    "type": "number"
+                },
+                "AutoAccept": {
+                    "type": "boolean"
+                },
+                "DeskPhoneNumber": {
+                    "type": "string"
+                },
+                "PhoneType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PhoneType"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParentGroupArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::UserHierarchyGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeadLetterQueueUrl": {
+                            "type": "string"
+                        },
+                        "DefaultEncryptionKey": {
+                            "type": "string"
+                        },
+                        "DefaultExpirationDays": {
+                            "type": "number"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CustomerProfiles::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "FlowDefinition": {
+                            "$ref": "#/definitions/AWS::CustomerProfiles::Integration.FlowDefinition"
+                        },
+                        "ObjectTypeName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Uri": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainName",
+                        "ObjectTypeName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CustomerProfiles::Integration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.ConnectorOperator": {
+            "additionalProperties": false,
+            "properties": {
+                "Marketo": {
+                    "type": "string"
+                },
+                "S3": {
+                    "type": "string"
+                },
+                "Salesforce": {
+                    "type": "string"
+                },
+                "ServiceNow": {
+                    "type": "string"
+                },
+                "Zendesk": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.FlowDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "FlowName": {
+                    "type": "string"
+                },
+                "KmsArn": {
+                    "type": "string"
+                },
+                "SourceFlowConfig": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.SourceFlowConfig"
+                },
+                "Tasks": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CustomerProfiles::Integration.Task"
+                    },
+                    "type": "array"
+                },
+                "TriggerConfig": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.TriggerConfig"
+                }
+            },
+            "required": [
+                "FlowName",
+                "KmsArn",
+                "SourceFlowConfig",
+                "Tasks",
+                "TriggerConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.IncrementalPullConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DatetimeTypeFieldName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.MarketoSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.S3SourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.SalesforceSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableDynamicFieldUpdate": {
+                    "type": "boolean"
+                },
+                "IncludeDeletedRecords": {
+                    "type": "boolean"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.ScheduledTriggerProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DataPullMode": {
+                    "type": "string"
+                },
+                "FirstExecutionFrom": {
+                    "type": "number"
+                },
+                "ScheduleEndTime": {
+                    "type": "number"
+                },
+                "ScheduleExpression": {
+                    "type": "string"
+                },
+                "ScheduleOffset": {
+                    "type": "number"
+                },
+                "ScheduleStartTime": {
+                    "type": "number"
+                },
+                "Timezone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.ServiceNowSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.SourceConnectorProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Marketo": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.MarketoSourceProperties"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.S3SourceProperties"
+                },
+                "Salesforce": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.SalesforceSourceProperties"
+                },
+                "ServiceNow": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.ServiceNowSourceProperties"
+                },
+                "Zendesk": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.ZendeskSourceProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.SourceFlowConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorProfileName": {
+                    "type": "string"
+                },
+                "ConnectorType": {
+                    "type": "string"
+                },
+                "IncrementalPullConfig": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.IncrementalPullConfig"
+                },
+                "SourceConnectorProperties": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.SourceConnectorProperties"
+                }
+            },
+            "required": [
+                "ConnectorType",
+                "SourceConnectorProperties"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.Task": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorOperator": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.ConnectorOperator"
+                },
+                "DestinationField": {
+                    "type": "string"
+                },
+                "SourceFields": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TaskProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CustomerProfiles::Integration.TaskPropertiesMap"
+                    },
+                    "type": "array"
+                },
+                "TaskType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourceFields",
+                "TaskType"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.TaskPropertiesMap": {
+            "additionalProperties": false,
+            "properties": {
+                "OperatorPropertyKey": {
+                    "type": "string"
+                },
+                "Property": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OperatorPropertyKey",
+                "Property"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.TriggerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TriggerProperties": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.TriggerProperties"
+                },
+                "TriggerType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TriggerType"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.TriggerProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Scheduled": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.ScheduledTriggerProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.ZendeskSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::ObjectType": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowProfileCreation": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EncryptionKey": {
+                            "type": "string"
+                        },
+                        "ExpirationDays": {
+                            "type": "number"
+                        },
+                        "Fields": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CustomerProfiles::ObjectType.FieldMap"
+                            },
+                            "type": "array"
+                        },
+                        "Keys": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CustomerProfiles::ObjectType.KeyMap"
+                            },
+                            "type": "array"
+                        },
+                        "ObjectTypeName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CustomerProfiles::ObjectType"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::ObjectType.FieldMap": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "ObjectTypeField": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::ObjectType.ObjectTypeField"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::ObjectType.KeyMap": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "ObjectTypeKeyList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CustomerProfiles::ObjectType.ObjectTypeKey"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::ObjectType.ObjectTypeField": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentType": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::ObjectType.ObjectTypeKey": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StandardIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DAX::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ClusterEndpointEncryptionType": {
+                            "type": "string"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IAMRoleARN": {
+                            "type": "string"
+                        },
+                        "NodeType": {
+                            "type": "string"
+                        },
+                        "NotificationTopicARN": {
+                            "type": "string"
+                        },
+                        "ParameterGroupName": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "ReplicationFactor": {
+                            "type": "number"
+                        },
+                        "SSESpecification": {
+                            "$ref": "#/definitions/AWS::DAX::Cluster.SSESpecification"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetGroupName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "IAMRoleARN",
+                        "NodeType",
+                        "ReplicationFactor"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DAX::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DAX::Cluster.SSESpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "SSEEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DAX::ParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ParameterGroupName": {
+                            "type": "string"
+                        },
+                        "ParameterNameValues": {
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DAX::ParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DAX::SubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SubnetGroupName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DAX::SubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "PolicyDetails": {
+                            "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.PolicyDetails"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DLM::LifecyclePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "CrossRegionCopy": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CrossRegionCopyAction"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CrossRegionCopy",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.CreateRule": {
+            "additionalProperties": false,
+            "properties": {
+                "CronExpression": {
+                    "type": "string"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "Times": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.CrossRegionCopyAction": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.EncryptionConfiguration"
+                },
+                "RetainRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CrossRegionCopyRetainRule"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionConfiguration",
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.CrossRegionCopyDeprecateRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Interval",
+                "IntervalUnit"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.CrossRegionCopyRetainRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Interval",
+                "IntervalUnit"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.CrossRegionCopyRule": {
+            "additionalProperties": false,
+            "properties": {
+                "CmkArn": {
+                    "type": "string"
+                },
+                "CopyTags": {
+                    "type": "boolean"
+                },
+                "DeprecateRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CrossRegionCopyDeprecateRule"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "RetainRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CrossRegionCopyRetainRule"
+                },
+                "Target": {
+                    "type": "string"
+                },
+                "TargetRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Encrypted"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.DeprecateRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CmkArn": {
+                    "type": "string"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Encrypted"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.EventParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DescriptionRegex": {
+                    "type": "string"
+                },
+                "EventType": {
+                    "type": "string"
+                },
+                "SnapshotOwner": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "EventType",
+                "SnapshotOwner"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.EventSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.EventParameters"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.FastRestoreRule": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZones": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Count": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.Parameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludeBootVolume": {
+                    "type": "boolean"
+                },
+                "NoReboot": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.PolicyDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.Action"
+                    },
+                    "type": "array"
+                },
+                "EventSource": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.EventSource"
+                },
+                "Parameters": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.Parameters"
+                },
+                "PolicyType": {
+                    "type": "string"
+                },
+                "ResourceLocations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ResourceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Schedules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.Schedule"
+                    },
+                    "type": "array"
+                },
+                "TargetTags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.RetainRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyTags": {
+                    "type": "boolean"
+                },
+                "CreateRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CreateRule"
+                },
+                "CrossRegionCopyRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CrossRegionCopyRule"
+                    },
+                    "type": "array"
+                },
+                "DeprecateRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.DeprecateRule"
+                },
+                "FastRestoreRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.FastRestoreRule"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "RetainRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.RetainRule"
+                },
+                "ShareRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.ShareRule"
+                    },
+                    "type": "array"
+                },
+                "TagsToAdd": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                },
+                "VariableTags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.ShareRule": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetAccounts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "UnshareInterval": {
+                    "type": "number"
+                },
+                "UnshareIntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CertificateIdentifier": {
+                            "type": "string"
+                        },
+                        "CertificatePem": {
+                            "type": "string"
+                        },
+                        "CertificateWallet": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::Certificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CertificateArn": {
+                            "type": "string"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "DocDbSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.DocDbSettings"
+                        },
+                        "DynamoDbSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.DynamoDbSettings"
+                        },
+                        "ElasticsearchSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.ElasticsearchSettings"
+                        },
+                        "EndpointIdentifier": {
+                            "type": "string"
+                        },
+                        "EndpointType": {
+                            "type": "string"
+                        },
+                        "EngineName": {
+                            "type": "string"
+                        },
+                        "ExtraConnectionAttributes": {
+                            "type": "string"
+                        },
+                        "IbmDb2Settings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.IbmDb2Settings"
+                        },
+                        "KafkaSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.KafkaSettings"
+                        },
+                        "KinesisSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.KinesisSettings"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MicrosoftSqlServerSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.MicrosoftSqlServerSettings"
+                        },
+                        "MongoDbSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.MongoDbSettings"
+                        },
+                        "MySqlSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.MySqlSettings"
+                        },
+                        "NeptuneSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.NeptuneSettings"
+                        },
+                        "OracleSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.OracleSettings"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PostgreSqlSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.PostgreSqlSettings"
+                        },
+                        "RedisSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.RedisSettings"
+                        },
+                        "RedshiftSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.RedshiftSettings"
+                        },
+                        "ResourceIdentifier": {
+                            "type": "string"
+                        },
+                        "S3Settings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.S3Settings"
+                        },
+                        "ServerName": {
+                            "type": "string"
+                        },
+                        "SslMode": {
+                            "type": "string"
+                        },
+                        "SybaseSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.SybaseSettings"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "EndpointType",
+                        "EngineName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::Endpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.DocDbSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.DynamoDbSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceAccessRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.ElasticsearchSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointUri": {
+                    "type": "string"
+                },
+                "ErrorRetryDuration": {
+                    "type": "number"
+                },
+                "FullLoadErrorPercentage": {
+                    "type": "number"
+                },
+                "ServiceAccessRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.IbmDb2Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.KafkaSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Broker": {
+                    "type": "string"
+                },
+                "IncludeControlDetails": {
+                    "type": "boolean"
+                },
+                "IncludeNullAndEmpty": {
+                    "type": "boolean"
+                },
+                "IncludeTableAlterOperations": {
+                    "type": "boolean"
+                },
+                "IncludeTransactionDetails": {
+                    "type": "boolean"
+                },
+                "NoHexPrefix": {
+                    "type": "boolean"
+                },
+                "PartitionIncludeSchemaTable": {
+                    "type": "boolean"
+                },
+                "SaslPassword": {
+                    "type": "string"
+                },
+                "SaslUserName": {
+                    "type": "string"
+                },
+                "SecurityProtocol": {
+                    "type": "string"
+                },
+                "SslCaCertificateArn": {
+                    "type": "string"
+                },
+                "SslClientCertificateArn": {
+                    "type": "string"
+                },
+                "SslClientKeyArn": {
+                    "type": "string"
+                },
+                "SslClientKeyPassword": {
+                    "type": "string"
+                },
+                "Topic": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.KinesisSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IncludeControlDetails": {
+                    "type": "boolean"
+                },
+                "IncludeNullAndEmpty": {
+                    "type": "boolean"
+                },
+                "IncludeTableAlterOperations": {
+                    "type": "boolean"
+                },
+                "IncludeTransactionDetails": {
+                    "type": "boolean"
+                },
+                "MessageFormat": {
+                    "type": "string"
+                },
+                "NoHexPrefix": {
+                    "type": "boolean"
+                },
+                "PartitionIncludeSchemaTable": {
+                    "type": "boolean"
+                },
+                "ServiceAccessRoleArn": {
+                    "type": "string"
+                },
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.MicrosoftSqlServerSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.MongoDbSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthMechanism": {
+                    "type": "string"
+                },
+                "AuthSource": {
+                    "type": "string"
+                },
+                "AuthType": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DocsToInvestigate": {
+                    "type": "string"
+                },
+                "ExtractDocId": {
+                    "type": "string"
+                },
+                "NestingLevel": {
+                    "type": "string"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                },
+                "ServerName": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.MySqlSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.NeptuneSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorRetryDuration": {
+                    "type": "number"
+                },
+                "IamAuthEnabled": {
+                    "type": "boolean"
+                },
+                "MaxFileSize": {
+                    "type": "number"
+                },
+                "MaxRetryCount": {
+                    "type": "number"
+                },
+                "S3BucketFolder": {
+                    "type": "string"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "ServiceAccessRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.OracleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerOracleAsmAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerOracleAsmSecretId": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.PostgreSqlSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.RedisSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthPassword": {
+                    "type": "string"
+                },
+                "AuthType": {
+                    "type": "string"
+                },
+                "AuthUserName": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "ServerName": {
+                    "type": "string"
+                },
+                "SslCaCertificateArn": {
+                    "type": "string"
+                },
+                "SslSecurityProtocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.RedshiftSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.S3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketFolder": {
+                    "type": "string"
+                },
+                "BucketName": {
+                    "type": "string"
+                },
+                "CompressionType": {
+                    "type": "string"
+                },
+                "CsvDelimiter": {
+                    "type": "string"
+                },
+                "CsvRowDelimiter": {
+                    "type": "string"
+                },
+                "ExternalTableDefinition": {
+                    "type": "string"
+                },
+                "ServiceAccessRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.SybaseSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::EventSubscription": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "EventCategories": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SourceIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SourceType": {
+                            "type": "string"
+                        },
+                        "SubscriptionName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SnsTopicArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::EventSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DMS::ReplicationInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocatedStorage": {
+                            "type": "number"
+                        },
+                        "AllowMajorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MultiAZ": {
+                            "type": "boolean"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "PubliclyAccessible": {
+                            "type": "boolean"
+                        },
+                        "ReplicationInstanceClass": {
+                            "type": "string"
+                        },
+                        "ReplicationInstanceIdentifier": {
+                            "type": "string"
+                        },
+                        "ReplicationSubnetGroupIdentifier": {
+                            "type": "string"
+                        },
+                        "ResourceIdentifier": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ReplicationInstanceClass"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::ReplicationInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DMS::ReplicationSubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ReplicationSubnetGroupDescription": {
+                            "type": "string"
+                        },
+                        "ReplicationSubnetGroupIdentifier": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ReplicationSubnetGroupDescription",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::ReplicationSubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DMS::ReplicationTask": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CdcStartPosition": {
+                            "type": "string"
+                        },
+                        "CdcStartTime": {
+                            "type": "number"
+                        },
+                        "CdcStopPosition": {
+                            "type": "string"
+                        },
+                        "MigrationType": {
+                            "type": "string"
+                        },
+                        "ReplicationInstanceArn": {
+                            "type": "string"
+                        },
+                        "ReplicationTaskIdentifier": {
+                            "type": "string"
+                        },
+                        "ReplicationTaskSettings": {
+                            "type": "string"
+                        },
+                        "ResourceIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceEndpointArn": {
+                            "type": "string"
+                        },
+                        "TableMappings": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetEndpointArn": {
+                            "type": "string"
+                        },
+                        "TaskData": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MigrationType",
+                        "ReplicationInstanceArn",
+                        "SourceEndpointArn",
+                        "TableMappings",
+                        "TargetEndpointArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::ReplicationTask"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Format": {
+                            "type": "string"
+                        },
+                        "FormatOptions": {
+                            "$ref": "#/definitions/AWS::DataBrew::Dataset.FormatOptions"
+                        },
+                        "Input": {
+                            "$ref": "#/definitions/AWS::DataBrew::Dataset.Input"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PathOptions": {
+                            "$ref": "#/definitions/AWS::DataBrew::Dataset.PathOptions"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Input",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Dataset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.CsvOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Delimiter": {
+                    "type": "string"
+                },
+                "HeaderRow": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.DataCatalogInputDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "TempDirectory": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.S3Location"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.DatabaseInputDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseTableName": {
+                    "type": "string"
+                },
+                "GlueConnectionName": {
+                    "type": "string"
+                },
+                "QueryString": {
+                    "type": "string"
+                },
+                "TempDirectory": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.S3Location"
+                }
+            },
+            "required": [
+                "GlueConnectionName"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.DatasetParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "CreateColumn": {
+                    "type": "boolean"
+                },
+                "DatetimeOptions": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.DatetimeOptions"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.FilterExpression"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.DatetimeOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Format": {
+                    "type": "string"
+                },
+                "LocaleCode": {
+                    "type": "string"
+                },
+                "TimezoneOffset": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Format"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.ExcelOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderRow": {
+                    "type": "boolean"
+                },
+                "SheetIndexes": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "SheetNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.FilesLimit": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxFiles": {
+                    "type": "number"
+                },
+                "Order": {
+                    "type": "string"
+                },
+                "OrderedBy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MaxFiles"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.FilterExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "ValuesMap": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Dataset.FilterValue"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Expression",
+                "ValuesMap"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.FilterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                },
+                "ValueReference": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Value",
+                "ValueReference"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.FormatOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Csv": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.CsvOptions"
+                },
+                "Excel": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.ExcelOptions"
+                },
+                "Json": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.JsonOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.Input": {
+            "additionalProperties": false,
+            "properties": {
+                "DataCatalogInputDefinition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.DataCatalogInputDefinition"
+                },
+                "DatabaseInputDefinition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.DatabaseInputDefinition"
+                },
+                "Metadata": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.Metadata"
+                },
+                "S3InputDefinition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.S3Location"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.JsonOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiLine": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.Metadata": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.PathOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "FilesLimit": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.FilesLimit"
+                },
+                "LastModifiedDateCondition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.FilterExpression"
+                },
+                "Parameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Dataset.PathParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.PathParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "DatasetParameter": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.DatasetParameter"
+                },
+                "PathParameterName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatasetParameter",
+                "PathParameterName"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataCatalogOutputs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Job.DataCatalogOutput"
+                            },
+                            "type": "array"
+                        },
+                        "DatabaseOutputs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Job.DatabaseOutput"
+                            },
+                            "type": "array"
+                        },
+                        "DatasetName": {
+                            "type": "string"
+                        },
+                        "EncryptionKeyArn": {
+                            "type": "string"
+                        },
+                        "EncryptionMode": {
+                            "type": "string"
+                        },
+                        "JobSample": {
+                            "$ref": "#/definitions/AWS::DataBrew::Job.JobSample"
+                        },
+                        "LogSubscription": {
+                            "type": "string"
+                        },
+                        "MaxCapacity": {
+                            "type": "number"
+                        },
+                        "MaxRetries": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OutputLocation": {
+                            "$ref": "#/definitions/AWS::DataBrew::Job.OutputLocation"
+                        },
+                        "Outputs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Job.Output"
+                            },
+                            "type": "array"
+                        },
+                        "ProfileConfiguration": {
+                            "$ref": "#/definitions/AWS::DataBrew::Job.ProfileConfiguration"
+                        },
+                        "ProjectName": {
+                            "type": "string"
+                        },
+                        "Recipe": {
+                            "$ref": "#/definitions/AWS::DataBrew::Job.Recipe"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Timeout": {
+                            "type": "number"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "ValidationConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Job.ValidationConfiguration"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "RoleArn",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Job"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.AllowedStatistics": {
+            "additionalProperties": false,
+            "properties": {
+                "Statistics": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Statistics"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.ColumnSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Regex": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.ColumnStatisticsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Selectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Job.ColumnSelector"
+                    },
+                    "type": "array"
+                },
+                "Statistics": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.StatisticsConfiguration"
+                }
+            },
+            "required": [
+                "Statistics"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.CsvOutputOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Delimiter": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.DataCatalogOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DatabaseOptions": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.DatabaseTableOutputOptions"
+                },
+                "Overwrite": {
+                    "type": "boolean"
+                },
+                "S3Options": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.S3TableOutputOptions"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.DatabaseOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseOptions": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.DatabaseTableOutputOptions"
+                },
+                "DatabaseOutputMode": {
+                    "type": "string"
+                },
+                "GlueConnectionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseOptions",
+                "GlueConnectionName"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.DatabaseTableOutputOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "TableName": {
+                    "type": "string"
+                },
+                "TempDirectory": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.S3Location"
+                }
+            },
+            "required": [
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.EntityDetectorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedStatistics": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.AllowedStatistics"
+                },
+                "EntityTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "EntityTypes"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.JobSample": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
+                    "type": "string"
+                },
+                "Size": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "CompressionFormat": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                },
+                "FormatOptions": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.OutputFormatOptions"
+                },
+                "Location": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.S3Location"
+                },
+                "Overwrite": {
+                    "type": "boolean"
+                },
+                "PartitionColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Location"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.OutputFormatOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Csv": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.CsvOutputOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.OutputLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.ParameterMap": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.ProfileConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnStatisticsConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Job.ColumnStatisticsConfiguration"
+                    },
+                    "type": "array"
+                },
+                "DatasetStatisticsConfiguration": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.StatisticsConfiguration"
+                },
+                "EntityDetectorConfiguration": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.EntityDetectorConfiguration"
+                },
+                "ProfileColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Job.ColumnSelector"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.Recipe": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.S3TableOutputOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Location": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.S3Location"
+                }
+            },
+            "required": [
+                "Location"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.StatisticOverride": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.ParameterMap"
+                },
+                "Statistic": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Parameters",
+                "Statistic"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.StatisticsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IncludedStatistics": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Overrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Job.StatisticOverride"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.ValidationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RulesetArn": {
+                    "type": "string"
+                },
+                "ValidationMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RulesetArn"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DatasetName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RecipeName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Sample": {
+                            "$ref": "#/definitions/AWS::DataBrew::Project.Sample"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DatasetName",
+                        "Name",
+                        "RecipeName",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Project.Sample": {
+            "additionalProperties": false,
+            "properties": {
+                "Size": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Steps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Recipe.RecipeStep"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Steps"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Recipe"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "Operation": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "$ref": "#/definitions/AWS::DataBrew::Recipe.ParameterMap"
+                }
+            },
+            "required": [
+                "Operation"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.ConditionExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "TargetColumn": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Condition",
+                "TargetColumn"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.DataCatalogInputDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "TempDirectory": {
+                    "$ref": "#/definitions/AWS::DataBrew::Recipe.S3Location"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.ParameterMap": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.RecipeParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregateFunction": {
+                    "type": "string"
+                },
+                "Base": {
+                    "type": "string"
+                },
+                "CaseStatement": {
+                    "type": "string"
+                },
+                "CategoryMap": {
+                    "type": "string"
+                },
+                "CharsToRemove": {
+                    "type": "string"
+                },
+                "CollapseConsecutiveWhitespace": {
+                    "type": "string"
+                },
+                "ColumnDataType": {
+                    "type": "string"
+                },
+                "ColumnRange": {
+                    "type": "string"
+                },
+                "Count": {
+                    "type": "string"
+                },
+                "CustomCharacters": {
+                    "type": "string"
+                },
+                "CustomStopWords": {
+                    "type": "string"
+                },
+                "CustomValue": {
+                    "type": "string"
+                },
+                "DatasetsColumns": {
+                    "type": "string"
+                },
+                "DateAddValue": {
+                    "type": "string"
+                },
+                "DateTimeFormat": {
+                    "type": "string"
+                },
+                "DateTimeParameters": {
+                    "type": "string"
+                },
+                "DeleteOtherRows": {
+                    "type": "string"
+                },
+                "Delimiter": {
+                    "type": "string"
+                },
+                "EndPattern": {
+                    "type": "string"
+                },
+                "EndPosition": {
+                    "type": "string"
+                },
+                "EndValue": {
+                    "type": "string"
+                },
+                "ExpandContractions": {
+                    "type": "string"
+                },
+                "Exponent": {
+                    "type": "string"
+                },
+                "FalseString": {
+                    "type": "string"
+                },
+                "GroupByAggFunctionOptions": {
+                    "type": "string"
+                },
+                "GroupByColumns": {
+                    "type": "string"
+                },
+                "HiddenColumns": {
+                    "type": "string"
+                },
+                "IgnoreCase": {
+                    "type": "string"
+                },
+                "IncludeInSplit": {
+                    "type": "string"
+                },
+                "Input": {
+                    "type": "object"
+                },
+                "Interval": {
+                    "type": "string"
+                },
+                "IsText": {
+                    "type": "string"
+                },
+                "JoinKeys": {
+                    "type": "string"
+                },
+                "JoinType": {
+                    "type": "string"
+                },
+                "LeftColumns": {
+                    "type": "string"
+                },
+                "Limit": {
+                    "type": "string"
+                },
+                "LowerBound": {
+                    "type": "string"
+                },
+                "MapType": {
+                    "type": "string"
+                },
+                "ModeType": {
+                    "type": "string"
+                },
+                "MultiLine": {
+                    "type": "boolean"
+                },
+                "NumRows": {
+                    "type": "string"
+                },
+                "NumRowsAfter": {
+                    "type": "string"
+                },
+                "NumRowsBefore": {
+                    "type": "string"
+                },
+                "OrderByColumn": {
+                    "type": "string"
+                },
+                "OrderByColumns": {
+                    "type": "string"
+                },
+                "Other": {
+                    "type": "string"
+                },
+                "Pattern": {
+                    "type": "string"
+                },
+                "PatternOption1": {
+                    "type": "string"
+                },
+                "PatternOption2": {
+                    "type": "string"
+                },
+                "PatternOptions": {
+                    "type": "string"
+                },
+                "Period": {
+                    "type": "string"
+                },
+                "Position": {
+                    "type": "string"
+                },
+                "RemoveAllPunctuation": {
+                    "type": "string"
+                },
+                "RemoveAllQuotes": {
+                    "type": "string"
+                },
+                "RemoveAllWhitespace": {
+                    "type": "string"
+                },
+                "RemoveCustomCharacters": {
+                    "type": "string"
+                },
+                "RemoveCustomValue": {
+                    "type": "string"
+                },
+                "RemoveLeadingAndTrailingPunctuation": {
+                    "type": "string"
+                },
+                "RemoveLeadingAndTrailingQuotes": {
+                    "type": "string"
+                },
+                "RemoveLeadingAndTrailingWhitespace": {
+                    "type": "string"
+                },
+                "RemoveLetters": {
+                    "type": "string"
+                },
+                "RemoveNumbers": {
+                    "type": "string"
+                },
+                "RemoveSourceColumn": {
+                    "type": "string"
+                },
+                "RemoveSpecialCharacters": {
+                    "type": "string"
+                },
+                "RightColumns": {
+                    "type": "string"
+                },
+                "SampleSize": {
+                    "type": "string"
+                },
+                "SampleType": {
+                    "type": "string"
+                },
+                "SecondInput": {
+                    "type": "string"
+                },
+                "SecondaryInputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Recipe.SecondaryInput"
+                    },
+                    "type": "array"
+                },
+                "SheetIndexes": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "SheetNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SourceColumn": {
+                    "type": "string"
+                },
+                "SourceColumn1": {
+                    "type": "string"
+                },
+                "SourceColumn2": {
+                    "type": "string"
+                },
+                "SourceColumns": {
+                    "type": "string"
+                },
+                "StartColumnIndex": {
+                    "type": "string"
+                },
+                "StartPattern": {
+                    "type": "string"
+                },
+                "StartPosition": {
+                    "type": "string"
+                },
+                "StartValue": {
+                    "type": "string"
+                },
+                "StemmingMode": {
+                    "type": "string"
+                },
+                "StepCount": {
+                    "type": "string"
+                },
+                "StepIndex": {
+                    "type": "string"
+                },
+                "StopWordsMode": {
+                    "type": "string"
+                },
+                "Strategy": {
+                    "type": "string"
+                },
+                "TargetColumn": {
+                    "type": "string"
+                },
+                "TargetColumnNames": {
+                    "type": "string"
+                },
+                "TargetDateFormat": {
+                    "type": "string"
+                },
+                "TargetIndex": {
+                    "type": "string"
+                },
+                "TimeZone": {
+                    "type": "string"
+                },
+                "TokenizerPattern": {
+                    "type": "string"
+                },
+                "TrueString": {
+                    "type": "string"
+                },
+                "UdfLang": {
+                    "type": "string"
+                },
+                "Units": {
+                    "type": "string"
+                },
+                "UnpivotColumn": {
+                    "type": "string"
+                },
+                "UpperBound": {
+                    "type": "string"
+                },
+                "UseNewDataFrame": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                },
+                "Value1": {
+                    "type": "string"
+                },
+                "Value2": {
+                    "type": "string"
+                },
+                "ValueColumn": {
+                    "type": "string"
+                },
+                "ViewFrame": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.RecipeStep": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::DataBrew::Recipe.Action"
+                },
+                "ConditionExpressions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Recipe.ConditionExpression"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Action"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.SecondaryInput": {
+            "additionalProperties": false,
+            "properties": {
+                "DataCatalogInputDefinition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Recipe.DataCatalogInputDefinition"
+                },
+                "S3InputDefinition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Recipe.S3Location"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Ruleset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Ruleset.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Rules",
+                        "TargetArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Ruleset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Ruleset.ColumnSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Regex": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Ruleset.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "CheckExpression": {
+                    "type": "string"
+                },
+                "ColumnSelectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Ruleset.ColumnSelector"
+                    },
+                    "type": "array"
+                },
+                "Disabled": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SubstitutionMap": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Ruleset.SubstitutionValue"
+                    },
+                    "type": "array"
+                },
+                "Threshold": {
+                    "$ref": "#/definitions/AWS::DataBrew::Ruleset.Threshold"
+                }
+            },
+            "required": [
+                "CheckExpression",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Ruleset.SubstitutionValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                },
+                "ValueReference": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Value",
+                "ValueReference"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Ruleset.Threshold": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CronExpression": {
+                            "type": "string"
+                        },
+                        "JobNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CronExpression",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Schedule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Activate": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParameterObjects": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataPipeline::Pipeline.ParameterObject"
+                            },
+                            "type": "array"
+                        },
+                        "ParameterValues": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataPipeline::Pipeline.ParameterValue"
+                            },
+                            "type": "array"
+                        },
+                        "PipelineObjects": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataPipeline::Pipeline.PipelineObject"
+                            },
+                            "type": "array"
+                        },
+                        "PipelineTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataPipeline::Pipeline.PipelineTag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "ParameterObjects"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataPipeline::Pipeline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.Field": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "RefValue": {
+                    "type": "string"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.ParameterAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "StringValue"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.ParameterObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataPipeline::Pipeline.ParameterAttribute"
+                    },
+                    "type": "array"
+                },
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attributes",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.ParameterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id",
+                "StringValue"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.PipelineObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Fields": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataPipeline::Pipeline.Field"
+                    },
+                    "type": "array"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Fields",
+                "Id",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.PipelineTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::Agent": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ActivationKey": {
+                            "type": "string"
+                        },
+                        "AgentName": {
+                            "type": "string"
+                        },
+                        "SecurityGroupArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcEndpointId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ActivationKey"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::Agent"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationEFS": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Ec2Config": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationEFS.Ec2Config"
+                        },
+                        "EfsFilesystemArn": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Ec2Config",
+                        "EfsFilesystemArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationEFS"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationEFS.Ec2Config": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecurityGroupArns",
+                "SubnetArn"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationFSxWindows": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "FsxFilesystemArn": {
+                            "type": "string"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "SecurityGroupArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "User": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FsxFilesystemArn",
+                        "Password",
+                        "SecurityGroupArns",
+                        "User"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationFSxWindows"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationHDFS": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AgentArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
+                        "BlockSize": {
+                            "type": "number"
+                        },
+                        "KerberosKeytab": {
+                            "type": "string"
+                        },
+                        "KerberosKrb5Conf": {
+                            "type": "string"
+                        },
+                        "KerberosPrincipal": {
+                            "type": "string"
+                        },
+                        "KmsKeyProviderUri": {
+                            "type": "string"
+                        },
+                        "NameNodes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataSync::LocationHDFS.NameNode"
+                            },
+                            "type": "array"
+                        },
+                        "QopConfiguration": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationHDFS.QopConfiguration"
+                        },
+                        "ReplicationFactor": {
+                            "type": "number"
+                        },
+                        "SimpleUser": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AgentArns",
+                        "AuthenticationType",
+                        "NameNodes"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationHDFS"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationHDFS.NameNode": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Hostname",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationHDFS.QopConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DataTransferProtection": {
+                    "type": "string"
+                },
+                "RpcProtection": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataSync::LocationNFS": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MountOptions": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationNFS.MountOptions"
+                        },
+                        "OnPremConfig": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationNFS.OnPremConfig"
+                        },
+                        "ServerHostname": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "OnPremConfig",
+                        "ServerHostname",
+                        "Subdirectory"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationNFS"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationNFS.MountOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataSync::LocationNFS.OnPremConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AgentArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AgentArns"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationObjectStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessKey": {
+                            "type": "string"
+                        },
+                        "AgentArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BucketName": {
+                            "type": "string"
+                        },
+                        "SecretKey": {
+                            "type": "string"
+                        },
+                        "ServerHostname": {
+                            "type": "string"
+                        },
+                        "ServerPort": {
+                            "type": "number"
+                        },
+                        "ServerProtocol": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AgentArns",
+                        "BucketName",
+                        "ServerHostname"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationObjectStorage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationS3": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "S3BucketArn": {
+                            "type": "string"
+                        },
+                        "S3Config": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationS3.S3Config"
+                        },
+                        "S3StorageClass": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "S3BucketArn",
+                        "S3Config"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationS3"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationS3.S3Config": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketAccessRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketAccessRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationSMB": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AgentArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "MountOptions": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationSMB.MountOptions"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "ServerHostname": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "User": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AgentArns",
+                        "Password",
+                        "ServerHostname",
+                        "Subdirectory",
+                        "User"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationSMB"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationSMB.MountOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataSync::Task": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CloudWatchLogGroupArn": {
+                            "type": "string"
+                        },
+                        "DestinationLocationArn": {
+                            "type": "string"
+                        },
+                        "Excludes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataSync::Task.FilterRule"
+                            },
+                            "type": "array"
+                        },
+                        "Includes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataSync::Task.FilterRule"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Options": {
+                            "$ref": "#/definitions/AWS::DataSync::Task.Options"
+                        },
+                        "Schedule": {
+                            "$ref": "#/definitions/AWS::DataSync::Task.TaskSchedule"
+                        },
+                        "SourceLocationArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DestinationLocationArn",
+                        "SourceLocationArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::Task"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::Task.FilterRule": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterType": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataSync::Task.Options": {
+            "additionalProperties": false,
+            "properties": {
+                "Atime": {
+                    "type": "string"
+                },
+                "BytesPerSecond": {
+                    "type": "number"
+                },
+                "Gid": {
+                    "type": "string"
+                },
+                "LogLevel": {
+                    "type": "string"
+                },
+                "Mtime": {
+                    "type": "string"
+                },
+                "OverwriteMode": {
+                    "type": "string"
+                },
+                "PosixPermissions": {
+                    "type": "string"
+                },
+                "PreserveDeletedFiles": {
+                    "type": "string"
+                },
+                "PreserveDevices": {
+                    "type": "string"
+                },
+                "SecurityDescriptorCopyFlags": {
+                    "type": "string"
+                },
+                "TaskQueueing": {
+                    "type": "string"
+                },
+                "TransferMode": {
+                    "type": "string"
+                },
+                "Uid": {
+                    "type": "string"
+                },
+                "VerifyMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataSync::Task.TaskSchedule": {
+            "additionalProperties": false,
+            "properties": {
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::Detective::Graph": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Detective::Graph"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Detective::MemberInvitation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DisableEmailNotification": {
+                            "type": "boolean"
+                        },
+                        "GraphArn": {
+                            "type": "string"
+                        },
+                        "MemberEmailAddress": {
+                            "type": "string"
+                        },
+                        "MemberId": {
+                            "type": "string"
+                        },
+                        "Message": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GraphArn",
+                        "MemberEmailAddress",
+                        "MemberId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Detective::MemberInvitation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::NotificationChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Config": {
+                            "$ref": "#/definitions/AWS::DevOpsGuru::NotificationChannel.NotificationChannelConfig"
+                        }
+                    },
+                    "required": [
+                        "Config"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DevOpsGuru::NotificationChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::NotificationChannel.NotificationChannelConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Sns": {
+                    "$ref": "#/definitions/AWS::DevOpsGuru::NotificationChannel.SnsChannelConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::NotificationChannel.SnsChannelConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::ResourceCollection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceCollectionFilter": {
+                            "$ref": "#/definitions/AWS::DevOpsGuru::ResourceCollection.ResourceCollectionFilter"
+                        }
+                    },
+                    "required": [
+                        "ResourceCollectionFilter"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DevOpsGuru::ResourceCollection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::ResourceCollection.CloudFormationCollectionFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "StackNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::ResourceCollection.ResourceCollectionFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudFormation": {
+                    "$ref": "#/definitions/AWS::DevOpsGuru::ResourceCollection.CloudFormationCollectionFilter"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DirectoryService::MicrosoftAD": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CreateAlias": {
+                            "type": "boolean"
+                        },
+                        "Edition": {
+                            "type": "string"
+                        },
+                        "EnableSso": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "ShortName": {
+                            "type": "string"
+                        },
+                        "VpcSettings": {
+                            "$ref": "#/definitions/AWS::DirectoryService::MicrosoftAD.VpcSettings"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Password",
+                        "VpcSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DirectoryService::MicrosoftAD"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DirectoryService::MicrosoftAD.VpcSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubnetIds",
+                "VpcId"
+            ],
+            "type": "object"
+        },
+        "AWS::DirectoryService::SimpleAD": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CreateAlias": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnableSso": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "ShortName": {
+                            "type": "string"
+                        },
+                        "Size": {
+                            "type": "string"
+                        },
+                        "VpcSettings": {
+                            "$ref": "#/definitions/AWS::DirectoryService::SimpleAD.VpcSettings"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Password",
+                        "Size",
+                        "VpcSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DirectoryService::SimpleAD"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DirectoryService::SimpleAD.VpcSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubnetIds",
+                "VpcId"
+            ],
+            "type": "object"
+        },
+        "AWS::DocDB::DBCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MasterUserPassword": {
+                            "type": "string"
+                        },
+                        "MasterUsername": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "SnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MasterUserPassword",
+                        "MasterUsername"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DocDB::DBCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DocDB::DBClusterParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::DocDB::DBClusterParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DocDB::DBInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBInstanceClass": {
+                            "type": "string"
+                        },
+                        "DBInstanceIdentifier": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBClusterIdentifier",
+                        "DBInstanceClass"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DocDB::DBInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DocDB::DBSubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DBSubnetGroupDescription": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBSubnetGroupDescription",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DocDB::DBSubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AttributeDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.AttributeDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "BillingMode": {
+                            "type": "string"
+                        },
+                        "GlobalSecondaryIndexes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.GlobalSecondaryIndex"
+                            },
+                            "type": "array"
+                        },
+                        "KeySchema": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.KeySchema"
+                            },
+                            "type": "array"
+                        },
+                        "LocalSecondaryIndexes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.LocalSecondaryIndex"
+                            },
+                            "type": "array"
+                        },
+                        "Replicas": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReplicaSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "SSESpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.SSESpecification"
+                        },
+                        "StreamSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.StreamSpecification"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        },
+                        "TimeToLiveSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.TimeToLiveSpecification"
+                        },
+                        "WriteProvisionedThroughputSettings": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
+                        }
+                    },
+                    "required": [
+                        "AttributeDefinitions",
+                        "KeySchema",
+                        "Replicas"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DynamoDB::GlobalTable"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.AttributeDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "AttributeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "AttributeType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.CapacityAutoScalingSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                },
+                "SeedCapacity": {
+                    "type": "number"
+                },
+                "TargetTrackingScalingPolicyConfiguration": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.TargetTrackingScalingPolicyConfiguration"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity",
+                "TargetTrackingScalingPolicyConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.ContributorInsightsSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.GlobalSecondaryIndex": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexName": {
+                    "type": "string"
+                },
+                "KeySchema": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.KeySchema"
+                    },
+                    "type": "array"
+                },
+                "Projection": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.Projection"
+                },
+                "WriteProvisionedThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
+                }
+            },
+            "required": [
+                "IndexName",
+                "KeySchema",
+                "Projection"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.KeySchema": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "KeyType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.LocalSecondaryIndex": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexName": {
+                    "type": "string"
+                },
+                "KeySchema": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.KeySchema"
+                    },
+                    "type": "array"
+                },
+                "Projection": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.Projection"
+                }
+            },
+            "required": [
+                "IndexName",
+                "KeySchema",
+                "Projection"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.PointInTimeRecoverySpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PointInTimeRecoveryEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.Projection": {
+            "additionalProperties": false,
+            "properties": {
+                "NonKeyAttributes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ProjectionType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityAutoScalingSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.CapacityAutoScalingSettings"
+                },
+                "ReadCapacityUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.ReplicaGlobalSecondaryIndexSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ContributorInsightsSpecification": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ContributorInsightsSpecification"
+                },
+                "IndexName": {
+                    "type": "string"
+                },
+                "ReadProvisionedThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
+                }
+            },
+            "required": [
+                "IndexName"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.ReplicaSSESpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSMasterKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KMSMasterKeyId"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.ReplicaSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ContributorInsightsSpecification": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ContributorInsightsSpecification"
+                },
+                "GlobalSecondaryIndexes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReplicaGlobalSecondaryIndexSpecification"
+                    },
+                    "type": "array"
+                },
+                "PointInTimeRecoverySpecification": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.PointInTimeRecoverySpecification"
+                },
+                "ReadProvisionedThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "SSESpecification": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReplicaSSESpecification"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.SSESpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "SSEEnabled": {
+                    "type": "boolean"
+                },
+                "SSEType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SSEEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.StreamSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamViewType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StreamViewType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.TargetTrackingScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "ScaleInCooldown": {
+                    "type": "number"
+                },
+                "ScaleOutCooldown": {
+                    "type": "number"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.TimeToLiveSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "WriteCapacityAutoScalingSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.CapacityAutoScalingSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AttributeDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::Table.AttributeDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "BillingMode": {
+                            "type": "string"
+                        },
+                        "ContributorInsightsSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.ContributorInsightsSpecification"
+                        },
+                        "GlobalSecondaryIndexes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::Table.GlobalSecondaryIndex"
+                            },
+                            "type": "array"
+                        },
+                        "KeySchema": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::Table.KeySchema"
+                            },
+                            "type": "array"
+                        },
+                        "KinesisStreamSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.KinesisStreamSpecification"
+                        },
+                        "LocalSecondaryIndexes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::Table.LocalSecondaryIndex"
+                            },
+                            "type": "array"
+                        },
+                        "PointInTimeRecoverySpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.PointInTimeRecoverySpecification"
+                        },
+                        "ProvisionedThroughput": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.ProvisionedThroughput"
+                        },
+                        "SSESpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.SSESpecification"
+                        },
+                        "StreamSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.StreamSpecification"
+                        },
+                        "TableClass": {
+                            "type": "string"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeToLiveSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.TimeToLiveSpecification"
+                        }
+                    },
+                    "required": [
+                        "KeySchema"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DynamoDB::Table"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.AttributeDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "AttributeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "AttributeType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.ContributorInsightsSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.GlobalSecondaryIndex": {
+            "additionalProperties": false,
+            "properties": {
+                "ContributorInsightsSpecification": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.ContributorInsightsSpecification"
+                },
+                "IndexName": {
+                    "type": "string"
+                },
+                "KeySchema": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DynamoDB::Table.KeySchema"
+                    },
+                    "type": "array"
+                },
+                "Projection": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.Projection"
+                },
+                "ProvisionedThroughput": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.ProvisionedThroughput"
+                }
+            },
+            "required": [
+                "IndexName",
+                "KeySchema",
+                "Projection"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.KeySchema": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "KeyType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.KinesisStreamSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StreamArn"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.LocalSecondaryIndex": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexName": {
+                    "type": "string"
+                },
+                "KeySchema": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DynamoDB::Table.KeySchema"
+                    },
+                    "type": "array"
+                },
+                "Projection": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.Projection"
+                }
+            },
+            "required": [
+                "IndexName",
+                "KeySchema",
+                "Projection"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.PointInTimeRecoverySpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PointInTimeRecoveryEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.Projection": {
+            "additionalProperties": false,
+            "properties": {
+                "NonKeyAttributes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ProjectionType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.ProvisionedThroughput": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityUnits": {
+                    "type": "number"
+                },
+                "WriteCapacityUnits": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ReadCapacityUnits",
+                "WriteCapacityUnits"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.SSESpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSMasterKeyId": {
+                    "type": "string"
+                },
+                "SSEEnabled": {
+                    "type": "boolean"
+                },
+                "SSEType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SSEEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.StreamSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamViewType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StreamViewType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.TimeToLiveSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::CapacityReservation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "EbsOptimized": {
+                            "type": "boolean"
+                        },
+                        "EndDate": {
+                            "type": "string"
+                        },
+                        "EndDateType": {
+                            "type": "string"
+                        },
+                        "EphemeralStorage": {
+                            "type": "boolean"
+                        },
+                        "InstanceCount": {
+                            "type": "number"
+                        },
+                        "InstanceMatchCriteria": {
+                            "type": "string"
+                        },
+                        "InstancePlatform": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "OutPostArn": {
+                            "type": "string"
+                        },
+                        "PlacementGroupArn": {
+                            "type": "string"
+                        },
+                        "TagSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::CapacityReservation.TagSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "Tenancy": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AvailabilityZone",
+                        "InstanceCount",
+                        "InstancePlatform",
+                        "InstanceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::CapacityReservation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::CapacityReservation.TagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::CapacityReservationFleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocationStrategy": {
+                            "type": "string"
+                        },
+                        "EndDate": {
+                            "type": "string"
+                        },
+                        "InstanceMatchCriteria": {
+                            "type": "string"
+                        },
+                        "InstanceTypeSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::CapacityReservationFleet.InstanceTypeSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "NoRemoveEndDate": {
+                            "type": "boolean"
+                        },
+                        "RemoveEndDate": {
+                            "type": "boolean"
+                        },
+                        "TagSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::CapacityReservationFleet.TagSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "Tenancy": {
+                            "type": "string"
+                        },
+                        "TotalTargetCapacity": {
+                            "type": "number"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::CapacityReservationFleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::CapacityReservationFleet.InstanceTypeSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "AvailabilityZoneId": {
+                    "type": "string"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                },
+                "InstancePlatform": {
+                    "type": "string"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::CapacityReservationFleet.TagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::CarrierGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::CarrierGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnAuthorizationRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessGroupId": {
+                            "type": "string"
+                        },
+                        "AuthorizeAllGroups": {
+                            "type": "boolean"
+                        },
+                        "ClientVpnEndpointId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "TargetNetworkCidr": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClientVpnEndpointId",
+                        "TargetNetworkCidr"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::ClientVpnAuthorizationRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationOptions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.ClientAuthenticationRequest"
+                            },
+                            "type": "array"
+                        },
+                        "ClientCidrBlock": {
+                            "type": "string"
+                        },
+                        "ClientConnectOptions": {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.ClientConnectOptions"
+                        },
+                        "ConnectionLogOptions": {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.ConnectionLogOptions"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DnsServers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SelfServicePortal": {
+                            "type": "string"
+                        },
+                        "ServerCertificateArn": {
+                            "type": "string"
+                        },
+                        "SplitTunnel": {
+                            "type": "boolean"
+                        },
+                        "TagSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.TagSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "TransportProtocol": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        },
+                        "VpnPort": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "AuthenticationOptions",
+                        "ClientCidrBlock",
+                        "ConnectionLogOptions",
+                        "ServerCertificateArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::ClientVpnEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.CertificateAuthenticationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientRootCertificateChainArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClientRootCertificateChainArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.ClientAuthenticationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveDirectory": {
+                    "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.DirectoryServiceAuthenticationRequest"
+                },
+                "FederatedAuthentication": {
+                    "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.FederatedAuthenticationRequest"
+                },
+                "MutualAuthentication": {
+                    "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.CertificateAuthenticationRequest"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.ClientConnectOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "LambdaFunctionArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.ConnectionLogOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudwatchLogGroup": {
+                    "type": "string"
+                },
+                "CloudwatchLogStream": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.DirectoryServiceAuthenticationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DirectoryId"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.FederatedAuthenticationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "SAMLProviderArn": {
+                    "type": "string"
+                },
+                "SelfServiceSAMLProviderArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SAMLProviderArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.TagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ResourceType",
+                "Tags"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClientVpnEndpointId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "TargetVpcSubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClientVpnEndpointId",
+                        "DestinationCidrBlock",
+                        "TargetVpcSubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::ClientVpnRoute"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnTargetNetworkAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClientVpnEndpointId": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClientVpnEndpointId",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::ClientVpnTargetNetworkAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::CustomerGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BgpAsn": {
+                            "type": "number"
+                        },
+                        "IpAddress": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "BgpAsn",
+                        "IpAddress",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::CustomerGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::DHCPOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DomainNameServers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "NetbiosNameServers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "NetbiosNodeType": {
+                            "type": "number"
+                        },
+                        "NtpServers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::DHCPOptions"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Context": {
+                            "type": "string"
+                        },
+                        "ExcessCapacityTerminationPolicy": {
+                            "type": "string"
+                        },
+                        "LaunchTemplateConfigs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::EC2Fleet.FleetLaunchTemplateConfigRequest"
+                            },
+                            "type": "array"
+                        },
+                        "OnDemandOptions": {
+                            "$ref": "#/definitions/AWS::EC2::EC2Fleet.OnDemandOptionsRequest"
+                        },
+                        "ReplaceUnhealthyInstances": {
+                            "type": "boolean"
+                        },
+                        "SpotOptions": {
+                            "$ref": "#/definitions/AWS::EC2::EC2Fleet.SpotOptionsRequest"
+                        },
+                        "TagSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::EC2Fleet.TagSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "TargetCapacitySpecification": {
+                            "$ref": "#/definitions/AWS::EC2::EC2Fleet.TargetCapacitySpecificationRequest"
+                        },
+                        "TerminateInstancesWithExpiration": {
+                            "type": "boolean"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "ValidFrom": {
+                            "type": "string"
+                        },
+                        "ValidUntil": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LaunchTemplateConfigs",
+                        "TargetCapacitySpecification"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::EC2Fleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.AcceleratorCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.AcceleratorTotalMemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.BaselineEbsBandwidthMbpsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.CapacityRebalance": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplacementStrategy": {
+                    "type": "string"
+                },
+                "TerminationDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.CapacityReservationOptionsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "UsageStrategy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.FleetLaunchTemplateConfigRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateSpecification": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.FleetLaunchTemplateSpecificationRequest"
+                },
+                "Overrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::EC2Fleet.FleetLaunchTemplateOverridesRequest"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.FleetLaunchTemplateOverridesRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "InstanceRequirements": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.InstanceRequirementsRequest"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "MaxPrice": {
+                    "type": "string"
+                },
+                "Placement": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.Placement"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "SubnetId": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.FleetLaunchTemplateSpecificationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.InstanceRequirementsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceleratorCount": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.AcceleratorCountRequest"
+                },
+                "AcceleratorManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorTotalMemoryMiB": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.AcceleratorTotalMemoryMiBRequest"
+                },
+                "AcceleratorTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BareMetal": {
+                    "type": "string"
+                },
+                "BaselineEbsBandwidthMbps": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.BaselineEbsBandwidthMbpsRequest"
+                },
+                "BurstablePerformance": {
+                    "type": "string"
+                },
+                "CpuManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExcludedInstanceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InstanceGenerations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LocalStorage": {
+                    "type": "string"
+                },
+                "LocalStorageTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MemoryGiBPerVCpu": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.MemoryGiBPerVCpuRequest"
+                },
+                "MemoryMiB": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.MemoryMiBRequest"
+                },
+                "NetworkInterfaceCount": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.NetworkInterfaceCountRequest"
+                },
+                "OnDemandMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "RequireHibernateSupport": {
+                    "type": "boolean"
+                },
+                "SpotMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "TotalLocalStorageGB": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.TotalLocalStorageGBRequest"
+                },
+                "VCpuCount": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.VCpuCountRangeRequest"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.MaintenanceStrategies": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityRebalance": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.CapacityRebalance"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.MemoryGiBPerVCpuRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.MemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.NetworkInterfaceCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.OnDemandOptionsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.CapacityReservationOptionsRequest"
+                },
+                "MaxTotalPrice": {
+                    "type": "string"
+                },
+                "MinTargetCapacity": {
+                    "type": "number"
+                },
+                "SingleAvailabilityZone": {
+                    "type": "boolean"
+                },
+                "SingleInstanceType": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.Placement": {
+            "additionalProperties": false,
+            "properties": {
+                "Affinity": {
+                    "type": "string"
+                },
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "GroupName": {
+                    "type": "string"
+                },
+                "HostId": {
+                    "type": "string"
+                },
+                "HostResourceGroupArn": {
+                    "type": "string"
+                },
+                "PartitionNumber": {
+                    "type": "number"
+                },
+                "SpreadDomain": {
+                    "type": "string"
+                },
+                "Tenancy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.SpotOptionsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "InstanceInterruptionBehavior": {
+                    "type": "string"
+                },
+                "InstancePoolsToUseCount": {
+                    "type": "number"
+                },
+                "MaintenanceStrategies": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.MaintenanceStrategies"
+                },
+                "MaxTotalPrice": {
+                    "type": "string"
+                },
+                "MinTargetCapacity": {
+                    "type": "number"
+                },
+                "SingleAvailabilityZone": {
+                    "type": "boolean"
+                },
+                "SingleInstanceType": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.TagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.TargetCapacitySpecificationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultTargetCapacityType": {
+                    "type": "string"
+                },
+                "OnDemandTargetCapacity": {
+                    "type": "number"
+                },
+                "SpotTargetCapacity": {
+                    "type": "number"
+                },
+                "TargetCapacityUnitType": {
+                    "type": "string"
+                },
+                "TotalTargetCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TotalTargetCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.TotalLocalStorageGBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.VCpuCountRangeRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EIP": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "PublicIpv4Pool": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::EIP"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EIPAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocationId": {
+                            "type": "string"
+                        },
+                        "EIP": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "PrivateIpAddress": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::EIPAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EgressOnlyInternetGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::EgressOnlyInternetGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EnclaveCertificateIamRoleAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CertificateArn": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CertificateArn",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::EnclaveCertificateIamRoleAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::FlowLog": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeliverLogsPermissionArn": {
+                            "type": "string"
+                        },
+                        "LogDestination": {
+                            "type": "string"
+                        },
+                        "LogDestinationType": {
+                            "type": "string"
+                        },
+                        "LogFormat": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "MaxAggregationInterval": {
+                            "type": "number"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "ResourceType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrafficType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourceId",
+                        "ResourceType",
+                        "TrafficType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::FlowLog"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::GatewayRouteTableAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GatewayId": {
+                            "type": "string"
+                        },
+                        "RouteTableId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GatewayId",
+                        "RouteTableId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::GatewayRouteTableAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Host": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoPlacement": {
+                            "type": "string"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "HostRecovery": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AvailabilityZone",
+                        "InstanceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::Host"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAM": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "OperatingRegions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::IPAM.IpamOperatingRegion"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::IPAM"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAM.IpamOperatingRegion": {
+            "additionalProperties": false,
+            "properties": {
+                "RegionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RegionName"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAMAllocation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Cidr": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IpamPoolId": {
+                            "type": "string"
+                        },
+                        "NetmaskLength": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "IpamPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::IPAMAllocation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAMPool": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AddressFamily": {
+                            "type": "string"
+                        },
+                        "AllocationDefaultNetmaskLength": {
+                            "type": "number"
+                        },
+                        "AllocationMaxNetmaskLength": {
+                            "type": "number"
+                        },
+                        "AllocationMinNetmaskLength": {
+                            "type": "number"
+                        },
+                        "AllocationResourceTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "AutoImport": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IpamScopeId": {
+                            "type": "string"
+                        },
+                        "Locale": {
+                            "type": "string"
+                        },
+                        "ProvisionedCidrs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::IPAMPool.ProvisionedCidr"
+                            },
+                            "type": "array"
+                        },
+                        "PubliclyAdvertisable": {
+                            "type": "boolean"
+                        },
+                        "SourceIpamPoolId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddressFamily",
+                        "IpamScopeId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::IPAMPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAMPool.ProvisionedCidr": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Cidr"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAMScope": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "IpamId": {
+                            "type": "string"
+                        },
+                        "IpamScopeType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "IpamId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::IPAMScope"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance": {
+            "additionalProperties": false,
+            "properties": {
+                "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": {
+                        "AdditionalInfo": {
+                            "type": "string"
+                        },
+                        "Affinity": {
+                            "type": "string"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "BlockDeviceMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.BlockDeviceMapping"
+                            },
+                            "type": "array"
+                        },
+                        "CpuOptions": {
+                            "$ref": "#/definitions/AWS::EC2::Instance.CpuOptions"
+                        },
+                        "CreditSpecification": {
+                            "$ref": "#/definitions/AWS::EC2::Instance.CreditSpecification"
+                        },
+                        "DisableApiTermination": {
+                            "type": "boolean"
+                        },
+                        "EbsOptimized": {
+                            "type": "boolean"
+                        },
+                        "ElasticGpuSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.ElasticGpuSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "ElasticInferenceAccelerators": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.ElasticInferenceAccelerator"
+                            },
+                            "type": "array"
+                        },
+                        "EnclaveOptions": {
+                            "$ref": "#/definitions/AWS::EC2::Instance.EnclaveOptions"
+                        },
+                        "HibernationOptions": {
+                            "$ref": "#/definitions/AWS::EC2::Instance.HibernationOptions"
+                        },
+                        "HostId": {
+                            "type": "string"
+                        },
+                        "HostResourceGroupArn": {
+                            "type": "string"
+                        },
+                        "IamInstanceProfile": {
+                            "type": "string"
+                        },
+                        "ImageId": {
+                            "type": "string"
+                        },
+                        "InstanceInitiatedShutdownBehavior": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "Ipv6AddressCount": {
+                            "type": "number"
+                        },
+                        "Ipv6Addresses": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.InstanceIpv6Address"
+                            },
+                            "type": "array"
+                        },
+                        "KernelId": {
+                            "type": "string"
+                        },
+                        "KeyName": {
+                            "type": "string"
+                        },
+                        "LaunchTemplate": {
+                            "$ref": "#/definitions/AWS::EC2::Instance.LaunchTemplateSpecification"
+                        },
+                        "LicenseSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.LicenseSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "Monitoring": {
+                            "type": "boolean"
+                        },
+                        "NetworkInterfaces": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.NetworkInterface"
+                            },
+                            "type": "array"
+                        },
+                        "PlacementGroupName": {
+                            "type": "string"
+                        },
+                        "PrivateIpAddress": {
+                            "type": "string"
+                        },
+                        "PropagateTagsToVolumeOnCreation": {
+                            "type": "boolean"
+                        },
+                        "RamdiskId": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SourceDestCheck": {
+                            "type": "boolean"
+                        },
+                        "SsmAssociations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.SsmAssociation"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Tenancy": {
+                            "type": "string"
+                        },
+                        "UserData": {
+                            "type": "string"
+                        },
+                        "Volumes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.Volume"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.AssociationParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.BlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::EC2::Instance.Ebs"
+                },
+                "NoDevice": {
+                    "$ref": "#/definitions/AWS::EC2::Instance.NoDevice"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeviceName"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.CpuOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CoreCount": {
+                    "type": "number"
+                },
+                "ThreadsPerCore": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Instance.CreditSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "CPUCredits": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Instance.Ebs": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Instance.ElasticGpuSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.ElasticInferenceAccelerator": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.EnclaveOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Instance.HibernationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Configured": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Instance.InstanceIpv6Address": {
+            "additionalProperties": false,
+            "properties": {
+                "Ipv6Address": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ipv6Address"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.LaunchTemplateSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.LicenseSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LicenseConfigurationArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LicenseConfigurationArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.NetworkInterface": {
+            "additionalProperties": false,
+            "properties": {
+                "AssociatePublicIpAddress": {
+                    "type": "boolean"
+                },
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DeviceIndex": {
+                    "type": "string"
+                },
+                "GroupSet": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Ipv6AddressCount": {
+                    "type": "number"
+                },
+                "Ipv6Addresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::Instance.InstanceIpv6Address"
+                    },
+                    "type": "array"
+                },
+                "NetworkInterfaceId": {
+                    "type": "string"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                },
+                "PrivateIpAddresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::Instance.PrivateIpAddressSpecification"
+                    },
+                    "type": "array"
+                },
+                "SecondaryPrivateIpAddressCount": {
+                    "type": "number"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeviceIndex"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.NoDevice": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::EC2::Instance.PrivateIpAddressSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Primary": {
+                    "type": "boolean"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Primary",
+                "PrivateIpAddress"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.SsmAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "AssociationParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::Instance.AssociationParameter"
+                    },
+                    "type": "array"
+                },
+                "DocumentName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DocumentName"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.Volume": {
+            "additionalProperties": false,
+            "properties": {
+                "Device": {
+                    "type": "string"
+                },
+                "VolumeId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Device",
+                "VolumeId"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::InternetGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::InternetGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LaunchTemplateData": {
+                            "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LaunchTemplateData"
+                        },
+                        "LaunchTemplateName": {
+                            "type": "string"
+                        },
+                        "TagSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LaunchTemplateTagSpecification"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::LaunchTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.AcceleratorCount": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.AcceleratorTotalMemoryMiB": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.BaselineEbsBandwidthMbps": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.BlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.Ebs"
+                },
+                "NoDevice": {
+                    "type": "string"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.CapacityReservationSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityReservationPreference": {
+                    "type": "string"
+                },
+                "CapacityReservationTarget": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.CapacityReservationTarget"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.CapacityReservationTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityReservationId": {
+                    "type": "string"
+                },
+                "CapacityReservationResourceGroupArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.CpuOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CoreCount": {
+                    "type": "number"
+                },
+                "ThreadsPerCore": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.CreditSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "CpuCredits": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.Ebs": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "Throughput": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.ElasticGpuSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.EnclaveOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.HibernationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Configured": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.IamInstanceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.InstanceMarketOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "MarketType": {
+                    "type": "string"
+                },
+                "SpotOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.SpotOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.Ipv6Add": {
+            "additionalProperties": false,
+            "properties": {
+                "Ipv6Address": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.LaunchTemplateData": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockDeviceMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.BlockDeviceMapping"
+                    },
+                    "type": "array"
+                },
+                "CapacityReservationSpecification": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.CapacityReservationSpecification"
+                },
+                "CpuOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.CpuOptions"
+                },
+                "CreditSpecification": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.CreditSpecification"
+                },
+                "DisableApiTermination": {
+                    "type": "boolean"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                },
+                "ElasticGpuSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.ElasticGpuSpecification"
+                    },
+                    "type": "array"
+                },
+                "ElasticInferenceAccelerators": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LaunchTemplateElasticInferenceAccelerator"
+                    },
+                    "type": "array"
+                },
+                "EnclaveOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.EnclaveOptions"
+                },
+                "HibernationOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.HibernationOptions"
+                },
+                "IamInstanceProfile": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.IamInstanceProfile"
+                },
+                "ImageId": {
+                    "type": "string"
+                },
+                "InstanceInitiatedShutdownBehavior": {
+                    "type": "string"
+                },
+                "InstanceMarketOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.InstanceMarketOptions"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "KernelId": {
+                    "type": "string"
+                },
+                "KeyName": {
+                    "type": "string"
+                },
+                "LicenseSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LicenseSpecification"
+                    },
+                    "type": "array"
+                },
+                "MetadataOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.MetadataOptions"
+                },
+                "Monitoring": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.Monitoring"
+                },
+                "NetworkInterfaces": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.NetworkInterface"
+                    },
+                    "type": "array"
+                },
+                "Placement": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.Placement"
+                },
+                "RamDiskId": {
+                    "type": "string"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TagSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.TagSpecification"
+                    },
+                    "type": "array"
+                },
+                "UserData": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.LaunchTemplateElasticInferenceAccelerator": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.LaunchTemplateTagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.LicenseSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LicenseConfigurationArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.MemoryGiBPerVCpu": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.MemoryMiB": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.MetadataOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpEndpoint": {
+                    "type": "string"
+                },
+                "HttpProtocolIpv6": {
+                    "type": "string"
+                },
+                "HttpPutResponseHopLimit": {
+                    "type": "number"
+                },
+                "HttpTokens": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.Monitoring": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.NetworkInterface": {
+            "additionalProperties": false,
+            "properties": {
+                "AssociateCarrierIpAddress": {
+                    "type": "boolean"
+                },
+                "AssociatePublicIpAddress": {
+                    "type": "boolean"
+                },
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DeviceIndex": {
+                    "type": "number"
+                },
+                "Groups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InterfaceType": {
+                    "type": "string"
+                },
+                "Ipv6AddressCount": {
+                    "type": "number"
+                },
+                "Ipv6Addresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.Ipv6Add"
+                    },
+                    "type": "array"
+                },
+                "NetworkCardIndex": {
+                    "type": "number"
+                },
+                "NetworkInterfaceId": {
+                    "type": "string"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                },
+                "PrivateIpAddresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.PrivateIpAdd"
+                    },
+                    "type": "array"
+                },
+                "SecondaryPrivateIpAddressCount": {
+                    "type": "number"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.NetworkInterfaceCount": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.Placement": {
+            "additionalProperties": false,
+            "properties": {
+                "Affinity": {
+                    "type": "string"
+                },
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "GroupName": {
+                    "type": "string"
+                },
+                "HostId": {
+                    "type": "string"
+                },
+                "HostResourceGroupArn": {
+                    "type": "string"
+                },
+                "PartitionNumber": {
+                    "type": "number"
+                },
+                "SpreadDomain": {
+                    "type": "string"
+                },
+                "Tenancy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.PrivateIpAdd": {
+            "additionalProperties": false,
+            "properties": {
+                "Primary": {
+                    "type": "boolean"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.SpotOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockDurationMinutes": {
+                    "type": "number"
+                },
+                "InstanceInterruptionBehavior": {
+                    "type": "string"
+                },
+                "MaxPrice": {
+                    "type": "string"
+                },
+                "SpotInstanceType": {
+                    "type": "string"
+                },
+                "ValidUntil": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.TagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.TotalLocalStorageGB": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.VCpuCount": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LocalGatewayRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "LocalGatewayRouteTableId": {
+                            "type": "string"
+                        },
+                        "LocalGatewayVirtualInterfaceGroupId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationCidrBlock",
+                        "LocalGatewayRouteTableId",
+                        "LocalGatewayVirtualInterfaceGroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::LocalGatewayRoute"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::LocalGatewayRouteTableVPCAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LocalGatewayRouteTableId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LocalGatewayRouteTableId",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::LocalGatewayRouteTableVPCAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NatGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocationId": {
+                            "type": "string"
+                        },
+                        "ConnectivityType": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NatGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkAcl": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkAcl"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkAclEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CidrBlock": {
+                            "type": "string"
+                        },
+                        "Egress": {
+                            "type": "boolean"
+                        },
+                        "Icmp": {
+                            "$ref": "#/definitions/AWS::EC2::NetworkAclEntry.Icmp"
+                        },
+                        "Ipv6CidrBlock": {
+                            "type": "string"
+                        },
+                        "NetworkAclId": {
+                            "type": "string"
+                        },
+                        "PortRange": {
+                            "$ref": "#/definitions/AWS::EC2::NetworkAclEntry.PortRange"
+                        },
+                        "Protocol": {
+                            "type": "number"
+                        },
+                        "RuleAction": {
+                            "type": "string"
+                        },
+                        "RuleNumber": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "NetworkAclId",
+                        "Protocol",
+                        "RuleAction",
+                        "RuleNumber"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkAclEntry"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkAclEntry.Icmp": {
+            "additionalProperties": false,
+            "properties": {
+                "Code": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkAclEntry.PortRange": {
+            "additionalProperties": false,
+            "properties": {
+                "From": {
+                    "type": "number"
+                },
+                "To": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FilterInArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "NetworkInsightsPathId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "NetworkInsightsPathId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkInsightsAnalysis"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AlternatePathHint": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentArn": {
+                    "type": "string"
+                },
+                "ComponentId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Egress": {
+                    "type": "boolean"
+                },
+                "PortRange": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.PortRange"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "RuleAction": {
+                    "type": "string"
+                },
+                "RuleNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerListener": {
+            "additionalProperties": false,
+            "properties": {
+                "InstancePort": {
+                    "type": "number"
+                },
+                "LoadBalancerPort": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "Instance": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationAddresses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DestinationPortRanges": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.PortRange"
+                    },
+                    "type": "array"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "SourceAddresses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SourcePortRanges": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.PortRange"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisRouteTableRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "NatGatewayId": {
+                    "type": "string"
+                },
+                "NetworkInterfaceId": {
+                    "type": "string"
+                },
+                "Origin": {
+                    "type": "string"
+                },
+                "TransitGatewayId": {
+                    "type": "string"
+                },
+                "VpcPeeringConnectionId": {
+                    "type": "string"
+                },
+                "destinationCidr": {
+                    "type": "string"
+                },
+                "destinationPrefixListId": {
+                    "type": "string"
+                },
+                "egressOnlyInternetGatewayId": {
+                    "type": "string"
+                },
+                "gatewayId": {
+                    "type": "string"
+                },
+                "instanceId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisSecurityGroupRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Direction": {
+                    "type": "string"
+                },
+                "PortRange": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.PortRange"
+                },
+                "PrefixListId": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "SecurityGroupId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.Explanation": {
+            "additionalProperties": false,
+            "properties": {
+                "Acl": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "AclRule": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule"
+                },
+                "Address": {
+                    "type": "string"
+                },
+                "Addresses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AttachedTo": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "AvailabilityZones": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Cidrs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ClassicLoadBalancerListener": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerListener"
+                },
+                "Component": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "CustomerGateway": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "DestinationVpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Direction": {
+                    "type": "string"
+                },
+                "ElasticLoadBalancerListener": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "ExplanationCode": {
+                    "type": "string"
+                },
+                "IngressRouteTable": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "InternetGateway": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "LoadBalancerArn": {
+                    "type": "string"
+                },
+                "LoadBalancerListenerPort": {
+                    "type": "number"
+                },
+                "LoadBalancerTarget": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerTarget"
+                },
+                "LoadBalancerTargetGroup": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "LoadBalancerTargetGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                    },
+                    "type": "array"
+                },
+                "LoadBalancerTargetPort": {
+                    "type": "number"
+                },
+                "MissingComponent": {
+                    "type": "string"
+                },
+                "NatGateway": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "NetworkInterface": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "PacketField": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "PortRanges": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.PortRange"
+                    },
+                    "type": "array"
+                },
+                "PrefixList": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Protocols": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RouteTable": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "RouteTableRoute": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisRouteTableRoute"
+                },
+                "SecurityGroup": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "SecurityGroupRule": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisSecurityGroupRule"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                    },
+                    "type": "array"
+                },
+                "SourceVpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "State": {
+                    "type": "string"
+                },
+                "Subnet": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "SubnetRouteTable": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Vpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "VpcPeeringConnection": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "VpnConnection": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "VpnGateway": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "vpcEndpoint": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.PathComponent": {
+            "additionalProperties": false,
+            "properties": {
+                "AclRule": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule"
+                },
+                "Component": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "DestinationVpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "InboundHeader": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader"
+                },
+                "OutboundHeader": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader"
+                },
+                "RouteTableRoute": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisRouteTableRoute"
+                },
+                "SecurityGroupRule": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisSecurityGroupRule"
+                },
+                "SequenceNumber": {
+                    "type": "number"
+                },
+                "SourceVpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Subnet": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Vpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.PortRange": {
+            "additionalProperties": false,
+            "properties": {
+                "From": {
+                    "type": "number"
+                },
+                "To": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsPath": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Destination": {
+                            "type": "string"
+                        },
+                        "DestinationIp": {
+                            "type": "string"
+                        },
+                        "DestinationPort": {
+                            "type": "number"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "Source": {
+                            "type": "string"
+                        },
+                        "SourceIp": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Destination",
+                        "Protocol",
+                        "Source"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkInsightsPath"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInterface": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "GroupSet": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "InterfaceType": {
+                            "type": "string"
+                        },
+                        "Ipv6AddressCount": {
+                            "type": "number"
+                        },
+                        "Ipv6Addresses": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::NetworkInterface.InstanceIpv6Address"
+                            },
+                            "type": "array"
+                        },
+                        "PrivateIpAddress": {
+                            "type": "string"
+                        },
+                        "PrivateIpAddresses": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::NetworkInterface.PrivateIpAddressSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "SecondaryPrivateIpAddressCount": {
+                            "type": "number"
+                        },
+                        "SourceDestCheck": {
+                            "type": "boolean"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkInterface"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInterface.InstanceIpv6Address": {
+            "additionalProperties": false,
+            "properties": {
+                "Ipv6Address": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ipv6Address"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInterface.PrivateIpAddressSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Primary": {
+                    "type": "boolean"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Primary",
+                "PrivateIpAddress"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInterfaceAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeleteOnTermination": {
+                            "type": "boolean"
+                        },
+                        "DeviceIndex": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DeviceIndex",
+                        "InstanceId",
+                        "NetworkInterfaceId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkInterfaceAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInterfacePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "Permission": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AwsAccountId",
+                        "NetworkInterfaceId",
+                        "Permission"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkInterfacePermission"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::PlacementGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Strategy": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::PlacementGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::PrefixList": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AddressFamily": {
+                            "type": "string"
+                        },
+                        "Entries": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::PrefixList.Entry"
+                            },
+                            "type": "array"
+                        },
+                        "MaxEntries": {
+                            "type": "number"
+                        },
+                        "PrefixListName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddressFamily",
+                        "MaxEntries",
+                        "PrefixListName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::PrefixList"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::PrefixList.Entry": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Cidr"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Route": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CarrierGatewayId": {
+                            "type": "string"
+                        },
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "DestinationIpv6CidrBlock": {
+                            "type": "string"
+                        },
+                        "EgressOnlyInternetGatewayId": {
+                            "type": "string"
+                        },
+                        "GatewayId": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "LocalGatewayId": {
+                            "type": "string"
+                        },
+                        "NatGatewayId": {
+                            "type": "string"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "RouteTableId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        },
+                        "VpcEndpointId": {
+                            "type": "string"
+                        },
+                        "VpcPeeringConnectionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RouteTableId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::Route"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::RouteTable": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::RouteTable"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupDescription": {
+                            "type": "string"
+                        },
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "SecurityGroupEgress": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::SecurityGroup.Egress"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityGroupIngress": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::SecurityGroup.Ingress"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GroupDescription"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SecurityGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SecurityGroup.Egress": {
+            "additionalProperties": false,
+            "properties": {
+                "CidrIp": {
+                    "type": "string"
+                },
+                "CidrIpv6": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DestinationPrefixListId": {
+                    "type": "string"
+                },
+                "DestinationSecurityGroupId": {
+                    "type": "string"
+                },
+                "FromPort": {
+                    "type": "number"
+                },
+                "IpProtocol": {
+                    "type": "string"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "IpProtocol"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SecurityGroup.Ingress": {
+            "additionalProperties": false,
+            "properties": {
+                "CidrIp": {
+                    "type": "string"
+                },
+                "CidrIpv6": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "FromPort": {
+                    "type": "number"
+                },
+                "IpProtocol": {
+                    "type": "string"
+                },
+                "SourcePrefixListId": {
+                    "type": "string"
+                },
+                "SourceSecurityGroupId": {
+                    "type": "string"
+                },
+                "SourceSecurityGroupName": {
+                    "type": "string"
+                },
+                "SourceSecurityGroupOwnerId": {
+                    "type": "string"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "IpProtocol"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SecurityGroupEgress": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CidrIp": {
+                            "type": "string"
+                        },
+                        "CidrIpv6": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DestinationPrefixListId": {
+                            "type": "string"
+                        },
+                        "DestinationSecurityGroupId": {
+                            "type": "string"
+                        },
+                        "FromPort": {
+                            "type": "number"
+                        },
+                        "GroupId": {
+                            "type": "string"
+                        },
+                        "IpProtocol": {
+                            "type": "string"
+                        },
+                        "ToPort": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "GroupId",
+                        "IpProtocol"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SecurityGroupEgress"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SecurityGroupIngress": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CidrIp": {
+                            "type": "string"
+                        },
+                        "CidrIpv6": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FromPort": {
+                            "type": "number"
+                        },
+                        "GroupId": {
+                            "type": "string"
+                        },
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "IpProtocol": {
+                            "type": "string"
+                        },
+                        "SourcePrefixListId": {
+                            "type": "string"
+                        },
+                        "SourceSecurityGroupId": {
+                            "type": "string"
+                        },
+                        "SourceSecurityGroupName": {
+                            "type": "string"
+                        },
+                        "SourceSecurityGroupOwnerId": {
+                            "type": "string"
+                        },
+                        "ToPort": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "IpProtocol"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SecurityGroupIngress"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SpotFleetRequestConfigData": {
+                            "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotFleetRequestConfigData"
+                        }
+                    },
+                    "required": [
+                        "SpotFleetRequestConfigData"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SpotFleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.AcceleratorCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.AcceleratorTotalMemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.BaselineEbsBandwidthMbpsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.BlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.EbsBlockDevice"
+                },
+                "NoDevice": {
+                    "type": "string"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeviceName"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.ClassicLoadBalancer": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.ClassicLoadBalancersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClassicLoadBalancers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.ClassicLoadBalancer"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ClassicLoadBalancers"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.EbsBlockDevice": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.FleetLaunchTemplateSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.GroupIdentifier": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupId"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.IamInstanceProfileSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.InstanceIpv6Address": {
+            "additionalProperties": false,
+            "properties": {
+                "Ipv6Address": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ipv6Address"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.InstanceNetworkInterfaceSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AssociatePublicIpAddress": {
+                    "type": "boolean"
+                },
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DeviceIndex": {
+                    "type": "number"
+                },
+                "Groups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Ipv6AddressCount": {
+                    "type": "number"
+                },
+                "Ipv6Addresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.InstanceIpv6Address"
+                    },
+                    "type": "array"
+                },
+                "NetworkInterfaceId": {
+                    "type": "string"
+                },
+                "PrivateIpAddresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.PrivateIpAddressSpecification"
+                    },
+                    "type": "array"
+                },
+                "SecondaryPrivateIpAddressCount": {
+                    "type": "number"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.InstanceRequirementsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceleratorCount": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.AcceleratorCountRequest"
+                },
+                "AcceleratorManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorTotalMemoryMiB": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.AcceleratorTotalMemoryMiBRequest"
+                },
+                "AcceleratorTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BareMetal": {
+                    "type": "string"
+                },
+                "BaselineEbsBandwidthMbps": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.BaselineEbsBandwidthMbpsRequest"
+                },
+                "BurstablePerformance": {
+                    "type": "string"
+                },
+                "CpuManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExcludedInstanceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InstanceGenerations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LocalStorage": {
+                    "type": "string"
+                },
+                "LocalStorageTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MemoryGiBPerVCpu": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.MemoryGiBPerVCpuRequest"
+                },
+                "MemoryMiB": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.MemoryMiBRequest"
+                },
+                "NetworkInterfaceCount": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.NetworkInterfaceCountRequest"
+                },
+                "OnDemandMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "RequireHibernateSupport": {
+                    "type": "boolean"
+                },
+                "SpotMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "TotalLocalStorageGB": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.TotalLocalStorageGBRequest"
+                },
+                "VCpuCount": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.VCpuCountRangeRequest"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.LaunchTemplateConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateSpecification": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.FleetLaunchTemplateSpecification"
+                },
+                "Overrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.LaunchTemplateOverrides"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.LaunchTemplateOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "InstanceRequirements": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.InstanceRequirementsRequest"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "SpotPrice": {
+                    "type": "string"
+                },
+                "SubnetId": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.LoadBalancersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClassicLoadBalancersConfig": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.ClassicLoadBalancersConfig"
+                },
+                "TargetGroupsConfig": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.TargetGroupsConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.MemoryGiBPerVCpuRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.MemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.NetworkInterfaceCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.PrivateIpAddressSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Primary": {
+                    "type": "boolean"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PrivateIpAddress"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotCapacityRebalance": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplacementStrategy": {
+                    "type": "string"
+                },
+                "TerminationDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotFleetLaunchSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockDeviceMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.BlockDeviceMapping"
+                    },
+                    "type": "array"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                },
+                "IamInstanceProfile": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.IamInstanceProfileSpecification"
+                },
+                "ImageId": {
+                    "type": "string"
+                },
+                "InstanceRequirements": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.InstanceRequirementsRequest"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "KernelId": {
+                    "type": "string"
+                },
+                "KeyName": {
+                    "type": "string"
+                },
+                "Monitoring": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotFleetMonitoring"
+                },
+                "NetworkInterfaces": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.InstanceNetworkInterfaceSpecification"
+                    },
+                    "type": "array"
+                },
+                "Placement": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotPlacement"
+                },
+                "RamdiskId": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.GroupIdentifier"
+                    },
+                    "type": "array"
+                },
+                "SpotPrice": {
+                    "type": "string"
+                },
+                "SubnetId": {
+                    "type": "string"
+                },
+                "TagSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotFleetTagSpecification"
+                    },
+                    "type": "array"
+                },
+                "UserData": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ImageId"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotFleetMonitoring": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotFleetRequestConfigData": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "Context": {
+                    "type": "string"
+                },
+                "ExcessCapacityTerminationPolicy": {
+                    "type": "string"
+                },
+                "IamFleetRole": {
+                    "type": "string"
+                },
+                "InstanceInterruptionBehavior": {
+                    "type": "string"
+                },
+                "InstancePoolsToUseCount": {
+                    "type": "number"
+                },
+                "LaunchSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotFleetLaunchSpecification"
+                    },
+                    "type": "array"
+                },
+                "LaunchTemplateConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.LaunchTemplateConfig"
+                    },
+                    "type": "array"
+                },
+                "LoadBalancersConfig": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.LoadBalancersConfig"
+                },
+                "OnDemandAllocationStrategy": {
+                    "type": "string"
+                },
+                "OnDemandMaxTotalPrice": {
+                    "type": "string"
+                },
+                "OnDemandTargetCapacity": {
+                    "type": "number"
+                },
+                "ReplaceUnhealthyInstances": {
+                    "type": "boolean"
+                },
+                "SpotMaintenanceStrategies": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotMaintenanceStrategies"
+                },
+                "SpotMaxTotalPrice": {
+                    "type": "string"
+                },
+                "SpotPrice": {
+                    "type": "string"
+                },
+                "TargetCapacity": {
+                    "type": "number"
+                },
+                "TargetCapacityUnitType": {
+                    "type": "string"
+                },
+                "TerminateInstancesWithExpiration": {
+                    "type": "boolean"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "ValidFrom": {
+                    "type": "string"
+                },
+                "ValidUntil": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IamFleetRole",
+                "TargetCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotFleetTagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotMaintenanceStrategies": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityRebalance": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotCapacityRebalance"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotPlacement": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "GroupName": {
+                    "type": "string"
+                },
+                "Tenancy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.TargetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.TargetGroupsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.TargetGroup"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "TargetGroups"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.TotalLocalStorageGBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.VCpuCountRangeRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Subnet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssignIpv6AddressOnCreation": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "CidrBlock": {
+                            "type": "string"
+                        },
+                        "Ipv6CidrBlock": {
+                            "type": "string"
+                        },
+                        "MapPublicIpOnLaunch": {
+                            "type": "boolean"
+                        },
+                        "OutpostArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CidrBlock",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::Subnet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SubnetCidrBlock": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Ipv6CidrBlock": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Ipv6CidrBlock",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SubnetCidrBlock"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SubnetNetworkAclAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "NetworkAclId": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "NetworkAclId",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SubnetNetworkAclAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SubnetRouteTableAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RouteTableId": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RouteTableId",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SubnetRouteTableAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TrafficMirrorFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "NetworkServices": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TrafficMirrorFilter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TrafficMirrorFilterRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "DestinationPortRange": {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange"
+                        },
+                        "Protocol": {
+                            "type": "number"
+                        },
+                        "RuleAction": {
+                            "type": "string"
+                        },
+                        "RuleNumber": {
+                            "type": "number"
+                        },
+                        "SourceCidrBlock": {
+                            "type": "string"
+                        },
+                        "SourcePortRange": {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange"
+                        },
+                        "TrafficDirection": {
+                            "type": "string"
+                        },
+                        "TrafficMirrorFilterId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationCidrBlock",
+                        "RuleAction",
+                        "RuleNumber",
+                        "SourceCidrBlock",
+                        "TrafficDirection",
+                        "TrafficMirrorFilterId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TrafficMirrorFilterRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange": {
+            "additionalProperties": false,
+            "properties": {
+                "FromPort": {
+                    "type": "number"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FromPort",
+                "ToPort"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TrafficMirrorSession": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "PacketLength": {
+                            "type": "number"
+                        },
+                        "SessionNumber": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrafficMirrorFilterId": {
+                            "type": "string"
+                        },
+                        "TrafficMirrorTargetId": {
+                            "type": "string"
+                        },
+                        "VirtualNetworkId": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "NetworkInterfaceId",
+                        "SessionNumber",
+                        "TrafficMirrorFilterId",
+                        "TrafficMirrorTargetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TrafficMirrorSession"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TrafficMirrorTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "NetworkLoadBalancerArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TrafficMirrorTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AmazonSideAsn": {
+                            "type": "number"
+                        },
+                        "AssociationDefaultRouteTableId": {
+                            "type": "string"
+                        },
+                        "AutoAcceptSharedAttachments": {
+                            "type": "string"
+                        },
+                        "DefaultRouteTableAssociation": {
+                            "type": "string"
+                        },
+                        "DefaultRouteTablePropagation": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DnsSupport": {
+                            "type": "string"
+                        },
+                        "MulticastSupport": {
+                            "type": "string"
+                        },
+                        "PropagationDefaultRouteTableId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayCidrBlocks": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpnEcmpSupport": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SubnetIds",
+                        "TransitGatewayId",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayConnect": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Options": {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayConnect.TransitGatewayConnectOptions"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransportTransitGatewayAttachmentId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Options",
+                        "TransportTransitGatewayAttachmentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayConnect"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayConnect.TransitGatewayConnectOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayMulticastDomain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Options": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TransitGatewayId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayMulticastDomain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayMulticastDomainAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayMulticastDomainId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SubnetId",
+                        "TransitGatewayAttachmentId",
+                        "TransitGatewayMulticastDomainId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayMulticastDomainAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayMulticastGroupMember": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupIpAddress": {
+                            "type": "string"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayMulticastDomainId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GroupIpAddress",
+                        "NetworkInterfaceId",
+                        "TransitGatewayMulticastDomainId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayMulticastGroupMember"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayMulticastGroupSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupIpAddress": {
+                            "type": "string"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayMulticastDomainId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GroupIpAddress",
+                        "NetworkInterfaceId",
+                        "TransitGatewayMulticastDomainId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayMulticastGroupSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayPeeringAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Options": {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayPeeringAttachment.TransitGatewayPeeringAttachmentOptions"
+                        },
+                        "PeerAccountId": {
+                            "type": "string"
+                        },
+                        "PeerRegion": {
+                            "type": "string"
+                        },
+                        "PeerTransitGatewayId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PeerAccountId",
+                        "PeerRegion",
+                        "PeerTransitGatewayId",
+                        "TransitGatewayId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayPeeringAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayPeeringAttachment.TransitGatewayPeeringAttachmentOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DynamicRouting": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Blackhole": {
+                            "type": "boolean"
+                        },
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "TransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayRouteTableId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TransitGatewayRouteTableId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayRoute"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayRouteTable": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TransitGatewayId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayRouteTable"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayRouteTableAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "TransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayRouteTableId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TransitGatewayAttachmentId",
+                        "TransitGatewayRouteTableId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayRouteTableAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayRouteTablePropagation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "TransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayRouteTableId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TransitGatewayAttachmentId",
+                        "TransitGatewayRouteTableId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayRouteTablePropagation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayVpcAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AddSubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Options": {
+                            "type": "object"
+                        },
+                        "RemoveSubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayVpcAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPC": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CidrBlock": {
+                            "type": "string"
+                        },
+                        "EnableDnsHostnames": {
+                            "type": "boolean"
+                        },
+                        "EnableDnsSupport": {
+                            "type": "boolean"
+                        },
+                        "InstanceTenancy": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CidrBlock"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPC"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCCidrBlock": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AmazonProvidedIpv6CidrBlock": {
+                            "type": "boolean"
+                        },
+                        "CidrBlock": {
+                            "type": "string"
+                        },
+                        "Ipv6CidrBlock": {
+                            "type": "string"
+                        },
+                        "Ipv6Pool": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCCidrBlock"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCDHCPOptionsAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DhcpOptionsId": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DhcpOptionsId",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCDHCPOptionsAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "PrivateDnsEnabled": {
+                            "type": "boolean"
+                        },
+                        "RouteTableIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpcEndpointType": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ServiceName",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCEndpointConnectionNotification": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionEvents": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ConnectionNotificationArn": {
+                            "type": "string"
+                        },
+                        "ServiceId": {
+                            "type": "string"
+                        },
+                        "VPCEndpointId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConnectionEvents",
+                        "ConnectionNotificationArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCEndpointConnectionNotification"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCEndpointService": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptanceRequired": {
+                            "type": "boolean"
+                        },
+                        "GatewayLoadBalancerArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "NetworkLoadBalancerArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCEndpointService"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCEndpointServicePermissions": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowedPrincipals": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ServiceId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCEndpointServicePermissions"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCGatewayAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InternetGatewayId": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        },
+                        "VpnGatewayId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCGatewayAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCPeeringConnection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PeerOwnerId": {
+                            "type": "string"
+                        },
+                        "PeerRegion": {
+                            "type": "string"
+                        },
+                        "PeerRoleArn": {
+                            "type": "string"
+                        },
+                        "PeerVpcId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PeerVpcId",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCPeeringConnection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPNConnection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomerGatewayId": {
+                            "type": "string"
+                        },
+                        "StaticRoutesOnly": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "VpnGatewayId": {
+                            "type": "string"
+                        },
+                        "VpnTunnelOptionsSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::VPNConnection.VpnTunnelOptionsSpecification"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CustomerGatewayId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPNConnection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPNConnection.VpnTunnelOptionsSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PreSharedKey": {
+                    "type": "string"
+                },
+                "TunnelInsideCidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::VPNConnectionRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "VpnConnectionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationCidrBlock",
+                        "VpnConnectionId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPNConnectionRoute"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPNGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AmazonSideAsn": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPNGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPNGatewayRoutePropagation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RouteTableIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpnGatewayId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RouteTableIds",
+                        "VpnGatewayId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPNGatewayRoutePropagation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Volume": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoEnableIO": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "Encrypted": {
+                            "type": "boolean"
+                        },
+                        "Iops": {
+                            "type": "number"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MultiAttachEnabled": {
+                            "type": "boolean"
+                        },
+                        "OutpostArn": {
+                            "type": "string"
+                        },
+                        "Size": {
+                            "type": "number"
+                        },
+                        "SnapshotId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Throughput": {
+                            "type": "number"
+                        },
+                        "VolumeType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AvailabilityZone"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::Volume"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VolumeAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Device": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "VolumeId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Device",
+                        "InstanceId",
+                        "VolumeId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VolumeAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::PublicRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RepositoryCatalogData": {
+                            "type": "object"
+                        },
+                        "RepositoryName": {
+                            "type": "string"
+                        },
+                        "RepositoryPolicyText": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECR::PublicRepository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::RegistryPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyText": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "PolicyText"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECR::RegistryPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::ReplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ReplicationConfiguration": {
+                            "$ref": "#/definitions/AWS::ECR::ReplicationConfiguration.ReplicationConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ReplicationConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECR::ReplicationConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::ReplicationConfiguration.ReplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECR::ReplicationConfiguration.ReplicationRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::ReplicationConfiguration.ReplicationDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "Region": {
+                    "type": "string"
+                },
+                "RegistryId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region",
+                "RegistryId"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::ReplicationConfiguration.ReplicationRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Destinations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECR::ReplicationConfiguration.ReplicationDestination"
+                    },
+                    "type": "array"
+                },
+                "RepositoryFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECR::ReplicationConfiguration.RepositoryFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Destinations"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::ReplicationConfiguration.RepositoryFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Filter": {
+                    "type": "string"
+                },
+                "FilterType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Filter",
+                "FilterType"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::Repository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::ECR::Repository.EncryptionConfiguration"
+                        },
+                        "ImageScanningConfiguration": {
+                            "$ref": "#/definitions/AWS::ECR::Repository.ImageScanningConfiguration"
+                        },
+                        "ImageTagMutability": {
+                            "type": "string"
+                        },
+                        "LifecyclePolicy": {
+                            "$ref": "#/definitions/AWS::ECR::Repository.LifecyclePolicy"
+                        },
+                        "RepositoryName": {
+                            "type": "string"
+                        },
+                        "RepositoryPolicyText": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECR::Repository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::Repository.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionType": {
+                    "type": "string"
+                },
+                "KmsKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionType"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::Repository.ImageScanningConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ScanOnPush": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECR::Repository.LifecyclePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "LifecyclePolicyText": {
+                    "type": "string"
+                },
+                "RegistryId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::CapacityProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingGroupProvider": {
+                            "$ref": "#/definitions/AWS::ECS::CapacityProvider.AutoScalingGroupProvider"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupProvider"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::CapacityProvider"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::CapacityProvider.AutoScalingGroupProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoScalingGroupArn": {
+                    "type": "string"
+                },
+                "ManagedScaling": {
+                    "$ref": "#/definitions/AWS::ECS::CapacityProvider.ManagedScaling"
+                },
+                "ManagedTerminationProtection": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AutoScalingGroupArn"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::CapacityProvider.ManagedScaling": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceWarmupPeriod": {
+                    "type": "number"
+                },
+                "MaximumScalingStepSize": {
+                    "type": "number"
+                },
+                "MinimumScalingStepSize": {
+                    "type": "number"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "TargetCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "ClusterSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Cluster.ClusterSettings"
+                            },
+                            "type": "array"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::ECS::Cluster.ClusterConfiguration"
+                        },
+                        "DefaultCapacityProviderStrategy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Cluster.CapacityProviderStrategyItem"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Cluster.CapacityProviderStrategyItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Base": {
+                    "type": "number"
+                },
+                "CapacityProvider": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Cluster.ClusterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecuteCommandConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::Cluster.ExecuteCommandConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Cluster.ClusterSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Cluster.ExecuteCommandConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "LogConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::Cluster.ExecuteCommandLogConfiguration"
+                },
+                "Logging": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Cluster.ExecuteCommandLogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchEncryptionEnabled": {
+                    "type": "boolean"
+                },
+                "CloudWatchLogGroupName": {
+                    "type": "string"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3EncryptionEnabled": {
+                    "type": "boolean"
+                },
+                "S3KeyPrefix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::ClusterCapacityProviderAssociations": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Cluster": {
+                            "type": "string"
+                        },
+                        "Service": {
+                            "type": "string"
+                        },
+                        "TaskSetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Cluster",
+                        "Service",
+                        "TaskSetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::PrimaryTaskSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Service": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CapacityProviderStrategy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Service.CapacityProviderStrategyItem"
+                            },
+                            "type": "array"
+                        },
+                        "Cluster": {
+                            "type": "string"
+                        },
+                        "DeploymentConfiguration": {
+                            "$ref": "#/definitions/AWS::ECS::Service.DeploymentConfiguration"
+                        },
+                        "DeploymentController": {
+                            "$ref": "#/definitions/AWS::ECS::Service.DeploymentController"
+                        },
+                        "DesiredCount": {
+                            "type": "number"
+                        },
+                        "EnableECSManagedTags": {
+                            "type": "boolean"
+                        },
+                        "EnableExecuteCommand": {
+                            "type": "boolean"
+                        },
+                        "HealthCheckGracePeriodSeconds": {
+                            "type": "number"
+                        },
+                        "LaunchType": {
+                            "type": "string"
+                        },
+                        "LoadBalancers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Service.LoadBalancer"
+                            },
+                            "type": "array"
+                        },
+                        "NetworkConfiguration": {
+                            "$ref": "#/definitions/AWS::ECS::Service.NetworkConfiguration"
+                        },
+                        "PlacementConstraints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Service.PlacementConstraint"
+                            },
+                            "type": "array"
+                        },
+                        "PlacementStrategies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Service.PlacementStrategy"
+                            },
+                            "type": "array"
+                        },
+                        "PlatformVersion": {
+                            "type": "string"
+                        },
+                        "PropagateTags": {
+                            "type": "string"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "SchedulingStrategy": {
+                            "type": "string"
+                        },
+                        "ServiceName": {
+                            "type": "string"
+                        },
+                        "ServiceRegistries": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Service.ServiceRegistry"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TaskDefinition": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::Service"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Service.AwsVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AssignPublicIp": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.CapacityProviderStrategyItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Base": {
+                    "type": "number"
+                },
+                "CapacityProvider": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.DeploymentCircuitBreaker": {
+            "additionalProperties": false,
+            "properties": {
+                "Enable": {
+                    "type": "boolean"
+                },
+                "Rollback": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enable",
+                "Rollback"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Service.DeploymentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeploymentCircuitBreaker": {
+                    "$ref": "#/definitions/AWS::ECS::Service.DeploymentCircuitBreaker"
+                },
+                "MaximumPercent": {
+                    "type": "number"
+                },
+                "MinimumHealthyPercent": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.DeploymentController": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.LoadBalancer": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerName": {
+                    "type": "string"
+                },
+                "ContainerPort": {
+                    "type": "number"
+                },
+                "LoadBalancerName": {
+                    "type": "string"
+                },
+                "TargetGroupArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsvpcConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::Service.AwsVpcConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.PlacementConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Service.PlacementStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "Field": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Service.ServiceRegistry": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerName": {
+                    "type": "string"
+                },
+                "ContainerPort": {
+                    "type": "number"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "RegistryArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContainerDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskDefinition.ContainerDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "Cpu": {
+                            "type": "string"
+                        },
+                        "EphemeralStorage": {
+                            "$ref": "#/definitions/AWS::ECS::TaskDefinition.EphemeralStorage"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "Family": {
+                            "type": "string"
+                        },
+                        "InferenceAccelerators": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskDefinition.InferenceAccelerator"
+                            },
+                            "type": "array"
+                        },
+                        "IpcMode": {
+                            "type": "string"
+                        },
+                        "Memory": {
+                            "type": "string"
+                        },
+                        "NetworkMode": {
+                            "type": "string"
+                        },
+                        "PidMode": {
+                            "type": "string"
+                        },
+                        "PlacementConstraints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskDefinition.TaskDefinitionPlacementConstraint"
+                            },
+                            "type": "array"
+                        },
+                        "ProxyConfiguration": {
+                            "$ref": "#/definitions/AWS::ECS::TaskDefinition.ProxyConfiguration"
+                        },
+                        "RequiresCompatibilities": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RuntimePlatform": {
+                            "$ref": "#/definitions/AWS::ECS::TaskDefinition.RuntimePlatform"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TaskRoleArn": {
+                            "type": "string"
+                        },
+                        "Volumes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskDefinition.Volume"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::TaskDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.AuthorizationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessPointId": {
+                    "type": "string"
+                },
+                "IAM": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.ContainerDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Command": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Cpu": {
+                    "type": "number"
+                },
+                "DependsOn": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.ContainerDependency"
+                    },
+                    "type": "array"
+                },
+                "DisableNetworking": {
+                    "type": "boolean"
+                },
+                "DnsSearchDomains": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DnsServers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DockerLabels": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "DockerSecurityOptions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EntryPoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Environment": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.KeyValuePair"
+                    },
+                    "type": "array"
+                },
+                "EnvironmentFiles": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.EnvironmentFile"
+                    },
+                    "type": "array"
+                },
+                "Essential": {
+                    "type": "boolean"
+                },
+                "ExtraHosts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.HostEntry"
+                    },
+                    "type": "array"
+                },
+                "FirelensConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.FirelensConfiguration"
+                },
+                "HealthCheck": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.HealthCheck"
+                },
+                "Hostname": {
+                    "type": "string"
+                },
+                "Image": {
+                    "type": "string"
+                },
+                "Interactive": {
+                    "type": "boolean"
+                },
+                "Links": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LinuxParameters": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.LinuxParameters"
+                },
+                "LogConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.LogConfiguration"
+                },
+                "Memory": {
+                    "type": "number"
+                },
+                "MemoryReservation": {
+                    "type": "number"
+                },
+                "MountPoints": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.MountPoint"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "PortMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.PortMapping"
+                    },
+                    "type": "array"
+                },
+                "Privileged": {
+                    "type": "boolean"
+                },
+                "PseudoTerminal": {
+                    "type": "boolean"
+                },
+                "ReadonlyRootFilesystem": {
+                    "type": "boolean"
+                },
+                "RepositoryCredentials": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.RepositoryCredentials"
+                },
+                "ResourceRequirements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.ResourceRequirement"
+                    },
+                    "type": "array"
+                },
+                "Secrets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.Secret"
+                    },
+                    "type": "array"
+                },
+                "StartTimeout": {
+                    "type": "number"
+                },
+                "StopTimeout": {
+                    "type": "number"
+                },
+                "SystemControls": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.SystemControl"
+                    },
+                    "type": "array"
+                },
+                "Ulimits": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.Ulimit"
+                    },
+                    "type": "array"
+                },
+                "User": {
+                    "type": "string"
+                },
+                "VolumesFrom": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.VolumeFrom"
+                    },
+                    "type": "array"
+                },
+                "WorkingDirectory": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.ContainerDependency": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "ContainerName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.Device": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "HostPath": {
+                    "type": "string"
+                },
+                "Permissions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.DockerVolumeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Autoprovision": {
+                    "type": "boolean"
+                },
+                "Driver": {
+                    "type": "string"
+                },
+                "DriverOpts": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Labels": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Scope": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.EFSVolumeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationConfig": {
+                    "type": "object"
+                },
+                "FilesystemId": {
+                    "type": "string"
+                },
+                "RootDirectory": {
+                    "type": "string"
+                },
+                "TransitEncryption": {
+                    "type": "string"
+                },
+                "TransitEncryptionPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FilesystemId"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.EnvironmentFile": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.EphemeralStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "SizeInGiB": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.FirelensConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Options": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.HealthCheck": {
+            "additionalProperties": false,
+            "properties": {
+                "Command": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "Retries": {
+                    "type": "number"
+                },
+                "StartPeriod": {
+                    "type": "number"
+                },
+                "Timeout": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.HostEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "type": "string"
+                },
+                "IpAddress": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.HostVolumeProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.InferenceAccelerator": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "DeviceType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.KernelCapabilities": {
+            "additionalProperties": false,
+            "properties": {
+                "Add": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Drop": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.KeyValuePair": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.LinuxParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Capabilities": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.KernelCapabilities"
+                },
+                "Devices": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.Device"
+                    },
+                    "type": "array"
+                },
+                "InitProcessEnabled": {
+                    "type": "boolean"
+                },
+                "MaxSwap": {
+                    "type": "number"
+                },
+                "SharedMemorySize": {
+                    "type": "number"
+                },
+                "Swappiness": {
+                    "type": "number"
+                },
+                "Tmpfs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.Tmpfs"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.LogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogDriver": {
+                    "type": "string"
+                },
+                "Options": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "SecretOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.Secret"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LogDriver"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.MountPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "ReadOnly": {
+                    "type": "boolean"
+                },
+                "SourceVolume": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.PortMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPort": {
+                    "type": "number"
+                },
+                "HostPort": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.ProxyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerName": {
+                    "type": "string"
+                },
+                "ProxyConfigurationProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.KeyValuePair"
+                    },
+                    "type": "array"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ContainerName"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.RepositoryCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "CredentialsParameter": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.ResourceRequirement": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.RuntimePlatform": {
+            "additionalProperties": false,
+            "properties": {
+                "CpuArchitecture": {
+                    "type": "string"
+                },
+                "OperatingSystemFamily": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.Secret": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "ValueFrom": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "ValueFrom"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.SystemControl": {
+            "additionalProperties": false,
+            "properties": {
+                "Namespace": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.TaskDefinitionPlacementConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.Tmpfs": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "MountOptions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Size": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Size"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.Ulimit": {
+            "additionalProperties": false,
+            "properties": {
+                "HardLimit": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SoftLimit": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "HardLimit",
+                "Name",
+                "SoftLimit"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.Volume": {
+            "additionalProperties": false,
+            "properties": {
+                "DockerVolumeConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.DockerVolumeConfiguration"
+                },
+                "EFSVolumeConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.EFSVolumeConfiguration"
+                },
+                "Host": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.HostVolumeProperties"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.VolumeFrom": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadOnly": {
+                    "type": "boolean"
+                },
+                "SourceContainer": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Cluster": {
+                            "type": "string"
+                        },
+                        "ExternalId": {
+                            "type": "string"
+                        },
+                        "LaunchType": {
+                            "type": "string"
+                        },
+                        "LoadBalancers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskSet.LoadBalancer"
+                            },
+                            "type": "array"
+                        },
+                        "NetworkConfiguration": {
+                            "$ref": "#/definitions/AWS::ECS::TaskSet.NetworkConfiguration"
+                        },
+                        "PlatformVersion": {
+                            "type": "string"
+                        },
+                        "Scale": {
+                            "$ref": "#/definitions/AWS::ECS::TaskSet.Scale"
+                        },
+                        "Service": {
+                            "type": "string"
+                        },
+                        "ServiceRegistries": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskSet.ServiceRegistry"
+                            },
+                            "type": "array"
+                        },
+                        "TaskDefinition": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Cluster",
+                        "Service",
+                        "TaskDefinition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::TaskSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet.AwsVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AssignPublicIp": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet.LoadBalancer": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerName": {
+                    "type": "string"
+                },
+                "ContainerPort": {
+                    "type": "number"
+                },
+                "LoadBalancerName": {
+                    "type": "string"
+                },
+                "TargetGroupArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsVpcConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::TaskSet.AwsVpcConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet.Scale": {
+            "additionalProperties": false,
+            "properties": {
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet.ServiceRegistry": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerName": {
+                    "type": "string"
+                },
+                "ContainerPort": {
+                    "type": "number"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "RegistryArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EFS::AccessPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessPointTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EFS::AccessPoint.AccessPointTag"
+                            },
+                            "type": "array"
+                        },
+                        "ClientToken": {
+                            "type": "string"
+                        },
+                        "FileSystemId": {
+                            "type": "string"
+                        },
+                        "PosixUser": {
+                            "$ref": "#/definitions/AWS::EFS::AccessPoint.PosixUser"
+                        },
+                        "RootDirectory": {
+                            "$ref": "#/definitions/AWS::EFS::AccessPoint.RootDirectory"
+                        }
+                    },
+                    "required": [
+                        "FileSystemId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EFS::AccessPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::AccessPoint.AccessPointTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EFS::AccessPoint.CreationInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "OwnerGid": {
+                    "type": "string"
+                },
+                "OwnerUid": {
+                    "type": "string"
+                },
+                "Permissions": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OwnerGid",
+                "OwnerUid",
+                "Permissions"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::AccessPoint.PosixUser": {
+            "additionalProperties": false,
+            "properties": {
+                "Gid": {
+                    "type": "string"
+                },
+                "SecondaryGids": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Uid": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Gid",
+                "Uid"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::AccessPoint.RootDirectory": {
+            "additionalProperties": false,
+            "properties": {
+                "CreationInfo": {
+                    "$ref": "#/definitions/AWS::EFS::AccessPoint.CreationInfo"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EFS::FileSystem": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZoneName": {
+                            "type": "string"
+                        },
+                        "BackupPolicy": {
+                            "$ref": "#/definitions/AWS::EFS::FileSystem.BackupPolicy"
+                        },
+                        "BypassPolicyLockoutSafetyCheck": {
+                            "type": "boolean"
+                        },
+                        "Encrypted": {
+                            "type": "boolean"
+                        },
+                        "FileSystemPolicy": {
+                            "type": "object"
+                        },
+                        "FileSystemTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EFS::FileSystem.ElasticFileSystemTag"
+                            },
+                            "type": "array"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LifecyclePolicies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EFS::FileSystem.LifecyclePolicy"
+                            },
+                            "type": "array"
+                        },
+                        "PerformanceMode": {
+                            "type": "string"
+                        },
+                        "ProvisionedThroughputInMibps": {
+                            "type": "number"
+                        },
+                        "ThroughputMode": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EFS::FileSystem"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::FileSystem.BackupPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::FileSystem.ElasticFileSystemTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::FileSystem.LifecyclePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "TransitionToIA": {
+                    "type": "string"
+                },
+                "TransitionToPrimaryStorageClass": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EFS::MountTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FileSystemId": {
+                            "type": "string"
+                        },
+                        "IpAddress": {
+                            "type": "string"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FileSystemId",
+                        "SecurityGroups",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EFS::MountTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Addon": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "AddonVersion": {
+                            "type": "string"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "ResolveConflicts": {
+                            "type": "string"
+                        },
+                        "ServiceAccountRoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddonName",
+                        "ClusterName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EKS::Addon"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EncryptionConfig": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EKS::Cluster.EncryptionConfig"
+                            },
+                            "type": "array"
+                        },
+                        "KubernetesNetworkConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.KubernetesNetworkConfig"
+                        },
+                        "Logging": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.Logging"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResourcesVpcConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.ResourcesVpcConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourcesVpcConfig",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EKS::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.ClusterLogging": {
+            "additionalProperties": false,
+            "properties": {
+                "EnabledTypes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EKS::Cluster.LoggingTypeConfig"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.EncryptionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Provider": {
+                    "type": "object"
+                },
+                "Resources": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.KubernetesNetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IpFamily": {
+                    "type": "string"
+                },
+                "ServiceIpv4Cidr": {
+                    "type": "string"
+                },
+                "ServiceIpv6Cidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterLogging": {
+                    "$ref": "#/definitions/AWS::EKS::Cluster.ClusterLogging"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.LoggingTypeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.ResourcesVpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointPrivateAccess": {
+                    "type": "boolean"
+                },
+                "EndpointPublicAccess": {
+                    "type": "boolean"
+                },
+                "PublicAccessCidrs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::FargateProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "FargateProfileName": {
+                            "type": "string"
+                        },
+                        "PodExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "Selectors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EKS::FargateProfile.Selector"
+                            },
+                            "type": "array"
+                        },
+                        "Subnets": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ClusterName",
+                        "PodExecutionRoleArn",
+                        "Selectors"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EKS::FargateProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::FargateProfile.Label": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::FargateProfile.Selector": {
+            "additionalProperties": false,
+            "properties": {
+                "Labels": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EKS::FargateProfile.Label"
+                    },
+                    "type": "array"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Namespace"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AmiType": {
+                            "type": "string"
+                        },
+                        "CapacityType": {
+                            "type": "string"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "DiskSize": {
+                            "type": "number"
+                        },
+                        "ForceUpdateEnabled": {
+                            "type": "boolean"
+                        },
+                        "InstanceTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Labels": {
+                            "type": "object"
+                        },
+                        "LaunchTemplate": {
+                            "$ref": "#/definitions/AWS::EKS::Nodegroup.LaunchTemplateSpecification"
+                        },
+                        "NodeRole": {
+                            "type": "string"
+                        },
+                        "NodegroupName": {
+                            "type": "string"
+                        },
+                        "ReleaseVersion": {
+                            "type": "string"
+                        },
+                        "RemoteAccess": {
+                            "$ref": "#/definitions/AWS::EKS::Nodegroup.RemoteAccess"
+                        },
+                        "ScalingConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Nodegroup.ScalingConfig"
+                        },
+                        "Subnets": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Taints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EKS::Nodegroup.Taint"
+                            },
+                            "type": "array"
+                        },
+                        "UpdateConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Nodegroup.UpdateConfig"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClusterName",
+                        "NodeRole",
+                        "Subnets"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EKS::Nodegroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup.LaunchTemplateSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup.RemoteAccess": {
+            "additionalProperties": false,
+            "properties": {
+                "Ec2SshKey": {
+                    "type": "string"
+                },
+                "SourceSecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Ec2SshKey"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup.ScalingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredSize": {
+                    "type": "number"
+                },
+                "MaxSize": {
+                    "type": "number"
+                },
+                "MinSize": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup.Taint": {
+            "additionalProperties": false,
+            "properties": {
+                "Effect": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup.UpdateConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxUnavailable": {
+                    "type": "number"
+                },
+                "MaxUnavailablePercentage": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdditionalInfo": {
+                            "type": "object"
+                        },
+                        "Applications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::Cluster.Application"
+                            },
+                            "type": "array"
+                        },
+                        "AutoScalingRole": {
+                            "type": "string"
+                        },
+                        "BootstrapActions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::Cluster.BootstrapActionConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Configurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::Cluster.Configuration"
+                            },
+                            "type": "array"
+                        },
+                        "CustomAmiId": {
+                            "type": "string"
+                        },
+                        "EbsRootVolumeSize": {
+                            "type": "number"
+                        },
+                        "Instances": {
+                            "$ref": "#/definitions/AWS::EMR::Cluster.JobFlowInstancesConfig"
+                        },
+                        "JobFlowRole": {
+                            "type": "string"
+                        },
+                        "KerberosAttributes": {
+                            "$ref": "#/definitions/AWS::EMR::Cluster.KerberosAttributes"
+                        },
+                        "LogEncryptionKmsKeyId": {
+                            "type": "string"
+                        },
+                        "LogUri": {
+                            "type": "string"
+                        },
+                        "ManagedScalingPolicy": {
+                            "$ref": "#/definitions/AWS::EMR::Cluster.ManagedScalingPolicy"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ReleaseLabel": {
+                            "type": "string"
+                        },
+                        "ScaleDownBehavior": {
+                            "type": "string"
+                        },
+                        "SecurityConfiguration": {
+                            "type": "string"
+                        },
+                        "ServiceRole": {
+                            "type": "string"
+                        },
+                        "StepConcurrencyLevel": {
+                            "type": "number"
+                        },
+                        "Steps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::Cluster.StepConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VisibleToAllUsers": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "Instances",
+                        "JobFlowRole",
+                        "Name",
+                        "ServiceRole"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.Application": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalInfo": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Args": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.AutoScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Constraints": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.ScalingConstraints"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.ScalingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Constraints",
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.BootstrapActionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "ScriptBootstrapAction": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.ScriptBootstrapActionConfig"
+                }
+            },
+            "required": [
+                "Name",
+                "ScriptBootstrapAction"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.CloudWatchAlarmDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "EvaluationPeriods": {
+                    "type": "number"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Threshold": {
+                    "type": "number"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "MetricName",
+                "Period",
+                "Threshold"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ComputeLimits": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumCapacityUnits": {
+                    "type": "number"
+                },
+                "MaximumCoreCapacityUnits": {
+                    "type": "number"
+                },
+                "MaximumOnDemandCapacityUnits": {
+                    "type": "number"
+                },
+                "MinimumCapacityUnits": {
+                    "type": "number"
+                },
+                "UnitType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MaximumCapacityUnits",
+                "MinimumCapacityUnits",
+                "UnitType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "Classification": {
+                    "type": "string"
+                },
+                "ConfigurationProperties": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.Configuration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.EbsBlockDeviceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "VolumeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.VolumeSpecification"
+                },
+                "VolumesPerInstance": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "VolumeSpecification"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.EbsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EbsBlockDeviceConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.EbsBlockDeviceConfig"
+                    },
+                    "type": "array"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.HadoopJarStepConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Args": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Jar": {
+                    "type": "string"
+                },
+                "MainClass": {
+                    "type": "string"
+                },
+                "StepProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.KeyValue"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Jar"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.InstanceFleetConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceTypeConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.InstanceTypeConfig"
+                    },
+                    "type": "array"
+                },
+                "LaunchSpecifications": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceFleetProvisioningSpecifications"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "TargetOnDemandCapacity": {
+                    "type": "number"
+                },
+                "TargetSpotCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.InstanceFleetProvisioningSpecifications": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandProvisioningSpecification"
+                },
+                "SpotSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.SpotProvisioningSpecification"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.InstanceGroupConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoScalingPolicy": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.AutoScalingPolicy"
+                },
+                "BidPrice": {
+                    "type": "string"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.Configuration"
+                    },
+                    "type": "array"
+                },
+                "CustomAmiId": {
+                    "type": "string"
+                },
+                "EbsConfiguration": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.EbsConfiguration"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "Market": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.InstanceTypeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BidPrice": {
+                    "type": "string"
+                },
+                "BidPriceAsPercentageOfOnDemandPrice": {
+                    "type": "number"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.Configuration"
+                    },
+                    "type": "array"
+                },
+                "CustomAmiId": {
+                    "type": "string"
+                },
+                "EbsConfiguration": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.EbsConfiguration"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.JobFlowInstancesConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalMasterSecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AdditionalSlaveSecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CoreInstanceFleet": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceFleetConfig"
+                },
+                "CoreInstanceGroup": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceGroupConfig"
+                },
+                "Ec2KeyName": {
+                    "type": "string"
+                },
+                "Ec2SubnetId": {
+                    "type": "string"
+                },
+                "Ec2SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EmrManagedMasterSecurityGroup": {
+                    "type": "string"
+                },
+                "EmrManagedSlaveSecurityGroup": {
+                    "type": "string"
+                },
+                "HadoopVersion": {
+                    "type": "string"
+                },
+                "KeepJobFlowAliveWhenNoSteps": {
+                    "type": "boolean"
+                },
+                "MasterInstanceFleet": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceFleetConfig"
+                },
+                "MasterInstanceGroup": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceGroupConfig"
+                },
+                "Placement": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.PlacementType"
+                },
+                "ServiceAccessSecurityGroup": {
+                    "type": "string"
+                },
+                "TerminationProtected": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.KerberosAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "ADDomainJoinPassword": {
+                    "type": "string"
+                },
+                "ADDomainJoinUser": {
+                    "type": "string"
+                },
+                "CrossRealmTrustPrincipalPassword": {
+                    "type": "string"
+                },
+                "KdcAdminPassword": {
+                    "type": "string"
+                },
+                "Realm": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KdcAdminPassword",
+                "Realm"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.KeyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ManagedScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeLimits": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.ComputeLimits"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.OnDemandProvisioningSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AllocationStrategy"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.PlacementType": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AvailabilityZone"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ScalingAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Market": {
+                    "type": "string"
+                },
+                "SimpleScalingPolicyConfiguration": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.SimpleScalingPolicyConfiguration"
+                }
+            },
+            "required": [
+                "SimpleScalingPolicyConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ScalingConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ScalingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.ScalingAction"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Trigger": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.ScalingTrigger"
+                }
+            },
+            "required": [
+                "Action",
+                "Name",
+                "Trigger"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ScalingTrigger": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchAlarmDefinition": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.CloudWatchAlarmDefinition"
+                }
+            },
+            "required": [
+                "CloudWatchAlarmDefinition"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ScriptBootstrapActionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Args": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Path"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.SimpleScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AdjustmentType": {
+                    "type": "string"
+                },
+                "CoolDown": {
+                    "type": "number"
+                },
+                "ScalingAdjustment": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ScalingAdjustment"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.SpotProvisioningSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "BlockDurationMinutes": {
+                    "type": "number"
+                },
+                "TimeoutAction": {
+                    "type": "string"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TimeoutAction",
+                "TimeoutDurationMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.StepConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionOnFailure": {
+                    "type": "string"
+                },
+                "HadoopJarStep": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.HadoopJarStepConfig"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HadoopJarStep",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.VolumeSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "SizeInGB": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SizeInGB",
+                "VolumeType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClusterId": {
+                            "type": "string"
+                        },
+                        "InstanceFleetType": {
+                            "type": "string"
+                        },
+                        "InstanceTypeConfigs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.InstanceTypeConfig"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchSpecifications": {
+                            "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.InstanceFleetProvisioningSpecifications"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "TargetOnDemandCapacity": {
+                            "type": "number"
+                        },
+                        "TargetSpotCapacity": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "ClusterId",
+                        "InstanceFleetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::InstanceFleetConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "Classification": {
+                    "type": "string"
+                },
+                "ConfigurationProperties": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.Configuration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.EbsBlockDeviceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "VolumeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.VolumeSpecification"
+                },
+                "VolumesPerInstance": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "VolumeSpecification"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.EbsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EbsBlockDeviceConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.EbsBlockDeviceConfig"
+                    },
+                    "type": "array"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.InstanceFleetProvisioningSpecifications": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandProvisioningSpecification"
+                },
+                "SpotSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.SpotProvisioningSpecification"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.InstanceTypeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BidPrice": {
+                    "type": "string"
+                },
+                "BidPriceAsPercentageOfOnDemandPrice": {
+                    "type": "number"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.Configuration"
+                    },
+                    "type": "array"
+                },
+                "CustomAmiId": {
+                    "type": "string"
+                },
+                "EbsConfiguration": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.EbsConfiguration"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.OnDemandProvisioningSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AllocationStrategy"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.SpotProvisioningSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "BlockDurationMinutes": {
+                    "type": "number"
+                },
+                "TimeoutAction": {
+                    "type": "string"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TimeoutAction",
+                "TimeoutDurationMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.VolumeSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "SizeInGB": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SizeInGB",
+                "VolumeType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingPolicy": {
+                            "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.AutoScalingPolicy"
+                        },
+                        "BidPrice": {
+                            "type": "string"
+                        },
+                        "Configurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.Configuration"
+                            },
+                            "type": "array"
+                        },
+                        "CustomAmiId": {
+                            "type": "string"
+                        },
+                        "EbsConfiguration": {
+                            "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.EbsConfiguration"
+                        },
+                        "InstanceCount": {
+                            "type": "number"
+                        },
+                        "InstanceRole": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "JobFlowId": {
+                            "type": "string"
+                        },
+                        "Market": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceCount",
+                        "InstanceRole",
+                        "InstanceType",
+                        "JobFlowId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::InstanceGroupConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.AutoScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Constraints": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.ScalingConstraints"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.ScalingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Constraints",
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.CloudWatchAlarmDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "EvaluationPeriods": {
+                    "type": "number"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Threshold": {
+                    "type": "number"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "MetricName",
+                "Period",
+                "Threshold"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "Classification": {
+                    "type": "string"
+                },
+                "ConfigurationProperties": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.Configuration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.EbsBlockDeviceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "VolumeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.VolumeSpecification"
+                },
+                "VolumesPerInstance": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "VolumeSpecification"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.EbsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EbsBlockDeviceConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.EbsBlockDeviceConfig"
+                    },
+                    "type": "array"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.ScalingAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Market": {
+                    "type": "string"
+                },
+                "SimpleScalingPolicyConfiguration": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.SimpleScalingPolicyConfiguration"
+                }
+            },
+            "required": [
+                "SimpleScalingPolicyConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.ScalingConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.ScalingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.ScalingAction"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Trigger": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.ScalingTrigger"
+                }
+            },
+            "required": [
+                "Action",
+                "Name",
+                "Trigger"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.ScalingTrigger": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchAlarmDefinition": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.CloudWatchAlarmDefinition"
+                }
+            },
+            "required": [
+                "CloudWatchAlarmDefinition"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.SimpleScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AdjustmentType": {
+                    "type": "string"
+                },
+                "CoolDown": {
+                    "type": "number"
+                },
+                "ScalingAdjustment": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ScalingAdjustment"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.VolumeSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "SizeInGB": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SizeInGB",
+                "VolumeType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::SecurityConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SecurityConfiguration": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "SecurityConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::SecurityConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Step": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ActionOnFailure": {
+                            "type": "string"
+                        },
+                        "HadoopJarStep": {
+                            "$ref": "#/definitions/AWS::EMR::Step.HadoopJarStepConfig"
+                        },
+                        "JobFlowId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ActionOnFailure",
+                        "HadoopJarStep",
+                        "JobFlowId",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::Step"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Step.HadoopJarStepConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Args": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Jar": {
+                    "type": "string"
+                },
+                "MainClass": {
+                    "type": "string"
+                },
+                "StepProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Step.KeyValue"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Jar"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Step.KeyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Studio": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthMode": {
+                            "type": "string"
+                        },
+                        "DefaultS3Location": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EngineSecurityGroupId": {
+                            "type": "string"
+                        },
+                        "IdpAuthUrl": {
+                            "type": "string"
+                        },
+                        "IdpRelayStateParameterName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ServiceRole": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserRole": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        },
+                        "WorkspaceSecurityGroupId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthMode",
+                        "DefaultS3Location",
+                        "EngineSecurityGroupId",
+                        "Name",
+                        "ServiceRole",
+                        "SubnetIds",
+                        "VpcId",
+                        "WorkspaceSecurityGroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::Studio"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::StudioSessionMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "IdentityName": {
+                            "type": "string"
+                        },
+                        "IdentityType": {
+                            "type": "string"
+                        },
+                        "SessionPolicyArn": {
+                            "type": "string"
+                        },
+                        "StudioId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "IdentityName",
+                        "IdentityType",
+                        "SessionPolicyArn",
+                        "StudioId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::StudioSessionMapping"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMRContainers::VirtualCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContainerProvider": {
+                            "$ref": "#/definitions/AWS::EMRContainers::VirtualCluster.ContainerProvider"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ContainerProvider",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMRContainers::VirtualCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMRContainers::VirtualCluster.ContainerInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "EksInfo": {
+                    "$ref": "#/definitions/AWS::EMRContainers::VirtualCluster.EksInfo"
+                }
+            },
+            "required": [
+                "EksInfo"
+            ],
+            "type": "object"
+        },
+        "AWS::EMRContainers::VirtualCluster.ContainerProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Info": {
+                    "$ref": "#/definitions/AWS::EMRContainers::VirtualCluster.ContainerInfo"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id",
+                "Info",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EMRContainers::VirtualCluster.EksInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Namespace"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::CacheCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AZMode": {
+                            "type": "string"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "CacheNodeType": {
+                            "type": "string"
+                        },
+                        "CacheParameterGroupName": {
+                            "type": "string"
+                        },
+                        "CacheSecurityGroupNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CacheSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "LogDeliveryConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElastiCache::CacheCluster.LogDeliveryConfigurationRequest"
+                            },
+                            "type": "array"
+                        },
+                        "NotificationTopicArn": {
+                            "type": "string"
+                        },
+                        "NumCacheNodes": {
+                            "type": "number"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredAvailabilityZone": {
+                            "type": "string"
+                        },
+                        "PreferredAvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "SnapshotArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnapshotName": {
+                            "type": "string"
+                        },
+                        "SnapshotRetentionLimit": {
+                            "type": "number"
+                        },
+                        "SnapshotWindow": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CacheNodeType",
+                        "Engine",
+                        "NumCacheNodes"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::CacheCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::CacheCluster.CloudWatchLogsDestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroup": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogGroup"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::CacheCluster.DestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::CacheCluster.CloudWatchLogsDestinationDetails"
+                },
+                "KinesisFirehoseDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::CacheCluster.KinesisFirehoseDestinationDetails"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::CacheCluster.KinesisFirehoseDestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStream": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStream"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::CacheCluster.LogDeliveryConfigurationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::CacheCluster.DestinationDetails"
+                },
+                "DestinationType": {
+                    "type": "string"
+                },
+                "LogFormat": {
+                    "type": "string"
+                },
+                "LogType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationDetails",
+                "DestinationType",
+                "LogFormat",
+                "LogType"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::GlobalReplicationGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutomaticFailoverEnabled": {
+                            "type": "boolean"
+                        },
+                        "CacheNodeType": {
+                            "type": "string"
+                        },
+                        "CacheParameterGroupName": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "GlobalNodeGroupCount": {
+                            "type": "number"
+                        },
+                        "GlobalReplicationGroupDescription": {
+                            "type": "string"
+                        },
+                        "GlobalReplicationGroupIdSuffix": {
+                            "type": "string"
+                        },
+                        "Members": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElastiCache::GlobalReplicationGroup.GlobalReplicationGroupMember"
+                            },
+                            "type": "array"
+                        },
+                        "RegionalConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElastiCache::GlobalReplicationGroup.RegionalConfiguration"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Members"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::GlobalReplicationGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::GlobalReplicationGroup.GlobalReplicationGroupMember": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplicationGroupId": {
+                    "type": "string"
+                },
+                "ReplicationGroupRegion": {
+                    "type": "string"
+                },
+                "Role": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::GlobalReplicationGroup.RegionalConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplicationGroupId": {
+                    "type": "string"
+                },
+                "ReplicationGroupRegion": {
+                    "type": "string"
+                },
+                "ReshardingConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ElastiCache::GlobalReplicationGroup.ReshardingConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::GlobalReplicationGroup.ReshardingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NodeGroupId": {
+                    "type": "string"
+                },
+                "PreferredAvailabilityZones": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::ParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CacheParameterGroupFamily": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Properties": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CacheParameterGroupFamily",
+                        "Description"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::ParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AtRestEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "AuthToken": {
+                            "type": "string"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AutomaticFailoverEnabled": {
+                            "type": "boolean"
+                        },
+                        "CacheNodeType": {
+                            "type": "string"
+                        },
+                        "CacheParameterGroupName": {
+                            "type": "string"
+                        },
+                        "CacheSecurityGroupNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CacheSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DataTieringEnabled": {
+                            "type": "boolean"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "GlobalReplicationGroupId": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LogDeliveryConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup.LogDeliveryConfigurationRequest"
+                            },
+                            "type": "array"
+                        },
+                        "MultiAZEnabled": {
+                            "type": "boolean"
+                        },
+                        "NodeGroupConfiguration": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup.NodeGroupConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "NotificationTopicArn": {
+                            "type": "string"
+                        },
+                        "NumCacheClusters": {
+                            "type": "number"
+                        },
+                        "NumNodeGroups": {
+                            "type": "number"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredCacheClusterAZs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "PrimaryClusterId": {
+                            "type": "string"
+                        },
+                        "ReplicasPerNodeGroup": {
+                            "type": "number"
+                        },
+                        "ReplicationGroupDescription": {
+                            "type": "string"
+                        },
+                        "ReplicationGroupId": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnapshotArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnapshotName": {
+                            "type": "string"
+                        },
+                        "SnapshotRetentionLimit": {
+                            "type": "number"
+                        },
+                        "SnapshotWindow": {
+                            "type": "string"
+                        },
+                        "SnapshottingClusterId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "UserGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ReplicationGroupDescription"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::ReplicationGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup.CloudWatchLogsDestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroup": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogGroup"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup.DestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup.CloudWatchLogsDestinationDetails"
+                },
+                "KinesisFirehoseDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup.KinesisFirehoseDestinationDetails"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup.KinesisFirehoseDestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStream": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStream"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup.LogDeliveryConfigurationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup.DestinationDetails"
+                },
+                "DestinationType": {
+                    "type": "string"
+                },
+                "LogFormat": {
+                    "type": "string"
+                },
+                "LogType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationDetails",
+                "DestinationType",
+                "LogFormat",
+                "LogType"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup.NodeGroupConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NodeGroupId": {
+                    "type": "string"
+                },
+                "PrimaryAvailabilityZone": {
+                    "type": "string"
+                },
+                "ReplicaAvailabilityZones": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ReplicaCount": {
+                    "type": "number"
+                },
+                "Slots": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::SecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::SecurityGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::SecurityGroupIngress": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CacheSecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupOwnerId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CacheSecurityGroupName",
+                        "EC2SecurityGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::SecurityGroupIngress"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::SubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CacheSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::SubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessString": {
+                            "type": "string"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "NoPasswordRequired": {
+                            "type": "boolean"
+                        },
+                        "Passwords": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "UserId": {
+                            "type": "string"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Engine",
+                        "UserId",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::UserGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "UserGroupId": {
+                            "type": "string"
+                        },
+                        "UserIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Engine",
+                        "UserGroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::UserGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ResourceLifecycleConfig": {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::Application.ApplicationResourceLifecycleConfig"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticBeanstalk::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Application.ApplicationResourceLifecycleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceRole": {
+                    "type": "string"
+                },
+                "VersionLifecycleConfig": {
+                    "$ref": "#/definitions/AWS::ElasticBeanstalk::Application.ApplicationVersionLifecycleConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Application.ApplicationVersionLifecycleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxAgeRule": {
+                    "$ref": "#/definitions/AWS::ElasticBeanstalk::Application.MaxAgeRule"
+                },
+                "MaxCountRule": {
+                    "$ref": "#/definitions/AWS::ElasticBeanstalk::Application.MaxCountRule"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Application.MaxAgeRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteSourceFromS3": {
+                    "type": "boolean"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "MaxAgeInDays": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Application.MaxCountRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteSourceFromS3": {
+                    "type": "boolean"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "MaxCount": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::ApplicationVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "SourceBundle": {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::ApplicationVersion.SourceBundle"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "SourceBundle"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticBeanstalk::ApplicationVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::ApplicationVersion.SourceBundle": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::ConfigurationTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnvironmentId": {
+                            "type": "string"
+                        },
+                        "OptionSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticBeanstalk::ConfigurationTemplate.ConfigurationOptionSetting"
+                            },
+                            "type": "array"
+                        },
+                        "PlatformArn": {
+                            "type": "string"
+                        },
+                        "SolutionStackName": {
+                            "type": "string"
+                        },
+                        "SourceConfiguration": {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::ConfigurationTemplate.SourceConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticBeanstalk::ConfigurationTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::ConfigurationTemplate.ConfigurationOptionSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "Namespace": {
+                    "type": "string"
+                },
+                "OptionName": {
+                    "type": "string"
+                },
+                "ResourceName": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Namespace",
+                "OptionName"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::ConfigurationTemplate.SourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationName": {
+                    "type": "string"
+                },
+                "TemplateName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApplicationName",
+                "TemplateName"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "CNAMEPrefix": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnvironmentName": {
+                            "type": "string"
+                        },
+                        "OperationsRole": {
+                            "type": "string"
+                        },
+                        "OptionSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticBeanstalk::Environment.OptionSetting"
+                            },
+                            "type": "array"
+                        },
+                        "PlatformArn": {
+                            "type": "string"
+                        },
+                        "SolutionStackName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        },
+                        "Tier": {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::Environment.Tier"
+                        },
+                        "VersionLabel": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticBeanstalk::Environment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Environment.OptionSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "Namespace": {
+                    "type": "string"
+                },
+                "OptionName": {
+                    "type": "string"
+                },
+                "ResourceName": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Namespace",
+                "OptionName"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Environment.Tier": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessLoggingPolicy": {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.AccessLoggingPolicy"
+                        },
+                        "AppCookieStickinessPolicy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.AppCookieStickinessPolicy"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ConnectionDrainingPolicy": {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.ConnectionDrainingPolicy"
+                        },
+                        "ConnectionSettings": {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.ConnectionSettings"
+                        },
+                        "CrossZone": {
+                            "type": "boolean"
+                        },
+                        "HealthCheck": {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.HealthCheck"
+                        },
+                        "Instances": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LBCookieStickinessPolicy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.LBCookieStickinessPolicy"
+                            },
+                            "type": "array"
+                        },
+                        "Listeners": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.Listeners"
+                            },
+                            "type": "array"
+                        },
+                        "LoadBalancerName": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.Policies"
+                            },
+                            "type": "array"
+                        },
+                        "Scheme": {
+                            "type": "string"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Subnets": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Listeners"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancing::LoadBalancer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.AccessLoggingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "EmitInterval": {
+                    "type": "number"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3BucketPrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled",
+                "S3BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.AppCookieStickinessPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "CookieName": {
+                    "type": "string"
+                },
+                "PolicyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CookieName",
+                "PolicyName"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.ConnectionDrainingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Timeout": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.ConnectionSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeout": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "IdleTimeout"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.HealthCheck": {
+            "additionalProperties": false,
+            "properties": {
+                "HealthyThreshold": {
+                    "type": "string"
+                },
+                "Interval": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                },
+                "Timeout": {
+                    "type": "string"
+                },
+                "UnhealthyThreshold": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HealthyThreshold",
+                "Interval",
+                "Target",
+                "Timeout",
+                "UnhealthyThreshold"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.LBCookieStickinessPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "CookieExpirationPeriod": {
+                    "type": "string"
+                },
+                "PolicyName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.Listeners": {
+            "additionalProperties": false,
+            "properties": {
+                "InstancePort": {
+                    "type": "string"
+                },
+                "InstanceProtocol": {
+                    "type": "string"
+                },
+                "LoadBalancerPort": {
+                    "type": "string"
+                },
+                "PolicyNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "SSLCertificateId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstancePort",
+                "LoadBalancerPort",
+                "Protocol"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.Policies": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "type": "object"
+                    },
+                    "type": "array"
+                },
+                "InstancePorts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LoadBalancerPorts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PolicyName": {
+                    "type": "string"
+                },
+                "PolicyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attributes",
+                "PolicyName",
+                "PolicyType"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AlpnPolicy": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Certificates": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.Certificate"
+                            },
+                            "type": "array"
+                        },
+                        "DefaultActions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.Action"
+                            },
+                            "type": "array"
+                        },
+                        "LoadBalancerArn": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "SslPolicy": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DefaultActions",
+                        "LoadBalancerArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancingV2::Listener"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticateCognitoConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.AuthenticateCognitoConfig"
+                },
+                "AuthenticateOidcConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.AuthenticateOidcConfig"
+                },
+                "FixedResponseConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.FixedResponseConfig"
+                },
+                "ForwardConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.ForwardConfig"
+                },
+                "Order": {
+                    "type": "number"
+                },
+                "RedirectConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.RedirectConfig"
+                },
+                "TargetGroupArn": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.AuthenticateCognitoConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationRequestExtraParams": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "OnUnauthenticatedRequest": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                },
+                "SessionCookieName": {
+                    "type": "string"
+                },
+                "SessionTimeout": {
+                    "type": "string"
+                },
+                "UserPoolArn": {
+                    "type": "string"
+                },
+                "UserPoolClientId": {
+                    "type": "string"
+                },
+                "UserPoolDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "UserPoolArn",
+                "UserPoolClientId",
+                "UserPoolDomain"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.AuthenticateOidcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationRequestExtraParams": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "AuthorizationEndpoint": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "OnUnauthenticatedRequest": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                },
+                "SessionCookieName": {
+                    "type": "string"
+                },
+                "SessionTimeout": {
+                    "type": "string"
+                },
+                "TokenEndpoint": {
+                    "type": "string"
+                },
+                "UserInfoEndpoint": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AuthorizationEndpoint",
+                "ClientId",
+                "ClientSecret",
+                "Issuer",
+                "TokenEndpoint",
+                "UserInfoEndpoint"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.FixedResponseConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentType": {
+                    "type": "string"
+                },
+                "MessageBody": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.ForwardConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetGroupStickinessConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.TargetGroupStickinessConfig"
+                },
+                "TargetGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.TargetGroupTuple"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.RedirectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Host": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "Query": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.TargetGroupStickinessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationSeconds": {
+                    "type": "number"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.TargetGroupTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetGroupArn": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Certificates": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerCertificate.Certificate"
+                            },
+                            "type": "array"
+                        },
+                        "ListenerArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Certificates",
+                        "ListenerArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancingV2::ListenerCertificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerCertificate.Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.Action"
+                            },
+                            "type": "array"
+                        },
+                        "Conditions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.RuleCondition"
+                            },
+                            "type": "array"
+                        },
+                        "ListenerArn": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Actions",
+                        "Conditions",
+                        "ListenerArn",
+                        "Priority"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancingV2::ListenerRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticateCognitoConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateCognitoConfig"
+                },
+                "AuthenticateOidcConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateOidcConfig"
+                },
+                "FixedResponseConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.FixedResponseConfig"
+                },
+                "ForwardConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.ForwardConfig"
+                },
+                "Order": {
+                    "type": "number"
+                },
+                "RedirectConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.RedirectConfig"
+                },
+                "TargetGroupArn": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateCognitoConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationRequestExtraParams": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "OnUnauthenticatedRequest": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                },
+                "SessionCookieName": {
+                    "type": "string"
+                },
+                "SessionTimeout": {
+                    "type": "number"
+                },
+                "UserPoolArn": {
+                    "type": "string"
+                },
+                "UserPoolClientId": {
+                    "type": "string"
+                },
+                "UserPoolDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "UserPoolArn",
+                "UserPoolClientId",
+                "UserPoolDomain"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateOidcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationRequestExtraParams": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "AuthorizationEndpoint": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "OnUnauthenticatedRequest": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                },
+                "SessionCookieName": {
+                    "type": "string"
+                },
+                "SessionTimeout": {
+                    "type": "number"
+                },
+                "TokenEndpoint": {
+                    "type": "string"
+                },
+                "UseExistingClientSecret": {
+                    "type": "boolean"
+                },
+                "UserInfoEndpoint": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AuthorizationEndpoint",
+                "ClientId",
+                "ClientSecret",
+                "Issuer",
+                "TokenEndpoint",
+                "UserInfoEndpoint"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.FixedResponseConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentType": {
+                    "type": "string"
+                },
+                "MessageBody": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.ForwardConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetGroupStickinessConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupStickinessConfig"
+                },
+                "TargetGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupTuple"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.HostHeaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.HttpHeaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpHeaderName": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.HttpRequestMethodConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.PathPatternConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringKeyValue"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringKeyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.RedirectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Host": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "Query": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.RuleCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Field": {
+                    "type": "string"
+                },
+                "HostHeaderConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.HostHeaderConfig"
+                },
+                "HttpHeaderConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.HttpHeaderConfig"
+                },
+                "HttpRequestMethodConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.HttpRequestMethodConfig"
+                },
+                "PathPatternConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.PathPatternConfig"
+                },
+                "QueryStringConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringConfig"
+                },
+                "SourceIpConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.SourceIpConfig"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.SourceIpConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupStickinessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationSeconds": {
+                    "type": "number"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetGroupArn": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::LoadBalancer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "IpAddressType": {
+                            "type": "string"
+                        },
+                        "LoadBalancerAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::LoadBalancer.LoadBalancerAttribute"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Scheme": {
+                            "type": "string"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::LoadBalancer.SubnetMapping"
+                            },
+                            "type": "array"
+                        },
+                        "Subnets": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancingV2::LoadBalancer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::LoadBalancer.LoadBalancerAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::LoadBalancer.SubnetMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationId": {
+                    "type": "string"
+                },
+                "IPv6Address": {
+                    "type": "string"
+                },
+                "PrivateIPv4Address": {
+                    "type": "string"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubnetId"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::TargetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HealthCheckEnabled": {
+                            "type": "boolean"
+                        },
+                        "HealthCheckIntervalSeconds": {
+                            "type": "number"
+                        },
+                        "HealthCheckPath": {
+                            "type": "string"
+                        },
+                        "HealthCheckPort": {
+                            "type": "string"
+                        },
+                        "HealthCheckProtocol": {
+                            "type": "string"
+                        },
+                        "HealthCheckTimeoutSeconds": {
+                            "type": "number"
+                        },
+                        "HealthyThresholdCount": {
+                            "type": "number"
+                        },
+                        "IpAddressType": {
+                            "type": "string"
+                        },
+                        "Matcher": {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::TargetGroup.Matcher"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "ProtocolVersion": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetGroupAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::TargetGroup.TargetGroupAttribute"
+                            },
+                            "type": "array"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::TargetGroup.TargetDescription"
+                            },
+                            "type": "array"
+                        },
+                        "UnhealthyThresholdCount": {
+                            "type": "number"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancingV2::TargetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::TargetGroup.Matcher": {
+            "additionalProperties": false,
+            "properties": {
+                "GrpcCode": {
+                    "type": "string"
+                },
+                "HttpCode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::TargetGroup.TargetDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::TargetGroup.TargetGroupAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessPolicies": {
+                            "type": "object"
+                        },
+                        "AdvancedOptions": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "AdvancedSecurityOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.AdvancedSecurityOptionsInput"
+                        },
+                        "CognitoOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.CognitoOptions"
+                        },
+                        "DomainEndpointOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.DomainEndpointOptions"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EBSOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.EBSOptions"
+                        },
+                        "ElasticsearchClusterConfig": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.ElasticsearchClusterConfig"
+                        },
+                        "ElasticsearchVersion": {
+                            "type": "string"
+                        },
+                        "EncryptionAtRestOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.EncryptionAtRestOptions"
+                        },
+                        "LogPublishingOptions": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::Elasticsearch::Domain.LogPublishingOption"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "NodeToNodeEncryptionOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.NodeToNodeEncryptionOptions"
+                        },
+                        "SnapshotOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.SnapshotOptions"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VPCOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.VPCOptions"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Elasticsearch::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.AdvancedSecurityOptionsInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "InternalUserDatabaseEnabled": {
+                    "type": "boolean"
+                },
+                "MasterUserOptions": {
+                    "$ref": "#/definitions/AWS::Elasticsearch::Domain.MasterUserOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.CognitoOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "IdentityPoolId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "UserPoolId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.ColdStorageOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.DomainEndpointOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomEndpoint": {
+                    "type": "string"
+                },
+                "CustomEndpointCertificateArn": {
+                    "type": "string"
+                },
+                "CustomEndpointEnabled": {
+                    "type": "boolean"
+                },
+                "EnforceHTTPS": {
+                    "type": "boolean"
+                },
+                "TLSSecurityPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.EBSOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "EBSEnabled": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.ElasticsearchClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ColdStorageOptions": {
+                    "$ref": "#/definitions/AWS::Elasticsearch::Domain.ColdStorageOptions"
+                },
+                "DedicatedMasterCount": {
+                    "type": "number"
+                },
+                "DedicatedMasterEnabled": {
+                    "type": "boolean"
+                },
+                "DedicatedMasterType": {
+                    "type": "string"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "WarmCount": {
+                    "type": "number"
+                },
+                "WarmEnabled": {
+                    "type": "boolean"
+                },
+                "WarmType": {
+                    "type": "string"
+                },
+                "ZoneAwarenessConfig": {
+                    "$ref": "#/definitions/AWS::Elasticsearch::Domain.ZoneAwarenessConfig"
+                },
+                "ZoneAwarenessEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.EncryptionAtRestOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.LogPublishingOption": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsLogGroupArn": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.MasterUserOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "MasterUserARN": {
+                    "type": "string"
+                },
+                "MasterUserName": {
+                    "type": "string"
+                },
+                "MasterUserPassword": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.NodeToNodeEncryptionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.SnapshotOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomatedSnapshotStartHour": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.VPCOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.ZoneAwarenessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZoneCount": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EventSchemas::Discoverer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CrossAccount": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "SourceArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EventSchemas::Discoverer.TagsEntry"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SourceArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EventSchemas::Discoverer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::Discoverer.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::Registry": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RegistryName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EventSchemas::Registry.TagsEntry"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EventSchemas::Registry"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::Registry.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::RegistryPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Policy": {
+                            "type": "object"
+                        },
+                        "RegistryName": {
+                            "type": "string"
+                        },
+                        "RevisionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Policy",
+                        "RegistryName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EventSchemas::RegistryPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::Schema": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Content": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "RegistryName": {
+                            "type": "string"
+                        },
+                        "SchemaName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EventSchemas::Schema.TagsEntry"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Content",
+                        "RegistryName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EventSchemas::Schema"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::Schema.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::ApiDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "HttpMethod": {
+                            "type": "string"
+                        },
+                        "InvocationEndpoint": {
+                            "type": "string"
+                        },
+                        "InvocationRateLimitPerSecond": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConnectionArn",
+                        "HttpMethod",
+                        "InvocationEndpoint"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::ApiDestination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Archive": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EventPattern": {
+                            "type": "object"
+                        },
+                        "RetentionDays": {
+                            "type": "number"
+                        },
+                        "SourceArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SourceArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::Archive"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Connection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthParameters": {
+                            "type": "object"
+                        },
+                        "AuthorizationType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthParameters",
+                        "AuthorizationType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::Connection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::EventBus": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EventSourceName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::EventBus"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::EventBusPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "Condition": {
+                            "$ref": "#/definitions/AWS::Events::EventBusPolicy.Condition"
+                        },
+                        "EventBusName": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        },
+                        "Statement": {
+                            "type": "object"
+                        },
+                        "StatementId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "StatementId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::EventBusPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::EventBusPolicy.Condition": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EventBusName": {
+                            "type": "string"
+                        },
+                        "EventPattern": {
+                            "type": "object"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "ScheduleExpression": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Events::Rule.Target"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::Rule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.AwsVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AssignPublicIp": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.BatchArrayProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Size": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.BatchParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ArrayProperties": {
+                    "$ref": "#/definitions/AWS::Events::Rule.BatchArrayProperties"
+                },
+                "JobDefinition": {
+                    "type": "string"
+                },
+                "JobName": {
+                    "type": "string"
+                },
+                "RetryStrategy": {
+                    "$ref": "#/definitions/AWS::Events::Rule.BatchRetryStrategy"
+                }
+            },
+            "required": [
+                "JobDefinition",
+                "JobName"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.BatchRetryStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "Attempts": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.CapacityProviderStrategyItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Base": {
+                    "type": "number"
+                },
+                "CapacityProvider": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "CapacityProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.DeadLetterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.EcsParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityProviderStrategy": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Events::Rule.CapacityProviderStrategyItem"
+                    },
+                    "type": "array"
+                },
+                "EnableECSManagedTags": {
+                    "type": "boolean"
+                },
+                "EnableExecuteCommand": {
+                    "type": "boolean"
+                },
+                "Group": {
+                    "type": "string"
+                },
+                "LaunchType": {
+                    "type": "string"
+                },
+                "NetworkConfiguration": {
+                    "$ref": "#/definitions/AWS::Events::Rule.NetworkConfiguration"
+                },
+                "PlacementConstraints": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Events::Rule.PlacementConstraint"
+                    },
+                    "type": "array"
+                },
+                "PlacementStrategies": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Events::Rule.PlacementStrategy"
+                    },
+                    "type": "array"
+                },
+                "PlatformVersion": {
+                    "type": "string"
+                },
+                "PropagateTags": {
+                    "type": "string"
+                },
+                "ReferenceId": {
+                    "type": "string"
+                },
+                "TagList": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                },
+                "TaskCount": {
+                    "type": "number"
+                },
+                "TaskDefinitionArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TaskDefinitionArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.HttpParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "PathParameterValues": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "QueryStringParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.InputTransformer": {
+            "additionalProperties": false,
+            "properties": {
+                "InputPathsMap": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "InputTemplate": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputTemplate"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.KinesisParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "PartitionKeyPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PartitionKeyPath"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsVpcConfiguration": {
+                    "$ref": "#/definitions/AWS::Events::Rule.AwsVpcConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.PlacementConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.PlacementStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "Field": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.RedshiftDataParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "DbUser": {
+                    "type": "string"
+                },
+                "SecretManagerArn": {
+                    "type": "string"
+                },
+                "Sql": {
+                    "type": "string"
+                },
+                "StatementName": {
+                    "type": "string"
+                },
+                "WithEvent": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Database",
+                "Sql"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.RetryPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumEventAgeInSeconds": {
+                    "type": "number"
+                },
+                "MaximumRetryAttempts": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.RunCommandParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RunCommandTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Events::Rule.RunCommandTarget"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "RunCommandTargets"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.RunCommandTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.SqsParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "MessageGroupId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MessageGroupId"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.Tag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.Target": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "BatchParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.BatchParameters"
+                },
+                "DeadLetterConfig": {
+                    "$ref": "#/definitions/AWS::Events::Rule.DeadLetterConfig"
+                },
+                "EcsParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.EcsParameters"
+                },
+                "HttpParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.HttpParameters"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Input": {
+                    "type": "string"
+                },
+                "InputPath": {
+                    "type": "string"
+                },
+                "InputTransformer": {
+                    "$ref": "#/definitions/AWS::Events::Rule.InputTransformer"
+                },
+                "KinesisParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.KinesisParameters"
+                },
+                "RedshiftDataParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.RedshiftDataParameters"
+                },
+                "RetryPolicy": {
+                    "$ref": "#/definitions/AWS::Events::Rule.RetryPolicy"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RunCommandParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.RunCommandParameters"
+                },
+                "SqsParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.SqsParameters"
+                }
+            },
+            "required": [
+                "Arn",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Experiment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "MetricGoals": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Experiment.MetricGoalObject"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OnlineAbConfig": {
+                            "$ref": "#/definitions/AWS::Evidently::Experiment.OnlineAbConfigObject"
+                        },
+                        "Project": {
+                            "type": "string"
+                        },
+                        "RandomizationSalt": {
+                            "type": "string"
+                        },
+                        "SamplingRate": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Treatments": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Experiment.TreatmentObject"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MetricGoals",
+                        "Name",
+                        "OnlineAbConfig",
+                        "Project",
+                        "Treatments"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Evidently::Experiment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Experiment.MetricGoalObject": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredChange": {
+                    "type": "string"
+                },
+                "EntityIdKey": {
+                    "type": "string"
+                },
+                "EventPattern": {
+                    "type": "string"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "UnitLabel": {
+                    "type": "string"
+                },
+                "ValueKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DesiredChange",
+                "EntityIdKey",
+                "EventPattern",
+                "MetricName",
+                "ValueKey"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Experiment.OnlineAbConfigObject": {
+            "additionalProperties": false,
+            "properties": {
+                "ControlTreatmentName": {
+                    "type": "string"
+                },
+                "TreatmentWeights": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Evidently::Experiment.TreatmentToWeight"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Evidently::Experiment.TreatmentObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Feature": {
+                    "type": "string"
+                },
+                "TreatmentName": {
+                    "type": "string"
+                },
+                "Variation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Feature",
+                "TreatmentName",
+                "Variation"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Experiment.TreatmentToWeight": {
+            "additionalProperties": false,
+            "properties": {
+                "SplitWeight": {
+                    "type": "number"
+                },
+                "Treatment": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SplitWeight",
+                "Treatment"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Feature": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DefaultVariation": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EntityOverrides": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Feature.EntityOverride"
+                            },
+                            "type": "array"
+                        },
+                        "EvaluationStrategy": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Project": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Variations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Feature.VariationObject"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Project",
+                        "Variations"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Evidently::Feature"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Feature.EntityOverride": {
+            "additionalProperties": false,
+            "properties": {
+                "EntityId": {
+                    "type": "string"
+                },
+                "Variation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Evidently::Feature.VariationObject": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanValue": {
+                    "type": "boolean"
+                },
+                "DoubleValue": {
+                    "type": "number"
+                },
+                "LongValue": {
+                    "type": "number"
+                },
+                "StringValue": {
+                    "type": "string"
+                },
+                "VariationName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Evidently::Launch": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Groups": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Launch.LaunchGroupObject"
+                            },
+                            "type": "array"
+                        },
+                        "MetricMonitors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Launch.MetricDefinitionObject"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Project": {
+                            "type": "string"
+                        },
+                        "RandomizationSalt": {
+                            "type": "string"
+                        },
+                        "ScheduledSplitsConfig": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Launch.StepConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Groups",
+                        "Name",
+                        "Project",
+                        "ScheduledSplitsConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Evidently::Launch"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Launch.GroupToWeight": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupName": {
+                    "type": "string"
+                },
+                "SplitWeight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "GroupName",
+                "SplitWeight"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Launch.LaunchGroupObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Feature": {
+                    "type": "string"
+                },
+                "GroupName": {
+                    "type": "string"
+                },
+                "Variation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Feature",
+                "GroupName",
+                "Variation"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Launch.MetricDefinitionObject": {
+            "additionalProperties": false,
+            "properties": {
+                "EntityIdKey": {
+                    "type": "string"
+                },
+                "EventPattern": {
+                    "type": "string"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "UnitLabel": {
+                    "type": "string"
+                },
+                "ValueKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EntityIdKey",
+                "EventPattern",
+                "MetricName",
+                "ValueKey"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Launch.StepConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupWeights": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Evidently::Launch.GroupToWeight"
+                    },
+                    "type": "array"
+                },
+                "StartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupWeights",
+                "StartTime"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataDelivery": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Evidently::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Project.DataDeliveryObject": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroup": {
+                    "type": "string"
+                },
+                "S3": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Evidently::Project.S3Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::FIS::ExperimentTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::FIS::ExperimentTemplate.ExperimentTemplateAction"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StopConditions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FIS::ExperimentTemplate.ExperimentTemplateStopCondition"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Targets": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::FIS::ExperimentTemplate.ExperimentTemplateTarget"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "RoleArn",
+                        "StopConditions",
+                        "Tags",
+                        "Targets"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FIS::ExperimentTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FIS::ExperimentTemplate.ExperimentTemplateAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionId": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "StartAfter": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Targets": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "required": [
+                "ActionId"
+            ],
+            "type": "object"
+        },
+        "AWS::FIS::ExperimentTemplate.ExperimentTemplateStopCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Source": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Source"
+            ],
+            "type": "object"
+        },
+        "AWS::FIS::ExperimentTemplate.ExperimentTemplateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Filters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FIS::ExperimentTemplate.ExperimentTemplateTargetFilter"
+                    },
+                    "type": "array"
+                },
+                "ResourceArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ResourceTags": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ResourceType": {
+                    "type": "string"
+                },
+                "SelectionMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceType",
+                "SelectionMode"
+            ],
+            "type": "object"
+        },
+        "AWS::FIS::ExperimentTemplate.ExperimentTemplateTargetFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Path": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Path",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::FMS::NotificationChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SnsRoleName": {
+                            "type": "string"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SnsRoleName",
+                        "SnsTopicArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FMS::NotificationChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FMS::Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeleteAllPolicyResources": {
+                            "type": "boolean"
+                        },
+                        "ExcludeMap": {
+                            "$ref": "#/definitions/AWS::FMS::Policy.IEMap"
+                        },
+                        "ExcludeResourceTags": {
+                            "type": "boolean"
+                        },
+                        "IncludeMap": {
+                            "$ref": "#/definitions/AWS::FMS::Policy.IEMap"
+                        },
+                        "PolicyName": {
+                            "type": "string"
+                        },
+                        "RemediationEnabled": {
+                            "type": "boolean"
+                        },
+                        "ResourceTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FMS::Policy.ResourceTag"
+                            },
+                            "type": "array"
+                        },
+                        "ResourceType": {
+                            "type": "string"
+                        },
+                        "ResourceTypeList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ResourcesCleanUp": {
+                            "type": "boolean"
+                        },
+                        "SecurityServicePolicyData": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FMS::Policy.PolicyTag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ExcludeResourceTags",
+                        "PolicyName",
+                        "RemediationEnabled",
+                        "ResourceType",
+                        "SecurityServicePolicyData"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FMS::Policy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FMS::Policy.IEMap": {
+            "additionalProperties": false,
+            "properties": {
+                "ACCOUNT": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ORGUNIT": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FMS::Policy.PolicyTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::FMS::Policy.ResourceTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BackupId": {
+                            "type": "string"
+                        },
+                        "FileSystemType": {
+                            "type": "string"
+                        },
+                        "FileSystemTypeVersion": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LustreConfiguration": {
+                            "$ref": "#/definitions/AWS::FSx::FileSystem.LustreConfiguration"
+                        },
+                        "OntapConfiguration": {
+                            "$ref": "#/definitions/AWS::FSx::FileSystem.OntapConfiguration"
+                        },
+                        "OpenZFSConfiguration": {
+                            "$ref": "#/definitions/AWS::FSx::FileSystem.OpenZFSConfiguration"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "StorageCapacity": {
+                            "type": "number"
+                        },
+                        "StorageType": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WindowsConfiguration": {
+                            "$ref": "#/definitions/AWS::FSx::FileSystem.WindowsConfiguration"
+                        }
+                    },
+                    "required": [
+                        "FileSystemType",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FSx::FileSystem"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.AuditLogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuditLogDestination": {
+                    "type": "string"
+                },
+                "FileAccessAuditLogLevel": {
+                    "type": "string"
+                },
+                "FileShareAccessAuditLogLevel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FileAccessAuditLogLevel",
+                "FileShareAccessAuditLogLevel"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.ClientConfigurations": {
+            "additionalProperties": false,
+            "properties": {
+                "Clients": {
+                    "type": "string"
+                },
+                "Options": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.DiskIopsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.LustreConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoImportPolicy": {
+                    "type": "string"
+                },
+                "AutomaticBackupRetentionDays": {
+                    "type": "number"
+                },
+                "CopyTagsToBackups": {
+                    "type": "boolean"
+                },
+                "DailyAutomaticBackupStartTime": {
+                    "type": "string"
+                },
+                "DataCompressionType": {
+                    "type": "string"
+                },
+                "DeploymentType": {
+                    "type": "string"
+                },
+                "DriveCacheType": {
+                    "type": "string"
+                },
+                "ExportPath": {
+                    "type": "string"
+                },
+                "ImportPath": {
+                    "type": "string"
+                },
+                "ImportedFileChunkSize": {
+                    "type": "number"
+                },
+                "PerUnitStorageThroughput": {
+                    "type": "number"
+                },
+                "WeeklyMaintenanceStartTime": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.NfsExports": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FSx::FileSystem.ClientConfigurations"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.OntapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomaticBackupRetentionDays": {
+                    "type": "number"
+                },
+                "DailyAutomaticBackupStartTime": {
+                    "type": "string"
+                },
+                "DeploymentType": {
+                    "type": "string"
+                },
+                "DiskIopsConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.DiskIopsConfiguration"
+                },
+                "EndpointIpAddressRange": {
+                    "type": "string"
+                },
+                "FsxAdminPassword": {
+                    "type": "string"
+                },
+                "PreferredSubnetId": {
+                    "type": "string"
+                },
+                "RouteTableIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ThroughputCapacity": {
+                    "type": "number"
+                },
+                "WeeklyMaintenanceStartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeploymentType"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.OpenZFSConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomaticBackupRetentionDays": {
+                    "type": "number"
+                },
+                "CopyTagsToBackups": {
+                    "type": "boolean"
+                },
+                "CopyTagsToVolumes": {
+                    "type": "boolean"
+                },
+                "DailyAutomaticBackupStartTime": {
+                    "type": "string"
+                },
+                "DeploymentType": {
+                    "type": "string"
+                },
+                "DiskIopsConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.DiskIopsConfiguration"
+                },
+                "RootVolumeConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.RootVolumeConfiguration"
+                },
+                "ThroughputCapacity": {
+                    "type": "number"
+                },
+                "WeeklyMaintenanceStartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeploymentType"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.RootVolumeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyTagsToSnapshots": {
+                    "type": "boolean"
+                },
+                "DataCompressionType": {
+                    "type": "string"
+                },
+                "NfsExports": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FSx::FileSystem.NfsExports"
+                    },
+                    "type": "array"
+                },
+                "ReadOnly": {
+                    "type": "boolean"
+                },
+                "UserAndGroupQuotas": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FSx::FileSystem.UserAndGroupQuotas"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.SelfManagedActiveDirectoryConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DnsIps": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DomainName": {
+                    "type": "string"
+                },
+                "FileSystemAdministratorsGroup": {
+                    "type": "string"
+                },
+                "OrganizationalUnitDistinguishedName": {
+                    "type": "string"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "UserName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.UserAndGroupQuotas": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "number"
+                },
+                "StorageCapacityQuotaGiB": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.WindowsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveDirectoryId": {
+                    "type": "string"
+                },
+                "Aliases": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AuditLogConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.AuditLogConfiguration"
+                },
+                "AutomaticBackupRetentionDays": {
+                    "type": "number"
+                },
+                "CopyTagsToBackups": {
+                    "type": "boolean"
+                },
+                "DailyAutomaticBackupStartTime": {
+                    "type": "string"
+                },
+                "DeploymentType": {
+                    "type": "string"
+                },
+                "PreferredSubnetId": {
+                    "type": "string"
+                },
+                "SelfManagedActiveDirectoryConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.SelfManagedActiveDirectoryConfiguration"
+                },
+                "ThroughputCapacity": {
+                    "type": "number"
+                },
+                "WeeklyMaintenanceStartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ThroughputCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::FinSpace::Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataBundles": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FederationMode": {
+                            "type": "string"
+                        },
+                        "FederationParameters": {
+                            "$ref": "#/definitions/AWS::FinSpace::Environment.FederationParameters"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SuperuserParameters": {
+                            "$ref": "#/definitions/AWS::FinSpace::Environment.SuperuserParameters"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FinSpace::Environment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FinSpace::Environment.FederationParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationCallBackURL": {
+                    "type": "string"
+                },
+                "AttributeMap": {
+                    "type": "object"
+                },
+                "FederationProviderName": {
+                    "type": "string"
+                },
+                "FederationURN": {
+                    "type": "string"
+                },
+                "SamlMetadataDocument": {
+                    "type": "string"
+                },
+                "SamlMetadataURL": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FinSpace::Environment.SuperuserParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "EmailAddress": {
+                    "type": "string"
+                },
+                "FirstName": {
+                    "type": "string"
+                },
+                "LastName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatedModels": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FraudDetector::Detector.Model"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "DetectorVersionStatus": {
+                            "type": "string"
+                        },
+                        "EventType": {
+                            "$ref": "#/definitions/AWS::FraudDetector::Detector.EventType"
+                        },
+                        "RuleExecutionMode": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FraudDetector::Detector.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DetectorId",
+                        "EventType",
+                        "Rules"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::Detector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.EntityType": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.EventType": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "EntityTypes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FraudDetector::Detector.EntityType"
+                    },
+                    "type": "array"
+                },
+                "EventVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FraudDetector::Detector.EventVariable"
+                    },
+                    "type": "array"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "Labels": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FraudDetector::Detector.Label"
+                    },
+                    "type": "array"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.EventVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "DataSource": {
+                    "type": "string"
+                },
+                "DataType": {
+                    "type": "string"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                },
+                "VariableType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.Label": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.Model": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.Outcome": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DetectorId": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                },
+                "Language": {
+                    "type": "string"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Outcomes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FraudDetector::Detector.Outcome"
+                    },
+                    "type": "array"
+                },
+                "RuleId": {
+                    "type": "string"
+                },
+                "RuleVersion": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::EntityType": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::EntityType"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FraudDetector::EventType": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EntityTypes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FraudDetector::EventType.EntityType"
+                            },
+                            "type": "array"
+                        },
+                        "EventVariables": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FraudDetector::EventType.EventVariable"
+                            },
+                            "type": "array"
+                        },
+                        "Labels": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FraudDetector::EventType.Label"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EntityTypes",
+                        "EventVariables",
+                        "Labels",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::EventType"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FraudDetector::EventType.EntityType": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::EventType.EventVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "DataSource": {
+                    "type": "string"
+                },
+                "DataType": {
+                    "type": "string"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                },
+                "VariableType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::EventType.Label": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Label": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::Label"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FraudDetector::Outcome": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::Outcome"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FraudDetector::Variable": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataSource": {
+                            "type": "string"
+                        },
+                        "DataType": {
+                            "type": "string"
+                        },
+                        "DefaultValue": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VariableType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DataSource",
+                        "DataType",
+                        "DefaultValue",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::Variable"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Alias": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RoutingStrategy": {
+                            "$ref": "#/definitions/AWS::GameLift::Alias.RoutingStrategy"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "RoutingStrategy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::Alias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Alias.RoutingStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "FleetId": {
+                    "type": "string"
+                },
+                "Message": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Build": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "OperatingSystem": {
+                            "type": "string"
+                        },
+                        "StorageLocation": {
+                            "$ref": "#/definitions/AWS::GameLift::Build.S3Location"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::Build"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Build.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BuildId": {
+                            "type": "string"
+                        },
+                        "CertificateConfiguration": {
+                            "$ref": "#/definitions/AWS::GameLift::Fleet.CertificateConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DesiredEC2Instances": {
+                            "type": "number"
+                        },
+                        "EC2InboundPermissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::Fleet.IpPermission"
+                            },
+                            "type": "array"
+                        },
+                        "EC2InstanceType": {
+                            "type": "string"
+                        },
+                        "FleetType": {
+                            "type": "string"
+                        },
+                        "InstanceRoleARN": {
+                            "type": "string"
+                        },
+                        "Locations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::Fleet.LocationConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "MaxSize": {
+                            "type": "number"
+                        },
+                        "MetricGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NewGameSessionProtectionPolicy": {
+                            "type": "string"
+                        },
+                        "PeerVpcAwsAccountId": {
+                            "type": "string"
+                        },
+                        "PeerVpcId": {
+                            "type": "string"
+                        },
+                        "ResourceCreationLimitPolicy": {
+                            "$ref": "#/definitions/AWS::GameLift::Fleet.ResourceCreationLimitPolicy"
+                        },
+                        "RuntimeConfiguration": {
+                            "$ref": "#/definitions/AWS::GameLift::Fleet.RuntimeConfiguration"
+                        },
+                        "ScriptId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::Fleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.CertificateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateType"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.IpPermission": {
+            "additionalProperties": false,
+            "properties": {
+                "FromPort": {
+                    "type": "number"
+                },
+                "IpRange": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FromPort",
+                "IpRange",
+                "Protocol",
+                "ToPort"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.LocationCapacity": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredEC2Instances": {
+                    "type": "number"
+                },
+                "MaxSize": {
+                    "type": "number"
+                },
+                "MinSize": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DesiredEC2Instances",
+                "MaxSize",
+                "MinSize"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.LocationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Location": {
+                    "type": "string"
+                },
+                "LocationCapacity": {
+                    "$ref": "#/definitions/AWS::GameLift::Fleet.LocationCapacity"
+                }
+            },
+            "required": [
+                "Location"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.ResourceCreationLimitPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "NewGameSessionsPerCreator": {
+                    "type": "number"
+                },
+                "PolicyPeriodInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.RuntimeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GameSessionActivationTimeoutSeconds": {
+                    "type": "number"
+                },
+                "MaxConcurrentGameSessionActivations": {
+                    "type": "number"
+                },
+                "ServerProcesses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::GameLift::Fleet.ServerProcess"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.ServerProcess": {
+            "additionalProperties": false,
+            "properties": {
+                "ConcurrentExecutions": {
+                    "type": "number"
+                },
+                "LaunchPath": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConcurrentExecutions",
+                "LaunchPath"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameServerGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingPolicy": {
+                            "$ref": "#/definitions/AWS::GameLift::GameServerGroup.AutoScalingPolicy"
+                        },
+                        "BalancingStrategy": {
+                            "type": "string"
+                        },
+                        "DeleteOption": {
+                            "type": "string"
+                        },
+                        "GameServerGroupName": {
+                            "type": "string"
+                        },
+                        "GameServerProtectionPolicy": {
+                            "type": "string"
+                        },
+                        "InstanceDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::GameServerGroup.InstanceDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchTemplate": {
+                            "$ref": "#/definitions/AWS::GameLift::GameServerGroup.LaunchTemplate"
+                        },
+                        "MaxSize": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSubnets": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "GameServerGroupName",
+                        "InstanceDefinitions",
+                        "LaunchTemplate",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::GameServerGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameServerGroup.AutoScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "EstimatedInstanceWarmup": {
+                    "type": "number"
+                },
+                "TargetTrackingConfiguration": {
+                    "$ref": "#/definitions/AWS::GameLift::GameServerGroup.TargetTrackingConfiguration"
+                }
+            },
+            "required": [
+                "TargetTrackingConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameServerGroup.InstanceDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameServerGroup.LaunchTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::GameServerGroup.TargetTrackingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameSessionQueue": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomEventData": {
+                            "type": "string"
+                        },
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::GameSessionQueue.Destination"
+                            },
+                            "type": "array"
+                        },
+                        "FilterConfiguration": {
+                            "$ref": "#/definitions/AWS::GameLift::GameSessionQueue.FilterConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NotificationTarget": {
+                            "type": "string"
+                        },
+                        "PlayerLatencyPolicies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::GameSessionQueue.PlayerLatencyPolicy"
+                            },
+                            "type": "array"
+                        },
+                        "PriorityConfiguration": {
+                            "$ref": "#/definitions/AWS::GameLift::GameSessionQueue.PriorityConfiguration"
+                        },
+                        "TimeoutInSeconds": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::GameSessionQueue"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameSessionQueue.Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::GameSessionQueue.FilterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedLocations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::GameSessionQueue.PlayerLatencyPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumIndividualPlayerLatencyMilliseconds": {
+                    "type": "number"
+                },
+                "PolicyDurationSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::GameSessionQueue.PriorityConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LocationOrder": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PriorityOrder": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::MatchmakingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptanceRequired": {
+                            "type": "boolean"
+                        },
+                        "AcceptanceTimeoutSeconds": {
+                            "type": "number"
+                        },
+                        "AdditionalPlayerCount": {
+                            "type": "number"
+                        },
+                        "BackfillMode": {
+                            "type": "string"
+                        },
+                        "CustomEventData": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FlexMatchMode": {
+                            "type": "string"
+                        },
+                        "GameProperties": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::MatchmakingConfiguration.GameProperty"
+                            },
+                            "type": "array"
+                        },
+                        "GameSessionData": {
+                            "type": "string"
+                        },
+                        "GameSessionQueueArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NotificationTarget": {
+                            "type": "string"
+                        },
+                        "RequestTimeoutSeconds": {
+                            "type": "number"
+                        },
+                        "RuleSetName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AcceptanceRequired",
+                        "Name",
+                        "RequestTimeoutSeconds",
+                        "RuleSetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::MatchmakingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::MatchmakingConfiguration.GameProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::MatchmakingRuleSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RuleSetBody": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "RuleSetBody"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::MatchmakingRuleSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Script": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "StorageLocation": {
+                            "$ref": "#/definitions/AWS::GameLift::Script.S3Location"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "StorageLocation"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::Script"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Script.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::Accelerator": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "IpAddressType": {
+                            "type": "string"
+                        },
+                        "IpAddresses": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GlobalAccelerator::Accelerator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::EndpointGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EndpointConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GlobalAccelerator::EndpointGroup.EndpointConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "EndpointGroupRegion": {
+                            "type": "string"
+                        },
+                        "HealthCheckIntervalSeconds": {
+                            "type": "number"
+                        },
+                        "HealthCheckPath": {
+                            "type": "string"
+                        },
+                        "HealthCheckPort": {
+                            "type": "number"
+                        },
+                        "HealthCheckProtocol": {
+                            "type": "string"
+                        },
+                        "ListenerArn": {
+                            "type": "string"
+                        },
+                        "PortOverrides": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GlobalAccelerator::EndpointGroup.PortOverride"
+                            },
+                            "type": "array"
+                        },
+                        "ThresholdCount": {
+                            "type": "number"
+                        },
+                        "TrafficDialPercentage": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "EndpointGroupRegion",
+                        "ListenerArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GlobalAccelerator::EndpointGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::EndpointGroup.EndpointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIPPreservationEnabled": {
+                    "type": "boolean"
+                },
+                "EndpointId": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "EndpointId"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::EndpointGroup.PortOverride": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointPort": {
+                    "type": "number"
+                },
+                "ListenerPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "EndpointPort",
+                "ListenerPort"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::Listener": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceleratorArn": {
+                            "type": "string"
+                        },
+                        "ClientAffinity": {
+                            "type": "string"
+                        },
+                        "PortRanges": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GlobalAccelerator::Listener.PortRange"
+                            },
+                            "type": "array"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AcceleratorArn",
+                        "PortRanges",
+                        "Protocol"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GlobalAccelerator::Listener"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::Listener.PortRange": {
+            "additionalProperties": false,
+            "properties": {
+                "FromPort": {
+                    "type": "number"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FromPort",
+                "ToPort"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Classifier": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CsvClassifier": {
+                            "$ref": "#/definitions/AWS::Glue::Classifier.CsvClassifier"
+                        },
+                        "GrokClassifier": {
+                            "$ref": "#/definitions/AWS::Glue::Classifier.GrokClassifier"
+                        },
+                        "JsonClassifier": {
+                            "$ref": "#/definitions/AWS::Glue::Classifier.JsonClassifier"
+                        },
+                        "XMLClassifier": {
+                            "$ref": "#/definitions/AWS::Glue::Classifier.XMLClassifier"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Classifier"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Classifier.CsvClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowSingleColumn": {
+                    "type": "boolean"
+                },
+                "ContainsHeader": {
+                    "type": "string"
+                },
+                "Delimiter": {
+                    "type": "string"
+                },
+                "DisableValueTrimming": {
+                    "type": "boolean"
+                },
+                "Header": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "QuoteSymbol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Classifier.GrokClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "Classification": {
+                    "type": "string"
+                },
+                "CustomPatterns": {
+                    "type": "string"
+                },
+                "GrokPattern": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Classification",
+                "GrokPattern"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Classifier.JsonClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonPath": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "JsonPath"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Classifier.XMLClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "Classification": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "RowTag": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Classification",
+                "RowTag"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Connection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CatalogId": {
+                            "type": "string"
+                        },
+                        "ConnectionInput": {
+                            "$ref": "#/definitions/AWS::Glue::Connection.ConnectionInput"
+                        }
+                    },
+                    "required": [
+                        "CatalogId",
+                        "ConnectionInput"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Connection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Connection.ConnectionInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionProperties": {
+                    "type": "object"
+                },
+                "ConnectionType": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "MatchCriteria": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "PhysicalConnectionRequirements": {
+                    "$ref": "#/definitions/AWS::Glue::Connection.PhysicalConnectionRequirements"
+                }
+            },
+            "required": [
+                "ConnectionType"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Connection.PhysicalConnectionRequirements": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "SecurityGroupIdList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Classifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Configuration": {
+                            "type": "string"
+                        },
+                        "CrawlerSecurityConfiguration": {
+                            "type": "string"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RecrawlPolicy": {
+                            "$ref": "#/definitions/AWS::Glue::Crawler.RecrawlPolicy"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "$ref": "#/definitions/AWS::Glue::Crawler.Schedule"
+                        },
+                        "SchemaChangePolicy": {
+                            "$ref": "#/definitions/AWS::Glue::Crawler.SchemaChangePolicy"
+                        },
+                        "TablePrefix": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Targets": {
+                            "$ref": "#/definitions/AWS::Glue::Crawler.Targets"
+                        }
+                    },
+                    "required": [
+                        "Role",
+                        "Targets"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Crawler"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.CatalogTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Tables": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.DynamoDBTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.JdbcTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionName": {
+                    "type": "string"
+                },
+                "Exclusions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.RecrawlPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "RecrawlBehavior": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.S3Target": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionName": {
+                    "type": "string"
+                },
+                "Exclusions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.SchemaChangePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteBehavior": {
+                    "type": "string"
+                },
+                "UpdateBehavior": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.Targets": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Crawler.CatalogTarget"
+                    },
+                    "type": "array"
+                },
+                "DynamoDBTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Crawler.DynamoDBTarget"
+                    },
+                    "type": "array"
+                },
+                "JdbcTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Crawler.JdbcTarget"
+                    },
+                    "type": "array"
+                },
+                "S3Targets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Crawler.S3Target"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::DataCatalogEncryptionSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CatalogId": {
+                            "type": "string"
+                        },
+                        "DataCatalogEncryptionSettings": {
+                            "$ref": "#/definitions/AWS::Glue::DataCatalogEncryptionSettings.DataCatalogEncryptionSettings"
+                        }
+                    },
+                    "required": [
+                        "CatalogId",
+                        "DataCatalogEncryptionSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::DataCatalogEncryptionSettings"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::DataCatalogEncryptionSettings.ConnectionPasswordEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "ReturnConnectionPasswordEncrypted": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::DataCatalogEncryptionSettings.DataCatalogEncryptionSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionPasswordEncryption": {
+                    "$ref": "#/definitions/AWS::Glue::DataCatalogEncryptionSettings.ConnectionPasswordEncryption"
+                },
+                "EncryptionAtRest": {
+                    "$ref": "#/definitions/AWS::Glue::DataCatalogEncryptionSettings.EncryptionAtRest"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::DataCatalogEncryptionSettings.EncryptionAtRest": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogEncryptionMode": {
+                    "type": "string"
+                },
+                "SseAwsKmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Database": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CatalogId": {
+                            "type": "string"
+                        },
+                        "DatabaseInput": {
+                            "$ref": "#/definitions/AWS::Glue::Database.DatabaseInput"
+                        }
+                    },
+                    "required": [
+                        "CatalogId",
+                        "DatabaseInput"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Database"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Database.DataLakePrincipal": {
+            "additionalProperties": false,
+            "properties": {
+                "DataLakePrincipalIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Database.DatabaseIdentifier": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Database.DatabaseInput": {
+            "additionalProperties": false,
+            "properties": {
+                "CreateTableDefaultPermissions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Database.PrincipalPrivileges"
+                    },
+                    "type": "array"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "LocationUri": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "TargetDatabase": {
+                    "$ref": "#/definitions/AWS::Glue::Database.DatabaseIdentifier"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Database.PrincipalPrivileges": {
+            "additionalProperties": false,
+            "properties": {
+                "Permissions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "$ref": "#/definitions/AWS::Glue::Database.DataLakePrincipal"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::DevEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Arguments": {
+                            "type": "object"
+                        },
+                        "EndpointName": {
+                            "type": "string"
+                        },
+                        "ExtraJarsS3Path": {
+                            "type": "string"
+                        },
+                        "ExtraPythonLibsS3Path": {
+                            "type": "string"
+                        },
+                        "GlueVersion": {
+                            "type": "string"
+                        },
+                        "NumberOfNodes": {
+                            "type": "number"
+                        },
+                        "NumberOfWorkers": {
+                            "type": "number"
+                        },
+                        "PublicKey": {
+                            "type": "string"
+                        },
+                        "PublicKeys": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "SecurityConfiguration": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "WorkerType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::DevEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Job": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocatedCapacity": {
+                            "type": "number"
+                        },
+                        "Command": {
+                            "$ref": "#/definitions/AWS::Glue::Job.JobCommand"
+                        },
+                        "Connections": {
+                            "$ref": "#/definitions/AWS::Glue::Job.ConnectionsList"
+                        },
+                        "DefaultArguments": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ExecutionProperty": {
+                            "$ref": "#/definitions/AWS::Glue::Job.ExecutionProperty"
+                        },
+                        "GlueVersion": {
+                            "type": "string"
+                        },
+                        "LogUri": {
+                            "type": "string"
+                        },
+                        "MaxCapacity": {
+                            "type": "number"
+                        },
+                        "MaxRetries": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NotificationProperty": {
+                            "$ref": "#/definitions/AWS::Glue::Job.NotificationProperty"
+                        },
+                        "NumberOfWorkers": {
+                            "type": "number"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "SecurityConfiguration": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Timeout": {
+                            "type": "number"
+                        },
+                        "WorkerType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Command",
+                        "Role"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Job"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Job.ConnectionsList": {
+            "additionalProperties": false,
+            "properties": {
+                "Connections": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Job.ExecutionProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConcurrentRuns": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Job.JobCommand": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "PythonVersion": {
+                    "type": "string"
+                },
+                "ScriptLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Job.NotificationProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "NotifyDelayAfter": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "GlueVersion": {
+                            "type": "string"
+                        },
+                        "InputRecordTables": {
+                            "$ref": "#/definitions/AWS::Glue::MLTransform.InputRecordTables"
+                        },
+                        "MaxCapacity": {
+                            "type": "number"
+                        },
+                        "MaxRetries": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NumberOfWorkers": {
+                            "type": "number"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Timeout": {
+                            "type": "number"
+                        },
+                        "TransformEncryption": {
+                            "$ref": "#/definitions/AWS::Glue::MLTransform.TransformEncryption"
+                        },
+                        "TransformParameters": {
+                            "$ref": "#/definitions/AWS::Glue::MLTransform.TransformParameters"
+                        },
+                        "WorkerType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InputRecordTables",
+                        "Role",
+                        "TransformParameters"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::MLTransform"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.FindMatchesParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "AccuracyCostTradeoff": {
+                    "type": "number"
+                },
+                "EnforceProvidedLabels": {
+                    "type": "boolean"
+                },
+                "PrecisionRecallTradeoff": {
+                    "type": "number"
+                },
+                "PrimaryKeyColumnName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PrimaryKeyColumnName"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.GlueTables": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "ConnectionName": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.InputRecordTables": {
+            "additionalProperties": false,
+            "properties": {
+                "GlueTables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::MLTransform.GlueTables"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.MLUserDataEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MLUserDataEncryptionMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MLUserDataEncryptionMode"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.TransformEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "MLUserDataEncryption": {
+                    "$ref": "#/definitions/AWS::Glue::MLTransform.MLUserDataEncryption"
+                },
+                "TaskRunSecurityConfigurationName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.TransformParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "FindMatchesParameters": {
+                    "$ref": "#/definitions/AWS::Glue::MLTransform.FindMatchesParameters"
+                },
+                "TransformType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TransformType"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Partition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CatalogId": {
+                            "type": "string"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "PartitionInput": {
+                            "$ref": "#/definitions/AWS::Glue::Partition.PartitionInput"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CatalogId",
+                        "DatabaseName",
+                        "PartitionInput",
+                        "TableName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Partition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Partition.Column": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Partition.Order": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "type": "string"
+                },
+                "SortOrder": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Column"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Partition.PartitionInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "type": "object"
+                },
+                "StorageDescriptor": {
+                    "$ref": "#/definitions/AWS::Glue::Partition.StorageDescriptor"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Partition.SchemaId": {
+            "additionalProperties": false,
+            "properties": {
+                "RegistryName": {
+                    "type": "string"
+                },
+                "SchemaArn": {
+                    "type": "string"
+                },
+                "SchemaName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Partition.SchemaReference": {
+            "additionalProperties": false,
+            "properties": {
+                "SchemaId": {
+                    "$ref": "#/definitions/AWS::Glue::Partition.SchemaId"
+                },
+                "SchemaVersionId": {
+                    "type": "string"
+                },
+                "SchemaVersionNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Partition.SerdeInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "SerializationLibrary": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Partition.SkewedInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "SkewedColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SkewedColumnValueLocationMaps": {
+                    "type": "object"
+                },
+                "SkewedColumnValues": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Partition.StorageDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Partition.Column"
+                    },
+                    "type": "array"
+                },
+                "Compressed": {
+                    "type": "boolean"
+                },
+                "InputFormat": {
+                    "type": "string"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "NumberOfBuckets": {
+                    "type": "number"
+                },
+                "OutputFormat": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "SchemaReference": {
+                    "$ref": "#/definitions/AWS::Glue::Partition.SchemaReference"
+                },
+                "SerdeInfo": {
+                    "$ref": "#/definitions/AWS::Glue::Partition.SerdeInfo"
+                },
+                "SkewedInfo": {
+                    "$ref": "#/definitions/AWS::Glue::Partition.SkewedInfo"
+                },
+                "SortColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Partition.Order"
+                    },
+                    "type": "array"
+                },
+                "StoredAsSubDirectories": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Registry": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Registry"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Schema": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CheckpointVersion": {
+                            "$ref": "#/definitions/AWS::Glue::Schema.SchemaVersion"
+                        },
+                        "Compatibility": {
+                            "type": "string"
+                        },
+                        "DataFormat": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Registry": {
+                            "$ref": "#/definitions/AWS::Glue::Schema.Registry"
+                        },
+                        "SchemaDefinition": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Compatibility",
+                        "DataFormat",
+                        "Name",
+                        "SchemaDefinition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Schema"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Schema.Registry": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Schema.SchemaVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "IsLatest": {
+                    "type": "boolean"
+                },
+                "VersionNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SchemaVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Schema": {
+                            "$ref": "#/definitions/AWS::Glue::SchemaVersion.Schema"
+                        },
+                        "SchemaDefinition": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Schema",
+                        "SchemaDefinition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::SchemaVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::SchemaVersion.Schema": {
+            "additionalProperties": false,
+            "properties": {
+                "RegistryName": {
+                    "type": "string"
+                },
+                "SchemaArn": {
+                    "type": "string"
+                },
+                "SchemaName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SchemaVersionMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Key": {
+                            "type": "string"
+                        },
+                        "SchemaVersionId": {
+                            "type": "string"
+                        },
+                        "Value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Key",
+                        "SchemaVersionId",
+                        "Value"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::SchemaVersionMetadata"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Glue::SecurityConfiguration.EncryptionConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "EncryptionConfiguration",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::SecurityConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration.CloudWatchEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchEncryptionMode": {
+                    "type": "string"
+                },
+                "KmsKeyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchEncryption": {
+                    "$ref": "#/definitions/AWS::Glue::SecurityConfiguration.CloudWatchEncryption"
+                },
+                "JobBookmarksEncryption": {
+                    "$ref": "#/definitions/AWS::Glue::SecurityConfiguration.JobBookmarksEncryption"
+                },
+                "S3Encryptions": {
+                    "$ref": "#/definitions/AWS::Glue::SecurityConfiguration.S3Encryptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration.JobBookmarksEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "JobBookmarksEncryptionMode": {
+                    "type": "string"
+                },
+                "KmsKeyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration.S3Encryption": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyArn": {
+                    "type": "string"
+                },
+                "S3EncryptionMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration.S3Encryptions": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::Glue::Table": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CatalogId": {
+                            "type": "string"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "TableInput": {
+                            "$ref": "#/definitions/AWS::Glue::Table.TableInput"
+                        }
+                    },
+                    "required": [
+                        "CatalogId",
+                        "DatabaseName",
+                        "TableInput"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Table"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Table.Column": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Table.Order": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "type": "string"
+                },
+                "SortOrder": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Column",
+                "SortOrder"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Table.SchemaId": {
+            "additionalProperties": false,
+            "properties": {
+                "RegistryName": {
+                    "type": "string"
+                },
+                "SchemaArn": {
+                    "type": "string"
+                },
+                "SchemaName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.SchemaReference": {
+            "additionalProperties": false,
+            "properties": {
+                "SchemaId": {
+                    "$ref": "#/definitions/AWS::Glue::Table.SchemaId"
+                },
+                "SchemaVersionId": {
+                    "type": "string"
+                },
+                "SchemaVersionNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.SerdeInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "SerializationLibrary": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.SkewedInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "SkewedColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SkewedColumnValueLocationMaps": {
+                    "type": "object"
+                },
+                "SkewedColumnValues": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.StorageDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Table.Column"
+                    },
+                    "type": "array"
+                },
+                "Compressed": {
+                    "type": "boolean"
+                },
+                "InputFormat": {
+                    "type": "string"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "NumberOfBuckets": {
+                    "type": "number"
+                },
+                "OutputFormat": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "SchemaReference": {
+                    "$ref": "#/definitions/AWS::Glue::Table.SchemaReference"
+                },
+                "SerdeInfo": {
+                    "$ref": "#/definitions/AWS::Glue::Table.SerdeInfo"
+                },
+                "SkewedInfo": {
+                    "$ref": "#/definitions/AWS::Glue::Table.SkewedInfo"
+                },
+                "SortColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Table.Order"
+                    },
+                    "type": "array"
+                },
+                "StoredAsSubDirectories": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.TableIdentifier": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.TableInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Owner": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "PartitionKeys": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Table.Column"
+                    },
+                    "type": "array"
+                },
+                "Retention": {
+                    "type": "number"
+                },
+                "StorageDescriptor": {
+                    "$ref": "#/definitions/AWS::Glue::Table.StorageDescriptor"
+                },
+                "TableType": {
+                    "type": "string"
+                },
+                "TargetTable": {
+                    "$ref": "#/definitions/AWS::Glue::Table.TableIdentifier"
+                },
+                "ViewExpandedText": {
+                    "type": "string"
+                },
+                "ViewOriginalText": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Trigger": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                                "$ref": "#/definitions/AWS::Glue::Trigger.Action"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Predicate": {
+                            "$ref": "#/definitions/AWS::Glue::Trigger.Predicate"
+                        },
+                        "Schedule": {
+                            "type": "string"
+                        },
+                        "StartOnCreation": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "WorkflowName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Actions",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Trigger"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Trigger.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "Arguments": {
+                    "type": "object"
+                },
+                "CrawlerName": {
+                    "type": "string"
+                },
+                "JobName": {
+                    "type": "string"
+                },
+                "NotificationProperty": {
+                    "$ref": "#/definitions/AWS::Glue::Trigger.NotificationProperty"
+                },
+                "SecurityConfiguration": {
+                    "type": "string"
+                },
+                "Timeout": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Trigger.Condition": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlState": {
+                    "type": "string"
+                },
+                "CrawlerName": {
+                    "type": "string"
+                },
+                "JobName": {
+                    "type": "string"
+                },
+                "LogicalOperator": {
+                    "type": "string"
+                },
+                "State": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Trigger.NotificationProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "NotifyDelayAfter": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Trigger.Predicate": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Trigger.Condition"
+                    },
+                    "type": "array"
+                },
+                "Logical": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Workflow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "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::Greengrass::ConnectorDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::ConnectorDefinition.ConnectorDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::ConnectorDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ConnectorDefinition.Connector": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "ConnectorArn",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ConnectorDefinition.ConnectorDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Connectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::ConnectorDefinition.Connector"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Connectors"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ConnectorDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectorDefinitionId": {
+                            "type": "string"
+                        },
+                        "Connectors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::ConnectorDefinitionVersion.Connector"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConnectorDefinitionId",
+                        "Connectors"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::ConnectorDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ConnectorDefinitionVersion.Connector": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "ConnectorArn",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::CoreDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::CoreDefinition.CoreDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::CoreDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::CoreDefinition.Core": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "SyncShadow": {
+                    "type": "boolean"
+                },
+                "ThingArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn",
+                "Id",
+                "ThingArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::CoreDefinition.CoreDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Cores": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::CoreDefinition.Core"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Cores"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::CoreDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CoreDefinitionId": {
+                            "type": "string"
+                        },
+                        "Cores": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::CoreDefinitionVersion.Core"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CoreDefinitionId",
+                        "Cores"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::CoreDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::CoreDefinitionVersion.Core": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "SyncShadow": {
+                    "type": "boolean"
+                },
+                "ThingArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn",
+                "Id",
+                "ThingArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::DeviceDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::DeviceDefinition.DeviceDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::DeviceDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::DeviceDefinition.Device": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "SyncShadow": {
+                    "type": "boolean"
+                },
+                "ThingArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn",
+                "Id",
+                "ThingArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::DeviceDefinition.DeviceDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Devices": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::DeviceDefinition.Device"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Devices"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::DeviceDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeviceDefinitionId": {
+                            "type": "string"
+                        },
+                        "Devices": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::DeviceDefinitionVersion.Device"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DeviceDefinitionId",
+                        "Devices"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::DeviceDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::DeviceDefinitionVersion.Device": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "SyncShadow": {
+                    "type": "boolean"
+                },
+                "ThingArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn",
+                "Id",
+                "ThingArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.FunctionDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::FunctionDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.DefaultConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Execution": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.Execution"
+                }
+            },
+            "required": [
+                "Execution"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessSysfs": {
+                    "type": "boolean"
+                },
+                "Execution": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.Execution"
+                },
+                "ResourceAccessPolicies": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.ResourceAccessPolicy"
+                    },
+                    "type": "array"
+                },
+                "Variables": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.Execution": {
+            "additionalProperties": false,
+            "properties": {
+                "IsolationMode": {
+                    "type": "string"
+                },
+                "RunAs": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.RunAs"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.Function": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionArn": {
+                    "type": "string"
+                },
+                "FunctionConfiguration": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.FunctionConfiguration"
+                },
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FunctionArn",
+                "FunctionConfiguration",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.FunctionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncodingType": {
+                    "type": "string"
+                },
+                "Environment": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.Environment"
+                },
+                "ExecArgs": {
+                    "type": "string"
+                },
+                "Executable": {
+                    "type": "string"
+                },
+                "MemorySize": {
+                    "type": "number"
+                },
+                "Pinned": {
+                    "type": "boolean"
+                },
+                "Timeout": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.FunctionDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultConfig": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.DefaultConfig"
+                },
+                "Functions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.Function"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Functions"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.ResourceAccessPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Permission": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceId"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.RunAs": {
+            "additionalProperties": false,
+            "properties": {
+                "Gid": {
+                    "type": "number"
+                },
+                "Uid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DefaultConfig": {
+                            "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.DefaultConfig"
+                        },
+                        "FunctionDefinitionId": {
+                            "type": "string"
+                        },
+                        "Functions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.Function"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FunctionDefinitionId",
+                        "Functions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::FunctionDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.DefaultConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Execution": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.Execution"
+                }
+            },
+            "required": [
+                "Execution"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessSysfs": {
+                    "type": "boolean"
+                },
+                "Execution": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.Execution"
+                },
+                "ResourceAccessPolicies": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.ResourceAccessPolicy"
+                    },
+                    "type": "array"
+                },
+                "Variables": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.Execution": {
+            "additionalProperties": false,
+            "properties": {
+                "IsolationMode": {
+                    "type": "string"
+                },
+                "RunAs": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.RunAs"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.Function": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionArn": {
+                    "type": "string"
+                },
+                "FunctionConfiguration": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.FunctionConfiguration"
+                },
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FunctionArn",
+                "FunctionConfiguration",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.FunctionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncodingType": {
+                    "type": "string"
+                },
+                "Environment": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.Environment"
+                },
+                "ExecArgs": {
+                    "type": "string"
+                },
+                "Executable": {
+                    "type": "string"
+                },
+                "MemorySize": {
+                    "type": "number"
+                },
+                "Pinned": {
+                    "type": "boolean"
+                },
+                "Timeout": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.ResourceAccessPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Permission": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceId"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.RunAs": {
+            "additionalProperties": false,
+            "properties": {
+                "Gid": {
+                    "type": "number"
+                },
+                "Uid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::Group": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::Group.GroupVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::Group"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::Group.GroupVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "CoreDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "DeviceDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "FunctionDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "LoggerDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "ResourceDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "SubscriptionDefinitionVersionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::GroupVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectorDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "CoreDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "DeviceDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "FunctionDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "GroupId": {
+                            "type": "string"
+                        },
+                        "LoggerDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "ResourceDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "SubscriptionDefinitionVersionArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::GroupVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::LoggerDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::LoggerDefinition.LoggerDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::LoggerDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::LoggerDefinition.Logger": {
+            "additionalProperties": false,
+            "properties": {
+                "Component": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Level": {
+                    "type": "string"
+                },
+                "Space": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Component",
+                "Id",
+                "Level",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::LoggerDefinition.LoggerDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Loggers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::LoggerDefinition.Logger"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Loggers"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::LoggerDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LoggerDefinitionId": {
+                            "type": "string"
+                        },
+                        "Loggers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::LoggerDefinitionVersion.Logger"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "LoggerDefinitionId",
+                        "Loggers"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::LoggerDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::LoggerDefinitionVersion.Logger": {
+            "additionalProperties": false,
+            "properties": {
+                "Component": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Level": {
+                    "type": "string"
+                },
+                "Space": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Component",
+                "Id",
+                "Level",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.ResourceDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::ResourceDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.GroupOwnerSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoAddGroupOwner": {
+                    "type": "boolean"
+                },
+                "GroupOwner": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AutoAddGroupOwner"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.LocalDeviceResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupOwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.GroupOwnerSetting"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourcePath"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.LocalVolumeResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "GroupOwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.GroupOwnerSetting"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "SourcePath"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.ResourceDataContainer": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalDeviceResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.LocalDeviceResourceData"
+                },
+                "LocalVolumeResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.LocalVolumeResourceData"
+                },
+                "S3MachineLearningModelResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.S3MachineLearningModelResourceData"
+                },
+                "SageMakerMachineLearningModelResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.SageMakerMachineLearningModelResourceData"
+                },
+                "SecretsManagerSecretResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.SecretsManagerSecretResourceData"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.ResourceDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Resources": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.ResourceInstance"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Resources"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.ResourceDownloadOwnerSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupOwner": {
+                    "type": "string"
+                },
+                "GroupPermission": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupOwner",
+                "GroupPermission"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.ResourceInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "ResourceDataContainer": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.ResourceDataContainer"
+                }
+            },
+            "required": [
+                "Id",
+                "Name",
+                "ResourceDataContainer"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.S3MachineLearningModelResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "OwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.ResourceDownloadOwnerSetting"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.SageMakerMachineLearningModelResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "OwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.ResourceDownloadOwnerSetting"
+                },
+                "SageMakerJobArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "SageMakerJobArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.SecretsManagerSecretResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "ARN": {
+                    "type": "string"
+                },
+                "AdditionalStagingLabelsToDownload": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ARN"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceDefinitionId": {
+                            "type": "string"
+                        },
+                        "Resources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.ResourceInstance"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ResourceDefinitionId",
+                        "Resources"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::ResourceDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.GroupOwnerSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoAddGroupOwner": {
+                    "type": "boolean"
+                },
+                "GroupOwner": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AutoAddGroupOwner"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.LocalDeviceResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupOwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.GroupOwnerSetting"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourcePath"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.LocalVolumeResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "GroupOwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.GroupOwnerSetting"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "SourcePath"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.ResourceDataContainer": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalDeviceResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.LocalDeviceResourceData"
+                },
+                "LocalVolumeResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.LocalVolumeResourceData"
+                },
+                "S3MachineLearningModelResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.S3MachineLearningModelResourceData"
+                },
+                "SageMakerMachineLearningModelResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.SageMakerMachineLearningModelResourceData"
+                },
+                "SecretsManagerSecretResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.SecretsManagerSecretResourceData"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.ResourceDownloadOwnerSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupOwner": {
+                    "type": "string"
+                },
+                "GroupPermission": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupOwner",
+                "GroupPermission"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.ResourceInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "ResourceDataContainer": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.ResourceDataContainer"
+                }
+            },
+            "required": [
+                "Id",
+                "Name",
+                "ResourceDataContainer"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.S3MachineLearningModelResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "OwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.ResourceDownloadOwnerSetting"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.SageMakerMachineLearningModelResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "OwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.ResourceDownloadOwnerSetting"
+                },
+                "SageMakerJobArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "SageMakerJobArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.SecretsManagerSecretResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "ARN": {
+                    "type": "string"
+                },
+                "AdditionalStagingLabelsToDownload": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ARN"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::SubscriptionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::SubscriptionDefinition.SubscriptionDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::SubscriptionDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::SubscriptionDefinition.Subscription": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Subject": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id",
+                "Source",
+                "Subject",
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::SubscriptionDefinition.SubscriptionDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Subscriptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::SubscriptionDefinition.Subscription"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Subscriptions"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::SubscriptionDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SubscriptionDefinitionId": {
+                            "type": "string"
+                        },
+                        "Subscriptions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::SubscriptionDefinitionVersion.Subscription"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubscriptionDefinitionId",
+                        "Subscriptions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::SubscriptionDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::SubscriptionDefinitionVersion.Subscription": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Subject": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id",
+                "Source",
+                "Subject",
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InlineRecipe": {
+                            "type": "string"
+                        },
+                        "LambdaFunction": {
+                            "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaFunctionRecipeSource"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GreengrassV2::ComponentVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.ComponentDependencyRequirement": {
+            "additionalProperties": false,
+            "properties": {
+                "DependencyType": {
+                    "type": "string"
+                },
+                "VersionRequirement": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.ComponentPlatform": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaContainerParams": {
+            "additionalProperties": false,
+            "properties": {
+                "Devices": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaDeviceMount"
+                    },
+                    "type": "array"
+                },
+                "MemorySizeInKB": {
+                    "type": "number"
+                },
+                "MountROSysfs": {
+                    "type": "boolean"
+                },
+                "Volumes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaVolumeMount"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaDeviceMount": {
+            "additionalProperties": false,
+            "properties": {
+                "AddGroupOwner": {
+                    "type": "boolean"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Permission": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaEventSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Topic": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaExecutionParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "EnvironmentVariables": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "EventSources": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaEventSource"
+                    },
+                    "type": "array"
+                },
+                "ExecArgs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InputPayloadEncodingType": {
+                    "type": "string"
+                },
+                "LinuxProcessParams": {
+                    "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaLinuxProcessParams"
+                },
+                "MaxIdleTimeInSeconds": {
+                    "type": "number"
+                },
+                "MaxInstancesCount": {
+                    "type": "number"
+                },
+                "MaxQueueSize": {
+                    "type": "number"
+                },
+                "Pinned": {
+                    "type": "boolean"
+                },
+                "StatusTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "TimeoutInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaFunctionRecipeSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentDependencies": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.ComponentDependencyRequirement"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ComponentLambdaParameters": {
+                    "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaExecutionParameters"
+                },
+                "ComponentName": {
+                    "type": "string"
+                },
+                "ComponentPlatforms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.ComponentPlatform"
+                    },
+                    "type": "array"
+                },
+                "ComponentVersion": {
+                    "type": "string"
+                },
+                "LambdaArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaLinuxProcessParams": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerParams": {
+                    "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaContainerParams"
+                },
+                "IsolationMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaVolumeMount": {
+            "additionalProperties": false,
+            "properties": {
+                "AddGroupOwner": {
+                    "type": "boolean"
+                },
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "Permission": {
+                    "type": "string"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigData": {
+                            "$ref": "#/definitions/AWS::GroundStation::Config.ConfigData"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConfigData",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GroundStation::Config"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.AntennaDownlinkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SpectrumConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.SpectrumConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.AntennaDownlinkDemodDecodeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DecodeConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.DecodeConfig"
+                },
+                "DemodulationConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.DemodulationConfig"
+                },
+                "SpectrumConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.SpectrumConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.AntennaUplinkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SpectrumConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.UplinkSpectrumConfig"
+                },
+                "TargetEirp": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.Eirp"
+                },
+                "TransmitDisabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.ConfigData": {
+            "additionalProperties": false,
+            "properties": {
+                "AntennaDownlinkConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.AntennaDownlinkConfig"
+                },
+                "AntennaDownlinkDemodDecodeConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.AntennaDownlinkDemodDecodeConfig"
+                },
+                "AntennaUplinkConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.AntennaUplinkConfig"
+                },
+                "DataflowEndpointConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.DataflowEndpointConfig"
+                },
+                "S3RecordingConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.S3RecordingConfig"
+                },
+                "TrackingConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.TrackingConfig"
+                },
+                "UplinkEchoConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.UplinkEchoConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.DataflowEndpointConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DataflowEndpointName": {
+                    "type": "string"
+                },
+                "DataflowEndpointRegion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.DecodeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "UnvalidatedJSON": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.DemodulationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "UnvalidatedJSON": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.Eirp": {
+            "additionalProperties": false,
+            "properties": {
+                "Units": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.Frequency": {
+            "additionalProperties": false,
+            "properties": {
+                "Units": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.FrequencyBandwidth": {
+            "additionalProperties": false,
+            "properties": {
+                "Units": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.S3RecordingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.SpectrumConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Bandwidth": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.FrequencyBandwidth"
+                },
+                "CenterFrequency": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.Frequency"
+                },
+                "Polarization": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.TrackingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Autotrack": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.UplinkEchoConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AntennaUplinkConfigArn": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.UplinkSpectrumConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CenterFrequency": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.Frequency"
+                },
+                "Polarization": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::DataflowEndpointGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EndpointDetails": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GroundStation::DataflowEndpointGroup.EndpointDetails"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EndpointDetails"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GroundStation::DataflowEndpointGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GroundStation::DataflowEndpointGroup.DataflowEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "$ref": "#/definitions/AWS::GroundStation::DataflowEndpointGroup.SocketAddress"
+                },
+                "Mtu": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::DataflowEndpointGroup.EndpointDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "$ref": "#/definitions/AWS::GroundStation::DataflowEndpointGroup.DataflowEndpoint"
+                },
+                "SecurityDetails": {
+                    "$ref": "#/definitions/AWS::GroundStation::DataflowEndpointGroup.SecurityDetails"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::DataflowEndpointGroup.SecurityDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::DataflowEndpointGroup.SocketAddress": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::MissionProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContactPostPassDurationSeconds": {
+                            "type": "number"
+                        },
+                        "ContactPrePassDurationSeconds": {
+                            "type": "number"
+                        },
+                        "DataflowEdges": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GroundStation::MissionProfile.DataflowEdge"
+                            },
+                            "type": "array"
+                        },
+                        "MinimumViableContactDurationSeconds": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrackingConfigArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DataflowEdges",
+                        "MinimumViableContactDurationSeconds",
+                        "Name",
+                        "TrackingConfigArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GroundStation::MissionProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GroundStation::MissionProfile.DataflowEdge": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::Detector": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataSources": {
+                            "$ref": "#/definitions/AWS::GuardDuty::Detector.CFNDataSourceConfigurations"
+                        },
+                        "Enable": {
+                            "type": "boolean"
+                        },
+                        "FindingPublishingFrequency": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Enable"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::Detector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Detector.CFNDataSourceConfigurations": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Logs": {
+                    "$ref": "#/definitions/AWS::GuardDuty::Detector.CFNS3LogsConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::Detector.CFNS3LogsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enable": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::Filter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "FindingCriteria": {
+                            "$ref": "#/definitions/AWS::GuardDuty::Filter.FindingCriteria"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Rank": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Action",
+                        "Description",
+                        "DetectorId",
+                        "FindingCriteria",
+                        "Name",
+                        "Rank"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::Filter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Filter.Condition": {
+            "additionalProperties": false,
+            "properties": {
+                "Eq": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Gte": {
+                    "type": "number"
+                },
+                "Lt": {
+                    "type": "number"
+                },
+                "Lte": {
+                    "type": "number"
+                },
+                "Neq": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::Filter.FindingCriteria": {
+            "additionalProperties": false,
+            "properties": {
+                "Criterion": {
+                    "type": "object"
+                },
+                "ItemType": {
+                    "$ref": "#/definitions/AWS::GuardDuty::Filter.Condition"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::IPSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Activate": {
+                            "type": "boolean"
+                        },
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "Format": {
+                            "type": "string"
+                        },
+                        "Location": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Activate",
+                        "DetectorId",
+                        "Format",
+                        "Location"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::IPSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Master": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "InvitationId": {
+                            "type": "string"
+                        },
+                        "MasterId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DetectorId",
+                        "MasterId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::Master"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Member": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "DisableEmailNotification": {
+                            "type": "boolean"
+                        },
+                        "Email": {
+                            "type": "string"
+                        },
+                        "MemberId": {
+                            "type": "string"
+                        },
+                        "Message": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DetectorId",
+                        "Email",
+                        "MemberId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::Member"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::ThreatIntelSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Activate": {
+                            "type": "boolean"
+                        },
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "Format": {
+                            "type": "string"
+                        },
+                        "Location": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Activate",
+                        "DetectorId",
+                        "Format",
+                        "Location"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::ThreatIntelSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DatastoreTypeVersion": {
+                            "type": "string"
+                        },
+                        "PreloadDataConfig": {
+                            "$ref": "#/definitions/AWS::HealthLake::FHIRDatastore.PreloadDataConfig"
+                        },
+                        "SseConfiguration": {
+                            "$ref": "#/definitions/AWS::HealthLake::FHIRDatastore.SseConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DatastoreTypeVersion"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::HealthLake::FHIRDatastore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore.KmsEncryptionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CmkType": {
+                    "type": "string"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CmkType"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore.PreloadDataConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "PreloadDataType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PreloadDataType"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore.SseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsEncryptionConfig": {
+                    "$ref": "#/definitions/AWS::HealthLake::FHIRDatastore.KmsEncryptionConfig"
+                }
+            },
+            "required": [
+                "KmsEncryptionConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::AccessKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Serial": {
+                            "type": "number"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::AccessKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::Group": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "ManagedPolicyArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IAM::Group.Policy"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::Group"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::Group.Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "PolicyDocument": {
+                    "type": "object"
+                },
+                "PolicyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PolicyDocument",
+                "PolicyName"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::InstanceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InstanceProfileName": {
+                            "type": "string"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "Roles": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Roles"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::InstanceProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::ManagedPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Groups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ManagedPolicyName": {
+                            "type": "string"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "Roles": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Users": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::ManagedPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::OIDCProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClientIdList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThumbprintList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Url": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ThumbprintList"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::OIDCProvider"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Groups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "PolicyName": {
+                            "type": "string"
+                        },
+                        "Roles": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Users": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument",
+                        "PolicyName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::Policy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::Role": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssumeRolePolicyDocument": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ManagedPolicyArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MaxSessionDuration": {
+                            "type": "number"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "PermissionsBoundary": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IAM::Role.Policy"
+                            },
+                            "type": "array"
+                        },
+                        "RoleName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AssumeRolePolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::Role"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::Role.Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "PolicyDocument": {
+                    "type": "object"
+                },
+                "PolicyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PolicyDocument",
+                "PolicyName"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::SAMLProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SamlMetadataDocument": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SamlMetadataDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::SAMLProvider"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::ServerCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CertificateBody": {
+                            "type": "string"
+                        },
+                        "CertificateChain": {
+                            "type": "string"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "PrivateKey": {
+                            "type": "string"
+                        },
+                        "ServerCertificateName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::ServerCertificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::ServiceLinkedRole": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AWSServiceName": {
+                            "type": "string"
+                        },
+                        "CustomSuffix": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AWSServiceName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::ServiceLinkedRole"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Groups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LoginProfile": {
+                            "$ref": "#/definitions/AWS::IAM::User.LoginProfile"
+                        },
+                        "ManagedPolicyArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "PermissionsBoundary": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IAM::User.Policy"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::User.LoginProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "PasswordResetRequired": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Password"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::User.Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "PolicyDocument": {
+                    "type": "object"
+                },
+                "PolicyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PolicyDocument",
+                "PolicyName"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::UserToGroupAddition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "Users": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "GroupName",
+                        "Users"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::UserToGroupAddition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::VirtualMFADevice": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Path": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Users": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualMfaDeviceName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Users"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::VirtualMFADevice"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Authorized": {
+                            "type": "boolean"
+                        },
+                        "LatencyMode": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RecordingConfigurationArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::Channel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::PlaybackKeyPair": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "PublicKeyMaterial": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PublicKeyMaterial"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::PlaybackKeyPair"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::RecordingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.DestinationConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DestinationConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::RecordingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::RecordingConfiguration.DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.S3DestinationConfiguration"
+                }
+            },
+            "required": [
+                "S3"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::RecordingConfiguration.S3DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StreamKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ChannelArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ChannelArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::StreamKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::Component": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ChangeDescription": {
+                            "type": "string"
+                        },
+                        "Data": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Platform": {
+                            "type": "string"
+                        },
+                        "SupportedOsVersions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Uri": {
+                            "type": "string"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Platform",
+                        "Version"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::Component"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Components": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe.ComponentConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "ContainerType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DockerfileTemplateData": {
+                            "type": "string"
+                        },
+                        "DockerfileTemplateUri": {
+                            "type": "string"
+                        },
+                        "ImageOsVersionOverride": {
+                            "type": "string"
+                        },
+                        "InstanceConfiguration": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe.InstanceConfiguration"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParentImage": {
+                            "type": "string"
+                        },
+                        "PlatformOverride": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "TargetRepository": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe.TargetContainerRepository"
+                        },
+                        "Version": {
+                            "type": "string"
+                        },
+                        "WorkingDirectory": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Components",
+                        "ContainerType",
+                        "Name",
+                        "ParentImage",
+                        "TargetRepository",
+                        "Version"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::ContainerRecipe"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe.ComponentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe.EbsInstanceBlockDeviceSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "Throughput": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe.InstanceBlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe.EbsInstanceBlockDeviceSpecification"
+                },
+                "NoDevice": {
+                    "type": "string"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe.InstanceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockDeviceMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe.InstanceBlockDeviceMapping"
+                    },
+                    "type": "array"
+                },
+                "Image": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe.TargetContainerRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "RepositoryName": {
+                    "type": "string"
+                },
+                "Service": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::DistributionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Distributions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ImageBuilder::DistributionConfiguration.Distribution"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Distributions",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::DistributionConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::DistributionConfiguration.Distribution": {
+            "additionalProperties": false,
+            "properties": {
+                "AmiDistributionConfiguration": {
+                    "type": "object"
+                },
+                "ContainerDistributionConfiguration": {
+                    "type": "object"
+                },
+                "LaunchTemplateConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ImageBuilder::DistributionConfiguration.LaunchTemplateConfiguration"
+                    },
+                    "type": "array"
+                },
+                "LicenseConfigurationArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::DistributionConfiguration.LaunchTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "SetDefaultVersion": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::Image": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContainerRecipeArn": {
+                            "type": "string"
+                        },
+                        "DistributionConfigurationArn": {
+                            "type": "string"
+                        },
+                        "EnhancedImageMetadataEnabled": {
+                            "type": "boolean"
+                        },
+                        "ImageRecipeArn": {
+                            "type": "string"
+                        },
+                        "ImageTestsConfiguration": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::Image.ImageTestsConfiguration"
+                        },
+                        "InfrastructureConfigurationArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "InfrastructureConfigurationArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::Image"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::Image.ImageTestsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ImageTestsEnabled": {
+                    "type": "boolean"
+                },
+                "TimeoutMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImagePipeline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContainerRecipeArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DistributionConfigurationArn": {
+                            "type": "string"
+                        },
+                        "EnhancedImageMetadataEnabled": {
+                            "type": "boolean"
+                        },
+                        "ImageRecipeArn": {
+                            "type": "string"
+                        },
+                        "ImageTestsConfiguration": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ImagePipeline.ImageTestsConfiguration"
+                        },
+                        "InfrastructureConfigurationArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ImagePipeline.Schedule"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "InfrastructureConfigurationArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::ImagePipeline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImagePipeline.ImageTestsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ImageTestsEnabled": {
+                    "type": "boolean"
+                },
+                "TimeoutMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImagePipeline.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "PipelineExecutionStartCondition": {
+                    "type": "string"
+                },
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdditionalInstanceConfiguration": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.AdditionalInstanceConfiguration"
+                        },
+                        "BlockDeviceMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.InstanceBlockDeviceMapping"
+                            },
+                            "type": "array"
+                        },
+                        "Components": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.ComponentConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParentImage": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Version": {
+                            "type": "string"
+                        },
+                        "WorkingDirectory": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Components",
+                        "Name",
+                        "ParentImage",
+                        "Version"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::ImageRecipe"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.AdditionalInstanceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SystemsManagerAgent": {
+                    "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.SystemsManagerAgent"
+                },
+                "UserDataOverride": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.ComponentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentArn": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.ComponentParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.ComponentParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.EbsInstanceBlockDeviceSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "Throughput": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.InstanceBlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.EbsInstanceBlockDeviceSpecification"
+                },
+                "NoDevice": {
+                    "type": "string"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.SystemsManagerAgent": {
+            "additionalProperties": false,
+            "properties": {
+                "UninstallAfterBuild": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::InfrastructureConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "InstanceMetadataOptions": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::InfrastructureConfiguration.InstanceMetadataOptions"
+                        },
+                        "InstanceProfileName": {
+                            "type": "string"
+                        },
+                        "InstanceTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "KeyPair": {
+                            "type": "string"
+                        },
+                        "Logging": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::InfrastructureConfiguration.Logging"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResourceTags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "TerminateInstanceOnFailure": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "InstanceProfileName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::InfrastructureConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::InfrastructureConfiguration.InstanceMetadataOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpPutResponseHopLimit": {
+                    "type": "number"
+                },
+                "HttpTokens": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::InfrastructureConfiguration.Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Logs": {
+                    "$ref": "#/definitions/AWS::ImageBuilder::InfrastructureConfiguration.S3Logs"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::InfrastructureConfiguration.S3Logs": {
+            "additionalProperties": false,
+            "properties": {
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3KeyPrefix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Inspector::AssessmentTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssessmentTargetName": {
+                            "type": "string"
+                        },
+                        "ResourceGroupArn": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Inspector::AssessmentTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Inspector::AssessmentTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssessmentTargetArn": {
+                            "type": "string"
+                        },
+                        "AssessmentTemplateName": {
+                            "type": "string"
+                        },
+                        "DurationInSeconds": {
+                            "type": "number"
+                        },
+                        "RulesPackageArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "UserAttributesForFindings": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AssessmentTargetArn",
+                        "DurationInSeconds",
+                        "RulesPackageArns"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Inspector::AssessmentTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Inspector::ResourceGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceGroupTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ResourceGroupTags"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Inspector::ResourceGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT1Click::Device": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeviceId": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "DeviceId",
+                        "Enabled"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT1Click::Device"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT1Click::Placement": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatedDevices": {
+                            "type": "object"
+                        },
+                        "Attributes": {
+                            "type": "object"
+                        },
+                        "PlacementName": {
+                            "type": "string"
+                        },
+                        "ProjectName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProjectName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT1Click::Placement"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT1Click::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "PlacementTemplate": {
+                            "$ref": "#/definitions/AWS::IoT1Click::Project.PlacementTemplate"
+                        },
+                        "ProjectName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PlacementTemplate"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT1Click::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT1Click::Project.DeviceTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "CallbackOverrides": {
+                    "type": "object"
+                },
+                "DeviceType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT1Click::Project.PlacementTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultAttributes": {
+                    "type": "object"
+                },
+                "DeviceTemplates": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::AccountAuditConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountId": {
+                            "type": "string"
+                        },
+                        "AuditCheckConfigurations": {
+                            "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfigurations"
+                        },
+                        "AuditNotificationTargetConfigurations": {
+                            "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditNotificationTargetConfigurations"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AccountId",
+                        "AuditCheckConfigurations",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::AccountAuditConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::AccountAuditConfiguration.AuditCheckConfigurations": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticatedCognitoRoleOverlyPermissiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "CaCertificateExpiringCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "CaCertificateKeyQualityCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "ConflictingClientIdsCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "DeviceCertificateExpiringCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "DeviceCertificateKeyQualityCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "DeviceCertificateSharedCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "IotPolicyOverlyPermissiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "IotRoleAliasAllowsAccessToUnusedServicesCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "IotRoleAliasOverlyPermissiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "LoggingDisabledCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "RevokedCaCertificateStillActiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "RevokedDeviceCertificateStillActiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "UnauthenticatedCognitoRoleOverlyPermissiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::AccountAuditConfiguration.AuditNotificationTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TargetArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::AccountAuditConfiguration.AuditNotificationTargetConfigurations": {
+            "additionalProperties": false,
+            "properties": {
+                "Sns": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditNotificationTarget"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::Authorizer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthorizerFunctionArn": {
+                            "type": "string"
+                        },
+                        "AuthorizerName": {
+                            "type": "string"
+                        },
+                        "SigningDisabled": {
+                            "type": "boolean"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TokenKeyName": {
+                            "type": "string"
+                        },
+                        "TokenSigningPublicKeys": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "AuthorizerFunctionArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Authorizer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CACertificatePem": {
+                            "type": "string"
+                        },
+                        "CertificateMode": {
+                            "type": "string"
+                        },
+                        "CertificatePem": {
+                            "type": "string"
+                        },
+                        "CertificateSigningRequest": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Status"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Certificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::CustomMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "MetricType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MetricType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::CustomMetric"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "StringValues": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "StringValues",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Dimension"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::DomainConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthorizerConfig": {
+                            "$ref": "#/definitions/AWS::IoT::DomainConfiguration.AuthorizerConfig"
+                        },
+                        "DomainConfigurationName": {
+                            "type": "string"
+                        },
+                        "DomainConfigurationStatus": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "ServerCertificateArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ValidationCertificateArn": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::DomainConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::DomainConfiguration.AuthorizerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowAuthorizerOverride": {
+                    "type": "boolean"
+                },
+                "DefaultAuthorizerName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::DomainConfiguration.ServerCertificateSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "ServerCertificateArn": {
+                    "type": "string"
+                },
+                "ServerCertificateStatus": {
+                    "type": "string"
+                },
+                "ServerCertificateStatusDetail": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::FleetMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AggregationField": {
+                            "type": "string"
+                        },
+                        "AggregationType": {
+                            "$ref": "#/definitions/AWS::IoT::FleetMetric.AggregationType"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IndexName": {
+                            "type": "string"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Period": {
+                            "type": "number"
+                        },
+                        "QueryString": {
+                            "type": "string"
+                        },
+                        "QueryVersion": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Unit": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MetricName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::FleetMetric"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::FleetMetric.AggregationType": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::JobTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AbortConfig": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Document": {
+                            "type": "string"
+                        },
+                        "DocumentSource": {
+                            "type": "string"
+                        },
+                        "JobArn": {
+                            "type": "string"
+                        },
+                        "JobExecutionsRolloutConfig": {
+                            "type": "object"
+                        },
+                        "JobTemplateId": {
+                            "type": "string"
+                        },
+                        "PresignedUrlConfig": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeoutConfig": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "JobTemplateId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::JobTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountId": {
+                            "type": "string"
+                        },
+                        "DefaultLogLevel": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AccountId",
+                        "DefaultLogLevel",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Logging"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ActionName": {
+                            "type": "string"
+                        },
+                        "ActionParams": {
+                            "$ref": "#/definitions/AWS::IoT::MitigationAction.ActionParams"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ActionParams",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::MitigationAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.ActionParams": {
+            "additionalProperties": false,
+            "properties": {
+                "AddThingsToThingGroupParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.AddThingsToThingGroupParams"
+                },
+                "EnableIoTLoggingParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.EnableIoTLoggingParams"
+                },
+                "PublishFindingToSnsParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.PublishFindingToSnsParams"
+                },
+                "ReplaceDefaultPolicyVersionParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.ReplaceDefaultPolicyVersionParams"
+                },
+                "UpdateCACertificateParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.UpdateCACertificateParams"
+                },
+                "UpdateDeviceCertificateParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.UpdateDeviceCertificateParams"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.AddThingsToThingGroupParams": {
+            "additionalProperties": false,
+            "properties": {
+                "OverrideDynamicGroups": {
+                    "type": "boolean"
+                },
+                "ThingGroupNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ThingGroupNames"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.EnableIoTLoggingParams": {
+            "additionalProperties": false,
+            "properties": {
+                "LogLevel": {
+                    "type": "string"
+                },
+                "RoleArnForLogging": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogLevel",
+                "RoleArnForLogging"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.PublishFindingToSnsParams": {
+            "additionalProperties": false,
+            "properties": {
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.ReplaceDefaultPolicyVersionParams": {
+            "additionalProperties": false,
+            "properties": {
+                "TemplateName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TemplateName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.UpdateCACertificateParams": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.UpdateDeviceCertificateParams": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "PolicyName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Policy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::PolicyPrincipalAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyName": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PolicyName",
+                        "Principal"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::PolicyPrincipalAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::ProvisioningTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "PreProvisioningHook": {
+                            "$ref": "#/definitions/AWS::IoT::ProvisioningTemplate.ProvisioningHook"
+                        },
+                        "ProvisioningRoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateBody": {
+                            "type": "string"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProvisioningRoleArn",
+                        "TemplateBody"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::ProvisioningTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::ProvisioningTemplate.ProvisioningHook": {
+            "additionalProperties": false,
+            "properties": {
+                "PayloadVersion": {
+                    "type": "string"
+                },
+                "TargetArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::ResourceSpecificLogging": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LogLevel": {
+                            "type": "string"
+                        },
+                        "TargetName": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LogLevel",
+                        "TargetName",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::ResourceSpecificLogging"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::ScheduledAudit": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DayOfMonth": {
+                            "type": "string"
+                        },
+                        "DayOfWeek": {
+                            "type": "string"
+                        },
+                        "Frequency": {
+                            "type": "string"
+                        },
+                        "ScheduledAuditName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetCheckNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Frequency",
+                        "TargetCheckNames"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::ScheduledAudit"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdditionalMetricsToRetainV2": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoT::SecurityProfile.MetricToRetain"
+                            },
+                            "type": "array"
+                        },
+                        "AlertTargets": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.AlertTarget"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Behaviors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoT::SecurityProfile.Behavior"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityProfileDescription": {
+                            "type": "string"
+                        },
+                        "SecurityProfileName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::SecurityProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.AlertTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "AlertTargetArn": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AlertTargetArn",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.Behavior": {
+            "additionalProperties": false,
+            "properties": {
+                "Criteria": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.BehaviorCriteria"
+                },
+                "Metric": {
+                    "type": "string"
+                },
+                "MetricDimension": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.MetricDimension"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SuppressAlerts": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.BehaviorCriteria": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "ConsecutiveDatapointsToAlarm": {
+                    "type": "number"
+                },
+                "ConsecutiveDatapointsToClear": {
+                    "type": "number"
+                },
+                "DurationSeconds": {
+                    "type": "number"
+                },
+                "MlDetectionConfig": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.MachineLearningDetectionConfig"
+                },
+                "StatisticalThreshold": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.StatisticalThreshold"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.MetricValue"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.MachineLearningDetectionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfidenceLevel": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionName": {
+                    "type": "string"
+                },
+                "Operator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DimensionName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.MetricToRetain": {
+            "additionalProperties": false,
+            "properties": {
+                "Metric": {
+                    "type": "string"
+                },
+                "MetricDimension": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.MetricDimension"
+                }
+            },
+            "required": [
+                "Metric"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.MetricValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidrs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Count": {
+                    "type": "string"
+                },
+                "Number": {
+                    "type": "number"
+                },
+                "Numbers": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Ports": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Strings": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.StatisticalThreshold": {
+            "additionalProperties": false,
+            "properties": {
+                "Statistic": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::Thing": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AttributePayload": {
+                            "$ref": "#/definitions/AWS::IoT::Thing.AttributePayload"
+                        },
+                        "ThingName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Thing"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::Thing.AttributePayload": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::ThingPrincipalAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Principal": {
+                            "type": "string"
+                        },
+                        "ThingName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Principal",
+                        "ThingName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::ThingPrincipalAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RuleName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TopicRulePayload": {
+                            "$ref": "#/definitions/AWS::IoT::TopicRule.TopicRulePayload"
+                        }
+                    },
+                    "required": [
+                        "TopicRulePayload"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::TopicRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudwatchAlarm": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.CloudwatchAlarmAction"
+                },
+                "CloudwatchLogs": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.CloudwatchLogsAction"
+                },
+                "CloudwatchMetric": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.CloudwatchMetricAction"
+                },
+                "DynamoDB": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.DynamoDBAction"
+                },
+                "DynamoDBv2": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.DynamoDBv2Action"
+                },
+                "Elasticsearch": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.ElasticsearchAction"
+                },
+                "Firehose": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.FirehoseAction"
+                },
+                "Http": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.HttpAction"
+                },
+                "IotAnalytics": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.IotAnalyticsAction"
+                },
+                "IotEvents": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.IotEventsAction"
+                },
+                "IotSiteWise": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.IotSiteWiseAction"
+                },
+                "Kafka": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.KafkaAction"
+                },
+                "Kinesis": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.KinesisAction"
+                },
+                "Lambda": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.LambdaAction"
+                },
+                "OpenSearch": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.OpenSearchAction"
+                },
+                "Republish": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.RepublishAction"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.S3Action"
+                },
+                "Sns": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.SnsAction"
+                },
+                "Sqs": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.SqsAction"
+                },
+                "StepFunctions": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.StepFunctionsAction"
+                },
+                "Timestream": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.TimestreamAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.AssetPropertyTimestamp": {
+            "additionalProperties": false,
+            "properties": {
+                "OffsetInNanos": {
+                    "type": "string"
+                },
+                "TimeInSeconds": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.AssetPropertyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Quality": {
+                    "type": "string"
+                },
+                "Timestamp": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.AssetPropertyTimestamp"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.AssetPropertyVariant"
+                }
+            },
+            "required": [
+                "Timestamp",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.AssetPropertyVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanValue": {
+                    "type": "string"
+                },
+                "DoubleValue": {
+                    "type": "string"
+                },
+                "IntegerValue": {
+                    "type": "string"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.CloudwatchAlarmAction": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StateReason": {
+                    "type": "string"
+                },
+                "StateValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AlarmName",
+                "RoleArn",
+                "StateReason",
+                "StateValue"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.CloudwatchLogsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogGroupName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.CloudwatchMetricAction": {
+            "additionalProperties": false,
+            "properties": {
+                "MetricName": {
+                    "type": "string"
+                },
+                "MetricNamespace": {
+                    "type": "string"
+                },
+                "MetricTimestamp": {
+                    "type": "string"
+                },
+                "MetricUnit": {
+                    "type": "string"
+                },
+                "MetricValue": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "MetricNamespace",
+                "MetricUnit",
+                "MetricValue",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.DynamoDBAction": {
+            "additionalProperties": false,
+            "properties": {
+                "HashKeyField": {
+                    "type": "string"
+                },
+                "HashKeyType": {
+                    "type": "string"
+                },
+                "HashKeyValue": {
+                    "type": "string"
+                },
+                "PayloadField": {
+                    "type": "string"
+                },
+                "RangeKeyField": {
+                    "type": "string"
+                },
+                "RangeKeyType": {
+                    "type": "string"
+                },
+                "RangeKeyValue": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HashKeyField",
+                "HashKeyValue",
+                "RoleArn",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.DynamoDBv2Action": {
+            "additionalProperties": false,
+            "properties": {
+                "PutItem": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.PutItemInput"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.ElasticsearchAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Index": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint",
+                "Id",
+                "Index",
+                "RoleArn",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.FirehoseAction": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchMode": {
+                    "type": "boolean"
+                },
+                "DeliveryStreamName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "Separator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStreamName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.HttpAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Auth": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.HttpAuthorization"
+                },
+                "ConfirmationUrl": {
+                    "type": "string"
+                },
+                "Headers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoT::TopicRule.HttpActionHeader"
+                    },
+                    "type": "array"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.HttpActionHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.HttpAuthorization": {
+            "additionalProperties": false,
+            "properties": {
+                "Sigv4": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.SigV4Authorization"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.IotAnalyticsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchMode": {
+                    "type": "boolean"
+                },
+                "ChannelName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ChannelName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.IotEventsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchMode": {
+                    "type": "boolean"
+                },
+                "InputName": {
+                    "type": "string"
+                },
+                "MessageId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.IotSiteWiseAction": {
+            "additionalProperties": false,
+            "properties": {
+                "PutAssetPropertyValueEntries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoT::TopicRule.PutAssetPropertyValueEntry"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PutAssetPropertyValueEntries",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.KafkaAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientProperties": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Partition": {
+                    "type": "string"
+                },
+                "Topic": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClientProperties",
+                "DestinationArn",
+                "Topic"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.KinesisAction": {
+            "additionalProperties": false,
+            "properties": {
+                "PartitionKey": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StreamName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "StreamName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.LambdaAction": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.OpenSearchAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Index": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint",
+                "Id",
+                "Index",
+                "RoleArn",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.PutAssetPropertyValueEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "AssetId": {
+                    "type": "string"
+                },
+                "EntryId": {
+                    "type": "string"
+                },
+                "PropertyAlias": {
+                    "type": "string"
+                },
+                "PropertyId": {
+                    "type": "string"
+                },
+                "PropertyValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoT::TopicRule.AssetPropertyValue"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "PropertyValues"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.PutItemInput": {
+            "additionalProperties": false,
+            "properties": {
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.RepublishAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Qos": {
+                    "type": "number"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "Topic": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "Topic"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.S3Action": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "CannedAcl": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName",
+                "Key",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.SigV4Authorization": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                },
+                "SigningRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "ServiceName",
+                "SigningRegion"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.SnsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "MessageFormat": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TargetArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "TargetArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.SqsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "QueueUrl": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "UseBase64": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "QueueUrl",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.StepFunctionsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionNamePrefix": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StateMachineName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "StateMachineName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.TimestreamAction": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchMode": {
+                    "type": "boolean"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoT::TopicRule.TimestreamDimension"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "Timestamp": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.TimestreamTimestamp"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "Dimensions",
+                "RoleArn",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.TimestreamDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.TimestreamTimestamp": {
+            "additionalProperties": false,
+            "properties": {
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Unit",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.TopicRulePayload": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoT::TopicRule.Action"
+                    },
+                    "type": "array"
+                },
+                "AwsIotSqlVersion": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "ErrorAction": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.Action"
+                },
+                "RuleDisabled": {
+                    "type": "boolean"
+                },
+                "Sql": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Sql"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRuleDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HttpUrlProperties": {
+                            "$ref": "#/definitions/AWS::IoT::TopicRuleDestination.HttpUrlDestinationSummary"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "VpcProperties": {
+                            "$ref": "#/definitions/AWS::IoT::TopicRuleDestination.VpcDestinationProperties"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::TopicRuleDestination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRuleDestination.HttpUrlDestinationSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfirmationUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRuleDestination.VpcDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ChannelName": {
+                            "type": "string"
+                        },
+                        "ChannelStorage": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Channel.ChannelStorage"
+                        },
+                        "RetentionPeriod": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Channel.RetentionPeriod"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTAnalytics::Channel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Channel.ChannelStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomerManagedS3": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Channel.CustomerManagedS3"
+                },
+                "ServiceManagedS3": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Channel.ServiceManagedS3"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Channel.CustomerManagedS3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "KeyPrefix": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Channel.RetentionPeriod": {
+            "additionalProperties": false,
+            "properties": {
+                "NumberOfDays": {
+                    "type": "number"
+                },
+                "Unlimited": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Channel.ServiceManagedS3": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                                "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.Action"
+                            },
+                            "type": "array"
+                        },
+                        "ContentDeliveryRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRule"
+                            },
+                            "type": "array"
+                        },
+                        "DatasetName": {
+                            "type": "string"
+                        },
+                        "LateDataRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.LateDataRule"
+                            },
+                            "type": "array"
+                        },
+                        "RetentionPeriod": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.RetentionPeriod"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Triggers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.Trigger"
+                            },
+                            "type": "array"
+                        },
+                        "VersioningConfiguration": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.VersioningConfiguration"
+                        }
+                    },
+                    "required": [
+                        "Actions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTAnalytics::Dataset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionName": {
+                    "type": "string"
+                },
+                "ContainerAction": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.ContainerAction"
+                },
+                "QueryAction": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.QueryAction"
+                }
+            },
+            "required": [
+                "ActionName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.ContainerAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRoleArn": {
+                    "type": "string"
+                },
+                "Image": {
+                    "type": "string"
+                },
+                "ResourceConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.ResourceConfiguration"
+                },
+                "Variables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.Variable"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ExecutionRoleArn",
+                "Image",
+                "ResourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRuleDestination"
+                },
+                "EntryName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRuleDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "IotEventsDestinationConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.IotEventsDestinationConfiguration"
+                },
+                "S3DestinationConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.S3DestinationConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.DatasetContentVersionValue": {
+            "additionalProperties": false,
+            "properties": {
+                "DatasetName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.DeltaTime": {
+            "additionalProperties": false,
+            "properties": {
+                "OffsetSeconds": {
+                    "type": "number"
+                },
+                "TimeExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OffsetSeconds",
+                "TimeExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.DeltaTimeSessionWindowConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "TimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TimeoutInMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.Filter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeltaTime": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.DeltaTime"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.GlueConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.IotEventsDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.LateDataRule": {
+            "additionalProperties": false,
+            "properties": {
+                "RuleConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.LateDataRuleConfiguration"
+                },
+                "RuleName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RuleConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.LateDataRuleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeltaTimeSessionWindowConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.DeltaTimeSessionWindowConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.OutputFileUriValue": {
+            "additionalProperties": false,
+            "properties": {
+                "FileName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.QueryAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Filters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.Filter"
+                    },
+                    "type": "array"
+                },
+                "SqlQuery": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SqlQuery"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.ResourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeType": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ComputeType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.RetentionPeriod": {
+            "additionalProperties": false,
+            "properties": {
+                "NumberOfDays": {
+                    "type": "number"
+                },
+                "Unlimited": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "NumberOfDays",
+                "Unlimited"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.S3DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "GlueConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.GlueConfiguration"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.Trigger": {
+            "additionalProperties": false,
+            "properties": {
+                "Schedule": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.Schedule"
+                },
+                "TriggeringDataset": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.TriggeringDataset"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.TriggeringDataset": {
+            "additionalProperties": false,
+            "properties": {
+                "DatasetName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatasetName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.Variable": {
+            "additionalProperties": false,
+            "properties": {
+                "DatasetContentVersionValue": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.DatasetContentVersionValue"
+                },
+                "DoubleValue": {
+                    "type": "number"
+                },
+                "OutputFileUriValue": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.OutputFileUriValue"
+                },
+                "StringValue": {
+                    "type": "string"
+                },
+                "VariableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VariableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.VersioningConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxVersions": {
+                    "type": "number"
+                },
+                "Unlimited": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DatastorePartitions": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.DatastorePartitions"
+                        },
+                        "DatastoreStorage": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.DatastoreStorage"
+                        },
+                        "FileFormatConfiguration": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.FileFormatConfiguration"
+                        },
+                        "RetentionPeriod": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.RetentionPeriod"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTAnalytics::Datastore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.Column": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.CustomerManagedS3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "KeyPrefix": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.CustomerManagedS3Storage": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "KeyPrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.DatastorePartition": {
+            "additionalProperties": false,
+            "properties": {
+                "Partition": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.Partition"
+                },
+                "TimestampPartition": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.TimestampPartition"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.DatastorePartitions": {
+            "additionalProperties": false,
+            "properties": {
+                "Partitions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.DatastorePartition"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.DatastoreStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomerManagedS3": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.CustomerManagedS3"
+                },
+                "IotSiteWiseMultiLayerStorage": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.IotSiteWiseMultiLayerStorage"
+                },
+                "ServiceManagedS3": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.ServiceManagedS3"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.FileFormatConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.JsonConfiguration"
+                },
+                "ParquetConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.ParquetConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.IotSiteWiseMultiLayerStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomerManagedS3Storage": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.CustomerManagedS3Storage"
+                }
+            },
+            "required": [
+                "CustomerManagedS3Storage"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.JsonConfiguration": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.ParquetConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SchemaDefinition": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.SchemaDefinition"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.Partition": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.RetentionPeriod": {
+            "additionalProperties": false,
+            "properties": {
+                "NumberOfDays": {
+                    "type": "number"
+                },
+                "Unlimited": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.SchemaDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.Column"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.ServiceManagedS3": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.TimestampPartition": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "TimestampFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PipelineActivities": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Activity"
+                            },
+                            "type": "array"
+                        },
+                        "PipelineName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PipelineActivities"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTAnalytics::Pipeline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Activity": {
+            "additionalProperties": false,
+            "properties": {
+                "AddAttributes": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.AddAttributes"
+                },
+                "Channel": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Channel"
+                },
+                "Datastore": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Datastore"
+                },
+                "DeviceRegistryEnrich": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.DeviceRegistryEnrich"
+                },
+                "DeviceShadowEnrich": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.DeviceShadowEnrich"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Filter"
+                },
+                "Lambda": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Lambda"
+                },
+                "Math": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Math"
+                },
+                "RemoveAttributes": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.RemoveAttributes"
+                },
+                "SelectAttributes": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.SelectAttributes"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.AddAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "type": "object"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Datastore": {
+            "additionalProperties": false,
+            "properties": {
+                "DatastoreName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.DeviceRegistryEnrich": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "ThingName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.DeviceShadowEnrich": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "ThingName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Filter": {
+            "additionalProperties": false,
+            "properties": {
+                "Filter": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Lambda": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchSize": {
+                    "type": "number"
+                },
+                "LambdaName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Math": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "Math": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.RemoveAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.SelectAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTCoreDeviceAdvisor::SuiteDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SuiteDefinitionConfiguration": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SuiteDefinitionConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTCoreDeviceAdvisor::SuiteDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DetectorModelDefinition": {
+                            "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.DetectorModelDefinition"
+                        },
+                        "DetectorModelDescription": {
+                            "type": "string"
+                        },
+                        "DetectorModelName": {
+                            "type": "string"
+                        },
+                        "EvaluationMethod": {
+                            "type": "string"
+                        },
+                        "Key": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DetectorModelDefinition",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTEvents::DetectorModel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "ClearTimer": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.ClearTimer"
+                },
+                "DynamoDB": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.DynamoDB"
+                },
+                "DynamoDBv2": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.DynamoDBv2"
+                },
+                "Firehose": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Firehose"
+                },
+                "IotEvents": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.IotEvents"
+                },
+                "IotSiteWise": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.IotSiteWise"
+                },
+                "IotTopicPublish": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.IotTopicPublish"
+                },
+                "Lambda": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Lambda"
+                },
+                "ResetTimer": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.ResetTimer"
+                },
+                "SetTimer": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.SetTimer"
+                },
+                "SetVariable": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.SetVariable"
+                },
+                "Sns": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Sns"
+                },
+                "Sqs": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Sqs"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.AssetPropertyTimestamp": {
+            "additionalProperties": false,
+            "properties": {
+                "OffsetInNanos": {
+                    "type": "string"
+                },
+                "TimeInSeconds": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.AssetPropertyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Quality": {
+                    "type": "string"
+                },
+                "Timestamp": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.AssetPropertyTimestamp"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.AssetPropertyVariant"
+                }
+            },
+            "required": [
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.AssetPropertyVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanValue": {
+                    "type": "string"
+                },
+                "DoubleValue": {
+                    "type": "string"
+                },
+                "IntegerValue": {
+                    "type": "string"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.ClearTimer": {
+            "additionalProperties": false,
+            "properties": {
+                "TimerName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TimerName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.DetectorModelDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "InitialStateName": {
+                    "type": "string"
+                },
+                "States": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.State"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "InitialStateName",
+                "States"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.DynamoDB": {
+            "additionalProperties": false,
+            "properties": {
+                "HashKeyField": {
+                    "type": "string"
+                },
+                "HashKeyType": {
+                    "type": "string"
+                },
+                "HashKeyValue": {
+                    "type": "string"
+                },
+                "Operation": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                },
+                "PayloadField": {
+                    "type": "string"
+                },
+                "RangeKeyField": {
+                    "type": "string"
+                },
+                "RangeKeyType": {
+                    "type": "string"
+                },
+                "RangeKeyValue": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HashKeyField",
+                "HashKeyValue",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.DynamoDBv2": {
+            "additionalProperties": false,
+            "properties": {
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Event": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Action"
+                    },
+                    "type": "array"
+                },
+                "Condition": {
+                    "type": "string"
+                },
+                "EventName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Firehose": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStreamName": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                },
+                "Separator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStreamName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.IotEvents": {
+            "additionalProperties": false,
+            "properties": {
+                "InputName": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                }
+            },
+            "required": [
+                "InputName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.IotSiteWise": {
+            "additionalProperties": false,
+            "properties": {
+                "AssetId": {
+                    "type": "string"
+                },
+                "EntryId": {
+                    "type": "string"
+                },
+                "PropertyAlias": {
+                    "type": "string"
+                },
+                "PropertyId": {
+                    "type": "string"
+                },
+                "PropertyValue": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.AssetPropertyValue"
+                }
+            },
+            "required": [
+                "PropertyValue"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.IotTopicPublish": {
+            "additionalProperties": false,
+            "properties": {
+                "MqttTopic": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                }
+            },
+            "required": [
+                "MqttTopic"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Lambda": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionArn": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                }
+            },
+            "required": [
+                "FunctionArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.OnEnter": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Event"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.OnExit": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Event"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.OnInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Event"
+                    },
+                    "type": "array"
+                },
+                "TransitionEvents": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.TransitionEvent"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Payload": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentExpression": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ContentExpression",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.ResetTimer": {
+            "additionalProperties": false,
+            "properties": {
+                "TimerName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TimerName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.SetTimer": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationExpression": {
+                    "type": "string"
+                },
+                "Seconds": {
+                    "type": "number"
+                },
+                "TimerName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TimerName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.SetVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                },
+                "VariableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Value",
+                "VariableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Sns": {
+            "additionalProperties": false,
+            "properties": {
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                },
+                "TargetArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TargetArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Sqs": {
+            "additionalProperties": false,
+            "properties": {
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                },
+                "QueueUrl": {
+                    "type": "string"
+                },
+                "UseBase64": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "QueueUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.State": {
+            "additionalProperties": false,
+            "properties": {
+                "OnEnter": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.OnEnter"
+                },
+                "OnExit": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.OnExit"
+                },
+                "OnInput": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.OnInput"
+                },
+                "StateName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StateName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.TransitionEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Action"
+                    },
+                    "type": "array"
+                },
+                "Condition": {
+                    "type": "string"
+                },
+                "EventName": {
+                    "type": "string"
+                },
+                "NextState": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Condition",
+                "EventName",
+                "NextState"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::Input": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InputDefinition": {
+                            "$ref": "#/definitions/AWS::IoTEvents::Input.InputDefinition"
+                        },
+                        "InputDescription": {
+                            "type": "string"
+                        },
+                        "InputName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InputDefinition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTEvents::Input"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::Input.Attribute": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "JsonPath"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::Input.InputDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::Input.Attribute"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Attributes"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTFleetHub::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationDescription": {
+                            "type": "string"
+                        },
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTFleetHub::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessPolicyIdentity": {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.AccessPolicyIdentity"
+                        },
+                        "AccessPolicyPermission": {
+                            "type": "string"
+                        },
+                        "AccessPolicyResource": {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.AccessPolicyResource"
+                        }
+                    },
+                    "required": [
+                        "AccessPolicyIdentity",
+                        "AccessPolicyPermission",
+                        "AccessPolicyResource"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::AccessPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.AccessPolicyIdentity": {
+            "additionalProperties": false,
+            "properties": {
+                "IamRole": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.IamRole"
+                },
+                "IamUser": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.IamUser"
+                },
+                "User": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.User"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.AccessPolicyResource": {
+            "additionalProperties": false,
+            "properties": {
+                "Portal": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.Portal"
+                },
+                "Project": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.Project"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.IamRole": {
+            "additionalProperties": false,
+            "properties": {
+                "arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.IamUser": {
+            "additionalProperties": false,
+            "properties": {
+                "arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.Portal": {
+            "additionalProperties": false,
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.Project": {
+            "additionalProperties": false,
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.User": {
+            "additionalProperties": false,
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Asset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssetHierarchies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::Asset.AssetHierarchy"
+                            },
+                            "type": "array"
+                        },
+                        "AssetModelId": {
+                            "type": "string"
+                        },
+                        "AssetName": {
+                            "type": "string"
+                        },
+                        "AssetProperties": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::Asset.AssetProperty"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AssetModelId",
+                        "AssetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::Asset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Asset.AssetHierarchy": {
+            "additionalProperties": false,
+            "properties": {
+                "ChildAssetId": {
+                    "type": "string"
+                },
+                "LogicalId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ChildAssetId",
+                "LogicalId"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Asset.AssetProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Alias": {
+                    "type": "string"
+                },
+                "LogicalId": {
+                    "type": "string"
+                },
+                "NotificationState": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogicalId"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssetModelCompositeModels": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.AssetModelCompositeModel"
+                            },
+                            "type": "array"
+                        },
+                        "AssetModelDescription": {
+                            "type": "string"
+                        },
+                        "AssetModelHierarchies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.AssetModelHierarchy"
+                            },
+                            "type": "array"
+                        },
+                        "AssetModelName": {
+                            "type": "string"
+                        },
+                        "AssetModelProperties": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.AssetModelProperty"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AssetModelName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::AssetModel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.AssetModelCompositeModel": {
+            "additionalProperties": false,
+            "properties": {
+                "CompositeModelProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.AssetModelProperty"
+                    },
+                    "type": "array"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.AssetModelHierarchy": {
+            "additionalProperties": false,
+            "properties": {
+                "ChildAssetModelId": {
+                    "type": "string"
+                },
+                "LogicalId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ChildAssetModelId",
+                "LogicalId",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.AssetModelProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "DataType": {
+                    "type": "string"
+                },
+                "DataTypeSpec": {
+                    "type": "string"
+                },
+                "LogicalId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.PropertyType"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataType",
+                "LogicalId",
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.Attribute": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.ExpressionVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.VariableValue"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.Metric": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Variables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.ExpressionVariable"
+                    },
+                    "type": "array"
+                },
+                "Window": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.MetricWindow"
+                }
+            },
+            "required": [
+                "Expression",
+                "Variables",
+                "Window"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.MetricWindow": {
+            "additionalProperties": false,
+            "properties": {
+                "Tumbling": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.TumblingWindow"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.PropertyType": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.Attribute"
+                },
+                "Metric": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.Metric"
+                },
+                "Transform": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.Transform"
+                },
+                "TypeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TypeName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.Transform": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Variables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.ExpressionVariable"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Expression",
+                "Variables"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.TumblingWindow": {
+            "additionalProperties": false,
+            "properties": {
+                "Interval": {
+                    "type": "string"
+                },
+                "Offset": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Interval"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.VariableValue": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLogicalId": {
+                    "type": "string"
+                },
+                "PropertyLogicalId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PropertyLogicalId"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Dashboard": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DashboardDefinition": {
+                            "type": "string"
+                        },
+                        "DashboardDescription": {
+                            "type": "string"
+                        },
+                        "DashboardName": {
+                            "type": "string"
+                        },
+                        "ProjectId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DashboardDefinition",
+                        "DashboardDescription",
+                        "DashboardName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::Dashboard"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Gateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GatewayCapabilitySummaries": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::Gateway.GatewayCapabilitySummary"
+                            },
+                            "type": "array"
+                        },
+                        "GatewayName": {
+                            "type": "string"
+                        },
+                        "GatewayPlatform": {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Gateway.GatewayPlatform"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "GatewayName",
+                        "GatewayPlatform"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::Gateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Gateway.GatewayCapabilitySummary": {
+            "additionalProperties": false,
+            "properties": {
+                "CapabilityConfiguration": {
+                    "type": "string"
+                },
+                "CapabilityNamespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CapabilityNamespace"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Gateway.GatewayPlatform": {
+            "additionalProperties": false,
+            "properties": {
+                "Greengrass": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::Gateway.Greengrass"
+                }
+            },
+            "required": [
+                "Greengrass"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Gateway.Greengrass": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Portal": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Alarms": {
+                            "type": "object"
+                        },
+                        "NotificationSenderEmail": {
+                            "type": "string"
+                        },
+                        "PortalAuthMode": {
+                            "type": "string"
+                        },
+                        "PortalContactEmail": {
+                            "type": "string"
+                        },
+                        "PortalDescription": {
+                            "type": "string"
+                        },
+                        "PortalName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PortalContactEmail",
+                        "PortalName",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::Portal"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PortalId": {
+                            "type": "string"
+                        },
+                        "ProjectDescription": {
+                            "type": "string"
+                        },
+                        "ProjectName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PortalId",
+                        "ProjectName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTThingsGraph::FlowTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CompatibleNamespaceVersion": {
+                            "type": "number"
+                        },
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::IoTThingsGraph::FlowTemplate.DefinitionDocument"
+                        }
+                    },
+                    "required": [
+                        "Definition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTThingsGraph::FlowTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTThingsGraph::FlowTemplate.DefinitionDocument": {
+            "additionalProperties": false,
+            "properties": {
+                "Language": {
+                    "type": "string"
+                },
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Language",
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Expression": {
+                            "type": "string"
+                        },
+                        "ExpressionType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Expression",
+                        "ExpressionType",
+                        "Name",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::Destination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::DeviceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::DeviceProfile.LoRaWANDeviceProfile"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::DeviceProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::DeviceProfile.LoRaWANDeviceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "ClassBTimeout": {
+                    "type": "number"
+                },
+                "ClassCTimeout": {
+                    "type": "number"
+                },
+                "MacVersion": {
+                    "type": "string"
+                },
+                "MaxDutyCycle": {
+                    "type": "number"
+                },
+                "MaxEirp": {
+                    "type": "number"
+                },
+                "PingSlotDr": {
+                    "type": "number"
+                },
+                "PingSlotFreq": {
+                    "type": "number"
+                },
+                "PingSlotPeriod": {
+                    "type": "number"
+                },
+                "RegParamsRevision": {
+                    "type": "string"
+                },
+                "RfRegion": {
+                    "type": "string"
+                },
+                "Supports32BitFCnt": {
+                    "type": "boolean"
+                },
+                "SupportsClassB": {
+                    "type": "boolean"
+                },
+                "SupportsClassC": {
+                    "type": "boolean"
+                },
+                "SupportsJoin": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::FuotaTask": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociateMulticastGroup": {
+                            "type": "string"
+                        },
+                        "AssociateWirelessDevice": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisassociateMulticastGroup": {
+                            "type": "string"
+                        },
+                        "DisassociateWirelessDevice": {
+                            "type": "string"
+                        },
+                        "FirmwareUpdateImage": {
+                            "type": "string"
+                        },
+                        "FirmwareUpdateRole": {
+                            "type": "string"
+                        },
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::FuotaTask.LoRaWAN"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FirmwareUpdateImage",
+                        "FirmwareUpdateRole",
+                        "LoRaWAN"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::FuotaTask"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::FuotaTask.LoRaWAN": {
+            "additionalProperties": false,
+            "properties": {
+                "RfRegion": {
+                    "type": "string"
+                },
+                "StartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RfRegion"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::MulticastGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociateWirelessDevice": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisassociateWirelessDevice": {
+                            "type": "string"
+                        },
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::MulticastGroup.LoRaWAN"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "LoRaWAN"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::MulticastGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::MulticastGroup.LoRaWAN": {
+            "additionalProperties": false,
+            "properties": {
+                "DlClass": {
+                    "type": "string"
+                },
+                "NumberOfDevicesInGroup": {
+                    "type": "number"
+                },
+                "NumberOfDevicesRequested": {
+                    "type": "number"
+                },
+                "RfRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DlClass",
+                "RfRegion"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::PartnerAccount": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountLinked": {
+                            "type": "boolean"
+                        },
+                        "Fingerprint": {
+                            "type": "string"
+                        },
+                        "PartnerAccountId": {
+                            "type": "string"
+                        },
+                        "PartnerType": {
+                            "type": "string"
+                        },
+                        "Sidewalk": {
+                            "$ref": "#/definitions/AWS::IoTWireless::PartnerAccount.SidewalkAccountInfo"
+                        },
+                        "SidewalkUpdate": {
+                            "$ref": "#/definitions/AWS::IoTWireless::PartnerAccount.SidewalkUpdateAccount"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::PartnerAccount"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::PartnerAccount.SidewalkAccountInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "AppServerPrivateKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AppServerPrivateKey"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::PartnerAccount.SidewalkUpdateAccount": {
+            "additionalProperties": false,
+            "properties": {
+                "AppServerPrivateKey": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::ServiceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::ServiceProfile.LoRaWANServiceProfile"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::ServiceProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::ServiceProfile.LoRaWANServiceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "AddGwMetadata": {
+                    "type": "boolean"
+                },
+                "ChannelMask": {
+                    "type": "string"
+                },
+                "DevStatusReqFreq": {
+                    "type": "number"
+                },
+                "DlBucketSize": {
+                    "type": "number"
+                },
+                "DlRate": {
+                    "type": "number"
+                },
+                "DlRatePolicy": {
+                    "type": "string"
+                },
+                "DrMax": {
+                    "type": "number"
+                },
+                "DrMin": {
+                    "type": "number"
+                },
+                "HrAllowed": {
+                    "type": "boolean"
+                },
+                "MinGwDiversity": {
+                    "type": "number"
+                },
+                "NwkGeoLoc": {
+                    "type": "boolean"
+                },
+                "PrAllowed": {
+                    "type": "boolean"
+                },
+                "RaAllowed": {
+                    "type": "boolean"
+                },
+                "ReportDevStatusBattery": {
+                    "type": "boolean"
+                },
+                "ReportDevStatusMargin": {
+                    "type": "boolean"
+                },
+                "TargetPer": {
+                    "type": "number"
+                },
+                "UlBucketSize": {
+                    "type": "number"
+                },
+                "UlRate": {
+                    "type": "number"
+                },
+                "UlRatePolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::TaskDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoCreateTasks": {
+                            "type": "boolean"
+                        },
+                        "LoRaWANUpdateGatewayTaskEntry": {
+                            "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskEntry"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TaskDefinitionType": {
+                            "type": "string"
+                        },
+                        "Update": {
+                            "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.UpdateWirelessGatewayTaskCreate"
+                        }
+                    },
+                    "required": [
+                        "AutoCreateTasks"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::TaskDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Model": {
+                    "type": "string"
+                },
+                "PackageVersion": {
+                    "type": "string"
+                },
+                "Station": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskCreate": {
+            "additionalProperties": false,
+            "properties": {
+                "CurrentVersion": {
+                    "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion"
+                },
+                "SigKeyCrc": {
+                    "type": "number"
+                },
+                "UpdateSignature": {
+                    "type": "string"
+                },
+                "UpdateVersion": {
+                    "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "CurrentVersion": {
+                    "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion"
+                },
+                "UpdateVersion": {
+                    "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::TaskDefinition.UpdateWirelessGatewayTaskCreate": {
+            "additionalProperties": false,
+            "properties": {
+                "LoRaWAN": {
+                    "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskCreate"
+                },
+                "UpdateDataRole": {
+                    "type": "string"
+                },
+                "UpdateDataSource": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DestinationName": {
+                            "type": "string"
+                        },
+                        "LastUplinkReceivedAt": {
+                            "type": "string"
+                        },
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.LoRaWANDevice"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThingArn": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::WirelessDevice"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.AbpV10x": {
+            "additionalProperties": false,
+            "properties": {
+                "DevAddr": {
+                    "type": "string"
+                },
+                "SessionKeys": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.SessionKeysAbpV10x"
+                }
+            },
+            "required": [
+                "DevAddr",
+                "SessionKeys"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.AbpV11": {
+            "additionalProperties": false,
+            "properties": {
+                "DevAddr": {
+                    "type": "string"
+                },
+                "SessionKeys": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.SessionKeysAbpV11"
+                }
+            },
+            "required": [
+                "DevAddr",
+                "SessionKeys"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.LoRaWANDevice": {
+            "additionalProperties": false,
+            "properties": {
+                "AbpV10x": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.AbpV10x"
+                },
+                "AbpV11": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.AbpV11"
+                },
+                "DevEui": {
+                    "type": "string"
+                },
+                "DeviceProfileId": {
+                    "type": "string"
+                },
+                "OtaaV10x": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.OtaaV10x"
+                },
+                "OtaaV11": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.OtaaV11"
+                },
+                "ServiceProfileId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.OtaaV10x": {
+            "additionalProperties": false,
+            "properties": {
+                "AppEui": {
+                    "type": "string"
+                },
+                "AppKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AppEui",
+                "AppKey"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.OtaaV11": {
+            "additionalProperties": false,
+            "properties": {
+                "AppKey": {
+                    "type": "string"
+                },
+                "JoinEui": {
+                    "type": "string"
+                },
+                "NwkKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AppKey",
+                "JoinEui",
+                "NwkKey"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.SessionKeysAbpV10x": {
+            "additionalProperties": false,
+            "properties": {
+                "AppSKey": {
+                    "type": "string"
+                },
+                "NwkSKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AppSKey",
+                "NwkSKey"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.SessionKeysAbpV11": {
+            "additionalProperties": false,
+            "properties": {
+                "AppSKey": {
+                    "type": "string"
+                },
+                "FNwkSIntKey": {
+                    "type": "string"
+                },
+                "NwkSEncKey": {
+                    "type": "string"
+                },
+                "SNwkSIntKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AppSKey",
+                "FNwkSIntKey",
+                "NwkSEncKey",
+                "SNwkSIntKey"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "LastUplinkReceivedAt": {
+                            "type": "string"
+                        },
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::WirelessGateway.LoRaWANGateway"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThingArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LoRaWAN"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::WirelessGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessGateway.LoRaWANGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "GatewayEui": {
+                    "type": "string"
+                },
+                "RfRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GatewayEui",
+                "RfRegion"
+            ],
+            "type": "object"
+        },
+        "AWS::KMS::Alias": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AliasName": {
+                            "type": "string"
+                        },
+                        "TargetKeyId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AliasName",
+                        "TargetKeyId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KMS::Alias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KMS::Key": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EnableKeyRotation": {
+                            "type": "boolean"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "KeyPolicy": {
+                            "type": "object"
+                        },
+                        "KeySpec": {
+                            "type": "string"
+                        },
+                        "KeyUsage": {
+                            "type": "string"
+                        },
+                        "MultiRegion": {
+                            "type": "boolean"
+                        },
+                        "PendingWindowInDays": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "KeyPolicy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KMS::Key"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KMS::ReplicaKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "KeyPolicy": {
+                            "type": "object"
+                        },
+                        "PendingWindowInDays": {
+                            "type": "number"
+                        },
+                        "PrimaryKeyArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "KeyPolicy",
+                        "PrimaryKeyArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KMS::ReplicaKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::Kendra::DataSource.DataSourceConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IndexId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "IndexId",
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kendra::DataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.AccessControlListConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyPath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.AclConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedGroupsColumnName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AllowedGroupsColumnName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ColumnConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChangeDetectingColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DocumentDataColumnName": {
+                    "type": "string"
+                },
+                "DocumentIdColumnName": {
+                    "type": "string"
+                },
+                "DocumentTitleColumnName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ChangeDetectingColumns",
+                "DocumentDataColumnName",
+                "DocumentIdColumnName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceAttachmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentFieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceAttachmentToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "CrawlAttachments": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceAttachmentToIndexFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceFieldName": {
+                    "type": "string"
+                },
+                "DateFieldFormat": {
+                    "type": "string"
+                },
+                "IndexFieldName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceFieldName",
+                "IndexFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceBlogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BlogFieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceBlogToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceBlogToIndexFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceFieldName": {
+                    "type": "string"
+                },
+                "DateFieldFormat": {
+                    "type": "string"
+                },
+                "IndexFieldName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceFieldName",
+                "IndexFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceAttachmentConfiguration"
+                },
+                "BlogConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceBlogConfiguration"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PageConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluencePageConfiguration"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "ServerUrl": {
+                    "type": "string"
+                },
+                "SpaceConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceSpaceConfiguration"
+                },
+                "Version": {
+                    "type": "string"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceVpcConfiguration"
+                }
+            },
+            "required": [
+                "SecretArn",
+                "ServerUrl",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluencePageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "PageFieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluencePageToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluencePageToIndexFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceFieldName": {
+                    "type": "string"
+                },
+                "DateFieldFormat": {
+                    "type": "string"
+                },
+                "IndexFieldName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceFieldName",
+                "IndexFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceSpaceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlArchivedSpaces": {
+                    "type": "boolean"
+                },
+                "CrawlPersonalSpaces": {
+                    "type": "boolean"
+                },
+                "ExcludeSpaces": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "IncludeSpaces": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SpaceFieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceSpaceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceSpaceToIndexFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceFieldName": {
+                    "type": "string"
+                },
+                "DateFieldFormat": {
+                    "type": "string"
+                },
+                "IndexFieldName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceFieldName",
+                "IndexFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseHost": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DatabasePort": {
+                    "type": "number"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseHost",
+                "DatabaseName",
+                "DatabasePort",
+                "SecretArn",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.DataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfluenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceConfiguration"
+                },
+                "DatabaseConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.DatabaseConfiguration"
+                },
+                "GoogleDriveConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.GoogleDriveConfiguration"
+                },
+                "OneDriveConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.OneDriveConfiguration"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.S3DataSourceConfiguration"
+                },
+                "SalesforceConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceConfiguration"
+                },
+                "ServiceNowConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ServiceNowConfiguration"
+                },
+                "SharePointConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SharePointConfiguration"
+                },
+                "WebCrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerConfiguration"
+                },
+                "WorkDocsConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WorkDocsConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.DataSourceToIndexFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceFieldName": {
+                    "type": "string"
+                },
+                "DateFieldFormat": {
+                    "type": "string"
+                },
+                "IndexFieldName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceFieldName",
+                "IndexFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.DataSourceVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.DatabaseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AclConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.AclConfiguration"
+                },
+                "ColumnConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ColumnConfiguration"
+                },
+                "ConnectionConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConnectionConfiguration"
+                },
+                "DatabaseEngineType": {
+                    "type": "string"
+                },
+                "SqlConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SqlConfiguration"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceVpcConfiguration"
+                }
+            },
+            "required": [
+                "ColumnConfiguration",
+                "ConnectionConfiguration",
+                "DatabaseEngineType"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.DocumentsMetadataConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Prefix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.GoogleDriveConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludeMimeTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExcludeSharedDrives": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExcludeUserAccounts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.OneDriveConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DisableLocalGroups": {
+                    "type": "boolean"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OneDriveUsers": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.OneDriveUsers"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "TenantDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OneDriveUsers",
+                "SecretArn",
+                "TenantDomain"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.OneDriveUsers": {
+            "additionalProperties": false,
+            "properties": {
+                "OneDriveUserList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OneDriveUserS3Path": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.S3Path"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ProxyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Credentials": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.S3DataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessControlListConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.AccessControlListConfiguration"
+                },
+                "BucketName": {
+                    "type": "string"
+                },
+                "DocumentsMetadataConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.DocumentsMetadataConfiguration"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InclusionPrefixes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.S3Path": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceChatterFeedConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "IncludeFilterTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChatterFeedConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceChatterFeedConfiguration"
+                },
+                "CrawlAttachments": {
+                    "type": "boolean"
+                },
+                "ExcludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "IncludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "KnowledgeArticleConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceKnowledgeArticleConfiguration"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "ServerUrl": {
+                    "type": "string"
+                },
+                "StandardObjectAttachmentConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceStandardObjectAttachmentConfiguration"
+                },
+                "StandardObjectConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceStandardObjectConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecretArn",
+                "ServerUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceCustomKnowledgeArticleTypeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceKnowledgeArticleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomKnowledgeArticleTypeConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceCustomKnowledgeArticleTypeConfiguration"
+                    },
+                    "type": "array"
+                },
+                "IncludedStates": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StandardKnowledgeArticleTypeConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceStandardKnowledgeArticleTypeConfiguration"
+                }
+            },
+            "required": [
+                "IncludedStates"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceStandardKnowledgeArticleTypeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceStandardObjectAttachmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceStandardObjectConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ServiceNowConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationType": {
+                    "type": "string"
+                },
+                "HostUrl": {
+                    "type": "string"
+                },
+                "KnowledgeArticleConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ServiceNowKnowledgeArticleConfiguration"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "ServiceCatalogConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ServiceNowServiceCatalogConfiguration"
+                },
+                "ServiceNowBuildVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HostUrl",
+                "SecretArn",
+                "ServiceNowBuildVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ServiceNowKnowledgeArticleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlAttachments": {
+                    "type": "boolean"
+                },
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "ExcludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "FilterQuery": {
+                    "type": "string"
+                },
+                "IncludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ServiceNowServiceCatalogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlAttachments": {
+                    "type": "boolean"
+                },
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "ExcludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "IncludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SharePointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlAttachments": {
+                    "type": "boolean"
+                },
+                "DisableLocalGroups": {
+                    "type": "boolean"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "SharePointVersion": {
+                    "type": "string"
+                },
+                "SslCertificateS3Path": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.S3Path"
+                },
+                "Urls": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "UseChangeLog": {
+                    "type": "boolean"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceVpcConfiguration"
+                }
+            },
+            "required": [
+                "SecretArn",
+                "SharePointVersion",
+                "Urls"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SqlConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryIdentifiersEnclosingOption": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerAuthenticationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BasicAuthentication": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerBasicAuthentication"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerBasicAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "Credentials": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Credentials",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerAuthenticationConfiguration"
+                },
+                "CrawlDepth": {
+                    "type": "number"
+                },
+                "MaxContentSizePerPageInMegaBytes": {
+                    "type": "number"
+                },
+                "MaxLinksPerPage": {
+                    "type": "number"
+                },
+                "MaxUrlsPerMinuteCrawlRate": {
+                    "type": "number"
+                },
+                "ProxyConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ProxyConfiguration"
+                },
+                "UrlExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "UrlInclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Urls": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerUrls"
+                }
+            },
+            "required": [
+                "Urls"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerSeedUrlConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SeedUrls": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "WebCrawlerMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SeedUrls"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerSiteMapsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SiteMaps": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SiteMaps"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerUrls": {
+            "additionalProperties": false,
+            "properties": {
+                "SeedUrlConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerSeedUrlConfiguration"
+                },
+                "SiteMapsConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerSiteMapsConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WorkDocsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlComments": {
+                    "type": "boolean"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OrganizationId": {
+                    "type": "string"
+                },
+                "UseChangeLog": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "OrganizationId"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Faq": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "FileFormat": {
+                            "type": "string"
+                        },
+                        "IndexId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "S3Path": {
+                            "$ref": "#/definitions/AWS::Kendra::Faq.S3Path"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "IndexId",
+                        "Name",
+                        "RoleArn",
+                        "S3Path"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kendra::Faq"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Faq.S3Path": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CapacityUnits": {
+                            "$ref": "#/definitions/AWS::Kendra::Index.CapacityUnitsConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DocumentMetadataConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Kendra::Index.DocumentMetadataConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "Edition": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "ServerSideEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Kendra::Index.ServerSideEncryptionConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserContextPolicy": {
+                            "type": "string"
+                        },
+                        "UserTokenConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Kendra::Index.UserTokenConfiguration"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Edition",
+                        "Name",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kendra::Index"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index.CapacityUnitsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryCapacityUnits": {
+                    "type": "number"
+                },
+                "StorageCapacityUnits": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "QueryCapacityUnits",
+                "StorageCapacityUnits"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index.DocumentMetadataConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Relevance": {
+                    "$ref": "#/definitions/AWS::Kendra::Index.Relevance"
+                },
+                "Search": {
+                    "$ref": "#/definitions/AWS::Kendra::Index.Search"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index.JsonTokenTypeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupAttributeField": {
+                    "type": "string"
+                },
+                "UserNameAttributeField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupAttributeField",
+                "UserNameAttributeField"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index.JwtTokenTypeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClaimRegex": {
+                    "type": "string"
+                },
+                "GroupAttributeField": {
+                    "type": "string"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "KeyLocation": {
+                    "type": "string"
+                },
+                "SecretManagerArn": {
+                    "type": "string"
+                },
+                "URL": {
+                    "type": "string"
+                },
+                "UserNameAttributeField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KeyLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index.Relevance": {
+            "additionalProperties": false,
+            "properties": {
+                "Duration": {
+                    "type": "string"
+                },
+                "Freshness": {
+                    "type": "boolean"
+                },
+                "Importance": {
+                    "type": "number"
+                },
+                "RankOrder": {
+                    "type": "string"
+                },
+                "ValueImportanceItems": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::Index.ValueImportanceItem"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::Index.Search": {
+            "additionalProperties": false,
+            "properties": {
+                "Displayable": {
+                    "type": "boolean"
+                },
+                "Facetable": {
+                    "type": "boolean"
+                },
+                "Searchable": {
+                    "type": "boolean"
+                },
+                "Sortable": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::Index.ServerSideEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::Index.UserTokenConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonTokenTypeConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::Index.JsonTokenTypeConfiguration"
+                },
+                "JwtTokenTypeConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::Index.JwtTokenTypeConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::Index.ValueImportanceItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kinesis::Stream": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RetentionPeriodHours": {
+                            "type": "number"
+                        },
+                        "ShardCount": {
+                            "type": "number"
+                        },
+                        "StreamEncryption": {
+                            "$ref": "#/definitions/AWS::Kinesis::Stream.StreamEncryption"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ShardCount"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kinesis::Stream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Kinesis::Stream.StreamEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionType": {
+                    "type": "string"
+                },
+                "KeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionType",
+                "KeyId"
+            ],
+            "type": "object"
+        },
+        "AWS::Kinesis::StreamConsumer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConsumerName": {
+                            "type": "string"
+                        },
+                        "StreamARN": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConsumerName",
+                        "StreamARN"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kinesis::StreamConsumer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationCode": {
+                            "type": "string"
+                        },
+                        "ApplicationDescription": {
+                            "type": "string"
+                        },
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Inputs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::KinesisAnalytics::Application.Input"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Inputs"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalytics::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.CSVMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumnDelimiter": {
+                    "type": "string"
+                },
+                "RecordRowDelimiter": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordColumnDelimiter",
+                "RecordRowDelimiter"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.Input": {
+            "additionalProperties": false,
+            "properties": {
+                "InputParallelism": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.InputParallelism"
+                },
+                "InputProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.InputProcessingConfiguration"
+                },
+                "InputSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.InputSchema"
+                },
+                "KinesisFirehoseInput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.KinesisFirehoseInput"
+                },
+                "KinesisStreamsInput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.KinesisStreamsInput"
+                },
+                "NamePrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputSchema",
+                "NamePrefix"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.InputLambdaProcessor": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.InputParallelism": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.InputProcessingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputLambdaProcessor": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.InputLambdaProcessor"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.InputSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalytics::Application.RecordColumn"
+                    },
+                    "type": "array"
+                },
+                "RecordEncoding": {
+                    "type": "string"
+                },
+                "RecordFormat": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.RecordFormat"
+                }
+            },
+            "required": [
+                "RecordColumns",
+                "RecordFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.JSONMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordRowPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordRowPath"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.KinesisFirehoseInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.KinesisStreamsInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.MappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CSVMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.CSVMappingParameters"
+                },
+                "JSONMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.JSONMappingParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.RecordColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Mapping": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SqlType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "SqlType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.RecordFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "MappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.MappingParameters"
+                },
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordFormatType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Output": {
+                            "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput.Output"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "Output"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalytics::ApplicationOutput"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput.DestinationSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput.KinesisFirehoseOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput.KinesisStreamsOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput.LambdaOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput.DestinationSchema"
+                },
+                "KinesisFirehoseOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput.KinesisFirehoseOutput"
+                },
+                "KinesisStreamsOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput.KinesisStreamsOutput"
+                },
+                "LambdaOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput.LambdaOutput"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationSchema"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "ReferenceDataSource": {
+                            "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceDataSource"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "ReferenceDataSource"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalytics::ApplicationReferenceDataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.CSVMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumnDelimiter": {
+                    "type": "string"
+                },
+                "RecordRowDelimiter": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordColumnDelimiter",
+                "RecordRowDelimiter"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.JSONMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordRowPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordRowPath"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.MappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CSVMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.CSVMappingParameters"
+                },
+                "JSONMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.JSONMappingParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Mapping": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SqlType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "SqlType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "MappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.MappingParameters"
+                },
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordFormatType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ReferenceSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceSchema"
+                },
+                "S3ReferenceDataSource": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.S3ReferenceDataSource"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ReferenceSchema"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordColumn"
+                    },
+                    "type": "array"
+                },
+                "RecordEncoding": {
+                    "type": "string"
+                },
+                "RecordFormat": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordFormat"
+                }
+            },
+            "required": [
+                "RecordColumns",
+                "RecordFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.S3ReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketARN": {
+                    "type": "string"
+                },
+                "FileKey": {
+                    "type": "string"
+                },
+                "ReferenceRoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketARN",
+                "FileKey",
+                "ReferenceRoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationConfiguration"
+                        },
+                        "ApplicationDescription": {
+                            "type": "string"
+                        },
+                        "ApplicationMode": {
+                            "type": "string"
+                        },
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "RuntimeEnvironment": {
+                            "type": "string"
+                        },
+                        "ServiceExecutionRole": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RuntimeEnvironment",
+                        "ServiceExecutionRole"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalyticsV2::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ApplicationCodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CodeContent": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.CodeContent"
+                },
+                "CodeContentType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CodeContent",
+                "CodeContentType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ApplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationCodeConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationCodeConfiguration"
+                },
+                "ApplicationSnapshotConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationSnapshotConfiguration"
+                },
+                "EnvironmentProperties": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.EnvironmentProperties"
+                },
+                "FlinkApplicationConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.FlinkApplicationConfiguration"
+                },
+                "SqlApplicationConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.SqlApplicationConfiguration"
+                },
+                "ZeppelinApplicationConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ZeppelinApplicationConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ApplicationSnapshotConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SnapshotsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "SnapshotsEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CSVMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumnDelimiter": {
+                    "type": "string"
+                },
+                "RecordRowDelimiter": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordColumnDelimiter",
+                "RecordRowDelimiter"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CatalogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GlueDataCatalogConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.GlueDataCatalogConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CheckpointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CheckpointInterval": {
+                    "type": "number"
+                },
+                "CheckpointingEnabled": {
+                    "type": "boolean"
+                },
+                "ConfigurationType": {
+                    "type": "string"
+                },
+                "MinPauseBetweenCheckpoints": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ConfigurationType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CodeContent": {
+            "additionalProperties": false,
+            "properties": {
+                "S3ContentLocation": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.S3ContentLocation"
+                },
+                "TextContent": {
+                    "type": "string"
+                },
+                "ZipFileContent": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CustomArtifactConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ArtifactType": {
+                    "type": "string"
+                },
+                "MavenReference": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.MavenReference"
+                },
+                "S3ContentLocation": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.S3ContentLocation"
+                }
+            },
+            "required": [
+                "ArtifactType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CustomArtifactsConfiguration": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.DeployAsApplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3ContentLocation": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.S3ContentBaseLocation"
+                }
+            },
+            "required": [
+                "S3ContentLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.EnvironmentProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "PropertyGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.PropertyGroup"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.FlinkApplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CheckpointConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.CheckpointConfiguration"
+                },
+                "MonitoringConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.MonitoringConfiguration"
+                },
+                "ParallelismConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ParallelismConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.GlueDataCatalogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseARN": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.Input": {
+            "additionalProperties": false,
+            "properties": {
+                "InputParallelism": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.InputParallelism"
+                },
+                "InputProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.InputProcessingConfiguration"
+                },
+                "InputSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.InputSchema"
+                },
+                "KinesisFirehoseInput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.KinesisFirehoseInput"
+                },
+                "KinesisStreamsInput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.KinesisStreamsInput"
+                },
+                "NamePrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputSchema",
+                "NamePrefix"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.InputLambdaProcessor": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.InputParallelism": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.InputProcessingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputLambdaProcessor": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.InputLambdaProcessor"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.InputSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.RecordColumn"
+                    },
+                    "type": "array"
+                },
+                "RecordEncoding": {
+                    "type": "string"
+                },
+                "RecordFormat": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.RecordFormat"
+                }
+            },
+            "required": [
+                "RecordColumns",
+                "RecordFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.JSONMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordRowPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordRowPath"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.KinesisFirehoseInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.KinesisStreamsInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.MappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CSVMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.CSVMappingParameters"
+                },
+                "JSONMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.JSONMappingParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.MavenReference": {
+            "additionalProperties": false,
+            "properties": {
+                "ArtifactId": {
+                    "type": "string"
+                },
+                "GroupId": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ArtifactId",
+                "GroupId",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.MonitoringConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfigurationType": {
+                    "type": "string"
+                },
+                "LogLevel": {
+                    "type": "string"
+                },
+                "MetricsLevel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConfigurationType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ParallelismConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoScalingEnabled": {
+                    "type": "boolean"
+                },
+                "ConfigurationType": {
+                    "type": "string"
+                },
+                "Parallelism": {
+                    "type": "number"
+                },
+                "ParallelismPerKPU": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ConfigurationType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.PropertyGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "PropertyGroupId": {
+                    "type": "string"
+                },
+                "PropertyMap": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.RecordColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Mapping": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SqlType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "SqlType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.RecordFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "MappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.MappingParameters"
+                },
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordFormatType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.S3ContentBaseLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "BasePath": {
+                    "type": "string"
+                },
+                "BucketARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BasePath",
+                "BucketARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.S3ContentLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketARN": {
+                    "type": "string"
+                },
+                "FileKey": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.SqlApplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Inputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.Input"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ZeppelinApplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.CatalogConfiguration"
+                },
+                "CustomArtifactsConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.CustomArtifactsConfiguration"
+                },
+                "DeployAsApplicationConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.DeployAsApplicationConfiguration"
+                },
+                "MonitoringConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ZeppelinMonitoringConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ZeppelinMonitoringConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogLevel": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "CloudWatchLoggingOption": {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption.CloudWatchLoggingOption"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "CloudWatchLoggingOption"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption.CloudWatchLoggingOption": {
+            "additionalProperties": false,
+            "properties": {
+                "LogStreamARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogStreamARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Output": {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput.Output"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "Output"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalyticsV2::ApplicationOutput"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput.DestinationSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisFirehoseOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisStreamsOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput.LambdaOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput.DestinationSchema"
+                },
+                "KinesisFirehoseOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisFirehoseOutput"
+                },
+                "KinesisStreamsOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisStreamsOutput"
+                },
+                "LambdaOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput.LambdaOutput"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationSchema"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "ReferenceDataSource": {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceDataSource"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "ReferenceDataSource"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.CSVMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumnDelimiter": {
+                    "type": "string"
+                },
+                "RecordRowDelimiter": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordColumnDelimiter",
+                "RecordRowDelimiter"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.JSONMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordRowPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordRowPath"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.MappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CSVMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.CSVMappingParameters"
+                },
+                "JSONMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.JSONMappingParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Mapping": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SqlType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "SqlType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "MappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.MappingParameters"
+                },
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordFormatType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ReferenceSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceSchema"
+                },
+                "S3ReferenceDataSource": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.S3ReferenceDataSource"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ReferenceSchema"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordColumn"
+                    },
+                    "type": "array"
+                },
+                "RecordEncoding": {
+                    "type": "string"
+                },
+                "RecordFormat": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordFormat"
+                }
+            },
+            "required": [
+                "RecordColumns",
+                "RecordFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.S3ReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketARN": {
+                    "type": "string"
+                },
+                "FileKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketARN",
+                "FileKey"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AmazonopensearchserviceDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceDestinationConfiguration"
+                        },
+                        "DeliveryStreamEncryptionConfigurationInput": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.DeliveryStreamEncryptionConfigurationInput"
+                        },
+                        "DeliveryStreamName": {
+                            "type": "string"
+                        },
+                        "DeliveryStreamType": {
+                            "type": "string"
+                        },
+                        "ElasticsearchDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ElasticsearchDestinationConfiguration"
+                        },
+                        "ExtendedS3DestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ExtendedS3DestinationConfiguration"
+                        },
+                        "HttpEndpointDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointDestinationConfiguration"
+                        },
+                        "KinesisStreamSourceConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.KinesisStreamSourceConfiguration"
+                        },
+                        "RedshiftDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RedshiftDestinationConfiguration"
+                        },
+                        "S3DestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                        },
+                        "SplunkDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SplunkDestinationConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisFirehose::DeliveryStream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceBufferingHints": {
+            "additionalProperties": false,
+            "properties": {
+                "IntervalInSeconds": {
+                    "type": "number"
+                },
+                "SizeInMBs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceBufferingHints"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "ClusterEndpoint": {
+                    "type": "string"
+                },
+                "DomainARN": {
+                    "type": "string"
+                },
+                "IndexName": {
+                    "type": "string"
+                },
+                "IndexRotationPeriod": {
+                    "type": "string"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceRetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "TypeName": {
+                    "type": "string"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.VpcConfiguration"
+                }
+            },
+            "required": [
+                "IndexName",
+                "RoleARN",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceRetryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.BufferingHints": {
+            "additionalProperties": false,
+            "properties": {
+                "IntervalInSeconds": {
+                    "type": "number"
+                },
+                "SizeInMBs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "LogStreamName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.CopyCommand": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyOptions": {
+                    "type": "string"
+                },
+                "DataTableColumns": {
+                    "type": "string"
+                },
+                "DataTableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataTableName"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.DataFormatConversionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "InputFormatConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.InputFormatConfiguration"
+                },
+                "OutputFormatConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.OutputFormatConfiguration"
+                },
+                "SchemaConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SchemaConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.DeliveryStreamEncryptionConfigurationInput": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyARN": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KeyType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.Deserializer": {
+            "additionalProperties": false,
+            "properties": {
+                "HiveJsonSerDe": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HiveJsonSerDe"
+                },
+                "OpenXJsonSerDe": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.OpenXJsonSerDe"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.DynamicPartitioningConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RetryOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ElasticsearchBufferingHints": {
+            "additionalProperties": false,
+            "properties": {
+                "IntervalInSeconds": {
+                    "type": "number"
+                },
+                "SizeInMBs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ElasticsearchDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ElasticsearchBufferingHints"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "ClusterEndpoint": {
+                    "type": "string"
+                },
+                "DomainARN": {
+                    "type": "string"
+                },
+                "IndexName": {
+                    "type": "string"
+                },
+                "IndexRotationPeriod": {
+                    "type": "string"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ElasticsearchRetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "TypeName": {
+                    "type": "string"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.VpcConfiguration"
+                }
+            },
+            "required": [
+                "IndexName",
+                "RoleARN",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ElasticsearchRetryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSEncryptionConfig": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.KMSEncryptionConfig"
+                },
+                "NoEncryptionConfig": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ExtendedS3DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketARN": {
+                    "type": "string"
+                },
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.BufferingHints"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "CompressionFormat": {
+                    "type": "string"
+                },
+                "DataFormatConversionConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.DataFormatConversionConfiguration"
+                },
+                "DynamicPartitioningConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.DynamicPartitioningConfiguration"
+                },
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.EncryptionConfiguration"
+                },
+                "ErrorOutputPrefix": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3BackupConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.HiveJsonSerDe": {
+            "additionalProperties": false,
+            "properties": {
+                "TimestampFormats": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.HttpEndpointCommonAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "AttributeValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "AttributeValue"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.HttpEndpointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessKey": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.HttpEndpointDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.BufferingHints"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "EndpointConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointConfiguration"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RequestConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointRequestConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                }
+            },
+            "required": [
+                "EndpointConfiguration",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.HttpEndpointRequestConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CommonAttributes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointCommonAttribute"
+                    },
+                    "type": "array"
+                },
+                "ContentEncoding": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.InputFormatConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Deserializer": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.Deserializer"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.KMSEncryptionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AWSKMSKeyARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AWSKMSKeyARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.KinesisStreamSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KinesisStreamARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KinesisStreamARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.OpenXJsonSerDe": {
+            "additionalProperties": false,
+            "properties": {
+                "CaseInsensitive": {
+                    "type": "boolean"
+                },
+                "ColumnToJsonKeyMappings": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ConvertDotsInJsonKeysToUnderscores": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.OrcSerDe": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockSizeBytes": {
+                    "type": "number"
+                },
+                "BloomFilterColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BloomFilterFalsePositiveProbability": {
+                    "type": "number"
+                },
+                "Compression": {
+                    "type": "string"
+                },
+                "DictionaryKeyThreshold": {
+                    "type": "number"
+                },
+                "EnablePadding": {
+                    "type": "boolean"
+                },
+                "FormatVersion": {
+                    "type": "string"
+                },
+                "PaddingTolerance": {
+                    "type": "number"
+                },
+                "RowIndexStride": {
+                    "type": "number"
+                },
+                "StripeSizeBytes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.OutputFormatConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Serializer": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.Serializer"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ParquetSerDe": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockSizeBytes": {
+                    "type": "number"
+                },
+                "Compression": {
+                    "type": "string"
+                },
+                "EnableDictionaryCompression": {
+                    "type": "boolean"
+                },
+                "MaxPaddingBytes": {
+                    "type": "number"
+                },
+                "PageSizeBytes": {
+                    "type": "number"
+                },
+                "WriterVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Processors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.Processor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.Processor": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessorParameter"
+                    },
+                    "type": "array"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ProcessorParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ParameterName",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.RedshiftDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "ClusterJDBCURL": {
+                    "type": "string"
+                },
+                "CopyCommand": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CopyCommand"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RedshiftRetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3BackupConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClusterJDBCURL",
+                "CopyCommand",
+                "Password",
+                "RoleARN",
+                "S3Configuration",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.RedshiftRetryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.RetryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketARN": {
+                    "type": "string"
+                },
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.BufferingHints"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "CompressionFormat": {
+                    "type": "string"
+                },
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.EncryptionConfiguration"
+                },
+                "ErrorOutputPrefix": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.SchemaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "VersionId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.Serializer": {
+            "additionalProperties": false,
+            "properties": {
+                "OrcSerDe": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.OrcSerDe"
+                },
+                "ParquetSerDe": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ParquetSerDe"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.SplunkDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "HECAcknowledgmentTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "HECEndpoint": {
+                    "type": "string"
+                },
+                "HECEndpointType": {
+                    "type": "string"
+                },
+                "HECToken": {
+                    "type": "string"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SplunkRetryOptions"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                }
+            },
+            "required": [
+                "HECEndpoint",
+                "HECEndpointType",
+                "HECToken",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.SplunkRetryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleARN": {
+                    "type": "string"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "RoleARN",
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::LakeFormation::DataLakeSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Admins": {
+                            "$ref": "#/definitions/AWS::LakeFormation::DataLakeSettings.Admins"
+                        },
+                        "TrustedResourceOwners": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LakeFormation::DataLakeSettings"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::LakeFormation::DataLakeSettings.Admins": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::LakeFormation::DataLakeSettings.DataLakePrincipal": {
+            "additionalProperties": false,
+            "properties": {
+                "DataLakePrincipalIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataLakePrincipal": {
+                            "$ref": "#/definitions/AWS::LakeFormation::Permissions.DataLakePrincipal"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PermissionsWithGrantOption": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Resource": {
+                            "$ref": "#/definitions/AWS::LakeFormation::Permissions.Resource"
+                        }
+                    },
+                    "required": [
+                        "DataLakePrincipal",
+                        "Resource"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LakeFormation::Permissions"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.ColumnWildcard": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludedColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.DataLakePrincipal": {
+            "additionalProperties": false,
+            "properties": {
+                "DataLakePrincipalIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.DataLocationResource": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "S3Resource": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.DatabaseResource": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.Resource": {
+            "additionalProperties": false,
+            "properties": {
+                "DataLocationResource": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.DataLocationResource"
+                },
+                "DatabaseResource": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.DatabaseResource"
+                },
+                "TableResource": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.TableResource"
+                },
+                "TableWithColumnsResource": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.TableWithColumnsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.TableResource": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "TableWildcard": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.TableWildcard"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.TableWildcard": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.TableWithColumnsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "ColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ColumnWildcard": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.ColumnWildcard"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Resource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "UseServiceLinkedRole": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ResourceArn",
+                        "UseServiceLinkedRole"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LakeFormation::Resource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Alias": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "FunctionVersion": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ProvisionedConcurrencyConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Alias.ProvisionedConcurrencyConfiguration"
+                        },
+                        "RoutingConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Alias.AliasRoutingConfiguration"
+                        }
+                    },
+                    "required": [
+                        "FunctionName",
+                        "FunctionVersion",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::Alias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Alias.AliasRoutingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalVersionWeights": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Lambda::Alias.VersionWeight"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AdditionalVersionWeights"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Alias.ProvisionedConcurrencyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ProvisionedConcurrentExecutions": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ProvisionedConcurrentExecutions"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Alias.VersionWeight": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionVersion": {
+                    "type": "string"
+                },
+                "FunctionWeight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FunctionVersion",
+                "FunctionWeight"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::CodeSigningConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowedPublishers": {
+                            "$ref": "#/definitions/AWS::Lambda::CodeSigningConfig.AllowedPublishers"
+                        },
+                        "CodeSigningPolicies": {
+                            "$ref": "#/definitions/AWS::Lambda::CodeSigningConfig.CodeSigningPolicies"
+                        },
+                        "Description": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AllowedPublishers"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::CodeSigningConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::CodeSigningConfig.AllowedPublishers": {
+            "additionalProperties": false,
+            "properties": {
+                "SigningProfileVersionArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SigningProfileVersionArns"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::CodeSigningConfig.CodeSigningPolicies": {
+            "additionalProperties": false,
+            "properties": {
+                "UntrustedArtifactOnDeployment": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "UntrustedArtifactOnDeployment"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::EventInvokeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::EventInvokeConfig.DestinationConfig"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "MaximumEventAgeInSeconds": {
+                            "type": "number"
+                        },
+                        "MaximumRetryAttempts": {
+                            "type": "number"
+                        },
+                        "Qualifier": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FunctionName",
+                        "Qualifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::EventInvokeConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::EventInvokeConfig.DestinationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "OnFailure": {
+                    "$ref": "#/definitions/AWS::Lambda::EventInvokeConfig.OnFailure"
+                },
+                "OnSuccess": {
+                    "$ref": "#/definitions/AWS::Lambda::EventInvokeConfig.OnSuccess"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::EventInvokeConfig.OnFailure": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::EventInvokeConfig.OnSuccess": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BatchSize": {
+                            "type": "number"
+                        },
+                        "BisectBatchOnFunctionError": {
+                            "type": "boolean"
+                        },
+                        "DestinationConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.DestinationConfig"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "EventSourceArn": {
+                            "type": "string"
+                        },
+                        "FilterCriteria": {
+                            "type": "object"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "FunctionResponseTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MaximumBatchingWindowInSeconds": {
+                            "type": "number"
+                        },
+                        "MaximumRecordAgeInSeconds": {
+                            "type": "number"
+                        },
+                        "MaximumRetryAttempts": {
+                            "type": "number"
+                        },
+                        "ParallelizationFactor": {
+                            "type": "number"
+                        },
+                        "Queues": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SelfManagedEventSource": {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SelfManagedEventSource"
+                        },
+                        "SourceAccessConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SourceAccessConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "StartingPosition": {
+                            "type": "string"
+                        },
+                        "StartingPositionTimestamp": {
+                            "type": "number"
+                        },
+                        "Topics": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "TumblingWindowInSeconds": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "FunctionName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::EventSourceMapping"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping.DestinationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "OnFailure": {
+                    "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.OnFailure"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping.Endpoints": {
+            "additionalProperties": false,
+            "properties": {
+                "KafkaBootstrapServers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping.OnFailure": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping.SelfManagedEventSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoints": {
+                    "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.Endpoints"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping.SourceAccessConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "URI": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Architectures": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Code": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.Code"
+                        },
+                        "CodeSigningConfigArn": {
+                            "type": "string"
+                        },
+                        "DeadLetterConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.DeadLetterConfig"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Environment": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.Environment"
+                        },
+                        "FileSystemConfigs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Lambda::Function.FileSystemConfig"
+                            },
+                            "type": "array"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "Handler": {
+                            "type": "string"
+                        },
+                        "ImageConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.ImageConfig"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "Layers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MemorySize": {
+                            "type": "number"
+                        },
+                        "PackageType": {
+                            "type": "string"
+                        },
+                        "ReservedConcurrentExecutions": {
+                            "type": "number"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "Runtime": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Timeout": {
+                            "type": "number"
+                        },
+                        "TracingConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.TracingConfig"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "Code",
+                        "Role"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::Function"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Function.Code": {
+            "additionalProperties": false,
+            "properties": {
+                "ImageUri": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                },
+                "S3ObjectVersion": {
+                    "type": "string"
+                },
+                "ZipFile": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function.DeadLetterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function.Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "Variables": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function.FileSystemConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "LocalMountPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn",
+                "LocalMountPath"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Function.ImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Command": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EntryPoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "WorkingDirectory": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function.TracingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::LayerVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CompatibleArchitectures": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CompatibleRuntimes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Content": {
+                            "$ref": "#/definitions/AWS::Lambda::LayerVersion.Content"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LayerName": {
+                            "type": "string"
+                        },
+                        "LicenseInfo": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Content"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::LayerVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::LayerVersion.Content": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                },
+                "S3ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::LayerVersionPermission": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "LayerVersionArn": {
+                            "type": "string"
+                        },
+                        "OrganizationId": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Action",
+                        "LayerVersionArn",
+                        "Principal"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::LayerVersionPermission"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Permission": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "EventSourceToken": {
+                            "type": "string"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        },
+                        "SourceAccount": {
+                            "type": "string"
+                        },
+                        "SourceArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Action",
+                        "FunctionName",
+                        "Principal"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::Permission"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Version": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CodeSha256": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "ProvisionedConcurrencyConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Version.ProvisionedConcurrencyConfiguration"
+                        }
+                    },
+                    "required": [
+                        "FunctionName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::Version"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Version.ProvisionedConcurrencyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ProvisionedConcurrentExecutions": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ProvisionedConcurrentExecutions"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::Grant": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowedOperations": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "GrantName": {
+                            "type": "string"
+                        },
+                        "HomeRegion": {
+                            "type": "string"
+                        },
+                        "LicenseArn": {
+                            "type": "string"
+                        },
+                        "Principals": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LicenseManager::Grant"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Beneficiary": {
+                            "type": "string"
+                        },
+                        "ConsumptionConfiguration": {
+                            "$ref": "#/definitions/AWS::LicenseManager::License.ConsumptionConfiguration"
+                        },
+                        "Entitlements": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::LicenseManager::License.Entitlement"
+                            },
+                            "type": "array"
+                        },
+                        "HomeRegion": {
+                            "type": "string"
+                        },
+                        "Issuer": {
+                            "$ref": "#/definitions/AWS::LicenseManager::License.IssuerData"
+                        },
+                        "LicenseMetadata": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::LicenseManager::License.Metadata"
+                            },
+                            "type": "array"
+                        },
+                        "LicenseName": {
+                            "type": "string"
+                        },
+                        "ProductName": {
+                            "type": "string"
+                        },
+                        "ProductSKU": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Validity": {
+                            "$ref": "#/definitions/AWS::LicenseManager::License.ValidityDateFormat"
+                        }
+                    },
+                    "required": [
+                        "ConsumptionConfiguration",
+                        "Entitlements",
+                        "HomeRegion",
+                        "Issuer",
+                        "LicenseName",
+                        "ProductName",
+                        "Validity"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LicenseManager::License"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.BorrowConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowEarlyCheckIn": {
+                    "type": "boolean"
+                },
+                "MaxTimeToLiveInMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AllowEarlyCheckIn",
+                "MaxTimeToLiveInMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.ConsumptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BorrowConfiguration": {
+                    "$ref": "#/definitions/AWS::LicenseManager::License.BorrowConfiguration"
+                },
+                "ProvisionalConfiguration": {
+                    "$ref": "#/definitions/AWS::LicenseManager::License.ProvisionalConfiguration"
+                },
+                "RenewType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.Entitlement": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowCheckIn": {
+                    "type": "boolean"
+                },
+                "MaxCount": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Overage": {
+                    "type": "boolean"
+                },
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Unit"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.IssuerData": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SignKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.Metadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.ProvisionalConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTimeToLiveInMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxTimeToLiveInMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.ValidityDateFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "Begin": {
+                    "type": "string"
+                },
+                "End": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Begin",
+                "End"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Database": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "BackupRetention": {
+                            "type": "boolean"
+                        },
+                        "CaCertificateIdentifier": {
+                            "type": "string"
+                        },
+                        "MasterDatabaseName": {
+                            "type": "string"
+                        },
+                        "MasterUserPassword": {
+                            "type": "string"
+                        },
+                        "MasterUsername": {
+                            "type": "string"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "PubliclyAccessible": {
+                            "type": "boolean"
+                        },
+                        "RelationalDatabaseBlueprintId": {
+                            "type": "string"
+                        },
+                        "RelationalDatabaseBundleId": {
+                            "type": "string"
+                        },
+                        "RelationalDatabaseName": {
+                            "type": "string"
+                        },
+                        "RelationalDatabaseParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Lightsail::Database.RelationalDatabaseParameter"
+                            },
+                            "type": "array"
+                        },
+                        "RotateMasterUserPassword": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MasterDatabaseName",
+                        "MasterUsername",
+                        "RelationalDatabaseBlueprintId",
+                        "RelationalDatabaseBundleId",
+                        "RelationalDatabaseName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lightsail::Database"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Database.RelationalDatabaseParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedValues": {
+                    "type": "string"
+                },
+                "ApplyMethod": {
+                    "type": "string"
+                },
+                "ApplyType": {
+                    "type": "string"
+                },
+                "DataType": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "IsModifiable": {
+                    "type": "boolean"
+                },
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Disk": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AddOns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Lightsail::Disk.AddOn"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "DiskName": {
+                            "type": "string"
+                        },
+                        "SizeInGb": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DiskName",
+                        "SizeInGb"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lightsail::Disk"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Disk.AddOn": {
+            "additionalProperties": false,
+            "properties": {
+                "AddOnType": {
+                    "type": "string"
+                },
+                "AutoSnapshotAddOnRequest": {
+                    "$ref": "#/definitions/AWS::Lightsail::Disk.AutoSnapshotAddOn"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AddOnType"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Disk.AutoSnapshotAddOn": {
+            "additionalProperties": false,
+            "properties": {
+                "SnapshotTimeOfDay": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AddOns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Lightsail::Instance.AddOn"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "BlueprintId": {
+                            "type": "string"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Hardware": {
+                            "$ref": "#/definitions/AWS::Lightsail::Instance.Hardware"
+                        },
+                        "InstanceName": {
+                            "type": "string"
+                        },
+                        "KeyPairName": {
+                            "type": "string"
+                        },
+                        "Networking": {
+                            "$ref": "#/definitions/AWS::Lightsail::Instance.Networking"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserData": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "BlueprintId",
+                        "BundleId",
+                        "InstanceName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lightsail::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.AddOn": {
+            "additionalProperties": false,
+            "properties": {
+                "AddOnType": {
+                    "type": "string"
+                },
+                "AutoSnapshotAddOnRequest": {
+                    "$ref": "#/definitions/AWS::Lightsail::Instance.AutoSnapshotAddOn"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AddOnType"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.AutoSnapshotAddOn": {
+            "additionalProperties": false,
+            "properties": {
+                "SnapshotTimeOfDay": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.Disk": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachedTo": {
+                    "type": "string"
+                },
+                "AttachmentState": {
+                    "type": "string"
+                },
+                "DiskName": {
+                    "type": "string"
+                },
+                "IOPS": {
+                    "type": "number"
+                },
+                "IsSystemDisk": {
+                    "type": "boolean"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "SizeInGb": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DiskName",
+                "Path"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.Hardware": {
+            "additionalProperties": false,
+            "properties": {
+                "CpuCount": {
+                    "type": "number"
+                },
+                "Disks": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Lightsail::Instance.Disk"
+                    },
+                    "type": "array"
+                },
+                "RamSizeInGb": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.Location": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "RegionName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.MonthlyTransfer": {
+            "additionalProperties": false,
+            "properties": {
+                "GbPerMonthAllocated": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.Networking": {
+            "additionalProperties": false,
+            "properties": {
+                "MonthlyTransfer": {
+                    "$ref": "#/definitions/AWS::Lightsail::Instance.MonthlyTransfer"
+                },
+                "Ports": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Lightsail::Instance.Port"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Ports"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.Port": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessDirection": {
+                    "type": "string"
+                },
+                "AccessFrom": {
+                    "type": "string"
+                },
+                "AccessType": {
+                    "type": "string"
+                },
+                "CidrListAliases": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Cidrs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CommonName": {
+                    "type": "string"
+                },
+                "FromPort": {
+                    "type": "number"
+                },
+                "Ipv6Cidrs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.State": {
+            "additionalProperties": false,
+            "properties": {
+                "Code": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::StaticIp": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AttachedTo": {
+                            "type": "string"
+                        },
+                        "StaticIpName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "StaticIpName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lightsail::StaticIp"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::GeofenceCollection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CollectionName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        },
+                        "PricingPlanDataSource": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CollectionName",
+                        "PricingPlan"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::GeofenceCollection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::Map": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::Location::Map.MapConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "MapName": {
+                            "type": "string"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Configuration",
+                        "MapName",
+                        "PricingPlan"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::Map"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::Map.MapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Style": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Style"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::PlaceIndex": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataSource": {
+                            "type": "string"
+                        },
+                        "DataSourceConfiguration": {
+                            "$ref": "#/definitions/AWS::Location::PlaceIndex.DataSourceConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IndexName": {
+                            "type": "string"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DataSource",
+                        "IndexName",
+                        "PricingPlan"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::PlaceIndex"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::PlaceIndex.DataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IntendedUse": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Location::RouteCalculator": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CalculatorName": {
+                            "type": "string"
+                        },
+                        "DataSource": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CalculatorName",
+                        "DataSource",
+                        "PricingPlan"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::RouteCalculator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::Tracker": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "PositionFiltering": {
+                            "type": "string"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        },
+                        "PricingPlanDataSource": {
+                            "type": "string"
+                        },
+                        "TrackerName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PricingPlan",
+                        "TrackerName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::Tracker"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::TrackerConsumer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConsumerArn": {
+                            "type": "string"
+                        },
+                        "TrackerName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConsumerArn",
+                        "TrackerName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::TrackerConsumer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationName": {
+                            "type": "string"
+                        },
+                        "DestinationPolicy": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "TargetArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationName",
+                        "DestinationPolicy",
+                        "RoleArn",
+                        "TargetArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::Destination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::LogGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "RetentionInDays": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::LogGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::LogStream": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "LogStreamName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LogGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::LogStream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::MetricFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FilterPattern": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "MetricTransformations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Logs::MetricFilter.MetricTransformation"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FilterPattern",
+                        "LogGroupName",
+                        "MetricTransformations"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::MetricFilter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::MetricFilter.MetricTransformation": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultValue": {
+                    "type": "number"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "MetricNamespace": {
+                    "type": "string"
+                },
+                "MetricValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "MetricNamespace",
+                "MetricValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::QueryDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LogGroupNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QueryString": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "QueryString"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::QueryDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::ResourcePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyDocument": {
+                            "type": "string"
+                        },
+                        "PolicyName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument",
+                        "PolicyName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::ResourcePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::SubscriptionFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationArn": {
+                            "type": "string"
+                        },
+                        "FilterPattern": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationArn",
+                        "FilterPattern",
+                        "LogGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::SubscriptionFilter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutEquipment::InferenceScheduler": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataDelayOffsetInMinutes": {
+                            "type": "number"
+                        },
+                        "DataInputConfiguration": {
+                            "type": "object"
+                        },
+                        "DataOutputConfiguration": {
+                            "type": "object"
+                        },
+                        "DataUploadFrequency": {
+                            "type": "string"
+                        },
+                        "InferenceSchedulerName": {
+                            "type": "string"
+                        },
+                        "ModelName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "ServerSideKmsKeyId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DataInputConfiguration",
+                        "DataOutputConfiguration",
+                        "DataUploadFrequency",
+                        "ModelName",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LookoutEquipment::InferenceScheduler"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::Alert": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "$ref": "#/definitions/AWS::LookoutMetrics::Alert.Action"
+                        },
+                        "AlertDescription": {
+                            "type": "string"
+                        },
+                        "AlertName": {
+                            "type": "string"
+                        },
+                        "AlertSensitivityThreshold": {
+                            "type": "number"
+                        },
+                        "AnomalyDetectorArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Action",
+                        "AlertSensitivityThreshold",
+                        "AnomalyDetectorArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LookoutMetrics::Alert"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::Alert.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaConfiguration": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::Alert.LambdaConfiguration"
+                },
+                "SNSConfiguration": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::Alert.SNSConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::Alert.LambdaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaArn",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::Alert.SNSConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SnsTopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SnsTopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AnomalyDetectorConfig": {
+                            "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.AnomalyDetectorConfig"
+                        },
+                        "AnomalyDetectorDescription": {
+                            "type": "string"
+                        },
+                        "AnomalyDetectorName": {
+                            "type": "string"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "MetricSetList": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.MetricSet"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AnomalyDetectorConfig",
+                        "MetricSetList"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LookoutMetrics::AnomalyDetector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.AnomalyDetectorConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AnomalyDetectorFrequency": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AnomalyDetectorFrequency"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.AppFlowConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FlowName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FlowName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.CloudwatchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.CsvFormatDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "Charset": {
+                    "type": "string"
+                },
+                "ContainsHeader": {
+                    "type": "boolean"
+                },
+                "Delimiter": {
+                    "type": "string"
+                },
+                "FileCompression": {
+                    "type": "string"
+                },
+                "HeaderList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "QuoteSymbol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.FileFormatDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "CsvFormatDescriptor": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.CsvFormatDescriptor"
+                },
+                "JsonFormatDescriptor": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.JsonFormatDescriptor"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.JsonFormatDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "Charset": {
+                    "type": "string"
+                },
+                "FileCompression": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.Metric": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregationFunction": {
+                    "type": "string"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AggregationFunction",
+                "MetricName"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.MetricSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MetricList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.Metric"
+                    },
+                    "type": "array"
+                },
+                "MetricSetDescription": {
+                    "type": "string"
+                },
+                "MetricSetFrequency": {
+                    "type": "string"
+                },
+                "MetricSetName": {
+                    "type": "string"
+                },
+                "MetricSource": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.MetricSource"
+                },
+                "Offset": {
+                    "type": "number"
+                },
+                "TimestampColumn": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.TimestampColumn"
+                },
+                "Timezone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricList",
+                "MetricSetName",
+                "MetricSource"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.MetricSource": {
+            "additionalProperties": false,
+            "properties": {
+                "AppFlowConfig": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.AppFlowConfig"
+                },
+                "CloudwatchConfig": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.CloudwatchConfig"
+                },
+                "RDSSourceConfig": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.RDSSourceConfig"
+                },
+                "RedshiftSourceConfig": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.RedshiftSourceConfig"
+                },
+                "S3SourceConfig": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.S3SourceConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.RDSSourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DBInstanceIdentifier": {
+                    "type": "string"
+                },
+                "DatabaseHost": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DatabasePort": {
+                    "type": "number"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretManagerArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.VpcConfiguration"
+                }
+            },
+            "required": [
+                "DBInstanceIdentifier",
+                "DatabaseHost",
+                "DatabaseName",
+                "DatabasePort",
+                "RoleArn",
+                "SecretManagerArn",
+                "TableName",
+                "VpcConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.RedshiftSourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterIdentifier": {
+                    "type": "string"
+                },
+                "DatabaseHost": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DatabasePort": {
+                    "type": "number"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretManagerArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.VpcConfiguration"
+                }
+            },
+            "required": [
+                "ClusterIdentifier",
+                "DatabaseHost",
+                "DatabaseName",
+                "DatabasePort",
+                "RoleArn",
+                "SecretManagerArn",
+                "TableName",
+                "VpcConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.S3SourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FileFormatDescriptor": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.FileFormatDescriptor"
+                },
+                "HistoricalDataPathList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TemplatedPathList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FileFormatDescriptor",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.TimestampColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnFormat": {
+                    "type": "string"
+                },
+                "ColumnName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIdList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIdList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIdList",
+                "SubnetIdList"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutVision::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ProjectName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProjectName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LookoutVision::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BrokerNodeGroupInfo": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.BrokerNodeGroupInfo"
+                        },
+                        "ClientAuthentication": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.ClientAuthentication"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "ConfigurationInfo": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.ConfigurationInfo"
+                        },
+                        "EncryptionInfo": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.EncryptionInfo"
+                        },
+                        "EnhancedMonitoring": {
+                            "type": "string"
+                        },
+                        "KafkaVersion": {
+                            "type": "string"
+                        },
+                        "LoggingInfo": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.LoggingInfo"
+                        },
+                        "NumberOfBrokerNodes": {
+                            "type": "number"
+                        },
+                        "OpenMonitoring": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.OpenMonitoring"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "BrokerNodeGroupInfo",
+                        "ClusterName",
+                        "KafkaVersion",
+                        "NumberOfBrokerNodes"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MSK::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.BrokerLogs": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogs": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.CloudWatchLogs"
+                },
+                "Firehose": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Firehose"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.S3"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.BrokerNodeGroupInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "BrokerAZDistribution": {
+                    "type": "string"
+                },
+                "ClientSubnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ConnectivityInfo": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.ConnectivityInfo"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StorageInfo": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.StorageInfo"
+                }
+            },
+            "required": [
+                "ClientSubnets",
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.ClientAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "Sasl": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Sasl"
+                },
+                "Tls": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Tls"
+                },
+                "Unauthenticated": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Unauthenticated"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.CloudWatchLogs": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "LogGroup": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.ConfigurationInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "Revision": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Arn",
+                "Revision"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.ConnectivityInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "PublicAccess": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.PublicAccess"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.EBSStorageInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "VolumeSize": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.EncryptionAtRest": {
+            "additionalProperties": false,
+            "properties": {
+                "DataVolumeKMSKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataVolumeKMSKeyId"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.EncryptionInTransit": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientBroker": {
+                    "type": "string"
+                },
+                "InCluster": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.EncryptionInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionAtRest": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.EncryptionAtRest"
+                },
+                "EncryptionInTransit": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.EncryptionInTransit"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Firehose": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStream": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Iam": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.JmxExporter": {
+            "additionalProperties": false,
+            "properties": {
+                "EnabledInBroker": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "EnabledInBroker"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.LoggingInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "BrokerLogs": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.BrokerLogs"
+                }
+            },
+            "required": [
+                "BrokerLogs"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.NodeExporter": {
+            "additionalProperties": false,
+            "properties": {
+                "EnabledInBroker": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "EnabledInBroker"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.OpenMonitoring": {
+            "additionalProperties": false,
+            "properties": {
+                "Prometheus": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Prometheus"
+                }
+            },
+            "required": [
+                "Prometheus"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Prometheus": {
+            "additionalProperties": false,
+            "properties": {
+                "JmxExporter": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.JmxExporter"
+                },
+                "NodeExporter": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.NodeExporter"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.PublicAccess": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Sasl": {
+            "additionalProperties": false,
+            "properties": {
+                "Iam": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Iam"
+                },
+                "Scram": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Scram"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Scram": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.StorageInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "EBSStorageInfo": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.EBSStorageInfo"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Tls": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateAuthorityArnList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Unauthenticated": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MWAA::Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AirflowConfigurationOptions": {
+                            "type": "object"
+                        },
+                        "AirflowVersion": {
+                            "type": "string"
+                        },
+                        "DagS3Path": {
+                            "type": "string"
+                        },
+                        "EnvironmentClass": {
+                            "type": "string"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "KmsKey": {
+                            "type": "string"
+                        },
+                        "LoggingConfiguration": {
+                            "$ref": "#/definitions/AWS::MWAA::Environment.LoggingConfiguration"
+                        },
+                        "MaxWorkers": {
+                            "type": "number"
+                        },
+                        "MinWorkers": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NetworkConfiguration": {
+                            "$ref": "#/definitions/AWS::MWAA::Environment.NetworkConfiguration"
+                        },
+                        "PluginsS3ObjectVersion": {
+                            "type": "string"
+                        },
+                        "PluginsS3Path": {
+                            "type": "string"
+                        },
+                        "RequirementsS3ObjectVersion": {
+                            "type": "string"
+                        },
+                        "RequirementsS3Path": {
+                            "type": "string"
+                        },
+                        "Schedulers": {
+                            "type": "number"
+                        },
+                        "SourceBucketArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "WebserverAccessMode": {
+                            "type": "string"
+                        },
+                        "WeeklyMaintenanceWindowStart": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MWAA::Environment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MWAA::Environment.LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DagProcessingLogs": {
+                    "$ref": "#/definitions/AWS::MWAA::Environment.ModuleLoggingConfiguration"
+                },
+                "SchedulerLogs": {
+                    "$ref": "#/definitions/AWS::MWAA::Environment.ModuleLoggingConfiguration"
+                },
+                "TaskLogs": {
+                    "$ref": "#/definitions/AWS::MWAA::Environment.ModuleLoggingConfiguration"
+                },
+                "WebserverLogs": {
+                    "$ref": "#/definitions/AWS::MWAA::Environment.ModuleLoggingConfiguration"
+                },
+                "WorkerLogs": {
+                    "$ref": "#/definitions/AWS::MWAA::Environment.ModuleLoggingConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MWAA::Environment.ModuleLoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogGroupArn": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "LogLevel": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MWAA::Environment.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Macie::CustomDataIdentifier": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "IgnoreWords": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Keywords": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MaximumMatchDistance": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Regex": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Regex"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Macie::CustomDataIdentifier"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Macie::FindingsFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FindingCriteria": {
+                            "$ref": "#/definitions/AWS::Macie::FindingsFilter.FindingCriteria"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Position": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "FindingCriteria",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Macie::FindingsFilter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Macie::FindingsFilter.Criterion": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::Macie::FindingsFilter.FindingCriteria": {
+            "additionalProperties": false,
+            "properties": {
+                "Criterion": {
+                    "$ref": "#/definitions/AWS::Macie::FindingsFilter.Criterion"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Macie::FindingsFilter.FindingsFilterListItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Macie::Session": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FindingPublishingFrequency": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Macie::Session"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InvitationId": {
+                            "type": "string"
+                        },
+                        "MemberConfiguration": {
+                            "$ref": "#/definitions/AWS::ManagedBlockchain::Member.MemberConfiguration"
+                        },
+                        "NetworkConfiguration": {
+                            "$ref": "#/definitions/AWS::ManagedBlockchain::Member.NetworkConfiguration"
+                        },
+                        "NetworkId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MemberConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ManagedBlockchain::Member"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.ApprovalThresholdPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ProposalDurationInHours": {
+                    "type": "number"
+                },
+                "ThresholdComparator": {
+                    "type": "string"
+                },
+                "ThresholdPercentage": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.MemberConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "MemberFrameworkConfiguration": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.MemberFrameworkConfiguration"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.MemberFabricConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AdminPassword": {
+                    "type": "string"
+                },
+                "AdminUsername": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AdminPassword",
+                "AdminUsername"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.MemberFrameworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MemberFabricConfiguration": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.MemberFabricConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Framework": {
+                    "type": "string"
+                },
+                "FrameworkVersion": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "NetworkFrameworkConfiguration": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.NetworkFrameworkConfiguration"
+                },
+                "VotingPolicy": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.VotingPolicy"
+                }
+            },
+            "required": [
+                "Framework",
+                "FrameworkVersion",
+                "Name",
+                "VotingPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.NetworkFabricConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Edition": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Edition"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.NetworkFrameworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NetworkFabricConfiguration": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.NetworkFabricConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.VotingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ApprovalThresholdPolicy": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.ApprovalThresholdPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Node": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MemberId": {
+                            "type": "string"
+                        },
+                        "NetworkId": {
+                            "type": "string"
+                        },
+                        "NodeConfiguration": {
+                            "$ref": "#/definitions/AWS::ManagedBlockchain::Node.NodeConfiguration"
+                        }
+                    },
+                    "required": [
+                        "NetworkId",
+                        "NodeConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ManagedBlockchain::Node"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Node.NodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "InstanceType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AvailabilityZone",
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Source": {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow.Source"
+                        },
+                        "SourceFailoverConfig": {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow.FailoverConfig"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Source"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::Flow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.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": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.FailoverConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RecoveryWindow": {
+                    "type": "number"
+                },
+                "State": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.Source": {
+            "additionalProperties": false,
+            "properties": {
+                "Decryption": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.Encryption"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "EntitlementArn": {
+                    "type": "string"
+                },
+                "IngestIp": {
+                    "type": "string"
+                },
+                "IngestPort": {
+                    "type": "number"
+                },
+                "MaxBitrate": {
+                    "type": "number"
+                },
+                "MaxLatency": {
+                    "type": "number"
+                },
+                "MinLatency": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "SourceArn": {
+                    "type": "string"
+                },
+                "SourceIngestPort": {
+                    "type": "string"
+                },
+                "StreamId": {
+                    "type": "string"
+                },
+                "VpcInterfaceName": {
+                    "type": "string"
+                },
+                "WhitelistCidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowEntitlement": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CidrAllowList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Destination": {
+                            "type": "string"
+                        },
+                        "Encryption": {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.Encryption"
+                        },
+                        "FlowArn": {
+                            "type": "string"
+                        },
+                        "MaxLatency": {
+                            "type": "number"
+                        },
+                        "MinLatency": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "RemoteId": {
+                            "type": "string"
+                        },
+                        "SmoothingLatency": {
+                            "type": "number"
+                        },
+                        "StreamId": {
+                            "type": "string"
+                        },
+                        "VpcInterfaceAttachment": {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.VpcInterfaceAttachment"
+                        }
+                    },
+                    "required": [
+                        "FlowArn",
+                        "Protocol"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::FlowOutput"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput.Encryption": {
+            "additionalProperties": false,
+            "properties": {
+                "Algorithm": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SecretArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput.VpcInterfaceAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "VpcInterfaceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Decryption": {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowSource.Encryption"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EntitlementArn": {
+                            "type": "string"
+                        },
+                        "FlowArn": {
+                            "type": "string"
+                        },
+                        "IngestPort": {
+                            "type": "number"
+                        },
+                        "MaxBitrate": {
+                            "type": "number"
+                        },
+                        "MaxLatency": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "StreamId": {
+                            "type": "string"
+                        },
+                        "VpcInterfaceName": {
+                            "type": "string"
+                        },
+                        "WhitelistCidr": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::FlowSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowSource.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::FlowVpcInterface": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FlowArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FlowArn",
+                        "Name",
+                        "RoleArn",
+                        "SecurityGroupIds",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::FlowVpcInterface"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConvert::JobTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccelerationSettings": {
+                            "$ref": "#/definitions/AWS::MediaConvert::JobTemplate.AccelerationSettings"
+                        },
+                        "Category": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "HopDestinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConvert::JobTemplate.HopDestination"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        },
+                        "Queue": {
+                            "type": "string"
+                        },
+                        "SettingsJson": {
+                            "type": "object"
+                        },
+                        "StatusUpdateInterval": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "SettingsJson"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConvert::JobTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConvert::JobTemplate.AccelerationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConvert::JobTemplate.HopDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "Queue": {
+                    "type": "string"
+                },
+                "WaitMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConvert::Preset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Category": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SettingsJson": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "SettingsJson"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConvert::Preset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConvert::Queue": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConvert::Queue"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CdiInputSpecification": {
+                            "$ref": "#/definitions/AWS::MediaLive::Channel.CdiInputSpecification"
+                        },
+                        "ChannelClass": {
+                            "type": "string"
+                        },
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Channel.OutputDestination"
+                            },
+                            "type": "array"
+                        },
+                        "EncoderSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Channel.EncoderSettings"
+                        },
+                        "InputAttachments": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Channel.InputAttachment"
+                            },
+                            "type": "array"
+                        },
+                        "InputSpecification": {
+                            "$ref": "#/definitions/AWS::MediaLive::Channel.InputSpecification"
+                        },
+                        "LogLevel": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Vpc": {
+                            "$ref": "#/definitions/AWS::MediaLive::Channel.VpcOutputSettings"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Channel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AacSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Bitrate": {
+                    "type": "number"
+                },
+                "CodingMode": {
+                    "type": "string"
+                },
+                "InputType": {
+                    "type": "string"
+                },
+                "Profile": {
+                    "type": "string"
+                },
+                "RateControlMode": {
+                    "type": "string"
+                },
+                "RawFormat": {
+                    "type": "string"
+                },
+                "SampleRate": {
+                    "type": "number"
+                },
+                "Spec": {
+                    "type": "string"
+                },
+                "VbrQuality": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Ac3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "Bitrate": {
+                    "type": "number"
+                },
+                "BitstreamMode": {
+                    "type": "string"
+                },
+                "CodingMode": {
+                    "type": "string"
+                },
+                "Dialnorm": {
+                    "type": "number"
+                },
+                "DrcProfile": {
+                    "type": "string"
+                },
+                "LfeFilter": {
+                    "type": "string"
+                },
+                "MetadataControl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AncillarySourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceAncillaryChannelNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ArchiveCdnSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ArchiveS3Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ArchiveS3Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ArchiveContainerSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "M2tsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.M2tsSettings"
+                },
+                "RawSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.RawSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ArchiveGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ArchiveCdnSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ArchiveCdnSettings"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "RolloverInterval": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ArchiveOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ArchiveContainerSettings"
+                },
+                "Extension": {
+                    "type": "string"
+                },
+                "NameModifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ArchiveS3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "CannedAcl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AribDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AribSourceSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioChannelMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "InputChannelLevels": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.InputChannelLevel"
+                    },
+                    "type": "array"
+                },
+                "OutputChannel": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioCodecSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AacSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AacSettings"
+                },
+                "Ac3Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Ac3Settings"
+                },
+                "Eac3Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Eac3Settings"
+                },
+                "Mp2Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Mp2Settings"
+                },
+                "PassThroughSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.PassThroughSettings"
+                },
+                "WavSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.WavSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioNormalizationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioNormalizationSettings"
+                },
+                "AudioSelectorName": {
+                    "type": "string"
+                },
+                "AudioType": {
+                    "type": "string"
+                },
+                "AudioTypeControl": {
+                    "type": "string"
+                },
+                "AudioWatermarkingSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioWatermarkSettings"
+                },
+                "CodecSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioCodecSettings"
+                },
+                "LanguageCode": {
+                    "type": "string"
+                },
+                "LanguageCodeControl": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "RemixSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.RemixSettings"
+                },
+                "StreamName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioHlsRenditionSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioLanguageSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "LanguageCode": {
+                    "type": "string"
+                },
+                "LanguageSelectionPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioNormalizationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Algorithm": {
+                    "type": "string"
+                },
+                "AlgorithmControl": {
+                    "type": "string"
+                },
+                "TargetLkfs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioOnlyHlsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioGroupId": {
+                    "type": "string"
+                },
+                "AudioOnlyImage": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "AudioTrackType": {
+                    "type": "string"
+                },
+                "SegmentType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioPidSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "Pid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SelectorSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioSelectorSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioSelectorSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioHlsRenditionSelection": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioHlsRenditionSelection"
+                },
+                "AudioLanguageSelection": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioLanguageSelection"
+                },
+                "AudioPidSelection": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioPidSelection"
+                },
+                "AudioTrackSelection": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioTrackSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioSilenceFailoverSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioSelectorName": {
+                    "type": "string"
+                },
+                "AudioSilenceThresholdMsec": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioTrack": {
+            "additionalProperties": false,
+            "properties": {
+                "Track": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioTrackSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "Tracks": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.AudioTrack"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioWatermarkSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NielsenWatermarksSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.NielsenWatermarksSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AutomaticInputFailoverSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorClearTimeMsec": {
+                    "type": "number"
+                },
+                "FailoverConditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.FailoverCondition"
+                    },
+                    "type": "array"
+                },
+                "InputPreference": {
+                    "type": "string"
+                },
+                "SecondaryInputId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AvailBlanking": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailBlankingImage": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "State": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AvailConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AvailSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AvailSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Scte35SpliceInsert": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte35SpliceInsert"
+                },
+                "Scte35TimeSignalApos": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte35TimeSignalApos"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.BlackoutSlate": {
+            "additionalProperties": false,
+            "properties": {
+                "BlackoutSlateImage": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "NetworkEndBlackout": {
+                    "type": "string"
+                },
+                "NetworkEndBlackoutImage": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "NetworkId": {
+                    "type": "string"
+                },
+                "State": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.BurnInDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BackgroundOpacity": {
+                    "type": "number"
+                },
+                "Font": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "FontColor": {
+                    "type": "string"
+                },
+                "FontOpacity": {
+                    "type": "number"
+                },
+                "FontResolution": {
+                    "type": "number"
+                },
+                "FontSize": {
+                    "type": "string"
+                },
+                "OutlineColor": {
+                    "type": "string"
+                },
+                "OutlineSize": {
+                    "type": "number"
+                },
+                "ShadowColor": {
+                    "type": "string"
+                },
+                "ShadowOpacity": {
+                    "type": "number"
+                },
+                "ShadowXOffset": {
+                    "type": "number"
+                },
+                "ShadowYOffset": {
+                    "type": "number"
+                },
+                "TeletextGridControl": {
+                    "type": "string"
+                },
+                "XPosition": {
+                    "type": "number"
+                },
+                "YPosition": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptionSelectorName": {
+                    "type": "string"
+                },
+                "DestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionDestinationSettings"
+                },
+                "LanguageCode": {
+                    "type": "string"
+                },
+                "LanguageDescription": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AribDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AribDestinationSettings"
+                },
+                "BurnInDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.BurnInDestinationSettings"
+                },
+                "DvbSubDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.DvbSubDestinationSettings"
+                },
+                "EbuTtDDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.EbuTtDDestinationSettings"
+                },
+                "EmbeddedDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.EmbeddedDestinationSettings"
+                },
+                "EmbeddedPlusScte20DestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.EmbeddedPlusScte20DestinationSettings"
+                },
+                "RtmpCaptionInfoDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.RtmpCaptionInfoDestinationSettings"
+                },
+                "Scte20PlusEmbeddedDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte20PlusEmbeddedDestinationSettings"
+                },
+                "Scte27DestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte27DestinationSettings"
+                },
+                "SmpteTtDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.SmpteTtDestinationSettings"
+                },
+                "TeletextDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TeletextDestinationSettings"
+                },
+                "TtmlDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TtmlDestinationSettings"
+                },
+                "WebvttDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.WebvttDestinationSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionLanguageMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptionChannel": {
+                    "type": "number"
+                },
+                "LanguageCode": {
+                    "type": "string"
+                },
+                "LanguageDescription": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionRectangle": {
+            "additionalProperties": false,
+            "properties": {
+                "Height": {
+                    "type": "number"
+                },
+                "LeftOffset": {
+                    "type": "number"
+                },
+                "TopOffset": {
+                    "type": "number"
+                },
+                "Width": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "LanguageCode": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SelectorSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionSelectorSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionSelectorSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AncillarySourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AncillarySourceSettings"
+                },
+                "AribSourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AribSourceSettings"
+                },
+                "DvbSubSourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.DvbSubSourceSettings"
+                },
+                "EmbeddedSourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.EmbeddedSourceSettings"
+                },
+                "Scte20SourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte20SourceSettings"
+                },
+                "Scte27SourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte27SourceSettings"
+                },
+                "TeletextSourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TeletextSourceSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CdiInputSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Resolution": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ColorSpacePassthroughSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.DvbNitSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NetworkId": {
+                    "type": "number"
+                },
+                "NetworkName": {
+                    "type": "string"
+                },
+                "RepInterval": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.DvbSdtSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "OutputSdt": {
+                    "type": "string"
+                },
+                "RepInterval": {
+                    "type": "number"
+                },
+                "ServiceName": {
+                    "type": "string"
+                },
+                "ServiceProviderName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.DvbSubDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BackgroundOpacity": {
+                    "type": "number"
+                },
+                "Font": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "FontColor": {
+                    "type": "string"
+                },
+                "FontOpacity": {
+                    "type": "number"
+                },
+                "FontResolution": {
+                    "type": "number"
+                },
+                "FontSize": {
+                    "type": "string"
+                },
+                "OutlineColor": {
+                    "type": "string"
+                },
+                "OutlineSize": {
+                    "type": "number"
+                },
+                "ShadowColor": {
+                    "type": "string"
+                },
+                "ShadowOpacity": {
+                    "type": "number"
+                },
+                "ShadowXOffset": {
+                    "type": "number"
+                },
+                "ShadowYOffset": {
+                    "type": "number"
+                },
+                "TeletextGridControl": {
+                    "type": "string"
+                },
+                "XPosition": {
+                    "type": "number"
+                },
+                "YPosition": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.DvbSubSourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "OcrLanguage": {
+                    "type": "string"
+                },
+                "Pid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.DvbTdtSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "RepInterval": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Eac3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "AttenuationControl": {
+                    "type": "string"
+                },
+                "Bitrate": {
+                    "type": "number"
+                },
+                "BitstreamMode": {
+                    "type": "string"
+                },
+                "CodingMode": {
+                    "type": "string"
+                },
+                "DcFilter": {
+                    "type": "string"
+                },
+                "Dialnorm": {
+                    "type": "number"
+                },
+                "DrcLine": {
+                    "type": "string"
+                },
+                "DrcRf": {
+                    "type": "string"
+                },
+                "LfeControl": {
+                    "type": "string"
+                },
+                "LfeFilter": {
+                    "type": "string"
+                },
+                "LoRoCenterMixLevel": {
+                    "type": "number"
+                },
+                "LoRoSurroundMixLevel": {
+                    "type": "number"
+                },
+                "LtRtCenterMixLevel": {
+                    "type": "number"
+                },
+                "LtRtSurroundMixLevel": {
+                    "type": "number"
+                },
+                "MetadataControl": {
+                    "type": "string"
+                },
+                "PassthroughControl": {
+                    "type": "string"
+                },
+                "PhaseControl": {
+                    "type": "string"
+                },
+                "StereoDownmix": {
+                    "type": "string"
+                },
+                "SurroundExMode": {
+                    "type": "string"
+                },
+                "SurroundMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.EbuTtDDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyrightHolder": {
+                    "type": "string"
+                },
+                "FillLineGap": {
+                    "type": "string"
+                },
+                "FontFamily": {
+                    "type": "string"
+                },
+                "StyleControl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.EmbeddedDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.EmbeddedPlusScte20DestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.EmbeddedSourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Convert608To708": {
+                    "type": "string"
+                },
+                "Scte20Detection": {
+                    "type": "string"
+                },
+                "Source608ChannelNumber": {
+                    "type": "number"
+                },
+                "Source608TrackNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.EncoderSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioDescriptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.AudioDescription"
+                    },
+                    "type": "array"
+                },
+                "AvailBlanking": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AvailBlanking"
+                },
+                "AvailConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AvailConfiguration"
+                },
+                "BlackoutSlate": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.BlackoutSlate"
+                },
+                "CaptionDescriptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionDescription"
+                    },
+                    "type": "array"
+                },
+                "FeatureActivations": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FeatureActivations"
+                },
+                "GlobalConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.GlobalConfiguration"
+                },
+                "MotionGraphicsConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MotionGraphicsConfiguration"
+                },
+                "NielsenConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.NielsenConfiguration"
+                },
+                "OutputGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.OutputGroup"
+                    },
+                    "type": "array"
+                },
+                "TimecodeConfig": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TimecodeConfig"
+                },
+                "VideoDescriptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.VideoDescription"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FailoverCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "FailoverConditionSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FailoverConditionSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FailoverConditionSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioSilenceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioSilenceFailoverSettings"
+                },
+                "InputLossSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLossFailoverSettings"
+                },
+                "VideoBlackSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoBlackFailoverSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FeatureActivations": {
+            "additionalProperties": false,
+            "properties": {
+                "InputPrepareScheduleActions": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FecOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnDepth": {
+                    "type": "number"
+                },
+                "IncludeFec": {
+                    "type": "string"
+                },
+                "RowLength": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Fmp4HlsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioRenditionSets": {
+                    "type": "string"
+                },
+                "NielsenId3Behavior": {
+                    "type": "string"
+                },
+                "TimedMetadataBehavior": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureCdnSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "FrameCaptureS3Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureS3Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "FrameCaptureCdnSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureCdnSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureHlsSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NameModifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureS3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "CannedAcl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureInterval": {
+                    "type": "number"
+                },
+                "CaptureIntervalUnits": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.GlobalConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InitialAudioGain": {
+                    "type": "number"
+                },
+                "InputEndAction": {
+                    "type": "string"
+                },
+                "InputLossBehavior": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLossBehavior"
+                },
+                "OutputLockingMode": {
+                    "type": "string"
+                },
+                "OutputTimingSource": {
+                    "type": "string"
+                },
+                "SupportLowFramerateInputs": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H264ColorSpaceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ColorSpacePassthroughSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ColorSpacePassthroughSettings"
+                },
+                "Rec601Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Rec601Settings"
+                },
+                "Rec709Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Rec709Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H264FilterSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "TemporalFilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TemporalFilterSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H264Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "AdaptiveQuantization": {
+                    "type": "string"
+                },
+                "AfdSignaling": {
+                    "type": "string"
+                },
+                "Bitrate": {
+                    "type": "number"
+                },
+                "BufFillPct": {
+                    "type": "number"
+                },
+                "BufSize": {
+                    "type": "number"
+                },
+                "ColorMetadata": {
+                    "type": "string"
+                },
+                "ColorSpaceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H264ColorSpaceSettings"
+                },
+                "EntropyEncoding": {
+                    "type": "string"
+                },
+                "FilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H264FilterSettings"
+                },
+                "FixedAfd": {
+                    "type": "string"
+                },
+                "FlickerAq": {
+                    "type": "string"
+                },
+                "ForceFieldPictures": {
+                    "type": "string"
+                },
+                "FramerateControl": {
+                    "type": "string"
+                },
+                "FramerateDenominator": {
+                    "type": "number"
+                },
+                "FramerateNumerator": {
+                    "type": "number"
+                },
+                "GopBReference": {
+                    "type": "string"
+                },
+                "GopClosedCadence": {
+                    "type": "number"
+                },
+                "GopNumBFrames": {
+                    "type": "number"
+                },
+                "GopSize": {
+                    "type": "number"
+                },
+                "GopSizeUnits": {
+                    "type": "string"
+                },
+                "Level": {
+                    "type": "string"
+                },
+                "LookAheadRateControl": {
+                    "type": "string"
+                },
+                "MaxBitrate": {
+                    "type": "number"
+                },
+                "MinIInterval": {
+                    "type": "number"
+                },
+                "NumRefFrames": {
+                    "type": "number"
+                },
+                "ParControl": {
+                    "type": "string"
+                },
+                "ParDenominator": {
+                    "type": "number"
+                },
+                "ParNumerator": {
+                    "type": "number"
+                },
+                "Profile": {
+                    "type": "string"
+                },
+                "QualityLevel": {
+                    "type": "string"
+                },
+                "QvbrQualityLevel": {
+                    "type": "number"
+                },
+                "RateControlMode": {
+                    "type": "string"
+                },
+                "ScanType": {
+                    "type": "string"
+                },
+                "SceneChangeDetect": {
+                    "type": "string"
+                },
+                "Slices": {
+                    "type": "number"
+                },
+                "Softness": {
+                    "type": "number"
+                },
+                "SpatialAq": {
+                    "type": "string"
+                },
+                "SubgopLength": {
+                    "type": "string"
+                },
+                "Syntax": {
+                    "type": "string"
+                },
+                "TemporalAq": {
+                    "type": "string"
+                },
+                "TimecodeInsertion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H265ColorSpaceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ColorSpacePassthroughSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ColorSpacePassthroughSettings"
+                },
+                "Hdr10Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Hdr10Settings"
+                },
+                "Rec601Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Rec601Settings"
+                },
+                "Rec709Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Rec709Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H265FilterSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "TemporalFilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TemporalFilterSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H265Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "AdaptiveQuantization": {
+                    "type": "string"
+                },
+                "AfdSignaling": {
+                    "type": "string"
+                },
+                "AlternativeTransferFunction": {
+                    "type": "string"
+                },
+                "Bitrate": {
+                    "type": "number"
+                },
+                "BufSize": {
+                    "type": "number"
+                },
+                "ColorMetadata": {
+                    "type": "string"
+                },
+                "ColorSpaceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H265ColorSpaceSettings"
+                },
+                "FilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H265FilterSettings"
+                },
+                "FixedAfd": {
+                    "type": "string"
+                },
+                "FlickerAq": {
+                    "type": "string"
+                },
+                "FramerateDenominator": {
+                    "type": "number"
+                },
+                "FramerateNumerator": {
+                    "type": "number"
+                },
+                "GopClosedCadence": {
+                    "type": "number"
+                },
+                "GopSize": {
+                    "type": "number"
+                },
+                "GopSizeUnits": {
+                    "type": "string"
+                },
+                "Level": {
+                    "type": "string"
+                },
+                "LookAheadRateControl": {
+                    "type": "string"
+                },
+                "MaxBitrate": {
+                    "type": "number"
+                },
+                "MinIInterval": {
+                    "type": "number"
+                },
+                "ParDenominator": {
+                    "type": "number"
+                },
+                "ParNumerator": {
+                    "type": "number"
+                },
+                "Profile": {
+                    "type": "string"
+                },
+                "QvbrQualityLevel": {
+                    "type": "number"
+                },
+                "RateControlMode": {
+                    "type": "string"
+                },
+                "ScanType": {
+                    "type": "string"
+                },
+                "SceneChangeDetect": {
+                    "type": "string"
+                },
+                "Slices": {
+                    "type": "number"
+                },
+                "Tier": {
+                    "type": "string"
+                },
+                "TimecodeInsertion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Hdr10Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCll": {
+                    "type": "number"
+                },
+                "MaxFall": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsAkamaiSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "FilecacheDuration": {
+                    "type": "number"
+                },
+                "HttpTransferMode": {
+                    "type": "string"
+                },
+                "NumRetries": {
+                    "type": "number"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                },
+                "Salt": {
+                    "type": "string"
+                },
+                "Token": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsBasicPutSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "FilecacheDuration": {
+                    "type": "number"
+                },
+                "NumRetries": {
+                    "type": "number"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsCdnSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HlsAkamaiSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsAkamaiSettings"
+                },
+                "HlsBasicPutSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsBasicPutSettings"
+                },
+                "HlsMediaStoreSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsMediaStoreSettings"
+                },
+                "HlsS3Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsS3Settings"
+                },
+                "HlsWebdavSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsWebdavSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BaseUrlContent": {
+                    "type": "string"
+                },
+                "BaseUrlContent1": {
+                    "type": "string"
+                },
+                "BaseUrlManifest": {
+                    "type": "string"
+                },
+                "BaseUrlManifest1": {
+                    "type": "string"
+                },
+                "CaptionLanguageMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionLanguageMapping"
+                    },
+                    "type": "array"
+                },
+                "CaptionLanguageSetting": {
+                    "type": "string"
+                },
+                "ClientCache": {
+                    "type": "string"
+                },
+                "CodecSpecification": {
+                    "type": "string"
+                },
+                "ConstantIv": {
+                    "type": "string"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "DirectoryStructure": {
+                    "type": "string"
+                },
+                "DiscontinuityTags": {
+                    "type": "string"
+                },
+                "EncryptionType": {
+                    "type": "string"
+                },
+                "HlsCdnSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsCdnSettings"
+                },
+                "HlsId3SegmentTagging": {
+                    "type": "string"
+                },
+                "IFrameOnlyPlaylists": {
+                    "type": "string"
+                },
+                "IncompleteSegmentBehavior": {
+                    "type": "string"
+                },
+                "IndexNSegments": {
+                    "type": "number"
+                },
+                "InputLossAction": {
+                    "type": "string"
+                },
+                "IvInManifest": {
+                    "type": "string"
+                },
+                "IvSource": {
+                    "type": "string"
+                },
+                "KeepSegments": {
+                    "type": "number"
+                },
+                "KeyFormat": {
+                    "type": "string"
+                },
+                "KeyFormatVersions": {
+                    "type": "string"
+                },
+                "KeyProviderSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.KeyProviderSettings"
+                },
+                "ManifestCompression": {
+                    "type": "string"
+                },
+                "ManifestDurationFormat": {
+                    "type": "string"
+                },
+                "MinSegmentLength": {
+                    "type": "number"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "OutputSelection": {
+                    "type": "string"
+                },
+                "ProgramDateTime": {
+                    "type": "string"
+                },
+                "ProgramDateTimePeriod": {
+                    "type": "number"
+                },
+                "RedundantManifest": {
+                    "type": "string"
+                },
+                "SegmentLength": {
+                    "type": "number"
+                },
+                "SegmentationMode": {
+                    "type": "string"
+                },
+                "SegmentsPerSubdirectory": {
+                    "type": "number"
+                },
+                "StreamInfResolution": {
+                    "type": "string"
+                },
+                "TimedMetadataId3Frame": {
+                    "type": "string"
+                },
+                "TimedMetadataId3Period": {
+                    "type": "number"
+                },
+                "TimestampDeltaMilliseconds": {
+                    "type": "number"
+                },
+                "TsFileMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsInputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Bandwidth": {
+                    "type": "number"
+                },
+                "BufferSegments": {
+                    "type": "number"
+                },
+                "Retries": {
+                    "type": "number"
+                },
+                "RetryInterval": {
+                    "type": "number"
+                },
+                "Scte35Source": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsMediaStoreSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "FilecacheDuration": {
+                    "type": "number"
+                },
+                "MediaStoreStorageClass": {
+                    "type": "string"
+                },
+                "NumRetries": {
+                    "type": "number"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "H265PackagingType": {
+                    "type": "string"
+                },
+                "HlsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsSettings"
+                },
+                "NameModifier": {
+                    "type": "string"
+                },
+                "SegmentModifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsS3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "CannedAcl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioOnlyHlsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioOnlyHlsSettings"
+                },
+                "Fmp4HlsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Fmp4HlsSettings"
+                },
+                "FrameCaptureHlsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureHlsSettings"
+                },
+                "StandardHlsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.StandardHlsSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsWebdavSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "FilecacheDuration": {
+                    "type": "number"
+                },
+                "HttpTransferMode": {
+                    "type": "string"
+                },
+                "NumRetries": {
+                    "type": "number"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HtmlMotionGraphicsSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomaticInputFailoverSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AutomaticInputFailoverSettings"
+                },
+                "InputAttachmentName": {
+                    "type": "string"
+                },
+                "InputId": {
+                    "type": "string"
+                },
+                "InputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputChannelLevel": {
+            "additionalProperties": false,
+            "properties": {
+                "Gain": {
+                    "type": "number"
+                },
+                "InputChannel": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "PasswordParam": {
+                    "type": "string"
+                },
+                "Uri": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputLossBehavior": {
+            "additionalProperties": false,
+            "properties": {
+                "BlackFrameMsec": {
+                    "type": "number"
+                },
+                "InputLossImageColor": {
+                    "type": "string"
+                },
+                "InputLossImageSlate": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "InputLossImageType": {
+                    "type": "string"
+                },
+                "RepeatFrameMsec": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputLossFailoverSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "InputLossThresholdMsec": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioSelectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.AudioSelector"
+                    },
+                    "type": "array"
+                },
+                "CaptionSelectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionSelector"
+                    },
+                    "type": "array"
+                },
+                "DeblockFilter": {
+                    "type": "string"
+                },
+                "DenoiseFilter": {
+                    "type": "string"
+                },
+                "FilterStrength": {
+                    "type": "number"
+                },
+                "InputFilter": {
+                    "type": "string"
+                },
+                "NetworkInputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.NetworkInputSettings"
+                },
+                "Smpte2038DataPreference": {
+                    "type": "string"
+                },
+                "SourceEndBehavior": {
+                    "type": "string"
+                },
+                "VideoSelector": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoSelector"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Codec": {
+                    "type": "string"
+                },
+                "MaximumBitrate": {
+                    "type": "string"
+                },
+                "Resolution": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.KeyProviderSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "StaticKeySettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.StaticKeySettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.M2tsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AbsentInputAudioBehavior": {
+                    "type": "string"
+                },
+                "Arib": {
+                    "type": "string"
+                },
+                "AribCaptionsPid": {
+                    "type": "string"
+                },
+                "AribCaptionsPidControl": {
+                    "type": "string"
+                },
+                "AudioBufferModel": {
+                    "type": "string"
+                },
+                "AudioFramesPerPes": {
+                    "type": "number"
+                },
+                "AudioPids": {
+                    "type": "string"
+                },
+                "AudioStreamType": {
+                    "type": "string"
+                },
+                "Bitrate": {
+                    "type": "number"
+                },
+                "BufferModel": {
+                    "type": "string"
+                },
+                "CcDescriptor": {
+                    "type": "string"
+                },
+                "DvbNitSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.DvbNitSettings"
+                },
+                "DvbSdtSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.DvbSdtSettings"
+                },
+                "DvbSubPids": {
+                    "type": "string"
+                },
+                "DvbTdtSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.DvbTdtSettings"
+                },
+                "DvbTeletextPid": {
+                    "type": "string"
+                },
+                "Ebif": {
+                    "type": "string"
+                },
+                "EbpAudioInterval": {
+                    "type": "string"
+                },
+                "EbpLookaheadMs": {
+                    "type": "number"
+                },
+                "EbpPlacement": {
+                    "type": "string"
+                },
+                "EcmPid": {
+                    "type": "string"
+                },
+                "EsRateInPes": {
+                    "type": "string"
+                },
+                "EtvPlatformPid": {
+                    "type": "string"
+                },
+                "EtvSignalPid": {
+                    "type": "string"
+                },
+                "FragmentTime": {
+                    "type": "number"
+                },
+                "Klv": {
+                    "type": "string"
+                },
+                "KlvDataPids": {
+                    "type": "string"
+                },
+                "NielsenId3Behavior": {
+                    "type": "string"
+                },
+                "NullPacketBitrate": {
+                    "type": "number"
+                },
+                "PatInterval": {
+                    "type": "number"
+                },
+                "PcrControl": {
+                    "type": "string"
+                },
+                "PcrPeriod": {
+                    "type": "number"
+                },
+                "PcrPid": {
+                    "type": "string"
+                },
+                "PmtInterval": {
+                    "type": "number"
+                },
+                "PmtPid": {
+                    "type": "string"
+                },
+                "ProgramNum": {
+                    "type": "number"
+                },
+                "RateMode": {
+                    "type": "string"
+                },
+                "Scte27Pids": {
+                    "type": "string"
+                },
+                "Scte35Control": {
+                    "type": "string"
+                },
+                "Scte35Pid": {
+                    "type": "string"
+                },
+                "SegmentationMarkers": {
+                    "type": "string"
+                },
+                "SegmentationStyle": {
+                    "type": "string"
+                },
+                "SegmentationTime": {
+                    "type": "number"
+                },
+                "TimedMetadataBehavior": {
+                    "type": "string"
+                },
+                "TimedMetadataPid": {
+                    "type": "string"
+                },
+                "TransportStreamId": {
+                    "type": "number"
+                },
+                "VideoPid": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.M3u8Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioFramesPerPes": {
+                    "type": "number"
+                },
+                "AudioPids": {
+                    "type": "string"
+                },
+                "EcmPid": {
+                    "type": "string"
+                },
+                "NielsenId3Behavior": {
+                    "type": "string"
+                },
+                "PatInterval": {
+                    "type": "number"
+                },
+                "PcrControl": {
+                    "type": "string"
+                },
+                "PcrPeriod": {
+                    "type": "number"
+                },
+                "PcrPid": {
+                    "type": "string"
+                },
+                "PmtInterval": {
+                    "type": "number"
+                },
+                "PmtPid": {
+                    "type": "string"
+                },
+                "ProgramNum": {
+                    "type": "number"
+                },
+                "Scte35Behavior": {
+                    "type": "string"
+                },
+                "Scte35Pid": {
+                    "type": "string"
+                },
+                "TimedMetadataBehavior": {
+                    "type": "string"
+                },
+                "TimedMetadataPid": {
+                    "type": "string"
+                },
+                "TransportStreamId": {
+                    "type": "number"
+                },
+                "VideoPid": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MediaPackageGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MediaPackageOutputDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MediaPackageOutputSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MotionGraphicsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MotionGraphicsInsertion": {
+                    "type": "string"
+                },
+                "MotionGraphicsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MotionGraphicsSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MotionGraphicsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HtmlMotionGraphicsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HtmlMotionGraphicsSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Mp2Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "Bitrate": {
+                    "type": "number"
+                },
+                "CodingMode": {
+                    "type": "string"
+                },
+                "SampleRate": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Mpeg2FilterSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "TemporalFilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TemporalFilterSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Mpeg2Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "AdaptiveQuantization": {
+                    "type": "string"
+                },
+                "AfdSignaling": {
+                    "type": "string"
+                },
+                "ColorMetadata": {
+                    "type": "string"
+                },
+                "ColorSpace": {
+                    "type": "string"
+                },
+                "DisplayAspectRatio": {
+                    "type": "string"
+                },
+                "FilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Mpeg2FilterSettings"
+                },
+                "FixedAfd": {
+                    "type": "string"
+                },
+                "FramerateDenominator": {
+                    "type": "number"
+                },
+                "FramerateNumerator": {
+                    "type": "number"
+                },
+                "GopClosedCadence": {
+                    "type": "number"
+                },
+                "GopNumBFrames": {
+                    "type": "number"
+                },
+                "GopSize": {
+                    "type": "number"
+                },
+                "GopSizeUnits": {
+                    "type": "string"
+                },
+                "ScanType": {
+                    "type": "string"
+                },
+                "SubgopLength": {
+                    "type": "string"
+                },
+                "TimecodeInsertion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MsSmoothGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AcquisitionPointId": {
+                    "type": "string"
+                },
+                "AudioOnlyTimecodeControl": {
+                    "type": "string"
+                },
+                "CertificateMode": {
+                    "type": "string"
+                },
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "EventId": {
+                    "type": "string"
+                },
+                "EventIdMode": {
+                    "type": "string"
+                },
+                "EventStopBehavior": {
+                    "type": "string"
+                },
+                "FilecacheDuration": {
+                    "type": "number"
+                },
+                "FragmentLength": {
+                    "type": "number"
+                },
+                "InputLossAction": {
+                    "type": "string"
+                },
+                "NumRetries": {
+                    "type": "number"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                },
+                "SegmentationMode": {
+                    "type": "string"
+                },
+                "SendDelayMs": {
+                    "type": "number"
+                },
+                "SparseTrackType": {
+                    "type": "string"
+                },
+                "StreamManifestBehavior": {
+                    "type": "string"
+                },
+                "TimestampOffset": {
+                    "type": "string"
+                },
+                "TimestampOffsetMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MsSmoothOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "H265PackagingType": {
+                    "type": "string"
+                },
+                "NameModifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MultiplexGroupSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MultiplexOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MultiplexProgramChannelDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiplexId": {
+                    "type": "string"
+                },
+                "ProgramName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.NetworkInputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HlsInputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsInputSettings"
+                },
+                "ServerValidation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.NielsenCBET": {
+            "additionalProperties": false,
+            "properties": {
+                "CbetCheckDigitString": {
+                    "type": "string"
+                },
+                "CbetStepaside": {
+                    "type": "string"
+                },
+                "Csid": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.NielsenConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DistributorId": {
+                    "type": "string"
+                },
+                "NielsenPcmToId3Tagging": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.NielsenNaesIiNw": {
+            "additionalProperties": false,
+            "properties": {
+                "CheckDigitString": {
+                    "type": "string"
+                },
+                "Sid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.NielsenWatermarksSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NielsenCbetSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.NielsenCBET"
+                },
+                "NielsenDistributionType": {
+                    "type": "string"
+                },
+                "NielsenNaesIiNwSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.NielsenNaesIiNw"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioDescriptionNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CaptionDescriptionNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OutputName": {
+                    "type": "string"
+                },
+                "OutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputSettings"
+                },
+                "VideoDescriptionName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "MediaPackageSettings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.MediaPackageOutputDestinationSettings"
+                    },
+                    "type": "array"
+                },
+                "MultiplexSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MultiplexProgramChannelDestinationSettings"
+                },
+                "Settings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.OutputDestinationSettings"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PasswordParam": {
+                    "type": "string"
+                },
+                "StreamName": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "OutputGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputGroupSettings"
+                },
+                "Outputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.Output"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ArchiveGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ArchiveGroupSettings"
+                },
+                "FrameCaptureGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureGroupSettings"
+                },
+                "HlsGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsGroupSettings"
+                },
+                "MediaPackageGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MediaPackageGroupSettings"
+                },
+                "MsSmoothGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MsSmoothGroupSettings"
+                },
+                "MultiplexGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MultiplexGroupSettings"
+                },
+                "RtmpGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.RtmpGroupSettings"
+                },
+                "UdpGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.UdpGroupSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputLocationRef": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationRefId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ArchiveOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ArchiveOutputSettings"
+                },
+                "FrameCaptureOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureOutputSettings"
+                },
+                "HlsOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsOutputSettings"
+                },
+                "MediaPackageOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MediaPackageOutputSettings"
+                },
+                "MsSmoothOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MsSmoothOutputSettings"
+                },
+                "MultiplexOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MultiplexOutputSettings"
+                },
+                "RtmpOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.RtmpOutputSettings"
+                },
+                "UdpOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.UdpOutputSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.PassThroughSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.RawSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Rec601Settings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Rec709Settings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.RemixSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.AudioChannelMapping"
+                    },
+                    "type": "array"
+                },
+                "ChannelsIn": {
+                    "type": "number"
+                },
+                "ChannelsOut": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.RtmpCaptionInfoDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.RtmpGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AuthenticationScheme": {
+                    "type": "string"
+                },
+                "CacheFullBehavior": {
+                    "type": "string"
+                },
+                "CacheLength": {
+                    "type": "number"
+                },
+                "CaptionData": {
+                    "type": "string"
+                },
+                "InputLossAction": {
+                    "type": "string"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.RtmpOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateMode": {
+                    "type": "string"
+                },
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "NumRetries": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte20PlusEmbeddedDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte20SourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Convert608To708": {
+                    "type": "string"
+                },
+                "Source608ChannelNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte27DestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte27SourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "OcrLanguage": {
+                    "type": "string"
+                },
+                "Pid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte35SpliceInsert": {
+            "additionalProperties": false,
+            "properties": {
+                "AdAvailOffset": {
+                    "type": "number"
+                },
+                "NoRegionalBlackoutFlag": {
+                    "type": "string"
+                },
+                "WebDeliveryAllowedFlag": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte35TimeSignalApos": {
+            "additionalProperties": false,
+            "properties": {
+                "AdAvailOffset": {
+                    "type": "number"
+                },
+                "NoRegionalBlackoutFlag": {
+                    "type": "string"
+                },
+                "WebDeliveryAllowedFlag": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.SmpteTtDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.StandardHlsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioRenditionSets": {
+                    "type": "string"
+                },
+                "M3u8Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.M3u8Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.StaticKeySettings": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyProviderServer": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "StaticKeyValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.TeletextDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.TeletextSourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "OutputRectangle": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionRectangle"
+                },
+                "PageNumber": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.TemporalFilterSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PostFilterSharpening": {
+                    "type": "string"
+                },
+                "Strength": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.TimecodeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Source": {
+                    "type": "string"
+                },
+                "SyncThreshold": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.TtmlDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "StyleControl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.UdpContainerSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "M2tsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.M2tsSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.UdpGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "InputLossAction": {
+                    "type": "string"
+                },
+                "TimedMetadataId3Frame": {
+                    "type": "string"
+                },
+                "TimedMetadataId3Period": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.UdpOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferMsec": {
+                    "type": "number"
+                },
+                "ContainerSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.UdpContainerSettings"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "FecOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FecOutputSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoBlackFailoverSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "BlackDetectThreshold": {
+                    "type": "number"
+                },
+                "VideoBlackThresholdMsec": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoCodecSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "FrameCaptureSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureSettings"
+                },
+                "H264Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H264Settings"
+                },
+                "H265Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H265Settings"
+                },
+                "Mpeg2Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Mpeg2Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "CodecSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoCodecSettings"
+                },
+                "Height": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "RespondToAfd": {
+                    "type": "string"
+                },
+                "ScalingBehavior": {
+                    "type": "string"
+                },
+                "Sharpness": {
+                    "type": "number"
+                },
+                "Width": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "ColorSpace": {
+                    "type": "string"
+                },
+                "ColorSpaceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoSelectorColorSpaceSettings"
+                },
+                "ColorSpaceUsage": {
+                    "type": "string"
+                },
+                "SelectorSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoSelectorSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoSelectorColorSpaceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Hdr10Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Hdr10Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoSelectorPid": {
+            "additionalProperties": false,
+            "properties": {
+                "Pid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoSelectorProgramId": {
+            "additionalProperties": false,
+            "properties": {
+                "ProgramId": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoSelectorSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "VideoSelectorPid": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoSelectorPid"
+                },
+                "VideoSelectorProgramId": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoSelectorProgramId"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VpcOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PublicAddressAllocationIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.WavSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "BitDepth": {
+                    "type": "number"
+                },
+                "CodingMode": {
+                    "type": "string"
+                },
+                "SampleRate": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.WebvttDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "StyleControl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "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::InputSecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "WhitelistRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::InputSecurityGroup.InputWhitelistRuleCidr"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::InputSecurityGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::InputSecurityGroup.InputWhitelistRuleCidr": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::Asset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Id": {
+                            "type": "string"
+                        },
+                        "PackagingGroupId": {
+                            "type": "string"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "SourceArn": {
+                            "type": "string"
+                        },
+                        "SourceRoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Id",
+                        "PackagingGroupId",
+                        "SourceArn",
+                        "SourceRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaPackage::Asset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::Asset.EgressEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "PackagingConfigurationId": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PackagingConfigurationId",
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EgressAccessLogs": {
+                            "$ref": "#/definitions/AWS::MediaPackage::Channel.LogConfiguration"
+                        },
+                        "Id": {
+                            "type": "string"
+                        },
+                        "IngressAccessLogs": {
+                            "$ref": "#/definitions/AWS::MediaPackage::Channel.LogConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Id"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaPackage::Channel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::Channel.LogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Authorization": {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.Authorization"
+                        },
+                        "ChannelId": {
+                            "type": "string"
+                        },
+                        "CmafPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.CmafPackage"
+                        },
+                        "DashPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.DashPackage"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "HlsPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.HlsPackage"
+                        },
+                        "Id": {
+                            "type": "string"
+                        },
+                        "ManifestName": {
+                            "type": "string"
+                        },
+                        "MssPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.MssPackage"
+                        },
+                        "Origination": {
+                            "type": "string"
+                        },
+                        "StartoverWindowSeconds": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeDelaySeconds": {
+                            "type": "number"
+                        },
+                        "Whitelist": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ChannelId",
+                        "Id"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaPackage::OriginEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.Authorization": {
+            "additionalProperties": false,
+            "properties": {
+                "CdnIdentifierSecret": {
+                    "type": "string"
+                },
+                "SecretsRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CdnIdentifierSecret",
+                "SecretsRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.CmafEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstantInitializationVector": {
+                    "type": "string"
+                },
+                "KeyRotationIntervalSeconds": {
+                    "type": "number"
+                },
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.CmafPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.CmafEncryption"
+                },
+                "HlsManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.HlsManifest"
+                    },
+                    "type": "array"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "SegmentPrefix": {
+                    "type": "string"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.StreamSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.DashEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyRotationIntervalSeconds": {
+                    "type": "number"
+                },
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.DashPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "AdTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AdsOnDeliveryRestrictions": {
+                    "type": "string"
+                },
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.DashEncryption"
+                },
+                "ManifestLayout": {
+                    "type": "string"
+                },
+                "ManifestWindowSeconds": {
+                    "type": "number"
+                },
+                "MinBufferTimeSeconds": {
+                    "type": "number"
+                },
+                "MinUpdatePeriodSeconds": {
+                    "type": "number"
+                },
+                "PeriodTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Profile": {
+                    "type": "string"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "SegmentTemplateFormat": {
+                    "type": "string"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.StreamSelection"
+                },
+                "SuggestedPresentationDelaySeconds": {
+                    "type": "number"
+                },
+                "UtcTiming": {
+                    "type": "string"
+                },
+                "UtcTimingUri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.HlsEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstantInitializationVector": {
+                    "type": "string"
+                },
+                "EncryptionMethod": {
+                    "type": "string"
+                },
+                "KeyRotationIntervalSeconds": {
+                    "type": "number"
+                },
+                "RepeatExtXKey": {
+                    "type": "boolean"
+                },
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.HlsManifest": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkers": {
+                    "type": "string"
+                },
+                "AdTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AdsOnDeliveryRestrictions": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "IncludeIframeOnlyStream": {
+                    "type": "boolean"
+                },
+                "ManifestName": {
+                    "type": "string"
+                },
+                "PlaylistType": {
+                    "type": "string"
+                },
+                "PlaylistWindowSeconds": {
+                    "type": "number"
+                },
+                "ProgramDateTimeIntervalSeconds": {
+                    "type": "number"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.HlsPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkers": {
+                    "type": "string"
+                },
+                "AdTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AdsOnDeliveryRestrictions": {
+                    "type": "string"
+                },
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.HlsEncryption"
+                },
+                "IncludeIframeOnlyStream": {
+                    "type": "boolean"
+                },
+                "PlaylistType": {
+                    "type": "string"
+                },
+                "PlaylistWindowSeconds": {
+                    "type": "number"
+                },
+                "ProgramDateTimeIntervalSeconds": {
+                    "type": "number"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.StreamSelection"
+                },
+                "UseAudioRenditionGroup": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.MssEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.MssPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.MssEncryption"
+                },
+                "ManifestWindowSeconds": {
+                    "type": "number"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.StreamSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SystemIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceId",
+                "RoleArn",
+                "SystemIds",
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.StreamSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxVideoBitsPerSecond": {
+                    "type": "number"
+                },
+                "MinVideoBitsPerSecond": {
+                    "type": "number"
+                },
+                "StreamOrder": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CmafPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.CmafPackage"
+                        },
+                        "DashPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.DashPackage"
+                        },
+                        "HlsPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.HlsPackage"
+                        },
+                        "Id": {
+                            "type": "string"
+                        },
+                        "MssPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.MssPackage"
+                        },
+                        "PackagingGroupId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Id",
+                        "PackagingGroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaPackage::PackagingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.CmafEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.CmafPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.CmafEncryption"
+                },
+                "HlsManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.HlsManifest"
+                    },
+                    "type": "array"
+                },
+                "IncludeEncoderConfigurationInSegments": {
+                    "type": "boolean"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "HlsManifests"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.DashEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.DashManifest": {
+            "additionalProperties": false,
+            "properties": {
+                "ManifestLayout": {
+                    "type": "string"
+                },
+                "ManifestName": {
+                    "type": "string"
+                },
+                "MinBufferTimeSeconds": {
+                    "type": "number"
+                },
+                "Profile": {
+                    "type": "string"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.StreamSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.DashPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "DashManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.DashManifest"
+                    },
+                    "type": "array"
+                },
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.DashEncryption"
+                },
+                "IncludeEncoderConfigurationInSegments": {
+                    "type": "boolean"
+                },
+                "PeriodTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "SegmentTemplateFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DashManifests"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.HlsEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstantInitializationVector": {
+                    "type": "string"
+                },
+                "EncryptionMethod": {
+                    "type": "string"
+                },
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.HlsManifest": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkers": {
+                    "type": "string"
+                },
+                "IncludeIframeOnlyStream": {
+                    "type": "boolean"
+                },
+                "ManifestName": {
+                    "type": "string"
+                },
+                "ProgramDateTimeIntervalSeconds": {
+                    "type": "number"
+                },
+                "RepeatExtXKey": {
+                    "type": "boolean"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.StreamSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.HlsPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.HlsEncryption"
+                },
+                "HlsManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.HlsManifest"
+                    },
+                    "type": "array"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "UseAudioRenditionGroup": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "HlsManifests"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.MssEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.MssManifest": {
+            "additionalProperties": false,
+            "properties": {
+                "ManifestName": {
+                    "type": "string"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.StreamSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.MssPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.MssEncryption"
+                },
+                "MssManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.MssManifest"
+                    },
+                    "type": "array"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MssManifests"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SystemIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SystemIds",
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.StreamSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxVideoBitsPerSecond": {
+                    "type": "number"
+                },
+                "MinVideoBitsPerSecond": {
+                    "type": "number"
+                },
+                "StreamOrder": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Authorization": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingGroup.Authorization"
+                        },
+                        "EgressAccessLogs": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingGroup.LogConfiguration"
+                        },
+                        "Id": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Id"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaPackage::PackagingGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingGroup.Authorization": {
+            "additionalProperties": false,
+            "properties": {
+                "CdnIdentifierSecret": {
+                    "type": "string"
+                },
+                "SecretsRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CdnIdentifierSecret",
+                "SecretsRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingGroup.LogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaStore::Container": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessLoggingEnabled": {
+                            "type": "boolean"
+                        },
+                        "ContainerName": {
+                            "type": "string"
+                        },
+                        "CorsPolicy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaStore::Container.CorsRule"
+                            },
+                            "type": "array"
+                        },
+                        "LifecyclePolicy": {
+                            "type": "string"
+                        },
+                        "MetricPolicy": {
+                            "$ref": "#/definitions/AWS::MediaStore::Container.MetricPolicy"
+                        },
+                        "Policy": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ContainerName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaStore::Container"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaStore::Container.CorsRule": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedOrigins": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExposeHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaxAgeSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaStore::Container.MetricPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerLevelMetrics": {
+                    "type": "string"
+                },
+                "MetricPolicyRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaStore::Container.MetricPolicyRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ContainerLevelMetrics"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaStore::Container.MetricPolicyRule": {
+            "additionalProperties": false,
+            "properties": {
+                "ObjectGroup": {
+                    "type": "string"
+                },
+                "ObjectGroupName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ObjectGroup",
+                "ObjectGroupName"
+            ],
+            "type": "object"
+        },
+        "AWS::MemoryDB::ACL": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ACLName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ACLName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MemoryDB::ACL"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MemoryDB::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ACLName": {
+                            "type": "string"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "FinalSnapshotName": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "NodeType": {
+                            "type": "string"
+                        },
+                        "NumReplicasPerShard": {
+                            "type": "number"
+                        },
+                        "NumShards": {
+                            "type": "number"
+                        },
+                        "ParameterGroupName": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnapshotArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnapshotName": {
+                            "type": "string"
+                        },
+                        "SnapshotRetentionLimit": {
+                            "type": "number"
+                        },
+                        "SnapshotWindow": {
+                            "type": "string"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SnsTopicStatus": {
+                            "type": "string"
+                        },
+                        "SubnetGroupName": {
+                            "type": "string"
+                        },
+                        "TLSEnabled": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ACLName",
+                        "ClusterName",
+                        "NodeType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MemoryDB::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MemoryDB::Cluster.Endpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MemoryDB::ParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ParameterGroupName": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Family",
+                        "ParameterGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MemoryDB::ParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MemoryDB::SubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SubnetGroupName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubnetGroupName",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MemoryDB::SubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MemoryDB::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessString": {
+                            "type": "string"
+                        },
+                        "AuthenticationMode": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AccessString",
+                        "AuthenticationMode",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MemoryDB::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatedRoles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Neptune::DBCluster.DBClusterRole"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "IamAuthEnabled": {
+                            "type": "boolean"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "RestoreToTime": {
+                            "type": "string"
+                        },
+                        "RestoreType": {
+                            "type": "string"
+                        },
+                        "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::DBClusterParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBInstanceClass": {
+                            "type": "string"
+                        },
+                        "DBInstanceIdentifier": {
+                            "type": "string"
+                        },
+                        "DBParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBSnapshotIdentifier": {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::DBParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBSubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DBSubnetGroupDescription": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBSubnetGroupDescription",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Neptune::DBSubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::Firewall": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeleteProtection": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FirewallName": {
+                            "type": "string"
+                        },
+                        "FirewallPolicyArn": {
+                            "type": "string"
+                        },
+                        "FirewallPolicyChangeProtection": {
+                            "type": "boolean"
+                        },
+                        "SubnetChangeProtection": {
+                            "type": "boolean"
+                        },
+                        "SubnetMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::NetworkFirewall::Firewall.SubnetMapping"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FirewallName",
+                        "FirewallPolicyArn",
+                        "SubnetMappings",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkFirewall::Firewall"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::Firewall.SubnetMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubnetId"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "FirewallPolicy": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.FirewallPolicy"
+                        },
+                        "FirewallPolicyName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FirewallPolicy",
+                        "FirewallPolicyName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkFirewall::FirewallPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.ActionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "PublishMetricAction": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.PublishMetricAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.CustomAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionDefinition": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.ActionDefinition"
+                },
+                "ActionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionDefinition",
+                "ActionName"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.FirewallPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "StatefulDefaultActions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StatefulEngineOptions": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.StatefulEngineOptions"
+                },
+                "StatefulRuleGroupReferences": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.StatefulRuleGroupReference"
+                    },
+                    "type": "array"
+                },
+                "StatelessCustomActions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.CustomAction"
+                    },
+                    "type": "array"
+                },
+                "StatelessDefaultActions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StatelessFragmentDefaultActions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StatelessRuleGroupReferences": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.StatelessRuleGroupReference"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "StatelessDefaultActions",
+                "StatelessFragmentDefaultActions"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.PublishMetricAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.Dimension"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Dimensions"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.StatefulEngineOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "RuleOrder": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.StatefulRuleGroupReference": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "ResourceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.StatelessRuleGroupReference": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "ResourceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Priority",
+                "ResourceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FirewallArn": {
+                            "type": "string"
+                        },
+                        "FirewallName": {
+                            "type": "string"
+                        },
+                        "LoggingConfiguration": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::LoggingConfiguration.LoggingConfiguration"
+                        }
+                    },
+                    "required": [
+                        "FirewallArn",
+                        "LoggingConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkFirewall::LoggingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::LoggingConfiguration.LogDestinationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LogDestination": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "LogDestinationType": {
+                    "type": "string"
+                },
+                "LogType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogDestination",
+                "LogDestinationType",
+                "LogType"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::LoggingConfiguration.LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogDestinationConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::LoggingConfiguration.LogDestinationConfig"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LogDestinationConfigs"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Capacity": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "RuleGroup": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleGroup"
+                        },
+                        "RuleGroupName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Capacity",
+                        "RuleGroupName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkFirewall::RuleGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.ActionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "PublishMetricAction": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.PublishMetricAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.Address": {
+            "additionalProperties": false,
+            "properties": {
+                "AddressDefinition": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AddressDefinition"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.CustomAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionDefinition": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.ActionDefinition"
+                },
+                "ActionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionDefinition",
+                "ActionName"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.Header": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                },
+                "DestinationPort": {
+                    "type": "string"
+                },
+                "Direction": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "SourcePort": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination",
+                "DestinationPort",
+                "Direction",
+                "Protocol",
+                "Source",
+                "SourcePort"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.IPSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Definition": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.MatchAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPorts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.PortRange"
+                    },
+                    "type": "array"
+                },
+                "Destinations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.Address"
+                    },
+                    "type": "array"
+                },
+                "Protocols": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "SourcePorts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.PortRange"
+                    },
+                    "type": "array"
+                },
+                "Sources": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.Address"
+                    },
+                    "type": "array"
+                },
+                "TCPFlags": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.TCPFlagField"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.PortRange": {
+            "additionalProperties": false,
+            "properties": {
+                "FromPort": {
+                    "type": "number"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FromPort",
+                "ToPort"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.PortSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Definition": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.PublishMetricAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.Dimension"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Dimensions"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RuleDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MatchAttributes": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.MatchAttributes"
+                }
+            },
+            "required": [
+                "Actions",
+                "MatchAttributes"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RuleGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "RuleVariables": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleVariables"
+                },
+                "RulesSource": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RulesSource"
+                },
+                "StatefulRuleOptions": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.StatefulRuleOptions"
+                }
+            },
+            "required": [
+                "RulesSource"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RuleOption": {
+            "additionalProperties": false,
+            "properties": {
+                "Keyword": {
+                    "type": "string"
+                },
+                "Settings": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Keyword"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RuleVariables": {
+            "additionalProperties": false,
+            "properties": {
+                "IPSets": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.IPSet"
+                        }
+                    },
+                    "type": "object"
+                },
+                "PortSets": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.PortSet"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RulesSource": {
+            "additionalProperties": false,
+            "properties": {
+                "RulesSourceList": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RulesSourceList"
+                },
+                "RulesString": {
+                    "type": "string"
+                },
+                "StatefulRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.StatefulRule"
+                    },
+                    "type": "array"
+                },
+                "StatelessRulesAndCustomActions": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.StatelessRulesAndCustomActions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RulesSourceList": {
+            "additionalProperties": false,
+            "properties": {
+                "GeneratedRulesType": {
+                    "type": "string"
+                },
+                "TargetTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Targets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "GeneratedRulesType",
+                "TargetTypes",
+                "Targets"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.StatefulRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Header": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.Header"
+                },
+                "RuleOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleOption"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Action",
+                "Header",
+                "RuleOptions"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.StatefulRuleOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "RuleOrder": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.StatelessRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "RuleDefinition": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleDefinition"
+                }
+            },
+            "required": [
+                "Priority",
+                "RuleDefinition"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.StatelessRulesAndCustomActions": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomActions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.CustomAction"
+                    },
+                    "type": "array"
+                },
+                "StatelessRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.StatelessRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "StatelessRules"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.TCPFlagField": {
+            "additionalProperties": false,
+            "properties": {
+                "Flags": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Masks": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Flags"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::CustomerGatewayAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomerGatewayArn": {
+                            "type": "string"
+                        },
+                        "DeviceId": {
+                            "type": "string"
+                        },
+                        "GlobalNetworkId": {
+                            "type": "string"
+                        },
+                        "LinkId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CustomerGatewayArn",
+                        "DeviceId",
+                        "GlobalNetworkId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::CustomerGatewayAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Device": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Location": {
+                            "$ref": "#/definitions/AWS::NetworkManager::Device.Location"
+                        },
+                        "Model": {
+                            "type": "string"
+                        },
+                        "SerialNumber": {
+                            "type": "string"
+                        },
+                        "SiteId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Vendor": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GlobalNetworkId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::Device"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Device.Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Latitude": {
+                    "type": "string"
+                },
+                "Longitude": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::GlobalNetwork": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::GlobalNetwork"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Link": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Bandwidth": {
+                            "$ref": "#/definitions/AWS::NetworkManager::Link.Bandwidth"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "GlobalNetworkId": {
+                            "type": "string"
+                        },
+                        "Provider": {
+                            "type": "string"
+                        },
+                        "SiteId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Bandwidth",
+                        "GlobalNetworkId",
+                        "SiteId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::Link"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Link.Bandwidth": {
+            "additionalProperties": false,
+            "properties": {
+                "DownloadSpeed": {
+                    "type": "number"
+                },
+                "UploadSpeed": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::LinkAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeviceId": {
+                            "type": "string"
+                        },
+                        "GlobalNetworkId": {
+                            "type": "string"
+                        },
+                        "LinkId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DeviceId",
+                        "GlobalNetworkId",
+                        "LinkId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::LinkAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Site": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Location": {
+                            "$ref": "#/definitions/AWS::NetworkManager::Site.Location"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "GlobalNetworkId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::Site"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Site.Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Latitude": {
+                    "type": "string"
+                },
+                "Longitude": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::TransitGatewayRegistration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GlobalNetworkId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GlobalNetworkId",
+                        "TransitGatewayArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::TransitGatewayRegistration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::LaunchProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Ec2SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchProfileProtocolVersions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "StreamConfiguration": {
+                            "$ref": "#/definitions/AWS::NimbleStudio::LaunchProfile.StreamConfiguration"
+                        },
+                        "StudioComponentIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "StudioId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Ec2SubnetIds",
+                        "LaunchProfileProtocolVersions",
+                        "Name",
+                        "StreamConfiguration",
+                        "StudioComponentIds",
+                        "StudioId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NimbleStudio::LaunchProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::LaunchProfile.StreamConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClipboardMode": {
+                    "type": "string"
+                },
+                "Ec2InstanceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaxSessionLengthInMinutes": {
+                    "type": "number"
+                },
+                "StreamingImageIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ClipboardMode",
+                "Ec2InstanceTypes",
+                "StreamingImageIds"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StreamingImage": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Ec2ImageId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "StudioId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Ec2ImageId",
+                        "Name",
+                        "StudioId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NimbleStudio::StreamingImage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::Studio": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdminRoleArn": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "StudioEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::NimbleStudio::Studio.StudioEncryptionConfiguration"
+                        },
+                        "StudioName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "UserRoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AdminRoleArn",
+                        "DisplayName",
+                        "StudioName",
+                        "UserRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NimbleStudio::Studio"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::Studio.StudioEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyArn": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KeyType"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.StudioComponentConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Ec2SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "InitializationScripts": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.StudioComponentInitializationScript"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ScriptParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.ScriptParameterKeyValue"
+                            },
+                            "type": "array"
+                        },
+                        "StudioId": {
+                            "type": "string"
+                        },
+                        "Subtype": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "StudioId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NimbleStudio::StudioComponent"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.ActiveDirectoryComputerAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.ActiveDirectoryConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputerAttributes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.ActiveDirectoryComputerAttribute"
+                    },
+                    "type": "array"
+                },
+                "DirectoryId": {
+                    "type": "string"
+                },
+                "OrganizationalUnitDistinguishedName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.ComputeFarmConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveDirectoryUser": {
+                    "type": "string"
+                },
+                "Endpoint": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.LicenseServiceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.ScriptParameterKeyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.SharedFileSystemConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                },
+                "FileSystemId": {
+                    "type": "string"
+                },
+                "LinuxMountPoint": {
+                    "type": "string"
+                },
+                "ShareName": {
+                    "type": "string"
+                },
+                "WindowsMountDrive": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.StudioComponentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveDirectoryConfiguration": {
+                    "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.ActiveDirectoryConfiguration"
+                },
+                "ComputeFarmConfiguration": {
+                    "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.ComputeFarmConfiguration"
+                },
+                "LicenseServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.LicenseServiceConfiguration"
+                },
+                "SharedFileSystemConfiguration": {
+                    "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.SharedFileSystemConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.StudioComponentInitializationScript": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchProfileProtocolVersion": {
+                    "type": "string"
+                },
+                "Platform": {
+                    "type": "string"
+                },
+                "RunContext": {
+                    "type": "string"
+                },
+                "Script": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessPolicies": {
+                            "type": "object"
+                        },
+                        "AdvancedOptions": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "AdvancedSecurityOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.AdvancedSecurityOptionsInput"
+                        },
+                        "ClusterConfig": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.ClusterConfig"
+                        },
+                        "CognitoOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.CognitoOptions"
+                        },
+                        "DomainEndpointOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.DomainEndpointOptions"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EBSOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.EBSOptions"
+                        },
+                        "EncryptionAtRestOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.EncryptionAtRestOptions"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "LogPublishingOptions": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::OpenSearchService::Domain.LogPublishingOption"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "NodeToNodeEncryptionOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.NodeToNodeEncryptionOptions"
+                        },
+                        "SnapshotOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.SnapshotOptions"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VPCOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.VPCOptions"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpenSearchService::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.AdvancedSecurityOptionsInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "InternalUserDatabaseEnabled": {
+                    "type": "boolean"
+                },
+                "MasterUserOptions": {
+                    "$ref": "#/definitions/AWS::OpenSearchService::Domain.MasterUserOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DedicatedMasterCount": {
+                    "type": "number"
+                },
+                "DedicatedMasterEnabled": {
+                    "type": "boolean"
+                },
+                "DedicatedMasterType": {
+                    "type": "string"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "WarmCount": {
+                    "type": "number"
+                },
+                "WarmEnabled": {
+                    "type": "boolean"
+                },
+                "WarmType": {
+                    "type": "string"
+                },
+                "ZoneAwarenessConfig": {
+                    "$ref": "#/definitions/AWS::OpenSearchService::Domain.ZoneAwarenessConfig"
+                },
+                "ZoneAwarenessEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.CognitoOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "IdentityPoolId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "UserPoolId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.DomainEndpointOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomEndpoint": {
+                    "type": "string"
+                },
+                "CustomEndpointCertificateArn": {
+                    "type": "string"
+                },
+                "CustomEndpointEnabled": {
+                    "type": "boolean"
+                },
+                "EnforceHTTPS": {
+                    "type": "boolean"
+                },
+                "TLSSecurityPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.EBSOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "EBSEnabled": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.EncryptionAtRestOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.LogPublishingOption": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsLogGroupArn": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.MasterUserOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "MasterUserARN": {
+                    "type": "string"
+                },
+                "MasterUserName": {
+                    "type": "string"
+                },
+                "MasterUserPassword": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.NodeToNodeEncryptionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.SnapshotOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomatedSnapshotStartHour": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.VPCOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.ZoneAwarenessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZoneCount": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::App": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppSource": {
+                            "$ref": "#/definitions/AWS::OpsWorks::App.Source"
+                        },
+                        "Attributes": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "DataSources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::App.DataSource"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Domains": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EnableSsl": {
+                            "type": "boolean"
+                        },
+                        "Environment": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::App.EnvironmentVariable"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Shortname": {
+                            "type": "string"
+                        },
+                        "SslConfiguration": {
+                            "$ref": "#/definitions/AWS::OpsWorks::App.SslConfiguration"
+                        },
+                        "StackId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "StackId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::App"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::App.DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::App.EnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Secure": {
+                    "type": "boolean"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::App.Source": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Revision": {
+                    "type": "string"
+                },
+                "SshKey": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::App.SslConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
+                    "type": "string"
+                },
+                "Chain": {
+                    "type": "string"
+                },
+                "PrivateKey": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::ElasticLoadBalancerAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ElasticLoadBalancerName": {
+                            "type": "string"
+                        },
+                        "LayerId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ElasticLoadBalancerName",
+                        "LayerId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::ElasticLoadBalancerAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Instance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AgentVersion": {
+                            "type": "string"
+                        },
+                        "AmiId": {
+                            "type": "string"
+                        },
+                        "Architecture": {
+                            "type": "string"
+                        },
+                        "AutoScalingType": {
+                            "type": "string"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "BlockDeviceMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::Instance.BlockDeviceMapping"
+                            },
+                            "type": "array"
+                        },
+                        "EbsOptimized": {
+                            "type": "boolean"
+                        },
+                        "ElasticIps": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Hostname": {
+                            "type": "string"
+                        },
+                        "InstallUpdatesOnBoot": {
+                            "type": "boolean"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "LayerIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Os": {
+                            "type": "string"
+                        },
+                        "RootDeviceType": {
+                            "type": "string"
+                        },
+                        "SshKeyName": {
+                            "type": "string"
+                        },
+                        "StackId": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tenancy": {
+                            "type": "string"
+                        },
+                        "TimeBasedAutoScaling": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Instance.TimeBasedAutoScaling"
+                        },
+                        "VirtualizationType": {
+                            "type": "string"
+                        },
+                        "Volumes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InstanceType",
+                        "LayerIds",
+                        "StackId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Instance.BlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::OpsWorks::Instance.EbsBlockDevice"
+                },
+                "NoDevice": {
+                    "type": "string"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Instance.EbsBlockDevice": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Instance.TimeBasedAutoScaling": {
+            "additionalProperties": false,
+            "properties": {
+                "Friday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Monday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Saturday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Sunday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Thursday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Tuesday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Wednesday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Attributes": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "AutoAssignElasticIps": {
+                            "type": "boolean"
+                        },
+                        "AutoAssignPublicIps": {
+                            "type": "boolean"
+                        },
+                        "CustomInstanceProfileArn": {
+                            "type": "string"
+                        },
+                        "CustomJson": {
+                            "type": "object"
+                        },
+                        "CustomRecipes": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Layer.Recipes"
+                        },
+                        "CustomSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EnableAutoHealing": {
+                            "type": "boolean"
+                        },
+                        "InstallUpdatesOnBoot": {
+                            "type": "boolean"
+                        },
+                        "LifecycleEventConfiguration": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Layer.LifecycleEventConfiguration"
+                        },
+                        "LoadBasedAutoScaling": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Layer.LoadBasedAutoScaling"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Packages": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Shortname": {
+                            "type": "string"
+                        },
+                        "StackId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "UseEbsOptimizedInstances": {
+                            "type": "boolean"
+                        },
+                        "VolumeConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::Layer.VolumeConfiguration"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AutoAssignElasticIps",
+                        "AutoAssignPublicIps",
+                        "EnableAutoHealing",
+                        "Name",
+                        "Shortname",
+                        "StackId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::Layer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.AutoScalingThresholds": {
+            "additionalProperties": false,
+            "properties": {
+                "CpuThreshold": {
+                    "type": "number"
+                },
+                "IgnoreMetricsTime": {
+                    "type": "number"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "LoadThreshold": {
+                    "type": "number"
+                },
+                "MemoryThreshold": {
+                    "type": "number"
+                },
+                "ThresholdsWaitTime": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.LifecycleEventConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ShutdownEventConfiguration": {
+                    "$ref": "#/definitions/AWS::OpsWorks::Layer.ShutdownEventConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.LoadBasedAutoScaling": {
+            "additionalProperties": false,
+            "properties": {
+                "DownScaling": {
+                    "$ref": "#/definitions/AWS::OpsWorks::Layer.AutoScalingThresholds"
+                },
+                "Enable": {
+                    "type": "boolean"
+                },
+                "UpScaling": {
+                    "$ref": "#/definitions/AWS::OpsWorks::Layer.AutoScalingThresholds"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.Recipes": {
+            "additionalProperties": false,
+            "properties": {
+                "Configure": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Deploy": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Setup": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Shutdown": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Undeploy": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.ShutdownEventConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DelayUntilElbConnectionsDrained": {
+                    "type": "boolean"
+                },
+                "ExecutionTimeout": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.VolumeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "MountPoint": {
+                    "type": "string"
+                },
+                "NumberOfDisks": {
+                    "type": "number"
+                },
+                "RaidLevel": {
+                    "type": "number"
+                },
+                "Size": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AgentVersion": {
+                            "type": "string"
+                        },
+                        "Attributes": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ChefConfiguration": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Stack.ChefConfiguration"
+                        },
+                        "CloneAppIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ClonePermissions": {
+                            "type": "boolean"
+                        },
+                        "ConfigurationManager": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Stack.StackConfigurationManager"
+                        },
+                        "CustomCookbooksSource": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Stack.Source"
+                        },
+                        "CustomJson": {
+                            "type": "object"
+                        },
+                        "DefaultAvailabilityZone": {
+                            "type": "string"
+                        },
+                        "DefaultInstanceProfileArn": {
+                            "type": "string"
+                        },
+                        "DefaultOs": {
+                            "type": "string"
+                        },
+                        "DefaultRootDeviceType": {
+                            "type": "string"
+                        },
+                        "DefaultSshKeyName": {
+                            "type": "string"
+                        },
+                        "DefaultSubnetId": {
+                            "type": "string"
+                        },
+                        "EcsClusterArn": {
+                            "type": "string"
+                        },
+                        "ElasticIps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::Stack.ElasticIp"
+                            },
+                            "type": "array"
+                        },
+                        "HostnameTheme": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RdsDbInstances": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::Stack.RdsDbInstance"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceRoleArn": {
+                            "type": "string"
+                        },
+                        "SourceStackId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UseCustomCookbooks": {
+                            "type": "boolean"
+                        },
+                        "UseOpsworksSecurityGroups": {
+                            "type": "boolean"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DefaultInstanceProfileArn",
+                        "Name",
+                        "ServiceRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::Stack"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack.ChefConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BerkshelfVersion": {
+                    "type": "string"
+                },
+                "ManageBerkshelf": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack.ElasticIp": {
+            "additionalProperties": false,
+            "properties": {
+                "Ip": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ip"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack.RdsDbInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DbPassword": {
+                    "type": "string"
+                },
+                "DbUser": {
+                    "type": "string"
+                },
+                "RdsDbInstanceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DbPassword",
+                "DbUser",
+                "RdsDbInstanceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack.Source": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Revision": {
+                    "type": "string"
+                },
+                "SshKey": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack.StackConfigurationManager": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::UserProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowSelfManagement": {
+                            "type": "boolean"
+                        },
+                        "IamUserArn": {
+                            "type": "string"
+                        },
+                        "SshPublicKey": {
+                            "type": "string"
+                        },
+                        "SshUsername": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "IamUserArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::UserProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Volume": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Ec2VolumeId": {
+                            "type": "string"
+                        },
+                        "MountPoint": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "StackId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Ec2VolumeId",
+                        "StackId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::Volume"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorksCM::Server": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatePublicIpAddress": {
+                            "type": "boolean"
+                        },
+                        "BackupId": {
+                            "type": "string"
+                        },
+                        "BackupRetentionCount": {
+                            "type": "number"
+                        },
+                        "CustomCertificate": {
+                            "type": "string"
+                        },
+                        "CustomDomain": {
+                            "type": "string"
+                        },
+                        "CustomPrivateKey": {
+                            "type": "string"
+                        },
+                        "DisableAutomatedBackup": {
+                            "type": "boolean"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorksCM::Server.EngineAttribute"
+                            },
+                            "type": "array"
+                        },
+                        "EngineModel": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "InstanceProfileArn": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "KeyPair": {
+                            "type": "string"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ServerName": {
+                            "type": "string"
+                        },
+                        "ServiceRoleArn": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InstanceProfileArn",
+                        "InstanceType",
+                        "ServiceRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorksCM::Server"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorksCM::Server.EngineAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Panorama::ApplicationInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationInstanceIdToReplace": {
+                            "type": "string"
+                        },
+                        "DefaultRuntimeContextDevice": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DeviceId": {
+                            "type": "string"
+                        },
+                        "ManifestOverridesPayload": {
+                            "$ref": "#/definitions/AWS::Panorama::ApplicationInstance.ManifestOverridesPayload"
+                        },
+                        "ManifestPayload": {
+                            "$ref": "#/definitions/AWS::Panorama::ApplicationInstance.ManifestPayload"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RuntimeRoleArn": {
+                            "type": "string"
+                        },
+                        "StatusFilter": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DefaultRuntimeContextDevice",
+                        "ManifestPayload"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Panorama::ApplicationInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Panorama::ApplicationInstance.ManifestOverridesPayload": {
+            "additionalProperties": false,
+            "properties": {
+                "PayloadData": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Panorama::ApplicationInstance.ManifestPayload": {
+            "additionalProperties": false,
+            "properties": {
+                "PayloadData": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Panorama::Package": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PackageName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PackageName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Panorama::Package"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Panorama::PackageVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MarkLatest": {
+                            "type": "boolean"
+                        },
+                        "OwnerAccount": {
+                            "type": "string"
+                        },
+                        "PackageId": {
+                            "type": "string"
+                        },
+                        "PackageVersion": {
+                            "type": "string"
+                        },
+                        "PatchVersion": {
+                            "type": "string"
+                        },
+                        "UpdatedLatestPatchVersion": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PackageId",
+                        "PackageVersion",
+                        "PatchVersion"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Panorama::PackageVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::ADMChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ClientId": {
+                            "type": "string"
+                        },
+                        "ClientSecret": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "ClientId",
+                        "ClientSecret"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::ADMChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::APNSChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "DefaultAuthenticationMethod": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "PrivateKey": {
+                            "type": "string"
+                        },
+                        "TeamId": {
+                            "type": "string"
+                        },
+                        "TokenKey": {
+                            "type": "string"
+                        },
+                        "TokenKeyId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::APNSChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::APNSSandboxChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "DefaultAuthenticationMethod": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "PrivateKey": {
+                            "type": "string"
+                        },
+                        "TeamId": {
+                            "type": "string"
+                        },
+                        "TokenKey": {
+                            "type": "string"
+                        },
+                        "TokenKeyId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::APNSSandboxChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::APNSVoipChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "DefaultAuthenticationMethod": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "PrivateKey": {
+                            "type": "string"
+                        },
+                        "TeamId": {
+                            "type": "string"
+                        },
+                        "TokenKey": {
+                            "type": "string"
+                        },
+                        "TokenKeyId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::APNSVoipChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::APNSVoipSandboxChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "DefaultAuthenticationMethod": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "PrivateKey": {
+                            "type": "string"
+                        },
+                        "TeamId": {
+                            "type": "string"
+                        },
+                        "TokenKey": {
+                            "type": "string"
+                        },
+                        "TokenKeyId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::APNSVoipSandboxChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::App": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::App"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::ApplicationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "CampaignHook": {
+                            "$ref": "#/definitions/AWS::Pinpoint::ApplicationSettings.CampaignHook"
+                        },
+                        "CloudWatchMetricsEnabled": {
+                            "type": "boolean"
+                        },
+                        "Limits": {
+                            "$ref": "#/definitions/AWS::Pinpoint::ApplicationSettings.Limits"
+                        },
+                        "QuietTime": {
+                            "$ref": "#/definitions/AWS::Pinpoint::ApplicationSettings.QuietTime"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::ApplicationSettings"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::ApplicationSettings.CampaignHook": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaFunctionName": {
+                    "type": "string"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "WebUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::ApplicationSettings.Limits": {
+            "additionalProperties": false,
+            "properties": {
+                "Daily": {
+                    "type": "number"
+                },
+                "MaximumDuration": {
+                    "type": "number"
+                },
+                "MessagesPerSecond": {
+                    "type": "number"
+                },
+                "Total": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::ApplicationSettings.QuietTime": {
+            "additionalProperties": false,
+            "properties": {
+                "End": {
+                    "type": "string"
+                },
+                "Start": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "End",
+                "Start"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::BaiduChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiKey": {
+                            "type": "string"
+                        },
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "SecretKey": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiKey",
+                        "ApplicationId",
+                        "SecretKey"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::BaiduChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdditionalTreatments": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Pinpoint::Campaign.WriteTreatmentResource"
+                            },
+                            "type": "array"
+                        },
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "CampaignHook": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Campaign.CampaignHook"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "HoldoutPercent": {
+                            "type": "number"
+                        },
+                        "IsPaused": {
+                            "type": "boolean"
+                        },
+                        "Limits": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Campaign.Limits"
+                        },
+                        "MessageConfiguration": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Campaign.MessageConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        },
+                        "Schedule": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Campaign.Schedule"
+                        },
+                        "SegmentId": {
+                            "type": "string"
+                        },
+                        "SegmentVersion": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TreatmentDescription": {
+                            "type": "string"
+                        },
+                        "TreatmentName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "MessageConfiguration",
+                        "Name",
+                        "Schedule",
+                        "SegmentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::Campaign"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.AttributeDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeType": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.CampaignEmailMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "Body": {
+                    "type": "string"
+                },
+                "FromAddress": {
+                    "type": "string"
+                },
+                "HtmlBody": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.CampaignEventFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.EventDimensions"
+                },
+                "FilterType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.CampaignHook": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaFunctionName": {
+                    "type": "string"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "WebUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.CampaignInAppMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "Content": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pinpoint::Campaign.InAppMessageContent"
+                    },
+                    "type": "array"
+                },
+                "CustomConfig": {
+                    "type": "object"
+                },
+                "Layout": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.CampaignSmsMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "Body": {
+                    "type": "string"
+                },
+                "EntityId": {
+                    "type": "string"
+                },
+                "MessageType": {
+                    "type": "string"
+                },
+                "OriginationNumber": {
+                    "type": "string"
+                },
+                "SenderId": {
+                    "type": "string"
+                },
+                "TemplateId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.DefaultButtonConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BorderRadius": {
+                    "type": "number"
+                },
+                "ButtonAction": {
+                    "type": "string"
+                },
+                "Link": {
+                    "type": "string"
+                },
+                "Text": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.EventDimensions": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "type": "object"
+                },
+                "EventType": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.SetDimension"
+                },
+                "Metrics": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.InAppMessageBodyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.InAppMessageButton": {
+            "additionalProperties": false,
+            "properties": {
+                "Android": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.OverrideButtonConfiguration"
+                },
+                "DefaultConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.DefaultButtonConfiguration"
+                },
+                "IOS": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.OverrideButtonConfiguration"
+                },
+                "Web": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.OverrideButtonConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.InAppMessageContent": {
+            "additionalProperties": false,
+            "properties": {
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BodyConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.InAppMessageBodyConfig"
+                },
+                "HeaderConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.InAppMessageHeaderConfig"
+                },
+                "ImageUrl": {
+                    "type": "string"
+                },
+                "PrimaryBtn": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.InAppMessageButton"
+                },
+                "SecondaryBtn": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.InAppMessageButton"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.InAppMessageHeaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "Header": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.Limits": {
+            "additionalProperties": false,
+            "properties": {
+                "Daily": {
+                    "type": "number"
+                },
+                "MaximumDuration": {
+                    "type": "number"
+                },
+                "MessagesPerSecond": {
+                    "type": "number"
+                },
+                "Session": {
+                    "type": "number"
+                },
+                "Total": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.Message": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "ImageIconUrl": {
+                    "type": "string"
+                },
+                "ImageSmallIconUrl": {
+                    "type": "string"
+                },
+                "ImageUrl": {
+                    "type": "string"
+                },
+                "JsonBody": {
+                    "type": "string"
+                },
+                "MediaUrl": {
+                    "type": "string"
+                },
+                "RawContent": {
+                    "type": "string"
+                },
+                "SilentPush": {
+                    "type": "boolean"
+                },
+                "TimeToLive": {
+                    "type": "number"
+                },
+                "Title": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.MessageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ADMMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Message"
+                },
+                "APNSMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Message"
+                },
+                "BaiduMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Message"
+                },
+                "DefaultMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Message"
+                },
+                "EmailMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.CampaignEmailMessage"
+                },
+                "GCMMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Message"
+                },
+                "InAppMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.CampaignInAppMessage"
+                },
+                "SMSMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.CampaignSmsMessage"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.OverrideButtonConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ButtonAction": {
+                    "type": "string"
+                },
+                "Link": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.QuietTime": {
+            "additionalProperties": false,
+            "properties": {
+                "End": {
+                    "type": "string"
+                },
+                "Start": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "End",
+                "Start"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "EndTime": {
+                    "type": "string"
+                },
+                "EventFilter": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.CampaignEventFilter"
+                },
+                "Frequency": {
+                    "type": "string"
+                },
+                "IsLocalTime": {
+                    "type": "boolean"
+                },
+                "QuietTime": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.QuietTime"
+                },
+                "StartTime": {
+                    "type": "string"
+                },
+                "TimeZone": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.SetDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionType": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.WriteTreatmentResource": {
+            "additionalProperties": false,
+            "properties": {
+                "MessageConfiguration": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.MessageConfiguration"
+                },
+                "Schedule": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Schedule"
+                },
+                "SizePercent": {
+                    "type": "number"
+                },
+                "TreatmentDescription": {
+                    "type": "string"
+                },
+                "TreatmentName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::EmailChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ConfigurationSet": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "FromAddress": {
+                            "type": "string"
+                        },
+                        "Identity": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "FromAddress",
+                        "Identity"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::EmailChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::EmailTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DefaultSubstitutions": {
+                            "type": "string"
+                        },
+                        "HtmlPart": {
+                            "type": "string"
+                        },
+                        "Subject": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TemplateDescription": {
+                            "type": "string"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        },
+                        "TextPart": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Subject",
+                        "TemplateName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::EmailTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::EventStream": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DestinationStreamArn": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "DestinationStreamArn",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::EventStream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::GCMChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiKey": {
+                            "type": "string"
+                        },
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ApiKey",
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::GCMChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Content": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.InAppMessageContent"
+                            },
+                            "type": "array"
+                        },
+                        "CustomConfig": {
+                            "type": "object"
+                        },
+                        "Layout": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TemplateDescription": {
+                            "type": "string"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TemplateName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::InAppTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.BodyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.ButtonConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Android": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.OverrideButtonConfiguration"
+                },
+                "DefaultConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.DefaultButtonConfiguration"
+                },
+                "IOS": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.OverrideButtonConfiguration"
+                },
+                "Web": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.OverrideButtonConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.DefaultButtonConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BorderRadius": {
+                    "type": "number"
+                },
+                "ButtonAction": {
+                    "type": "string"
+                },
+                "Link": {
+                    "type": "string"
+                },
+                "Text": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.HeaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "Header": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.InAppMessageContent": {
+            "additionalProperties": false,
+            "properties": {
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BodyConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.BodyConfig"
+                },
+                "HeaderConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.HeaderConfig"
+                },
+                "ImageUrl": {
+                    "type": "string"
+                },
+                "PrimaryBtn": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.ButtonConfig"
+                },
+                "SecondaryBtn": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.ButtonConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.OverrideButtonConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ButtonAction": {
+                    "type": "string"
+                },
+                "Link": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::PushTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ADM": {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate.AndroidPushNotificationTemplate"
+                        },
+                        "APNS": {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate.APNSPushNotificationTemplate"
+                        },
+                        "Baidu": {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate.AndroidPushNotificationTemplate"
+                        },
+                        "Default": {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate.DefaultPushNotificationTemplate"
+                        },
+                        "DefaultSubstitutions": {
+                            "type": "string"
+                        },
+                        "GCM": {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate.AndroidPushNotificationTemplate"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TemplateDescription": {
+                            "type": "string"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TemplateName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::PushTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::PushTemplate.APNSPushNotificationTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "MediaUrl": {
+                    "type": "string"
+                },
+                "Sound": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::PushTemplate.AndroidPushNotificationTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "ImageIconUrl": {
+                    "type": "string"
+                },
+                "ImageUrl": {
+                    "type": "string"
+                },
+                "SmallImageIconUrl": {
+                    "type": "string"
+                },
+                "Sound": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::PushTemplate.DefaultPushNotificationTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "Sound": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::SMSChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "SenderId": {
+                            "type": "string"
+                        },
+                        "ShortCode": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::SMSChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Dimensions": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Segment.SegmentDimensions"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SegmentGroups": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Segment.SegmentGroups"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::Segment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.AttributeDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeType": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Behavior": {
+            "additionalProperties": false,
+            "properties": {
+                "Recency": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.Recency"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Coordinates": {
+            "additionalProperties": false,
+            "properties": {
+                "Latitude": {
+                    "type": "number"
+                },
+                "Longitude": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Latitude",
+                "Longitude"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Demographic": {
+            "additionalProperties": false,
+            "properties": {
+                "AppVersion": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "Channel": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "DeviceType": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "Make": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "Model": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "Platform": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.GPSPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "Coordinates": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.Coordinates"
+                },
+                "RangeInKilometers": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Coordinates",
+                "RangeInKilometers"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Groups": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pinpoint::Segment.SegmentDimensions"
+                    },
+                    "type": "array"
+                },
+                "SourceSegments": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pinpoint::Segment.SourceSegments"
+                    },
+                    "type": "array"
+                },
+                "SourceType": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Country": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "GPSPoint": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.GPSPoint"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Recency": {
+            "additionalProperties": false,
+            "properties": {
+                "Duration": {
+                    "type": "string"
+                },
+                "RecencyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Duration",
+                "RecencyType"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.SegmentDimensions": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "type": "object"
+                },
+                "Behavior": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.Behavior"
+                },
+                "Demographic": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.Demographic"
+                },
+                "Location": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.Location"
+                },
+                "Metrics": {
+                    "type": "object"
+                },
+                "UserAttributes": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.SegmentGroups": {
+            "additionalProperties": false,
+            "properties": {
+                "Groups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pinpoint::Segment.Groups"
+                    },
+                    "type": "array"
+                },
+                "Include": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.SetDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionType": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.SourceSegments": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::SmsTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Body": {
+                            "type": "string"
+                        },
+                        "DefaultSubstitutions": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TemplateDescription": {
+                            "type": "string"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Body",
+                        "TemplateName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::SmsTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::VoiceChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::VoiceChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeliveryOptions": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet.DeliveryOptions"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ReputationOptions": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet.ReputationOptions"
+                        },
+                        "SendingOptions": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet.SendingOptions"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet.Tags"
+                            },
+                            "type": "array"
+                        },
+                        "TrackingOptions": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet.TrackingOptions"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PinpointEmail::ConfigurationSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet.DeliveryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "SendingPoolName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet.ReputationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "ReputationMetricsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet.SendingOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "SendingEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet.TrackingOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomRedirectDomain": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigurationSetName": {
+                            "type": "string"
+                        },
+                        "EventDestination": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.EventDestination"
+                        },
+                        "EventDestinationName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationSetName",
+                        "EventDestinationName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PinpointEmail::ConfigurationSetEventDestination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.CloudWatchDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.DimensionConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.DimensionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultDimensionValue": {
+                    "type": "string"
+                },
+                "DimensionName": {
+                    "type": "string"
+                },
+                "DimensionValueSource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DefaultDimensionValue",
+                "DimensionName",
+                "DimensionValueSource"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.EventDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchDestination": {
+                    "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.CloudWatchDestination"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "KinesisFirehoseDestination": {
+                    "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.KinesisFirehoseDestination"
+                },
+                "MatchingEventTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PinpointDestination": {
+                    "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.PinpointDestination"
+                },
+                "SnsDestination": {
+                    "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.SnsDestination"
+                }
+            },
+            "required": [
+                "MatchingEventTypes"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.KinesisFirehoseDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStreamArn": {
+                    "type": "string"
+                },
+                "IamRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStreamArn",
+                "IamRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.PinpointDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.SnsDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::DedicatedIpPool": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PoolName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::PinpointEmail::DedicatedIpPool.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PinpointEmail::DedicatedIpPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::DedicatedIpPool.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::Identity": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DkimSigningEnabled": {
+                            "type": "boolean"
+                        },
+                        "FeedbackForwardingEnabled": {
+                            "type": "boolean"
+                        },
+                        "MailFromAttributes": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::Identity.MailFromAttributes"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::PinpointEmail::Identity.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PinpointEmail::Identity"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::Identity.MailFromAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "BehaviorOnMxFailure": {
+                    "type": "string"
+                },
+                "MailFromDomain": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::Identity.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QLDB::Ledger": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "KmsKey": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PermissionsMode": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PermissionsMode"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QLDB::Ledger"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QLDB::Stream": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExclusiveEndTime": {
+                            "type": "string"
+                        },
+                        "InclusiveStartTime": {
+                            "type": "string"
+                        },
+                        "KinesisConfiguration": {
+                            "$ref": "#/definitions/AWS::QLDB::Stream.KinesisConfiguration"
+                        },
+                        "LedgerName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StreamName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InclusiveStartTime",
+                        "KinesisConfiguration",
+                        "LedgerName",
+                        "RoleArn",
+                        "StreamName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QLDB::Stream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QLDB::Stream.KinesisConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregationEnabled": {
+                    "type": "boolean"
+                },
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AnalysisId": {
+                            "type": "string"
+                        },
+                        "AwsAccountId": {
+                            "type": "string"
+                        },
+                        "Errors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Analysis.AnalysisError"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "$ref": "#/definitions/AWS::QuickSight::Analysis.Parameters"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Analysis.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SourceEntity": {
+                            "$ref": "#/definitions/AWS::QuickSight::Analysis.AnalysisSourceEntity"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThemeArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AnalysisId",
+                        "AwsAccountId",
+                        "SourceEntity"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Analysis"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.AnalysisError": {
+            "additionalProperties": false,
+            "properties": {
+                "Message": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.AnalysisSourceEntity": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceTemplate": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.AnalysisSourceTemplate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.AnalysisSourceTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "DataSetReferences": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DataSetReference"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn",
+                "DataSetReferences"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.DataSetReference": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSetArn": {
+                    "type": "string"
+                },
+                "DataSetPlaceholder": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSetArn",
+                "DataSetPlaceholder"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.DateTimeParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.DecimalParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.IntegerParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.Parameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DateTimeParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DateTimeParameter"
+                    },
+                    "type": "array"
+                },
+                "DecimalParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DecimalParameter"
+                    },
+                    "type": "array"
+                },
+                "IntegerParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.IntegerParameter"
+                    },
+                    "type": "array"
+                },
+                "StringParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.StringParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.Sheet": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SheetId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.StringParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DashboardId": {
+                            "type": "string"
+                        },
+                        "DashboardPublishOptions": {
+                            "$ref": "#/definitions/AWS::QuickSight::Dashboard.DashboardPublishOptions"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "$ref": "#/definitions/AWS::QuickSight::Dashboard.Parameters"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Dashboard.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SourceEntity": {
+                            "$ref": "#/definitions/AWS::QuickSight::Dashboard.DashboardSourceEntity"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThemeArn": {
+                            "type": "string"
+                        },
+                        "VersionDescription": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AwsAccountId",
+                        "DashboardId",
+                        "SourceEntity"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Dashboard"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.AdHocFilteringOption": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityStatus": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DashboardPublishOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "AdHocFilteringOption": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.AdHocFilteringOption"
+                },
+                "ExportToCSVOption": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ExportToCSVOption"
+                },
+                "SheetControlsOption": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.SheetControlsOption"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DashboardSourceEntity": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceTemplate": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.DashboardSourceTemplate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DashboardSourceTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "DataSetReferences": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DataSetReference"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn",
+                "DataSetReferences"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DataSetReference": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSetArn": {
+                    "type": "string"
+                },
+                "DataSetPlaceholder": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSetArn",
+                "DataSetPlaceholder"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DateTimeParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DecimalParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.ExportToCSVOption": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityStatus": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.IntegerParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.Parameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DateTimeParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DateTimeParameter"
+                    },
+                    "type": "array"
+                },
+                "DecimalParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DecimalParameter"
+                    },
+                    "type": "array"
+                },
+                "IntegerParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.IntegerParameter"
+                    },
+                    "type": "array"
+                },
+                "StringParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.StringParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.SheetControlsOption": {
+            "additionalProperties": false,
+            "properties": {
+                "VisibilityState": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.StringParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ColumnGroups": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::DataSet.ColumnGroup"
+                            },
+                            "type": "array"
+                        },
+                        "ColumnLevelPermissionRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::DataSet.ColumnLevelPermissionRule"
+                            },
+                            "type": "array"
+                        },
+                        "DataSetId": {
+                            "type": "string"
+                        },
+                        "FieldFolders": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::QuickSight::DataSet.FieldFolder"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ImportMode": {
+                            "type": "string"
+                        },
+                        "IngestionWaitPolicy": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSet.IngestionWaitPolicy"
+                        },
+                        "LogicalTableMap": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::QuickSight::DataSet.LogicalTable"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::DataSet.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "PhysicalTableMap": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::QuickSight::DataSet.PhysicalTable"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "RowLevelPermissionDataSet": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSet.RowLevelPermissionDataSet"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::DataSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.CalculatedColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnId": {
+                    "type": "string"
+                },
+                "ColumnName": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnId",
+                "ColumnName",
+                "Expression"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.CastColumnTypeOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                },
+                "NewColumnType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "NewColumnType"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ColumnDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ColumnGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "GeoSpatialColumnGroup": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.GeoSpatialColumnGroup"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ColumnLevelPermissionRule": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principals": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ColumnTag": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnDescription": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.ColumnDescription"
+                },
+                "ColumnGeographicRole": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.CreateColumnsOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.CalculatedColumn"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Columns"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.CustomSql": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.InputColumn"
+                    },
+                    "type": "array"
+                },
+                "DataSourceArn": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SqlQuery": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Columns",
+                "DataSourceArn",
+                "Name",
+                "SqlQuery"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.FieldFolder": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Description": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.FilterOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ConditionExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConditionExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.GeoSpatialColumnGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CountryCode": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Columns",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.IngestionWaitPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "IngestionWaitTimeInHours": {
+                    "type": "number"
+                },
+                "WaitForSpiceIngestion": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.InputColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.JoinInstruction": {
+            "additionalProperties": false,
+            "properties": {
+                "LeftJoinKeyProperties": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.JoinKeyProperties"
+                },
+                "LeftOperand": {
+                    "type": "string"
+                },
+                "OnClause": {
+                    "type": "string"
+                },
+                "RightJoinKeyProperties": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.JoinKeyProperties"
+                },
+                "RightOperand": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LeftOperand",
+                "OnClause",
+                "RightOperand",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.JoinKeyProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "UniqueKey": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.LogicalTable": {
+            "additionalProperties": false,
+            "properties": {
+                "Alias": {
+                    "type": "string"
+                },
+                "DataTransforms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.TransformOperation"
+                    },
+                    "type": "array"
+                },
+                "Source": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.LogicalTableSource"
+                }
+            },
+            "required": [
+                "Alias",
+                "Source"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.LogicalTableSource": {
+            "additionalProperties": false,
+            "properties": {
+                "JoinInstruction": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.JoinInstruction"
+                },
+                "PhysicalTableId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.OutputColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.PhysicalTable": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomSql": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.CustomSql"
+                },
+                "RelationalTable": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.RelationalTable"
+                },
+                "S3Source": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.S3Source"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ProjectOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ProjectedColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ProjectedColumns"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.RelationalTable": {
+            "additionalProperties": false,
+            "properties": {
+                "Catalog": {
+                    "type": "string"
+                },
+                "DataSourceArn": {
+                    "type": "string"
+                },
+                "InputColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.InputColumn"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Schema": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceArn",
+                "InputColumns",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.RenameColumnOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "NewColumnName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "NewColumnName"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.RowLevelPermissionDataSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "FormatVersion": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "PermissionPolicy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn",
+                "PermissionPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.S3Source": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceArn": {
+                    "type": "string"
+                },
+                "InputColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.InputColumn"
+                    },
+                    "type": "array"
+                },
+                "UploadSettings": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.UploadSettings"
+                }
+            },
+            "required": [
+                "DataSourceArn",
+                "InputColumns"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.TagColumnOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.ColumnTag"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "Tags"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.TransformOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "CastColumnTypeOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.CastColumnTypeOperation"
+                },
+                "CreateColumnsOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.CreateColumnsOperation"
+                },
+                "FilterOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.FilterOperation"
+                },
+                "ProjectOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.ProjectOperation"
+                },
+                "RenameColumnOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.RenameColumnOperation"
+                },
+                "TagColumnOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.TagColumnOperation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.UploadSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainsHeader": {
+                    "type": "boolean"
+                },
+                "Delimiter": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                },
+                "StartFromRow": {
+                    "type": "number"
+                },
+                "TextQualifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AlternateDataSourceParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::DataSource.DataSourceParameters"
+                            },
+                            "type": "array"
+                        },
+                        "AwsAccountId": {
+                            "type": "string"
+                        },
+                        "Credentials": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource.DataSourceCredentials"
+                        },
+                        "DataSourceId": {
+                            "type": "string"
+                        },
+                        "DataSourceParameters": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource.DataSourceParameters"
+                        },
+                        "ErrorInfo": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource.DataSourceErrorInfo"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::DataSource.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SslProperties": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource.SslProperties"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "VpcConnectionProperties": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource.VpcConnectionProperties"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::DataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.AmazonElasticsearchParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Domain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Domain"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.AmazonOpenSearchParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Domain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Domain"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.AthenaParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "WorkGroup": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.AuroraParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.AuroraPostgreSqlParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.CredentialPair": {
+            "additionalProperties": false,
+            "properties": {
+                "AlternateDataSourceParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSource.DataSourceParameters"
+                    },
+                    "type": "array"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.DataSourceCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "CopySourceArn": {
+                    "type": "string"
+                },
+                "CredentialPair": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.CredentialPair"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.DataSourceErrorInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Message": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.DataSourceParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "AmazonElasticsearchParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.AmazonElasticsearchParameters"
+                },
+                "AmazonOpenSearchParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.AmazonOpenSearchParameters"
+                },
+                "AthenaParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.AthenaParameters"
+                },
+                "AuroraParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.AuroraParameters"
+                },
+                "AuroraPostgreSqlParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.AuroraPostgreSqlParameters"
+                },
+                "MariaDbParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.MariaDbParameters"
+                },
+                "MySqlParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.MySqlParameters"
+                },
+                "OracleParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.OracleParameters"
+                },
+                "PostgreSqlParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.PostgreSqlParameters"
+                },
+                "PrestoParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.PrestoParameters"
+                },
+                "RdsParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.RdsParameters"
+                },
+                "RedshiftParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.RedshiftParameters"
+                },
+                "S3Parameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.S3Parameters"
+                },
+                "SnowflakeParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.SnowflakeParameters"
+                },
+                "SparkParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.SparkParameters"
+                },
+                "SqlServerParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.SqlServerParameters"
+                },
+                "TeradataParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.TeradataParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.ManifestFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.MariaDbParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.MySqlParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.OracleParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.PostgreSqlParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.PrestoParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Catalog": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Catalog",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.RdsParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "InstanceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Database",
+                "InstanceId"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.RedshiftParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterId": {
+                    "type": "string"
+                },
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.S3Parameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ManifestFileLocation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.ManifestFileLocation"
+                }
+            },
+            "required": [
+                "ManifestFileLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.SnowflakeParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Warehouse": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Warehouse"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.SparkParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.SqlServerParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.SslProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DisableSsl": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.TeradataParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.VpcConnectionProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "VpcConnectionArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VpcConnectionArn"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Template.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SourceEntity": {
+                            "$ref": "#/definitions/AWS::QuickSight::Template.TemplateSourceEntity"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateId": {
+                            "type": "string"
+                        },
+                        "VersionDescription": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AwsAccountId",
+                        "SourceEntity",
+                        "TemplateId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Template"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.DataSetReference": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSetArn": {
+                    "type": "string"
+                },
+                "DataSetPlaceholder": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSetArn",
+                "DataSetPlaceholder"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.TemplateSourceAnalysis": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "DataSetReferences": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DataSetReference"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn",
+                "DataSetReferences"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.TemplateSourceEntity": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceAnalysis": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.TemplateSourceAnalysis"
+                },
+                "SourceTemplate": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.TemplateSourceTemplate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.TemplateSourceTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "BaseThemeId": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::QuickSight::Theme.ThemeConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Theme.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThemeId": {
+                            "type": "string"
+                        },
+                        "VersionDescription": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AwsAccountId",
+                        "ThemeId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Theme"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.BorderStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Show": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.DataColorPalette": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EmptyFillColor": {
+                    "type": "string"
+                },
+                "MinMaxGradient": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.Font": {
+            "additionalProperties": false,
+            "properties": {
+                "FontFamily": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.GutterStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Show": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.MarginStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Show": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.SheetStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Tile": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.TileStyle"
+                },
+                "TileLayout": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.TileLayoutStyle"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.ThemeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DataColorPalette": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.DataColorPalette"
+                },
+                "Sheet": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.SheetStyle"
+                },
+                "Typography": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.Typography"
+                },
+                "UIColorPalette": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.UIColorPalette"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.TileLayoutStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Gutter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.GutterStyle"
+                },
+                "Margin": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.MarginStyle"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.TileStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Border": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.BorderStyle"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.Typography": {
+            "additionalProperties": false,
+            "properties": {
+                "FontFamilies": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Theme.Font"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.UIColorPalette": {
+            "additionalProperties": false,
+            "properties": {
+                "Accent": {
+                    "type": "string"
+                },
+                "AccentForeground": {
+                    "type": "string"
+                },
+                "Danger": {
+                    "type": "string"
+                },
+                "DangerForeground": {
+                    "type": "string"
+                },
+                "Dimension": {
+                    "type": "string"
+                },
+                "DimensionForeground": {
+                    "type": "string"
+                },
+                "Measure": {
+                    "type": "string"
+                },
+                "MeasureForeground": {
+                    "type": "string"
+                },
+                "PrimaryBackground": {
+                    "type": "string"
+                },
+                "PrimaryForeground": {
+                    "type": "string"
+                },
+                "SecondaryBackground": {
+                    "type": "string"
+                },
+                "SecondaryForeground": {
+                    "type": "string"
+                },
+                "Success": {
+                    "type": "string"
+                },
+                "SuccessForeground": {
+                    "type": "string"
+                },
+                "Warning": {
+                    "type": "string"
+                },
+                "WarningForeground": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RAM::ResourceShare": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowExternalPrincipals": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PermissionArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Principals": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ResourceArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RAM::ResourceShare"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatedRoles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBCluster.DBClusterRole"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BacktrackWindow": {
+                            "type": "number"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "CopyTagsToSnapshot": {
+                            "type": "boolean"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EnableHttpEndpoint": {
+                            "type": "boolean"
+                        },
+                        "EnableIAMDatabaseAuthentication": {
+                            "type": "boolean"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineMode": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "GlobalClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MasterUserPassword": {
+                            "type": "string"
+                        },
+                        "MasterUsername": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "ReplicationSourceIdentifier": {
+                            "type": "string"
+                        },
+                        "RestoreType": {
+                            "type": "string"
+                        },
+                        "ScalingConfiguration": {
+                            "$ref": "#/definitions/AWS::RDS::DBCluster.ScalingConfiguration"
+                        },
+                        "SnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceDBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceRegion": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UseLatestRestorableTime": {
+                            "type": "boolean"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Engine"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBCluster.DBClusterRole": {
+            "additionalProperties": false,
+            "properties": {
+                "FeatureName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBCluster.ScalingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoPause": {
+                    "type": "boolean"
+                },
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                },
+                "SecondsUntilAutoPause": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBClusterParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "Family",
+                        "Parameters"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBClusterParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocatedStorage": {
+                            "type": "string"
+                        },
+                        "AllowMajorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AssociatedRoles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBInstance.DBInstanceRole"
+                            },
+                            "type": "array"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "CACertificateIdentifier": {
+                            "type": "string"
+                        },
+                        "CharacterSetName": {
+                            "type": "string"
+                        },
+                        "CopyTagsToSnapshot": {
+                            "type": "boolean"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBInstanceClass": {
+                            "type": "string"
+                        },
+                        "DBInstanceIdentifier": {
+                            "type": "string"
+                        },
+                        "DBName": {
+                            "type": "string"
+                        },
+                        "DBParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DBSnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DeleteAutomatedBackups": {
+                            "type": "boolean"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "DomainIAMRoleName": {
+                            "type": "string"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EnableIAMDatabaseAuthentication": {
+                            "type": "boolean"
+                        },
+                        "EnablePerformanceInsights": {
+                            "type": "boolean"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "Iops": {
+                            "type": "number"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LicenseModel": {
+                            "type": "string"
+                        },
+                        "MasterUserPassword": {
+                            "type": "string"
+                        },
+                        "MasterUsername": {
+                            "type": "string"
+                        },
+                        "MaxAllocatedStorage": {
+                            "type": "number"
+                        },
+                        "MonitoringInterval": {
+                            "type": "number"
+                        },
+                        "MonitoringRoleArn": {
+                            "type": "string"
+                        },
+                        "MultiAZ": {
+                            "type": "boolean"
+                        },
+                        "OptionGroupName": {
+                            "type": "string"
+                        },
+                        "PerformanceInsightsKMSKeyId": {
+                            "type": "string"
+                        },
+                        "PerformanceInsightsRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "Port": {
+                            "type": "string"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "ProcessorFeatures": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBInstance.ProcessorFeature"
+                            },
+                            "type": "array"
+                        },
+                        "PromotionTier": {
+                            "type": "number"
+                        },
+                        "PubliclyAccessible": {
+                            "type": "boolean"
+                        },
+                        "SourceDBInstanceIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceRegion": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        },
+                        "StorageType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Timezone": {
+                            "type": "string"
+                        },
+                        "UseDefaultProcessorFeatures": {
+                            "type": "boolean"
+                        },
+                        "VPCSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBInstanceClass"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBInstance.DBInstanceRole": {
+            "additionalProperties": false,
+            "properties": {
+                "FeatureName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FeatureName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBInstance.ProcessorFeature": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "Family"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBProxy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Auth": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBProxy.AuthFormat"
+                            },
+                            "type": "array"
+                        },
+                        "DBProxyName": {
+                            "type": "string"
+                        },
+                        "DebugLogging": {
+                            "type": "boolean"
+                        },
+                        "EngineFamily": {
+                            "type": "string"
+                        },
+                        "IdleClientTimeout": {
+                            "type": "number"
+                        },
+                        "RequireTLS": {
+                            "type": "boolean"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBProxy.TagFormat"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Auth",
+                        "DBProxyName",
+                        "EngineFamily",
+                        "RoleArn",
+                        "VpcSubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBProxy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBProxy.AuthFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthScheme": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "IAMAuth": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "UserName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBProxy.TagFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBProxyEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DBProxyEndpointName": {
+                            "type": "string"
+                        },
+                        "DBProxyName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBProxyEndpoint.TagFormat"
+                            },
+                            "type": "array"
+                        },
+                        "TargetRole": {
+                            "type": "string"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBProxyEndpointName",
+                        "DBProxyName",
+                        "VpcSubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBProxyEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBProxyEndpoint.TagFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBProxyTargetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionPoolConfigurationInfo": {
+                            "$ref": "#/definitions/AWS::RDS::DBProxyTargetGroup.ConnectionPoolConfigurationInfoFormat"
+                        },
+                        "DBClusterIdentifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DBInstanceIdentifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DBProxyName": {
+                            "type": "string"
+                        },
+                        "TargetGroupName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DBProxyName",
+                        "TargetGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBProxyTargetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBProxyTargetGroup.ConnectionPoolConfigurationInfoFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionBorrowTimeout": {
+                    "type": "number"
+                },
+                "InitQuery": {
+                    "type": "string"
+                },
+                "MaxConnectionsPercent": {
+                    "type": "number"
+                },
+                "MaxIdleConnectionsPercent": {
+                    "type": "number"
+                },
+                "SessionPinningFilters": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBSecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DBSecurityGroupIngress": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBSecurityGroup.Ingress"
+                            },
+                            "type": "array"
+                        },
+                        "EC2VpcId": {
+                            "type": "string"
+                        },
+                        "GroupDescription": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBSecurityGroupIngress",
+                        "GroupDescription"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBSecurityGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBSecurityGroup.Ingress": {
+            "additionalProperties": false,
+            "properties": {
+                "CIDRIP": {
+                    "type": "string"
+                },
+                "EC2SecurityGroupId": {
+                    "type": "string"
+                },
+                "EC2SecurityGroupName": {
+                    "type": "string"
+                },
+                "EC2SecurityGroupOwnerId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBSecurityGroupIngress": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CIDRIP": {
+                            "type": "string"
+                        },
+                        "DBSecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupId": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupOwnerId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DBSecurityGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBSecurityGroupIngress"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBSubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DBSubnetGroupDescription": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBSubnetGroupDescription",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBSubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::EventSubscription": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "EventCategories": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SourceIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SourceType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SnsTopicArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::EventSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::GlobalCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "GlobalClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceDBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::GlobalCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::OptionGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EngineName": {
+                            "type": "string"
+                        },
+                        "MajorEngineVersion": {
+                            "type": "string"
+                        },
+                        "OptionConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::OptionGroup.OptionConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "OptionGroupDescription": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EngineName",
+                        "MajorEngineVersion",
+                        "OptionConfigurations",
+                        "OptionGroupDescription"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::OptionGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::OptionGroup.OptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DBSecurityGroupMemberships": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OptionName": {
+                    "type": "string"
+                },
+                "OptionSettings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::RDS::OptionGroup.OptionSetting"
+                    },
+                    "type": "array"
+                },
+                "OptionVersion": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "VpcSecurityGroupMemberships": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "OptionName"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::OptionGroup.OptionSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RUM::AppMonitor": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppMonitorConfiguration": {
+                            "$ref": "#/definitions/AWS::RUM::AppMonitor.AppMonitorConfiguration"
+                        },
+                        "CwLogEnabled": {
+                            "type": "boolean"
+                        },
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RUM::AppMonitor"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::RUM::AppMonitor.AppMonitorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowCookies": {
+                    "type": "boolean"
+                },
+                "EnableXRay": {
+                    "type": "boolean"
+                },
+                "ExcludedPages": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FavoritePages": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "GuestRoleArn": {
+                    "type": "string"
+                },
+                "IdentityPoolId": {
+                    "type": "string"
+                },
+                "IncludedPages": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SessionSampleRate": {
+                    "type": "number"
+                },
+                "Telemetries": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Redshift::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AquaConfigurationStatus": {
+                            "type": "string"
+                        },
+                        "AutomatedSnapshotRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "AvailabilityZoneRelocation": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZoneRelocationStatus": {
+                            "type": "string"
+                        },
+                        "Classic": {
+                            "type": "boolean"
+                        },
+                        "ClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "ClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "ClusterSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ClusterSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "ClusterType": {
+                            "type": "string"
+                        },
+                        "ClusterVersion": {
+                            "type": "string"
+                        },
+                        "DBName": {
+                            "type": "string"
+                        },
+                        "DeferMaintenance": {
+                            "type": "boolean"
+                        },
+                        "DeferMaintenanceDuration": {
+                            "type": "number"
+                        },
+                        "DeferMaintenanceEndTime": {
+                            "type": "string"
+                        },
+                        "DeferMaintenanceStartTime": {
+                            "type": "string"
+                        },
+                        "DestinationRegion": {
+                            "type": "string"
+                        },
+                        "ElasticIp": {
+                            "type": "string"
+                        },
+                        "Encrypted": {
+                            "type": "boolean"
+                        },
+                        "EnhancedVpcRouting": {
+                            "type": "boolean"
+                        },
+                        "HsmClientCertificateIdentifier": {
+                            "type": "string"
+                        },
+                        "HsmConfigurationIdentifier": {
+                            "type": "string"
+                        },
+                        "IamRoles": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LoggingProperties": {
+                            "$ref": "#/definitions/AWS::Redshift::Cluster.LoggingProperties"
+                        },
+                        "MaintenanceTrackName": {
+                            "type": "string"
+                        },
+                        "ManualSnapshotRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "MasterUserPassword": {
+                            "type": "string"
+                        },
+                        "MasterUsername": {
+                            "type": "string"
+                        },
+                        "NodeType": {
+                            "type": "string"
+                        },
+                        "NumberOfNodes": {
+                            "type": "number"
+                        },
+                        "OwnerAccount": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "PubliclyAccessible": {
+                            "type": "boolean"
+                        },
+                        "ResourceAction": {
+                            "type": "string"
+                        },
+                        "RevisionTarget": {
+                            "type": "string"
+                        },
+                        "RotateEncryptionKey": {
+                            "type": "boolean"
+                        },
+                        "SnapshotClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "SnapshotCopyGrantName": {
+                            "type": "string"
+                        },
+                        "SnapshotCopyManual": {
+                            "type": "boolean"
+                        },
+                        "SnapshotCopyRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "SnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ClusterType",
+                        "DBName",
+                        "MasterUserPassword",
+                        "MasterUsername",
+                        "NodeType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::Cluster.Endpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Redshift::Cluster.LoggingProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "S3KeyPrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ClusterParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ParameterGroupFamily": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Redshift::ClusterParameterGroup.Parameter"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "ParameterGroupFamily"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::ClusterParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ClusterParameterGroup.Parameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ParameterName",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ClusterSecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::ClusterSecurityGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ClusterSecurityGroupIngress": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CIDRIP": {
+                            "type": "string"
+                        },
+                        "ClusterSecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupOwnerId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClusterSecurityGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::ClusterSecurityGroupIngress"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ClusterSubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::ClusterSubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::EndpointAccess": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "EndpointName": {
+                            "type": "string"
+                        },
+                        "ResourceOwner": {
+                            "type": "string"
+                        },
+                        "SubnetGroupName": {
+                            "type": "string"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EndpointName",
+                        "VpcSecurityGroupIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::EndpointAccess"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::EndpointAccess.VpcSecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                },
+                "VpcSecurityGroupId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Redshift::EndpointAuthorization": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Account": {
+                            "type": "string"
+                        },
+                        "ClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "Force": {
+                            "type": "boolean"
+                        },
+                        "VpcIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Account",
+                        "ClusterIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::EndpointAuthorization"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::EventSubscription": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "EventCategories": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Severity": {
+                            "type": "string"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SourceIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SourceType": {
+                            "type": "string"
+                        },
+                        "SubscriptionName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubscriptionName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::EventSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ScheduledAction": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Enable": {
+                            "type": "boolean"
+                        },
+                        "EndTime": {
+                            "type": "string"
+                        },
+                        "IamRole": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "type": "string"
+                        },
+                        "ScheduledActionDescription": {
+                            "type": "string"
+                        },
+                        "ScheduledActionName": {
+                            "type": "string"
+                        },
+                        "StartTime": {
+                            "type": "string"
+                        },
+                        "TargetAction": {
+                            "$ref": "#/definitions/AWS::Redshift::ScheduledAction.ScheduledActionType"
+                        }
+                    },
+                    "required": [
+                        "ScheduledActionName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::ScheduledAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ScheduledAction.PauseClusterMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClusterIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ScheduledAction.ResizeClusterMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "Classic": {
+                    "type": "boolean"
+                },
+                "ClusterIdentifier": {
+                    "type": "string"
+                },
+                "ClusterType": {
+                    "type": "string"
+                },
+                "NodeType": {
+                    "type": "string"
+                },
+                "NumberOfNodes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ClusterIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ScheduledAction.ResumeClusterMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClusterIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ScheduledAction.ScheduledActionType": {
+            "additionalProperties": false,
+            "properties": {
+                "PauseCluster": {
+                    "$ref": "#/definitions/AWS::Redshift::ScheduledAction.PauseClusterMessage"
+                },
+                "ResizeCluster": {
+                    "$ref": "#/definitions/AWS::Redshift::ScheduledAction.ResizeClusterMessage"
+                },
+                "ResumeCluster": {
+                    "$ref": "#/definitions/AWS::Redshift::ScheduledAction.ResumeClusterMessage"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiGatewayProxy": {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Application.ApiGatewayProxyInput"
+                        },
+                        "EnvironmentIdentifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ProxyType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RefactorSpaces::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Application.ApiGatewayProxyInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointType": {
+                    "type": "string"
+                },
+                "StageName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "NetworkFabricType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RefactorSpaces::Environment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Route": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationIdentifier": {
+                            "type": "string"
+                        },
+                        "EnvironmentIdentifier": {
+                            "type": "string"
+                        },
+                        "RouteType": {
+                            "type": "string"
+                        },
+                        "ServiceIdentifier": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UriPathRoute": {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Route.UriPathRouteInput"
+                        }
+                    },
+                    "required": [
+                        "ApplicationIdentifier",
+                        "EnvironmentIdentifier",
+                        "ServiceIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RefactorSpaces::Route"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Route.UriPathRouteInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ActivationState": {
+                    "type": "string"
+                },
+                "IncludeChildPaths": {
+                    "type": "boolean"
+                },
+                "Methods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActivationState"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Service": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationIdentifier": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EndpointType": {
+                            "type": "string"
+                        },
+                        "EnvironmentIdentifier": {
+                            "type": "string"
+                        },
+                        "LambdaEndpoint": {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Service.LambdaEndpointInput"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UrlEndpoint": {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Service.UrlEndpointInput"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationIdentifier",
+                        "EnvironmentIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RefactorSpaces::Service"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Service.LambdaEndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Service.UrlEndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "HealthUrl": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::Rekognition::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ProjectName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProjectName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Rekognition::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ResilienceHub::App": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppTemplateBody": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResiliencyPolicyArn": {
+                            "type": "string"
+                        },
+                        "ResourceMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ResilienceHub::App.ResourceMapping"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "AppTemplateBody",
+                        "Name",
+                        "ResourceMappings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ResilienceHub::App"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ResilienceHub::App.PhysicalResourceId": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsAccountId": {
+                    "type": "string"
+                },
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "Identifier": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Identifier",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ResilienceHub::App.ResourceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "LogicalStackName": {
+                    "type": "string"
+                },
+                "MappingType": {
+                    "type": "string"
+                },
+                "PhysicalResourceId": {
+                    "$ref": "#/definitions/AWS::ResilienceHub::App.PhysicalResourceId"
+                },
+                "ResourceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MappingType",
+                "PhysicalResourceId"
+            ],
+            "type": "object"
+        },
+        "AWS::ResilienceHub::ResiliencyPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataLocationConstraint": {
+                            "type": "string"
+                        },
+                        "Policy": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::ResilienceHub::ResiliencyPolicy.FailurePolicy"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "PolicyDescription": {
+                            "type": "string"
+                        },
+                        "PolicyName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tier": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Policy",
+                        "PolicyName",
+                        "Tier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ResilienceHub::ResiliencyPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ResilienceHub::ResiliencyPolicy.FailurePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "RpoInSecs": {
+                    "type": "number"
+                },
+                "RtoInSecs": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "RpoInSecs",
+                "RtoInSecs"
+            ],
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ResourceGroups::Group.ConfigurationItem"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResourceQuery": {
+                            "$ref": "#/definitions/AWS::ResourceGroups::Group.ResourceQuery"
+                        },
+                        "Resources": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ResourceGroups::Group"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group.ConfigurationItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ResourceGroups::Group.ConfigurationParameter"
+                    },
+                    "type": "array"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group.ConfigurationParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group.Query": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceTypeFilters": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StackIdentifier": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ResourceGroups::Group.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group.ResourceQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "Query": {
+                    "$ref": "#/definitions/AWS::ResourceGroups::Group.Query"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group.TagFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RoboMaker::Fleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::Fleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::Robot": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Architecture": {
+                            "type": "string"
+                        },
+                        "Fleet": {
+                            "type": "string"
+                        },
+                        "GreengrassGroupId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Architecture",
+                        "GreengrassGroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::Robot"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::RobotApplication": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CurrentRevisionId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RobotSoftwareSuite": {
+                            "$ref": "#/definitions/AWS::RoboMaker::RobotApplication.RobotSoftwareSuite"
+                        },
+                        "Sources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RoboMaker::RobotApplication.SourceConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "RobotSoftwareSuite",
+                        "Sources"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::RobotApplication"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::RobotApplication.RobotSoftwareSuite": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::RobotApplication.SourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Architecture": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Architecture",
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::RobotApplicationVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Application": {
+                            "type": "string"
+                        },
+                        "CurrentRevisionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Application"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::RobotApplicationVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplication": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CurrentRevisionId": {
+                            "type": "string"
+                        },
+                        "Environment": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RenderingEngine": {
+                            "$ref": "#/definitions/AWS::RoboMaker::SimulationApplication.RenderingEngine"
+                        },
+                        "RobotSoftwareSuite": {
+                            "$ref": "#/definitions/AWS::RoboMaker::SimulationApplication.RobotSoftwareSuite"
+                        },
+                        "SimulationSoftwareSuite": {
+                            "$ref": "#/definitions/AWS::RoboMaker::SimulationApplication.SimulationSoftwareSuite"
+                        },
+                        "Sources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RoboMaker::SimulationApplication.SourceConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "RobotSoftwareSuite",
+                        "SimulationSoftwareSuite"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::SimulationApplication"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplication.RenderingEngine": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplication.RobotSoftwareSuite": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplication.SimulationSoftwareSuite": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplication.SourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Architecture": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Architecture",
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplicationVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Application": {
+                            "type": "string"
+                        },
+                        "CurrentRevisionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Application"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::SimulationApplicationVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::DNSSEC": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HostedZoneId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "HostedZoneId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::DNSSEC"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HealthCheck": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HealthCheckConfig": {
+                            "type": "object"
+                        },
+                        "HealthCheckTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53::HealthCheck.HealthCheckTag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "HealthCheckConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::HealthCheck"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HealthCheck.HealthCheckTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HostedZone": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HostedZoneConfig": {
+                            "$ref": "#/definitions/AWS::Route53::HostedZone.HostedZoneConfig"
+                        },
+                        "HostedZoneTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53::HostedZone.HostedZoneTag"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QueryLoggingConfig": {
+                            "$ref": "#/definitions/AWS::Route53::HostedZone.QueryLoggingConfig"
+                        },
+                        "VPCs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53::HostedZone.VPC"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::HostedZone"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HostedZone.HostedZoneConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53::HostedZone.HostedZoneTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HostedZone.QueryLoggingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsLogGroupArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CloudWatchLogsLogGroupArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HostedZone.VPC": {
+            "additionalProperties": false,
+            "properties": {
+                "VPCId": {
+                    "type": "string"
+                },
+                "VPCRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VPCId",
+                "VPCRegion"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::KeySigningKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HostedZoneId": {
+                            "type": "string"
+                        },
+                        "KeyManagementServiceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "HostedZoneId",
+                        "KeyManagementServiceArn",
+                        "Name",
+                        "Status"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::KeySigningKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::RecordSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AliasTarget": {
+                            "$ref": "#/definitions/AWS::Route53::RecordSet.AliasTarget"
+                        },
+                        "Comment": {
+                            "type": "string"
+                        },
+                        "Failover": {
+                            "type": "string"
+                        },
+                        "GeoLocation": {
+                            "$ref": "#/definitions/AWS::Route53::RecordSet.GeoLocation"
+                        },
+                        "HealthCheckId": {
+                            "type": "string"
+                        },
+                        "HostedZoneId": {
+                            "type": "string"
+                        },
+                        "HostedZoneName": {
+                            "type": "string"
+                        },
+                        "MultiValueAnswer": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Region": {
+                            "type": "string"
+                        },
+                        "ResourceRecords": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SetIdentifier": {
+                            "type": "string"
+                        },
+                        "TTL": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Weight": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::RecordSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::RecordSet.AliasTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DNSName": {
+                    "type": "string"
+                },
+                "EvaluateTargetHealth": {
+                    "type": "boolean"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DNSName",
+                "HostedZoneId"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::RecordSet.GeoLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "ContinentCode": {
+                    "type": "string"
+                },
+                "CountryCode": {
+                    "type": "string"
+                },
+                "SubdivisionCode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53::RecordSetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Comment": {
+                            "type": "string"
+                        },
+                        "HostedZoneId": {
+                            "type": "string"
+                        },
+                        "HostedZoneName": {
+                            "type": "string"
+                        },
+                        "RecordSets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53::RecordSetGroup.RecordSet"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::RecordSetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::RecordSetGroup.AliasTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DNSName": {
+                    "type": "string"
+                },
+                "EvaluateTargetHealth": {
+                    "type": "boolean"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DNSName",
+                "HostedZoneId"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::RecordSetGroup.GeoLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "ContinentCode": {
+                    "type": "string"
+                },
+                "CountryCode": {
+                    "type": "string"
+                },
+                "SubdivisionCode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53::RecordSetGroup.RecordSet": {
+            "additionalProperties": false,
+            "properties": {
+                "AliasTarget": {
+                    "$ref": "#/definitions/AWS::Route53::RecordSetGroup.AliasTarget"
+                },
+                "Comment": {
+                    "type": "string"
+                },
+                "Failover": {
+                    "type": "string"
+                },
+                "GeoLocation": {
+                    "$ref": "#/definitions/AWS::Route53::RecordSetGroup.GeoLocation"
+                },
+                "HealthCheckId": {
+                    "type": "string"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                },
+                "HostedZoneName": {
+                    "type": "string"
+                },
+                "MultiValueAnswer": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "ResourceRecords": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SetIdentifier": {
+                    "type": "string"
+                },
+                "TTL": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::Route53RecoveryControl::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::Cluster.ClusterEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::ControlPanel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClusterArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryControl::ControlPanel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::RoutingControl": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClusterArn": {
+                            "type": "string"
+                        },
+                        "ControlPanelArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryControl::RoutingControl"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::SafetyRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssertionRule": {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::SafetyRule.AssertionRule"
+                        },
+                        "ControlPanelArn": {
+                            "type": "string"
+                        },
+                        "GatingRule": {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::SafetyRule.GatingRule"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RuleConfig": {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::SafetyRule.RuleConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ControlPanelArn",
+                        "Name",
+                        "RuleConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryControl::SafetyRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::SafetyRule.AssertionRule": {
+            "additionalProperties": false,
+            "properties": {
+                "AssertedControls": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "WaitPeriodMs": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AssertedControls",
+                "WaitPeriodMs"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::SafetyRule.GatingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "GatingControls": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TargetControls": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "WaitPeriodMs": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "GatingControls",
+                "TargetControls",
+                "WaitPeriodMs"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::SafetyRule.RuleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Inverted": {
+                    "type": "boolean"
+                },
+                "Threshold": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Inverted",
+                "Threshold",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::Cell": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CellName": {
+                            "type": "string"
+                        },
+                        "Cells": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CellName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryReadiness::Cell"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ReadinessCheck": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ReadinessCheckName": {
+                            "type": "string"
+                        },
+                        "ResourceSetName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ReadinessCheckName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryReadiness::ReadinessCheck"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::RecoveryGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Cells": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RecoveryGroupName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RecoveryGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryReadiness::RecoveryGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceSetName": {
+                            "type": "string"
+                        },
+                        "ResourceSetType": {
+                            "type": "string"
+                        },
+                        "Resources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet.Resource"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ResourceSetName",
+                        "ResourceSetType",
+                        "Resources"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryReadiness::ResourceSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet.DNSTargetResource": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                },
+                "HostedZoneArn": {
+                    "type": "string"
+                },
+                "RecordSetId": {
+                    "type": "string"
+                },
+                "RecordType": {
+                    "type": "string"
+                },
+                "TargetResource": {
+                    "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet.TargetResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet.NLBResource": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet.R53ResourceRecord": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                },
+                "RecordSetId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet.Resource": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentId": {
+                    "type": "string"
+                },
+                "DnsTargetResource": {
+                    "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet.DNSTargetResource"
+                },
+                "ReadinessScopes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ResourceArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet.TargetResource": {
+            "additionalProperties": false,
+            "properties": {
+                "NLBResource": {
+                    "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet.NLBResource"
+                },
+                "R53Resource": {
+                    "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet.R53ResourceRecord"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53Resolver::FirewallDomainList": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DomainFileUrl": {
+                            "type": "string"
+                        },
+                        "Domains": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::FirewallDomainList"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::FirewallRuleGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FirewallRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53Resolver::FirewallRuleGroup.FirewallRule"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::FirewallRuleGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::FirewallRuleGroup.FirewallRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "BlockOverrideDnsType": {
+                    "type": "string"
+                },
+                "BlockOverrideDomain": {
+                    "type": "string"
+                },
+                "BlockOverrideTtl": {
+                    "type": "number"
+                },
+                "BlockResponse": {
+                    "type": "string"
+                },
+                "FirewallDomainListId": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Action",
+                "FirewallDomainListId",
+                "Priority"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::FirewallRuleGroupAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FirewallRuleGroupId": {
+                            "type": "string"
+                        },
+                        "MutationProtection": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FirewallRuleGroupId",
+                        "Priority",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::FirewallRuleGroupAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutodefinedReverseFlag": {
+                            "type": "string"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutodefinedReverseFlag",
+                        "ResourceId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverDNSSECConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverDNSSECConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Direction": {
+                            "type": "string"
+                        },
+                        "IpAddresses": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53Resolver::ResolverEndpoint.IpAddressRequest"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Direction",
+                        "IpAddresses",
+                        "SecurityGroupIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverEndpoint.IpAddressRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Ip": {
+                    "type": "string"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubnetId"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverQueryLoggingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverQueryLoggingConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResolverQueryLogConfigId": {
+                            "type": "string"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResolverEndpointId": {
+                            "type": "string"
+                        },
+                        "RuleType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetIps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53Resolver::ResolverRule.TargetAddress"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DomainName",
+                        "RuleType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverRule.TargetAddress": {
+            "additionalProperties": false,
+            "properties": {
+                "Ip": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ip"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverRuleAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ResolverRuleId": {
+                            "type": "string"
+                        },
+                        "VPCId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResolverRuleId",
+                        "VPCId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverRuleAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::AccessPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Bucket": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Policy": {
+                            "type": "object"
+                        },
+                        "PolicyStatus": {
+                            "type": "object"
+                        },
+                        "PublicAccessBlockConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::AccessPoint.PublicAccessBlockConfiguration"
+                        },
+                        "VpcConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::AccessPoint.VpcConfiguration"
+                        }
+                    },
+                    "required": [
+                        "Bucket"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::AccessPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::AccessPoint.PublicAccessBlockConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockPublicAcls": {
+                    "type": "boolean"
+                },
+                "BlockPublicPolicy": {
+                    "type": "boolean"
+                },
+                "IgnorePublicAcls": {
+                    "type": "boolean"
+                },
+                "RestrictPublicBuckets": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::AccessPoint.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccelerateConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.AccelerateConfiguration"
+                        },
+                        "AccessControl": {
+                            "type": "string"
+                        },
+                        "AnalyticsConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::S3::Bucket.AnalyticsConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "BucketEncryption": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.BucketEncryption"
+                        },
+                        "BucketName": {
+                            "type": "string"
+                        },
+                        "CorsConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.CorsConfiguration"
+                        },
+                        "IntelligentTieringConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::S3::Bucket.IntelligentTieringConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "InventoryConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::S3::Bucket.InventoryConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "LifecycleConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.LifecycleConfiguration"
+                        },
+                        "LoggingConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.LoggingConfiguration"
+                        },
+                        "MetricsConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::S3::Bucket.MetricsConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "NotificationConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.NotificationConfiguration"
+                        },
+                        "ObjectLockConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.ObjectLockConfiguration"
+                        },
+                        "ObjectLockEnabled": {
+                            "type": "boolean"
+                        },
+                        "OwnershipControls": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.OwnershipControls"
+                        },
+                        "PublicAccessBlockConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.PublicAccessBlockConfiguration"
+                        },
+                        "ReplicationConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.ReplicationConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VersioningConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.VersioningConfiguration"
+                        },
+                        "WebsiteConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.WebsiteConfiguration"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::Bucket"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.AbortIncompleteMultipartUpload": {
+            "additionalProperties": false,
+            "properties": {
+                "DaysAfterInitiation": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DaysAfterInitiation"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.AccelerateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccelerationStatus": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AccelerationStatus"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.AccessControlTranslation": {
+            "additionalProperties": false,
+            "properties": {
+                "Owner": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Owner"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.AnalyticsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "StorageClassAnalysis": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.StorageClassAnalysis"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Id",
+                "StorageClassAnalysis"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.BucketEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ServerSideEncryptionConfiguration": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.ServerSideEncryptionRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ServerSideEncryptionConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.CorsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CorsRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.CorsRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CorsRules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.CorsRule": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedOrigins": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExposedHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "MaxAge": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AllowedMethods",
+                "AllowedOrigins"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.DataExport": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.Destination"
+                },
+                "OutputSchemaVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination",
+                "OutputSchemaVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.DefaultRetention": {
+            "additionalProperties": false,
+            "properties": {
+                "Days": {
+                    "type": "number"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "Years": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.DeleteMarkerReplication": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketAccountId": {
+                    "type": "string"
+                },
+                "BucketArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketArn",
+                "Format"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplicaKmsKeyID": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ReplicaKmsKeyID"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.EventBridgeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBridgeEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.FilterRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.IntelligentTieringConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                    },
+                    "type": "array"
+                },
+                "Tierings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.Tiering"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Id",
+                "Status",
+                "Tierings"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.InventoryConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.Destination"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "IncludedObjectVersions": {
+                    "type": "string"
+                },
+                "OptionalFields": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "ScheduleFrequency": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination",
+                "Enabled",
+                "Id",
+                "IncludedObjectVersions",
+                "ScheduleFrequency"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.LambdaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Event": {
+                    "type": "string"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.NotificationFilter"
+                },
+                "Function": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Event",
+                "Function"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.LifecycleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationBucketName": {
+                    "type": "string"
+                },
+                "LogFilePrefix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.Metrics": {
+            "additionalProperties": false,
+            "properties": {
+                "EventThreshold": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationTimeValue"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.MetricsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessPointArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.NoncurrentVersionExpiration": {
+            "additionalProperties": false,
+            "properties": {
+                "NewerNoncurrentVersions": {
+                    "type": "number"
+                },
+                "NoncurrentDays": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "NoncurrentDays"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.NoncurrentVersionTransition": {
+            "additionalProperties": false,
+            "properties": {
+                "NewerNoncurrentVersions": {
+                    "type": "number"
+                },
+                "StorageClass": {
+                    "type": "string"
+                },
+                "TransitionInDays": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "StorageClass",
+                "TransitionInDays"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBridgeConfiguration": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.EventBridgeConfiguration"
+                },
+                "LambdaConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.LambdaConfiguration"
+                    },
+                    "type": "array"
+                },
+                "QueueConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.QueueConfiguration"
+                    },
+                    "type": "array"
+                },
+                "TopicConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TopicConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.NotificationFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Key": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.S3KeyFilter"
+                }
+            },
+            "required": [
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ObjectLockConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ObjectLockEnabled": {
+                    "type": "string"
+                },
+                "Rule": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ObjectLockRule"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ObjectLockRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultRetention": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.DefaultRetention"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.OwnershipControls": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.OwnershipControlsRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.OwnershipControlsRule": {
+            "additionalProperties": false,
+            "properties": {
+                "ObjectOwnership": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.PublicAccessBlockConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockPublicAcls": {
+                    "type": "boolean"
+                },
+                "BlockPublicPolicy": {
+                    "type": "boolean"
+                },
+                "IgnorePublicAcls": {
+                    "type": "boolean"
+                },
+                "RestrictPublicBuckets": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.QueueConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Event": {
+                    "type": "string"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.NotificationFilter"
+                },
+                "Queue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Event",
+                "Queue"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.RedirectAllRequestsTo": {
+            "additionalProperties": false,
+            "properties": {
+                "HostName": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HostName"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.RedirectRule": {
+            "additionalProperties": false,
+            "properties": {
+                "HostName": {
+                    "type": "string"
+                },
+                "HttpRedirectCode": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "ReplaceKeyPrefixWith": {
+                    "type": "string"
+                },
+                "ReplaceKeyWith": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicaModifications": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Role": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.ReplicationRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Role",
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessControlTranslation": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.AccessControlTranslation"
+                },
+                "Account": {
+                    "type": "string"
+                },
+                "Bucket": {
+                    "type": "string"
+                },
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.EncryptionConfiguration"
+                },
+                "Metrics": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.Metrics"
+                },
+                "ReplicationTime": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationTime"
+                },
+                "StorageClass": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteMarkerReplication": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.DeleteMarkerReplication"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationDestination"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationRuleFilter"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "SourceSelectionCriteria": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.SourceSelectionCriteria"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination",
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationRuleAndOperator": {
+            "additionalProperties": false,
+            "properties": {
+                "Prefix": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationRuleFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "And": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationRuleAndOperator"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "TagFilter": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationTime": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                },
+                "Time": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationTimeValue"
+                }
+            },
+            "required": [
+                "Status",
+                "Time"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationTimeValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Minutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Minutes"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.RoutingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "RedirectRule": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.RedirectRule"
+                },
+                "RoutingRuleCondition": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.RoutingRuleCondition"
+                }
+            },
+            "required": [
+                "RedirectRule"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.RoutingRuleCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpErrorCodeReturnedEquals": {
+                    "type": "string"
+                },
+                "KeyPrefixEquals": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "AbortIncompleteMultipartUpload": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.AbortIncompleteMultipartUpload"
+                },
+                "ExpirationDate": {
+                    "type": "string"
+                },
+                "ExpirationInDays": {
+                    "type": "number"
+                },
+                "ExpiredObjectDeleteMarker": {
+                    "type": "boolean"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "NoncurrentVersionExpiration": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.NoncurrentVersionExpiration"
+                },
+                "NoncurrentVersionExpirationInDays": {
+                    "type": "number"
+                },
+                "NoncurrentVersionTransition": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.NoncurrentVersionTransition"
+                },
+                "NoncurrentVersionTransitions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.NoncurrentVersionTransition"
+                    },
+                    "type": "array"
+                },
+                "ObjectSizeGreaterThan": {
+                    "type": "number"
+                },
+                "ObjectSizeLessThan": {
+                    "type": "number"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                    },
+                    "type": "array"
+                },
+                "Transition": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.Transition"
+                },
+                "Transitions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.Transition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.S3KeyFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.FilterRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ServerSideEncryptionByDefault": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSMasterKeyID": {
+                    "type": "string"
+                },
+                "SSEAlgorithm": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SSEAlgorithm"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ServerSideEncryptionRule": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketKeyEnabled": {
+                    "type": "boolean"
+                },
+                "ServerSideEncryptionByDefault": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ServerSideEncryptionByDefault"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.SourceSelectionCriteria": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplicaModifications": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicaModifications"
+                },
+                "SseKmsEncryptedObjects": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.SseKmsEncryptedObjects"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.SseKmsEncryptedObjects": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.StorageClassAnalysis": {
+            "additionalProperties": false,
+            "properties": {
+                "DataExport": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.DataExport"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.TagFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.Tiering": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessTier": {
+                    "type": "string"
+                },
+                "Days": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AccessTier",
+                "Days"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.TopicConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Event": {
+                    "type": "string"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.NotificationFilter"
+                },
+                "Topic": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Event",
+                "Topic"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.Transition": {
+            "additionalProperties": false,
+            "properties": {
+                "StorageClass": {
+                    "type": "string"
+                },
+                "TransitionDate": {
+                    "type": "string"
+                },
+                "TransitionInDays": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "StorageClass"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.VersioningConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.WebsiteConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorDocument": {
+                    "type": "string"
+                },
+                "IndexDocument": {
+                    "type": "string"
+                },
+                "RedirectAllRequestsTo": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.RedirectAllRequestsTo"
+                },
+                "RoutingRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.RoutingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::BucketPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Bucket": {
+                            "type": "string"
+                        },
+                        "PolicyDocument": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Bucket",
+                        "PolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::BucketPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::MultiRegionAccessPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "PublicAccessBlockConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::MultiRegionAccessPoint.PublicAccessBlockConfiguration"
+                        },
+                        "Regions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::S3::MultiRegionAccessPoint.Region"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Regions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::MultiRegionAccessPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::MultiRegionAccessPoint.PublicAccessBlockConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockPublicAcls": {
+                    "type": "boolean"
+                },
+                "BlockPublicPolicy": {
+                    "type": "boolean"
+                },
+                "IgnorePublicAcls": {
+                    "type": "boolean"
+                },
+                "RestrictPublicBuckets": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::MultiRegionAccessPoint.Region": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::MultiRegionAccessPointPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MrapName": {
+                            "type": "string"
+                        },
+                        "Policy": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "MrapName",
+                        "Policy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::MultiRegionAccessPointPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "StorageLensConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::StorageLens.StorageLensConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "StorageLensConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::StorageLens"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.AccountLevel": {
+            "additionalProperties": false,
+            "properties": {
+                "ActivityMetrics": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.ActivityMetrics"
+                },
+                "BucketLevel": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.BucketLevel"
+                }
+            },
+            "required": [
+                "BucketLevel"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.ActivityMetrics": {
+            "additionalProperties": false,
+            "properties": {
+                "IsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.AwsOrg": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.BucketLevel": {
+            "additionalProperties": false,
+            "properties": {
+                "ActivityMetrics": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.ActivityMetrics"
+                },
+                "PrefixLevel": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.PrefixLevel"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.BucketsAndRegions": {
+            "additionalProperties": false,
+            "properties": {
+                "Buckets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Regions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.CloudWatchMetrics": {
+            "additionalProperties": false,
+            "properties": {
+                "IsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "IsEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.DataExport": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchMetrics": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.CloudWatchMetrics"
+                },
+                "S3BucketDestination": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.S3BucketDestination"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.Encryption": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.PrefixLevel": {
+            "additionalProperties": false,
+            "properties": {
+                "StorageMetrics": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.PrefixLevelStorageMetrics"
+                }
+            },
+            "required": [
+                "StorageMetrics"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.PrefixLevelStorageMetrics": {
+            "additionalProperties": false,
+            "properties": {
+                "IsEnabled": {
+                    "type": "boolean"
+                },
+                "SelectionCriteria": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.SelectionCriteria"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.S3BucketDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "Arn": {
+                    "type": "string"
+                },
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.Encryption"
+                },
+                "Format": {
+                    "type": "string"
+                },
+                "OutputSchemaVersion": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AccountId",
+                "Arn",
+                "Format",
+                "OutputSchemaVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.SelectionCriteria": {
+            "additionalProperties": false,
+            "properties": {
+                "Delimiter": {
+                    "type": "string"
+                },
+                "MaxDepth": {
+                    "type": "number"
+                },
+                "MinStorageBytesPercentage": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.StorageLensConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountLevel": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.AccountLevel"
+                },
+                "AwsOrg": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.AwsOrg"
+                },
+                "DataExport": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.DataExport"
+                },
+                "Exclude": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.BucketsAndRegions"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Include": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.BucketsAndRegions"
+                },
+                "IsEnabled": {
+                    "type": "boolean"
+                },
+                "StorageLensArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AccountLevel",
+                "Id",
+                "IsEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::S3ObjectLambda::AccessPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ObjectLambdaConfiguration": {
+                            "$ref": "#/definitions/AWS::S3ObjectLambda::AccessPoint.ObjectLambdaConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ObjectLambdaConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3ObjectLambda::AccessPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3ObjectLambda::AccessPoint.ObjectLambdaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedFeatures": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CloudWatchMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "SupportingAccessPoint": {
+                    "type": "string"
+                },
+                "TransformationConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3ObjectLambda::AccessPoint.TransformationConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SupportingAccessPoint",
+                "TransformationConfigurations"
+            ],
+            "type": "object"
+        },
+        "AWS::S3ObjectLambda::AccessPoint.TransformationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContentTransformation": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "Actions",
+                "ContentTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::S3ObjectLambda::AccessPointPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ObjectLambdaAccessPoint": {
+                            "type": "string"
+                        },
+                        "PolicyDocument": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ObjectLambdaAccessPoint",
+                        "PolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3ObjectLambda::AccessPointPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::AccessPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Bucket": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Policy": {
+                            "type": "object"
+                        },
+                        "VpcConfiguration": {
+                            "$ref": "#/definitions/AWS::S3Outposts::AccessPoint.VpcConfiguration"
+                        }
+                    },
+                    "required": [
+                        "Bucket",
+                        "Name",
+                        "VpcConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3Outposts::AccessPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::AccessPoint.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3Outposts::Bucket": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BucketName": {
+                            "type": "string"
+                        },
+                        "LifecycleConfiguration": {
+                            "$ref": "#/definitions/AWS::S3Outposts::Bucket.LifecycleConfiguration"
+                        },
+                        "OutpostId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "BucketName",
+                        "OutpostId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3Outposts::Bucket"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::Bucket.AbortIncompleteMultipartUpload": {
+            "additionalProperties": false,
+            "properties": {
+                "DaysAfterInitiation": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DaysAfterInitiation"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::Bucket.LifecycleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3Outposts::Bucket.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::Bucket.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "AbortIncompleteMultipartUpload": {
+                    "$ref": "#/definitions/AWS::S3Outposts::Bucket.AbortIncompleteMultipartUpload"
+                },
+                "ExpirationDate": {
+                    "type": "string"
+                },
+                "ExpirationInDays": {
+                    "type": "number"
+                },
+                "Filter": {
+                    "type": "object"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3Outposts::BucketPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Bucket": {
+                            "type": "string"
+                        },
+                        "PolicyDocument": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Bucket",
+                        "PolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3Outposts::BucketPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::Endpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessType": {
+                            "type": "string"
+                        },
+                        "CustomerOwnedIpv4Pool": {
+                            "type": "string"
+                        },
+                        "OutpostId": {
+                            "type": "string"
+                        },
+                        "SecurityGroupId": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "OutpostId",
+                        "SecurityGroupId",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3Outposts::Endpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::Endpoint.NetworkInterface": {
+            "additionalProperties": false,
+            "properties": {
+                "NetworkInterfaceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NetworkInterfaceId"
+            ],
+            "type": "object"
+        },
+        "AWS::SDB::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SDB::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ConfigurationSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSetEventDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigurationSetName": {
+                            "type": "string"
+                        },
+                        "EventDestination": {
+                            "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.EventDestination"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationSetName",
+                        "EventDestination"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ConfigurationSetEventDestination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSetEventDestination.CloudWatchDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.DimensionConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSetEventDestination.DimensionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultDimensionValue": {
+                    "type": "string"
+                },
+                "DimensionName": {
+                    "type": "string"
+                },
+                "DimensionValueSource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DefaultDimensionValue",
+                "DimensionName",
+                "DimensionValueSource"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSetEventDestination.EventDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchDestination": {
+                    "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.CloudWatchDestination"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "KinesisFirehoseDestination": {
+                    "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.KinesisFirehoseDestination"
+                },
+                "MatchingEventTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchingEventTypes"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSetEventDestination.KinesisFirehoseDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStreamARN": {
+                    "type": "string"
+                },
+                "IAMRoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStreamARN",
+                "IAMRoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ContactList": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContactListName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Topics": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SES::ContactList.Topic"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ContactList"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ContactList.Topic": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultSubscriptionStatus": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DisplayName": {
+                    "type": "string"
+                },
+                "TopicName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DefaultSubscriptionStatus",
+                "DisplayName",
+                "TopicName"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Filter": {
+                            "$ref": "#/definitions/AWS::SES::ReceiptFilter.Filter"
+                        }
+                    },
+                    "required": [
+                        "Filter"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ReceiptFilter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptFilter.Filter": {
+            "additionalProperties": false,
+            "properties": {
+                "IpFilter": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptFilter.IpFilter"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IpFilter"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptFilter.IpFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Policy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Cidr",
+                "Policy"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "After": {
+                            "type": "string"
+                        },
+                        "Rule": {
+                            "$ref": "#/definitions/AWS::SES::ReceiptRule.Rule"
+                        },
+                        "RuleSetName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Rule",
+                        "RuleSetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ReceiptRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "AddHeaderAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.AddHeaderAction"
+                },
+                "BounceAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.BounceAction"
+                },
+                "LambdaAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.LambdaAction"
+                },
+                "S3Action": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.S3Action"
+                },
+                "SNSAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.SNSAction"
+                },
+                "StopAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.StopAction"
+                },
+                "WorkmailAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.WorkmailAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.AddHeaderAction": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderName": {
+                    "type": "string"
+                },
+                "HeaderValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HeaderName",
+                "HeaderValue"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.BounceAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Message": {
+                    "type": "string"
+                },
+                "Sender": {
+                    "type": "string"
+                },
+                "SmtpReplyCode": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Message",
+                "Sender",
+                "SmtpReplyCode"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.LambdaAction": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionArn": {
+                    "type": "string"
+                },
+                "InvocationType": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FunctionArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::ReceiptRule.Action"
+                    },
+                    "type": "array"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Recipients": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ScanEnabled": {
+                    "type": "boolean"
+                },
+                "TlsPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.S3Action": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "KmsKeyArn": {
+                    "type": "string"
+                },
+                "ObjectKeyPrefix": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.SNSAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Encoding": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.StopAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Scope": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Scope"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.WorkmailAction": {
+            "additionalProperties": false,
+            "properties": {
+                "OrganizationArn": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OrganizationArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRuleSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ReceiptRuleSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::Template": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Template": {
+                            "$ref": "#/definitions/AWS::SES::Template.Template"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::Template"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::Template.Template": {
+            "additionalProperties": false,
+            "properties": {
+                "HtmlPart": {
+                    "type": "string"
+                },
+                "SubjectPart": {
+                    "type": "string"
+                },
+                "TemplateName": {
+                    "type": "string"
+                },
+                "TextPart": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SNS::Subscription": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeliveryPolicy": {
+                            "type": "object"
+                        },
+                        "Endpoint": {
+                            "type": "string"
+                        },
+                        "FilterPolicy": {
+                            "type": "object"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "RawMessageDelivery": {
+                            "type": "boolean"
+                        },
+                        "RedrivePolicy": {
+                            "type": "object"
+                        },
+                        "Region": {
+                            "type": "string"
+                        },
+                        "SubscriptionRoleArn": {
+                            "type": "string"
+                        },
+                        "TopicArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Protocol",
+                        "TopicArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SNS::Subscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SNS::Topic": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContentBasedDeduplication": {
+                            "type": "boolean"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "FifoTopic": {
+                            "type": "boolean"
+                        },
+                        "KmsMasterKeyId": {
+                            "type": "string"
+                        },
+                        "Subscription": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SNS::Topic.Subscription"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TopicName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SNS::Topic"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SNS::Topic.Subscription": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint",
+                "Protocol"
+            ],
+            "type": "object"
+        },
+        "AWS::SNS::TopicPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "Topics": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument",
+                        "Topics"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SNS::TopicPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SQS::Queue": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContentBasedDeduplication": {
+                            "type": "boolean"
+                        },
+                        "DeduplicationScope": {
+                            "type": "string"
+                        },
+                        "DelaySeconds": {
+                            "type": "number"
+                        },
+                        "FifoQueue": {
+                            "type": "boolean"
+                        },
+                        "FifoThroughputLimit": {
+                            "type": "string"
+                        },
+                        "KmsDataKeyReusePeriodSeconds": {
+                            "type": "number"
+                        },
+                        "KmsMasterKeyId": {
+                            "type": "string"
+                        },
+                        "MaximumMessageSize": {
+                            "type": "number"
+                        },
+                        "MessageRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "QueueName": {
+                            "type": "string"
+                        },
+                        "ReceiveMessageWaitTimeSeconds": {
+                            "type": "number"
+                        },
+                        "RedriveAllowPolicy": {
+                            "type": "object"
+                        },
+                        "RedrivePolicy": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VisibilityTimeout": {
+                            "type": "number"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SQS::Queue"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SQS::QueuePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "Queues": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument",
+                        "Queues"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SQS::QueuePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::Association": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplyOnlyAtCronInterval": {
+                            "type": "boolean"
+                        },
+                        "AssociationName": {
+                            "type": "string"
+                        },
+                        "AutomationTargetParameterName": {
+                            "type": "string"
+                        },
+                        "CalendarNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ComplianceSeverity": {
+                            "type": "string"
+                        },
+                        "DocumentVersion": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "MaxConcurrency": {
+                            "type": "string"
+                        },
+                        "MaxErrors": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OutputLocation": {
+                            "$ref": "#/definitions/AWS::SSM::Association.InstanceAssociationOutputLocation"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "object"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ScheduleExpression": {
+                            "type": "string"
+                        },
+                        "SyncCompliance": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::Association.Target"
+                            },
+                            "type": "array"
+                        },
+                        "WaitForSuccessTimeoutSeconds": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::Association"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::Association.InstanceAssociationOutputLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Location": {
+                    "$ref": "#/definitions/AWS::SSM::Association.S3OutputLocation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::Association.S3OutputLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "OutputS3BucketName": {
+                    "type": "string"
+                },
+                "OutputS3KeyPrefix": {
+                    "type": "string"
+                },
+                "OutputS3Region": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::Association.Target": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::Document": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Attachments": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::Document.AttachmentsSource"
+                            },
+                            "type": "array"
+                        },
+                        "Content": {
+                            "type": "object"
+                        },
+                        "DocumentFormat": {
+                            "type": "string"
+                        },
+                        "DocumentType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Requires": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::Document.DocumentRequires"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        },
+                        "VersionName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Content"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::Document"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::Document.AttachmentsSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::Document.DocumentRequires": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowUnassociatedTargets": {
+                            "type": "boolean"
+                        },
+                        "Cutoff": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Duration": {
+                            "type": "number"
+                        },
+                        "EndDate": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "type": "string"
+                        },
+                        "ScheduleOffset": {
+                            "type": "number"
+                        },
+                        "ScheduleTimezone": {
+                            "type": "string"
+                        },
+                        "StartDate": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AllowUnassociatedTargets",
+                        "Cutoff",
+                        "Duration",
+                        "Name",
+                        "Schedule"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::MaintenanceWindow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "OwnerInformation": {
+                            "type": "string"
+                        },
+                        "ResourceType": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTarget.Targets"
+                            },
+                            "type": "array"
+                        },
+                        "WindowId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourceType",
+                        "Targets",
+                        "WindowId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::MaintenanceWindowTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTarget.Targets": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CutoffBehavior": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LoggingInfo": {
+                            "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.LoggingInfo"
+                        },
+                        "MaxConcurrency": {
+                            "type": "string"
+                        },
+                        "MaxErrors": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        },
+                        "ServiceRoleArn": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.Target"
+                            },
+                            "type": "array"
+                        },
+                        "TaskArn": {
+                            "type": "string"
+                        },
+                        "TaskInvocationParameters": {
+                            "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.TaskInvocationParameters"
+                        },
+                        "TaskParameters": {
+                            "type": "object"
+                        },
+                        "TaskType": {
+                            "type": "string"
+                        },
+                        "WindowId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Priority",
+                        "TaskArn",
+                        "TaskType",
+                        "WindowId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::MaintenanceWindowTask"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.LoggingInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Region": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region",
+                "S3Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowAutomationParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentVersion": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowLambdaParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientContext": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "type": "string"
+                },
+                "Qualifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowRunCommandParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "DocumentHash": {
+                    "type": "string"
+                },
+                "DocumentHashType": {
+                    "type": "string"
+                },
+                "NotificationConfig": {
+                    "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.NotificationConfig"
+                },
+                "OutputS3BucketName": {
+                    "type": "string"
+                },
+                "OutputS3KeyPrefix": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "ServiceRoleArn": {
+                    "type": "string"
+                },
+                "TimeoutSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowStepFunctionsParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.NotificationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "NotificationArn": {
+                    "type": "string"
+                },
+                "NotificationEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "NotificationType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NotificationArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.Target": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.TaskInvocationParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "MaintenanceWindowAutomationParameters": {
+                    "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.MaintenanceWindowAutomationParameters"
+                },
+                "MaintenanceWindowLambdaParameters": {
+                    "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.MaintenanceWindowLambdaParameters"
+                },
+                "MaintenanceWindowRunCommandParameters": {
+                    "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.MaintenanceWindowRunCommandParameters"
+                },
+                "MaintenanceWindowStepFunctionsParameters": {
+                    "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.MaintenanceWindowStepFunctionsParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::Parameter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowedPattern": {
+                            "type": "string"
+                        },
+                        "DataType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Tier": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Type",
+                        "Value"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::Parameter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApprovalRules": {
+                            "$ref": "#/definitions/AWS::SSM::PatchBaseline.RuleGroup"
+                        },
+                        "ApprovedPatches": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ApprovedPatchesComplianceLevel": {
+                            "type": "string"
+                        },
+                        "ApprovedPatchesEnableNonSecurity": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "GlobalFilters": {
+                            "$ref": "#/definitions/AWS::SSM::PatchBaseline.PatchFilterGroup"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OperatingSystem": {
+                            "type": "string"
+                        },
+                        "PatchGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RejectedPatches": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RejectedPatchesAction": {
+                            "type": "string"
+                        },
+                        "Sources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::PatchBaseline.PatchSource"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::PatchBaseline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.PatchFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.PatchFilterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "PatchFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SSM::PatchBaseline.PatchFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.PatchSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Products": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.PatchStringDate": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "ApproveAfterDays": {
+                    "type": "number"
+                },
+                "ApproveUntilDate": {
+                    "$ref": "#/definitions/AWS::SSM::PatchBaseline.PatchStringDate"
+                },
+                "ComplianceLevel": {
+                    "type": "string"
+                },
+                "EnableNonSecurity": {
+                    "type": "boolean"
+                },
+                "PatchFilterGroup": {
+                    "$ref": "#/definitions/AWS::SSM::PatchBaseline.PatchFilterGroup"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.RuleGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "PatchRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SSM::PatchBaseline.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::ResourceDataSync": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BucketName": {
+                            "type": "string"
+                        },
+                        "BucketPrefix": {
+                            "type": "string"
+                        },
+                        "BucketRegion": {
+                            "type": "string"
+                        },
+                        "KMSKeyArn": {
+                            "type": "string"
+                        },
+                        "S3Destination": {
+                            "$ref": "#/definitions/AWS::SSM::ResourceDataSync.S3Destination"
+                        },
+                        "SyncFormat": {
+                            "type": "string"
+                        },
+                        "SyncName": {
+                            "type": "string"
+                        },
+                        "SyncSource": {
+                            "$ref": "#/definitions/AWS::SSM::ResourceDataSync.SyncSource"
+                        },
+                        "SyncType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SyncName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::ResourceDataSync"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::ResourceDataSync.AwsOrganizationsSource": {
+            "additionalProperties": false,
+            "properties": {
+                "OrganizationSourceType": {
+                    "type": "string"
+                },
+                "OrganizationalUnits": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "OrganizationSourceType"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::ResourceDataSync.S3Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "BucketRegion": {
+                    "type": "string"
+                },
+                "KMSKeyArn": {
+                    "type": "string"
+                },
+                "SyncFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName",
+                "BucketRegion",
+                "SyncFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::ResourceDataSync.SyncSource": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsOrganizationsSource": {
+                    "$ref": "#/definitions/AWS::SSM::ResourceDataSync.AwsOrganizationsSource"
+                },
+                "IncludeFutureRegions": {
+                    "type": "boolean"
+                },
+                "SourceRegions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SourceType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourceRegions",
+                "SourceType"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMContacts::Contact": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Alias": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "Plan": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSMContacts::Contact.Stage"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Alias",
+                        "DisplayName",
+                        "Plan",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMContacts::Contact"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMContacts::Contact.ChannelTargetInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelId": {
+                    "type": "string"
+                },
+                "RetryIntervalInMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ChannelId",
+                "RetryIntervalInMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMContacts::Contact.ContactTargetInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "ContactId": {
+                    "type": "string"
+                },
+                "IsEssential": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "ContactId",
+                "IsEssential"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMContacts::Contact.Stage": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInMinutes": {
+                    "type": "number"
+                },
+                "Targets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SSMContacts::Contact.Targets"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DurationInMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMContacts::Contact.Targets": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelTargetInfo": {
+                    "$ref": "#/definitions/AWS::SSMContacts::Contact.ChannelTargetInfo"
+                },
+                "ContactTargetInfo": {
+                    "$ref": "#/definitions/AWS::SSMContacts::Contact.ContactTargetInfo"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSMContacts::ContactChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ChannelAddress": {
+                            "type": "string"
+                        },
+                        "ChannelName": {
+                            "type": "string"
+                        },
+                        "ChannelType": {
+                            "type": "string"
+                        },
+                        "ContactId": {
+                            "type": "string"
+                        },
+                        "DeferActivation": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ChannelAddress",
+                        "ChannelName",
+                        "ChannelType",
+                        "ContactId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMContacts::ContactChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ReplicationSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeletionProtected": {
+                            "type": "boolean"
+                        },
+                        "Regions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSMIncidents::ReplicationSet.ReplicationRegion"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Regions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMIncidents::ReplicationSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ReplicationSet.RegionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SseKmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SseKmsKeyId"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ReplicationSet.ReplicationRegion": {
+            "additionalProperties": false,
+            "properties": {
+                "RegionConfiguration": {
+                    "$ref": "#/definitions/AWS::SSMIncidents::ReplicationSet.RegionConfiguration"
+                },
+                "RegionName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                                "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.Action"
+                            },
+                            "type": "array"
+                        },
+                        "ChatChannel": {
+                            "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.ChatChannel"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "Engagements": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "IncidentTemplate": {
+                            "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.IncidentTemplate"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "IncidentTemplate",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMIncidents::ResponsePlan"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "SsmAutomation": {
+                    "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.SsmAutomation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.ChatChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "ChatbotSns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.IncidentTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DedupeString": {
+                    "type": "string"
+                },
+                "Impact": {
+                    "type": "number"
+                },
+                "NotificationTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.NotificationTargetItem"
+                    },
+                    "type": "array"
+                },
+                "Summary": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Impact",
+                "Title"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.NotificationTargetItem": {
+            "additionalProperties": false,
+            "properties": {
+                "SnsTopicArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.SsmAutomation": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentName": {
+                    "type": "string"
+                },
+                "DocumentVersion": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.SsmParameter"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TargetAccount": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DocumentName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.SsmParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::Assignment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "PermissionSetArn": {
+                            "type": "string"
+                        },
+                        "PrincipalId": {
+                            "type": "string"
+                        },
+                        "PrincipalType": {
+                            "type": "string"
+                        },
+                        "TargetId": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "PermissionSetArn",
+                        "PrincipalId",
+                        "PrincipalType",
+                        "TargetId",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::Assignment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::InstanceAccessControlAttributeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessControlAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttribute"
+                            },
+                            "type": "array"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::InstanceAccessControlAttributeConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttributeValue"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttributeValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Source": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Source"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::PermissionSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "InlinePolicy": {
+                            "type": "object"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "ManagedPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "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::SageMaker::App": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "AppType": {
+                            "type": "string"
+                        },
+                        "DomainId": {
+                            "type": "string"
+                        },
+                        "ResourceSpec": {
+                            "$ref": "#/definitions/AWS::SageMaker::App.ResourceSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserProfileName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AppName",
+                        "AppType",
+                        "DomainId",
+                        "UserProfileName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::App"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::App.ResourceSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "SageMakerImageArn": {
+                    "type": "string"
+                },
+                "SageMakerImageVersionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppImageConfigName": {
+                            "type": "string"
+                        },
+                        "KernelGatewayImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AppImageConfigName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::AppImageConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.FileSystemConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultGid": {
+                    "type": "number"
+                },
+                "DefaultUid": {
+                    "type": "number"
+                },
+                "MountPath": {
+                    "type": "string"
+                }
+            },
+            "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::CodeRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CodeRepositoryName": {
+                            "type": "string"
+                        },
+                        "GitConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::CodeRepository.GitConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "GitConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::CodeRepository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::CodeRepository.GitConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Branch": {
+                    "type": "string"
+                },
+                "RepositoryUrl": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RepositoryUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataQualityAppSpecification": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.DataQualityAppSpecification"
+                        },
+                        "DataQualityBaselineConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.DataQualityBaselineConfig"
+                        },
+                        "DataQualityJobInput": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.DataQualityJobInput"
+                        },
+                        "DataQualityJobOutputConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.MonitoringOutputConfig"
+                        },
+                        "JobDefinitionName": {
+                            "type": "string"
+                        },
+                        "JobResources": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.MonitoringResources"
+                        },
+                        "NetworkConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.NetworkConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StoppingCondition": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.StoppingCondition"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DataQualityAppSpecification",
+                        "DataQualityJobInput",
+                        "DataQualityJobOutputConfig",
+                        "JobResources",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::DataQualityJobDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "VolumeKmsKeyId": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.ConstraintsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.DataQualityAppSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerArguments": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEntrypoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Environment": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ImageUri": {
+                    "type": "string"
+                },
+                "PostAnalyticsProcessorSourceUri": {
+                    "type": "string"
+                },
+                "RecordPreprocessorSourceUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ImageUri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.DataQualityBaselineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseliningJobName": {
+                    "type": "string"
+                },
+                "ConstraintsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.ConstraintsResource"
+                },
+                "StatisticsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.StatisticsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.DataQualityJobInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointInput": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.EndpointInput"
+                }
+            },
+            "required": [
+                "EndpointInput"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.EndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointName": {
+                    "type": "string"
+                },
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3DataDistributionType": {
+                    "type": "string"
+                },
+                "S3InputMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointName",
+                "LocalPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.MonitoringOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Output": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.S3Output"
+                }
+            },
+            "required": [
+                "S3Output"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.MonitoringOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MonitoringOutputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.MonitoringOutput"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MonitoringOutputs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.MonitoringResources": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.ClusterConfig"
+                }
+            },
+            "required": [
+                "ClusterConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.NetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableInterContainerTrafficEncryption": {
+                    "type": "boolean"
+                },
+                "EnableNetworkIsolation": {
+                    "type": "boolean"
+                },
+                "VpcConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.VpcConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.S3Output": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3UploadMode": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LocalPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.StatisticsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.StoppingCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRuntimeInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRuntimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Device": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Device": {
+                            "type": "object"
+                        },
+                        "DeviceFleetName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DeviceFleetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Device"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Device.Device": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "DeviceName": {
+                    "type": "string"
+                },
+                "IotThingName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeviceName"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DeviceFleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DeviceFleetName": {
+                            "type": "string"
+                        },
+                        "OutputConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::DeviceFleet.EdgeOutputConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DeviceFleetName",
+                        "OutputConfig",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::DeviceFleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DeviceFleet.EdgeOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "S3OutputLocation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3OutputLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppNetworkAccessType": {
+                            "type": "string"
+                        },
+                        "AuthMode": {
+                            "type": "string"
+                        },
+                        "DefaultUserSettings": {
+                            "$ref": "#/definitions/AWS::SageMaker::Domain.UserSettings"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthMode",
+                        "DefaultUserSettings",
+                        "DomainName",
+                        "SubnetIds",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.CustomImage": {
+            "additionalProperties": false,
+            "properties": {
+                "AppImageConfigName": {
+                    "type": "string"
+                },
+                "ImageName": {
+                    "type": "string"
+                },
+                "ImageVersionNumber": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AppImageConfigName",
+                "ImageName"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.JupyterServerAppSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultResourceSpec": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.ResourceSpec"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.KernelGatewayAppSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomImages": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::Domain.CustomImage"
+                    },
+                    "type": "array"
+                },
+                "DefaultResourceSpec": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.ResourceSpec"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.ResourceSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "SageMakerImageArn": {
+                    "type": "string"
+                },
+                "SageMakerImageVersionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.SharingSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NotebookOutputOption": {
+                    "type": "string"
+                },
+                "S3KmsKeyId": {
+                    "type": "string"
+                },
+                "S3OutputPath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.UserSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRole": {
+                    "type": "string"
+                },
+                "JupyterServerAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.JupyterServerAppSettings"
+                },
+                "KernelGatewayAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.KernelGatewayAppSettings"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SharingSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.SharingSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeploymentConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::Endpoint.DeploymentConfig"
+                        },
+                        "EndpointConfigName": {
+                            "type": "string"
+                        },
+                        "EndpointName": {
+                            "type": "string"
+                        },
+                        "ExcludeRetainedVariantProperties": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::Endpoint.VariantProperty"
+                            },
+                            "type": "array"
+                        },
+                        "RetainAllVariantProperties": {
+                            "type": "boolean"
+                        },
+                        "RetainDeploymentConfig": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EndpointConfigName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Endpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.Alarm": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AlarmName"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.AutoRollbackConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Alarms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::Endpoint.Alarm"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Alarms"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.BlueGreenUpdatePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumExecutionTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "TerminationWaitInSeconds": {
+                    "type": "number"
+                },
+                "TrafficRoutingConfiguration": {
+                    "$ref": "#/definitions/AWS::SageMaker::Endpoint.TrafficRoutingConfig"
+                }
+            },
+            "required": [
+                "TrafficRoutingConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.CapacitySize": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.DeploymentConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoRollbackConfiguration": {
+                    "$ref": "#/definitions/AWS::SageMaker::Endpoint.AutoRollbackConfig"
+                },
+                "BlueGreenUpdatePolicy": {
+                    "$ref": "#/definitions/AWS::SageMaker::Endpoint.BlueGreenUpdatePolicy"
+                }
+            },
+            "required": [
+                "BlueGreenUpdatePolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.TrafficRoutingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CanarySize": {
+                    "$ref": "#/definitions/AWS::SageMaker::Endpoint.CapacitySize"
+                },
+                "LinearStepSize": {
+                    "$ref": "#/definitions/AWS::SageMaker::Endpoint.CapacitySize"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "WaitIntervalInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.VariantProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "VariantPropertyType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AsyncInferenceConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.AsyncInferenceConfig"
+                        },
+                        "DataCaptureConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.DataCaptureConfig"
+                        },
+                        "EndpointConfigName": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "ProductionVariants": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.ProductionVariant"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ProductionVariants"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::EndpointConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.AsyncInferenceClientConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConcurrentInvocationsPerInstance": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.AsyncInferenceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.AsyncInferenceClientConfig"
+                },
+                "OutputConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.AsyncInferenceOutputConfig"
+                }
+            },
+            "required": [
+                "OutputConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.AsyncInferenceNotificationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorTopic": {
+                    "type": "string"
+                },
+                "SuccessTopic": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.AsyncInferenceOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "NotificationConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.AsyncInferenceNotificationConfig"
+                },
+                "S3OutputPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3OutputPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.CaptureContentTypeHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "CsvContentTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "JsonContentTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.CaptureOption": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CaptureMode"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.DataCaptureConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureContentTypeHeader": {
+                    "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.CaptureContentTypeHeader"
+                },
+                "CaptureOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.CaptureOption"
+                    },
+                    "type": "array"
+                },
+                "DestinationS3Uri": {
+                    "type": "string"
+                },
+                "EnableCapture": {
+                    "type": "boolean"
+                },
+                "InitialSamplingPercentage": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CaptureOptions",
+                "DestinationS3Uri",
+                "InitialSamplingPercentage"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.ProductionVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceleratorType": {
+                    "type": "string"
+                },
+                "InitialInstanceCount": {
+                    "type": "number"
+                },
+                "InitialVariantWeight": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "ModelName": {
+                    "type": "string"
+                },
+                "ServerlessConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.ServerlessConfig"
+                },
+                "VariantName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InitialVariantWeight",
+                "ModelName",
+                "VariantName"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.ServerlessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConcurrency": {
+                    "type": "number"
+                },
+                "MemorySizeInMB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxConcurrency",
+                "MemorySizeInMB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::FeatureGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EventTimeFeatureName": {
+                            "type": "string"
+                        },
+                        "FeatureDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::FeatureGroup.FeatureDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "FeatureGroupName": {
+                            "type": "string"
+                        },
+                        "OfflineStoreConfig": {
+                            "type": "object"
+                        },
+                        "OnlineStoreConfig": {
+                            "type": "object"
+                        },
+                        "RecordIdentifierFeatureName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EventTimeFeatureName",
+                        "FeatureDefinitions",
+                        "FeatureGroupName",
+                        "RecordIdentifierFeatureName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::FeatureGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::FeatureGroup.FeatureDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "FeatureName": {
+                    "type": "string"
+                },
+                "FeatureType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FeatureName",
+                "FeatureType"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Image": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ImageDescription": {
+                            "type": "string"
+                        },
+                        "ImageDisplayName": {
+                            "type": "string"
+                        },
+                        "ImageName": {
+                            "type": "string"
+                        },
+                        "ImageRoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ImageName",
+                        "ImageRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Image"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ImageVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BaseImage": {
+                            "type": "string"
+                        },
+                        "ImageName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "BaseImage",
+                        "ImageName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::ImageVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Model": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Containers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::Model.ContainerDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "EnableNetworkIsolation": {
+                            "type": "boolean"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "InferenceExecutionConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::Model.InferenceExecutionConfig"
+                        },
+                        "ModelName": {
+                            "type": "string"
+                        },
+                        "PrimaryContainer": {
+                            "$ref": "#/definitions/AWS::SageMaker::Model.ContainerDefinition"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::Model.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "ExecutionRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Model"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.ContainerDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerHostname": {
+                    "type": "string"
+                },
+                "Environment": {
+                    "type": "object"
+                },
+                "Image": {
+                    "type": "string"
+                },
+                "ImageConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.ImageConfig"
+                },
+                "InferenceSpecificationName": {
+                    "type": "string"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "ModelDataUrl": {
+                    "type": "string"
+                },
+                "ModelPackageName": {
+                    "type": "string"
+                },
+                "MultiModelConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.MultiModelConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.ImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RepositoryAccessMode": {
+                    "type": "string"
+                },
+                "RepositoryAuthConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.RepositoryAuthConfig"
+                }
+            },
+            "required": [
+                "RepositoryAccessMode"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.InferenceExecutionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.MultiModelConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ModelCacheSetting": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.RepositoryAuthConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RepositoryCredentialsProviderArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RepositoryCredentialsProviderArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "JobDefinitionName": {
+                            "type": "string"
+                        },
+                        "JobResources": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.MonitoringResources"
+                        },
+                        "ModelBiasAppSpecification": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.ModelBiasAppSpecification"
+                        },
+                        "ModelBiasBaselineConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.ModelBiasBaselineConfig"
+                        },
+                        "ModelBiasJobInput": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.ModelBiasJobInput"
+                        },
+                        "ModelBiasJobOutputConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutputConfig"
+                        },
+                        "NetworkConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.NetworkConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StoppingCondition": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.StoppingCondition"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "JobResources",
+                        "ModelBiasAppSpecification",
+                        "ModelBiasJobInput",
+                        "ModelBiasJobOutputConfig",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::ModelBiasJobDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "VolumeKmsKeyId": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.ConstraintsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.EndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndTimeOffset": {
+                    "type": "string"
+                },
+                "EndpointName": {
+                    "type": "string"
+                },
+                "FeaturesAttribute": {
+                    "type": "string"
+                },
+                "InferenceAttribute": {
+                    "type": "string"
+                },
+                "LocalPath": {
+                    "type": "string"
+                },
+                "ProbabilityAttribute": {
+                    "type": "string"
+                },
+                "ProbabilityThresholdAttribute": {
+                    "type": "number"
+                },
+                "S3DataDistributionType": {
+                    "type": "string"
+                },
+                "S3InputMode": {
+                    "type": "string"
+                },
+                "StartTimeOffset": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointName",
+                "LocalPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.ModelBiasAppSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfigUri": {
+                    "type": "string"
+                },
+                "Environment": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ImageUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConfigUri",
+                "ImageUri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.ModelBiasBaselineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseliningJobName": {
+                    "type": "string"
+                },
+                "ConstraintsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.ConstraintsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.ModelBiasJobInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointInput": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.EndpointInput"
+                },
+                "GroundTruthS3Input": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.MonitoringGroundTruthS3Input"
+                }
+            },
+            "required": [
+                "EndpointInput",
+                "GroundTruthS3Input"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.MonitoringGroundTruthS3Input": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Output": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.S3Output"
+                }
+            },
+            "required": [
+                "S3Output"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MonitoringOutputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutput"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MonitoringOutputs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.MonitoringResources": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.ClusterConfig"
+                }
+            },
+            "required": [
+                "ClusterConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.NetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableInterContainerTrafficEncryption": {
+                    "type": "boolean"
+                },
+                "EnableNetworkIsolation": {
+                    "type": "boolean"
+                },
+                "VpcConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.VpcConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.S3Output": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3UploadMode": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LocalPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.StoppingCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRuntimeInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRuntimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "JobDefinitionName": {
+                            "type": "string"
+                        },
+                        "JobResources": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringResources"
+                        },
+                        "ModelExplainabilityAppSpecification": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityAppSpecification"
+                        },
+                        "ModelExplainabilityBaselineConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityBaselineConfig"
+                        },
+                        "ModelExplainabilityJobInput": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityJobInput"
+                        },
+                        "ModelExplainabilityJobOutputConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutputConfig"
+                        },
+                        "NetworkConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.NetworkConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StoppingCondition": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.StoppingCondition"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "JobResources",
+                        "ModelExplainabilityAppSpecification",
+                        "ModelExplainabilityJobInput",
+                        "ModelExplainabilityJobOutputConfig",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::ModelExplainabilityJobDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "VolumeKmsKeyId": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.ConstraintsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.EndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointName": {
+                    "type": "string"
+                },
+                "FeaturesAttribute": {
+                    "type": "string"
+                },
+                "InferenceAttribute": {
+                    "type": "string"
+                },
+                "LocalPath": {
+                    "type": "string"
+                },
+                "ProbabilityAttribute": {
+                    "type": "string"
+                },
+                "S3DataDistributionType": {
+                    "type": "string"
+                },
+                "S3InputMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointName",
+                "LocalPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityAppSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfigUri": {
+                    "type": "string"
+                },
+                "Environment": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ImageUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConfigUri",
+                "ImageUri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityBaselineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseliningJobName": {
+                    "type": "string"
+                },
+                "ConstraintsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.ConstraintsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityJobInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointInput": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.EndpointInput"
+                }
+            },
+            "required": [
+                "EndpointInput"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Output": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.S3Output"
+                }
+            },
+            "required": [
+                "S3Output"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MonitoringOutputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutput"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MonitoringOutputs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringResources": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.ClusterConfig"
+                }
+            },
+            "required": [
+                "ClusterConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.NetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableInterContainerTrafficEncryption": {
+                    "type": "boolean"
+                },
+                "EnableNetworkIsolation": {
+                    "type": "boolean"
+                },
+                "VpcConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.VpcConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.S3Output": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3UploadMode": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LocalPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.StoppingCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRuntimeInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRuntimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelPackageGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ModelPackageGroupDescription": {
+                            "type": "string"
+                        },
+                        "ModelPackageGroupName": {
+                            "type": "string"
+                        },
+                        "ModelPackageGroupPolicy": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ModelPackageGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::ModelPackageGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "JobDefinitionName": {
+                            "type": "string"
+                        },
+                        "JobResources": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.MonitoringResources"
+                        },
+                        "ModelQualityAppSpecification": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.ModelQualityAppSpecification"
+                        },
+                        "ModelQualityBaselineConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.ModelQualityBaselineConfig"
+                        },
+                        "ModelQualityJobInput": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.ModelQualityJobInput"
+                        },
+                        "ModelQualityJobOutputConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutputConfig"
+                        },
+                        "NetworkConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.NetworkConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StoppingCondition": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.StoppingCondition"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "JobResources",
+                        "ModelQualityAppSpecification",
+                        "ModelQualityJobInput",
+                        "ModelQualityJobOutputConfig",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::ModelQualityJobDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "VolumeKmsKeyId": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.ConstraintsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.EndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndTimeOffset": {
+                    "type": "string"
+                },
+                "EndpointName": {
+                    "type": "string"
+                },
+                "InferenceAttribute": {
+                    "type": "string"
+                },
+                "LocalPath": {
+                    "type": "string"
+                },
+                "ProbabilityAttribute": {
+                    "type": "string"
+                },
+                "ProbabilityThresholdAttribute": {
+                    "type": "number"
+                },
+                "S3DataDistributionType": {
+                    "type": "string"
+                },
+                "S3InputMode": {
+                    "type": "string"
+                },
+                "StartTimeOffset": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointName",
+                "LocalPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.ModelQualityAppSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerArguments": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEntrypoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Environment": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ImageUri": {
+                    "type": "string"
+                },
+                "PostAnalyticsProcessorSourceUri": {
+                    "type": "string"
+                },
+                "ProblemType": {
+                    "type": "string"
+                },
+                "RecordPreprocessorSourceUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ImageUri",
+                "ProblemType"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.ModelQualityBaselineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseliningJobName": {
+                    "type": "string"
+                },
+                "ConstraintsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.ConstraintsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.ModelQualityJobInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointInput": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.EndpointInput"
+                },
+                "GroundTruthS3Input": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.MonitoringGroundTruthS3Input"
+                }
+            },
+            "required": [
+                "EndpointInput",
+                "GroundTruthS3Input"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.MonitoringGroundTruthS3Input": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Output": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.S3Output"
+                }
+            },
+            "required": [
+                "S3Output"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MonitoringOutputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutput"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MonitoringOutputs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.MonitoringResources": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.ClusterConfig"
+                }
+            },
+            "required": [
+                "ClusterConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.NetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableInterContainerTrafficEncryption": {
+                    "type": "boolean"
+                },
+                "EnableNetworkIsolation": {
+                    "type": "boolean"
+                },
+                "VpcConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.VpcConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.S3Output": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3UploadMode": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LocalPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.StoppingCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRuntimeInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRuntimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EndpointName": {
+                            "type": "string"
+                        },
+                        "FailureReason": {
+                            "type": "string"
+                        },
+                        "LastMonitoringExecutionSummary": {
+                            "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringExecutionSummary"
+                        },
+                        "MonitoringScheduleConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringScheduleConfig"
+                        },
+                        "MonitoringScheduleName": {
+                            "type": "string"
+                        },
+                        "MonitoringScheduleStatus": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MonitoringScheduleConfig",
+                        "MonitoringScheduleName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::MonitoringSchedule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.BaselineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstraintsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.ConstraintsResource"
+                },
+                "StatisticsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.StatisticsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "VolumeKmsKeyId": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.ConstraintsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.EndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointName": {
+                    "type": "string"
+                },
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3DataDistributionType": {
+                    "type": "string"
+                },
+                "S3InputMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointName",
+                "LocalPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringAppSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerArguments": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEntrypoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ImageUri": {
+                    "type": "string"
+                },
+                "PostAnalyticsProcessorSourceUri": {
+                    "type": "string"
+                },
+                "RecordPreprocessorSourceUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ImageUri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringExecutionSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "CreationTime": {
+                    "type": "string"
+                },
+                "EndpointName": {
+                    "type": "string"
+                },
+                "FailureReason": {
+                    "type": "string"
+                },
+                "LastModifiedTime": {
+                    "type": "string"
+                },
+                "MonitoringExecutionStatus": {
+                    "type": "string"
+                },
+                "MonitoringScheduleName": {
+                    "type": "string"
+                },
+                "ProcessingJobArn": {
+                    "type": "string"
+                },
+                "ScheduledTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CreationTime",
+                "LastModifiedTime",
+                "MonitoringExecutionStatus",
+                "MonitoringScheduleName",
+                "ScheduledTime"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointInput": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.EndpointInput"
+                }
+            },
+            "required": [
+                "EndpointInput"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringJobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "BaselineConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.BaselineConfig"
+                },
+                "Environment": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "MonitoringAppSpecification": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringAppSpecification"
+                },
+                "MonitoringInputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringInput"
+                    },
+                    "type": "array"
+                },
+                "MonitoringOutputConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringOutputConfig"
+                },
+                "MonitoringResources": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringResources"
+                },
+                "NetworkConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.NetworkConfig"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StoppingCondition": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.StoppingCondition"
+                }
+            },
+            "required": [
+                "MonitoringAppSpecification",
+                "MonitoringInputs",
+                "MonitoringOutputConfig",
+                "MonitoringResources",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Output": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.S3Output"
+                }
+            },
+            "required": [
+                "S3Output"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MonitoringOutputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringOutput"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MonitoringOutputs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringResources": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.ClusterConfig"
+                }
+            },
+            "required": [
+                "ClusterConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringScheduleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "MonitoringJobDefinition": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringJobDefinition"
+                },
+                "MonitoringJobDefinitionName": {
+                    "type": "string"
+                },
+                "MonitoringType": {
+                    "type": "string"
+                },
+                "ScheduleConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.ScheduleConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.NetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableInterContainerTrafficEncryption": {
+                    "type": "boolean"
+                },
+                "EnableNetworkIsolation": {
+                    "type": "boolean"
+                },
+                "VpcConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.VpcConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.S3Output": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3UploadMode": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LocalPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.ScheduleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.StatisticsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.StoppingCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRuntimeInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRuntimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::NotebookInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceleratorTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AdditionalCodeRepositories": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DefaultCodeRepository": {
+                            "type": "string"
+                        },
+                        "DirectInternetAccess": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LifecycleConfigName": {
+                            "type": "string"
+                        },
+                        "NotebookInstanceName": {
+                            "type": "string"
+                        },
+                        "PlatformIdentifier": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "RootAccess": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VolumeSizeInGB": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "InstanceType",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::NotebookInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::NotebookInstanceLifecycleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "NotebookInstanceLifecycleConfigName": {
+                            "type": "string"
+                        },
+                        "OnCreate": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::NotebookInstanceLifecycleConfig.NotebookInstanceLifecycleHook"
+                            },
+                            "type": "array"
+                        },
+                        "OnStart": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::NotebookInstanceLifecycleConfig.NotebookInstanceLifecycleHook"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::NotebookInstanceLifecycleConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::NotebookInstanceLifecycleConfig.NotebookInstanceLifecycleHook": {
+            "additionalProperties": false,
+            "properties": {
+                "Content": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Pipeline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PipelineDefinition": {
+                            "type": "object"
+                        },
+                        "PipelineDescription": {
+                            "type": "string"
+                        },
+                        "PipelineDisplayName": {
+                            "type": "string"
+                        },
+                        "PipelineName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PipelineDefinition",
+                        "PipelineName",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Pipeline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ProjectDescription": {
+                            "type": "string"
+                        },
+                        "ProjectName": {
+                            "type": "string"
+                        },
+                        "ServiceCatalogProvisioningDetails": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ProjectName",
+                        "ServiceCatalogProvisioningDetails"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DomainId": {
+                            "type": "string"
+                        },
+                        "SingleSignOnUserIdentifier": {
+                            "type": "string"
+                        },
+                        "SingleSignOnUserValue": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserProfileName": {
+                            "type": "string"
+                        },
+                        "UserSettings": {
+                            "$ref": "#/definitions/AWS::SageMaker::UserProfile.UserSettings"
+                        }
+                    },
+                    "required": [
+                        "DomainId",
+                        "UserProfileName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::UserProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.CustomImage": {
+            "additionalProperties": false,
+            "properties": {
+                "AppImageConfigName": {
+                    "type": "string"
+                },
+                "ImageName": {
+                    "type": "string"
+                },
+                "ImageVersionNumber": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AppImageConfigName",
+                "ImageName"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.JupyterServerAppSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultResourceSpec": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.ResourceSpec"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.KernelGatewayAppSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomImages": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::UserProfile.CustomImage"
+                    },
+                    "type": "array"
+                },
+                "DefaultResourceSpec": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.ResourceSpec"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.ResourceSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "SageMakerImageArn": {
+                    "type": "string"
+                },
+                "SageMakerImageVersionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.SharingSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NotebookOutputOption": {
+                    "type": "string"
+                },
+                "S3KmsKeyId": {
+                    "type": "string"
+                },
+                "S3OutputPath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.UserSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRole": {
+                    "type": "string"
+                },
+                "JupyterServerAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.JupyterServerAppSettings"
+                },
+                "KernelGatewayAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.KernelGatewayAppSettings"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SharingSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.SharingSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Workteam": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "MemberDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::Workteam.MemberDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "NotificationConfiguration": {
+                            "$ref": "#/definitions/AWS::SageMaker::Workteam.NotificationConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkteamName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Workteam"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Workteam.CognitoMemberDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "CognitoClientId": {
+                    "type": "string"
+                },
+                "CognitoUserGroup": {
+                    "type": "string"
+                },
+                "CognitoUserPool": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CognitoClientId",
+                "CognitoUserGroup",
+                "CognitoUserPool"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Workteam.MemberDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "CognitoMemberDefinition": {
+                    "$ref": "#/definitions/AWS::SageMaker::Workteam.CognitoMemberDefinition"
+                }
+            },
+            "required": [
+                "CognitoMemberDefinition"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Workteam.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NotificationTopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NotificationTopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::ResourcePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BlockPublicPolicy": {
+                            "type": "boolean"
+                        },
+                        "ResourcePolicy": {
+                            "type": "object"
+                        },
+                        "SecretId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourcePolicy",
+                        "SecretId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecretsManager::ResourcePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::RotationSchedule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HostedRotationLambda": {
+                            "$ref": "#/definitions/AWS::SecretsManager::RotationSchedule.HostedRotationLambda"
+                        },
+                        "RotationLambdaARN": {
+                            "type": "string"
+                        },
+                        "RotationRules": {
+                            "$ref": "#/definitions/AWS::SecretsManager::RotationSchedule.RotationRules"
+                        },
+                        "SecretId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SecretId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecretsManager::RotationSchedule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::RotationSchedule.HostedRotationLambda": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyArn": {
+                    "type": "string"
+                },
+                "MasterSecretArn": {
+                    "type": "string"
+                },
+                "MasterSecretKmsKeyArn": {
+                    "type": "string"
+                },
+                "RotationLambdaName": {
+                    "type": "string"
+                },
+                "RotationType": {
+                    "type": "string"
+                },
+                "SuperuserSecretArn": {
+                    "type": "string"
+                },
+                "SuperuserSecretKmsKeyArn": {
+                    "type": "string"
+                },
+                "VpcSecurityGroupIds": {
+                    "type": "string"
+                },
+                "VpcSubnetIds": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RotationType"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::RotationSchedule.RotationRules": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomaticallyAfterDays": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecretsManager::Secret": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "GenerateSecretString": {
+                            "$ref": "#/definitions/AWS::SecretsManager::Secret.GenerateSecretString"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ReplicaRegions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SecretsManager::Secret.ReplicaRegion"
+                            },
+                            "type": "array"
+                        },
+                        "SecretString": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecretsManager::Secret"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::Secret.GenerateSecretString": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludeCharacters": {
+                    "type": "string"
+                },
+                "ExcludeLowercase": {
+                    "type": "boolean"
+                },
+                "ExcludeNumbers": {
+                    "type": "boolean"
+                },
+                "ExcludePunctuation": {
+                    "type": "boolean"
+                },
+                "ExcludeUppercase": {
+                    "type": "boolean"
+                },
+                "GenerateStringKey": {
+                    "type": "string"
+                },
+                "IncludeSpace": {
+                    "type": "boolean"
+                },
+                "PasswordLength": {
+                    "type": "number"
+                },
+                "RequireEachIncludedType": {
+                    "type": "boolean"
+                },
+                "SecretStringTemplate": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecretsManager::Secret.ReplicaRegion": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::SecretTargetAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SecretId": {
+                            "type": "string"
+                        },
+                        "TargetId": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SecretId",
+                        "TargetId",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecretsManager::SecretTargetAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::Hub": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::Hub"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::AcceptedPortfolioShare": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::AcceptedPortfolioShare"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::CloudFormationProduct": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Distributor": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Owner": {
+                            "type": "string"
+                        },
+                        "ProvisioningArtifactParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ServiceCatalog::CloudFormationProduct.ProvisioningArtifactProperties"
+                            },
+                            "type": "array"
+                        },
+                        "ReplaceProvisioningArtifacts": {
+                            "type": "boolean"
+                        },
+                        "SupportDescription": {
+                            "type": "string"
+                        },
+                        "SupportEmail": {
+                            "type": "string"
+                        },
+                        "SupportUrl": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Owner",
+                        "ProvisioningArtifactParameters"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::CloudFormationProduct"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::CloudFormationProduct.ProvisioningArtifactProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "DisableTemplateValidation": {
+                    "type": "boolean"
+                },
+                "Info": {
+                    "type": "object"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Info"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::CloudFormationProvisionedProduct": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "NotificationArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PathId": {
+                            "type": "string"
+                        },
+                        "PathName": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "ProductName": {
+                            "type": "string"
+                        },
+                        "ProvisionedProductName": {
+                            "type": "string"
+                        },
+                        "ProvisioningArtifactId": {
+                            "type": "string"
+                        },
+                        "ProvisioningArtifactName": {
+                            "type": "string"
+                        },
+                        "ProvisioningParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningParameter"
+                            },
+                            "type": "array"
+                        },
+                        "ProvisioningPreferences": {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningPreferences"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::CloudFormationProvisionedProduct"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningPreferences": {
+            "additionalProperties": false,
+            "properties": {
+                "StackSetAccounts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StackSetFailureToleranceCount": {
+                    "type": "number"
+                },
+                "StackSetFailureTolerancePercentage": {
+                    "type": "number"
+                },
+                "StackSetMaxConcurrencyCount": {
+                    "type": "number"
+                },
+                "StackSetMaxConcurrencyPercentage": {
+                    "type": "number"
+                },
+                "StackSetOperationType": {
+                    "type": "string"
+                },
+                "StackSetRegions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::LaunchNotificationConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "NotificationArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "NotificationArns",
+                        "PortfolioId",
+                        "ProductId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::LaunchNotificationConstraint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::LaunchRoleConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LocalRoleName": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId",
+                        "ProductId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::LaunchRoleConstraint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::LaunchTemplateConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId",
+                        "ProductId",
+                        "Rules"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::LaunchTemplateConstraint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::Portfolio": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "ProviderName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DisplayName",
+                        "ProviderName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::Portfolio"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::PortfolioPrincipalAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "PrincipalARN": {
+                            "type": "string"
+                        },
+                        "PrincipalType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId",
+                        "PrincipalARN",
+                        "PrincipalType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::PortfolioPrincipalAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::PortfolioProductAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "SourcePortfolioId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId",
+                        "ProductId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::PortfolioProductAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::PortfolioShare": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "AccountId": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ShareTagOptions": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "AccountId",
+                        "PortfolioId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::PortfolioShare"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::ResourceUpdateConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "TagUpdateOnProvisionedProduct": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId",
+                        "ProductId",
+                        "TagUpdateOnProvisionedProduct"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::ResourceUpdateConstraint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::ServiceAction": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Definition": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ServiceCatalog::ServiceAction.DefinitionParameter"
+                            },
+                            "type": "array"
+                        },
+                        "DefinitionType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Definition",
+                        "DefinitionType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::ServiceAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::ServiceAction.DefinitionParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::ServiceActionAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "ProvisioningArtifactId": {
+                            "type": "string"
+                        },
+                        "ServiceActionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProductId",
+                        "ProvisioningArtifactId",
+                        "ServiceActionId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::ServiceActionAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::StackSetConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "AccountList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AdminRole": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ExecutionRole": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "RegionList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "StackInstanceControl": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AccountList",
+                        "AdminRole",
+                        "Description",
+                        "ExecutionRole",
+                        "PortfolioId",
+                        "ProductId",
+                        "RegionList",
+                        "StackInstanceControl"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::StackSetConstraint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::TagOption": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Active": {
+                            "type": "boolean"
+                        },
+                        "Key": {
+                            "type": "string"
+                        },
+                        "Value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Key",
+                        "Value"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::TagOption"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::TagOptionAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "TagOptionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourceId",
+                        "TagOptionId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::TagOptionAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalogAppRegistry::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::ServiceCatalogAppRegistry::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalogAppRegistry::AttributeGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Attributes": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Attributes",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalogAppRegistry::AttributeGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Application": {
+                            "type": "string"
+                        },
+                        "AttributeGroup": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Application",
+                        "AttributeGroup"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalogAppRegistry::ResourceAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Application": {
+                            "type": "string"
+                        },
+                        "Resource": {
+                            "type": "string"
+                        },
+                        "ResourceType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Application",
+                        "Resource",
+                        "ResourceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalogAppRegistry::ResourceAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::HttpNamespace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceDiscovery::HttpNamespace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Instance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InstanceAttributes": {
+                            "type": "object"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "ServiceId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceAttributes",
+                        "ServiceId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceDiscovery::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PrivateDnsNamespace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Properties": {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::PrivateDnsNamespace.Properties"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Vpc": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Vpc"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceDiscovery::PrivateDnsNamespace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PrivateDnsNamespace.PrivateDnsPropertiesMutable": {
+            "additionalProperties": false,
+            "properties": {
+                "SOA": {
+                    "$ref": "#/definitions/AWS::ServiceDiscovery::PrivateDnsNamespace.SOA"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PrivateDnsNamespace.Properties": {
+            "additionalProperties": false,
+            "properties": {
+                "DnsProperties": {
+                    "$ref": "#/definitions/AWS::ServiceDiscovery::PrivateDnsNamespace.PrivateDnsPropertiesMutable"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PrivateDnsNamespace.SOA": {
+            "additionalProperties": false,
+            "properties": {
+                "TTL": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PublicDnsNamespace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Properties": {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::PublicDnsNamespace.Properties"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceDiscovery::PublicDnsNamespace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PublicDnsNamespace.Properties": {
+            "additionalProperties": false,
+            "properties": {
+                "DnsProperties": {
+                    "$ref": "#/definitions/AWS::ServiceDiscovery::PublicDnsNamespace.PublicDnsPropertiesMutable"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PublicDnsNamespace.PublicDnsPropertiesMutable": {
+            "additionalProperties": false,
+            "properties": {
+                "SOA": {
+                    "$ref": "#/definitions/AWS::ServiceDiscovery::PublicDnsNamespace.SOA"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PublicDnsNamespace.SOA": {
+            "additionalProperties": false,
+            "properties": {
+                "TTL": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Service": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DnsConfig": {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::Service.DnsConfig"
+                        },
+                        "HealthCheckConfig": {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::Service.HealthCheckConfig"
+                        },
+                        "HealthCheckCustomConfig": {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::Service.HealthCheckCustomConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NamespaceId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceDiscovery::Service"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Service.DnsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DnsRecords": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ServiceDiscovery::Service.DnsRecord"
+                    },
+                    "type": "array"
+                },
+                "NamespaceId": {
+                    "type": "string"
+                },
+                "RoutingPolicy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DnsRecords"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Service.DnsRecord": {
+            "additionalProperties": false,
+            "properties": {
+                "TTL": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TTL",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Service.HealthCheckConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FailureThreshold": {
+                    "type": "number"
+                },
+                "ResourcePath": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Service.HealthCheckCustomConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FailureThreshold": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Signer::ProfilePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        },
+                        "ProfileName": {
+                            "type": "string"
+                        },
+                        "ProfileVersion": {
+                            "type": "string"
+                        },
+                        "StatementId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Action",
+                        "Principal",
+                        "ProfileName",
+                        "StatementId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Signer::ProfilePermission"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Signer::SigningProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PlatformId": {
+                            "type": "string"
+                        },
+                        "SignatureValidityPeriod": {
+                            "$ref": "#/definitions/AWS::Signer::SigningProfile.SignatureValidityPeriod"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PlatformId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Signer::SigningProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Signer::SigningProfile.SignatureValidityPeriod": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::StepFunctions::Activity": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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/AWS::StepFunctions::Activity.TagsEntry"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::StepFunctions::Activity"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::StepFunctions::Activity.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.Definition"
+                        },
+                        "DefinitionS3Location": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.S3Location"
+                        },
+                        "DefinitionString": {
+                            "type": "string"
+                        },
+                        "DefinitionSubstitutions": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "LoggingConfiguration": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.LoggingConfiguration"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StateMachineName": {
+                            "type": "string"
+                        },
+                        "StateMachineType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::StepFunctions::StateMachine.TagsEntry"
+                            },
+                            "type": "array"
+                        },
+                        "TracingConfiguration": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.TracingConfiguration"
+                        }
+                    },
+                    "required": [
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::StepFunctions::StateMachine"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.CloudWatchLogsLogGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.Definition": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.LogDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsLogGroup": {
+                    "$ref": "#/definitions/AWS::StepFunctions::StateMachine.CloudWatchLogsLogGroup"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Destinations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::StepFunctions::StateMachine.LogDestination"
+                    },
+                    "type": "array"
+                },
+                "IncludeExecutionData": {
+                    "type": "boolean"
+                },
+                "Level": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.TracingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ArtifactConfig": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.ArtifactConfig"
+                        },
+                        "ArtifactS3Location": {
+                            "type": "string"
+                        },
+                        "Code": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.Code"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "FailureRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RunConfig": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.RunConfig"
+                        },
+                        "RuntimeVersion": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.Schedule"
+                        },
+                        "StartCanaryAfterCreation": {
+                            "type": "boolean"
+                        },
+                        "SuccessRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VPCConfig": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.VPCConfig"
+                        },
+                        "VisualReference": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.VisualReference"
+                        }
+                    },
+                    "required": [
+                        "ArtifactS3Location",
+                        "Code",
+                        "ExecutionRoleArn",
+                        "Name",
+                        "RuntimeVersion",
+                        "Schedule",
+                        "StartCanaryAfterCreation"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Synthetics::Canary"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.ArtifactConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Encryption": {
+                    "$ref": "#/definitions/AWS::Synthetics::Canary.S3Encryption"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.BaseScreenshot": {
+            "additionalProperties": false,
+            "properties": {
+                "IgnoreCoordinates": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ScreenshotName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScreenshotName"
+            ],
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.Code": {
+            "additionalProperties": false,
+            "properties": {
+                "Handler": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                },
+                "S3ObjectVersion": {
+                    "type": "string"
+                },
+                "Script": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Handler"
+            ],
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.RunConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveTracing": {
+                    "type": "boolean"
+                },
+                "EnvironmentVariables": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "MemoryInMB": {
+                    "type": "number"
+                },
+                "TimeoutInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.S3Encryption": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionMode": {
+                    "type": "string"
+                },
+                "KmsKeyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Expression"
+            ],
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.VPCConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.VisualReference": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseCanaryRunId": {
+                    "type": "string"
+                },
+                "BaseScreenshots": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Synthetics::Canary.BaseScreenshot"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "BaseCanaryRunId"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::Database": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Timestream::Database"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClientToken": {
+                            "type": "string"
+                        },
+                        "ErrorReportConfiguration": {
+                            "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.ErrorReportConfiguration"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "NotificationConfiguration": {
+                            "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.NotificationConfiguration"
+                        },
+                        "QueryString": {
+                            "type": "string"
+                        },
+                        "ScheduleConfiguration": {
+                            "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.ScheduleConfiguration"
+                        },
+                        "ScheduledQueryExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "ScheduledQueryName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetConfiguration": {
+                            "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.TargetConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ErrorReportConfiguration",
+                        "NotificationConfiguration",
+                        "QueryString",
+                        "ScheduleConfiguration",
+                        "ScheduledQueryExecutionRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Timestream::ScheduledQuery"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.DimensionMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionValueType": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DimensionValueType",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.ErrorReportConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.S3Configuration"
+                }
+            },
+            "required": [
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.MixedMeasureMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MeasureName": {
+                    "type": "string"
+                },
+                "MeasureValueType": {
+                    "type": "string"
+                },
+                "MultiMeasureAttributeMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.MultiMeasureAttributeMapping"
+                    },
+                    "type": "array"
+                },
+                "SourceColumn": {
+                    "type": "string"
+                },
+                "TargetMeasureName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MeasureValueType"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.MultiMeasureAttributeMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MeasureValueType": {
+                    "type": "string"
+                },
+                "SourceColumn": {
+                    "type": "string"
+                },
+                "TargetMultiMeasureAttributeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MeasureValueType",
+                "SourceColumn"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.MultiMeasureMappings": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiMeasureAttributeMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.MultiMeasureAttributeMapping"
+                    },
+                    "type": "array"
+                },
+                "TargetMultiMeasureName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MultiMeasureAttributeMappings"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SnsConfiguration": {
+                    "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.SnsConfiguration"
+                }
+            },
+            "required": [
+                "SnsConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.S3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "EncryptionOption": {
+                    "type": "string"
+                },
+                "ObjectKeyPrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.ScheduleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.SnsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.TargetConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "TimestreamConfiguration": {
+                    "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.TimestreamConfiguration"
+                }
+            },
+            "required": [
+                "TimestreamConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.TimestreamConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DimensionMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.DimensionMapping"
+                    },
+                    "type": "array"
+                },
+                "MeasureNameColumn": {
+                    "type": "string"
+                },
+                "MixedMeasureMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.MixedMeasureMapping"
+                    },
+                    "type": "array"
+                },
+                "MultiMeasureMappings": {
+                    "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.MultiMeasureMappings"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "TimeColumn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "DimensionMappings",
+                "TableName",
+                "TimeColumn"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::Table": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "RetentionProperties": {
+                            "type": "object"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DatabaseName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Timestream::Table"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Server": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "EndpointDetails": {
+                            "$ref": "#/definitions/AWS::Transfer::Server.EndpointDetails"
+                        },
+                        "EndpointType": {
+                            "type": "string"
+                        },
+                        "IdentityProviderDetails": {
+                            "$ref": "#/definitions/AWS::Transfer::Server.IdentityProviderDetails"
+                        },
+                        "IdentityProviderType": {
+                            "type": "string"
+                        },
+                        "LoggingRole": {
+                            "type": "string"
+                        },
+                        "ProtocolDetails": {
+                            "$ref": "#/definitions/AWS::Transfer::Server.ProtocolDetails"
+                        },
+                        "Protocols": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Server.Protocol"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityPolicyName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkflowDetails": {
+                            "$ref": "#/definitions/AWS::Transfer::Server.WorkflowDetails"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Transfer::Server"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Server.EndpointDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "AddressAllocationIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcEndpointId": {
+                    "type": "string"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Server.IdentityProviderDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryId": {
+                    "type": "string"
+                },
+                "Function": {
+                    "type": "string"
+                },
+                "InvocationRole": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Server.Protocol": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::Transfer::Server.ProtocolDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "PassiveIp": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Server.WorkflowDetail": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRole": {
+                    "type": "string"
+                },
+                "WorkflowId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ExecutionRole",
+                "WorkflowId"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Server.WorkflowDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "OnUpload": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Transfer::Server.WorkflowDetail"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "OnUpload"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HomeDirectory": {
+                            "type": "string"
+                        },
+                        "HomeDirectoryMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::User.HomeDirectoryMapEntry"
+                            },
+                            "type": "array"
+                        },
+                        "HomeDirectoryType": {
+                            "type": "string"
+                        },
+                        "Policy": {
+                            "type": "string"
+                        },
+                        "PosixProfile": {
+                            "$ref": "#/definitions/AWS::Transfer::User.PosixProfile"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "ServerId": {
+                            "type": "string"
+                        },
+                        "SshPublicKeys": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::User.SshPublicKey"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Role",
+                        "ServerId",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Transfer::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::User.HomeDirectoryMapEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Entry": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Entry",
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::User.PosixProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "Gid": {
+                    "type": "number"
+                },
+                "SecondaryGids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Uid": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Gid",
+                "Uid"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::User.SshPublicKey": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "OnExceptionSteps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
+                            },
+                            "type": "array"
+                        },
+                        "Steps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Steps"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Transfer::Workflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.WorkflowStep": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyStepDetails": {
+                    "type": "object"
+                },
+                "CustomStepDetails": {
+                    "type": "object"
+                },
+                "DeleteStepDetails": {
+                    "type": "object"
+                },
+                "TagStepDetails": {
+                    "type": "object"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAF::ByteMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ByteMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::ByteMatchSet.ByteMatchTuple"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::ByteMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::ByteMatchSet.ByteMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAF::ByteMatchSet.FieldToMatch"
+                },
+                "PositionalConstraint": {
+                    "type": "string"
+                },
+                "TargetString": {
+                    "type": "string"
+                },
+                "TargetStringBase64": {
+                    "type": "string"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "PositionalConstraint",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::ByteMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::IPSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "IPSetDescriptors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::IPSet.IPSetDescriptor"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::IPSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::IPSet.IPSetDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Predicates": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::Rule.Predicate"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MetricName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::Rule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::Rule.Predicate": {
+            "additionalProperties": false,
+            "properties": {
+                "DataId": {
+                    "type": "string"
+                },
+                "Negated": {
+                    "type": "boolean"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataId",
+                "Negated",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SizeConstraintSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SizeConstraints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::SizeConstraintSet.SizeConstraint"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "SizeConstraints"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::SizeConstraintSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SizeConstraintSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SizeConstraintSet.SizeConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAF::SizeConstraintSet.FieldToMatch"
+                },
+                "Size": {
+                    "type": "number"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "FieldToMatch",
+                "Size",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SqlInjectionMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SqlInjectionMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::SqlInjectionMatchSet.SqlInjectionMatchTuple"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::SqlInjectionMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SqlInjectionMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SqlInjectionMatchSet.SqlInjectionMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAF::SqlInjectionMatchSet.FieldToMatch"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::WebACL": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "$ref": "#/definitions/AWS::WAF::WebACL.WafAction"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::WebACL.ActivatedRule"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DefaultAction",
+                        "MetricName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::WebACL"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::WebACL.ActivatedRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::WAF::WebACL.WafAction"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "RuleId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Priority",
+                "RuleId"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::WebACL.WafAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::XssMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "XssMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::XssMatchSet.XssMatchTuple"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "XssMatchTuples"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::XssMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::XssMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::XssMatchSet.XssMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAF::XssMatchSet.FieldToMatch"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::ByteMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ByteMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::ByteMatchSet.ByteMatchTuple"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::ByteMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::ByteMatchSet.ByteMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFRegional::ByteMatchSet.FieldToMatch"
+                },
+                "PositionalConstraint": {
+                    "type": "string"
+                },
+                "TargetString": {
+                    "type": "string"
+                },
+                "TargetStringBase64": {
+                    "type": "string"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "PositionalConstraint",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::ByteMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::GeoMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GeoMatchConstraints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::GeoMatchSet.GeoMatchConstraint"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::GeoMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::GeoMatchSet.GeoMatchConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::IPSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "IPSetDescriptors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::IPSet.IPSetDescriptor"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::IPSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::IPSet.IPSetDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::RateBasedRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MatchPredicates": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::RateBasedRule.Predicate"
+                            },
+                            "type": "array"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RateKey": {
+                            "type": "string"
+                        },
+                        "RateLimit": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "MetricName",
+                        "Name",
+                        "RateKey",
+                        "RateLimit"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::RateBasedRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::RateBasedRule.Predicate": {
+            "additionalProperties": false,
+            "properties": {
+                "DataId": {
+                    "type": "string"
+                },
+                "Negated": {
+                    "type": "boolean"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataId",
+                "Negated",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::RegexPatternSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RegexPatternStrings": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "RegexPatternStrings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::RegexPatternSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Predicates": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::Rule.Predicate"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MetricName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::Rule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::Rule.Predicate": {
+            "additionalProperties": false,
+            "properties": {
+                "DataId": {
+                    "type": "string"
+                },
+                "Negated": {
+                    "type": "boolean"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataId",
+                "Negated",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SizeConstraintSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SizeConstraints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::SizeConstraintSet.SizeConstraint"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::SizeConstraintSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SizeConstraintSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SizeConstraintSet.SizeConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFRegional::SizeConstraintSet.FieldToMatch"
+                },
+                "Size": {
+                    "type": "number"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "FieldToMatch",
+                "Size",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SqlInjectionMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SqlInjectionMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::SqlInjectionMatchSet.SqlInjectionMatchTuple"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::SqlInjectionMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SqlInjectionMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SqlInjectionMatchSet.SqlInjectionMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFRegional::SqlInjectionMatchSet.FieldToMatch"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::WebACL": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "$ref": "#/definitions/AWS::WAFRegional::WebACL.Action"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::WebACL.Rule"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DefaultAction",
+                        "MetricName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::WebACL"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::WebACL.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::WebACL.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::WAFRegional::WebACL.Action"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "RuleId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action",
+                "Priority",
+                "RuleId"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::WebACLAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "WebACLId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourceArn",
+                        "WebACLId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::WebACLAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::XssMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "XssMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::XssMatchSet.XssMatchTuple"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::XssMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::XssMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::XssMatchSet.XssMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFRegional::XssMatchSet.FieldToMatch"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::IPSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Addresses": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IPAddressVersion": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Scope": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Addresses",
+                        "IPAddressVersion",
+                        "Scope"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::IPSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LogDestinationConfigs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LoggingFilter": {
+                            "type": "object"
+                        },
+                        "RedactedFields": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFv2::LoggingConfiguration.FieldToMatch"
+                            },
+                            "type": "array"
+                        },
+                        "ResourceArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LogDestinationConfigs",
+                        "ResourceArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::LoggingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::LoggingConfiguration.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonBody": {
+                    "type": "object"
+                },
+                "Method": {
+                    "type": "object"
+                },
+                "QueryString": {
+                    "type": "object"
+                },
+                "SingleHeader": {
+                    "type": "object"
+                },
+                "UriPath": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RegexPatternSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RegularExpressionList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Scope": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RegularExpressionList",
+                        "Scope"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::RegexPatternSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Capacity": {
+                            "type": "number"
+                        },
+                        "CustomResponseBodies": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.CustomResponseBody"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Scope": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VisibilityConfig": {
+                            "$ref": "#/definitions/AWS::WAFv2::RuleGroup.VisibilityConfig"
+                        }
+                    },
+                    "required": [
+                        "Capacity",
+                        "Scope",
+                        "VisibilityConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::RuleGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.AndStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Statement"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Statements"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.ByteMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.FieldToMatch"
+                },
+                "PositionalConstraint": {
+                    "type": "string"
+                },
+                "SearchString": {
+                    "type": "string"
+                },
+                "SearchStringBase64": {
+                    "type": "string"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "PositionalConstraint",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.CustomResponseBody": {
+            "additionalProperties": false,
+            "properties": {
+                "Content": {
+                    "type": "string"
+                },
+                "ContentType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Content",
+                "ContentType"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "AllQueryArguments": {
+                    "type": "object"
+                },
+                "Body": {
+                    "type": "object"
+                },
+                "JsonBody": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.JsonBody"
+                },
+                "Method": {
+                    "type": "object"
+                },
+                "QueryString": {
+                    "type": "object"
+                },
+                "SingleHeader": {
+                    "type": "object"
+                },
+                "SingleQueryArgument": {
+                    "type": "object"
+                },
+                "UriPath": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.ForwardedIPConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FallbackBehavior": {
+                    "type": "string"
+                },
+                "HeaderName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FallbackBehavior",
+                "HeaderName"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.GeoMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "CountryCodes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.ForwardedIPConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.IPSetForwardedIPConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FallbackBehavior": {
+                    "type": "string"
+                },
+                "HeaderName": {
+                    "type": "string"
+                },
+                "Position": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FallbackBehavior",
+                "HeaderName",
+                "Position"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.IPSetReferenceStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "IPSetForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.IPSetForwardedIPConfiguration"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.JsonBody": {
+            "additionalProperties": false,
+            "properties": {
+                "InvalidFallbackBehavior": {
+                    "type": "string"
+                },
+                "MatchPattern": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.JsonMatchPattern"
+                },
+                "MatchScope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchPattern",
+                "MatchScope"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.JsonMatchPattern": {
+            "additionalProperties": false,
+            "properties": {
+                "All": {
+                    "type": "object"
+                },
+                "IncludedPaths": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.Label": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.LabelMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Scope"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.LabelSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.NotStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Statement"
+                }
+            },
+            "required": [
+                "Statement"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.OrStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Statement"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Statements"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.RateBasedStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregateKeyType": {
+                    "type": "string"
+                },
+                "ForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.ForwardedIPConfiguration"
+                },
+                "Limit": {
+                    "type": "number"
+                },
+                "ScopeDownStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Statement"
+                }
+            },
+            "required": [
+                "AggregateKeyType",
+                "Limit"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.RegexPatternSetReferenceStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn",
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.RuleAction"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "RuleLabels": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Label"
+                    },
+                    "type": "array"
+                },
+                "Statement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Statement"
+                },
+                "VisibilityConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.VisibilityConfig"
+                }
+            },
+            "required": [
+                "Name",
+                "Priority",
+                "Statement",
+                "VisibilityConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.RuleAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Allow": {
+                    "type": "object"
+                },
+                "Block": {
+                    "type": "object"
+                },
+                "Count": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.SizeConstraintStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.FieldToMatch"
+                },
+                "Size": {
+                    "type": "number"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "FieldToMatch",
+                "Size",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.SqliMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.Statement": {
+            "additionalProperties": false,
+            "properties": {
+                "AndStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.AndStatement"
+                },
+                "ByteMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.ByteMatchStatement"
+                },
+                "GeoMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.GeoMatchStatement"
+                },
+                "IPSetReferenceStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.IPSetReferenceStatement"
+                },
+                "LabelMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.LabelMatchStatement"
+                },
+                "NotStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.NotStatement"
+                },
+                "OrStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.OrStatement"
+                },
+                "RateBasedStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.RateBasedStatement"
+                },
+                "RegexPatternSetReferenceStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.RegexPatternSetReferenceStatement"
+                },
+                "SizeConstraintStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.SizeConstraintStatement"
+                },
+                "SqliMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.SqliMatchStatement"
+                },
+                "XssMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.XssMatchStatement"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.TextTransformation": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Priority",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.VisibilityConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "SampledRequestsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "CloudWatchMetricsEnabled",
+                "MetricName",
+                "SampledRequestsEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.XssMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomResponseBodies": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomResponseBody"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "DefaultAction": {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL.DefaultAction"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFv2::WebACL.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Scope": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VisibilityConfig": {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL.VisibilityConfig"
+                        }
+                    },
+                    "required": [
+                        "DefaultAction",
+                        "Scope",
+                        "VisibilityConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::WebACL"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.AllowAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomRequestHandling": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomRequestHandling"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.AndStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Statements"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.BlockAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomResponse": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomResponse"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.ByteMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.FieldToMatch"
+                },
+                "PositionalConstraint": {
+                    "type": "string"
+                },
+                "SearchString": {
+                    "type": "string"
+                },
+                "SearchStringBase64": {
+                    "type": "string"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "PositionalConstraint",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.CountAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomRequestHandling": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomRequestHandling"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.CustomHTTPHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.CustomRequestHandling": {
+            "additionalProperties": false,
+            "properties": {
+                "InsertHeaders": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomHTTPHeader"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "InsertHeaders"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.CustomResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomResponseBodyKey": {
+                    "type": "string"
+                },
+                "ResponseCode": {
+                    "type": "number"
+                },
+                "ResponseHeaders": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomHTTPHeader"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ResponseCode"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.CustomResponseBody": {
+            "additionalProperties": false,
+            "properties": {
+                "Content": {
+                    "type": "string"
+                },
+                "ContentType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Content",
+                "ContentType"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.DefaultAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Allow": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.AllowAction"
+                },
+                "Block": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.BlockAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.ExcludedRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "AllQueryArguments": {
+                    "type": "object"
+                },
+                "Body": {
+                    "type": "object"
+                },
+                "JsonBody": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.JsonBody"
+                },
+                "Method": {
+                    "type": "object"
+                },
+                "QueryString": {
+                    "type": "object"
+                },
+                "SingleHeader": {
+                    "type": "object"
+                },
+                "SingleQueryArgument": {
+                    "type": "object"
+                },
+                "UriPath": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.ForwardedIPConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FallbackBehavior": {
+                    "type": "string"
+                },
+                "HeaderName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FallbackBehavior",
+                "HeaderName"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.GeoMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "CountryCodes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.ForwardedIPConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.IPSetForwardedIPConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FallbackBehavior": {
+                    "type": "string"
+                },
+                "HeaderName": {
+                    "type": "string"
+                },
+                "Position": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FallbackBehavior",
+                "HeaderName",
+                "Position"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.IPSetReferenceStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "IPSetForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.IPSetForwardedIPConfiguration"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.JsonBody": {
+            "additionalProperties": false,
+            "properties": {
+                "InvalidFallbackBehavior": {
+                    "type": "string"
+                },
+                "MatchPattern": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.JsonMatchPattern"
+                },
+                "MatchScope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchPattern",
+                "MatchScope"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.JsonMatchPattern": {
+            "additionalProperties": false,
+            "properties": {
+                "All": {
+                    "type": "object"
+                },
+                "IncludedPaths": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.Label": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.LabelMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Scope"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.ManagedRuleGroupStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludedRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.ExcludedRule"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "ScopeDownStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                },
+                "VendorName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "VendorName"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.NotStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                }
+            },
+            "required": [
+                "Statement"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.OrStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Statements"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.OverrideAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "object"
+                },
+                "None": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.RateBasedStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregateKeyType": {
+                    "type": "string"
+                },
+                "ForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.ForwardedIPConfiguration"
+                },
+                "Limit": {
+                    "type": "number"
+                },
+                "ScopeDownStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                }
+            },
+            "required": [
+                "AggregateKeyType",
+                "Limit"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.RegexPatternSetReferenceStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn",
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.RuleAction"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "OverrideAction": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.OverrideAction"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "RuleLabels": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.Label"
+                    },
+                    "type": "array"
+                },
+                "Statement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                },
+                "VisibilityConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.VisibilityConfig"
+                }
+            },
+            "required": [
+                "Name",
+                "Priority",
+                "Statement",
+                "VisibilityConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.RuleAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Allow": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.AllowAction"
+                },
+                "Block": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.BlockAction"
+                },
+                "Count": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.CountAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.RuleGroupReferenceStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "ExcludedRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.ExcludedRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.SizeConstraintStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.FieldToMatch"
+                },
+                "Size": {
+                    "type": "number"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "FieldToMatch",
+                "Size",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.SqliMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.Statement": {
+            "additionalProperties": false,
+            "properties": {
+                "AndStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.AndStatement"
+                },
+                "ByteMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.ByteMatchStatement"
+                },
+                "GeoMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.GeoMatchStatement"
+                },
+                "IPSetReferenceStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.IPSetReferenceStatement"
+                },
+                "LabelMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.LabelMatchStatement"
+                },
+                "ManagedRuleGroupStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.ManagedRuleGroupStatement"
+                },
+                "NotStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.NotStatement"
+                },
+                "OrStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.OrStatement"
+                },
+                "RateBasedStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.RateBasedStatement"
+                },
+                "RegexPatternSetReferenceStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.RegexPatternSetReferenceStatement"
+                },
+                "RuleGroupReferenceStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.RuleGroupReferenceStatement"
+                },
+                "SizeConstraintStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.SizeConstraintStatement"
+                },
+                "SqliMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.SqliMatchStatement"
+                },
+                "XssMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.XssMatchStatement"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.TextTransformation": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Priority",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.VisibilityConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "SampledRequestsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "CloudWatchMetricsEnabled",
+                "MetricName",
+                "SampledRequestsEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.XssMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACLAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "WebACLArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourceArn",
+                        "WebACLArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::WebACLAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::Assistant": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ServerSideEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Wisdom::Assistant.ServerSideEncryptionConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Wisdom::Assistant"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::Assistant.ServerSideEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Wisdom::AssistantAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssistantId": {
+                            "type": "string"
+                        },
+                        "Association": {
+                            "$ref": "#/definitions/AWS::Wisdom::AssistantAssociation.AssociationData"
+                        },
+                        "AssociationType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AssistantId",
+                        "Association",
+                        "AssociationType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Wisdom::AssistantAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::AssistantAssociation.AssociationData": {
+            "additionalProperties": false,
+            "properties": {
+                "KnowledgeBaseId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KnowledgeBaseId"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::KnowledgeBase": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "KnowledgeBaseType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RenderingConfiguration": {
+                            "$ref": "#/definitions/AWS::Wisdom::KnowledgeBase.RenderingConfiguration"
+                        },
+                        "ServerSideEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Wisdom::KnowledgeBase.ServerSideEncryptionConfiguration"
+                        },
+                        "SourceConfiguration": {
+                            "$ref": "#/definitions/AWS::Wisdom::KnowledgeBase.SourceConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "KnowledgeBaseType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Wisdom::KnowledgeBase"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::KnowledgeBase.AppIntegrationsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AppIntegrationArn": {
+                    "type": "string"
+                },
+                "ObjectFields": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AppIntegrationArn",
+                "ObjectFields"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::KnowledgeBase.RenderingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "TemplateUri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Wisdom::KnowledgeBase.ServerSideEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Wisdom::KnowledgeBase.SourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AppIntegrations": {
+                    "$ref": "#/definitions/AWS::Wisdom::KnowledgeBase.AppIntegrationsConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WorkSpaces::ConnectionAlias": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionString": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConnectionString"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WorkSpaces::ConnectionAlias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::ConnectionAlias.ConnectionAliasAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "AssociatedAccountId": {
+                    "type": "string"
+                },
+                "AssociationStatus": {
+                    "type": "string"
+                },
+                "ConnectionIdentifier": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WorkSpaces::Workspace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "DirectoryId": {
+                            "type": "string"
+                        },
+                        "RootVolumeEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        },
+                        "UserVolumeEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "VolumeEncryptionKey": {
+                            "type": "string"
+                        },
+                        "WorkspaceProperties": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::Workspace.WorkspaceProperties"
+                        }
+                    },
+                    "required": [
+                        "BundleId",
+                        "DirectoryId",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WorkSpaces::Workspace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::Workspace.WorkspaceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeTypeName": {
+                    "type": "string"
+                },
+                "RootVolumeSizeGib": {
+                    "type": "number"
+                },
+                "RunningMode": {
+                    "type": "string"
+                },
+                "RunningModeAutoStopTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "UserVolumeSizeGib": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::XRay::Group": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FilterExpression": {
+                            "type": "string"
+                        },
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "InsightsConfiguration": {
+                            "$ref": "#/definitions/AWS::XRay::Group.InsightsConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "type": "object"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::XRay::Group"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::XRay::Group.InsightsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InsightsEnabled": {
+                    "type": "boolean"
+                },
+                "NotificationsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::XRay::SamplingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RuleName": {
+                            "type": "string"
+                        },
+                        "SamplingRule": {
+                            "$ref": "#/definitions/AWS::XRay::SamplingRule.SamplingRule"
+                        },
+                        "SamplingRuleRecord": {
+                            "$ref": "#/definitions/AWS::XRay::SamplingRule.SamplingRuleRecord"
+                        },
+                        "SamplingRuleUpdate": {
+                            "$ref": "#/definitions/AWS::XRay::SamplingRule.SamplingRuleUpdate"
+                        },
+                        "Tags": {
+                            "items": {
+                                "type": "object"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::XRay::SamplingRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::XRay::SamplingRule.SamplingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "FixedRate": {
+                    "type": "number"
+                },
+                "HTTPMethod": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "ReservoirSize": {
+                    "type": "number"
+                },
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RuleARN": {
+                    "type": "string"
+                },
+                "RuleName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                },
+                "ServiceType": {
+                    "type": "string"
+                },
+                "URLPath": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::XRay::SamplingRule.SamplingRuleRecord": {
+            "additionalProperties": false,
+            "properties": {
+                "CreatedAt": {
+                    "type": "string"
+                },
+                "ModifiedAt": {
+                    "type": "string"
+                },
+                "SamplingRule": {
+                    "$ref": "#/definitions/AWS::XRay::SamplingRule.SamplingRule"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::XRay::SamplingRule.SamplingRuleUpdate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "FixedRate": {
+                    "type": "number"
+                },
+                "HTTPMethod": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "ReservoirSize": {
+                    "type": "number"
+                },
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RuleARN": {
+                    "type": "string"
+                },
+                "RuleName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                },
+                "ServiceType": {
+                    "type": "string"
+                },
+                "URLPath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "Alexa::ASK::Skill": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationConfiguration": {
+                            "$ref": "#/definitions/Alexa::ASK::Skill.AuthenticationConfiguration"
+                        },
+                        "SkillPackage": {
+                            "$ref": "#/definitions/Alexa::ASK::Skill.SkillPackage"
+                        },
+                        "VendorId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthenticationConfiguration",
+                        "SkillPackage",
+                        "VendorId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "Alexa::ASK::Skill"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "Alexa::ASK::Skill.AuthenticationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "RefreshToken": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClientId",
+                "ClientSecret",
+                "RefreshToken"
+            ],
+            "type": "object"
+        },
+        "Alexa::ASK::Skill.Overrides": {
+            "additionalProperties": false,
+            "properties": {
+                "Manifest": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "Alexa::ASK::Skill.SkillPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Overrides": {
+                    "$ref": "#/definitions/Alexa::ASK::Skill.Overrides"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3BucketRole": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                },
+                "S3ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "Parameter": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedPattern": {
+                    "type": "string"
+                },
+                "AllowedValues": {
+                    "type": "array"
+                },
+                "ConstraintDescription": {
+                    "type": "string"
+                },
+                "Default": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "MaxLength": {
+                    "type": "string"
+                },
+                "MaxValue": {
+                    "type": "string"
+                },
+                "MinLength": {
+                    "type": "string"
+                },
+                "MinValue": {
+                    "type": "string"
+                },
+                "NoEcho": {
+                    "type": [
+                        "string",
+                        "boolean"
+                    ]
+                },
+                "Type": {
+                    "enum": [
+                        "String",
+                        "Number",
+                        "List\u003cNumber\u003e",
+                        "CommaDelimitedList",
+                        "AWS::EC2::AvailabilityZone::Name",
+                        "AWS::EC2::Image::Id",
+                        "AWS::EC2::Instance::Id",
+                        "AWS::EC2::KeyPair::KeyName",
+                        "AWS::EC2::SecurityGroup::GroupName",
+                        "AWS::EC2::SecurityGroup::Id",
+                        "AWS::EC2::Subnet::Id",
+                        "AWS::EC2::Volume::Id",
+                        "AWS::EC2::VPC::Id",
+                        "AWS::Route53::HostedZone::Id",
+                        "List\u003cAWS::EC2::AvailabilityZone::Name\u003e",
+                        "List\u003cAWS::EC2::Image::Id\u003e",
+                        "List\u003cAWS::EC2::Instance::Id\u003e",
+                        "List\u003cAWS::EC2::SecurityGroup::GroupName\u003e",
+                        "List\u003cAWS::EC2::SecurityGroup::Id\u003e",
+                        "List\u003cAWS::EC2::Subnet::Id\u003e",
+                        "List\u003cAWS::EC2::Volume::Id\u003e",
+                        "List\u003cAWS::EC2::VPC::Id\u003e",
+                        "List\u003cAWS::Route53::HostedZone::Id\u003e",
+                        "List\u003cString\u003e",
+                        "AWS::SSM::Parameter::Name",
+                        "AWS::SSM::Parameter::Value\u003cString\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cString\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cCommaDelimitedList\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::AvailabilityZone::Name\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::Image::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::Instance::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::SecurityGroup::GroupName\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::SecurityGroup::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::Subnet::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::Volume::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::VPC::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::Route53::HostedZone::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::AvailabilityZone::Name\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::Image::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::Instance::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::SecurityGroup::GroupName\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::SecurityGroup::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::Subnet::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::Volume::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::VPC::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::Route53::HostedZone::Id\u003e\u003e"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "Tag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        }
+    },
+    "properties": {
+        "AWSTemplateFormatVersion": {
+            "enum": [
+                "2010-09-09"
+            ],
+            "type": "string"
+        },
+        "Conditions": {
+            "additionalProperties": false,
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "Description": {
+            "description": "Template description",
+            "maxLength": 1024,
+            "type": "string"
+        },
+        "Mappings": {
+            "additionalProperties": false,
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "Metadata": {
+            "type": "object"
+        },
+        "Outputs": {
+            "additionalProperties": false,
+            "maxProperties": 60,
+            "minProperties": 1,
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "Parameters": {
+            "additionalProperties": false,
+            "maxProperties": 50,
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "$ref": "#/definitions/Parameter"
+                }
+            },
+            "type": "object"
+        },
+        "Resources": {
+            "additionalProperties": false,
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/AWS::ACMPCA::Certificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthorityActivation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ACMPCA::Permission"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::APS::RuleGroupsNamespace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::APS::Workspace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AccessAnalyzer::Analyzer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Configuration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AmazonMQ::ConfigurationAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Amplify::App"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Amplify::Branch"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Amplify::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AmplifyUIBuilder::Theme"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Account"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::ApiKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Authorizer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::BasePathMapping"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::ClientCertificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Deployment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::DocumentationPart"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::DocumentationVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::DomainName"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::GatewayResponse"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Method"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Model"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::RequestValidator"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Resource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::RestApi"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Stage"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::UsagePlan"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::UsagePlanKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::VpcLink"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Api"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::ApiMapping"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Authorizer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Deployment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::DomainName"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Integration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::IntegrationResponse"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Model"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Route"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::RouteResponse"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Stage"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::VpcLink"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::ConfigurationProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::Deployment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::DeploymentStrategy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::Environment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::HostedConfigurationVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppFlow::Flow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppIntegrations::EventIntegration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::GatewayRoute"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::Mesh"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::Route"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualNode"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualRouter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualService"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppRunner::Service"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlock"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::ApplicationFleetAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::DirectoryConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::Fleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::ImageBuilder"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::Stack"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::StackFleetAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::StackUserAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::ApiCache"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::ApiKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::FunctionConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLSchema"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::Resolver"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApplicationInsights::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Athena::DataCatalog"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Athena::NamedQuery"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Athena::PreparedStatement"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Athena::WorkGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AuditManager::Assessment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::LaunchConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::LifecycleHook"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::ScheduledAction"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::WarmPool"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Backup::BackupPlan"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Backup::BackupSelection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Backup::BackupVault"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Backup::Framework"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Backup::ReportPlan"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Batch::ComputeEnvironment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Batch::JobDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Batch::JobQueue"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Batch::SchedulingPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Budgets::Budget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CE::AnomalyMonitor"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CE::AnomalySubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CE::CostCategory"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CUR::ReportDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cassandra::Keyspace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cassandra::Table"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CertificateManager::Account"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CertificateManager::Certificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Chatbot::SlackChannelConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cloud9::EnvironmentEC2"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::CustomResource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::Macro"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::ModuleDefaultVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::ModuleVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::PublicTypeVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::Publisher"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::ResourceDefaultVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::ResourceVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::Stack"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::TypeActivation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::WaitCondition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::WaitConditionHandle"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::CachePolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::CloudFrontOriginAccessIdentity"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::Distribution"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::Function"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::KeyGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::PublicKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::RealtimeLogConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudTrail::Trail"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::Alarm"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::CompositeAlarm"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::Dashboard"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::InsightRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::MetricStream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeArtifact::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeArtifact::Repository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeBuild::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeBuild::ReportGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeBuild::SourceCredential"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeCommit::Repository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeDeploy::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeGuruProfiler::ProfilingGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeGuruReviewer::RepositoryAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodePipeline::CustomActionType"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodePipeline::Pipeline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodePipeline::Webhook"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeStar::GitHubRepository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeStarConnections::Connection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeStarNotifications::NotificationRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::IdentityPool"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::IdentityPoolRoleAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolClient"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolDomain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolIdentityProvider"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolResourceServer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolUICustomizationAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolUser"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolUserToGroupAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::AggregationAuthorization"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::ConfigRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::ConfigurationAggregator"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::ConfigurationRecorder"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::ConformancePack"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::DeliveryChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::OrganizationConfigRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::OrganizationConformancePack"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::RemediationConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::StoredQuery"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::ContactFlow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::ContactFlowModule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::HoursOfOperation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::QuickConnect"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::UserHierarchyGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CustomerProfiles::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CustomerProfiles::Integration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CustomerProfiles::ObjectType"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DAX::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DAX::ParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DAX::SubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DLM::LifecyclePolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::Certificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::EventSubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::ReplicationInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::ReplicationSubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::ReplicationTask"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Dataset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Job"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Recipe"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Ruleset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Schedule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataPipeline::Pipeline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::Agent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationEFS"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationFSxWindows"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationHDFS"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationNFS"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationObjectStorage"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationS3"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationSMB"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::Task"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Detective::Graph"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Detective::MemberInvitation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DevOpsGuru::NotificationChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DevOpsGuru::ResourceCollection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DirectoryService::MicrosoftAD"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DirectoryService::SimpleAD"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DocDB::DBCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DocDB::DBClusterParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DocDB::DBInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DocDB::DBSubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::CapacityReservation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::CapacityReservationFleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::CarrierGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnAuthorizationRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnRoute"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnTargetNetworkAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::CustomerGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::DHCPOptions"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::EC2Fleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::EIP"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::EIPAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::EgressOnlyInternetGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::EnclaveCertificateIamRoleAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::FlowLog"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::GatewayRouteTableAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::Host"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::IPAM"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::IPAMAllocation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::IPAMPool"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::IPAMScope"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::Instance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::InternetGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::LaunchTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::LocalGatewayRoute"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::LocalGatewayRouteTableVPCAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NatGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkAcl"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkAclEntry"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkInsightsPath"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkInterface"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkInterfaceAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkInterfacePermission"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::PlacementGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::PrefixList"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::Route"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::RouteTable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SecurityGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SecurityGroupEgress"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SecurityGroupIngress"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SpotFleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::Subnet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SubnetCidrBlock"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SubnetNetworkAclAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SubnetRouteTableAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilterRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorSession"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorTarget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayConnect"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayMulticastDomain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayMulticastDomainAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayMulticastGroupMember"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayMulticastGroupSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayPeeringAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayRoute"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayRouteTable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayRouteTableAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayRouteTablePropagation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayVpcAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPC"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCCidrBlock"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCDHCPOptionsAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCEndpointConnectionNotification"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCEndpointService"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCEndpointServicePermissions"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCGatewayAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCPeeringConnection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPNConnection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPNConnectionRoute"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPNGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPNGatewayRoutePropagation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::Volume"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VolumeAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECR::PublicRepository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECR::RegistryPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECR::ReplicationConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECR::Repository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::CapacityProvider"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::ClusterCapacityProviderAssociations"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::PrimaryTaskSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::Service"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::TaskDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::TaskSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EFS::AccessPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EFS::FileSystem"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EFS::MountTarget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EKS::Addon"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EKS::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EKS::FargateProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EKS::Nodegroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::SecurityConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::Step"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::Studio"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::StudioSessionMapping"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMRContainers::VirtualCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::CacheCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::GlobalReplicationGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::ParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::SecurityGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::SecurityGroupIngress"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::SubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::UserGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::ApplicationVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::ConfigurationTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::Environment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerCertificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::LoadBalancer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::TargetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EventSchemas::Discoverer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EventSchemas::Registry"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EventSchemas::RegistryPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EventSchemas::Schema"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::ApiDestination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::Archive"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::Connection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::EventBus"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::EventBusPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::Rule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Evidently::Experiment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Evidently::Feature"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Evidently::Launch"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Evidently::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FIS::ExperimentTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FMS::NotificationChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FMS::Policy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FSx::FileSystem"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FinSpace::Environment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::Detector"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::EntityType"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::EventType"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::Label"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::Outcome"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::Variable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::Alias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::Build"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::Fleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::GameServerGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::GameSessionQueue"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::MatchmakingConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::MatchmakingRuleSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::Script"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GlobalAccelerator::Accelerator"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GlobalAccelerator::EndpointGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GlobalAccelerator::Listener"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Classifier"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Connection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Crawler"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::DataCatalogEncryptionSettings"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Database"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::DevEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Job"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::MLTransform"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Partition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Registry"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Schema"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::SchemaVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::SchemaVersionMetadata"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::SecurityConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Table"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Trigger"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Workflow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::ConnectorDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::ConnectorDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::CoreDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::CoreDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::DeviceDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::DeviceDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::Group"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::GroupVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::LoggerDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::LoggerDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::SubscriptionDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::SubscriptionDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GroundStation::Config"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GroundStation::DataflowEndpointGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GroundStation::MissionProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::Detector"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::Filter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::IPSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::Master"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::Member"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::ThreatIntelSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::HealthLake::FHIRDatastore"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::AccessKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::Group"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::InstanceProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::ManagedPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::OIDCProvider"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::Policy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::Role"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::SAMLProvider"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::ServerCertificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::ServiceLinkedRole"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::UserToGroupAddition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::VirtualMFADevice"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::Channel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::PlaybackKeyPair"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::StreamKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::Component"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::DistributionConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::Image"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ImagePipeline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::InfrastructureConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Inspector::AssessmentTarget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Inspector::AssessmentTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Inspector::ResourceGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT1Click::Device"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT1Click::Placement"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT1Click::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Authorizer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Certificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::CustomMetric"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Dimension"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::DomainConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::FleetMetric"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::JobTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Logging"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::MitigationAction"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Policy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::PolicyPrincipalAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::ProvisioningTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::ResourceSpecificLogging"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::ScheduledAudit"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::SecurityProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Thing"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::ThingPrincipalAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::TopicRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::TopicRuleDestination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Channel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Dataset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Datastore"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTCoreDeviceAdvisor::SuiteDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTEvents::DetectorModel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTEvents::Input"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTFleetHub::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Asset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Dashboard"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Gateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Portal"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTThingsGraph::FlowTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::Destination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::DeviceProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::FuotaTask"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::MulticastGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::PartnerAccount"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::ServiceProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::WirelessGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KMS::Alias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KMS::Key"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KMS::ReplicaKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Kendra::DataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Kendra::Faq"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Kendra::Index"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Kinesis::Stream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Kinesis::StreamConsumer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalytics::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LakeFormation::DataLakeSettings"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LakeFormation::Permissions"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LakeFormation::Resource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::Alias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::CodeSigningConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::EventInvokeConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::Function"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::LayerVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::LayerVersionPermission"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::Permission"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::Version"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LicenseManager::Grant"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LicenseManager::License"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lightsail::Database"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lightsail::Disk"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lightsail::Instance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lightsail::StaticIp"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::GeofenceCollection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::Map"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::PlaceIndex"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::RouteCalculator"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::Tracker"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::TrackerConsumer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::Destination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::LogGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::LogStream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::MetricFilter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::QueryDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::ResourcePolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::SubscriptionFilter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LookoutEquipment::InferenceScheduler"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LookoutMetrics::Alert"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LookoutVision::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MSK::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MWAA::Environment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Macie::CustomDataIdentifier"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Macie::FindingsFilter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Macie::Session"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ManagedBlockchain::Member"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ManagedBlockchain::Node"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowEntitlement"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowOutput"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowVpcInterface"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConvert::JobTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConvert::Preset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConvert::Queue"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::Channel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::Input"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::InputSecurityGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaPackage::Asset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaPackage::Channel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaStore::Container"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MemoryDB::ACL"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MemoryDB::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MemoryDB::ParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MemoryDB::SubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MemoryDB::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::DBCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::DBClusterParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::DBInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::DBParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::DBSubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::Firewall"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::LoggingConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::CustomerGatewayAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::Device"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::GlobalNetwork"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::Link"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::LinkAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::Site"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::TransitGatewayRegistration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NimbleStudio::LaunchProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NimbleStudio::StreamingImage"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NimbleStudio::Studio"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::App"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::ElasticLoadBalancerAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::Instance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::Layer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::Stack"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::UserProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::Volume"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorksCM::Server"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Panorama::ApplicationInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Panorama::Package"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Panorama::PackageVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::ADMChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::APNSChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::APNSSandboxChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::APNSVoipChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::APNSVoipSandboxChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::App"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::ApplicationSettings"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::BaiduChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::Campaign"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::EmailChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::EmailTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::EventStream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::GCMChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::SMSChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::Segment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::SmsTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::VoiceChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PinpointEmail::DedicatedIpPool"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PinpointEmail::Identity"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QLDB::Ledger"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QLDB::Stream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Analysis"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Dashboard"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Template"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Theme"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RAM::ResourceShare"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBClusterParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBProxy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBProxyEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBProxyTargetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBSecurityGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBSecurityGroupIngress"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBSubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::EventSubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::GlobalCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::OptionGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RUM::AppMonitor"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::ClusterParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::ClusterSecurityGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::ClusterSecurityGroupIngress"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::ClusterSubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::EndpointAccess"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::EndpointAuthorization"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::EventSubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::ScheduledAction"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Environment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Route"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Service"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Rekognition::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ResilienceHub::App"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ResilienceHub::ResiliencyPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ResourceGroups::Group"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::Fleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::Robot"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::RobotApplication"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::RobotApplicationVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::SimulationApplication"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::SimulationApplicationVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::DNSSEC"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::HealthCheck"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::HostedZone"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::KeySigningKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::RecordSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::RecordSetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::ControlPanel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::RoutingControl"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::SafetyRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryReadiness::Cell"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ReadinessCheck"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryReadiness::RecoveryGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::FirewallDomainList"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::FirewallRuleGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::FirewallRuleGroupAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverDNSSECConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverQueryLoggingConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverRuleAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::AccessPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::Bucket"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::BucketPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::MultiRegionAccessPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::MultiRegionAccessPointPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::StorageLens"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3ObjectLambda::AccessPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3ObjectLambda::AccessPointPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3Outposts::AccessPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3Outposts::Bucket"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3Outposts::BucketPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3Outposts::Endpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SDB::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ConfigurationSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ContactList"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ReceiptFilter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ReceiptRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ReceiptRuleSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::Template"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SNS::Subscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SNS::Topic"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SNS::TopicPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SQS::Queue"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SQS::QueuePolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::Association"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::Document"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::MaintenanceWindow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTarget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::Parameter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::PatchBaseline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::ResourceDataSync"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSMContacts::Contact"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSMContacts::ContactChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSMIncidents::ReplicationSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::Assignment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::InstanceAccessControlAttributeConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::PermissionSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::App"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::CodeRepository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Device"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::DeviceFleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Endpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::EndpointConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::FeatureGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Image"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::ImageVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Model"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelPackageGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::NotebookInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::NotebookInstanceLifecycleConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Pipeline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::UserProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Workteam"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecretsManager::ResourcePolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecretsManager::RotationSchedule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecretsManager::Secret"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecretsManager::SecretTargetAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::Hub"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::AcceptedPortfolioShare"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::CloudFormationProduct"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::CloudFormationProvisionedProduct"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::LaunchNotificationConstraint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::LaunchRoleConstraint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::LaunchTemplateConstraint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::Portfolio"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::PortfolioPrincipalAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::PortfolioProductAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::PortfolioShare"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::ResourceUpdateConstraint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::ServiceAction"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::ServiceActionAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::StackSetConstraint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::TagOption"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::TagOptionAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalogAppRegistry::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalogAppRegistry::AttributeGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalogAppRegistry::ResourceAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::HttpNamespace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::Instance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::PrivateDnsNamespace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::PublicDnsNamespace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::Service"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Signer::ProfilePermission"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Signer::SigningProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::StepFunctions::Activity"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Timestream::Database"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Timestream::ScheduledQuery"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Timestream::Table"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Transfer::Server"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Transfer::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Transfer::Workflow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::ByteMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::IPSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::Rule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::SizeConstraintSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::SqlInjectionMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::WebACL"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::XssMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::ByteMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::GeoMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::IPSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::RateBasedRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::RegexPatternSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::Rule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::SizeConstraintSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::SqlInjectionMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::WebACL"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::WebACLAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::XssMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::IPSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::LoggingConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::RegexPatternSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::RuleGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACLAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Wisdom::Assistant"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Wisdom::AssistantAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Wisdom::KnowledgeBase"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WorkSpaces::ConnectionAlias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WorkSpaces::Workspace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::XRay::Group"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::XRay::SamplingRule"
+                        },
+                        {
+                            "$ref": "#/definitions/Alexa::ASK::Skill"
+                        }
+                    ]
+                }
+            },
+            "type": "object"
+        },
+        "Transform": {
+            "oneOf": [
+                {
+                    "type": [
+                        "string"
+                    ]
+                },
+                {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            ]
+        }
+    },
+    "required": [
+        "Resources"
+    ],
+    "type": "object"
+}`
diff --git a/goformation/schema/cloudformation.schema.json b/goformation/schema/cloudformation.schema.json
new file mode 100644
index 0000000000..5662089a8c
--- /dev/null
+++ b/goformation/schema/cloudformation.schema.json
@@ -0,0 +1,124429 @@
+{
+    "$id": "http://json-schema.org/draft-04/schema#",
+    "additionalProperties": false,
+    "definitions": {
+        "AWS::ACMPCA::Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiPassthrough": {
+                            "$ref": "#/definitions/AWS::ACMPCA::Certificate.ApiPassthrough"
+                        },
+                        "CertificateAuthorityArn": {
+                            "type": "string"
+                        },
+                        "CertificateSigningRequest": {
+                            "type": "string"
+                        },
+                        "SigningAlgorithm": {
+                            "type": "string"
+                        },
+                        "TemplateArn": {
+                            "type": "string"
+                        },
+                        "Validity": {
+                            "$ref": "#/definitions/AWS::ACMPCA::Certificate.Validity"
+                        },
+                        "ValidityNotBefore": {
+                            "$ref": "#/definitions/AWS::ACMPCA::Certificate.Validity"
+                        }
+                    },
+                    "required": [
+                        "CertificateAuthorityArn",
+                        "CertificateSigningRequest",
+                        "SigningAlgorithm",
+                        "Validity"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ACMPCA::Certificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.ApiPassthrough": {
+            "additionalProperties": false,
+            "properties": {
+                "Extensions": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.Extensions"
+                },
+                "Subject": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.Subject"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.EdiPartyName": {
+            "additionalProperties": false,
+            "properties": {
+                "NameAssigner": {
+                    "type": "string"
+                },
+                "PartyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NameAssigner",
+                "PartyName"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.ExtendedKeyUsage": {
+            "additionalProperties": false,
+            "properties": {
+                "ExtendedKeyUsageObjectIdentifier": {
+                    "type": "string"
+                },
+                "ExtendedKeyUsageType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.Extensions": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificatePolicies": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ACMPCA::Certificate.PolicyInformation"
+                    },
+                    "type": "array"
+                },
+                "ExtendedKeyUsage": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ACMPCA::Certificate.ExtendedKeyUsage"
+                    },
+                    "type": "array"
+                },
+                "KeyUsage": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.KeyUsage"
+                },
+                "SubjectAlternativeNames": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ACMPCA::Certificate.GeneralName"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.GeneralName": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.Subject"
+                },
+                "DnsName": {
+                    "type": "string"
+                },
+                "EdiPartyName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.EdiPartyName"
+                },
+                "IpAddress": {
+                    "type": "string"
+                },
+                "OtherName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.OtherName"
+                },
+                "RegisteredId": {
+                    "type": "string"
+                },
+                "Rfc822Name": {
+                    "type": "string"
+                },
+                "UniformResourceIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.KeyUsage": {
+            "additionalProperties": false,
+            "properties": {
+                "CRLSign": {
+                    "type": "boolean"
+                },
+                "DataEncipherment": {
+                    "type": "boolean"
+                },
+                "DecipherOnly": {
+                    "type": "boolean"
+                },
+                "DigitalSignature": {
+                    "type": "boolean"
+                },
+                "EncipherOnly": {
+                    "type": "boolean"
+                },
+                "KeyAgreement": {
+                    "type": "boolean"
+                },
+                "KeyCertSign": {
+                    "type": "boolean"
+                },
+                "KeyEncipherment": {
+                    "type": "boolean"
+                },
+                "NonRepudiation": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.OtherName": {
+            "additionalProperties": false,
+            "properties": {
+                "TypeId": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TypeId",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.PolicyInformation": {
+            "additionalProperties": false,
+            "properties": {
+                "CertPolicyId": {
+                    "type": "string"
+                },
+                "PolicyQualifiers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ACMPCA::Certificate.PolicyQualifierInfo"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CertPolicyId"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.PolicyQualifierInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "PolicyQualifierId": {
+                    "type": "string"
+                },
+                "Qualifier": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.Qualifier"
+                }
+            },
+            "required": [
+                "PolicyQualifierId",
+                "Qualifier"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.Qualifier": {
+            "additionalProperties": false,
+            "properties": {
+                "CpsUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CpsUri"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.Subject": {
+            "additionalProperties": false,
+            "properties": {
+                "CommonName": {
+                    "type": "string"
+                },
+                "Country": {
+                    "type": "string"
+                },
+                "DistinguishedNameQualifier": {
+                    "type": "string"
+                },
+                "GenerationQualifier": {
+                    "type": "string"
+                },
+                "GivenName": {
+                    "type": "string"
+                },
+                "Initials": {
+                    "type": "string"
+                },
+                "Locality": {
+                    "type": "string"
+                },
+                "Organization": {
+                    "type": "string"
+                },
+                "OrganizationalUnit": {
+                    "type": "string"
+                },
+                "Pseudonym": {
+                    "type": "string"
+                },
+                "SerialNumber": {
+                    "type": "string"
+                },
+                "State": {
+                    "type": "string"
+                },
+                "Surname": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.Validity": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CsrExtensions": {
+                            "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.CsrExtensions"
+                        },
+                        "KeyAlgorithm": {
+                            "type": "string"
+                        },
+                        "KeyStorageSecurityStandard": {
+                            "type": "string"
+                        },
+                        "RevocationConfiguration": {
+                            "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.RevocationConfiguration"
+                        },
+                        "SigningAlgorithm": {
+                            "type": "string"
+                        },
+                        "Subject": {
+                            "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.Subject"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "KeyAlgorithm",
+                        "SigningAlgorithm",
+                        "Subject",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ACMPCA::CertificateAuthority"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.AccessDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessLocation": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.GeneralName"
+                },
+                "AccessMethod": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.AccessMethod"
+                }
+            },
+            "required": [
+                "AccessLocation",
+                "AccessMethod"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.AccessMethod": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessMethodType": {
+                    "type": "string"
+                },
+                "CustomObjectIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.CrlConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomCname": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "ExpirationInDays": {
+                    "type": "number"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3ObjectAcl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.CsrExtensions": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyUsage": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.KeyUsage"
+                },
+                "SubjectInformationAccess": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.AccessDescription"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.EdiPartyName": {
+            "additionalProperties": false,
+            "properties": {
+                "NameAssigner": {
+                    "type": "string"
+                },
+                "PartyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NameAssigner",
+                "PartyName"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.GeneralName": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.Subject"
+                },
+                "DnsName": {
+                    "type": "string"
+                },
+                "EdiPartyName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.EdiPartyName"
+                },
+                "IpAddress": {
+                    "type": "string"
+                },
+                "OtherName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.OtherName"
+                },
+                "RegisteredId": {
+                    "type": "string"
+                },
+                "Rfc822Name": {
+                    "type": "string"
+                },
+                "UniformResourceIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.KeyUsage": {
+            "additionalProperties": false,
+            "properties": {
+                "CRLSign": {
+                    "type": "boolean"
+                },
+                "DataEncipherment": {
+                    "type": "boolean"
+                },
+                "DecipherOnly": {
+                    "type": "boolean"
+                },
+                "DigitalSignature": {
+                    "type": "boolean"
+                },
+                "EncipherOnly": {
+                    "type": "boolean"
+                },
+                "KeyAgreement": {
+                    "type": "boolean"
+                },
+                "KeyCertSign": {
+                    "type": "boolean"
+                },
+                "KeyEncipherment": {
+                    "type": "boolean"
+                },
+                "NonRepudiation": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.OcspConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "OcspCustomCname": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.OtherName": {
+            "additionalProperties": false,
+            "properties": {
+                "TypeId": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TypeId",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.RevocationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrlConfiguration": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.CrlConfiguration"
+                },
+                "OcspConfiguration": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.OcspConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.Subject": {
+            "additionalProperties": false,
+            "properties": {
+                "CommonName": {
+                    "type": "string"
+                },
+                "Country": {
+                    "type": "string"
+                },
+                "DistinguishedNameQualifier": {
+                    "type": "string"
+                },
+                "GenerationQualifier": {
+                    "type": "string"
+                },
+                "GivenName": {
+                    "type": "string"
+                },
+                "Initials": {
+                    "type": "string"
+                },
+                "Locality": {
+                    "type": "string"
+                },
+                "Organization": {
+                    "type": "string"
+                },
+                "OrganizationalUnit": {
+                    "type": "string"
+                },
+                "Pseudonym": {
+                    "type": "string"
+                },
+                "SerialNumber": {
+                    "type": "string"
+                },
+                "State": {
+                    "type": "string"
+                },
+                "Surname": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthorityActivation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "CertificateAuthorityArn": {
+                            "type": "string"
+                        },
+                        "CertificateChain": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Certificate",
+                        "CertificateAuthorityArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ACMPCA::CertificateAuthorityActivation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Permission": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "CertificateAuthorityArn": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        },
+                        "SourceAccount": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Actions",
+                        "CertificateAuthorityArn",
+                        "Principal"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ACMPCA::Permission"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::APS::RuleGroupsNamespace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Data": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Workspace": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Data",
+                        "Name",
+                        "Workspace"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::APS::RuleGroupsNamespace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::APS::Workspace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AlertManagerDefinition": {
+                            "type": "string"
+                        },
+                        "Alias": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::APS::Workspace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AccessAnalyzer::Analyzer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AnalyzerName": {
+                            "type": "string"
+                        },
+                        "ArchiveRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AccessAnalyzer::Analyzer.ArchiveRule"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AccessAnalyzer::Analyzer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AccessAnalyzer::Analyzer.ArchiveRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Filter": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AccessAnalyzer::Analyzer.Filter"
+                    },
+                    "type": "array"
+                },
+                "RuleName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Filter",
+                "RuleName"
+            ],
+            "type": "object"
+        },
+        "AWS::AccessAnalyzer::Analyzer.Filter": {
+            "additionalProperties": false,
+            "properties": {
+                "Contains": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Eq": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Exists": {
+                    "type": "boolean"
+                },
+                "Neq": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Property": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Property"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationStrategy": {
+                            "type": "string"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "BrokerName": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker.ConfigurationId"
+                        },
+                        "DeploymentMode": {
+                            "type": "string"
+                        },
+                        "EncryptionOptions": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker.EncryptionOptions"
+                        },
+                        "EngineType": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "HostInstanceType": {
+                            "type": "string"
+                        },
+                        "LdapServerMetadata": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker.LdapServerMetadata"
+                        },
+                        "Logs": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker.LogList"
+                        },
+                        "MaintenanceWindowStartTime": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker.MaintenanceWindow"
+                        },
+                        "PubliclyAccessible": {
+                            "type": "boolean"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "StorageType": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmazonMQ::Broker.TagsEntry"
+                            },
+                            "type": "array"
+                        },
+                        "Users": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmazonMQ::Broker.User"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AutoMinorVersionUpgrade",
+                        "BrokerName",
+                        "DeploymentMode",
+                        "EngineType",
+                        "EngineVersion",
+                        "HostInstanceType",
+                        "PubliclyAccessible",
+                        "Users"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AmazonMQ::Broker"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.ConfigurationId": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Revision": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Id",
+                "Revision"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.EncryptionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "UseAwsOwnedKey": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "UseAwsOwnedKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.LdapServerMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Hosts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RoleBase": {
+                    "type": "string"
+                },
+                "RoleName": {
+                    "type": "string"
+                },
+                "RoleSearchMatching": {
+                    "type": "string"
+                },
+                "RoleSearchSubtree": {
+                    "type": "boolean"
+                },
+                "ServiceAccountPassword": {
+                    "type": "string"
+                },
+                "ServiceAccountUsername": {
+                    "type": "string"
+                },
+                "UserBase": {
+                    "type": "string"
+                },
+                "UserRoleName": {
+                    "type": "string"
+                },
+                "UserSearchMatching": {
+                    "type": "string"
+                },
+                "UserSearchSubtree": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Hosts",
+                "RoleBase",
+                "RoleSearchMatching",
+                "ServiceAccountPassword",
+                "ServiceAccountUsername",
+                "UserBase",
+                "UserSearchMatching"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.LogList": {
+            "additionalProperties": false,
+            "properties": {
+                "Audit": {
+                    "type": "boolean"
+                },
+                "General": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.MaintenanceWindow": {
+            "additionalProperties": false,
+            "properties": {
+                "DayOfWeek": {
+                    "type": "string"
+                },
+                "TimeOfDay": {
+                    "type": "string"
+                },
+                "TimeZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DayOfWeek",
+                "TimeOfDay",
+                "TimeZone"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.User": {
+            "additionalProperties": false,
+            "properties": {
+                "ConsoleAccess": {
+                    "type": "boolean"
+                },
+                "Groups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationStrategy": {
+                            "type": "string"
+                        },
+                        "Data": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EngineType": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmazonMQ::Configuration.TagsEntry"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Data",
+                        "EngineType",
+                        "EngineVersion",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AmazonMQ::Configuration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Configuration.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::ConfigurationAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Broker": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::ConfigurationAssociation.ConfigurationId"
+                        }
+                    },
+                    "required": [
+                        "Broker",
+                        "Configuration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AmazonMQ::ConfigurationAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::ConfigurationAssociation.ConfigurationId": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Revision": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Id",
+                "Revision"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::App": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessToken": {
+                            "type": "string"
+                        },
+                        "AutoBranchCreationConfig": {
+                            "$ref": "#/definitions/AWS::Amplify::App.AutoBranchCreationConfig"
+                        },
+                        "BasicAuthConfig": {
+                            "$ref": "#/definitions/AWS::Amplify::App.BasicAuthConfig"
+                        },
+                        "BuildSpec": {
+                            "type": "string"
+                        },
+                        "CustomHeaders": {
+                            "type": "string"
+                        },
+                        "CustomRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Amplify::App.CustomRule"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnableBranchAutoDeletion": {
+                            "type": "boolean"
+                        },
+                        "EnvironmentVariables": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Amplify::App.EnvironmentVariable"
+                            },
+                            "type": "array"
+                        },
+                        "IAMServiceRole": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OauthToken": {
+                            "type": "string"
+                        },
+                        "Repository": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Amplify::App"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::App.AutoBranchCreationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoBranchCreationPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BasicAuthConfig": {
+                    "$ref": "#/definitions/AWS::Amplify::App.BasicAuthConfig"
+                },
+                "BuildSpec": {
+                    "type": "string"
+                },
+                "EnableAutoBranchCreation": {
+                    "type": "boolean"
+                },
+                "EnableAutoBuild": {
+                    "type": "boolean"
+                },
+                "EnablePerformanceMode": {
+                    "type": "boolean"
+                },
+                "EnablePullRequestPreview": {
+                    "type": "boolean"
+                },
+                "EnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Amplify::App.EnvironmentVariable"
+                    },
+                    "type": "array"
+                },
+                "PullRequestEnvironmentName": {
+                    "type": "string"
+                },
+                "Stage": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Amplify::App.BasicAuthConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableBasicAuth": {
+                    "type": "boolean"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Amplify::App.CustomRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Source",
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::App.EnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::Branch": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppId": {
+                            "type": "string"
+                        },
+                        "BasicAuthConfig": {
+                            "$ref": "#/definitions/AWS::Amplify::Branch.BasicAuthConfig"
+                        },
+                        "BranchName": {
+                            "type": "string"
+                        },
+                        "BuildSpec": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnableAutoBuild": {
+                            "type": "boolean"
+                        },
+                        "EnablePerformanceMode": {
+                            "type": "boolean"
+                        },
+                        "EnablePullRequestPreview": {
+                            "type": "boolean"
+                        },
+                        "EnvironmentVariables": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Amplify::Branch.EnvironmentVariable"
+                            },
+                            "type": "array"
+                        },
+                        "PullRequestEnvironmentName": {
+                            "type": "string"
+                        },
+                        "Stage": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AppId",
+                        "BranchName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Amplify::Branch"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::Branch.BasicAuthConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableBasicAuth": {
+                    "type": "boolean"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::Branch.EnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppId": {
+                            "type": "string"
+                        },
+                        "AutoSubDomainCreationPatterns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AutoSubDomainIAMRole": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EnableAutoSubDomain": {
+                            "type": "boolean"
+                        },
+                        "SubDomainSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Amplify::Domain.SubDomainSetting"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AppId",
+                        "DomainName",
+                        "SubDomainSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Amplify::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::Domain.SubDomainSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "BranchName": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BranchName",
+                "Prefix"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BindingProperties": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValue"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Children": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentChild"
+                            },
+                            "type": "array"
+                        },
+                        "CollectionProperties": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentDataConfiguration"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ComponentType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Overrides": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentOverridesValue"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Properties": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentProperty"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "SourceId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Variants": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentVariant"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AmplifyUIBuilder::Component"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValue": {
+            "additionalProperties": false,
+            "properties": {
+                "BindingProperties": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValueProperties"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValueProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Field": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Model": {
+                    "type": "string"
+                },
+                "Predicates": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.Predicate"
+                    },
+                    "type": "array"
+                },
+                "UserAttribute": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentChild": {
+            "additionalProperties": false,
+            "properties": {
+                "Children": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentChild"
+                    },
+                    "type": "array"
+                },
+                "ComponentType": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Properties": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentProperties"
+                }
+            },
+            "required": [
+                "ComponentType",
+                "Name",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentConditionProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Else": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentProperty"
+                },
+                "Field": {
+                    "type": "string"
+                },
+                "Operand": {
+                    "type": "string"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Property": {
+                    "type": "string"
+                },
+                "Then": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentProperty"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentDataConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Identifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Model": {
+                    "type": "string"
+                },
+                "Predicate": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.Predicate"
+                },
+                "Sort": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.SortProperty"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Model"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentOverrides": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentOverridesValue": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentProperties": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "BindingProperties": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentPropertyBindingProperties"
+                },
+                "Bindings": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.FormBindings"
+                },
+                "CollectionBindingProperties": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentPropertyBindingProperties"
+                },
+                "Concat": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentProperty"
+                    },
+                    "type": "array"
+                },
+                "Condition": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentConditionProperty"
+                },
+                "Configured": {
+                    "type": "boolean"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Event": {
+                    "type": "string"
+                },
+                "ImportedValue": {
+                    "type": "string"
+                },
+                "Model": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "UserAttribute": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentPropertyBindingProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Field": {
+                    "type": "string"
+                },
+                "Property": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Property"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "Overrides": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentOverrides"
+                },
+                "VariantValues": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentVariantValues"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentVariantValues": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.FormBindings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.Predicate": {
+            "additionalProperties": false,
+            "properties": {
+                "And": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.Predicate"
+                    },
+                    "type": "array"
+                },
+                "Field": {
+                    "type": "string"
+                },
+                "Operand": {
+                    "type": "string"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Or": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.Predicate"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.SortProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Direction": {
+                    "type": "string"
+                },
+                "Field": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Direction",
+                "Field"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Theme": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Overrides": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmplifyUIBuilder::Theme.ThemeValues"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Values": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmplifyUIBuilder::Theme.ThemeValues"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Values"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AmplifyUIBuilder::Theme"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Theme.ThemeValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Children": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Theme.ThemeValues"
+                    },
+                    "type": "array"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Theme.ThemeValues": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Theme.ThemeValue"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Account": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CloudWatchRoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Account"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::ApiKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomerId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "GenerateDistinctId": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "StageKeys": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApiGateway::ApiKey.StageKey"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Value": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::ApiKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::ApiKey.StageKey": {
+            "additionalProperties": false,
+            "properties": {
+                "RestApiId": {
+                    "type": "string"
+                },
+                "StageName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Authorizer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthType": {
+                            "type": "string"
+                        },
+                        "AuthorizerCredentials": {
+                            "type": "string"
+                        },
+                        "AuthorizerResultTtlInSeconds": {
+                            "type": "number"
+                        },
+                        "AuthorizerUri": {
+                            "type": "string"
+                        },
+                        "IdentitySource": {
+                            "type": "string"
+                        },
+                        "IdentityValidationExpression": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ProviderARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "RestApiId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Authorizer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::BasePathMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BasePath": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "Stage": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::BasePathMapping"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::ClientCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::ClientCertificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeploymentCanarySettings": {
+                            "$ref": "#/definitions/AWS::ApiGateway::Deployment.DeploymentCanarySettings"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "StageDescription": {
+                            "$ref": "#/definitions/AWS::ApiGateway::Deployment.StageDescription"
+                        },
+                        "StageName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Deployment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment.AccessLogSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment.CanarySetting": {
+            "additionalProperties": false,
+            "properties": {
+                "PercentTraffic": {
+                    "type": "number"
+                },
+                "StageVariableOverrides": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "UseStageCache": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment.DeploymentCanarySettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PercentTraffic": {
+                    "type": "number"
+                },
+                "StageVariableOverrides": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "UseStageCache": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment.MethodSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "CacheDataEncrypted": {
+                    "type": "boolean"
+                },
+                "CacheTtlInSeconds": {
+                    "type": "number"
+                },
+                "CachingEnabled": {
+                    "type": "boolean"
+                },
+                "DataTraceEnabled": {
+                    "type": "boolean"
+                },
+                "HttpMethod": {
+                    "type": "string"
+                },
+                "LoggingLevel": {
+                    "type": "string"
+                },
+                "MetricsEnabled": {
+                    "type": "boolean"
+                },
+                "ResourcePath": {
+                    "type": "string"
+                },
+                "ThrottlingBurstLimit": {
+                    "type": "number"
+                },
+                "ThrottlingRateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment.StageDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessLogSetting": {
+                    "$ref": "#/definitions/AWS::ApiGateway::Deployment.AccessLogSetting"
+                },
+                "CacheClusterEnabled": {
+                    "type": "boolean"
+                },
+                "CacheClusterSize": {
+                    "type": "string"
+                },
+                "CacheDataEncrypted": {
+                    "type": "boolean"
+                },
+                "CacheTtlInSeconds": {
+                    "type": "number"
+                },
+                "CachingEnabled": {
+                    "type": "boolean"
+                },
+                "CanarySetting": {
+                    "$ref": "#/definitions/AWS::ApiGateway::Deployment.CanarySetting"
+                },
+                "ClientCertificateId": {
+                    "type": "string"
+                },
+                "DataTraceEnabled": {
+                    "type": "boolean"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DocumentationVersion": {
+                    "type": "string"
+                },
+                "LoggingLevel": {
+                    "type": "string"
+                },
+                "MethodSettings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApiGateway::Deployment.MethodSetting"
+                    },
+                    "type": "array"
+                },
+                "MetricsEnabled": {
+                    "type": "boolean"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                },
+                "ThrottlingBurstLimit": {
+                    "type": "number"
+                },
+                "ThrottlingRateLimit": {
+                    "type": "number"
+                },
+                "TracingEnabled": {
+                    "type": "boolean"
+                },
+                "Variables": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::DocumentationPart": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Location": {
+                            "$ref": "#/definitions/AWS::ApiGateway::DocumentationPart.Location"
+                        },
+                        "Properties": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Location",
+                        "Properties",
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::DocumentationPart"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::DocumentationPart.Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Method": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::DocumentationVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DocumentationVersion": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DocumentationVersion",
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::DocumentationVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::DomainName": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CertificateArn": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EndpointConfiguration": {
+                            "$ref": "#/definitions/AWS::ApiGateway::DomainName.EndpointConfiguration"
+                        },
+                        "MutualTlsAuthentication": {
+                            "$ref": "#/definitions/AWS::ApiGateway::DomainName.MutualTlsAuthentication"
+                        },
+                        "OwnershipVerificationCertificateArn": {
+                            "type": "string"
+                        },
+                        "RegionalCertificateArn": {
+                            "type": "string"
+                        },
+                        "SecurityPolicy": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::DomainName"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::DomainName.EndpointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Types": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::DomainName.MutualTlsAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "TruststoreUri": {
+                    "type": "string"
+                },
+                "TruststoreVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::GatewayResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResponseParameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ResponseTemplates": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ResponseType": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "StatusCode": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResponseType",
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::GatewayResponse"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Method": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiKeyRequired": {
+                            "type": "boolean"
+                        },
+                        "AuthorizationScopes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AuthorizationType": {
+                            "type": "string"
+                        },
+                        "AuthorizerId": {
+                            "type": "string"
+                        },
+                        "HttpMethod": {
+                            "type": "string"
+                        },
+                        "Integration": {
+                            "$ref": "#/definitions/AWS::ApiGateway::Method.Integration"
+                        },
+                        "MethodResponses": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApiGateway::Method.MethodResponse"
+                            },
+                            "type": "array"
+                        },
+                        "OperationName": {
+                            "type": "string"
+                        },
+                        "RequestModels": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "RequestParameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "boolean"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "RequestValidatorId": {
+                            "type": "string"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "HttpMethod",
+                        "ResourceId",
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Method"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Method.Integration": {
+            "additionalProperties": false,
+            "properties": {
+                "CacheKeyParameters": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CacheNamespace": {
+                    "type": "string"
+                },
+                "ConnectionId": {
+                    "type": "string"
+                },
+                "ConnectionType": {
+                    "type": "string"
+                },
+                "ContentHandling": {
+                    "type": "string"
+                },
+                "Credentials": {
+                    "type": "string"
+                },
+                "IntegrationHttpMethod": {
+                    "type": "string"
+                },
+                "IntegrationResponses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApiGateway::Method.IntegrationResponse"
+                    },
+                    "type": "array"
+                },
+                "PassthroughBehavior": {
+                    "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"
+                },
+                "TimeoutInMillis": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Method.IntegrationResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentHandling": {
+                    "type": "string"
+                },
+                "ResponseParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ResponseTemplates": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "SelectionPattern": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Method.MethodResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "ResponseModels": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ResponseParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "boolean"
+                        }
+                    },
+                    "type": "object"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Model": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContentType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "Schema": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Model"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::RequestValidator": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "ValidateRequestBody": {
+                            "type": "boolean"
+                        },
+                        "ValidateRequestParameters": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::RequestValidator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Resource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ParentId": {
+                            "type": "string"
+                        },
+                        "PathPart": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ParentId",
+                        "PathPart",
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Resource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::RestApi": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiKeySourceType": {
+                            "type": "string"
+                        },
+                        "BinaryMediaTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Body": {
+                            "type": "object"
+                        },
+                        "BodyS3Location": {
+                            "$ref": "#/definitions/AWS::ApiGateway::RestApi.S3Location"
+                        },
+                        "CloneFrom": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisableExecuteApiEndpoint": {
+                            "type": "boolean"
+                        },
+                        "EndpointConfiguration": {
+                            "$ref": "#/definitions/AWS::ApiGateway::RestApi.EndpointConfiguration"
+                        },
+                        "FailOnWarnings": {
+                            "type": "boolean"
+                        },
+                        "MinimumCompressionSize": {
+                            "type": "number"
+                        },
+                        "Mode": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Policy": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::RestApi"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::RestApi.EndpointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Types": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcEndpointIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::RestApi.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "ETag": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Stage": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessLogSetting": {
+                            "$ref": "#/definitions/AWS::ApiGateway::Stage.AccessLogSetting"
+                        },
+                        "CacheClusterEnabled": {
+                            "type": "boolean"
+                        },
+                        "CacheClusterSize": {
+                            "type": "string"
+                        },
+                        "CanarySetting": {
+                            "$ref": "#/definitions/AWS::ApiGateway::Stage.CanarySetting"
+                        },
+                        "ClientCertificateId": {
+                            "type": "string"
+                        },
+                        "DeploymentId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DocumentationVersion": {
+                            "type": "string"
+                        },
+                        "MethodSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApiGateway::Stage.MethodSetting"
+                            },
+                            "type": "array"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "StageName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TracingEnabled": {
+                            "type": "boolean"
+                        },
+                        "Variables": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Stage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Stage.AccessLogSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Stage.CanarySetting": {
+            "additionalProperties": false,
+            "properties": {
+                "DeploymentId": {
+                    "type": "string"
+                },
+                "PercentTraffic": {
+                    "type": "number"
+                },
+                "StageVariableOverrides": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "UseStageCache": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Stage.MethodSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "CacheDataEncrypted": {
+                    "type": "boolean"
+                },
+                "CacheTtlInSeconds": {
+                    "type": "number"
+                },
+                "CachingEnabled": {
+                    "type": "boolean"
+                },
+                "DataTraceEnabled": {
+                    "type": "boolean"
+                },
+                "HttpMethod": {
+                    "type": "string"
+                },
+                "LoggingLevel": {
+                    "type": "string"
+                },
+                "MetricsEnabled": {
+                    "type": "boolean"
+                },
+                "ResourcePath": {
+                    "type": "string"
+                },
+                "ThrottlingBurstLimit": {
+                    "type": "number"
+                },
+                "ThrottlingRateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::UsagePlan": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiStages": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApiGateway::UsagePlan.ApiStage"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Quota": {
+                            "$ref": "#/definitions/AWS::ApiGateway::UsagePlan.QuotaSettings"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Throttle": {
+                            "$ref": "#/definitions/AWS::ApiGateway::UsagePlan.ThrottleSettings"
+                        },
+                        "UsagePlanName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::UsagePlan"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::UsagePlan.ApiStage": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiId": {
+                    "type": "string"
+                },
+                "Stage": {
+                    "type": "string"
+                },
+                "Throttle": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::ApiGateway::UsagePlan.ThrottleSettings"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::UsagePlan.QuotaSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Limit": {
+                    "type": "number"
+                },
+                "Offset": {
+                    "type": "number"
+                },
+                "Period": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::UsagePlan.ThrottleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "BurstLimit": {
+                    "type": "number"
+                },
+                "RateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::UsagePlanKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "KeyId": {
+                            "type": "string"
+                        },
+                        "KeyType": {
+                            "type": "string"
+                        },
+                        "UsagePlanId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "KeyId",
+                        "KeyType",
+                        "UsagePlanId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::UsagePlanKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::VpcLink": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "TargetArns"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::VpcLink"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Api": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiKeySelectionExpression": {
+                            "type": "string"
+                        },
+                        "BasePath": {
+                            "type": "string"
+                        },
+                        "Body": {
+                            "type": "object"
+                        },
+                        "BodyS3Location": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Api.BodyS3Location"
+                        },
+                        "CorsConfiguration": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Api.Cors"
+                        },
+                        "CredentialsArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisableExecuteApiEndpoint": {
+                            "type": "boolean"
+                        },
+                        "DisableSchemaValidation": {
+                            "type": "boolean"
+                        },
+                        "FailOnWarnings": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ProtocolType": {
+                            "type": "string"
+                        },
+                        "RouteKey": {
+                            "type": "string"
+                        },
+                        "RouteSelectionExpression": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Target": {
+                            "type": "string"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Api"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Api.BodyS3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Etag": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Api.Cors": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowCredentials": {
+                    "type": "boolean"
+                },
+                "AllowHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowOrigins": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExposeHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaxAge": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "Integration": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides.IntegrationOverrides"
+                        },
+                        "Route": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteOverrides"
+                        },
+                        "Stage": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides.StageOverrides"
+                        }
+                    },
+                    "required": [
+                        "ApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.AccessLogSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.IntegrationOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "IntegrationMethod": {
+                    "type": "string"
+                },
+                "PayloadFormatVersion": {
+                    "type": "string"
+                },
+                "TimeoutInMillis": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationScopes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AuthorizationType": {
+                    "type": "string"
+                },
+                "AuthorizerId": {
+                    "type": "string"
+                },
+                "OperationName": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DataTraceEnabled": {
+                    "type": "boolean"
+                },
+                "DetailedMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "LoggingLevel": {
+                    "type": "string"
+                },
+                "ThrottlingBurstLimit": {
+                    "type": "number"
+                },
+                "ThrottlingRateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.StageOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessLogSettings": {
+                    "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides.AccessLogSettings"
+                },
+                "AutoDeploy": {
+                    "type": "boolean"
+                },
+                "DefaultRouteSettings": {
+                    "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteSettings"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "RouteSettings": {
+                    "type": "object"
+                },
+                "StageVariables": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ApiMappingKey": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "Stage": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "DomainName",
+                        "Stage"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::ApiMapping"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Authorizer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "AuthorizerCredentialsArn": {
+                            "type": "string"
+                        },
+                        "AuthorizerPayloadFormatVersion": {
+                            "type": "string"
+                        },
+                        "AuthorizerResultTtlInSeconds": {
+                            "type": "number"
+                        },
+                        "AuthorizerType": {
+                            "type": "string"
+                        },
+                        "AuthorizerUri": {
+                            "type": "string"
+                        },
+                        "EnableSimpleResponses": {
+                            "type": "boolean"
+                        },
+                        "IdentitySource": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "IdentityValidationExpression": {
+                            "type": "string"
+                        },
+                        "JwtConfiguration": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Authorizer.JWTConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "AuthorizerType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Authorizer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Authorizer.JWTConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Audience": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Issuer": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Deployment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "StageName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Deployment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::DomainName": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DomainNameConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApiGatewayV2::DomainName.DomainNameConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "MutualTlsAuthentication": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::DomainName.MutualTlsAuthentication"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::DomainName"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::DomainName.DomainNameConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "CertificateName": {
+                    "type": "string"
+                },
+                "EndpointType": {
+                    "type": "string"
+                },
+                "OwnershipVerificationCertificateArn": {
+                    "type": "string"
+                },
+                "SecurityPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::DomainName.MutualTlsAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "TruststoreUri": {
+                    "type": "string"
+                },
+                "TruststoreVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Integration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ConnectionId": {
+                            "type": "string"
+                        },
+                        "ConnectionType": {
+                            "type": "string"
+                        },
+                        "ContentHandlingStrategy": {
+                            "type": "string"
+                        },
+                        "CredentialsArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IntegrationMethod": {
+                            "type": "string"
+                        },
+                        "IntegrationSubtype": {
+                            "type": "string"
+                        },
+                        "IntegrationType": {
+                            "type": "string"
+                        },
+                        "IntegrationUri": {
+                            "type": "string"
+                        },
+                        "PassthroughBehavior": {
+                            "type": "string"
+                        },
+                        "PayloadFormatVersion": {
+                            "type": "string"
+                        },
+                        "RequestParameters": {
+                            "type": "object"
+                        },
+                        "RequestTemplates": {
+                            "type": "object"
+                        },
+                        "ResponseParameters": {
+                            "type": "object"
+                        },
+                        "TemplateSelectionExpression": {
+                            "type": "string"
+                        },
+                        "TimeoutInMillis": {
+                            "type": "number"
+                        },
+                        "TlsConfig": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Integration.TlsConfig"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "IntegrationType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Integration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Integration.ResponseParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination",
+                "Source"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Integration.ResponseParameterList": {
+            "additionalProperties": false,
+            "properties": {
+                "ResponseParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApiGatewayV2::Integration.ResponseParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Integration.TlsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ServerNameToVerify": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::IntegrationResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ContentHandlingStrategy": {
+                            "type": "string"
+                        },
+                        "IntegrationId": {
+                            "type": "string"
+                        },
+                        "IntegrationResponseKey": {
+                            "type": "string"
+                        },
+                        "ResponseParameters": {
+                            "type": "object"
+                        },
+                        "ResponseTemplates": {
+                            "type": "object"
+                        },
+                        "TemplateSelectionExpression": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "IntegrationId",
+                        "IntegrationResponseKey"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::IntegrationResponse"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Model": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ContentType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Schema": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "Name",
+                        "Schema"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Model"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Route": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ApiKeyRequired": {
+                            "type": "boolean"
+                        },
+                        "AuthorizationScopes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AuthorizationType": {
+                            "type": "string"
+                        },
+                        "AuthorizerId": {
+                            "type": "string"
+                        },
+                        "ModelSelectionExpression": {
+                            "type": "string"
+                        },
+                        "OperationName": {
+                            "type": "string"
+                        },
+                        "RequestModels": {
+                            "type": "object"
+                        },
+                        "RequestParameters": {
+                            "type": "object"
+                        },
+                        "RouteKey": {
+                            "type": "string"
+                        },
+                        "RouteResponseSelectionExpression": {
+                            "type": "string"
+                        },
+                        "Target": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "RouteKey"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Route"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Route.ParameterConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "Required": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Required"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::RouteResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ModelSelectionExpression": {
+                            "type": "string"
+                        },
+                        "ResponseModels": {
+                            "type": "object"
+                        },
+                        "ResponseParameters": {
+                            "type": "object"
+                        },
+                        "RouteId": {
+                            "type": "string"
+                        },
+                        "RouteResponseKey": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "RouteId",
+                        "RouteResponseKey"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::RouteResponse"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::RouteResponse.ParameterConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "Required": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Required"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Stage": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessLogSettings": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Stage.AccessLogSettings"
+                        },
+                        "AccessPolicyId": {
+                            "type": "string"
+                        },
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "AutoDeploy": {
+                            "type": "boolean"
+                        },
+                        "ClientCertificateId": {
+                            "type": "string"
+                        },
+                        "DefaultRouteSettings": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Stage.RouteSettings"
+                        },
+                        "DeploymentId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "RouteSettings": {
+                            "type": "object"
+                        },
+                        "StageName": {
+                            "type": "string"
+                        },
+                        "StageVariables": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "StageName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Stage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Stage.AccessLogSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Stage.RouteSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DataTraceEnabled": {
+                    "type": "boolean"
+                },
+                "DetailedMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "LoggingLevel": {
+                    "type": "string"
+                },
+                "ThrottlingBurstLimit": {
+                    "type": "number"
+                },
+                "ThrottlingRateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::VpcLink": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::VpcLink"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::Application.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::Application.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::ConfigurationProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LocationUri": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RetrievalRoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::ConfigurationProfile.Tags"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Validators": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::ConfigurationProfile.Validators"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "LocationUri",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::ConfigurationProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::ConfigurationProfile.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::ConfigurationProfile.Validators": {
+            "additionalProperties": false,
+            "properties": {
+                "Content": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::Deployment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ConfigurationProfileId": {
+                            "type": "string"
+                        },
+                        "ConfigurationVersion": {
+                            "type": "string"
+                        },
+                        "DeploymentStrategyId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnvironmentId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::Deployment.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "ConfigurationProfileId",
+                        "ConfigurationVersion",
+                        "DeploymentStrategyId",
+                        "EnvironmentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::Deployment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::Deployment.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::DeploymentStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeploymentDurationInMinutes": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FinalBakeTimeInMinutes": {
+                            "type": "number"
+                        },
+                        "GrowthFactor": {
+                            "type": "number"
+                        },
+                        "GrowthType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ReplicateTo": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::DeploymentStrategy.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DeploymentDurationInMinutes",
+                        "GrowthFactor",
+                        "Name",
+                        "ReplicateTo"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::DeploymentStrategy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::DeploymentStrategy.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Monitors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::Environment.Monitors"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::Environment.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::Environment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::Environment.Monitors": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmArn": {
+                    "type": "string"
+                },
+                "AlarmRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::Environment.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::HostedConfigurationVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ConfigurationProfileId": {
+                            "type": "string"
+                        },
+                        "Content": {
+                            "type": "string"
+                        },
+                        "ContentType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LatestVersionNumber": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "ConfigurationProfileId",
+                        "Content",
+                        "ContentType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::HostedConfigurationVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionMode": {
+                            "type": "string"
+                        },
+                        "ConnectorProfileConfig": {
+                            "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorProfileConfig"
+                        },
+                        "ConnectorProfileName": {
+                            "type": "string"
+                        },
+                        "ConnectorType": {
+                            "type": "string"
+                        },
+                        "KMSArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConnectionMode",
+                        "ConnectorProfileName",
+                        "ConnectorType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppFlow::ConnectorProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.AmplitudeConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiKey": {
+                    "type": "string"
+                },
+                "SecretKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiKey",
+                "SecretKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthCode": {
+                    "type": "string"
+                },
+                "RedirectUri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ConnectorProfileConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorProfileCredentials": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorProfileCredentials"
+                },
+                "ConnectorProfileProperties": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorProfileProperties"
+                }
+            },
+            "required": [
+                "ConnectorProfileCredentials"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "Amplitude": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.AmplitudeConnectorProfileCredentials"
+                },
+                "Datadog": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileCredentials"
+                },
+                "Dynatrace": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileCredentials"
+                },
+                "GoogleAnalytics": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.GoogleAnalyticsConnectorProfileCredentials"
+                },
+                "InforNexus": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileCredentials"
+                },
+                "Marketo": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileCredentials"
+                },
+                "Redshift": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileCredentials"
+                },
+                "SAPOData": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileCredentials"
+                },
+                "Salesforce": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileCredentials"
+                },
+                "ServiceNow": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileCredentials"
+                },
+                "Singular": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SingularConnectorProfileCredentials"
+                },
+                "Slack": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SlackConnectorProfileCredentials"
+                },
+                "Snowflake": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileCredentials"
+                },
+                "Trendmicro": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.TrendmicroConnectorProfileCredentials"
+                },
+                "Veeva": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileCredentials"
+                },
+                "Zendesk": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileCredentials"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Datadog": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileProperties"
+                },
+                "Dynatrace": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileProperties"
+                },
+                "InforNexus": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileProperties"
+                },
+                "Marketo": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileProperties"
+                },
+                "Redshift": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileProperties"
+                },
+                "SAPOData": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileProperties"
+                },
+                "Salesforce": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileProperties"
+                },
+                "ServiceNow": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileProperties"
+                },
+                "Slack": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SlackConnectorProfileProperties"
+                },
+                "Snowflake": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileProperties"
+                },
+                "Veeva": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileProperties"
+                },
+                "Zendesk": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiKey": {
+                    "type": "string"
+                },
+                "ApplicationKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiKey",
+                "ApplicationKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiToken": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiToken"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.GoogleAnalyticsConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "ConnectorOAuthRequest": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+                },
+                "RefreshToken": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClientId",
+                "ClientSecret"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessKeyId": {
+                    "type": "string"
+                },
+                "Datakey": {
+                    "type": "string"
+                },
+                "SecretAccessKey": {
+                    "type": "string"
+                },
+                "UserId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AccessKeyId",
+                "Datakey",
+                "SecretAccessKey",
+                "UserId"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "ConnectorOAuthRequest": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+                }
+            },
+            "required": [
+                "ClientId",
+                "ClientSecret"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.OAuthProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthCodeUrl": {
+                    "type": "string"
+                },
+                "OAuthScopes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TokenUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "DatabaseUrl": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName",
+                "DatabaseUrl",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "BasicAuthCredentials": {
+                    "type": "object"
+                },
+                "OAuthCredentials": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationHostUrl": {
+                    "type": "string"
+                },
+                "ApplicationServicePath": {
+                    "type": "string"
+                },
+                "ClientNumber": {
+                    "type": "string"
+                },
+                "LogonLanguage": {
+                    "type": "string"
+                },
+                "OAuthProperties": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.OAuthProperties"
+                },
+                "PortNumber": {
+                    "type": "number"
+                },
+                "PrivateLinkServiceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "ClientCredentialsArn": {
+                    "type": "string"
+                },
+                "ConnectorOAuthRequest": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+                },
+                "RefreshToken": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                },
+                "isSandboxEnvironment": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SingularConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SlackConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "ConnectorOAuthRequest": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+                }
+            },
+            "required": [
+                "ClientId",
+                "ClientSecret"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SlackConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountName": {
+                    "type": "string"
+                },
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "PrivateLinkServiceName": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "Stage": {
+                    "type": "string"
+                },
+                "Warehouse": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName",
+                "Stage",
+                "Warehouse"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.TrendmicroConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiSecretKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiSecretKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "ConnectorOAuthRequest": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+                }
+            },
+            "required": [
+                "ClientId",
+                "ClientSecret"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DestinationFlowConfigList": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppFlow::Flow.DestinationFlowConfig"
+                            },
+                            "type": "array"
+                        },
+                        "FlowName": {
+                            "type": "string"
+                        },
+                        "KMSArn": {
+                            "type": "string"
+                        },
+                        "SourceFlowConfig": {
+                            "$ref": "#/definitions/AWS::AppFlow::Flow.SourceFlowConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Tasks": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppFlow::Flow.Task"
+                            },
+                            "type": "array"
+                        },
+                        "TriggerConfig": {
+                            "$ref": "#/definitions/AWS::AppFlow::Flow.TriggerConfig"
+                        }
+                    },
+                    "required": [
+                        "DestinationFlowConfigList",
+                        "FlowName",
+                        "SourceFlowConfig",
+                        "Tasks",
+                        "TriggerConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppFlow::Flow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.AggregationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregationType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.AmplitudeSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ConnectorOperator": {
+            "additionalProperties": false,
+            "properties": {
+                "Amplitude": {
+                    "type": "string"
+                },
+                "Datadog": {
+                    "type": "string"
+                },
+                "Dynatrace": {
+                    "type": "string"
+                },
+                "GoogleAnalytics": {
+                    "type": "string"
+                },
+                "InforNexus": {
+                    "type": "string"
+                },
+                "Marketo": {
+                    "type": "string"
+                },
+                "S3": {
+                    "type": "string"
+                },
+                "SAPOData": {
+                    "type": "string"
+                },
+                "Salesforce": {
+                    "type": "string"
+                },
+                "ServiceNow": {
+                    "type": "string"
+                },
+                "Singular": {
+                    "type": "string"
+                },
+                "Slack": {
+                    "type": "string"
+                },
+                "Trendmicro": {
+                    "type": "string"
+                },
+                "Veeva": {
+                    "type": "string"
+                },
+                "Zendesk": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.DatadogSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.DestinationConnectorProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBridge": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.EventBridgeDestinationProperties"
+                },
+                "LookoutMetrics": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.LookoutMetricsDestinationProperties"
+                },
+                "Redshift": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.RedshiftDestinationProperties"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.S3DestinationProperties"
+                },
+                "Salesforce": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SalesforceDestinationProperties"
+                },
+                "Snowflake": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SnowflakeDestinationProperties"
+                },
+                "Upsolver": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.UpsolverDestinationProperties"
+                },
+                "Zendesk": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ZendeskDestinationProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.DestinationFlowConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorProfileName": {
+                    "type": "string"
+                },
+                "ConnectorType": {
+                    "type": "string"
+                },
+                "DestinationConnectorProperties": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.DestinationConnectorProperties"
+                }
+            },
+            "required": [
+                "ConnectorType",
+                "DestinationConnectorProperties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.DynatraceSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ErrorHandlingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "FailOnFirstError": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.EventBridgeDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorHandlingConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ErrorHandlingConfig"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.GoogleAnalyticsSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.IncrementalPullConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DatetimeTypeFieldName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.InforNexusSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.LookoutMetricsDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.MarketoSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.PrefixConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "PrefixFormat": {
+                    "type": "string"
+                },
+                "PrefixType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.RedshiftDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "ErrorHandlingConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ErrorHandlingConfig"
+                },
+                "IntermediateBucketName": {
+                    "type": "string"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IntermediateBucketName",
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.S3DestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "S3OutputFormatConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.S3OutputFormatConfig"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.S3InputFormatConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "S3InputFileType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.S3OutputFormatConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregationConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.AggregationConfig"
+                },
+                "FileType": {
+                    "type": "string"
+                },
+                "PrefixConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.PrefixConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.S3SourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "S3InputFormatConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.S3InputFormatConfig"
+                }
+            },
+            "required": [
+                "BucketName",
+                "BucketPrefix"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SAPODataSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ObjectPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ObjectPath"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SalesforceDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorHandlingConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ErrorHandlingConfig"
+                },
+                "IdFieldNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Object": {
+                    "type": "string"
+                },
+                "WriteOperationType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SalesforceSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableDynamicFieldUpdate": {
+                    "type": "boolean"
+                },
+                "IncludeDeletedRecords": {
+                    "type": "boolean"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ScheduledTriggerProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DataPullMode": {
+                    "type": "string"
+                },
+                "ScheduleEndTime": {
+                    "type": "number"
+                },
+                "ScheduleExpression": {
+                    "type": "string"
+                },
+                "ScheduleOffset": {
+                    "type": "number"
+                },
+                "ScheduleStartTime": {
+                    "type": "number"
+                },
+                "TimeZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ServiceNowSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SingularSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SlackSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SnowflakeDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "ErrorHandlingConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ErrorHandlingConfig"
+                },
+                "IntermediateBucketName": {
+                    "type": "string"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IntermediateBucketName",
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SourceConnectorProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Amplitude": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.AmplitudeSourceProperties"
+                },
+                "Datadog": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.DatadogSourceProperties"
+                },
+                "Dynatrace": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.DynatraceSourceProperties"
+                },
+                "GoogleAnalytics": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.GoogleAnalyticsSourceProperties"
+                },
+                "InforNexus": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.InforNexusSourceProperties"
+                },
+                "Marketo": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.MarketoSourceProperties"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.S3SourceProperties"
+                },
+                "SAPOData": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SAPODataSourceProperties"
+                },
+                "Salesforce": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SalesforceSourceProperties"
+                },
+                "ServiceNow": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ServiceNowSourceProperties"
+                },
+                "Singular": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SingularSourceProperties"
+                },
+                "Slack": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SlackSourceProperties"
+                },
+                "Trendmicro": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.TrendmicroSourceProperties"
+                },
+                "Veeva": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.VeevaSourceProperties"
+                },
+                "Zendesk": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ZendeskSourceProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SourceFlowConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorProfileName": {
+                    "type": "string"
+                },
+                "ConnectorType": {
+                    "type": "string"
+                },
+                "IncrementalPullConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.IncrementalPullConfig"
+                },
+                "SourceConnectorProperties": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SourceConnectorProperties"
+                }
+            },
+            "required": [
+                "ConnectorType",
+                "SourceConnectorProperties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.Task": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorOperator": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ConnectorOperator"
+                },
+                "DestinationField": {
+                    "type": "string"
+                },
+                "SourceFields": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TaskProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppFlow::Flow.TaskPropertiesObject"
+                    },
+                    "type": "array"
+                },
+                "TaskType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourceFields",
+                "TaskType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.TaskPropertiesObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.TrendmicroSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.TriggerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TriggerProperties": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ScheduledTriggerProperties"
+                },
+                "TriggerType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TriggerType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.UpsolverDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "S3OutputFormatConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.UpsolverS3OutputFormatConfig"
+                }
+            },
+            "required": [
+                "BucketName",
+                "S3OutputFormatConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.UpsolverS3OutputFormatConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregationConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.AggregationConfig"
+                },
+                "FileType": {
+                    "type": "string"
+                },
+                "PrefixConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.PrefixConfig"
+                }
+            },
+            "required": [
+                "PrefixConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.VeevaSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentType": {
+                    "type": "string"
+                },
+                "IncludeAllVersions": {
+                    "type": "boolean"
+                },
+                "IncludeRenditions": {
+                    "type": "boolean"
+                },
+                "IncludeSourceFiles": {
+                    "type": "boolean"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ZendeskDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorHandlingConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ErrorHandlingConfig"
+                },
+                "IdFieldNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Object": {
+                    "type": "string"
+                },
+                "WriteOperationType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ZendeskSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppIntegrations::EventIntegration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EventBridgeBus": {
+                            "type": "string"
+                        },
+                        "EventFilter": {
+                            "$ref": "#/definitions/AWS::AppIntegrations::EventIntegration.EventFilter"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EventBridgeBus",
+                        "EventFilter",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppIntegrations::EventIntegration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppIntegrations::EventIntegration.EventFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Source": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Source"
+            ],
+            "type": "object"
+        },
+        "AWS::AppIntegrations::EventIntegration.EventIntegrationAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientAssociationMetadata": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppIntegrations::EventIntegration.Metadata"
+                    },
+                    "type": "array"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "EventBridgeRuleName": {
+                    "type": "string"
+                },
+                "EventIntegrationAssociationArn": {
+                    "type": "string"
+                },
+                "EventIntegrationAssociationId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppIntegrations::EventIntegration.Metadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GatewayRouteName": {
+                            "type": "string"
+                        },
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualGatewayName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec",
+                        "VirtualGatewayName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::GatewayRoute"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteHostnameMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Suffix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteHostnameRewrite": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultTargetHostname": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteMetadataMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Range": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteRangeMatch"
+                },
+                "Regex": {
+                    "type": "string"
+                },
+                "Suffix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteRangeMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "End": {
+                    "type": "number"
+                },
+                "Start": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "End",
+                "Start"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "GrpcRoute": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GrpcGatewayRoute"
+                },
+                "Http2Route": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRoute"
+                },
+                "HttpRoute": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRoute"
+                },
+                "Priority": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualService": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteVirtualService"
+                }
+            },
+            "required": [
+                "VirtualService"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteVirtualService": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VirtualServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GrpcGatewayRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GrpcGatewayRouteAction"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMatch"
+                }
+            },
+            "required": [
+                "Action",
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Rewrite": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GrpcGatewayRouteRewrite"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteHostnameMatch"
+                },
+                "Metadata": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMetadata"
+                    },
+                    "type": "array"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Invert": {
+                    "type": "boolean"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteMetadataMatch"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteRewrite": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteHostnameRewrite"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRouteAction"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRouteMatch"
+                }
+            },
+            "required": [
+                "Action",
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRouteAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Rewrite": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRouteRewrite"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "Invert": {
+                    "type": "boolean"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeaderMatch"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeaderMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Range": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteRangeMatch"
+                },
+                "Regex": {
+                    "type": "string"
+                },
+                "Suffix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRouteMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Headers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeader"
+                    },
+                    "type": "array"
+                },
+                "Hostname": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteHostnameMatch"
+                },
+                "Method": {
+                    "type": "string"
+                },
+                "Path": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpPathMatch"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "QueryParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.QueryParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRoutePathRewrite": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRoutePrefixRewrite": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultPrefix": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRouteRewrite": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteHostnameRewrite"
+                },
+                "Path": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRoutePathRewrite"
+                },
+                "Prefix": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRoutePrefixRewrite"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpPathMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Regex": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpQueryParameterMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.QueryParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpQueryParameterMatch"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Mesh": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::Mesh.MeshSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::Mesh"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Mesh.EgressFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Mesh.MeshSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "EgressFilter": {
+                    "$ref": "#/definitions/AWS::AppMesh::Mesh.EgressFilter"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "RouteName": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::Route.RouteSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualRouterName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec",
+                        "VirtualRouterName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::Route"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.Duration": {
+            "additionalProperties": false,
+            "properties": {
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Unit",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRetryPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "GrpcRetryEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "HttpRetryEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaxRetries": {
+                    "type": "number"
+                },
+                "PerRetryTimeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                },
+                "TcpRetryEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MaxRetries",
+                "PerRetryTimeout"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRouteAction"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRouteMatch"
+                },
+                "RetryPolicy": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRetryPolicy"
+                },
+                "Timeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcTimeout"
+                }
+            },
+            "required": [
+                "Action",
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRouteAction": {
+            "additionalProperties": false,
+            "properties": {
+                "WeightedTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.WeightedTarget"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "WeightedTargets"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRouteMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Metadata": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRouteMetadata"
+                    },
+                    "type": "array"
+                },
+                "MethodName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRouteMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Invert": {
+                    "type": "boolean"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRouteMetadataMatchMethod"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRouteMetadataMatchMethod": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Range": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.MatchRange"
+                },
+                "Regex": {
+                    "type": "string"
+                },
+                "Suffix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                },
+                "PerRequest": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HeaderMatchMethod": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Range": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.MatchRange"
+                },
+                "Regex": {
+                    "type": "string"
+                },
+                "Suffix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpPathMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Regex": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpQueryParameterMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpRetryPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpRetryEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaxRetries": {
+                    "type": "number"
+                },
+                "PerRetryTimeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                },
+                "TcpRetryEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MaxRetries",
+                "PerRetryTimeout"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpRouteAction"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpRouteMatch"
+                },
+                "RetryPolicy": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpRetryPolicy"
+                },
+                "Timeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpTimeout"
+                }
+            },
+            "required": [
+                "Action",
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpRouteAction": {
+            "additionalProperties": false,
+            "properties": {
+                "WeightedTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.WeightedTarget"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "WeightedTargets"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpRouteHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "Invert": {
+                    "type": "boolean"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HeaderMatchMethod"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpRouteMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Headers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.HttpRouteHeader"
+                    },
+                    "type": "array"
+                },
+                "Method": {
+                    "type": "string"
+                },
+                "Path": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpPathMatch"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "QueryParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.QueryParameter"
+                    },
+                    "type": "array"
+                },
+                "Scheme": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                },
+                "PerRequest": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.MatchRange": {
+            "additionalProperties": false,
+            "properties": {
+                "End": {
+                    "type": "number"
+                },
+                "Start": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "End",
+                "Start"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.QueryParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpQueryParameterMatch"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.RouteSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "GrpcRoute": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRoute"
+                },
+                "Http2Route": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpRoute"
+                },
+                "HttpRoute": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpRoute"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "TcpRoute": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.TcpRoute"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.TcpRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.TcpRouteAction"
+                },
+                "Timeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.TcpTimeout"
+                }
+            },
+            "required": [
+                "Action"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.TcpRouteAction": {
+            "additionalProperties": false,
+            "properties": {
+                "WeightedTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.WeightedTarget"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "WeightedTargets"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.TcpTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.WeightedTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualNode": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "VirtualNode",
+                "Weight"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewaySpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualGatewayName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::VirtualGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.SubjectAlternativeNameMatchers": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.SubjectAlternativeNames": {
+            "additionalProperties": false,
+            "properties": {
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.SubjectAlternativeNameMatchers"
+                }
+            },
+            "required": [
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayAccessLog": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayFileAccessLog"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayBackendDefaults": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientPolicy": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "TLS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicyTls"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicyTls": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayClientTlsCertificate"
+                },
+                "Enforce": {
+                    "type": "boolean"
+                },
+                "Ports": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Validation": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContext"
+                }
+            },
+            "required": [
+                "Validation"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayClientTlsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsFileCertificate"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsSdsCertificate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "GRPC": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayGrpcConnectionPool"
+                },
+                "HTTP": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayHttpConnectionPool"
+                },
+                "HTTP2": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayHttp2ConnectionPool"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayFileAccessLog": {
+            "additionalProperties": false,
+            "properties": {
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Path"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayGrpcConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRequests"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayHealthCheckPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "HealthyThreshold": {
+                    "type": "number"
+                },
+                "IntervalMillis": {
+                    "type": "number"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "TimeoutMillis": {
+                    "type": "number"
+                },
+                "UnhealthyThreshold": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "HealthyThreshold",
+                "IntervalMillis",
+                "Protocol",
+                "TimeoutMillis",
+                "UnhealthyThreshold"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayHttp2ConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRequests"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayHttpConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConnections": {
+                    "type": "number"
+                },
+                "MaxPendingRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxConnections"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListener": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionPool": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayConnectionPool"
+                },
+                "HealthCheck": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayHealthCheckPolicy"
+                },
+                "PortMapping": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayPortMapping"
+                },
+                "TLS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTls"
+                }
+            },
+            "required": [
+                "PortMapping"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTls": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsCertificate"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "Validation": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContext"
+                }
+            },
+            "required": [
+                "Certificate",
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsAcmCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "ACM": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsAcmCertificate"
+                },
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsFileCertificate"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsSdsCertificate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsFileCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateChain": {
+                    "type": "string"
+                },
+                "PrivateKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateChain",
+                "PrivateKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsSdsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContext": {
+            "additionalProperties": false,
+            "properties": {
+                "SubjectAlternativeNames": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.SubjectAlternativeNames"
+                },
+                "Trust": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContextTrust"
+                }
+            },
+            "required": [
+                "Trust"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContextTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextFileTrust"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextSdsTrust"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayLogging": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessLog": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayAccessLog"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayPortMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "Port": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Port",
+                "Protocol"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewaySpec": {
+            "additionalProperties": false,
+            "properties": {
+                "BackendDefaults": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayBackendDefaults"
+                },
+                "Listeners": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListener"
+                    },
+                    "type": "array"
+                },
+                "Logging": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayLogging"
+                }
+            },
+            "required": [
+                "Listeners"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContext": {
+            "additionalProperties": false,
+            "properties": {
+                "SubjectAlternativeNames": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.SubjectAlternativeNames"
+                },
+                "Trust": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextTrust"
+                }
+            },
+            "required": [
+                "Trust"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextAcmTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateAuthorityArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CertificateAuthorityArns"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextFileTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateChain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateChain"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextSdsTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "ACM": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextAcmTrust"
+                },
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextFileTrust"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextSdsTrust"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualNodeName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::VirtualNode"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.AccessLog": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.FileAccessLog"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.AwsCloudMapInstanceAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.AwsCloudMapServiceDiscovery": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::VirtualNode.AwsCloudMapInstanceAttribute"
+                    },
+                    "type": "array"
+                },
+                "NamespaceName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NamespaceName",
+                "ServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.Backend": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualService": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualServiceBackend"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.BackendDefaults": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientPolicy": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ClientPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ClientPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "TLS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ClientPolicyTls"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ClientPolicyTls": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ClientTlsCertificate"
+                },
+                "Enforce": {
+                    "type": "boolean"
+                },
+                "Ports": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Validation": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContext"
+                }
+            },
+            "required": [
+                "Validation"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ClientTlsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsFileCertificate"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsSdsCertificate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.DnsServiceDiscovery": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "type": "string"
+                },
+                "ResponseType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Hostname"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.Duration": {
+            "additionalProperties": false,
+            "properties": {
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Unit",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.FileAccessLog": {
+            "additionalProperties": false,
+            "properties": {
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Path"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.GrpcTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                },
+                "PerRequest": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.HealthCheck": {
+            "additionalProperties": false,
+            "properties": {
+                "HealthyThreshold": {
+                    "type": "number"
+                },
+                "IntervalMillis": {
+                    "type": "number"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "TimeoutMillis": {
+                    "type": "number"
+                },
+                "UnhealthyThreshold": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "HealthyThreshold",
+                "IntervalMillis",
+                "Protocol",
+                "TimeoutMillis",
+                "UnhealthyThreshold"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.HttpTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                },
+                "PerRequest": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.Listener": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionPool": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeConnectionPool"
+                },
+                "HealthCheck": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.HealthCheck"
+                },
+                "OutlierDetection": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.OutlierDetection"
+                },
+                "PortMapping": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.PortMapping"
+                },
+                "TLS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTls"
+                },
+                "Timeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTimeout"
+                }
+            },
+            "required": [
+                "PortMapping"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "GRPC": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.GrpcTimeout"
+                },
+                "HTTP": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.HttpTimeout"
+                },
+                "HTTP2": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.HttpTimeout"
+                },
+                "TCP": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TcpTimeout"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTls": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsCertificate"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "Validation": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsValidationContext"
+                }
+            },
+            "required": [
+                "Certificate",
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsAcmCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "ACM": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsAcmCertificate"
+                },
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsFileCertificate"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsSdsCertificate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsFileCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateChain": {
+                    "type": "string"
+                },
+                "PrivateKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateChain",
+                "PrivateKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsSdsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsValidationContext": {
+            "additionalProperties": false,
+            "properties": {
+                "SubjectAlternativeNames": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.SubjectAlternativeNames"
+                },
+                "Trust": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsValidationContextTrust"
+                }
+            },
+            "required": [
+                "Trust"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsValidationContextTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextFileTrust"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextSdsTrust"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessLog": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.AccessLog"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.OutlierDetection": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseEjectionDuration": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                },
+                "Interval": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                },
+                "MaxEjectionPercent": {
+                    "type": "number"
+                },
+                "MaxServerErrors": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "BaseEjectionDuration",
+                "Interval",
+                "MaxEjectionPercent",
+                "MaxServerErrors"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.PortMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "Port": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Port",
+                "Protocol"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ServiceDiscovery": {
+            "additionalProperties": false,
+            "properties": {
+                "AWSCloudMap": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.AwsCloudMapServiceDiscovery"
+                },
+                "DNS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.DnsServiceDiscovery"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.SubjectAlternativeNameMatchers": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.SubjectAlternativeNames": {
+            "additionalProperties": false,
+            "properties": {
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.SubjectAlternativeNameMatchers"
+                }
+            },
+            "required": [
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TcpTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TlsValidationContext": {
+            "additionalProperties": false,
+            "properties": {
+                "SubjectAlternativeNames": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.SubjectAlternativeNames"
+                },
+                "Trust": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextTrust"
+                }
+            },
+            "required": [
+                "Trust"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TlsValidationContextAcmTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateAuthorityArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CertificateAuthorityArns"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TlsValidationContextFileTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateChain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateChain"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TlsValidationContextSdsTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TlsValidationContextTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "ACM": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextAcmTrust"
+                },
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextFileTrust"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextSdsTrust"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "GRPC": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeGrpcConnectionPool"
+                },
+                "HTTP": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeHttpConnectionPool"
+                },
+                "HTTP2": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeHttp2ConnectionPool"
+                },
+                "TCP": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeTcpConnectionPool"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeGrpcConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRequests"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeHttp2ConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRequests"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeHttpConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConnections": {
+                    "type": "number"
+                },
+                "MaxPendingRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxConnections"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "BackendDefaults": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.BackendDefaults"
+                },
+                "Backends": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Backend"
+                    },
+                    "type": "array"
+                },
+                "Listeners": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Listener"
+                    },
+                    "type": "array"
+                },
+                "Logging": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Logging"
+                },
+                "ServiceDiscovery": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ServiceDiscovery"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeTcpConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConnections": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxConnections"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualServiceBackend": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientPolicy": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ClientPolicy"
+                },
+                "VirtualServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VirtualServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualRouter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualRouter.VirtualRouterSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualRouterName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::VirtualRouter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualRouter.PortMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "Port": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Port",
+                "Protocol"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualRouter.VirtualRouterListener": {
+            "additionalProperties": false,
+            "properties": {
+                "PortMapping": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualRouter.PortMapping"
+                }
+            },
+            "required": [
+                "PortMapping"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualRouter.VirtualRouterSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "Listeners": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::VirtualRouter.VirtualRouterListener"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Listeners"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualService": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualService.VirtualServiceSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualServiceName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec",
+                        "VirtualServiceName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::VirtualService"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualService.VirtualNodeServiceProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualNodeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VirtualNodeName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualService.VirtualRouterServiceProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualRouterName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VirtualRouterName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualService.VirtualServiceProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualNode": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualService.VirtualNodeServiceProvider"
+                },
+                "VirtualRouter": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualService.VirtualRouterServiceProvider"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualService.VirtualServiceSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "Provider": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualService.VirtualServiceProvider"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingConfigurationArn": {
+                            "type": "string"
+                        },
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::AppRunner::Service.EncryptionConfiguration"
+                        },
+                        "HealthCheckConfiguration": {
+                            "$ref": "#/definitions/AWS::AppRunner::Service.HealthCheckConfiguration"
+                        },
+                        "InstanceConfiguration": {
+                            "$ref": "#/definitions/AWS::AppRunner::Service.InstanceConfiguration"
+                        },
+                        "ServiceName": {
+                            "type": "string"
+                        },
+                        "SourceConfiguration": {
+                            "$ref": "#/definitions/AWS::AppRunner::Service.SourceConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SourceConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppRunner::Service"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.AuthenticationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessRoleArn": {
+                    "type": "string"
+                },
+                "ConnectionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.CodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CodeConfigurationValues": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.CodeConfigurationValues"
+                },
+                "ConfigurationSource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConfigurationSource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.CodeConfigurationValues": {
+            "additionalProperties": false,
+            "properties": {
+                "BuildCommand": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "string"
+                },
+                "Runtime": {
+                    "type": "string"
+                },
+                "RuntimeEnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppRunner::Service.KeyValuePair"
+                    },
+                    "type": "array"
+                },
+                "StartCommand": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Runtime"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.CodeRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "CodeConfiguration": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.CodeConfiguration"
+                },
+                "RepositoryUrl": {
+                    "type": "string"
+                },
+                "SourceCodeVersion": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.SourceCodeVersion"
+                }
+            },
+            "required": [
+                "RepositoryUrl",
+                "SourceCodeVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KmsKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.HealthCheckConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HealthyThreshold": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "Timeout": {
+                    "type": "number"
+                },
+                "UnhealthyThreshold": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.ImageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Port": {
+                    "type": "string"
+                },
+                "RuntimeEnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppRunner::Service.KeyValuePair"
+                    },
+                    "type": "array"
+                },
+                "StartCommand": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.ImageRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "ImageConfiguration": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.ImageConfiguration"
+                },
+                "ImageIdentifier": {
+                    "type": "string"
+                },
+                "ImageRepositoryType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ImageIdentifier",
+                "ImageRepositoryType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.InstanceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Cpu": {
+                    "type": "string"
+                },
+                "InstanceRoleArn": {
+                    "type": "string"
+                },
+                "Memory": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.KeyValuePair": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.SourceCodeVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.SourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationConfiguration": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.AuthenticationConfiguration"
+                },
+                "AutoDeploymentsEnabled": {
+                    "type": "boolean"
+                },
+                "CodeRepository": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.CodeRepository"
+                },
+                "ImageRepository": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.ImageRepository"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::AppBlock": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SetupScriptDetails": {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlock.ScriptDetails"
+                        },
+                        "SourceS3Location": {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlock.S3Location"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "SetupScriptDetails",
+                        "SourceS3Location"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::AppBlock"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::AppBlock.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::AppBlock.ScriptDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutableParameters": {
+                    "type": "string"
+                },
+                "ExecutablePath": {
+                    "type": "string"
+                },
+                "ScriptS3Location": {
+                    "$ref": "#/definitions/AWS::AppStream::AppBlock.S3Location"
+                },
+                "TimeoutInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ExecutablePath",
+                "ScriptS3Location",
+                "TimeoutInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppBlockArn": {
+                            "type": "string"
+                        },
+                        "AttributesToDelete": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "IconS3Location": {
+                            "$ref": "#/definitions/AWS::AppStream::Application.S3Location"
+                        },
+                        "InstanceFamilies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchParameters": {
+                            "type": "string"
+                        },
+                        "LaunchPath": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Platforms": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkingDirectory": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AppBlockArn",
+                        "IconS3Location",
+                        "InstanceFamilies",
+                        "LaunchPath",
+                        "Name",
+                        "Platforms"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Application.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::ApplicationFleetAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationArn": {
+                            "type": "string"
+                        },
+                        "FleetName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationArn",
+                        "FleetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::ApplicationFleetAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::DirectoryConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DirectoryName": {
+                            "type": "string"
+                        },
+                        "OrganizationalUnitDistinguishedNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceAccountCredentials": {
+                            "$ref": "#/definitions/AWS::AppStream::DirectoryConfig.ServiceAccountCredentials"
+                        }
+                    },
+                    "required": [
+                        "DirectoryName",
+                        "OrganizationalUnitDistinguishedNames",
+                        "ServiceAccountCredentials"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::DirectoryConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::DirectoryConfig.ServiceAccountCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountName": {
+                    "type": "string"
+                },
+                "AccountPassword": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AccountName",
+                "AccountPassword"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Fleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ComputeCapacity": {
+                            "$ref": "#/definitions/AWS::AppStream::Fleet.ComputeCapacity"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisconnectTimeoutInSeconds": {
+                            "type": "number"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "DomainJoinInfo": {
+                            "$ref": "#/definitions/AWS::AppStream::Fleet.DomainJoinInfo"
+                        },
+                        "EnableDefaultInternetAccess": {
+                            "type": "boolean"
+                        },
+                        "FleetType": {
+                            "type": "string"
+                        },
+                        "IamRoleArn": {
+                            "type": "string"
+                        },
+                        "IdleDisconnectTimeoutInSeconds": {
+                            "type": "number"
+                        },
+                        "ImageArn": {
+                            "type": "string"
+                        },
+                        "ImageName": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "MaxConcurrentSessions": {
+                            "type": "number"
+                        },
+                        "MaxUserDurationInSeconds": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Platform": {
+                            "type": "string"
+                        },
+                        "StreamView": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UsbDeviceFilterStrings": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::AppStream::Fleet.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "InstanceType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::Fleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Fleet.ComputeCapacity": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredInstances": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DesiredInstances"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Fleet.DomainJoinInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryName": {
+                    "type": "string"
+                },
+                "OrganizationalUnitDistinguishedName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::Fleet.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::ImageBuilder": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessEndpoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::ImageBuilder.AccessEndpoint"
+                            },
+                            "type": "array"
+                        },
+                        "AppstreamAgentVersion": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "DomainJoinInfo": {
+                            "$ref": "#/definitions/AWS::AppStream::ImageBuilder.DomainJoinInfo"
+                        },
+                        "EnableDefaultInternetAccess": {
+                            "type": "boolean"
+                        },
+                        "IamRoleArn": {
+                            "type": "string"
+                        },
+                        "ImageArn": {
+                            "type": "string"
+                        },
+                        "ImageName": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::AppStream::ImageBuilder.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "InstanceType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::ImageBuilder"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::ImageBuilder.AccessEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointType": {
+                    "type": "string"
+                },
+                "VpceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointType",
+                "VpceId"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::ImageBuilder.DomainJoinInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryName": {
+                    "type": "string"
+                },
+                "OrganizationalUnitDistinguishedName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::ImageBuilder.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::Stack": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessEndpoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::Stack.AccessEndpoint"
+                            },
+                            "type": "array"
+                        },
+                        "ApplicationSettings": {
+                            "$ref": "#/definitions/AWS::AppStream::Stack.ApplicationSettings"
+                        },
+                        "AttributesToDelete": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DeleteStorageConnectors": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "EmbedHostDomains": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "FeedbackURL": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RedirectURL": {
+                            "type": "string"
+                        },
+                        "StorageConnectors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::Stack.StorageConnector"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::Stack.UserSetting"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::Stack"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Stack.AccessEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointType": {
+                    "type": "string"
+                },
+                "VpceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointType",
+                "VpceId"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Stack.ApplicationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "SettingsGroup": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Stack.StorageConnector": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorType": {
+                    "type": "string"
+                },
+                "Domains": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ResourceIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConnectorType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Stack.UserSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Permission": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action",
+                "Permission"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::StackFleetAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FleetName": {
+                            "type": "string"
+                        },
+                        "StackName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FleetName",
+                        "StackName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::StackFleetAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::StackUserAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
+                        "SendEmailNotification": {
+                            "type": "boolean"
+                        },
+                        "StackName": {
+                            "type": "string"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthenticationType",
+                        "StackName",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::StackUserAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
+                        "FirstName": {
+                            "type": "string"
+                        },
+                        "LastName": {
+                            "type": "string"
+                        },
+                        "MessageAction": {
+                            "type": "string"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthenticationType",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::ApiCache": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiCachingBehavior": {
+                            "type": "string"
+                        },
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "AtRestEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "TransitEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "Ttl": {
+                            "type": "number"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiCachingBehavior",
+                        "ApiId",
+                        "Ttl",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::ApiCache"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::ApiKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ApiKeyId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Expires": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "ApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::ApiKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DynamoDBConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.DynamoDBConfig"
+                        },
+                        "ElasticsearchConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.ElasticsearchConfig"
+                        },
+                        "HttpConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.HttpConfig"
+                        },
+                        "LambdaConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.LambdaConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OpenSearchServiceConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.OpenSearchServiceConfig"
+                        },
+                        "RelationalDatabaseConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.RelationalDatabaseConfig"
+                        },
+                        "ServiceRoleArn": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::DataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.AuthorizationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationType": {
+                    "type": "string"
+                },
+                "AwsIamConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::DataSource.AwsIamConfig"
+                }
+            },
+            "required": [
+                "AuthorizationType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.AwsIamConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SigningRegion": {
+                    "type": "string"
+                },
+                "SigningServiceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.DeltaSyncConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseTableTTL": {
+                    "type": "string"
+                },
+                "DeltaSyncTableName": {
+                    "type": "string"
+                },
+                "DeltaSyncTableTTL": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BaseTableTTL",
+                "DeltaSyncTableName",
+                "DeltaSyncTableTTL"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.DynamoDBConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "DeltaSyncConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::DataSource.DeltaSyncConfig"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "UseCallerCredentials": {
+                    "type": "boolean"
+                },
+                "Versioned": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AwsRegion",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.ElasticsearchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "Endpoint": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AwsRegion",
+                "Endpoint"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.HttpConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::DataSource.AuthorizationConfig"
+                },
+                "Endpoint": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.LambdaConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaFunctionArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaFunctionArn"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.OpenSearchServiceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "Endpoint": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AwsRegion",
+                "Endpoint"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.RdsHttpEndpointConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "AwsSecretStoreArn": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DbClusterIdentifier": {
+                    "type": "string"
+                },
+                "Schema": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AwsRegion",
+                "AwsSecretStoreArn",
+                "DbClusterIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.RelationalDatabaseConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RdsHttpEndpointConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::DataSource.RdsHttpEndpointConfig"
+                },
+                "RelationalDatabaseSourceType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RelationalDatabaseSourceType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::FunctionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "DataSourceName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FunctionVersion": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RequestMappingTemplate": {
+                            "type": "string"
+                        },
+                        "RequestMappingTemplateS3Location": {
+                            "type": "string"
+                        },
+                        "ResponseMappingTemplate": {
+                            "type": "string"
+                        },
+                        "ResponseMappingTemplateS3Location": {
+                            "type": "string"
+                        },
+                        "SyncConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::FunctionConfiguration.SyncConfig"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "DataSourceName",
+                        "FunctionVersion",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::FunctionConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::FunctionConfiguration.LambdaConflictHandlerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaConflictHandlerArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::FunctionConfiguration.SyncConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConflictDetection": {
+                    "type": "string"
+                },
+                "ConflictHandler": {
+                    "type": "string"
+                },
+                "LambdaConflictHandlerConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::FunctionConfiguration.LambdaConflictHandlerConfig"
+                }
+            },
+            "required": [
+                "ConflictDetection"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdditionalAuthenticationProviders": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.AdditionalAuthenticationProviders"
+                        },
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
+                        "LambdaAuthorizerConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.LambdaAuthorizerConfig"
+                        },
+                        "LogConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.LogConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OpenIDConnectConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.OpenIDConnectConfig"
+                        },
+                        "Tags": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.Tags"
+                        },
+                        "UserPoolConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.UserPoolConfig"
+                        },
+                        "XrayEnabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "AuthenticationType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::GraphQLApi"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.AdditionalAuthenticationProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationType": {
+                    "type": "string"
+                },
+                "LambdaAuthorizerConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::GraphQLApi.LambdaAuthorizerConfig"
+                },
+                "OpenIDConnectConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::GraphQLApi.OpenIDConnectConfig"
+                },
+                "UserPoolConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::GraphQLApi.CognitoUserPoolConfig"
+                }
+            },
+            "required": [
+                "AuthenticationType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.AdditionalAuthenticationProviders": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.CognitoUserPoolConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AppIdClientRegex": {
+                    "type": "string"
+                },
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "UserPoolId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.LambdaAuthorizerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizerResultTtlInSeconds": {
+                    "type": "number"
+                },
+                "AuthorizerUri": {
+                    "type": "string"
+                },
+                "IdentityValidationExpression": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.LogConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsRoleArn": {
+                    "type": "string"
+                },
+                "ExcludeVerboseContent": {
+                    "type": "boolean"
+                },
+                "FieldLogLevel": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.OpenIDConnectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthTTL": {
+                    "type": "number"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "IatTTL": {
+                    "type": "number"
+                },
+                "Issuer": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.Tags": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.UserPoolConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AppIdClientRegex": {
+                    "type": "string"
+                },
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "DefaultAction": {
+                    "type": "string"
+                },
+                "UserPoolId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "Definition": {
+                            "type": "string"
+                        },
+                        "DefinitionS3Location": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::GraphQLSchema"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::Resolver": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "CachingConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::Resolver.CachingConfig"
+                        },
+                        "DataSourceName": {
+                            "type": "string"
+                        },
+                        "FieldName": {
+                            "type": "string"
+                        },
+                        "Kind": {
+                            "type": "string"
+                        },
+                        "PipelineConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::Resolver.PipelineConfig"
+                        },
+                        "RequestMappingTemplate": {
+                            "type": "string"
+                        },
+                        "RequestMappingTemplateS3Location": {
+                            "type": "string"
+                        },
+                        "ResponseMappingTemplate": {
+                            "type": "string"
+                        },
+                        "ResponseMappingTemplateS3Location": {
+                            "type": "string"
+                        },
+                        "SyncConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::Resolver.SyncConfig"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "FieldName",
+                        "TypeName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::Resolver"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::Resolver.CachingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CachingKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Ttl": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::Resolver.LambdaConflictHandlerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaConflictHandlerArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::Resolver.PipelineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Functions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::Resolver.SyncConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConflictDetection": {
+                    "type": "string"
+                },
+                "ConflictHandler": {
+                    "type": "string"
+                },
+                "LambdaConflictHandlerConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::Resolver.LambdaConflictHandlerConfig"
+                }
+            },
+            "required": [
+                "ConflictDetection"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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",
+                        "RoleARN",
+                        "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyName": {
+                            "type": "string"
+                        },
+                        "PolicyType": {
+                            "type": "string"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "ScalableDimension": {
+                            "type": "string"
+                        },
+                        "ScalingTargetId": {
+                            "type": "string"
+                        },
+                        "ServiceNamespace": {
+                            "type": "string"
+                        },
+                        "StepScalingPolicyConfiguration": {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.StepScalingPolicyConfiguration"
+                        },
+                        "TargetTrackingScalingPolicyConfiguration": {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.TargetTrackingScalingPolicyConfiguration"
+                        }
+                    },
+                    "required": [
+                        "PolicyName",
+                        "PolicyType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApplicationAutoScaling::ScalingPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.CustomizedMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "Namespace",
+                "Statistic"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.PredefinedMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.StepAdjustment": {
+            "additionalProperties": false,
+            "properties": {
+                "MetricIntervalLowerBound": {
+                    "type": "number"
+                },
+                "MetricIntervalUpperBound": {
+                    "type": "number"
+                },
+                "ScalingAdjustment": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ScalingAdjustment"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.StepScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AdjustmentType": {
+                    "type": "string"
+                },
+                "Cooldown": {
+                    "type": "number"
+                },
+                "MetricAggregationType": {
+                    "type": "string"
+                },
+                "MinAdjustmentMagnitude": {
+                    "type": "number"
+                },
+                "StepAdjustments": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.StepAdjustment"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.TargetTrackingScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomizedMetricSpecification": {
+                    "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.CustomizedMetricSpecification"
+                },
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "PredefinedMetricSpecification": {
+                    "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.PredefinedMetricSpecification"
+                },
+                "ScaleInCooldown": {
+                    "type": "number"
+                },
+                "ScaleOutCooldown": {
+                    "type": "number"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoConfigurationEnabled": {
+                            "type": "boolean"
+                        },
+                        "CWEMonitorEnabled": {
+                            "type": "boolean"
+                        },
+                        "ComponentMonitoringSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApplicationInsights::Application.ComponentMonitoringSetting"
+                            },
+                            "type": "array"
+                        },
+                        "CustomComponents": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApplicationInsights::Application.CustomComponent"
+                            },
+                            "type": "array"
+                        },
+                        "LogPatternSets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApplicationInsights::Application.LogPatternSet"
+                            },
+                            "type": "array"
+                        },
+                        "OpsCenterEnabled": {
+                            "type": "boolean"
+                        },
+                        "OpsItemSNSTopicArn": {
+                            "type": "string"
+                        },
+                        "ResourceGroupName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ResourceGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApplicationInsights::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.Alarm": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmName": {
+                    "type": "string"
+                },
+                "Severity": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AlarmName"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.AlarmMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmMetricName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AlarmMetricName"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.ComponentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfigurationDetails": {
+                    "$ref": "#/definitions/AWS::ApplicationInsights::Application.ConfigurationDetails"
+                },
+                "SubComponentTypeConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.SubComponentTypeConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.ComponentMonitoringSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentARN": {
+                    "type": "string"
+                },
+                "ComponentConfigurationMode": {
+                    "type": "string"
+                },
+                "ComponentName": {
+                    "type": "string"
+                },
+                "CustomComponentConfiguration": {
+                    "$ref": "#/definitions/AWS::ApplicationInsights::Application.ComponentConfiguration"
+                },
+                "DefaultOverwriteComponentConfiguration": {
+                    "$ref": "#/definitions/AWS::ApplicationInsights::Application.ComponentConfiguration"
+                },
+                "Tier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComponentConfigurationMode",
+                "Tier"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.ConfigurationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmMetrics": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.AlarmMetric"
+                    },
+                    "type": "array"
+                },
+                "Alarms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.Alarm"
+                    },
+                    "type": "array"
+                },
+                "JMXPrometheusExporter": {
+                    "$ref": "#/definitions/AWS::ApplicationInsights::Application.JMXPrometheusExporter"
+                },
+                "Logs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.Log"
+                    },
+                    "type": "array"
+                },
+                "WindowsEvents": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.WindowsEvent"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.CustomComponent": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentName": {
+                    "type": "string"
+                },
+                "ResourceList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ComponentName",
+                "ResourceList"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.JMXPrometheusExporter": {
+            "additionalProperties": false,
+            "properties": {
+                "HostPort": {
+                    "type": "string"
+                },
+                "JMXURL": {
+                    "type": "string"
+                },
+                "PrometheusPort": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.Log": {
+            "additionalProperties": false,
+            "properties": {
+                "Encoding": {
+                    "type": "string"
+                },
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "LogPath": {
+                    "type": "string"
+                },
+                "LogType": {
+                    "type": "string"
+                },
+                "PatternSet": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogType"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.LogPattern": {
+            "additionalProperties": false,
+            "properties": {
+                "Pattern": {
+                    "type": "string"
+                },
+                "PatternName": {
+                    "type": "string"
+                },
+                "Rank": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Pattern",
+                "PatternName",
+                "Rank"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.LogPatternSet": {
+            "additionalProperties": false,
+            "properties": {
+                "LogPatterns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.LogPattern"
+                    },
+                    "type": "array"
+                },
+                "PatternSetName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogPatterns",
+                "PatternSetName"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.SubComponentConfigurationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmMetrics": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.AlarmMetric"
+                    },
+                    "type": "array"
+                },
+                "Logs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.Log"
+                    },
+                    "type": "array"
+                },
+                "WindowsEvents": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.WindowsEvent"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.SubComponentTypeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SubComponentConfigurationDetails": {
+                    "$ref": "#/definitions/AWS::ApplicationInsights::Application.SubComponentConfigurationDetails"
+                },
+                "SubComponentType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubComponentConfigurationDetails",
+                "SubComponentType"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.WindowsEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "EventLevels": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EventName": {
+                    "type": "string"
+                },
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "PatternSet": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventLevels",
+                "EventName",
+                "LogGroupName"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::DataCatalog": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::DataCatalog"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::NamedQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Database": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QueryString": {
+                            "type": "string"
+                        },
+                        "WorkGroup": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Database",
+                        "QueryString"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::NamedQuery"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::PreparedStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "QueryStatement": {
+                            "type": "string"
+                        },
+                        "StatementName": {
+                            "type": "string"
+                        },
+                        "WorkGroup": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "QueryStatement",
+                        "StatementName",
+                        "WorkGroup"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::PreparedStatement"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RecursiveDeleteOption": {
+                            "type": "boolean"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkGroupConfiguration": {
+                            "$ref": "#/definitions/AWS::Athena::WorkGroup.WorkGroupConfiguration"
+                        },
+                        "WorkGroupConfigurationUpdates": {
+                            "$ref": "#/definitions/AWS::Athena::WorkGroup.WorkGroupConfigurationUpdates"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::WorkGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionOption": {
+                    "type": "string"
+                },
+                "KmsKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionOption"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.EngineVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "EffectiveEngineVersion": {
+                    "type": "string"
+                },
+                "SelectedEngineVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.ResultConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.EncryptionConfiguration"
+                },
+                "OutputLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.ResultConfigurationUpdates": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.EncryptionConfiguration"
+                },
+                "OutputLocation": {
+                    "type": "string"
+                },
+                "RemoveEncryptionConfiguration": {
+                    "type": "boolean"
+                },
+                "RemoveOutputLocation": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.WorkGroupConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BytesScannedCutoffPerQuery": {
+                    "type": "number"
+                },
+                "EnforceWorkGroupConfiguration": {
+                    "type": "boolean"
+                },
+                "EngineVersion": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.EngineVersion"
+                },
+                "PublishCloudWatchMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "RequesterPaysEnabled": {
+                    "type": "boolean"
+                },
+                "ResultConfiguration": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.ResultConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.WorkGroupConfigurationUpdates": {
+            "additionalProperties": false,
+            "properties": {
+                "BytesScannedCutoffPerQuery": {
+                    "type": "number"
+                },
+                "EnforceWorkGroupConfiguration": {
+                    "type": "boolean"
+                },
+                "EngineVersion": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.EngineVersion"
+                },
+                "PublishCloudWatchMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "RemoveBytesScannedCutoffPerQuery": {
+                    "type": "boolean"
+                },
+                "RequesterPaysEnabled": {
+                    "type": "boolean"
+                },
+                "ResultConfigurationUpdates": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.ResultConfigurationUpdates"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssessmentReportsDestination": {
+                            "$ref": "#/definitions/AWS::AuditManager::Assessment.AssessmentReportsDestination"
+                        },
+                        "AwsAccount": {
+                            "$ref": "#/definitions/AWS::AuditManager::Assessment.AWSAccount"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FrameworkId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Roles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AuditManager::Assessment.Role"
+                            },
+                            "type": "array"
+                        },
+                        "Scope": {
+                            "$ref": "#/definitions/AWS::AuditManager::Assessment.Scope"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AuditManager::Assessment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.AWSAccount": {
+            "additionalProperties": false,
+            "properties": {
+                "EmailAddress": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.AWSService": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.AssessmentReportsDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                },
+                "DestinationType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.Delegation": {
+            "additionalProperties": false,
+            "properties": {
+                "AssessmentId": {
+                    "type": "string"
+                },
+                "AssessmentName": {
+                    "type": "string"
+                },
+                "Comment": {
+                    "type": "string"
+                },
+                "ControlSetId": {
+                    "type": "string"
+                },
+                "CreatedBy": {
+                    "type": "string"
+                },
+                "CreationTime": {
+                    "type": "number"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "LastUpdated": {
+                    "type": "number"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RoleType": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.Role": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RoleType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.Scope": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsAccounts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AuditManager::Assessment.AWSAccount"
+                    },
+                    "type": "array"
+                },
+                "AwsServices": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AuditManager::Assessment.AWSService"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "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": {
+                        "AutoScalingGroupName": {
+                            "type": "string"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CapacityRebalance": {
+                            "type": "boolean"
+                        },
+                        "Context": {
+                            "type": "string"
+                        },
+                        "Cooldown": {
+                            "type": "string"
+                        },
+                        "DesiredCapacity": {
+                            "type": "string"
+                        },
+                        "DesiredCapacityType": {
+                            "type": "string"
+                        },
+                        "HealthCheckGracePeriod": {
+                            "type": "number"
+                        },
+                        "HealthCheckType": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "LaunchConfigurationName": {
+                            "type": "string"
+                        },
+                        "LaunchTemplate": {
+                            "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LaunchTemplateSpecification"
+                        },
+                        "LifecycleHookSpecificationList": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LifecycleHookSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "LoadBalancerNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MaxInstanceLifetime": {
+                            "type": "number"
+                        },
+                        "MaxSize": {
+                            "type": "string"
+                        },
+                        "MetricsCollection": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.MetricsCollection"
+                            },
+                            "type": "array"
+                        },
+                        "MinSize": {
+                            "type": "string"
+                        },
+                        "MixedInstancesPolicy": {
+                            "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.MixedInstancesPolicy"
+                        },
+                        "NewInstancesProtectedFromScaleIn": {
+                            "type": "boolean"
+                        },
+                        "NotificationConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.NotificationConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "PlacementGroup": {
+                            "type": "string"
+                        },
+                        "ServiceLinkedRoleARN": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.TagProperty"
+                            },
+                            "type": "array"
+                        },
+                        "TargetGroupARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "TerminationPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VPCZoneIdentifier": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MaxSize",
+                        "MinSize"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::AutoScalingGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdatePolicy": {
+                    "type": "object"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.AcceleratorCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.AcceleratorTotalMemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.BaselineEbsBandwidthMbpsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.InstanceRequirements": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceleratorCount": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.AcceleratorCountRequest"
+                },
+                "AcceleratorManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorTotalMemoryMiB": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.AcceleratorTotalMemoryMiBRequest"
+                },
+                "AcceleratorTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BareMetal": {
+                    "type": "string"
+                },
+                "BaselineEbsBandwidthMbps": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.BaselineEbsBandwidthMbpsRequest"
+                },
+                "BurstablePerformance": {
+                    "type": "string"
+                },
+                "CpuManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExcludedInstanceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InstanceGenerations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LocalStorage": {
+                    "type": "string"
+                },
+                "LocalStorageTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MemoryGiBPerVCpu": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.MemoryGiBPerVCpuRequest"
+                },
+                "MemoryMiB": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.MemoryMiBRequest"
+                },
+                "NetworkInterfaceCount": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.NetworkInterfaceCountRequest"
+                },
+                "OnDemandMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "RequireHibernateSupport": {
+                    "type": "boolean"
+                },
+                "SpotMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "TotalLocalStorageGB": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.TotalLocalStorageGBRequest"
+                },
+                "VCpuCount": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.VCpuCountRequest"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.InstancesDistribution": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandAllocationStrategy": {
+                    "type": "string"
+                },
+                "OnDemandBaseCapacity": {
+                    "type": "number"
+                },
+                "OnDemandPercentageAboveBaseCapacity": {
+                    "type": "number"
+                },
+                "SpotAllocationStrategy": {
+                    "type": "string"
+                },
+                "SpotInstancePools": {
+                    "type": "number"
+                },
+                "SpotMaxPrice": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.LaunchTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LaunchTemplateSpecification"
+                },
+                "Overrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LaunchTemplateOverrides"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LaunchTemplateSpecification"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.LaunchTemplateOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceRequirements": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.InstanceRequirements"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "LaunchTemplateSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LaunchTemplateSpecification"
+                },
+                "WeightedCapacity": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.LaunchTemplateSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.LifecycleHookSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultResult": {
+                    "type": "string"
+                },
+                "HeartbeatTimeout": {
+                    "type": "number"
+                },
+                "LifecycleHookName": {
+                    "type": "string"
+                },
+                "LifecycleTransition": {
+                    "type": "string"
+                },
+                "NotificationMetadata": {
+                    "type": "string"
+                },
+                "NotificationTargetARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LifecycleHookName",
+                "LifecycleTransition"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.MemoryGiBPerVCpuRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.MemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.MetricsCollection": {
+            "additionalProperties": false,
+            "properties": {
+                "Granularity": {
+                    "type": "string"
+                },
+                "Metrics": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Granularity"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.MixedInstancesPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "InstancesDistribution": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.InstancesDistribution"
+                },
+                "LaunchTemplate": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LaunchTemplate"
+                }
+            },
+            "required": [
+                "LaunchTemplate"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.NetworkInterfaceCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NotificationTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TopicARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TopicARN"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.TagProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "PropagateAtLaunch": {
+                    "type": "boolean"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "PropagateAtLaunch",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.TotalLocalStorageGBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.VCpuCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::LaunchConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatePublicIpAddress": {
+                            "type": "boolean"
+                        },
+                        "BlockDeviceMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::LaunchConfiguration.BlockDeviceMapping"
+                            },
+                            "type": "array"
+                        },
+                        "ClassicLinkVPCId": {
+                            "type": "string"
+                        },
+                        "ClassicLinkVPCSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EbsOptimized": {
+                            "type": "boolean"
+                        },
+                        "IamInstanceProfile": {
+                            "type": "string"
+                        },
+                        "ImageId": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "InstanceMonitoring": {
+                            "type": "boolean"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "KernelId": {
+                            "type": "string"
+                        },
+                        "KeyName": {
+                            "type": "string"
+                        },
+                        "LaunchConfigurationName": {
+                            "type": "string"
+                        },
+                        "MetadataOptions": {
+                            "$ref": "#/definitions/AWS::AutoScaling::LaunchConfiguration.MetadataOptions"
+                        },
+                        "PlacementTenancy": {
+                            "type": "string"
+                        },
+                        "RamDiskId": {
+                            "type": "string"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SpotPrice": {
+                            "type": "string"
+                        },
+                        "UserData": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ImageId",
+                        "InstanceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::LaunchConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::LaunchConfiguration.BlockDevice": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "Throughput": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::LaunchConfiguration.BlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::AutoScaling::LaunchConfiguration.BlockDevice"
+                },
+                "NoDevice": {
+                    "type": "boolean"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeviceName"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::LaunchConfiguration.MetadataOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpEndpoint": {
+                    "type": "string"
+                },
+                "HttpPutResponseHopLimit": {
+                    "type": "number"
+                },
+                "HttpTokens": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::LifecycleHook": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DefaultResult": {
+                            "type": "string"
+                        },
+                        "HeartbeatTimeout": {
+                            "type": "number"
+                        },
+                        "LifecycleHookName": {
+                            "type": "string"
+                        },
+                        "LifecycleTransition": {
+                            "type": "string"
+                        },
+                        "NotificationMetadata": {
+                            "type": "string"
+                        },
+                        "NotificationTargetARN": {
+                            "type": "string"
+                        },
+                        "RoleARN": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupName",
+                        "LifecycleTransition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::LifecycleHook"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdjustmentType": {
+                            "type": "string"
+                        },
+                        "AutoScalingGroupName": {
+                            "type": "string"
+                        },
+                        "Cooldown": {
+                            "type": "string"
+                        },
+                        "EstimatedInstanceWarmup": {
+                            "type": "number"
+                        },
+                        "MetricAggregationType": {
+                            "type": "string"
+                        },
+                        "MinAdjustmentMagnitude": {
+                            "type": "number"
+                        },
+                        "PolicyType": {
+                            "type": "string"
+                        },
+                        "PredictiveScalingConfiguration": {
+                            "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredictiveScalingConfiguration"
+                        },
+                        "ScalingAdjustment": {
+                            "type": "number"
+                        },
+                        "StepAdjustments": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.StepAdjustment"
+                            },
+                            "type": "array"
+                        },
+                        "TargetTrackingConfiguration": {
+                            "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.TargetTrackingConfiguration"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::ScalingPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.CustomizedMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "Namespace",
+                "Statistic"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredefinedMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredictiveScalingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacityBreachBehavior": {
+                    "type": "string"
+                },
+                "MaxCapacityBuffer": {
+                    "type": "number"
+                },
+                "MetricSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredictiveScalingMetricSpecification"
+                    },
+                    "type": "array"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "SchedulingBufferTime": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MetricSpecifications"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredictiveScalingMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedLoadMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedLoadMetric"
+                },
+                "PredefinedMetricPairSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedMetricPair"
+                },
+                "PredefinedScalingMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedScalingMetric"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedLoadMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedMetricPair": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedScalingMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.StepAdjustment": {
+            "additionalProperties": false,
+            "properties": {
+                "MetricIntervalLowerBound": {
+                    "type": "number"
+                },
+                "MetricIntervalUpperBound": {
+                    "type": "number"
+                },
+                "ScalingAdjustment": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ScalingAdjustment"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.TargetTrackingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomizedMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.CustomizedMetricSpecification"
+                },
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "PredefinedMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredefinedMetricSpecification"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScheduledAction": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "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::AutoScalingPlans::ScalingPlan": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationSource": {
+                            "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.ApplicationSource"
+                        },
+                        "ScalingInstructions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.ScalingInstruction"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationSource",
+                        "ScalingInstructions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScalingPlans::ScalingPlan"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.ApplicationSource": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudFormationStackARN": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.CustomizedLoadMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "Namespace",
+                "Statistic"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.CustomizedScalingMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "Namespace",
+                "Statistic"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.PredefinedLoadMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedLoadMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedLoadMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.PredefinedScalingMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedScalingMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedScalingMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.ScalingInstruction": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomizedLoadMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.CustomizedLoadMetricSpecification"
+                },
+                "DisableDynamicScaling": {
+                    "type": "boolean"
+                },
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                },
+                "PredefinedLoadMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.PredefinedLoadMetricSpecification"
+                },
+                "PredictiveScalingMaxCapacityBehavior": {
+                    "type": "string"
+                },
+                "PredictiveScalingMaxCapacityBuffer": {
+                    "type": "number"
+                },
+                "PredictiveScalingMode": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                },
+                "ScalableDimension": {
+                    "type": "string"
+                },
+                "ScalingPolicyUpdateBehavior": {
+                    "type": "string"
+                },
+                "ScheduledActionBufferTime": {
+                    "type": "number"
+                },
+                "ServiceNamespace": {
+                    "type": "string"
+                },
+                "TargetTrackingConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.TargetTrackingConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity",
+                "ResourceId",
+                "ScalableDimension",
+                "ServiceNamespace",
+                "TargetTrackingConfigurations"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.TagFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.TargetTrackingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomizedScalingMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.CustomizedScalingMetricSpecification"
+                },
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "EstimatedInstanceWarmup": {
+                    "type": "number"
+                },
+                "PredefinedScalingMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.PredefinedScalingMetricSpecification"
+                },
+                "ScaleInCooldown": {
+                    "type": "number"
+                },
+                "ScaleOutCooldown": {
+                    "type": "number"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BackupPlan": {
+                            "$ref": "#/definitions/AWS::Backup::BackupPlan.BackupPlanResourceType"
+                        },
+                        "BackupPlanTags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "BackupPlan"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Backup::BackupPlan"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan.AdvancedBackupSettingResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "BackupOptions": {
+                    "type": "object"
+                },
+                "ResourceType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BackupOptions",
+                "ResourceType"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan.BackupPlanResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "AdvancedBackupSettings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Backup::BackupPlan.AdvancedBackupSettingResourceType"
+                    },
+                    "type": "array"
+                },
+                "BackupPlanName": {
+                    "type": "string"
+                },
+                "BackupPlanRule": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Backup::BackupPlan.BackupRuleResourceType"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "BackupPlanName",
+                "BackupPlanRule"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan.BackupRuleResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "CompletionWindowMinutes": {
+                    "type": "number"
+                },
+                "CopyActions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Backup::BackupPlan.CopyActionResourceType"
+                    },
+                    "type": "array"
+                },
+                "EnableContinuousBackup": {
+                    "type": "boolean"
+                },
+                "Lifecycle": {
+                    "$ref": "#/definitions/AWS::Backup::BackupPlan.LifecycleResourceType"
+                },
+                "RecoveryPointTags": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "RuleName": {
+                    "type": "string"
+                },
+                "ScheduleExpression": {
+                    "type": "string"
+                },
+                "StartWindowMinutes": {
+                    "type": "number"
+                },
+                "TargetBackupVault": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RuleName",
+                "TargetBackupVault"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan.CopyActionResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationBackupVaultArn": {
+                    "type": "string"
+                },
+                "Lifecycle": {
+                    "$ref": "#/definitions/AWS::Backup::BackupPlan.LifecycleResourceType"
+                }
+            },
+            "required": [
+                "DestinationBackupVaultArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan.LifecycleResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteAfterDays": {
+                    "type": "number"
+                },
+                "MoveToColdStorageAfterDays": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Backup::BackupSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BackupPlanId": {
+                            "type": "string"
+                        },
+                        "BackupSelection": {
+                            "$ref": "#/definitions/AWS::Backup::BackupSelection.BackupSelectionResourceType"
+                        }
+                    },
+                    "required": [
+                        "BackupPlanId",
+                        "BackupSelection"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Backup::BackupSelection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupSelection.BackupSelectionResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "type": "object"
+                },
+                "IamRoleArn": {
+                    "type": "string"
+                },
+                "ListOfTags": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Backup::BackupSelection.ConditionResourceType"
+                    },
+                    "type": "array"
+                },
+                "NotResources": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Resources": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SelectionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IamRoleArn",
+                "SelectionName"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupSelection.ConditionResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "ConditionKey": {
+                    "type": "string"
+                },
+                "ConditionType": {
+                    "type": "string"
+                },
+                "ConditionValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConditionKey",
+                "ConditionType",
+                "ConditionValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupVault": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessPolicy": {
+                            "type": "object"
+                        },
+                        "BackupVaultName": {
+                            "type": "string"
+                        },
+                        "BackupVaultTags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "EncryptionKeyArn": {
+                            "type": "string"
+                        },
+                        "LockConfiguration": {
+                            "$ref": "#/definitions/AWS::Backup::BackupVault.LockConfigurationType"
+                        },
+                        "Notifications": {
+                            "$ref": "#/definitions/AWS::Backup::BackupVault.NotificationObjectType"
+                        }
+                    },
+                    "required": [
+                        "BackupVaultName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Backup::BackupVault"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupVault.LockConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "ChangeableForDays": {
+                    "type": "number"
+                },
+                "MaxRetentionDays": {
+                    "type": "number"
+                },
+                "MinRetentionDays": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MinRetentionDays"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupVault.NotificationObjectType": {
+            "additionalProperties": false,
+            "properties": {
+                "BackupVaultEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SNSTopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BackupVaultEvents",
+                "SNSTopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::Framework": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FrameworkControls": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Backup::Framework.FrameworkControl"
+                            },
+                            "type": "array"
+                        },
+                        "FrameworkDescription": {
+                            "type": "string"
+                        },
+                        "FrameworkName": {
+                            "type": "string"
+                        },
+                        "FrameworkTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FrameworkControls"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Backup::Framework"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::Framework.ControlInputParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ParameterName",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::Framework.FrameworkControl": {
+            "additionalProperties": false,
+            "properties": {
+                "ControlInputParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Backup::Framework.ControlInputParameter"
+                    },
+                    "type": "array"
+                },
+                "ControlName": {
+                    "type": "string"
+                },
+                "ControlScope": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "ControlName"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::ReportPlan": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ReportDeliveryChannel": {
+                            "type": "object"
+                        },
+                        "ReportPlanDescription": {
+                            "type": "string"
+                        },
+                        "ReportPlanName": {
+                            "type": "string"
+                        },
+                        "ReportPlanTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ReportSetting": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ReportDeliveryChannel",
+                        "ReportSetting"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Backup::ReportPlan"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::ComputeEnvironment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ComputeEnvironmentName": {
+                            "type": "string"
+                        },
+                        "ComputeResources": {
+                            "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.ComputeResources"
+                        },
+                        "ServiceRole": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "UnmanagedvCpus": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Batch::ComputeEnvironment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::ComputeEnvironment.ComputeResources": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "BidPercentage": {
+                    "type": "number"
+                },
+                "DesiredvCpus": {
+                    "type": "number"
+                },
+                "Ec2Configuration": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.Ec2ConfigurationObject"
+                    },
+                    "type": "array"
+                },
+                "Ec2KeyPair": {
+                    "type": "string"
+                },
+                "ImageId": {
+                    "type": "string"
+                },
+                "InstanceRole": {
+                    "type": "string"
+                },
+                "InstanceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LaunchTemplate": {
+                    "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.LaunchTemplateSpecification"
+                },
+                "MaxvCpus": {
+                    "type": "number"
+                },
+                "MinvCpus": {
+                    "type": "number"
+                },
+                "PlacementGroup": {
+                    "type": "string"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SpotIamFleetRole": {
+                    "type": "string"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Tags": {
+                    "type": "object"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MaxvCpus",
+                "Subnets",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::ComputeEnvironment.Ec2ConfigurationObject": {
+            "additionalProperties": false,
+            "properties": {
+                "ImageIdOverride": {
+                    "type": "string"
+                },
+                "ImageType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ImageType"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::ComputeEnvironment.LaunchTemplateSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContainerProperties": {
+                            "$ref": "#/definitions/AWS::Batch::JobDefinition.ContainerProperties"
+                        },
+                        "JobDefinitionName": {
+                            "type": "string"
+                        },
+                        "NodeProperties": {
+                            "$ref": "#/definitions/AWS::Batch::JobDefinition.NodeProperties"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "PlatformCapabilities": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PropagateTags": {
+                            "type": "boolean"
+                        },
+                        "RetryStrategy": {
+                            "$ref": "#/definitions/AWS::Batch::JobDefinition.RetryStrategy"
+                        },
+                        "SchedulingPriority": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Timeout": {
+                            "$ref": "#/definitions/AWS::Batch::JobDefinition.Timeout"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Batch::JobDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.AuthorizationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessPointId": {
+                    "type": "string"
+                },
+                "Iam": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.ContainerProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Command": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Environment": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Environment"
+                    },
+                    "type": "array"
+                },
+                "ExecutionRoleArn": {
+                    "type": "string"
+                },
+                "FargatePlatformConfiguration": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.FargatePlatformConfiguration"
+                },
+                "Image": {
+                    "type": "string"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "JobRoleArn": {
+                    "type": "string"
+                },
+                "LinuxParameters": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.LinuxParameters"
+                },
+                "LogConfiguration": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.LogConfiguration"
+                },
+                "Memory": {
+                    "type": "number"
+                },
+                "MountPoints": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.MountPoints"
+                    },
+                    "type": "array"
+                },
+                "NetworkConfiguration": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.NetworkConfiguration"
+                },
+                "Privileged": {
+                    "type": "boolean"
+                },
+                "ReadonlyRootFilesystem": {
+                    "type": "boolean"
+                },
+                "ResourceRequirements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.ResourceRequirement"
+                    },
+                    "type": "array"
+                },
+                "Secrets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Secret"
+                    },
+                    "type": "array"
+                },
+                "Ulimits": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Ulimit"
+                    },
+                    "type": "array"
+                },
+                "User": {
+                    "type": "string"
+                },
+                "Vcpus": {
+                    "type": "number"
+                },
+                "Volumes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Volumes"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Image"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Device": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "HostPath": {
+                    "type": "string"
+                },
+                "Permissions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.EfsVolumeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationConfig": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.AuthorizationConfig"
+                },
+                "FileSystemId": {
+                    "type": "string"
+                },
+                "RootDirectory": {
+                    "type": "string"
+                },
+                "TransitEncryption": {
+                    "type": "string"
+                },
+                "TransitEncryptionPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FileSystemId"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.EvaluateOnExit": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "OnExitCode": {
+                    "type": "string"
+                },
+                "OnReason": {
+                    "type": "string"
+                },
+                "OnStatusReason": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.FargatePlatformConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "PlatformVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.LinuxParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Devices": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Device"
+                    },
+                    "type": "array"
+                },
+                "InitProcessEnabled": {
+                    "type": "boolean"
+                },
+                "MaxSwap": {
+                    "type": "number"
+                },
+                "SharedMemorySize": {
+                    "type": "number"
+                },
+                "Swappiness": {
+                    "type": "number"
+                },
+                "Tmpfs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Tmpfs"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.LogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogDriver": {
+                    "type": "string"
+                },
+                "Options": {
+                    "type": "object"
+                },
+                "SecretOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Secret"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LogDriver"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.MountPoints": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "ReadOnly": {
+                    "type": "boolean"
+                },
+                "SourceVolume": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AssignPublicIp": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.NodeProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "MainNode": {
+                    "type": "number"
+                },
+                "NodeRangeProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.NodeRangeProperty"
+                    },
+                    "type": "array"
+                },
+                "NumNodes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MainNode",
+                "NodeRangeProperties",
+                "NumNodes"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.NodeRangeProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Container": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.ContainerProperties"
+                },
+                "TargetNodes": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TargetNodes"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.ResourceRequirement": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.RetryStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "Attempts": {
+                    "type": "number"
+                },
+                "EvaluateOnExit": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.EvaluateOnExit"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Secret": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "ValueFrom": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "ValueFrom"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Timeout": {
+            "additionalProperties": false,
+            "properties": {
+                "AttemptDurationSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Tmpfs": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "MountOptions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Size": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ContainerPath",
+                "Size"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Ulimit": {
+            "additionalProperties": false,
+            "properties": {
+                "HardLimit": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SoftLimit": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "HardLimit",
+                "Name",
+                "SoftLimit"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Volumes": {
+            "additionalProperties": false,
+            "properties": {
+                "EfsVolumeConfiguration": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.EfsVolumeConfiguration"
+                },
+                "Host": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.VolumesHost"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.VolumesHost": {
+            "additionalProperties": false,
+            "properties": {
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobQueue": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ComputeEnvironmentOrder": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Batch::JobQueue.ComputeEnvironmentOrder"
+                            },
+                            "type": "array"
+                        },
+                        "JobQueueName": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        },
+                        "SchedulingPolicyArn": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ComputeEnvironmentOrder",
+                        "Priority"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Batch::JobQueue"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobQueue.ComputeEnvironmentOrder": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeEnvironment": {
+                    "type": "string"
+                },
+                "Order": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ComputeEnvironment",
+                "Order"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::SchedulingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FairsharePolicy": {
+                            "$ref": "#/definitions/AWS::Batch::SchedulingPolicy.FairsharePolicy"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Batch::SchedulingPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::SchedulingPolicy.FairsharePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeReservation": {
+                    "type": "number"
+                },
+                "ShareDecaySeconds": {
+                    "type": "number"
+                },
+                "ShareDistribution": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::SchedulingPolicy.ShareAttributes"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::SchedulingPolicy.ShareAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "ShareIdentifier": {
+                    "type": "string"
+                },
+                "WeightFactor": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Budgets::Budget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.BudgetData": {
+            "additionalProperties": false,
+            "properties": {
+                "BudgetLimit": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.Spend"
+                },
+                "BudgetName": {
+                    "type": "string"
+                },
+                "BudgetType": {
+                    "type": "string"
+                },
+                "CostFilters": {
+                    "type": "object"
+                },
+                "CostTypes": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.CostTypes"
+                },
+                "PlannedBudgetLimits": {
+                    "type": "object"
+                },
+                "TimePeriod": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.TimePeriod"
+                },
+                "TimeUnit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BudgetType",
+                "TimeUnit"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.CostTypes": {
+            "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"
+                },
+                "UseBlended": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.Notification": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "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.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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ActionThreshold": {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ActionThreshold"
+                        },
+                        "ActionType": {
+                            "type": "string"
+                        },
+                        "ApprovalModel": {
+                            "type": "string"
+                        },
+                        "BudgetName": {
+                            "type": "string"
+                        },
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Definition"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "NotificationType": {
+                            "type": "string"
+                        },
+                        "Subscribers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Subscriber"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ActionThreshold",
+                        "ActionType",
+                        "BudgetName",
+                        "Definition",
+                        "ExecutionRoleArn",
+                        "NotificationType",
+                        "Subscribers"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Budgets::BudgetsAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.ActionThreshold": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.Definition": {
+            "additionalProperties": false,
+            "properties": {
+                "IamActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.IamActionDefinition"
+                },
+                "ScpActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ScpActionDefinition"
+                },
+                "SsmActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.SsmActionDefinition"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.IamActionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Groups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PolicyArn": {
+                    "type": "string"
+                },
+                "Roles": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Users": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "PolicyArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.ScpActionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "PolicyId": {
+                    "type": "string"
+                },
+                "TargetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "PolicyId",
+                "TargetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.SsmActionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "Subtype": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceIds",
+                "Region",
+                "Subtype"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.Subscriber": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Address",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CE::AnomalyMonitor": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        }
+                    },
+                    "required": [
+                        "MonitorName",
+                        "MonitorType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CE::AnomalyMonitor"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CE::AnomalySubscription": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Subscribers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.Subscriber"
+                            },
+                            "type": "array"
+                        },
+                        "SubscriptionName": {
+                            "type": "string"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Frequency",
+                        "MonitorArnList",
+                        "Subscribers",
+                        "SubscriptionName",
+                        "Threshold"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CE::AnomalySubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CE::AnomalySubscription.Subscriber": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Address",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CE::CostCategory": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "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"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CUR::ReportDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CUR::ReportDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Keyspace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cassandra::Keyspace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BillingMode": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.BillingMode"
+                        },
+                        "ClusteringKeyColumns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.ClusteringKeyColumn"
+                            },
+                            "type": "array"
+                        },
+                        "DefaultTimeToLive": {
+                            "type": "number"
+                        },
+                        "EncryptionSpecification": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.EncryptionSpecification"
+                        },
+                        "KeyspaceName": {
+                            "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"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "KeyspaceName",
+                        "PartitionKeyColumns"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cassandra::Table"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "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::CertificateManager::Account": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExpiryEventsConfiguration": {
+                            "$ref": "#/definitions/AWS::CertificateManager::Account.ExpiryEventsConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ExpiryEventsConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CertificateManager::Account"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CertificateManager::Account.ExpiryEventsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DaysBeforeExpiry": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CertificateManager::Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "CertificateTransparencyLoggingPreference": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "DomainValidationOptions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CertificateManager::Certificate.DomainValidationOption"
+                            },
+                            "type": "array"
+                        },
+                        "SubjectAlternativeNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ValidationMethod": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CertificateManager::Certificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CertificateManager::Certificate.DomainValidationOption": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                },
+                "ValidationDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DomainName"
+            ],
+            "type": "object"
+        },
+        "AWS::Chatbot::SlackChannelConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigurationName": {
+                            "type": "string"
+                        },
+                        "GuardrailPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "IamRoleArn": {
+                            "type": "string"
+                        },
+                        "LoggingLevel": {
+                            "type": "string"
+                        },
+                        "SlackChannelId": {
+                            "type": "string"
+                        },
+                        "SlackWorkspaceId": {
+                            "type": "string"
+                        },
+                        "SnsTopicArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "UserRoleRequired": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationName",
+                        "IamRoleArn",
+                        "SlackChannelId",
+                        "SlackWorkspaceId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Chatbot::SlackChannelConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cloud9::EnvironmentEC2": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": [
+                        "InstanceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cloud9::EnvironmentEC2"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cloud9::EnvironmentEC2.Repository": {
+            "additionalProperties": false,
+            "properties": {
+                "PathComponent": {
+                    "type": "string"
+                },
+                "RepositoryUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PathComponent",
+                "RepositoryUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::CustomResource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::Macro": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "LogRoleARN": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FunctionName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::Macro"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::ModuleDefaultVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ModuleDefaultVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::ModuleVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ModuleName": {
+                            "type": "string"
+                        },
+                        "ModulePackage": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ModuleName",
+                        "ModulePackage"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ModuleVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::PublicTypeVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::Publisher": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptTermsAndConditions": {
+                            "type": "boolean"
+                        },
+                        "ConnectionArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AcceptTermsAndConditions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::Publisher"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::ResourceDefaultVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeVersionArn": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ResourceDefaultVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::ResourceVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::ResourceVersion.LoggingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "LogRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::Stack": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "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": {
+                            "type": "string"
+                        },
+                        "ManagedExecution": {
+                            "type": "object"
+                        },
+                        "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": [
+                        "PermissionModel",
+                        "StackSetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::StackSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.AutoDeployment": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "RetainStacksOnAccountRemoval": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.DeploymentTargets": {
+            "additionalProperties": false,
+            "properties": {
+                "Accounts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OrganizationalUnitIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.OperationPreferences": {
+            "additionalProperties": false,
+            "properties": {
+                "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": [
+                "ParameterKey",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::Distribution": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                },
+                "OriginProtocolPolicy": {
+                    "type": "string"
+                },
+                "OriginReadTimeout": {
+                    "type": "number"
+                },
+                "OriginSSLProtocols": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "OriginProtocolPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.DefaultCacheBehavior": {
+            "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"
+                },
+                "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": [
+                "TargetOriginId",
+                "ViewerProtocolPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.DistributionConfig": {
+            "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"
+                },
+                "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"
+                },
+                "ViewerCertificate": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ViewerCertificate"
+                },
+                "WebACLId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.ForwardedValues": {
+            "additionalProperties": false,
+            "properties": {
+                "Cookies": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.Cookies"
+                },
+                "Headers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "QueryString": {
+                    "type": "boolean"
+                },
+                "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"
+                },
+                "OriginProtocolPolicy": {
+                    "type": "string"
+                },
+                "OriginSSLProtocols": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DNSName",
+                "OriginProtocolPolicy",
+                "OriginSSLProtocols"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.LegacyS3Origin": {
+            "additionalProperties": false,
+            "properties": {
+                "DNSName": {
+                    "type": "string"
+                },
+                "OriginAccessIdentity": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DNSName"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "IncludeCookies": {
+                    "type": "boolean"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.Origin": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionAttempts": {
+                    "type": "number"
+                },
+                "ConnectionTimeout": {
+                    "type": "number"
+                },
+                "CustomOriginConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.CustomOriginConfig"
+                },
+                "DomainName": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "OriginCustomHeaders": {
+                    "items": {
+                        "$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": [
+                "DomainName",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.OriginCustomHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderName": {
+                    "type": "string"
+                },
+                "HeaderValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HeaderName",
+                "HeaderValue"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.OriginGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "FailoverCriteria": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroupFailoverCriteria"
+                },
+                "Id": {
+                    "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": {
+                    "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"
+                },
+                "Quantity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Quantity"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.OriginShield": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "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"
+                    },
+                    "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"
+                },
+                "MinimumProtocolVersion": {
+                    "type": "string"
+                },
+                "SslSupportMethod": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFront::Function": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoPublish": {
+                            "type": "boolean"
+                        },
+                        "FunctionCode": {
+                            "type": "string"
+                        },
+                        "FunctionConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::Function.FunctionConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::Function"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Function.FunctionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "Runtime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Comment",
+                "Runtime"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Function.FunctionMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionARN": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFront::KeyGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "KeyGroupConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::KeyGroup.KeyGroupConfig"
+                        }
+                    },
+                    "required": [
+                        "KeyGroupConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::KeyGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "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::OriginRequestPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "OriginRequestPolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.OriginRequestPolicyConfig"
+                        }
+                    },
+                    "required": [
+                        "OriginRequestPolicyConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::OriginRequestPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::OriginRequestPolicy.CookiesConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CookieBehavior": {
+                    "type": "string"
+                },
+                "Cookies": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CookieBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::OriginRequestPolicy.HeadersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderBehavior": {
+                    "type": "string"
+                },
+                "Headers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "HeaderBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::OriginRequestPolicy.OriginRequestPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "CookiesConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.CookiesConfig"
+                },
+                "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::CloudFront::OriginRequestPolicy.QueryStringsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryStringBehavior": {
+                    "type": "string"
+                },
+                "QueryStrings": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "QueryStringBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::PublicKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PublicKeyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::PublicKey.PublicKeyConfig"
+                        }
+                    },
+                    "required": [
+                        "PublicKeyConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::PublicKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::PublicKey.PublicKeyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CallerReference": {
+                    "type": "string"
+                },
+                "Comment": {
+                    "type": "string"
+                },
+                "EncodedKey": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CallerReference",
+                "EncodedKey",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::RealtimeLogConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        }
+                    },
+                    "required": [
+                        "EndPoints",
+                        "Fields",
+                        "Name",
+                        "SamplingRate"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::RealtimeLogConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::RealtimeLogConfig.EndPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "KinesisStreamConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::RealtimeLogConfig.KinesisStreamConfig"
+                },
+                "StreamType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KinesisStreamConfig",
+                "StreamType"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::RealtimeLogConfig.KinesisStreamConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "StreamArn"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResponseHeadersPolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ResponseHeadersPolicyConfig"
+                        }
+                    },
+                    "required": [
+                        "ResponseHeadersPolicyConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::ResponseHeadersPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "Items": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Items"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowMethods": {
+            "additionalProperties": false,
+            "properties": {
+                "Items": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Items"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowOrigins": {
+            "additionalProperties": false,
+            "properties": {
+                "Items": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Items"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlExposeHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "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::CloudFront::ResponseHeadersPolicy.ContentTypeOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Override": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Override"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.CorsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessControlAllowCredentials": {
+                    "type": "boolean"
+                },
+                "AccessControlAllowHeaders": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowHeaders"
+                },
+                "AccessControlAllowMethods": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowMethods"
+                },
+                "AccessControlAllowOrigins": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowOrigins"
+                },
+                "AccessControlExposeHeaders": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlExposeHeaders"
+                },
+                "AccessControlMaxAgeSec": {
+                    "type": "number"
+                },
+                "OriginOverride": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AccessControlAllowCredentials",
+                "AccessControlAllowHeaders",
+                "AccessControlAllowMethods",
+                "AccessControlAllowOrigins",
+                "OriginOverride"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.CustomHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "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::CloudFront::ResponseHeadersPolicy.CustomHeader"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Items"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.FrameOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "FrameOption": {
+                    "type": "string"
+                },
+                "Override": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "FrameOption",
+                "Override"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.ReferrerPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Override": {
+                    "type": "boolean"
+                },
+                "ReferrerPolicy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Override",
+                "ReferrerPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.ResponseHeadersPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "CorsConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.CorsConfig"
+                },
+                "CustomHeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.CustomHeadersConfig"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SecurityHeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.SecurityHeadersConfig"
+                }
+            },
+            "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.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::CloudFront::StreamingDistribution": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "StreamingDistributionConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution.StreamingDistributionConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "StreamingDistributionConfig",
+                        "Tags"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::StreamingDistribution"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "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::Trail": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "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"
+                        }
+                    },
+                    "required": [
+                        "IsLogging",
+                        "S3BucketName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudTrail::Trail"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudTrail::Trail.DataResource": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "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"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        },
+                        "ThresholdMetricId": {
+                            "type": "string"
+                        },
+                        "TreatMissingData": {
+                            "type": "string"
+                        },
+                        "Unit": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ComparisonOperator",
+                        "EvaluationPeriods"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::Alarm"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Configuration"
+                        },
+                        "Dimensions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
+                            },
+                            "type": "array"
+                        },
+                        "MetricMathAnomalyDetector": {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricMathAnomalyDetector"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Namespace": {
+                            "type": "string"
+                        },
+                        "SingleMetricAnomalyDetector": {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector"
+                        },
+                        "Stat": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::AnomalyDetector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "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": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.Metric": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "Namespace"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.MetricDataQueries": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.MetricDataQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Label": {
+                    "type": "string"
+                },
+                "MetricStat": {
+                    "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricStat"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "ReturnData": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "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": {
+                "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ActionsEnabled": {
+                            "type": "boolean"
+                        },
+                        "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"
+                        }
+                    },
+                    "required": [
+                        "AlarmName",
+                        "AlarmRule"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::CompositeAlarm"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::Dashboard": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DashboardBody": {
+                            "type": "string"
+                        },
+                        "DashboardName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DashboardBody"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::Dashboard"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::InsightRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RuleBody": {
+                            "type": "string"
+                        },
+                        "RuleName": {
+                            "type": "string"
+                        },
+                        "RuleState": {
+                            "type": "string"
+                        },
+                        "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExcludeFilters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamFilter"
+                            },
+                            "type": "array"
+                        },
+                        "FirehoseArn": {
+                            "type": "string"
+                        },
+                        "IncludeFilters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamFilter"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OutputFormat": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FirehoseArn",
+                        "OutputFormat",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::MetricStream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::MetricStream.MetricStreamFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Namespace"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeArtifact::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::Repository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                    "type": "string"
+                },
+                "EnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeBuild::Project.EnvironmentVariable"
+                    },
+                    "type": "array"
+                },
+                "Image": {
+                    "type": "string"
+                },
+                "ImagePullCredentialsType": {
+                    "type": "string"
+                },
+                "PrivilegedMode": {
+                    "type": "boolean"
+                },
+                "RegistryCredential": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.RegistryCredential"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComputeType",
+                "Image",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.EnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.FilterGroup": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.GitSubmodulesConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FetchSubmodules": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "FetchSubmodules"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.LogsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogs": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.CloudWatchLogsConfig"
+                },
+                "S3Logs": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.S3LogsConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.ProjectBuildBatchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchReportMode": {
+                    "type": "string"
+                },
+                "CombineArtifacts": {
+                    "type": "boolean"
+                },
+                "Restrictions": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.BatchRestrictions"
+                },
+                "ServiceRole": {
+                    "type": "string"
+                },
+                "TimeoutInMins": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.ProjectCache": {
+            "additionalProperties": false,
+            "properties": {
+                "Location": {
+                    "type": "string"
+                },
+                "Modes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.ProjectFileSystemLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "Identifier": {
+                    "type": "string"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "MountOptions": {
+                    "type": "string"
+                },
+                "MountPoint": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Identifier",
+                "Location",
+                "MountPoint",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.ProjectSourceVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceIdentifier": {
+                    "type": "string"
+                },
+                "SourceVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourceIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.ProjectTriggers": {
+            "additionalProperties": false,
+            "properties": {
+                "BuildType": {
+                    "type": "string"
+                },
+                "FilterGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeBuild::Project.FilterGroup"
+                    },
+                    "type": "array"
+                },
+                "Webhook": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.RegistryCredential": {
+            "additionalProperties": false,
+            "properties": {
+                "Credential": {
+                    "type": "string"
+                },
+                "CredentialProvider": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Credential",
+                "CredentialProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.S3LogsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionDisabled": {
+                    "type": "boolean"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.Source": {
+            "additionalProperties": false,
+            "properties": {
+                "Auth": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.SourceAuth"
+                },
+                "BuildSpec": {
+                    "type": "string"
+                },
+                "BuildStatusConfig": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.BuildStatusConfig"
+                },
+                "GitCloneDepth": {
+                    "type": "number"
+                },
+                "GitSubmodulesConfig": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.GitSubmodulesConfig"
+                },
+                "InsecureSsl": {
+                    "type": "boolean"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "ReportBuildStatus": {
+                    "type": "boolean"
+                },
+                "SourceIdentifier": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.SourceAuth": {
+            "additionalProperties": false,
+            "properties": {
+                "Resource": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.WebhookFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludeMatchedPattern": {
+                    "type": "boolean"
+                },
+                "Pattern": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Pattern",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::ReportGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeleteReports": {
+                            "type": "boolean"
+                        },
+                        "ExportConfig": {
+                            "$ref": "#/definitions/AWS::CodeBuild::ReportGroup.ReportExportConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ExportConfig",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeBuild::ReportGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::ReportGroup.ReportExportConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ExportConfigType": {
+                    "type": "string"
+                },
+                "S3Destination": {
+                    "$ref": "#/definitions/AWS::CodeBuild::ReportGroup.S3ReportExportConfig"
+                }
+            },
+            "required": [
+                "ExportConfigType"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::ReportGroup.S3ReportExportConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "BucketOwner": {
+                    "type": "string"
+                },
+                "EncryptionDisabled": {
+                    "type": "boolean"
+                },
+                "EncryptionKey": {
+                    "type": "string"
+                },
+                "Packaging": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::SourceCredential": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthType": {
+                            "type": "string"
+                        },
+                        "ServerType": {
+                            "type": "string"
+                        },
+                        "Token": {
+                            "type": "string"
+                        },
+                        "Username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthType",
+                        "ServerType",
+                        "Token"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeBuild::SourceCredential"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeCommit::Repository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Code": {
+                            "$ref": "#/definitions/AWS::CodeCommit::Repository.Code"
+                        },
+                        "RepositoryDescription": {
+                            "type": "string"
+                        },
+                        "RepositoryName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Triggers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeCommit::Repository.RepositoryTrigger"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RepositoryName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeCommit::Repository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeCommit::Repository.Code": {
+            "additionalProperties": false,
+            "properties": {
+                "BranchName": {
+                    "type": "string"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::CodeCommit::Repository.S3"
+                }
+            },
+            "required": [
+                "S3"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeCommit::Repository.RepositoryTrigger": {
+            "additionalProperties": false,
+            "properties": {
+                "Branches": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CustomData": {
+                    "type": "string"
+                },
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Events": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationArn",
+                "Events",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeCommit::Repository.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "ComputePlatform": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeDeploy::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ComputePlatform": {
+                            "type": "string"
+                        },
+                        "DeploymentConfigName": {
+                            "type": "string"
+                        },
+                        "MinimumHealthyHosts": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentConfig.MinimumHealthyHosts"
+                        },
+                        "TrafficRoutingConfig": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentConfig.TrafficRoutingConfig"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeDeploy::DeploymentConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentConfig.MinimumHealthyHosts": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentConfig.TimeBasedCanary": {
+            "additionalProperties": false,
+            "properties": {
+                "CanaryInterval": {
+                    "type": "number"
+                },
+                "CanaryPercentage": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "CanaryInterval",
+                "CanaryPercentage"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentConfig.TimeBasedLinear": {
+            "additionalProperties": false,
+            "properties": {
+                "LinearInterval": {
+                    "type": "number"
+                },
+                "LinearPercentage": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "LinearInterval",
+                "LinearPercentage"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentConfig.TrafficRoutingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TimeBasedCanary": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentConfig.TimeBasedCanary"
+                },
+                "TimeBasedLinear": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentConfig.TimeBasedLinear"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AlarmConfiguration": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.AlarmConfiguration"
+                        },
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "AutoRollbackConfiguration": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.AutoRollbackConfiguration"
+                        },
+                        "AutoScalingGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BlueGreenDeploymentConfiguration": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.BlueGreenDeploymentConfiguration"
+                        },
+                        "Deployment": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.Deployment"
+                        },
+                        "DeploymentConfigName": {
+                            "type": "string"
+                        },
+                        "DeploymentGroupName": {
+                            "type": "string"
+                        },
+                        "DeploymentStyle": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.DeploymentStyle"
+                        },
+                        "ECSServices": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.ECSService"
+                            },
+                            "type": "array"
+                        },
+                        "Ec2TagFilters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.EC2TagFilter"
+                            },
+                            "type": "array"
+                        },
+                        "Ec2TagSet": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.EC2TagSet"
+                        },
+                        "LoadBalancerInfo": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.LoadBalancerInfo"
+                        },
+                        "OnPremisesInstanceTagFilters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.TagFilter"
+                            },
+                            "type": "array"
+                        },
+                        "OnPremisesTagSet": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSet"
+                        },
+                        "ServiceRoleArn": {
+                            "type": "string"
+                        },
+                        "TriggerConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.TriggerConfig"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "ServiceRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeDeploy::DeploymentGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.Alarm": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.AlarmConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Alarms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.Alarm"
+                    },
+                    "type": "array"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "IgnorePollAlarmFailure": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.AutoRollbackConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Events": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.BlueGreenDeploymentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeploymentReadyOption": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.DeploymentReadyOption"
+                },
+                "GreenFleetProvisioningOption": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.GreenFleetProvisioningOption"
+                },
+                "TerminateBlueInstancesOnDeploymentSuccess": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.BlueInstanceTerminationOption"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.BlueInstanceTerminationOption": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "TerminationWaitTimeInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.Deployment": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "IgnoreApplicationStopFailures": {
+                    "type": "boolean"
+                },
+                "Revision": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.RevisionLocation"
+                }
+            },
+            "required": [
+                "Revision"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.DeploymentReadyOption": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionOnTimeout": {
+                    "type": "string"
+                },
+                "WaitTimeInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.DeploymentStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "DeploymentOption": {
+                    "type": "string"
+                },
+                "DeploymentType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.EC2TagFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.EC2TagSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Ec2TagSetList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.EC2TagSetListObject"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.EC2TagSetListObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Ec2TagGroup": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.EC2TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.ECSService": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClusterName",
+                "ServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.ELBInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.GitHubLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "CommitId": {
+                    "type": "string"
+                },
+                "Repository": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CommitId",
+                "Repository"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.GreenFleetProvisioningOption": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.LoadBalancerInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "ElbInfoList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.ELBInfo"
+                    },
+                    "type": "array"
+                },
+                "TargetGroupInfoList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.TargetGroupInfo"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSet": {
+            "additionalProperties": false,
+            "properties": {
+                "OnPremisesTagSetList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSetListObject"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSetListObject": {
+            "additionalProperties": false,
+            "properties": {
+                "OnPremisesTagGroup": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.RevisionLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "GitHubLocation": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.GitHubLocation"
+                },
+                "RevisionType": {
+                    "type": "string"
+                },
+                "S3Location": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.S3Location"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "BundleType": {
+                    "type": "string"
+                },
+                "ETag": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.TagFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.TargetGroupInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.TriggerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TriggerEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TriggerName": {
+                    "type": "string"
+                },
+                "TriggerTargetArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeGuruProfiler::ProfilingGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AgentPermissions": {
+                            "type": "object"
+                        },
+                        "AnomalyDetectionNotificationConfiguration": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeGuruProfiler::ProfilingGroup.Channel"
+                            },
+                            "type": "array"
+                        },
+                        "ComputePlatform": {
+                            "type": "string"
+                        },
+                        "ProfilingGroupName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ProfilingGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeGuruProfiler::ProfilingGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeGuruProfiler::ProfilingGroup.Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "channelId": {
+                    "type": "string"
+                },
+                "channelUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "channelUri"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeGuruReviewer::RepositoryAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BucketName": {
+                            "type": "string"
+                        },
+                        "ConnectionArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Owner": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeGuruReviewer::RepositoryAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::CustomActionType": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Category": {
+                            "type": "string"
+                        },
+                        "ConfigurationProperties": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodePipeline::CustomActionType.ConfigurationProperties"
+                            },
+                            "type": "array"
+                        },
+                        "InputArtifactDetails": {
+                            "$ref": "#/definitions/AWS::CodePipeline::CustomActionType.ArtifactDetails"
+                        },
+                        "OutputArtifactDetails": {
+                            "$ref": "#/definitions/AWS::CodePipeline::CustomActionType.ArtifactDetails"
+                        },
+                        "Provider": {
+                            "type": "string"
+                        },
+                        "Settings": {
+                            "$ref": "#/definitions/AWS::CodePipeline::CustomActionType.Settings"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Category",
+                        "InputArtifactDetails",
+                        "OutputArtifactDetails",
+                        "Provider",
+                        "Version"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodePipeline::CustomActionType"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::CustomActionType.ArtifactDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumCount": {
+                    "type": "number"
+                },
+                "MinimumCount": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaximumCount",
+                "MinimumCount"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::CustomActionType.ConfigurationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Queryable": {
+                    "type": "boolean"
+                },
+                "Required": {
+                    "type": "boolean"
+                },
+                "Secret": {
+                    "type": "boolean"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Name",
+                "Required",
+                "Secret"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::CustomActionType.Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "EntityUrlTemplate": {
+                    "type": "string"
+                },
+                "ExecutionUrlTemplate": {
+                    "type": "string"
+                },
+                "RevisionUrlTemplate": {
+                    "type": "string"
+                },
+                "ThirdPartyConfigurationUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ArtifactStore": {
+                            "$ref": "#/definitions/AWS::CodePipeline::Pipeline.ArtifactStore"
+                        },
+                        "ArtifactStores": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodePipeline::Pipeline.ArtifactStoreMap"
+                            },
+                            "type": "array"
+                        },
+                        "DisableInboundStageTransitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodePipeline::Pipeline.StageTransition"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RestartExecutionOnUpdate": {
+                            "type": "boolean"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Stages": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodePipeline::Pipeline.StageDeclaration"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RoleArn",
+                        "Stages"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodePipeline::Pipeline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.ActionDeclaration": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionTypeId": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.ActionTypeId"
+                },
+                "Configuration": {
+                    "type": "object"
+                },
+                "InputArtifacts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.InputArtifact"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "OutputArtifacts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.OutputArtifact"
+                    },
+                    "type": "array"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RunOrder": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ActionTypeId",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.ActionTypeId": {
+            "additionalProperties": false,
+            "properties": {
+                "Category": {
+                    "type": "string"
+                },
+                "Owner": {
+                    "type": "string"
+                },
+                "Provider": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Category",
+                "Owner",
+                "Provider",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.ArtifactStore": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionKey": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.EncryptionKey"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Location",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.ArtifactStoreMap": {
+            "additionalProperties": false,
+            "properties": {
+                "ArtifactStore": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.ArtifactStore"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ArtifactStore",
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.BlockerDeclaration": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.EncryptionKey": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.InputArtifact": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.OutputArtifact": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.StageDeclaration": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.ActionDeclaration"
+                    },
+                    "type": "array"
+                },
+                "Blockers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.BlockerDeclaration"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.StageTransition": {
+            "additionalProperties": false,
+            "properties": {
+                "Reason": {
+                    "type": "string"
+                },
+                "StageName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Reason",
+                "StageName"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Webhook": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "type": "string"
+                        },
+                        "AuthenticationConfiguration": {
+                            "$ref": "#/definitions/AWS::CodePipeline::Webhook.WebhookAuthConfiguration"
+                        },
+                        "Filters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodePipeline::Webhook.WebhookFilterRule"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RegisterWithThirdParty": {
+                            "type": "boolean"
+                        },
+                        "TargetAction": {
+                            "type": "string"
+                        },
+                        "TargetPipeline": {
+                            "type": "string"
+                        },
+                        "TargetPipelineVersion": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Authentication",
+                        "AuthenticationConfiguration",
+                        "Filters",
+                        "TargetAction",
+                        "TargetPipeline",
+                        "TargetPipelineVersion"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodePipeline::Webhook"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Webhook.WebhookAuthConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedIPRange": {
+                    "type": "string"
+                },
+                "SecretToken": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodePipeline::Webhook.WebhookFilterRule": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonPath": {
+                    "type": "string"
+                },
+                "MatchEquals": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "JsonPath"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStar::GitHubRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Code": {
+                            "$ref": "#/definitions/AWS::CodeStar::GitHubRepository.Code"
+                        },
+                        "ConnectionArn": {
+                            "type": "string"
+                        },
+                        "EnableIssues": {
+                            "type": "boolean"
+                        },
+                        "IsPrivate": {
+                            "type": "boolean"
+                        },
+                        "RepositoryAccessToken": {
+                            "type": "string"
+                        },
+                        "RepositoryDescription": {
+                            "type": "string"
+                        },
+                        "RepositoryName": {
+                            "type": "string"
+                        },
+                        "RepositoryOwner": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RepositoryName",
+                        "RepositoryOwner"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeStar::GitHubRepository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStar::GitHubRepository.Code": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::CodeStar::GitHubRepository.S3"
+                }
+            },
+            "required": [
+                "S3"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStar::GitHubRepository.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStarConnections::Connection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionName": {
+                            "type": "string"
+                        },
+                        "HostArn": {
+                            "type": "string"
+                        },
+                        "ProviderType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConnectionName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeStarConnections::Connection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStarNotifications::NotificationRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CreatedBy": {
+                            "type": "string"
+                        },
+                        "DetailType": {
+                            "type": "string"
+                        },
+                        "EventTypeId": {
+                            "type": "string"
+                        },
+                        "EventTypeIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Resource": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TargetAddress": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeStarNotifications::NotificationRule.Target"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DetailType",
+                        "EventTypeIds",
+                        "Name",
+                        "Resource",
+                        "Targets"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeStarNotifications::NotificationRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStarNotifications::NotificationRule.Target": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetAddress": {
+                    "type": "string"
+                },
+                "TargetType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TargetAddress",
+                "TargetType"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPool": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowClassicFlow": {
+                            "type": "boolean"
+                        },
+                        "AllowUnauthenticatedIdentities": {
+                            "type": "boolean"
+                        },
+                        "CognitoEvents": {
+                            "type": "object"
+                        },
+                        "CognitoIdentityProviders": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cognito::IdentityPool.CognitoIdentityProvider"
+                            },
+                            "type": "array"
+                        },
+                        "CognitoStreams": {
+                            "$ref": "#/definitions/AWS::Cognito::IdentityPool.CognitoStreams"
+                        },
+                        "DeveloperProviderName": {
+                            "type": "string"
+                        },
+                        "IdentityPoolName": {
+                            "type": "string"
+                        },
+                        "OpenIdConnectProviderARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PushSync": {
+                            "$ref": "#/definitions/AWS::Cognito::IdentityPool.PushSync"
+                        },
+                        "SamlProviderARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SupportedLoginProviders": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "AllowUnauthenticatedIdentities"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::IdentityPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPool.CognitoIdentityProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientId": {
+                    "type": "string"
+                },
+                "ProviderName": {
+                    "type": "string"
+                },
+                "ServerSideTokenCheck": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPool.CognitoStreams": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StreamName": {
+                    "type": "string"
+                },
+                "StreamingStatus": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPool.PushSync": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPoolRoleAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "IdentityPoolId": {
+                            "type": "string"
+                        },
+                        "RoleMappings": {
+                            "type": "object"
+                        },
+                        "Roles": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "IdentityPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::IdentityPoolRoleAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPoolRoleAttachment.MappingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Claim": {
+                    "type": "string"
+                },
+                "MatchType": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Claim",
+                "MatchType",
+                "RoleARN",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPoolRoleAttachment.RoleMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "AmbiguousRoleResolution": {
+                    "type": "string"
+                },
+                "IdentityProvider": {
+                    "type": "string"
+                },
+                "RulesConfiguration": {
+                    "$ref": "#/definitions/AWS::Cognito::IdentityPoolRoleAttachment.RulesConfigurationType"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPoolRoleAttachment.RulesConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Cognito::IdentityPoolRoleAttachment.MappingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountRecoverySetting": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.AccountRecoverySetting"
+                        },
+                        "AdminCreateUserConfig": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.AdminCreateUserConfig"
+                        },
+                        "AliasAttributes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AutoVerifiedAttributes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DeviceConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.DeviceConfiguration"
+                        },
+                        "EmailConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.EmailConfiguration"
+                        },
+                        "EmailVerificationMessage": {
+                            "type": "string"
+                        },
+                        "EmailVerificationSubject": {
+                            "type": "string"
+                        },
+                        "EnabledMfas": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LambdaConfig": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.LambdaConfig"
+                        },
+                        "MfaConfiguration": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.Policies"
+                        },
+                        "Schema": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cognito::UserPool.SchemaAttribute"
+                            },
+                            "type": "array"
+                        },
+                        "SmsAuthenticationMessage": {
+                            "type": "string"
+                        },
+                        "SmsConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.SmsConfiguration"
+                        },
+                        "SmsVerificationMessage": {
+                            "type": "string"
+                        },
+                        "UserPoolAddOns": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.UserPoolAddOns"
+                        },
+                        "UserPoolName": {
+                            "type": "string"
+                        },
+                        "UserPoolTags": {
+                            "type": "object"
+                        },
+                        "UsernameAttributes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "UsernameConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.UsernameConfiguration"
+                        },
+                        "VerificationMessageTemplate": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.VerificationMessageTemplate"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.AccountRecoverySetting": {
+            "additionalProperties": false,
+            "properties": {
+                "RecoveryMechanisms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Cognito::UserPool.RecoveryOption"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.AdminCreateUserConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowAdminCreateUserOnly": {
+                    "type": "boolean"
+                },
+                "InviteMessageTemplate": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.InviteMessageTemplate"
+                },
+                "UnusedAccountValidityDays": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.CustomEmailSender": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                },
+                "LambdaVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.CustomSMSSender": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                },
+                "LambdaVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.DeviceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChallengeRequiredOnNewDevice": {
+                    "type": "boolean"
+                },
+                "DeviceOnlyRememberedOnUserPrompt": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.EmailConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfigurationSet": {
+                    "type": "string"
+                },
+                "EmailSendingAccount": {
+                    "type": "string"
+                },
+                "From": {
+                    "type": "string"
+                },
+                "ReplyToEmailAddress": {
+                    "type": "string"
+                },
+                "SourceArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.InviteMessageTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "EmailMessage": {
+                    "type": "string"
+                },
+                "EmailSubject": {
+                    "type": "string"
+                },
+                "SMSMessage": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.LambdaConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CreateAuthChallenge": {
+                    "type": "string"
+                },
+                "CustomEmailSender": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.CustomEmailSender"
+                },
+                "CustomMessage": {
+                    "type": "string"
+                },
+                "CustomSMSSender": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.CustomSMSSender"
+                },
+                "DefineAuthChallenge": {
+                    "type": "string"
+                },
+                "KMSKeyID": {
+                    "type": "string"
+                },
+                "PostAuthentication": {
+                    "type": "string"
+                },
+                "PostConfirmation": {
+                    "type": "string"
+                },
+                "PreAuthentication": {
+                    "type": "string"
+                },
+                "PreSignUp": {
+                    "type": "string"
+                },
+                "PreTokenGeneration": {
+                    "type": "string"
+                },
+                "UserMigration": {
+                    "type": "string"
+                },
+                "VerifyAuthChallengeResponse": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.NumberAttributeConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxValue": {
+                    "type": "string"
+                },
+                "MinValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.PasswordPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "MinimumLength": {
+                    "type": "number"
+                },
+                "RequireLowercase": {
+                    "type": "boolean"
+                },
+                "RequireNumbers": {
+                    "type": "boolean"
+                },
+                "RequireSymbols": {
+                    "type": "boolean"
+                },
+                "RequireUppercase": {
+                    "type": "boolean"
+                },
+                "TemporaryPasswordValidityDays": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.Policies": {
+            "additionalProperties": false,
+            "properties": {
+                "PasswordPolicy": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.PasswordPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.RecoveryOption": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.SchemaAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeDataType": {
+                    "type": "string"
+                },
+                "DeveloperOnlyAttribute": {
+                    "type": "boolean"
+                },
+                "Mutable": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "NumberAttributeConstraints": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.NumberAttributeConstraints"
+                },
+                "Required": {
+                    "type": "boolean"
+                },
+                "StringAttributeConstraints": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.StringAttributeConstraints"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.SmsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ExternalId": {
+                    "type": "string"
+                },
+                "SnsCallerArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.StringAttributeConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxLength": {
+                    "type": "string"
+                },
+                "MinLength": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.UserPoolAddOns": {
+            "additionalProperties": false,
+            "properties": {
+                "AdvancedSecurityMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.UsernameConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CaseSensitive": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.VerificationMessageTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultEmailOption": {
+                    "type": "string"
+                },
+                "EmailMessage": {
+                    "type": "string"
+                },
+                "EmailMessageByLink": {
+                    "type": "string"
+                },
+                "EmailSubject": {
+                    "type": "string"
+                },
+                "EmailSubjectByLink": {
+                    "type": "string"
+                },
+                "SmsMessage": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolClient": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessTokenValidity": {
+                            "type": "number"
+                        },
+                        "AllowedOAuthFlows": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AllowedOAuthFlowsUserPoolClient": {
+                            "type": "boolean"
+                        },
+                        "AllowedOAuthScopes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AnalyticsConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolClient.AnalyticsConfiguration"
+                        },
+                        "CallbackURLs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ClientName": {
+                            "type": "string"
+                        },
+                        "DefaultRedirectURI": {
+                            "type": "string"
+                        },
+                        "EnableTokenRevocation": {
+                            "type": "boolean"
+                        },
+                        "ExplicitAuthFlows": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "GenerateSecret": {
+                            "type": "boolean"
+                        },
+                        "IdTokenValidity": {
+                            "type": "number"
+                        },
+                        "LogoutURLs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PreventUserExistenceErrors": {
+                            "type": "string"
+                        },
+                        "ReadAttributes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RefreshTokenValidity": {
+                            "type": "number"
+                        },
+                        "SupportedIdentityProviders": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "TokenValidityUnits": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolClient.TokenValidityUnits"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        },
+                        "WriteAttributes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolClient"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolClient.AnalyticsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationArn": {
+                    "type": "string"
+                },
+                "ApplicationId": {
+                    "type": "string"
+                },
+                "ExternalId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "UserDataShared": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolClient.TokenValidityUnits": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "IdToken": {
+                    "type": "string"
+                },
+                "RefreshToken": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolDomain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomDomainConfig": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolDomain.CustomDomainConfigType"
+                        },
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Domain",
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolDomain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolDomain.CustomDomainConfigType": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "Precedence": {
+                            "type": "number"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolIdentityProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AttributeMapping": {
+                            "type": "object"
+                        },
+                        "IdpIdentifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ProviderDetails": {
+                            "type": "object"
+                        },
+                        "ProviderName": {
+                            "type": "string"
+                        },
+                        "ProviderType": {
+                            "type": "string"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProviderName",
+                        "ProviderType",
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolIdentityProvider"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolResourceServer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Identifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Scopes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cognito::UserPoolResourceServer.ResourceServerScopeType"
+                            },
+                            "type": "array"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Identifier",
+                        "Name",
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolResourceServer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolResourceServer.ResourceServerScopeType": {
+            "additionalProperties": false,
+            "properties": {
+                "ScopeDescription": {
+                    "type": "string"
+                },
+                "ScopeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScopeDescription",
+                "ScopeName"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountTakeoverRiskConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverRiskConfigurationType"
+                        },
+                        "ClientId": {
+                            "type": "string"
+                        },
+                        "CompromisedCredentialsRiskConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsRiskConfigurationType"
+                        },
+                        "RiskExceptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.RiskExceptionConfigurationType"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClientId",
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolRiskConfigurationAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionType": {
+            "additionalProperties": false,
+            "properties": {
+                "EventAction": {
+                    "type": "string"
+                },
+                "Notify": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "EventAction",
+                "Notify"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionsType": {
+            "additionalProperties": false,
+            "properties": {
+                "HighAction": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionType"
+                },
+                "LowAction": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionType"
+                },
+                "MediumAction": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionType"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverRiskConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionsType"
+                },
+                "NotifyConfiguration": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyConfigurationType"
+                }
+            },
+            "required": [
+                "Actions"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsActionsType": {
+            "additionalProperties": false,
+            "properties": {
+                "EventAction": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventAction"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsRiskConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsActionsType"
+                },
+                "EventFilter": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Actions"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockEmail": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyEmailType"
+                },
+                "From": {
+                    "type": "string"
+                },
+                "MfaEmail": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyEmailType"
+                },
+                "NoActionEmail": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyEmailType"
+                },
+                "ReplyTo": {
+                    "type": "string"
+                },
+                "SourceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyEmailType": {
+            "additionalProperties": false,
+            "properties": {
+                "HtmlBody": {
+                    "type": "string"
+                },
+                "Subject": {
+                    "type": "string"
+                },
+                "TextBody": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Subject"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.RiskExceptionConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockedIPRangeList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SkippedIPRangeList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolUICustomizationAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CSS": {
+                            "type": "string"
+                        },
+                        "ClientId": {
+                            "type": "string"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClientId",
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolUICustomizationAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolUser": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClientMetadata": {
+                            "type": "object"
+                        },
+                        "DesiredDeliveryMediums": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ForceAliasCreation": {
+                            "type": "boolean"
+                        },
+                        "MessageAction": {
+                            "type": "string"
+                        },
+                        "UserAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cognito::UserPoolUser.AttributeType"
+                            },
+                            "type": "array"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        },
+                        "Username": {
+                            "type": "string"
+                        },
+                        "ValidationData": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cognito::UserPoolUser.AttributeType"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolUser"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolUser.AttributeType": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolUserToGroupAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        },
+                        "Username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GroupName",
+                        "UserPoolId",
+                        "Username"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolUserToGroupAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::AggregationAuthorization": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthorizedAccountId": {
+                            "type": "string"
+                        },
+                        "AuthorizedAwsRegion": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AuthorizedAccountId",
+                        "AuthorizedAwsRegion"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::AggregationAuthorization"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigRuleName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InputParameters": {
+                            "type": "object"
+                        },
+                        "MaximumExecutionFrequency": {
+                            "type": "string"
+                        },
+                        "Scope": {
+                            "$ref": "#/definitions/AWS::Config::ConfigRule.Scope"
+                        },
+                        "Source": {
+                            "$ref": "#/definitions/AWS::Config::ConfigRule.Source"
+                        }
+                    },
+                    "required": [
+                        "Source"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::ConfigRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigRule.Scope": {
+            "additionalProperties": false,
+            "properties": {
+                "ComplianceResourceId": {
+                    "type": "string"
+                },
+                "ComplianceResourceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TagKey": {
+                    "type": "string"
+                },
+                "TagValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::ConfigRule.Source": {
+            "additionalProperties": false,
+            "properties": {
+                "Owner": {
+                    "type": "string"
+                },
+                "SourceDetails": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Config::ConfigRule.SourceDetail"
+                    },
+                    "type": "array"
+                },
+                "SourceIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Owner",
+                "SourceIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigRule.SourceDetail": {
+            "additionalProperties": false,
+            "properties": {
+                "EventSource": {
+                    "type": "string"
+                },
+                "MaximumExecutionFrequency": {
+                    "type": "string"
+                },
+                "MessageType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventSource",
+                "MessageType"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigurationAggregator": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountAggregationSources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Config::ConfigurationAggregator.AccountAggregationSource"
+                            },
+                            "type": "array"
+                        },
+                        "ConfigurationAggregatorName": {
+                            "type": "string"
+                        },
+                        "OrganizationAggregationSource": {
+                            "$ref": "#/definitions/AWS::Config::ConfigurationAggregator.OrganizationAggregationSource"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::ConfigurationAggregator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigurationAggregator.AccountAggregationSource": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllAwsRegions": {
+                    "type": "boolean"
+                },
+                "AwsRegions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AccountIds"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigurationAggregator.OrganizationAggregationSource": {
+            "additionalProperties": false,
+            "properties": {
+                "AllAwsRegions": {
+                    "type": "boolean"
+                },
+                "AwsRegions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigurationRecorder": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RecordingGroup": {
+                            "$ref": "#/definitions/AWS::Config::ConfigurationRecorder.RecordingGroup"
+                        },
+                        "RoleARN": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RoleARN"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::ConfigurationRecorder"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigurationRecorder.RecordingGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "AllSupported": {
+                    "type": "boolean"
+                },
+                "IncludeGlobalResourceTypes": {
+                    "type": "boolean"
+                },
+                "ResourceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::ConformancePack": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConformancePackInputParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Config::ConformancePack.ConformancePackInputParameter"
+                            },
+                            "type": "array"
+                        },
+                        "ConformancePackName": {
+                            "type": "string"
+                        },
+                        "DeliveryS3Bucket": {
+                            "type": "string"
+                        },
+                        "DeliveryS3KeyPrefix": {
+                            "type": "string"
+                        },
+                        "TemplateBody": {
+                            "type": "string"
+                        },
+                        "TemplateS3Uri": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConformancePackName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::ConformancePack"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConformancePack.ConformancePackInputParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ParameterName",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::DeliveryChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigSnapshotDeliveryProperties": {
+                            "$ref": "#/definitions/AWS::Config::DeliveryChannel.ConfigSnapshotDeliveryProperties"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "S3BucketName": {
+                            "type": "string"
+                        },
+                        "S3KeyPrefix": {
+                            "type": "string"
+                        },
+                        "S3KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "SnsTopicARN": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "S3BucketName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::DeliveryChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::DeliveryChannel.ConfigSnapshotDeliveryProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryFrequency": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::OrganizationConfigRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExcludedAccounts": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "OrganizationConfigRuleName": {
+                            "type": "string"
+                        },
+                        "OrganizationCustomRuleMetadata": {
+                            "$ref": "#/definitions/AWS::Config::OrganizationConfigRule.OrganizationCustomRuleMetadata"
+                        },
+                        "OrganizationManagedRuleMetadata": {
+                            "$ref": "#/definitions/AWS::Config::OrganizationConfigRule.OrganizationManagedRuleMetadata"
+                        }
+                    },
+                    "required": [
+                        "OrganizationConfigRuleName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::OrganizationConfigRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::OrganizationConfigRule.OrganizationCustomRuleMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "InputParameters": {
+                    "type": "string"
+                },
+                "LambdaFunctionArn": {
+                    "type": "string"
+                },
+                "MaximumExecutionFrequency": {
+                    "type": "string"
+                },
+                "OrganizationConfigRuleTriggerTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ResourceIdScope": {
+                    "type": "string"
+                },
+                "ResourceTypesScope": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TagKeyScope": {
+                    "type": "string"
+                },
+                "TagValueScope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaFunctionArn",
+                "OrganizationConfigRuleTriggerTypes"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::OrganizationConfigRule.OrganizationManagedRuleMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "InputParameters": {
+                    "type": "string"
+                },
+                "MaximumExecutionFrequency": {
+                    "type": "string"
+                },
+                "ResourceIdScope": {
+                    "type": "string"
+                },
+                "ResourceTypesScope": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RuleIdentifier": {
+                    "type": "string"
+                },
+                "TagKeyScope": {
+                    "type": "string"
+                },
+                "TagValueScope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RuleIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::OrganizationConformancePack": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConformancePackInputParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Config::OrganizationConformancePack.ConformancePackInputParameter"
+                            },
+                            "type": "array"
+                        },
+                        "DeliveryS3Bucket": {
+                            "type": "string"
+                        },
+                        "DeliveryS3KeyPrefix": {
+                            "type": "string"
+                        },
+                        "ExcludedAccounts": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "OrganizationConformancePackName": {
+                            "type": "string"
+                        },
+                        "TemplateBody": {
+                            "type": "string"
+                        },
+                        "TemplateS3Uri": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "OrganizationConformancePackName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::OrganizationConformancePack"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::OrganizationConformancePack.ConformancePackInputParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ParameterName",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Automatic": {
+                            "type": "boolean"
+                        },
+                        "ConfigRuleName": {
+                            "type": "string"
+                        },
+                        "ExecutionControls": {
+                            "$ref": "#/definitions/AWS::Config::RemediationConfiguration.ExecutionControls"
+                        },
+                        "MaximumAutomaticAttempts": {
+                            "type": "number"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "ResourceType": {
+                            "type": "string"
+                        },
+                        "RetryAttemptSeconds": {
+                            "type": "number"
+                        },
+                        "TargetId": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        },
+                        "TargetVersion": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConfigRuleName",
+                        "TargetId",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::RemediationConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration.ExecutionControls": {
+            "additionalProperties": false,
+            "properties": {
+                "SsmControls": {
+                    "$ref": "#/definitions/AWS::Config::RemediationConfiguration.SsmControls"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration.RemediationParameterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceValue": {
+                    "$ref": "#/definitions/AWS::Config::RemediationConfiguration.ResourceValue"
+                },
+                "StaticValue": {
+                    "$ref": "#/definitions/AWS::Config::RemediationConfiguration.StaticValue"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration.ResourceValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration.SsmControls": {
+            "additionalProperties": false,
+            "properties": {
+                "ConcurrentExecutionRatePercentage": {
+                    "type": "number"
+                },
+                "ErrorPercentage": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration.StaticValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::StoredQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "QueryDescription": {
+                            "type": "string"
+                        },
+                        "QueryExpression": {
+                            "type": "string"
+                        },
+                        "QueryName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "QueryExpression",
+                        "QueryName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::StoredQuery"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::ContactFlow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Content": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Content",
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::ContactFlow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::ContactFlowModule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Content": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Content",
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::ContactFlowModule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::HoursOfOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Config": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Connect::HoursOfOperation.HoursOfOperationConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeZone": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Config",
+                        "InstanceArn",
+                        "Name",
+                        "TimeZone"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::HoursOfOperation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::HoursOfOperation.HoursOfOperationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Day": {
+                    "type": "string"
+                },
+                "EndTime": {
+                    "$ref": "#/definitions/AWS::Connect::HoursOfOperation.HoursOfOperationTimeSlice"
+                },
+                "StartTime": {
+                    "$ref": "#/definitions/AWS::Connect::HoursOfOperation.HoursOfOperationTimeSlice"
+                }
+            },
+            "required": [
+                "Day",
+                "EndTime",
+                "StartTime"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::HoursOfOperation.HoursOfOperationTimeSlice": {
+            "additionalProperties": false,
+            "properties": {
+                "Hours": {
+                    "type": "number"
+                },
+                "Minutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Hours",
+                "Minutes"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::QuickConnect": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QuickConnectConfig": {
+                            "$ref": "#/definitions/AWS::Connect::QuickConnect.QuickConnectConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "Name",
+                        "QuickConnectConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::QuickConnect"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::QuickConnect.PhoneNumberQuickConnectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "PhoneNumber": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PhoneNumber"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::QuickConnect.QueueQuickConnectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContactFlowArn": {
+                    "type": "string"
+                },
+                "QueueArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ContactFlowArn",
+                "QueueArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::QuickConnect.QuickConnectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "PhoneConfig": {
+                    "$ref": "#/definitions/AWS::Connect::QuickConnect.PhoneNumberQuickConnectConfig"
+                },
+                "QueueConfig": {
+                    "$ref": "#/definitions/AWS::Connect::QuickConnect.QueueQuickConnectConfig"
+                },
+                "QuickConnectType": {
+                    "type": "string"
+                },
+                "UserConfig": {
+                    "$ref": "#/definitions/AWS::Connect::QuickConnect.UserQuickConnectConfig"
+                }
+            },
+            "required": [
+                "QuickConnectType"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::QuickConnect.UserQuickConnectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContactFlowArn": {
+                    "type": "string"
+                },
+                "UserArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ContactFlowArn",
+                "UserArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DirectoryUserId": {
+                            "type": "string"
+                        },
+                        "HierarchyGroupArn": {
+                            "type": "string"
+                        },
+                        "IdentityInfo": {
+                            "$ref": "#/definitions/AWS::Connect::User.UserIdentityInfo"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "PhoneConfig": {
+                            "$ref": "#/definitions/AWS::Connect::User.UserPhoneConfig"
+                        },
+                        "RoutingProfileArn": {
+                            "type": "string"
+                        },
+                        "SecurityProfileArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "PhoneConfig",
+                        "RoutingProfileArn",
+                        "SecurityProfileArns",
+                        "Username"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::User.UserIdentityInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Email": {
+                    "type": "string"
+                },
+                "FirstName": {
+                    "type": "string"
+                },
+                "LastName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Connect::User.UserPhoneConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AfterContactWorkTimeLimit": {
+                    "type": "number"
+                },
+                "AutoAccept": {
+                    "type": "boolean"
+                },
+                "DeskPhoneNumber": {
+                    "type": "string"
+                },
+                "PhoneType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PhoneType"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParentGroupArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::UserHierarchyGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeadLetterQueueUrl": {
+                            "type": "string"
+                        },
+                        "DefaultEncryptionKey": {
+                            "type": "string"
+                        },
+                        "DefaultExpirationDays": {
+                            "type": "number"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CustomerProfiles::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "FlowDefinition": {
+                            "$ref": "#/definitions/AWS::CustomerProfiles::Integration.FlowDefinition"
+                        },
+                        "ObjectTypeName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Uri": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainName",
+                        "ObjectTypeName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CustomerProfiles::Integration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.ConnectorOperator": {
+            "additionalProperties": false,
+            "properties": {
+                "Marketo": {
+                    "type": "string"
+                },
+                "S3": {
+                    "type": "string"
+                },
+                "Salesforce": {
+                    "type": "string"
+                },
+                "ServiceNow": {
+                    "type": "string"
+                },
+                "Zendesk": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.FlowDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "FlowName": {
+                    "type": "string"
+                },
+                "KmsArn": {
+                    "type": "string"
+                },
+                "SourceFlowConfig": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.SourceFlowConfig"
+                },
+                "Tasks": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CustomerProfiles::Integration.Task"
+                    },
+                    "type": "array"
+                },
+                "TriggerConfig": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.TriggerConfig"
+                }
+            },
+            "required": [
+                "FlowName",
+                "KmsArn",
+                "SourceFlowConfig",
+                "Tasks",
+                "TriggerConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.IncrementalPullConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DatetimeTypeFieldName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.MarketoSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.S3SourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.SalesforceSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableDynamicFieldUpdate": {
+                    "type": "boolean"
+                },
+                "IncludeDeletedRecords": {
+                    "type": "boolean"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.ScheduledTriggerProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DataPullMode": {
+                    "type": "string"
+                },
+                "FirstExecutionFrom": {
+                    "type": "number"
+                },
+                "ScheduleEndTime": {
+                    "type": "number"
+                },
+                "ScheduleExpression": {
+                    "type": "string"
+                },
+                "ScheduleOffset": {
+                    "type": "number"
+                },
+                "ScheduleStartTime": {
+                    "type": "number"
+                },
+                "Timezone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.ServiceNowSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.SourceConnectorProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Marketo": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.MarketoSourceProperties"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.S3SourceProperties"
+                },
+                "Salesforce": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.SalesforceSourceProperties"
+                },
+                "ServiceNow": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.ServiceNowSourceProperties"
+                },
+                "Zendesk": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.ZendeskSourceProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.SourceFlowConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorProfileName": {
+                    "type": "string"
+                },
+                "ConnectorType": {
+                    "type": "string"
+                },
+                "IncrementalPullConfig": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.IncrementalPullConfig"
+                },
+                "SourceConnectorProperties": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.SourceConnectorProperties"
+                }
+            },
+            "required": [
+                "ConnectorType",
+                "SourceConnectorProperties"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.Task": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorOperator": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.ConnectorOperator"
+                },
+                "DestinationField": {
+                    "type": "string"
+                },
+                "SourceFields": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TaskProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CustomerProfiles::Integration.TaskPropertiesMap"
+                    },
+                    "type": "array"
+                },
+                "TaskType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourceFields",
+                "TaskType"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.TaskPropertiesMap": {
+            "additionalProperties": false,
+            "properties": {
+                "OperatorPropertyKey": {
+                    "type": "string"
+                },
+                "Property": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OperatorPropertyKey",
+                "Property"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.TriggerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TriggerProperties": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.TriggerProperties"
+                },
+                "TriggerType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TriggerType"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.TriggerProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Scheduled": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.ScheduledTriggerProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.ZendeskSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::ObjectType": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowProfileCreation": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EncryptionKey": {
+                            "type": "string"
+                        },
+                        "ExpirationDays": {
+                            "type": "number"
+                        },
+                        "Fields": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CustomerProfiles::ObjectType.FieldMap"
+                            },
+                            "type": "array"
+                        },
+                        "Keys": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CustomerProfiles::ObjectType.KeyMap"
+                            },
+                            "type": "array"
+                        },
+                        "ObjectTypeName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CustomerProfiles::ObjectType"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::ObjectType.FieldMap": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "ObjectTypeField": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::ObjectType.ObjectTypeField"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::ObjectType.KeyMap": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "ObjectTypeKeyList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CustomerProfiles::ObjectType.ObjectTypeKey"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::ObjectType.ObjectTypeField": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentType": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::ObjectType.ObjectTypeKey": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StandardIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DAX::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ClusterEndpointEncryptionType": {
+                            "type": "string"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IAMRoleARN": {
+                            "type": "string"
+                        },
+                        "NodeType": {
+                            "type": "string"
+                        },
+                        "NotificationTopicARN": {
+                            "type": "string"
+                        },
+                        "ParameterGroupName": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "ReplicationFactor": {
+                            "type": "number"
+                        },
+                        "SSESpecification": {
+                            "$ref": "#/definitions/AWS::DAX::Cluster.SSESpecification"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetGroupName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "IAMRoleARN",
+                        "NodeType",
+                        "ReplicationFactor"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DAX::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DAX::Cluster.SSESpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "SSEEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DAX::ParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ParameterGroupName": {
+                            "type": "string"
+                        },
+                        "ParameterNameValues": {
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DAX::ParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DAX::SubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SubnetGroupName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DAX::SubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "PolicyDetails": {
+                            "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.PolicyDetails"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DLM::LifecyclePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "CrossRegionCopy": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CrossRegionCopyAction"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CrossRegionCopy",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.CreateRule": {
+            "additionalProperties": false,
+            "properties": {
+                "CronExpression": {
+                    "type": "string"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "Times": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.CrossRegionCopyAction": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.EncryptionConfiguration"
+                },
+                "RetainRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CrossRegionCopyRetainRule"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionConfiguration",
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.CrossRegionCopyDeprecateRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Interval",
+                "IntervalUnit"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.CrossRegionCopyRetainRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Interval",
+                "IntervalUnit"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.CrossRegionCopyRule": {
+            "additionalProperties": false,
+            "properties": {
+                "CmkArn": {
+                    "type": "string"
+                },
+                "CopyTags": {
+                    "type": "boolean"
+                },
+                "DeprecateRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CrossRegionCopyDeprecateRule"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "RetainRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CrossRegionCopyRetainRule"
+                },
+                "Target": {
+                    "type": "string"
+                },
+                "TargetRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Encrypted"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.DeprecateRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CmkArn": {
+                    "type": "string"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Encrypted"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.EventParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DescriptionRegex": {
+                    "type": "string"
+                },
+                "EventType": {
+                    "type": "string"
+                },
+                "SnapshotOwner": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "EventType",
+                "SnapshotOwner"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.EventSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.EventParameters"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.FastRestoreRule": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZones": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Count": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.Parameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludeBootVolume": {
+                    "type": "boolean"
+                },
+                "NoReboot": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.PolicyDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.Action"
+                    },
+                    "type": "array"
+                },
+                "EventSource": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.EventSource"
+                },
+                "Parameters": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.Parameters"
+                },
+                "PolicyType": {
+                    "type": "string"
+                },
+                "ResourceLocations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ResourceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Schedules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.Schedule"
+                    },
+                    "type": "array"
+                },
+                "TargetTags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.RetainRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyTags": {
+                    "type": "boolean"
+                },
+                "CreateRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CreateRule"
+                },
+                "CrossRegionCopyRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CrossRegionCopyRule"
+                    },
+                    "type": "array"
+                },
+                "DeprecateRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.DeprecateRule"
+                },
+                "FastRestoreRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.FastRestoreRule"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "RetainRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.RetainRule"
+                },
+                "ShareRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.ShareRule"
+                    },
+                    "type": "array"
+                },
+                "TagsToAdd": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                },
+                "VariableTags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.ShareRule": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetAccounts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "UnshareInterval": {
+                    "type": "number"
+                },
+                "UnshareIntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CertificateIdentifier": {
+                            "type": "string"
+                        },
+                        "CertificatePem": {
+                            "type": "string"
+                        },
+                        "CertificateWallet": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::Certificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CertificateArn": {
+                            "type": "string"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "DocDbSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.DocDbSettings"
+                        },
+                        "DynamoDbSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.DynamoDbSettings"
+                        },
+                        "ElasticsearchSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.ElasticsearchSettings"
+                        },
+                        "EndpointIdentifier": {
+                            "type": "string"
+                        },
+                        "EndpointType": {
+                            "type": "string"
+                        },
+                        "EngineName": {
+                            "type": "string"
+                        },
+                        "ExtraConnectionAttributes": {
+                            "type": "string"
+                        },
+                        "IbmDb2Settings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.IbmDb2Settings"
+                        },
+                        "KafkaSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.KafkaSettings"
+                        },
+                        "KinesisSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.KinesisSettings"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MicrosoftSqlServerSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.MicrosoftSqlServerSettings"
+                        },
+                        "MongoDbSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.MongoDbSettings"
+                        },
+                        "MySqlSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.MySqlSettings"
+                        },
+                        "NeptuneSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.NeptuneSettings"
+                        },
+                        "OracleSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.OracleSettings"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PostgreSqlSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.PostgreSqlSettings"
+                        },
+                        "RedisSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.RedisSettings"
+                        },
+                        "RedshiftSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.RedshiftSettings"
+                        },
+                        "ResourceIdentifier": {
+                            "type": "string"
+                        },
+                        "S3Settings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.S3Settings"
+                        },
+                        "ServerName": {
+                            "type": "string"
+                        },
+                        "SslMode": {
+                            "type": "string"
+                        },
+                        "SybaseSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.SybaseSettings"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "EndpointType",
+                        "EngineName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::Endpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.DocDbSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.DynamoDbSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceAccessRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.ElasticsearchSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointUri": {
+                    "type": "string"
+                },
+                "ErrorRetryDuration": {
+                    "type": "number"
+                },
+                "FullLoadErrorPercentage": {
+                    "type": "number"
+                },
+                "ServiceAccessRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.IbmDb2Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.KafkaSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Broker": {
+                    "type": "string"
+                },
+                "IncludeControlDetails": {
+                    "type": "boolean"
+                },
+                "IncludeNullAndEmpty": {
+                    "type": "boolean"
+                },
+                "IncludeTableAlterOperations": {
+                    "type": "boolean"
+                },
+                "IncludeTransactionDetails": {
+                    "type": "boolean"
+                },
+                "NoHexPrefix": {
+                    "type": "boolean"
+                },
+                "PartitionIncludeSchemaTable": {
+                    "type": "boolean"
+                },
+                "SaslPassword": {
+                    "type": "string"
+                },
+                "SaslUserName": {
+                    "type": "string"
+                },
+                "SecurityProtocol": {
+                    "type": "string"
+                },
+                "SslCaCertificateArn": {
+                    "type": "string"
+                },
+                "SslClientCertificateArn": {
+                    "type": "string"
+                },
+                "SslClientKeyArn": {
+                    "type": "string"
+                },
+                "SslClientKeyPassword": {
+                    "type": "string"
+                },
+                "Topic": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.KinesisSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IncludeControlDetails": {
+                    "type": "boolean"
+                },
+                "IncludeNullAndEmpty": {
+                    "type": "boolean"
+                },
+                "IncludeTableAlterOperations": {
+                    "type": "boolean"
+                },
+                "IncludeTransactionDetails": {
+                    "type": "boolean"
+                },
+                "MessageFormat": {
+                    "type": "string"
+                },
+                "NoHexPrefix": {
+                    "type": "boolean"
+                },
+                "PartitionIncludeSchemaTable": {
+                    "type": "boolean"
+                },
+                "ServiceAccessRoleArn": {
+                    "type": "string"
+                },
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.MicrosoftSqlServerSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.MongoDbSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthMechanism": {
+                    "type": "string"
+                },
+                "AuthSource": {
+                    "type": "string"
+                },
+                "AuthType": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DocsToInvestigate": {
+                    "type": "string"
+                },
+                "ExtractDocId": {
+                    "type": "string"
+                },
+                "NestingLevel": {
+                    "type": "string"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                },
+                "ServerName": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.MySqlSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.NeptuneSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorRetryDuration": {
+                    "type": "number"
+                },
+                "IamAuthEnabled": {
+                    "type": "boolean"
+                },
+                "MaxFileSize": {
+                    "type": "number"
+                },
+                "MaxRetryCount": {
+                    "type": "number"
+                },
+                "S3BucketFolder": {
+                    "type": "string"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "ServiceAccessRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.OracleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerOracleAsmAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerOracleAsmSecretId": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.PostgreSqlSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.RedisSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthPassword": {
+                    "type": "string"
+                },
+                "AuthType": {
+                    "type": "string"
+                },
+                "AuthUserName": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "ServerName": {
+                    "type": "string"
+                },
+                "SslCaCertificateArn": {
+                    "type": "string"
+                },
+                "SslSecurityProtocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.RedshiftSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.S3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketFolder": {
+                    "type": "string"
+                },
+                "BucketName": {
+                    "type": "string"
+                },
+                "CompressionType": {
+                    "type": "string"
+                },
+                "CsvDelimiter": {
+                    "type": "string"
+                },
+                "CsvRowDelimiter": {
+                    "type": "string"
+                },
+                "ExternalTableDefinition": {
+                    "type": "string"
+                },
+                "ServiceAccessRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.SybaseSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::EventSubscription": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "EventCategories": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SourceIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SourceType": {
+                            "type": "string"
+                        },
+                        "SubscriptionName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SnsTopicArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::EventSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DMS::ReplicationInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocatedStorage": {
+                            "type": "number"
+                        },
+                        "AllowMajorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MultiAZ": {
+                            "type": "boolean"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "PubliclyAccessible": {
+                            "type": "boolean"
+                        },
+                        "ReplicationInstanceClass": {
+                            "type": "string"
+                        },
+                        "ReplicationInstanceIdentifier": {
+                            "type": "string"
+                        },
+                        "ReplicationSubnetGroupIdentifier": {
+                            "type": "string"
+                        },
+                        "ResourceIdentifier": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ReplicationInstanceClass"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::ReplicationInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DMS::ReplicationSubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ReplicationSubnetGroupDescription": {
+                            "type": "string"
+                        },
+                        "ReplicationSubnetGroupIdentifier": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ReplicationSubnetGroupDescription",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::ReplicationSubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DMS::ReplicationTask": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CdcStartPosition": {
+                            "type": "string"
+                        },
+                        "CdcStartTime": {
+                            "type": "number"
+                        },
+                        "CdcStopPosition": {
+                            "type": "string"
+                        },
+                        "MigrationType": {
+                            "type": "string"
+                        },
+                        "ReplicationInstanceArn": {
+                            "type": "string"
+                        },
+                        "ReplicationTaskIdentifier": {
+                            "type": "string"
+                        },
+                        "ReplicationTaskSettings": {
+                            "type": "string"
+                        },
+                        "ResourceIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceEndpointArn": {
+                            "type": "string"
+                        },
+                        "TableMappings": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetEndpointArn": {
+                            "type": "string"
+                        },
+                        "TaskData": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MigrationType",
+                        "ReplicationInstanceArn",
+                        "SourceEndpointArn",
+                        "TableMappings",
+                        "TargetEndpointArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::ReplicationTask"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Format": {
+                            "type": "string"
+                        },
+                        "FormatOptions": {
+                            "$ref": "#/definitions/AWS::DataBrew::Dataset.FormatOptions"
+                        },
+                        "Input": {
+                            "$ref": "#/definitions/AWS::DataBrew::Dataset.Input"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PathOptions": {
+                            "$ref": "#/definitions/AWS::DataBrew::Dataset.PathOptions"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Input",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Dataset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.CsvOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Delimiter": {
+                    "type": "string"
+                },
+                "HeaderRow": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.DataCatalogInputDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "TempDirectory": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.S3Location"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.DatabaseInputDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseTableName": {
+                    "type": "string"
+                },
+                "GlueConnectionName": {
+                    "type": "string"
+                },
+                "QueryString": {
+                    "type": "string"
+                },
+                "TempDirectory": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.S3Location"
+                }
+            },
+            "required": [
+                "GlueConnectionName"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.DatasetParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "CreateColumn": {
+                    "type": "boolean"
+                },
+                "DatetimeOptions": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.DatetimeOptions"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.FilterExpression"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.DatetimeOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Format": {
+                    "type": "string"
+                },
+                "LocaleCode": {
+                    "type": "string"
+                },
+                "TimezoneOffset": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Format"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.ExcelOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderRow": {
+                    "type": "boolean"
+                },
+                "SheetIndexes": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "SheetNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.FilesLimit": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxFiles": {
+                    "type": "number"
+                },
+                "Order": {
+                    "type": "string"
+                },
+                "OrderedBy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MaxFiles"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.FilterExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "ValuesMap": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Dataset.FilterValue"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Expression",
+                "ValuesMap"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.FilterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                },
+                "ValueReference": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Value",
+                "ValueReference"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.FormatOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Csv": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.CsvOptions"
+                },
+                "Excel": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.ExcelOptions"
+                },
+                "Json": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.JsonOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.Input": {
+            "additionalProperties": false,
+            "properties": {
+                "DataCatalogInputDefinition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.DataCatalogInputDefinition"
+                },
+                "DatabaseInputDefinition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.DatabaseInputDefinition"
+                },
+                "Metadata": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.Metadata"
+                },
+                "S3InputDefinition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.S3Location"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.JsonOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiLine": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.Metadata": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.PathOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "FilesLimit": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.FilesLimit"
+                },
+                "LastModifiedDateCondition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.FilterExpression"
+                },
+                "Parameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Dataset.PathParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.PathParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "DatasetParameter": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.DatasetParameter"
+                },
+                "PathParameterName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatasetParameter",
+                "PathParameterName"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataCatalogOutputs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Job.DataCatalogOutput"
+                            },
+                            "type": "array"
+                        },
+                        "DatabaseOutputs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Job.DatabaseOutput"
+                            },
+                            "type": "array"
+                        },
+                        "DatasetName": {
+                            "type": "string"
+                        },
+                        "EncryptionKeyArn": {
+                            "type": "string"
+                        },
+                        "EncryptionMode": {
+                            "type": "string"
+                        },
+                        "JobSample": {
+                            "$ref": "#/definitions/AWS::DataBrew::Job.JobSample"
+                        },
+                        "LogSubscription": {
+                            "type": "string"
+                        },
+                        "MaxCapacity": {
+                            "type": "number"
+                        },
+                        "MaxRetries": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OutputLocation": {
+                            "$ref": "#/definitions/AWS::DataBrew::Job.OutputLocation"
+                        },
+                        "Outputs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Job.Output"
+                            },
+                            "type": "array"
+                        },
+                        "ProfileConfiguration": {
+                            "$ref": "#/definitions/AWS::DataBrew::Job.ProfileConfiguration"
+                        },
+                        "ProjectName": {
+                            "type": "string"
+                        },
+                        "Recipe": {
+                            "$ref": "#/definitions/AWS::DataBrew::Job.Recipe"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Timeout": {
+                            "type": "number"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "ValidationConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Job.ValidationConfiguration"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "RoleArn",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Job"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.AllowedStatistics": {
+            "additionalProperties": false,
+            "properties": {
+                "Statistics": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Statistics"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.ColumnSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Regex": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.ColumnStatisticsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Selectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Job.ColumnSelector"
+                    },
+                    "type": "array"
+                },
+                "Statistics": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.StatisticsConfiguration"
+                }
+            },
+            "required": [
+                "Statistics"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.CsvOutputOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Delimiter": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.DataCatalogOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DatabaseOptions": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.DatabaseTableOutputOptions"
+                },
+                "Overwrite": {
+                    "type": "boolean"
+                },
+                "S3Options": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.S3TableOutputOptions"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.DatabaseOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseOptions": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.DatabaseTableOutputOptions"
+                },
+                "DatabaseOutputMode": {
+                    "type": "string"
+                },
+                "GlueConnectionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseOptions",
+                "GlueConnectionName"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.DatabaseTableOutputOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "TableName": {
+                    "type": "string"
+                },
+                "TempDirectory": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.S3Location"
+                }
+            },
+            "required": [
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.EntityDetectorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedStatistics": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.AllowedStatistics"
+                },
+                "EntityTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "EntityTypes"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.JobSample": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
+                    "type": "string"
+                },
+                "Size": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "CompressionFormat": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                },
+                "FormatOptions": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.OutputFormatOptions"
+                },
+                "Location": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.S3Location"
+                },
+                "Overwrite": {
+                    "type": "boolean"
+                },
+                "PartitionColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Location"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.OutputFormatOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Csv": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.CsvOutputOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.OutputLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.ParameterMap": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.ProfileConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnStatisticsConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Job.ColumnStatisticsConfiguration"
+                    },
+                    "type": "array"
+                },
+                "DatasetStatisticsConfiguration": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.StatisticsConfiguration"
+                },
+                "EntityDetectorConfiguration": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.EntityDetectorConfiguration"
+                },
+                "ProfileColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Job.ColumnSelector"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.Recipe": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.S3TableOutputOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Location": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.S3Location"
+                }
+            },
+            "required": [
+                "Location"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.StatisticOverride": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.ParameterMap"
+                },
+                "Statistic": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Parameters",
+                "Statistic"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.StatisticsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IncludedStatistics": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Overrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Job.StatisticOverride"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.ValidationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RulesetArn": {
+                    "type": "string"
+                },
+                "ValidationMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RulesetArn"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DatasetName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RecipeName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Sample": {
+                            "$ref": "#/definitions/AWS::DataBrew::Project.Sample"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DatasetName",
+                        "Name",
+                        "RecipeName",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Project.Sample": {
+            "additionalProperties": false,
+            "properties": {
+                "Size": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Steps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Recipe.RecipeStep"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Steps"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Recipe"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "Operation": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "$ref": "#/definitions/AWS::DataBrew::Recipe.ParameterMap"
+                }
+            },
+            "required": [
+                "Operation"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.ConditionExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "TargetColumn": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Condition",
+                "TargetColumn"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.DataCatalogInputDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "TempDirectory": {
+                    "$ref": "#/definitions/AWS::DataBrew::Recipe.S3Location"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.ParameterMap": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.RecipeParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregateFunction": {
+                    "type": "string"
+                },
+                "Base": {
+                    "type": "string"
+                },
+                "CaseStatement": {
+                    "type": "string"
+                },
+                "CategoryMap": {
+                    "type": "string"
+                },
+                "CharsToRemove": {
+                    "type": "string"
+                },
+                "CollapseConsecutiveWhitespace": {
+                    "type": "string"
+                },
+                "ColumnDataType": {
+                    "type": "string"
+                },
+                "ColumnRange": {
+                    "type": "string"
+                },
+                "Count": {
+                    "type": "string"
+                },
+                "CustomCharacters": {
+                    "type": "string"
+                },
+                "CustomStopWords": {
+                    "type": "string"
+                },
+                "CustomValue": {
+                    "type": "string"
+                },
+                "DatasetsColumns": {
+                    "type": "string"
+                },
+                "DateAddValue": {
+                    "type": "string"
+                },
+                "DateTimeFormat": {
+                    "type": "string"
+                },
+                "DateTimeParameters": {
+                    "type": "string"
+                },
+                "DeleteOtherRows": {
+                    "type": "string"
+                },
+                "Delimiter": {
+                    "type": "string"
+                },
+                "EndPattern": {
+                    "type": "string"
+                },
+                "EndPosition": {
+                    "type": "string"
+                },
+                "EndValue": {
+                    "type": "string"
+                },
+                "ExpandContractions": {
+                    "type": "string"
+                },
+                "Exponent": {
+                    "type": "string"
+                },
+                "FalseString": {
+                    "type": "string"
+                },
+                "GroupByAggFunctionOptions": {
+                    "type": "string"
+                },
+                "GroupByColumns": {
+                    "type": "string"
+                },
+                "HiddenColumns": {
+                    "type": "string"
+                },
+                "IgnoreCase": {
+                    "type": "string"
+                },
+                "IncludeInSplit": {
+                    "type": "string"
+                },
+                "Input": {
+                    "type": "object"
+                },
+                "Interval": {
+                    "type": "string"
+                },
+                "IsText": {
+                    "type": "string"
+                },
+                "JoinKeys": {
+                    "type": "string"
+                },
+                "JoinType": {
+                    "type": "string"
+                },
+                "LeftColumns": {
+                    "type": "string"
+                },
+                "Limit": {
+                    "type": "string"
+                },
+                "LowerBound": {
+                    "type": "string"
+                },
+                "MapType": {
+                    "type": "string"
+                },
+                "ModeType": {
+                    "type": "string"
+                },
+                "MultiLine": {
+                    "type": "boolean"
+                },
+                "NumRows": {
+                    "type": "string"
+                },
+                "NumRowsAfter": {
+                    "type": "string"
+                },
+                "NumRowsBefore": {
+                    "type": "string"
+                },
+                "OrderByColumn": {
+                    "type": "string"
+                },
+                "OrderByColumns": {
+                    "type": "string"
+                },
+                "Other": {
+                    "type": "string"
+                },
+                "Pattern": {
+                    "type": "string"
+                },
+                "PatternOption1": {
+                    "type": "string"
+                },
+                "PatternOption2": {
+                    "type": "string"
+                },
+                "PatternOptions": {
+                    "type": "string"
+                },
+                "Period": {
+                    "type": "string"
+                },
+                "Position": {
+                    "type": "string"
+                },
+                "RemoveAllPunctuation": {
+                    "type": "string"
+                },
+                "RemoveAllQuotes": {
+                    "type": "string"
+                },
+                "RemoveAllWhitespace": {
+                    "type": "string"
+                },
+                "RemoveCustomCharacters": {
+                    "type": "string"
+                },
+                "RemoveCustomValue": {
+                    "type": "string"
+                },
+                "RemoveLeadingAndTrailingPunctuation": {
+                    "type": "string"
+                },
+                "RemoveLeadingAndTrailingQuotes": {
+                    "type": "string"
+                },
+                "RemoveLeadingAndTrailingWhitespace": {
+                    "type": "string"
+                },
+                "RemoveLetters": {
+                    "type": "string"
+                },
+                "RemoveNumbers": {
+                    "type": "string"
+                },
+                "RemoveSourceColumn": {
+                    "type": "string"
+                },
+                "RemoveSpecialCharacters": {
+                    "type": "string"
+                },
+                "RightColumns": {
+                    "type": "string"
+                },
+                "SampleSize": {
+                    "type": "string"
+                },
+                "SampleType": {
+                    "type": "string"
+                },
+                "SecondInput": {
+                    "type": "string"
+                },
+                "SecondaryInputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Recipe.SecondaryInput"
+                    },
+                    "type": "array"
+                },
+                "SheetIndexes": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "SheetNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SourceColumn": {
+                    "type": "string"
+                },
+                "SourceColumn1": {
+                    "type": "string"
+                },
+                "SourceColumn2": {
+                    "type": "string"
+                },
+                "SourceColumns": {
+                    "type": "string"
+                },
+                "StartColumnIndex": {
+                    "type": "string"
+                },
+                "StartPattern": {
+                    "type": "string"
+                },
+                "StartPosition": {
+                    "type": "string"
+                },
+                "StartValue": {
+                    "type": "string"
+                },
+                "StemmingMode": {
+                    "type": "string"
+                },
+                "StepCount": {
+                    "type": "string"
+                },
+                "StepIndex": {
+                    "type": "string"
+                },
+                "StopWordsMode": {
+                    "type": "string"
+                },
+                "Strategy": {
+                    "type": "string"
+                },
+                "TargetColumn": {
+                    "type": "string"
+                },
+                "TargetColumnNames": {
+                    "type": "string"
+                },
+                "TargetDateFormat": {
+                    "type": "string"
+                },
+                "TargetIndex": {
+                    "type": "string"
+                },
+                "TimeZone": {
+                    "type": "string"
+                },
+                "TokenizerPattern": {
+                    "type": "string"
+                },
+                "TrueString": {
+                    "type": "string"
+                },
+                "UdfLang": {
+                    "type": "string"
+                },
+                "Units": {
+                    "type": "string"
+                },
+                "UnpivotColumn": {
+                    "type": "string"
+                },
+                "UpperBound": {
+                    "type": "string"
+                },
+                "UseNewDataFrame": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                },
+                "Value1": {
+                    "type": "string"
+                },
+                "Value2": {
+                    "type": "string"
+                },
+                "ValueColumn": {
+                    "type": "string"
+                },
+                "ViewFrame": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.RecipeStep": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::DataBrew::Recipe.Action"
+                },
+                "ConditionExpressions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Recipe.ConditionExpression"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Action"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.SecondaryInput": {
+            "additionalProperties": false,
+            "properties": {
+                "DataCatalogInputDefinition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Recipe.DataCatalogInputDefinition"
+                },
+                "S3InputDefinition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Recipe.S3Location"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Ruleset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Ruleset.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Rules",
+                        "TargetArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Ruleset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Ruleset.ColumnSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Regex": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Ruleset.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "CheckExpression": {
+                    "type": "string"
+                },
+                "ColumnSelectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Ruleset.ColumnSelector"
+                    },
+                    "type": "array"
+                },
+                "Disabled": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SubstitutionMap": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Ruleset.SubstitutionValue"
+                    },
+                    "type": "array"
+                },
+                "Threshold": {
+                    "$ref": "#/definitions/AWS::DataBrew::Ruleset.Threshold"
+                }
+            },
+            "required": [
+                "CheckExpression",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Ruleset.SubstitutionValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                },
+                "ValueReference": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Value",
+                "ValueReference"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Ruleset.Threshold": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CronExpression": {
+                            "type": "string"
+                        },
+                        "JobNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CronExpression",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Schedule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Activate": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParameterObjects": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataPipeline::Pipeline.ParameterObject"
+                            },
+                            "type": "array"
+                        },
+                        "ParameterValues": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataPipeline::Pipeline.ParameterValue"
+                            },
+                            "type": "array"
+                        },
+                        "PipelineObjects": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataPipeline::Pipeline.PipelineObject"
+                            },
+                            "type": "array"
+                        },
+                        "PipelineTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataPipeline::Pipeline.PipelineTag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "ParameterObjects"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataPipeline::Pipeline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.Field": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "RefValue": {
+                    "type": "string"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.ParameterAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "StringValue"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.ParameterObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataPipeline::Pipeline.ParameterAttribute"
+                    },
+                    "type": "array"
+                },
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attributes",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.ParameterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id",
+                "StringValue"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.PipelineObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Fields": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataPipeline::Pipeline.Field"
+                    },
+                    "type": "array"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Fields",
+                "Id",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.PipelineTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::Agent": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ActivationKey": {
+                            "type": "string"
+                        },
+                        "AgentName": {
+                            "type": "string"
+                        },
+                        "SecurityGroupArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcEndpointId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ActivationKey"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::Agent"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationEFS": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Ec2Config": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationEFS.Ec2Config"
+                        },
+                        "EfsFilesystemArn": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Ec2Config",
+                        "EfsFilesystemArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationEFS"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationEFS.Ec2Config": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecurityGroupArns",
+                "SubnetArn"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationFSxWindows": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "FsxFilesystemArn": {
+                            "type": "string"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "SecurityGroupArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "User": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FsxFilesystemArn",
+                        "Password",
+                        "SecurityGroupArns",
+                        "User"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationFSxWindows"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationHDFS": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AgentArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
+                        "BlockSize": {
+                            "type": "number"
+                        },
+                        "KerberosKeytab": {
+                            "type": "string"
+                        },
+                        "KerberosKrb5Conf": {
+                            "type": "string"
+                        },
+                        "KerberosPrincipal": {
+                            "type": "string"
+                        },
+                        "KmsKeyProviderUri": {
+                            "type": "string"
+                        },
+                        "NameNodes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataSync::LocationHDFS.NameNode"
+                            },
+                            "type": "array"
+                        },
+                        "QopConfiguration": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationHDFS.QopConfiguration"
+                        },
+                        "ReplicationFactor": {
+                            "type": "number"
+                        },
+                        "SimpleUser": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AgentArns",
+                        "AuthenticationType",
+                        "NameNodes"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationHDFS"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationHDFS.NameNode": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Hostname",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationHDFS.QopConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DataTransferProtection": {
+                    "type": "string"
+                },
+                "RpcProtection": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataSync::LocationNFS": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MountOptions": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationNFS.MountOptions"
+                        },
+                        "OnPremConfig": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationNFS.OnPremConfig"
+                        },
+                        "ServerHostname": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "OnPremConfig",
+                        "ServerHostname",
+                        "Subdirectory"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationNFS"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationNFS.MountOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataSync::LocationNFS.OnPremConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AgentArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AgentArns"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationObjectStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessKey": {
+                            "type": "string"
+                        },
+                        "AgentArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BucketName": {
+                            "type": "string"
+                        },
+                        "SecretKey": {
+                            "type": "string"
+                        },
+                        "ServerHostname": {
+                            "type": "string"
+                        },
+                        "ServerPort": {
+                            "type": "number"
+                        },
+                        "ServerProtocol": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AgentArns",
+                        "BucketName",
+                        "ServerHostname"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationObjectStorage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationS3": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "S3BucketArn": {
+                            "type": "string"
+                        },
+                        "S3Config": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationS3.S3Config"
+                        },
+                        "S3StorageClass": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "S3BucketArn",
+                        "S3Config"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationS3"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationS3.S3Config": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketAccessRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketAccessRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationSMB": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AgentArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "MountOptions": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationSMB.MountOptions"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "ServerHostname": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "User": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AgentArns",
+                        "Password",
+                        "ServerHostname",
+                        "Subdirectory",
+                        "User"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationSMB"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationSMB.MountOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataSync::Task": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CloudWatchLogGroupArn": {
+                            "type": "string"
+                        },
+                        "DestinationLocationArn": {
+                            "type": "string"
+                        },
+                        "Excludes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataSync::Task.FilterRule"
+                            },
+                            "type": "array"
+                        },
+                        "Includes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataSync::Task.FilterRule"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Options": {
+                            "$ref": "#/definitions/AWS::DataSync::Task.Options"
+                        },
+                        "Schedule": {
+                            "$ref": "#/definitions/AWS::DataSync::Task.TaskSchedule"
+                        },
+                        "SourceLocationArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DestinationLocationArn",
+                        "SourceLocationArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::Task"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::Task.FilterRule": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterType": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataSync::Task.Options": {
+            "additionalProperties": false,
+            "properties": {
+                "Atime": {
+                    "type": "string"
+                },
+                "BytesPerSecond": {
+                    "type": "number"
+                },
+                "Gid": {
+                    "type": "string"
+                },
+                "LogLevel": {
+                    "type": "string"
+                },
+                "Mtime": {
+                    "type": "string"
+                },
+                "OverwriteMode": {
+                    "type": "string"
+                },
+                "PosixPermissions": {
+                    "type": "string"
+                },
+                "PreserveDeletedFiles": {
+                    "type": "string"
+                },
+                "PreserveDevices": {
+                    "type": "string"
+                },
+                "SecurityDescriptorCopyFlags": {
+                    "type": "string"
+                },
+                "TaskQueueing": {
+                    "type": "string"
+                },
+                "TransferMode": {
+                    "type": "string"
+                },
+                "Uid": {
+                    "type": "string"
+                },
+                "VerifyMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataSync::Task.TaskSchedule": {
+            "additionalProperties": false,
+            "properties": {
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::Detective::Graph": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Detective::Graph"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Detective::MemberInvitation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DisableEmailNotification": {
+                            "type": "boolean"
+                        },
+                        "GraphArn": {
+                            "type": "string"
+                        },
+                        "MemberEmailAddress": {
+                            "type": "string"
+                        },
+                        "MemberId": {
+                            "type": "string"
+                        },
+                        "Message": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GraphArn",
+                        "MemberEmailAddress",
+                        "MemberId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Detective::MemberInvitation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::NotificationChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Config": {
+                            "$ref": "#/definitions/AWS::DevOpsGuru::NotificationChannel.NotificationChannelConfig"
+                        }
+                    },
+                    "required": [
+                        "Config"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DevOpsGuru::NotificationChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::NotificationChannel.NotificationChannelConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Sns": {
+                    "$ref": "#/definitions/AWS::DevOpsGuru::NotificationChannel.SnsChannelConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::NotificationChannel.SnsChannelConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::ResourceCollection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceCollectionFilter": {
+                            "$ref": "#/definitions/AWS::DevOpsGuru::ResourceCollection.ResourceCollectionFilter"
+                        }
+                    },
+                    "required": [
+                        "ResourceCollectionFilter"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DevOpsGuru::ResourceCollection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::ResourceCollection.CloudFormationCollectionFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "StackNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::ResourceCollection.ResourceCollectionFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudFormation": {
+                    "$ref": "#/definitions/AWS::DevOpsGuru::ResourceCollection.CloudFormationCollectionFilter"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DirectoryService::MicrosoftAD": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CreateAlias": {
+                            "type": "boolean"
+                        },
+                        "Edition": {
+                            "type": "string"
+                        },
+                        "EnableSso": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "ShortName": {
+                            "type": "string"
+                        },
+                        "VpcSettings": {
+                            "$ref": "#/definitions/AWS::DirectoryService::MicrosoftAD.VpcSettings"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Password",
+                        "VpcSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DirectoryService::MicrosoftAD"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DirectoryService::MicrosoftAD.VpcSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubnetIds",
+                "VpcId"
+            ],
+            "type": "object"
+        },
+        "AWS::DirectoryService::SimpleAD": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CreateAlias": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnableSso": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "ShortName": {
+                            "type": "string"
+                        },
+                        "Size": {
+                            "type": "string"
+                        },
+                        "VpcSettings": {
+                            "$ref": "#/definitions/AWS::DirectoryService::SimpleAD.VpcSettings"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Password",
+                        "Size",
+                        "VpcSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DirectoryService::SimpleAD"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DirectoryService::SimpleAD.VpcSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubnetIds",
+                "VpcId"
+            ],
+            "type": "object"
+        },
+        "AWS::DocDB::DBCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MasterUserPassword": {
+                            "type": "string"
+                        },
+                        "MasterUsername": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "SnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MasterUserPassword",
+                        "MasterUsername"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DocDB::DBCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DocDB::DBClusterParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::DocDB::DBClusterParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DocDB::DBInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBInstanceClass": {
+                            "type": "string"
+                        },
+                        "DBInstanceIdentifier": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBClusterIdentifier",
+                        "DBInstanceClass"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DocDB::DBInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DocDB::DBSubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DBSubnetGroupDescription": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBSubnetGroupDescription",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DocDB::DBSubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AttributeDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.AttributeDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "BillingMode": {
+                            "type": "string"
+                        },
+                        "GlobalSecondaryIndexes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.GlobalSecondaryIndex"
+                            },
+                            "type": "array"
+                        },
+                        "KeySchema": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.KeySchema"
+                            },
+                            "type": "array"
+                        },
+                        "LocalSecondaryIndexes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.LocalSecondaryIndex"
+                            },
+                            "type": "array"
+                        },
+                        "Replicas": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReplicaSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "SSESpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.SSESpecification"
+                        },
+                        "StreamSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.StreamSpecification"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        },
+                        "TimeToLiveSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.TimeToLiveSpecification"
+                        },
+                        "WriteProvisionedThroughputSettings": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
+                        }
+                    },
+                    "required": [
+                        "AttributeDefinitions",
+                        "KeySchema",
+                        "Replicas"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DynamoDB::GlobalTable"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.AttributeDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "AttributeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "AttributeType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.CapacityAutoScalingSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                },
+                "SeedCapacity": {
+                    "type": "number"
+                },
+                "TargetTrackingScalingPolicyConfiguration": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.TargetTrackingScalingPolicyConfiguration"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity",
+                "TargetTrackingScalingPolicyConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.ContributorInsightsSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.GlobalSecondaryIndex": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexName": {
+                    "type": "string"
+                },
+                "KeySchema": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.KeySchema"
+                    },
+                    "type": "array"
+                },
+                "Projection": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.Projection"
+                },
+                "WriteProvisionedThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
+                }
+            },
+            "required": [
+                "IndexName",
+                "KeySchema",
+                "Projection"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.KeySchema": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "KeyType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.LocalSecondaryIndex": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexName": {
+                    "type": "string"
+                },
+                "KeySchema": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.KeySchema"
+                    },
+                    "type": "array"
+                },
+                "Projection": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.Projection"
+                }
+            },
+            "required": [
+                "IndexName",
+                "KeySchema",
+                "Projection"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.PointInTimeRecoverySpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PointInTimeRecoveryEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.Projection": {
+            "additionalProperties": false,
+            "properties": {
+                "NonKeyAttributes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ProjectionType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityAutoScalingSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.CapacityAutoScalingSettings"
+                },
+                "ReadCapacityUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.ReplicaGlobalSecondaryIndexSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ContributorInsightsSpecification": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ContributorInsightsSpecification"
+                },
+                "IndexName": {
+                    "type": "string"
+                },
+                "ReadProvisionedThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
+                }
+            },
+            "required": [
+                "IndexName"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.ReplicaSSESpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSMasterKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KMSMasterKeyId"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.ReplicaSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ContributorInsightsSpecification": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ContributorInsightsSpecification"
+                },
+                "GlobalSecondaryIndexes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReplicaGlobalSecondaryIndexSpecification"
+                    },
+                    "type": "array"
+                },
+                "PointInTimeRecoverySpecification": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.PointInTimeRecoverySpecification"
+                },
+                "ReadProvisionedThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "SSESpecification": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReplicaSSESpecification"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.SSESpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "SSEEnabled": {
+                    "type": "boolean"
+                },
+                "SSEType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SSEEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.StreamSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamViewType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StreamViewType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.TargetTrackingScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "ScaleInCooldown": {
+                    "type": "number"
+                },
+                "ScaleOutCooldown": {
+                    "type": "number"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.TimeToLiveSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "WriteCapacityAutoScalingSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.CapacityAutoScalingSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AttributeDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::Table.AttributeDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "BillingMode": {
+                            "type": "string"
+                        },
+                        "ContributorInsightsSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.ContributorInsightsSpecification"
+                        },
+                        "GlobalSecondaryIndexes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::Table.GlobalSecondaryIndex"
+                            },
+                            "type": "array"
+                        },
+                        "KeySchema": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::Table.KeySchema"
+                            },
+                            "type": "array"
+                        },
+                        "KinesisStreamSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.KinesisStreamSpecification"
+                        },
+                        "LocalSecondaryIndexes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::Table.LocalSecondaryIndex"
+                            },
+                            "type": "array"
+                        },
+                        "PointInTimeRecoverySpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.PointInTimeRecoverySpecification"
+                        },
+                        "ProvisionedThroughput": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.ProvisionedThroughput"
+                        },
+                        "SSESpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.SSESpecification"
+                        },
+                        "StreamSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.StreamSpecification"
+                        },
+                        "TableClass": {
+                            "type": "string"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeToLiveSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.TimeToLiveSpecification"
+                        }
+                    },
+                    "required": [
+                        "KeySchema"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DynamoDB::Table"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.AttributeDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "AttributeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "AttributeType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.ContributorInsightsSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.GlobalSecondaryIndex": {
+            "additionalProperties": false,
+            "properties": {
+                "ContributorInsightsSpecification": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.ContributorInsightsSpecification"
+                },
+                "IndexName": {
+                    "type": "string"
+                },
+                "KeySchema": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DynamoDB::Table.KeySchema"
+                    },
+                    "type": "array"
+                },
+                "Projection": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.Projection"
+                },
+                "ProvisionedThroughput": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.ProvisionedThroughput"
+                }
+            },
+            "required": [
+                "IndexName",
+                "KeySchema",
+                "Projection"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.KeySchema": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "KeyType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.KinesisStreamSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StreamArn"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.LocalSecondaryIndex": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexName": {
+                    "type": "string"
+                },
+                "KeySchema": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DynamoDB::Table.KeySchema"
+                    },
+                    "type": "array"
+                },
+                "Projection": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.Projection"
+                }
+            },
+            "required": [
+                "IndexName",
+                "KeySchema",
+                "Projection"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.PointInTimeRecoverySpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PointInTimeRecoveryEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.Projection": {
+            "additionalProperties": false,
+            "properties": {
+                "NonKeyAttributes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ProjectionType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.ProvisionedThroughput": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityUnits": {
+                    "type": "number"
+                },
+                "WriteCapacityUnits": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ReadCapacityUnits",
+                "WriteCapacityUnits"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.SSESpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSMasterKeyId": {
+                    "type": "string"
+                },
+                "SSEEnabled": {
+                    "type": "boolean"
+                },
+                "SSEType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SSEEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.StreamSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamViewType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StreamViewType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.TimeToLiveSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::CapacityReservation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "EbsOptimized": {
+                            "type": "boolean"
+                        },
+                        "EndDate": {
+                            "type": "string"
+                        },
+                        "EndDateType": {
+                            "type": "string"
+                        },
+                        "EphemeralStorage": {
+                            "type": "boolean"
+                        },
+                        "InstanceCount": {
+                            "type": "number"
+                        },
+                        "InstanceMatchCriteria": {
+                            "type": "string"
+                        },
+                        "InstancePlatform": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "OutPostArn": {
+                            "type": "string"
+                        },
+                        "PlacementGroupArn": {
+                            "type": "string"
+                        },
+                        "TagSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::CapacityReservation.TagSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "Tenancy": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AvailabilityZone",
+                        "InstanceCount",
+                        "InstancePlatform",
+                        "InstanceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::CapacityReservation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::CapacityReservation.TagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::CapacityReservationFleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocationStrategy": {
+                            "type": "string"
+                        },
+                        "EndDate": {
+                            "type": "string"
+                        },
+                        "InstanceMatchCriteria": {
+                            "type": "string"
+                        },
+                        "InstanceTypeSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::CapacityReservationFleet.InstanceTypeSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "NoRemoveEndDate": {
+                            "type": "boolean"
+                        },
+                        "RemoveEndDate": {
+                            "type": "boolean"
+                        },
+                        "TagSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::CapacityReservationFleet.TagSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "Tenancy": {
+                            "type": "string"
+                        },
+                        "TotalTargetCapacity": {
+                            "type": "number"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::CapacityReservationFleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::CapacityReservationFleet.InstanceTypeSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "AvailabilityZoneId": {
+                    "type": "string"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                },
+                "InstancePlatform": {
+                    "type": "string"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::CapacityReservationFleet.TagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::CarrierGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::CarrierGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnAuthorizationRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessGroupId": {
+                            "type": "string"
+                        },
+                        "AuthorizeAllGroups": {
+                            "type": "boolean"
+                        },
+                        "ClientVpnEndpointId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "TargetNetworkCidr": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClientVpnEndpointId",
+                        "TargetNetworkCidr"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::ClientVpnAuthorizationRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationOptions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.ClientAuthenticationRequest"
+                            },
+                            "type": "array"
+                        },
+                        "ClientCidrBlock": {
+                            "type": "string"
+                        },
+                        "ClientConnectOptions": {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.ClientConnectOptions"
+                        },
+                        "ConnectionLogOptions": {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.ConnectionLogOptions"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DnsServers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SelfServicePortal": {
+                            "type": "string"
+                        },
+                        "ServerCertificateArn": {
+                            "type": "string"
+                        },
+                        "SplitTunnel": {
+                            "type": "boolean"
+                        },
+                        "TagSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.TagSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "TransportProtocol": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        },
+                        "VpnPort": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "AuthenticationOptions",
+                        "ClientCidrBlock",
+                        "ConnectionLogOptions",
+                        "ServerCertificateArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::ClientVpnEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.CertificateAuthenticationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientRootCertificateChainArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClientRootCertificateChainArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.ClientAuthenticationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveDirectory": {
+                    "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.DirectoryServiceAuthenticationRequest"
+                },
+                "FederatedAuthentication": {
+                    "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.FederatedAuthenticationRequest"
+                },
+                "MutualAuthentication": {
+                    "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.CertificateAuthenticationRequest"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.ClientConnectOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "LambdaFunctionArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.ConnectionLogOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudwatchLogGroup": {
+                    "type": "string"
+                },
+                "CloudwatchLogStream": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.DirectoryServiceAuthenticationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DirectoryId"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.FederatedAuthenticationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "SAMLProviderArn": {
+                    "type": "string"
+                },
+                "SelfServiceSAMLProviderArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SAMLProviderArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.TagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ResourceType",
+                "Tags"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClientVpnEndpointId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "TargetVpcSubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClientVpnEndpointId",
+                        "DestinationCidrBlock",
+                        "TargetVpcSubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::ClientVpnRoute"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnTargetNetworkAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClientVpnEndpointId": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClientVpnEndpointId",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::ClientVpnTargetNetworkAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::CustomerGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BgpAsn": {
+                            "type": "number"
+                        },
+                        "IpAddress": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "BgpAsn",
+                        "IpAddress",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::CustomerGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::DHCPOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DomainNameServers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "NetbiosNameServers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "NetbiosNodeType": {
+                            "type": "number"
+                        },
+                        "NtpServers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::DHCPOptions"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Context": {
+                            "type": "string"
+                        },
+                        "ExcessCapacityTerminationPolicy": {
+                            "type": "string"
+                        },
+                        "LaunchTemplateConfigs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::EC2Fleet.FleetLaunchTemplateConfigRequest"
+                            },
+                            "type": "array"
+                        },
+                        "OnDemandOptions": {
+                            "$ref": "#/definitions/AWS::EC2::EC2Fleet.OnDemandOptionsRequest"
+                        },
+                        "ReplaceUnhealthyInstances": {
+                            "type": "boolean"
+                        },
+                        "SpotOptions": {
+                            "$ref": "#/definitions/AWS::EC2::EC2Fleet.SpotOptionsRequest"
+                        },
+                        "TagSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::EC2Fleet.TagSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "TargetCapacitySpecification": {
+                            "$ref": "#/definitions/AWS::EC2::EC2Fleet.TargetCapacitySpecificationRequest"
+                        },
+                        "TerminateInstancesWithExpiration": {
+                            "type": "boolean"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "ValidFrom": {
+                            "type": "string"
+                        },
+                        "ValidUntil": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LaunchTemplateConfigs",
+                        "TargetCapacitySpecification"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::EC2Fleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.AcceleratorCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.AcceleratorTotalMemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.BaselineEbsBandwidthMbpsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.CapacityRebalance": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplacementStrategy": {
+                    "type": "string"
+                },
+                "TerminationDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.CapacityReservationOptionsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "UsageStrategy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.FleetLaunchTemplateConfigRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateSpecification": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.FleetLaunchTemplateSpecificationRequest"
+                },
+                "Overrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::EC2Fleet.FleetLaunchTemplateOverridesRequest"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.FleetLaunchTemplateOverridesRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "InstanceRequirements": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.InstanceRequirementsRequest"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "MaxPrice": {
+                    "type": "string"
+                },
+                "Placement": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.Placement"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "SubnetId": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.FleetLaunchTemplateSpecificationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.InstanceRequirementsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceleratorCount": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.AcceleratorCountRequest"
+                },
+                "AcceleratorManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorTotalMemoryMiB": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.AcceleratorTotalMemoryMiBRequest"
+                },
+                "AcceleratorTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BareMetal": {
+                    "type": "string"
+                },
+                "BaselineEbsBandwidthMbps": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.BaselineEbsBandwidthMbpsRequest"
+                },
+                "BurstablePerformance": {
+                    "type": "string"
+                },
+                "CpuManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExcludedInstanceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InstanceGenerations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LocalStorage": {
+                    "type": "string"
+                },
+                "LocalStorageTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MemoryGiBPerVCpu": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.MemoryGiBPerVCpuRequest"
+                },
+                "MemoryMiB": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.MemoryMiBRequest"
+                },
+                "NetworkInterfaceCount": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.NetworkInterfaceCountRequest"
+                },
+                "OnDemandMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "RequireHibernateSupport": {
+                    "type": "boolean"
+                },
+                "SpotMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "TotalLocalStorageGB": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.TotalLocalStorageGBRequest"
+                },
+                "VCpuCount": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.VCpuCountRangeRequest"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.MaintenanceStrategies": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityRebalance": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.CapacityRebalance"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.MemoryGiBPerVCpuRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.MemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.NetworkInterfaceCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.OnDemandOptionsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.CapacityReservationOptionsRequest"
+                },
+                "MaxTotalPrice": {
+                    "type": "string"
+                },
+                "MinTargetCapacity": {
+                    "type": "number"
+                },
+                "SingleAvailabilityZone": {
+                    "type": "boolean"
+                },
+                "SingleInstanceType": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.Placement": {
+            "additionalProperties": false,
+            "properties": {
+                "Affinity": {
+                    "type": "string"
+                },
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "GroupName": {
+                    "type": "string"
+                },
+                "HostId": {
+                    "type": "string"
+                },
+                "HostResourceGroupArn": {
+                    "type": "string"
+                },
+                "PartitionNumber": {
+                    "type": "number"
+                },
+                "SpreadDomain": {
+                    "type": "string"
+                },
+                "Tenancy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.SpotOptionsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "InstanceInterruptionBehavior": {
+                    "type": "string"
+                },
+                "InstancePoolsToUseCount": {
+                    "type": "number"
+                },
+                "MaintenanceStrategies": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.MaintenanceStrategies"
+                },
+                "MaxTotalPrice": {
+                    "type": "string"
+                },
+                "MinTargetCapacity": {
+                    "type": "number"
+                },
+                "SingleAvailabilityZone": {
+                    "type": "boolean"
+                },
+                "SingleInstanceType": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.TagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.TargetCapacitySpecificationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultTargetCapacityType": {
+                    "type": "string"
+                },
+                "OnDemandTargetCapacity": {
+                    "type": "number"
+                },
+                "SpotTargetCapacity": {
+                    "type": "number"
+                },
+                "TargetCapacityUnitType": {
+                    "type": "string"
+                },
+                "TotalTargetCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TotalTargetCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.TotalLocalStorageGBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.VCpuCountRangeRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EIP": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "PublicIpv4Pool": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::EIP"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EIPAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocationId": {
+                            "type": "string"
+                        },
+                        "EIP": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "PrivateIpAddress": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::EIPAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EgressOnlyInternetGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::EgressOnlyInternetGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EnclaveCertificateIamRoleAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CertificateArn": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CertificateArn",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::EnclaveCertificateIamRoleAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::FlowLog": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeliverLogsPermissionArn": {
+                            "type": "string"
+                        },
+                        "LogDestination": {
+                            "type": "string"
+                        },
+                        "LogDestinationType": {
+                            "type": "string"
+                        },
+                        "LogFormat": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "MaxAggregationInterval": {
+                            "type": "number"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "ResourceType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrafficType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourceId",
+                        "ResourceType",
+                        "TrafficType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::FlowLog"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::GatewayRouteTableAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GatewayId": {
+                            "type": "string"
+                        },
+                        "RouteTableId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GatewayId",
+                        "RouteTableId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::GatewayRouteTableAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Host": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoPlacement": {
+                            "type": "string"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "HostRecovery": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AvailabilityZone",
+                        "InstanceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::Host"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAM": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "OperatingRegions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::IPAM.IpamOperatingRegion"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::IPAM"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAM.IpamOperatingRegion": {
+            "additionalProperties": false,
+            "properties": {
+                "RegionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RegionName"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAMAllocation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Cidr": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IpamPoolId": {
+                            "type": "string"
+                        },
+                        "NetmaskLength": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "IpamPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::IPAMAllocation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAMPool": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AddressFamily": {
+                            "type": "string"
+                        },
+                        "AllocationDefaultNetmaskLength": {
+                            "type": "number"
+                        },
+                        "AllocationMaxNetmaskLength": {
+                            "type": "number"
+                        },
+                        "AllocationMinNetmaskLength": {
+                            "type": "number"
+                        },
+                        "AllocationResourceTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "AutoImport": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IpamScopeId": {
+                            "type": "string"
+                        },
+                        "Locale": {
+                            "type": "string"
+                        },
+                        "ProvisionedCidrs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::IPAMPool.ProvisionedCidr"
+                            },
+                            "type": "array"
+                        },
+                        "PubliclyAdvertisable": {
+                            "type": "boolean"
+                        },
+                        "SourceIpamPoolId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddressFamily",
+                        "IpamScopeId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::IPAMPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAMPool.ProvisionedCidr": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Cidr"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAMScope": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "IpamId": {
+                            "type": "string"
+                        },
+                        "IpamScopeType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "IpamId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::IPAMScope"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance": {
+            "additionalProperties": false,
+            "properties": {
+                "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": {
+                        "AdditionalInfo": {
+                            "type": "string"
+                        },
+                        "Affinity": {
+                            "type": "string"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "BlockDeviceMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.BlockDeviceMapping"
+                            },
+                            "type": "array"
+                        },
+                        "CpuOptions": {
+                            "$ref": "#/definitions/AWS::EC2::Instance.CpuOptions"
+                        },
+                        "CreditSpecification": {
+                            "$ref": "#/definitions/AWS::EC2::Instance.CreditSpecification"
+                        },
+                        "DisableApiTermination": {
+                            "type": "boolean"
+                        },
+                        "EbsOptimized": {
+                            "type": "boolean"
+                        },
+                        "ElasticGpuSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.ElasticGpuSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "ElasticInferenceAccelerators": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.ElasticInferenceAccelerator"
+                            },
+                            "type": "array"
+                        },
+                        "EnclaveOptions": {
+                            "$ref": "#/definitions/AWS::EC2::Instance.EnclaveOptions"
+                        },
+                        "HibernationOptions": {
+                            "$ref": "#/definitions/AWS::EC2::Instance.HibernationOptions"
+                        },
+                        "HostId": {
+                            "type": "string"
+                        },
+                        "HostResourceGroupArn": {
+                            "type": "string"
+                        },
+                        "IamInstanceProfile": {
+                            "type": "string"
+                        },
+                        "ImageId": {
+                            "type": "string"
+                        },
+                        "InstanceInitiatedShutdownBehavior": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "Ipv6AddressCount": {
+                            "type": "number"
+                        },
+                        "Ipv6Addresses": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.InstanceIpv6Address"
+                            },
+                            "type": "array"
+                        },
+                        "KernelId": {
+                            "type": "string"
+                        },
+                        "KeyName": {
+                            "type": "string"
+                        },
+                        "LaunchTemplate": {
+                            "$ref": "#/definitions/AWS::EC2::Instance.LaunchTemplateSpecification"
+                        },
+                        "LicenseSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.LicenseSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "Monitoring": {
+                            "type": "boolean"
+                        },
+                        "NetworkInterfaces": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.NetworkInterface"
+                            },
+                            "type": "array"
+                        },
+                        "PlacementGroupName": {
+                            "type": "string"
+                        },
+                        "PrivateIpAddress": {
+                            "type": "string"
+                        },
+                        "PropagateTagsToVolumeOnCreation": {
+                            "type": "boolean"
+                        },
+                        "RamdiskId": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SourceDestCheck": {
+                            "type": "boolean"
+                        },
+                        "SsmAssociations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.SsmAssociation"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Tenancy": {
+                            "type": "string"
+                        },
+                        "UserData": {
+                            "type": "string"
+                        },
+                        "Volumes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.Volume"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.AssociationParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.BlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::EC2::Instance.Ebs"
+                },
+                "NoDevice": {
+                    "$ref": "#/definitions/AWS::EC2::Instance.NoDevice"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeviceName"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.CpuOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CoreCount": {
+                    "type": "number"
+                },
+                "ThreadsPerCore": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Instance.CreditSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "CPUCredits": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Instance.Ebs": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Instance.ElasticGpuSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.ElasticInferenceAccelerator": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.EnclaveOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Instance.HibernationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Configured": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Instance.InstanceIpv6Address": {
+            "additionalProperties": false,
+            "properties": {
+                "Ipv6Address": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ipv6Address"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.LaunchTemplateSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.LicenseSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LicenseConfigurationArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LicenseConfigurationArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.NetworkInterface": {
+            "additionalProperties": false,
+            "properties": {
+                "AssociatePublicIpAddress": {
+                    "type": "boolean"
+                },
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DeviceIndex": {
+                    "type": "string"
+                },
+                "GroupSet": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Ipv6AddressCount": {
+                    "type": "number"
+                },
+                "Ipv6Addresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::Instance.InstanceIpv6Address"
+                    },
+                    "type": "array"
+                },
+                "NetworkInterfaceId": {
+                    "type": "string"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                },
+                "PrivateIpAddresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::Instance.PrivateIpAddressSpecification"
+                    },
+                    "type": "array"
+                },
+                "SecondaryPrivateIpAddressCount": {
+                    "type": "number"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeviceIndex"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.NoDevice": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::EC2::Instance.PrivateIpAddressSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Primary": {
+                    "type": "boolean"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Primary",
+                "PrivateIpAddress"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.SsmAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "AssociationParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::Instance.AssociationParameter"
+                    },
+                    "type": "array"
+                },
+                "DocumentName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DocumentName"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.Volume": {
+            "additionalProperties": false,
+            "properties": {
+                "Device": {
+                    "type": "string"
+                },
+                "VolumeId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Device",
+                "VolumeId"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::InternetGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::InternetGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LaunchTemplateData": {
+                            "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LaunchTemplateData"
+                        },
+                        "LaunchTemplateName": {
+                            "type": "string"
+                        },
+                        "TagSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LaunchTemplateTagSpecification"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::LaunchTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.AcceleratorCount": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.AcceleratorTotalMemoryMiB": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.BaselineEbsBandwidthMbps": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.BlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.Ebs"
+                },
+                "NoDevice": {
+                    "type": "string"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.CapacityReservationSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityReservationPreference": {
+                    "type": "string"
+                },
+                "CapacityReservationTarget": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.CapacityReservationTarget"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.CapacityReservationTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityReservationId": {
+                    "type": "string"
+                },
+                "CapacityReservationResourceGroupArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.CpuOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CoreCount": {
+                    "type": "number"
+                },
+                "ThreadsPerCore": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.CreditSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "CpuCredits": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.Ebs": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "Throughput": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.ElasticGpuSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.EnclaveOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.HibernationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Configured": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.IamInstanceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.InstanceMarketOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "MarketType": {
+                    "type": "string"
+                },
+                "SpotOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.SpotOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.Ipv6Add": {
+            "additionalProperties": false,
+            "properties": {
+                "Ipv6Address": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.LaunchTemplateData": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockDeviceMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.BlockDeviceMapping"
+                    },
+                    "type": "array"
+                },
+                "CapacityReservationSpecification": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.CapacityReservationSpecification"
+                },
+                "CpuOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.CpuOptions"
+                },
+                "CreditSpecification": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.CreditSpecification"
+                },
+                "DisableApiTermination": {
+                    "type": "boolean"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                },
+                "ElasticGpuSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.ElasticGpuSpecification"
+                    },
+                    "type": "array"
+                },
+                "ElasticInferenceAccelerators": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LaunchTemplateElasticInferenceAccelerator"
+                    },
+                    "type": "array"
+                },
+                "EnclaveOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.EnclaveOptions"
+                },
+                "HibernationOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.HibernationOptions"
+                },
+                "IamInstanceProfile": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.IamInstanceProfile"
+                },
+                "ImageId": {
+                    "type": "string"
+                },
+                "InstanceInitiatedShutdownBehavior": {
+                    "type": "string"
+                },
+                "InstanceMarketOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.InstanceMarketOptions"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "KernelId": {
+                    "type": "string"
+                },
+                "KeyName": {
+                    "type": "string"
+                },
+                "LicenseSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LicenseSpecification"
+                    },
+                    "type": "array"
+                },
+                "MetadataOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.MetadataOptions"
+                },
+                "Monitoring": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.Monitoring"
+                },
+                "NetworkInterfaces": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.NetworkInterface"
+                    },
+                    "type": "array"
+                },
+                "Placement": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.Placement"
+                },
+                "RamDiskId": {
+                    "type": "string"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TagSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.TagSpecification"
+                    },
+                    "type": "array"
+                },
+                "UserData": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.LaunchTemplateElasticInferenceAccelerator": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.LaunchTemplateTagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.LicenseSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LicenseConfigurationArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.MemoryGiBPerVCpu": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.MemoryMiB": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.MetadataOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpEndpoint": {
+                    "type": "string"
+                },
+                "HttpProtocolIpv6": {
+                    "type": "string"
+                },
+                "HttpPutResponseHopLimit": {
+                    "type": "number"
+                },
+                "HttpTokens": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.Monitoring": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.NetworkInterface": {
+            "additionalProperties": false,
+            "properties": {
+                "AssociateCarrierIpAddress": {
+                    "type": "boolean"
+                },
+                "AssociatePublicIpAddress": {
+                    "type": "boolean"
+                },
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DeviceIndex": {
+                    "type": "number"
+                },
+                "Groups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InterfaceType": {
+                    "type": "string"
+                },
+                "Ipv6AddressCount": {
+                    "type": "number"
+                },
+                "Ipv6Addresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.Ipv6Add"
+                    },
+                    "type": "array"
+                },
+                "NetworkCardIndex": {
+                    "type": "number"
+                },
+                "NetworkInterfaceId": {
+                    "type": "string"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                },
+                "PrivateIpAddresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.PrivateIpAdd"
+                    },
+                    "type": "array"
+                },
+                "SecondaryPrivateIpAddressCount": {
+                    "type": "number"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.NetworkInterfaceCount": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.Placement": {
+            "additionalProperties": false,
+            "properties": {
+                "Affinity": {
+                    "type": "string"
+                },
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "GroupName": {
+                    "type": "string"
+                },
+                "HostId": {
+                    "type": "string"
+                },
+                "HostResourceGroupArn": {
+                    "type": "string"
+                },
+                "PartitionNumber": {
+                    "type": "number"
+                },
+                "SpreadDomain": {
+                    "type": "string"
+                },
+                "Tenancy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.PrivateIpAdd": {
+            "additionalProperties": false,
+            "properties": {
+                "Primary": {
+                    "type": "boolean"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.SpotOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockDurationMinutes": {
+                    "type": "number"
+                },
+                "InstanceInterruptionBehavior": {
+                    "type": "string"
+                },
+                "MaxPrice": {
+                    "type": "string"
+                },
+                "SpotInstanceType": {
+                    "type": "string"
+                },
+                "ValidUntil": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.TagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.TotalLocalStorageGB": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.VCpuCount": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LocalGatewayRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "LocalGatewayRouteTableId": {
+                            "type": "string"
+                        },
+                        "LocalGatewayVirtualInterfaceGroupId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationCidrBlock",
+                        "LocalGatewayRouteTableId",
+                        "LocalGatewayVirtualInterfaceGroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::LocalGatewayRoute"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::LocalGatewayRouteTableVPCAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LocalGatewayRouteTableId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LocalGatewayRouteTableId",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::LocalGatewayRouteTableVPCAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NatGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocationId": {
+                            "type": "string"
+                        },
+                        "ConnectivityType": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NatGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkAcl": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkAcl"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkAclEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CidrBlock": {
+                            "type": "string"
+                        },
+                        "Egress": {
+                            "type": "boolean"
+                        },
+                        "Icmp": {
+                            "$ref": "#/definitions/AWS::EC2::NetworkAclEntry.Icmp"
+                        },
+                        "Ipv6CidrBlock": {
+                            "type": "string"
+                        },
+                        "NetworkAclId": {
+                            "type": "string"
+                        },
+                        "PortRange": {
+                            "$ref": "#/definitions/AWS::EC2::NetworkAclEntry.PortRange"
+                        },
+                        "Protocol": {
+                            "type": "number"
+                        },
+                        "RuleAction": {
+                            "type": "string"
+                        },
+                        "RuleNumber": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "NetworkAclId",
+                        "Protocol",
+                        "RuleAction",
+                        "RuleNumber"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkAclEntry"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkAclEntry.Icmp": {
+            "additionalProperties": false,
+            "properties": {
+                "Code": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkAclEntry.PortRange": {
+            "additionalProperties": false,
+            "properties": {
+                "From": {
+                    "type": "number"
+                },
+                "To": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FilterInArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "NetworkInsightsPathId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "NetworkInsightsPathId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkInsightsAnalysis"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AlternatePathHint": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentArn": {
+                    "type": "string"
+                },
+                "ComponentId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Egress": {
+                    "type": "boolean"
+                },
+                "PortRange": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.PortRange"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "RuleAction": {
+                    "type": "string"
+                },
+                "RuleNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerListener": {
+            "additionalProperties": false,
+            "properties": {
+                "InstancePort": {
+                    "type": "number"
+                },
+                "LoadBalancerPort": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "Instance": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationAddresses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DestinationPortRanges": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.PortRange"
+                    },
+                    "type": "array"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "SourceAddresses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SourcePortRanges": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.PortRange"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisRouteTableRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "NatGatewayId": {
+                    "type": "string"
+                },
+                "NetworkInterfaceId": {
+                    "type": "string"
+                },
+                "Origin": {
+                    "type": "string"
+                },
+                "TransitGatewayId": {
+                    "type": "string"
+                },
+                "VpcPeeringConnectionId": {
+                    "type": "string"
+                },
+                "destinationCidr": {
+                    "type": "string"
+                },
+                "destinationPrefixListId": {
+                    "type": "string"
+                },
+                "egressOnlyInternetGatewayId": {
+                    "type": "string"
+                },
+                "gatewayId": {
+                    "type": "string"
+                },
+                "instanceId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisSecurityGroupRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Direction": {
+                    "type": "string"
+                },
+                "PortRange": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.PortRange"
+                },
+                "PrefixListId": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "SecurityGroupId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.Explanation": {
+            "additionalProperties": false,
+            "properties": {
+                "Acl": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "AclRule": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule"
+                },
+                "Address": {
+                    "type": "string"
+                },
+                "Addresses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AttachedTo": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "AvailabilityZones": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Cidrs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ClassicLoadBalancerListener": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerListener"
+                },
+                "Component": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "CustomerGateway": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "DestinationVpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Direction": {
+                    "type": "string"
+                },
+                "ElasticLoadBalancerListener": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "ExplanationCode": {
+                    "type": "string"
+                },
+                "IngressRouteTable": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "InternetGateway": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "LoadBalancerArn": {
+                    "type": "string"
+                },
+                "LoadBalancerListenerPort": {
+                    "type": "number"
+                },
+                "LoadBalancerTarget": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerTarget"
+                },
+                "LoadBalancerTargetGroup": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "LoadBalancerTargetGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                    },
+                    "type": "array"
+                },
+                "LoadBalancerTargetPort": {
+                    "type": "number"
+                },
+                "MissingComponent": {
+                    "type": "string"
+                },
+                "NatGateway": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "NetworkInterface": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "PacketField": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "PortRanges": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.PortRange"
+                    },
+                    "type": "array"
+                },
+                "PrefixList": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Protocols": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RouteTable": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "RouteTableRoute": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisRouteTableRoute"
+                },
+                "SecurityGroup": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "SecurityGroupRule": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisSecurityGroupRule"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                    },
+                    "type": "array"
+                },
+                "SourceVpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "State": {
+                    "type": "string"
+                },
+                "Subnet": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "SubnetRouteTable": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Vpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "VpcPeeringConnection": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "VpnConnection": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "VpnGateway": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "vpcEndpoint": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.PathComponent": {
+            "additionalProperties": false,
+            "properties": {
+                "AclRule": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule"
+                },
+                "Component": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "DestinationVpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "InboundHeader": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader"
+                },
+                "OutboundHeader": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader"
+                },
+                "RouteTableRoute": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisRouteTableRoute"
+                },
+                "SecurityGroupRule": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisSecurityGroupRule"
+                },
+                "SequenceNumber": {
+                    "type": "number"
+                },
+                "SourceVpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Subnet": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Vpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.PortRange": {
+            "additionalProperties": false,
+            "properties": {
+                "From": {
+                    "type": "number"
+                },
+                "To": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsPath": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Destination": {
+                            "type": "string"
+                        },
+                        "DestinationIp": {
+                            "type": "string"
+                        },
+                        "DestinationPort": {
+                            "type": "number"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "Source": {
+                            "type": "string"
+                        },
+                        "SourceIp": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Destination",
+                        "Protocol",
+                        "Source"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkInsightsPath"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInterface": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "GroupSet": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "InterfaceType": {
+                            "type": "string"
+                        },
+                        "Ipv6AddressCount": {
+                            "type": "number"
+                        },
+                        "Ipv6Addresses": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::NetworkInterface.InstanceIpv6Address"
+                            },
+                            "type": "array"
+                        },
+                        "PrivateIpAddress": {
+                            "type": "string"
+                        },
+                        "PrivateIpAddresses": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::NetworkInterface.PrivateIpAddressSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "SecondaryPrivateIpAddressCount": {
+                            "type": "number"
+                        },
+                        "SourceDestCheck": {
+                            "type": "boolean"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkInterface"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInterface.InstanceIpv6Address": {
+            "additionalProperties": false,
+            "properties": {
+                "Ipv6Address": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ipv6Address"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInterface.PrivateIpAddressSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Primary": {
+                    "type": "boolean"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Primary",
+                "PrivateIpAddress"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInterfaceAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeleteOnTermination": {
+                            "type": "boolean"
+                        },
+                        "DeviceIndex": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DeviceIndex",
+                        "InstanceId",
+                        "NetworkInterfaceId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkInterfaceAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInterfacePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "Permission": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AwsAccountId",
+                        "NetworkInterfaceId",
+                        "Permission"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkInterfacePermission"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::PlacementGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Strategy": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::PlacementGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::PrefixList": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AddressFamily": {
+                            "type": "string"
+                        },
+                        "Entries": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::PrefixList.Entry"
+                            },
+                            "type": "array"
+                        },
+                        "MaxEntries": {
+                            "type": "number"
+                        },
+                        "PrefixListName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddressFamily",
+                        "MaxEntries",
+                        "PrefixListName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::PrefixList"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::PrefixList.Entry": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Cidr"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Route": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CarrierGatewayId": {
+                            "type": "string"
+                        },
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "DestinationIpv6CidrBlock": {
+                            "type": "string"
+                        },
+                        "EgressOnlyInternetGatewayId": {
+                            "type": "string"
+                        },
+                        "GatewayId": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "LocalGatewayId": {
+                            "type": "string"
+                        },
+                        "NatGatewayId": {
+                            "type": "string"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "RouteTableId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        },
+                        "VpcEndpointId": {
+                            "type": "string"
+                        },
+                        "VpcPeeringConnectionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RouteTableId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::Route"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::RouteTable": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::RouteTable"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupDescription": {
+                            "type": "string"
+                        },
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "SecurityGroupEgress": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::SecurityGroup.Egress"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityGroupIngress": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::SecurityGroup.Ingress"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GroupDescription"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SecurityGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SecurityGroup.Egress": {
+            "additionalProperties": false,
+            "properties": {
+                "CidrIp": {
+                    "type": "string"
+                },
+                "CidrIpv6": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DestinationPrefixListId": {
+                    "type": "string"
+                },
+                "DestinationSecurityGroupId": {
+                    "type": "string"
+                },
+                "FromPort": {
+                    "type": "number"
+                },
+                "IpProtocol": {
+                    "type": "string"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "IpProtocol"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SecurityGroup.Ingress": {
+            "additionalProperties": false,
+            "properties": {
+                "CidrIp": {
+                    "type": "string"
+                },
+                "CidrIpv6": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "FromPort": {
+                    "type": "number"
+                },
+                "IpProtocol": {
+                    "type": "string"
+                },
+                "SourcePrefixListId": {
+                    "type": "string"
+                },
+                "SourceSecurityGroupId": {
+                    "type": "string"
+                },
+                "SourceSecurityGroupName": {
+                    "type": "string"
+                },
+                "SourceSecurityGroupOwnerId": {
+                    "type": "string"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "IpProtocol"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SecurityGroupEgress": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CidrIp": {
+                            "type": "string"
+                        },
+                        "CidrIpv6": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DestinationPrefixListId": {
+                            "type": "string"
+                        },
+                        "DestinationSecurityGroupId": {
+                            "type": "string"
+                        },
+                        "FromPort": {
+                            "type": "number"
+                        },
+                        "GroupId": {
+                            "type": "string"
+                        },
+                        "IpProtocol": {
+                            "type": "string"
+                        },
+                        "ToPort": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "GroupId",
+                        "IpProtocol"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SecurityGroupEgress"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SecurityGroupIngress": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CidrIp": {
+                            "type": "string"
+                        },
+                        "CidrIpv6": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FromPort": {
+                            "type": "number"
+                        },
+                        "GroupId": {
+                            "type": "string"
+                        },
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "IpProtocol": {
+                            "type": "string"
+                        },
+                        "SourcePrefixListId": {
+                            "type": "string"
+                        },
+                        "SourceSecurityGroupId": {
+                            "type": "string"
+                        },
+                        "SourceSecurityGroupName": {
+                            "type": "string"
+                        },
+                        "SourceSecurityGroupOwnerId": {
+                            "type": "string"
+                        },
+                        "ToPort": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "IpProtocol"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SecurityGroupIngress"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SpotFleetRequestConfigData": {
+                            "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotFleetRequestConfigData"
+                        }
+                    },
+                    "required": [
+                        "SpotFleetRequestConfigData"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SpotFleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.AcceleratorCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.AcceleratorTotalMemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.BaselineEbsBandwidthMbpsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.BlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.EbsBlockDevice"
+                },
+                "NoDevice": {
+                    "type": "string"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeviceName"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.ClassicLoadBalancer": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.ClassicLoadBalancersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClassicLoadBalancers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.ClassicLoadBalancer"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ClassicLoadBalancers"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.EbsBlockDevice": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.FleetLaunchTemplateSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.GroupIdentifier": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupId"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.IamInstanceProfileSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.InstanceIpv6Address": {
+            "additionalProperties": false,
+            "properties": {
+                "Ipv6Address": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ipv6Address"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.InstanceNetworkInterfaceSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AssociatePublicIpAddress": {
+                    "type": "boolean"
+                },
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DeviceIndex": {
+                    "type": "number"
+                },
+                "Groups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Ipv6AddressCount": {
+                    "type": "number"
+                },
+                "Ipv6Addresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.InstanceIpv6Address"
+                    },
+                    "type": "array"
+                },
+                "NetworkInterfaceId": {
+                    "type": "string"
+                },
+                "PrivateIpAddresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.PrivateIpAddressSpecification"
+                    },
+                    "type": "array"
+                },
+                "SecondaryPrivateIpAddressCount": {
+                    "type": "number"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.InstanceRequirementsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceleratorCount": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.AcceleratorCountRequest"
+                },
+                "AcceleratorManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorTotalMemoryMiB": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.AcceleratorTotalMemoryMiBRequest"
+                },
+                "AcceleratorTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BareMetal": {
+                    "type": "string"
+                },
+                "BaselineEbsBandwidthMbps": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.BaselineEbsBandwidthMbpsRequest"
+                },
+                "BurstablePerformance": {
+                    "type": "string"
+                },
+                "CpuManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExcludedInstanceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InstanceGenerations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LocalStorage": {
+                    "type": "string"
+                },
+                "LocalStorageTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MemoryGiBPerVCpu": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.MemoryGiBPerVCpuRequest"
+                },
+                "MemoryMiB": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.MemoryMiBRequest"
+                },
+                "NetworkInterfaceCount": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.NetworkInterfaceCountRequest"
+                },
+                "OnDemandMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "RequireHibernateSupport": {
+                    "type": "boolean"
+                },
+                "SpotMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "TotalLocalStorageGB": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.TotalLocalStorageGBRequest"
+                },
+                "VCpuCount": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.VCpuCountRangeRequest"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.LaunchTemplateConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateSpecification": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.FleetLaunchTemplateSpecification"
+                },
+                "Overrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.LaunchTemplateOverrides"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.LaunchTemplateOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "InstanceRequirements": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.InstanceRequirementsRequest"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "SpotPrice": {
+                    "type": "string"
+                },
+                "SubnetId": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.LoadBalancersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClassicLoadBalancersConfig": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.ClassicLoadBalancersConfig"
+                },
+                "TargetGroupsConfig": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.TargetGroupsConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.MemoryGiBPerVCpuRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.MemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.NetworkInterfaceCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.PrivateIpAddressSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Primary": {
+                    "type": "boolean"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PrivateIpAddress"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotCapacityRebalance": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplacementStrategy": {
+                    "type": "string"
+                },
+                "TerminationDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotFleetLaunchSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockDeviceMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.BlockDeviceMapping"
+                    },
+                    "type": "array"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                },
+                "IamInstanceProfile": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.IamInstanceProfileSpecification"
+                },
+                "ImageId": {
+                    "type": "string"
+                },
+                "InstanceRequirements": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.InstanceRequirementsRequest"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "KernelId": {
+                    "type": "string"
+                },
+                "KeyName": {
+                    "type": "string"
+                },
+                "Monitoring": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotFleetMonitoring"
+                },
+                "NetworkInterfaces": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.InstanceNetworkInterfaceSpecification"
+                    },
+                    "type": "array"
+                },
+                "Placement": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotPlacement"
+                },
+                "RamdiskId": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.GroupIdentifier"
+                    },
+                    "type": "array"
+                },
+                "SpotPrice": {
+                    "type": "string"
+                },
+                "SubnetId": {
+                    "type": "string"
+                },
+                "TagSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotFleetTagSpecification"
+                    },
+                    "type": "array"
+                },
+                "UserData": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ImageId"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotFleetMonitoring": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotFleetRequestConfigData": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "Context": {
+                    "type": "string"
+                },
+                "ExcessCapacityTerminationPolicy": {
+                    "type": "string"
+                },
+                "IamFleetRole": {
+                    "type": "string"
+                },
+                "InstanceInterruptionBehavior": {
+                    "type": "string"
+                },
+                "InstancePoolsToUseCount": {
+                    "type": "number"
+                },
+                "LaunchSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotFleetLaunchSpecification"
+                    },
+                    "type": "array"
+                },
+                "LaunchTemplateConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.LaunchTemplateConfig"
+                    },
+                    "type": "array"
+                },
+                "LoadBalancersConfig": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.LoadBalancersConfig"
+                },
+                "OnDemandAllocationStrategy": {
+                    "type": "string"
+                },
+                "OnDemandMaxTotalPrice": {
+                    "type": "string"
+                },
+                "OnDemandTargetCapacity": {
+                    "type": "number"
+                },
+                "ReplaceUnhealthyInstances": {
+                    "type": "boolean"
+                },
+                "SpotMaintenanceStrategies": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotMaintenanceStrategies"
+                },
+                "SpotMaxTotalPrice": {
+                    "type": "string"
+                },
+                "SpotPrice": {
+                    "type": "string"
+                },
+                "TargetCapacity": {
+                    "type": "number"
+                },
+                "TargetCapacityUnitType": {
+                    "type": "string"
+                },
+                "TerminateInstancesWithExpiration": {
+                    "type": "boolean"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "ValidFrom": {
+                    "type": "string"
+                },
+                "ValidUntil": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IamFleetRole",
+                "TargetCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotFleetTagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotMaintenanceStrategies": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityRebalance": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotCapacityRebalance"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotPlacement": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "GroupName": {
+                    "type": "string"
+                },
+                "Tenancy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.TargetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.TargetGroupsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.TargetGroup"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "TargetGroups"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.TotalLocalStorageGBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.VCpuCountRangeRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Subnet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssignIpv6AddressOnCreation": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "CidrBlock": {
+                            "type": "string"
+                        },
+                        "Ipv6CidrBlock": {
+                            "type": "string"
+                        },
+                        "MapPublicIpOnLaunch": {
+                            "type": "boolean"
+                        },
+                        "OutpostArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CidrBlock",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::Subnet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SubnetCidrBlock": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Ipv6CidrBlock": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Ipv6CidrBlock",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SubnetCidrBlock"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SubnetNetworkAclAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "NetworkAclId": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "NetworkAclId",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SubnetNetworkAclAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SubnetRouteTableAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RouteTableId": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RouteTableId",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SubnetRouteTableAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TrafficMirrorFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "NetworkServices": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TrafficMirrorFilter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TrafficMirrorFilterRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "DestinationPortRange": {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange"
+                        },
+                        "Protocol": {
+                            "type": "number"
+                        },
+                        "RuleAction": {
+                            "type": "string"
+                        },
+                        "RuleNumber": {
+                            "type": "number"
+                        },
+                        "SourceCidrBlock": {
+                            "type": "string"
+                        },
+                        "SourcePortRange": {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange"
+                        },
+                        "TrafficDirection": {
+                            "type": "string"
+                        },
+                        "TrafficMirrorFilterId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationCidrBlock",
+                        "RuleAction",
+                        "RuleNumber",
+                        "SourceCidrBlock",
+                        "TrafficDirection",
+                        "TrafficMirrorFilterId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TrafficMirrorFilterRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange": {
+            "additionalProperties": false,
+            "properties": {
+                "FromPort": {
+                    "type": "number"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FromPort",
+                "ToPort"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TrafficMirrorSession": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "PacketLength": {
+                            "type": "number"
+                        },
+                        "SessionNumber": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrafficMirrorFilterId": {
+                            "type": "string"
+                        },
+                        "TrafficMirrorTargetId": {
+                            "type": "string"
+                        },
+                        "VirtualNetworkId": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "NetworkInterfaceId",
+                        "SessionNumber",
+                        "TrafficMirrorFilterId",
+                        "TrafficMirrorTargetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TrafficMirrorSession"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TrafficMirrorTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "NetworkLoadBalancerArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TrafficMirrorTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AmazonSideAsn": {
+                            "type": "number"
+                        },
+                        "AssociationDefaultRouteTableId": {
+                            "type": "string"
+                        },
+                        "AutoAcceptSharedAttachments": {
+                            "type": "string"
+                        },
+                        "DefaultRouteTableAssociation": {
+                            "type": "string"
+                        },
+                        "DefaultRouteTablePropagation": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DnsSupport": {
+                            "type": "string"
+                        },
+                        "MulticastSupport": {
+                            "type": "string"
+                        },
+                        "PropagationDefaultRouteTableId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayCidrBlocks": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpnEcmpSupport": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SubnetIds",
+                        "TransitGatewayId",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayConnect": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Options": {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayConnect.TransitGatewayConnectOptions"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransportTransitGatewayAttachmentId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Options",
+                        "TransportTransitGatewayAttachmentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayConnect"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayConnect.TransitGatewayConnectOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayMulticastDomain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Options": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TransitGatewayId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayMulticastDomain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayMulticastDomainAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayMulticastDomainId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SubnetId",
+                        "TransitGatewayAttachmentId",
+                        "TransitGatewayMulticastDomainId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayMulticastDomainAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayMulticastGroupMember": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupIpAddress": {
+                            "type": "string"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayMulticastDomainId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GroupIpAddress",
+                        "NetworkInterfaceId",
+                        "TransitGatewayMulticastDomainId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayMulticastGroupMember"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayMulticastGroupSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupIpAddress": {
+                            "type": "string"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayMulticastDomainId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GroupIpAddress",
+                        "NetworkInterfaceId",
+                        "TransitGatewayMulticastDomainId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayMulticastGroupSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayPeeringAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Options": {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayPeeringAttachment.TransitGatewayPeeringAttachmentOptions"
+                        },
+                        "PeerAccountId": {
+                            "type": "string"
+                        },
+                        "PeerRegion": {
+                            "type": "string"
+                        },
+                        "PeerTransitGatewayId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PeerAccountId",
+                        "PeerRegion",
+                        "PeerTransitGatewayId",
+                        "TransitGatewayId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayPeeringAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayPeeringAttachment.TransitGatewayPeeringAttachmentOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DynamicRouting": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Blackhole": {
+                            "type": "boolean"
+                        },
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "TransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayRouteTableId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TransitGatewayRouteTableId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayRoute"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayRouteTable": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TransitGatewayId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayRouteTable"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayRouteTableAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "TransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayRouteTableId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TransitGatewayAttachmentId",
+                        "TransitGatewayRouteTableId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayRouteTableAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayRouteTablePropagation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "TransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayRouteTableId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TransitGatewayAttachmentId",
+                        "TransitGatewayRouteTableId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayRouteTablePropagation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayVpcAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AddSubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Options": {
+                            "type": "object"
+                        },
+                        "RemoveSubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayVpcAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPC": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CidrBlock": {
+                            "type": "string"
+                        },
+                        "EnableDnsHostnames": {
+                            "type": "boolean"
+                        },
+                        "EnableDnsSupport": {
+                            "type": "boolean"
+                        },
+                        "InstanceTenancy": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CidrBlock"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPC"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCCidrBlock": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AmazonProvidedIpv6CidrBlock": {
+                            "type": "boolean"
+                        },
+                        "CidrBlock": {
+                            "type": "string"
+                        },
+                        "Ipv6CidrBlock": {
+                            "type": "string"
+                        },
+                        "Ipv6Pool": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCCidrBlock"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCDHCPOptionsAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DhcpOptionsId": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DhcpOptionsId",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCDHCPOptionsAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "PrivateDnsEnabled": {
+                            "type": "boolean"
+                        },
+                        "RouteTableIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpcEndpointType": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ServiceName",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCEndpointConnectionNotification": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionEvents": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ConnectionNotificationArn": {
+                            "type": "string"
+                        },
+                        "ServiceId": {
+                            "type": "string"
+                        },
+                        "VPCEndpointId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConnectionEvents",
+                        "ConnectionNotificationArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCEndpointConnectionNotification"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCEndpointService": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptanceRequired": {
+                            "type": "boolean"
+                        },
+                        "GatewayLoadBalancerArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "NetworkLoadBalancerArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCEndpointService"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCEndpointServicePermissions": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowedPrincipals": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ServiceId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCEndpointServicePermissions"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCGatewayAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InternetGatewayId": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        },
+                        "VpnGatewayId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCGatewayAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCPeeringConnection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PeerOwnerId": {
+                            "type": "string"
+                        },
+                        "PeerRegion": {
+                            "type": "string"
+                        },
+                        "PeerRoleArn": {
+                            "type": "string"
+                        },
+                        "PeerVpcId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PeerVpcId",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCPeeringConnection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPNConnection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomerGatewayId": {
+                            "type": "string"
+                        },
+                        "StaticRoutesOnly": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "VpnGatewayId": {
+                            "type": "string"
+                        },
+                        "VpnTunnelOptionsSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::VPNConnection.VpnTunnelOptionsSpecification"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CustomerGatewayId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPNConnection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPNConnection.VpnTunnelOptionsSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PreSharedKey": {
+                    "type": "string"
+                },
+                "TunnelInsideCidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::VPNConnectionRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "VpnConnectionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationCidrBlock",
+                        "VpnConnectionId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPNConnectionRoute"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPNGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AmazonSideAsn": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPNGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPNGatewayRoutePropagation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RouteTableIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpnGatewayId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RouteTableIds",
+                        "VpnGatewayId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPNGatewayRoutePropagation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Volume": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoEnableIO": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "Encrypted": {
+                            "type": "boolean"
+                        },
+                        "Iops": {
+                            "type": "number"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MultiAttachEnabled": {
+                            "type": "boolean"
+                        },
+                        "OutpostArn": {
+                            "type": "string"
+                        },
+                        "Size": {
+                            "type": "number"
+                        },
+                        "SnapshotId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Throughput": {
+                            "type": "number"
+                        },
+                        "VolumeType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AvailabilityZone"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::Volume"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VolumeAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Device": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "VolumeId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Device",
+                        "InstanceId",
+                        "VolumeId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VolumeAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::PublicRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RepositoryCatalogData": {
+                            "type": "object"
+                        },
+                        "RepositoryName": {
+                            "type": "string"
+                        },
+                        "RepositoryPolicyText": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECR::PublicRepository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::RegistryPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyText": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "PolicyText"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECR::RegistryPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::ReplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ReplicationConfiguration": {
+                            "$ref": "#/definitions/AWS::ECR::ReplicationConfiguration.ReplicationConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ReplicationConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECR::ReplicationConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::ReplicationConfiguration.ReplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECR::ReplicationConfiguration.ReplicationRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::ReplicationConfiguration.ReplicationDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "Region": {
+                    "type": "string"
+                },
+                "RegistryId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region",
+                "RegistryId"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::ReplicationConfiguration.ReplicationRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Destinations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECR::ReplicationConfiguration.ReplicationDestination"
+                    },
+                    "type": "array"
+                },
+                "RepositoryFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECR::ReplicationConfiguration.RepositoryFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Destinations"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::ReplicationConfiguration.RepositoryFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Filter": {
+                    "type": "string"
+                },
+                "FilterType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Filter",
+                "FilterType"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::Repository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::ECR::Repository.EncryptionConfiguration"
+                        },
+                        "ImageScanningConfiguration": {
+                            "$ref": "#/definitions/AWS::ECR::Repository.ImageScanningConfiguration"
+                        },
+                        "ImageTagMutability": {
+                            "type": "string"
+                        },
+                        "LifecyclePolicy": {
+                            "$ref": "#/definitions/AWS::ECR::Repository.LifecyclePolicy"
+                        },
+                        "RepositoryName": {
+                            "type": "string"
+                        },
+                        "RepositoryPolicyText": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECR::Repository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::Repository.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionType": {
+                    "type": "string"
+                },
+                "KmsKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionType"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::Repository.ImageScanningConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ScanOnPush": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECR::Repository.LifecyclePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "LifecyclePolicyText": {
+                    "type": "string"
+                },
+                "RegistryId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::CapacityProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingGroupProvider": {
+                            "$ref": "#/definitions/AWS::ECS::CapacityProvider.AutoScalingGroupProvider"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupProvider"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::CapacityProvider"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::CapacityProvider.AutoScalingGroupProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoScalingGroupArn": {
+                    "type": "string"
+                },
+                "ManagedScaling": {
+                    "$ref": "#/definitions/AWS::ECS::CapacityProvider.ManagedScaling"
+                },
+                "ManagedTerminationProtection": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AutoScalingGroupArn"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::CapacityProvider.ManagedScaling": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceWarmupPeriod": {
+                    "type": "number"
+                },
+                "MaximumScalingStepSize": {
+                    "type": "number"
+                },
+                "MinimumScalingStepSize": {
+                    "type": "number"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "TargetCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "ClusterSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Cluster.ClusterSettings"
+                            },
+                            "type": "array"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::ECS::Cluster.ClusterConfiguration"
+                        },
+                        "DefaultCapacityProviderStrategy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Cluster.CapacityProviderStrategyItem"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Cluster.CapacityProviderStrategyItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Base": {
+                    "type": "number"
+                },
+                "CapacityProvider": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Cluster.ClusterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecuteCommandConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::Cluster.ExecuteCommandConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Cluster.ClusterSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Cluster.ExecuteCommandConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "LogConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::Cluster.ExecuteCommandLogConfiguration"
+                },
+                "Logging": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Cluster.ExecuteCommandLogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchEncryptionEnabled": {
+                    "type": "boolean"
+                },
+                "CloudWatchLogGroupName": {
+                    "type": "string"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3EncryptionEnabled": {
+                    "type": "boolean"
+                },
+                "S3KeyPrefix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::ClusterCapacityProviderAssociations": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Cluster": {
+                            "type": "string"
+                        },
+                        "Service": {
+                            "type": "string"
+                        },
+                        "TaskSetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Cluster",
+                        "Service",
+                        "TaskSetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::PrimaryTaskSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Service": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CapacityProviderStrategy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Service.CapacityProviderStrategyItem"
+                            },
+                            "type": "array"
+                        },
+                        "Cluster": {
+                            "type": "string"
+                        },
+                        "DeploymentConfiguration": {
+                            "$ref": "#/definitions/AWS::ECS::Service.DeploymentConfiguration"
+                        },
+                        "DeploymentController": {
+                            "$ref": "#/definitions/AWS::ECS::Service.DeploymentController"
+                        },
+                        "DesiredCount": {
+                            "type": "number"
+                        },
+                        "EnableECSManagedTags": {
+                            "type": "boolean"
+                        },
+                        "EnableExecuteCommand": {
+                            "type": "boolean"
+                        },
+                        "HealthCheckGracePeriodSeconds": {
+                            "type": "number"
+                        },
+                        "LaunchType": {
+                            "type": "string"
+                        },
+                        "LoadBalancers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Service.LoadBalancer"
+                            },
+                            "type": "array"
+                        },
+                        "NetworkConfiguration": {
+                            "$ref": "#/definitions/AWS::ECS::Service.NetworkConfiguration"
+                        },
+                        "PlacementConstraints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Service.PlacementConstraint"
+                            },
+                            "type": "array"
+                        },
+                        "PlacementStrategies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Service.PlacementStrategy"
+                            },
+                            "type": "array"
+                        },
+                        "PlatformVersion": {
+                            "type": "string"
+                        },
+                        "PropagateTags": {
+                            "type": "string"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "SchedulingStrategy": {
+                            "type": "string"
+                        },
+                        "ServiceName": {
+                            "type": "string"
+                        },
+                        "ServiceRegistries": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Service.ServiceRegistry"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TaskDefinition": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::Service"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Service.AwsVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AssignPublicIp": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.CapacityProviderStrategyItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Base": {
+                    "type": "number"
+                },
+                "CapacityProvider": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.DeploymentCircuitBreaker": {
+            "additionalProperties": false,
+            "properties": {
+                "Enable": {
+                    "type": "boolean"
+                },
+                "Rollback": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enable",
+                "Rollback"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Service.DeploymentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeploymentCircuitBreaker": {
+                    "$ref": "#/definitions/AWS::ECS::Service.DeploymentCircuitBreaker"
+                },
+                "MaximumPercent": {
+                    "type": "number"
+                },
+                "MinimumHealthyPercent": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.DeploymentController": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.LoadBalancer": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerName": {
+                    "type": "string"
+                },
+                "ContainerPort": {
+                    "type": "number"
+                },
+                "LoadBalancerName": {
+                    "type": "string"
+                },
+                "TargetGroupArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsvpcConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::Service.AwsVpcConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.PlacementConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Service.PlacementStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "Field": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Service.ServiceRegistry": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerName": {
+                    "type": "string"
+                },
+                "ContainerPort": {
+                    "type": "number"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "RegistryArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContainerDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskDefinition.ContainerDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "Cpu": {
+                            "type": "string"
+                        },
+                        "EphemeralStorage": {
+                            "$ref": "#/definitions/AWS::ECS::TaskDefinition.EphemeralStorage"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "Family": {
+                            "type": "string"
+                        },
+                        "InferenceAccelerators": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskDefinition.InferenceAccelerator"
+                            },
+                            "type": "array"
+                        },
+                        "IpcMode": {
+                            "type": "string"
+                        },
+                        "Memory": {
+                            "type": "string"
+                        },
+                        "NetworkMode": {
+                            "type": "string"
+                        },
+                        "PidMode": {
+                            "type": "string"
+                        },
+                        "PlacementConstraints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskDefinition.TaskDefinitionPlacementConstraint"
+                            },
+                            "type": "array"
+                        },
+                        "ProxyConfiguration": {
+                            "$ref": "#/definitions/AWS::ECS::TaskDefinition.ProxyConfiguration"
+                        },
+                        "RequiresCompatibilities": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RuntimePlatform": {
+                            "$ref": "#/definitions/AWS::ECS::TaskDefinition.RuntimePlatform"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TaskRoleArn": {
+                            "type": "string"
+                        },
+                        "Volumes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskDefinition.Volume"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::TaskDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.AuthorizationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessPointId": {
+                    "type": "string"
+                },
+                "IAM": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.ContainerDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Command": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Cpu": {
+                    "type": "number"
+                },
+                "DependsOn": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.ContainerDependency"
+                    },
+                    "type": "array"
+                },
+                "DisableNetworking": {
+                    "type": "boolean"
+                },
+                "DnsSearchDomains": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DnsServers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DockerLabels": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "DockerSecurityOptions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EntryPoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Environment": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.KeyValuePair"
+                    },
+                    "type": "array"
+                },
+                "EnvironmentFiles": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.EnvironmentFile"
+                    },
+                    "type": "array"
+                },
+                "Essential": {
+                    "type": "boolean"
+                },
+                "ExtraHosts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.HostEntry"
+                    },
+                    "type": "array"
+                },
+                "FirelensConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.FirelensConfiguration"
+                },
+                "HealthCheck": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.HealthCheck"
+                },
+                "Hostname": {
+                    "type": "string"
+                },
+                "Image": {
+                    "type": "string"
+                },
+                "Interactive": {
+                    "type": "boolean"
+                },
+                "Links": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LinuxParameters": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.LinuxParameters"
+                },
+                "LogConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.LogConfiguration"
+                },
+                "Memory": {
+                    "type": "number"
+                },
+                "MemoryReservation": {
+                    "type": "number"
+                },
+                "MountPoints": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.MountPoint"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "PortMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.PortMapping"
+                    },
+                    "type": "array"
+                },
+                "Privileged": {
+                    "type": "boolean"
+                },
+                "PseudoTerminal": {
+                    "type": "boolean"
+                },
+                "ReadonlyRootFilesystem": {
+                    "type": "boolean"
+                },
+                "RepositoryCredentials": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.RepositoryCredentials"
+                },
+                "ResourceRequirements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.ResourceRequirement"
+                    },
+                    "type": "array"
+                },
+                "Secrets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.Secret"
+                    },
+                    "type": "array"
+                },
+                "StartTimeout": {
+                    "type": "number"
+                },
+                "StopTimeout": {
+                    "type": "number"
+                },
+                "SystemControls": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.SystemControl"
+                    },
+                    "type": "array"
+                },
+                "Ulimits": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.Ulimit"
+                    },
+                    "type": "array"
+                },
+                "User": {
+                    "type": "string"
+                },
+                "VolumesFrom": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.VolumeFrom"
+                    },
+                    "type": "array"
+                },
+                "WorkingDirectory": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.ContainerDependency": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "ContainerName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.Device": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "HostPath": {
+                    "type": "string"
+                },
+                "Permissions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.DockerVolumeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Autoprovision": {
+                    "type": "boolean"
+                },
+                "Driver": {
+                    "type": "string"
+                },
+                "DriverOpts": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Labels": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Scope": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.EFSVolumeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationConfig": {
+                    "type": "object"
+                },
+                "FilesystemId": {
+                    "type": "string"
+                },
+                "RootDirectory": {
+                    "type": "string"
+                },
+                "TransitEncryption": {
+                    "type": "string"
+                },
+                "TransitEncryptionPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FilesystemId"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.EnvironmentFile": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.EphemeralStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "SizeInGiB": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.FirelensConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Options": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.HealthCheck": {
+            "additionalProperties": false,
+            "properties": {
+                "Command": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "Retries": {
+                    "type": "number"
+                },
+                "StartPeriod": {
+                    "type": "number"
+                },
+                "Timeout": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.HostEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "type": "string"
+                },
+                "IpAddress": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.HostVolumeProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.InferenceAccelerator": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "DeviceType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.KernelCapabilities": {
+            "additionalProperties": false,
+            "properties": {
+                "Add": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Drop": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.KeyValuePair": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.LinuxParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Capabilities": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.KernelCapabilities"
+                },
+                "Devices": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.Device"
+                    },
+                    "type": "array"
+                },
+                "InitProcessEnabled": {
+                    "type": "boolean"
+                },
+                "MaxSwap": {
+                    "type": "number"
+                },
+                "SharedMemorySize": {
+                    "type": "number"
+                },
+                "Swappiness": {
+                    "type": "number"
+                },
+                "Tmpfs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.Tmpfs"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.LogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogDriver": {
+                    "type": "string"
+                },
+                "Options": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "SecretOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.Secret"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LogDriver"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.MountPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "ReadOnly": {
+                    "type": "boolean"
+                },
+                "SourceVolume": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.PortMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPort": {
+                    "type": "number"
+                },
+                "HostPort": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.ProxyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerName": {
+                    "type": "string"
+                },
+                "ProxyConfigurationProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.KeyValuePair"
+                    },
+                    "type": "array"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ContainerName"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.RepositoryCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "CredentialsParameter": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.ResourceRequirement": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.RuntimePlatform": {
+            "additionalProperties": false,
+            "properties": {
+                "CpuArchitecture": {
+                    "type": "string"
+                },
+                "OperatingSystemFamily": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.Secret": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "ValueFrom": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "ValueFrom"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.SystemControl": {
+            "additionalProperties": false,
+            "properties": {
+                "Namespace": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.TaskDefinitionPlacementConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.Tmpfs": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "MountOptions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Size": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Size"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.Ulimit": {
+            "additionalProperties": false,
+            "properties": {
+                "HardLimit": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SoftLimit": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "HardLimit",
+                "Name",
+                "SoftLimit"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.Volume": {
+            "additionalProperties": false,
+            "properties": {
+                "DockerVolumeConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.DockerVolumeConfiguration"
+                },
+                "EFSVolumeConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.EFSVolumeConfiguration"
+                },
+                "Host": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.HostVolumeProperties"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.VolumeFrom": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadOnly": {
+                    "type": "boolean"
+                },
+                "SourceContainer": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Cluster": {
+                            "type": "string"
+                        },
+                        "ExternalId": {
+                            "type": "string"
+                        },
+                        "LaunchType": {
+                            "type": "string"
+                        },
+                        "LoadBalancers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskSet.LoadBalancer"
+                            },
+                            "type": "array"
+                        },
+                        "NetworkConfiguration": {
+                            "$ref": "#/definitions/AWS::ECS::TaskSet.NetworkConfiguration"
+                        },
+                        "PlatformVersion": {
+                            "type": "string"
+                        },
+                        "Scale": {
+                            "$ref": "#/definitions/AWS::ECS::TaskSet.Scale"
+                        },
+                        "Service": {
+                            "type": "string"
+                        },
+                        "ServiceRegistries": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskSet.ServiceRegistry"
+                            },
+                            "type": "array"
+                        },
+                        "TaskDefinition": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Cluster",
+                        "Service",
+                        "TaskDefinition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::TaskSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet.AwsVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AssignPublicIp": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet.LoadBalancer": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerName": {
+                    "type": "string"
+                },
+                "ContainerPort": {
+                    "type": "number"
+                },
+                "LoadBalancerName": {
+                    "type": "string"
+                },
+                "TargetGroupArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsVpcConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::TaskSet.AwsVpcConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet.Scale": {
+            "additionalProperties": false,
+            "properties": {
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet.ServiceRegistry": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerName": {
+                    "type": "string"
+                },
+                "ContainerPort": {
+                    "type": "number"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "RegistryArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EFS::AccessPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessPointTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EFS::AccessPoint.AccessPointTag"
+                            },
+                            "type": "array"
+                        },
+                        "ClientToken": {
+                            "type": "string"
+                        },
+                        "FileSystemId": {
+                            "type": "string"
+                        },
+                        "PosixUser": {
+                            "$ref": "#/definitions/AWS::EFS::AccessPoint.PosixUser"
+                        },
+                        "RootDirectory": {
+                            "$ref": "#/definitions/AWS::EFS::AccessPoint.RootDirectory"
+                        }
+                    },
+                    "required": [
+                        "FileSystemId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EFS::AccessPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::AccessPoint.AccessPointTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EFS::AccessPoint.CreationInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "OwnerGid": {
+                    "type": "string"
+                },
+                "OwnerUid": {
+                    "type": "string"
+                },
+                "Permissions": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OwnerGid",
+                "OwnerUid",
+                "Permissions"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::AccessPoint.PosixUser": {
+            "additionalProperties": false,
+            "properties": {
+                "Gid": {
+                    "type": "string"
+                },
+                "SecondaryGids": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Uid": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Gid",
+                "Uid"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::AccessPoint.RootDirectory": {
+            "additionalProperties": false,
+            "properties": {
+                "CreationInfo": {
+                    "$ref": "#/definitions/AWS::EFS::AccessPoint.CreationInfo"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EFS::FileSystem": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZoneName": {
+                            "type": "string"
+                        },
+                        "BackupPolicy": {
+                            "$ref": "#/definitions/AWS::EFS::FileSystem.BackupPolicy"
+                        },
+                        "BypassPolicyLockoutSafetyCheck": {
+                            "type": "boolean"
+                        },
+                        "Encrypted": {
+                            "type": "boolean"
+                        },
+                        "FileSystemPolicy": {
+                            "type": "object"
+                        },
+                        "FileSystemTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EFS::FileSystem.ElasticFileSystemTag"
+                            },
+                            "type": "array"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LifecyclePolicies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EFS::FileSystem.LifecyclePolicy"
+                            },
+                            "type": "array"
+                        },
+                        "PerformanceMode": {
+                            "type": "string"
+                        },
+                        "ProvisionedThroughputInMibps": {
+                            "type": "number"
+                        },
+                        "ThroughputMode": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EFS::FileSystem"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::FileSystem.BackupPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::FileSystem.ElasticFileSystemTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::FileSystem.LifecyclePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "TransitionToIA": {
+                    "type": "string"
+                },
+                "TransitionToPrimaryStorageClass": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EFS::MountTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FileSystemId": {
+                            "type": "string"
+                        },
+                        "IpAddress": {
+                            "type": "string"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FileSystemId",
+                        "SecurityGroups",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EFS::MountTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Addon": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "AddonVersion": {
+                            "type": "string"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "ResolveConflicts": {
+                            "type": "string"
+                        },
+                        "ServiceAccountRoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddonName",
+                        "ClusterName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EKS::Addon"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EncryptionConfig": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EKS::Cluster.EncryptionConfig"
+                            },
+                            "type": "array"
+                        },
+                        "KubernetesNetworkConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.KubernetesNetworkConfig"
+                        },
+                        "Logging": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.Logging"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResourcesVpcConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.ResourcesVpcConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourcesVpcConfig",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EKS::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.ClusterLogging": {
+            "additionalProperties": false,
+            "properties": {
+                "EnabledTypes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EKS::Cluster.LoggingTypeConfig"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.EncryptionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Provider": {
+                    "type": "object"
+                },
+                "Resources": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.KubernetesNetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IpFamily": {
+                    "type": "string"
+                },
+                "ServiceIpv4Cidr": {
+                    "type": "string"
+                },
+                "ServiceIpv6Cidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterLogging": {
+                    "$ref": "#/definitions/AWS::EKS::Cluster.ClusterLogging"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.LoggingTypeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.ResourcesVpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointPrivateAccess": {
+                    "type": "boolean"
+                },
+                "EndpointPublicAccess": {
+                    "type": "boolean"
+                },
+                "PublicAccessCidrs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::FargateProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "FargateProfileName": {
+                            "type": "string"
+                        },
+                        "PodExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "Selectors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EKS::FargateProfile.Selector"
+                            },
+                            "type": "array"
+                        },
+                        "Subnets": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ClusterName",
+                        "PodExecutionRoleArn",
+                        "Selectors"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EKS::FargateProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::FargateProfile.Label": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::FargateProfile.Selector": {
+            "additionalProperties": false,
+            "properties": {
+                "Labels": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EKS::FargateProfile.Label"
+                    },
+                    "type": "array"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Namespace"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AmiType": {
+                            "type": "string"
+                        },
+                        "CapacityType": {
+                            "type": "string"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "DiskSize": {
+                            "type": "number"
+                        },
+                        "ForceUpdateEnabled": {
+                            "type": "boolean"
+                        },
+                        "InstanceTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Labels": {
+                            "type": "object"
+                        },
+                        "LaunchTemplate": {
+                            "$ref": "#/definitions/AWS::EKS::Nodegroup.LaunchTemplateSpecification"
+                        },
+                        "NodeRole": {
+                            "type": "string"
+                        },
+                        "NodegroupName": {
+                            "type": "string"
+                        },
+                        "ReleaseVersion": {
+                            "type": "string"
+                        },
+                        "RemoteAccess": {
+                            "$ref": "#/definitions/AWS::EKS::Nodegroup.RemoteAccess"
+                        },
+                        "ScalingConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Nodegroup.ScalingConfig"
+                        },
+                        "Subnets": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Taints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EKS::Nodegroup.Taint"
+                            },
+                            "type": "array"
+                        },
+                        "UpdateConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Nodegroup.UpdateConfig"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClusterName",
+                        "NodeRole",
+                        "Subnets"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EKS::Nodegroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup.LaunchTemplateSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup.RemoteAccess": {
+            "additionalProperties": false,
+            "properties": {
+                "Ec2SshKey": {
+                    "type": "string"
+                },
+                "SourceSecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Ec2SshKey"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup.ScalingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredSize": {
+                    "type": "number"
+                },
+                "MaxSize": {
+                    "type": "number"
+                },
+                "MinSize": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup.Taint": {
+            "additionalProperties": false,
+            "properties": {
+                "Effect": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup.UpdateConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxUnavailable": {
+                    "type": "number"
+                },
+                "MaxUnavailablePercentage": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdditionalInfo": {
+                            "type": "object"
+                        },
+                        "Applications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::Cluster.Application"
+                            },
+                            "type": "array"
+                        },
+                        "AutoScalingRole": {
+                            "type": "string"
+                        },
+                        "BootstrapActions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::Cluster.BootstrapActionConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Configurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::Cluster.Configuration"
+                            },
+                            "type": "array"
+                        },
+                        "CustomAmiId": {
+                            "type": "string"
+                        },
+                        "EbsRootVolumeSize": {
+                            "type": "number"
+                        },
+                        "Instances": {
+                            "$ref": "#/definitions/AWS::EMR::Cluster.JobFlowInstancesConfig"
+                        },
+                        "JobFlowRole": {
+                            "type": "string"
+                        },
+                        "KerberosAttributes": {
+                            "$ref": "#/definitions/AWS::EMR::Cluster.KerberosAttributes"
+                        },
+                        "LogEncryptionKmsKeyId": {
+                            "type": "string"
+                        },
+                        "LogUri": {
+                            "type": "string"
+                        },
+                        "ManagedScalingPolicy": {
+                            "$ref": "#/definitions/AWS::EMR::Cluster.ManagedScalingPolicy"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ReleaseLabel": {
+                            "type": "string"
+                        },
+                        "ScaleDownBehavior": {
+                            "type": "string"
+                        },
+                        "SecurityConfiguration": {
+                            "type": "string"
+                        },
+                        "ServiceRole": {
+                            "type": "string"
+                        },
+                        "StepConcurrencyLevel": {
+                            "type": "number"
+                        },
+                        "Steps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::Cluster.StepConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VisibleToAllUsers": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "Instances",
+                        "JobFlowRole",
+                        "Name",
+                        "ServiceRole"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.Application": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalInfo": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Args": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.AutoScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Constraints": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.ScalingConstraints"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.ScalingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Constraints",
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.BootstrapActionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "ScriptBootstrapAction": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.ScriptBootstrapActionConfig"
+                }
+            },
+            "required": [
+                "Name",
+                "ScriptBootstrapAction"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.CloudWatchAlarmDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "EvaluationPeriods": {
+                    "type": "number"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Threshold": {
+                    "type": "number"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "MetricName",
+                "Period",
+                "Threshold"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ComputeLimits": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumCapacityUnits": {
+                    "type": "number"
+                },
+                "MaximumCoreCapacityUnits": {
+                    "type": "number"
+                },
+                "MaximumOnDemandCapacityUnits": {
+                    "type": "number"
+                },
+                "MinimumCapacityUnits": {
+                    "type": "number"
+                },
+                "UnitType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MaximumCapacityUnits",
+                "MinimumCapacityUnits",
+                "UnitType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "Classification": {
+                    "type": "string"
+                },
+                "ConfigurationProperties": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.Configuration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.EbsBlockDeviceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "VolumeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.VolumeSpecification"
+                },
+                "VolumesPerInstance": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "VolumeSpecification"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.EbsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EbsBlockDeviceConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.EbsBlockDeviceConfig"
+                    },
+                    "type": "array"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.HadoopJarStepConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Args": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Jar": {
+                    "type": "string"
+                },
+                "MainClass": {
+                    "type": "string"
+                },
+                "StepProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.KeyValue"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Jar"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.InstanceFleetConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceTypeConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.InstanceTypeConfig"
+                    },
+                    "type": "array"
+                },
+                "LaunchSpecifications": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceFleetProvisioningSpecifications"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "TargetOnDemandCapacity": {
+                    "type": "number"
+                },
+                "TargetSpotCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.InstanceFleetProvisioningSpecifications": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandProvisioningSpecification"
+                },
+                "SpotSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.SpotProvisioningSpecification"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.InstanceGroupConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoScalingPolicy": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.AutoScalingPolicy"
+                },
+                "BidPrice": {
+                    "type": "string"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.Configuration"
+                    },
+                    "type": "array"
+                },
+                "CustomAmiId": {
+                    "type": "string"
+                },
+                "EbsConfiguration": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.EbsConfiguration"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "Market": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.InstanceTypeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BidPrice": {
+                    "type": "string"
+                },
+                "BidPriceAsPercentageOfOnDemandPrice": {
+                    "type": "number"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.Configuration"
+                    },
+                    "type": "array"
+                },
+                "CustomAmiId": {
+                    "type": "string"
+                },
+                "EbsConfiguration": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.EbsConfiguration"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.JobFlowInstancesConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalMasterSecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AdditionalSlaveSecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CoreInstanceFleet": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceFleetConfig"
+                },
+                "CoreInstanceGroup": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceGroupConfig"
+                },
+                "Ec2KeyName": {
+                    "type": "string"
+                },
+                "Ec2SubnetId": {
+                    "type": "string"
+                },
+                "Ec2SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EmrManagedMasterSecurityGroup": {
+                    "type": "string"
+                },
+                "EmrManagedSlaveSecurityGroup": {
+                    "type": "string"
+                },
+                "HadoopVersion": {
+                    "type": "string"
+                },
+                "KeepJobFlowAliveWhenNoSteps": {
+                    "type": "boolean"
+                },
+                "MasterInstanceFleet": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceFleetConfig"
+                },
+                "MasterInstanceGroup": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceGroupConfig"
+                },
+                "Placement": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.PlacementType"
+                },
+                "ServiceAccessSecurityGroup": {
+                    "type": "string"
+                },
+                "TerminationProtected": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.KerberosAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "ADDomainJoinPassword": {
+                    "type": "string"
+                },
+                "ADDomainJoinUser": {
+                    "type": "string"
+                },
+                "CrossRealmTrustPrincipalPassword": {
+                    "type": "string"
+                },
+                "KdcAdminPassword": {
+                    "type": "string"
+                },
+                "Realm": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KdcAdminPassword",
+                "Realm"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.KeyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ManagedScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeLimits": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.ComputeLimits"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.OnDemandProvisioningSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AllocationStrategy"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.PlacementType": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AvailabilityZone"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ScalingAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Market": {
+                    "type": "string"
+                },
+                "SimpleScalingPolicyConfiguration": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.SimpleScalingPolicyConfiguration"
+                }
+            },
+            "required": [
+                "SimpleScalingPolicyConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ScalingConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ScalingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.ScalingAction"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Trigger": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.ScalingTrigger"
+                }
+            },
+            "required": [
+                "Action",
+                "Name",
+                "Trigger"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ScalingTrigger": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchAlarmDefinition": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.CloudWatchAlarmDefinition"
+                }
+            },
+            "required": [
+                "CloudWatchAlarmDefinition"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ScriptBootstrapActionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Args": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Path"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.SimpleScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AdjustmentType": {
+                    "type": "string"
+                },
+                "CoolDown": {
+                    "type": "number"
+                },
+                "ScalingAdjustment": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ScalingAdjustment"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.SpotProvisioningSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "BlockDurationMinutes": {
+                    "type": "number"
+                },
+                "TimeoutAction": {
+                    "type": "string"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TimeoutAction",
+                "TimeoutDurationMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.StepConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionOnFailure": {
+                    "type": "string"
+                },
+                "HadoopJarStep": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.HadoopJarStepConfig"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HadoopJarStep",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.VolumeSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "SizeInGB": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SizeInGB",
+                "VolumeType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClusterId": {
+                            "type": "string"
+                        },
+                        "InstanceFleetType": {
+                            "type": "string"
+                        },
+                        "InstanceTypeConfigs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.InstanceTypeConfig"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchSpecifications": {
+                            "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.InstanceFleetProvisioningSpecifications"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "TargetOnDemandCapacity": {
+                            "type": "number"
+                        },
+                        "TargetSpotCapacity": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "ClusterId",
+                        "InstanceFleetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::InstanceFleetConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "Classification": {
+                    "type": "string"
+                },
+                "ConfigurationProperties": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.Configuration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.EbsBlockDeviceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "VolumeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.VolumeSpecification"
+                },
+                "VolumesPerInstance": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "VolumeSpecification"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.EbsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EbsBlockDeviceConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.EbsBlockDeviceConfig"
+                    },
+                    "type": "array"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.InstanceFleetProvisioningSpecifications": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandProvisioningSpecification"
+                },
+                "SpotSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.SpotProvisioningSpecification"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.InstanceTypeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BidPrice": {
+                    "type": "string"
+                },
+                "BidPriceAsPercentageOfOnDemandPrice": {
+                    "type": "number"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.Configuration"
+                    },
+                    "type": "array"
+                },
+                "CustomAmiId": {
+                    "type": "string"
+                },
+                "EbsConfiguration": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.EbsConfiguration"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.OnDemandProvisioningSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AllocationStrategy"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.SpotProvisioningSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "BlockDurationMinutes": {
+                    "type": "number"
+                },
+                "TimeoutAction": {
+                    "type": "string"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TimeoutAction",
+                "TimeoutDurationMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.VolumeSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "SizeInGB": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SizeInGB",
+                "VolumeType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingPolicy": {
+                            "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.AutoScalingPolicy"
+                        },
+                        "BidPrice": {
+                            "type": "string"
+                        },
+                        "Configurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.Configuration"
+                            },
+                            "type": "array"
+                        },
+                        "CustomAmiId": {
+                            "type": "string"
+                        },
+                        "EbsConfiguration": {
+                            "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.EbsConfiguration"
+                        },
+                        "InstanceCount": {
+                            "type": "number"
+                        },
+                        "InstanceRole": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "JobFlowId": {
+                            "type": "string"
+                        },
+                        "Market": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceCount",
+                        "InstanceRole",
+                        "InstanceType",
+                        "JobFlowId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::InstanceGroupConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.AutoScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Constraints": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.ScalingConstraints"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.ScalingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Constraints",
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.CloudWatchAlarmDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "EvaluationPeriods": {
+                    "type": "number"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Threshold": {
+                    "type": "number"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "MetricName",
+                "Period",
+                "Threshold"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "Classification": {
+                    "type": "string"
+                },
+                "ConfigurationProperties": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.Configuration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.EbsBlockDeviceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "VolumeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.VolumeSpecification"
+                },
+                "VolumesPerInstance": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "VolumeSpecification"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.EbsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EbsBlockDeviceConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.EbsBlockDeviceConfig"
+                    },
+                    "type": "array"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.ScalingAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Market": {
+                    "type": "string"
+                },
+                "SimpleScalingPolicyConfiguration": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.SimpleScalingPolicyConfiguration"
+                }
+            },
+            "required": [
+                "SimpleScalingPolicyConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.ScalingConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.ScalingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.ScalingAction"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Trigger": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.ScalingTrigger"
+                }
+            },
+            "required": [
+                "Action",
+                "Name",
+                "Trigger"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.ScalingTrigger": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchAlarmDefinition": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.CloudWatchAlarmDefinition"
+                }
+            },
+            "required": [
+                "CloudWatchAlarmDefinition"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.SimpleScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AdjustmentType": {
+                    "type": "string"
+                },
+                "CoolDown": {
+                    "type": "number"
+                },
+                "ScalingAdjustment": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ScalingAdjustment"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.VolumeSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "SizeInGB": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SizeInGB",
+                "VolumeType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::SecurityConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SecurityConfiguration": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "SecurityConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::SecurityConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Step": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ActionOnFailure": {
+                            "type": "string"
+                        },
+                        "HadoopJarStep": {
+                            "$ref": "#/definitions/AWS::EMR::Step.HadoopJarStepConfig"
+                        },
+                        "JobFlowId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ActionOnFailure",
+                        "HadoopJarStep",
+                        "JobFlowId",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::Step"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Step.HadoopJarStepConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Args": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Jar": {
+                    "type": "string"
+                },
+                "MainClass": {
+                    "type": "string"
+                },
+                "StepProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Step.KeyValue"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Jar"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Step.KeyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Studio": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthMode": {
+                            "type": "string"
+                        },
+                        "DefaultS3Location": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EngineSecurityGroupId": {
+                            "type": "string"
+                        },
+                        "IdpAuthUrl": {
+                            "type": "string"
+                        },
+                        "IdpRelayStateParameterName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ServiceRole": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserRole": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        },
+                        "WorkspaceSecurityGroupId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthMode",
+                        "DefaultS3Location",
+                        "EngineSecurityGroupId",
+                        "Name",
+                        "ServiceRole",
+                        "SubnetIds",
+                        "VpcId",
+                        "WorkspaceSecurityGroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::Studio"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::StudioSessionMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "IdentityName": {
+                            "type": "string"
+                        },
+                        "IdentityType": {
+                            "type": "string"
+                        },
+                        "SessionPolicyArn": {
+                            "type": "string"
+                        },
+                        "StudioId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "IdentityName",
+                        "IdentityType",
+                        "SessionPolicyArn",
+                        "StudioId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::StudioSessionMapping"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMRContainers::VirtualCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContainerProvider": {
+                            "$ref": "#/definitions/AWS::EMRContainers::VirtualCluster.ContainerProvider"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ContainerProvider",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMRContainers::VirtualCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMRContainers::VirtualCluster.ContainerInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "EksInfo": {
+                    "$ref": "#/definitions/AWS::EMRContainers::VirtualCluster.EksInfo"
+                }
+            },
+            "required": [
+                "EksInfo"
+            ],
+            "type": "object"
+        },
+        "AWS::EMRContainers::VirtualCluster.ContainerProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Info": {
+                    "$ref": "#/definitions/AWS::EMRContainers::VirtualCluster.ContainerInfo"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id",
+                "Info",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EMRContainers::VirtualCluster.EksInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Namespace"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::CacheCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AZMode": {
+                            "type": "string"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "CacheNodeType": {
+                            "type": "string"
+                        },
+                        "CacheParameterGroupName": {
+                            "type": "string"
+                        },
+                        "CacheSecurityGroupNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CacheSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "LogDeliveryConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElastiCache::CacheCluster.LogDeliveryConfigurationRequest"
+                            },
+                            "type": "array"
+                        },
+                        "NotificationTopicArn": {
+                            "type": "string"
+                        },
+                        "NumCacheNodes": {
+                            "type": "number"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredAvailabilityZone": {
+                            "type": "string"
+                        },
+                        "PreferredAvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "SnapshotArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnapshotName": {
+                            "type": "string"
+                        },
+                        "SnapshotRetentionLimit": {
+                            "type": "number"
+                        },
+                        "SnapshotWindow": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CacheNodeType",
+                        "Engine",
+                        "NumCacheNodes"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::CacheCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::CacheCluster.CloudWatchLogsDestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroup": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogGroup"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::CacheCluster.DestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::CacheCluster.CloudWatchLogsDestinationDetails"
+                },
+                "KinesisFirehoseDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::CacheCluster.KinesisFirehoseDestinationDetails"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::CacheCluster.KinesisFirehoseDestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStream": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStream"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::CacheCluster.LogDeliveryConfigurationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::CacheCluster.DestinationDetails"
+                },
+                "DestinationType": {
+                    "type": "string"
+                },
+                "LogFormat": {
+                    "type": "string"
+                },
+                "LogType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationDetails",
+                "DestinationType",
+                "LogFormat",
+                "LogType"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::GlobalReplicationGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutomaticFailoverEnabled": {
+                            "type": "boolean"
+                        },
+                        "CacheNodeType": {
+                            "type": "string"
+                        },
+                        "CacheParameterGroupName": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "GlobalNodeGroupCount": {
+                            "type": "number"
+                        },
+                        "GlobalReplicationGroupDescription": {
+                            "type": "string"
+                        },
+                        "GlobalReplicationGroupIdSuffix": {
+                            "type": "string"
+                        },
+                        "Members": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElastiCache::GlobalReplicationGroup.GlobalReplicationGroupMember"
+                            },
+                            "type": "array"
+                        },
+                        "RegionalConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElastiCache::GlobalReplicationGroup.RegionalConfiguration"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Members"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::GlobalReplicationGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::GlobalReplicationGroup.GlobalReplicationGroupMember": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplicationGroupId": {
+                    "type": "string"
+                },
+                "ReplicationGroupRegion": {
+                    "type": "string"
+                },
+                "Role": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::GlobalReplicationGroup.RegionalConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplicationGroupId": {
+                    "type": "string"
+                },
+                "ReplicationGroupRegion": {
+                    "type": "string"
+                },
+                "ReshardingConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ElastiCache::GlobalReplicationGroup.ReshardingConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::GlobalReplicationGroup.ReshardingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NodeGroupId": {
+                    "type": "string"
+                },
+                "PreferredAvailabilityZones": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::ParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CacheParameterGroupFamily": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Properties": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CacheParameterGroupFamily",
+                        "Description"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::ParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AtRestEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "AuthToken": {
+                            "type": "string"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AutomaticFailoverEnabled": {
+                            "type": "boolean"
+                        },
+                        "CacheNodeType": {
+                            "type": "string"
+                        },
+                        "CacheParameterGroupName": {
+                            "type": "string"
+                        },
+                        "CacheSecurityGroupNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CacheSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DataTieringEnabled": {
+                            "type": "boolean"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "GlobalReplicationGroupId": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LogDeliveryConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup.LogDeliveryConfigurationRequest"
+                            },
+                            "type": "array"
+                        },
+                        "MultiAZEnabled": {
+                            "type": "boolean"
+                        },
+                        "NodeGroupConfiguration": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup.NodeGroupConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "NotificationTopicArn": {
+                            "type": "string"
+                        },
+                        "NumCacheClusters": {
+                            "type": "number"
+                        },
+                        "NumNodeGroups": {
+                            "type": "number"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredCacheClusterAZs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "PrimaryClusterId": {
+                            "type": "string"
+                        },
+                        "ReplicasPerNodeGroup": {
+                            "type": "number"
+                        },
+                        "ReplicationGroupDescription": {
+                            "type": "string"
+                        },
+                        "ReplicationGroupId": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnapshotArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnapshotName": {
+                            "type": "string"
+                        },
+                        "SnapshotRetentionLimit": {
+                            "type": "number"
+                        },
+                        "SnapshotWindow": {
+                            "type": "string"
+                        },
+                        "SnapshottingClusterId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "UserGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ReplicationGroupDescription"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::ReplicationGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup.CloudWatchLogsDestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroup": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogGroup"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup.DestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup.CloudWatchLogsDestinationDetails"
+                },
+                "KinesisFirehoseDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup.KinesisFirehoseDestinationDetails"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup.KinesisFirehoseDestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStream": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStream"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup.LogDeliveryConfigurationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup.DestinationDetails"
+                },
+                "DestinationType": {
+                    "type": "string"
+                },
+                "LogFormat": {
+                    "type": "string"
+                },
+                "LogType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationDetails",
+                "DestinationType",
+                "LogFormat",
+                "LogType"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup.NodeGroupConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NodeGroupId": {
+                    "type": "string"
+                },
+                "PrimaryAvailabilityZone": {
+                    "type": "string"
+                },
+                "ReplicaAvailabilityZones": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ReplicaCount": {
+                    "type": "number"
+                },
+                "Slots": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::SecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::SecurityGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::SecurityGroupIngress": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CacheSecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupOwnerId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CacheSecurityGroupName",
+                        "EC2SecurityGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::SecurityGroupIngress"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::SubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CacheSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::SubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessString": {
+                            "type": "string"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "NoPasswordRequired": {
+                            "type": "boolean"
+                        },
+                        "Passwords": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "UserId": {
+                            "type": "string"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Engine",
+                        "UserId",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::UserGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "UserGroupId": {
+                            "type": "string"
+                        },
+                        "UserIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Engine",
+                        "UserGroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::UserGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ResourceLifecycleConfig": {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::Application.ApplicationResourceLifecycleConfig"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticBeanstalk::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Application.ApplicationResourceLifecycleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceRole": {
+                    "type": "string"
+                },
+                "VersionLifecycleConfig": {
+                    "$ref": "#/definitions/AWS::ElasticBeanstalk::Application.ApplicationVersionLifecycleConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Application.ApplicationVersionLifecycleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxAgeRule": {
+                    "$ref": "#/definitions/AWS::ElasticBeanstalk::Application.MaxAgeRule"
+                },
+                "MaxCountRule": {
+                    "$ref": "#/definitions/AWS::ElasticBeanstalk::Application.MaxCountRule"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Application.MaxAgeRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteSourceFromS3": {
+                    "type": "boolean"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "MaxAgeInDays": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Application.MaxCountRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteSourceFromS3": {
+                    "type": "boolean"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "MaxCount": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::ApplicationVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "SourceBundle": {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::ApplicationVersion.SourceBundle"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "SourceBundle"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticBeanstalk::ApplicationVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::ApplicationVersion.SourceBundle": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::ConfigurationTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnvironmentId": {
+                            "type": "string"
+                        },
+                        "OptionSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticBeanstalk::ConfigurationTemplate.ConfigurationOptionSetting"
+                            },
+                            "type": "array"
+                        },
+                        "PlatformArn": {
+                            "type": "string"
+                        },
+                        "SolutionStackName": {
+                            "type": "string"
+                        },
+                        "SourceConfiguration": {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::ConfigurationTemplate.SourceConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticBeanstalk::ConfigurationTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::ConfigurationTemplate.ConfigurationOptionSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "Namespace": {
+                    "type": "string"
+                },
+                "OptionName": {
+                    "type": "string"
+                },
+                "ResourceName": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Namespace",
+                "OptionName"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::ConfigurationTemplate.SourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationName": {
+                    "type": "string"
+                },
+                "TemplateName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApplicationName",
+                "TemplateName"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "CNAMEPrefix": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnvironmentName": {
+                            "type": "string"
+                        },
+                        "OperationsRole": {
+                            "type": "string"
+                        },
+                        "OptionSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticBeanstalk::Environment.OptionSetting"
+                            },
+                            "type": "array"
+                        },
+                        "PlatformArn": {
+                            "type": "string"
+                        },
+                        "SolutionStackName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        },
+                        "Tier": {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::Environment.Tier"
+                        },
+                        "VersionLabel": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticBeanstalk::Environment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Environment.OptionSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "Namespace": {
+                    "type": "string"
+                },
+                "OptionName": {
+                    "type": "string"
+                },
+                "ResourceName": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Namespace",
+                "OptionName"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Environment.Tier": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessLoggingPolicy": {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.AccessLoggingPolicy"
+                        },
+                        "AppCookieStickinessPolicy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.AppCookieStickinessPolicy"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ConnectionDrainingPolicy": {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.ConnectionDrainingPolicy"
+                        },
+                        "ConnectionSettings": {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.ConnectionSettings"
+                        },
+                        "CrossZone": {
+                            "type": "boolean"
+                        },
+                        "HealthCheck": {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.HealthCheck"
+                        },
+                        "Instances": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LBCookieStickinessPolicy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.LBCookieStickinessPolicy"
+                            },
+                            "type": "array"
+                        },
+                        "Listeners": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.Listeners"
+                            },
+                            "type": "array"
+                        },
+                        "LoadBalancerName": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.Policies"
+                            },
+                            "type": "array"
+                        },
+                        "Scheme": {
+                            "type": "string"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Subnets": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Listeners"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancing::LoadBalancer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.AccessLoggingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "EmitInterval": {
+                    "type": "number"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3BucketPrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled",
+                "S3BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.AppCookieStickinessPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "CookieName": {
+                    "type": "string"
+                },
+                "PolicyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CookieName",
+                "PolicyName"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.ConnectionDrainingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Timeout": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.ConnectionSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeout": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "IdleTimeout"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.HealthCheck": {
+            "additionalProperties": false,
+            "properties": {
+                "HealthyThreshold": {
+                    "type": "string"
+                },
+                "Interval": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                },
+                "Timeout": {
+                    "type": "string"
+                },
+                "UnhealthyThreshold": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HealthyThreshold",
+                "Interval",
+                "Target",
+                "Timeout",
+                "UnhealthyThreshold"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.LBCookieStickinessPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "CookieExpirationPeriod": {
+                    "type": "string"
+                },
+                "PolicyName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.Listeners": {
+            "additionalProperties": false,
+            "properties": {
+                "InstancePort": {
+                    "type": "string"
+                },
+                "InstanceProtocol": {
+                    "type": "string"
+                },
+                "LoadBalancerPort": {
+                    "type": "string"
+                },
+                "PolicyNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "SSLCertificateId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstancePort",
+                "LoadBalancerPort",
+                "Protocol"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.Policies": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "type": "object"
+                    },
+                    "type": "array"
+                },
+                "InstancePorts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LoadBalancerPorts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PolicyName": {
+                    "type": "string"
+                },
+                "PolicyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attributes",
+                "PolicyName",
+                "PolicyType"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AlpnPolicy": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Certificates": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.Certificate"
+                            },
+                            "type": "array"
+                        },
+                        "DefaultActions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.Action"
+                            },
+                            "type": "array"
+                        },
+                        "LoadBalancerArn": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "SslPolicy": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DefaultActions",
+                        "LoadBalancerArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancingV2::Listener"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticateCognitoConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.AuthenticateCognitoConfig"
+                },
+                "AuthenticateOidcConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.AuthenticateOidcConfig"
+                },
+                "FixedResponseConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.FixedResponseConfig"
+                },
+                "ForwardConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.ForwardConfig"
+                },
+                "Order": {
+                    "type": "number"
+                },
+                "RedirectConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.RedirectConfig"
+                },
+                "TargetGroupArn": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.AuthenticateCognitoConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationRequestExtraParams": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "OnUnauthenticatedRequest": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                },
+                "SessionCookieName": {
+                    "type": "string"
+                },
+                "SessionTimeout": {
+                    "type": "string"
+                },
+                "UserPoolArn": {
+                    "type": "string"
+                },
+                "UserPoolClientId": {
+                    "type": "string"
+                },
+                "UserPoolDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "UserPoolArn",
+                "UserPoolClientId",
+                "UserPoolDomain"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.AuthenticateOidcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationRequestExtraParams": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "AuthorizationEndpoint": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "OnUnauthenticatedRequest": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                },
+                "SessionCookieName": {
+                    "type": "string"
+                },
+                "SessionTimeout": {
+                    "type": "string"
+                },
+                "TokenEndpoint": {
+                    "type": "string"
+                },
+                "UserInfoEndpoint": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AuthorizationEndpoint",
+                "ClientId",
+                "ClientSecret",
+                "Issuer",
+                "TokenEndpoint",
+                "UserInfoEndpoint"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.FixedResponseConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentType": {
+                    "type": "string"
+                },
+                "MessageBody": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.ForwardConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetGroupStickinessConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.TargetGroupStickinessConfig"
+                },
+                "TargetGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.TargetGroupTuple"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.RedirectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Host": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "Query": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.TargetGroupStickinessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationSeconds": {
+                    "type": "number"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.TargetGroupTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetGroupArn": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Certificates": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerCertificate.Certificate"
+                            },
+                            "type": "array"
+                        },
+                        "ListenerArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Certificates",
+                        "ListenerArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancingV2::ListenerCertificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerCertificate.Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.Action"
+                            },
+                            "type": "array"
+                        },
+                        "Conditions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.RuleCondition"
+                            },
+                            "type": "array"
+                        },
+                        "ListenerArn": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Actions",
+                        "Conditions",
+                        "ListenerArn",
+                        "Priority"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancingV2::ListenerRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticateCognitoConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateCognitoConfig"
+                },
+                "AuthenticateOidcConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateOidcConfig"
+                },
+                "FixedResponseConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.FixedResponseConfig"
+                },
+                "ForwardConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.ForwardConfig"
+                },
+                "Order": {
+                    "type": "number"
+                },
+                "RedirectConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.RedirectConfig"
+                },
+                "TargetGroupArn": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateCognitoConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationRequestExtraParams": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "OnUnauthenticatedRequest": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                },
+                "SessionCookieName": {
+                    "type": "string"
+                },
+                "SessionTimeout": {
+                    "type": "number"
+                },
+                "UserPoolArn": {
+                    "type": "string"
+                },
+                "UserPoolClientId": {
+                    "type": "string"
+                },
+                "UserPoolDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "UserPoolArn",
+                "UserPoolClientId",
+                "UserPoolDomain"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateOidcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationRequestExtraParams": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "AuthorizationEndpoint": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "OnUnauthenticatedRequest": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                },
+                "SessionCookieName": {
+                    "type": "string"
+                },
+                "SessionTimeout": {
+                    "type": "number"
+                },
+                "TokenEndpoint": {
+                    "type": "string"
+                },
+                "UseExistingClientSecret": {
+                    "type": "boolean"
+                },
+                "UserInfoEndpoint": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AuthorizationEndpoint",
+                "ClientId",
+                "ClientSecret",
+                "Issuer",
+                "TokenEndpoint",
+                "UserInfoEndpoint"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.FixedResponseConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentType": {
+                    "type": "string"
+                },
+                "MessageBody": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.ForwardConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetGroupStickinessConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupStickinessConfig"
+                },
+                "TargetGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupTuple"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.HostHeaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.HttpHeaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpHeaderName": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.HttpRequestMethodConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.PathPatternConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringKeyValue"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringKeyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.RedirectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Host": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "Query": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.RuleCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Field": {
+                    "type": "string"
+                },
+                "HostHeaderConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.HostHeaderConfig"
+                },
+                "HttpHeaderConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.HttpHeaderConfig"
+                },
+                "HttpRequestMethodConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.HttpRequestMethodConfig"
+                },
+                "PathPatternConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.PathPatternConfig"
+                },
+                "QueryStringConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringConfig"
+                },
+                "SourceIpConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.SourceIpConfig"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.SourceIpConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupStickinessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationSeconds": {
+                    "type": "number"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetGroupArn": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::LoadBalancer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "IpAddressType": {
+                            "type": "string"
+                        },
+                        "LoadBalancerAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::LoadBalancer.LoadBalancerAttribute"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Scheme": {
+                            "type": "string"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::LoadBalancer.SubnetMapping"
+                            },
+                            "type": "array"
+                        },
+                        "Subnets": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancingV2::LoadBalancer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::LoadBalancer.LoadBalancerAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::LoadBalancer.SubnetMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationId": {
+                    "type": "string"
+                },
+                "IPv6Address": {
+                    "type": "string"
+                },
+                "PrivateIPv4Address": {
+                    "type": "string"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubnetId"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::TargetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HealthCheckEnabled": {
+                            "type": "boolean"
+                        },
+                        "HealthCheckIntervalSeconds": {
+                            "type": "number"
+                        },
+                        "HealthCheckPath": {
+                            "type": "string"
+                        },
+                        "HealthCheckPort": {
+                            "type": "string"
+                        },
+                        "HealthCheckProtocol": {
+                            "type": "string"
+                        },
+                        "HealthCheckTimeoutSeconds": {
+                            "type": "number"
+                        },
+                        "HealthyThresholdCount": {
+                            "type": "number"
+                        },
+                        "IpAddressType": {
+                            "type": "string"
+                        },
+                        "Matcher": {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::TargetGroup.Matcher"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "ProtocolVersion": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetGroupAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::TargetGroup.TargetGroupAttribute"
+                            },
+                            "type": "array"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::TargetGroup.TargetDescription"
+                            },
+                            "type": "array"
+                        },
+                        "UnhealthyThresholdCount": {
+                            "type": "number"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancingV2::TargetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::TargetGroup.Matcher": {
+            "additionalProperties": false,
+            "properties": {
+                "GrpcCode": {
+                    "type": "string"
+                },
+                "HttpCode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::TargetGroup.TargetDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::TargetGroup.TargetGroupAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessPolicies": {
+                            "type": "object"
+                        },
+                        "AdvancedOptions": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "AdvancedSecurityOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.AdvancedSecurityOptionsInput"
+                        },
+                        "CognitoOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.CognitoOptions"
+                        },
+                        "DomainEndpointOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.DomainEndpointOptions"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EBSOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.EBSOptions"
+                        },
+                        "ElasticsearchClusterConfig": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.ElasticsearchClusterConfig"
+                        },
+                        "ElasticsearchVersion": {
+                            "type": "string"
+                        },
+                        "EncryptionAtRestOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.EncryptionAtRestOptions"
+                        },
+                        "LogPublishingOptions": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::Elasticsearch::Domain.LogPublishingOption"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "NodeToNodeEncryptionOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.NodeToNodeEncryptionOptions"
+                        },
+                        "SnapshotOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.SnapshotOptions"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VPCOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.VPCOptions"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Elasticsearch::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.AdvancedSecurityOptionsInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "InternalUserDatabaseEnabled": {
+                    "type": "boolean"
+                },
+                "MasterUserOptions": {
+                    "$ref": "#/definitions/AWS::Elasticsearch::Domain.MasterUserOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.CognitoOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "IdentityPoolId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "UserPoolId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.ColdStorageOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.DomainEndpointOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomEndpoint": {
+                    "type": "string"
+                },
+                "CustomEndpointCertificateArn": {
+                    "type": "string"
+                },
+                "CustomEndpointEnabled": {
+                    "type": "boolean"
+                },
+                "EnforceHTTPS": {
+                    "type": "boolean"
+                },
+                "TLSSecurityPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.EBSOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "EBSEnabled": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.ElasticsearchClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ColdStorageOptions": {
+                    "$ref": "#/definitions/AWS::Elasticsearch::Domain.ColdStorageOptions"
+                },
+                "DedicatedMasterCount": {
+                    "type": "number"
+                },
+                "DedicatedMasterEnabled": {
+                    "type": "boolean"
+                },
+                "DedicatedMasterType": {
+                    "type": "string"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "WarmCount": {
+                    "type": "number"
+                },
+                "WarmEnabled": {
+                    "type": "boolean"
+                },
+                "WarmType": {
+                    "type": "string"
+                },
+                "ZoneAwarenessConfig": {
+                    "$ref": "#/definitions/AWS::Elasticsearch::Domain.ZoneAwarenessConfig"
+                },
+                "ZoneAwarenessEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.EncryptionAtRestOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.LogPublishingOption": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsLogGroupArn": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.MasterUserOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "MasterUserARN": {
+                    "type": "string"
+                },
+                "MasterUserName": {
+                    "type": "string"
+                },
+                "MasterUserPassword": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.NodeToNodeEncryptionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.SnapshotOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomatedSnapshotStartHour": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.VPCOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.ZoneAwarenessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZoneCount": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EventSchemas::Discoverer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CrossAccount": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "SourceArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EventSchemas::Discoverer.TagsEntry"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SourceArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EventSchemas::Discoverer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::Discoverer.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::Registry": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RegistryName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EventSchemas::Registry.TagsEntry"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EventSchemas::Registry"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::Registry.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::RegistryPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Policy": {
+                            "type": "object"
+                        },
+                        "RegistryName": {
+                            "type": "string"
+                        },
+                        "RevisionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Policy",
+                        "RegistryName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EventSchemas::RegistryPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::Schema": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Content": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "RegistryName": {
+                            "type": "string"
+                        },
+                        "SchemaName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EventSchemas::Schema.TagsEntry"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Content",
+                        "RegistryName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EventSchemas::Schema"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::Schema.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::ApiDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "HttpMethod": {
+                            "type": "string"
+                        },
+                        "InvocationEndpoint": {
+                            "type": "string"
+                        },
+                        "InvocationRateLimitPerSecond": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConnectionArn",
+                        "HttpMethod",
+                        "InvocationEndpoint"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::ApiDestination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Archive": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EventPattern": {
+                            "type": "object"
+                        },
+                        "RetentionDays": {
+                            "type": "number"
+                        },
+                        "SourceArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SourceArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::Archive"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Connection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthParameters": {
+                            "type": "object"
+                        },
+                        "AuthorizationType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthParameters",
+                        "AuthorizationType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::Connection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::EventBus": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EventSourceName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::EventBus"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::EventBusPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "Condition": {
+                            "$ref": "#/definitions/AWS::Events::EventBusPolicy.Condition"
+                        },
+                        "EventBusName": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        },
+                        "Statement": {
+                            "type": "object"
+                        },
+                        "StatementId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "StatementId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::EventBusPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::EventBusPolicy.Condition": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EventBusName": {
+                            "type": "string"
+                        },
+                        "EventPattern": {
+                            "type": "object"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "ScheduleExpression": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Events::Rule.Target"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::Rule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.AwsVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AssignPublicIp": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.BatchArrayProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Size": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.BatchParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ArrayProperties": {
+                    "$ref": "#/definitions/AWS::Events::Rule.BatchArrayProperties"
+                },
+                "JobDefinition": {
+                    "type": "string"
+                },
+                "JobName": {
+                    "type": "string"
+                },
+                "RetryStrategy": {
+                    "$ref": "#/definitions/AWS::Events::Rule.BatchRetryStrategy"
+                }
+            },
+            "required": [
+                "JobDefinition",
+                "JobName"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.BatchRetryStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "Attempts": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.CapacityProviderStrategyItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Base": {
+                    "type": "number"
+                },
+                "CapacityProvider": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "CapacityProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.DeadLetterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.EcsParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityProviderStrategy": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Events::Rule.CapacityProviderStrategyItem"
+                    },
+                    "type": "array"
+                },
+                "EnableECSManagedTags": {
+                    "type": "boolean"
+                },
+                "EnableExecuteCommand": {
+                    "type": "boolean"
+                },
+                "Group": {
+                    "type": "string"
+                },
+                "LaunchType": {
+                    "type": "string"
+                },
+                "NetworkConfiguration": {
+                    "$ref": "#/definitions/AWS::Events::Rule.NetworkConfiguration"
+                },
+                "PlacementConstraints": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Events::Rule.PlacementConstraint"
+                    },
+                    "type": "array"
+                },
+                "PlacementStrategies": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Events::Rule.PlacementStrategy"
+                    },
+                    "type": "array"
+                },
+                "PlatformVersion": {
+                    "type": "string"
+                },
+                "PropagateTags": {
+                    "type": "string"
+                },
+                "ReferenceId": {
+                    "type": "string"
+                },
+                "TagList": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                },
+                "TaskCount": {
+                    "type": "number"
+                },
+                "TaskDefinitionArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TaskDefinitionArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.HttpParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "PathParameterValues": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "QueryStringParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.InputTransformer": {
+            "additionalProperties": false,
+            "properties": {
+                "InputPathsMap": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "InputTemplate": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputTemplate"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.KinesisParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "PartitionKeyPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PartitionKeyPath"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsVpcConfiguration": {
+                    "$ref": "#/definitions/AWS::Events::Rule.AwsVpcConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.PlacementConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.PlacementStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "Field": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.RedshiftDataParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "DbUser": {
+                    "type": "string"
+                },
+                "SecretManagerArn": {
+                    "type": "string"
+                },
+                "Sql": {
+                    "type": "string"
+                },
+                "StatementName": {
+                    "type": "string"
+                },
+                "WithEvent": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Database",
+                "Sql"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.RetryPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumEventAgeInSeconds": {
+                    "type": "number"
+                },
+                "MaximumRetryAttempts": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.RunCommandParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RunCommandTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Events::Rule.RunCommandTarget"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "RunCommandTargets"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.RunCommandTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.SqsParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "MessageGroupId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MessageGroupId"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.Tag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.Target": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "BatchParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.BatchParameters"
+                },
+                "DeadLetterConfig": {
+                    "$ref": "#/definitions/AWS::Events::Rule.DeadLetterConfig"
+                },
+                "EcsParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.EcsParameters"
+                },
+                "HttpParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.HttpParameters"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Input": {
+                    "type": "string"
+                },
+                "InputPath": {
+                    "type": "string"
+                },
+                "InputTransformer": {
+                    "$ref": "#/definitions/AWS::Events::Rule.InputTransformer"
+                },
+                "KinesisParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.KinesisParameters"
+                },
+                "RedshiftDataParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.RedshiftDataParameters"
+                },
+                "RetryPolicy": {
+                    "$ref": "#/definitions/AWS::Events::Rule.RetryPolicy"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RunCommandParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.RunCommandParameters"
+                },
+                "SqsParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.SqsParameters"
+                }
+            },
+            "required": [
+                "Arn",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Experiment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "MetricGoals": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Experiment.MetricGoalObject"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OnlineAbConfig": {
+                            "$ref": "#/definitions/AWS::Evidently::Experiment.OnlineAbConfigObject"
+                        },
+                        "Project": {
+                            "type": "string"
+                        },
+                        "RandomizationSalt": {
+                            "type": "string"
+                        },
+                        "SamplingRate": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Treatments": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Experiment.TreatmentObject"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MetricGoals",
+                        "Name",
+                        "OnlineAbConfig",
+                        "Project",
+                        "Treatments"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Evidently::Experiment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Experiment.MetricGoalObject": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredChange": {
+                    "type": "string"
+                },
+                "EntityIdKey": {
+                    "type": "string"
+                },
+                "EventPattern": {
+                    "type": "string"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "UnitLabel": {
+                    "type": "string"
+                },
+                "ValueKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DesiredChange",
+                "EntityIdKey",
+                "EventPattern",
+                "MetricName",
+                "ValueKey"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Experiment.OnlineAbConfigObject": {
+            "additionalProperties": false,
+            "properties": {
+                "ControlTreatmentName": {
+                    "type": "string"
+                },
+                "TreatmentWeights": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Evidently::Experiment.TreatmentToWeight"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Evidently::Experiment.TreatmentObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Feature": {
+                    "type": "string"
+                },
+                "TreatmentName": {
+                    "type": "string"
+                },
+                "Variation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Feature",
+                "TreatmentName",
+                "Variation"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Experiment.TreatmentToWeight": {
+            "additionalProperties": false,
+            "properties": {
+                "SplitWeight": {
+                    "type": "number"
+                },
+                "Treatment": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SplitWeight",
+                "Treatment"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Feature": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DefaultVariation": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EntityOverrides": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Feature.EntityOverride"
+                            },
+                            "type": "array"
+                        },
+                        "EvaluationStrategy": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Project": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Variations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Feature.VariationObject"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Project",
+                        "Variations"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Evidently::Feature"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Feature.EntityOverride": {
+            "additionalProperties": false,
+            "properties": {
+                "EntityId": {
+                    "type": "string"
+                },
+                "Variation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Evidently::Feature.VariationObject": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanValue": {
+                    "type": "boolean"
+                },
+                "DoubleValue": {
+                    "type": "number"
+                },
+                "LongValue": {
+                    "type": "number"
+                },
+                "StringValue": {
+                    "type": "string"
+                },
+                "VariationName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Evidently::Launch": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Groups": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Launch.LaunchGroupObject"
+                            },
+                            "type": "array"
+                        },
+                        "MetricMonitors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Launch.MetricDefinitionObject"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Project": {
+                            "type": "string"
+                        },
+                        "RandomizationSalt": {
+                            "type": "string"
+                        },
+                        "ScheduledSplitsConfig": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Launch.StepConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Groups",
+                        "Name",
+                        "Project",
+                        "ScheduledSplitsConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Evidently::Launch"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Launch.GroupToWeight": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupName": {
+                    "type": "string"
+                },
+                "SplitWeight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "GroupName",
+                "SplitWeight"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Launch.LaunchGroupObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Feature": {
+                    "type": "string"
+                },
+                "GroupName": {
+                    "type": "string"
+                },
+                "Variation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Feature",
+                "GroupName",
+                "Variation"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Launch.MetricDefinitionObject": {
+            "additionalProperties": false,
+            "properties": {
+                "EntityIdKey": {
+                    "type": "string"
+                },
+                "EventPattern": {
+                    "type": "string"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "UnitLabel": {
+                    "type": "string"
+                },
+                "ValueKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EntityIdKey",
+                "EventPattern",
+                "MetricName",
+                "ValueKey"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Launch.StepConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupWeights": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Evidently::Launch.GroupToWeight"
+                    },
+                    "type": "array"
+                },
+                "StartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupWeights",
+                "StartTime"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataDelivery": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Evidently::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Project.DataDeliveryObject": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroup": {
+                    "type": "string"
+                },
+                "S3": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Evidently::Project.S3Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::FIS::ExperimentTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::FIS::ExperimentTemplate.ExperimentTemplateAction"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StopConditions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FIS::ExperimentTemplate.ExperimentTemplateStopCondition"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Targets": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::FIS::ExperimentTemplate.ExperimentTemplateTarget"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "RoleArn",
+                        "StopConditions",
+                        "Tags",
+                        "Targets"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FIS::ExperimentTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FIS::ExperimentTemplate.ExperimentTemplateAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionId": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "StartAfter": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Targets": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "required": [
+                "ActionId"
+            ],
+            "type": "object"
+        },
+        "AWS::FIS::ExperimentTemplate.ExperimentTemplateStopCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Source": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Source"
+            ],
+            "type": "object"
+        },
+        "AWS::FIS::ExperimentTemplate.ExperimentTemplateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Filters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FIS::ExperimentTemplate.ExperimentTemplateTargetFilter"
+                    },
+                    "type": "array"
+                },
+                "ResourceArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ResourceTags": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ResourceType": {
+                    "type": "string"
+                },
+                "SelectionMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceType",
+                "SelectionMode"
+            ],
+            "type": "object"
+        },
+        "AWS::FIS::ExperimentTemplate.ExperimentTemplateTargetFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Path": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Path",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::FMS::NotificationChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SnsRoleName": {
+                            "type": "string"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SnsRoleName",
+                        "SnsTopicArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FMS::NotificationChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FMS::Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeleteAllPolicyResources": {
+                            "type": "boolean"
+                        },
+                        "ExcludeMap": {
+                            "$ref": "#/definitions/AWS::FMS::Policy.IEMap"
+                        },
+                        "ExcludeResourceTags": {
+                            "type": "boolean"
+                        },
+                        "IncludeMap": {
+                            "$ref": "#/definitions/AWS::FMS::Policy.IEMap"
+                        },
+                        "PolicyName": {
+                            "type": "string"
+                        },
+                        "RemediationEnabled": {
+                            "type": "boolean"
+                        },
+                        "ResourceTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FMS::Policy.ResourceTag"
+                            },
+                            "type": "array"
+                        },
+                        "ResourceType": {
+                            "type": "string"
+                        },
+                        "ResourceTypeList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ResourcesCleanUp": {
+                            "type": "boolean"
+                        },
+                        "SecurityServicePolicyData": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FMS::Policy.PolicyTag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ExcludeResourceTags",
+                        "PolicyName",
+                        "RemediationEnabled",
+                        "ResourceType",
+                        "SecurityServicePolicyData"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FMS::Policy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FMS::Policy.IEMap": {
+            "additionalProperties": false,
+            "properties": {
+                "ACCOUNT": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ORGUNIT": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FMS::Policy.PolicyTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::FMS::Policy.ResourceTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BackupId": {
+                            "type": "string"
+                        },
+                        "FileSystemType": {
+                            "type": "string"
+                        },
+                        "FileSystemTypeVersion": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LustreConfiguration": {
+                            "$ref": "#/definitions/AWS::FSx::FileSystem.LustreConfiguration"
+                        },
+                        "OntapConfiguration": {
+                            "$ref": "#/definitions/AWS::FSx::FileSystem.OntapConfiguration"
+                        },
+                        "OpenZFSConfiguration": {
+                            "$ref": "#/definitions/AWS::FSx::FileSystem.OpenZFSConfiguration"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "StorageCapacity": {
+                            "type": "number"
+                        },
+                        "StorageType": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WindowsConfiguration": {
+                            "$ref": "#/definitions/AWS::FSx::FileSystem.WindowsConfiguration"
+                        }
+                    },
+                    "required": [
+                        "FileSystemType",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FSx::FileSystem"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.AuditLogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuditLogDestination": {
+                    "type": "string"
+                },
+                "FileAccessAuditLogLevel": {
+                    "type": "string"
+                },
+                "FileShareAccessAuditLogLevel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FileAccessAuditLogLevel",
+                "FileShareAccessAuditLogLevel"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.ClientConfigurations": {
+            "additionalProperties": false,
+            "properties": {
+                "Clients": {
+                    "type": "string"
+                },
+                "Options": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.DiskIopsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.LustreConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoImportPolicy": {
+                    "type": "string"
+                },
+                "AutomaticBackupRetentionDays": {
+                    "type": "number"
+                },
+                "CopyTagsToBackups": {
+                    "type": "boolean"
+                },
+                "DailyAutomaticBackupStartTime": {
+                    "type": "string"
+                },
+                "DataCompressionType": {
+                    "type": "string"
+                },
+                "DeploymentType": {
+                    "type": "string"
+                },
+                "DriveCacheType": {
+                    "type": "string"
+                },
+                "ExportPath": {
+                    "type": "string"
+                },
+                "ImportPath": {
+                    "type": "string"
+                },
+                "ImportedFileChunkSize": {
+                    "type": "number"
+                },
+                "PerUnitStorageThroughput": {
+                    "type": "number"
+                },
+                "WeeklyMaintenanceStartTime": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.NfsExports": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FSx::FileSystem.ClientConfigurations"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.OntapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomaticBackupRetentionDays": {
+                    "type": "number"
+                },
+                "DailyAutomaticBackupStartTime": {
+                    "type": "string"
+                },
+                "DeploymentType": {
+                    "type": "string"
+                },
+                "DiskIopsConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.DiskIopsConfiguration"
+                },
+                "EndpointIpAddressRange": {
+                    "type": "string"
+                },
+                "FsxAdminPassword": {
+                    "type": "string"
+                },
+                "PreferredSubnetId": {
+                    "type": "string"
+                },
+                "RouteTableIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ThroughputCapacity": {
+                    "type": "number"
+                },
+                "WeeklyMaintenanceStartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeploymentType"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.OpenZFSConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomaticBackupRetentionDays": {
+                    "type": "number"
+                },
+                "CopyTagsToBackups": {
+                    "type": "boolean"
+                },
+                "CopyTagsToVolumes": {
+                    "type": "boolean"
+                },
+                "DailyAutomaticBackupStartTime": {
+                    "type": "string"
+                },
+                "DeploymentType": {
+                    "type": "string"
+                },
+                "DiskIopsConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.DiskIopsConfiguration"
+                },
+                "RootVolumeConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.RootVolumeConfiguration"
+                },
+                "ThroughputCapacity": {
+                    "type": "number"
+                },
+                "WeeklyMaintenanceStartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeploymentType"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.RootVolumeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyTagsToSnapshots": {
+                    "type": "boolean"
+                },
+                "DataCompressionType": {
+                    "type": "string"
+                },
+                "NfsExports": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FSx::FileSystem.NfsExports"
+                    },
+                    "type": "array"
+                },
+                "ReadOnly": {
+                    "type": "boolean"
+                },
+                "UserAndGroupQuotas": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FSx::FileSystem.UserAndGroupQuotas"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.SelfManagedActiveDirectoryConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DnsIps": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DomainName": {
+                    "type": "string"
+                },
+                "FileSystemAdministratorsGroup": {
+                    "type": "string"
+                },
+                "OrganizationalUnitDistinguishedName": {
+                    "type": "string"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "UserName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.UserAndGroupQuotas": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "number"
+                },
+                "StorageCapacityQuotaGiB": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.WindowsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveDirectoryId": {
+                    "type": "string"
+                },
+                "Aliases": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AuditLogConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.AuditLogConfiguration"
+                },
+                "AutomaticBackupRetentionDays": {
+                    "type": "number"
+                },
+                "CopyTagsToBackups": {
+                    "type": "boolean"
+                },
+                "DailyAutomaticBackupStartTime": {
+                    "type": "string"
+                },
+                "DeploymentType": {
+                    "type": "string"
+                },
+                "PreferredSubnetId": {
+                    "type": "string"
+                },
+                "SelfManagedActiveDirectoryConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.SelfManagedActiveDirectoryConfiguration"
+                },
+                "ThroughputCapacity": {
+                    "type": "number"
+                },
+                "WeeklyMaintenanceStartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ThroughputCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::FinSpace::Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataBundles": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FederationMode": {
+                            "type": "string"
+                        },
+                        "FederationParameters": {
+                            "$ref": "#/definitions/AWS::FinSpace::Environment.FederationParameters"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SuperuserParameters": {
+                            "$ref": "#/definitions/AWS::FinSpace::Environment.SuperuserParameters"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FinSpace::Environment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FinSpace::Environment.FederationParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationCallBackURL": {
+                    "type": "string"
+                },
+                "AttributeMap": {
+                    "type": "object"
+                },
+                "FederationProviderName": {
+                    "type": "string"
+                },
+                "FederationURN": {
+                    "type": "string"
+                },
+                "SamlMetadataDocument": {
+                    "type": "string"
+                },
+                "SamlMetadataURL": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FinSpace::Environment.SuperuserParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "EmailAddress": {
+                    "type": "string"
+                },
+                "FirstName": {
+                    "type": "string"
+                },
+                "LastName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatedModels": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FraudDetector::Detector.Model"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "DetectorVersionStatus": {
+                            "type": "string"
+                        },
+                        "EventType": {
+                            "$ref": "#/definitions/AWS::FraudDetector::Detector.EventType"
+                        },
+                        "RuleExecutionMode": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FraudDetector::Detector.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DetectorId",
+                        "EventType",
+                        "Rules"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::Detector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.EntityType": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.EventType": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "EntityTypes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FraudDetector::Detector.EntityType"
+                    },
+                    "type": "array"
+                },
+                "EventVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FraudDetector::Detector.EventVariable"
+                    },
+                    "type": "array"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "Labels": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FraudDetector::Detector.Label"
+                    },
+                    "type": "array"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.EventVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "DataSource": {
+                    "type": "string"
+                },
+                "DataType": {
+                    "type": "string"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                },
+                "VariableType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.Label": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.Model": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.Outcome": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DetectorId": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                },
+                "Language": {
+                    "type": "string"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Outcomes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FraudDetector::Detector.Outcome"
+                    },
+                    "type": "array"
+                },
+                "RuleId": {
+                    "type": "string"
+                },
+                "RuleVersion": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::EntityType": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::EntityType"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FraudDetector::EventType": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EntityTypes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FraudDetector::EventType.EntityType"
+                            },
+                            "type": "array"
+                        },
+                        "EventVariables": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FraudDetector::EventType.EventVariable"
+                            },
+                            "type": "array"
+                        },
+                        "Labels": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FraudDetector::EventType.Label"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EntityTypes",
+                        "EventVariables",
+                        "Labels",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::EventType"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FraudDetector::EventType.EntityType": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::EventType.EventVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "DataSource": {
+                    "type": "string"
+                },
+                "DataType": {
+                    "type": "string"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                },
+                "VariableType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::EventType.Label": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Label": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::Label"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FraudDetector::Outcome": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::Outcome"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FraudDetector::Variable": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataSource": {
+                            "type": "string"
+                        },
+                        "DataType": {
+                            "type": "string"
+                        },
+                        "DefaultValue": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VariableType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DataSource",
+                        "DataType",
+                        "DefaultValue",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::Variable"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Alias": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RoutingStrategy": {
+                            "$ref": "#/definitions/AWS::GameLift::Alias.RoutingStrategy"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "RoutingStrategy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::Alias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Alias.RoutingStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "FleetId": {
+                    "type": "string"
+                },
+                "Message": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Build": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "OperatingSystem": {
+                            "type": "string"
+                        },
+                        "StorageLocation": {
+                            "$ref": "#/definitions/AWS::GameLift::Build.S3Location"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::Build"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Build.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BuildId": {
+                            "type": "string"
+                        },
+                        "CertificateConfiguration": {
+                            "$ref": "#/definitions/AWS::GameLift::Fleet.CertificateConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DesiredEC2Instances": {
+                            "type": "number"
+                        },
+                        "EC2InboundPermissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::Fleet.IpPermission"
+                            },
+                            "type": "array"
+                        },
+                        "EC2InstanceType": {
+                            "type": "string"
+                        },
+                        "FleetType": {
+                            "type": "string"
+                        },
+                        "InstanceRoleARN": {
+                            "type": "string"
+                        },
+                        "Locations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::Fleet.LocationConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "MaxSize": {
+                            "type": "number"
+                        },
+                        "MetricGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NewGameSessionProtectionPolicy": {
+                            "type": "string"
+                        },
+                        "PeerVpcAwsAccountId": {
+                            "type": "string"
+                        },
+                        "PeerVpcId": {
+                            "type": "string"
+                        },
+                        "ResourceCreationLimitPolicy": {
+                            "$ref": "#/definitions/AWS::GameLift::Fleet.ResourceCreationLimitPolicy"
+                        },
+                        "RuntimeConfiguration": {
+                            "$ref": "#/definitions/AWS::GameLift::Fleet.RuntimeConfiguration"
+                        },
+                        "ScriptId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::Fleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.CertificateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateType"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.IpPermission": {
+            "additionalProperties": false,
+            "properties": {
+                "FromPort": {
+                    "type": "number"
+                },
+                "IpRange": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FromPort",
+                "IpRange",
+                "Protocol",
+                "ToPort"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.LocationCapacity": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredEC2Instances": {
+                    "type": "number"
+                },
+                "MaxSize": {
+                    "type": "number"
+                },
+                "MinSize": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DesiredEC2Instances",
+                "MaxSize",
+                "MinSize"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.LocationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Location": {
+                    "type": "string"
+                },
+                "LocationCapacity": {
+                    "$ref": "#/definitions/AWS::GameLift::Fleet.LocationCapacity"
+                }
+            },
+            "required": [
+                "Location"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.ResourceCreationLimitPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "NewGameSessionsPerCreator": {
+                    "type": "number"
+                },
+                "PolicyPeriodInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.RuntimeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GameSessionActivationTimeoutSeconds": {
+                    "type": "number"
+                },
+                "MaxConcurrentGameSessionActivations": {
+                    "type": "number"
+                },
+                "ServerProcesses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::GameLift::Fleet.ServerProcess"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.ServerProcess": {
+            "additionalProperties": false,
+            "properties": {
+                "ConcurrentExecutions": {
+                    "type": "number"
+                },
+                "LaunchPath": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConcurrentExecutions",
+                "LaunchPath"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameServerGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingPolicy": {
+                            "$ref": "#/definitions/AWS::GameLift::GameServerGroup.AutoScalingPolicy"
+                        },
+                        "BalancingStrategy": {
+                            "type": "string"
+                        },
+                        "DeleteOption": {
+                            "type": "string"
+                        },
+                        "GameServerGroupName": {
+                            "type": "string"
+                        },
+                        "GameServerProtectionPolicy": {
+                            "type": "string"
+                        },
+                        "InstanceDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::GameServerGroup.InstanceDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchTemplate": {
+                            "$ref": "#/definitions/AWS::GameLift::GameServerGroup.LaunchTemplate"
+                        },
+                        "MaxSize": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSubnets": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "GameServerGroupName",
+                        "InstanceDefinitions",
+                        "LaunchTemplate",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::GameServerGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameServerGroup.AutoScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "EstimatedInstanceWarmup": {
+                    "type": "number"
+                },
+                "TargetTrackingConfiguration": {
+                    "$ref": "#/definitions/AWS::GameLift::GameServerGroup.TargetTrackingConfiguration"
+                }
+            },
+            "required": [
+                "TargetTrackingConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameServerGroup.InstanceDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameServerGroup.LaunchTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::GameServerGroup.TargetTrackingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameSessionQueue": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomEventData": {
+                            "type": "string"
+                        },
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::GameSessionQueue.Destination"
+                            },
+                            "type": "array"
+                        },
+                        "FilterConfiguration": {
+                            "$ref": "#/definitions/AWS::GameLift::GameSessionQueue.FilterConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NotificationTarget": {
+                            "type": "string"
+                        },
+                        "PlayerLatencyPolicies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::GameSessionQueue.PlayerLatencyPolicy"
+                            },
+                            "type": "array"
+                        },
+                        "PriorityConfiguration": {
+                            "$ref": "#/definitions/AWS::GameLift::GameSessionQueue.PriorityConfiguration"
+                        },
+                        "TimeoutInSeconds": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::GameSessionQueue"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameSessionQueue.Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::GameSessionQueue.FilterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedLocations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::GameSessionQueue.PlayerLatencyPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumIndividualPlayerLatencyMilliseconds": {
+                    "type": "number"
+                },
+                "PolicyDurationSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::GameSessionQueue.PriorityConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LocationOrder": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PriorityOrder": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::MatchmakingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptanceRequired": {
+                            "type": "boolean"
+                        },
+                        "AcceptanceTimeoutSeconds": {
+                            "type": "number"
+                        },
+                        "AdditionalPlayerCount": {
+                            "type": "number"
+                        },
+                        "BackfillMode": {
+                            "type": "string"
+                        },
+                        "CustomEventData": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FlexMatchMode": {
+                            "type": "string"
+                        },
+                        "GameProperties": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::MatchmakingConfiguration.GameProperty"
+                            },
+                            "type": "array"
+                        },
+                        "GameSessionData": {
+                            "type": "string"
+                        },
+                        "GameSessionQueueArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NotificationTarget": {
+                            "type": "string"
+                        },
+                        "RequestTimeoutSeconds": {
+                            "type": "number"
+                        },
+                        "RuleSetName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AcceptanceRequired",
+                        "Name",
+                        "RequestTimeoutSeconds",
+                        "RuleSetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::MatchmakingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::MatchmakingConfiguration.GameProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::MatchmakingRuleSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RuleSetBody": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "RuleSetBody"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::MatchmakingRuleSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Script": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "StorageLocation": {
+                            "$ref": "#/definitions/AWS::GameLift::Script.S3Location"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "StorageLocation"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::Script"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Script.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::Accelerator": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "IpAddressType": {
+                            "type": "string"
+                        },
+                        "IpAddresses": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GlobalAccelerator::Accelerator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::EndpointGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EndpointConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GlobalAccelerator::EndpointGroup.EndpointConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "EndpointGroupRegion": {
+                            "type": "string"
+                        },
+                        "HealthCheckIntervalSeconds": {
+                            "type": "number"
+                        },
+                        "HealthCheckPath": {
+                            "type": "string"
+                        },
+                        "HealthCheckPort": {
+                            "type": "number"
+                        },
+                        "HealthCheckProtocol": {
+                            "type": "string"
+                        },
+                        "ListenerArn": {
+                            "type": "string"
+                        },
+                        "PortOverrides": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GlobalAccelerator::EndpointGroup.PortOverride"
+                            },
+                            "type": "array"
+                        },
+                        "ThresholdCount": {
+                            "type": "number"
+                        },
+                        "TrafficDialPercentage": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "EndpointGroupRegion",
+                        "ListenerArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GlobalAccelerator::EndpointGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::EndpointGroup.EndpointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIPPreservationEnabled": {
+                    "type": "boolean"
+                },
+                "EndpointId": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "EndpointId"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::EndpointGroup.PortOverride": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointPort": {
+                    "type": "number"
+                },
+                "ListenerPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "EndpointPort",
+                "ListenerPort"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::Listener": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceleratorArn": {
+                            "type": "string"
+                        },
+                        "ClientAffinity": {
+                            "type": "string"
+                        },
+                        "PortRanges": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GlobalAccelerator::Listener.PortRange"
+                            },
+                            "type": "array"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AcceleratorArn",
+                        "PortRanges",
+                        "Protocol"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GlobalAccelerator::Listener"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::Listener.PortRange": {
+            "additionalProperties": false,
+            "properties": {
+                "FromPort": {
+                    "type": "number"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FromPort",
+                "ToPort"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Classifier": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CsvClassifier": {
+                            "$ref": "#/definitions/AWS::Glue::Classifier.CsvClassifier"
+                        },
+                        "GrokClassifier": {
+                            "$ref": "#/definitions/AWS::Glue::Classifier.GrokClassifier"
+                        },
+                        "JsonClassifier": {
+                            "$ref": "#/definitions/AWS::Glue::Classifier.JsonClassifier"
+                        },
+                        "XMLClassifier": {
+                            "$ref": "#/definitions/AWS::Glue::Classifier.XMLClassifier"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Classifier"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Classifier.CsvClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowSingleColumn": {
+                    "type": "boolean"
+                },
+                "ContainsHeader": {
+                    "type": "string"
+                },
+                "Delimiter": {
+                    "type": "string"
+                },
+                "DisableValueTrimming": {
+                    "type": "boolean"
+                },
+                "Header": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "QuoteSymbol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Classifier.GrokClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "Classification": {
+                    "type": "string"
+                },
+                "CustomPatterns": {
+                    "type": "string"
+                },
+                "GrokPattern": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Classification",
+                "GrokPattern"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Classifier.JsonClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonPath": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "JsonPath"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Classifier.XMLClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "Classification": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "RowTag": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Classification",
+                "RowTag"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Connection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CatalogId": {
+                            "type": "string"
+                        },
+                        "ConnectionInput": {
+                            "$ref": "#/definitions/AWS::Glue::Connection.ConnectionInput"
+                        }
+                    },
+                    "required": [
+                        "CatalogId",
+                        "ConnectionInput"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Connection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Connection.ConnectionInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionProperties": {
+                    "type": "object"
+                },
+                "ConnectionType": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "MatchCriteria": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "PhysicalConnectionRequirements": {
+                    "$ref": "#/definitions/AWS::Glue::Connection.PhysicalConnectionRequirements"
+                }
+            },
+            "required": [
+                "ConnectionType"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Connection.PhysicalConnectionRequirements": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "SecurityGroupIdList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Classifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Configuration": {
+                            "type": "string"
+                        },
+                        "CrawlerSecurityConfiguration": {
+                            "type": "string"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RecrawlPolicy": {
+                            "$ref": "#/definitions/AWS::Glue::Crawler.RecrawlPolicy"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "$ref": "#/definitions/AWS::Glue::Crawler.Schedule"
+                        },
+                        "SchemaChangePolicy": {
+                            "$ref": "#/definitions/AWS::Glue::Crawler.SchemaChangePolicy"
+                        },
+                        "TablePrefix": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Targets": {
+                            "$ref": "#/definitions/AWS::Glue::Crawler.Targets"
+                        }
+                    },
+                    "required": [
+                        "Role",
+                        "Targets"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Crawler"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.CatalogTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Tables": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.DynamoDBTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.JdbcTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionName": {
+                    "type": "string"
+                },
+                "Exclusions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.RecrawlPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "RecrawlBehavior": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.S3Target": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionName": {
+                    "type": "string"
+                },
+                "Exclusions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.SchemaChangePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteBehavior": {
+                    "type": "string"
+                },
+                "UpdateBehavior": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.Targets": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Crawler.CatalogTarget"
+                    },
+                    "type": "array"
+                },
+                "DynamoDBTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Crawler.DynamoDBTarget"
+                    },
+                    "type": "array"
+                },
+                "JdbcTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Crawler.JdbcTarget"
+                    },
+                    "type": "array"
+                },
+                "S3Targets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Crawler.S3Target"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::DataCatalogEncryptionSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CatalogId": {
+                            "type": "string"
+                        },
+                        "DataCatalogEncryptionSettings": {
+                            "$ref": "#/definitions/AWS::Glue::DataCatalogEncryptionSettings.DataCatalogEncryptionSettings"
+                        }
+                    },
+                    "required": [
+                        "CatalogId",
+                        "DataCatalogEncryptionSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::DataCatalogEncryptionSettings"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::DataCatalogEncryptionSettings.ConnectionPasswordEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "ReturnConnectionPasswordEncrypted": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::DataCatalogEncryptionSettings.DataCatalogEncryptionSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionPasswordEncryption": {
+                    "$ref": "#/definitions/AWS::Glue::DataCatalogEncryptionSettings.ConnectionPasswordEncryption"
+                },
+                "EncryptionAtRest": {
+                    "$ref": "#/definitions/AWS::Glue::DataCatalogEncryptionSettings.EncryptionAtRest"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::DataCatalogEncryptionSettings.EncryptionAtRest": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogEncryptionMode": {
+                    "type": "string"
+                },
+                "SseAwsKmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Database": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CatalogId": {
+                            "type": "string"
+                        },
+                        "DatabaseInput": {
+                            "$ref": "#/definitions/AWS::Glue::Database.DatabaseInput"
+                        }
+                    },
+                    "required": [
+                        "CatalogId",
+                        "DatabaseInput"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Database"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Database.DataLakePrincipal": {
+            "additionalProperties": false,
+            "properties": {
+                "DataLakePrincipalIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Database.DatabaseIdentifier": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Database.DatabaseInput": {
+            "additionalProperties": false,
+            "properties": {
+                "CreateTableDefaultPermissions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Database.PrincipalPrivileges"
+                    },
+                    "type": "array"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "LocationUri": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "TargetDatabase": {
+                    "$ref": "#/definitions/AWS::Glue::Database.DatabaseIdentifier"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Database.PrincipalPrivileges": {
+            "additionalProperties": false,
+            "properties": {
+                "Permissions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "$ref": "#/definitions/AWS::Glue::Database.DataLakePrincipal"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::DevEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Arguments": {
+                            "type": "object"
+                        },
+                        "EndpointName": {
+                            "type": "string"
+                        },
+                        "ExtraJarsS3Path": {
+                            "type": "string"
+                        },
+                        "ExtraPythonLibsS3Path": {
+                            "type": "string"
+                        },
+                        "GlueVersion": {
+                            "type": "string"
+                        },
+                        "NumberOfNodes": {
+                            "type": "number"
+                        },
+                        "NumberOfWorkers": {
+                            "type": "number"
+                        },
+                        "PublicKey": {
+                            "type": "string"
+                        },
+                        "PublicKeys": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "SecurityConfiguration": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "WorkerType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::DevEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Job": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocatedCapacity": {
+                            "type": "number"
+                        },
+                        "Command": {
+                            "$ref": "#/definitions/AWS::Glue::Job.JobCommand"
+                        },
+                        "Connections": {
+                            "$ref": "#/definitions/AWS::Glue::Job.ConnectionsList"
+                        },
+                        "DefaultArguments": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ExecutionProperty": {
+                            "$ref": "#/definitions/AWS::Glue::Job.ExecutionProperty"
+                        },
+                        "GlueVersion": {
+                            "type": "string"
+                        },
+                        "LogUri": {
+                            "type": "string"
+                        },
+                        "MaxCapacity": {
+                            "type": "number"
+                        },
+                        "MaxRetries": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NotificationProperty": {
+                            "$ref": "#/definitions/AWS::Glue::Job.NotificationProperty"
+                        },
+                        "NumberOfWorkers": {
+                            "type": "number"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "SecurityConfiguration": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Timeout": {
+                            "type": "number"
+                        },
+                        "WorkerType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Command",
+                        "Role"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Job"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Job.ConnectionsList": {
+            "additionalProperties": false,
+            "properties": {
+                "Connections": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Job.ExecutionProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConcurrentRuns": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Job.JobCommand": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "PythonVersion": {
+                    "type": "string"
+                },
+                "ScriptLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Job.NotificationProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "NotifyDelayAfter": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "GlueVersion": {
+                            "type": "string"
+                        },
+                        "InputRecordTables": {
+                            "$ref": "#/definitions/AWS::Glue::MLTransform.InputRecordTables"
+                        },
+                        "MaxCapacity": {
+                            "type": "number"
+                        },
+                        "MaxRetries": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NumberOfWorkers": {
+                            "type": "number"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Timeout": {
+                            "type": "number"
+                        },
+                        "TransformEncryption": {
+                            "$ref": "#/definitions/AWS::Glue::MLTransform.TransformEncryption"
+                        },
+                        "TransformParameters": {
+                            "$ref": "#/definitions/AWS::Glue::MLTransform.TransformParameters"
+                        },
+                        "WorkerType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InputRecordTables",
+                        "Role",
+                        "TransformParameters"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::MLTransform"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.FindMatchesParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "AccuracyCostTradeoff": {
+                    "type": "number"
+                },
+                "EnforceProvidedLabels": {
+                    "type": "boolean"
+                },
+                "PrecisionRecallTradeoff": {
+                    "type": "number"
+                },
+                "PrimaryKeyColumnName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PrimaryKeyColumnName"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.GlueTables": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "ConnectionName": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.InputRecordTables": {
+            "additionalProperties": false,
+            "properties": {
+                "GlueTables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::MLTransform.GlueTables"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.MLUserDataEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MLUserDataEncryptionMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MLUserDataEncryptionMode"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.TransformEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "MLUserDataEncryption": {
+                    "$ref": "#/definitions/AWS::Glue::MLTransform.MLUserDataEncryption"
+                },
+                "TaskRunSecurityConfigurationName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.TransformParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "FindMatchesParameters": {
+                    "$ref": "#/definitions/AWS::Glue::MLTransform.FindMatchesParameters"
+                },
+                "TransformType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TransformType"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Partition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CatalogId": {
+                            "type": "string"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "PartitionInput": {
+                            "$ref": "#/definitions/AWS::Glue::Partition.PartitionInput"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CatalogId",
+                        "DatabaseName",
+                        "PartitionInput",
+                        "TableName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Partition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Partition.Column": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Partition.Order": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "type": "string"
+                },
+                "SortOrder": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Column"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Partition.PartitionInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "type": "object"
+                },
+                "StorageDescriptor": {
+                    "$ref": "#/definitions/AWS::Glue::Partition.StorageDescriptor"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Partition.SchemaId": {
+            "additionalProperties": false,
+            "properties": {
+                "RegistryName": {
+                    "type": "string"
+                },
+                "SchemaArn": {
+                    "type": "string"
+                },
+                "SchemaName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Partition.SchemaReference": {
+            "additionalProperties": false,
+            "properties": {
+                "SchemaId": {
+                    "$ref": "#/definitions/AWS::Glue::Partition.SchemaId"
+                },
+                "SchemaVersionId": {
+                    "type": "string"
+                },
+                "SchemaVersionNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Partition.SerdeInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "SerializationLibrary": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Partition.SkewedInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "SkewedColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SkewedColumnValueLocationMaps": {
+                    "type": "object"
+                },
+                "SkewedColumnValues": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Partition.StorageDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Partition.Column"
+                    },
+                    "type": "array"
+                },
+                "Compressed": {
+                    "type": "boolean"
+                },
+                "InputFormat": {
+                    "type": "string"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "NumberOfBuckets": {
+                    "type": "number"
+                },
+                "OutputFormat": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "SchemaReference": {
+                    "$ref": "#/definitions/AWS::Glue::Partition.SchemaReference"
+                },
+                "SerdeInfo": {
+                    "$ref": "#/definitions/AWS::Glue::Partition.SerdeInfo"
+                },
+                "SkewedInfo": {
+                    "$ref": "#/definitions/AWS::Glue::Partition.SkewedInfo"
+                },
+                "SortColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Partition.Order"
+                    },
+                    "type": "array"
+                },
+                "StoredAsSubDirectories": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Registry": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Registry"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Schema": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CheckpointVersion": {
+                            "$ref": "#/definitions/AWS::Glue::Schema.SchemaVersion"
+                        },
+                        "Compatibility": {
+                            "type": "string"
+                        },
+                        "DataFormat": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Registry": {
+                            "$ref": "#/definitions/AWS::Glue::Schema.Registry"
+                        },
+                        "SchemaDefinition": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Compatibility",
+                        "DataFormat",
+                        "Name",
+                        "SchemaDefinition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Schema"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Schema.Registry": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Schema.SchemaVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "IsLatest": {
+                    "type": "boolean"
+                },
+                "VersionNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SchemaVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Schema": {
+                            "$ref": "#/definitions/AWS::Glue::SchemaVersion.Schema"
+                        },
+                        "SchemaDefinition": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Schema",
+                        "SchemaDefinition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::SchemaVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::SchemaVersion.Schema": {
+            "additionalProperties": false,
+            "properties": {
+                "RegistryName": {
+                    "type": "string"
+                },
+                "SchemaArn": {
+                    "type": "string"
+                },
+                "SchemaName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SchemaVersionMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Key": {
+                            "type": "string"
+                        },
+                        "SchemaVersionId": {
+                            "type": "string"
+                        },
+                        "Value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Key",
+                        "SchemaVersionId",
+                        "Value"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::SchemaVersionMetadata"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Glue::SecurityConfiguration.EncryptionConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "EncryptionConfiguration",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::SecurityConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration.CloudWatchEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchEncryptionMode": {
+                    "type": "string"
+                },
+                "KmsKeyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchEncryption": {
+                    "$ref": "#/definitions/AWS::Glue::SecurityConfiguration.CloudWatchEncryption"
+                },
+                "JobBookmarksEncryption": {
+                    "$ref": "#/definitions/AWS::Glue::SecurityConfiguration.JobBookmarksEncryption"
+                },
+                "S3Encryptions": {
+                    "$ref": "#/definitions/AWS::Glue::SecurityConfiguration.S3Encryptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration.JobBookmarksEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "JobBookmarksEncryptionMode": {
+                    "type": "string"
+                },
+                "KmsKeyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration.S3Encryption": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyArn": {
+                    "type": "string"
+                },
+                "S3EncryptionMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration.S3Encryptions": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::Glue::Table": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CatalogId": {
+                            "type": "string"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "TableInput": {
+                            "$ref": "#/definitions/AWS::Glue::Table.TableInput"
+                        }
+                    },
+                    "required": [
+                        "CatalogId",
+                        "DatabaseName",
+                        "TableInput"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Table"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Table.Column": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Table.Order": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "type": "string"
+                },
+                "SortOrder": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Column",
+                "SortOrder"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Table.SchemaId": {
+            "additionalProperties": false,
+            "properties": {
+                "RegistryName": {
+                    "type": "string"
+                },
+                "SchemaArn": {
+                    "type": "string"
+                },
+                "SchemaName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.SchemaReference": {
+            "additionalProperties": false,
+            "properties": {
+                "SchemaId": {
+                    "$ref": "#/definitions/AWS::Glue::Table.SchemaId"
+                },
+                "SchemaVersionId": {
+                    "type": "string"
+                },
+                "SchemaVersionNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.SerdeInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "SerializationLibrary": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.SkewedInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "SkewedColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SkewedColumnValueLocationMaps": {
+                    "type": "object"
+                },
+                "SkewedColumnValues": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.StorageDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Table.Column"
+                    },
+                    "type": "array"
+                },
+                "Compressed": {
+                    "type": "boolean"
+                },
+                "InputFormat": {
+                    "type": "string"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "NumberOfBuckets": {
+                    "type": "number"
+                },
+                "OutputFormat": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "SchemaReference": {
+                    "$ref": "#/definitions/AWS::Glue::Table.SchemaReference"
+                },
+                "SerdeInfo": {
+                    "$ref": "#/definitions/AWS::Glue::Table.SerdeInfo"
+                },
+                "SkewedInfo": {
+                    "$ref": "#/definitions/AWS::Glue::Table.SkewedInfo"
+                },
+                "SortColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Table.Order"
+                    },
+                    "type": "array"
+                },
+                "StoredAsSubDirectories": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.TableIdentifier": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.TableInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Owner": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "PartitionKeys": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Table.Column"
+                    },
+                    "type": "array"
+                },
+                "Retention": {
+                    "type": "number"
+                },
+                "StorageDescriptor": {
+                    "$ref": "#/definitions/AWS::Glue::Table.StorageDescriptor"
+                },
+                "TableType": {
+                    "type": "string"
+                },
+                "TargetTable": {
+                    "$ref": "#/definitions/AWS::Glue::Table.TableIdentifier"
+                },
+                "ViewExpandedText": {
+                    "type": "string"
+                },
+                "ViewOriginalText": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Trigger": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                                "$ref": "#/definitions/AWS::Glue::Trigger.Action"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Predicate": {
+                            "$ref": "#/definitions/AWS::Glue::Trigger.Predicate"
+                        },
+                        "Schedule": {
+                            "type": "string"
+                        },
+                        "StartOnCreation": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "WorkflowName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Actions",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Trigger"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Trigger.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "Arguments": {
+                    "type": "object"
+                },
+                "CrawlerName": {
+                    "type": "string"
+                },
+                "JobName": {
+                    "type": "string"
+                },
+                "NotificationProperty": {
+                    "$ref": "#/definitions/AWS::Glue::Trigger.NotificationProperty"
+                },
+                "SecurityConfiguration": {
+                    "type": "string"
+                },
+                "Timeout": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Trigger.Condition": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlState": {
+                    "type": "string"
+                },
+                "CrawlerName": {
+                    "type": "string"
+                },
+                "JobName": {
+                    "type": "string"
+                },
+                "LogicalOperator": {
+                    "type": "string"
+                },
+                "State": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Trigger.NotificationProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "NotifyDelayAfter": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Trigger.Predicate": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Trigger.Condition"
+                    },
+                    "type": "array"
+                },
+                "Logical": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Workflow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "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::Greengrass::ConnectorDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::ConnectorDefinition.ConnectorDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::ConnectorDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ConnectorDefinition.Connector": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "ConnectorArn",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ConnectorDefinition.ConnectorDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Connectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::ConnectorDefinition.Connector"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Connectors"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ConnectorDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectorDefinitionId": {
+                            "type": "string"
+                        },
+                        "Connectors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::ConnectorDefinitionVersion.Connector"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConnectorDefinitionId",
+                        "Connectors"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::ConnectorDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ConnectorDefinitionVersion.Connector": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "ConnectorArn",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::CoreDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::CoreDefinition.CoreDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::CoreDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::CoreDefinition.Core": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "SyncShadow": {
+                    "type": "boolean"
+                },
+                "ThingArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn",
+                "Id",
+                "ThingArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::CoreDefinition.CoreDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Cores": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::CoreDefinition.Core"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Cores"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::CoreDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CoreDefinitionId": {
+                            "type": "string"
+                        },
+                        "Cores": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::CoreDefinitionVersion.Core"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CoreDefinitionId",
+                        "Cores"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::CoreDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::CoreDefinitionVersion.Core": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "SyncShadow": {
+                    "type": "boolean"
+                },
+                "ThingArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn",
+                "Id",
+                "ThingArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::DeviceDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::DeviceDefinition.DeviceDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::DeviceDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::DeviceDefinition.Device": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "SyncShadow": {
+                    "type": "boolean"
+                },
+                "ThingArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn",
+                "Id",
+                "ThingArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::DeviceDefinition.DeviceDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Devices": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::DeviceDefinition.Device"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Devices"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::DeviceDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeviceDefinitionId": {
+                            "type": "string"
+                        },
+                        "Devices": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::DeviceDefinitionVersion.Device"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DeviceDefinitionId",
+                        "Devices"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::DeviceDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::DeviceDefinitionVersion.Device": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "SyncShadow": {
+                    "type": "boolean"
+                },
+                "ThingArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn",
+                "Id",
+                "ThingArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.FunctionDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::FunctionDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.DefaultConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Execution": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.Execution"
+                }
+            },
+            "required": [
+                "Execution"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessSysfs": {
+                    "type": "boolean"
+                },
+                "Execution": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.Execution"
+                },
+                "ResourceAccessPolicies": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.ResourceAccessPolicy"
+                    },
+                    "type": "array"
+                },
+                "Variables": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.Execution": {
+            "additionalProperties": false,
+            "properties": {
+                "IsolationMode": {
+                    "type": "string"
+                },
+                "RunAs": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.RunAs"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.Function": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionArn": {
+                    "type": "string"
+                },
+                "FunctionConfiguration": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.FunctionConfiguration"
+                },
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FunctionArn",
+                "FunctionConfiguration",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.FunctionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncodingType": {
+                    "type": "string"
+                },
+                "Environment": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.Environment"
+                },
+                "ExecArgs": {
+                    "type": "string"
+                },
+                "Executable": {
+                    "type": "string"
+                },
+                "MemorySize": {
+                    "type": "number"
+                },
+                "Pinned": {
+                    "type": "boolean"
+                },
+                "Timeout": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.FunctionDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultConfig": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.DefaultConfig"
+                },
+                "Functions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.Function"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Functions"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.ResourceAccessPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Permission": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceId"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.RunAs": {
+            "additionalProperties": false,
+            "properties": {
+                "Gid": {
+                    "type": "number"
+                },
+                "Uid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DefaultConfig": {
+                            "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.DefaultConfig"
+                        },
+                        "FunctionDefinitionId": {
+                            "type": "string"
+                        },
+                        "Functions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.Function"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FunctionDefinitionId",
+                        "Functions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::FunctionDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.DefaultConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Execution": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.Execution"
+                }
+            },
+            "required": [
+                "Execution"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessSysfs": {
+                    "type": "boolean"
+                },
+                "Execution": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.Execution"
+                },
+                "ResourceAccessPolicies": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.ResourceAccessPolicy"
+                    },
+                    "type": "array"
+                },
+                "Variables": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.Execution": {
+            "additionalProperties": false,
+            "properties": {
+                "IsolationMode": {
+                    "type": "string"
+                },
+                "RunAs": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.RunAs"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.Function": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionArn": {
+                    "type": "string"
+                },
+                "FunctionConfiguration": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.FunctionConfiguration"
+                },
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FunctionArn",
+                "FunctionConfiguration",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.FunctionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncodingType": {
+                    "type": "string"
+                },
+                "Environment": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.Environment"
+                },
+                "ExecArgs": {
+                    "type": "string"
+                },
+                "Executable": {
+                    "type": "string"
+                },
+                "MemorySize": {
+                    "type": "number"
+                },
+                "Pinned": {
+                    "type": "boolean"
+                },
+                "Timeout": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.ResourceAccessPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Permission": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceId"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.RunAs": {
+            "additionalProperties": false,
+            "properties": {
+                "Gid": {
+                    "type": "number"
+                },
+                "Uid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::Group": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::Group.GroupVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::Group"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::Group.GroupVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "CoreDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "DeviceDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "FunctionDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "LoggerDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "ResourceDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "SubscriptionDefinitionVersionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::GroupVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectorDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "CoreDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "DeviceDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "FunctionDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "GroupId": {
+                            "type": "string"
+                        },
+                        "LoggerDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "ResourceDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "SubscriptionDefinitionVersionArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::GroupVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::LoggerDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::LoggerDefinition.LoggerDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::LoggerDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::LoggerDefinition.Logger": {
+            "additionalProperties": false,
+            "properties": {
+                "Component": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Level": {
+                    "type": "string"
+                },
+                "Space": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Component",
+                "Id",
+                "Level",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::LoggerDefinition.LoggerDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Loggers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::LoggerDefinition.Logger"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Loggers"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::LoggerDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LoggerDefinitionId": {
+                            "type": "string"
+                        },
+                        "Loggers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::LoggerDefinitionVersion.Logger"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "LoggerDefinitionId",
+                        "Loggers"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::LoggerDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::LoggerDefinitionVersion.Logger": {
+            "additionalProperties": false,
+            "properties": {
+                "Component": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Level": {
+                    "type": "string"
+                },
+                "Space": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Component",
+                "Id",
+                "Level",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.ResourceDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::ResourceDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.GroupOwnerSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoAddGroupOwner": {
+                    "type": "boolean"
+                },
+                "GroupOwner": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AutoAddGroupOwner"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.LocalDeviceResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupOwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.GroupOwnerSetting"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourcePath"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.LocalVolumeResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "GroupOwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.GroupOwnerSetting"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "SourcePath"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.ResourceDataContainer": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalDeviceResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.LocalDeviceResourceData"
+                },
+                "LocalVolumeResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.LocalVolumeResourceData"
+                },
+                "S3MachineLearningModelResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.S3MachineLearningModelResourceData"
+                },
+                "SageMakerMachineLearningModelResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.SageMakerMachineLearningModelResourceData"
+                },
+                "SecretsManagerSecretResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.SecretsManagerSecretResourceData"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.ResourceDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Resources": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.ResourceInstance"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Resources"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.ResourceDownloadOwnerSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupOwner": {
+                    "type": "string"
+                },
+                "GroupPermission": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupOwner",
+                "GroupPermission"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.ResourceInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "ResourceDataContainer": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.ResourceDataContainer"
+                }
+            },
+            "required": [
+                "Id",
+                "Name",
+                "ResourceDataContainer"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.S3MachineLearningModelResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "OwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.ResourceDownloadOwnerSetting"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.SageMakerMachineLearningModelResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "OwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.ResourceDownloadOwnerSetting"
+                },
+                "SageMakerJobArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "SageMakerJobArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.SecretsManagerSecretResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "ARN": {
+                    "type": "string"
+                },
+                "AdditionalStagingLabelsToDownload": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ARN"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceDefinitionId": {
+                            "type": "string"
+                        },
+                        "Resources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.ResourceInstance"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ResourceDefinitionId",
+                        "Resources"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::ResourceDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.GroupOwnerSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoAddGroupOwner": {
+                    "type": "boolean"
+                },
+                "GroupOwner": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AutoAddGroupOwner"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.LocalDeviceResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupOwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.GroupOwnerSetting"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourcePath"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.LocalVolumeResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "GroupOwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.GroupOwnerSetting"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "SourcePath"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.ResourceDataContainer": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalDeviceResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.LocalDeviceResourceData"
+                },
+                "LocalVolumeResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.LocalVolumeResourceData"
+                },
+                "S3MachineLearningModelResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.S3MachineLearningModelResourceData"
+                },
+                "SageMakerMachineLearningModelResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.SageMakerMachineLearningModelResourceData"
+                },
+                "SecretsManagerSecretResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.SecretsManagerSecretResourceData"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.ResourceDownloadOwnerSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupOwner": {
+                    "type": "string"
+                },
+                "GroupPermission": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupOwner",
+                "GroupPermission"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.ResourceInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "ResourceDataContainer": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.ResourceDataContainer"
+                }
+            },
+            "required": [
+                "Id",
+                "Name",
+                "ResourceDataContainer"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.S3MachineLearningModelResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "OwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.ResourceDownloadOwnerSetting"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.SageMakerMachineLearningModelResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "OwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.ResourceDownloadOwnerSetting"
+                },
+                "SageMakerJobArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "SageMakerJobArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.SecretsManagerSecretResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "ARN": {
+                    "type": "string"
+                },
+                "AdditionalStagingLabelsToDownload": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ARN"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::SubscriptionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::SubscriptionDefinition.SubscriptionDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::SubscriptionDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::SubscriptionDefinition.Subscription": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Subject": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id",
+                "Source",
+                "Subject",
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::SubscriptionDefinition.SubscriptionDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Subscriptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::SubscriptionDefinition.Subscription"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Subscriptions"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::SubscriptionDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SubscriptionDefinitionId": {
+                            "type": "string"
+                        },
+                        "Subscriptions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::SubscriptionDefinitionVersion.Subscription"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubscriptionDefinitionId",
+                        "Subscriptions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::SubscriptionDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::SubscriptionDefinitionVersion.Subscription": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Subject": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id",
+                "Source",
+                "Subject",
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InlineRecipe": {
+                            "type": "string"
+                        },
+                        "LambdaFunction": {
+                            "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaFunctionRecipeSource"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GreengrassV2::ComponentVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.ComponentDependencyRequirement": {
+            "additionalProperties": false,
+            "properties": {
+                "DependencyType": {
+                    "type": "string"
+                },
+                "VersionRequirement": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.ComponentPlatform": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaContainerParams": {
+            "additionalProperties": false,
+            "properties": {
+                "Devices": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaDeviceMount"
+                    },
+                    "type": "array"
+                },
+                "MemorySizeInKB": {
+                    "type": "number"
+                },
+                "MountROSysfs": {
+                    "type": "boolean"
+                },
+                "Volumes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaVolumeMount"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaDeviceMount": {
+            "additionalProperties": false,
+            "properties": {
+                "AddGroupOwner": {
+                    "type": "boolean"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Permission": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaEventSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Topic": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaExecutionParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "EnvironmentVariables": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "EventSources": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaEventSource"
+                    },
+                    "type": "array"
+                },
+                "ExecArgs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InputPayloadEncodingType": {
+                    "type": "string"
+                },
+                "LinuxProcessParams": {
+                    "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaLinuxProcessParams"
+                },
+                "MaxIdleTimeInSeconds": {
+                    "type": "number"
+                },
+                "MaxInstancesCount": {
+                    "type": "number"
+                },
+                "MaxQueueSize": {
+                    "type": "number"
+                },
+                "Pinned": {
+                    "type": "boolean"
+                },
+                "StatusTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "TimeoutInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaFunctionRecipeSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentDependencies": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.ComponentDependencyRequirement"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ComponentLambdaParameters": {
+                    "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaExecutionParameters"
+                },
+                "ComponentName": {
+                    "type": "string"
+                },
+                "ComponentPlatforms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.ComponentPlatform"
+                    },
+                    "type": "array"
+                },
+                "ComponentVersion": {
+                    "type": "string"
+                },
+                "LambdaArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaLinuxProcessParams": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerParams": {
+                    "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaContainerParams"
+                },
+                "IsolationMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaVolumeMount": {
+            "additionalProperties": false,
+            "properties": {
+                "AddGroupOwner": {
+                    "type": "boolean"
+                },
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "Permission": {
+                    "type": "string"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigData": {
+                            "$ref": "#/definitions/AWS::GroundStation::Config.ConfigData"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConfigData",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GroundStation::Config"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.AntennaDownlinkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SpectrumConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.SpectrumConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.AntennaDownlinkDemodDecodeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DecodeConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.DecodeConfig"
+                },
+                "DemodulationConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.DemodulationConfig"
+                },
+                "SpectrumConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.SpectrumConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.AntennaUplinkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SpectrumConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.UplinkSpectrumConfig"
+                },
+                "TargetEirp": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.Eirp"
+                },
+                "TransmitDisabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.ConfigData": {
+            "additionalProperties": false,
+            "properties": {
+                "AntennaDownlinkConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.AntennaDownlinkConfig"
+                },
+                "AntennaDownlinkDemodDecodeConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.AntennaDownlinkDemodDecodeConfig"
+                },
+                "AntennaUplinkConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.AntennaUplinkConfig"
+                },
+                "DataflowEndpointConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.DataflowEndpointConfig"
+                },
+                "S3RecordingConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.S3RecordingConfig"
+                },
+                "TrackingConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.TrackingConfig"
+                },
+                "UplinkEchoConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.UplinkEchoConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.DataflowEndpointConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DataflowEndpointName": {
+                    "type": "string"
+                },
+                "DataflowEndpointRegion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.DecodeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "UnvalidatedJSON": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.DemodulationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "UnvalidatedJSON": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.Eirp": {
+            "additionalProperties": false,
+            "properties": {
+                "Units": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.Frequency": {
+            "additionalProperties": false,
+            "properties": {
+                "Units": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.FrequencyBandwidth": {
+            "additionalProperties": false,
+            "properties": {
+                "Units": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.S3RecordingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.SpectrumConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Bandwidth": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.FrequencyBandwidth"
+                },
+                "CenterFrequency": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.Frequency"
+                },
+                "Polarization": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.TrackingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Autotrack": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.UplinkEchoConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AntennaUplinkConfigArn": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.UplinkSpectrumConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CenterFrequency": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.Frequency"
+                },
+                "Polarization": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::DataflowEndpointGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EndpointDetails": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GroundStation::DataflowEndpointGroup.EndpointDetails"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EndpointDetails"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GroundStation::DataflowEndpointGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GroundStation::DataflowEndpointGroup.DataflowEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "$ref": "#/definitions/AWS::GroundStation::DataflowEndpointGroup.SocketAddress"
+                },
+                "Mtu": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::DataflowEndpointGroup.EndpointDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "$ref": "#/definitions/AWS::GroundStation::DataflowEndpointGroup.DataflowEndpoint"
+                },
+                "SecurityDetails": {
+                    "$ref": "#/definitions/AWS::GroundStation::DataflowEndpointGroup.SecurityDetails"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::DataflowEndpointGroup.SecurityDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::DataflowEndpointGroup.SocketAddress": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::MissionProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContactPostPassDurationSeconds": {
+                            "type": "number"
+                        },
+                        "ContactPrePassDurationSeconds": {
+                            "type": "number"
+                        },
+                        "DataflowEdges": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GroundStation::MissionProfile.DataflowEdge"
+                            },
+                            "type": "array"
+                        },
+                        "MinimumViableContactDurationSeconds": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrackingConfigArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DataflowEdges",
+                        "MinimumViableContactDurationSeconds",
+                        "Name",
+                        "TrackingConfigArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GroundStation::MissionProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GroundStation::MissionProfile.DataflowEdge": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::Detector": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataSources": {
+                            "$ref": "#/definitions/AWS::GuardDuty::Detector.CFNDataSourceConfigurations"
+                        },
+                        "Enable": {
+                            "type": "boolean"
+                        },
+                        "FindingPublishingFrequency": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Enable"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::Detector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Detector.CFNDataSourceConfigurations": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Logs": {
+                    "$ref": "#/definitions/AWS::GuardDuty::Detector.CFNS3LogsConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::Detector.CFNS3LogsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enable": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::Filter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "FindingCriteria": {
+                            "$ref": "#/definitions/AWS::GuardDuty::Filter.FindingCriteria"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Rank": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Action",
+                        "Description",
+                        "DetectorId",
+                        "FindingCriteria",
+                        "Name",
+                        "Rank"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::Filter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Filter.Condition": {
+            "additionalProperties": false,
+            "properties": {
+                "Eq": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Gte": {
+                    "type": "number"
+                },
+                "Lt": {
+                    "type": "number"
+                },
+                "Lte": {
+                    "type": "number"
+                },
+                "Neq": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::Filter.FindingCriteria": {
+            "additionalProperties": false,
+            "properties": {
+                "Criterion": {
+                    "type": "object"
+                },
+                "ItemType": {
+                    "$ref": "#/definitions/AWS::GuardDuty::Filter.Condition"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::IPSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Activate": {
+                            "type": "boolean"
+                        },
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "Format": {
+                            "type": "string"
+                        },
+                        "Location": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Activate",
+                        "DetectorId",
+                        "Format",
+                        "Location"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::IPSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Master": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "InvitationId": {
+                            "type": "string"
+                        },
+                        "MasterId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DetectorId",
+                        "MasterId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::Master"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Member": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "DisableEmailNotification": {
+                            "type": "boolean"
+                        },
+                        "Email": {
+                            "type": "string"
+                        },
+                        "MemberId": {
+                            "type": "string"
+                        },
+                        "Message": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DetectorId",
+                        "Email",
+                        "MemberId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::Member"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::ThreatIntelSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Activate": {
+                            "type": "boolean"
+                        },
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "Format": {
+                            "type": "string"
+                        },
+                        "Location": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Activate",
+                        "DetectorId",
+                        "Format",
+                        "Location"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::ThreatIntelSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DatastoreTypeVersion": {
+                            "type": "string"
+                        },
+                        "PreloadDataConfig": {
+                            "$ref": "#/definitions/AWS::HealthLake::FHIRDatastore.PreloadDataConfig"
+                        },
+                        "SseConfiguration": {
+                            "$ref": "#/definitions/AWS::HealthLake::FHIRDatastore.SseConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DatastoreTypeVersion"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::HealthLake::FHIRDatastore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore.KmsEncryptionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CmkType": {
+                    "type": "string"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CmkType"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore.PreloadDataConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "PreloadDataType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PreloadDataType"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore.SseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsEncryptionConfig": {
+                    "$ref": "#/definitions/AWS::HealthLake::FHIRDatastore.KmsEncryptionConfig"
+                }
+            },
+            "required": [
+                "KmsEncryptionConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::AccessKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Serial": {
+                            "type": "number"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::AccessKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::Group": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "ManagedPolicyArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IAM::Group.Policy"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::Group"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::Group.Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "PolicyDocument": {
+                    "type": "object"
+                },
+                "PolicyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PolicyDocument",
+                "PolicyName"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::InstanceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InstanceProfileName": {
+                            "type": "string"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "Roles": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Roles"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::InstanceProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::ManagedPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Groups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ManagedPolicyName": {
+                            "type": "string"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "Roles": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Users": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::ManagedPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::OIDCProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClientIdList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThumbprintList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Url": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ThumbprintList"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::OIDCProvider"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Groups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "PolicyName": {
+                            "type": "string"
+                        },
+                        "Roles": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Users": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument",
+                        "PolicyName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::Policy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::Role": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssumeRolePolicyDocument": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ManagedPolicyArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MaxSessionDuration": {
+                            "type": "number"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "PermissionsBoundary": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IAM::Role.Policy"
+                            },
+                            "type": "array"
+                        },
+                        "RoleName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AssumeRolePolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::Role"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::Role.Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "PolicyDocument": {
+                    "type": "object"
+                },
+                "PolicyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PolicyDocument",
+                "PolicyName"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::SAMLProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SamlMetadataDocument": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SamlMetadataDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::SAMLProvider"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::ServerCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CertificateBody": {
+                            "type": "string"
+                        },
+                        "CertificateChain": {
+                            "type": "string"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "PrivateKey": {
+                            "type": "string"
+                        },
+                        "ServerCertificateName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::ServerCertificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::ServiceLinkedRole": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AWSServiceName": {
+                            "type": "string"
+                        },
+                        "CustomSuffix": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AWSServiceName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::ServiceLinkedRole"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Groups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LoginProfile": {
+                            "$ref": "#/definitions/AWS::IAM::User.LoginProfile"
+                        },
+                        "ManagedPolicyArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "PermissionsBoundary": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IAM::User.Policy"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::User.LoginProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "PasswordResetRequired": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Password"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::User.Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "PolicyDocument": {
+                    "type": "object"
+                },
+                "PolicyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PolicyDocument",
+                "PolicyName"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::UserToGroupAddition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "Users": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "GroupName",
+                        "Users"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::UserToGroupAddition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::VirtualMFADevice": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Path": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Users": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualMfaDeviceName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Users"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::VirtualMFADevice"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Authorized": {
+                            "type": "boolean"
+                        },
+                        "LatencyMode": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RecordingConfigurationArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::Channel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::PlaybackKeyPair": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "PublicKeyMaterial": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PublicKeyMaterial"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::PlaybackKeyPair"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::RecordingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.DestinationConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DestinationConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::RecordingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::RecordingConfiguration.DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.S3DestinationConfiguration"
+                }
+            },
+            "required": [
+                "S3"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::RecordingConfiguration.S3DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StreamKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ChannelArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ChannelArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::StreamKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::Component": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ChangeDescription": {
+                            "type": "string"
+                        },
+                        "Data": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Platform": {
+                            "type": "string"
+                        },
+                        "SupportedOsVersions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Uri": {
+                            "type": "string"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Platform",
+                        "Version"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::Component"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Components": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe.ComponentConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "ContainerType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DockerfileTemplateData": {
+                            "type": "string"
+                        },
+                        "DockerfileTemplateUri": {
+                            "type": "string"
+                        },
+                        "ImageOsVersionOverride": {
+                            "type": "string"
+                        },
+                        "InstanceConfiguration": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe.InstanceConfiguration"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParentImage": {
+                            "type": "string"
+                        },
+                        "PlatformOverride": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "TargetRepository": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe.TargetContainerRepository"
+                        },
+                        "Version": {
+                            "type": "string"
+                        },
+                        "WorkingDirectory": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Components",
+                        "ContainerType",
+                        "Name",
+                        "ParentImage",
+                        "TargetRepository",
+                        "Version"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::ContainerRecipe"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe.ComponentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe.EbsInstanceBlockDeviceSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "Throughput": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe.InstanceBlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe.EbsInstanceBlockDeviceSpecification"
+                },
+                "NoDevice": {
+                    "type": "string"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe.InstanceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockDeviceMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe.InstanceBlockDeviceMapping"
+                    },
+                    "type": "array"
+                },
+                "Image": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe.TargetContainerRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "RepositoryName": {
+                    "type": "string"
+                },
+                "Service": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::DistributionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Distributions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ImageBuilder::DistributionConfiguration.Distribution"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Distributions",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::DistributionConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::DistributionConfiguration.Distribution": {
+            "additionalProperties": false,
+            "properties": {
+                "AmiDistributionConfiguration": {
+                    "type": "object"
+                },
+                "ContainerDistributionConfiguration": {
+                    "type": "object"
+                },
+                "LaunchTemplateConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ImageBuilder::DistributionConfiguration.LaunchTemplateConfiguration"
+                    },
+                    "type": "array"
+                },
+                "LicenseConfigurationArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::DistributionConfiguration.LaunchTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "SetDefaultVersion": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::Image": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContainerRecipeArn": {
+                            "type": "string"
+                        },
+                        "DistributionConfigurationArn": {
+                            "type": "string"
+                        },
+                        "EnhancedImageMetadataEnabled": {
+                            "type": "boolean"
+                        },
+                        "ImageRecipeArn": {
+                            "type": "string"
+                        },
+                        "ImageTestsConfiguration": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::Image.ImageTestsConfiguration"
+                        },
+                        "InfrastructureConfigurationArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "InfrastructureConfigurationArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::Image"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::Image.ImageTestsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ImageTestsEnabled": {
+                    "type": "boolean"
+                },
+                "TimeoutMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImagePipeline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContainerRecipeArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DistributionConfigurationArn": {
+                            "type": "string"
+                        },
+                        "EnhancedImageMetadataEnabled": {
+                            "type": "boolean"
+                        },
+                        "ImageRecipeArn": {
+                            "type": "string"
+                        },
+                        "ImageTestsConfiguration": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ImagePipeline.ImageTestsConfiguration"
+                        },
+                        "InfrastructureConfigurationArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ImagePipeline.Schedule"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "InfrastructureConfigurationArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::ImagePipeline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImagePipeline.ImageTestsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ImageTestsEnabled": {
+                    "type": "boolean"
+                },
+                "TimeoutMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImagePipeline.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "PipelineExecutionStartCondition": {
+                    "type": "string"
+                },
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdditionalInstanceConfiguration": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.AdditionalInstanceConfiguration"
+                        },
+                        "BlockDeviceMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.InstanceBlockDeviceMapping"
+                            },
+                            "type": "array"
+                        },
+                        "Components": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.ComponentConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParentImage": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Version": {
+                            "type": "string"
+                        },
+                        "WorkingDirectory": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Components",
+                        "Name",
+                        "ParentImage",
+                        "Version"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::ImageRecipe"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.AdditionalInstanceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SystemsManagerAgent": {
+                    "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.SystemsManagerAgent"
+                },
+                "UserDataOverride": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.ComponentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentArn": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.ComponentParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.ComponentParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.EbsInstanceBlockDeviceSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "Throughput": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.InstanceBlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.EbsInstanceBlockDeviceSpecification"
+                },
+                "NoDevice": {
+                    "type": "string"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.SystemsManagerAgent": {
+            "additionalProperties": false,
+            "properties": {
+                "UninstallAfterBuild": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::InfrastructureConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "InstanceMetadataOptions": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::InfrastructureConfiguration.InstanceMetadataOptions"
+                        },
+                        "InstanceProfileName": {
+                            "type": "string"
+                        },
+                        "InstanceTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "KeyPair": {
+                            "type": "string"
+                        },
+                        "Logging": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::InfrastructureConfiguration.Logging"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResourceTags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "TerminateInstanceOnFailure": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "InstanceProfileName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::InfrastructureConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::InfrastructureConfiguration.InstanceMetadataOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpPutResponseHopLimit": {
+                    "type": "number"
+                },
+                "HttpTokens": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::InfrastructureConfiguration.Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Logs": {
+                    "$ref": "#/definitions/AWS::ImageBuilder::InfrastructureConfiguration.S3Logs"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::InfrastructureConfiguration.S3Logs": {
+            "additionalProperties": false,
+            "properties": {
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3KeyPrefix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Inspector::AssessmentTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssessmentTargetName": {
+                            "type": "string"
+                        },
+                        "ResourceGroupArn": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Inspector::AssessmentTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Inspector::AssessmentTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssessmentTargetArn": {
+                            "type": "string"
+                        },
+                        "AssessmentTemplateName": {
+                            "type": "string"
+                        },
+                        "DurationInSeconds": {
+                            "type": "number"
+                        },
+                        "RulesPackageArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "UserAttributesForFindings": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AssessmentTargetArn",
+                        "DurationInSeconds",
+                        "RulesPackageArns"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Inspector::AssessmentTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Inspector::ResourceGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceGroupTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ResourceGroupTags"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Inspector::ResourceGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT1Click::Device": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeviceId": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "DeviceId",
+                        "Enabled"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT1Click::Device"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT1Click::Placement": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatedDevices": {
+                            "type": "object"
+                        },
+                        "Attributes": {
+                            "type": "object"
+                        },
+                        "PlacementName": {
+                            "type": "string"
+                        },
+                        "ProjectName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProjectName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT1Click::Placement"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT1Click::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "PlacementTemplate": {
+                            "$ref": "#/definitions/AWS::IoT1Click::Project.PlacementTemplate"
+                        },
+                        "ProjectName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PlacementTemplate"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT1Click::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT1Click::Project.DeviceTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "CallbackOverrides": {
+                    "type": "object"
+                },
+                "DeviceType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT1Click::Project.PlacementTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultAttributes": {
+                    "type": "object"
+                },
+                "DeviceTemplates": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::AccountAuditConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountId": {
+                            "type": "string"
+                        },
+                        "AuditCheckConfigurations": {
+                            "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfigurations"
+                        },
+                        "AuditNotificationTargetConfigurations": {
+                            "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditNotificationTargetConfigurations"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AccountId",
+                        "AuditCheckConfigurations",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::AccountAuditConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::AccountAuditConfiguration.AuditCheckConfigurations": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticatedCognitoRoleOverlyPermissiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "CaCertificateExpiringCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "CaCertificateKeyQualityCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "ConflictingClientIdsCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "DeviceCertificateExpiringCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "DeviceCertificateKeyQualityCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "DeviceCertificateSharedCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "IotPolicyOverlyPermissiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "IotRoleAliasAllowsAccessToUnusedServicesCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "IotRoleAliasOverlyPermissiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "LoggingDisabledCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "RevokedCaCertificateStillActiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "RevokedDeviceCertificateStillActiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "UnauthenticatedCognitoRoleOverlyPermissiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::AccountAuditConfiguration.AuditNotificationTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TargetArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::AccountAuditConfiguration.AuditNotificationTargetConfigurations": {
+            "additionalProperties": false,
+            "properties": {
+                "Sns": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditNotificationTarget"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::Authorizer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthorizerFunctionArn": {
+                            "type": "string"
+                        },
+                        "AuthorizerName": {
+                            "type": "string"
+                        },
+                        "SigningDisabled": {
+                            "type": "boolean"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TokenKeyName": {
+                            "type": "string"
+                        },
+                        "TokenSigningPublicKeys": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "AuthorizerFunctionArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Authorizer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CACertificatePem": {
+                            "type": "string"
+                        },
+                        "CertificateMode": {
+                            "type": "string"
+                        },
+                        "CertificatePem": {
+                            "type": "string"
+                        },
+                        "CertificateSigningRequest": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Status"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Certificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::CustomMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "MetricType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MetricType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::CustomMetric"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "StringValues": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "StringValues",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Dimension"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::DomainConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthorizerConfig": {
+                            "$ref": "#/definitions/AWS::IoT::DomainConfiguration.AuthorizerConfig"
+                        },
+                        "DomainConfigurationName": {
+                            "type": "string"
+                        },
+                        "DomainConfigurationStatus": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "ServerCertificateArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ValidationCertificateArn": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::DomainConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::DomainConfiguration.AuthorizerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowAuthorizerOverride": {
+                    "type": "boolean"
+                },
+                "DefaultAuthorizerName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::DomainConfiguration.ServerCertificateSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "ServerCertificateArn": {
+                    "type": "string"
+                },
+                "ServerCertificateStatus": {
+                    "type": "string"
+                },
+                "ServerCertificateStatusDetail": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::FleetMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AggregationField": {
+                            "type": "string"
+                        },
+                        "AggregationType": {
+                            "$ref": "#/definitions/AWS::IoT::FleetMetric.AggregationType"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IndexName": {
+                            "type": "string"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Period": {
+                            "type": "number"
+                        },
+                        "QueryString": {
+                            "type": "string"
+                        },
+                        "QueryVersion": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Unit": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MetricName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::FleetMetric"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::FleetMetric.AggregationType": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::JobTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AbortConfig": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Document": {
+                            "type": "string"
+                        },
+                        "DocumentSource": {
+                            "type": "string"
+                        },
+                        "JobArn": {
+                            "type": "string"
+                        },
+                        "JobExecutionsRolloutConfig": {
+                            "type": "object"
+                        },
+                        "JobTemplateId": {
+                            "type": "string"
+                        },
+                        "PresignedUrlConfig": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeoutConfig": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "JobTemplateId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::JobTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountId": {
+                            "type": "string"
+                        },
+                        "DefaultLogLevel": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AccountId",
+                        "DefaultLogLevel",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Logging"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ActionName": {
+                            "type": "string"
+                        },
+                        "ActionParams": {
+                            "$ref": "#/definitions/AWS::IoT::MitigationAction.ActionParams"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ActionParams",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::MitigationAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.ActionParams": {
+            "additionalProperties": false,
+            "properties": {
+                "AddThingsToThingGroupParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.AddThingsToThingGroupParams"
+                },
+                "EnableIoTLoggingParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.EnableIoTLoggingParams"
+                },
+                "PublishFindingToSnsParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.PublishFindingToSnsParams"
+                },
+                "ReplaceDefaultPolicyVersionParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.ReplaceDefaultPolicyVersionParams"
+                },
+                "UpdateCACertificateParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.UpdateCACertificateParams"
+                },
+                "UpdateDeviceCertificateParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.UpdateDeviceCertificateParams"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.AddThingsToThingGroupParams": {
+            "additionalProperties": false,
+            "properties": {
+                "OverrideDynamicGroups": {
+                    "type": "boolean"
+                },
+                "ThingGroupNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ThingGroupNames"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.EnableIoTLoggingParams": {
+            "additionalProperties": false,
+            "properties": {
+                "LogLevel": {
+                    "type": "string"
+                },
+                "RoleArnForLogging": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogLevel",
+                "RoleArnForLogging"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.PublishFindingToSnsParams": {
+            "additionalProperties": false,
+            "properties": {
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.ReplaceDefaultPolicyVersionParams": {
+            "additionalProperties": false,
+            "properties": {
+                "TemplateName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TemplateName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.UpdateCACertificateParams": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.UpdateDeviceCertificateParams": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "PolicyName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Policy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::PolicyPrincipalAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyName": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PolicyName",
+                        "Principal"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::PolicyPrincipalAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::ProvisioningTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "PreProvisioningHook": {
+                            "$ref": "#/definitions/AWS::IoT::ProvisioningTemplate.ProvisioningHook"
+                        },
+                        "ProvisioningRoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateBody": {
+                            "type": "string"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProvisioningRoleArn",
+                        "TemplateBody"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::ProvisioningTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::ProvisioningTemplate.ProvisioningHook": {
+            "additionalProperties": false,
+            "properties": {
+                "PayloadVersion": {
+                    "type": "string"
+                },
+                "TargetArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::ResourceSpecificLogging": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LogLevel": {
+                            "type": "string"
+                        },
+                        "TargetName": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LogLevel",
+                        "TargetName",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::ResourceSpecificLogging"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::ScheduledAudit": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DayOfMonth": {
+                            "type": "string"
+                        },
+                        "DayOfWeek": {
+                            "type": "string"
+                        },
+                        "Frequency": {
+                            "type": "string"
+                        },
+                        "ScheduledAuditName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetCheckNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Frequency",
+                        "TargetCheckNames"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::ScheduledAudit"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdditionalMetricsToRetainV2": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoT::SecurityProfile.MetricToRetain"
+                            },
+                            "type": "array"
+                        },
+                        "AlertTargets": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.AlertTarget"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Behaviors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoT::SecurityProfile.Behavior"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityProfileDescription": {
+                            "type": "string"
+                        },
+                        "SecurityProfileName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::SecurityProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.AlertTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "AlertTargetArn": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AlertTargetArn",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.Behavior": {
+            "additionalProperties": false,
+            "properties": {
+                "Criteria": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.BehaviorCriteria"
+                },
+                "Metric": {
+                    "type": "string"
+                },
+                "MetricDimension": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.MetricDimension"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SuppressAlerts": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.BehaviorCriteria": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "ConsecutiveDatapointsToAlarm": {
+                    "type": "number"
+                },
+                "ConsecutiveDatapointsToClear": {
+                    "type": "number"
+                },
+                "DurationSeconds": {
+                    "type": "number"
+                },
+                "MlDetectionConfig": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.MachineLearningDetectionConfig"
+                },
+                "StatisticalThreshold": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.StatisticalThreshold"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.MetricValue"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.MachineLearningDetectionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfidenceLevel": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionName": {
+                    "type": "string"
+                },
+                "Operator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DimensionName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.MetricToRetain": {
+            "additionalProperties": false,
+            "properties": {
+                "Metric": {
+                    "type": "string"
+                },
+                "MetricDimension": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.MetricDimension"
+                }
+            },
+            "required": [
+                "Metric"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.MetricValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidrs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Count": {
+                    "type": "string"
+                },
+                "Number": {
+                    "type": "number"
+                },
+                "Numbers": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Ports": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Strings": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.StatisticalThreshold": {
+            "additionalProperties": false,
+            "properties": {
+                "Statistic": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::Thing": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AttributePayload": {
+                            "$ref": "#/definitions/AWS::IoT::Thing.AttributePayload"
+                        },
+                        "ThingName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Thing"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::Thing.AttributePayload": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::ThingPrincipalAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Principal": {
+                            "type": "string"
+                        },
+                        "ThingName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Principal",
+                        "ThingName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::ThingPrincipalAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RuleName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TopicRulePayload": {
+                            "$ref": "#/definitions/AWS::IoT::TopicRule.TopicRulePayload"
+                        }
+                    },
+                    "required": [
+                        "TopicRulePayload"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::TopicRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudwatchAlarm": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.CloudwatchAlarmAction"
+                },
+                "CloudwatchLogs": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.CloudwatchLogsAction"
+                },
+                "CloudwatchMetric": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.CloudwatchMetricAction"
+                },
+                "DynamoDB": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.DynamoDBAction"
+                },
+                "DynamoDBv2": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.DynamoDBv2Action"
+                },
+                "Elasticsearch": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.ElasticsearchAction"
+                },
+                "Firehose": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.FirehoseAction"
+                },
+                "Http": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.HttpAction"
+                },
+                "IotAnalytics": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.IotAnalyticsAction"
+                },
+                "IotEvents": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.IotEventsAction"
+                },
+                "IotSiteWise": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.IotSiteWiseAction"
+                },
+                "Kafka": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.KafkaAction"
+                },
+                "Kinesis": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.KinesisAction"
+                },
+                "Lambda": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.LambdaAction"
+                },
+                "OpenSearch": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.OpenSearchAction"
+                },
+                "Republish": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.RepublishAction"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.S3Action"
+                },
+                "Sns": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.SnsAction"
+                },
+                "Sqs": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.SqsAction"
+                },
+                "StepFunctions": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.StepFunctionsAction"
+                },
+                "Timestream": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.TimestreamAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.AssetPropertyTimestamp": {
+            "additionalProperties": false,
+            "properties": {
+                "OffsetInNanos": {
+                    "type": "string"
+                },
+                "TimeInSeconds": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.AssetPropertyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Quality": {
+                    "type": "string"
+                },
+                "Timestamp": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.AssetPropertyTimestamp"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.AssetPropertyVariant"
+                }
+            },
+            "required": [
+                "Timestamp",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.AssetPropertyVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanValue": {
+                    "type": "string"
+                },
+                "DoubleValue": {
+                    "type": "string"
+                },
+                "IntegerValue": {
+                    "type": "string"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.CloudwatchAlarmAction": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StateReason": {
+                    "type": "string"
+                },
+                "StateValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AlarmName",
+                "RoleArn",
+                "StateReason",
+                "StateValue"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.CloudwatchLogsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogGroupName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.CloudwatchMetricAction": {
+            "additionalProperties": false,
+            "properties": {
+                "MetricName": {
+                    "type": "string"
+                },
+                "MetricNamespace": {
+                    "type": "string"
+                },
+                "MetricTimestamp": {
+                    "type": "string"
+                },
+                "MetricUnit": {
+                    "type": "string"
+                },
+                "MetricValue": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "MetricNamespace",
+                "MetricUnit",
+                "MetricValue",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.DynamoDBAction": {
+            "additionalProperties": false,
+            "properties": {
+                "HashKeyField": {
+                    "type": "string"
+                },
+                "HashKeyType": {
+                    "type": "string"
+                },
+                "HashKeyValue": {
+                    "type": "string"
+                },
+                "PayloadField": {
+                    "type": "string"
+                },
+                "RangeKeyField": {
+                    "type": "string"
+                },
+                "RangeKeyType": {
+                    "type": "string"
+                },
+                "RangeKeyValue": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HashKeyField",
+                "HashKeyValue",
+                "RoleArn",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.DynamoDBv2Action": {
+            "additionalProperties": false,
+            "properties": {
+                "PutItem": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.PutItemInput"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.ElasticsearchAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Index": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint",
+                "Id",
+                "Index",
+                "RoleArn",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.FirehoseAction": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchMode": {
+                    "type": "boolean"
+                },
+                "DeliveryStreamName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "Separator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStreamName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.HttpAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Auth": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.HttpAuthorization"
+                },
+                "ConfirmationUrl": {
+                    "type": "string"
+                },
+                "Headers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoT::TopicRule.HttpActionHeader"
+                    },
+                    "type": "array"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.HttpActionHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.HttpAuthorization": {
+            "additionalProperties": false,
+            "properties": {
+                "Sigv4": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.SigV4Authorization"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.IotAnalyticsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchMode": {
+                    "type": "boolean"
+                },
+                "ChannelName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ChannelName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.IotEventsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchMode": {
+                    "type": "boolean"
+                },
+                "InputName": {
+                    "type": "string"
+                },
+                "MessageId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.IotSiteWiseAction": {
+            "additionalProperties": false,
+            "properties": {
+                "PutAssetPropertyValueEntries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoT::TopicRule.PutAssetPropertyValueEntry"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PutAssetPropertyValueEntries",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.KafkaAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientProperties": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Partition": {
+                    "type": "string"
+                },
+                "Topic": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClientProperties",
+                "DestinationArn",
+                "Topic"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.KinesisAction": {
+            "additionalProperties": false,
+            "properties": {
+                "PartitionKey": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StreamName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "StreamName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.LambdaAction": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.OpenSearchAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Index": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint",
+                "Id",
+                "Index",
+                "RoleArn",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.PutAssetPropertyValueEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "AssetId": {
+                    "type": "string"
+                },
+                "EntryId": {
+                    "type": "string"
+                },
+                "PropertyAlias": {
+                    "type": "string"
+                },
+                "PropertyId": {
+                    "type": "string"
+                },
+                "PropertyValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoT::TopicRule.AssetPropertyValue"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "PropertyValues"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.PutItemInput": {
+            "additionalProperties": false,
+            "properties": {
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.RepublishAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Qos": {
+                    "type": "number"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "Topic": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "Topic"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.S3Action": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "CannedAcl": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName",
+                "Key",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.SigV4Authorization": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                },
+                "SigningRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "ServiceName",
+                "SigningRegion"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.SnsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "MessageFormat": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TargetArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "TargetArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.SqsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "QueueUrl": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "UseBase64": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "QueueUrl",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.StepFunctionsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionNamePrefix": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StateMachineName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "StateMachineName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.TimestreamAction": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchMode": {
+                    "type": "boolean"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoT::TopicRule.TimestreamDimension"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "Timestamp": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.TimestreamTimestamp"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "Dimensions",
+                "RoleArn",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.TimestreamDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.TimestreamTimestamp": {
+            "additionalProperties": false,
+            "properties": {
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Unit",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.TopicRulePayload": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoT::TopicRule.Action"
+                    },
+                    "type": "array"
+                },
+                "AwsIotSqlVersion": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "ErrorAction": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.Action"
+                },
+                "RuleDisabled": {
+                    "type": "boolean"
+                },
+                "Sql": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Sql"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRuleDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HttpUrlProperties": {
+                            "$ref": "#/definitions/AWS::IoT::TopicRuleDestination.HttpUrlDestinationSummary"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "VpcProperties": {
+                            "$ref": "#/definitions/AWS::IoT::TopicRuleDestination.VpcDestinationProperties"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::TopicRuleDestination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRuleDestination.HttpUrlDestinationSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfirmationUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRuleDestination.VpcDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ChannelName": {
+                            "type": "string"
+                        },
+                        "ChannelStorage": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Channel.ChannelStorage"
+                        },
+                        "RetentionPeriod": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Channel.RetentionPeriod"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTAnalytics::Channel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Channel.ChannelStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomerManagedS3": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Channel.CustomerManagedS3"
+                },
+                "ServiceManagedS3": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Channel.ServiceManagedS3"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Channel.CustomerManagedS3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "KeyPrefix": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Channel.RetentionPeriod": {
+            "additionalProperties": false,
+            "properties": {
+                "NumberOfDays": {
+                    "type": "number"
+                },
+                "Unlimited": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Channel.ServiceManagedS3": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                                "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.Action"
+                            },
+                            "type": "array"
+                        },
+                        "ContentDeliveryRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRule"
+                            },
+                            "type": "array"
+                        },
+                        "DatasetName": {
+                            "type": "string"
+                        },
+                        "LateDataRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.LateDataRule"
+                            },
+                            "type": "array"
+                        },
+                        "RetentionPeriod": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.RetentionPeriod"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Triggers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.Trigger"
+                            },
+                            "type": "array"
+                        },
+                        "VersioningConfiguration": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.VersioningConfiguration"
+                        }
+                    },
+                    "required": [
+                        "Actions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTAnalytics::Dataset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionName": {
+                    "type": "string"
+                },
+                "ContainerAction": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.ContainerAction"
+                },
+                "QueryAction": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.QueryAction"
+                }
+            },
+            "required": [
+                "ActionName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.ContainerAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRoleArn": {
+                    "type": "string"
+                },
+                "Image": {
+                    "type": "string"
+                },
+                "ResourceConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.ResourceConfiguration"
+                },
+                "Variables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.Variable"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ExecutionRoleArn",
+                "Image",
+                "ResourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRuleDestination"
+                },
+                "EntryName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRuleDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "IotEventsDestinationConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.IotEventsDestinationConfiguration"
+                },
+                "S3DestinationConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.S3DestinationConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.DatasetContentVersionValue": {
+            "additionalProperties": false,
+            "properties": {
+                "DatasetName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.DeltaTime": {
+            "additionalProperties": false,
+            "properties": {
+                "OffsetSeconds": {
+                    "type": "number"
+                },
+                "TimeExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OffsetSeconds",
+                "TimeExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.DeltaTimeSessionWindowConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "TimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TimeoutInMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.Filter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeltaTime": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.DeltaTime"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.GlueConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.IotEventsDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.LateDataRule": {
+            "additionalProperties": false,
+            "properties": {
+                "RuleConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.LateDataRuleConfiguration"
+                },
+                "RuleName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RuleConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.LateDataRuleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeltaTimeSessionWindowConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.DeltaTimeSessionWindowConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.OutputFileUriValue": {
+            "additionalProperties": false,
+            "properties": {
+                "FileName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.QueryAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Filters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.Filter"
+                    },
+                    "type": "array"
+                },
+                "SqlQuery": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SqlQuery"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.ResourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeType": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ComputeType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.RetentionPeriod": {
+            "additionalProperties": false,
+            "properties": {
+                "NumberOfDays": {
+                    "type": "number"
+                },
+                "Unlimited": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "NumberOfDays",
+                "Unlimited"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.S3DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "GlueConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.GlueConfiguration"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.Trigger": {
+            "additionalProperties": false,
+            "properties": {
+                "Schedule": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.Schedule"
+                },
+                "TriggeringDataset": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.TriggeringDataset"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.TriggeringDataset": {
+            "additionalProperties": false,
+            "properties": {
+                "DatasetName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatasetName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.Variable": {
+            "additionalProperties": false,
+            "properties": {
+                "DatasetContentVersionValue": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.DatasetContentVersionValue"
+                },
+                "DoubleValue": {
+                    "type": "number"
+                },
+                "OutputFileUriValue": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.OutputFileUriValue"
+                },
+                "StringValue": {
+                    "type": "string"
+                },
+                "VariableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VariableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.VersioningConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxVersions": {
+                    "type": "number"
+                },
+                "Unlimited": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DatastorePartitions": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.DatastorePartitions"
+                        },
+                        "DatastoreStorage": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.DatastoreStorage"
+                        },
+                        "FileFormatConfiguration": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.FileFormatConfiguration"
+                        },
+                        "RetentionPeriod": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.RetentionPeriod"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTAnalytics::Datastore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.Column": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.CustomerManagedS3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "KeyPrefix": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.CustomerManagedS3Storage": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "KeyPrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.DatastorePartition": {
+            "additionalProperties": false,
+            "properties": {
+                "Partition": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.Partition"
+                },
+                "TimestampPartition": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.TimestampPartition"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.DatastorePartitions": {
+            "additionalProperties": false,
+            "properties": {
+                "Partitions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.DatastorePartition"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.DatastoreStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomerManagedS3": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.CustomerManagedS3"
+                },
+                "IotSiteWiseMultiLayerStorage": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.IotSiteWiseMultiLayerStorage"
+                },
+                "ServiceManagedS3": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.ServiceManagedS3"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.FileFormatConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.JsonConfiguration"
+                },
+                "ParquetConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.ParquetConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.IotSiteWiseMultiLayerStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomerManagedS3Storage": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.CustomerManagedS3Storage"
+                }
+            },
+            "required": [
+                "CustomerManagedS3Storage"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.JsonConfiguration": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.ParquetConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SchemaDefinition": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.SchemaDefinition"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.Partition": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.RetentionPeriod": {
+            "additionalProperties": false,
+            "properties": {
+                "NumberOfDays": {
+                    "type": "number"
+                },
+                "Unlimited": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.SchemaDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.Column"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.ServiceManagedS3": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.TimestampPartition": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "TimestampFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PipelineActivities": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Activity"
+                            },
+                            "type": "array"
+                        },
+                        "PipelineName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PipelineActivities"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTAnalytics::Pipeline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Activity": {
+            "additionalProperties": false,
+            "properties": {
+                "AddAttributes": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.AddAttributes"
+                },
+                "Channel": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Channel"
+                },
+                "Datastore": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Datastore"
+                },
+                "DeviceRegistryEnrich": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.DeviceRegistryEnrich"
+                },
+                "DeviceShadowEnrich": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.DeviceShadowEnrich"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Filter"
+                },
+                "Lambda": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Lambda"
+                },
+                "Math": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Math"
+                },
+                "RemoveAttributes": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.RemoveAttributes"
+                },
+                "SelectAttributes": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.SelectAttributes"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.AddAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "type": "object"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Datastore": {
+            "additionalProperties": false,
+            "properties": {
+                "DatastoreName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.DeviceRegistryEnrich": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "ThingName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.DeviceShadowEnrich": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "ThingName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Filter": {
+            "additionalProperties": false,
+            "properties": {
+                "Filter": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Lambda": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchSize": {
+                    "type": "number"
+                },
+                "LambdaName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Math": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "Math": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.RemoveAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.SelectAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTCoreDeviceAdvisor::SuiteDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SuiteDefinitionConfiguration": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SuiteDefinitionConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTCoreDeviceAdvisor::SuiteDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DetectorModelDefinition": {
+                            "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.DetectorModelDefinition"
+                        },
+                        "DetectorModelDescription": {
+                            "type": "string"
+                        },
+                        "DetectorModelName": {
+                            "type": "string"
+                        },
+                        "EvaluationMethod": {
+                            "type": "string"
+                        },
+                        "Key": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DetectorModelDefinition",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTEvents::DetectorModel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "ClearTimer": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.ClearTimer"
+                },
+                "DynamoDB": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.DynamoDB"
+                },
+                "DynamoDBv2": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.DynamoDBv2"
+                },
+                "Firehose": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Firehose"
+                },
+                "IotEvents": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.IotEvents"
+                },
+                "IotSiteWise": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.IotSiteWise"
+                },
+                "IotTopicPublish": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.IotTopicPublish"
+                },
+                "Lambda": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Lambda"
+                },
+                "ResetTimer": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.ResetTimer"
+                },
+                "SetTimer": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.SetTimer"
+                },
+                "SetVariable": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.SetVariable"
+                },
+                "Sns": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Sns"
+                },
+                "Sqs": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Sqs"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.AssetPropertyTimestamp": {
+            "additionalProperties": false,
+            "properties": {
+                "OffsetInNanos": {
+                    "type": "string"
+                },
+                "TimeInSeconds": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.AssetPropertyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Quality": {
+                    "type": "string"
+                },
+                "Timestamp": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.AssetPropertyTimestamp"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.AssetPropertyVariant"
+                }
+            },
+            "required": [
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.AssetPropertyVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanValue": {
+                    "type": "string"
+                },
+                "DoubleValue": {
+                    "type": "string"
+                },
+                "IntegerValue": {
+                    "type": "string"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.ClearTimer": {
+            "additionalProperties": false,
+            "properties": {
+                "TimerName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TimerName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.DetectorModelDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "InitialStateName": {
+                    "type": "string"
+                },
+                "States": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.State"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "InitialStateName",
+                "States"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.DynamoDB": {
+            "additionalProperties": false,
+            "properties": {
+                "HashKeyField": {
+                    "type": "string"
+                },
+                "HashKeyType": {
+                    "type": "string"
+                },
+                "HashKeyValue": {
+                    "type": "string"
+                },
+                "Operation": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                },
+                "PayloadField": {
+                    "type": "string"
+                },
+                "RangeKeyField": {
+                    "type": "string"
+                },
+                "RangeKeyType": {
+                    "type": "string"
+                },
+                "RangeKeyValue": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HashKeyField",
+                "HashKeyValue",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.DynamoDBv2": {
+            "additionalProperties": false,
+            "properties": {
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Event": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Action"
+                    },
+                    "type": "array"
+                },
+                "Condition": {
+                    "type": "string"
+                },
+                "EventName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Firehose": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStreamName": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                },
+                "Separator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStreamName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.IotEvents": {
+            "additionalProperties": false,
+            "properties": {
+                "InputName": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                }
+            },
+            "required": [
+                "InputName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.IotSiteWise": {
+            "additionalProperties": false,
+            "properties": {
+                "AssetId": {
+                    "type": "string"
+                },
+                "EntryId": {
+                    "type": "string"
+                },
+                "PropertyAlias": {
+                    "type": "string"
+                },
+                "PropertyId": {
+                    "type": "string"
+                },
+                "PropertyValue": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.AssetPropertyValue"
+                }
+            },
+            "required": [
+                "PropertyValue"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.IotTopicPublish": {
+            "additionalProperties": false,
+            "properties": {
+                "MqttTopic": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                }
+            },
+            "required": [
+                "MqttTopic"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Lambda": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionArn": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                }
+            },
+            "required": [
+                "FunctionArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.OnEnter": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Event"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.OnExit": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Event"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.OnInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Event"
+                    },
+                    "type": "array"
+                },
+                "TransitionEvents": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.TransitionEvent"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Payload": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentExpression": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ContentExpression",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.ResetTimer": {
+            "additionalProperties": false,
+            "properties": {
+                "TimerName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TimerName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.SetTimer": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationExpression": {
+                    "type": "string"
+                },
+                "Seconds": {
+                    "type": "number"
+                },
+                "TimerName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TimerName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.SetVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                },
+                "VariableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Value",
+                "VariableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Sns": {
+            "additionalProperties": false,
+            "properties": {
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                },
+                "TargetArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TargetArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Sqs": {
+            "additionalProperties": false,
+            "properties": {
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                },
+                "QueueUrl": {
+                    "type": "string"
+                },
+                "UseBase64": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "QueueUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.State": {
+            "additionalProperties": false,
+            "properties": {
+                "OnEnter": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.OnEnter"
+                },
+                "OnExit": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.OnExit"
+                },
+                "OnInput": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.OnInput"
+                },
+                "StateName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StateName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.TransitionEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Action"
+                    },
+                    "type": "array"
+                },
+                "Condition": {
+                    "type": "string"
+                },
+                "EventName": {
+                    "type": "string"
+                },
+                "NextState": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Condition",
+                "EventName",
+                "NextState"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::Input": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InputDefinition": {
+                            "$ref": "#/definitions/AWS::IoTEvents::Input.InputDefinition"
+                        },
+                        "InputDescription": {
+                            "type": "string"
+                        },
+                        "InputName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InputDefinition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTEvents::Input"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::Input.Attribute": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "JsonPath"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::Input.InputDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::Input.Attribute"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Attributes"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTFleetHub::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationDescription": {
+                            "type": "string"
+                        },
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTFleetHub::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessPolicyIdentity": {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.AccessPolicyIdentity"
+                        },
+                        "AccessPolicyPermission": {
+                            "type": "string"
+                        },
+                        "AccessPolicyResource": {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.AccessPolicyResource"
+                        }
+                    },
+                    "required": [
+                        "AccessPolicyIdentity",
+                        "AccessPolicyPermission",
+                        "AccessPolicyResource"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::AccessPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.AccessPolicyIdentity": {
+            "additionalProperties": false,
+            "properties": {
+                "IamRole": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.IamRole"
+                },
+                "IamUser": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.IamUser"
+                },
+                "User": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.User"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.AccessPolicyResource": {
+            "additionalProperties": false,
+            "properties": {
+                "Portal": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.Portal"
+                },
+                "Project": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.Project"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.IamRole": {
+            "additionalProperties": false,
+            "properties": {
+                "arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.IamUser": {
+            "additionalProperties": false,
+            "properties": {
+                "arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.Portal": {
+            "additionalProperties": false,
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.Project": {
+            "additionalProperties": false,
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.User": {
+            "additionalProperties": false,
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Asset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssetHierarchies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::Asset.AssetHierarchy"
+                            },
+                            "type": "array"
+                        },
+                        "AssetModelId": {
+                            "type": "string"
+                        },
+                        "AssetName": {
+                            "type": "string"
+                        },
+                        "AssetProperties": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::Asset.AssetProperty"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AssetModelId",
+                        "AssetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::Asset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Asset.AssetHierarchy": {
+            "additionalProperties": false,
+            "properties": {
+                "ChildAssetId": {
+                    "type": "string"
+                },
+                "LogicalId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ChildAssetId",
+                "LogicalId"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Asset.AssetProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Alias": {
+                    "type": "string"
+                },
+                "LogicalId": {
+                    "type": "string"
+                },
+                "NotificationState": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogicalId"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssetModelCompositeModels": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.AssetModelCompositeModel"
+                            },
+                            "type": "array"
+                        },
+                        "AssetModelDescription": {
+                            "type": "string"
+                        },
+                        "AssetModelHierarchies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.AssetModelHierarchy"
+                            },
+                            "type": "array"
+                        },
+                        "AssetModelName": {
+                            "type": "string"
+                        },
+                        "AssetModelProperties": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.AssetModelProperty"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AssetModelName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::AssetModel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.AssetModelCompositeModel": {
+            "additionalProperties": false,
+            "properties": {
+                "CompositeModelProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.AssetModelProperty"
+                    },
+                    "type": "array"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.AssetModelHierarchy": {
+            "additionalProperties": false,
+            "properties": {
+                "ChildAssetModelId": {
+                    "type": "string"
+                },
+                "LogicalId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ChildAssetModelId",
+                "LogicalId",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.AssetModelProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "DataType": {
+                    "type": "string"
+                },
+                "DataTypeSpec": {
+                    "type": "string"
+                },
+                "LogicalId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.PropertyType"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataType",
+                "LogicalId",
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.Attribute": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.ExpressionVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.VariableValue"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.Metric": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Variables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.ExpressionVariable"
+                    },
+                    "type": "array"
+                },
+                "Window": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.MetricWindow"
+                }
+            },
+            "required": [
+                "Expression",
+                "Variables",
+                "Window"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.MetricWindow": {
+            "additionalProperties": false,
+            "properties": {
+                "Tumbling": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.TumblingWindow"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.PropertyType": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.Attribute"
+                },
+                "Metric": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.Metric"
+                },
+                "Transform": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.Transform"
+                },
+                "TypeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TypeName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.Transform": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Variables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.ExpressionVariable"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Expression",
+                "Variables"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.TumblingWindow": {
+            "additionalProperties": false,
+            "properties": {
+                "Interval": {
+                    "type": "string"
+                },
+                "Offset": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Interval"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.VariableValue": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLogicalId": {
+                    "type": "string"
+                },
+                "PropertyLogicalId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PropertyLogicalId"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Dashboard": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DashboardDefinition": {
+                            "type": "string"
+                        },
+                        "DashboardDescription": {
+                            "type": "string"
+                        },
+                        "DashboardName": {
+                            "type": "string"
+                        },
+                        "ProjectId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DashboardDefinition",
+                        "DashboardDescription",
+                        "DashboardName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::Dashboard"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Gateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GatewayCapabilitySummaries": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::Gateway.GatewayCapabilitySummary"
+                            },
+                            "type": "array"
+                        },
+                        "GatewayName": {
+                            "type": "string"
+                        },
+                        "GatewayPlatform": {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Gateway.GatewayPlatform"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "GatewayName",
+                        "GatewayPlatform"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::Gateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Gateway.GatewayCapabilitySummary": {
+            "additionalProperties": false,
+            "properties": {
+                "CapabilityConfiguration": {
+                    "type": "string"
+                },
+                "CapabilityNamespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CapabilityNamespace"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Gateway.GatewayPlatform": {
+            "additionalProperties": false,
+            "properties": {
+                "Greengrass": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::Gateway.Greengrass"
+                }
+            },
+            "required": [
+                "Greengrass"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Gateway.Greengrass": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Portal": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Alarms": {
+                            "type": "object"
+                        },
+                        "NotificationSenderEmail": {
+                            "type": "string"
+                        },
+                        "PortalAuthMode": {
+                            "type": "string"
+                        },
+                        "PortalContactEmail": {
+                            "type": "string"
+                        },
+                        "PortalDescription": {
+                            "type": "string"
+                        },
+                        "PortalName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PortalContactEmail",
+                        "PortalName",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::Portal"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PortalId": {
+                            "type": "string"
+                        },
+                        "ProjectDescription": {
+                            "type": "string"
+                        },
+                        "ProjectName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PortalId",
+                        "ProjectName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTThingsGraph::FlowTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CompatibleNamespaceVersion": {
+                            "type": "number"
+                        },
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::IoTThingsGraph::FlowTemplate.DefinitionDocument"
+                        }
+                    },
+                    "required": [
+                        "Definition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTThingsGraph::FlowTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTThingsGraph::FlowTemplate.DefinitionDocument": {
+            "additionalProperties": false,
+            "properties": {
+                "Language": {
+                    "type": "string"
+                },
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Language",
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Expression": {
+                            "type": "string"
+                        },
+                        "ExpressionType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Expression",
+                        "ExpressionType",
+                        "Name",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::Destination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::DeviceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::DeviceProfile.LoRaWANDeviceProfile"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::DeviceProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::DeviceProfile.LoRaWANDeviceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "ClassBTimeout": {
+                    "type": "number"
+                },
+                "ClassCTimeout": {
+                    "type": "number"
+                },
+                "MacVersion": {
+                    "type": "string"
+                },
+                "MaxDutyCycle": {
+                    "type": "number"
+                },
+                "MaxEirp": {
+                    "type": "number"
+                },
+                "PingSlotDr": {
+                    "type": "number"
+                },
+                "PingSlotFreq": {
+                    "type": "number"
+                },
+                "PingSlotPeriod": {
+                    "type": "number"
+                },
+                "RegParamsRevision": {
+                    "type": "string"
+                },
+                "RfRegion": {
+                    "type": "string"
+                },
+                "Supports32BitFCnt": {
+                    "type": "boolean"
+                },
+                "SupportsClassB": {
+                    "type": "boolean"
+                },
+                "SupportsClassC": {
+                    "type": "boolean"
+                },
+                "SupportsJoin": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::FuotaTask": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociateMulticastGroup": {
+                            "type": "string"
+                        },
+                        "AssociateWirelessDevice": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisassociateMulticastGroup": {
+                            "type": "string"
+                        },
+                        "DisassociateWirelessDevice": {
+                            "type": "string"
+                        },
+                        "FirmwareUpdateImage": {
+                            "type": "string"
+                        },
+                        "FirmwareUpdateRole": {
+                            "type": "string"
+                        },
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::FuotaTask.LoRaWAN"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FirmwareUpdateImage",
+                        "FirmwareUpdateRole",
+                        "LoRaWAN"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::FuotaTask"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::FuotaTask.LoRaWAN": {
+            "additionalProperties": false,
+            "properties": {
+                "RfRegion": {
+                    "type": "string"
+                },
+                "StartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RfRegion"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::MulticastGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociateWirelessDevice": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisassociateWirelessDevice": {
+                            "type": "string"
+                        },
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::MulticastGroup.LoRaWAN"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "LoRaWAN"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::MulticastGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::MulticastGroup.LoRaWAN": {
+            "additionalProperties": false,
+            "properties": {
+                "DlClass": {
+                    "type": "string"
+                },
+                "NumberOfDevicesInGroup": {
+                    "type": "number"
+                },
+                "NumberOfDevicesRequested": {
+                    "type": "number"
+                },
+                "RfRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DlClass",
+                "RfRegion"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::PartnerAccount": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountLinked": {
+                            "type": "boolean"
+                        },
+                        "Fingerprint": {
+                            "type": "string"
+                        },
+                        "PartnerAccountId": {
+                            "type": "string"
+                        },
+                        "PartnerType": {
+                            "type": "string"
+                        },
+                        "Sidewalk": {
+                            "$ref": "#/definitions/AWS::IoTWireless::PartnerAccount.SidewalkAccountInfo"
+                        },
+                        "SidewalkUpdate": {
+                            "$ref": "#/definitions/AWS::IoTWireless::PartnerAccount.SidewalkUpdateAccount"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::PartnerAccount"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::PartnerAccount.SidewalkAccountInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "AppServerPrivateKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AppServerPrivateKey"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::PartnerAccount.SidewalkUpdateAccount": {
+            "additionalProperties": false,
+            "properties": {
+                "AppServerPrivateKey": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::ServiceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::ServiceProfile.LoRaWANServiceProfile"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::ServiceProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::ServiceProfile.LoRaWANServiceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "AddGwMetadata": {
+                    "type": "boolean"
+                },
+                "ChannelMask": {
+                    "type": "string"
+                },
+                "DevStatusReqFreq": {
+                    "type": "number"
+                },
+                "DlBucketSize": {
+                    "type": "number"
+                },
+                "DlRate": {
+                    "type": "number"
+                },
+                "DlRatePolicy": {
+                    "type": "string"
+                },
+                "DrMax": {
+                    "type": "number"
+                },
+                "DrMin": {
+                    "type": "number"
+                },
+                "HrAllowed": {
+                    "type": "boolean"
+                },
+                "MinGwDiversity": {
+                    "type": "number"
+                },
+                "NwkGeoLoc": {
+                    "type": "boolean"
+                },
+                "PrAllowed": {
+                    "type": "boolean"
+                },
+                "RaAllowed": {
+                    "type": "boolean"
+                },
+                "ReportDevStatusBattery": {
+                    "type": "boolean"
+                },
+                "ReportDevStatusMargin": {
+                    "type": "boolean"
+                },
+                "TargetPer": {
+                    "type": "number"
+                },
+                "UlBucketSize": {
+                    "type": "number"
+                },
+                "UlRate": {
+                    "type": "number"
+                },
+                "UlRatePolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::TaskDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoCreateTasks": {
+                            "type": "boolean"
+                        },
+                        "LoRaWANUpdateGatewayTaskEntry": {
+                            "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskEntry"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TaskDefinitionType": {
+                            "type": "string"
+                        },
+                        "Update": {
+                            "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.UpdateWirelessGatewayTaskCreate"
+                        }
+                    },
+                    "required": [
+                        "AutoCreateTasks"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::TaskDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Model": {
+                    "type": "string"
+                },
+                "PackageVersion": {
+                    "type": "string"
+                },
+                "Station": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskCreate": {
+            "additionalProperties": false,
+            "properties": {
+                "CurrentVersion": {
+                    "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion"
+                },
+                "SigKeyCrc": {
+                    "type": "number"
+                },
+                "UpdateSignature": {
+                    "type": "string"
+                },
+                "UpdateVersion": {
+                    "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "CurrentVersion": {
+                    "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion"
+                },
+                "UpdateVersion": {
+                    "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::TaskDefinition.UpdateWirelessGatewayTaskCreate": {
+            "additionalProperties": false,
+            "properties": {
+                "LoRaWAN": {
+                    "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskCreate"
+                },
+                "UpdateDataRole": {
+                    "type": "string"
+                },
+                "UpdateDataSource": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DestinationName": {
+                            "type": "string"
+                        },
+                        "LastUplinkReceivedAt": {
+                            "type": "string"
+                        },
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.LoRaWANDevice"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThingArn": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::WirelessDevice"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.AbpV10x": {
+            "additionalProperties": false,
+            "properties": {
+                "DevAddr": {
+                    "type": "string"
+                },
+                "SessionKeys": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.SessionKeysAbpV10x"
+                }
+            },
+            "required": [
+                "DevAddr",
+                "SessionKeys"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.AbpV11": {
+            "additionalProperties": false,
+            "properties": {
+                "DevAddr": {
+                    "type": "string"
+                },
+                "SessionKeys": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.SessionKeysAbpV11"
+                }
+            },
+            "required": [
+                "DevAddr",
+                "SessionKeys"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.LoRaWANDevice": {
+            "additionalProperties": false,
+            "properties": {
+                "AbpV10x": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.AbpV10x"
+                },
+                "AbpV11": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.AbpV11"
+                },
+                "DevEui": {
+                    "type": "string"
+                },
+                "DeviceProfileId": {
+                    "type": "string"
+                },
+                "OtaaV10x": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.OtaaV10x"
+                },
+                "OtaaV11": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.OtaaV11"
+                },
+                "ServiceProfileId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.OtaaV10x": {
+            "additionalProperties": false,
+            "properties": {
+                "AppEui": {
+                    "type": "string"
+                },
+                "AppKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AppEui",
+                "AppKey"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.OtaaV11": {
+            "additionalProperties": false,
+            "properties": {
+                "AppKey": {
+                    "type": "string"
+                },
+                "JoinEui": {
+                    "type": "string"
+                },
+                "NwkKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AppKey",
+                "JoinEui",
+                "NwkKey"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.SessionKeysAbpV10x": {
+            "additionalProperties": false,
+            "properties": {
+                "AppSKey": {
+                    "type": "string"
+                },
+                "NwkSKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AppSKey",
+                "NwkSKey"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.SessionKeysAbpV11": {
+            "additionalProperties": false,
+            "properties": {
+                "AppSKey": {
+                    "type": "string"
+                },
+                "FNwkSIntKey": {
+                    "type": "string"
+                },
+                "NwkSEncKey": {
+                    "type": "string"
+                },
+                "SNwkSIntKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AppSKey",
+                "FNwkSIntKey",
+                "NwkSEncKey",
+                "SNwkSIntKey"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "LastUplinkReceivedAt": {
+                            "type": "string"
+                        },
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::WirelessGateway.LoRaWANGateway"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThingArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LoRaWAN"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::WirelessGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessGateway.LoRaWANGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "GatewayEui": {
+                    "type": "string"
+                },
+                "RfRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GatewayEui",
+                "RfRegion"
+            ],
+            "type": "object"
+        },
+        "AWS::KMS::Alias": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AliasName": {
+                            "type": "string"
+                        },
+                        "TargetKeyId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AliasName",
+                        "TargetKeyId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KMS::Alias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KMS::Key": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EnableKeyRotation": {
+                            "type": "boolean"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "KeyPolicy": {
+                            "type": "object"
+                        },
+                        "KeySpec": {
+                            "type": "string"
+                        },
+                        "KeyUsage": {
+                            "type": "string"
+                        },
+                        "MultiRegion": {
+                            "type": "boolean"
+                        },
+                        "PendingWindowInDays": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "KeyPolicy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KMS::Key"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KMS::ReplicaKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "KeyPolicy": {
+                            "type": "object"
+                        },
+                        "PendingWindowInDays": {
+                            "type": "number"
+                        },
+                        "PrimaryKeyArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "KeyPolicy",
+                        "PrimaryKeyArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KMS::ReplicaKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::Kendra::DataSource.DataSourceConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IndexId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "IndexId",
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kendra::DataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.AccessControlListConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyPath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.AclConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedGroupsColumnName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AllowedGroupsColumnName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ColumnConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChangeDetectingColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DocumentDataColumnName": {
+                    "type": "string"
+                },
+                "DocumentIdColumnName": {
+                    "type": "string"
+                },
+                "DocumentTitleColumnName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ChangeDetectingColumns",
+                "DocumentDataColumnName",
+                "DocumentIdColumnName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceAttachmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentFieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceAttachmentToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "CrawlAttachments": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceAttachmentToIndexFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceFieldName": {
+                    "type": "string"
+                },
+                "DateFieldFormat": {
+                    "type": "string"
+                },
+                "IndexFieldName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceFieldName",
+                "IndexFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceBlogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BlogFieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceBlogToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceBlogToIndexFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceFieldName": {
+                    "type": "string"
+                },
+                "DateFieldFormat": {
+                    "type": "string"
+                },
+                "IndexFieldName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceFieldName",
+                "IndexFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceAttachmentConfiguration"
+                },
+                "BlogConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceBlogConfiguration"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PageConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluencePageConfiguration"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "ServerUrl": {
+                    "type": "string"
+                },
+                "SpaceConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceSpaceConfiguration"
+                },
+                "Version": {
+                    "type": "string"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceVpcConfiguration"
+                }
+            },
+            "required": [
+                "SecretArn",
+                "ServerUrl",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluencePageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "PageFieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluencePageToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluencePageToIndexFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceFieldName": {
+                    "type": "string"
+                },
+                "DateFieldFormat": {
+                    "type": "string"
+                },
+                "IndexFieldName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceFieldName",
+                "IndexFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceSpaceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlArchivedSpaces": {
+                    "type": "boolean"
+                },
+                "CrawlPersonalSpaces": {
+                    "type": "boolean"
+                },
+                "ExcludeSpaces": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "IncludeSpaces": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SpaceFieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceSpaceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceSpaceToIndexFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceFieldName": {
+                    "type": "string"
+                },
+                "DateFieldFormat": {
+                    "type": "string"
+                },
+                "IndexFieldName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceFieldName",
+                "IndexFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseHost": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DatabasePort": {
+                    "type": "number"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseHost",
+                "DatabaseName",
+                "DatabasePort",
+                "SecretArn",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.DataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfluenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceConfiguration"
+                },
+                "DatabaseConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.DatabaseConfiguration"
+                },
+                "GoogleDriveConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.GoogleDriveConfiguration"
+                },
+                "OneDriveConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.OneDriveConfiguration"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.S3DataSourceConfiguration"
+                },
+                "SalesforceConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceConfiguration"
+                },
+                "ServiceNowConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ServiceNowConfiguration"
+                },
+                "SharePointConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SharePointConfiguration"
+                },
+                "WebCrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerConfiguration"
+                },
+                "WorkDocsConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WorkDocsConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.DataSourceToIndexFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceFieldName": {
+                    "type": "string"
+                },
+                "DateFieldFormat": {
+                    "type": "string"
+                },
+                "IndexFieldName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceFieldName",
+                "IndexFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.DataSourceVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.DatabaseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AclConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.AclConfiguration"
+                },
+                "ColumnConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ColumnConfiguration"
+                },
+                "ConnectionConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConnectionConfiguration"
+                },
+                "DatabaseEngineType": {
+                    "type": "string"
+                },
+                "SqlConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SqlConfiguration"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceVpcConfiguration"
+                }
+            },
+            "required": [
+                "ColumnConfiguration",
+                "ConnectionConfiguration",
+                "DatabaseEngineType"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.DocumentsMetadataConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Prefix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.GoogleDriveConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludeMimeTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExcludeSharedDrives": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExcludeUserAccounts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.OneDriveConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DisableLocalGroups": {
+                    "type": "boolean"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OneDriveUsers": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.OneDriveUsers"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "TenantDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OneDriveUsers",
+                "SecretArn",
+                "TenantDomain"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.OneDriveUsers": {
+            "additionalProperties": false,
+            "properties": {
+                "OneDriveUserList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OneDriveUserS3Path": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.S3Path"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ProxyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Credentials": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.S3DataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessControlListConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.AccessControlListConfiguration"
+                },
+                "BucketName": {
+                    "type": "string"
+                },
+                "DocumentsMetadataConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.DocumentsMetadataConfiguration"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InclusionPrefixes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.S3Path": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceChatterFeedConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "IncludeFilterTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChatterFeedConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceChatterFeedConfiguration"
+                },
+                "CrawlAttachments": {
+                    "type": "boolean"
+                },
+                "ExcludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "IncludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "KnowledgeArticleConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceKnowledgeArticleConfiguration"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "ServerUrl": {
+                    "type": "string"
+                },
+                "StandardObjectAttachmentConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceStandardObjectAttachmentConfiguration"
+                },
+                "StandardObjectConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceStandardObjectConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecretArn",
+                "ServerUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceCustomKnowledgeArticleTypeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceKnowledgeArticleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomKnowledgeArticleTypeConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceCustomKnowledgeArticleTypeConfiguration"
+                    },
+                    "type": "array"
+                },
+                "IncludedStates": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StandardKnowledgeArticleTypeConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceStandardKnowledgeArticleTypeConfiguration"
+                }
+            },
+            "required": [
+                "IncludedStates"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceStandardKnowledgeArticleTypeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceStandardObjectAttachmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceStandardObjectConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ServiceNowConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationType": {
+                    "type": "string"
+                },
+                "HostUrl": {
+                    "type": "string"
+                },
+                "KnowledgeArticleConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ServiceNowKnowledgeArticleConfiguration"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "ServiceCatalogConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ServiceNowServiceCatalogConfiguration"
+                },
+                "ServiceNowBuildVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HostUrl",
+                "SecretArn",
+                "ServiceNowBuildVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ServiceNowKnowledgeArticleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlAttachments": {
+                    "type": "boolean"
+                },
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "ExcludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "FilterQuery": {
+                    "type": "string"
+                },
+                "IncludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ServiceNowServiceCatalogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlAttachments": {
+                    "type": "boolean"
+                },
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "ExcludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "IncludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SharePointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlAttachments": {
+                    "type": "boolean"
+                },
+                "DisableLocalGroups": {
+                    "type": "boolean"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "SharePointVersion": {
+                    "type": "string"
+                },
+                "SslCertificateS3Path": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.S3Path"
+                },
+                "Urls": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "UseChangeLog": {
+                    "type": "boolean"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceVpcConfiguration"
+                }
+            },
+            "required": [
+                "SecretArn",
+                "SharePointVersion",
+                "Urls"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SqlConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryIdentifiersEnclosingOption": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerAuthenticationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BasicAuthentication": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerBasicAuthentication"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerBasicAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "Credentials": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Credentials",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerAuthenticationConfiguration"
+                },
+                "CrawlDepth": {
+                    "type": "number"
+                },
+                "MaxContentSizePerPageInMegaBytes": {
+                    "type": "number"
+                },
+                "MaxLinksPerPage": {
+                    "type": "number"
+                },
+                "MaxUrlsPerMinuteCrawlRate": {
+                    "type": "number"
+                },
+                "ProxyConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ProxyConfiguration"
+                },
+                "UrlExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "UrlInclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Urls": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerUrls"
+                }
+            },
+            "required": [
+                "Urls"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerSeedUrlConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SeedUrls": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "WebCrawlerMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SeedUrls"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerSiteMapsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SiteMaps": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SiteMaps"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerUrls": {
+            "additionalProperties": false,
+            "properties": {
+                "SeedUrlConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerSeedUrlConfiguration"
+                },
+                "SiteMapsConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerSiteMapsConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WorkDocsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlComments": {
+                    "type": "boolean"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OrganizationId": {
+                    "type": "string"
+                },
+                "UseChangeLog": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "OrganizationId"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Faq": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "FileFormat": {
+                            "type": "string"
+                        },
+                        "IndexId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "S3Path": {
+                            "$ref": "#/definitions/AWS::Kendra::Faq.S3Path"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "IndexId",
+                        "Name",
+                        "RoleArn",
+                        "S3Path"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kendra::Faq"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Faq.S3Path": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CapacityUnits": {
+                            "$ref": "#/definitions/AWS::Kendra::Index.CapacityUnitsConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DocumentMetadataConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Kendra::Index.DocumentMetadataConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "Edition": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "ServerSideEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Kendra::Index.ServerSideEncryptionConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserContextPolicy": {
+                            "type": "string"
+                        },
+                        "UserTokenConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Kendra::Index.UserTokenConfiguration"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Edition",
+                        "Name",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kendra::Index"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index.CapacityUnitsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryCapacityUnits": {
+                    "type": "number"
+                },
+                "StorageCapacityUnits": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "QueryCapacityUnits",
+                "StorageCapacityUnits"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index.DocumentMetadataConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Relevance": {
+                    "$ref": "#/definitions/AWS::Kendra::Index.Relevance"
+                },
+                "Search": {
+                    "$ref": "#/definitions/AWS::Kendra::Index.Search"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index.JsonTokenTypeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupAttributeField": {
+                    "type": "string"
+                },
+                "UserNameAttributeField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupAttributeField",
+                "UserNameAttributeField"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index.JwtTokenTypeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClaimRegex": {
+                    "type": "string"
+                },
+                "GroupAttributeField": {
+                    "type": "string"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "KeyLocation": {
+                    "type": "string"
+                },
+                "SecretManagerArn": {
+                    "type": "string"
+                },
+                "URL": {
+                    "type": "string"
+                },
+                "UserNameAttributeField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KeyLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index.Relevance": {
+            "additionalProperties": false,
+            "properties": {
+                "Duration": {
+                    "type": "string"
+                },
+                "Freshness": {
+                    "type": "boolean"
+                },
+                "Importance": {
+                    "type": "number"
+                },
+                "RankOrder": {
+                    "type": "string"
+                },
+                "ValueImportanceItems": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::Index.ValueImportanceItem"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::Index.Search": {
+            "additionalProperties": false,
+            "properties": {
+                "Displayable": {
+                    "type": "boolean"
+                },
+                "Facetable": {
+                    "type": "boolean"
+                },
+                "Searchable": {
+                    "type": "boolean"
+                },
+                "Sortable": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::Index.ServerSideEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::Index.UserTokenConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonTokenTypeConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::Index.JsonTokenTypeConfiguration"
+                },
+                "JwtTokenTypeConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::Index.JwtTokenTypeConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::Index.ValueImportanceItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kinesis::Stream": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RetentionPeriodHours": {
+                            "type": "number"
+                        },
+                        "ShardCount": {
+                            "type": "number"
+                        },
+                        "StreamEncryption": {
+                            "$ref": "#/definitions/AWS::Kinesis::Stream.StreamEncryption"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ShardCount"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kinesis::Stream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Kinesis::Stream.StreamEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionType": {
+                    "type": "string"
+                },
+                "KeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionType",
+                "KeyId"
+            ],
+            "type": "object"
+        },
+        "AWS::Kinesis::StreamConsumer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConsumerName": {
+                            "type": "string"
+                        },
+                        "StreamARN": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConsumerName",
+                        "StreamARN"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kinesis::StreamConsumer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationCode": {
+                            "type": "string"
+                        },
+                        "ApplicationDescription": {
+                            "type": "string"
+                        },
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Inputs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::KinesisAnalytics::Application.Input"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Inputs"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalytics::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.CSVMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumnDelimiter": {
+                    "type": "string"
+                },
+                "RecordRowDelimiter": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordColumnDelimiter",
+                "RecordRowDelimiter"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.Input": {
+            "additionalProperties": false,
+            "properties": {
+                "InputParallelism": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.InputParallelism"
+                },
+                "InputProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.InputProcessingConfiguration"
+                },
+                "InputSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.InputSchema"
+                },
+                "KinesisFirehoseInput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.KinesisFirehoseInput"
+                },
+                "KinesisStreamsInput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.KinesisStreamsInput"
+                },
+                "NamePrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputSchema",
+                "NamePrefix"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.InputLambdaProcessor": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.InputParallelism": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.InputProcessingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputLambdaProcessor": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.InputLambdaProcessor"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.InputSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalytics::Application.RecordColumn"
+                    },
+                    "type": "array"
+                },
+                "RecordEncoding": {
+                    "type": "string"
+                },
+                "RecordFormat": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.RecordFormat"
+                }
+            },
+            "required": [
+                "RecordColumns",
+                "RecordFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.JSONMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordRowPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordRowPath"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.KinesisFirehoseInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.KinesisStreamsInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.MappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CSVMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.CSVMappingParameters"
+                },
+                "JSONMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.JSONMappingParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.RecordColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Mapping": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SqlType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "SqlType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.RecordFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "MappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.MappingParameters"
+                },
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordFormatType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Output": {
+                            "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput.Output"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "Output"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalytics::ApplicationOutput"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput.DestinationSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput.KinesisFirehoseOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput.KinesisStreamsOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput.LambdaOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput.DestinationSchema"
+                },
+                "KinesisFirehoseOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput.KinesisFirehoseOutput"
+                },
+                "KinesisStreamsOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput.KinesisStreamsOutput"
+                },
+                "LambdaOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput.LambdaOutput"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationSchema"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "ReferenceDataSource": {
+                            "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceDataSource"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "ReferenceDataSource"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalytics::ApplicationReferenceDataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.CSVMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumnDelimiter": {
+                    "type": "string"
+                },
+                "RecordRowDelimiter": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordColumnDelimiter",
+                "RecordRowDelimiter"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.JSONMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordRowPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordRowPath"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.MappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CSVMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.CSVMappingParameters"
+                },
+                "JSONMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.JSONMappingParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Mapping": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SqlType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "SqlType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "MappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.MappingParameters"
+                },
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordFormatType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ReferenceSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceSchema"
+                },
+                "S3ReferenceDataSource": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.S3ReferenceDataSource"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ReferenceSchema"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordColumn"
+                    },
+                    "type": "array"
+                },
+                "RecordEncoding": {
+                    "type": "string"
+                },
+                "RecordFormat": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordFormat"
+                }
+            },
+            "required": [
+                "RecordColumns",
+                "RecordFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.S3ReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketARN": {
+                    "type": "string"
+                },
+                "FileKey": {
+                    "type": "string"
+                },
+                "ReferenceRoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketARN",
+                "FileKey",
+                "ReferenceRoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationConfiguration"
+                        },
+                        "ApplicationDescription": {
+                            "type": "string"
+                        },
+                        "ApplicationMode": {
+                            "type": "string"
+                        },
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "RuntimeEnvironment": {
+                            "type": "string"
+                        },
+                        "ServiceExecutionRole": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RuntimeEnvironment",
+                        "ServiceExecutionRole"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalyticsV2::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ApplicationCodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CodeContent": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.CodeContent"
+                },
+                "CodeContentType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CodeContent",
+                "CodeContentType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ApplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationCodeConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationCodeConfiguration"
+                },
+                "ApplicationSnapshotConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationSnapshotConfiguration"
+                },
+                "EnvironmentProperties": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.EnvironmentProperties"
+                },
+                "FlinkApplicationConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.FlinkApplicationConfiguration"
+                },
+                "SqlApplicationConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.SqlApplicationConfiguration"
+                },
+                "ZeppelinApplicationConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ZeppelinApplicationConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ApplicationSnapshotConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SnapshotsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "SnapshotsEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CSVMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumnDelimiter": {
+                    "type": "string"
+                },
+                "RecordRowDelimiter": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordColumnDelimiter",
+                "RecordRowDelimiter"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CatalogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GlueDataCatalogConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.GlueDataCatalogConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CheckpointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CheckpointInterval": {
+                    "type": "number"
+                },
+                "CheckpointingEnabled": {
+                    "type": "boolean"
+                },
+                "ConfigurationType": {
+                    "type": "string"
+                },
+                "MinPauseBetweenCheckpoints": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ConfigurationType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CodeContent": {
+            "additionalProperties": false,
+            "properties": {
+                "S3ContentLocation": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.S3ContentLocation"
+                },
+                "TextContent": {
+                    "type": "string"
+                },
+                "ZipFileContent": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CustomArtifactConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ArtifactType": {
+                    "type": "string"
+                },
+                "MavenReference": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.MavenReference"
+                },
+                "S3ContentLocation": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.S3ContentLocation"
+                }
+            },
+            "required": [
+                "ArtifactType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CustomArtifactsConfiguration": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.DeployAsApplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3ContentLocation": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.S3ContentBaseLocation"
+                }
+            },
+            "required": [
+                "S3ContentLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.EnvironmentProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "PropertyGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.PropertyGroup"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.FlinkApplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CheckpointConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.CheckpointConfiguration"
+                },
+                "MonitoringConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.MonitoringConfiguration"
+                },
+                "ParallelismConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ParallelismConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.GlueDataCatalogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseARN": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.Input": {
+            "additionalProperties": false,
+            "properties": {
+                "InputParallelism": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.InputParallelism"
+                },
+                "InputProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.InputProcessingConfiguration"
+                },
+                "InputSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.InputSchema"
+                },
+                "KinesisFirehoseInput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.KinesisFirehoseInput"
+                },
+                "KinesisStreamsInput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.KinesisStreamsInput"
+                },
+                "NamePrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputSchema",
+                "NamePrefix"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.InputLambdaProcessor": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.InputParallelism": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.InputProcessingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputLambdaProcessor": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.InputLambdaProcessor"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.InputSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.RecordColumn"
+                    },
+                    "type": "array"
+                },
+                "RecordEncoding": {
+                    "type": "string"
+                },
+                "RecordFormat": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.RecordFormat"
+                }
+            },
+            "required": [
+                "RecordColumns",
+                "RecordFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.JSONMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordRowPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordRowPath"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.KinesisFirehoseInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.KinesisStreamsInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.MappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CSVMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.CSVMappingParameters"
+                },
+                "JSONMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.JSONMappingParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.MavenReference": {
+            "additionalProperties": false,
+            "properties": {
+                "ArtifactId": {
+                    "type": "string"
+                },
+                "GroupId": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ArtifactId",
+                "GroupId",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.MonitoringConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfigurationType": {
+                    "type": "string"
+                },
+                "LogLevel": {
+                    "type": "string"
+                },
+                "MetricsLevel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConfigurationType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ParallelismConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoScalingEnabled": {
+                    "type": "boolean"
+                },
+                "ConfigurationType": {
+                    "type": "string"
+                },
+                "Parallelism": {
+                    "type": "number"
+                },
+                "ParallelismPerKPU": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ConfigurationType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.PropertyGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "PropertyGroupId": {
+                    "type": "string"
+                },
+                "PropertyMap": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.RecordColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Mapping": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SqlType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "SqlType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.RecordFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "MappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.MappingParameters"
+                },
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordFormatType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.S3ContentBaseLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "BasePath": {
+                    "type": "string"
+                },
+                "BucketARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BasePath",
+                "BucketARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.S3ContentLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketARN": {
+                    "type": "string"
+                },
+                "FileKey": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.SqlApplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Inputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.Input"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ZeppelinApplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.CatalogConfiguration"
+                },
+                "CustomArtifactsConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.CustomArtifactsConfiguration"
+                },
+                "DeployAsApplicationConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.DeployAsApplicationConfiguration"
+                },
+                "MonitoringConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ZeppelinMonitoringConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ZeppelinMonitoringConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogLevel": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "CloudWatchLoggingOption": {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption.CloudWatchLoggingOption"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "CloudWatchLoggingOption"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption.CloudWatchLoggingOption": {
+            "additionalProperties": false,
+            "properties": {
+                "LogStreamARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogStreamARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Output": {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput.Output"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "Output"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalyticsV2::ApplicationOutput"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput.DestinationSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisFirehoseOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisStreamsOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput.LambdaOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput.DestinationSchema"
+                },
+                "KinesisFirehoseOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisFirehoseOutput"
+                },
+                "KinesisStreamsOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisStreamsOutput"
+                },
+                "LambdaOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput.LambdaOutput"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationSchema"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "ReferenceDataSource": {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceDataSource"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "ReferenceDataSource"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.CSVMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumnDelimiter": {
+                    "type": "string"
+                },
+                "RecordRowDelimiter": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordColumnDelimiter",
+                "RecordRowDelimiter"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.JSONMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordRowPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordRowPath"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.MappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CSVMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.CSVMappingParameters"
+                },
+                "JSONMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.JSONMappingParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Mapping": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SqlType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "SqlType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "MappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.MappingParameters"
+                },
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordFormatType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ReferenceSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceSchema"
+                },
+                "S3ReferenceDataSource": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.S3ReferenceDataSource"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ReferenceSchema"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordColumn"
+                    },
+                    "type": "array"
+                },
+                "RecordEncoding": {
+                    "type": "string"
+                },
+                "RecordFormat": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordFormat"
+                }
+            },
+            "required": [
+                "RecordColumns",
+                "RecordFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.S3ReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketARN": {
+                    "type": "string"
+                },
+                "FileKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketARN",
+                "FileKey"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AmazonopensearchserviceDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceDestinationConfiguration"
+                        },
+                        "DeliveryStreamEncryptionConfigurationInput": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.DeliveryStreamEncryptionConfigurationInput"
+                        },
+                        "DeliveryStreamName": {
+                            "type": "string"
+                        },
+                        "DeliveryStreamType": {
+                            "type": "string"
+                        },
+                        "ElasticsearchDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ElasticsearchDestinationConfiguration"
+                        },
+                        "ExtendedS3DestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ExtendedS3DestinationConfiguration"
+                        },
+                        "HttpEndpointDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointDestinationConfiguration"
+                        },
+                        "KinesisStreamSourceConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.KinesisStreamSourceConfiguration"
+                        },
+                        "RedshiftDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RedshiftDestinationConfiguration"
+                        },
+                        "S3DestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                        },
+                        "SplunkDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SplunkDestinationConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisFirehose::DeliveryStream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceBufferingHints": {
+            "additionalProperties": false,
+            "properties": {
+                "IntervalInSeconds": {
+                    "type": "number"
+                },
+                "SizeInMBs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceBufferingHints"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "ClusterEndpoint": {
+                    "type": "string"
+                },
+                "DomainARN": {
+                    "type": "string"
+                },
+                "IndexName": {
+                    "type": "string"
+                },
+                "IndexRotationPeriod": {
+                    "type": "string"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceRetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "TypeName": {
+                    "type": "string"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.VpcConfiguration"
+                }
+            },
+            "required": [
+                "IndexName",
+                "RoleARN",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceRetryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.BufferingHints": {
+            "additionalProperties": false,
+            "properties": {
+                "IntervalInSeconds": {
+                    "type": "number"
+                },
+                "SizeInMBs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "LogStreamName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.CopyCommand": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyOptions": {
+                    "type": "string"
+                },
+                "DataTableColumns": {
+                    "type": "string"
+                },
+                "DataTableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataTableName"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.DataFormatConversionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "InputFormatConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.InputFormatConfiguration"
+                },
+                "OutputFormatConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.OutputFormatConfiguration"
+                },
+                "SchemaConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SchemaConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.DeliveryStreamEncryptionConfigurationInput": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyARN": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KeyType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.Deserializer": {
+            "additionalProperties": false,
+            "properties": {
+                "HiveJsonSerDe": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HiveJsonSerDe"
+                },
+                "OpenXJsonSerDe": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.OpenXJsonSerDe"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.DynamicPartitioningConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RetryOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ElasticsearchBufferingHints": {
+            "additionalProperties": false,
+            "properties": {
+                "IntervalInSeconds": {
+                    "type": "number"
+                },
+                "SizeInMBs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ElasticsearchDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ElasticsearchBufferingHints"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "ClusterEndpoint": {
+                    "type": "string"
+                },
+                "DomainARN": {
+                    "type": "string"
+                },
+                "IndexName": {
+                    "type": "string"
+                },
+                "IndexRotationPeriod": {
+                    "type": "string"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ElasticsearchRetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "TypeName": {
+                    "type": "string"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.VpcConfiguration"
+                }
+            },
+            "required": [
+                "IndexName",
+                "RoleARN",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ElasticsearchRetryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSEncryptionConfig": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.KMSEncryptionConfig"
+                },
+                "NoEncryptionConfig": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ExtendedS3DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketARN": {
+                    "type": "string"
+                },
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.BufferingHints"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "CompressionFormat": {
+                    "type": "string"
+                },
+                "DataFormatConversionConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.DataFormatConversionConfiguration"
+                },
+                "DynamicPartitioningConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.DynamicPartitioningConfiguration"
+                },
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.EncryptionConfiguration"
+                },
+                "ErrorOutputPrefix": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3BackupConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.HiveJsonSerDe": {
+            "additionalProperties": false,
+            "properties": {
+                "TimestampFormats": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.HttpEndpointCommonAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "AttributeValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "AttributeValue"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.HttpEndpointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessKey": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.HttpEndpointDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.BufferingHints"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "EndpointConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointConfiguration"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RequestConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointRequestConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                }
+            },
+            "required": [
+                "EndpointConfiguration",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.HttpEndpointRequestConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CommonAttributes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointCommonAttribute"
+                    },
+                    "type": "array"
+                },
+                "ContentEncoding": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.InputFormatConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Deserializer": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.Deserializer"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.KMSEncryptionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AWSKMSKeyARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AWSKMSKeyARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.KinesisStreamSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KinesisStreamARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KinesisStreamARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.OpenXJsonSerDe": {
+            "additionalProperties": false,
+            "properties": {
+                "CaseInsensitive": {
+                    "type": "boolean"
+                },
+                "ColumnToJsonKeyMappings": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ConvertDotsInJsonKeysToUnderscores": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.OrcSerDe": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockSizeBytes": {
+                    "type": "number"
+                },
+                "BloomFilterColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BloomFilterFalsePositiveProbability": {
+                    "type": "number"
+                },
+                "Compression": {
+                    "type": "string"
+                },
+                "DictionaryKeyThreshold": {
+                    "type": "number"
+                },
+                "EnablePadding": {
+                    "type": "boolean"
+                },
+                "FormatVersion": {
+                    "type": "string"
+                },
+                "PaddingTolerance": {
+                    "type": "number"
+                },
+                "RowIndexStride": {
+                    "type": "number"
+                },
+                "StripeSizeBytes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.OutputFormatConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Serializer": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.Serializer"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ParquetSerDe": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockSizeBytes": {
+                    "type": "number"
+                },
+                "Compression": {
+                    "type": "string"
+                },
+                "EnableDictionaryCompression": {
+                    "type": "boolean"
+                },
+                "MaxPaddingBytes": {
+                    "type": "number"
+                },
+                "PageSizeBytes": {
+                    "type": "number"
+                },
+                "WriterVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Processors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.Processor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.Processor": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessorParameter"
+                    },
+                    "type": "array"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ProcessorParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ParameterName",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.RedshiftDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "ClusterJDBCURL": {
+                    "type": "string"
+                },
+                "CopyCommand": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CopyCommand"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RedshiftRetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3BackupConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClusterJDBCURL",
+                "CopyCommand",
+                "Password",
+                "RoleARN",
+                "S3Configuration",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.RedshiftRetryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.RetryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketARN": {
+                    "type": "string"
+                },
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.BufferingHints"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "CompressionFormat": {
+                    "type": "string"
+                },
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.EncryptionConfiguration"
+                },
+                "ErrorOutputPrefix": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.SchemaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "VersionId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.Serializer": {
+            "additionalProperties": false,
+            "properties": {
+                "OrcSerDe": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.OrcSerDe"
+                },
+                "ParquetSerDe": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ParquetSerDe"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.SplunkDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "HECAcknowledgmentTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "HECEndpoint": {
+                    "type": "string"
+                },
+                "HECEndpointType": {
+                    "type": "string"
+                },
+                "HECToken": {
+                    "type": "string"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SplunkRetryOptions"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                }
+            },
+            "required": [
+                "HECEndpoint",
+                "HECEndpointType",
+                "HECToken",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.SplunkRetryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleARN": {
+                    "type": "string"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "RoleARN",
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::LakeFormation::DataLakeSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Admins": {
+                            "$ref": "#/definitions/AWS::LakeFormation::DataLakeSettings.Admins"
+                        },
+                        "TrustedResourceOwners": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LakeFormation::DataLakeSettings"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::LakeFormation::DataLakeSettings.Admins": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::LakeFormation::DataLakeSettings.DataLakePrincipal": {
+            "additionalProperties": false,
+            "properties": {
+                "DataLakePrincipalIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataLakePrincipal": {
+                            "$ref": "#/definitions/AWS::LakeFormation::Permissions.DataLakePrincipal"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PermissionsWithGrantOption": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Resource": {
+                            "$ref": "#/definitions/AWS::LakeFormation::Permissions.Resource"
+                        }
+                    },
+                    "required": [
+                        "DataLakePrincipal",
+                        "Resource"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LakeFormation::Permissions"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.ColumnWildcard": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludedColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.DataLakePrincipal": {
+            "additionalProperties": false,
+            "properties": {
+                "DataLakePrincipalIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.DataLocationResource": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "S3Resource": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.DatabaseResource": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.Resource": {
+            "additionalProperties": false,
+            "properties": {
+                "DataLocationResource": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.DataLocationResource"
+                },
+                "DatabaseResource": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.DatabaseResource"
+                },
+                "TableResource": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.TableResource"
+                },
+                "TableWithColumnsResource": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.TableWithColumnsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.TableResource": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "TableWildcard": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.TableWildcard"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.TableWildcard": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.TableWithColumnsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "ColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ColumnWildcard": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.ColumnWildcard"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Resource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "UseServiceLinkedRole": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ResourceArn",
+                        "UseServiceLinkedRole"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LakeFormation::Resource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Alias": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "FunctionVersion": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ProvisionedConcurrencyConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Alias.ProvisionedConcurrencyConfiguration"
+                        },
+                        "RoutingConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Alias.AliasRoutingConfiguration"
+                        }
+                    },
+                    "required": [
+                        "FunctionName",
+                        "FunctionVersion",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::Alias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Alias.AliasRoutingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalVersionWeights": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Lambda::Alias.VersionWeight"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AdditionalVersionWeights"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Alias.ProvisionedConcurrencyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ProvisionedConcurrentExecutions": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ProvisionedConcurrentExecutions"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Alias.VersionWeight": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionVersion": {
+                    "type": "string"
+                },
+                "FunctionWeight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FunctionVersion",
+                "FunctionWeight"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::CodeSigningConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowedPublishers": {
+                            "$ref": "#/definitions/AWS::Lambda::CodeSigningConfig.AllowedPublishers"
+                        },
+                        "CodeSigningPolicies": {
+                            "$ref": "#/definitions/AWS::Lambda::CodeSigningConfig.CodeSigningPolicies"
+                        },
+                        "Description": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AllowedPublishers"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::CodeSigningConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::CodeSigningConfig.AllowedPublishers": {
+            "additionalProperties": false,
+            "properties": {
+                "SigningProfileVersionArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SigningProfileVersionArns"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::CodeSigningConfig.CodeSigningPolicies": {
+            "additionalProperties": false,
+            "properties": {
+                "UntrustedArtifactOnDeployment": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "UntrustedArtifactOnDeployment"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::EventInvokeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::EventInvokeConfig.DestinationConfig"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "MaximumEventAgeInSeconds": {
+                            "type": "number"
+                        },
+                        "MaximumRetryAttempts": {
+                            "type": "number"
+                        },
+                        "Qualifier": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FunctionName",
+                        "Qualifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::EventInvokeConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::EventInvokeConfig.DestinationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "OnFailure": {
+                    "$ref": "#/definitions/AWS::Lambda::EventInvokeConfig.OnFailure"
+                },
+                "OnSuccess": {
+                    "$ref": "#/definitions/AWS::Lambda::EventInvokeConfig.OnSuccess"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::EventInvokeConfig.OnFailure": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::EventInvokeConfig.OnSuccess": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BatchSize": {
+                            "type": "number"
+                        },
+                        "BisectBatchOnFunctionError": {
+                            "type": "boolean"
+                        },
+                        "DestinationConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.DestinationConfig"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "EventSourceArn": {
+                            "type": "string"
+                        },
+                        "FilterCriteria": {
+                            "type": "object"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "FunctionResponseTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MaximumBatchingWindowInSeconds": {
+                            "type": "number"
+                        },
+                        "MaximumRecordAgeInSeconds": {
+                            "type": "number"
+                        },
+                        "MaximumRetryAttempts": {
+                            "type": "number"
+                        },
+                        "ParallelizationFactor": {
+                            "type": "number"
+                        },
+                        "Queues": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SelfManagedEventSource": {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SelfManagedEventSource"
+                        },
+                        "SourceAccessConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SourceAccessConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "StartingPosition": {
+                            "type": "string"
+                        },
+                        "StartingPositionTimestamp": {
+                            "type": "number"
+                        },
+                        "Topics": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "TumblingWindowInSeconds": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "FunctionName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::EventSourceMapping"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping.DestinationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "OnFailure": {
+                    "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.OnFailure"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping.Endpoints": {
+            "additionalProperties": false,
+            "properties": {
+                "KafkaBootstrapServers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping.OnFailure": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping.SelfManagedEventSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoints": {
+                    "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.Endpoints"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping.SourceAccessConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "URI": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Architectures": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Code": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.Code"
+                        },
+                        "CodeSigningConfigArn": {
+                            "type": "string"
+                        },
+                        "DeadLetterConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.DeadLetterConfig"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Environment": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.Environment"
+                        },
+                        "FileSystemConfigs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Lambda::Function.FileSystemConfig"
+                            },
+                            "type": "array"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "Handler": {
+                            "type": "string"
+                        },
+                        "ImageConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.ImageConfig"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "Layers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MemorySize": {
+                            "type": "number"
+                        },
+                        "PackageType": {
+                            "type": "string"
+                        },
+                        "ReservedConcurrentExecutions": {
+                            "type": "number"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "Runtime": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Timeout": {
+                            "type": "number"
+                        },
+                        "TracingConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.TracingConfig"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "Code",
+                        "Role"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::Function"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Function.Code": {
+            "additionalProperties": false,
+            "properties": {
+                "ImageUri": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                },
+                "S3ObjectVersion": {
+                    "type": "string"
+                },
+                "ZipFile": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function.DeadLetterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function.Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "Variables": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function.FileSystemConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "LocalMountPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn",
+                "LocalMountPath"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Function.ImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Command": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EntryPoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "WorkingDirectory": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function.TracingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::LayerVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CompatibleArchitectures": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CompatibleRuntimes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Content": {
+                            "$ref": "#/definitions/AWS::Lambda::LayerVersion.Content"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LayerName": {
+                            "type": "string"
+                        },
+                        "LicenseInfo": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Content"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::LayerVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::LayerVersion.Content": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                },
+                "S3ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::LayerVersionPermission": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "LayerVersionArn": {
+                            "type": "string"
+                        },
+                        "OrganizationId": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Action",
+                        "LayerVersionArn",
+                        "Principal"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::LayerVersionPermission"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Permission": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "EventSourceToken": {
+                            "type": "string"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        },
+                        "SourceAccount": {
+                            "type": "string"
+                        },
+                        "SourceArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Action",
+                        "FunctionName",
+                        "Principal"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::Permission"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Version": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CodeSha256": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "ProvisionedConcurrencyConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Version.ProvisionedConcurrencyConfiguration"
+                        }
+                    },
+                    "required": [
+                        "FunctionName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::Version"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Version.ProvisionedConcurrencyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ProvisionedConcurrentExecutions": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ProvisionedConcurrentExecutions"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::Grant": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowedOperations": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "GrantName": {
+                            "type": "string"
+                        },
+                        "HomeRegion": {
+                            "type": "string"
+                        },
+                        "LicenseArn": {
+                            "type": "string"
+                        },
+                        "Principals": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LicenseManager::Grant"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Beneficiary": {
+                            "type": "string"
+                        },
+                        "ConsumptionConfiguration": {
+                            "$ref": "#/definitions/AWS::LicenseManager::License.ConsumptionConfiguration"
+                        },
+                        "Entitlements": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::LicenseManager::License.Entitlement"
+                            },
+                            "type": "array"
+                        },
+                        "HomeRegion": {
+                            "type": "string"
+                        },
+                        "Issuer": {
+                            "$ref": "#/definitions/AWS::LicenseManager::License.IssuerData"
+                        },
+                        "LicenseMetadata": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::LicenseManager::License.Metadata"
+                            },
+                            "type": "array"
+                        },
+                        "LicenseName": {
+                            "type": "string"
+                        },
+                        "ProductName": {
+                            "type": "string"
+                        },
+                        "ProductSKU": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Validity": {
+                            "$ref": "#/definitions/AWS::LicenseManager::License.ValidityDateFormat"
+                        }
+                    },
+                    "required": [
+                        "ConsumptionConfiguration",
+                        "Entitlements",
+                        "HomeRegion",
+                        "Issuer",
+                        "LicenseName",
+                        "ProductName",
+                        "Validity"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LicenseManager::License"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.BorrowConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowEarlyCheckIn": {
+                    "type": "boolean"
+                },
+                "MaxTimeToLiveInMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AllowEarlyCheckIn",
+                "MaxTimeToLiveInMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.ConsumptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BorrowConfiguration": {
+                    "$ref": "#/definitions/AWS::LicenseManager::License.BorrowConfiguration"
+                },
+                "ProvisionalConfiguration": {
+                    "$ref": "#/definitions/AWS::LicenseManager::License.ProvisionalConfiguration"
+                },
+                "RenewType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.Entitlement": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowCheckIn": {
+                    "type": "boolean"
+                },
+                "MaxCount": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Overage": {
+                    "type": "boolean"
+                },
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Unit"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.IssuerData": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SignKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.Metadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.ProvisionalConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTimeToLiveInMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxTimeToLiveInMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.ValidityDateFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "Begin": {
+                    "type": "string"
+                },
+                "End": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Begin",
+                "End"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Database": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "BackupRetention": {
+                            "type": "boolean"
+                        },
+                        "CaCertificateIdentifier": {
+                            "type": "string"
+                        },
+                        "MasterDatabaseName": {
+                            "type": "string"
+                        },
+                        "MasterUserPassword": {
+                            "type": "string"
+                        },
+                        "MasterUsername": {
+                            "type": "string"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "PubliclyAccessible": {
+                            "type": "boolean"
+                        },
+                        "RelationalDatabaseBlueprintId": {
+                            "type": "string"
+                        },
+                        "RelationalDatabaseBundleId": {
+                            "type": "string"
+                        },
+                        "RelationalDatabaseName": {
+                            "type": "string"
+                        },
+                        "RelationalDatabaseParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Lightsail::Database.RelationalDatabaseParameter"
+                            },
+                            "type": "array"
+                        },
+                        "RotateMasterUserPassword": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MasterDatabaseName",
+                        "MasterUsername",
+                        "RelationalDatabaseBlueprintId",
+                        "RelationalDatabaseBundleId",
+                        "RelationalDatabaseName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lightsail::Database"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Database.RelationalDatabaseParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedValues": {
+                    "type": "string"
+                },
+                "ApplyMethod": {
+                    "type": "string"
+                },
+                "ApplyType": {
+                    "type": "string"
+                },
+                "DataType": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "IsModifiable": {
+                    "type": "boolean"
+                },
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Disk": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AddOns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Lightsail::Disk.AddOn"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "DiskName": {
+                            "type": "string"
+                        },
+                        "SizeInGb": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DiskName",
+                        "SizeInGb"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lightsail::Disk"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Disk.AddOn": {
+            "additionalProperties": false,
+            "properties": {
+                "AddOnType": {
+                    "type": "string"
+                },
+                "AutoSnapshotAddOnRequest": {
+                    "$ref": "#/definitions/AWS::Lightsail::Disk.AutoSnapshotAddOn"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AddOnType"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Disk.AutoSnapshotAddOn": {
+            "additionalProperties": false,
+            "properties": {
+                "SnapshotTimeOfDay": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AddOns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Lightsail::Instance.AddOn"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "BlueprintId": {
+                            "type": "string"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Hardware": {
+                            "$ref": "#/definitions/AWS::Lightsail::Instance.Hardware"
+                        },
+                        "InstanceName": {
+                            "type": "string"
+                        },
+                        "KeyPairName": {
+                            "type": "string"
+                        },
+                        "Networking": {
+                            "$ref": "#/definitions/AWS::Lightsail::Instance.Networking"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserData": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "BlueprintId",
+                        "BundleId",
+                        "InstanceName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lightsail::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.AddOn": {
+            "additionalProperties": false,
+            "properties": {
+                "AddOnType": {
+                    "type": "string"
+                },
+                "AutoSnapshotAddOnRequest": {
+                    "$ref": "#/definitions/AWS::Lightsail::Instance.AutoSnapshotAddOn"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AddOnType"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.AutoSnapshotAddOn": {
+            "additionalProperties": false,
+            "properties": {
+                "SnapshotTimeOfDay": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.Disk": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachedTo": {
+                    "type": "string"
+                },
+                "AttachmentState": {
+                    "type": "string"
+                },
+                "DiskName": {
+                    "type": "string"
+                },
+                "IOPS": {
+                    "type": "number"
+                },
+                "IsSystemDisk": {
+                    "type": "boolean"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "SizeInGb": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DiskName",
+                "Path"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.Hardware": {
+            "additionalProperties": false,
+            "properties": {
+                "CpuCount": {
+                    "type": "number"
+                },
+                "Disks": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Lightsail::Instance.Disk"
+                    },
+                    "type": "array"
+                },
+                "RamSizeInGb": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.Location": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "RegionName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.MonthlyTransfer": {
+            "additionalProperties": false,
+            "properties": {
+                "GbPerMonthAllocated": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.Networking": {
+            "additionalProperties": false,
+            "properties": {
+                "MonthlyTransfer": {
+                    "$ref": "#/definitions/AWS::Lightsail::Instance.MonthlyTransfer"
+                },
+                "Ports": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Lightsail::Instance.Port"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Ports"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.Port": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessDirection": {
+                    "type": "string"
+                },
+                "AccessFrom": {
+                    "type": "string"
+                },
+                "AccessType": {
+                    "type": "string"
+                },
+                "CidrListAliases": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Cidrs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CommonName": {
+                    "type": "string"
+                },
+                "FromPort": {
+                    "type": "number"
+                },
+                "Ipv6Cidrs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.State": {
+            "additionalProperties": false,
+            "properties": {
+                "Code": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::StaticIp": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AttachedTo": {
+                            "type": "string"
+                        },
+                        "StaticIpName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "StaticIpName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lightsail::StaticIp"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::GeofenceCollection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CollectionName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        },
+                        "PricingPlanDataSource": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CollectionName",
+                        "PricingPlan"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::GeofenceCollection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::Map": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::Location::Map.MapConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "MapName": {
+                            "type": "string"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Configuration",
+                        "MapName",
+                        "PricingPlan"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::Map"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::Map.MapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Style": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Style"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::PlaceIndex": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataSource": {
+                            "type": "string"
+                        },
+                        "DataSourceConfiguration": {
+                            "$ref": "#/definitions/AWS::Location::PlaceIndex.DataSourceConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IndexName": {
+                            "type": "string"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DataSource",
+                        "IndexName",
+                        "PricingPlan"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::PlaceIndex"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::PlaceIndex.DataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IntendedUse": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Location::RouteCalculator": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CalculatorName": {
+                            "type": "string"
+                        },
+                        "DataSource": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CalculatorName",
+                        "DataSource",
+                        "PricingPlan"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::RouteCalculator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::Tracker": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "PositionFiltering": {
+                            "type": "string"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        },
+                        "PricingPlanDataSource": {
+                            "type": "string"
+                        },
+                        "TrackerName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PricingPlan",
+                        "TrackerName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::Tracker"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::TrackerConsumer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConsumerArn": {
+                            "type": "string"
+                        },
+                        "TrackerName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConsumerArn",
+                        "TrackerName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::TrackerConsumer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationName": {
+                            "type": "string"
+                        },
+                        "DestinationPolicy": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "TargetArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationName",
+                        "DestinationPolicy",
+                        "RoleArn",
+                        "TargetArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::Destination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::LogGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "RetentionInDays": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::LogGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::LogStream": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "LogStreamName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LogGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::LogStream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::MetricFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FilterPattern": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "MetricTransformations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Logs::MetricFilter.MetricTransformation"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FilterPattern",
+                        "LogGroupName",
+                        "MetricTransformations"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::MetricFilter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::MetricFilter.MetricTransformation": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultValue": {
+                    "type": "number"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "MetricNamespace": {
+                    "type": "string"
+                },
+                "MetricValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "MetricNamespace",
+                "MetricValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::QueryDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LogGroupNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QueryString": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "QueryString"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::QueryDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::ResourcePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyDocument": {
+                            "type": "string"
+                        },
+                        "PolicyName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument",
+                        "PolicyName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::ResourcePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::SubscriptionFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationArn": {
+                            "type": "string"
+                        },
+                        "FilterPattern": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationArn",
+                        "FilterPattern",
+                        "LogGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::SubscriptionFilter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutEquipment::InferenceScheduler": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataDelayOffsetInMinutes": {
+                            "type": "number"
+                        },
+                        "DataInputConfiguration": {
+                            "type": "object"
+                        },
+                        "DataOutputConfiguration": {
+                            "type": "object"
+                        },
+                        "DataUploadFrequency": {
+                            "type": "string"
+                        },
+                        "InferenceSchedulerName": {
+                            "type": "string"
+                        },
+                        "ModelName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "ServerSideKmsKeyId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DataInputConfiguration",
+                        "DataOutputConfiguration",
+                        "DataUploadFrequency",
+                        "ModelName",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LookoutEquipment::InferenceScheduler"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::Alert": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "$ref": "#/definitions/AWS::LookoutMetrics::Alert.Action"
+                        },
+                        "AlertDescription": {
+                            "type": "string"
+                        },
+                        "AlertName": {
+                            "type": "string"
+                        },
+                        "AlertSensitivityThreshold": {
+                            "type": "number"
+                        },
+                        "AnomalyDetectorArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Action",
+                        "AlertSensitivityThreshold",
+                        "AnomalyDetectorArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LookoutMetrics::Alert"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::Alert.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaConfiguration": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::Alert.LambdaConfiguration"
+                },
+                "SNSConfiguration": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::Alert.SNSConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::Alert.LambdaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaArn",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::Alert.SNSConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SnsTopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SnsTopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AnomalyDetectorConfig": {
+                            "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.AnomalyDetectorConfig"
+                        },
+                        "AnomalyDetectorDescription": {
+                            "type": "string"
+                        },
+                        "AnomalyDetectorName": {
+                            "type": "string"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "MetricSetList": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.MetricSet"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AnomalyDetectorConfig",
+                        "MetricSetList"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LookoutMetrics::AnomalyDetector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.AnomalyDetectorConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AnomalyDetectorFrequency": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AnomalyDetectorFrequency"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.AppFlowConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FlowName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FlowName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.CloudwatchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.CsvFormatDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "Charset": {
+                    "type": "string"
+                },
+                "ContainsHeader": {
+                    "type": "boolean"
+                },
+                "Delimiter": {
+                    "type": "string"
+                },
+                "FileCompression": {
+                    "type": "string"
+                },
+                "HeaderList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "QuoteSymbol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.FileFormatDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "CsvFormatDescriptor": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.CsvFormatDescriptor"
+                },
+                "JsonFormatDescriptor": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.JsonFormatDescriptor"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.JsonFormatDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "Charset": {
+                    "type": "string"
+                },
+                "FileCompression": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.Metric": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregationFunction": {
+                    "type": "string"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AggregationFunction",
+                "MetricName"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.MetricSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MetricList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.Metric"
+                    },
+                    "type": "array"
+                },
+                "MetricSetDescription": {
+                    "type": "string"
+                },
+                "MetricSetFrequency": {
+                    "type": "string"
+                },
+                "MetricSetName": {
+                    "type": "string"
+                },
+                "MetricSource": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.MetricSource"
+                },
+                "Offset": {
+                    "type": "number"
+                },
+                "TimestampColumn": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.TimestampColumn"
+                },
+                "Timezone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricList",
+                "MetricSetName",
+                "MetricSource"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.MetricSource": {
+            "additionalProperties": false,
+            "properties": {
+                "AppFlowConfig": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.AppFlowConfig"
+                },
+                "CloudwatchConfig": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.CloudwatchConfig"
+                },
+                "RDSSourceConfig": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.RDSSourceConfig"
+                },
+                "RedshiftSourceConfig": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.RedshiftSourceConfig"
+                },
+                "S3SourceConfig": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.S3SourceConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.RDSSourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DBInstanceIdentifier": {
+                    "type": "string"
+                },
+                "DatabaseHost": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DatabasePort": {
+                    "type": "number"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretManagerArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.VpcConfiguration"
+                }
+            },
+            "required": [
+                "DBInstanceIdentifier",
+                "DatabaseHost",
+                "DatabaseName",
+                "DatabasePort",
+                "RoleArn",
+                "SecretManagerArn",
+                "TableName",
+                "VpcConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.RedshiftSourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterIdentifier": {
+                    "type": "string"
+                },
+                "DatabaseHost": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DatabasePort": {
+                    "type": "number"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretManagerArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.VpcConfiguration"
+                }
+            },
+            "required": [
+                "ClusterIdentifier",
+                "DatabaseHost",
+                "DatabaseName",
+                "DatabasePort",
+                "RoleArn",
+                "SecretManagerArn",
+                "TableName",
+                "VpcConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.S3SourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FileFormatDescriptor": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.FileFormatDescriptor"
+                },
+                "HistoricalDataPathList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TemplatedPathList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FileFormatDescriptor",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.TimestampColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnFormat": {
+                    "type": "string"
+                },
+                "ColumnName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIdList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIdList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIdList",
+                "SubnetIdList"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutVision::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ProjectName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProjectName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LookoutVision::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BrokerNodeGroupInfo": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.BrokerNodeGroupInfo"
+                        },
+                        "ClientAuthentication": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.ClientAuthentication"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "ConfigurationInfo": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.ConfigurationInfo"
+                        },
+                        "EncryptionInfo": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.EncryptionInfo"
+                        },
+                        "EnhancedMonitoring": {
+                            "type": "string"
+                        },
+                        "KafkaVersion": {
+                            "type": "string"
+                        },
+                        "LoggingInfo": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.LoggingInfo"
+                        },
+                        "NumberOfBrokerNodes": {
+                            "type": "number"
+                        },
+                        "OpenMonitoring": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.OpenMonitoring"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "BrokerNodeGroupInfo",
+                        "ClusterName",
+                        "KafkaVersion",
+                        "NumberOfBrokerNodes"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MSK::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.BrokerLogs": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogs": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.CloudWatchLogs"
+                },
+                "Firehose": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Firehose"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.S3"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.BrokerNodeGroupInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "BrokerAZDistribution": {
+                    "type": "string"
+                },
+                "ClientSubnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ConnectivityInfo": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.ConnectivityInfo"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StorageInfo": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.StorageInfo"
+                }
+            },
+            "required": [
+                "ClientSubnets",
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.ClientAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "Sasl": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Sasl"
+                },
+                "Tls": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Tls"
+                },
+                "Unauthenticated": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Unauthenticated"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.CloudWatchLogs": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "LogGroup": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.ConfigurationInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "Revision": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Arn",
+                "Revision"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.ConnectivityInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "PublicAccess": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.PublicAccess"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.EBSStorageInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "VolumeSize": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.EncryptionAtRest": {
+            "additionalProperties": false,
+            "properties": {
+                "DataVolumeKMSKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataVolumeKMSKeyId"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.EncryptionInTransit": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientBroker": {
+                    "type": "string"
+                },
+                "InCluster": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.EncryptionInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionAtRest": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.EncryptionAtRest"
+                },
+                "EncryptionInTransit": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.EncryptionInTransit"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Firehose": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStream": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Iam": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.JmxExporter": {
+            "additionalProperties": false,
+            "properties": {
+                "EnabledInBroker": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "EnabledInBroker"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.LoggingInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "BrokerLogs": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.BrokerLogs"
+                }
+            },
+            "required": [
+                "BrokerLogs"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.NodeExporter": {
+            "additionalProperties": false,
+            "properties": {
+                "EnabledInBroker": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "EnabledInBroker"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.OpenMonitoring": {
+            "additionalProperties": false,
+            "properties": {
+                "Prometheus": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Prometheus"
+                }
+            },
+            "required": [
+                "Prometheus"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Prometheus": {
+            "additionalProperties": false,
+            "properties": {
+                "JmxExporter": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.JmxExporter"
+                },
+                "NodeExporter": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.NodeExporter"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.PublicAccess": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Sasl": {
+            "additionalProperties": false,
+            "properties": {
+                "Iam": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Iam"
+                },
+                "Scram": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Scram"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Scram": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.StorageInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "EBSStorageInfo": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.EBSStorageInfo"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Tls": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateAuthorityArnList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Unauthenticated": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MWAA::Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AirflowConfigurationOptions": {
+                            "type": "object"
+                        },
+                        "AirflowVersion": {
+                            "type": "string"
+                        },
+                        "DagS3Path": {
+                            "type": "string"
+                        },
+                        "EnvironmentClass": {
+                            "type": "string"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "KmsKey": {
+                            "type": "string"
+                        },
+                        "LoggingConfiguration": {
+                            "$ref": "#/definitions/AWS::MWAA::Environment.LoggingConfiguration"
+                        },
+                        "MaxWorkers": {
+                            "type": "number"
+                        },
+                        "MinWorkers": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NetworkConfiguration": {
+                            "$ref": "#/definitions/AWS::MWAA::Environment.NetworkConfiguration"
+                        },
+                        "PluginsS3ObjectVersion": {
+                            "type": "string"
+                        },
+                        "PluginsS3Path": {
+                            "type": "string"
+                        },
+                        "RequirementsS3ObjectVersion": {
+                            "type": "string"
+                        },
+                        "RequirementsS3Path": {
+                            "type": "string"
+                        },
+                        "Schedulers": {
+                            "type": "number"
+                        },
+                        "SourceBucketArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "WebserverAccessMode": {
+                            "type": "string"
+                        },
+                        "WeeklyMaintenanceWindowStart": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MWAA::Environment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MWAA::Environment.LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DagProcessingLogs": {
+                    "$ref": "#/definitions/AWS::MWAA::Environment.ModuleLoggingConfiguration"
+                },
+                "SchedulerLogs": {
+                    "$ref": "#/definitions/AWS::MWAA::Environment.ModuleLoggingConfiguration"
+                },
+                "TaskLogs": {
+                    "$ref": "#/definitions/AWS::MWAA::Environment.ModuleLoggingConfiguration"
+                },
+                "WebserverLogs": {
+                    "$ref": "#/definitions/AWS::MWAA::Environment.ModuleLoggingConfiguration"
+                },
+                "WorkerLogs": {
+                    "$ref": "#/definitions/AWS::MWAA::Environment.ModuleLoggingConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MWAA::Environment.ModuleLoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogGroupArn": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "LogLevel": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MWAA::Environment.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Macie::CustomDataIdentifier": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "IgnoreWords": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Keywords": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MaximumMatchDistance": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Regex": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Regex"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Macie::CustomDataIdentifier"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Macie::FindingsFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FindingCriteria": {
+                            "$ref": "#/definitions/AWS::Macie::FindingsFilter.FindingCriteria"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Position": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "FindingCriteria",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Macie::FindingsFilter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Macie::FindingsFilter.Criterion": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::Macie::FindingsFilter.FindingCriteria": {
+            "additionalProperties": false,
+            "properties": {
+                "Criterion": {
+                    "$ref": "#/definitions/AWS::Macie::FindingsFilter.Criterion"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Macie::FindingsFilter.FindingsFilterListItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Macie::Session": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FindingPublishingFrequency": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Macie::Session"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InvitationId": {
+                            "type": "string"
+                        },
+                        "MemberConfiguration": {
+                            "$ref": "#/definitions/AWS::ManagedBlockchain::Member.MemberConfiguration"
+                        },
+                        "NetworkConfiguration": {
+                            "$ref": "#/definitions/AWS::ManagedBlockchain::Member.NetworkConfiguration"
+                        },
+                        "NetworkId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MemberConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ManagedBlockchain::Member"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.ApprovalThresholdPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ProposalDurationInHours": {
+                    "type": "number"
+                },
+                "ThresholdComparator": {
+                    "type": "string"
+                },
+                "ThresholdPercentage": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.MemberConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "MemberFrameworkConfiguration": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.MemberFrameworkConfiguration"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.MemberFabricConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AdminPassword": {
+                    "type": "string"
+                },
+                "AdminUsername": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AdminPassword",
+                "AdminUsername"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.MemberFrameworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MemberFabricConfiguration": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.MemberFabricConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Framework": {
+                    "type": "string"
+                },
+                "FrameworkVersion": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "NetworkFrameworkConfiguration": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.NetworkFrameworkConfiguration"
+                },
+                "VotingPolicy": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.VotingPolicy"
+                }
+            },
+            "required": [
+                "Framework",
+                "FrameworkVersion",
+                "Name",
+                "VotingPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.NetworkFabricConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Edition": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Edition"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.NetworkFrameworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NetworkFabricConfiguration": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.NetworkFabricConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.VotingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ApprovalThresholdPolicy": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.ApprovalThresholdPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Node": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MemberId": {
+                            "type": "string"
+                        },
+                        "NetworkId": {
+                            "type": "string"
+                        },
+                        "NodeConfiguration": {
+                            "$ref": "#/definitions/AWS::ManagedBlockchain::Node.NodeConfiguration"
+                        }
+                    },
+                    "required": [
+                        "NetworkId",
+                        "NodeConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ManagedBlockchain::Node"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Node.NodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "InstanceType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AvailabilityZone",
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Source": {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow.Source"
+                        },
+                        "SourceFailoverConfig": {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow.FailoverConfig"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Source"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::Flow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.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": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.FailoverConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RecoveryWindow": {
+                    "type": "number"
+                },
+                "State": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.Source": {
+            "additionalProperties": false,
+            "properties": {
+                "Decryption": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.Encryption"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "EntitlementArn": {
+                    "type": "string"
+                },
+                "IngestIp": {
+                    "type": "string"
+                },
+                "IngestPort": {
+                    "type": "number"
+                },
+                "MaxBitrate": {
+                    "type": "number"
+                },
+                "MaxLatency": {
+                    "type": "number"
+                },
+                "MinLatency": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "SourceArn": {
+                    "type": "string"
+                },
+                "SourceIngestPort": {
+                    "type": "string"
+                },
+                "StreamId": {
+                    "type": "string"
+                },
+                "VpcInterfaceName": {
+                    "type": "string"
+                },
+                "WhitelistCidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowEntitlement": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CidrAllowList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Destination": {
+                            "type": "string"
+                        },
+                        "Encryption": {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.Encryption"
+                        },
+                        "FlowArn": {
+                            "type": "string"
+                        },
+                        "MaxLatency": {
+                            "type": "number"
+                        },
+                        "MinLatency": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "RemoteId": {
+                            "type": "string"
+                        },
+                        "SmoothingLatency": {
+                            "type": "number"
+                        },
+                        "StreamId": {
+                            "type": "string"
+                        },
+                        "VpcInterfaceAttachment": {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.VpcInterfaceAttachment"
+                        }
+                    },
+                    "required": [
+                        "FlowArn",
+                        "Protocol"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::FlowOutput"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput.Encryption": {
+            "additionalProperties": false,
+            "properties": {
+                "Algorithm": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SecretArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput.VpcInterfaceAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "VpcInterfaceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Decryption": {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowSource.Encryption"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EntitlementArn": {
+                            "type": "string"
+                        },
+                        "FlowArn": {
+                            "type": "string"
+                        },
+                        "IngestPort": {
+                            "type": "number"
+                        },
+                        "MaxBitrate": {
+                            "type": "number"
+                        },
+                        "MaxLatency": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "StreamId": {
+                            "type": "string"
+                        },
+                        "VpcInterfaceName": {
+                            "type": "string"
+                        },
+                        "WhitelistCidr": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::FlowSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowSource.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::FlowVpcInterface": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FlowArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FlowArn",
+                        "Name",
+                        "RoleArn",
+                        "SecurityGroupIds",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::FlowVpcInterface"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConvert::JobTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccelerationSettings": {
+                            "$ref": "#/definitions/AWS::MediaConvert::JobTemplate.AccelerationSettings"
+                        },
+                        "Category": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "HopDestinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConvert::JobTemplate.HopDestination"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        },
+                        "Queue": {
+                            "type": "string"
+                        },
+                        "SettingsJson": {
+                            "type": "object"
+                        },
+                        "StatusUpdateInterval": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "SettingsJson"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConvert::JobTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConvert::JobTemplate.AccelerationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConvert::JobTemplate.HopDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "Queue": {
+                    "type": "string"
+                },
+                "WaitMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConvert::Preset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Category": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SettingsJson": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "SettingsJson"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConvert::Preset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConvert::Queue": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConvert::Queue"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CdiInputSpecification": {
+                            "$ref": "#/definitions/AWS::MediaLive::Channel.CdiInputSpecification"
+                        },
+                        "ChannelClass": {
+                            "type": "string"
+                        },
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Channel.OutputDestination"
+                            },
+                            "type": "array"
+                        },
+                        "EncoderSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Channel.EncoderSettings"
+                        },
+                        "InputAttachments": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Channel.InputAttachment"
+                            },
+                            "type": "array"
+                        },
+                        "InputSpecification": {
+                            "$ref": "#/definitions/AWS::MediaLive::Channel.InputSpecification"
+                        },
+                        "LogLevel": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Vpc": {
+                            "$ref": "#/definitions/AWS::MediaLive::Channel.VpcOutputSettings"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Channel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AacSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Bitrate": {
+                    "type": "number"
+                },
+                "CodingMode": {
+                    "type": "string"
+                },
+                "InputType": {
+                    "type": "string"
+                },
+                "Profile": {
+                    "type": "string"
+                },
+                "RateControlMode": {
+                    "type": "string"
+                },
+                "RawFormat": {
+                    "type": "string"
+                },
+                "SampleRate": {
+                    "type": "number"
+                },
+                "Spec": {
+                    "type": "string"
+                },
+                "VbrQuality": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Ac3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "Bitrate": {
+                    "type": "number"
+                },
+                "BitstreamMode": {
+                    "type": "string"
+                },
+                "CodingMode": {
+                    "type": "string"
+                },
+                "Dialnorm": {
+                    "type": "number"
+                },
+                "DrcProfile": {
+                    "type": "string"
+                },
+                "LfeFilter": {
+                    "type": "string"
+                },
+                "MetadataControl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AncillarySourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceAncillaryChannelNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ArchiveCdnSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ArchiveS3Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ArchiveS3Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ArchiveContainerSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "M2tsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.M2tsSettings"
+                },
+                "RawSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.RawSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ArchiveGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ArchiveCdnSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ArchiveCdnSettings"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "RolloverInterval": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ArchiveOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ArchiveContainerSettings"
+                },
+                "Extension": {
+                    "type": "string"
+                },
+                "NameModifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ArchiveS3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "CannedAcl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AribDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AribSourceSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioChannelMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "InputChannelLevels": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.InputChannelLevel"
+                    },
+                    "type": "array"
+                },
+                "OutputChannel": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioCodecSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AacSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AacSettings"
+                },
+                "Ac3Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Ac3Settings"
+                },
+                "Eac3Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Eac3Settings"
+                },
+                "Mp2Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Mp2Settings"
+                },
+                "PassThroughSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.PassThroughSettings"
+                },
+                "WavSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.WavSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioNormalizationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioNormalizationSettings"
+                },
+                "AudioSelectorName": {
+                    "type": "string"
+                },
+                "AudioType": {
+                    "type": "string"
+                },
+                "AudioTypeControl": {
+                    "type": "string"
+                },
+                "AudioWatermarkingSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioWatermarkSettings"
+                },
+                "CodecSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioCodecSettings"
+                },
+                "LanguageCode": {
+                    "type": "string"
+                },
+                "LanguageCodeControl": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "RemixSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.RemixSettings"
+                },
+                "StreamName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioHlsRenditionSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioLanguageSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "LanguageCode": {
+                    "type": "string"
+                },
+                "LanguageSelectionPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioNormalizationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Algorithm": {
+                    "type": "string"
+                },
+                "AlgorithmControl": {
+                    "type": "string"
+                },
+                "TargetLkfs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioOnlyHlsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioGroupId": {
+                    "type": "string"
+                },
+                "AudioOnlyImage": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "AudioTrackType": {
+                    "type": "string"
+                },
+                "SegmentType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioPidSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "Pid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SelectorSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioSelectorSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioSelectorSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioHlsRenditionSelection": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioHlsRenditionSelection"
+                },
+                "AudioLanguageSelection": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioLanguageSelection"
+                },
+                "AudioPidSelection": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioPidSelection"
+                },
+                "AudioTrackSelection": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioTrackSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioSilenceFailoverSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioSelectorName": {
+                    "type": "string"
+                },
+                "AudioSilenceThresholdMsec": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioTrack": {
+            "additionalProperties": false,
+            "properties": {
+                "Track": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioTrackSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "Tracks": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.AudioTrack"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioWatermarkSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NielsenWatermarksSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.NielsenWatermarksSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AutomaticInputFailoverSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorClearTimeMsec": {
+                    "type": "number"
+                },
+                "FailoverConditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.FailoverCondition"
+                    },
+                    "type": "array"
+                },
+                "InputPreference": {
+                    "type": "string"
+                },
+                "SecondaryInputId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AvailBlanking": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailBlankingImage": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "State": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AvailConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AvailSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AvailSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Scte35SpliceInsert": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte35SpliceInsert"
+                },
+                "Scte35TimeSignalApos": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte35TimeSignalApos"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.BlackoutSlate": {
+            "additionalProperties": false,
+            "properties": {
+                "BlackoutSlateImage": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "NetworkEndBlackout": {
+                    "type": "string"
+                },
+                "NetworkEndBlackoutImage": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "NetworkId": {
+                    "type": "string"
+                },
+                "State": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.BurnInDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BackgroundOpacity": {
+                    "type": "number"
+                },
+                "Font": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "FontColor": {
+                    "type": "string"
+                },
+                "FontOpacity": {
+                    "type": "number"
+                },
+                "FontResolution": {
+                    "type": "number"
+                },
+                "FontSize": {
+                    "type": "string"
+                },
+                "OutlineColor": {
+                    "type": "string"
+                },
+                "OutlineSize": {
+                    "type": "number"
+                },
+                "ShadowColor": {
+                    "type": "string"
+                },
+                "ShadowOpacity": {
+                    "type": "number"
+                },
+                "ShadowXOffset": {
+                    "type": "number"
+                },
+                "ShadowYOffset": {
+                    "type": "number"
+                },
+                "TeletextGridControl": {
+                    "type": "string"
+                },
+                "XPosition": {
+                    "type": "number"
+                },
+                "YPosition": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptionSelectorName": {
+                    "type": "string"
+                },
+                "DestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionDestinationSettings"
+                },
+                "LanguageCode": {
+                    "type": "string"
+                },
+                "LanguageDescription": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AribDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AribDestinationSettings"
+                },
+                "BurnInDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.BurnInDestinationSettings"
+                },
+                "DvbSubDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.DvbSubDestinationSettings"
+                },
+                "EbuTtDDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.EbuTtDDestinationSettings"
+                },
+                "EmbeddedDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.EmbeddedDestinationSettings"
+                },
+                "EmbeddedPlusScte20DestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.EmbeddedPlusScte20DestinationSettings"
+                },
+                "RtmpCaptionInfoDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.RtmpCaptionInfoDestinationSettings"
+                },
+                "Scte20PlusEmbeddedDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte20PlusEmbeddedDestinationSettings"
+                },
+                "Scte27DestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte27DestinationSettings"
+                },
+                "SmpteTtDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.SmpteTtDestinationSettings"
+                },
+                "TeletextDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TeletextDestinationSettings"
+                },
+                "TtmlDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TtmlDestinationSettings"
+                },
+                "WebvttDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.WebvttDestinationSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionLanguageMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptionChannel": {
+                    "type": "number"
+                },
+                "LanguageCode": {
+                    "type": "string"
+                },
+                "LanguageDescription": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionRectangle": {
+            "additionalProperties": false,
+            "properties": {
+                "Height": {
+                    "type": "number"
+                },
+                "LeftOffset": {
+                    "type": "number"
+                },
+                "TopOffset": {
+                    "type": "number"
+                },
+                "Width": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "LanguageCode": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SelectorSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionSelectorSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionSelectorSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AncillarySourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AncillarySourceSettings"
+                },
+                "AribSourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AribSourceSettings"
+                },
+                "DvbSubSourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.DvbSubSourceSettings"
+                },
+                "EmbeddedSourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.EmbeddedSourceSettings"
+                },
+                "Scte20SourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte20SourceSettings"
+                },
+                "Scte27SourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte27SourceSettings"
+                },
+                "TeletextSourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TeletextSourceSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CdiInputSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Resolution": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ColorSpacePassthroughSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.DvbNitSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NetworkId": {
+                    "type": "number"
+                },
+                "NetworkName": {
+                    "type": "string"
+                },
+                "RepInterval": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.DvbSdtSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "OutputSdt": {
+                    "type": "string"
+                },
+                "RepInterval": {
+                    "type": "number"
+                },
+                "ServiceName": {
+                    "type": "string"
+                },
+                "ServiceProviderName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.DvbSubDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BackgroundOpacity": {
+                    "type": "number"
+                },
+                "Font": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "FontColor": {
+                    "type": "string"
+                },
+                "FontOpacity": {
+                    "type": "number"
+                },
+                "FontResolution": {
+                    "type": "number"
+                },
+                "FontSize": {
+                    "type": "string"
+                },
+                "OutlineColor": {
+                    "type": "string"
+                },
+                "OutlineSize": {
+                    "type": "number"
+                },
+                "ShadowColor": {
+                    "type": "string"
+                },
+                "ShadowOpacity": {
+                    "type": "number"
+                },
+                "ShadowXOffset": {
+                    "type": "number"
+                },
+                "ShadowYOffset": {
+                    "type": "number"
+                },
+                "TeletextGridControl": {
+                    "type": "string"
+                },
+                "XPosition": {
+                    "type": "number"
+                },
+                "YPosition": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.DvbSubSourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "OcrLanguage": {
+                    "type": "string"
+                },
+                "Pid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.DvbTdtSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "RepInterval": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Eac3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "AttenuationControl": {
+                    "type": "string"
+                },
+                "Bitrate": {
+                    "type": "number"
+                },
+                "BitstreamMode": {
+                    "type": "string"
+                },
+                "CodingMode": {
+                    "type": "string"
+                },
+                "DcFilter": {
+                    "type": "string"
+                },
+                "Dialnorm": {
+                    "type": "number"
+                },
+                "DrcLine": {
+                    "type": "string"
+                },
+                "DrcRf": {
+                    "type": "string"
+                },
+                "LfeControl": {
+                    "type": "string"
+                },
+                "LfeFilter": {
+                    "type": "string"
+                },
+                "LoRoCenterMixLevel": {
+                    "type": "number"
+                },
+                "LoRoSurroundMixLevel": {
+                    "type": "number"
+                },
+                "LtRtCenterMixLevel": {
+                    "type": "number"
+                },
+                "LtRtSurroundMixLevel": {
+                    "type": "number"
+                },
+                "MetadataControl": {
+                    "type": "string"
+                },
+                "PassthroughControl": {
+                    "type": "string"
+                },
+                "PhaseControl": {
+                    "type": "string"
+                },
+                "StereoDownmix": {
+                    "type": "string"
+                },
+                "SurroundExMode": {
+                    "type": "string"
+                },
+                "SurroundMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.EbuTtDDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyrightHolder": {
+                    "type": "string"
+                },
+                "FillLineGap": {
+                    "type": "string"
+                },
+                "FontFamily": {
+                    "type": "string"
+                },
+                "StyleControl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.EmbeddedDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.EmbeddedPlusScte20DestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.EmbeddedSourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Convert608To708": {
+                    "type": "string"
+                },
+                "Scte20Detection": {
+                    "type": "string"
+                },
+                "Source608ChannelNumber": {
+                    "type": "number"
+                },
+                "Source608TrackNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.EncoderSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioDescriptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.AudioDescription"
+                    },
+                    "type": "array"
+                },
+                "AvailBlanking": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AvailBlanking"
+                },
+                "AvailConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AvailConfiguration"
+                },
+                "BlackoutSlate": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.BlackoutSlate"
+                },
+                "CaptionDescriptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionDescription"
+                    },
+                    "type": "array"
+                },
+                "FeatureActivations": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FeatureActivations"
+                },
+                "GlobalConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.GlobalConfiguration"
+                },
+                "MotionGraphicsConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MotionGraphicsConfiguration"
+                },
+                "NielsenConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.NielsenConfiguration"
+                },
+                "OutputGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.OutputGroup"
+                    },
+                    "type": "array"
+                },
+                "TimecodeConfig": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TimecodeConfig"
+                },
+                "VideoDescriptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.VideoDescription"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FailoverCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "FailoverConditionSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FailoverConditionSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FailoverConditionSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioSilenceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioSilenceFailoverSettings"
+                },
+                "InputLossSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLossFailoverSettings"
+                },
+                "VideoBlackSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoBlackFailoverSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FeatureActivations": {
+            "additionalProperties": false,
+            "properties": {
+                "InputPrepareScheduleActions": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FecOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnDepth": {
+                    "type": "number"
+                },
+                "IncludeFec": {
+                    "type": "string"
+                },
+                "RowLength": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Fmp4HlsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioRenditionSets": {
+                    "type": "string"
+                },
+                "NielsenId3Behavior": {
+                    "type": "string"
+                },
+                "TimedMetadataBehavior": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureCdnSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "FrameCaptureS3Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureS3Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "FrameCaptureCdnSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureCdnSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureHlsSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NameModifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureS3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "CannedAcl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureInterval": {
+                    "type": "number"
+                },
+                "CaptureIntervalUnits": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.GlobalConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InitialAudioGain": {
+                    "type": "number"
+                },
+                "InputEndAction": {
+                    "type": "string"
+                },
+                "InputLossBehavior": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLossBehavior"
+                },
+                "OutputLockingMode": {
+                    "type": "string"
+                },
+                "OutputTimingSource": {
+                    "type": "string"
+                },
+                "SupportLowFramerateInputs": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H264ColorSpaceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ColorSpacePassthroughSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ColorSpacePassthroughSettings"
+                },
+                "Rec601Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Rec601Settings"
+                },
+                "Rec709Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Rec709Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H264FilterSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "TemporalFilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TemporalFilterSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H264Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "AdaptiveQuantization": {
+                    "type": "string"
+                },
+                "AfdSignaling": {
+                    "type": "string"
+                },
+                "Bitrate": {
+                    "type": "number"
+                },
+                "BufFillPct": {
+                    "type": "number"
+                },
+                "BufSize": {
+                    "type": "number"
+                },
+                "ColorMetadata": {
+                    "type": "string"
+                },
+                "ColorSpaceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H264ColorSpaceSettings"
+                },
+                "EntropyEncoding": {
+                    "type": "string"
+                },
+                "FilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H264FilterSettings"
+                },
+                "FixedAfd": {
+                    "type": "string"
+                },
+                "FlickerAq": {
+                    "type": "string"
+                },
+                "ForceFieldPictures": {
+                    "type": "string"
+                },
+                "FramerateControl": {
+                    "type": "string"
+                },
+                "FramerateDenominator": {
+                    "type": "number"
+                },
+                "FramerateNumerator": {
+                    "type": "number"
+                },
+                "GopBReference": {
+                    "type": "string"
+                },
+                "GopClosedCadence": {
+                    "type": "number"
+                },
+                "GopNumBFrames": {
+                    "type": "number"
+                },
+                "GopSize": {
+                    "type": "number"
+                },
+                "GopSizeUnits": {
+                    "type": "string"
+                },
+                "Level": {
+                    "type": "string"
+                },
+                "LookAheadRateControl": {
+                    "type": "string"
+                },
+                "MaxBitrate": {
+                    "type": "number"
+                },
+                "MinIInterval": {
+                    "type": "number"
+                },
+                "NumRefFrames": {
+                    "type": "number"
+                },
+                "ParControl": {
+                    "type": "string"
+                },
+                "ParDenominator": {
+                    "type": "number"
+                },
+                "ParNumerator": {
+                    "type": "number"
+                },
+                "Profile": {
+                    "type": "string"
+                },
+                "QualityLevel": {
+                    "type": "string"
+                },
+                "QvbrQualityLevel": {
+                    "type": "number"
+                },
+                "RateControlMode": {
+                    "type": "string"
+                },
+                "ScanType": {
+                    "type": "string"
+                },
+                "SceneChangeDetect": {
+                    "type": "string"
+                },
+                "Slices": {
+                    "type": "number"
+                },
+                "Softness": {
+                    "type": "number"
+                },
+                "SpatialAq": {
+                    "type": "string"
+                },
+                "SubgopLength": {
+                    "type": "string"
+                },
+                "Syntax": {
+                    "type": "string"
+                },
+                "TemporalAq": {
+                    "type": "string"
+                },
+                "TimecodeInsertion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H265ColorSpaceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ColorSpacePassthroughSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ColorSpacePassthroughSettings"
+                },
+                "Hdr10Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Hdr10Settings"
+                },
+                "Rec601Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Rec601Settings"
+                },
+                "Rec709Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Rec709Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H265FilterSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "TemporalFilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TemporalFilterSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H265Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "AdaptiveQuantization": {
+                    "type": "string"
+                },
+                "AfdSignaling": {
+                    "type": "string"
+                },
+                "AlternativeTransferFunction": {
+                    "type": "string"
+                },
+                "Bitrate": {
+                    "type": "number"
+                },
+                "BufSize": {
+                    "type": "number"
+                },
+                "ColorMetadata": {
+                    "type": "string"
+                },
+                "ColorSpaceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H265ColorSpaceSettings"
+                },
+                "FilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H265FilterSettings"
+                },
+                "FixedAfd": {
+                    "type": "string"
+                },
+                "FlickerAq": {
+                    "type": "string"
+                },
+                "FramerateDenominator": {
+                    "type": "number"
+                },
+                "FramerateNumerator": {
+                    "type": "number"
+                },
+                "GopClosedCadence": {
+                    "type": "number"
+                },
+                "GopSize": {
+                    "type": "number"
+                },
+                "GopSizeUnits": {
+                    "type": "string"
+                },
+                "Level": {
+                    "type": "string"
+                },
+                "LookAheadRateControl": {
+                    "type": "string"
+                },
+                "MaxBitrate": {
+                    "type": "number"
+                },
+                "MinIInterval": {
+                    "type": "number"
+                },
+                "ParDenominator": {
+                    "type": "number"
+                },
+                "ParNumerator": {
+                    "type": "number"
+                },
+                "Profile": {
+                    "type": "string"
+                },
+                "QvbrQualityLevel": {
+                    "type": "number"
+                },
+                "RateControlMode": {
+                    "type": "string"
+                },
+                "ScanType": {
+                    "type": "string"
+                },
+                "SceneChangeDetect": {
+                    "type": "string"
+                },
+                "Slices": {
+                    "type": "number"
+                },
+                "Tier": {
+                    "type": "string"
+                },
+                "TimecodeInsertion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Hdr10Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCll": {
+                    "type": "number"
+                },
+                "MaxFall": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsAkamaiSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "FilecacheDuration": {
+                    "type": "number"
+                },
+                "HttpTransferMode": {
+                    "type": "string"
+                },
+                "NumRetries": {
+                    "type": "number"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                },
+                "Salt": {
+                    "type": "string"
+                },
+                "Token": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsBasicPutSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "FilecacheDuration": {
+                    "type": "number"
+                },
+                "NumRetries": {
+                    "type": "number"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsCdnSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HlsAkamaiSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsAkamaiSettings"
+                },
+                "HlsBasicPutSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsBasicPutSettings"
+                },
+                "HlsMediaStoreSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsMediaStoreSettings"
+                },
+                "HlsS3Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsS3Settings"
+                },
+                "HlsWebdavSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsWebdavSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BaseUrlContent": {
+                    "type": "string"
+                },
+                "BaseUrlContent1": {
+                    "type": "string"
+                },
+                "BaseUrlManifest": {
+                    "type": "string"
+                },
+                "BaseUrlManifest1": {
+                    "type": "string"
+                },
+                "CaptionLanguageMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionLanguageMapping"
+                    },
+                    "type": "array"
+                },
+                "CaptionLanguageSetting": {
+                    "type": "string"
+                },
+                "ClientCache": {
+                    "type": "string"
+                },
+                "CodecSpecification": {
+                    "type": "string"
+                },
+                "ConstantIv": {
+                    "type": "string"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "DirectoryStructure": {
+                    "type": "string"
+                },
+                "DiscontinuityTags": {
+                    "type": "string"
+                },
+                "EncryptionType": {
+                    "type": "string"
+                },
+                "HlsCdnSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsCdnSettings"
+                },
+                "HlsId3SegmentTagging": {
+                    "type": "string"
+                },
+                "IFrameOnlyPlaylists": {
+                    "type": "string"
+                },
+                "IncompleteSegmentBehavior": {
+                    "type": "string"
+                },
+                "IndexNSegments": {
+                    "type": "number"
+                },
+                "InputLossAction": {
+                    "type": "string"
+                },
+                "IvInManifest": {
+                    "type": "string"
+                },
+                "IvSource": {
+                    "type": "string"
+                },
+                "KeepSegments": {
+                    "type": "number"
+                },
+                "KeyFormat": {
+                    "type": "string"
+                },
+                "KeyFormatVersions": {
+                    "type": "string"
+                },
+                "KeyProviderSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.KeyProviderSettings"
+                },
+                "ManifestCompression": {
+                    "type": "string"
+                },
+                "ManifestDurationFormat": {
+                    "type": "string"
+                },
+                "MinSegmentLength": {
+                    "type": "number"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "OutputSelection": {
+                    "type": "string"
+                },
+                "ProgramDateTime": {
+                    "type": "string"
+                },
+                "ProgramDateTimePeriod": {
+                    "type": "number"
+                },
+                "RedundantManifest": {
+                    "type": "string"
+                },
+                "SegmentLength": {
+                    "type": "number"
+                },
+                "SegmentationMode": {
+                    "type": "string"
+                },
+                "SegmentsPerSubdirectory": {
+                    "type": "number"
+                },
+                "StreamInfResolution": {
+                    "type": "string"
+                },
+                "TimedMetadataId3Frame": {
+                    "type": "string"
+                },
+                "TimedMetadataId3Period": {
+                    "type": "number"
+                },
+                "TimestampDeltaMilliseconds": {
+                    "type": "number"
+                },
+                "TsFileMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsInputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Bandwidth": {
+                    "type": "number"
+                },
+                "BufferSegments": {
+                    "type": "number"
+                },
+                "Retries": {
+                    "type": "number"
+                },
+                "RetryInterval": {
+                    "type": "number"
+                },
+                "Scte35Source": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsMediaStoreSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "FilecacheDuration": {
+                    "type": "number"
+                },
+                "MediaStoreStorageClass": {
+                    "type": "string"
+                },
+                "NumRetries": {
+                    "type": "number"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "H265PackagingType": {
+                    "type": "string"
+                },
+                "HlsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsSettings"
+                },
+                "NameModifier": {
+                    "type": "string"
+                },
+                "SegmentModifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsS3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "CannedAcl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioOnlyHlsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioOnlyHlsSettings"
+                },
+                "Fmp4HlsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Fmp4HlsSettings"
+                },
+                "FrameCaptureHlsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureHlsSettings"
+                },
+                "StandardHlsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.StandardHlsSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsWebdavSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "FilecacheDuration": {
+                    "type": "number"
+                },
+                "HttpTransferMode": {
+                    "type": "string"
+                },
+                "NumRetries": {
+                    "type": "number"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HtmlMotionGraphicsSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomaticInputFailoverSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AutomaticInputFailoverSettings"
+                },
+                "InputAttachmentName": {
+                    "type": "string"
+                },
+                "InputId": {
+                    "type": "string"
+                },
+                "InputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputChannelLevel": {
+            "additionalProperties": false,
+            "properties": {
+                "Gain": {
+                    "type": "number"
+                },
+                "InputChannel": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "PasswordParam": {
+                    "type": "string"
+                },
+                "Uri": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputLossBehavior": {
+            "additionalProperties": false,
+            "properties": {
+                "BlackFrameMsec": {
+                    "type": "number"
+                },
+                "InputLossImageColor": {
+                    "type": "string"
+                },
+                "InputLossImageSlate": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "InputLossImageType": {
+                    "type": "string"
+                },
+                "RepeatFrameMsec": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputLossFailoverSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "InputLossThresholdMsec": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioSelectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.AudioSelector"
+                    },
+                    "type": "array"
+                },
+                "CaptionSelectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionSelector"
+                    },
+                    "type": "array"
+                },
+                "DeblockFilter": {
+                    "type": "string"
+                },
+                "DenoiseFilter": {
+                    "type": "string"
+                },
+                "FilterStrength": {
+                    "type": "number"
+                },
+                "InputFilter": {
+                    "type": "string"
+                },
+                "NetworkInputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.NetworkInputSettings"
+                },
+                "Smpte2038DataPreference": {
+                    "type": "string"
+                },
+                "SourceEndBehavior": {
+                    "type": "string"
+                },
+                "VideoSelector": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoSelector"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Codec": {
+                    "type": "string"
+                },
+                "MaximumBitrate": {
+                    "type": "string"
+                },
+                "Resolution": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.KeyProviderSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "StaticKeySettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.StaticKeySettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.M2tsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AbsentInputAudioBehavior": {
+                    "type": "string"
+                },
+                "Arib": {
+                    "type": "string"
+                },
+                "AribCaptionsPid": {
+                    "type": "string"
+                },
+                "AribCaptionsPidControl": {
+                    "type": "string"
+                },
+                "AudioBufferModel": {
+                    "type": "string"
+                },
+                "AudioFramesPerPes": {
+                    "type": "number"
+                },
+                "AudioPids": {
+                    "type": "string"
+                },
+                "AudioStreamType": {
+                    "type": "string"
+                },
+                "Bitrate": {
+                    "type": "number"
+                },
+                "BufferModel": {
+                    "type": "string"
+                },
+                "CcDescriptor": {
+                    "type": "string"
+                },
+                "DvbNitSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.DvbNitSettings"
+                },
+                "DvbSdtSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.DvbSdtSettings"
+                },
+                "DvbSubPids": {
+                    "type": "string"
+                },
+                "DvbTdtSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.DvbTdtSettings"
+                },
+                "DvbTeletextPid": {
+                    "type": "string"
+                },
+                "Ebif": {
+                    "type": "string"
+                },
+                "EbpAudioInterval": {
+                    "type": "string"
+                },
+                "EbpLookaheadMs": {
+                    "type": "number"
+                },
+                "EbpPlacement": {
+                    "type": "string"
+                },
+                "EcmPid": {
+                    "type": "string"
+                },
+                "EsRateInPes": {
+                    "type": "string"
+                },
+                "EtvPlatformPid": {
+                    "type": "string"
+                },
+                "EtvSignalPid": {
+                    "type": "string"
+                },
+                "FragmentTime": {
+                    "type": "number"
+                },
+                "Klv": {
+                    "type": "string"
+                },
+                "KlvDataPids": {
+                    "type": "string"
+                },
+                "NielsenId3Behavior": {
+                    "type": "string"
+                },
+                "NullPacketBitrate": {
+                    "type": "number"
+                },
+                "PatInterval": {
+                    "type": "number"
+                },
+                "PcrControl": {
+                    "type": "string"
+                },
+                "PcrPeriod": {
+                    "type": "number"
+                },
+                "PcrPid": {
+                    "type": "string"
+                },
+                "PmtInterval": {
+                    "type": "number"
+                },
+                "PmtPid": {
+                    "type": "string"
+                },
+                "ProgramNum": {
+                    "type": "number"
+                },
+                "RateMode": {
+                    "type": "string"
+                },
+                "Scte27Pids": {
+                    "type": "string"
+                },
+                "Scte35Control": {
+                    "type": "string"
+                },
+                "Scte35Pid": {
+                    "type": "string"
+                },
+                "SegmentationMarkers": {
+                    "type": "string"
+                },
+                "SegmentationStyle": {
+                    "type": "string"
+                },
+                "SegmentationTime": {
+                    "type": "number"
+                },
+                "TimedMetadataBehavior": {
+                    "type": "string"
+                },
+                "TimedMetadataPid": {
+                    "type": "string"
+                },
+                "TransportStreamId": {
+                    "type": "number"
+                },
+                "VideoPid": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.M3u8Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioFramesPerPes": {
+                    "type": "number"
+                },
+                "AudioPids": {
+                    "type": "string"
+                },
+                "EcmPid": {
+                    "type": "string"
+                },
+                "NielsenId3Behavior": {
+                    "type": "string"
+                },
+                "PatInterval": {
+                    "type": "number"
+                },
+                "PcrControl": {
+                    "type": "string"
+                },
+                "PcrPeriod": {
+                    "type": "number"
+                },
+                "PcrPid": {
+                    "type": "string"
+                },
+                "PmtInterval": {
+                    "type": "number"
+                },
+                "PmtPid": {
+                    "type": "string"
+                },
+                "ProgramNum": {
+                    "type": "number"
+                },
+                "Scte35Behavior": {
+                    "type": "string"
+                },
+                "Scte35Pid": {
+                    "type": "string"
+                },
+                "TimedMetadataBehavior": {
+                    "type": "string"
+                },
+                "TimedMetadataPid": {
+                    "type": "string"
+                },
+                "TransportStreamId": {
+                    "type": "number"
+                },
+                "VideoPid": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MediaPackageGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MediaPackageOutputDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MediaPackageOutputSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MotionGraphicsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MotionGraphicsInsertion": {
+                    "type": "string"
+                },
+                "MotionGraphicsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MotionGraphicsSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MotionGraphicsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HtmlMotionGraphicsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HtmlMotionGraphicsSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Mp2Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "Bitrate": {
+                    "type": "number"
+                },
+                "CodingMode": {
+                    "type": "string"
+                },
+                "SampleRate": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Mpeg2FilterSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "TemporalFilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TemporalFilterSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Mpeg2Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "AdaptiveQuantization": {
+                    "type": "string"
+                },
+                "AfdSignaling": {
+                    "type": "string"
+                },
+                "ColorMetadata": {
+                    "type": "string"
+                },
+                "ColorSpace": {
+                    "type": "string"
+                },
+                "DisplayAspectRatio": {
+                    "type": "string"
+                },
+                "FilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Mpeg2FilterSettings"
+                },
+                "FixedAfd": {
+                    "type": "string"
+                },
+                "FramerateDenominator": {
+                    "type": "number"
+                },
+                "FramerateNumerator": {
+                    "type": "number"
+                },
+                "GopClosedCadence": {
+                    "type": "number"
+                },
+                "GopNumBFrames": {
+                    "type": "number"
+                },
+                "GopSize": {
+                    "type": "number"
+                },
+                "GopSizeUnits": {
+                    "type": "string"
+                },
+                "ScanType": {
+                    "type": "string"
+                },
+                "SubgopLength": {
+                    "type": "string"
+                },
+                "TimecodeInsertion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MsSmoothGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AcquisitionPointId": {
+                    "type": "string"
+                },
+                "AudioOnlyTimecodeControl": {
+                    "type": "string"
+                },
+                "CertificateMode": {
+                    "type": "string"
+                },
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "EventId": {
+                    "type": "string"
+                },
+                "EventIdMode": {
+                    "type": "string"
+                },
+                "EventStopBehavior": {
+                    "type": "string"
+                },
+                "FilecacheDuration": {
+                    "type": "number"
+                },
+                "FragmentLength": {
+                    "type": "number"
+                },
+                "InputLossAction": {
+                    "type": "string"
+                },
+                "NumRetries": {
+                    "type": "number"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                },
+                "SegmentationMode": {
+                    "type": "string"
+                },
+                "SendDelayMs": {
+                    "type": "number"
+                },
+                "SparseTrackType": {
+                    "type": "string"
+                },
+                "StreamManifestBehavior": {
+                    "type": "string"
+                },
+                "TimestampOffset": {
+                    "type": "string"
+                },
+                "TimestampOffsetMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MsSmoothOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "H265PackagingType": {
+                    "type": "string"
+                },
+                "NameModifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MultiplexGroupSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MultiplexOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MultiplexProgramChannelDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiplexId": {
+                    "type": "string"
+                },
+                "ProgramName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.NetworkInputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HlsInputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsInputSettings"
+                },
+                "ServerValidation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.NielsenCBET": {
+            "additionalProperties": false,
+            "properties": {
+                "CbetCheckDigitString": {
+                    "type": "string"
+                },
+                "CbetStepaside": {
+                    "type": "string"
+                },
+                "Csid": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.NielsenConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DistributorId": {
+                    "type": "string"
+                },
+                "NielsenPcmToId3Tagging": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.NielsenNaesIiNw": {
+            "additionalProperties": false,
+            "properties": {
+                "CheckDigitString": {
+                    "type": "string"
+                },
+                "Sid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.NielsenWatermarksSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NielsenCbetSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.NielsenCBET"
+                },
+                "NielsenDistributionType": {
+                    "type": "string"
+                },
+                "NielsenNaesIiNwSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.NielsenNaesIiNw"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioDescriptionNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CaptionDescriptionNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OutputName": {
+                    "type": "string"
+                },
+                "OutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputSettings"
+                },
+                "VideoDescriptionName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "MediaPackageSettings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.MediaPackageOutputDestinationSettings"
+                    },
+                    "type": "array"
+                },
+                "MultiplexSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MultiplexProgramChannelDestinationSettings"
+                },
+                "Settings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.OutputDestinationSettings"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PasswordParam": {
+                    "type": "string"
+                },
+                "StreamName": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "OutputGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputGroupSettings"
+                },
+                "Outputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.Output"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ArchiveGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ArchiveGroupSettings"
+                },
+                "FrameCaptureGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureGroupSettings"
+                },
+                "HlsGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsGroupSettings"
+                },
+                "MediaPackageGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MediaPackageGroupSettings"
+                },
+                "MsSmoothGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MsSmoothGroupSettings"
+                },
+                "MultiplexGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MultiplexGroupSettings"
+                },
+                "RtmpGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.RtmpGroupSettings"
+                },
+                "UdpGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.UdpGroupSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputLocationRef": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationRefId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ArchiveOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ArchiveOutputSettings"
+                },
+                "FrameCaptureOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureOutputSettings"
+                },
+                "HlsOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsOutputSettings"
+                },
+                "MediaPackageOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MediaPackageOutputSettings"
+                },
+                "MsSmoothOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MsSmoothOutputSettings"
+                },
+                "MultiplexOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MultiplexOutputSettings"
+                },
+                "RtmpOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.RtmpOutputSettings"
+                },
+                "UdpOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.UdpOutputSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.PassThroughSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.RawSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Rec601Settings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Rec709Settings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.RemixSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.AudioChannelMapping"
+                    },
+                    "type": "array"
+                },
+                "ChannelsIn": {
+                    "type": "number"
+                },
+                "ChannelsOut": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.RtmpCaptionInfoDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.RtmpGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AuthenticationScheme": {
+                    "type": "string"
+                },
+                "CacheFullBehavior": {
+                    "type": "string"
+                },
+                "CacheLength": {
+                    "type": "number"
+                },
+                "CaptionData": {
+                    "type": "string"
+                },
+                "InputLossAction": {
+                    "type": "string"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.RtmpOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateMode": {
+                    "type": "string"
+                },
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "NumRetries": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte20PlusEmbeddedDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte20SourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Convert608To708": {
+                    "type": "string"
+                },
+                "Source608ChannelNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte27DestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte27SourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "OcrLanguage": {
+                    "type": "string"
+                },
+                "Pid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte35SpliceInsert": {
+            "additionalProperties": false,
+            "properties": {
+                "AdAvailOffset": {
+                    "type": "number"
+                },
+                "NoRegionalBlackoutFlag": {
+                    "type": "string"
+                },
+                "WebDeliveryAllowedFlag": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte35TimeSignalApos": {
+            "additionalProperties": false,
+            "properties": {
+                "AdAvailOffset": {
+                    "type": "number"
+                },
+                "NoRegionalBlackoutFlag": {
+                    "type": "string"
+                },
+                "WebDeliveryAllowedFlag": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.SmpteTtDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.StandardHlsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioRenditionSets": {
+                    "type": "string"
+                },
+                "M3u8Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.M3u8Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.StaticKeySettings": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyProviderServer": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "StaticKeyValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.TeletextDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.TeletextSourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "OutputRectangle": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionRectangle"
+                },
+                "PageNumber": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.TemporalFilterSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PostFilterSharpening": {
+                    "type": "string"
+                },
+                "Strength": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.TimecodeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Source": {
+                    "type": "string"
+                },
+                "SyncThreshold": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.TtmlDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "StyleControl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.UdpContainerSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "M2tsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.M2tsSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.UdpGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "InputLossAction": {
+                    "type": "string"
+                },
+                "TimedMetadataId3Frame": {
+                    "type": "string"
+                },
+                "TimedMetadataId3Period": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.UdpOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferMsec": {
+                    "type": "number"
+                },
+                "ContainerSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.UdpContainerSettings"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "FecOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FecOutputSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoBlackFailoverSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "BlackDetectThreshold": {
+                    "type": "number"
+                },
+                "VideoBlackThresholdMsec": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoCodecSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "FrameCaptureSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureSettings"
+                },
+                "H264Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H264Settings"
+                },
+                "H265Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H265Settings"
+                },
+                "Mpeg2Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Mpeg2Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "CodecSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoCodecSettings"
+                },
+                "Height": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "RespondToAfd": {
+                    "type": "string"
+                },
+                "ScalingBehavior": {
+                    "type": "string"
+                },
+                "Sharpness": {
+                    "type": "number"
+                },
+                "Width": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "ColorSpace": {
+                    "type": "string"
+                },
+                "ColorSpaceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoSelectorColorSpaceSettings"
+                },
+                "ColorSpaceUsage": {
+                    "type": "string"
+                },
+                "SelectorSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoSelectorSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoSelectorColorSpaceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Hdr10Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Hdr10Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoSelectorPid": {
+            "additionalProperties": false,
+            "properties": {
+                "Pid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoSelectorProgramId": {
+            "additionalProperties": false,
+            "properties": {
+                "ProgramId": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoSelectorSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "VideoSelectorPid": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoSelectorPid"
+                },
+                "VideoSelectorProgramId": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoSelectorProgramId"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VpcOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PublicAddressAllocationIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.WavSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "BitDepth": {
+                    "type": "number"
+                },
+                "CodingMode": {
+                    "type": "string"
+                },
+                "SampleRate": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.WebvttDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "StyleControl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "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::InputSecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "WhitelistRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::InputSecurityGroup.InputWhitelistRuleCidr"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::InputSecurityGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::InputSecurityGroup.InputWhitelistRuleCidr": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::Asset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Id": {
+                            "type": "string"
+                        },
+                        "PackagingGroupId": {
+                            "type": "string"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "SourceArn": {
+                            "type": "string"
+                        },
+                        "SourceRoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Id",
+                        "PackagingGroupId",
+                        "SourceArn",
+                        "SourceRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaPackage::Asset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::Asset.EgressEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "PackagingConfigurationId": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PackagingConfigurationId",
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EgressAccessLogs": {
+                            "$ref": "#/definitions/AWS::MediaPackage::Channel.LogConfiguration"
+                        },
+                        "Id": {
+                            "type": "string"
+                        },
+                        "IngressAccessLogs": {
+                            "$ref": "#/definitions/AWS::MediaPackage::Channel.LogConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Id"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaPackage::Channel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::Channel.LogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Authorization": {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.Authorization"
+                        },
+                        "ChannelId": {
+                            "type": "string"
+                        },
+                        "CmafPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.CmafPackage"
+                        },
+                        "DashPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.DashPackage"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "HlsPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.HlsPackage"
+                        },
+                        "Id": {
+                            "type": "string"
+                        },
+                        "ManifestName": {
+                            "type": "string"
+                        },
+                        "MssPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.MssPackage"
+                        },
+                        "Origination": {
+                            "type": "string"
+                        },
+                        "StartoverWindowSeconds": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeDelaySeconds": {
+                            "type": "number"
+                        },
+                        "Whitelist": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ChannelId",
+                        "Id"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaPackage::OriginEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.Authorization": {
+            "additionalProperties": false,
+            "properties": {
+                "CdnIdentifierSecret": {
+                    "type": "string"
+                },
+                "SecretsRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CdnIdentifierSecret",
+                "SecretsRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.CmafEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstantInitializationVector": {
+                    "type": "string"
+                },
+                "KeyRotationIntervalSeconds": {
+                    "type": "number"
+                },
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.CmafPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.CmafEncryption"
+                },
+                "HlsManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.HlsManifest"
+                    },
+                    "type": "array"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "SegmentPrefix": {
+                    "type": "string"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.StreamSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.DashEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyRotationIntervalSeconds": {
+                    "type": "number"
+                },
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.DashPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "AdTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AdsOnDeliveryRestrictions": {
+                    "type": "string"
+                },
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.DashEncryption"
+                },
+                "ManifestLayout": {
+                    "type": "string"
+                },
+                "ManifestWindowSeconds": {
+                    "type": "number"
+                },
+                "MinBufferTimeSeconds": {
+                    "type": "number"
+                },
+                "MinUpdatePeriodSeconds": {
+                    "type": "number"
+                },
+                "PeriodTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Profile": {
+                    "type": "string"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "SegmentTemplateFormat": {
+                    "type": "string"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.StreamSelection"
+                },
+                "SuggestedPresentationDelaySeconds": {
+                    "type": "number"
+                },
+                "UtcTiming": {
+                    "type": "string"
+                },
+                "UtcTimingUri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.HlsEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstantInitializationVector": {
+                    "type": "string"
+                },
+                "EncryptionMethod": {
+                    "type": "string"
+                },
+                "KeyRotationIntervalSeconds": {
+                    "type": "number"
+                },
+                "RepeatExtXKey": {
+                    "type": "boolean"
+                },
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.HlsManifest": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkers": {
+                    "type": "string"
+                },
+                "AdTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AdsOnDeliveryRestrictions": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "IncludeIframeOnlyStream": {
+                    "type": "boolean"
+                },
+                "ManifestName": {
+                    "type": "string"
+                },
+                "PlaylistType": {
+                    "type": "string"
+                },
+                "PlaylistWindowSeconds": {
+                    "type": "number"
+                },
+                "ProgramDateTimeIntervalSeconds": {
+                    "type": "number"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.HlsPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkers": {
+                    "type": "string"
+                },
+                "AdTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AdsOnDeliveryRestrictions": {
+                    "type": "string"
+                },
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.HlsEncryption"
+                },
+                "IncludeIframeOnlyStream": {
+                    "type": "boolean"
+                },
+                "PlaylistType": {
+                    "type": "string"
+                },
+                "PlaylistWindowSeconds": {
+                    "type": "number"
+                },
+                "ProgramDateTimeIntervalSeconds": {
+                    "type": "number"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.StreamSelection"
+                },
+                "UseAudioRenditionGroup": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.MssEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.MssPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.MssEncryption"
+                },
+                "ManifestWindowSeconds": {
+                    "type": "number"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.StreamSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SystemIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceId",
+                "RoleArn",
+                "SystemIds",
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.StreamSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxVideoBitsPerSecond": {
+                    "type": "number"
+                },
+                "MinVideoBitsPerSecond": {
+                    "type": "number"
+                },
+                "StreamOrder": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CmafPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.CmafPackage"
+                        },
+                        "DashPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.DashPackage"
+                        },
+                        "HlsPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.HlsPackage"
+                        },
+                        "Id": {
+                            "type": "string"
+                        },
+                        "MssPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.MssPackage"
+                        },
+                        "PackagingGroupId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Id",
+                        "PackagingGroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaPackage::PackagingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.CmafEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.CmafPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.CmafEncryption"
+                },
+                "HlsManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.HlsManifest"
+                    },
+                    "type": "array"
+                },
+                "IncludeEncoderConfigurationInSegments": {
+                    "type": "boolean"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "HlsManifests"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.DashEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.DashManifest": {
+            "additionalProperties": false,
+            "properties": {
+                "ManifestLayout": {
+                    "type": "string"
+                },
+                "ManifestName": {
+                    "type": "string"
+                },
+                "MinBufferTimeSeconds": {
+                    "type": "number"
+                },
+                "Profile": {
+                    "type": "string"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.StreamSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.DashPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "DashManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.DashManifest"
+                    },
+                    "type": "array"
+                },
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.DashEncryption"
+                },
+                "IncludeEncoderConfigurationInSegments": {
+                    "type": "boolean"
+                },
+                "PeriodTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "SegmentTemplateFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DashManifests"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.HlsEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstantInitializationVector": {
+                    "type": "string"
+                },
+                "EncryptionMethod": {
+                    "type": "string"
+                },
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.HlsManifest": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkers": {
+                    "type": "string"
+                },
+                "IncludeIframeOnlyStream": {
+                    "type": "boolean"
+                },
+                "ManifestName": {
+                    "type": "string"
+                },
+                "ProgramDateTimeIntervalSeconds": {
+                    "type": "number"
+                },
+                "RepeatExtXKey": {
+                    "type": "boolean"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.StreamSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.HlsPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.HlsEncryption"
+                },
+                "HlsManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.HlsManifest"
+                    },
+                    "type": "array"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "UseAudioRenditionGroup": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "HlsManifests"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.MssEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.MssManifest": {
+            "additionalProperties": false,
+            "properties": {
+                "ManifestName": {
+                    "type": "string"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.StreamSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.MssPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.MssEncryption"
+                },
+                "MssManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.MssManifest"
+                    },
+                    "type": "array"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MssManifests"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SystemIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SystemIds",
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.StreamSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxVideoBitsPerSecond": {
+                    "type": "number"
+                },
+                "MinVideoBitsPerSecond": {
+                    "type": "number"
+                },
+                "StreamOrder": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Authorization": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingGroup.Authorization"
+                        },
+                        "EgressAccessLogs": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingGroup.LogConfiguration"
+                        },
+                        "Id": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Id"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaPackage::PackagingGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingGroup.Authorization": {
+            "additionalProperties": false,
+            "properties": {
+                "CdnIdentifierSecret": {
+                    "type": "string"
+                },
+                "SecretsRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CdnIdentifierSecret",
+                "SecretsRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingGroup.LogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaStore::Container": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessLoggingEnabled": {
+                            "type": "boolean"
+                        },
+                        "ContainerName": {
+                            "type": "string"
+                        },
+                        "CorsPolicy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaStore::Container.CorsRule"
+                            },
+                            "type": "array"
+                        },
+                        "LifecyclePolicy": {
+                            "type": "string"
+                        },
+                        "MetricPolicy": {
+                            "$ref": "#/definitions/AWS::MediaStore::Container.MetricPolicy"
+                        },
+                        "Policy": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ContainerName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaStore::Container"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaStore::Container.CorsRule": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedOrigins": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExposeHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaxAgeSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaStore::Container.MetricPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerLevelMetrics": {
+                    "type": "string"
+                },
+                "MetricPolicyRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaStore::Container.MetricPolicyRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ContainerLevelMetrics"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaStore::Container.MetricPolicyRule": {
+            "additionalProperties": false,
+            "properties": {
+                "ObjectGroup": {
+                    "type": "string"
+                },
+                "ObjectGroupName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ObjectGroup",
+                "ObjectGroupName"
+            ],
+            "type": "object"
+        },
+        "AWS::MemoryDB::ACL": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ACLName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ACLName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MemoryDB::ACL"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MemoryDB::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ACLName": {
+                            "type": "string"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "FinalSnapshotName": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "NodeType": {
+                            "type": "string"
+                        },
+                        "NumReplicasPerShard": {
+                            "type": "number"
+                        },
+                        "NumShards": {
+                            "type": "number"
+                        },
+                        "ParameterGroupName": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnapshotArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnapshotName": {
+                            "type": "string"
+                        },
+                        "SnapshotRetentionLimit": {
+                            "type": "number"
+                        },
+                        "SnapshotWindow": {
+                            "type": "string"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SnsTopicStatus": {
+                            "type": "string"
+                        },
+                        "SubnetGroupName": {
+                            "type": "string"
+                        },
+                        "TLSEnabled": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ACLName",
+                        "ClusterName",
+                        "NodeType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MemoryDB::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MemoryDB::Cluster.Endpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MemoryDB::ParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ParameterGroupName": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Family",
+                        "ParameterGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MemoryDB::ParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MemoryDB::SubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SubnetGroupName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubnetGroupName",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MemoryDB::SubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MemoryDB::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessString": {
+                            "type": "string"
+                        },
+                        "AuthenticationMode": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AccessString",
+                        "AuthenticationMode",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MemoryDB::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatedRoles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Neptune::DBCluster.DBClusterRole"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "IamAuthEnabled": {
+                            "type": "boolean"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "RestoreToTime": {
+                            "type": "string"
+                        },
+                        "RestoreType": {
+                            "type": "string"
+                        },
+                        "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::DBClusterParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBInstanceClass": {
+                            "type": "string"
+                        },
+                        "DBInstanceIdentifier": {
+                            "type": "string"
+                        },
+                        "DBParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBSnapshotIdentifier": {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::DBParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBSubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DBSubnetGroupDescription": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBSubnetGroupDescription",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Neptune::DBSubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::Firewall": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeleteProtection": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FirewallName": {
+                            "type": "string"
+                        },
+                        "FirewallPolicyArn": {
+                            "type": "string"
+                        },
+                        "FirewallPolicyChangeProtection": {
+                            "type": "boolean"
+                        },
+                        "SubnetChangeProtection": {
+                            "type": "boolean"
+                        },
+                        "SubnetMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::NetworkFirewall::Firewall.SubnetMapping"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FirewallName",
+                        "FirewallPolicyArn",
+                        "SubnetMappings",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkFirewall::Firewall"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::Firewall.SubnetMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubnetId"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "FirewallPolicy": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.FirewallPolicy"
+                        },
+                        "FirewallPolicyName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FirewallPolicy",
+                        "FirewallPolicyName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkFirewall::FirewallPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.ActionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "PublishMetricAction": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.PublishMetricAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.CustomAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionDefinition": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.ActionDefinition"
+                },
+                "ActionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionDefinition",
+                "ActionName"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.FirewallPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "StatefulDefaultActions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StatefulEngineOptions": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.StatefulEngineOptions"
+                },
+                "StatefulRuleGroupReferences": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.StatefulRuleGroupReference"
+                    },
+                    "type": "array"
+                },
+                "StatelessCustomActions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.CustomAction"
+                    },
+                    "type": "array"
+                },
+                "StatelessDefaultActions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StatelessFragmentDefaultActions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StatelessRuleGroupReferences": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.StatelessRuleGroupReference"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "StatelessDefaultActions",
+                "StatelessFragmentDefaultActions"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.PublishMetricAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.Dimension"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Dimensions"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.StatefulEngineOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "RuleOrder": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.StatefulRuleGroupReference": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "ResourceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.StatelessRuleGroupReference": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "ResourceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Priority",
+                "ResourceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FirewallArn": {
+                            "type": "string"
+                        },
+                        "FirewallName": {
+                            "type": "string"
+                        },
+                        "LoggingConfiguration": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::LoggingConfiguration.LoggingConfiguration"
+                        }
+                    },
+                    "required": [
+                        "FirewallArn",
+                        "LoggingConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkFirewall::LoggingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::LoggingConfiguration.LogDestinationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LogDestination": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "LogDestinationType": {
+                    "type": "string"
+                },
+                "LogType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogDestination",
+                "LogDestinationType",
+                "LogType"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::LoggingConfiguration.LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogDestinationConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::LoggingConfiguration.LogDestinationConfig"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LogDestinationConfigs"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Capacity": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "RuleGroup": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleGroup"
+                        },
+                        "RuleGroupName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Capacity",
+                        "RuleGroupName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkFirewall::RuleGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.ActionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "PublishMetricAction": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.PublishMetricAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.Address": {
+            "additionalProperties": false,
+            "properties": {
+                "AddressDefinition": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AddressDefinition"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.CustomAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionDefinition": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.ActionDefinition"
+                },
+                "ActionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionDefinition",
+                "ActionName"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.Header": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                },
+                "DestinationPort": {
+                    "type": "string"
+                },
+                "Direction": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "SourcePort": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination",
+                "DestinationPort",
+                "Direction",
+                "Protocol",
+                "Source",
+                "SourcePort"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.IPSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Definition": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.MatchAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPorts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.PortRange"
+                    },
+                    "type": "array"
+                },
+                "Destinations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.Address"
+                    },
+                    "type": "array"
+                },
+                "Protocols": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "SourcePorts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.PortRange"
+                    },
+                    "type": "array"
+                },
+                "Sources": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.Address"
+                    },
+                    "type": "array"
+                },
+                "TCPFlags": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.TCPFlagField"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.PortRange": {
+            "additionalProperties": false,
+            "properties": {
+                "FromPort": {
+                    "type": "number"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FromPort",
+                "ToPort"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.PortSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Definition": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.PublishMetricAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.Dimension"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Dimensions"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RuleDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MatchAttributes": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.MatchAttributes"
+                }
+            },
+            "required": [
+                "Actions",
+                "MatchAttributes"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RuleGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "RuleVariables": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleVariables"
+                },
+                "RulesSource": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RulesSource"
+                },
+                "StatefulRuleOptions": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.StatefulRuleOptions"
+                }
+            },
+            "required": [
+                "RulesSource"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RuleOption": {
+            "additionalProperties": false,
+            "properties": {
+                "Keyword": {
+                    "type": "string"
+                },
+                "Settings": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Keyword"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RuleVariables": {
+            "additionalProperties": false,
+            "properties": {
+                "IPSets": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.IPSet"
+                        }
+                    },
+                    "type": "object"
+                },
+                "PortSets": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.PortSet"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RulesSource": {
+            "additionalProperties": false,
+            "properties": {
+                "RulesSourceList": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RulesSourceList"
+                },
+                "RulesString": {
+                    "type": "string"
+                },
+                "StatefulRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.StatefulRule"
+                    },
+                    "type": "array"
+                },
+                "StatelessRulesAndCustomActions": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.StatelessRulesAndCustomActions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RulesSourceList": {
+            "additionalProperties": false,
+            "properties": {
+                "GeneratedRulesType": {
+                    "type": "string"
+                },
+                "TargetTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Targets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "GeneratedRulesType",
+                "TargetTypes",
+                "Targets"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.StatefulRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Header": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.Header"
+                },
+                "RuleOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleOption"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Action",
+                "Header",
+                "RuleOptions"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.StatefulRuleOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "RuleOrder": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.StatelessRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "RuleDefinition": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleDefinition"
+                }
+            },
+            "required": [
+                "Priority",
+                "RuleDefinition"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.StatelessRulesAndCustomActions": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomActions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.CustomAction"
+                    },
+                    "type": "array"
+                },
+                "StatelessRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.StatelessRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "StatelessRules"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.TCPFlagField": {
+            "additionalProperties": false,
+            "properties": {
+                "Flags": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Masks": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Flags"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::CustomerGatewayAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomerGatewayArn": {
+                            "type": "string"
+                        },
+                        "DeviceId": {
+                            "type": "string"
+                        },
+                        "GlobalNetworkId": {
+                            "type": "string"
+                        },
+                        "LinkId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CustomerGatewayArn",
+                        "DeviceId",
+                        "GlobalNetworkId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::CustomerGatewayAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Device": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Location": {
+                            "$ref": "#/definitions/AWS::NetworkManager::Device.Location"
+                        },
+                        "Model": {
+                            "type": "string"
+                        },
+                        "SerialNumber": {
+                            "type": "string"
+                        },
+                        "SiteId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Vendor": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GlobalNetworkId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::Device"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Device.Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Latitude": {
+                    "type": "string"
+                },
+                "Longitude": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::GlobalNetwork": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::GlobalNetwork"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Link": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Bandwidth": {
+                            "$ref": "#/definitions/AWS::NetworkManager::Link.Bandwidth"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "GlobalNetworkId": {
+                            "type": "string"
+                        },
+                        "Provider": {
+                            "type": "string"
+                        },
+                        "SiteId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Bandwidth",
+                        "GlobalNetworkId",
+                        "SiteId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::Link"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Link.Bandwidth": {
+            "additionalProperties": false,
+            "properties": {
+                "DownloadSpeed": {
+                    "type": "number"
+                },
+                "UploadSpeed": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::LinkAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeviceId": {
+                            "type": "string"
+                        },
+                        "GlobalNetworkId": {
+                            "type": "string"
+                        },
+                        "LinkId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DeviceId",
+                        "GlobalNetworkId",
+                        "LinkId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::LinkAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Site": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Location": {
+                            "$ref": "#/definitions/AWS::NetworkManager::Site.Location"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "GlobalNetworkId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::Site"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Site.Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Latitude": {
+                    "type": "string"
+                },
+                "Longitude": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::TransitGatewayRegistration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GlobalNetworkId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GlobalNetworkId",
+                        "TransitGatewayArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::TransitGatewayRegistration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::LaunchProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Ec2SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchProfileProtocolVersions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "StreamConfiguration": {
+                            "$ref": "#/definitions/AWS::NimbleStudio::LaunchProfile.StreamConfiguration"
+                        },
+                        "StudioComponentIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "StudioId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Ec2SubnetIds",
+                        "LaunchProfileProtocolVersions",
+                        "Name",
+                        "StreamConfiguration",
+                        "StudioComponentIds",
+                        "StudioId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NimbleStudio::LaunchProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::LaunchProfile.StreamConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClipboardMode": {
+                    "type": "string"
+                },
+                "Ec2InstanceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaxSessionLengthInMinutes": {
+                    "type": "number"
+                },
+                "StreamingImageIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ClipboardMode",
+                "Ec2InstanceTypes",
+                "StreamingImageIds"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StreamingImage": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Ec2ImageId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "StudioId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Ec2ImageId",
+                        "Name",
+                        "StudioId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NimbleStudio::StreamingImage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::Studio": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdminRoleArn": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "StudioEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::NimbleStudio::Studio.StudioEncryptionConfiguration"
+                        },
+                        "StudioName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "UserRoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AdminRoleArn",
+                        "DisplayName",
+                        "StudioName",
+                        "UserRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NimbleStudio::Studio"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::Studio.StudioEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyArn": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KeyType"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.StudioComponentConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Ec2SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "InitializationScripts": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.StudioComponentInitializationScript"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ScriptParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.ScriptParameterKeyValue"
+                            },
+                            "type": "array"
+                        },
+                        "StudioId": {
+                            "type": "string"
+                        },
+                        "Subtype": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "StudioId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NimbleStudio::StudioComponent"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.ActiveDirectoryComputerAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.ActiveDirectoryConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputerAttributes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.ActiveDirectoryComputerAttribute"
+                    },
+                    "type": "array"
+                },
+                "DirectoryId": {
+                    "type": "string"
+                },
+                "OrganizationalUnitDistinguishedName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.ComputeFarmConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveDirectoryUser": {
+                    "type": "string"
+                },
+                "Endpoint": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.LicenseServiceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.ScriptParameterKeyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.SharedFileSystemConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                },
+                "FileSystemId": {
+                    "type": "string"
+                },
+                "LinuxMountPoint": {
+                    "type": "string"
+                },
+                "ShareName": {
+                    "type": "string"
+                },
+                "WindowsMountDrive": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.StudioComponentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveDirectoryConfiguration": {
+                    "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.ActiveDirectoryConfiguration"
+                },
+                "ComputeFarmConfiguration": {
+                    "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.ComputeFarmConfiguration"
+                },
+                "LicenseServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.LicenseServiceConfiguration"
+                },
+                "SharedFileSystemConfiguration": {
+                    "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.SharedFileSystemConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.StudioComponentInitializationScript": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchProfileProtocolVersion": {
+                    "type": "string"
+                },
+                "Platform": {
+                    "type": "string"
+                },
+                "RunContext": {
+                    "type": "string"
+                },
+                "Script": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessPolicies": {
+                            "type": "object"
+                        },
+                        "AdvancedOptions": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "AdvancedSecurityOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.AdvancedSecurityOptionsInput"
+                        },
+                        "ClusterConfig": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.ClusterConfig"
+                        },
+                        "CognitoOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.CognitoOptions"
+                        },
+                        "DomainEndpointOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.DomainEndpointOptions"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EBSOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.EBSOptions"
+                        },
+                        "EncryptionAtRestOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.EncryptionAtRestOptions"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "LogPublishingOptions": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::OpenSearchService::Domain.LogPublishingOption"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "NodeToNodeEncryptionOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.NodeToNodeEncryptionOptions"
+                        },
+                        "SnapshotOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.SnapshotOptions"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VPCOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.VPCOptions"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpenSearchService::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.AdvancedSecurityOptionsInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "InternalUserDatabaseEnabled": {
+                    "type": "boolean"
+                },
+                "MasterUserOptions": {
+                    "$ref": "#/definitions/AWS::OpenSearchService::Domain.MasterUserOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DedicatedMasterCount": {
+                    "type": "number"
+                },
+                "DedicatedMasterEnabled": {
+                    "type": "boolean"
+                },
+                "DedicatedMasterType": {
+                    "type": "string"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "WarmCount": {
+                    "type": "number"
+                },
+                "WarmEnabled": {
+                    "type": "boolean"
+                },
+                "WarmType": {
+                    "type": "string"
+                },
+                "ZoneAwarenessConfig": {
+                    "$ref": "#/definitions/AWS::OpenSearchService::Domain.ZoneAwarenessConfig"
+                },
+                "ZoneAwarenessEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.CognitoOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "IdentityPoolId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "UserPoolId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.DomainEndpointOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomEndpoint": {
+                    "type": "string"
+                },
+                "CustomEndpointCertificateArn": {
+                    "type": "string"
+                },
+                "CustomEndpointEnabled": {
+                    "type": "boolean"
+                },
+                "EnforceHTTPS": {
+                    "type": "boolean"
+                },
+                "TLSSecurityPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.EBSOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "EBSEnabled": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.EncryptionAtRestOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.LogPublishingOption": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsLogGroupArn": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.MasterUserOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "MasterUserARN": {
+                    "type": "string"
+                },
+                "MasterUserName": {
+                    "type": "string"
+                },
+                "MasterUserPassword": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.NodeToNodeEncryptionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.SnapshotOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomatedSnapshotStartHour": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.VPCOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.ZoneAwarenessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZoneCount": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::App": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppSource": {
+                            "$ref": "#/definitions/AWS::OpsWorks::App.Source"
+                        },
+                        "Attributes": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "DataSources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::App.DataSource"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Domains": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EnableSsl": {
+                            "type": "boolean"
+                        },
+                        "Environment": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::App.EnvironmentVariable"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Shortname": {
+                            "type": "string"
+                        },
+                        "SslConfiguration": {
+                            "$ref": "#/definitions/AWS::OpsWorks::App.SslConfiguration"
+                        },
+                        "StackId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "StackId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::App"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::App.DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::App.EnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Secure": {
+                    "type": "boolean"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::App.Source": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Revision": {
+                    "type": "string"
+                },
+                "SshKey": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::App.SslConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
+                    "type": "string"
+                },
+                "Chain": {
+                    "type": "string"
+                },
+                "PrivateKey": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::ElasticLoadBalancerAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ElasticLoadBalancerName": {
+                            "type": "string"
+                        },
+                        "LayerId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ElasticLoadBalancerName",
+                        "LayerId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::ElasticLoadBalancerAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Instance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AgentVersion": {
+                            "type": "string"
+                        },
+                        "AmiId": {
+                            "type": "string"
+                        },
+                        "Architecture": {
+                            "type": "string"
+                        },
+                        "AutoScalingType": {
+                            "type": "string"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "BlockDeviceMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::Instance.BlockDeviceMapping"
+                            },
+                            "type": "array"
+                        },
+                        "EbsOptimized": {
+                            "type": "boolean"
+                        },
+                        "ElasticIps": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Hostname": {
+                            "type": "string"
+                        },
+                        "InstallUpdatesOnBoot": {
+                            "type": "boolean"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "LayerIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Os": {
+                            "type": "string"
+                        },
+                        "RootDeviceType": {
+                            "type": "string"
+                        },
+                        "SshKeyName": {
+                            "type": "string"
+                        },
+                        "StackId": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tenancy": {
+                            "type": "string"
+                        },
+                        "TimeBasedAutoScaling": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Instance.TimeBasedAutoScaling"
+                        },
+                        "VirtualizationType": {
+                            "type": "string"
+                        },
+                        "Volumes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InstanceType",
+                        "LayerIds",
+                        "StackId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Instance.BlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::OpsWorks::Instance.EbsBlockDevice"
+                },
+                "NoDevice": {
+                    "type": "string"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Instance.EbsBlockDevice": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Instance.TimeBasedAutoScaling": {
+            "additionalProperties": false,
+            "properties": {
+                "Friday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Monday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Saturday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Sunday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Thursday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Tuesday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Wednesday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Attributes": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "AutoAssignElasticIps": {
+                            "type": "boolean"
+                        },
+                        "AutoAssignPublicIps": {
+                            "type": "boolean"
+                        },
+                        "CustomInstanceProfileArn": {
+                            "type": "string"
+                        },
+                        "CustomJson": {
+                            "type": "object"
+                        },
+                        "CustomRecipes": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Layer.Recipes"
+                        },
+                        "CustomSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EnableAutoHealing": {
+                            "type": "boolean"
+                        },
+                        "InstallUpdatesOnBoot": {
+                            "type": "boolean"
+                        },
+                        "LifecycleEventConfiguration": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Layer.LifecycleEventConfiguration"
+                        },
+                        "LoadBasedAutoScaling": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Layer.LoadBasedAutoScaling"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Packages": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Shortname": {
+                            "type": "string"
+                        },
+                        "StackId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "UseEbsOptimizedInstances": {
+                            "type": "boolean"
+                        },
+                        "VolumeConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::Layer.VolumeConfiguration"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AutoAssignElasticIps",
+                        "AutoAssignPublicIps",
+                        "EnableAutoHealing",
+                        "Name",
+                        "Shortname",
+                        "StackId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::Layer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.AutoScalingThresholds": {
+            "additionalProperties": false,
+            "properties": {
+                "CpuThreshold": {
+                    "type": "number"
+                },
+                "IgnoreMetricsTime": {
+                    "type": "number"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "LoadThreshold": {
+                    "type": "number"
+                },
+                "MemoryThreshold": {
+                    "type": "number"
+                },
+                "ThresholdsWaitTime": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.LifecycleEventConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ShutdownEventConfiguration": {
+                    "$ref": "#/definitions/AWS::OpsWorks::Layer.ShutdownEventConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.LoadBasedAutoScaling": {
+            "additionalProperties": false,
+            "properties": {
+                "DownScaling": {
+                    "$ref": "#/definitions/AWS::OpsWorks::Layer.AutoScalingThresholds"
+                },
+                "Enable": {
+                    "type": "boolean"
+                },
+                "UpScaling": {
+                    "$ref": "#/definitions/AWS::OpsWorks::Layer.AutoScalingThresholds"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.Recipes": {
+            "additionalProperties": false,
+            "properties": {
+                "Configure": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Deploy": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Setup": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Shutdown": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Undeploy": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.ShutdownEventConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DelayUntilElbConnectionsDrained": {
+                    "type": "boolean"
+                },
+                "ExecutionTimeout": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.VolumeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "MountPoint": {
+                    "type": "string"
+                },
+                "NumberOfDisks": {
+                    "type": "number"
+                },
+                "RaidLevel": {
+                    "type": "number"
+                },
+                "Size": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AgentVersion": {
+                            "type": "string"
+                        },
+                        "Attributes": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ChefConfiguration": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Stack.ChefConfiguration"
+                        },
+                        "CloneAppIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ClonePermissions": {
+                            "type": "boolean"
+                        },
+                        "ConfigurationManager": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Stack.StackConfigurationManager"
+                        },
+                        "CustomCookbooksSource": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Stack.Source"
+                        },
+                        "CustomJson": {
+                            "type": "object"
+                        },
+                        "DefaultAvailabilityZone": {
+                            "type": "string"
+                        },
+                        "DefaultInstanceProfileArn": {
+                            "type": "string"
+                        },
+                        "DefaultOs": {
+                            "type": "string"
+                        },
+                        "DefaultRootDeviceType": {
+                            "type": "string"
+                        },
+                        "DefaultSshKeyName": {
+                            "type": "string"
+                        },
+                        "DefaultSubnetId": {
+                            "type": "string"
+                        },
+                        "EcsClusterArn": {
+                            "type": "string"
+                        },
+                        "ElasticIps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::Stack.ElasticIp"
+                            },
+                            "type": "array"
+                        },
+                        "HostnameTheme": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RdsDbInstances": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::Stack.RdsDbInstance"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceRoleArn": {
+                            "type": "string"
+                        },
+                        "SourceStackId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UseCustomCookbooks": {
+                            "type": "boolean"
+                        },
+                        "UseOpsworksSecurityGroups": {
+                            "type": "boolean"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DefaultInstanceProfileArn",
+                        "Name",
+                        "ServiceRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::Stack"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack.ChefConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BerkshelfVersion": {
+                    "type": "string"
+                },
+                "ManageBerkshelf": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack.ElasticIp": {
+            "additionalProperties": false,
+            "properties": {
+                "Ip": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ip"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack.RdsDbInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DbPassword": {
+                    "type": "string"
+                },
+                "DbUser": {
+                    "type": "string"
+                },
+                "RdsDbInstanceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DbPassword",
+                "DbUser",
+                "RdsDbInstanceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack.Source": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Revision": {
+                    "type": "string"
+                },
+                "SshKey": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack.StackConfigurationManager": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::UserProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowSelfManagement": {
+                            "type": "boolean"
+                        },
+                        "IamUserArn": {
+                            "type": "string"
+                        },
+                        "SshPublicKey": {
+                            "type": "string"
+                        },
+                        "SshUsername": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "IamUserArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::UserProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Volume": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Ec2VolumeId": {
+                            "type": "string"
+                        },
+                        "MountPoint": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "StackId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Ec2VolumeId",
+                        "StackId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::Volume"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorksCM::Server": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatePublicIpAddress": {
+                            "type": "boolean"
+                        },
+                        "BackupId": {
+                            "type": "string"
+                        },
+                        "BackupRetentionCount": {
+                            "type": "number"
+                        },
+                        "CustomCertificate": {
+                            "type": "string"
+                        },
+                        "CustomDomain": {
+                            "type": "string"
+                        },
+                        "CustomPrivateKey": {
+                            "type": "string"
+                        },
+                        "DisableAutomatedBackup": {
+                            "type": "boolean"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorksCM::Server.EngineAttribute"
+                            },
+                            "type": "array"
+                        },
+                        "EngineModel": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "InstanceProfileArn": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "KeyPair": {
+                            "type": "string"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ServerName": {
+                            "type": "string"
+                        },
+                        "ServiceRoleArn": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InstanceProfileArn",
+                        "InstanceType",
+                        "ServiceRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorksCM::Server"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorksCM::Server.EngineAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Panorama::ApplicationInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationInstanceIdToReplace": {
+                            "type": "string"
+                        },
+                        "DefaultRuntimeContextDevice": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DeviceId": {
+                            "type": "string"
+                        },
+                        "ManifestOverridesPayload": {
+                            "$ref": "#/definitions/AWS::Panorama::ApplicationInstance.ManifestOverridesPayload"
+                        },
+                        "ManifestPayload": {
+                            "$ref": "#/definitions/AWS::Panorama::ApplicationInstance.ManifestPayload"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RuntimeRoleArn": {
+                            "type": "string"
+                        },
+                        "StatusFilter": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DefaultRuntimeContextDevice",
+                        "ManifestPayload"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Panorama::ApplicationInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Panorama::ApplicationInstance.ManifestOverridesPayload": {
+            "additionalProperties": false,
+            "properties": {
+                "PayloadData": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Panorama::ApplicationInstance.ManifestPayload": {
+            "additionalProperties": false,
+            "properties": {
+                "PayloadData": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Panorama::Package": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PackageName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PackageName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Panorama::Package"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Panorama::PackageVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MarkLatest": {
+                            "type": "boolean"
+                        },
+                        "OwnerAccount": {
+                            "type": "string"
+                        },
+                        "PackageId": {
+                            "type": "string"
+                        },
+                        "PackageVersion": {
+                            "type": "string"
+                        },
+                        "PatchVersion": {
+                            "type": "string"
+                        },
+                        "UpdatedLatestPatchVersion": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PackageId",
+                        "PackageVersion",
+                        "PatchVersion"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Panorama::PackageVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::ADMChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ClientId": {
+                            "type": "string"
+                        },
+                        "ClientSecret": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "ClientId",
+                        "ClientSecret"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::ADMChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::APNSChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "DefaultAuthenticationMethod": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "PrivateKey": {
+                            "type": "string"
+                        },
+                        "TeamId": {
+                            "type": "string"
+                        },
+                        "TokenKey": {
+                            "type": "string"
+                        },
+                        "TokenKeyId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::APNSChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::APNSSandboxChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "DefaultAuthenticationMethod": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "PrivateKey": {
+                            "type": "string"
+                        },
+                        "TeamId": {
+                            "type": "string"
+                        },
+                        "TokenKey": {
+                            "type": "string"
+                        },
+                        "TokenKeyId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::APNSSandboxChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::APNSVoipChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "DefaultAuthenticationMethod": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "PrivateKey": {
+                            "type": "string"
+                        },
+                        "TeamId": {
+                            "type": "string"
+                        },
+                        "TokenKey": {
+                            "type": "string"
+                        },
+                        "TokenKeyId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::APNSVoipChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::APNSVoipSandboxChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "DefaultAuthenticationMethod": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "PrivateKey": {
+                            "type": "string"
+                        },
+                        "TeamId": {
+                            "type": "string"
+                        },
+                        "TokenKey": {
+                            "type": "string"
+                        },
+                        "TokenKeyId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::APNSVoipSandboxChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::App": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::App"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::ApplicationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "CampaignHook": {
+                            "$ref": "#/definitions/AWS::Pinpoint::ApplicationSettings.CampaignHook"
+                        },
+                        "CloudWatchMetricsEnabled": {
+                            "type": "boolean"
+                        },
+                        "Limits": {
+                            "$ref": "#/definitions/AWS::Pinpoint::ApplicationSettings.Limits"
+                        },
+                        "QuietTime": {
+                            "$ref": "#/definitions/AWS::Pinpoint::ApplicationSettings.QuietTime"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::ApplicationSettings"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::ApplicationSettings.CampaignHook": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaFunctionName": {
+                    "type": "string"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "WebUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::ApplicationSettings.Limits": {
+            "additionalProperties": false,
+            "properties": {
+                "Daily": {
+                    "type": "number"
+                },
+                "MaximumDuration": {
+                    "type": "number"
+                },
+                "MessagesPerSecond": {
+                    "type": "number"
+                },
+                "Total": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::ApplicationSettings.QuietTime": {
+            "additionalProperties": false,
+            "properties": {
+                "End": {
+                    "type": "string"
+                },
+                "Start": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "End",
+                "Start"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::BaiduChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiKey": {
+                            "type": "string"
+                        },
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "SecretKey": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiKey",
+                        "ApplicationId",
+                        "SecretKey"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::BaiduChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdditionalTreatments": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Pinpoint::Campaign.WriteTreatmentResource"
+                            },
+                            "type": "array"
+                        },
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "CampaignHook": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Campaign.CampaignHook"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "HoldoutPercent": {
+                            "type": "number"
+                        },
+                        "IsPaused": {
+                            "type": "boolean"
+                        },
+                        "Limits": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Campaign.Limits"
+                        },
+                        "MessageConfiguration": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Campaign.MessageConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        },
+                        "Schedule": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Campaign.Schedule"
+                        },
+                        "SegmentId": {
+                            "type": "string"
+                        },
+                        "SegmentVersion": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TreatmentDescription": {
+                            "type": "string"
+                        },
+                        "TreatmentName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "MessageConfiguration",
+                        "Name",
+                        "Schedule",
+                        "SegmentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::Campaign"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.AttributeDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeType": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.CampaignEmailMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "Body": {
+                    "type": "string"
+                },
+                "FromAddress": {
+                    "type": "string"
+                },
+                "HtmlBody": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.CampaignEventFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.EventDimensions"
+                },
+                "FilterType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.CampaignHook": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaFunctionName": {
+                    "type": "string"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "WebUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.CampaignInAppMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "Content": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pinpoint::Campaign.InAppMessageContent"
+                    },
+                    "type": "array"
+                },
+                "CustomConfig": {
+                    "type": "object"
+                },
+                "Layout": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.CampaignSmsMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "Body": {
+                    "type": "string"
+                },
+                "EntityId": {
+                    "type": "string"
+                },
+                "MessageType": {
+                    "type": "string"
+                },
+                "OriginationNumber": {
+                    "type": "string"
+                },
+                "SenderId": {
+                    "type": "string"
+                },
+                "TemplateId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.DefaultButtonConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BorderRadius": {
+                    "type": "number"
+                },
+                "ButtonAction": {
+                    "type": "string"
+                },
+                "Link": {
+                    "type": "string"
+                },
+                "Text": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.EventDimensions": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "type": "object"
+                },
+                "EventType": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.SetDimension"
+                },
+                "Metrics": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.InAppMessageBodyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.InAppMessageButton": {
+            "additionalProperties": false,
+            "properties": {
+                "Android": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.OverrideButtonConfiguration"
+                },
+                "DefaultConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.DefaultButtonConfiguration"
+                },
+                "IOS": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.OverrideButtonConfiguration"
+                },
+                "Web": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.OverrideButtonConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.InAppMessageContent": {
+            "additionalProperties": false,
+            "properties": {
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BodyConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.InAppMessageBodyConfig"
+                },
+                "HeaderConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.InAppMessageHeaderConfig"
+                },
+                "ImageUrl": {
+                    "type": "string"
+                },
+                "PrimaryBtn": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.InAppMessageButton"
+                },
+                "SecondaryBtn": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.InAppMessageButton"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.InAppMessageHeaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "Header": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.Limits": {
+            "additionalProperties": false,
+            "properties": {
+                "Daily": {
+                    "type": "number"
+                },
+                "MaximumDuration": {
+                    "type": "number"
+                },
+                "MessagesPerSecond": {
+                    "type": "number"
+                },
+                "Session": {
+                    "type": "number"
+                },
+                "Total": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.Message": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "ImageIconUrl": {
+                    "type": "string"
+                },
+                "ImageSmallIconUrl": {
+                    "type": "string"
+                },
+                "ImageUrl": {
+                    "type": "string"
+                },
+                "JsonBody": {
+                    "type": "string"
+                },
+                "MediaUrl": {
+                    "type": "string"
+                },
+                "RawContent": {
+                    "type": "string"
+                },
+                "SilentPush": {
+                    "type": "boolean"
+                },
+                "TimeToLive": {
+                    "type": "number"
+                },
+                "Title": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.MessageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ADMMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Message"
+                },
+                "APNSMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Message"
+                },
+                "BaiduMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Message"
+                },
+                "DefaultMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Message"
+                },
+                "EmailMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.CampaignEmailMessage"
+                },
+                "GCMMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Message"
+                },
+                "InAppMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.CampaignInAppMessage"
+                },
+                "SMSMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.CampaignSmsMessage"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.OverrideButtonConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ButtonAction": {
+                    "type": "string"
+                },
+                "Link": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.QuietTime": {
+            "additionalProperties": false,
+            "properties": {
+                "End": {
+                    "type": "string"
+                },
+                "Start": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "End",
+                "Start"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "EndTime": {
+                    "type": "string"
+                },
+                "EventFilter": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.CampaignEventFilter"
+                },
+                "Frequency": {
+                    "type": "string"
+                },
+                "IsLocalTime": {
+                    "type": "boolean"
+                },
+                "QuietTime": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.QuietTime"
+                },
+                "StartTime": {
+                    "type": "string"
+                },
+                "TimeZone": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.SetDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionType": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.WriteTreatmentResource": {
+            "additionalProperties": false,
+            "properties": {
+                "MessageConfiguration": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.MessageConfiguration"
+                },
+                "Schedule": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Schedule"
+                },
+                "SizePercent": {
+                    "type": "number"
+                },
+                "TreatmentDescription": {
+                    "type": "string"
+                },
+                "TreatmentName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::EmailChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ConfigurationSet": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "FromAddress": {
+                            "type": "string"
+                        },
+                        "Identity": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "FromAddress",
+                        "Identity"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::EmailChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::EmailTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DefaultSubstitutions": {
+                            "type": "string"
+                        },
+                        "HtmlPart": {
+                            "type": "string"
+                        },
+                        "Subject": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TemplateDescription": {
+                            "type": "string"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        },
+                        "TextPart": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Subject",
+                        "TemplateName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::EmailTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::EventStream": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DestinationStreamArn": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "DestinationStreamArn",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::EventStream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::GCMChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiKey": {
+                            "type": "string"
+                        },
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ApiKey",
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::GCMChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Content": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.InAppMessageContent"
+                            },
+                            "type": "array"
+                        },
+                        "CustomConfig": {
+                            "type": "object"
+                        },
+                        "Layout": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TemplateDescription": {
+                            "type": "string"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TemplateName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::InAppTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.BodyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.ButtonConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Android": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.OverrideButtonConfiguration"
+                },
+                "DefaultConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.DefaultButtonConfiguration"
+                },
+                "IOS": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.OverrideButtonConfiguration"
+                },
+                "Web": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.OverrideButtonConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.DefaultButtonConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BorderRadius": {
+                    "type": "number"
+                },
+                "ButtonAction": {
+                    "type": "string"
+                },
+                "Link": {
+                    "type": "string"
+                },
+                "Text": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.HeaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "Header": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.InAppMessageContent": {
+            "additionalProperties": false,
+            "properties": {
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BodyConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.BodyConfig"
+                },
+                "HeaderConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.HeaderConfig"
+                },
+                "ImageUrl": {
+                    "type": "string"
+                },
+                "PrimaryBtn": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.ButtonConfig"
+                },
+                "SecondaryBtn": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.ButtonConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.OverrideButtonConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ButtonAction": {
+                    "type": "string"
+                },
+                "Link": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::PushTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ADM": {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate.AndroidPushNotificationTemplate"
+                        },
+                        "APNS": {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate.APNSPushNotificationTemplate"
+                        },
+                        "Baidu": {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate.AndroidPushNotificationTemplate"
+                        },
+                        "Default": {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate.DefaultPushNotificationTemplate"
+                        },
+                        "DefaultSubstitutions": {
+                            "type": "string"
+                        },
+                        "GCM": {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate.AndroidPushNotificationTemplate"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TemplateDescription": {
+                            "type": "string"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TemplateName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::PushTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::PushTemplate.APNSPushNotificationTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "MediaUrl": {
+                    "type": "string"
+                },
+                "Sound": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::PushTemplate.AndroidPushNotificationTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "ImageIconUrl": {
+                    "type": "string"
+                },
+                "ImageUrl": {
+                    "type": "string"
+                },
+                "SmallImageIconUrl": {
+                    "type": "string"
+                },
+                "Sound": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::PushTemplate.DefaultPushNotificationTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "Sound": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::SMSChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "SenderId": {
+                            "type": "string"
+                        },
+                        "ShortCode": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::SMSChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Dimensions": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Segment.SegmentDimensions"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SegmentGroups": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Segment.SegmentGroups"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::Segment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.AttributeDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeType": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Behavior": {
+            "additionalProperties": false,
+            "properties": {
+                "Recency": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.Recency"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Coordinates": {
+            "additionalProperties": false,
+            "properties": {
+                "Latitude": {
+                    "type": "number"
+                },
+                "Longitude": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Latitude",
+                "Longitude"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Demographic": {
+            "additionalProperties": false,
+            "properties": {
+                "AppVersion": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "Channel": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "DeviceType": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "Make": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "Model": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "Platform": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.GPSPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "Coordinates": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.Coordinates"
+                },
+                "RangeInKilometers": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Coordinates",
+                "RangeInKilometers"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Groups": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pinpoint::Segment.SegmentDimensions"
+                    },
+                    "type": "array"
+                },
+                "SourceSegments": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pinpoint::Segment.SourceSegments"
+                    },
+                    "type": "array"
+                },
+                "SourceType": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Country": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "GPSPoint": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.GPSPoint"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Recency": {
+            "additionalProperties": false,
+            "properties": {
+                "Duration": {
+                    "type": "string"
+                },
+                "RecencyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Duration",
+                "RecencyType"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.SegmentDimensions": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "type": "object"
+                },
+                "Behavior": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.Behavior"
+                },
+                "Demographic": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.Demographic"
+                },
+                "Location": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.Location"
+                },
+                "Metrics": {
+                    "type": "object"
+                },
+                "UserAttributes": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.SegmentGroups": {
+            "additionalProperties": false,
+            "properties": {
+                "Groups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pinpoint::Segment.Groups"
+                    },
+                    "type": "array"
+                },
+                "Include": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.SetDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionType": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.SourceSegments": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::SmsTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Body": {
+                            "type": "string"
+                        },
+                        "DefaultSubstitutions": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TemplateDescription": {
+                            "type": "string"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Body",
+                        "TemplateName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::SmsTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::VoiceChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::VoiceChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeliveryOptions": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet.DeliveryOptions"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ReputationOptions": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet.ReputationOptions"
+                        },
+                        "SendingOptions": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet.SendingOptions"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet.Tags"
+                            },
+                            "type": "array"
+                        },
+                        "TrackingOptions": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet.TrackingOptions"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PinpointEmail::ConfigurationSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet.DeliveryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "SendingPoolName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet.ReputationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "ReputationMetricsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet.SendingOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "SendingEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet.TrackingOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomRedirectDomain": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigurationSetName": {
+                            "type": "string"
+                        },
+                        "EventDestination": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.EventDestination"
+                        },
+                        "EventDestinationName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationSetName",
+                        "EventDestinationName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PinpointEmail::ConfigurationSetEventDestination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.CloudWatchDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.DimensionConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.DimensionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultDimensionValue": {
+                    "type": "string"
+                },
+                "DimensionName": {
+                    "type": "string"
+                },
+                "DimensionValueSource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DefaultDimensionValue",
+                "DimensionName",
+                "DimensionValueSource"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.EventDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchDestination": {
+                    "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.CloudWatchDestination"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "KinesisFirehoseDestination": {
+                    "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.KinesisFirehoseDestination"
+                },
+                "MatchingEventTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PinpointDestination": {
+                    "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.PinpointDestination"
+                },
+                "SnsDestination": {
+                    "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.SnsDestination"
+                }
+            },
+            "required": [
+                "MatchingEventTypes"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.KinesisFirehoseDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStreamArn": {
+                    "type": "string"
+                },
+                "IamRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStreamArn",
+                "IamRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.PinpointDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.SnsDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::DedicatedIpPool": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PoolName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::PinpointEmail::DedicatedIpPool.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PinpointEmail::DedicatedIpPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::DedicatedIpPool.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::Identity": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DkimSigningEnabled": {
+                            "type": "boolean"
+                        },
+                        "FeedbackForwardingEnabled": {
+                            "type": "boolean"
+                        },
+                        "MailFromAttributes": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::Identity.MailFromAttributes"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::PinpointEmail::Identity.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PinpointEmail::Identity"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::Identity.MailFromAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "BehaviorOnMxFailure": {
+                    "type": "string"
+                },
+                "MailFromDomain": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::Identity.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QLDB::Ledger": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "KmsKey": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PermissionsMode": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PermissionsMode"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QLDB::Ledger"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QLDB::Stream": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExclusiveEndTime": {
+                            "type": "string"
+                        },
+                        "InclusiveStartTime": {
+                            "type": "string"
+                        },
+                        "KinesisConfiguration": {
+                            "$ref": "#/definitions/AWS::QLDB::Stream.KinesisConfiguration"
+                        },
+                        "LedgerName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StreamName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InclusiveStartTime",
+                        "KinesisConfiguration",
+                        "LedgerName",
+                        "RoleArn",
+                        "StreamName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QLDB::Stream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QLDB::Stream.KinesisConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregationEnabled": {
+                    "type": "boolean"
+                },
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AnalysisId": {
+                            "type": "string"
+                        },
+                        "AwsAccountId": {
+                            "type": "string"
+                        },
+                        "Errors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Analysis.AnalysisError"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "$ref": "#/definitions/AWS::QuickSight::Analysis.Parameters"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Analysis.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SourceEntity": {
+                            "$ref": "#/definitions/AWS::QuickSight::Analysis.AnalysisSourceEntity"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThemeArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AnalysisId",
+                        "AwsAccountId",
+                        "SourceEntity"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Analysis"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.AnalysisError": {
+            "additionalProperties": false,
+            "properties": {
+                "Message": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.AnalysisSourceEntity": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceTemplate": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.AnalysisSourceTemplate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.AnalysisSourceTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "DataSetReferences": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DataSetReference"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn",
+                "DataSetReferences"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.DataSetReference": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSetArn": {
+                    "type": "string"
+                },
+                "DataSetPlaceholder": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSetArn",
+                "DataSetPlaceholder"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.DateTimeParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.DecimalParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.IntegerParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.Parameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DateTimeParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DateTimeParameter"
+                    },
+                    "type": "array"
+                },
+                "DecimalParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DecimalParameter"
+                    },
+                    "type": "array"
+                },
+                "IntegerParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.IntegerParameter"
+                    },
+                    "type": "array"
+                },
+                "StringParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.StringParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.Sheet": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SheetId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.StringParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DashboardId": {
+                            "type": "string"
+                        },
+                        "DashboardPublishOptions": {
+                            "$ref": "#/definitions/AWS::QuickSight::Dashboard.DashboardPublishOptions"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "$ref": "#/definitions/AWS::QuickSight::Dashboard.Parameters"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Dashboard.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SourceEntity": {
+                            "$ref": "#/definitions/AWS::QuickSight::Dashboard.DashboardSourceEntity"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThemeArn": {
+                            "type": "string"
+                        },
+                        "VersionDescription": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AwsAccountId",
+                        "DashboardId",
+                        "SourceEntity"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Dashboard"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.AdHocFilteringOption": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityStatus": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DashboardPublishOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "AdHocFilteringOption": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.AdHocFilteringOption"
+                },
+                "ExportToCSVOption": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ExportToCSVOption"
+                },
+                "SheetControlsOption": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.SheetControlsOption"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DashboardSourceEntity": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceTemplate": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.DashboardSourceTemplate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DashboardSourceTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "DataSetReferences": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DataSetReference"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn",
+                "DataSetReferences"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DataSetReference": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSetArn": {
+                    "type": "string"
+                },
+                "DataSetPlaceholder": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSetArn",
+                "DataSetPlaceholder"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DateTimeParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DecimalParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.ExportToCSVOption": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityStatus": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.IntegerParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.Parameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DateTimeParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DateTimeParameter"
+                    },
+                    "type": "array"
+                },
+                "DecimalParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DecimalParameter"
+                    },
+                    "type": "array"
+                },
+                "IntegerParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.IntegerParameter"
+                    },
+                    "type": "array"
+                },
+                "StringParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.StringParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.SheetControlsOption": {
+            "additionalProperties": false,
+            "properties": {
+                "VisibilityState": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.StringParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ColumnGroups": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::DataSet.ColumnGroup"
+                            },
+                            "type": "array"
+                        },
+                        "ColumnLevelPermissionRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::DataSet.ColumnLevelPermissionRule"
+                            },
+                            "type": "array"
+                        },
+                        "DataSetId": {
+                            "type": "string"
+                        },
+                        "FieldFolders": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::QuickSight::DataSet.FieldFolder"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ImportMode": {
+                            "type": "string"
+                        },
+                        "IngestionWaitPolicy": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSet.IngestionWaitPolicy"
+                        },
+                        "LogicalTableMap": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::QuickSight::DataSet.LogicalTable"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::DataSet.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "PhysicalTableMap": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::QuickSight::DataSet.PhysicalTable"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "RowLevelPermissionDataSet": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSet.RowLevelPermissionDataSet"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::DataSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.CalculatedColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnId": {
+                    "type": "string"
+                },
+                "ColumnName": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnId",
+                "ColumnName",
+                "Expression"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.CastColumnTypeOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                },
+                "NewColumnType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "NewColumnType"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ColumnDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ColumnGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "GeoSpatialColumnGroup": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.GeoSpatialColumnGroup"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ColumnLevelPermissionRule": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principals": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ColumnTag": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnDescription": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.ColumnDescription"
+                },
+                "ColumnGeographicRole": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.CreateColumnsOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.CalculatedColumn"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Columns"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.CustomSql": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.InputColumn"
+                    },
+                    "type": "array"
+                },
+                "DataSourceArn": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SqlQuery": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Columns",
+                "DataSourceArn",
+                "Name",
+                "SqlQuery"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.FieldFolder": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Description": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.FilterOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ConditionExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConditionExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.GeoSpatialColumnGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CountryCode": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Columns",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.IngestionWaitPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "IngestionWaitTimeInHours": {
+                    "type": "number"
+                },
+                "WaitForSpiceIngestion": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.InputColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.JoinInstruction": {
+            "additionalProperties": false,
+            "properties": {
+                "LeftJoinKeyProperties": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.JoinKeyProperties"
+                },
+                "LeftOperand": {
+                    "type": "string"
+                },
+                "OnClause": {
+                    "type": "string"
+                },
+                "RightJoinKeyProperties": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.JoinKeyProperties"
+                },
+                "RightOperand": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LeftOperand",
+                "OnClause",
+                "RightOperand",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.JoinKeyProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "UniqueKey": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.LogicalTable": {
+            "additionalProperties": false,
+            "properties": {
+                "Alias": {
+                    "type": "string"
+                },
+                "DataTransforms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.TransformOperation"
+                    },
+                    "type": "array"
+                },
+                "Source": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.LogicalTableSource"
+                }
+            },
+            "required": [
+                "Alias",
+                "Source"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.LogicalTableSource": {
+            "additionalProperties": false,
+            "properties": {
+                "JoinInstruction": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.JoinInstruction"
+                },
+                "PhysicalTableId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.OutputColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.PhysicalTable": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomSql": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.CustomSql"
+                },
+                "RelationalTable": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.RelationalTable"
+                },
+                "S3Source": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.S3Source"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ProjectOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ProjectedColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ProjectedColumns"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.RelationalTable": {
+            "additionalProperties": false,
+            "properties": {
+                "Catalog": {
+                    "type": "string"
+                },
+                "DataSourceArn": {
+                    "type": "string"
+                },
+                "InputColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.InputColumn"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Schema": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceArn",
+                "InputColumns",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.RenameColumnOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "NewColumnName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "NewColumnName"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.RowLevelPermissionDataSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "FormatVersion": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "PermissionPolicy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn",
+                "PermissionPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.S3Source": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceArn": {
+                    "type": "string"
+                },
+                "InputColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.InputColumn"
+                    },
+                    "type": "array"
+                },
+                "UploadSettings": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.UploadSettings"
+                }
+            },
+            "required": [
+                "DataSourceArn",
+                "InputColumns"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.TagColumnOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.ColumnTag"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "Tags"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.TransformOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "CastColumnTypeOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.CastColumnTypeOperation"
+                },
+                "CreateColumnsOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.CreateColumnsOperation"
+                },
+                "FilterOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.FilterOperation"
+                },
+                "ProjectOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.ProjectOperation"
+                },
+                "RenameColumnOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.RenameColumnOperation"
+                },
+                "TagColumnOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.TagColumnOperation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.UploadSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainsHeader": {
+                    "type": "boolean"
+                },
+                "Delimiter": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                },
+                "StartFromRow": {
+                    "type": "number"
+                },
+                "TextQualifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AlternateDataSourceParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::DataSource.DataSourceParameters"
+                            },
+                            "type": "array"
+                        },
+                        "AwsAccountId": {
+                            "type": "string"
+                        },
+                        "Credentials": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource.DataSourceCredentials"
+                        },
+                        "DataSourceId": {
+                            "type": "string"
+                        },
+                        "DataSourceParameters": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource.DataSourceParameters"
+                        },
+                        "ErrorInfo": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource.DataSourceErrorInfo"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::DataSource.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SslProperties": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource.SslProperties"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "VpcConnectionProperties": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource.VpcConnectionProperties"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::DataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.AmazonElasticsearchParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Domain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Domain"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.AmazonOpenSearchParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Domain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Domain"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.AthenaParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "WorkGroup": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.AuroraParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.AuroraPostgreSqlParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.CredentialPair": {
+            "additionalProperties": false,
+            "properties": {
+                "AlternateDataSourceParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSource.DataSourceParameters"
+                    },
+                    "type": "array"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.DataSourceCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "CopySourceArn": {
+                    "type": "string"
+                },
+                "CredentialPair": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.CredentialPair"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.DataSourceErrorInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Message": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.DataSourceParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "AmazonElasticsearchParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.AmazonElasticsearchParameters"
+                },
+                "AmazonOpenSearchParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.AmazonOpenSearchParameters"
+                },
+                "AthenaParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.AthenaParameters"
+                },
+                "AuroraParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.AuroraParameters"
+                },
+                "AuroraPostgreSqlParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.AuroraPostgreSqlParameters"
+                },
+                "MariaDbParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.MariaDbParameters"
+                },
+                "MySqlParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.MySqlParameters"
+                },
+                "OracleParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.OracleParameters"
+                },
+                "PostgreSqlParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.PostgreSqlParameters"
+                },
+                "PrestoParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.PrestoParameters"
+                },
+                "RdsParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.RdsParameters"
+                },
+                "RedshiftParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.RedshiftParameters"
+                },
+                "S3Parameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.S3Parameters"
+                },
+                "SnowflakeParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.SnowflakeParameters"
+                },
+                "SparkParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.SparkParameters"
+                },
+                "SqlServerParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.SqlServerParameters"
+                },
+                "TeradataParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.TeradataParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.ManifestFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.MariaDbParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.MySqlParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.OracleParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.PostgreSqlParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.PrestoParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Catalog": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Catalog",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.RdsParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "InstanceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Database",
+                "InstanceId"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.RedshiftParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterId": {
+                    "type": "string"
+                },
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.S3Parameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ManifestFileLocation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.ManifestFileLocation"
+                }
+            },
+            "required": [
+                "ManifestFileLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.SnowflakeParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Warehouse": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Warehouse"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.SparkParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.SqlServerParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.SslProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DisableSsl": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.TeradataParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.VpcConnectionProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "VpcConnectionArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VpcConnectionArn"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Template.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SourceEntity": {
+                            "$ref": "#/definitions/AWS::QuickSight::Template.TemplateSourceEntity"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateId": {
+                            "type": "string"
+                        },
+                        "VersionDescription": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AwsAccountId",
+                        "SourceEntity",
+                        "TemplateId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Template"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.DataSetReference": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSetArn": {
+                    "type": "string"
+                },
+                "DataSetPlaceholder": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSetArn",
+                "DataSetPlaceholder"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.TemplateSourceAnalysis": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "DataSetReferences": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DataSetReference"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn",
+                "DataSetReferences"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.TemplateSourceEntity": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceAnalysis": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.TemplateSourceAnalysis"
+                },
+                "SourceTemplate": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.TemplateSourceTemplate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.TemplateSourceTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "BaseThemeId": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::QuickSight::Theme.ThemeConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Theme.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThemeId": {
+                            "type": "string"
+                        },
+                        "VersionDescription": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AwsAccountId",
+                        "ThemeId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Theme"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.BorderStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Show": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.DataColorPalette": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EmptyFillColor": {
+                    "type": "string"
+                },
+                "MinMaxGradient": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.Font": {
+            "additionalProperties": false,
+            "properties": {
+                "FontFamily": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.GutterStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Show": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.MarginStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Show": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.SheetStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Tile": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.TileStyle"
+                },
+                "TileLayout": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.TileLayoutStyle"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.ThemeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DataColorPalette": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.DataColorPalette"
+                },
+                "Sheet": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.SheetStyle"
+                },
+                "Typography": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.Typography"
+                },
+                "UIColorPalette": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.UIColorPalette"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.TileLayoutStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Gutter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.GutterStyle"
+                },
+                "Margin": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.MarginStyle"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.TileStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Border": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.BorderStyle"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.Typography": {
+            "additionalProperties": false,
+            "properties": {
+                "FontFamilies": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Theme.Font"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.UIColorPalette": {
+            "additionalProperties": false,
+            "properties": {
+                "Accent": {
+                    "type": "string"
+                },
+                "AccentForeground": {
+                    "type": "string"
+                },
+                "Danger": {
+                    "type": "string"
+                },
+                "DangerForeground": {
+                    "type": "string"
+                },
+                "Dimension": {
+                    "type": "string"
+                },
+                "DimensionForeground": {
+                    "type": "string"
+                },
+                "Measure": {
+                    "type": "string"
+                },
+                "MeasureForeground": {
+                    "type": "string"
+                },
+                "PrimaryBackground": {
+                    "type": "string"
+                },
+                "PrimaryForeground": {
+                    "type": "string"
+                },
+                "SecondaryBackground": {
+                    "type": "string"
+                },
+                "SecondaryForeground": {
+                    "type": "string"
+                },
+                "Success": {
+                    "type": "string"
+                },
+                "SuccessForeground": {
+                    "type": "string"
+                },
+                "Warning": {
+                    "type": "string"
+                },
+                "WarningForeground": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RAM::ResourceShare": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowExternalPrincipals": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PermissionArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Principals": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ResourceArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RAM::ResourceShare"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatedRoles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBCluster.DBClusterRole"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BacktrackWindow": {
+                            "type": "number"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "CopyTagsToSnapshot": {
+                            "type": "boolean"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EnableHttpEndpoint": {
+                            "type": "boolean"
+                        },
+                        "EnableIAMDatabaseAuthentication": {
+                            "type": "boolean"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineMode": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "GlobalClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MasterUserPassword": {
+                            "type": "string"
+                        },
+                        "MasterUsername": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "ReplicationSourceIdentifier": {
+                            "type": "string"
+                        },
+                        "RestoreType": {
+                            "type": "string"
+                        },
+                        "ScalingConfiguration": {
+                            "$ref": "#/definitions/AWS::RDS::DBCluster.ScalingConfiguration"
+                        },
+                        "SnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceDBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceRegion": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UseLatestRestorableTime": {
+                            "type": "boolean"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Engine"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBCluster.DBClusterRole": {
+            "additionalProperties": false,
+            "properties": {
+                "FeatureName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBCluster.ScalingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoPause": {
+                    "type": "boolean"
+                },
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                },
+                "SecondsUntilAutoPause": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBClusterParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "Family",
+                        "Parameters"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBClusterParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocatedStorage": {
+                            "type": "string"
+                        },
+                        "AllowMajorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AssociatedRoles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBInstance.DBInstanceRole"
+                            },
+                            "type": "array"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "CACertificateIdentifier": {
+                            "type": "string"
+                        },
+                        "CharacterSetName": {
+                            "type": "string"
+                        },
+                        "CopyTagsToSnapshot": {
+                            "type": "boolean"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBInstanceClass": {
+                            "type": "string"
+                        },
+                        "DBInstanceIdentifier": {
+                            "type": "string"
+                        },
+                        "DBName": {
+                            "type": "string"
+                        },
+                        "DBParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DBSnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DeleteAutomatedBackups": {
+                            "type": "boolean"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "DomainIAMRoleName": {
+                            "type": "string"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EnableIAMDatabaseAuthentication": {
+                            "type": "boolean"
+                        },
+                        "EnablePerformanceInsights": {
+                            "type": "boolean"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "Iops": {
+                            "type": "number"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LicenseModel": {
+                            "type": "string"
+                        },
+                        "MasterUserPassword": {
+                            "type": "string"
+                        },
+                        "MasterUsername": {
+                            "type": "string"
+                        },
+                        "MaxAllocatedStorage": {
+                            "type": "number"
+                        },
+                        "MonitoringInterval": {
+                            "type": "number"
+                        },
+                        "MonitoringRoleArn": {
+                            "type": "string"
+                        },
+                        "MultiAZ": {
+                            "type": "boolean"
+                        },
+                        "OptionGroupName": {
+                            "type": "string"
+                        },
+                        "PerformanceInsightsKMSKeyId": {
+                            "type": "string"
+                        },
+                        "PerformanceInsightsRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "Port": {
+                            "type": "string"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "ProcessorFeatures": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBInstance.ProcessorFeature"
+                            },
+                            "type": "array"
+                        },
+                        "PromotionTier": {
+                            "type": "number"
+                        },
+                        "PubliclyAccessible": {
+                            "type": "boolean"
+                        },
+                        "SourceDBInstanceIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceRegion": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        },
+                        "StorageType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Timezone": {
+                            "type": "string"
+                        },
+                        "UseDefaultProcessorFeatures": {
+                            "type": "boolean"
+                        },
+                        "VPCSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBInstanceClass"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBInstance.DBInstanceRole": {
+            "additionalProperties": false,
+            "properties": {
+                "FeatureName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FeatureName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBInstance.ProcessorFeature": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "Family"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBProxy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Auth": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBProxy.AuthFormat"
+                            },
+                            "type": "array"
+                        },
+                        "DBProxyName": {
+                            "type": "string"
+                        },
+                        "DebugLogging": {
+                            "type": "boolean"
+                        },
+                        "EngineFamily": {
+                            "type": "string"
+                        },
+                        "IdleClientTimeout": {
+                            "type": "number"
+                        },
+                        "RequireTLS": {
+                            "type": "boolean"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBProxy.TagFormat"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Auth",
+                        "DBProxyName",
+                        "EngineFamily",
+                        "RoleArn",
+                        "VpcSubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBProxy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBProxy.AuthFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthScheme": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "IAMAuth": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "UserName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBProxy.TagFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBProxyEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DBProxyEndpointName": {
+                            "type": "string"
+                        },
+                        "DBProxyName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBProxyEndpoint.TagFormat"
+                            },
+                            "type": "array"
+                        },
+                        "TargetRole": {
+                            "type": "string"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBProxyEndpointName",
+                        "DBProxyName",
+                        "VpcSubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBProxyEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBProxyEndpoint.TagFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBProxyTargetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionPoolConfigurationInfo": {
+                            "$ref": "#/definitions/AWS::RDS::DBProxyTargetGroup.ConnectionPoolConfigurationInfoFormat"
+                        },
+                        "DBClusterIdentifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DBInstanceIdentifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DBProxyName": {
+                            "type": "string"
+                        },
+                        "TargetGroupName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DBProxyName",
+                        "TargetGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBProxyTargetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBProxyTargetGroup.ConnectionPoolConfigurationInfoFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionBorrowTimeout": {
+                    "type": "number"
+                },
+                "InitQuery": {
+                    "type": "string"
+                },
+                "MaxConnectionsPercent": {
+                    "type": "number"
+                },
+                "MaxIdleConnectionsPercent": {
+                    "type": "number"
+                },
+                "SessionPinningFilters": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBSecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DBSecurityGroupIngress": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBSecurityGroup.Ingress"
+                            },
+                            "type": "array"
+                        },
+                        "EC2VpcId": {
+                            "type": "string"
+                        },
+                        "GroupDescription": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBSecurityGroupIngress",
+                        "GroupDescription"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBSecurityGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBSecurityGroup.Ingress": {
+            "additionalProperties": false,
+            "properties": {
+                "CIDRIP": {
+                    "type": "string"
+                },
+                "EC2SecurityGroupId": {
+                    "type": "string"
+                },
+                "EC2SecurityGroupName": {
+                    "type": "string"
+                },
+                "EC2SecurityGroupOwnerId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBSecurityGroupIngress": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CIDRIP": {
+                            "type": "string"
+                        },
+                        "DBSecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupId": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupOwnerId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DBSecurityGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBSecurityGroupIngress"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBSubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DBSubnetGroupDescription": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBSubnetGroupDescription",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBSubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::EventSubscription": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "EventCategories": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SourceIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SourceType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SnsTopicArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::EventSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::GlobalCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "GlobalClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceDBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::GlobalCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::OptionGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EngineName": {
+                            "type": "string"
+                        },
+                        "MajorEngineVersion": {
+                            "type": "string"
+                        },
+                        "OptionConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::OptionGroup.OptionConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "OptionGroupDescription": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EngineName",
+                        "MajorEngineVersion",
+                        "OptionConfigurations",
+                        "OptionGroupDescription"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::OptionGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::OptionGroup.OptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DBSecurityGroupMemberships": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OptionName": {
+                    "type": "string"
+                },
+                "OptionSettings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::RDS::OptionGroup.OptionSetting"
+                    },
+                    "type": "array"
+                },
+                "OptionVersion": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "VpcSecurityGroupMemberships": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "OptionName"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::OptionGroup.OptionSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RUM::AppMonitor": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppMonitorConfiguration": {
+                            "$ref": "#/definitions/AWS::RUM::AppMonitor.AppMonitorConfiguration"
+                        },
+                        "CwLogEnabled": {
+                            "type": "boolean"
+                        },
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RUM::AppMonitor"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::RUM::AppMonitor.AppMonitorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowCookies": {
+                    "type": "boolean"
+                },
+                "EnableXRay": {
+                    "type": "boolean"
+                },
+                "ExcludedPages": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FavoritePages": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "GuestRoleArn": {
+                    "type": "string"
+                },
+                "IdentityPoolId": {
+                    "type": "string"
+                },
+                "IncludedPages": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SessionSampleRate": {
+                    "type": "number"
+                },
+                "Telemetries": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Redshift::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AquaConfigurationStatus": {
+                            "type": "string"
+                        },
+                        "AutomatedSnapshotRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "AvailabilityZoneRelocation": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZoneRelocationStatus": {
+                            "type": "string"
+                        },
+                        "Classic": {
+                            "type": "boolean"
+                        },
+                        "ClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "ClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "ClusterSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ClusterSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "ClusterType": {
+                            "type": "string"
+                        },
+                        "ClusterVersion": {
+                            "type": "string"
+                        },
+                        "DBName": {
+                            "type": "string"
+                        },
+                        "DeferMaintenance": {
+                            "type": "boolean"
+                        },
+                        "DeferMaintenanceDuration": {
+                            "type": "number"
+                        },
+                        "DeferMaintenanceEndTime": {
+                            "type": "string"
+                        },
+                        "DeferMaintenanceStartTime": {
+                            "type": "string"
+                        },
+                        "DestinationRegion": {
+                            "type": "string"
+                        },
+                        "ElasticIp": {
+                            "type": "string"
+                        },
+                        "Encrypted": {
+                            "type": "boolean"
+                        },
+                        "EnhancedVpcRouting": {
+                            "type": "boolean"
+                        },
+                        "HsmClientCertificateIdentifier": {
+                            "type": "string"
+                        },
+                        "HsmConfigurationIdentifier": {
+                            "type": "string"
+                        },
+                        "IamRoles": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LoggingProperties": {
+                            "$ref": "#/definitions/AWS::Redshift::Cluster.LoggingProperties"
+                        },
+                        "MaintenanceTrackName": {
+                            "type": "string"
+                        },
+                        "ManualSnapshotRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "MasterUserPassword": {
+                            "type": "string"
+                        },
+                        "MasterUsername": {
+                            "type": "string"
+                        },
+                        "NodeType": {
+                            "type": "string"
+                        },
+                        "NumberOfNodes": {
+                            "type": "number"
+                        },
+                        "OwnerAccount": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "PubliclyAccessible": {
+                            "type": "boolean"
+                        },
+                        "ResourceAction": {
+                            "type": "string"
+                        },
+                        "RevisionTarget": {
+                            "type": "string"
+                        },
+                        "RotateEncryptionKey": {
+                            "type": "boolean"
+                        },
+                        "SnapshotClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "SnapshotCopyGrantName": {
+                            "type": "string"
+                        },
+                        "SnapshotCopyManual": {
+                            "type": "boolean"
+                        },
+                        "SnapshotCopyRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "SnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ClusterType",
+                        "DBName",
+                        "MasterUserPassword",
+                        "MasterUsername",
+                        "NodeType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::Cluster.Endpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Redshift::Cluster.LoggingProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "S3KeyPrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ClusterParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ParameterGroupFamily": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Redshift::ClusterParameterGroup.Parameter"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "ParameterGroupFamily"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::ClusterParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ClusterParameterGroup.Parameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ParameterName",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ClusterSecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::ClusterSecurityGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ClusterSecurityGroupIngress": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CIDRIP": {
+                            "type": "string"
+                        },
+                        "ClusterSecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupOwnerId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClusterSecurityGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::ClusterSecurityGroupIngress"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ClusterSubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::ClusterSubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::EndpointAccess": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "EndpointName": {
+                            "type": "string"
+                        },
+                        "ResourceOwner": {
+                            "type": "string"
+                        },
+                        "SubnetGroupName": {
+                            "type": "string"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EndpointName",
+                        "VpcSecurityGroupIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::EndpointAccess"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::EndpointAccess.VpcSecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                },
+                "VpcSecurityGroupId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Redshift::EndpointAuthorization": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Account": {
+                            "type": "string"
+                        },
+                        "ClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "Force": {
+                            "type": "boolean"
+                        },
+                        "VpcIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Account",
+                        "ClusterIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::EndpointAuthorization"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::EventSubscription": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "EventCategories": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Severity": {
+                            "type": "string"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SourceIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SourceType": {
+                            "type": "string"
+                        },
+                        "SubscriptionName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubscriptionName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::EventSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ScheduledAction": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Enable": {
+                            "type": "boolean"
+                        },
+                        "EndTime": {
+                            "type": "string"
+                        },
+                        "IamRole": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "type": "string"
+                        },
+                        "ScheduledActionDescription": {
+                            "type": "string"
+                        },
+                        "ScheduledActionName": {
+                            "type": "string"
+                        },
+                        "StartTime": {
+                            "type": "string"
+                        },
+                        "TargetAction": {
+                            "$ref": "#/definitions/AWS::Redshift::ScheduledAction.ScheduledActionType"
+                        }
+                    },
+                    "required": [
+                        "ScheduledActionName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::ScheduledAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ScheduledAction.PauseClusterMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClusterIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ScheduledAction.ResizeClusterMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "Classic": {
+                    "type": "boolean"
+                },
+                "ClusterIdentifier": {
+                    "type": "string"
+                },
+                "ClusterType": {
+                    "type": "string"
+                },
+                "NodeType": {
+                    "type": "string"
+                },
+                "NumberOfNodes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ClusterIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ScheduledAction.ResumeClusterMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClusterIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ScheduledAction.ScheduledActionType": {
+            "additionalProperties": false,
+            "properties": {
+                "PauseCluster": {
+                    "$ref": "#/definitions/AWS::Redshift::ScheduledAction.PauseClusterMessage"
+                },
+                "ResizeCluster": {
+                    "$ref": "#/definitions/AWS::Redshift::ScheduledAction.ResizeClusterMessage"
+                },
+                "ResumeCluster": {
+                    "$ref": "#/definitions/AWS::Redshift::ScheduledAction.ResumeClusterMessage"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiGatewayProxy": {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Application.ApiGatewayProxyInput"
+                        },
+                        "EnvironmentIdentifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ProxyType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RefactorSpaces::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Application.ApiGatewayProxyInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointType": {
+                    "type": "string"
+                },
+                "StageName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "NetworkFabricType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RefactorSpaces::Environment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Route": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationIdentifier": {
+                            "type": "string"
+                        },
+                        "EnvironmentIdentifier": {
+                            "type": "string"
+                        },
+                        "RouteType": {
+                            "type": "string"
+                        },
+                        "ServiceIdentifier": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UriPathRoute": {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Route.UriPathRouteInput"
+                        }
+                    },
+                    "required": [
+                        "ApplicationIdentifier",
+                        "EnvironmentIdentifier",
+                        "ServiceIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RefactorSpaces::Route"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Route.UriPathRouteInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ActivationState": {
+                    "type": "string"
+                },
+                "IncludeChildPaths": {
+                    "type": "boolean"
+                },
+                "Methods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActivationState"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Service": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationIdentifier": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EndpointType": {
+                            "type": "string"
+                        },
+                        "EnvironmentIdentifier": {
+                            "type": "string"
+                        },
+                        "LambdaEndpoint": {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Service.LambdaEndpointInput"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UrlEndpoint": {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Service.UrlEndpointInput"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationIdentifier",
+                        "EnvironmentIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RefactorSpaces::Service"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Service.LambdaEndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Service.UrlEndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "HealthUrl": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::Rekognition::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ProjectName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProjectName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Rekognition::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ResilienceHub::App": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppTemplateBody": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResiliencyPolicyArn": {
+                            "type": "string"
+                        },
+                        "ResourceMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ResilienceHub::App.ResourceMapping"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "AppTemplateBody",
+                        "Name",
+                        "ResourceMappings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ResilienceHub::App"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ResilienceHub::App.PhysicalResourceId": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsAccountId": {
+                    "type": "string"
+                },
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "Identifier": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Identifier",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ResilienceHub::App.ResourceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "LogicalStackName": {
+                    "type": "string"
+                },
+                "MappingType": {
+                    "type": "string"
+                },
+                "PhysicalResourceId": {
+                    "$ref": "#/definitions/AWS::ResilienceHub::App.PhysicalResourceId"
+                },
+                "ResourceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MappingType",
+                "PhysicalResourceId"
+            ],
+            "type": "object"
+        },
+        "AWS::ResilienceHub::ResiliencyPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataLocationConstraint": {
+                            "type": "string"
+                        },
+                        "Policy": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::ResilienceHub::ResiliencyPolicy.FailurePolicy"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "PolicyDescription": {
+                            "type": "string"
+                        },
+                        "PolicyName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tier": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Policy",
+                        "PolicyName",
+                        "Tier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ResilienceHub::ResiliencyPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ResilienceHub::ResiliencyPolicy.FailurePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "RpoInSecs": {
+                    "type": "number"
+                },
+                "RtoInSecs": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "RpoInSecs",
+                "RtoInSecs"
+            ],
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ResourceGroups::Group.ConfigurationItem"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResourceQuery": {
+                            "$ref": "#/definitions/AWS::ResourceGroups::Group.ResourceQuery"
+                        },
+                        "Resources": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ResourceGroups::Group"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group.ConfigurationItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ResourceGroups::Group.ConfigurationParameter"
+                    },
+                    "type": "array"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group.ConfigurationParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group.Query": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceTypeFilters": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StackIdentifier": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ResourceGroups::Group.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group.ResourceQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "Query": {
+                    "$ref": "#/definitions/AWS::ResourceGroups::Group.Query"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group.TagFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RoboMaker::Fleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::Fleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::Robot": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Architecture": {
+                            "type": "string"
+                        },
+                        "Fleet": {
+                            "type": "string"
+                        },
+                        "GreengrassGroupId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Architecture",
+                        "GreengrassGroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::Robot"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::RobotApplication": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CurrentRevisionId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RobotSoftwareSuite": {
+                            "$ref": "#/definitions/AWS::RoboMaker::RobotApplication.RobotSoftwareSuite"
+                        },
+                        "Sources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RoboMaker::RobotApplication.SourceConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "RobotSoftwareSuite",
+                        "Sources"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::RobotApplication"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::RobotApplication.RobotSoftwareSuite": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::RobotApplication.SourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Architecture": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Architecture",
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::RobotApplicationVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Application": {
+                            "type": "string"
+                        },
+                        "CurrentRevisionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Application"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::RobotApplicationVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplication": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CurrentRevisionId": {
+                            "type": "string"
+                        },
+                        "Environment": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RenderingEngine": {
+                            "$ref": "#/definitions/AWS::RoboMaker::SimulationApplication.RenderingEngine"
+                        },
+                        "RobotSoftwareSuite": {
+                            "$ref": "#/definitions/AWS::RoboMaker::SimulationApplication.RobotSoftwareSuite"
+                        },
+                        "SimulationSoftwareSuite": {
+                            "$ref": "#/definitions/AWS::RoboMaker::SimulationApplication.SimulationSoftwareSuite"
+                        },
+                        "Sources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RoboMaker::SimulationApplication.SourceConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "RobotSoftwareSuite",
+                        "SimulationSoftwareSuite"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::SimulationApplication"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplication.RenderingEngine": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplication.RobotSoftwareSuite": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplication.SimulationSoftwareSuite": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplication.SourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Architecture": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Architecture",
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplicationVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Application": {
+                            "type": "string"
+                        },
+                        "CurrentRevisionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Application"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::SimulationApplicationVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::DNSSEC": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HostedZoneId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "HostedZoneId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::DNSSEC"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HealthCheck": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HealthCheckConfig": {
+                            "type": "object"
+                        },
+                        "HealthCheckTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53::HealthCheck.HealthCheckTag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "HealthCheckConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::HealthCheck"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HealthCheck.HealthCheckTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HostedZone": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HostedZoneConfig": {
+                            "$ref": "#/definitions/AWS::Route53::HostedZone.HostedZoneConfig"
+                        },
+                        "HostedZoneTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53::HostedZone.HostedZoneTag"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QueryLoggingConfig": {
+                            "$ref": "#/definitions/AWS::Route53::HostedZone.QueryLoggingConfig"
+                        },
+                        "VPCs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53::HostedZone.VPC"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::HostedZone"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HostedZone.HostedZoneConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53::HostedZone.HostedZoneTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HostedZone.QueryLoggingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsLogGroupArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CloudWatchLogsLogGroupArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HostedZone.VPC": {
+            "additionalProperties": false,
+            "properties": {
+                "VPCId": {
+                    "type": "string"
+                },
+                "VPCRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VPCId",
+                "VPCRegion"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::KeySigningKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HostedZoneId": {
+                            "type": "string"
+                        },
+                        "KeyManagementServiceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "HostedZoneId",
+                        "KeyManagementServiceArn",
+                        "Name",
+                        "Status"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::KeySigningKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::RecordSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AliasTarget": {
+                            "$ref": "#/definitions/AWS::Route53::RecordSet.AliasTarget"
+                        },
+                        "Comment": {
+                            "type": "string"
+                        },
+                        "Failover": {
+                            "type": "string"
+                        },
+                        "GeoLocation": {
+                            "$ref": "#/definitions/AWS::Route53::RecordSet.GeoLocation"
+                        },
+                        "HealthCheckId": {
+                            "type": "string"
+                        },
+                        "HostedZoneId": {
+                            "type": "string"
+                        },
+                        "HostedZoneName": {
+                            "type": "string"
+                        },
+                        "MultiValueAnswer": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Region": {
+                            "type": "string"
+                        },
+                        "ResourceRecords": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SetIdentifier": {
+                            "type": "string"
+                        },
+                        "TTL": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Weight": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::RecordSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::RecordSet.AliasTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DNSName": {
+                    "type": "string"
+                },
+                "EvaluateTargetHealth": {
+                    "type": "boolean"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DNSName",
+                "HostedZoneId"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::RecordSet.GeoLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "ContinentCode": {
+                    "type": "string"
+                },
+                "CountryCode": {
+                    "type": "string"
+                },
+                "SubdivisionCode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53::RecordSetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Comment": {
+                            "type": "string"
+                        },
+                        "HostedZoneId": {
+                            "type": "string"
+                        },
+                        "HostedZoneName": {
+                            "type": "string"
+                        },
+                        "RecordSets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53::RecordSetGroup.RecordSet"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::RecordSetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::RecordSetGroup.AliasTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DNSName": {
+                    "type": "string"
+                },
+                "EvaluateTargetHealth": {
+                    "type": "boolean"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DNSName",
+                "HostedZoneId"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::RecordSetGroup.GeoLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "ContinentCode": {
+                    "type": "string"
+                },
+                "CountryCode": {
+                    "type": "string"
+                },
+                "SubdivisionCode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53::RecordSetGroup.RecordSet": {
+            "additionalProperties": false,
+            "properties": {
+                "AliasTarget": {
+                    "$ref": "#/definitions/AWS::Route53::RecordSetGroup.AliasTarget"
+                },
+                "Comment": {
+                    "type": "string"
+                },
+                "Failover": {
+                    "type": "string"
+                },
+                "GeoLocation": {
+                    "$ref": "#/definitions/AWS::Route53::RecordSetGroup.GeoLocation"
+                },
+                "HealthCheckId": {
+                    "type": "string"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                },
+                "HostedZoneName": {
+                    "type": "string"
+                },
+                "MultiValueAnswer": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "ResourceRecords": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SetIdentifier": {
+                    "type": "string"
+                },
+                "TTL": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::Route53RecoveryControl::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::Cluster.ClusterEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::ControlPanel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClusterArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryControl::ControlPanel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::RoutingControl": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClusterArn": {
+                            "type": "string"
+                        },
+                        "ControlPanelArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryControl::RoutingControl"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::SafetyRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssertionRule": {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::SafetyRule.AssertionRule"
+                        },
+                        "ControlPanelArn": {
+                            "type": "string"
+                        },
+                        "GatingRule": {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::SafetyRule.GatingRule"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RuleConfig": {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::SafetyRule.RuleConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ControlPanelArn",
+                        "Name",
+                        "RuleConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryControl::SafetyRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::SafetyRule.AssertionRule": {
+            "additionalProperties": false,
+            "properties": {
+                "AssertedControls": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "WaitPeriodMs": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AssertedControls",
+                "WaitPeriodMs"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::SafetyRule.GatingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "GatingControls": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TargetControls": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "WaitPeriodMs": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "GatingControls",
+                "TargetControls",
+                "WaitPeriodMs"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::SafetyRule.RuleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Inverted": {
+                    "type": "boolean"
+                },
+                "Threshold": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Inverted",
+                "Threshold",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::Cell": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CellName": {
+                            "type": "string"
+                        },
+                        "Cells": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CellName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryReadiness::Cell"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ReadinessCheck": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ReadinessCheckName": {
+                            "type": "string"
+                        },
+                        "ResourceSetName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ReadinessCheckName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryReadiness::ReadinessCheck"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::RecoveryGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Cells": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RecoveryGroupName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RecoveryGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryReadiness::RecoveryGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceSetName": {
+                            "type": "string"
+                        },
+                        "ResourceSetType": {
+                            "type": "string"
+                        },
+                        "Resources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet.Resource"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ResourceSetName",
+                        "ResourceSetType",
+                        "Resources"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryReadiness::ResourceSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet.DNSTargetResource": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                },
+                "HostedZoneArn": {
+                    "type": "string"
+                },
+                "RecordSetId": {
+                    "type": "string"
+                },
+                "RecordType": {
+                    "type": "string"
+                },
+                "TargetResource": {
+                    "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet.TargetResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet.NLBResource": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet.R53ResourceRecord": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                },
+                "RecordSetId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet.Resource": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentId": {
+                    "type": "string"
+                },
+                "DnsTargetResource": {
+                    "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet.DNSTargetResource"
+                },
+                "ReadinessScopes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ResourceArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet.TargetResource": {
+            "additionalProperties": false,
+            "properties": {
+                "NLBResource": {
+                    "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet.NLBResource"
+                },
+                "R53Resource": {
+                    "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet.R53ResourceRecord"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53Resolver::FirewallDomainList": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DomainFileUrl": {
+                            "type": "string"
+                        },
+                        "Domains": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::FirewallDomainList"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::FirewallRuleGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FirewallRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53Resolver::FirewallRuleGroup.FirewallRule"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::FirewallRuleGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::FirewallRuleGroup.FirewallRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "BlockOverrideDnsType": {
+                    "type": "string"
+                },
+                "BlockOverrideDomain": {
+                    "type": "string"
+                },
+                "BlockOverrideTtl": {
+                    "type": "number"
+                },
+                "BlockResponse": {
+                    "type": "string"
+                },
+                "FirewallDomainListId": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Action",
+                "FirewallDomainListId",
+                "Priority"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::FirewallRuleGroupAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FirewallRuleGroupId": {
+                            "type": "string"
+                        },
+                        "MutationProtection": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FirewallRuleGroupId",
+                        "Priority",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::FirewallRuleGroupAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutodefinedReverseFlag": {
+                            "type": "string"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutodefinedReverseFlag",
+                        "ResourceId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverDNSSECConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverDNSSECConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Direction": {
+                            "type": "string"
+                        },
+                        "IpAddresses": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53Resolver::ResolverEndpoint.IpAddressRequest"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Direction",
+                        "IpAddresses",
+                        "SecurityGroupIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverEndpoint.IpAddressRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Ip": {
+                    "type": "string"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubnetId"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverQueryLoggingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverQueryLoggingConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResolverQueryLogConfigId": {
+                            "type": "string"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResolverEndpointId": {
+                            "type": "string"
+                        },
+                        "RuleType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetIps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53Resolver::ResolverRule.TargetAddress"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DomainName",
+                        "RuleType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverRule.TargetAddress": {
+            "additionalProperties": false,
+            "properties": {
+                "Ip": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ip"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverRuleAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ResolverRuleId": {
+                            "type": "string"
+                        },
+                        "VPCId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResolverRuleId",
+                        "VPCId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverRuleAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::AccessPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Bucket": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Policy": {
+                            "type": "object"
+                        },
+                        "PolicyStatus": {
+                            "type": "object"
+                        },
+                        "PublicAccessBlockConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::AccessPoint.PublicAccessBlockConfiguration"
+                        },
+                        "VpcConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::AccessPoint.VpcConfiguration"
+                        }
+                    },
+                    "required": [
+                        "Bucket"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::AccessPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::AccessPoint.PublicAccessBlockConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockPublicAcls": {
+                    "type": "boolean"
+                },
+                "BlockPublicPolicy": {
+                    "type": "boolean"
+                },
+                "IgnorePublicAcls": {
+                    "type": "boolean"
+                },
+                "RestrictPublicBuckets": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::AccessPoint.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccelerateConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.AccelerateConfiguration"
+                        },
+                        "AccessControl": {
+                            "type": "string"
+                        },
+                        "AnalyticsConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::S3::Bucket.AnalyticsConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "BucketEncryption": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.BucketEncryption"
+                        },
+                        "BucketName": {
+                            "type": "string"
+                        },
+                        "CorsConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.CorsConfiguration"
+                        },
+                        "IntelligentTieringConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::S3::Bucket.IntelligentTieringConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "InventoryConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::S3::Bucket.InventoryConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "LifecycleConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.LifecycleConfiguration"
+                        },
+                        "LoggingConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.LoggingConfiguration"
+                        },
+                        "MetricsConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::S3::Bucket.MetricsConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "NotificationConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.NotificationConfiguration"
+                        },
+                        "ObjectLockConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.ObjectLockConfiguration"
+                        },
+                        "ObjectLockEnabled": {
+                            "type": "boolean"
+                        },
+                        "OwnershipControls": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.OwnershipControls"
+                        },
+                        "PublicAccessBlockConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.PublicAccessBlockConfiguration"
+                        },
+                        "ReplicationConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.ReplicationConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VersioningConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.VersioningConfiguration"
+                        },
+                        "WebsiteConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.WebsiteConfiguration"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::Bucket"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.AbortIncompleteMultipartUpload": {
+            "additionalProperties": false,
+            "properties": {
+                "DaysAfterInitiation": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DaysAfterInitiation"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.AccelerateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccelerationStatus": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AccelerationStatus"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.AccessControlTranslation": {
+            "additionalProperties": false,
+            "properties": {
+                "Owner": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Owner"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.AnalyticsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "StorageClassAnalysis": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.StorageClassAnalysis"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Id",
+                "StorageClassAnalysis"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.BucketEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ServerSideEncryptionConfiguration": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.ServerSideEncryptionRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ServerSideEncryptionConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.CorsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CorsRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.CorsRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CorsRules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.CorsRule": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedOrigins": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExposedHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "MaxAge": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AllowedMethods",
+                "AllowedOrigins"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.DataExport": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.Destination"
+                },
+                "OutputSchemaVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination",
+                "OutputSchemaVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.DefaultRetention": {
+            "additionalProperties": false,
+            "properties": {
+                "Days": {
+                    "type": "number"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "Years": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.DeleteMarkerReplication": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketAccountId": {
+                    "type": "string"
+                },
+                "BucketArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketArn",
+                "Format"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplicaKmsKeyID": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ReplicaKmsKeyID"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.EventBridgeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBridgeEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.FilterRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.IntelligentTieringConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                    },
+                    "type": "array"
+                },
+                "Tierings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.Tiering"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Id",
+                "Status",
+                "Tierings"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.InventoryConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.Destination"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "IncludedObjectVersions": {
+                    "type": "string"
+                },
+                "OptionalFields": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "ScheduleFrequency": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination",
+                "Enabled",
+                "Id",
+                "IncludedObjectVersions",
+                "ScheduleFrequency"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.LambdaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Event": {
+                    "type": "string"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.NotificationFilter"
+                },
+                "Function": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Event",
+                "Function"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.LifecycleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationBucketName": {
+                    "type": "string"
+                },
+                "LogFilePrefix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.Metrics": {
+            "additionalProperties": false,
+            "properties": {
+                "EventThreshold": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationTimeValue"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.MetricsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessPointArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.NoncurrentVersionExpiration": {
+            "additionalProperties": false,
+            "properties": {
+                "NewerNoncurrentVersions": {
+                    "type": "number"
+                },
+                "NoncurrentDays": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "NoncurrentDays"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.NoncurrentVersionTransition": {
+            "additionalProperties": false,
+            "properties": {
+                "NewerNoncurrentVersions": {
+                    "type": "number"
+                },
+                "StorageClass": {
+                    "type": "string"
+                },
+                "TransitionInDays": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "StorageClass",
+                "TransitionInDays"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBridgeConfiguration": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.EventBridgeConfiguration"
+                },
+                "LambdaConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.LambdaConfiguration"
+                    },
+                    "type": "array"
+                },
+                "QueueConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.QueueConfiguration"
+                    },
+                    "type": "array"
+                },
+                "TopicConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TopicConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.NotificationFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Key": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.S3KeyFilter"
+                }
+            },
+            "required": [
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ObjectLockConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ObjectLockEnabled": {
+                    "type": "string"
+                },
+                "Rule": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ObjectLockRule"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ObjectLockRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultRetention": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.DefaultRetention"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.OwnershipControls": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.OwnershipControlsRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.OwnershipControlsRule": {
+            "additionalProperties": false,
+            "properties": {
+                "ObjectOwnership": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.PublicAccessBlockConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockPublicAcls": {
+                    "type": "boolean"
+                },
+                "BlockPublicPolicy": {
+                    "type": "boolean"
+                },
+                "IgnorePublicAcls": {
+                    "type": "boolean"
+                },
+                "RestrictPublicBuckets": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.QueueConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Event": {
+                    "type": "string"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.NotificationFilter"
+                },
+                "Queue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Event",
+                "Queue"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.RedirectAllRequestsTo": {
+            "additionalProperties": false,
+            "properties": {
+                "HostName": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HostName"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.RedirectRule": {
+            "additionalProperties": false,
+            "properties": {
+                "HostName": {
+                    "type": "string"
+                },
+                "HttpRedirectCode": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "ReplaceKeyPrefixWith": {
+                    "type": "string"
+                },
+                "ReplaceKeyWith": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicaModifications": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Role": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.ReplicationRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Role",
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessControlTranslation": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.AccessControlTranslation"
+                },
+                "Account": {
+                    "type": "string"
+                },
+                "Bucket": {
+                    "type": "string"
+                },
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.EncryptionConfiguration"
+                },
+                "Metrics": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.Metrics"
+                },
+                "ReplicationTime": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationTime"
+                },
+                "StorageClass": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteMarkerReplication": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.DeleteMarkerReplication"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationDestination"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationRuleFilter"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "SourceSelectionCriteria": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.SourceSelectionCriteria"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination",
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationRuleAndOperator": {
+            "additionalProperties": false,
+            "properties": {
+                "Prefix": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationRuleFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "And": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationRuleAndOperator"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "TagFilter": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationTime": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                },
+                "Time": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationTimeValue"
+                }
+            },
+            "required": [
+                "Status",
+                "Time"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationTimeValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Minutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Minutes"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.RoutingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "RedirectRule": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.RedirectRule"
+                },
+                "RoutingRuleCondition": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.RoutingRuleCondition"
+                }
+            },
+            "required": [
+                "RedirectRule"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.RoutingRuleCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpErrorCodeReturnedEquals": {
+                    "type": "string"
+                },
+                "KeyPrefixEquals": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "AbortIncompleteMultipartUpload": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.AbortIncompleteMultipartUpload"
+                },
+                "ExpirationDate": {
+                    "type": "string"
+                },
+                "ExpirationInDays": {
+                    "type": "number"
+                },
+                "ExpiredObjectDeleteMarker": {
+                    "type": "boolean"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "NoncurrentVersionExpiration": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.NoncurrentVersionExpiration"
+                },
+                "NoncurrentVersionExpirationInDays": {
+                    "type": "number"
+                },
+                "NoncurrentVersionTransition": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.NoncurrentVersionTransition"
+                },
+                "NoncurrentVersionTransitions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.NoncurrentVersionTransition"
+                    },
+                    "type": "array"
+                },
+                "ObjectSizeGreaterThan": {
+                    "type": "number"
+                },
+                "ObjectSizeLessThan": {
+                    "type": "number"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                    },
+                    "type": "array"
+                },
+                "Transition": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.Transition"
+                },
+                "Transitions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.Transition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.S3KeyFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.FilterRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ServerSideEncryptionByDefault": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSMasterKeyID": {
+                    "type": "string"
+                },
+                "SSEAlgorithm": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SSEAlgorithm"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ServerSideEncryptionRule": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketKeyEnabled": {
+                    "type": "boolean"
+                },
+                "ServerSideEncryptionByDefault": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ServerSideEncryptionByDefault"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.SourceSelectionCriteria": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplicaModifications": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicaModifications"
+                },
+                "SseKmsEncryptedObjects": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.SseKmsEncryptedObjects"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.SseKmsEncryptedObjects": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.StorageClassAnalysis": {
+            "additionalProperties": false,
+            "properties": {
+                "DataExport": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.DataExport"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.TagFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.Tiering": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessTier": {
+                    "type": "string"
+                },
+                "Days": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AccessTier",
+                "Days"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.TopicConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Event": {
+                    "type": "string"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.NotificationFilter"
+                },
+                "Topic": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Event",
+                "Topic"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.Transition": {
+            "additionalProperties": false,
+            "properties": {
+                "StorageClass": {
+                    "type": "string"
+                },
+                "TransitionDate": {
+                    "type": "string"
+                },
+                "TransitionInDays": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "StorageClass"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.VersioningConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.WebsiteConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorDocument": {
+                    "type": "string"
+                },
+                "IndexDocument": {
+                    "type": "string"
+                },
+                "RedirectAllRequestsTo": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.RedirectAllRequestsTo"
+                },
+                "RoutingRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.RoutingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::BucketPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Bucket": {
+                            "type": "string"
+                        },
+                        "PolicyDocument": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Bucket",
+                        "PolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::BucketPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::MultiRegionAccessPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "PublicAccessBlockConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::MultiRegionAccessPoint.PublicAccessBlockConfiguration"
+                        },
+                        "Regions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::S3::MultiRegionAccessPoint.Region"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Regions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::MultiRegionAccessPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::MultiRegionAccessPoint.PublicAccessBlockConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockPublicAcls": {
+                    "type": "boolean"
+                },
+                "BlockPublicPolicy": {
+                    "type": "boolean"
+                },
+                "IgnorePublicAcls": {
+                    "type": "boolean"
+                },
+                "RestrictPublicBuckets": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::MultiRegionAccessPoint.Region": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::MultiRegionAccessPointPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MrapName": {
+                            "type": "string"
+                        },
+                        "Policy": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "MrapName",
+                        "Policy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::MultiRegionAccessPointPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "StorageLensConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::StorageLens.StorageLensConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "StorageLensConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::StorageLens"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.AccountLevel": {
+            "additionalProperties": false,
+            "properties": {
+                "ActivityMetrics": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.ActivityMetrics"
+                },
+                "BucketLevel": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.BucketLevel"
+                }
+            },
+            "required": [
+                "BucketLevel"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.ActivityMetrics": {
+            "additionalProperties": false,
+            "properties": {
+                "IsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.AwsOrg": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.BucketLevel": {
+            "additionalProperties": false,
+            "properties": {
+                "ActivityMetrics": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.ActivityMetrics"
+                },
+                "PrefixLevel": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.PrefixLevel"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.BucketsAndRegions": {
+            "additionalProperties": false,
+            "properties": {
+                "Buckets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Regions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.CloudWatchMetrics": {
+            "additionalProperties": false,
+            "properties": {
+                "IsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "IsEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.DataExport": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchMetrics": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.CloudWatchMetrics"
+                },
+                "S3BucketDestination": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.S3BucketDestination"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.Encryption": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.PrefixLevel": {
+            "additionalProperties": false,
+            "properties": {
+                "StorageMetrics": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.PrefixLevelStorageMetrics"
+                }
+            },
+            "required": [
+                "StorageMetrics"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.PrefixLevelStorageMetrics": {
+            "additionalProperties": false,
+            "properties": {
+                "IsEnabled": {
+                    "type": "boolean"
+                },
+                "SelectionCriteria": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.SelectionCriteria"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.S3BucketDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "Arn": {
+                    "type": "string"
+                },
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.Encryption"
+                },
+                "Format": {
+                    "type": "string"
+                },
+                "OutputSchemaVersion": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AccountId",
+                "Arn",
+                "Format",
+                "OutputSchemaVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.SelectionCriteria": {
+            "additionalProperties": false,
+            "properties": {
+                "Delimiter": {
+                    "type": "string"
+                },
+                "MaxDepth": {
+                    "type": "number"
+                },
+                "MinStorageBytesPercentage": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.StorageLensConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountLevel": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.AccountLevel"
+                },
+                "AwsOrg": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.AwsOrg"
+                },
+                "DataExport": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.DataExport"
+                },
+                "Exclude": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.BucketsAndRegions"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Include": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.BucketsAndRegions"
+                },
+                "IsEnabled": {
+                    "type": "boolean"
+                },
+                "StorageLensArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AccountLevel",
+                "Id",
+                "IsEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::S3ObjectLambda::AccessPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ObjectLambdaConfiguration": {
+                            "$ref": "#/definitions/AWS::S3ObjectLambda::AccessPoint.ObjectLambdaConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ObjectLambdaConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3ObjectLambda::AccessPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3ObjectLambda::AccessPoint.ObjectLambdaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedFeatures": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CloudWatchMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "SupportingAccessPoint": {
+                    "type": "string"
+                },
+                "TransformationConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3ObjectLambda::AccessPoint.TransformationConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SupportingAccessPoint",
+                "TransformationConfigurations"
+            ],
+            "type": "object"
+        },
+        "AWS::S3ObjectLambda::AccessPoint.TransformationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContentTransformation": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "Actions",
+                "ContentTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::S3ObjectLambda::AccessPointPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ObjectLambdaAccessPoint": {
+                            "type": "string"
+                        },
+                        "PolicyDocument": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ObjectLambdaAccessPoint",
+                        "PolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3ObjectLambda::AccessPointPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::AccessPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Bucket": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Policy": {
+                            "type": "object"
+                        },
+                        "VpcConfiguration": {
+                            "$ref": "#/definitions/AWS::S3Outposts::AccessPoint.VpcConfiguration"
+                        }
+                    },
+                    "required": [
+                        "Bucket",
+                        "Name",
+                        "VpcConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3Outposts::AccessPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::AccessPoint.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3Outposts::Bucket": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BucketName": {
+                            "type": "string"
+                        },
+                        "LifecycleConfiguration": {
+                            "$ref": "#/definitions/AWS::S3Outposts::Bucket.LifecycleConfiguration"
+                        },
+                        "OutpostId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "BucketName",
+                        "OutpostId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3Outposts::Bucket"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::Bucket.AbortIncompleteMultipartUpload": {
+            "additionalProperties": false,
+            "properties": {
+                "DaysAfterInitiation": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DaysAfterInitiation"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::Bucket.LifecycleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3Outposts::Bucket.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::Bucket.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "AbortIncompleteMultipartUpload": {
+                    "$ref": "#/definitions/AWS::S3Outposts::Bucket.AbortIncompleteMultipartUpload"
+                },
+                "ExpirationDate": {
+                    "type": "string"
+                },
+                "ExpirationInDays": {
+                    "type": "number"
+                },
+                "Filter": {
+                    "type": "object"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3Outposts::BucketPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Bucket": {
+                            "type": "string"
+                        },
+                        "PolicyDocument": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Bucket",
+                        "PolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3Outposts::BucketPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::Endpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessType": {
+                            "type": "string"
+                        },
+                        "CustomerOwnedIpv4Pool": {
+                            "type": "string"
+                        },
+                        "OutpostId": {
+                            "type": "string"
+                        },
+                        "SecurityGroupId": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "OutpostId",
+                        "SecurityGroupId",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3Outposts::Endpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::Endpoint.NetworkInterface": {
+            "additionalProperties": false,
+            "properties": {
+                "NetworkInterfaceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NetworkInterfaceId"
+            ],
+            "type": "object"
+        },
+        "AWS::SDB::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SDB::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ConfigurationSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSetEventDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigurationSetName": {
+                            "type": "string"
+                        },
+                        "EventDestination": {
+                            "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.EventDestination"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationSetName",
+                        "EventDestination"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ConfigurationSetEventDestination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSetEventDestination.CloudWatchDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.DimensionConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSetEventDestination.DimensionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultDimensionValue": {
+                    "type": "string"
+                },
+                "DimensionName": {
+                    "type": "string"
+                },
+                "DimensionValueSource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DefaultDimensionValue",
+                "DimensionName",
+                "DimensionValueSource"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSetEventDestination.EventDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchDestination": {
+                    "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.CloudWatchDestination"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "KinesisFirehoseDestination": {
+                    "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.KinesisFirehoseDestination"
+                },
+                "MatchingEventTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchingEventTypes"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSetEventDestination.KinesisFirehoseDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStreamARN": {
+                    "type": "string"
+                },
+                "IAMRoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStreamARN",
+                "IAMRoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ContactList": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContactListName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Topics": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SES::ContactList.Topic"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ContactList"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ContactList.Topic": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultSubscriptionStatus": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DisplayName": {
+                    "type": "string"
+                },
+                "TopicName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DefaultSubscriptionStatus",
+                "DisplayName",
+                "TopicName"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Filter": {
+                            "$ref": "#/definitions/AWS::SES::ReceiptFilter.Filter"
+                        }
+                    },
+                    "required": [
+                        "Filter"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ReceiptFilter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptFilter.Filter": {
+            "additionalProperties": false,
+            "properties": {
+                "IpFilter": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptFilter.IpFilter"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IpFilter"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptFilter.IpFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Policy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Cidr",
+                "Policy"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "After": {
+                            "type": "string"
+                        },
+                        "Rule": {
+                            "$ref": "#/definitions/AWS::SES::ReceiptRule.Rule"
+                        },
+                        "RuleSetName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Rule",
+                        "RuleSetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ReceiptRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "AddHeaderAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.AddHeaderAction"
+                },
+                "BounceAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.BounceAction"
+                },
+                "LambdaAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.LambdaAction"
+                },
+                "S3Action": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.S3Action"
+                },
+                "SNSAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.SNSAction"
+                },
+                "StopAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.StopAction"
+                },
+                "WorkmailAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.WorkmailAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.AddHeaderAction": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderName": {
+                    "type": "string"
+                },
+                "HeaderValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HeaderName",
+                "HeaderValue"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.BounceAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Message": {
+                    "type": "string"
+                },
+                "Sender": {
+                    "type": "string"
+                },
+                "SmtpReplyCode": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Message",
+                "Sender",
+                "SmtpReplyCode"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.LambdaAction": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionArn": {
+                    "type": "string"
+                },
+                "InvocationType": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FunctionArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::ReceiptRule.Action"
+                    },
+                    "type": "array"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Recipients": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ScanEnabled": {
+                    "type": "boolean"
+                },
+                "TlsPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.S3Action": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "KmsKeyArn": {
+                    "type": "string"
+                },
+                "ObjectKeyPrefix": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.SNSAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Encoding": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.StopAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Scope": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Scope"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.WorkmailAction": {
+            "additionalProperties": false,
+            "properties": {
+                "OrganizationArn": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OrganizationArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRuleSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ReceiptRuleSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::Template": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Template": {
+                            "$ref": "#/definitions/AWS::SES::Template.Template"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::Template"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::Template.Template": {
+            "additionalProperties": false,
+            "properties": {
+                "HtmlPart": {
+                    "type": "string"
+                },
+                "SubjectPart": {
+                    "type": "string"
+                },
+                "TemplateName": {
+                    "type": "string"
+                },
+                "TextPart": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SNS::Subscription": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeliveryPolicy": {
+                            "type": "object"
+                        },
+                        "Endpoint": {
+                            "type": "string"
+                        },
+                        "FilterPolicy": {
+                            "type": "object"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "RawMessageDelivery": {
+                            "type": "boolean"
+                        },
+                        "RedrivePolicy": {
+                            "type": "object"
+                        },
+                        "Region": {
+                            "type": "string"
+                        },
+                        "SubscriptionRoleArn": {
+                            "type": "string"
+                        },
+                        "TopicArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Protocol",
+                        "TopicArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SNS::Subscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SNS::Topic": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContentBasedDeduplication": {
+                            "type": "boolean"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "FifoTopic": {
+                            "type": "boolean"
+                        },
+                        "KmsMasterKeyId": {
+                            "type": "string"
+                        },
+                        "Subscription": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SNS::Topic.Subscription"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TopicName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SNS::Topic"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SNS::Topic.Subscription": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint",
+                "Protocol"
+            ],
+            "type": "object"
+        },
+        "AWS::SNS::TopicPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "Topics": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument",
+                        "Topics"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SNS::TopicPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SQS::Queue": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContentBasedDeduplication": {
+                            "type": "boolean"
+                        },
+                        "DeduplicationScope": {
+                            "type": "string"
+                        },
+                        "DelaySeconds": {
+                            "type": "number"
+                        },
+                        "FifoQueue": {
+                            "type": "boolean"
+                        },
+                        "FifoThroughputLimit": {
+                            "type": "string"
+                        },
+                        "KmsDataKeyReusePeriodSeconds": {
+                            "type": "number"
+                        },
+                        "KmsMasterKeyId": {
+                            "type": "string"
+                        },
+                        "MaximumMessageSize": {
+                            "type": "number"
+                        },
+                        "MessageRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "QueueName": {
+                            "type": "string"
+                        },
+                        "ReceiveMessageWaitTimeSeconds": {
+                            "type": "number"
+                        },
+                        "RedriveAllowPolicy": {
+                            "type": "object"
+                        },
+                        "RedrivePolicy": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VisibilityTimeout": {
+                            "type": "number"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SQS::Queue"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SQS::QueuePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "Queues": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument",
+                        "Queues"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SQS::QueuePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::Association": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplyOnlyAtCronInterval": {
+                            "type": "boolean"
+                        },
+                        "AssociationName": {
+                            "type": "string"
+                        },
+                        "AutomationTargetParameterName": {
+                            "type": "string"
+                        },
+                        "CalendarNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ComplianceSeverity": {
+                            "type": "string"
+                        },
+                        "DocumentVersion": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "MaxConcurrency": {
+                            "type": "string"
+                        },
+                        "MaxErrors": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OutputLocation": {
+                            "$ref": "#/definitions/AWS::SSM::Association.InstanceAssociationOutputLocation"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "object"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ScheduleExpression": {
+                            "type": "string"
+                        },
+                        "SyncCompliance": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::Association.Target"
+                            },
+                            "type": "array"
+                        },
+                        "WaitForSuccessTimeoutSeconds": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::Association"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::Association.InstanceAssociationOutputLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Location": {
+                    "$ref": "#/definitions/AWS::SSM::Association.S3OutputLocation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::Association.S3OutputLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "OutputS3BucketName": {
+                    "type": "string"
+                },
+                "OutputS3KeyPrefix": {
+                    "type": "string"
+                },
+                "OutputS3Region": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::Association.Target": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::Document": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Attachments": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::Document.AttachmentsSource"
+                            },
+                            "type": "array"
+                        },
+                        "Content": {
+                            "type": "object"
+                        },
+                        "DocumentFormat": {
+                            "type": "string"
+                        },
+                        "DocumentType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Requires": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::Document.DocumentRequires"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        },
+                        "VersionName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Content"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::Document"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::Document.AttachmentsSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::Document.DocumentRequires": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowUnassociatedTargets": {
+                            "type": "boolean"
+                        },
+                        "Cutoff": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Duration": {
+                            "type": "number"
+                        },
+                        "EndDate": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "type": "string"
+                        },
+                        "ScheduleOffset": {
+                            "type": "number"
+                        },
+                        "ScheduleTimezone": {
+                            "type": "string"
+                        },
+                        "StartDate": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AllowUnassociatedTargets",
+                        "Cutoff",
+                        "Duration",
+                        "Name",
+                        "Schedule"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::MaintenanceWindow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "OwnerInformation": {
+                            "type": "string"
+                        },
+                        "ResourceType": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTarget.Targets"
+                            },
+                            "type": "array"
+                        },
+                        "WindowId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourceType",
+                        "Targets",
+                        "WindowId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::MaintenanceWindowTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTarget.Targets": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CutoffBehavior": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LoggingInfo": {
+                            "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.LoggingInfo"
+                        },
+                        "MaxConcurrency": {
+                            "type": "string"
+                        },
+                        "MaxErrors": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        },
+                        "ServiceRoleArn": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.Target"
+                            },
+                            "type": "array"
+                        },
+                        "TaskArn": {
+                            "type": "string"
+                        },
+                        "TaskInvocationParameters": {
+                            "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.TaskInvocationParameters"
+                        },
+                        "TaskParameters": {
+                            "type": "object"
+                        },
+                        "TaskType": {
+                            "type": "string"
+                        },
+                        "WindowId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Priority",
+                        "TaskArn",
+                        "TaskType",
+                        "WindowId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::MaintenanceWindowTask"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.LoggingInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Region": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region",
+                "S3Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowAutomationParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentVersion": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowLambdaParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientContext": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "type": "string"
+                },
+                "Qualifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowRunCommandParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "DocumentHash": {
+                    "type": "string"
+                },
+                "DocumentHashType": {
+                    "type": "string"
+                },
+                "NotificationConfig": {
+                    "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.NotificationConfig"
+                },
+                "OutputS3BucketName": {
+                    "type": "string"
+                },
+                "OutputS3KeyPrefix": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "ServiceRoleArn": {
+                    "type": "string"
+                },
+                "TimeoutSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowStepFunctionsParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.NotificationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "NotificationArn": {
+                    "type": "string"
+                },
+                "NotificationEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "NotificationType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NotificationArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.Target": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.TaskInvocationParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "MaintenanceWindowAutomationParameters": {
+                    "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.MaintenanceWindowAutomationParameters"
+                },
+                "MaintenanceWindowLambdaParameters": {
+                    "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.MaintenanceWindowLambdaParameters"
+                },
+                "MaintenanceWindowRunCommandParameters": {
+                    "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.MaintenanceWindowRunCommandParameters"
+                },
+                "MaintenanceWindowStepFunctionsParameters": {
+                    "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.MaintenanceWindowStepFunctionsParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::Parameter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowedPattern": {
+                            "type": "string"
+                        },
+                        "DataType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Tier": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Type",
+                        "Value"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::Parameter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApprovalRules": {
+                            "$ref": "#/definitions/AWS::SSM::PatchBaseline.RuleGroup"
+                        },
+                        "ApprovedPatches": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ApprovedPatchesComplianceLevel": {
+                            "type": "string"
+                        },
+                        "ApprovedPatchesEnableNonSecurity": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "GlobalFilters": {
+                            "$ref": "#/definitions/AWS::SSM::PatchBaseline.PatchFilterGroup"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OperatingSystem": {
+                            "type": "string"
+                        },
+                        "PatchGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RejectedPatches": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RejectedPatchesAction": {
+                            "type": "string"
+                        },
+                        "Sources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::PatchBaseline.PatchSource"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::PatchBaseline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.PatchFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.PatchFilterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "PatchFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SSM::PatchBaseline.PatchFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.PatchSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Products": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.PatchStringDate": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "ApproveAfterDays": {
+                    "type": "number"
+                },
+                "ApproveUntilDate": {
+                    "$ref": "#/definitions/AWS::SSM::PatchBaseline.PatchStringDate"
+                },
+                "ComplianceLevel": {
+                    "type": "string"
+                },
+                "EnableNonSecurity": {
+                    "type": "boolean"
+                },
+                "PatchFilterGroup": {
+                    "$ref": "#/definitions/AWS::SSM::PatchBaseline.PatchFilterGroup"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.RuleGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "PatchRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SSM::PatchBaseline.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::ResourceDataSync": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BucketName": {
+                            "type": "string"
+                        },
+                        "BucketPrefix": {
+                            "type": "string"
+                        },
+                        "BucketRegion": {
+                            "type": "string"
+                        },
+                        "KMSKeyArn": {
+                            "type": "string"
+                        },
+                        "S3Destination": {
+                            "$ref": "#/definitions/AWS::SSM::ResourceDataSync.S3Destination"
+                        },
+                        "SyncFormat": {
+                            "type": "string"
+                        },
+                        "SyncName": {
+                            "type": "string"
+                        },
+                        "SyncSource": {
+                            "$ref": "#/definitions/AWS::SSM::ResourceDataSync.SyncSource"
+                        },
+                        "SyncType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SyncName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::ResourceDataSync"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::ResourceDataSync.AwsOrganizationsSource": {
+            "additionalProperties": false,
+            "properties": {
+                "OrganizationSourceType": {
+                    "type": "string"
+                },
+                "OrganizationalUnits": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "OrganizationSourceType"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::ResourceDataSync.S3Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "BucketRegion": {
+                    "type": "string"
+                },
+                "KMSKeyArn": {
+                    "type": "string"
+                },
+                "SyncFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName",
+                "BucketRegion",
+                "SyncFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::ResourceDataSync.SyncSource": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsOrganizationsSource": {
+                    "$ref": "#/definitions/AWS::SSM::ResourceDataSync.AwsOrganizationsSource"
+                },
+                "IncludeFutureRegions": {
+                    "type": "boolean"
+                },
+                "SourceRegions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SourceType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourceRegions",
+                "SourceType"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMContacts::Contact": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Alias": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "Plan": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSMContacts::Contact.Stage"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Alias",
+                        "DisplayName",
+                        "Plan",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMContacts::Contact"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMContacts::Contact.ChannelTargetInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelId": {
+                    "type": "string"
+                },
+                "RetryIntervalInMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ChannelId",
+                "RetryIntervalInMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMContacts::Contact.ContactTargetInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "ContactId": {
+                    "type": "string"
+                },
+                "IsEssential": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "ContactId",
+                "IsEssential"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMContacts::Contact.Stage": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInMinutes": {
+                    "type": "number"
+                },
+                "Targets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SSMContacts::Contact.Targets"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DurationInMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMContacts::Contact.Targets": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelTargetInfo": {
+                    "$ref": "#/definitions/AWS::SSMContacts::Contact.ChannelTargetInfo"
+                },
+                "ContactTargetInfo": {
+                    "$ref": "#/definitions/AWS::SSMContacts::Contact.ContactTargetInfo"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSMContacts::ContactChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ChannelAddress": {
+                            "type": "string"
+                        },
+                        "ChannelName": {
+                            "type": "string"
+                        },
+                        "ChannelType": {
+                            "type": "string"
+                        },
+                        "ContactId": {
+                            "type": "string"
+                        },
+                        "DeferActivation": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ChannelAddress",
+                        "ChannelName",
+                        "ChannelType",
+                        "ContactId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMContacts::ContactChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ReplicationSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeletionProtected": {
+                            "type": "boolean"
+                        },
+                        "Regions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSMIncidents::ReplicationSet.ReplicationRegion"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Regions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMIncidents::ReplicationSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ReplicationSet.RegionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SseKmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SseKmsKeyId"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ReplicationSet.ReplicationRegion": {
+            "additionalProperties": false,
+            "properties": {
+                "RegionConfiguration": {
+                    "$ref": "#/definitions/AWS::SSMIncidents::ReplicationSet.RegionConfiguration"
+                },
+                "RegionName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                                "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.Action"
+                            },
+                            "type": "array"
+                        },
+                        "ChatChannel": {
+                            "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.ChatChannel"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "Engagements": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "IncidentTemplate": {
+                            "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.IncidentTemplate"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "IncidentTemplate",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMIncidents::ResponsePlan"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "SsmAutomation": {
+                    "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.SsmAutomation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.ChatChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "ChatbotSns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.IncidentTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DedupeString": {
+                    "type": "string"
+                },
+                "Impact": {
+                    "type": "number"
+                },
+                "NotificationTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.NotificationTargetItem"
+                    },
+                    "type": "array"
+                },
+                "Summary": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Impact",
+                "Title"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.NotificationTargetItem": {
+            "additionalProperties": false,
+            "properties": {
+                "SnsTopicArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.SsmAutomation": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentName": {
+                    "type": "string"
+                },
+                "DocumentVersion": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.SsmParameter"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TargetAccount": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DocumentName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.SsmParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::Assignment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "PermissionSetArn": {
+                            "type": "string"
+                        },
+                        "PrincipalId": {
+                            "type": "string"
+                        },
+                        "PrincipalType": {
+                            "type": "string"
+                        },
+                        "TargetId": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "PermissionSetArn",
+                        "PrincipalId",
+                        "PrincipalType",
+                        "TargetId",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::Assignment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::InstanceAccessControlAttributeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessControlAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttribute"
+                            },
+                            "type": "array"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::InstanceAccessControlAttributeConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttributeValue"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttributeValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Source": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Source"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::PermissionSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "InlinePolicy": {
+                            "type": "object"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "ManagedPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "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::SageMaker::App": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "AppType": {
+                            "type": "string"
+                        },
+                        "DomainId": {
+                            "type": "string"
+                        },
+                        "ResourceSpec": {
+                            "$ref": "#/definitions/AWS::SageMaker::App.ResourceSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserProfileName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AppName",
+                        "AppType",
+                        "DomainId",
+                        "UserProfileName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::App"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::App.ResourceSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "SageMakerImageArn": {
+                    "type": "string"
+                },
+                "SageMakerImageVersionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppImageConfigName": {
+                            "type": "string"
+                        },
+                        "KernelGatewayImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AppImageConfigName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::AppImageConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.FileSystemConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultGid": {
+                    "type": "number"
+                },
+                "DefaultUid": {
+                    "type": "number"
+                },
+                "MountPath": {
+                    "type": "string"
+                }
+            },
+            "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::CodeRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CodeRepositoryName": {
+                            "type": "string"
+                        },
+                        "GitConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::CodeRepository.GitConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "GitConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::CodeRepository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::CodeRepository.GitConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Branch": {
+                    "type": "string"
+                },
+                "RepositoryUrl": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RepositoryUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataQualityAppSpecification": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.DataQualityAppSpecification"
+                        },
+                        "DataQualityBaselineConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.DataQualityBaselineConfig"
+                        },
+                        "DataQualityJobInput": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.DataQualityJobInput"
+                        },
+                        "DataQualityJobOutputConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.MonitoringOutputConfig"
+                        },
+                        "JobDefinitionName": {
+                            "type": "string"
+                        },
+                        "JobResources": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.MonitoringResources"
+                        },
+                        "NetworkConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.NetworkConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StoppingCondition": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.StoppingCondition"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DataQualityAppSpecification",
+                        "DataQualityJobInput",
+                        "DataQualityJobOutputConfig",
+                        "JobResources",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::DataQualityJobDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "VolumeKmsKeyId": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.ConstraintsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.DataQualityAppSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerArguments": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEntrypoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Environment": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ImageUri": {
+                    "type": "string"
+                },
+                "PostAnalyticsProcessorSourceUri": {
+                    "type": "string"
+                },
+                "RecordPreprocessorSourceUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ImageUri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.DataQualityBaselineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseliningJobName": {
+                    "type": "string"
+                },
+                "ConstraintsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.ConstraintsResource"
+                },
+                "StatisticsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.StatisticsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.DataQualityJobInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointInput": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.EndpointInput"
+                }
+            },
+            "required": [
+                "EndpointInput"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.EndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointName": {
+                    "type": "string"
+                },
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3DataDistributionType": {
+                    "type": "string"
+                },
+                "S3InputMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointName",
+                "LocalPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.MonitoringOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Output": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.S3Output"
+                }
+            },
+            "required": [
+                "S3Output"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.MonitoringOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MonitoringOutputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.MonitoringOutput"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MonitoringOutputs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.MonitoringResources": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.ClusterConfig"
+                }
+            },
+            "required": [
+                "ClusterConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.NetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableInterContainerTrafficEncryption": {
+                    "type": "boolean"
+                },
+                "EnableNetworkIsolation": {
+                    "type": "boolean"
+                },
+                "VpcConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.VpcConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.S3Output": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3UploadMode": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LocalPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.StatisticsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.StoppingCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRuntimeInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRuntimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Device": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Device": {
+                            "type": "object"
+                        },
+                        "DeviceFleetName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DeviceFleetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Device"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Device.Device": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "DeviceName": {
+                    "type": "string"
+                },
+                "IotThingName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeviceName"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DeviceFleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DeviceFleetName": {
+                            "type": "string"
+                        },
+                        "OutputConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::DeviceFleet.EdgeOutputConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DeviceFleetName",
+                        "OutputConfig",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::DeviceFleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DeviceFleet.EdgeOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "S3OutputLocation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3OutputLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppNetworkAccessType": {
+                            "type": "string"
+                        },
+                        "AuthMode": {
+                            "type": "string"
+                        },
+                        "DefaultUserSettings": {
+                            "$ref": "#/definitions/AWS::SageMaker::Domain.UserSettings"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthMode",
+                        "DefaultUserSettings",
+                        "DomainName",
+                        "SubnetIds",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.CustomImage": {
+            "additionalProperties": false,
+            "properties": {
+                "AppImageConfigName": {
+                    "type": "string"
+                },
+                "ImageName": {
+                    "type": "string"
+                },
+                "ImageVersionNumber": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AppImageConfigName",
+                "ImageName"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.JupyterServerAppSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultResourceSpec": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.ResourceSpec"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.KernelGatewayAppSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomImages": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::Domain.CustomImage"
+                    },
+                    "type": "array"
+                },
+                "DefaultResourceSpec": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.ResourceSpec"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.ResourceSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "SageMakerImageArn": {
+                    "type": "string"
+                },
+                "SageMakerImageVersionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.SharingSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NotebookOutputOption": {
+                    "type": "string"
+                },
+                "S3KmsKeyId": {
+                    "type": "string"
+                },
+                "S3OutputPath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.UserSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRole": {
+                    "type": "string"
+                },
+                "JupyterServerAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.JupyterServerAppSettings"
+                },
+                "KernelGatewayAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.KernelGatewayAppSettings"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SharingSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.SharingSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeploymentConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::Endpoint.DeploymentConfig"
+                        },
+                        "EndpointConfigName": {
+                            "type": "string"
+                        },
+                        "EndpointName": {
+                            "type": "string"
+                        },
+                        "ExcludeRetainedVariantProperties": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::Endpoint.VariantProperty"
+                            },
+                            "type": "array"
+                        },
+                        "RetainAllVariantProperties": {
+                            "type": "boolean"
+                        },
+                        "RetainDeploymentConfig": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EndpointConfigName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Endpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.Alarm": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AlarmName"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.AutoRollbackConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Alarms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::Endpoint.Alarm"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Alarms"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.BlueGreenUpdatePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumExecutionTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "TerminationWaitInSeconds": {
+                    "type": "number"
+                },
+                "TrafficRoutingConfiguration": {
+                    "$ref": "#/definitions/AWS::SageMaker::Endpoint.TrafficRoutingConfig"
+                }
+            },
+            "required": [
+                "TrafficRoutingConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.CapacitySize": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.DeploymentConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoRollbackConfiguration": {
+                    "$ref": "#/definitions/AWS::SageMaker::Endpoint.AutoRollbackConfig"
+                },
+                "BlueGreenUpdatePolicy": {
+                    "$ref": "#/definitions/AWS::SageMaker::Endpoint.BlueGreenUpdatePolicy"
+                }
+            },
+            "required": [
+                "BlueGreenUpdatePolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.TrafficRoutingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CanarySize": {
+                    "$ref": "#/definitions/AWS::SageMaker::Endpoint.CapacitySize"
+                },
+                "LinearStepSize": {
+                    "$ref": "#/definitions/AWS::SageMaker::Endpoint.CapacitySize"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "WaitIntervalInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.VariantProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "VariantPropertyType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AsyncInferenceConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.AsyncInferenceConfig"
+                        },
+                        "DataCaptureConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.DataCaptureConfig"
+                        },
+                        "EndpointConfigName": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "ProductionVariants": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.ProductionVariant"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ProductionVariants"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::EndpointConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.AsyncInferenceClientConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConcurrentInvocationsPerInstance": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.AsyncInferenceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.AsyncInferenceClientConfig"
+                },
+                "OutputConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.AsyncInferenceOutputConfig"
+                }
+            },
+            "required": [
+                "OutputConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.AsyncInferenceNotificationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorTopic": {
+                    "type": "string"
+                },
+                "SuccessTopic": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.AsyncInferenceOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "NotificationConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.AsyncInferenceNotificationConfig"
+                },
+                "S3OutputPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3OutputPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.CaptureContentTypeHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "CsvContentTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "JsonContentTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.CaptureOption": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CaptureMode"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.DataCaptureConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureContentTypeHeader": {
+                    "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.CaptureContentTypeHeader"
+                },
+                "CaptureOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.CaptureOption"
+                    },
+                    "type": "array"
+                },
+                "DestinationS3Uri": {
+                    "type": "string"
+                },
+                "EnableCapture": {
+                    "type": "boolean"
+                },
+                "InitialSamplingPercentage": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CaptureOptions",
+                "DestinationS3Uri",
+                "InitialSamplingPercentage"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.ProductionVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceleratorType": {
+                    "type": "string"
+                },
+                "InitialInstanceCount": {
+                    "type": "number"
+                },
+                "InitialVariantWeight": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "ModelName": {
+                    "type": "string"
+                },
+                "ServerlessConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.ServerlessConfig"
+                },
+                "VariantName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InitialVariantWeight",
+                "ModelName",
+                "VariantName"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.ServerlessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConcurrency": {
+                    "type": "number"
+                },
+                "MemorySizeInMB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxConcurrency",
+                "MemorySizeInMB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::FeatureGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EventTimeFeatureName": {
+                            "type": "string"
+                        },
+                        "FeatureDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::FeatureGroup.FeatureDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "FeatureGroupName": {
+                            "type": "string"
+                        },
+                        "OfflineStoreConfig": {
+                            "type": "object"
+                        },
+                        "OnlineStoreConfig": {
+                            "type": "object"
+                        },
+                        "RecordIdentifierFeatureName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EventTimeFeatureName",
+                        "FeatureDefinitions",
+                        "FeatureGroupName",
+                        "RecordIdentifierFeatureName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::FeatureGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::FeatureGroup.FeatureDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "FeatureName": {
+                    "type": "string"
+                },
+                "FeatureType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FeatureName",
+                "FeatureType"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Image": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ImageDescription": {
+                            "type": "string"
+                        },
+                        "ImageDisplayName": {
+                            "type": "string"
+                        },
+                        "ImageName": {
+                            "type": "string"
+                        },
+                        "ImageRoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ImageName",
+                        "ImageRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Image"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ImageVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BaseImage": {
+                            "type": "string"
+                        },
+                        "ImageName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "BaseImage",
+                        "ImageName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::ImageVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Model": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Containers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::Model.ContainerDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "EnableNetworkIsolation": {
+                            "type": "boolean"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "InferenceExecutionConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::Model.InferenceExecutionConfig"
+                        },
+                        "ModelName": {
+                            "type": "string"
+                        },
+                        "PrimaryContainer": {
+                            "$ref": "#/definitions/AWS::SageMaker::Model.ContainerDefinition"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::Model.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "ExecutionRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Model"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.ContainerDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerHostname": {
+                    "type": "string"
+                },
+                "Environment": {
+                    "type": "object"
+                },
+                "Image": {
+                    "type": "string"
+                },
+                "ImageConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.ImageConfig"
+                },
+                "InferenceSpecificationName": {
+                    "type": "string"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "ModelDataUrl": {
+                    "type": "string"
+                },
+                "ModelPackageName": {
+                    "type": "string"
+                },
+                "MultiModelConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.MultiModelConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.ImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RepositoryAccessMode": {
+                    "type": "string"
+                },
+                "RepositoryAuthConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.RepositoryAuthConfig"
+                }
+            },
+            "required": [
+                "RepositoryAccessMode"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.InferenceExecutionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.MultiModelConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ModelCacheSetting": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.RepositoryAuthConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RepositoryCredentialsProviderArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RepositoryCredentialsProviderArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "JobDefinitionName": {
+                            "type": "string"
+                        },
+                        "JobResources": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.MonitoringResources"
+                        },
+                        "ModelBiasAppSpecification": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.ModelBiasAppSpecification"
+                        },
+                        "ModelBiasBaselineConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.ModelBiasBaselineConfig"
+                        },
+                        "ModelBiasJobInput": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.ModelBiasJobInput"
+                        },
+                        "ModelBiasJobOutputConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutputConfig"
+                        },
+                        "NetworkConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.NetworkConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StoppingCondition": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.StoppingCondition"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "JobResources",
+                        "ModelBiasAppSpecification",
+                        "ModelBiasJobInput",
+                        "ModelBiasJobOutputConfig",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::ModelBiasJobDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "VolumeKmsKeyId": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.ConstraintsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.EndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndTimeOffset": {
+                    "type": "string"
+                },
+                "EndpointName": {
+                    "type": "string"
+                },
+                "FeaturesAttribute": {
+                    "type": "string"
+                },
+                "InferenceAttribute": {
+                    "type": "string"
+                },
+                "LocalPath": {
+                    "type": "string"
+                },
+                "ProbabilityAttribute": {
+                    "type": "string"
+                },
+                "ProbabilityThresholdAttribute": {
+                    "type": "number"
+                },
+                "S3DataDistributionType": {
+                    "type": "string"
+                },
+                "S3InputMode": {
+                    "type": "string"
+                },
+                "StartTimeOffset": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointName",
+                "LocalPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.ModelBiasAppSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfigUri": {
+                    "type": "string"
+                },
+                "Environment": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ImageUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConfigUri",
+                "ImageUri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.ModelBiasBaselineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseliningJobName": {
+                    "type": "string"
+                },
+                "ConstraintsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.ConstraintsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.ModelBiasJobInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointInput": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.EndpointInput"
+                },
+                "GroundTruthS3Input": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.MonitoringGroundTruthS3Input"
+                }
+            },
+            "required": [
+                "EndpointInput",
+                "GroundTruthS3Input"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.MonitoringGroundTruthS3Input": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Output": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.S3Output"
+                }
+            },
+            "required": [
+                "S3Output"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MonitoringOutputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutput"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MonitoringOutputs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.MonitoringResources": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.ClusterConfig"
+                }
+            },
+            "required": [
+                "ClusterConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.NetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableInterContainerTrafficEncryption": {
+                    "type": "boolean"
+                },
+                "EnableNetworkIsolation": {
+                    "type": "boolean"
+                },
+                "VpcConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.VpcConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.S3Output": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3UploadMode": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LocalPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.StoppingCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRuntimeInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRuntimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "JobDefinitionName": {
+                            "type": "string"
+                        },
+                        "JobResources": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringResources"
+                        },
+                        "ModelExplainabilityAppSpecification": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityAppSpecification"
+                        },
+                        "ModelExplainabilityBaselineConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityBaselineConfig"
+                        },
+                        "ModelExplainabilityJobInput": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityJobInput"
+                        },
+                        "ModelExplainabilityJobOutputConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutputConfig"
+                        },
+                        "NetworkConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.NetworkConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StoppingCondition": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.StoppingCondition"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "JobResources",
+                        "ModelExplainabilityAppSpecification",
+                        "ModelExplainabilityJobInput",
+                        "ModelExplainabilityJobOutputConfig",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::ModelExplainabilityJobDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "VolumeKmsKeyId": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.ConstraintsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.EndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointName": {
+                    "type": "string"
+                },
+                "FeaturesAttribute": {
+                    "type": "string"
+                },
+                "InferenceAttribute": {
+                    "type": "string"
+                },
+                "LocalPath": {
+                    "type": "string"
+                },
+                "ProbabilityAttribute": {
+                    "type": "string"
+                },
+                "S3DataDistributionType": {
+                    "type": "string"
+                },
+                "S3InputMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointName",
+                "LocalPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityAppSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfigUri": {
+                    "type": "string"
+                },
+                "Environment": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ImageUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConfigUri",
+                "ImageUri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityBaselineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseliningJobName": {
+                    "type": "string"
+                },
+                "ConstraintsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.ConstraintsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityJobInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointInput": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.EndpointInput"
+                }
+            },
+            "required": [
+                "EndpointInput"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Output": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.S3Output"
+                }
+            },
+            "required": [
+                "S3Output"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MonitoringOutputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutput"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MonitoringOutputs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringResources": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.ClusterConfig"
+                }
+            },
+            "required": [
+                "ClusterConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.NetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableInterContainerTrafficEncryption": {
+                    "type": "boolean"
+                },
+                "EnableNetworkIsolation": {
+                    "type": "boolean"
+                },
+                "VpcConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.VpcConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.S3Output": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3UploadMode": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LocalPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.StoppingCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRuntimeInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRuntimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelPackageGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ModelPackageGroupDescription": {
+                            "type": "string"
+                        },
+                        "ModelPackageGroupName": {
+                            "type": "string"
+                        },
+                        "ModelPackageGroupPolicy": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ModelPackageGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::ModelPackageGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "JobDefinitionName": {
+                            "type": "string"
+                        },
+                        "JobResources": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.MonitoringResources"
+                        },
+                        "ModelQualityAppSpecification": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.ModelQualityAppSpecification"
+                        },
+                        "ModelQualityBaselineConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.ModelQualityBaselineConfig"
+                        },
+                        "ModelQualityJobInput": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.ModelQualityJobInput"
+                        },
+                        "ModelQualityJobOutputConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutputConfig"
+                        },
+                        "NetworkConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.NetworkConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StoppingCondition": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.StoppingCondition"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "JobResources",
+                        "ModelQualityAppSpecification",
+                        "ModelQualityJobInput",
+                        "ModelQualityJobOutputConfig",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::ModelQualityJobDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "VolumeKmsKeyId": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.ConstraintsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.EndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndTimeOffset": {
+                    "type": "string"
+                },
+                "EndpointName": {
+                    "type": "string"
+                },
+                "InferenceAttribute": {
+                    "type": "string"
+                },
+                "LocalPath": {
+                    "type": "string"
+                },
+                "ProbabilityAttribute": {
+                    "type": "string"
+                },
+                "ProbabilityThresholdAttribute": {
+                    "type": "number"
+                },
+                "S3DataDistributionType": {
+                    "type": "string"
+                },
+                "S3InputMode": {
+                    "type": "string"
+                },
+                "StartTimeOffset": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointName",
+                "LocalPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.ModelQualityAppSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerArguments": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEntrypoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Environment": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ImageUri": {
+                    "type": "string"
+                },
+                "PostAnalyticsProcessorSourceUri": {
+                    "type": "string"
+                },
+                "ProblemType": {
+                    "type": "string"
+                },
+                "RecordPreprocessorSourceUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ImageUri",
+                "ProblemType"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.ModelQualityBaselineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseliningJobName": {
+                    "type": "string"
+                },
+                "ConstraintsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.ConstraintsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.ModelQualityJobInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointInput": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.EndpointInput"
+                },
+                "GroundTruthS3Input": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.MonitoringGroundTruthS3Input"
+                }
+            },
+            "required": [
+                "EndpointInput",
+                "GroundTruthS3Input"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.MonitoringGroundTruthS3Input": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Output": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.S3Output"
+                }
+            },
+            "required": [
+                "S3Output"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MonitoringOutputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutput"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MonitoringOutputs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.MonitoringResources": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.ClusterConfig"
+                }
+            },
+            "required": [
+                "ClusterConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.NetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableInterContainerTrafficEncryption": {
+                    "type": "boolean"
+                },
+                "EnableNetworkIsolation": {
+                    "type": "boolean"
+                },
+                "VpcConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.VpcConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.S3Output": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3UploadMode": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LocalPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.StoppingCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRuntimeInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRuntimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EndpointName": {
+                            "type": "string"
+                        },
+                        "FailureReason": {
+                            "type": "string"
+                        },
+                        "LastMonitoringExecutionSummary": {
+                            "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringExecutionSummary"
+                        },
+                        "MonitoringScheduleConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringScheduleConfig"
+                        },
+                        "MonitoringScheduleName": {
+                            "type": "string"
+                        },
+                        "MonitoringScheduleStatus": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MonitoringScheduleConfig",
+                        "MonitoringScheduleName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::MonitoringSchedule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.BaselineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstraintsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.ConstraintsResource"
+                },
+                "StatisticsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.StatisticsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "VolumeKmsKeyId": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.ConstraintsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.EndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointName": {
+                    "type": "string"
+                },
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3DataDistributionType": {
+                    "type": "string"
+                },
+                "S3InputMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointName",
+                "LocalPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringAppSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerArguments": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEntrypoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ImageUri": {
+                    "type": "string"
+                },
+                "PostAnalyticsProcessorSourceUri": {
+                    "type": "string"
+                },
+                "RecordPreprocessorSourceUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ImageUri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringExecutionSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "CreationTime": {
+                    "type": "string"
+                },
+                "EndpointName": {
+                    "type": "string"
+                },
+                "FailureReason": {
+                    "type": "string"
+                },
+                "LastModifiedTime": {
+                    "type": "string"
+                },
+                "MonitoringExecutionStatus": {
+                    "type": "string"
+                },
+                "MonitoringScheduleName": {
+                    "type": "string"
+                },
+                "ProcessingJobArn": {
+                    "type": "string"
+                },
+                "ScheduledTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CreationTime",
+                "LastModifiedTime",
+                "MonitoringExecutionStatus",
+                "MonitoringScheduleName",
+                "ScheduledTime"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointInput": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.EndpointInput"
+                }
+            },
+            "required": [
+                "EndpointInput"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringJobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "BaselineConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.BaselineConfig"
+                },
+                "Environment": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "MonitoringAppSpecification": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringAppSpecification"
+                },
+                "MonitoringInputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringInput"
+                    },
+                    "type": "array"
+                },
+                "MonitoringOutputConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringOutputConfig"
+                },
+                "MonitoringResources": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringResources"
+                },
+                "NetworkConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.NetworkConfig"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StoppingCondition": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.StoppingCondition"
+                }
+            },
+            "required": [
+                "MonitoringAppSpecification",
+                "MonitoringInputs",
+                "MonitoringOutputConfig",
+                "MonitoringResources",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Output": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.S3Output"
+                }
+            },
+            "required": [
+                "S3Output"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MonitoringOutputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringOutput"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MonitoringOutputs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringResources": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.ClusterConfig"
+                }
+            },
+            "required": [
+                "ClusterConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringScheduleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "MonitoringJobDefinition": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringJobDefinition"
+                },
+                "MonitoringJobDefinitionName": {
+                    "type": "string"
+                },
+                "MonitoringType": {
+                    "type": "string"
+                },
+                "ScheduleConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.ScheduleConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.NetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableInterContainerTrafficEncryption": {
+                    "type": "boolean"
+                },
+                "EnableNetworkIsolation": {
+                    "type": "boolean"
+                },
+                "VpcConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.VpcConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.S3Output": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3UploadMode": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LocalPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.ScheduleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.StatisticsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.StoppingCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRuntimeInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRuntimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::NotebookInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceleratorTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AdditionalCodeRepositories": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DefaultCodeRepository": {
+                            "type": "string"
+                        },
+                        "DirectInternetAccess": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LifecycleConfigName": {
+                            "type": "string"
+                        },
+                        "NotebookInstanceName": {
+                            "type": "string"
+                        },
+                        "PlatformIdentifier": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "RootAccess": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VolumeSizeInGB": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "InstanceType",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::NotebookInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::NotebookInstanceLifecycleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "NotebookInstanceLifecycleConfigName": {
+                            "type": "string"
+                        },
+                        "OnCreate": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::NotebookInstanceLifecycleConfig.NotebookInstanceLifecycleHook"
+                            },
+                            "type": "array"
+                        },
+                        "OnStart": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::NotebookInstanceLifecycleConfig.NotebookInstanceLifecycleHook"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::NotebookInstanceLifecycleConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::NotebookInstanceLifecycleConfig.NotebookInstanceLifecycleHook": {
+            "additionalProperties": false,
+            "properties": {
+                "Content": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Pipeline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PipelineDefinition": {
+                            "type": "object"
+                        },
+                        "PipelineDescription": {
+                            "type": "string"
+                        },
+                        "PipelineDisplayName": {
+                            "type": "string"
+                        },
+                        "PipelineName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PipelineDefinition",
+                        "PipelineName",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Pipeline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ProjectDescription": {
+                            "type": "string"
+                        },
+                        "ProjectName": {
+                            "type": "string"
+                        },
+                        "ServiceCatalogProvisioningDetails": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ProjectName",
+                        "ServiceCatalogProvisioningDetails"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DomainId": {
+                            "type": "string"
+                        },
+                        "SingleSignOnUserIdentifier": {
+                            "type": "string"
+                        },
+                        "SingleSignOnUserValue": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserProfileName": {
+                            "type": "string"
+                        },
+                        "UserSettings": {
+                            "$ref": "#/definitions/AWS::SageMaker::UserProfile.UserSettings"
+                        }
+                    },
+                    "required": [
+                        "DomainId",
+                        "UserProfileName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::UserProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.CustomImage": {
+            "additionalProperties": false,
+            "properties": {
+                "AppImageConfigName": {
+                    "type": "string"
+                },
+                "ImageName": {
+                    "type": "string"
+                },
+                "ImageVersionNumber": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AppImageConfigName",
+                "ImageName"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.JupyterServerAppSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultResourceSpec": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.ResourceSpec"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.KernelGatewayAppSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomImages": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::UserProfile.CustomImage"
+                    },
+                    "type": "array"
+                },
+                "DefaultResourceSpec": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.ResourceSpec"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.ResourceSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "SageMakerImageArn": {
+                    "type": "string"
+                },
+                "SageMakerImageVersionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.SharingSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NotebookOutputOption": {
+                    "type": "string"
+                },
+                "S3KmsKeyId": {
+                    "type": "string"
+                },
+                "S3OutputPath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.UserSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRole": {
+                    "type": "string"
+                },
+                "JupyterServerAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.JupyterServerAppSettings"
+                },
+                "KernelGatewayAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.KernelGatewayAppSettings"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SharingSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.SharingSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Workteam": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "MemberDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::Workteam.MemberDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "NotificationConfiguration": {
+                            "$ref": "#/definitions/AWS::SageMaker::Workteam.NotificationConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkteamName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Workteam"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Workteam.CognitoMemberDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "CognitoClientId": {
+                    "type": "string"
+                },
+                "CognitoUserGroup": {
+                    "type": "string"
+                },
+                "CognitoUserPool": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CognitoClientId",
+                "CognitoUserGroup",
+                "CognitoUserPool"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Workteam.MemberDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "CognitoMemberDefinition": {
+                    "$ref": "#/definitions/AWS::SageMaker::Workteam.CognitoMemberDefinition"
+                }
+            },
+            "required": [
+                "CognitoMemberDefinition"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Workteam.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NotificationTopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NotificationTopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::ResourcePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BlockPublicPolicy": {
+                            "type": "boolean"
+                        },
+                        "ResourcePolicy": {
+                            "type": "object"
+                        },
+                        "SecretId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourcePolicy",
+                        "SecretId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecretsManager::ResourcePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::RotationSchedule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HostedRotationLambda": {
+                            "$ref": "#/definitions/AWS::SecretsManager::RotationSchedule.HostedRotationLambda"
+                        },
+                        "RotationLambdaARN": {
+                            "type": "string"
+                        },
+                        "RotationRules": {
+                            "$ref": "#/definitions/AWS::SecretsManager::RotationSchedule.RotationRules"
+                        },
+                        "SecretId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SecretId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecretsManager::RotationSchedule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::RotationSchedule.HostedRotationLambda": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyArn": {
+                    "type": "string"
+                },
+                "MasterSecretArn": {
+                    "type": "string"
+                },
+                "MasterSecretKmsKeyArn": {
+                    "type": "string"
+                },
+                "RotationLambdaName": {
+                    "type": "string"
+                },
+                "RotationType": {
+                    "type": "string"
+                },
+                "SuperuserSecretArn": {
+                    "type": "string"
+                },
+                "SuperuserSecretKmsKeyArn": {
+                    "type": "string"
+                },
+                "VpcSecurityGroupIds": {
+                    "type": "string"
+                },
+                "VpcSubnetIds": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RotationType"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::RotationSchedule.RotationRules": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomaticallyAfterDays": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecretsManager::Secret": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "GenerateSecretString": {
+                            "$ref": "#/definitions/AWS::SecretsManager::Secret.GenerateSecretString"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ReplicaRegions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SecretsManager::Secret.ReplicaRegion"
+                            },
+                            "type": "array"
+                        },
+                        "SecretString": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecretsManager::Secret"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::Secret.GenerateSecretString": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludeCharacters": {
+                    "type": "string"
+                },
+                "ExcludeLowercase": {
+                    "type": "boolean"
+                },
+                "ExcludeNumbers": {
+                    "type": "boolean"
+                },
+                "ExcludePunctuation": {
+                    "type": "boolean"
+                },
+                "ExcludeUppercase": {
+                    "type": "boolean"
+                },
+                "GenerateStringKey": {
+                    "type": "string"
+                },
+                "IncludeSpace": {
+                    "type": "boolean"
+                },
+                "PasswordLength": {
+                    "type": "number"
+                },
+                "RequireEachIncludedType": {
+                    "type": "boolean"
+                },
+                "SecretStringTemplate": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecretsManager::Secret.ReplicaRegion": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::SecretTargetAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SecretId": {
+                            "type": "string"
+                        },
+                        "TargetId": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SecretId",
+                        "TargetId",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecretsManager::SecretTargetAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::Hub": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::Hub"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::AcceptedPortfolioShare": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::AcceptedPortfolioShare"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::CloudFormationProduct": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Distributor": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Owner": {
+                            "type": "string"
+                        },
+                        "ProvisioningArtifactParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ServiceCatalog::CloudFormationProduct.ProvisioningArtifactProperties"
+                            },
+                            "type": "array"
+                        },
+                        "ReplaceProvisioningArtifacts": {
+                            "type": "boolean"
+                        },
+                        "SupportDescription": {
+                            "type": "string"
+                        },
+                        "SupportEmail": {
+                            "type": "string"
+                        },
+                        "SupportUrl": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Owner",
+                        "ProvisioningArtifactParameters"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::CloudFormationProduct"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::CloudFormationProduct.ProvisioningArtifactProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "DisableTemplateValidation": {
+                    "type": "boolean"
+                },
+                "Info": {
+                    "type": "object"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Info"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::CloudFormationProvisionedProduct": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "NotificationArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PathId": {
+                            "type": "string"
+                        },
+                        "PathName": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "ProductName": {
+                            "type": "string"
+                        },
+                        "ProvisionedProductName": {
+                            "type": "string"
+                        },
+                        "ProvisioningArtifactId": {
+                            "type": "string"
+                        },
+                        "ProvisioningArtifactName": {
+                            "type": "string"
+                        },
+                        "ProvisioningParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningParameter"
+                            },
+                            "type": "array"
+                        },
+                        "ProvisioningPreferences": {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningPreferences"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::CloudFormationProvisionedProduct"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningPreferences": {
+            "additionalProperties": false,
+            "properties": {
+                "StackSetAccounts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StackSetFailureToleranceCount": {
+                    "type": "number"
+                },
+                "StackSetFailureTolerancePercentage": {
+                    "type": "number"
+                },
+                "StackSetMaxConcurrencyCount": {
+                    "type": "number"
+                },
+                "StackSetMaxConcurrencyPercentage": {
+                    "type": "number"
+                },
+                "StackSetOperationType": {
+                    "type": "string"
+                },
+                "StackSetRegions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::LaunchNotificationConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "NotificationArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "NotificationArns",
+                        "PortfolioId",
+                        "ProductId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::LaunchNotificationConstraint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::LaunchRoleConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LocalRoleName": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId",
+                        "ProductId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::LaunchRoleConstraint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::LaunchTemplateConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId",
+                        "ProductId",
+                        "Rules"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::LaunchTemplateConstraint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::Portfolio": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "ProviderName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DisplayName",
+                        "ProviderName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::Portfolio"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::PortfolioPrincipalAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "PrincipalARN": {
+                            "type": "string"
+                        },
+                        "PrincipalType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId",
+                        "PrincipalARN",
+                        "PrincipalType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::PortfolioPrincipalAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::PortfolioProductAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "SourcePortfolioId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId",
+                        "ProductId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::PortfolioProductAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::PortfolioShare": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "AccountId": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ShareTagOptions": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "AccountId",
+                        "PortfolioId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::PortfolioShare"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::ResourceUpdateConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "TagUpdateOnProvisionedProduct": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId",
+                        "ProductId",
+                        "TagUpdateOnProvisionedProduct"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::ResourceUpdateConstraint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::ServiceAction": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Definition": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ServiceCatalog::ServiceAction.DefinitionParameter"
+                            },
+                            "type": "array"
+                        },
+                        "DefinitionType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Definition",
+                        "DefinitionType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::ServiceAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::ServiceAction.DefinitionParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::ServiceActionAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "ProvisioningArtifactId": {
+                            "type": "string"
+                        },
+                        "ServiceActionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProductId",
+                        "ProvisioningArtifactId",
+                        "ServiceActionId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::ServiceActionAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::StackSetConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "AccountList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AdminRole": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ExecutionRole": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "RegionList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "StackInstanceControl": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AccountList",
+                        "AdminRole",
+                        "Description",
+                        "ExecutionRole",
+                        "PortfolioId",
+                        "ProductId",
+                        "RegionList",
+                        "StackInstanceControl"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::StackSetConstraint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::TagOption": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Active": {
+                            "type": "boolean"
+                        },
+                        "Key": {
+                            "type": "string"
+                        },
+                        "Value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Key",
+                        "Value"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::TagOption"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::TagOptionAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "TagOptionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourceId",
+                        "TagOptionId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::TagOptionAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalogAppRegistry::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::ServiceCatalogAppRegistry::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalogAppRegistry::AttributeGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Attributes": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Attributes",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalogAppRegistry::AttributeGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Application": {
+                            "type": "string"
+                        },
+                        "AttributeGroup": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Application",
+                        "AttributeGroup"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalogAppRegistry::ResourceAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Application": {
+                            "type": "string"
+                        },
+                        "Resource": {
+                            "type": "string"
+                        },
+                        "ResourceType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Application",
+                        "Resource",
+                        "ResourceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalogAppRegistry::ResourceAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::HttpNamespace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceDiscovery::HttpNamespace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Instance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InstanceAttributes": {
+                            "type": "object"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "ServiceId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceAttributes",
+                        "ServiceId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceDiscovery::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PrivateDnsNamespace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Properties": {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::PrivateDnsNamespace.Properties"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Vpc": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Vpc"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceDiscovery::PrivateDnsNamespace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PrivateDnsNamespace.PrivateDnsPropertiesMutable": {
+            "additionalProperties": false,
+            "properties": {
+                "SOA": {
+                    "$ref": "#/definitions/AWS::ServiceDiscovery::PrivateDnsNamespace.SOA"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PrivateDnsNamespace.Properties": {
+            "additionalProperties": false,
+            "properties": {
+                "DnsProperties": {
+                    "$ref": "#/definitions/AWS::ServiceDiscovery::PrivateDnsNamespace.PrivateDnsPropertiesMutable"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PrivateDnsNamespace.SOA": {
+            "additionalProperties": false,
+            "properties": {
+                "TTL": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PublicDnsNamespace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Properties": {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::PublicDnsNamespace.Properties"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceDiscovery::PublicDnsNamespace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PublicDnsNamespace.Properties": {
+            "additionalProperties": false,
+            "properties": {
+                "DnsProperties": {
+                    "$ref": "#/definitions/AWS::ServiceDiscovery::PublicDnsNamespace.PublicDnsPropertiesMutable"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PublicDnsNamespace.PublicDnsPropertiesMutable": {
+            "additionalProperties": false,
+            "properties": {
+                "SOA": {
+                    "$ref": "#/definitions/AWS::ServiceDiscovery::PublicDnsNamespace.SOA"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PublicDnsNamespace.SOA": {
+            "additionalProperties": false,
+            "properties": {
+                "TTL": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Service": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DnsConfig": {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::Service.DnsConfig"
+                        },
+                        "HealthCheckConfig": {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::Service.HealthCheckConfig"
+                        },
+                        "HealthCheckCustomConfig": {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::Service.HealthCheckCustomConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NamespaceId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceDiscovery::Service"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Service.DnsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DnsRecords": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ServiceDiscovery::Service.DnsRecord"
+                    },
+                    "type": "array"
+                },
+                "NamespaceId": {
+                    "type": "string"
+                },
+                "RoutingPolicy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DnsRecords"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Service.DnsRecord": {
+            "additionalProperties": false,
+            "properties": {
+                "TTL": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TTL",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Service.HealthCheckConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FailureThreshold": {
+                    "type": "number"
+                },
+                "ResourcePath": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Service.HealthCheckCustomConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FailureThreshold": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Signer::ProfilePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        },
+                        "ProfileName": {
+                            "type": "string"
+                        },
+                        "ProfileVersion": {
+                            "type": "string"
+                        },
+                        "StatementId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Action",
+                        "Principal",
+                        "ProfileName",
+                        "StatementId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Signer::ProfilePermission"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Signer::SigningProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PlatformId": {
+                            "type": "string"
+                        },
+                        "SignatureValidityPeriod": {
+                            "$ref": "#/definitions/AWS::Signer::SigningProfile.SignatureValidityPeriod"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PlatformId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Signer::SigningProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Signer::SigningProfile.SignatureValidityPeriod": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::StepFunctions::Activity": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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/AWS::StepFunctions::Activity.TagsEntry"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::StepFunctions::Activity"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::StepFunctions::Activity.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.Definition"
+                        },
+                        "DefinitionS3Location": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.S3Location"
+                        },
+                        "DefinitionString": {
+                            "type": "string"
+                        },
+                        "DefinitionSubstitutions": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "LoggingConfiguration": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.LoggingConfiguration"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StateMachineName": {
+                            "type": "string"
+                        },
+                        "StateMachineType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::StepFunctions::StateMachine.TagsEntry"
+                            },
+                            "type": "array"
+                        },
+                        "TracingConfiguration": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.TracingConfiguration"
+                        }
+                    },
+                    "required": [
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::StepFunctions::StateMachine"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.CloudWatchLogsLogGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.Definition": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.LogDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsLogGroup": {
+                    "$ref": "#/definitions/AWS::StepFunctions::StateMachine.CloudWatchLogsLogGroup"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Destinations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::StepFunctions::StateMachine.LogDestination"
+                    },
+                    "type": "array"
+                },
+                "IncludeExecutionData": {
+                    "type": "boolean"
+                },
+                "Level": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.TracingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ArtifactConfig": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.ArtifactConfig"
+                        },
+                        "ArtifactS3Location": {
+                            "type": "string"
+                        },
+                        "Code": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.Code"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "FailureRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RunConfig": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.RunConfig"
+                        },
+                        "RuntimeVersion": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.Schedule"
+                        },
+                        "StartCanaryAfterCreation": {
+                            "type": "boolean"
+                        },
+                        "SuccessRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VPCConfig": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.VPCConfig"
+                        },
+                        "VisualReference": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.VisualReference"
+                        }
+                    },
+                    "required": [
+                        "ArtifactS3Location",
+                        "Code",
+                        "ExecutionRoleArn",
+                        "Name",
+                        "RuntimeVersion",
+                        "Schedule",
+                        "StartCanaryAfterCreation"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Synthetics::Canary"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.ArtifactConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Encryption": {
+                    "$ref": "#/definitions/AWS::Synthetics::Canary.S3Encryption"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.BaseScreenshot": {
+            "additionalProperties": false,
+            "properties": {
+                "IgnoreCoordinates": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ScreenshotName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScreenshotName"
+            ],
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.Code": {
+            "additionalProperties": false,
+            "properties": {
+                "Handler": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                },
+                "S3ObjectVersion": {
+                    "type": "string"
+                },
+                "Script": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Handler"
+            ],
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.RunConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveTracing": {
+                    "type": "boolean"
+                },
+                "EnvironmentVariables": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "MemoryInMB": {
+                    "type": "number"
+                },
+                "TimeoutInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.S3Encryption": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionMode": {
+                    "type": "string"
+                },
+                "KmsKeyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Expression"
+            ],
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.VPCConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.VisualReference": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseCanaryRunId": {
+                    "type": "string"
+                },
+                "BaseScreenshots": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Synthetics::Canary.BaseScreenshot"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "BaseCanaryRunId"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::Database": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Timestream::Database"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClientToken": {
+                            "type": "string"
+                        },
+                        "ErrorReportConfiguration": {
+                            "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.ErrorReportConfiguration"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "NotificationConfiguration": {
+                            "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.NotificationConfiguration"
+                        },
+                        "QueryString": {
+                            "type": "string"
+                        },
+                        "ScheduleConfiguration": {
+                            "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.ScheduleConfiguration"
+                        },
+                        "ScheduledQueryExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "ScheduledQueryName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetConfiguration": {
+                            "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.TargetConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ErrorReportConfiguration",
+                        "NotificationConfiguration",
+                        "QueryString",
+                        "ScheduleConfiguration",
+                        "ScheduledQueryExecutionRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Timestream::ScheduledQuery"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.DimensionMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionValueType": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DimensionValueType",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.ErrorReportConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.S3Configuration"
+                }
+            },
+            "required": [
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.MixedMeasureMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MeasureName": {
+                    "type": "string"
+                },
+                "MeasureValueType": {
+                    "type": "string"
+                },
+                "MultiMeasureAttributeMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.MultiMeasureAttributeMapping"
+                    },
+                    "type": "array"
+                },
+                "SourceColumn": {
+                    "type": "string"
+                },
+                "TargetMeasureName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MeasureValueType"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.MultiMeasureAttributeMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MeasureValueType": {
+                    "type": "string"
+                },
+                "SourceColumn": {
+                    "type": "string"
+                },
+                "TargetMultiMeasureAttributeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MeasureValueType",
+                "SourceColumn"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.MultiMeasureMappings": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiMeasureAttributeMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.MultiMeasureAttributeMapping"
+                    },
+                    "type": "array"
+                },
+                "TargetMultiMeasureName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MultiMeasureAttributeMappings"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SnsConfiguration": {
+                    "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.SnsConfiguration"
+                }
+            },
+            "required": [
+                "SnsConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.S3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "EncryptionOption": {
+                    "type": "string"
+                },
+                "ObjectKeyPrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.ScheduleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.SnsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.TargetConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "TimestreamConfiguration": {
+                    "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.TimestreamConfiguration"
+                }
+            },
+            "required": [
+                "TimestreamConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.TimestreamConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DimensionMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.DimensionMapping"
+                    },
+                    "type": "array"
+                },
+                "MeasureNameColumn": {
+                    "type": "string"
+                },
+                "MixedMeasureMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.MixedMeasureMapping"
+                    },
+                    "type": "array"
+                },
+                "MultiMeasureMappings": {
+                    "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.MultiMeasureMappings"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "TimeColumn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "DimensionMappings",
+                "TableName",
+                "TimeColumn"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::Table": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "RetentionProperties": {
+                            "type": "object"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DatabaseName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Timestream::Table"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Server": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "EndpointDetails": {
+                            "$ref": "#/definitions/AWS::Transfer::Server.EndpointDetails"
+                        },
+                        "EndpointType": {
+                            "type": "string"
+                        },
+                        "IdentityProviderDetails": {
+                            "$ref": "#/definitions/AWS::Transfer::Server.IdentityProviderDetails"
+                        },
+                        "IdentityProviderType": {
+                            "type": "string"
+                        },
+                        "LoggingRole": {
+                            "type": "string"
+                        },
+                        "ProtocolDetails": {
+                            "$ref": "#/definitions/AWS::Transfer::Server.ProtocolDetails"
+                        },
+                        "Protocols": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Server.Protocol"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityPolicyName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkflowDetails": {
+                            "$ref": "#/definitions/AWS::Transfer::Server.WorkflowDetails"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Transfer::Server"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Server.EndpointDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "AddressAllocationIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcEndpointId": {
+                    "type": "string"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Server.IdentityProviderDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryId": {
+                    "type": "string"
+                },
+                "Function": {
+                    "type": "string"
+                },
+                "InvocationRole": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Server.Protocol": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::Transfer::Server.ProtocolDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "PassiveIp": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Server.WorkflowDetail": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRole": {
+                    "type": "string"
+                },
+                "WorkflowId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ExecutionRole",
+                "WorkflowId"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Server.WorkflowDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "OnUpload": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Transfer::Server.WorkflowDetail"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "OnUpload"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HomeDirectory": {
+                            "type": "string"
+                        },
+                        "HomeDirectoryMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::User.HomeDirectoryMapEntry"
+                            },
+                            "type": "array"
+                        },
+                        "HomeDirectoryType": {
+                            "type": "string"
+                        },
+                        "Policy": {
+                            "type": "string"
+                        },
+                        "PosixProfile": {
+                            "$ref": "#/definitions/AWS::Transfer::User.PosixProfile"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "ServerId": {
+                            "type": "string"
+                        },
+                        "SshPublicKeys": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::User.SshPublicKey"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Role",
+                        "ServerId",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Transfer::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::User.HomeDirectoryMapEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Entry": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Entry",
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::User.PosixProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "Gid": {
+                    "type": "number"
+                },
+                "SecondaryGids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Uid": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Gid",
+                "Uid"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::User.SshPublicKey": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "OnExceptionSteps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
+                            },
+                            "type": "array"
+                        },
+                        "Steps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Steps"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Transfer::Workflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.WorkflowStep": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyStepDetails": {
+                    "type": "object"
+                },
+                "CustomStepDetails": {
+                    "type": "object"
+                },
+                "DeleteStepDetails": {
+                    "type": "object"
+                },
+                "TagStepDetails": {
+                    "type": "object"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAF::ByteMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ByteMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::ByteMatchSet.ByteMatchTuple"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::ByteMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::ByteMatchSet.ByteMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAF::ByteMatchSet.FieldToMatch"
+                },
+                "PositionalConstraint": {
+                    "type": "string"
+                },
+                "TargetString": {
+                    "type": "string"
+                },
+                "TargetStringBase64": {
+                    "type": "string"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "PositionalConstraint",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::ByteMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::IPSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "IPSetDescriptors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::IPSet.IPSetDescriptor"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::IPSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::IPSet.IPSetDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Predicates": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::Rule.Predicate"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MetricName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::Rule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::Rule.Predicate": {
+            "additionalProperties": false,
+            "properties": {
+                "DataId": {
+                    "type": "string"
+                },
+                "Negated": {
+                    "type": "boolean"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataId",
+                "Negated",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SizeConstraintSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SizeConstraints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::SizeConstraintSet.SizeConstraint"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "SizeConstraints"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::SizeConstraintSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SizeConstraintSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SizeConstraintSet.SizeConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAF::SizeConstraintSet.FieldToMatch"
+                },
+                "Size": {
+                    "type": "number"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "FieldToMatch",
+                "Size",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SqlInjectionMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SqlInjectionMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::SqlInjectionMatchSet.SqlInjectionMatchTuple"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::SqlInjectionMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SqlInjectionMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SqlInjectionMatchSet.SqlInjectionMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAF::SqlInjectionMatchSet.FieldToMatch"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::WebACL": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "$ref": "#/definitions/AWS::WAF::WebACL.WafAction"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::WebACL.ActivatedRule"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DefaultAction",
+                        "MetricName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::WebACL"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::WebACL.ActivatedRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::WAF::WebACL.WafAction"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "RuleId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Priority",
+                "RuleId"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::WebACL.WafAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::XssMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "XssMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::XssMatchSet.XssMatchTuple"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "XssMatchTuples"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::XssMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::XssMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::XssMatchSet.XssMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAF::XssMatchSet.FieldToMatch"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::ByteMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ByteMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::ByteMatchSet.ByteMatchTuple"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::ByteMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::ByteMatchSet.ByteMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFRegional::ByteMatchSet.FieldToMatch"
+                },
+                "PositionalConstraint": {
+                    "type": "string"
+                },
+                "TargetString": {
+                    "type": "string"
+                },
+                "TargetStringBase64": {
+                    "type": "string"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "PositionalConstraint",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::ByteMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::GeoMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GeoMatchConstraints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::GeoMatchSet.GeoMatchConstraint"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::GeoMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::GeoMatchSet.GeoMatchConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::IPSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "IPSetDescriptors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::IPSet.IPSetDescriptor"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::IPSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::IPSet.IPSetDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::RateBasedRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MatchPredicates": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::RateBasedRule.Predicate"
+                            },
+                            "type": "array"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RateKey": {
+                            "type": "string"
+                        },
+                        "RateLimit": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "MetricName",
+                        "Name",
+                        "RateKey",
+                        "RateLimit"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::RateBasedRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::RateBasedRule.Predicate": {
+            "additionalProperties": false,
+            "properties": {
+                "DataId": {
+                    "type": "string"
+                },
+                "Negated": {
+                    "type": "boolean"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataId",
+                "Negated",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::RegexPatternSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RegexPatternStrings": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "RegexPatternStrings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::RegexPatternSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Predicates": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::Rule.Predicate"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MetricName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::Rule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::Rule.Predicate": {
+            "additionalProperties": false,
+            "properties": {
+                "DataId": {
+                    "type": "string"
+                },
+                "Negated": {
+                    "type": "boolean"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataId",
+                "Negated",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SizeConstraintSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SizeConstraints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::SizeConstraintSet.SizeConstraint"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::SizeConstraintSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SizeConstraintSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SizeConstraintSet.SizeConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFRegional::SizeConstraintSet.FieldToMatch"
+                },
+                "Size": {
+                    "type": "number"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "FieldToMatch",
+                "Size",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SqlInjectionMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SqlInjectionMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::SqlInjectionMatchSet.SqlInjectionMatchTuple"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::SqlInjectionMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SqlInjectionMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SqlInjectionMatchSet.SqlInjectionMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFRegional::SqlInjectionMatchSet.FieldToMatch"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::WebACL": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "$ref": "#/definitions/AWS::WAFRegional::WebACL.Action"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::WebACL.Rule"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DefaultAction",
+                        "MetricName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::WebACL"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::WebACL.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::WebACL.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::WAFRegional::WebACL.Action"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "RuleId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action",
+                "Priority",
+                "RuleId"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::WebACLAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "WebACLId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourceArn",
+                        "WebACLId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::WebACLAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::XssMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "XssMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::XssMatchSet.XssMatchTuple"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::XssMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::XssMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::XssMatchSet.XssMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFRegional::XssMatchSet.FieldToMatch"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::IPSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Addresses": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IPAddressVersion": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Scope": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Addresses",
+                        "IPAddressVersion",
+                        "Scope"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::IPSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LogDestinationConfigs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LoggingFilter": {
+                            "type": "object"
+                        },
+                        "RedactedFields": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFv2::LoggingConfiguration.FieldToMatch"
+                            },
+                            "type": "array"
+                        },
+                        "ResourceArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LogDestinationConfigs",
+                        "ResourceArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::LoggingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::LoggingConfiguration.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonBody": {
+                    "type": "object"
+                },
+                "Method": {
+                    "type": "object"
+                },
+                "QueryString": {
+                    "type": "object"
+                },
+                "SingleHeader": {
+                    "type": "object"
+                },
+                "UriPath": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RegexPatternSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RegularExpressionList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Scope": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RegularExpressionList",
+                        "Scope"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::RegexPatternSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Capacity": {
+                            "type": "number"
+                        },
+                        "CustomResponseBodies": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.CustomResponseBody"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Scope": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VisibilityConfig": {
+                            "$ref": "#/definitions/AWS::WAFv2::RuleGroup.VisibilityConfig"
+                        }
+                    },
+                    "required": [
+                        "Capacity",
+                        "Scope",
+                        "VisibilityConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::RuleGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.AndStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Statement"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Statements"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.ByteMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.FieldToMatch"
+                },
+                "PositionalConstraint": {
+                    "type": "string"
+                },
+                "SearchString": {
+                    "type": "string"
+                },
+                "SearchStringBase64": {
+                    "type": "string"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "PositionalConstraint",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.CustomResponseBody": {
+            "additionalProperties": false,
+            "properties": {
+                "Content": {
+                    "type": "string"
+                },
+                "ContentType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Content",
+                "ContentType"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "AllQueryArguments": {
+                    "type": "object"
+                },
+                "Body": {
+                    "type": "object"
+                },
+                "JsonBody": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.JsonBody"
+                },
+                "Method": {
+                    "type": "object"
+                },
+                "QueryString": {
+                    "type": "object"
+                },
+                "SingleHeader": {
+                    "type": "object"
+                },
+                "SingleQueryArgument": {
+                    "type": "object"
+                },
+                "UriPath": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.ForwardedIPConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FallbackBehavior": {
+                    "type": "string"
+                },
+                "HeaderName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FallbackBehavior",
+                "HeaderName"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.GeoMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "CountryCodes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.ForwardedIPConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.IPSetForwardedIPConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FallbackBehavior": {
+                    "type": "string"
+                },
+                "HeaderName": {
+                    "type": "string"
+                },
+                "Position": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FallbackBehavior",
+                "HeaderName",
+                "Position"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.IPSetReferenceStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "IPSetForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.IPSetForwardedIPConfiguration"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.JsonBody": {
+            "additionalProperties": false,
+            "properties": {
+                "InvalidFallbackBehavior": {
+                    "type": "string"
+                },
+                "MatchPattern": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.JsonMatchPattern"
+                },
+                "MatchScope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchPattern",
+                "MatchScope"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.JsonMatchPattern": {
+            "additionalProperties": false,
+            "properties": {
+                "All": {
+                    "type": "object"
+                },
+                "IncludedPaths": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.Label": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.LabelMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Scope"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.LabelSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.NotStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Statement"
+                }
+            },
+            "required": [
+                "Statement"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.OrStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Statement"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Statements"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.RateBasedStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregateKeyType": {
+                    "type": "string"
+                },
+                "ForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.ForwardedIPConfiguration"
+                },
+                "Limit": {
+                    "type": "number"
+                },
+                "ScopeDownStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Statement"
+                }
+            },
+            "required": [
+                "AggregateKeyType",
+                "Limit"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.RegexPatternSetReferenceStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn",
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.RuleAction"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "RuleLabels": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Label"
+                    },
+                    "type": "array"
+                },
+                "Statement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Statement"
+                },
+                "VisibilityConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.VisibilityConfig"
+                }
+            },
+            "required": [
+                "Name",
+                "Priority",
+                "Statement",
+                "VisibilityConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.RuleAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Allow": {
+                    "type": "object"
+                },
+                "Block": {
+                    "type": "object"
+                },
+                "Count": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.SizeConstraintStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.FieldToMatch"
+                },
+                "Size": {
+                    "type": "number"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "FieldToMatch",
+                "Size",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.SqliMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.Statement": {
+            "additionalProperties": false,
+            "properties": {
+                "AndStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.AndStatement"
+                },
+                "ByteMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.ByteMatchStatement"
+                },
+                "GeoMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.GeoMatchStatement"
+                },
+                "IPSetReferenceStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.IPSetReferenceStatement"
+                },
+                "LabelMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.LabelMatchStatement"
+                },
+                "NotStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.NotStatement"
+                },
+                "OrStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.OrStatement"
+                },
+                "RateBasedStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.RateBasedStatement"
+                },
+                "RegexPatternSetReferenceStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.RegexPatternSetReferenceStatement"
+                },
+                "SizeConstraintStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.SizeConstraintStatement"
+                },
+                "SqliMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.SqliMatchStatement"
+                },
+                "XssMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.XssMatchStatement"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.TextTransformation": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Priority",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.VisibilityConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "SampledRequestsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "CloudWatchMetricsEnabled",
+                "MetricName",
+                "SampledRequestsEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.XssMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomResponseBodies": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomResponseBody"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "DefaultAction": {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL.DefaultAction"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFv2::WebACL.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Scope": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VisibilityConfig": {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL.VisibilityConfig"
+                        }
+                    },
+                    "required": [
+                        "DefaultAction",
+                        "Scope",
+                        "VisibilityConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::WebACL"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.AllowAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomRequestHandling": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomRequestHandling"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.AndStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Statements"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.BlockAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomResponse": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomResponse"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.ByteMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.FieldToMatch"
+                },
+                "PositionalConstraint": {
+                    "type": "string"
+                },
+                "SearchString": {
+                    "type": "string"
+                },
+                "SearchStringBase64": {
+                    "type": "string"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "PositionalConstraint",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.CountAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomRequestHandling": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomRequestHandling"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.CustomHTTPHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.CustomRequestHandling": {
+            "additionalProperties": false,
+            "properties": {
+                "InsertHeaders": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomHTTPHeader"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "InsertHeaders"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.CustomResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomResponseBodyKey": {
+                    "type": "string"
+                },
+                "ResponseCode": {
+                    "type": "number"
+                },
+                "ResponseHeaders": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomHTTPHeader"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ResponseCode"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.CustomResponseBody": {
+            "additionalProperties": false,
+            "properties": {
+                "Content": {
+                    "type": "string"
+                },
+                "ContentType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Content",
+                "ContentType"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.DefaultAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Allow": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.AllowAction"
+                },
+                "Block": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.BlockAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.ExcludedRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "AllQueryArguments": {
+                    "type": "object"
+                },
+                "Body": {
+                    "type": "object"
+                },
+                "JsonBody": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.JsonBody"
+                },
+                "Method": {
+                    "type": "object"
+                },
+                "QueryString": {
+                    "type": "object"
+                },
+                "SingleHeader": {
+                    "type": "object"
+                },
+                "SingleQueryArgument": {
+                    "type": "object"
+                },
+                "UriPath": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.ForwardedIPConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FallbackBehavior": {
+                    "type": "string"
+                },
+                "HeaderName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FallbackBehavior",
+                "HeaderName"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.GeoMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "CountryCodes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.ForwardedIPConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.IPSetForwardedIPConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FallbackBehavior": {
+                    "type": "string"
+                },
+                "HeaderName": {
+                    "type": "string"
+                },
+                "Position": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FallbackBehavior",
+                "HeaderName",
+                "Position"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.IPSetReferenceStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "IPSetForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.IPSetForwardedIPConfiguration"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.JsonBody": {
+            "additionalProperties": false,
+            "properties": {
+                "InvalidFallbackBehavior": {
+                    "type": "string"
+                },
+                "MatchPattern": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.JsonMatchPattern"
+                },
+                "MatchScope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchPattern",
+                "MatchScope"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.JsonMatchPattern": {
+            "additionalProperties": false,
+            "properties": {
+                "All": {
+                    "type": "object"
+                },
+                "IncludedPaths": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.Label": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.LabelMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Scope"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.ManagedRuleGroupStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludedRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.ExcludedRule"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "ScopeDownStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                },
+                "VendorName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "VendorName"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.NotStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                }
+            },
+            "required": [
+                "Statement"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.OrStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Statements"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.OverrideAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "object"
+                },
+                "None": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.RateBasedStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregateKeyType": {
+                    "type": "string"
+                },
+                "ForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.ForwardedIPConfiguration"
+                },
+                "Limit": {
+                    "type": "number"
+                },
+                "ScopeDownStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                }
+            },
+            "required": [
+                "AggregateKeyType",
+                "Limit"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.RegexPatternSetReferenceStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn",
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.RuleAction"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "OverrideAction": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.OverrideAction"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "RuleLabels": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.Label"
+                    },
+                    "type": "array"
+                },
+                "Statement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                },
+                "VisibilityConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.VisibilityConfig"
+                }
+            },
+            "required": [
+                "Name",
+                "Priority",
+                "Statement",
+                "VisibilityConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.RuleAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Allow": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.AllowAction"
+                },
+                "Block": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.BlockAction"
+                },
+                "Count": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.CountAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.RuleGroupReferenceStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "ExcludedRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.ExcludedRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.SizeConstraintStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.FieldToMatch"
+                },
+                "Size": {
+                    "type": "number"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "FieldToMatch",
+                "Size",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.SqliMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.Statement": {
+            "additionalProperties": false,
+            "properties": {
+                "AndStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.AndStatement"
+                },
+                "ByteMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.ByteMatchStatement"
+                },
+                "GeoMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.GeoMatchStatement"
+                },
+                "IPSetReferenceStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.IPSetReferenceStatement"
+                },
+                "LabelMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.LabelMatchStatement"
+                },
+                "ManagedRuleGroupStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.ManagedRuleGroupStatement"
+                },
+                "NotStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.NotStatement"
+                },
+                "OrStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.OrStatement"
+                },
+                "RateBasedStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.RateBasedStatement"
+                },
+                "RegexPatternSetReferenceStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.RegexPatternSetReferenceStatement"
+                },
+                "RuleGroupReferenceStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.RuleGroupReferenceStatement"
+                },
+                "SizeConstraintStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.SizeConstraintStatement"
+                },
+                "SqliMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.SqliMatchStatement"
+                },
+                "XssMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.XssMatchStatement"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.TextTransformation": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Priority",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.VisibilityConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "SampledRequestsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "CloudWatchMetricsEnabled",
+                "MetricName",
+                "SampledRequestsEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.XssMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACLAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "WebACLArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourceArn",
+                        "WebACLArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::WebACLAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::Assistant": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ServerSideEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Wisdom::Assistant.ServerSideEncryptionConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Wisdom::Assistant"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::Assistant.ServerSideEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Wisdom::AssistantAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssistantId": {
+                            "type": "string"
+                        },
+                        "Association": {
+                            "$ref": "#/definitions/AWS::Wisdom::AssistantAssociation.AssociationData"
+                        },
+                        "AssociationType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AssistantId",
+                        "Association",
+                        "AssociationType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Wisdom::AssistantAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::AssistantAssociation.AssociationData": {
+            "additionalProperties": false,
+            "properties": {
+                "KnowledgeBaseId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KnowledgeBaseId"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::KnowledgeBase": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "KnowledgeBaseType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RenderingConfiguration": {
+                            "$ref": "#/definitions/AWS::Wisdom::KnowledgeBase.RenderingConfiguration"
+                        },
+                        "ServerSideEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Wisdom::KnowledgeBase.ServerSideEncryptionConfiguration"
+                        },
+                        "SourceConfiguration": {
+                            "$ref": "#/definitions/AWS::Wisdom::KnowledgeBase.SourceConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "KnowledgeBaseType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Wisdom::KnowledgeBase"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::KnowledgeBase.AppIntegrationsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AppIntegrationArn": {
+                    "type": "string"
+                },
+                "ObjectFields": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AppIntegrationArn",
+                "ObjectFields"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::KnowledgeBase.RenderingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "TemplateUri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Wisdom::KnowledgeBase.ServerSideEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Wisdom::KnowledgeBase.SourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AppIntegrations": {
+                    "$ref": "#/definitions/AWS::Wisdom::KnowledgeBase.AppIntegrationsConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WorkSpaces::ConnectionAlias": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionString": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConnectionString"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WorkSpaces::ConnectionAlias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::ConnectionAlias.ConnectionAliasAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "AssociatedAccountId": {
+                    "type": "string"
+                },
+                "AssociationStatus": {
+                    "type": "string"
+                },
+                "ConnectionIdentifier": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WorkSpaces::Workspace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "DirectoryId": {
+                            "type": "string"
+                        },
+                        "RootVolumeEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        },
+                        "UserVolumeEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "VolumeEncryptionKey": {
+                            "type": "string"
+                        },
+                        "WorkspaceProperties": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::Workspace.WorkspaceProperties"
+                        }
+                    },
+                    "required": [
+                        "BundleId",
+                        "DirectoryId",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WorkSpaces::Workspace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::Workspace.WorkspaceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeTypeName": {
+                    "type": "string"
+                },
+                "RootVolumeSizeGib": {
+                    "type": "number"
+                },
+                "RunningMode": {
+                    "type": "string"
+                },
+                "RunningModeAutoStopTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "UserVolumeSizeGib": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::XRay::Group": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FilterExpression": {
+                            "type": "string"
+                        },
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "InsightsConfiguration": {
+                            "$ref": "#/definitions/AWS::XRay::Group.InsightsConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "type": "object"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::XRay::Group"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::XRay::Group.InsightsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InsightsEnabled": {
+                    "type": "boolean"
+                },
+                "NotificationsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::XRay::SamplingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RuleName": {
+                            "type": "string"
+                        },
+                        "SamplingRule": {
+                            "$ref": "#/definitions/AWS::XRay::SamplingRule.SamplingRule"
+                        },
+                        "SamplingRuleRecord": {
+                            "$ref": "#/definitions/AWS::XRay::SamplingRule.SamplingRuleRecord"
+                        },
+                        "SamplingRuleUpdate": {
+                            "$ref": "#/definitions/AWS::XRay::SamplingRule.SamplingRuleUpdate"
+                        },
+                        "Tags": {
+                            "items": {
+                                "type": "object"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::XRay::SamplingRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::XRay::SamplingRule.SamplingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "FixedRate": {
+                    "type": "number"
+                },
+                "HTTPMethod": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "ReservoirSize": {
+                    "type": "number"
+                },
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RuleARN": {
+                    "type": "string"
+                },
+                "RuleName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                },
+                "ServiceType": {
+                    "type": "string"
+                },
+                "URLPath": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::XRay::SamplingRule.SamplingRuleRecord": {
+            "additionalProperties": false,
+            "properties": {
+                "CreatedAt": {
+                    "type": "string"
+                },
+                "ModifiedAt": {
+                    "type": "string"
+                },
+                "SamplingRule": {
+                    "$ref": "#/definitions/AWS::XRay::SamplingRule.SamplingRule"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::XRay::SamplingRule.SamplingRuleUpdate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "FixedRate": {
+                    "type": "number"
+                },
+                "HTTPMethod": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "ReservoirSize": {
+                    "type": "number"
+                },
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RuleARN": {
+                    "type": "string"
+                },
+                "RuleName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                },
+                "ServiceType": {
+                    "type": "string"
+                },
+                "URLPath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "Alexa::ASK::Skill": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationConfiguration": {
+                            "$ref": "#/definitions/Alexa::ASK::Skill.AuthenticationConfiguration"
+                        },
+                        "SkillPackage": {
+                            "$ref": "#/definitions/Alexa::ASK::Skill.SkillPackage"
+                        },
+                        "VendorId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthenticationConfiguration",
+                        "SkillPackage",
+                        "VendorId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "Alexa::ASK::Skill"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "Alexa::ASK::Skill.AuthenticationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "RefreshToken": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClientId",
+                "ClientSecret",
+                "RefreshToken"
+            ],
+            "type": "object"
+        },
+        "Alexa::ASK::Skill.Overrides": {
+            "additionalProperties": false,
+            "properties": {
+                "Manifest": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "Alexa::ASK::Skill.SkillPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Overrides": {
+                    "$ref": "#/definitions/Alexa::ASK::Skill.Overrides"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3BucketRole": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                },
+                "S3ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "Parameter": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedPattern": {
+                    "type": "string"
+                },
+                "AllowedValues": {
+                    "type": "array"
+                },
+                "ConstraintDescription": {
+                    "type": "string"
+                },
+                "Default": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "MaxLength": {
+                    "type": "string"
+                },
+                "MaxValue": {
+                    "type": "string"
+                },
+                "MinLength": {
+                    "type": "string"
+                },
+                "MinValue": {
+                    "type": "string"
+                },
+                "NoEcho": {
+                    "type": [
+                        "string",
+                        "boolean"
+                    ]
+                },
+                "Type": {
+                    "enum": [
+                        "String",
+                        "Number",
+                        "List\u003cNumber\u003e",
+                        "CommaDelimitedList",
+                        "AWS::EC2::AvailabilityZone::Name",
+                        "AWS::EC2::Image::Id",
+                        "AWS::EC2::Instance::Id",
+                        "AWS::EC2::KeyPair::KeyName",
+                        "AWS::EC2::SecurityGroup::GroupName",
+                        "AWS::EC2::SecurityGroup::Id",
+                        "AWS::EC2::Subnet::Id",
+                        "AWS::EC2::Volume::Id",
+                        "AWS::EC2::VPC::Id",
+                        "AWS::Route53::HostedZone::Id",
+                        "List\u003cAWS::EC2::AvailabilityZone::Name\u003e",
+                        "List\u003cAWS::EC2::Image::Id\u003e",
+                        "List\u003cAWS::EC2::Instance::Id\u003e",
+                        "List\u003cAWS::EC2::SecurityGroup::GroupName\u003e",
+                        "List\u003cAWS::EC2::SecurityGroup::Id\u003e",
+                        "List\u003cAWS::EC2::Subnet::Id\u003e",
+                        "List\u003cAWS::EC2::Volume::Id\u003e",
+                        "List\u003cAWS::EC2::VPC::Id\u003e",
+                        "List\u003cAWS::Route53::HostedZone::Id\u003e",
+                        "List\u003cString\u003e",
+                        "AWS::SSM::Parameter::Name",
+                        "AWS::SSM::Parameter::Value\u003cString\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cString\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cCommaDelimitedList\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::AvailabilityZone::Name\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::Image::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::Instance::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::SecurityGroup::GroupName\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::SecurityGroup::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::Subnet::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::Volume::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::VPC::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::Route53::HostedZone::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::AvailabilityZone::Name\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::Image::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::Instance::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::SecurityGroup::GroupName\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::SecurityGroup::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::Subnet::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::Volume::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::VPC::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::Route53::HostedZone::Id\u003e\u003e"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "Tag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        }
+    },
+    "properties": {
+        "AWSTemplateFormatVersion": {
+            "enum": [
+                "2010-09-09"
+            ],
+            "type": "string"
+        },
+        "Conditions": {
+            "additionalProperties": false,
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "Description": {
+            "description": "Template description",
+            "maxLength": 1024,
+            "type": "string"
+        },
+        "Mappings": {
+            "additionalProperties": false,
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "Metadata": {
+            "type": "object"
+        },
+        "Outputs": {
+            "additionalProperties": false,
+            "maxProperties": 60,
+            "minProperties": 1,
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "Parameters": {
+            "additionalProperties": false,
+            "maxProperties": 50,
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "$ref": "#/definitions/Parameter"
+                }
+            },
+            "type": "object"
+        },
+        "Resources": {
+            "additionalProperties": false,
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/AWS::ACMPCA::Certificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthorityActivation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ACMPCA::Permission"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::APS::RuleGroupsNamespace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::APS::Workspace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AccessAnalyzer::Analyzer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Configuration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AmazonMQ::ConfigurationAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Amplify::App"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Amplify::Branch"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Amplify::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AmplifyUIBuilder::Theme"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Account"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::ApiKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Authorizer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::BasePathMapping"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::ClientCertificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Deployment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::DocumentationPart"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::DocumentationVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::DomainName"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::GatewayResponse"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Method"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Model"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::RequestValidator"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Resource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::RestApi"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Stage"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::UsagePlan"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::UsagePlanKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::VpcLink"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Api"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::ApiMapping"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Authorizer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Deployment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::DomainName"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Integration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::IntegrationResponse"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Model"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Route"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::RouteResponse"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Stage"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::VpcLink"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::ConfigurationProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::Deployment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::DeploymentStrategy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::Environment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::HostedConfigurationVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppFlow::Flow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppIntegrations::EventIntegration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::GatewayRoute"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::Mesh"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::Route"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualNode"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualRouter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualService"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppRunner::Service"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlock"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::ApplicationFleetAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::DirectoryConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::Fleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::ImageBuilder"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::Stack"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::StackFleetAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::StackUserAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::ApiCache"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::ApiKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::FunctionConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLSchema"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::Resolver"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApplicationInsights::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Athena::DataCatalog"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Athena::NamedQuery"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Athena::PreparedStatement"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Athena::WorkGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AuditManager::Assessment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::LaunchConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::LifecycleHook"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::ScheduledAction"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::WarmPool"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Backup::BackupPlan"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Backup::BackupSelection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Backup::BackupVault"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Backup::Framework"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Backup::ReportPlan"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Batch::ComputeEnvironment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Batch::JobDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Batch::JobQueue"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Batch::SchedulingPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Budgets::Budget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CE::AnomalyMonitor"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CE::AnomalySubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CE::CostCategory"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CUR::ReportDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cassandra::Keyspace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cassandra::Table"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CertificateManager::Account"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CertificateManager::Certificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Chatbot::SlackChannelConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cloud9::EnvironmentEC2"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::CustomResource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::Macro"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::ModuleDefaultVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::ModuleVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::PublicTypeVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::Publisher"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::ResourceDefaultVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::ResourceVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::Stack"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::TypeActivation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::WaitCondition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::WaitConditionHandle"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::CachePolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::CloudFrontOriginAccessIdentity"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::Distribution"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::Function"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::KeyGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::PublicKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::RealtimeLogConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudTrail::Trail"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::Alarm"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::CompositeAlarm"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::Dashboard"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::InsightRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::MetricStream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeArtifact::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeArtifact::Repository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeBuild::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeBuild::ReportGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeBuild::SourceCredential"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeCommit::Repository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeDeploy::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeGuruProfiler::ProfilingGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeGuruReviewer::RepositoryAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodePipeline::CustomActionType"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodePipeline::Pipeline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodePipeline::Webhook"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeStar::GitHubRepository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeStarConnections::Connection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeStarNotifications::NotificationRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::IdentityPool"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::IdentityPoolRoleAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolClient"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolDomain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolIdentityProvider"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolResourceServer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolUICustomizationAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolUser"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolUserToGroupAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::AggregationAuthorization"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::ConfigRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::ConfigurationAggregator"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::ConfigurationRecorder"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::ConformancePack"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::DeliveryChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::OrganizationConfigRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::OrganizationConformancePack"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::RemediationConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::StoredQuery"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::ContactFlow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::ContactFlowModule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::HoursOfOperation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::QuickConnect"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::UserHierarchyGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CustomerProfiles::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CustomerProfiles::Integration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CustomerProfiles::ObjectType"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DAX::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DAX::ParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DAX::SubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DLM::LifecyclePolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::Certificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::EventSubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::ReplicationInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::ReplicationSubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::ReplicationTask"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Dataset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Job"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Recipe"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Ruleset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Schedule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataPipeline::Pipeline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::Agent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationEFS"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationFSxWindows"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationHDFS"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationNFS"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationObjectStorage"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationS3"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationSMB"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::Task"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Detective::Graph"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Detective::MemberInvitation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DevOpsGuru::NotificationChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DevOpsGuru::ResourceCollection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DirectoryService::MicrosoftAD"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DirectoryService::SimpleAD"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DocDB::DBCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DocDB::DBClusterParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DocDB::DBInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DocDB::DBSubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::CapacityReservation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::CapacityReservationFleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::CarrierGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnAuthorizationRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnRoute"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnTargetNetworkAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::CustomerGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::DHCPOptions"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::EC2Fleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::EIP"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::EIPAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::EgressOnlyInternetGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::EnclaveCertificateIamRoleAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::FlowLog"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::GatewayRouteTableAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::Host"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::IPAM"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::IPAMAllocation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::IPAMPool"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::IPAMScope"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::Instance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::InternetGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::LaunchTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::LocalGatewayRoute"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::LocalGatewayRouteTableVPCAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NatGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkAcl"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkAclEntry"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkInsightsPath"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkInterface"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkInterfaceAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkInterfacePermission"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::PlacementGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::PrefixList"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::Route"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::RouteTable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SecurityGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SecurityGroupEgress"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SecurityGroupIngress"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SpotFleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::Subnet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SubnetCidrBlock"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SubnetNetworkAclAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SubnetRouteTableAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilterRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorSession"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorTarget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayConnect"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayMulticastDomain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayMulticastDomainAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayMulticastGroupMember"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayMulticastGroupSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayPeeringAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayRoute"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayRouteTable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayRouteTableAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayRouteTablePropagation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayVpcAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPC"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCCidrBlock"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCDHCPOptionsAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCEndpointConnectionNotification"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCEndpointService"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCEndpointServicePermissions"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCGatewayAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCPeeringConnection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPNConnection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPNConnectionRoute"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPNGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPNGatewayRoutePropagation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::Volume"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VolumeAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECR::PublicRepository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECR::RegistryPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECR::ReplicationConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECR::Repository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::CapacityProvider"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::ClusterCapacityProviderAssociations"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::PrimaryTaskSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::Service"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::TaskDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::TaskSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EFS::AccessPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EFS::FileSystem"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EFS::MountTarget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EKS::Addon"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EKS::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EKS::FargateProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EKS::Nodegroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::SecurityConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::Step"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::Studio"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::StudioSessionMapping"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMRContainers::VirtualCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::CacheCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::GlobalReplicationGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::ParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::SecurityGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::SecurityGroupIngress"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::SubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::UserGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::ApplicationVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::ConfigurationTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::Environment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerCertificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::LoadBalancer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::TargetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EventSchemas::Discoverer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EventSchemas::Registry"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EventSchemas::RegistryPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EventSchemas::Schema"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::ApiDestination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::Archive"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::Connection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::EventBus"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::EventBusPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::Rule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Evidently::Experiment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Evidently::Feature"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Evidently::Launch"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Evidently::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FIS::ExperimentTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FMS::NotificationChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FMS::Policy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FSx::FileSystem"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FinSpace::Environment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::Detector"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::EntityType"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::EventType"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::Label"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::Outcome"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::Variable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::Alias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::Build"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::Fleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::GameServerGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::GameSessionQueue"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::MatchmakingConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::MatchmakingRuleSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::Script"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GlobalAccelerator::Accelerator"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GlobalAccelerator::EndpointGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GlobalAccelerator::Listener"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Classifier"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Connection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Crawler"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::DataCatalogEncryptionSettings"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Database"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::DevEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Job"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::MLTransform"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Partition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Registry"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Schema"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::SchemaVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::SchemaVersionMetadata"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::SecurityConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Table"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Trigger"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Workflow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::ConnectorDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::ConnectorDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::CoreDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::CoreDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::DeviceDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::DeviceDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::Group"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::GroupVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::LoggerDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::LoggerDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::SubscriptionDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::SubscriptionDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GroundStation::Config"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GroundStation::DataflowEndpointGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GroundStation::MissionProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::Detector"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::Filter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::IPSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::Master"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::Member"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::ThreatIntelSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::HealthLake::FHIRDatastore"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::AccessKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::Group"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::InstanceProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::ManagedPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::OIDCProvider"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::Policy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::Role"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::SAMLProvider"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::ServerCertificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::ServiceLinkedRole"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::UserToGroupAddition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::VirtualMFADevice"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::Channel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::PlaybackKeyPair"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::StreamKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::Component"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::DistributionConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::Image"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ImagePipeline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::InfrastructureConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Inspector::AssessmentTarget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Inspector::AssessmentTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Inspector::ResourceGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT1Click::Device"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT1Click::Placement"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT1Click::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Authorizer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Certificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::CustomMetric"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Dimension"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::DomainConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::FleetMetric"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::JobTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Logging"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::MitigationAction"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Policy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::PolicyPrincipalAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::ProvisioningTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::ResourceSpecificLogging"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::ScheduledAudit"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::SecurityProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Thing"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::ThingPrincipalAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::TopicRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::TopicRuleDestination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Channel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Dataset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Datastore"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTCoreDeviceAdvisor::SuiteDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTEvents::DetectorModel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTEvents::Input"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTFleetHub::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Asset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Dashboard"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Gateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Portal"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTThingsGraph::FlowTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::Destination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::DeviceProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::FuotaTask"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::MulticastGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::PartnerAccount"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::ServiceProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::WirelessGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KMS::Alias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KMS::Key"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KMS::ReplicaKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Kendra::DataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Kendra::Faq"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Kendra::Index"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Kinesis::Stream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Kinesis::StreamConsumer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalytics::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LakeFormation::DataLakeSettings"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LakeFormation::Permissions"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LakeFormation::Resource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::Alias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::CodeSigningConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::EventInvokeConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::Function"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::LayerVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::LayerVersionPermission"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::Permission"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::Version"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LicenseManager::Grant"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LicenseManager::License"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lightsail::Database"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lightsail::Disk"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lightsail::Instance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lightsail::StaticIp"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::GeofenceCollection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::Map"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::PlaceIndex"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::RouteCalculator"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::Tracker"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::TrackerConsumer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::Destination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::LogGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::LogStream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::MetricFilter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::QueryDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::ResourcePolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::SubscriptionFilter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LookoutEquipment::InferenceScheduler"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LookoutMetrics::Alert"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LookoutVision::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MSK::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MWAA::Environment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Macie::CustomDataIdentifier"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Macie::FindingsFilter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Macie::Session"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ManagedBlockchain::Member"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ManagedBlockchain::Node"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowEntitlement"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowOutput"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowVpcInterface"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConvert::JobTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConvert::Preset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConvert::Queue"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::Channel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::Input"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::InputSecurityGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaPackage::Asset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaPackage::Channel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaStore::Container"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MemoryDB::ACL"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MemoryDB::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MemoryDB::ParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MemoryDB::SubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MemoryDB::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::DBCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::DBClusterParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::DBInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::DBParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::DBSubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::Firewall"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::LoggingConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::CustomerGatewayAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::Device"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::GlobalNetwork"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::Link"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::LinkAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::Site"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::TransitGatewayRegistration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NimbleStudio::LaunchProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NimbleStudio::StreamingImage"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NimbleStudio::Studio"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::App"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::ElasticLoadBalancerAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::Instance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::Layer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::Stack"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::UserProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::Volume"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorksCM::Server"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Panorama::ApplicationInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Panorama::Package"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Panorama::PackageVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::ADMChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::APNSChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::APNSSandboxChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::APNSVoipChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::APNSVoipSandboxChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::App"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::ApplicationSettings"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::BaiduChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::Campaign"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::EmailChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::EmailTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::EventStream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::GCMChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::SMSChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::Segment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::SmsTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::VoiceChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PinpointEmail::DedicatedIpPool"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PinpointEmail::Identity"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QLDB::Ledger"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QLDB::Stream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Analysis"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Dashboard"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Template"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Theme"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RAM::ResourceShare"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBClusterParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBProxy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBProxyEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBProxyTargetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBSecurityGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBSecurityGroupIngress"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBSubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::EventSubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::GlobalCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::OptionGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RUM::AppMonitor"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::ClusterParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::ClusterSecurityGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::ClusterSecurityGroupIngress"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::ClusterSubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::EndpointAccess"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::EndpointAuthorization"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::EventSubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::ScheduledAction"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Environment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Route"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Service"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Rekognition::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ResilienceHub::App"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ResilienceHub::ResiliencyPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ResourceGroups::Group"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::Fleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::Robot"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::RobotApplication"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::RobotApplicationVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::SimulationApplication"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::SimulationApplicationVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::DNSSEC"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::HealthCheck"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::HostedZone"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::KeySigningKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::RecordSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::RecordSetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::ControlPanel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::RoutingControl"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::SafetyRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryReadiness::Cell"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ReadinessCheck"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryReadiness::RecoveryGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::FirewallDomainList"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::FirewallRuleGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::FirewallRuleGroupAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverDNSSECConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverQueryLoggingConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverRuleAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::AccessPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::Bucket"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::BucketPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::MultiRegionAccessPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::MultiRegionAccessPointPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::StorageLens"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3ObjectLambda::AccessPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3ObjectLambda::AccessPointPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3Outposts::AccessPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3Outposts::Bucket"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3Outposts::BucketPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3Outposts::Endpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SDB::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ConfigurationSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ContactList"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ReceiptFilter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ReceiptRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ReceiptRuleSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::Template"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SNS::Subscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SNS::Topic"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SNS::TopicPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SQS::Queue"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SQS::QueuePolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::Association"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::Document"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::MaintenanceWindow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTarget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::Parameter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::PatchBaseline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::ResourceDataSync"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSMContacts::Contact"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSMContacts::ContactChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSMIncidents::ReplicationSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::Assignment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::InstanceAccessControlAttributeConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::PermissionSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::App"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::CodeRepository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Device"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::DeviceFleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Endpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::EndpointConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::FeatureGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Image"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::ImageVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Model"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelPackageGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::NotebookInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::NotebookInstanceLifecycleConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Pipeline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::UserProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Workteam"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecretsManager::ResourcePolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecretsManager::RotationSchedule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecretsManager::Secret"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecretsManager::SecretTargetAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::Hub"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::AcceptedPortfolioShare"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::CloudFormationProduct"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::CloudFormationProvisionedProduct"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::LaunchNotificationConstraint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::LaunchRoleConstraint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::LaunchTemplateConstraint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::Portfolio"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::PortfolioPrincipalAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::PortfolioProductAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::PortfolioShare"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::ResourceUpdateConstraint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::ServiceAction"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::ServiceActionAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::StackSetConstraint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::TagOption"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::TagOptionAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalogAppRegistry::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalogAppRegistry::AttributeGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalogAppRegistry::ResourceAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::HttpNamespace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::Instance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::PrivateDnsNamespace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::PublicDnsNamespace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::Service"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Signer::ProfilePermission"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Signer::SigningProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::StepFunctions::Activity"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Timestream::Database"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Timestream::ScheduledQuery"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Timestream::Table"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Transfer::Server"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Transfer::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Transfer::Workflow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::ByteMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::IPSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::Rule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::SizeConstraintSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::SqlInjectionMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::WebACL"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::XssMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::ByteMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::GeoMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::IPSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::RateBasedRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::RegexPatternSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::Rule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::SizeConstraintSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::SqlInjectionMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::WebACL"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::WebACLAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::XssMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::IPSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::LoggingConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::RegexPatternSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::RuleGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACLAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Wisdom::Assistant"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Wisdom::AssistantAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Wisdom::KnowledgeBase"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WorkSpaces::ConnectionAlias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WorkSpaces::Workspace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::XRay::Group"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::XRay::SamplingRule"
+                        },
+                        {
+                            "$ref": "#/definitions/Alexa::ASK::Skill"
+                        }
+                    ]
+                }
+            },
+            "type": "object"
+        },
+        "Transform": {
+            "oneOf": [
+                {
+                    "type": [
+                        "string"
+                    ]
+                },
+                {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            ]
+        }
+    },
+    "required": [
+        "Resources"
+    ],
+    "type": "object"
+}
\ No newline at end of file
diff --git a/goformation/schema/sam.go b/goformation/schema/sam.go
new file mode 100644
index 0000000000..a00477ec42
--- /dev/null
+++ b/goformation/schema/sam.go
@@ -0,0 +1,126243 @@
+package schema
+
+// SamSchema defined a JSON Schema that can be used to validate CloudFormation/SAM templates
+var SamSchema = `{
+    "$id": "http://json-schema.org/draft-04/schema#",
+    "additionalProperties": false,
+    "definitions": {
+        "AWS::ACMPCA::Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiPassthrough": {
+                            "$ref": "#/definitions/AWS::ACMPCA::Certificate.ApiPassthrough"
+                        },
+                        "CertificateAuthorityArn": {
+                            "type": "string"
+                        },
+                        "CertificateSigningRequest": {
+                            "type": "string"
+                        },
+                        "SigningAlgorithm": {
+                            "type": "string"
+                        },
+                        "TemplateArn": {
+                            "type": "string"
+                        },
+                        "Validity": {
+                            "$ref": "#/definitions/AWS::ACMPCA::Certificate.Validity"
+                        },
+                        "ValidityNotBefore": {
+                            "$ref": "#/definitions/AWS::ACMPCA::Certificate.Validity"
+                        }
+                    },
+                    "required": [
+                        "CertificateAuthorityArn",
+                        "CertificateSigningRequest",
+                        "SigningAlgorithm",
+                        "Validity"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ACMPCA::Certificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.ApiPassthrough": {
+            "additionalProperties": false,
+            "properties": {
+                "Extensions": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.Extensions"
+                },
+                "Subject": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.Subject"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.EdiPartyName": {
+            "additionalProperties": false,
+            "properties": {
+                "NameAssigner": {
+                    "type": "string"
+                },
+                "PartyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NameAssigner",
+                "PartyName"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.ExtendedKeyUsage": {
+            "additionalProperties": false,
+            "properties": {
+                "ExtendedKeyUsageObjectIdentifier": {
+                    "type": "string"
+                },
+                "ExtendedKeyUsageType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.Extensions": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificatePolicies": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ACMPCA::Certificate.PolicyInformation"
+                    },
+                    "type": "array"
+                },
+                "ExtendedKeyUsage": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ACMPCA::Certificate.ExtendedKeyUsage"
+                    },
+                    "type": "array"
+                },
+                "KeyUsage": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.KeyUsage"
+                },
+                "SubjectAlternativeNames": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ACMPCA::Certificate.GeneralName"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.GeneralName": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.Subject"
+                },
+                "DnsName": {
+                    "type": "string"
+                },
+                "EdiPartyName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.EdiPartyName"
+                },
+                "IpAddress": {
+                    "type": "string"
+                },
+                "OtherName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.OtherName"
+                },
+                "RegisteredId": {
+                    "type": "string"
+                },
+                "Rfc822Name": {
+                    "type": "string"
+                },
+                "UniformResourceIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.KeyUsage": {
+            "additionalProperties": false,
+            "properties": {
+                "CRLSign": {
+                    "type": "boolean"
+                },
+                "DataEncipherment": {
+                    "type": "boolean"
+                },
+                "DecipherOnly": {
+                    "type": "boolean"
+                },
+                "DigitalSignature": {
+                    "type": "boolean"
+                },
+                "EncipherOnly": {
+                    "type": "boolean"
+                },
+                "KeyAgreement": {
+                    "type": "boolean"
+                },
+                "KeyCertSign": {
+                    "type": "boolean"
+                },
+                "KeyEncipherment": {
+                    "type": "boolean"
+                },
+                "NonRepudiation": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.OtherName": {
+            "additionalProperties": false,
+            "properties": {
+                "TypeId": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TypeId",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.PolicyInformation": {
+            "additionalProperties": false,
+            "properties": {
+                "CertPolicyId": {
+                    "type": "string"
+                },
+                "PolicyQualifiers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ACMPCA::Certificate.PolicyQualifierInfo"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CertPolicyId"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.PolicyQualifierInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "PolicyQualifierId": {
+                    "type": "string"
+                },
+                "Qualifier": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.Qualifier"
+                }
+            },
+            "required": [
+                "PolicyQualifierId",
+                "Qualifier"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.Qualifier": {
+            "additionalProperties": false,
+            "properties": {
+                "CpsUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CpsUri"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.Subject": {
+            "additionalProperties": false,
+            "properties": {
+                "CommonName": {
+                    "type": "string"
+                },
+                "Country": {
+                    "type": "string"
+                },
+                "DistinguishedNameQualifier": {
+                    "type": "string"
+                },
+                "GenerationQualifier": {
+                    "type": "string"
+                },
+                "GivenName": {
+                    "type": "string"
+                },
+                "Initials": {
+                    "type": "string"
+                },
+                "Locality": {
+                    "type": "string"
+                },
+                "Organization": {
+                    "type": "string"
+                },
+                "OrganizationalUnit": {
+                    "type": "string"
+                },
+                "Pseudonym": {
+                    "type": "string"
+                },
+                "SerialNumber": {
+                    "type": "string"
+                },
+                "State": {
+                    "type": "string"
+                },
+                "Surname": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.Validity": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CsrExtensions": {
+                            "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.CsrExtensions"
+                        },
+                        "KeyAlgorithm": {
+                            "type": "string"
+                        },
+                        "KeyStorageSecurityStandard": {
+                            "type": "string"
+                        },
+                        "RevocationConfiguration": {
+                            "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.RevocationConfiguration"
+                        },
+                        "SigningAlgorithm": {
+                            "type": "string"
+                        },
+                        "Subject": {
+                            "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.Subject"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "KeyAlgorithm",
+                        "SigningAlgorithm",
+                        "Subject",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ACMPCA::CertificateAuthority"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.AccessDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessLocation": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.GeneralName"
+                },
+                "AccessMethod": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.AccessMethod"
+                }
+            },
+            "required": [
+                "AccessLocation",
+                "AccessMethod"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.AccessMethod": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessMethodType": {
+                    "type": "string"
+                },
+                "CustomObjectIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.CrlConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomCname": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "ExpirationInDays": {
+                    "type": "number"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3ObjectAcl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.CsrExtensions": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyUsage": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.KeyUsage"
+                },
+                "SubjectInformationAccess": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.AccessDescription"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.EdiPartyName": {
+            "additionalProperties": false,
+            "properties": {
+                "NameAssigner": {
+                    "type": "string"
+                },
+                "PartyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NameAssigner",
+                "PartyName"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.GeneralName": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.Subject"
+                },
+                "DnsName": {
+                    "type": "string"
+                },
+                "EdiPartyName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.EdiPartyName"
+                },
+                "IpAddress": {
+                    "type": "string"
+                },
+                "OtherName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.OtherName"
+                },
+                "RegisteredId": {
+                    "type": "string"
+                },
+                "Rfc822Name": {
+                    "type": "string"
+                },
+                "UniformResourceIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.KeyUsage": {
+            "additionalProperties": false,
+            "properties": {
+                "CRLSign": {
+                    "type": "boolean"
+                },
+                "DataEncipherment": {
+                    "type": "boolean"
+                },
+                "DecipherOnly": {
+                    "type": "boolean"
+                },
+                "DigitalSignature": {
+                    "type": "boolean"
+                },
+                "EncipherOnly": {
+                    "type": "boolean"
+                },
+                "KeyAgreement": {
+                    "type": "boolean"
+                },
+                "KeyCertSign": {
+                    "type": "boolean"
+                },
+                "KeyEncipherment": {
+                    "type": "boolean"
+                },
+                "NonRepudiation": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.OcspConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "OcspCustomCname": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.OtherName": {
+            "additionalProperties": false,
+            "properties": {
+                "TypeId": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TypeId",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.RevocationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrlConfiguration": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.CrlConfiguration"
+                },
+                "OcspConfiguration": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.OcspConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.Subject": {
+            "additionalProperties": false,
+            "properties": {
+                "CommonName": {
+                    "type": "string"
+                },
+                "Country": {
+                    "type": "string"
+                },
+                "DistinguishedNameQualifier": {
+                    "type": "string"
+                },
+                "GenerationQualifier": {
+                    "type": "string"
+                },
+                "GivenName": {
+                    "type": "string"
+                },
+                "Initials": {
+                    "type": "string"
+                },
+                "Locality": {
+                    "type": "string"
+                },
+                "Organization": {
+                    "type": "string"
+                },
+                "OrganizationalUnit": {
+                    "type": "string"
+                },
+                "Pseudonym": {
+                    "type": "string"
+                },
+                "SerialNumber": {
+                    "type": "string"
+                },
+                "State": {
+                    "type": "string"
+                },
+                "Surname": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthorityActivation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "CertificateAuthorityArn": {
+                            "type": "string"
+                        },
+                        "CertificateChain": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Certificate",
+                        "CertificateAuthorityArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ACMPCA::CertificateAuthorityActivation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Permission": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "CertificateAuthorityArn": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        },
+                        "SourceAccount": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Actions",
+                        "CertificateAuthorityArn",
+                        "Principal"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ACMPCA::Permission"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::APS::RuleGroupsNamespace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Data": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Workspace": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Data",
+                        "Name",
+                        "Workspace"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::APS::RuleGroupsNamespace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::APS::Workspace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AlertManagerDefinition": {
+                            "type": "string"
+                        },
+                        "Alias": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::APS::Workspace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AccessAnalyzer::Analyzer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AnalyzerName": {
+                            "type": "string"
+                        },
+                        "ArchiveRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AccessAnalyzer::Analyzer.ArchiveRule"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AccessAnalyzer::Analyzer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AccessAnalyzer::Analyzer.ArchiveRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Filter": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AccessAnalyzer::Analyzer.Filter"
+                    },
+                    "type": "array"
+                },
+                "RuleName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Filter",
+                "RuleName"
+            ],
+            "type": "object"
+        },
+        "AWS::AccessAnalyzer::Analyzer.Filter": {
+            "additionalProperties": false,
+            "properties": {
+                "Contains": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Eq": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Exists": {
+                    "type": "boolean"
+                },
+                "Neq": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Property": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Property"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationStrategy": {
+                            "type": "string"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "BrokerName": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker.ConfigurationId"
+                        },
+                        "DeploymentMode": {
+                            "type": "string"
+                        },
+                        "EncryptionOptions": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker.EncryptionOptions"
+                        },
+                        "EngineType": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "HostInstanceType": {
+                            "type": "string"
+                        },
+                        "LdapServerMetadata": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker.LdapServerMetadata"
+                        },
+                        "Logs": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker.LogList"
+                        },
+                        "MaintenanceWindowStartTime": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker.MaintenanceWindow"
+                        },
+                        "PubliclyAccessible": {
+                            "type": "boolean"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "StorageType": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmazonMQ::Broker.TagsEntry"
+                            },
+                            "type": "array"
+                        },
+                        "Users": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmazonMQ::Broker.User"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AutoMinorVersionUpgrade",
+                        "BrokerName",
+                        "DeploymentMode",
+                        "EngineType",
+                        "EngineVersion",
+                        "HostInstanceType",
+                        "PubliclyAccessible",
+                        "Users"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AmazonMQ::Broker"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.ConfigurationId": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Revision": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Id",
+                "Revision"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.EncryptionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "UseAwsOwnedKey": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "UseAwsOwnedKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.LdapServerMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Hosts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RoleBase": {
+                    "type": "string"
+                },
+                "RoleName": {
+                    "type": "string"
+                },
+                "RoleSearchMatching": {
+                    "type": "string"
+                },
+                "RoleSearchSubtree": {
+                    "type": "boolean"
+                },
+                "ServiceAccountPassword": {
+                    "type": "string"
+                },
+                "ServiceAccountUsername": {
+                    "type": "string"
+                },
+                "UserBase": {
+                    "type": "string"
+                },
+                "UserRoleName": {
+                    "type": "string"
+                },
+                "UserSearchMatching": {
+                    "type": "string"
+                },
+                "UserSearchSubtree": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Hosts",
+                "RoleBase",
+                "RoleSearchMatching",
+                "ServiceAccountPassword",
+                "ServiceAccountUsername",
+                "UserBase",
+                "UserSearchMatching"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.LogList": {
+            "additionalProperties": false,
+            "properties": {
+                "Audit": {
+                    "type": "boolean"
+                },
+                "General": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.MaintenanceWindow": {
+            "additionalProperties": false,
+            "properties": {
+                "DayOfWeek": {
+                    "type": "string"
+                },
+                "TimeOfDay": {
+                    "type": "string"
+                },
+                "TimeZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DayOfWeek",
+                "TimeOfDay",
+                "TimeZone"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.User": {
+            "additionalProperties": false,
+            "properties": {
+                "ConsoleAccess": {
+                    "type": "boolean"
+                },
+                "Groups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationStrategy": {
+                            "type": "string"
+                        },
+                        "Data": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EngineType": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmazonMQ::Configuration.TagsEntry"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Data",
+                        "EngineType",
+                        "EngineVersion",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AmazonMQ::Configuration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Configuration.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::ConfigurationAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Broker": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::ConfigurationAssociation.ConfigurationId"
+                        }
+                    },
+                    "required": [
+                        "Broker",
+                        "Configuration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AmazonMQ::ConfigurationAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::ConfigurationAssociation.ConfigurationId": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Revision": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Id",
+                "Revision"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::App": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessToken": {
+                            "type": "string"
+                        },
+                        "AutoBranchCreationConfig": {
+                            "$ref": "#/definitions/AWS::Amplify::App.AutoBranchCreationConfig"
+                        },
+                        "BasicAuthConfig": {
+                            "$ref": "#/definitions/AWS::Amplify::App.BasicAuthConfig"
+                        },
+                        "BuildSpec": {
+                            "type": "string"
+                        },
+                        "CustomHeaders": {
+                            "type": "string"
+                        },
+                        "CustomRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Amplify::App.CustomRule"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnableBranchAutoDeletion": {
+                            "type": "boolean"
+                        },
+                        "EnvironmentVariables": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Amplify::App.EnvironmentVariable"
+                            },
+                            "type": "array"
+                        },
+                        "IAMServiceRole": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OauthToken": {
+                            "type": "string"
+                        },
+                        "Repository": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Amplify::App"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::App.AutoBranchCreationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoBranchCreationPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BasicAuthConfig": {
+                    "$ref": "#/definitions/AWS::Amplify::App.BasicAuthConfig"
+                },
+                "BuildSpec": {
+                    "type": "string"
+                },
+                "EnableAutoBranchCreation": {
+                    "type": "boolean"
+                },
+                "EnableAutoBuild": {
+                    "type": "boolean"
+                },
+                "EnablePerformanceMode": {
+                    "type": "boolean"
+                },
+                "EnablePullRequestPreview": {
+                    "type": "boolean"
+                },
+                "EnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Amplify::App.EnvironmentVariable"
+                    },
+                    "type": "array"
+                },
+                "PullRequestEnvironmentName": {
+                    "type": "string"
+                },
+                "Stage": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Amplify::App.BasicAuthConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableBasicAuth": {
+                    "type": "boolean"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Amplify::App.CustomRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Source",
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::App.EnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::Branch": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppId": {
+                            "type": "string"
+                        },
+                        "BasicAuthConfig": {
+                            "$ref": "#/definitions/AWS::Amplify::Branch.BasicAuthConfig"
+                        },
+                        "BranchName": {
+                            "type": "string"
+                        },
+                        "BuildSpec": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnableAutoBuild": {
+                            "type": "boolean"
+                        },
+                        "EnablePerformanceMode": {
+                            "type": "boolean"
+                        },
+                        "EnablePullRequestPreview": {
+                            "type": "boolean"
+                        },
+                        "EnvironmentVariables": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Amplify::Branch.EnvironmentVariable"
+                            },
+                            "type": "array"
+                        },
+                        "PullRequestEnvironmentName": {
+                            "type": "string"
+                        },
+                        "Stage": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AppId",
+                        "BranchName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Amplify::Branch"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::Branch.BasicAuthConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableBasicAuth": {
+                    "type": "boolean"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::Branch.EnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppId": {
+                            "type": "string"
+                        },
+                        "AutoSubDomainCreationPatterns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AutoSubDomainIAMRole": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EnableAutoSubDomain": {
+                            "type": "boolean"
+                        },
+                        "SubDomainSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Amplify::Domain.SubDomainSetting"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AppId",
+                        "DomainName",
+                        "SubDomainSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Amplify::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::Domain.SubDomainSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "BranchName": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BranchName",
+                "Prefix"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BindingProperties": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValue"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Children": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentChild"
+                            },
+                            "type": "array"
+                        },
+                        "CollectionProperties": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentDataConfiguration"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ComponentType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Overrides": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentOverridesValue"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Properties": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentProperty"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "SourceId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Variants": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentVariant"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AmplifyUIBuilder::Component"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValue": {
+            "additionalProperties": false,
+            "properties": {
+                "BindingProperties": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValueProperties"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValueProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Field": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Model": {
+                    "type": "string"
+                },
+                "Predicates": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.Predicate"
+                    },
+                    "type": "array"
+                },
+                "UserAttribute": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentChild": {
+            "additionalProperties": false,
+            "properties": {
+                "Children": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentChild"
+                    },
+                    "type": "array"
+                },
+                "ComponentType": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Properties": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentProperties"
+                }
+            },
+            "required": [
+                "ComponentType",
+                "Name",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentConditionProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Else": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentProperty"
+                },
+                "Field": {
+                    "type": "string"
+                },
+                "Operand": {
+                    "type": "string"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Property": {
+                    "type": "string"
+                },
+                "Then": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentProperty"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentDataConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Identifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Model": {
+                    "type": "string"
+                },
+                "Predicate": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.Predicate"
+                },
+                "Sort": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.SortProperty"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Model"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentOverrides": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentOverridesValue": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentProperties": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "BindingProperties": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentPropertyBindingProperties"
+                },
+                "Bindings": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.FormBindings"
+                },
+                "CollectionBindingProperties": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentPropertyBindingProperties"
+                },
+                "Concat": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentProperty"
+                    },
+                    "type": "array"
+                },
+                "Condition": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentConditionProperty"
+                },
+                "Configured": {
+                    "type": "boolean"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Event": {
+                    "type": "string"
+                },
+                "ImportedValue": {
+                    "type": "string"
+                },
+                "Model": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "UserAttribute": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentPropertyBindingProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Field": {
+                    "type": "string"
+                },
+                "Property": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Property"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "Overrides": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentOverrides"
+                },
+                "VariantValues": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentVariantValues"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentVariantValues": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.FormBindings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.Predicate": {
+            "additionalProperties": false,
+            "properties": {
+                "And": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.Predicate"
+                    },
+                    "type": "array"
+                },
+                "Field": {
+                    "type": "string"
+                },
+                "Operand": {
+                    "type": "string"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Or": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.Predicate"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.SortProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Direction": {
+                    "type": "string"
+                },
+                "Field": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Direction",
+                "Field"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Theme": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Overrides": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmplifyUIBuilder::Theme.ThemeValues"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Values": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmplifyUIBuilder::Theme.ThemeValues"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Values"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AmplifyUIBuilder::Theme"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Theme.ThemeValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Children": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Theme.ThemeValues"
+                    },
+                    "type": "array"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Theme.ThemeValues": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Theme.ThemeValue"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Account": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CloudWatchRoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Account"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::ApiKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomerId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "GenerateDistinctId": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "StageKeys": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApiGateway::ApiKey.StageKey"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Value": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::ApiKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::ApiKey.StageKey": {
+            "additionalProperties": false,
+            "properties": {
+                "RestApiId": {
+                    "type": "string"
+                },
+                "StageName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Authorizer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthType": {
+                            "type": "string"
+                        },
+                        "AuthorizerCredentials": {
+                            "type": "string"
+                        },
+                        "AuthorizerResultTtlInSeconds": {
+                            "type": "number"
+                        },
+                        "AuthorizerUri": {
+                            "type": "string"
+                        },
+                        "IdentitySource": {
+                            "type": "string"
+                        },
+                        "IdentityValidationExpression": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ProviderARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "RestApiId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Authorizer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::BasePathMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BasePath": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "Stage": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::BasePathMapping"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::ClientCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::ClientCertificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeploymentCanarySettings": {
+                            "$ref": "#/definitions/AWS::ApiGateway::Deployment.DeploymentCanarySettings"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "StageDescription": {
+                            "$ref": "#/definitions/AWS::ApiGateway::Deployment.StageDescription"
+                        },
+                        "StageName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Deployment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment.AccessLogSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment.CanarySetting": {
+            "additionalProperties": false,
+            "properties": {
+                "PercentTraffic": {
+                    "type": "number"
+                },
+                "StageVariableOverrides": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "UseStageCache": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment.DeploymentCanarySettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PercentTraffic": {
+                    "type": "number"
+                },
+                "StageVariableOverrides": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "UseStageCache": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment.MethodSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "CacheDataEncrypted": {
+                    "type": "boolean"
+                },
+                "CacheTtlInSeconds": {
+                    "type": "number"
+                },
+                "CachingEnabled": {
+                    "type": "boolean"
+                },
+                "DataTraceEnabled": {
+                    "type": "boolean"
+                },
+                "HttpMethod": {
+                    "type": "string"
+                },
+                "LoggingLevel": {
+                    "type": "string"
+                },
+                "MetricsEnabled": {
+                    "type": "boolean"
+                },
+                "ResourcePath": {
+                    "type": "string"
+                },
+                "ThrottlingBurstLimit": {
+                    "type": "number"
+                },
+                "ThrottlingRateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment.StageDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessLogSetting": {
+                    "$ref": "#/definitions/AWS::ApiGateway::Deployment.AccessLogSetting"
+                },
+                "CacheClusterEnabled": {
+                    "type": "boolean"
+                },
+                "CacheClusterSize": {
+                    "type": "string"
+                },
+                "CacheDataEncrypted": {
+                    "type": "boolean"
+                },
+                "CacheTtlInSeconds": {
+                    "type": "number"
+                },
+                "CachingEnabled": {
+                    "type": "boolean"
+                },
+                "CanarySetting": {
+                    "$ref": "#/definitions/AWS::ApiGateway::Deployment.CanarySetting"
+                },
+                "ClientCertificateId": {
+                    "type": "string"
+                },
+                "DataTraceEnabled": {
+                    "type": "boolean"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DocumentationVersion": {
+                    "type": "string"
+                },
+                "LoggingLevel": {
+                    "type": "string"
+                },
+                "MethodSettings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApiGateway::Deployment.MethodSetting"
+                    },
+                    "type": "array"
+                },
+                "MetricsEnabled": {
+                    "type": "boolean"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                },
+                "ThrottlingBurstLimit": {
+                    "type": "number"
+                },
+                "ThrottlingRateLimit": {
+                    "type": "number"
+                },
+                "TracingEnabled": {
+                    "type": "boolean"
+                },
+                "Variables": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::DocumentationPart": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Location": {
+                            "$ref": "#/definitions/AWS::ApiGateway::DocumentationPart.Location"
+                        },
+                        "Properties": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Location",
+                        "Properties",
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::DocumentationPart"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::DocumentationPart.Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Method": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::DocumentationVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DocumentationVersion": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DocumentationVersion",
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::DocumentationVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::DomainName": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CertificateArn": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EndpointConfiguration": {
+                            "$ref": "#/definitions/AWS::ApiGateway::DomainName.EndpointConfiguration"
+                        },
+                        "MutualTlsAuthentication": {
+                            "$ref": "#/definitions/AWS::ApiGateway::DomainName.MutualTlsAuthentication"
+                        },
+                        "OwnershipVerificationCertificateArn": {
+                            "type": "string"
+                        },
+                        "RegionalCertificateArn": {
+                            "type": "string"
+                        },
+                        "SecurityPolicy": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::DomainName"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::DomainName.EndpointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Types": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::DomainName.MutualTlsAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "TruststoreUri": {
+                    "type": "string"
+                },
+                "TruststoreVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::GatewayResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResponseParameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ResponseTemplates": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ResponseType": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "StatusCode": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResponseType",
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::GatewayResponse"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Method": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiKeyRequired": {
+                            "type": "boolean"
+                        },
+                        "AuthorizationScopes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AuthorizationType": {
+                            "type": "string"
+                        },
+                        "AuthorizerId": {
+                            "type": "string"
+                        },
+                        "HttpMethod": {
+                            "type": "string"
+                        },
+                        "Integration": {
+                            "$ref": "#/definitions/AWS::ApiGateway::Method.Integration"
+                        },
+                        "MethodResponses": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApiGateway::Method.MethodResponse"
+                            },
+                            "type": "array"
+                        },
+                        "OperationName": {
+                            "type": "string"
+                        },
+                        "RequestModels": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "RequestParameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "boolean"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "RequestValidatorId": {
+                            "type": "string"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "HttpMethod",
+                        "ResourceId",
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Method"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Method.Integration": {
+            "additionalProperties": false,
+            "properties": {
+                "CacheKeyParameters": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CacheNamespace": {
+                    "type": "string"
+                },
+                "ConnectionId": {
+                    "type": "string"
+                },
+                "ConnectionType": {
+                    "type": "string"
+                },
+                "ContentHandling": {
+                    "type": "string"
+                },
+                "Credentials": {
+                    "type": "string"
+                },
+                "IntegrationHttpMethod": {
+                    "type": "string"
+                },
+                "IntegrationResponses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApiGateway::Method.IntegrationResponse"
+                    },
+                    "type": "array"
+                },
+                "PassthroughBehavior": {
+                    "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"
+                },
+                "TimeoutInMillis": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Method.IntegrationResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentHandling": {
+                    "type": "string"
+                },
+                "ResponseParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ResponseTemplates": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "SelectionPattern": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Method.MethodResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "ResponseModels": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ResponseParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "boolean"
+                        }
+                    },
+                    "type": "object"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Model": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContentType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "Schema": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Model"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::RequestValidator": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "ValidateRequestBody": {
+                            "type": "boolean"
+                        },
+                        "ValidateRequestParameters": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::RequestValidator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Resource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ParentId": {
+                            "type": "string"
+                        },
+                        "PathPart": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ParentId",
+                        "PathPart",
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Resource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::RestApi": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiKeySourceType": {
+                            "type": "string"
+                        },
+                        "BinaryMediaTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Body": {
+                            "type": "object"
+                        },
+                        "BodyS3Location": {
+                            "$ref": "#/definitions/AWS::ApiGateway::RestApi.S3Location"
+                        },
+                        "CloneFrom": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisableExecuteApiEndpoint": {
+                            "type": "boolean"
+                        },
+                        "EndpointConfiguration": {
+                            "$ref": "#/definitions/AWS::ApiGateway::RestApi.EndpointConfiguration"
+                        },
+                        "FailOnWarnings": {
+                            "type": "boolean"
+                        },
+                        "MinimumCompressionSize": {
+                            "type": "number"
+                        },
+                        "Mode": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Policy": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::RestApi"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::RestApi.EndpointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Types": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcEndpointIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::RestApi.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "ETag": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Stage": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessLogSetting": {
+                            "$ref": "#/definitions/AWS::ApiGateway::Stage.AccessLogSetting"
+                        },
+                        "CacheClusterEnabled": {
+                            "type": "boolean"
+                        },
+                        "CacheClusterSize": {
+                            "type": "string"
+                        },
+                        "CanarySetting": {
+                            "$ref": "#/definitions/AWS::ApiGateway::Stage.CanarySetting"
+                        },
+                        "ClientCertificateId": {
+                            "type": "string"
+                        },
+                        "DeploymentId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DocumentationVersion": {
+                            "type": "string"
+                        },
+                        "MethodSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApiGateway::Stage.MethodSetting"
+                            },
+                            "type": "array"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "StageName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TracingEnabled": {
+                            "type": "boolean"
+                        },
+                        "Variables": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Stage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Stage.AccessLogSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Stage.CanarySetting": {
+            "additionalProperties": false,
+            "properties": {
+                "DeploymentId": {
+                    "type": "string"
+                },
+                "PercentTraffic": {
+                    "type": "number"
+                },
+                "StageVariableOverrides": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "UseStageCache": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Stage.MethodSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "CacheDataEncrypted": {
+                    "type": "boolean"
+                },
+                "CacheTtlInSeconds": {
+                    "type": "number"
+                },
+                "CachingEnabled": {
+                    "type": "boolean"
+                },
+                "DataTraceEnabled": {
+                    "type": "boolean"
+                },
+                "HttpMethod": {
+                    "type": "string"
+                },
+                "LoggingLevel": {
+                    "type": "string"
+                },
+                "MetricsEnabled": {
+                    "type": "boolean"
+                },
+                "ResourcePath": {
+                    "type": "string"
+                },
+                "ThrottlingBurstLimit": {
+                    "type": "number"
+                },
+                "ThrottlingRateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::UsagePlan": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiStages": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApiGateway::UsagePlan.ApiStage"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Quota": {
+                            "$ref": "#/definitions/AWS::ApiGateway::UsagePlan.QuotaSettings"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Throttle": {
+                            "$ref": "#/definitions/AWS::ApiGateway::UsagePlan.ThrottleSettings"
+                        },
+                        "UsagePlanName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::UsagePlan"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::UsagePlan.ApiStage": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiId": {
+                    "type": "string"
+                },
+                "Stage": {
+                    "type": "string"
+                },
+                "Throttle": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::ApiGateway::UsagePlan.ThrottleSettings"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::UsagePlan.QuotaSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Limit": {
+                    "type": "number"
+                },
+                "Offset": {
+                    "type": "number"
+                },
+                "Period": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::UsagePlan.ThrottleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "BurstLimit": {
+                    "type": "number"
+                },
+                "RateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::UsagePlanKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "KeyId": {
+                            "type": "string"
+                        },
+                        "KeyType": {
+                            "type": "string"
+                        },
+                        "UsagePlanId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "KeyId",
+                        "KeyType",
+                        "UsagePlanId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::UsagePlanKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::VpcLink": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "TargetArns"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::VpcLink"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Api": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiKeySelectionExpression": {
+                            "type": "string"
+                        },
+                        "BasePath": {
+                            "type": "string"
+                        },
+                        "Body": {
+                            "type": "object"
+                        },
+                        "BodyS3Location": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Api.BodyS3Location"
+                        },
+                        "CorsConfiguration": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Api.Cors"
+                        },
+                        "CredentialsArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisableExecuteApiEndpoint": {
+                            "type": "boolean"
+                        },
+                        "DisableSchemaValidation": {
+                            "type": "boolean"
+                        },
+                        "FailOnWarnings": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ProtocolType": {
+                            "type": "string"
+                        },
+                        "RouteKey": {
+                            "type": "string"
+                        },
+                        "RouteSelectionExpression": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Target": {
+                            "type": "string"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Api"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Api.BodyS3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Etag": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Api.Cors": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowCredentials": {
+                    "type": "boolean"
+                },
+                "AllowHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowOrigins": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExposeHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaxAge": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "Integration": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides.IntegrationOverrides"
+                        },
+                        "Route": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteOverrides"
+                        },
+                        "Stage": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides.StageOverrides"
+                        }
+                    },
+                    "required": [
+                        "ApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.AccessLogSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.IntegrationOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "IntegrationMethod": {
+                    "type": "string"
+                },
+                "PayloadFormatVersion": {
+                    "type": "string"
+                },
+                "TimeoutInMillis": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationScopes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AuthorizationType": {
+                    "type": "string"
+                },
+                "AuthorizerId": {
+                    "type": "string"
+                },
+                "OperationName": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DataTraceEnabled": {
+                    "type": "boolean"
+                },
+                "DetailedMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "LoggingLevel": {
+                    "type": "string"
+                },
+                "ThrottlingBurstLimit": {
+                    "type": "number"
+                },
+                "ThrottlingRateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.StageOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessLogSettings": {
+                    "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides.AccessLogSettings"
+                },
+                "AutoDeploy": {
+                    "type": "boolean"
+                },
+                "DefaultRouteSettings": {
+                    "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteSettings"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "RouteSettings": {
+                    "type": "object"
+                },
+                "StageVariables": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ApiMappingKey": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "Stage": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "DomainName",
+                        "Stage"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::ApiMapping"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Authorizer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "AuthorizerCredentialsArn": {
+                            "type": "string"
+                        },
+                        "AuthorizerPayloadFormatVersion": {
+                            "type": "string"
+                        },
+                        "AuthorizerResultTtlInSeconds": {
+                            "type": "number"
+                        },
+                        "AuthorizerType": {
+                            "type": "string"
+                        },
+                        "AuthorizerUri": {
+                            "type": "string"
+                        },
+                        "EnableSimpleResponses": {
+                            "type": "boolean"
+                        },
+                        "IdentitySource": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "IdentityValidationExpression": {
+                            "type": "string"
+                        },
+                        "JwtConfiguration": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Authorizer.JWTConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "AuthorizerType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Authorizer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Authorizer.JWTConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Audience": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Issuer": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Deployment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "StageName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Deployment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::DomainName": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DomainNameConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApiGatewayV2::DomainName.DomainNameConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "MutualTlsAuthentication": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::DomainName.MutualTlsAuthentication"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::DomainName"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::DomainName.DomainNameConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "CertificateName": {
+                    "type": "string"
+                },
+                "EndpointType": {
+                    "type": "string"
+                },
+                "OwnershipVerificationCertificateArn": {
+                    "type": "string"
+                },
+                "SecurityPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::DomainName.MutualTlsAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "TruststoreUri": {
+                    "type": "string"
+                },
+                "TruststoreVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Integration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ConnectionId": {
+                            "type": "string"
+                        },
+                        "ConnectionType": {
+                            "type": "string"
+                        },
+                        "ContentHandlingStrategy": {
+                            "type": "string"
+                        },
+                        "CredentialsArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IntegrationMethod": {
+                            "type": "string"
+                        },
+                        "IntegrationSubtype": {
+                            "type": "string"
+                        },
+                        "IntegrationType": {
+                            "type": "string"
+                        },
+                        "IntegrationUri": {
+                            "type": "string"
+                        },
+                        "PassthroughBehavior": {
+                            "type": "string"
+                        },
+                        "PayloadFormatVersion": {
+                            "type": "string"
+                        },
+                        "RequestParameters": {
+                            "type": "object"
+                        },
+                        "RequestTemplates": {
+                            "type": "object"
+                        },
+                        "ResponseParameters": {
+                            "type": "object"
+                        },
+                        "TemplateSelectionExpression": {
+                            "type": "string"
+                        },
+                        "TimeoutInMillis": {
+                            "type": "number"
+                        },
+                        "TlsConfig": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Integration.TlsConfig"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "IntegrationType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Integration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Integration.ResponseParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination",
+                "Source"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Integration.ResponseParameterList": {
+            "additionalProperties": false,
+            "properties": {
+                "ResponseParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApiGatewayV2::Integration.ResponseParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Integration.TlsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ServerNameToVerify": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::IntegrationResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ContentHandlingStrategy": {
+                            "type": "string"
+                        },
+                        "IntegrationId": {
+                            "type": "string"
+                        },
+                        "IntegrationResponseKey": {
+                            "type": "string"
+                        },
+                        "ResponseParameters": {
+                            "type": "object"
+                        },
+                        "ResponseTemplates": {
+                            "type": "object"
+                        },
+                        "TemplateSelectionExpression": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "IntegrationId",
+                        "IntegrationResponseKey"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::IntegrationResponse"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Model": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ContentType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Schema": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "Name",
+                        "Schema"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Model"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Route": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ApiKeyRequired": {
+                            "type": "boolean"
+                        },
+                        "AuthorizationScopes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AuthorizationType": {
+                            "type": "string"
+                        },
+                        "AuthorizerId": {
+                            "type": "string"
+                        },
+                        "ModelSelectionExpression": {
+                            "type": "string"
+                        },
+                        "OperationName": {
+                            "type": "string"
+                        },
+                        "RequestModels": {
+                            "type": "object"
+                        },
+                        "RequestParameters": {
+                            "type": "object"
+                        },
+                        "RouteKey": {
+                            "type": "string"
+                        },
+                        "RouteResponseSelectionExpression": {
+                            "type": "string"
+                        },
+                        "Target": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "RouteKey"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Route"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Route.ParameterConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "Required": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Required"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::RouteResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ModelSelectionExpression": {
+                            "type": "string"
+                        },
+                        "ResponseModels": {
+                            "type": "object"
+                        },
+                        "ResponseParameters": {
+                            "type": "object"
+                        },
+                        "RouteId": {
+                            "type": "string"
+                        },
+                        "RouteResponseKey": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "RouteId",
+                        "RouteResponseKey"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::RouteResponse"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::RouteResponse.ParameterConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "Required": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Required"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Stage": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessLogSettings": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Stage.AccessLogSettings"
+                        },
+                        "AccessPolicyId": {
+                            "type": "string"
+                        },
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "AutoDeploy": {
+                            "type": "boolean"
+                        },
+                        "ClientCertificateId": {
+                            "type": "string"
+                        },
+                        "DefaultRouteSettings": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Stage.RouteSettings"
+                        },
+                        "DeploymentId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "RouteSettings": {
+                            "type": "object"
+                        },
+                        "StageName": {
+                            "type": "string"
+                        },
+                        "StageVariables": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "StageName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Stage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Stage.AccessLogSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Stage.RouteSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DataTraceEnabled": {
+                    "type": "boolean"
+                },
+                "DetailedMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "LoggingLevel": {
+                    "type": "string"
+                },
+                "ThrottlingBurstLimit": {
+                    "type": "number"
+                },
+                "ThrottlingRateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::VpcLink": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::VpcLink"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::Application.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::Application.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::ConfigurationProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LocationUri": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RetrievalRoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::ConfigurationProfile.Tags"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Validators": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::ConfigurationProfile.Validators"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "LocationUri",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::ConfigurationProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::ConfigurationProfile.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::ConfigurationProfile.Validators": {
+            "additionalProperties": false,
+            "properties": {
+                "Content": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::Deployment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ConfigurationProfileId": {
+                            "type": "string"
+                        },
+                        "ConfigurationVersion": {
+                            "type": "string"
+                        },
+                        "DeploymentStrategyId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnvironmentId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::Deployment.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "ConfigurationProfileId",
+                        "ConfigurationVersion",
+                        "DeploymentStrategyId",
+                        "EnvironmentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::Deployment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::Deployment.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::DeploymentStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeploymentDurationInMinutes": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FinalBakeTimeInMinutes": {
+                            "type": "number"
+                        },
+                        "GrowthFactor": {
+                            "type": "number"
+                        },
+                        "GrowthType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ReplicateTo": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::DeploymentStrategy.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DeploymentDurationInMinutes",
+                        "GrowthFactor",
+                        "Name",
+                        "ReplicateTo"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::DeploymentStrategy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::DeploymentStrategy.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Monitors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::Environment.Monitors"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::Environment.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::Environment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::Environment.Monitors": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmArn": {
+                    "type": "string"
+                },
+                "AlarmRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::Environment.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::HostedConfigurationVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ConfigurationProfileId": {
+                            "type": "string"
+                        },
+                        "Content": {
+                            "type": "string"
+                        },
+                        "ContentType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LatestVersionNumber": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "ConfigurationProfileId",
+                        "Content",
+                        "ContentType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::HostedConfigurationVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionMode": {
+                            "type": "string"
+                        },
+                        "ConnectorProfileConfig": {
+                            "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorProfileConfig"
+                        },
+                        "ConnectorProfileName": {
+                            "type": "string"
+                        },
+                        "ConnectorType": {
+                            "type": "string"
+                        },
+                        "KMSArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConnectionMode",
+                        "ConnectorProfileName",
+                        "ConnectorType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppFlow::ConnectorProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.AmplitudeConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiKey": {
+                    "type": "string"
+                },
+                "SecretKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiKey",
+                "SecretKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthCode": {
+                    "type": "string"
+                },
+                "RedirectUri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ConnectorProfileConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorProfileCredentials": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorProfileCredentials"
+                },
+                "ConnectorProfileProperties": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorProfileProperties"
+                }
+            },
+            "required": [
+                "ConnectorProfileCredentials"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "Amplitude": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.AmplitudeConnectorProfileCredentials"
+                },
+                "Datadog": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileCredentials"
+                },
+                "Dynatrace": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileCredentials"
+                },
+                "GoogleAnalytics": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.GoogleAnalyticsConnectorProfileCredentials"
+                },
+                "InforNexus": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileCredentials"
+                },
+                "Marketo": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileCredentials"
+                },
+                "Redshift": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileCredentials"
+                },
+                "SAPOData": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileCredentials"
+                },
+                "Salesforce": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileCredentials"
+                },
+                "ServiceNow": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileCredentials"
+                },
+                "Singular": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SingularConnectorProfileCredentials"
+                },
+                "Slack": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SlackConnectorProfileCredentials"
+                },
+                "Snowflake": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileCredentials"
+                },
+                "Trendmicro": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.TrendmicroConnectorProfileCredentials"
+                },
+                "Veeva": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileCredentials"
+                },
+                "Zendesk": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileCredentials"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Datadog": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileProperties"
+                },
+                "Dynatrace": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileProperties"
+                },
+                "InforNexus": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileProperties"
+                },
+                "Marketo": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileProperties"
+                },
+                "Redshift": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileProperties"
+                },
+                "SAPOData": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileProperties"
+                },
+                "Salesforce": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileProperties"
+                },
+                "ServiceNow": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileProperties"
+                },
+                "Slack": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SlackConnectorProfileProperties"
+                },
+                "Snowflake": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileProperties"
+                },
+                "Veeva": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileProperties"
+                },
+                "Zendesk": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiKey": {
+                    "type": "string"
+                },
+                "ApplicationKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiKey",
+                "ApplicationKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiToken": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiToken"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.GoogleAnalyticsConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "ConnectorOAuthRequest": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+                },
+                "RefreshToken": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClientId",
+                "ClientSecret"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessKeyId": {
+                    "type": "string"
+                },
+                "Datakey": {
+                    "type": "string"
+                },
+                "SecretAccessKey": {
+                    "type": "string"
+                },
+                "UserId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AccessKeyId",
+                "Datakey",
+                "SecretAccessKey",
+                "UserId"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "ConnectorOAuthRequest": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+                }
+            },
+            "required": [
+                "ClientId",
+                "ClientSecret"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.OAuthProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthCodeUrl": {
+                    "type": "string"
+                },
+                "OAuthScopes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TokenUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "DatabaseUrl": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName",
+                "DatabaseUrl",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "BasicAuthCredentials": {
+                    "type": "object"
+                },
+                "OAuthCredentials": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationHostUrl": {
+                    "type": "string"
+                },
+                "ApplicationServicePath": {
+                    "type": "string"
+                },
+                "ClientNumber": {
+                    "type": "string"
+                },
+                "LogonLanguage": {
+                    "type": "string"
+                },
+                "OAuthProperties": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.OAuthProperties"
+                },
+                "PortNumber": {
+                    "type": "number"
+                },
+                "PrivateLinkServiceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "ClientCredentialsArn": {
+                    "type": "string"
+                },
+                "ConnectorOAuthRequest": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+                },
+                "RefreshToken": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                },
+                "isSandboxEnvironment": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SingularConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SlackConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "ConnectorOAuthRequest": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+                }
+            },
+            "required": [
+                "ClientId",
+                "ClientSecret"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SlackConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountName": {
+                    "type": "string"
+                },
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "PrivateLinkServiceName": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "Stage": {
+                    "type": "string"
+                },
+                "Warehouse": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName",
+                "Stage",
+                "Warehouse"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.TrendmicroConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiSecretKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiSecretKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "ConnectorOAuthRequest": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+                }
+            },
+            "required": [
+                "ClientId",
+                "ClientSecret"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DestinationFlowConfigList": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppFlow::Flow.DestinationFlowConfig"
+                            },
+                            "type": "array"
+                        },
+                        "FlowName": {
+                            "type": "string"
+                        },
+                        "KMSArn": {
+                            "type": "string"
+                        },
+                        "SourceFlowConfig": {
+                            "$ref": "#/definitions/AWS::AppFlow::Flow.SourceFlowConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Tasks": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppFlow::Flow.Task"
+                            },
+                            "type": "array"
+                        },
+                        "TriggerConfig": {
+                            "$ref": "#/definitions/AWS::AppFlow::Flow.TriggerConfig"
+                        }
+                    },
+                    "required": [
+                        "DestinationFlowConfigList",
+                        "FlowName",
+                        "SourceFlowConfig",
+                        "Tasks",
+                        "TriggerConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppFlow::Flow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.AggregationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregationType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.AmplitudeSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ConnectorOperator": {
+            "additionalProperties": false,
+            "properties": {
+                "Amplitude": {
+                    "type": "string"
+                },
+                "Datadog": {
+                    "type": "string"
+                },
+                "Dynatrace": {
+                    "type": "string"
+                },
+                "GoogleAnalytics": {
+                    "type": "string"
+                },
+                "InforNexus": {
+                    "type": "string"
+                },
+                "Marketo": {
+                    "type": "string"
+                },
+                "S3": {
+                    "type": "string"
+                },
+                "SAPOData": {
+                    "type": "string"
+                },
+                "Salesforce": {
+                    "type": "string"
+                },
+                "ServiceNow": {
+                    "type": "string"
+                },
+                "Singular": {
+                    "type": "string"
+                },
+                "Slack": {
+                    "type": "string"
+                },
+                "Trendmicro": {
+                    "type": "string"
+                },
+                "Veeva": {
+                    "type": "string"
+                },
+                "Zendesk": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.DatadogSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.DestinationConnectorProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBridge": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.EventBridgeDestinationProperties"
+                },
+                "LookoutMetrics": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.LookoutMetricsDestinationProperties"
+                },
+                "Redshift": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.RedshiftDestinationProperties"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.S3DestinationProperties"
+                },
+                "Salesforce": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SalesforceDestinationProperties"
+                },
+                "Snowflake": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SnowflakeDestinationProperties"
+                },
+                "Upsolver": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.UpsolverDestinationProperties"
+                },
+                "Zendesk": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ZendeskDestinationProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.DestinationFlowConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorProfileName": {
+                    "type": "string"
+                },
+                "ConnectorType": {
+                    "type": "string"
+                },
+                "DestinationConnectorProperties": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.DestinationConnectorProperties"
+                }
+            },
+            "required": [
+                "ConnectorType",
+                "DestinationConnectorProperties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.DynatraceSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ErrorHandlingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "FailOnFirstError": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.EventBridgeDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorHandlingConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ErrorHandlingConfig"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.GoogleAnalyticsSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.IncrementalPullConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DatetimeTypeFieldName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.InforNexusSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.LookoutMetricsDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.MarketoSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.PrefixConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "PrefixFormat": {
+                    "type": "string"
+                },
+                "PrefixType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.RedshiftDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "ErrorHandlingConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ErrorHandlingConfig"
+                },
+                "IntermediateBucketName": {
+                    "type": "string"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IntermediateBucketName",
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.S3DestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "S3OutputFormatConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.S3OutputFormatConfig"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.S3InputFormatConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "S3InputFileType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.S3OutputFormatConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregationConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.AggregationConfig"
+                },
+                "FileType": {
+                    "type": "string"
+                },
+                "PrefixConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.PrefixConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.S3SourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "S3InputFormatConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.S3InputFormatConfig"
+                }
+            },
+            "required": [
+                "BucketName",
+                "BucketPrefix"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SAPODataSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ObjectPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ObjectPath"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SalesforceDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorHandlingConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ErrorHandlingConfig"
+                },
+                "IdFieldNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Object": {
+                    "type": "string"
+                },
+                "WriteOperationType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SalesforceSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableDynamicFieldUpdate": {
+                    "type": "boolean"
+                },
+                "IncludeDeletedRecords": {
+                    "type": "boolean"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ScheduledTriggerProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DataPullMode": {
+                    "type": "string"
+                },
+                "ScheduleEndTime": {
+                    "type": "number"
+                },
+                "ScheduleExpression": {
+                    "type": "string"
+                },
+                "ScheduleOffset": {
+                    "type": "number"
+                },
+                "ScheduleStartTime": {
+                    "type": "number"
+                },
+                "TimeZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ServiceNowSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SingularSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SlackSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SnowflakeDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "ErrorHandlingConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ErrorHandlingConfig"
+                },
+                "IntermediateBucketName": {
+                    "type": "string"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IntermediateBucketName",
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SourceConnectorProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Amplitude": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.AmplitudeSourceProperties"
+                },
+                "Datadog": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.DatadogSourceProperties"
+                },
+                "Dynatrace": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.DynatraceSourceProperties"
+                },
+                "GoogleAnalytics": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.GoogleAnalyticsSourceProperties"
+                },
+                "InforNexus": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.InforNexusSourceProperties"
+                },
+                "Marketo": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.MarketoSourceProperties"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.S3SourceProperties"
+                },
+                "SAPOData": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SAPODataSourceProperties"
+                },
+                "Salesforce": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SalesforceSourceProperties"
+                },
+                "ServiceNow": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ServiceNowSourceProperties"
+                },
+                "Singular": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SingularSourceProperties"
+                },
+                "Slack": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SlackSourceProperties"
+                },
+                "Trendmicro": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.TrendmicroSourceProperties"
+                },
+                "Veeva": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.VeevaSourceProperties"
+                },
+                "Zendesk": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ZendeskSourceProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SourceFlowConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorProfileName": {
+                    "type": "string"
+                },
+                "ConnectorType": {
+                    "type": "string"
+                },
+                "IncrementalPullConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.IncrementalPullConfig"
+                },
+                "SourceConnectorProperties": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SourceConnectorProperties"
+                }
+            },
+            "required": [
+                "ConnectorType",
+                "SourceConnectorProperties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.Task": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorOperator": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ConnectorOperator"
+                },
+                "DestinationField": {
+                    "type": "string"
+                },
+                "SourceFields": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TaskProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppFlow::Flow.TaskPropertiesObject"
+                    },
+                    "type": "array"
+                },
+                "TaskType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourceFields",
+                "TaskType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.TaskPropertiesObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.TrendmicroSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.TriggerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TriggerProperties": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ScheduledTriggerProperties"
+                },
+                "TriggerType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TriggerType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.UpsolverDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "S3OutputFormatConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.UpsolverS3OutputFormatConfig"
+                }
+            },
+            "required": [
+                "BucketName",
+                "S3OutputFormatConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.UpsolverS3OutputFormatConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregationConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.AggregationConfig"
+                },
+                "FileType": {
+                    "type": "string"
+                },
+                "PrefixConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.PrefixConfig"
+                }
+            },
+            "required": [
+                "PrefixConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.VeevaSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentType": {
+                    "type": "string"
+                },
+                "IncludeAllVersions": {
+                    "type": "boolean"
+                },
+                "IncludeRenditions": {
+                    "type": "boolean"
+                },
+                "IncludeSourceFiles": {
+                    "type": "boolean"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ZendeskDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorHandlingConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ErrorHandlingConfig"
+                },
+                "IdFieldNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Object": {
+                    "type": "string"
+                },
+                "WriteOperationType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ZendeskSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppIntegrations::EventIntegration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EventBridgeBus": {
+                            "type": "string"
+                        },
+                        "EventFilter": {
+                            "$ref": "#/definitions/AWS::AppIntegrations::EventIntegration.EventFilter"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EventBridgeBus",
+                        "EventFilter",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppIntegrations::EventIntegration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppIntegrations::EventIntegration.EventFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Source": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Source"
+            ],
+            "type": "object"
+        },
+        "AWS::AppIntegrations::EventIntegration.EventIntegrationAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientAssociationMetadata": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppIntegrations::EventIntegration.Metadata"
+                    },
+                    "type": "array"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "EventBridgeRuleName": {
+                    "type": "string"
+                },
+                "EventIntegrationAssociationArn": {
+                    "type": "string"
+                },
+                "EventIntegrationAssociationId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppIntegrations::EventIntegration.Metadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GatewayRouteName": {
+                            "type": "string"
+                        },
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualGatewayName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec",
+                        "VirtualGatewayName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::GatewayRoute"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteHostnameMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Suffix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteHostnameRewrite": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultTargetHostname": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteMetadataMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Range": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteRangeMatch"
+                },
+                "Regex": {
+                    "type": "string"
+                },
+                "Suffix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteRangeMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "End": {
+                    "type": "number"
+                },
+                "Start": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "End",
+                "Start"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "GrpcRoute": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GrpcGatewayRoute"
+                },
+                "Http2Route": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRoute"
+                },
+                "HttpRoute": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRoute"
+                },
+                "Priority": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualService": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteVirtualService"
+                }
+            },
+            "required": [
+                "VirtualService"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteVirtualService": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VirtualServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GrpcGatewayRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GrpcGatewayRouteAction"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMatch"
+                }
+            },
+            "required": [
+                "Action",
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Rewrite": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GrpcGatewayRouteRewrite"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteHostnameMatch"
+                },
+                "Metadata": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMetadata"
+                    },
+                    "type": "array"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Invert": {
+                    "type": "boolean"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteMetadataMatch"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteRewrite": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteHostnameRewrite"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRouteAction"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRouteMatch"
+                }
+            },
+            "required": [
+                "Action",
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRouteAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Rewrite": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRouteRewrite"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "Invert": {
+                    "type": "boolean"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeaderMatch"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeaderMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Range": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteRangeMatch"
+                },
+                "Regex": {
+                    "type": "string"
+                },
+                "Suffix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRouteMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Headers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeader"
+                    },
+                    "type": "array"
+                },
+                "Hostname": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteHostnameMatch"
+                },
+                "Method": {
+                    "type": "string"
+                },
+                "Path": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpPathMatch"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "QueryParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.QueryParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRoutePathRewrite": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRoutePrefixRewrite": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultPrefix": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRouteRewrite": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteHostnameRewrite"
+                },
+                "Path": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRoutePathRewrite"
+                },
+                "Prefix": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRoutePrefixRewrite"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpPathMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Regex": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpQueryParameterMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.QueryParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpQueryParameterMatch"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Mesh": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::Mesh.MeshSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::Mesh"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Mesh.EgressFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Mesh.MeshSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "EgressFilter": {
+                    "$ref": "#/definitions/AWS::AppMesh::Mesh.EgressFilter"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "RouteName": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::Route.RouteSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualRouterName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec",
+                        "VirtualRouterName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::Route"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.Duration": {
+            "additionalProperties": false,
+            "properties": {
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Unit",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRetryPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "GrpcRetryEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "HttpRetryEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaxRetries": {
+                    "type": "number"
+                },
+                "PerRetryTimeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                },
+                "TcpRetryEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MaxRetries",
+                "PerRetryTimeout"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRouteAction"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRouteMatch"
+                },
+                "RetryPolicy": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRetryPolicy"
+                },
+                "Timeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcTimeout"
+                }
+            },
+            "required": [
+                "Action",
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRouteAction": {
+            "additionalProperties": false,
+            "properties": {
+                "WeightedTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.WeightedTarget"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "WeightedTargets"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRouteMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Metadata": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRouteMetadata"
+                    },
+                    "type": "array"
+                },
+                "MethodName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRouteMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Invert": {
+                    "type": "boolean"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRouteMetadataMatchMethod"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRouteMetadataMatchMethod": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Range": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.MatchRange"
+                },
+                "Regex": {
+                    "type": "string"
+                },
+                "Suffix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                },
+                "PerRequest": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HeaderMatchMethod": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Range": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.MatchRange"
+                },
+                "Regex": {
+                    "type": "string"
+                },
+                "Suffix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpPathMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Regex": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpQueryParameterMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpRetryPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpRetryEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaxRetries": {
+                    "type": "number"
+                },
+                "PerRetryTimeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                },
+                "TcpRetryEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MaxRetries",
+                "PerRetryTimeout"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpRouteAction"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpRouteMatch"
+                },
+                "RetryPolicy": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpRetryPolicy"
+                },
+                "Timeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpTimeout"
+                }
+            },
+            "required": [
+                "Action",
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpRouteAction": {
+            "additionalProperties": false,
+            "properties": {
+                "WeightedTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.WeightedTarget"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "WeightedTargets"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpRouteHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "Invert": {
+                    "type": "boolean"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HeaderMatchMethod"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpRouteMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Headers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.HttpRouteHeader"
+                    },
+                    "type": "array"
+                },
+                "Method": {
+                    "type": "string"
+                },
+                "Path": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpPathMatch"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "QueryParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.QueryParameter"
+                    },
+                    "type": "array"
+                },
+                "Scheme": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                },
+                "PerRequest": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.MatchRange": {
+            "additionalProperties": false,
+            "properties": {
+                "End": {
+                    "type": "number"
+                },
+                "Start": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "End",
+                "Start"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.QueryParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpQueryParameterMatch"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.RouteSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "GrpcRoute": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRoute"
+                },
+                "Http2Route": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpRoute"
+                },
+                "HttpRoute": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpRoute"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "TcpRoute": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.TcpRoute"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.TcpRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.TcpRouteAction"
+                },
+                "Timeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.TcpTimeout"
+                }
+            },
+            "required": [
+                "Action"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.TcpRouteAction": {
+            "additionalProperties": false,
+            "properties": {
+                "WeightedTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.WeightedTarget"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "WeightedTargets"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.TcpTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.WeightedTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualNode": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "VirtualNode",
+                "Weight"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewaySpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualGatewayName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::VirtualGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.SubjectAlternativeNameMatchers": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.SubjectAlternativeNames": {
+            "additionalProperties": false,
+            "properties": {
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.SubjectAlternativeNameMatchers"
+                }
+            },
+            "required": [
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayAccessLog": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayFileAccessLog"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayBackendDefaults": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientPolicy": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "TLS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicyTls"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicyTls": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayClientTlsCertificate"
+                },
+                "Enforce": {
+                    "type": "boolean"
+                },
+                "Ports": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Validation": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContext"
+                }
+            },
+            "required": [
+                "Validation"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayClientTlsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsFileCertificate"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsSdsCertificate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "GRPC": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayGrpcConnectionPool"
+                },
+                "HTTP": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayHttpConnectionPool"
+                },
+                "HTTP2": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayHttp2ConnectionPool"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayFileAccessLog": {
+            "additionalProperties": false,
+            "properties": {
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Path"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayGrpcConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRequests"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayHealthCheckPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "HealthyThreshold": {
+                    "type": "number"
+                },
+                "IntervalMillis": {
+                    "type": "number"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "TimeoutMillis": {
+                    "type": "number"
+                },
+                "UnhealthyThreshold": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "HealthyThreshold",
+                "IntervalMillis",
+                "Protocol",
+                "TimeoutMillis",
+                "UnhealthyThreshold"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayHttp2ConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRequests"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayHttpConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConnections": {
+                    "type": "number"
+                },
+                "MaxPendingRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxConnections"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListener": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionPool": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayConnectionPool"
+                },
+                "HealthCheck": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayHealthCheckPolicy"
+                },
+                "PortMapping": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayPortMapping"
+                },
+                "TLS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTls"
+                }
+            },
+            "required": [
+                "PortMapping"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTls": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsCertificate"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "Validation": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContext"
+                }
+            },
+            "required": [
+                "Certificate",
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsAcmCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "ACM": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsAcmCertificate"
+                },
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsFileCertificate"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsSdsCertificate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsFileCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateChain": {
+                    "type": "string"
+                },
+                "PrivateKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateChain",
+                "PrivateKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsSdsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContext": {
+            "additionalProperties": false,
+            "properties": {
+                "SubjectAlternativeNames": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.SubjectAlternativeNames"
+                },
+                "Trust": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContextTrust"
+                }
+            },
+            "required": [
+                "Trust"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContextTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextFileTrust"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextSdsTrust"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayLogging": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessLog": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayAccessLog"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayPortMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "Port": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Port",
+                "Protocol"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewaySpec": {
+            "additionalProperties": false,
+            "properties": {
+                "BackendDefaults": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayBackendDefaults"
+                },
+                "Listeners": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListener"
+                    },
+                    "type": "array"
+                },
+                "Logging": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayLogging"
+                }
+            },
+            "required": [
+                "Listeners"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContext": {
+            "additionalProperties": false,
+            "properties": {
+                "SubjectAlternativeNames": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.SubjectAlternativeNames"
+                },
+                "Trust": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextTrust"
+                }
+            },
+            "required": [
+                "Trust"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextAcmTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateAuthorityArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CertificateAuthorityArns"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextFileTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateChain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateChain"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextSdsTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "ACM": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextAcmTrust"
+                },
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextFileTrust"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextSdsTrust"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualNodeName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::VirtualNode"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.AccessLog": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.FileAccessLog"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.AwsCloudMapInstanceAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.AwsCloudMapServiceDiscovery": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::VirtualNode.AwsCloudMapInstanceAttribute"
+                    },
+                    "type": "array"
+                },
+                "NamespaceName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NamespaceName",
+                "ServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.Backend": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualService": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualServiceBackend"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.BackendDefaults": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientPolicy": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ClientPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ClientPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "TLS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ClientPolicyTls"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ClientPolicyTls": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ClientTlsCertificate"
+                },
+                "Enforce": {
+                    "type": "boolean"
+                },
+                "Ports": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Validation": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContext"
+                }
+            },
+            "required": [
+                "Validation"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ClientTlsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsFileCertificate"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsSdsCertificate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.DnsServiceDiscovery": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "type": "string"
+                },
+                "ResponseType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Hostname"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.Duration": {
+            "additionalProperties": false,
+            "properties": {
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Unit",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.FileAccessLog": {
+            "additionalProperties": false,
+            "properties": {
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Path"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.GrpcTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                },
+                "PerRequest": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.HealthCheck": {
+            "additionalProperties": false,
+            "properties": {
+                "HealthyThreshold": {
+                    "type": "number"
+                },
+                "IntervalMillis": {
+                    "type": "number"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "TimeoutMillis": {
+                    "type": "number"
+                },
+                "UnhealthyThreshold": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "HealthyThreshold",
+                "IntervalMillis",
+                "Protocol",
+                "TimeoutMillis",
+                "UnhealthyThreshold"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.HttpTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                },
+                "PerRequest": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.Listener": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionPool": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeConnectionPool"
+                },
+                "HealthCheck": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.HealthCheck"
+                },
+                "OutlierDetection": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.OutlierDetection"
+                },
+                "PortMapping": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.PortMapping"
+                },
+                "TLS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTls"
+                },
+                "Timeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTimeout"
+                }
+            },
+            "required": [
+                "PortMapping"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "GRPC": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.GrpcTimeout"
+                },
+                "HTTP": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.HttpTimeout"
+                },
+                "HTTP2": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.HttpTimeout"
+                },
+                "TCP": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TcpTimeout"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTls": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsCertificate"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "Validation": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsValidationContext"
+                }
+            },
+            "required": [
+                "Certificate",
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsAcmCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "ACM": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsAcmCertificate"
+                },
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsFileCertificate"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsSdsCertificate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsFileCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateChain": {
+                    "type": "string"
+                },
+                "PrivateKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateChain",
+                "PrivateKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsSdsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsValidationContext": {
+            "additionalProperties": false,
+            "properties": {
+                "SubjectAlternativeNames": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.SubjectAlternativeNames"
+                },
+                "Trust": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsValidationContextTrust"
+                }
+            },
+            "required": [
+                "Trust"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsValidationContextTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextFileTrust"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextSdsTrust"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessLog": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.AccessLog"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.OutlierDetection": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseEjectionDuration": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                },
+                "Interval": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                },
+                "MaxEjectionPercent": {
+                    "type": "number"
+                },
+                "MaxServerErrors": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "BaseEjectionDuration",
+                "Interval",
+                "MaxEjectionPercent",
+                "MaxServerErrors"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.PortMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "Port": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Port",
+                "Protocol"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ServiceDiscovery": {
+            "additionalProperties": false,
+            "properties": {
+                "AWSCloudMap": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.AwsCloudMapServiceDiscovery"
+                },
+                "DNS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.DnsServiceDiscovery"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.SubjectAlternativeNameMatchers": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.SubjectAlternativeNames": {
+            "additionalProperties": false,
+            "properties": {
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.SubjectAlternativeNameMatchers"
+                }
+            },
+            "required": [
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TcpTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TlsValidationContext": {
+            "additionalProperties": false,
+            "properties": {
+                "SubjectAlternativeNames": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.SubjectAlternativeNames"
+                },
+                "Trust": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextTrust"
+                }
+            },
+            "required": [
+                "Trust"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TlsValidationContextAcmTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateAuthorityArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CertificateAuthorityArns"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TlsValidationContextFileTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateChain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateChain"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TlsValidationContextSdsTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TlsValidationContextTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "ACM": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextAcmTrust"
+                },
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextFileTrust"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextSdsTrust"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "GRPC": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeGrpcConnectionPool"
+                },
+                "HTTP": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeHttpConnectionPool"
+                },
+                "HTTP2": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeHttp2ConnectionPool"
+                },
+                "TCP": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeTcpConnectionPool"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeGrpcConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRequests"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeHttp2ConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRequests"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeHttpConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConnections": {
+                    "type": "number"
+                },
+                "MaxPendingRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxConnections"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "BackendDefaults": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.BackendDefaults"
+                },
+                "Backends": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Backend"
+                    },
+                    "type": "array"
+                },
+                "Listeners": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Listener"
+                    },
+                    "type": "array"
+                },
+                "Logging": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Logging"
+                },
+                "ServiceDiscovery": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ServiceDiscovery"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeTcpConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConnections": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxConnections"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualServiceBackend": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientPolicy": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ClientPolicy"
+                },
+                "VirtualServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VirtualServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualRouter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualRouter.VirtualRouterSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualRouterName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::VirtualRouter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualRouter.PortMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "Port": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Port",
+                "Protocol"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualRouter.VirtualRouterListener": {
+            "additionalProperties": false,
+            "properties": {
+                "PortMapping": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualRouter.PortMapping"
+                }
+            },
+            "required": [
+                "PortMapping"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualRouter.VirtualRouterSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "Listeners": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::VirtualRouter.VirtualRouterListener"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Listeners"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualService": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualService.VirtualServiceSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualServiceName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec",
+                        "VirtualServiceName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::VirtualService"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualService.VirtualNodeServiceProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualNodeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VirtualNodeName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualService.VirtualRouterServiceProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualRouterName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VirtualRouterName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualService.VirtualServiceProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualNode": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualService.VirtualNodeServiceProvider"
+                },
+                "VirtualRouter": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualService.VirtualRouterServiceProvider"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualService.VirtualServiceSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "Provider": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualService.VirtualServiceProvider"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingConfigurationArn": {
+                            "type": "string"
+                        },
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::AppRunner::Service.EncryptionConfiguration"
+                        },
+                        "HealthCheckConfiguration": {
+                            "$ref": "#/definitions/AWS::AppRunner::Service.HealthCheckConfiguration"
+                        },
+                        "InstanceConfiguration": {
+                            "$ref": "#/definitions/AWS::AppRunner::Service.InstanceConfiguration"
+                        },
+                        "ServiceName": {
+                            "type": "string"
+                        },
+                        "SourceConfiguration": {
+                            "$ref": "#/definitions/AWS::AppRunner::Service.SourceConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SourceConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppRunner::Service"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.AuthenticationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessRoleArn": {
+                    "type": "string"
+                },
+                "ConnectionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.CodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CodeConfigurationValues": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.CodeConfigurationValues"
+                },
+                "ConfigurationSource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConfigurationSource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.CodeConfigurationValues": {
+            "additionalProperties": false,
+            "properties": {
+                "BuildCommand": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "string"
+                },
+                "Runtime": {
+                    "type": "string"
+                },
+                "RuntimeEnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppRunner::Service.KeyValuePair"
+                    },
+                    "type": "array"
+                },
+                "StartCommand": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Runtime"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.CodeRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "CodeConfiguration": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.CodeConfiguration"
+                },
+                "RepositoryUrl": {
+                    "type": "string"
+                },
+                "SourceCodeVersion": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.SourceCodeVersion"
+                }
+            },
+            "required": [
+                "RepositoryUrl",
+                "SourceCodeVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KmsKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.HealthCheckConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HealthyThreshold": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "Timeout": {
+                    "type": "number"
+                },
+                "UnhealthyThreshold": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.ImageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Port": {
+                    "type": "string"
+                },
+                "RuntimeEnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppRunner::Service.KeyValuePair"
+                    },
+                    "type": "array"
+                },
+                "StartCommand": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.ImageRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "ImageConfiguration": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.ImageConfiguration"
+                },
+                "ImageIdentifier": {
+                    "type": "string"
+                },
+                "ImageRepositoryType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ImageIdentifier",
+                "ImageRepositoryType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.InstanceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Cpu": {
+                    "type": "string"
+                },
+                "InstanceRoleArn": {
+                    "type": "string"
+                },
+                "Memory": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.KeyValuePair": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.SourceCodeVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.SourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationConfiguration": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.AuthenticationConfiguration"
+                },
+                "AutoDeploymentsEnabled": {
+                    "type": "boolean"
+                },
+                "CodeRepository": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.CodeRepository"
+                },
+                "ImageRepository": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.ImageRepository"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::AppBlock": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SetupScriptDetails": {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlock.ScriptDetails"
+                        },
+                        "SourceS3Location": {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlock.S3Location"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "SetupScriptDetails",
+                        "SourceS3Location"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::AppBlock"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::AppBlock.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::AppBlock.ScriptDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutableParameters": {
+                    "type": "string"
+                },
+                "ExecutablePath": {
+                    "type": "string"
+                },
+                "ScriptS3Location": {
+                    "$ref": "#/definitions/AWS::AppStream::AppBlock.S3Location"
+                },
+                "TimeoutInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ExecutablePath",
+                "ScriptS3Location",
+                "TimeoutInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppBlockArn": {
+                            "type": "string"
+                        },
+                        "AttributesToDelete": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "IconS3Location": {
+                            "$ref": "#/definitions/AWS::AppStream::Application.S3Location"
+                        },
+                        "InstanceFamilies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchParameters": {
+                            "type": "string"
+                        },
+                        "LaunchPath": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Platforms": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkingDirectory": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AppBlockArn",
+                        "IconS3Location",
+                        "InstanceFamilies",
+                        "LaunchPath",
+                        "Name",
+                        "Platforms"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Application.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::ApplicationFleetAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationArn": {
+                            "type": "string"
+                        },
+                        "FleetName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationArn",
+                        "FleetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::ApplicationFleetAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::DirectoryConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DirectoryName": {
+                            "type": "string"
+                        },
+                        "OrganizationalUnitDistinguishedNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceAccountCredentials": {
+                            "$ref": "#/definitions/AWS::AppStream::DirectoryConfig.ServiceAccountCredentials"
+                        }
+                    },
+                    "required": [
+                        "DirectoryName",
+                        "OrganizationalUnitDistinguishedNames",
+                        "ServiceAccountCredentials"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::DirectoryConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::DirectoryConfig.ServiceAccountCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountName": {
+                    "type": "string"
+                },
+                "AccountPassword": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AccountName",
+                "AccountPassword"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Fleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ComputeCapacity": {
+                            "$ref": "#/definitions/AWS::AppStream::Fleet.ComputeCapacity"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisconnectTimeoutInSeconds": {
+                            "type": "number"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "DomainJoinInfo": {
+                            "$ref": "#/definitions/AWS::AppStream::Fleet.DomainJoinInfo"
+                        },
+                        "EnableDefaultInternetAccess": {
+                            "type": "boolean"
+                        },
+                        "FleetType": {
+                            "type": "string"
+                        },
+                        "IamRoleArn": {
+                            "type": "string"
+                        },
+                        "IdleDisconnectTimeoutInSeconds": {
+                            "type": "number"
+                        },
+                        "ImageArn": {
+                            "type": "string"
+                        },
+                        "ImageName": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "MaxConcurrentSessions": {
+                            "type": "number"
+                        },
+                        "MaxUserDurationInSeconds": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Platform": {
+                            "type": "string"
+                        },
+                        "StreamView": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UsbDeviceFilterStrings": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::AppStream::Fleet.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "InstanceType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::Fleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Fleet.ComputeCapacity": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredInstances": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DesiredInstances"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Fleet.DomainJoinInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryName": {
+                    "type": "string"
+                },
+                "OrganizationalUnitDistinguishedName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::Fleet.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::ImageBuilder": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessEndpoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::ImageBuilder.AccessEndpoint"
+                            },
+                            "type": "array"
+                        },
+                        "AppstreamAgentVersion": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "DomainJoinInfo": {
+                            "$ref": "#/definitions/AWS::AppStream::ImageBuilder.DomainJoinInfo"
+                        },
+                        "EnableDefaultInternetAccess": {
+                            "type": "boolean"
+                        },
+                        "IamRoleArn": {
+                            "type": "string"
+                        },
+                        "ImageArn": {
+                            "type": "string"
+                        },
+                        "ImageName": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::AppStream::ImageBuilder.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "InstanceType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::ImageBuilder"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::ImageBuilder.AccessEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointType": {
+                    "type": "string"
+                },
+                "VpceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointType",
+                "VpceId"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::ImageBuilder.DomainJoinInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryName": {
+                    "type": "string"
+                },
+                "OrganizationalUnitDistinguishedName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::ImageBuilder.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::Stack": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessEndpoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::Stack.AccessEndpoint"
+                            },
+                            "type": "array"
+                        },
+                        "ApplicationSettings": {
+                            "$ref": "#/definitions/AWS::AppStream::Stack.ApplicationSettings"
+                        },
+                        "AttributesToDelete": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DeleteStorageConnectors": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "EmbedHostDomains": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "FeedbackURL": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RedirectURL": {
+                            "type": "string"
+                        },
+                        "StorageConnectors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::Stack.StorageConnector"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::Stack.UserSetting"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::Stack"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Stack.AccessEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointType": {
+                    "type": "string"
+                },
+                "VpceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointType",
+                "VpceId"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Stack.ApplicationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "SettingsGroup": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Stack.StorageConnector": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorType": {
+                    "type": "string"
+                },
+                "Domains": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ResourceIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConnectorType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Stack.UserSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Permission": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action",
+                "Permission"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::StackFleetAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FleetName": {
+                            "type": "string"
+                        },
+                        "StackName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FleetName",
+                        "StackName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::StackFleetAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::StackUserAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
+                        "SendEmailNotification": {
+                            "type": "boolean"
+                        },
+                        "StackName": {
+                            "type": "string"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthenticationType",
+                        "StackName",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::StackUserAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
+                        "FirstName": {
+                            "type": "string"
+                        },
+                        "LastName": {
+                            "type": "string"
+                        },
+                        "MessageAction": {
+                            "type": "string"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthenticationType",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::ApiCache": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiCachingBehavior": {
+                            "type": "string"
+                        },
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "AtRestEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "TransitEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "Ttl": {
+                            "type": "number"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiCachingBehavior",
+                        "ApiId",
+                        "Ttl",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::ApiCache"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::ApiKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ApiKeyId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Expires": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "ApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::ApiKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DynamoDBConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.DynamoDBConfig"
+                        },
+                        "ElasticsearchConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.ElasticsearchConfig"
+                        },
+                        "HttpConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.HttpConfig"
+                        },
+                        "LambdaConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.LambdaConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OpenSearchServiceConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.OpenSearchServiceConfig"
+                        },
+                        "RelationalDatabaseConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.RelationalDatabaseConfig"
+                        },
+                        "ServiceRoleArn": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::DataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.AuthorizationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationType": {
+                    "type": "string"
+                },
+                "AwsIamConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::DataSource.AwsIamConfig"
+                }
+            },
+            "required": [
+                "AuthorizationType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.AwsIamConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SigningRegion": {
+                    "type": "string"
+                },
+                "SigningServiceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.DeltaSyncConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseTableTTL": {
+                    "type": "string"
+                },
+                "DeltaSyncTableName": {
+                    "type": "string"
+                },
+                "DeltaSyncTableTTL": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BaseTableTTL",
+                "DeltaSyncTableName",
+                "DeltaSyncTableTTL"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.DynamoDBConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "DeltaSyncConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::DataSource.DeltaSyncConfig"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "UseCallerCredentials": {
+                    "type": "boolean"
+                },
+                "Versioned": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AwsRegion",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.ElasticsearchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "Endpoint": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AwsRegion",
+                "Endpoint"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.HttpConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::DataSource.AuthorizationConfig"
+                },
+                "Endpoint": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.LambdaConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaFunctionArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaFunctionArn"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.OpenSearchServiceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "Endpoint": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AwsRegion",
+                "Endpoint"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.RdsHttpEndpointConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "AwsSecretStoreArn": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DbClusterIdentifier": {
+                    "type": "string"
+                },
+                "Schema": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AwsRegion",
+                "AwsSecretStoreArn",
+                "DbClusterIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.RelationalDatabaseConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RdsHttpEndpointConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::DataSource.RdsHttpEndpointConfig"
+                },
+                "RelationalDatabaseSourceType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RelationalDatabaseSourceType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::FunctionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "DataSourceName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FunctionVersion": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RequestMappingTemplate": {
+                            "type": "string"
+                        },
+                        "RequestMappingTemplateS3Location": {
+                            "type": "string"
+                        },
+                        "ResponseMappingTemplate": {
+                            "type": "string"
+                        },
+                        "ResponseMappingTemplateS3Location": {
+                            "type": "string"
+                        },
+                        "SyncConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::FunctionConfiguration.SyncConfig"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "DataSourceName",
+                        "FunctionVersion",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::FunctionConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::FunctionConfiguration.LambdaConflictHandlerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaConflictHandlerArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::FunctionConfiguration.SyncConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConflictDetection": {
+                    "type": "string"
+                },
+                "ConflictHandler": {
+                    "type": "string"
+                },
+                "LambdaConflictHandlerConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::FunctionConfiguration.LambdaConflictHandlerConfig"
+                }
+            },
+            "required": [
+                "ConflictDetection"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdditionalAuthenticationProviders": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.AdditionalAuthenticationProviders"
+                        },
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
+                        "LambdaAuthorizerConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.LambdaAuthorizerConfig"
+                        },
+                        "LogConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.LogConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OpenIDConnectConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.OpenIDConnectConfig"
+                        },
+                        "Tags": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.Tags"
+                        },
+                        "UserPoolConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.UserPoolConfig"
+                        },
+                        "XrayEnabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "AuthenticationType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::GraphQLApi"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.AdditionalAuthenticationProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationType": {
+                    "type": "string"
+                },
+                "LambdaAuthorizerConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::GraphQLApi.LambdaAuthorizerConfig"
+                },
+                "OpenIDConnectConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::GraphQLApi.OpenIDConnectConfig"
+                },
+                "UserPoolConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::GraphQLApi.CognitoUserPoolConfig"
+                }
+            },
+            "required": [
+                "AuthenticationType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.AdditionalAuthenticationProviders": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.CognitoUserPoolConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AppIdClientRegex": {
+                    "type": "string"
+                },
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "UserPoolId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.LambdaAuthorizerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizerResultTtlInSeconds": {
+                    "type": "number"
+                },
+                "AuthorizerUri": {
+                    "type": "string"
+                },
+                "IdentityValidationExpression": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.LogConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsRoleArn": {
+                    "type": "string"
+                },
+                "ExcludeVerboseContent": {
+                    "type": "boolean"
+                },
+                "FieldLogLevel": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.OpenIDConnectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthTTL": {
+                    "type": "number"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "IatTTL": {
+                    "type": "number"
+                },
+                "Issuer": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.Tags": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.UserPoolConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AppIdClientRegex": {
+                    "type": "string"
+                },
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "DefaultAction": {
+                    "type": "string"
+                },
+                "UserPoolId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "Definition": {
+                            "type": "string"
+                        },
+                        "DefinitionS3Location": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::GraphQLSchema"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::Resolver": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "CachingConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::Resolver.CachingConfig"
+                        },
+                        "DataSourceName": {
+                            "type": "string"
+                        },
+                        "FieldName": {
+                            "type": "string"
+                        },
+                        "Kind": {
+                            "type": "string"
+                        },
+                        "PipelineConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::Resolver.PipelineConfig"
+                        },
+                        "RequestMappingTemplate": {
+                            "type": "string"
+                        },
+                        "RequestMappingTemplateS3Location": {
+                            "type": "string"
+                        },
+                        "ResponseMappingTemplate": {
+                            "type": "string"
+                        },
+                        "ResponseMappingTemplateS3Location": {
+                            "type": "string"
+                        },
+                        "SyncConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::Resolver.SyncConfig"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "FieldName",
+                        "TypeName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::Resolver"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::Resolver.CachingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CachingKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Ttl": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::Resolver.LambdaConflictHandlerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaConflictHandlerArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::Resolver.PipelineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Functions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::Resolver.SyncConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConflictDetection": {
+                    "type": "string"
+                },
+                "ConflictHandler": {
+                    "type": "string"
+                },
+                "LambdaConflictHandlerConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::Resolver.LambdaConflictHandlerConfig"
+                }
+            },
+            "required": [
+                "ConflictDetection"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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",
+                        "RoleARN",
+                        "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyName": {
+                            "type": "string"
+                        },
+                        "PolicyType": {
+                            "type": "string"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "ScalableDimension": {
+                            "type": "string"
+                        },
+                        "ScalingTargetId": {
+                            "type": "string"
+                        },
+                        "ServiceNamespace": {
+                            "type": "string"
+                        },
+                        "StepScalingPolicyConfiguration": {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.StepScalingPolicyConfiguration"
+                        },
+                        "TargetTrackingScalingPolicyConfiguration": {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.TargetTrackingScalingPolicyConfiguration"
+                        }
+                    },
+                    "required": [
+                        "PolicyName",
+                        "PolicyType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApplicationAutoScaling::ScalingPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.CustomizedMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "Namespace",
+                "Statistic"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.PredefinedMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.StepAdjustment": {
+            "additionalProperties": false,
+            "properties": {
+                "MetricIntervalLowerBound": {
+                    "type": "number"
+                },
+                "MetricIntervalUpperBound": {
+                    "type": "number"
+                },
+                "ScalingAdjustment": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ScalingAdjustment"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.StepScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AdjustmentType": {
+                    "type": "string"
+                },
+                "Cooldown": {
+                    "type": "number"
+                },
+                "MetricAggregationType": {
+                    "type": "string"
+                },
+                "MinAdjustmentMagnitude": {
+                    "type": "number"
+                },
+                "StepAdjustments": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.StepAdjustment"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.TargetTrackingScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomizedMetricSpecification": {
+                    "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.CustomizedMetricSpecification"
+                },
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "PredefinedMetricSpecification": {
+                    "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.PredefinedMetricSpecification"
+                },
+                "ScaleInCooldown": {
+                    "type": "number"
+                },
+                "ScaleOutCooldown": {
+                    "type": "number"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoConfigurationEnabled": {
+                            "type": "boolean"
+                        },
+                        "CWEMonitorEnabled": {
+                            "type": "boolean"
+                        },
+                        "ComponentMonitoringSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApplicationInsights::Application.ComponentMonitoringSetting"
+                            },
+                            "type": "array"
+                        },
+                        "CustomComponents": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApplicationInsights::Application.CustomComponent"
+                            },
+                            "type": "array"
+                        },
+                        "LogPatternSets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApplicationInsights::Application.LogPatternSet"
+                            },
+                            "type": "array"
+                        },
+                        "OpsCenterEnabled": {
+                            "type": "boolean"
+                        },
+                        "OpsItemSNSTopicArn": {
+                            "type": "string"
+                        },
+                        "ResourceGroupName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ResourceGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApplicationInsights::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.Alarm": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmName": {
+                    "type": "string"
+                },
+                "Severity": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AlarmName"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.AlarmMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmMetricName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AlarmMetricName"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.ComponentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfigurationDetails": {
+                    "$ref": "#/definitions/AWS::ApplicationInsights::Application.ConfigurationDetails"
+                },
+                "SubComponentTypeConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.SubComponentTypeConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.ComponentMonitoringSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentARN": {
+                    "type": "string"
+                },
+                "ComponentConfigurationMode": {
+                    "type": "string"
+                },
+                "ComponentName": {
+                    "type": "string"
+                },
+                "CustomComponentConfiguration": {
+                    "$ref": "#/definitions/AWS::ApplicationInsights::Application.ComponentConfiguration"
+                },
+                "DefaultOverwriteComponentConfiguration": {
+                    "$ref": "#/definitions/AWS::ApplicationInsights::Application.ComponentConfiguration"
+                },
+                "Tier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComponentConfigurationMode",
+                "Tier"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.ConfigurationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmMetrics": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.AlarmMetric"
+                    },
+                    "type": "array"
+                },
+                "Alarms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.Alarm"
+                    },
+                    "type": "array"
+                },
+                "JMXPrometheusExporter": {
+                    "$ref": "#/definitions/AWS::ApplicationInsights::Application.JMXPrometheusExporter"
+                },
+                "Logs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.Log"
+                    },
+                    "type": "array"
+                },
+                "WindowsEvents": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.WindowsEvent"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.CustomComponent": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentName": {
+                    "type": "string"
+                },
+                "ResourceList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ComponentName",
+                "ResourceList"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.JMXPrometheusExporter": {
+            "additionalProperties": false,
+            "properties": {
+                "HostPort": {
+                    "type": "string"
+                },
+                "JMXURL": {
+                    "type": "string"
+                },
+                "PrometheusPort": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.Log": {
+            "additionalProperties": false,
+            "properties": {
+                "Encoding": {
+                    "type": "string"
+                },
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "LogPath": {
+                    "type": "string"
+                },
+                "LogType": {
+                    "type": "string"
+                },
+                "PatternSet": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogType"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.LogPattern": {
+            "additionalProperties": false,
+            "properties": {
+                "Pattern": {
+                    "type": "string"
+                },
+                "PatternName": {
+                    "type": "string"
+                },
+                "Rank": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Pattern",
+                "PatternName",
+                "Rank"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.LogPatternSet": {
+            "additionalProperties": false,
+            "properties": {
+                "LogPatterns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.LogPattern"
+                    },
+                    "type": "array"
+                },
+                "PatternSetName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogPatterns",
+                "PatternSetName"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.SubComponentConfigurationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmMetrics": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.AlarmMetric"
+                    },
+                    "type": "array"
+                },
+                "Logs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.Log"
+                    },
+                    "type": "array"
+                },
+                "WindowsEvents": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.WindowsEvent"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.SubComponentTypeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SubComponentConfigurationDetails": {
+                    "$ref": "#/definitions/AWS::ApplicationInsights::Application.SubComponentConfigurationDetails"
+                },
+                "SubComponentType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubComponentConfigurationDetails",
+                "SubComponentType"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.WindowsEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "EventLevels": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EventName": {
+                    "type": "string"
+                },
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "PatternSet": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventLevels",
+                "EventName",
+                "LogGroupName"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::DataCatalog": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::DataCatalog"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::NamedQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Database": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QueryString": {
+                            "type": "string"
+                        },
+                        "WorkGroup": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Database",
+                        "QueryString"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::NamedQuery"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::PreparedStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "QueryStatement": {
+                            "type": "string"
+                        },
+                        "StatementName": {
+                            "type": "string"
+                        },
+                        "WorkGroup": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "QueryStatement",
+                        "StatementName",
+                        "WorkGroup"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::PreparedStatement"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RecursiveDeleteOption": {
+                            "type": "boolean"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkGroupConfiguration": {
+                            "$ref": "#/definitions/AWS::Athena::WorkGroup.WorkGroupConfiguration"
+                        },
+                        "WorkGroupConfigurationUpdates": {
+                            "$ref": "#/definitions/AWS::Athena::WorkGroup.WorkGroupConfigurationUpdates"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::WorkGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionOption": {
+                    "type": "string"
+                },
+                "KmsKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionOption"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.EngineVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "EffectiveEngineVersion": {
+                    "type": "string"
+                },
+                "SelectedEngineVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.ResultConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.EncryptionConfiguration"
+                },
+                "OutputLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.ResultConfigurationUpdates": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.EncryptionConfiguration"
+                },
+                "OutputLocation": {
+                    "type": "string"
+                },
+                "RemoveEncryptionConfiguration": {
+                    "type": "boolean"
+                },
+                "RemoveOutputLocation": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.WorkGroupConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BytesScannedCutoffPerQuery": {
+                    "type": "number"
+                },
+                "EnforceWorkGroupConfiguration": {
+                    "type": "boolean"
+                },
+                "EngineVersion": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.EngineVersion"
+                },
+                "PublishCloudWatchMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "RequesterPaysEnabled": {
+                    "type": "boolean"
+                },
+                "ResultConfiguration": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.ResultConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.WorkGroupConfigurationUpdates": {
+            "additionalProperties": false,
+            "properties": {
+                "BytesScannedCutoffPerQuery": {
+                    "type": "number"
+                },
+                "EnforceWorkGroupConfiguration": {
+                    "type": "boolean"
+                },
+                "EngineVersion": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.EngineVersion"
+                },
+                "PublishCloudWatchMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "RemoveBytesScannedCutoffPerQuery": {
+                    "type": "boolean"
+                },
+                "RequesterPaysEnabled": {
+                    "type": "boolean"
+                },
+                "ResultConfigurationUpdates": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.ResultConfigurationUpdates"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssessmentReportsDestination": {
+                            "$ref": "#/definitions/AWS::AuditManager::Assessment.AssessmentReportsDestination"
+                        },
+                        "AwsAccount": {
+                            "$ref": "#/definitions/AWS::AuditManager::Assessment.AWSAccount"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FrameworkId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Roles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AuditManager::Assessment.Role"
+                            },
+                            "type": "array"
+                        },
+                        "Scope": {
+                            "$ref": "#/definitions/AWS::AuditManager::Assessment.Scope"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AuditManager::Assessment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.AWSAccount": {
+            "additionalProperties": false,
+            "properties": {
+                "EmailAddress": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.AWSService": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.AssessmentReportsDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                },
+                "DestinationType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.Delegation": {
+            "additionalProperties": false,
+            "properties": {
+                "AssessmentId": {
+                    "type": "string"
+                },
+                "AssessmentName": {
+                    "type": "string"
+                },
+                "Comment": {
+                    "type": "string"
+                },
+                "ControlSetId": {
+                    "type": "string"
+                },
+                "CreatedBy": {
+                    "type": "string"
+                },
+                "CreationTime": {
+                    "type": "number"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "LastUpdated": {
+                    "type": "number"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RoleType": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.Role": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RoleType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.Scope": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsAccounts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AuditManager::Assessment.AWSAccount"
+                    },
+                    "type": "array"
+                },
+                "AwsServices": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AuditManager::Assessment.AWSService"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "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": {
+                        "AutoScalingGroupName": {
+                            "type": "string"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CapacityRebalance": {
+                            "type": "boolean"
+                        },
+                        "Context": {
+                            "type": "string"
+                        },
+                        "Cooldown": {
+                            "type": "string"
+                        },
+                        "DesiredCapacity": {
+                            "type": "string"
+                        },
+                        "DesiredCapacityType": {
+                            "type": "string"
+                        },
+                        "HealthCheckGracePeriod": {
+                            "type": "number"
+                        },
+                        "HealthCheckType": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "LaunchConfigurationName": {
+                            "type": "string"
+                        },
+                        "LaunchTemplate": {
+                            "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LaunchTemplateSpecification"
+                        },
+                        "LifecycleHookSpecificationList": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LifecycleHookSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "LoadBalancerNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MaxInstanceLifetime": {
+                            "type": "number"
+                        },
+                        "MaxSize": {
+                            "type": "string"
+                        },
+                        "MetricsCollection": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.MetricsCollection"
+                            },
+                            "type": "array"
+                        },
+                        "MinSize": {
+                            "type": "string"
+                        },
+                        "MixedInstancesPolicy": {
+                            "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.MixedInstancesPolicy"
+                        },
+                        "NewInstancesProtectedFromScaleIn": {
+                            "type": "boolean"
+                        },
+                        "NotificationConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.NotificationConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "PlacementGroup": {
+                            "type": "string"
+                        },
+                        "ServiceLinkedRoleARN": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.TagProperty"
+                            },
+                            "type": "array"
+                        },
+                        "TargetGroupARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "TerminationPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VPCZoneIdentifier": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MaxSize",
+                        "MinSize"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::AutoScalingGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdatePolicy": {
+                    "type": "object"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.AcceleratorCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.AcceleratorTotalMemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.BaselineEbsBandwidthMbpsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.InstanceRequirements": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceleratorCount": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.AcceleratorCountRequest"
+                },
+                "AcceleratorManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorTotalMemoryMiB": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.AcceleratorTotalMemoryMiBRequest"
+                },
+                "AcceleratorTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BareMetal": {
+                    "type": "string"
+                },
+                "BaselineEbsBandwidthMbps": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.BaselineEbsBandwidthMbpsRequest"
+                },
+                "BurstablePerformance": {
+                    "type": "string"
+                },
+                "CpuManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExcludedInstanceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InstanceGenerations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LocalStorage": {
+                    "type": "string"
+                },
+                "LocalStorageTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MemoryGiBPerVCpu": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.MemoryGiBPerVCpuRequest"
+                },
+                "MemoryMiB": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.MemoryMiBRequest"
+                },
+                "NetworkInterfaceCount": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.NetworkInterfaceCountRequest"
+                },
+                "OnDemandMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "RequireHibernateSupport": {
+                    "type": "boolean"
+                },
+                "SpotMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "TotalLocalStorageGB": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.TotalLocalStorageGBRequest"
+                },
+                "VCpuCount": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.VCpuCountRequest"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.InstancesDistribution": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandAllocationStrategy": {
+                    "type": "string"
+                },
+                "OnDemandBaseCapacity": {
+                    "type": "number"
+                },
+                "OnDemandPercentageAboveBaseCapacity": {
+                    "type": "number"
+                },
+                "SpotAllocationStrategy": {
+                    "type": "string"
+                },
+                "SpotInstancePools": {
+                    "type": "number"
+                },
+                "SpotMaxPrice": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.LaunchTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LaunchTemplateSpecification"
+                },
+                "Overrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LaunchTemplateOverrides"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LaunchTemplateSpecification"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.LaunchTemplateOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceRequirements": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.InstanceRequirements"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "LaunchTemplateSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LaunchTemplateSpecification"
+                },
+                "WeightedCapacity": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.LaunchTemplateSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.LifecycleHookSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultResult": {
+                    "type": "string"
+                },
+                "HeartbeatTimeout": {
+                    "type": "number"
+                },
+                "LifecycleHookName": {
+                    "type": "string"
+                },
+                "LifecycleTransition": {
+                    "type": "string"
+                },
+                "NotificationMetadata": {
+                    "type": "string"
+                },
+                "NotificationTargetARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LifecycleHookName",
+                "LifecycleTransition"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.MemoryGiBPerVCpuRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.MemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.MetricsCollection": {
+            "additionalProperties": false,
+            "properties": {
+                "Granularity": {
+                    "type": "string"
+                },
+                "Metrics": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Granularity"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.MixedInstancesPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "InstancesDistribution": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.InstancesDistribution"
+                },
+                "LaunchTemplate": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LaunchTemplate"
+                }
+            },
+            "required": [
+                "LaunchTemplate"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.NetworkInterfaceCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NotificationTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TopicARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TopicARN"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.TagProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "PropagateAtLaunch": {
+                    "type": "boolean"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "PropagateAtLaunch",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.TotalLocalStorageGBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.VCpuCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::LaunchConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatePublicIpAddress": {
+                            "type": "boolean"
+                        },
+                        "BlockDeviceMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::LaunchConfiguration.BlockDeviceMapping"
+                            },
+                            "type": "array"
+                        },
+                        "ClassicLinkVPCId": {
+                            "type": "string"
+                        },
+                        "ClassicLinkVPCSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EbsOptimized": {
+                            "type": "boolean"
+                        },
+                        "IamInstanceProfile": {
+                            "type": "string"
+                        },
+                        "ImageId": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "InstanceMonitoring": {
+                            "type": "boolean"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "KernelId": {
+                            "type": "string"
+                        },
+                        "KeyName": {
+                            "type": "string"
+                        },
+                        "LaunchConfigurationName": {
+                            "type": "string"
+                        },
+                        "MetadataOptions": {
+                            "$ref": "#/definitions/AWS::AutoScaling::LaunchConfiguration.MetadataOptions"
+                        },
+                        "PlacementTenancy": {
+                            "type": "string"
+                        },
+                        "RamDiskId": {
+                            "type": "string"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SpotPrice": {
+                            "type": "string"
+                        },
+                        "UserData": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ImageId",
+                        "InstanceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::LaunchConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::LaunchConfiguration.BlockDevice": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "Throughput": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::LaunchConfiguration.BlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::AutoScaling::LaunchConfiguration.BlockDevice"
+                },
+                "NoDevice": {
+                    "type": "boolean"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeviceName"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::LaunchConfiguration.MetadataOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpEndpoint": {
+                    "type": "string"
+                },
+                "HttpPutResponseHopLimit": {
+                    "type": "number"
+                },
+                "HttpTokens": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::LifecycleHook": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DefaultResult": {
+                            "type": "string"
+                        },
+                        "HeartbeatTimeout": {
+                            "type": "number"
+                        },
+                        "LifecycleHookName": {
+                            "type": "string"
+                        },
+                        "LifecycleTransition": {
+                            "type": "string"
+                        },
+                        "NotificationMetadata": {
+                            "type": "string"
+                        },
+                        "NotificationTargetARN": {
+                            "type": "string"
+                        },
+                        "RoleARN": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupName",
+                        "LifecycleTransition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::LifecycleHook"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdjustmentType": {
+                            "type": "string"
+                        },
+                        "AutoScalingGroupName": {
+                            "type": "string"
+                        },
+                        "Cooldown": {
+                            "type": "string"
+                        },
+                        "EstimatedInstanceWarmup": {
+                            "type": "number"
+                        },
+                        "MetricAggregationType": {
+                            "type": "string"
+                        },
+                        "MinAdjustmentMagnitude": {
+                            "type": "number"
+                        },
+                        "PolicyType": {
+                            "type": "string"
+                        },
+                        "PredictiveScalingConfiguration": {
+                            "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredictiveScalingConfiguration"
+                        },
+                        "ScalingAdjustment": {
+                            "type": "number"
+                        },
+                        "StepAdjustments": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.StepAdjustment"
+                            },
+                            "type": "array"
+                        },
+                        "TargetTrackingConfiguration": {
+                            "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.TargetTrackingConfiguration"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::ScalingPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.CustomizedMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "Namespace",
+                "Statistic"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredefinedMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredictiveScalingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacityBreachBehavior": {
+                    "type": "string"
+                },
+                "MaxCapacityBuffer": {
+                    "type": "number"
+                },
+                "MetricSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredictiveScalingMetricSpecification"
+                    },
+                    "type": "array"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "SchedulingBufferTime": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MetricSpecifications"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredictiveScalingMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedLoadMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedLoadMetric"
+                },
+                "PredefinedMetricPairSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedMetricPair"
+                },
+                "PredefinedScalingMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedScalingMetric"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedLoadMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedMetricPair": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedScalingMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.StepAdjustment": {
+            "additionalProperties": false,
+            "properties": {
+                "MetricIntervalLowerBound": {
+                    "type": "number"
+                },
+                "MetricIntervalUpperBound": {
+                    "type": "number"
+                },
+                "ScalingAdjustment": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ScalingAdjustment"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.TargetTrackingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomizedMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.CustomizedMetricSpecification"
+                },
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "PredefinedMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredefinedMetricSpecification"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScheduledAction": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "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::AutoScalingPlans::ScalingPlan": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationSource": {
+                            "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.ApplicationSource"
+                        },
+                        "ScalingInstructions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.ScalingInstruction"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationSource",
+                        "ScalingInstructions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScalingPlans::ScalingPlan"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.ApplicationSource": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudFormationStackARN": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.CustomizedLoadMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "Namespace",
+                "Statistic"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.CustomizedScalingMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "Namespace",
+                "Statistic"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.PredefinedLoadMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedLoadMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedLoadMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.PredefinedScalingMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedScalingMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedScalingMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.ScalingInstruction": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomizedLoadMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.CustomizedLoadMetricSpecification"
+                },
+                "DisableDynamicScaling": {
+                    "type": "boolean"
+                },
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                },
+                "PredefinedLoadMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.PredefinedLoadMetricSpecification"
+                },
+                "PredictiveScalingMaxCapacityBehavior": {
+                    "type": "string"
+                },
+                "PredictiveScalingMaxCapacityBuffer": {
+                    "type": "number"
+                },
+                "PredictiveScalingMode": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                },
+                "ScalableDimension": {
+                    "type": "string"
+                },
+                "ScalingPolicyUpdateBehavior": {
+                    "type": "string"
+                },
+                "ScheduledActionBufferTime": {
+                    "type": "number"
+                },
+                "ServiceNamespace": {
+                    "type": "string"
+                },
+                "TargetTrackingConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.TargetTrackingConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity",
+                "ResourceId",
+                "ScalableDimension",
+                "ServiceNamespace",
+                "TargetTrackingConfigurations"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.TagFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.TargetTrackingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomizedScalingMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.CustomizedScalingMetricSpecification"
+                },
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "EstimatedInstanceWarmup": {
+                    "type": "number"
+                },
+                "PredefinedScalingMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.PredefinedScalingMetricSpecification"
+                },
+                "ScaleInCooldown": {
+                    "type": "number"
+                },
+                "ScaleOutCooldown": {
+                    "type": "number"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BackupPlan": {
+                            "$ref": "#/definitions/AWS::Backup::BackupPlan.BackupPlanResourceType"
+                        },
+                        "BackupPlanTags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "BackupPlan"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Backup::BackupPlan"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan.AdvancedBackupSettingResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "BackupOptions": {
+                    "type": "object"
+                },
+                "ResourceType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BackupOptions",
+                "ResourceType"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan.BackupPlanResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "AdvancedBackupSettings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Backup::BackupPlan.AdvancedBackupSettingResourceType"
+                    },
+                    "type": "array"
+                },
+                "BackupPlanName": {
+                    "type": "string"
+                },
+                "BackupPlanRule": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Backup::BackupPlan.BackupRuleResourceType"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "BackupPlanName",
+                "BackupPlanRule"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan.BackupRuleResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "CompletionWindowMinutes": {
+                    "type": "number"
+                },
+                "CopyActions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Backup::BackupPlan.CopyActionResourceType"
+                    },
+                    "type": "array"
+                },
+                "EnableContinuousBackup": {
+                    "type": "boolean"
+                },
+                "Lifecycle": {
+                    "$ref": "#/definitions/AWS::Backup::BackupPlan.LifecycleResourceType"
+                },
+                "RecoveryPointTags": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "RuleName": {
+                    "type": "string"
+                },
+                "ScheduleExpression": {
+                    "type": "string"
+                },
+                "StartWindowMinutes": {
+                    "type": "number"
+                },
+                "TargetBackupVault": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RuleName",
+                "TargetBackupVault"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan.CopyActionResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationBackupVaultArn": {
+                    "type": "string"
+                },
+                "Lifecycle": {
+                    "$ref": "#/definitions/AWS::Backup::BackupPlan.LifecycleResourceType"
+                }
+            },
+            "required": [
+                "DestinationBackupVaultArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan.LifecycleResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteAfterDays": {
+                    "type": "number"
+                },
+                "MoveToColdStorageAfterDays": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Backup::BackupSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BackupPlanId": {
+                            "type": "string"
+                        },
+                        "BackupSelection": {
+                            "$ref": "#/definitions/AWS::Backup::BackupSelection.BackupSelectionResourceType"
+                        }
+                    },
+                    "required": [
+                        "BackupPlanId",
+                        "BackupSelection"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Backup::BackupSelection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupSelection.BackupSelectionResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "type": "object"
+                },
+                "IamRoleArn": {
+                    "type": "string"
+                },
+                "ListOfTags": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Backup::BackupSelection.ConditionResourceType"
+                    },
+                    "type": "array"
+                },
+                "NotResources": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Resources": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SelectionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IamRoleArn",
+                "SelectionName"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupSelection.ConditionResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "ConditionKey": {
+                    "type": "string"
+                },
+                "ConditionType": {
+                    "type": "string"
+                },
+                "ConditionValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConditionKey",
+                "ConditionType",
+                "ConditionValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupVault": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessPolicy": {
+                            "type": "object"
+                        },
+                        "BackupVaultName": {
+                            "type": "string"
+                        },
+                        "BackupVaultTags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "EncryptionKeyArn": {
+                            "type": "string"
+                        },
+                        "LockConfiguration": {
+                            "$ref": "#/definitions/AWS::Backup::BackupVault.LockConfigurationType"
+                        },
+                        "Notifications": {
+                            "$ref": "#/definitions/AWS::Backup::BackupVault.NotificationObjectType"
+                        }
+                    },
+                    "required": [
+                        "BackupVaultName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Backup::BackupVault"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupVault.LockConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "ChangeableForDays": {
+                    "type": "number"
+                },
+                "MaxRetentionDays": {
+                    "type": "number"
+                },
+                "MinRetentionDays": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MinRetentionDays"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupVault.NotificationObjectType": {
+            "additionalProperties": false,
+            "properties": {
+                "BackupVaultEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SNSTopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BackupVaultEvents",
+                "SNSTopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::Framework": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FrameworkControls": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Backup::Framework.FrameworkControl"
+                            },
+                            "type": "array"
+                        },
+                        "FrameworkDescription": {
+                            "type": "string"
+                        },
+                        "FrameworkName": {
+                            "type": "string"
+                        },
+                        "FrameworkTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FrameworkControls"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Backup::Framework"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::Framework.ControlInputParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ParameterName",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::Framework.FrameworkControl": {
+            "additionalProperties": false,
+            "properties": {
+                "ControlInputParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Backup::Framework.ControlInputParameter"
+                    },
+                    "type": "array"
+                },
+                "ControlName": {
+                    "type": "string"
+                },
+                "ControlScope": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "ControlName"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::ReportPlan": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ReportDeliveryChannel": {
+                            "type": "object"
+                        },
+                        "ReportPlanDescription": {
+                            "type": "string"
+                        },
+                        "ReportPlanName": {
+                            "type": "string"
+                        },
+                        "ReportPlanTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ReportSetting": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ReportDeliveryChannel",
+                        "ReportSetting"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Backup::ReportPlan"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::ComputeEnvironment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ComputeEnvironmentName": {
+                            "type": "string"
+                        },
+                        "ComputeResources": {
+                            "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.ComputeResources"
+                        },
+                        "ServiceRole": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "UnmanagedvCpus": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Batch::ComputeEnvironment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::ComputeEnvironment.ComputeResources": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "BidPercentage": {
+                    "type": "number"
+                },
+                "DesiredvCpus": {
+                    "type": "number"
+                },
+                "Ec2Configuration": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.Ec2ConfigurationObject"
+                    },
+                    "type": "array"
+                },
+                "Ec2KeyPair": {
+                    "type": "string"
+                },
+                "ImageId": {
+                    "type": "string"
+                },
+                "InstanceRole": {
+                    "type": "string"
+                },
+                "InstanceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LaunchTemplate": {
+                    "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.LaunchTemplateSpecification"
+                },
+                "MaxvCpus": {
+                    "type": "number"
+                },
+                "MinvCpus": {
+                    "type": "number"
+                },
+                "PlacementGroup": {
+                    "type": "string"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SpotIamFleetRole": {
+                    "type": "string"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Tags": {
+                    "type": "object"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MaxvCpus",
+                "Subnets",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::ComputeEnvironment.Ec2ConfigurationObject": {
+            "additionalProperties": false,
+            "properties": {
+                "ImageIdOverride": {
+                    "type": "string"
+                },
+                "ImageType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ImageType"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::ComputeEnvironment.LaunchTemplateSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContainerProperties": {
+                            "$ref": "#/definitions/AWS::Batch::JobDefinition.ContainerProperties"
+                        },
+                        "JobDefinitionName": {
+                            "type": "string"
+                        },
+                        "NodeProperties": {
+                            "$ref": "#/definitions/AWS::Batch::JobDefinition.NodeProperties"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "PlatformCapabilities": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PropagateTags": {
+                            "type": "boolean"
+                        },
+                        "RetryStrategy": {
+                            "$ref": "#/definitions/AWS::Batch::JobDefinition.RetryStrategy"
+                        },
+                        "SchedulingPriority": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Timeout": {
+                            "$ref": "#/definitions/AWS::Batch::JobDefinition.Timeout"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Batch::JobDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.AuthorizationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessPointId": {
+                    "type": "string"
+                },
+                "Iam": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.ContainerProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Command": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Environment": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Environment"
+                    },
+                    "type": "array"
+                },
+                "ExecutionRoleArn": {
+                    "type": "string"
+                },
+                "FargatePlatformConfiguration": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.FargatePlatformConfiguration"
+                },
+                "Image": {
+                    "type": "string"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "JobRoleArn": {
+                    "type": "string"
+                },
+                "LinuxParameters": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.LinuxParameters"
+                },
+                "LogConfiguration": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.LogConfiguration"
+                },
+                "Memory": {
+                    "type": "number"
+                },
+                "MountPoints": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.MountPoints"
+                    },
+                    "type": "array"
+                },
+                "NetworkConfiguration": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.NetworkConfiguration"
+                },
+                "Privileged": {
+                    "type": "boolean"
+                },
+                "ReadonlyRootFilesystem": {
+                    "type": "boolean"
+                },
+                "ResourceRequirements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.ResourceRequirement"
+                    },
+                    "type": "array"
+                },
+                "Secrets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Secret"
+                    },
+                    "type": "array"
+                },
+                "Ulimits": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Ulimit"
+                    },
+                    "type": "array"
+                },
+                "User": {
+                    "type": "string"
+                },
+                "Vcpus": {
+                    "type": "number"
+                },
+                "Volumes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Volumes"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Image"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Device": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "HostPath": {
+                    "type": "string"
+                },
+                "Permissions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.EfsVolumeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationConfig": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.AuthorizationConfig"
+                },
+                "FileSystemId": {
+                    "type": "string"
+                },
+                "RootDirectory": {
+                    "type": "string"
+                },
+                "TransitEncryption": {
+                    "type": "string"
+                },
+                "TransitEncryptionPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FileSystemId"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.EvaluateOnExit": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "OnExitCode": {
+                    "type": "string"
+                },
+                "OnReason": {
+                    "type": "string"
+                },
+                "OnStatusReason": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.FargatePlatformConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "PlatformVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.LinuxParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Devices": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Device"
+                    },
+                    "type": "array"
+                },
+                "InitProcessEnabled": {
+                    "type": "boolean"
+                },
+                "MaxSwap": {
+                    "type": "number"
+                },
+                "SharedMemorySize": {
+                    "type": "number"
+                },
+                "Swappiness": {
+                    "type": "number"
+                },
+                "Tmpfs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Tmpfs"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.LogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogDriver": {
+                    "type": "string"
+                },
+                "Options": {
+                    "type": "object"
+                },
+                "SecretOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Secret"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LogDriver"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.MountPoints": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "ReadOnly": {
+                    "type": "boolean"
+                },
+                "SourceVolume": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AssignPublicIp": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.NodeProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "MainNode": {
+                    "type": "number"
+                },
+                "NodeRangeProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.NodeRangeProperty"
+                    },
+                    "type": "array"
+                },
+                "NumNodes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MainNode",
+                "NodeRangeProperties",
+                "NumNodes"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.NodeRangeProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Container": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.ContainerProperties"
+                },
+                "TargetNodes": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TargetNodes"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.ResourceRequirement": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.RetryStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "Attempts": {
+                    "type": "number"
+                },
+                "EvaluateOnExit": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.EvaluateOnExit"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Secret": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "ValueFrom": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "ValueFrom"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Timeout": {
+            "additionalProperties": false,
+            "properties": {
+                "AttemptDurationSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Tmpfs": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "MountOptions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Size": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ContainerPath",
+                "Size"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Ulimit": {
+            "additionalProperties": false,
+            "properties": {
+                "HardLimit": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SoftLimit": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "HardLimit",
+                "Name",
+                "SoftLimit"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Volumes": {
+            "additionalProperties": false,
+            "properties": {
+                "EfsVolumeConfiguration": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.EfsVolumeConfiguration"
+                },
+                "Host": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.VolumesHost"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.VolumesHost": {
+            "additionalProperties": false,
+            "properties": {
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobQueue": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ComputeEnvironmentOrder": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Batch::JobQueue.ComputeEnvironmentOrder"
+                            },
+                            "type": "array"
+                        },
+                        "JobQueueName": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        },
+                        "SchedulingPolicyArn": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ComputeEnvironmentOrder",
+                        "Priority"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Batch::JobQueue"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobQueue.ComputeEnvironmentOrder": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeEnvironment": {
+                    "type": "string"
+                },
+                "Order": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ComputeEnvironment",
+                "Order"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::SchedulingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FairsharePolicy": {
+                            "$ref": "#/definitions/AWS::Batch::SchedulingPolicy.FairsharePolicy"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Batch::SchedulingPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::SchedulingPolicy.FairsharePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeReservation": {
+                    "type": "number"
+                },
+                "ShareDecaySeconds": {
+                    "type": "number"
+                },
+                "ShareDistribution": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::SchedulingPolicy.ShareAttributes"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::SchedulingPolicy.ShareAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "ShareIdentifier": {
+                    "type": "string"
+                },
+                "WeightFactor": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Budgets::Budget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.BudgetData": {
+            "additionalProperties": false,
+            "properties": {
+                "BudgetLimit": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.Spend"
+                },
+                "BudgetName": {
+                    "type": "string"
+                },
+                "BudgetType": {
+                    "type": "string"
+                },
+                "CostFilters": {
+                    "type": "object"
+                },
+                "CostTypes": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.CostTypes"
+                },
+                "PlannedBudgetLimits": {
+                    "type": "object"
+                },
+                "TimePeriod": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.TimePeriod"
+                },
+                "TimeUnit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BudgetType",
+                "TimeUnit"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.CostTypes": {
+            "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"
+                },
+                "UseBlended": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.Notification": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "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.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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ActionThreshold": {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ActionThreshold"
+                        },
+                        "ActionType": {
+                            "type": "string"
+                        },
+                        "ApprovalModel": {
+                            "type": "string"
+                        },
+                        "BudgetName": {
+                            "type": "string"
+                        },
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Definition"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "NotificationType": {
+                            "type": "string"
+                        },
+                        "Subscribers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Subscriber"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ActionThreshold",
+                        "ActionType",
+                        "BudgetName",
+                        "Definition",
+                        "ExecutionRoleArn",
+                        "NotificationType",
+                        "Subscribers"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Budgets::BudgetsAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.ActionThreshold": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.Definition": {
+            "additionalProperties": false,
+            "properties": {
+                "IamActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.IamActionDefinition"
+                },
+                "ScpActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ScpActionDefinition"
+                },
+                "SsmActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.SsmActionDefinition"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.IamActionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Groups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PolicyArn": {
+                    "type": "string"
+                },
+                "Roles": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Users": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "PolicyArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.ScpActionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "PolicyId": {
+                    "type": "string"
+                },
+                "TargetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "PolicyId",
+                "TargetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.SsmActionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "Subtype": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceIds",
+                "Region",
+                "Subtype"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.Subscriber": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Address",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CE::AnomalyMonitor": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        }
+                    },
+                    "required": [
+                        "MonitorName",
+                        "MonitorType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CE::AnomalyMonitor"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CE::AnomalySubscription": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Subscribers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.Subscriber"
+                            },
+                            "type": "array"
+                        },
+                        "SubscriptionName": {
+                            "type": "string"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Frequency",
+                        "MonitorArnList",
+                        "Subscribers",
+                        "SubscriptionName",
+                        "Threshold"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CE::AnomalySubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CE::AnomalySubscription.Subscriber": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Address",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CE::CostCategory": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "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"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CUR::ReportDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CUR::ReportDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Keyspace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cassandra::Keyspace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BillingMode": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.BillingMode"
+                        },
+                        "ClusteringKeyColumns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.ClusteringKeyColumn"
+                            },
+                            "type": "array"
+                        },
+                        "DefaultTimeToLive": {
+                            "type": "number"
+                        },
+                        "EncryptionSpecification": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.EncryptionSpecification"
+                        },
+                        "KeyspaceName": {
+                            "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"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "KeyspaceName",
+                        "PartitionKeyColumns"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cassandra::Table"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "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::CertificateManager::Account": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExpiryEventsConfiguration": {
+                            "$ref": "#/definitions/AWS::CertificateManager::Account.ExpiryEventsConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ExpiryEventsConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CertificateManager::Account"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CertificateManager::Account.ExpiryEventsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DaysBeforeExpiry": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CertificateManager::Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "CertificateTransparencyLoggingPreference": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "DomainValidationOptions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CertificateManager::Certificate.DomainValidationOption"
+                            },
+                            "type": "array"
+                        },
+                        "SubjectAlternativeNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ValidationMethod": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CertificateManager::Certificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CertificateManager::Certificate.DomainValidationOption": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                },
+                "ValidationDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DomainName"
+            ],
+            "type": "object"
+        },
+        "AWS::Chatbot::SlackChannelConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigurationName": {
+                            "type": "string"
+                        },
+                        "GuardrailPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "IamRoleArn": {
+                            "type": "string"
+                        },
+                        "LoggingLevel": {
+                            "type": "string"
+                        },
+                        "SlackChannelId": {
+                            "type": "string"
+                        },
+                        "SlackWorkspaceId": {
+                            "type": "string"
+                        },
+                        "SnsTopicArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "UserRoleRequired": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationName",
+                        "IamRoleArn",
+                        "SlackChannelId",
+                        "SlackWorkspaceId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Chatbot::SlackChannelConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cloud9::EnvironmentEC2": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": [
+                        "InstanceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cloud9::EnvironmentEC2"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cloud9::EnvironmentEC2.Repository": {
+            "additionalProperties": false,
+            "properties": {
+                "PathComponent": {
+                    "type": "string"
+                },
+                "RepositoryUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PathComponent",
+                "RepositoryUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::CustomResource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::Macro": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "LogRoleARN": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FunctionName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::Macro"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::ModuleDefaultVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ModuleDefaultVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::ModuleVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ModuleName": {
+                            "type": "string"
+                        },
+                        "ModulePackage": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ModuleName",
+                        "ModulePackage"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ModuleVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::PublicTypeVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::Publisher": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptTermsAndConditions": {
+                            "type": "boolean"
+                        },
+                        "ConnectionArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AcceptTermsAndConditions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::Publisher"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::ResourceDefaultVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeVersionArn": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ResourceDefaultVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::ResourceVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::ResourceVersion.LoggingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "LogRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::Stack": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "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": {
+                            "type": "string"
+                        },
+                        "ManagedExecution": {
+                            "type": "object"
+                        },
+                        "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": [
+                        "PermissionModel",
+                        "StackSetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::StackSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.AutoDeployment": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "RetainStacksOnAccountRemoval": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.DeploymentTargets": {
+            "additionalProperties": false,
+            "properties": {
+                "Accounts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OrganizationalUnitIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.OperationPreferences": {
+            "additionalProperties": false,
+            "properties": {
+                "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": [
+                "ParameterKey",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::Distribution": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                },
+                "OriginProtocolPolicy": {
+                    "type": "string"
+                },
+                "OriginReadTimeout": {
+                    "type": "number"
+                },
+                "OriginSSLProtocols": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "OriginProtocolPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.DefaultCacheBehavior": {
+            "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"
+                },
+                "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": [
+                "TargetOriginId",
+                "ViewerProtocolPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.DistributionConfig": {
+            "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"
+                },
+                "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"
+                },
+                "ViewerCertificate": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ViewerCertificate"
+                },
+                "WebACLId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.ForwardedValues": {
+            "additionalProperties": false,
+            "properties": {
+                "Cookies": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.Cookies"
+                },
+                "Headers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "QueryString": {
+                    "type": "boolean"
+                },
+                "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"
+                },
+                "OriginProtocolPolicy": {
+                    "type": "string"
+                },
+                "OriginSSLProtocols": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DNSName",
+                "OriginProtocolPolicy",
+                "OriginSSLProtocols"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.LegacyS3Origin": {
+            "additionalProperties": false,
+            "properties": {
+                "DNSName": {
+                    "type": "string"
+                },
+                "OriginAccessIdentity": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DNSName"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "IncludeCookies": {
+                    "type": "boolean"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.Origin": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionAttempts": {
+                    "type": "number"
+                },
+                "ConnectionTimeout": {
+                    "type": "number"
+                },
+                "CustomOriginConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.CustomOriginConfig"
+                },
+                "DomainName": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "OriginCustomHeaders": {
+                    "items": {
+                        "$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": [
+                "DomainName",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.OriginCustomHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderName": {
+                    "type": "string"
+                },
+                "HeaderValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HeaderName",
+                "HeaderValue"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.OriginGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "FailoverCriteria": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroupFailoverCriteria"
+                },
+                "Id": {
+                    "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": {
+                    "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"
+                },
+                "Quantity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Quantity"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.OriginShield": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "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"
+                    },
+                    "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"
+                },
+                "MinimumProtocolVersion": {
+                    "type": "string"
+                },
+                "SslSupportMethod": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFront::Function": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoPublish": {
+                            "type": "boolean"
+                        },
+                        "FunctionCode": {
+                            "type": "string"
+                        },
+                        "FunctionConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::Function.FunctionConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::Function"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Function.FunctionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "Runtime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Comment",
+                "Runtime"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Function.FunctionMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionARN": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFront::KeyGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "KeyGroupConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::KeyGroup.KeyGroupConfig"
+                        }
+                    },
+                    "required": [
+                        "KeyGroupConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::KeyGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "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::OriginRequestPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "OriginRequestPolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.OriginRequestPolicyConfig"
+                        }
+                    },
+                    "required": [
+                        "OriginRequestPolicyConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::OriginRequestPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::OriginRequestPolicy.CookiesConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CookieBehavior": {
+                    "type": "string"
+                },
+                "Cookies": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CookieBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::OriginRequestPolicy.HeadersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderBehavior": {
+                    "type": "string"
+                },
+                "Headers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "HeaderBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::OriginRequestPolicy.OriginRequestPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "CookiesConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.CookiesConfig"
+                },
+                "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::CloudFront::OriginRequestPolicy.QueryStringsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryStringBehavior": {
+                    "type": "string"
+                },
+                "QueryStrings": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "QueryStringBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::PublicKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PublicKeyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::PublicKey.PublicKeyConfig"
+                        }
+                    },
+                    "required": [
+                        "PublicKeyConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::PublicKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::PublicKey.PublicKeyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CallerReference": {
+                    "type": "string"
+                },
+                "Comment": {
+                    "type": "string"
+                },
+                "EncodedKey": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CallerReference",
+                "EncodedKey",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::RealtimeLogConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        }
+                    },
+                    "required": [
+                        "EndPoints",
+                        "Fields",
+                        "Name",
+                        "SamplingRate"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::RealtimeLogConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::RealtimeLogConfig.EndPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "KinesisStreamConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::RealtimeLogConfig.KinesisStreamConfig"
+                },
+                "StreamType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KinesisStreamConfig",
+                "StreamType"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::RealtimeLogConfig.KinesisStreamConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "StreamArn"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResponseHeadersPolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ResponseHeadersPolicyConfig"
+                        }
+                    },
+                    "required": [
+                        "ResponseHeadersPolicyConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::ResponseHeadersPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "Items": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Items"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowMethods": {
+            "additionalProperties": false,
+            "properties": {
+                "Items": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Items"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowOrigins": {
+            "additionalProperties": false,
+            "properties": {
+                "Items": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Items"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlExposeHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "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::CloudFront::ResponseHeadersPolicy.ContentTypeOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Override": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Override"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.CorsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessControlAllowCredentials": {
+                    "type": "boolean"
+                },
+                "AccessControlAllowHeaders": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowHeaders"
+                },
+                "AccessControlAllowMethods": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowMethods"
+                },
+                "AccessControlAllowOrigins": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowOrigins"
+                },
+                "AccessControlExposeHeaders": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlExposeHeaders"
+                },
+                "AccessControlMaxAgeSec": {
+                    "type": "number"
+                },
+                "OriginOverride": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AccessControlAllowCredentials",
+                "AccessControlAllowHeaders",
+                "AccessControlAllowMethods",
+                "AccessControlAllowOrigins",
+                "OriginOverride"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.CustomHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "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::CloudFront::ResponseHeadersPolicy.CustomHeader"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Items"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.FrameOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "FrameOption": {
+                    "type": "string"
+                },
+                "Override": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "FrameOption",
+                "Override"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.ReferrerPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Override": {
+                    "type": "boolean"
+                },
+                "ReferrerPolicy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Override",
+                "ReferrerPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.ResponseHeadersPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "CorsConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.CorsConfig"
+                },
+                "CustomHeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.CustomHeadersConfig"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SecurityHeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.SecurityHeadersConfig"
+                }
+            },
+            "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.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::CloudFront::StreamingDistribution": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "StreamingDistributionConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution.StreamingDistributionConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "StreamingDistributionConfig",
+                        "Tags"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::StreamingDistribution"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "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::Trail": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "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"
+                        }
+                    },
+                    "required": [
+                        "IsLogging",
+                        "S3BucketName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudTrail::Trail"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudTrail::Trail.DataResource": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "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"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        },
+                        "ThresholdMetricId": {
+                            "type": "string"
+                        },
+                        "TreatMissingData": {
+                            "type": "string"
+                        },
+                        "Unit": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ComparisonOperator",
+                        "EvaluationPeriods"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::Alarm"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Configuration"
+                        },
+                        "Dimensions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
+                            },
+                            "type": "array"
+                        },
+                        "MetricMathAnomalyDetector": {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricMathAnomalyDetector"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Namespace": {
+                            "type": "string"
+                        },
+                        "SingleMetricAnomalyDetector": {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector"
+                        },
+                        "Stat": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::AnomalyDetector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "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": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.Metric": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "Namespace"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.MetricDataQueries": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.MetricDataQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Label": {
+                    "type": "string"
+                },
+                "MetricStat": {
+                    "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricStat"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "ReturnData": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "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": {
+                "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ActionsEnabled": {
+                            "type": "boolean"
+                        },
+                        "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"
+                        }
+                    },
+                    "required": [
+                        "AlarmName",
+                        "AlarmRule"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::CompositeAlarm"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::Dashboard": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DashboardBody": {
+                            "type": "string"
+                        },
+                        "DashboardName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DashboardBody"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::Dashboard"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::InsightRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RuleBody": {
+                            "type": "string"
+                        },
+                        "RuleName": {
+                            "type": "string"
+                        },
+                        "RuleState": {
+                            "type": "string"
+                        },
+                        "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExcludeFilters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamFilter"
+                            },
+                            "type": "array"
+                        },
+                        "FirehoseArn": {
+                            "type": "string"
+                        },
+                        "IncludeFilters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamFilter"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OutputFormat": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FirehoseArn",
+                        "OutputFormat",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::MetricStream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::MetricStream.MetricStreamFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Namespace"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeArtifact::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::Repository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                    "type": "string"
+                },
+                "EnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeBuild::Project.EnvironmentVariable"
+                    },
+                    "type": "array"
+                },
+                "Image": {
+                    "type": "string"
+                },
+                "ImagePullCredentialsType": {
+                    "type": "string"
+                },
+                "PrivilegedMode": {
+                    "type": "boolean"
+                },
+                "RegistryCredential": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.RegistryCredential"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComputeType",
+                "Image",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.EnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.FilterGroup": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.GitSubmodulesConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FetchSubmodules": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "FetchSubmodules"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.LogsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogs": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.CloudWatchLogsConfig"
+                },
+                "S3Logs": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.S3LogsConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.ProjectBuildBatchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchReportMode": {
+                    "type": "string"
+                },
+                "CombineArtifacts": {
+                    "type": "boolean"
+                },
+                "Restrictions": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.BatchRestrictions"
+                },
+                "ServiceRole": {
+                    "type": "string"
+                },
+                "TimeoutInMins": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.ProjectCache": {
+            "additionalProperties": false,
+            "properties": {
+                "Location": {
+                    "type": "string"
+                },
+                "Modes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.ProjectFileSystemLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "Identifier": {
+                    "type": "string"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "MountOptions": {
+                    "type": "string"
+                },
+                "MountPoint": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Identifier",
+                "Location",
+                "MountPoint",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.ProjectSourceVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceIdentifier": {
+                    "type": "string"
+                },
+                "SourceVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourceIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.ProjectTriggers": {
+            "additionalProperties": false,
+            "properties": {
+                "BuildType": {
+                    "type": "string"
+                },
+                "FilterGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeBuild::Project.FilterGroup"
+                    },
+                    "type": "array"
+                },
+                "Webhook": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.RegistryCredential": {
+            "additionalProperties": false,
+            "properties": {
+                "Credential": {
+                    "type": "string"
+                },
+                "CredentialProvider": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Credential",
+                "CredentialProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.S3LogsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionDisabled": {
+                    "type": "boolean"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.Source": {
+            "additionalProperties": false,
+            "properties": {
+                "Auth": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.SourceAuth"
+                },
+                "BuildSpec": {
+                    "type": "string"
+                },
+                "BuildStatusConfig": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.BuildStatusConfig"
+                },
+                "GitCloneDepth": {
+                    "type": "number"
+                },
+                "GitSubmodulesConfig": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.GitSubmodulesConfig"
+                },
+                "InsecureSsl": {
+                    "type": "boolean"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "ReportBuildStatus": {
+                    "type": "boolean"
+                },
+                "SourceIdentifier": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.SourceAuth": {
+            "additionalProperties": false,
+            "properties": {
+                "Resource": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.WebhookFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludeMatchedPattern": {
+                    "type": "boolean"
+                },
+                "Pattern": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Pattern",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::ReportGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeleteReports": {
+                            "type": "boolean"
+                        },
+                        "ExportConfig": {
+                            "$ref": "#/definitions/AWS::CodeBuild::ReportGroup.ReportExportConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ExportConfig",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeBuild::ReportGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::ReportGroup.ReportExportConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ExportConfigType": {
+                    "type": "string"
+                },
+                "S3Destination": {
+                    "$ref": "#/definitions/AWS::CodeBuild::ReportGroup.S3ReportExportConfig"
+                }
+            },
+            "required": [
+                "ExportConfigType"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::ReportGroup.S3ReportExportConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "BucketOwner": {
+                    "type": "string"
+                },
+                "EncryptionDisabled": {
+                    "type": "boolean"
+                },
+                "EncryptionKey": {
+                    "type": "string"
+                },
+                "Packaging": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::SourceCredential": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthType": {
+                            "type": "string"
+                        },
+                        "ServerType": {
+                            "type": "string"
+                        },
+                        "Token": {
+                            "type": "string"
+                        },
+                        "Username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthType",
+                        "ServerType",
+                        "Token"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeBuild::SourceCredential"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeCommit::Repository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Code": {
+                            "$ref": "#/definitions/AWS::CodeCommit::Repository.Code"
+                        },
+                        "RepositoryDescription": {
+                            "type": "string"
+                        },
+                        "RepositoryName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Triggers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeCommit::Repository.RepositoryTrigger"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RepositoryName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeCommit::Repository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeCommit::Repository.Code": {
+            "additionalProperties": false,
+            "properties": {
+                "BranchName": {
+                    "type": "string"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::CodeCommit::Repository.S3"
+                }
+            },
+            "required": [
+                "S3"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeCommit::Repository.RepositoryTrigger": {
+            "additionalProperties": false,
+            "properties": {
+                "Branches": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CustomData": {
+                    "type": "string"
+                },
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Events": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationArn",
+                "Events",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeCommit::Repository.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "ComputePlatform": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeDeploy::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ComputePlatform": {
+                            "type": "string"
+                        },
+                        "DeploymentConfigName": {
+                            "type": "string"
+                        },
+                        "MinimumHealthyHosts": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentConfig.MinimumHealthyHosts"
+                        },
+                        "TrafficRoutingConfig": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentConfig.TrafficRoutingConfig"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeDeploy::DeploymentConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentConfig.MinimumHealthyHosts": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentConfig.TimeBasedCanary": {
+            "additionalProperties": false,
+            "properties": {
+                "CanaryInterval": {
+                    "type": "number"
+                },
+                "CanaryPercentage": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "CanaryInterval",
+                "CanaryPercentage"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentConfig.TimeBasedLinear": {
+            "additionalProperties": false,
+            "properties": {
+                "LinearInterval": {
+                    "type": "number"
+                },
+                "LinearPercentage": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "LinearInterval",
+                "LinearPercentage"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentConfig.TrafficRoutingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TimeBasedCanary": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentConfig.TimeBasedCanary"
+                },
+                "TimeBasedLinear": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentConfig.TimeBasedLinear"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AlarmConfiguration": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.AlarmConfiguration"
+                        },
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "AutoRollbackConfiguration": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.AutoRollbackConfiguration"
+                        },
+                        "AutoScalingGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BlueGreenDeploymentConfiguration": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.BlueGreenDeploymentConfiguration"
+                        },
+                        "Deployment": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.Deployment"
+                        },
+                        "DeploymentConfigName": {
+                            "type": "string"
+                        },
+                        "DeploymentGroupName": {
+                            "type": "string"
+                        },
+                        "DeploymentStyle": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.DeploymentStyle"
+                        },
+                        "ECSServices": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.ECSService"
+                            },
+                            "type": "array"
+                        },
+                        "Ec2TagFilters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.EC2TagFilter"
+                            },
+                            "type": "array"
+                        },
+                        "Ec2TagSet": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.EC2TagSet"
+                        },
+                        "LoadBalancerInfo": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.LoadBalancerInfo"
+                        },
+                        "OnPremisesInstanceTagFilters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.TagFilter"
+                            },
+                            "type": "array"
+                        },
+                        "OnPremisesTagSet": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSet"
+                        },
+                        "ServiceRoleArn": {
+                            "type": "string"
+                        },
+                        "TriggerConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.TriggerConfig"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "ServiceRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeDeploy::DeploymentGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.Alarm": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.AlarmConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Alarms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.Alarm"
+                    },
+                    "type": "array"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "IgnorePollAlarmFailure": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.AutoRollbackConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Events": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.BlueGreenDeploymentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeploymentReadyOption": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.DeploymentReadyOption"
+                },
+                "GreenFleetProvisioningOption": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.GreenFleetProvisioningOption"
+                },
+                "TerminateBlueInstancesOnDeploymentSuccess": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.BlueInstanceTerminationOption"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.BlueInstanceTerminationOption": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "TerminationWaitTimeInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.Deployment": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "IgnoreApplicationStopFailures": {
+                    "type": "boolean"
+                },
+                "Revision": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.RevisionLocation"
+                }
+            },
+            "required": [
+                "Revision"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.DeploymentReadyOption": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionOnTimeout": {
+                    "type": "string"
+                },
+                "WaitTimeInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.DeploymentStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "DeploymentOption": {
+                    "type": "string"
+                },
+                "DeploymentType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.EC2TagFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.EC2TagSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Ec2TagSetList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.EC2TagSetListObject"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.EC2TagSetListObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Ec2TagGroup": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.EC2TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.ECSService": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClusterName",
+                "ServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.ELBInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.GitHubLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "CommitId": {
+                    "type": "string"
+                },
+                "Repository": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CommitId",
+                "Repository"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.GreenFleetProvisioningOption": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.LoadBalancerInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "ElbInfoList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.ELBInfo"
+                    },
+                    "type": "array"
+                },
+                "TargetGroupInfoList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.TargetGroupInfo"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSet": {
+            "additionalProperties": false,
+            "properties": {
+                "OnPremisesTagSetList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSetListObject"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSetListObject": {
+            "additionalProperties": false,
+            "properties": {
+                "OnPremisesTagGroup": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.RevisionLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "GitHubLocation": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.GitHubLocation"
+                },
+                "RevisionType": {
+                    "type": "string"
+                },
+                "S3Location": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.S3Location"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "BundleType": {
+                    "type": "string"
+                },
+                "ETag": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.TagFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.TargetGroupInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.TriggerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TriggerEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TriggerName": {
+                    "type": "string"
+                },
+                "TriggerTargetArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeGuruProfiler::ProfilingGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AgentPermissions": {
+                            "type": "object"
+                        },
+                        "AnomalyDetectionNotificationConfiguration": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeGuruProfiler::ProfilingGroup.Channel"
+                            },
+                            "type": "array"
+                        },
+                        "ComputePlatform": {
+                            "type": "string"
+                        },
+                        "ProfilingGroupName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ProfilingGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeGuruProfiler::ProfilingGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeGuruProfiler::ProfilingGroup.Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "channelId": {
+                    "type": "string"
+                },
+                "channelUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "channelUri"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeGuruReviewer::RepositoryAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BucketName": {
+                            "type": "string"
+                        },
+                        "ConnectionArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Owner": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeGuruReviewer::RepositoryAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::CustomActionType": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Category": {
+                            "type": "string"
+                        },
+                        "ConfigurationProperties": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodePipeline::CustomActionType.ConfigurationProperties"
+                            },
+                            "type": "array"
+                        },
+                        "InputArtifactDetails": {
+                            "$ref": "#/definitions/AWS::CodePipeline::CustomActionType.ArtifactDetails"
+                        },
+                        "OutputArtifactDetails": {
+                            "$ref": "#/definitions/AWS::CodePipeline::CustomActionType.ArtifactDetails"
+                        },
+                        "Provider": {
+                            "type": "string"
+                        },
+                        "Settings": {
+                            "$ref": "#/definitions/AWS::CodePipeline::CustomActionType.Settings"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Category",
+                        "InputArtifactDetails",
+                        "OutputArtifactDetails",
+                        "Provider",
+                        "Version"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodePipeline::CustomActionType"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::CustomActionType.ArtifactDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumCount": {
+                    "type": "number"
+                },
+                "MinimumCount": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaximumCount",
+                "MinimumCount"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::CustomActionType.ConfigurationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Queryable": {
+                    "type": "boolean"
+                },
+                "Required": {
+                    "type": "boolean"
+                },
+                "Secret": {
+                    "type": "boolean"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Name",
+                "Required",
+                "Secret"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::CustomActionType.Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "EntityUrlTemplate": {
+                    "type": "string"
+                },
+                "ExecutionUrlTemplate": {
+                    "type": "string"
+                },
+                "RevisionUrlTemplate": {
+                    "type": "string"
+                },
+                "ThirdPartyConfigurationUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ArtifactStore": {
+                            "$ref": "#/definitions/AWS::CodePipeline::Pipeline.ArtifactStore"
+                        },
+                        "ArtifactStores": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodePipeline::Pipeline.ArtifactStoreMap"
+                            },
+                            "type": "array"
+                        },
+                        "DisableInboundStageTransitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodePipeline::Pipeline.StageTransition"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RestartExecutionOnUpdate": {
+                            "type": "boolean"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Stages": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodePipeline::Pipeline.StageDeclaration"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RoleArn",
+                        "Stages"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodePipeline::Pipeline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.ActionDeclaration": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionTypeId": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.ActionTypeId"
+                },
+                "Configuration": {
+                    "type": "object"
+                },
+                "InputArtifacts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.InputArtifact"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "OutputArtifacts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.OutputArtifact"
+                    },
+                    "type": "array"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RunOrder": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ActionTypeId",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.ActionTypeId": {
+            "additionalProperties": false,
+            "properties": {
+                "Category": {
+                    "type": "string"
+                },
+                "Owner": {
+                    "type": "string"
+                },
+                "Provider": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Category",
+                "Owner",
+                "Provider",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.ArtifactStore": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionKey": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.EncryptionKey"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Location",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.ArtifactStoreMap": {
+            "additionalProperties": false,
+            "properties": {
+                "ArtifactStore": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.ArtifactStore"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ArtifactStore",
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.BlockerDeclaration": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.EncryptionKey": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.InputArtifact": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.OutputArtifact": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.StageDeclaration": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.ActionDeclaration"
+                    },
+                    "type": "array"
+                },
+                "Blockers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.BlockerDeclaration"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.StageTransition": {
+            "additionalProperties": false,
+            "properties": {
+                "Reason": {
+                    "type": "string"
+                },
+                "StageName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Reason",
+                "StageName"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Webhook": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "type": "string"
+                        },
+                        "AuthenticationConfiguration": {
+                            "$ref": "#/definitions/AWS::CodePipeline::Webhook.WebhookAuthConfiguration"
+                        },
+                        "Filters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodePipeline::Webhook.WebhookFilterRule"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RegisterWithThirdParty": {
+                            "type": "boolean"
+                        },
+                        "TargetAction": {
+                            "type": "string"
+                        },
+                        "TargetPipeline": {
+                            "type": "string"
+                        },
+                        "TargetPipelineVersion": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Authentication",
+                        "AuthenticationConfiguration",
+                        "Filters",
+                        "TargetAction",
+                        "TargetPipeline",
+                        "TargetPipelineVersion"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodePipeline::Webhook"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Webhook.WebhookAuthConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedIPRange": {
+                    "type": "string"
+                },
+                "SecretToken": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodePipeline::Webhook.WebhookFilterRule": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonPath": {
+                    "type": "string"
+                },
+                "MatchEquals": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "JsonPath"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStar::GitHubRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Code": {
+                            "$ref": "#/definitions/AWS::CodeStar::GitHubRepository.Code"
+                        },
+                        "ConnectionArn": {
+                            "type": "string"
+                        },
+                        "EnableIssues": {
+                            "type": "boolean"
+                        },
+                        "IsPrivate": {
+                            "type": "boolean"
+                        },
+                        "RepositoryAccessToken": {
+                            "type": "string"
+                        },
+                        "RepositoryDescription": {
+                            "type": "string"
+                        },
+                        "RepositoryName": {
+                            "type": "string"
+                        },
+                        "RepositoryOwner": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RepositoryName",
+                        "RepositoryOwner"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeStar::GitHubRepository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStar::GitHubRepository.Code": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::CodeStar::GitHubRepository.S3"
+                }
+            },
+            "required": [
+                "S3"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStar::GitHubRepository.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStarConnections::Connection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionName": {
+                            "type": "string"
+                        },
+                        "HostArn": {
+                            "type": "string"
+                        },
+                        "ProviderType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConnectionName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeStarConnections::Connection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStarNotifications::NotificationRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CreatedBy": {
+                            "type": "string"
+                        },
+                        "DetailType": {
+                            "type": "string"
+                        },
+                        "EventTypeId": {
+                            "type": "string"
+                        },
+                        "EventTypeIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Resource": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TargetAddress": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeStarNotifications::NotificationRule.Target"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DetailType",
+                        "EventTypeIds",
+                        "Name",
+                        "Resource",
+                        "Targets"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeStarNotifications::NotificationRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStarNotifications::NotificationRule.Target": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetAddress": {
+                    "type": "string"
+                },
+                "TargetType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TargetAddress",
+                "TargetType"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPool": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowClassicFlow": {
+                            "type": "boolean"
+                        },
+                        "AllowUnauthenticatedIdentities": {
+                            "type": "boolean"
+                        },
+                        "CognitoEvents": {
+                            "type": "object"
+                        },
+                        "CognitoIdentityProviders": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cognito::IdentityPool.CognitoIdentityProvider"
+                            },
+                            "type": "array"
+                        },
+                        "CognitoStreams": {
+                            "$ref": "#/definitions/AWS::Cognito::IdentityPool.CognitoStreams"
+                        },
+                        "DeveloperProviderName": {
+                            "type": "string"
+                        },
+                        "IdentityPoolName": {
+                            "type": "string"
+                        },
+                        "OpenIdConnectProviderARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PushSync": {
+                            "$ref": "#/definitions/AWS::Cognito::IdentityPool.PushSync"
+                        },
+                        "SamlProviderARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SupportedLoginProviders": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "AllowUnauthenticatedIdentities"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::IdentityPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPool.CognitoIdentityProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientId": {
+                    "type": "string"
+                },
+                "ProviderName": {
+                    "type": "string"
+                },
+                "ServerSideTokenCheck": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPool.CognitoStreams": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StreamName": {
+                    "type": "string"
+                },
+                "StreamingStatus": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPool.PushSync": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPoolRoleAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "IdentityPoolId": {
+                            "type": "string"
+                        },
+                        "RoleMappings": {
+                            "type": "object"
+                        },
+                        "Roles": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "IdentityPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::IdentityPoolRoleAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPoolRoleAttachment.MappingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Claim": {
+                    "type": "string"
+                },
+                "MatchType": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Claim",
+                "MatchType",
+                "RoleARN",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPoolRoleAttachment.RoleMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "AmbiguousRoleResolution": {
+                    "type": "string"
+                },
+                "IdentityProvider": {
+                    "type": "string"
+                },
+                "RulesConfiguration": {
+                    "$ref": "#/definitions/AWS::Cognito::IdentityPoolRoleAttachment.RulesConfigurationType"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPoolRoleAttachment.RulesConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Cognito::IdentityPoolRoleAttachment.MappingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountRecoverySetting": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.AccountRecoverySetting"
+                        },
+                        "AdminCreateUserConfig": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.AdminCreateUserConfig"
+                        },
+                        "AliasAttributes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AutoVerifiedAttributes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DeviceConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.DeviceConfiguration"
+                        },
+                        "EmailConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.EmailConfiguration"
+                        },
+                        "EmailVerificationMessage": {
+                            "type": "string"
+                        },
+                        "EmailVerificationSubject": {
+                            "type": "string"
+                        },
+                        "EnabledMfas": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LambdaConfig": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.LambdaConfig"
+                        },
+                        "MfaConfiguration": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.Policies"
+                        },
+                        "Schema": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cognito::UserPool.SchemaAttribute"
+                            },
+                            "type": "array"
+                        },
+                        "SmsAuthenticationMessage": {
+                            "type": "string"
+                        },
+                        "SmsConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.SmsConfiguration"
+                        },
+                        "SmsVerificationMessage": {
+                            "type": "string"
+                        },
+                        "UserPoolAddOns": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.UserPoolAddOns"
+                        },
+                        "UserPoolName": {
+                            "type": "string"
+                        },
+                        "UserPoolTags": {
+                            "type": "object"
+                        },
+                        "UsernameAttributes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "UsernameConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.UsernameConfiguration"
+                        },
+                        "VerificationMessageTemplate": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.VerificationMessageTemplate"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.AccountRecoverySetting": {
+            "additionalProperties": false,
+            "properties": {
+                "RecoveryMechanisms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Cognito::UserPool.RecoveryOption"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.AdminCreateUserConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowAdminCreateUserOnly": {
+                    "type": "boolean"
+                },
+                "InviteMessageTemplate": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.InviteMessageTemplate"
+                },
+                "UnusedAccountValidityDays": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.CustomEmailSender": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                },
+                "LambdaVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.CustomSMSSender": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                },
+                "LambdaVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.DeviceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChallengeRequiredOnNewDevice": {
+                    "type": "boolean"
+                },
+                "DeviceOnlyRememberedOnUserPrompt": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.EmailConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfigurationSet": {
+                    "type": "string"
+                },
+                "EmailSendingAccount": {
+                    "type": "string"
+                },
+                "From": {
+                    "type": "string"
+                },
+                "ReplyToEmailAddress": {
+                    "type": "string"
+                },
+                "SourceArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.InviteMessageTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "EmailMessage": {
+                    "type": "string"
+                },
+                "EmailSubject": {
+                    "type": "string"
+                },
+                "SMSMessage": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.LambdaConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CreateAuthChallenge": {
+                    "type": "string"
+                },
+                "CustomEmailSender": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.CustomEmailSender"
+                },
+                "CustomMessage": {
+                    "type": "string"
+                },
+                "CustomSMSSender": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.CustomSMSSender"
+                },
+                "DefineAuthChallenge": {
+                    "type": "string"
+                },
+                "KMSKeyID": {
+                    "type": "string"
+                },
+                "PostAuthentication": {
+                    "type": "string"
+                },
+                "PostConfirmation": {
+                    "type": "string"
+                },
+                "PreAuthentication": {
+                    "type": "string"
+                },
+                "PreSignUp": {
+                    "type": "string"
+                },
+                "PreTokenGeneration": {
+                    "type": "string"
+                },
+                "UserMigration": {
+                    "type": "string"
+                },
+                "VerifyAuthChallengeResponse": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.NumberAttributeConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxValue": {
+                    "type": "string"
+                },
+                "MinValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.PasswordPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "MinimumLength": {
+                    "type": "number"
+                },
+                "RequireLowercase": {
+                    "type": "boolean"
+                },
+                "RequireNumbers": {
+                    "type": "boolean"
+                },
+                "RequireSymbols": {
+                    "type": "boolean"
+                },
+                "RequireUppercase": {
+                    "type": "boolean"
+                },
+                "TemporaryPasswordValidityDays": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.Policies": {
+            "additionalProperties": false,
+            "properties": {
+                "PasswordPolicy": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.PasswordPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.RecoveryOption": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.SchemaAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeDataType": {
+                    "type": "string"
+                },
+                "DeveloperOnlyAttribute": {
+                    "type": "boolean"
+                },
+                "Mutable": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "NumberAttributeConstraints": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.NumberAttributeConstraints"
+                },
+                "Required": {
+                    "type": "boolean"
+                },
+                "StringAttributeConstraints": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.StringAttributeConstraints"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.SmsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ExternalId": {
+                    "type": "string"
+                },
+                "SnsCallerArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.StringAttributeConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxLength": {
+                    "type": "string"
+                },
+                "MinLength": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.UserPoolAddOns": {
+            "additionalProperties": false,
+            "properties": {
+                "AdvancedSecurityMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.UsernameConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CaseSensitive": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.VerificationMessageTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultEmailOption": {
+                    "type": "string"
+                },
+                "EmailMessage": {
+                    "type": "string"
+                },
+                "EmailMessageByLink": {
+                    "type": "string"
+                },
+                "EmailSubject": {
+                    "type": "string"
+                },
+                "EmailSubjectByLink": {
+                    "type": "string"
+                },
+                "SmsMessage": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolClient": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessTokenValidity": {
+                            "type": "number"
+                        },
+                        "AllowedOAuthFlows": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AllowedOAuthFlowsUserPoolClient": {
+                            "type": "boolean"
+                        },
+                        "AllowedOAuthScopes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AnalyticsConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolClient.AnalyticsConfiguration"
+                        },
+                        "CallbackURLs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ClientName": {
+                            "type": "string"
+                        },
+                        "DefaultRedirectURI": {
+                            "type": "string"
+                        },
+                        "EnableTokenRevocation": {
+                            "type": "boolean"
+                        },
+                        "ExplicitAuthFlows": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "GenerateSecret": {
+                            "type": "boolean"
+                        },
+                        "IdTokenValidity": {
+                            "type": "number"
+                        },
+                        "LogoutURLs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PreventUserExistenceErrors": {
+                            "type": "string"
+                        },
+                        "ReadAttributes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RefreshTokenValidity": {
+                            "type": "number"
+                        },
+                        "SupportedIdentityProviders": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "TokenValidityUnits": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolClient.TokenValidityUnits"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        },
+                        "WriteAttributes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolClient"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolClient.AnalyticsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationArn": {
+                    "type": "string"
+                },
+                "ApplicationId": {
+                    "type": "string"
+                },
+                "ExternalId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "UserDataShared": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolClient.TokenValidityUnits": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "IdToken": {
+                    "type": "string"
+                },
+                "RefreshToken": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolDomain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomDomainConfig": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolDomain.CustomDomainConfigType"
+                        },
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Domain",
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolDomain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolDomain.CustomDomainConfigType": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "Precedence": {
+                            "type": "number"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolIdentityProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AttributeMapping": {
+                            "type": "object"
+                        },
+                        "IdpIdentifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ProviderDetails": {
+                            "type": "object"
+                        },
+                        "ProviderName": {
+                            "type": "string"
+                        },
+                        "ProviderType": {
+                            "type": "string"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProviderName",
+                        "ProviderType",
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolIdentityProvider"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolResourceServer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Identifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Scopes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cognito::UserPoolResourceServer.ResourceServerScopeType"
+                            },
+                            "type": "array"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Identifier",
+                        "Name",
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolResourceServer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolResourceServer.ResourceServerScopeType": {
+            "additionalProperties": false,
+            "properties": {
+                "ScopeDescription": {
+                    "type": "string"
+                },
+                "ScopeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScopeDescription",
+                "ScopeName"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountTakeoverRiskConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverRiskConfigurationType"
+                        },
+                        "ClientId": {
+                            "type": "string"
+                        },
+                        "CompromisedCredentialsRiskConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsRiskConfigurationType"
+                        },
+                        "RiskExceptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.RiskExceptionConfigurationType"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClientId",
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolRiskConfigurationAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionType": {
+            "additionalProperties": false,
+            "properties": {
+                "EventAction": {
+                    "type": "string"
+                },
+                "Notify": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "EventAction",
+                "Notify"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionsType": {
+            "additionalProperties": false,
+            "properties": {
+                "HighAction": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionType"
+                },
+                "LowAction": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionType"
+                },
+                "MediumAction": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionType"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverRiskConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionsType"
+                },
+                "NotifyConfiguration": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyConfigurationType"
+                }
+            },
+            "required": [
+                "Actions"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsActionsType": {
+            "additionalProperties": false,
+            "properties": {
+                "EventAction": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventAction"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsRiskConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsActionsType"
+                },
+                "EventFilter": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Actions"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockEmail": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyEmailType"
+                },
+                "From": {
+                    "type": "string"
+                },
+                "MfaEmail": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyEmailType"
+                },
+                "NoActionEmail": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyEmailType"
+                },
+                "ReplyTo": {
+                    "type": "string"
+                },
+                "SourceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyEmailType": {
+            "additionalProperties": false,
+            "properties": {
+                "HtmlBody": {
+                    "type": "string"
+                },
+                "Subject": {
+                    "type": "string"
+                },
+                "TextBody": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Subject"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.RiskExceptionConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockedIPRangeList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SkippedIPRangeList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolUICustomizationAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CSS": {
+                            "type": "string"
+                        },
+                        "ClientId": {
+                            "type": "string"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClientId",
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolUICustomizationAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolUser": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClientMetadata": {
+                            "type": "object"
+                        },
+                        "DesiredDeliveryMediums": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ForceAliasCreation": {
+                            "type": "boolean"
+                        },
+                        "MessageAction": {
+                            "type": "string"
+                        },
+                        "UserAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cognito::UserPoolUser.AttributeType"
+                            },
+                            "type": "array"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        },
+                        "Username": {
+                            "type": "string"
+                        },
+                        "ValidationData": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cognito::UserPoolUser.AttributeType"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolUser"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolUser.AttributeType": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolUserToGroupAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        },
+                        "Username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GroupName",
+                        "UserPoolId",
+                        "Username"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolUserToGroupAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::AggregationAuthorization": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthorizedAccountId": {
+                            "type": "string"
+                        },
+                        "AuthorizedAwsRegion": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AuthorizedAccountId",
+                        "AuthorizedAwsRegion"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::AggregationAuthorization"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigRuleName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InputParameters": {
+                            "type": "object"
+                        },
+                        "MaximumExecutionFrequency": {
+                            "type": "string"
+                        },
+                        "Scope": {
+                            "$ref": "#/definitions/AWS::Config::ConfigRule.Scope"
+                        },
+                        "Source": {
+                            "$ref": "#/definitions/AWS::Config::ConfigRule.Source"
+                        }
+                    },
+                    "required": [
+                        "Source"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::ConfigRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigRule.Scope": {
+            "additionalProperties": false,
+            "properties": {
+                "ComplianceResourceId": {
+                    "type": "string"
+                },
+                "ComplianceResourceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TagKey": {
+                    "type": "string"
+                },
+                "TagValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::ConfigRule.Source": {
+            "additionalProperties": false,
+            "properties": {
+                "Owner": {
+                    "type": "string"
+                },
+                "SourceDetails": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Config::ConfigRule.SourceDetail"
+                    },
+                    "type": "array"
+                },
+                "SourceIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Owner",
+                "SourceIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigRule.SourceDetail": {
+            "additionalProperties": false,
+            "properties": {
+                "EventSource": {
+                    "type": "string"
+                },
+                "MaximumExecutionFrequency": {
+                    "type": "string"
+                },
+                "MessageType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventSource",
+                "MessageType"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigurationAggregator": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountAggregationSources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Config::ConfigurationAggregator.AccountAggregationSource"
+                            },
+                            "type": "array"
+                        },
+                        "ConfigurationAggregatorName": {
+                            "type": "string"
+                        },
+                        "OrganizationAggregationSource": {
+                            "$ref": "#/definitions/AWS::Config::ConfigurationAggregator.OrganizationAggregationSource"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::ConfigurationAggregator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigurationAggregator.AccountAggregationSource": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllAwsRegions": {
+                    "type": "boolean"
+                },
+                "AwsRegions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AccountIds"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigurationAggregator.OrganizationAggregationSource": {
+            "additionalProperties": false,
+            "properties": {
+                "AllAwsRegions": {
+                    "type": "boolean"
+                },
+                "AwsRegions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigurationRecorder": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RecordingGroup": {
+                            "$ref": "#/definitions/AWS::Config::ConfigurationRecorder.RecordingGroup"
+                        },
+                        "RoleARN": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RoleARN"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::ConfigurationRecorder"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigurationRecorder.RecordingGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "AllSupported": {
+                    "type": "boolean"
+                },
+                "IncludeGlobalResourceTypes": {
+                    "type": "boolean"
+                },
+                "ResourceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::ConformancePack": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConformancePackInputParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Config::ConformancePack.ConformancePackInputParameter"
+                            },
+                            "type": "array"
+                        },
+                        "ConformancePackName": {
+                            "type": "string"
+                        },
+                        "DeliveryS3Bucket": {
+                            "type": "string"
+                        },
+                        "DeliveryS3KeyPrefix": {
+                            "type": "string"
+                        },
+                        "TemplateBody": {
+                            "type": "string"
+                        },
+                        "TemplateS3Uri": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConformancePackName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::ConformancePack"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConformancePack.ConformancePackInputParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ParameterName",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::DeliveryChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigSnapshotDeliveryProperties": {
+                            "$ref": "#/definitions/AWS::Config::DeliveryChannel.ConfigSnapshotDeliveryProperties"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "S3BucketName": {
+                            "type": "string"
+                        },
+                        "S3KeyPrefix": {
+                            "type": "string"
+                        },
+                        "S3KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "SnsTopicARN": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "S3BucketName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::DeliveryChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::DeliveryChannel.ConfigSnapshotDeliveryProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryFrequency": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::OrganizationConfigRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExcludedAccounts": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "OrganizationConfigRuleName": {
+                            "type": "string"
+                        },
+                        "OrganizationCustomRuleMetadata": {
+                            "$ref": "#/definitions/AWS::Config::OrganizationConfigRule.OrganizationCustomRuleMetadata"
+                        },
+                        "OrganizationManagedRuleMetadata": {
+                            "$ref": "#/definitions/AWS::Config::OrganizationConfigRule.OrganizationManagedRuleMetadata"
+                        }
+                    },
+                    "required": [
+                        "OrganizationConfigRuleName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::OrganizationConfigRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::OrganizationConfigRule.OrganizationCustomRuleMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "InputParameters": {
+                    "type": "string"
+                },
+                "LambdaFunctionArn": {
+                    "type": "string"
+                },
+                "MaximumExecutionFrequency": {
+                    "type": "string"
+                },
+                "OrganizationConfigRuleTriggerTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ResourceIdScope": {
+                    "type": "string"
+                },
+                "ResourceTypesScope": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TagKeyScope": {
+                    "type": "string"
+                },
+                "TagValueScope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaFunctionArn",
+                "OrganizationConfigRuleTriggerTypes"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::OrganizationConfigRule.OrganizationManagedRuleMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "InputParameters": {
+                    "type": "string"
+                },
+                "MaximumExecutionFrequency": {
+                    "type": "string"
+                },
+                "ResourceIdScope": {
+                    "type": "string"
+                },
+                "ResourceTypesScope": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RuleIdentifier": {
+                    "type": "string"
+                },
+                "TagKeyScope": {
+                    "type": "string"
+                },
+                "TagValueScope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RuleIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::OrganizationConformancePack": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConformancePackInputParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Config::OrganizationConformancePack.ConformancePackInputParameter"
+                            },
+                            "type": "array"
+                        },
+                        "DeliveryS3Bucket": {
+                            "type": "string"
+                        },
+                        "DeliveryS3KeyPrefix": {
+                            "type": "string"
+                        },
+                        "ExcludedAccounts": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "OrganizationConformancePackName": {
+                            "type": "string"
+                        },
+                        "TemplateBody": {
+                            "type": "string"
+                        },
+                        "TemplateS3Uri": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "OrganizationConformancePackName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::OrganizationConformancePack"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::OrganizationConformancePack.ConformancePackInputParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ParameterName",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Automatic": {
+                            "type": "boolean"
+                        },
+                        "ConfigRuleName": {
+                            "type": "string"
+                        },
+                        "ExecutionControls": {
+                            "$ref": "#/definitions/AWS::Config::RemediationConfiguration.ExecutionControls"
+                        },
+                        "MaximumAutomaticAttempts": {
+                            "type": "number"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "ResourceType": {
+                            "type": "string"
+                        },
+                        "RetryAttemptSeconds": {
+                            "type": "number"
+                        },
+                        "TargetId": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        },
+                        "TargetVersion": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConfigRuleName",
+                        "TargetId",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::RemediationConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration.ExecutionControls": {
+            "additionalProperties": false,
+            "properties": {
+                "SsmControls": {
+                    "$ref": "#/definitions/AWS::Config::RemediationConfiguration.SsmControls"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration.RemediationParameterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceValue": {
+                    "$ref": "#/definitions/AWS::Config::RemediationConfiguration.ResourceValue"
+                },
+                "StaticValue": {
+                    "$ref": "#/definitions/AWS::Config::RemediationConfiguration.StaticValue"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration.ResourceValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration.SsmControls": {
+            "additionalProperties": false,
+            "properties": {
+                "ConcurrentExecutionRatePercentage": {
+                    "type": "number"
+                },
+                "ErrorPercentage": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration.StaticValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::StoredQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "QueryDescription": {
+                            "type": "string"
+                        },
+                        "QueryExpression": {
+                            "type": "string"
+                        },
+                        "QueryName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "QueryExpression",
+                        "QueryName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::StoredQuery"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::ContactFlow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Content": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Content",
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::ContactFlow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::ContactFlowModule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Content": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Content",
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::ContactFlowModule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::HoursOfOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Config": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Connect::HoursOfOperation.HoursOfOperationConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeZone": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Config",
+                        "InstanceArn",
+                        "Name",
+                        "TimeZone"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::HoursOfOperation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::HoursOfOperation.HoursOfOperationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Day": {
+                    "type": "string"
+                },
+                "EndTime": {
+                    "$ref": "#/definitions/AWS::Connect::HoursOfOperation.HoursOfOperationTimeSlice"
+                },
+                "StartTime": {
+                    "$ref": "#/definitions/AWS::Connect::HoursOfOperation.HoursOfOperationTimeSlice"
+                }
+            },
+            "required": [
+                "Day",
+                "EndTime",
+                "StartTime"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::HoursOfOperation.HoursOfOperationTimeSlice": {
+            "additionalProperties": false,
+            "properties": {
+                "Hours": {
+                    "type": "number"
+                },
+                "Minutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Hours",
+                "Minutes"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::QuickConnect": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QuickConnectConfig": {
+                            "$ref": "#/definitions/AWS::Connect::QuickConnect.QuickConnectConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "Name",
+                        "QuickConnectConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::QuickConnect"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::QuickConnect.PhoneNumberQuickConnectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "PhoneNumber": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PhoneNumber"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::QuickConnect.QueueQuickConnectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContactFlowArn": {
+                    "type": "string"
+                },
+                "QueueArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ContactFlowArn",
+                "QueueArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::QuickConnect.QuickConnectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "PhoneConfig": {
+                    "$ref": "#/definitions/AWS::Connect::QuickConnect.PhoneNumberQuickConnectConfig"
+                },
+                "QueueConfig": {
+                    "$ref": "#/definitions/AWS::Connect::QuickConnect.QueueQuickConnectConfig"
+                },
+                "QuickConnectType": {
+                    "type": "string"
+                },
+                "UserConfig": {
+                    "$ref": "#/definitions/AWS::Connect::QuickConnect.UserQuickConnectConfig"
+                }
+            },
+            "required": [
+                "QuickConnectType"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::QuickConnect.UserQuickConnectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContactFlowArn": {
+                    "type": "string"
+                },
+                "UserArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ContactFlowArn",
+                "UserArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DirectoryUserId": {
+                            "type": "string"
+                        },
+                        "HierarchyGroupArn": {
+                            "type": "string"
+                        },
+                        "IdentityInfo": {
+                            "$ref": "#/definitions/AWS::Connect::User.UserIdentityInfo"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "PhoneConfig": {
+                            "$ref": "#/definitions/AWS::Connect::User.UserPhoneConfig"
+                        },
+                        "RoutingProfileArn": {
+                            "type": "string"
+                        },
+                        "SecurityProfileArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "PhoneConfig",
+                        "RoutingProfileArn",
+                        "SecurityProfileArns",
+                        "Username"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::User.UserIdentityInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Email": {
+                    "type": "string"
+                },
+                "FirstName": {
+                    "type": "string"
+                },
+                "LastName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Connect::User.UserPhoneConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AfterContactWorkTimeLimit": {
+                    "type": "number"
+                },
+                "AutoAccept": {
+                    "type": "boolean"
+                },
+                "DeskPhoneNumber": {
+                    "type": "string"
+                },
+                "PhoneType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PhoneType"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParentGroupArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::UserHierarchyGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeadLetterQueueUrl": {
+                            "type": "string"
+                        },
+                        "DefaultEncryptionKey": {
+                            "type": "string"
+                        },
+                        "DefaultExpirationDays": {
+                            "type": "number"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CustomerProfiles::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "FlowDefinition": {
+                            "$ref": "#/definitions/AWS::CustomerProfiles::Integration.FlowDefinition"
+                        },
+                        "ObjectTypeName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Uri": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainName",
+                        "ObjectTypeName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CustomerProfiles::Integration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.ConnectorOperator": {
+            "additionalProperties": false,
+            "properties": {
+                "Marketo": {
+                    "type": "string"
+                },
+                "S3": {
+                    "type": "string"
+                },
+                "Salesforce": {
+                    "type": "string"
+                },
+                "ServiceNow": {
+                    "type": "string"
+                },
+                "Zendesk": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.FlowDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "FlowName": {
+                    "type": "string"
+                },
+                "KmsArn": {
+                    "type": "string"
+                },
+                "SourceFlowConfig": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.SourceFlowConfig"
+                },
+                "Tasks": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CustomerProfiles::Integration.Task"
+                    },
+                    "type": "array"
+                },
+                "TriggerConfig": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.TriggerConfig"
+                }
+            },
+            "required": [
+                "FlowName",
+                "KmsArn",
+                "SourceFlowConfig",
+                "Tasks",
+                "TriggerConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.IncrementalPullConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DatetimeTypeFieldName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.MarketoSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.S3SourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.SalesforceSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableDynamicFieldUpdate": {
+                    "type": "boolean"
+                },
+                "IncludeDeletedRecords": {
+                    "type": "boolean"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.ScheduledTriggerProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DataPullMode": {
+                    "type": "string"
+                },
+                "FirstExecutionFrom": {
+                    "type": "number"
+                },
+                "ScheduleEndTime": {
+                    "type": "number"
+                },
+                "ScheduleExpression": {
+                    "type": "string"
+                },
+                "ScheduleOffset": {
+                    "type": "number"
+                },
+                "ScheduleStartTime": {
+                    "type": "number"
+                },
+                "Timezone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.ServiceNowSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.SourceConnectorProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Marketo": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.MarketoSourceProperties"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.S3SourceProperties"
+                },
+                "Salesforce": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.SalesforceSourceProperties"
+                },
+                "ServiceNow": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.ServiceNowSourceProperties"
+                },
+                "Zendesk": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.ZendeskSourceProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.SourceFlowConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorProfileName": {
+                    "type": "string"
+                },
+                "ConnectorType": {
+                    "type": "string"
+                },
+                "IncrementalPullConfig": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.IncrementalPullConfig"
+                },
+                "SourceConnectorProperties": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.SourceConnectorProperties"
+                }
+            },
+            "required": [
+                "ConnectorType",
+                "SourceConnectorProperties"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.Task": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorOperator": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.ConnectorOperator"
+                },
+                "DestinationField": {
+                    "type": "string"
+                },
+                "SourceFields": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TaskProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CustomerProfiles::Integration.TaskPropertiesMap"
+                    },
+                    "type": "array"
+                },
+                "TaskType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourceFields",
+                "TaskType"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.TaskPropertiesMap": {
+            "additionalProperties": false,
+            "properties": {
+                "OperatorPropertyKey": {
+                    "type": "string"
+                },
+                "Property": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OperatorPropertyKey",
+                "Property"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.TriggerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TriggerProperties": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.TriggerProperties"
+                },
+                "TriggerType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TriggerType"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.TriggerProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Scheduled": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.ScheduledTriggerProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.ZendeskSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::ObjectType": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowProfileCreation": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EncryptionKey": {
+                            "type": "string"
+                        },
+                        "ExpirationDays": {
+                            "type": "number"
+                        },
+                        "Fields": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CustomerProfiles::ObjectType.FieldMap"
+                            },
+                            "type": "array"
+                        },
+                        "Keys": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CustomerProfiles::ObjectType.KeyMap"
+                            },
+                            "type": "array"
+                        },
+                        "ObjectTypeName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CustomerProfiles::ObjectType"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::ObjectType.FieldMap": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "ObjectTypeField": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::ObjectType.ObjectTypeField"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::ObjectType.KeyMap": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "ObjectTypeKeyList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CustomerProfiles::ObjectType.ObjectTypeKey"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::ObjectType.ObjectTypeField": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentType": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::ObjectType.ObjectTypeKey": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StandardIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DAX::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ClusterEndpointEncryptionType": {
+                            "type": "string"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IAMRoleARN": {
+                            "type": "string"
+                        },
+                        "NodeType": {
+                            "type": "string"
+                        },
+                        "NotificationTopicARN": {
+                            "type": "string"
+                        },
+                        "ParameterGroupName": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "ReplicationFactor": {
+                            "type": "number"
+                        },
+                        "SSESpecification": {
+                            "$ref": "#/definitions/AWS::DAX::Cluster.SSESpecification"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetGroupName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "IAMRoleARN",
+                        "NodeType",
+                        "ReplicationFactor"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DAX::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DAX::Cluster.SSESpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "SSEEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DAX::ParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ParameterGroupName": {
+                            "type": "string"
+                        },
+                        "ParameterNameValues": {
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DAX::ParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DAX::SubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SubnetGroupName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DAX::SubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "PolicyDetails": {
+                            "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.PolicyDetails"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DLM::LifecyclePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "CrossRegionCopy": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CrossRegionCopyAction"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CrossRegionCopy",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.CreateRule": {
+            "additionalProperties": false,
+            "properties": {
+                "CronExpression": {
+                    "type": "string"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "Times": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.CrossRegionCopyAction": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.EncryptionConfiguration"
+                },
+                "RetainRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CrossRegionCopyRetainRule"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionConfiguration",
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.CrossRegionCopyDeprecateRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Interval",
+                "IntervalUnit"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.CrossRegionCopyRetainRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Interval",
+                "IntervalUnit"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.CrossRegionCopyRule": {
+            "additionalProperties": false,
+            "properties": {
+                "CmkArn": {
+                    "type": "string"
+                },
+                "CopyTags": {
+                    "type": "boolean"
+                },
+                "DeprecateRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CrossRegionCopyDeprecateRule"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "RetainRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CrossRegionCopyRetainRule"
+                },
+                "Target": {
+                    "type": "string"
+                },
+                "TargetRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Encrypted"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.DeprecateRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CmkArn": {
+                    "type": "string"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Encrypted"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.EventParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DescriptionRegex": {
+                    "type": "string"
+                },
+                "EventType": {
+                    "type": "string"
+                },
+                "SnapshotOwner": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "EventType",
+                "SnapshotOwner"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.EventSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.EventParameters"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.FastRestoreRule": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZones": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Count": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.Parameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludeBootVolume": {
+                    "type": "boolean"
+                },
+                "NoReboot": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.PolicyDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.Action"
+                    },
+                    "type": "array"
+                },
+                "EventSource": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.EventSource"
+                },
+                "Parameters": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.Parameters"
+                },
+                "PolicyType": {
+                    "type": "string"
+                },
+                "ResourceLocations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ResourceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Schedules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.Schedule"
+                    },
+                    "type": "array"
+                },
+                "TargetTags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.RetainRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyTags": {
+                    "type": "boolean"
+                },
+                "CreateRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CreateRule"
+                },
+                "CrossRegionCopyRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CrossRegionCopyRule"
+                    },
+                    "type": "array"
+                },
+                "DeprecateRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.DeprecateRule"
+                },
+                "FastRestoreRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.FastRestoreRule"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "RetainRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.RetainRule"
+                },
+                "ShareRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.ShareRule"
+                    },
+                    "type": "array"
+                },
+                "TagsToAdd": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                },
+                "VariableTags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.ShareRule": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetAccounts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "UnshareInterval": {
+                    "type": "number"
+                },
+                "UnshareIntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CertificateIdentifier": {
+                            "type": "string"
+                        },
+                        "CertificatePem": {
+                            "type": "string"
+                        },
+                        "CertificateWallet": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::Certificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CertificateArn": {
+                            "type": "string"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "DocDbSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.DocDbSettings"
+                        },
+                        "DynamoDbSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.DynamoDbSettings"
+                        },
+                        "ElasticsearchSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.ElasticsearchSettings"
+                        },
+                        "EndpointIdentifier": {
+                            "type": "string"
+                        },
+                        "EndpointType": {
+                            "type": "string"
+                        },
+                        "EngineName": {
+                            "type": "string"
+                        },
+                        "ExtraConnectionAttributes": {
+                            "type": "string"
+                        },
+                        "IbmDb2Settings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.IbmDb2Settings"
+                        },
+                        "KafkaSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.KafkaSettings"
+                        },
+                        "KinesisSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.KinesisSettings"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MicrosoftSqlServerSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.MicrosoftSqlServerSettings"
+                        },
+                        "MongoDbSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.MongoDbSettings"
+                        },
+                        "MySqlSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.MySqlSettings"
+                        },
+                        "NeptuneSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.NeptuneSettings"
+                        },
+                        "OracleSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.OracleSettings"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PostgreSqlSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.PostgreSqlSettings"
+                        },
+                        "RedisSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.RedisSettings"
+                        },
+                        "RedshiftSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.RedshiftSettings"
+                        },
+                        "ResourceIdentifier": {
+                            "type": "string"
+                        },
+                        "S3Settings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.S3Settings"
+                        },
+                        "ServerName": {
+                            "type": "string"
+                        },
+                        "SslMode": {
+                            "type": "string"
+                        },
+                        "SybaseSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.SybaseSettings"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "EndpointType",
+                        "EngineName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::Endpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.DocDbSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.DynamoDbSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceAccessRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.ElasticsearchSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointUri": {
+                    "type": "string"
+                },
+                "ErrorRetryDuration": {
+                    "type": "number"
+                },
+                "FullLoadErrorPercentage": {
+                    "type": "number"
+                },
+                "ServiceAccessRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.IbmDb2Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.KafkaSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Broker": {
+                    "type": "string"
+                },
+                "IncludeControlDetails": {
+                    "type": "boolean"
+                },
+                "IncludeNullAndEmpty": {
+                    "type": "boolean"
+                },
+                "IncludeTableAlterOperations": {
+                    "type": "boolean"
+                },
+                "IncludeTransactionDetails": {
+                    "type": "boolean"
+                },
+                "NoHexPrefix": {
+                    "type": "boolean"
+                },
+                "PartitionIncludeSchemaTable": {
+                    "type": "boolean"
+                },
+                "SaslPassword": {
+                    "type": "string"
+                },
+                "SaslUserName": {
+                    "type": "string"
+                },
+                "SecurityProtocol": {
+                    "type": "string"
+                },
+                "SslCaCertificateArn": {
+                    "type": "string"
+                },
+                "SslClientCertificateArn": {
+                    "type": "string"
+                },
+                "SslClientKeyArn": {
+                    "type": "string"
+                },
+                "SslClientKeyPassword": {
+                    "type": "string"
+                },
+                "Topic": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.KinesisSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IncludeControlDetails": {
+                    "type": "boolean"
+                },
+                "IncludeNullAndEmpty": {
+                    "type": "boolean"
+                },
+                "IncludeTableAlterOperations": {
+                    "type": "boolean"
+                },
+                "IncludeTransactionDetails": {
+                    "type": "boolean"
+                },
+                "MessageFormat": {
+                    "type": "string"
+                },
+                "NoHexPrefix": {
+                    "type": "boolean"
+                },
+                "PartitionIncludeSchemaTable": {
+                    "type": "boolean"
+                },
+                "ServiceAccessRoleArn": {
+                    "type": "string"
+                },
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.MicrosoftSqlServerSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.MongoDbSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthMechanism": {
+                    "type": "string"
+                },
+                "AuthSource": {
+                    "type": "string"
+                },
+                "AuthType": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DocsToInvestigate": {
+                    "type": "string"
+                },
+                "ExtractDocId": {
+                    "type": "string"
+                },
+                "NestingLevel": {
+                    "type": "string"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                },
+                "ServerName": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.MySqlSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.NeptuneSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorRetryDuration": {
+                    "type": "number"
+                },
+                "IamAuthEnabled": {
+                    "type": "boolean"
+                },
+                "MaxFileSize": {
+                    "type": "number"
+                },
+                "MaxRetryCount": {
+                    "type": "number"
+                },
+                "S3BucketFolder": {
+                    "type": "string"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "ServiceAccessRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.OracleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerOracleAsmAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerOracleAsmSecretId": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.PostgreSqlSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.RedisSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthPassword": {
+                    "type": "string"
+                },
+                "AuthType": {
+                    "type": "string"
+                },
+                "AuthUserName": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "ServerName": {
+                    "type": "string"
+                },
+                "SslCaCertificateArn": {
+                    "type": "string"
+                },
+                "SslSecurityProtocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.RedshiftSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.S3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketFolder": {
+                    "type": "string"
+                },
+                "BucketName": {
+                    "type": "string"
+                },
+                "CompressionType": {
+                    "type": "string"
+                },
+                "CsvDelimiter": {
+                    "type": "string"
+                },
+                "CsvRowDelimiter": {
+                    "type": "string"
+                },
+                "ExternalTableDefinition": {
+                    "type": "string"
+                },
+                "ServiceAccessRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.SybaseSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::EventSubscription": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "EventCategories": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SourceIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SourceType": {
+                            "type": "string"
+                        },
+                        "SubscriptionName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SnsTopicArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::EventSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DMS::ReplicationInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocatedStorage": {
+                            "type": "number"
+                        },
+                        "AllowMajorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MultiAZ": {
+                            "type": "boolean"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "PubliclyAccessible": {
+                            "type": "boolean"
+                        },
+                        "ReplicationInstanceClass": {
+                            "type": "string"
+                        },
+                        "ReplicationInstanceIdentifier": {
+                            "type": "string"
+                        },
+                        "ReplicationSubnetGroupIdentifier": {
+                            "type": "string"
+                        },
+                        "ResourceIdentifier": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ReplicationInstanceClass"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::ReplicationInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DMS::ReplicationSubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ReplicationSubnetGroupDescription": {
+                            "type": "string"
+                        },
+                        "ReplicationSubnetGroupIdentifier": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ReplicationSubnetGroupDescription",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::ReplicationSubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DMS::ReplicationTask": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CdcStartPosition": {
+                            "type": "string"
+                        },
+                        "CdcStartTime": {
+                            "type": "number"
+                        },
+                        "CdcStopPosition": {
+                            "type": "string"
+                        },
+                        "MigrationType": {
+                            "type": "string"
+                        },
+                        "ReplicationInstanceArn": {
+                            "type": "string"
+                        },
+                        "ReplicationTaskIdentifier": {
+                            "type": "string"
+                        },
+                        "ReplicationTaskSettings": {
+                            "type": "string"
+                        },
+                        "ResourceIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceEndpointArn": {
+                            "type": "string"
+                        },
+                        "TableMappings": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetEndpointArn": {
+                            "type": "string"
+                        },
+                        "TaskData": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MigrationType",
+                        "ReplicationInstanceArn",
+                        "SourceEndpointArn",
+                        "TableMappings",
+                        "TargetEndpointArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::ReplicationTask"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Format": {
+                            "type": "string"
+                        },
+                        "FormatOptions": {
+                            "$ref": "#/definitions/AWS::DataBrew::Dataset.FormatOptions"
+                        },
+                        "Input": {
+                            "$ref": "#/definitions/AWS::DataBrew::Dataset.Input"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PathOptions": {
+                            "$ref": "#/definitions/AWS::DataBrew::Dataset.PathOptions"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Input",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Dataset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.CsvOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Delimiter": {
+                    "type": "string"
+                },
+                "HeaderRow": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.DataCatalogInputDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "TempDirectory": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.S3Location"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.DatabaseInputDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseTableName": {
+                    "type": "string"
+                },
+                "GlueConnectionName": {
+                    "type": "string"
+                },
+                "QueryString": {
+                    "type": "string"
+                },
+                "TempDirectory": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.S3Location"
+                }
+            },
+            "required": [
+                "GlueConnectionName"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.DatasetParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "CreateColumn": {
+                    "type": "boolean"
+                },
+                "DatetimeOptions": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.DatetimeOptions"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.FilterExpression"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.DatetimeOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Format": {
+                    "type": "string"
+                },
+                "LocaleCode": {
+                    "type": "string"
+                },
+                "TimezoneOffset": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Format"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.ExcelOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderRow": {
+                    "type": "boolean"
+                },
+                "SheetIndexes": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "SheetNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.FilesLimit": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxFiles": {
+                    "type": "number"
+                },
+                "Order": {
+                    "type": "string"
+                },
+                "OrderedBy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MaxFiles"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.FilterExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "ValuesMap": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Dataset.FilterValue"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Expression",
+                "ValuesMap"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.FilterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                },
+                "ValueReference": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Value",
+                "ValueReference"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.FormatOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Csv": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.CsvOptions"
+                },
+                "Excel": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.ExcelOptions"
+                },
+                "Json": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.JsonOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.Input": {
+            "additionalProperties": false,
+            "properties": {
+                "DataCatalogInputDefinition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.DataCatalogInputDefinition"
+                },
+                "DatabaseInputDefinition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.DatabaseInputDefinition"
+                },
+                "Metadata": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.Metadata"
+                },
+                "S3InputDefinition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.S3Location"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.JsonOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiLine": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.Metadata": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.PathOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "FilesLimit": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.FilesLimit"
+                },
+                "LastModifiedDateCondition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.FilterExpression"
+                },
+                "Parameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Dataset.PathParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.PathParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "DatasetParameter": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.DatasetParameter"
+                },
+                "PathParameterName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatasetParameter",
+                "PathParameterName"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataCatalogOutputs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Job.DataCatalogOutput"
+                            },
+                            "type": "array"
+                        },
+                        "DatabaseOutputs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Job.DatabaseOutput"
+                            },
+                            "type": "array"
+                        },
+                        "DatasetName": {
+                            "type": "string"
+                        },
+                        "EncryptionKeyArn": {
+                            "type": "string"
+                        },
+                        "EncryptionMode": {
+                            "type": "string"
+                        },
+                        "JobSample": {
+                            "$ref": "#/definitions/AWS::DataBrew::Job.JobSample"
+                        },
+                        "LogSubscription": {
+                            "type": "string"
+                        },
+                        "MaxCapacity": {
+                            "type": "number"
+                        },
+                        "MaxRetries": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OutputLocation": {
+                            "$ref": "#/definitions/AWS::DataBrew::Job.OutputLocation"
+                        },
+                        "Outputs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Job.Output"
+                            },
+                            "type": "array"
+                        },
+                        "ProfileConfiguration": {
+                            "$ref": "#/definitions/AWS::DataBrew::Job.ProfileConfiguration"
+                        },
+                        "ProjectName": {
+                            "type": "string"
+                        },
+                        "Recipe": {
+                            "$ref": "#/definitions/AWS::DataBrew::Job.Recipe"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Timeout": {
+                            "type": "number"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "ValidationConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Job.ValidationConfiguration"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "RoleArn",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Job"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.AllowedStatistics": {
+            "additionalProperties": false,
+            "properties": {
+                "Statistics": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Statistics"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.ColumnSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Regex": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.ColumnStatisticsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Selectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Job.ColumnSelector"
+                    },
+                    "type": "array"
+                },
+                "Statistics": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.StatisticsConfiguration"
+                }
+            },
+            "required": [
+                "Statistics"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.CsvOutputOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Delimiter": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.DataCatalogOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DatabaseOptions": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.DatabaseTableOutputOptions"
+                },
+                "Overwrite": {
+                    "type": "boolean"
+                },
+                "S3Options": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.S3TableOutputOptions"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.DatabaseOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseOptions": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.DatabaseTableOutputOptions"
+                },
+                "DatabaseOutputMode": {
+                    "type": "string"
+                },
+                "GlueConnectionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseOptions",
+                "GlueConnectionName"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.DatabaseTableOutputOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "TableName": {
+                    "type": "string"
+                },
+                "TempDirectory": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.S3Location"
+                }
+            },
+            "required": [
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.EntityDetectorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedStatistics": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.AllowedStatistics"
+                },
+                "EntityTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "EntityTypes"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.JobSample": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
+                    "type": "string"
+                },
+                "Size": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "CompressionFormat": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                },
+                "FormatOptions": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.OutputFormatOptions"
+                },
+                "Location": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.S3Location"
+                },
+                "Overwrite": {
+                    "type": "boolean"
+                },
+                "PartitionColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Location"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.OutputFormatOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Csv": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.CsvOutputOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.OutputLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.ParameterMap": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.ProfileConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnStatisticsConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Job.ColumnStatisticsConfiguration"
+                    },
+                    "type": "array"
+                },
+                "DatasetStatisticsConfiguration": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.StatisticsConfiguration"
+                },
+                "EntityDetectorConfiguration": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.EntityDetectorConfiguration"
+                },
+                "ProfileColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Job.ColumnSelector"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.Recipe": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.S3TableOutputOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Location": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.S3Location"
+                }
+            },
+            "required": [
+                "Location"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.StatisticOverride": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.ParameterMap"
+                },
+                "Statistic": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Parameters",
+                "Statistic"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.StatisticsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IncludedStatistics": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Overrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Job.StatisticOverride"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.ValidationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RulesetArn": {
+                    "type": "string"
+                },
+                "ValidationMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RulesetArn"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DatasetName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RecipeName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Sample": {
+                            "$ref": "#/definitions/AWS::DataBrew::Project.Sample"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DatasetName",
+                        "Name",
+                        "RecipeName",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Project.Sample": {
+            "additionalProperties": false,
+            "properties": {
+                "Size": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Steps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Recipe.RecipeStep"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Steps"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Recipe"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "Operation": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "$ref": "#/definitions/AWS::DataBrew::Recipe.ParameterMap"
+                }
+            },
+            "required": [
+                "Operation"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.ConditionExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "TargetColumn": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Condition",
+                "TargetColumn"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.DataCatalogInputDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "TempDirectory": {
+                    "$ref": "#/definitions/AWS::DataBrew::Recipe.S3Location"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.ParameterMap": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.RecipeParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregateFunction": {
+                    "type": "string"
+                },
+                "Base": {
+                    "type": "string"
+                },
+                "CaseStatement": {
+                    "type": "string"
+                },
+                "CategoryMap": {
+                    "type": "string"
+                },
+                "CharsToRemove": {
+                    "type": "string"
+                },
+                "CollapseConsecutiveWhitespace": {
+                    "type": "string"
+                },
+                "ColumnDataType": {
+                    "type": "string"
+                },
+                "ColumnRange": {
+                    "type": "string"
+                },
+                "Count": {
+                    "type": "string"
+                },
+                "CustomCharacters": {
+                    "type": "string"
+                },
+                "CustomStopWords": {
+                    "type": "string"
+                },
+                "CustomValue": {
+                    "type": "string"
+                },
+                "DatasetsColumns": {
+                    "type": "string"
+                },
+                "DateAddValue": {
+                    "type": "string"
+                },
+                "DateTimeFormat": {
+                    "type": "string"
+                },
+                "DateTimeParameters": {
+                    "type": "string"
+                },
+                "DeleteOtherRows": {
+                    "type": "string"
+                },
+                "Delimiter": {
+                    "type": "string"
+                },
+                "EndPattern": {
+                    "type": "string"
+                },
+                "EndPosition": {
+                    "type": "string"
+                },
+                "EndValue": {
+                    "type": "string"
+                },
+                "ExpandContractions": {
+                    "type": "string"
+                },
+                "Exponent": {
+                    "type": "string"
+                },
+                "FalseString": {
+                    "type": "string"
+                },
+                "GroupByAggFunctionOptions": {
+                    "type": "string"
+                },
+                "GroupByColumns": {
+                    "type": "string"
+                },
+                "HiddenColumns": {
+                    "type": "string"
+                },
+                "IgnoreCase": {
+                    "type": "string"
+                },
+                "IncludeInSplit": {
+                    "type": "string"
+                },
+                "Input": {
+                    "type": "object"
+                },
+                "Interval": {
+                    "type": "string"
+                },
+                "IsText": {
+                    "type": "string"
+                },
+                "JoinKeys": {
+                    "type": "string"
+                },
+                "JoinType": {
+                    "type": "string"
+                },
+                "LeftColumns": {
+                    "type": "string"
+                },
+                "Limit": {
+                    "type": "string"
+                },
+                "LowerBound": {
+                    "type": "string"
+                },
+                "MapType": {
+                    "type": "string"
+                },
+                "ModeType": {
+                    "type": "string"
+                },
+                "MultiLine": {
+                    "type": "boolean"
+                },
+                "NumRows": {
+                    "type": "string"
+                },
+                "NumRowsAfter": {
+                    "type": "string"
+                },
+                "NumRowsBefore": {
+                    "type": "string"
+                },
+                "OrderByColumn": {
+                    "type": "string"
+                },
+                "OrderByColumns": {
+                    "type": "string"
+                },
+                "Other": {
+                    "type": "string"
+                },
+                "Pattern": {
+                    "type": "string"
+                },
+                "PatternOption1": {
+                    "type": "string"
+                },
+                "PatternOption2": {
+                    "type": "string"
+                },
+                "PatternOptions": {
+                    "type": "string"
+                },
+                "Period": {
+                    "type": "string"
+                },
+                "Position": {
+                    "type": "string"
+                },
+                "RemoveAllPunctuation": {
+                    "type": "string"
+                },
+                "RemoveAllQuotes": {
+                    "type": "string"
+                },
+                "RemoveAllWhitespace": {
+                    "type": "string"
+                },
+                "RemoveCustomCharacters": {
+                    "type": "string"
+                },
+                "RemoveCustomValue": {
+                    "type": "string"
+                },
+                "RemoveLeadingAndTrailingPunctuation": {
+                    "type": "string"
+                },
+                "RemoveLeadingAndTrailingQuotes": {
+                    "type": "string"
+                },
+                "RemoveLeadingAndTrailingWhitespace": {
+                    "type": "string"
+                },
+                "RemoveLetters": {
+                    "type": "string"
+                },
+                "RemoveNumbers": {
+                    "type": "string"
+                },
+                "RemoveSourceColumn": {
+                    "type": "string"
+                },
+                "RemoveSpecialCharacters": {
+                    "type": "string"
+                },
+                "RightColumns": {
+                    "type": "string"
+                },
+                "SampleSize": {
+                    "type": "string"
+                },
+                "SampleType": {
+                    "type": "string"
+                },
+                "SecondInput": {
+                    "type": "string"
+                },
+                "SecondaryInputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Recipe.SecondaryInput"
+                    },
+                    "type": "array"
+                },
+                "SheetIndexes": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "SheetNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SourceColumn": {
+                    "type": "string"
+                },
+                "SourceColumn1": {
+                    "type": "string"
+                },
+                "SourceColumn2": {
+                    "type": "string"
+                },
+                "SourceColumns": {
+                    "type": "string"
+                },
+                "StartColumnIndex": {
+                    "type": "string"
+                },
+                "StartPattern": {
+                    "type": "string"
+                },
+                "StartPosition": {
+                    "type": "string"
+                },
+                "StartValue": {
+                    "type": "string"
+                },
+                "StemmingMode": {
+                    "type": "string"
+                },
+                "StepCount": {
+                    "type": "string"
+                },
+                "StepIndex": {
+                    "type": "string"
+                },
+                "StopWordsMode": {
+                    "type": "string"
+                },
+                "Strategy": {
+                    "type": "string"
+                },
+                "TargetColumn": {
+                    "type": "string"
+                },
+                "TargetColumnNames": {
+                    "type": "string"
+                },
+                "TargetDateFormat": {
+                    "type": "string"
+                },
+                "TargetIndex": {
+                    "type": "string"
+                },
+                "TimeZone": {
+                    "type": "string"
+                },
+                "TokenizerPattern": {
+                    "type": "string"
+                },
+                "TrueString": {
+                    "type": "string"
+                },
+                "UdfLang": {
+                    "type": "string"
+                },
+                "Units": {
+                    "type": "string"
+                },
+                "UnpivotColumn": {
+                    "type": "string"
+                },
+                "UpperBound": {
+                    "type": "string"
+                },
+                "UseNewDataFrame": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                },
+                "Value1": {
+                    "type": "string"
+                },
+                "Value2": {
+                    "type": "string"
+                },
+                "ValueColumn": {
+                    "type": "string"
+                },
+                "ViewFrame": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.RecipeStep": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::DataBrew::Recipe.Action"
+                },
+                "ConditionExpressions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Recipe.ConditionExpression"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Action"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.SecondaryInput": {
+            "additionalProperties": false,
+            "properties": {
+                "DataCatalogInputDefinition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Recipe.DataCatalogInputDefinition"
+                },
+                "S3InputDefinition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Recipe.S3Location"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Ruleset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Ruleset.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Rules",
+                        "TargetArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Ruleset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Ruleset.ColumnSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Regex": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Ruleset.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "CheckExpression": {
+                    "type": "string"
+                },
+                "ColumnSelectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Ruleset.ColumnSelector"
+                    },
+                    "type": "array"
+                },
+                "Disabled": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SubstitutionMap": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Ruleset.SubstitutionValue"
+                    },
+                    "type": "array"
+                },
+                "Threshold": {
+                    "$ref": "#/definitions/AWS::DataBrew::Ruleset.Threshold"
+                }
+            },
+            "required": [
+                "CheckExpression",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Ruleset.SubstitutionValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                },
+                "ValueReference": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Value",
+                "ValueReference"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Ruleset.Threshold": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CronExpression": {
+                            "type": "string"
+                        },
+                        "JobNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CronExpression",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Schedule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Activate": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParameterObjects": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataPipeline::Pipeline.ParameterObject"
+                            },
+                            "type": "array"
+                        },
+                        "ParameterValues": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataPipeline::Pipeline.ParameterValue"
+                            },
+                            "type": "array"
+                        },
+                        "PipelineObjects": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataPipeline::Pipeline.PipelineObject"
+                            },
+                            "type": "array"
+                        },
+                        "PipelineTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataPipeline::Pipeline.PipelineTag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "ParameterObjects"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataPipeline::Pipeline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.Field": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "RefValue": {
+                    "type": "string"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.ParameterAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "StringValue"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.ParameterObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataPipeline::Pipeline.ParameterAttribute"
+                    },
+                    "type": "array"
+                },
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attributes",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.ParameterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id",
+                "StringValue"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.PipelineObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Fields": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataPipeline::Pipeline.Field"
+                    },
+                    "type": "array"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Fields",
+                "Id",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.PipelineTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::Agent": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ActivationKey": {
+                            "type": "string"
+                        },
+                        "AgentName": {
+                            "type": "string"
+                        },
+                        "SecurityGroupArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcEndpointId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ActivationKey"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::Agent"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationEFS": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Ec2Config": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationEFS.Ec2Config"
+                        },
+                        "EfsFilesystemArn": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Ec2Config",
+                        "EfsFilesystemArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationEFS"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationEFS.Ec2Config": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecurityGroupArns",
+                "SubnetArn"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationFSxWindows": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "FsxFilesystemArn": {
+                            "type": "string"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "SecurityGroupArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "User": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FsxFilesystemArn",
+                        "Password",
+                        "SecurityGroupArns",
+                        "User"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationFSxWindows"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationHDFS": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AgentArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
+                        "BlockSize": {
+                            "type": "number"
+                        },
+                        "KerberosKeytab": {
+                            "type": "string"
+                        },
+                        "KerberosKrb5Conf": {
+                            "type": "string"
+                        },
+                        "KerberosPrincipal": {
+                            "type": "string"
+                        },
+                        "KmsKeyProviderUri": {
+                            "type": "string"
+                        },
+                        "NameNodes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataSync::LocationHDFS.NameNode"
+                            },
+                            "type": "array"
+                        },
+                        "QopConfiguration": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationHDFS.QopConfiguration"
+                        },
+                        "ReplicationFactor": {
+                            "type": "number"
+                        },
+                        "SimpleUser": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AgentArns",
+                        "AuthenticationType",
+                        "NameNodes"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationHDFS"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationHDFS.NameNode": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Hostname",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationHDFS.QopConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DataTransferProtection": {
+                    "type": "string"
+                },
+                "RpcProtection": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataSync::LocationNFS": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MountOptions": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationNFS.MountOptions"
+                        },
+                        "OnPremConfig": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationNFS.OnPremConfig"
+                        },
+                        "ServerHostname": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "OnPremConfig",
+                        "ServerHostname",
+                        "Subdirectory"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationNFS"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationNFS.MountOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataSync::LocationNFS.OnPremConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AgentArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AgentArns"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationObjectStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessKey": {
+                            "type": "string"
+                        },
+                        "AgentArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BucketName": {
+                            "type": "string"
+                        },
+                        "SecretKey": {
+                            "type": "string"
+                        },
+                        "ServerHostname": {
+                            "type": "string"
+                        },
+                        "ServerPort": {
+                            "type": "number"
+                        },
+                        "ServerProtocol": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AgentArns",
+                        "BucketName",
+                        "ServerHostname"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationObjectStorage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationS3": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "S3BucketArn": {
+                            "type": "string"
+                        },
+                        "S3Config": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationS3.S3Config"
+                        },
+                        "S3StorageClass": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "S3BucketArn",
+                        "S3Config"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationS3"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationS3.S3Config": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketAccessRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketAccessRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationSMB": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AgentArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "MountOptions": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationSMB.MountOptions"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "ServerHostname": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "User": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AgentArns",
+                        "Password",
+                        "ServerHostname",
+                        "Subdirectory",
+                        "User"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationSMB"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationSMB.MountOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataSync::Task": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CloudWatchLogGroupArn": {
+                            "type": "string"
+                        },
+                        "DestinationLocationArn": {
+                            "type": "string"
+                        },
+                        "Excludes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataSync::Task.FilterRule"
+                            },
+                            "type": "array"
+                        },
+                        "Includes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataSync::Task.FilterRule"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Options": {
+                            "$ref": "#/definitions/AWS::DataSync::Task.Options"
+                        },
+                        "Schedule": {
+                            "$ref": "#/definitions/AWS::DataSync::Task.TaskSchedule"
+                        },
+                        "SourceLocationArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DestinationLocationArn",
+                        "SourceLocationArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::Task"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::Task.FilterRule": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterType": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataSync::Task.Options": {
+            "additionalProperties": false,
+            "properties": {
+                "Atime": {
+                    "type": "string"
+                },
+                "BytesPerSecond": {
+                    "type": "number"
+                },
+                "Gid": {
+                    "type": "string"
+                },
+                "LogLevel": {
+                    "type": "string"
+                },
+                "Mtime": {
+                    "type": "string"
+                },
+                "OverwriteMode": {
+                    "type": "string"
+                },
+                "PosixPermissions": {
+                    "type": "string"
+                },
+                "PreserveDeletedFiles": {
+                    "type": "string"
+                },
+                "PreserveDevices": {
+                    "type": "string"
+                },
+                "SecurityDescriptorCopyFlags": {
+                    "type": "string"
+                },
+                "TaskQueueing": {
+                    "type": "string"
+                },
+                "TransferMode": {
+                    "type": "string"
+                },
+                "Uid": {
+                    "type": "string"
+                },
+                "VerifyMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataSync::Task.TaskSchedule": {
+            "additionalProperties": false,
+            "properties": {
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::Detective::Graph": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Detective::Graph"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Detective::MemberInvitation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DisableEmailNotification": {
+                            "type": "boolean"
+                        },
+                        "GraphArn": {
+                            "type": "string"
+                        },
+                        "MemberEmailAddress": {
+                            "type": "string"
+                        },
+                        "MemberId": {
+                            "type": "string"
+                        },
+                        "Message": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GraphArn",
+                        "MemberEmailAddress",
+                        "MemberId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Detective::MemberInvitation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::NotificationChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Config": {
+                            "$ref": "#/definitions/AWS::DevOpsGuru::NotificationChannel.NotificationChannelConfig"
+                        }
+                    },
+                    "required": [
+                        "Config"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DevOpsGuru::NotificationChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::NotificationChannel.NotificationChannelConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Sns": {
+                    "$ref": "#/definitions/AWS::DevOpsGuru::NotificationChannel.SnsChannelConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::NotificationChannel.SnsChannelConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::ResourceCollection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceCollectionFilter": {
+                            "$ref": "#/definitions/AWS::DevOpsGuru::ResourceCollection.ResourceCollectionFilter"
+                        }
+                    },
+                    "required": [
+                        "ResourceCollectionFilter"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DevOpsGuru::ResourceCollection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::ResourceCollection.CloudFormationCollectionFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "StackNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::ResourceCollection.ResourceCollectionFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudFormation": {
+                    "$ref": "#/definitions/AWS::DevOpsGuru::ResourceCollection.CloudFormationCollectionFilter"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DirectoryService::MicrosoftAD": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CreateAlias": {
+                            "type": "boolean"
+                        },
+                        "Edition": {
+                            "type": "string"
+                        },
+                        "EnableSso": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "ShortName": {
+                            "type": "string"
+                        },
+                        "VpcSettings": {
+                            "$ref": "#/definitions/AWS::DirectoryService::MicrosoftAD.VpcSettings"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Password",
+                        "VpcSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DirectoryService::MicrosoftAD"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DirectoryService::MicrosoftAD.VpcSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubnetIds",
+                "VpcId"
+            ],
+            "type": "object"
+        },
+        "AWS::DirectoryService::SimpleAD": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CreateAlias": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnableSso": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "ShortName": {
+                            "type": "string"
+                        },
+                        "Size": {
+                            "type": "string"
+                        },
+                        "VpcSettings": {
+                            "$ref": "#/definitions/AWS::DirectoryService::SimpleAD.VpcSettings"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Password",
+                        "Size",
+                        "VpcSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DirectoryService::SimpleAD"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DirectoryService::SimpleAD.VpcSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubnetIds",
+                "VpcId"
+            ],
+            "type": "object"
+        },
+        "AWS::DocDB::DBCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MasterUserPassword": {
+                            "type": "string"
+                        },
+                        "MasterUsername": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "SnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MasterUserPassword",
+                        "MasterUsername"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DocDB::DBCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DocDB::DBClusterParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::DocDB::DBClusterParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DocDB::DBInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBInstanceClass": {
+                            "type": "string"
+                        },
+                        "DBInstanceIdentifier": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBClusterIdentifier",
+                        "DBInstanceClass"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DocDB::DBInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DocDB::DBSubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DBSubnetGroupDescription": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBSubnetGroupDescription",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DocDB::DBSubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AttributeDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.AttributeDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "BillingMode": {
+                            "type": "string"
+                        },
+                        "GlobalSecondaryIndexes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.GlobalSecondaryIndex"
+                            },
+                            "type": "array"
+                        },
+                        "KeySchema": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.KeySchema"
+                            },
+                            "type": "array"
+                        },
+                        "LocalSecondaryIndexes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.LocalSecondaryIndex"
+                            },
+                            "type": "array"
+                        },
+                        "Replicas": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReplicaSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "SSESpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.SSESpecification"
+                        },
+                        "StreamSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.StreamSpecification"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        },
+                        "TimeToLiveSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.TimeToLiveSpecification"
+                        },
+                        "WriteProvisionedThroughputSettings": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
+                        }
+                    },
+                    "required": [
+                        "AttributeDefinitions",
+                        "KeySchema",
+                        "Replicas"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DynamoDB::GlobalTable"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.AttributeDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "AttributeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "AttributeType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.CapacityAutoScalingSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                },
+                "SeedCapacity": {
+                    "type": "number"
+                },
+                "TargetTrackingScalingPolicyConfiguration": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.TargetTrackingScalingPolicyConfiguration"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity",
+                "TargetTrackingScalingPolicyConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.ContributorInsightsSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.GlobalSecondaryIndex": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexName": {
+                    "type": "string"
+                },
+                "KeySchema": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.KeySchema"
+                    },
+                    "type": "array"
+                },
+                "Projection": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.Projection"
+                },
+                "WriteProvisionedThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
+                }
+            },
+            "required": [
+                "IndexName",
+                "KeySchema",
+                "Projection"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.KeySchema": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "KeyType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.LocalSecondaryIndex": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexName": {
+                    "type": "string"
+                },
+                "KeySchema": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.KeySchema"
+                    },
+                    "type": "array"
+                },
+                "Projection": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.Projection"
+                }
+            },
+            "required": [
+                "IndexName",
+                "KeySchema",
+                "Projection"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.PointInTimeRecoverySpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PointInTimeRecoveryEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.Projection": {
+            "additionalProperties": false,
+            "properties": {
+                "NonKeyAttributes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ProjectionType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityAutoScalingSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.CapacityAutoScalingSettings"
+                },
+                "ReadCapacityUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.ReplicaGlobalSecondaryIndexSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ContributorInsightsSpecification": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ContributorInsightsSpecification"
+                },
+                "IndexName": {
+                    "type": "string"
+                },
+                "ReadProvisionedThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
+                }
+            },
+            "required": [
+                "IndexName"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.ReplicaSSESpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSMasterKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KMSMasterKeyId"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.ReplicaSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ContributorInsightsSpecification": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ContributorInsightsSpecification"
+                },
+                "GlobalSecondaryIndexes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReplicaGlobalSecondaryIndexSpecification"
+                    },
+                    "type": "array"
+                },
+                "PointInTimeRecoverySpecification": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.PointInTimeRecoverySpecification"
+                },
+                "ReadProvisionedThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "SSESpecification": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReplicaSSESpecification"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.SSESpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "SSEEnabled": {
+                    "type": "boolean"
+                },
+                "SSEType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SSEEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.StreamSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamViewType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StreamViewType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.TargetTrackingScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "ScaleInCooldown": {
+                    "type": "number"
+                },
+                "ScaleOutCooldown": {
+                    "type": "number"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.TimeToLiveSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "WriteCapacityAutoScalingSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.CapacityAutoScalingSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AttributeDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::Table.AttributeDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "BillingMode": {
+                            "type": "string"
+                        },
+                        "ContributorInsightsSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.ContributorInsightsSpecification"
+                        },
+                        "GlobalSecondaryIndexes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::Table.GlobalSecondaryIndex"
+                            },
+                            "type": "array"
+                        },
+                        "KeySchema": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::Table.KeySchema"
+                            },
+                            "type": "array"
+                        },
+                        "KinesisStreamSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.KinesisStreamSpecification"
+                        },
+                        "LocalSecondaryIndexes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::Table.LocalSecondaryIndex"
+                            },
+                            "type": "array"
+                        },
+                        "PointInTimeRecoverySpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.PointInTimeRecoverySpecification"
+                        },
+                        "ProvisionedThroughput": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.ProvisionedThroughput"
+                        },
+                        "SSESpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.SSESpecification"
+                        },
+                        "StreamSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.StreamSpecification"
+                        },
+                        "TableClass": {
+                            "type": "string"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeToLiveSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.TimeToLiveSpecification"
+                        }
+                    },
+                    "required": [
+                        "KeySchema"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DynamoDB::Table"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.AttributeDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "AttributeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "AttributeType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.ContributorInsightsSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.GlobalSecondaryIndex": {
+            "additionalProperties": false,
+            "properties": {
+                "ContributorInsightsSpecification": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.ContributorInsightsSpecification"
+                },
+                "IndexName": {
+                    "type": "string"
+                },
+                "KeySchema": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DynamoDB::Table.KeySchema"
+                    },
+                    "type": "array"
+                },
+                "Projection": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.Projection"
+                },
+                "ProvisionedThroughput": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.ProvisionedThroughput"
+                }
+            },
+            "required": [
+                "IndexName",
+                "KeySchema",
+                "Projection"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.KeySchema": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "KeyType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.KinesisStreamSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StreamArn"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.LocalSecondaryIndex": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexName": {
+                    "type": "string"
+                },
+                "KeySchema": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DynamoDB::Table.KeySchema"
+                    },
+                    "type": "array"
+                },
+                "Projection": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.Projection"
+                }
+            },
+            "required": [
+                "IndexName",
+                "KeySchema",
+                "Projection"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.PointInTimeRecoverySpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PointInTimeRecoveryEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.Projection": {
+            "additionalProperties": false,
+            "properties": {
+                "NonKeyAttributes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ProjectionType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.ProvisionedThroughput": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityUnits": {
+                    "type": "number"
+                },
+                "WriteCapacityUnits": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ReadCapacityUnits",
+                "WriteCapacityUnits"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.SSESpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSMasterKeyId": {
+                    "type": "string"
+                },
+                "SSEEnabled": {
+                    "type": "boolean"
+                },
+                "SSEType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SSEEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.StreamSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamViewType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StreamViewType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.TimeToLiveSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::CapacityReservation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "EbsOptimized": {
+                            "type": "boolean"
+                        },
+                        "EndDate": {
+                            "type": "string"
+                        },
+                        "EndDateType": {
+                            "type": "string"
+                        },
+                        "EphemeralStorage": {
+                            "type": "boolean"
+                        },
+                        "InstanceCount": {
+                            "type": "number"
+                        },
+                        "InstanceMatchCriteria": {
+                            "type": "string"
+                        },
+                        "InstancePlatform": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "OutPostArn": {
+                            "type": "string"
+                        },
+                        "PlacementGroupArn": {
+                            "type": "string"
+                        },
+                        "TagSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::CapacityReservation.TagSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "Tenancy": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AvailabilityZone",
+                        "InstanceCount",
+                        "InstancePlatform",
+                        "InstanceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::CapacityReservation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::CapacityReservation.TagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::CapacityReservationFleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocationStrategy": {
+                            "type": "string"
+                        },
+                        "EndDate": {
+                            "type": "string"
+                        },
+                        "InstanceMatchCriteria": {
+                            "type": "string"
+                        },
+                        "InstanceTypeSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::CapacityReservationFleet.InstanceTypeSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "NoRemoveEndDate": {
+                            "type": "boolean"
+                        },
+                        "RemoveEndDate": {
+                            "type": "boolean"
+                        },
+                        "TagSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::CapacityReservationFleet.TagSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "Tenancy": {
+                            "type": "string"
+                        },
+                        "TotalTargetCapacity": {
+                            "type": "number"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::CapacityReservationFleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::CapacityReservationFleet.InstanceTypeSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "AvailabilityZoneId": {
+                    "type": "string"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                },
+                "InstancePlatform": {
+                    "type": "string"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::CapacityReservationFleet.TagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::CarrierGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::CarrierGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnAuthorizationRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessGroupId": {
+                            "type": "string"
+                        },
+                        "AuthorizeAllGroups": {
+                            "type": "boolean"
+                        },
+                        "ClientVpnEndpointId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "TargetNetworkCidr": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClientVpnEndpointId",
+                        "TargetNetworkCidr"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::ClientVpnAuthorizationRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationOptions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.ClientAuthenticationRequest"
+                            },
+                            "type": "array"
+                        },
+                        "ClientCidrBlock": {
+                            "type": "string"
+                        },
+                        "ClientConnectOptions": {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.ClientConnectOptions"
+                        },
+                        "ConnectionLogOptions": {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.ConnectionLogOptions"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DnsServers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SelfServicePortal": {
+                            "type": "string"
+                        },
+                        "ServerCertificateArn": {
+                            "type": "string"
+                        },
+                        "SplitTunnel": {
+                            "type": "boolean"
+                        },
+                        "TagSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.TagSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "TransportProtocol": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        },
+                        "VpnPort": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "AuthenticationOptions",
+                        "ClientCidrBlock",
+                        "ConnectionLogOptions",
+                        "ServerCertificateArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::ClientVpnEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.CertificateAuthenticationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientRootCertificateChainArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClientRootCertificateChainArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.ClientAuthenticationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveDirectory": {
+                    "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.DirectoryServiceAuthenticationRequest"
+                },
+                "FederatedAuthentication": {
+                    "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.FederatedAuthenticationRequest"
+                },
+                "MutualAuthentication": {
+                    "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.CertificateAuthenticationRequest"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.ClientConnectOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "LambdaFunctionArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.ConnectionLogOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudwatchLogGroup": {
+                    "type": "string"
+                },
+                "CloudwatchLogStream": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.DirectoryServiceAuthenticationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DirectoryId"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.FederatedAuthenticationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "SAMLProviderArn": {
+                    "type": "string"
+                },
+                "SelfServiceSAMLProviderArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SAMLProviderArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.TagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ResourceType",
+                "Tags"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClientVpnEndpointId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "TargetVpcSubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClientVpnEndpointId",
+                        "DestinationCidrBlock",
+                        "TargetVpcSubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::ClientVpnRoute"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnTargetNetworkAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClientVpnEndpointId": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClientVpnEndpointId",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::ClientVpnTargetNetworkAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::CustomerGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BgpAsn": {
+                            "type": "number"
+                        },
+                        "IpAddress": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "BgpAsn",
+                        "IpAddress",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::CustomerGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::DHCPOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DomainNameServers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "NetbiosNameServers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "NetbiosNodeType": {
+                            "type": "number"
+                        },
+                        "NtpServers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::DHCPOptions"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Context": {
+                            "type": "string"
+                        },
+                        "ExcessCapacityTerminationPolicy": {
+                            "type": "string"
+                        },
+                        "LaunchTemplateConfigs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::EC2Fleet.FleetLaunchTemplateConfigRequest"
+                            },
+                            "type": "array"
+                        },
+                        "OnDemandOptions": {
+                            "$ref": "#/definitions/AWS::EC2::EC2Fleet.OnDemandOptionsRequest"
+                        },
+                        "ReplaceUnhealthyInstances": {
+                            "type": "boolean"
+                        },
+                        "SpotOptions": {
+                            "$ref": "#/definitions/AWS::EC2::EC2Fleet.SpotOptionsRequest"
+                        },
+                        "TagSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::EC2Fleet.TagSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "TargetCapacitySpecification": {
+                            "$ref": "#/definitions/AWS::EC2::EC2Fleet.TargetCapacitySpecificationRequest"
+                        },
+                        "TerminateInstancesWithExpiration": {
+                            "type": "boolean"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "ValidFrom": {
+                            "type": "string"
+                        },
+                        "ValidUntil": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LaunchTemplateConfigs",
+                        "TargetCapacitySpecification"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::EC2Fleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.AcceleratorCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.AcceleratorTotalMemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.BaselineEbsBandwidthMbpsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.CapacityRebalance": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplacementStrategy": {
+                    "type": "string"
+                },
+                "TerminationDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.CapacityReservationOptionsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "UsageStrategy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.FleetLaunchTemplateConfigRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateSpecification": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.FleetLaunchTemplateSpecificationRequest"
+                },
+                "Overrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::EC2Fleet.FleetLaunchTemplateOverridesRequest"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.FleetLaunchTemplateOverridesRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "InstanceRequirements": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.InstanceRequirementsRequest"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "MaxPrice": {
+                    "type": "string"
+                },
+                "Placement": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.Placement"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "SubnetId": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.FleetLaunchTemplateSpecificationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.InstanceRequirementsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceleratorCount": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.AcceleratorCountRequest"
+                },
+                "AcceleratorManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorTotalMemoryMiB": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.AcceleratorTotalMemoryMiBRequest"
+                },
+                "AcceleratorTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BareMetal": {
+                    "type": "string"
+                },
+                "BaselineEbsBandwidthMbps": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.BaselineEbsBandwidthMbpsRequest"
+                },
+                "BurstablePerformance": {
+                    "type": "string"
+                },
+                "CpuManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExcludedInstanceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InstanceGenerations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LocalStorage": {
+                    "type": "string"
+                },
+                "LocalStorageTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MemoryGiBPerVCpu": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.MemoryGiBPerVCpuRequest"
+                },
+                "MemoryMiB": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.MemoryMiBRequest"
+                },
+                "NetworkInterfaceCount": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.NetworkInterfaceCountRequest"
+                },
+                "OnDemandMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "RequireHibernateSupport": {
+                    "type": "boolean"
+                },
+                "SpotMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "TotalLocalStorageGB": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.TotalLocalStorageGBRequest"
+                },
+                "VCpuCount": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.VCpuCountRangeRequest"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.MaintenanceStrategies": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityRebalance": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.CapacityRebalance"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.MemoryGiBPerVCpuRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.MemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.NetworkInterfaceCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.OnDemandOptionsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.CapacityReservationOptionsRequest"
+                },
+                "MaxTotalPrice": {
+                    "type": "string"
+                },
+                "MinTargetCapacity": {
+                    "type": "number"
+                },
+                "SingleAvailabilityZone": {
+                    "type": "boolean"
+                },
+                "SingleInstanceType": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.Placement": {
+            "additionalProperties": false,
+            "properties": {
+                "Affinity": {
+                    "type": "string"
+                },
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "GroupName": {
+                    "type": "string"
+                },
+                "HostId": {
+                    "type": "string"
+                },
+                "HostResourceGroupArn": {
+                    "type": "string"
+                },
+                "PartitionNumber": {
+                    "type": "number"
+                },
+                "SpreadDomain": {
+                    "type": "string"
+                },
+                "Tenancy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.SpotOptionsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "InstanceInterruptionBehavior": {
+                    "type": "string"
+                },
+                "InstancePoolsToUseCount": {
+                    "type": "number"
+                },
+                "MaintenanceStrategies": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.MaintenanceStrategies"
+                },
+                "MaxTotalPrice": {
+                    "type": "string"
+                },
+                "MinTargetCapacity": {
+                    "type": "number"
+                },
+                "SingleAvailabilityZone": {
+                    "type": "boolean"
+                },
+                "SingleInstanceType": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.TagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.TargetCapacitySpecificationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultTargetCapacityType": {
+                    "type": "string"
+                },
+                "OnDemandTargetCapacity": {
+                    "type": "number"
+                },
+                "SpotTargetCapacity": {
+                    "type": "number"
+                },
+                "TargetCapacityUnitType": {
+                    "type": "string"
+                },
+                "TotalTargetCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TotalTargetCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.TotalLocalStorageGBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.VCpuCountRangeRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EIP": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "PublicIpv4Pool": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::EIP"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EIPAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocationId": {
+                            "type": "string"
+                        },
+                        "EIP": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "PrivateIpAddress": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::EIPAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EgressOnlyInternetGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::EgressOnlyInternetGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EnclaveCertificateIamRoleAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CertificateArn": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CertificateArn",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::EnclaveCertificateIamRoleAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::FlowLog": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeliverLogsPermissionArn": {
+                            "type": "string"
+                        },
+                        "LogDestination": {
+                            "type": "string"
+                        },
+                        "LogDestinationType": {
+                            "type": "string"
+                        },
+                        "LogFormat": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "MaxAggregationInterval": {
+                            "type": "number"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "ResourceType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrafficType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourceId",
+                        "ResourceType",
+                        "TrafficType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::FlowLog"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::GatewayRouteTableAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GatewayId": {
+                            "type": "string"
+                        },
+                        "RouteTableId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GatewayId",
+                        "RouteTableId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::GatewayRouteTableAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Host": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoPlacement": {
+                            "type": "string"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "HostRecovery": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AvailabilityZone",
+                        "InstanceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::Host"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAM": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "OperatingRegions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::IPAM.IpamOperatingRegion"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::IPAM"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAM.IpamOperatingRegion": {
+            "additionalProperties": false,
+            "properties": {
+                "RegionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RegionName"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAMAllocation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Cidr": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IpamPoolId": {
+                            "type": "string"
+                        },
+                        "NetmaskLength": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "IpamPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::IPAMAllocation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAMPool": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AddressFamily": {
+                            "type": "string"
+                        },
+                        "AllocationDefaultNetmaskLength": {
+                            "type": "number"
+                        },
+                        "AllocationMaxNetmaskLength": {
+                            "type": "number"
+                        },
+                        "AllocationMinNetmaskLength": {
+                            "type": "number"
+                        },
+                        "AllocationResourceTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "AutoImport": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IpamScopeId": {
+                            "type": "string"
+                        },
+                        "Locale": {
+                            "type": "string"
+                        },
+                        "ProvisionedCidrs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::IPAMPool.ProvisionedCidr"
+                            },
+                            "type": "array"
+                        },
+                        "PubliclyAdvertisable": {
+                            "type": "boolean"
+                        },
+                        "SourceIpamPoolId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddressFamily",
+                        "IpamScopeId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::IPAMPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAMPool.ProvisionedCidr": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Cidr"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAMScope": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "IpamId": {
+                            "type": "string"
+                        },
+                        "IpamScopeType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "IpamId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::IPAMScope"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance": {
+            "additionalProperties": false,
+            "properties": {
+                "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": {
+                        "AdditionalInfo": {
+                            "type": "string"
+                        },
+                        "Affinity": {
+                            "type": "string"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "BlockDeviceMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.BlockDeviceMapping"
+                            },
+                            "type": "array"
+                        },
+                        "CpuOptions": {
+                            "$ref": "#/definitions/AWS::EC2::Instance.CpuOptions"
+                        },
+                        "CreditSpecification": {
+                            "$ref": "#/definitions/AWS::EC2::Instance.CreditSpecification"
+                        },
+                        "DisableApiTermination": {
+                            "type": "boolean"
+                        },
+                        "EbsOptimized": {
+                            "type": "boolean"
+                        },
+                        "ElasticGpuSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.ElasticGpuSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "ElasticInferenceAccelerators": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.ElasticInferenceAccelerator"
+                            },
+                            "type": "array"
+                        },
+                        "EnclaveOptions": {
+                            "$ref": "#/definitions/AWS::EC2::Instance.EnclaveOptions"
+                        },
+                        "HibernationOptions": {
+                            "$ref": "#/definitions/AWS::EC2::Instance.HibernationOptions"
+                        },
+                        "HostId": {
+                            "type": "string"
+                        },
+                        "HostResourceGroupArn": {
+                            "type": "string"
+                        },
+                        "IamInstanceProfile": {
+                            "type": "string"
+                        },
+                        "ImageId": {
+                            "type": "string"
+                        },
+                        "InstanceInitiatedShutdownBehavior": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "Ipv6AddressCount": {
+                            "type": "number"
+                        },
+                        "Ipv6Addresses": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.InstanceIpv6Address"
+                            },
+                            "type": "array"
+                        },
+                        "KernelId": {
+                            "type": "string"
+                        },
+                        "KeyName": {
+                            "type": "string"
+                        },
+                        "LaunchTemplate": {
+                            "$ref": "#/definitions/AWS::EC2::Instance.LaunchTemplateSpecification"
+                        },
+                        "LicenseSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.LicenseSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "Monitoring": {
+                            "type": "boolean"
+                        },
+                        "NetworkInterfaces": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.NetworkInterface"
+                            },
+                            "type": "array"
+                        },
+                        "PlacementGroupName": {
+                            "type": "string"
+                        },
+                        "PrivateIpAddress": {
+                            "type": "string"
+                        },
+                        "PropagateTagsToVolumeOnCreation": {
+                            "type": "boolean"
+                        },
+                        "RamdiskId": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SourceDestCheck": {
+                            "type": "boolean"
+                        },
+                        "SsmAssociations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.SsmAssociation"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Tenancy": {
+                            "type": "string"
+                        },
+                        "UserData": {
+                            "type": "string"
+                        },
+                        "Volumes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.Volume"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.AssociationParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.BlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::EC2::Instance.Ebs"
+                },
+                "NoDevice": {
+                    "$ref": "#/definitions/AWS::EC2::Instance.NoDevice"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeviceName"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.CpuOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CoreCount": {
+                    "type": "number"
+                },
+                "ThreadsPerCore": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Instance.CreditSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "CPUCredits": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Instance.Ebs": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Instance.ElasticGpuSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.ElasticInferenceAccelerator": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.EnclaveOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Instance.HibernationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Configured": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Instance.InstanceIpv6Address": {
+            "additionalProperties": false,
+            "properties": {
+                "Ipv6Address": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ipv6Address"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.LaunchTemplateSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.LicenseSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LicenseConfigurationArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LicenseConfigurationArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.NetworkInterface": {
+            "additionalProperties": false,
+            "properties": {
+                "AssociatePublicIpAddress": {
+                    "type": "boolean"
+                },
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DeviceIndex": {
+                    "type": "string"
+                },
+                "GroupSet": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Ipv6AddressCount": {
+                    "type": "number"
+                },
+                "Ipv6Addresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::Instance.InstanceIpv6Address"
+                    },
+                    "type": "array"
+                },
+                "NetworkInterfaceId": {
+                    "type": "string"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                },
+                "PrivateIpAddresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::Instance.PrivateIpAddressSpecification"
+                    },
+                    "type": "array"
+                },
+                "SecondaryPrivateIpAddressCount": {
+                    "type": "number"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeviceIndex"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.NoDevice": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::EC2::Instance.PrivateIpAddressSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Primary": {
+                    "type": "boolean"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Primary",
+                "PrivateIpAddress"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.SsmAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "AssociationParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::Instance.AssociationParameter"
+                    },
+                    "type": "array"
+                },
+                "DocumentName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DocumentName"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.Volume": {
+            "additionalProperties": false,
+            "properties": {
+                "Device": {
+                    "type": "string"
+                },
+                "VolumeId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Device",
+                "VolumeId"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::InternetGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::InternetGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LaunchTemplateData": {
+                            "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LaunchTemplateData"
+                        },
+                        "LaunchTemplateName": {
+                            "type": "string"
+                        },
+                        "TagSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LaunchTemplateTagSpecification"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::LaunchTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.AcceleratorCount": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.AcceleratorTotalMemoryMiB": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.BaselineEbsBandwidthMbps": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.BlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.Ebs"
+                },
+                "NoDevice": {
+                    "type": "string"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.CapacityReservationSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityReservationPreference": {
+                    "type": "string"
+                },
+                "CapacityReservationTarget": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.CapacityReservationTarget"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.CapacityReservationTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityReservationId": {
+                    "type": "string"
+                },
+                "CapacityReservationResourceGroupArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.CpuOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CoreCount": {
+                    "type": "number"
+                },
+                "ThreadsPerCore": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.CreditSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "CpuCredits": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.Ebs": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "Throughput": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.ElasticGpuSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.EnclaveOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.HibernationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Configured": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.IamInstanceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.InstanceMarketOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "MarketType": {
+                    "type": "string"
+                },
+                "SpotOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.SpotOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.Ipv6Add": {
+            "additionalProperties": false,
+            "properties": {
+                "Ipv6Address": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.LaunchTemplateData": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockDeviceMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.BlockDeviceMapping"
+                    },
+                    "type": "array"
+                },
+                "CapacityReservationSpecification": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.CapacityReservationSpecification"
+                },
+                "CpuOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.CpuOptions"
+                },
+                "CreditSpecification": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.CreditSpecification"
+                },
+                "DisableApiTermination": {
+                    "type": "boolean"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                },
+                "ElasticGpuSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.ElasticGpuSpecification"
+                    },
+                    "type": "array"
+                },
+                "ElasticInferenceAccelerators": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LaunchTemplateElasticInferenceAccelerator"
+                    },
+                    "type": "array"
+                },
+                "EnclaveOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.EnclaveOptions"
+                },
+                "HibernationOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.HibernationOptions"
+                },
+                "IamInstanceProfile": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.IamInstanceProfile"
+                },
+                "ImageId": {
+                    "type": "string"
+                },
+                "InstanceInitiatedShutdownBehavior": {
+                    "type": "string"
+                },
+                "InstanceMarketOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.InstanceMarketOptions"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "KernelId": {
+                    "type": "string"
+                },
+                "KeyName": {
+                    "type": "string"
+                },
+                "LicenseSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LicenseSpecification"
+                    },
+                    "type": "array"
+                },
+                "MetadataOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.MetadataOptions"
+                },
+                "Monitoring": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.Monitoring"
+                },
+                "NetworkInterfaces": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.NetworkInterface"
+                    },
+                    "type": "array"
+                },
+                "Placement": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.Placement"
+                },
+                "RamDiskId": {
+                    "type": "string"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TagSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.TagSpecification"
+                    },
+                    "type": "array"
+                },
+                "UserData": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.LaunchTemplateElasticInferenceAccelerator": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.LaunchTemplateTagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.LicenseSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LicenseConfigurationArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.MemoryGiBPerVCpu": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.MemoryMiB": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.MetadataOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpEndpoint": {
+                    "type": "string"
+                },
+                "HttpProtocolIpv6": {
+                    "type": "string"
+                },
+                "HttpPutResponseHopLimit": {
+                    "type": "number"
+                },
+                "HttpTokens": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.Monitoring": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.NetworkInterface": {
+            "additionalProperties": false,
+            "properties": {
+                "AssociateCarrierIpAddress": {
+                    "type": "boolean"
+                },
+                "AssociatePublicIpAddress": {
+                    "type": "boolean"
+                },
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DeviceIndex": {
+                    "type": "number"
+                },
+                "Groups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InterfaceType": {
+                    "type": "string"
+                },
+                "Ipv6AddressCount": {
+                    "type": "number"
+                },
+                "Ipv6Addresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.Ipv6Add"
+                    },
+                    "type": "array"
+                },
+                "NetworkCardIndex": {
+                    "type": "number"
+                },
+                "NetworkInterfaceId": {
+                    "type": "string"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                },
+                "PrivateIpAddresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.PrivateIpAdd"
+                    },
+                    "type": "array"
+                },
+                "SecondaryPrivateIpAddressCount": {
+                    "type": "number"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.NetworkInterfaceCount": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.Placement": {
+            "additionalProperties": false,
+            "properties": {
+                "Affinity": {
+                    "type": "string"
+                },
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "GroupName": {
+                    "type": "string"
+                },
+                "HostId": {
+                    "type": "string"
+                },
+                "HostResourceGroupArn": {
+                    "type": "string"
+                },
+                "PartitionNumber": {
+                    "type": "number"
+                },
+                "SpreadDomain": {
+                    "type": "string"
+                },
+                "Tenancy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.PrivateIpAdd": {
+            "additionalProperties": false,
+            "properties": {
+                "Primary": {
+                    "type": "boolean"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.SpotOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockDurationMinutes": {
+                    "type": "number"
+                },
+                "InstanceInterruptionBehavior": {
+                    "type": "string"
+                },
+                "MaxPrice": {
+                    "type": "string"
+                },
+                "SpotInstanceType": {
+                    "type": "string"
+                },
+                "ValidUntil": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.TagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.TotalLocalStorageGB": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.VCpuCount": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LocalGatewayRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "LocalGatewayRouteTableId": {
+                            "type": "string"
+                        },
+                        "LocalGatewayVirtualInterfaceGroupId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationCidrBlock",
+                        "LocalGatewayRouteTableId",
+                        "LocalGatewayVirtualInterfaceGroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::LocalGatewayRoute"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::LocalGatewayRouteTableVPCAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LocalGatewayRouteTableId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LocalGatewayRouteTableId",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::LocalGatewayRouteTableVPCAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NatGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocationId": {
+                            "type": "string"
+                        },
+                        "ConnectivityType": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NatGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkAcl": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkAcl"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkAclEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CidrBlock": {
+                            "type": "string"
+                        },
+                        "Egress": {
+                            "type": "boolean"
+                        },
+                        "Icmp": {
+                            "$ref": "#/definitions/AWS::EC2::NetworkAclEntry.Icmp"
+                        },
+                        "Ipv6CidrBlock": {
+                            "type": "string"
+                        },
+                        "NetworkAclId": {
+                            "type": "string"
+                        },
+                        "PortRange": {
+                            "$ref": "#/definitions/AWS::EC2::NetworkAclEntry.PortRange"
+                        },
+                        "Protocol": {
+                            "type": "number"
+                        },
+                        "RuleAction": {
+                            "type": "string"
+                        },
+                        "RuleNumber": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "NetworkAclId",
+                        "Protocol",
+                        "RuleAction",
+                        "RuleNumber"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkAclEntry"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkAclEntry.Icmp": {
+            "additionalProperties": false,
+            "properties": {
+                "Code": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkAclEntry.PortRange": {
+            "additionalProperties": false,
+            "properties": {
+                "From": {
+                    "type": "number"
+                },
+                "To": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FilterInArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "NetworkInsightsPathId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "NetworkInsightsPathId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkInsightsAnalysis"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AlternatePathHint": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentArn": {
+                    "type": "string"
+                },
+                "ComponentId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Egress": {
+                    "type": "boolean"
+                },
+                "PortRange": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.PortRange"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "RuleAction": {
+                    "type": "string"
+                },
+                "RuleNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerListener": {
+            "additionalProperties": false,
+            "properties": {
+                "InstancePort": {
+                    "type": "number"
+                },
+                "LoadBalancerPort": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "Instance": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationAddresses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DestinationPortRanges": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.PortRange"
+                    },
+                    "type": "array"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "SourceAddresses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SourcePortRanges": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.PortRange"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisRouteTableRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "NatGatewayId": {
+                    "type": "string"
+                },
+                "NetworkInterfaceId": {
+                    "type": "string"
+                },
+                "Origin": {
+                    "type": "string"
+                },
+                "TransitGatewayId": {
+                    "type": "string"
+                },
+                "VpcPeeringConnectionId": {
+                    "type": "string"
+                },
+                "destinationCidr": {
+                    "type": "string"
+                },
+                "destinationPrefixListId": {
+                    "type": "string"
+                },
+                "egressOnlyInternetGatewayId": {
+                    "type": "string"
+                },
+                "gatewayId": {
+                    "type": "string"
+                },
+                "instanceId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisSecurityGroupRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Direction": {
+                    "type": "string"
+                },
+                "PortRange": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.PortRange"
+                },
+                "PrefixListId": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "SecurityGroupId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.Explanation": {
+            "additionalProperties": false,
+            "properties": {
+                "Acl": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "AclRule": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule"
+                },
+                "Address": {
+                    "type": "string"
+                },
+                "Addresses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AttachedTo": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "AvailabilityZones": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Cidrs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ClassicLoadBalancerListener": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerListener"
+                },
+                "Component": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "CustomerGateway": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "DestinationVpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Direction": {
+                    "type": "string"
+                },
+                "ElasticLoadBalancerListener": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "ExplanationCode": {
+                    "type": "string"
+                },
+                "IngressRouteTable": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "InternetGateway": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "LoadBalancerArn": {
+                    "type": "string"
+                },
+                "LoadBalancerListenerPort": {
+                    "type": "number"
+                },
+                "LoadBalancerTarget": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerTarget"
+                },
+                "LoadBalancerTargetGroup": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "LoadBalancerTargetGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                    },
+                    "type": "array"
+                },
+                "LoadBalancerTargetPort": {
+                    "type": "number"
+                },
+                "MissingComponent": {
+                    "type": "string"
+                },
+                "NatGateway": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "NetworkInterface": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "PacketField": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "PortRanges": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.PortRange"
+                    },
+                    "type": "array"
+                },
+                "PrefixList": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Protocols": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RouteTable": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "RouteTableRoute": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisRouteTableRoute"
+                },
+                "SecurityGroup": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "SecurityGroupRule": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisSecurityGroupRule"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                    },
+                    "type": "array"
+                },
+                "SourceVpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "State": {
+                    "type": "string"
+                },
+                "Subnet": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "SubnetRouteTable": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Vpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "VpcPeeringConnection": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "VpnConnection": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "VpnGateway": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "vpcEndpoint": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.PathComponent": {
+            "additionalProperties": false,
+            "properties": {
+                "AclRule": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule"
+                },
+                "Component": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "DestinationVpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "InboundHeader": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader"
+                },
+                "OutboundHeader": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader"
+                },
+                "RouteTableRoute": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisRouteTableRoute"
+                },
+                "SecurityGroupRule": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisSecurityGroupRule"
+                },
+                "SequenceNumber": {
+                    "type": "number"
+                },
+                "SourceVpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Subnet": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Vpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.PortRange": {
+            "additionalProperties": false,
+            "properties": {
+                "From": {
+                    "type": "number"
+                },
+                "To": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsPath": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Destination": {
+                            "type": "string"
+                        },
+                        "DestinationIp": {
+                            "type": "string"
+                        },
+                        "DestinationPort": {
+                            "type": "number"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "Source": {
+                            "type": "string"
+                        },
+                        "SourceIp": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Destination",
+                        "Protocol",
+                        "Source"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkInsightsPath"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInterface": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "GroupSet": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "InterfaceType": {
+                            "type": "string"
+                        },
+                        "Ipv6AddressCount": {
+                            "type": "number"
+                        },
+                        "Ipv6Addresses": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::NetworkInterface.InstanceIpv6Address"
+                            },
+                            "type": "array"
+                        },
+                        "PrivateIpAddress": {
+                            "type": "string"
+                        },
+                        "PrivateIpAddresses": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::NetworkInterface.PrivateIpAddressSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "SecondaryPrivateIpAddressCount": {
+                            "type": "number"
+                        },
+                        "SourceDestCheck": {
+                            "type": "boolean"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkInterface"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInterface.InstanceIpv6Address": {
+            "additionalProperties": false,
+            "properties": {
+                "Ipv6Address": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ipv6Address"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInterface.PrivateIpAddressSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Primary": {
+                    "type": "boolean"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Primary",
+                "PrivateIpAddress"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInterfaceAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeleteOnTermination": {
+                            "type": "boolean"
+                        },
+                        "DeviceIndex": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DeviceIndex",
+                        "InstanceId",
+                        "NetworkInterfaceId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkInterfaceAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInterfacePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "Permission": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AwsAccountId",
+                        "NetworkInterfaceId",
+                        "Permission"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkInterfacePermission"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::PlacementGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Strategy": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::PlacementGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::PrefixList": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AddressFamily": {
+                            "type": "string"
+                        },
+                        "Entries": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::PrefixList.Entry"
+                            },
+                            "type": "array"
+                        },
+                        "MaxEntries": {
+                            "type": "number"
+                        },
+                        "PrefixListName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddressFamily",
+                        "MaxEntries",
+                        "PrefixListName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::PrefixList"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::PrefixList.Entry": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Cidr"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Route": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CarrierGatewayId": {
+                            "type": "string"
+                        },
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "DestinationIpv6CidrBlock": {
+                            "type": "string"
+                        },
+                        "EgressOnlyInternetGatewayId": {
+                            "type": "string"
+                        },
+                        "GatewayId": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "LocalGatewayId": {
+                            "type": "string"
+                        },
+                        "NatGatewayId": {
+                            "type": "string"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "RouteTableId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        },
+                        "VpcEndpointId": {
+                            "type": "string"
+                        },
+                        "VpcPeeringConnectionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RouteTableId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::Route"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::RouteTable": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::RouteTable"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupDescription": {
+                            "type": "string"
+                        },
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "SecurityGroupEgress": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::SecurityGroup.Egress"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityGroupIngress": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::SecurityGroup.Ingress"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GroupDescription"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SecurityGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SecurityGroup.Egress": {
+            "additionalProperties": false,
+            "properties": {
+                "CidrIp": {
+                    "type": "string"
+                },
+                "CidrIpv6": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DestinationPrefixListId": {
+                    "type": "string"
+                },
+                "DestinationSecurityGroupId": {
+                    "type": "string"
+                },
+                "FromPort": {
+                    "type": "number"
+                },
+                "IpProtocol": {
+                    "type": "string"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "IpProtocol"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SecurityGroup.Ingress": {
+            "additionalProperties": false,
+            "properties": {
+                "CidrIp": {
+                    "type": "string"
+                },
+                "CidrIpv6": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "FromPort": {
+                    "type": "number"
+                },
+                "IpProtocol": {
+                    "type": "string"
+                },
+                "SourcePrefixListId": {
+                    "type": "string"
+                },
+                "SourceSecurityGroupId": {
+                    "type": "string"
+                },
+                "SourceSecurityGroupName": {
+                    "type": "string"
+                },
+                "SourceSecurityGroupOwnerId": {
+                    "type": "string"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "IpProtocol"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SecurityGroupEgress": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CidrIp": {
+                            "type": "string"
+                        },
+                        "CidrIpv6": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DestinationPrefixListId": {
+                            "type": "string"
+                        },
+                        "DestinationSecurityGroupId": {
+                            "type": "string"
+                        },
+                        "FromPort": {
+                            "type": "number"
+                        },
+                        "GroupId": {
+                            "type": "string"
+                        },
+                        "IpProtocol": {
+                            "type": "string"
+                        },
+                        "ToPort": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "GroupId",
+                        "IpProtocol"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SecurityGroupEgress"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SecurityGroupIngress": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CidrIp": {
+                            "type": "string"
+                        },
+                        "CidrIpv6": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FromPort": {
+                            "type": "number"
+                        },
+                        "GroupId": {
+                            "type": "string"
+                        },
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "IpProtocol": {
+                            "type": "string"
+                        },
+                        "SourcePrefixListId": {
+                            "type": "string"
+                        },
+                        "SourceSecurityGroupId": {
+                            "type": "string"
+                        },
+                        "SourceSecurityGroupName": {
+                            "type": "string"
+                        },
+                        "SourceSecurityGroupOwnerId": {
+                            "type": "string"
+                        },
+                        "ToPort": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "IpProtocol"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SecurityGroupIngress"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SpotFleetRequestConfigData": {
+                            "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotFleetRequestConfigData"
+                        }
+                    },
+                    "required": [
+                        "SpotFleetRequestConfigData"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SpotFleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.AcceleratorCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.AcceleratorTotalMemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.BaselineEbsBandwidthMbpsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.BlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.EbsBlockDevice"
+                },
+                "NoDevice": {
+                    "type": "string"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeviceName"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.ClassicLoadBalancer": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.ClassicLoadBalancersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClassicLoadBalancers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.ClassicLoadBalancer"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ClassicLoadBalancers"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.EbsBlockDevice": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.FleetLaunchTemplateSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.GroupIdentifier": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupId"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.IamInstanceProfileSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.InstanceIpv6Address": {
+            "additionalProperties": false,
+            "properties": {
+                "Ipv6Address": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ipv6Address"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.InstanceNetworkInterfaceSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AssociatePublicIpAddress": {
+                    "type": "boolean"
+                },
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DeviceIndex": {
+                    "type": "number"
+                },
+                "Groups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Ipv6AddressCount": {
+                    "type": "number"
+                },
+                "Ipv6Addresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.InstanceIpv6Address"
+                    },
+                    "type": "array"
+                },
+                "NetworkInterfaceId": {
+                    "type": "string"
+                },
+                "PrivateIpAddresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.PrivateIpAddressSpecification"
+                    },
+                    "type": "array"
+                },
+                "SecondaryPrivateIpAddressCount": {
+                    "type": "number"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.InstanceRequirementsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceleratorCount": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.AcceleratorCountRequest"
+                },
+                "AcceleratorManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorTotalMemoryMiB": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.AcceleratorTotalMemoryMiBRequest"
+                },
+                "AcceleratorTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BareMetal": {
+                    "type": "string"
+                },
+                "BaselineEbsBandwidthMbps": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.BaselineEbsBandwidthMbpsRequest"
+                },
+                "BurstablePerformance": {
+                    "type": "string"
+                },
+                "CpuManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExcludedInstanceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InstanceGenerations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LocalStorage": {
+                    "type": "string"
+                },
+                "LocalStorageTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MemoryGiBPerVCpu": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.MemoryGiBPerVCpuRequest"
+                },
+                "MemoryMiB": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.MemoryMiBRequest"
+                },
+                "NetworkInterfaceCount": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.NetworkInterfaceCountRequest"
+                },
+                "OnDemandMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "RequireHibernateSupport": {
+                    "type": "boolean"
+                },
+                "SpotMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "TotalLocalStorageGB": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.TotalLocalStorageGBRequest"
+                },
+                "VCpuCount": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.VCpuCountRangeRequest"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.LaunchTemplateConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateSpecification": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.FleetLaunchTemplateSpecification"
+                },
+                "Overrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.LaunchTemplateOverrides"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.LaunchTemplateOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "InstanceRequirements": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.InstanceRequirementsRequest"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "SpotPrice": {
+                    "type": "string"
+                },
+                "SubnetId": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.LoadBalancersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClassicLoadBalancersConfig": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.ClassicLoadBalancersConfig"
+                },
+                "TargetGroupsConfig": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.TargetGroupsConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.MemoryGiBPerVCpuRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.MemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.NetworkInterfaceCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.PrivateIpAddressSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Primary": {
+                    "type": "boolean"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PrivateIpAddress"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotCapacityRebalance": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplacementStrategy": {
+                    "type": "string"
+                },
+                "TerminationDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotFleetLaunchSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockDeviceMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.BlockDeviceMapping"
+                    },
+                    "type": "array"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                },
+                "IamInstanceProfile": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.IamInstanceProfileSpecification"
+                },
+                "ImageId": {
+                    "type": "string"
+                },
+                "InstanceRequirements": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.InstanceRequirementsRequest"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "KernelId": {
+                    "type": "string"
+                },
+                "KeyName": {
+                    "type": "string"
+                },
+                "Monitoring": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotFleetMonitoring"
+                },
+                "NetworkInterfaces": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.InstanceNetworkInterfaceSpecification"
+                    },
+                    "type": "array"
+                },
+                "Placement": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotPlacement"
+                },
+                "RamdiskId": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.GroupIdentifier"
+                    },
+                    "type": "array"
+                },
+                "SpotPrice": {
+                    "type": "string"
+                },
+                "SubnetId": {
+                    "type": "string"
+                },
+                "TagSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotFleetTagSpecification"
+                    },
+                    "type": "array"
+                },
+                "UserData": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ImageId"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotFleetMonitoring": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotFleetRequestConfigData": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "Context": {
+                    "type": "string"
+                },
+                "ExcessCapacityTerminationPolicy": {
+                    "type": "string"
+                },
+                "IamFleetRole": {
+                    "type": "string"
+                },
+                "InstanceInterruptionBehavior": {
+                    "type": "string"
+                },
+                "InstancePoolsToUseCount": {
+                    "type": "number"
+                },
+                "LaunchSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotFleetLaunchSpecification"
+                    },
+                    "type": "array"
+                },
+                "LaunchTemplateConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.LaunchTemplateConfig"
+                    },
+                    "type": "array"
+                },
+                "LoadBalancersConfig": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.LoadBalancersConfig"
+                },
+                "OnDemandAllocationStrategy": {
+                    "type": "string"
+                },
+                "OnDemandMaxTotalPrice": {
+                    "type": "string"
+                },
+                "OnDemandTargetCapacity": {
+                    "type": "number"
+                },
+                "ReplaceUnhealthyInstances": {
+                    "type": "boolean"
+                },
+                "SpotMaintenanceStrategies": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotMaintenanceStrategies"
+                },
+                "SpotMaxTotalPrice": {
+                    "type": "string"
+                },
+                "SpotPrice": {
+                    "type": "string"
+                },
+                "TargetCapacity": {
+                    "type": "number"
+                },
+                "TargetCapacityUnitType": {
+                    "type": "string"
+                },
+                "TerminateInstancesWithExpiration": {
+                    "type": "boolean"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "ValidFrom": {
+                    "type": "string"
+                },
+                "ValidUntil": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IamFleetRole",
+                "TargetCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotFleetTagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotMaintenanceStrategies": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityRebalance": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotCapacityRebalance"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotPlacement": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "GroupName": {
+                    "type": "string"
+                },
+                "Tenancy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.TargetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.TargetGroupsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.TargetGroup"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "TargetGroups"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.TotalLocalStorageGBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.VCpuCountRangeRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Subnet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssignIpv6AddressOnCreation": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "CidrBlock": {
+                            "type": "string"
+                        },
+                        "Ipv6CidrBlock": {
+                            "type": "string"
+                        },
+                        "MapPublicIpOnLaunch": {
+                            "type": "boolean"
+                        },
+                        "OutpostArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CidrBlock",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::Subnet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SubnetCidrBlock": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Ipv6CidrBlock": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Ipv6CidrBlock",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SubnetCidrBlock"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SubnetNetworkAclAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "NetworkAclId": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "NetworkAclId",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SubnetNetworkAclAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SubnetRouteTableAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RouteTableId": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RouteTableId",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SubnetRouteTableAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TrafficMirrorFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "NetworkServices": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TrafficMirrorFilter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TrafficMirrorFilterRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "DestinationPortRange": {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange"
+                        },
+                        "Protocol": {
+                            "type": "number"
+                        },
+                        "RuleAction": {
+                            "type": "string"
+                        },
+                        "RuleNumber": {
+                            "type": "number"
+                        },
+                        "SourceCidrBlock": {
+                            "type": "string"
+                        },
+                        "SourcePortRange": {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange"
+                        },
+                        "TrafficDirection": {
+                            "type": "string"
+                        },
+                        "TrafficMirrorFilterId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationCidrBlock",
+                        "RuleAction",
+                        "RuleNumber",
+                        "SourceCidrBlock",
+                        "TrafficDirection",
+                        "TrafficMirrorFilterId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TrafficMirrorFilterRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange": {
+            "additionalProperties": false,
+            "properties": {
+                "FromPort": {
+                    "type": "number"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FromPort",
+                "ToPort"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TrafficMirrorSession": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "PacketLength": {
+                            "type": "number"
+                        },
+                        "SessionNumber": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrafficMirrorFilterId": {
+                            "type": "string"
+                        },
+                        "TrafficMirrorTargetId": {
+                            "type": "string"
+                        },
+                        "VirtualNetworkId": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "NetworkInterfaceId",
+                        "SessionNumber",
+                        "TrafficMirrorFilterId",
+                        "TrafficMirrorTargetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TrafficMirrorSession"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TrafficMirrorTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "NetworkLoadBalancerArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TrafficMirrorTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AmazonSideAsn": {
+                            "type": "number"
+                        },
+                        "AssociationDefaultRouteTableId": {
+                            "type": "string"
+                        },
+                        "AutoAcceptSharedAttachments": {
+                            "type": "string"
+                        },
+                        "DefaultRouteTableAssociation": {
+                            "type": "string"
+                        },
+                        "DefaultRouteTablePropagation": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DnsSupport": {
+                            "type": "string"
+                        },
+                        "MulticastSupport": {
+                            "type": "string"
+                        },
+                        "PropagationDefaultRouteTableId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayCidrBlocks": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpnEcmpSupport": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SubnetIds",
+                        "TransitGatewayId",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayConnect": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Options": {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayConnect.TransitGatewayConnectOptions"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransportTransitGatewayAttachmentId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Options",
+                        "TransportTransitGatewayAttachmentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayConnect"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayConnect.TransitGatewayConnectOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayMulticastDomain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Options": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TransitGatewayId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayMulticastDomain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayMulticastDomainAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayMulticastDomainId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SubnetId",
+                        "TransitGatewayAttachmentId",
+                        "TransitGatewayMulticastDomainId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayMulticastDomainAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayMulticastGroupMember": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupIpAddress": {
+                            "type": "string"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayMulticastDomainId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GroupIpAddress",
+                        "NetworkInterfaceId",
+                        "TransitGatewayMulticastDomainId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayMulticastGroupMember"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayMulticastGroupSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupIpAddress": {
+                            "type": "string"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayMulticastDomainId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GroupIpAddress",
+                        "NetworkInterfaceId",
+                        "TransitGatewayMulticastDomainId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayMulticastGroupSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayPeeringAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Options": {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayPeeringAttachment.TransitGatewayPeeringAttachmentOptions"
+                        },
+                        "PeerAccountId": {
+                            "type": "string"
+                        },
+                        "PeerRegion": {
+                            "type": "string"
+                        },
+                        "PeerTransitGatewayId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PeerAccountId",
+                        "PeerRegion",
+                        "PeerTransitGatewayId",
+                        "TransitGatewayId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayPeeringAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayPeeringAttachment.TransitGatewayPeeringAttachmentOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DynamicRouting": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Blackhole": {
+                            "type": "boolean"
+                        },
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "TransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayRouteTableId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TransitGatewayRouteTableId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayRoute"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayRouteTable": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TransitGatewayId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayRouteTable"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayRouteTableAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "TransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayRouteTableId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TransitGatewayAttachmentId",
+                        "TransitGatewayRouteTableId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayRouteTableAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayRouteTablePropagation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "TransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayRouteTableId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TransitGatewayAttachmentId",
+                        "TransitGatewayRouteTableId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayRouteTablePropagation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayVpcAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AddSubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Options": {
+                            "type": "object"
+                        },
+                        "RemoveSubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayVpcAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPC": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CidrBlock": {
+                            "type": "string"
+                        },
+                        "EnableDnsHostnames": {
+                            "type": "boolean"
+                        },
+                        "EnableDnsSupport": {
+                            "type": "boolean"
+                        },
+                        "InstanceTenancy": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CidrBlock"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPC"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCCidrBlock": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AmazonProvidedIpv6CidrBlock": {
+                            "type": "boolean"
+                        },
+                        "CidrBlock": {
+                            "type": "string"
+                        },
+                        "Ipv6CidrBlock": {
+                            "type": "string"
+                        },
+                        "Ipv6Pool": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCCidrBlock"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCDHCPOptionsAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DhcpOptionsId": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DhcpOptionsId",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCDHCPOptionsAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "PrivateDnsEnabled": {
+                            "type": "boolean"
+                        },
+                        "RouteTableIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpcEndpointType": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ServiceName",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCEndpointConnectionNotification": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionEvents": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ConnectionNotificationArn": {
+                            "type": "string"
+                        },
+                        "ServiceId": {
+                            "type": "string"
+                        },
+                        "VPCEndpointId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConnectionEvents",
+                        "ConnectionNotificationArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCEndpointConnectionNotification"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCEndpointService": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptanceRequired": {
+                            "type": "boolean"
+                        },
+                        "GatewayLoadBalancerArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "NetworkLoadBalancerArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCEndpointService"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCEndpointServicePermissions": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowedPrincipals": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ServiceId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCEndpointServicePermissions"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCGatewayAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InternetGatewayId": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        },
+                        "VpnGatewayId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCGatewayAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCPeeringConnection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PeerOwnerId": {
+                            "type": "string"
+                        },
+                        "PeerRegion": {
+                            "type": "string"
+                        },
+                        "PeerRoleArn": {
+                            "type": "string"
+                        },
+                        "PeerVpcId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PeerVpcId",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCPeeringConnection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPNConnection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomerGatewayId": {
+                            "type": "string"
+                        },
+                        "StaticRoutesOnly": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "VpnGatewayId": {
+                            "type": "string"
+                        },
+                        "VpnTunnelOptionsSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::VPNConnection.VpnTunnelOptionsSpecification"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CustomerGatewayId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPNConnection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPNConnection.VpnTunnelOptionsSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PreSharedKey": {
+                    "type": "string"
+                },
+                "TunnelInsideCidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::VPNConnectionRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "VpnConnectionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationCidrBlock",
+                        "VpnConnectionId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPNConnectionRoute"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPNGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AmazonSideAsn": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPNGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPNGatewayRoutePropagation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RouteTableIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpnGatewayId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RouteTableIds",
+                        "VpnGatewayId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPNGatewayRoutePropagation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Volume": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoEnableIO": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "Encrypted": {
+                            "type": "boolean"
+                        },
+                        "Iops": {
+                            "type": "number"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MultiAttachEnabled": {
+                            "type": "boolean"
+                        },
+                        "OutpostArn": {
+                            "type": "string"
+                        },
+                        "Size": {
+                            "type": "number"
+                        },
+                        "SnapshotId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Throughput": {
+                            "type": "number"
+                        },
+                        "VolumeType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AvailabilityZone"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::Volume"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VolumeAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Device": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "VolumeId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Device",
+                        "InstanceId",
+                        "VolumeId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VolumeAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::PublicRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RepositoryCatalogData": {
+                            "type": "object"
+                        },
+                        "RepositoryName": {
+                            "type": "string"
+                        },
+                        "RepositoryPolicyText": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECR::PublicRepository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::RegistryPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyText": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "PolicyText"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECR::RegistryPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::ReplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ReplicationConfiguration": {
+                            "$ref": "#/definitions/AWS::ECR::ReplicationConfiguration.ReplicationConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ReplicationConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECR::ReplicationConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::ReplicationConfiguration.ReplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECR::ReplicationConfiguration.ReplicationRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::ReplicationConfiguration.ReplicationDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "Region": {
+                    "type": "string"
+                },
+                "RegistryId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region",
+                "RegistryId"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::ReplicationConfiguration.ReplicationRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Destinations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECR::ReplicationConfiguration.ReplicationDestination"
+                    },
+                    "type": "array"
+                },
+                "RepositoryFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECR::ReplicationConfiguration.RepositoryFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Destinations"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::ReplicationConfiguration.RepositoryFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Filter": {
+                    "type": "string"
+                },
+                "FilterType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Filter",
+                "FilterType"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::Repository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::ECR::Repository.EncryptionConfiguration"
+                        },
+                        "ImageScanningConfiguration": {
+                            "$ref": "#/definitions/AWS::ECR::Repository.ImageScanningConfiguration"
+                        },
+                        "ImageTagMutability": {
+                            "type": "string"
+                        },
+                        "LifecyclePolicy": {
+                            "$ref": "#/definitions/AWS::ECR::Repository.LifecyclePolicy"
+                        },
+                        "RepositoryName": {
+                            "type": "string"
+                        },
+                        "RepositoryPolicyText": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECR::Repository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::Repository.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionType": {
+                    "type": "string"
+                },
+                "KmsKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionType"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::Repository.ImageScanningConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ScanOnPush": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECR::Repository.LifecyclePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "LifecyclePolicyText": {
+                    "type": "string"
+                },
+                "RegistryId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::CapacityProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingGroupProvider": {
+                            "$ref": "#/definitions/AWS::ECS::CapacityProvider.AutoScalingGroupProvider"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupProvider"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::CapacityProvider"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::CapacityProvider.AutoScalingGroupProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoScalingGroupArn": {
+                    "type": "string"
+                },
+                "ManagedScaling": {
+                    "$ref": "#/definitions/AWS::ECS::CapacityProvider.ManagedScaling"
+                },
+                "ManagedTerminationProtection": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AutoScalingGroupArn"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::CapacityProvider.ManagedScaling": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceWarmupPeriod": {
+                    "type": "number"
+                },
+                "MaximumScalingStepSize": {
+                    "type": "number"
+                },
+                "MinimumScalingStepSize": {
+                    "type": "number"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "TargetCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "ClusterSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Cluster.ClusterSettings"
+                            },
+                            "type": "array"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::ECS::Cluster.ClusterConfiguration"
+                        },
+                        "DefaultCapacityProviderStrategy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Cluster.CapacityProviderStrategyItem"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Cluster.CapacityProviderStrategyItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Base": {
+                    "type": "number"
+                },
+                "CapacityProvider": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Cluster.ClusterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecuteCommandConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::Cluster.ExecuteCommandConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Cluster.ClusterSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Cluster.ExecuteCommandConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "LogConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::Cluster.ExecuteCommandLogConfiguration"
+                },
+                "Logging": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Cluster.ExecuteCommandLogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchEncryptionEnabled": {
+                    "type": "boolean"
+                },
+                "CloudWatchLogGroupName": {
+                    "type": "string"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3EncryptionEnabled": {
+                    "type": "boolean"
+                },
+                "S3KeyPrefix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::ClusterCapacityProviderAssociations": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Cluster": {
+                            "type": "string"
+                        },
+                        "Service": {
+                            "type": "string"
+                        },
+                        "TaskSetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Cluster",
+                        "Service",
+                        "TaskSetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::PrimaryTaskSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Service": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CapacityProviderStrategy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Service.CapacityProviderStrategyItem"
+                            },
+                            "type": "array"
+                        },
+                        "Cluster": {
+                            "type": "string"
+                        },
+                        "DeploymentConfiguration": {
+                            "$ref": "#/definitions/AWS::ECS::Service.DeploymentConfiguration"
+                        },
+                        "DeploymentController": {
+                            "$ref": "#/definitions/AWS::ECS::Service.DeploymentController"
+                        },
+                        "DesiredCount": {
+                            "type": "number"
+                        },
+                        "EnableECSManagedTags": {
+                            "type": "boolean"
+                        },
+                        "EnableExecuteCommand": {
+                            "type": "boolean"
+                        },
+                        "HealthCheckGracePeriodSeconds": {
+                            "type": "number"
+                        },
+                        "LaunchType": {
+                            "type": "string"
+                        },
+                        "LoadBalancers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Service.LoadBalancer"
+                            },
+                            "type": "array"
+                        },
+                        "NetworkConfiguration": {
+                            "$ref": "#/definitions/AWS::ECS::Service.NetworkConfiguration"
+                        },
+                        "PlacementConstraints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Service.PlacementConstraint"
+                            },
+                            "type": "array"
+                        },
+                        "PlacementStrategies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Service.PlacementStrategy"
+                            },
+                            "type": "array"
+                        },
+                        "PlatformVersion": {
+                            "type": "string"
+                        },
+                        "PropagateTags": {
+                            "type": "string"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "SchedulingStrategy": {
+                            "type": "string"
+                        },
+                        "ServiceName": {
+                            "type": "string"
+                        },
+                        "ServiceRegistries": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Service.ServiceRegistry"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TaskDefinition": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::Service"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Service.AwsVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AssignPublicIp": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.CapacityProviderStrategyItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Base": {
+                    "type": "number"
+                },
+                "CapacityProvider": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.DeploymentCircuitBreaker": {
+            "additionalProperties": false,
+            "properties": {
+                "Enable": {
+                    "type": "boolean"
+                },
+                "Rollback": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enable",
+                "Rollback"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Service.DeploymentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeploymentCircuitBreaker": {
+                    "$ref": "#/definitions/AWS::ECS::Service.DeploymentCircuitBreaker"
+                },
+                "MaximumPercent": {
+                    "type": "number"
+                },
+                "MinimumHealthyPercent": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.DeploymentController": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.LoadBalancer": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerName": {
+                    "type": "string"
+                },
+                "ContainerPort": {
+                    "type": "number"
+                },
+                "LoadBalancerName": {
+                    "type": "string"
+                },
+                "TargetGroupArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsvpcConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::Service.AwsVpcConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.PlacementConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Service.PlacementStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "Field": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Service.ServiceRegistry": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerName": {
+                    "type": "string"
+                },
+                "ContainerPort": {
+                    "type": "number"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "RegistryArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContainerDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskDefinition.ContainerDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "Cpu": {
+                            "type": "string"
+                        },
+                        "EphemeralStorage": {
+                            "$ref": "#/definitions/AWS::ECS::TaskDefinition.EphemeralStorage"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "Family": {
+                            "type": "string"
+                        },
+                        "InferenceAccelerators": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskDefinition.InferenceAccelerator"
+                            },
+                            "type": "array"
+                        },
+                        "IpcMode": {
+                            "type": "string"
+                        },
+                        "Memory": {
+                            "type": "string"
+                        },
+                        "NetworkMode": {
+                            "type": "string"
+                        },
+                        "PidMode": {
+                            "type": "string"
+                        },
+                        "PlacementConstraints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskDefinition.TaskDefinitionPlacementConstraint"
+                            },
+                            "type": "array"
+                        },
+                        "ProxyConfiguration": {
+                            "$ref": "#/definitions/AWS::ECS::TaskDefinition.ProxyConfiguration"
+                        },
+                        "RequiresCompatibilities": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RuntimePlatform": {
+                            "$ref": "#/definitions/AWS::ECS::TaskDefinition.RuntimePlatform"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TaskRoleArn": {
+                            "type": "string"
+                        },
+                        "Volumes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskDefinition.Volume"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::TaskDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.AuthorizationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessPointId": {
+                    "type": "string"
+                },
+                "IAM": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.ContainerDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Command": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Cpu": {
+                    "type": "number"
+                },
+                "DependsOn": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.ContainerDependency"
+                    },
+                    "type": "array"
+                },
+                "DisableNetworking": {
+                    "type": "boolean"
+                },
+                "DnsSearchDomains": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DnsServers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DockerLabels": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "DockerSecurityOptions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EntryPoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Environment": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.KeyValuePair"
+                    },
+                    "type": "array"
+                },
+                "EnvironmentFiles": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.EnvironmentFile"
+                    },
+                    "type": "array"
+                },
+                "Essential": {
+                    "type": "boolean"
+                },
+                "ExtraHosts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.HostEntry"
+                    },
+                    "type": "array"
+                },
+                "FirelensConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.FirelensConfiguration"
+                },
+                "HealthCheck": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.HealthCheck"
+                },
+                "Hostname": {
+                    "type": "string"
+                },
+                "Image": {
+                    "type": "string"
+                },
+                "Interactive": {
+                    "type": "boolean"
+                },
+                "Links": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LinuxParameters": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.LinuxParameters"
+                },
+                "LogConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.LogConfiguration"
+                },
+                "Memory": {
+                    "type": "number"
+                },
+                "MemoryReservation": {
+                    "type": "number"
+                },
+                "MountPoints": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.MountPoint"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "PortMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.PortMapping"
+                    },
+                    "type": "array"
+                },
+                "Privileged": {
+                    "type": "boolean"
+                },
+                "PseudoTerminal": {
+                    "type": "boolean"
+                },
+                "ReadonlyRootFilesystem": {
+                    "type": "boolean"
+                },
+                "RepositoryCredentials": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.RepositoryCredentials"
+                },
+                "ResourceRequirements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.ResourceRequirement"
+                    },
+                    "type": "array"
+                },
+                "Secrets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.Secret"
+                    },
+                    "type": "array"
+                },
+                "StartTimeout": {
+                    "type": "number"
+                },
+                "StopTimeout": {
+                    "type": "number"
+                },
+                "SystemControls": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.SystemControl"
+                    },
+                    "type": "array"
+                },
+                "Ulimits": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.Ulimit"
+                    },
+                    "type": "array"
+                },
+                "User": {
+                    "type": "string"
+                },
+                "VolumesFrom": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.VolumeFrom"
+                    },
+                    "type": "array"
+                },
+                "WorkingDirectory": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.ContainerDependency": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "ContainerName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.Device": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "HostPath": {
+                    "type": "string"
+                },
+                "Permissions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.DockerVolumeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Autoprovision": {
+                    "type": "boolean"
+                },
+                "Driver": {
+                    "type": "string"
+                },
+                "DriverOpts": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Labels": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Scope": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.EFSVolumeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationConfig": {
+                    "type": "object"
+                },
+                "FilesystemId": {
+                    "type": "string"
+                },
+                "RootDirectory": {
+                    "type": "string"
+                },
+                "TransitEncryption": {
+                    "type": "string"
+                },
+                "TransitEncryptionPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FilesystemId"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.EnvironmentFile": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.EphemeralStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "SizeInGiB": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.FirelensConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Options": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.HealthCheck": {
+            "additionalProperties": false,
+            "properties": {
+                "Command": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "Retries": {
+                    "type": "number"
+                },
+                "StartPeriod": {
+                    "type": "number"
+                },
+                "Timeout": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.HostEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "type": "string"
+                },
+                "IpAddress": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.HostVolumeProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.InferenceAccelerator": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "DeviceType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.KernelCapabilities": {
+            "additionalProperties": false,
+            "properties": {
+                "Add": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Drop": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.KeyValuePair": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.LinuxParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Capabilities": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.KernelCapabilities"
+                },
+                "Devices": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.Device"
+                    },
+                    "type": "array"
+                },
+                "InitProcessEnabled": {
+                    "type": "boolean"
+                },
+                "MaxSwap": {
+                    "type": "number"
+                },
+                "SharedMemorySize": {
+                    "type": "number"
+                },
+                "Swappiness": {
+                    "type": "number"
+                },
+                "Tmpfs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.Tmpfs"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.LogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogDriver": {
+                    "type": "string"
+                },
+                "Options": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "SecretOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.Secret"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LogDriver"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.MountPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "ReadOnly": {
+                    "type": "boolean"
+                },
+                "SourceVolume": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.PortMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPort": {
+                    "type": "number"
+                },
+                "HostPort": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.ProxyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerName": {
+                    "type": "string"
+                },
+                "ProxyConfigurationProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.KeyValuePair"
+                    },
+                    "type": "array"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ContainerName"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.RepositoryCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "CredentialsParameter": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.ResourceRequirement": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.RuntimePlatform": {
+            "additionalProperties": false,
+            "properties": {
+                "CpuArchitecture": {
+                    "type": "string"
+                },
+                "OperatingSystemFamily": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.Secret": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "ValueFrom": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "ValueFrom"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.SystemControl": {
+            "additionalProperties": false,
+            "properties": {
+                "Namespace": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.TaskDefinitionPlacementConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.Tmpfs": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "MountOptions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Size": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Size"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.Ulimit": {
+            "additionalProperties": false,
+            "properties": {
+                "HardLimit": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SoftLimit": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "HardLimit",
+                "Name",
+                "SoftLimit"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.Volume": {
+            "additionalProperties": false,
+            "properties": {
+                "DockerVolumeConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.DockerVolumeConfiguration"
+                },
+                "EFSVolumeConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.EFSVolumeConfiguration"
+                },
+                "Host": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.HostVolumeProperties"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.VolumeFrom": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadOnly": {
+                    "type": "boolean"
+                },
+                "SourceContainer": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Cluster": {
+                            "type": "string"
+                        },
+                        "ExternalId": {
+                            "type": "string"
+                        },
+                        "LaunchType": {
+                            "type": "string"
+                        },
+                        "LoadBalancers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskSet.LoadBalancer"
+                            },
+                            "type": "array"
+                        },
+                        "NetworkConfiguration": {
+                            "$ref": "#/definitions/AWS::ECS::TaskSet.NetworkConfiguration"
+                        },
+                        "PlatformVersion": {
+                            "type": "string"
+                        },
+                        "Scale": {
+                            "$ref": "#/definitions/AWS::ECS::TaskSet.Scale"
+                        },
+                        "Service": {
+                            "type": "string"
+                        },
+                        "ServiceRegistries": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskSet.ServiceRegistry"
+                            },
+                            "type": "array"
+                        },
+                        "TaskDefinition": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Cluster",
+                        "Service",
+                        "TaskDefinition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::TaskSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet.AwsVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AssignPublicIp": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet.LoadBalancer": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerName": {
+                    "type": "string"
+                },
+                "ContainerPort": {
+                    "type": "number"
+                },
+                "LoadBalancerName": {
+                    "type": "string"
+                },
+                "TargetGroupArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsVpcConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::TaskSet.AwsVpcConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet.Scale": {
+            "additionalProperties": false,
+            "properties": {
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet.ServiceRegistry": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerName": {
+                    "type": "string"
+                },
+                "ContainerPort": {
+                    "type": "number"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "RegistryArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EFS::AccessPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessPointTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EFS::AccessPoint.AccessPointTag"
+                            },
+                            "type": "array"
+                        },
+                        "ClientToken": {
+                            "type": "string"
+                        },
+                        "FileSystemId": {
+                            "type": "string"
+                        },
+                        "PosixUser": {
+                            "$ref": "#/definitions/AWS::EFS::AccessPoint.PosixUser"
+                        },
+                        "RootDirectory": {
+                            "$ref": "#/definitions/AWS::EFS::AccessPoint.RootDirectory"
+                        }
+                    },
+                    "required": [
+                        "FileSystemId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EFS::AccessPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::AccessPoint.AccessPointTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EFS::AccessPoint.CreationInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "OwnerGid": {
+                    "type": "string"
+                },
+                "OwnerUid": {
+                    "type": "string"
+                },
+                "Permissions": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OwnerGid",
+                "OwnerUid",
+                "Permissions"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::AccessPoint.PosixUser": {
+            "additionalProperties": false,
+            "properties": {
+                "Gid": {
+                    "type": "string"
+                },
+                "SecondaryGids": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Uid": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Gid",
+                "Uid"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::AccessPoint.RootDirectory": {
+            "additionalProperties": false,
+            "properties": {
+                "CreationInfo": {
+                    "$ref": "#/definitions/AWS::EFS::AccessPoint.CreationInfo"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EFS::FileSystem": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZoneName": {
+                            "type": "string"
+                        },
+                        "BackupPolicy": {
+                            "$ref": "#/definitions/AWS::EFS::FileSystem.BackupPolicy"
+                        },
+                        "BypassPolicyLockoutSafetyCheck": {
+                            "type": "boolean"
+                        },
+                        "Encrypted": {
+                            "type": "boolean"
+                        },
+                        "FileSystemPolicy": {
+                            "type": "object"
+                        },
+                        "FileSystemTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EFS::FileSystem.ElasticFileSystemTag"
+                            },
+                            "type": "array"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LifecyclePolicies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EFS::FileSystem.LifecyclePolicy"
+                            },
+                            "type": "array"
+                        },
+                        "PerformanceMode": {
+                            "type": "string"
+                        },
+                        "ProvisionedThroughputInMibps": {
+                            "type": "number"
+                        },
+                        "ThroughputMode": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EFS::FileSystem"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::FileSystem.BackupPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::FileSystem.ElasticFileSystemTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::FileSystem.LifecyclePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "TransitionToIA": {
+                    "type": "string"
+                },
+                "TransitionToPrimaryStorageClass": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EFS::MountTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FileSystemId": {
+                            "type": "string"
+                        },
+                        "IpAddress": {
+                            "type": "string"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FileSystemId",
+                        "SecurityGroups",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EFS::MountTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Addon": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "AddonVersion": {
+                            "type": "string"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "ResolveConflicts": {
+                            "type": "string"
+                        },
+                        "ServiceAccountRoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddonName",
+                        "ClusterName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EKS::Addon"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EncryptionConfig": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EKS::Cluster.EncryptionConfig"
+                            },
+                            "type": "array"
+                        },
+                        "KubernetesNetworkConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.KubernetesNetworkConfig"
+                        },
+                        "Logging": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.Logging"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResourcesVpcConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.ResourcesVpcConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourcesVpcConfig",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EKS::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.ClusterLogging": {
+            "additionalProperties": false,
+            "properties": {
+                "EnabledTypes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EKS::Cluster.LoggingTypeConfig"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.EncryptionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Provider": {
+                    "type": "object"
+                },
+                "Resources": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.KubernetesNetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IpFamily": {
+                    "type": "string"
+                },
+                "ServiceIpv4Cidr": {
+                    "type": "string"
+                },
+                "ServiceIpv6Cidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterLogging": {
+                    "$ref": "#/definitions/AWS::EKS::Cluster.ClusterLogging"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.LoggingTypeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.ResourcesVpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointPrivateAccess": {
+                    "type": "boolean"
+                },
+                "EndpointPublicAccess": {
+                    "type": "boolean"
+                },
+                "PublicAccessCidrs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::FargateProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "FargateProfileName": {
+                            "type": "string"
+                        },
+                        "PodExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "Selectors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EKS::FargateProfile.Selector"
+                            },
+                            "type": "array"
+                        },
+                        "Subnets": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ClusterName",
+                        "PodExecutionRoleArn",
+                        "Selectors"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EKS::FargateProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::FargateProfile.Label": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::FargateProfile.Selector": {
+            "additionalProperties": false,
+            "properties": {
+                "Labels": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EKS::FargateProfile.Label"
+                    },
+                    "type": "array"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Namespace"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AmiType": {
+                            "type": "string"
+                        },
+                        "CapacityType": {
+                            "type": "string"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "DiskSize": {
+                            "type": "number"
+                        },
+                        "ForceUpdateEnabled": {
+                            "type": "boolean"
+                        },
+                        "InstanceTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Labels": {
+                            "type": "object"
+                        },
+                        "LaunchTemplate": {
+                            "$ref": "#/definitions/AWS::EKS::Nodegroup.LaunchTemplateSpecification"
+                        },
+                        "NodeRole": {
+                            "type": "string"
+                        },
+                        "NodegroupName": {
+                            "type": "string"
+                        },
+                        "ReleaseVersion": {
+                            "type": "string"
+                        },
+                        "RemoteAccess": {
+                            "$ref": "#/definitions/AWS::EKS::Nodegroup.RemoteAccess"
+                        },
+                        "ScalingConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Nodegroup.ScalingConfig"
+                        },
+                        "Subnets": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Taints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EKS::Nodegroup.Taint"
+                            },
+                            "type": "array"
+                        },
+                        "UpdateConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Nodegroup.UpdateConfig"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClusterName",
+                        "NodeRole",
+                        "Subnets"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EKS::Nodegroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup.LaunchTemplateSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup.RemoteAccess": {
+            "additionalProperties": false,
+            "properties": {
+                "Ec2SshKey": {
+                    "type": "string"
+                },
+                "SourceSecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Ec2SshKey"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup.ScalingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredSize": {
+                    "type": "number"
+                },
+                "MaxSize": {
+                    "type": "number"
+                },
+                "MinSize": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup.Taint": {
+            "additionalProperties": false,
+            "properties": {
+                "Effect": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup.UpdateConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxUnavailable": {
+                    "type": "number"
+                },
+                "MaxUnavailablePercentage": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdditionalInfo": {
+                            "type": "object"
+                        },
+                        "Applications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::Cluster.Application"
+                            },
+                            "type": "array"
+                        },
+                        "AutoScalingRole": {
+                            "type": "string"
+                        },
+                        "BootstrapActions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::Cluster.BootstrapActionConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Configurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::Cluster.Configuration"
+                            },
+                            "type": "array"
+                        },
+                        "CustomAmiId": {
+                            "type": "string"
+                        },
+                        "EbsRootVolumeSize": {
+                            "type": "number"
+                        },
+                        "Instances": {
+                            "$ref": "#/definitions/AWS::EMR::Cluster.JobFlowInstancesConfig"
+                        },
+                        "JobFlowRole": {
+                            "type": "string"
+                        },
+                        "KerberosAttributes": {
+                            "$ref": "#/definitions/AWS::EMR::Cluster.KerberosAttributes"
+                        },
+                        "LogEncryptionKmsKeyId": {
+                            "type": "string"
+                        },
+                        "LogUri": {
+                            "type": "string"
+                        },
+                        "ManagedScalingPolicy": {
+                            "$ref": "#/definitions/AWS::EMR::Cluster.ManagedScalingPolicy"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ReleaseLabel": {
+                            "type": "string"
+                        },
+                        "ScaleDownBehavior": {
+                            "type": "string"
+                        },
+                        "SecurityConfiguration": {
+                            "type": "string"
+                        },
+                        "ServiceRole": {
+                            "type": "string"
+                        },
+                        "StepConcurrencyLevel": {
+                            "type": "number"
+                        },
+                        "Steps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::Cluster.StepConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VisibleToAllUsers": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "Instances",
+                        "JobFlowRole",
+                        "Name",
+                        "ServiceRole"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.Application": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalInfo": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Args": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.AutoScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Constraints": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.ScalingConstraints"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.ScalingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Constraints",
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.BootstrapActionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "ScriptBootstrapAction": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.ScriptBootstrapActionConfig"
+                }
+            },
+            "required": [
+                "Name",
+                "ScriptBootstrapAction"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.CloudWatchAlarmDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "EvaluationPeriods": {
+                    "type": "number"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Threshold": {
+                    "type": "number"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "MetricName",
+                "Period",
+                "Threshold"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ComputeLimits": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumCapacityUnits": {
+                    "type": "number"
+                },
+                "MaximumCoreCapacityUnits": {
+                    "type": "number"
+                },
+                "MaximumOnDemandCapacityUnits": {
+                    "type": "number"
+                },
+                "MinimumCapacityUnits": {
+                    "type": "number"
+                },
+                "UnitType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MaximumCapacityUnits",
+                "MinimumCapacityUnits",
+                "UnitType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "Classification": {
+                    "type": "string"
+                },
+                "ConfigurationProperties": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.Configuration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.EbsBlockDeviceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "VolumeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.VolumeSpecification"
+                },
+                "VolumesPerInstance": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "VolumeSpecification"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.EbsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EbsBlockDeviceConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.EbsBlockDeviceConfig"
+                    },
+                    "type": "array"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.HadoopJarStepConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Args": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Jar": {
+                    "type": "string"
+                },
+                "MainClass": {
+                    "type": "string"
+                },
+                "StepProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.KeyValue"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Jar"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.InstanceFleetConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceTypeConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.InstanceTypeConfig"
+                    },
+                    "type": "array"
+                },
+                "LaunchSpecifications": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceFleetProvisioningSpecifications"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "TargetOnDemandCapacity": {
+                    "type": "number"
+                },
+                "TargetSpotCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.InstanceFleetProvisioningSpecifications": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandProvisioningSpecification"
+                },
+                "SpotSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.SpotProvisioningSpecification"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.InstanceGroupConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoScalingPolicy": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.AutoScalingPolicy"
+                },
+                "BidPrice": {
+                    "type": "string"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.Configuration"
+                    },
+                    "type": "array"
+                },
+                "CustomAmiId": {
+                    "type": "string"
+                },
+                "EbsConfiguration": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.EbsConfiguration"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "Market": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.InstanceTypeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BidPrice": {
+                    "type": "string"
+                },
+                "BidPriceAsPercentageOfOnDemandPrice": {
+                    "type": "number"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.Configuration"
+                    },
+                    "type": "array"
+                },
+                "CustomAmiId": {
+                    "type": "string"
+                },
+                "EbsConfiguration": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.EbsConfiguration"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.JobFlowInstancesConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalMasterSecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AdditionalSlaveSecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CoreInstanceFleet": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceFleetConfig"
+                },
+                "CoreInstanceGroup": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceGroupConfig"
+                },
+                "Ec2KeyName": {
+                    "type": "string"
+                },
+                "Ec2SubnetId": {
+                    "type": "string"
+                },
+                "Ec2SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EmrManagedMasterSecurityGroup": {
+                    "type": "string"
+                },
+                "EmrManagedSlaveSecurityGroup": {
+                    "type": "string"
+                },
+                "HadoopVersion": {
+                    "type": "string"
+                },
+                "KeepJobFlowAliveWhenNoSteps": {
+                    "type": "boolean"
+                },
+                "MasterInstanceFleet": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceFleetConfig"
+                },
+                "MasterInstanceGroup": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceGroupConfig"
+                },
+                "Placement": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.PlacementType"
+                },
+                "ServiceAccessSecurityGroup": {
+                    "type": "string"
+                },
+                "TerminationProtected": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.KerberosAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "ADDomainJoinPassword": {
+                    "type": "string"
+                },
+                "ADDomainJoinUser": {
+                    "type": "string"
+                },
+                "CrossRealmTrustPrincipalPassword": {
+                    "type": "string"
+                },
+                "KdcAdminPassword": {
+                    "type": "string"
+                },
+                "Realm": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KdcAdminPassword",
+                "Realm"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.KeyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ManagedScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeLimits": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.ComputeLimits"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.OnDemandProvisioningSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AllocationStrategy"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.PlacementType": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AvailabilityZone"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ScalingAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Market": {
+                    "type": "string"
+                },
+                "SimpleScalingPolicyConfiguration": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.SimpleScalingPolicyConfiguration"
+                }
+            },
+            "required": [
+                "SimpleScalingPolicyConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ScalingConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ScalingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.ScalingAction"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Trigger": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.ScalingTrigger"
+                }
+            },
+            "required": [
+                "Action",
+                "Name",
+                "Trigger"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ScalingTrigger": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchAlarmDefinition": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.CloudWatchAlarmDefinition"
+                }
+            },
+            "required": [
+                "CloudWatchAlarmDefinition"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ScriptBootstrapActionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Args": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Path"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.SimpleScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AdjustmentType": {
+                    "type": "string"
+                },
+                "CoolDown": {
+                    "type": "number"
+                },
+                "ScalingAdjustment": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ScalingAdjustment"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.SpotProvisioningSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "BlockDurationMinutes": {
+                    "type": "number"
+                },
+                "TimeoutAction": {
+                    "type": "string"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TimeoutAction",
+                "TimeoutDurationMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.StepConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionOnFailure": {
+                    "type": "string"
+                },
+                "HadoopJarStep": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.HadoopJarStepConfig"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HadoopJarStep",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.VolumeSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "SizeInGB": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SizeInGB",
+                "VolumeType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClusterId": {
+                            "type": "string"
+                        },
+                        "InstanceFleetType": {
+                            "type": "string"
+                        },
+                        "InstanceTypeConfigs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.InstanceTypeConfig"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchSpecifications": {
+                            "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.InstanceFleetProvisioningSpecifications"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "TargetOnDemandCapacity": {
+                            "type": "number"
+                        },
+                        "TargetSpotCapacity": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "ClusterId",
+                        "InstanceFleetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::InstanceFleetConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "Classification": {
+                    "type": "string"
+                },
+                "ConfigurationProperties": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.Configuration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.EbsBlockDeviceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "VolumeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.VolumeSpecification"
+                },
+                "VolumesPerInstance": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "VolumeSpecification"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.EbsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EbsBlockDeviceConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.EbsBlockDeviceConfig"
+                    },
+                    "type": "array"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.InstanceFleetProvisioningSpecifications": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandProvisioningSpecification"
+                },
+                "SpotSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.SpotProvisioningSpecification"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.InstanceTypeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BidPrice": {
+                    "type": "string"
+                },
+                "BidPriceAsPercentageOfOnDemandPrice": {
+                    "type": "number"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.Configuration"
+                    },
+                    "type": "array"
+                },
+                "CustomAmiId": {
+                    "type": "string"
+                },
+                "EbsConfiguration": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.EbsConfiguration"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.OnDemandProvisioningSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AllocationStrategy"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.SpotProvisioningSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "BlockDurationMinutes": {
+                    "type": "number"
+                },
+                "TimeoutAction": {
+                    "type": "string"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TimeoutAction",
+                "TimeoutDurationMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.VolumeSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "SizeInGB": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SizeInGB",
+                "VolumeType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingPolicy": {
+                            "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.AutoScalingPolicy"
+                        },
+                        "BidPrice": {
+                            "type": "string"
+                        },
+                        "Configurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.Configuration"
+                            },
+                            "type": "array"
+                        },
+                        "CustomAmiId": {
+                            "type": "string"
+                        },
+                        "EbsConfiguration": {
+                            "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.EbsConfiguration"
+                        },
+                        "InstanceCount": {
+                            "type": "number"
+                        },
+                        "InstanceRole": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "JobFlowId": {
+                            "type": "string"
+                        },
+                        "Market": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceCount",
+                        "InstanceRole",
+                        "InstanceType",
+                        "JobFlowId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::InstanceGroupConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.AutoScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Constraints": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.ScalingConstraints"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.ScalingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Constraints",
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.CloudWatchAlarmDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "EvaluationPeriods": {
+                    "type": "number"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Threshold": {
+                    "type": "number"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "MetricName",
+                "Period",
+                "Threshold"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "Classification": {
+                    "type": "string"
+                },
+                "ConfigurationProperties": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.Configuration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.EbsBlockDeviceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "VolumeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.VolumeSpecification"
+                },
+                "VolumesPerInstance": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "VolumeSpecification"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.EbsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EbsBlockDeviceConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.EbsBlockDeviceConfig"
+                    },
+                    "type": "array"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.ScalingAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Market": {
+                    "type": "string"
+                },
+                "SimpleScalingPolicyConfiguration": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.SimpleScalingPolicyConfiguration"
+                }
+            },
+            "required": [
+                "SimpleScalingPolicyConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.ScalingConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.ScalingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.ScalingAction"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Trigger": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.ScalingTrigger"
+                }
+            },
+            "required": [
+                "Action",
+                "Name",
+                "Trigger"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.ScalingTrigger": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchAlarmDefinition": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.CloudWatchAlarmDefinition"
+                }
+            },
+            "required": [
+                "CloudWatchAlarmDefinition"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.SimpleScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AdjustmentType": {
+                    "type": "string"
+                },
+                "CoolDown": {
+                    "type": "number"
+                },
+                "ScalingAdjustment": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ScalingAdjustment"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.VolumeSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "SizeInGB": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SizeInGB",
+                "VolumeType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::SecurityConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SecurityConfiguration": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "SecurityConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::SecurityConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Step": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ActionOnFailure": {
+                            "type": "string"
+                        },
+                        "HadoopJarStep": {
+                            "$ref": "#/definitions/AWS::EMR::Step.HadoopJarStepConfig"
+                        },
+                        "JobFlowId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ActionOnFailure",
+                        "HadoopJarStep",
+                        "JobFlowId",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::Step"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Step.HadoopJarStepConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Args": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Jar": {
+                    "type": "string"
+                },
+                "MainClass": {
+                    "type": "string"
+                },
+                "StepProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Step.KeyValue"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Jar"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Step.KeyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Studio": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthMode": {
+                            "type": "string"
+                        },
+                        "DefaultS3Location": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EngineSecurityGroupId": {
+                            "type": "string"
+                        },
+                        "IdpAuthUrl": {
+                            "type": "string"
+                        },
+                        "IdpRelayStateParameterName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ServiceRole": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserRole": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        },
+                        "WorkspaceSecurityGroupId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthMode",
+                        "DefaultS3Location",
+                        "EngineSecurityGroupId",
+                        "Name",
+                        "ServiceRole",
+                        "SubnetIds",
+                        "VpcId",
+                        "WorkspaceSecurityGroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::Studio"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::StudioSessionMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "IdentityName": {
+                            "type": "string"
+                        },
+                        "IdentityType": {
+                            "type": "string"
+                        },
+                        "SessionPolicyArn": {
+                            "type": "string"
+                        },
+                        "StudioId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "IdentityName",
+                        "IdentityType",
+                        "SessionPolicyArn",
+                        "StudioId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::StudioSessionMapping"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMRContainers::VirtualCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContainerProvider": {
+                            "$ref": "#/definitions/AWS::EMRContainers::VirtualCluster.ContainerProvider"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ContainerProvider",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMRContainers::VirtualCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMRContainers::VirtualCluster.ContainerInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "EksInfo": {
+                    "$ref": "#/definitions/AWS::EMRContainers::VirtualCluster.EksInfo"
+                }
+            },
+            "required": [
+                "EksInfo"
+            ],
+            "type": "object"
+        },
+        "AWS::EMRContainers::VirtualCluster.ContainerProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Info": {
+                    "$ref": "#/definitions/AWS::EMRContainers::VirtualCluster.ContainerInfo"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id",
+                "Info",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EMRContainers::VirtualCluster.EksInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Namespace"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::CacheCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AZMode": {
+                            "type": "string"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "CacheNodeType": {
+                            "type": "string"
+                        },
+                        "CacheParameterGroupName": {
+                            "type": "string"
+                        },
+                        "CacheSecurityGroupNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CacheSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "LogDeliveryConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElastiCache::CacheCluster.LogDeliveryConfigurationRequest"
+                            },
+                            "type": "array"
+                        },
+                        "NotificationTopicArn": {
+                            "type": "string"
+                        },
+                        "NumCacheNodes": {
+                            "type": "number"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredAvailabilityZone": {
+                            "type": "string"
+                        },
+                        "PreferredAvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "SnapshotArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnapshotName": {
+                            "type": "string"
+                        },
+                        "SnapshotRetentionLimit": {
+                            "type": "number"
+                        },
+                        "SnapshotWindow": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CacheNodeType",
+                        "Engine",
+                        "NumCacheNodes"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::CacheCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::CacheCluster.CloudWatchLogsDestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroup": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogGroup"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::CacheCluster.DestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::CacheCluster.CloudWatchLogsDestinationDetails"
+                },
+                "KinesisFirehoseDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::CacheCluster.KinesisFirehoseDestinationDetails"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::CacheCluster.KinesisFirehoseDestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStream": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStream"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::CacheCluster.LogDeliveryConfigurationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::CacheCluster.DestinationDetails"
+                },
+                "DestinationType": {
+                    "type": "string"
+                },
+                "LogFormat": {
+                    "type": "string"
+                },
+                "LogType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationDetails",
+                "DestinationType",
+                "LogFormat",
+                "LogType"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::GlobalReplicationGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutomaticFailoverEnabled": {
+                            "type": "boolean"
+                        },
+                        "CacheNodeType": {
+                            "type": "string"
+                        },
+                        "CacheParameterGroupName": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "GlobalNodeGroupCount": {
+                            "type": "number"
+                        },
+                        "GlobalReplicationGroupDescription": {
+                            "type": "string"
+                        },
+                        "GlobalReplicationGroupIdSuffix": {
+                            "type": "string"
+                        },
+                        "Members": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElastiCache::GlobalReplicationGroup.GlobalReplicationGroupMember"
+                            },
+                            "type": "array"
+                        },
+                        "RegionalConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElastiCache::GlobalReplicationGroup.RegionalConfiguration"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Members"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::GlobalReplicationGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::GlobalReplicationGroup.GlobalReplicationGroupMember": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplicationGroupId": {
+                    "type": "string"
+                },
+                "ReplicationGroupRegion": {
+                    "type": "string"
+                },
+                "Role": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::GlobalReplicationGroup.RegionalConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplicationGroupId": {
+                    "type": "string"
+                },
+                "ReplicationGroupRegion": {
+                    "type": "string"
+                },
+                "ReshardingConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ElastiCache::GlobalReplicationGroup.ReshardingConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::GlobalReplicationGroup.ReshardingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NodeGroupId": {
+                    "type": "string"
+                },
+                "PreferredAvailabilityZones": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::ParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CacheParameterGroupFamily": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Properties": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CacheParameterGroupFamily",
+                        "Description"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::ParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AtRestEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "AuthToken": {
+                            "type": "string"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AutomaticFailoverEnabled": {
+                            "type": "boolean"
+                        },
+                        "CacheNodeType": {
+                            "type": "string"
+                        },
+                        "CacheParameterGroupName": {
+                            "type": "string"
+                        },
+                        "CacheSecurityGroupNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CacheSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DataTieringEnabled": {
+                            "type": "boolean"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "GlobalReplicationGroupId": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LogDeliveryConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup.LogDeliveryConfigurationRequest"
+                            },
+                            "type": "array"
+                        },
+                        "MultiAZEnabled": {
+                            "type": "boolean"
+                        },
+                        "NodeGroupConfiguration": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup.NodeGroupConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "NotificationTopicArn": {
+                            "type": "string"
+                        },
+                        "NumCacheClusters": {
+                            "type": "number"
+                        },
+                        "NumNodeGroups": {
+                            "type": "number"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredCacheClusterAZs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "PrimaryClusterId": {
+                            "type": "string"
+                        },
+                        "ReplicasPerNodeGroup": {
+                            "type": "number"
+                        },
+                        "ReplicationGroupDescription": {
+                            "type": "string"
+                        },
+                        "ReplicationGroupId": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnapshotArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnapshotName": {
+                            "type": "string"
+                        },
+                        "SnapshotRetentionLimit": {
+                            "type": "number"
+                        },
+                        "SnapshotWindow": {
+                            "type": "string"
+                        },
+                        "SnapshottingClusterId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "UserGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ReplicationGroupDescription"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::ReplicationGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup.CloudWatchLogsDestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroup": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogGroup"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup.DestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup.CloudWatchLogsDestinationDetails"
+                },
+                "KinesisFirehoseDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup.KinesisFirehoseDestinationDetails"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup.KinesisFirehoseDestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStream": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStream"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup.LogDeliveryConfigurationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup.DestinationDetails"
+                },
+                "DestinationType": {
+                    "type": "string"
+                },
+                "LogFormat": {
+                    "type": "string"
+                },
+                "LogType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationDetails",
+                "DestinationType",
+                "LogFormat",
+                "LogType"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup.NodeGroupConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NodeGroupId": {
+                    "type": "string"
+                },
+                "PrimaryAvailabilityZone": {
+                    "type": "string"
+                },
+                "ReplicaAvailabilityZones": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ReplicaCount": {
+                    "type": "number"
+                },
+                "Slots": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::SecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::SecurityGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::SecurityGroupIngress": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CacheSecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupOwnerId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CacheSecurityGroupName",
+                        "EC2SecurityGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::SecurityGroupIngress"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::SubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CacheSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::SubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessString": {
+                            "type": "string"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "NoPasswordRequired": {
+                            "type": "boolean"
+                        },
+                        "Passwords": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "UserId": {
+                            "type": "string"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Engine",
+                        "UserId",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::UserGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "UserGroupId": {
+                            "type": "string"
+                        },
+                        "UserIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Engine",
+                        "UserGroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::UserGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ResourceLifecycleConfig": {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::Application.ApplicationResourceLifecycleConfig"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticBeanstalk::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Application.ApplicationResourceLifecycleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceRole": {
+                    "type": "string"
+                },
+                "VersionLifecycleConfig": {
+                    "$ref": "#/definitions/AWS::ElasticBeanstalk::Application.ApplicationVersionLifecycleConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Application.ApplicationVersionLifecycleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxAgeRule": {
+                    "$ref": "#/definitions/AWS::ElasticBeanstalk::Application.MaxAgeRule"
+                },
+                "MaxCountRule": {
+                    "$ref": "#/definitions/AWS::ElasticBeanstalk::Application.MaxCountRule"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Application.MaxAgeRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteSourceFromS3": {
+                    "type": "boolean"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "MaxAgeInDays": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Application.MaxCountRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteSourceFromS3": {
+                    "type": "boolean"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "MaxCount": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::ApplicationVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "SourceBundle": {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::ApplicationVersion.SourceBundle"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "SourceBundle"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticBeanstalk::ApplicationVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::ApplicationVersion.SourceBundle": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::ConfigurationTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnvironmentId": {
+                            "type": "string"
+                        },
+                        "OptionSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticBeanstalk::ConfigurationTemplate.ConfigurationOptionSetting"
+                            },
+                            "type": "array"
+                        },
+                        "PlatformArn": {
+                            "type": "string"
+                        },
+                        "SolutionStackName": {
+                            "type": "string"
+                        },
+                        "SourceConfiguration": {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::ConfigurationTemplate.SourceConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticBeanstalk::ConfigurationTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::ConfigurationTemplate.ConfigurationOptionSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "Namespace": {
+                    "type": "string"
+                },
+                "OptionName": {
+                    "type": "string"
+                },
+                "ResourceName": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Namespace",
+                "OptionName"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::ConfigurationTemplate.SourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationName": {
+                    "type": "string"
+                },
+                "TemplateName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApplicationName",
+                "TemplateName"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "CNAMEPrefix": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnvironmentName": {
+                            "type": "string"
+                        },
+                        "OperationsRole": {
+                            "type": "string"
+                        },
+                        "OptionSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticBeanstalk::Environment.OptionSetting"
+                            },
+                            "type": "array"
+                        },
+                        "PlatformArn": {
+                            "type": "string"
+                        },
+                        "SolutionStackName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        },
+                        "Tier": {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::Environment.Tier"
+                        },
+                        "VersionLabel": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticBeanstalk::Environment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Environment.OptionSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "Namespace": {
+                    "type": "string"
+                },
+                "OptionName": {
+                    "type": "string"
+                },
+                "ResourceName": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Namespace",
+                "OptionName"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Environment.Tier": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessLoggingPolicy": {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.AccessLoggingPolicy"
+                        },
+                        "AppCookieStickinessPolicy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.AppCookieStickinessPolicy"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ConnectionDrainingPolicy": {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.ConnectionDrainingPolicy"
+                        },
+                        "ConnectionSettings": {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.ConnectionSettings"
+                        },
+                        "CrossZone": {
+                            "type": "boolean"
+                        },
+                        "HealthCheck": {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.HealthCheck"
+                        },
+                        "Instances": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LBCookieStickinessPolicy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.LBCookieStickinessPolicy"
+                            },
+                            "type": "array"
+                        },
+                        "Listeners": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.Listeners"
+                            },
+                            "type": "array"
+                        },
+                        "LoadBalancerName": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.Policies"
+                            },
+                            "type": "array"
+                        },
+                        "Scheme": {
+                            "type": "string"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Subnets": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Listeners"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancing::LoadBalancer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.AccessLoggingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "EmitInterval": {
+                    "type": "number"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3BucketPrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled",
+                "S3BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.AppCookieStickinessPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "CookieName": {
+                    "type": "string"
+                },
+                "PolicyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CookieName",
+                "PolicyName"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.ConnectionDrainingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Timeout": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.ConnectionSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeout": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "IdleTimeout"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.HealthCheck": {
+            "additionalProperties": false,
+            "properties": {
+                "HealthyThreshold": {
+                    "type": "string"
+                },
+                "Interval": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                },
+                "Timeout": {
+                    "type": "string"
+                },
+                "UnhealthyThreshold": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HealthyThreshold",
+                "Interval",
+                "Target",
+                "Timeout",
+                "UnhealthyThreshold"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.LBCookieStickinessPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "CookieExpirationPeriod": {
+                    "type": "string"
+                },
+                "PolicyName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.Listeners": {
+            "additionalProperties": false,
+            "properties": {
+                "InstancePort": {
+                    "type": "string"
+                },
+                "InstanceProtocol": {
+                    "type": "string"
+                },
+                "LoadBalancerPort": {
+                    "type": "string"
+                },
+                "PolicyNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "SSLCertificateId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstancePort",
+                "LoadBalancerPort",
+                "Protocol"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.Policies": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "type": "object"
+                    },
+                    "type": "array"
+                },
+                "InstancePorts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LoadBalancerPorts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PolicyName": {
+                    "type": "string"
+                },
+                "PolicyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attributes",
+                "PolicyName",
+                "PolicyType"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AlpnPolicy": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Certificates": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.Certificate"
+                            },
+                            "type": "array"
+                        },
+                        "DefaultActions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.Action"
+                            },
+                            "type": "array"
+                        },
+                        "LoadBalancerArn": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "SslPolicy": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DefaultActions",
+                        "LoadBalancerArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancingV2::Listener"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticateCognitoConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.AuthenticateCognitoConfig"
+                },
+                "AuthenticateOidcConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.AuthenticateOidcConfig"
+                },
+                "FixedResponseConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.FixedResponseConfig"
+                },
+                "ForwardConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.ForwardConfig"
+                },
+                "Order": {
+                    "type": "number"
+                },
+                "RedirectConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.RedirectConfig"
+                },
+                "TargetGroupArn": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.AuthenticateCognitoConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationRequestExtraParams": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "OnUnauthenticatedRequest": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                },
+                "SessionCookieName": {
+                    "type": "string"
+                },
+                "SessionTimeout": {
+                    "type": "string"
+                },
+                "UserPoolArn": {
+                    "type": "string"
+                },
+                "UserPoolClientId": {
+                    "type": "string"
+                },
+                "UserPoolDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "UserPoolArn",
+                "UserPoolClientId",
+                "UserPoolDomain"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.AuthenticateOidcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationRequestExtraParams": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "AuthorizationEndpoint": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "OnUnauthenticatedRequest": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                },
+                "SessionCookieName": {
+                    "type": "string"
+                },
+                "SessionTimeout": {
+                    "type": "string"
+                },
+                "TokenEndpoint": {
+                    "type": "string"
+                },
+                "UserInfoEndpoint": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AuthorizationEndpoint",
+                "ClientId",
+                "ClientSecret",
+                "Issuer",
+                "TokenEndpoint",
+                "UserInfoEndpoint"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.FixedResponseConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentType": {
+                    "type": "string"
+                },
+                "MessageBody": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.ForwardConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetGroupStickinessConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.TargetGroupStickinessConfig"
+                },
+                "TargetGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.TargetGroupTuple"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.RedirectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Host": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "Query": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.TargetGroupStickinessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationSeconds": {
+                    "type": "number"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.TargetGroupTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetGroupArn": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Certificates": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerCertificate.Certificate"
+                            },
+                            "type": "array"
+                        },
+                        "ListenerArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Certificates",
+                        "ListenerArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancingV2::ListenerCertificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerCertificate.Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.Action"
+                            },
+                            "type": "array"
+                        },
+                        "Conditions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.RuleCondition"
+                            },
+                            "type": "array"
+                        },
+                        "ListenerArn": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Actions",
+                        "Conditions",
+                        "ListenerArn",
+                        "Priority"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancingV2::ListenerRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticateCognitoConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateCognitoConfig"
+                },
+                "AuthenticateOidcConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateOidcConfig"
+                },
+                "FixedResponseConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.FixedResponseConfig"
+                },
+                "ForwardConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.ForwardConfig"
+                },
+                "Order": {
+                    "type": "number"
+                },
+                "RedirectConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.RedirectConfig"
+                },
+                "TargetGroupArn": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateCognitoConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationRequestExtraParams": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "OnUnauthenticatedRequest": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                },
+                "SessionCookieName": {
+                    "type": "string"
+                },
+                "SessionTimeout": {
+                    "type": "number"
+                },
+                "UserPoolArn": {
+                    "type": "string"
+                },
+                "UserPoolClientId": {
+                    "type": "string"
+                },
+                "UserPoolDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "UserPoolArn",
+                "UserPoolClientId",
+                "UserPoolDomain"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateOidcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationRequestExtraParams": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "AuthorizationEndpoint": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "OnUnauthenticatedRequest": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                },
+                "SessionCookieName": {
+                    "type": "string"
+                },
+                "SessionTimeout": {
+                    "type": "number"
+                },
+                "TokenEndpoint": {
+                    "type": "string"
+                },
+                "UseExistingClientSecret": {
+                    "type": "boolean"
+                },
+                "UserInfoEndpoint": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AuthorizationEndpoint",
+                "ClientId",
+                "ClientSecret",
+                "Issuer",
+                "TokenEndpoint",
+                "UserInfoEndpoint"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.FixedResponseConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentType": {
+                    "type": "string"
+                },
+                "MessageBody": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.ForwardConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetGroupStickinessConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupStickinessConfig"
+                },
+                "TargetGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupTuple"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.HostHeaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.HttpHeaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpHeaderName": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.HttpRequestMethodConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.PathPatternConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringKeyValue"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringKeyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.RedirectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Host": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "Query": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.RuleCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Field": {
+                    "type": "string"
+                },
+                "HostHeaderConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.HostHeaderConfig"
+                },
+                "HttpHeaderConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.HttpHeaderConfig"
+                },
+                "HttpRequestMethodConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.HttpRequestMethodConfig"
+                },
+                "PathPatternConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.PathPatternConfig"
+                },
+                "QueryStringConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringConfig"
+                },
+                "SourceIpConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.SourceIpConfig"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.SourceIpConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupStickinessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationSeconds": {
+                    "type": "number"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetGroupArn": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::LoadBalancer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "IpAddressType": {
+                            "type": "string"
+                        },
+                        "LoadBalancerAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::LoadBalancer.LoadBalancerAttribute"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Scheme": {
+                            "type": "string"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::LoadBalancer.SubnetMapping"
+                            },
+                            "type": "array"
+                        },
+                        "Subnets": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancingV2::LoadBalancer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::LoadBalancer.LoadBalancerAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::LoadBalancer.SubnetMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationId": {
+                    "type": "string"
+                },
+                "IPv6Address": {
+                    "type": "string"
+                },
+                "PrivateIPv4Address": {
+                    "type": "string"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubnetId"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::TargetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HealthCheckEnabled": {
+                            "type": "boolean"
+                        },
+                        "HealthCheckIntervalSeconds": {
+                            "type": "number"
+                        },
+                        "HealthCheckPath": {
+                            "type": "string"
+                        },
+                        "HealthCheckPort": {
+                            "type": "string"
+                        },
+                        "HealthCheckProtocol": {
+                            "type": "string"
+                        },
+                        "HealthCheckTimeoutSeconds": {
+                            "type": "number"
+                        },
+                        "HealthyThresholdCount": {
+                            "type": "number"
+                        },
+                        "IpAddressType": {
+                            "type": "string"
+                        },
+                        "Matcher": {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::TargetGroup.Matcher"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "ProtocolVersion": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetGroupAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::TargetGroup.TargetGroupAttribute"
+                            },
+                            "type": "array"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::TargetGroup.TargetDescription"
+                            },
+                            "type": "array"
+                        },
+                        "UnhealthyThresholdCount": {
+                            "type": "number"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancingV2::TargetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::TargetGroup.Matcher": {
+            "additionalProperties": false,
+            "properties": {
+                "GrpcCode": {
+                    "type": "string"
+                },
+                "HttpCode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::TargetGroup.TargetDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::TargetGroup.TargetGroupAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessPolicies": {
+                            "type": "object"
+                        },
+                        "AdvancedOptions": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "AdvancedSecurityOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.AdvancedSecurityOptionsInput"
+                        },
+                        "CognitoOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.CognitoOptions"
+                        },
+                        "DomainEndpointOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.DomainEndpointOptions"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EBSOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.EBSOptions"
+                        },
+                        "ElasticsearchClusterConfig": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.ElasticsearchClusterConfig"
+                        },
+                        "ElasticsearchVersion": {
+                            "type": "string"
+                        },
+                        "EncryptionAtRestOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.EncryptionAtRestOptions"
+                        },
+                        "LogPublishingOptions": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::Elasticsearch::Domain.LogPublishingOption"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "NodeToNodeEncryptionOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.NodeToNodeEncryptionOptions"
+                        },
+                        "SnapshotOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.SnapshotOptions"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VPCOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.VPCOptions"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Elasticsearch::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.AdvancedSecurityOptionsInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "InternalUserDatabaseEnabled": {
+                    "type": "boolean"
+                },
+                "MasterUserOptions": {
+                    "$ref": "#/definitions/AWS::Elasticsearch::Domain.MasterUserOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.CognitoOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "IdentityPoolId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "UserPoolId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.ColdStorageOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.DomainEndpointOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomEndpoint": {
+                    "type": "string"
+                },
+                "CustomEndpointCertificateArn": {
+                    "type": "string"
+                },
+                "CustomEndpointEnabled": {
+                    "type": "boolean"
+                },
+                "EnforceHTTPS": {
+                    "type": "boolean"
+                },
+                "TLSSecurityPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.EBSOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "EBSEnabled": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.ElasticsearchClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ColdStorageOptions": {
+                    "$ref": "#/definitions/AWS::Elasticsearch::Domain.ColdStorageOptions"
+                },
+                "DedicatedMasterCount": {
+                    "type": "number"
+                },
+                "DedicatedMasterEnabled": {
+                    "type": "boolean"
+                },
+                "DedicatedMasterType": {
+                    "type": "string"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "WarmCount": {
+                    "type": "number"
+                },
+                "WarmEnabled": {
+                    "type": "boolean"
+                },
+                "WarmType": {
+                    "type": "string"
+                },
+                "ZoneAwarenessConfig": {
+                    "$ref": "#/definitions/AWS::Elasticsearch::Domain.ZoneAwarenessConfig"
+                },
+                "ZoneAwarenessEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.EncryptionAtRestOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.LogPublishingOption": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsLogGroupArn": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.MasterUserOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "MasterUserARN": {
+                    "type": "string"
+                },
+                "MasterUserName": {
+                    "type": "string"
+                },
+                "MasterUserPassword": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.NodeToNodeEncryptionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.SnapshotOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomatedSnapshotStartHour": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.VPCOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.ZoneAwarenessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZoneCount": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EventSchemas::Discoverer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CrossAccount": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "SourceArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EventSchemas::Discoverer.TagsEntry"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SourceArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EventSchemas::Discoverer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::Discoverer.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::Registry": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RegistryName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EventSchemas::Registry.TagsEntry"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EventSchemas::Registry"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::Registry.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::RegistryPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Policy": {
+                            "type": "object"
+                        },
+                        "RegistryName": {
+                            "type": "string"
+                        },
+                        "RevisionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Policy",
+                        "RegistryName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EventSchemas::RegistryPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::Schema": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Content": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "RegistryName": {
+                            "type": "string"
+                        },
+                        "SchemaName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EventSchemas::Schema.TagsEntry"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Content",
+                        "RegistryName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EventSchemas::Schema"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::Schema.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::ApiDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "HttpMethod": {
+                            "type": "string"
+                        },
+                        "InvocationEndpoint": {
+                            "type": "string"
+                        },
+                        "InvocationRateLimitPerSecond": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConnectionArn",
+                        "HttpMethod",
+                        "InvocationEndpoint"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::ApiDestination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Archive": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EventPattern": {
+                            "type": "object"
+                        },
+                        "RetentionDays": {
+                            "type": "number"
+                        },
+                        "SourceArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SourceArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::Archive"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Connection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthParameters": {
+                            "type": "object"
+                        },
+                        "AuthorizationType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthParameters",
+                        "AuthorizationType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::Connection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::EventBus": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EventSourceName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::EventBus"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::EventBusPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "Condition": {
+                            "$ref": "#/definitions/AWS::Events::EventBusPolicy.Condition"
+                        },
+                        "EventBusName": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        },
+                        "Statement": {
+                            "type": "object"
+                        },
+                        "StatementId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "StatementId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::EventBusPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::EventBusPolicy.Condition": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EventBusName": {
+                            "type": "string"
+                        },
+                        "EventPattern": {
+                            "type": "object"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "ScheduleExpression": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Events::Rule.Target"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::Rule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.AwsVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AssignPublicIp": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.BatchArrayProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Size": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.BatchParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ArrayProperties": {
+                    "$ref": "#/definitions/AWS::Events::Rule.BatchArrayProperties"
+                },
+                "JobDefinition": {
+                    "type": "string"
+                },
+                "JobName": {
+                    "type": "string"
+                },
+                "RetryStrategy": {
+                    "$ref": "#/definitions/AWS::Events::Rule.BatchRetryStrategy"
+                }
+            },
+            "required": [
+                "JobDefinition",
+                "JobName"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.BatchRetryStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "Attempts": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.CapacityProviderStrategyItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Base": {
+                    "type": "number"
+                },
+                "CapacityProvider": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "CapacityProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.DeadLetterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.EcsParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityProviderStrategy": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Events::Rule.CapacityProviderStrategyItem"
+                    },
+                    "type": "array"
+                },
+                "EnableECSManagedTags": {
+                    "type": "boolean"
+                },
+                "EnableExecuteCommand": {
+                    "type": "boolean"
+                },
+                "Group": {
+                    "type": "string"
+                },
+                "LaunchType": {
+                    "type": "string"
+                },
+                "NetworkConfiguration": {
+                    "$ref": "#/definitions/AWS::Events::Rule.NetworkConfiguration"
+                },
+                "PlacementConstraints": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Events::Rule.PlacementConstraint"
+                    },
+                    "type": "array"
+                },
+                "PlacementStrategies": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Events::Rule.PlacementStrategy"
+                    },
+                    "type": "array"
+                },
+                "PlatformVersion": {
+                    "type": "string"
+                },
+                "PropagateTags": {
+                    "type": "string"
+                },
+                "ReferenceId": {
+                    "type": "string"
+                },
+                "TagList": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                },
+                "TaskCount": {
+                    "type": "number"
+                },
+                "TaskDefinitionArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TaskDefinitionArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.HttpParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "PathParameterValues": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "QueryStringParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.InputTransformer": {
+            "additionalProperties": false,
+            "properties": {
+                "InputPathsMap": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "InputTemplate": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputTemplate"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.KinesisParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "PartitionKeyPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PartitionKeyPath"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsVpcConfiguration": {
+                    "$ref": "#/definitions/AWS::Events::Rule.AwsVpcConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.PlacementConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.PlacementStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "Field": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.RedshiftDataParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "DbUser": {
+                    "type": "string"
+                },
+                "SecretManagerArn": {
+                    "type": "string"
+                },
+                "Sql": {
+                    "type": "string"
+                },
+                "StatementName": {
+                    "type": "string"
+                },
+                "WithEvent": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Database",
+                "Sql"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.RetryPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumEventAgeInSeconds": {
+                    "type": "number"
+                },
+                "MaximumRetryAttempts": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.RunCommandParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RunCommandTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Events::Rule.RunCommandTarget"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "RunCommandTargets"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.RunCommandTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.SqsParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "MessageGroupId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MessageGroupId"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.Tag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.Target": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "BatchParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.BatchParameters"
+                },
+                "DeadLetterConfig": {
+                    "$ref": "#/definitions/AWS::Events::Rule.DeadLetterConfig"
+                },
+                "EcsParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.EcsParameters"
+                },
+                "HttpParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.HttpParameters"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Input": {
+                    "type": "string"
+                },
+                "InputPath": {
+                    "type": "string"
+                },
+                "InputTransformer": {
+                    "$ref": "#/definitions/AWS::Events::Rule.InputTransformer"
+                },
+                "KinesisParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.KinesisParameters"
+                },
+                "RedshiftDataParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.RedshiftDataParameters"
+                },
+                "RetryPolicy": {
+                    "$ref": "#/definitions/AWS::Events::Rule.RetryPolicy"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RunCommandParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.RunCommandParameters"
+                },
+                "SqsParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.SqsParameters"
+                }
+            },
+            "required": [
+                "Arn",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Experiment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "MetricGoals": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Experiment.MetricGoalObject"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OnlineAbConfig": {
+                            "$ref": "#/definitions/AWS::Evidently::Experiment.OnlineAbConfigObject"
+                        },
+                        "Project": {
+                            "type": "string"
+                        },
+                        "RandomizationSalt": {
+                            "type": "string"
+                        },
+                        "SamplingRate": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Treatments": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Experiment.TreatmentObject"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MetricGoals",
+                        "Name",
+                        "OnlineAbConfig",
+                        "Project",
+                        "Treatments"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Evidently::Experiment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Experiment.MetricGoalObject": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredChange": {
+                    "type": "string"
+                },
+                "EntityIdKey": {
+                    "type": "string"
+                },
+                "EventPattern": {
+                    "type": "string"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "UnitLabel": {
+                    "type": "string"
+                },
+                "ValueKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DesiredChange",
+                "EntityIdKey",
+                "EventPattern",
+                "MetricName",
+                "ValueKey"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Experiment.OnlineAbConfigObject": {
+            "additionalProperties": false,
+            "properties": {
+                "ControlTreatmentName": {
+                    "type": "string"
+                },
+                "TreatmentWeights": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Evidently::Experiment.TreatmentToWeight"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Evidently::Experiment.TreatmentObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Feature": {
+                    "type": "string"
+                },
+                "TreatmentName": {
+                    "type": "string"
+                },
+                "Variation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Feature",
+                "TreatmentName",
+                "Variation"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Experiment.TreatmentToWeight": {
+            "additionalProperties": false,
+            "properties": {
+                "SplitWeight": {
+                    "type": "number"
+                },
+                "Treatment": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SplitWeight",
+                "Treatment"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Feature": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DefaultVariation": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EntityOverrides": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Feature.EntityOverride"
+                            },
+                            "type": "array"
+                        },
+                        "EvaluationStrategy": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Project": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Variations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Feature.VariationObject"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Project",
+                        "Variations"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Evidently::Feature"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Feature.EntityOverride": {
+            "additionalProperties": false,
+            "properties": {
+                "EntityId": {
+                    "type": "string"
+                },
+                "Variation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Evidently::Feature.VariationObject": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanValue": {
+                    "type": "boolean"
+                },
+                "DoubleValue": {
+                    "type": "number"
+                },
+                "LongValue": {
+                    "type": "number"
+                },
+                "StringValue": {
+                    "type": "string"
+                },
+                "VariationName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Evidently::Launch": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Groups": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Launch.LaunchGroupObject"
+                            },
+                            "type": "array"
+                        },
+                        "MetricMonitors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Launch.MetricDefinitionObject"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Project": {
+                            "type": "string"
+                        },
+                        "RandomizationSalt": {
+                            "type": "string"
+                        },
+                        "ScheduledSplitsConfig": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Launch.StepConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Groups",
+                        "Name",
+                        "Project",
+                        "ScheduledSplitsConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Evidently::Launch"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Launch.GroupToWeight": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupName": {
+                    "type": "string"
+                },
+                "SplitWeight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "GroupName",
+                "SplitWeight"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Launch.LaunchGroupObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Feature": {
+                    "type": "string"
+                },
+                "GroupName": {
+                    "type": "string"
+                },
+                "Variation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Feature",
+                "GroupName",
+                "Variation"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Launch.MetricDefinitionObject": {
+            "additionalProperties": false,
+            "properties": {
+                "EntityIdKey": {
+                    "type": "string"
+                },
+                "EventPattern": {
+                    "type": "string"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "UnitLabel": {
+                    "type": "string"
+                },
+                "ValueKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EntityIdKey",
+                "EventPattern",
+                "MetricName",
+                "ValueKey"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Launch.StepConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupWeights": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Evidently::Launch.GroupToWeight"
+                    },
+                    "type": "array"
+                },
+                "StartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupWeights",
+                "StartTime"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataDelivery": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Evidently::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Project.DataDeliveryObject": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroup": {
+                    "type": "string"
+                },
+                "S3": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Evidently::Project.S3Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::FIS::ExperimentTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::FIS::ExperimentTemplate.ExperimentTemplateAction"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StopConditions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FIS::ExperimentTemplate.ExperimentTemplateStopCondition"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Targets": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::FIS::ExperimentTemplate.ExperimentTemplateTarget"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "RoleArn",
+                        "StopConditions",
+                        "Tags",
+                        "Targets"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FIS::ExperimentTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FIS::ExperimentTemplate.ExperimentTemplateAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionId": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "StartAfter": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Targets": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "required": [
+                "ActionId"
+            ],
+            "type": "object"
+        },
+        "AWS::FIS::ExperimentTemplate.ExperimentTemplateStopCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Source": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Source"
+            ],
+            "type": "object"
+        },
+        "AWS::FIS::ExperimentTemplate.ExperimentTemplateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Filters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FIS::ExperimentTemplate.ExperimentTemplateTargetFilter"
+                    },
+                    "type": "array"
+                },
+                "ResourceArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ResourceTags": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ResourceType": {
+                    "type": "string"
+                },
+                "SelectionMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceType",
+                "SelectionMode"
+            ],
+            "type": "object"
+        },
+        "AWS::FIS::ExperimentTemplate.ExperimentTemplateTargetFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Path": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Path",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::FMS::NotificationChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SnsRoleName": {
+                            "type": "string"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SnsRoleName",
+                        "SnsTopicArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FMS::NotificationChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FMS::Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeleteAllPolicyResources": {
+                            "type": "boolean"
+                        },
+                        "ExcludeMap": {
+                            "$ref": "#/definitions/AWS::FMS::Policy.IEMap"
+                        },
+                        "ExcludeResourceTags": {
+                            "type": "boolean"
+                        },
+                        "IncludeMap": {
+                            "$ref": "#/definitions/AWS::FMS::Policy.IEMap"
+                        },
+                        "PolicyName": {
+                            "type": "string"
+                        },
+                        "RemediationEnabled": {
+                            "type": "boolean"
+                        },
+                        "ResourceTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FMS::Policy.ResourceTag"
+                            },
+                            "type": "array"
+                        },
+                        "ResourceType": {
+                            "type": "string"
+                        },
+                        "ResourceTypeList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ResourcesCleanUp": {
+                            "type": "boolean"
+                        },
+                        "SecurityServicePolicyData": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FMS::Policy.PolicyTag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ExcludeResourceTags",
+                        "PolicyName",
+                        "RemediationEnabled",
+                        "ResourceType",
+                        "SecurityServicePolicyData"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FMS::Policy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FMS::Policy.IEMap": {
+            "additionalProperties": false,
+            "properties": {
+                "ACCOUNT": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ORGUNIT": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FMS::Policy.PolicyTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::FMS::Policy.ResourceTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BackupId": {
+                            "type": "string"
+                        },
+                        "FileSystemType": {
+                            "type": "string"
+                        },
+                        "FileSystemTypeVersion": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LustreConfiguration": {
+                            "$ref": "#/definitions/AWS::FSx::FileSystem.LustreConfiguration"
+                        },
+                        "OntapConfiguration": {
+                            "$ref": "#/definitions/AWS::FSx::FileSystem.OntapConfiguration"
+                        },
+                        "OpenZFSConfiguration": {
+                            "$ref": "#/definitions/AWS::FSx::FileSystem.OpenZFSConfiguration"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "StorageCapacity": {
+                            "type": "number"
+                        },
+                        "StorageType": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WindowsConfiguration": {
+                            "$ref": "#/definitions/AWS::FSx::FileSystem.WindowsConfiguration"
+                        }
+                    },
+                    "required": [
+                        "FileSystemType",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FSx::FileSystem"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.AuditLogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuditLogDestination": {
+                    "type": "string"
+                },
+                "FileAccessAuditLogLevel": {
+                    "type": "string"
+                },
+                "FileShareAccessAuditLogLevel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FileAccessAuditLogLevel",
+                "FileShareAccessAuditLogLevel"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.ClientConfigurations": {
+            "additionalProperties": false,
+            "properties": {
+                "Clients": {
+                    "type": "string"
+                },
+                "Options": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.DiskIopsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.LustreConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoImportPolicy": {
+                    "type": "string"
+                },
+                "AutomaticBackupRetentionDays": {
+                    "type": "number"
+                },
+                "CopyTagsToBackups": {
+                    "type": "boolean"
+                },
+                "DailyAutomaticBackupStartTime": {
+                    "type": "string"
+                },
+                "DataCompressionType": {
+                    "type": "string"
+                },
+                "DeploymentType": {
+                    "type": "string"
+                },
+                "DriveCacheType": {
+                    "type": "string"
+                },
+                "ExportPath": {
+                    "type": "string"
+                },
+                "ImportPath": {
+                    "type": "string"
+                },
+                "ImportedFileChunkSize": {
+                    "type": "number"
+                },
+                "PerUnitStorageThroughput": {
+                    "type": "number"
+                },
+                "WeeklyMaintenanceStartTime": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.NfsExports": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FSx::FileSystem.ClientConfigurations"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.OntapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomaticBackupRetentionDays": {
+                    "type": "number"
+                },
+                "DailyAutomaticBackupStartTime": {
+                    "type": "string"
+                },
+                "DeploymentType": {
+                    "type": "string"
+                },
+                "DiskIopsConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.DiskIopsConfiguration"
+                },
+                "EndpointIpAddressRange": {
+                    "type": "string"
+                },
+                "FsxAdminPassword": {
+                    "type": "string"
+                },
+                "PreferredSubnetId": {
+                    "type": "string"
+                },
+                "RouteTableIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ThroughputCapacity": {
+                    "type": "number"
+                },
+                "WeeklyMaintenanceStartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeploymentType"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.OpenZFSConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomaticBackupRetentionDays": {
+                    "type": "number"
+                },
+                "CopyTagsToBackups": {
+                    "type": "boolean"
+                },
+                "CopyTagsToVolumes": {
+                    "type": "boolean"
+                },
+                "DailyAutomaticBackupStartTime": {
+                    "type": "string"
+                },
+                "DeploymentType": {
+                    "type": "string"
+                },
+                "DiskIopsConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.DiskIopsConfiguration"
+                },
+                "RootVolumeConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.RootVolumeConfiguration"
+                },
+                "ThroughputCapacity": {
+                    "type": "number"
+                },
+                "WeeklyMaintenanceStartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeploymentType"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.RootVolumeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyTagsToSnapshots": {
+                    "type": "boolean"
+                },
+                "DataCompressionType": {
+                    "type": "string"
+                },
+                "NfsExports": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FSx::FileSystem.NfsExports"
+                    },
+                    "type": "array"
+                },
+                "ReadOnly": {
+                    "type": "boolean"
+                },
+                "UserAndGroupQuotas": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FSx::FileSystem.UserAndGroupQuotas"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.SelfManagedActiveDirectoryConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DnsIps": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DomainName": {
+                    "type": "string"
+                },
+                "FileSystemAdministratorsGroup": {
+                    "type": "string"
+                },
+                "OrganizationalUnitDistinguishedName": {
+                    "type": "string"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "UserName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.UserAndGroupQuotas": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "number"
+                },
+                "StorageCapacityQuotaGiB": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.WindowsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveDirectoryId": {
+                    "type": "string"
+                },
+                "Aliases": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AuditLogConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.AuditLogConfiguration"
+                },
+                "AutomaticBackupRetentionDays": {
+                    "type": "number"
+                },
+                "CopyTagsToBackups": {
+                    "type": "boolean"
+                },
+                "DailyAutomaticBackupStartTime": {
+                    "type": "string"
+                },
+                "DeploymentType": {
+                    "type": "string"
+                },
+                "PreferredSubnetId": {
+                    "type": "string"
+                },
+                "SelfManagedActiveDirectoryConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.SelfManagedActiveDirectoryConfiguration"
+                },
+                "ThroughputCapacity": {
+                    "type": "number"
+                },
+                "WeeklyMaintenanceStartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ThroughputCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::FinSpace::Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataBundles": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FederationMode": {
+                            "type": "string"
+                        },
+                        "FederationParameters": {
+                            "$ref": "#/definitions/AWS::FinSpace::Environment.FederationParameters"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SuperuserParameters": {
+                            "$ref": "#/definitions/AWS::FinSpace::Environment.SuperuserParameters"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FinSpace::Environment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FinSpace::Environment.FederationParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationCallBackURL": {
+                    "type": "string"
+                },
+                "AttributeMap": {
+                    "type": "object"
+                },
+                "FederationProviderName": {
+                    "type": "string"
+                },
+                "FederationURN": {
+                    "type": "string"
+                },
+                "SamlMetadataDocument": {
+                    "type": "string"
+                },
+                "SamlMetadataURL": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FinSpace::Environment.SuperuserParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "EmailAddress": {
+                    "type": "string"
+                },
+                "FirstName": {
+                    "type": "string"
+                },
+                "LastName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatedModels": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FraudDetector::Detector.Model"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "DetectorVersionStatus": {
+                            "type": "string"
+                        },
+                        "EventType": {
+                            "$ref": "#/definitions/AWS::FraudDetector::Detector.EventType"
+                        },
+                        "RuleExecutionMode": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FraudDetector::Detector.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DetectorId",
+                        "EventType",
+                        "Rules"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::Detector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.EntityType": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.EventType": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "EntityTypes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FraudDetector::Detector.EntityType"
+                    },
+                    "type": "array"
+                },
+                "EventVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FraudDetector::Detector.EventVariable"
+                    },
+                    "type": "array"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "Labels": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FraudDetector::Detector.Label"
+                    },
+                    "type": "array"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.EventVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "DataSource": {
+                    "type": "string"
+                },
+                "DataType": {
+                    "type": "string"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                },
+                "VariableType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.Label": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.Model": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.Outcome": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DetectorId": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                },
+                "Language": {
+                    "type": "string"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Outcomes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FraudDetector::Detector.Outcome"
+                    },
+                    "type": "array"
+                },
+                "RuleId": {
+                    "type": "string"
+                },
+                "RuleVersion": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::EntityType": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::EntityType"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FraudDetector::EventType": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EntityTypes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FraudDetector::EventType.EntityType"
+                            },
+                            "type": "array"
+                        },
+                        "EventVariables": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FraudDetector::EventType.EventVariable"
+                            },
+                            "type": "array"
+                        },
+                        "Labels": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FraudDetector::EventType.Label"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EntityTypes",
+                        "EventVariables",
+                        "Labels",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::EventType"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FraudDetector::EventType.EntityType": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::EventType.EventVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "DataSource": {
+                    "type": "string"
+                },
+                "DataType": {
+                    "type": "string"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                },
+                "VariableType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::EventType.Label": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Label": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::Label"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FraudDetector::Outcome": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::Outcome"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FraudDetector::Variable": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataSource": {
+                            "type": "string"
+                        },
+                        "DataType": {
+                            "type": "string"
+                        },
+                        "DefaultValue": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VariableType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DataSource",
+                        "DataType",
+                        "DefaultValue",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::Variable"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Alias": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RoutingStrategy": {
+                            "$ref": "#/definitions/AWS::GameLift::Alias.RoutingStrategy"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "RoutingStrategy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::Alias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Alias.RoutingStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "FleetId": {
+                    "type": "string"
+                },
+                "Message": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Build": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "OperatingSystem": {
+                            "type": "string"
+                        },
+                        "StorageLocation": {
+                            "$ref": "#/definitions/AWS::GameLift::Build.S3Location"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::Build"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Build.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BuildId": {
+                            "type": "string"
+                        },
+                        "CertificateConfiguration": {
+                            "$ref": "#/definitions/AWS::GameLift::Fleet.CertificateConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DesiredEC2Instances": {
+                            "type": "number"
+                        },
+                        "EC2InboundPermissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::Fleet.IpPermission"
+                            },
+                            "type": "array"
+                        },
+                        "EC2InstanceType": {
+                            "type": "string"
+                        },
+                        "FleetType": {
+                            "type": "string"
+                        },
+                        "InstanceRoleARN": {
+                            "type": "string"
+                        },
+                        "Locations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::Fleet.LocationConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "MaxSize": {
+                            "type": "number"
+                        },
+                        "MetricGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NewGameSessionProtectionPolicy": {
+                            "type": "string"
+                        },
+                        "PeerVpcAwsAccountId": {
+                            "type": "string"
+                        },
+                        "PeerVpcId": {
+                            "type": "string"
+                        },
+                        "ResourceCreationLimitPolicy": {
+                            "$ref": "#/definitions/AWS::GameLift::Fleet.ResourceCreationLimitPolicy"
+                        },
+                        "RuntimeConfiguration": {
+                            "$ref": "#/definitions/AWS::GameLift::Fleet.RuntimeConfiguration"
+                        },
+                        "ScriptId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::Fleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.CertificateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateType"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.IpPermission": {
+            "additionalProperties": false,
+            "properties": {
+                "FromPort": {
+                    "type": "number"
+                },
+                "IpRange": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FromPort",
+                "IpRange",
+                "Protocol",
+                "ToPort"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.LocationCapacity": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredEC2Instances": {
+                    "type": "number"
+                },
+                "MaxSize": {
+                    "type": "number"
+                },
+                "MinSize": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DesiredEC2Instances",
+                "MaxSize",
+                "MinSize"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.LocationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Location": {
+                    "type": "string"
+                },
+                "LocationCapacity": {
+                    "$ref": "#/definitions/AWS::GameLift::Fleet.LocationCapacity"
+                }
+            },
+            "required": [
+                "Location"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.ResourceCreationLimitPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "NewGameSessionsPerCreator": {
+                    "type": "number"
+                },
+                "PolicyPeriodInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.RuntimeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GameSessionActivationTimeoutSeconds": {
+                    "type": "number"
+                },
+                "MaxConcurrentGameSessionActivations": {
+                    "type": "number"
+                },
+                "ServerProcesses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::GameLift::Fleet.ServerProcess"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.ServerProcess": {
+            "additionalProperties": false,
+            "properties": {
+                "ConcurrentExecutions": {
+                    "type": "number"
+                },
+                "LaunchPath": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConcurrentExecutions",
+                "LaunchPath"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameServerGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingPolicy": {
+                            "$ref": "#/definitions/AWS::GameLift::GameServerGroup.AutoScalingPolicy"
+                        },
+                        "BalancingStrategy": {
+                            "type": "string"
+                        },
+                        "DeleteOption": {
+                            "type": "string"
+                        },
+                        "GameServerGroupName": {
+                            "type": "string"
+                        },
+                        "GameServerProtectionPolicy": {
+                            "type": "string"
+                        },
+                        "InstanceDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::GameServerGroup.InstanceDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchTemplate": {
+                            "$ref": "#/definitions/AWS::GameLift::GameServerGroup.LaunchTemplate"
+                        },
+                        "MaxSize": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSubnets": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "GameServerGroupName",
+                        "InstanceDefinitions",
+                        "LaunchTemplate",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::GameServerGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameServerGroup.AutoScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "EstimatedInstanceWarmup": {
+                    "type": "number"
+                },
+                "TargetTrackingConfiguration": {
+                    "$ref": "#/definitions/AWS::GameLift::GameServerGroup.TargetTrackingConfiguration"
+                }
+            },
+            "required": [
+                "TargetTrackingConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameServerGroup.InstanceDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameServerGroup.LaunchTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::GameServerGroup.TargetTrackingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameSessionQueue": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomEventData": {
+                            "type": "string"
+                        },
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::GameSessionQueue.Destination"
+                            },
+                            "type": "array"
+                        },
+                        "FilterConfiguration": {
+                            "$ref": "#/definitions/AWS::GameLift::GameSessionQueue.FilterConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NotificationTarget": {
+                            "type": "string"
+                        },
+                        "PlayerLatencyPolicies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::GameSessionQueue.PlayerLatencyPolicy"
+                            },
+                            "type": "array"
+                        },
+                        "PriorityConfiguration": {
+                            "$ref": "#/definitions/AWS::GameLift::GameSessionQueue.PriorityConfiguration"
+                        },
+                        "TimeoutInSeconds": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::GameSessionQueue"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameSessionQueue.Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::GameSessionQueue.FilterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedLocations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::GameSessionQueue.PlayerLatencyPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumIndividualPlayerLatencyMilliseconds": {
+                    "type": "number"
+                },
+                "PolicyDurationSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::GameSessionQueue.PriorityConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LocationOrder": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PriorityOrder": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::MatchmakingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptanceRequired": {
+                            "type": "boolean"
+                        },
+                        "AcceptanceTimeoutSeconds": {
+                            "type": "number"
+                        },
+                        "AdditionalPlayerCount": {
+                            "type": "number"
+                        },
+                        "BackfillMode": {
+                            "type": "string"
+                        },
+                        "CustomEventData": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FlexMatchMode": {
+                            "type": "string"
+                        },
+                        "GameProperties": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::MatchmakingConfiguration.GameProperty"
+                            },
+                            "type": "array"
+                        },
+                        "GameSessionData": {
+                            "type": "string"
+                        },
+                        "GameSessionQueueArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NotificationTarget": {
+                            "type": "string"
+                        },
+                        "RequestTimeoutSeconds": {
+                            "type": "number"
+                        },
+                        "RuleSetName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AcceptanceRequired",
+                        "Name",
+                        "RequestTimeoutSeconds",
+                        "RuleSetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::MatchmakingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::MatchmakingConfiguration.GameProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::MatchmakingRuleSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RuleSetBody": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "RuleSetBody"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::MatchmakingRuleSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Script": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "StorageLocation": {
+                            "$ref": "#/definitions/AWS::GameLift::Script.S3Location"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "StorageLocation"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::Script"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Script.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::Accelerator": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "IpAddressType": {
+                            "type": "string"
+                        },
+                        "IpAddresses": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GlobalAccelerator::Accelerator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::EndpointGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EndpointConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GlobalAccelerator::EndpointGroup.EndpointConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "EndpointGroupRegion": {
+                            "type": "string"
+                        },
+                        "HealthCheckIntervalSeconds": {
+                            "type": "number"
+                        },
+                        "HealthCheckPath": {
+                            "type": "string"
+                        },
+                        "HealthCheckPort": {
+                            "type": "number"
+                        },
+                        "HealthCheckProtocol": {
+                            "type": "string"
+                        },
+                        "ListenerArn": {
+                            "type": "string"
+                        },
+                        "PortOverrides": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GlobalAccelerator::EndpointGroup.PortOverride"
+                            },
+                            "type": "array"
+                        },
+                        "ThresholdCount": {
+                            "type": "number"
+                        },
+                        "TrafficDialPercentage": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "EndpointGroupRegion",
+                        "ListenerArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GlobalAccelerator::EndpointGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::EndpointGroup.EndpointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIPPreservationEnabled": {
+                    "type": "boolean"
+                },
+                "EndpointId": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "EndpointId"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::EndpointGroup.PortOverride": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointPort": {
+                    "type": "number"
+                },
+                "ListenerPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "EndpointPort",
+                "ListenerPort"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::Listener": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceleratorArn": {
+                            "type": "string"
+                        },
+                        "ClientAffinity": {
+                            "type": "string"
+                        },
+                        "PortRanges": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GlobalAccelerator::Listener.PortRange"
+                            },
+                            "type": "array"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AcceleratorArn",
+                        "PortRanges",
+                        "Protocol"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GlobalAccelerator::Listener"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::Listener.PortRange": {
+            "additionalProperties": false,
+            "properties": {
+                "FromPort": {
+                    "type": "number"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FromPort",
+                "ToPort"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Classifier": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CsvClassifier": {
+                            "$ref": "#/definitions/AWS::Glue::Classifier.CsvClassifier"
+                        },
+                        "GrokClassifier": {
+                            "$ref": "#/definitions/AWS::Glue::Classifier.GrokClassifier"
+                        },
+                        "JsonClassifier": {
+                            "$ref": "#/definitions/AWS::Glue::Classifier.JsonClassifier"
+                        },
+                        "XMLClassifier": {
+                            "$ref": "#/definitions/AWS::Glue::Classifier.XMLClassifier"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Classifier"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Classifier.CsvClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowSingleColumn": {
+                    "type": "boolean"
+                },
+                "ContainsHeader": {
+                    "type": "string"
+                },
+                "Delimiter": {
+                    "type": "string"
+                },
+                "DisableValueTrimming": {
+                    "type": "boolean"
+                },
+                "Header": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "QuoteSymbol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Classifier.GrokClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "Classification": {
+                    "type": "string"
+                },
+                "CustomPatterns": {
+                    "type": "string"
+                },
+                "GrokPattern": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Classification",
+                "GrokPattern"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Classifier.JsonClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonPath": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "JsonPath"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Classifier.XMLClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "Classification": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "RowTag": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Classification",
+                "RowTag"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Connection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CatalogId": {
+                            "type": "string"
+                        },
+                        "ConnectionInput": {
+                            "$ref": "#/definitions/AWS::Glue::Connection.ConnectionInput"
+                        }
+                    },
+                    "required": [
+                        "CatalogId",
+                        "ConnectionInput"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Connection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Connection.ConnectionInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionProperties": {
+                    "type": "object"
+                },
+                "ConnectionType": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "MatchCriteria": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "PhysicalConnectionRequirements": {
+                    "$ref": "#/definitions/AWS::Glue::Connection.PhysicalConnectionRequirements"
+                }
+            },
+            "required": [
+                "ConnectionType"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Connection.PhysicalConnectionRequirements": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "SecurityGroupIdList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Classifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Configuration": {
+                            "type": "string"
+                        },
+                        "CrawlerSecurityConfiguration": {
+                            "type": "string"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RecrawlPolicy": {
+                            "$ref": "#/definitions/AWS::Glue::Crawler.RecrawlPolicy"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "$ref": "#/definitions/AWS::Glue::Crawler.Schedule"
+                        },
+                        "SchemaChangePolicy": {
+                            "$ref": "#/definitions/AWS::Glue::Crawler.SchemaChangePolicy"
+                        },
+                        "TablePrefix": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Targets": {
+                            "$ref": "#/definitions/AWS::Glue::Crawler.Targets"
+                        }
+                    },
+                    "required": [
+                        "Role",
+                        "Targets"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Crawler"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.CatalogTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Tables": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.DynamoDBTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.JdbcTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionName": {
+                    "type": "string"
+                },
+                "Exclusions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.RecrawlPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "RecrawlBehavior": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.S3Target": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionName": {
+                    "type": "string"
+                },
+                "Exclusions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.SchemaChangePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteBehavior": {
+                    "type": "string"
+                },
+                "UpdateBehavior": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.Targets": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Crawler.CatalogTarget"
+                    },
+                    "type": "array"
+                },
+                "DynamoDBTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Crawler.DynamoDBTarget"
+                    },
+                    "type": "array"
+                },
+                "JdbcTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Crawler.JdbcTarget"
+                    },
+                    "type": "array"
+                },
+                "S3Targets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Crawler.S3Target"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::DataCatalogEncryptionSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CatalogId": {
+                            "type": "string"
+                        },
+                        "DataCatalogEncryptionSettings": {
+                            "$ref": "#/definitions/AWS::Glue::DataCatalogEncryptionSettings.DataCatalogEncryptionSettings"
+                        }
+                    },
+                    "required": [
+                        "CatalogId",
+                        "DataCatalogEncryptionSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::DataCatalogEncryptionSettings"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::DataCatalogEncryptionSettings.ConnectionPasswordEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "ReturnConnectionPasswordEncrypted": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::DataCatalogEncryptionSettings.DataCatalogEncryptionSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionPasswordEncryption": {
+                    "$ref": "#/definitions/AWS::Glue::DataCatalogEncryptionSettings.ConnectionPasswordEncryption"
+                },
+                "EncryptionAtRest": {
+                    "$ref": "#/definitions/AWS::Glue::DataCatalogEncryptionSettings.EncryptionAtRest"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::DataCatalogEncryptionSettings.EncryptionAtRest": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogEncryptionMode": {
+                    "type": "string"
+                },
+                "SseAwsKmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Database": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CatalogId": {
+                            "type": "string"
+                        },
+                        "DatabaseInput": {
+                            "$ref": "#/definitions/AWS::Glue::Database.DatabaseInput"
+                        }
+                    },
+                    "required": [
+                        "CatalogId",
+                        "DatabaseInput"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Database"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Database.DataLakePrincipal": {
+            "additionalProperties": false,
+            "properties": {
+                "DataLakePrincipalIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Database.DatabaseIdentifier": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Database.DatabaseInput": {
+            "additionalProperties": false,
+            "properties": {
+                "CreateTableDefaultPermissions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Database.PrincipalPrivileges"
+                    },
+                    "type": "array"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "LocationUri": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "TargetDatabase": {
+                    "$ref": "#/definitions/AWS::Glue::Database.DatabaseIdentifier"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Database.PrincipalPrivileges": {
+            "additionalProperties": false,
+            "properties": {
+                "Permissions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "$ref": "#/definitions/AWS::Glue::Database.DataLakePrincipal"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::DevEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Arguments": {
+                            "type": "object"
+                        },
+                        "EndpointName": {
+                            "type": "string"
+                        },
+                        "ExtraJarsS3Path": {
+                            "type": "string"
+                        },
+                        "ExtraPythonLibsS3Path": {
+                            "type": "string"
+                        },
+                        "GlueVersion": {
+                            "type": "string"
+                        },
+                        "NumberOfNodes": {
+                            "type": "number"
+                        },
+                        "NumberOfWorkers": {
+                            "type": "number"
+                        },
+                        "PublicKey": {
+                            "type": "string"
+                        },
+                        "PublicKeys": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "SecurityConfiguration": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "WorkerType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::DevEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Job": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocatedCapacity": {
+                            "type": "number"
+                        },
+                        "Command": {
+                            "$ref": "#/definitions/AWS::Glue::Job.JobCommand"
+                        },
+                        "Connections": {
+                            "$ref": "#/definitions/AWS::Glue::Job.ConnectionsList"
+                        },
+                        "DefaultArguments": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ExecutionProperty": {
+                            "$ref": "#/definitions/AWS::Glue::Job.ExecutionProperty"
+                        },
+                        "GlueVersion": {
+                            "type": "string"
+                        },
+                        "LogUri": {
+                            "type": "string"
+                        },
+                        "MaxCapacity": {
+                            "type": "number"
+                        },
+                        "MaxRetries": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NotificationProperty": {
+                            "$ref": "#/definitions/AWS::Glue::Job.NotificationProperty"
+                        },
+                        "NumberOfWorkers": {
+                            "type": "number"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "SecurityConfiguration": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Timeout": {
+                            "type": "number"
+                        },
+                        "WorkerType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Command",
+                        "Role"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Job"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Job.ConnectionsList": {
+            "additionalProperties": false,
+            "properties": {
+                "Connections": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Job.ExecutionProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConcurrentRuns": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Job.JobCommand": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "PythonVersion": {
+                    "type": "string"
+                },
+                "ScriptLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Job.NotificationProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "NotifyDelayAfter": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "GlueVersion": {
+                            "type": "string"
+                        },
+                        "InputRecordTables": {
+                            "$ref": "#/definitions/AWS::Glue::MLTransform.InputRecordTables"
+                        },
+                        "MaxCapacity": {
+                            "type": "number"
+                        },
+                        "MaxRetries": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NumberOfWorkers": {
+                            "type": "number"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Timeout": {
+                            "type": "number"
+                        },
+                        "TransformEncryption": {
+                            "$ref": "#/definitions/AWS::Glue::MLTransform.TransformEncryption"
+                        },
+                        "TransformParameters": {
+                            "$ref": "#/definitions/AWS::Glue::MLTransform.TransformParameters"
+                        },
+                        "WorkerType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InputRecordTables",
+                        "Role",
+                        "TransformParameters"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::MLTransform"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.FindMatchesParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "AccuracyCostTradeoff": {
+                    "type": "number"
+                },
+                "EnforceProvidedLabels": {
+                    "type": "boolean"
+                },
+                "PrecisionRecallTradeoff": {
+                    "type": "number"
+                },
+                "PrimaryKeyColumnName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PrimaryKeyColumnName"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.GlueTables": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "ConnectionName": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.InputRecordTables": {
+            "additionalProperties": false,
+            "properties": {
+                "GlueTables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::MLTransform.GlueTables"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.MLUserDataEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MLUserDataEncryptionMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MLUserDataEncryptionMode"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.TransformEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "MLUserDataEncryption": {
+                    "$ref": "#/definitions/AWS::Glue::MLTransform.MLUserDataEncryption"
+                },
+                "TaskRunSecurityConfigurationName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.TransformParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "FindMatchesParameters": {
+                    "$ref": "#/definitions/AWS::Glue::MLTransform.FindMatchesParameters"
+                },
+                "TransformType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TransformType"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Partition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CatalogId": {
+                            "type": "string"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "PartitionInput": {
+                            "$ref": "#/definitions/AWS::Glue::Partition.PartitionInput"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CatalogId",
+                        "DatabaseName",
+                        "PartitionInput",
+                        "TableName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Partition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Partition.Column": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Partition.Order": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "type": "string"
+                },
+                "SortOrder": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Column"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Partition.PartitionInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "type": "object"
+                },
+                "StorageDescriptor": {
+                    "$ref": "#/definitions/AWS::Glue::Partition.StorageDescriptor"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Partition.SchemaId": {
+            "additionalProperties": false,
+            "properties": {
+                "RegistryName": {
+                    "type": "string"
+                },
+                "SchemaArn": {
+                    "type": "string"
+                },
+                "SchemaName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Partition.SchemaReference": {
+            "additionalProperties": false,
+            "properties": {
+                "SchemaId": {
+                    "$ref": "#/definitions/AWS::Glue::Partition.SchemaId"
+                },
+                "SchemaVersionId": {
+                    "type": "string"
+                },
+                "SchemaVersionNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Partition.SerdeInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "SerializationLibrary": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Partition.SkewedInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "SkewedColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SkewedColumnValueLocationMaps": {
+                    "type": "object"
+                },
+                "SkewedColumnValues": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Partition.StorageDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Partition.Column"
+                    },
+                    "type": "array"
+                },
+                "Compressed": {
+                    "type": "boolean"
+                },
+                "InputFormat": {
+                    "type": "string"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "NumberOfBuckets": {
+                    "type": "number"
+                },
+                "OutputFormat": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "SchemaReference": {
+                    "$ref": "#/definitions/AWS::Glue::Partition.SchemaReference"
+                },
+                "SerdeInfo": {
+                    "$ref": "#/definitions/AWS::Glue::Partition.SerdeInfo"
+                },
+                "SkewedInfo": {
+                    "$ref": "#/definitions/AWS::Glue::Partition.SkewedInfo"
+                },
+                "SortColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Partition.Order"
+                    },
+                    "type": "array"
+                },
+                "StoredAsSubDirectories": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Registry": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Registry"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Schema": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CheckpointVersion": {
+                            "$ref": "#/definitions/AWS::Glue::Schema.SchemaVersion"
+                        },
+                        "Compatibility": {
+                            "type": "string"
+                        },
+                        "DataFormat": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Registry": {
+                            "$ref": "#/definitions/AWS::Glue::Schema.Registry"
+                        },
+                        "SchemaDefinition": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Compatibility",
+                        "DataFormat",
+                        "Name",
+                        "SchemaDefinition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Schema"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Schema.Registry": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Schema.SchemaVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "IsLatest": {
+                    "type": "boolean"
+                },
+                "VersionNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SchemaVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Schema": {
+                            "$ref": "#/definitions/AWS::Glue::SchemaVersion.Schema"
+                        },
+                        "SchemaDefinition": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Schema",
+                        "SchemaDefinition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::SchemaVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::SchemaVersion.Schema": {
+            "additionalProperties": false,
+            "properties": {
+                "RegistryName": {
+                    "type": "string"
+                },
+                "SchemaArn": {
+                    "type": "string"
+                },
+                "SchemaName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SchemaVersionMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Key": {
+                            "type": "string"
+                        },
+                        "SchemaVersionId": {
+                            "type": "string"
+                        },
+                        "Value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Key",
+                        "SchemaVersionId",
+                        "Value"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::SchemaVersionMetadata"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Glue::SecurityConfiguration.EncryptionConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "EncryptionConfiguration",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::SecurityConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration.CloudWatchEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchEncryptionMode": {
+                    "type": "string"
+                },
+                "KmsKeyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchEncryption": {
+                    "$ref": "#/definitions/AWS::Glue::SecurityConfiguration.CloudWatchEncryption"
+                },
+                "JobBookmarksEncryption": {
+                    "$ref": "#/definitions/AWS::Glue::SecurityConfiguration.JobBookmarksEncryption"
+                },
+                "S3Encryptions": {
+                    "$ref": "#/definitions/AWS::Glue::SecurityConfiguration.S3Encryptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration.JobBookmarksEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "JobBookmarksEncryptionMode": {
+                    "type": "string"
+                },
+                "KmsKeyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration.S3Encryption": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyArn": {
+                    "type": "string"
+                },
+                "S3EncryptionMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration.S3Encryptions": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::Glue::Table": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CatalogId": {
+                            "type": "string"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "TableInput": {
+                            "$ref": "#/definitions/AWS::Glue::Table.TableInput"
+                        }
+                    },
+                    "required": [
+                        "CatalogId",
+                        "DatabaseName",
+                        "TableInput"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Table"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Table.Column": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Table.Order": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "type": "string"
+                },
+                "SortOrder": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Column",
+                "SortOrder"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Table.SchemaId": {
+            "additionalProperties": false,
+            "properties": {
+                "RegistryName": {
+                    "type": "string"
+                },
+                "SchemaArn": {
+                    "type": "string"
+                },
+                "SchemaName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.SchemaReference": {
+            "additionalProperties": false,
+            "properties": {
+                "SchemaId": {
+                    "$ref": "#/definitions/AWS::Glue::Table.SchemaId"
+                },
+                "SchemaVersionId": {
+                    "type": "string"
+                },
+                "SchemaVersionNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.SerdeInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "SerializationLibrary": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.SkewedInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "SkewedColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SkewedColumnValueLocationMaps": {
+                    "type": "object"
+                },
+                "SkewedColumnValues": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.StorageDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Table.Column"
+                    },
+                    "type": "array"
+                },
+                "Compressed": {
+                    "type": "boolean"
+                },
+                "InputFormat": {
+                    "type": "string"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "NumberOfBuckets": {
+                    "type": "number"
+                },
+                "OutputFormat": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "SchemaReference": {
+                    "$ref": "#/definitions/AWS::Glue::Table.SchemaReference"
+                },
+                "SerdeInfo": {
+                    "$ref": "#/definitions/AWS::Glue::Table.SerdeInfo"
+                },
+                "SkewedInfo": {
+                    "$ref": "#/definitions/AWS::Glue::Table.SkewedInfo"
+                },
+                "SortColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Table.Order"
+                    },
+                    "type": "array"
+                },
+                "StoredAsSubDirectories": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.TableIdentifier": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.TableInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Owner": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "PartitionKeys": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Table.Column"
+                    },
+                    "type": "array"
+                },
+                "Retention": {
+                    "type": "number"
+                },
+                "StorageDescriptor": {
+                    "$ref": "#/definitions/AWS::Glue::Table.StorageDescriptor"
+                },
+                "TableType": {
+                    "type": "string"
+                },
+                "TargetTable": {
+                    "$ref": "#/definitions/AWS::Glue::Table.TableIdentifier"
+                },
+                "ViewExpandedText": {
+                    "type": "string"
+                },
+                "ViewOriginalText": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Trigger": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                                "$ref": "#/definitions/AWS::Glue::Trigger.Action"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Predicate": {
+                            "$ref": "#/definitions/AWS::Glue::Trigger.Predicate"
+                        },
+                        "Schedule": {
+                            "type": "string"
+                        },
+                        "StartOnCreation": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "WorkflowName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Actions",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Trigger"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Trigger.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "Arguments": {
+                    "type": "object"
+                },
+                "CrawlerName": {
+                    "type": "string"
+                },
+                "JobName": {
+                    "type": "string"
+                },
+                "NotificationProperty": {
+                    "$ref": "#/definitions/AWS::Glue::Trigger.NotificationProperty"
+                },
+                "SecurityConfiguration": {
+                    "type": "string"
+                },
+                "Timeout": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Trigger.Condition": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlState": {
+                    "type": "string"
+                },
+                "CrawlerName": {
+                    "type": "string"
+                },
+                "JobName": {
+                    "type": "string"
+                },
+                "LogicalOperator": {
+                    "type": "string"
+                },
+                "State": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Trigger.NotificationProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "NotifyDelayAfter": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Trigger.Predicate": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Trigger.Condition"
+                    },
+                    "type": "array"
+                },
+                "Logical": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Workflow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "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::Greengrass::ConnectorDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::ConnectorDefinition.ConnectorDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::ConnectorDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ConnectorDefinition.Connector": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "ConnectorArn",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ConnectorDefinition.ConnectorDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Connectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::ConnectorDefinition.Connector"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Connectors"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ConnectorDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectorDefinitionId": {
+                            "type": "string"
+                        },
+                        "Connectors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::ConnectorDefinitionVersion.Connector"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConnectorDefinitionId",
+                        "Connectors"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::ConnectorDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ConnectorDefinitionVersion.Connector": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "ConnectorArn",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::CoreDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::CoreDefinition.CoreDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::CoreDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::CoreDefinition.Core": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "SyncShadow": {
+                    "type": "boolean"
+                },
+                "ThingArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn",
+                "Id",
+                "ThingArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::CoreDefinition.CoreDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Cores": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::CoreDefinition.Core"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Cores"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::CoreDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CoreDefinitionId": {
+                            "type": "string"
+                        },
+                        "Cores": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::CoreDefinitionVersion.Core"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CoreDefinitionId",
+                        "Cores"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::CoreDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::CoreDefinitionVersion.Core": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "SyncShadow": {
+                    "type": "boolean"
+                },
+                "ThingArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn",
+                "Id",
+                "ThingArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::DeviceDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::DeviceDefinition.DeviceDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::DeviceDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::DeviceDefinition.Device": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "SyncShadow": {
+                    "type": "boolean"
+                },
+                "ThingArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn",
+                "Id",
+                "ThingArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::DeviceDefinition.DeviceDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Devices": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::DeviceDefinition.Device"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Devices"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::DeviceDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeviceDefinitionId": {
+                            "type": "string"
+                        },
+                        "Devices": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::DeviceDefinitionVersion.Device"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DeviceDefinitionId",
+                        "Devices"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::DeviceDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::DeviceDefinitionVersion.Device": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "SyncShadow": {
+                    "type": "boolean"
+                },
+                "ThingArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn",
+                "Id",
+                "ThingArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.FunctionDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::FunctionDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.DefaultConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Execution": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.Execution"
+                }
+            },
+            "required": [
+                "Execution"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessSysfs": {
+                    "type": "boolean"
+                },
+                "Execution": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.Execution"
+                },
+                "ResourceAccessPolicies": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.ResourceAccessPolicy"
+                    },
+                    "type": "array"
+                },
+                "Variables": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.Execution": {
+            "additionalProperties": false,
+            "properties": {
+                "IsolationMode": {
+                    "type": "string"
+                },
+                "RunAs": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.RunAs"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.Function": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionArn": {
+                    "type": "string"
+                },
+                "FunctionConfiguration": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.FunctionConfiguration"
+                },
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FunctionArn",
+                "FunctionConfiguration",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.FunctionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncodingType": {
+                    "type": "string"
+                },
+                "Environment": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.Environment"
+                },
+                "ExecArgs": {
+                    "type": "string"
+                },
+                "Executable": {
+                    "type": "string"
+                },
+                "MemorySize": {
+                    "type": "number"
+                },
+                "Pinned": {
+                    "type": "boolean"
+                },
+                "Timeout": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.FunctionDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultConfig": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.DefaultConfig"
+                },
+                "Functions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.Function"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Functions"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.ResourceAccessPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Permission": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceId"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.RunAs": {
+            "additionalProperties": false,
+            "properties": {
+                "Gid": {
+                    "type": "number"
+                },
+                "Uid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DefaultConfig": {
+                            "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.DefaultConfig"
+                        },
+                        "FunctionDefinitionId": {
+                            "type": "string"
+                        },
+                        "Functions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.Function"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FunctionDefinitionId",
+                        "Functions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::FunctionDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.DefaultConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Execution": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.Execution"
+                }
+            },
+            "required": [
+                "Execution"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessSysfs": {
+                    "type": "boolean"
+                },
+                "Execution": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.Execution"
+                },
+                "ResourceAccessPolicies": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.ResourceAccessPolicy"
+                    },
+                    "type": "array"
+                },
+                "Variables": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.Execution": {
+            "additionalProperties": false,
+            "properties": {
+                "IsolationMode": {
+                    "type": "string"
+                },
+                "RunAs": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.RunAs"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.Function": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionArn": {
+                    "type": "string"
+                },
+                "FunctionConfiguration": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.FunctionConfiguration"
+                },
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FunctionArn",
+                "FunctionConfiguration",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.FunctionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncodingType": {
+                    "type": "string"
+                },
+                "Environment": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.Environment"
+                },
+                "ExecArgs": {
+                    "type": "string"
+                },
+                "Executable": {
+                    "type": "string"
+                },
+                "MemorySize": {
+                    "type": "number"
+                },
+                "Pinned": {
+                    "type": "boolean"
+                },
+                "Timeout": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.ResourceAccessPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Permission": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceId"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.RunAs": {
+            "additionalProperties": false,
+            "properties": {
+                "Gid": {
+                    "type": "number"
+                },
+                "Uid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::Group": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::Group.GroupVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::Group"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::Group.GroupVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "CoreDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "DeviceDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "FunctionDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "LoggerDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "ResourceDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "SubscriptionDefinitionVersionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::GroupVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectorDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "CoreDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "DeviceDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "FunctionDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "GroupId": {
+                            "type": "string"
+                        },
+                        "LoggerDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "ResourceDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "SubscriptionDefinitionVersionArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::GroupVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::LoggerDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::LoggerDefinition.LoggerDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::LoggerDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::LoggerDefinition.Logger": {
+            "additionalProperties": false,
+            "properties": {
+                "Component": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Level": {
+                    "type": "string"
+                },
+                "Space": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Component",
+                "Id",
+                "Level",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::LoggerDefinition.LoggerDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Loggers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::LoggerDefinition.Logger"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Loggers"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::LoggerDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LoggerDefinitionId": {
+                            "type": "string"
+                        },
+                        "Loggers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::LoggerDefinitionVersion.Logger"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "LoggerDefinitionId",
+                        "Loggers"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::LoggerDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::LoggerDefinitionVersion.Logger": {
+            "additionalProperties": false,
+            "properties": {
+                "Component": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Level": {
+                    "type": "string"
+                },
+                "Space": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Component",
+                "Id",
+                "Level",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.ResourceDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::ResourceDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.GroupOwnerSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoAddGroupOwner": {
+                    "type": "boolean"
+                },
+                "GroupOwner": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AutoAddGroupOwner"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.LocalDeviceResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupOwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.GroupOwnerSetting"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourcePath"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.LocalVolumeResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "GroupOwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.GroupOwnerSetting"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "SourcePath"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.ResourceDataContainer": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalDeviceResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.LocalDeviceResourceData"
+                },
+                "LocalVolumeResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.LocalVolumeResourceData"
+                },
+                "S3MachineLearningModelResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.S3MachineLearningModelResourceData"
+                },
+                "SageMakerMachineLearningModelResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.SageMakerMachineLearningModelResourceData"
+                },
+                "SecretsManagerSecretResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.SecretsManagerSecretResourceData"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.ResourceDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Resources": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.ResourceInstance"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Resources"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.ResourceDownloadOwnerSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupOwner": {
+                    "type": "string"
+                },
+                "GroupPermission": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupOwner",
+                "GroupPermission"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.ResourceInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "ResourceDataContainer": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.ResourceDataContainer"
+                }
+            },
+            "required": [
+                "Id",
+                "Name",
+                "ResourceDataContainer"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.S3MachineLearningModelResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "OwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.ResourceDownloadOwnerSetting"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.SageMakerMachineLearningModelResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "OwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.ResourceDownloadOwnerSetting"
+                },
+                "SageMakerJobArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "SageMakerJobArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.SecretsManagerSecretResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "ARN": {
+                    "type": "string"
+                },
+                "AdditionalStagingLabelsToDownload": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ARN"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceDefinitionId": {
+                            "type": "string"
+                        },
+                        "Resources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.ResourceInstance"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ResourceDefinitionId",
+                        "Resources"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::ResourceDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.GroupOwnerSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoAddGroupOwner": {
+                    "type": "boolean"
+                },
+                "GroupOwner": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AutoAddGroupOwner"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.LocalDeviceResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupOwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.GroupOwnerSetting"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourcePath"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.LocalVolumeResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "GroupOwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.GroupOwnerSetting"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "SourcePath"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.ResourceDataContainer": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalDeviceResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.LocalDeviceResourceData"
+                },
+                "LocalVolumeResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.LocalVolumeResourceData"
+                },
+                "S3MachineLearningModelResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.S3MachineLearningModelResourceData"
+                },
+                "SageMakerMachineLearningModelResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.SageMakerMachineLearningModelResourceData"
+                },
+                "SecretsManagerSecretResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.SecretsManagerSecretResourceData"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.ResourceDownloadOwnerSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupOwner": {
+                    "type": "string"
+                },
+                "GroupPermission": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupOwner",
+                "GroupPermission"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.ResourceInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "ResourceDataContainer": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.ResourceDataContainer"
+                }
+            },
+            "required": [
+                "Id",
+                "Name",
+                "ResourceDataContainer"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.S3MachineLearningModelResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "OwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.ResourceDownloadOwnerSetting"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.SageMakerMachineLearningModelResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "OwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.ResourceDownloadOwnerSetting"
+                },
+                "SageMakerJobArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "SageMakerJobArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.SecretsManagerSecretResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "ARN": {
+                    "type": "string"
+                },
+                "AdditionalStagingLabelsToDownload": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ARN"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::SubscriptionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::SubscriptionDefinition.SubscriptionDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::SubscriptionDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::SubscriptionDefinition.Subscription": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Subject": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id",
+                "Source",
+                "Subject",
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::SubscriptionDefinition.SubscriptionDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Subscriptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::SubscriptionDefinition.Subscription"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Subscriptions"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::SubscriptionDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SubscriptionDefinitionId": {
+                            "type": "string"
+                        },
+                        "Subscriptions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::SubscriptionDefinitionVersion.Subscription"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubscriptionDefinitionId",
+                        "Subscriptions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::SubscriptionDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::SubscriptionDefinitionVersion.Subscription": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Subject": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id",
+                "Source",
+                "Subject",
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InlineRecipe": {
+                            "type": "string"
+                        },
+                        "LambdaFunction": {
+                            "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaFunctionRecipeSource"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GreengrassV2::ComponentVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.ComponentDependencyRequirement": {
+            "additionalProperties": false,
+            "properties": {
+                "DependencyType": {
+                    "type": "string"
+                },
+                "VersionRequirement": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.ComponentPlatform": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaContainerParams": {
+            "additionalProperties": false,
+            "properties": {
+                "Devices": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaDeviceMount"
+                    },
+                    "type": "array"
+                },
+                "MemorySizeInKB": {
+                    "type": "number"
+                },
+                "MountROSysfs": {
+                    "type": "boolean"
+                },
+                "Volumes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaVolumeMount"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaDeviceMount": {
+            "additionalProperties": false,
+            "properties": {
+                "AddGroupOwner": {
+                    "type": "boolean"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Permission": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaEventSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Topic": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaExecutionParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "EnvironmentVariables": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "EventSources": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaEventSource"
+                    },
+                    "type": "array"
+                },
+                "ExecArgs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InputPayloadEncodingType": {
+                    "type": "string"
+                },
+                "LinuxProcessParams": {
+                    "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaLinuxProcessParams"
+                },
+                "MaxIdleTimeInSeconds": {
+                    "type": "number"
+                },
+                "MaxInstancesCount": {
+                    "type": "number"
+                },
+                "MaxQueueSize": {
+                    "type": "number"
+                },
+                "Pinned": {
+                    "type": "boolean"
+                },
+                "StatusTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "TimeoutInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaFunctionRecipeSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentDependencies": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.ComponentDependencyRequirement"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ComponentLambdaParameters": {
+                    "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaExecutionParameters"
+                },
+                "ComponentName": {
+                    "type": "string"
+                },
+                "ComponentPlatforms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.ComponentPlatform"
+                    },
+                    "type": "array"
+                },
+                "ComponentVersion": {
+                    "type": "string"
+                },
+                "LambdaArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaLinuxProcessParams": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerParams": {
+                    "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaContainerParams"
+                },
+                "IsolationMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaVolumeMount": {
+            "additionalProperties": false,
+            "properties": {
+                "AddGroupOwner": {
+                    "type": "boolean"
+                },
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "Permission": {
+                    "type": "string"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigData": {
+                            "$ref": "#/definitions/AWS::GroundStation::Config.ConfigData"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConfigData",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GroundStation::Config"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.AntennaDownlinkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SpectrumConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.SpectrumConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.AntennaDownlinkDemodDecodeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DecodeConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.DecodeConfig"
+                },
+                "DemodulationConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.DemodulationConfig"
+                },
+                "SpectrumConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.SpectrumConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.AntennaUplinkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SpectrumConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.UplinkSpectrumConfig"
+                },
+                "TargetEirp": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.Eirp"
+                },
+                "TransmitDisabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.ConfigData": {
+            "additionalProperties": false,
+            "properties": {
+                "AntennaDownlinkConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.AntennaDownlinkConfig"
+                },
+                "AntennaDownlinkDemodDecodeConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.AntennaDownlinkDemodDecodeConfig"
+                },
+                "AntennaUplinkConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.AntennaUplinkConfig"
+                },
+                "DataflowEndpointConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.DataflowEndpointConfig"
+                },
+                "S3RecordingConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.S3RecordingConfig"
+                },
+                "TrackingConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.TrackingConfig"
+                },
+                "UplinkEchoConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.UplinkEchoConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.DataflowEndpointConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DataflowEndpointName": {
+                    "type": "string"
+                },
+                "DataflowEndpointRegion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.DecodeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "UnvalidatedJSON": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.DemodulationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "UnvalidatedJSON": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.Eirp": {
+            "additionalProperties": false,
+            "properties": {
+                "Units": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.Frequency": {
+            "additionalProperties": false,
+            "properties": {
+                "Units": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.FrequencyBandwidth": {
+            "additionalProperties": false,
+            "properties": {
+                "Units": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.S3RecordingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.SpectrumConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Bandwidth": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.FrequencyBandwidth"
+                },
+                "CenterFrequency": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.Frequency"
+                },
+                "Polarization": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.TrackingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Autotrack": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.UplinkEchoConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AntennaUplinkConfigArn": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.UplinkSpectrumConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CenterFrequency": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.Frequency"
+                },
+                "Polarization": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::DataflowEndpointGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EndpointDetails": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GroundStation::DataflowEndpointGroup.EndpointDetails"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EndpointDetails"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GroundStation::DataflowEndpointGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GroundStation::DataflowEndpointGroup.DataflowEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "$ref": "#/definitions/AWS::GroundStation::DataflowEndpointGroup.SocketAddress"
+                },
+                "Mtu": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::DataflowEndpointGroup.EndpointDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "$ref": "#/definitions/AWS::GroundStation::DataflowEndpointGroup.DataflowEndpoint"
+                },
+                "SecurityDetails": {
+                    "$ref": "#/definitions/AWS::GroundStation::DataflowEndpointGroup.SecurityDetails"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::DataflowEndpointGroup.SecurityDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::DataflowEndpointGroup.SocketAddress": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::MissionProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContactPostPassDurationSeconds": {
+                            "type": "number"
+                        },
+                        "ContactPrePassDurationSeconds": {
+                            "type": "number"
+                        },
+                        "DataflowEdges": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GroundStation::MissionProfile.DataflowEdge"
+                            },
+                            "type": "array"
+                        },
+                        "MinimumViableContactDurationSeconds": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrackingConfigArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DataflowEdges",
+                        "MinimumViableContactDurationSeconds",
+                        "Name",
+                        "TrackingConfigArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GroundStation::MissionProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GroundStation::MissionProfile.DataflowEdge": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::Detector": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataSources": {
+                            "$ref": "#/definitions/AWS::GuardDuty::Detector.CFNDataSourceConfigurations"
+                        },
+                        "Enable": {
+                            "type": "boolean"
+                        },
+                        "FindingPublishingFrequency": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Enable"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::Detector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Detector.CFNDataSourceConfigurations": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Logs": {
+                    "$ref": "#/definitions/AWS::GuardDuty::Detector.CFNS3LogsConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::Detector.CFNS3LogsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enable": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::Filter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "FindingCriteria": {
+                            "$ref": "#/definitions/AWS::GuardDuty::Filter.FindingCriteria"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Rank": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Action",
+                        "Description",
+                        "DetectorId",
+                        "FindingCriteria",
+                        "Name",
+                        "Rank"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::Filter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Filter.Condition": {
+            "additionalProperties": false,
+            "properties": {
+                "Eq": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Gte": {
+                    "type": "number"
+                },
+                "Lt": {
+                    "type": "number"
+                },
+                "Lte": {
+                    "type": "number"
+                },
+                "Neq": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::Filter.FindingCriteria": {
+            "additionalProperties": false,
+            "properties": {
+                "Criterion": {
+                    "type": "object"
+                },
+                "ItemType": {
+                    "$ref": "#/definitions/AWS::GuardDuty::Filter.Condition"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::IPSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Activate": {
+                            "type": "boolean"
+                        },
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "Format": {
+                            "type": "string"
+                        },
+                        "Location": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Activate",
+                        "DetectorId",
+                        "Format",
+                        "Location"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::IPSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Master": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "InvitationId": {
+                            "type": "string"
+                        },
+                        "MasterId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DetectorId",
+                        "MasterId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::Master"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Member": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "DisableEmailNotification": {
+                            "type": "boolean"
+                        },
+                        "Email": {
+                            "type": "string"
+                        },
+                        "MemberId": {
+                            "type": "string"
+                        },
+                        "Message": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DetectorId",
+                        "Email",
+                        "MemberId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::Member"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::ThreatIntelSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Activate": {
+                            "type": "boolean"
+                        },
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "Format": {
+                            "type": "string"
+                        },
+                        "Location": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Activate",
+                        "DetectorId",
+                        "Format",
+                        "Location"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::ThreatIntelSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DatastoreTypeVersion": {
+                            "type": "string"
+                        },
+                        "PreloadDataConfig": {
+                            "$ref": "#/definitions/AWS::HealthLake::FHIRDatastore.PreloadDataConfig"
+                        },
+                        "SseConfiguration": {
+                            "$ref": "#/definitions/AWS::HealthLake::FHIRDatastore.SseConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DatastoreTypeVersion"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::HealthLake::FHIRDatastore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore.KmsEncryptionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CmkType": {
+                    "type": "string"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CmkType"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore.PreloadDataConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "PreloadDataType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PreloadDataType"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore.SseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsEncryptionConfig": {
+                    "$ref": "#/definitions/AWS::HealthLake::FHIRDatastore.KmsEncryptionConfig"
+                }
+            },
+            "required": [
+                "KmsEncryptionConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::AccessKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Serial": {
+                            "type": "number"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::AccessKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::Group": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "ManagedPolicyArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IAM::Group.Policy"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::Group"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::Group.Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "PolicyDocument": {
+                    "type": "object"
+                },
+                "PolicyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PolicyDocument",
+                "PolicyName"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::InstanceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InstanceProfileName": {
+                            "type": "string"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "Roles": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Roles"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::InstanceProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::ManagedPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Groups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ManagedPolicyName": {
+                            "type": "string"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "Roles": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Users": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::ManagedPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::OIDCProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClientIdList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThumbprintList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Url": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ThumbprintList"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::OIDCProvider"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Groups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "PolicyName": {
+                            "type": "string"
+                        },
+                        "Roles": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Users": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument",
+                        "PolicyName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::Policy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::Role": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssumeRolePolicyDocument": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ManagedPolicyArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MaxSessionDuration": {
+                            "type": "number"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "PermissionsBoundary": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IAM::Role.Policy"
+                            },
+                            "type": "array"
+                        },
+                        "RoleName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AssumeRolePolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::Role"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::Role.Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "PolicyDocument": {
+                    "type": "object"
+                },
+                "PolicyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PolicyDocument",
+                "PolicyName"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::SAMLProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SamlMetadataDocument": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SamlMetadataDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::SAMLProvider"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::ServerCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CertificateBody": {
+                            "type": "string"
+                        },
+                        "CertificateChain": {
+                            "type": "string"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "PrivateKey": {
+                            "type": "string"
+                        },
+                        "ServerCertificateName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::ServerCertificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::ServiceLinkedRole": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AWSServiceName": {
+                            "type": "string"
+                        },
+                        "CustomSuffix": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AWSServiceName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::ServiceLinkedRole"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Groups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LoginProfile": {
+                            "$ref": "#/definitions/AWS::IAM::User.LoginProfile"
+                        },
+                        "ManagedPolicyArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "PermissionsBoundary": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IAM::User.Policy"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::User.LoginProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "PasswordResetRequired": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Password"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::User.Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "PolicyDocument": {
+                    "type": "object"
+                },
+                "PolicyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PolicyDocument",
+                "PolicyName"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::UserToGroupAddition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "Users": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "GroupName",
+                        "Users"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::UserToGroupAddition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::VirtualMFADevice": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Path": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Users": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualMfaDeviceName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Users"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::VirtualMFADevice"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Authorized": {
+                            "type": "boolean"
+                        },
+                        "LatencyMode": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RecordingConfigurationArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::Channel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::PlaybackKeyPair": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "PublicKeyMaterial": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PublicKeyMaterial"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::PlaybackKeyPair"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::RecordingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.DestinationConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DestinationConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::RecordingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::RecordingConfiguration.DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.S3DestinationConfiguration"
+                }
+            },
+            "required": [
+                "S3"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::RecordingConfiguration.S3DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StreamKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ChannelArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ChannelArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::StreamKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::Component": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ChangeDescription": {
+                            "type": "string"
+                        },
+                        "Data": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Platform": {
+                            "type": "string"
+                        },
+                        "SupportedOsVersions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Uri": {
+                            "type": "string"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Platform",
+                        "Version"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::Component"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Components": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe.ComponentConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "ContainerType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DockerfileTemplateData": {
+                            "type": "string"
+                        },
+                        "DockerfileTemplateUri": {
+                            "type": "string"
+                        },
+                        "ImageOsVersionOverride": {
+                            "type": "string"
+                        },
+                        "InstanceConfiguration": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe.InstanceConfiguration"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParentImage": {
+                            "type": "string"
+                        },
+                        "PlatformOverride": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "TargetRepository": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe.TargetContainerRepository"
+                        },
+                        "Version": {
+                            "type": "string"
+                        },
+                        "WorkingDirectory": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Components",
+                        "ContainerType",
+                        "Name",
+                        "ParentImage",
+                        "TargetRepository",
+                        "Version"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::ContainerRecipe"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe.ComponentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe.EbsInstanceBlockDeviceSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "Throughput": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe.InstanceBlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe.EbsInstanceBlockDeviceSpecification"
+                },
+                "NoDevice": {
+                    "type": "string"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe.InstanceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockDeviceMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe.InstanceBlockDeviceMapping"
+                    },
+                    "type": "array"
+                },
+                "Image": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe.TargetContainerRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "RepositoryName": {
+                    "type": "string"
+                },
+                "Service": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::DistributionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Distributions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ImageBuilder::DistributionConfiguration.Distribution"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Distributions",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::DistributionConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::DistributionConfiguration.Distribution": {
+            "additionalProperties": false,
+            "properties": {
+                "AmiDistributionConfiguration": {
+                    "type": "object"
+                },
+                "ContainerDistributionConfiguration": {
+                    "type": "object"
+                },
+                "LaunchTemplateConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ImageBuilder::DistributionConfiguration.LaunchTemplateConfiguration"
+                    },
+                    "type": "array"
+                },
+                "LicenseConfigurationArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::DistributionConfiguration.LaunchTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "SetDefaultVersion": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::Image": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContainerRecipeArn": {
+                            "type": "string"
+                        },
+                        "DistributionConfigurationArn": {
+                            "type": "string"
+                        },
+                        "EnhancedImageMetadataEnabled": {
+                            "type": "boolean"
+                        },
+                        "ImageRecipeArn": {
+                            "type": "string"
+                        },
+                        "ImageTestsConfiguration": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::Image.ImageTestsConfiguration"
+                        },
+                        "InfrastructureConfigurationArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "InfrastructureConfigurationArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::Image"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::Image.ImageTestsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ImageTestsEnabled": {
+                    "type": "boolean"
+                },
+                "TimeoutMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImagePipeline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContainerRecipeArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DistributionConfigurationArn": {
+                            "type": "string"
+                        },
+                        "EnhancedImageMetadataEnabled": {
+                            "type": "boolean"
+                        },
+                        "ImageRecipeArn": {
+                            "type": "string"
+                        },
+                        "ImageTestsConfiguration": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ImagePipeline.ImageTestsConfiguration"
+                        },
+                        "InfrastructureConfigurationArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ImagePipeline.Schedule"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "InfrastructureConfigurationArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::ImagePipeline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImagePipeline.ImageTestsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ImageTestsEnabled": {
+                    "type": "boolean"
+                },
+                "TimeoutMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImagePipeline.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "PipelineExecutionStartCondition": {
+                    "type": "string"
+                },
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdditionalInstanceConfiguration": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.AdditionalInstanceConfiguration"
+                        },
+                        "BlockDeviceMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.InstanceBlockDeviceMapping"
+                            },
+                            "type": "array"
+                        },
+                        "Components": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.ComponentConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParentImage": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Version": {
+                            "type": "string"
+                        },
+                        "WorkingDirectory": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Components",
+                        "Name",
+                        "ParentImage",
+                        "Version"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::ImageRecipe"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.AdditionalInstanceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SystemsManagerAgent": {
+                    "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.SystemsManagerAgent"
+                },
+                "UserDataOverride": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.ComponentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentArn": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.ComponentParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.ComponentParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.EbsInstanceBlockDeviceSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "Throughput": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.InstanceBlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.EbsInstanceBlockDeviceSpecification"
+                },
+                "NoDevice": {
+                    "type": "string"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.SystemsManagerAgent": {
+            "additionalProperties": false,
+            "properties": {
+                "UninstallAfterBuild": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::InfrastructureConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "InstanceMetadataOptions": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::InfrastructureConfiguration.InstanceMetadataOptions"
+                        },
+                        "InstanceProfileName": {
+                            "type": "string"
+                        },
+                        "InstanceTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "KeyPair": {
+                            "type": "string"
+                        },
+                        "Logging": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::InfrastructureConfiguration.Logging"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResourceTags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "TerminateInstanceOnFailure": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "InstanceProfileName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::InfrastructureConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::InfrastructureConfiguration.InstanceMetadataOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpPutResponseHopLimit": {
+                    "type": "number"
+                },
+                "HttpTokens": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::InfrastructureConfiguration.Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Logs": {
+                    "$ref": "#/definitions/AWS::ImageBuilder::InfrastructureConfiguration.S3Logs"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::InfrastructureConfiguration.S3Logs": {
+            "additionalProperties": false,
+            "properties": {
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3KeyPrefix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Inspector::AssessmentTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssessmentTargetName": {
+                            "type": "string"
+                        },
+                        "ResourceGroupArn": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Inspector::AssessmentTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Inspector::AssessmentTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssessmentTargetArn": {
+                            "type": "string"
+                        },
+                        "AssessmentTemplateName": {
+                            "type": "string"
+                        },
+                        "DurationInSeconds": {
+                            "type": "number"
+                        },
+                        "RulesPackageArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "UserAttributesForFindings": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AssessmentTargetArn",
+                        "DurationInSeconds",
+                        "RulesPackageArns"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Inspector::AssessmentTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Inspector::ResourceGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceGroupTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ResourceGroupTags"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Inspector::ResourceGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT1Click::Device": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeviceId": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "DeviceId",
+                        "Enabled"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT1Click::Device"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT1Click::Placement": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatedDevices": {
+                            "type": "object"
+                        },
+                        "Attributes": {
+                            "type": "object"
+                        },
+                        "PlacementName": {
+                            "type": "string"
+                        },
+                        "ProjectName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProjectName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT1Click::Placement"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT1Click::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "PlacementTemplate": {
+                            "$ref": "#/definitions/AWS::IoT1Click::Project.PlacementTemplate"
+                        },
+                        "ProjectName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PlacementTemplate"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT1Click::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT1Click::Project.DeviceTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "CallbackOverrides": {
+                    "type": "object"
+                },
+                "DeviceType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT1Click::Project.PlacementTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultAttributes": {
+                    "type": "object"
+                },
+                "DeviceTemplates": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::AccountAuditConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountId": {
+                            "type": "string"
+                        },
+                        "AuditCheckConfigurations": {
+                            "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfigurations"
+                        },
+                        "AuditNotificationTargetConfigurations": {
+                            "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditNotificationTargetConfigurations"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AccountId",
+                        "AuditCheckConfigurations",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::AccountAuditConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::AccountAuditConfiguration.AuditCheckConfigurations": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticatedCognitoRoleOverlyPermissiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "CaCertificateExpiringCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "CaCertificateKeyQualityCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "ConflictingClientIdsCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "DeviceCertificateExpiringCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "DeviceCertificateKeyQualityCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "DeviceCertificateSharedCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "IotPolicyOverlyPermissiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "IotRoleAliasAllowsAccessToUnusedServicesCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "IotRoleAliasOverlyPermissiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "LoggingDisabledCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "RevokedCaCertificateStillActiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "RevokedDeviceCertificateStillActiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "UnauthenticatedCognitoRoleOverlyPermissiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::AccountAuditConfiguration.AuditNotificationTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TargetArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::AccountAuditConfiguration.AuditNotificationTargetConfigurations": {
+            "additionalProperties": false,
+            "properties": {
+                "Sns": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditNotificationTarget"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::Authorizer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthorizerFunctionArn": {
+                            "type": "string"
+                        },
+                        "AuthorizerName": {
+                            "type": "string"
+                        },
+                        "SigningDisabled": {
+                            "type": "boolean"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TokenKeyName": {
+                            "type": "string"
+                        },
+                        "TokenSigningPublicKeys": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "AuthorizerFunctionArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Authorizer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CACertificatePem": {
+                            "type": "string"
+                        },
+                        "CertificateMode": {
+                            "type": "string"
+                        },
+                        "CertificatePem": {
+                            "type": "string"
+                        },
+                        "CertificateSigningRequest": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Status"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Certificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::CustomMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "MetricType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MetricType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::CustomMetric"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "StringValues": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "StringValues",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Dimension"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::DomainConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthorizerConfig": {
+                            "$ref": "#/definitions/AWS::IoT::DomainConfiguration.AuthorizerConfig"
+                        },
+                        "DomainConfigurationName": {
+                            "type": "string"
+                        },
+                        "DomainConfigurationStatus": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "ServerCertificateArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ValidationCertificateArn": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::DomainConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::DomainConfiguration.AuthorizerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowAuthorizerOverride": {
+                    "type": "boolean"
+                },
+                "DefaultAuthorizerName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::DomainConfiguration.ServerCertificateSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "ServerCertificateArn": {
+                    "type": "string"
+                },
+                "ServerCertificateStatus": {
+                    "type": "string"
+                },
+                "ServerCertificateStatusDetail": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::FleetMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AggregationField": {
+                            "type": "string"
+                        },
+                        "AggregationType": {
+                            "$ref": "#/definitions/AWS::IoT::FleetMetric.AggregationType"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IndexName": {
+                            "type": "string"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Period": {
+                            "type": "number"
+                        },
+                        "QueryString": {
+                            "type": "string"
+                        },
+                        "QueryVersion": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Unit": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MetricName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::FleetMetric"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::FleetMetric.AggregationType": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::JobTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AbortConfig": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Document": {
+                            "type": "string"
+                        },
+                        "DocumentSource": {
+                            "type": "string"
+                        },
+                        "JobArn": {
+                            "type": "string"
+                        },
+                        "JobExecutionsRolloutConfig": {
+                            "type": "object"
+                        },
+                        "JobTemplateId": {
+                            "type": "string"
+                        },
+                        "PresignedUrlConfig": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeoutConfig": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "JobTemplateId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::JobTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountId": {
+                            "type": "string"
+                        },
+                        "DefaultLogLevel": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AccountId",
+                        "DefaultLogLevel",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Logging"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ActionName": {
+                            "type": "string"
+                        },
+                        "ActionParams": {
+                            "$ref": "#/definitions/AWS::IoT::MitigationAction.ActionParams"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ActionParams",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::MitigationAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.ActionParams": {
+            "additionalProperties": false,
+            "properties": {
+                "AddThingsToThingGroupParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.AddThingsToThingGroupParams"
+                },
+                "EnableIoTLoggingParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.EnableIoTLoggingParams"
+                },
+                "PublishFindingToSnsParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.PublishFindingToSnsParams"
+                },
+                "ReplaceDefaultPolicyVersionParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.ReplaceDefaultPolicyVersionParams"
+                },
+                "UpdateCACertificateParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.UpdateCACertificateParams"
+                },
+                "UpdateDeviceCertificateParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.UpdateDeviceCertificateParams"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.AddThingsToThingGroupParams": {
+            "additionalProperties": false,
+            "properties": {
+                "OverrideDynamicGroups": {
+                    "type": "boolean"
+                },
+                "ThingGroupNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ThingGroupNames"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.EnableIoTLoggingParams": {
+            "additionalProperties": false,
+            "properties": {
+                "LogLevel": {
+                    "type": "string"
+                },
+                "RoleArnForLogging": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogLevel",
+                "RoleArnForLogging"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.PublishFindingToSnsParams": {
+            "additionalProperties": false,
+            "properties": {
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.ReplaceDefaultPolicyVersionParams": {
+            "additionalProperties": false,
+            "properties": {
+                "TemplateName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TemplateName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.UpdateCACertificateParams": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.UpdateDeviceCertificateParams": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "PolicyName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Policy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::PolicyPrincipalAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyName": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PolicyName",
+                        "Principal"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::PolicyPrincipalAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::ProvisioningTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "PreProvisioningHook": {
+                            "$ref": "#/definitions/AWS::IoT::ProvisioningTemplate.ProvisioningHook"
+                        },
+                        "ProvisioningRoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateBody": {
+                            "type": "string"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProvisioningRoleArn",
+                        "TemplateBody"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::ProvisioningTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::ProvisioningTemplate.ProvisioningHook": {
+            "additionalProperties": false,
+            "properties": {
+                "PayloadVersion": {
+                    "type": "string"
+                },
+                "TargetArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::ResourceSpecificLogging": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LogLevel": {
+                            "type": "string"
+                        },
+                        "TargetName": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LogLevel",
+                        "TargetName",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::ResourceSpecificLogging"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::ScheduledAudit": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DayOfMonth": {
+                            "type": "string"
+                        },
+                        "DayOfWeek": {
+                            "type": "string"
+                        },
+                        "Frequency": {
+                            "type": "string"
+                        },
+                        "ScheduledAuditName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetCheckNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Frequency",
+                        "TargetCheckNames"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::ScheduledAudit"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdditionalMetricsToRetainV2": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoT::SecurityProfile.MetricToRetain"
+                            },
+                            "type": "array"
+                        },
+                        "AlertTargets": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.AlertTarget"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Behaviors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoT::SecurityProfile.Behavior"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityProfileDescription": {
+                            "type": "string"
+                        },
+                        "SecurityProfileName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::SecurityProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.AlertTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "AlertTargetArn": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AlertTargetArn",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.Behavior": {
+            "additionalProperties": false,
+            "properties": {
+                "Criteria": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.BehaviorCriteria"
+                },
+                "Metric": {
+                    "type": "string"
+                },
+                "MetricDimension": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.MetricDimension"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SuppressAlerts": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.BehaviorCriteria": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "ConsecutiveDatapointsToAlarm": {
+                    "type": "number"
+                },
+                "ConsecutiveDatapointsToClear": {
+                    "type": "number"
+                },
+                "DurationSeconds": {
+                    "type": "number"
+                },
+                "MlDetectionConfig": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.MachineLearningDetectionConfig"
+                },
+                "StatisticalThreshold": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.StatisticalThreshold"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.MetricValue"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.MachineLearningDetectionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfidenceLevel": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionName": {
+                    "type": "string"
+                },
+                "Operator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DimensionName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.MetricToRetain": {
+            "additionalProperties": false,
+            "properties": {
+                "Metric": {
+                    "type": "string"
+                },
+                "MetricDimension": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.MetricDimension"
+                }
+            },
+            "required": [
+                "Metric"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.MetricValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidrs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Count": {
+                    "type": "string"
+                },
+                "Number": {
+                    "type": "number"
+                },
+                "Numbers": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Ports": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Strings": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.StatisticalThreshold": {
+            "additionalProperties": false,
+            "properties": {
+                "Statistic": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::Thing": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AttributePayload": {
+                            "$ref": "#/definitions/AWS::IoT::Thing.AttributePayload"
+                        },
+                        "ThingName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Thing"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::Thing.AttributePayload": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::ThingPrincipalAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Principal": {
+                            "type": "string"
+                        },
+                        "ThingName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Principal",
+                        "ThingName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::ThingPrincipalAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RuleName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TopicRulePayload": {
+                            "$ref": "#/definitions/AWS::IoT::TopicRule.TopicRulePayload"
+                        }
+                    },
+                    "required": [
+                        "TopicRulePayload"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::TopicRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudwatchAlarm": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.CloudwatchAlarmAction"
+                },
+                "CloudwatchLogs": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.CloudwatchLogsAction"
+                },
+                "CloudwatchMetric": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.CloudwatchMetricAction"
+                },
+                "DynamoDB": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.DynamoDBAction"
+                },
+                "DynamoDBv2": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.DynamoDBv2Action"
+                },
+                "Elasticsearch": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.ElasticsearchAction"
+                },
+                "Firehose": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.FirehoseAction"
+                },
+                "Http": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.HttpAction"
+                },
+                "IotAnalytics": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.IotAnalyticsAction"
+                },
+                "IotEvents": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.IotEventsAction"
+                },
+                "IotSiteWise": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.IotSiteWiseAction"
+                },
+                "Kafka": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.KafkaAction"
+                },
+                "Kinesis": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.KinesisAction"
+                },
+                "Lambda": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.LambdaAction"
+                },
+                "OpenSearch": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.OpenSearchAction"
+                },
+                "Republish": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.RepublishAction"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.S3Action"
+                },
+                "Sns": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.SnsAction"
+                },
+                "Sqs": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.SqsAction"
+                },
+                "StepFunctions": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.StepFunctionsAction"
+                },
+                "Timestream": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.TimestreamAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.AssetPropertyTimestamp": {
+            "additionalProperties": false,
+            "properties": {
+                "OffsetInNanos": {
+                    "type": "string"
+                },
+                "TimeInSeconds": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.AssetPropertyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Quality": {
+                    "type": "string"
+                },
+                "Timestamp": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.AssetPropertyTimestamp"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.AssetPropertyVariant"
+                }
+            },
+            "required": [
+                "Timestamp",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.AssetPropertyVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanValue": {
+                    "type": "string"
+                },
+                "DoubleValue": {
+                    "type": "string"
+                },
+                "IntegerValue": {
+                    "type": "string"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.CloudwatchAlarmAction": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StateReason": {
+                    "type": "string"
+                },
+                "StateValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AlarmName",
+                "RoleArn",
+                "StateReason",
+                "StateValue"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.CloudwatchLogsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogGroupName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.CloudwatchMetricAction": {
+            "additionalProperties": false,
+            "properties": {
+                "MetricName": {
+                    "type": "string"
+                },
+                "MetricNamespace": {
+                    "type": "string"
+                },
+                "MetricTimestamp": {
+                    "type": "string"
+                },
+                "MetricUnit": {
+                    "type": "string"
+                },
+                "MetricValue": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "MetricNamespace",
+                "MetricUnit",
+                "MetricValue",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.DynamoDBAction": {
+            "additionalProperties": false,
+            "properties": {
+                "HashKeyField": {
+                    "type": "string"
+                },
+                "HashKeyType": {
+                    "type": "string"
+                },
+                "HashKeyValue": {
+                    "type": "string"
+                },
+                "PayloadField": {
+                    "type": "string"
+                },
+                "RangeKeyField": {
+                    "type": "string"
+                },
+                "RangeKeyType": {
+                    "type": "string"
+                },
+                "RangeKeyValue": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HashKeyField",
+                "HashKeyValue",
+                "RoleArn",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.DynamoDBv2Action": {
+            "additionalProperties": false,
+            "properties": {
+                "PutItem": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.PutItemInput"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.ElasticsearchAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Index": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint",
+                "Id",
+                "Index",
+                "RoleArn",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.FirehoseAction": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchMode": {
+                    "type": "boolean"
+                },
+                "DeliveryStreamName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "Separator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStreamName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.HttpAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Auth": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.HttpAuthorization"
+                },
+                "ConfirmationUrl": {
+                    "type": "string"
+                },
+                "Headers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoT::TopicRule.HttpActionHeader"
+                    },
+                    "type": "array"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.HttpActionHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.HttpAuthorization": {
+            "additionalProperties": false,
+            "properties": {
+                "Sigv4": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.SigV4Authorization"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.IotAnalyticsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchMode": {
+                    "type": "boolean"
+                },
+                "ChannelName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ChannelName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.IotEventsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchMode": {
+                    "type": "boolean"
+                },
+                "InputName": {
+                    "type": "string"
+                },
+                "MessageId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.IotSiteWiseAction": {
+            "additionalProperties": false,
+            "properties": {
+                "PutAssetPropertyValueEntries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoT::TopicRule.PutAssetPropertyValueEntry"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PutAssetPropertyValueEntries",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.KafkaAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientProperties": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Partition": {
+                    "type": "string"
+                },
+                "Topic": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClientProperties",
+                "DestinationArn",
+                "Topic"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.KinesisAction": {
+            "additionalProperties": false,
+            "properties": {
+                "PartitionKey": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StreamName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "StreamName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.LambdaAction": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.OpenSearchAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Index": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint",
+                "Id",
+                "Index",
+                "RoleArn",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.PutAssetPropertyValueEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "AssetId": {
+                    "type": "string"
+                },
+                "EntryId": {
+                    "type": "string"
+                },
+                "PropertyAlias": {
+                    "type": "string"
+                },
+                "PropertyId": {
+                    "type": "string"
+                },
+                "PropertyValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoT::TopicRule.AssetPropertyValue"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "PropertyValues"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.PutItemInput": {
+            "additionalProperties": false,
+            "properties": {
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.RepublishAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Qos": {
+                    "type": "number"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "Topic": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "Topic"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.S3Action": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "CannedAcl": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName",
+                "Key",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.SigV4Authorization": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                },
+                "SigningRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "ServiceName",
+                "SigningRegion"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.SnsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "MessageFormat": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TargetArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "TargetArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.SqsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "QueueUrl": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "UseBase64": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "QueueUrl",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.StepFunctionsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionNamePrefix": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StateMachineName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "StateMachineName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.TimestreamAction": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchMode": {
+                    "type": "boolean"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoT::TopicRule.TimestreamDimension"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "Timestamp": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.TimestreamTimestamp"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "Dimensions",
+                "RoleArn",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.TimestreamDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.TimestreamTimestamp": {
+            "additionalProperties": false,
+            "properties": {
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Unit",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.TopicRulePayload": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoT::TopicRule.Action"
+                    },
+                    "type": "array"
+                },
+                "AwsIotSqlVersion": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "ErrorAction": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.Action"
+                },
+                "RuleDisabled": {
+                    "type": "boolean"
+                },
+                "Sql": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Sql"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRuleDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HttpUrlProperties": {
+                            "$ref": "#/definitions/AWS::IoT::TopicRuleDestination.HttpUrlDestinationSummary"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "VpcProperties": {
+                            "$ref": "#/definitions/AWS::IoT::TopicRuleDestination.VpcDestinationProperties"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::TopicRuleDestination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRuleDestination.HttpUrlDestinationSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfirmationUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRuleDestination.VpcDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ChannelName": {
+                            "type": "string"
+                        },
+                        "ChannelStorage": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Channel.ChannelStorage"
+                        },
+                        "RetentionPeriod": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Channel.RetentionPeriod"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTAnalytics::Channel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Channel.ChannelStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomerManagedS3": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Channel.CustomerManagedS3"
+                },
+                "ServiceManagedS3": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Channel.ServiceManagedS3"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Channel.CustomerManagedS3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "KeyPrefix": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Channel.RetentionPeriod": {
+            "additionalProperties": false,
+            "properties": {
+                "NumberOfDays": {
+                    "type": "number"
+                },
+                "Unlimited": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Channel.ServiceManagedS3": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                                "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.Action"
+                            },
+                            "type": "array"
+                        },
+                        "ContentDeliveryRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRule"
+                            },
+                            "type": "array"
+                        },
+                        "DatasetName": {
+                            "type": "string"
+                        },
+                        "LateDataRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.LateDataRule"
+                            },
+                            "type": "array"
+                        },
+                        "RetentionPeriod": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.RetentionPeriod"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Triggers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.Trigger"
+                            },
+                            "type": "array"
+                        },
+                        "VersioningConfiguration": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.VersioningConfiguration"
+                        }
+                    },
+                    "required": [
+                        "Actions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTAnalytics::Dataset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionName": {
+                    "type": "string"
+                },
+                "ContainerAction": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.ContainerAction"
+                },
+                "QueryAction": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.QueryAction"
+                }
+            },
+            "required": [
+                "ActionName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.ContainerAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRoleArn": {
+                    "type": "string"
+                },
+                "Image": {
+                    "type": "string"
+                },
+                "ResourceConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.ResourceConfiguration"
+                },
+                "Variables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.Variable"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ExecutionRoleArn",
+                "Image",
+                "ResourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRuleDestination"
+                },
+                "EntryName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRuleDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "IotEventsDestinationConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.IotEventsDestinationConfiguration"
+                },
+                "S3DestinationConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.S3DestinationConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.DatasetContentVersionValue": {
+            "additionalProperties": false,
+            "properties": {
+                "DatasetName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.DeltaTime": {
+            "additionalProperties": false,
+            "properties": {
+                "OffsetSeconds": {
+                    "type": "number"
+                },
+                "TimeExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OffsetSeconds",
+                "TimeExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.DeltaTimeSessionWindowConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "TimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TimeoutInMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.Filter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeltaTime": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.DeltaTime"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.GlueConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.IotEventsDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.LateDataRule": {
+            "additionalProperties": false,
+            "properties": {
+                "RuleConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.LateDataRuleConfiguration"
+                },
+                "RuleName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RuleConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.LateDataRuleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeltaTimeSessionWindowConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.DeltaTimeSessionWindowConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.OutputFileUriValue": {
+            "additionalProperties": false,
+            "properties": {
+                "FileName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.QueryAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Filters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.Filter"
+                    },
+                    "type": "array"
+                },
+                "SqlQuery": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SqlQuery"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.ResourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeType": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ComputeType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.RetentionPeriod": {
+            "additionalProperties": false,
+            "properties": {
+                "NumberOfDays": {
+                    "type": "number"
+                },
+                "Unlimited": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "NumberOfDays",
+                "Unlimited"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.S3DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "GlueConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.GlueConfiguration"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.Trigger": {
+            "additionalProperties": false,
+            "properties": {
+                "Schedule": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.Schedule"
+                },
+                "TriggeringDataset": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.TriggeringDataset"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.TriggeringDataset": {
+            "additionalProperties": false,
+            "properties": {
+                "DatasetName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatasetName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.Variable": {
+            "additionalProperties": false,
+            "properties": {
+                "DatasetContentVersionValue": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.DatasetContentVersionValue"
+                },
+                "DoubleValue": {
+                    "type": "number"
+                },
+                "OutputFileUriValue": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.OutputFileUriValue"
+                },
+                "StringValue": {
+                    "type": "string"
+                },
+                "VariableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VariableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.VersioningConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxVersions": {
+                    "type": "number"
+                },
+                "Unlimited": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DatastorePartitions": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.DatastorePartitions"
+                        },
+                        "DatastoreStorage": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.DatastoreStorage"
+                        },
+                        "FileFormatConfiguration": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.FileFormatConfiguration"
+                        },
+                        "RetentionPeriod": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.RetentionPeriod"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTAnalytics::Datastore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.Column": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.CustomerManagedS3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "KeyPrefix": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.CustomerManagedS3Storage": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "KeyPrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.DatastorePartition": {
+            "additionalProperties": false,
+            "properties": {
+                "Partition": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.Partition"
+                },
+                "TimestampPartition": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.TimestampPartition"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.DatastorePartitions": {
+            "additionalProperties": false,
+            "properties": {
+                "Partitions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.DatastorePartition"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.DatastoreStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomerManagedS3": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.CustomerManagedS3"
+                },
+                "IotSiteWiseMultiLayerStorage": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.IotSiteWiseMultiLayerStorage"
+                },
+                "ServiceManagedS3": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.ServiceManagedS3"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.FileFormatConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.JsonConfiguration"
+                },
+                "ParquetConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.ParquetConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.IotSiteWiseMultiLayerStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomerManagedS3Storage": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.CustomerManagedS3Storage"
+                }
+            },
+            "required": [
+                "CustomerManagedS3Storage"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.JsonConfiguration": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.ParquetConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SchemaDefinition": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.SchemaDefinition"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.Partition": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.RetentionPeriod": {
+            "additionalProperties": false,
+            "properties": {
+                "NumberOfDays": {
+                    "type": "number"
+                },
+                "Unlimited": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.SchemaDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.Column"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.ServiceManagedS3": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.TimestampPartition": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "TimestampFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PipelineActivities": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Activity"
+                            },
+                            "type": "array"
+                        },
+                        "PipelineName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PipelineActivities"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTAnalytics::Pipeline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Activity": {
+            "additionalProperties": false,
+            "properties": {
+                "AddAttributes": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.AddAttributes"
+                },
+                "Channel": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Channel"
+                },
+                "Datastore": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Datastore"
+                },
+                "DeviceRegistryEnrich": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.DeviceRegistryEnrich"
+                },
+                "DeviceShadowEnrich": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.DeviceShadowEnrich"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Filter"
+                },
+                "Lambda": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Lambda"
+                },
+                "Math": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Math"
+                },
+                "RemoveAttributes": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.RemoveAttributes"
+                },
+                "SelectAttributes": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.SelectAttributes"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.AddAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "type": "object"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Datastore": {
+            "additionalProperties": false,
+            "properties": {
+                "DatastoreName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.DeviceRegistryEnrich": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "ThingName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.DeviceShadowEnrich": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "ThingName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Filter": {
+            "additionalProperties": false,
+            "properties": {
+                "Filter": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Lambda": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchSize": {
+                    "type": "number"
+                },
+                "LambdaName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Math": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "Math": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.RemoveAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.SelectAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTCoreDeviceAdvisor::SuiteDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SuiteDefinitionConfiguration": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SuiteDefinitionConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTCoreDeviceAdvisor::SuiteDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DetectorModelDefinition": {
+                            "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.DetectorModelDefinition"
+                        },
+                        "DetectorModelDescription": {
+                            "type": "string"
+                        },
+                        "DetectorModelName": {
+                            "type": "string"
+                        },
+                        "EvaluationMethod": {
+                            "type": "string"
+                        },
+                        "Key": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DetectorModelDefinition",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTEvents::DetectorModel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "ClearTimer": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.ClearTimer"
+                },
+                "DynamoDB": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.DynamoDB"
+                },
+                "DynamoDBv2": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.DynamoDBv2"
+                },
+                "Firehose": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Firehose"
+                },
+                "IotEvents": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.IotEvents"
+                },
+                "IotSiteWise": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.IotSiteWise"
+                },
+                "IotTopicPublish": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.IotTopicPublish"
+                },
+                "Lambda": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Lambda"
+                },
+                "ResetTimer": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.ResetTimer"
+                },
+                "SetTimer": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.SetTimer"
+                },
+                "SetVariable": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.SetVariable"
+                },
+                "Sns": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Sns"
+                },
+                "Sqs": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Sqs"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.AssetPropertyTimestamp": {
+            "additionalProperties": false,
+            "properties": {
+                "OffsetInNanos": {
+                    "type": "string"
+                },
+                "TimeInSeconds": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.AssetPropertyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Quality": {
+                    "type": "string"
+                },
+                "Timestamp": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.AssetPropertyTimestamp"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.AssetPropertyVariant"
+                }
+            },
+            "required": [
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.AssetPropertyVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanValue": {
+                    "type": "string"
+                },
+                "DoubleValue": {
+                    "type": "string"
+                },
+                "IntegerValue": {
+                    "type": "string"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.ClearTimer": {
+            "additionalProperties": false,
+            "properties": {
+                "TimerName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TimerName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.DetectorModelDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "InitialStateName": {
+                    "type": "string"
+                },
+                "States": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.State"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "InitialStateName",
+                "States"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.DynamoDB": {
+            "additionalProperties": false,
+            "properties": {
+                "HashKeyField": {
+                    "type": "string"
+                },
+                "HashKeyType": {
+                    "type": "string"
+                },
+                "HashKeyValue": {
+                    "type": "string"
+                },
+                "Operation": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                },
+                "PayloadField": {
+                    "type": "string"
+                },
+                "RangeKeyField": {
+                    "type": "string"
+                },
+                "RangeKeyType": {
+                    "type": "string"
+                },
+                "RangeKeyValue": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HashKeyField",
+                "HashKeyValue",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.DynamoDBv2": {
+            "additionalProperties": false,
+            "properties": {
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Event": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Action"
+                    },
+                    "type": "array"
+                },
+                "Condition": {
+                    "type": "string"
+                },
+                "EventName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Firehose": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStreamName": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                },
+                "Separator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStreamName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.IotEvents": {
+            "additionalProperties": false,
+            "properties": {
+                "InputName": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                }
+            },
+            "required": [
+                "InputName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.IotSiteWise": {
+            "additionalProperties": false,
+            "properties": {
+                "AssetId": {
+                    "type": "string"
+                },
+                "EntryId": {
+                    "type": "string"
+                },
+                "PropertyAlias": {
+                    "type": "string"
+                },
+                "PropertyId": {
+                    "type": "string"
+                },
+                "PropertyValue": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.AssetPropertyValue"
+                }
+            },
+            "required": [
+                "PropertyValue"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.IotTopicPublish": {
+            "additionalProperties": false,
+            "properties": {
+                "MqttTopic": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                }
+            },
+            "required": [
+                "MqttTopic"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Lambda": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionArn": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                }
+            },
+            "required": [
+                "FunctionArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.OnEnter": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Event"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.OnExit": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Event"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.OnInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Event"
+                    },
+                    "type": "array"
+                },
+                "TransitionEvents": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.TransitionEvent"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Payload": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentExpression": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ContentExpression",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.ResetTimer": {
+            "additionalProperties": false,
+            "properties": {
+                "TimerName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TimerName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.SetTimer": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationExpression": {
+                    "type": "string"
+                },
+                "Seconds": {
+                    "type": "number"
+                },
+                "TimerName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TimerName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.SetVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                },
+                "VariableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Value",
+                "VariableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Sns": {
+            "additionalProperties": false,
+            "properties": {
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                },
+                "TargetArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TargetArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Sqs": {
+            "additionalProperties": false,
+            "properties": {
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                },
+                "QueueUrl": {
+                    "type": "string"
+                },
+                "UseBase64": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "QueueUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.State": {
+            "additionalProperties": false,
+            "properties": {
+                "OnEnter": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.OnEnter"
+                },
+                "OnExit": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.OnExit"
+                },
+                "OnInput": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.OnInput"
+                },
+                "StateName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StateName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.TransitionEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Action"
+                    },
+                    "type": "array"
+                },
+                "Condition": {
+                    "type": "string"
+                },
+                "EventName": {
+                    "type": "string"
+                },
+                "NextState": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Condition",
+                "EventName",
+                "NextState"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::Input": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InputDefinition": {
+                            "$ref": "#/definitions/AWS::IoTEvents::Input.InputDefinition"
+                        },
+                        "InputDescription": {
+                            "type": "string"
+                        },
+                        "InputName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InputDefinition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTEvents::Input"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::Input.Attribute": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "JsonPath"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::Input.InputDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::Input.Attribute"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Attributes"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTFleetHub::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationDescription": {
+                            "type": "string"
+                        },
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTFleetHub::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessPolicyIdentity": {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.AccessPolicyIdentity"
+                        },
+                        "AccessPolicyPermission": {
+                            "type": "string"
+                        },
+                        "AccessPolicyResource": {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.AccessPolicyResource"
+                        }
+                    },
+                    "required": [
+                        "AccessPolicyIdentity",
+                        "AccessPolicyPermission",
+                        "AccessPolicyResource"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::AccessPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.AccessPolicyIdentity": {
+            "additionalProperties": false,
+            "properties": {
+                "IamRole": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.IamRole"
+                },
+                "IamUser": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.IamUser"
+                },
+                "User": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.User"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.AccessPolicyResource": {
+            "additionalProperties": false,
+            "properties": {
+                "Portal": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.Portal"
+                },
+                "Project": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.Project"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.IamRole": {
+            "additionalProperties": false,
+            "properties": {
+                "arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.IamUser": {
+            "additionalProperties": false,
+            "properties": {
+                "arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.Portal": {
+            "additionalProperties": false,
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.Project": {
+            "additionalProperties": false,
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.User": {
+            "additionalProperties": false,
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Asset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssetHierarchies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::Asset.AssetHierarchy"
+                            },
+                            "type": "array"
+                        },
+                        "AssetModelId": {
+                            "type": "string"
+                        },
+                        "AssetName": {
+                            "type": "string"
+                        },
+                        "AssetProperties": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::Asset.AssetProperty"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AssetModelId",
+                        "AssetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::Asset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Asset.AssetHierarchy": {
+            "additionalProperties": false,
+            "properties": {
+                "ChildAssetId": {
+                    "type": "string"
+                },
+                "LogicalId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ChildAssetId",
+                "LogicalId"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Asset.AssetProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Alias": {
+                    "type": "string"
+                },
+                "LogicalId": {
+                    "type": "string"
+                },
+                "NotificationState": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogicalId"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssetModelCompositeModels": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.AssetModelCompositeModel"
+                            },
+                            "type": "array"
+                        },
+                        "AssetModelDescription": {
+                            "type": "string"
+                        },
+                        "AssetModelHierarchies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.AssetModelHierarchy"
+                            },
+                            "type": "array"
+                        },
+                        "AssetModelName": {
+                            "type": "string"
+                        },
+                        "AssetModelProperties": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.AssetModelProperty"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AssetModelName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::AssetModel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.AssetModelCompositeModel": {
+            "additionalProperties": false,
+            "properties": {
+                "CompositeModelProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.AssetModelProperty"
+                    },
+                    "type": "array"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.AssetModelHierarchy": {
+            "additionalProperties": false,
+            "properties": {
+                "ChildAssetModelId": {
+                    "type": "string"
+                },
+                "LogicalId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ChildAssetModelId",
+                "LogicalId",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.AssetModelProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "DataType": {
+                    "type": "string"
+                },
+                "DataTypeSpec": {
+                    "type": "string"
+                },
+                "LogicalId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.PropertyType"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataType",
+                "LogicalId",
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.Attribute": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.ExpressionVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.VariableValue"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.Metric": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Variables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.ExpressionVariable"
+                    },
+                    "type": "array"
+                },
+                "Window": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.MetricWindow"
+                }
+            },
+            "required": [
+                "Expression",
+                "Variables",
+                "Window"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.MetricWindow": {
+            "additionalProperties": false,
+            "properties": {
+                "Tumbling": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.TumblingWindow"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.PropertyType": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.Attribute"
+                },
+                "Metric": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.Metric"
+                },
+                "Transform": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.Transform"
+                },
+                "TypeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TypeName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.Transform": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Variables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.ExpressionVariable"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Expression",
+                "Variables"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.TumblingWindow": {
+            "additionalProperties": false,
+            "properties": {
+                "Interval": {
+                    "type": "string"
+                },
+                "Offset": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Interval"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.VariableValue": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLogicalId": {
+                    "type": "string"
+                },
+                "PropertyLogicalId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PropertyLogicalId"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Dashboard": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DashboardDefinition": {
+                            "type": "string"
+                        },
+                        "DashboardDescription": {
+                            "type": "string"
+                        },
+                        "DashboardName": {
+                            "type": "string"
+                        },
+                        "ProjectId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DashboardDefinition",
+                        "DashboardDescription",
+                        "DashboardName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::Dashboard"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Gateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GatewayCapabilitySummaries": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::Gateway.GatewayCapabilitySummary"
+                            },
+                            "type": "array"
+                        },
+                        "GatewayName": {
+                            "type": "string"
+                        },
+                        "GatewayPlatform": {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Gateway.GatewayPlatform"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "GatewayName",
+                        "GatewayPlatform"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::Gateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Gateway.GatewayCapabilitySummary": {
+            "additionalProperties": false,
+            "properties": {
+                "CapabilityConfiguration": {
+                    "type": "string"
+                },
+                "CapabilityNamespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CapabilityNamespace"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Gateway.GatewayPlatform": {
+            "additionalProperties": false,
+            "properties": {
+                "Greengrass": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::Gateway.Greengrass"
+                }
+            },
+            "required": [
+                "Greengrass"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Gateway.Greengrass": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Portal": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Alarms": {
+                            "type": "object"
+                        },
+                        "NotificationSenderEmail": {
+                            "type": "string"
+                        },
+                        "PortalAuthMode": {
+                            "type": "string"
+                        },
+                        "PortalContactEmail": {
+                            "type": "string"
+                        },
+                        "PortalDescription": {
+                            "type": "string"
+                        },
+                        "PortalName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PortalContactEmail",
+                        "PortalName",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::Portal"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PortalId": {
+                            "type": "string"
+                        },
+                        "ProjectDescription": {
+                            "type": "string"
+                        },
+                        "ProjectName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PortalId",
+                        "ProjectName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTThingsGraph::FlowTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CompatibleNamespaceVersion": {
+                            "type": "number"
+                        },
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::IoTThingsGraph::FlowTemplate.DefinitionDocument"
+                        }
+                    },
+                    "required": [
+                        "Definition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTThingsGraph::FlowTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTThingsGraph::FlowTemplate.DefinitionDocument": {
+            "additionalProperties": false,
+            "properties": {
+                "Language": {
+                    "type": "string"
+                },
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Language",
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Expression": {
+                            "type": "string"
+                        },
+                        "ExpressionType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Expression",
+                        "ExpressionType",
+                        "Name",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::Destination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::DeviceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::DeviceProfile.LoRaWANDeviceProfile"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::DeviceProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::DeviceProfile.LoRaWANDeviceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "ClassBTimeout": {
+                    "type": "number"
+                },
+                "ClassCTimeout": {
+                    "type": "number"
+                },
+                "MacVersion": {
+                    "type": "string"
+                },
+                "MaxDutyCycle": {
+                    "type": "number"
+                },
+                "MaxEirp": {
+                    "type": "number"
+                },
+                "PingSlotDr": {
+                    "type": "number"
+                },
+                "PingSlotFreq": {
+                    "type": "number"
+                },
+                "PingSlotPeriod": {
+                    "type": "number"
+                },
+                "RegParamsRevision": {
+                    "type": "string"
+                },
+                "RfRegion": {
+                    "type": "string"
+                },
+                "Supports32BitFCnt": {
+                    "type": "boolean"
+                },
+                "SupportsClassB": {
+                    "type": "boolean"
+                },
+                "SupportsClassC": {
+                    "type": "boolean"
+                },
+                "SupportsJoin": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::FuotaTask": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociateMulticastGroup": {
+                            "type": "string"
+                        },
+                        "AssociateWirelessDevice": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisassociateMulticastGroup": {
+                            "type": "string"
+                        },
+                        "DisassociateWirelessDevice": {
+                            "type": "string"
+                        },
+                        "FirmwareUpdateImage": {
+                            "type": "string"
+                        },
+                        "FirmwareUpdateRole": {
+                            "type": "string"
+                        },
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::FuotaTask.LoRaWAN"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FirmwareUpdateImage",
+                        "FirmwareUpdateRole",
+                        "LoRaWAN"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::FuotaTask"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::FuotaTask.LoRaWAN": {
+            "additionalProperties": false,
+            "properties": {
+                "RfRegion": {
+                    "type": "string"
+                },
+                "StartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RfRegion"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::MulticastGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociateWirelessDevice": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisassociateWirelessDevice": {
+                            "type": "string"
+                        },
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::MulticastGroup.LoRaWAN"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "LoRaWAN"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::MulticastGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::MulticastGroup.LoRaWAN": {
+            "additionalProperties": false,
+            "properties": {
+                "DlClass": {
+                    "type": "string"
+                },
+                "NumberOfDevicesInGroup": {
+                    "type": "number"
+                },
+                "NumberOfDevicesRequested": {
+                    "type": "number"
+                },
+                "RfRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DlClass",
+                "RfRegion"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::PartnerAccount": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountLinked": {
+                            "type": "boolean"
+                        },
+                        "Fingerprint": {
+                            "type": "string"
+                        },
+                        "PartnerAccountId": {
+                            "type": "string"
+                        },
+                        "PartnerType": {
+                            "type": "string"
+                        },
+                        "Sidewalk": {
+                            "$ref": "#/definitions/AWS::IoTWireless::PartnerAccount.SidewalkAccountInfo"
+                        },
+                        "SidewalkUpdate": {
+                            "$ref": "#/definitions/AWS::IoTWireless::PartnerAccount.SidewalkUpdateAccount"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::PartnerAccount"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::PartnerAccount.SidewalkAccountInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "AppServerPrivateKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AppServerPrivateKey"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::PartnerAccount.SidewalkUpdateAccount": {
+            "additionalProperties": false,
+            "properties": {
+                "AppServerPrivateKey": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::ServiceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::ServiceProfile.LoRaWANServiceProfile"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::ServiceProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::ServiceProfile.LoRaWANServiceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "AddGwMetadata": {
+                    "type": "boolean"
+                },
+                "ChannelMask": {
+                    "type": "string"
+                },
+                "DevStatusReqFreq": {
+                    "type": "number"
+                },
+                "DlBucketSize": {
+                    "type": "number"
+                },
+                "DlRate": {
+                    "type": "number"
+                },
+                "DlRatePolicy": {
+                    "type": "string"
+                },
+                "DrMax": {
+                    "type": "number"
+                },
+                "DrMin": {
+                    "type": "number"
+                },
+                "HrAllowed": {
+                    "type": "boolean"
+                },
+                "MinGwDiversity": {
+                    "type": "number"
+                },
+                "NwkGeoLoc": {
+                    "type": "boolean"
+                },
+                "PrAllowed": {
+                    "type": "boolean"
+                },
+                "RaAllowed": {
+                    "type": "boolean"
+                },
+                "ReportDevStatusBattery": {
+                    "type": "boolean"
+                },
+                "ReportDevStatusMargin": {
+                    "type": "boolean"
+                },
+                "TargetPer": {
+                    "type": "number"
+                },
+                "UlBucketSize": {
+                    "type": "number"
+                },
+                "UlRate": {
+                    "type": "number"
+                },
+                "UlRatePolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::TaskDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoCreateTasks": {
+                            "type": "boolean"
+                        },
+                        "LoRaWANUpdateGatewayTaskEntry": {
+                            "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskEntry"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TaskDefinitionType": {
+                            "type": "string"
+                        },
+                        "Update": {
+                            "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.UpdateWirelessGatewayTaskCreate"
+                        }
+                    },
+                    "required": [
+                        "AutoCreateTasks"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::TaskDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Model": {
+                    "type": "string"
+                },
+                "PackageVersion": {
+                    "type": "string"
+                },
+                "Station": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskCreate": {
+            "additionalProperties": false,
+            "properties": {
+                "CurrentVersion": {
+                    "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion"
+                },
+                "SigKeyCrc": {
+                    "type": "number"
+                },
+                "UpdateSignature": {
+                    "type": "string"
+                },
+                "UpdateVersion": {
+                    "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "CurrentVersion": {
+                    "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion"
+                },
+                "UpdateVersion": {
+                    "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::TaskDefinition.UpdateWirelessGatewayTaskCreate": {
+            "additionalProperties": false,
+            "properties": {
+                "LoRaWAN": {
+                    "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskCreate"
+                },
+                "UpdateDataRole": {
+                    "type": "string"
+                },
+                "UpdateDataSource": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DestinationName": {
+                            "type": "string"
+                        },
+                        "LastUplinkReceivedAt": {
+                            "type": "string"
+                        },
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.LoRaWANDevice"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThingArn": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::WirelessDevice"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.AbpV10x": {
+            "additionalProperties": false,
+            "properties": {
+                "DevAddr": {
+                    "type": "string"
+                },
+                "SessionKeys": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.SessionKeysAbpV10x"
+                }
+            },
+            "required": [
+                "DevAddr",
+                "SessionKeys"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.AbpV11": {
+            "additionalProperties": false,
+            "properties": {
+                "DevAddr": {
+                    "type": "string"
+                },
+                "SessionKeys": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.SessionKeysAbpV11"
+                }
+            },
+            "required": [
+                "DevAddr",
+                "SessionKeys"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.LoRaWANDevice": {
+            "additionalProperties": false,
+            "properties": {
+                "AbpV10x": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.AbpV10x"
+                },
+                "AbpV11": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.AbpV11"
+                },
+                "DevEui": {
+                    "type": "string"
+                },
+                "DeviceProfileId": {
+                    "type": "string"
+                },
+                "OtaaV10x": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.OtaaV10x"
+                },
+                "OtaaV11": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.OtaaV11"
+                },
+                "ServiceProfileId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.OtaaV10x": {
+            "additionalProperties": false,
+            "properties": {
+                "AppEui": {
+                    "type": "string"
+                },
+                "AppKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AppEui",
+                "AppKey"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.OtaaV11": {
+            "additionalProperties": false,
+            "properties": {
+                "AppKey": {
+                    "type": "string"
+                },
+                "JoinEui": {
+                    "type": "string"
+                },
+                "NwkKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AppKey",
+                "JoinEui",
+                "NwkKey"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.SessionKeysAbpV10x": {
+            "additionalProperties": false,
+            "properties": {
+                "AppSKey": {
+                    "type": "string"
+                },
+                "NwkSKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AppSKey",
+                "NwkSKey"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.SessionKeysAbpV11": {
+            "additionalProperties": false,
+            "properties": {
+                "AppSKey": {
+                    "type": "string"
+                },
+                "FNwkSIntKey": {
+                    "type": "string"
+                },
+                "NwkSEncKey": {
+                    "type": "string"
+                },
+                "SNwkSIntKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AppSKey",
+                "FNwkSIntKey",
+                "NwkSEncKey",
+                "SNwkSIntKey"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "LastUplinkReceivedAt": {
+                            "type": "string"
+                        },
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::WirelessGateway.LoRaWANGateway"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThingArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LoRaWAN"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::WirelessGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessGateway.LoRaWANGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "GatewayEui": {
+                    "type": "string"
+                },
+                "RfRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GatewayEui",
+                "RfRegion"
+            ],
+            "type": "object"
+        },
+        "AWS::KMS::Alias": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AliasName": {
+                            "type": "string"
+                        },
+                        "TargetKeyId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AliasName",
+                        "TargetKeyId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KMS::Alias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KMS::Key": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EnableKeyRotation": {
+                            "type": "boolean"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "KeyPolicy": {
+                            "type": "object"
+                        },
+                        "KeySpec": {
+                            "type": "string"
+                        },
+                        "KeyUsage": {
+                            "type": "string"
+                        },
+                        "MultiRegion": {
+                            "type": "boolean"
+                        },
+                        "PendingWindowInDays": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "KeyPolicy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KMS::Key"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KMS::ReplicaKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "KeyPolicy": {
+                            "type": "object"
+                        },
+                        "PendingWindowInDays": {
+                            "type": "number"
+                        },
+                        "PrimaryKeyArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "KeyPolicy",
+                        "PrimaryKeyArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KMS::ReplicaKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::Kendra::DataSource.DataSourceConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IndexId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "IndexId",
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kendra::DataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.AccessControlListConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyPath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.AclConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedGroupsColumnName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AllowedGroupsColumnName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ColumnConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChangeDetectingColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DocumentDataColumnName": {
+                    "type": "string"
+                },
+                "DocumentIdColumnName": {
+                    "type": "string"
+                },
+                "DocumentTitleColumnName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ChangeDetectingColumns",
+                "DocumentDataColumnName",
+                "DocumentIdColumnName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceAttachmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentFieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceAttachmentToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "CrawlAttachments": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceAttachmentToIndexFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceFieldName": {
+                    "type": "string"
+                },
+                "DateFieldFormat": {
+                    "type": "string"
+                },
+                "IndexFieldName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceFieldName",
+                "IndexFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceBlogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BlogFieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceBlogToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceBlogToIndexFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceFieldName": {
+                    "type": "string"
+                },
+                "DateFieldFormat": {
+                    "type": "string"
+                },
+                "IndexFieldName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceFieldName",
+                "IndexFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceAttachmentConfiguration"
+                },
+                "BlogConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceBlogConfiguration"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PageConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluencePageConfiguration"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "ServerUrl": {
+                    "type": "string"
+                },
+                "SpaceConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceSpaceConfiguration"
+                },
+                "Version": {
+                    "type": "string"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceVpcConfiguration"
+                }
+            },
+            "required": [
+                "SecretArn",
+                "ServerUrl",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluencePageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "PageFieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluencePageToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluencePageToIndexFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceFieldName": {
+                    "type": "string"
+                },
+                "DateFieldFormat": {
+                    "type": "string"
+                },
+                "IndexFieldName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceFieldName",
+                "IndexFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceSpaceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlArchivedSpaces": {
+                    "type": "boolean"
+                },
+                "CrawlPersonalSpaces": {
+                    "type": "boolean"
+                },
+                "ExcludeSpaces": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "IncludeSpaces": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SpaceFieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceSpaceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceSpaceToIndexFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceFieldName": {
+                    "type": "string"
+                },
+                "DateFieldFormat": {
+                    "type": "string"
+                },
+                "IndexFieldName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceFieldName",
+                "IndexFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseHost": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DatabasePort": {
+                    "type": "number"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseHost",
+                "DatabaseName",
+                "DatabasePort",
+                "SecretArn",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.DataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfluenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceConfiguration"
+                },
+                "DatabaseConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.DatabaseConfiguration"
+                },
+                "GoogleDriveConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.GoogleDriveConfiguration"
+                },
+                "OneDriveConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.OneDriveConfiguration"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.S3DataSourceConfiguration"
+                },
+                "SalesforceConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceConfiguration"
+                },
+                "ServiceNowConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ServiceNowConfiguration"
+                },
+                "SharePointConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SharePointConfiguration"
+                },
+                "WebCrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerConfiguration"
+                },
+                "WorkDocsConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WorkDocsConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.DataSourceToIndexFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceFieldName": {
+                    "type": "string"
+                },
+                "DateFieldFormat": {
+                    "type": "string"
+                },
+                "IndexFieldName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceFieldName",
+                "IndexFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.DataSourceVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.DatabaseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AclConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.AclConfiguration"
+                },
+                "ColumnConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ColumnConfiguration"
+                },
+                "ConnectionConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConnectionConfiguration"
+                },
+                "DatabaseEngineType": {
+                    "type": "string"
+                },
+                "SqlConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SqlConfiguration"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceVpcConfiguration"
+                }
+            },
+            "required": [
+                "ColumnConfiguration",
+                "ConnectionConfiguration",
+                "DatabaseEngineType"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.DocumentsMetadataConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Prefix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.GoogleDriveConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludeMimeTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExcludeSharedDrives": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExcludeUserAccounts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.OneDriveConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DisableLocalGroups": {
+                    "type": "boolean"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OneDriveUsers": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.OneDriveUsers"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "TenantDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OneDriveUsers",
+                "SecretArn",
+                "TenantDomain"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.OneDriveUsers": {
+            "additionalProperties": false,
+            "properties": {
+                "OneDriveUserList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OneDriveUserS3Path": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.S3Path"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ProxyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Credentials": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.S3DataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessControlListConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.AccessControlListConfiguration"
+                },
+                "BucketName": {
+                    "type": "string"
+                },
+                "DocumentsMetadataConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.DocumentsMetadataConfiguration"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InclusionPrefixes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.S3Path": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceChatterFeedConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "IncludeFilterTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChatterFeedConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceChatterFeedConfiguration"
+                },
+                "CrawlAttachments": {
+                    "type": "boolean"
+                },
+                "ExcludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "IncludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "KnowledgeArticleConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceKnowledgeArticleConfiguration"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "ServerUrl": {
+                    "type": "string"
+                },
+                "StandardObjectAttachmentConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceStandardObjectAttachmentConfiguration"
+                },
+                "StandardObjectConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceStandardObjectConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecretArn",
+                "ServerUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceCustomKnowledgeArticleTypeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceKnowledgeArticleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomKnowledgeArticleTypeConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceCustomKnowledgeArticleTypeConfiguration"
+                    },
+                    "type": "array"
+                },
+                "IncludedStates": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StandardKnowledgeArticleTypeConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceStandardKnowledgeArticleTypeConfiguration"
+                }
+            },
+            "required": [
+                "IncludedStates"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceStandardKnowledgeArticleTypeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceStandardObjectAttachmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceStandardObjectConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ServiceNowConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationType": {
+                    "type": "string"
+                },
+                "HostUrl": {
+                    "type": "string"
+                },
+                "KnowledgeArticleConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ServiceNowKnowledgeArticleConfiguration"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "ServiceCatalogConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ServiceNowServiceCatalogConfiguration"
+                },
+                "ServiceNowBuildVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HostUrl",
+                "SecretArn",
+                "ServiceNowBuildVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ServiceNowKnowledgeArticleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlAttachments": {
+                    "type": "boolean"
+                },
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "ExcludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "FilterQuery": {
+                    "type": "string"
+                },
+                "IncludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ServiceNowServiceCatalogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlAttachments": {
+                    "type": "boolean"
+                },
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "ExcludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "IncludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SharePointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlAttachments": {
+                    "type": "boolean"
+                },
+                "DisableLocalGroups": {
+                    "type": "boolean"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "SharePointVersion": {
+                    "type": "string"
+                },
+                "SslCertificateS3Path": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.S3Path"
+                },
+                "Urls": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "UseChangeLog": {
+                    "type": "boolean"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceVpcConfiguration"
+                }
+            },
+            "required": [
+                "SecretArn",
+                "SharePointVersion",
+                "Urls"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SqlConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryIdentifiersEnclosingOption": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerAuthenticationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BasicAuthentication": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerBasicAuthentication"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerBasicAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "Credentials": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Credentials",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerAuthenticationConfiguration"
+                },
+                "CrawlDepth": {
+                    "type": "number"
+                },
+                "MaxContentSizePerPageInMegaBytes": {
+                    "type": "number"
+                },
+                "MaxLinksPerPage": {
+                    "type": "number"
+                },
+                "MaxUrlsPerMinuteCrawlRate": {
+                    "type": "number"
+                },
+                "ProxyConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ProxyConfiguration"
+                },
+                "UrlExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "UrlInclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Urls": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerUrls"
+                }
+            },
+            "required": [
+                "Urls"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerSeedUrlConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SeedUrls": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "WebCrawlerMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SeedUrls"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerSiteMapsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SiteMaps": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SiteMaps"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerUrls": {
+            "additionalProperties": false,
+            "properties": {
+                "SeedUrlConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerSeedUrlConfiguration"
+                },
+                "SiteMapsConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerSiteMapsConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WorkDocsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlComments": {
+                    "type": "boolean"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OrganizationId": {
+                    "type": "string"
+                },
+                "UseChangeLog": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "OrganizationId"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Faq": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "FileFormat": {
+                            "type": "string"
+                        },
+                        "IndexId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "S3Path": {
+                            "$ref": "#/definitions/AWS::Kendra::Faq.S3Path"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "IndexId",
+                        "Name",
+                        "RoleArn",
+                        "S3Path"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kendra::Faq"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Faq.S3Path": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CapacityUnits": {
+                            "$ref": "#/definitions/AWS::Kendra::Index.CapacityUnitsConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DocumentMetadataConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Kendra::Index.DocumentMetadataConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "Edition": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "ServerSideEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Kendra::Index.ServerSideEncryptionConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserContextPolicy": {
+                            "type": "string"
+                        },
+                        "UserTokenConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Kendra::Index.UserTokenConfiguration"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Edition",
+                        "Name",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kendra::Index"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index.CapacityUnitsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryCapacityUnits": {
+                    "type": "number"
+                },
+                "StorageCapacityUnits": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "QueryCapacityUnits",
+                "StorageCapacityUnits"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index.DocumentMetadataConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Relevance": {
+                    "$ref": "#/definitions/AWS::Kendra::Index.Relevance"
+                },
+                "Search": {
+                    "$ref": "#/definitions/AWS::Kendra::Index.Search"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index.JsonTokenTypeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupAttributeField": {
+                    "type": "string"
+                },
+                "UserNameAttributeField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupAttributeField",
+                "UserNameAttributeField"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index.JwtTokenTypeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClaimRegex": {
+                    "type": "string"
+                },
+                "GroupAttributeField": {
+                    "type": "string"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "KeyLocation": {
+                    "type": "string"
+                },
+                "SecretManagerArn": {
+                    "type": "string"
+                },
+                "URL": {
+                    "type": "string"
+                },
+                "UserNameAttributeField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KeyLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index.Relevance": {
+            "additionalProperties": false,
+            "properties": {
+                "Duration": {
+                    "type": "string"
+                },
+                "Freshness": {
+                    "type": "boolean"
+                },
+                "Importance": {
+                    "type": "number"
+                },
+                "RankOrder": {
+                    "type": "string"
+                },
+                "ValueImportanceItems": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::Index.ValueImportanceItem"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::Index.Search": {
+            "additionalProperties": false,
+            "properties": {
+                "Displayable": {
+                    "type": "boolean"
+                },
+                "Facetable": {
+                    "type": "boolean"
+                },
+                "Searchable": {
+                    "type": "boolean"
+                },
+                "Sortable": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::Index.ServerSideEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::Index.UserTokenConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonTokenTypeConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::Index.JsonTokenTypeConfiguration"
+                },
+                "JwtTokenTypeConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::Index.JwtTokenTypeConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::Index.ValueImportanceItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kinesis::Stream": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RetentionPeriodHours": {
+                            "type": "number"
+                        },
+                        "ShardCount": {
+                            "type": "number"
+                        },
+                        "StreamEncryption": {
+                            "$ref": "#/definitions/AWS::Kinesis::Stream.StreamEncryption"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ShardCount"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kinesis::Stream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Kinesis::Stream.StreamEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionType": {
+                    "type": "string"
+                },
+                "KeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionType",
+                "KeyId"
+            ],
+            "type": "object"
+        },
+        "AWS::Kinesis::StreamConsumer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConsumerName": {
+                            "type": "string"
+                        },
+                        "StreamARN": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConsumerName",
+                        "StreamARN"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kinesis::StreamConsumer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationCode": {
+                            "type": "string"
+                        },
+                        "ApplicationDescription": {
+                            "type": "string"
+                        },
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Inputs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::KinesisAnalytics::Application.Input"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Inputs"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalytics::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.CSVMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumnDelimiter": {
+                    "type": "string"
+                },
+                "RecordRowDelimiter": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordColumnDelimiter",
+                "RecordRowDelimiter"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.Input": {
+            "additionalProperties": false,
+            "properties": {
+                "InputParallelism": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.InputParallelism"
+                },
+                "InputProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.InputProcessingConfiguration"
+                },
+                "InputSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.InputSchema"
+                },
+                "KinesisFirehoseInput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.KinesisFirehoseInput"
+                },
+                "KinesisStreamsInput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.KinesisStreamsInput"
+                },
+                "NamePrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputSchema",
+                "NamePrefix"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.InputLambdaProcessor": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.InputParallelism": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.InputProcessingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputLambdaProcessor": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.InputLambdaProcessor"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.InputSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalytics::Application.RecordColumn"
+                    },
+                    "type": "array"
+                },
+                "RecordEncoding": {
+                    "type": "string"
+                },
+                "RecordFormat": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.RecordFormat"
+                }
+            },
+            "required": [
+                "RecordColumns",
+                "RecordFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.JSONMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordRowPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordRowPath"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.KinesisFirehoseInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.KinesisStreamsInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.MappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CSVMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.CSVMappingParameters"
+                },
+                "JSONMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.JSONMappingParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.RecordColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Mapping": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SqlType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "SqlType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.RecordFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "MappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.MappingParameters"
+                },
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordFormatType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Output": {
+                            "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput.Output"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "Output"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalytics::ApplicationOutput"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput.DestinationSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput.KinesisFirehoseOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput.KinesisStreamsOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput.LambdaOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput.DestinationSchema"
+                },
+                "KinesisFirehoseOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput.KinesisFirehoseOutput"
+                },
+                "KinesisStreamsOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput.KinesisStreamsOutput"
+                },
+                "LambdaOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput.LambdaOutput"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationSchema"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "ReferenceDataSource": {
+                            "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceDataSource"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "ReferenceDataSource"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalytics::ApplicationReferenceDataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.CSVMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumnDelimiter": {
+                    "type": "string"
+                },
+                "RecordRowDelimiter": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordColumnDelimiter",
+                "RecordRowDelimiter"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.JSONMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordRowPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordRowPath"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.MappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CSVMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.CSVMappingParameters"
+                },
+                "JSONMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.JSONMappingParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Mapping": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SqlType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "SqlType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "MappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.MappingParameters"
+                },
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordFormatType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ReferenceSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceSchema"
+                },
+                "S3ReferenceDataSource": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.S3ReferenceDataSource"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ReferenceSchema"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordColumn"
+                    },
+                    "type": "array"
+                },
+                "RecordEncoding": {
+                    "type": "string"
+                },
+                "RecordFormat": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordFormat"
+                }
+            },
+            "required": [
+                "RecordColumns",
+                "RecordFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.S3ReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketARN": {
+                    "type": "string"
+                },
+                "FileKey": {
+                    "type": "string"
+                },
+                "ReferenceRoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketARN",
+                "FileKey",
+                "ReferenceRoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationConfiguration"
+                        },
+                        "ApplicationDescription": {
+                            "type": "string"
+                        },
+                        "ApplicationMode": {
+                            "type": "string"
+                        },
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "RuntimeEnvironment": {
+                            "type": "string"
+                        },
+                        "ServiceExecutionRole": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RuntimeEnvironment",
+                        "ServiceExecutionRole"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalyticsV2::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ApplicationCodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CodeContent": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.CodeContent"
+                },
+                "CodeContentType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CodeContent",
+                "CodeContentType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ApplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationCodeConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationCodeConfiguration"
+                },
+                "ApplicationSnapshotConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationSnapshotConfiguration"
+                },
+                "EnvironmentProperties": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.EnvironmentProperties"
+                },
+                "FlinkApplicationConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.FlinkApplicationConfiguration"
+                },
+                "SqlApplicationConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.SqlApplicationConfiguration"
+                },
+                "ZeppelinApplicationConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ZeppelinApplicationConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ApplicationSnapshotConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SnapshotsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "SnapshotsEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CSVMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumnDelimiter": {
+                    "type": "string"
+                },
+                "RecordRowDelimiter": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordColumnDelimiter",
+                "RecordRowDelimiter"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CatalogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GlueDataCatalogConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.GlueDataCatalogConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CheckpointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CheckpointInterval": {
+                    "type": "number"
+                },
+                "CheckpointingEnabled": {
+                    "type": "boolean"
+                },
+                "ConfigurationType": {
+                    "type": "string"
+                },
+                "MinPauseBetweenCheckpoints": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ConfigurationType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CodeContent": {
+            "additionalProperties": false,
+            "properties": {
+                "S3ContentLocation": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.S3ContentLocation"
+                },
+                "TextContent": {
+                    "type": "string"
+                },
+                "ZipFileContent": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CustomArtifactConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ArtifactType": {
+                    "type": "string"
+                },
+                "MavenReference": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.MavenReference"
+                },
+                "S3ContentLocation": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.S3ContentLocation"
+                }
+            },
+            "required": [
+                "ArtifactType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CustomArtifactsConfiguration": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.DeployAsApplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3ContentLocation": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.S3ContentBaseLocation"
+                }
+            },
+            "required": [
+                "S3ContentLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.EnvironmentProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "PropertyGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.PropertyGroup"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.FlinkApplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CheckpointConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.CheckpointConfiguration"
+                },
+                "MonitoringConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.MonitoringConfiguration"
+                },
+                "ParallelismConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ParallelismConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.GlueDataCatalogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseARN": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.Input": {
+            "additionalProperties": false,
+            "properties": {
+                "InputParallelism": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.InputParallelism"
+                },
+                "InputProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.InputProcessingConfiguration"
+                },
+                "InputSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.InputSchema"
+                },
+                "KinesisFirehoseInput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.KinesisFirehoseInput"
+                },
+                "KinesisStreamsInput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.KinesisStreamsInput"
+                },
+                "NamePrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputSchema",
+                "NamePrefix"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.InputLambdaProcessor": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.InputParallelism": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.InputProcessingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputLambdaProcessor": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.InputLambdaProcessor"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.InputSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.RecordColumn"
+                    },
+                    "type": "array"
+                },
+                "RecordEncoding": {
+                    "type": "string"
+                },
+                "RecordFormat": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.RecordFormat"
+                }
+            },
+            "required": [
+                "RecordColumns",
+                "RecordFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.JSONMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordRowPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordRowPath"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.KinesisFirehoseInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.KinesisStreamsInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.MappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CSVMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.CSVMappingParameters"
+                },
+                "JSONMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.JSONMappingParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.MavenReference": {
+            "additionalProperties": false,
+            "properties": {
+                "ArtifactId": {
+                    "type": "string"
+                },
+                "GroupId": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ArtifactId",
+                "GroupId",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.MonitoringConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfigurationType": {
+                    "type": "string"
+                },
+                "LogLevel": {
+                    "type": "string"
+                },
+                "MetricsLevel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConfigurationType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ParallelismConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoScalingEnabled": {
+                    "type": "boolean"
+                },
+                "ConfigurationType": {
+                    "type": "string"
+                },
+                "Parallelism": {
+                    "type": "number"
+                },
+                "ParallelismPerKPU": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ConfigurationType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.PropertyGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "PropertyGroupId": {
+                    "type": "string"
+                },
+                "PropertyMap": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.RecordColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Mapping": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SqlType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "SqlType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.RecordFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "MappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.MappingParameters"
+                },
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordFormatType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.S3ContentBaseLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "BasePath": {
+                    "type": "string"
+                },
+                "BucketARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BasePath",
+                "BucketARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.S3ContentLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketARN": {
+                    "type": "string"
+                },
+                "FileKey": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.SqlApplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Inputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.Input"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ZeppelinApplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.CatalogConfiguration"
+                },
+                "CustomArtifactsConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.CustomArtifactsConfiguration"
+                },
+                "DeployAsApplicationConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.DeployAsApplicationConfiguration"
+                },
+                "MonitoringConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ZeppelinMonitoringConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ZeppelinMonitoringConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogLevel": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "CloudWatchLoggingOption": {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption.CloudWatchLoggingOption"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "CloudWatchLoggingOption"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption.CloudWatchLoggingOption": {
+            "additionalProperties": false,
+            "properties": {
+                "LogStreamARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogStreamARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Output": {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput.Output"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "Output"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalyticsV2::ApplicationOutput"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput.DestinationSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisFirehoseOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisStreamsOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput.LambdaOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput.DestinationSchema"
+                },
+                "KinesisFirehoseOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisFirehoseOutput"
+                },
+                "KinesisStreamsOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisStreamsOutput"
+                },
+                "LambdaOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput.LambdaOutput"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationSchema"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "ReferenceDataSource": {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceDataSource"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "ReferenceDataSource"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.CSVMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumnDelimiter": {
+                    "type": "string"
+                },
+                "RecordRowDelimiter": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordColumnDelimiter",
+                "RecordRowDelimiter"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.JSONMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordRowPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordRowPath"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.MappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CSVMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.CSVMappingParameters"
+                },
+                "JSONMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.JSONMappingParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Mapping": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SqlType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "SqlType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "MappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.MappingParameters"
+                },
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordFormatType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ReferenceSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceSchema"
+                },
+                "S3ReferenceDataSource": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.S3ReferenceDataSource"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ReferenceSchema"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordColumn"
+                    },
+                    "type": "array"
+                },
+                "RecordEncoding": {
+                    "type": "string"
+                },
+                "RecordFormat": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordFormat"
+                }
+            },
+            "required": [
+                "RecordColumns",
+                "RecordFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.S3ReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketARN": {
+                    "type": "string"
+                },
+                "FileKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketARN",
+                "FileKey"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AmazonopensearchserviceDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceDestinationConfiguration"
+                        },
+                        "DeliveryStreamEncryptionConfigurationInput": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.DeliveryStreamEncryptionConfigurationInput"
+                        },
+                        "DeliveryStreamName": {
+                            "type": "string"
+                        },
+                        "DeliveryStreamType": {
+                            "type": "string"
+                        },
+                        "ElasticsearchDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ElasticsearchDestinationConfiguration"
+                        },
+                        "ExtendedS3DestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ExtendedS3DestinationConfiguration"
+                        },
+                        "HttpEndpointDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointDestinationConfiguration"
+                        },
+                        "KinesisStreamSourceConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.KinesisStreamSourceConfiguration"
+                        },
+                        "RedshiftDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RedshiftDestinationConfiguration"
+                        },
+                        "S3DestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                        },
+                        "SplunkDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SplunkDestinationConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisFirehose::DeliveryStream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceBufferingHints": {
+            "additionalProperties": false,
+            "properties": {
+                "IntervalInSeconds": {
+                    "type": "number"
+                },
+                "SizeInMBs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceBufferingHints"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "ClusterEndpoint": {
+                    "type": "string"
+                },
+                "DomainARN": {
+                    "type": "string"
+                },
+                "IndexName": {
+                    "type": "string"
+                },
+                "IndexRotationPeriod": {
+                    "type": "string"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceRetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "TypeName": {
+                    "type": "string"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.VpcConfiguration"
+                }
+            },
+            "required": [
+                "IndexName",
+                "RoleARN",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceRetryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.BufferingHints": {
+            "additionalProperties": false,
+            "properties": {
+                "IntervalInSeconds": {
+                    "type": "number"
+                },
+                "SizeInMBs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "LogStreamName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.CopyCommand": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyOptions": {
+                    "type": "string"
+                },
+                "DataTableColumns": {
+                    "type": "string"
+                },
+                "DataTableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataTableName"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.DataFormatConversionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "InputFormatConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.InputFormatConfiguration"
+                },
+                "OutputFormatConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.OutputFormatConfiguration"
+                },
+                "SchemaConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SchemaConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.DeliveryStreamEncryptionConfigurationInput": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyARN": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KeyType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.Deserializer": {
+            "additionalProperties": false,
+            "properties": {
+                "HiveJsonSerDe": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HiveJsonSerDe"
+                },
+                "OpenXJsonSerDe": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.OpenXJsonSerDe"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.DynamicPartitioningConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RetryOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ElasticsearchBufferingHints": {
+            "additionalProperties": false,
+            "properties": {
+                "IntervalInSeconds": {
+                    "type": "number"
+                },
+                "SizeInMBs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ElasticsearchDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ElasticsearchBufferingHints"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "ClusterEndpoint": {
+                    "type": "string"
+                },
+                "DomainARN": {
+                    "type": "string"
+                },
+                "IndexName": {
+                    "type": "string"
+                },
+                "IndexRotationPeriod": {
+                    "type": "string"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ElasticsearchRetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "TypeName": {
+                    "type": "string"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.VpcConfiguration"
+                }
+            },
+            "required": [
+                "IndexName",
+                "RoleARN",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ElasticsearchRetryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSEncryptionConfig": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.KMSEncryptionConfig"
+                },
+                "NoEncryptionConfig": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ExtendedS3DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketARN": {
+                    "type": "string"
+                },
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.BufferingHints"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "CompressionFormat": {
+                    "type": "string"
+                },
+                "DataFormatConversionConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.DataFormatConversionConfiguration"
+                },
+                "DynamicPartitioningConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.DynamicPartitioningConfiguration"
+                },
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.EncryptionConfiguration"
+                },
+                "ErrorOutputPrefix": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3BackupConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.HiveJsonSerDe": {
+            "additionalProperties": false,
+            "properties": {
+                "TimestampFormats": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.HttpEndpointCommonAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "AttributeValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "AttributeValue"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.HttpEndpointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessKey": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.HttpEndpointDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.BufferingHints"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "EndpointConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointConfiguration"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RequestConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointRequestConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                }
+            },
+            "required": [
+                "EndpointConfiguration",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.HttpEndpointRequestConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CommonAttributes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointCommonAttribute"
+                    },
+                    "type": "array"
+                },
+                "ContentEncoding": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.InputFormatConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Deserializer": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.Deserializer"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.KMSEncryptionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AWSKMSKeyARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AWSKMSKeyARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.KinesisStreamSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KinesisStreamARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KinesisStreamARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.OpenXJsonSerDe": {
+            "additionalProperties": false,
+            "properties": {
+                "CaseInsensitive": {
+                    "type": "boolean"
+                },
+                "ColumnToJsonKeyMappings": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ConvertDotsInJsonKeysToUnderscores": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.OrcSerDe": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockSizeBytes": {
+                    "type": "number"
+                },
+                "BloomFilterColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BloomFilterFalsePositiveProbability": {
+                    "type": "number"
+                },
+                "Compression": {
+                    "type": "string"
+                },
+                "DictionaryKeyThreshold": {
+                    "type": "number"
+                },
+                "EnablePadding": {
+                    "type": "boolean"
+                },
+                "FormatVersion": {
+                    "type": "string"
+                },
+                "PaddingTolerance": {
+                    "type": "number"
+                },
+                "RowIndexStride": {
+                    "type": "number"
+                },
+                "StripeSizeBytes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.OutputFormatConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Serializer": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.Serializer"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ParquetSerDe": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockSizeBytes": {
+                    "type": "number"
+                },
+                "Compression": {
+                    "type": "string"
+                },
+                "EnableDictionaryCompression": {
+                    "type": "boolean"
+                },
+                "MaxPaddingBytes": {
+                    "type": "number"
+                },
+                "PageSizeBytes": {
+                    "type": "number"
+                },
+                "WriterVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Processors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.Processor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.Processor": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessorParameter"
+                    },
+                    "type": "array"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ProcessorParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ParameterName",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.RedshiftDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "ClusterJDBCURL": {
+                    "type": "string"
+                },
+                "CopyCommand": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CopyCommand"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RedshiftRetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3BackupConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClusterJDBCURL",
+                "CopyCommand",
+                "Password",
+                "RoleARN",
+                "S3Configuration",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.RedshiftRetryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.RetryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketARN": {
+                    "type": "string"
+                },
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.BufferingHints"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "CompressionFormat": {
+                    "type": "string"
+                },
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.EncryptionConfiguration"
+                },
+                "ErrorOutputPrefix": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.SchemaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "VersionId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.Serializer": {
+            "additionalProperties": false,
+            "properties": {
+                "OrcSerDe": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.OrcSerDe"
+                },
+                "ParquetSerDe": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ParquetSerDe"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.SplunkDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "HECAcknowledgmentTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "HECEndpoint": {
+                    "type": "string"
+                },
+                "HECEndpointType": {
+                    "type": "string"
+                },
+                "HECToken": {
+                    "type": "string"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SplunkRetryOptions"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                }
+            },
+            "required": [
+                "HECEndpoint",
+                "HECEndpointType",
+                "HECToken",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.SplunkRetryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleARN": {
+                    "type": "string"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "RoleARN",
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::LakeFormation::DataLakeSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Admins": {
+                            "$ref": "#/definitions/AWS::LakeFormation::DataLakeSettings.Admins"
+                        },
+                        "TrustedResourceOwners": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LakeFormation::DataLakeSettings"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::LakeFormation::DataLakeSettings.Admins": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::LakeFormation::DataLakeSettings.DataLakePrincipal": {
+            "additionalProperties": false,
+            "properties": {
+                "DataLakePrincipalIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataLakePrincipal": {
+                            "$ref": "#/definitions/AWS::LakeFormation::Permissions.DataLakePrincipal"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PermissionsWithGrantOption": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Resource": {
+                            "$ref": "#/definitions/AWS::LakeFormation::Permissions.Resource"
+                        }
+                    },
+                    "required": [
+                        "DataLakePrincipal",
+                        "Resource"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LakeFormation::Permissions"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.ColumnWildcard": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludedColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.DataLakePrincipal": {
+            "additionalProperties": false,
+            "properties": {
+                "DataLakePrincipalIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.DataLocationResource": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "S3Resource": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.DatabaseResource": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.Resource": {
+            "additionalProperties": false,
+            "properties": {
+                "DataLocationResource": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.DataLocationResource"
+                },
+                "DatabaseResource": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.DatabaseResource"
+                },
+                "TableResource": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.TableResource"
+                },
+                "TableWithColumnsResource": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.TableWithColumnsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.TableResource": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "TableWildcard": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.TableWildcard"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.TableWildcard": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.TableWithColumnsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "ColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ColumnWildcard": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.ColumnWildcard"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Resource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "UseServiceLinkedRole": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ResourceArn",
+                        "UseServiceLinkedRole"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LakeFormation::Resource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Alias": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "FunctionVersion": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ProvisionedConcurrencyConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Alias.ProvisionedConcurrencyConfiguration"
+                        },
+                        "RoutingConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Alias.AliasRoutingConfiguration"
+                        }
+                    },
+                    "required": [
+                        "FunctionName",
+                        "FunctionVersion",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::Alias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Alias.AliasRoutingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalVersionWeights": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Lambda::Alias.VersionWeight"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AdditionalVersionWeights"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Alias.ProvisionedConcurrencyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ProvisionedConcurrentExecutions": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ProvisionedConcurrentExecutions"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Alias.VersionWeight": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionVersion": {
+                    "type": "string"
+                },
+                "FunctionWeight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FunctionVersion",
+                "FunctionWeight"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::CodeSigningConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowedPublishers": {
+                            "$ref": "#/definitions/AWS::Lambda::CodeSigningConfig.AllowedPublishers"
+                        },
+                        "CodeSigningPolicies": {
+                            "$ref": "#/definitions/AWS::Lambda::CodeSigningConfig.CodeSigningPolicies"
+                        },
+                        "Description": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AllowedPublishers"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::CodeSigningConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::CodeSigningConfig.AllowedPublishers": {
+            "additionalProperties": false,
+            "properties": {
+                "SigningProfileVersionArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SigningProfileVersionArns"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::CodeSigningConfig.CodeSigningPolicies": {
+            "additionalProperties": false,
+            "properties": {
+                "UntrustedArtifactOnDeployment": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "UntrustedArtifactOnDeployment"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::EventInvokeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::EventInvokeConfig.DestinationConfig"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "MaximumEventAgeInSeconds": {
+                            "type": "number"
+                        },
+                        "MaximumRetryAttempts": {
+                            "type": "number"
+                        },
+                        "Qualifier": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FunctionName",
+                        "Qualifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::EventInvokeConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::EventInvokeConfig.DestinationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "OnFailure": {
+                    "$ref": "#/definitions/AWS::Lambda::EventInvokeConfig.OnFailure"
+                },
+                "OnSuccess": {
+                    "$ref": "#/definitions/AWS::Lambda::EventInvokeConfig.OnSuccess"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::EventInvokeConfig.OnFailure": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::EventInvokeConfig.OnSuccess": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BatchSize": {
+                            "type": "number"
+                        },
+                        "BisectBatchOnFunctionError": {
+                            "type": "boolean"
+                        },
+                        "DestinationConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.DestinationConfig"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "EventSourceArn": {
+                            "type": "string"
+                        },
+                        "FilterCriteria": {
+                            "type": "object"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "FunctionResponseTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MaximumBatchingWindowInSeconds": {
+                            "type": "number"
+                        },
+                        "MaximumRecordAgeInSeconds": {
+                            "type": "number"
+                        },
+                        "MaximumRetryAttempts": {
+                            "type": "number"
+                        },
+                        "ParallelizationFactor": {
+                            "type": "number"
+                        },
+                        "Queues": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SelfManagedEventSource": {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SelfManagedEventSource"
+                        },
+                        "SourceAccessConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SourceAccessConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "StartingPosition": {
+                            "type": "string"
+                        },
+                        "StartingPositionTimestamp": {
+                            "type": "number"
+                        },
+                        "Topics": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "TumblingWindowInSeconds": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "FunctionName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::EventSourceMapping"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping.DestinationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "OnFailure": {
+                    "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.OnFailure"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping.Endpoints": {
+            "additionalProperties": false,
+            "properties": {
+                "KafkaBootstrapServers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping.OnFailure": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping.SelfManagedEventSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoints": {
+                    "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.Endpoints"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping.SourceAccessConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "URI": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Architectures": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Code": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.Code"
+                        },
+                        "CodeSigningConfigArn": {
+                            "type": "string"
+                        },
+                        "DeadLetterConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.DeadLetterConfig"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Environment": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.Environment"
+                        },
+                        "FileSystemConfigs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Lambda::Function.FileSystemConfig"
+                            },
+                            "type": "array"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "Handler": {
+                            "type": "string"
+                        },
+                        "ImageConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.ImageConfig"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "Layers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MemorySize": {
+                            "type": "number"
+                        },
+                        "PackageType": {
+                            "type": "string"
+                        },
+                        "ReservedConcurrentExecutions": {
+                            "type": "number"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "Runtime": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Timeout": {
+                            "type": "number"
+                        },
+                        "TracingConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.TracingConfig"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "Code",
+                        "Role"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::Function"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Function.Code": {
+            "additionalProperties": false,
+            "properties": {
+                "ImageUri": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                },
+                "S3ObjectVersion": {
+                    "type": "string"
+                },
+                "ZipFile": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function.DeadLetterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function.Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "Variables": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function.FileSystemConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "LocalMountPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn",
+                "LocalMountPath"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Function.ImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Command": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EntryPoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "WorkingDirectory": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function.TracingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::LayerVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CompatibleArchitectures": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CompatibleRuntimes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Content": {
+                            "$ref": "#/definitions/AWS::Lambda::LayerVersion.Content"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LayerName": {
+                            "type": "string"
+                        },
+                        "LicenseInfo": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Content"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::LayerVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::LayerVersion.Content": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                },
+                "S3ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::LayerVersionPermission": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "LayerVersionArn": {
+                            "type": "string"
+                        },
+                        "OrganizationId": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Action",
+                        "LayerVersionArn",
+                        "Principal"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::LayerVersionPermission"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Permission": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "EventSourceToken": {
+                            "type": "string"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        },
+                        "SourceAccount": {
+                            "type": "string"
+                        },
+                        "SourceArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Action",
+                        "FunctionName",
+                        "Principal"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::Permission"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Version": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CodeSha256": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "ProvisionedConcurrencyConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Version.ProvisionedConcurrencyConfiguration"
+                        }
+                    },
+                    "required": [
+                        "FunctionName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::Version"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Version.ProvisionedConcurrencyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ProvisionedConcurrentExecutions": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ProvisionedConcurrentExecutions"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::Grant": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowedOperations": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "GrantName": {
+                            "type": "string"
+                        },
+                        "HomeRegion": {
+                            "type": "string"
+                        },
+                        "LicenseArn": {
+                            "type": "string"
+                        },
+                        "Principals": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LicenseManager::Grant"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Beneficiary": {
+                            "type": "string"
+                        },
+                        "ConsumptionConfiguration": {
+                            "$ref": "#/definitions/AWS::LicenseManager::License.ConsumptionConfiguration"
+                        },
+                        "Entitlements": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::LicenseManager::License.Entitlement"
+                            },
+                            "type": "array"
+                        },
+                        "HomeRegion": {
+                            "type": "string"
+                        },
+                        "Issuer": {
+                            "$ref": "#/definitions/AWS::LicenseManager::License.IssuerData"
+                        },
+                        "LicenseMetadata": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::LicenseManager::License.Metadata"
+                            },
+                            "type": "array"
+                        },
+                        "LicenseName": {
+                            "type": "string"
+                        },
+                        "ProductName": {
+                            "type": "string"
+                        },
+                        "ProductSKU": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Validity": {
+                            "$ref": "#/definitions/AWS::LicenseManager::License.ValidityDateFormat"
+                        }
+                    },
+                    "required": [
+                        "ConsumptionConfiguration",
+                        "Entitlements",
+                        "HomeRegion",
+                        "Issuer",
+                        "LicenseName",
+                        "ProductName",
+                        "Validity"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LicenseManager::License"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.BorrowConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowEarlyCheckIn": {
+                    "type": "boolean"
+                },
+                "MaxTimeToLiveInMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AllowEarlyCheckIn",
+                "MaxTimeToLiveInMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.ConsumptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BorrowConfiguration": {
+                    "$ref": "#/definitions/AWS::LicenseManager::License.BorrowConfiguration"
+                },
+                "ProvisionalConfiguration": {
+                    "$ref": "#/definitions/AWS::LicenseManager::License.ProvisionalConfiguration"
+                },
+                "RenewType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.Entitlement": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowCheckIn": {
+                    "type": "boolean"
+                },
+                "MaxCount": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Overage": {
+                    "type": "boolean"
+                },
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Unit"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.IssuerData": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SignKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.Metadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.ProvisionalConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTimeToLiveInMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxTimeToLiveInMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.ValidityDateFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "Begin": {
+                    "type": "string"
+                },
+                "End": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Begin",
+                "End"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Database": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "BackupRetention": {
+                            "type": "boolean"
+                        },
+                        "CaCertificateIdentifier": {
+                            "type": "string"
+                        },
+                        "MasterDatabaseName": {
+                            "type": "string"
+                        },
+                        "MasterUserPassword": {
+                            "type": "string"
+                        },
+                        "MasterUsername": {
+                            "type": "string"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "PubliclyAccessible": {
+                            "type": "boolean"
+                        },
+                        "RelationalDatabaseBlueprintId": {
+                            "type": "string"
+                        },
+                        "RelationalDatabaseBundleId": {
+                            "type": "string"
+                        },
+                        "RelationalDatabaseName": {
+                            "type": "string"
+                        },
+                        "RelationalDatabaseParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Lightsail::Database.RelationalDatabaseParameter"
+                            },
+                            "type": "array"
+                        },
+                        "RotateMasterUserPassword": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MasterDatabaseName",
+                        "MasterUsername",
+                        "RelationalDatabaseBlueprintId",
+                        "RelationalDatabaseBundleId",
+                        "RelationalDatabaseName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lightsail::Database"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Database.RelationalDatabaseParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedValues": {
+                    "type": "string"
+                },
+                "ApplyMethod": {
+                    "type": "string"
+                },
+                "ApplyType": {
+                    "type": "string"
+                },
+                "DataType": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "IsModifiable": {
+                    "type": "boolean"
+                },
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Disk": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AddOns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Lightsail::Disk.AddOn"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "DiskName": {
+                            "type": "string"
+                        },
+                        "SizeInGb": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DiskName",
+                        "SizeInGb"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lightsail::Disk"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Disk.AddOn": {
+            "additionalProperties": false,
+            "properties": {
+                "AddOnType": {
+                    "type": "string"
+                },
+                "AutoSnapshotAddOnRequest": {
+                    "$ref": "#/definitions/AWS::Lightsail::Disk.AutoSnapshotAddOn"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AddOnType"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Disk.AutoSnapshotAddOn": {
+            "additionalProperties": false,
+            "properties": {
+                "SnapshotTimeOfDay": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AddOns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Lightsail::Instance.AddOn"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "BlueprintId": {
+                            "type": "string"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Hardware": {
+                            "$ref": "#/definitions/AWS::Lightsail::Instance.Hardware"
+                        },
+                        "InstanceName": {
+                            "type": "string"
+                        },
+                        "KeyPairName": {
+                            "type": "string"
+                        },
+                        "Networking": {
+                            "$ref": "#/definitions/AWS::Lightsail::Instance.Networking"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserData": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "BlueprintId",
+                        "BundleId",
+                        "InstanceName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lightsail::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.AddOn": {
+            "additionalProperties": false,
+            "properties": {
+                "AddOnType": {
+                    "type": "string"
+                },
+                "AutoSnapshotAddOnRequest": {
+                    "$ref": "#/definitions/AWS::Lightsail::Instance.AutoSnapshotAddOn"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AddOnType"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.AutoSnapshotAddOn": {
+            "additionalProperties": false,
+            "properties": {
+                "SnapshotTimeOfDay": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.Disk": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachedTo": {
+                    "type": "string"
+                },
+                "AttachmentState": {
+                    "type": "string"
+                },
+                "DiskName": {
+                    "type": "string"
+                },
+                "IOPS": {
+                    "type": "number"
+                },
+                "IsSystemDisk": {
+                    "type": "boolean"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "SizeInGb": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DiskName",
+                "Path"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.Hardware": {
+            "additionalProperties": false,
+            "properties": {
+                "CpuCount": {
+                    "type": "number"
+                },
+                "Disks": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Lightsail::Instance.Disk"
+                    },
+                    "type": "array"
+                },
+                "RamSizeInGb": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.Location": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "RegionName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.MonthlyTransfer": {
+            "additionalProperties": false,
+            "properties": {
+                "GbPerMonthAllocated": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.Networking": {
+            "additionalProperties": false,
+            "properties": {
+                "MonthlyTransfer": {
+                    "$ref": "#/definitions/AWS::Lightsail::Instance.MonthlyTransfer"
+                },
+                "Ports": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Lightsail::Instance.Port"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Ports"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.Port": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessDirection": {
+                    "type": "string"
+                },
+                "AccessFrom": {
+                    "type": "string"
+                },
+                "AccessType": {
+                    "type": "string"
+                },
+                "CidrListAliases": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Cidrs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CommonName": {
+                    "type": "string"
+                },
+                "FromPort": {
+                    "type": "number"
+                },
+                "Ipv6Cidrs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.State": {
+            "additionalProperties": false,
+            "properties": {
+                "Code": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::StaticIp": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AttachedTo": {
+                            "type": "string"
+                        },
+                        "StaticIpName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "StaticIpName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lightsail::StaticIp"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::GeofenceCollection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CollectionName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        },
+                        "PricingPlanDataSource": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CollectionName",
+                        "PricingPlan"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::GeofenceCollection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::Map": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::Location::Map.MapConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "MapName": {
+                            "type": "string"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Configuration",
+                        "MapName",
+                        "PricingPlan"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::Map"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::Map.MapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Style": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Style"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::PlaceIndex": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataSource": {
+                            "type": "string"
+                        },
+                        "DataSourceConfiguration": {
+                            "$ref": "#/definitions/AWS::Location::PlaceIndex.DataSourceConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IndexName": {
+                            "type": "string"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DataSource",
+                        "IndexName",
+                        "PricingPlan"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::PlaceIndex"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::PlaceIndex.DataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IntendedUse": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Location::RouteCalculator": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CalculatorName": {
+                            "type": "string"
+                        },
+                        "DataSource": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CalculatorName",
+                        "DataSource",
+                        "PricingPlan"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::RouteCalculator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::Tracker": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "PositionFiltering": {
+                            "type": "string"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        },
+                        "PricingPlanDataSource": {
+                            "type": "string"
+                        },
+                        "TrackerName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PricingPlan",
+                        "TrackerName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::Tracker"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::TrackerConsumer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConsumerArn": {
+                            "type": "string"
+                        },
+                        "TrackerName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConsumerArn",
+                        "TrackerName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::TrackerConsumer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationName": {
+                            "type": "string"
+                        },
+                        "DestinationPolicy": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "TargetArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationName",
+                        "DestinationPolicy",
+                        "RoleArn",
+                        "TargetArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::Destination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::LogGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "RetentionInDays": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::LogGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::LogStream": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "LogStreamName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LogGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::LogStream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::MetricFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FilterPattern": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "MetricTransformations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Logs::MetricFilter.MetricTransformation"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FilterPattern",
+                        "LogGroupName",
+                        "MetricTransformations"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::MetricFilter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::MetricFilter.MetricTransformation": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultValue": {
+                    "type": "number"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "MetricNamespace": {
+                    "type": "string"
+                },
+                "MetricValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "MetricNamespace",
+                "MetricValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::QueryDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LogGroupNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QueryString": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "QueryString"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::QueryDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::ResourcePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyDocument": {
+                            "type": "string"
+                        },
+                        "PolicyName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument",
+                        "PolicyName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::ResourcePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::SubscriptionFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationArn": {
+                            "type": "string"
+                        },
+                        "FilterPattern": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationArn",
+                        "FilterPattern",
+                        "LogGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::SubscriptionFilter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutEquipment::InferenceScheduler": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataDelayOffsetInMinutes": {
+                            "type": "number"
+                        },
+                        "DataInputConfiguration": {
+                            "type": "object"
+                        },
+                        "DataOutputConfiguration": {
+                            "type": "object"
+                        },
+                        "DataUploadFrequency": {
+                            "type": "string"
+                        },
+                        "InferenceSchedulerName": {
+                            "type": "string"
+                        },
+                        "ModelName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "ServerSideKmsKeyId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DataInputConfiguration",
+                        "DataOutputConfiguration",
+                        "DataUploadFrequency",
+                        "ModelName",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LookoutEquipment::InferenceScheduler"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::Alert": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "$ref": "#/definitions/AWS::LookoutMetrics::Alert.Action"
+                        },
+                        "AlertDescription": {
+                            "type": "string"
+                        },
+                        "AlertName": {
+                            "type": "string"
+                        },
+                        "AlertSensitivityThreshold": {
+                            "type": "number"
+                        },
+                        "AnomalyDetectorArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Action",
+                        "AlertSensitivityThreshold",
+                        "AnomalyDetectorArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LookoutMetrics::Alert"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::Alert.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaConfiguration": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::Alert.LambdaConfiguration"
+                },
+                "SNSConfiguration": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::Alert.SNSConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::Alert.LambdaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaArn",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::Alert.SNSConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SnsTopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SnsTopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AnomalyDetectorConfig": {
+                            "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.AnomalyDetectorConfig"
+                        },
+                        "AnomalyDetectorDescription": {
+                            "type": "string"
+                        },
+                        "AnomalyDetectorName": {
+                            "type": "string"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "MetricSetList": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.MetricSet"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AnomalyDetectorConfig",
+                        "MetricSetList"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LookoutMetrics::AnomalyDetector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.AnomalyDetectorConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AnomalyDetectorFrequency": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AnomalyDetectorFrequency"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.AppFlowConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FlowName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FlowName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.CloudwatchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.CsvFormatDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "Charset": {
+                    "type": "string"
+                },
+                "ContainsHeader": {
+                    "type": "boolean"
+                },
+                "Delimiter": {
+                    "type": "string"
+                },
+                "FileCompression": {
+                    "type": "string"
+                },
+                "HeaderList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "QuoteSymbol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.FileFormatDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "CsvFormatDescriptor": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.CsvFormatDescriptor"
+                },
+                "JsonFormatDescriptor": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.JsonFormatDescriptor"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.JsonFormatDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "Charset": {
+                    "type": "string"
+                },
+                "FileCompression": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.Metric": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregationFunction": {
+                    "type": "string"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AggregationFunction",
+                "MetricName"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.MetricSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MetricList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.Metric"
+                    },
+                    "type": "array"
+                },
+                "MetricSetDescription": {
+                    "type": "string"
+                },
+                "MetricSetFrequency": {
+                    "type": "string"
+                },
+                "MetricSetName": {
+                    "type": "string"
+                },
+                "MetricSource": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.MetricSource"
+                },
+                "Offset": {
+                    "type": "number"
+                },
+                "TimestampColumn": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.TimestampColumn"
+                },
+                "Timezone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricList",
+                "MetricSetName",
+                "MetricSource"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.MetricSource": {
+            "additionalProperties": false,
+            "properties": {
+                "AppFlowConfig": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.AppFlowConfig"
+                },
+                "CloudwatchConfig": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.CloudwatchConfig"
+                },
+                "RDSSourceConfig": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.RDSSourceConfig"
+                },
+                "RedshiftSourceConfig": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.RedshiftSourceConfig"
+                },
+                "S3SourceConfig": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.S3SourceConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.RDSSourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DBInstanceIdentifier": {
+                    "type": "string"
+                },
+                "DatabaseHost": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DatabasePort": {
+                    "type": "number"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretManagerArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.VpcConfiguration"
+                }
+            },
+            "required": [
+                "DBInstanceIdentifier",
+                "DatabaseHost",
+                "DatabaseName",
+                "DatabasePort",
+                "RoleArn",
+                "SecretManagerArn",
+                "TableName",
+                "VpcConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.RedshiftSourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterIdentifier": {
+                    "type": "string"
+                },
+                "DatabaseHost": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DatabasePort": {
+                    "type": "number"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretManagerArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.VpcConfiguration"
+                }
+            },
+            "required": [
+                "ClusterIdentifier",
+                "DatabaseHost",
+                "DatabaseName",
+                "DatabasePort",
+                "RoleArn",
+                "SecretManagerArn",
+                "TableName",
+                "VpcConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.S3SourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FileFormatDescriptor": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.FileFormatDescriptor"
+                },
+                "HistoricalDataPathList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TemplatedPathList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FileFormatDescriptor",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.TimestampColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnFormat": {
+                    "type": "string"
+                },
+                "ColumnName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIdList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIdList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIdList",
+                "SubnetIdList"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutVision::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ProjectName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProjectName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LookoutVision::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BrokerNodeGroupInfo": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.BrokerNodeGroupInfo"
+                        },
+                        "ClientAuthentication": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.ClientAuthentication"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "ConfigurationInfo": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.ConfigurationInfo"
+                        },
+                        "EncryptionInfo": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.EncryptionInfo"
+                        },
+                        "EnhancedMonitoring": {
+                            "type": "string"
+                        },
+                        "KafkaVersion": {
+                            "type": "string"
+                        },
+                        "LoggingInfo": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.LoggingInfo"
+                        },
+                        "NumberOfBrokerNodes": {
+                            "type": "number"
+                        },
+                        "OpenMonitoring": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.OpenMonitoring"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "BrokerNodeGroupInfo",
+                        "ClusterName",
+                        "KafkaVersion",
+                        "NumberOfBrokerNodes"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MSK::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.BrokerLogs": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogs": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.CloudWatchLogs"
+                },
+                "Firehose": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Firehose"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.S3"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.BrokerNodeGroupInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "BrokerAZDistribution": {
+                    "type": "string"
+                },
+                "ClientSubnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ConnectivityInfo": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.ConnectivityInfo"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StorageInfo": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.StorageInfo"
+                }
+            },
+            "required": [
+                "ClientSubnets",
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.ClientAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "Sasl": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Sasl"
+                },
+                "Tls": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Tls"
+                },
+                "Unauthenticated": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Unauthenticated"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.CloudWatchLogs": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "LogGroup": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.ConfigurationInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "Revision": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Arn",
+                "Revision"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.ConnectivityInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "PublicAccess": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.PublicAccess"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.EBSStorageInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "VolumeSize": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.EncryptionAtRest": {
+            "additionalProperties": false,
+            "properties": {
+                "DataVolumeKMSKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataVolumeKMSKeyId"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.EncryptionInTransit": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientBroker": {
+                    "type": "string"
+                },
+                "InCluster": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.EncryptionInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionAtRest": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.EncryptionAtRest"
+                },
+                "EncryptionInTransit": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.EncryptionInTransit"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Firehose": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStream": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Iam": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.JmxExporter": {
+            "additionalProperties": false,
+            "properties": {
+                "EnabledInBroker": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "EnabledInBroker"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.LoggingInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "BrokerLogs": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.BrokerLogs"
+                }
+            },
+            "required": [
+                "BrokerLogs"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.NodeExporter": {
+            "additionalProperties": false,
+            "properties": {
+                "EnabledInBroker": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "EnabledInBroker"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.OpenMonitoring": {
+            "additionalProperties": false,
+            "properties": {
+                "Prometheus": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Prometheus"
+                }
+            },
+            "required": [
+                "Prometheus"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Prometheus": {
+            "additionalProperties": false,
+            "properties": {
+                "JmxExporter": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.JmxExporter"
+                },
+                "NodeExporter": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.NodeExporter"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.PublicAccess": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Sasl": {
+            "additionalProperties": false,
+            "properties": {
+                "Iam": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Iam"
+                },
+                "Scram": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Scram"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Scram": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.StorageInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "EBSStorageInfo": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.EBSStorageInfo"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Tls": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateAuthorityArnList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Unauthenticated": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MWAA::Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AirflowConfigurationOptions": {
+                            "type": "object"
+                        },
+                        "AirflowVersion": {
+                            "type": "string"
+                        },
+                        "DagS3Path": {
+                            "type": "string"
+                        },
+                        "EnvironmentClass": {
+                            "type": "string"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "KmsKey": {
+                            "type": "string"
+                        },
+                        "LoggingConfiguration": {
+                            "$ref": "#/definitions/AWS::MWAA::Environment.LoggingConfiguration"
+                        },
+                        "MaxWorkers": {
+                            "type": "number"
+                        },
+                        "MinWorkers": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NetworkConfiguration": {
+                            "$ref": "#/definitions/AWS::MWAA::Environment.NetworkConfiguration"
+                        },
+                        "PluginsS3ObjectVersion": {
+                            "type": "string"
+                        },
+                        "PluginsS3Path": {
+                            "type": "string"
+                        },
+                        "RequirementsS3ObjectVersion": {
+                            "type": "string"
+                        },
+                        "RequirementsS3Path": {
+                            "type": "string"
+                        },
+                        "Schedulers": {
+                            "type": "number"
+                        },
+                        "SourceBucketArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "WebserverAccessMode": {
+                            "type": "string"
+                        },
+                        "WeeklyMaintenanceWindowStart": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MWAA::Environment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MWAA::Environment.LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DagProcessingLogs": {
+                    "$ref": "#/definitions/AWS::MWAA::Environment.ModuleLoggingConfiguration"
+                },
+                "SchedulerLogs": {
+                    "$ref": "#/definitions/AWS::MWAA::Environment.ModuleLoggingConfiguration"
+                },
+                "TaskLogs": {
+                    "$ref": "#/definitions/AWS::MWAA::Environment.ModuleLoggingConfiguration"
+                },
+                "WebserverLogs": {
+                    "$ref": "#/definitions/AWS::MWAA::Environment.ModuleLoggingConfiguration"
+                },
+                "WorkerLogs": {
+                    "$ref": "#/definitions/AWS::MWAA::Environment.ModuleLoggingConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MWAA::Environment.ModuleLoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogGroupArn": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "LogLevel": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MWAA::Environment.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Macie::CustomDataIdentifier": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "IgnoreWords": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Keywords": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MaximumMatchDistance": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Regex": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Regex"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Macie::CustomDataIdentifier"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Macie::FindingsFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FindingCriteria": {
+                            "$ref": "#/definitions/AWS::Macie::FindingsFilter.FindingCriteria"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Position": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "FindingCriteria",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Macie::FindingsFilter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Macie::FindingsFilter.Criterion": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::Macie::FindingsFilter.FindingCriteria": {
+            "additionalProperties": false,
+            "properties": {
+                "Criterion": {
+                    "$ref": "#/definitions/AWS::Macie::FindingsFilter.Criterion"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Macie::FindingsFilter.FindingsFilterListItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Macie::Session": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FindingPublishingFrequency": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Macie::Session"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InvitationId": {
+                            "type": "string"
+                        },
+                        "MemberConfiguration": {
+                            "$ref": "#/definitions/AWS::ManagedBlockchain::Member.MemberConfiguration"
+                        },
+                        "NetworkConfiguration": {
+                            "$ref": "#/definitions/AWS::ManagedBlockchain::Member.NetworkConfiguration"
+                        },
+                        "NetworkId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MemberConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ManagedBlockchain::Member"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.ApprovalThresholdPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ProposalDurationInHours": {
+                    "type": "number"
+                },
+                "ThresholdComparator": {
+                    "type": "string"
+                },
+                "ThresholdPercentage": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.MemberConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "MemberFrameworkConfiguration": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.MemberFrameworkConfiguration"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.MemberFabricConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AdminPassword": {
+                    "type": "string"
+                },
+                "AdminUsername": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AdminPassword",
+                "AdminUsername"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.MemberFrameworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MemberFabricConfiguration": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.MemberFabricConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Framework": {
+                    "type": "string"
+                },
+                "FrameworkVersion": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "NetworkFrameworkConfiguration": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.NetworkFrameworkConfiguration"
+                },
+                "VotingPolicy": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.VotingPolicy"
+                }
+            },
+            "required": [
+                "Framework",
+                "FrameworkVersion",
+                "Name",
+                "VotingPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.NetworkFabricConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Edition": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Edition"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.NetworkFrameworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NetworkFabricConfiguration": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.NetworkFabricConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.VotingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ApprovalThresholdPolicy": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.ApprovalThresholdPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Node": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MemberId": {
+                            "type": "string"
+                        },
+                        "NetworkId": {
+                            "type": "string"
+                        },
+                        "NodeConfiguration": {
+                            "$ref": "#/definitions/AWS::ManagedBlockchain::Node.NodeConfiguration"
+                        }
+                    },
+                    "required": [
+                        "NetworkId",
+                        "NodeConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ManagedBlockchain::Node"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Node.NodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "InstanceType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AvailabilityZone",
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Source": {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow.Source"
+                        },
+                        "SourceFailoverConfig": {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow.FailoverConfig"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Source"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::Flow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.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": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.FailoverConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RecoveryWindow": {
+                    "type": "number"
+                },
+                "State": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.Source": {
+            "additionalProperties": false,
+            "properties": {
+                "Decryption": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.Encryption"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "EntitlementArn": {
+                    "type": "string"
+                },
+                "IngestIp": {
+                    "type": "string"
+                },
+                "IngestPort": {
+                    "type": "number"
+                },
+                "MaxBitrate": {
+                    "type": "number"
+                },
+                "MaxLatency": {
+                    "type": "number"
+                },
+                "MinLatency": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "SourceArn": {
+                    "type": "string"
+                },
+                "SourceIngestPort": {
+                    "type": "string"
+                },
+                "StreamId": {
+                    "type": "string"
+                },
+                "VpcInterfaceName": {
+                    "type": "string"
+                },
+                "WhitelistCidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowEntitlement": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CidrAllowList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Destination": {
+                            "type": "string"
+                        },
+                        "Encryption": {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.Encryption"
+                        },
+                        "FlowArn": {
+                            "type": "string"
+                        },
+                        "MaxLatency": {
+                            "type": "number"
+                        },
+                        "MinLatency": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "RemoteId": {
+                            "type": "string"
+                        },
+                        "SmoothingLatency": {
+                            "type": "number"
+                        },
+                        "StreamId": {
+                            "type": "string"
+                        },
+                        "VpcInterfaceAttachment": {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.VpcInterfaceAttachment"
+                        }
+                    },
+                    "required": [
+                        "FlowArn",
+                        "Protocol"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::FlowOutput"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput.Encryption": {
+            "additionalProperties": false,
+            "properties": {
+                "Algorithm": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SecretArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput.VpcInterfaceAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "VpcInterfaceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Decryption": {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowSource.Encryption"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EntitlementArn": {
+                            "type": "string"
+                        },
+                        "FlowArn": {
+                            "type": "string"
+                        },
+                        "IngestPort": {
+                            "type": "number"
+                        },
+                        "MaxBitrate": {
+                            "type": "number"
+                        },
+                        "MaxLatency": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "StreamId": {
+                            "type": "string"
+                        },
+                        "VpcInterfaceName": {
+                            "type": "string"
+                        },
+                        "WhitelistCidr": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::FlowSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowSource.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::FlowVpcInterface": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FlowArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FlowArn",
+                        "Name",
+                        "RoleArn",
+                        "SecurityGroupIds",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::FlowVpcInterface"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConvert::JobTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccelerationSettings": {
+                            "$ref": "#/definitions/AWS::MediaConvert::JobTemplate.AccelerationSettings"
+                        },
+                        "Category": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "HopDestinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConvert::JobTemplate.HopDestination"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        },
+                        "Queue": {
+                            "type": "string"
+                        },
+                        "SettingsJson": {
+                            "type": "object"
+                        },
+                        "StatusUpdateInterval": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "SettingsJson"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConvert::JobTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConvert::JobTemplate.AccelerationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConvert::JobTemplate.HopDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "Queue": {
+                    "type": "string"
+                },
+                "WaitMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConvert::Preset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Category": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SettingsJson": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "SettingsJson"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConvert::Preset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConvert::Queue": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConvert::Queue"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CdiInputSpecification": {
+                            "$ref": "#/definitions/AWS::MediaLive::Channel.CdiInputSpecification"
+                        },
+                        "ChannelClass": {
+                            "type": "string"
+                        },
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Channel.OutputDestination"
+                            },
+                            "type": "array"
+                        },
+                        "EncoderSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Channel.EncoderSettings"
+                        },
+                        "InputAttachments": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Channel.InputAttachment"
+                            },
+                            "type": "array"
+                        },
+                        "InputSpecification": {
+                            "$ref": "#/definitions/AWS::MediaLive::Channel.InputSpecification"
+                        },
+                        "LogLevel": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Vpc": {
+                            "$ref": "#/definitions/AWS::MediaLive::Channel.VpcOutputSettings"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Channel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AacSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Bitrate": {
+                    "type": "number"
+                },
+                "CodingMode": {
+                    "type": "string"
+                },
+                "InputType": {
+                    "type": "string"
+                },
+                "Profile": {
+                    "type": "string"
+                },
+                "RateControlMode": {
+                    "type": "string"
+                },
+                "RawFormat": {
+                    "type": "string"
+                },
+                "SampleRate": {
+                    "type": "number"
+                },
+                "Spec": {
+                    "type": "string"
+                },
+                "VbrQuality": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Ac3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "Bitrate": {
+                    "type": "number"
+                },
+                "BitstreamMode": {
+                    "type": "string"
+                },
+                "CodingMode": {
+                    "type": "string"
+                },
+                "Dialnorm": {
+                    "type": "number"
+                },
+                "DrcProfile": {
+                    "type": "string"
+                },
+                "LfeFilter": {
+                    "type": "string"
+                },
+                "MetadataControl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AncillarySourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceAncillaryChannelNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ArchiveCdnSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ArchiveS3Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ArchiveS3Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ArchiveContainerSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "M2tsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.M2tsSettings"
+                },
+                "RawSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.RawSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ArchiveGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ArchiveCdnSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ArchiveCdnSettings"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "RolloverInterval": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ArchiveOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ArchiveContainerSettings"
+                },
+                "Extension": {
+                    "type": "string"
+                },
+                "NameModifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ArchiveS3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "CannedAcl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AribDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AribSourceSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioChannelMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "InputChannelLevels": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.InputChannelLevel"
+                    },
+                    "type": "array"
+                },
+                "OutputChannel": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioCodecSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AacSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AacSettings"
+                },
+                "Ac3Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Ac3Settings"
+                },
+                "Eac3Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Eac3Settings"
+                },
+                "Mp2Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Mp2Settings"
+                },
+                "PassThroughSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.PassThroughSettings"
+                },
+                "WavSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.WavSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioNormalizationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioNormalizationSettings"
+                },
+                "AudioSelectorName": {
+                    "type": "string"
+                },
+                "AudioType": {
+                    "type": "string"
+                },
+                "AudioTypeControl": {
+                    "type": "string"
+                },
+                "AudioWatermarkingSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioWatermarkSettings"
+                },
+                "CodecSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioCodecSettings"
+                },
+                "LanguageCode": {
+                    "type": "string"
+                },
+                "LanguageCodeControl": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "RemixSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.RemixSettings"
+                },
+                "StreamName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioHlsRenditionSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioLanguageSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "LanguageCode": {
+                    "type": "string"
+                },
+                "LanguageSelectionPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioNormalizationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Algorithm": {
+                    "type": "string"
+                },
+                "AlgorithmControl": {
+                    "type": "string"
+                },
+                "TargetLkfs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioOnlyHlsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioGroupId": {
+                    "type": "string"
+                },
+                "AudioOnlyImage": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "AudioTrackType": {
+                    "type": "string"
+                },
+                "SegmentType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioPidSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "Pid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SelectorSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioSelectorSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioSelectorSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioHlsRenditionSelection": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioHlsRenditionSelection"
+                },
+                "AudioLanguageSelection": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioLanguageSelection"
+                },
+                "AudioPidSelection": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioPidSelection"
+                },
+                "AudioTrackSelection": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioTrackSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioSilenceFailoverSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioSelectorName": {
+                    "type": "string"
+                },
+                "AudioSilenceThresholdMsec": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioTrack": {
+            "additionalProperties": false,
+            "properties": {
+                "Track": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioTrackSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "Tracks": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.AudioTrack"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioWatermarkSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NielsenWatermarksSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.NielsenWatermarksSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AutomaticInputFailoverSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorClearTimeMsec": {
+                    "type": "number"
+                },
+                "FailoverConditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.FailoverCondition"
+                    },
+                    "type": "array"
+                },
+                "InputPreference": {
+                    "type": "string"
+                },
+                "SecondaryInputId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AvailBlanking": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailBlankingImage": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "State": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AvailConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AvailSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AvailSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Scte35SpliceInsert": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte35SpliceInsert"
+                },
+                "Scte35TimeSignalApos": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte35TimeSignalApos"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.BlackoutSlate": {
+            "additionalProperties": false,
+            "properties": {
+                "BlackoutSlateImage": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "NetworkEndBlackout": {
+                    "type": "string"
+                },
+                "NetworkEndBlackoutImage": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "NetworkId": {
+                    "type": "string"
+                },
+                "State": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.BurnInDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BackgroundOpacity": {
+                    "type": "number"
+                },
+                "Font": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "FontColor": {
+                    "type": "string"
+                },
+                "FontOpacity": {
+                    "type": "number"
+                },
+                "FontResolution": {
+                    "type": "number"
+                },
+                "FontSize": {
+                    "type": "string"
+                },
+                "OutlineColor": {
+                    "type": "string"
+                },
+                "OutlineSize": {
+                    "type": "number"
+                },
+                "ShadowColor": {
+                    "type": "string"
+                },
+                "ShadowOpacity": {
+                    "type": "number"
+                },
+                "ShadowXOffset": {
+                    "type": "number"
+                },
+                "ShadowYOffset": {
+                    "type": "number"
+                },
+                "TeletextGridControl": {
+                    "type": "string"
+                },
+                "XPosition": {
+                    "type": "number"
+                },
+                "YPosition": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptionSelectorName": {
+                    "type": "string"
+                },
+                "DestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionDestinationSettings"
+                },
+                "LanguageCode": {
+                    "type": "string"
+                },
+                "LanguageDescription": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AribDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AribDestinationSettings"
+                },
+                "BurnInDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.BurnInDestinationSettings"
+                },
+                "DvbSubDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.DvbSubDestinationSettings"
+                },
+                "EbuTtDDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.EbuTtDDestinationSettings"
+                },
+                "EmbeddedDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.EmbeddedDestinationSettings"
+                },
+                "EmbeddedPlusScte20DestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.EmbeddedPlusScte20DestinationSettings"
+                },
+                "RtmpCaptionInfoDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.RtmpCaptionInfoDestinationSettings"
+                },
+                "Scte20PlusEmbeddedDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte20PlusEmbeddedDestinationSettings"
+                },
+                "Scte27DestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte27DestinationSettings"
+                },
+                "SmpteTtDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.SmpteTtDestinationSettings"
+                },
+                "TeletextDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TeletextDestinationSettings"
+                },
+                "TtmlDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TtmlDestinationSettings"
+                },
+                "WebvttDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.WebvttDestinationSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionLanguageMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptionChannel": {
+                    "type": "number"
+                },
+                "LanguageCode": {
+                    "type": "string"
+                },
+                "LanguageDescription": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionRectangle": {
+            "additionalProperties": false,
+            "properties": {
+                "Height": {
+                    "type": "number"
+                },
+                "LeftOffset": {
+                    "type": "number"
+                },
+                "TopOffset": {
+                    "type": "number"
+                },
+                "Width": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "LanguageCode": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SelectorSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionSelectorSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionSelectorSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AncillarySourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AncillarySourceSettings"
+                },
+                "AribSourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AribSourceSettings"
+                },
+                "DvbSubSourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.DvbSubSourceSettings"
+                },
+                "EmbeddedSourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.EmbeddedSourceSettings"
+                },
+                "Scte20SourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte20SourceSettings"
+                },
+                "Scte27SourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte27SourceSettings"
+                },
+                "TeletextSourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TeletextSourceSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CdiInputSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Resolution": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ColorSpacePassthroughSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.DvbNitSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NetworkId": {
+                    "type": "number"
+                },
+                "NetworkName": {
+                    "type": "string"
+                },
+                "RepInterval": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.DvbSdtSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "OutputSdt": {
+                    "type": "string"
+                },
+                "RepInterval": {
+                    "type": "number"
+                },
+                "ServiceName": {
+                    "type": "string"
+                },
+                "ServiceProviderName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.DvbSubDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BackgroundOpacity": {
+                    "type": "number"
+                },
+                "Font": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "FontColor": {
+                    "type": "string"
+                },
+                "FontOpacity": {
+                    "type": "number"
+                },
+                "FontResolution": {
+                    "type": "number"
+                },
+                "FontSize": {
+                    "type": "string"
+                },
+                "OutlineColor": {
+                    "type": "string"
+                },
+                "OutlineSize": {
+                    "type": "number"
+                },
+                "ShadowColor": {
+                    "type": "string"
+                },
+                "ShadowOpacity": {
+                    "type": "number"
+                },
+                "ShadowXOffset": {
+                    "type": "number"
+                },
+                "ShadowYOffset": {
+                    "type": "number"
+                },
+                "TeletextGridControl": {
+                    "type": "string"
+                },
+                "XPosition": {
+                    "type": "number"
+                },
+                "YPosition": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.DvbSubSourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "OcrLanguage": {
+                    "type": "string"
+                },
+                "Pid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.DvbTdtSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "RepInterval": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Eac3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "AttenuationControl": {
+                    "type": "string"
+                },
+                "Bitrate": {
+                    "type": "number"
+                },
+                "BitstreamMode": {
+                    "type": "string"
+                },
+                "CodingMode": {
+                    "type": "string"
+                },
+                "DcFilter": {
+                    "type": "string"
+                },
+                "Dialnorm": {
+                    "type": "number"
+                },
+                "DrcLine": {
+                    "type": "string"
+                },
+                "DrcRf": {
+                    "type": "string"
+                },
+                "LfeControl": {
+                    "type": "string"
+                },
+                "LfeFilter": {
+                    "type": "string"
+                },
+                "LoRoCenterMixLevel": {
+                    "type": "number"
+                },
+                "LoRoSurroundMixLevel": {
+                    "type": "number"
+                },
+                "LtRtCenterMixLevel": {
+                    "type": "number"
+                },
+                "LtRtSurroundMixLevel": {
+                    "type": "number"
+                },
+                "MetadataControl": {
+                    "type": "string"
+                },
+                "PassthroughControl": {
+                    "type": "string"
+                },
+                "PhaseControl": {
+                    "type": "string"
+                },
+                "StereoDownmix": {
+                    "type": "string"
+                },
+                "SurroundExMode": {
+                    "type": "string"
+                },
+                "SurroundMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.EbuTtDDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyrightHolder": {
+                    "type": "string"
+                },
+                "FillLineGap": {
+                    "type": "string"
+                },
+                "FontFamily": {
+                    "type": "string"
+                },
+                "StyleControl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.EmbeddedDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.EmbeddedPlusScte20DestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.EmbeddedSourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Convert608To708": {
+                    "type": "string"
+                },
+                "Scte20Detection": {
+                    "type": "string"
+                },
+                "Source608ChannelNumber": {
+                    "type": "number"
+                },
+                "Source608TrackNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.EncoderSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioDescriptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.AudioDescription"
+                    },
+                    "type": "array"
+                },
+                "AvailBlanking": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AvailBlanking"
+                },
+                "AvailConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AvailConfiguration"
+                },
+                "BlackoutSlate": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.BlackoutSlate"
+                },
+                "CaptionDescriptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionDescription"
+                    },
+                    "type": "array"
+                },
+                "FeatureActivations": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FeatureActivations"
+                },
+                "GlobalConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.GlobalConfiguration"
+                },
+                "MotionGraphicsConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MotionGraphicsConfiguration"
+                },
+                "NielsenConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.NielsenConfiguration"
+                },
+                "OutputGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.OutputGroup"
+                    },
+                    "type": "array"
+                },
+                "TimecodeConfig": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TimecodeConfig"
+                },
+                "VideoDescriptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.VideoDescription"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FailoverCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "FailoverConditionSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FailoverConditionSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FailoverConditionSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioSilenceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioSilenceFailoverSettings"
+                },
+                "InputLossSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLossFailoverSettings"
+                },
+                "VideoBlackSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoBlackFailoverSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FeatureActivations": {
+            "additionalProperties": false,
+            "properties": {
+                "InputPrepareScheduleActions": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FecOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnDepth": {
+                    "type": "number"
+                },
+                "IncludeFec": {
+                    "type": "string"
+                },
+                "RowLength": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Fmp4HlsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioRenditionSets": {
+                    "type": "string"
+                },
+                "NielsenId3Behavior": {
+                    "type": "string"
+                },
+                "TimedMetadataBehavior": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureCdnSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "FrameCaptureS3Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureS3Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "FrameCaptureCdnSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureCdnSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureHlsSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NameModifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureS3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "CannedAcl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureInterval": {
+                    "type": "number"
+                },
+                "CaptureIntervalUnits": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.GlobalConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InitialAudioGain": {
+                    "type": "number"
+                },
+                "InputEndAction": {
+                    "type": "string"
+                },
+                "InputLossBehavior": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLossBehavior"
+                },
+                "OutputLockingMode": {
+                    "type": "string"
+                },
+                "OutputTimingSource": {
+                    "type": "string"
+                },
+                "SupportLowFramerateInputs": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H264ColorSpaceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ColorSpacePassthroughSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ColorSpacePassthroughSettings"
+                },
+                "Rec601Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Rec601Settings"
+                },
+                "Rec709Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Rec709Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H264FilterSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "TemporalFilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TemporalFilterSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H264Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "AdaptiveQuantization": {
+                    "type": "string"
+                },
+                "AfdSignaling": {
+                    "type": "string"
+                },
+                "Bitrate": {
+                    "type": "number"
+                },
+                "BufFillPct": {
+                    "type": "number"
+                },
+                "BufSize": {
+                    "type": "number"
+                },
+                "ColorMetadata": {
+                    "type": "string"
+                },
+                "ColorSpaceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H264ColorSpaceSettings"
+                },
+                "EntropyEncoding": {
+                    "type": "string"
+                },
+                "FilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H264FilterSettings"
+                },
+                "FixedAfd": {
+                    "type": "string"
+                },
+                "FlickerAq": {
+                    "type": "string"
+                },
+                "ForceFieldPictures": {
+                    "type": "string"
+                },
+                "FramerateControl": {
+                    "type": "string"
+                },
+                "FramerateDenominator": {
+                    "type": "number"
+                },
+                "FramerateNumerator": {
+                    "type": "number"
+                },
+                "GopBReference": {
+                    "type": "string"
+                },
+                "GopClosedCadence": {
+                    "type": "number"
+                },
+                "GopNumBFrames": {
+                    "type": "number"
+                },
+                "GopSize": {
+                    "type": "number"
+                },
+                "GopSizeUnits": {
+                    "type": "string"
+                },
+                "Level": {
+                    "type": "string"
+                },
+                "LookAheadRateControl": {
+                    "type": "string"
+                },
+                "MaxBitrate": {
+                    "type": "number"
+                },
+                "MinIInterval": {
+                    "type": "number"
+                },
+                "NumRefFrames": {
+                    "type": "number"
+                },
+                "ParControl": {
+                    "type": "string"
+                },
+                "ParDenominator": {
+                    "type": "number"
+                },
+                "ParNumerator": {
+                    "type": "number"
+                },
+                "Profile": {
+                    "type": "string"
+                },
+                "QualityLevel": {
+                    "type": "string"
+                },
+                "QvbrQualityLevel": {
+                    "type": "number"
+                },
+                "RateControlMode": {
+                    "type": "string"
+                },
+                "ScanType": {
+                    "type": "string"
+                },
+                "SceneChangeDetect": {
+                    "type": "string"
+                },
+                "Slices": {
+                    "type": "number"
+                },
+                "Softness": {
+                    "type": "number"
+                },
+                "SpatialAq": {
+                    "type": "string"
+                },
+                "SubgopLength": {
+                    "type": "string"
+                },
+                "Syntax": {
+                    "type": "string"
+                },
+                "TemporalAq": {
+                    "type": "string"
+                },
+                "TimecodeInsertion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H265ColorSpaceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ColorSpacePassthroughSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ColorSpacePassthroughSettings"
+                },
+                "Hdr10Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Hdr10Settings"
+                },
+                "Rec601Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Rec601Settings"
+                },
+                "Rec709Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Rec709Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H265FilterSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "TemporalFilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TemporalFilterSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H265Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "AdaptiveQuantization": {
+                    "type": "string"
+                },
+                "AfdSignaling": {
+                    "type": "string"
+                },
+                "AlternativeTransferFunction": {
+                    "type": "string"
+                },
+                "Bitrate": {
+                    "type": "number"
+                },
+                "BufSize": {
+                    "type": "number"
+                },
+                "ColorMetadata": {
+                    "type": "string"
+                },
+                "ColorSpaceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H265ColorSpaceSettings"
+                },
+                "FilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H265FilterSettings"
+                },
+                "FixedAfd": {
+                    "type": "string"
+                },
+                "FlickerAq": {
+                    "type": "string"
+                },
+                "FramerateDenominator": {
+                    "type": "number"
+                },
+                "FramerateNumerator": {
+                    "type": "number"
+                },
+                "GopClosedCadence": {
+                    "type": "number"
+                },
+                "GopSize": {
+                    "type": "number"
+                },
+                "GopSizeUnits": {
+                    "type": "string"
+                },
+                "Level": {
+                    "type": "string"
+                },
+                "LookAheadRateControl": {
+                    "type": "string"
+                },
+                "MaxBitrate": {
+                    "type": "number"
+                },
+                "MinIInterval": {
+                    "type": "number"
+                },
+                "ParDenominator": {
+                    "type": "number"
+                },
+                "ParNumerator": {
+                    "type": "number"
+                },
+                "Profile": {
+                    "type": "string"
+                },
+                "QvbrQualityLevel": {
+                    "type": "number"
+                },
+                "RateControlMode": {
+                    "type": "string"
+                },
+                "ScanType": {
+                    "type": "string"
+                },
+                "SceneChangeDetect": {
+                    "type": "string"
+                },
+                "Slices": {
+                    "type": "number"
+                },
+                "Tier": {
+                    "type": "string"
+                },
+                "TimecodeInsertion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Hdr10Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCll": {
+                    "type": "number"
+                },
+                "MaxFall": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsAkamaiSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "FilecacheDuration": {
+                    "type": "number"
+                },
+                "HttpTransferMode": {
+                    "type": "string"
+                },
+                "NumRetries": {
+                    "type": "number"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                },
+                "Salt": {
+                    "type": "string"
+                },
+                "Token": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsBasicPutSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "FilecacheDuration": {
+                    "type": "number"
+                },
+                "NumRetries": {
+                    "type": "number"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsCdnSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HlsAkamaiSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsAkamaiSettings"
+                },
+                "HlsBasicPutSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsBasicPutSettings"
+                },
+                "HlsMediaStoreSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsMediaStoreSettings"
+                },
+                "HlsS3Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsS3Settings"
+                },
+                "HlsWebdavSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsWebdavSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BaseUrlContent": {
+                    "type": "string"
+                },
+                "BaseUrlContent1": {
+                    "type": "string"
+                },
+                "BaseUrlManifest": {
+                    "type": "string"
+                },
+                "BaseUrlManifest1": {
+                    "type": "string"
+                },
+                "CaptionLanguageMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionLanguageMapping"
+                    },
+                    "type": "array"
+                },
+                "CaptionLanguageSetting": {
+                    "type": "string"
+                },
+                "ClientCache": {
+                    "type": "string"
+                },
+                "CodecSpecification": {
+                    "type": "string"
+                },
+                "ConstantIv": {
+                    "type": "string"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "DirectoryStructure": {
+                    "type": "string"
+                },
+                "DiscontinuityTags": {
+                    "type": "string"
+                },
+                "EncryptionType": {
+                    "type": "string"
+                },
+                "HlsCdnSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsCdnSettings"
+                },
+                "HlsId3SegmentTagging": {
+                    "type": "string"
+                },
+                "IFrameOnlyPlaylists": {
+                    "type": "string"
+                },
+                "IncompleteSegmentBehavior": {
+                    "type": "string"
+                },
+                "IndexNSegments": {
+                    "type": "number"
+                },
+                "InputLossAction": {
+                    "type": "string"
+                },
+                "IvInManifest": {
+                    "type": "string"
+                },
+                "IvSource": {
+                    "type": "string"
+                },
+                "KeepSegments": {
+                    "type": "number"
+                },
+                "KeyFormat": {
+                    "type": "string"
+                },
+                "KeyFormatVersions": {
+                    "type": "string"
+                },
+                "KeyProviderSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.KeyProviderSettings"
+                },
+                "ManifestCompression": {
+                    "type": "string"
+                },
+                "ManifestDurationFormat": {
+                    "type": "string"
+                },
+                "MinSegmentLength": {
+                    "type": "number"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "OutputSelection": {
+                    "type": "string"
+                },
+                "ProgramDateTime": {
+                    "type": "string"
+                },
+                "ProgramDateTimePeriod": {
+                    "type": "number"
+                },
+                "RedundantManifest": {
+                    "type": "string"
+                },
+                "SegmentLength": {
+                    "type": "number"
+                },
+                "SegmentationMode": {
+                    "type": "string"
+                },
+                "SegmentsPerSubdirectory": {
+                    "type": "number"
+                },
+                "StreamInfResolution": {
+                    "type": "string"
+                },
+                "TimedMetadataId3Frame": {
+                    "type": "string"
+                },
+                "TimedMetadataId3Period": {
+                    "type": "number"
+                },
+                "TimestampDeltaMilliseconds": {
+                    "type": "number"
+                },
+                "TsFileMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsInputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Bandwidth": {
+                    "type": "number"
+                },
+                "BufferSegments": {
+                    "type": "number"
+                },
+                "Retries": {
+                    "type": "number"
+                },
+                "RetryInterval": {
+                    "type": "number"
+                },
+                "Scte35Source": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsMediaStoreSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "FilecacheDuration": {
+                    "type": "number"
+                },
+                "MediaStoreStorageClass": {
+                    "type": "string"
+                },
+                "NumRetries": {
+                    "type": "number"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "H265PackagingType": {
+                    "type": "string"
+                },
+                "HlsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsSettings"
+                },
+                "NameModifier": {
+                    "type": "string"
+                },
+                "SegmentModifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsS3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "CannedAcl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioOnlyHlsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioOnlyHlsSettings"
+                },
+                "Fmp4HlsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Fmp4HlsSettings"
+                },
+                "FrameCaptureHlsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureHlsSettings"
+                },
+                "StandardHlsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.StandardHlsSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsWebdavSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "FilecacheDuration": {
+                    "type": "number"
+                },
+                "HttpTransferMode": {
+                    "type": "string"
+                },
+                "NumRetries": {
+                    "type": "number"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HtmlMotionGraphicsSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomaticInputFailoverSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AutomaticInputFailoverSettings"
+                },
+                "InputAttachmentName": {
+                    "type": "string"
+                },
+                "InputId": {
+                    "type": "string"
+                },
+                "InputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputChannelLevel": {
+            "additionalProperties": false,
+            "properties": {
+                "Gain": {
+                    "type": "number"
+                },
+                "InputChannel": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "PasswordParam": {
+                    "type": "string"
+                },
+                "Uri": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputLossBehavior": {
+            "additionalProperties": false,
+            "properties": {
+                "BlackFrameMsec": {
+                    "type": "number"
+                },
+                "InputLossImageColor": {
+                    "type": "string"
+                },
+                "InputLossImageSlate": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "InputLossImageType": {
+                    "type": "string"
+                },
+                "RepeatFrameMsec": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputLossFailoverSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "InputLossThresholdMsec": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioSelectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.AudioSelector"
+                    },
+                    "type": "array"
+                },
+                "CaptionSelectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionSelector"
+                    },
+                    "type": "array"
+                },
+                "DeblockFilter": {
+                    "type": "string"
+                },
+                "DenoiseFilter": {
+                    "type": "string"
+                },
+                "FilterStrength": {
+                    "type": "number"
+                },
+                "InputFilter": {
+                    "type": "string"
+                },
+                "NetworkInputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.NetworkInputSettings"
+                },
+                "Smpte2038DataPreference": {
+                    "type": "string"
+                },
+                "SourceEndBehavior": {
+                    "type": "string"
+                },
+                "VideoSelector": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoSelector"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Codec": {
+                    "type": "string"
+                },
+                "MaximumBitrate": {
+                    "type": "string"
+                },
+                "Resolution": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.KeyProviderSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "StaticKeySettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.StaticKeySettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.M2tsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AbsentInputAudioBehavior": {
+                    "type": "string"
+                },
+                "Arib": {
+                    "type": "string"
+                },
+                "AribCaptionsPid": {
+                    "type": "string"
+                },
+                "AribCaptionsPidControl": {
+                    "type": "string"
+                },
+                "AudioBufferModel": {
+                    "type": "string"
+                },
+                "AudioFramesPerPes": {
+                    "type": "number"
+                },
+                "AudioPids": {
+                    "type": "string"
+                },
+                "AudioStreamType": {
+                    "type": "string"
+                },
+                "Bitrate": {
+                    "type": "number"
+                },
+                "BufferModel": {
+                    "type": "string"
+                },
+                "CcDescriptor": {
+                    "type": "string"
+                },
+                "DvbNitSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.DvbNitSettings"
+                },
+                "DvbSdtSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.DvbSdtSettings"
+                },
+                "DvbSubPids": {
+                    "type": "string"
+                },
+                "DvbTdtSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.DvbTdtSettings"
+                },
+                "DvbTeletextPid": {
+                    "type": "string"
+                },
+                "Ebif": {
+                    "type": "string"
+                },
+                "EbpAudioInterval": {
+                    "type": "string"
+                },
+                "EbpLookaheadMs": {
+                    "type": "number"
+                },
+                "EbpPlacement": {
+                    "type": "string"
+                },
+                "EcmPid": {
+                    "type": "string"
+                },
+                "EsRateInPes": {
+                    "type": "string"
+                },
+                "EtvPlatformPid": {
+                    "type": "string"
+                },
+                "EtvSignalPid": {
+                    "type": "string"
+                },
+                "FragmentTime": {
+                    "type": "number"
+                },
+                "Klv": {
+                    "type": "string"
+                },
+                "KlvDataPids": {
+                    "type": "string"
+                },
+                "NielsenId3Behavior": {
+                    "type": "string"
+                },
+                "NullPacketBitrate": {
+                    "type": "number"
+                },
+                "PatInterval": {
+                    "type": "number"
+                },
+                "PcrControl": {
+                    "type": "string"
+                },
+                "PcrPeriod": {
+                    "type": "number"
+                },
+                "PcrPid": {
+                    "type": "string"
+                },
+                "PmtInterval": {
+                    "type": "number"
+                },
+                "PmtPid": {
+                    "type": "string"
+                },
+                "ProgramNum": {
+                    "type": "number"
+                },
+                "RateMode": {
+                    "type": "string"
+                },
+                "Scte27Pids": {
+                    "type": "string"
+                },
+                "Scte35Control": {
+                    "type": "string"
+                },
+                "Scte35Pid": {
+                    "type": "string"
+                },
+                "SegmentationMarkers": {
+                    "type": "string"
+                },
+                "SegmentationStyle": {
+                    "type": "string"
+                },
+                "SegmentationTime": {
+                    "type": "number"
+                },
+                "TimedMetadataBehavior": {
+                    "type": "string"
+                },
+                "TimedMetadataPid": {
+                    "type": "string"
+                },
+                "TransportStreamId": {
+                    "type": "number"
+                },
+                "VideoPid": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.M3u8Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioFramesPerPes": {
+                    "type": "number"
+                },
+                "AudioPids": {
+                    "type": "string"
+                },
+                "EcmPid": {
+                    "type": "string"
+                },
+                "NielsenId3Behavior": {
+                    "type": "string"
+                },
+                "PatInterval": {
+                    "type": "number"
+                },
+                "PcrControl": {
+                    "type": "string"
+                },
+                "PcrPeriod": {
+                    "type": "number"
+                },
+                "PcrPid": {
+                    "type": "string"
+                },
+                "PmtInterval": {
+                    "type": "number"
+                },
+                "PmtPid": {
+                    "type": "string"
+                },
+                "ProgramNum": {
+                    "type": "number"
+                },
+                "Scte35Behavior": {
+                    "type": "string"
+                },
+                "Scte35Pid": {
+                    "type": "string"
+                },
+                "TimedMetadataBehavior": {
+                    "type": "string"
+                },
+                "TimedMetadataPid": {
+                    "type": "string"
+                },
+                "TransportStreamId": {
+                    "type": "number"
+                },
+                "VideoPid": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MediaPackageGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MediaPackageOutputDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MediaPackageOutputSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MotionGraphicsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MotionGraphicsInsertion": {
+                    "type": "string"
+                },
+                "MotionGraphicsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MotionGraphicsSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MotionGraphicsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HtmlMotionGraphicsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HtmlMotionGraphicsSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Mp2Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "Bitrate": {
+                    "type": "number"
+                },
+                "CodingMode": {
+                    "type": "string"
+                },
+                "SampleRate": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Mpeg2FilterSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "TemporalFilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TemporalFilterSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Mpeg2Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "AdaptiveQuantization": {
+                    "type": "string"
+                },
+                "AfdSignaling": {
+                    "type": "string"
+                },
+                "ColorMetadata": {
+                    "type": "string"
+                },
+                "ColorSpace": {
+                    "type": "string"
+                },
+                "DisplayAspectRatio": {
+                    "type": "string"
+                },
+                "FilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Mpeg2FilterSettings"
+                },
+                "FixedAfd": {
+                    "type": "string"
+                },
+                "FramerateDenominator": {
+                    "type": "number"
+                },
+                "FramerateNumerator": {
+                    "type": "number"
+                },
+                "GopClosedCadence": {
+                    "type": "number"
+                },
+                "GopNumBFrames": {
+                    "type": "number"
+                },
+                "GopSize": {
+                    "type": "number"
+                },
+                "GopSizeUnits": {
+                    "type": "string"
+                },
+                "ScanType": {
+                    "type": "string"
+                },
+                "SubgopLength": {
+                    "type": "string"
+                },
+                "TimecodeInsertion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MsSmoothGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AcquisitionPointId": {
+                    "type": "string"
+                },
+                "AudioOnlyTimecodeControl": {
+                    "type": "string"
+                },
+                "CertificateMode": {
+                    "type": "string"
+                },
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "EventId": {
+                    "type": "string"
+                },
+                "EventIdMode": {
+                    "type": "string"
+                },
+                "EventStopBehavior": {
+                    "type": "string"
+                },
+                "FilecacheDuration": {
+                    "type": "number"
+                },
+                "FragmentLength": {
+                    "type": "number"
+                },
+                "InputLossAction": {
+                    "type": "string"
+                },
+                "NumRetries": {
+                    "type": "number"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                },
+                "SegmentationMode": {
+                    "type": "string"
+                },
+                "SendDelayMs": {
+                    "type": "number"
+                },
+                "SparseTrackType": {
+                    "type": "string"
+                },
+                "StreamManifestBehavior": {
+                    "type": "string"
+                },
+                "TimestampOffset": {
+                    "type": "string"
+                },
+                "TimestampOffsetMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MsSmoothOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "H265PackagingType": {
+                    "type": "string"
+                },
+                "NameModifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MultiplexGroupSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MultiplexOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MultiplexProgramChannelDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiplexId": {
+                    "type": "string"
+                },
+                "ProgramName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.NetworkInputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HlsInputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsInputSettings"
+                },
+                "ServerValidation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.NielsenCBET": {
+            "additionalProperties": false,
+            "properties": {
+                "CbetCheckDigitString": {
+                    "type": "string"
+                },
+                "CbetStepaside": {
+                    "type": "string"
+                },
+                "Csid": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.NielsenConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DistributorId": {
+                    "type": "string"
+                },
+                "NielsenPcmToId3Tagging": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.NielsenNaesIiNw": {
+            "additionalProperties": false,
+            "properties": {
+                "CheckDigitString": {
+                    "type": "string"
+                },
+                "Sid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.NielsenWatermarksSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NielsenCbetSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.NielsenCBET"
+                },
+                "NielsenDistributionType": {
+                    "type": "string"
+                },
+                "NielsenNaesIiNwSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.NielsenNaesIiNw"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioDescriptionNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CaptionDescriptionNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OutputName": {
+                    "type": "string"
+                },
+                "OutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputSettings"
+                },
+                "VideoDescriptionName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "MediaPackageSettings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.MediaPackageOutputDestinationSettings"
+                    },
+                    "type": "array"
+                },
+                "MultiplexSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MultiplexProgramChannelDestinationSettings"
+                },
+                "Settings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.OutputDestinationSettings"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PasswordParam": {
+                    "type": "string"
+                },
+                "StreamName": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "OutputGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputGroupSettings"
+                },
+                "Outputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.Output"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ArchiveGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ArchiveGroupSettings"
+                },
+                "FrameCaptureGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureGroupSettings"
+                },
+                "HlsGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsGroupSettings"
+                },
+                "MediaPackageGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MediaPackageGroupSettings"
+                },
+                "MsSmoothGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MsSmoothGroupSettings"
+                },
+                "MultiplexGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MultiplexGroupSettings"
+                },
+                "RtmpGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.RtmpGroupSettings"
+                },
+                "UdpGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.UdpGroupSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputLocationRef": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationRefId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ArchiveOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ArchiveOutputSettings"
+                },
+                "FrameCaptureOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureOutputSettings"
+                },
+                "HlsOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsOutputSettings"
+                },
+                "MediaPackageOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MediaPackageOutputSettings"
+                },
+                "MsSmoothOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MsSmoothOutputSettings"
+                },
+                "MultiplexOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MultiplexOutputSettings"
+                },
+                "RtmpOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.RtmpOutputSettings"
+                },
+                "UdpOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.UdpOutputSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.PassThroughSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.RawSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Rec601Settings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Rec709Settings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.RemixSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.AudioChannelMapping"
+                    },
+                    "type": "array"
+                },
+                "ChannelsIn": {
+                    "type": "number"
+                },
+                "ChannelsOut": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.RtmpCaptionInfoDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.RtmpGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AuthenticationScheme": {
+                    "type": "string"
+                },
+                "CacheFullBehavior": {
+                    "type": "string"
+                },
+                "CacheLength": {
+                    "type": "number"
+                },
+                "CaptionData": {
+                    "type": "string"
+                },
+                "InputLossAction": {
+                    "type": "string"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.RtmpOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateMode": {
+                    "type": "string"
+                },
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "NumRetries": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte20PlusEmbeddedDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte20SourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Convert608To708": {
+                    "type": "string"
+                },
+                "Source608ChannelNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte27DestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte27SourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "OcrLanguage": {
+                    "type": "string"
+                },
+                "Pid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte35SpliceInsert": {
+            "additionalProperties": false,
+            "properties": {
+                "AdAvailOffset": {
+                    "type": "number"
+                },
+                "NoRegionalBlackoutFlag": {
+                    "type": "string"
+                },
+                "WebDeliveryAllowedFlag": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte35TimeSignalApos": {
+            "additionalProperties": false,
+            "properties": {
+                "AdAvailOffset": {
+                    "type": "number"
+                },
+                "NoRegionalBlackoutFlag": {
+                    "type": "string"
+                },
+                "WebDeliveryAllowedFlag": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.SmpteTtDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.StandardHlsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioRenditionSets": {
+                    "type": "string"
+                },
+                "M3u8Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.M3u8Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.StaticKeySettings": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyProviderServer": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "StaticKeyValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.TeletextDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.TeletextSourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "OutputRectangle": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionRectangle"
+                },
+                "PageNumber": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.TemporalFilterSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PostFilterSharpening": {
+                    "type": "string"
+                },
+                "Strength": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.TimecodeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Source": {
+                    "type": "string"
+                },
+                "SyncThreshold": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.TtmlDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "StyleControl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.UdpContainerSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "M2tsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.M2tsSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.UdpGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "InputLossAction": {
+                    "type": "string"
+                },
+                "TimedMetadataId3Frame": {
+                    "type": "string"
+                },
+                "TimedMetadataId3Period": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.UdpOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferMsec": {
+                    "type": "number"
+                },
+                "ContainerSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.UdpContainerSettings"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "FecOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FecOutputSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoBlackFailoverSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "BlackDetectThreshold": {
+                    "type": "number"
+                },
+                "VideoBlackThresholdMsec": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoCodecSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "FrameCaptureSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureSettings"
+                },
+                "H264Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H264Settings"
+                },
+                "H265Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H265Settings"
+                },
+                "Mpeg2Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Mpeg2Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "CodecSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoCodecSettings"
+                },
+                "Height": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "RespondToAfd": {
+                    "type": "string"
+                },
+                "ScalingBehavior": {
+                    "type": "string"
+                },
+                "Sharpness": {
+                    "type": "number"
+                },
+                "Width": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "ColorSpace": {
+                    "type": "string"
+                },
+                "ColorSpaceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoSelectorColorSpaceSettings"
+                },
+                "ColorSpaceUsage": {
+                    "type": "string"
+                },
+                "SelectorSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoSelectorSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoSelectorColorSpaceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Hdr10Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Hdr10Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoSelectorPid": {
+            "additionalProperties": false,
+            "properties": {
+                "Pid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoSelectorProgramId": {
+            "additionalProperties": false,
+            "properties": {
+                "ProgramId": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoSelectorSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "VideoSelectorPid": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoSelectorPid"
+                },
+                "VideoSelectorProgramId": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoSelectorProgramId"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VpcOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PublicAddressAllocationIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.WavSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "BitDepth": {
+                    "type": "number"
+                },
+                "CodingMode": {
+                    "type": "string"
+                },
+                "SampleRate": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.WebvttDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "StyleControl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "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::InputSecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "WhitelistRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::InputSecurityGroup.InputWhitelistRuleCidr"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::InputSecurityGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::InputSecurityGroup.InputWhitelistRuleCidr": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::Asset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Id": {
+                            "type": "string"
+                        },
+                        "PackagingGroupId": {
+                            "type": "string"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "SourceArn": {
+                            "type": "string"
+                        },
+                        "SourceRoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Id",
+                        "PackagingGroupId",
+                        "SourceArn",
+                        "SourceRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaPackage::Asset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::Asset.EgressEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "PackagingConfigurationId": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PackagingConfigurationId",
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EgressAccessLogs": {
+                            "$ref": "#/definitions/AWS::MediaPackage::Channel.LogConfiguration"
+                        },
+                        "Id": {
+                            "type": "string"
+                        },
+                        "IngressAccessLogs": {
+                            "$ref": "#/definitions/AWS::MediaPackage::Channel.LogConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Id"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaPackage::Channel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::Channel.LogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Authorization": {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.Authorization"
+                        },
+                        "ChannelId": {
+                            "type": "string"
+                        },
+                        "CmafPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.CmafPackage"
+                        },
+                        "DashPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.DashPackage"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "HlsPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.HlsPackage"
+                        },
+                        "Id": {
+                            "type": "string"
+                        },
+                        "ManifestName": {
+                            "type": "string"
+                        },
+                        "MssPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.MssPackage"
+                        },
+                        "Origination": {
+                            "type": "string"
+                        },
+                        "StartoverWindowSeconds": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeDelaySeconds": {
+                            "type": "number"
+                        },
+                        "Whitelist": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ChannelId",
+                        "Id"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaPackage::OriginEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.Authorization": {
+            "additionalProperties": false,
+            "properties": {
+                "CdnIdentifierSecret": {
+                    "type": "string"
+                },
+                "SecretsRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CdnIdentifierSecret",
+                "SecretsRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.CmafEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstantInitializationVector": {
+                    "type": "string"
+                },
+                "KeyRotationIntervalSeconds": {
+                    "type": "number"
+                },
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.CmafPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.CmafEncryption"
+                },
+                "HlsManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.HlsManifest"
+                    },
+                    "type": "array"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "SegmentPrefix": {
+                    "type": "string"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.StreamSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.DashEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyRotationIntervalSeconds": {
+                    "type": "number"
+                },
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.DashPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "AdTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AdsOnDeliveryRestrictions": {
+                    "type": "string"
+                },
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.DashEncryption"
+                },
+                "ManifestLayout": {
+                    "type": "string"
+                },
+                "ManifestWindowSeconds": {
+                    "type": "number"
+                },
+                "MinBufferTimeSeconds": {
+                    "type": "number"
+                },
+                "MinUpdatePeriodSeconds": {
+                    "type": "number"
+                },
+                "PeriodTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Profile": {
+                    "type": "string"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "SegmentTemplateFormat": {
+                    "type": "string"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.StreamSelection"
+                },
+                "SuggestedPresentationDelaySeconds": {
+                    "type": "number"
+                },
+                "UtcTiming": {
+                    "type": "string"
+                },
+                "UtcTimingUri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.HlsEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstantInitializationVector": {
+                    "type": "string"
+                },
+                "EncryptionMethod": {
+                    "type": "string"
+                },
+                "KeyRotationIntervalSeconds": {
+                    "type": "number"
+                },
+                "RepeatExtXKey": {
+                    "type": "boolean"
+                },
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.HlsManifest": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkers": {
+                    "type": "string"
+                },
+                "AdTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AdsOnDeliveryRestrictions": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "IncludeIframeOnlyStream": {
+                    "type": "boolean"
+                },
+                "ManifestName": {
+                    "type": "string"
+                },
+                "PlaylistType": {
+                    "type": "string"
+                },
+                "PlaylistWindowSeconds": {
+                    "type": "number"
+                },
+                "ProgramDateTimeIntervalSeconds": {
+                    "type": "number"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.HlsPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkers": {
+                    "type": "string"
+                },
+                "AdTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AdsOnDeliveryRestrictions": {
+                    "type": "string"
+                },
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.HlsEncryption"
+                },
+                "IncludeIframeOnlyStream": {
+                    "type": "boolean"
+                },
+                "PlaylistType": {
+                    "type": "string"
+                },
+                "PlaylistWindowSeconds": {
+                    "type": "number"
+                },
+                "ProgramDateTimeIntervalSeconds": {
+                    "type": "number"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.StreamSelection"
+                },
+                "UseAudioRenditionGroup": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.MssEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.MssPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.MssEncryption"
+                },
+                "ManifestWindowSeconds": {
+                    "type": "number"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.StreamSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SystemIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceId",
+                "RoleArn",
+                "SystemIds",
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.StreamSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxVideoBitsPerSecond": {
+                    "type": "number"
+                },
+                "MinVideoBitsPerSecond": {
+                    "type": "number"
+                },
+                "StreamOrder": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CmafPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.CmafPackage"
+                        },
+                        "DashPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.DashPackage"
+                        },
+                        "HlsPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.HlsPackage"
+                        },
+                        "Id": {
+                            "type": "string"
+                        },
+                        "MssPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.MssPackage"
+                        },
+                        "PackagingGroupId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Id",
+                        "PackagingGroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaPackage::PackagingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.CmafEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.CmafPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.CmafEncryption"
+                },
+                "HlsManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.HlsManifest"
+                    },
+                    "type": "array"
+                },
+                "IncludeEncoderConfigurationInSegments": {
+                    "type": "boolean"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "HlsManifests"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.DashEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.DashManifest": {
+            "additionalProperties": false,
+            "properties": {
+                "ManifestLayout": {
+                    "type": "string"
+                },
+                "ManifestName": {
+                    "type": "string"
+                },
+                "MinBufferTimeSeconds": {
+                    "type": "number"
+                },
+                "Profile": {
+                    "type": "string"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.StreamSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.DashPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "DashManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.DashManifest"
+                    },
+                    "type": "array"
+                },
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.DashEncryption"
+                },
+                "IncludeEncoderConfigurationInSegments": {
+                    "type": "boolean"
+                },
+                "PeriodTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "SegmentTemplateFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DashManifests"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.HlsEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstantInitializationVector": {
+                    "type": "string"
+                },
+                "EncryptionMethod": {
+                    "type": "string"
+                },
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.HlsManifest": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkers": {
+                    "type": "string"
+                },
+                "IncludeIframeOnlyStream": {
+                    "type": "boolean"
+                },
+                "ManifestName": {
+                    "type": "string"
+                },
+                "ProgramDateTimeIntervalSeconds": {
+                    "type": "number"
+                },
+                "RepeatExtXKey": {
+                    "type": "boolean"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.StreamSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.HlsPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.HlsEncryption"
+                },
+                "HlsManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.HlsManifest"
+                    },
+                    "type": "array"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "UseAudioRenditionGroup": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "HlsManifests"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.MssEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.MssManifest": {
+            "additionalProperties": false,
+            "properties": {
+                "ManifestName": {
+                    "type": "string"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.StreamSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.MssPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.MssEncryption"
+                },
+                "MssManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.MssManifest"
+                    },
+                    "type": "array"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MssManifests"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SystemIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SystemIds",
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.StreamSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxVideoBitsPerSecond": {
+                    "type": "number"
+                },
+                "MinVideoBitsPerSecond": {
+                    "type": "number"
+                },
+                "StreamOrder": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Authorization": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingGroup.Authorization"
+                        },
+                        "EgressAccessLogs": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingGroup.LogConfiguration"
+                        },
+                        "Id": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Id"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaPackage::PackagingGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingGroup.Authorization": {
+            "additionalProperties": false,
+            "properties": {
+                "CdnIdentifierSecret": {
+                    "type": "string"
+                },
+                "SecretsRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CdnIdentifierSecret",
+                "SecretsRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingGroup.LogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaStore::Container": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessLoggingEnabled": {
+                            "type": "boolean"
+                        },
+                        "ContainerName": {
+                            "type": "string"
+                        },
+                        "CorsPolicy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaStore::Container.CorsRule"
+                            },
+                            "type": "array"
+                        },
+                        "LifecyclePolicy": {
+                            "type": "string"
+                        },
+                        "MetricPolicy": {
+                            "$ref": "#/definitions/AWS::MediaStore::Container.MetricPolicy"
+                        },
+                        "Policy": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ContainerName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaStore::Container"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaStore::Container.CorsRule": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedOrigins": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExposeHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaxAgeSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaStore::Container.MetricPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerLevelMetrics": {
+                    "type": "string"
+                },
+                "MetricPolicyRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaStore::Container.MetricPolicyRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ContainerLevelMetrics"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaStore::Container.MetricPolicyRule": {
+            "additionalProperties": false,
+            "properties": {
+                "ObjectGroup": {
+                    "type": "string"
+                },
+                "ObjectGroupName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ObjectGroup",
+                "ObjectGroupName"
+            ],
+            "type": "object"
+        },
+        "AWS::MemoryDB::ACL": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ACLName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ACLName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MemoryDB::ACL"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MemoryDB::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ACLName": {
+                            "type": "string"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "FinalSnapshotName": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "NodeType": {
+                            "type": "string"
+                        },
+                        "NumReplicasPerShard": {
+                            "type": "number"
+                        },
+                        "NumShards": {
+                            "type": "number"
+                        },
+                        "ParameterGroupName": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnapshotArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnapshotName": {
+                            "type": "string"
+                        },
+                        "SnapshotRetentionLimit": {
+                            "type": "number"
+                        },
+                        "SnapshotWindow": {
+                            "type": "string"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SnsTopicStatus": {
+                            "type": "string"
+                        },
+                        "SubnetGroupName": {
+                            "type": "string"
+                        },
+                        "TLSEnabled": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ACLName",
+                        "ClusterName",
+                        "NodeType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MemoryDB::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MemoryDB::Cluster.Endpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MemoryDB::ParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ParameterGroupName": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Family",
+                        "ParameterGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MemoryDB::ParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MemoryDB::SubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SubnetGroupName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubnetGroupName",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MemoryDB::SubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MemoryDB::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessString": {
+                            "type": "string"
+                        },
+                        "AuthenticationMode": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AccessString",
+                        "AuthenticationMode",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MemoryDB::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatedRoles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Neptune::DBCluster.DBClusterRole"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "IamAuthEnabled": {
+                            "type": "boolean"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "RestoreToTime": {
+                            "type": "string"
+                        },
+                        "RestoreType": {
+                            "type": "string"
+                        },
+                        "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::DBClusterParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBInstanceClass": {
+                            "type": "string"
+                        },
+                        "DBInstanceIdentifier": {
+                            "type": "string"
+                        },
+                        "DBParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBSnapshotIdentifier": {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::DBParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBSubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DBSubnetGroupDescription": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBSubnetGroupDescription",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Neptune::DBSubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::Firewall": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeleteProtection": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FirewallName": {
+                            "type": "string"
+                        },
+                        "FirewallPolicyArn": {
+                            "type": "string"
+                        },
+                        "FirewallPolicyChangeProtection": {
+                            "type": "boolean"
+                        },
+                        "SubnetChangeProtection": {
+                            "type": "boolean"
+                        },
+                        "SubnetMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::NetworkFirewall::Firewall.SubnetMapping"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FirewallName",
+                        "FirewallPolicyArn",
+                        "SubnetMappings",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkFirewall::Firewall"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::Firewall.SubnetMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubnetId"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "FirewallPolicy": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.FirewallPolicy"
+                        },
+                        "FirewallPolicyName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FirewallPolicy",
+                        "FirewallPolicyName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkFirewall::FirewallPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.ActionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "PublishMetricAction": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.PublishMetricAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.CustomAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionDefinition": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.ActionDefinition"
+                },
+                "ActionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionDefinition",
+                "ActionName"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.FirewallPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "StatefulDefaultActions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StatefulEngineOptions": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.StatefulEngineOptions"
+                },
+                "StatefulRuleGroupReferences": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.StatefulRuleGroupReference"
+                    },
+                    "type": "array"
+                },
+                "StatelessCustomActions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.CustomAction"
+                    },
+                    "type": "array"
+                },
+                "StatelessDefaultActions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StatelessFragmentDefaultActions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StatelessRuleGroupReferences": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.StatelessRuleGroupReference"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "StatelessDefaultActions",
+                "StatelessFragmentDefaultActions"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.PublishMetricAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.Dimension"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Dimensions"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.StatefulEngineOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "RuleOrder": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.StatefulRuleGroupReference": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "ResourceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.StatelessRuleGroupReference": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "ResourceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Priority",
+                "ResourceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FirewallArn": {
+                            "type": "string"
+                        },
+                        "FirewallName": {
+                            "type": "string"
+                        },
+                        "LoggingConfiguration": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::LoggingConfiguration.LoggingConfiguration"
+                        }
+                    },
+                    "required": [
+                        "FirewallArn",
+                        "LoggingConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkFirewall::LoggingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::LoggingConfiguration.LogDestinationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LogDestination": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "LogDestinationType": {
+                    "type": "string"
+                },
+                "LogType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogDestination",
+                "LogDestinationType",
+                "LogType"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::LoggingConfiguration.LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogDestinationConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::LoggingConfiguration.LogDestinationConfig"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LogDestinationConfigs"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Capacity": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "RuleGroup": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleGroup"
+                        },
+                        "RuleGroupName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Capacity",
+                        "RuleGroupName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkFirewall::RuleGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.ActionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "PublishMetricAction": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.PublishMetricAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.Address": {
+            "additionalProperties": false,
+            "properties": {
+                "AddressDefinition": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AddressDefinition"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.CustomAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionDefinition": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.ActionDefinition"
+                },
+                "ActionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionDefinition",
+                "ActionName"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.Header": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                },
+                "DestinationPort": {
+                    "type": "string"
+                },
+                "Direction": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "SourcePort": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination",
+                "DestinationPort",
+                "Direction",
+                "Protocol",
+                "Source",
+                "SourcePort"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.IPSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Definition": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.MatchAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPorts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.PortRange"
+                    },
+                    "type": "array"
+                },
+                "Destinations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.Address"
+                    },
+                    "type": "array"
+                },
+                "Protocols": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "SourcePorts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.PortRange"
+                    },
+                    "type": "array"
+                },
+                "Sources": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.Address"
+                    },
+                    "type": "array"
+                },
+                "TCPFlags": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.TCPFlagField"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.PortRange": {
+            "additionalProperties": false,
+            "properties": {
+                "FromPort": {
+                    "type": "number"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FromPort",
+                "ToPort"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.PortSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Definition": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.PublishMetricAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.Dimension"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Dimensions"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RuleDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MatchAttributes": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.MatchAttributes"
+                }
+            },
+            "required": [
+                "Actions",
+                "MatchAttributes"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RuleGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "RuleVariables": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleVariables"
+                },
+                "RulesSource": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RulesSource"
+                },
+                "StatefulRuleOptions": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.StatefulRuleOptions"
+                }
+            },
+            "required": [
+                "RulesSource"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RuleOption": {
+            "additionalProperties": false,
+            "properties": {
+                "Keyword": {
+                    "type": "string"
+                },
+                "Settings": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Keyword"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RuleVariables": {
+            "additionalProperties": false,
+            "properties": {
+                "IPSets": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.IPSet"
+                        }
+                    },
+                    "type": "object"
+                },
+                "PortSets": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.PortSet"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RulesSource": {
+            "additionalProperties": false,
+            "properties": {
+                "RulesSourceList": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RulesSourceList"
+                },
+                "RulesString": {
+                    "type": "string"
+                },
+                "StatefulRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.StatefulRule"
+                    },
+                    "type": "array"
+                },
+                "StatelessRulesAndCustomActions": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.StatelessRulesAndCustomActions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RulesSourceList": {
+            "additionalProperties": false,
+            "properties": {
+                "GeneratedRulesType": {
+                    "type": "string"
+                },
+                "TargetTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Targets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "GeneratedRulesType",
+                "TargetTypes",
+                "Targets"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.StatefulRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Header": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.Header"
+                },
+                "RuleOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleOption"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Action",
+                "Header",
+                "RuleOptions"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.StatefulRuleOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "RuleOrder": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.StatelessRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "RuleDefinition": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleDefinition"
+                }
+            },
+            "required": [
+                "Priority",
+                "RuleDefinition"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.StatelessRulesAndCustomActions": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomActions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.CustomAction"
+                    },
+                    "type": "array"
+                },
+                "StatelessRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.StatelessRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "StatelessRules"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.TCPFlagField": {
+            "additionalProperties": false,
+            "properties": {
+                "Flags": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Masks": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Flags"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::CustomerGatewayAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomerGatewayArn": {
+                            "type": "string"
+                        },
+                        "DeviceId": {
+                            "type": "string"
+                        },
+                        "GlobalNetworkId": {
+                            "type": "string"
+                        },
+                        "LinkId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CustomerGatewayArn",
+                        "DeviceId",
+                        "GlobalNetworkId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::CustomerGatewayAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Device": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Location": {
+                            "$ref": "#/definitions/AWS::NetworkManager::Device.Location"
+                        },
+                        "Model": {
+                            "type": "string"
+                        },
+                        "SerialNumber": {
+                            "type": "string"
+                        },
+                        "SiteId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Vendor": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GlobalNetworkId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::Device"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Device.Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Latitude": {
+                    "type": "string"
+                },
+                "Longitude": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::GlobalNetwork": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::GlobalNetwork"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Link": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Bandwidth": {
+                            "$ref": "#/definitions/AWS::NetworkManager::Link.Bandwidth"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "GlobalNetworkId": {
+                            "type": "string"
+                        },
+                        "Provider": {
+                            "type": "string"
+                        },
+                        "SiteId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Bandwidth",
+                        "GlobalNetworkId",
+                        "SiteId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::Link"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Link.Bandwidth": {
+            "additionalProperties": false,
+            "properties": {
+                "DownloadSpeed": {
+                    "type": "number"
+                },
+                "UploadSpeed": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::LinkAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeviceId": {
+                            "type": "string"
+                        },
+                        "GlobalNetworkId": {
+                            "type": "string"
+                        },
+                        "LinkId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DeviceId",
+                        "GlobalNetworkId",
+                        "LinkId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::LinkAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Site": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Location": {
+                            "$ref": "#/definitions/AWS::NetworkManager::Site.Location"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "GlobalNetworkId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::Site"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Site.Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Latitude": {
+                    "type": "string"
+                },
+                "Longitude": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::TransitGatewayRegistration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GlobalNetworkId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GlobalNetworkId",
+                        "TransitGatewayArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::TransitGatewayRegistration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::LaunchProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Ec2SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchProfileProtocolVersions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "StreamConfiguration": {
+                            "$ref": "#/definitions/AWS::NimbleStudio::LaunchProfile.StreamConfiguration"
+                        },
+                        "StudioComponentIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "StudioId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Ec2SubnetIds",
+                        "LaunchProfileProtocolVersions",
+                        "Name",
+                        "StreamConfiguration",
+                        "StudioComponentIds",
+                        "StudioId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NimbleStudio::LaunchProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::LaunchProfile.StreamConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClipboardMode": {
+                    "type": "string"
+                },
+                "Ec2InstanceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaxSessionLengthInMinutes": {
+                    "type": "number"
+                },
+                "StreamingImageIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ClipboardMode",
+                "Ec2InstanceTypes",
+                "StreamingImageIds"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StreamingImage": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Ec2ImageId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "StudioId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Ec2ImageId",
+                        "Name",
+                        "StudioId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NimbleStudio::StreamingImage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::Studio": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdminRoleArn": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "StudioEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::NimbleStudio::Studio.StudioEncryptionConfiguration"
+                        },
+                        "StudioName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "UserRoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AdminRoleArn",
+                        "DisplayName",
+                        "StudioName",
+                        "UserRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NimbleStudio::Studio"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::Studio.StudioEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyArn": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KeyType"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.StudioComponentConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Ec2SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "InitializationScripts": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.StudioComponentInitializationScript"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ScriptParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.ScriptParameterKeyValue"
+                            },
+                            "type": "array"
+                        },
+                        "StudioId": {
+                            "type": "string"
+                        },
+                        "Subtype": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "StudioId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NimbleStudio::StudioComponent"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.ActiveDirectoryComputerAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.ActiveDirectoryConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputerAttributes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.ActiveDirectoryComputerAttribute"
+                    },
+                    "type": "array"
+                },
+                "DirectoryId": {
+                    "type": "string"
+                },
+                "OrganizationalUnitDistinguishedName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.ComputeFarmConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveDirectoryUser": {
+                    "type": "string"
+                },
+                "Endpoint": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.LicenseServiceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.ScriptParameterKeyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.SharedFileSystemConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                },
+                "FileSystemId": {
+                    "type": "string"
+                },
+                "LinuxMountPoint": {
+                    "type": "string"
+                },
+                "ShareName": {
+                    "type": "string"
+                },
+                "WindowsMountDrive": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.StudioComponentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveDirectoryConfiguration": {
+                    "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.ActiveDirectoryConfiguration"
+                },
+                "ComputeFarmConfiguration": {
+                    "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.ComputeFarmConfiguration"
+                },
+                "LicenseServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.LicenseServiceConfiguration"
+                },
+                "SharedFileSystemConfiguration": {
+                    "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.SharedFileSystemConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.StudioComponentInitializationScript": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchProfileProtocolVersion": {
+                    "type": "string"
+                },
+                "Platform": {
+                    "type": "string"
+                },
+                "RunContext": {
+                    "type": "string"
+                },
+                "Script": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessPolicies": {
+                            "type": "object"
+                        },
+                        "AdvancedOptions": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "AdvancedSecurityOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.AdvancedSecurityOptionsInput"
+                        },
+                        "ClusterConfig": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.ClusterConfig"
+                        },
+                        "CognitoOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.CognitoOptions"
+                        },
+                        "DomainEndpointOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.DomainEndpointOptions"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EBSOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.EBSOptions"
+                        },
+                        "EncryptionAtRestOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.EncryptionAtRestOptions"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "LogPublishingOptions": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::OpenSearchService::Domain.LogPublishingOption"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "NodeToNodeEncryptionOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.NodeToNodeEncryptionOptions"
+                        },
+                        "SnapshotOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.SnapshotOptions"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VPCOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.VPCOptions"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpenSearchService::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.AdvancedSecurityOptionsInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "InternalUserDatabaseEnabled": {
+                    "type": "boolean"
+                },
+                "MasterUserOptions": {
+                    "$ref": "#/definitions/AWS::OpenSearchService::Domain.MasterUserOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DedicatedMasterCount": {
+                    "type": "number"
+                },
+                "DedicatedMasterEnabled": {
+                    "type": "boolean"
+                },
+                "DedicatedMasterType": {
+                    "type": "string"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "WarmCount": {
+                    "type": "number"
+                },
+                "WarmEnabled": {
+                    "type": "boolean"
+                },
+                "WarmType": {
+                    "type": "string"
+                },
+                "ZoneAwarenessConfig": {
+                    "$ref": "#/definitions/AWS::OpenSearchService::Domain.ZoneAwarenessConfig"
+                },
+                "ZoneAwarenessEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.CognitoOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "IdentityPoolId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "UserPoolId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.DomainEndpointOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomEndpoint": {
+                    "type": "string"
+                },
+                "CustomEndpointCertificateArn": {
+                    "type": "string"
+                },
+                "CustomEndpointEnabled": {
+                    "type": "boolean"
+                },
+                "EnforceHTTPS": {
+                    "type": "boolean"
+                },
+                "TLSSecurityPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.EBSOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "EBSEnabled": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.EncryptionAtRestOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.LogPublishingOption": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsLogGroupArn": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.MasterUserOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "MasterUserARN": {
+                    "type": "string"
+                },
+                "MasterUserName": {
+                    "type": "string"
+                },
+                "MasterUserPassword": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.NodeToNodeEncryptionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.SnapshotOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomatedSnapshotStartHour": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.VPCOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.ZoneAwarenessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZoneCount": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::App": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppSource": {
+                            "$ref": "#/definitions/AWS::OpsWorks::App.Source"
+                        },
+                        "Attributes": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "DataSources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::App.DataSource"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Domains": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EnableSsl": {
+                            "type": "boolean"
+                        },
+                        "Environment": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::App.EnvironmentVariable"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Shortname": {
+                            "type": "string"
+                        },
+                        "SslConfiguration": {
+                            "$ref": "#/definitions/AWS::OpsWorks::App.SslConfiguration"
+                        },
+                        "StackId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "StackId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::App"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::App.DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::App.EnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Secure": {
+                    "type": "boolean"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::App.Source": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Revision": {
+                    "type": "string"
+                },
+                "SshKey": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::App.SslConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
+                    "type": "string"
+                },
+                "Chain": {
+                    "type": "string"
+                },
+                "PrivateKey": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::ElasticLoadBalancerAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ElasticLoadBalancerName": {
+                            "type": "string"
+                        },
+                        "LayerId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ElasticLoadBalancerName",
+                        "LayerId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::ElasticLoadBalancerAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Instance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AgentVersion": {
+                            "type": "string"
+                        },
+                        "AmiId": {
+                            "type": "string"
+                        },
+                        "Architecture": {
+                            "type": "string"
+                        },
+                        "AutoScalingType": {
+                            "type": "string"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "BlockDeviceMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::Instance.BlockDeviceMapping"
+                            },
+                            "type": "array"
+                        },
+                        "EbsOptimized": {
+                            "type": "boolean"
+                        },
+                        "ElasticIps": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Hostname": {
+                            "type": "string"
+                        },
+                        "InstallUpdatesOnBoot": {
+                            "type": "boolean"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "LayerIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Os": {
+                            "type": "string"
+                        },
+                        "RootDeviceType": {
+                            "type": "string"
+                        },
+                        "SshKeyName": {
+                            "type": "string"
+                        },
+                        "StackId": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tenancy": {
+                            "type": "string"
+                        },
+                        "TimeBasedAutoScaling": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Instance.TimeBasedAutoScaling"
+                        },
+                        "VirtualizationType": {
+                            "type": "string"
+                        },
+                        "Volumes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InstanceType",
+                        "LayerIds",
+                        "StackId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Instance.BlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::OpsWorks::Instance.EbsBlockDevice"
+                },
+                "NoDevice": {
+                    "type": "string"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Instance.EbsBlockDevice": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Instance.TimeBasedAutoScaling": {
+            "additionalProperties": false,
+            "properties": {
+                "Friday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Monday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Saturday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Sunday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Thursday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Tuesday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Wednesday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Attributes": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "AutoAssignElasticIps": {
+                            "type": "boolean"
+                        },
+                        "AutoAssignPublicIps": {
+                            "type": "boolean"
+                        },
+                        "CustomInstanceProfileArn": {
+                            "type": "string"
+                        },
+                        "CustomJson": {
+                            "type": "object"
+                        },
+                        "CustomRecipes": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Layer.Recipes"
+                        },
+                        "CustomSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EnableAutoHealing": {
+                            "type": "boolean"
+                        },
+                        "InstallUpdatesOnBoot": {
+                            "type": "boolean"
+                        },
+                        "LifecycleEventConfiguration": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Layer.LifecycleEventConfiguration"
+                        },
+                        "LoadBasedAutoScaling": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Layer.LoadBasedAutoScaling"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Packages": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Shortname": {
+                            "type": "string"
+                        },
+                        "StackId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "UseEbsOptimizedInstances": {
+                            "type": "boolean"
+                        },
+                        "VolumeConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::Layer.VolumeConfiguration"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AutoAssignElasticIps",
+                        "AutoAssignPublicIps",
+                        "EnableAutoHealing",
+                        "Name",
+                        "Shortname",
+                        "StackId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::Layer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.AutoScalingThresholds": {
+            "additionalProperties": false,
+            "properties": {
+                "CpuThreshold": {
+                    "type": "number"
+                },
+                "IgnoreMetricsTime": {
+                    "type": "number"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "LoadThreshold": {
+                    "type": "number"
+                },
+                "MemoryThreshold": {
+                    "type": "number"
+                },
+                "ThresholdsWaitTime": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.LifecycleEventConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ShutdownEventConfiguration": {
+                    "$ref": "#/definitions/AWS::OpsWorks::Layer.ShutdownEventConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.LoadBasedAutoScaling": {
+            "additionalProperties": false,
+            "properties": {
+                "DownScaling": {
+                    "$ref": "#/definitions/AWS::OpsWorks::Layer.AutoScalingThresholds"
+                },
+                "Enable": {
+                    "type": "boolean"
+                },
+                "UpScaling": {
+                    "$ref": "#/definitions/AWS::OpsWorks::Layer.AutoScalingThresholds"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.Recipes": {
+            "additionalProperties": false,
+            "properties": {
+                "Configure": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Deploy": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Setup": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Shutdown": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Undeploy": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.ShutdownEventConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DelayUntilElbConnectionsDrained": {
+                    "type": "boolean"
+                },
+                "ExecutionTimeout": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.VolumeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "MountPoint": {
+                    "type": "string"
+                },
+                "NumberOfDisks": {
+                    "type": "number"
+                },
+                "RaidLevel": {
+                    "type": "number"
+                },
+                "Size": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AgentVersion": {
+                            "type": "string"
+                        },
+                        "Attributes": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ChefConfiguration": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Stack.ChefConfiguration"
+                        },
+                        "CloneAppIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ClonePermissions": {
+                            "type": "boolean"
+                        },
+                        "ConfigurationManager": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Stack.StackConfigurationManager"
+                        },
+                        "CustomCookbooksSource": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Stack.Source"
+                        },
+                        "CustomJson": {
+                            "type": "object"
+                        },
+                        "DefaultAvailabilityZone": {
+                            "type": "string"
+                        },
+                        "DefaultInstanceProfileArn": {
+                            "type": "string"
+                        },
+                        "DefaultOs": {
+                            "type": "string"
+                        },
+                        "DefaultRootDeviceType": {
+                            "type": "string"
+                        },
+                        "DefaultSshKeyName": {
+                            "type": "string"
+                        },
+                        "DefaultSubnetId": {
+                            "type": "string"
+                        },
+                        "EcsClusterArn": {
+                            "type": "string"
+                        },
+                        "ElasticIps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::Stack.ElasticIp"
+                            },
+                            "type": "array"
+                        },
+                        "HostnameTheme": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RdsDbInstances": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::Stack.RdsDbInstance"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceRoleArn": {
+                            "type": "string"
+                        },
+                        "SourceStackId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UseCustomCookbooks": {
+                            "type": "boolean"
+                        },
+                        "UseOpsworksSecurityGroups": {
+                            "type": "boolean"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DefaultInstanceProfileArn",
+                        "Name",
+                        "ServiceRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::Stack"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack.ChefConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BerkshelfVersion": {
+                    "type": "string"
+                },
+                "ManageBerkshelf": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack.ElasticIp": {
+            "additionalProperties": false,
+            "properties": {
+                "Ip": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ip"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack.RdsDbInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DbPassword": {
+                    "type": "string"
+                },
+                "DbUser": {
+                    "type": "string"
+                },
+                "RdsDbInstanceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DbPassword",
+                "DbUser",
+                "RdsDbInstanceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack.Source": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Revision": {
+                    "type": "string"
+                },
+                "SshKey": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack.StackConfigurationManager": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::UserProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowSelfManagement": {
+                            "type": "boolean"
+                        },
+                        "IamUserArn": {
+                            "type": "string"
+                        },
+                        "SshPublicKey": {
+                            "type": "string"
+                        },
+                        "SshUsername": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "IamUserArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::UserProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Volume": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Ec2VolumeId": {
+                            "type": "string"
+                        },
+                        "MountPoint": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "StackId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Ec2VolumeId",
+                        "StackId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::Volume"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorksCM::Server": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatePublicIpAddress": {
+                            "type": "boolean"
+                        },
+                        "BackupId": {
+                            "type": "string"
+                        },
+                        "BackupRetentionCount": {
+                            "type": "number"
+                        },
+                        "CustomCertificate": {
+                            "type": "string"
+                        },
+                        "CustomDomain": {
+                            "type": "string"
+                        },
+                        "CustomPrivateKey": {
+                            "type": "string"
+                        },
+                        "DisableAutomatedBackup": {
+                            "type": "boolean"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorksCM::Server.EngineAttribute"
+                            },
+                            "type": "array"
+                        },
+                        "EngineModel": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "InstanceProfileArn": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "KeyPair": {
+                            "type": "string"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ServerName": {
+                            "type": "string"
+                        },
+                        "ServiceRoleArn": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InstanceProfileArn",
+                        "InstanceType",
+                        "ServiceRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorksCM::Server"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorksCM::Server.EngineAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Panorama::ApplicationInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationInstanceIdToReplace": {
+                            "type": "string"
+                        },
+                        "DefaultRuntimeContextDevice": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DeviceId": {
+                            "type": "string"
+                        },
+                        "ManifestOverridesPayload": {
+                            "$ref": "#/definitions/AWS::Panorama::ApplicationInstance.ManifestOverridesPayload"
+                        },
+                        "ManifestPayload": {
+                            "$ref": "#/definitions/AWS::Panorama::ApplicationInstance.ManifestPayload"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RuntimeRoleArn": {
+                            "type": "string"
+                        },
+                        "StatusFilter": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DefaultRuntimeContextDevice",
+                        "ManifestPayload"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Panorama::ApplicationInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Panorama::ApplicationInstance.ManifestOverridesPayload": {
+            "additionalProperties": false,
+            "properties": {
+                "PayloadData": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Panorama::ApplicationInstance.ManifestPayload": {
+            "additionalProperties": false,
+            "properties": {
+                "PayloadData": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Panorama::Package": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PackageName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PackageName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Panorama::Package"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Panorama::PackageVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MarkLatest": {
+                            "type": "boolean"
+                        },
+                        "OwnerAccount": {
+                            "type": "string"
+                        },
+                        "PackageId": {
+                            "type": "string"
+                        },
+                        "PackageVersion": {
+                            "type": "string"
+                        },
+                        "PatchVersion": {
+                            "type": "string"
+                        },
+                        "UpdatedLatestPatchVersion": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PackageId",
+                        "PackageVersion",
+                        "PatchVersion"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Panorama::PackageVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::ADMChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ClientId": {
+                            "type": "string"
+                        },
+                        "ClientSecret": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "ClientId",
+                        "ClientSecret"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::ADMChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::APNSChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "DefaultAuthenticationMethod": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "PrivateKey": {
+                            "type": "string"
+                        },
+                        "TeamId": {
+                            "type": "string"
+                        },
+                        "TokenKey": {
+                            "type": "string"
+                        },
+                        "TokenKeyId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::APNSChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::APNSSandboxChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "DefaultAuthenticationMethod": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "PrivateKey": {
+                            "type": "string"
+                        },
+                        "TeamId": {
+                            "type": "string"
+                        },
+                        "TokenKey": {
+                            "type": "string"
+                        },
+                        "TokenKeyId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::APNSSandboxChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::APNSVoipChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "DefaultAuthenticationMethod": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "PrivateKey": {
+                            "type": "string"
+                        },
+                        "TeamId": {
+                            "type": "string"
+                        },
+                        "TokenKey": {
+                            "type": "string"
+                        },
+                        "TokenKeyId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::APNSVoipChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::APNSVoipSandboxChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "DefaultAuthenticationMethod": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "PrivateKey": {
+                            "type": "string"
+                        },
+                        "TeamId": {
+                            "type": "string"
+                        },
+                        "TokenKey": {
+                            "type": "string"
+                        },
+                        "TokenKeyId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::APNSVoipSandboxChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::App": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::App"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::ApplicationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "CampaignHook": {
+                            "$ref": "#/definitions/AWS::Pinpoint::ApplicationSettings.CampaignHook"
+                        },
+                        "CloudWatchMetricsEnabled": {
+                            "type": "boolean"
+                        },
+                        "Limits": {
+                            "$ref": "#/definitions/AWS::Pinpoint::ApplicationSettings.Limits"
+                        },
+                        "QuietTime": {
+                            "$ref": "#/definitions/AWS::Pinpoint::ApplicationSettings.QuietTime"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::ApplicationSettings"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::ApplicationSettings.CampaignHook": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaFunctionName": {
+                    "type": "string"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "WebUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::ApplicationSettings.Limits": {
+            "additionalProperties": false,
+            "properties": {
+                "Daily": {
+                    "type": "number"
+                },
+                "MaximumDuration": {
+                    "type": "number"
+                },
+                "MessagesPerSecond": {
+                    "type": "number"
+                },
+                "Total": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::ApplicationSettings.QuietTime": {
+            "additionalProperties": false,
+            "properties": {
+                "End": {
+                    "type": "string"
+                },
+                "Start": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "End",
+                "Start"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::BaiduChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiKey": {
+                            "type": "string"
+                        },
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "SecretKey": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiKey",
+                        "ApplicationId",
+                        "SecretKey"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::BaiduChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdditionalTreatments": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Pinpoint::Campaign.WriteTreatmentResource"
+                            },
+                            "type": "array"
+                        },
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "CampaignHook": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Campaign.CampaignHook"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "HoldoutPercent": {
+                            "type": "number"
+                        },
+                        "IsPaused": {
+                            "type": "boolean"
+                        },
+                        "Limits": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Campaign.Limits"
+                        },
+                        "MessageConfiguration": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Campaign.MessageConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        },
+                        "Schedule": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Campaign.Schedule"
+                        },
+                        "SegmentId": {
+                            "type": "string"
+                        },
+                        "SegmentVersion": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TreatmentDescription": {
+                            "type": "string"
+                        },
+                        "TreatmentName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "MessageConfiguration",
+                        "Name",
+                        "Schedule",
+                        "SegmentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::Campaign"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.AttributeDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeType": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.CampaignEmailMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "Body": {
+                    "type": "string"
+                },
+                "FromAddress": {
+                    "type": "string"
+                },
+                "HtmlBody": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.CampaignEventFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.EventDimensions"
+                },
+                "FilterType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.CampaignHook": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaFunctionName": {
+                    "type": "string"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "WebUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.CampaignInAppMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "Content": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pinpoint::Campaign.InAppMessageContent"
+                    },
+                    "type": "array"
+                },
+                "CustomConfig": {
+                    "type": "object"
+                },
+                "Layout": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.CampaignSmsMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "Body": {
+                    "type": "string"
+                },
+                "EntityId": {
+                    "type": "string"
+                },
+                "MessageType": {
+                    "type": "string"
+                },
+                "OriginationNumber": {
+                    "type": "string"
+                },
+                "SenderId": {
+                    "type": "string"
+                },
+                "TemplateId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.DefaultButtonConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BorderRadius": {
+                    "type": "number"
+                },
+                "ButtonAction": {
+                    "type": "string"
+                },
+                "Link": {
+                    "type": "string"
+                },
+                "Text": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.EventDimensions": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "type": "object"
+                },
+                "EventType": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.SetDimension"
+                },
+                "Metrics": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.InAppMessageBodyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.InAppMessageButton": {
+            "additionalProperties": false,
+            "properties": {
+                "Android": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.OverrideButtonConfiguration"
+                },
+                "DefaultConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.DefaultButtonConfiguration"
+                },
+                "IOS": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.OverrideButtonConfiguration"
+                },
+                "Web": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.OverrideButtonConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.InAppMessageContent": {
+            "additionalProperties": false,
+            "properties": {
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BodyConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.InAppMessageBodyConfig"
+                },
+                "HeaderConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.InAppMessageHeaderConfig"
+                },
+                "ImageUrl": {
+                    "type": "string"
+                },
+                "PrimaryBtn": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.InAppMessageButton"
+                },
+                "SecondaryBtn": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.InAppMessageButton"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.InAppMessageHeaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "Header": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.Limits": {
+            "additionalProperties": false,
+            "properties": {
+                "Daily": {
+                    "type": "number"
+                },
+                "MaximumDuration": {
+                    "type": "number"
+                },
+                "MessagesPerSecond": {
+                    "type": "number"
+                },
+                "Session": {
+                    "type": "number"
+                },
+                "Total": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.Message": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "ImageIconUrl": {
+                    "type": "string"
+                },
+                "ImageSmallIconUrl": {
+                    "type": "string"
+                },
+                "ImageUrl": {
+                    "type": "string"
+                },
+                "JsonBody": {
+                    "type": "string"
+                },
+                "MediaUrl": {
+                    "type": "string"
+                },
+                "RawContent": {
+                    "type": "string"
+                },
+                "SilentPush": {
+                    "type": "boolean"
+                },
+                "TimeToLive": {
+                    "type": "number"
+                },
+                "Title": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.MessageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ADMMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Message"
+                },
+                "APNSMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Message"
+                },
+                "BaiduMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Message"
+                },
+                "DefaultMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Message"
+                },
+                "EmailMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.CampaignEmailMessage"
+                },
+                "GCMMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Message"
+                },
+                "InAppMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.CampaignInAppMessage"
+                },
+                "SMSMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.CampaignSmsMessage"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.OverrideButtonConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ButtonAction": {
+                    "type": "string"
+                },
+                "Link": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.QuietTime": {
+            "additionalProperties": false,
+            "properties": {
+                "End": {
+                    "type": "string"
+                },
+                "Start": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "End",
+                "Start"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "EndTime": {
+                    "type": "string"
+                },
+                "EventFilter": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.CampaignEventFilter"
+                },
+                "Frequency": {
+                    "type": "string"
+                },
+                "IsLocalTime": {
+                    "type": "boolean"
+                },
+                "QuietTime": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.QuietTime"
+                },
+                "StartTime": {
+                    "type": "string"
+                },
+                "TimeZone": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.SetDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionType": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.WriteTreatmentResource": {
+            "additionalProperties": false,
+            "properties": {
+                "MessageConfiguration": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.MessageConfiguration"
+                },
+                "Schedule": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Schedule"
+                },
+                "SizePercent": {
+                    "type": "number"
+                },
+                "TreatmentDescription": {
+                    "type": "string"
+                },
+                "TreatmentName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::EmailChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ConfigurationSet": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "FromAddress": {
+                            "type": "string"
+                        },
+                        "Identity": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "FromAddress",
+                        "Identity"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::EmailChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::EmailTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DefaultSubstitutions": {
+                            "type": "string"
+                        },
+                        "HtmlPart": {
+                            "type": "string"
+                        },
+                        "Subject": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TemplateDescription": {
+                            "type": "string"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        },
+                        "TextPart": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Subject",
+                        "TemplateName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::EmailTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::EventStream": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DestinationStreamArn": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "DestinationStreamArn",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::EventStream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::GCMChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiKey": {
+                            "type": "string"
+                        },
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ApiKey",
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::GCMChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Content": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.InAppMessageContent"
+                            },
+                            "type": "array"
+                        },
+                        "CustomConfig": {
+                            "type": "object"
+                        },
+                        "Layout": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TemplateDescription": {
+                            "type": "string"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TemplateName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::InAppTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.BodyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.ButtonConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Android": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.OverrideButtonConfiguration"
+                },
+                "DefaultConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.DefaultButtonConfiguration"
+                },
+                "IOS": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.OverrideButtonConfiguration"
+                },
+                "Web": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.OverrideButtonConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.DefaultButtonConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BorderRadius": {
+                    "type": "number"
+                },
+                "ButtonAction": {
+                    "type": "string"
+                },
+                "Link": {
+                    "type": "string"
+                },
+                "Text": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.HeaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "Header": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.InAppMessageContent": {
+            "additionalProperties": false,
+            "properties": {
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BodyConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.BodyConfig"
+                },
+                "HeaderConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.HeaderConfig"
+                },
+                "ImageUrl": {
+                    "type": "string"
+                },
+                "PrimaryBtn": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.ButtonConfig"
+                },
+                "SecondaryBtn": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.ButtonConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.OverrideButtonConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ButtonAction": {
+                    "type": "string"
+                },
+                "Link": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::PushTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ADM": {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate.AndroidPushNotificationTemplate"
+                        },
+                        "APNS": {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate.APNSPushNotificationTemplate"
+                        },
+                        "Baidu": {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate.AndroidPushNotificationTemplate"
+                        },
+                        "Default": {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate.DefaultPushNotificationTemplate"
+                        },
+                        "DefaultSubstitutions": {
+                            "type": "string"
+                        },
+                        "GCM": {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate.AndroidPushNotificationTemplate"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TemplateDescription": {
+                            "type": "string"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TemplateName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::PushTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::PushTemplate.APNSPushNotificationTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "MediaUrl": {
+                    "type": "string"
+                },
+                "Sound": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::PushTemplate.AndroidPushNotificationTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "ImageIconUrl": {
+                    "type": "string"
+                },
+                "ImageUrl": {
+                    "type": "string"
+                },
+                "SmallImageIconUrl": {
+                    "type": "string"
+                },
+                "Sound": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::PushTemplate.DefaultPushNotificationTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "Sound": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::SMSChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "SenderId": {
+                            "type": "string"
+                        },
+                        "ShortCode": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::SMSChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Dimensions": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Segment.SegmentDimensions"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SegmentGroups": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Segment.SegmentGroups"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::Segment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.AttributeDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeType": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Behavior": {
+            "additionalProperties": false,
+            "properties": {
+                "Recency": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.Recency"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Coordinates": {
+            "additionalProperties": false,
+            "properties": {
+                "Latitude": {
+                    "type": "number"
+                },
+                "Longitude": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Latitude",
+                "Longitude"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Demographic": {
+            "additionalProperties": false,
+            "properties": {
+                "AppVersion": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "Channel": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "DeviceType": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "Make": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "Model": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "Platform": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.GPSPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "Coordinates": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.Coordinates"
+                },
+                "RangeInKilometers": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Coordinates",
+                "RangeInKilometers"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Groups": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pinpoint::Segment.SegmentDimensions"
+                    },
+                    "type": "array"
+                },
+                "SourceSegments": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pinpoint::Segment.SourceSegments"
+                    },
+                    "type": "array"
+                },
+                "SourceType": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Country": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "GPSPoint": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.GPSPoint"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Recency": {
+            "additionalProperties": false,
+            "properties": {
+                "Duration": {
+                    "type": "string"
+                },
+                "RecencyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Duration",
+                "RecencyType"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.SegmentDimensions": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "type": "object"
+                },
+                "Behavior": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.Behavior"
+                },
+                "Demographic": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.Demographic"
+                },
+                "Location": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.Location"
+                },
+                "Metrics": {
+                    "type": "object"
+                },
+                "UserAttributes": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.SegmentGroups": {
+            "additionalProperties": false,
+            "properties": {
+                "Groups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pinpoint::Segment.Groups"
+                    },
+                    "type": "array"
+                },
+                "Include": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.SetDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionType": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.SourceSegments": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::SmsTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Body": {
+                            "type": "string"
+                        },
+                        "DefaultSubstitutions": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TemplateDescription": {
+                            "type": "string"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Body",
+                        "TemplateName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::SmsTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::VoiceChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::VoiceChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeliveryOptions": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet.DeliveryOptions"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ReputationOptions": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet.ReputationOptions"
+                        },
+                        "SendingOptions": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet.SendingOptions"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet.Tags"
+                            },
+                            "type": "array"
+                        },
+                        "TrackingOptions": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet.TrackingOptions"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PinpointEmail::ConfigurationSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet.DeliveryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "SendingPoolName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet.ReputationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "ReputationMetricsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet.SendingOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "SendingEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet.TrackingOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomRedirectDomain": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigurationSetName": {
+                            "type": "string"
+                        },
+                        "EventDestination": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.EventDestination"
+                        },
+                        "EventDestinationName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationSetName",
+                        "EventDestinationName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PinpointEmail::ConfigurationSetEventDestination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.CloudWatchDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.DimensionConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.DimensionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultDimensionValue": {
+                    "type": "string"
+                },
+                "DimensionName": {
+                    "type": "string"
+                },
+                "DimensionValueSource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DefaultDimensionValue",
+                "DimensionName",
+                "DimensionValueSource"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.EventDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchDestination": {
+                    "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.CloudWatchDestination"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "KinesisFirehoseDestination": {
+                    "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.KinesisFirehoseDestination"
+                },
+                "MatchingEventTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PinpointDestination": {
+                    "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.PinpointDestination"
+                },
+                "SnsDestination": {
+                    "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.SnsDestination"
+                }
+            },
+            "required": [
+                "MatchingEventTypes"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.KinesisFirehoseDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStreamArn": {
+                    "type": "string"
+                },
+                "IamRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStreamArn",
+                "IamRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.PinpointDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.SnsDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::DedicatedIpPool": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PoolName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::PinpointEmail::DedicatedIpPool.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PinpointEmail::DedicatedIpPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::DedicatedIpPool.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::Identity": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DkimSigningEnabled": {
+                            "type": "boolean"
+                        },
+                        "FeedbackForwardingEnabled": {
+                            "type": "boolean"
+                        },
+                        "MailFromAttributes": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::Identity.MailFromAttributes"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::PinpointEmail::Identity.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PinpointEmail::Identity"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::Identity.MailFromAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "BehaviorOnMxFailure": {
+                    "type": "string"
+                },
+                "MailFromDomain": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::Identity.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QLDB::Ledger": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "KmsKey": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PermissionsMode": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PermissionsMode"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QLDB::Ledger"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QLDB::Stream": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExclusiveEndTime": {
+                            "type": "string"
+                        },
+                        "InclusiveStartTime": {
+                            "type": "string"
+                        },
+                        "KinesisConfiguration": {
+                            "$ref": "#/definitions/AWS::QLDB::Stream.KinesisConfiguration"
+                        },
+                        "LedgerName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StreamName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InclusiveStartTime",
+                        "KinesisConfiguration",
+                        "LedgerName",
+                        "RoleArn",
+                        "StreamName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QLDB::Stream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QLDB::Stream.KinesisConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregationEnabled": {
+                    "type": "boolean"
+                },
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AnalysisId": {
+                            "type": "string"
+                        },
+                        "AwsAccountId": {
+                            "type": "string"
+                        },
+                        "Errors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Analysis.AnalysisError"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "$ref": "#/definitions/AWS::QuickSight::Analysis.Parameters"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Analysis.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SourceEntity": {
+                            "$ref": "#/definitions/AWS::QuickSight::Analysis.AnalysisSourceEntity"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThemeArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AnalysisId",
+                        "AwsAccountId",
+                        "SourceEntity"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Analysis"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.AnalysisError": {
+            "additionalProperties": false,
+            "properties": {
+                "Message": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.AnalysisSourceEntity": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceTemplate": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.AnalysisSourceTemplate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.AnalysisSourceTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "DataSetReferences": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DataSetReference"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn",
+                "DataSetReferences"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.DataSetReference": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSetArn": {
+                    "type": "string"
+                },
+                "DataSetPlaceholder": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSetArn",
+                "DataSetPlaceholder"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.DateTimeParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.DecimalParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.IntegerParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.Parameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DateTimeParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DateTimeParameter"
+                    },
+                    "type": "array"
+                },
+                "DecimalParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DecimalParameter"
+                    },
+                    "type": "array"
+                },
+                "IntegerParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.IntegerParameter"
+                    },
+                    "type": "array"
+                },
+                "StringParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.StringParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.Sheet": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SheetId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.StringParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DashboardId": {
+                            "type": "string"
+                        },
+                        "DashboardPublishOptions": {
+                            "$ref": "#/definitions/AWS::QuickSight::Dashboard.DashboardPublishOptions"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "$ref": "#/definitions/AWS::QuickSight::Dashboard.Parameters"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Dashboard.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SourceEntity": {
+                            "$ref": "#/definitions/AWS::QuickSight::Dashboard.DashboardSourceEntity"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThemeArn": {
+                            "type": "string"
+                        },
+                        "VersionDescription": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AwsAccountId",
+                        "DashboardId",
+                        "SourceEntity"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Dashboard"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.AdHocFilteringOption": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityStatus": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DashboardPublishOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "AdHocFilteringOption": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.AdHocFilteringOption"
+                },
+                "ExportToCSVOption": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ExportToCSVOption"
+                },
+                "SheetControlsOption": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.SheetControlsOption"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DashboardSourceEntity": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceTemplate": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.DashboardSourceTemplate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DashboardSourceTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "DataSetReferences": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DataSetReference"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn",
+                "DataSetReferences"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DataSetReference": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSetArn": {
+                    "type": "string"
+                },
+                "DataSetPlaceholder": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSetArn",
+                "DataSetPlaceholder"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DateTimeParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DecimalParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.ExportToCSVOption": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityStatus": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.IntegerParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.Parameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DateTimeParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DateTimeParameter"
+                    },
+                    "type": "array"
+                },
+                "DecimalParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DecimalParameter"
+                    },
+                    "type": "array"
+                },
+                "IntegerParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.IntegerParameter"
+                    },
+                    "type": "array"
+                },
+                "StringParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.StringParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.SheetControlsOption": {
+            "additionalProperties": false,
+            "properties": {
+                "VisibilityState": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.StringParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ColumnGroups": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::DataSet.ColumnGroup"
+                            },
+                            "type": "array"
+                        },
+                        "ColumnLevelPermissionRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::DataSet.ColumnLevelPermissionRule"
+                            },
+                            "type": "array"
+                        },
+                        "DataSetId": {
+                            "type": "string"
+                        },
+                        "FieldFolders": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::QuickSight::DataSet.FieldFolder"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ImportMode": {
+                            "type": "string"
+                        },
+                        "IngestionWaitPolicy": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSet.IngestionWaitPolicy"
+                        },
+                        "LogicalTableMap": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::QuickSight::DataSet.LogicalTable"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::DataSet.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "PhysicalTableMap": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::QuickSight::DataSet.PhysicalTable"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "RowLevelPermissionDataSet": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSet.RowLevelPermissionDataSet"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::DataSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.CalculatedColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnId": {
+                    "type": "string"
+                },
+                "ColumnName": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnId",
+                "ColumnName",
+                "Expression"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.CastColumnTypeOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                },
+                "NewColumnType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "NewColumnType"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ColumnDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ColumnGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "GeoSpatialColumnGroup": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.GeoSpatialColumnGroup"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ColumnLevelPermissionRule": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principals": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ColumnTag": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnDescription": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.ColumnDescription"
+                },
+                "ColumnGeographicRole": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.CreateColumnsOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.CalculatedColumn"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Columns"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.CustomSql": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.InputColumn"
+                    },
+                    "type": "array"
+                },
+                "DataSourceArn": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SqlQuery": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Columns",
+                "DataSourceArn",
+                "Name",
+                "SqlQuery"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.FieldFolder": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Description": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.FilterOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ConditionExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConditionExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.GeoSpatialColumnGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CountryCode": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Columns",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.IngestionWaitPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "IngestionWaitTimeInHours": {
+                    "type": "number"
+                },
+                "WaitForSpiceIngestion": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.InputColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.JoinInstruction": {
+            "additionalProperties": false,
+            "properties": {
+                "LeftJoinKeyProperties": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.JoinKeyProperties"
+                },
+                "LeftOperand": {
+                    "type": "string"
+                },
+                "OnClause": {
+                    "type": "string"
+                },
+                "RightJoinKeyProperties": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.JoinKeyProperties"
+                },
+                "RightOperand": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LeftOperand",
+                "OnClause",
+                "RightOperand",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.JoinKeyProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "UniqueKey": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.LogicalTable": {
+            "additionalProperties": false,
+            "properties": {
+                "Alias": {
+                    "type": "string"
+                },
+                "DataTransforms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.TransformOperation"
+                    },
+                    "type": "array"
+                },
+                "Source": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.LogicalTableSource"
+                }
+            },
+            "required": [
+                "Alias",
+                "Source"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.LogicalTableSource": {
+            "additionalProperties": false,
+            "properties": {
+                "JoinInstruction": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.JoinInstruction"
+                },
+                "PhysicalTableId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.OutputColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.PhysicalTable": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomSql": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.CustomSql"
+                },
+                "RelationalTable": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.RelationalTable"
+                },
+                "S3Source": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.S3Source"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ProjectOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ProjectedColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ProjectedColumns"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.RelationalTable": {
+            "additionalProperties": false,
+            "properties": {
+                "Catalog": {
+                    "type": "string"
+                },
+                "DataSourceArn": {
+                    "type": "string"
+                },
+                "InputColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.InputColumn"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Schema": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceArn",
+                "InputColumns",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.RenameColumnOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "NewColumnName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "NewColumnName"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.RowLevelPermissionDataSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "FormatVersion": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "PermissionPolicy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn",
+                "PermissionPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.S3Source": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceArn": {
+                    "type": "string"
+                },
+                "InputColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.InputColumn"
+                    },
+                    "type": "array"
+                },
+                "UploadSettings": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.UploadSettings"
+                }
+            },
+            "required": [
+                "DataSourceArn",
+                "InputColumns"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.TagColumnOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.ColumnTag"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "Tags"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.TransformOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "CastColumnTypeOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.CastColumnTypeOperation"
+                },
+                "CreateColumnsOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.CreateColumnsOperation"
+                },
+                "FilterOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.FilterOperation"
+                },
+                "ProjectOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.ProjectOperation"
+                },
+                "RenameColumnOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.RenameColumnOperation"
+                },
+                "TagColumnOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.TagColumnOperation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.UploadSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainsHeader": {
+                    "type": "boolean"
+                },
+                "Delimiter": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                },
+                "StartFromRow": {
+                    "type": "number"
+                },
+                "TextQualifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AlternateDataSourceParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::DataSource.DataSourceParameters"
+                            },
+                            "type": "array"
+                        },
+                        "AwsAccountId": {
+                            "type": "string"
+                        },
+                        "Credentials": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource.DataSourceCredentials"
+                        },
+                        "DataSourceId": {
+                            "type": "string"
+                        },
+                        "DataSourceParameters": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource.DataSourceParameters"
+                        },
+                        "ErrorInfo": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource.DataSourceErrorInfo"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::DataSource.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SslProperties": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource.SslProperties"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "VpcConnectionProperties": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource.VpcConnectionProperties"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::DataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.AmazonElasticsearchParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Domain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Domain"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.AmazonOpenSearchParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Domain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Domain"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.AthenaParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "WorkGroup": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.AuroraParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.AuroraPostgreSqlParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.CredentialPair": {
+            "additionalProperties": false,
+            "properties": {
+                "AlternateDataSourceParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSource.DataSourceParameters"
+                    },
+                    "type": "array"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.DataSourceCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "CopySourceArn": {
+                    "type": "string"
+                },
+                "CredentialPair": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.CredentialPair"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.DataSourceErrorInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Message": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.DataSourceParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "AmazonElasticsearchParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.AmazonElasticsearchParameters"
+                },
+                "AmazonOpenSearchParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.AmazonOpenSearchParameters"
+                },
+                "AthenaParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.AthenaParameters"
+                },
+                "AuroraParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.AuroraParameters"
+                },
+                "AuroraPostgreSqlParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.AuroraPostgreSqlParameters"
+                },
+                "MariaDbParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.MariaDbParameters"
+                },
+                "MySqlParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.MySqlParameters"
+                },
+                "OracleParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.OracleParameters"
+                },
+                "PostgreSqlParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.PostgreSqlParameters"
+                },
+                "PrestoParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.PrestoParameters"
+                },
+                "RdsParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.RdsParameters"
+                },
+                "RedshiftParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.RedshiftParameters"
+                },
+                "S3Parameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.S3Parameters"
+                },
+                "SnowflakeParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.SnowflakeParameters"
+                },
+                "SparkParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.SparkParameters"
+                },
+                "SqlServerParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.SqlServerParameters"
+                },
+                "TeradataParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.TeradataParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.ManifestFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.MariaDbParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.MySqlParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.OracleParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.PostgreSqlParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.PrestoParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Catalog": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Catalog",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.RdsParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "InstanceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Database",
+                "InstanceId"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.RedshiftParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterId": {
+                    "type": "string"
+                },
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.S3Parameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ManifestFileLocation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.ManifestFileLocation"
+                }
+            },
+            "required": [
+                "ManifestFileLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.SnowflakeParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Warehouse": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Warehouse"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.SparkParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.SqlServerParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.SslProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DisableSsl": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.TeradataParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.VpcConnectionProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "VpcConnectionArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VpcConnectionArn"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Template.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SourceEntity": {
+                            "$ref": "#/definitions/AWS::QuickSight::Template.TemplateSourceEntity"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateId": {
+                            "type": "string"
+                        },
+                        "VersionDescription": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AwsAccountId",
+                        "SourceEntity",
+                        "TemplateId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Template"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.DataSetReference": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSetArn": {
+                    "type": "string"
+                },
+                "DataSetPlaceholder": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSetArn",
+                "DataSetPlaceholder"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.TemplateSourceAnalysis": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "DataSetReferences": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DataSetReference"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn",
+                "DataSetReferences"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.TemplateSourceEntity": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceAnalysis": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.TemplateSourceAnalysis"
+                },
+                "SourceTemplate": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.TemplateSourceTemplate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.TemplateSourceTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "BaseThemeId": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::QuickSight::Theme.ThemeConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Theme.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThemeId": {
+                            "type": "string"
+                        },
+                        "VersionDescription": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AwsAccountId",
+                        "ThemeId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Theme"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.BorderStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Show": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.DataColorPalette": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EmptyFillColor": {
+                    "type": "string"
+                },
+                "MinMaxGradient": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.Font": {
+            "additionalProperties": false,
+            "properties": {
+                "FontFamily": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.GutterStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Show": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.MarginStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Show": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.SheetStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Tile": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.TileStyle"
+                },
+                "TileLayout": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.TileLayoutStyle"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.ThemeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DataColorPalette": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.DataColorPalette"
+                },
+                "Sheet": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.SheetStyle"
+                },
+                "Typography": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.Typography"
+                },
+                "UIColorPalette": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.UIColorPalette"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.TileLayoutStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Gutter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.GutterStyle"
+                },
+                "Margin": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.MarginStyle"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.TileStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Border": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.BorderStyle"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.Typography": {
+            "additionalProperties": false,
+            "properties": {
+                "FontFamilies": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Theme.Font"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.UIColorPalette": {
+            "additionalProperties": false,
+            "properties": {
+                "Accent": {
+                    "type": "string"
+                },
+                "AccentForeground": {
+                    "type": "string"
+                },
+                "Danger": {
+                    "type": "string"
+                },
+                "DangerForeground": {
+                    "type": "string"
+                },
+                "Dimension": {
+                    "type": "string"
+                },
+                "DimensionForeground": {
+                    "type": "string"
+                },
+                "Measure": {
+                    "type": "string"
+                },
+                "MeasureForeground": {
+                    "type": "string"
+                },
+                "PrimaryBackground": {
+                    "type": "string"
+                },
+                "PrimaryForeground": {
+                    "type": "string"
+                },
+                "SecondaryBackground": {
+                    "type": "string"
+                },
+                "SecondaryForeground": {
+                    "type": "string"
+                },
+                "Success": {
+                    "type": "string"
+                },
+                "SuccessForeground": {
+                    "type": "string"
+                },
+                "Warning": {
+                    "type": "string"
+                },
+                "WarningForeground": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RAM::ResourceShare": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowExternalPrincipals": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PermissionArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Principals": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ResourceArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RAM::ResourceShare"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatedRoles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBCluster.DBClusterRole"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BacktrackWindow": {
+                            "type": "number"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "CopyTagsToSnapshot": {
+                            "type": "boolean"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EnableHttpEndpoint": {
+                            "type": "boolean"
+                        },
+                        "EnableIAMDatabaseAuthentication": {
+                            "type": "boolean"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineMode": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "GlobalClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MasterUserPassword": {
+                            "type": "string"
+                        },
+                        "MasterUsername": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "ReplicationSourceIdentifier": {
+                            "type": "string"
+                        },
+                        "RestoreType": {
+                            "type": "string"
+                        },
+                        "ScalingConfiguration": {
+                            "$ref": "#/definitions/AWS::RDS::DBCluster.ScalingConfiguration"
+                        },
+                        "SnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceDBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceRegion": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UseLatestRestorableTime": {
+                            "type": "boolean"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Engine"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBCluster.DBClusterRole": {
+            "additionalProperties": false,
+            "properties": {
+                "FeatureName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBCluster.ScalingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoPause": {
+                    "type": "boolean"
+                },
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                },
+                "SecondsUntilAutoPause": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBClusterParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "Family",
+                        "Parameters"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBClusterParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocatedStorage": {
+                            "type": "string"
+                        },
+                        "AllowMajorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AssociatedRoles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBInstance.DBInstanceRole"
+                            },
+                            "type": "array"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "CACertificateIdentifier": {
+                            "type": "string"
+                        },
+                        "CharacterSetName": {
+                            "type": "string"
+                        },
+                        "CopyTagsToSnapshot": {
+                            "type": "boolean"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBInstanceClass": {
+                            "type": "string"
+                        },
+                        "DBInstanceIdentifier": {
+                            "type": "string"
+                        },
+                        "DBName": {
+                            "type": "string"
+                        },
+                        "DBParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DBSnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DeleteAutomatedBackups": {
+                            "type": "boolean"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "DomainIAMRoleName": {
+                            "type": "string"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EnableIAMDatabaseAuthentication": {
+                            "type": "boolean"
+                        },
+                        "EnablePerformanceInsights": {
+                            "type": "boolean"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "Iops": {
+                            "type": "number"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LicenseModel": {
+                            "type": "string"
+                        },
+                        "MasterUserPassword": {
+                            "type": "string"
+                        },
+                        "MasterUsername": {
+                            "type": "string"
+                        },
+                        "MaxAllocatedStorage": {
+                            "type": "number"
+                        },
+                        "MonitoringInterval": {
+                            "type": "number"
+                        },
+                        "MonitoringRoleArn": {
+                            "type": "string"
+                        },
+                        "MultiAZ": {
+                            "type": "boolean"
+                        },
+                        "OptionGroupName": {
+                            "type": "string"
+                        },
+                        "PerformanceInsightsKMSKeyId": {
+                            "type": "string"
+                        },
+                        "PerformanceInsightsRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "Port": {
+                            "type": "string"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "ProcessorFeatures": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBInstance.ProcessorFeature"
+                            },
+                            "type": "array"
+                        },
+                        "PromotionTier": {
+                            "type": "number"
+                        },
+                        "PubliclyAccessible": {
+                            "type": "boolean"
+                        },
+                        "SourceDBInstanceIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceRegion": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        },
+                        "StorageType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Timezone": {
+                            "type": "string"
+                        },
+                        "UseDefaultProcessorFeatures": {
+                            "type": "boolean"
+                        },
+                        "VPCSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBInstanceClass"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBInstance.DBInstanceRole": {
+            "additionalProperties": false,
+            "properties": {
+                "FeatureName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FeatureName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBInstance.ProcessorFeature": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "Family"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBProxy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Auth": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBProxy.AuthFormat"
+                            },
+                            "type": "array"
+                        },
+                        "DBProxyName": {
+                            "type": "string"
+                        },
+                        "DebugLogging": {
+                            "type": "boolean"
+                        },
+                        "EngineFamily": {
+                            "type": "string"
+                        },
+                        "IdleClientTimeout": {
+                            "type": "number"
+                        },
+                        "RequireTLS": {
+                            "type": "boolean"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBProxy.TagFormat"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Auth",
+                        "DBProxyName",
+                        "EngineFamily",
+                        "RoleArn",
+                        "VpcSubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBProxy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBProxy.AuthFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthScheme": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "IAMAuth": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "UserName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBProxy.TagFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBProxyEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DBProxyEndpointName": {
+                            "type": "string"
+                        },
+                        "DBProxyName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBProxyEndpoint.TagFormat"
+                            },
+                            "type": "array"
+                        },
+                        "TargetRole": {
+                            "type": "string"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBProxyEndpointName",
+                        "DBProxyName",
+                        "VpcSubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBProxyEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBProxyEndpoint.TagFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBProxyTargetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionPoolConfigurationInfo": {
+                            "$ref": "#/definitions/AWS::RDS::DBProxyTargetGroup.ConnectionPoolConfigurationInfoFormat"
+                        },
+                        "DBClusterIdentifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DBInstanceIdentifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DBProxyName": {
+                            "type": "string"
+                        },
+                        "TargetGroupName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DBProxyName",
+                        "TargetGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBProxyTargetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBProxyTargetGroup.ConnectionPoolConfigurationInfoFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionBorrowTimeout": {
+                    "type": "number"
+                },
+                "InitQuery": {
+                    "type": "string"
+                },
+                "MaxConnectionsPercent": {
+                    "type": "number"
+                },
+                "MaxIdleConnectionsPercent": {
+                    "type": "number"
+                },
+                "SessionPinningFilters": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBSecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DBSecurityGroupIngress": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBSecurityGroup.Ingress"
+                            },
+                            "type": "array"
+                        },
+                        "EC2VpcId": {
+                            "type": "string"
+                        },
+                        "GroupDescription": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBSecurityGroupIngress",
+                        "GroupDescription"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBSecurityGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBSecurityGroup.Ingress": {
+            "additionalProperties": false,
+            "properties": {
+                "CIDRIP": {
+                    "type": "string"
+                },
+                "EC2SecurityGroupId": {
+                    "type": "string"
+                },
+                "EC2SecurityGroupName": {
+                    "type": "string"
+                },
+                "EC2SecurityGroupOwnerId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBSecurityGroupIngress": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CIDRIP": {
+                            "type": "string"
+                        },
+                        "DBSecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupId": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupOwnerId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DBSecurityGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBSecurityGroupIngress"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBSubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DBSubnetGroupDescription": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBSubnetGroupDescription",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBSubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::EventSubscription": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "EventCategories": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SourceIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SourceType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SnsTopicArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::EventSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::GlobalCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "GlobalClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceDBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::GlobalCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::OptionGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EngineName": {
+                            "type": "string"
+                        },
+                        "MajorEngineVersion": {
+                            "type": "string"
+                        },
+                        "OptionConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::OptionGroup.OptionConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "OptionGroupDescription": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EngineName",
+                        "MajorEngineVersion",
+                        "OptionConfigurations",
+                        "OptionGroupDescription"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::OptionGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::OptionGroup.OptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DBSecurityGroupMemberships": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OptionName": {
+                    "type": "string"
+                },
+                "OptionSettings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::RDS::OptionGroup.OptionSetting"
+                    },
+                    "type": "array"
+                },
+                "OptionVersion": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "VpcSecurityGroupMemberships": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "OptionName"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::OptionGroup.OptionSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RUM::AppMonitor": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppMonitorConfiguration": {
+                            "$ref": "#/definitions/AWS::RUM::AppMonitor.AppMonitorConfiguration"
+                        },
+                        "CwLogEnabled": {
+                            "type": "boolean"
+                        },
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RUM::AppMonitor"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::RUM::AppMonitor.AppMonitorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowCookies": {
+                    "type": "boolean"
+                },
+                "EnableXRay": {
+                    "type": "boolean"
+                },
+                "ExcludedPages": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FavoritePages": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "GuestRoleArn": {
+                    "type": "string"
+                },
+                "IdentityPoolId": {
+                    "type": "string"
+                },
+                "IncludedPages": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SessionSampleRate": {
+                    "type": "number"
+                },
+                "Telemetries": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Redshift::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AquaConfigurationStatus": {
+                            "type": "string"
+                        },
+                        "AutomatedSnapshotRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "AvailabilityZoneRelocation": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZoneRelocationStatus": {
+                            "type": "string"
+                        },
+                        "Classic": {
+                            "type": "boolean"
+                        },
+                        "ClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "ClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "ClusterSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ClusterSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "ClusterType": {
+                            "type": "string"
+                        },
+                        "ClusterVersion": {
+                            "type": "string"
+                        },
+                        "DBName": {
+                            "type": "string"
+                        },
+                        "DeferMaintenance": {
+                            "type": "boolean"
+                        },
+                        "DeferMaintenanceDuration": {
+                            "type": "number"
+                        },
+                        "DeferMaintenanceEndTime": {
+                            "type": "string"
+                        },
+                        "DeferMaintenanceStartTime": {
+                            "type": "string"
+                        },
+                        "DestinationRegion": {
+                            "type": "string"
+                        },
+                        "ElasticIp": {
+                            "type": "string"
+                        },
+                        "Encrypted": {
+                            "type": "boolean"
+                        },
+                        "EnhancedVpcRouting": {
+                            "type": "boolean"
+                        },
+                        "HsmClientCertificateIdentifier": {
+                            "type": "string"
+                        },
+                        "HsmConfigurationIdentifier": {
+                            "type": "string"
+                        },
+                        "IamRoles": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LoggingProperties": {
+                            "$ref": "#/definitions/AWS::Redshift::Cluster.LoggingProperties"
+                        },
+                        "MaintenanceTrackName": {
+                            "type": "string"
+                        },
+                        "ManualSnapshotRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "MasterUserPassword": {
+                            "type": "string"
+                        },
+                        "MasterUsername": {
+                            "type": "string"
+                        },
+                        "NodeType": {
+                            "type": "string"
+                        },
+                        "NumberOfNodes": {
+                            "type": "number"
+                        },
+                        "OwnerAccount": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "PubliclyAccessible": {
+                            "type": "boolean"
+                        },
+                        "ResourceAction": {
+                            "type": "string"
+                        },
+                        "RevisionTarget": {
+                            "type": "string"
+                        },
+                        "RotateEncryptionKey": {
+                            "type": "boolean"
+                        },
+                        "SnapshotClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "SnapshotCopyGrantName": {
+                            "type": "string"
+                        },
+                        "SnapshotCopyManual": {
+                            "type": "boolean"
+                        },
+                        "SnapshotCopyRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "SnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ClusterType",
+                        "DBName",
+                        "MasterUserPassword",
+                        "MasterUsername",
+                        "NodeType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::Cluster.Endpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Redshift::Cluster.LoggingProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "S3KeyPrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ClusterParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ParameterGroupFamily": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Redshift::ClusterParameterGroup.Parameter"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "ParameterGroupFamily"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::ClusterParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ClusterParameterGroup.Parameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ParameterName",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ClusterSecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::ClusterSecurityGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ClusterSecurityGroupIngress": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CIDRIP": {
+                            "type": "string"
+                        },
+                        "ClusterSecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupOwnerId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClusterSecurityGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::ClusterSecurityGroupIngress"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ClusterSubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::ClusterSubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::EndpointAccess": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "EndpointName": {
+                            "type": "string"
+                        },
+                        "ResourceOwner": {
+                            "type": "string"
+                        },
+                        "SubnetGroupName": {
+                            "type": "string"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EndpointName",
+                        "VpcSecurityGroupIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::EndpointAccess"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::EndpointAccess.VpcSecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                },
+                "VpcSecurityGroupId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Redshift::EndpointAuthorization": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Account": {
+                            "type": "string"
+                        },
+                        "ClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "Force": {
+                            "type": "boolean"
+                        },
+                        "VpcIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Account",
+                        "ClusterIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::EndpointAuthorization"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::EventSubscription": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "EventCategories": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Severity": {
+                            "type": "string"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SourceIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SourceType": {
+                            "type": "string"
+                        },
+                        "SubscriptionName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubscriptionName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::EventSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ScheduledAction": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Enable": {
+                            "type": "boolean"
+                        },
+                        "EndTime": {
+                            "type": "string"
+                        },
+                        "IamRole": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "type": "string"
+                        },
+                        "ScheduledActionDescription": {
+                            "type": "string"
+                        },
+                        "ScheduledActionName": {
+                            "type": "string"
+                        },
+                        "StartTime": {
+                            "type": "string"
+                        },
+                        "TargetAction": {
+                            "$ref": "#/definitions/AWS::Redshift::ScheduledAction.ScheduledActionType"
+                        }
+                    },
+                    "required": [
+                        "ScheduledActionName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::ScheduledAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ScheduledAction.PauseClusterMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClusterIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ScheduledAction.ResizeClusterMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "Classic": {
+                    "type": "boolean"
+                },
+                "ClusterIdentifier": {
+                    "type": "string"
+                },
+                "ClusterType": {
+                    "type": "string"
+                },
+                "NodeType": {
+                    "type": "string"
+                },
+                "NumberOfNodes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ClusterIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ScheduledAction.ResumeClusterMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClusterIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ScheduledAction.ScheduledActionType": {
+            "additionalProperties": false,
+            "properties": {
+                "PauseCluster": {
+                    "$ref": "#/definitions/AWS::Redshift::ScheduledAction.PauseClusterMessage"
+                },
+                "ResizeCluster": {
+                    "$ref": "#/definitions/AWS::Redshift::ScheduledAction.ResizeClusterMessage"
+                },
+                "ResumeCluster": {
+                    "$ref": "#/definitions/AWS::Redshift::ScheduledAction.ResumeClusterMessage"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiGatewayProxy": {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Application.ApiGatewayProxyInput"
+                        },
+                        "EnvironmentIdentifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ProxyType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RefactorSpaces::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Application.ApiGatewayProxyInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointType": {
+                    "type": "string"
+                },
+                "StageName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "NetworkFabricType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RefactorSpaces::Environment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Route": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationIdentifier": {
+                            "type": "string"
+                        },
+                        "EnvironmentIdentifier": {
+                            "type": "string"
+                        },
+                        "RouteType": {
+                            "type": "string"
+                        },
+                        "ServiceIdentifier": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UriPathRoute": {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Route.UriPathRouteInput"
+                        }
+                    },
+                    "required": [
+                        "ApplicationIdentifier",
+                        "EnvironmentIdentifier",
+                        "ServiceIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RefactorSpaces::Route"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Route.UriPathRouteInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ActivationState": {
+                    "type": "string"
+                },
+                "IncludeChildPaths": {
+                    "type": "boolean"
+                },
+                "Methods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActivationState"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Service": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationIdentifier": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EndpointType": {
+                            "type": "string"
+                        },
+                        "EnvironmentIdentifier": {
+                            "type": "string"
+                        },
+                        "LambdaEndpoint": {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Service.LambdaEndpointInput"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UrlEndpoint": {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Service.UrlEndpointInput"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationIdentifier",
+                        "EnvironmentIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RefactorSpaces::Service"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Service.LambdaEndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Service.UrlEndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "HealthUrl": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::Rekognition::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ProjectName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProjectName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Rekognition::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ResilienceHub::App": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppTemplateBody": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResiliencyPolicyArn": {
+                            "type": "string"
+                        },
+                        "ResourceMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ResilienceHub::App.ResourceMapping"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "AppTemplateBody",
+                        "Name",
+                        "ResourceMappings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ResilienceHub::App"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ResilienceHub::App.PhysicalResourceId": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsAccountId": {
+                    "type": "string"
+                },
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "Identifier": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Identifier",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ResilienceHub::App.ResourceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "LogicalStackName": {
+                    "type": "string"
+                },
+                "MappingType": {
+                    "type": "string"
+                },
+                "PhysicalResourceId": {
+                    "$ref": "#/definitions/AWS::ResilienceHub::App.PhysicalResourceId"
+                },
+                "ResourceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MappingType",
+                "PhysicalResourceId"
+            ],
+            "type": "object"
+        },
+        "AWS::ResilienceHub::ResiliencyPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataLocationConstraint": {
+                            "type": "string"
+                        },
+                        "Policy": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::ResilienceHub::ResiliencyPolicy.FailurePolicy"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "PolicyDescription": {
+                            "type": "string"
+                        },
+                        "PolicyName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tier": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Policy",
+                        "PolicyName",
+                        "Tier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ResilienceHub::ResiliencyPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ResilienceHub::ResiliencyPolicy.FailurePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "RpoInSecs": {
+                    "type": "number"
+                },
+                "RtoInSecs": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "RpoInSecs",
+                "RtoInSecs"
+            ],
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ResourceGroups::Group.ConfigurationItem"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResourceQuery": {
+                            "$ref": "#/definitions/AWS::ResourceGroups::Group.ResourceQuery"
+                        },
+                        "Resources": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ResourceGroups::Group"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group.ConfigurationItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ResourceGroups::Group.ConfigurationParameter"
+                    },
+                    "type": "array"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group.ConfigurationParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group.Query": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceTypeFilters": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StackIdentifier": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ResourceGroups::Group.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group.ResourceQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "Query": {
+                    "$ref": "#/definitions/AWS::ResourceGroups::Group.Query"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group.TagFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RoboMaker::Fleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::Fleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::Robot": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Architecture": {
+                            "type": "string"
+                        },
+                        "Fleet": {
+                            "type": "string"
+                        },
+                        "GreengrassGroupId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Architecture",
+                        "GreengrassGroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::Robot"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::RobotApplication": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CurrentRevisionId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RobotSoftwareSuite": {
+                            "$ref": "#/definitions/AWS::RoboMaker::RobotApplication.RobotSoftwareSuite"
+                        },
+                        "Sources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RoboMaker::RobotApplication.SourceConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "RobotSoftwareSuite",
+                        "Sources"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::RobotApplication"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::RobotApplication.RobotSoftwareSuite": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::RobotApplication.SourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Architecture": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Architecture",
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::RobotApplicationVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Application": {
+                            "type": "string"
+                        },
+                        "CurrentRevisionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Application"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::RobotApplicationVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplication": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CurrentRevisionId": {
+                            "type": "string"
+                        },
+                        "Environment": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RenderingEngine": {
+                            "$ref": "#/definitions/AWS::RoboMaker::SimulationApplication.RenderingEngine"
+                        },
+                        "RobotSoftwareSuite": {
+                            "$ref": "#/definitions/AWS::RoboMaker::SimulationApplication.RobotSoftwareSuite"
+                        },
+                        "SimulationSoftwareSuite": {
+                            "$ref": "#/definitions/AWS::RoboMaker::SimulationApplication.SimulationSoftwareSuite"
+                        },
+                        "Sources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RoboMaker::SimulationApplication.SourceConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "RobotSoftwareSuite",
+                        "SimulationSoftwareSuite"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::SimulationApplication"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplication.RenderingEngine": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplication.RobotSoftwareSuite": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplication.SimulationSoftwareSuite": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplication.SourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Architecture": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Architecture",
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplicationVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Application": {
+                            "type": "string"
+                        },
+                        "CurrentRevisionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Application"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::SimulationApplicationVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::DNSSEC": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HostedZoneId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "HostedZoneId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::DNSSEC"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HealthCheck": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HealthCheckConfig": {
+                            "type": "object"
+                        },
+                        "HealthCheckTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53::HealthCheck.HealthCheckTag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "HealthCheckConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::HealthCheck"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HealthCheck.HealthCheckTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HostedZone": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HostedZoneConfig": {
+                            "$ref": "#/definitions/AWS::Route53::HostedZone.HostedZoneConfig"
+                        },
+                        "HostedZoneTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53::HostedZone.HostedZoneTag"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QueryLoggingConfig": {
+                            "$ref": "#/definitions/AWS::Route53::HostedZone.QueryLoggingConfig"
+                        },
+                        "VPCs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53::HostedZone.VPC"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::HostedZone"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HostedZone.HostedZoneConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53::HostedZone.HostedZoneTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HostedZone.QueryLoggingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsLogGroupArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CloudWatchLogsLogGroupArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HostedZone.VPC": {
+            "additionalProperties": false,
+            "properties": {
+                "VPCId": {
+                    "type": "string"
+                },
+                "VPCRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VPCId",
+                "VPCRegion"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::KeySigningKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HostedZoneId": {
+                            "type": "string"
+                        },
+                        "KeyManagementServiceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "HostedZoneId",
+                        "KeyManagementServiceArn",
+                        "Name",
+                        "Status"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::KeySigningKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::RecordSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AliasTarget": {
+                            "$ref": "#/definitions/AWS::Route53::RecordSet.AliasTarget"
+                        },
+                        "Comment": {
+                            "type": "string"
+                        },
+                        "Failover": {
+                            "type": "string"
+                        },
+                        "GeoLocation": {
+                            "$ref": "#/definitions/AWS::Route53::RecordSet.GeoLocation"
+                        },
+                        "HealthCheckId": {
+                            "type": "string"
+                        },
+                        "HostedZoneId": {
+                            "type": "string"
+                        },
+                        "HostedZoneName": {
+                            "type": "string"
+                        },
+                        "MultiValueAnswer": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Region": {
+                            "type": "string"
+                        },
+                        "ResourceRecords": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SetIdentifier": {
+                            "type": "string"
+                        },
+                        "TTL": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Weight": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::RecordSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::RecordSet.AliasTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DNSName": {
+                    "type": "string"
+                },
+                "EvaluateTargetHealth": {
+                    "type": "boolean"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DNSName",
+                "HostedZoneId"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::RecordSet.GeoLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "ContinentCode": {
+                    "type": "string"
+                },
+                "CountryCode": {
+                    "type": "string"
+                },
+                "SubdivisionCode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53::RecordSetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Comment": {
+                            "type": "string"
+                        },
+                        "HostedZoneId": {
+                            "type": "string"
+                        },
+                        "HostedZoneName": {
+                            "type": "string"
+                        },
+                        "RecordSets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53::RecordSetGroup.RecordSet"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::RecordSetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::RecordSetGroup.AliasTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DNSName": {
+                    "type": "string"
+                },
+                "EvaluateTargetHealth": {
+                    "type": "boolean"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DNSName",
+                "HostedZoneId"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::RecordSetGroup.GeoLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "ContinentCode": {
+                    "type": "string"
+                },
+                "CountryCode": {
+                    "type": "string"
+                },
+                "SubdivisionCode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53::RecordSetGroup.RecordSet": {
+            "additionalProperties": false,
+            "properties": {
+                "AliasTarget": {
+                    "$ref": "#/definitions/AWS::Route53::RecordSetGroup.AliasTarget"
+                },
+                "Comment": {
+                    "type": "string"
+                },
+                "Failover": {
+                    "type": "string"
+                },
+                "GeoLocation": {
+                    "$ref": "#/definitions/AWS::Route53::RecordSetGroup.GeoLocation"
+                },
+                "HealthCheckId": {
+                    "type": "string"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                },
+                "HostedZoneName": {
+                    "type": "string"
+                },
+                "MultiValueAnswer": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "ResourceRecords": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SetIdentifier": {
+                    "type": "string"
+                },
+                "TTL": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::Route53RecoveryControl::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::Cluster.ClusterEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::ControlPanel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClusterArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryControl::ControlPanel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::RoutingControl": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClusterArn": {
+                            "type": "string"
+                        },
+                        "ControlPanelArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryControl::RoutingControl"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::SafetyRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssertionRule": {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::SafetyRule.AssertionRule"
+                        },
+                        "ControlPanelArn": {
+                            "type": "string"
+                        },
+                        "GatingRule": {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::SafetyRule.GatingRule"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RuleConfig": {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::SafetyRule.RuleConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ControlPanelArn",
+                        "Name",
+                        "RuleConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryControl::SafetyRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::SafetyRule.AssertionRule": {
+            "additionalProperties": false,
+            "properties": {
+                "AssertedControls": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "WaitPeriodMs": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AssertedControls",
+                "WaitPeriodMs"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::SafetyRule.GatingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "GatingControls": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TargetControls": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "WaitPeriodMs": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "GatingControls",
+                "TargetControls",
+                "WaitPeriodMs"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::SafetyRule.RuleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Inverted": {
+                    "type": "boolean"
+                },
+                "Threshold": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Inverted",
+                "Threshold",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::Cell": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CellName": {
+                            "type": "string"
+                        },
+                        "Cells": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CellName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryReadiness::Cell"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ReadinessCheck": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ReadinessCheckName": {
+                            "type": "string"
+                        },
+                        "ResourceSetName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ReadinessCheckName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryReadiness::ReadinessCheck"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::RecoveryGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Cells": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RecoveryGroupName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RecoveryGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryReadiness::RecoveryGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceSetName": {
+                            "type": "string"
+                        },
+                        "ResourceSetType": {
+                            "type": "string"
+                        },
+                        "Resources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet.Resource"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ResourceSetName",
+                        "ResourceSetType",
+                        "Resources"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryReadiness::ResourceSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet.DNSTargetResource": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                },
+                "HostedZoneArn": {
+                    "type": "string"
+                },
+                "RecordSetId": {
+                    "type": "string"
+                },
+                "RecordType": {
+                    "type": "string"
+                },
+                "TargetResource": {
+                    "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet.TargetResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet.NLBResource": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet.R53ResourceRecord": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                },
+                "RecordSetId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet.Resource": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentId": {
+                    "type": "string"
+                },
+                "DnsTargetResource": {
+                    "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet.DNSTargetResource"
+                },
+                "ReadinessScopes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ResourceArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet.TargetResource": {
+            "additionalProperties": false,
+            "properties": {
+                "NLBResource": {
+                    "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet.NLBResource"
+                },
+                "R53Resource": {
+                    "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet.R53ResourceRecord"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53Resolver::FirewallDomainList": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DomainFileUrl": {
+                            "type": "string"
+                        },
+                        "Domains": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::FirewallDomainList"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::FirewallRuleGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FirewallRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53Resolver::FirewallRuleGroup.FirewallRule"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::FirewallRuleGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::FirewallRuleGroup.FirewallRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "BlockOverrideDnsType": {
+                    "type": "string"
+                },
+                "BlockOverrideDomain": {
+                    "type": "string"
+                },
+                "BlockOverrideTtl": {
+                    "type": "number"
+                },
+                "BlockResponse": {
+                    "type": "string"
+                },
+                "FirewallDomainListId": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Action",
+                "FirewallDomainListId",
+                "Priority"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::FirewallRuleGroupAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FirewallRuleGroupId": {
+                            "type": "string"
+                        },
+                        "MutationProtection": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FirewallRuleGroupId",
+                        "Priority",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::FirewallRuleGroupAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutodefinedReverseFlag": {
+                            "type": "string"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutodefinedReverseFlag",
+                        "ResourceId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverDNSSECConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverDNSSECConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Direction": {
+                            "type": "string"
+                        },
+                        "IpAddresses": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53Resolver::ResolverEndpoint.IpAddressRequest"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Direction",
+                        "IpAddresses",
+                        "SecurityGroupIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverEndpoint.IpAddressRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Ip": {
+                    "type": "string"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubnetId"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverQueryLoggingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverQueryLoggingConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResolverQueryLogConfigId": {
+                            "type": "string"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResolverEndpointId": {
+                            "type": "string"
+                        },
+                        "RuleType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetIps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53Resolver::ResolverRule.TargetAddress"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DomainName",
+                        "RuleType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverRule.TargetAddress": {
+            "additionalProperties": false,
+            "properties": {
+                "Ip": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ip"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverRuleAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ResolverRuleId": {
+                            "type": "string"
+                        },
+                        "VPCId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResolverRuleId",
+                        "VPCId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverRuleAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::AccessPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Bucket": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Policy": {
+                            "type": "object"
+                        },
+                        "PolicyStatus": {
+                            "type": "object"
+                        },
+                        "PublicAccessBlockConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::AccessPoint.PublicAccessBlockConfiguration"
+                        },
+                        "VpcConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::AccessPoint.VpcConfiguration"
+                        }
+                    },
+                    "required": [
+                        "Bucket"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::AccessPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::AccessPoint.PublicAccessBlockConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockPublicAcls": {
+                    "type": "boolean"
+                },
+                "BlockPublicPolicy": {
+                    "type": "boolean"
+                },
+                "IgnorePublicAcls": {
+                    "type": "boolean"
+                },
+                "RestrictPublicBuckets": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::AccessPoint.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccelerateConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.AccelerateConfiguration"
+                        },
+                        "AccessControl": {
+                            "type": "string"
+                        },
+                        "AnalyticsConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::S3::Bucket.AnalyticsConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "BucketEncryption": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.BucketEncryption"
+                        },
+                        "BucketName": {
+                            "type": "string"
+                        },
+                        "CorsConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.CorsConfiguration"
+                        },
+                        "IntelligentTieringConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::S3::Bucket.IntelligentTieringConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "InventoryConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::S3::Bucket.InventoryConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "LifecycleConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.LifecycleConfiguration"
+                        },
+                        "LoggingConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.LoggingConfiguration"
+                        },
+                        "MetricsConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::S3::Bucket.MetricsConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "NotificationConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.NotificationConfiguration"
+                        },
+                        "ObjectLockConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.ObjectLockConfiguration"
+                        },
+                        "ObjectLockEnabled": {
+                            "type": "boolean"
+                        },
+                        "OwnershipControls": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.OwnershipControls"
+                        },
+                        "PublicAccessBlockConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.PublicAccessBlockConfiguration"
+                        },
+                        "ReplicationConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.ReplicationConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VersioningConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.VersioningConfiguration"
+                        },
+                        "WebsiteConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.WebsiteConfiguration"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::Bucket"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.AbortIncompleteMultipartUpload": {
+            "additionalProperties": false,
+            "properties": {
+                "DaysAfterInitiation": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DaysAfterInitiation"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.AccelerateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccelerationStatus": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AccelerationStatus"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.AccessControlTranslation": {
+            "additionalProperties": false,
+            "properties": {
+                "Owner": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Owner"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.AnalyticsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "StorageClassAnalysis": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.StorageClassAnalysis"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Id",
+                "StorageClassAnalysis"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.BucketEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ServerSideEncryptionConfiguration": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.ServerSideEncryptionRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ServerSideEncryptionConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.CorsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CorsRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.CorsRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CorsRules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.CorsRule": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedOrigins": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExposedHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "MaxAge": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AllowedMethods",
+                "AllowedOrigins"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.DataExport": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.Destination"
+                },
+                "OutputSchemaVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination",
+                "OutputSchemaVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.DefaultRetention": {
+            "additionalProperties": false,
+            "properties": {
+                "Days": {
+                    "type": "number"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "Years": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.DeleteMarkerReplication": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketAccountId": {
+                    "type": "string"
+                },
+                "BucketArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketArn",
+                "Format"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplicaKmsKeyID": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ReplicaKmsKeyID"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.EventBridgeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBridgeEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.FilterRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.IntelligentTieringConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                    },
+                    "type": "array"
+                },
+                "Tierings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.Tiering"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Id",
+                "Status",
+                "Tierings"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.InventoryConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.Destination"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "IncludedObjectVersions": {
+                    "type": "string"
+                },
+                "OptionalFields": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "ScheduleFrequency": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination",
+                "Enabled",
+                "Id",
+                "IncludedObjectVersions",
+                "ScheduleFrequency"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.LambdaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Event": {
+                    "type": "string"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.NotificationFilter"
+                },
+                "Function": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Event",
+                "Function"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.LifecycleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationBucketName": {
+                    "type": "string"
+                },
+                "LogFilePrefix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.Metrics": {
+            "additionalProperties": false,
+            "properties": {
+                "EventThreshold": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationTimeValue"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.MetricsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessPointArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.NoncurrentVersionExpiration": {
+            "additionalProperties": false,
+            "properties": {
+                "NewerNoncurrentVersions": {
+                    "type": "number"
+                },
+                "NoncurrentDays": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "NoncurrentDays"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.NoncurrentVersionTransition": {
+            "additionalProperties": false,
+            "properties": {
+                "NewerNoncurrentVersions": {
+                    "type": "number"
+                },
+                "StorageClass": {
+                    "type": "string"
+                },
+                "TransitionInDays": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "StorageClass",
+                "TransitionInDays"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBridgeConfiguration": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.EventBridgeConfiguration"
+                },
+                "LambdaConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.LambdaConfiguration"
+                    },
+                    "type": "array"
+                },
+                "QueueConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.QueueConfiguration"
+                    },
+                    "type": "array"
+                },
+                "TopicConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TopicConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.NotificationFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Key": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.S3KeyFilter"
+                }
+            },
+            "required": [
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ObjectLockConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ObjectLockEnabled": {
+                    "type": "string"
+                },
+                "Rule": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ObjectLockRule"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ObjectLockRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultRetention": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.DefaultRetention"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.OwnershipControls": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.OwnershipControlsRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.OwnershipControlsRule": {
+            "additionalProperties": false,
+            "properties": {
+                "ObjectOwnership": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.PublicAccessBlockConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockPublicAcls": {
+                    "type": "boolean"
+                },
+                "BlockPublicPolicy": {
+                    "type": "boolean"
+                },
+                "IgnorePublicAcls": {
+                    "type": "boolean"
+                },
+                "RestrictPublicBuckets": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.QueueConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Event": {
+                    "type": "string"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.NotificationFilter"
+                },
+                "Queue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Event",
+                "Queue"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.RedirectAllRequestsTo": {
+            "additionalProperties": false,
+            "properties": {
+                "HostName": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HostName"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.RedirectRule": {
+            "additionalProperties": false,
+            "properties": {
+                "HostName": {
+                    "type": "string"
+                },
+                "HttpRedirectCode": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "ReplaceKeyPrefixWith": {
+                    "type": "string"
+                },
+                "ReplaceKeyWith": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicaModifications": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Role": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.ReplicationRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Role",
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessControlTranslation": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.AccessControlTranslation"
+                },
+                "Account": {
+                    "type": "string"
+                },
+                "Bucket": {
+                    "type": "string"
+                },
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.EncryptionConfiguration"
+                },
+                "Metrics": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.Metrics"
+                },
+                "ReplicationTime": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationTime"
+                },
+                "StorageClass": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteMarkerReplication": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.DeleteMarkerReplication"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationDestination"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationRuleFilter"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "SourceSelectionCriteria": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.SourceSelectionCriteria"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination",
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationRuleAndOperator": {
+            "additionalProperties": false,
+            "properties": {
+                "Prefix": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationRuleFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "And": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationRuleAndOperator"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "TagFilter": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationTime": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                },
+                "Time": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationTimeValue"
+                }
+            },
+            "required": [
+                "Status",
+                "Time"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationTimeValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Minutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Minutes"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.RoutingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "RedirectRule": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.RedirectRule"
+                },
+                "RoutingRuleCondition": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.RoutingRuleCondition"
+                }
+            },
+            "required": [
+                "RedirectRule"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.RoutingRuleCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpErrorCodeReturnedEquals": {
+                    "type": "string"
+                },
+                "KeyPrefixEquals": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "AbortIncompleteMultipartUpload": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.AbortIncompleteMultipartUpload"
+                },
+                "ExpirationDate": {
+                    "type": "string"
+                },
+                "ExpirationInDays": {
+                    "type": "number"
+                },
+                "ExpiredObjectDeleteMarker": {
+                    "type": "boolean"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "NoncurrentVersionExpiration": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.NoncurrentVersionExpiration"
+                },
+                "NoncurrentVersionExpirationInDays": {
+                    "type": "number"
+                },
+                "NoncurrentVersionTransition": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.NoncurrentVersionTransition"
+                },
+                "NoncurrentVersionTransitions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.NoncurrentVersionTransition"
+                    },
+                    "type": "array"
+                },
+                "ObjectSizeGreaterThan": {
+                    "type": "number"
+                },
+                "ObjectSizeLessThan": {
+                    "type": "number"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                    },
+                    "type": "array"
+                },
+                "Transition": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.Transition"
+                },
+                "Transitions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.Transition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.S3KeyFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.FilterRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ServerSideEncryptionByDefault": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSMasterKeyID": {
+                    "type": "string"
+                },
+                "SSEAlgorithm": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SSEAlgorithm"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ServerSideEncryptionRule": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketKeyEnabled": {
+                    "type": "boolean"
+                },
+                "ServerSideEncryptionByDefault": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ServerSideEncryptionByDefault"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.SourceSelectionCriteria": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplicaModifications": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicaModifications"
+                },
+                "SseKmsEncryptedObjects": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.SseKmsEncryptedObjects"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.SseKmsEncryptedObjects": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.StorageClassAnalysis": {
+            "additionalProperties": false,
+            "properties": {
+                "DataExport": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.DataExport"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.TagFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.Tiering": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessTier": {
+                    "type": "string"
+                },
+                "Days": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AccessTier",
+                "Days"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.TopicConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Event": {
+                    "type": "string"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.NotificationFilter"
+                },
+                "Topic": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Event",
+                "Topic"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.Transition": {
+            "additionalProperties": false,
+            "properties": {
+                "StorageClass": {
+                    "type": "string"
+                },
+                "TransitionDate": {
+                    "type": "string"
+                },
+                "TransitionInDays": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "StorageClass"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.VersioningConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.WebsiteConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorDocument": {
+                    "type": "string"
+                },
+                "IndexDocument": {
+                    "type": "string"
+                },
+                "RedirectAllRequestsTo": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.RedirectAllRequestsTo"
+                },
+                "RoutingRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.RoutingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::BucketPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Bucket": {
+                            "type": "string"
+                        },
+                        "PolicyDocument": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Bucket",
+                        "PolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::BucketPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::MultiRegionAccessPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "PublicAccessBlockConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::MultiRegionAccessPoint.PublicAccessBlockConfiguration"
+                        },
+                        "Regions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::S3::MultiRegionAccessPoint.Region"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Regions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::MultiRegionAccessPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::MultiRegionAccessPoint.PublicAccessBlockConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockPublicAcls": {
+                    "type": "boolean"
+                },
+                "BlockPublicPolicy": {
+                    "type": "boolean"
+                },
+                "IgnorePublicAcls": {
+                    "type": "boolean"
+                },
+                "RestrictPublicBuckets": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::MultiRegionAccessPoint.Region": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::MultiRegionAccessPointPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MrapName": {
+                            "type": "string"
+                        },
+                        "Policy": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "MrapName",
+                        "Policy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::MultiRegionAccessPointPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "StorageLensConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::StorageLens.StorageLensConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "StorageLensConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::StorageLens"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.AccountLevel": {
+            "additionalProperties": false,
+            "properties": {
+                "ActivityMetrics": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.ActivityMetrics"
+                },
+                "BucketLevel": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.BucketLevel"
+                }
+            },
+            "required": [
+                "BucketLevel"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.ActivityMetrics": {
+            "additionalProperties": false,
+            "properties": {
+                "IsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.AwsOrg": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.BucketLevel": {
+            "additionalProperties": false,
+            "properties": {
+                "ActivityMetrics": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.ActivityMetrics"
+                },
+                "PrefixLevel": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.PrefixLevel"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.BucketsAndRegions": {
+            "additionalProperties": false,
+            "properties": {
+                "Buckets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Regions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.CloudWatchMetrics": {
+            "additionalProperties": false,
+            "properties": {
+                "IsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "IsEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.DataExport": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchMetrics": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.CloudWatchMetrics"
+                },
+                "S3BucketDestination": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.S3BucketDestination"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.Encryption": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.PrefixLevel": {
+            "additionalProperties": false,
+            "properties": {
+                "StorageMetrics": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.PrefixLevelStorageMetrics"
+                }
+            },
+            "required": [
+                "StorageMetrics"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.PrefixLevelStorageMetrics": {
+            "additionalProperties": false,
+            "properties": {
+                "IsEnabled": {
+                    "type": "boolean"
+                },
+                "SelectionCriteria": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.SelectionCriteria"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.S3BucketDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "Arn": {
+                    "type": "string"
+                },
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.Encryption"
+                },
+                "Format": {
+                    "type": "string"
+                },
+                "OutputSchemaVersion": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AccountId",
+                "Arn",
+                "Format",
+                "OutputSchemaVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.SelectionCriteria": {
+            "additionalProperties": false,
+            "properties": {
+                "Delimiter": {
+                    "type": "string"
+                },
+                "MaxDepth": {
+                    "type": "number"
+                },
+                "MinStorageBytesPercentage": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.StorageLensConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountLevel": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.AccountLevel"
+                },
+                "AwsOrg": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.AwsOrg"
+                },
+                "DataExport": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.DataExport"
+                },
+                "Exclude": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.BucketsAndRegions"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Include": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.BucketsAndRegions"
+                },
+                "IsEnabled": {
+                    "type": "boolean"
+                },
+                "StorageLensArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AccountLevel",
+                "Id",
+                "IsEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::S3ObjectLambda::AccessPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ObjectLambdaConfiguration": {
+                            "$ref": "#/definitions/AWS::S3ObjectLambda::AccessPoint.ObjectLambdaConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ObjectLambdaConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3ObjectLambda::AccessPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3ObjectLambda::AccessPoint.ObjectLambdaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedFeatures": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CloudWatchMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "SupportingAccessPoint": {
+                    "type": "string"
+                },
+                "TransformationConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3ObjectLambda::AccessPoint.TransformationConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SupportingAccessPoint",
+                "TransformationConfigurations"
+            ],
+            "type": "object"
+        },
+        "AWS::S3ObjectLambda::AccessPoint.TransformationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContentTransformation": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "Actions",
+                "ContentTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::S3ObjectLambda::AccessPointPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ObjectLambdaAccessPoint": {
+                            "type": "string"
+                        },
+                        "PolicyDocument": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ObjectLambdaAccessPoint",
+                        "PolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3ObjectLambda::AccessPointPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::AccessPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Bucket": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Policy": {
+                            "type": "object"
+                        },
+                        "VpcConfiguration": {
+                            "$ref": "#/definitions/AWS::S3Outposts::AccessPoint.VpcConfiguration"
+                        }
+                    },
+                    "required": [
+                        "Bucket",
+                        "Name",
+                        "VpcConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3Outposts::AccessPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::AccessPoint.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3Outposts::Bucket": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BucketName": {
+                            "type": "string"
+                        },
+                        "LifecycleConfiguration": {
+                            "$ref": "#/definitions/AWS::S3Outposts::Bucket.LifecycleConfiguration"
+                        },
+                        "OutpostId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "BucketName",
+                        "OutpostId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3Outposts::Bucket"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::Bucket.AbortIncompleteMultipartUpload": {
+            "additionalProperties": false,
+            "properties": {
+                "DaysAfterInitiation": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DaysAfterInitiation"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::Bucket.LifecycleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3Outposts::Bucket.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::Bucket.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "AbortIncompleteMultipartUpload": {
+                    "$ref": "#/definitions/AWS::S3Outposts::Bucket.AbortIncompleteMultipartUpload"
+                },
+                "ExpirationDate": {
+                    "type": "string"
+                },
+                "ExpirationInDays": {
+                    "type": "number"
+                },
+                "Filter": {
+                    "type": "object"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3Outposts::BucketPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Bucket": {
+                            "type": "string"
+                        },
+                        "PolicyDocument": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Bucket",
+                        "PolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3Outposts::BucketPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::Endpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessType": {
+                            "type": "string"
+                        },
+                        "CustomerOwnedIpv4Pool": {
+                            "type": "string"
+                        },
+                        "OutpostId": {
+                            "type": "string"
+                        },
+                        "SecurityGroupId": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "OutpostId",
+                        "SecurityGroupId",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3Outposts::Endpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::Endpoint.NetworkInterface": {
+            "additionalProperties": false,
+            "properties": {
+                "NetworkInterfaceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NetworkInterfaceId"
+            ],
+            "type": "object"
+        },
+        "AWS::SDB::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SDB::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ConfigurationSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSetEventDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigurationSetName": {
+                            "type": "string"
+                        },
+                        "EventDestination": {
+                            "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.EventDestination"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationSetName",
+                        "EventDestination"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ConfigurationSetEventDestination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSetEventDestination.CloudWatchDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.DimensionConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSetEventDestination.DimensionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultDimensionValue": {
+                    "type": "string"
+                },
+                "DimensionName": {
+                    "type": "string"
+                },
+                "DimensionValueSource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DefaultDimensionValue",
+                "DimensionName",
+                "DimensionValueSource"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSetEventDestination.EventDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchDestination": {
+                    "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.CloudWatchDestination"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "KinesisFirehoseDestination": {
+                    "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.KinesisFirehoseDestination"
+                },
+                "MatchingEventTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchingEventTypes"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSetEventDestination.KinesisFirehoseDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStreamARN": {
+                    "type": "string"
+                },
+                "IAMRoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStreamARN",
+                "IAMRoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ContactList": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContactListName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Topics": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SES::ContactList.Topic"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ContactList"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ContactList.Topic": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultSubscriptionStatus": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DisplayName": {
+                    "type": "string"
+                },
+                "TopicName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DefaultSubscriptionStatus",
+                "DisplayName",
+                "TopicName"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Filter": {
+                            "$ref": "#/definitions/AWS::SES::ReceiptFilter.Filter"
+                        }
+                    },
+                    "required": [
+                        "Filter"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ReceiptFilter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptFilter.Filter": {
+            "additionalProperties": false,
+            "properties": {
+                "IpFilter": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptFilter.IpFilter"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IpFilter"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptFilter.IpFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Policy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Cidr",
+                "Policy"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "After": {
+                            "type": "string"
+                        },
+                        "Rule": {
+                            "$ref": "#/definitions/AWS::SES::ReceiptRule.Rule"
+                        },
+                        "RuleSetName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Rule",
+                        "RuleSetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ReceiptRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "AddHeaderAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.AddHeaderAction"
+                },
+                "BounceAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.BounceAction"
+                },
+                "LambdaAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.LambdaAction"
+                },
+                "S3Action": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.S3Action"
+                },
+                "SNSAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.SNSAction"
+                },
+                "StopAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.StopAction"
+                },
+                "WorkmailAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.WorkmailAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.AddHeaderAction": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderName": {
+                    "type": "string"
+                },
+                "HeaderValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HeaderName",
+                "HeaderValue"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.BounceAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Message": {
+                    "type": "string"
+                },
+                "Sender": {
+                    "type": "string"
+                },
+                "SmtpReplyCode": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Message",
+                "Sender",
+                "SmtpReplyCode"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.LambdaAction": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionArn": {
+                    "type": "string"
+                },
+                "InvocationType": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FunctionArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::ReceiptRule.Action"
+                    },
+                    "type": "array"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Recipients": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ScanEnabled": {
+                    "type": "boolean"
+                },
+                "TlsPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.S3Action": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "KmsKeyArn": {
+                    "type": "string"
+                },
+                "ObjectKeyPrefix": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.SNSAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Encoding": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.StopAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Scope": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Scope"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.WorkmailAction": {
+            "additionalProperties": false,
+            "properties": {
+                "OrganizationArn": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OrganizationArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRuleSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ReceiptRuleSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::Template": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Template": {
+                            "$ref": "#/definitions/AWS::SES::Template.Template"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::Template"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::Template.Template": {
+            "additionalProperties": false,
+            "properties": {
+                "HtmlPart": {
+                    "type": "string"
+                },
+                "SubjectPart": {
+                    "type": "string"
+                },
+                "TemplateName": {
+                    "type": "string"
+                },
+                "TextPart": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SNS::Subscription": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeliveryPolicy": {
+                            "type": "object"
+                        },
+                        "Endpoint": {
+                            "type": "string"
+                        },
+                        "FilterPolicy": {
+                            "type": "object"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "RawMessageDelivery": {
+                            "type": "boolean"
+                        },
+                        "RedrivePolicy": {
+                            "type": "object"
+                        },
+                        "Region": {
+                            "type": "string"
+                        },
+                        "SubscriptionRoleArn": {
+                            "type": "string"
+                        },
+                        "TopicArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Protocol",
+                        "TopicArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SNS::Subscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SNS::Topic": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContentBasedDeduplication": {
+                            "type": "boolean"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "FifoTopic": {
+                            "type": "boolean"
+                        },
+                        "KmsMasterKeyId": {
+                            "type": "string"
+                        },
+                        "Subscription": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SNS::Topic.Subscription"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TopicName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SNS::Topic"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SNS::Topic.Subscription": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint",
+                "Protocol"
+            ],
+            "type": "object"
+        },
+        "AWS::SNS::TopicPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "Topics": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument",
+                        "Topics"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SNS::TopicPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SQS::Queue": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContentBasedDeduplication": {
+                            "type": "boolean"
+                        },
+                        "DeduplicationScope": {
+                            "type": "string"
+                        },
+                        "DelaySeconds": {
+                            "type": "number"
+                        },
+                        "FifoQueue": {
+                            "type": "boolean"
+                        },
+                        "FifoThroughputLimit": {
+                            "type": "string"
+                        },
+                        "KmsDataKeyReusePeriodSeconds": {
+                            "type": "number"
+                        },
+                        "KmsMasterKeyId": {
+                            "type": "string"
+                        },
+                        "MaximumMessageSize": {
+                            "type": "number"
+                        },
+                        "MessageRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "QueueName": {
+                            "type": "string"
+                        },
+                        "ReceiveMessageWaitTimeSeconds": {
+                            "type": "number"
+                        },
+                        "RedriveAllowPolicy": {
+                            "type": "object"
+                        },
+                        "RedrivePolicy": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VisibilityTimeout": {
+                            "type": "number"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SQS::Queue"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SQS::QueuePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "Queues": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument",
+                        "Queues"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SQS::QueuePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::Association": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplyOnlyAtCronInterval": {
+                            "type": "boolean"
+                        },
+                        "AssociationName": {
+                            "type": "string"
+                        },
+                        "AutomationTargetParameterName": {
+                            "type": "string"
+                        },
+                        "CalendarNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ComplianceSeverity": {
+                            "type": "string"
+                        },
+                        "DocumentVersion": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "MaxConcurrency": {
+                            "type": "string"
+                        },
+                        "MaxErrors": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OutputLocation": {
+                            "$ref": "#/definitions/AWS::SSM::Association.InstanceAssociationOutputLocation"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "object"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ScheduleExpression": {
+                            "type": "string"
+                        },
+                        "SyncCompliance": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::Association.Target"
+                            },
+                            "type": "array"
+                        },
+                        "WaitForSuccessTimeoutSeconds": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::Association"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::Association.InstanceAssociationOutputLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Location": {
+                    "$ref": "#/definitions/AWS::SSM::Association.S3OutputLocation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::Association.S3OutputLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "OutputS3BucketName": {
+                    "type": "string"
+                },
+                "OutputS3KeyPrefix": {
+                    "type": "string"
+                },
+                "OutputS3Region": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::Association.Target": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::Document": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Attachments": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::Document.AttachmentsSource"
+                            },
+                            "type": "array"
+                        },
+                        "Content": {
+                            "type": "object"
+                        },
+                        "DocumentFormat": {
+                            "type": "string"
+                        },
+                        "DocumentType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Requires": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::Document.DocumentRequires"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        },
+                        "VersionName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Content"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::Document"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::Document.AttachmentsSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::Document.DocumentRequires": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowUnassociatedTargets": {
+                            "type": "boolean"
+                        },
+                        "Cutoff": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Duration": {
+                            "type": "number"
+                        },
+                        "EndDate": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "type": "string"
+                        },
+                        "ScheduleOffset": {
+                            "type": "number"
+                        },
+                        "ScheduleTimezone": {
+                            "type": "string"
+                        },
+                        "StartDate": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AllowUnassociatedTargets",
+                        "Cutoff",
+                        "Duration",
+                        "Name",
+                        "Schedule"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::MaintenanceWindow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "OwnerInformation": {
+                            "type": "string"
+                        },
+                        "ResourceType": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTarget.Targets"
+                            },
+                            "type": "array"
+                        },
+                        "WindowId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourceType",
+                        "Targets",
+                        "WindowId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::MaintenanceWindowTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTarget.Targets": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CutoffBehavior": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LoggingInfo": {
+                            "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.LoggingInfo"
+                        },
+                        "MaxConcurrency": {
+                            "type": "string"
+                        },
+                        "MaxErrors": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        },
+                        "ServiceRoleArn": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.Target"
+                            },
+                            "type": "array"
+                        },
+                        "TaskArn": {
+                            "type": "string"
+                        },
+                        "TaskInvocationParameters": {
+                            "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.TaskInvocationParameters"
+                        },
+                        "TaskParameters": {
+                            "type": "object"
+                        },
+                        "TaskType": {
+                            "type": "string"
+                        },
+                        "WindowId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Priority",
+                        "TaskArn",
+                        "TaskType",
+                        "WindowId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::MaintenanceWindowTask"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.LoggingInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Region": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region",
+                "S3Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowAutomationParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentVersion": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowLambdaParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientContext": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "type": "string"
+                },
+                "Qualifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowRunCommandParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "DocumentHash": {
+                    "type": "string"
+                },
+                "DocumentHashType": {
+                    "type": "string"
+                },
+                "NotificationConfig": {
+                    "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.NotificationConfig"
+                },
+                "OutputS3BucketName": {
+                    "type": "string"
+                },
+                "OutputS3KeyPrefix": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "ServiceRoleArn": {
+                    "type": "string"
+                },
+                "TimeoutSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowStepFunctionsParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.NotificationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "NotificationArn": {
+                    "type": "string"
+                },
+                "NotificationEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "NotificationType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NotificationArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.Target": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.TaskInvocationParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "MaintenanceWindowAutomationParameters": {
+                    "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.MaintenanceWindowAutomationParameters"
+                },
+                "MaintenanceWindowLambdaParameters": {
+                    "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.MaintenanceWindowLambdaParameters"
+                },
+                "MaintenanceWindowRunCommandParameters": {
+                    "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.MaintenanceWindowRunCommandParameters"
+                },
+                "MaintenanceWindowStepFunctionsParameters": {
+                    "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.MaintenanceWindowStepFunctionsParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::Parameter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowedPattern": {
+                            "type": "string"
+                        },
+                        "DataType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Tier": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Type",
+                        "Value"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::Parameter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApprovalRules": {
+                            "$ref": "#/definitions/AWS::SSM::PatchBaseline.RuleGroup"
+                        },
+                        "ApprovedPatches": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ApprovedPatchesComplianceLevel": {
+                            "type": "string"
+                        },
+                        "ApprovedPatchesEnableNonSecurity": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "GlobalFilters": {
+                            "$ref": "#/definitions/AWS::SSM::PatchBaseline.PatchFilterGroup"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OperatingSystem": {
+                            "type": "string"
+                        },
+                        "PatchGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RejectedPatches": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RejectedPatchesAction": {
+                            "type": "string"
+                        },
+                        "Sources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::PatchBaseline.PatchSource"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::PatchBaseline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.PatchFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.PatchFilterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "PatchFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SSM::PatchBaseline.PatchFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.PatchSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Products": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.PatchStringDate": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "ApproveAfterDays": {
+                    "type": "number"
+                },
+                "ApproveUntilDate": {
+                    "$ref": "#/definitions/AWS::SSM::PatchBaseline.PatchStringDate"
+                },
+                "ComplianceLevel": {
+                    "type": "string"
+                },
+                "EnableNonSecurity": {
+                    "type": "boolean"
+                },
+                "PatchFilterGroup": {
+                    "$ref": "#/definitions/AWS::SSM::PatchBaseline.PatchFilterGroup"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.RuleGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "PatchRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SSM::PatchBaseline.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::ResourceDataSync": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BucketName": {
+                            "type": "string"
+                        },
+                        "BucketPrefix": {
+                            "type": "string"
+                        },
+                        "BucketRegion": {
+                            "type": "string"
+                        },
+                        "KMSKeyArn": {
+                            "type": "string"
+                        },
+                        "S3Destination": {
+                            "$ref": "#/definitions/AWS::SSM::ResourceDataSync.S3Destination"
+                        },
+                        "SyncFormat": {
+                            "type": "string"
+                        },
+                        "SyncName": {
+                            "type": "string"
+                        },
+                        "SyncSource": {
+                            "$ref": "#/definitions/AWS::SSM::ResourceDataSync.SyncSource"
+                        },
+                        "SyncType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SyncName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::ResourceDataSync"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::ResourceDataSync.AwsOrganizationsSource": {
+            "additionalProperties": false,
+            "properties": {
+                "OrganizationSourceType": {
+                    "type": "string"
+                },
+                "OrganizationalUnits": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "OrganizationSourceType"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::ResourceDataSync.S3Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "BucketRegion": {
+                    "type": "string"
+                },
+                "KMSKeyArn": {
+                    "type": "string"
+                },
+                "SyncFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName",
+                "BucketRegion",
+                "SyncFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::ResourceDataSync.SyncSource": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsOrganizationsSource": {
+                    "$ref": "#/definitions/AWS::SSM::ResourceDataSync.AwsOrganizationsSource"
+                },
+                "IncludeFutureRegions": {
+                    "type": "boolean"
+                },
+                "SourceRegions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SourceType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourceRegions",
+                "SourceType"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMContacts::Contact": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Alias": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "Plan": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSMContacts::Contact.Stage"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Alias",
+                        "DisplayName",
+                        "Plan",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMContacts::Contact"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMContacts::Contact.ChannelTargetInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelId": {
+                    "type": "string"
+                },
+                "RetryIntervalInMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ChannelId",
+                "RetryIntervalInMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMContacts::Contact.ContactTargetInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "ContactId": {
+                    "type": "string"
+                },
+                "IsEssential": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "ContactId",
+                "IsEssential"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMContacts::Contact.Stage": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInMinutes": {
+                    "type": "number"
+                },
+                "Targets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SSMContacts::Contact.Targets"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DurationInMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMContacts::Contact.Targets": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelTargetInfo": {
+                    "$ref": "#/definitions/AWS::SSMContacts::Contact.ChannelTargetInfo"
+                },
+                "ContactTargetInfo": {
+                    "$ref": "#/definitions/AWS::SSMContacts::Contact.ContactTargetInfo"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSMContacts::ContactChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ChannelAddress": {
+                            "type": "string"
+                        },
+                        "ChannelName": {
+                            "type": "string"
+                        },
+                        "ChannelType": {
+                            "type": "string"
+                        },
+                        "ContactId": {
+                            "type": "string"
+                        },
+                        "DeferActivation": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ChannelAddress",
+                        "ChannelName",
+                        "ChannelType",
+                        "ContactId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMContacts::ContactChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ReplicationSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeletionProtected": {
+                            "type": "boolean"
+                        },
+                        "Regions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSMIncidents::ReplicationSet.ReplicationRegion"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Regions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMIncidents::ReplicationSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ReplicationSet.RegionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SseKmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SseKmsKeyId"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ReplicationSet.ReplicationRegion": {
+            "additionalProperties": false,
+            "properties": {
+                "RegionConfiguration": {
+                    "$ref": "#/definitions/AWS::SSMIncidents::ReplicationSet.RegionConfiguration"
+                },
+                "RegionName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                                "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.Action"
+                            },
+                            "type": "array"
+                        },
+                        "ChatChannel": {
+                            "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.ChatChannel"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "Engagements": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "IncidentTemplate": {
+                            "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.IncidentTemplate"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "IncidentTemplate",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMIncidents::ResponsePlan"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "SsmAutomation": {
+                    "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.SsmAutomation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.ChatChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "ChatbotSns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.IncidentTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DedupeString": {
+                    "type": "string"
+                },
+                "Impact": {
+                    "type": "number"
+                },
+                "NotificationTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.NotificationTargetItem"
+                    },
+                    "type": "array"
+                },
+                "Summary": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Impact",
+                "Title"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.NotificationTargetItem": {
+            "additionalProperties": false,
+            "properties": {
+                "SnsTopicArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.SsmAutomation": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentName": {
+                    "type": "string"
+                },
+                "DocumentVersion": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.SsmParameter"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TargetAccount": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DocumentName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.SsmParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::Assignment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "PermissionSetArn": {
+                            "type": "string"
+                        },
+                        "PrincipalId": {
+                            "type": "string"
+                        },
+                        "PrincipalType": {
+                            "type": "string"
+                        },
+                        "TargetId": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "PermissionSetArn",
+                        "PrincipalId",
+                        "PrincipalType",
+                        "TargetId",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::Assignment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::InstanceAccessControlAttributeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessControlAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttribute"
+                            },
+                            "type": "array"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::InstanceAccessControlAttributeConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttributeValue"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttributeValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Source": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Source"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::PermissionSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "InlinePolicy": {
+                            "type": "object"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "ManagedPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "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::SageMaker::App": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "AppType": {
+                            "type": "string"
+                        },
+                        "DomainId": {
+                            "type": "string"
+                        },
+                        "ResourceSpec": {
+                            "$ref": "#/definitions/AWS::SageMaker::App.ResourceSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserProfileName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AppName",
+                        "AppType",
+                        "DomainId",
+                        "UserProfileName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::App"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::App.ResourceSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "SageMakerImageArn": {
+                    "type": "string"
+                },
+                "SageMakerImageVersionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppImageConfigName": {
+                            "type": "string"
+                        },
+                        "KernelGatewayImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AppImageConfigName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::AppImageConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.FileSystemConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultGid": {
+                    "type": "number"
+                },
+                "DefaultUid": {
+                    "type": "number"
+                },
+                "MountPath": {
+                    "type": "string"
+                }
+            },
+            "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::CodeRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CodeRepositoryName": {
+                            "type": "string"
+                        },
+                        "GitConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::CodeRepository.GitConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "GitConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::CodeRepository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::CodeRepository.GitConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Branch": {
+                    "type": "string"
+                },
+                "RepositoryUrl": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RepositoryUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataQualityAppSpecification": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.DataQualityAppSpecification"
+                        },
+                        "DataQualityBaselineConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.DataQualityBaselineConfig"
+                        },
+                        "DataQualityJobInput": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.DataQualityJobInput"
+                        },
+                        "DataQualityJobOutputConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.MonitoringOutputConfig"
+                        },
+                        "JobDefinitionName": {
+                            "type": "string"
+                        },
+                        "JobResources": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.MonitoringResources"
+                        },
+                        "NetworkConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.NetworkConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StoppingCondition": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.StoppingCondition"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DataQualityAppSpecification",
+                        "DataQualityJobInput",
+                        "DataQualityJobOutputConfig",
+                        "JobResources",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::DataQualityJobDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "VolumeKmsKeyId": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.ConstraintsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.DataQualityAppSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerArguments": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEntrypoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Environment": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ImageUri": {
+                    "type": "string"
+                },
+                "PostAnalyticsProcessorSourceUri": {
+                    "type": "string"
+                },
+                "RecordPreprocessorSourceUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ImageUri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.DataQualityBaselineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseliningJobName": {
+                    "type": "string"
+                },
+                "ConstraintsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.ConstraintsResource"
+                },
+                "StatisticsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.StatisticsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.DataQualityJobInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointInput": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.EndpointInput"
+                }
+            },
+            "required": [
+                "EndpointInput"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.EndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointName": {
+                    "type": "string"
+                },
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3DataDistributionType": {
+                    "type": "string"
+                },
+                "S3InputMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointName",
+                "LocalPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.MonitoringOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Output": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.S3Output"
+                }
+            },
+            "required": [
+                "S3Output"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.MonitoringOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MonitoringOutputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.MonitoringOutput"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MonitoringOutputs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.MonitoringResources": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.ClusterConfig"
+                }
+            },
+            "required": [
+                "ClusterConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.NetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableInterContainerTrafficEncryption": {
+                    "type": "boolean"
+                },
+                "EnableNetworkIsolation": {
+                    "type": "boolean"
+                },
+                "VpcConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.VpcConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.S3Output": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3UploadMode": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LocalPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.StatisticsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.StoppingCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRuntimeInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRuntimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Device": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Device": {
+                            "type": "object"
+                        },
+                        "DeviceFleetName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DeviceFleetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Device"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Device.Device": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "DeviceName": {
+                    "type": "string"
+                },
+                "IotThingName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeviceName"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DeviceFleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DeviceFleetName": {
+                            "type": "string"
+                        },
+                        "OutputConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::DeviceFleet.EdgeOutputConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DeviceFleetName",
+                        "OutputConfig",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::DeviceFleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DeviceFleet.EdgeOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "S3OutputLocation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3OutputLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppNetworkAccessType": {
+                            "type": "string"
+                        },
+                        "AuthMode": {
+                            "type": "string"
+                        },
+                        "DefaultUserSettings": {
+                            "$ref": "#/definitions/AWS::SageMaker::Domain.UserSettings"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthMode",
+                        "DefaultUserSettings",
+                        "DomainName",
+                        "SubnetIds",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.CustomImage": {
+            "additionalProperties": false,
+            "properties": {
+                "AppImageConfigName": {
+                    "type": "string"
+                },
+                "ImageName": {
+                    "type": "string"
+                },
+                "ImageVersionNumber": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AppImageConfigName",
+                "ImageName"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.JupyterServerAppSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultResourceSpec": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.ResourceSpec"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.KernelGatewayAppSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomImages": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::Domain.CustomImage"
+                    },
+                    "type": "array"
+                },
+                "DefaultResourceSpec": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.ResourceSpec"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.ResourceSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "SageMakerImageArn": {
+                    "type": "string"
+                },
+                "SageMakerImageVersionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.SharingSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NotebookOutputOption": {
+                    "type": "string"
+                },
+                "S3KmsKeyId": {
+                    "type": "string"
+                },
+                "S3OutputPath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.UserSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRole": {
+                    "type": "string"
+                },
+                "JupyterServerAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.JupyterServerAppSettings"
+                },
+                "KernelGatewayAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.KernelGatewayAppSettings"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SharingSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.SharingSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeploymentConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::Endpoint.DeploymentConfig"
+                        },
+                        "EndpointConfigName": {
+                            "type": "string"
+                        },
+                        "EndpointName": {
+                            "type": "string"
+                        },
+                        "ExcludeRetainedVariantProperties": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::Endpoint.VariantProperty"
+                            },
+                            "type": "array"
+                        },
+                        "RetainAllVariantProperties": {
+                            "type": "boolean"
+                        },
+                        "RetainDeploymentConfig": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EndpointConfigName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Endpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.Alarm": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AlarmName"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.AutoRollbackConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Alarms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::Endpoint.Alarm"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Alarms"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.BlueGreenUpdatePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumExecutionTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "TerminationWaitInSeconds": {
+                    "type": "number"
+                },
+                "TrafficRoutingConfiguration": {
+                    "$ref": "#/definitions/AWS::SageMaker::Endpoint.TrafficRoutingConfig"
+                }
+            },
+            "required": [
+                "TrafficRoutingConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.CapacitySize": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.DeploymentConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoRollbackConfiguration": {
+                    "$ref": "#/definitions/AWS::SageMaker::Endpoint.AutoRollbackConfig"
+                },
+                "BlueGreenUpdatePolicy": {
+                    "$ref": "#/definitions/AWS::SageMaker::Endpoint.BlueGreenUpdatePolicy"
+                }
+            },
+            "required": [
+                "BlueGreenUpdatePolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.TrafficRoutingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CanarySize": {
+                    "$ref": "#/definitions/AWS::SageMaker::Endpoint.CapacitySize"
+                },
+                "LinearStepSize": {
+                    "$ref": "#/definitions/AWS::SageMaker::Endpoint.CapacitySize"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "WaitIntervalInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.VariantProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "VariantPropertyType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AsyncInferenceConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.AsyncInferenceConfig"
+                        },
+                        "DataCaptureConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.DataCaptureConfig"
+                        },
+                        "EndpointConfigName": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "ProductionVariants": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.ProductionVariant"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ProductionVariants"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::EndpointConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.AsyncInferenceClientConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConcurrentInvocationsPerInstance": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.AsyncInferenceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.AsyncInferenceClientConfig"
+                },
+                "OutputConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.AsyncInferenceOutputConfig"
+                }
+            },
+            "required": [
+                "OutputConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.AsyncInferenceNotificationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorTopic": {
+                    "type": "string"
+                },
+                "SuccessTopic": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.AsyncInferenceOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "NotificationConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.AsyncInferenceNotificationConfig"
+                },
+                "S3OutputPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3OutputPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.CaptureContentTypeHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "CsvContentTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "JsonContentTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.CaptureOption": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CaptureMode"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.DataCaptureConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureContentTypeHeader": {
+                    "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.CaptureContentTypeHeader"
+                },
+                "CaptureOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.CaptureOption"
+                    },
+                    "type": "array"
+                },
+                "DestinationS3Uri": {
+                    "type": "string"
+                },
+                "EnableCapture": {
+                    "type": "boolean"
+                },
+                "InitialSamplingPercentage": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CaptureOptions",
+                "DestinationS3Uri",
+                "InitialSamplingPercentage"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.ProductionVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceleratorType": {
+                    "type": "string"
+                },
+                "InitialInstanceCount": {
+                    "type": "number"
+                },
+                "InitialVariantWeight": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "ModelName": {
+                    "type": "string"
+                },
+                "ServerlessConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.ServerlessConfig"
+                },
+                "VariantName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InitialVariantWeight",
+                "ModelName",
+                "VariantName"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.ServerlessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConcurrency": {
+                    "type": "number"
+                },
+                "MemorySizeInMB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxConcurrency",
+                "MemorySizeInMB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::FeatureGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EventTimeFeatureName": {
+                            "type": "string"
+                        },
+                        "FeatureDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::FeatureGroup.FeatureDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "FeatureGroupName": {
+                            "type": "string"
+                        },
+                        "OfflineStoreConfig": {
+                            "type": "object"
+                        },
+                        "OnlineStoreConfig": {
+                            "type": "object"
+                        },
+                        "RecordIdentifierFeatureName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EventTimeFeatureName",
+                        "FeatureDefinitions",
+                        "FeatureGroupName",
+                        "RecordIdentifierFeatureName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::FeatureGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::FeatureGroup.FeatureDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "FeatureName": {
+                    "type": "string"
+                },
+                "FeatureType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FeatureName",
+                "FeatureType"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Image": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ImageDescription": {
+                            "type": "string"
+                        },
+                        "ImageDisplayName": {
+                            "type": "string"
+                        },
+                        "ImageName": {
+                            "type": "string"
+                        },
+                        "ImageRoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ImageName",
+                        "ImageRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Image"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ImageVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BaseImage": {
+                            "type": "string"
+                        },
+                        "ImageName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "BaseImage",
+                        "ImageName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::ImageVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Model": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Containers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::Model.ContainerDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "EnableNetworkIsolation": {
+                            "type": "boolean"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "InferenceExecutionConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::Model.InferenceExecutionConfig"
+                        },
+                        "ModelName": {
+                            "type": "string"
+                        },
+                        "PrimaryContainer": {
+                            "$ref": "#/definitions/AWS::SageMaker::Model.ContainerDefinition"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::Model.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "ExecutionRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Model"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.ContainerDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerHostname": {
+                    "type": "string"
+                },
+                "Environment": {
+                    "type": "object"
+                },
+                "Image": {
+                    "type": "string"
+                },
+                "ImageConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.ImageConfig"
+                },
+                "InferenceSpecificationName": {
+                    "type": "string"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "ModelDataUrl": {
+                    "type": "string"
+                },
+                "ModelPackageName": {
+                    "type": "string"
+                },
+                "MultiModelConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.MultiModelConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.ImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RepositoryAccessMode": {
+                    "type": "string"
+                },
+                "RepositoryAuthConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.RepositoryAuthConfig"
+                }
+            },
+            "required": [
+                "RepositoryAccessMode"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.InferenceExecutionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.MultiModelConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ModelCacheSetting": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.RepositoryAuthConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RepositoryCredentialsProviderArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RepositoryCredentialsProviderArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "JobDefinitionName": {
+                            "type": "string"
+                        },
+                        "JobResources": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.MonitoringResources"
+                        },
+                        "ModelBiasAppSpecification": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.ModelBiasAppSpecification"
+                        },
+                        "ModelBiasBaselineConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.ModelBiasBaselineConfig"
+                        },
+                        "ModelBiasJobInput": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.ModelBiasJobInput"
+                        },
+                        "ModelBiasJobOutputConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutputConfig"
+                        },
+                        "NetworkConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.NetworkConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StoppingCondition": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.StoppingCondition"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "JobResources",
+                        "ModelBiasAppSpecification",
+                        "ModelBiasJobInput",
+                        "ModelBiasJobOutputConfig",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::ModelBiasJobDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "VolumeKmsKeyId": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.ConstraintsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.EndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndTimeOffset": {
+                    "type": "string"
+                },
+                "EndpointName": {
+                    "type": "string"
+                },
+                "FeaturesAttribute": {
+                    "type": "string"
+                },
+                "InferenceAttribute": {
+                    "type": "string"
+                },
+                "LocalPath": {
+                    "type": "string"
+                },
+                "ProbabilityAttribute": {
+                    "type": "string"
+                },
+                "ProbabilityThresholdAttribute": {
+                    "type": "number"
+                },
+                "S3DataDistributionType": {
+                    "type": "string"
+                },
+                "S3InputMode": {
+                    "type": "string"
+                },
+                "StartTimeOffset": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointName",
+                "LocalPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.ModelBiasAppSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfigUri": {
+                    "type": "string"
+                },
+                "Environment": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ImageUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConfigUri",
+                "ImageUri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.ModelBiasBaselineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseliningJobName": {
+                    "type": "string"
+                },
+                "ConstraintsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.ConstraintsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.ModelBiasJobInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointInput": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.EndpointInput"
+                },
+                "GroundTruthS3Input": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.MonitoringGroundTruthS3Input"
+                }
+            },
+            "required": [
+                "EndpointInput",
+                "GroundTruthS3Input"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.MonitoringGroundTruthS3Input": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Output": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.S3Output"
+                }
+            },
+            "required": [
+                "S3Output"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MonitoringOutputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutput"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MonitoringOutputs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.MonitoringResources": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.ClusterConfig"
+                }
+            },
+            "required": [
+                "ClusterConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.NetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableInterContainerTrafficEncryption": {
+                    "type": "boolean"
+                },
+                "EnableNetworkIsolation": {
+                    "type": "boolean"
+                },
+                "VpcConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.VpcConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.S3Output": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3UploadMode": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LocalPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.StoppingCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRuntimeInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRuntimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "JobDefinitionName": {
+                            "type": "string"
+                        },
+                        "JobResources": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringResources"
+                        },
+                        "ModelExplainabilityAppSpecification": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityAppSpecification"
+                        },
+                        "ModelExplainabilityBaselineConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityBaselineConfig"
+                        },
+                        "ModelExplainabilityJobInput": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityJobInput"
+                        },
+                        "ModelExplainabilityJobOutputConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutputConfig"
+                        },
+                        "NetworkConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.NetworkConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StoppingCondition": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.StoppingCondition"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "JobResources",
+                        "ModelExplainabilityAppSpecification",
+                        "ModelExplainabilityJobInput",
+                        "ModelExplainabilityJobOutputConfig",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::ModelExplainabilityJobDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "VolumeKmsKeyId": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.ConstraintsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.EndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointName": {
+                    "type": "string"
+                },
+                "FeaturesAttribute": {
+                    "type": "string"
+                },
+                "InferenceAttribute": {
+                    "type": "string"
+                },
+                "LocalPath": {
+                    "type": "string"
+                },
+                "ProbabilityAttribute": {
+                    "type": "string"
+                },
+                "S3DataDistributionType": {
+                    "type": "string"
+                },
+                "S3InputMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointName",
+                "LocalPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityAppSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfigUri": {
+                    "type": "string"
+                },
+                "Environment": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ImageUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConfigUri",
+                "ImageUri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityBaselineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseliningJobName": {
+                    "type": "string"
+                },
+                "ConstraintsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.ConstraintsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityJobInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointInput": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.EndpointInput"
+                }
+            },
+            "required": [
+                "EndpointInput"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Output": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.S3Output"
+                }
+            },
+            "required": [
+                "S3Output"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MonitoringOutputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutput"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MonitoringOutputs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringResources": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.ClusterConfig"
+                }
+            },
+            "required": [
+                "ClusterConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.NetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableInterContainerTrafficEncryption": {
+                    "type": "boolean"
+                },
+                "EnableNetworkIsolation": {
+                    "type": "boolean"
+                },
+                "VpcConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.VpcConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.S3Output": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3UploadMode": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LocalPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.StoppingCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRuntimeInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRuntimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelPackageGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ModelPackageGroupDescription": {
+                            "type": "string"
+                        },
+                        "ModelPackageGroupName": {
+                            "type": "string"
+                        },
+                        "ModelPackageGroupPolicy": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ModelPackageGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::ModelPackageGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "JobDefinitionName": {
+                            "type": "string"
+                        },
+                        "JobResources": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.MonitoringResources"
+                        },
+                        "ModelQualityAppSpecification": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.ModelQualityAppSpecification"
+                        },
+                        "ModelQualityBaselineConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.ModelQualityBaselineConfig"
+                        },
+                        "ModelQualityJobInput": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.ModelQualityJobInput"
+                        },
+                        "ModelQualityJobOutputConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutputConfig"
+                        },
+                        "NetworkConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.NetworkConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StoppingCondition": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.StoppingCondition"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "JobResources",
+                        "ModelQualityAppSpecification",
+                        "ModelQualityJobInput",
+                        "ModelQualityJobOutputConfig",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::ModelQualityJobDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "VolumeKmsKeyId": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.ConstraintsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.EndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndTimeOffset": {
+                    "type": "string"
+                },
+                "EndpointName": {
+                    "type": "string"
+                },
+                "InferenceAttribute": {
+                    "type": "string"
+                },
+                "LocalPath": {
+                    "type": "string"
+                },
+                "ProbabilityAttribute": {
+                    "type": "string"
+                },
+                "ProbabilityThresholdAttribute": {
+                    "type": "number"
+                },
+                "S3DataDistributionType": {
+                    "type": "string"
+                },
+                "S3InputMode": {
+                    "type": "string"
+                },
+                "StartTimeOffset": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointName",
+                "LocalPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.ModelQualityAppSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerArguments": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEntrypoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Environment": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ImageUri": {
+                    "type": "string"
+                },
+                "PostAnalyticsProcessorSourceUri": {
+                    "type": "string"
+                },
+                "ProblemType": {
+                    "type": "string"
+                },
+                "RecordPreprocessorSourceUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ImageUri",
+                "ProblemType"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.ModelQualityBaselineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseliningJobName": {
+                    "type": "string"
+                },
+                "ConstraintsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.ConstraintsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.ModelQualityJobInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointInput": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.EndpointInput"
+                },
+                "GroundTruthS3Input": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.MonitoringGroundTruthS3Input"
+                }
+            },
+            "required": [
+                "EndpointInput",
+                "GroundTruthS3Input"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.MonitoringGroundTruthS3Input": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Output": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.S3Output"
+                }
+            },
+            "required": [
+                "S3Output"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MonitoringOutputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutput"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MonitoringOutputs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.MonitoringResources": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.ClusterConfig"
+                }
+            },
+            "required": [
+                "ClusterConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.NetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableInterContainerTrafficEncryption": {
+                    "type": "boolean"
+                },
+                "EnableNetworkIsolation": {
+                    "type": "boolean"
+                },
+                "VpcConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.VpcConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.S3Output": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3UploadMode": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LocalPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.StoppingCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRuntimeInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRuntimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EndpointName": {
+                            "type": "string"
+                        },
+                        "FailureReason": {
+                            "type": "string"
+                        },
+                        "LastMonitoringExecutionSummary": {
+                            "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringExecutionSummary"
+                        },
+                        "MonitoringScheduleConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringScheduleConfig"
+                        },
+                        "MonitoringScheduleName": {
+                            "type": "string"
+                        },
+                        "MonitoringScheduleStatus": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MonitoringScheduleConfig",
+                        "MonitoringScheduleName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::MonitoringSchedule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.BaselineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstraintsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.ConstraintsResource"
+                },
+                "StatisticsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.StatisticsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "VolumeKmsKeyId": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.ConstraintsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.EndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointName": {
+                    "type": "string"
+                },
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3DataDistributionType": {
+                    "type": "string"
+                },
+                "S3InputMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointName",
+                "LocalPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringAppSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerArguments": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEntrypoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ImageUri": {
+                    "type": "string"
+                },
+                "PostAnalyticsProcessorSourceUri": {
+                    "type": "string"
+                },
+                "RecordPreprocessorSourceUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ImageUri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringExecutionSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "CreationTime": {
+                    "type": "string"
+                },
+                "EndpointName": {
+                    "type": "string"
+                },
+                "FailureReason": {
+                    "type": "string"
+                },
+                "LastModifiedTime": {
+                    "type": "string"
+                },
+                "MonitoringExecutionStatus": {
+                    "type": "string"
+                },
+                "MonitoringScheduleName": {
+                    "type": "string"
+                },
+                "ProcessingJobArn": {
+                    "type": "string"
+                },
+                "ScheduledTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CreationTime",
+                "LastModifiedTime",
+                "MonitoringExecutionStatus",
+                "MonitoringScheduleName",
+                "ScheduledTime"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointInput": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.EndpointInput"
+                }
+            },
+            "required": [
+                "EndpointInput"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringJobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "BaselineConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.BaselineConfig"
+                },
+                "Environment": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "MonitoringAppSpecification": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringAppSpecification"
+                },
+                "MonitoringInputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringInput"
+                    },
+                    "type": "array"
+                },
+                "MonitoringOutputConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringOutputConfig"
+                },
+                "MonitoringResources": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringResources"
+                },
+                "NetworkConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.NetworkConfig"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StoppingCondition": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.StoppingCondition"
+                }
+            },
+            "required": [
+                "MonitoringAppSpecification",
+                "MonitoringInputs",
+                "MonitoringOutputConfig",
+                "MonitoringResources",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Output": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.S3Output"
+                }
+            },
+            "required": [
+                "S3Output"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MonitoringOutputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringOutput"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MonitoringOutputs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringResources": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.ClusterConfig"
+                }
+            },
+            "required": [
+                "ClusterConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringScheduleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "MonitoringJobDefinition": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringJobDefinition"
+                },
+                "MonitoringJobDefinitionName": {
+                    "type": "string"
+                },
+                "MonitoringType": {
+                    "type": "string"
+                },
+                "ScheduleConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.ScheduleConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.NetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableInterContainerTrafficEncryption": {
+                    "type": "boolean"
+                },
+                "EnableNetworkIsolation": {
+                    "type": "boolean"
+                },
+                "VpcConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.VpcConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.S3Output": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3UploadMode": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LocalPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.ScheduleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.StatisticsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.StoppingCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRuntimeInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRuntimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::NotebookInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceleratorTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AdditionalCodeRepositories": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DefaultCodeRepository": {
+                            "type": "string"
+                        },
+                        "DirectInternetAccess": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LifecycleConfigName": {
+                            "type": "string"
+                        },
+                        "NotebookInstanceName": {
+                            "type": "string"
+                        },
+                        "PlatformIdentifier": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "RootAccess": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VolumeSizeInGB": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "InstanceType",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::NotebookInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::NotebookInstanceLifecycleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "NotebookInstanceLifecycleConfigName": {
+                            "type": "string"
+                        },
+                        "OnCreate": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::NotebookInstanceLifecycleConfig.NotebookInstanceLifecycleHook"
+                            },
+                            "type": "array"
+                        },
+                        "OnStart": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::NotebookInstanceLifecycleConfig.NotebookInstanceLifecycleHook"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::NotebookInstanceLifecycleConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::NotebookInstanceLifecycleConfig.NotebookInstanceLifecycleHook": {
+            "additionalProperties": false,
+            "properties": {
+                "Content": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Pipeline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PipelineDefinition": {
+                            "type": "object"
+                        },
+                        "PipelineDescription": {
+                            "type": "string"
+                        },
+                        "PipelineDisplayName": {
+                            "type": "string"
+                        },
+                        "PipelineName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PipelineDefinition",
+                        "PipelineName",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Pipeline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ProjectDescription": {
+                            "type": "string"
+                        },
+                        "ProjectName": {
+                            "type": "string"
+                        },
+                        "ServiceCatalogProvisioningDetails": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ProjectName",
+                        "ServiceCatalogProvisioningDetails"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DomainId": {
+                            "type": "string"
+                        },
+                        "SingleSignOnUserIdentifier": {
+                            "type": "string"
+                        },
+                        "SingleSignOnUserValue": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserProfileName": {
+                            "type": "string"
+                        },
+                        "UserSettings": {
+                            "$ref": "#/definitions/AWS::SageMaker::UserProfile.UserSettings"
+                        }
+                    },
+                    "required": [
+                        "DomainId",
+                        "UserProfileName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::UserProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.CustomImage": {
+            "additionalProperties": false,
+            "properties": {
+                "AppImageConfigName": {
+                    "type": "string"
+                },
+                "ImageName": {
+                    "type": "string"
+                },
+                "ImageVersionNumber": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AppImageConfigName",
+                "ImageName"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.JupyterServerAppSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultResourceSpec": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.ResourceSpec"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.KernelGatewayAppSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomImages": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::UserProfile.CustomImage"
+                    },
+                    "type": "array"
+                },
+                "DefaultResourceSpec": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.ResourceSpec"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.ResourceSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "SageMakerImageArn": {
+                    "type": "string"
+                },
+                "SageMakerImageVersionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.SharingSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NotebookOutputOption": {
+                    "type": "string"
+                },
+                "S3KmsKeyId": {
+                    "type": "string"
+                },
+                "S3OutputPath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.UserSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRole": {
+                    "type": "string"
+                },
+                "JupyterServerAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.JupyterServerAppSettings"
+                },
+                "KernelGatewayAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.KernelGatewayAppSettings"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SharingSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.SharingSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Workteam": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "MemberDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::Workteam.MemberDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "NotificationConfiguration": {
+                            "$ref": "#/definitions/AWS::SageMaker::Workteam.NotificationConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkteamName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Workteam"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Workteam.CognitoMemberDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "CognitoClientId": {
+                    "type": "string"
+                },
+                "CognitoUserGroup": {
+                    "type": "string"
+                },
+                "CognitoUserPool": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CognitoClientId",
+                "CognitoUserGroup",
+                "CognitoUserPool"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Workteam.MemberDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "CognitoMemberDefinition": {
+                    "$ref": "#/definitions/AWS::SageMaker::Workteam.CognitoMemberDefinition"
+                }
+            },
+            "required": [
+                "CognitoMemberDefinition"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Workteam.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NotificationTopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NotificationTopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::ResourcePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BlockPublicPolicy": {
+                            "type": "boolean"
+                        },
+                        "ResourcePolicy": {
+                            "type": "object"
+                        },
+                        "SecretId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourcePolicy",
+                        "SecretId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecretsManager::ResourcePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::RotationSchedule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HostedRotationLambda": {
+                            "$ref": "#/definitions/AWS::SecretsManager::RotationSchedule.HostedRotationLambda"
+                        },
+                        "RotationLambdaARN": {
+                            "type": "string"
+                        },
+                        "RotationRules": {
+                            "$ref": "#/definitions/AWS::SecretsManager::RotationSchedule.RotationRules"
+                        },
+                        "SecretId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SecretId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecretsManager::RotationSchedule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::RotationSchedule.HostedRotationLambda": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyArn": {
+                    "type": "string"
+                },
+                "MasterSecretArn": {
+                    "type": "string"
+                },
+                "MasterSecretKmsKeyArn": {
+                    "type": "string"
+                },
+                "RotationLambdaName": {
+                    "type": "string"
+                },
+                "RotationType": {
+                    "type": "string"
+                },
+                "SuperuserSecretArn": {
+                    "type": "string"
+                },
+                "SuperuserSecretKmsKeyArn": {
+                    "type": "string"
+                },
+                "VpcSecurityGroupIds": {
+                    "type": "string"
+                },
+                "VpcSubnetIds": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RotationType"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::RotationSchedule.RotationRules": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomaticallyAfterDays": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecretsManager::Secret": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "GenerateSecretString": {
+                            "$ref": "#/definitions/AWS::SecretsManager::Secret.GenerateSecretString"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ReplicaRegions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SecretsManager::Secret.ReplicaRegion"
+                            },
+                            "type": "array"
+                        },
+                        "SecretString": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecretsManager::Secret"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::Secret.GenerateSecretString": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludeCharacters": {
+                    "type": "string"
+                },
+                "ExcludeLowercase": {
+                    "type": "boolean"
+                },
+                "ExcludeNumbers": {
+                    "type": "boolean"
+                },
+                "ExcludePunctuation": {
+                    "type": "boolean"
+                },
+                "ExcludeUppercase": {
+                    "type": "boolean"
+                },
+                "GenerateStringKey": {
+                    "type": "string"
+                },
+                "IncludeSpace": {
+                    "type": "boolean"
+                },
+                "PasswordLength": {
+                    "type": "number"
+                },
+                "RequireEachIncludedType": {
+                    "type": "boolean"
+                },
+                "SecretStringTemplate": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecretsManager::Secret.ReplicaRegion": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::SecretTargetAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SecretId": {
+                            "type": "string"
+                        },
+                        "TargetId": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SecretId",
+                        "TargetId",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecretsManager::SecretTargetAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::Hub": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::Hub"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Api": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessLogSetting": {
+                            "$ref": "#/definitions/AWS::Serverless::Api.AccessLogSetting"
+                        },
+                        "Auth": {
+                            "$ref": "#/definitions/AWS::Serverless::Api.Auth"
+                        },
+                        "BinaryMediaTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CacheClusterEnabled": {
+                            "type": "boolean"
+                        },
+                        "CacheClusterSize": {
+                            "type": "string"
+                        },
+                        "Cors": {
+                            "anyOf": [
+                                {
+                                    "type": [
+                                        "string"
+                                    ]
+                                },
+                                {
+                                    "$ref": "#/definitions/AWS::Serverless::Api.CorsConfiguration"
+                                }
+                            ]
+                        },
+                        "DefinitionBody": {
+                            "type": "object"
+                        },
+                        "DefinitionUri": {
+                            "anyOf": [
+                                {
+                                    "type": [
+                                        "string"
+                                    ]
+                                },
+                                {
+                                    "$ref": "#/definitions/AWS::Serverless::Api.S3Location"
+                                }
+                            ]
+                        },
+                        "EndpointConfiguration": {
+                            "type": "string"
+                        },
+                        "MethodSettings": {
+                            "items": {
+                                "type": "object"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OpenApiVersion": {
+                            "type": "string"
+                        },
+                        "StageName": {
+                            "type": "string"
+                        },
+                        "TracingEnabled": {
+                            "type": "boolean"
+                        },
+                        "Variables": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "StageName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Serverless::Api"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Api.AccessLogSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Serverless::Api.Auth": {
+            "additionalProperties": false,
+            "properties": {
+                "Authorizers": {
+                    "type": "object"
+                },
+                "DefaultAuthorizer": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Serverless::Api.CorsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowCredentials": {
+                    "type": "boolean"
+                },
+                "AllowHeaders": {
+                    "type": "string"
+                },
+                "AllowMethods": {
+                    "type": "string"
+                },
+                "AllowOrigin": {
+                    "type": "string"
+                },
+                "MaxAge": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AllowOrigin"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Api.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Location": {
+                            "anyOf": [
+                                {
+                                    "type": [
+                                        "string"
+                                    ]
+                                },
+                                {
+                                    "$ref": "#/definitions/AWS::Serverless::Application.ApplicationLocation"
+                                }
+                            ]
+                        },
+                        "NotificationArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "TimeoutInMinutes": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Location"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Serverless::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Application.ApplicationLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationId": {
+                    "type": "string"
+                },
+                "SemanticVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApplicationId",
+                "SemanticVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoPublishAlias": {
+                            "type": "string"
+                        },
+                        "CodeUri": {
+                            "anyOf": [
+                                {
+                                    "type": [
+                                        "string"
+                                    ]
+                                },
+                                {
+                                    "$ref": "#/definitions/AWS::Serverless::Function.S3Location"
+                                }
+                            ]
+                        },
+                        "DeadLetterQueue": {
+                            "$ref": "#/definitions/AWS::Serverless::Function.DeadLetterQueue"
+                        },
+                        "DeploymentPreference": {
+                            "$ref": "#/definitions/AWS::Serverless::Function.DeploymentPreference"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Environment": {
+                            "$ref": "#/definitions/AWS::Serverless::Function.FunctionEnvironment"
+                        },
+                        "Events": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::Serverless::Function.EventSource"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "FileSystemConfigs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Serverless::Function.FileSystemConfig"
+                            },
+                            "type": "array"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "Handler": {
+                            "type": "string"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "Layers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MemorySize": {
+                            "type": "number"
+                        },
+                        "PermissionsBoundary": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "anyOf": [
+                                {
+                                    "type": [
+                                        "string"
+                                    ]
+                                },
+                                {
+                                    "items": {
+                                        "type": "string"
+                                    },
+                                    "type": "array"
+                                },
+                                {
+                                    "$ref": "#/definitions/AWS::Serverless::Function.IAMPolicyDocument"
+                                },
+                                {
+                                    "items": {
+                                        "$ref": "#/definitions/AWS::Serverless::Function.IAMPolicyDocument"
+                                    },
+                                    "type": "array"
+                                },
+                                {
+                                    "items": {
+                                        "$ref": "#/definitions/AWS::Serverless::Function.SAMPolicyTemplate"
+                                    },
+                                    "type": "array"
+                                }
+                            ]
+                        },
+                        "ReservedConcurrentExecutions": {
+                            "type": "number"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "Runtime": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Timeout": {
+                            "type": "number"
+                        },
+                        "Tracing": {
+                            "type": "string"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::Serverless::Function.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "CodeUri",
+                        "Handler",
+                        "Runtime"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Serverless::Function"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.AlexaSkillEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "Variables": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Serverless::Function.ApiEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "Method": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "RestApiId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Method",
+                "Path"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.BucketSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.CloudWatchEventEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "type": "string"
+                },
+                "InputPath": {
+                    "type": "string"
+                },
+                "Pattern": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "Pattern"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.CloudWatchLogsEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterPattern": {
+                    "type": "string"
+                },
+                "LogGroupName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FilterPattern",
+                "LogGroupName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.CollectionSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "CollectionId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CollectionId"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.DeadLetterQueue": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetArn": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TargetArn",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.DeploymentPreference": {
+            "additionalProperties": false,
+            "properties": {
+                "Alarms": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Hooks": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Role": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Serverless::Function.DestinationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "OnFailure": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.OnFailure"
+                }
+            },
+            "required": [
+                "OnFailure"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.DomainSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DomainName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.DynamoDBEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchSize": {
+                    "type": "number"
+                },
+                "BisectBatchOnFunctionError": {
+                    "type": "boolean"
+                },
+                "DestinationConfig": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.DestinationConfig"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "MaximumBatchingWindowInSeconds": {
+                    "type": "number"
+                },
+                "MaximumRecordAgeInSeconds": {
+                    "type": "number"
+                },
+                "MaximumRetryAttempts": {
+                    "type": "number"
+                },
+                "ParallelizationFactor": {
+                    "type": "number"
+                },
+                "StartingPosition": {
+                    "type": "string"
+                },
+                "Stream": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StartingPosition",
+                "Stream"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.EmptySAMPT": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::Serverless::Function.EventBridgeRuleEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBusName": {
+                    "type": "string"
+                },
+                "Input": {
+                    "type": "string"
+                },
+                "InputPath": {
+                    "type": "string"
+                },
+                "Pattern": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "Pattern"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.EventSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Properties": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.S3Event"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.SNSEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.SQSEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.KinesisEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.DynamoDBEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.ApiEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.ScheduleEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.CloudWatchEventEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.CloudWatchLogsEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.IoTRuleEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.AlexaSkillEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.EventBridgeRuleEvent"
+                        }
+                    ]
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Properties",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.FileSystemConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "LocalMountPath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Serverless::Function.FunctionEnvironment": {
+            "additionalProperties": false,
+            "properties": {
+                "Variables": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "required": [
+                "Variables"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.FunctionSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FunctionName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.IAMPolicyDocument": {
+            "additionalProperties": false,
+            "properties": {
+                "Statement": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "Statement"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.IdentitySAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "IdentityName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IdentityName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.IoTRuleEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsIotSqlVersion": {
+                    "type": "string"
+                },
+                "Sql": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Sql"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.KeySAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KeyId"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.KinesisEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchSize": {
+                    "type": "number"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "StartingPosition": {
+                    "type": "string"
+                },
+                "Stream": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StartingPosition",
+                "Stream"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.LogGroupSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogGroupName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.OnFailure": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.QueueSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "QueueName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "QueueName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.S3Event": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Events": {
+                    "anyOf": [
+                        {
+                            "type": [
+                                "string"
+                            ]
+                        },
+                        {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.S3NotificationFilter"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Events"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.S3KeyFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Serverless::Function.S3KeyFilterRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.S3KeyFilterRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.S3NotificationFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Key": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.S3KeyFilter"
+                }
+            },
+            "required": [
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.SAMPolicyTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "AMIDescribePolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.EmptySAMPT"
+                },
+                "CloudFormationDescribeStacksPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.EmptySAMPT"
+                },
+                "CloudWatchPutMetricPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.EmptySAMPT"
+                },
+                "DynamoDBCrudPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.TableSAMPT"
+                },
+                "DynamoDBReadPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.TableSAMPT"
+                },
+                "DynamoDBStreamReadPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.TableStreamSAMPT"
+                },
+                "EC2DescribePolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.EmptySAMPT"
+                },
+                "ElasticsearchHttpPostPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.DomainSAMPT"
+                },
+                "FilterLogEventsPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.LogGroupSAMPT"
+                },
+                "KMSDecryptPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.KeySAMPT"
+                },
+                "KinesisCrudPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.StreamSAMPT"
+                },
+                "KinesisStreamReadPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.StreamSAMPT"
+                },
+                "LambdaInvokePolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.FunctionSAMPT"
+                },
+                "RekognitionDetectOnlyPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.EmptySAMPT"
+                },
+                "RekognitionLabelsPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.EmptySAMPT"
+                },
+                "RekognitionNoDataAccessPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.CollectionSAMPT"
+                },
+                "RekognitionReadPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.CollectionSAMPT"
+                },
+                "RekognitionWriteOnlyAccessPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.CollectionSAMPT"
+                },
+                "S3CrudPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.BucketSAMPT"
+                },
+                "S3ReadPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.BucketSAMPT"
+                },
+                "SESBulkTemplatedCrudPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.IdentitySAMPT"
+                },
+                "SESCrudPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.IdentitySAMPT"
+                },
+                "SESEmailTemplateCrudPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.EmptySAMPT"
+                },
+                "SESSendBouncePolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.IdentitySAMPT"
+                },
+                "SNSCrudPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.TopicSAMPT"
+                },
+                "SNSPublishMessagePolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.TopicSAMPT"
+                },
+                "SQSPollerPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.QueueSAMPT"
+                },
+                "SQSSendMessagePolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.QueueSAMPT"
+                },
+                "StepFunctionsExecutionPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.StateMachineSAMPT"
+                },
+                "VPCAccessPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.EmptySAMPT"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Serverless::Function.SNSEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "Topic": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Topic"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.SQSEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchSize": {
+                    "type": "number"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Queue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Queue"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.ScheduleEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "type": "string"
+                },
+                "Schedule": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Schedule"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.StateMachineSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "StateMachineName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StateMachineName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.StreamSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StreamName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.TableSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.TableStreamSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StreamName",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.TopicSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "TopicName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TopicName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::LayerVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CompatibleRuntimes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ContentUri": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LayerName": {
+                            "type": "string"
+                        },
+                        "LicenseInfo": {
+                            "type": "string"
+                        },
+                        "RetentionPolicy": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Serverless::LayerVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::SimpleTable": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PrimaryKey": {
+                            "$ref": "#/definitions/AWS::Serverless::SimpleTable.PrimaryKey"
+                        },
+                        "ProvisionedThroughput": {
+                            "$ref": "#/definitions/AWS::Serverless::SimpleTable.ProvisionedThroughput"
+                        },
+                        "SSESpecification": {
+                            "$ref": "#/definitions/AWS::Serverless::SimpleTable.SSESpecification"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Serverless::SimpleTable"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::SimpleTable.PrimaryKey": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::SimpleTable.ProvisionedThroughput": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityUnits": {
+                    "type": "number"
+                },
+                "WriteCapacityUnits": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "WriteCapacityUnits"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::SimpleTable.SSESpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "SSEEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Definition": {
+                            "type": "object"
+                        },
+                        "DefinitionSubstitutions": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "DefinitionUri": {
+                            "anyOf": [
+                                {
+                                    "type": [
+                                        "string"
+                                    ]
+                                },
+                                {
+                                    "$ref": "#/definitions/AWS::Serverless::StateMachine.S3Location"
+                                }
+                            ]
+                        },
+                        "Events": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::Serverless::StateMachine.EventSource"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Logging": {
+                            "$ref": "#/definitions/AWS::Serverless::StateMachine.LoggingConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "anyOf": [
+                                {
+                                    "type": [
+                                        "string"
+                                    ]
+                                },
+                                {
+                                    "items": {
+                                        "type": "string"
+                                    },
+                                    "type": "array"
+                                },
+                                {
+                                    "$ref": "#/definitions/AWS::Serverless::StateMachine.IAMPolicyDocument"
+                                },
+                                {
+                                    "items": {
+                                        "$ref": "#/definitions/AWS::Serverless::StateMachine.IAMPolicyDocument"
+                                    },
+                                    "type": "array"
+                                },
+                                {
+                                    "items": {
+                                        "$ref": "#/definitions/AWS::Serverless::StateMachine.SAMPolicyTemplate"
+                                    },
+                                    "type": "array"
+                                }
+                            ]
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Serverless::StateMachine"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.ApiEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "Method": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "RestApiId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Method",
+                "Path"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.CloudWatchEventEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBusName": {
+                    "type": "string"
+                },
+                "Input": {
+                    "type": "string"
+                },
+                "InputPath": {
+                    "type": "string"
+                },
+                "Pattern": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "Pattern"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.CloudWatchLogsLogGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogGroupArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.EventBridgeRuleEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBusName": {
+                    "type": "string"
+                },
+                "Input": {
+                    "type": "string"
+                },
+                "InputPath": {
+                    "type": "string"
+                },
+                "Pattern": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "Pattern"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.EventSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Properties": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::StateMachine.CloudWatchEventEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::StateMachine.EventBridgeRuleEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::StateMachine.ScheduleEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::StateMachine.ApiEvent"
+                        }
+                    ]
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Properties",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.FunctionSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FunctionName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.IAMPolicyDocument": {
+            "additionalProperties": false,
+            "properties": {
+                "Statement": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "Statement"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.LogDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsLogGroup": {
+                    "$ref": "#/definitions/AWS::Serverless::StateMachine.CloudWatchLogsLogGroup"
+                }
+            },
+            "required": [
+                "CloudWatchLogsLogGroup"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Destinations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Serverless::StateMachine.LogDestination"
+                    },
+                    "type": "array"
+                },
+                "IncludeExecutionData": {
+                    "type": "boolean"
+                },
+                "Level": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destinations",
+                "IncludeExecutionData",
+                "Level"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.SAMPolicyTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaInvokePolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::StateMachine.FunctionSAMPT"
+                },
+                "StepFunctionsExecutionPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::StateMachine.StateMachineSAMPT"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.ScheduleEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "type": "string"
+                },
+                "Schedule": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Schedule"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.StateMachineSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "StateMachineName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StateMachineName"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::AcceptedPortfolioShare": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::AcceptedPortfolioShare"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::CloudFormationProduct": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Distributor": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Owner": {
+                            "type": "string"
+                        },
+                        "ProvisioningArtifactParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ServiceCatalog::CloudFormationProduct.ProvisioningArtifactProperties"
+                            },
+                            "type": "array"
+                        },
+                        "ReplaceProvisioningArtifacts": {
+                            "type": "boolean"
+                        },
+                        "SupportDescription": {
+                            "type": "string"
+                        },
+                        "SupportEmail": {
+                            "type": "string"
+                        },
+                        "SupportUrl": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Owner",
+                        "ProvisioningArtifactParameters"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::CloudFormationProduct"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::CloudFormationProduct.ProvisioningArtifactProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "DisableTemplateValidation": {
+                    "type": "boolean"
+                },
+                "Info": {
+                    "type": "object"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Info"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::CloudFormationProvisionedProduct": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "NotificationArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PathId": {
+                            "type": "string"
+                        },
+                        "PathName": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "ProductName": {
+                            "type": "string"
+                        },
+                        "ProvisionedProductName": {
+                            "type": "string"
+                        },
+                        "ProvisioningArtifactId": {
+                            "type": "string"
+                        },
+                        "ProvisioningArtifactName": {
+                            "type": "string"
+                        },
+                        "ProvisioningParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningParameter"
+                            },
+                            "type": "array"
+                        },
+                        "ProvisioningPreferences": {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningPreferences"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::CloudFormationProvisionedProduct"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningPreferences": {
+            "additionalProperties": false,
+            "properties": {
+                "StackSetAccounts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StackSetFailureToleranceCount": {
+                    "type": "number"
+                },
+                "StackSetFailureTolerancePercentage": {
+                    "type": "number"
+                },
+                "StackSetMaxConcurrencyCount": {
+                    "type": "number"
+                },
+                "StackSetMaxConcurrencyPercentage": {
+                    "type": "number"
+                },
+                "StackSetOperationType": {
+                    "type": "string"
+                },
+                "StackSetRegions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::LaunchNotificationConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "NotificationArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "NotificationArns",
+                        "PortfolioId",
+                        "ProductId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::LaunchNotificationConstraint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::LaunchRoleConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LocalRoleName": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId",
+                        "ProductId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::LaunchRoleConstraint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::LaunchTemplateConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId",
+                        "ProductId",
+                        "Rules"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::LaunchTemplateConstraint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::Portfolio": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "ProviderName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DisplayName",
+                        "ProviderName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::Portfolio"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::PortfolioPrincipalAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "PrincipalARN": {
+                            "type": "string"
+                        },
+                        "PrincipalType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId",
+                        "PrincipalARN",
+                        "PrincipalType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::PortfolioPrincipalAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::PortfolioProductAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "SourcePortfolioId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId",
+                        "ProductId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::PortfolioProductAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::PortfolioShare": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "AccountId": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ShareTagOptions": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "AccountId",
+                        "PortfolioId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::PortfolioShare"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::ResourceUpdateConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "TagUpdateOnProvisionedProduct": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId",
+                        "ProductId",
+                        "TagUpdateOnProvisionedProduct"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::ResourceUpdateConstraint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::ServiceAction": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Definition": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ServiceCatalog::ServiceAction.DefinitionParameter"
+                            },
+                            "type": "array"
+                        },
+                        "DefinitionType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Definition",
+                        "DefinitionType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::ServiceAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::ServiceAction.DefinitionParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::ServiceActionAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "ProvisioningArtifactId": {
+                            "type": "string"
+                        },
+                        "ServiceActionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProductId",
+                        "ProvisioningArtifactId",
+                        "ServiceActionId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::ServiceActionAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::StackSetConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "AccountList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AdminRole": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ExecutionRole": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "RegionList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "StackInstanceControl": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AccountList",
+                        "AdminRole",
+                        "Description",
+                        "ExecutionRole",
+                        "PortfolioId",
+                        "ProductId",
+                        "RegionList",
+                        "StackInstanceControl"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::StackSetConstraint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::TagOption": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Active": {
+                            "type": "boolean"
+                        },
+                        "Key": {
+                            "type": "string"
+                        },
+                        "Value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Key",
+                        "Value"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::TagOption"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::TagOptionAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "TagOptionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourceId",
+                        "TagOptionId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::TagOptionAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalogAppRegistry::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::ServiceCatalogAppRegistry::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalogAppRegistry::AttributeGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Attributes": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Attributes",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalogAppRegistry::AttributeGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Application": {
+                            "type": "string"
+                        },
+                        "AttributeGroup": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Application",
+                        "AttributeGroup"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalogAppRegistry::ResourceAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Application": {
+                            "type": "string"
+                        },
+                        "Resource": {
+                            "type": "string"
+                        },
+                        "ResourceType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Application",
+                        "Resource",
+                        "ResourceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalogAppRegistry::ResourceAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::HttpNamespace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceDiscovery::HttpNamespace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Instance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InstanceAttributes": {
+                            "type": "object"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "ServiceId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceAttributes",
+                        "ServiceId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceDiscovery::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PrivateDnsNamespace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Properties": {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::PrivateDnsNamespace.Properties"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Vpc": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Vpc"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceDiscovery::PrivateDnsNamespace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PrivateDnsNamespace.PrivateDnsPropertiesMutable": {
+            "additionalProperties": false,
+            "properties": {
+                "SOA": {
+                    "$ref": "#/definitions/AWS::ServiceDiscovery::PrivateDnsNamespace.SOA"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PrivateDnsNamespace.Properties": {
+            "additionalProperties": false,
+            "properties": {
+                "DnsProperties": {
+                    "$ref": "#/definitions/AWS::ServiceDiscovery::PrivateDnsNamespace.PrivateDnsPropertiesMutable"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PrivateDnsNamespace.SOA": {
+            "additionalProperties": false,
+            "properties": {
+                "TTL": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PublicDnsNamespace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Properties": {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::PublicDnsNamespace.Properties"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceDiscovery::PublicDnsNamespace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PublicDnsNamespace.Properties": {
+            "additionalProperties": false,
+            "properties": {
+                "DnsProperties": {
+                    "$ref": "#/definitions/AWS::ServiceDiscovery::PublicDnsNamespace.PublicDnsPropertiesMutable"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PublicDnsNamespace.PublicDnsPropertiesMutable": {
+            "additionalProperties": false,
+            "properties": {
+                "SOA": {
+                    "$ref": "#/definitions/AWS::ServiceDiscovery::PublicDnsNamespace.SOA"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PublicDnsNamespace.SOA": {
+            "additionalProperties": false,
+            "properties": {
+                "TTL": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Service": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DnsConfig": {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::Service.DnsConfig"
+                        },
+                        "HealthCheckConfig": {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::Service.HealthCheckConfig"
+                        },
+                        "HealthCheckCustomConfig": {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::Service.HealthCheckCustomConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NamespaceId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceDiscovery::Service"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Service.DnsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DnsRecords": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ServiceDiscovery::Service.DnsRecord"
+                    },
+                    "type": "array"
+                },
+                "NamespaceId": {
+                    "type": "string"
+                },
+                "RoutingPolicy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DnsRecords"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Service.DnsRecord": {
+            "additionalProperties": false,
+            "properties": {
+                "TTL": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TTL",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Service.HealthCheckConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FailureThreshold": {
+                    "type": "number"
+                },
+                "ResourcePath": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Service.HealthCheckCustomConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FailureThreshold": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Signer::ProfilePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        },
+                        "ProfileName": {
+                            "type": "string"
+                        },
+                        "ProfileVersion": {
+                            "type": "string"
+                        },
+                        "StatementId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Action",
+                        "Principal",
+                        "ProfileName",
+                        "StatementId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Signer::ProfilePermission"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Signer::SigningProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PlatformId": {
+                            "type": "string"
+                        },
+                        "SignatureValidityPeriod": {
+                            "$ref": "#/definitions/AWS::Signer::SigningProfile.SignatureValidityPeriod"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PlatformId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Signer::SigningProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Signer::SigningProfile.SignatureValidityPeriod": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::StepFunctions::Activity": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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/AWS::StepFunctions::Activity.TagsEntry"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::StepFunctions::Activity"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::StepFunctions::Activity.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.Definition"
+                        },
+                        "DefinitionS3Location": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.S3Location"
+                        },
+                        "DefinitionString": {
+                            "type": "string"
+                        },
+                        "DefinitionSubstitutions": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "LoggingConfiguration": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.LoggingConfiguration"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StateMachineName": {
+                            "type": "string"
+                        },
+                        "StateMachineType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::StepFunctions::StateMachine.TagsEntry"
+                            },
+                            "type": "array"
+                        },
+                        "TracingConfiguration": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.TracingConfiguration"
+                        }
+                    },
+                    "required": [
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::StepFunctions::StateMachine"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.CloudWatchLogsLogGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.Definition": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.LogDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsLogGroup": {
+                    "$ref": "#/definitions/AWS::StepFunctions::StateMachine.CloudWatchLogsLogGroup"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Destinations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::StepFunctions::StateMachine.LogDestination"
+                    },
+                    "type": "array"
+                },
+                "IncludeExecutionData": {
+                    "type": "boolean"
+                },
+                "Level": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.TracingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ArtifactConfig": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.ArtifactConfig"
+                        },
+                        "ArtifactS3Location": {
+                            "type": "string"
+                        },
+                        "Code": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.Code"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "FailureRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RunConfig": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.RunConfig"
+                        },
+                        "RuntimeVersion": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.Schedule"
+                        },
+                        "StartCanaryAfterCreation": {
+                            "type": "boolean"
+                        },
+                        "SuccessRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VPCConfig": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.VPCConfig"
+                        },
+                        "VisualReference": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.VisualReference"
+                        }
+                    },
+                    "required": [
+                        "ArtifactS3Location",
+                        "Code",
+                        "ExecutionRoleArn",
+                        "Name",
+                        "RuntimeVersion",
+                        "Schedule",
+                        "StartCanaryAfterCreation"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Synthetics::Canary"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.ArtifactConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Encryption": {
+                    "$ref": "#/definitions/AWS::Synthetics::Canary.S3Encryption"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.BaseScreenshot": {
+            "additionalProperties": false,
+            "properties": {
+                "IgnoreCoordinates": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ScreenshotName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScreenshotName"
+            ],
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.Code": {
+            "additionalProperties": false,
+            "properties": {
+                "Handler": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                },
+                "S3ObjectVersion": {
+                    "type": "string"
+                },
+                "Script": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Handler"
+            ],
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.RunConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveTracing": {
+                    "type": "boolean"
+                },
+                "EnvironmentVariables": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "MemoryInMB": {
+                    "type": "number"
+                },
+                "TimeoutInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.S3Encryption": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionMode": {
+                    "type": "string"
+                },
+                "KmsKeyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Expression"
+            ],
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.VPCConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.VisualReference": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseCanaryRunId": {
+                    "type": "string"
+                },
+                "BaseScreenshots": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Synthetics::Canary.BaseScreenshot"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "BaseCanaryRunId"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::Database": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Timestream::Database"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClientToken": {
+                            "type": "string"
+                        },
+                        "ErrorReportConfiguration": {
+                            "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.ErrorReportConfiguration"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "NotificationConfiguration": {
+                            "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.NotificationConfiguration"
+                        },
+                        "QueryString": {
+                            "type": "string"
+                        },
+                        "ScheduleConfiguration": {
+                            "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.ScheduleConfiguration"
+                        },
+                        "ScheduledQueryExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "ScheduledQueryName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetConfiguration": {
+                            "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.TargetConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ErrorReportConfiguration",
+                        "NotificationConfiguration",
+                        "QueryString",
+                        "ScheduleConfiguration",
+                        "ScheduledQueryExecutionRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Timestream::ScheduledQuery"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.DimensionMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionValueType": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DimensionValueType",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.ErrorReportConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.S3Configuration"
+                }
+            },
+            "required": [
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.MixedMeasureMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MeasureName": {
+                    "type": "string"
+                },
+                "MeasureValueType": {
+                    "type": "string"
+                },
+                "MultiMeasureAttributeMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.MultiMeasureAttributeMapping"
+                    },
+                    "type": "array"
+                },
+                "SourceColumn": {
+                    "type": "string"
+                },
+                "TargetMeasureName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MeasureValueType"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.MultiMeasureAttributeMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MeasureValueType": {
+                    "type": "string"
+                },
+                "SourceColumn": {
+                    "type": "string"
+                },
+                "TargetMultiMeasureAttributeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MeasureValueType",
+                "SourceColumn"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.MultiMeasureMappings": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiMeasureAttributeMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.MultiMeasureAttributeMapping"
+                    },
+                    "type": "array"
+                },
+                "TargetMultiMeasureName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MultiMeasureAttributeMappings"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SnsConfiguration": {
+                    "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.SnsConfiguration"
+                }
+            },
+            "required": [
+                "SnsConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.S3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "EncryptionOption": {
+                    "type": "string"
+                },
+                "ObjectKeyPrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.ScheduleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.SnsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.TargetConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "TimestreamConfiguration": {
+                    "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.TimestreamConfiguration"
+                }
+            },
+            "required": [
+                "TimestreamConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.TimestreamConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DimensionMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.DimensionMapping"
+                    },
+                    "type": "array"
+                },
+                "MeasureNameColumn": {
+                    "type": "string"
+                },
+                "MixedMeasureMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.MixedMeasureMapping"
+                    },
+                    "type": "array"
+                },
+                "MultiMeasureMappings": {
+                    "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.MultiMeasureMappings"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "TimeColumn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "DimensionMappings",
+                "TableName",
+                "TimeColumn"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::Table": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "RetentionProperties": {
+                            "type": "object"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DatabaseName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Timestream::Table"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Server": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "EndpointDetails": {
+                            "$ref": "#/definitions/AWS::Transfer::Server.EndpointDetails"
+                        },
+                        "EndpointType": {
+                            "type": "string"
+                        },
+                        "IdentityProviderDetails": {
+                            "$ref": "#/definitions/AWS::Transfer::Server.IdentityProviderDetails"
+                        },
+                        "IdentityProviderType": {
+                            "type": "string"
+                        },
+                        "LoggingRole": {
+                            "type": "string"
+                        },
+                        "ProtocolDetails": {
+                            "$ref": "#/definitions/AWS::Transfer::Server.ProtocolDetails"
+                        },
+                        "Protocols": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Server.Protocol"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityPolicyName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkflowDetails": {
+                            "$ref": "#/definitions/AWS::Transfer::Server.WorkflowDetails"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Transfer::Server"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Server.EndpointDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "AddressAllocationIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcEndpointId": {
+                    "type": "string"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Server.IdentityProviderDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryId": {
+                    "type": "string"
+                },
+                "Function": {
+                    "type": "string"
+                },
+                "InvocationRole": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Server.Protocol": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::Transfer::Server.ProtocolDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "PassiveIp": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Server.WorkflowDetail": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRole": {
+                    "type": "string"
+                },
+                "WorkflowId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ExecutionRole",
+                "WorkflowId"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Server.WorkflowDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "OnUpload": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Transfer::Server.WorkflowDetail"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "OnUpload"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HomeDirectory": {
+                            "type": "string"
+                        },
+                        "HomeDirectoryMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::User.HomeDirectoryMapEntry"
+                            },
+                            "type": "array"
+                        },
+                        "HomeDirectoryType": {
+                            "type": "string"
+                        },
+                        "Policy": {
+                            "type": "string"
+                        },
+                        "PosixProfile": {
+                            "$ref": "#/definitions/AWS::Transfer::User.PosixProfile"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "ServerId": {
+                            "type": "string"
+                        },
+                        "SshPublicKeys": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::User.SshPublicKey"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Role",
+                        "ServerId",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Transfer::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::User.HomeDirectoryMapEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Entry": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Entry",
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::User.PosixProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "Gid": {
+                    "type": "number"
+                },
+                "SecondaryGids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Uid": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Gid",
+                "Uid"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::User.SshPublicKey": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "OnExceptionSteps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
+                            },
+                            "type": "array"
+                        },
+                        "Steps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Steps"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Transfer::Workflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.WorkflowStep": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyStepDetails": {
+                    "type": "object"
+                },
+                "CustomStepDetails": {
+                    "type": "object"
+                },
+                "DeleteStepDetails": {
+                    "type": "object"
+                },
+                "TagStepDetails": {
+                    "type": "object"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAF::ByteMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ByteMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::ByteMatchSet.ByteMatchTuple"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::ByteMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::ByteMatchSet.ByteMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAF::ByteMatchSet.FieldToMatch"
+                },
+                "PositionalConstraint": {
+                    "type": "string"
+                },
+                "TargetString": {
+                    "type": "string"
+                },
+                "TargetStringBase64": {
+                    "type": "string"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "PositionalConstraint",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::ByteMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::IPSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "IPSetDescriptors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::IPSet.IPSetDescriptor"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::IPSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::IPSet.IPSetDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Predicates": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::Rule.Predicate"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MetricName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::Rule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::Rule.Predicate": {
+            "additionalProperties": false,
+            "properties": {
+                "DataId": {
+                    "type": "string"
+                },
+                "Negated": {
+                    "type": "boolean"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataId",
+                "Negated",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SizeConstraintSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SizeConstraints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::SizeConstraintSet.SizeConstraint"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "SizeConstraints"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::SizeConstraintSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SizeConstraintSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SizeConstraintSet.SizeConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAF::SizeConstraintSet.FieldToMatch"
+                },
+                "Size": {
+                    "type": "number"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "FieldToMatch",
+                "Size",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SqlInjectionMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SqlInjectionMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::SqlInjectionMatchSet.SqlInjectionMatchTuple"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::SqlInjectionMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SqlInjectionMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SqlInjectionMatchSet.SqlInjectionMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAF::SqlInjectionMatchSet.FieldToMatch"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::WebACL": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "$ref": "#/definitions/AWS::WAF::WebACL.WafAction"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::WebACL.ActivatedRule"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DefaultAction",
+                        "MetricName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::WebACL"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::WebACL.ActivatedRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::WAF::WebACL.WafAction"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "RuleId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Priority",
+                "RuleId"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::WebACL.WafAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::XssMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "XssMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::XssMatchSet.XssMatchTuple"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "XssMatchTuples"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::XssMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::XssMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::XssMatchSet.XssMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAF::XssMatchSet.FieldToMatch"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::ByteMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ByteMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::ByteMatchSet.ByteMatchTuple"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::ByteMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::ByteMatchSet.ByteMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFRegional::ByteMatchSet.FieldToMatch"
+                },
+                "PositionalConstraint": {
+                    "type": "string"
+                },
+                "TargetString": {
+                    "type": "string"
+                },
+                "TargetStringBase64": {
+                    "type": "string"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "PositionalConstraint",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::ByteMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::GeoMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GeoMatchConstraints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::GeoMatchSet.GeoMatchConstraint"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::GeoMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::GeoMatchSet.GeoMatchConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::IPSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "IPSetDescriptors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::IPSet.IPSetDescriptor"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::IPSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::IPSet.IPSetDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::RateBasedRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MatchPredicates": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::RateBasedRule.Predicate"
+                            },
+                            "type": "array"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RateKey": {
+                            "type": "string"
+                        },
+                        "RateLimit": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "MetricName",
+                        "Name",
+                        "RateKey",
+                        "RateLimit"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::RateBasedRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::RateBasedRule.Predicate": {
+            "additionalProperties": false,
+            "properties": {
+                "DataId": {
+                    "type": "string"
+                },
+                "Negated": {
+                    "type": "boolean"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataId",
+                "Negated",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::RegexPatternSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RegexPatternStrings": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "RegexPatternStrings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::RegexPatternSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Predicates": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::Rule.Predicate"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MetricName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::Rule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::Rule.Predicate": {
+            "additionalProperties": false,
+            "properties": {
+                "DataId": {
+                    "type": "string"
+                },
+                "Negated": {
+                    "type": "boolean"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataId",
+                "Negated",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SizeConstraintSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SizeConstraints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::SizeConstraintSet.SizeConstraint"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::SizeConstraintSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SizeConstraintSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SizeConstraintSet.SizeConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFRegional::SizeConstraintSet.FieldToMatch"
+                },
+                "Size": {
+                    "type": "number"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "FieldToMatch",
+                "Size",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SqlInjectionMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SqlInjectionMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::SqlInjectionMatchSet.SqlInjectionMatchTuple"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::SqlInjectionMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SqlInjectionMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SqlInjectionMatchSet.SqlInjectionMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFRegional::SqlInjectionMatchSet.FieldToMatch"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::WebACL": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "$ref": "#/definitions/AWS::WAFRegional::WebACL.Action"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::WebACL.Rule"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DefaultAction",
+                        "MetricName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::WebACL"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::WebACL.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::WebACL.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::WAFRegional::WebACL.Action"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "RuleId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action",
+                "Priority",
+                "RuleId"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::WebACLAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "WebACLId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourceArn",
+                        "WebACLId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::WebACLAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::XssMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "XssMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::XssMatchSet.XssMatchTuple"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::XssMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::XssMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::XssMatchSet.XssMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFRegional::XssMatchSet.FieldToMatch"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::IPSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Addresses": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IPAddressVersion": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Scope": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Addresses",
+                        "IPAddressVersion",
+                        "Scope"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::IPSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LogDestinationConfigs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LoggingFilter": {
+                            "type": "object"
+                        },
+                        "RedactedFields": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFv2::LoggingConfiguration.FieldToMatch"
+                            },
+                            "type": "array"
+                        },
+                        "ResourceArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LogDestinationConfigs",
+                        "ResourceArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::LoggingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::LoggingConfiguration.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonBody": {
+                    "type": "object"
+                },
+                "Method": {
+                    "type": "object"
+                },
+                "QueryString": {
+                    "type": "object"
+                },
+                "SingleHeader": {
+                    "type": "object"
+                },
+                "UriPath": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RegexPatternSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RegularExpressionList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Scope": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RegularExpressionList",
+                        "Scope"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::RegexPatternSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Capacity": {
+                            "type": "number"
+                        },
+                        "CustomResponseBodies": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.CustomResponseBody"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Scope": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VisibilityConfig": {
+                            "$ref": "#/definitions/AWS::WAFv2::RuleGroup.VisibilityConfig"
+                        }
+                    },
+                    "required": [
+                        "Capacity",
+                        "Scope",
+                        "VisibilityConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::RuleGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.AndStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Statement"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Statements"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.ByteMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.FieldToMatch"
+                },
+                "PositionalConstraint": {
+                    "type": "string"
+                },
+                "SearchString": {
+                    "type": "string"
+                },
+                "SearchStringBase64": {
+                    "type": "string"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "PositionalConstraint",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.CustomResponseBody": {
+            "additionalProperties": false,
+            "properties": {
+                "Content": {
+                    "type": "string"
+                },
+                "ContentType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Content",
+                "ContentType"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "AllQueryArguments": {
+                    "type": "object"
+                },
+                "Body": {
+                    "type": "object"
+                },
+                "JsonBody": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.JsonBody"
+                },
+                "Method": {
+                    "type": "object"
+                },
+                "QueryString": {
+                    "type": "object"
+                },
+                "SingleHeader": {
+                    "type": "object"
+                },
+                "SingleQueryArgument": {
+                    "type": "object"
+                },
+                "UriPath": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.ForwardedIPConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FallbackBehavior": {
+                    "type": "string"
+                },
+                "HeaderName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FallbackBehavior",
+                "HeaderName"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.GeoMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "CountryCodes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.ForwardedIPConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.IPSetForwardedIPConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FallbackBehavior": {
+                    "type": "string"
+                },
+                "HeaderName": {
+                    "type": "string"
+                },
+                "Position": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FallbackBehavior",
+                "HeaderName",
+                "Position"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.IPSetReferenceStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "IPSetForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.IPSetForwardedIPConfiguration"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.JsonBody": {
+            "additionalProperties": false,
+            "properties": {
+                "InvalidFallbackBehavior": {
+                    "type": "string"
+                },
+                "MatchPattern": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.JsonMatchPattern"
+                },
+                "MatchScope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchPattern",
+                "MatchScope"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.JsonMatchPattern": {
+            "additionalProperties": false,
+            "properties": {
+                "All": {
+                    "type": "object"
+                },
+                "IncludedPaths": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.Label": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.LabelMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Scope"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.LabelSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.NotStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Statement"
+                }
+            },
+            "required": [
+                "Statement"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.OrStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Statement"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Statements"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.RateBasedStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregateKeyType": {
+                    "type": "string"
+                },
+                "ForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.ForwardedIPConfiguration"
+                },
+                "Limit": {
+                    "type": "number"
+                },
+                "ScopeDownStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Statement"
+                }
+            },
+            "required": [
+                "AggregateKeyType",
+                "Limit"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.RegexPatternSetReferenceStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn",
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.RuleAction"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "RuleLabels": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Label"
+                    },
+                    "type": "array"
+                },
+                "Statement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Statement"
+                },
+                "VisibilityConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.VisibilityConfig"
+                }
+            },
+            "required": [
+                "Name",
+                "Priority",
+                "Statement",
+                "VisibilityConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.RuleAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Allow": {
+                    "type": "object"
+                },
+                "Block": {
+                    "type": "object"
+                },
+                "Count": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.SizeConstraintStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.FieldToMatch"
+                },
+                "Size": {
+                    "type": "number"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "FieldToMatch",
+                "Size",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.SqliMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.Statement": {
+            "additionalProperties": false,
+            "properties": {
+                "AndStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.AndStatement"
+                },
+                "ByteMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.ByteMatchStatement"
+                },
+                "GeoMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.GeoMatchStatement"
+                },
+                "IPSetReferenceStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.IPSetReferenceStatement"
+                },
+                "LabelMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.LabelMatchStatement"
+                },
+                "NotStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.NotStatement"
+                },
+                "OrStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.OrStatement"
+                },
+                "RateBasedStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.RateBasedStatement"
+                },
+                "RegexPatternSetReferenceStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.RegexPatternSetReferenceStatement"
+                },
+                "SizeConstraintStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.SizeConstraintStatement"
+                },
+                "SqliMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.SqliMatchStatement"
+                },
+                "XssMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.XssMatchStatement"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.TextTransformation": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Priority",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.VisibilityConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "SampledRequestsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "CloudWatchMetricsEnabled",
+                "MetricName",
+                "SampledRequestsEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.XssMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomResponseBodies": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomResponseBody"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "DefaultAction": {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL.DefaultAction"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFv2::WebACL.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Scope": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VisibilityConfig": {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL.VisibilityConfig"
+                        }
+                    },
+                    "required": [
+                        "DefaultAction",
+                        "Scope",
+                        "VisibilityConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::WebACL"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.AllowAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomRequestHandling": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomRequestHandling"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.AndStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Statements"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.BlockAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomResponse": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomResponse"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.ByteMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.FieldToMatch"
+                },
+                "PositionalConstraint": {
+                    "type": "string"
+                },
+                "SearchString": {
+                    "type": "string"
+                },
+                "SearchStringBase64": {
+                    "type": "string"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "PositionalConstraint",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.CountAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomRequestHandling": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomRequestHandling"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.CustomHTTPHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.CustomRequestHandling": {
+            "additionalProperties": false,
+            "properties": {
+                "InsertHeaders": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomHTTPHeader"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "InsertHeaders"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.CustomResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomResponseBodyKey": {
+                    "type": "string"
+                },
+                "ResponseCode": {
+                    "type": "number"
+                },
+                "ResponseHeaders": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomHTTPHeader"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ResponseCode"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.CustomResponseBody": {
+            "additionalProperties": false,
+            "properties": {
+                "Content": {
+                    "type": "string"
+                },
+                "ContentType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Content",
+                "ContentType"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.DefaultAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Allow": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.AllowAction"
+                },
+                "Block": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.BlockAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.ExcludedRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "AllQueryArguments": {
+                    "type": "object"
+                },
+                "Body": {
+                    "type": "object"
+                },
+                "JsonBody": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.JsonBody"
+                },
+                "Method": {
+                    "type": "object"
+                },
+                "QueryString": {
+                    "type": "object"
+                },
+                "SingleHeader": {
+                    "type": "object"
+                },
+                "SingleQueryArgument": {
+                    "type": "object"
+                },
+                "UriPath": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.ForwardedIPConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FallbackBehavior": {
+                    "type": "string"
+                },
+                "HeaderName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FallbackBehavior",
+                "HeaderName"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.GeoMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "CountryCodes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.ForwardedIPConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.IPSetForwardedIPConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FallbackBehavior": {
+                    "type": "string"
+                },
+                "HeaderName": {
+                    "type": "string"
+                },
+                "Position": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FallbackBehavior",
+                "HeaderName",
+                "Position"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.IPSetReferenceStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "IPSetForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.IPSetForwardedIPConfiguration"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.JsonBody": {
+            "additionalProperties": false,
+            "properties": {
+                "InvalidFallbackBehavior": {
+                    "type": "string"
+                },
+                "MatchPattern": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.JsonMatchPattern"
+                },
+                "MatchScope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchPattern",
+                "MatchScope"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.JsonMatchPattern": {
+            "additionalProperties": false,
+            "properties": {
+                "All": {
+                    "type": "object"
+                },
+                "IncludedPaths": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.Label": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.LabelMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Scope"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.ManagedRuleGroupStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludedRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.ExcludedRule"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "ScopeDownStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                },
+                "VendorName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "VendorName"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.NotStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                }
+            },
+            "required": [
+                "Statement"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.OrStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Statements"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.OverrideAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "object"
+                },
+                "None": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.RateBasedStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregateKeyType": {
+                    "type": "string"
+                },
+                "ForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.ForwardedIPConfiguration"
+                },
+                "Limit": {
+                    "type": "number"
+                },
+                "ScopeDownStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                }
+            },
+            "required": [
+                "AggregateKeyType",
+                "Limit"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.RegexPatternSetReferenceStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn",
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.RuleAction"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "OverrideAction": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.OverrideAction"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "RuleLabels": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.Label"
+                    },
+                    "type": "array"
+                },
+                "Statement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                },
+                "VisibilityConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.VisibilityConfig"
+                }
+            },
+            "required": [
+                "Name",
+                "Priority",
+                "Statement",
+                "VisibilityConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.RuleAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Allow": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.AllowAction"
+                },
+                "Block": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.BlockAction"
+                },
+                "Count": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.CountAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.RuleGroupReferenceStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "ExcludedRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.ExcludedRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.SizeConstraintStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.FieldToMatch"
+                },
+                "Size": {
+                    "type": "number"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "FieldToMatch",
+                "Size",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.SqliMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.Statement": {
+            "additionalProperties": false,
+            "properties": {
+                "AndStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.AndStatement"
+                },
+                "ByteMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.ByteMatchStatement"
+                },
+                "GeoMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.GeoMatchStatement"
+                },
+                "IPSetReferenceStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.IPSetReferenceStatement"
+                },
+                "LabelMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.LabelMatchStatement"
+                },
+                "ManagedRuleGroupStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.ManagedRuleGroupStatement"
+                },
+                "NotStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.NotStatement"
+                },
+                "OrStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.OrStatement"
+                },
+                "RateBasedStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.RateBasedStatement"
+                },
+                "RegexPatternSetReferenceStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.RegexPatternSetReferenceStatement"
+                },
+                "RuleGroupReferenceStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.RuleGroupReferenceStatement"
+                },
+                "SizeConstraintStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.SizeConstraintStatement"
+                },
+                "SqliMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.SqliMatchStatement"
+                },
+                "XssMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.XssMatchStatement"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.TextTransformation": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Priority",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.VisibilityConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "SampledRequestsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "CloudWatchMetricsEnabled",
+                "MetricName",
+                "SampledRequestsEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.XssMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACLAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "WebACLArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourceArn",
+                        "WebACLArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::WebACLAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::Assistant": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ServerSideEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Wisdom::Assistant.ServerSideEncryptionConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Wisdom::Assistant"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::Assistant.ServerSideEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Wisdom::AssistantAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssistantId": {
+                            "type": "string"
+                        },
+                        "Association": {
+                            "$ref": "#/definitions/AWS::Wisdom::AssistantAssociation.AssociationData"
+                        },
+                        "AssociationType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AssistantId",
+                        "Association",
+                        "AssociationType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Wisdom::AssistantAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::AssistantAssociation.AssociationData": {
+            "additionalProperties": false,
+            "properties": {
+                "KnowledgeBaseId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KnowledgeBaseId"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::KnowledgeBase": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "KnowledgeBaseType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RenderingConfiguration": {
+                            "$ref": "#/definitions/AWS::Wisdom::KnowledgeBase.RenderingConfiguration"
+                        },
+                        "ServerSideEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Wisdom::KnowledgeBase.ServerSideEncryptionConfiguration"
+                        },
+                        "SourceConfiguration": {
+                            "$ref": "#/definitions/AWS::Wisdom::KnowledgeBase.SourceConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "KnowledgeBaseType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Wisdom::KnowledgeBase"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::KnowledgeBase.AppIntegrationsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AppIntegrationArn": {
+                    "type": "string"
+                },
+                "ObjectFields": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AppIntegrationArn",
+                "ObjectFields"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::KnowledgeBase.RenderingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "TemplateUri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Wisdom::KnowledgeBase.ServerSideEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Wisdom::KnowledgeBase.SourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AppIntegrations": {
+                    "$ref": "#/definitions/AWS::Wisdom::KnowledgeBase.AppIntegrationsConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WorkSpaces::ConnectionAlias": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionString": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConnectionString"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WorkSpaces::ConnectionAlias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::ConnectionAlias.ConnectionAliasAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "AssociatedAccountId": {
+                    "type": "string"
+                },
+                "AssociationStatus": {
+                    "type": "string"
+                },
+                "ConnectionIdentifier": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WorkSpaces::Workspace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "DirectoryId": {
+                            "type": "string"
+                        },
+                        "RootVolumeEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        },
+                        "UserVolumeEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "VolumeEncryptionKey": {
+                            "type": "string"
+                        },
+                        "WorkspaceProperties": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::Workspace.WorkspaceProperties"
+                        }
+                    },
+                    "required": [
+                        "BundleId",
+                        "DirectoryId",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WorkSpaces::Workspace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::Workspace.WorkspaceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeTypeName": {
+                    "type": "string"
+                },
+                "RootVolumeSizeGib": {
+                    "type": "number"
+                },
+                "RunningMode": {
+                    "type": "string"
+                },
+                "RunningModeAutoStopTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "UserVolumeSizeGib": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::XRay::Group": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FilterExpression": {
+                            "type": "string"
+                        },
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "InsightsConfiguration": {
+                            "$ref": "#/definitions/AWS::XRay::Group.InsightsConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "type": "object"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::XRay::Group"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::XRay::Group.InsightsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InsightsEnabled": {
+                    "type": "boolean"
+                },
+                "NotificationsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::XRay::SamplingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RuleName": {
+                            "type": "string"
+                        },
+                        "SamplingRule": {
+                            "$ref": "#/definitions/AWS::XRay::SamplingRule.SamplingRule"
+                        },
+                        "SamplingRuleRecord": {
+                            "$ref": "#/definitions/AWS::XRay::SamplingRule.SamplingRuleRecord"
+                        },
+                        "SamplingRuleUpdate": {
+                            "$ref": "#/definitions/AWS::XRay::SamplingRule.SamplingRuleUpdate"
+                        },
+                        "Tags": {
+                            "items": {
+                                "type": "object"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::XRay::SamplingRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::XRay::SamplingRule.SamplingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "FixedRate": {
+                    "type": "number"
+                },
+                "HTTPMethod": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "ReservoirSize": {
+                    "type": "number"
+                },
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RuleARN": {
+                    "type": "string"
+                },
+                "RuleName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                },
+                "ServiceType": {
+                    "type": "string"
+                },
+                "URLPath": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::XRay::SamplingRule.SamplingRuleRecord": {
+            "additionalProperties": false,
+            "properties": {
+                "CreatedAt": {
+                    "type": "string"
+                },
+                "ModifiedAt": {
+                    "type": "string"
+                },
+                "SamplingRule": {
+                    "$ref": "#/definitions/AWS::XRay::SamplingRule.SamplingRule"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::XRay::SamplingRule.SamplingRuleUpdate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "FixedRate": {
+                    "type": "number"
+                },
+                "HTTPMethod": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "ReservoirSize": {
+                    "type": "number"
+                },
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RuleARN": {
+                    "type": "string"
+                },
+                "RuleName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                },
+                "ServiceType": {
+                    "type": "string"
+                },
+                "URLPath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "Alexa::ASK::Skill": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationConfiguration": {
+                            "$ref": "#/definitions/Alexa::ASK::Skill.AuthenticationConfiguration"
+                        },
+                        "SkillPackage": {
+                            "$ref": "#/definitions/Alexa::ASK::Skill.SkillPackage"
+                        },
+                        "VendorId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthenticationConfiguration",
+                        "SkillPackage",
+                        "VendorId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "Alexa::ASK::Skill"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "Alexa::ASK::Skill.AuthenticationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "RefreshToken": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClientId",
+                "ClientSecret",
+                "RefreshToken"
+            ],
+            "type": "object"
+        },
+        "Alexa::ASK::Skill.Overrides": {
+            "additionalProperties": false,
+            "properties": {
+                "Manifest": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "Alexa::ASK::Skill.SkillPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Overrides": {
+                    "$ref": "#/definitions/Alexa::ASK::Skill.Overrides"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3BucketRole": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                },
+                "S3ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "Parameter": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedPattern": {
+                    "type": "string"
+                },
+                "AllowedValues": {
+                    "type": "array"
+                },
+                "ConstraintDescription": {
+                    "type": "string"
+                },
+                "Default": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "MaxLength": {
+                    "type": "string"
+                },
+                "MaxValue": {
+                    "type": "string"
+                },
+                "MinLength": {
+                    "type": "string"
+                },
+                "MinValue": {
+                    "type": "string"
+                },
+                "NoEcho": {
+                    "type": [
+                        "string",
+                        "boolean"
+                    ]
+                },
+                "Type": {
+                    "enum": [
+                        "String",
+                        "Number",
+                        "List\u003cNumber\u003e",
+                        "CommaDelimitedList",
+                        "AWS::EC2::AvailabilityZone::Name",
+                        "AWS::EC2::Image::Id",
+                        "AWS::EC2::Instance::Id",
+                        "AWS::EC2::KeyPair::KeyName",
+                        "AWS::EC2::SecurityGroup::GroupName",
+                        "AWS::EC2::SecurityGroup::Id",
+                        "AWS::EC2::Subnet::Id",
+                        "AWS::EC2::Volume::Id",
+                        "AWS::EC2::VPC::Id",
+                        "AWS::Route53::HostedZone::Id",
+                        "List\u003cAWS::EC2::AvailabilityZone::Name\u003e",
+                        "List\u003cAWS::EC2::Image::Id\u003e",
+                        "List\u003cAWS::EC2::Instance::Id\u003e",
+                        "List\u003cAWS::EC2::SecurityGroup::GroupName\u003e",
+                        "List\u003cAWS::EC2::SecurityGroup::Id\u003e",
+                        "List\u003cAWS::EC2::Subnet::Id\u003e",
+                        "List\u003cAWS::EC2::Volume::Id\u003e",
+                        "List\u003cAWS::EC2::VPC::Id\u003e",
+                        "List\u003cAWS::Route53::HostedZone::Id\u003e",
+                        "List\u003cString\u003e",
+                        "AWS::SSM::Parameter::Name",
+                        "AWS::SSM::Parameter::Value\u003cString\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cString\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cCommaDelimitedList\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::AvailabilityZone::Name\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::Image::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::Instance::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::SecurityGroup::GroupName\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::SecurityGroup::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::Subnet::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::Volume::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::VPC::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::Route53::HostedZone::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::AvailabilityZone::Name\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::Image::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::Instance::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::SecurityGroup::GroupName\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::SecurityGroup::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::Subnet::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::Volume::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::VPC::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::Route53::HostedZone::Id\u003e\u003e"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "Tag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        }
+    },
+    "properties": {
+        "AWSTemplateFormatVersion": {
+            "enum": [
+                "2010-09-09"
+            ],
+            "type": "string"
+        },
+        "Conditions": {
+            "additionalProperties": false,
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "Description": {
+            "description": "Template description",
+            "maxLength": 1024,
+            "type": "string"
+        },
+        "Mappings": {
+            "additionalProperties": false,
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "Metadata": {
+            "type": "object"
+        },
+        "Outputs": {
+            "additionalProperties": false,
+            "maxProperties": 60,
+            "minProperties": 1,
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "Parameters": {
+            "additionalProperties": false,
+            "maxProperties": 50,
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "$ref": "#/definitions/Parameter"
+                }
+            },
+            "type": "object"
+        },
+        "Resources": {
+            "additionalProperties": false,
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/AWS::ACMPCA::Certificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthorityActivation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ACMPCA::Permission"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::APS::RuleGroupsNamespace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::APS::Workspace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AccessAnalyzer::Analyzer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Configuration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AmazonMQ::ConfigurationAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Amplify::App"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Amplify::Branch"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Amplify::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AmplifyUIBuilder::Theme"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Account"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::ApiKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Authorizer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::BasePathMapping"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::ClientCertificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Deployment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::DocumentationPart"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::DocumentationVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::DomainName"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::GatewayResponse"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Method"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Model"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::RequestValidator"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Resource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::RestApi"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Stage"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::UsagePlan"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::UsagePlanKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::VpcLink"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Api"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::ApiMapping"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Authorizer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Deployment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::DomainName"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Integration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::IntegrationResponse"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Model"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Route"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::RouteResponse"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Stage"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::VpcLink"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::ConfigurationProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::Deployment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::DeploymentStrategy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::Environment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::HostedConfigurationVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppFlow::Flow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppIntegrations::EventIntegration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::GatewayRoute"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::Mesh"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::Route"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualNode"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualRouter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualService"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppRunner::Service"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlock"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::ApplicationFleetAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::DirectoryConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::Fleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::ImageBuilder"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::Stack"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::StackFleetAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::StackUserAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::ApiCache"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::ApiKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::FunctionConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLSchema"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::Resolver"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApplicationInsights::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Athena::DataCatalog"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Athena::NamedQuery"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Athena::PreparedStatement"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Athena::WorkGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AuditManager::Assessment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::LaunchConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::LifecycleHook"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::ScheduledAction"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::WarmPool"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Backup::BackupPlan"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Backup::BackupSelection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Backup::BackupVault"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Backup::Framework"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Backup::ReportPlan"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Batch::ComputeEnvironment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Batch::JobDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Batch::JobQueue"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Batch::SchedulingPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Budgets::Budget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CE::AnomalyMonitor"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CE::AnomalySubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CE::CostCategory"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CUR::ReportDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cassandra::Keyspace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cassandra::Table"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CertificateManager::Account"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CertificateManager::Certificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Chatbot::SlackChannelConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cloud9::EnvironmentEC2"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::CustomResource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::Macro"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::ModuleDefaultVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::ModuleVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::PublicTypeVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::Publisher"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::ResourceDefaultVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::ResourceVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::Stack"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::TypeActivation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::WaitCondition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::WaitConditionHandle"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::CachePolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::CloudFrontOriginAccessIdentity"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::Distribution"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::Function"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::KeyGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::PublicKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::RealtimeLogConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudTrail::Trail"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::Alarm"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::CompositeAlarm"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::Dashboard"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::InsightRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::MetricStream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeArtifact::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeArtifact::Repository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeBuild::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeBuild::ReportGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeBuild::SourceCredential"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeCommit::Repository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeDeploy::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeGuruProfiler::ProfilingGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeGuruReviewer::RepositoryAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodePipeline::CustomActionType"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodePipeline::Pipeline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodePipeline::Webhook"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeStar::GitHubRepository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeStarConnections::Connection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeStarNotifications::NotificationRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::IdentityPool"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::IdentityPoolRoleAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolClient"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolDomain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolIdentityProvider"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolResourceServer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolUICustomizationAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolUser"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolUserToGroupAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::AggregationAuthorization"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::ConfigRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::ConfigurationAggregator"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::ConfigurationRecorder"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::ConformancePack"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::DeliveryChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::OrganizationConfigRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::OrganizationConformancePack"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::RemediationConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::StoredQuery"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::ContactFlow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::ContactFlowModule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::HoursOfOperation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::QuickConnect"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::UserHierarchyGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CustomerProfiles::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CustomerProfiles::Integration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CustomerProfiles::ObjectType"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DAX::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DAX::ParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DAX::SubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DLM::LifecyclePolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::Certificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::EventSubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::ReplicationInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::ReplicationSubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::ReplicationTask"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Dataset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Job"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Recipe"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Ruleset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Schedule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataPipeline::Pipeline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::Agent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationEFS"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationFSxWindows"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationHDFS"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationNFS"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationObjectStorage"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationS3"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationSMB"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::Task"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Detective::Graph"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Detective::MemberInvitation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DevOpsGuru::NotificationChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DevOpsGuru::ResourceCollection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DirectoryService::MicrosoftAD"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DirectoryService::SimpleAD"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DocDB::DBCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DocDB::DBClusterParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DocDB::DBInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DocDB::DBSubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::CapacityReservation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::CapacityReservationFleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::CarrierGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnAuthorizationRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnRoute"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnTargetNetworkAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::CustomerGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::DHCPOptions"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::EC2Fleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::EIP"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::EIPAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::EgressOnlyInternetGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::EnclaveCertificateIamRoleAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::FlowLog"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::GatewayRouteTableAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::Host"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::IPAM"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::IPAMAllocation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::IPAMPool"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::IPAMScope"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::Instance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::InternetGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::LaunchTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::LocalGatewayRoute"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::LocalGatewayRouteTableVPCAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NatGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkAcl"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkAclEntry"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkInsightsPath"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkInterface"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkInterfaceAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkInterfacePermission"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::PlacementGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::PrefixList"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::Route"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::RouteTable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SecurityGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SecurityGroupEgress"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SecurityGroupIngress"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SpotFleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::Subnet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SubnetCidrBlock"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SubnetNetworkAclAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SubnetRouteTableAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilterRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorSession"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorTarget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayConnect"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayMulticastDomain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayMulticastDomainAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayMulticastGroupMember"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayMulticastGroupSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayPeeringAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayRoute"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayRouteTable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayRouteTableAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayRouteTablePropagation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayVpcAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPC"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCCidrBlock"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCDHCPOptionsAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCEndpointConnectionNotification"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCEndpointService"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCEndpointServicePermissions"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCGatewayAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCPeeringConnection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPNConnection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPNConnectionRoute"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPNGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPNGatewayRoutePropagation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::Volume"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VolumeAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECR::PublicRepository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECR::RegistryPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECR::ReplicationConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECR::Repository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::CapacityProvider"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::ClusterCapacityProviderAssociations"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::PrimaryTaskSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::Service"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::TaskDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::TaskSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EFS::AccessPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EFS::FileSystem"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EFS::MountTarget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EKS::Addon"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EKS::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EKS::FargateProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EKS::Nodegroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::SecurityConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::Step"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::Studio"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::StudioSessionMapping"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMRContainers::VirtualCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::CacheCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::GlobalReplicationGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::ParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::SecurityGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::SecurityGroupIngress"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::SubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::UserGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::ApplicationVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::ConfigurationTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::Environment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerCertificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::LoadBalancer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::TargetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EventSchemas::Discoverer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EventSchemas::Registry"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EventSchemas::RegistryPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EventSchemas::Schema"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::ApiDestination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::Archive"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::Connection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::EventBus"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::EventBusPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::Rule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Evidently::Experiment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Evidently::Feature"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Evidently::Launch"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Evidently::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FIS::ExperimentTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FMS::NotificationChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FMS::Policy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FSx::FileSystem"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FinSpace::Environment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::Detector"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::EntityType"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::EventType"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::Label"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::Outcome"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::Variable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::Alias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::Build"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::Fleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::GameServerGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::GameSessionQueue"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::MatchmakingConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::MatchmakingRuleSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::Script"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GlobalAccelerator::Accelerator"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GlobalAccelerator::EndpointGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GlobalAccelerator::Listener"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Classifier"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Connection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Crawler"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::DataCatalogEncryptionSettings"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Database"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::DevEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Job"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::MLTransform"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Partition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Registry"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Schema"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::SchemaVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::SchemaVersionMetadata"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::SecurityConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Table"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Trigger"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Workflow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::ConnectorDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::ConnectorDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::CoreDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::CoreDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::DeviceDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::DeviceDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::Group"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::GroupVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::LoggerDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::LoggerDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::SubscriptionDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::SubscriptionDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GroundStation::Config"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GroundStation::DataflowEndpointGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GroundStation::MissionProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::Detector"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::Filter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::IPSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::Master"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::Member"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::ThreatIntelSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::HealthLake::FHIRDatastore"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::AccessKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::Group"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::InstanceProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::ManagedPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::OIDCProvider"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::Policy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::Role"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::SAMLProvider"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::ServerCertificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::ServiceLinkedRole"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::UserToGroupAddition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::VirtualMFADevice"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::Channel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::PlaybackKeyPair"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::StreamKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::Component"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::DistributionConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::Image"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ImagePipeline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::InfrastructureConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Inspector::AssessmentTarget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Inspector::AssessmentTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Inspector::ResourceGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT1Click::Device"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT1Click::Placement"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT1Click::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Authorizer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Certificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::CustomMetric"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Dimension"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::DomainConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::FleetMetric"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::JobTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Logging"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::MitigationAction"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Policy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::PolicyPrincipalAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::ProvisioningTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::ResourceSpecificLogging"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::ScheduledAudit"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::SecurityProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Thing"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::ThingPrincipalAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::TopicRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::TopicRuleDestination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Channel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Dataset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Datastore"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTCoreDeviceAdvisor::SuiteDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTEvents::DetectorModel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTEvents::Input"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTFleetHub::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Asset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Dashboard"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Gateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Portal"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTThingsGraph::FlowTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::Destination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::DeviceProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::FuotaTask"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::MulticastGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::PartnerAccount"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::ServiceProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::WirelessGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KMS::Alias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KMS::Key"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KMS::ReplicaKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Kendra::DataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Kendra::Faq"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Kendra::Index"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Kinesis::Stream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Kinesis::StreamConsumer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalytics::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LakeFormation::DataLakeSettings"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LakeFormation::Permissions"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LakeFormation::Resource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::Alias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::CodeSigningConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::EventInvokeConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::Function"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::LayerVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::LayerVersionPermission"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::Permission"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::Version"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LicenseManager::Grant"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LicenseManager::License"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lightsail::Database"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lightsail::Disk"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lightsail::Instance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lightsail::StaticIp"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::GeofenceCollection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::Map"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::PlaceIndex"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::RouteCalculator"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::Tracker"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::TrackerConsumer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::Destination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::LogGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::LogStream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::MetricFilter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::QueryDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::ResourcePolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::SubscriptionFilter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LookoutEquipment::InferenceScheduler"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LookoutMetrics::Alert"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LookoutVision::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MSK::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MWAA::Environment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Macie::CustomDataIdentifier"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Macie::FindingsFilter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Macie::Session"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ManagedBlockchain::Member"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ManagedBlockchain::Node"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowEntitlement"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowOutput"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowVpcInterface"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConvert::JobTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConvert::Preset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConvert::Queue"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::Channel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::Input"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::InputSecurityGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaPackage::Asset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaPackage::Channel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaStore::Container"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MemoryDB::ACL"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MemoryDB::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MemoryDB::ParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MemoryDB::SubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MemoryDB::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::DBCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::DBClusterParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::DBInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::DBParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::DBSubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::Firewall"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::LoggingConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::CustomerGatewayAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::Device"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::GlobalNetwork"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::Link"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::LinkAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::Site"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::TransitGatewayRegistration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NimbleStudio::LaunchProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NimbleStudio::StreamingImage"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NimbleStudio::Studio"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::App"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::ElasticLoadBalancerAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::Instance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::Layer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::Stack"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::UserProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::Volume"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorksCM::Server"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Panorama::ApplicationInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Panorama::Package"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Panorama::PackageVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::ADMChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::APNSChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::APNSSandboxChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::APNSVoipChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::APNSVoipSandboxChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::App"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::ApplicationSettings"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::BaiduChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::Campaign"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::EmailChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::EmailTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::EventStream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::GCMChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::SMSChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::Segment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::SmsTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::VoiceChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PinpointEmail::DedicatedIpPool"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PinpointEmail::Identity"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QLDB::Ledger"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QLDB::Stream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Analysis"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Dashboard"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Template"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Theme"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RAM::ResourceShare"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBClusterParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBProxy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBProxyEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBProxyTargetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBSecurityGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBSecurityGroupIngress"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBSubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::EventSubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::GlobalCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::OptionGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RUM::AppMonitor"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::ClusterParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::ClusterSecurityGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::ClusterSecurityGroupIngress"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::ClusterSubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::EndpointAccess"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::EndpointAuthorization"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::EventSubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::ScheduledAction"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Environment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Route"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Service"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Rekognition::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ResilienceHub::App"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ResilienceHub::ResiliencyPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ResourceGroups::Group"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::Fleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::Robot"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::RobotApplication"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::RobotApplicationVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::SimulationApplication"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::SimulationApplicationVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::DNSSEC"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::HealthCheck"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::HostedZone"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::KeySigningKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::RecordSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::RecordSetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::ControlPanel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::RoutingControl"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::SafetyRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryReadiness::Cell"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ReadinessCheck"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryReadiness::RecoveryGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::FirewallDomainList"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::FirewallRuleGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::FirewallRuleGroupAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverDNSSECConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverQueryLoggingConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverRuleAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::AccessPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::Bucket"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::BucketPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::MultiRegionAccessPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::MultiRegionAccessPointPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::StorageLens"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3ObjectLambda::AccessPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3ObjectLambda::AccessPointPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3Outposts::AccessPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3Outposts::Bucket"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3Outposts::BucketPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3Outposts::Endpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SDB::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ConfigurationSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ContactList"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ReceiptFilter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ReceiptRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ReceiptRuleSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::Template"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SNS::Subscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SNS::Topic"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SNS::TopicPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SQS::Queue"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SQS::QueuePolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::Association"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::Document"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::MaintenanceWindow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTarget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::Parameter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::PatchBaseline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::ResourceDataSync"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSMContacts::Contact"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSMContacts::ContactChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSMIncidents::ReplicationSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::Assignment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::InstanceAccessControlAttributeConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::PermissionSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::App"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::CodeRepository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Device"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::DeviceFleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Endpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::EndpointConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::FeatureGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Image"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::ImageVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Model"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelPackageGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::NotebookInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::NotebookInstanceLifecycleConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Pipeline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::UserProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Workteam"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecretsManager::ResourcePolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecretsManager::RotationSchedule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecretsManager::Secret"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecretsManager::SecretTargetAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::Hub"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Api"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::LayerVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::SimpleTable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::StateMachine"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::AcceptedPortfolioShare"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::CloudFormationProduct"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::CloudFormationProvisionedProduct"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::LaunchNotificationConstraint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::LaunchRoleConstraint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::LaunchTemplateConstraint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::Portfolio"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::PortfolioPrincipalAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::PortfolioProductAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::PortfolioShare"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::ResourceUpdateConstraint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::ServiceAction"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::ServiceActionAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::StackSetConstraint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::TagOption"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::TagOptionAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalogAppRegistry::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalogAppRegistry::AttributeGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalogAppRegistry::ResourceAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::HttpNamespace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::Instance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::PrivateDnsNamespace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::PublicDnsNamespace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::Service"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Signer::ProfilePermission"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Signer::SigningProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::StepFunctions::Activity"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Timestream::Database"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Timestream::ScheduledQuery"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Timestream::Table"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Transfer::Server"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Transfer::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Transfer::Workflow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::ByteMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::IPSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::Rule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::SizeConstraintSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::SqlInjectionMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::WebACL"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::XssMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::ByteMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::GeoMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::IPSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::RateBasedRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::RegexPatternSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::Rule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::SizeConstraintSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::SqlInjectionMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::WebACL"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::WebACLAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::XssMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::IPSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::LoggingConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::RegexPatternSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::RuleGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACLAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Wisdom::Assistant"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Wisdom::AssistantAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Wisdom::KnowledgeBase"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WorkSpaces::ConnectionAlias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WorkSpaces::Workspace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::XRay::Group"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::XRay::SamplingRule"
+                        },
+                        {
+                            "$ref": "#/definitions/Alexa::ASK::Skill"
+                        }
+                    ]
+                }
+            },
+            "type": "object"
+        },
+        "Transform": {
+            "enum": [
+                "AWS::Serverless-2016-10-31"
+            ],
+            "type": "string"
+        }
+    },
+    "required": [
+        "Transform",
+        "Resources"
+    ],
+    "type": "object"
+}`
diff --git a/goformation/schema/sam.schema.json b/goformation/schema/sam.schema.json
new file mode 100644
index 0000000000..8ca64e0b4b
--- /dev/null
+++ b/goformation/schema/sam.schema.json
@@ -0,0 +1,126240 @@
+{
+    "$id": "http://json-schema.org/draft-04/schema#",
+    "additionalProperties": false,
+    "definitions": {
+        "AWS::ACMPCA::Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiPassthrough": {
+                            "$ref": "#/definitions/AWS::ACMPCA::Certificate.ApiPassthrough"
+                        },
+                        "CertificateAuthorityArn": {
+                            "type": "string"
+                        },
+                        "CertificateSigningRequest": {
+                            "type": "string"
+                        },
+                        "SigningAlgorithm": {
+                            "type": "string"
+                        },
+                        "TemplateArn": {
+                            "type": "string"
+                        },
+                        "Validity": {
+                            "$ref": "#/definitions/AWS::ACMPCA::Certificate.Validity"
+                        },
+                        "ValidityNotBefore": {
+                            "$ref": "#/definitions/AWS::ACMPCA::Certificate.Validity"
+                        }
+                    },
+                    "required": [
+                        "CertificateAuthorityArn",
+                        "CertificateSigningRequest",
+                        "SigningAlgorithm",
+                        "Validity"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ACMPCA::Certificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.ApiPassthrough": {
+            "additionalProperties": false,
+            "properties": {
+                "Extensions": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.Extensions"
+                },
+                "Subject": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.Subject"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.EdiPartyName": {
+            "additionalProperties": false,
+            "properties": {
+                "NameAssigner": {
+                    "type": "string"
+                },
+                "PartyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NameAssigner",
+                "PartyName"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.ExtendedKeyUsage": {
+            "additionalProperties": false,
+            "properties": {
+                "ExtendedKeyUsageObjectIdentifier": {
+                    "type": "string"
+                },
+                "ExtendedKeyUsageType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.Extensions": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificatePolicies": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ACMPCA::Certificate.PolicyInformation"
+                    },
+                    "type": "array"
+                },
+                "ExtendedKeyUsage": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ACMPCA::Certificate.ExtendedKeyUsage"
+                    },
+                    "type": "array"
+                },
+                "KeyUsage": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.KeyUsage"
+                },
+                "SubjectAlternativeNames": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ACMPCA::Certificate.GeneralName"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.GeneralName": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.Subject"
+                },
+                "DnsName": {
+                    "type": "string"
+                },
+                "EdiPartyName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.EdiPartyName"
+                },
+                "IpAddress": {
+                    "type": "string"
+                },
+                "OtherName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.OtherName"
+                },
+                "RegisteredId": {
+                    "type": "string"
+                },
+                "Rfc822Name": {
+                    "type": "string"
+                },
+                "UniformResourceIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.KeyUsage": {
+            "additionalProperties": false,
+            "properties": {
+                "CRLSign": {
+                    "type": "boolean"
+                },
+                "DataEncipherment": {
+                    "type": "boolean"
+                },
+                "DecipherOnly": {
+                    "type": "boolean"
+                },
+                "DigitalSignature": {
+                    "type": "boolean"
+                },
+                "EncipherOnly": {
+                    "type": "boolean"
+                },
+                "KeyAgreement": {
+                    "type": "boolean"
+                },
+                "KeyCertSign": {
+                    "type": "boolean"
+                },
+                "KeyEncipherment": {
+                    "type": "boolean"
+                },
+                "NonRepudiation": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.OtherName": {
+            "additionalProperties": false,
+            "properties": {
+                "TypeId": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TypeId",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.PolicyInformation": {
+            "additionalProperties": false,
+            "properties": {
+                "CertPolicyId": {
+                    "type": "string"
+                },
+                "PolicyQualifiers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ACMPCA::Certificate.PolicyQualifierInfo"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CertPolicyId"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.PolicyQualifierInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "PolicyQualifierId": {
+                    "type": "string"
+                },
+                "Qualifier": {
+                    "$ref": "#/definitions/AWS::ACMPCA::Certificate.Qualifier"
+                }
+            },
+            "required": [
+                "PolicyQualifierId",
+                "Qualifier"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.Qualifier": {
+            "additionalProperties": false,
+            "properties": {
+                "CpsUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CpsUri"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.Subject": {
+            "additionalProperties": false,
+            "properties": {
+                "CommonName": {
+                    "type": "string"
+                },
+                "Country": {
+                    "type": "string"
+                },
+                "DistinguishedNameQualifier": {
+                    "type": "string"
+                },
+                "GenerationQualifier": {
+                    "type": "string"
+                },
+                "GivenName": {
+                    "type": "string"
+                },
+                "Initials": {
+                    "type": "string"
+                },
+                "Locality": {
+                    "type": "string"
+                },
+                "Organization": {
+                    "type": "string"
+                },
+                "OrganizationalUnit": {
+                    "type": "string"
+                },
+                "Pseudonym": {
+                    "type": "string"
+                },
+                "SerialNumber": {
+                    "type": "string"
+                },
+                "State": {
+                    "type": "string"
+                },
+                "Surname": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::Certificate.Validity": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CsrExtensions": {
+                            "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.CsrExtensions"
+                        },
+                        "KeyAlgorithm": {
+                            "type": "string"
+                        },
+                        "KeyStorageSecurityStandard": {
+                            "type": "string"
+                        },
+                        "RevocationConfiguration": {
+                            "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.RevocationConfiguration"
+                        },
+                        "SigningAlgorithm": {
+                            "type": "string"
+                        },
+                        "Subject": {
+                            "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.Subject"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "KeyAlgorithm",
+                        "SigningAlgorithm",
+                        "Subject",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ACMPCA::CertificateAuthority"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.AccessDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessLocation": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.GeneralName"
+                },
+                "AccessMethod": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.AccessMethod"
+                }
+            },
+            "required": [
+                "AccessLocation",
+                "AccessMethod"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.AccessMethod": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessMethodType": {
+                    "type": "string"
+                },
+                "CustomObjectIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.CrlConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomCname": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "ExpirationInDays": {
+                    "type": "number"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3ObjectAcl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.CsrExtensions": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyUsage": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.KeyUsage"
+                },
+                "SubjectInformationAccess": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.AccessDescription"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.EdiPartyName": {
+            "additionalProperties": false,
+            "properties": {
+                "NameAssigner": {
+                    "type": "string"
+                },
+                "PartyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NameAssigner",
+                "PartyName"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.GeneralName": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.Subject"
+                },
+                "DnsName": {
+                    "type": "string"
+                },
+                "EdiPartyName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.EdiPartyName"
+                },
+                "IpAddress": {
+                    "type": "string"
+                },
+                "OtherName": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.OtherName"
+                },
+                "RegisteredId": {
+                    "type": "string"
+                },
+                "Rfc822Name": {
+                    "type": "string"
+                },
+                "UniformResourceIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.KeyUsage": {
+            "additionalProperties": false,
+            "properties": {
+                "CRLSign": {
+                    "type": "boolean"
+                },
+                "DataEncipherment": {
+                    "type": "boolean"
+                },
+                "DecipherOnly": {
+                    "type": "boolean"
+                },
+                "DigitalSignature": {
+                    "type": "boolean"
+                },
+                "EncipherOnly": {
+                    "type": "boolean"
+                },
+                "KeyAgreement": {
+                    "type": "boolean"
+                },
+                "KeyCertSign": {
+                    "type": "boolean"
+                },
+                "KeyEncipherment": {
+                    "type": "boolean"
+                },
+                "NonRepudiation": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.OcspConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "OcspCustomCname": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.OtherName": {
+            "additionalProperties": false,
+            "properties": {
+                "TypeId": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TypeId",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.RevocationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrlConfiguration": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.CrlConfiguration"
+                },
+                "OcspConfiguration": {
+                    "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority.OcspConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthority.Subject": {
+            "additionalProperties": false,
+            "properties": {
+                "CommonName": {
+                    "type": "string"
+                },
+                "Country": {
+                    "type": "string"
+                },
+                "DistinguishedNameQualifier": {
+                    "type": "string"
+                },
+                "GenerationQualifier": {
+                    "type": "string"
+                },
+                "GivenName": {
+                    "type": "string"
+                },
+                "Initials": {
+                    "type": "string"
+                },
+                "Locality": {
+                    "type": "string"
+                },
+                "Organization": {
+                    "type": "string"
+                },
+                "OrganizationalUnit": {
+                    "type": "string"
+                },
+                "Pseudonym": {
+                    "type": "string"
+                },
+                "SerialNumber": {
+                    "type": "string"
+                },
+                "State": {
+                    "type": "string"
+                },
+                "Surname": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ACMPCA::CertificateAuthorityActivation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "CertificateAuthorityArn": {
+                            "type": "string"
+                        },
+                        "CertificateChain": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Certificate",
+                        "CertificateAuthorityArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ACMPCA::CertificateAuthorityActivation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ACMPCA::Permission": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "CertificateAuthorityArn": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        },
+                        "SourceAccount": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Actions",
+                        "CertificateAuthorityArn",
+                        "Principal"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ACMPCA::Permission"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::APS::RuleGroupsNamespace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Data": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Workspace": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Data",
+                        "Name",
+                        "Workspace"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::APS::RuleGroupsNamespace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::APS::Workspace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AlertManagerDefinition": {
+                            "type": "string"
+                        },
+                        "Alias": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::APS::Workspace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AccessAnalyzer::Analyzer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AnalyzerName": {
+                            "type": "string"
+                        },
+                        "ArchiveRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AccessAnalyzer::Analyzer.ArchiveRule"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AccessAnalyzer::Analyzer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AccessAnalyzer::Analyzer.ArchiveRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Filter": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AccessAnalyzer::Analyzer.Filter"
+                    },
+                    "type": "array"
+                },
+                "RuleName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Filter",
+                "RuleName"
+            ],
+            "type": "object"
+        },
+        "AWS::AccessAnalyzer::Analyzer.Filter": {
+            "additionalProperties": false,
+            "properties": {
+                "Contains": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Eq": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Exists": {
+                    "type": "boolean"
+                },
+                "Neq": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Property": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Property"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationStrategy": {
+                            "type": "string"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "BrokerName": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker.ConfigurationId"
+                        },
+                        "DeploymentMode": {
+                            "type": "string"
+                        },
+                        "EncryptionOptions": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker.EncryptionOptions"
+                        },
+                        "EngineType": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "HostInstanceType": {
+                            "type": "string"
+                        },
+                        "LdapServerMetadata": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker.LdapServerMetadata"
+                        },
+                        "Logs": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker.LogList"
+                        },
+                        "MaintenanceWindowStartTime": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker.MaintenanceWindow"
+                        },
+                        "PubliclyAccessible": {
+                            "type": "boolean"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "StorageType": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmazonMQ::Broker.TagsEntry"
+                            },
+                            "type": "array"
+                        },
+                        "Users": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmazonMQ::Broker.User"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AutoMinorVersionUpgrade",
+                        "BrokerName",
+                        "DeploymentMode",
+                        "EngineType",
+                        "EngineVersion",
+                        "HostInstanceType",
+                        "PubliclyAccessible",
+                        "Users"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AmazonMQ::Broker"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.ConfigurationId": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Revision": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Id",
+                "Revision"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.EncryptionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "UseAwsOwnedKey": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "UseAwsOwnedKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.LdapServerMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Hosts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RoleBase": {
+                    "type": "string"
+                },
+                "RoleName": {
+                    "type": "string"
+                },
+                "RoleSearchMatching": {
+                    "type": "string"
+                },
+                "RoleSearchSubtree": {
+                    "type": "boolean"
+                },
+                "ServiceAccountPassword": {
+                    "type": "string"
+                },
+                "ServiceAccountUsername": {
+                    "type": "string"
+                },
+                "UserBase": {
+                    "type": "string"
+                },
+                "UserRoleName": {
+                    "type": "string"
+                },
+                "UserSearchMatching": {
+                    "type": "string"
+                },
+                "UserSearchSubtree": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Hosts",
+                "RoleBase",
+                "RoleSearchMatching",
+                "ServiceAccountPassword",
+                "ServiceAccountUsername",
+                "UserBase",
+                "UserSearchMatching"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.LogList": {
+            "additionalProperties": false,
+            "properties": {
+                "Audit": {
+                    "type": "boolean"
+                },
+                "General": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.MaintenanceWindow": {
+            "additionalProperties": false,
+            "properties": {
+                "DayOfWeek": {
+                    "type": "string"
+                },
+                "TimeOfDay": {
+                    "type": "string"
+                },
+                "TimeZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DayOfWeek",
+                "TimeOfDay",
+                "TimeZone"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Broker.User": {
+            "additionalProperties": false,
+            "properties": {
+                "ConsoleAccess": {
+                    "type": "boolean"
+                },
+                "Groups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationStrategy": {
+                            "type": "string"
+                        },
+                        "Data": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EngineType": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmazonMQ::Configuration.TagsEntry"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Data",
+                        "EngineType",
+                        "EngineVersion",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AmazonMQ::Configuration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::Configuration.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::ConfigurationAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Broker": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::AmazonMQ::ConfigurationAssociation.ConfigurationId"
+                        }
+                    },
+                    "required": [
+                        "Broker",
+                        "Configuration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AmazonMQ::ConfigurationAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AmazonMQ::ConfigurationAssociation.ConfigurationId": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Revision": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Id",
+                "Revision"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::App": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessToken": {
+                            "type": "string"
+                        },
+                        "AutoBranchCreationConfig": {
+                            "$ref": "#/definitions/AWS::Amplify::App.AutoBranchCreationConfig"
+                        },
+                        "BasicAuthConfig": {
+                            "$ref": "#/definitions/AWS::Amplify::App.BasicAuthConfig"
+                        },
+                        "BuildSpec": {
+                            "type": "string"
+                        },
+                        "CustomHeaders": {
+                            "type": "string"
+                        },
+                        "CustomRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Amplify::App.CustomRule"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnableBranchAutoDeletion": {
+                            "type": "boolean"
+                        },
+                        "EnvironmentVariables": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Amplify::App.EnvironmentVariable"
+                            },
+                            "type": "array"
+                        },
+                        "IAMServiceRole": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OauthToken": {
+                            "type": "string"
+                        },
+                        "Repository": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Amplify::App"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::App.AutoBranchCreationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoBranchCreationPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BasicAuthConfig": {
+                    "$ref": "#/definitions/AWS::Amplify::App.BasicAuthConfig"
+                },
+                "BuildSpec": {
+                    "type": "string"
+                },
+                "EnableAutoBranchCreation": {
+                    "type": "boolean"
+                },
+                "EnableAutoBuild": {
+                    "type": "boolean"
+                },
+                "EnablePerformanceMode": {
+                    "type": "boolean"
+                },
+                "EnablePullRequestPreview": {
+                    "type": "boolean"
+                },
+                "EnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Amplify::App.EnvironmentVariable"
+                    },
+                    "type": "array"
+                },
+                "PullRequestEnvironmentName": {
+                    "type": "string"
+                },
+                "Stage": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Amplify::App.BasicAuthConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableBasicAuth": {
+                    "type": "boolean"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Amplify::App.CustomRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Source",
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::App.EnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::Branch": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppId": {
+                            "type": "string"
+                        },
+                        "BasicAuthConfig": {
+                            "$ref": "#/definitions/AWS::Amplify::Branch.BasicAuthConfig"
+                        },
+                        "BranchName": {
+                            "type": "string"
+                        },
+                        "BuildSpec": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnableAutoBuild": {
+                            "type": "boolean"
+                        },
+                        "EnablePerformanceMode": {
+                            "type": "boolean"
+                        },
+                        "EnablePullRequestPreview": {
+                            "type": "boolean"
+                        },
+                        "EnvironmentVariables": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Amplify::Branch.EnvironmentVariable"
+                            },
+                            "type": "array"
+                        },
+                        "PullRequestEnvironmentName": {
+                            "type": "string"
+                        },
+                        "Stage": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AppId",
+                        "BranchName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Amplify::Branch"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::Branch.BasicAuthConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableBasicAuth": {
+                    "type": "boolean"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::Branch.EnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppId": {
+                            "type": "string"
+                        },
+                        "AutoSubDomainCreationPatterns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AutoSubDomainIAMRole": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EnableAutoSubDomain": {
+                            "type": "boolean"
+                        },
+                        "SubDomainSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Amplify::Domain.SubDomainSetting"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AppId",
+                        "DomainName",
+                        "SubDomainSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Amplify::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Amplify::Domain.SubDomainSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "BranchName": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BranchName",
+                "Prefix"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BindingProperties": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValue"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Children": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentChild"
+                            },
+                            "type": "array"
+                        },
+                        "CollectionProperties": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentDataConfiguration"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ComponentType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Overrides": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentOverridesValue"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Properties": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentProperty"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "SourceId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Variants": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentVariant"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AmplifyUIBuilder::Component"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValue": {
+            "additionalProperties": false,
+            "properties": {
+                "BindingProperties": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValueProperties"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentBindingPropertiesValueProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Field": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Model": {
+                    "type": "string"
+                },
+                "Predicates": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.Predicate"
+                    },
+                    "type": "array"
+                },
+                "UserAttribute": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentChild": {
+            "additionalProperties": false,
+            "properties": {
+                "Children": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentChild"
+                    },
+                    "type": "array"
+                },
+                "ComponentType": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Properties": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentProperties"
+                }
+            },
+            "required": [
+                "ComponentType",
+                "Name",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentConditionProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Else": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentProperty"
+                },
+                "Field": {
+                    "type": "string"
+                },
+                "Operand": {
+                    "type": "string"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Property": {
+                    "type": "string"
+                },
+                "Then": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentProperty"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentDataConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Identifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Model": {
+                    "type": "string"
+                },
+                "Predicate": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.Predicate"
+                },
+                "Sort": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.SortProperty"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Model"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentOverrides": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentOverridesValue": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentProperties": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "BindingProperties": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentPropertyBindingProperties"
+                },
+                "Bindings": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.FormBindings"
+                },
+                "CollectionBindingProperties": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentPropertyBindingProperties"
+                },
+                "Concat": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentProperty"
+                    },
+                    "type": "array"
+                },
+                "Condition": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentConditionProperty"
+                },
+                "Configured": {
+                    "type": "boolean"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Event": {
+                    "type": "string"
+                },
+                "ImportedValue": {
+                    "type": "string"
+                },
+                "Model": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "UserAttribute": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentPropertyBindingProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Field": {
+                    "type": "string"
+                },
+                "Property": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Property"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "Overrides": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentOverrides"
+                },
+                "VariantValues": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.ComponentVariantValues"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.ComponentVariantValues": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.FormBindings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.Predicate": {
+            "additionalProperties": false,
+            "properties": {
+                "And": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.Predicate"
+                    },
+                    "type": "array"
+                },
+                "Field": {
+                    "type": "string"
+                },
+                "Operand": {
+                    "type": "string"
+                },
+                "Operator": {
+                    "type": "string"
+                },
+                "Or": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component.Predicate"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Component.SortProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Direction": {
+                    "type": "string"
+                },
+                "Field": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Direction",
+                "Field"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Theme": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Overrides": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmplifyUIBuilder::Theme.ThemeValues"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Values": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AmplifyUIBuilder::Theme.ThemeValues"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Values"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AmplifyUIBuilder::Theme"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Theme.ThemeValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Children": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AmplifyUIBuilder::Theme.ThemeValues"
+                    },
+                    "type": "array"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AmplifyUIBuilder::Theme.ThemeValues": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::AmplifyUIBuilder::Theme.ThemeValue"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Account": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CloudWatchRoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Account"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::ApiKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomerId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "GenerateDistinctId": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "StageKeys": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApiGateway::ApiKey.StageKey"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Value": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::ApiKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::ApiKey.StageKey": {
+            "additionalProperties": false,
+            "properties": {
+                "RestApiId": {
+                    "type": "string"
+                },
+                "StageName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Authorizer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthType": {
+                            "type": "string"
+                        },
+                        "AuthorizerCredentials": {
+                            "type": "string"
+                        },
+                        "AuthorizerResultTtlInSeconds": {
+                            "type": "number"
+                        },
+                        "AuthorizerUri": {
+                            "type": "string"
+                        },
+                        "IdentitySource": {
+                            "type": "string"
+                        },
+                        "IdentityValidationExpression": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ProviderARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "RestApiId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Authorizer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::BasePathMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BasePath": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "Stage": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::BasePathMapping"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::ClientCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::ClientCertificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeploymentCanarySettings": {
+                            "$ref": "#/definitions/AWS::ApiGateway::Deployment.DeploymentCanarySettings"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "StageDescription": {
+                            "$ref": "#/definitions/AWS::ApiGateway::Deployment.StageDescription"
+                        },
+                        "StageName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Deployment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment.AccessLogSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment.CanarySetting": {
+            "additionalProperties": false,
+            "properties": {
+                "PercentTraffic": {
+                    "type": "number"
+                },
+                "StageVariableOverrides": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "UseStageCache": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment.DeploymentCanarySettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PercentTraffic": {
+                    "type": "number"
+                },
+                "StageVariableOverrides": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "UseStageCache": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment.MethodSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "CacheDataEncrypted": {
+                    "type": "boolean"
+                },
+                "CacheTtlInSeconds": {
+                    "type": "number"
+                },
+                "CachingEnabled": {
+                    "type": "boolean"
+                },
+                "DataTraceEnabled": {
+                    "type": "boolean"
+                },
+                "HttpMethod": {
+                    "type": "string"
+                },
+                "LoggingLevel": {
+                    "type": "string"
+                },
+                "MetricsEnabled": {
+                    "type": "boolean"
+                },
+                "ResourcePath": {
+                    "type": "string"
+                },
+                "ThrottlingBurstLimit": {
+                    "type": "number"
+                },
+                "ThrottlingRateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Deployment.StageDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessLogSetting": {
+                    "$ref": "#/definitions/AWS::ApiGateway::Deployment.AccessLogSetting"
+                },
+                "CacheClusterEnabled": {
+                    "type": "boolean"
+                },
+                "CacheClusterSize": {
+                    "type": "string"
+                },
+                "CacheDataEncrypted": {
+                    "type": "boolean"
+                },
+                "CacheTtlInSeconds": {
+                    "type": "number"
+                },
+                "CachingEnabled": {
+                    "type": "boolean"
+                },
+                "CanarySetting": {
+                    "$ref": "#/definitions/AWS::ApiGateway::Deployment.CanarySetting"
+                },
+                "ClientCertificateId": {
+                    "type": "string"
+                },
+                "DataTraceEnabled": {
+                    "type": "boolean"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DocumentationVersion": {
+                    "type": "string"
+                },
+                "LoggingLevel": {
+                    "type": "string"
+                },
+                "MethodSettings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApiGateway::Deployment.MethodSetting"
+                    },
+                    "type": "array"
+                },
+                "MetricsEnabled": {
+                    "type": "boolean"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                },
+                "ThrottlingBurstLimit": {
+                    "type": "number"
+                },
+                "ThrottlingRateLimit": {
+                    "type": "number"
+                },
+                "TracingEnabled": {
+                    "type": "boolean"
+                },
+                "Variables": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::DocumentationPart": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Location": {
+                            "$ref": "#/definitions/AWS::ApiGateway::DocumentationPart.Location"
+                        },
+                        "Properties": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Location",
+                        "Properties",
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::DocumentationPart"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::DocumentationPart.Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Method": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::DocumentationVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DocumentationVersion": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DocumentationVersion",
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::DocumentationVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::DomainName": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CertificateArn": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EndpointConfiguration": {
+                            "$ref": "#/definitions/AWS::ApiGateway::DomainName.EndpointConfiguration"
+                        },
+                        "MutualTlsAuthentication": {
+                            "$ref": "#/definitions/AWS::ApiGateway::DomainName.MutualTlsAuthentication"
+                        },
+                        "OwnershipVerificationCertificateArn": {
+                            "type": "string"
+                        },
+                        "RegionalCertificateArn": {
+                            "type": "string"
+                        },
+                        "SecurityPolicy": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::DomainName"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::DomainName.EndpointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Types": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::DomainName.MutualTlsAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "TruststoreUri": {
+                    "type": "string"
+                },
+                "TruststoreVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::GatewayResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResponseParameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ResponseTemplates": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ResponseType": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "StatusCode": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResponseType",
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::GatewayResponse"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Method": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiKeyRequired": {
+                            "type": "boolean"
+                        },
+                        "AuthorizationScopes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AuthorizationType": {
+                            "type": "string"
+                        },
+                        "AuthorizerId": {
+                            "type": "string"
+                        },
+                        "HttpMethod": {
+                            "type": "string"
+                        },
+                        "Integration": {
+                            "$ref": "#/definitions/AWS::ApiGateway::Method.Integration"
+                        },
+                        "MethodResponses": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApiGateway::Method.MethodResponse"
+                            },
+                            "type": "array"
+                        },
+                        "OperationName": {
+                            "type": "string"
+                        },
+                        "RequestModels": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "RequestParameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "boolean"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "RequestValidatorId": {
+                            "type": "string"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "HttpMethod",
+                        "ResourceId",
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Method"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Method.Integration": {
+            "additionalProperties": false,
+            "properties": {
+                "CacheKeyParameters": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CacheNamespace": {
+                    "type": "string"
+                },
+                "ConnectionId": {
+                    "type": "string"
+                },
+                "ConnectionType": {
+                    "type": "string"
+                },
+                "ContentHandling": {
+                    "type": "string"
+                },
+                "Credentials": {
+                    "type": "string"
+                },
+                "IntegrationHttpMethod": {
+                    "type": "string"
+                },
+                "IntegrationResponses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApiGateway::Method.IntegrationResponse"
+                    },
+                    "type": "array"
+                },
+                "PassthroughBehavior": {
+                    "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"
+                },
+                "TimeoutInMillis": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Method.IntegrationResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentHandling": {
+                    "type": "string"
+                },
+                "ResponseParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ResponseTemplates": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "SelectionPattern": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Method.MethodResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "ResponseModels": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ResponseParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "boolean"
+                        }
+                    },
+                    "type": "object"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Model": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContentType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "Schema": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Model"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::RequestValidator": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "ValidateRequestBody": {
+                            "type": "boolean"
+                        },
+                        "ValidateRequestParameters": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::RequestValidator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Resource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ParentId": {
+                            "type": "string"
+                        },
+                        "PathPart": {
+                            "type": "string"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ParentId",
+                        "PathPart",
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Resource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::RestApi": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiKeySourceType": {
+                            "type": "string"
+                        },
+                        "BinaryMediaTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Body": {
+                            "type": "object"
+                        },
+                        "BodyS3Location": {
+                            "$ref": "#/definitions/AWS::ApiGateway::RestApi.S3Location"
+                        },
+                        "CloneFrom": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisableExecuteApiEndpoint": {
+                            "type": "boolean"
+                        },
+                        "EndpointConfiguration": {
+                            "$ref": "#/definitions/AWS::ApiGateway::RestApi.EndpointConfiguration"
+                        },
+                        "FailOnWarnings": {
+                            "type": "boolean"
+                        },
+                        "MinimumCompressionSize": {
+                            "type": "number"
+                        },
+                        "Mode": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Policy": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::RestApi"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::RestApi.EndpointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Types": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcEndpointIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::RestApi.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "ETag": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Stage": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessLogSetting": {
+                            "$ref": "#/definitions/AWS::ApiGateway::Stage.AccessLogSetting"
+                        },
+                        "CacheClusterEnabled": {
+                            "type": "boolean"
+                        },
+                        "CacheClusterSize": {
+                            "type": "string"
+                        },
+                        "CanarySetting": {
+                            "$ref": "#/definitions/AWS::ApiGateway::Stage.CanarySetting"
+                        },
+                        "ClientCertificateId": {
+                            "type": "string"
+                        },
+                        "DeploymentId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DocumentationVersion": {
+                            "type": "string"
+                        },
+                        "MethodSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApiGateway::Stage.MethodSetting"
+                            },
+                            "type": "array"
+                        },
+                        "RestApiId": {
+                            "type": "string"
+                        },
+                        "StageName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TracingEnabled": {
+                            "type": "boolean"
+                        },
+                        "Variables": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "RestApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::Stage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::Stage.AccessLogSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Stage.CanarySetting": {
+            "additionalProperties": false,
+            "properties": {
+                "DeploymentId": {
+                    "type": "string"
+                },
+                "PercentTraffic": {
+                    "type": "number"
+                },
+                "StageVariableOverrides": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "UseStageCache": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::Stage.MethodSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "CacheDataEncrypted": {
+                    "type": "boolean"
+                },
+                "CacheTtlInSeconds": {
+                    "type": "number"
+                },
+                "CachingEnabled": {
+                    "type": "boolean"
+                },
+                "DataTraceEnabled": {
+                    "type": "boolean"
+                },
+                "HttpMethod": {
+                    "type": "string"
+                },
+                "LoggingLevel": {
+                    "type": "string"
+                },
+                "MetricsEnabled": {
+                    "type": "boolean"
+                },
+                "ResourcePath": {
+                    "type": "string"
+                },
+                "ThrottlingBurstLimit": {
+                    "type": "number"
+                },
+                "ThrottlingRateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::UsagePlan": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiStages": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApiGateway::UsagePlan.ApiStage"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Quota": {
+                            "$ref": "#/definitions/AWS::ApiGateway::UsagePlan.QuotaSettings"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Throttle": {
+                            "$ref": "#/definitions/AWS::ApiGateway::UsagePlan.ThrottleSettings"
+                        },
+                        "UsagePlanName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::UsagePlan"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::UsagePlan.ApiStage": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiId": {
+                    "type": "string"
+                },
+                "Stage": {
+                    "type": "string"
+                },
+                "Throttle": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::ApiGateway::UsagePlan.ThrottleSettings"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::UsagePlan.QuotaSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Limit": {
+                    "type": "number"
+                },
+                "Offset": {
+                    "type": "number"
+                },
+                "Period": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::UsagePlan.ThrottleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "BurstLimit": {
+                    "type": "number"
+                },
+                "RateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGateway::UsagePlanKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "KeyId": {
+                            "type": "string"
+                        },
+                        "KeyType": {
+                            "type": "string"
+                        },
+                        "UsagePlanId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "KeyId",
+                        "KeyType",
+                        "UsagePlanId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::UsagePlanKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGateway::VpcLink": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "TargetArns"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGateway::VpcLink"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Api": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiKeySelectionExpression": {
+                            "type": "string"
+                        },
+                        "BasePath": {
+                            "type": "string"
+                        },
+                        "Body": {
+                            "type": "object"
+                        },
+                        "BodyS3Location": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Api.BodyS3Location"
+                        },
+                        "CorsConfiguration": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Api.Cors"
+                        },
+                        "CredentialsArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisableExecuteApiEndpoint": {
+                            "type": "boolean"
+                        },
+                        "DisableSchemaValidation": {
+                            "type": "boolean"
+                        },
+                        "FailOnWarnings": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ProtocolType": {
+                            "type": "string"
+                        },
+                        "RouteKey": {
+                            "type": "string"
+                        },
+                        "RouteSelectionExpression": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Target": {
+                            "type": "string"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Api"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Api.BodyS3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Etag": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Api.Cors": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowCredentials": {
+                    "type": "boolean"
+                },
+                "AllowHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowOrigins": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExposeHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaxAge": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "Integration": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides.IntegrationOverrides"
+                        },
+                        "Route": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteOverrides"
+                        },
+                        "Stage": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides.StageOverrides"
+                        }
+                    },
+                    "required": [
+                        "ApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.AccessLogSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.IntegrationOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "IntegrationMethod": {
+                    "type": "string"
+                },
+                "PayloadFormatVersion": {
+                    "type": "string"
+                },
+                "TimeoutInMillis": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationScopes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AuthorizationType": {
+                    "type": "string"
+                },
+                "AuthorizerId": {
+                    "type": "string"
+                },
+                "OperationName": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DataTraceEnabled": {
+                    "type": "boolean"
+                },
+                "DetailedMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "LoggingLevel": {
+                    "type": "string"
+                },
+                "ThrottlingBurstLimit": {
+                    "type": "number"
+                },
+                "ThrottlingRateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiGatewayManagedOverrides.StageOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessLogSettings": {
+                    "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides.AccessLogSettings"
+                },
+                "AutoDeploy": {
+                    "type": "boolean"
+                },
+                "DefaultRouteSettings": {
+                    "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides.RouteSettings"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "RouteSettings": {
+                    "type": "object"
+                },
+                "StageVariables": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::ApiMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ApiMappingKey": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "Stage": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "DomainName",
+                        "Stage"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::ApiMapping"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Authorizer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "AuthorizerCredentialsArn": {
+                            "type": "string"
+                        },
+                        "AuthorizerPayloadFormatVersion": {
+                            "type": "string"
+                        },
+                        "AuthorizerResultTtlInSeconds": {
+                            "type": "number"
+                        },
+                        "AuthorizerType": {
+                            "type": "string"
+                        },
+                        "AuthorizerUri": {
+                            "type": "string"
+                        },
+                        "EnableSimpleResponses": {
+                            "type": "boolean"
+                        },
+                        "IdentitySource": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "IdentityValidationExpression": {
+                            "type": "string"
+                        },
+                        "JwtConfiguration": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Authorizer.JWTConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "AuthorizerType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Authorizer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Authorizer.JWTConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Audience": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Issuer": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Deployment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "StageName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Deployment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::DomainName": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DomainNameConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApiGatewayV2::DomainName.DomainNameConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "MutualTlsAuthentication": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::DomainName.MutualTlsAuthentication"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::DomainName"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::DomainName.DomainNameConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "CertificateName": {
+                    "type": "string"
+                },
+                "EndpointType": {
+                    "type": "string"
+                },
+                "OwnershipVerificationCertificateArn": {
+                    "type": "string"
+                },
+                "SecurityPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::DomainName.MutualTlsAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "TruststoreUri": {
+                    "type": "string"
+                },
+                "TruststoreVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Integration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ConnectionId": {
+                            "type": "string"
+                        },
+                        "ConnectionType": {
+                            "type": "string"
+                        },
+                        "ContentHandlingStrategy": {
+                            "type": "string"
+                        },
+                        "CredentialsArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IntegrationMethod": {
+                            "type": "string"
+                        },
+                        "IntegrationSubtype": {
+                            "type": "string"
+                        },
+                        "IntegrationType": {
+                            "type": "string"
+                        },
+                        "IntegrationUri": {
+                            "type": "string"
+                        },
+                        "PassthroughBehavior": {
+                            "type": "string"
+                        },
+                        "PayloadFormatVersion": {
+                            "type": "string"
+                        },
+                        "RequestParameters": {
+                            "type": "object"
+                        },
+                        "RequestTemplates": {
+                            "type": "object"
+                        },
+                        "ResponseParameters": {
+                            "type": "object"
+                        },
+                        "TemplateSelectionExpression": {
+                            "type": "string"
+                        },
+                        "TimeoutInMillis": {
+                            "type": "number"
+                        },
+                        "TlsConfig": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Integration.TlsConfig"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "IntegrationType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Integration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Integration.ResponseParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination",
+                "Source"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Integration.ResponseParameterList": {
+            "additionalProperties": false,
+            "properties": {
+                "ResponseParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApiGatewayV2::Integration.ResponseParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Integration.TlsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ServerNameToVerify": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::IntegrationResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ContentHandlingStrategy": {
+                            "type": "string"
+                        },
+                        "IntegrationId": {
+                            "type": "string"
+                        },
+                        "IntegrationResponseKey": {
+                            "type": "string"
+                        },
+                        "ResponseParameters": {
+                            "type": "object"
+                        },
+                        "ResponseTemplates": {
+                            "type": "object"
+                        },
+                        "TemplateSelectionExpression": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "IntegrationId",
+                        "IntegrationResponseKey"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::IntegrationResponse"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Model": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ContentType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Schema": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "Name",
+                        "Schema"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Model"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Route": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ApiKeyRequired": {
+                            "type": "boolean"
+                        },
+                        "AuthorizationScopes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AuthorizationType": {
+                            "type": "string"
+                        },
+                        "AuthorizerId": {
+                            "type": "string"
+                        },
+                        "ModelSelectionExpression": {
+                            "type": "string"
+                        },
+                        "OperationName": {
+                            "type": "string"
+                        },
+                        "RequestModels": {
+                            "type": "object"
+                        },
+                        "RequestParameters": {
+                            "type": "object"
+                        },
+                        "RouteKey": {
+                            "type": "string"
+                        },
+                        "RouteResponseSelectionExpression": {
+                            "type": "string"
+                        },
+                        "Target": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "RouteKey"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Route"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Route.ParameterConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "Required": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Required"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::RouteResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ModelSelectionExpression": {
+                            "type": "string"
+                        },
+                        "ResponseModels": {
+                            "type": "object"
+                        },
+                        "ResponseParameters": {
+                            "type": "object"
+                        },
+                        "RouteId": {
+                            "type": "string"
+                        },
+                        "RouteResponseKey": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "RouteId",
+                        "RouteResponseKey"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::RouteResponse"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::RouteResponse.ParameterConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "Required": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Required"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Stage": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessLogSettings": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Stage.AccessLogSettings"
+                        },
+                        "AccessPolicyId": {
+                            "type": "string"
+                        },
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "AutoDeploy": {
+                            "type": "boolean"
+                        },
+                        "ClientCertificateId": {
+                            "type": "string"
+                        },
+                        "DefaultRouteSettings": {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Stage.RouteSettings"
+                        },
+                        "DeploymentId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "RouteSettings": {
+                            "type": "object"
+                        },
+                        "StageName": {
+                            "type": "string"
+                        },
+                        "StageVariables": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "StageName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::Stage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Stage.AccessLogSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::Stage.RouteSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DataTraceEnabled": {
+                    "type": "boolean"
+                },
+                "DetailedMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "LoggingLevel": {
+                    "type": "string"
+                },
+                "ThrottlingBurstLimit": {
+                    "type": "number"
+                },
+                "ThrottlingRateLimit": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApiGatewayV2::VpcLink": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApiGatewayV2::VpcLink"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::Application.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::Application.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::ConfigurationProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LocationUri": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RetrievalRoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::ConfigurationProfile.Tags"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Validators": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::ConfigurationProfile.Validators"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "LocationUri",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::ConfigurationProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::ConfigurationProfile.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::ConfigurationProfile.Validators": {
+            "additionalProperties": false,
+            "properties": {
+                "Content": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::Deployment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ConfigurationProfileId": {
+                            "type": "string"
+                        },
+                        "ConfigurationVersion": {
+                            "type": "string"
+                        },
+                        "DeploymentStrategyId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnvironmentId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::Deployment.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "ConfigurationProfileId",
+                        "ConfigurationVersion",
+                        "DeploymentStrategyId",
+                        "EnvironmentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::Deployment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::Deployment.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::DeploymentStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeploymentDurationInMinutes": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FinalBakeTimeInMinutes": {
+                            "type": "number"
+                        },
+                        "GrowthFactor": {
+                            "type": "number"
+                        },
+                        "GrowthType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ReplicateTo": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::DeploymentStrategy.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DeploymentDurationInMinutes",
+                        "GrowthFactor",
+                        "Name",
+                        "ReplicateTo"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::DeploymentStrategy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::DeploymentStrategy.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Monitors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::Environment.Monitors"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppConfig::Environment.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::Environment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppConfig::Environment.Monitors": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmArn": {
+                    "type": "string"
+                },
+                "AlarmRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::Environment.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppConfig::HostedConfigurationVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ConfigurationProfileId": {
+                            "type": "string"
+                        },
+                        "Content": {
+                            "type": "string"
+                        },
+                        "ContentType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LatestVersionNumber": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "ConfigurationProfileId",
+                        "Content",
+                        "ContentType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppConfig::HostedConfigurationVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionMode": {
+                            "type": "string"
+                        },
+                        "ConnectorProfileConfig": {
+                            "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorProfileConfig"
+                        },
+                        "ConnectorProfileName": {
+                            "type": "string"
+                        },
+                        "ConnectorType": {
+                            "type": "string"
+                        },
+                        "KMSArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConnectionMode",
+                        "ConnectorProfileName",
+                        "ConnectorType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppFlow::ConnectorProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.AmplitudeConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiKey": {
+                    "type": "string"
+                },
+                "SecretKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiKey",
+                "SecretKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthCode": {
+                    "type": "string"
+                },
+                "RedirectUri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ConnectorProfileConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorProfileCredentials": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorProfileCredentials"
+                },
+                "ConnectorProfileProperties": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorProfileProperties"
+                }
+            },
+            "required": [
+                "ConnectorProfileCredentials"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "Amplitude": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.AmplitudeConnectorProfileCredentials"
+                },
+                "Datadog": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileCredentials"
+                },
+                "Dynatrace": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileCredentials"
+                },
+                "GoogleAnalytics": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.GoogleAnalyticsConnectorProfileCredentials"
+                },
+                "InforNexus": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileCredentials"
+                },
+                "Marketo": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileCredentials"
+                },
+                "Redshift": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileCredentials"
+                },
+                "SAPOData": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileCredentials"
+                },
+                "Salesforce": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileCredentials"
+                },
+                "ServiceNow": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileCredentials"
+                },
+                "Singular": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SingularConnectorProfileCredentials"
+                },
+                "Slack": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SlackConnectorProfileCredentials"
+                },
+                "Snowflake": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileCredentials"
+                },
+                "Trendmicro": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.TrendmicroConnectorProfileCredentials"
+                },
+                "Veeva": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileCredentials"
+                },
+                "Zendesk": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileCredentials"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Datadog": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileProperties"
+                },
+                "Dynatrace": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileProperties"
+                },
+                "InforNexus": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileProperties"
+                },
+                "Marketo": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileProperties"
+                },
+                "Redshift": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileProperties"
+                },
+                "SAPOData": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileProperties"
+                },
+                "Salesforce": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileProperties"
+                },
+                "ServiceNow": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileProperties"
+                },
+                "Slack": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SlackConnectorProfileProperties"
+                },
+                "Snowflake": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileProperties"
+                },
+                "Veeva": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileProperties"
+                },
+                "Zendesk": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiKey": {
+                    "type": "string"
+                },
+                "ApplicationKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiKey",
+                "ApplicationKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.DatadogConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiToken": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiToken"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.DynatraceConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.GoogleAnalyticsConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "ConnectorOAuthRequest": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+                },
+                "RefreshToken": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClientId",
+                "ClientSecret"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessKeyId": {
+                    "type": "string"
+                },
+                "Datakey": {
+                    "type": "string"
+                },
+                "SecretAccessKey": {
+                    "type": "string"
+                },
+                "UserId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AccessKeyId",
+                "Datakey",
+                "SecretAccessKey",
+                "UserId"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.InforNexusConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "ConnectorOAuthRequest": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+                }
+            },
+            "required": [
+                "ClientId",
+                "ClientSecret"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.MarketoConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.OAuthProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthCodeUrl": {
+                    "type": "string"
+                },
+                "OAuthScopes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TokenUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.RedshiftConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "DatabaseUrl": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName",
+                "DatabaseUrl",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "BasicAuthCredentials": {
+                    "type": "object"
+                },
+                "OAuthCredentials": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SAPODataConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationHostUrl": {
+                    "type": "string"
+                },
+                "ApplicationServicePath": {
+                    "type": "string"
+                },
+                "ClientNumber": {
+                    "type": "string"
+                },
+                "LogonLanguage": {
+                    "type": "string"
+                },
+                "OAuthProperties": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.OAuthProperties"
+                },
+                "PortNumber": {
+                    "type": "number"
+                },
+                "PrivateLinkServiceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "ClientCredentialsArn": {
+                    "type": "string"
+                },
+                "ConnectorOAuthRequest": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+                },
+                "RefreshToken": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SalesforceConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                },
+                "isSandboxEnvironment": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ServiceNowConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SingularConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SlackConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "ConnectorOAuthRequest": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+                }
+            },
+            "required": [
+                "ClientId",
+                "ClientSecret"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SlackConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.SnowflakeConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountName": {
+                    "type": "string"
+                },
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "PrivateLinkServiceName": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "Stage": {
+                    "type": "string"
+                },
+                "Warehouse": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName",
+                "Stage",
+                "Warehouse"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.TrendmicroConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "ApiSecretKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApiSecretKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.VeevaConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "ConnectorOAuthRequest": {
+                    "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile.ConnectorOAuthRequest"
+                }
+            },
+            "required": [
+                "ClientId",
+                "ClientSecret"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::ConnectorProfile.ZendeskConnectorProfileProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DestinationFlowConfigList": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppFlow::Flow.DestinationFlowConfig"
+                            },
+                            "type": "array"
+                        },
+                        "FlowName": {
+                            "type": "string"
+                        },
+                        "KMSArn": {
+                            "type": "string"
+                        },
+                        "SourceFlowConfig": {
+                            "$ref": "#/definitions/AWS::AppFlow::Flow.SourceFlowConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Tasks": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppFlow::Flow.Task"
+                            },
+                            "type": "array"
+                        },
+                        "TriggerConfig": {
+                            "$ref": "#/definitions/AWS::AppFlow::Flow.TriggerConfig"
+                        }
+                    },
+                    "required": [
+                        "DestinationFlowConfigList",
+                        "FlowName",
+                        "SourceFlowConfig",
+                        "Tasks",
+                        "TriggerConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppFlow::Flow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.AggregationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregationType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.AmplitudeSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ConnectorOperator": {
+            "additionalProperties": false,
+            "properties": {
+                "Amplitude": {
+                    "type": "string"
+                },
+                "Datadog": {
+                    "type": "string"
+                },
+                "Dynatrace": {
+                    "type": "string"
+                },
+                "GoogleAnalytics": {
+                    "type": "string"
+                },
+                "InforNexus": {
+                    "type": "string"
+                },
+                "Marketo": {
+                    "type": "string"
+                },
+                "S3": {
+                    "type": "string"
+                },
+                "SAPOData": {
+                    "type": "string"
+                },
+                "Salesforce": {
+                    "type": "string"
+                },
+                "ServiceNow": {
+                    "type": "string"
+                },
+                "Singular": {
+                    "type": "string"
+                },
+                "Slack": {
+                    "type": "string"
+                },
+                "Trendmicro": {
+                    "type": "string"
+                },
+                "Veeva": {
+                    "type": "string"
+                },
+                "Zendesk": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.DatadogSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.DestinationConnectorProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBridge": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.EventBridgeDestinationProperties"
+                },
+                "LookoutMetrics": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.LookoutMetricsDestinationProperties"
+                },
+                "Redshift": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.RedshiftDestinationProperties"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.S3DestinationProperties"
+                },
+                "Salesforce": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SalesforceDestinationProperties"
+                },
+                "Snowflake": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SnowflakeDestinationProperties"
+                },
+                "Upsolver": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.UpsolverDestinationProperties"
+                },
+                "Zendesk": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ZendeskDestinationProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.DestinationFlowConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorProfileName": {
+                    "type": "string"
+                },
+                "ConnectorType": {
+                    "type": "string"
+                },
+                "DestinationConnectorProperties": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.DestinationConnectorProperties"
+                }
+            },
+            "required": [
+                "ConnectorType",
+                "DestinationConnectorProperties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.DynatraceSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ErrorHandlingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "FailOnFirstError": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.EventBridgeDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorHandlingConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ErrorHandlingConfig"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.GoogleAnalyticsSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.IncrementalPullConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DatetimeTypeFieldName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.InforNexusSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.LookoutMetricsDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.MarketoSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.PrefixConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "PrefixFormat": {
+                    "type": "string"
+                },
+                "PrefixType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.RedshiftDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "ErrorHandlingConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ErrorHandlingConfig"
+                },
+                "IntermediateBucketName": {
+                    "type": "string"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IntermediateBucketName",
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.S3DestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "S3OutputFormatConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.S3OutputFormatConfig"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.S3InputFormatConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "S3InputFileType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.S3OutputFormatConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregationConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.AggregationConfig"
+                },
+                "FileType": {
+                    "type": "string"
+                },
+                "PrefixConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.PrefixConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.S3SourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "S3InputFormatConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.S3InputFormatConfig"
+                }
+            },
+            "required": [
+                "BucketName",
+                "BucketPrefix"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SAPODataSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ObjectPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ObjectPath"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SalesforceDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorHandlingConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ErrorHandlingConfig"
+                },
+                "IdFieldNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Object": {
+                    "type": "string"
+                },
+                "WriteOperationType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SalesforceSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableDynamicFieldUpdate": {
+                    "type": "boolean"
+                },
+                "IncludeDeletedRecords": {
+                    "type": "boolean"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ScheduledTriggerProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DataPullMode": {
+                    "type": "string"
+                },
+                "ScheduleEndTime": {
+                    "type": "number"
+                },
+                "ScheduleExpression": {
+                    "type": "string"
+                },
+                "ScheduleOffset": {
+                    "type": "number"
+                },
+                "ScheduleStartTime": {
+                    "type": "number"
+                },
+                "TimeZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ServiceNowSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SingularSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SlackSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SnowflakeDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "ErrorHandlingConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ErrorHandlingConfig"
+                },
+                "IntermediateBucketName": {
+                    "type": "string"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IntermediateBucketName",
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SourceConnectorProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Amplitude": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.AmplitudeSourceProperties"
+                },
+                "Datadog": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.DatadogSourceProperties"
+                },
+                "Dynatrace": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.DynatraceSourceProperties"
+                },
+                "GoogleAnalytics": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.GoogleAnalyticsSourceProperties"
+                },
+                "InforNexus": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.InforNexusSourceProperties"
+                },
+                "Marketo": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.MarketoSourceProperties"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.S3SourceProperties"
+                },
+                "SAPOData": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SAPODataSourceProperties"
+                },
+                "Salesforce": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SalesforceSourceProperties"
+                },
+                "ServiceNow": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ServiceNowSourceProperties"
+                },
+                "Singular": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SingularSourceProperties"
+                },
+                "Slack": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SlackSourceProperties"
+                },
+                "Trendmicro": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.TrendmicroSourceProperties"
+                },
+                "Veeva": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.VeevaSourceProperties"
+                },
+                "Zendesk": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ZendeskSourceProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.SourceFlowConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorProfileName": {
+                    "type": "string"
+                },
+                "ConnectorType": {
+                    "type": "string"
+                },
+                "IncrementalPullConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.IncrementalPullConfig"
+                },
+                "SourceConnectorProperties": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.SourceConnectorProperties"
+                }
+            },
+            "required": [
+                "ConnectorType",
+                "SourceConnectorProperties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.Task": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorOperator": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ConnectorOperator"
+                },
+                "DestinationField": {
+                    "type": "string"
+                },
+                "SourceFields": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TaskProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppFlow::Flow.TaskPropertiesObject"
+                    },
+                    "type": "array"
+                },
+                "TaskType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourceFields",
+                "TaskType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.TaskPropertiesObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.TrendmicroSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.TriggerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TriggerProperties": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ScheduledTriggerProperties"
+                },
+                "TriggerType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TriggerType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.UpsolverDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "S3OutputFormatConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.UpsolverS3OutputFormatConfig"
+                }
+            },
+            "required": [
+                "BucketName",
+                "S3OutputFormatConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.UpsolverS3OutputFormatConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregationConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.AggregationConfig"
+                },
+                "FileType": {
+                    "type": "string"
+                },
+                "PrefixConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.PrefixConfig"
+                }
+            },
+            "required": [
+                "PrefixConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.VeevaSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentType": {
+                    "type": "string"
+                },
+                "IncludeAllVersions": {
+                    "type": "boolean"
+                },
+                "IncludeRenditions": {
+                    "type": "boolean"
+                },
+                "IncludeSourceFiles": {
+                    "type": "boolean"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ZendeskDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorHandlingConfig": {
+                    "$ref": "#/definitions/AWS::AppFlow::Flow.ErrorHandlingConfig"
+                },
+                "IdFieldNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Object": {
+                    "type": "string"
+                },
+                "WriteOperationType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppFlow::Flow.ZendeskSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::AppIntegrations::EventIntegration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EventBridgeBus": {
+                            "type": "string"
+                        },
+                        "EventFilter": {
+                            "$ref": "#/definitions/AWS::AppIntegrations::EventIntegration.EventFilter"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EventBridgeBus",
+                        "EventFilter",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppIntegrations::EventIntegration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppIntegrations::EventIntegration.EventFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Source": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Source"
+            ],
+            "type": "object"
+        },
+        "AWS::AppIntegrations::EventIntegration.EventIntegrationAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientAssociationMetadata": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppIntegrations::EventIntegration.Metadata"
+                    },
+                    "type": "array"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "EventBridgeRuleName": {
+                    "type": "string"
+                },
+                "EventIntegrationAssociationArn": {
+                    "type": "string"
+                },
+                "EventIntegrationAssociationId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppIntegrations::EventIntegration.Metadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GatewayRouteName": {
+                            "type": "string"
+                        },
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualGatewayName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec",
+                        "VirtualGatewayName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::GatewayRoute"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteHostnameMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Suffix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteHostnameRewrite": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultTargetHostname": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteMetadataMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Range": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteRangeMatch"
+                },
+                "Regex": {
+                    "type": "string"
+                },
+                "Suffix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteRangeMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "End": {
+                    "type": "number"
+                },
+                "Start": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "End",
+                "Start"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "GrpcRoute": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GrpcGatewayRoute"
+                },
+                "Http2Route": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRoute"
+                },
+                "HttpRoute": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRoute"
+                },
+                "Priority": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualService": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteVirtualService"
+                }
+            },
+            "required": [
+                "VirtualService"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GatewayRouteVirtualService": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VirtualServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GrpcGatewayRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GrpcGatewayRouteAction"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMatch"
+                }
+            },
+            "required": [
+                "Action",
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Rewrite": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GrpcGatewayRouteRewrite"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteHostnameMatch"
+                },
+                "Metadata": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMetadata"
+                    },
+                    "type": "array"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Invert": {
+                    "type": "boolean"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteMetadataMatch"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.GrpcGatewayRouteRewrite": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteHostnameRewrite"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRouteAction"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRouteMatch"
+                }
+            },
+            "required": [
+                "Action",
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRouteAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Rewrite": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRouteRewrite"
+                },
+                "Target": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteTarget"
+                }
+            },
+            "required": [
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "Invert": {
+                    "type": "boolean"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeaderMatch"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeaderMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Range": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteRangeMatch"
+                },
+                "Regex": {
+                    "type": "string"
+                },
+                "Suffix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRouteMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Headers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRouteHeader"
+                    },
+                    "type": "array"
+                },
+                "Hostname": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteHostnameMatch"
+                },
+                "Method": {
+                    "type": "string"
+                },
+                "Path": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpPathMatch"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "QueryParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.QueryParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRoutePathRewrite": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRoutePrefixRewrite": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultPrefix": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpGatewayRouteRewrite": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.GatewayRouteHostnameRewrite"
+                },
+                "Path": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRoutePathRewrite"
+                },
+                "Prefix": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpGatewayRoutePrefixRewrite"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpPathMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Regex": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.HttpQueryParameterMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::GatewayRoute.QueryParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::GatewayRoute.HttpQueryParameterMatch"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Mesh": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::Mesh.MeshSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::Mesh"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Mesh.EgressFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Mesh.MeshSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "EgressFilter": {
+                    "$ref": "#/definitions/AWS::AppMesh::Mesh.EgressFilter"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "RouteName": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::Route.RouteSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualRouterName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec",
+                        "VirtualRouterName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::Route"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.Duration": {
+            "additionalProperties": false,
+            "properties": {
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Unit",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRetryPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "GrpcRetryEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "HttpRetryEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaxRetries": {
+                    "type": "number"
+                },
+                "PerRetryTimeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                },
+                "TcpRetryEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MaxRetries",
+                "PerRetryTimeout"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRouteAction"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRouteMatch"
+                },
+                "RetryPolicy": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRetryPolicy"
+                },
+                "Timeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcTimeout"
+                }
+            },
+            "required": [
+                "Action",
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRouteAction": {
+            "additionalProperties": false,
+            "properties": {
+                "WeightedTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.WeightedTarget"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "WeightedTargets"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRouteMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Metadata": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRouteMetadata"
+                    },
+                    "type": "array"
+                },
+                "MethodName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRouteMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Invert": {
+                    "type": "boolean"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRouteMetadataMatchMethod"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcRouteMetadataMatchMethod": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Range": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.MatchRange"
+                },
+                "Regex": {
+                    "type": "string"
+                },
+                "Suffix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.GrpcTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                },
+                "PerRequest": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HeaderMatchMethod": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Range": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.MatchRange"
+                },
+                "Regex": {
+                    "type": "string"
+                },
+                "Suffix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpPathMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                },
+                "Regex": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpQueryParameterMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpRetryPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpRetryEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaxRetries": {
+                    "type": "number"
+                },
+                "PerRetryTimeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                },
+                "TcpRetryEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MaxRetries",
+                "PerRetryTimeout"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpRouteAction"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpRouteMatch"
+                },
+                "RetryPolicy": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpRetryPolicy"
+                },
+                "Timeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpTimeout"
+                }
+            },
+            "required": [
+                "Action",
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpRouteAction": {
+            "additionalProperties": false,
+            "properties": {
+                "WeightedTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.WeightedTarget"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "WeightedTargets"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpRouteHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "Invert": {
+                    "type": "boolean"
+                },
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HeaderMatchMethod"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpRouteMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Headers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.HttpRouteHeader"
+                    },
+                    "type": "array"
+                },
+                "Method": {
+                    "type": "string"
+                },
+                "Path": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpPathMatch"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "QueryParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.QueryParameter"
+                    },
+                    "type": "array"
+                },
+                "Scheme": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.HttpTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                },
+                "PerRequest": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.MatchRange": {
+            "additionalProperties": false,
+            "properties": {
+                "End": {
+                    "type": "number"
+                },
+                "Start": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "End",
+                "Start"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.QueryParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpQueryParameterMatch"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.RouteSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "GrpcRoute": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.GrpcRoute"
+                },
+                "Http2Route": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpRoute"
+                },
+                "HttpRoute": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.HttpRoute"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "TcpRoute": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.TcpRoute"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.TcpRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.TcpRouteAction"
+                },
+                "Timeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.TcpTimeout"
+                }
+            },
+            "required": [
+                "Action"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.TcpRouteAction": {
+            "additionalProperties": false,
+            "properties": {
+                "WeightedTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::Route.WeightedTarget"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "WeightedTargets"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.TcpTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::Route.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::Route.WeightedTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualNode": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "VirtualNode",
+                "Weight"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewaySpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualGatewayName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::VirtualGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.SubjectAlternativeNameMatchers": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.SubjectAlternativeNames": {
+            "additionalProperties": false,
+            "properties": {
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.SubjectAlternativeNameMatchers"
+                }
+            },
+            "required": [
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayAccessLog": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayFileAccessLog"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayBackendDefaults": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientPolicy": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "TLS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicyTls"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayClientPolicyTls": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayClientTlsCertificate"
+                },
+                "Enforce": {
+                    "type": "boolean"
+                },
+                "Ports": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Validation": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContext"
+                }
+            },
+            "required": [
+                "Validation"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayClientTlsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsFileCertificate"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsSdsCertificate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "GRPC": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayGrpcConnectionPool"
+                },
+                "HTTP": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayHttpConnectionPool"
+                },
+                "HTTP2": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayHttp2ConnectionPool"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayFileAccessLog": {
+            "additionalProperties": false,
+            "properties": {
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Path"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayGrpcConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRequests"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayHealthCheckPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "HealthyThreshold": {
+                    "type": "number"
+                },
+                "IntervalMillis": {
+                    "type": "number"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "TimeoutMillis": {
+                    "type": "number"
+                },
+                "UnhealthyThreshold": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "HealthyThreshold",
+                "IntervalMillis",
+                "Protocol",
+                "TimeoutMillis",
+                "UnhealthyThreshold"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayHttp2ConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRequests"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayHttpConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConnections": {
+                    "type": "number"
+                },
+                "MaxPendingRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxConnections"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListener": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionPool": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayConnectionPool"
+                },
+                "HealthCheck": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayHealthCheckPolicy"
+                },
+                "PortMapping": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayPortMapping"
+                },
+                "TLS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTls"
+                }
+            },
+            "required": [
+                "PortMapping"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTls": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsCertificate"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "Validation": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContext"
+                }
+            },
+            "required": [
+                "Certificate",
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsAcmCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "ACM": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsAcmCertificate"
+                },
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsFileCertificate"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsSdsCertificate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsFileCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateChain": {
+                    "type": "string"
+                },
+                "PrivateKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateChain",
+                "PrivateKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsSdsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContext": {
+            "additionalProperties": false,
+            "properties": {
+                "SubjectAlternativeNames": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.SubjectAlternativeNames"
+                },
+                "Trust": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContextTrust"
+                }
+            },
+            "required": [
+                "Trust"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayListenerTlsValidationContextTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextFileTrust"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextSdsTrust"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayLogging": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessLog": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayAccessLog"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayPortMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "Port": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Port",
+                "Protocol"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewaySpec": {
+            "additionalProperties": false,
+            "properties": {
+                "BackendDefaults": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayBackendDefaults"
+                },
+                "Listeners": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayListener"
+                    },
+                    "type": "array"
+                },
+                "Logging": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayLogging"
+                }
+            },
+            "required": [
+                "Listeners"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContext": {
+            "additionalProperties": false,
+            "properties": {
+                "SubjectAlternativeNames": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.SubjectAlternativeNames"
+                },
+                "Trust": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextTrust"
+                }
+            },
+            "required": [
+                "Trust"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextAcmTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateAuthorityArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CertificateAuthorityArns"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextFileTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateChain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateChain"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextSdsTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "ACM": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextAcmTrust"
+                },
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextFileTrust"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualGateway.VirtualGatewayTlsValidationContextSdsTrust"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualNodeName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::VirtualNode"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.AccessLog": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.FileAccessLog"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.AwsCloudMapInstanceAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.AwsCloudMapServiceDiscovery": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::VirtualNode.AwsCloudMapInstanceAttribute"
+                    },
+                    "type": "array"
+                },
+                "NamespaceName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NamespaceName",
+                "ServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.Backend": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualService": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualServiceBackend"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.BackendDefaults": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientPolicy": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ClientPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ClientPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "TLS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ClientPolicyTls"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ClientPolicyTls": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ClientTlsCertificate"
+                },
+                "Enforce": {
+                    "type": "boolean"
+                },
+                "Ports": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Validation": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContext"
+                }
+            },
+            "required": [
+                "Validation"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ClientTlsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsFileCertificate"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsSdsCertificate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.DnsServiceDiscovery": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "type": "string"
+                },
+                "ResponseType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Hostname"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.Duration": {
+            "additionalProperties": false,
+            "properties": {
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Unit",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.FileAccessLog": {
+            "additionalProperties": false,
+            "properties": {
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Path"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.GrpcTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                },
+                "PerRequest": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.HealthCheck": {
+            "additionalProperties": false,
+            "properties": {
+                "HealthyThreshold": {
+                    "type": "number"
+                },
+                "IntervalMillis": {
+                    "type": "number"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "TimeoutMillis": {
+                    "type": "number"
+                },
+                "UnhealthyThreshold": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "HealthyThreshold",
+                "IntervalMillis",
+                "Protocol",
+                "TimeoutMillis",
+                "UnhealthyThreshold"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.HttpTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                },
+                "PerRequest": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.Listener": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionPool": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeConnectionPool"
+                },
+                "HealthCheck": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.HealthCheck"
+                },
+                "OutlierDetection": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.OutlierDetection"
+                },
+                "PortMapping": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.PortMapping"
+                },
+                "TLS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTls"
+                },
+                "Timeout": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTimeout"
+                }
+            },
+            "required": [
+                "PortMapping"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "GRPC": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.GrpcTimeout"
+                },
+                "HTTP": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.HttpTimeout"
+                },
+                "HTTP2": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.HttpTimeout"
+                },
+                "TCP": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TcpTimeout"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTls": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsCertificate"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "Validation": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsValidationContext"
+                }
+            },
+            "required": [
+                "Certificate",
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsAcmCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "ACM": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsAcmCertificate"
+                },
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsFileCertificate"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsSdsCertificate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsFileCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateChain": {
+                    "type": "string"
+                },
+                "PrivateKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateChain",
+                "PrivateKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsSdsCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsValidationContext": {
+            "additionalProperties": false,
+            "properties": {
+                "SubjectAlternativeNames": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.SubjectAlternativeNames"
+                },
+                "Trust": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ListenerTlsValidationContextTrust"
+                }
+            },
+            "required": [
+                "Trust"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ListenerTlsValidationContextTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextFileTrust"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextSdsTrust"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessLog": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.AccessLog"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.OutlierDetection": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseEjectionDuration": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                },
+                "Interval": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                },
+                "MaxEjectionPercent": {
+                    "type": "number"
+                },
+                "MaxServerErrors": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "BaseEjectionDuration",
+                "Interval",
+                "MaxEjectionPercent",
+                "MaxServerErrors"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.PortMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "Port": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Port",
+                "Protocol"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.ServiceDiscovery": {
+            "additionalProperties": false,
+            "properties": {
+                "AWSCloudMap": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.AwsCloudMapServiceDiscovery"
+                },
+                "DNS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.DnsServiceDiscovery"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.SubjectAlternativeNameMatchers": {
+            "additionalProperties": false,
+            "properties": {
+                "Exact": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.SubjectAlternativeNames": {
+            "additionalProperties": false,
+            "properties": {
+                "Match": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.SubjectAlternativeNameMatchers"
+                }
+            },
+            "required": [
+                "Match"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TcpTimeout": {
+            "additionalProperties": false,
+            "properties": {
+                "Idle": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Duration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TlsValidationContext": {
+            "additionalProperties": false,
+            "properties": {
+                "SubjectAlternativeNames": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.SubjectAlternativeNames"
+                },
+                "Trust": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextTrust"
+                }
+            },
+            "required": [
+                "Trust"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TlsValidationContextAcmTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateAuthorityArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CertificateAuthorityArns"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TlsValidationContextFileTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateChain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateChain"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TlsValidationContextSdsTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.TlsValidationContextTrust": {
+            "additionalProperties": false,
+            "properties": {
+                "ACM": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextAcmTrust"
+                },
+                "File": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextFileTrust"
+                },
+                "SDS": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.TlsValidationContextSdsTrust"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "GRPC": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeGrpcConnectionPool"
+                },
+                "HTTP": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeHttpConnectionPool"
+                },
+                "HTTP2": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeHttp2ConnectionPool"
+                },
+                "TCP": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.VirtualNodeTcpConnectionPool"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeGrpcConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRequests"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeHttp2ConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRequests"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeHttpConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConnections": {
+                    "type": "number"
+                },
+                "MaxPendingRequests": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxConnections"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "BackendDefaults": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.BackendDefaults"
+                },
+                "Backends": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Backend"
+                    },
+                    "type": "array"
+                },
+                "Listeners": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Listener"
+                    },
+                    "type": "array"
+                },
+                "Logging": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.Logging"
+                },
+                "ServiceDiscovery": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ServiceDiscovery"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualNodeTcpConnectionPool": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConnections": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxConnections"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualNode.VirtualServiceBackend": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientPolicy": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualNode.ClientPolicy"
+                },
+                "VirtualServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VirtualServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualRouter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualRouter.VirtualRouterSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualRouterName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::VirtualRouter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualRouter.PortMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "Port": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Port",
+                "Protocol"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualRouter.VirtualRouterListener": {
+            "additionalProperties": false,
+            "properties": {
+                "PortMapping": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualRouter.PortMapping"
+                }
+            },
+            "required": [
+                "PortMapping"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualRouter.VirtualRouterSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "Listeners": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppMesh::VirtualRouter.VirtualRouterListener"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Listeners"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualService": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MeshName": {
+                            "type": "string"
+                        },
+                        "MeshOwner": {
+                            "type": "string"
+                        },
+                        "Spec": {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualService.VirtualServiceSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualServiceName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MeshName",
+                        "Spec",
+                        "VirtualServiceName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppMesh::VirtualService"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualService.VirtualNodeServiceProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualNodeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VirtualNodeName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualService.VirtualRouterServiceProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualRouterName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VirtualRouterName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualService.VirtualServiceProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "VirtualNode": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualService.VirtualNodeServiceProvider"
+                },
+                "VirtualRouter": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualService.VirtualRouterServiceProvider"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppMesh::VirtualService.VirtualServiceSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "Provider": {
+                    "$ref": "#/definitions/AWS::AppMesh::VirtualService.VirtualServiceProvider"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingConfigurationArn": {
+                            "type": "string"
+                        },
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::AppRunner::Service.EncryptionConfiguration"
+                        },
+                        "HealthCheckConfiguration": {
+                            "$ref": "#/definitions/AWS::AppRunner::Service.HealthCheckConfiguration"
+                        },
+                        "InstanceConfiguration": {
+                            "$ref": "#/definitions/AWS::AppRunner::Service.InstanceConfiguration"
+                        },
+                        "ServiceName": {
+                            "type": "string"
+                        },
+                        "SourceConfiguration": {
+                            "$ref": "#/definitions/AWS::AppRunner::Service.SourceConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SourceConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppRunner::Service"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.AuthenticationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessRoleArn": {
+                    "type": "string"
+                },
+                "ConnectionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.CodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CodeConfigurationValues": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.CodeConfigurationValues"
+                },
+                "ConfigurationSource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConfigurationSource"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.CodeConfigurationValues": {
+            "additionalProperties": false,
+            "properties": {
+                "BuildCommand": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "string"
+                },
+                "Runtime": {
+                    "type": "string"
+                },
+                "RuntimeEnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppRunner::Service.KeyValuePair"
+                    },
+                    "type": "array"
+                },
+                "StartCommand": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Runtime"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.CodeRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "CodeConfiguration": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.CodeConfiguration"
+                },
+                "RepositoryUrl": {
+                    "type": "string"
+                },
+                "SourceCodeVersion": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.SourceCodeVersion"
+                }
+            },
+            "required": [
+                "RepositoryUrl",
+                "SourceCodeVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KmsKey"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.HealthCheckConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "HealthyThreshold": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "Timeout": {
+                    "type": "number"
+                },
+                "UnhealthyThreshold": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.ImageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Port": {
+                    "type": "string"
+                },
+                "RuntimeEnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AppRunner::Service.KeyValuePair"
+                    },
+                    "type": "array"
+                },
+                "StartCommand": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.ImageRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "ImageConfiguration": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.ImageConfiguration"
+                },
+                "ImageIdentifier": {
+                    "type": "string"
+                },
+                "ImageRepositoryType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ImageIdentifier",
+                "ImageRepositoryType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.InstanceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Cpu": {
+                    "type": "string"
+                },
+                "InstanceRoleArn": {
+                    "type": "string"
+                },
+                "Memory": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.KeyValuePair": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.SourceCodeVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AppRunner::Service.SourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationConfiguration": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.AuthenticationConfiguration"
+                },
+                "AutoDeploymentsEnabled": {
+                    "type": "boolean"
+                },
+                "CodeRepository": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.CodeRepository"
+                },
+                "ImageRepository": {
+                    "$ref": "#/definitions/AWS::AppRunner::Service.ImageRepository"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::AppBlock": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SetupScriptDetails": {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlock.ScriptDetails"
+                        },
+                        "SourceS3Location": {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlock.S3Location"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "SetupScriptDetails",
+                        "SourceS3Location"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::AppBlock"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::AppBlock.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::AppBlock.ScriptDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutableParameters": {
+                    "type": "string"
+                },
+                "ExecutablePath": {
+                    "type": "string"
+                },
+                "ScriptS3Location": {
+                    "$ref": "#/definitions/AWS::AppStream::AppBlock.S3Location"
+                },
+                "TimeoutInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ExecutablePath",
+                "ScriptS3Location",
+                "TimeoutInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppBlockArn": {
+                            "type": "string"
+                        },
+                        "AttributesToDelete": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "IconS3Location": {
+                            "$ref": "#/definitions/AWS::AppStream::Application.S3Location"
+                        },
+                        "InstanceFamilies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchParameters": {
+                            "type": "string"
+                        },
+                        "LaunchPath": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Platforms": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkingDirectory": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AppBlockArn",
+                        "IconS3Location",
+                        "InstanceFamilies",
+                        "LaunchPath",
+                        "Name",
+                        "Platforms"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Application.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::ApplicationFleetAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationArn": {
+                            "type": "string"
+                        },
+                        "FleetName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationArn",
+                        "FleetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::ApplicationFleetAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::DirectoryConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DirectoryName": {
+                            "type": "string"
+                        },
+                        "OrganizationalUnitDistinguishedNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceAccountCredentials": {
+                            "$ref": "#/definitions/AWS::AppStream::DirectoryConfig.ServiceAccountCredentials"
+                        }
+                    },
+                    "required": [
+                        "DirectoryName",
+                        "OrganizationalUnitDistinguishedNames",
+                        "ServiceAccountCredentials"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::DirectoryConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::DirectoryConfig.ServiceAccountCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountName": {
+                    "type": "string"
+                },
+                "AccountPassword": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AccountName",
+                "AccountPassword"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Fleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ComputeCapacity": {
+                            "$ref": "#/definitions/AWS::AppStream::Fleet.ComputeCapacity"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisconnectTimeoutInSeconds": {
+                            "type": "number"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "DomainJoinInfo": {
+                            "$ref": "#/definitions/AWS::AppStream::Fleet.DomainJoinInfo"
+                        },
+                        "EnableDefaultInternetAccess": {
+                            "type": "boolean"
+                        },
+                        "FleetType": {
+                            "type": "string"
+                        },
+                        "IamRoleArn": {
+                            "type": "string"
+                        },
+                        "IdleDisconnectTimeoutInSeconds": {
+                            "type": "number"
+                        },
+                        "ImageArn": {
+                            "type": "string"
+                        },
+                        "ImageName": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "MaxConcurrentSessions": {
+                            "type": "number"
+                        },
+                        "MaxUserDurationInSeconds": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Platform": {
+                            "type": "string"
+                        },
+                        "StreamView": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UsbDeviceFilterStrings": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::AppStream::Fleet.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "InstanceType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::Fleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Fleet.ComputeCapacity": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredInstances": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DesiredInstances"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Fleet.DomainJoinInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryName": {
+                    "type": "string"
+                },
+                "OrganizationalUnitDistinguishedName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::Fleet.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::ImageBuilder": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessEndpoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::ImageBuilder.AccessEndpoint"
+                            },
+                            "type": "array"
+                        },
+                        "AppstreamAgentVersion": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "DomainJoinInfo": {
+                            "$ref": "#/definitions/AWS::AppStream::ImageBuilder.DomainJoinInfo"
+                        },
+                        "EnableDefaultInternetAccess": {
+                            "type": "boolean"
+                        },
+                        "IamRoleArn": {
+                            "type": "string"
+                        },
+                        "ImageArn": {
+                            "type": "string"
+                        },
+                        "ImageName": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::AppStream::ImageBuilder.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "InstanceType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::ImageBuilder"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::ImageBuilder.AccessEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointType": {
+                    "type": "string"
+                },
+                "VpceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointType",
+                "VpceId"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::ImageBuilder.DomainJoinInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryName": {
+                    "type": "string"
+                },
+                "OrganizationalUnitDistinguishedName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::ImageBuilder.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppStream::Stack": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessEndpoints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::Stack.AccessEndpoint"
+                            },
+                            "type": "array"
+                        },
+                        "ApplicationSettings": {
+                            "$ref": "#/definitions/AWS::AppStream::Stack.ApplicationSettings"
+                        },
+                        "AttributesToDelete": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DeleteStorageConnectors": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "EmbedHostDomains": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "FeedbackURL": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RedirectURL": {
+                            "type": "string"
+                        },
+                        "StorageConnectors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::Stack.StorageConnector"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AppStream::Stack.UserSetting"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::Stack"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Stack.AccessEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointType": {
+                    "type": "string"
+                },
+                "VpceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointType",
+                "VpceId"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Stack.ApplicationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "SettingsGroup": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Stack.StorageConnector": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorType": {
+                    "type": "string"
+                },
+                "Domains": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ResourceIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConnectorType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::Stack.UserSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Permission": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action",
+                "Permission"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::StackFleetAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FleetName": {
+                            "type": "string"
+                        },
+                        "StackName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FleetName",
+                        "StackName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::StackFleetAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::StackUserAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
+                        "SendEmailNotification": {
+                            "type": "boolean"
+                        },
+                        "StackName": {
+                            "type": "string"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthenticationType",
+                        "StackName",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::StackUserAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppStream::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
+                        "FirstName": {
+                            "type": "string"
+                        },
+                        "LastName": {
+                            "type": "string"
+                        },
+                        "MessageAction": {
+                            "type": "string"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthenticationType",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppStream::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::ApiCache": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiCachingBehavior": {
+                            "type": "string"
+                        },
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "AtRestEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "TransitEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "Ttl": {
+                            "type": "number"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiCachingBehavior",
+                        "ApiId",
+                        "Ttl",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::ApiCache"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::ApiKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "ApiKeyId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Expires": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "ApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::ApiKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DynamoDBConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.DynamoDBConfig"
+                        },
+                        "ElasticsearchConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.ElasticsearchConfig"
+                        },
+                        "HttpConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.HttpConfig"
+                        },
+                        "LambdaConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.LambdaConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OpenSearchServiceConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.OpenSearchServiceConfig"
+                        },
+                        "RelationalDatabaseConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource.RelationalDatabaseConfig"
+                        },
+                        "ServiceRoleArn": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::DataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.AuthorizationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationType": {
+                    "type": "string"
+                },
+                "AwsIamConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::DataSource.AwsIamConfig"
+                }
+            },
+            "required": [
+                "AuthorizationType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.AwsIamConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SigningRegion": {
+                    "type": "string"
+                },
+                "SigningServiceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.DeltaSyncConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseTableTTL": {
+                    "type": "string"
+                },
+                "DeltaSyncTableName": {
+                    "type": "string"
+                },
+                "DeltaSyncTableTTL": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BaseTableTTL",
+                "DeltaSyncTableName",
+                "DeltaSyncTableTTL"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.DynamoDBConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "DeltaSyncConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::DataSource.DeltaSyncConfig"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "UseCallerCredentials": {
+                    "type": "boolean"
+                },
+                "Versioned": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AwsRegion",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.ElasticsearchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "Endpoint": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AwsRegion",
+                "Endpoint"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.HttpConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::DataSource.AuthorizationConfig"
+                },
+                "Endpoint": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.LambdaConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaFunctionArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaFunctionArn"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.OpenSearchServiceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "Endpoint": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AwsRegion",
+                "Endpoint"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.RdsHttpEndpointConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "AwsSecretStoreArn": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DbClusterIdentifier": {
+                    "type": "string"
+                },
+                "Schema": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AwsRegion",
+                "AwsSecretStoreArn",
+                "DbClusterIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::DataSource.RelationalDatabaseConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RdsHttpEndpointConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::DataSource.RdsHttpEndpointConfig"
+                },
+                "RelationalDatabaseSourceType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RelationalDatabaseSourceType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::FunctionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "DataSourceName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FunctionVersion": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RequestMappingTemplate": {
+                            "type": "string"
+                        },
+                        "RequestMappingTemplateS3Location": {
+                            "type": "string"
+                        },
+                        "ResponseMappingTemplate": {
+                            "type": "string"
+                        },
+                        "ResponseMappingTemplateS3Location": {
+                            "type": "string"
+                        },
+                        "SyncConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::FunctionConfiguration.SyncConfig"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "DataSourceName",
+                        "FunctionVersion",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::FunctionConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::FunctionConfiguration.LambdaConflictHandlerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaConflictHandlerArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::FunctionConfiguration.SyncConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConflictDetection": {
+                    "type": "string"
+                },
+                "ConflictHandler": {
+                    "type": "string"
+                },
+                "LambdaConflictHandlerConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::FunctionConfiguration.LambdaConflictHandlerConfig"
+                }
+            },
+            "required": [
+                "ConflictDetection"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdditionalAuthenticationProviders": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.AdditionalAuthenticationProviders"
+                        },
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
+                        "LambdaAuthorizerConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.LambdaAuthorizerConfig"
+                        },
+                        "LogConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.LogConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OpenIDConnectConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.OpenIDConnectConfig"
+                        },
+                        "Tags": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.Tags"
+                        },
+                        "UserPoolConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi.UserPoolConfig"
+                        },
+                        "XrayEnabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "AuthenticationType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::GraphQLApi"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.AdditionalAuthenticationProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationType": {
+                    "type": "string"
+                },
+                "LambdaAuthorizerConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::GraphQLApi.LambdaAuthorizerConfig"
+                },
+                "OpenIDConnectConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::GraphQLApi.OpenIDConnectConfig"
+                },
+                "UserPoolConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::GraphQLApi.CognitoUserPoolConfig"
+                }
+            },
+            "required": [
+                "AuthenticationType"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.AdditionalAuthenticationProviders": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.CognitoUserPoolConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AppIdClientRegex": {
+                    "type": "string"
+                },
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "UserPoolId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.LambdaAuthorizerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizerResultTtlInSeconds": {
+                    "type": "number"
+                },
+                "AuthorizerUri": {
+                    "type": "string"
+                },
+                "IdentityValidationExpression": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.LogConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsRoleArn": {
+                    "type": "string"
+                },
+                "ExcludeVerboseContent": {
+                    "type": "boolean"
+                },
+                "FieldLogLevel": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.OpenIDConnectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthTTL": {
+                    "type": "number"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "IatTTL": {
+                    "type": "number"
+                },
+                "Issuer": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.Tags": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLApi.UserPoolConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AppIdClientRegex": {
+                    "type": "string"
+                },
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "DefaultAction": {
+                    "type": "string"
+                },
+                "UserPoolId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::GraphQLSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "Definition": {
+                            "type": "string"
+                        },
+                        "DefinitionS3Location": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::GraphQLSchema"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::Resolver": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiId": {
+                            "type": "string"
+                        },
+                        "CachingConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::Resolver.CachingConfig"
+                        },
+                        "DataSourceName": {
+                            "type": "string"
+                        },
+                        "FieldName": {
+                            "type": "string"
+                        },
+                        "Kind": {
+                            "type": "string"
+                        },
+                        "PipelineConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::Resolver.PipelineConfig"
+                        },
+                        "RequestMappingTemplate": {
+                            "type": "string"
+                        },
+                        "RequestMappingTemplateS3Location": {
+                            "type": "string"
+                        },
+                        "ResponseMappingTemplate": {
+                            "type": "string"
+                        },
+                        "ResponseMappingTemplateS3Location": {
+                            "type": "string"
+                        },
+                        "SyncConfig": {
+                            "$ref": "#/definitions/AWS::AppSync::Resolver.SyncConfig"
+                        },
+                        "TypeName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiId",
+                        "FieldName",
+                        "TypeName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AppSync::Resolver"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AppSync::Resolver.CachingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CachingKeys": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Ttl": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::Resolver.LambdaConflictHandlerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaConflictHandlerArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::Resolver.PipelineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Functions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AppSync::Resolver.SyncConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConflictDetection": {
+                    "type": "string"
+                },
+                "ConflictHandler": {
+                    "type": "string"
+                },
+                "LambdaConflictHandlerConfig": {
+                    "$ref": "#/definitions/AWS::AppSync::Resolver.LambdaConflictHandlerConfig"
+                }
+            },
+            "required": [
+                "ConflictDetection"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalableTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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",
+                        "RoleARN",
+                        "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyName": {
+                            "type": "string"
+                        },
+                        "PolicyType": {
+                            "type": "string"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "ScalableDimension": {
+                            "type": "string"
+                        },
+                        "ScalingTargetId": {
+                            "type": "string"
+                        },
+                        "ServiceNamespace": {
+                            "type": "string"
+                        },
+                        "StepScalingPolicyConfiguration": {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.StepScalingPolicyConfiguration"
+                        },
+                        "TargetTrackingScalingPolicyConfiguration": {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.TargetTrackingScalingPolicyConfiguration"
+                        }
+                    },
+                    "required": [
+                        "PolicyName",
+                        "PolicyType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApplicationAutoScaling::ScalingPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.CustomizedMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "Namespace",
+                "Statistic"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.PredefinedMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.StepAdjustment": {
+            "additionalProperties": false,
+            "properties": {
+                "MetricIntervalLowerBound": {
+                    "type": "number"
+                },
+                "MetricIntervalUpperBound": {
+                    "type": "number"
+                },
+                "ScalingAdjustment": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ScalingAdjustment"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.StepScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AdjustmentType": {
+                    "type": "string"
+                },
+                "Cooldown": {
+                    "type": "number"
+                },
+                "MetricAggregationType": {
+                    "type": "string"
+                },
+                "MinAdjustmentMagnitude": {
+                    "type": "number"
+                },
+                "StepAdjustments": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.StepAdjustment"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationAutoScaling::ScalingPolicy.TargetTrackingScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomizedMetricSpecification": {
+                    "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.CustomizedMetricSpecification"
+                },
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "PredefinedMetricSpecification": {
+                    "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy.PredefinedMetricSpecification"
+                },
+                "ScaleInCooldown": {
+                    "type": "number"
+                },
+                "ScaleOutCooldown": {
+                    "type": "number"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoConfigurationEnabled": {
+                            "type": "boolean"
+                        },
+                        "CWEMonitorEnabled": {
+                            "type": "boolean"
+                        },
+                        "ComponentMonitoringSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApplicationInsights::Application.ComponentMonitoringSetting"
+                            },
+                            "type": "array"
+                        },
+                        "CustomComponents": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApplicationInsights::Application.CustomComponent"
+                            },
+                            "type": "array"
+                        },
+                        "LogPatternSets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ApplicationInsights::Application.LogPatternSet"
+                            },
+                            "type": "array"
+                        },
+                        "OpsCenterEnabled": {
+                            "type": "boolean"
+                        },
+                        "OpsItemSNSTopicArn": {
+                            "type": "string"
+                        },
+                        "ResourceGroupName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ResourceGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ApplicationInsights::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.Alarm": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmName": {
+                    "type": "string"
+                },
+                "Severity": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AlarmName"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.AlarmMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmMetricName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AlarmMetricName"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.ComponentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfigurationDetails": {
+                    "$ref": "#/definitions/AWS::ApplicationInsights::Application.ConfigurationDetails"
+                },
+                "SubComponentTypeConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.SubComponentTypeConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.ComponentMonitoringSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentARN": {
+                    "type": "string"
+                },
+                "ComponentConfigurationMode": {
+                    "type": "string"
+                },
+                "ComponentName": {
+                    "type": "string"
+                },
+                "CustomComponentConfiguration": {
+                    "$ref": "#/definitions/AWS::ApplicationInsights::Application.ComponentConfiguration"
+                },
+                "DefaultOverwriteComponentConfiguration": {
+                    "$ref": "#/definitions/AWS::ApplicationInsights::Application.ComponentConfiguration"
+                },
+                "Tier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComponentConfigurationMode",
+                "Tier"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.ConfigurationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmMetrics": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.AlarmMetric"
+                    },
+                    "type": "array"
+                },
+                "Alarms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.Alarm"
+                    },
+                    "type": "array"
+                },
+                "JMXPrometheusExporter": {
+                    "$ref": "#/definitions/AWS::ApplicationInsights::Application.JMXPrometheusExporter"
+                },
+                "Logs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.Log"
+                    },
+                    "type": "array"
+                },
+                "WindowsEvents": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.WindowsEvent"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.CustomComponent": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentName": {
+                    "type": "string"
+                },
+                "ResourceList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ComponentName",
+                "ResourceList"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.JMXPrometheusExporter": {
+            "additionalProperties": false,
+            "properties": {
+                "HostPort": {
+                    "type": "string"
+                },
+                "JMXURL": {
+                    "type": "string"
+                },
+                "PrometheusPort": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.Log": {
+            "additionalProperties": false,
+            "properties": {
+                "Encoding": {
+                    "type": "string"
+                },
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "LogPath": {
+                    "type": "string"
+                },
+                "LogType": {
+                    "type": "string"
+                },
+                "PatternSet": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogType"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.LogPattern": {
+            "additionalProperties": false,
+            "properties": {
+                "Pattern": {
+                    "type": "string"
+                },
+                "PatternName": {
+                    "type": "string"
+                },
+                "Rank": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Pattern",
+                "PatternName",
+                "Rank"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.LogPatternSet": {
+            "additionalProperties": false,
+            "properties": {
+                "LogPatterns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.LogPattern"
+                    },
+                    "type": "array"
+                },
+                "PatternSetName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogPatterns",
+                "PatternSetName"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.SubComponentConfigurationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmMetrics": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.AlarmMetric"
+                    },
+                    "type": "array"
+                },
+                "Logs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.Log"
+                    },
+                    "type": "array"
+                },
+                "WindowsEvents": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ApplicationInsights::Application.WindowsEvent"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.SubComponentTypeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SubComponentConfigurationDetails": {
+                    "$ref": "#/definitions/AWS::ApplicationInsights::Application.SubComponentConfigurationDetails"
+                },
+                "SubComponentType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubComponentConfigurationDetails",
+                "SubComponentType"
+            ],
+            "type": "object"
+        },
+        "AWS::ApplicationInsights::Application.WindowsEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "EventLevels": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EventName": {
+                    "type": "string"
+                },
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "PatternSet": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventLevels",
+                "EventName",
+                "LogGroupName"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::DataCatalog": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::DataCatalog"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::NamedQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Database": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QueryString": {
+                            "type": "string"
+                        },
+                        "WorkGroup": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Database",
+                        "QueryString"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::NamedQuery"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::PreparedStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "QueryStatement": {
+                            "type": "string"
+                        },
+                        "StatementName": {
+                            "type": "string"
+                        },
+                        "WorkGroup": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "QueryStatement",
+                        "StatementName",
+                        "WorkGroup"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::PreparedStatement"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RecursiveDeleteOption": {
+                            "type": "boolean"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkGroupConfiguration": {
+                            "$ref": "#/definitions/AWS::Athena::WorkGroup.WorkGroupConfiguration"
+                        },
+                        "WorkGroupConfigurationUpdates": {
+                            "$ref": "#/definitions/AWS::Athena::WorkGroup.WorkGroupConfigurationUpdates"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Athena::WorkGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionOption": {
+                    "type": "string"
+                },
+                "KmsKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionOption"
+            ],
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.EngineVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "EffectiveEngineVersion": {
+                    "type": "string"
+                },
+                "SelectedEngineVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.ResultConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.EncryptionConfiguration"
+                },
+                "OutputLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.ResultConfigurationUpdates": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.EncryptionConfiguration"
+                },
+                "OutputLocation": {
+                    "type": "string"
+                },
+                "RemoveEncryptionConfiguration": {
+                    "type": "boolean"
+                },
+                "RemoveOutputLocation": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.WorkGroupConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BytesScannedCutoffPerQuery": {
+                    "type": "number"
+                },
+                "EnforceWorkGroupConfiguration": {
+                    "type": "boolean"
+                },
+                "EngineVersion": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.EngineVersion"
+                },
+                "PublishCloudWatchMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "RequesterPaysEnabled": {
+                    "type": "boolean"
+                },
+                "ResultConfiguration": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.ResultConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Athena::WorkGroup.WorkGroupConfigurationUpdates": {
+            "additionalProperties": false,
+            "properties": {
+                "BytesScannedCutoffPerQuery": {
+                    "type": "number"
+                },
+                "EnforceWorkGroupConfiguration": {
+                    "type": "boolean"
+                },
+                "EngineVersion": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.EngineVersion"
+                },
+                "PublishCloudWatchMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "RemoveBytesScannedCutoffPerQuery": {
+                    "type": "boolean"
+                },
+                "RequesterPaysEnabled": {
+                    "type": "boolean"
+                },
+                "ResultConfigurationUpdates": {
+                    "$ref": "#/definitions/AWS::Athena::WorkGroup.ResultConfigurationUpdates"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssessmentReportsDestination": {
+                            "$ref": "#/definitions/AWS::AuditManager::Assessment.AssessmentReportsDestination"
+                        },
+                        "AwsAccount": {
+                            "$ref": "#/definitions/AWS::AuditManager::Assessment.AWSAccount"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FrameworkId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Roles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AuditManager::Assessment.Role"
+                            },
+                            "type": "array"
+                        },
+                        "Scope": {
+                            "$ref": "#/definitions/AWS::AuditManager::Assessment.Scope"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AuditManager::Assessment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.AWSAccount": {
+            "additionalProperties": false,
+            "properties": {
+                "EmailAddress": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.AWSService": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.AssessmentReportsDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                },
+                "DestinationType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.Delegation": {
+            "additionalProperties": false,
+            "properties": {
+                "AssessmentId": {
+                    "type": "string"
+                },
+                "AssessmentName": {
+                    "type": "string"
+                },
+                "Comment": {
+                    "type": "string"
+                },
+                "ControlSetId": {
+                    "type": "string"
+                },
+                "CreatedBy": {
+                    "type": "string"
+                },
+                "CreationTime": {
+                    "type": "number"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "LastUpdated": {
+                    "type": "number"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RoleType": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.Role": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RoleType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AuditManager::Assessment.Scope": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsAccounts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AuditManager::Assessment.AWSAccount"
+                    },
+                    "type": "array"
+                },
+                "AwsServices": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AuditManager::Assessment.AWSService"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "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": {
+                        "AutoScalingGroupName": {
+                            "type": "string"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CapacityRebalance": {
+                            "type": "boolean"
+                        },
+                        "Context": {
+                            "type": "string"
+                        },
+                        "Cooldown": {
+                            "type": "string"
+                        },
+                        "DesiredCapacity": {
+                            "type": "string"
+                        },
+                        "DesiredCapacityType": {
+                            "type": "string"
+                        },
+                        "HealthCheckGracePeriod": {
+                            "type": "number"
+                        },
+                        "HealthCheckType": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "LaunchConfigurationName": {
+                            "type": "string"
+                        },
+                        "LaunchTemplate": {
+                            "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LaunchTemplateSpecification"
+                        },
+                        "LifecycleHookSpecificationList": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LifecycleHookSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "LoadBalancerNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MaxInstanceLifetime": {
+                            "type": "number"
+                        },
+                        "MaxSize": {
+                            "type": "string"
+                        },
+                        "MetricsCollection": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.MetricsCollection"
+                            },
+                            "type": "array"
+                        },
+                        "MinSize": {
+                            "type": "string"
+                        },
+                        "MixedInstancesPolicy": {
+                            "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.MixedInstancesPolicy"
+                        },
+                        "NewInstancesProtectedFromScaleIn": {
+                            "type": "boolean"
+                        },
+                        "NotificationConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.NotificationConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "PlacementGroup": {
+                            "type": "string"
+                        },
+                        "ServiceLinkedRoleARN": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.TagProperty"
+                            },
+                            "type": "array"
+                        },
+                        "TargetGroupARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "TerminationPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VPCZoneIdentifier": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MaxSize",
+                        "MinSize"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::AutoScalingGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdatePolicy": {
+                    "type": "object"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.AcceleratorCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.AcceleratorTotalMemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.BaselineEbsBandwidthMbpsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.InstanceRequirements": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceleratorCount": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.AcceleratorCountRequest"
+                },
+                "AcceleratorManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorTotalMemoryMiB": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.AcceleratorTotalMemoryMiBRequest"
+                },
+                "AcceleratorTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BareMetal": {
+                    "type": "string"
+                },
+                "BaselineEbsBandwidthMbps": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.BaselineEbsBandwidthMbpsRequest"
+                },
+                "BurstablePerformance": {
+                    "type": "string"
+                },
+                "CpuManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExcludedInstanceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InstanceGenerations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LocalStorage": {
+                    "type": "string"
+                },
+                "LocalStorageTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MemoryGiBPerVCpu": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.MemoryGiBPerVCpuRequest"
+                },
+                "MemoryMiB": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.MemoryMiBRequest"
+                },
+                "NetworkInterfaceCount": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.NetworkInterfaceCountRequest"
+                },
+                "OnDemandMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "RequireHibernateSupport": {
+                    "type": "boolean"
+                },
+                "SpotMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "TotalLocalStorageGB": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.TotalLocalStorageGBRequest"
+                },
+                "VCpuCount": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.VCpuCountRequest"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.InstancesDistribution": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandAllocationStrategy": {
+                    "type": "string"
+                },
+                "OnDemandBaseCapacity": {
+                    "type": "number"
+                },
+                "OnDemandPercentageAboveBaseCapacity": {
+                    "type": "number"
+                },
+                "SpotAllocationStrategy": {
+                    "type": "string"
+                },
+                "SpotInstancePools": {
+                    "type": "number"
+                },
+                "SpotMaxPrice": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.LaunchTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LaunchTemplateSpecification"
+                },
+                "Overrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LaunchTemplateOverrides"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LaunchTemplateSpecification"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.LaunchTemplateOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceRequirements": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.InstanceRequirements"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "LaunchTemplateSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LaunchTemplateSpecification"
+                },
+                "WeightedCapacity": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.LaunchTemplateSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.LifecycleHookSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultResult": {
+                    "type": "string"
+                },
+                "HeartbeatTimeout": {
+                    "type": "number"
+                },
+                "LifecycleHookName": {
+                    "type": "string"
+                },
+                "LifecycleTransition": {
+                    "type": "string"
+                },
+                "NotificationMetadata": {
+                    "type": "string"
+                },
+                "NotificationTargetARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LifecycleHookName",
+                "LifecycleTransition"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.MemoryGiBPerVCpuRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.MemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.MetricsCollection": {
+            "additionalProperties": false,
+            "properties": {
+                "Granularity": {
+                    "type": "string"
+                },
+                "Metrics": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Granularity"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.MixedInstancesPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "InstancesDistribution": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.InstancesDistribution"
+                },
+                "LaunchTemplate": {
+                    "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup.LaunchTemplate"
+                }
+            },
+            "required": [
+                "LaunchTemplate"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.NetworkInterfaceCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NotificationTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TopicARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TopicARN"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.TagProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "PropagateAtLaunch": {
+                    "type": "boolean"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "PropagateAtLaunch",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.TotalLocalStorageGBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::AutoScalingGroup.VCpuCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::LaunchConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatePublicIpAddress": {
+                            "type": "boolean"
+                        },
+                        "BlockDeviceMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::LaunchConfiguration.BlockDeviceMapping"
+                            },
+                            "type": "array"
+                        },
+                        "ClassicLinkVPCId": {
+                            "type": "string"
+                        },
+                        "ClassicLinkVPCSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EbsOptimized": {
+                            "type": "boolean"
+                        },
+                        "IamInstanceProfile": {
+                            "type": "string"
+                        },
+                        "ImageId": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "InstanceMonitoring": {
+                            "type": "boolean"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "KernelId": {
+                            "type": "string"
+                        },
+                        "KeyName": {
+                            "type": "string"
+                        },
+                        "LaunchConfigurationName": {
+                            "type": "string"
+                        },
+                        "MetadataOptions": {
+                            "$ref": "#/definitions/AWS::AutoScaling::LaunchConfiguration.MetadataOptions"
+                        },
+                        "PlacementTenancy": {
+                            "type": "string"
+                        },
+                        "RamDiskId": {
+                            "type": "string"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SpotPrice": {
+                            "type": "string"
+                        },
+                        "UserData": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ImageId",
+                        "InstanceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::LaunchConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::LaunchConfiguration.BlockDevice": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "Throughput": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::LaunchConfiguration.BlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::AutoScaling::LaunchConfiguration.BlockDevice"
+                },
+                "NoDevice": {
+                    "type": "boolean"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeviceName"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::LaunchConfiguration.MetadataOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpEndpoint": {
+                    "type": "string"
+                },
+                "HttpPutResponseHopLimit": {
+                    "type": "number"
+                },
+                "HttpTokens": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScaling::LifecycleHook": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DefaultResult": {
+                            "type": "string"
+                        },
+                        "HeartbeatTimeout": {
+                            "type": "number"
+                        },
+                        "LifecycleHookName": {
+                            "type": "string"
+                        },
+                        "LifecycleTransition": {
+                            "type": "string"
+                        },
+                        "NotificationMetadata": {
+                            "type": "string"
+                        },
+                        "NotificationTargetARN": {
+                            "type": "string"
+                        },
+                        "RoleARN": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupName",
+                        "LifecycleTransition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::LifecycleHook"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdjustmentType": {
+                            "type": "string"
+                        },
+                        "AutoScalingGroupName": {
+                            "type": "string"
+                        },
+                        "Cooldown": {
+                            "type": "string"
+                        },
+                        "EstimatedInstanceWarmup": {
+                            "type": "number"
+                        },
+                        "MetricAggregationType": {
+                            "type": "string"
+                        },
+                        "MinAdjustmentMagnitude": {
+                            "type": "number"
+                        },
+                        "PolicyType": {
+                            "type": "string"
+                        },
+                        "PredictiveScalingConfiguration": {
+                            "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredictiveScalingConfiguration"
+                        },
+                        "ScalingAdjustment": {
+                            "type": "number"
+                        },
+                        "StepAdjustments": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.StepAdjustment"
+                            },
+                            "type": "array"
+                        },
+                        "TargetTrackingConfiguration": {
+                            "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.TargetTrackingConfiguration"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScaling::ScalingPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.CustomizedMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "Namespace",
+                "Statistic"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredefinedMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredictiveScalingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacityBreachBehavior": {
+                    "type": "string"
+                },
+                "MaxCapacityBuffer": {
+                    "type": "number"
+                },
+                "MetricSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredictiveScalingMetricSpecification"
+                    },
+                    "type": "array"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "SchedulingBufferTime": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MetricSpecifications"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredictiveScalingMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedLoadMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedLoadMetric"
+                },
+                "PredefinedMetricPairSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedMetricPair"
+                },
+                "PredefinedScalingMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedScalingMetric"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedLoadMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedMetricPair": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.PredictiveScalingPredefinedScalingMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.StepAdjustment": {
+            "additionalProperties": false,
+            "properties": {
+                "MetricIntervalLowerBound": {
+                    "type": "number"
+                },
+                "MetricIntervalUpperBound": {
+                    "type": "number"
+                },
+                "ScalingAdjustment": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ScalingAdjustment"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScalingPolicy.TargetTrackingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomizedMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.CustomizedMetricSpecification"
+                },
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "PredefinedMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy.PredefinedMetricSpecification"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScaling::ScheduledAction": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "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::AutoScalingPlans::ScalingPlan": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationSource": {
+                            "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.ApplicationSource"
+                        },
+                        "ScalingInstructions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.ScalingInstruction"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationSource",
+                        "ScalingInstructions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::AutoScalingPlans::ScalingPlan"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.ApplicationSource": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudFormationStackARN": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.CustomizedLoadMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "Namespace",
+                "Statistic"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.CustomizedScalingMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "Namespace",
+                "Statistic"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.PredefinedLoadMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedLoadMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedLoadMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.PredefinedScalingMetricSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PredefinedScalingMetricType": {
+                    "type": "string"
+                },
+                "ResourceLabel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PredefinedScalingMetricType"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.ScalingInstruction": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomizedLoadMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.CustomizedLoadMetricSpecification"
+                },
+                "DisableDynamicScaling": {
+                    "type": "boolean"
+                },
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                },
+                "PredefinedLoadMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.PredefinedLoadMetricSpecification"
+                },
+                "PredictiveScalingMaxCapacityBehavior": {
+                    "type": "string"
+                },
+                "PredictiveScalingMaxCapacityBuffer": {
+                    "type": "number"
+                },
+                "PredictiveScalingMode": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                },
+                "ScalableDimension": {
+                    "type": "string"
+                },
+                "ScalingPolicyUpdateBehavior": {
+                    "type": "string"
+                },
+                "ScheduledActionBufferTime": {
+                    "type": "number"
+                },
+                "ServiceNamespace": {
+                    "type": "string"
+                },
+                "TargetTrackingConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.TargetTrackingConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity",
+                "ResourceId",
+                "ScalableDimension",
+                "ServiceNamespace",
+                "TargetTrackingConfigurations"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.TagFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::AutoScalingPlans::ScalingPlan.TargetTrackingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomizedScalingMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.CustomizedScalingMetricSpecification"
+                },
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "EstimatedInstanceWarmup": {
+                    "type": "number"
+                },
+                "PredefinedScalingMetricSpecification": {
+                    "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan.PredefinedScalingMetricSpecification"
+                },
+                "ScaleInCooldown": {
+                    "type": "number"
+                },
+                "ScaleOutCooldown": {
+                    "type": "number"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BackupPlan": {
+                            "$ref": "#/definitions/AWS::Backup::BackupPlan.BackupPlanResourceType"
+                        },
+                        "BackupPlanTags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "BackupPlan"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Backup::BackupPlan"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan.AdvancedBackupSettingResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "BackupOptions": {
+                    "type": "object"
+                },
+                "ResourceType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BackupOptions",
+                "ResourceType"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan.BackupPlanResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "AdvancedBackupSettings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Backup::BackupPlan.AdvancedBackupSettingResourceType"
+                    },
+                    "type": "array"
+                },
+                "BackupPlanName": {
+                    "type": "string"
+                },
+                "BackupPlanRule": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Backup::BackupPlan.BackupRuleResourceType"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "BackupPlanName",
+                "BackupPlanRule"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan.BackupRuleResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "CompletionWindowMinutes": {
+                    "type": "number"
+                },
+                "CopyActions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Backup::BackupPlan.CopyActionResourceType"
+                    },
+                    "type": "array"
+                },
+                "EnableContinuousBackup": {
+                    "type": "boolean"
+                },
+                "Lifecycle": {
+                    "$ref": "#/definitions/AWS::Backup::BackupPlan.LifecycleResourceType"
+                },
+                "RecoveryPointTags": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "RuleName": {
+                    "type": "string"
+                },
+                "ScheduleExpression": {
+                    "type": "string"
+                },
+                "StartWindowMinutes": {
+                    "type": "number"
+                },
+                "TargetBackupVault": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RuleName",
+                "TargetBackupVault"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan.CopyActionResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationBackupVaultArn": {
+                    "type": "string"
+                },
+                "Lifecycle": {
+                    "$ref": "#/definitions/AWS::Backup::BackupPlan.LifecycleResourceType"
+                }
+            },
+            "required": [
+                "DestinationBackupVaultArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupPlan.LifecycleResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteAfterDays": {
+                    "type": "number"
+                },
+                "MoveToColdStorageAfterDays": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Backup::BackupSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BackupPlanId": {
+                            "type": "string"
+                        },
+                        "BackupSelection": {
+                            "$ref": "#/definitions/AWS::Backup::BackupSelection.BackupSelectionResourceType"
+                        }
+                    },
+                    "required": [
+                        "BackupPlanId",
+                        "BackupSelection"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Backup::BackupSelection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupSelection.BackupSelectionResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "type": "object"
+                },
+                "IamRoleArn": {
+                    "type": "string"
+                },
+                "ListOfTags": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Backup::BackupSelection.ConditionResourceType"
+                    },
+                    "type": "array"
+                },
+                "NotResources": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Resources": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SelectionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IamRoleArn",
+                "SelectionName"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupSelection.ConditionResourceType": {
+            "additionalProperties": false,
+            "properties": {
+                "ConditionKey": {
+                    "type": "string"
+                },
+                "ConditionType": {
+                    "type": "string"
+                },
+                "ConditionValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConditionKey",
+                "ConditionType",
+                "ConditionValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupVault": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessPolicy": {
+                            "type": "object"
+                        },
+                        "BackupVaultName": {
+                            "type": "string"
+                        },
+                        "BackupVaultTags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "EncryptionKeyArn": {
+                            "type": "string"
+                        },
+                        "LockConfiguration": {
+                            "$ref": "#/definitions/AWS::Backup::BackupVault.LockConfigurationType"
+                        },
+                        "Notifications": {
+                            "$ref": "#/definitions/AWS::Backup::BackupVault.NotificationObjectType"
+                        }
+                    },
+                    "required": [
+                        "BackupVaultName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Backup::BackupVault"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupVault.LockConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "ChangeableForDays": {
+                    "type": "number"
+                },
+                "MaxRetentionDays": {
+                    "type": "number"
+                },
+                "MinRetentionDays": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MinRetentionDays"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::BackupVault.NotificationObjectType": {
+            "additionalProperties": false,
+            "properties": {
+                "BackupVaultEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SNSTopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BackupVaultEvents",
+                "SNSTopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::Framework": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FrameworkControls": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Backup::Framework.FrameworkControl"
+                            },
+                            "type": "array"
+                        },
+                        "FrameworkDescription": {
+                            "type": "string"
+                        },
+                        "FrameworkName": {
+                            "type": "string"
+                        },
+                        "FrameworkTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FrameworkControls"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Backup::Framework"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::Framework.ControlInputParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ParameterName",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::Framework.FrameworkControl": {
+            "additionalProperties": false,
+            "properties": {
+                "ControlInputParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Backup::Framework.ControlInputParameter"
+                    },
+                    "type": "array"
+                },
+                "ControlName": {
+                    "type": "string"
+                },
+                "ControlScope": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "ControlName"
+            ],
+            "type": "object"
+        },
+        "AWS::Backup::ReportPlan": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ReportDeliveryChannel": {
+                            "type": "object"
+                        },
+                        "ReportPlanDescription": {
+                            "type": "string"
+                        },
+                        "ReportPlanName": {
+                            "type": "string"
+                        },
+                        "ReportPlanTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ReportSetting": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ReportDeliveryChannel",
+                        "ReportSetting"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Backup::ReportPlan"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::ComputeEnvironment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ComputeEnvironmentName": {
+                            "type": "string"
+                        },
+                        "ComputeResources": {
+                            "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.ComputeResources"
+                        },
+                        "ServiceRole": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "UnmanagedvCpus": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Batch::ComputeEnvironment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::ComputeEnvironment.ComputeResources": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "BidPercentage": {
+                    "type": "number"
+                },
+                "DesiredvCpus": {
+                    "type": "number"
+                },
+                "Ec2Configuration": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.Ec2ConfigurationObject"
+                    },
+                    "type": "array"
+                },
+                "Ec2KeyPair": {
+                    "type": "string"
+                },
+                "ImageId": {
+                    "type": "string"
+                },
+                "InstanceRole": {
+                    "type": "string"
+                },
+                "InstanceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LaunchTemplate": {
+                    "$ref": "#/definitions/AWS::Batch::ComputeEnvironment.LaunchTemplateSpecification"
+                },
+                "MaxvCpus": {
+                    "type": "number"
+                },
+                "MinvCpus": {
+                    "type": "number"
+                },
+                "PlacementGroup": {
+                    "type": "string"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SpotIamFleetRole": {
+                    "type": "string"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Tags": {
+                    "type": "object"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MaxvCpus",
+                "Subnets",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::ComputeEnvironment.Ec2ConfigurationObject": {
+            "additionalProperties": false,
+            "properties": {
+                "ImageIdOverride": {
+                    "type": "string"
+                },
+                "ImageType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ImageType"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::ComputeEnvironment.LaunchTemplateSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContainerProperties": {
+                            "$ref": "#/definitions/AWS::Batch::JobDefinition.ContainerProperties"
+                        },
+                        "JobDefinitionName": {
+                            "type": "string"
+                        },
+                        "NodeProperties": {
+                            "$ref": "#/definitions/AWS::Batch::JobDefinition.NodeProperties"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "PlatformCapabilities": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PropagateTags": {
+                            "type": "boolean"
+                        },
+                        "RetryStrategy": {
+                            "$ref": "#/definitions/AWS::Batch::JobDefinition.RetryStrategy"
+                        },
+                        "SchedulingPriority": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Timeout": {
+                            "$ref": "#/definitions/AWS::Batch::JobDefinition.Timeout"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Batch::JobDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.AuthorizationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessPointId": {
+                    "type": "string"
+                },
+                "Iam": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.ContainerProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Command": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Environment": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Environment"
+                    },
+                    "type": "array"
+                },
+                "ExecutionRoleArn": {
+                    "type": "string"
+                },
+                "FargatePlatformConfiguration": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.FargatePlatformConfiguration"
+                },
+                "Image": {
+                    "type": "string"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "JobRoleArn": {
+                    "type": "string"
+                },
+                "LinuxParameters": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.LinuxParameters"
+                },
+                "LogConfiguration": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.LogConfiguration"
+                },
+                "Memory": {
+                    "type": "number"
+                },
+                "MountPoints": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.MountPoints"
+                    },
+                    "type": "array"
+                },
+                "NetworkConfiguration": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.NetworkConfiguration"
+                },
+                "Privileged": {
+                    "type": "boolean"
+                },
+                "ReadonlyRootFilesystem": {
+                    "type": "boolean"
+                },
+                "ResourceRequirements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.ResourceRequirement"
+                    },
+                    "type": "array"
+                },
+                "Secrets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Secret"
+                    },
+                    "type": "array"
+                },
+                "Ulimits": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Ulimit"
+                    },
+                    "type": "array"
+                },
+                "User": {
+                    "type": "string"
+                },
+                "Vcpus": {
+                    "type": "number"
+                },
+                "Volumes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Volumes"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Image"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Device": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "HostPath": {
+                    "type": "string"
+                },
+                "Permissions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.EfsVolumeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationConfig": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.AuthorizationConfig"
+                },
+                "FileSystemId": {
+                    "type": "string"
+                },
+                "RootDirectory": {
+                    "type": "string"
+                },
+                "TransitEncryption": {
+                    "type": "string"
+                },
+                "TransitEncryptionPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FileSystemId"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.EvaluateOnExit": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "OnExitCode": {
+                    "type": "string"
+                },
+                "OnReason": {
+                    "type": "string"
+                },
+                "OnStatusReason": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.FargatePlatformConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "PlatformVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.LinuxParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Devices": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Device"
+                    },
+                    "type": "array"
+                },
+                "InitProcessEnabled": {
+                    "type": "boolean"
+                },
+                "MaxSwap": {
+                    "type": "number"
+                },
+                "SharedMemorySize": {
+                    "type": "number"
+                },
+                "Swappiness": {
+                    "type": "number"
+                },
+                "Tmpfs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Tmpfs"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.LogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogDriver": {
+                    "type": "string"
+                },
+                "Options": {
+                    "type": "object"
+                },
+                "SecretOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.Secret"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LogDriver"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.MountPoints": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "ReadOnly": {
+                    "type": "boolean"
+                },
+                "SourceVolume": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AssignPublicIp": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.NodeProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "MainNode": {
+                    "type": "number"
+                },
+                "NodeRangeProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.NodeRangeProperty"
+                    },
+                    "type": "array"
+                },
+                "NumNodes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MainNode",
+                "NodeRangeProperties",
+                "NumNodes"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.NodeRangeProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Container": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.ContainerProperties"
+                },
+                "TargetNodes": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TargetNodes"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.ResourceRequirement": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.RetryStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "Attempts": {
+                    "type": "number"
+                },
+                "EvaluateOnExit": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::JobDefinition.EvaluateOnExit"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Secret": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "ValueFrom": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "ValueFrom"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Timeout": {
+            "additionalProperties": false,
+            "properties": {
+                "AttemptDurationSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Tmpfs": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "MountOptions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Size": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ContainerPath",
+                "Size"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Ulimit": {
+            "additionalProperties": false,
+            "properties": {
+                "HardLimit": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SoftLimit": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "HardLimit",
+                "Name",
+                "SoftLimit"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.Volumes": {
+            "additionalProperties": false,
+            "properties": {
+                "EfsVolumeConfiguration": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.EfsVolumeConfiguration"
+                },
+                "Host": {
+                    "$ref": "#/definitions/AWS::Batch::JobDefinition.VolumesHost"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobDefinition.VolumesHost": {
+            "additionalProperties": false,
+            "properties": {
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::JobQueue": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ComputeEnvironmentOrder": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Batch::JobQueue.ComputeEnvironmentOrder"
+                            },
+                            "type": "array"
+                        },
+                        "JobQueueName": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        },
+                        "SchedulingPolicyArn": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ComputeEnvironmentOrder",
+                        "Priority"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Batch::JobQueue"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::JobQueue.ComputeEnvironmentOrder": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeEnvironment": {
+                    "type": "string"
+                },
+                "Order": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ComputeEnvironment",
+                "Order"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::SchedulingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FairsharePolicy": {
+                            "$ref": "#/definitions/AWS::Batch::SchedulingPolicy.FairsharePolicy"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Batch::SchedulingPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Batch::SchedulingPolicy.FairsharePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeReservation": {
+                    "type": "number"
+                },
+                "ShareDecaySeconds": {
+                    "type": "number"
+                },
+                "ShareDistribution": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Batch::SchedulingPolicy.ShareAttributes"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Batch::SchedulingPolicy.ShareAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "ShareIdentifier": {
+                    "type": "string"
+                },
+                "WeightFactor": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Budgets::Budget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.BudgetData": {
+            "additionalProperties": false,
+            "properties": {
+                "BudgetLimit": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.Spend"
+                },
+                "BudgetName": {
+                    "type": "string"
+                },
+                "BudgetType": {
+                    "type": "string"
+                },
+                "CostFilters": {
+                    "type": "object"
+                },
+                "CostTypes": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.CostTypes"
+                },
+                "PlannedBudgetLimits": {
+                    "type": "object"
+                },
+                "TimePeriod": {
+                    "$ref": "#/definitions/AWS::Budgets::Budget.TimePeriod"
+                },
+                "TimeUnit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BudgetType",
+                "TimeUnit"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.CostTypes": {
+            "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"
+                },
+                "UseBlended": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Budgets::Budget.Notification": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "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.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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ActionThreshold": {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ActionThreshold"
+                        },
+                        "ActionType": {
+                            "type": "string"
+                        },
+                        "ApprovalModel": {
+                            "type": "string"
+                        },
+                        "BudgetName": {
+                            "type": "string"
+                        },
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Definition"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "NotificationType": {
+                            "type": "string"
+                        },
+                        "Subscribers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Budgets::BudgetsAction.Subscriber"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ActionThreshold",
+                        "ActionType",
+                        "BudgetName",
+                        "Definition",
+                        "ExecutionRoleArn",
+                        "NotificationType",
+                        "Subscribers"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Budgets::BudgetsAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.ActionThreshold": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.Definition": {
+            "additionalProperties": false,
+            "properties": {
+                "IamActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.IamActionDefinition"
+                },
+                "ScpActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.ScpActionDefinition"
+                },
+                "SsmActionDefinition": {
+                    "$ref": "#/definitions/AWS::Budgets::BudgetsAction.SsmActionDefinition"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.IamActionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Groups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PolicyArn": {
+                    "type": "string"
+                },
+                "Roles": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Users": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "PolicyArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.ScpActionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "PolicyId": {
+                    "type": "string"
+                },
+                "TargetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "PolicyId",
+                "TargetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.SsmActionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "Subtype": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceIds",
+                "Region",
+                "Subtype"
+            ],
+            "type": "object"
+        },
+        "AWS::Budgets::BudgetsAction.Subscriber": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Address",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CE::AnomalyMonitor": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        }
+                    },
+                    "required": [
+                        "MonitorName",
+                        "MonitorType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CE::AnomalyMonitor"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CE::AnomalySubscription": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Subscribers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CE::AnomalySubscription.Subscriber"
+                            },
+                            "type": "array"
+                        },
+                        "SubscriptionName": {
+                            "type": "string"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Frequency",
+                        "MonitorArnList",
+                        "Subscribers",
+                        "SubscriptionName",
+                        "Threshold"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CE::AnomalySubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CE::AnomalySubscription.Subscriber": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Address",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CE::CostCategory": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "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"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CUR::ReportDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CUR::ReportDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Keyspace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cassandra::Keyspace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Cassandra::Table": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BillingMode": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.BillingMode"
+                        },
+                        "ClusteringKeyColumns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cassandra::Table.ClusteringKeyColumn"
+                            },
+                            "type": "array"
+                        },
+                        "DefaultTimeToLive": {
+                            "type": "number"
+                        },
+                        "EncryptionSpecification": {
+                            "$ref": "#/definitions/AWS::Cassandra::Table.EncryptionSpecification"
+                        },
+                        "KeyspaceName": {
+                            "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"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "KeyspaceName",
+                        "PartitionKeyColumns"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cassandra::Table"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "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::CertificateManager::Account": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExpiryEventsConfiguration": {
+                            "$ref": "#/definitions/AWS::CertificateManager::Account.ExpiryEventsConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ExpiryEventsConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CertificateManager::Account"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CertificateManager::Account.ExpiryEventsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DaysBeforeExpiry": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CertificateManager::Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "CertificateTransparencyLoggingPreference": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "DomainValidationOptions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CertificateManager::Certificate.DomainValidationOption"
+                            },
+                            "type": "array"
+                        },
+                        "SubjectAlternativeNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ValidationMethod": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CertificateManager::Certificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CertificateManager::Certificate.DomainValidationOption": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                },
+                "ValidationDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DomainName"
+            ],
+            "type": "object"
+        },
+        "AWS::Chatbot::SlackChannelConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigurationName": {
+                            "type": "string"
+                        },
+                        "GuardrailPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "IamRoleArn": {
+                            "type": "string"
+                        },
+                        "LoggingLevel": {
+                            "type": "string"
+                        },
+                        "SlackChannelId": {
+                            "type": "string"
+                        },
+                        "SlackWorkspaceId": {
+                            "type": "string"
+                        },
+                        "SnsTopicArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "UserRoleRequired": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationName",
+                        "IamRoleArn",
+                        "SlackChannelId",
+                        "SlackWorkspaceId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Chatbot::SlackChannelConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cloud9::EnvironmentEC2": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": [
+                        "InstanceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cloud9::EnvironmentEC2"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cloud9::EnvironmentEC2.Repository": {
+            "additionalProperties": false,
+            "properties": {
+                "PathComponent": {
+                    "type": "string"
+                },
+                "RepositoryUrl": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PathComponent",
+                "RepositoryUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::CustomResource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::Macro": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "LogRoleARN": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FunctionName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::Macro"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::ModuleDefaultVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ModuleDefaultVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::ModuleVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ModuleName": {
+                            "type": "string"
+                        },
+                        "ModulePackage": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ModuleName",
+                        "ModulePackage"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ModuleVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::PublicTypeVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::Publisher": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptTermsAndConditions": {
+                            "type": "boolean"
+                        },
+                        "ConnectionArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AcceptTermsAndConditions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::Publisher"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::ResourceDefaultVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "TypeName": {
+                            "type": "string"
+                        },
+                        "TypeVersionArn": {
+                            "type": "string"
+                        },
+                        "VersionId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::ResourceDefaultVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::ResourceVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::ResourceVersion.LoggingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "LogRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::Stack": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "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": {
+                            "type": "string"
+                        },
+                        "ManagedExecution": {
+                            "type": "object"
+                        },
+                        "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": [
+                        "PermissionModel",
+                        "StackSetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFormation::StackSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.AutoDeployment": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "RetainStacksOnAccountRemoval": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.DeploymentTargets": {
+            "additionalProperties": false,
+            "properties": {
+                "Accounts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OrganizationalUnitIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFormation::StackSet.OperationPreferences": {
+            "additionalProperties": false,
+            "properties": {
+                "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": [
+                "ParameterKey",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::Distribution": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                },
+                "OriginProtocolPolicy": {
+                    "type": "string"
+                },
+                "OriginReadTimeout": {
+                    "type": "number"
+                },
+                "OriginSSLProtocols": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "OriginProtocolPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.DefaultCacheBehavior": {
+            "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"
+                },
+                "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": [
+                "TargetOriginId",
+                "ViewerProtocolPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.DistributionConfig": {
+            "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"
+                },
+                "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"
+                },
+                "ViewerCertificate": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.ViewerCertificate"
+                },
+                "WebACLId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.ForwardedValues": {
+            "additionalProperties": false,
+            "properties": {
+                "Cookies": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.Cookies"
+                },
+                "Headers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "QueryString": {
+                    "type": "boolean"
+                },
+                "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"
+                },
+                "OriginProtocolPolicy": {
+                    "type": "string"
+                },
+                "OriginSSLProtocols": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DNSName",
+                "OriginProtocolPolicy",
+                "OriginSSLProtocols"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.LegacyS3Origin": {
+            "additionalProperties": false,
+            "properties": {
+                "DNSName": {
+                    "type": "string"
+                },
+                "OriginAccessIdentity": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DNSName"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "IncludeCookies": {
+                    "type": "boolean"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.Origin": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionAttempts": {
+                    "type": "number"
+                },
+                "ConnectionTimeout": {
+                    "type": "number"
+                },
+                "CustomOriginConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.CustomOriginConfig"
+                },
+                "DomainName": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "OriginCustomHeaders": {
+                    "items": {
+                        "$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": [
+                "DomainName",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.OriginCustomHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderName": {
+                    "type": "string"
+                },
+                "HeaderValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HeaderName",
+                "HeaderValue"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.OriginGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "FailoverCriteria": {
+                    "$ref": "#/definitions/AWS::CloudFront::Distribution.OriginGroupFailoverCriteria"
+                },
+                "Id": {
+                    "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": {
+                    "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"
+                },
+                "Quantity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Quantity"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Distribution.OriginShield": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "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"
+                    },
+                    "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"
+                },
+                "MinimumProtocolVersion": {
+                    "type": "string"
+                },
+                "SslSupportMethod": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFront::Function": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoPublish": {
+                            "type": "boolean"
+                        },
+                        "FunctionCode": {
+                            "type": "string"
+                        },
+                        "FunctionConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::Function.FunctionConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::Function"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Function.FunctionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "Runtime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Comment",
+                "Runtime"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::Function.FunctionMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionARN": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CloudFront::KeyGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "KeyGroupConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::KeyGroup.KeyGroupConfig"
+                        }
+                    },
+                    "required": [
+                        "KeyGroupConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::KeyGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "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::OriginRequestPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "OriginRequestPolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.OriginRequestPolicyConfig"
+                        }
+                    },
+                    "required": [
+                        "OriginRequestPolicyConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::OriginRequestPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::OriginRequestPolicy.CookiesConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CookieBehavior": {
+                    "type": "string"
+                },
+                "Cookies": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CookieBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::OriginRequestPolicy.HeadersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderBehavior": {
+                    "type": "string"
+                },
+                "Headers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "HeaderBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::OriginRequestPolicy.OriginRequestPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "CookiesConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy.CookiesConfig"
+                },
+                "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::CloudFront::OriginRequestPolicy.QueryStringsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryStringBehavior": {
+                    "type": "string"
+                },
+                "QueryStrings": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "QueryStringBehavior"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::PublicKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PublicKeyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::PublicKey.PublicKeyConfig"
+                        }
+                    },
+                    "required": [
+                        "PublicKeyConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::PublicKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::PublicKey.PublicKeyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CallerReference": {
+                    "type": "string"
+                },
+                "Comment": {
+                    "type": "string"
+                },
+                "EncodedKey": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CallerReference",
+                "EncodedKey",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::RealtimeLogConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        }
+                    },
+                    "required": [
+                        "EndPoints",
+                        "Fields",
+                        "Name",
+                        "SamplingRate"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::RealtimeLogConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::RealtimeLogConfig.EndPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "KinesisStreamConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::RealtimeLogConfig.KinesisStreamConfig"
+                },
+                "StreamType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KinesisStreamConfig",
+                "StreamType"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::RealtimeLogConfig.KinesisStreamConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "StreamArn"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResponseHeadersPolicyConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.ResponseHeadersPolicyConfig"
+                        }
+                    },
+                    "required": [
+                        "ResponseHeadersPolicyConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::ResponseHeadersPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "Items": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Items"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowMethods": {
+            "additionalProperties": false,
+            "properties": {
+                "Items": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Items"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowOrigins": {
+            "additionalProperties": false,
+            "properties": {
+                "Items": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Items"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.AccessControlExposeHeaders": {
+            "additionalProperties": false,
+            "properties": {
+                "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::CloudFront::ResponseHeadersPolicy.ContentTypeOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Override": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Override"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.CorsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessControlAllowCredentials": {
+                    "type": "boolean"
+                },
+                "AccessControlAllowHeaders": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowHeaders"
+                },
+                "AccessControlAllowMethods": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowMethods"
+                },
+                "AccessControlAllowOrigins": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlAllowOrigins"
+                },
+                "AccessControlExposeHeaders": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.AccessControlExposeHeaders"
+                },
+                "AccessControlMaxAgeSec": {
+                    "type": "number"
+                },
+                "OriginOverride": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AccessControlAllowCredentials",
+                "AccessControlAllowHeaders",
+                "AccessControlAllowMethods",
+                "AccessControlAllowOrigins",
+                "OriginOverride"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.CustomHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "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::CloudFront::ResponseHeadersPolicy.CustomHeader"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Items"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.FrameOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "FrameOption": {
+                    "type": "string"
+                },
+                "Override": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "FrameOption",
+                "Override"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.ReferrerPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Override": {
+                    "type": "boolean"
+                },
+                "ReferrerPolicy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Override",
+                "ReferrerPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudFront::ResponseHeadersPolicy.ResponseHeadersPolicyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "CorsConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.CorsConfig"
+                },
+                "CustomHeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.CustomHeadersConfig"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SecurityHeadersConfig": {
+                    "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy.SecurityHeadersConfig"
+                }
+            },
+            "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.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::CloudFront::StreamingDistribution": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "StreamingDistributionConfig": {
+                            "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution.StreamingDistributionConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "StreamingDistributionConfig",
+                        "Tags"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudFront::StreamingDistribution"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "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::Trail": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "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"
+                        }
+                    },
+                    "required": [
+                        "IsLogging",
+                        "S3BucketName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudTrail::Trail"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudTrail::Trail.DataResource": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "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"
+                        },
+                        "Threshold": {
+                            "type": "number"
+                        },
+                        "ThresholdMetricId": {
+                            "type": "string"
+                        },
+                        "TreatMissingData": {
+                            "type": "string"
+                        },
+                        "Unit": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ComparisonOperator",
+                        "EvaluationPeriods"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::Alarm"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Configuration"
+                        },
+                        "Dimensions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
+                            },
+                            "type": "array"
+                        },
+                        "MetricMathAnomalyDetector": {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricMathAnomalyDetector"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Namespace": {
+                            "type": "string"
+                        },
+                        "SingleMetricAnomalyDetector": {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.SingleMetricAnomalyDetector"
+                        },
+                        "Stat": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::AnomalyDetector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "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": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.Metric": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.Dimension"
+                    },
+                    "type": "array"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "Namespace"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.MetricDataQueries": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::CloudWatch::AnomalyDetector.MetricDataQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Label": {
+                    "type": "string"
+                },
+                "MetricStat": {
+                    "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector.MetricStat"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "ReturnData": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "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": {
+                "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ActionsEnabled": {
+                            "type": "boolean"
+                        },
+                        "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"
+                        }
+                    },
+                    "required": [
+                        "AlarmName",
+                        "AlarmRule"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::CompositeAlarm"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::Dashboard": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DashboardBody": {
+                            "type": "string"
+                        },
+                        "DashboardName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DashboardBody"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::Dashboard"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::InsightRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RuleBody": {
+                            "type": "string"
+                        },
+                        "RuleName": {
+                            "type": "string"
+                        },
+                        "RuleState": {
+                            "type": "string"
+                        },
+                        "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExcludeFilters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamFilter"
+                            },
+                            "type": "array"
+                        },
+                        "FirehoseArn": {
+                            "type": "string"
+                        },
+                        "IncludeFilters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CloudWatch::MetricStream.MetricStreamFilter"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OutputFormat": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FirehoseArn",
+                        "OutputFormat",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CloudWatch::MetricStream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CloudWatch::MetricStream.MetricStreamFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Namespace"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeArtifact::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::Repository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                    "type": "string"
+                },
+                "EnvironmentVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeBuild::Project.EnvironmentVariable"
+                    },
+                    "type": "array"
+                },
+                "Image": {
+                    "type": "string"
+                },
+                "ImagePullCredentialsType": {
+                    "type": "string"
+                },
+                "PrivilegedMode": {
+                    "type": "boolean"
+                },
+                "RegistryCredential": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.RegistryCredential"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComputeType",
+                "Image",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.EnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.FilterGroup": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.GitSubmodulesConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FetchSubmodules": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "FetchSubmodules"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.LogsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogs": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.CloudWatchLogsConfig"
+                },
+                "S3Logs": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.S3LogsConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.ProjectBuildBatchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchReportMode": {
+                    "type": "string"
+                },
+                "CombineArtifacts": {
+                    "type": "boolean"
+                },
+                "Restrictions": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.BatchRestrictions"
+                },
+                "ServiceRole": {
+                    "type": "string"
+                },
+                "TimeoutInMins": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.ProjectCache": {
+            "additionalProperties": false,
+            "properties": {
+                "Location": {
+                    "type": "string"
+                },
+                "Modes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.ProjectFileSystemLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "Identifier": {
+                    "type": "string"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "MountOptions": {
+                    "type": "string"
+                },
+                "MountPoint": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Identifier",
+                "Location",
+                "MountPoint",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.ProjectSourceVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceIdentifier": {
+                    "type": "string"
+                },
+                "SourceVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourceIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.ProjectTriggers": {
+            "additionalProperties": false,
+            "properties": {
+                "BuildType": {
+                    "type": "string"
+                },
+                "FilterGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeBuild::Project.FilterGroup"
+                    },
+                    "type": "array"
+                },
+                "Webhook": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.RegistryCredential": {
+            "additionalProperties": false,
+            "properties": {
+                "Credential": {
+                    "type": "string"
+                },
+                "CredentialProvider": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Credential",
+                "CredentialProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.S3LogsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionDisabled": {
+                    "type": "boolean"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.Source": {
+            "additionalProperties": false,
+            "properties": {
+                "Auth": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.SourceAuth"
+                },
+                "BuildSpec": {
+                    "type": "string"
+                },
+                "BuildStatusConfig": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.BuildStatusConfig"
+                },
+                "GitCloneDepth": {
+                    "type": "number"
+                },
+                "GitSubmodulesConfig": {
+                    "$ref": "#/definitions/AWS::CodeBuild::Project.GitSubmodulesConfig"
+                },
+                "InsecureSsl": {
+                    "type": "boolean"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "ReportBuildStatus": {
+                    "type": "boolean"
+                },
+                "SourceIdentifier": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.SourceAuth": {
+            "additionalProperties": false,
+            "properties": {
+                "Resource": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeBuild::Project.WebhookFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludeMatchedPattern": {
+                    "type": "boolean"
+                },
+                "Pattern": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Pattern",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::ReportGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeleteReports": {
+                            "type": "boolean"
+                        },
+                        "ExportConfig": {
+                            "$ref": "#/definitions/AWS::CodeBuild::ReportGroup.ReportExportConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ExportConfig",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeBuild::ReportGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::ReportGroup.ReportExportConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ExportConfigType": {
+                    "type": "string"
+                },
+                "S3Destination": {
+                    "$ref": "#/definitions/AWS::CodeBuild::ReportGroup.S3ReportExportConfig"
+                }
+            },
+            "required": [
+                "ExportConfigType"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::ReportGroup.S3ReportExportConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "BucketOwner": {
+                    "type": "string"
+                },
+                "EncryptionDisabled": {
+                    "type": "boolean"
+                },
+                "EncryptionKey": {
+                    "type": "string"
+                },
+                "Packaging": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeBuild::SourceCredential": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthType": {
+                            "type": "string"
+                        },
+                        "ServerType": {
+                            "type": "string"
+                        },
+                        "Token": {
+                            "type": "string"
+                        },
+                        "Username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthType",
+                        "ServerType",
+                        "Token"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeBuild::SourceCredential"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeCommit::Repository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Code": {
+                            "$ref": "#/definitions/AWS::CodeCommit::Repository.Code"
+                        },
+                        "RepositoryDescription": {
+                            "type": "string"
+                        },
+                        "RepositoryName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Triggers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeCommit::Repository.RepositoryTrigger"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RepositoryName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeCommit::Repository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeCommit::Repository.Code": {
+            "additionalProperties": false,
+            "properties": {
+                "BranchName": {
+                    "type": "string"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::CodeCommit::Repository.S3"
+                }
+            },
+            "required": [
+                "S3"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeCommit::Repository.RepositoryTrigger": {
+            "additionalProperties": false,
+            "properties": {
+                "Branches": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CustomData": {
+                    "type": "string"
+                },
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Events": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationArn",
+                "Events",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeCommit::Repository.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "ComputePlatform": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeDeploy::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ComputePlatform": {
+                            "type": "string"
+                        },
+                        "DeploymentConfigName": {
+                            "type": "string"
+                        },
+                        "MinimumHealthyHosts": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentConfig.MinimumHealthyHosts"
+                        },
+                        "TrafficRoutingConfig": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentConfig.TrafficRoutingConfig"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeDeploy::DeploymentConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentConfig.MinimumHealthyHosts": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentConfig.TimeBasedCanary": {
+            "additionalProperties": false,
+            "properties": {
+                "CanaryInterval": {
+                    "type": "number"
+                },
+                "CanaryPercentage": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "CanaryInterval",
+                "CanaryPercentage"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentConfig.TimeBasedLinear": {
+            "additionalProperties": false,
+            "properties": {
+                "LinearInterval": {
+                    "type": "number"
+                },
+                "LinearPercentage": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "LinearInterval",
+                "LinearPercentage"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentConfig.TrafficRoutingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TimeBasedCanary": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentConfig.TimeBasedCanary"
+                },
+                "TimeBasedLinear": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentConfig.TimeBasedLinear"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AlarmConfiguration": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.AlarmConfiguration"
+                        },
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "AutoRollbackConfiguration": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.AutoRollbackConfiguration"
+                        },
+                        "AutoScalingGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BlueGreenDeploymentConfiguration": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.BlueGreenDeploymentConfiguration"
+                        },
+                        "Deployment": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.Deployment"
+                        },
+                        "DeploymentConfigName": {
+                            "type": "string"
+                        },
+                        "DeploymentGroupName": {
+                            "type": "string"
+                        },
+                        "DeploymentStyle": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.DeploymentStyle"
+                        },
+                        "ECSServices": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.ECSService"
+                            },
+                            "type": "array"
+                        },
+                        "Ec2TagFilters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.EC2TagFilter"
+                            },
+                            "type": "array"
+                        },
+                        "Ec2TagSet": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.EC2TagSet"
+                        },
+                        "LoadBalancerInfo": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.LoadBalancerInfo"
+                        },
+                        "OnPremisesInstanceTagFilters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.TagFilter"
+                            },
+                            "type": "array"
+                        },
+                        "OnPremisesTagSet": {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSet"
+                        },
+                        "ServiceRoleArn": {
+                            "type": "string"
+                        },
+                        "TriggerConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.TriggerConfig"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "ServiceRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeDeploy::DeploymentGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.Alarm": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.AlarmConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Alarms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.Alarm"
+                    },
+                    "type": "array"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "IgnorePollAlarmFailure": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.AutoRollbackConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Events": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.BlueGreenDeploymentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeploymentReadyOption": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.DeploymentReadyOption"
+                },
+                "GreenFleetProvisioningOption": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.GreenFleetProvisioningOption"
+                },
+                "TerminateBlueInstancesOnDeploymentSuccess": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.BlueInstanceTerminationOption"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.BlueInstanceTerminationOption": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "TerminationWaitTimeInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.Deployment": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "IgnoreApplicationStopFailures": {
+                    "type": "boolean"
+                },
+                "Revision": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.RevisionLocation"
+                }
+            },
+            "required": [
+                "Revision"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.DeploymentReadyOption": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionOnTimeout": {
+                    "type": "string"
+                },
+                "WaitTimeInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.DeploymentStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "DeploymentOption": {
+                    "type": "string"
+                },
+                "DeploymentType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.EC2TagFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.EC2TagSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Ec2TagSetList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.EC2TagSetListObject"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.EC2TagSetListObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Ec2TagGroup": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.EC2TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.ECSService": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClusterName",
+                "ServiceName"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.ELBInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.GitHubLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "CommitId": {
+                    "type": "string"
+                },
+                "Repository": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CommitId",
+                "Repository"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.GreenFleetProvisioningOption": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.LoadBalancerInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "ElbInfoList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.ELBInfo"
+                    },
+                    "type": "array"
+                },
+                "TargetGroupInfoList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.TargetGroupInfo"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSet": {
+            "additionalProperties": false,
+            "properties": {
+                "OnPremisesTagSetList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSetListObject"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.OnPremisesTagSetListObject": {
+            "additionalProperties": false,
+            "properties": {
+                "OnPremisesTagGroup": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.RevisionLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "GitHubLocation": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.GitHubLocation"
+                },
+                "RevisionType": {
+                    "type": "string"
+                },
+                "S3Location": {
+                    "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup.S3Location"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "BundleType": {
+                    "type": "string"
+                },
+                "ETag": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.TagFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.TargetGroupInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeDeploy::DeploymentGroup.TriggerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TriggerEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TriggerName": {
+                    "type": "string"
+                },
+                "TriggerTargetArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodeGuruProfiler::ProfilingGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AgentPermissions": {
+                            "type": "object"
+                        },
+                        "AnomalyDetectionNotificationConfiguration": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeGuruProfiler::ProfilingGroup.Channel"
+                            },
+                            "type": "array"
+                        },
+                        "ComputePlatform": {
+                            "type": "string"
+                        },
+                        "ProfilingGroupName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ProfilingGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeGuruProfiler::ProfilingGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeGuruProfiler::ProfilingGroup.Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "channelId": {
+                    "type": "string"
+                },
+                "channelUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "channelUri"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeGuruReviewer::RepositoryAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BucketName": {
+                            "type": "string"
+                        },
+                        "ConnectionArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Owner": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeGuruReviewer::RepositoryAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::CustomActionType": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Category": {
+                            "type": "string"
+                        },
+                        "ConfigurationProperties": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodePipeline::CustomActionType.ConfigurationProperties"
+                            },
+                            "type": "array"
+                        },
+                        "InputArtifactDetails": {
+                            "$ref": "#/definitions/AWS::CodePipeline::CustomActionType.ArtifactDetails"
+                        },
+                        "OutputArtifactDetails": {
+                            "$ref": "#/definitions/AWS::CodePipeline::CustomActionType.ArtifactDetails"
+                        },
+                        "Provider": {
+                            "type": "string"
+                        },
+                        "Settings": {
+                            "$ref": "#/definitions/AWS::CodePipeline::CustomActionType.Settings"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Category",
+                        "InputArtifactDetails",
+                        "OutputArtifactDetails",
+                        "Provider",
+                        "Version"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodePipeline::CustomActionType"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::CustomActionType.ArtifactDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumCount": {
+                    "type": "number"
+                },
+                "MinimumCount": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaximumCount",
+                "MinimumCount"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::CustomActionType.ConfigurationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Queryable": {
+                    "type": "boolean"
+                },
+                "Required": {
+                    "type": "boolean"
+                },
+                "Secret": {
+                    "type": "boolean"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Name",
+                "Required",
+                "Secret"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::CustomActionType.Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "EntityUrlTemplate": {
+                    "type": "string"
+                },
+                "ExecutionUrlTemplate": {
+                    "type": "string"
+                },
+                "RevisionUrlTemplate": {
+                    "type": "string"
+                },
+                "ThirdPartyConfigurationUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ArtifactStore": {
+                            "$ref": "#/definitions/AWS::CodePipeline::Pipeline.ArtifactStore"
+                        },
+                        "ArtifactStores": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodePipeline::Pipeline.ArtifactStoreMap"
+                            },
+                            "type": "array"
+                        },
+                        "DisableInboundStageTransitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodePipeline::Pipeline.StageTransition"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RestartExecutionOnUpdate": {
+                            "type": "boolean"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Stages": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodePipeline::Pipeline.StageDeclaration"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RoleArn",
+                        "Stages"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodePipeline::Pipeline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.ActionDeclaration": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionTypeId": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.ActionTypeId"
+                },
+                "Configuration": {
+                    "type": "object"
+                },
+                "InputArtifacts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.InputArtifact"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "OutputArtifacts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.OutputArtifact"
+                    },
+                    "type": "array"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RunOrder": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ActionTypeId",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.ActionTypeId": {
+            "additionalProperties": false,
+            "properties": {
+                "Category": {
+                    "type": "string"
+                },
+                "Owner": {
+                    "type": "string"
+                },
+                "Provider": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Category",
+                "Owner",
+                "Provider",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.ArtifactStore": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionKey": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.EncryptionKey"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Location",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.ArtifactStoreMap": {
+            "additionalProperties": false,
+            "properties": {
+                "ArtifactStore": {
+                    "$ref": "#/definitions/AWS::CodePipeline::Pipeline.ArtifactStore"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ArtifactStore",
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.BlockerDeclaration": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.EncryptionKey": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.InputArtifact": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.OutputArtifact": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.StageDeclaration": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.ActionDeclaration"
+                    },
+                    "type": "array"
+                },
+                "Blockers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CodePipeline::Pipeline.BlockerDeclaration"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Pipeline.StageTransition": {
+            "additionalProperties": false,
+            "properties": {
+                "Reason": {
+                    "type": "string"
+                },
+                "StageName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Reason",
+                "StageName"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Webhook": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "type": "string"
+                        },
+                        "AuthenticationConfiguration": {
+                            "$ref": "#/definitions/AWS::CodePipeline::Webhook.WebhookAuthConfiguration"
+                        },
+                        "Filters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodePipeline::Webhook.WebhookFilterRule"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RegisterWithThirdParty": {
+                            "type": "boolean"
+                        },
+                        "TargetAction": {
+                            "type": "string"
+                        },
+                        "TargetPipeline": {
+                            "type": "string"
+                        },
+                        "TargetPipelineVersion": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Authentication",
+                        "AuthenticationConfiguration",
+                        "Filters",
+                        "TargetAction",
+                        "TargetPipeline",
+                        "TargetPipelineVersion"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodePipeline::Webhook"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodePipeline::Webhook.WebhookAuthConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedIPRange": {
+                    "type": "string"
+                },
+                "SecretToken": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CodePipeline::Webhook.WebhookFilterRule": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonPath": {
+                    "type": "string"
+                },
+                "MatchEquals": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "JsonPath"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStar::GitHubRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Code": {
+                            "$ref": "#/definitions/AWS::CodeStar::GitHubRepository.Code"
+                        },
+                        "ConnectionArn": {
+                            "type": "string"
+                        },
+                        "EnableIssues": {
+                            "type": "boolean"
+                        },
+                        "IsPrivate": {
+                            "type": "boolean"
+                        },
+                        "RepositoryAccessToken": {
+                            "type": "string"
+                        },
+                        "RepositoryDescription": {
+                            "type": "string"
+                        },
+                        "RepositoryName": {
+                            "type": "string"
+                        },
+                        "RepositoryOwner": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RepositoryName",
+                        "RepositoryOwner"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeStar::GitHubRepository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStar::GitHubRepository.Code": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::CodeStar::GitHubRepository.S3"
+                }
+            },
+            "required": [
+                "S3"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStar::GitHubRepository.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStarConnections::Connection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionName": {
+                            "type": "string"
+                        },
+                        "HostArn": {
+                            "type": "string"
+                        },
+                        "ProviderType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConnectionName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeStarConnections::Connection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStarNotifications::NotificationRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CreatedBy": {
+                            "type": "string"
+                        },
+                        "DetailType": {
+                            "type": "string"
+                        },
+                        "EventTypeId": {
+                            "type": "string"
+                        },
+                        "EventTypeIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Resource": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TargetAddress": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CodeStarNotifications::NotificationRule.Target"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DetailType",
+                        "EventTypeIds",
+                        "Name",
+                        "Resource",
+                        "Targets"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CodeStarNotifications::NotificationRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CodeStarNotifications::NotificationRule.Target": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetAddress": {
+                    "type": "string"
+                },
+                "TargetType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TargetAddress",
+                "TargetType"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPool": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowClassicFlow": {
+                            "type": "boolean"
+                        },
+                        "AllowUnauthenticatedIdentities": {
+                            "type": "boolean"
+                        },
+                        "CognitoEvents": {
+                            "type": "object"
+                        },
+                        "CognitoIdentityProviders": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cognito::IdentityPool.CognitoIdentityProvider"
+                            },
+                            "type": "array"
+                        },
+                        "CognitoStreams": {
+                            "$ref": "#/definitions/AWS::Cognito::IdentityPool.CognitoStreams"
+                        },
+                        "DeveloperProviderName": {
+                            "type": "string"
+                        },
+                        "IdentityPoolName": {
+                            "type": "string"
+                        },
+                        "OpenIdConnectProviderARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PushSync": {
+                            "$ref": "#/definitions/AWS::Cognito::IdentityPool.PushSync"
+                        },
+                        "SamlProviderARNs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SupportedLoginProviders": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "AllowUnauthenticatedIdentities"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::IdentityPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPool.CognitoIdentityProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientId": {
+                    "type": "string"
+                },
+                "ProviderName": {
+                    "type": "string"
+                },
+                "ServerSideTokenCheck": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPool.CognitoStreams": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StreamName": {
+                    "type": "string"
+                },
+                "StreamingStatus": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPool.PushSync": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPoolRoleAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "IdentityPoolId": {
+                            "type": "string"
+                        },
+                        "RoleMappings": {
+                            "type": "object"
+                        },
+                        "Roles": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "IdentityPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::IdentityPoolRoleAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPoolRoleAttachment.MappingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Claim": {
+                    "type": "string"
+                },
+                "MatchType": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Claim",
+                "MatchType",
+                "RoleARN",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPoolRoleAttachment.RoleMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "AmbiguousRoleResolution": {
+                    "type": "string"
+                },
+                "IdentityProvider": {
+                    "type": "string"
+                },
+                "RulesConfiguration": {
+                    "$ref": "#/definitions/AWS::Cognito::IdentityPoolRoleAttachment.RulesConfigurationType"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::IdentityPoolRoleAttachment.RulesConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Cognito::IdentityPoolRoleAttachment.MappingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountRecoverySetting": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.AccountRecoverySetting"
+                        },
+                        "AdminCreateUserConfig": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.AdminCreateUserConfig"
+                        },
+                        "AliasAttributes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AutoVerifiedAttributes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DeviceConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.DeviceConfiguration"
+                        },
+                        "EmailConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.EmailConfiguration"
+                        },
+                        "EmailVerificationMessage": {
+                            "type": "string"
+                        },
+                        "EmailVerificationSubject": {
+                            "type": "string"
+                        },
+                        "EnabledMfas": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LambdaConfig": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.LambdaConfig"
+                        },
+                        "MfaConfiguration": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.Policies"
+                        },
+                        "Schema": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cognito::UserPool.SchemaAttribute"
+                            },
+                            "type": "array"
+                        },
+                        "SmsAuthenticationMessage": {
+                            "type": "string"
+                        },
+                        "SmsConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.SmsConfiguration"
+                        },
+                        "SmsVerificationMessage": {
+                            "type": "string"
+                        },
+                        "UserPoolAddOns": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.UserPoolAddOns"
+                        },
+                        "UserPoolName": {
+                            "type": "string"
+                        },
+                        "UserPoolTags": {
+                            "type": "object"
+                        },
+                        "UsernameAttributes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "UsernameConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.UsernameConfiguration"
+                        },
+                        "VerificationMessageTemplate": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool.VerificationMessageTemplate"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.AccountRecoverySetting": {
+            "additionalProperties": false,
+            "properties": {
+                "RecoveryMechanisms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Cognito::UserPool.RecoveryOption"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.AdminCreateUserConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowAdminCreateUserOnly": {
+                    "type": "boolean"
+                },
+                "InviteMessageTemplate": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.InviteMessageTemplate"
+                },
+                "UnusedAccountValidityDays": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.CustomEmailSender": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                },
+                "LambdaVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.CustomSMSSender": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                },
+                "LambdaVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.DeviceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChallengeRequiredOnNewDevice": {
+                    "type": "boolean"
+                },
+                "DeviceOnlyRememberedOnUserPrompt": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.EmailConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfigurationSet": {
+                    "type": "string"
+                },
+                "EmailSendingAccount": {
+                    "type": "string"
+                },
+                "From": {
+                    "type": "string"
+                },
+                "ReplyToEmailAddress": {
+                    "type": "string"
+                },
+                "SourceArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.InviteMessageTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "EmailMessage": {
+                    "type": "string"
+                },
+                "EmailSubject": {
+                    "type": "string"
+                },
+                "SMSMessage": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.LambdaConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CreateAuthChallenge": {
+                    "type": "string"
+                },
+                "CustomEmailSender": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.CustomEmailSender"
+                },
+                "CustomMessage": {
+                    "type": "string"
+                },
+                "CustomSMSSender": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.CustomSMSSender"
+                },
+                "DefineAuthChallenge": {
+                    "type": "string"
+                },
+                "KMSKeyID": {
+                    "type": "string"
+                },
+                "PostAuthentication": {
+                    "type": "string"
+                },
+                "PostConfirmation": {
+                    "type": "string"
+                },
+                "PreAuthentication": {
+                    "type": "string"
+                },
+                "PreSignUp": {
+                    "type": "string"
+                },
+                "PreTokenGeneration": {
+                    "type": "string"
+                },
+                "UserMigration": {
+                    "type": "string"
+                },
+                "VerifyAuthChallengeResponse": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.NumberAttributeConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxValue": {
+                    "type": "string"
+                },
+                "MinValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.PasswordPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "MinimumLength": {
+                    "type": "number"
+                },
+                "RequireLowercase": {
+                    "type": "boolean"
+                },
+                "RequireNumbers": {
+                    "type": "boolean"
+                },
+                "RequireSymbols": {
+                    "type": "boolean"
+                },
+                "RequireUppercase": {
+                    "type": "boolean"
+                },
+                "TemporaryPasswordValidityDays": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.Policies": {
+            "additionalProperties": false,
+            "properties": {
+                "PasswordPolicy": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.PasswordPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.RecoveryOption": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.SchemaAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeDataType": {
+                    "type": "string"
+                },
+                "DeveloperOnlyAttribute": {
+                    "type": "boolean"
+                },
+                "Mutable": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "NumberAttributeConstraints": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.NumberAttributeConstraints"
+                },
+                "Required": {
+                    "type": "boolean"
+                },
+                "StringAttributeConstraints": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPool.StringAttributeConstraints"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.SmsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ExternalId": {
+                    "type": "string"
+                },
+                "SnsCallerArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.StringAttributeConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxLength": {
+                    "type": "string"
+                },
+                "MinLength": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.UserPoolAddOns": {
+            "additionalProperties": false,
+            "properties": {
+                "AdvancedSecurityMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.UsernameConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CaseSensitive": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPool.VerificationMessageTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultEmailOption": {
+                    "type": "string"
+                },
+                "EmailMessage": {
+                    "type": "string"
+                },
+                "EmailMessageByLink": {
+                    "type": "string"
+                },
+                "EmailSubject": {
+                    "type": "string"
+                },
+                "EmailSubjectByLink": {
+                    "type": "string"
+                },
+                "SmsMessage": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolClient": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessTokenValidity": {
+                            "type": "number"
+                        },
+                        "AllowedOAuthFlows": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AllowedOAuthFlowsUserPoolClient": {
+                            "type": "boolean"
+                        },
+                        "AllowedOAuthScopes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AnalyticsConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolClient.AnalyticsConfiguration"
+                        },
+                        "CallbackURLs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ClientName": {
+                            "type": "string"
+                        },
+                        "DefaultRedirectURI": {
+                            "type": "string"
+                        },
+                        "EnableTokenRevocation": {
+                            "type": "boolean"
+                        },
+                        "ExplicitAuthFlows": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "GenerateSecret": {
+                            "type": "boolean"
+                        },
+                        "IdTokenValidity": {
+                            "type": "number"
+                        },
+                        "LogoutURLs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PreventUserExistenceErrors": {
+                            "type": "string"
+                        },
+                        "ReadAttributes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RefreshTokenValidity": {
+                            "type": "number"
+                        },
+                        "SupportedIdentityProviders": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "TokenValidityUnits": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolClient.TokenValidityUnits"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        },
+                        "WriteAttributes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolClient"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolClient.AnalyticsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationArn": {
+                    "type": "string"
+                },
+                "ApplicationId": {
+                    "type": "string"
+                },
+                "ExternalId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "UserDataShared": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolClient.TokenValidityUnits": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessToken": {
+                    "type": "string"
+                },
+                "IdToken": {
+                    "type": "string"
+                },
+                "RefreshToken": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolDomain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomDomainConfig": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolDomain.CustomDomainConfigType"
+                        },
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Domain",
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolDomain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolDomain.CustomDomainConfigType": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "Precedence": {
+                            "type": "number"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolIdentityProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AttributeMapping": {
+                            "type": "object"
+                        },
+                        "IdpIdentifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ProviderDetails": {
+                            "type": "object"
+                        },
+                        "ProviderName": {
+                            "type": "string"
+                        },
+                        "ProviderType": {
+                            "type": "string"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProviderName",
+                        "ProviderType",
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolIdentityProvider"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolResourceServer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Identifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Scopes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cognito::UserPoolResourceServer.ResourceServerScopeType"
+                            },
+                            "type": "array"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Identifier",
+                        "Name",
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolResourceServer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolResourceServer.ResourceServerScopeType": {
+            "additionalProperties": false,
+            "properties": {
+                "ScopeDescription": {
+                    "type": "string"
+                },
+                "ScopeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScopeDescription",
+                "ScopeName"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountTakeoverRiskConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverRiskConfigurationType"
+                        },
+                        "ClientId": {
+                            "type": "string"
+                        },
+                        "CompromisedCredentialsRiskConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsRiskConfigurationType"
+                        },
+                        "RiskExceptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.RiskExceptionConfigurationType"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClientId",
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolRiskConfigurationAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionType": {
+            "additionalProperties": false,
+            "properties": {
+                "EventAction": {
+                    "type": "string"
+                },
+                "Notify": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "EventAction",
+                "Notify"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionsType": {
+            "additionalProperties": false,
+            "properties": {
+                "HighAction": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionType"
+                },
+                "LowAction": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionType"
+                },
+                "MediumAction": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionType"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverRiskConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.AccountTakeoverActionsType"
+                },
+                "NotifyConfiguration": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyConfigurationType"
+                }
+            },
+            "required": [
+                "Actions"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsActionsType": {
+            "additionalProperties": false,
+            "properties": {
+                "EventAction": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventAction"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsRiskConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.CompromisedCredentialsActionsType"
+                },
+                "EventFilter": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Actions"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockEmail": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyEmailType"
+                },
+                "From": {
+                    "type": "string"
+                },
+                "MfaEmail": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyEmailType"
+                },
+                "NoActionEmail": {
+                    "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyEmailType"
+                },
+                "ReplyTo": {
+                    "type": "string"
+                },
+                "SourceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.NotifyEmailType": {
+            "additionalProperties": false,
+            "properties": {
+                "HtmlBody": {
+                    "type": "string"
+                },
+                "Subject": {
+                    "type": "string"
+                },
+                "TextBody": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Subject"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolRiskConfigurationAttachment.RiskExceptionConfigurationType": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockedIPRangeList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SkippedIPRangeList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolUICustomizationAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CSS": {
+                            "type": "string"
+                        },
+                        "ClientId": {
+                            "type": "string"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClientId",
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolUICustomizationAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolUser": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClientMetadata": {
+                            "type": "object"
+                        },
+                        "DesiredDeliveryMediums": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ForceAliasCreation": {
+                            "type": "boolean"
+                        },
+                        "MessageAction": {
+                            "type": "string"
+                        },
+                        "UserAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cognito::UserPoolUser.AttributeType"
+                            },
+                            "type": "array"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        },
+                        "Username": {
+                            "type": "string"
+                        },
+                        "ValidationData": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Cognito::UserPoolUser.AttributeType"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "UserPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolUser"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolUser.AttributeType": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Cognito::UserPoolUserToGroupAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "UserPoolId": {
+                            "type": "string"
+                        },
+                        "Username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GroupName",
+                        "UserPoolId",
+                        "Username"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Cognito::UserPoolUserToGroupAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::AggregationAuthorization": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthorizedAccountId": {
+                            "type": "string"
+                        },
+                        "AuthorizedAwsRegion": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AuthorizedAccountId",
+                        "AuthorizedAwsRegion"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::AggregationAuthorization"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigRuleName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InputParameters": {
+                            "type": "object"
+                        },
+                        "MaximumExecutionFrequency": {
+                            "type": "string"
+                        },
+                        "Scope": {
+                            "$ref": "#/definitions/AWS::Config::ConfigRule.Scope"
+                        },
+                        "Source": {
+                            "$ref": "#/definitions/AWS::Config::ConfigRule.Source"
+                        }
+                    },
+                    "required": [
+                        "Source"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::ConfigRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigRule.Scope": {
+            "additionalProperties": false,
+            "properties": {
+                "ComplianceResourceId": {
+                    "type": "string"
+                },
+                "ComplianceResourceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TagKey": {
+                    "type": "string"
+                },
+                "TagValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::ConfigRule.Source": {
+            "additionalProperties": false,
+            "properties": {
+                "Owner": {
+                    "type": "string"
+                },
+                "SourceDetails": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Config::ConfigRule.SourceDetail"
+                    },
+                    "type": "array"
+                },
+                "SourceIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Owner",
+                "SourceIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigRule.SourceDetail": {
+            "additionalProperties": false,
+            "properties": {
+                "EventSource": {
+                    "type": "string"
+                },
+                "MaximumExecutionFrequency": {
+                    "type": "string"
+                },
+                "MessageType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventSource",
+                "MessageType"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigurationAggregator": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountAggregationSources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Config::ConfigurationAggregator.AccountAggregationSource"
+                            },
+                            "type": "array"
+                        },
+                        "ConfigurationAggregatorName": {
+                            "type": "string"
+                        },
+                        "OrganizationAggregationSource": {
+                            "$ref": "#/definitions/AWS::Config::ConfigurationAggregator.OrganizationAggregationSource"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::ConfigurationAggregator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigurationAggregator.AccountAggregationSource": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllAwsRegions": {
+                    "type": "boolean"
+                },
+                "AwsRegions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AccountIds"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigurationAggregator.OrganizationAggregationSource": {
+            "additionalProperties": false,
+            "properties": {
+                "AllAwsRegions": {
+                    "type": "boolean"
+                },
+                "AwsRegions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigurationRecorder": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RecordingGroup": {
+                            "$ref": "#/definitions/AWS::Config::ConfigurationRecorder.RecordingGroup"
+                        },
+                        "RoleARN": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RoleARN"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::ConfigurationRecorder"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConfigurationRecorder.RecordingGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "AllSupported": {
+                    "type": "boolean"
+                },
+                "IncludeGlobalResourceTypes": {
+                    "type": "boolean"
+                },
+                "ResourceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::ConformancePack": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConformancePackInputParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Config::ConformancePack.ConformancePackInputParameter"
+                            },
+                            "type": "array"
+                        },
+                        "ConformancePackName": {
+                            "type": "string"
+                        },
+                        "DeliveryS3Bucket": {
+                            "type": "string"
+                        },
+                        "DeliveryS3KeyPrefix": {
+                            "type": "string"
+                        },
+                        "TemplateBody": {
+                            "type": "string"
+                        },
+                        "TemplateS3Uri": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConformancePackName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::ConformancePack"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::ConformancePack.ConformancePackInputParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ParameterName",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::DeliveryChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigSnapshotDeliveryProperties": {
+                            "$ref": "#/definitions/AWS::Config::DeliveryChannel.ConfigSnapshotDeliveryProperties"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "S3BucketName": {
+                            "type": "string"
+                        },
+                        "S3KeyPrefix": {
+                            "type": "string"
+                        },
+                        "S3KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "SnsTopicARN": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "S3BucketName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::DeliveryChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::DeliveryChannel.ConfigSnapshotDeliveryProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryFrequency": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::OrganizationConfigRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExcludedAccounts": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "OrganizationConfigRuleName": {
+                            "type": "string"
+                        },
+                        "OrganizationCustomRuleMetadata": {
+                            "$ref": "#/definitions/AWS::Config::OrganizationConfigRule.OrganizationCustomRuleMetadata"
+                        },
+                        "OrganizationManagedRuleMetadata": {
+                            "$ref": "#/definitions/AWS::Config::OrganizationConfigRule.OrganizationManagedRuleMetadata"
+                        }
+                    },
+                    "required": [
+                        "OrganizationConfigRuleName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::OrganizationConfigRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::OrganizationConfigRule.OrganizationCustomRuleMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "InputParameters": {
+                    "type": "string"
+                },
+                "LambdaFunctionArn": {
+                    "type": "string"
+                },
+                "MaximumExecutionFrequency": {
+                    "type": "string"
+                },
+                "OrganizationConfigRuleTriggerTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ResourceIdScope": {
+                    "type": "string"
+                },
+                "ResourceTypesScope": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TagKeyScope": {
+                    "type": "string"
+                },
+                "TagValueScope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaFunctionArn",
+                "OrganizationConfigRuleTriggerTypes"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::OrganizationConfigRule.OrganizationManagedRuleMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "InputParameters": {
+                    "type": "string"
+                },
+                "MaximumExecutionFrequency": {
+                    "type": "string"
+                },
+                "ResourceIdScope": {
+                    "type": "string"
+                },
+                "ResourceTypesScope": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RuleIdentifier": {
+                    "type": "string"
+                },
+                "TagKeyScope": {
+                    "type": "string"
+                },
+                "TagValueScope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RuleIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::OrganizationConformancePack": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConformancePackInputParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Config::OrganizationConformancePack.ConformancePackInputParameter"
+                            },
+                            "type": "array"
+                        },
+                        "DeliveryS3Bucket": {
+                            "type": "string"
+                        },
+                        "DeliveryS3KeyPrefix": {
+                            "type": "string"
+                        },
+                        "ExcludedAccounts": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "OrganizationConformancePackName": {
+                            "type": "string"
+                        },
+                        "TemplateBody": {
+                            "type": "string"
+                        },
+                        "TemplateS3Uri": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "OrganizationConformancePackName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::OrganizationConformancePack"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::OrganizationConformancePack.ConformancePackInputParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ParameterName",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Automatic": {
+                            "type": "boolean"
+                        },
+                        "ConfigRuleName": {
+                            "type": "string"
+                        },
+                        "ExecutionControls": {
+                            "$ref": "#/definitions/AWS::Config::RemediationConfiguration.ExecutionControls"
+                        },
+                        "MaximumAutomaticAttempts": {
+                            "type": "number"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "ResourceType": {
+                            "type": "string"
+                        },
+                        "RetryAttemptSeconds": {
+                            "type": "number"
+                        },
+                        "TargetId": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        },
+                        "TargetVersion": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConfigRuleName",
+                        "TargetId",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::RemediationConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration.ExecutionControls": {
+            "additionalProperties": false,
+            "properties": {
+                "SsmControls": {
+                    "$ref": "#/definitions/AWS::Config::RemediationConfiguration.SsmControls"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration.RemediationParameterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceValue": {
+                    "$ref": "#/definitions/AWS::Config::RemediationConfiguration.ResourceValue"
+                },
+                "StaticValue": {
+                    "$ref": "#/definitions/AWS::Config::RemediationConfiguration.StaticValue"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration.ResourceValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration.SsmControls": {
+            "additionalProperties": false,
+            "properties": {
+                "ConcurrentExecutionRatePercentage": {
+                    "type": "number"
+                },
+                "ErrorPercentage": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::RemediationConfiguration.StaticValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Config::StoredQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "QueryDescription": {
+                            "type": "string"
+                        },
+                        "QueryExpression": {
+                            "type": "string"
+                        },
+                        "QueryName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "QueryExpression",
+                        "QueryName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Config::StoredQuery"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::ContactFlow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Content": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Content",
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::ContactFlow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::ContactFlowModule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Content": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Content",
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::ContactFlowModule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::HoursOfOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Config": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Connect::HoursOfOperation.HoursOfOperationConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeZone": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Config",
+                        "InstanceArn",
+                        "Name",
+                        "TimeZone"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::HoursOfOperation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::HoursOfOperation.HoursOfOperationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Day": {
+                    "type": "string"
+                },
+                "EndTime": {
+                    "$ref": "#/definitions/AWS::Connect::HoursOfOperation.HoursOfOperationTimeSlice"
+                },
+                "StartTime": {
+                    "$ref": "#/definitions/AWS::Connect::HoursOfOperation.HoursOfOperationTimeSlice"
+                }
+            },
+            "required": [
+                "Day",
+                "EndTime",
+                "StartTime"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::HoursOfOperation.HoursOfOperationTimeSlice": {
+            "additionalProperties": false,
+            "properties": {
+                "Hours": {
+                    "type": "number"
+                },
+                "Minutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Hours",
+                "Minutes"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::QuickConnect": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QuickConnectConfig": {
+                            "$ref": "#/definitions/AWS::Connect::QuickConnect.QuickConnectConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "Name",
+                        "QuickConnectConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::QuickConnect"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::QuickConnect.PhoneNumberQuickConnectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "PhoneNumber": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PhoneNumber"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::QuickConnect.QueueQuickConnectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContactFlowArn": {
+                    "type": "string"
+                },
+                "QueueArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ContactFlowArn",
+                "QueueArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::QuickConnect.QuickConnectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "PhoneConfig": {
+                    "$ref": "#/definitions/AWS::Connect::QuickConnect.PhoneNumberQuickConnectConfig"
+                },
+                "QueueConfig": {
+                    "$ref": "#/definitions/AWS::Connect::QuickConnect.QueueQuickConnectConfig"
+                },
+                "QuickConnectType": {
+                    "type": "string"
+                },
+                "UserConfig": {
+                    "$ref": "#/definitions/AWS::Connect::QuickConnect.UserQuickConnectConfig"
+                }
+            },
+            "required": [
+                "QuickConnectType"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::QuickConnect.UserQuickConnectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContactFlowArn": {
+                    "type": "string"
+                },
+                "UserArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ContactFlowArn",
+                "UserArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DirectoryUserId": {
+                            "type": "string"
+                        },
+                        "HierarchyGroupArn": {
+                            "type": "string"
+                        },
+                        "IdentityInfo": {
+                            "$ref": "#/definitions/AWS::Connect::User.UserIdentityInfo"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "PhoneConfig": {
+                            "$ref": "#/definitions/AWS::Connect::User.UserPhoneConfig"
+                        },
+                        "RoutingProfileArn": {
+                            "type": "string"
+                        },
+                        "SecurityProfileArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "PhoneConfig",
+                        "RoutingProfileArn",
+                        "SecurityProfileArns",
+                        "Username"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::User.UserIdentityInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Email": {
+                    "type": "string"
+                },
+                "FirstName": {
+                    "type": "string"
+                },
+                "LastName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Connect::User.UserPhoneConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AfterContactWorkTimeLimit": {
+                    "type": "number"
+                },
+                "AutoAccept": {
+                    "type": "boolean"
+                },
+                "DeskPhoneNumber": {
+                    "type": "string"
+                },
+                "PhoneType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PhoneType"
+            ],
+            "type": "object"
+        },
+        "AWS::Connect::UserHierarchyGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParentGroupArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Connect::UserHierarchyGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeadLetterQueueUrl": {
+                            "type": "string"
+                        },
+                        "DefaultEncryptionKey": {
+                            "type": "string"
+                        },
+                        "DefaultExpirationDays": {
+                            "type": "number"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CustomerProfiles::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "FlowDefinition": {
+                            "$ref": "#/definitions/AWS::CustomerProfiles::Integration.FlowDefinition"
+                        },
+                        "ObjectTypeName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Uri": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainName",
+                        "ObjectTypeName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CustomerProfiles::Integration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.ConnectorOperator": {
+            "additionalProperties": false,
+            "properties": {
+                "Marketo": {
+                    "type": "string"
+                },
+                "S3": {
+                    "type": "string"
+                },
+                "Salesforce": {
+                    "type": "string"
+                },
+                "ServiceNow": {
+                    "type": "string"
+                },
+                "Zendesk": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.FlowDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "FlowName": {
+                    "type": "string"
+                },
+                "KmsArn": {
+                    "type": "string"
+                },
+                "SourceFlowConfig": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.SourceFlowConfig"
+                },
+                "Tasks": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CustomerProfiles::Integration.Task"
+                    },
+                    "type": "array"
+                },
+                "TriggerConfig": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.TriggerConfig"
+                }
+            },
+            "required": [
+                "FlowName",
+                "KmsArn",
+                "SourceFlowConfig",
+                "Tasks",
+                "TriggerConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.IncrementalPullConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DatetimeTypeFieldName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.MarketoSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.S3SourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.SalesforceSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableDynamicFieldUpdate": {
+                    "type": "boolean"
+                },
+                "IncludeDeletedRecords": {
+                    "type": "boolean"
+                },
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.ScheduledTriggerProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DataPullMode": {
+                    "type": "string"
+                },
+                "FirstExecutionFrom": {
+                    "type": "number"
+                },
+                "ScheduleEndTime": {
+                    "type": "number"
+                },
+                "ScheduleExpression": {
+                    "type": "string"
+                },
+                "ScheduleOffset": {
+                    "type": "number"
+                },
+                "ScheduleStartTime": {
+                    "type": "number"
+                },
+                "Timezone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.ServiceNowSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.SourceConnectorProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Marketo": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.MarketoSourceProperties"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.S3SourceProperties"
+                },
+                "Salesforce": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.SalesforceSourceProperties"
+                },
+                "ServiceNow": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.ServiceNowSourceProperties"
+                },
+                "Zendesk": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.ZendeskSourceProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.SourceFlowConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorProfileName": {
+                    "type": "string"
+                },
+                "ConnectorType": {
+                    "type": "string"
+                },
+                "IncrementalPullConfig": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.IncrementalPullConfig"
+                },
+                "SourceConnectorProperties": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.SourceConnectorProperties"
+                }
+            },
+            "required": [
+                "ConnectorType",
+                "SourceConnectorProperties"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.Task": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorOperator": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.ConnectorOperator"
+                },
+                "DestinationField": {
+                    "type": "string"
+                },
+                "SourceFields": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TaskProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CustomerProfiles::Integration.TaskPropertiesMap"
+                    },
+                    "type": "array"
+                },
+                "TaskType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourceFields",
+                "TaskType"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.TaskPropertiesMap": {
+            "additionalProperties": false,
+            "properties": {
+                "OperatorPropertyKey": {
+                    "type": "string"
+                },
+                "Property": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OperatorPropertyKey",
+                "Property"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.TriggerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TriggerProperties": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.TriggerProperties"
+                },
+                "TriggerType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TriggerType"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.TriggerProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Scheduled": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::Integration.ScheduledTriggerProperties"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::Integration.ZendeskSourceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Object": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Object"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::ObjectType": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowProfileCreation": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EncryptionKey": {
+                            "type": "string"
+                        },
+                        "ExpirationDays": {
+                            "type": "number"
+                        },
+                        "Fields": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CustomerProfiles::ObjectType.FieldMap"
+                            },
+                            "type": "array"
+                        },
+                        "Keys": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::CustomerProfiles::ObjectType.KeyMap"
+                            },
+                            "type": "array"
+                        },
+                        "ObjectTypeName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DomainName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::CustomerProfiles::ObjectType"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::ObjectType.FieldMap": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "ObjectTypeField": {
+                    "$ref": "#/definitions/AWS::CustomerProfiles::ObjectType.ObjectTypeField"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::ObjectType.KeyMap": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "ObjectTypeKeyList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::CustomerProfiles::ObjectType.ObjectTypeKey"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::ObjectType.ObjectTypeField": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentType": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::CustomerProfiles::ObjectType.ObjectTypeKey": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StandardIdentifiers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DAX::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ClusterEndpointEncryptionType": {
+                            "type": "string"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IAMRoleARN": {
+                            "type": "string"
+                        },
+                        "NodeType": {
+                            "type": "string"
+                        },
+                        "NotificationTopicARN": {
+                            "type": "string"
+                        },
+                        "ParameterGroupName": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "ReplicationFactor": {
+                            "type": "number"
+                        },
+                        "SSESpecification": {
+                            "$ref": "#/definitions/AWS::DAX::Cluster.SSESpecification"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetGroupName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "IAMRoleARN",
+                        "NodeType",
+                        "ReplicationFactor"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DAX::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DAX::Cluster.SSESpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "SSEEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DAX::ParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ParameterGroupName": {
+                            "type": "string"
+                        },
+                        "ParameterNameValues": {
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DAX::ParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DAX::SubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SubnetGroupName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DAX::SubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "PolicyDetails": {
+                            "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.PolicyDetails"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DLM::LifecyclePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "CrossRegionCopy": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CrossRegionCopyAction"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CrossRegionCopy",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.CreateRule": {
+            "additionalProperties": false,
+            "properties": {
+                "CronExpression": {
+                    "type": "string"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "Times": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.CrossRegionCopyAction": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.EncryptionConfiguration"
+                },
+                "RetainRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CrossRegionCopyRetainRule"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionConfiguration",
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.CrossRegionCopyDeprecateRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Interval",
+                "IntervalUnit"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.CrossRegionCopyRetainRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Interval",
+                "IntervalUnit"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.CrossRegionCopyRule": {
+            "additionalProperties": false,
+            "properties": {
+                "CmkArn": {
+                    "type": "string"
+                },
+                "CopyTags": {
+                    "type": "boolean"
+                },
+                "DeprecateRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CrossRegionCopyDeprecateRule"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "RetainRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CrossRegionCopyRetainRule"
+                },
+                "Target": {
+                    "type": "string"
+                },
+                "TargetRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Encrypted"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.DeprecateRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CmkArn": {
+                    "type": "string"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Encrypted"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.EventParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DescriptionRegex": {
+                    "type": "string"
+                },
+                "EventType": {
+                    "type": "string"
+                },
+                "SnapshotOwner": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "EventType",
+                "SnapshotOwner"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.EventSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.EventParameters"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.FastRestoreRule": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZones": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Count": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.Parameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludeBootVolume": {
+                    "type": "boolean"
+                },
+                "NoReboot": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.PolicyDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.Action"
+                    },
+                    "type": "array"
+                },
+                "EventSource": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.EventSource"
+                },
+                "Parameters": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.Parameters"
+                },
+                "PolicyType": {
+                    "type": "string"
+                },
+                "ResourceLocations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ResourceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Schedules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.Schedule"
+                    },
+                    "type": "array"
+                },
+                "TargetTags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.RetainRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "IntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyTags": {
+                    "type": "boolean"
+                },
+                "CreateRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CreateRule"
+                },
+                "CrossRegionCopyRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.CrossRegionCopyRule"
+                    },
+                    "type": "array"
+                },
+                "DeprecateRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.DeprecateRule"
+                },
+                "FastRestoreRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.FastRestoreRule"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "RetainRule": {
+                    "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.RetainRule"
+                },
+                "ShareRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DLM::LifecyclePolicy.ShareRule"
+                    },
+                    "type": "array"
+                },
+                "TagsToAdd": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                },
+                "VariableTags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DLM::LifecyclePolicy.ShareRule": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetAccounts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "UnshareInterval": {
+                    "type": "number"
+                },
+                "UnshareIntervalUnit": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CertificateIdentifier": {
+                            "type": "string"
+                        },
+                        "CertificatePem": {
+                            "type": "string"
+                        },
+                        "CertificateWallet": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::Certificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CertificateArn": {
+                            "type": "string"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "DocDbSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.DocDbSettings"
+                        },
+                        "DynamoDbSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.DynamoDbSettings"
+                        },
+                        "ElasticsearchSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.ElasticsearchSettings"
+                        },
+                        "EndpointIdentifier": {
+                            "type": "string"
+                        },
+                        "EndpointType": {
+                            "type": "string"
+                        },
+                        "EngineName": {
+                            "type": "string"
+                        },
+                        "ExtraConnectionAttributes": {
+                            "type": "string"
+                        },
+                        "IbmDb2Settings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.IbmDb2Settings"
+                        },
+                        "KafkaSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.KafkaSettings"
+                        },
+                        "KinesisSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.KinesisSettings"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MicrosoftSqlServerSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.MicrosoftSqlServerSettings"
+                        },
+                        "MongoDbSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.MongoDbSettings"
+                        },
+                        "MySqlSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.MySqlSettings"
+                        },
+                        "NeptuneSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.NeptuneSettings"
+                        },
+                        "OracleSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.OracleSettings"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PostgreSqlSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.PostgreSqlSettings"
+                        },
+                        "RedisSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.RedisSettings"
+                        },
+                        "RedshiftSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.RedshiftSettings"
+                        },
+                        "ResourceIdentifier": {
+                            "type": "string"
+                        },
+                        "S3Settings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.S3Settings"
+                        },
+                        "ServerName": {
+                            "type": "string"
+                        },
+                        "SslMode": {
+                            "type": "string"
+                        },
+                        "SybaseSettings": {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint.SybaseSettings"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Username": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "EndpointType",
+                        "EngineName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::Endpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.DocDbSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.DynamoDbSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceAccessRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.ElasticsearchSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointUri": {
+                    "type": "string"
+                },
+                "ErrorRetryDuration": {
+                    "type": "number"
+                },
+                "FullLoadErrorPercentage": {
+                    "type": "number"
+                },
+                "ServiceAccessRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.IbmDb2Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.KafkaSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Broker": {
+                    "type": "string"
+                },
+                "IncludeControlDetails": {
+                    "type": "boolean"
+                },
+                "IncludeNullAndEmpty": {
+                    "type": "boolean"
+                },
+                "IncludeTableAlterOperations": {
+                    "type": "boolean"
+                },
+                "IncludeTransactionDetails": {
+                    "type": "boolean"
+                },
+                "NoHexPrefix": {
+                    "type": "boolean"
+                },
+                "PartitionIncludeSchemaTable": {
+                    "type": "boolean"
+                },
+                "SaslPassword": {
+                    "type": "string"
+                },
+                "SaslUserName": {
+                    "type": "string"
+                },
+                "SecurityProtocol": {
+                    "type": "string"
+                },
+                "SslCaCertificateArn": {
+                    "type": "string"
+                },
+                "SslClientCertificateArn": {
+                    "type": "string"
+                },
+                "SslClientKeyArn": {
+                    "type": "string"
+                },
+                "SslClientKeyPassword": {
+                    "type": "string"
+                },
+                "Topic": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.KinesisSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IncludeControlDetails": {
+                    "type": "boolean"
+                },
+                "IncludeNullAndEmpty": {
+                    "type": "boolean"
+                },
+                "IncludeTableAlterOperations": {
+                    "type": "boolean"
+                },
+                "IncludeTransactionDetails": {
+                    "type": "boolean"
+                },
+                "MessageFormat": {
+                    "type": "string"
+                },
+                "NoHexPrefix": {
+                    "type": "boolean"
+                },
+                "PartitionIncludeSchemaTable": {
+                    "type": "boolean"
+                },
+                "ServiceAccessRoleArn": {
+                    "type": "string"
+                },
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.MicrosoftSqlServerSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.MongoDbSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthMechanism": {
+                    "type": "string"
+                },
+                "AuthSource": {
+                    "type": "string"
+                },
+                "AuthType": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DocsToInvestigate": {
+                    "type": "string"
+                },
+                "ExtractDocId": {
+                    "type": "string"
+                },
+                "NestingLevel": {
+                    "type": "string"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                },
+                "ServerName": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.MySqlSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.NeptuneSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorRetryDuration": {
+                    "type": "number"
+                },
+                "IamAuthEnabled": {
+                    "type": "boolean"
+                },
+                "MaxFileSize": {
+                    "type": "number"
+                },
+                "MaxRetryCount": {
+                    "type": "number"
+                },
+                "S3BucketFolder": {
+                    "type": "string"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "ServiceAccessRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.OracleSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerOracleAsmAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerOracleAsmSecretId": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.PostgreSqlSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.RedisSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthPassword": {
+                    "type": "string"
+                },
+                "AuthType": {
+                    "type": "string"
+                },
+                "AuthUserName": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "ServerName": {
+                    "type": "string"
+                },
+                "SslCaCertificateArn": {
+                    "type": "string"
+                },
+                "SslSecurityProtocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.RedshiftSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.S3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketFolder": {
+                    "type": "string"
+                },
+                "BucketName": {
+                    "type": "string"
+                },
+                "CompressionType": {
+                    "type": "string"
+                },
+                "CsvDelimiter": {
+                    "type": "string"
+                },
+                "CsvRowDelimiter": {
+                    "type": "string"
+                },
+                "ExternalTableDefinition": {
+                    "type": "string"
+                },
+                "ServiceAccessRoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::Endpoint.SybaseSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SecretsManagerAccessRoleArn": {
+                    "type": "string"
+                },
+                "SecretsManagerSecretId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DMS::EventSubscription": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "EventCategories": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SourceIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SourceType": {
+                            "type": "string"
+                        },
+                        "SubscriptionName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SnsTopicArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::EventSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DMS::ReplicationInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocatedStorage": {
+                            "type": "number"
+                        },
+                        "AllowMajorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MultiAZ": {
+                            "type": "boolean"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "PubliclyAccessible": {
+                            "type": "boolean"
+                        },
+                        "ReplicationInstanceClass": {
+                            "type": "string"
+                        },
+                        "ReplicationInstanceIdentifier": {
+                            "type": "string"
+                        },
+                        "ReplicationSubnetGroupIdentifier": {
+                            "type": "string"
+                        },
+                        "ResourceIdentifier": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ReplicationInstanceClass"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::ReplicationInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DMS::ReplicationSubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ReplicationSubnetGroupDescription": {
+                            "type": "string"
+                        },
+                        "ReplicationSubnetGroupIdentifier": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ReplicationSubnetGroupDescription",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::ReplicationSubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DMS::ReplicationTask": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CdcStartPosition": {
+                            "type": "string"
+                        },
+                        "CdcStartTime": {
+                            "type": "number"
+                        },
+                        "CdcStopPosition": {
+                            "type": "string"
+                        },
+                        "MigrationType": {
+                            "type": "string"
+                        },
+                        "ReplicationInstanceArn": {
+                            "type": "string"
+                        },
+                        "ReplicationTaskIdentifier": {
+                            "type": "string"
+                        },
+                        "ReplicationTaskSettings": {
+                            "type": "string"
+                        },
+                        "ResourceIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceEndpointArn": {
+                            "type": "string"
+                        },
+                        "TableMappings": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetEndpointArn": {
+                            "type": "string"
+                        },
+                        "TaskData": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MigrationType",
+                        "ReplicationInstanceArn",
+                        "SourceEndpointArn",
+                        "TableMappings",
+                        "TargetEndpointArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DMS::ReplicationTask"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Format": {
+                            "type": "string"
+                        },
+                        "FormatOptions": {
+                            "$ref": "#/definitions/AWS::DataBrew::Dataset.FormatOptions"
+                        },
+                        "Input": {
+                            "$ref": "#/definitions/AWS::DataBrew::Dataset.Input"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PathOptions": {
+                            "$ref": "#/definitions/AWS::DataBrew::Dataset.PathOptions"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Input",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Dataset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.CsvOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Delimiter": {
+                    "type": "string"
+                },
+                "HeaderRow": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.DataCatalogInputDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "TempDirectory": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.S3Location"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.DatabaseInputDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseTableName": {
+                    "type": "string"
+                },
+                "GlueConnectionName": {
+                    "type": "string"
+                },
+                "QueryString": {
+                    "type": "string"
+                },
+                "TempDirectory": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.S3Location"
+                }
+            },
+            "required": [
+                "GlueConnectionName"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.DatasetParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "CreateColumn": {
+                    "type": "boolean"
+                },
+                "DatetimeOptions": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.DatetimeOptions"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.FilterExpression"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.DatetimeOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Format": {
+                    "type": "string"
+                },
+                "LocaleCode": {
+                    "type": "string"
+                },
+                "TimezoneOffset": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Format"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.ExcelOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderRow": {
+                    "type": "boolean"
+                },
+                "SheetIndexes": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "SheetNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.FilesLimit": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxFiles": {
+                    "type": "number"
+                },
+                "Order": {
+                    "type": "string"
+                },
+                "OrderedBy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MaxFiles"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.FilterExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "ValuesMap": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Dataset.FilterValue"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Expression",
+                "ValuesMap"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.FilterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                },
+                "ValueReference": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Value",
+                "ValueReference"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.FormatOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Csv": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.CsvOptions"
+                },
+                "Excel": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.ExcelOptions"
+                },
+                "Json": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.JsonOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.Input": {
+            "additionalProperties": false,
+            "properties": {
+                "DataCatalogInputDefinition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.DataCatalogInputDefinition"
+                },
+                "DatabaseInputDefinition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.DatabaseInputDefinition"
+                },
+                "Metadata": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.Metadata"
+                },
+                "S3InputDefinition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.S3Location"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.JsonOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiLine": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.Metadata": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.PathOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "FilesLimit": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.FilesLimit"
+                },
+                "LastModifiedDateCondition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.FilterExpression"
+                },
+                "Parameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Dataset.PathParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.PathParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "DatasetParameter": {
+                    "$ref": "#/definitions/AWS::DataBrew::Dataset.DatasetParameter"
+                },
+                "PathParameterName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatasetParameter",
+                "PathParameterName"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Dataset.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataCatalogOutputs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Job.DataCatalogOutput"
+                            },
+                            "type": "array"
+                        },
+                        "DatabaseOutputs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Job.DatabaseOutput"
+                            },
+                            "type": "array"
+                        },
+                        "DatasetName": {
+                            "type": "string"
+                        },
+                        "EncryptionKeyArn": {
+                            "type": "string"
+                        },
+                        "EncryptionMode": {
+                            "type": "string"
+                        },
+                        "JobSample": {
+                            "$ref": "#/definitions/AWS::DataBrew::Job.JobSample"
+                        },
+                        "LogSubscription": {
+                            "type": "string"
+                        },
+                        "MaxCapacity": {
+                            "type": "number"
+                        },
+                        "MaxRetries": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OutputLocation": {
+                            "$ref": "#/definitions/AWS::DataBrew::Job.OutputLocation"
+                        },
+                        "Outputs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Job.Output"
+                            },
+                            "type": "array"
+                        },
+                        "ProfileConfiguration": {
+                            "$ref": "#/definitions/AWS::DataBrew::Job.ProfileConfiguration"
+                        },
+                        "ProjectName": {
+                            "type": "string"
+                        },
+                        "Recipe": {
+                            "$ref": "#/definitions/AWS::DataBrew::Job.Recipe"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Timeout": {
+                            "type": "number"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "ValidationConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Job.ValidationConfiguration"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "RoleArn",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Job"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.AllowedStatistics": {
+            "additionalProperties": false,
+            "properties": {
+                "Statistics": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Statistics"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.ColumnSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Regex": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.ColumnStatisticsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Selectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Job.ColumnSelector"
+                    },
+                    "type": "array"
+                },
+                "Statistics": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.StatisticsConfiguration"
+                }
+            },
+            "required": [
+                "Statistics"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.CsvOutputOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Delimiter": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.DataCatalogOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DatabaseOptions": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.DatabaseTableOutputOptions"
+                },
+                "Overwrite": {
+                    "type": "boolean"
+                },
+                "S3Options": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.S3TableOutputOptions"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.DatabaseOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseOptions": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.DatabaseTableOutputOptions"
+                },
+                "DatabaseOutputMode": {
+                    "type": "string"
+                },
+                "GlueConnectionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseOptions",
+                "GlueConnectionName"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.DatabaseTableOutputOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "TableName": {
+                    "type": "string"
+                },
+                "TempDirectory": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.S3Location"
+                }
+            },
+            "required": [
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.EntityDetectorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedStatistics": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.AllowedStatistics"
+                },
+                "EntityTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "EntityTypes"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.JobSample": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
+                    "type": "string"
+                },
+                "Size": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "CompressionFormat": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                },
+                "FormatOptions": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.OutputFormatOptions"
+                },
+                "Location": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.S3Location"
+                },
+                "Overwrite": {
+                    "type": "boolean"
+                },
+                "PartitionColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Location"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.OutputFormatOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Csv": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.CsvOutputOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.OutputLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.ParameterMap": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.ProfileConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnStatisticsConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Job.ColumnStatisticsConfiguration"
+                    },
+                    "type": "array"
+                },
+                "DatasetStatisticsConfiguration": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.StatisticsConfiguration"
+                },
+                "EntityDetectorConfiguration": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.EntityDetectorConfiguration"
+                },
+                "ProfileColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Job.ColumnSelector"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.Recipe": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.S3TableOutputOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Location": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.S3Location"
+                }
+            },
+            "required": [
+                "Location"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.StatisticOverride": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "$ref": "#/definitions/AWS::DataBrew::Job.ParameterMap"
+                },
+                "Statistic": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Parameters",
+                "Statistic"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.StatisticsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IncludedStatistics": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Overrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Job.StatisticOverride"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Job.ValidationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RulesetArn": {
+                    "type": "string"
+                },
+                "ValidationMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RulesetArn"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DatasetName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RecipeName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Sample": {
+                            "$ref": "#/definitions/AWS::DataBrew::Project.Sample"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DatasetName",
+                        "Name",
+                        "RecipeName",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Project.Sample": {
+            "additionalProperties": false,
+            "properties": {
+                "Size": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Steps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Recipe.RecipeStep"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Steps"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Recipe"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "Operation": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "$ref": "#/definitions/AWS::DataBrew::Recipe.ParameterMap"
+                }
+            },
+            "required": [
+                "Operation"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.ConditionExpression": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "TargetColumn": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Condition",
+                "TargetColumn"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.DataCatalogInputDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "TempDirectory": {
+                    "$ref": "#/definitions/AWS::DataBrew::Recipe.S3Location"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.ParameterMap": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.RecipeParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregateFunction": {
+                    "type": "string"
+                },
+                "Base": {
+                    "type": "string"
+                },
+                "CaseStatement": {
+                    "type": "string"
+                },
+                "CategoryMap": {
+                    "type": "string"
+                },
+                "CharsToRemove": {
+                    "type": "string"
+                },
+                "CollapseConsecutiveWhitespace": {
+                    "type": "string"
+                },
+                "ColumnDataType": {
+                    "type": "string"
+                },
+                "ColumnRange": {
+                    "type": "string"
+                },
+                "Count": {
+                    "type": "string"
+                },
+                "CustomCharacters": {
+                    "type": "string"
+                },
+                "CustomStopWords": {
+                    "type": "string"
+                },
+                "CustomValue": {
+                    "type": "string"
+                },
+                "DatasetsColumns": {
+                    "type": "string"
+                },
+                "DateAddValue": {
+                    "type": "string"
+                },
+                "DateTimeFormat": {
+                    "type": "string"
+                },
+                "DateTimeParameters": {
+                    "type": "string"
+                },
+                "DeleteOtherRows": {
+                    "type": "string"
+                },
+                "Delimiter": {
+                    "type": "string"
+                },
+                "EndPattern": {
+                    "type": "string"
+                },
+                "EndPosition": {
+                    "type": "string"
+                },
+                "EndValue": {
+                    "type": "string"
+                },
+                "ExpandContractions": {
+                    "type": "string"
+                },
+                "Exponent": {
+                    "type": "string"
+                },
+                "FalseString": {
+                    "type": "string"
+                },
+                "GroupByAggFunctionOptions": {
+                    "type": "string"
+                },
+                "GroupByColumns": {
+                    "type": "string"
+                },
+                "HiddenColumns": {
+                    "type": "string"
+                },
+                "IgnoreCase": {
+                    "type": "string"
+                },
+                "IncludeInSplit": {
+                    "type": "string"
+                },
+                "Input": {
+                    "type": "object"
+                },
+                "Interval": {
+                    "type": "string"
+                },
+                "IsText": {
+                    "type": "string"
+                },
+                "JoinKeys": {
+                    "type": "string"
+                },
+                "JoinType": {
+                    "type": "string"
+                },
+                "LeftColumns": {
+                    "type": "string"
+                },
+                "Limit": {
+                    "type": "string"
+                },
+                "LowerBound": {
+                    "type": "string"
+                },
+                "MapType": {
+                    "type": "string"
+                },
+                "ModeType": {
+                    "type": "string"
+                },
+                "MultiLine": {
+                    "type": "boolean"
+                },
+                "NumRows": {
+                    "type": "string"
+                },
+                "NumRowsAfter": {
+                    "type": "string"
+                },
+                "NumRowsBefore": {
+                    "type": "string"
+                },
+                "OrderByColumn": {
+                    "type": "string"
+                },
+                "OrderByColumns": {
+                    "type": "string"
+                },
+                "Other": {
+                    "type": "string"
+                },
+                "Pattern": {
+                    "type": "string"
+                },
+                "PatternOption1": {
+                    "type": "string"
+                },
+                "PatternOption2": {
+                    "type": "string"
+                },
+                "PatternOptions": {
+                    "type": "string"
+                },
+                "Period": {
+                    "type": "string"
+                },
+                "Position": {
+                    "type": "string"
+                },
+                "RemoveAllPunctuation": {
+                    "type": "string"
+                },
+                "RemoveAllQuotes": {
+                    "type": "string"
+                },
+                "RemoveAllWhitespace": {
+                    "type": "string"
+                },
+                "RemoveCustomCharacters": {
+                    "type": "string"
+                },
+                "RemoveCustomValue": {
+                    "type": "string"
+                },
+                "RemoveLeadingAndTrailingPunctuation": {
+                    "type": "string"
+                },
+                "RemoveLeadingAndTrailingQuotes": {
+                    "type": "string"
+                },
+                "RemoveLeadingAndTrailingWhitespace": {
+                    "type": "string"
+                },
+                "RemoveLetters": {
+                    "type": "string"
+                },
+                "RemoveNumbers": {
+                    "type": "string"
+                },
+                "RemoveSourceColumn": {
+                    "type": "string"
+                },
+                "RemoveSpecialCharacters": {
+                    "type": "string"
+                },
+                "RightColumns": {
+                    "type": "string"
+                },
+                "SampleSize": {
+                    "type": "string"
+                },
+                "SampleType": {
+                    "type": "string"
+                },
+                "SecondInput": {
+                    "type": "string"
+                },
+                "SecondaryInputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Recipe.SecondaryInput"
+                    },
+                    "type": "array"
+                },
+                "SheetIndexes": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "SheetNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SourceColumn": {
+                    "type": "string"
+                },
+                "SourceColumn1": {
+                    "type": "string"
+                },
+                "SourceColumn2": {
+                    "type": "string"
+                },
+                "SourceColumns": {
+                    "type": "string"
+                },
+                "StartColumnIndex": {
+                    "type": "string"
+                },
+                "StartPattern": {
+                    "type": "string"
+                },
+                "StartPosition": {
+                    "type": "string"
+                },
+                "StartValue": {
+                    "type": "string"
+                },
+                "StemmingMode": {
+                    "type": "string"
+                },
+                "StepCount": {
+                    "type": "string"
+                },
+                "StepIndex": {
+                    "type": "string"
+                },
+                "StopWordsMode": {
+                    "type": "string"
+                },
+                "Strategy": {
+                    "type": "string"
+                },
+                "TargetColumn": {
+                    "type": "string"
+                },
+                "TargetColumnNames": {
+                    "type": "string"
+                },
+                "TargetDateFormat": {
+                    "type": "string"
+                },
+                "TargetIndex": {
+                    "type": "string"
+                },
+                "TimeZone": {
+                    "type": "string"
+                },
+                "TokenizerPattern": {
+                    "type": "string"
+                },
+                "TrueString": {
+                    "type": "string"
+                },
+                "UdfLang": {
+                    "type": "string"
+                },
+                "Units": {
+                    "type": "string"
+                },
+                "UnpivotColumn": {
+                    "type": "string"
+                },
+                "UpperBound": {
+                    "type": "string"
+                },
+                "UseNewDataFrame": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                },
+                "Value1": {
+                    "type": "string"
+                },
+                "Value2": {
+                    "type": "string"
+                },
+                "ValueColumn": {
+                    "type": "string"
+                },
+                "ViewFrame": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.RecipeStep": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::DataBrew::Recipe.Action"
+                },
+                "ConditionExpressions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Recipe.ConditionExpression"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Action"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Recipe.SecondaryInput": {
+            "additionalProperties": false,
+            "properties": {
+                "DataCatalogInputDefinition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Recipe.DataCatalogInputDefinition"
+                },
+                "S3InputDefinition": {
+                    "$ref": "#/definitions/AWS::DataBrew::Recipe.S3Location"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Ruleset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataBrew::Ruleset.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Rules",
+                        "TargetArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Ruleset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Ruleset.ColumnSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Regex": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataBrew::Ruleset.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "CheckExpression": {
+                    "type": "string"
+                },
+                "ColumnSelectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Ruleset.ColumnSelector"
+                    },
+                    "type": "array"
+                },
+                "Disabled": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SubstitutionMap": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataBrew::Ruleset.SubstitutionValue"
+                    },
+                    "type": "array"
+                },
+                "Threshold": {
+                    "$ref": "#/definitions/AWS::DataBrew::Ruleset.Threshold"
+                }
+            },
+            "required": [
+                "CheckExpression",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Ruleset.SubstitutionValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                },
+                "ValueReference": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Value",
+                "ValueReference"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Ruleset.Threshold": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::DataBrew::Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CronExpression": {
+                            "type": "string"
+                        },
+                        "JobNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CronExpression",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataBrew::Schedule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Activate": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParameterObjects": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataPipeline::Pipeline.ParameterObject"
+                            },
+                            "type": "array"
+                        },
+                        "ParameterValues": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataPipeline::Pipeline.ParameterValue"
+                            },
+                            "type": "array"
+                        },
+                        "PipelineObjects": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataPipeline::Pipeline.PipelineObject"
+                            },
+                            "type": "array"
+                        },
+                        "PipelineTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataPipeline::Pipeline.PipelineTag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "ParameterObjects"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataPipeline::Pipeline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.Field": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "RefValue": {
+                    "type": "string"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.ParameterAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "StringValue"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.ParameterObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataPipeline::Pipeline.ParameterAttribute"
+                    },
+                    "type": "array"
+                },
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attributes",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.ParameterValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id",
+                "StringValue"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.PipelineObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Fields": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DataPipeline::Pipeline.Field"
+                    },
+                    "type": "array"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Fields",
+                "Id",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::DataPipeline::Pipeline.PipelineTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::Agent": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ActivationKey": {
+                            "type": "string"
+                        },
+                        "AgentName": {
+                            "type": "string"
+                        },
+                        "SecurityGroupArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcEndpointId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ActivationKey"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::Agent"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationEFS": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Ec2Config": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationEFS.Ec2Config"
+                        },
+                        "EfsFilesystemArn": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Ec2Config",
+                        "EfsFilesystemArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationEFS"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationEFS.Ec2Config": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecurityGroupArns",
+                "SubnetArn"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationFSxWindows": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "FsxFilesystemArn": {
+                            "type": "string"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "SecurityGroupArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "User": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FsxFilesystemArn",
+                        "Password",
+                        "SecurityGroupArns",
+                        "User"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationFSxWindows"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationHDFS": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AgentArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AuthenticationType": {
+                            "type": "string"
+                        },
+                        "BlockSize": {
+                            "type": "number"
+                        },
+                        "KerberosKeytab": {
+                            "type": "string"
+                        },
+                        "KerberosKrb5Conf": {
+                            "type": "string"
+                        },
+                        "KerberosPrincipal": {
+                            "type": "string"
+                        },
+                        "KmsKeyProviderUri": {
+                            "type": "string"
+                        },
+                        "NameNodes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataSync::LocationHDFS.NameNode"
+                            },
+                            "type": "array"
+                        },
+                        "QopConfiguration": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationHDFS.QopConfiguration"
+                        },
+                        "ReplicationFactor": {
+                            "type": "number"
+                        },
+                        "SimpleUser": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AgentArns",
+                        "AuthenticationType",
+                        "NameNodes"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationHDFS"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationHDFS.NameNode": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Hostname",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationHDFS.QopConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DataTransferProtection": {
+                    "type": "string"
+                },
+                "RpcProtection": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataSync::LocationNFS": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MountOptions": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationNFS.MountOptions"
+                        },
+                        "OnPremConfig": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationNFS.OnPremConfig"
+                        },
+                        "ServerHostname": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "OnPremConfig",
+                        "ServerHostname",
+                        "Subdirectory"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationNFS"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationNFS.MountOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataSync::LocationNFS.OnPremConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AgentArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AgentArns"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationObjectStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessKey": {
+                            "type": "string"
+                        },
+                        "AgentArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BucketName": {
+                            "type": "string"
+                        },
+                        "SecretKey": {
+                            "type": "string"
+                        },
+                        "ServerHostname": {
+                            "type": "string"
+                        },
+                        "ServerPort": {
+                            "type": "number"
+                        },
+                        "ServerProtocol": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AgentArns",
+                        "BucketName",
+                        "ServerHostname"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationObjectStorage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationS3": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "S3BucketArn": {
+                            "type": "string"
+                        },
+                        "S3Config": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationS3.S3Config"
+                        },
+                        "S3StorageClass": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "S3BucketArn",
+                        "S3Config"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationS3"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationS3.S3Config": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketAccessRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketAccessRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationSMB": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AgentArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "MountOptions": {
+                            "$ref": "#/definitions/AWS::DataSync::LocationSMB.MountOptions"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "ServerHostname": {
+                            "type": "string"
+                        },
+                        "Subdirectory": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "User": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AgentArns",
+                        "Password",
+                        "ServerHostname",
+                        "Subdirectory",
+                        "User"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::LocationSMB"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::LocationSMB.MountOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataSync::Task": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CloudWatchLogGroupArn": {
+                            "type": "string"
+                        },
+                        "DestinationLocationArn": {
+                            "type": "string"
+                        },
+                        "Excludes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataSync::Task.FilterRule"
+                            },
+                            "type": "array"
+                        },
+                        "Includes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DataSync::Task.FilterRule"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Options": {
+                            "$ref": "#/definitions/AWS::DataSync::Task.Options"
+                        },
+                        "Schedule": {
+                            "$ref": "#/definitions/AWS::DataSync::Task.TaskSchedule"
+                        },
+                        "SourceLocationArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DestinationLocationArn",
+                        "SourceLocationArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DataSync::Task"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DataSync::Task.FilterRule": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterType": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataSync::Task.Options": {
+            "additionalProperties": false,
+            "properties": {
+                "Atime": {
+                    "type": "string"
+                },
+                "BytesPerSecond": {
+                    "type": "number"
+                },
+                "Gid": {
+                    "type": "string"
+                },
+                "LogLevel": {
+                    "type": "string"
+                },
+                "Mtime": {
+                    "type": "string"
+                },
+                "OverwriteMode": {
+                    "type": "string"
+                },
+                "PosixPermissions": {
+                    "type": "string"
+                },
+                "PreserveDeletedFiles": {
+                    "type": "string"
+                },
+                "PreserveDevices": {
+                    "type": "string"
+                },
+                "SecurityDescriptorCopyFlags": {
+                    "type": "string"
+                },
+                "TaskQueueing": {
+                    "type": "string"
+                },
+                "TransferMode": {
+                    "type": "string"
+                },
+                "Uid": {
+                    "type": "string"
+                },
+                "VerifyMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DataSync::Task.TaskSchedule": {
+            "additionalProperties": false,
+            "properties": {
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::Detective::Graph": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Detective::Graph"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Detective::MemberInvitation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DisableEmailNotification": {
+                            "type": "boolean"
+                        },
+                        "GraphArn": {
+                            "type": "string"
+                        },
+                        "MemberEmailAddress": {
+                            "type": "string"
+                        },
+                        "MemberId": {
+                            "type": "string"
+                        },
+                        "Message": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GraphArn",
+                        "MemberEmailAddress",
+                        "MemberId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Detective::MemberInvitation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::NotificationChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Config": {
+                            "$ref": "#/definitions/AWS::DevOpsGuru::NotificationChannel.NotificationChannelConfig"
+                        }
+                    },
+                    "required": [
+                        "Config"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DevOpsGuru::NotificationChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::NotificationChannel.NotificationChannelConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Sns": {
+                    "$ref": "#/definitions/AWS::DevOpsGuru::NotificationChannel.SnsChannelConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::NotificationChannel.SnsChannelConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::ResourceCollection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceCollectionFilter": {
+                            "$ref": "#/definitions/AWS::DevOpsGuru::ResourceCollection.ResourceCollectionFilter"
+                        }
+                    },
+                    "required": [
+                        "ResourceCollectionFilter"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DevOpsGuru::ResourceCollection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::ResourceCollection.CloudFormationCollectionFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "StackNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DevOpsGuru::ResourceCollection.ResourceCollectionFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudFormation": {
+                    "$ref": "#/definitions/AWS::DevOpsGuru::ResourceCollection.CloudFormationCollectionFilter"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DirectoryService::MicrosoftAD": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CreateAlias": {
+                            "type": "boolean"
+                        },
+                        "Edition": {
+                            "type": "string"
+                        },
+                        "EnableSso": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "ShortName": {
+                            "type": "string"
+                        },
+                        "VpcSettings": {
+                            "$ref": "#/definitions/AWS::DirectoryService::MicrosoftAD.VpcSettings"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Password",
+                        "VpcSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DirectoryService::MicrosoftAD"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DirectoryService::MicrosoftAD.VpcSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubnetIds",
+                "VpcId"
+            ],
+            "type": "object"
+        },
+        "AWS::DirectoryService::SimpleAD": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CreateAlias": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnableSso": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Password": {
+                            "type": "string"
+                        },
+                        "ShortName": {
+                            "type": "string"
+                        },
+                        "Size": {
+                            "type": "string"
+                        },
+                        "VpcSettings": {
+                            "$ref": "#/definitions/AWS::DirectoryService::SimpleAD.VpcSettings"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Password",
+                        "Size",
+                        "VpcSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DirectoryService::SimpleAD"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DirectoryService::SimpleAD.VpcSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubnetIds",
+                "VpcId"
+            ],
+            "type": "object"
+        },
+        "AWS::DocDB::DBCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MasterUserPassword": {
+                            "type": "string"
+                        },
+                        "MasterUsername": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "SnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MasterUserPassword",
+                        "MasterUsername"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DocDB::DBCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DocDB::DBClusterParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::DocDB::DBClusterParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DocDB::DBInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBInstanceClass": {
+                            "type": "string"
+                        },
+                        "DBInstanceIdentifier": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBClusterIdentifier",
+                        "DBInstanceClass"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DocDB::DBInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DocDB::DBSubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DBSubnetGroupDescription": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBSubnetGroupDescription",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DocDB::DBSubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AttributeDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.AttributeDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "BillingMode": {
+                            "type": "string"
+                        },
+                        "GlobalSecondaryIndexes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.GlobalSecondaryIndex"
+                            },
+                            "type": "array"
+                        },
+                        "KeySchema": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.KeySchema"
+                            },
+                            "type": "array"
+                        },
+                        "LocalSecondaryIndexes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.LocalSecondaryIndex"
+                            },
+                            "type": "array"
+                        },
+                        "Replicas": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReplicaSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "SSESpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.SSESpecification"
+                        },
+                        "StreamSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.StreamSpecification"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        },
+                        "TimeToLiveSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.TimeToLiveSpecification"
+                        },
+                        "WriteProvisionedThroughputSettings": {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
+                        }
+                    },
+                    "required": [
+                        "AttributeDefinitions",
+                        "KeySchema",
+                        "Replicas"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DynamoDB::GlobalTable"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.AttributeDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "AttributeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "AttributeType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.CapacityAutoScalingSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                },
+                "SeedCapacity": {
+                    "type": "number"
+                },
+                "TargetTrackingScalingPolicyConfiguration": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.TargetTrackingScalingPolicyConfiguration"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity",
+                "TargetTrackingScalingPolicyConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.ContributorInsightsSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.GlobalSecondaryIndex": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexName": {
+                    "type": "string"
+                },
+                "KeySchema": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.KeySchema"
+                    },
+                    "type": "array"
+                },
+                "Projection": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.Projection"
+                },
+                "WriteProvisionedThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings"
+                }
+            },
+            "required": [
+                "IndexName",
+                "KeySchema",
+                "Projection"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.KeySchema": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "KeyType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.LocalSecondaryIndex": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexName": {
+                    "type": "string"
+                },
+                "KeySchema": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.KeySchema"
+                    },
+                    "type": "array"
+                },
+                "Projection": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.Projection"
+                }
+            },
+            "required": [
+                "IndexName",
+                "KeySchema",
+                "Projection"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.PointInTimeRecoverySpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PointInTimeRecoveryEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.Projection": {
+            "additionalProperties": false,
+            "properties": {
+                "NonKeyAttributes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ProjectionType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityAutoScalingSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.CapacityAutoScalingSettings"
+                },
+                "ReadCapacityUnits": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.ReplicaGlobalSecondaryIndexSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ContributorInsightsSpecification": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ContributorInsightsSpecification"
+                },
+                "IndexName": {
+                    "type": "string"
+                },
+                "ReadProvisionedThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
+                }
+            },
+            "required": [
+                "IndexName"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.ReplicaSSESpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSMasterKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KMSMasterKeyId"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.ReplicaSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ContributorInsightsSpecification": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ContributorInsightsSpecification"
+                },
+                "GlobalSecondaryIndexes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReplicaGlobalSecondaryIndexSpecification"
+                    },
+                    "type": "array"
+                },
+                "PointInTimeRecoverySpecification": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.PointInTimeRecoverySpecification"
+                },
+                "ReadProvisionedThroughputSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReadProvisionedThroughputSettings"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "SSESpecification": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.ReplicaSSESpecification"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.SSESpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "SSEEnabled": {
+                    "type": "boolean"
+                },
+                "SSEType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SSEEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.StreamSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamViewType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StreamViewType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.TargetTrackingScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DisableScaleIn": {
+                    "type": "boolean"
+                },
+                "ScaleInCooldown": {
+                    "type": "number"
+                },
+                "ScaleOutCooldown": {
+                    "type": "number"
+                },
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.TimeToLiveSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::GlobalTable.WriteProvisionedThroughputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "WriteCapacityAutoScalingSettings": {
+                    "$ref": "#/definitions/AWS::DynamoDB::GlobalTable.CapacityAutoScalingSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AttributeDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::Table.AttributeDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "BillingMode": {
+                            "type": "string"
+                        },
+                        "ContributorInsightsSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.ContributorInsightsSpecification"
+                        },
+                        "GlobalSecondaryIndexes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::Table.GlobalSecondaryIndex"
+                            },
+                            "type": "array"
+                        },
+                        "KeySchema": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::Table.KeySchema"
+                            },
+                            "type": "array"
+                        },
+                        "KinesisStreamSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.KinesisStreamSpecification"
+                        },
+                        "LocalSecondaryIndexes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::DynamoDB::Table.LocalSecondaryIndex"
+                            },
+                            "type": "array"
+                        },
+                        "PointInTimeRecoverySpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.PointInTimeRecoverySpecification"
+                        },
+                        "ProvisionedThroughput": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.ProvisionedThroughput"
+                        },
+                        "SSESpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.SSESpecification"
+                        },
+                        "StreamSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.StreamSpecification"
+                        },
+                        "TableClass": {
+                            "type": "string"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeToLiveSpecification": {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table.TimeToLiveSpecification"
+                        }
+                    },
+                    "required": [
+                        "KeySchema"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::DynamoDB::Table"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.AttributeDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "AttributeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "AttributeType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.ContributorInsightsSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.GlobalSecondaryIndex": {
+            "additionalProperties": false,
+            "properties": {
+                "ContributorInsightsSpecification": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.ContributorInsightsSpecification"
+                },
+                "IndexName": {
+                    "type": "string"
+                },
+                "KeySchema": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DynamoDB::Table.KeySchema"
+                    },
+                    "type": "array"
+                },
+                "Projection": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.Projection"
+                },
+                "ProvisionedThroughput": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.ProvisionedThroughput"
+                }
+            },
+            "required": [
+                "IndexName",
+                "KeySchema",
+                "Projection"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.KeySchema": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "KeyType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.KinesisStreamSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StreamArn"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.LocalSecondaryIndex": {
+            "additionalProperties": false,
+            "properties": {
+                "IndexName": {
+                    "type": "string"
+                },
+                "KeySchema": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::DynamoDB::Table.KeySchema"
+                    },
+                    "type": "array"
+                },
+                "Projection": {
+                    "$ref": "#/definitions/AWS::DynamoDB::Table.Projection"
+                }
+            },
+            "required": [
+                "IndexName",
+                "KeySchema",
+                "Projection"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.PointInTimeRecoverySpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PointInTimeRecoveryEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.Projection": {
+            "additionalProperties": false,
+            "properties": {
+                "NonKeyAttributes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ProjectionType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.ProvisionedThroughput": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityUnits": {
+                    "type": "number"
+                },
+                "WriteCapacityUnits": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ReadCapacityUnits",
+                "WriteCapacityUnits"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.SSESpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSMasterKeyId": {
+                    "type": "string"
+                },
+                "SSEEnabled": {
+                    "type": "boolean"
+                },
+                "SSEType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SSEEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.StreamSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamViewType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StreamViewType"
+            ],
+            "type": "object"
+        },
+        "AWS::DynamoDB::Table.TimeToLiveSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::CapacityReservation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "EbsOptimized": {
+                            "type": "boolean"
+                        },
+                        "EndDate": {
+                            "type": "string"
+                        },
+                        "EndDateType": {
+                            "type": "string"
+                        },
+                        "EphemeralStorage": {
+                            "type": "boolean"
+                        },
+                        "InstanceCount": {
+                            "type": "number"
+                        },
+                        "InstanceMatchCriteria": {
+                            "type": "string"
+                        },
+                        "InstancePlatform": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "OutPostArn": {
+                            "type": "string"
+                        },
+                        "PlacementGroupArn": {
+                            "type": "string"
+                        },
+                        "TagSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::CapacityReservation.TagSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "Tenancy": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AvailabilityZone",
+                        "InstanceCount",
+                        "InstancePlatform",
+                        "InstanceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::CapacityReservation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::CapacityReservation.TagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::CapacityReservationFleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocationStrategy": {
+                            "type": "string"
+                        },
+                        "EndDate": {
+                            "type": "string"
+                        },
+                        "InstanceMatchCriteria": {
+                            "type": "string"
+                        },
+                        "InstanceTypeSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::CapacityReservationFleet.InstanceTypeSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "NoRemoveEndDate": {
+                            "type": "boolean"
+                        },
+                        "RemoveEndDate": {
+                            "type": "boolean"
+                        },
+                        "TagSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::CapacityReservationFleet.TagSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "Tenancy": {
+                            "type": "string"
+                        },
+                        "TotalTargetCapacity": {
+                            "type": "number"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::CapacityReservationFleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::CapacityReservationFleet.InstanceTypeSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "AvailabilityZoneId": {
+                    "type": "string"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                },
+                "InstancePlatform": {
+                    "type": "string"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::CapacityReservationFleet.TagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::CarrierGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::CarrierGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnAuthorizationRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessGroupId": {
+                            "type": "string"
+                        },
+                        "AuthorizeAllGroups": {
+                            "type": "boolean"
+                        },
+                        "ClientVpnEndpointId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "TargetNetworkCidr": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClientVpnEndpointId",
+                        "TargetNetworkCidr"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::ClientVpnAuthorizationRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationOptions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.ClientAuthenticationRequest"
+                            },
+                            "type": "array"
+                        },
+                        "ClientCidrBlock": {
+                            "type": "string"
+                        },
+                        "ClientConnectOptions": {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.ClientConnectOptions"
+                        },
+                        "ConnectionLogOptions": {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.ConnectionLogOptions"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DnsServers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SelfServicePortal": {
+                            "type": "string"
+                        },
+                        "ServerCertificateArn": {
+                            "type": "string"
+                        },
+                        "SplitTunnel": {
+                            "type": "boolean"
+                        },
+                        "TagSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.TagSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "TransportProtocol": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        },
+                        "VpnPort": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "AuthenticationOptions",
+                        "ClientCidrBlock",
+                        "ConnectionLogOptions",
+                        "ServerCertificateArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::ClientVpnEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.CertificateAuthenticationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientRootCertificateChainArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClientRootCertificateChainArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.ClientAuthenticationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveDirectory": {
+                    "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.DirectoryServiceAuthenticationRequest"
+                },
+                "FederatedAuthentication": {
+                    "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.FederatedAuthenticationRequest"
+                },
+                "MutualAuthentication": {
+                    "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint.CertificateAuthenticationRequest"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.ClientConnectOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "LambdaFunctionArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.ConnectionLogOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudwatchLogGroup": {
+                    "type": "string"
+                },
+                "CloudwatchLogStream": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.DirectoryServiceAuthenticationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DirectoryId"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.FederatedAuthenticationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "SAMLProviderArn": {
+                    "type": "string"
+                },
+                "SelfServiceSAMLProviderArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SAMLProviderArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnEndpoint.TagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ResourceType",
+                "Tags"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClientVpnEndpointId": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "TargetVpcSubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClientVpnEndpointId",
+                        "DestinationCidrBlock",
+                        "TargetVpcSubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::ClientVpnRoute"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::ClientVpnTargetNetworkAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClientVpnEndpointId": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClientVpnEndpointId",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::ClientVpnTargetNetworkAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::CustomerGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BgpAsn": {
+                            "type": "number"
+                        },
+                        "IpAddress": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "BgpAsn",
+                        "IpAddress",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::CustomerGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::DHCPOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DomainNameServers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "NetbiosNameServers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "NetbiosNodeType": {
+                            "type": "number"
+                        },
+                        "NtpServers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::DHCPOptions"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Context": {
+                            "type": "string"
+                        },
+                        "ExcessCapacityTerminationPolicy": {
+                            "type": "string"
+                        },
+                        "LaunchTemplateConfigs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::EC2Fleet.FleetLaunchTemplateConfigRequest"
+                            },
+                            "type": "array"
+                        },
+                        "OnDemandOptions": {
+                            "$ref": "#/definitions/AWS::EC2::EC2Fleet.OnDemandOptionsRequest"
+                        },
+                        "ReplaceUnhealthyInstances": {
+                            "type": "boolean"
+                        },
+                        "SpotOptions": {
+                            "$ref": "#/definitions/AWS::EC2::EC2Fleet.SpotOptionsRequest"
+                        },
+                        "TagSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::EC2Fleet.TagSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "TargetCapacitySpecification": {
+                            "$ref": "#/definitions/AWS::EC2::EC2Fleet.TargetCapacitySpecificationRequest"
+                        },
+                        "TerminateInstancesWithExpiration": {
+                            "type": "boolean"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "ValidFrom": {
+                            "type": "string"
+                        },
+                        "ValidUntil": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LaunchTemplateConfigs",
+                        "TargetCapacitySpecification"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::EC2Fleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.AcceleratorCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.AcceleratorTotalMemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.BaselineEbsBandwidthMbpsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.CapacityRebalance": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplacementStrategy": {
+                    "type": "string"
+                },
+                "TerminationDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.CapacityReservationOptionsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "UsageStrategy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.FleetLaunchTemplateConfigRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateSpecification": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.FleetLaunchTemplateSpecificationRequest"
+                },
+                "Overrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::EC2Fleet.FleetLaunchTemplateOverridesRequest"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.FleetLaunchTemplateOverridesRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "InstanceRequirements": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.InstanceRequirementsRequest"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "MaxPrice": {
+                    "type": "string"
+                },
+                "Placement": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.Placement"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "SubnetId": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.FleetLaunchTemplateSpecificationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.InstanceRequirementsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceleratorCount": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.AcceleratorCountRequest"
+                },
+                "AcceleratorManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorTotalMemoryMiB": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.AcceleratorTotalMemoryMiBRequest"
+                },
+                "AcceleratorTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BareMetal": {
+                    "type": "string"
+                },
+                "BaselineEbsBandwidthMbps": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.BaselineEbsBandwidthMbpsRequest"
+                },
+                "BurstablePerformance": {
+                    "type": "string"
+                },
+                "CpuManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExcludedInstanceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InstanceGenerations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LocalStorage": {
+                    "type": "string"
+                },
+                "LocalStorageTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MemoryGiBPerVCpu": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.MemoryGiBPerVCpuRequest"
+                },
+                "MemoryMiB": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.MemoryMiBRequest"
+                },
+                "NetworkInterfaceCount": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.NetworkInterfaceCountRequest"
+                },
+                "OnDemandMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "RequireHibernateSupport": {
+                    "type": "boolean"
+                },
+                "SpotMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "TotalLocalStorageGB": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.TotalLocalStorageGBRequest"
+                },
+                "VCpuCount": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.VCpuCountRangeRequest"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.MaintenanceStrategies": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityRebalance": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.CapacityRebalance"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.MemoryGiBPerVCpuRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.MemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.NetworkInterfaceCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.OnDemandOptionsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "CapacityReservationOptions": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.CapacityReservationOptionsRequest"
+                },
+                "MaxTotalPrice": {
+                    "type": "string"
+                },
+                "MinTargetCapacity": {
+                    "type": "number"
+                },
+                "SingleAvailabilityZone": {
+                    "type": "boolean"
+                },
+                "SingleInstanceType": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.Placement": {
+            "additionalProperties": false,
+            "properties": {
+                "Affinity": {
+                    "type": "string"
+                },
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "GroupName": {
+                    "type": "string"
+                },
+                "HostId": {
+                    "type": "string"
+                },
+                "HostResourceGroupArn": {
+                    "type": "string"
+                },
+                "PartitionNumber": {
+                    "type": "number"
+                },
+                "SpreadDomain": {
+                    "type": "string"
+                },
+                "Tenancy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.SpotOptionsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "InstanceInterruptionBehavior": {
+                    "type": "string"
+                },
+                "InstancePoolsToUseCount": {
+                    "type": "number"
+                },
+                "MaintenanceStrategies": {
+                    "$ref": "#/definitions/AWS::EC2::EC2Fleet.MaintenanceStrategies"
+                },
+                "MaxTotalPrice": {
+                    "type": "string"
+                },
+                "MinTargetCapacity": {
+                    "type": "number"
+                },
+                "SingleAvailabilityZone": {
+                    "type": "boolean"
+                },
+                "SingleInstanceType": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.TagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.TargetCapacitySpecificationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultTargetCapacityType": {
+                    "type": "string"
+                },
+                "OnDemandTargetCapacity": {
+                    "type": "number"
+                },
+                "SpotTargetCapacity": {
+                    "type": "number"
+                },
+                "TargetCapacityUnitType": {
+                    "type": "string"
+                },
+                "TotalTargetCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TotalTargetCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.TotalLocalStorageGBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EC2Fleet.VCpuCountRangeRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::EIP": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "PublicIpv4Pool": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::EIP"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EIPAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocationId": {
+                            "type": "string"
+                        },
+                        "EIP": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "PrivateIpAddress": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::EIPAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EgressOnlyInternetGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::EgressOnlyInternetGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::EnclaveCertificateIamRoleAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CertificateArn": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CertificateArn",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::EnclaveCertificateIamRoleAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::FlowLog": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeliverLogsPermissionArn": {
+                            "type": "string"
+                        },
+                        "LogDestination": {
+                            "type": "string"
+                        },
+                        "LogDestinationType": {
+                            "type": "string"
+                        },
+                        "LogFormat": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "MaxAggregationInterval": {
+                            "type": "number"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "ResourceType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrafficType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourceId",
+                        "ResourceType",
+                        "TrafficType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::FlowLog"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::GatewayRouteTableAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GatewayId": {
+                            "type": "string"
+                        },
+                        "RouteTableId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GatewayId",
+                        "RouteTableId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::GatewayRouteTableAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Host": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoPlacement": {
+                            "type": "string"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "HostRecovery": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AvailabilityZone",
+                        "InstanceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::Host"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAM": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "OperatingRegions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::IPAM.IpamOperatingRegion"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::IPAM"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAM.IpamOperatingRegion": {
+            "additionalProperties": false,
+            "properties": {
+                "RegionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RegionName"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAMAllocation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Cidr": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IpamPoolId": {
+                            "type": "string"
+                        },
+                        "NetmaskLength": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "IpamPoolId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::IPAMAllocation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAMPool": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AddressFamily": {
+                            "type": "string"
+                        },
+                        "AllocationDefaultNetmaskLength": {
+                            "type": "number"
+                        },
+                        "AllocationMaxNetmaskLength": {
+                            "type": "number"
+                        },
+                        "AllocationMinNetmaskLength": {
+                            "type": "number"
+                        },
+                        "AllocationResourceTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "AutoImport": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IpamScopeId": {
+                            "type": "string"
+                        },
+                        "Locale": {
+                            "type": "string"
+                        },
+                        "ProvisionedCidrs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::IPAMPool.ProvisionedCidr"
+                            },
+                            "type": "array"
+                        },
+                        "PubliclyAdvertisable": {
+                            "type": "boolean"
+                        },
+                        "SourceIpamPoolId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddressFamily",
+                        "IpamScopeId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::IPAMPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAMPool.ProvisionedCidr": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Cidr"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::IPAMScope": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "IpamId": {
+                            "type": "string"
+                        },
+                        "IpamScopeType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "IpamId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::IPAMScope"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance": {
+            "additionalProperties": false,
+            "properties": {
+                "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": {
+                        "AdditionalInfo": {
+                            "type": "string"
+                        },
+                        "Affinity": {
+                            "type": "string"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "BlockDeviceMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.BlockDeviceMapping"
+                            },
+                            "type": "array"
+                        },
+                        "CpuOptions": {
+                            "$ref": "#/definitions/AWS::EC2::Instance.CpuOptions"
+                        },
+                        "CreditSpecification": {
+                            "$ref": "#/definitions/AWS::EC2::Instance.CreditSpecification"
+                        },
+                        "DisableApiTermination": {
+                            "type": "boolean"
+                        },
+                        "EbsOptimized": {
+                            "type": "boolean"
+                        },
+                        "ElasticGpuSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.ElasticGpuSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "ElasticInferenceAccelerators": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.ElasticInferenceAccelerator"
+                            },
+                            "type": "array"
+                        },
+                        "EnclaveOptions": {
+                            "$ref": "#/definitions/AWS::EC2::Instance.EnclaveOptions"
+                        },
+                        "HibernationOptions": {
+                            "$ref": "#/definitions/AWS::EC2::Instance.HibernationOptions"
+                        },
+                        "HostId": {
+                            "type": "string"
+                        },
+                        "HostResourceGroupArn": {
+                            "type": "string"
+                        },
+                        "IamInstanceProfile": {
+                            "type": "string"
+                        },
+                        "ImageId": {
+                            "type": "string"
+                        },
+                        "InstanceInitiatedShutdownBehavior": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "Ipv6AddressCount": {
+                            "type": "number"
+                        },
+                        "Ipv6Addresses": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.InstanceIpv6Address"
+                            },
+                            "type": "array"
+                        },
+                        "KernelId": {
+                            "type": "string"
+                        },
+                        "KeyName": {
+                            "type": "string"
+                        },
+                        "LaunchTemplate": {
+                            "$ref": "#/definitions/AWS::EC2::Instance.LaunchTemplateSpecification"
+                        },
+                        "LicenseSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.LicenseSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "Monitoring": {
+                            "type": "boolean"
+                        },
+                        "NetworkInterfaces": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.NetworkInterface"
+                            },
+                            "type": "array"
+                        },
+                        "PlacementGroupName": {
+                            "type": "string"
+                        },
+                        "PrivateIpAddress": {
+                            "type": "string"
+                        },
+                        "PropagateTagsToVolumeOnCreation": {
+                            "type": "boolean"
+                        },
+                        "RamdiskId": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SourceDestCheck": {
+                            "type": "boolean"
+                        },
+                        "SsmAssociations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.SsmAssociation"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Tenancy": {
+                            "type": "string"
+                        },
+                        "UserData": {
+                            "type": "string"
+                        },
+                        "Volumes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::Instance.Volume"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.AssociationParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.BlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::EC2::Instance.Ebs"
+                },
+                "NoDevice": {
+                    "$ref": "#/definitions/AWS::EC2::Instance.NoDevice"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeviceName"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.CpuOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CoreCount": {
+                    "type": "number"
+                },
+                "ThreadsPerCore": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Instance.CreditSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "CPUCredits": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Instance.Ebs": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Instance.ElasticGpuSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.ElasticInferenceAccelerator": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.EnclaveOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Instance.HibernationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Configured": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Instance.InstanceIpv6Address": {
+            "additionalProperties": false,
+            "properties": {
+                "Ipv6Address": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ipv6Address"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.LaunchTemplateSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.LicenseSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LicenseConfigurationArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LicenseConfigurationArn"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.NetworkInterface": {
+            "additionalProperties": false,
+            "properties": {
+                "AssociatePublicIpAddress": {
+                    "type": "boolean"
+                },
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DeviceIndex": {
+                    "type": "string"
+                },
+                "GroupSet": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Ipv6AddressCount": {
+                    "type": "number"
+                },
+                "Ipv6Addresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::Instance.InstanceIpv6Address"
+                    },
+                    "type": "array"
+                },
+                "NetworkInterfaceId": {
+                    "type": "string"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                },
+                "PrivateIpAddresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::Instance.PrivateIpAddressSpecification"
+                    },
+                    "type": "array"
+                },
+                "SecondaryPrivateIpAddressCount": {
+                    "type": "number"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeviceIndex"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.NoDevice": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::EC2::Instance.PrivateIpAddressSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Primary": {
+                    "type": "boolean"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Primary",
+                "PrivateIpAddress"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.SsmAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "AssociationParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::Instance.AssociationParameter"
+                    },
+                    "type": "array"
+                },
+                "DocumentName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DocumentName"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Instance.Volume": {
+            "additionalProperties": false,
+            "properties": {
+                "Device": {
+                    "type": "string"
+                },
+                "VolumeId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Device",
+                "VolumeId"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::InternetGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::InternetGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LaunchTemplateData": {
+                            "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LaunchTemplateData"
+                        },
+                        "LaunchTemplateName": {
+                            "type": "string"
+                        },
+                        "TagSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LaunchTemplateTagSpecification"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::LaunchTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.AcceleratorCount": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.AcceleratorTotalMemoryMiB": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.BaselineEbsBandwidthMbps": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.BlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.Ebs"
+                },
+                "NoDevice": {
+                    "type": "string"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.CapacityReservationSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityReservationPreference": {
+                    "type": "string"
+                },
+                "CapacityReservationTarget": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.CapacityReservationTarget"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.CapacityReservationTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityReservationId": {
+                    "type": "string"
+                },
+                "CapacityReservationResourceGroupArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.CpuOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CoreCount": {
+                    "type": "number"
+                },
+                "ThreadsPerCore": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.CreditSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "CpuCredits": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.Ebs": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "Throughput": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.ElasticGpuSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.EnclaveOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.HibernationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Configured": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.IamInstanceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.InstanceMarketOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "MarketType": {
+                    "type": "string"
+                },
+                "SpotOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.SpotOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.Ipv6Add": {
+            "additionalProperties": false,
+            "properties": {
+                "Ipv6Address": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.LaunchTemplateData": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockDeviceMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.BlockDeviceMapping"
+                    },
+                    "type": "array"
+                },
+                "CapacityReservationSpecification": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.CapacityReservationSpecification"
+                },
+                "CpuOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.CpuOptions"
+                },
+                "CreditSpecification": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.CreditSpecification"
+                },
+                "DisableApiTermination": {
+                    "type": "boolean"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                },
+                "ElasticGpuSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.ElasticGpuSpecification"
+                    },
+                    "type": "array"
+                },
+                "ElasticInferenceAccelerators": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LaunchTemplateElasticInferenceAccelerator"
+                    },
+                    "type": "array"
+                },
+                "EnclaveOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.EnclaveOptions"
+                },
+                "HibernationOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.HibernationOptions"
+                },
+                "IamInstanceProfile": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.IamInstanceProfile"
+                },
+                "ImageId": {
+                    "type": "string"
+                },
+                "InstanceInitiatedShutdownBehavior": {
+                    "type": "string"
+                },
+                "InstanceMarketOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.InstanceMarketOptions"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "KernelId": {
+                    "type": "string"
+                },
+                "KeyName": {
+                    "type": "string"
+                },
+                "LicenseSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.LicenseSpecification"
+                    },
+                    "type": "array"
+                },
+                "MetadataOptions": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.MetadataOptions"
+                },
+                "Monitoring": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.Monitoring"
+                },
+                "NetworkInterfaces": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.NetworkInterface"
+                    },
+                    "type": "array"
+                },
+                "Placement": {
+                    "$ref": "#/definitions/AWS::EC2::LaunchTemplate.Placement"
+                },
+                "RamDiskId": {
+                    "type": "string"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TagSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.TagSpecification"
+                    },
+                    "type": "array"
+                },
+                "UserData": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.LaunchTemplateElasticInferenceAccelerator": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.LaunchTemplateTagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.LicenseSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LicenseConfigurationArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.MemoryGiBPerVCpu": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.MemoryMiB": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.MetadataOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpEndpoint": {
+                    "type": "string"
+                },
+                "HttpProtocolIpv6": {
+                    "type": "string"
+                },
+                "HttpPutResponseHopLimit": {
+                    "type": "number"
+                },
+                "HttpTokens": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.Monitoring": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.NetworkInterface": {
+            "additionalProperties": false,
+            "properties": {
+                "AssociateCarrierIpAddress": {
+                    "type": "boolean"
+                },
+                "AssociatePublicIpAddress": {
+                    "type": "boolean"
+                },
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DeviceIndex": {
+                    "type": "number"
+                },
+                "Groups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InterfaceType": {
+                    "type": "string"
+                },
+                "Ipv6AddressCount": {
+                    "type": "number"
+                },
+                "Ipv6Addresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.Ipv6Add"
+                    },
+                    "type": "array"
+                },
+                "NetworkCardIndex": {
+                    "type": "number"
+                },
+                "NetworkInterfaceId": {
+                    "type": "string"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                },
+                "PrivateIpAddresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::LaunchTemplate.PrivateIpAdd"
+                    },
+                    "type": "array"
+                },
+                "SecondaryPrivateIpAddressCount": {
+                    "type": "number"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.NetworkInterfaceCount": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.Placement": {
+            "additionalProperties": false,
+            "properties": {
+                "Affinity": {
+                    "type": "string"
+                },
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "GroupName": {
+                    "type": "string"
+                },
+                "HostId": {
+                    "type": "string"
+                },
+                "HostResourceGroupArn": {
+                    "type": "string"
+                },
+                "PartitionNumber": {
+                    "type": "number"
+                },
+                "SpreadDomain": {
+                    "type": "string"
+                },
+                "Tenancy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.PrivateIpAdd": {
+            "additionalProperties": false,
+            "properties": {
+                "Primary": {
+                    "type": "boolean"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.SpotOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockDurationMinutes": {
+                    "type": "number"
+                },
+                "InstanceInterruptionBehavior": {
+                    "type": "string"
+                },
+                "MaxPrice": {
+                    "type": "string"
+                },
+                "SpotInstanceType": {
+                    "type": "string"
+                },
+                "ValidUntil": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.TagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.TotalLocalStorageGB": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LaunchTemplate.VCpuCount": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::LocalGatewayRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "LocalGatewayRouteTableId": {
+                            "type": "string"
+                        },
+                        "LocalGatewayVirtualInterfaceGroupId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationCidrBlock",
+                        "LocalGatewayRouteTableId",
+                        "LocalGatewayVirtualInterfaceGroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::LocalGatewayRoute"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::LocalGatewayRouteTableVPCAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LocalGatewayRouteTableId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LocalGatewayRouteTableId",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::LocalGatewayRouteTableVPCAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NatGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocationId": {
+                            "type": "string"
+                        },
+                        "ConnectivityType": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NatGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkAcl": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkAcl"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkAclEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CidrBlock": {
+                            "type": "string"
+                        },
+                        "Egress": {
+                            "type": "boolean"
+                        },
+                        "Icmp": {
+                            "$ref": "#/definitions/AWS::EC2::NetworkAclEntry.Icmp"
+                        },
+                        "Ipv6CidrBlock": {
+                            "type": "string"
+                        },
+                        "NetworkAclId": {
+                            "type": "string"
+                        },
+                        "PortRange": {
+                            "$ref": "#/definitions/AWS::EC2::NetworkAclEntry.PortRange"
+                        },
+                        "Protocol": {
+                            "type": "number"
+                        },
+                        "RuleAction": {
+                            "type": "string"
+                        },
+                        "RuleNumber": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "NetworkAclId",
+                        "Protocol",
+                        "RuleAction",
+                        "RuleNumber"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkAclEntry"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkAclEntry.Icmp": {
+            "additionalProperties": false,
+            "properties": {
+                "Code": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkAclEntry.PortRange": {
+            "additionalProperties": false,
+            "properties": {
+                "From": {
+                    "type": "number"
+                },
+                "To": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FilterInArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "NetworkInsightsPathId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "NetworkInsightsPathId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkInsightsAnalysis"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AlternatePathHint": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentArn": {
+                    "type": "string"
+                },
+                "ComponentId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Egress": {
+                    "type": "boolean"
+                },
+                "PortRange": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.PortRange"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "RuleAction": {
+                    "type": "string"
+                },
+                "RuleNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerListener": {
+            "additionalProperties": false,
+            "properties": {
+                "InstancePort": {
+                    "type": "number"
+                },
+                "LoadBalancerPort": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "Instance": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationAddresses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DestinationPortRanges": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.PortRange"
+                    },
+                    "type": "array"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "SourceAddresses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SourcePortRanges": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.PortRange"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisRouteTableRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "NatGatewayId": {
+                    "type": "string"
+                },
+                "NetworkInterfaceId": {
+                    "type": "string"
+                },
+                "Origin": {
+                    "type": "string"
+                },
+                "TransitGatewayId": {
+                    "type": "string"
+                },
+                "VpcPeeringConnectionId": {
+                    "type": "string"
+                },
+                "destinationCidr": {
+                    "type": "string"
+                },
+                "destinationPrefixListId": {
+                    "type": "string"
+                },
+                "egressOnlyInternetGatewayId": {
+                    "type": "string"
+                },
+                "gatewayId": {
+                    "type": "string"
+                },
+                "instanceId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.AnalysisSecurityGroupRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Direction": {
+                    "type": "string"
+                },
+                "PortRange": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.PortRange"
+                },
+                "PrefixListId": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "SecurityGroupId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.Explanation": {
+            "additionalProperties": false,
+            "properties": {
+                "Acl": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "AclRule": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule"
+                },
+                "Address": {
+                    "type": "string"
+                },
+                "Addresses": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AttachedTo": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "AvailabilityZones": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Cidrs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ClassicLoadBalancerListener": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerListener"
+                },
+                "Component": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "CustomerGateway": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "DestinationVpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Direction": {
+                    "type": "string"
+                },
+                "ElasticLoadBalancerListener": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "ExplanationCode": {
+                    "type": "string"
+                },
+                "IngressRouteTable": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "InternetGateway": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "LoadBalancerArn": {
+                    "type": "string"
+                },
+                "LoadBalancerListenerPort": {
+                    "type": "number"
+                },
+                "LoadBalancerTarget": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisLoadBalancerTarget"
+                },
+                "LoadBalancerTargetGroup": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "LoadBalancerTargetGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                    },
+                    "type": "array"
+                },
+                "LoadBalancerTargetPort": {
+                    "type": "number"
+                },
+                "MissingComponent": {
+                    "type": "string"
+                },
+                "NatGateway": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "NetworkInterface": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "PacketField": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "PortRanges": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.PortRange"
+                    },
+                    "type": "array"
+                },
+                "PrefixList": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Protocols": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RouteTable": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "RouteTableRoute": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisRouteTableRoute"
+                },
+                "SecurityGroup": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "SecurityGroupRule": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisSecurityGroupRule"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                    },
+                    "type": "array"
+                },
+                "SourceVpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "State": {
+                    "type": "string"
+                },
+                "Subnet": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "SubnetRouteTable": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Vpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "VpcPeeringConnection": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "VpnConnection": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "VpnGateway": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "vpcEndpoint": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.PathComponent": {
+            "additionalProperties": false,
+            "properties": {
+                "AclRule": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisAclRule"
+                },
+                "Component": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "DestinationVpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "InboundHeader": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader"
+                },
+                "OutboundHeader": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisPacketHeader"
+                },
+                "RouteTableRoute": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisRouteTableRoute"
+                },
+                "SecurityGroupRule": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisSecurityGroupRule"
+                },
+                "SequenceNumber": {
+                    "type": "number"
+                },
+                "SourceVpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Subnet": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                },
+                "Vpc": {
+                    "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis.AnalysisComponent"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsAnalysis.PortRange": {
+            "additionalProperties": false,
+            "properties": {
+                "From": {
+                    "type": "number"
+                },
+                "To": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInsightsPath": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Destination": {
+                            "type": "string"
+                        },
+                        "DestinationIp": {
+                            "type": "string"
+                        },
+                        "DestinationPort": {
+                            "type": "number"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "Source": {
+                            "type": "string"
+                        },
+                        "SourceIp": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Destination",
+                        "Protocol",
+                        "Source"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkInsightsPath"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInterface": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "GroupSet": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "InterfaceType": {
+                            "type": "string"
+                        },
+                        "Ipv6AddressCount": {
+                            "type": "number"
+                        },
+                        "Ipv6Addresses": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::NetworkInterface.InstanceIpv6Address"
+                            },
+                            "type": "array"
+                        },
+                        "PrivateIpAddress": {
+                            "type": "string"
+                        },
+                        "PrivateIpAddresses": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::NetworkInterface.PrivateIpAddressSpecification"
+                            },
+                            "type": "array"
+                        },
+                        "SecondaryPrivateIpAddressCount": {
+                            "type": "number"
+                        },
+                        "SourceDestCheck": {
+                            "type": "boolean"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkInterface"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInterface.InstanceIpv6Address": {
+            "additionalProperties": false,
+            "properties": {
+                "Ipv6Address": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ipv6Address"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInterface.PrivateIpAddressSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Primary": {
+                    "type": "boolean"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Primary",
+                "PrivateIpAddress"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInterfaceAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeleteOnTermination": {
+                            "type": "boolean"
+                        },
+                        "DeviceIndex": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DeviceIndex",
+                        "InstanceId",
+                        "NetworkInterfaceId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkInterfaceAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::NetworkInterfacePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "Permission": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AwsAccountId",
+                        "NetworkInterfaceId",
+                        "Permission"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::NetworkInterfacePermission"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::PlacementGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Strategy": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::PlacementGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::PrefixList": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AddressFamily": {
+                            "type": "string"
+                        },
+                        "Entries": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::PrefixList.Entry"
+                            },
+                            "type": "array"
+                        },
+                        "MaxEntries": {
+                            "type": "number"
+                        },
+                        "PrefixListName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddressFamily",
+                        "MaxEntries",
+                        "PrefixListName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::PrefixList"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::PrefixList.Entry": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Cidr"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Route": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CarrierGatewayId": {
+                            "type": "string"
+                        },
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "DestinationIpv6CidrBlock": {
+                            "type": "string"
+                        },
+                        "EgressOnlyInternetGatewayId": {
+                            "type": "string"
+                        },
+                        "GatewayId": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "LocalGatewayId": {
+                            "type": "string"
+                        },
+                        "NatGatewayId": {
+                            "type": "string"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "RouteTableId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        },
+                        "VpcEndpointId": {
+                            "type": "string"
+                        },
+                        "VpcPeeringConnectionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RouteTableId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::Route"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::RouteTable": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::RouteTable"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupDescription": {
+                            "type": "string"
+                        },
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "SecurityGroupEgress": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::SecurityGroup.Egress"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityGroupIngress": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::SecurityGroup.Ingress"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GroupDescription"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SecurityGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SecurityGroup.Egress": {
+            "additionalProperties": false,
+            "properties": {
+                "CidrIp": {
+                    "type": "string"
+                },
+                "CidrIpv6": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DestinationPrefixListId": {
+                    "type": "string"
+                },
+                "DestinationSecurityGroupId": {
+                    "type": "string"
+                },
+                "FromPort": {
+                    "type": "number"
+                },
+                "IpProtocol": {
+                    "type": "string"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "IpProtocol"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SecurityGroup.Ingress": {
+            "additionalProperties": false,
+            "properties": {
+                "CidrIp": {
+                    "type": "string"
+                },
+                "CidrIpv6": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "FromPort": {
+                    "type": "number"
+                },
+                "IpProtocol": {
+                    "type": "string"
+                },
+                "SourcePrefixListId": {
+                    "type": "string"
+                },
+                "SourceSecurityGroupId": {
+                    "type": "string"
+                },
+                "SourceSecurityGroupName": {
+                    "type": "string"
+                },
+                "SourceSecurityGroupOwnerId": {
+                    "type": "string"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "IpProtocol"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SecurityGroupEgress": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CidrIp": {
+                            "type": "string"
+                        },
+                        "CidrIpv6": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DestinationPrefixListId": {
+                            "type": "string"
+                        },
+                        "DestinationSecurityGroupId": {
+                            "type": "string"
+                        },
+                        "FromPort": {
+                            "type": "number"
+                        },
+                        "GroupId": {
+                            "type": "string"
+                        },
+                        "IpProtocol": {
+                            "type": "string"
+                        },
+                        "ToPort": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "GroupId",
+                        "IpProtocol"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SecurityGroupEgress"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SecurityGroupIngress": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CidrIp": {
+                            "type": "string"
+                        },
+                        "CidrIpv6": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FromPort": {
+                            "type": "number"
+                        },
+                        "GroupId": {
+                            "type": "string"
+                        },
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "IpProtocol": {
+                            "type": "string"
+                        },
+                        "SourcePrefixListId": {
+                            "type": "string"
+                        },
+                        "SourceSecurityGroupId": {
+                            "type": "string"
+                        },
+                        "SourceSecurityGroupName": {
+                            "type": "string"
+                        },
+                        "SourceSecurityGroupOwnerId": {
+                            "type": "string"
+                        },
+                        "ToPort": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "IpProtocol"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SecurityGroupIngress"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SpotFleetRequestConfigData": {
+                            "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotFleetRequestConfigData"
+                        }
+                    },
+                    "required": [
+                        "SpotFleetRequestConfigData"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SpotFleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.AcceleratorCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.AcceleratorTotalMemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.BaselineEbsBandwidthMbpsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.BlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.EbsBlockDevice"
+                },
+                "NoDevice": {
+                    "type": "string"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeviceName"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.ClassicLoadBalancer": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.ClassicLoadBalancersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClassicLoadBalancers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.ClassicLoadBalancer"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ClassicLoadBalancers"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.EbsBlockDevice": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.FleetLaunchTemplateSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.GroupIdentifier": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupId"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.IamInstanceProfileSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.InstanceIpv6Address": {
+            "additionalProperties": false,
+            "properties": {
+                "Ipv6Address": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ipv6Address"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.InstanceNetworkInterfaceSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AssociatePublicIpAddress": {
+                    "type": "boolean"
+                },
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DeviceIndex": {
+                    "type": "number"
+                },
+                "Groups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Ipv6AddressCount": {
+                    "type": "number"
+                },
+                "Ipv6Addresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.InstanceIpv6Address"
+                    },
+                    "type": "array"
+                },
+                "NetworkInterfaceId": {
+                    "type": "string"
+                },
+                "PrivateIpAddresses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.PrivateIpAddressSpecification"
+                    },
+                    "type": "array"
+                },
+                "SecondaryPrivateIpAddressCount": {
+                    "type": "number"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.InstanceRequirementsRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceleratorCount": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.AcceleratorCountRequest"
+                },
+                "AcceleratorManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AcceleratorTotalMemoryMiB": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.AcceleratorTotalMemoryMiBRequest"
+                },
+                "AcceleratorTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BareMetal": {
+                    "type": "string"
+                },
+                "BaselineEbsBandwidthMbps": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.BaselineEbsBandwidthMbpsRequest"
+                },
+                "BurstablePerformance": {
+                    "type": "string"
+                },
+                "CpuManufacturers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExcludedInstanceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InstanceGenerations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LocalStorage": {
+                    "type": "string"
+                },
+                "LocalStorageTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MemoryGiBPerVCpu": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.MemoryGiBPerVCpuRequest"
+                },
+                "MemoryMiB": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.MemoryMiBRequest"
+                },
+                "NetworkInterfaceCount": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.NetworkInterfaceCountRequest"
+                },
+                "OnDemandMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "RequireHibernateSupport": {
+                    "type": "boolean"
+                },
+                "SpotMaxPricePercentageOverLowestPrice": {
+                    "type": "number"
+                },
+                "TotalLocalStorageGB": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.TotalLocalStorageGBRequest"
+                },
+                "VCpuCount": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.VCpuCountRangeRequest"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.LaunchTemplateConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateSpecification": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.FleetLaunchTemplateSpecification"
+                },
+                "Overrides": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.LaunchTemplateOverrides"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.LaunchTemplateOverrides": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "InstanceRequirements": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.InstanceRequirementsRequest"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "SpotPrice": {
+                    "type": "string"
+                },
+                "SubnetId": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.LoadBalancersConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClassicLoadBalancersConfig": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.ClassicLoadBalancersConfig"
+                },
+                "TargetGroupsConfig": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.TargetGroupsConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.MemoryGiBPerVCpuRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.MemoryMiBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.NetworkInterfaceCountRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.PrivateIpAddressSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Primary": {
+                    "type": "boolean"
+                },
+                "PrivateIpAddress": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PrivateIpAddress"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotCapacityRebalance": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplacementStrategy": {
+                    "type": "string"
+                },
+                "TerminationDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotFleetLaunchSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockDeviceMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.BlockDeviceMapping"
+                    },
+                    "type": "array"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                },
+                "IamInstanceProfile": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.IamInstanceProfileSpecification"
+                },
+                "ImageId": {
+                    "type": "string"
+                },
+                "InstanceRequirements": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.InstanceRequirementsRequest"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "KernelId": {
+                    "type": "string"
+                },
+                "KeyName": {
+                    "type": "string"
+                },
+                "Monitoring": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotFleetMonitoring"
+                },
+                "NetworkInterfaces": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.InstanceNetworkInterfaceSpecification"
+                    },
+                    "type": "array"
+                },
+                "Placement": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotPlacement"
+                },
+                "RamdiskId": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.GroupIdentifier"
+                    },
+                    "type": "array"
+                },
+                "SpotPrice": {
+                    "type": "string"
+                },
+                "SubnetId": {
+                    "type": "string"
+                },
+                "TagSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotFleetTagSpecification"
+                    },
+                    "type": "array"
+                },
+                "UserData": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ImageId"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotFleetMonitoring": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotFleetRequestConfigData": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "Context": {
+                    "type": "string"
+                },
+                "ExcessCapacityTerminationPolicy": {
+                    "type": "string"
+                },
+                "IamFleetRole": {
+                    "type": "string"
+                },
+                "InstanceInterruptionBehavior": {
+                    "type": "string"
+                },
+                "InstancePoolsToUseCount": {
+                    "type": "number"
+                },
+                "LaunchSpecifications": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotFleetLaunchSpecification"
+                    },
+                    "type": "array"
+                },
+                "LaunchTemplateConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.LaunchTemplateConfig"
+                    },
+                    "type": "array"
+                },
+                "LoadBalancersConfig": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.LoadBalancersConfig"
+                },
+                "OnDemandAllocationStrategy": {
+                    "type": "string"
+                },
+                "OnDemandMaxTotalPrice": {
+                    "type": "string"
+                },
+                "OnDemandTargetCapacity": {
+                    "type": "number"
+                },
+                "ReplaceUnhealthyInstances": {
+                    "type": "boolean"
+                },
+                "SpotMaintenanceStrategies": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotMaintenanceStrategies"
+                },
+                "SpotMaxTotalPrice": {
+                    "type": "string"
+                },
+                "SpotPrice": {
+                    "type": "string"
+                },
+                "TargetCapacity": {
+                    "type": "number"
+                },
+                "TargetCapacityUnitType": {
+                    "type": "string"
+                },
+                "TerminateInstancesWithExpiration": {
+                    "type": "boolean"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "ValidFrom": {
+                    "type": "string"
+                },
+                "ValidUntil": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IamFleetRole",
+                "TargetCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotFleetTagSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceType": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotMaintenanceStrategies": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityRebalance": {
+                    "$ref": "#/definitions/AWS::EC2::SpotFleet.SpotCapacityRebalance"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.SpotPlacement": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "GroupName": {
+                    "type": "string"
+                },
+                "Tenancy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.TargetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.TargetGroupsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EC2::SpotFleet.TargetGroup"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "TargetGroups"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.TotalLocalStorageGBRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::SpotFleet.VCpuCountRangeRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Max": {
+                    "type": "number"
+                },
+                "Min": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::Subnet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssignIpv6AddressOnCreation": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "CidrBlock": {
+                            "type": "string"
+                        },
+                        "Ipv6CidrBlock": {
+                            "type": "string"
+                        },
+                        "MapPublicIpOnLaunch": {
+                            "type": "boolean"
+                        },
+                        "OutpostArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CidrBlock",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::Subnet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SubnetCidrBlock": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Ipv6CidrBlock": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Ipv6CidrBlock",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SubnetCidrBlock"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SubnetNetworkAclAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "NetworkAclId": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "NetworkAclId",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SubnetNetworkAclAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::SubnetRouteTableAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RouteTableId": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RouteTableId",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::SubnetRouteTableAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TrafficMirrorFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "NetworkServices": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TrafficMirrorFilter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TrafficMirrorFilterRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "DestinationPortRange": {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange"
+                        },
+                        "Protocol": {
+                            "type": "number"
+                        },
+                        "RuleAction": {
+                            "type": "string"
+                        },
+                        "RuleNumber": {
+                            "type": "number"
+                        },
+                        "SourceCidrBlock": {
+                            "type": "string"
+                        },
+                        "SourcePortRange": {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange"
+                        },
+                        "TrafficDirection": {
+                            "type": "string"
+                        },
+                        "TrafficMirrorFilterId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationCidrBlock",
+                        "RuleAction",
+                        "RuleNumber",
+                        "SourceCidrBlock",
+                        "TrafficDirection",
+                        "TrafficMirrorFilterId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TrafficMirrorFilterRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TrafficMirrorFilterRule.TrafficMirrorPortRange": {
+            "additionalProperties": false,
+            "properties": {
+                "FromPort": {
+                    "type": "number"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FromPort",
+                "ToPort"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TrafficMirrorSession": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "PacketLength": {
+                            "type": "number"
+                        },
+                        "SessionNumber": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrafficMirrorFilterId": {
+                            "type": "string"
+                        },
+                        "TrafficMirrorTargetId": {
+                            "type": "string"
+                        },
+                        "VirtualNetworkId": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "NetworkInterfaceId",
+                        "SessionNumber",
+                        "TrafficMirrorFilterId",
+                        "TrafficMirrorTargetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TrafficMirrorSession"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TrafficMirrorTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "NetworkLoadBalancerArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TrafficMirrorTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AmazonSideAsn": {
+                            "type": "number"
+                        },
+                        "AssociationDefaultRouteTableId": {
+                            "type": "string"
+                        },
+                        "AutoAcceptSharedAttachments": {
+                            "type": "string"
+                        },
+                        "DefaultRouteTableAssociation": {
+                            "type": "string"
+                        },
+                        "DefaultRouteTablePropagation": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DnsSupport": {
+                            "type": "string"
+                        },
+                        "MulticastSupport": {
+                            "type": "string"
+                        },
+                        "PropagationDefaultRouteTableId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayCidrBlocks": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpnEcmpSupport": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SubnetIds",
+                        "TransitGatewayId",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayConnect": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Options": {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayConnect.TransitGatewayConnectOptions"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransportTransitGatewayAttachmentId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Options",
+                        "TransportTransitGatewayAttachmentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayConnect"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayConnect.TransitGatewayConnectOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayMulticastDomain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Options": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TransitGatewayId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayMulticastDomain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayMulticastDomainAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayMulticastDomainId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SubnetId",
+                        "TransitGatewayAttachmentId",
+                        "TransitGatewayMulticastDomainId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayMulticastDomainAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayMulticastGroupMember": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupIpAddress": {
+                            "type": "string"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayMulticastDomainId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GroupIpAddress",
+                        "NetworkInterfaceId",
+                        "TransitGatewayMulticastDomainId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayMulticastGroupMember"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayMulticastGroupSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupIpAddress": {
+                            "type": "string"
+                        },
+                        "NetworkInterfaceId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayMulticastDomainId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GroupIpAddress",
+                        "NetworkInterfaceId",
+                        "TransitGatewayMulticastDomainId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayMulticastGroupSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayPeeringAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Options": {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayPeeringAttachment.TransitGatewayPeeringAttachmentOptions"
+                        },
+                        "PeerAccountId": {
+                            "type": "string"
+                        },
+                        "PeerRegion": {
+                            "type": "string"
+                        },
+                        "PeerTransitGatewayId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PeerAccountId",
+                        "PeerRegion",
+                        "PeerTransitGatewayId",
+                        "TransitGatewayId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayPeeringAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayPeeringAttachment.TransitGatewayPeeringAttachmentOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DynamicRouting": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Blackhole": {
+                            "type": "boolean"
+                        },
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "TransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayRouteTableId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TransitGatewayRouteTableId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayRoute"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayRouteTable": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TransitGatewayId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayRouteTable"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayRouteTableAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "TransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayRouteTableId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TransitGatewayAttachmentId",
+                        "TransitGatewayRouteTableId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayRouteTableAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayRouteTablePropagation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "TransitGatewayAttachmentId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayRouteTableId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TransitGatewayAttachmentId",
+                        "TransitGatewayRouteTableId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayRouteTablePropagation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::TransitGatewayVpcAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AddSubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Options": {
+                            "type": "object"
+                        },
+                        "RemoveSubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::TransitGatewayVpcAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPC": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CidrBlock": {
+                            "type": "string"
+                        },
+                        "EnableDnsHostnames": {
+                            "type": "boolean"
+                        },
+                        "EnableDnsSupport": {
+                            "type": "boolean"
+                        },
+                        "InstanceTenancy": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CidrBlock"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPC"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCCidrBlock": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AmazonProvidedIpv6CidrBlock": {
+                            "type": "boolean"
+                        },
+                        "CidrBlock": {
+                            "type": "string"
+                        },
+                        "Ipv6CidrBlock": {
+                            "type": "string"
+                        },
+                        "Ipv6Pool": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCCidrBlock"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCDHCPOptionsAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DhcpOptionsId": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DhcpOptionsId",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCDHCPOptionsAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "PrivateDnsEnabled": {
+                            "type": "boolean"
+                        },
+                        "RouteTableIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpcEndpointType": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ServiceName",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCEndpointConnectionNotification": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionEvents": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ConnectionNotificationArn": {
+                            "type": "string"
+                        },
+                        "ServiceId": {
+                            "type": "string"
+                        },
+                        "VPCEndpointId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConnectionEvents",
+                        "ConnectionNotificationArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCEndpointConnectionNotification"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCEndpointService": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptanceRequired": {
+                            "type": "boolean"
+                        },
+                        "GatewayLoadBalancerArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "NetworkLoadBalancerArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCEndpointService"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCEndpointServicePermissions": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowedPrincipals": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ServiceId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCEndpointServicePermissions"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCGatewayAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InternetGatewayId": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        },
+                        "VpnGatewayId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCGatewayAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPCPeeringConnection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PeerOwnerId": {
+                            "type": "string"
+                        },
+                        "PeerRegion": {
+                            "type": "string"
+                        },
+                        "PeerRoleArn": {
+                            "type": "string"
+                        },
+                        "PeerVpcId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PeerVpcId",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPCPeeringConnection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPNConnection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomerGatewayId": {
+                            "type": "string"
+                        },
+                        "StaticRoutesOnly": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitGatewayId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "VpnGatewayId": {
+                            "type": "string"
+                        },
+                        "VpnTunnelOptionsSpecifications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EC2::VPNConnection.VpnTunnelOptionsSpecification"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CustomerGatewayId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPNConnection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPNConnection.VpnTunnelOptionsSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "PreSharedKey": {
+                    "type": "string"
+                },
+                "TunnelInsideCidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EC2::VPNConnectionRoute": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationCidrBlock": {
+                            "type": "string"
+                        },
+                        "VpnConnectionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationCidrBlock",
+                        "VpnConnectionId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPNConnectionRoute"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPNGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AmazonSideAsn": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPNGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VPNGatewayRoutePropagation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RouteTableIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpnGatewayId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RouteTableIds",
+                        "VpnGatewayId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VPNGatewayRoutePropagation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::Volume": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoEnableIO": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "Encrypted": {
+                            "type": "boolean"
+                        },
+                        "Iops": {
+                            "type": "number"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MultiAttachEnabled": {
+                            "type": "boolean"
+                        },
+                        "OutpostArn": {
+                            "type": "string"
+                        },
+                        "Size": {
+                            "type": "number"
+                        },
+                        "SnapshotId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Throughput": {
+                            "type": "number"
+                        },
+                        "VolumeType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AvailabilityZone"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::Volume"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EC2::VolumeAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Device": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "VolumeId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Device",
+                        "InstanceId",
+                        "VolumeId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EC2::VolumeAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::PublicRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RepositoryCatalogData": {
+                            "type": "object"
+                        },
+                        "RepositoryName": {
+                            "type": "string"
+                        },
+                        "RepositoryPolicyText": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECR::PublicRepository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::RegistryPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyText": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "PolicyText"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECR::RegistryPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::ReplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ReplicationConfiguration": {
+                            "$ref": "#/definitions/AWS::ECR::ReplicationConfiguration.ReplicationConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ReplicationConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECR::ReplicationConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::ReplicationConfiguration.ReplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECR::ReplicationConfiguration.ReplicationRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::ReplicationConfiguration.ReplicationDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "Region": {
+                    "type": "string"
+                },
+                "RegistryId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region",
+                "RegistryId"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::ReplicationConfiguration.ReplicationRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Destinations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECR::ReplicationConfiguration.ReplicationDestination"
+                    },
+                    "type": "array"
+                },
+                "RepositoryFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECR::ReplicationConfiguration.RepositoryFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Destinations"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::ReplicationConfiguration.RepositoryFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Filter": {
+                    "type": "string"
+                },
+                "FilterType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Filter",
+                "FilterType"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::Repository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::ECR::Repository.EncryptionConfiguration"
+                        },
+                        "ImageScanningConfiguration": {
+                            "$ref": "#/definitions/AWS::ECR::Repository.ImageScanningConfiguration"
+                        },
+                        "ImageTagMutability": {
+                            "type": "string"
+                        },
+                        "LifecyclePolicy": {
+                            "$ref": "#/definitions/AWS::ECR::Repository.LifecyclePolicy"
+                        },
+                        "RepositoryName": {
+                            "type": "string"
+                        },
+                        "RepositoryPolicyText": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECR::Repository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::Repository.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionType": {
+                    "type": "string"
+                },
+                "KmsKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionType"
+            ],
+            "type": "object"
+        },
+        "AWS::ECR::Repository.ImageScanningConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ScanOnPush": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECR::Repository.LifecyclePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "LifecyclePolicyText": {
+                    "type": "string"
+                },
+                "RegistryId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::CapacityProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingGroupProvider": {
+                            "$ref": "#/definitions/AWS::ECS::CapacityProvider.AutoScalingGroupProvider"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AutoScalingGroupProvider"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::CapacityProvider"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::CapacityProvider.AutoScalingGroupProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoScalingGroupArn": {
+                    "type": "string"
+                },
+                "ManagedScaling": {
+                    "$ref": "#/definitions/AWS::ECS::CapacityProvider.ManagedScaling"
+                },
+                "ManagedTerminationProtection": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AutoScalingGroupArn"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::CapacityProvider.ManagedScaling": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceWarmupPeriod": {
+                    "type": "number"
+                },
+                "MaximumScalingStepSize": {
+                    "type": "number"
+                },
+                "MinimumScalingStepSize": {
+                    "type": "number"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "TargetCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "ClusterSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Cluster.ClusterSettings"
+                            },
+                            "type": "array"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::ECS::Cluster.ClusterConfiguration"
+                        },
+                        "DefaultCapacityProviderStrategy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Cluster.CapacityProviderStrategyItem"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Cluster.CapacityProviderStrategyItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Base": {
+                    "type": "number"
+                },
+                "CapacityProvider": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Cluster.ClusterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecuteCommandConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::Cluster.ExecuteCommandConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Cluster.ClusterSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Cluster.ExecuteCommandConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "LogConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::Cluster.ExecuteCommandLogConfiguration"
+                },
+                "Logging": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Cluster.ExecuteCommandLogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchEncryptionEnabled": {
+                    "type": "boolean"
+                },
+                "CloudWatchLogGroupName": {
+                    "type": "string"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3EncryptionEnabled": {
+                    "type": "boolean"
+                },
+                "S3KeyPrefix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::ClusterCapacityProviderAssociations": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Cluster": {
+                            "type": "string"
+                        },
+                        "Service": {
+                            "type": "string"
+                        },
+                        "TaskSetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Cluster",
+                        "Service",
+                        "TaskSetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::PrimaryTaskSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Service": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CapacityProviderStrategy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Service.CapacityProviderStrategyItem"
+                            },
+                            "type": "array"
+                        },
+                        "Cluster": {
+                            "type": "string"
+                        },
+                        "DeploymentConfiguration": {
+                            "$ref": "#/definitions/AWS::ECS::Service.DeploymentConfiguration"
+                        },
+                        "DeploymentController": {
+                            "$ref": "#/definitions/AWS::ECS::Service.DeploymentController"
+                        },
+                        "DesiredCount": {
+                            "type": "number"
+                        },
+                        "EnableECSManagedTags": {
+                            "type": "boolean"
+                        },
+                        "EnableExecuteCommand": {
+                            "type": "boolean"
+                        },
+                        "HealthCheckGracePeriodSeconds": {
+                            "type": "number"
+                        },
+                        "LaunchType": {
+                            "type": "string"
+                        },
+                        "LoadBalancers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Service.LoadBalancer"
+                            },
+                            "type": "array"
+                        },
+                        "NetworkConfiguration": {
+                            "$ref": "#/definitions/AWS::ECS::Service.NetworkConfiguration"
+                        },
+                        "PlacementConstraints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Service.PlacementConstraint"
+                            },
+                            "type": "array"
+                        },
+                        "PlacementStrategies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Service.PlacementStrategy"
+                            },
+                            "type": "array"
+                        },
+                        "PlatformVersion": {
+                            "type": "string"
+                        },
+                        "PropagateTags": {
+                            "type": "string"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "SchedulingStrategy": {
+                            "type": "string"
+                        },
+                        "ServiceName": {
+                            "type": "string"
+                        },
+                        "ServiceRegistries": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::Service.ServiceRegistry"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TaskDefinition": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::Service"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Service.AwsVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AssignPublicIp": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.CapacityProviderStrategyItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Base": {
+                    "type": "number"
+                },
+                "CapacityProvider": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.DeploymentCircuitBreaker": {
+            "additionalProperties": false,
+            "properties": {
+                "Enable": {
+                    "type": "boolean"
+                },
+                "Rollback": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enable",
+                "Rollback"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Service.DeploymentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeploymentCircuitBreaker": {
+                    "$ref": "#/definitions/AWS::ECS::Service.DeploymentCircuitBreaker"
+                },
+                "MaximumPercent": {
+                    "type": "number"
+                },
+                "MinimumHealthyPercent": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.DeploymentController": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.LoadBalancer": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerName": {
+                    "type": "string"
+                },
+                "ContainerPort": {
+                    "type": "number"
+                },
+                "LoadBalancerName": {
+                    "type": "string"
+                },
+                "TargetGroupArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsvpcConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::Service.AwsVpcConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::Service.PlacementConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Service.PlacementStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "Field": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::Service.ServiceRegistry": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerName": {
+                    "type": "string"
+                },
+                "ContainerPort": {
+                    "type": "number"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "RegistryArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContainerDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskDefinition.ContainerDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "Cpu": {
+                            "type": "string"
+                        },
+                        "EphemeralStorage": {
+                            "$ref": "#/definitions/AWS::ECS::TaskDefinition.EphemeralStorage"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "Family": {
+                            "type": "string"
+                        },
+                        "InferenceAccelerators": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskDefinition.InferenceAccelerator"
+                            },
+                            "type": "array"
+                        },
+                        "IpcMode": {
+                            "type": "string"
+                        },
+                        "Memory": {
+                            "type": "string"
+                        },
+                        "NetworkMode": {
+                            "type": "string"
+                        },
+                        "PidMode": {
+                            "type": "string"
+                        },
+                        "PlacementConstraints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskDefinition.TaskDefinitionPlacementConstraint"
+                            },
+                            "type": "array"
+                        },
+                        "ProxyConfiguration": {
+                            "$ref": "#/definitions/AWS::ECS::TaskDefinition.ProxyConfiguration"
+                        },
+                        "RequiresCompatibilities": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RuntimePlatform": {
+                            "$ref": "#/definitions/AWS::ECS::TaskDefinition.RuntimePlatform"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TaskRoleArn": {
+                            "type": "string"
+                        },
+                        "Volumes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskDefinition.Volume"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::TaskDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.AuthorizationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessPointId": {
+                    "type": "string"
+                },
+                "IAM": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.ContainerDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Command": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Cpu": {
+                    "type": "number"
+                },
+                "DependsOn": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.ContainerDependency"
+                    },
+                    "type": "array"
+                },
+                "DisableNetworking": {
+                    "type": "boolean"
+                },
+                "DnsSearchDomains": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DnsServers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DockerLabels": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "DockerSecurityOptions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EntryPoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Environment": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.KeyValuePair"
+                    },
+                    "type": "array"
+                },
+                "EnvironmentFiles": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.EnvironmentFile"
+                    },
+                    "type": "array"
+                },
+                "Essential": {
+                    "type": "boolean"
+                },
+                "ExtraHosts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.HostEntry"
+                    },
+                    "type": "array"
+                },
+                "FirelensConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.FirelensConfiguration"
+                },
+                "HealthCheck": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.HealthCheck"
+                },
+                "Hostname": {
+                    "type": "string"
+                },
+                "Image": {
+                    "type": "string"
+                },
+                "Interactive": {
+                    "type": "boolean"
+                },
+                "Links": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LinuxParameters": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.LinuxParameters"
+                },
+                "LogConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.LogConfiguration"
+                },
+                "Memory": {
+                    "type": "number"
+                },
+                "MemoryReservation": {
+                    "type": "number"
+                },
+                "MountPoints": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.MountPoint"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "PortMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.PortMapping"
+                    },
+                    "type": "array"
+                },
+                "Privileged": {
+                    "type": "boolean"
+                },
+                "PseudoTerminal": {
+                    "type": "boolean"
+                },
+                "ReadonlyRootFilesystem": {
+                    "type": "boolean"
+                },
+                "RepositoryCredentials": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.RepositoryCredentials"
+                },
+                "ResourceRequirements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.ResourceRequirement"
+                    },
+                    "type": "array"
+                },
+                "Secrets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.Secret"
+                    },
+                    "type": "array"
+                },
+                "StartTimeout": {
+                    "type": "number"
+                },
+                "StopTimeout": {
+                    "type": "number"
+                },
+                "SystemControls": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.SystemControl"
+                    },
+                    "type": "array"
+                },
+                "Ulimits": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.Ulimit"
+                    },
+                    "type": "array"
+                },
+                "User": {
+                    "type": "string"
+                },
+                "VolumesFrom": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.VolumeFrom"
+                    },
+                    "type": "array"
+                },
+                "WorkingDirectory": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.ContainerDependency": {
+            "additionalProperties": false,
+            "properties": {
+                "Condition": {
+                    "type": "string"
+                },
+                "ContainerName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.Device": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "HostPath": {
+                    "type": "string"
+                },
+                "Permissions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.DockerVolumeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Autoprovision": {
+                    "type": "boolean"
+                },
+                "Driver": {
+                    "type": "string"
+                },
+                "DriverOpts": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Labels": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Scope": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.EFSVolumeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthorizationConfig": {
+                    "type": "object"
+                },
+                "FilesystemId": {
+                    "type": "string"
+                },
+                "RootDirectory": {
+                    "type": "string"
+                },
+                "TransitEncryption": {
+                    "type": "string"
+                },
+                "TransitEncryptionPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FilesystemId"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.EnvironmentFile": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.EphemeralStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "SizeInGiB": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.FirelensConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Options": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.HealthCheck": {
+            "additionalProperties": false,
+            "properties": {
+                "Command": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Interval": {
+                    "type": "number"
+                },
+                "Retries": {
+                    "type": "number"
+                },
+                "StartPeriod": {
+                    "type": "number"
+                },
+                "Timeout": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.HostEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Hostname": {
+                    "type": "string"
+                },
+                "IpAddress": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.HostVolumeProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.InferenceAccelerator": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "DeviceType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.KernelCapabilities": {
+            "additionalProperties": false,
+            "properties": {
+                "Add": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Drop": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.KeyValuePair": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.LinuxParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Capabilities": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.KernelCapabilities"
+                },
+                "Devices": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.Device"
+                    },
+                    "type": "array"
+                },
+                "InitProcessEnabled": {
+                    "type": "boolean"
+                },
+                "MaxSwap": {
+                    "type": "number"
+                },
+                "SharedMemorySize": {
+                    "type": "number"
+                },
+                "Swappiness": {
+                    "type": "number"
+                },
+                "Tmpfs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.Tmpfs"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.LogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogDriver": {
+                    "type": "string"
+                },
+                "Options": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "SecretOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.Secret"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LogDriver"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.MountPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "ReadOnly": {
+                    "type": "boolean"
+                },
+                "SourceVolume": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.PortMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPort": {
+                    "type": "number"
+                },
+                "HostPort": {
+                    "type": "number"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.ProxyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerName": {
+                    "type": "string"
+                },
+                "ProxyConfigurationProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ECS::TaskDefinition.KeyValuePair"
+                    },
+                    "type": "array"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ContainerName"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.RepositoryCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "CredentialsParameter": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.ResourceRequirement": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.RuntimePlatform": {
+            "additionalProperties": false,
+            "properties": {
+                "CpuArchitecture": {
+                    "type": "string"
+                },
+                "OperatingSystemFamily": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.Secret": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "ValueFrom": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "ValueFrom"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.SystemControl": {
+            "additionalProperties": false,
+            "properties": {
+                "Namespace": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.TaskDefinitionPlacementConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.Tmpfs": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerPath": {
+                    "type": "string"
+                },
+                "MountOptions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Size": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Size"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.Ulimit": {
+            "additionalProperties": false,
+            "properties": {
+                "HardLimit": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SoftLimit": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "HardLimit",
+                "Name",
+                "SoftLimit"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.Volume": {
+            "additionalProperties": false,
+            "properties": {
+                "DockerVolumeConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.DockerVolumeConfiguration"
+                },
+                "EFSVolumeConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.EFSVolumeConfiguration"
+                },
+                "Host": {
+                    "$ref": "#/definitions/AWS::ECS::TaskDefinition.HostVolumeProperties"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskDefinition.VolumeFrom": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadOnly": {
+                    "type": "boolean"
+                },
+                "SourceContainer": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Cluster": {
+                            "type": "string"
+                        },
+                        "ExternalId": {
+                            "type": "string"
+                        },
+                        "LaunchType": {
+                            "type": "string"
+                        },
+                        "LoadBalancers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskSet.LoadBalancer"
+                            },
+                            "type": "array"
+                        },
+                        "NetworkConfiguration": {
+                            "$ref": "#/definitions/AWS::ECS::TaskSet.NetworkConfiguration"
+                        },
+                        "PlatformVersion": {
+                            "type": "string"
+                        },
+                        "Scale": {
+                            "$ref": "#/definitions/AWS::ECS::TaskSet.Scale"
+                        },
+                        "Service": {
+                            "type": "string"
+                        },
+                        "ServiceRegistries": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ECS::TaskSet.ServiceRegistry"
+                            },
+                            "type": "array"
+                        },
+                        "TaskDefinition": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Cluster",
+                        "Service",
+                        "TaskDefinition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ECS::TaskSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet.AwsVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AssignPublicIp": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet.LoadBalancer": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerName": {
+                    "type": "string"
+                },
+                "ContainerPort": {
+                    "type": "number"
+                },
+                "LoadBalancerName": {
+                    "type": "string"
+                },
+                "TargetGroupArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsVpcConfiguration": {
+                    "$ref": "#/definitions/AWS::ECS::TaskSet.AwsVpcConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet.Scale": {
+            "additionalProperties": false,
+            "properties": {
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ECS::TaskSet.ServiceRegistry": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerName": {
+                    "type": "string"
+                },
+                "ContainerPort": {
+                    "type": "number"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "RegistryArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EFS::AccessPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessPointTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EFS::AccessPoint.AccessPointTag"
+                            },
+                            "type": "array"
+                        },
+                        "ClientToken": {
+                            "type": "string"
+                        },
+                        "FileSystemId": {
+                            "type": "string"
+                        },
+                        "PosixUser": {
+                            "$ref": "#/definitions/AWS::EFS::AccessPoint.PosixUser"
+                        },
+                        "RootDirectory": {
+                            "$ref": "#/definitions/AWS::EFS::AccessPoint.RootDirectory"
+                        }
+                    },
+                    "required": [
+                        "FileSystemId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EFS::AccessPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::AccessPoint.AccessPointTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EFS::AccessPoint.CreationInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "OwnerGid": {
+                    "type": "string"
+                },
+                "OwnerUid": {
+                    "type": "string"
+                },
+                "Permissions": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OwnerGid",
+                "OwnerUid",
+                "Permissions"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::AccessPoint.PosixUser": {
+            "additionalProperties": false,
+            "properties": {
+                "Gid": {
+                    "type": "string"
+                },
+                "SecondaryGids": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Uid": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Gid",
+                "Uid"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::AccessPoint.RootDirectory": {
+            "additionalProperties": false,
+            "properties": {
+                "CreationInfo": {
+                    "$ref": "#/definitions/AWS::EFS::AccessPoint.CreationInfo"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EFS::FileSystem": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZoneName": {
+                            "type": "string"
+                        },
+                        "BackupPolicy": {
+                            "$ref": "#/definitions/AWS::EFS::FileSystem.BackupPolicy"
+                        },
+                        "BypassPolicyLockoutSafetyCheck": {
+                            "type": "boolean"
+                        },
+                        "Encrypted": {
+                            "type": "boolean"
+                        },
+                        "FileSystemPolicy": {
+                            "type": "object"
+                        },
+                        "FileSystemTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EFS::FileSystem.ElasticFileSystemTag"
+                            },
+                            "type": "array"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LifecyclePolicies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EFS::FileSystem.LifecyclePolicy"
+                            },
+                            "type": "array"
+                        },
+                        "PerformanceMode": {
+                            "type": "string"
+                        },
+                        "ProvisionedThroughputInMibps": {
+                            "type": "number"
+                        },
+                        "ThroughputMode": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EFS::FileSystem"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::FileSystem.BackupPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::FileSystem.ElasticFileSystemTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EFS::FileSystem.LifecyclePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "TransitionToIA": {
+                    "type": "string"
+                },
+                "TransitionToPrimaryStorageClass": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EFS::MountTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FileSystemId": {
+                            "type": "string"
+                        },
+                        "IpAddress": {
+                            "type": "string"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FileSystemId",
+                        "SecurityGroups",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EFS::MountTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Addon": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "AddonVersion": {
+                            "type": "string"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "ResolveConflicts": {
+                            "type": "string"
+                        },
+                        "ServiceAccountRoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AddonName",
+                        "ClusterName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EKS::Addon"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EncryptionConfig": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EKS::Cluster.EncryptionConfig"
+                            },
+                            "type": "array"
+                        },
+                        "KubernetesNetworkConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.KubernetesNetworkConfig"
+                        },
+                        "Logging": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.Logging"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResourcesVpcConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Cluster.ResourcesVpcConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourcesVpcConfig",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EKS::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.ClusterLogging": {
+            "additionalProperties": false,
+            "properties": {
+                "EnabledTypes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EKS::Cluster.LoggingTypeConfig"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.EncryptionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Provider": {
+                    "type": "object"
+                },
+                "Resources": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.KubernetesNetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "IpFamily": {
+                    "type": "string"
+                },
+                "ServiceIpv4Cidr": {
+                    "type": "string"
+                },
+                "ServiceIpv6Cidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterLogging": {
+                    "$ref": "#/definitions/AWS::EKS::Cluster.ClusterLogging"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.LoggingTypeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Cluster.ResourcesVpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointPrivateAccess": {
+                    "type": "boolean"
+                },
+                "EndpointPublicAccess": {
+                    "type": "boolean"
+                },
+                "PublicAccessCidrs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::FargateProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "FargateProfileName": {
+                            "type": "string"
+                        },
+                        "PodExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "Selectors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EKS::FargateProfile.Selector"
+                            },
+                            "type": "array"
+                        },
+                        "Subnets": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ClusterName",
+                        "PodExecutionRoleArn",
+                        "Selectors"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EKS::FargateProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::FargateProfile.Label": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::FargateProfile.Selector": {
+            "additionalProperties": false,
+            "properties": {
+                "Labels": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EKS::FargateProfile.Label"
+                    },
+                    "type": "array"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Namespace"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AmiType": {
+                            "type": "string"
+                        },
+                        "CapacityType": {
+                            "type": "string"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "DiskSize": {
+                            "type": "number"
+                        },
+                        "ForceUpdateEnabled": {
+                            "type": "boolean"
+                        },
+                        "InstanceTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Labels": {
+                            "type": "object"
+                        },
+                        "LaunchTemplate": {
+                            "$ref": "#/definitions/AWS::EKS::Nodegroup.LaunchTemplateSpecification"
+                        },
+                        "NodeRole": {
+                            "type": "string"
+                        },
+                        "NodegroupName": {
+                            "type": "string"
+                        },
+                        "ReleaseVersion": {
+                            "type": "string"
+                        },
+                        "RemoteAccess": {
+                            "$ref": "#/definitions/AWS::EKS::Nodegroup.RemoteAccess"
+                        },
+                        "ScalingConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Nodegroup.ScalingConfig"
+                        },
+                        "Subnets": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Taints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EKS::Nodegroup.Taint"
+                            },
+                            "type": "array"
+                        },
+                        "UpdateConfig": {
+                            "$ref": "#/definitions/AWS::EKS::Nodegroup.UpdateConfig"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClusterName",
+                        "NodeRole",
+                        "Subnets"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EKS::Nodegroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup.LaunchTemplateSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup.RemoteAccess": {
+            "additionalProperties": false,
+            "properties": {
+                "Ec2SshKey": {
+                    "type": "string"
+                },
+                "SourceSecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Ec2SshKey"
+            ],
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup.ScalingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredSize": {
+                    "type": "number"
+                },
+                "MaxSize": {
+                    "type": "number"
+                },
+                "MinSize": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup.Taint": {
+            "additionalProperties": false,
+            "properties": {
+                "Effect": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EKS::Nodegroup.UpdateConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxUnavailable": {
+                    "type": "number"
+                },
+                "MaxUnavailablePercentage": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdditionalInfo": {
+                            "type": "object"
+                        },
+                        "Applications": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::Cluster.Application"
+                            },
+                            "type": "array"
+                        },
+                        "AutoScalingRole": {
+                            "type": "string"
+                        },
+                        "BootstrapActions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::Cluster.BootstrapActionConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Configurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::Cluster.Configuration"
+                            },
+                            "type": "array"
+                        },
+                        "CustomAmiId": {
+                            "type": "string"
+                        },
+                        "EbsRootVolumeSize": {
+                            "type": "number"
+                        },
+                        "Instances": {
+                            "$ref": "#/definitions/AWS::EMR::Cluster.JobFlowInstancesConfig"
+                        },
+                        "JobFlowRole": {
+                            "type": "string"
+                        },
+                        "KerberosAttributes": {
+                            "$ref": "#/definitions/AWS::EMR::Cluster.KerberosAttributes"
+                        },
+                        "LogEncryptionKmsKeyId": {
+                            "type": "string"
+                        },
+                        "LogUri": {
+                            "type": "string"
+                        },
+                        "ManagedScalingPolicy": {
+                            "$ref": "#/definitions/AWS::EMR::Cluster.ManagedScalingPolicy"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ReleaseLabel": {
+                            "type": "string"
+                        },
+                        "ScaleDownBehavior": {
+                            "type": "string"
+                        },
+                        "SecurityConfiguration": {
+                            "type": "string"
+                        },
+                        "ServiceRole": {
+                            "type": "string"
+                        },
+                        "StepConcurrencyLevel": {
+                            "type": "number"
+                        },
+                        "Steps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::Cluster.StepConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VisibleToAllUsers": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "Instances",
+                        "JobFlowRole",
+                        "Name",
+                        "ServiceRole"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.Application": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalInfo": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Args": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.AutoScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Constraints": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.ScalingConstraints"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.ScalingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Constraints",
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.BootstrapActionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "ScriptBootstrapAction": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.ScriptBootstrapActionConfig"
+                }
+            },
+            "required": [
+                "Name",
+                "ScriptBootstrapAction"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.CloudWatchAlarmDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "EvaluationPeriods": {
+                    "type": "number"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Threshold": {
+                    "type": "number"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "MetricName",
+                "Period",
+                "Threshold"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ComputeLimits": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumCapacityUnits": {
+                    "type": "number"
+                },
+                "MaximumCoreCapacityUnits": {
+                    "type": "number"
+                },
+                "MaximumOnDemandCapacityUnits": {
+                    "type": "number"
+                },
+                "MinimumCapacityUnits": {
+                    "type": "number"
+                },
+                "UnitType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MaximumCapacityUnits",
+                "MinimumCapacityUnits",
+                "UnitType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "Classification": {
+                    "type": "string"
+                },
+                "ConfigurationProperties": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.Configuration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.EbsBlockDeviceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "VolumeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.VolumeSpecification"
+                },
+                "VolumesPerInstance": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "VolumeSpecification"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.EbsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EbsBlockDeviceConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.EbsBlockDeviceConfig"
+                    },
+                    "type": "array"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.HadoopJarStepConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Args": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Jar": {
+                    "type": "string"
+                },
+                "MainClass": {
+                    "type": "string"
+                },
+                "StepProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.KeyValue"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Jar"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.InstanceFleetConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceTypeConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.InstanceTypeConfig"
+                    },
+                    "type": "array"
+                },
+                "LaunchSpecifications": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceFleetProvisioningSpecifications"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "TargetOnDemandCapacity": {
+                    "type": "number"
+                },
+                "TargetSpotCapacity": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.InstanceFleetProvisioningSpecifications": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.OnDemandProvisioningSpecification"
+                },
+                "SpotSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.SpotProvisioningSpecification"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.InstanceGroupConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoScalingPolicy": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.AutoScalingPolicy"
+                },
+                "BidPrice": {
+                    "type": "string"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.Configuration"
+                    },
+                    "type": "array"
+                },
+                "CustomAmiId": {
+                    "type": "string"
+                },
+                "EbsConfiguration": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.EbsConfiguration"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "Market": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.InstanceTypeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BidPrice": {
+                    "type": "string"
+                },
+                "BidPriceAsPercentageOfOnDemandPrice": {
+                    "type": "number"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Cluster.Configuration"
+                    },
+                    "type": "array"
+                },
+                "CustomAmiId": {
+                    "type": "string"
+                },
+                "EbsConfiguration": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.EbsConfiguration"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.JobFlowInstancesConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalMasterSecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AdditionalSlaveSecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CoreInstanceFleet": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceFleetConfig"
+                },
+                "CoreInstanceGroup": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceGroupConfig"
+                },
+                "Ec2KeyName": {
+                    "type": "string"
+                },
+                "Ec2SubnetId": {
+                    "type": "string"
+                },
+                "Ec2SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EmrManagedMasterSecurityGroup": {
+                    "type": "string"
+                },
+                "EmrManagedSlaveSecurityGroup": {
+                    "type": "string"
+                },
+                "HadoopVersion": {
+                    "type": "string"
+                },
+                "KeepJobFlowAliveWhenNoSteps": {
+                    "type": "boolean"
+                },
+                "MasterInstanceFleet": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceFleetConfig"
+                },
+                "MasterInstanceGroup": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.InstanceGroupConfig"
+                },
+                "Placement": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.PlacementType"
+                },
+                "ServiceAccessSecurityGroup": {
+                    "type": "string"
+                },
+                "TerminationProtected": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.KerberosAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "ADDomainJoinPassword": {
+                    "type": "string"
+                },
+                "ADDomainJoinUser": {
+                    "type": "string"
+                },
+                "CrossRealmTrustPrincipalPassword": {
+                    "type": "string"
+                },
+                "KdcAdminPassword": {
+                    "type": "string"
+                },
+                "Realm": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KdcAdminPassword",
+                "Realm"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.KeyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ManagedScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeLimits": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.ComputeLimits"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.OnDemandProvisioningSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AllocationStrategy"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.PlacementType": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AvailabilityZone"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ScalingAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Market": {
+                    "type": "string"
+                },
+                "SimpleScalingPolicyConfiguration": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.SimpleScalingPolicyConfiguration"
+                }
+            },
+            "required": [
+                "SimpleScalingPolicyConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ScalingConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ScalingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.ScalingAction"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Trigger": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.ScalingTrigger"
+                }
+            },
+            "required": [
+                "Action",
+                "Name",
+                "Trigger"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ScalingTrigger": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchAlarmDefinition": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.CloudWatchAlarmDefinition"
+                }
+            },
+            "required": [
+                "CloudWatchAlarmDefinition"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.ScriptBootstrapActionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Args": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Path"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.SimpleScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AdjustmentType": {
+                    "type": "string"
+                },
+                "CoolDown": {
+                    "type": "number"
+                },
+                "ScalingAdjustment": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ScalingAdjustment"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.SpotProvisioningSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "BlockDurationMinutes": {
+                    "type": "number"
+                },
+                "TimeoutAction": {
+                    "type": "string"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TimeoutAction",
+                "TimeoutDurationMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.StepConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionOnFailure": {
+                    "type": "string"
+                },
+                "HadoopJarStep": {
+                    "$ref": "#/definitions/AWS::EMR::Cluster.HadoopJarStepConfig"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HadoopJarStep",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Cluster.VolumeSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "SizeInGB": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SizeInGB",
+                "VolumeType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClusterId": {
+                            "type": "string"
+                        },
+                        "InstanceFleetType": {
+                            "type": "string"
+                        },
+                        "InstanceTypeConfigs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.InstanceTypeConfig"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchSpecifications": {
+                            "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.InstanceFleetProvisioningSpecifications"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "TargetOnDemandCapacity": {
+                            "type": "number"
+                        },
+                        "TargetSpotCapacity": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "ClusterId",
+                        "InstanceFleetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::InstanceFleetConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "Classification": {
+                    "type": "string"
+                },
+                "ConfigurationProperties": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.Configuration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.EbsBlockDeviceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "VolumeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.VolumeSpecification"
+                },
+                "VolumesPerInstance": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "VolumeSpecification"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.EbsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EbsBlockDeviceConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.EbsBlockDeviceConfig"
+                    },
+                    "type": "array"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.InstanceFleetProvisioningSpecifications": {
+            "additionalProperties": false,
+            "properties": {
+                "OnDemandSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.OnDemandProvisioningSpecification"
+                },
+                "SpotSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.SpotProvisioningSpecification"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.InstanceTypeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BidPrice": {
+                    "type": "string"
+                },
+                "BidPriceAsPercentageOfOnDemandPrice": {
+                    "type": "number"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.Configuration"
+                    },
+                    "type": "array"
+                },
+                "CustomAmiId": {
+                    "type": "string"
+                },
+                "EbsConfiguration": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig.EbsConfiguration"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.OnDemandProvisioningSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AllocationStrategy"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.SpotProvisioningSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationStrategy": {
+                    "type": "string"
+                },
+                "BlockDurationMinutes": {
+                    "type": "number"
+                },
+                "TimeoutAction": {
+                    "type": "string"
+                },
+                "TimeoutDurationMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TimeoutAction",
+                "TimeoutDurationMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceFleetConfig.VolumeSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "SizeInGB": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SizeInGB",
+                "VolumeType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingPolicy": {
+                            "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.AutoScalingPolicy"
+                        },
+                        "BidPrice": {
+                            "type": "string"
+                        },
+                        "Configurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.Configuration"
+                            },
+                            "type": "array"
+                        },
+                        "CustomAmiId": {
+                            "type": "string"
+                        },
+                        "EbsConfiguration": {
+                            "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.EbsConfiguration"
+                        },
+                        "InstanceCount": {
+                            "type": "number"
+                        },
+                        "InstanceRole": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "JobFlowId": {
+                            "type": "string"
+                        },
+                        "Market": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceCount",
+                        "InstanceRole",
+                        "InstanceType",
+                        "JobFlowId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::InstanceGroupConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.AutoScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Constraints": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.ScalingConstraints"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.ScalingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Constraints",
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.CloudWatchAlarmDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.MetricDimension"
+                    },
+                    "type": "array"
+                },
+                "EvaluationPeriods": {
+                    "type": "number"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "Period": {
+                    "type": "number"
+                },
+                "Statistic": {
+                    "type": "string"
+                },
+                "Threshold": {
+                    "type": "number"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "MetricName",
+                "Period",
+                "Threshold"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "Classification": {
+                    "type": "string"
+                },
+                "ConfigurationProperties": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Configurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.Configuration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.EbsBlockDeviceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "VolumeSpecification": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.VolumeSpecification"
+                },
+                "VolumesPerInstance": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "VolumeSpecification"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.EbsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EbsBlockDeviceConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.EbsBlockDeviceConfig"
+                    },
+                    "type": "array"
+                },
+                "EbsOptimized": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.ScalingAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Market": {
+                    "type": "string"
+                },
+                "SimpleScalingPolicyConfiguration": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.SimpleScalingPolicyConfiguration"
+                }
+            },
+            "required": [
+                "SimpleScalingPolicyConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.ScalingConstraints": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxCapacity",
+                "MinCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.ScalingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.ScalingAction"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Trigger": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.ScalingTrigger"
+                }
+            },
+            "required": [
+                "Action",
+                "Name",
+                "Trigger"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.ScalingTrigger": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchAlarmDefinition": {
+                    "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig.CloudWatchAlarmDefinition"
+                }
+            },
+            "required": [
+                "CloudWatchAlarmDefinition"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.SimpleScalingPolicyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AdjustmentType": {
+                    "type": "string"
+                },
+                "CoolDown": {
+                    "type": "number"
+                },
+                "ScalingAdjustment": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ScalingAdjustment"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::InstanceGroupConfig.VolumeSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "SizeInGB": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SizeInGB",
+                "VolumeType"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::SecurityConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SecurityConfiguration": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "SecurityConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::SecurityConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Step": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ActionOnFailure": {
+                            "type": "string"
+                        },
+                        "HadoopJarStep": {
+                            "$ref": "#/definitions/AWS::EMR::Step.HadoopJarStepConfig"
+                        },
+                        "JobFlowId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ActionOnFailure",
+                        "HadoopJarStep",
+                        "JobFlowId",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::Step"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Step.HadoopJarStepConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Args": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Jar": {
+                    "type": "string"
+                },
+                "MainClass": {
+                    "type": "string"
+                },
+                "StepProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::EMR::Step.KeyValue"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Jar"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::Step.KeyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EMR::Studio": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthMode": {
+                            "type": "string"
+                        },
+                        "DefaultS3Location": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EngineSecurityGroupId": {
+                            "type": "string"
+                        },
+                        "IdpAuthUrl": {
+                            "type": "string"
+                        },
+                        "IdpRelayStateParameterName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ServiceRole": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserRole": {
+                            "type": "string"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        },
+                        "WorkspaceSecurityGroupId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthMode",
+                        "DefaultS3Location",
+                        "EngineSecurityGroupId",
+                        "Name",
+                        "ServiceRole",
+                        "SubnetIds",
+                        "VpcId",
+                        "WorkspaceSecurityGroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::Studio"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMR::StudioSessionMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "IdentityName": {
+                            "type": "string"
+                        },
+                        "IdentityType": {
+                            "type": "string"
+                        },
+                        "SessionPolicyArn": {
+                            "type": "string"
+                        },
+                        "StudioId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "IdentityName",
+                        "IdentityType",
+                        "SessionPolicyArn",
+                        "StudioId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMR::StudioSessionMapping"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMRContainers::VirtualCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContainerProvider": {
+                            "$ref": "#/definitions/AWS::EMRContainers::VirtualCluster.ContainerProvider"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ContainerProvider",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EMRContainers::VirtualCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EMRContainers::VirtualCluster.ContainerInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "EksInfo": {
+                    "$ref": "#/definitions/AWS::EMRContainers::VirtualCluster.EksInfo"
+                }
+            },
+            "required": [
+                "EksInfo"
+            ],
+            "type": "object"
+        },
+        "AWS::EMRContainers::VirtualCluster.ContainerProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Info": {
+                    "$ref": "#/definitions/AWS::EMRContainers::VirtualCluster.ContainerInfo"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id",
+                "Info",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EMRContainers::VirtualCluster.EksInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Namespace"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::CacheCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AZMode": {
+                            "type": "string"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "CacheNodeType": {
+                            "type": "string"
+                        },
+                        "CacheParameterGroupName": {
+                            "type": "string"
+                        },
+                        "CacheSecurityGroupNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CacheSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "LogDeliveryConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElastiCache::CacheCluster.LogDeliveryConfigurationRequest"
+                            },
+                            "type": "array"
+                        },
+                        "NotificationTopicArn": {
+                            "type": "string"
+                        },
+                        "NumCacheNodes": {
+                            "type": "number"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredAvailabilityZone": {
+                            "type": "string"
+                        },
+                        "PreferredAvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "SnapshotArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnapshotName": {
+                            "type": "string"
+                        },
+                        "SnapshotRetentionLimit": {
+                            "type": "number"
+                        },
+                        "SnapshotWindow": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CacheNodeType",
+                        "Engine",
+                        "NumCacheNodes"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::CacheCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::CacheCluster.CloudWatchLogsDestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroup": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogGroup"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::CacheCluster.DestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::CacheCluster.CloudWatchLogsDestinationDetails"
+                },
+                "KinesisFirehoseDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::CacheCluster.KinesisFirehoseDestinationDetails"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::CacheCluster.KinesisFirehoseDestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStream": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStream"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::CacheCluster.LogDeliveryConfigurationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::CacheCluster.DestinationDetails"
+                },
+                "DestinationType": {
+                    "type": "string"
+                },
+                "LogFormat": {
+                    "type": "string"
+                },
+                "LogType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationDetails",
+                "DestinationType",
+                "LogFormat",
+                "LogType"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::GlobalReplicationGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutomaticFailoverEnabled": {
+                            "type": "boolean"
+                        },
+                        "CacheNodeType": {
+                            "type": "string"
+                        },
+                        "CacheParameterGroupName": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "GlobalNodeGroupCount": {
+                            "type": "number"
+                        },
+                        "GlobalReplicationGroupDescription": {
+                            "type": "string"
+                        },
+                        "GlobalReplicationGroupIdSuffix": {
+                            "type": "string"
+                        },
+                        "Members": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElastiCache::GlobalReplicationGroup.GlobalReplicationGroupMember"
+                            },
+                            "type": "array"
+                        },
+                        "RegionalConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElastiCache::GlobalReplicationGroup.RegionalConfiguration"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Members"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::GlobalReplicationGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::GlobalReplicationGroup.GlobalReplicationGroupMember": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplicationGroupId": {
+                    "type": "string"
+                },
+                "ReplicationGroupRegion": {
+                    "type": "string"
+                },
+                "Role": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::GlobalReplicationGroup.RegionalConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplicationGroupId": {
+                    "type": "string"
+                },
+                "ReplicationGroupRegion": {
+                    "type": "string"
+                },
+                "ReshardingConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ElastiCache::GlobalReplicationGroup.ReshardingConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::GlobalReplicationGroup.ReshardingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NodeGroupId": {
+                    "type": "string"
+                },
+                "PreferredAvailabilityZones": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::ParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CacheParameterGroupFamily": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Properties": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CacheParameterGroupFamily",
+                        "Description"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::ParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AtRestEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "AuthToken": {
+                            "type": "string"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AutomaticFailoverEnabled": {
+                            "type": "boolean"
+                        },
+                        "CacheNodeType": {
+                            "type": "string"
+                        },
+                        "CacheParameterGroupName": {
+                            "type": "string"
+                        },
+                        "CacheSecurityGroupNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CacheSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DataTieringEnabled": {
+                            "type": "boolean"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "GlobalReplicationGroupId": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LogDeliveryConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup.LogDeliveryConfigurationRequest"
+                            },
+                            "type": "array"
+                        },
+                        "MultiAZEnabled": {
+                            "type": "boolean"
+                        },
+                        "NodeGroupConfiguration": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup.NodeGroupConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "NotificationTopicArn": {
+                            "type": "string"
+                        },
+                        "NumCacheClusters": {
+                            "type": "number"
+                        },
+                        "NumNodeGroups": {
+                            "type": "number"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredCacheClusterAZs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "PrimaryClusterId": {
+                            "type": "string"
+                        },
+                        "ReplicasPerNodeGroup": {
+                            "type": "number"
+                        },
+                        "ReplicationGroupDescription": {
+                            "type": "string"
+                        },
+                        "ReplicationGroupId": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnapshotArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnapshotName": {
+                            "type": "string"
+                        },
+                        "SnapshotRetentionLimit": {
+                            "type": "number"
+                        },
+                        "SnapshotWindow": {
+                            "type": "string"
+                        },
+                        "SnapshottingClusterId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TransitEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "UserGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ReplicationGroupDescription"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::ReplicationGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup.CloudWatchLogsDestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroup": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogGroup"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup.DestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup.CloudWatchLogsDestinationDetails"
+                },
+                "KinesisFirehoseDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup.KinesisFirehoseDestinationDetails"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup.KinesisFirehoseDestinationDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStream": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStream"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup.LogDeliveryConfigurationRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationDetails": {
+                    "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup.DestinationDetails"
+                },
+                "DestinationType": {
+                    "type": "string"
+                },
+                "LogFormat": {
+                    "type": "string"
+                },
+                "LogType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationDetails",
+                "DestinationType",
+                "LogFormat",
+                "LogType"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::ReplicationGroup.NodeGroupConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NodeGroupId": {
+                    "type": "string"
+                },
+                "PrimaryAvailabilityZone": {
+                    "type": "string"
+                },
+                "ReplicaAvailabilityZones": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ReplicaCount": {
+                    "type": "number"
+                },
+                "Slots": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElastiCache::SecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::SecurityGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::SecurityGroupIngress": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CacheSecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupOwnerId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CacheSecurityGroupName",
+                        "EC2SecurityGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::SecurityGroupIngress"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::SubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CacheSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::SubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessString": {
+                            "type": "string"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "NoPasswordRequired": {
+                            "type": "boolean"
+                        },
+                        "Passwords": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "UserId": {
+                            "type": "string"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Engine",
+                        "UserId",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElastiCache::UserGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "UserGroupId": {
+                            "type": "string"
+                        },
+                        "UserIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Engine",
+                        "UserGroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElastiCache::UserGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ResourceLifecycleConfig": {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::Application.ApplicationResourceLifecycleConfig"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticBeanstalk::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Application.ApplicationResourceLifecycleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ServiceRole": {
+                    "type": "string"
+                },
+                "VersionLifecycleConfig": {
+                    "$ref": "#/definitions/AWS::ElasticBeanstalk::Application.ApplicationVersionLifecycleConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Application.ApplicationVersionLifecycleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxAgeRule": {
+                    "$ref": "#/definitions/AWS::ElasticBeanstalk::Application.MaxAgeRule"
+                },
+                "MaxCountRule": {
+                    "$ref": "#/definitions/AWS::ElasticBeanstalk::Application.MaxCountRule"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Application.MaxAgeRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteSourceFromS3": {
+                    "type": "boolean"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "MaxAgeInDays": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Application.MaxCountRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteSourceFromS3": {
+                    "type": "boolean"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "MaxCount": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::ApplicationVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "SourceBundle": {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::ApplicationVersion.SourceBundle"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "SourceBundle"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticBeanstalk::ApplicationVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::ApplicationVersion.SourceBundle": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::ConfigurationTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnvironmentId": {
+                            "type": "string"
+                        },
+                        "OptionSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticBeanstalk::ConfigurationTemplate.ConfigurationOptionSetting"
+                            },
+                            "type": "array"
+                        },
+                        "PlatformArn": {
+                            "type": "string"
+                        },
+                        "SolutionStackName": {
+                            "type": "string"
+                        },
+                        "SourceConfiguration": {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::ConfigurationTemplate.SourceConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticBeanstalk::ConfigurationTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::ConfigurationTemplate.ConfigurationOptionSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "Namespace": {
+                    "type": "string"
+                },
+                "OptionName": {
+                    "type": "string"
+                },
+                "ResourceName": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Namespace",
+                "OptionName"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::ConfigurationTemplate.SourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationName": {
+                    "type": "string"
+                },
+                "TemplateName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApplicationName",
+                "TemplateName"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "CNAMEPrefix": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EnvironmentName": {
+                            "type": "string"
+                        },
+                        "OperationsRole": {
+                            "type": "string"
+                        },
+                        "OptionSettings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticBeanstalk::Environment.OptionSetting"
+                            },
+                            "type": "array"
+                        },
+                        "PlatformArn": {
+                            "type": "string"
+                        },
+                        "SolutionStackName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        },
+                        "Tier": {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::Environment.Tier"
+                        },
+                        "VersionLabel": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticBeanstalk::Environment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Environment.OptionSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "Namespace": {
+                    "type": "string"
+                },
+                "OptionName": {
+                    "type": "string"
+                },
+                "ResourceName": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Namespace",
+                "OptionName"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticBeanstalk::Environment.Tier": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessLoggingPolicy": {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.AccessLoggingPolicy"
+                        },
+                        "AppCookieStickinessPolicy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.AppCookieStickinessPolicy"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ConnectionDrainingPolicy": {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.ConnectionDrainingPolicy"
+                        },
+                        "ConnectionSettings": {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.ConnectionSettings"
+                        },
+                        "CrossZone": {
+                            "type": "boolean"
+                        },
+                        "HealthCheck": {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.HealthCheck"
+                        },
+                        "Instances": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LBCookieStickinessPolicy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.LBCookieStickinessPolicy"
+                            },
+                            "type": "array"
+                        },
+                        "Listeners": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.Listeners"
+                            },
+                            "type": "array"
+                        },
+                        "LoadBalancerName": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer.Policies"
+                            },
+                            "type": "array"
+                        },
+                        "Scheme": {
+                            "type": "string"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Subnets": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Listeners"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancing::LoadBalancer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.AccessLoggingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "EmitInterval": {
+                    "type": "number"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3BucketPrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled",
+                "S3BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.AppCookieStickinessPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "CookieName": {
+                    "type": "string"
+                },
+                "PolicyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CookieName",
+                "PolicyName"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.ConnectionDrainingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Timeout": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.ConnectionSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "IdleTimeout": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "IdleTimeout"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.HealthCheck": {
+            "additionalProperties": false,
+            "properties": {
+                "HealthyThreshold": {
+                    "type": "string"
+                },
+                "Interval": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                },
+                "Timeout": {
+                    "type": "string"
+                },
+                "UnhealthyThreshold": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HealthyThreshold",
+                "Interval",
+                "Target",
+                "Timeout",
+                "UnhealthyThreshold"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.LBCookieStickinessPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "CookieExpirationPeriod": {
+                    "type": "string"
+                },
+                "PolicyName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.Listeners": {
+            "additionalProperties": false,
+            "properties": {
+                "InstancePort": {
+                    "type": "string"
+                },
+                "InstanceProtocol": {
+                    "type": "string"
+                },
+                "LoadBalancerPort": {
+                    "type": "string"
+                },
+                "PolicyNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "SSLCertificateId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstancePort",
+                "LoadBalancerPort",
+                "Protocol"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancing::LoadBalancer.Policies": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "type": "object"
+                    },
+                    "type": "array"
+                },
+                "InstancePorts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "LoadBalancerPorts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PolicyName": {
+                    "type": "string"
+                },
+                "PolicyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Attributes",
+                "PolicyName",
+                "PolicyType"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AlpnPolicy": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Certificates": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.Certificate"
+                            },
+                            "type": "array"
+                        },
+                        "DefaultActions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.Action"
+                            },
+                            "type": "array"
+                        },
+                        "LoadBalancerArn": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "SslPolicy": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DefaultActions",
+                        "LoadBalancerArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancingV2::Listener"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticateCognitoConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.AuthenticateCognitoConfig"
+                },
+                "AuthenticateOidcConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.AuthenticateOidcConfig"
+                },
+                "FixedResponseConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.FixedResponseConfig"
+                },
+                "ForwardConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.ForwardConfig"
+                },
+                "Order": {
+                    "type": "number"
+                },
+                "RedirectConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.RedirectConfig"
+                },
+                "TargetGroupArn": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.AuthenticateCognitoConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationRequestExtraParams": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "OnUnauthenticatedRequest": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                },
+                "SessionCookieName": {
+                    "type": "string"
+                },
+                "SessionTimeout": {
+                    "type": "string"
+                },
+                "UserPoolArn": {
+                    "type": "string"
+                },
+                "UserPoolClientId": {
+                    "type": "string"
+                },
+                "UserPoolDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "UserPoolArn",
+                "UserPoolClientId",
+                "UserPoolDomain"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.AuthenticateOidcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationRequestExtraParams": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "AuthorizationEndpoint": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "OnUnauthenticatedRequest": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                },
+                "SessionCookieName": {
+                    "type": "string"
+                },
+                "SessionTimeout": {
+                    "type": "string"
+                },
+                "TokenEndpoint": {
+                    "type": "string"
+                },
+                "UserInfoEndpoint": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AuthorizationEndpoint",
+                "ClientId",
+                "ClientSecret",
+                "Issuer",
+                "TokenEndpoint",
+                "UserInfoEndpoint"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.FixedResponseConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentType": {
+                    "type": "string"
+                },
+                "MessageBody": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.ForwardConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetGroupStickinessConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.TargetGroupStickinessConfig"
+                },
+                "TargetGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener.TargetGroupTuple"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.RedirectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Host": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "Query": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.TargetGroupStickinessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationSeconds": {
+                    "type": "number"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::Listener.TargetGroupTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetGroupArn": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Certificates": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerCertificate.Certificate"
+                            },
+                            "type": "array"
+                        },
+                        "ListenerArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Certificates",
+                        "ListenerArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancingV2::ListenerCertificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerCertificate.Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.Action"
+                            },
+                            "type": "array"
+                        },
+                        "Conditions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.RuleCondition"
+                            },
+                            "type": "array"
+                        },
+                        "ListenerArn": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Actions",
+                        "Conditions",
+                        "ListenerArn",
+                        "Priority"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancingV2::ListenerRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticateCognitoConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateCognitoConfig"
+                },
+                "AuthenticateOidcConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateOidcConfig"
+                },
+                "FixedResponseConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.FixedResponseConfig"
+                },
+                "ForwardConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.ForwardConfig"
+                },
+                "Order": {
+                    "type": "number"
+                },
+                "RedirectConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.RedirectConfig"
+                },
+                "TargetGroupArn": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateCognitoConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationRequestExtraParams": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "OnUnauthenticatedRequest": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                },
+                "SessionCookieName": {
+                    "type": "string"
+                },
+                "SessionTimeout": {
+                    "type": "number"
+                },
+                "UserPoolArn": {
+                    "type": "string"
+                },
+                "UserPoolClientId": {
+                    "type": "string"
+                },
+                "UserPoolDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "UserPoolArn",
+                "UserPoolClientId",
+                "UserPoolDomain"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.AuthenticateOidcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationRequestExtraParams": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "AuthorizationEndpoint": {
+                    "type": "string"
+                },
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "OnUnauthenticatedRequest": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                },
+                "SessionCookieName": {
+                    "type": "string"
+                },
+                "SessionTimeout": {
+                    "type": "number"
+                },
+                "TokenEndpoint": {
+                    "type": "string"
+                },
+                "UseExistingClientSecret": {
+                    "type": "boolean"
+                },
+                "UserInfoEndpoint": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AuthorizationEndpoint",
+                "ClientId",
+                "ClientSecret",
+                "Issuer",
+                "TokenEndpoint",
+                "UserInfoEndpoint"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.FixedResponseConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentType": {
+                    "type": "string"
+                },
+                "MessageBody": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.ForwardConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetGroupStickinessConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupStickinessConfig"
+                },
+                "TargetGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupTuple"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.HostHeaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.HttpHeaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpHeaderName": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.HttpRequestMethodConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.PathPatternConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringKeyValue"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringKeyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.RedirectConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Host": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "Query": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StatusCode"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.RuleCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Field": {
+                    "type": "string"
+                },
+                "HostHeaderConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.HostHeaderConfig"
+                },
+                "HttpHeaderConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.HttpHeaderConfig"
+                },
+                "HttpRequestMethodConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.HttpRequestMethodConfig"
+                },
+                "PathPatternConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.PathPatternConfig"
+                },
+                "QueryStringConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.QueryStringConfig"
+                },
+                "SourceIpConfig": {
+                    "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule.SourceIpConfig"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.SourceIpConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupStickinessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationSeconds": {
+                    "type": "number"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::ListenerRule.TargetGroupTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetGroupArn": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::LoadBalancer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "IpAddressType": {
+                            "type": "string"
+                        },
+                        "LoadBalancerAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::LoadBalancer.LoadBalancerAttribute"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Scheme": {
+                            "type": "string"
+                        },
+                        "SecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::LoadBalancer.SubnetMapping"
+                            },
+                            "type": "array"
+                        },
+                        "Subnets": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancingV2::LoadBalancer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::LoadBalancer.LoadBalancerAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::LoadBalancer.SubnetMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "AllocationId": {
+                    "type": "string"
+                },
+                "IPv6Address": {
+                    "type": "string"
+                },
+                "PrivateIPv4Address": {
+                    "type": "string"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubnetId"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::TargetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HealthCheckEnabled": {
+                            "type": "boolean"
+                        },
+                        "HealthCheckIntervalSeconds": {
+                            "type": "number"
+                        },
+                        "HealthCheckPath": {
+                            "type": "string"
+                        },
+                        "HealthCheckPort": {
+                            "type": "string"
+                        },
+                        "HealthCheckProtocol": {
+                            "type": "string"
+                        },
+                        "HealthCheckTimeoutSeconds": {
+                            "type": "number"
+                        },
+                        "HealthyThresholdCount": {
+                            "type": "number"
+                        },
+                        "IpAddressType": {
+                            "type": "string"
+                        },
+                        "Matcher": {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::TargetGroup.Matcher"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "ProtocolVersion": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetGroupAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::TargetGroup.TargetGroupAttribute"
+                            },
+                            "type": "array"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::TargetGroup.TargetDescription"
+                            },
+                            "type": "array"
+                        },
+                        "UnhealthyThresholdCount": {
+                            "type": "number"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ElasticLoadBalancingV2::TargetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::TargetGroup.Matcher": {
+            "additionalProperties": false,
+            "properties": {
+                "GrpcCode": {
+                    "type": "string"
+                },
+                "HttpCode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::TargetGroup.TargetDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::ElasticLoadBalancingV2::TargetGroup.TargetGroupAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessPolicies": {
+                            "type": "object"
+                        },
+                        "AdvancedOptions": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "AdvancedSecurityOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.AdvancedSecurityOptionsInput"
+                        },
+                        "CognitoOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.CognitoOptions"
+                        },
+                        "DomainEndpointOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.DomainEndpointOptions"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EBSOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.EBSOptions"
+                        },
+                        "ElasticsearchClusterConfig": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.ElasticsearchClusterConfig"
+                        },
+                        "ElasticsearchVersion": {
+                            "type": "string"
+                        },
+                        "EncryptionAtRestOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.EncryptionAtRestOptions"
+                        },
+                        "LogPublishingOptions": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::Elasticsearch::Domain.LogPublishingOption"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "NodeToNodeEncryptionOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.NodeToNodeEncryptionOptions"
+                        },
+                        "SnapshotOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.SnapshotOptions"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VPCOptions": {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain.VPCOptions"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Elasticsearch::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.AdvancedSecurityOptionsInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "InternalUserDatabaseEnabled": {
+                    "type": "boolean"
+                },
+                "MasterUserOptions": {
+                    "$ref": "#/definitions/AWS::Elasticsearch::Domain.MasterUserOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.CognitoOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "IdentityPoolId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "UserPoolId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.ColdStorageOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.DomainEndpointOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomEndpoint": {
+                    "type": "string"
+                },
+                "CustomEndpointCertificateArn": {
+                    "type": "string"
+                },
+                "CustomEndpointEnabled": {
+                    "type": "boolean"
+                },
+                "EnforceHTTPS": {
+                    "type": "boolean"
+                },
+                "TLSSecurityPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.EBSOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "EBSEnabled": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.ElasticsearchClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ColdStorageOptions": {
+                    "$ref": "#/definitions/AWS::Elasticsearch::Domain.ColdStorageOptions"
+                },
+                "DedicatedMasterCount": {
+                    "type": "number"
+                },
+                "DedicatedMasterEnabled": {
+                    "type": "boolean"
+                },
+                "DedicatedMasterType": {
+                    "type": "string"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "WarmCount": {
+                    "type": "number"
+                },
+                "WarmEnabled": {
+                    "type": "boolean"
+                },
+                "WarmType": {
+                    "type": "string"
+                },
+                "ZoneAwarenessConfig": {
+                    "$ref": "#/definitions/AWS::Elasticsearch::Domain.ZoneAwarenessConfig"
+                },
+                "ZoneAwarenessEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.EncryptionAtRestOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.LogPublishingOption": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsLogGroupArn": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.MasterUserOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "MasterUserARN": {
+                    "type": "string"
+                },
+                "MasterUserName": {
+                    "type": "string"
+                },
+                "MasterUserPassword": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.NodeToNodeEncryptionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.SnapshotOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomatedSnapshotStartHour": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.VPCOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Elasticsearch::Domain.ZoneAwarenessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZoneCount": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::EventSchemas::Discoverer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CrossAccount": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "SourceArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EventSchemas::Discoverer.TagsEntry"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SourceArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EventSchemas::Discoverer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::Discoverer.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::Registry": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RegistryName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EventSchemas::Registry.TagsEntry"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EventSchemas::Registry"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::Registry.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::RegistryPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Policy": {
+                            "type": "object"
+                        },
+                        "RegistryName": {
+                            "type": "string"
+                        },
+                        "RevisionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Policy",
+                        "RegistryName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EventSchemas::RegistryPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::Schema": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Content": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "RegistryName": {
+                            "type": "string"
+                        },
+                        "SchemaName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::EventSchemas::Schema.TagsEntry"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Content",
+                        "RegistryName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::EventSchemas::Schema"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::EventSchemas::Schema.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::ApiDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "HttpMethod": {
+                            "type": "string"
+                        },
+                        "InvocationEndpoint": {
+                            "type": "string"
+                        },
+                        "InvocationRateLimitPerSecond": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConnectionArn",
+                        "HttpMethod",
+                        "InvocationEndpoint"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::ApiDestination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Archive": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EventPattern": {
+                            "type": "object"
+                        },
+                        "RetentionDays": {
+                            "type": "number"
+                        },
+                        "SourceArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SourceArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::Archive"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Connection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthParameters": {
+                            "type": "object"
+                        },
+                        "AuthorizationType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthParameters",
+                        "AuthorizationType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::Connection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::EventBus": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EventSourceName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::EventBus"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::EventBusPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "Condition": {
+                            "$ref": "#/definitions/AWS::Events::EventBusPolicy.Condition"
+                        },
+                        "EventBusName": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        },
+                        "Statement": {
+                            "type": "object"
+                        },
+                        "StatementId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "StatementId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::EventBusPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::EventBusPolicy.Condition": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EventBusName": {
+                            "type": "string"
+                        },
+                        "EventPattern": {
+                            "type": "object"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "ScheduleExpression": {
+                            "type": "string"
+                        },
+                        "State": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Events::Rule.Target"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Events::Rule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.AwsVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AssignPublicIp": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.BatchArrayProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Size": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.BatchParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ArrayProperties": {
+                    "$ref": "#/definitions/AWS::Events::Rule.BatchArrayProperties"
+                },
+                "JobDefinition": {
+                    "type": "string"
+                },
+                "JobName": {
+                    "type": "string"
+                },
+                "RetryStrategy": {
+                    "$ref": "#/definitions/AWS::Events::Rule.BatchRetryStrategy"
+                }
+            },
+            "required": [
+                "JobDefinition",
+                "JobName"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.BatchRetryStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "Attempts": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.CapacityProviderStrategyItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Base": {
+                    "type": "number"
+                },
+                "CapacityProvider": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "CapacityProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.DeadLetterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.EcsParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CapacityProviderStrategy": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Events::Rule.CapacityProviderStrategyItem"
+                    },
+                    "type": "array"
+                },
+                "EnableECSManagedTags": {
+                    "type": "boolean"
+                },
+                "EnableExecuteCommand": {
+                    "type": "boolean"
+                },
+                "Group": {
+                    "type": "string"
+                },
+                "LaunchType": {
+                    "type": "string"
+                },
+                "NetworkConfiguration": {
+                    "$ref": "#/definitions/AWS::Events::Rule.NetworkConfiguration"
+                },
+                "PlacementConstraints": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Events::Rule.PlacementConstraint"
+                    },
+                    "type": "array"
+                },
+                "PlacementStrategies": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Events::Rule.PlacementStrategy"
+                    },
+                    "type": "array"
+                },
+                "PlatformVersion": {
+                    "type": "string"
+                },
+                "PropagateTags": {
+                    "type": "string"
+                },
+                "ReferenceId": {
+                    "type": "string"
+                },
+                "TagList": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                },
+                "TaskCount": {
+                    "type": "number"
+                },
+                "TaskDefinitionArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TaskDefinitionArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.HttpParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "PathParameterValues": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "QueryStringParameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.InputTransformer": {
+            "additionalProperties": false,
+            "properties": {
+                "InputPathsMap": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "InputTemplate": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputTemplate"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.KinesisParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "PartitionKeyPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PartitionKeyPath"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsVpcConfiguration": {
+                    "$ref": "#/definitions/AWS::Events::Rule.AwsVpcConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.PlacementConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.PlacementStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "Field": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.RedshiftDataParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "DbUser": {
+                    "type": "string"
+                },
+                "SecretManagerArn": {
+                    "type": "string"
+                },
+                "Sql": {
+                    "type": "string"
+                },
+                "StatementName": {
+                    "type": "string"
+                },
+                "WithEvent": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Database",
+                "Sql"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.RetryPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumEventAgeInSeconds": {
+                    "type": "number"
+                },
+                "MaximumRetryAttempts": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.RunCommandParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RunCommandTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Events::Rule.RunCommandTarget"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "RunCommandTargets"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.RunCommandTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.SqsParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "MessageGroupId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MessageGroupId"
+            ],
+            "type": "object"
+        },
+        "AWS::Events::Rule.Tag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Events::Rule.Target": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "BatchParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.BatchParameters"
+                },
+                "DeadLetterConfig": {
+                    "$ref": "#/definitions/AWS::Events::Rule.DeadLetterConfig"
+                },
+                "EcsParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.EcsParameters"
+                },
+                "HttpParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.HttpParameters"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Input": {
+                    "type": "string"
+                },
+                "InputPath": {
+                    "type": "string"
+                },
+                "InputTransformer": {
+                    "$ref": "#/definitions/AWS::Events::Rule.InputTransformer"
+                },
+                "KinesisParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.KinesisParameters"
+                },
+                "RedshiftDataParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.RedshiftDataParameters"
+                },
+                "RetryPolicy": {
+                    "$ref": "#/definitions/AWS::Events::Rule.RetryPolicy"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "RunCommandParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.RunCommandParameters"
+                },
+                "SqsParameters": {
+                    "$ref": "#/definitions/AWS::Events::Rule.SqsParameters"
+                }
+            },
+            "required": [
+                "Arn",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Experiment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "MetricGoals": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Experiment.MetricGoalObject"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OnlineAbConfig": {
+                            "$ref": "#/definitions/AWS::Evidently::Experiment.OnlineAbConfigObject"
+                        },
+                        "Project": {
+                            "type": "string"
+                        },
+                        "RandomizationSalt": {
+                            "type": "string"
+                        },
+                        "SamplingRate": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Treatments": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Experiment.TreatmentObject"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MetricGoals",
+                        "Name",
+                        "OnlineAbConfig",
+                        "Project",
+                        "Treatments"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Evidently::Experiment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Experiment.MetricGoalObject": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredChange": {
+                    "type": "string"
+                },
+                "EntityIdKey": {
+                    "type": "string"
+                },
+                "EventPattern": {
+                    "type": "string"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "UnitLabel": {
+                    "type": "string"
+                },
+                "ValueKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DesiredChange",
+                "EntityIdKey",
+                "EventPattern",
+                "MetricName",
+                "ValueKey"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Experiment.OnlineAbConfigObject": {
+            "additionalProperties": false,
+            "properties": {
+                "ControlTreatmentName": {
+                    "type": "string"
+                },
+                "TreatmentWeights": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Evidently::Experiment.TreatmentToWeight"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Evidently::Experiment.TreatmentObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Feature": {
+                    "type": "string"
+                },
+                "TreatmentName": {
+                    "type": "string"
+                },
+                "Variation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Feature",
+                "TreatmentName",
+                "Variation"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Experiment.TreatmentToWeight": {
+            "additionalProperties": false,
+            "properties": {
+                "SplitWeight": {
+                    "type": "number"
+                },
+                "Treatment": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SplitWeight",
+                "Treatment"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Feature": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DefaultVariation": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EntityOverrides": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Feature.EntityOverride"
+                            },
+                            "type": "array"
+                        },
+                        "EvaluationStrategy": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Project": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Variations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Feature.VariationObject"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Project",
+                        "Variations"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Evidently::Feature"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Feature.EntityOverride": {
+            "additionalProperties": false,
+            "properties": {
+                "EntityId": {
+                    "type": "string"
+                },
+                "Variation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Evidently::Feature.VariationObject": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanValue": {
+                    "type": "boolean"
+                },
+                "DoubleValue": {
+                    "type": "number"
+                },
+                "LongValue": {
+                    "type": "number"
+                },
+                "StringValue": {
+                    "type": "string"
+                },
+                "VariationName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Evidently::Launch": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Groups": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Launch.LaunchGroupObject"
+                            },
+                            "type": "array"
+                        },
+                        "MetricMonitors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Launch.MetricDefinitionObject"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Project": {
+                            "type": "string"
+                        },
+                        "RandomizationSalt": {
+                            "type": "string"
+                        },
+                        "ScheduledSplitsConfig": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Evidently::Launch.StepConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Groups",
+                        "Name",
+                        "Project",
+                        "ScheduledSplitsConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Evidently::Launch"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Launch.GroupToWeight": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupName": {
+                    "type": "string"
+                },
+                "SplitWeight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "GroupName",
+                "SplitWeight"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Launch.LaunchGroupObject": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Feature": {
+                    "type": "string"
+                },
+                "GroupName": {
+                    "type": "string"
+                },
+                "Variation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Feature",
+                "GroupName",
+                "Variation"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Launch.MetricDefinitionObject": {
+            "additionalProperties": false,
+            "properties": {
+                "EntityIdKey": {
+                    "type": "string"
+                },
+                "EventPattern": {
+                    "type": "string"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "UnitLabel": {
+                    "type": "string"
+                },
+                "ValueKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EntityIdKey",
+                "EventPattern",
+                "MetricName",
+                "ValueKey"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Launch.StepConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupWeights": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Evidently::Launch.GroupToWeight"
+                    },
+                    "type": "array"
+                },
+                "StartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupWeights",
+                "StartTime"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataDelivery": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Evidently::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Evidently::Project.DataDeliveryObject": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroup": {
+                    "type": "string"
+                },
+                "S3": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Evidently::Project.S3Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::FIS::ExperimentTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::FIS::ExperimentTemplate.ExperimentTemplateAction"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StopConditions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FIS::ExperimentTemplate.ExperimentTemplateStopCondition"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Targets": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::FIS::ExperimentTemplate.ExperimentTemplateTarget"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "RoleArn",
+                        "StopConditions",
+                        "Tags",
+                        "Targets"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FIS::ExperimentTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FIS::ExperimentTemplate.ExperimentTemplateAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionId": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "StartAfter": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Targets": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "required": [
+                "ActionId"
+            ],
+            "type": "object"
+        },
+        "AWS::FIS::ExperimentTemplate.ExperimentTemplateStopCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "Source": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Source"
+            ],
+            "type": "object"
+        },
+        "AWS::FIS::ExperimentTemplate.ExperimentTemplateTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Filters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FIS::ExperimentTemplate.ExperimentTemplateTargetFilter"
+                    },
+                    "type": "array"
+                },
+                "ResourceArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ResourceTags": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ResourceType": {
+                    "type": "string"
+                },
+                "SelectionMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceType",
+                "SelectionMode"
+            ],
+            "type": "object"
+        },
+        "AWS::FIS::ExperimentTemplate.ExperimentTemplateTargetFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Path": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Path",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::FMS::NotificationChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SnsRoleName": {
+                            "type": "string"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SnsRoleName",
+                        "SnsTopicArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FMS::NotificationChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FMS::Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeleteAllPolicyResources": {
+                            "type": "boolean"
+                        },
+                        "ExcludeMap": {
+                            "$ref": "#/definitions/AWS::FMS::Policy.IEMap"
+                        },
+                        "ExcludeResourceTags": {
+                            "type": "boolean"
+                        },
+                        "IncludeMap": {
+                            "$ref": "#/definitions/AWS::FMS::Policy.IEMap"
+                        },
+                        "PolicyName": {
+                            "type": "string"
+                        },
+                        "RemediationEnabled": {
+                            "type": "boolean"
+                        },
+                        "ResourceTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FMS::Policy.ResourceTag"
+                            },
+                            "type": "array"
+                        },
+                        "ResourceType": {
+                            "type": "string"
+                        },
+                        "ResourceTypeList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ResourcesCleanUp": {
+                            "type": "boolean"
+                        },
+                        "SecurityServicePolicyData": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FMS::Policy.PolicyTag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ExcludeResourceTags",
+                        "PolicyName",
+                        "RemediationEnabled",
+                        "ResourceType",
+                        "SecurityServicePolicyData"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FMS::Policy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FMS::Policy.IEMap": {
+            "additionalProperties": false,
+            "properties": {
+                "ACCOUNT": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ORGUNIT": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FMS::Policy.PolicyTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::FMS::Policy.ResourceTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BackupId": {
+                            "type": "string"
+                        },
+                        "FileSystemType": {
+                            "type": "string"
+                        },
+                        "FileSystemTypeVersion": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LustreConfiguration": {
+                            "$ref": "#/definitions/AWS::FSx::FileSystem.LustreConfiguration"
+                        },
+                        "OntapConfiguration": {
+                            "$ref": "#/definitions/AWS::FSx::FileSystem.OntapConfiguration"
+                        },
+                        "OpenZFSConfiguration": {
+                            "$ref": "#/definitions/AWS::FSx::FileSystem.OpenZFSConfiguration"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "StorageCapacity": {
+                            "type": "number"
+                        },
+                        "StorageType": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WindowsConfiguration": {
+                            "$ref": "#/definitions/AWS::FSx::FileSystem.WindowsConfiguration"
+                        }
+                    },
+                    "required": [
+                        "FileSystemType",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FSx::FileSystem"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.AuditLogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuditLogDestination": {
+                    "type": "string"
+                },
+                "FileAccessAuditLogLevel": {
+                    "type": "string"
+                },
+                "FileShareAccessAuditLogLevel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FileAccessAuditLogLevel",
+                "FileShareAccessAuditLogLevel"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.ClientConfigurations": {
+            "additionalProperties": false,
+            "properties": {
+                "Clients": {
+                    "type": "string"
+                },
+                "Options": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.DiskIopsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Iops": {
+                    "type": "number"
+                },
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.LustreConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoImportPolicy": {
+                    "type": "string"
+                },
+                "AutomaticBackupRetentionDays": {
+                    "type": "number"
+                },
+                "CopyTagsToBackups": {
+                    "type": "boolean"
+                },
+                "DailyAutomaticBackupStartTime": {
+                    "type": "string"
+                },
+                "DataCompressionType": {
+                    "type": "string"
+                },
+                "DeploymentType": {
+                    "type": "string"
+                },
+                "DriveCacheType": {
+                    "type": "string"
+                },
+                "ExportPath": {
+                    "type": "string"
+                },
+                "ImportPath": {
+                    "type": "string"
+                },
+                "ImportedFileChunkSize": {
+                    "type": "number"
+                },
+                "PerUnitStorageThroughput": {
+                    "type": "number"
+                },
+                "WeeklyMaintenanceStartTime": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.NfsExports": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FSx::FileSystem.ClientConfigurations"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.OntapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomaticBackupRetentionDays": {
+                    "type": "number"
+                },
+                "DailyAutomaticBackupStartTime": {
+                    "type": "string"
+                },
+                "DeploymentType": {
+                    "type": "string"
+                },
+                "DiskIopsConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.DiskIopsConfiguration"
+                },
+                "EndpointIpAddressRange": {
+                    "type": "string"
+                },
+                "FsxAdminPassword": {
+                    "type": "string"
+                },
+                "PreferredSubnetId": {
+                    "type": "string"
+                },
+                "RouteTableIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ThroughputCapacity": {
+                    "type": "number"
+                },
+                "WeeklyMaintenanceStartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeploymentType"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.OpenZFSConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomaticBackupRetentionDays": {
+                    "type": "number"
+                },
+                "CopyTagsToBackups": {
+                    "type": "boolean"
+                },
+                "CopyTagsToVolumes": {
+                    "type": "boolean"
+                },
+                "DailyAutomaticBackupStartTime": {
+                    "type": "string"
+                },
+                "DeploymentType": {
+                    "type": "string"
+                },
+                "DiskIopsConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.DiskIopsConfiguration"
+                },
+                "RootVolumeConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.RootVolumeConfiguration"
+                },
+                "ThroughputCapacity": {
+                    "type": "number"
+                },
+                "WeeklyMaintenanceStartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeploymentType"
+            ],
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.RootVolumeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyTagsToSnapshots": {
+                    "type": "boolean"
+                },
+                "DataCompressionType": {
+                    "type": "string"
+                },
+                "NfsExports": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FSx::FileSystem.NfsExports"
+                    },
+                    "type": "array"
+                },
+                "ReadOnly": {
+                    "type": "boolean"
+                },
+                "UserAndGroupQuotas": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FSx::FileSystem.UserAndGroupQuotas"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.SelfManagedActiveDirectoryConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DnsIps": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DomainName": {
+                    "type": "string"
+                },
+                "FileSystemAdministratorsGroup": {
+                    "type": "string"
+                },
+                "OrganizationalUnitDistinguishedName": {
+                    "type": "string"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "UserName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.UserAndGroupQuotas": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "number"
+                },
+                "StorageCapacityQuotaGiB": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FSx::FileSystem.WindowsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveDirectoryId": {
+                    "type": "string"
+                },
+                "Aliases": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AuditLogConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.AuditLogConfiguration"
+                },
+                "AutomaticBackupRetentionDays": {
+                    "type": "number"
+                },
+                "CopyTagsToBackups": {
+                    "type": "boolean"
+                },
+                "DailyAutomaticBackupStartTime": {
+                    "type": "string"
+                },
+                "DeploymentType": {
+                    "type": "string"
+                },
+                "PreferredSubnetId": {
+                    "type": "string"
+                },
+                "SelfManagedActiveDirectoryConfiguration": {
+                    "$ref": "#/definitions/AWS::FSx::FileSystem.SelfManagedActiveDirectoryConfiguration"
+                },
+                "ThroughputCapacity": {
+                    "type": "number"
+                },
+                "WeeklyMaintenanceStartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ThroughputCapacity"
+            ],
+            "type": "object"
+        },
+        "AWS::FinSpace::Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataBundles": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FederationMode": {
+                            "type": "string"
+                        },
+                        "FederationParameters": {
+                            "$ref": "#/definitions/AWS::FinSpace::Environment.FederationParameters"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SuperuserParameters": {
+                            "$ref": "#/definitions/AWS::FinSpace::Environment.SuperuserParameters"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FinSpace::Environment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FinSpace::Environment.FederationParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationCallBackURL": {
+                    "type": "string"
+                },
+                "AttributeMap": {
+                    "type": "object"
+                },
+                "FederationProviderName": {
+                    "type": "string"
+                },
+                "FederationURN": {
+                    "type": "string"
+                },
+                "SamlMetadataDocument": {
+                    "type": "string"
+                },
+                "SamlMetadataURL": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FinSpace::Environment.SuperuserParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "EmailAddress": {
+                    "type": "string"
+                },
+                "FirstName": {
+                    "type": "string"
+                },
+                "LastName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatedModels": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FraudDetector::Detector.Model"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "DetectorVersionStatus": {
+                            "type": "string"
+                        },
+                        "EventType": {
+                            "$ref": "#/definitions/AWS::FraudDetector::Detector.EventType"
+                        },
+                        "RuleExecutionMode": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FraudDetector::Detector.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DetectorId",
+                        "EventType",
+                        "Rules"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::Detector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.EntityType": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.EventType": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "EntityTypes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FraudDetector::Detector.EntityType"
+                    },
+                    "type": "array"
+                },
+                "EventVariables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FraudDetector::Detector.EventVariable"
+                    },
+                    "type": "array"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "Labels": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FraudDetector::Detector.Label"
+                    },
+                    "type": "array"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.EventVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "DataSource": {
+                    "type": "string"
+                },
+                "DataType": {
+                    "type": "string"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                },
+                "VariableType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.Label": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.Model": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.Outcome": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Detector.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DetectorId": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                },
+                "Language": {
+                    "type": "string"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Outcomes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::FraudDetector::Detector.Outcome"
+                    },
+                    "type": "array"
+                },
+                "RuleId": {
+                    "type": "string"
+                },
+                "RuleVersion": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::EntityType": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::EntityType"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FraudDetector::EventType": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EntityTypes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FraudDetector::EventType.EntityType"
+                            },
+                            "type": "array"
+                        },
+                        "EventVariables": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FraudDetector::EventType.EventVariable"
+                            },
+                            "type": "array"
+                        },
+                        "Labels": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::FraudDetector::EventType.Label"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EntityTypes",
+                        "EventVariables",
+                        "Labels",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::EventType"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FraudDetector::EventType.EntityType": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::EventType.EventVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "DataSource": {
+                    "type": "string"
+                },
+                "DataType": {
+                    "type": "string"
+                },
+                "DefaultValue": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                },
+                "VariableType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::EventType.Label": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "CreatedTime": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Inline": {
+                    "type": "boolean"
+                },
+                "LastUpdatedTime": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/Tag"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::FraudDetector::Label": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::Label"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FraudDetector::Outcome": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::Outcome"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::FraudDetector::Variable": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataSource": {
+                            "type": "string"
+                        },
+                        "DataType": {
+                            "type": "string"
+                        },
+                        "DefaultValue": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VariableType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DataSource",
+                        "DataType",
+                        "DefaultValue",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::FraudDetector::Variable"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Alias": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RoutingStrategy": {
+                            "$ref": "#/definitions/AWS::GameLift::Alias.RoutingStrategy"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "RoutingStrategy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::Alias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Alias.RoutingStrategy": {
+            "additionalProperties": false,
+            "properties": {
+                "FleetId": {
+                    "type": "string"
+                },
+                "Message": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Build": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "OperatingSystem": {
+                            "type": "string"
+                        },
+                        "StorageLocation": {
+                            "$ref": "#/definitions/AWS::GameLift::Build.S3Location"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::Build"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Build.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BuildId": {
+                            "type": "string"
+                        },
+                        "CertificateConfiguration": {
+                            "$ref": "#/definitions/AWS::GameLift::Fleet.CertificateConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DesiredEC2Instances": {
+                            "type": "number"
+                        },
+                        "EC2InboundPermissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::Fleet.IpPermission"
+                            },
+                            "type": "array"
+                        },
+                        "EC2InstanceType": {
+                            "type": "string"
+                        },
+                        "FleetType": {
+                            "type": "string"
+                        },
+                        "InstanceRoleARN": {
+                            "type": "string"
+                        },
+                        "Locations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::Fleet.LocationConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "MaxSize": {
+                            "type": "number"
+                        },
+                        "MetricGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NewGameSessionProtectionPolicy": {
+                            "type": "string"
+                        },
+                        "PeerVpcAwsAccountId": {
+                            "type": "string"
+                        },
+                        "PeerVpcId": {
+                            "type": "string"
+                        },
+                        "ResourceCreationLimitPolicy": {
+                            "$ref": "#/definitions/AWS::GameLift::Fleet.ResourceCreationLimitPolicy"
+                        },
+                        "RuntimeConfiguration": {
+                            "$ref": "#/definitions/AWS::GameLift::Fleet.RuntimeConfiguration"
+                        },
+                        "ScriptId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::Fleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.CertificateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateType"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.IpPermission": {
+            "additionalProperties": false,
+            "properties": {
+                "FromPort": {
+                    "type": "number"
+                },
+                "IpRange": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FromPort",
+                "IpRange",
+                "Protocol",
+                "ToPort"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.LocationCapacity": {
+            "additionalProperties": false,
+            "properties": {
+                "DesiredEC2Instances": {
+                    "type": "number"
+                },
+                "MaxSize": {
+                    "type": "number"
+                },
+                "MinSize": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DesiredEC2Instances",
+                "MaxSize",
+                "MinSize"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.LocationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Location": {
+                    "type": "string"
+                },
+                "LocationCapacity": {
+                    "$ref": "#/definitions/AWS::GameLift::Fleet.LocationCapacity"
+                }
+            },
+            "required": [
+                "Location"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.ResourceCreationLimitPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "NewGameSessionsPerCreator": {
+                    "type": "number"
+                },
+                "PolicyPeriodInMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.RuntimeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GameSessionActivationTimeoutSeconds": {
+                    "type": "number"
+                },
+                "MaxConcurrentGameSessionActivations": {
+                    "type": "number"
+                },
+                "ServerProcesses": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::GameLift::Fleet.ServerProcess"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::Fleet.ServerProcess": {
+            "additionalProperties": false,
+            "properties": {
+                "ConcurrentExecutions": {
+                    "type": "number"
+                },
+                "LaunchPath": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConcurrentExecutions",
+                "LaunchPath"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameServerGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoScalingPolicy": {
+                            "$ref": "#/definitions/AWS::GameLift::GameServerGroup.AutoScalingPolicy"
+                        },
+                        "BalancingStrategy": {
+                            "type": "string"
+                        },
+                        "DeleteOption": {
+                            "type": "string"
+                        },
+                        "GameServerGroupName": {
+                            "type": "string"
+                        },
+                        "GameServerProtectionPolicy": {
+                            "type": "string"
+                        },
+                        "InstanceDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::GameServerGroup.InstanceDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchTemplate": {
+                            "$ref": "#/definitions/AWS::GameLift::GameServerGroup.LaunchTemplate"
+                        },
+                        "MaxSize": {
+                            "type": "number"
+                        },
+                        "MinSize": {
+                            "type": "number"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSubnets": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "GameServerGroupName",
+                        "InstanceDefinitions",
+                        "LaunchTemplate",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::GameServerGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameServerGroup.AutoScalingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "EstimatedInstanceWarmup": {
+                    "type": "number"
+                },
+                "TargetTrackingConfiguration": {
+                    "$ref": "#/definitions/AWS::GameLift::GameServerGroup.TargetTrackingConfiguration"
+                }
+            },
+            "required": [
+                "TargetTrackingConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameServerGroup.InstanceDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "WeightedCapacity": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameServerGroup.LaunchTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "LaunchTemplateName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::GameServerGroup.TargetTrackingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetValue": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TargetValue"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameSessionQueue": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomEventData": {
+                            "type": "string"
+                        },
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::GameSessionQueue.Destination"
+                            },
+                            "type": "array"
+                        },
+                        "FilterConfiguration": {
+                            "$ref": "#/definitions/AWS::GameLift::GameSessionQueue.FilterConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NotificationTarget": {
+                            "type": "string"
+                        },
+                        "PlayerLatencyPolicies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::GameSessionQueue.PlayerLatencyPolicy"
+                            },
+                            "type": "array"
+                        },
+                        "PriorityConfiguration": {
+                            "$ref": "#/definitions/AWS::GameLift::GameSessionQueue.PriorityConfiguration"
+                        },
+                        "TimeoutInSeconds": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::GameSessionQueue"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::GameSessionQueue.Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::GameSessionQueue.FilterConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedLocations": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::GameSessionQueue.PlayerLatencyPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumIndividualPlayerLatencyMilliseconds": {
+                    "type": "number"
+                },
+                "PolicyDurationSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::GameSessionQueue.PriorityConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LocationOrder": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PriorityOrder": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GameLift::MatchmakingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptanceRequired": {
+                            "type": "boolean"
+                        },
+                        "AcceptanceTimeoutSeconds": {
+                            "type": "number"
+                        },
+                        "AdditionalPlayerCount": {
+                            "type": "number"
+                        },
+                        "BackfillMode": {
+                            "type": "string"
+                        },
+                        "CustomEventData": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FlexMatchMode": {
+                            "type": "string"
+                        },
+                        "GameProperties": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GameLift::MatchmakingConfiguration.GameProperty"
+                            },
+                            "type": "array"
+                        },
+                        "GameSessionData": {
+                            "type": "string"
+                        },
+                        "GameSessionQueueArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NotificationTarget": {
+                            "type": "string"
+                        },
+                        "RequestTimeoutSeconds": {
+                            "type": "number"
+                        },
+                        "RuleSetName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AcceptanceRequired",
+                        "Name",
+                        "RequestTimeoutSeconds",
+                        "RuleSetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::MatchmakingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::MatchmakingConfiguration.GameProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::MatchmakingRuleSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RuleSetBody": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "RuleSetBody"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::MatchmakingRuleSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Script": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "StorageLocation": {
+                            "$ref": "#/definitions/AWS::GameLift::Script.S3Location"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "StorageLocation"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GameLift::Script"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GameLift::Script.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::Accelerator": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "IpAddressType": {
+                            "type": "string"
+                        },
+                        "IpAddresses": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GlobalAccelerator::Accelerator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::EndpointGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EndpointConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GlobalAccelerator::EndpointGroup.EndpointConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "EndpointGroupRegion": {
+                            "type": "string"
+                        },
+                        "HealthCheckIntervalSeconds": {
+                            "type": "number"
+                        },
+                        "HealthCheckPath": {
+                            "type": "string"
+                        },
+                        "HealthCheckPort": {
+                            "type": "number"
+                        },
+                        "HealthCheckProtocol": {
+                            "type": "string"
+                        },
+                        "ListenerArn": {
+                            "type": "string"
+                        },
+                        "PortOverrides": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GlobalAccelerator::EndpointGroup.PortOverride"
+                            },
+                            "type": "array"
+                        },
+                        "ThresholdCount": {
+                            "type": "number"
+                        },
+                        "TrafficDialPercentage": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "EndpointGroupRegion",
+                        "ListenerArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GlobalAccelerator::EndpointGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::EndpointGroup.EndpointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientIPPreservationEnabled": {
+                    "type": "boolean"
+                },
+                "EndpointId": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "EndpointId"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::EndpointGroup.PortOverride": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointPort": {
+                    "type": "number"
+                },
+                "ListenerPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "EndpointPort",
+                "ListenerPort"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::Listener": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceleratorArn": {
+                            "type": "string"
+                        },
+                        "ClientAffinity": {
+                            "type": "string"
+                        },
+                        "PortRanges": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GlobalAccelerator::Listener.PortRange"
+                            },
+                            "type": "array"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AcceleratorArn",
+                        "PortRanges",
+                        "Protocol"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GlobalAccelerator::Listener"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GlobalAccelerator::Listener.PortRange": {
+            "additionalProperties": false,
+            "properties": {
+                "FromPort": {
+                    "type": "number"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FromPort",
+                "ToPort"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Classifier": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CsvClassifier": {
+                            "$ref": "#/definitions/AWS::Glue::Classifier.CsvClassifier"
+                        },
+                        "GrokClassifier": {
+                            "$ref": "#/definitions/AWS::Glue::Classifier.GrokClassifier"
+                        },
+                        "JsonClassifier": {
+                            "$ref": "#/definitions/AWS::Glue::Classifier.JsonClassifier"
+                        },
+                        "XMLClassifier": {
+                            "$ref": "#/definitions/AWS::Glue::Classifier.XMLClassifier"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Classifier"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Classifier.CsvClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowSingleColumn": {
+                    "type": "boolean"
+                },
+                "ContainsHeader": {
+                    "type": "string"
+                },
+                "Delimiter": {
+                    "type": "string"
+                },
+                "DisableValueTrimming": {
+                    "type": "boolean"
+                },
+                "Header": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "QuoteSymbol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Classifier.GrokClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "Classification": {
+                    "type": "string"
+                },
+                "CustomPatterns": {
+                    "type": "string"
+                },
+                "GrokPattern": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Classification",
+                "GrokPattern"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Classifier.JsonClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonPath": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "JsonPath"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Classifier.XMLClassifier": {
+            "additionalProperties": false,
+            "properties": {
+                "Classification": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "RowTag": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Classification",
+                "RowTag"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Connection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CatalogId": {
+                            "type": "string"
+                        },
+                        "ConnectionInput": {
+                            "$ref": "#/definitions/AWS::Glue::Connection.ConnectionInput"
+                        }
+                    },
+                    "required": [
+                        "CatalogId",
+                        "ConnectionInput"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Connection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Connection.ConnectionInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionProperties": {
+                    "type": "object"
+                },
+                "ConnectionType": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "MatchCriteria": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "PhysicalConnectionRequirements": {
+                    "$ref": "#/definitions/AWS::Glue::Connection.PhysicalConnectionRequirements"
+                }
+            },
+            "required": [
+                "ConnectionType"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Connection.PhysicalConnectionRequirements": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "SecurityGroupIdList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Classifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Configuration": {
+                            "type": "string"
+                        },
+                        "CrawlerSecurityConfiguration": {
+                            "type": "string"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RecrawlPolicy": {
+                            "$ref": "#/definitions/AWS::Glue::Crawler.RecrawlPolicy"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "$ref": "#/definitions/AWS::Glue::Crawler.Schedule"
+                        },
+                        "SchemaChangePolicy": {
+                            "$ref": "#/definitions/AWS::Glue::Crawler.SchemaChangePolicy"
+                        },
+                        "TablePrefix": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Targets": {
+                            "$ref": "#/definitions/AWS::Glue::Crawler.Targets"
+                        }
+                    },
+                    "required": [
+                        "Role",
+                        "Targets"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Crawler"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.CatalogTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Tables": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.DynamoDBTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.JdbcTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionName": {
+                    "type": "string"
+                },
+                "Exclusions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.RecrawlPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "RecrawlBehavior": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.S3Target": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionName": {
+                    "type": "string"
+                },
+                "Exclusions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Path": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.SchemaChangePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteBehavior": {
+                    "type": "string"
+                },
+                "UpdateBehavior": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Crawler.Targets": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Crawler.CatalogTarget"
+                    },
+                    "type": "array"
+                },
+                "DynamoDBTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Crawler.DynamoDBTarget"
+                    },
+                    "type": "array"
+                },
+                "JdbcTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Crawler.JdbcTarget"
+                    },
+                    "type": "array"
+                },
+                "S3Targets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Crawler.S3Target"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::DataCatalogEncryptionSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CatalogId": {
+                            "type": "string"
+                        },
+                        "DataCatalogEncryptionSettings": {
+                            "$ref": "#/definitions/AWS::Glue::DataCatalogEncryptionSettings.DataCatalogEncryptionSettings"
+                        }
+                    },
+                    "required": [
+                        "CatalogId",
+                        "DataCatalogEncryptionSettings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::DataCatalogEncryptionSettings"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::DataCatalogEncryptionSettings.ConnectionPasswordEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "ReturnConnectionPasswordEncrypted": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::DataCatalogEncryptionSettings.DataCatalogEncryptionSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionPasswordEncryption": {
+                    "$ref": "#/definitions/AWS::Glue::DataCatalogEncryptionSettings.ConnectionPasswordEncryption"
+                },
+                "EncryptionAtRest": {
+                    "$ref": "#/definitions/AWS::Glue::DataCatalogEncryptionSettings.EncryptionAtRest"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::DataCatalogEncryptionSettings.EncryptionAtRest": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogEncryptionMode": {
+                    "type": "string"
+                },
+                "SseAwsKmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Database": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CatalogId": {
+                            "type": "string"
+                        },
+                        "DatabaseInput": {
+                            "$ref": "#/definitions/AWS::Glue::Database.DatabaseInput"
+                        }
+                    },
+                    "required": [
+                        "CatalogId",
+                        "DatabaseInput"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Database"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Database.DataLakePrincipal": {
+            "additionalProperties": false,
+            "properties": {
+                "DataLakePrincipalIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Database.DatabaseIdentifier": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Database.DatabaseInput": {
+            "additionalProperties": false,
+            "properties": {
+                "CreateTableDefaultPermissions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Database.PrincipalPrivileges"
+                    },
+                    "type": "array"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "LocationUri": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "TargetDatabase": {
+                    "$ref": "#/definitions/AWS::Glue::Database.DatabaseIdentifier"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Database.PrincipalPrivileges": {
+            "additionalProperties": false,
+            "properties": {
+                "Permissions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "$ref": "#/definitions/AWS::Glue::Database.DataLakePrincipal"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::DevEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Arguments": {
+                            "type": "object"
+                        },
+                        "EndpointName": {
+                            "type": "string"
+                        },
+                        "ExtraJarsS3Path": {
+                            "type": "string"
+                        },
+                        "ExtraPythonLibsS3Path": {
+                            "type": "string"
+                        },
+                        "GlueVersion": {
+                            "type": "string"
+                        },
+                        "NumberOfNodes": {
+                            "type": "number"
+                        },
+                        "NumberOfWorkers": {
+                            "type": "number"
+                        },
+                        "PublicKey": {
+                            "type": "string"
+                        },
+                        "PublicKeys": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "SecurityConfiguration": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "WorkerType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::DevEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Job": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocatedCapacity": {
+                            "type": "number"
+                        },
+                        "Command": {
+                            "$ref": "#/definitions/AWS::Glue::Job.JobCommand"
+                        },
+                        "Connections": {
+                            "$ref": "#/definitions/AWS::Glue::Job.ConnectionsList"
+                        },
+                        "DefaultArguments": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ExecutionProperty": {
+                            "$ref": "#/definitions/AWS::Glue::Job.ExecutionProperty"
+                        },
+                        "GlueVersion": {
+                            "type": "string"
+                        },
+                        "LogUri": {
+                            "type": "string"
+                        },
+                        "MaxCapacity": {
+                            "type": "number"
+                        },
+                        "MaxRetries": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NotificationProperty": {
+                            "$ref": "#/definitions/AWS::Glue::Job.NotificationProperty"
+                        },
+                        "NumberOfWorkers": {
+                            "type": "number"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "SecurityConfiguration": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Timeout": {
+                            "type": "number"
+                        },
+                        "WorkerType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Command",
+                        "Role"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Job"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Job.ConnectionsList": {
+            "additionalProperties": false,
+            "properties": {
+                "Connections": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Job.ExecutionProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConcurrentRuns": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Job.JobCommand": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "PythonVersion": {
+                    "type": "string"
+                },
+                "ScriptLocation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Job.NotificationProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "NotifyDelayAfter": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "GlueVersion": {
+                            "type": "string"
+                        },
+                        "InputRecordTables": {
+                            "$ref": "#/definitions/AWS::Glue::MLTransform.InputRecordTables"
+                        },
+                        "MaxCapacity": {
+                            "type": "number"
+                        },
+                        "MaxRetries": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NumberOfWorkers": {
+                            "type": "number"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Timeout": {
+                            "type": "number"
+                        },
+                        "TransformEncryption": {
+                            "$ref": "#/definitions/AWS::Glue::MLTransform.TransformEncryption"
+                        },
+                        "TransformParameters": {
+                            "$ref": "#/definitions/AWS::Glue::MLTransform.TransformParameters"
+                        },
+                        "WorkerType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InputRecordTables",
+                        "Role",
+                        "TransformParameters"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::MLTransform"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.FindMatchesParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "AccuracyCostTradeoff": {
+                    "type": "number"
+                },
+                "EnforceProvidedLabels": {
+                    "type": "boolean"
+                },
+                "PrecisionRecallTradeoff": {
+                    "type": "number"
+                },
+                "PrimaryKeyColumnName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PrimaryKeyColumnName"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.GlueTables": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "ConnectionName": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.InputRecordTables": {
+            "additionalProperties": false,
+            "properties": {
+                "GlueTables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::MLTransform.GlueTables"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.MLUserDataEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MLUserDataEncryptionMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MLUserDataEncryptionMode"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.TransformEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "MLUserDataEncryption": {
+                    "$ref": "#/definitions/AWS::Glue::MLTransform.MLUserDataEncryption"
+                },
+                "TaskRunSecurityConfigurationName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::MLTransform.TransformParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "FindMatchesParameters": {
+                    "$ref": "#/definitions/AWS::Glue::MLTransform.FindMatchesParameters"
+                },
+                "TransformType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TransformType"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Partition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CatalogId": {
+                            "type": "string"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "PartitionInput": {
+                            "$ref": "#/definitions/AWS::Glue::Partition.PartitionInput"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CatalogId",
+                        "DatabaseName",
+                        "PartitionInput",
+                        "TableName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Partition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Partition.Column": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Partition.Order": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "type": "string"
+                },
+                "SortOrder": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Column"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Partition.PartitionInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "type": "object"
+                },
+                "StorageDescriptor": {
+                    "$ref": "#/definitions/AWS::Glue::Partition.StorageDescriptor"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Partition.SchemaId": {
+            "additionalProperties": false,
+            "properties": {
+                "RegistryName": {
+                    "type": "string"
+                },
+                "SchemaArn": {
+                    "type": "string"
+                },
+                "SchemaName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Partition.SchemaReference": {
+            "additionalProperties": false,
+            "properties": {
+                "SchemaId": {
+                    "$ref": "#/definitions/AWS::Glue::Partition.SchemaId"
+                },
+                "SchemaVersionId": {
+                    "type": "string"
+                },
+                "SchemaVersionNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Partition.SerdeInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "SerializationLibrary": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Partition.SkewedInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "SkewedColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SkewedColumnValueLocationMaps": {
+                    "type": "object"
+                },
+                "SkewedColumnValues": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Partition.StorageDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Partition.Column"
+                    },
+                    "type": "array"
+                },
+                "Compressed": {
+                    "type": "boolean"
+                },
+                "InputFormat": {
+                    "type": "string"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "NumberOfBuckets": {
+                    "type": "number"
+                },
+                "OutputFormat": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "SchemaReference": {
+                    "$ref": "#/definitions/AWS::Glue::Partition.SchemaReference"
+                },
+                "SerdeInfo": {
+                    "$ref": "#/definitions/AWS::Glue::Partition.SerdeInfo"
+                },
+                "SkewedInfo": {
+                    "$ref": "#/definitions/AWS::Glue::Partition.SkewedInfo"
+                },
+                "SortColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Partition.Order"
+                    },
+                    "type": "array"
+                },
+                "StoredAsSubDirectories": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Registry": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Registry"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Schema": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CheckpointVersion": {
+                            "$ref": "#/definitions/AWS::Glue::Schema.SchemaVersion"
+                        },
+                        "Compatibility": {
+                            "type": "string"
+                        },
+                        "DataFormat": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Registry": {
+                            "$ref": "#/definitions/AWS::Glue::Schema.Registry"
+                        },
+                        "SchemaDefinition": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Compatibility",
+                        "DataFormat",
+                        "Name",
+                        "SchemaDefinition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Schema"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Schema.Registry": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Schema.SchemaVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "IsLatest": {
+                    "type": "boolean"
+                },
+                "VersionNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SchemaVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Schema": {
+                            "$ref": "#/definitions/AWS::Glue::SchemaVersion.Schema"
+                        },
+                        "SchemaDefinition": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Schema",
+                        "SchemaDefinition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::SchemaVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::SchemaVersion.Schema": {
+            "additionalProperties": false,
+            "properties": {
+                "RegistryName": {
+                    "type": "string"
+                },
+                "SchemaArn": {
+                    "type": "string"
+                },
+                "SchemaName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SchemaVersionMetadata": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Key": {
+                            "type": "string"
+                        },
+                        "SchemaVersionId": {
+                            "type": "string"
+                        },
+                        "Value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Key",
+                        "SchemaVersionId",
+                        "Value"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::SchemaVersionMetadata"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Glue::SecurityConfiguration.EncryptionConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "EncryptionConfiguration",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::SecurityConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration.CloudWatchEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchEncryptionMode": {
+                    "type": "string"
+                },
+                "KmsKeyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchEncryption": {
+                    "$ref": "#/definitions/AWS::Glue::SecurityConfiguration.CloudWatchEncryption"
+                },
+                "JobBookmarksEncryption": {
+                    "$ref": "#/definitions/AWS::Glue::SecurityConfiguration.JobBookmarksEncryption"
+                },
+                "S3Encryptions": {
+                    "$ref": "#/definitions/AWS::Glue::SecurityConfiguration.S3Encryptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration.JobBookmarksEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "JobBookmarksEncryptionMode": {
+                    "type": "string"
+                },
+                "KmsKeyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration.S3Encryption": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyArn": {
+                    "type": "string"
+                },
+                "S3EncryptionMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::SecurityConfiguration.S3Encryptions": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::Glue::Table": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CatalogId": {
+                            "type": "string"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "TableInput": {
+                            "$ref": "#/definitions/AWS::Glue::Table.TableInput"
+                        }
+                    },
+                    "required": [
+                        "CatalogId",
+                        "DatabaseName",
+                        "TableInput"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Table"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Table.Column": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Table.Order": {
+            "additionalProperties": false,
+            "properties": {
+                "Column": {
+                    "type": "string"
+                },
+                "SortOrder": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Column",
+                "SortOrder"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Table.SchemaId": {
+            "additionalProperties": false,
+            "properties": {
+                "RegistryName": {
+                    "type": "string"
+                },
+                "SchemaArn": {
+                    "type": "string"
+                },
+                "SchemaName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.SchemaReference": {
+            "additionalProperties": false,
+            "properties": {
+                "SchemaId": {
+                    "$ref": "#/definitions/AWS::Glue::Table.SchemaId"
+                },
+                "SchemaVersionId": {
+                    "type": "string"
+                },
+                "SchemaVersionNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.SerdeInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "SerializationLibrary": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.SkewedInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "SkewedColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SkewedColumnValueLocationMaps": {
+                    "type": "object"
+                },
+                "SkewedColumnValues": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.StorageDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Table.Column"
+                    },
+                    "type": "array"
+                },
+                "Compressed": {
+                    "type": "boolean"
+                },
+                "InputFormat": {
+                    "type": "string"
+                },
+                "Location": {
+                    "type": "string"
+                },
+                "NumberOfBuckets": {
+                    "type": "number"
+                },
+                "OutputFormat": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "SchemaReference": {
+                    "$ref": "#/definitions/AWS::Glue::Table.SchemaReference"
+                },
+                "SerdeInfo": {
+                    "$ref": "#/definitions/AWS::Glue::Table.SerdeInfo"
+                },
+                "SkewedInfo": {
+                    "$ref": "#/definitions/AWS::Glue::Table.SkewedInfo"
+                },
+                "SortColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Table.Order"
+                    },
+                    "type": "array"
+                },
+                "StoredAsSubDirectories": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.TableIdentifier": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Table.TableInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Owner": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "PartitionKeys": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Table.Column"
+                    },
+                    "type": "array"
+                },
+                "Retention": {
+                    "type": "number"
+                },
+                "StorageDescriptor": {
+                    "$ref": "#/definitions/AWS::Glue::Table.StorageDescriptor"
+                },
+                "TableType": {
+                    "type": "string"
+                },
+                "TargetTable": {
+                    "$ref": "#/definitions/AWS::Glue::Table.TableIdentifier"
+                },
+                "ViewExpandedText": {
+                    "type": "string"
+                },
+                "ViewOriginalText": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Trigger": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                                "$ref": "#/definitions/AWS::Glue::Trigger.Action"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Predicate": {
+                            "$ref": "#/definitions/AWS::Glue::Trigger.Predicate"
+                        },
+                        "Schedule": {
+                            "type": "string"
+                        },
+                        "StartOnCreation": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "WorkflowName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Actions",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Glue::Trigger"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Glue::Trigger.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "Arguments": {
+                    "type": "object"
+                },
+                "CrawlerName": {
+                    "type": "string"
+                },
+                "JobName": {
+                    "type": "string"
+                },
+                "NotificationProperty": {
+                    "$ref": "#/definitions/AWS::Glue::Trigger.NotificationProperty"
+                },
+                "SecurityConfiguration": {
+                    "type": "string"
+                },
+                "Timeout": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Trigger.Condition": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlState": {
+                    "type": "string"
+                },
+                "CrawlerName": {
+                    "type": "string"
+                },
+                "JobName": {
+                    "type": "string"
+                },
+                "LogicalOperator": {
+                    "type": "string"
+                },
+                "State": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Trigger.NotificationProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "NotifyDelayAfter": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Trigger.Predicate": {
+            "additionalProperties": false,
+            "properties": {
+                "Conditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Glue::Trigger.Condition"
+                    },
+                    "type": "array"
+                },
+                "Logical": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Glue::Workflow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "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::Greengrass::ConnectorDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::ConnectorDefinition.ConnectorDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::ConnectorDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ConnectorDefinition.Connector": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "ConnectorArn",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ConnectorDefinition.ConnectorDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Connectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::ConnectorDefinition.Connector"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Connectors"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ConnectorDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectorDefinitionId": {
+                            "type": "string"
+                        },
+                        "Connectors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::ConnectorDefinitionVersion.Connector"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConnectorDefinitionId",
+                        "Connectors"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::ConnectorDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ConnectorDefinitionVersion.Connector": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "ConnectorArn",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::CoreDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::CoreDefinition.CoreDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::CoreDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::CoreDefinition.Core": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "SyncShadow": {
+                    "type": "boolean"
+                },
+                "ThingArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn",
+                "Id",
+                "ThingArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::CoreDefinition.CoreDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Cores": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::CoreDefinition.Core"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Cores"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::CoreDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CoreDefinitionId": {
+                            "type": "string"
+                        },
+                        "Cores": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::CoreDefinitionVersion.Core"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CoreDefinitionId",
+                        "Cores"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::CoreDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::CoreDefinitionVersion.Core": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "SyncShadow": {
+                    "type": "boolean"
+                },
+                "ThingArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn",
+                "Id",
+                "ThingArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::DeviceDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::DeviceDefinition.DeviceDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::DeviceDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::DeviceDefinition.Device": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "SyncShadow": {
+                    "type": "boolean"
+                },
+                "ThingArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn",
+                "Id",
+                "ThingArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::DeviceDefinition.DeviceDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Devices": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::DeviceDefinition.Device"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Devices"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::DeviceDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeviceDefinitionId": {
+                            "type": "string"
+                        },
+                        "Devices": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::DeviceDefinitionVersion.Device"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DeviceDefinitionId",
+                        "Devices"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::DeviceDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::DeviceDefinitionVersion.Device": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "SyncShadow": {
+                    "type": "boolean"
+                },
+                "ThingArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CertificateArn",
+                "Id",
+                "ThingArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.FunctionDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::FunctionDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.DefaultConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Execution": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.Execution"
+                }
+            },
+            "required": [
+                "Execution"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessSysfs": {
+                    "type": "boolean"
+                },
+                "Execution": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.Execution"
+                },
+                "ResourceAccessPolicies": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.ResourceAccessPolicy"
+                    },
+                    "type": "array"
+                },
+                "Variables": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.Execution": {
+            "additionalProperties": false,
+            "properties": {
+                "IsolationMode": {
+                    "type": "string"
+                },
+                "RunAs": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.RunAs"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.Function": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionArn": {
+                    "type": "string"
+                },
+                "FunctionConfiguration": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.FunctionConfiguration"
+                },
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FunctionArn",
+                "FunctionConfiguration",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.FunctionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncodingType": {
+                    "type": "string"
+                },
+                "Environment": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.Environment"
+                },
+                "ExecArgs": {
+                    "type": "string"
+                },
+                "Executable": {
+                    "type": "string"
+                },
+                "MemorySize": {
+                    "type": "number"
+                },
+                "Pinned": {
+                    "type": "boolean"
+                },
+                "Timeout": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.FunctionDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultConfig": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.DefaultConfig"
+                },
+                "Functions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition.Function"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Functions"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.ResourceAccessPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Permission": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceId"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinition.RunAs": {
+            "additionalProperties": false,
+            "properties": {
+                "Gid": {
+                    "type": "number"
+                },
+                "Uid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DefaultConfig": {
+                            "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.DefaultConfig"
+                        },
+                        "FunctionDefinitionId": {
+                            "type": "string"
+                        },
+                        "Functions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.Function"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FunctionDefinitionId",
+                        "Functions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::FunctionDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.DefaultConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Execution": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.Execution"
+                }
+            },
+            "required": [
+                "Execution"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessSysfs": {
+                    "type": "boolean"
+                },
+                "Execution": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.Execution"
+                },
+                "ResourceAccessPolicies": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.ResourceAccessPolicy"
+                    },
+                    "type": "array"
+                },
+                "Variables": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.Execution": {
+            "additionalProperties": false,
+            "properties": {
+                "IsolationMode": {
+                    "type": "string"
+                },
+                "RunAs": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.RunAs"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.Function": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionArn": {
+                    "type": "string"
+                },
+                "FunctionConfiguration": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.FunctionConfiguration"
+                },
+                "Id": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FunctionArn",
+                "FunctionConfiguration",
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.FunctionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EncodingType": {
+                    "type": "string"
+                },
+                "Environment": {
+                    "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion.Environment"
+                },
+                "ExecArgs": {
+                    "type": "string"
+                },
+                "Executable": {
+                    "type": "string"
+                },
+                "MemorySize": {
+                    "type": "number"
+                },
+                "Pinned": {
+                    "type": "boolean"
+                },
+                "Timeout": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.ResourceAccessPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "Permission": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceId"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::FunctionDefinitionVersion.RunAs": {
+            "additionalProperties": false,
+            "properties": {
+                "Gid": {
+                    "type": "number"
+                },
+                "Uid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::Group": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::Group.GroupVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::Group"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::Group.GroupVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectorDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "CoreDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "DeviceDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "FunctionDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "LoggerDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "ResourceDefinitionVersionArn": {
+                    "type": "string"
+                },
+                "SubscriptionDefinitionVersionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::GroupVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectorDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "CoreDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "DeviceDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "FunctionDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "GroupId": {
+                            "type": "string"
+                        },
+                        "LoggerDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "ResourceDefinitionVersionArn": {
+                            "type": "string"
+                        },
+                        "SubscriptionDefinitionVersionArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::GroupVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::LoggerDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::LoggerDefinition.LoggerDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::LoggerDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::LoggerDefinition.Logger": {
+            "additionalProperties": false,
+            "properties": {
+                "Component": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Level": {
+                    "type": "string"
+                },
+                "Space": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Component",
+                "Id",
+                "Level",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::LoggerDefinition.LoggerDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Loggers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::LoggerDefinition.Logger"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Loggers"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::LoggerDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LoggerDefinitionId": {
+                            "type": "string"
+                        },
+                        "Loggers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::LoggerDefinitionVersion.Logger"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "LoggerDefinitionId",
+                        "Loggers"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::LoggerDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::LoggerDefinitionVersion.Logger": {
+            "additionalProperties": false,
+            "properties": {
+                "Component": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Level": {
+                    "type": "string"
+                },
+                "Space": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Component",
+                "Id",
+                "Level",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.ResourceDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::ResourceDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.GroupOwnerSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoAddGroupOwner": {
+                    "type": "boolean"
+                },
+                "GroupOwner": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AutoAddGroupOwner"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.LocalDeviceResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupOwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.GroupOwnerSetting"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourcePath"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.LocalVolumeResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "GroupOwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.GroupOwnerSetting"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "SourcePath"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.ResourceDataContainer": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalDeviceResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.LocalDeviceResourceData"
+                },
+                "LocalVolumeResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.LocalVolumeResourceData"
+                },
+                "S3MachineLearningModelResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.S3MachineLearningModelResourceData"
+                },
+                "SageMakerMachineLearningModelResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.SageMakerMachineLearningModelResourceData"
+                },
+                "SecretsManagerSecretResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.SecretsManagerSecretResourceData"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.ResourceDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Resources": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.ResourceInstance"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Resources"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.ResourceDownloadOwnerSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupOwner": {
+                    "type": "string"
+                },
+                "GroupPermission": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupOwner",
+                "GroupPermission"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.ResourceInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "ResourceDataContainer": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.ResourceDataContainer"
+                }
+            },
+            "required": [
+                "Id",
+                "Name",
+                "ResourceDataContainer"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.S3MachineLearningModelResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "OwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.ResourceDownloadOwnerSetting"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.SageMakerMachineLearningModelResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "OwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition.ResourceDownloadOwnerSetting"
+                },
+                "SageMakerJobArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "SageMakerJobArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinition.SecretsManagerSecretResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "ARN": {
+                    "type": "string"
+                },
+                "AdditionalStagingLabelsToDownload": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ARN"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceDefinitionId": {
+                            "type": "string"
+                        },
+                        "Resources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.ResourceInstance"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ResourceDefinitionId",
+                        "Resources"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::ResourceDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.GroupOwnerSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoAddGroupOwner": {
+                    "type": "boolean"
+                },
+                "GroupOwner": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AutoAddGroupOwner"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.LocalDeviceResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupOwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.GroupOwnerSetting"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourcePath"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.LocalVolumeResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "GroupOwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.GroupOwnerSetting"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "SourcePath"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.ResourceDataContainer": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalDeviceResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.LocalDeviceResourceData"
+                },
+                "LocalVolumeResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.LocalVolumeResourceData"
+                },
+                "S3MachineLearningModelResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.S3MachineLearningModelResourceData"
+                },
+                "SageMakerMachineLearningModelResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.SageMakerMachineLearningModelResourceData"
+                },
+                "SecretsManagerSecretResourceData": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.SecretsManagerSecretResourceData"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.ResourceDownloadOwnerSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupOwner": {
+                    "type": "string"
+                },
+                "GroupPermission": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupOwner",
+                "GroupPermission"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.ResourceInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "ResourceDataContainer": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.ResourceDataContainer"
+                }
+            },
+            "required": [
+                "Id",
+                "Name",
+                "ResourceDataContainer"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.S3MachineLearningModelResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "OwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.ResourceDownloadOwnerSetting"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.SageMakerMachineLearningModelResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "OwnerSetting": {
+                    "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion.ResourceDownloadOwnerSetting"
+                },
+                "SageMakerJobArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationPath",
+                "SageMakerJobArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::ResourceDefinitionVersion.SecretsManagerSecretResourceData": {
+            "additionalProperties": false,
+            "properties": {
+                "ARN": {
+                    "type": "string"
+                },
+                "AdditionalStagingLabelsToDownload": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ARN"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::SubscriptionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InitialVersion": {
+                            "$ref": "#/definitions/AWS::Greengrass::SubscriptionDefinition.SubscriptionDefinitionVersion"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::SubscriptionDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::SubscriptionDefinition.Subscription": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Subject": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id",
+                "Source",
+                "Subject",
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::SubscriptionDefinition.SubscriptionDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Subscriptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Greengrass::SubscriptionDefinition.Subscription"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Subscriptions"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::SubscriptionDefinitionVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SubscriptionDefinitionId": {
+                            "type": "string"
+                        },
+                        "Subscriptions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Greengrass::SubscriptionDefinitionVersion.Subscription"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubscriptionDefinitionId",
+                        "Subscriptions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Greengrass::SubscriptionDefinitionVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Greengrass::SubscriptionDefinitionVersion.Subscription": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "Subject": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id",
+                "Source",
+                "Subject",
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InlineRecipe": {
+                            "type": "string"
+                        },
+                        "LambdaFunction": {
+                            "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaFunctionRecipeSource"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GreengrassV2::ComponentVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.ComponentDependencyRequirement": {
+            "additionalProperties": false,
+            "properties": {
+                "DependencyType": {
+                    "type": "string"
+                },
+                "VersionRequirement": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.ComponentPlatform": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaContainerParams": {
+            "additionalProperties": false,
+            "properties": {
+                "Devices": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaDeviceMount"
+                    },
+                    "type": "array"
+                },
+                "MemorySizeInKB": {
+                    "type": "number"
+                },
+                "MountROSysfs": {
+                    "type": "boolean"
+                },
+                "Volumes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaVolumeMount"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaDeviceMount": {
+            "additionalProperties": false,
+            "properties": {
+                "AddGroupOwner": {
+                    "type": "boolean"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "Permission": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaEventSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Topic": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaExecutionParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "EnvironmentVariables": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "EventSources": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaEventSource"
+                    },
+                    "type": "array"
+                },
+                "ExecArgs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InputPayloadEncodingType": {
+                    "type": "string"
+                },
+                "LinuxProcessParams": {
+                    "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaLinuxProcessParams"
+                },
+                "MaxIdleTimeInSeconds": {
+                    "type": "number"
+                },
+                "MaxInstancesCount": {
+                    "type": "number"
+                },
+                "MaxQueueSize": {
+                    "type": "number"
+                },
+                "Pinned": {
+                    "type": "boolean"
+                },
+                "StatusTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "TimeoutInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaFunctionRecipeSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentDependencies": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.ComponentDependencyRequirement"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ComponentLambdaParameters": {
+                    "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaExecutionParameters"
+                },
+                "ComponentName": {
+                    "type": "string"
+                },
+                "ComponentPlatforms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.ComponentPlatform"
+                    },
+                    "type": "array"
+                },
+                "ComponentVersion": {
+                    "type": "string"
+                },
+                "LambdaArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaLinuxProcessParams": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerParams": {
+                    "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion.LambdaContainerParams"
+                },
+                "IsolationMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GreengrassV2::ComponentVersion.LambdaVolumeMount": {
+            "additionalProperties": false,
+            "properties": {
+                "AddGroupOwner": {
+                    "type": "boolean"
+                },
+                "DestinationPath": {
+                    "type": "string"
+                },
+                "Permission": {
+                    "type": "string"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigData": {
+                            "$ref": "#/definitions/AWS::GroundStation::Config.ConfigData"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConfigData",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GroundStation::Config"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.AntennaDownlinkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SpectrumConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.SpectrumConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.AntennaDownlinkDemodDecodeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DecodeConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.DecodeConfig"
+                },
+                "DemodulationConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.DemodulationConfig"
+                },
+                "SpectrumConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.SpectrumConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.AntennaUplinkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SpectrumConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.UplinkSpectrumConfig"
+                },
+                "TargetEirp": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.Eirp"
+                },
+                "TransmitDisabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.ConfigData": {
+            "additionalProperties": false,
+            "properties": {
+                "AntennaDownlinkConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.AntennaDownlinkConfig"
+                },
+                "AntennaDownlinkDemodDecodeConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.AntennaDownlinkDemodDecodeConfig"
+                },
+                "AntennaUplinkConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.AntennaUplinkConfig"
+                },
+                "DataflowEndpointConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.DataflowEndpointConfig"
+                },
+                "S3RecordingConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.S3RecordingConfig"
+                },
+                "TrackingConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.TrackingConfig"
+                },
+                "UplinkEchoConfig": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.UplinkEchoConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.DataflowEndpointConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DataflowEndpointName": {
+                    "type": "string"
+                },
+                "DataflowEndpointRegion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.DecodeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "UnvalidatedJSON": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.DemodulationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "UnvalidatedJSON": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.Eirp": {
+            "additionalProperties": false,
+            "properties": {
+                "Units": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.Frequency": {
+            "additionalProperties": false,
+            "properties": {
+                "Units": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.FrequencyBandwidth": {
+            "additionalProperties": false,
+            "properties": {
+                "Units": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.S3RecordingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketArn": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.SpectrumConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Bandwidth": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.FrequencyBandwidth"
+                },
+                "CenterFrequency": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.Frequency"
+                },
+                "Polarization": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.TrackingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Autotrack": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.UplinkEchoConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AntennaUplinkConfigArn": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::Config.UplinkSpectrumConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CenterFrequency": {
+                    "$ref": "#/definitions/AWS::GroundStation::Config.Frequency"
+                },
+                "Polarization": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::DataflowEndpointGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EndpointDetails": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GroundStation::DataflowEndpointGroup.EndpointDetails"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EndpointDetails"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GroundStation::DataflowEndpointGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GroundStation::DataflowEndpointGroup.DataflowEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "$ref": "#/definitions/AWS::GroundStation::DataflowEndpointGroup.SocketAddress"
+                },
+                "Mtu": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::DataflowEndpointGroup.EndpointDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "$ref": "#/definitions/AWS::GroundStation::DataflowEndpointGroup.DataflowEndpoint"
+                },
+                "SecurityDetails": {
+                    "$ref": "#/definitions/AWS::GroundStation::DataflowEndpointGroup.SecurityDetails"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::DataflowEndpointGroup.SecurityDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::DataflowEndpointGroup.SocketAddress": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GroundStation::MissionProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContactPostPassDurationSeconds": {
+                            "type": "number"
+                        },
+                        "ContactPrePassDurationSeconds": {
+                            "type": "number"
+                        },
+                        "DataflowEdges": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::GroundStation::MissionProfile.DataflowEdge"
+                            },
+                            "type": "array"
+                        },
+                        "MinimumViableContactDurationSeconds": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TrackingConfigArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DataflowEdges",
+                        "MinimumViableContactDurationSeconds",
+                        "Name",
+                        "TrackingConfigArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GroundStation::MissionProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GroundStation::MissionProfile.DataflowEdge": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::Detector": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataSources": {
+                            "$ref": "#/definitions/AWS::GuardDuty::Detector.CFNDataSourceConfigurations"
+                        },
+                        "Enable": {
+                            "type": "boolean"
+                        },
+                        "FindingPublishingFrequency": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Enable"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::Detector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Detector.CFNDataSourceConfigurations": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Logs": {
+                    "$ref": "#/definitions/AWS::GuardDuty::Detector.CFNS3LogsConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::Detector.CFNS3LogsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enable": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::Filter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "FindingCriteria": {
+                            "$ref": "#/definitions/AWS::GuardDuty::Filter.FindingCriteria"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Rank": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Action",
+                        "Description",
+                        "DetectorId",
+                        "FindingCriteria",
+                        "Name",
+                        "Rank"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::Filter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Filter.Condition": {
+            "additionalProperties": false,
+            "properties": {
+                "Eq": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Gte": {
+                    "type": "number"
+                },
+                "Lt": {
+                    "type": "number"
+                },
+                "Lte": {
+                    "type": "number"
+                },
+                "Neq": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::Filter.FindingCriteria": {
+            "additionalProperties": false,
+            "properties": {
+                "Criterion": {
+                    "type": "object"
+                },
+                "ItemType": {
+                    "$ref": "#/definitions/AWS::GuardDuty::Filter.Condition"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::GuardDuty::IPSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Activate": {
+                            "type": "boolean"
+                        },
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "Format": {
+                            "type": "string"
+                        },
+                        "Location": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Activate",
+                        "DetectorId",
+                        "Format",
+                        "Location"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::IPSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Master": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "InvitationId": {
+                            "type": "string"
+                        },
+                        "MasterId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DetectorId",
+                        "MasterId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::Master"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::Member": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "DisableEmailNotification": {
+                            "type": "boolean"
+                        },
+                        "Email": {
+                            "type": "string"
+                        },
+                        "MemberId": {
+                            "type": "string"
+                        },
+                        "Message": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DetectorId",
+                        "Email",
+                        "MemberId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::Member"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::GuardDuty::ThreatIntelSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Activate": {
+                            "type": "boolean"
+                        },
+                        "DetectorId": {
+                            "type": "string"
+                        },
+                        "Format": {
+                            "type": "string"
+                        },
+                        "Location": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Activate",
+                        "DetectorId",
+                        "Format",
+                        "Location"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::GuardDuty::ThreatIntelSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DatastoreTypeVersion": {
+                            "type": "string"
+                        },
+                        "PreloadDataConfig": {
+                            "$ref": "#/definitions/AWS::HealthLake::FHIRDatastore.PreloadDataConfig"
+                        },
+                        "SseConfiguration": {
+                            "$ref": "#/definitions/AWS::HealthLake::FHIRDatastore.SseConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DatastoreTypeVersion"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::HealthLake::FHIRDatastore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore.KmsEncryptionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CmkType": {
+                    "type": "string"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CmkType"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore.PreloadDataConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "PreloadDataType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PreloadDataType"
+            ],
+            "type": "object"
+        },
+        "AWS::HealthLake::FHIRDatastore.SseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsEncryptionConfig": {
+                    "$ref": "#/definitions/AWS::HealthLake::FHIRDatastore.KmsEncryptionConfig"
+                }
+            },
+            "required": [
+                "KmsEncryptionConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::AccessKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Serial": {
+                            "type": "number"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::AccessKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::Group": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "ManagedPolicyArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IAM::Group.Policy"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::Group"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::Group.Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "PolicyDocument": {
+                    "type": "object"
+                },
+                "PolicyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PolicyDocument",
+                "PolicyName"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::InstanceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InstanceProfileName": {
+                            "type": "string"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "Roles": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Roles"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::InstanceProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::ManagedPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Groups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ManagedPolicyName": {
+                            "type": "string"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "Roles": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Users": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::ManagedPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::OIDCProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClientIdList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThumbprintList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Url": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ThumbprintList"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::OIDCProvider"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Groups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "PolicyName": {
+                            "type": "string"
+                        },
+                        "Roles": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Users": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument",
+                        "PolicyName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::Policy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::Role": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssumeRolePolicyDocument": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ManagedPolicyArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MaxSessionDuration": {
+                            "type": "number"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "PermissionsBoundary": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IAM::Role.Policy"
+                            },
+                            "type": "array"
+                        },
+                        "RoleName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AssumeRolePolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::Role"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::Role.Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "PolicyDocument": {
+                    "type": "object"
+                },
+                "PolicyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PolicyDocument",
+                "PolicyName"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::SAMLProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SamlMetadataDocument": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SamlMetadataDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::SAMLProvider"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::ServerCertificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CertificateBody": {
+                            "type": "string"
+                        },
+                        "CertificateChain": {
+                            "type": "string"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "PrivateKey": {
+                            "type": "string"
+                        },
+                        "ServerCertificateName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::ServerCertificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::ServiceLinkedRole": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AWSServiceName": {
+                            "type": "string"
+                        },
+                        "CustomSuffix": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AWSServiceName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::ServiceLinkedRole"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Groups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LoginProfile": {
+                            "$ref": "#/definitions/AWS::IAM::User.LoginProfile"
+                        },
+                        "ManagedPolicyArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Path": {
+                            "type": "string"
+                        },
+                        "PermissionsBoundary": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IAM::User.Policy"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::User.LoginProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "PasswordResetRequired": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Password"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::User.Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "PolicyDocument": {
+                    "type": "object"
+                },
+                "PolicyName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PolicyDocument",
+                "PolicyName"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::UserToGroupAddition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "Users": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "GroupName",
+                        "Users"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::UserToGroupAddition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IAM::VirtualMFADevice": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Path": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Users": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VirtualMfaDeviceName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Users"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IAM::VirtualMFADevice"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Authorized": {
+                            "type": "boolean"
+                        },
+                        "LatencyMode": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RecordingConfigurationArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::Channel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::PlaybackKeyPair": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "PublicKeyMaterial": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PublicKeyMaterial"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::PlaybackKeyPair"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::RecordingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.DestinationConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DestinationConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::RecordingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::RecordingConfiguration.DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3": {
+                    "$ref": "#/definitions/AWS::IVS::RecordingConfiguration.S3DestinationConfiguration"
+                }
+            },
+            "required": [
+                "S3"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::RecordingConfiguration.S3DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::IVS::StreamKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ChannelArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ChannelArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IVS::StreamKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::Component": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ChangeDescription": {
+                            "type": "string"
+                        },
+                        "Data": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Platform": {
+                            "type": "string"
+                        },
+                        "SupportedOsVersions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Uri": {
+                            "type": "string"
+                        },
+                        "Version": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Platform",
+                        "Version"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::Component"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Components": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe.ComponentConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "ContainerType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DockerfileTemplateData": {
+                            "type": "string"
+                        },
+                        "DockerfileTemplateUri": {
+                            "type": "string"
+                        },
+                        "ImageOsVersionOverride": {
+                            "type": "string"
+                        },
+                        "InstanceConfiguration": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe.InstanceConfiguration"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParentImage": {
+                            "type": "string"
+                        },
+                        "PlatformOverride": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "TargetRepository": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe.TargetContainerRepository"
+                        },
+                        "Version": {
+                            "type": "string"
+                        },
+                        "WorkingDirectory": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Components",
+                        "ContainerType",
+                        "Name",
+                        "ParentImage",
+                        "TargetRepository",
+                        "Version"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::ContainerRecipe"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe.ComponentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe.EbsInstanceBlockDeviceSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "Throughput": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe.InstanceBlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe.EbsInstanceBlockDeviceSpecification"
+                },
+                "NoDevice": {
+                    "type": "string"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe.InstanceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockDeviceMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe.InstanceBlockDeviceMapping"
+                    },
+                    "type": "array"
+                },
+                "Image": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ContainerRecipe.TargetContainerRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "RepositoryName": {
+                    "type": "string"
+                },
+                "Service": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::DistributionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Distributions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ImageBuilder::DistributionConfiguration.Distribution"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Distributions",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::DistributionConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::DistributionConfiguration.Distribution": {
+            "additionalProperties": false,
+            "properties": {
+                "AmiDistributionConfiguration": {
+                    "type": "object"
+                },
+                "ContainerDistributionConfiguration": {
+                    "type": "object"
+                },
+                "LaunchTemplateConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ImageBuilder::DistributionConfiguration.LaunchTemplateConfiguration"
+                    },
+                    "type": "array"
+                },
+                "LicenseConfigurationArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::DistributionConfiguration.LaunchTemplateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "LaunchTemplateId": {
+                    "type": "string"
+                },
+                "SetDefaultVersion": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::Image": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContainerRecipeArn": {
+                            "type": "string"
+                        },
+                        "DistributionConfigurationArn": {
+                            "type": "string"
+                        },
+                        "EnhancedImageMetadataEnabled": {
+                            "type": "boolean"
+                        },
+                        "ImageRecipeArn": {
+                            "type": "string"
+                        },
+                        "ImageTestsConfiguration": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::Image.ImageTestsConfiguration"
+                        },
+                        "InfrastructureConfigurationArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "InfrastructureConfigurationArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::Image"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::Image.ImageTestsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ImageTestsEnabled": {
+                    "type": "boolean"
+                },
+                "TimeoutMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImagePipeline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContainerRecipeArn": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DistributionConfigurationArn": {
+                            "type": "string"
+                        },
+                        "EnhancedImageMetadataEnabled": {
+                            "type": "boolean"
+                        },
+                        "ImageRecipeArn": {
+                            "type": "string"
+                        },
+                        "ImageTestsConfiguration": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ImagePipeline.ImageTestsConfiguration"
+                        },
+                        "InfrastructureConfigurationArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ImagePipeline.Schedule"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "InfrastructureConfigurationArn",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::ImagePipeline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImagePipeline.ImageTestsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ImageTestsEnabled": {
+                    "type": "boolean"
+                },
+                "TimeoutMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImagePipeline.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "PipelineExecutionStartCondition": {
+                    "type": "string"
+                },
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdditionalInstanceConfiguration": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.AdditionalInstanceConfiguration"
+                        },
+                        "BlockDeviceMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.InstanceBlockDeviceMapping"
+                            },
+                            "type": "array"
+                        },
+                        "Components": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.ComponentConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ParentImage": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Version": {
+                            "type": "string"
+                        },
+                        "WorkingDirectory": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Components",
+                        "Name",
+                        "ParentImage",
+                        "Version"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::ImageRecipe"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.AdditionalInstanceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SystemsManagerAgent": {
+                    "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.SystemsManagerAgent"
+                },
+                "UserDataOverride": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.ComponentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentArn": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.ComponentParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.ComponentParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.EbsInstanceBlockDeviceSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "Throughput": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.InstanceBlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe.EbsInstanceBlockDeviceSpecification"
+                },
+                "NoDevice": {
+                    "type": "string"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::ImageRecipe.SystemsManagerAgent": {
+            "additionalProperties": false,
+            "properties": {
+                "UninstallAfterBuild": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::InfrastructureConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "InstanceMetadataOptions": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::InfrastructureConfiguration.InstanceMetadataOptions"
+                        },
+                        "InstanceProfileName": {
+                            "type": "string"
+                        },
+                        "InstanceTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "KeyPair": {
+                            "type": "string"
+                        },
+                        "Logging": {
+                            "$ref": "#/definitions/AWS::ImageBuilder::InfrastructureConfiguration.Logging"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResourceTags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "TerminateInstanceOnFailure": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "InstanceProfileName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ImageBuilder::InfrastructureConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ImageBuilder::InfrastructureConfiguration.InstanceMetadataOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpPutResponseHopLimit": {
+                    "type": "number"
+                },
+                "HttpTokens": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::InfrastructureConfiguration.Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Logs": {
+                    "$ref": "#/definitions/AWS::ImageBuilder::InfrastructureConfiguration.S3Logs"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ImageBuilder::InfrastructureConfiguration.S3Logs": {
+            "additionalProperties": false,
+            "properties": {
+                "S3BucketName": {
+                    "type": "string"
+                },
+                "S3KeyPrefix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Inspector::AssessmentTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssessmentTargetName": {
+                            "type": "string"
+                        },
+                        "ResourceGroupArn": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Inspector::AssessmentTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Inspector::AssessmentTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssessmentTargetArn": {
+                            "type": "string"
+                        },
+                        "AssessmentTemplateName": {
+                            "type": "string"
+                        },
+                        "DurationInSeconds": {
+                            "type": "number"
+                        },
+                        "RulesPackageArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "UserAttributesForFindings": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AssessmentTargetArn",
+                        "DurationInSeconds",
+                        "RulesPackageArns"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Inspector::AssessmentTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Inspector::ResourceGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceGroupTags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ResourceGroupTags"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Inspector::ResourceGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT1Click::Device": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeviceId": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "DeviceId",
+                        "Enabled"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT1Click::Device"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT1Click::Placement": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatedDevices": {
+                            "type": "object"
+                        },
+                        "Attributes": {
+                            "type": "object"
+                        },
+                        "PlacementName": {
+                            "type": "string"
+                        },
+                        "ProjectName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProjectName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT1Click::Placement"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT1Click::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "PlacementTemplate": {
+                            "$ref": "#/definitions/AWS::IoT1Click::Project.PlacementTemplate"
+                        },
+                        "ProjectName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PlacementTemplate"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT1Click::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT1Click::Project.DeviceTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "CallbackOverrides": {
+                    "type": "object"
+                },
+                "DeviceType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT1Click::Project.PlacementTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultAttributes": {
+                    "type": "object"
+                },
+                "DeviceTemplates": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::AccountAuditConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountId": {
+                            "type": "string"
+                        },
+                        "AuditCheckConfigurations": {
+                            "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfigurations"
+                        },
+                        "AuditNotificationTargetConfigurations": {
+                            "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditNotificationTargetConfigurations"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AccountId",
+                        "AuditCheckConfigurations",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::AccountAuditConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::AccountAuditConfiguration.AuditCheckConfigurations": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticatedCognitoRoleOverlyPermissiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "CaCertificateExpiringCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "CaCertificateKeyQualityCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "ConflictingClientIdsCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "DeviceCertificateExpiringCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "DeviceCertificateKeyQualityCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "DeviceCertificateSharedCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "IotPolicyOverlyPermissiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "IotRoleAliasAllowsAccessToUnusedServicesCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "IotRoleAliasOverlyPermissiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "LoggingDisabledCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "RevokedCaCertificateStillActiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "RevokedDeviceCertificateStillActiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                },
+                "UnauthenticatedCognitoRoleOverlyPermissiveCheck": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditCheckConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::AccountAuditConfiguration.AuditNotificationTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TargetArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::AccountAuditConfiguration.AuditNotificationTargetConfigurations": {
+            "additionalProperties": false,
+            "properties": {
+                "Sns": {
+                    "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration.AuditNotificationTarget"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::Authorizer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthorizerFunctionArn": {
+                            "type": "string"
+                        },
+                        "AuthorizerName": {
+                            "type": "string"
+                        },
+                        "SigningDisabled": {
+                            "type": "boolean"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TokenKeyName": {
+                            "type": "string"
+                        },
+                        "TokenSigningPublicKeys": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "AuthorizerFunctionArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Authorizer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::Certificate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CACertificatePem": {
+                            "type": "string"
+                        },
+                        "CertificateMode": {
+                            "type": "string"
+                        },
+                        "CertificatePem": {
+                            "type": "string"
+                        },
+                        "CertificateSigningRequest": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Status"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Certificate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::CustomMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "MetricType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MetricType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::CustomMetric"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "StringValues": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "StringValues",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Dimension"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::DomainConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthorizerConfig": {
+                            "$ref": "#/definitions/AWS::IoT::DomainConfiguration.AuthorizerConfig"
+                        },
+                        "DomainConfigurationName": {
+                            "type": "string"
+                        },
+                        "DomainConfigurationStatus": {
+                            "type": "string"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "ServerCertificateArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ValidationCertificateArn": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::DomainConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::DomainConfiguration.AuthorizerConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowAuthorizerOverride": {
+                    "type": "boolean"
+                },
+                "DefaultAuthorizerName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::DomainConfiguration.ServerCertificateSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "ServerCertificateArn": {
+                    "type": "string"
+                },
+                "ServerCertificateStatus": {
+                    "type": "string"
+                },
+                "ServerCertificateStatusDetail": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::FleetMetric": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AggregationField": {
+                            "type": "string"
+                        },
+                        "AggregationType": {
+                            "$ref": "#/definitions/AWS::IoT::FleetMetric.AggregationType"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IndexName": {
+                            "type": "string"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Period": {
+                            "type": "number"
+                        },
+                        "QueryString": {
+                            "type": "string"
+                        },
+                        "QueryVersion": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Unit": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MetricName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::FleetMetric"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::FleetMetric.AggregationType": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::JobTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AbortConfig": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Document": {
+                            "type": "string"
+                        },
+                        "DocumentSource": {
+                            "type": "string"
+                        },
+                        "JobArn": {
+                            "type": "string"
+                        },
+                        "JobExecutionsRolloutConfig": {
+                            "type": "object"
+                        },
+                        "JobTemplateId": {
+                            "type": "string"
+                        },
+                        "PresignedUrlConfig": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeoutConfig": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "JobTemplateId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::JobTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::Logging": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountId": {
+                            "type": "string"
+                        },
+                        "DefaultLogLevel": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AccountId",
+                        "DefaultLogLevel",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Logging"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ActionName": {
+                            "type": "string"
+                        },
+                        "ActionParams": {
+                            "$ref": "#/definitions/AWS::IoT::MitigationAction.ActionParams"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ActionParams",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::MitigationAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.ActionParams": {
+            "additionalProperties": false,
+            "properties": {
+                "AddThingsToThingGroupParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.AddThingsToThingGroupParams"
+                },
+                "EnableIoTLoggingParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.EnableIoTLoggingParams"
+                },
+                "PublishFindingToSnsParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.PublishFindingToSnsParams"
+                },
+                "ReplaceDefaultPolicyVersionParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.ReplaceDefaultPolicyVersionParams"
+                },
+                "UpdateCACertificateParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.UpdateCACertificateParams"
+                },
+                "UpdateDeviceCertificateParams": {
+                    "$ref": "#/definitions/AWS::IoT::MitigationAction.UpdateDeviceCertificateParams"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.AddThingsToThingGroupParams": {
+            "additionalProperties": false,
+            "properties": {
+                "OverrideDynamicGroups": {
+                    "type": "boolean"
+                },
+                "ThingGroupNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ThingGroupNames"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.EnableIoTLoggingParams": {
+            "additionalProperties": false,
+            "properties": {
+                "LogLevel": {
+                    "type": "string"
+                },
+                "RoleArnForLogging": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogLevel",
+                "RoleArnForLogging"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.PublishFindingToSnsParams": {
+            "additionalProperties": false,
+            "properties": {
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.ReplaceDefaultPolicyVersionParams": {
+            "additionalProperties": false,
+            "properties": {
+                "TemplateName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TemplateName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.UpdateCACertificateParams": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::MitigationAction.UpdateDeviceCertificateParams": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::Policy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "PolicyName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Policy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::PolicyPrincipalAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyName": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PolicyName",
+                        "Principal"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::PolicyPrincipalAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::ProvisioningTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "PreProvisioningHook": {
+                            "$ref": "#/definitions/AWS::IoT::ProvisioningTemplate.ProvisioningHook"
+                        },
+                        "ProvisioningRoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateBody": {
+                            "type": "string"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProvisioningRoleArn",
+                        "TemplateBody"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::ProvisioningTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::ProvisioningTemplate.ProvisioningHook": {
+            "additionalProperties": false,
+            "properties": {
+                "PayloadVersion": {
+                    "type": "string"
+                },
+                "TargetArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::ResourceSpecificLogging": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LogLevel": {
+                            "type": "string"
+                        },
+                        "TargetName": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LogLevel",
+                        "TargetName",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::ResourceSpecificLogging"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::ScheduledAudit": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DayOfMonth": {
+                            "type": "string"
+                        },
+                        "DayOfWeek": {
+                            "type": "string"
+                        },
+                        "Frequency": {
+                            "type": "string"
+                        },
+                        "ScheduledAuditName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetCheckNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Frequency",
+                        "TargetCheckNames"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::ScheduledAudit"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdditionalMetricsToRetainV2": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoT::SecurityProfile.MetricToRetain"
+                            },
+                            "type": "array"
+                        },
+                        "AlertTargets": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.AlertTarget"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Behaviors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoT::SecurityProfile.Behavior"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityProfileDescription": {
+                            "type": "string"
+                        },
+                        "SecurityProfileName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::SecurityProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.AlertTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "AlertTargetArn": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AlertTargetArn",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.Behavior": {
+            "additionalProperties": false,
+            "properties": {
+                "Criteria": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.BehaviorCriteria"
+                },
+                "Metric": {
+                    "type": "string"
+                },
+                "MetricDimension": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.MetricDimension"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SuppressAlerts": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.BehaviorCriteria": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "ConsecutiveDatapointsToAlarm": {
+                    "type": "number"
+                },
+                "ConsecutiveDatapointsToClear": {
+                    "type": "number"
+                },
+                "DurationSeconds": {
+                    "type": "number"
+                },
+                "MlDetectionConfig": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.MachineLearningDetectionConfig"
+                },
+                "StatisticalThreshold": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.StatisticalThreshold"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.MetricValue"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.MachineLearningDetectionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfidenceLevel": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionName": {
+                    "type": "string"
+                },
+                "Operator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DimensionName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.MetricToRetain": {
+            "additionalProperties": false,
+            "properties": {
+                "Metric": {
+                    "type": "string"
+                },
+                "MetricDimension": {
+                    "$ref": "#/definitions/AWS::IoT::SecurityProfile.MetricDimension"
+                }
+            },
+            "required": [
+                "Metric"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.MetricValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidrs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Count": {
+                    "type": "string"
+                },
+                "Number": {
+                    "type": "number"
+                },
+                "Numbers": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Ports": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Strings": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::SecurityProfile.StatisticalThreshold": {
+            "additionalProperties": false,
+            "properties": {
+                "Statistic": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::Thing": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AttributePayload": {
+                            "$ref": "#/definitions/AWS::IoT::Thing.AttributePayload"
+                        },
+                        "ThingName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::Thing"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::Thing.AttributePayload": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::ThingPrincipalAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Principal": {
+                            "type": "string"
+                        },
+                        "ThingName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Principal",
+                        "ThingName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::ThingPrincipalAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RuleName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TopicRulePayload": {
+                            "$ref": "#/definitions/AWS::IoT::TopicRule.TopicRulePayload"
+                        }
+                    },
+                    "required": [
+                        "TopicRulePayload"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::TopicRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudwatchAlarm": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.CloudwatchAlarmAction"
+                },
+                "CloudwatchLogs": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.CloudwatchLogsAction"
+                },
+                "CloudwatchMetric": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.CloudwatchMetricAction"
+                },
+                "DynamoDB": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.DynamoDBAction"
+                },
+                "DynamoDBv2": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.DynamoDBv2Action"
+                },
+                "Elasticsearch": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.ElasticsearchAction"
+                },
+                "Firehose": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.FirehoseAction"
+                },
+                "Http": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.HttpAction"
+                },
+                "IotAnalytics": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.IotAnalyticsAction"
+                },
+                "IotEvents": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.IotEventsAction"
+                },
+                "IotSiteWise": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.IotSiteWiseAction"
+                },
+                "Kafka": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.KafkaAction"
+                },
+                "Kinesis": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.KinesisAction"
+                },
+                "Lambda": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.LambdaAction"
+                },
+                "OpenSearch": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.OpenSearchAction"
+                },
+                "Republish": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.RepublishAction"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.S3Action"
+                },
+                "Sns": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.SnsAction"
+                },
+                "Sqs": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.SqsAction"
+                },
+                "StepFunctions": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.StepFunctionsAction"
+                },
+                "Timestream": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.TimestreamAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.AssetPropertyTimestamp": {
+            "additionalProperties": false,
+            "properties": {
+                "OffsetInNanos": {
+                    "type": "string"
+                },
+                "TimeInSeconds": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.AssetPropertyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Quality": {
+                    "type": "string"
+                },
+                "Timestamp": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.AssetPropertyTimestamp"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.AssetPropertyVariant"
+                }
+            },
+            "required": [
+                "Timestamp",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.AssetPropertyVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanValue": {
+                    "type": "string"
+                },
+                "DoubleValue": {
+                    "type": "string"
+                },
+                "IntegerValue": {
+                    "type": "string"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.CloudwatchAlarmAction": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StateReason": {
+                    "type": "string"
+                },
+                "StateValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AlarmName",
+                "RoleArn",
+                "StateReason",
+                "StateValue"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.CloudwatchLogsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogGroupName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.CloudwatchMetricAction": {
+            "additionalProperties": false,
+            "properties": {
+                "MetricName": {
+                    "type": "string"
+                },
+                "MetricNamespace": {
+                    "type": "string"
+                },
+                "MetricTimestamp": {
+                    "type": "string"
+                },
+                "MetricUnit": {
+                    "type": "string"
+                },
+                "MetricValue": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "MetricNamespace",
+                "MetricUnit",
+                "MetricValue",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.DynamoDBAction": {
+            "additionalProperties": false,
+            "properties": {
+                "HashKeyField": {
+                    "type": "string"
+                },
+                "HashKeyType": {
+                    "type": "string"
+                },
+                "HashKeyValue": {
+                    "type": "string"
+                },
+                "PayloadField": {
+                    "type": "string"
+                },
+                "RangeKeyField": {
+                    "type": "string"
+                },
+                "RangeKeyType": {
+                    "type": "string"
+                },
+                "RangeKeyValue": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HashKeyField",
+                "HashKeyValue",
+                "RoleArn",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.DynamoDBv2Action": {
+            "additionalProperties": false,
+            "properties": {
+                "PutItem": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.PutItemInput"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.ElasticsearchAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Index": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint",
+                "Id",
+                "Index",
+                "RoleArn",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.FirehoseAction": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchMode": {
+                    "type": "boolean"
+                },
+                "DeliveryStreamName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "Separator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStreamName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.HttpAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Auth": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.HttpAuthorization"
+                },
+                "ConfirmationUrl": {
+                    "type": "string"
+                },
+                "Headers": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoT::TopicRule.HttpActionHeader"
+                    },
+                    "type": "array"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.HttpActionHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.HttpAuthorization": {
+            "additionalProperties": false,
+            "properties": {
+                "Sigv4": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.SigV4Authorization"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.IotAnalyticsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchMode": {
+                    "type": "boolean"
+                },
+                "ChannelName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ChannelName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.IotEventsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchMode": {
+                    "type": "boolean"
+                },
+                "InputName": {
+                    "type": "string"
+                },
+                "MessageId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.IotSiteWiseAction": {
+            "additionalProperties": false,
+            "properties": {
+                "PutAssetPropertyValueEntries": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoT::TopicRule.PutAssetPropertyValueEntry"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PutAssetPropertyValueEntries",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.KafkaAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientProperties": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Partition": {
+                    "type": "string"
+                },
+                "Topic": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClientProperties",
+                "DestinationArn",
+                "Topic"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.KinesisAction": {
+            "additionalProperties": false,
+            "properties": {
+                "PartitionKey": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StreamName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "StreamName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.LambdaAction": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.OpenSearchAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Index": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint",
+                "Id",
+                "Index",
+                "RoleArn",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.PutAssetPropertyValueEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "AssetId": {
+                    "type": "string"
+                },
+                "EntryId": {
+                    "type": "string"
+                },
+                "PropertyAlias": {
+                    "type": "string"
+                },
+                "PropertyId": {
+                    "type": "string"
+                },
+                "PropertyValues": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoT::TopicRule.AssetPropertyValue"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "PropertyValues"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.PutItemInput": {
+            "additionalProperties": false,
+            "properties": {
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.RepublishAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Qos": {
+                    "type": "number"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "Topic": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "Topic"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.S3Action": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "CannedAcl": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName",
+                "Key",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.SigV4Authorization": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                },
+                "SigningRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "ServiceName",
+                "SigningRegion"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.SnsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "MessageFormat": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TargetArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "TargetArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.SqsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "QueueUrl": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "UseBase64": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "QueueUrl",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.StepFunctionsAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionNamePrefix": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StateMachineName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "StateMachineName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.TimestreamAction": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchMode": {
+                    "type": "boolean"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoT::TopicRule.TimestreamDimension"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "Timestamp": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.TimestreamTimestamp"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "Dimensions",
+                "RoleArn",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.TimestreamDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.TimestreamTimestamp": {
+            "additionalProperties": false,
+            "properties": {
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Unit",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRule.TopicRulePayload": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoT::TopicRule.Action"
+                    },
+                    "type": "array"
+                },
+                "AwsIotSqlVersion": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "ErrorAction": {
+                    "$ref": "#/definitions/AWS::IoT::TopicRule.Action"
+                },
+                "RuleDisabled": {
+                    "type": "boolean"
+                },
+                "Sql": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Sql"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRuleDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HttpUrlProperties": {
+                            "$ref": "#/definitions/AWS::IoT::TopicRuleDestination.HttpUrlDestinationSummary"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "VpcProperties": {
+                            "$ref": "#/definitions/AWS::IoT::TopicRuleDestination.VpcDestinationProperties"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoT::TopicRuleDestination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoT::TopicRuleDestination.HttpUrlDestinationSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfirmationUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoT::TopicRuleDestination.VpcDestinationProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ChannelName": {
+                            "type": "string"
+                        },
+                        "ChannelStorage": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Channel.ChannelStorage"
+                        },
+                        "RetentionPeriod": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Channel.RetentionPeriod"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTAnalytics::Channel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Channel.ChannelStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomerManagedS3": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Channel.CustomerManagedS3"
+                },
+                "ServiceManagedS3": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Channel.ServiceManagedS3"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Channel.CustomerManagedS3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "KeyPrefix": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Channel.RetentionPeriod": {
+            "additionalProperties": false,
+            "properties": {
+                "NumberOfDays": {
+                    "type": "number"
+                },
+                "Unlimited": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Channel.ServiceManagedS3": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                                "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.Action"
+                            },
+                            "type": "array"
+                        },
+                        "ContentDeliveryRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRule"
+                            },
+                            "type": "array"
+                        },
+                        "DatasetName": {
+                            "type": "string"
+                        },
+                        "LateDataRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.LateDataRule"
+                            },
+                            "type": "array"
+                        },
+                        "RetentionPeriod": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.RetentionPeriod"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Triggers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.Trigger"
+                            },
+                            "type": "array"
+                        },
+                        "VersioningConfiguration": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.VersioningConfiguration"
+                        }
+                    },
+                    "required": [
+                        "Actions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTAnalytics::Dataset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionName": {
+                    "type": "string"
+                },
+                "ContainerAction": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.ContainerAction"
+                },
+                "QueryAction": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.QueryAction"
+                }
+            },
+            "required": [
+                "ActionName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.ContainerAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRoleArn": {
+                    "type": "string"
+                },
+                "Image": {
+                    "type": "string"
+                },
+                "ResourceConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.ResourceConfiguration"
+                },
+                "Variables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.Variable"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ExecutionRoleArn",
+                "Image",
+                "ResourceConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRuleDestination"
+                },
+                "EntryName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.DatasetContentDeliveryRuleDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "IotEventsDestinationConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.IotEventsDestinationConfiguration"
+                },
+                "S3DestinationConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.S3DestinationConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.DatasetContentVersionValue": {
+            "additionalProperties": false,
+            "properties": {
+                "DatasetName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.DeltaTime": {
+            "additionalProperties": false,
+            "properties": {
+                "OffsetSeconds": {
+                    "type": "number"
+                },
+                "TimeExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OffsetSeconds",
+                "TimeExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.DeltaTimeSessionWindowConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "TimeoutInMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "TimeoutInMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.Filter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeltaTime": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.DeltaTime"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.GlueConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.IotEventsDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.LateDataRule": {
+            "additionalProperties": false,
+            "properties": {
+                "RuleConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.LateDataRuleConfiguration"
+                },
+                "RuleName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RuleConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.LateDataRuleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeltaTimeSessionWindowConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.DeltaTimeSessionWindowConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.OutputFileUriValue": {
+            "additionalProperties": false,
+            "properties": {
+                "FileName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.QueryAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Filters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.Filter"
+                    },
+                    "type": "array"
+                },
+                "SqlQuery": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SqlQuery"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.ResourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeType": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ComputeType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.RetentionPeriod": {
+            "additionalProperties": false,
+            "properties": {
+                "NumberOfDays": {
+                    "type": "number"
+                },
+                "Unlimited": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "NumberOfDays",
+                "Unlimited"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.S3DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "GlueConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.GlueConfiguration"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.Trigger": {
+            "additionalProperties": false,
+            "properties": {
+                "Schedule": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.Schedule"
+                },
+                "TriggeringDataset": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.TriggeringDataset"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.TriggeringDataset": {
+            "additionalProperties": false,
+            "properties": {
+                "DatasetName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatasetName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.Variable": {
+            "additionalProperties": false,
+            "properties": {
+                "DatasetContentVersionValue": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.DatasetContentVersionValue"
+                },
+                "DoubleValue": {
+                    "type": "number"
+                },
+                "OutputFileUriValue": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Dataset.OutputFileUriValue"
+                },
+                "StringValue": {
+                    "type": "string"
+                },
+                "VariableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VariableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Dataset.VersioningConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxVersions": {
+                    "type": "number"
+                },
+                "Unlimited": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DatastorePartitions": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.DatastorePartitions"
+                        },
+                        "DatastoreStorage": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.DatastoreStorage"
+                        },
+                        "FileFormatConfiguration": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.FileFormatConfiguration"
+                        },
+                        "RetentionPeriod": {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.RetentionPeriod"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTAnalytics::Datastore"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.Column": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.CustomerManagedS3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "KeyPrefix": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.CustomerManagedS3Storage": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "KeyPrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.DatastorePartition": {
+            "additionalProperties": false,
+            "properties": {
+                "Partition": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.Partition"
+                },
+                "TimestampPartition": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.TimestampPartition"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.DatastorePartitions": {
+            "additionalProperties": false,
+            "properties": {
+                "Partitions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.DatastorePartition"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.DatastoreStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomerManagedS3": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.CustomerManagedS3"
+                },
+                "IotSiteWiseMultiLayerStorage": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.IotSiteWiseMultiLayerStorage"
+                },
+                "ServiceManagedS3": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.ServiceManagedS3"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.FileFormatConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.JsonConfiguration"
+                },
+                "ParquetConfiguration": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.ParquetConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.IotSiteWiseMultiLayerStorage": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomerManagedS3Storage": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.CustomerManagedS3Storage"
+                }
+            },
+            "required": [
+                "CustomerManagedS3Storage"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.JsonConfiguration": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.ParquetConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SchemaDefinition": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.SchemaDefinition"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.Partition": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.RetentionPeriod": {
+            "additionalProperties": false,
+            "properties": {
+                "NumberOfDays": {
+                    "type": "number"
+                },
+                "Unlimited": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.SchemaDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTAnalytics::Datastore.Column"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.ServiceManagedS3": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Datastore.TimestampPartition": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "TimestampFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PipelineActivities": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Activity"
+                            },
+                            "type": "array"
+                        },
+                        "PipelineName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PipelineActivities"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTAnalytics::Pipeline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Activity": {
+            "additionalProperties": false,
+            "properties": {
+                "AddAttributes": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.AddAttributes"
+                },
+                "Channel": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Channel"
+                },
+                "Datastore": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Datastore"
+                },
+                "DeviceRegistryEnrich": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.DeviceRegistryEnrich"
+                },
+                "DeviceShadowEnrich": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.DeviceShadowEnrich"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Filter"
+                },
+                "Lambda": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Lambda"
+                },
+                "Math": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.Math"
+                },
+                "RemoveAttributes": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.RemoveAttributes"
+                },
+                "SelectAttributes": {
+                    "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline.SelectAttributes"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.AddAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "type": "object"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Datastore": {
+            "additionalProperties": false,
+            "properties": {
+                "DatastoreName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.DeviceRegistryEnrich": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "ThingName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.DeviceShadowEnrich": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "ThingName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Filter": {
+            "additionalProperties": false,
+            "properties": {
+                "Filter": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Lambda": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchSize": {
+                    "type": "number"
+                },
+                "LambdaName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.Math": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "type": "string"
+                },
+                "Math": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.RemoveAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTAnalytics::Pipeline.SelectAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Next": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTCoreDeviceAdvisor::SuiteDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SuiteDefinitionConfiguration": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SuiteDefinitionConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTCoreDeviceAdvisor::SuiteDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DetectorModelDefinition": {
+                            "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.DetectorModelDefinition"
+                        },
+                        "DetectorModelDescription": {
+                            "type": "string"
+                        },
+                        "DetectorModelName": {
+                            "type": "string"
+                        },
+                        "EvaluationMethod": {
+                            "type": "string"
+                        },
+                        "Key": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DetectorModelDefinition",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTEvents::DetectorModel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "ClearTimer": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.ClearTimer"
+                },
+                "DynamoDB": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.DynamoDB"
+                },
+                "DynamoDBv2": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.DynamoDBv2"
+                },
+                "Firehose": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Firehose"
+                },
+                "IotEvents": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.IotEvents"
+                },
+                "IotSiteWise": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.IotSiteWise"
+                },
+                "IotTopicPublish": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.IotTopicPublish"
+                },
+                "Lambda": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Lambda"
+                },
+                "ResetTimer": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.ResetTimer"
+                },
+                "SetTimer": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.SetTimer"
+                },
+                "SetVariable": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.SetVariable"
+                },
+                "Sns": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Sns"
+                },
+                "Sqs": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Sqs"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.AssetPropertyTimestamp": {
+            "additionalProperties": false,
+            "properties": {
+                "OffsetInNanos": {
+                    "type": "string"
+                },
+                "TimeInSeconds": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.AssetPropertyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Quality": {
+                    "type": "string"
+                },
+                "Timestamp": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.AssetPropertyTimestamp"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.AssetPropertyVariant"
+                }
+            },
+            "required": [
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.AssetPropertyVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "BooleanValue": {
+                    "type": "string"
+                },
+                "DoubleValue": {
+                    "type": "string"
+                },
+                "IntegerValue": {
+                    "type": "string"
+                },
+                "StringValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.ClearTimer": {
+            "additionalProperties": false,
+            "properties": {
+                "TimerName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TimerName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.DetectorModelDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "InitialStateName": {
+                    "type": "string"
+                },
+                "States": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.State"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "InitialStateName",
+                "States"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.DynamoDB": {
+            "additionalProperties": false,
+            "properties": {
+                "HashKeyField": {
+                    "type": "string"
+                },
+                "HashKeyType": {
+                    "type": "string"
+                },
+                "HashKeyValue": {
+                    "type": "string"
+                },
+                "Operation": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                },
+                "PayloadField": {
+                    "type": "string"
+                },
+                "RangeKeyField": {
+                    "type": "string"
+                },
+                "RangeKeyType": {
+                    "type": "string"
+                },
+                "RangeKeyValue": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HashKeyField",
+                "HashKeyValue",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.DynamoDBv2": {
+            "additionalProperties": false,
+            "properties": {
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Event": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Action"
+                    },
+                    "type": "array"
+                },
+                "Condition": {
+                    "type": "string"
+                },
+                "EventName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EventName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Firehose": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStreamName": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                },
+                "Separator": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStreamName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.IotEvents": {
+            "additionalProperties": false,
+            "properties": {
+                "InputName": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                }
+            },
+            "required": [
+                "InputName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.IotSiteWise": {
+            "additionalProperties": false,
+            "properties": {
+                "AssetId": {
+                    "type": "string"
+                },
+                "EntryId": {
+                    "type": "string"
+                },
+                "PropertyAlias": {
+                    "type": "string"
+                },
+                "PropertyId": {
+                    "type": "string"
+                },
+                "PropertyValue": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.AssetPropertyValue"
+                }
+            },
+            "required": [
+                "PropertyValue"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.IotTopicPublish": {
+            "additionalProperties": false,
+            "properties": {
+                "MqttTopic": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                }
+            },
+            "required": [
+                "MqttTopic"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Lambda": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionArn": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                }
+            },
+            "required": [
+                "FunctionArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.OnEnter": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Event"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.OnExit": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Event"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.OnInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Events": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Event"
+                    },
+                    "type": "array"
+                },
+                "TransitionEvents": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.TransitionEvent"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Payload": {
+            "additionalProperties": false,
+            "properties": {
+                "ContentExpression": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ContentExpression",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.ResetTimer": {
+            "additionalProperties": false,
+            "properties": {
+                "TimerName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TimerName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.SetTimer": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationExpression": {
+                    "type": "string"
+                },
+                "Seconds": {
+                    "type": "number"
+                },
+                "TimerName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TimerName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.SetVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                },
+                "VariableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Value",
+                "VariableName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Sns": {
+            "additionalProperties": false,
+            "properties": {
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                },
+                "TargetArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TargetArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.Sqs": {
+            "additionalProperties": false,
+            "properties": {
+                "Payload": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Payload"
+                },
+                "QueueUrl": {
+                    "type": "string"
+                },
+                "UseBase64": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "QueueUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.State": {
+            "additionalProperties": false,
+            "properties": {
+                "OnEnter": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.OnEnter"
+                },
+                "OnExit": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.OnExit"
+                },
+                "OnInput": {
+                    "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.OnInput"
+                },
+                "StateName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StateName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::DetectorModel.TransitionEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::DetectorModel.Action"
+                    },
+                    "type": "array"
+                },
+                "Condition": {
+                    "type": "string"
+                },
+                "EventName": {
+                    "type": "string"
+                },
+                "NextState": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Condition",
+                "EventName",
+                "NextState"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::Input": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InputDefinition": {
+                            "$ref": "#/definitions/AWS::IoTEvents::Input.InputDefinition"
+                        },
+                        "InputDescription": {
+                            "type": "string"
+                        },
+                        "InputName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InputDefinition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTEvents::Input"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::Input.Attribute": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "JsonPath"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTEvents::Input.InputDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTEvents::Input.Attribute"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Attributes"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTFleetHub::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationDescription": {
+                            "type": "string"
+                        },
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTFleetHub::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessPolicyIdentity": {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.AccessPolicyIdentity"
+                        },
+                        "AccessPolicyPermission": {
+                            "type": "string"
+                        },
+                        "AccessPolicyResource": {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.AccessPolicyResource"
+                        }
+                    },
+                    "required": [
+                        "AccessPolicyIdentity",
+                        "AccessPolicyPermission",
+                        "AccessPolicyResource"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::AccessPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.AccessPolicyIdentity": {
+            "additionalProperties": false,
+            "properties": {
+                "IamRole": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.IamRole"
+                },
+                "IamUser": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.IamUser"
+                },
+                "User": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.User"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.AccessPolicyResource": {
+            "additionalProperties": false,
+            "properties": {
+                "Portal": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.Portal"
+                },
+                "Project": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy.Project"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.IamRole": {
+            "additionalProperties": false,
+            "properties": {
+                "arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.IamUser": {
+            "additionalProperties": false,
+            "properties": {
+                "arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.Portal": {
+            "additionalProperties": false,
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.Project": {
+            "additionalProperties": false,
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AccessPolicy.User": {
+            "additionalProperties": false,
+            "properties": {
+                "id": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Asset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssetHierarchies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::Asset.AssetHierarchy"
+                            },
+                            "type": "array"
+                        },
+                        "AssetModelId": {
+                            "type": "string"
+                        },
+                        "AssetName": {
+                            "type": "string"
+                        },
+                        "AssetProperties": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::Asset.AssetProperty"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AssetModelId",
+                        "AssetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::Asset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Asset.AssetHierarchy": {
+            "additionalProperties": false,
+            "properties": {
+                "ChildAssetId": {
+                    "type": "string"
+                },
+                "LogicalId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ChildAssetId",
+                "LogicalId"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Asset.AssetProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "Alias": {
+                    "type": "string"
+                },
+                "LogicalId": {
+                    "type": "string"
+                },
+                "NotificationState": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogicalId"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssetModelCompositeModels": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.AssetModelCompositeModel"
+                            },
+                            "type": "array"
+                        },
+                        "AssetModelDescription": {
+                            "type": "string"
+                        },
+                        "AssetModelHierarchies": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.AssetModelHierarchy"
+                            },
+                            "type": "array"
+                        },
+                        "AssetModelName": {
+                            "type": "string"
+                        },
+                        "AssetModelProperties": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.AssetModelProperty"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AssetModelName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::AssetModel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.AssetModelCompositeModel": {
+            "additionalProperties": false,
+            "properties": {
+                "CompositeModelProperties": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.AssetModelProperty"
+                    },
+                    "type": "array"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.AssetModelHierarchy": {
+            "additionalProperties": false,
+            "properties": {
+                "ChildAssetModelId": {
+                    "type": "string"
+                },
+                "LogicalId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ChildAssetModelId",
+                "LogicalId",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.AssetModelProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "DataType": {
+                    "type": "string"
+                },
+                "DataTypeSpec": {
+                    "type": "string"
+                },
+                "LogicalId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.PropertyType"
+                },
+                "Unit": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataType",
+                "LogicalId",
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.Attribute": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.ExpressionVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.VariableValue"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.Metric": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Variables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.ExpressionVariable"
+                    },
+                    "type": "array"
+                },
+                "Window": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.MetricWindow"
+                }
+            },
+            "required": [
+                "Expression",
+                "Variables",
+                "Window"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.MetricWindow": {
+            "additionalProperties": false,
+            "properties": {
+                "Tumbling": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.TumblingWindow"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.PropertyType": {
+            "additionalProperties": false,
+            "properties": {
+                "Attribute": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.Attribute"
+                },
+                "Metric": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.Metric"
+                },
+                "Transform": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.Transform"
+                },
+                "TypeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TypeName"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.Transform": {
+            "additionalProperties": false,
+            "properties": {
+                "Expression": {
+                    "type": "string"
+                },
+                "Variables": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel.ExpressionVariable"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Expression",
+                "Variables"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.TumblingWindow": {
+            "additionalProperties": false,
+            "properties": {
+                "Interval": {
+                    "type": "string"
+                },
+                "Offset": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Interval"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::AssetModel.VariableValue": {
+            "additionalProperties": false,
+            "properties": {
+                "HierarchyLogicalId": {
+                    "type": "string"
+                },
+                "PropertyLogicalId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PropertyLogicalId"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Dashboard": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DashboardDefinition": {
+                            "type": "string"
+                        },
+                        "DashboardDescription": {
+                            "type": "string"
+                        },
+                        "DashboardName": {
+                            "type": "string"
+                        },
+                        "ProjectId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DashboardDefinition",
+                        "DashboardDescription",
+                        "DashboardName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::Dashboard"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Gateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GatewayCapabilitySummaries": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::IoTSiteWise::Gateway.GatewayCapabilitySummary"
+                            },
+                            "type": "array"
+                        },
+                        "GatewayName": {
+                            "type": "string"
+                        },
+                        "GatewayPlatform": {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Gateway.GatewayPlatform"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "GatewayName",
+                        "GatewayPlatform"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::Gateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Gateway.GatewayCapabilitySummary": {
+            "additionalProperties": false,
+            "properties": {
+                "CapabilityConfiguration": {
+                    "type": "string"
+                },
+                "CapabilityNamespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CapabilityNamespace"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Gateway.GatewayPlatform": {
+            "additionalProperties": false,
+            "properties": {
+                "Greengrass": {
+                    "$ref": "#/definitions/AWS::IoTSiteWise::Gateway.Greengrass"
+                }
+            },
+            "required": [
+                "Greengrass"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Gateway.Greengrass": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupArn"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Portal": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Alarms": {
+                            "type": "object"
+                        },
+                        "NotificationSenderEmail": {
+                            "type": "string"
+                        },
+                        "PortalAuthMode": {
+                            "type": "string"
+                        },
+                        "PortalContactEmail": {
+                            "type": "string"
+                        },
+                        "PortalDescription": {
+                            "type": "string"
+                        },
+                        "PortalName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PortalContactEmail",
+                        "PortalName",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::Portal"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTSiteWise::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PortalId": {
+                            "type": "string"
+                        },
+                        "ProjectDescription": {
+                            "type": "string"
+                        },
+                        "ProjectName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PortalId",
+                        "ProjectName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTSiteWise::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTThingsGraph::FlowTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CompatibleNamespaceVersion": {
+                            "type": "number"
+                        },
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::IoTThingsGraph::FlowTemplate.DefinitionDocument"
+                        }
+                    },
+                    "required": [
+                        "Definition"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTThingsGraph::FlowTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTThingsGraph::FlowTemplate.DefinitionDocument": {
+            "additionalProperties": false,
+            "properties": {
+                "Language": {
+                    "type": "string"
+                },
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Language",
+                "Text"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Expression": {
+                            "type": "string"
+                        },
+                        "ExpressionType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Expression",
+                        "ExpressionType",
+                        "Name",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::Destination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::DeviceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::DeviceProfile.LoRaWANDeviceProfile"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::DeviceProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::DeviceProfile.LoRaWANDeviceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "ClassBTimeout": {
+                    "type": "number"
+                },
+                "ClassCTimeout": {
+                    "type": "number"
+                },
+                "MacVersion": {
+                    "type": "string"
+                },
+                "MaxDutyCycle": {
+                    "type": "number"
+                },
+                "MaxEirp": {
+                    "type": "number"
+                },
+                "PingSlotDr": {
+                    "type": "number"
+                },
+                "PingSlotFreq": {
+                    "type": "number"
+                },
+                "PingSlotPeriod": {
+                    "type": "number"
+                },
+                "RegParamsRevision": {
+                    "type": "string"
+                },
+                "RfRegion": {
+                    "type": "string"
+                },
+                "Supports32BitFCnt": {
+                    "type": "boolean"
+                },
+                "SupportsClassB": {
+                    "type": "boolean"
+                },
+                "SupportsClassC": {
+                    "type": "boolean"
+                },
+                "SupportsJoin": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::FuotaTask": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociateMulticastGroup": {
+                            "type": "string"
+                        },
+                        "AssociateWirelessDevice": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisassociateMulticastGroup": {
+                            "type": "string"
+                        },
+                        "DisassociateWirelessDevice": {
+                            "type": "string"
+                        },
+                        "FirmwareUpdateImage": {
+                            "type": "string"
+                        },
+                        "FirmwareUpdateRole": {
+                            "type": "string"
+                        },
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::FuotaTask.LoRaWAN"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FirmwareUpdateImage",
+                        "FirmwareUpdateRole",
+                        "LoRaWAN"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::FuotaTask"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::FuotaTask.LoRaWAN": {
+            "additionalProperties": false,
+            "properties": {
+                "RfRegion": {
+                    "type": "string"
+                },
+                "StartTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RfRegion"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::MulticastGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociateWirelessDevice": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisassociateWirelessDevice": {
+                            "type": "string"
+                        },
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::MulticastGroup.LoRaWAN"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "LoRaWAN"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::MulticastGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::MulticastGroup.LoRaWAN": {
+            "additionalProperties": false,
+            "properties": {
+                "DlClass": {
+                    "type": "string"
+                },
+                "NumberOfDevicesInGroup": {
+                    "type": "number"
+                },
+                "NumberOfDevicesRequested": {
+                    "type": "number"
+                },
+                "RfRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DlClass",
+                "RfRegion"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::PartnerAccount": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccountLinked": {
+                            "type": "boolean"
+                        },
+                        "Fingerprint": {
+                            "type": "string"
+                        },
+                        "PartnerAccountId": {
+                            "type": "string"
+                        },
+                        "PartnerType": {
+                            "type": "string"
+                        },
+                        "Sidewalk": {
+                            "$ref": "#/definitions/AWS::IoTWireless::PartnerAccount.SidewalkAccountInfo"
+                        },
+                        "SidewalkUpdate": {
+                            "$ref": "#/definitions/AWS::IoTWireless::PartnerAccount.SidewalkUpdateAccount"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::PartnerAccount"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::PartnerAccount.SidewalkAccountInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "AppServerPrivateKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AppServerPrivateKey"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::PartnerAccount.SidewalkUpdateAccount": {
+            "additionalProperties": false,
+            "properties": {
+                "AppServerPrivateKey": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::ServiceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::ServiceProfile.LoRaWANServiceProfile"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::ServiceProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::ServiceProfile.LoRaWANServiceProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "AddGwMetadata": {
+                    "type": "boolean"
+                },
+                "ChannelMask": {
+                    "type": "string"
+                },
+                "DevStatusReqFreq": {
+                    "type": "number"
+                },
+                "DlBucketSize": {
+                    "type": "number"
+                },
+                "DlRate": {
+                    "type": "number"
+                },
+                "DlRatePolicy": {
+                    "type": "string"
+                },
+                "DrMax": {
+                    "type": "number"
+                },
+                "DrMin": {
+                    "type": "number"
+                },
+                "HrAllowed": {
+                    "type": "boolean"
+                },
+                "MinGwDiversity": {
+                    "type": "number"
+                },
+                "NwkGeoLoc": {
+                    "type": "boolean"
+                },
+                "PrAllowed": {
+                    "type": "boolean"
+                },
+                "RaAllowed": {
+                    "type": "boolean"
+                },
+                "ReportDevStatusBattery": {
+                    "type": "boolean"
+                },
+                "ReportDevStatusMargin": {
+                    "type": "boolean"
+                },
+                "TargetPer": {
+                    "type": "number"
+                },
+                "UlBucketSize": {
+                    "type": "number"
+                },
+                "UlRate": {
+                    "type": "number"
+                },
+                "UlRatePolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::TaskDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoCreateTasks": {
+                            "type": "boolean"
+                        },
+                        "LoRaWANUpdateGatewayTaskEntry": {
+                            "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskEntry"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TaskDefinitionType": {
+                            "type": "string"
+                        },
+                        "Update": {
+                            "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.UpdateWirelessGatewayTaskCreate"
+                        }
+                    },
+                    "required": [
+                        "AutoCreateTasks"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::TaskDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "Model": {
+                    "type": "string"
+                },
+                "PackageVersion": {
+                    "type": "string"
+                },
+                "Station": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskCreate": {
+            "additionalProperties": false,
+            "properties": {
+                "CurrentVersion": {
+                    "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion"
+                },
+                "SigKeyCrc": {
+                    "type": "number"
+                },
+                "UpdateSignature": {
+                    "type": "string"
+                },
+                "UpdateVersion": {
+                    "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "CurrentVersion": {
+                    "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion"
+                },
+                "UpdateVersion": {
+                    "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANGatewayVersion"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::TaskDefinition.UpdateWirelessGatewayTaskCreate": {
+            "additionalProperties": false,
+            "properties": {
+                "LoRaWAN": {
+                    "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition.LoRaWANUpdateGatewayTaskCreate"
+                },
+                "UpdateDataRole": {
+                    "type": "string"
+                },
+                "UpdateDataSource": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DestinationName": {
+                            "type": "string"
+                        },
+                        "LastUplinkReceivedAt": {
+                            "type": "string"
+                        },
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.LoRaWANDevice"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThingArn": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::WirelessDevice"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.AbpV10x": {
+            "additionalProperties": false,
+            "properties": {
+                "DevAddr": {
+                    "type": "string"
+                },
+                "SessionKeys": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.SessionKeysAbpV10x"
+                }
+            },
+            "required": [
+                "DevAddr",
+                "SessionKeys"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.AbpV11": {
+            "additionalProperties": false,
+            "properties": {
+                "DevAddr": {
+                    "type": "string"
+                },
+                "SessionKeys": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.SessionKeysAbpV11"
+                }
+            },
+            "required": [
+                "DevAddr",
+                "SessionKeys"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.LoRaWANDevice": {
+            "additionalProperties": false,
+            "properties": {
+                "AbpV10x": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.AbpV10x"
+                },
+                "AbpV11": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.AbpV11"
+                },
+                "DevEui": {
+                    "type": "string"
+                },
+                "DeviceProfileId": {
+                    "type": "string"
+                },
+                "OtaaV10x": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.OtaaV10x"
+                },
+                "OtaaV11": {
+                    "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice.OtaaV11"
+                },
+                "ServiceProfileId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.OtaaV10x": {
+            "additionalProperties": false,
+            "properties": {
+                "AppEui": {
+                    "type": "string"
+                },
+                "AppKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AppEui",
+                "AppKey"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.OtaaV11": {
+            "additionalProperties": false,
+            "properties": {
+                "AppKey": {
+                    "type": "string"
+                },
+                "JoinEui": {
+                    "type": "string"
+                },
+                "NwkKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AppKey",
+                "JoinEui",
+                "NwkKey"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.SessionKeysAbpV10x": {
+            "additionalProperties": false,
+            "properties": {
+                "AppSKey": {
+                    "type": "string"
+                },
+                "NwkSKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AppSKey",
+                "NwkSKey"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessDevice.SessionKeysAbpV11": {
+            "additionalProperties": false,
+            "properties": {
+                "AppSKey": {
+                    "type": "string"
+                },
+                "FNwkSIntKey": {
+                    "type": "string"
+                },
+                "NwkSEncKey": {
+                    "type": "string"
+                },
+                "SNwkSIntKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AppSKey",
+                "FNwkSIntKey",
+                "NwkSEncKey",
+                "SNwkSIntKey"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "LastUplinkReceivedAt": {
+                            "type": "string"
+                        },
+                        "LoRaWAN": {
+                            "$ref": "#/definitions/AWS::IoTWireless::WirelessGateway.LoRaWANGateway"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThingArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LoRaWAN"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::IoTWireless::WirelessGateway"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::IoTWireless::WirelessGateway.LoRaWANGateway": {
+            "additionalProperties": false,
+            "properties": {
+                "GatewayEui": {
+                    "type": "string"
+                },
+                "RfRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GatewayEui",
+                "RfRegion"
+            ],
+            "type": "object"
+        },
+        "AWS::KMS::Alias": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AliasName": {
+                            "type": "string"
+                        },
+                        "TargetKeyId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AliasName",
+                        "TargetKeyId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KMS::Alias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KMS::Key": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EnableKeyRotation": {
+                            "type": "boolean"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "KeyPolicy": {
+                            "type": "object"
+                        },
+                        "KeySpec": {
+                            "type": "string"
+                        },
+                        "KeyUsage": {
+                            "type": "string"
+                        },
+                        "MultiRegion": {
+                            "type": "boolean"
+                        },
+                        "PendingWindowInDays": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "KeyPolicy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KMS::Key"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KMS::ReplicaKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "KeyPolicy": {
+                            "type": "object"
+                        },
+                        "PendingWindowInDays": {
+                            "type": "number"
+                        },
+                        "PrimaryKeyArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "KeyPolicy",
+                        "PrimaryKeyArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KMS::ReplicaKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::Kendra::DataSource.DataSourceConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IndexId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "IndexId",
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kendra::DataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.AccessControlListConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyPath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.AclConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedGroupsColumnName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AllowedGroupsColumnName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ColumnConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChangeDetectingColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "DocumentDataColumnName": {
+                    "type": "string"
+                },
+                "DocumentIdColumnName": {
+                    "type": "string"
+                },
+                "DocumentTitleColumnName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ChangeDetectingColumns",
+                "DocumentDataColumnName",
+                "DocumentIdColumnName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceAttachmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentFieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceAttachmentToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "CrawlAttachments": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceAttachmentToIndexFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceFieldName": {
+                    "type": "string"
+                },
+                "DateFieldFormat": {
+                    "type": "string"
+                },
+                "IndexFieldName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceFieldName",
+                "IndexFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceBlogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BlogFieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceBlogToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceBlogToIndexFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceFieldName": {
+                    "type": "string"
+                },
+                "DateFieldFormat": {
+                    "type": "string"
+                },
+                "IndexFieldName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceFieldName",
+                "IndexFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachmentConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceAttachmentConfiguration"
+                },
+                "BlogConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceBlogConfiguration"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PageConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluencePageConfiguration"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "ServerUrl": {
+                    "type": "string"
+                },
+                "SpaceConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceSpaceConfiguration"
+                },
+                "Version": {
+                    "type": "string"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceVpcConfiguration"
+                }
+            },
+            "required": [
+                "SecretArn",
+                "ServerUrl",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluencePageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "PageFieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluencePageToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluencePageToIndexFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceFieldName": {
+                    "type": "string"
+                },
+                "DateFieldFormat": {
+                    "type": "string"
+                },
+                "IndexFieldName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceFieldName",
+                "IndexFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceSpaceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlArchivedSpaces": {
+                    "type": "boolean"
+                },
+                "CrawlPersonalSpaces": {
+                    "type": "boolean"
+                },
+                "ExcludeSpaces": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "IncludeSpaces": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SpaceFieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceSpaceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConfluenceSpaceToIndexFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceFieldName": {
+                    "type": "string"
+                },
+                "DateFieldFormat": {
+                    "type": "string"
+                },
+                "IndexFieldName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceFieldName",
+                "IndexFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ConnectionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseHost": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DatabasePort": {
+                    "type": "number"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseHost",
+                "DatabaseName",
+                "DatabasePort",
+                "SecretArn",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.DataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfluenceConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConfluenceConfiguration"
+                },
+                "DatabaseConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.DatabaseConfiguration"
+                },
+                "GoogleDriveConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.GoogleDriveConfiguration"
+                },
+                "OneDriveConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.OneDriveConfiguration"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.S3DataSourceConfiguration"
+                },
+                "SalesforceConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceConfiguration"
+                },
+                "ServiceNowConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ServiceNowConfiguration"
+                },
+                "SharePointConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SharePointConfiguration"
+                },
+                "WebCrawlerConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerConfiguration"
+                },
+                "WorkDocsConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WorkDocsConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.DataSourceToIndexFieldMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceFieldName": {
+                    "type": "string"
+                },
+                "DateFieldFormat": {
+                    "type": "string"
+                },
+                "IndexFieldName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceFieldName",
+                "IndexFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.DataSourceVpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.DatabaseConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AclConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.AclConfiguration"
+                },
+                "ColumnConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ColumnConfiguration"
+                },
+                "ConnectionConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ConnectionConfiguration"
+                },
+                "DatabaseEngineType": {
+                    "type": "string"
+                },
+                "SqlConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SqlConfiguration"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceVpcConfiguration"
+                }
+            },
+            "required": [
+                "ColumnConfiguration",
+                "ConnectionConfiguration",
+                "DatabaseEngineType"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.DocumentsMetadataConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Prefix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.GoogleDriveConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludeMimeTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExcludeSharedDrives": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExcludeUserAccounts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecretArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.OneDriveConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DisableLocalGroups": {
+                    "type": "boolean"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OneDriveUsers": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.OneDriveUsers"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "TenantDomain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OneDriveUsers",
+                "SecretArn",
+                "TenantDomain"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.OneDriveUsers": {
+            "additionalProperties": false,
+            "properties": {
+                "OneDriveUserList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OneDriveUserS3Path": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.S3Path"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ProxyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Credentials": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.S3DataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessControlListConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.AccessControlListConfiguration"
+                },
+                "BucketName": {
+                    "type": "string"
+                },
+                "DocumentsMetadataConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.DocumentsMetadataConfiguration"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "InclusionPrefixes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.S3Path": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceChatterFeedConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "IncludeFilterTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ChatterFeedConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceChatterFeedConfiguration"
+                },
+                "CrawlAttachments": {
+                    "type": "boolean"
+                },
+                "ExcludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "IncludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "KnowledgeArticleConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceKnowledgeArticleConfiguration"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "ServerUrl": {
+                    "type": "string"
+                },
+                "StandardObjectAttachmentConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceStandardObjectAttachmentConfiguration"
+                },
+                "StandardObjectConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceStandardObjectConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecretArn",
+                "ServerUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceCustomKnowledgeArticleTypeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceKnowledgeArticleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomKnowledgeArticleTypeConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceCustomKnowledgeArticleTypeConfiguration"
+                    },
+                    "type": "array"
+                },
+                "IncludedStates": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StandardKnowledgeArticleTypeConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.SalesforceStandardKnowledgeArticleTypeConfiguration"
+                }
+            },
+            "required": [
+                "IncludedStates"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceStandardKnowledgeArticleTypeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceStandardObjectAttachmentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SalesforceStandardObjectConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ServiceNowConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationType": {
+                    "type": "string"
+                },
+                "HostUrl": {
+                    "type": "string"
+                },
+                "KnowledgeArticleConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ServiceNowKnowledgeArticleConfiguration"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "ServiceCatalogConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ServiceNowServiceCatalogConfiguration"
+                },
+                "ServiceNowBuildVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HostUrl",
+                "SecretArn",
+                "ServiceNowBuildVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ServiceNowKnowledgeArticleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlAttachments": {
+                    "type": "boolean"
+                },
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "ExcludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "FilterQuery": {
+                    "type": "string"
+                },
+                "IncludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.ServiceNowServiceCatalogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlAttachments": {
+                    "type": "boolean"
+                },
+                "DocumentDataFieldName": {
+                    "type": "string"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "ExcludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "IncludeAttachmentFilePatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DocumentDataFieldName"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SharePointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlAttachments": {
+                    "type": "boolean"
+                },
+                "DisableLocalGroups": {
+                    "type": "boolean"
+                },
+                "DocumentTitleFieldName": {
+                    "type": "string"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "SharePointVersion": {
+                    "type": "string"
+                },
+                "SslCertificateS3Path": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.S3Path"
+                },
+                "Urls": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "UseChangeLog": {
+                    "type": "boolean"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceVpcConfiguration"
+                }
+            },
+            "required": [
+                "SecretArn",
+                "SharePointVersion",
+                "Urls"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.SqlConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryIdentifiersEnclosingOption": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerAuthenticationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BasicAuthentication": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerBasicAuthentication"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerBasicAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "Credentials": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Credentials",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthenticationConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerAuthenticationConfiguration"
+                },
+                "CrawlDepth": {
+                    "type": "number"
+                },
+                "MaxContentSizePerPageInMegaBytes": {
+                    "type": "number"
+                },
+                "MaxLinksPerPage": {
+                    "type": "number"
+                },
+                "MaxUrlsPerMinuteCrawlRate": {
+                    "type": "number"
+                },
+                "ProxyConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.ProxyConfiguration"
+                },
+                "UrlExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "UrlInclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Urls": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerUrls"
+                }
+            },
+            "required": [
+                "Urls"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerSeedUrlConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SeedUrls": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "WebCrawlerMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SeedUrls"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerSiteMapsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SiteMaps": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SiteMaps"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WebCrawlerUrls": {
+            "additionalProperties": false,
+            "properties": {
+                "SeedUrlConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerSeedUrlConfiguration"
+                },
+                "SiteMapsConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::DataSource.WebCrawlerSiteMapsConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::DataSource.WorkDocsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CrawlComments": {
+                    "type": "boolean"
+                },
+                "ExclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FieldMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::DataSource.DataSourceToIndexFieldMapping"
+                    },
+                    "type": "array"
+                },
+                "InclusionPatterns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OrganizationId": {
+                    "type": "string"
+                },
+                "UseChangeLog": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "OrganizationId"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Faq": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "FileFormat": {
+                            "type": "string"
+                        },
+                        "IndexId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "S3Path": {
+                            "$ref": "#/definitions/AWS::Kendra::Faq.S3Path"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "IndexId",
+                        "Name",
+                        "RoleArn",
+                        "S3Path"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kendra::Faq"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Faq.S3Path": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CapacityUnits": {
+                            "$ref": "#/definitions/AWS::Kendra::Index.CapacityUnitsConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DocumentMetadataConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Kendra::Index.DocumentMetadataConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "Edition": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "ServerSideEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Kendra::Index.ServerSideEncryptionConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserContextPolicy": {
+                            "type": "string"
+                        },
+                        "UserTokenConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Kendra::Index.UserTokenConfiguration"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Edition",
+                        "Name",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kendra::Index"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index.CapacityUnitsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "QueryCapacityUnits": {
+                    "type": "number"
+                },
+                "StorageCapacityUnits": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "QueryCapacityUnits",
+                "StorageCapacityUnits"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index.DocumentMetadataConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Relevance": {
+                    "$ref": "#/definitions/AWS::Kendra::Index.Relevance"
+                },
+                "Search": {
+                    "$ref": "#/definitions/AWS::Kendra::Index.Search"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index.JsonTokenTypeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupAttributeField": {
+                    "type": "string"
+                },
+                "UserNameAttributeField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "GroupAttributeField",
+                "UserNameAttributeField"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index.JwtTokenTypeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClaimRegex": {
+                    "type": "string"
+                },
+                "GroupAttributeField": {
+                    "type": "string"
+                },
+                "Issuer": {
+                    "type": "string"
+                },
+                "KeyLocation": {
+                    "type": "string"
+                },
+                "SecretManagerArn": {
+                    "type": "string"
+                },
+                "URL": {
+                    "type": "string"
+                },
+                "UserNameAttributeField": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KeyLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::Kendra::Index.Relevance": {
+            "additionalProperties": false,
+            "properties": {
+                "Duration": {
+                    "type": "string"
+                },
+                "Freshness": {
+                    "type": "boolean"
+                },
+                "Importance": {
+                    "type": "number"
+                },
+                "RankOrder": {
+                    "type": "string"
+                },
+                "ValueImportanceItems": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Kendra::Index.ValueImportanceItem"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::Index.Search": {
+            "additionalProperties": false,
+            "properties": {
+                "Displayable": {
+                    "type": "boolean"
+                },
+                "Facetable": {
+                    "type": "boolean"
+                },
+                "Searchable": {
+                    "type": "boolean"
+                },
+                "Sortable": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::Index.ServerSideEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::Index.UserTokenConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonTokenTypeConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::Index.JsonTokenTypeConfiguration"
+                },
+                "JwtTokenTypeConfiguration": {
+                    "$ref": "#/definitions/AWS::Kendra::Index.JwtTokenTypeConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kendra::Index.ValueImportanceItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Kinesis::Stream": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RetentionPeriodHours": {
+                            "type": "number"
+                        },
+                        "ShardCount": {
+                            "type": "number"
+                        },
+                        "StreamEncryption": {
+                            "$ref": "#/definitions/AWS::Kinesis::Stream.StreamEncryption"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ShardCount"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kinesis::Stream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Kinesis::Stream.StreamEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionType": {
+                    "type": "string"
+                },
+                "KeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EncryptionType",
+                "KeyId"
+            ],
+            "type": "object"
+        },
+        "AWS::Kinesis::StreamConsumer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConsumerName": {
+                            "type": "string"
+                        },
+                        "StreamARN": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConsumerName",
+                        "StreamARN"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Kinesis::StreamConsumer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationCode": {
+                            "type": "string"
+                        },
+                        "ApplicationDescription": {
+                            "type": "string"
+                        },
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Inputs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::KinesisAnalytics::Application.Input"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Inputs"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalytics::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.CSVMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumnDelimiter": {
+                    "type": "string"
+                },
+                "RecordRowDelimiter": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordColumnDelimiter",
+                "RecordRowDelimiter"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.Input": {
+            "additionalProperties": false,
+            "properties": {
+                "InputParallelism": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.InputParallelism"
+                },
+                "InputProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.InputProcessingConfiguration"
+                },
+                "InputSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.InputSchema"
+                },
+                "KinesisFirehoseInput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.KinesisFirehoseInput"
+                },
+                "KinesisStreamsInput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.KinesisStreamsInput"
+                },
+                "NamePrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputSchema",
+                "NamePrefix"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.InputLambdaProcessor": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.InputParallelism": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.InputProcessingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputLambdaProcessor": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.InputLambdaProcessor"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.InputSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalytics::Application.RecordColumn"
+                    },
+                    "type": "array"
+                },
+                "RecordEncoding": {
+                    "type": "string"
+                },
+                "RecordFormat": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.RecordFormat"
+                }
+            },
+            "required": [
+                "RecordColumns",
+                "RecordFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.JSONMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordRowPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordRowPath"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.KinesisFirehoseInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.KinesisStreamsInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.MappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CSVMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.CSVMappingParameters"
+                },
+                "JSONMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.JSONMappingParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.RecordColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Mapping": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SqlType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "SqlType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::Application.RecordFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "MappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::Application.MappingParameters"
+                },
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordFormatType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Output": {
+                            "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput.Output"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "Output"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalytics::ApplicationOutput"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput.DestinationSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput.KinesisFirehoseOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput.KinesisStreamsOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput.LambdaOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationOutput.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput.DestinationSchema"
+                },
+                "KinesisFirehoseOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput.KinesisFirehoseOutput"
+                },
+                "KinesisStreamsOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput.KinesisStreamsOutput"
+                },
+                "LambdaOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput.LambdaOutput"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationSchema"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "ReferenceDataSource": {
+                            "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceDataSource"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "ReferenceDataSource"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalytics::ApplicationReferenceDataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.CSVMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumnDelimiter": {
+                    "type": "string"
+                },
+                "RecordRowDelimiter": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordColumnDelimiter",
+                "RecordRowDelimiter"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.JSONMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordRowPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordRowPath"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.MappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CSVMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.CSVMappingParameters"
+                },
+                "JSONMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.JSONMappingParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Mapping": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SqlType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "SqlType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "MappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.MappingParameters"
+                },
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordFormatType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ReferenceSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceSchema"
+                },
+                "S3ReferenceDataSource": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.S3ReferenceDataSource"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ReferenceSchema"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.ReferenceSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordColumn"
+                    },
+                    "type": "array"
+                },
+                "RecordEncoding": {
+                    "type": "string"
+                },
+                "RecordFormat": {
+                    "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource.RecordFormat"
+                }
+            },
+            "required": [
+                "RecordColumns",
+                "RecordFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalytics::ApplicationReferenceDataSource.S3ReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketARN": {
+                    "type": "string"
+                },
+                "FileKey": {
+                    "type": "string"
+                },
+                "ReferenceRoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketARN",
+                "FileKey",
+                "ReferenceRoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationConfiguration"
+                        },
+                        "ApplicationDescription": {
+                            "type": "string"
+                        },
+                        "ApplicationMode": {
+                            "type": "string"
+                        },
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "RuntimeEnvironment": {
+                            "type": "string"
+                        },
+                        "ServiceExecutionRole": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RuntimeEnvironment",
+                        "ServiceExecutionRole"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalyticsV2::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ApplicationCodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CodeContent": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.CodeContent"
+                },
+                "CodeContentType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CodeContent",
+                "CodeContentType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ApplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationCodeConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationCodeConfiguration"
+                },
+                "ApplicationSnapshotConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ApplicationSnapshotConfiguration"
+                },
+                "EnvironmentProperties": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.EnvironmentProperties"
+                },
+                "FlinkApplicationConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.FlinkApplicationConfiguration"
+                },
+                "SqlApplicationConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.SqlApplicationConfiguration"
+                },
+                "ZeppelinApplicationConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ZeppelinApplicationConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ApplicationSnapshotConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SnapshotsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "SnapshotsEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CSVMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumnDelimiter": {
+                    "type": "string"
+                },
+                "RecordRowDelimiter": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordColumnDelimiter",
+                "RecordRowDelimiter"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CatalogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "GlueDataCatalogConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.GlueDataCatalogConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CheckpointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CheckpointInterval": {
+                    "type": "number"
+                },
+                "CheckpointingEnabled": {
+                    "type": "boolean"
+                },
+                "ConfigurationType": {
+                    "type": "string"
+                },
+                "MinPauseBetweenCheckpoints": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ConfigurationType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CodeContent": {
+            "additionalProperties": false,
+            "properties": {
+                "S3ContentLocation": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.S3ContentLocation"
+                },
+                "TextContent": {
+                    "type": "string"
+                },
+                "ZipFileContent": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CustomArtifactConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ArtifactType": {
+                    "type": "string"
+                },
+                "MavenReference": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.MavenReference"
+                },
+                "S3ContentLocation": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.S3ContentLocation"
+                }
+            },
+            "required": [
+                "ArtifactType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.CustomArtifactsConfiguration": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.DeployAsApplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3ContentLocation": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.S3ContentBaseLocation"
+                }
+            },
+            "required": [
+                "S3ContentLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.EnvironmentProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "PropertyGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.PropertyGroup"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.FlinkApplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CheckpointConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.CheckpointConfiguration"
+                },
+                "MonitoringConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.MonitoringConfiguration"
+                },
+                "ParallelismConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ParallelismConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.GlueDataCatalogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseARN": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.Input": {
+            "additionalProperties": false,
+            "properties": {
+                "InputParallelism": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.InputParallelism"
+                },
+                "InputProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.InputProcessingConfiguration"
+                },
+                "InputSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.InputSchema"
+                },
+                "KinesisFirehoseInput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.KinesisFirehoseInput"
+                },
+                "KinesisStreamsInput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.KinesisStreamsInput"
+                },
+                "NamePrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InputSchema",
+                "NamePrefix"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.InputLambdaProcessor": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.InputParallelism": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.InputProcessingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InputLambdaProcessor": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.InputLambdaProcessor"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.InputSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.RecordColumn"
+                    },
+                    "type": "array"
+                },
+                "RecordEncoding": {
+                    "type": "string"
+                },
+                "RecordFormat": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.RecordFormat"
+                }
+            },
+            "required": [
+                "RecordColumns",
+                "RecordFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.JSONMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordRowPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordRowPath"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.KinesisFirehoseInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.KinesisStreamsInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.MappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CSVMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.CSVMappingParameters"
+                },
+                "JSONMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.JSONMappingParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.MavenReference": {
+            "additionalProperties": false,
+            "properties": {
+                "ArtifactId": {
+                    "type": "string"
+                },
+                "GroupId": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ArtifactId",
+                "GroupId",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.MonitoringConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfigurationType": {
+                    "type": "string"
+                },
+                "LogLevel": {
+                    "type": "string"
+                },
+                "MetricsLevel": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConfigurationType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ParallelismConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoScalingEnabled": {
+                    "type": "boolean"
+                },
+                "ConfigurationType": {
+                    "type": "string"
+                },
+                "Parallelism": {
+                    "type": "number"
+                },
+                "ParallelismPerKPU": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ConfigurationType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.PropertyGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "PropertyGroupId": {
+                    "type": "string"
+                },
+                "PropertyMap": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.RecordColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Mapping": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SqlType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "SqlType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.RecordFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "MappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.MappingParameters"
+                },
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordFormatType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.S3ContentBaseLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "BasePath": {
+                    "type": "string"
+                },
+                "BucketARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BasePath",
+                "BucketARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.S3ContentLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketARN": {
+                    "type": "string"
+                },
+                "FileKey": {
+                    "type": "string"
+                },
+                "ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.SqlApplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Inputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.Input"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ZeppelinApplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.CatalogConfiguration"
+                },
+                "CustomArtifactsConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.CustomArtifactsConfiguration"
+                },
+                "DeployAsApplicationConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.DeployAsApplicationConfiguration"
+                },
+                "MonitoringConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application.ZeppelinMonitoringConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::Application.ZeppelinMonitoringConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogLevel": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "CloudWatchLoggingOption": {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption.CloudWatchLoggingOption"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "CloudWatchLoggingOption"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption.CloudWatchLoggingOption": {
+            "additionalProperties": false,
+            "properties": {
+                "LogStreamARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogStreamARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "Output": {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput.Output"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "Output"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalyticsV2::ApplicationOutput"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput.DestinationSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisFirehoseOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisStreamsOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput.LambdaOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationOutput.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput.DestinationSchema"
+                },
+                "KinesisFirehoseOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisFirehoseOutput"
+                },
+                "KinesisStreamsOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput.KinesisStreamsOutput"
+                },
+                "LambdaOutput": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput.LambdaOutput"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DestinationSchema"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationName": {
+                            "type": "string"
+                        },
+                        "ReferenceDataSource": {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceDataSource"
+                        }
+                    },
+                    "required": [
+                        "ApplicationName",
+                        "ReferenceDataSource"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.CSVMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumnDelimiter": {
+                    "type": "string"
+                },
+                "RecordRowDelimiter": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordColumnDelimiter",
+                "RecordRowDelimiter"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.JSONMappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordRowPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordRowPath"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.MappingParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "CSVMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.CSVMappingParameters"
+                },
+                "JSONMappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.JSONMappingParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Mapping": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SqlType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "SqlType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "MappingParameters": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.MappingParameters"
+                },
+                "RecordFormatType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RecordFormatType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "ReferenceSchema": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceSchema"
+                },
+                "S3ReferenceDataSource": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.S3ReferenceDataSource"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ReferenceSchema"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.ReferenceSchema": {
+            "additionalProperties": false,
+            "properties": {
+                "RecordColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordColumn"
+                    },
+                    "type": "array"
+                },
+                "RecordEncoding": {
+                    "type": "string"
+                },
+                "RecordFormat": {
+                    "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.RecordFormat"
+                }
+            },
+            "required": [
+                "RecordColumns",
+                "RecordFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource.S3ReferenceDataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketARN": {
+                    "type": "string"
+                },
+                "FileKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketARN",
+                "FileKey"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AmazonopensearchserviceDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceDestinationConfiguration"
+                        },
+                        "DeliveryStreamEncryptionConfigurationInput": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.DeliveryStreamEncryptionConfigurationInput"
+                        },
+                        "DeliveryStreamName": {
+                            "type": "string"
+                        },
+                        "DeliveryStreamType": {
+                            "type": "string"
+                        },
+                        "ElasticsearchDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ElasticsearchDestinationConfiguration"
+                        },
+                        "ExtendedS3DestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ExtendedS3DestinationConfiguration"
+                        },
+                        "HttpEndpointDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointDestinationConfiguration"
+                        },
+                        "KinesisStreamSourceConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.KinesisStreamSourceConfiguration"
+                        },
+                        "RedshiftDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RedshiftDestinationConfiguration"
+                        },
+                        "S3DestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                        },
+                        "SplunkDestinationConfiguration": {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SplunkDestinationConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::KinesisFirehose::DeliveryStream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceBufferingHints": {
+            "additionalProperties": false,
+            "properties": {
+                "IntervalInSeconds": {
+                    "type": "number"
+                },
+                "SizeInMBs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceBufferingHints"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "ClusterEndpoint": {
+                    "type": "string"
+                },
+                "DomainARN": {
+                    "type": "string"
+                },
+                "IndexName": {
+                    "type": "string"
+                },
+                "IndexRotationPeriod": {
+                    "type": "string"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceRetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "TypeName": {
+                    "type": "string"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.VpcConfiguration"
+                }
+            },
+            "required": [
+                "IndexName",
+                "RoleARN",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.AmazonopensearchserviceRetryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.BufferingHints": {
+            "additionalProperties": false,
+            "properties": {
+                "IntervalInSeconds": {
+                    "type": "number"
+                },
+                "SizeInMBs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "LogGroupName": {
+                    "type": "string"
+                },
+                "LogStreamName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.CopyCommand": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyOptions": {
+                    "type": "string"
+                },
+                "DataTableColumns": {
+                    "type": "string"
+                },
+                "DataTableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataTableName"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.DataFormatConversionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "InputFormatConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.InputFormatConfiguration"
+                },
+                "OutputFormatConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.OutputFormatConfiguration"
+                },
+                "SchemaConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SchemaConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.DeliveryStreamEncryptionConfigurationInput": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyARN": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KeyType"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.Deserializer": {
+            "additionalProperties": false,
+            "properties": {
+                "HiveJsonSerDe": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HiveJsonSerDe"
+                },
+                "OpenXJsonSerDe": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.OpenXJsonSerDe"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.DynamicPartitioningConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RetryOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ElasticsearchBufferingHints": {
+            "additionalProperties": false,
+            "properties": {
+                "IntervalInSeconds": {
+                    "type": "number"
+                },
+                "SizeInMBs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ElasticsearchDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ElasticsearchBufferingHints"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "ClusterEndpoint": {
+                    "type": "string"
+                },
+                "DomainARN": {
+                    "type": "string"
+                },
+                "IndexName": {
+                    "type": "string"
+                },
+                "IndexRotationPeriod": {
+                    "type": "string"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ElasticsearchRetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "TypeName": {
+                    "type": "string"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.VpcConfiguration"
+                }
+            },
+            "required": [
+                "IndexName",
+                "RoleARN",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ElasticsearchRetryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSEncryptionConfig": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.KMSEncryptionConfig"
+                },
+                "NoEncryptionConfig": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ExtendedS3DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketARN": {
+                    "type": "string"
+                },
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.BufferingHints"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "CompressionFormat": {
+                    "type": "string"
+                },
+                "DataFormatConversionConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.DataFormatConversionConfiguration"
+                },
+                "DynamicPartitioningConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.DynamicPartitioningConfiguration"
+                },
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.EncryptionConfiguration"
+                },
+                "ErrorOutputPrefix": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3BackupConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.HiveJsonSerDe": {
+            "additionalProperties": false,
+            "properties": {
+                "TimestampFormats": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.HttpEndpointCommonAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeName": {
+                    "type": "string"
+                },
+                "AttributeValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AttributeName",
+                "AttributeValue"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.HttpEndpointConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessKey": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.HttpEndpointDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.BufferingHints"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "EndpointConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointConfiguration"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RequestConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointRequestConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                }
+            },
+            "required": [
+                "EndpointConfiguration",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.HttpEndpointRequestConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CommonAttributes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.HttpEndpointCommonAttribute"
+                    },
+                    "type": "array"
+                },
+                "ContentEncoding": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.InputFormatConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Deserializer": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.Deserializer"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.KMSEncryptionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AWSKMSKeyARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AWSKMSKeyARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.KinesisStreamSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KinesisStreamARN": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KinesisStreamARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.OpenXJsonSerDe": {
+            "additionalProperties": false,
+            "properties": {
+                "CaseInsensitive": {
+                    "type": "boolean"
+                },
+                "ColumnToJsonKeyMappings": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ConvertDotsInJsonKeysToUnderscores": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.OrcSerDe": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockSizeBytes": {
+                    "type": "number"
+                },
+                "BloomFilterColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BloomFilterFalsePositiveProbability": {
+                    "type": "number"
+                },
+                "Compression": {
+                    "type": "string"
+                },
+                "DictionaryKeyThreshold": {
+                    "type": "number"
+                },
+                "EnablePadding": {
+                    "type": "boolean"
+                },
+                "FormatVersion": {
+                    "type": "string"
+                },
+                "PaddingTolerance": {
+                    "type": "number"
+                },
+                "RowIndexStride": {
+                    "type": "number"
+                },
+                "StripeSizeBytes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.OutputFormatConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Serializer": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.Serializer"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ParquetSerDe": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockSizeBytes": {
+                    "type": "number"
+                },
+                "Compression": {
+                    "type": "string"
+                },
+                "EnableDictionaryCompression": {
+                    "type": "boolean"
+                },
+                "MaxPaddingBytes": {
+                    "type": "number"
+                },
+                "PageSizeBytes": {
+                    "type": "number"
+                },
+                "WriterVersion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Processors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.Processor"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.Processor": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessorParameter"
+                    },
+                    "type": "array"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.ProcessorParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ParameterName",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.RedshiftDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "ClusterJDBCURL": {
+                    "type": "string"
+                },
+                "CopyCommand": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CopyCommand"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.RedshiftRetryOptions"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "S3BackupConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClusterJDBCURL",
+                "CopyCommand",
+                "Password",
+                "RoleARN",
+                "S3Configuration",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.RedshiftRetryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.RetryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketARN": {
+                    "type": "string"
+                },
+                "BufferingHints": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.BufferingHints"
+                },
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "CompressionFormat": {
+                    "type": "string"
+                },
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.EncryptionConfiguration"
+                },
+                "ErrorOutputPrefix": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketARN",
+                "RoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.SchemaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "RoleARN": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "VersionId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.Serializer": {
+            "additionalProperties": false,
+            "properties": {
+                "OrcSerDe": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.OrcSerDe"
+                },
+                "ParquetSerDe": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ParquetSerDe"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.SplunkDestinationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLoggingOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.CloudWatchLoggingOptions"
+                },
+                "HECAcknowledgmentTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "HECEndpoint": {
+                    "type": "string"
+                },
+                "HECEndpointType": {
+                    "type": "string"
+                },
+                "HECToken": {
+                    "type": "string"
+                },
+                "ProcessingConfiguration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.ProcessingConfiguration"
+                },
+                "RetryOptions": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.SplunkRetryOptions"
+                },
+                "S3BackupMode": {
+                    "type": "string"
+                },
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream.S3DestinationConfiguration"
+                }
+            },
+            "required": [
+                "HECEndpoint",
+                "HECEndpointType",
+                "HECToken",
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.SplunkRetryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::KinesisFirehose::DeliveryStream.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleARN": {
+                    "type": "string"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "RoleARN",
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::LakeFormation::DataLakeSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Admins": {
+                            "$ref": "#/definitions/AWS::LakeFormation::DataLakeSettings.Admins"
+                        },
+                        "TrustedResourceOwners": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LakeFormation::DataLakeSettings"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::LakeFormation::DataLakeSettings.Admins": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::LakeFormation::DataLakeSettings.DataLakePrincipal": {
+            "additionalProperties": false,
+            "properties": {
+                "DataLakePrincipalIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataLakePrincipal": {
+                            "$ref": "#/definitions/AWS::LakeFormation::Permissions.DataLakePrincipal"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PermissionsWithGrantOption": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Resource": {
+                            "$ref": "#/definitions/AWS::LakeFormation::Permissions.Resource"
+                        }
+                    },
+                    "required": [
+                        "DataLakePrincipal",
+                        "Resource"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LakeFormation::Permissions"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.ColumnWildcard": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludedColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.DataLakePrincipal": {
+            "additionalProperties": false,
+            "properties": {
+                "DataLakePrincipalIdentifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.DataLocationResource": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "S3Resource": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.DatabaseResource": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.Resource": {
+            "additionalProperties": false,
+            "properties": {
+                "DataLocationResource": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.DataLocationResource"
+                },
+                "DatabaseResource": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.DatabaseResource"
+                },
+                "TableResource": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.TableResource"
+                },
+                "TableWithColumnsResource": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.TableWithColumnsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.TableResource": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "TableWildcard": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.TableWildcard"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.TableWildcard": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::LakeFormation::Permissions.TableWithColumnsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "CatalogId": {
+                    "type": "string"
+                },
+                "ColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ColumnWildcard": {
+                    "$ref": "#/definitions/AWS::LakeFormation::Permissions.ColumnWildcard"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LakeFormation::Resource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "UseServiceLinkedRole": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ResourceArn",
+                        "UseServiceLinkedRole"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LakeFormation::Resource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Alias": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "FunctionVersion": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ProvisionedConcurrencyConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Alias.ProvisionedConcurrencyConfiguration"
+                        },
+                        "RoutingConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Alias.AliasRoutingConfiguration"
+                        }
+                    },
+                    "required": [
+                        "FunctionName",
+                        "FunctionVersion",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::Alias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Alias.AliasRoutingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AdditionalVersionWeights": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Lambda::Alias.VersionWeight"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AdditionalVersionWeights"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Alias.ProvisionedConcurrencyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ProvisionedConcurrentExecutions": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ProvisionedConcurrentExecutions"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Alias.VersionWeight": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionVersion": {
+                    "type": "string"
+                },
+                "FunctionWeight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FunctionVersion",
+                "FunctionWeight"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::CodeSigningConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowedPublishers": {
+                            "$ref": "#/definitions/AWS::Lambda::CodeSigningConfig.AllowedPublishers"
+                        },
+                        "CodeSigningPolicies": {
+                            "$ref": "#/definitions/AWS::Lambda::CodeSigningConfig.CodeSigningPolicies"
+                        },
+                        "Description": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AllowedPublishers"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::CodeSigningConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::CodeSigningConfig.AllowedPublishers": {
+            "additionalProperties": false,
+            "properties": {
+                "SigningProfileVersionArns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SigningProfileVersionArns"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::CodeSigningConfig.CodeSigningPolicies": {
+            "additionalProperties": false,
+            "properties": {
+                "UntrustedArtifactOnDeployment": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "UntrustedArtifactOnDeployment"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::EventInvokeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::EventInvokeConfig.DestinationConfig"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "MaximumEventAgeInSeconds": {
+                            "type": "number"
+                        },
+                        "MaximumRetryAttempts": {
+                            "type": "number"
+                        },
+                        "Qualifier": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FunctionName",
+                        "Qualifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::EventInvokeConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::EventInvokeConfig.DestinationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "OnFailure": {
+                    "$ref": "#/definitions/AWS::Lambda::EventInvokeConfig.OnFailure"
+                },
+                "OnSuccess": {
+                    "$ref": "#/definitions/AWS::Lambda::EventInvokeConfig.OnSuccess"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::EventInvokeConfig.OnFailure": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::EventInvokeConfig.OnSuccess": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BatchSize": {
+                            "type": "number"
+                        },
+                        "BisectBatchOnFunctionError": {
+                            "type": "boolean"
+                        },
+                        "DestinationConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.DestinationConfig"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "EventSourceArn": {
+                            "type": "string"
+                        },
+                        "FilterCriteria": {
+                            "type": "object"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "FunctionResponseTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MaximumBatchingWindowInSeconds": {
+                            "type": "number"
+                        },
+                        "MaximumRecordAgeInSeconds": {
+                            "type": "number"
+                        },
+                        "MaximumRetryAttempts": {
+                            "type": "number"
+                        },
+                        "ParallelizationFactor": {
+                            "type": "number"
+                        },
+                        "Queues": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SelfManagedEventSource": {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SelfManagedEventSource"
+                        },
+                        "SourceAccessConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.SourceAccessConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "StartingPosition": {
+                            "type": "string"
+                        },
+                        "StartingPositionTimestamp": {
+                            "type": "number"
+                        },
+                        "Topics": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "TumblingWindowInSeconds": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "FunctionName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::EventSourceMapping"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping.DestinationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "OnFailure": {
+                    "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.OnFailure"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping.Endpoints": {
+            "additionalProperties": false,
+            "properties": {
+                "KafkaBootstrapServers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping.OnFailure": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping.SelfManagedEventSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoints": {
+                    "$ref": "#/definitions/AWS::Lambda::EventSourceMapping.Endpoints"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::EventSourceMapping.SourceAccessConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "URI": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Architectures": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Code": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.Code"
+                        },
+                        "CodeSigningConfigArn": {
+                            "type": "string"
+                        },
+                        "DeadLetterConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.DeadLetterConfig"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Environment": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.Environment"
+                        },
+                        "FileSystemConfigs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Lambda::Function.FileSystemConfig"
+                            },
+                            "type": "array"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "Handler": {
+                            "type": "string"
+                        },
+                        "ImageConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.ImageConfig"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "Layers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MemorySize": {
+                            "type": "number"
+                        },
+                        "PackageType": {
+                            "type": "string"
+                        },
+                        "ReservedConcurrentExecutions": {
+                            "type": "number"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "Runtime": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Timeout": {
+                            "type": "number"
+                        },
+                        "TracingConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.TracingConfig"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Function.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "Code",
+                        "Role"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::Function"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Function.Code": {
+            "additionalProperties": false,
+            "properties": {
+                "ImageUri": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                },
+                "S3ObjectVersion": {
+                    "type": "string"
+                },
+                "ZipFile": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function.DeadLetterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function.Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "Variables": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function.FileSystemConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "LocalMountPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn",
+                "LocalMountPath"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Function.ImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Command": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EntryPoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "WorkingDirectory": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function.TracingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::Function.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lambda::LayerVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CompatibleArchitectures": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CompatibleRuntimes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Content": {
+                            "$ref": "#/definitions/AWS::Lambda::LayerVersion.Content"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LayerName": {
+                            "type": "string"
+                        },
+                        "LicenseInfo": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Content"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::LayerVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::LayerVersion.Content": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                },
+                "S3ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::LayerVersionPermission": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "LayerVersionArn": {
+                            "type": "string"
+                        },
+                        "OrganizationId": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Action",
+                        "LayerVersionArn",
+                        "Principal"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::LayerVersionPermission"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Permission": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "EventSourceToken": {
+                            "type": "string"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        },
+                        "SourceAccount": {
+                            "type": "string"
+                        },
+                        "SourceArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Action",
+                        "FunctionName",
+                        "Principal"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::Permission"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Version": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CodeSha256": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "ProvisionedConcurrencyConfig": {
+                            "$ref": "#/definitions/AWS::Lambda::Version.ProvisionedConcurrencyConfiguration"
+                        }
+                    },
+                    "required": [
+                        "FunctionName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lambda::Version"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lambda::Version.ProvisionedConcurrencyConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ProvisionedConcurrentExecutions": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ProvisionedConcurrentExecutions"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::Grant": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowedOperations": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "GrantName": {
+                            "type": "string"
+                        },
+                        "HomeRegion": {
+                            "type": "string"
+                        },
+                        "LicenseArn": {
+                            "type": "string"
+                        },
+                        "Principals": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LicenseManager::Grant"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Beneficiary": {
+                            "type": "string"
+                        },
+                        "ConsumptionConfiguration": {
+                            "$ref": "#/definitions/AWS::LicenseManager::License.ConsumptionConfiguration"
+                        },
+                        "Entitlements": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::LicenseManager::License.Entitlement"
+                            },
+                            "type": "array"
+                        },
+                        "HomeRegion": {
+                            "type": "string"
+                        },
+                        "Issuer": {
+                            "$ref": "#/definitions/AWS::LicenseManager::License.IssuerData"
+                        },
+                        "LicenseMetadata": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::LicenseManager::License.Metadata"
+                            },
+                            "type": "array"
+                        },
+                        "LicenseName": {
+                            "type": "string"
+                        },
+                        "ProductName": {
+                            "type": "string"
+                        },
+                        "ProductSKU": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Validity": {
+                            "$ref": "#/definitions/AWS::LicenseManager::License.ValidityDateFormat"
+                        }
+                    },
+                    "required": [
+                        "ConsumptionConfiguration",
+                        "Entitlements",
+                        "HomeRegion",
+                        "Issuer",
+                        "LicenseName",
+                        "ProductName",
+                        "Validity"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LicenseManager::License"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.BorrowConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowEarlyCheckIn": {
+                    "type": "boolean"
+                },
+                "MaxTimeToLiveInMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AllowEarlyCheckIn",
+                "MaxTimeToLiveInMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.ConsumptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BorrowConfiguration": {
+                    "$ref": "#/definitions/AWS::LicenseManager::License.BorrowConfiguration"
+                },
+                "ProvisionalConfiguration": {
+                    "$ref": "#/definitions/AWS::LicenseManager::License.ProvisionalConfiguration"
+                },
+                "RenewType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.Entitlement": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowCheckIn": {
+                    "type": "boolean"
+                },
+                "MaxCount": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Overage": {
+                    "type": "boolean"
+                },
+                "Unit": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Unit"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.IssuerData": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SignKey": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.Metadata": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.ProvisionalConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxTimeToLiveInMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxTimeToLiveInMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::LicenseManager::License.ValidityDateFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "Begin": {
+                    "type": "string"
+                },
+                "End": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Begin",
+                "End"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Database": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "BackupRetention": {
+                            "type": "boolean"
+                        },
+                        "CaCertificateIdentifier": {
+                            "type": "string"
+                        },
+                        "MasterDatabaseName": {
+                            "type": "string"
+                        },
+                        "MasterUserPassword": {
+                            "type": "string"
+                        },
+                        "MasterUsername": {
+                            "type": "string"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "PubliclyAccessible": {
+                            "type": "boolean"
+                        },
+                        "RelationalDatabaseBlueprintId": {
+                            "type": "string"
+                        },
+                        "RelationalDatabaseBundleId": {
+                            "type": "string"
+                        },
+                        "RelationalDatabaseName": {
+                            "type": "string"
+                        },
+                        "RelationalDatabaseParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Lightsail::Database.RelationalDatabaseParameter"
+                            },
+                            "type": "array"
+                        },
+                        "RotateMasterUserPassword": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MasterDatabaseName",
+                        "MasterUsername",
+                        "RelationalDatabaseBlueprintId",
+                        "RelationalDatabaseBundleId",
+                        "RelationalDatabaseName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lightsail::Database"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Database.RelationalDatabaseParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedValues": {
+                    "type": "string"
+                },
+                "ApplyMethod": {
+                    "type": "string"
+                },
+                "ApplyType": {
+                    "type": "string"
+                },
+                "DataType": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "IsModifiable": {
+                    "type": "boolean"
+                },
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Disk": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AddOns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Lightsail::Disk.AddOn"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "DiskName": {
+                            "type": "string"
+                        },
+                        "SizeInGb": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DiskName",
+                        "SizeInGb"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lightsail::Disk"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Disk.AddOn": {
+            "additionalProperties": false,
+            "properties": {
+                "AddOnType": {
+                    "type": "string"
+                },
+                "AutoSnapshotAddOnRequest": {
+                    "$ref": "#/definitions/AWS::Lightsail::Disk.AutoSnapshotAddOn"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AddOnType"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Disk.AutoSnapshotAddOn": {
+            "additionalProperties": false,
+            "properties": {
+                "SnapshotTimeOfDay": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AddOns": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Lightsail::Instance.AddOn"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "BlueprintId": {
+                            "type": "string"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Hardware": {
+                            "$ref": "#/definitions/AWS::Lightsail::Instance.Hardware"
+                        },
+                        "InstanceName": {
+                            "type": "string"
+                        },
+                        "KeyPairName": {
+                            "type": "string"
+                        },
+                        "Networking": {
+                            "$ref": "#/definitions/AWS::Lightsail::Instance.Networking"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserData": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "BlueprintId",
+                        "BundleId",
+                        "InstanceName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lightsail::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.AddOn": {
+            "additionalProperties": false,
+            "properties": {
+                "AddOnType": {
+                    "type": "string"
+                },
+                "AutoSnapshotAddOnRequest": {
+                    "$ref": "#/definitions/AWS::Lightsail::Instance.AutoSnapshotAddOn"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AddOnType"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.AutoSnapshotAddOn": {
+            "additionalProperties": false,
+            "properties": {
+                "SnapshotTimeOfDay": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.Disk": {
+            "additionalProperties": false,
+            "properties": {
+                "AttachedTo": {
+                    "type": "string"
+                },
+                "AttachmentState": {
+                    "type": "string"
+                },
+                "DiskName": {
+                    "type": "string"
+                },
+                "IOPS": {
+                    "type": "number"
+                },
+                "IsSystemDisk": {
+                    "type": "boolean"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "SizeInGb": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DiskName",
+                "Path"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.Hardware": {
+            "additionalProperties": false,
+            "properties": {
+                "CpuCount": {
+                    "type": "number"
+                },
+                "Disks": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Lightsail::Instance.Disk"
+                    },
+                    "type": "array"
+                },
+                "RamSizeInGb": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.Location": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "RegionName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.MonthlyTransfer": {
+            "additionalProperties": false,
+            "properties": {
+                "GbPerMonthAllocated": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.Networking": {
+            "additionalProperties": false,
+            "properties": {
+                "MonthlyTransfer": {
+                    "$ref": "#/definitions/AWS::Lightsail::Instance.MonthlyTransfer"
+                },
+                "Ports": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Lightsail::Instance.Port"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Ports"
+            ],
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.Port": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessDirection": {
+                    "type": "string"
+                },
+                "AccessFrom": {
+                    "type": "string"
+                },
+                "AccessType": {
+                    "type": "string"
+                },
+                "CidrListAliases": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Cidrs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CommonName": {
+                    "type": "string"
+                },
+                "FromPort": {
+                    "type": "number"
+                },
+                "Ipv6Cidrs": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::Instance.State": {
+            "additionalProperties": false,
+            "properties": {
+                "Code": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Lightsail::StaticIp": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AttachedTo": {
+                            "type": "string"
+                        },
+                        "StaticIpName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "StaticIpName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Lightsail::StaticIp"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::GeofenceCollection": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CollectionName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        },
+                        "PricingPlanDataSource": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CollectionName",
+                        "PricingPlan"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::GeofenceCollection"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::Map": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::Location::Map.MapConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "MapName": {
+                            "type": "string"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Configuration",
+                        "MapName",
+                        "PricingPlan"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::Map"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::Map.MapConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Style": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Style"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::PlaceIndex": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataSource": {
+                            "type": "string"
+                        },
+                        "DataSourceConfiguration": {
+                            "$ref": "#/definitions/AWS::Location::PlaceIndex.DataSourceConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IndexName": {
+                            "type": "string"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DataSource",
+                        "IndexName",
+                        "PricingPlan"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::PlaceIndex"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::PlaceIndex.DataSourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "IntendedUse": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Location::RouteCalculator": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CalculatorName": {
+                            "type": "string"
+                        },
+                        "DataSource": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CalculatorName",
+                        "DataSource",
+                        "PricingPlan"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::RouteCalculator"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::Tracker": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "PositionFiltering": {
+                            "type": "string"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        },
+                        "PricingPlanDataSource": {
+                            "type": "string"
+                        },
+                        "TrackerName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PricingPlan",
+                        "TrackerName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::Tracker"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Location::TrackerConsumer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConsumerArn": {
+                            "type": "string"
+                        },
+                        "TrackerName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConsumerArn",
+                        "TrackerName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Location::TrackerConsumer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationName": {
+                            "type": "string"
+                        },
+                        "DestinationPolicy": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "TargetArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationName",
+                        "DestinationPolicy",
+                        "RoleArn",
+                        "TargetArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::Destination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::LogGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "RetentionInDays": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::LogGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::LogStream": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "LogStreamName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LogGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::LogStream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::MetricFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FilterPattern": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "MetricTransformations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Logs::MetricFilter.MetricTransformation"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FilterPattern",
+                        "LogGroupName",
+                        "MetricTransformations"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::MetricFilter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::MetricFilter.MetricTransformation": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultValue": {
+                    "type": "number"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "MetricNamespace": {
+                    "type": "string"
+                },
+                "MetricValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricName",
+                "MetricNamespace",
+                "MetricValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::QueryDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LogGroupNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QueryString": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "QueryString"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::QueryDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::ResourcePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyDocument": {
+                            "type": "string"
+                        },
+                        "PolicyName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument",
+                        "PolicyName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::ResourcePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Logs::SubscriptionFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationArn": {
+                            "type": "string"
+                        },
+                        "FilterPattern": {
+                            "type": "string"
+                        },
+                        "LogGroupName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DestinationArn",
+                        "FilterPattern",
+                        "LogGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Logs::SubscriptionFilter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutEquipment::InferenceScheduler": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataDelayOffsetInMinutes": {
+                            "type": "number"
+                        },
+                        "DataInputConfiguration": {
+                            "type": "object"
+                        },
+                        "DataOutputConfiguration": {
+                            "type": "object"
+                        },
+                        "DataUploadFrequency": {
+                            "type": "string"
+                        },
+                        "InferenceSchedulerName": {
+                            "type": "string"
+                        },
+                        "ModelName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "ServerSideKmsKeyId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DataInputConfiguration",
+                        "DataOutputConfiguration",
+                        "DataUploadFrequency",
+                        "ModelName",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LookoutEquipment::InferenceScheduler"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::Alert": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "$ref": "#/definitions/AWS::LookoutMetrics::Alert.Action"
+                        },
+                        "AlertDescription": {
+                            "type": "string"
+                        },
+                        "AlertName": {
+                            "type": "string"
+                        },
+                        "AlertSensitivityThreshold": {
+                            "type": "number"
+                        },
+                        "AnomalyDetectorArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Action",
+                        "AlertSensitivityThreshold",
+                        "AnomalyDetectorArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LookoutMetrics::Alert"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::Alert.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaConfiguration": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::Alert.LambdaConfiguration"
+                },
+                "SNSConfiguration": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::Alert.SNSConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::Alert.LambdaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaArn": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LambdaArn",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::Alert.SNSConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SnsTopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SnsTopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AnomalyDetectorConfig": {
+                            "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.AnomalyDetectorConfig"
+                        },
+                        "AnomalyDetectorDescription": {
+                            "type": "string"
+                        },
+                        "AnomalyDetectorName": {
+                            "type": "string"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "MetricSetList": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.MetricSet"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AnomalyDetectorConfig",
+                        "MetricSetList"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LookoutMetrics::AnomalyDetector"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.AnomalyDetectorConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AnomalyDetectorFrequency": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AnomalyDetectorFrequency"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.AppFlowConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FlowName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FlowName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.CloudwatchConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.CsvFormatDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "Charset": {
+                    "type": "string"
+                },
+                "ContainsHeader": {
+                    "type": "boolean"
+                },
+                "Delimiter": {
+                    "type": "string"
+                },
+                "FileCompression": {
+                    "type": "string"
+                },
+                "HeaderList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "QuoteSymbol": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.FileFormatDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "CsvFormatDescriptor": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.CsvFormatDescriptor"
+                },
+                "JsonFormatDescriptor": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.JsonFormatDescriptor"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.JsonFormatDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "Charset": {
+                    "type": "string"
+                },
+                "FileCompression": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.Metric": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregationFunction": {
+                    "type": "string"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AggregationFunction",
+                "MetricName"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.MetricSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MetricList": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.Metric"
+                    },
+                    "type": "array"
+                },
+                "MetricSetDescription": {
+                    "type": "string"
+                },
+                "MetricSetFrequency": {
+                    "type": "string"
+                },
+                "MetricSetName": {
+                    "type": "string"
+                },
+                "MetricSource": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.MetricSource"
+                },
+                "Offset": {
+                    "type": "number"
+                },
+                "TimestampColumn": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.TimestampColumn"
+                },
+                "Timezone": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MetricList",
+                "MetricSetName",
+                "MetricSource"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.MetricSource": {
+            "additionalProperties": false,
+            "properties": {
+                "AppFlowConfig": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.AppFlowConfig"
+                },
+                "CloudwatchConfig": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.CloudwatchConfig"
+                },
+                "RDSSourceConfig": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.RDSSourceConfig"
+                },
+                "RedshiftSourceConfig": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.RedshiftSourceConfig"
+                },
+                "S3SourceConfig": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.S3SourceConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.RDSSourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DBInstanceIdentifier": {
+                    "type": "string"
+                },
+                "DatabaseHost": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DatabasePort": {
+                    "type": "number"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretManagerArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.VpcConfiguration"
+                }
+            },
+            "required": [
+                "DBInstanceIdentifier",
+                "DatabaseHost",
+                "DatabaseName",
+                "DatabasePort",
+                "RoleArn",
+                "SecretManagerArn",
+                "TableName",
+                "VpcConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.RedshiftSourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterIdentifier": {
+                    "type": "string"
+                },
+                "DatabaseHost": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DatabasePort": {
+                    "type": "number"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretManagerArn": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "VpcConfiguration": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.VpcConfiguration"
+                }
+            },
+            "required": [
+                "ClusterIdentifier",
+                "DatabaseHost",
+                "DatabaseName",
+                "DatabasePort",
+                "RoleArn",
+                "SecretManagerArn",
+                "TableName",
+                "VpcConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.S3SourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FileFormatDescriptor": {
+                    "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector.FileFormatDescriptor"
+                },
+                "HistoricalDataPathList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TemplatedPathList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FileFormatDescriptor",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.TimestampColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnFormat": {
+                    "type": "string"
+                },
+                "ColumnName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::LookoutMetrics::AnomalyDetector.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIdList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIdList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIdList",
+                "SubnetIdList"
+            ],
+            "type": "object"
+        },
+        "AWS::LookoutVision::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ProjectName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProjectName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::LookoutVision::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BrokerNodeGroupInfo": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.BrokerNodeGroupInfo"
+                        },
+                        "ClientAuthentication": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.ClientAuthentication"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "ConfigurationInfo": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.ConfigurationInfo"
+                        },
+                        "EncryptionInfo": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.EncryptionInfo"
+                        },
+                        "EnhancedMonitoring": {
+                            "type": "string"
+                        },
+                        "KafkaVersion": {
+                            "type": "string"
+                        },
+                        "LoggingInfo": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.LoggingInfo"
+                        },
+                        "NumberOfBrokerNodes": {
+                            "type": "number"
+                        },
+                        "OpenMonitoring": {
+                            "$ref": "#/definitions/AWS::MSK::Cluster.OpenMonitoring"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "BrokerNodeGroupInfo",
+                        "ClusterName",
+                        "KafkaVersion",
+                        "NumberOfBrokerNodes"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MSK::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.BrokerLogs": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogs": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.CloudWatchLogs"
+                },
+                "Firehose": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Firehose"
+                },
+                "S3": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.S3"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.BrokerNodeGroupInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "BrokerAZDistribution": {
+                    "type": "string"
+                },
+                "ClientSubnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ConnectivityInfo": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.ConnectivityInfo"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StorageInfo": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.StorageInfo"
+                }
+            },
+            "required": [
+                "ClientSubnets",
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.ClientAuthentication": {
+            "additionalProperties": false,
+            "properties": {
+                "Sasl": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Sasl"
+                },
+                "Tls": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Tls"
+                },
+                "Unauthenticated": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Unauthenticated"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.CloudWatchLogs": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "LogGroup": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.ConfigurationInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "Revision": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Arn",
+                "Revision"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.ConnectivityInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "PublicAccess": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.PublicAccess"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.EBSStorageInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "VolumeSize": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.EncryptionAtRest": {
+            "additionalProperties": false,
+            "properties": {
+                "DataVolumeKMSKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataVolumeKMSKeyId"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.EncryptionInTransit": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientBroker": {
+                    "type": "string"
+                },
+                "InCluster": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.EncryptionInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionAtRest": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.EncryptionAtRest"
+                },
+                "EncryptionInTransit": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.EncryptionInTransit"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Firehose": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStream": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Iam": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.JmxExporter": {
+            "additionalProperties": false,
+            "properties": {
+                "EnabledInBroker": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "EnabledInBroker"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.LoggingInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "BrokerLogs": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.BrokerLogs"
+                }
+            },
+            "required": [
+                "BrokerLogs"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.NodeExporter": {
+            "additionalProperties": false,
+            "properties": {
+                "EnabledInBroker": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "EnabledInBroker"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.OpenMonitoring": {
+            "additionalProperties": false,
+            "properties": {
+                "Prometheus": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Prometheus"
+                }
+            },
+            "required": [
+                "Prometheus"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Prometheus": {
+            "additionalProperties": false,
+            "properties": {
+                "JmxExporter": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.JmxExporter"
+                },
+                "NodeExporter": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.NodeExporter"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.PublicAccess": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.S3": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Sasl": {
+            "additionalProperties": false,
+            "properties": {
+                "Iam": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Iam"
+                },
+                "Scram": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.Scram"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Scram": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.StorageInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "EBSStorageInfo": {
+                    "$ref": "#/definitions/AWS::MSK::Cluster.EBSStorageInfo"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Tls": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateAuthorityArnList": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MSK::Cluster.Unauthenticated": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "Enabled"
+            ],
+            "type": "object"
+        },
+        "AWS::MWAA::Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AirflowConfigurationOptions": {
+                            "type": "object"
+                        },
+                        "AirflowVersion": {
+                            "type": "string"
+                        },
+                        "DagS3Path": {
+                            "type": "string"
+                        },
+                        "EnvironmentClass": {
+                            "type": "string"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "KmsKey": {
+                            "type": "string"
+                        },
+                        "LoggingConfiguration": {
+                            "$ref": "#/definitions/AWS::MWAA::Environment.LoggingConfiguration"
+                        },
+                        "MaxWorkers": {
+                            "type": "number"
+                        },
+                        "MinWorkers": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NetworkConfiguration": {
+                            "$ref": "#/definitions/AWS::MWAA::Environment.NetworkConfiguration"
+                        },
+                        "PluginsS3ObjectVersion": {
+                            "type": "string"
+                        },
+                        "PluginsS3Path": {
+                            "type": "string"
+                        },
+                        "RequirementsS3ObjectVersion": {
+                            "type": "string"
+                        },
+                        "RequirementsS3Path": {
+                            "type": "string"
+                        },
+                        "Schedulers": {
+                            "type": "number"
+                        },
+                        "SourceBucketArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "WebserverAccessMode": {
+                            "type": "string"
+                        },
+                        "WeeklyMaintenanceWindowStart": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MWAA::Environment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MWAA::Environment.LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DagProcessingLogs": {
+                    "$ref": "#/definitions/AWS::MWAA::Environment.ModuleLoggingConfiguration"
+                },
+                "SchedulerLogs": {
+                    "$ref": "#/definitions/AWS::MWAA::Environment.ModuleLoggingConfiguration"
+                },
+                "TaskLogs": {
+                    "$ref": "#/definitions/AWS::MWAA::Environment.ModuleLoggingConfiguration"
+                },
+                "WebserverLogs": {
+                    "$ref": "#/definitions/AWS::MWAA::Environment.ModuleLoggingConfiguration"
+                },
+                "WorkerLogs": {
+                    "$ref": "#/definitions/AWS::MWAA::Environment.ModuleLoggingConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MWAA::Environment.ModuleLoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogGroupArn": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "LogLevel": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MWAA::Environment.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Macie::CustomDataIdentifier": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "IgnoreWords": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Keywords": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MaximumMatchDistance": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Regex": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Regex"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Macie::CustomDataIdentifier"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Macie::FindingsFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FindingCriteria": {
+                            "$ref": "#/definitions/AWS::Macie::FindingsFilter.FindingCriteria"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Position": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "FindingCriteria",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Macie::FindingsFilter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Macie::FindingsFilter.Criterion": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::Macie::FindingsFilter.FindingCriteria": {
+            "additionalProperties": false,
+            "properties": {
+                "Criterion": {
+                    "$ref": "#/definitions/AWS::Macie::FindingsFilter.Criterion"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Macie::FindingsFilter.FindingsFilterListItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Macie::Session": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FindingPublishingFrequency": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Macie::Session"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InvitationId": {
+                            "type": "string"
+                        },
+                        "MemberConfiguration": {
+                            "$ref": "#/definitions/AWS::ManagedBlockchain::Member.MemberConfiguration"
+                        },
+                        "NetworkConfiguration": {
+                            "$ref": "#/definitions/AWS::ManagedBlockchain::Member.NetworkConfiguration"
+                        },
+                        "NetworkId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "MemberConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ManagedBlockchain::Member"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.ApprovalThresholdPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ProposalDurationInHours": {
+                    "type": "number"
+                },
+                "ThresholdComparator": {
+                    "type": "string"
+                },
+                "ThresholdPercentage": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.MemberConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "MemberFrameworkConfiguration": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.MemberFrameworkConfiguration"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.MemberFabricConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AdminPassword": {
+                    "type": "string"
+                },
+                "AdminUsername": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AdminPassword",
+                "AdminUsername"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.MemberFrameworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MemberFabricConfiguration": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.MemberFabricConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.NetworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Framework": {
+                    "type": "string"
+                },
+                "FrameworkVersion": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "NetworkFrameworkConfiguration": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.NetworkFrameworkConfiguration"
+                },
+                "VotingPolicy": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.VotingPolicy"
+                }
+            },
+            "required": [
+                "Framework",
+                "FrameworkVersion",
+                "Name",
+                "VotingPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.NetworkFabricConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Edition": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Edition"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.NetworkFrameworkConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NetworkFabricConfiguration": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.NetworkFabricConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Member.VotingPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ApprovalThresholdPolicy": {
+                    "$ref": "#/definitions/AWS::ManagedBlockchain::Member.ApprovalThresholdPolicy"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Node": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MemberId": {
+                            "type": "string"
+                        },
+                        "NetworkId": {
+                            "type": "string"
+                        },
+                        "NodeConfiguration": {
+                            "$ref": "#/definitions/AWS::ManagedBlockchain::Node.NodeConfiguration"
+                        }
+                    },
+                    "required": [
+                        "NetworkId",
+                        "NodeConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ManagedBlockchain::Node"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ManagedBlockchain::Node.NodeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZone": {
+                    "type": "string"
+                },
+                "InstanceType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AvailabilityZone",
+                "InstanceType"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Source": {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow.Source"
+                        },
+                        "SourceFailoverConfig": {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow.FailoverConfig"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Source"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::Flow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.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": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.FailoverConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RecoveryWindow": {
+                    "type": "number"
+                },
+                "State": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConnect::Flow.Source": {
+            "additionalProperties": false,
+            "properties": {
+                "Decryption": {
+                    "$ref": "#/definitions/AWS::MediaConnect::Flow.Encryption"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "EntitlementArn": {
+                    "type": "string"
+                },
+                "IngestIp": {
+                    "type": "string"
+                },
+                "IngestPort": {
+                    "type": "number"
+                },
+                "MaxBitrate": {
+                    "type": "number"
+                },
+                "MaxLatency": {
+                    "type": "number"
+                },
+                "MinLatency": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "SourceArn": {
+                    "type": "string"
+                },
+                "SourceIngestPort": {
+                    "type": "string"
+                },
+                "StreamId": {
+                    "type": "string"
+                },
+                "VpcInterfaceName": {
+                    "type": "string"
+                },
+                "WhitelistCidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowEntitlement": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CidrAllowList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Destination": {
+                            "type": "string"
+                        },
+                        "Encryption": {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.Encryption"
+                        },
+                        "FlowArn": {
+                            "type": "string"
+                        },
+                        "MaxLatency": {
+                            "type": "number"
+                        },
+                        "MinLatency": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "RemoteId": {
+                            "type": "string"
+                        },
+                        "SmoothingLatency": {
+                            "type": "number"
+                        },
+                        "StreamId": {
+                            "type": "string"
+                        },
+                        "VpcInterfaceAttachment": {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowOutput.VpcInterfaceAttachment"
+                        }
+                    },
+                    "required": [
+                        "FlowArn",
+                        "Protocol"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::FlowOutput"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput.Encryption": {
+            "additionalProperties": false,
+            "properties": {
+                "Algorithm": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SecretArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowOutput.VpcInterfaceAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "VpcInterfaceName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Decryption": {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowSource.Encryption"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EntitlementArn": {
+                            "type": "string"
+                        },
+                        "FlowArn": {
+                            "type": "string"
+                        },
+                        "IngestPort": {
+                            "type": "number"
+                        },
+                        "MaxBitrate": {
+                            "type": "number"
+                        },
+                        "MaxLatency": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "StreamId": {
+                            "type": "string"
+                        },
+                        "VpcInterfaceName": {
+                            "type": "string"
+                        },
+                        "WhitelistCidr": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::FlowSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConnect::FlowSource.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::FlowVpcInterface": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FlowArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FlowArn",
+                        "Name",
+                        "RoleArn",
+                        "SecurityGroupIds",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConnect::FlowVpcInterface"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConvert::JobTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccelerationSettings": {
+                            "$ref": "#/definitions/AWS::MediaConvert::JobTemplate.AccelerationSettings"
+                        },
+                        "Category": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "HopDestinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaConvert::JobTemplate.HopDestination"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        },
+                        "Queue": {
+                            "type": "string"
+                        },
+                        "SettingsJson": {
+                            "type": "object"
+                        },
+                        "StatusUpdateInterval": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "SettingsJson"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConvert::JobTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConvert::JobTemplate.AccelerationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConvert::JobTemplate.HopDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "Queue": {
+                    "type": "string"
+                },
+                "WaitMinutes": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaConvert::Preset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Category": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SettingsJson": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "SettingsJson"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConvert::Preset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaConvert::Queue": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "PricingPlan": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaConvert::Queue"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CdiInputSpecification": {
+                            "$ref": "#/definitions/AWS::MediaLive::Channel.CdiInputSpecification"
+                        },
+                        "ChannelClass": {
+                            "type": "string"
+                        },
+                        "Destinations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Channel.OutputDestination"
+                            },
+                            "type": "array"
+                        },
+                        "EncoderSettings": {
+                            "$ref": "#/definitions/AWS::MediaLive::Channel.EncoderSettings"
+                        },
+                        "InputAttachments": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::Channel.InputAttachment"
+                            },
+                            "type": "array"
+                        },
+                        "InputSpecification": {
+                            "$ref": "#/definitions/AWS::MediaLive::Channel.InputSpecification"
+                        },
+                        "LogLevel": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Vpc": {
+                            "$ref": "#/definitions/AWS::MediaLive::Channel.VpcOutputSettings"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::Channel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AacSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Bitrate": {
+                    "type": "number"
+                },
+                "CodingMode": {
+                    "type": "string"
+                },
+                "InputType": {
+                    "type": "string"
+                },
+                "Profile": {
+                    "type": "string"
+                },
+                "RateControlMode": {
+                    "type": "string"
+                },
+                "RawFormat": {
+                    "type": "string"
+                },
+                "SampleRate": {
+                    "type": "number"
+                },
+                "Spec": {
+                    "type": "string"
+                },
+                "VbrQuality": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Ac3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "Bitrate": {
+                    "type": "number"
+                },
+                "BitstreamMode": {
+                    "type": "string"
+                },
+                "CodingMode": {
+                    "type": "string"
+                },
+                "Dialnorm": {
+                    "type": "number"
+                },
+                "DrcProfile": {
+                    "type": "string"
+                },
+                "LfeFilter": {
+                    "type": "string"
+                },
+                "MetadataControl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AncillarySourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceAncillaryChannelNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ArchiveCdnSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ArchiveS3Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ArchiveS3Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ArchiveContainerSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "M2tsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.M2tsSettings"
+                },
+                "RawSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.RawSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ArchiveGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ArchiveCdnSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ArchiveCdnSettings"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "RolloverInterval": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ArchiveOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ArchiveContainerSettings"
+                },
+                "Extension": {
+                    "type": "string"
+                },
+                "NameModifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ArchiveS3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "CannedAcl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AribDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AribSourceSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioChannelMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "InputChannelLevels": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.InputChannelLevel"
+                    },
+                    "type": "array"
+                },
+                "OutputChannel": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioCodecSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AacSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AacSettings"
+                },
+                "Ac3Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Ac3Settings"
+                },
+                "Eac3Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Eac3Settings"
+                },
+                "Mp2Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Mp2Settings"
+                },
+                "PassThroughSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.PassThroughSettings"
+                },
+                "WavSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.WavSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioNormalizationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioNormalizationSettings"
+                },
+                "AudioSelectorName": {
+                    "type": "string"
+                },
+                "AudioType": {
+                    "type": "string"
+                },
+                "AudioTypeControl": {
+                    "type": "string"
+                },
+                "AudioWatermarkingSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioWatermarkSettings"
+                },
+                "CodecSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioCodecSettings"
+                },
+                "LanguageCode": {
+                    "type": "string"
+                },
+                "LanguageCodeControl": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "RemixSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.RemixSettings"
+                },
+                "StreamName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioHlsRenditionSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "GroupId": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioLanguageSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "LanguageCode": {
+                    "type": "string"
+                },
+                "LanguageSelectionPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioNormalizationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Algorithm": {
+                    "type": "string"
+                },
+                "AlgorithmControl": {
+                    "type": "string"
+                },
+                "TargetLkfs": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioOnlyHlsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioGroupId": {
+                    "type": "string"
+                },
+                "AudioOnlyImage": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "AudioTrackType": {
+                    "type": "string"
+                },
+                "SegmentType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioPidSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "Pid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SelectorSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioSelectorSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioSelectorSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioHlsRenditionSelection": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioHlsRenditionSelection"
+                },
+                "AudioLanguageSelection": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioLanguageSelection"
+                },
+                "AudioPidSelection": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioPidSelection"
+                },
+                "AudioTrackSelection": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioTrackSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioSilenceFailoverSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioSelectorName": {
+                    "type": "string"
+                },
+                "AudioSilenceThresholdMsec": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioTrack": {
+            "additionalProperties": false,
+            "properties": {
+                "Track": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioTrackSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "Tracks": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.AudioTrack"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AudioWatermarkSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NielsenWatermarksSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.NielsenWatermarksSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AutomaticInputFailoverSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorClearTimeMsec": {
+                    "type": "number"
+                },
+                "FailoverConditions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.FailoverCondition"
+                    },
+                    "type": "array"
+                },
+                "InputPreference": {
+                    "type": "string"
+                },
+                "SecondaryInputId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AvailBlanking": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailBlankingImage": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "State": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AvailConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AvailSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.AvailSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Scte35SpliceInsert": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte35SpliceInsert"
+                },
+                "Scte35TimeSignalApos": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte35TimeSignalApos"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.BlackoutSlate": {
+            "additionalProperties": false,
+            "properties": {
+                "BlackoutSlateImage": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "NetworkEndBlackout": {
+                    "type": "string"
+                },
+                "NetworkEndBlackoutImage": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "NetworkId": {
+                    "type": "string"
+                },
+                "State": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.BurnInDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BackgroundOpacity": {
+                    "type": "number"
+                },
+                "Font": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "FontColor": {
+                    "type": "string"
+                },
+                "FontOpacity": {
+                    "type": "number"
+                },
+                "FontResolution": {
+                    "type": "number"
+                },
+                "FontSize": {
+                    "type": "string"
+                },
+                "OutlineColor": {
+                    "type": "string"
+                },
+                "OutlineSize": {
+                    "type": "number"
+                },
+                "ShadowColor": {
+                    "type": "string"
+                },
+                "ShadowOpacity": {
+                    "type": "number"
+                },
+                "ShadowXOffset": {
+                    "type": "number"
+                },
+                "ShadowYOffset": {
+                    "type": "number"
+                },
+                "TeletextGridControl": {
+                    "type": "string"
+                },
+                "XPosition": {
+                    "type": "number"
+                },
+                "YPosition": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptionSelectorName": {
+                    "type": "string"
+                },
+                "DestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionDestinationSettings"
+                },
+                "LanguageCode": {
+                    "type": "string"
+                },
+                "LanguageDescription": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AribDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AribDestinationSettings"
+                },
+                "BurnInDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.BurnInDestinationSettings"
+                },
+                "DvbSubDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.DvbSubDestinationSettings"
+                },
+                "EbuTtDDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.EbuTtDDestinationSettings"
+                },
+                "EmbeddedDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.EmbeddedDestinationSettings"
+                },
+                "EmbeddedPlusScte20DestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.EmbeddedPlusScte20DestinationSettings"
+                },
+                "RtmpCaptionInfoDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.RtmpCaptionInfoDestinationSettings"
+                },
+                "Scte20PlusEmbeddedDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte20PlusEmbeddedDestinationSettings"
+                },
+                "Scte27DestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte27DestinationSettings"
+                },
+                "SmpteTtDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.SmpteTtDestinationSettings"
+                },
+                "TeletextDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TeletextDestinationSettings"
+                },
+                "TtmlDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TtmlDestinationSettings"
+                },
+                "WebvttDestinationSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.WebvttDestinationSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionLanguageMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptionChannel": {
+                    "type": "number"
+                },
+                "LanguageCode": {
+                    "type": "string"
+                },
+                "LanguageDescription": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionRectangle": {
+            "additionalProperties": false,
+            "properties": {
+                "Height": {
+                    "type": "number"
+                },
+                "LeftOffset": {
+                    "type": "number"
+                },
+                "TopOffset": {
+                    "type": "number"
+                },
+                "Width": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "LanguageCode": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SelectorSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionSelectorSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CaptionSelectorSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AncillarySourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AncillarySourceSettings"
+                },
+                "AribSourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AribSourceSettings"
+                },
+                "DvbSubSourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.DvbSubSourceSettings"
+                },
+                "EmbeddedSourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.EmbeddedSourceSettings"
+                },
+                "Scte20SourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte20SourceSettings"
+                },
+                "Scte27SourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Scte27SourceSettings"
+                },
+                "TeletextSourceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TeletextSourceSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.CdiInputSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Resolution": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.ColorSpacePassthroughSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.DvbNitSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NetworkId": {
+                    "type": "number"
+                },
+                "NetworkName": {
+                    "type": "string"
+                },
+                "RepInterval": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.DvbSdtSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "OutputSdt": {
+                    "type": "string"
+                },
+                "RepInterval": {
+                    "type": "number"
+                },
+                "ServiceName": {
+                    "type": "string"
+                },
+                "ServiceProviderName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.DvbSubDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BackgroundOpacity": {
+                    "type": "number"
+                },
+                "Font": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "FontColor": {
+                    "type": "string"
+                },
+                "FontOpacity": {
+                    "type": "number"
+                },
+                "FontResolution": {
+                    "type": "number"
+                },
+                "FontSize": {
+                    "type": "string"
+                },
+                "OutlineColor": {
+                    "type": "string"
+                },
+                "OutlineSize": {
+                    "type": "number"
+                },
+                "ShadowColor": {
+                    "type": "string"
+                },
+                "ShadowOpacity": {
+                    "type": "number"
+                },
+                "ShadowXOffset": {
+                    "type": "number"
+                },
+                "ShadowYOffset": {
+                    "type": "number"
+                },
+                "TeletextGridControl": {
+                    "type": "string"
+                },
+                "XPosition": {
+                    "type": "number"
+                },
+                "YPosition": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.DvbSubSourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "OcrLanguage": {
+                    "type": "string"
+                },
+                "Pid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.DvbTdtSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "RepInterval": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Eac3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "AttenuationControl": {
+                    "type": "string"
+                },
+                "Bitrate": {
+                    "type": "number"
+                },
+                "BitstreamMode": {
+                    "type": "string"
+                },
+                "CodingMode": {
+                    "type": "string"
+                },
+                "DcFilter": {
+                    "type": "string"
+                },
+                "Dialnorm": {
+                    "type": "number"
+                },
+                "DrcLine": {
+                    "type": "string"
+                },
+                "DrcRf": {
+                    "type": "string"
+                },
+                "LfeControl": {
+                    "type": "string"
+                },
+                "LfeFilter": {
+                    "type": "string"
+                },
+                "LoRoCenterMixLevel": {
+                    "type": "number"
+                },
+                "LoRoSurroundMixLevel": {
+                    "type": "number"
+                },
+                "LtRtCenterMixLevel": {
+                    "type": "number"
+                },
+                "LtRtSurroundMixLevel": {
+                    "type": "number"
+                },
+                "MetadataControl": {
+                    "type": "string"
+                },
+                "PassthroughControl": {
+                    "type": "string"
+                },
+                "PhaseControl": {
+                    "type": "string"
+                },
+                "StereoDownmix": {
+                    "type": "string"
+                },
+                "SurroundExMode": {
+                    "type": "string"
+                },
+                "SurroundMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.EbuTtDDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyrightHolder": {
+                    "type": "string"
+                },
+                "FillLineGap": {
+                    "type": "string"
+                },
+                "FontFamily": {
+                    "type": "string"
+                },
+                "StyleControl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.EmbeddedDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.EmbeddedPlusScte20DestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.EmbeddedSourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Convert608To708": {
+                    "type": "string"
+                },
+                "Scte20Detection": {
+                    "type": "string"
+                },
+                "Source608ChannelNumber": {
+                    "type": "number"
+                },
+                "Source608TrackNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.EncoderSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioDescriptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.AudioDescription"
+                    },
+                    "type": "array"
+                },
+                "AvailBlanking": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AvailBlanking"
+                },
+                "AvailConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AvailConfiguration"
+                },
+                "BlackoutSlate": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.BlackoutSlate"
+                },
+                "CaptionDescriptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionDescription"
+                    },
+                    "type": "array"
+                },
+                "FeatureActivations": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FeatureActivations"
+                },
+                "GlobalConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.GlobalConfiguration"
+                },
+                "MotionGraphicsConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MotionGraphicsConfiguration"
+                },
+                "NielsenConfiguration": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.NielsenConfiguration"
+                },
+                "OutputGroups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.OutputGroup"
+                    },
+                    "type": "array"
+                },
+                "TimecodeConfig": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TimecodeConfig"
+                },
+                "VideoDescriptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.VideoDescription"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FailoverCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "FailoverConditionSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FailoverConditionSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FailoverConditionSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioSilenceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioSilenceFailoverSettings"
+                },
+                "InputLossSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLossFailoverSettings"
+                },
+                "VideoBlackSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoBlackFailoverSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FeatureActivations": {
+            "additionalProperties": false,
+            "properties": {
+                "InputPrepareScheduleActions": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FecOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnDepth": {
+                    "type": "number"
+                },
+                "IncludeFec": {
+                    "type": "string"
+                },
+                "RowLength": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Fmp4HlsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioRenditionSets": {
+                    "type": "string"
+                },
+                "NielsenId3Behavior": {
+                    "type": "string"
+                },
+                "TimedMetadataBehavior": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureCdnSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "FrameCaptureS3Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureS3Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "FrameCaptureCdnSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureCdnSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureHlsSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NameModifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureS3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "CannedAcl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.FrameCaptureSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureInterval": {
+                    "type": "number"
+                },
+                "CaptureIntervalUnits": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.GlobalConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InitialAudioGain": {
+                    "type": "number"
+                },
+                "InputEndAction": {
+                    "type": "string"
+                },
+                "InputLossBehavior": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLossBehavior"
+                },
+                "OutputLockingMode": {
+                    "type": "string"
+                },
+                "OutputTimingSource": {
+                    "type": "string"
+                },
+                "SupportLowFramerateInputs": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H264ColorSpaceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ColorSpacePassthroughSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ColorSpacePassthroughSettings"
+                },
+                "Rec601Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Rec601Settings"
+                },
+                "Rec709Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Rec709Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H264FilterSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "TemporalFilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TemporalFilterSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H264Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "AdaptiveQuantization": {
+                    "type": "string"
+                },
+                "AfdSignaling": {
+                    "type": "string"
+                },
+                "Bitrate": {
+                    "type": "number"
+                },
+                "BufFillPct": {
+                    "type": "number"
+                },
+                "BufSize": {
+                    "type": "number"
+                },
+                "ColorMetadata": {
+                    "type": "string"
+                },
+                "ColorSpaceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H264ColorSpaceSettings"
+                },
+                "EntropyEncoding": {
+                    "type": "string"
+                },
+                "FilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H264FilterSettings"
+                },
+                "FixedAfd": {
+                    "type": "string"
+                },
+                "FlickerAq": {
+                    "type": "string"
+                },
+                "ForceFieldPictures": {
+                    "type": "string"
+                },
+                "FramerateControl": {
+                    "type": "string"
+                },
+                "FramerateDenominator": {
+                    "type": "number"
+                },
+                "FramerateNumerator": {
+                    "type": "number"
+                },
+                "GopBReference": {
+                    "type": "string"
+                },
+                "GopClosedCadence": {
+                    "type": "number"
+                },
+                "GopNumBFrames": {
+                    "type": "number"
+                },
+                "GopSize": {
+                    "type": "number"
+                },
+                "GopSizeUnits": {
+                    "type": "string"
+                },
+                "Level": {
+                    "type": "string"
+                },
+                "LookAheadRateControl": {
+                    "type": "string"
+                },
+                "MaxBitrate": {
+                    "type": "number"
+                },
+                "MinIInterval": {
+                    "type": "number"
+                },
+                "NumRefFrames": {
+                    "type": "number"
+                },
+                "ParControl": {
+                    "type": "string"
+                },
+                "ParDenominator": {
+                    "type": "number"
+                },
+                "ParNumerator": {
+                    "type": "number"
+                },
+                "Profile": {
+                    "type": "string"
+                },
+                "QualityLevel": {
+                    "type": "string"
+                },
+                "QvbrQualityLevel": {
+                    "type": "number"
+                },
+                "RateControlMode": {
+                    "type": "string"
+                },
+                "ScanType": {
+                    "type": "string"
+                },
+                "SceneChangeDetect": {
+                    "type": "string"
+                },
+                "Slices": {
+                    "type": "number"
+                },
+                "Softness": {
+                    "type": "number"
+                },
+                "SpatialAq": {
+                    "type": "string"
+                },
+                "SubgopLength": {
+                    "type": "string"
+                },
+                "Syntax": {
+                    "type": "string"
+                },
+                "TemporalAq": {
+                    "type": "string"
+                },
+                "TimecodeInsertion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H265ColorSpaceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ColorSpacePassthroughSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ColorSpacePassthroughSettings"
+                },
+                "Hdr10Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Hdr10Settings"
+                },
+                "Rec601Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Rec601Settings"
+                },
+                "Rec709Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Rec709Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H265FilterSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "TemporalFilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TemporalFilterSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.H265Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "AdaptiveQuantization": {
+                    "type": "string"
+                },
+                "AfdSignaling": {
+                    "type": "string"
+                },
+                "AlternativeTransferFunction": {
+                    "type": "string"
+                },
+                "Bitrate": {
+                    "type": "number"
+                },
+                "BufSize": {
+                    "type": "number"
+                },
+                "ColorMetadata": {
+                    "type": "string"
+                },
+                "ColorSpaceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H265ColorSpaceSettings"
+                },
+                "FilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H265FilterSettings"
+                },
+                "FixedAfd": {
+                    "type": "string"
+                },
+                "FlickerAq": {
+                    "type": "string"
+                },
+                "FramerateDenominator": {
+                    "type": "number"
+                },
+                "FramerateNumerator": {
+                    "type": "number"
+                },
+                "GopClosedCadence": {
+                    "type": "number"
+                },
+                "GopSize": {
+                    "type": "number"
+                },
+                "GopSizeUnits": {
+                    "type": "string"
+                },
+                "Level": {
+                    "type": "string"
+                },
+                "LookAheadRateControl": {
+                    "type": "string"
+                },
+                "MaxBitrate": {
+                    "type": "number"
+                },
+                "MinIInterval": {
+                    "type": "number"
+                },
+                "ParDenominator": {
+                    "type": "number"
+                },
+                "ParNumerator": {
+                    "type": "number"
+                },
+                "Profile": {
+                    "type": "string"
+                },
+                "QvbrQualityLevel": {
+                    "type": "number"
+                },
+                "RateControlMode": {
+                    "type": "string"
+                },
+                "ScanType": {
+                    "type": "string"
+                },
+                "SceneChangeDetect": {
+                    "type": "string"
+                },
+                "Slices": {
+                    "type": "number"
+                },
+                "Tier": {
+                    "type": "string"
+                },
+                "TimecodeInsertion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Hdr10Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxCll": {
+                    "type": "number"
+                },
+                "MaxFall": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsAkamaiSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "FilecacheDuration": {
+                    "type": "number"
+                },
+                "HttpTransferMode": {
+                    "type": "string"
+                },
+                "NumRetries": {
+                    "type": "number"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                },
+                "Salt": {
+                    "type": "string"
+                },
+                "Token": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsBasicPutSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "FilecacheDuration": {
+                    "type": "number"
+                },
+                "NumRetries": {
+                    "type": "number"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsCdnSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HlsAkamaiSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsAkamaiSettings"
+                },
+                "HlsBasicPutSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsBasicPutSettings"
+                },
+                "HlsMediaStoreSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsMediaStoreSettings"
+                },
+                "HlsS3Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsS3Settings"
+                },
+                "HlsWebdavSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsWebdavSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "BaseUrlContent": {
+                    "type": "string"
+                },
+                "BaseUrlContent1": {
+                    "type": "string"
+                },
+                "BaseUrlManifest": {
+                    "type": "string"
+                },
+                "BaseUrlManifest1": {
+                    "type": "string"
+                },
+                "CaptionLanguageMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionLanguageMapping"
+                    },
+                    "type": "array"
+                },
+                "CaptionLanguageSetting": {
+                    "type": "string"
+                },
+                "ClientCache": {
+                    "type": "string"
+                },
+                "CodecSpecification": {
+                    "type": "string"
+                },
+                "ConstantIv": {
+                    "type": "string"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "DirectoryStructure": {
+                    "type": "string"
+                },
+                "DiscontinuityTags": {
+                    "type": "string"
+                },
+                "EncryptionType": {
+                    "type": "string"
+                },
+                "HlsCdnSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsCdnSettings"
+                },
+                "HlsId3SegmentTagging": {
+                    "type": "string"
+                },
+                "IFrameOnlyPlaylists": {
+                    "type": "string"
+                },
+                "IncompleteSegmentBehavior": {
+                    "type": "string"
+                },
+                "IndexNSegments": {
+                    "type": "number"
+                },
+                "InputLossAction": {
+                    "type": "string"
+                },
+                "IvInManifest": {
+                    "type": "string"
+                },
+                "IvSource": {
+                    "type": "string"
+                },
+                "KeepSegments": {
+                    "type": "number"
+                },
+                "KeyFormat": {
+                    "type": "string"
+                },
+                "KeyFormatVersions": {
+                    "type": "string"
+                },
+                "KeyProviderSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.KeyProviderSettings"
+                },
+                "ManifestCompression": {
+                    "type": "string"
+                },
+                "ManifestDurationFormat": {
+                    "type": "string"
+                },
+                "MinSegmentLength": {
+                    "type": "number"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "OutputSelection": {
+                    "type": "string"
+                },
+                "ProgramDateTime": {
+                    "type": "string"
+                },
+                "ProgramDateTimePeriod": {
+                    "type": "number"
+                },
+                "RedundantManifest": {
+                    "type": "string"
+                },
+                "SegmentLength": {
+                    "type": "number"
+                },
+                "SegmentationMode": {
+                    "type": "string"
+                },
+                "SegmentsPerSubdirectory": {
+                    "type": "number"
+                },
+                "StreamInfResolution": {
+                    "type": "string"
+                },
+                "TimedMetadataId3Frame": {
+                    "type": "string"
+                },
+                "TimedMetadataId3Period": {
+                    "type": "number"
+                },
+                "TimestampDeltaMilliseconds": {
+                    "type": "number"
+                },
+                "TsFileMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsInputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Bandwidth": {
+                    "type": "number"
+                },
+                "BufferSegments": {
+                    "type": "number"
+                },
+                "Retries": {
+                    "type": "number"
+                },
+                "RetryInterval": {
+                    "type": "number"
+                },
+                "Scte35Source": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsMediaStoreSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "FilecacheDuration": {
+                    "type": "number"
+                },
+                "MediaStoreStorageClass": {
+                    "type": "string"
+                },
+                "NumRetries": {
+                    "type": "number"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "H265PackagingType": {
+                    "type": "string"
+                },
+                "HlsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsSettings"
+                },
+                "NameModifier": {
+                    "type": "string"
+                },
+                "SegmentModifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsS3Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "CannedAcl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioOnlyHlsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AudioOnlyHlsSettings"
+                },
+                "Fmp4HlsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Fmp4HlsSettings"
+                },
+                "FrameCaptureHlsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureHlsSettings"
+                },
+                "StandardHlsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.StandardHlsSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HlsWebdavSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "FilecacheDuration": {
+                    "type": "number"
+                },
+                "HttpTransferMode": {
+                    "type": "string"
+                },
+                "NumRetries": {
+                    "type": "number"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.HtmlMotionGraphicsSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomaticInputFailoverSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.AutomaticInputFailoverSettings"
+                },
+                "InputAttachmentName": {
+                    "type": "string"
+                },
+                "InputId": {
+                    "type": "string"
+                },
+                "InputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputChannelLevel": {
+            "additionalProperties": false,
+            "properties": {
+                "Gain": {
+                    "type": "number"
+                },
+                "InputChannel": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "PasswordParam": {
+                    "type": "string"
+                },
+                "Uri": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputLossBehavior": {
+            "additionalProperties": false,
+            "properties": {
+                "BlackFrameMsec": {
+                    "type": "number"
+                },
+                "InputLossImageColor": {
+                    "type": "string"
+                },
+                "InputLossImageSlate": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "InputLossImageType": {
+                    "type": "string"
+                },
+                "RepeatFrameMsec": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputLossFailoverSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "InputLossThresholdMsec": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioSelectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.AudioSelector"
+                    },
+                    "type": "array"
+                },
+                "CaptionSelectors": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionSelector"
+                    },
+                    "type": "array"
+                },
+                "DeblockFilter": {
+                    "type": "string"
+                },
+                "DenoiseFilter": {
+                    "type": "string"
+                },
+                "FilterStrength": {
+                    "type": "number"
+                },
+                "InputFilter": {
+                    "type": "string"
+                },
+                "NetworkInputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.NetworkInputSettings"
+                },
+                "Smpte2038DataPreference": {
+                    "type": "string"
+                },
+                "SourceEndBehavior": {
+                    "type": "string"
+                },
+                "VideoSelector": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoSelector"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.InputSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "Codec": {
+                    "type": "string"
+                },
+                "MaximumBitrate": {
+                    "type": "string"
+                },
+                "Resolution": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.KeyProviderSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "StaticKeySettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.StaticKeySettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.M2tsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AbsentInputAudioBehavior": {
+                    "type": "string"
+                },
+                "Arib": {
+                    "type": "string"
+                },
+                "AribCaptionsPid": {
+                    "type": "string"
+                },
+                "AribCaptionsPidControl": {
+                    "type": "string"
+                },
+                "AudioBufferModel": {
+                    "type": "string"
+                },
+                "AudioFramesPerPes": {
+                    "type": "number"
+                },
+                "AudioPids": {
+                    "type": "string"
+                },
+                "AudioStreamType": {
+                    "type": "string"
+                },
+                "Bitrate": {
+                    "type": "number"
+                },
+                "BufferModel": {
+                    "type": "string"
+                },
+                "CcDescriptor": {
+                    "type": "string"
+                },
+                "DvbNitSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.DvbNitSettings"
+                },
+                "DvbSdtSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.DvbSdtSettings"
+                },
+                "DvbSubPids": {
+                    "type": "string"
+                },
+                "DvbTdtSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.DvbTdtSettings"
+                },
+                "DvbTeletextPid": {
+                    "type": "string"
+                },
+                "Ebif": {
+                    "type": "string"
+                },
+                "EbpAudioInterval": {
+                    "type": "string"
+                },
+                "EbpLookaheadMs": {
+                    "type": "number"
+                },
+                "EbpPlacement": {
+                    "type": "string"
+                },
+                "EcmPid": {
+                    "type": "string"
+                },
+                "EsRateInPes": {
+                    "type": "string"
+                },
+                "EtvPlatformPid": {
+                    "type": "string"
+                },
+                "EtvSignalPid": {
+                    "type": "string"
+                },
+                "FragmentTime": {
+                    "type": "number"
+                },
+                "Klv": {
+                    "type": "string"
+                },
+                "KlvDataPids": {
+                    "type": "string"
+                },
+                "NielsenId3Behavior": {
+                    "type": "string"
+                },
+                "NullPacketBitrate": {
+                    "type": "number"
+                },
+                "PatInterval": {
+                    "type": "number"
+                },
+                "PcrControl": {
+                    "type": "string"
+                },
+                "PcrPeriod": {
+                    "type": "number"
+                },
+                "PcrPid": {
+                    "type": "string"
+                },
+                "PmtInterval": {
+                    "type": "number"
+                },
+                "PmtPid": {
+                    "type": "string"
+                },
+                "ProgramNum": {
+                    "type": "number"
+                },
+                "RateMode": {
+                    "type": "string"
+                },
+                "Scte27Pids": {
+                    "type": "string"
+                },
+                "Scte35Control": {
+                    "type": "string"
+                },
+                "Scte35Pid": {
+                    "type": "string"
+                },
+                "SegmentationMarkers": {
+                    "type": "string"
+                },
+                "SegmentationStyle": {
+                    "type": "string"
+                },
+                "SegmentationTime": {
+                    "type": "number"
+                },
+                "TimedMetadataBehavior": {
+                    "type": "string"
+                },
+                "TimedMetadataPid": {
+                    "type": "string"
+                },
+                "TransportStreamId": {
+                    "type": "number"
+                },
+                "VideoPid": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.M3u8Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioFramesPerPes": {
+                    "type": "number"
+                },
+                "AudioPids": {
+                    "type": "string"
+                },
+                "EcmPid": {
+                    "type": "string"
+                },
+                "NielsenId3Behavior": {
+                    "type": "string"
+                },
+                "PatInterval": {
+                    "type": "number"
+                },
+                "PcrControl": {
+                    "type": "string"
+                },
+                "PcrPeriod": {
+                    "type": "number"
+                },
+                "PcrPid": {
+                    "type": "string"
+                },
+                "PmtInterval": {
+                    "type": "number"
+                },
+                "PmtPid": {
+                    "type": "string"
+                },
+                "ProgramNum": {
+                    "type": "number"
+                },
+                "Scte35Behavior": {
+                    "type": "string"
+                },
+                "Scte35Pid": {
+                    "type": "string"
+                },
+                "TimedMetadataBehavior": {
+                    "type": "string"
+                },
+                "TimedMetadataPid": {
+                    "type": "string"
+                },
+                "TransportStreamId": {
+                    "type": "number"
+                },
+                "VideoPid": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MediaPackageGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MediaPackageOutputDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MediaPackageOutputSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MotionGraphicsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "MotionGraphicsInsertion": {
+                    "type": "string"
+                },
+                "MotionGraphicsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MotionGraphicsSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MotionGraphicsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HtmlMotionGraphicsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HtmlMotionGraphicsSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Mp2Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "Bitrate": {
+                    "type": "number"
+                },
+                "CodingMode": {
+                    "type": "string"
+                },
+                "SampleRate": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Mpeg2FilterSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "TemporalFilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.TemporalFilterSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Mpeg2Settings": {
+            "additionalProperties": false,
+            "properties": {
+                "AdaptiveQuantization": {
+                    "type": "string"
+                },
+                "AfdSignaling": {
+                    "type": "string"
+                },
+                "ColorMetadata": {
+                    "type": "string"
+                },
+                "ColorSpace": {
+                    "type": "string"
+                },
+                "DisplayAspectRatio": {
+                    "type": "string"
+                },
+                "FilterSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Mpeg2FilterSettings"
+                },
+                "FixedAfd": {
+                    "type": "string"
+                },
+                "FramerateDenominator": {
+                    "type": "number"
+                },
+                "FramerateNumerator": {
+                    "type": "number"
+                },
+                "GopClosedCadence": {
+                    "type": "number"
+                },
+                "GopNumBFrames": {
+                    "type": "number"
+                },
+                "GopSize": {
+                    "type": "number"
+                },
+                "GopSizeUnits": {
+                    "type": "string"
+                },
+                "ScanType": {
+                    "type": "string"
+                },
+                "SubgopLength": {
+                    "type": "string"
+                },
+                "TimecodeInsertion": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MsSmoothGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AcquisitionPointId": {
+                    "type": "string"
+                },
+                "AudioOnlyTimecodeControl": {
+                    "type": "string"
+                },
+                "CertificateMode": {
+                    "type": "string"
+                },
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "EventId": {
+                    "type": "string"
+                },
+                "EventIdMode": {
+                    "type": "string"
+                },
+                "EventStopBehavior": {
+                    "type": "string"
+                },
+                "FilecacheDuration": {
+                    "type": "number"
+                },
+                "FragmentLength": {
+                    "type": "number"
+                },
+                "InputLossAction": {
+                    "type": "string"
+                },
+                "NumRetries": {
+                    "type": "number"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                },
+                "SegmentationMode": {
+                    "type": "string"
+                },
+                "SendDelayMs": {
+                    "type": "number"
+                },
+                "SparseTrackType": {
+                    "type": "string"
+                },
+                "StreamManifestBehavior": {
+                    "type": "string"
+                },
+                "TimestampOffset": {
+                    "type": "string"
+                },
+                "TimestampOffsetMode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MsSmoothOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "H265PackagingType": {
+                    "type": "string"
+                },
+                "NameModifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MultiplexGroupSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MultiplexOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.MultiplexProgramChannelDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiplexId": {
+                    "type": "string"
+                },
+                "ProgramName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.NetworkInputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "HlsInputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsInputSettings"
+                },
+                "ServerValidation": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.NielsenCBET": {
+            "additionalProperties": false,
+            "properties": {
+                "CbetCheckDigitString": {
+                    "type": "string"
+                },
+                "CbetStepaside": {
+                    "type": "string"
+                },
+                "Csid": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.NielsenConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DistributorId": {
+                    "type": "string"
+                },
+                "NielsenPcmToId3Tagging": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.NielsenNaesIiNw": {
+            "additionalProperties": false,
+            "properties": {
+                "CheckDigitString": {
+                    "type": "string"
+                },
+                "Sid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.NielsenWatermarksSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NielsenCbetSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.NielsenCBET"
+                },
+                "NielsenDistributionType": {
+                    "type": "string"
+                },
+                "NielsenNaesIiNwSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.NielsenNaesIiNw"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Output": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioDescriptionNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CaptionDescriptionNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OutputName": {
+                    "type": "string"
+                },
+                "OutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputSettings"
+                },
+                "VideoDescriptionName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "MediaPackageSettings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.MediaPackageOutputDestinationSettings"
+                    },
+                    "type": "array"
+                },
+                "MultiplexSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MultiplexProgramChannelDestinationSettings"
+                },
+                "Settings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.OutputDestinationSettings"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PasswordParam": {
+                    "type": "string"
+                },
+                "StreamName": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "OutputGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputGroupSettings"
+                },
+                "Outputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.Output"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ArchiveGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ArchiveGroupSettings"
+                },
+                "FrameCaptureGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureGroupSettings"
+                },
+                "HlsGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsGroupSettings"
+                },
+                "MediaPackageGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MediaPackageGroupSettings"
+                },
+                "MsSmoothGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MsSmoothGroupSettings"
+                },
+                "MultiplexGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MultiplexGroupSettings"
+                },
+                "RtmpGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.RtmpGroupSettings"
+                },
+                "UdpGroupSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.UdpGroupSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputLocationRef": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationRefId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.OutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ArchiveOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.ArchiveOutputSettings"
+                },
+                "FrameCaptureOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureOutputSettings"
+                },
+                "HlsOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.HlsOutputSettings"
+                },
+                "MediaPackageOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MediaPackageOutputSettings"
+                },
+                "MsSmoothOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MsSmoothOutputSettings"
+                },
+                "MultiplexOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.MultiplexOutputSettings"
+                },
+                "RtmpOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.RtmpOutputSettings"
+                },
+                "UdpOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.UdpOutputSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.PassThroughSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.RawSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Rec601Settings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Rec709Settings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.RemixSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaLive::Channel.AudioChannelMapping"
+                    },
+                    "type": "array"
+                },
+                "ChannelsIn": {
+                    "type": "number"
+                },
+                "ChannelsOut": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.RtmpCaptionInfoDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.RtmpGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AuthenticationScheme": {
+                    "type": "string"
+                },
+                "CacheFullBehavior": {
+                    "type": "string"
+                },
+                "CacheLength": {
+                    "type": "number"
+                },
+                "CaptionData": {
+                    "type": "string"
+                },
+                "InputLossAction": {
+                    "type": "string"
+                },
+                "RestartDelay": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.RtmpOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateMode": {
+                    "type": "string"
+                },
+                "ConnectionRetryInterval": {
+                    "type": "number"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "NumRetries": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte20PlusEmbeddedDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte20SourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Convert608To708": {
+                    "type": "string"
+                },
+                "Source608ChannelNumber": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte27DestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte27SourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "OcrLanguage": {
+                    "type": "string"
+                },
+                "Pid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte35SpliceInsert": {
+            "additionalProperties": false,
+            "properties": {
+                "AdAvailOffset": {
+                    "type": "number"
+                },
+                "NoRegionalBlackoutFlag": {
+                    "type": "string"
+                },
+                "WebDeliveryAllowedFlag": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.Scte35TimeSignalApos": {
+            "additionalProperties": false,
+            "properties": {
+                "AdAvailOffset": {
+                    "type": "number"
+                },
+                "NoRegionalBlackoutFlag": {
+                    "type": "string"
+                },
+                "WebDeliveryAllowedFlag": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.SmpteTtDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.StandardHlsSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "AudioRenditionSets": {
+                    "type": "string"
+                },
+                "M3u8Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.M3u8Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.StaticKeySettings": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyProviderServer": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.InputLocation"
+                },
+                "StaticKeyValue": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.TeletextDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.TeletextSourceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "OutputRectangle": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.CaptionRectangle"
+                },
+                "PageNumber": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.TemporalFilterSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PostFilterSharpening": {
+                    "type": "string"
+                },
+                "Strength": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.TimecodeConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Source": {
+                    "type": "string"
+                },
+                "SyncThreshold": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.TtmlDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "StyleControl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.UdpContainerSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "M2tsSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.M2tsSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.UdpGroupSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "InputLossAction": {
+                    "type": "string"
+                },
+                "TimedMetadataId3Frame": {
+                    "type": "string"
+                },
+                "TimedMetadataId3Period": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.UdpOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "BufferMsec": {
+                    "type": "number"
+                },
+                "ContainerSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.UdpContainerSettings"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.OutputLocationRef"
+                },
+                "FecOutputSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FecOutputSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoBlackFailoverSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "BlackDetectThreshold": {
+                    "type": "number"
+                },
+                "VideoBlackThresholdMsec": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoCodecSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "FrameCaptureSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.FrameCaptureSettings"
+                },
+                "H264Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H264Settings"
+                },
+                "H265Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.H265Settings"
+                },
+                "Mpeg2Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Mpeg2Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "CodecSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoCodecSettings"
+                },
+                "Height": {
+                    "type": "number"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "RespondToAfd": {
+                    "type": "string"
+                },
+                "ScalingBehavior": {
+                    "type": "string"
+                },
+                "Sharpness": {
+                    "type": "number"
+                },
+                "Width": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoSelector": {
+            "additionalProperties": false,
+            "properties": {
+                "ColorSpace": {
+                    "type": "string"
+                },
+                "ColorSpaceSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoSelectorColorSpaceSettings"
+                },
+                "ColorSpaceUsage": {
+                    "type": "string"
+                },
+                "SelectorSettings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoSelectorSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoSelectorColorSpaceSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "Hdr10Settings": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.Hdr10Settings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoSelectorPid": {
+            "additionalProperties": false,
+            "properties": {
+                "Pid": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoSelectorProgramId": {
+            "additionalProperties": false,
+            "properties": {
+                "ProgramId": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VideoSelectorSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "VideoSelectorPid": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoSelectorPid"
+                },
+                "VideoSelectorProgramId": {
+                    "$ref": "#/definitions/AWS::MediaLive::Channel.VideoSelectorProgramId"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.VpcOutputSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "PublicAddressAllocationIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.WavSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "BitDepth": {
+                    "type": "number"
+                },
+                "CodingMode": {
+                    "type": "string"
+                },
+                "SampleRate": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Channel.WebvttDestinationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "StyleControl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaLive::Input": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "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::InputSecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "WhitelistRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaLive::InputSecurityGroup.InputWhitelistRuleCidr"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaLive::InputSecurityGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaLive::InputSecurityGroup.InputWhitelistRuleCidr": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::Asset": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Id": {
+                            "type": "string"
+                        },
+                        "PackagingGroupId": {
+                            "type": "string"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "SourceArn": {
+                            "type": "string"
+                        },
+                        "SourceRoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Id",
+                        "PackagingGroupId",
+                        "SourceArn",
+                        "SourceRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaPackage::Asset"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::Asset.EgressEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "PackagingConfigurationId": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "PackagingConfigurationId",
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::Channel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EgressAccessLogs": {
+                            "$ref": "#/definitions/AWS::MediaPackage::Channel.LogConfiguration"
+                        },
+                        "Id": {
+                            "type": "string"
+                        },
+                        "IngressAccessLogs": {
+                            "$ref": "#/definitions/AWS::MediaPackage::Channel.LogConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Id"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaPackage::Channel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::Channel.LogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Authorization": {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.Authorization"
+                        },
+                        "ChannelId": {
+                            "type": "string"
+                        },
+                        "CmafPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.CmafPackage"
+                        },
+                        "DashPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.DashPackage"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "HlsPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.HlsPackage"
+                        },
+                        "Id": {
+                            "type": "string"
+                        },
+                        "ManifestName": {
+                            "type": "string"
+                        },
+                        "MssPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.MssPackage"
+                        },
+                        "Origination": {
+                            "type": "string"
+                        },
+                        "StartoverWindowSeconds": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TimeDelaySeconds": {
+                            "type": "number"
+                        },
+                        "Whitelist": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ChannelId",
+                        "Id"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaPackage::OriginEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.Authorization": {
+            "additionalProperties": false,
+            "properties": {
+                "CdnIdentifierSecret": {
+                    "type": "string"
+                },
+                "SecretsRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CdnIdentifierSecret",
+                "SecretsRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.CmafEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstantInitializationVector": {
+                    "type": "string"
+                },
+                "KeyRotationIntervalSeconds": {
+                    "type": "number"
+                },
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.CmafPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.CmafEncryption"
+                },
+                "HlsManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.HlsManifest"
+                    },
+                    "type": "array"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "SegmentPrefix": {
+                    "type": "string"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.StreamSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.DashEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyRotationIntervalSeconds": {
+                    "type": "number"
+                },
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.DashPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "AdTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AdsOnDeliveryRestrictions": {
+                    "type": "string"
+                },
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.DashEncryption"
+                },
+                "ManifestLayout": {
+                    "type": "string"
+                },
+                "ManifestWindowSeconds": {
+                    "type": "number"
+                },
+                "MinBufferTimeSeconds": {
+                    "type": "number"
+                },
+                "MinUpdatePeriodSeconds": {
+                    "type": "number"
+                },
+                "PeriodTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Profile": {
+                    "type": "string"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "SegmentTemplateFormat": {
+                    "type": "string"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.StreamSelection"
+                },
+                "SuggestedPresentationDelaySeconds": {
+                    "type": "number"
+                },
+                "UtcTiming": {
+                    "type": "string"
+                },
+                "UtcTimingUri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.HlsEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstantInitializationVector": {
+                    "type": "string"
+                },
+                "EncryptionMethod": {
+                    "type": "string"
+                },
+                "KeyRotationIntervalSeconds": {
+                    "type": "number"
+                },
+                "RepeatExtXKey": {
+                    "type": "boolean"
+                },
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.HlsManifest": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkers": {
+                    "type": "string"
+                },
+                "AdTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AdsOnDeliveryRestrictions": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "IncludeIframeOnlyStream": {
+                    "type": "boolean"
+                },
+                "ManifestName": {
+                    "type": "string"
+                },
+                "PlaylistType": {
+                    "type": "string"
+                },
+                "PlaylistWindowSeconds": {
+                    "type": "number"
+                },
+                "ProgramDateTimeIntervalSeconds": {
+                    "type": "number"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.HlsPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkers": {
+                    "type": "string"
+                },
+                "AdTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AdsOnDeliveryRestrictions": {
+                    "type": "string"
+                },
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.HlsEncryption"
+                },
+                "IncludeIframeOnlyStream": {
+                    "type": "boolean"
+                },
+                "PlaylistType": {
+                    "type": "string"
+                },
+                "PlaylistWindowSeconds": {
+                    "type": "number"
+                },
+                "ProgramDateTimeIntervalSeconds": {
+                    "type": "number"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.StreamSelection"
+                },
+                "UseAudioRenditionGroup": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.MssEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.MssPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.MssEncryption"
+                },
+                "ManifestWindowSeconds": {
+                    "type": "number"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint.StreamSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.SpekeKeyProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "CertificateArn": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SystemIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceId",
+                "RoleArn",
+                "SystemIds",
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::OriginEndpoint.StreamSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxVideoBitsPerSecond": {
+                    "type": "number"
+                },
+                "MinVideoBitsPerSecond": {
+                    "type": "number"
+                },
+                "StreamOrder": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CmafPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.CmafPackage"
+                        },
+                        "DashPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.DashPackage"
+                        },
+                        "HlsPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.HlsPackage"
+                        },
+                        "Id": {
+                            "type": "string"
+                        },
+                        "MssPackage": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.MssPackage"
+                        },
+                        "PackagingGroupId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Id",
+                        "PackagingGroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaPackage::PackagingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.CmafEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.CmafPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.CmafEncryption"
+                },
+                "HlsManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.HlsManifest"
+                    },
+                    "type": "array"
+                },
+                "IncludeEncoderConfigurationInSegments": {
+                    "type": "boolean"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "HlsManifests"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.DashEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.DashManifest": {
+            "additionalProperties": false,
+            "properties": {
+                "ManifestLayout": {
+                    "type": "string"
+                },
+                "ManifestName": {
+                    "type": "string"
+                },
+                "MinBufferTimeSeconds": {
+                    "type": "number"
+                },
+                "Profile": {
+                    "type": "string"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.StreamSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.DashPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "DashManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.DashManifest"
+                    },
+                    "type": "array"
+                },
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.DashEncryption"
+                },
+                "IncludeEncoderConfigurationInSegments": {
+                    "type": "boolean"
+                },
+                "PeriodTriggers": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "SegmentTemplateFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DashManifests"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.HlsEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstantInitializationVector": {
+                    "type": "string"
+                },
+                "EncryptionMethod": {
+                    "type": "string"
+                },
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.HlsManifest": {
+            "additionalProperties": false,
+            "properties": {
+                "AdMarkers": {
+                    "type": "string"
+                },
+                "IncludeIframeOnlyStream": {
+                    "type": "boolean"
+                },
+                "ManifestName": {
+                    "type": "string"
+                },
+                "ProgramDateTimeIntervalSeconds": {
+                    "type": "number"
+                },
+                "RepeatExtXKey": {
+                    "type": "boolean"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.StreamSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.HlsPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.HlsEncryption"
+                },
+                "HlsManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.HlsManifest"
+                    },
+                    "type": "array"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                },
+                "UseAudioRenditionGroup": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "HlsManifests"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.MssEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "SpekeKeyProvider": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider"
+                }
+            },
+            "required": [
+                "SpekeKeyProvider"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.MssManifest": {
+            "additionalProperties": false,
+            "properties": {
+                "ManifestName": {
+                    "type": "string"
+                },
+                "StreamSelection": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.StreamSelection"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.MssPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.MssEncryption"
+                },
+                "MssManifests": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration.MssManifest"
+                    },
+                    "type": "array"
+                },
+                "SegmentDurationSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MssManifests"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.SpekeKeyProvider": {
+            "additionalProperties": false,
+            "properties": {
+                "RoleArn": {
+                    "type": "string"
+                },
+                "SystemIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn",
+                "SystemIds",
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingConfiguration.StreamSelection": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxVideoBitsPerSecond": {
+                    "type": "number"
+                },
+                "MinVideoBitsPerSecond": {
+                    "type": "number"
+                },
+                "StreamOrder": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Authorization": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingGroup.Authorization"
+                        },
+                        "EgressAccessLogs": {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingGroup.LogConfiguration"
+                        },
+                        "Id": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Id"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaPackage::PackagingGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingGroup.Authorization": {
+            "additionalProperties": false,
+            "properties": {
+                "CdnIdentifierSecret": {
+                    "type": "string"
+                },
+                "SecretsRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CdnIdentifierSecret",
+                "SecretsRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaPackage::PackagingGroup.LogConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaStore::Container": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessLoggingEnabled": {
+                            "type": "boolean"
+                        },
+                        "ContainerName": {
+                            "type": "string"
+                        },
+                        "CorsPolicy": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::MediaStore::Container.CorsRule"
+                            },
+                            "type": "array"
+                        },
+                        "LifecyclePolicy": {
+                            "type": "string"
+                        },
+                        "MetricPolicy": {
+                            "$ref": "#/definitions/AWS::MediaStore::Container.MetricPolicy"
+                        },
+                        "Policy": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ContainerName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MediaStore::Container"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaStore::Container.CorsRule": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedOrigins": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExposeHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaxAgeSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MediaStore::Container.MetricPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerLevelMetrics": {
+                    "type": "string"
+                },
+                "MetricPolicyRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::MediaStore::Container.MetricPolicyRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ContainerLevelMetrics"
+            ],
+            "type": "object"
+        },
+        "AWS::MediaStore::Container.MetricPolicyRule": {
+            "additionalProperties": false,
+            "properties": {
+                "ObjectGroup": {
+                    "type": "string"
+                },
+                "ObjectGroupName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ObjectGroup",
+                "ObjectGroupName"
+            ],
+            "type": "object"
+        },
+        "AWS::MemoryDB::ACL": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ACLName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ACLName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MemoryDB::ACL"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MemoryDB::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ACLName": {
+                            "type": "string"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "ClusterName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "FinalSnapshotName": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "NodeType": {
+                            "type": "string"
+                        },
+                        "NumReplicasPerShard": {
+                            "type": "number"
+                        },
+                        "NumShards": {
+                            "type": "number"
+                        },
+                        "ParameterGroupName": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnapshotArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnapshotName": {
+                            "type": "string"
+                        },
+                        "SnapshotRetentionLimit": {
+                            "type": "number"
+                        },
+                        "SnapshotWindow": {
+                            "type": "string"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SnsTopicStatus": {
+                            "type": "string"
+                        },
+                        "SubnetGroupName": {
+                            "type": "string"
+                        },
+                        "TLSEnabled": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ACLName",
+                        "ClusterName",
+                        "NodeType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MemoryDB::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MemoryDB::Cluster.Endpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::MemoryDB::ParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ParameterGroupName": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Family",
+                        "ParameterGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MemoryDB::ParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MemoryDB::SubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SubnetGroupName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubnetGroupName",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MemoryDB::SubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::MemoryDB::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessString": {
+                            "type": "string"
+                        },
+                        "AuthenticationMode": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AccessString",
+                        "AuthenticationMode",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::MemoryDB::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatedRoles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Neptune::DBCluster.DBClusterRole"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "IamAuthEnabled": {
+                            "type": "boolean"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "RestoreToTime": {
+                            "type": "string"
+                        },
+                        "RestoreType": {
+                            "type": "string"
+                        },
+                        "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::DBClusterParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBInstanceClass": {
+                            "type": "string"
+                        },
+                        "DBInstanceIdentifier": {
+                            "type": "string"
+                        },
+                        "DBParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBSnapshotIdentifier": {
+                            "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": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::DBParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Neptune::DBSubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DBSubnetGroupDescription": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBSubnetGroupDescription",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Neptune::DBSubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::Firewall": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeleteProtection": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "FirewallName": {
+                            "type": "string"
+                        },
+                        "FirewallPolicyArn": {
+                            "type": "string"
+                        },
+                        "FirewallPolicyChangeProtection": {
+                            "type": "boolean"
+                        },
+                        "SubnetChangeProtection": {
+                            "type": "boolean"
+                        },
+                        "SubnetMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::NetworkFirewall::Firewall.SubnetMapping"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FirewallName",
+                        "FirewallPolicyArn",
+                        "SubnetMappings",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkFirewall::Firewall"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::Firewall.SubnetMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubnetId"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "FirewallPolicy": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.FirewallPolicy"
+                        },
+                        "FirewallPolicyName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "FirewallPolicy",
+                        "FirewallPolicyName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkFirewall::FirewallPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.ActionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "PublishMetricAction": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.PublishMetricAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.CustomAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionDefinition": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.ActionDefinition"
+                },
+                "ActionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionDefinition",
+                "ActionName"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.FirewallPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "StatefulDefaultActions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StatefulEngineOptions": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.StatefulEngineOptions"
+                },
+                "StatefulRuleGroupReferences": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.StatefulRuleGroupReference"
+                    },
+                    "type": "array"
+                },
+                "StatelessCustomActions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.CustomAction"
+                    },
+                    "type": "array"
+                },
+                "StatelessDefaultActions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StatelessFragmentDefaultActions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StatelessRuleGroupReferences": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.StatelessRuleGroupReference"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "StatelessDefaultActions",
+                "StatelessFragmentDefaultActions"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.PublishMetricAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy.Dimension"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Dimensions"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.StatefulEngineOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "RuleOrder": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.StatefulRuleGroupReference": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "ResourceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ResourceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::FirewallPolicy.StatelessRuleGroupReference": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "ResourceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Priority",
+                "ResourceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FirewallArn": {
+                            "type": "string"
+                        },
+                        "FirewallName": {
+                            "type": "string"
+                        },
+                        "LoggingConfiguration": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::LoggingConfiguration.LoggingConfiguration"
+                        }
+                    },
+                    "required": [
+                        "FirewallArn",
+                        "LoggingConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkFirewall::LoggingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::LoggingConfiguration.LogDestinationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "LogDestination": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "LogDestinationType": {
+                    "type": "string"
+                },
+                "LogType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogDestination",
+                "LogDestinationType",
+                "LogType"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::LoggingConfiguration.LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "LogDestinationConfigs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::LoggingConfiguration.LogDestinationConfig"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "LogDestinationConfigs"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Capacity": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "RuleGroup": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleGroup"
+                        },
+                        "RuleGroupName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Capacity",
+                        "RuleGroupName",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkFirewall::RuleGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.ActionDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "PublishMetricAction": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.PublishMetricAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.Address": {
+            "additionalProperties": false,
+            "properties": {
+                "AddressDefinition": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AddressDefinition"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.CustomAction": {
+            "additionalProperties": false,
+            "properties": {
+                "ActionDefinition": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.ActionDefinition"
+                },
+                "ActionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActionDefinition",
+                "ActionName"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.Dimension": {
+            "additionalProperties": false,
+            "properties": {
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.Header": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                },
+                "DestinationPort": {
+                    "type": "string"
+                },
+                "Direction": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "Source": {
+                    "type": "string"
+                },
+                "SourcePort": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination",
+                "DestinationPort",
+                "Direction",
+                "Protocol",
+                "Source",
+                "SourcePort"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.IPSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Definition": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.MatchAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationPorts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.PortRange"
+                    },
+                    "type": "array"
+                },
+                "Destinations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.Address"
+                    },
+                    "type": "array"
+                },
+                "Protocols": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "SourcePorts": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.PortRange"
+                    },
+                    "type": "array"
+                },
+                "Sources": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.Address"
+                    },
+                    "type": "array"
+                },
+                "TCPFlags": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.TCPFlagField"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.PortRange": {
+            "additionalProperties": false,
+            "properties": {
+                "FromPort": {
+                    "type": "number"
+                },
+                "ToPort": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "FromPort",
+                "ToPort"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.PortSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Definition": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.PublishMetricAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.Dimension"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Dimensions"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RuleDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MatchAttributes": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.MatchAttributes"
+                }
+            },
+            "required": [
+                "Actions",
+                "MatchAttributes"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RuleGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "RuleVariables": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleVariables"
+                },
+                "RulesSource": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RulesSource"
+                },
+                "StatefulRuleOptions": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.StatefulRuleOptions"
+                }
+            },
+            "required": [
+                "RulesSource"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RuleOption": {
+            "additionalProperties": false,
+            "properties": {
+                "Keyword": {
+                    "type": "string"
+                },
+                "Settings": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Keyword"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RuleVariables": {
+            "additionalProperties": false,
+            "properties": {
+                "IPSets": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.IPSet"
+                        }
+                    },
+                    "type": "object"
+                },
+                "PortSets": {
+                    "additionalProperties": false,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.PortSet"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RulesSource": {
+            "additionalProperties": false,
+            "properties": {
+                "RulesSourceList": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RulesSourceList"
+                },
+                "RulesString": {
+                    "type": "string"
+                },
+                "StatefulRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.StatefulRule"
+                    },
+                    "type": "array"
+                },
+                "StatelessRulesAndCustomActions": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.StatelessRulesAndCustomActions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.RulesSourceList": {
+            "additionalProperties": false,
+            "properties": {
+                "GeneratedRulesType": {
+                    "type": "string"
+                },
+                "TargetTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Targets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "GeneratedRulesType",
+                "TargetTypes",
+                "Targets"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.StatefulRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Header": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.Header"
+                },
+                "RuleOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleOption"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Action",
+                "Header",
+                "RuleOptions"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.StatefulRuleOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "RuleOrder": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.StatelessRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "RuleDefinition": {
+                    "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.RuleDefinition"
+                }
+            },
+            "required": [
+                "Priority",
+                "RuleDefinition"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.StatelessRulesAndCustomActions": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomActions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.CustomAction"
+                    },
+                    "type": "array"
+                },
+                "StatelessRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup.StatelessRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "StatelessRules"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkFirewall::RuleGroup.TCPFlagField": {
+            "additionalProperties": false,
+            "properties": {
+                "Flags": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Masks": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Flags"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::CustomerGatewayAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomerGatewayArn": {
+                            "type": "string"
+                        },
+                        "DeviceId": {
+                            "type": "string"
+                        },
+                        "GlobalNetworkId": {
+                            "type": "string"
+                        },
+                        "LinkId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "CustomerGatewayArn",
+                        "DeviceId",
+                        "GlobalNetworkId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::CustomerGatewayAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Device": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Location": {
+                            "$ref": "#/definitions/AWS::NetworkManager::Device.Location"
+                        },
+                        "Model": {
+                            "type": "string"
+                        },
+                        "SerialNumber": {
+                            "type": "string"
+                        },
+                        "SiteId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Vendor": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GlobalNetworkId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::Device"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Device.Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Latitude": {
+                    "type": "string"
+                },
+                "Longitude": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::GlobalNetwork": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::GlobalNetwork"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Link": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Bandwidth": {
+                            "$ref": "#/definitions/AWS::NetworkManager::Link.Bandwidth"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "GlobalNetworkId": {
+                            "type": "string"
+                        },
+                        "Provider": {
+                            "type": "string"
+                        },
+                        "SiteId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Bandwidth",
+                        "GlobalNetworkId",
+                        "SiteId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::Link"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Link.Bandwidth": {
+            "additionalProperties": false,
+            "properties": {
+                "DownloadSpeed": {
+                    "type": "number"
+                },
+                "UploadSpeed": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::LinkAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeviceId": {
+                            "type": "string"
+                        },
+                        "GlobalNetworkId": {
+                            "type": "string"
+                        },
+                        "LinkId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DeviceId",
+                        "GlobalNetworkId",
+                        "LinkId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::LinkAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Site": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Location": {
+                            "$ref": "#/definitions/AWS::NetworkManager::Site.Location"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "GlobalNetworkId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::Site"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NetworkManager::Site.Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Latitude": {
+                    "type": "string"
+                },
+                "Longitude": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NetworkManager::TransitGatewayRegistration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GlobalNetworkId": {
+                            "type": "string"
+                        },
+                        "TransitGatewayArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "GlobalNetworkId",
+                        "TransitGatewayArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NetworkManager::TransitGatewayRegistration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::LaunchProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Ec2SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LaunchProfileProtocolVersions": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "StreamConfiguration": {
+                            "$ref": "#/definitions/AWS::NimbleStudio::LaunchProfile.StreamConfiguration"
+                        },
+                        "StudioComponentIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "StudioId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Ec2SubnetIds",
+                        "LaunchProfileProtocolVersions",
+                        "Name",
+                        "StreamConfiguration",
+                        "StudioComponentIds",
+                        "StudioId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NimbleStudio::LaunchProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::LaunchProfile.StreamConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClipboardMode": {
+                    "type": "string"
+                },
+                "Ec2InstanceTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "MaxSessionLengthInMinutes": {
+                    "type": "number"
+                },
+                "StreamingImageIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ClipboardMode",
+                "Ec2InstanceTypes",
+                "StreamingImageIds"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StreamingImage": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Ec2ImageId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "StudioId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Ec2ImageId",
+                        "Name",
+                        "StudioId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NimbleStudio::StreamingImage"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::Studio": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdminRoleArn": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "StudioEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::NimbleStudio::Studio.StudioEncryptionConfiguration"
+                        },
+                        "StudioName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "UserRoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AdminRoleArn",
+                        "DisplayName",
+                        "StudioName",
+                        "UserRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NimbleStudio::Studio"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::Studio.StudioEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyArn": {
+                    "type": "string"
+                },
+                "KeyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KeyType"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.StudioComponentConfiguration"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Ec2SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "InitializationScripts": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.StudioComponentInitializationScript"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ScriptParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.ScriptParameterKeyValue"
+                            },
+                            "type": "array"
+                        },
+                        "StudioId": {
+                            "type": "string"
+                        },
+                        "Subtype": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "StudioId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::NimbleStudio::StudioComponent"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.ActiveDirectoryComputerAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.ActiveDirectoryConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputerAttributes": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.ActiveDirectoryComputerAttribute"
+                    },
+                    "type": "array"
+                },
+                "DirectoryId": {
+                    "type": "string"
+                },
+                "OrganizationalUnitDistinguishedName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.ComputeFarmConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveDirectoryUser": {
+                    "type": "string"
+                },
+                "Endpoint": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.LicenseServiceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.ScriptParameterKeyValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.SharedFileSystemConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                },
+                "FileSystemId": {
+                    "type": "string"
+                },
+                "LinuxMountPoint": {
+                    "type": "string"
+                },
+                "ShareName": {
+                    "type": "string"
+                },
+                "WindowsMountDrive": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.StudioComponentConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveDirectoryConfiguration": {
+                    "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.ActiveDirectoryConfiguration"
+                },
+                "ComputeFarmConfiguration": {
+                    "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.ComputeFarmConfiguration"
+                },
+                "LicenseServiceConfiguration": {
+                    "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.LicenseServiceConfiguration"
+                },
+                "SharedFileSystemConfiguration": {
+                    "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent.SharedFileSystemConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::NimbleStudio::StudioComponent.StudioComponentInitializationScript": {
+            "additionalProperties": false,
+            "properties": {
+                "LaunchProfileProtocolVersion": {
+                    "type": "string"
+                },
+                "Platform": {
+                    "type": "string"
+                },
+                "RunContext": {
+                    "type": "string"
+                },
+                "Script": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessPolicies": {
+                            "type": "object"
+                        },
+                        "AdvancedOptions": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "AdvancedSecurityOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.AdvancedSecurityOptionsInput"
+                        },
+                        "ClusterConfig": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.ClusterConfig"
+                        },
+                        "CognitoOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.CognitoOptions"
+                        },
+                        "DomainEndpointOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.DomainEndpointOptions"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "EBSOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.EBSOptions"
+                        },
+                        "EncryptionAtRestOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.EncryptionAtRestOptions"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "LogPublishingOptions": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::OpenSearchService::Domain.LogPublishingOption"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "NodeToNodeEncryptionOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.NodeToNodeEncryptionOptions"
+                        },
+                        "SnapshotOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.SnapshotOptions"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VPCOptions": {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain.VPCOptions"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpenSearchService::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.AdvancedSecurityOptionsInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "InternalUserDatabaseEnabled": {
+                    "type": "boolean"
+                },
+                "MasterUserOptions": {
+                    "$ref": "#/definitions/AWS::OpenSearchService::Domain.MasterUserOptions"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DedicatedMasterCount": {
+                    "type": "number"
+                },
+                "DedicatedMasterEnabled": {
+                    "type": "boolean"
+                },
+                "DedicatedMasterType": {
+                    "type": "string"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "WarmCount": {
+                    "type": "number"
+                },
+                "WarmEnabled": {
+                    "type": "boolean"
+                },
+                "WarmType": {
+                    "type": "string"
+                },
+                "ZoneAwarenessConfig": {
+                    "$ref": "#/definitions/AWS::OpenSearchService::Domain.ZoneAwarenessConfig"
+                },
+                "ZoneAwarenessEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.CognitoOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "IdentityPoolId": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "UserPoolId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.DomainEndpointOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomEndpoint": {
+                    "type": "string"
+                },
+                "CustomEndpointCertificateArn": {
+                    "type": "string"
+                },
+                "CustomEndpointEnabled": {
+                    "type": "boolean"
+                },
+                "EnforceHTTPS": {
+                    "type": "boolean"
+                },
+                "TLSSecurityPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.EBSOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "EBSEnabled": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.EncryptionAtRestOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.LogPublishingOption": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsLogGroupArn": {
+                    "type": "string"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.MasterUserOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "MasterUserARN": {
+                    "type": "string"
+                },
+                "MasterUserName": {
+                    "type": "string"
+                },
+                "MasterUserPassword": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.NodeToNodeEncryptionOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.SnapshotOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomatedSnapshotStartHour": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.VPCOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpenSearchService::Domain.ZoneAwarenessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityZoneCount": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::App": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppSource": {
+                            "$ref": "#/definitions/AWS::OpsWorks::App.Source"
+                        },
+                        "Attributes": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "DataSources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::App.DataSource"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Domains": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EnableSsl": {
+                            "type": "boolean"
+                        },
+                        "Environment": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::App.EnvironmentVariable"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Shortname": {
+                            "type": "string"
+                        },
+                        "SslConfiguration": {
+                            "$ref": "#/definitions/AWS::OpsWorks::App.SslConfiguration"
+                        },
+                        "StackId": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "StackId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::App"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::App.DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::App.EnvironmentVariable": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Secure": {
+                    "type": "boolean"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::App.Source": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Revision": {
+                    "type": "string"
+                },
+                "SshKey": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::App.SslConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Certificate": {
+                    "type": "string"
+                },
+                "Chain": {
+                    "type": "string"
+                },
+                "PrivateKey": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::ElasticLoadBalancerAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ElasticLoadBalancerName": {
+                            "type": "string"
+                        },
+                        "LayerId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ElasticLoadBalancerName",
+                        "LayerId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::ElasticLoadBalancerAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Instance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AgentVersion": {
+                            "type": "string"
+                        },
+                        "AmiId": {
+                            "type": "string"
+                        },
+                        "Architecture": {
+                            "type": "string"
+                        },
+                        "AutoScalingType": {
+                            "type": "string"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "BlockDeviceMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::Instance.BlockDeviceMapping"
+                            },
+                            "type": "array"
+                        },
+                        "EbsOptimized": {
+                            "type": "boolean"
+                        },
+                        "ElasticIps": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Hostname": {
+                            "type": "string"
+                        },
+                        "InstallUpdatesOnBoot": {
+                            "type": "boolean"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "LayerIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Os": {
+                            "type": "string"
+                        },
+                        "RootDeviceType": {
+                            "type": "string"
+                        },
+                        "SshKeyName": {
+                            "type": "string"
+                        },
+                        "StackId": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tenancy": {
+                            "type": "string"
+                        },
+                        "TimeBasedAutoScaling": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Instance.TimeBasedAutoScaling"
+                        },
+                        "VirtualizationType": {
+                            "type": "string"
+                        },
+                        "Volumes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InstanceType",
+                        "LayerIds",
+                        "StackId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Instance.BlockDeviceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DeviceName": {
+                    "type": "string"
+                },
+                "Ebs": {
+                    "$ref": "#/definitions/AWS::OpsWorks::Instance.EbsBlockDevice"
+                },
+                "NoDevice": {
+                    "type": "string"
+                },
+                "VirtualName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Instance.EbsBlockDevice": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteOnTermination": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "SnapshotId": {
+                    "type": "string"
+                },
+                "VolumeSize": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Instance.TimeBasedAutoScaling": {
+            "additionalProperties": false,
+            "properties": {
+                "Friday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Monday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Saturday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Sunday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Thursday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Tuesday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Wednesday": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Attributes": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "AutoAssignElasticIps": {
+                            "type": "boolean"
+                        },
+                        "AutoAssignPublicIps": {
+                            "type": "boolean"
+                        },
+                        "CustomInstanceProfileArn": {
+                            "type": "string"
+                        },
+                        "CustomJson": {
+                            "type": "object"
+                        },
+                        "CustomRecipes": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Layer.Recipes"
+                        },
+                        "CustomSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EnableAutoHealing": {
+                            "type": "boolean"
+                        },
+                        "InstallUpdatesOnBoot": {
+                            "type": "boolean"
+                        },
+                        "LifecycleEventConfiguration": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Layer.LifecycleEventConfiguration"
+                        },
+                        "LoadBasedAutoScaling": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Layer.LoadBasedAutoScaling"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Packages": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Shortname": {
+                            "type": "string"
+                        },
+                        "StackId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "UseEbsOptimizedInstances": {
+                            "type": "boolean"
+                        },
+                        "VolumeConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::Layer.VolumeConfiguration"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AutoAssignElasticIps",
+                        "AutoAssignPublicIps",
+                        "EnableAutoHealing",
+                        "Name",
+                        "Shortname",
+                        "StackId",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::Layer"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.AutoScalingThresholds": {
+            "additionalProperties": false,
+            "properties": {
+                "CpuThreshold": {
+                    "type": "number"
+                },
+                "IgnoreMetricsTime": {
+                    "type": "number"
+                },
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "LoadThreshold": {
+                    "type": "number"
+                },
+                "MemoryThreshold": {
+                    "type": "number"
+                },
+                "ThresholdsWaitTime": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.LifecycleEventConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ShutdownEventConfiguration": {
+                    "$ref": "#/definitions/AWS::OpsWorks::Layer.ShutdownEventConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.LoadBasedAutoScaling": {
+            "additionalProperties": false,
+            "properties": {
+                "DownScaling": {
+                    "$ref": "#/definitions/AWS::OpsWorks::Layer.AutoScalingThresholds"
+                },
+                "Enable": {
+                    "type": "boolean"
+                },
+                "UpScaling": {
+                    "$ref": "#/definitions/AWS::OpsWorks::Layer.AutoScalingThresholds"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.Recipes": {
+            "additionalProperties": false,
+            "properties": {
+                "Configure": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Deploy": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Setup": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Shutdown": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Undeploy": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.ShutdownEventConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DelayUntilElbConnectionsDrained": {
+                    "type": "boolean"
+                },
+                "ExecutionTimeout": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Layer.VolumeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Encrypted": {
+                    "type": "boolean"
+                },
+                "Iops": {
+                    "type": "number"
+                },
+                "MountPoint": {
+                    "type": "string"
+                },
+                "NumberOfDisks": {
+                    "type": "number"
+                },
+                "RaidLevel": {
+                    "type": "number"
+                },
+                "Size": {
+                    "type": "number"
+                },
+                "VolumeType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AgentVersion": {
+                            "type": "string"
+                        },
+                        "Attributes": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ChefConfiguration": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Stack.ChefConfiguration"
+                        },
+                        "CloneAppIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ClonePermissions": {
+                            "type": "boolean"
+                        },
+                        "ConfigurationManager": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Stack.StackConfigurationManager"
+                        },
+                        "CustomCookbooksSource": {
+                            "$ref": "#/definitions/AWS::OpsWorks::Stack.Source"
+                        },
+                        "CustomJson": {
+                            "type": "object"
+                        },
+                        "DefaultAvailabilityZone": {
+                            "type": "string"
+                        },
+                        "DefaultInstanceProfileArn": {
+                            "type": "string"
+                        },
+                        "DefaultOs": {
+                            "type": "string"
+                        },
+                        "DefaultRootDeviceType": {
+                            "type": "string"
+                        },
+                        "DefaultSshKeyName": {
+                            "type": "string"
+                        },
+                        "DefaultSubnetId": {
+                            "type": "string"
+                        },
+                        "EcsClusterArn": {
+                            "type": "string"
+                        },
+                        "ElasticIps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::Stack.ElasticIp"
+                            },
+                            "type": "array"
+                        },
+                        "HostnameTheme": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RdsDbInstances": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorks::Stack.RdsDbInstance"
+                            },
+                            "type": "array"
+                        },
+                        "ServiceRoleArn": {
+                            "type": "string"
+                        },
+                        "SourceStackId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UseCustomCookbooks": {
+                            "type": "boolean"
+                        },
+                        "UseOpsworksSecurityGroups": {
+                            "type": "boolean"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DefaultInstanceProfileArn",
+                        "Name",
+                        "ServiceRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::Stack"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack.ChefConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BerkshelfVersion": {
+                    "type": "string"
+                },
+                "ManageBerkshelf": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack.ElasticIp": {
+            "additionalProperties": false,
+            "properties": {
+                "Ip": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ip"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack.RdsDbInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DbPassword": {
+                    "type": "string"
+                },
+                "DbUser": {
+                    "type": "string"
+                },
+                "RdsDbInstanceArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DbPassword",
+                "DbUser",
+                "RdsDbInstanceArn"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack.Source": {
+            "additionalProperties": false,
+            "properties": {
+                "Password": {
+                    "type": "string"
+                },
+                "Revision": {
+                    "type": "string"
+                },
+                "SshKey": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::Stack.StackConfigurationManager": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::OpsWorks::UserProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowSelfManagement": {
+                            "type": "boolean"
+                        },
+                        "IamUserArn": {
+                            "type": "string"
+                        },
+                        "SshPublicKey": {
+                            "type": "string"
+                        },
+                        "SshUsername": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "IamUserArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::UserProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorks::Volume": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Ec2VolumeId": {
+                            "type": "string"
+                        },
+                        "MountPoint": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "StackId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Ec2VolumeId",
+                        "StackId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorks::Volume"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorksCM::Server": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatePublicIpAddress": {
+                            "type": "boolean"
+                        },
+                        "BackupId": {
+                            "type": "string"
+                        },
+                        "BackupRetentionCount": {
+                            "type": "number"
+                        },
+                        "CustomCertificate": {
+                            "type": "string"
+                        },
+                        "CustomDomain": {
+                            "type": "string"
+                        },
+                        "CustomPrivateKey": {
+                            "type": "string"
+                        },
+                        "DisableAutomatedBackup": {
+                            "type": "boolean"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::OpsWorksCM::Server.EngineAttribute"
+                            },
+                            "type": "array"
+                        },
+                        "EngineModel": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "InstanceProfileArn": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "KeyPair": {
+                            "type": "string"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ServerName": {
+                            "type": "string"
+                        },
+                        "ServiceRoleArn": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InstanceProfileArn",
+                        "InstanceType",
+                        "ServiceRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::OpsWorksCM::Server"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::OpsWorksCM::Server.EngineAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Panorama::ApplicationInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationInstanceIdToReplace": {
+                            "type": "string"
+                        },
+                        "DefaultRuntimeContextDevice": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DeviceId": {
+                            "type": "string"
+                        },
+                        "ManifestOverridesPayload": {
+                            "$ref": "#/definitions/AWS::Panorama::ApplicationInstance.ManifestOverridesPayload"
+                        },
+                        "ManifestPayload": {
+                            "$ref": "#/definitions/AWS::Panorama::ApplicationInstance.ManifestPayload"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RuntimeRoleArn": {
+                            "type": "string"
+                        },
+                        "StatusFilter": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DefaultRuntimeContextDevice",
+                        "ManifestPayload"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Panorama::ApplicationInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Panorama::ApplicationInstance.ManifestOverridesPayload": {
+            "additionalProperties": false,
+            "properties": {
+                "PayloadData": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Panorama::ApplicationInstance.ManifestPayload": {
+            "additionalProperties": false,
+            "properties": {
+                "PayloadData": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Panorama::Package": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PackageName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PackageName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Panorama::Package"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Panorama::PackageVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MarkLatest": {
+                            "type": "boolean"
+                        },
+                        "OwnerAccount": {
+                            "type": "string"
+                        },
+                        "PackageId": {
+                            "type": "string"
+                        },
+                        "PackageVersion": {
+                            "type": "string"
+                        },
+                        "PatchVersion": {
+                            "type": "string"
+                        },
+                        "UpdatedLatestPatchVersion": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PackageId",
+                        "PackageVersion",
+                        "PatchVersion"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Panorama::PackageVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::ADMChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ClientId": {
+                            "type": "string"
+                        },
+                        "ClientSecret": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "ClientId",
+                        "ClientSecret"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::ADMChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::APNSChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "DefaultAuthenticationMethod": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "PrivateKey": {
+                            "type": "string"
+                        },
+                        "TeamId": {
+                            "type": "string"
+                        },
+                        "TokenKey": {
+                            "type": "string"
+                        },
+                        "TokenKeyId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::APNSChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::APNSSandboxChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "DefaultAuthenticationMethod": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "PrivateKey": {
+                            "type": "string"
+                        },
+                        "TeamId": {
+                            "type": "string"
+                        },
+                        "TokenKey": {
+                            "type": "string"
+                        },
+                        "TokenKeyId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::APNSSandboxChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::APNSVoipChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "DefaultAuthenticationMethod": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "PrivateKey": {
+                            "type": "string"
+                        },
+                        "TeamId": {
+                            "type": "string"
+                        },
+                        "TokenKey": {
+                            "type": "string"
+                        },
+                        "TokenKeyId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::APNSVoipChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::APNSVoipSandboxChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "DefaultAuthenticationMethod": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "PrivateKey": {
+                            "type": "string"
+                        },
+                        "TeamId": {
+                            "type": "string"
+                        },
+                        "TokenKey": {
+                            "type": "string"
+                        },
+                        "TokenKeyId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::APNSVoipSandboxChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::App": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::App"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::ApplicationSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "CampaignHook": {
+                            "$ref": "#/definitions/AWS::Pinpoint::ApplicationSettings.CampaignHook"
+                        },
+                        "CloudWatchMetricsEnabled": {
+                            "type": "boolean"
+                        },
+                        "Limits": {
+                            "$ref": "#/definitions/AWS::Pinpoint::ApplicationSettings.Limits"
+                        },
+                        "QuietTime": {
+                            "$ref": "#/definitions/AWS::Pinpoint::ApplicationSettings.QuietTime"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::ApplicationSettings"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::ApplicationSettings.CampaignHook": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaFunctionName": {
+                    "type": "string"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "WebUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::ApplicationSettings.Limits": {
+            "additionalProperties": false,
+            "properties": {
+                "Daily": {
+                    "type": "number"
+                },
+                "MaximumDuration": {
+                    "type": "number"
+                },
+                "MessagesPerSecond": {
+                    "type": "number"
+                },
+                "Total": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::ApplicationSettings.QuietTime": {
+            "additionalProperties": false,
+            "properties": {
+                "End": {
+                    "type": "string"
+                },
+                "Start": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "End",
+                "Start"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::BaiduChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiKey": {
+                            "type": "string"
+                        },
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "SecretKey": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApiKey",
+                        "ApplicationId",
+                        "SecretKey"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::BaiduChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AdditionalTreatments": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Pinpoint::Campaign.WriteTreatmentResource"
+                            },
+                            "type": "array"
+                        },
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "CampaignHook": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Campaign.CampaignHook"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "HoldoutPercent": {
+                            "type": "number"
+                        },
+                        "IsPaused": {
+                            "type": "boolean"
+                        },
+                        "Limits": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Campaign.Limits"
+                        },
+                        "MessageConfiguration": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Campaign.MessageConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        },
+                        "Schedule": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Campaign.Schedule"
+                        },
+                        "SegmentId": {
+                            "type": "string"
+                        },
+                        "SegmentVersion": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TreatmentDescription": {
+                            "type": "string"
+                        },
+                        "TreatmentName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "MessageConfiguration",
+                        "Name",
+                        "Schedule",
+                        "SegmentId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::Campaign"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.AttributeDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeType": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.CampaignEmailMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "Body": {
+                    "type": "string"
+                },
+                "FromAddress": {
+                    "type": "string"
+                },
+                "HtmlBody": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.CampaignEventFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.EventDimensions"
+                },
+                "FilterType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.CampaignHook": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaFunctionName": {
+                    "type": "string"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "WebUrl": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.CampaignInAppMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "Content": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pinpoint::Campaign.InAppMessageContent"
+                    },
+                    "type": "array"
+                },
+                "CustomConfig": {
+                    "type": "object"
+                },
+                "Layout": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.CampaignSmsMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "Body": {
+                    "type": "string"
+                },
+                "EntityId": {
+                    "type": "string"
+                },
+                "MessageType": {
+                    "type": "string"
+                },
+                "OriginationNumber": {
+                    "type": "string"
+                },
+                "SenderId": {
+                    "type": "string"
+                },
+                "TemplateId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.DefaultButtonConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BorderRadius": {
+                    "type": "number"
+                },
+                "ButtonAction": {
+                    "type": "string"
+                },
+                "Link": {
+                    "type": "string"
+                },
+                "Text": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.EventDimensions": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "type": "object"
+                },
+                "EventType": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.SetDimension"
+                },
+                "Metrics": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.InAppMessageBodyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.InAppMessageButton": {
+            "additionalProperties": false,
+            "properties": {
+                "Android": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.OverrideButtonConfiguration"
+                },
+                "DefaultConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.DefaultButtonConfiguration"
+                },
+                "IOS": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.OverrideButtonConfiguration"
+                },
+                "Web": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.OverrideButtonConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.InAppMessageContent": {
+            "additionalProperties": false,
+            "properties": {
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BodyConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.InAppMessageBodyConfig"
+                },
+                "HeaderConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.InAppMessageHeaderConfig"
+                },
+                "ImageUrl": {
+                    "type": "string"
+                },
+                "PrimaryBtn": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.InAppMessageButton"
+                },
+                "SecondaryBtn": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.InAppMessageButton"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.InAppMessageHeaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "Header": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.Limits": {
+            "additionalProperties": false,
+            "properties": {
+                "Daily": {
+                    "type": "number"
+                },
+                "MaximumDuration": {
+                    "type": "number"
+                },
+                "MessagesPerSecond": {
+                    "type": "number"
+                },
+                "Session": {
+                    "type": "number"
+                },
+                "Total": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.Message": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "ImageIconUrl": {
+                    "type": "string"
+                },
+                "ImageSmallIconUrl": {
+                    "type": "string"
+                },
+                "ImageUrl": {
+                    "type": "string"
+                },
+                "JsonBody": {
+                    "type": "string"
+                },
+                "MediaUrl": {
+                    "type": "string"
+                },
+                "RawContent": {
+                    "type": "string"
+                },
+                "SilentPush": {
+                    "type": "boolean"
+                },
+                "TimeToLive": {
+                    "type": "number"
+                },
+                "Title": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.MessageConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ADMMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Message"
+                },
+                "APNSMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Message"
+                },
+                "BaiduMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Message"
+                },
+                "DefaultMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Message"
+                },
+                "EmailMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.CampaignEmailMessage"
+                },
+                "GCMMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Message"
+                },
+                "InAppMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.CampaignInAppMessage"
+                },
+                "SMSMessage": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.CampaignSmsMessage"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.MetricDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.OverrideButtonConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ButtonAction": {
+                    "type": "string"
+                },
+                "Link": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.QuietTime": {
+            "additionalProperties": false,
+            "properties": {
+                "End": {
+                    "type": "string"
+                },
+                "Start": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "End",
+                "Start"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "EndTime": {
+                    "type": "string"
+                },
+                "EventFilter": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.CampaignEventFilter"
+                },
+                "Frequency": {
+                    "type": "string"
+                },
+                "IsLocalTime": {
+                    "type": "boolean"
+                },
+                "QuietTime": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.QuietTime"
+                },
+                "StartTime": {
+                    "type": "string"
+                },
+                "TimeZone": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.SetDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionType": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Campaign.WriteTreatmentResource": {
+            "additionalProperties": false,
+            "properties": {
+                "MessageConfiguration": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.MessageConfiguration"
+                },
+                "Schedule": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Campaign.Schedule"
+                },
+                "SizePercent": {
+                    "type": "number"
+                },
+                "TreatmentDescription": {
+                    "type": "string"
+                },
+                "TreatmentName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::EmailChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ConfigurationSet": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "FromAddress": {
+                            "type": "string"
+                        },
+                        "Identity": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "FromAddress",
+                        "Identity"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::EmailChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::EmailTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DefaultSubstitutions": {
+                            "type": "string"
+                        },
+                        "HtmlPart": {
+                            "type": "string"
+                        },
+                        "Subject": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TemplateDescription": {
+                            "type": "string"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        },
+                        "TextPart": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Subject",
+                        "TemplateName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::EmailTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::EventStream": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DestinationStreamArn": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "DestinationStreamArn",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::EventStream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::GCMChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiKey": {
+                            "type": "string"
+                        },
+                        "ApplicationId": {
+                            "type": "string"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ApiKey",
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::GCMChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Content": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.InAppMessageContent"
+                            },
+                            "type": "array"
+                        },
+                        "CustomConfig": {
+                            "type": "object"
+                        },
+                        "Layout": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TemplateDescription": {
+                            "type": "string"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TemplateName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::InAppTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.BodyConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.ButtonConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Android": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.OverrideButtonConfiguration"
+                },
+                "DefaultConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.DefaultButtonConfiguration"
+                },
+                "IOS": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.OverrideButtonConfiguration"
+                },
+                "Web": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.OverrideButtonConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.DefaultButtonConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BorderRadius": {
+                    "type": "number"
+                },
+                "ButtonAction": {
+                    "type": "string"
+                },
+                "Link": {
+                    "type": "string"
+                },
+                "Text": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.HeaderConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Alignment": {
+                    "type": "string"
+                },
+                "Header": {
+                    "type": "string"
+                },
+                "TextColor": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.InAppMessageContent": {
+            "additionalProperties": false,
+            "properties": {
+                "BackgroundColor": {
+                    "type": "string"
+                },
+                "BodyConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.BodyConfig"
+                },
+                "HeaderConfig": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.HeaderConfig"
+                },
+                "ImageUrl": {
+                    "type": "string"
+                },
+                "PrimaryBtn": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.ButtonConfig"
+                },
+                "SecondaryBtn": {
+                    "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate.ButtonConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::InAppTemplate.OverrideButtonConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ButtonAction": {
+                    "type": "string"
+                },
+                "Link": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::PushTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ADM": {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate.AndroidPushNotificationTemplate"
+                        },
+                        "APNS": {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate.APNSPushNotificationTemplate"
+                        },
+                        "Baidu": {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate.AndroidPushNotificationTemplate"
+                        },
+                        "Default": {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate.DefaultPushNotificationTemplate"
+                        },
+                        "DefaultSubstitutions": {
+                            "type": "string"
+                        },
+                        "GCM": {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate.AndroidPushNotificationTemplate"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TemplateDescription": {
+                            "type": "string"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "TemplateName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::PushTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::PushTemplate.APNSPushNotificationTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "MediaUrl": {
+                    "type": "string"
+                },
+                "Sound": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::PushTemplate.AndroidPushNotificationTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "ImageIconUrl": {
+                    "type": "string"
+                },
+                "ImageUrl": {
+                    "type": "string"
+                },
+                "SmallImageIconUrl": {
+                    "type": "string"
+                },
+                "Sound": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::PushTemplate.DefaultPushNotificationTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "Body": {
+                    "type": "string"
+                },
+                "Sound": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::SMSChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "SenderId": {
+                            "type": "string"
+                        },
+                        "ShortCode": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::SMSChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Dimensions": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Segment.SegmentDimensions"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SegmentGroups": {
+                            "$ref": "#/definitions/AWS::Pinpoint::Segment.SegmentGroups"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::Segment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.AttributeDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "AttributeType": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Behavior": {
+            "additionalProperties": false,
+            "properties": {
+                "Recency": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.Recency"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Coordinates": {
+            "additionalProperties": false,
+            "properties": {
+                "Latitude": {
+                    "type": "number"
+                },
+                "Longitude": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Latitude",
+                "Longitude"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Demographic": {
+            "additionalProperties": false,
+            "properties": {
+                "AppVersion": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "Channel": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "DeviceType": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "Make": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "Model": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "Platform": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.GPSPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "Coordinates": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.Coordinates"
+                },
+                "RangeInKilometers": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Coordinates",
+                "RangeInKilometers"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Groups": {
+            "additionalProperties": false,
+            "properties": {
+                "Dimensions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pinpoint::Segment.SegmentDimensions"
+                    },
+                    "type": "array"
+                },
+                "SourceSegments": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pinpoint::Segment.SourceSegments"
+                    },
+                    "type": "array"
+                },
+                "SourceType": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Country": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.SetDimension"
+                },
+                "GPSPoint": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.GPSPoint"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.Recency": {
+            "additionalProperties": false,
+            "properties": {
+                "Duration": {
+                    "type": "string"
+                },
+                "RecencyType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Duration",
+                "RecencyType"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.SegmentDimensions": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "type": "object"
+                },
+                "Behavior": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.Behavior"
+                },
+                "Demographic": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.Demographic"
+                },
+                "Location": {
+                    "$ref": "#/definitions/AWS::Pinpoint::Segment.Location"
+                },
+                "Metrics": {
+                    "type": "object"
+                },
+                "UserAttributes": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.SegmentGroups": {
+            "additionalProperties": false,
+            "properties": {
+                "Groups": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Pinpoint::Segment.Groups"
+                    },
+                    "type": "array"
+                },
+                "Include": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.SetDimension": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionType": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Pinpoint::Segment.SourceSegments": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::SmsTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Body": {
+                            "type": "string"
+                        },
+                        "DefaultSubstitutions": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "TemplateDescription": {
+                            "type": "string"
+                        },
+                        "TemplateName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Body",
+                        "TemplateName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::SmsTemplate"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Pinpoint::VoiceChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Enabled": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ApplicationId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Pinpoint::VoiceChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeliveryOptions": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet.DeliveryOptions"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ReputationOptions": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet.ReputationOptions"
+                        },
+                        "SendingOptions": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet.SendingOptions"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet.Tags"
+                            },
+                            "type": "array"
+                        },
+                        "TrackingOptions": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet.TrackingOptions"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PinpointEmail::ConfigurationSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet.DeliveryOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "SendingPoolName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet.ReputationOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "ReputationMetricsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet.SendingOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "SendingEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSet.TrackingOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomRedirectDomain": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigurationSetName": {
+                            "type": "string"
+                        },
+                        "EventDestination": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.EventDestination"
+                        },
+                        "EventDestinationName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationSetName",
+                        "EventDestinationName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PinpointEmail::ConfigurationSetEventDestination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.CloudWatchDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.DimensionConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.DimensionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultDimensionValue": {
+                    "type": "string"
+                },
+                "DimensionName": {
+                    "type": "string"
+                },
+                "DimensionValueSource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DefaultDimensionValue",
+                "DimensionName",
+                "DimensionValueSource"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.EventDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchDestination": {
+                    "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.CloudWatchDestination"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "KinesisFirehoseDestination": {
+                    "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.KinesisFirehoseDestination"
+                },
+                "MatchingEventTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "PinpointDestination": {
+                    "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.PinpointDestination"
+                },
+                "SnsDestination": {
+                    "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination.SnsDestination"
+                }
+            },
+            "required": [
+                "MatchingEventTypes"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.KinesisFirehoseDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStreamArn": {
+                    "type": "string"
+                },
+                "IamRoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStreamArn",
+                "IamRoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.PinpointDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::ConfigurationSetEventDestination.SnsDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::DedicatedIpPool": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PoolName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::PinpointEmail::DedicatedIpPool.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PinpointEmail::DedicatedIpPool"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::DedicatedIpPool.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::Identity": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DkimSigningEnabled": {
+                            "type": "boolean"
+                        },
+                        "FeedbackForwardingEnabled": {
+                            "type": "boolean"
+                        },
+                        "MailFromAttributes": {
+                            "$ref": "#/definitions/AWS::PinpointEmail::Identity.MailFromAttributes"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::PinpointEmail::Identity.Tags"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::PinpointEmail::Identity"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::PinpointEmail::Identity.MailFromAttributes": {
+            "additionalProperties": false,
+            "properties": {
+                "BehaviorOnMxFailure": {
+                    "type": "string"
+                },
+                "MailFromDomain": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::PinpointEmail::Identity.Tags": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QLDB::Ledger": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "KmsKey": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PermissionsMode": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PermissionsMode"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QLDB::Ledger"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QLDB::Stream": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ExclusiveEndTime": {
+                            "type": "string"
+                        },
+                        "InclusiveStartTime": {
+                            "type": "string"
+                        },
+                        "KinesisConfiguration": {
+                            "$ref": "#/definitions/AWS::QLDB::Stream.KinesisConfiguration"
+                        },
+                        "LedgerName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StreamName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "InclusiveStartTime",
+                        "KinesisConfiguration",
+                        "LedgerName",
+                        "RoleArn",
+                        "StreamName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QLDB::Stream"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QLDB::Stream.KinesisConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregationEnabled": {
+                    "type": "boolean"
+                },
+                "StreamArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AnalysisId": {
+                            "type": "string"
+                        },
+                        "AwsAccountId": {
+                            "type": "string"
+                        },
+                        "Errors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Analysis.AnalysisError"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "$ref": "#/definitions/AWS::QuickSight::Analysis.Parameters"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Analysis.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SourceEntity": {
+                            "$ref": "#/definitions/AWS::QuickSight::Analysis.AnalysisSourceEntity"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThemeArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AnalysisId",
+                        "AwsAccountId",
+                        "SourceEntity"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Analysis"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.AnalysisError": {
+            "additionalProperties": false,
+            "properties": {
+                "Message": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.AnalysisSourceEntity": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceTemplate": {
+                    "$ref": "#/definitions/AWS::QuickSight::Analysis.AnalysisSourceTemplate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.AnalysisSourceTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "DataSetReferences": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DataSetReference"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn",
+                "DataSetReferences"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.DataSetReference": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSetArn": {
+                    "type": "string"
+                },
+                "DataSetPlaceholder": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSetArn",
+                "DataSetPlaceholder"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.DateTimeParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.DecimalParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.IntegerParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.Parameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DateTimeParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DateTimeParameter"
+                    },
+                    "type": "array"
+                },
+                "DecimalParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.DecimalParameter"
+                    },
+                    "type": "array"
+                },
+                "IntegerParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.IntegerParameter"
+                    },
+                    "type": "array"
+                },
+                "StringParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Analysis.StringParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.Sheet": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "SheetId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Analysis.StringParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DashboardId": {
+                            "type": "string"
+                        },
+                        "DashboardPublishOptions": {
+                            "$ref": "#/definitions/AWS::QuickSight::Dashboard.DashboardPublishOptions"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "$ref": "#/definitions/AWS::QuickSight::Dashboard.Parameters"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Dashboard.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SourceEntity": {
+                            "$ref": "#/definitions/AWS::QuickSight::Dashboard.DashboardSourceEntity"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThemeArn": {
+                            "type": "string"
+                        },
+                        "VersionDescription": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AwsAccountId",
+                        "DashboardId",
+                        "SourceEntity"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Dashboard"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.AdHocFilteringOption": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityStatus": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DashboardPublishOptions": {
+            "additionalProperties": false,
+            "properties": {
+                "AdHocFilteringOption": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.AdHocFilteringOption"
+                },
+                "ExportToCSVOption": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.ExportToCSVOption"
+                },
+                "SheetControlsOption": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.SheetControlsOption"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DashboardSourceEntity": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceTemplate": {
+                    "$ref": "#/definitions/AWS::QuickSight::Dashboard.DashboardSourceTemplate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DashboardSourceTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "DataSetReferences": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DataSetReference"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn",
+                "DataSetReferences"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DataSetReference": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSetArn": {
+                    "type": "string"
+                },
+                "DataSetPlaceholder": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSetArn",
+                "DataSetPlaceholder"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DateTimeParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.DecimalParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.ExportToCSVOption": {
+            "additionalProperties": false,
+            "properties": {
+                "AvailabilityStatus": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.IntegerParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.Parameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DateTimeParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DateTimeParameter"
+                    },
+                    "type": "array"
+                },
+                "DecimalParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.DecimalParameter"
+                    },
+                    "type": "array"
+                },
+                "IntegerParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.IntegerParameter"
+                    },
+                    "type": "array"
+                },
+                "StringParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Dashboard.StringParameter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.SheetControlsOption": {
+            "additionalProperties": false,
+            "properties": {
+                "VisibilityState": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Dashboard.StringParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Name",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ColumnGroups": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::DataSet.ColumnGroup"
+                            },
+                            "type": "array"
+                        },
+                        "ColumnLevelPermissionRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::DataSet.ColumnLevelPermissionRule"
+                            },
+                            "type": "array"
+                        },
+                        "DataSetId": {
+                            "type": "string"
+                        },
+                        "FieldFolders": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::QuickSight::DataSet.FieldFolder"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ImportMode": {
+                            "type": "string"
+                        },
+                        "IngestionWaitPolicy": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSet.IngestionWaitPolicy"
+                        },
+                        "LogicalTableMap": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::QuickSight::DataSet.LogicalTable"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::DataSet.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "PhysicalTableMap": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::QuickSight::DataSet.PhysicalTable"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "RowLevelPermissionDataSet": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSet.RowLevelPermissionDataSet"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::DataSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.CalculatedColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnId": {
+                    "type": "string"
+                },
+                "ColumnName": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnId",
+                "ColumnName",
+                "Expression"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.CastColumnTypeOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                },
+                "NewColumnType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "NewColumnType"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ColumnDescription": {
+            "additionalProperties": false,
+            "properties": {
+                "Text": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ColumnGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "GeoSpatialColumnGroup": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.GeoSpatialColumnGroup"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ColumnLevelPermissionRule": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnNames": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principals": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ColumnTag": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnDescription": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.ColumnDescription"
+                },
+                "ColumnGeographicRole": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.CreateColumnsOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.CalculatedColumn"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Columns"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.CustomSql": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.InputColumn"
+                    },
+                    "type": "array"
+                },
+                "DataSourceArn": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "SqlQuery": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Columns",
+                "DataSourceArn",
+                "Name",
+                "SqlQuery"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.FieldFolder": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Description": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.FilterOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ConditionExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConditionExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.GeoSpatialColumnGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "Columns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CountryCode": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Columns",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.IngestionWaitPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "IngestionWaitTimeInHours": {
+                    "type": "number"
+                },
+                "WaitForSpiceIngestion": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.InputColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.JoinInstruction": {
+            "additionalProperties": false,
+            "properties": {
+                "LeftJoinKeyProperties": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.JoinKeyProperties"
+                },
+                "LeftOperand": {
+                    "type": "string"
+                },
+                "OnClause": {
+                    "type": "string"
+                },
+                "RightJoinKeyProperties": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.JoinKeyProperties"
+                },
+                "RightOperand": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LeftOperand",
+                "OnClause",
+                "RightOperand",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.JoinKeyProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "UniqueKey": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.LogicalTable": {
+            "additionalProperties": false,
+            "properties": {
+                "Alias": {
+                    "type": "string"
+                },
+                "DataTransforms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.TransformOperation"
+                    },
+                    "type": "array"
+                },
+                "Source": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.LogicalTableSource"
+                }
+            },
+            "required": [
+                "Alias",
+                "Source"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.LogicalTableSource": {
+            "additionalProperties": false,
+            "properties": {
+                "JoinInstruction": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.JoinInstruction"
+                },
+                "PhysicalTableId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.OutputColumn": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.PhysicalTable": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomSql": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.CustomSql"
+                },
+                "RelationalTable": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.RelationalTable"
+                },
+                "S3Source": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.S3Source"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ProjectOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ProjectedColumns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ProjectedColumns"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.RelationalTable": {
+            "additionalProperties": false,
+            "properties": {
+                "Catalog": {
+                    "type": "string"
+                },
+                "DataSourceArn": {
+                    "type": "string"
+                },
+                "InputColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.InputColumn"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Schema": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSourceArn",
+                "InputColumns",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.RenameColumnOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "NewColumnName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "NewColumnName"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.RowLevelPermissionDataSet": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "FormatVersion": {
+                    "type": "string"
+                },
+                "Namespace": {
+                    "type": "string"
+                },
+                "PermissionPolicy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn",
+                "PermissionPolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.S3Source": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSourceArn": {
+                    "type": "string"
+                },
+                "InputColumns": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.InputColumn"
+                    },
+                    "type": "array"
+                },
+                "UploadSettings": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.UploadSettings"
+                }
+            },
+            "required": [
+                "DataSourceArn",
+                "InputColumns"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.TagColumnOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "ColumnName": {
+                    "type": "string"
+                },
+                "Tags": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSet.ColumnTag"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ColumnName",
+                "Tags"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.TransformOperation": {
+            "additionalProperties": false,
+            "properties": {
+                "CastColumnTypeOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.CastColumnTypeOperation"
+                },
+                "CreateColumnsOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.CreateColumnsOperation"
+                },
+                "FilterOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.FilterOperation"
+                },
+                "ProjectOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.ProjectOperation"
+                },
+                "RenameColumnOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.RenameColumnOperation"
+                },
+                "TagColumnOperation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSet.TagColumnOperation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSet.UploadSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainsHeader": {
+                    "type": "boolean"
+                },
+                "Delimiter": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                },
+                "StartFromRow": {
+                    "type": "number"
+                },
+                "TextQualifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AlternateDataSourceParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::DataSource.DataSourceParameters"
+                            },
+                            "type": "array"
+                        },
+                        "AwsAccountId": {
+                            "type": "string"
+                        },
+                        "Credentials": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource.DataSourceCredentials"
+                        },
+                        "DataSourceId": {
+                            "type": "string"
+                        },
+                        "DataSourceParameters": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource.DataSourceParameters"
+                        },
+                        "ErrorInfo": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource.DataSourceErrorInfo"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::DataSource.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SslProperties": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource.SslProperties"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "VpcConnectionProperties": {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource.VpcConnectionProperties"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::DataSource"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.AmazonElasticsearchParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Domain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Domain"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.AmazonOpenSearchParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Domain": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Domain"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.AthenaParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "WorkGroup": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.AuroraParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.AuroraPostgreSqlParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.CredentialPair": {
+            "additionalProperties": false,
+            "properties": {
+                "AlternateDataSourceParameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::DataSource.DataSourceParameters"
+                    },
+                    "type": "array"
+                },
+                "Password": {
+                    "type": "string"
+                },
+                "Username": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Password",
+                "Username"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.DataSourceCredentials": {
+            "additionalProperties": false,
+            "properties": {
+                "CopySourceArn": {
+                    "type": "string"
+                },
+                "CredentialPair": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.CredentialPair"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.DataSourceErrorInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Message": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.DataSourceParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "AmazonElasticsearchParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.AmazonElasticsearchParameters"
+                },
+                "AmazonOpenSearchParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.AmazonOpenSearchParameters"
+                },
+                "AthenaParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.AthenaParameters"
+                },
+                "AuroraParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.AuroraParameters"
+                },
+                "AuroraPostgreSqlParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.AuroraPostgreSqlParameters"
+                },
+                "MariaDbParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.MariaDbParameters"
+                },
+                "MySqlParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.MySqlParameters"
+                },
+                "OracleParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.OracleParameters"
+                },
+                "PostgreSqlParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.PostgreSqlParameters"
+                },
+                "PrestoParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.PrestoParameters"
+                },
+                "RdsParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.RdsParameters"
+                },
+                "RedshiftParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.RedshiftParameters"
+                },
+                "S3Parameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.S3Parameters"
+                },
+                "SnowflakeParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.SnowflakeParameters"
+                },
+                "SparkParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.SparkParameters"
+                },
+                "SqlServerParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.SqlServerParameters"
+                },
+                "TeradataParameters": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.TeradataParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.ManifestFileLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.MariaDbParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.MySqlParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.OracleParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.PostgreSqlParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.PrestoParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Catalog": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Catalog",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.RdsParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "InstanceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Database",
+                "InstanceId"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.RedshiftParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterId": {
+                    "type": "string"
+                },
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.S3Parameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ManifestFileLocation": {
+                    "$ref": "#/definitions/AWS::QuickSight::DataSource.ManifestFileLocation"
+                }
+            },
+            "required": [
+                "ManifestFileLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.SnowflakeParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Warehouse": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Warehouse"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.SparkParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.SqlServerParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.SslProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "DisableSsl": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.TeradataParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Database": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Database",
+                "Host",
+                "Port"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::DataSource.VpcConnectionProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "VpcConnectionArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VpcConnectionArn"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Template.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "SourceEntity": {
+                            "$ref": "#/definitions/AWS::QuickSight::Template.TemplateSourceEntity"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TemplateId": {
+                            "type": "string"
+                        },
+                        "VersionDescription": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AwsAccountId",
+                        "SourceEntity",
+                        "TemplateId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Template"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.DataSetReference": {
+            "additionalProperties": false,
+            "properties": {
+                "DataSetArn": {
+                    "type": "string"
+                },
+                "DataSetPlaceholder": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataSetArn",
+                "DataSetPlaceholder"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.TemplateSourceAnalysis": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "DataSetReferences": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Template.DataSetReference"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn",
+                "DataSetReferences"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.TemplateSourceEntity": {
+            "additionalProperties": false,
+            "properties": {
+                "SourceAnalysis": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.TemplateSourceAnalysis"
+                },
+                "SourceTemplate": {
+                    "$ref": "#/definitions/AWS::QuickSight::Template.TemplateSourceTemplate"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Template.TemplateSourceTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "BaseThemeId": {
+                            "type": "string"
+                        },
+                        "Configuration": {
+                            "$ref": "#/definitions/AWS::QuickSight::Theme.ThemeConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Permissions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::QuickSight::Theme.ResourcePermission"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "ThemeId": {
+                            "type": "string"
+                        },
+                        "VersionDescription": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AwsAccountId",
+                        "ThemeId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::QuickSight::Theme"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.BorderStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Show": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.DataColorPalette": {
+            "additionalProperties": false,
+            "properties": {
+                "Colors": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "EmptyFillColor": {
+                    "type": "string"
+                },
+                "MinMaxGradient": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.Font": {
+            "additionalProperties": false,
+            "properties": {
+                "FontFamily": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.GutterStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Show": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.MarginStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Show": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.ResourcePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Principal": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Actions",
+                "Principal"
+            ],
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.SheetStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Tile": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.TileStyle"
+                },
+                "TileLayout": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.TileLayoutStyle"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.ThemeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DataColorPalette": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.DataColorPalette"
+                },
+                "Sheet": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.SheetStyle"
+                },
+                "Typography": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.Typography"
+                },
+                "UIColorPalette": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.UIColorPalette"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.TileLayoutStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Gutter": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.GutterStyle"
+                },
+                "Margin": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.MarginStyle"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.TileStyle": {
+            "additionalProperties": false,
+            "properties": {
+                "Border": {
+                    "$ref": "#/definitions/AWS::QuickSight::Theme.BorderStyle"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.Typography": {
+            "additionalProperties": false,
+            "properties": {
+                "FontFamilies": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::QuickSight::Theme.Font"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::QuickSight::Theme.UIColorPalette": {
+            "additionalProperties": false,
+            "properties": {
+                "Accent": {
+                    "type": "string"
+                },
+                "AccentForeground": {
+                    "type": "string"
+                },
+                "Danger": {
+                    "type": "string"
+                },
+                "DangerForeground": {
+                    "type": "string"
+                },
+                "Dimension": {
+                    "type": "string"
+                },
+                "DimensionForeground": {
+                    "type": "string"
+                },
+                "Measure": {
+                    "type": "string"
+                },
+                "MeasureForeground": {
+                    "type": "string"
+                },
+                "PrimaryBackground": {
+                    "type": "string"
+                },
+                "PrimaryForeground": {
+                    "type": "string"
+                },
+                "SecondaryBackground": {
+                    "type": "string"
+                },
+                "SecondaryForeground": {
+                    "type": "string"
+                },
+                "Success": {
+                    "type": "string"
+                },
+                "SuccessForeground": {
+                    "type": "string"
+                },
+                "Warning": {
+                    "type": "string"
+                },
+                "WarningForeground": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RAM::ResourceShare": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowExternalPrincipals": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "PermissionArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Principals": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ResourceArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RAM::ResourceShare"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssociatedRoles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBCluster.DBClusterRole"
+                            },
+                            "type": "array"
+                        },
+                        "AvailabilityZones": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "BacktrackWindow": {
+                            "type": "number"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "CopyTagsToSnapshot": {
+                            "type": "boolean"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EnableHttpEndpoint": {
+                            "type": "boolean"
+                        },
+                        "EnableIAMDatabaseAuthentication": {
+                            "type": "boolean"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineMode": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "GlobalClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "MasterUserPassword": {
+                            "type": "string"
+                        },
+                        "MasterUsername": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "ReplicationSourceIdentifier": {
+                            "type": "string"
+                        },
+                        "RestoreType": {
+                            "type": "string"
+                        },
+                        "ScalingConfiguration": {
+                            "$ref": "#/definitions/AWS::RDS::DBCluster.ScalingConfiguration"
+                        },
+                        "SnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceDBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceRegion": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UseLatestRestorableTime": {
+                            "type": "boolean"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Engine"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBCluster.DBClusterRole": {
+            "additionalProperties": false,
+            "properties": {
+                "FeatureName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBCluster.ScalingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoPause": {
+                    "type": "boolean"
+                },
+                "MaxCapacity": {
+                    "type": "number"
+                },
+                "MinCapacity": {
+                    "type": "number"
+                },
+                "SecondsUntilAutoPause": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBClusterParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Parameters": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "Family",
+                        "Parameters"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBClusterParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllocatedStorage": {
+                            "type": "string"
+                        },
+                        "AllowMajorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AssociatedRoles": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBInstance.DBInstanceRole"
+                            },
+                            "type": "array"
+                        },
+                        "AutoMinorVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "BackupRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "CACertificateIdentifier": {
+                            "type": "string"
+                        },
+                        "CharacterSetName": {
+                            "type": "string"
+                        },
+                        "CopyTagsToSnapshot": {
+                            "type": "boolean"
+                        },
+                        "DBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "DBInstanceClass": {
+                            "type": "string"
+                        },
+                        "DBInstanceIdentifier": {
+                            "type": "string"
+                        },
+                        "DBName": {
+                            "type": "string"
+                        },
+                        "DBParameterGroupName": {
+                            "type": "string"
+                        },
+                        "DBSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DBSnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "DeleteAutomatedBackups": {
+                            "type": "boolean"
+                        },
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "DomainIAMRoleName": {
+                            "type": "string"
+                        },
+                        "EnableCloudwatchLogsExports": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "EnableIAMDatabaseAuthentication": {
+                            "type": "boolean"
+                        },
+                        "EnablePerformanceInsights": {
+                            "type": "boolean"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "Iops": {
+                            "type": "number"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LicenseModel": {
+                            "type": "string"
+                        },
+                        "MasterUserPassword": {
+                            "type": "string"
+                        },
+                        "MasterUsername": {
+                            "type": "string"
+                        },
+                        "MaxAllocatedStorage": {
+                            "type": "number"
+                        },
+                        "MonitoringInterval": {
+                            "type": "number"
+                        },
+                        "MonitoringRoleArn": {
+                            "type": "string"
+                        },
+                        "MultiAZ": {
+                            "type": "boolean"
+                        },
+                        "OptionGroupName": {
+                            "type": "string"
+                        },
+                        "PerformanceInsightsKMSKeyId": {
+                            "type": "string"
+                        },
+                        "PerformanceInsightsRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "Port": {
+                            "type": "string"
+                        },
+                        "PreferredBackupWindow": {
+                            "type": "string"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "ProcessorFeatures": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBInstance.ProcessorFeature"
+                            },
+                            "type": "array"
+                        },
+                        "PromotionTier": {
+                            "type": "number"
+                        },
+                        "PubliclyAccessible": {
+                            "type": "boolean"
+                        },
+                        "SourceDBInstanceIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceRegion": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        },
+                        "StorageType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Timezone": {
+                            "type": "string"
+                        },
+                        "UseDefaultProcessorFeatures": {
+                            "type": "boolean"
+                        },
+                        "VPCSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBInstanceClass"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBInstance.DBInstanceRole": {
+            "additionalProperties": false,
+            "properties": {
+                "FeatureName": {
+                    "type": "string"
+                },
+                "RoleArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FeatureName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBInstance.ProcessorFeature": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "Family"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBProxy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Auth": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBProxy.AuthFormat"
+                            },
+                            "type": "array"
+                        },
+                        "DBProxyName": {
+                            "type": "string"
+                        },
+                        "DebugLogging": {
+                            "type": "boolean"
+                        },
+                        "EngineFamily": {
+                            "type": "string"
+                        },
+                        "IdleClientTimeout": {
+                            "type": "number"
+                        },
+                        "RequireTLS": {
+                            "type": "boolean"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBProxy.TagFormat"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Auth",
+                        "DBProxyName",
+                        "EngineFamily",
+                        "RoleArn",
+                        "VpcSubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBProxy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBProxy.AuthFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "AuthScheme": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "IAMAuth": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                },
+                "UserName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBProxy.TagFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBProxyEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DBProxyEndpointName": {
+                            "type": "string"
+                        },
+                        "DBProxyName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBProxyEndpoint.TagFormat"
+                            },
+                            "type": "array"
+                        },
+                        "TargetRole": {
+                            "type": "string"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBProxyEndpointName",
+                        "DBProxyName",
+                        "VpcSubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBProxyEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBProxyEndpoint.TagFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBProxyTargetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionPoolConfigurationInfo": {
+                            "$ref": "#/definitions/AWS::RDS::DBProxyTargetGroup.ConnectionPoolConfigurationInfoFormat"
+                        },
+                        "DBClusterIdentifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DBInstanceIdentifiers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DBProxyName": {
+                            "type": "string"
+                        },
+                        "TargetGroupName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DBProxyName",
+                        "TargetGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBProxyTargetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBProxyTargetGroup.ConnectionPoolConfigurationInfoFormat": {
+            "additionalProperties": false,
+            "properties": {
+                "ConnectionBorrowTimeout": {
+                    "type": "number"
+                },
+                "InitQuery": {
+                    "type": "string"
+                },
+                "MaxConnectionsPercent": {
+                    "type": "number"
+                },
+                "MaxIdleConnectionsPercent": {
+                    "type": "number"
+                },
+                "SessionPinningFilters": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBSecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DBSecurityGroupIngress": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::DBSecurityGroup.Ingress"
+                            },
+                            "type": "array"
+                        },
+                        "EC2VpcId": {
+                            "type": "string"
+                        },
+                        "GroupDescription": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBSecurityGroupIngress",
+                        "GroupDescription"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBSecurityGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBSecurityGroup.Ingress": {
+            "additionalProperties": false,
+            "properties": {
+                "CIDRIP": {
+                    "type": "string"
+                },
+                "EC2SecurityGroupId": {
+                    "type": "string"
+                },
+                "EC2SecurityGroupName": {
+                    "type": "string"
+                },
+                "EC2SecurityGroupOwnerId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RDS::DBSecurityGroupIngress": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CIDRIP": {
+                            "type": "string"
+                        },
+                        "DBSecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupId": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupOwnerId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "DBSecurityGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBSecurityGroupIngress"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::DBSubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DBSubnetGroupDescription": {
+                            "type": "string"
+                        },
+                        "DBSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DBSubnetGroupDescription",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::DBSubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::EventSubscription": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "EventCategories": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SourceIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SourceType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SnsTopicArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::EventSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::GlobalCluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeletionProtection": {
+                            "type": "boolean"
+                        },
+                        "Engine": {
+                            "type": "string"
+                        },
+                        "EngineVersion": {
+                            "type": "string"
+                        },
+                        "GlobalClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "SourceDBClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "StorageEncrypted": {
+                            "type": "boolean"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::GlobalCluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::OptionGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EngineName": {
+                            "type": "string"
+                        },
+                        "MajorEngineVersion": {
+                            "type": "string"
+                        },
+                        "OptionConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RDS::OptionGroup.OptionConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "OptionGroupDescription": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EngineName",
+                        "MajorEngineVersion",
+                        "OptionConfigurations",
+                        "OptionGroupDescription"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RDS::OptionGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::OptionGroup.OptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DBSecurityGroupMemberships": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "OptionName": {
+                    "type": "string"
+                },
+                "OptionSettings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::RDS::OptionGroup.OptionSetting"
+                    },
+                    "type": "array"
+                },
+                "OptionVersion": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "number"
+                },
+                "VpcSecurityGroupMemberships": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "OptionName"
+            ],
+            "type": "object"
+        },
+        "AWS::RDS::OptionGroup.OptionSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RUM::AppMonitor": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppMonitorConfiguration": {
+                            "$ref": "#/definitions/AWS::RUM::AppMonitor.AppMonitorConfiguration"
+                        },
+                        "CwLogEnabled": {
+                            "type": "boolean"
+                        },
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RUM::AppMonitor"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::RUM::AppMonitor.AppMonitorConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowCookies": {
+                    "type": "boolean"
+                },
+                "EnableXRay": {
+                    "type": "boolean"
+                },
+                "ExcludedPages": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "FavoritePages": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "GuestRoleArn": {
+                    "type": "string"
+                },
+                "IdentityPoolId": {
+                    "type": "string"
+                },
+                "IncludedPages": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SessionSampleRate": {
+                    "type": "number"
+                },
+                "Telemetries": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Redshift::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowVersionUpgrade": {
+                            "type": "boolean"
+                        },
+                        "AquaConfigurationStatus": {
+                            "type": "string"
+                        },
+                        "AutomatedSnapshotRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "AvailabilityZone": {
+                            "type": "string"
+                        },
+                        "AvailabilityZoneRelocation": {
+                            "type": "boolean"
+                        },
+                        "AvailabilityZoneRelocationStatus": {
+                            "type": "string"
+                        },
+                        "Classic": {
+                            "type": "boolean"
+                        },
+                        "ClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "ClusterParameterGroupName": {
+                            "type": "string"
+                        },
+                        "ClusterSecurityGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ClusterSubnetGroupName": {
+                            "type": "string"
+                        },
+                        "ClusterType": {
+                            "type": "string"
+                        },
+                        "ClusterVersion": {
+                            "type": "string"
+                        },
+                        "DBName": {
+                            "type": "string"
+                        },
+                        "DeferMaintenance": {
+                            "type": "boolean"
+                        },
+                        "DeferMaintenanceDuration": {
+                            "type": "number"
+                        },
+                        "DeferMaintenanceEndTime": {
+                            "type": "string"
+                        },
+                        "DeferMaintenanceStartTime": {
+                            "type": "string"
+                        },
+                        "DestinationRegion": {
+                            "type": "string"
+                        },
+                        "ElasticIp": {
+                            "type": "string"
+                        },
+                        "Encrypted": {
+                            "type": "boolean"
+                        },
+                        "EnhancedVpcRouting": {
+                            "type": "boolean"
+                        },
+                        "HsmClientCertificateIdentifier": {
+                            "type": "string"
+                        },
+                        "HsmConfigurationIdentifier": {
+                            "type": "string"
+                        },
+                        "IamRoles": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LoggingProperties": {
+                            "$ref": "#/definitions/AWS::Redshift::Cluster.LoggingProperties"
+                        },
+                        "MaintenanceTrackName": {
+                            "type": "string"
+                        },
+                        "ManualSnapshotRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "MasterUserPassword": {
+                            "type": "string"
+                        },
+                        "MasterUsername": {
+                            "type": "string"
+                        },
+                        "NodeType": {
+                            "type": "string"
+                        },
+                        "NumberOfNodes": {
+                            "type": "number"
+                        },
+                        "OwnerAccount": {
+                            "type": "string"
+                        },
+                        "Port": {
+                            "type": "number"
+                        },
+                        "PreferredMaintenanceWindow": {
+                            "type": "string"
+                        },
+                        "PubliclyAccessible": {
+                            "type": "boolean"
+                        },
+                        "ResourceAction": {
+                            "type": "string"
+                        },
+                        "RevisionTarget": {
+                            "type": "string"
+                        },
+                        "RotateEncryptionKey": {
+                            "type": "boolean"
+                        },
+                        "SnapshotClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "SnapshotCopyGrantName": {
+                            "type": "string"
+                        },
+                        "SnapshotCopyManual": {
+                            "type": "boolean"
+                        },
+                        "SnapshotCopyRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "SnapshotIdentifier": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ClusterType",
+                        "DBName",
+                        "MasterUserPassword",
+                        "MasterUsername",
+                        "NodeType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::Cluster.Endpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "Address": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Redshift::Cluster.LoggingProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "S3KeyPrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ClusterParameterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ParameterGroupFamily": {
+                            "type": "string"
+                        },
+                        "Parameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Redshift::ClusterParameterGroup.Parameter"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "ParameterGroupFamily"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::ClusterParameterGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ClusterParameterGroup.Parameter": {
+            "additionalProperties": false,
+            "properties": {
+                "ParameterName": {
+                    "type": "string"
+                },
+                "ParameterValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ParameterName",
+                "ParameterValue"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ClusterSecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::ClusterSecurityGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ClusterSecurityGroupIngress": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CIDRIP": {
+                            "type": "string"
+                        },
+                        "ClusterSecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupName": {
+                            "type": "string"
+                        },
+                        "EC2SecurityGroupOwnerId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ClusterSecurityGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::ClusterSecurityGroupIngress"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ClusterSubnetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Description",
+                        "SubnetIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::ClusterSubnetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::EndpointAccess": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "EndpointName": {
+                            "type": "string"
+                        },
+                        "ResourceOwner": {
+                            "type": "string"
+                        },
+                        "SubnetGroupName": {
+                            "type": "string"
+                        },
+                        "VpcSecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EndpointName",
+                        "VpcSecurityGroupIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::EndpointAccess"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::EndpointAccess.VpcSecurityGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                },
+                "VpcSecurityGroupId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Redshift::EndpointAuthorization": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Account": {
+                            "type": "string"
+                        },
+                        "ClusterIdentifier": {
+                            "type": "string"
+                        },
+                        "Force": {
+                            "type": "boolean"
+                        },
+                        "VpcIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Account",
+                        "ClusterIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::EndpointAuthorization"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::EventSubscription": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Enabled": {
+                            "type": "boolean"
+                        },
+                        "EventCategories": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Severity": {
+                            "type": "string"
+                        },
+                        "SnsTopicArn": {
+                            "type": "string"
+                        },
+                        "SourceIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SourceType": {
+                            "type": "string"
+                        },
+                        "SubscriptionName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "SubscriptionName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::EventSubscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ScheduledAction": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Enable": {
+                            "type": "boolean"
+                        },
+                        "EndTime": {
+                            "type": "string"
+                        },
+                        "IamRole": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "type": "string"
+                        },
+                        "ScheduledActionDescription": {
+                            "type": "string"
+                        },
+                        "ScheduledActionName": {
+                            "type": "string"
+                        },
+                        "StartTime": {
+                            "type": "string"
+                        },
+                        "TargetAction": {
+                            "$ref": "#/definitions/AWS::Redshift::ScheduledAction.ScheduledActionType"
+                        }
+                    },
+                    "required": [
+                        "ScheduledActionName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Redshift::ScheduledAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ScheduledAction.PauseClusterMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClusterIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ScheduledAction.ResizeClusterMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "Classic": {
+                    "type": "boolean"
+                },
+                "ClusterIdentifier": {
+                    "type": "string"
+                },
+                "ClusterType": {
+                    "type": "string"
+                },
+                "NodeType": {
+                    "type": "string"
+                },
+                "NumberOfNodes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ClusterIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ScheduledAction.ResumeClusterMessage": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterIdentifier": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClusterIdentifier"
+            ],
+            "type": "object"
+        },
+        "AWS::Redshift::ScheduledAction.ScheduledActionType": {
+            "additionalProperties": false,
+            "properties": {
+                "PauseCluster": {
+                    "$ref": "#/definitions/AWS::Redshift::ScheduledAction.PauseClusterMessage"
+                },
+                "ResizeCluster": {
+                    "$ref": "#/definitions/AWS::Redshift::ScheduledAction.ResizeClusterMessage"
+                },
+                "ResumeCluster": {
+                    "$ref": "#/definitions/AWS::Redshift::ScheduledAction.ResumeClusterMessage"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApiGatewayProxy": {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Application.ApiGatewayProxyInput"
+                        },
+                        "EnvironmentIdentifier": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ProxyType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RefactorSpaces::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Application.ApiGatewayProxyInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointType": {
+                    "type": "string"
+                },
+                "StageName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Environment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "NetworkFabricType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RefactorSpaces::Environment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Route": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationIdentifier": {
+                            "type": "string"
+                        },
+                        "EnvironmentIdentifier": {
+                            "type": "string"
+                        },
+                        "RouteType": {
+                            "type": "string"
+                        },
+                        "ServiceIdentifier": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UriPathRoute": {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Route.UriPathRouteInput"
+                        }
+                    },
+                    "required": [
+                        "ApplicationIdentifier",
+                        "EnvironmentIdentifier",
+                        "ServiceIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RefactorSpaces::Route"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Route.UriPathRouteInput": {
+            "additionalProperties": false,
+            "properties": {
+                "ActivationState": {
+                    "type": "string"
+                },
+                "IncludeChildPaths": {
+                    "type": "boolean"
+                },
+                "Methods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SourcePath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ActivationState"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Service": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplicationIdentifier": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "EndpointType": {
+                            "type": "string"
+                        },
+                        "EnvironmentIdentifier": {
+                            "type": "string"
+                        },
+                        "LambdaEndpoint": {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Service.LambdaEndpointInput"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UrlEndpoint": {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Service.UrlEndpointInput"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ApplicationIdentifier",
+                        "EnvironmentIdentifier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RefactorSpaces::Service"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Service.LambdaEndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::RefactorSpaces::Service.UrlEndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "HealthUrl": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Url"
+            ],
+            "type": "object"
+        },
+        "AWS::Rekognition::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ProjectName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProjectName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Rekognition::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ResilienceHub::App": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppTemplateBody": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResiliencyPolicyArn": {
+                            "type": "string"
+                        },
+                        "ResourceMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ResilienceHub::App.ResourceMapping"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "AppTemplateBody",
+                        "Name",
+                        "ResourceMappings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ResilienceHub::App"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ResilienceHub::App.PhysicalResourceId": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsAccountId": {
+                    "type": "string"
+                },
+                "AwsRegion": {
+                    "type": "string"
+                },
+                "Identifier": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Identifier",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ResilienceHub::App.ResourceMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "LogicalStackName": {
+                    "type": "string"
+                },
+                "MappingType": {
+                    "type": "string"
+                },
+                "PhysicalResourceId": {
+                    "$ref": "#/definitions/AWS::ResilienceHub::App.PhysicalResourceId"
+                },
+                "ResourceName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MappingType",
+                "PhysicalResourceId"
+            ],
+            "type": "object"
+        },
+        "AWS::ResilienceHub::ResiliencyPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataLocationConstraint": {
+                            "type": "string"
+                        },
+                        "Policy": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::ResilienceHub::ResiliencyPolicy.FailurePolicy"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "PolicyDescription": {
+                            "type": "string"
+                        },
+                        "PolicyName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tier": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Policy",
+                        "PolicyName",
+                        "Tier"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ResilienceHub::ResiliencyPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ResilienceHub::ResiliencyPolicy.FailurePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "RpoInSecs": {
+                    "type": "number"
+                },
+                "RtoInSecs": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "RpoInSecs",
+                "RtoInSecs"
+            ],
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Configuration": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ResourceGroups::Group.ConfigurationItem"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResourceQuery": {
+                            "$ref": "#/definitions/AWS::ResourceGroups::Group.ResourceQuery"
+                        },
+                        "Resources": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ResourceGroups::Group"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group.ConfigurationItem": {
+            "additionalProperties": false,
+            "properties": {
+                "Parameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ResourceGroups::Group.ConfigurationParameter"
+                    },
+                    "type": "array"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group.ConfigurationParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group.Query": {
+            "additionalProperties": false,
+            "properties": {
+                "ResourceTypeFilters": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StackIdentifier": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ResourceGroups::Group.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group.ResourceQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "Query": {
+                    "$ref": "#/definitions/AWS::ResourceGroups::Group.Query"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ResourceGroups::Group.TagFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::RoboMaker::Fleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::Fleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::Robot": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Architecture": {
+                            "type": "string"
+                        },
+                        "Fleet": {
+                            "type": "string"
+                        },
+                        "GreengrassGroupId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Architecture",
+                        "GreengrassGroupId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::Robot"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::RobotApplication": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CurrentRevisionId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RobotSoftwareSuite": {
+                            "$ref": "#/definitions/AWS::RoboMaker::RobotApplication.RobotSoftwareSuite"
+                        },
+                        "Sources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RoboMaker::RobotApplication.SourceConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "RobotSoftwareSuite",
+                        "Sources"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::RobotApplication"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::RobotApplication.RobotSoftwareSuite": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::RobotApplication.SourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Architecture": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Architecture",
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::RobotApplicationVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Application": {
+                            "type": "string"
+                        },
+                        "CurrentRevisionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Application"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::RobotApplicationVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplication": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CurrentRevisionId": {
+                            "type": "string"
+                        },
+                        "Environment": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RenderingEngine": {
+                            "$ref": "#/definitions/AWS::RoboMaker::SimulationApplication.RenderingEngine"
+                        },
+                        "RobotSoftwareSuite": {
+                            "$ref": "#/definitions/AWS::RoboMaker::SimulationApplication.RobotSoftwareSuite"
+                        },
+                        "SimulationSoftwareSuite": {
+                            "$ref": "#/definitions/AWS::RoboMaker::SimulationApplication.SimulationSoftwareSuite"
+                        },
+                        "Sources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::RoboMaker::SimulationApplication.SourceConfig"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "RobotSoftwareSuite",
+                        "SimulationSoftwareSuite"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::SimulationApplication"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplication.RenderingEngine": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplication.RobotSoftwareSuite": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplication.SimulationSoftwareSuite": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplication.SourceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Architecture": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Architecture",
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::RoboMaker::SimulationApplicationVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Application": {
+                            "type": "string"
+                        },
+                        "CurrentRevisionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Application"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::RoboMaker::SimulationApplicationVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::DNSSEC": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HostedZoneId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "HostedZoneId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::DNSSEC"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HealthCheck": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HealthCheckConfig": {
+                            "type": "object"
+                        },
+                        "HealthCheckTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53::HealthCheck.HealthCheckTag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "HealthCheckConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::HealthCheck"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HealthCheck.HealthCheckTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HostedZone": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HostedZoneConfig": {
+                            "$ref": "#/definitions/AWS::Route53::HostedZone.HostedZoneConfig"
+                        },
+                        "HostedZoneTags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53::HostedZone.HostedZoneTag"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "QueryLoggingConfig": {
+                            "$ref": "#/definitions/AWS::Route53::HostedZone.QueryLoggingConfig"
+                        },
+                        "VPCs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53::HostedZone.VPC"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::HostedZone"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HostedZone.HostedZoneConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53::HostedZone.HostedZoneTag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HostedZone.QueryLoggingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsLogGroupArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CloudWatchLogsLogGroupArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::HostedZone.VPC": {
+            "additionalProperties": false,
+            "properties": {
+                "VPCId": {
+                    "type": "string"
+                },
+                "VPCRegion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "VPCId",
+                "VPCRegion"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::KeySigningKey": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HostedZoneId": {
+                            "type": "string"
+                        },
+                        "KeyManagementServiceArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Status": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "HostedZoneId",
+                        "KeyManagementServiceArn",
+                        "Name",
+                        "Status"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::KeySigningKey"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::RecordSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AliasTarget": {
+                            "$ref": "#/definitions/AWS::Route53::RecordSet.AliasTarget"
+                        },
+                        "Comment": {
+                            "type": "string"
+                        },
+                        "Failover": {
+                            "type": "string"
+                        },
+                        "GeoLocation": {
+                            "$ref": "#/definitions/AWS::Route53::RecordSet.GeoLocation"
+                        },
+                        "HealthCheckId": {
+                            "type": "string"
+                        },
+                        "HostedZoneId": {
+                            "type": "string"
+                        },
+                        "HostedZoneName": {
+                            "type": "string"
+                        },
+                        "MultiValueAnswer": {
+                            "type": "boolean"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Region": {
+                            "type": "string"
+                        },
+                        "ResourceRecords": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SetIdentifier": {
+                            "type": "string"
+                        },
+                        "TTL": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Weight": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::RecordSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::RecordSet.AliasTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DNSName": {
+                    "type": "string"
+                },
+                "EvaluateTargetHealth": {
+                    "type": "boolean"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DNSName",
+                "HostedZoneId"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::RecordSet.GeoLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "ContinentCode": {
+                    "type": "string"
+                },
+                "CountryCode": {
+                    "type": "string"
+                },
+                "SubdivisionCode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53::RecordSetGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Comment": {
+                            "type": "string"
+                        },
+                        "HostedZoneId": {
+                            "type": "string"
+                        },
+                        "HostedZoneName": {
+                            "type": "string"
+                        },
+                        "RecordSets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53::RecordSetGroup.RecordSet"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53::RecordSetGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::RecordSetGroup.AliasTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DNSName": {
+                    "type": "string"
+                },
+                "EvaluateTargetHealth": {
+                    "type": "boolean"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DNSName",
+                "HostedZoneId"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53::RecordSetGroup.GeoLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "ContinentCode": {
+                    "type": "string"
+                },
+                "CountryCode": {
+                    "type": "string"
+                },
+                "SubdivisionCode": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53::RecordSetGroup.RecordSet": {
+            "additionalProperties": false,
+            "properties": {
+                "AliasTarget": {
+                    "$ref": "#/definitions/AWS::Route53::RecordSetGroup.AliasTarget"
+                },
+                "Comment": {
+                    "type": "string"
+                },
+                "Failover": {
+                    "type": "string"
+                },
+                "GeoLocation": {
+                    "$ref": "#/definitions/AWS::Route53::RecordSetGroup.GeoLocation"
+                },
+                "HealthCheckId": {
+                    "type": "string"
+                },
+                "HostedZoneId": {
+                    "type": "string"
+                },
+                "HostedZoneName": {
+                    "type": "string"
+                },
+                "MultiValueAnswer": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                },
+                "ResourceRecords": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SetIdentifier": {
+                    "type": "string"
+                },
+                "TTL": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "Weight": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Name",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::Cluster": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::Route53RecoveryControl::Cluster"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::Cluster.ClusterEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::ControlPanel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClusterArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryControl::ControlPanel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::RoutingControl": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClusterArn": {
+                            "type": "string"
+                        },
+                        "ControlPanelArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryControl::RoutingControl"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::SafetyRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssertionRule": {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::SafetyRule.AssertionRule"
+                        },
+                        "ControlPanelArn": {
+                            "type": "string"
+                        },
+                        "GatingRule": {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::SafetyRule.GatingRule"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RuleConfig": {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::SafetyRule.RuleConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ControlPanelArn",
+                        "Name",
+                        "RuleConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryControl::SafetyRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::SafetyRule.AssertionRule": {
+            "additionalProperties": false,
+            "properties": {
+                "AssertedControls": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "WaitPeriodMs": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AssertedControls",
+                "WaitPeriodMs"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::SafetyRule.GatingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "GatingControls": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "TargetControls": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "WaitPeriodMs": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "GatingControls",
+                "TargetControls",
+                "WaitPeriodMs"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryControl::SafetyRule.RuleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Inverted": {
+                    "type": "boolean"
+                },
+                "Threshold": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Inverted",
+                "Threshold",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::Cell": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CellName": {
+                            "type": "string"
+                        },
+                        "Cells": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "CellName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryReadiness::Cell"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ReadinessCheck": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ReadinessCheckName": {
+                            "type": "string"
+                        },
+                        "ResourceSetName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ReadinessCheckName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryReadiness::ReadinessCheck"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::RecoveryGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Cells": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RecoveryGroupName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RecoveryGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryReadiness::RecoveryGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceSetName": {
+                            "type": "string"
+                        },
+                        "ResourceSetType": {
+                            "type": "string"
+                        },
+                        "Resources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet.Resource"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ResourceSetName",
+                        "ResourceSetType",
+                        "Resources"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53RecoveryReadiness::ResourceSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet.DNSTargetResource": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                },
+                "HostedZoneArn": {
+                    "type": "string"
+                },
+                "RecordSetId": {
+                    "type": "string"
+                },
+                "RecordType": {
+                    "type": "string"
+                },
+                "TargetResource": {
+                    "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet.TargetResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet.NLBResource": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet.R53ResourceRecord": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                },
+                "RecordSetId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet.Resource": {
+            "additionalProperties": false,
+            "properties": {
+                "ComponentId": {
+                    "type": "string"
+                },
+                "DnsTargetResource": {
+                    "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet.DNSTargetResource"
+                },
+                "ReadinessScopes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ResourceArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53RecoveryReadiness::ResourceSet.TargetResource": {
+            "additionalProperties": false,
+            "properties": {
+                "NLBResource": {
+                    "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet.NLBResource"
+                },
+                "R53Resource": {
+                    "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet.R53ResourceRecord"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Route53Resolver::FirewallDomainList": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DomainFileUrl": {
+                            "type": "string"
+                        },
+                        "Domains": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::FirewallDomainList"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::FirewallRuleGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FirewallRules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53Resolver::FirewallRuleGroup.FirewallRule"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::FirewallRuleGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::FirewallRuleGroup.FirewallRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "type": "string"
+                },
+                "BlockOverrideDnsType": {
+                    "type": "string"
+                },
+                "BlockOverrideDomain": {
+                    "type": "string"
+                },
+                "BlockOverrideTtl": {
+                    "type": "number"
+                },
+                "BlockResponse": {
+                    "type": "string"
+                },
+                "FirewallDomainListId": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Action",
+                "FirewallDomainListId",
+                "Priority"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::FirewallRuleGroupAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FirewallRuleGroupId": {
+                            "type": "string"
+                        },
+                        "MutationProtection": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "FirewallRuleGroupId",
+                        "Priority",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::FirewallRuleGroupAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutodefinedReverseFlag": {
+                            "type": "string"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AutodefinedReverseFlag",
+                        "ResourceId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverDNSSECConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverDNSSECConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverEndpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Direction": {
+                            "type": "string"
+                        },
+                        "IpAddresses": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53Resolver::ResolverEndpoint.IpAddressRequest"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Direction",
+                        "IpAddresses",
+                        "SecurityGroupIds"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverEndpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverEndpoint.IpAddressRequest": {
+            "additionalProperties": false,
+            "properties": {
+                "Ip": {
+                    "type": "string"
+                },
+                "SubnetId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SubnetId"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverQueryLoggingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DestinationArn": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverQueryLoggingConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResolverQueryLogConfigId": {
+                            "type": "string"
+                        },
+                        "ResourceId": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ResolverEndpointId": {
+                            "type": "string"
+                        },
+                        "RuleType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetIps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Route53Resolver::ResolverRule.TargetAddress"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DomainName",
+                        "RuleType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverRule.TargetAddress": {
+            "additionalProperties": false,
+            "properties": {
+                "Ip": {
+                    "type": "string"
+                },
+                "Port": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Ip"
+            ],
+            "type": "object"
+        },
+        "AWS::Route53Resolver::ResolverRuleAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ResolverRuleId": {
+                            "type": "string"
+                        },
+                        "VPCId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResolverRuleId",
+                        "VPCId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Route53Resolver::ResolverRuleAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::AccessPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Bucket": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Policy": {
+                            "type": "object"
+                        },
+                        "PolicyStatus": {
+                            "type": "object"
+                        },
+                        "PublicAccessBlockConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::AccessPoint.PublicAccessBlockConfiguration"
+                        },
+                        "VpcConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::AccessPoint.VpcConfiguration"
+                        }
+                    },
+                    "required": [
+                        "Bucket"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::AccessPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::AccessPoint.PublicAccessBlockConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockPublicAcls": {
+                    "type": "boolean"
+                },
+                "BlockPublicPolicy": {
+                    "type": "boolean"
+                },
+                "IgnorePublicAcls": {
+                    "type": "boolean"
+                },
+                "RestrictPublicBuckets": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::AccessPoint.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccelerateConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.AccelerateConfiguration"
+                        },
+                        "AccessControl": {
+                            "type": "string"
+                        },
+                        "AnalyticsConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::S3::Bucket.AnalyticsConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "BucketEncryption": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.BucketEncryption"
+                        },
+                        "BucketName": {
+                            "type": "string"
+                        },
+                        "CorsConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.CorsConfiguration"
+                        },
+                        "IntelligentTieringConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::S3::Bucket.IntelligentTieringConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "InventoryConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::S3::Bucket.InventoryConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "LifecycleConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.LifecycleConfiguration"
+                        },
+                        "LoggingConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.LoggingConfiguration"
+                        },
+                        "MetricsConfigurations": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::S3::Bucket.MetricsConfiguration"
+                            },
+                            "type": "array"
+                        },
+                        "NotificationConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.NotificationConfiguration"
+                        },
+                        "ObjectLockConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.ObjectLockConfiguration"
+                        },
+                        "ObjectLockEnabled": {
+                            "type": "boolean"
+                        },
+                        "OwnershipControls": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.OwnershipControls"
+                        },
+                        "PublicAccessBlockConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.PublicAccessBlockConfiguration"
+                        },
+                        "ReplicationConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.ReplicationConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VersioningConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.VersioningConfiguration"
+                        },
+                        "WebsiteConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::Bucket.WebsiteConfiguration"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::Bucket"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.AbortIncompleteMultipartUpload": {
+            "additionalProperties": false,
+            "properties": {
+                "DaysAfterInitiation": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DaysAfterInitiation"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.AccelerateConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccelerationStatus": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AccelerationStatus"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.AccessControlTranslation": {
+            "additionalProperties": false,
+            "properties": {
+                "Owner": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Owner"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.AnalyticsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "StorageClassAnalysis": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.StorageClassAnalysis"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Id",
+                "StorageClassAnalysis"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.BucketEncryption": {
+            "additionalProperties": false,
+            "properties": {
+                "ServerSideEncryptionConfiguration": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.ServerSideEncryptionRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ServerSideEncryptionConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.CorsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "CorsRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.CorsRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "CorsRules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.CorsRule": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedMethods": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "AllowedOrigins": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ExposedHeaders": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "MaxAge": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AllowedMethods",
+                "AllowedOrigins"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.DataExport": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.Destination"
+                },
+                "OutputSchemaVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination",
+                "OutputSchemaVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.DefaultRetention": {
+            "additionalProperties": false,
+            "properties": {
+                "Days": {
+                    "type": "number"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "Years": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.DeleteMarkerReplication": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketAccountId": {
+                    "type": "string"
+                },
+                "BucketArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketArn",
+                "Format"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.EncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplicaKmsKeyID": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ReplicaKmsKeyID"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.EventBridgeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBridgeEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.FilterRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.IntelligentTieringConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Id": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                    },
+                    "type": "array"
+                },
+                "Tierings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.Tiering"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Id",
+                "Status",
+                "Tierings"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.InventoryConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.Destination"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "IncludedObjectVersions": {
+                    "type": "string"
+                },
+                "OptionalFields": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "ScheduleFrequency": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination",
+                "Enabled",
+                "Id",
+                "IncludedObjectVersions",
+                "ScheduleFrequency"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.LambdaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Event": {
+                    "type": "string"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.NotificationFilter"
+                },
+                "Function": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Event",
+                "Function"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.LifecycleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationBucketName": {
+                    "type": "string"
+                },
+                "LogFilePrefix": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.Metrics": {
+            "additionalProperties": false,
+            "properties": {
+                "EventThreshold": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationTimeValue"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.MetricsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessPointArn": {
+                    "type": "string"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Id"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.NoncurrentVersionExpiration": {
+            "additionalProperties": false,
+            "properties": {
+                "NewerNoncurrentVersions": {
+                    "type": "number"
+                },
+                "NoncurrentDays": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "NoncurrentDays"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.NoncurrentVersionTransition": {
+            "additionalProperties": false,
+            "properties": {
+                "NewerNoncurrentVersions": {
+                    "type": "number"
+                },
+                "StorageClass": {
+                    "type": "string"
+                },
+                "TransitionInDays": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "StorageClass",
+                "TransitionInDays"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBridgeConfiguration": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.EventBridgeConfiguration"
+                },
+                "LambdaConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.LambdaConfiguration"
+                    },
+                    "type": "array"
+                },
+                "QueueConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.QueueConfiguration"
+                    },
+                    "type": "array"
+                },
+                "TopicConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TopicConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.NotificationFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Key": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.S3KeyFilter"
+                }
+            },
+            "required": [
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ObjectLockConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ObjectLockEnabled": {
+                    "type": "string"
+                },
+                "Rule": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ObjectLockRule"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ObjectLockRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultRetention": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.DefaultRetention"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.OwnershipControls": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.OwnershipControlsRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.OwnershipControlsRule": {
+            "additionalProperties": false,
+            "properties": {
+                "ObjectOwnership": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.PublicAccessBlockConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockPublicAcls": {
+                    "type": "boolean"
+                },
+                "BlockPublicPolicy": {
+                    "type": "boolean"
+                },
+                "IgnorePublicAcls": {
+                    "type": "boolean"
+                },
+                "RestrictPublicBuckets": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.QueueConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Event": {
+                    "type": "string"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.NotificationFilter"
+                },
+                "Queue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Event",
+                "Queue"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.RedirectAllRequestsTo": {
+            "additionalProperties": false,
+            "properties": {
+                "HostName": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HostName"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.RedirectRule": {
+            "additionalProperties": false,
+            "properties": {
+                "HostName": {
+                    "type": "string"
+                },
+                "HttpRedirectCode": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                },
+                "ReplaceKeyPrefixWith": {
+                    "type": "string"
+                },
+                "ReplaceKeyWith": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicaModifications": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Role": {
+                    "type": "string"
+                },
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.ReplicationRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Role",
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessControlTranslation": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.AccessControlTranslation"
+                },
+                "Account": {
+                    "type": "string"
+                },
+                "Bucket": {
+                    "type": "string"
+                },
+                "EncryptionConfiguration": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.EncryptionConfiguration"
+                },
+                "Metrics": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.Metrics"
+                },
+                "ReplicationTime": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationTime"
+                },
+                "StorageClass": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeleteMarkerReplication": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.DeleteMarkerReplication"
+                },
+                "Destination": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationDestination"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationRuleFilter"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "SourceSelectionCriteria": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.SourceSelectionCriteria"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination",
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationRuleAndOperator": {
+            "additionalProperties": false,
+            "properties": {
+                "Prefix": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationRuleFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "And": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationRuleAndOperator"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "TagFilter": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationTime": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                },
+                "Time": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicationTimeValue"
+                }
+            },
+            "required": [
+                "Status",
+                "Time"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ReplicationTimeValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Minutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Minutes"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.RoutingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "RedirectRule": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.RedirectRule"
+                },
+                "RoutingRuleCondition": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.RoutingRuleCondition"
+                }
+            },
+            "required": [
+                "RedirectRule"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.RoutingRuleCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "HttpErrorCodeReturnedEquals": {
+                    "type": "string"
+                },
+                "KeyPrefixEquals": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "AbortIncompleteMultipartUpload": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.AbortIncompleteMultipartUpload"
+                },
+                "ExpirationDate": {
+                    "type": "string"
+                },
+                "ExpirationInDays": {
+                    "type": "number"
+                },
+                "ExpiredObjectDeleteMarker": {
+                    "type": "boolean"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "NoncurrentVersionExpiration": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.NoncurrentVersionExpiration"
+                },
+                "NoncurrentVersionExpirationInDays": {
+                    "type": "number"
+                },
+                "NoncurrentVersionTransition": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.NoncurrentVersionTransition"
+                },
+                "NoncurrentVersionTransitions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.NoncurrentVersionTransition"
+                    },
+                    "type": "array"
+                },
+                "ObjectSizeGreaterThan": {
+                    "type": "number"
+                },
+                "ObjectSizeLessThan": {
+                    "type": "number"
+                },
+                "Prefix": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                },
+                "TagFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.TagFilter"
+                    },
+                    "type": "array"
+                },
+                "Transition": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.Transition"
+                },
+                "Transitions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.Transition"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.S3KeyFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.FilterRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ServerSideEncryptionByDefault": {
+            "additionalProperties": false,
+            "properties": {
+                "KMSMasterKeyID": {
+                    "type": "string"
+                },
+                "SSEAlgorithm": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SSEAlgorithm"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.ServerSideEncryptionRule": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketKeyEnabled": {
+                    "type": "boolean"
+                },
+                "ServerSideEncryptionByDefault": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ServerSideEncryptionByDefault"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.SourceSelectionCriteria": {
+            "additionalProperties": false,
+            "properties": {
+                "ReplicaModifications": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.ReplicaModifications"
+                },
+                "SseKmsEncryptedObjects": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.SseKmsEncryptedObjects"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.SseKmsEncryptedObjects": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.StorageClassAnalysis": {
+            "additionalProperties": false,
+            "properties": {
+                "DataExport": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.DataExport"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::Bucket.TagFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.Tiering": {
+            "additionalProperties": false,
+            "properties": {
+                "AccessTier": {
+                    "type": "string"
+                },
+                "Days": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AccessTier",
+                "Days"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.TopicConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Event": {
+                    "type": "string"
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.NotificationFilter"
+                },
+                "Topic": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Event",
+                "Topic"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.Transition": {
+            "additionalProperties": false,
+            "properties": {
+                "StorageClass": {
+                    "type": "string"
+                },
+                "TransitionDate": {
+                    "type": "string"
+                },
+                "TransitionInDays": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "StorageClass"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.VersioningConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Status"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::Bucket.WebsiteConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorDocument": {
+                    "type": "string"
+                },
+                "IndexDocument": {
+                    "type": "string"
+                },
+                "RedirectAllRequestsTo": {
+                    "$ref": "#/definitions/AWS::S3::Bucket.RedirectAllRequestsTo"
+                },
+                "RoutingRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3::Bucket.RoutingRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::BucketPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Bucket": {
+                            "type": "string"
+                        },
+                        "PolicyDocument": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Bucket",
+                        "PolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::BucketPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::MultiRegionAccessPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "PublicAccessBlockConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::MultiRegionAccessPoint.PublicAccessBlockConfiguration"
+                        },
+                        "Regions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::S3::MultiRegionAccessPoint.Region"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Regions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::MultiRegionAccessPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::MultiRegionAccessPoint.PublicAccessBlockConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "BlockPublicAcls": {
+                    "type": "boolean"
+                },
+                "BlockPublicPolicy": {
+                    "type": "boolean"
+                },
+                "IgnorePublicAcls": {
+                    "type": "boolean"
+                },
+                "RestrictPublicBuckets": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::MultiRegionAccessPoint.Region": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::MultiRegionAccessPointPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MrapName": {
+                            "type": "string"
+                        },
+                        "Policy": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "MrapName",
+                        "Policy"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::MultiRegionAccessPointPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "StorageLensConfiguration": {
+                            "$ref": "#/definitions/AWS::S3::StorageLens.StorageLensConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "StorageLensConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3::StorageLens"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.AccountLevel": {
+            "additionalProperties": false,
+            "properties": {
+                "ActivityMetrics": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.ActivityMetrics"
+                },
+                "BucketLevel": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.BucketLevel"
+                }
+            },
+            "required": [
+                "BucketLevel"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.ActivityMetrics": {
+            "additionalProperties": false,
+            "properties": {
+                "IsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.AwsOrg": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.BucketLevel": {
+            "additionalProperties": false,
+            "properties": {
+                "ActivityMetrics": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.ActivityMetrics"
+                },
+                "PrefixLevel": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.PrefixLevel"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.BucketsAndRegions": {
+            "additionalProperties": false,
+            "properties": {
+                "Buckets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Regions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.CloudWatchMetrics": {
+            "additionalProperties": false,
+            "properties": {
+                "IsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "IsEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.DataExport": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchMetrics": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.CloudWatchMetrics"
+                },
+                "S3BucketDestination": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.S3BucketDestination"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.Encryption": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.PrefixLevel": {
+            "additionalProperties": false,
+            "properties": {
+                "StorageMetrics": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.PrefixLevelStorageMetrics"
+                }
+            },
+            "required": [
+                "StorageMetrics"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.PrefixLevelStorageMetrics": {
+            "additionalProperties": false,
+            "properties": {
+                "IsEnabled": {
+                    "type": "boolean"
+                },
+                "SelectionCriteria": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.SelectionCriteria"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.S3BucketDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountId": {
+                    "type": "string"
+                },
+                "Arn": {
+                    "type": "string"
+                },
+                "Encryption": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.Encryption"
+                },
+                "Format": {
+                    "type": "string"
+                },
+                "OutputSchemaVersion": {
+                    "type": "string"
+                },
+                "Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AccountId",
+                "Arn",
+                "Format",
+                "OutputSchemaVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.SelectionCriteria": {
+            "additionalProperties": false,
+            "properties": {
+                "Delimiter": {
+                    "type": "string"
+                },
+                "MaxDepth": {
+                    "type": "number"
+                },
+                "MinStorageBytesPercentage": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3::StorageLens.StorageLensConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AccountLevel": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.AccountLevel"
+                },
+                "AwsOrg": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.AwsOrg"
+                },
+                "DataExport": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.DataExport"
+                },
+                "Exclude": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.BucketsAndRegions"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Include": {
+                    "$ref": "#/definitions/AWS::S3::StorageLens.BucketsAndRegions"
+                },
+                "IsEnabled": {
+                    "type": "boolean"
+                },
+                "StorageLensArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AccountLevel",
+                "Id",
+                "IsEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::S3ObjectLambda::AccessPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ObjectLambdaConfiguration": {
+                            "$ref": "#/definitions/AWS::S3ObjectLambda::AccessPoint.ObjectLambdaConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ObjectLambdaConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3ObjectLambda::AccessPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3ObjectLambda::AccessPoint.ObjectLambdaConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedFeatures": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "CloudWatchMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "SupportingAccessPoint": {
+                    "type": "string"
+                },
+                "TransformationConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3ObjectLambda::AccessPoint.TransformationConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SupportingAccessPoint",
+                "TransformationConfigurations"
+            ],
+            "type": "object"
+        },
+        "AWS::S3ObjectLambda::AccessPoint.TransformationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContentTransformation": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "Actions",
+                "ContentTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::S3ObjectLambda::AccessPointPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ObjectLambdaAccessPoint": {
+                            "type": "string"
+                        },
+                        "PolicyDocument": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "ObjectLambdaAccessPoint",
+                        "PolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3ObjectLambda::AccessPointPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::AccessPoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Bucket": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Policy": {
+                            "type": "object"
+                        },
+                        "VpcConfiguration": {
+                            "$ref": "#/definitions/AWS::S3Outposts::AccessPoint.VpcConfiguration"
+                        }
+                    },
+                    "required": [
+                        "Bucket",
+                        "Name",
+                        "VpcConfiguration"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3Outposts::AccessPoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::AccessPoint.VpcConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3Outposts::Bucket": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BucketName": {
+                            "type": "string"
+                        },
+                        "LifecycleConfiguration": {
+                            "$ref": "#/definitions/AWS::S3Outposts::Bucket.LifecycleConfiguration"
+                        },
+                        "OutpostId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "BucketName",
+                        "OutpostId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3Outposts::Bucket"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::Bucket.AbortIncompleteMultipartUpload": {
+            "additionalProperties": false,
+            "properties": {
+                "DaysAfterInitiation": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "DaysAfterInitiation"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::Bucket.LifecycleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::S3Outposts::Bucket.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::Bucket.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "AbortIncompleteMultipartUpload": {
+                    "$ref": "#/definitions/AWS::S3Outposts::Bucket.AbortIncompleteMultipartUpload"
+                },
+                "ExpirationDate": {
+                    "type": "string"
+                },
+                "ExpirationInDays": {
+                    "type": "number"
+                },
+                "Filter": {
+                    "type": "object"
+                },
+                "Id": {
+                    "type": "string"
+                },
+                "Status": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::S3Outposts::BucketPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Bucket": {
+                            "type": "string"
+                        },
+                        "PolicyDocument": {
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Bucket",
+                        "PolicyDocument"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3Outposts::BucketPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::Endpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessType": {
+                            "type": "string"
+                        },
+                        "CustomerOwnedIpv4Pool": {
+                            "type": "string"
+                        },
+                        "OutpostId": {
+                            "type": "string"
+                        },
+                        "SecurityGroupId": {
+                            "type": "string"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "OutpostId",
+                        "SecurityGroupId",
+                        "SubnetId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::S3Outposts::Endpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::S3Outposts::Endpoint.NetworkInterface": {
+            "additionalProperties": false,
+            "properties": {
+                "NetworkInterfaceId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NetworkInterfaceId"
+            ],
+            "type": "object"
+        },
+        "AWS::SDB::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SDB::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ConfigurationSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSetEventDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConfigurationSetName": {
+                            "type": "string"
+                        },
+                        "EventDestination": {
+                            "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.EventDestination"
+                        }
+                    },
+                    "required": [
+                        "ConfigurationSetName",
+                        "EventDestination"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ConfigurationSetEventDestination"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSetEventDestination.CloudWatchDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionConfigurations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.DimensionConfiguration"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSetEventDestination.DimensionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultDimensionValue": {
+                    "type": "string"
+                },
+                "DimensionName": {
+                    "type": "string"
+                },
+                "DimensionValueSource": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DefaultDimensionValue",
+                "DimensionName",
+                "DimensionValueSource"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSetEventDestination.EventDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchDestination": {
+                    "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.CloudWatchDestination"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "KinesisFirehoseDestination": {
+                    "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination.KinesisFirehoseDestination"
+                },
+                "MatchingEventTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchingEventTypes"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ConfigurationSetEventDestination.KinesisFirehoseDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "DeliveryStreamARN": {
+                    "type": "string"
+                },
+                "IAMRoleARN": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeliveryStreamARN",
+                "IAMRoleARN"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ContactList": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContactListName": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Topics": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SES::ContactList.Topic"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ContactList"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ContactList.Topic": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultSubscriptionStatus": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "DisplayName": {
+                    "type": "string"
+                },
+                "TopicName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DefaultSubscriptionStatus",
+                "DisplayName",
+                "TopicName"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Filter": {
+                            "$ref": "#/definitions/AWS::SES::ReceiptFilter.Filter"
+                        }
+                    },
+                    "required": [
+                        "Filter"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ReceiptFilter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptFilter.Filter": {
+            "additionalProperties": false,
+            "properties": {
+                "IpFilter": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptFilter.IpFilter"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IpFilter"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptFilter.IpFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Cidr": {
+                    "type": "string"
+                },
+                "Policy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Cidr",
+                "Policy"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "After": {
+                            "type": "string"
+                        },
+                        "Rule": {
+                            "$ref": "#/definitions/AWS::SES::ReceiptRule.Rule"
+                        },
+                        "RuleSetName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Rule",
+                        "RuleSetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ReceiptRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "AddHeaderAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.AddHeaderAction"
+                },
+                "BounceAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.BounceAction"
+                },
+                "LambdaAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.LambdaAction"
+                },
+                "S3Action": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.S3Action"
+                },
+                "SNSAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.SNSAction"
+                },
+                "StopAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.StopAction"
+                },
+                "WorkmailAction": {
+                    "$ref": "#/definitions/AWS::SES::ReceiptRule.WorkmailAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.AddHeaderAction": {
+            "additionalProperties": false,
+            "properties": {
+                "HeaderName": {
+                    "type": "string"
+                },
+                "HeaderValue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "HeaderName",
+                "HeaderValue"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.BounceAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Message": {
+                    "type": "string"
+                },
+                "Sender": {
+                    "type": "string"
+                },
+                "SmtpReplyCode": {
+                    "type": "string"
+                },
+                "StatusCode": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Message",
+                "Sender",
+                "SmtpReplyCode"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.LambdaAction": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionArn": {
+                    "type": "string"
+                },
+                "InvocationType": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FunctionArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Actions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SES::ReceiptRule.Action"
+                    },
+                    "type": "array"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Recipients": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ScanEnabled": {
+                    "type": "boolean"
+                },
+                "TlsPolicy": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.S3Action": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "KmsKeyArn": {
+                    "type": "string"
+                },
+                "ObjectKeyPrefix": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.SNSAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Encoding": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.StopAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Scope": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Scope"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRule.WorkmailAction": {
+            "additionalProperties": false,
+            "properties": {
+                "OrganizationArn": {
+                    "type": "string"
+                },
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "OrganizationArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::ReceiptRuleSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::ReceiptRuleSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::Template": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Template": {
+                            "$ref": "#/definitions/AWS::SES::Template.Template"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SES::Template"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SES::Template.Template": {
+            "additionalProperties": false,
+            "properties": {
+                "HtmlPart": {
+                    "type": "string"
+                },
+                "SubjectPart": {
+                    "type": "string"
+                },
+                "TemplateName": {
+                    "type": "string"
+                },
+                "TextPart": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SNS::Subscription": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeliveryPolicy": {
+                            "type": "object"
+                        },
+                        "Endpoint": {
+                            "type": "string"
+                        },
+                        "FilterPolicy": {
+                            "type": "object"
+                        },
+                        "Protocol": {
+                            "type": "string"
+                        },
+                        "RawMessageDelivery": {
+                            "type": "boolean"
+                        },
+                        "RedrivePolicy": {
+                            "type": "object"
+                        },
+                        "Region": {
+                            "type": "string"
+                        },
+                        "SubscriptionRoleArn": {
+                            "type": "string"
+                        },
+                        "TopicArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Protocol",
+                        "TopicArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SNS::Subscription"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SNS::Topic": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContentBasedDeduplication": {
+                            "type": "boolean"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "FifoTopic": {
+                            "type": "boolean"
+                        },
+                        "KmsMasterKeyId": {
+                            "type": "string"
+                        },
+                        "Subscription": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SNS::Topic.Subscription"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TopicName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SNS::Topic"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SNS::Topic.Subscription": {
+            "additionalProperties": false,
+            "properties": {
+                "Endpoint": {
+                    "type": "string"
+                },
+                "Protocol": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Endpoint",
+                "Protocol"
+            ],
+            "type": "object"
+        },
+        "AWS::SNS::TopicPolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "Topics": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument",
+                        "Topics"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SNS::TopicPolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SQS::Queue": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ContentBasedDeduplication": {
+                            "type": "boolean"
+                        },
+                        "DeduplicationScope": {
+                            "type": "string"
+                        },
+                        "DelaySeconds": {
+                            "type": "number"
+                        },
+                        "FifoQueue": {
+                            "type": "boolean"
+                        },
+                        "FifoThroughputLimit": {
+                            "type": "string"
+                        },
+                        "KmsDataKeyReusePeriodSeconds": {
+                            "type": "number"
+                        },
+                        "KmsMasterKeyId": {
+                            "type": "string"
+                        },
+                        "MaximumMessageSize": {
+                            "type": "number"
+                        },
+                        "MessageRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "QueueName": {
+                            "type": "string"
+                        },
+                        "ReceiveMessageWaitTimeSeconds": {
+                            "type": "number"
+                        },
+                        "RedriveAllowPolicy": {
+                            "type": "object"
+                        },
+                        "RedrivePolicy": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VisibilityTimeout": {
+                            "type": "number"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SQS::Queue"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SQS::QueuePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PolicyDocument": {
+                            "type": "object"
+                        },
+                        "Queues": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PolicyDocument",
+                        "Queues"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SQS::QueuePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::Association": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApplyOnlyAtCronInterval": {
+                            "type": "boolean"
+                        },
+                        "AssociationName": {
+                            "type": "string"
+                        },
+                        "AutomationTargetParameterName": {
+                            "type": "string"
+                        },
+                        "CalendarNames": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ComplianceSeverity": {
+                            "type": "string"
+                        },
+                        "DocumentVersion": {
+                            "type": "string"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "MaxConcurrency": {
+                            "type": "string"
+                        },
+                        "MaxErrors": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OutputLocation": {
+                            "$ref": "#/definitions/AWS::SSM::Association.InstanceAssociationOutputLocation"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "object"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "ScheduleExpression": {
+                            "type": "string"
+                        },
+                        "SyncCompliance": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::Association.Target"
+                            },
+                            "type": "array"
+                        },
+                        "WaitForSuccessTimeoutSeconds": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::Association"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::Association.InstanceAssociationOutputLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Location": {
+                    "$ref": "#/definitions/AWS::SSM::Association.S3OutputLocation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::Association.S3OutputLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "OutputS3BucketName": {
+                    "type": "string"
+                },
+                "OutputS3KeyPrefix": {
+                    "type": "string"
+                },
+                "OutputS3Region": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::Association.Target": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::Document": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Attachments": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::Document.AttachmentsSource"
+                            },
+                            "type": "array"
+                        },
+                        "Content": {
+                            "type": "object"
+                        },
+                        "DocumentFormat": {
+                            "type": "string"
+                        },
+                        "DocumentType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Requires": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::Document.DocumentRequires"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        },
+                        "VersionName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Content"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::Document"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::Document.AttachmentsSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::Document.DocumentRequires": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowUnassociatedTargets": {
+                            "type": "boolean"
+                        },
+                        "Cutoff": {
+                            "type": "number"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Duration": {
+                            "type": "number"
+                        },
+                        "EndDate": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "type": "string"
+                        },
+                        "ScheduleOffset": {
+                            "type": "number"
+                        },
+                        "ScheduleTimezone": {
+                            "type": "string"
+                        },
+                        "StartDate": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AllowUnassociatedTargets",
+                        "Cutoff",
+                        "Duration",
+                        "Name",
+                        "Schedule"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::MaintenanceWindow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTarget": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "OwnerInformation": {
+                            "type": "string"
+                        },
+                        "ResourceType": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTarget.Targets"
+                            },
+                            "type": "array"
+                        },
+                        "WindowId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourceType",
+                        "Targets",
+                        "WindowId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::MaintenanceWindowTarget"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTarget.Targets": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CutoffBehavior": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LoggingInfo": {
+                            "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.LoggingInfo"
+                        },
+                        "MaxConcurrency": {
+                            "type": "string"
+                        },
+                        "MaxErrors": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Priority": {
+                            "type": "number"
+                        },
+                        "ServiceRoleArn": {
+                            "type": "string"
+                        },
+                        "Targets": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.Target"
+                            },
+                            "type": "array"
+                        },
+                        "TaskArn": {
+                            "type": "string"
+                        },
+                        "TaskInvocationParameters": {
+                            "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.TaskInvocationParameters"
+                        },
+                        "TaskParameters": {
+                            "type": "object"
+                        },
+                        "TaskType": {
+                            "type": "string"
+                        },
+                        "WindowId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Priority",
+                        "TaskArn",
+                        "TaskType",
+                        "WindowId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::MaintenanceWindowTask"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.LoggingInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "Region": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Prefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region",
+                "S3Bucket"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowAutomationParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentVersion": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowLambdaParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientContext": {
+                    "type": "string"
+                },
+                "Payload": {
+                    "type": "string"
+                },
+                "Qualifier": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowRunCommandParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Comment": {
+                    "type": "string"
+                },
+                "DocumentHash": {
+                    "type": "string"
+                },
+                "DocumentHashType": {
+                    "type": "string"
+                },
+                "NotificationConfig": {
+                    "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.NotificationConfig"
+                },
+                "OutputS3BucketName": {
+                    "type": "string"
+                },
+                "OutputS3KeyPrefix": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "type": "object"
+                },
+                "ServiceRoleArn": {
+                    "type": "string"
+                },
+                "TimeoutSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.MaintenanceWindowStepFunctionsParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.NotificationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "NotificationArn": {
+                    "type": "string"
+                },
+                "NotificationEvents": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "NotificationType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NotificationArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.Target": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::MaintenanceWindowTask.TaskInvocationParameters": {
+            "additionalProperties": false,
+            "properties": {
+                "MaintenanceWindowAutomationParameters": {
+                    "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.MaintenanceWindowAutomationParameters"
+                },
+                "MaintenanceWindowLambdaParameters": {
+                    "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.MaintenanceWindowLambdaParameters"
+                },
+                "MaintenanceWindowRunCommandParameters": {
+                    "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.MaintenanceWindowRunCommandParameters"
+                },
+                "MaintenanceWindowStepFunctionsParameters": {
+                    "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask.MaintenanceWindowStepFunctionsParameters"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::Parameter": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AllowedPattern": {
+                            "type": "string"
+                        },
+                        "DataType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "type": "object"
+                        },
+                        "Tier": {
+                            "type": "string"
+                        },
+                        "Type": {
+                            "type": "string"
+                        },
+                        "Value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Type",
+                        "Value"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::Parameter"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ApprovalRules": {
+                            "$ref": "#/definitions/AWS::SSM::PatchBaseline.RuleGroup"
+                        },
+                        "ApprovedPatches": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ApprovedPatchesComplianceLevel": {
+                            "type": "string"
+                        },
+                        "ApprovedPatchesEnableNonSecurity": {
+                            "type": "boolean"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "GlobalFilters": {
+                            "$ref": "#/definitions/AWS::SSM::PatchBaseline.PatchFilterGroup"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OperatingSystem": {
+                            "type": "string"
+                        },
+                        "PatchGroups": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RejectedPatches": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "RejectedPatchesAction": {
+                            "type": "string"
+                        },
+                        "Sources": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSM::PatchBaseline.PatchSource"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::PatchBaseline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.PatchFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.PatchFilterGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "PatchFilters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SSM::PatchBaseline.PatchFilter"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.PatchSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Configuration": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Products": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.PatchStringDate": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "ApproveAfterDays": {
+                    "type": "number"
+                },
+                "ApproveUntilDate": {
+                    "$ref": "#/definitions/AWS::SSM::PatchBaseline.PatchStringDate"
+                },
+                "ComplianceLevel": {
+                    "type": "string"
+                },
+                "EnableNonSecurity": {
+                    "type": "boolean"
+                },
+                "PatchFilterGroup": {
+                    "$ref": "#/definitions/AWS::SSM::PatchBaseline.PatchFilterGroup"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::PatchBaseline.RuleGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "PatchRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SSM::PatchBaseline.Rule"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSM::ResourceDataSync": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BucketName": {
+                            "type": "string"
+                        },
+                        "BucketPrefix": {
+                            "type": "string"
+                        },
+                        "BucketRegion": {
+                            "type": "string"
+                        },
+                        "KMSKeyArn": {
+                            "type": "string"
+                        },
+                        "S3Destination": {
+                            "$ref": "#/definitions/AWS::SSM::ResourceDataSync.S3Destination"
+                        },
+                        "SyncFormat": {
+                            "type": "string"
+                        },
+                        "SyncName": {
+                            "type": "string"
+                        },
+                        "SyncSource": {
+                            "$ref": "#/definitions/AWS::SSM::ResourceDataSync.SyncSource"
+                        },
+                        "SyncType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SyncName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSM::ResourceDataSync"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::ResourceDataSync.AwsOrganizationsSource": {
+            "additionalProperties": false,
+            "properties": {
+                "OrganizationSourceType": {
+                    "type": "string"
+                },
+                "OrganizationalUnits": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "OrganizationSourceType"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::ResourceDataSync.S3Destination": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "BucketPrefix": {
+                    "type": "string"
+                },
+                "BucketRegion": {
+                    "type": "string"
+                },
+                "KMSKeyArn": {
+                    "type": "string"
+                },
+                "SyncFormat": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName",
+                "BucketRegion",
+                "SyncFormat"
+            ],
+            "type": "object"
+        },
+        "AWS::SSM::ResourceDataSync.SyncSource": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsOrganizationsSource": {
+                    "$ref": "#/definitions/AWS::SSM::ResourceDataSync.AwsOrganizationsSource"
+                },
+                "IncludeFutureRegions": {
+                    "type": "boolean"
+                },
+                "SourceRegions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SourceType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SourceRegions",
+                "SourceType"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMContacts::Contact": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Alias": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "Plan": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSMContacts::Contact.Stage"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Alias",
+                        "DisplayName",
+                        "Plan",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMContacts::Contact"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMContacts::Contact.ChannelTargetInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelId": {
+                    "type": "string"
+                },
+                "RetryIntervalInMinutes": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "ChannelId",
+                "RetryIntervalInMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMContacts::Contact.ContactTargetInfo": {
+            "additionalProperties": false,
+            "properties": {
+                "ContactId": {
+                    "type": "string"
+                },
+                "IsEssential": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "ContactId",
+                "IsEssential"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMContacts::Contact.Stage": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInMinutes": {
+                    "type": "number"
+                },
+                "Targets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SSMContacts::Contact.Targets"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "DurationInMinutes"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMContacts::Contact.Targets": {
+            "additionalProperties": false,
+            "properties": {
+                "ChannelTargetInfo": {
+                    "$ref": "#/definitions/AWS::SSMContacts::Contact.ChannelTargetInfo"
+                },
+                "ContactTargetInfo": {
+                    "$ref": "#/definitions/AWS::SSMContacts::Contact.ContactTargetInfo"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSMContacts::ContactChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ChannelAddress": {
+                            "type": "string"
+                        },
+                        "ChannelName": {
+                            "type": "string"
+                        },
+                        "ChannelType": {
+                            "type": "string"
+                        },
+                        "ContactId": {
+                            "type": "string"
+                        },
+                        "DeferActivation": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "ChannelAddress",
+                        "ChannelName",
+                        "ChannelType",
+                        "ContactId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMContacts::ContactChannel"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ReplicationSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeletionProtected": {
+                            "type": "boolean"
+                        },
+                        "Regions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSMIncidents::ReplicationSet.ReplicationRegion"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Regions"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMIncidents::ReplicationSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ReplicationSet.RegionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SseKmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SseKmsKeyId"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ReplicationSet.ReplicationRegion": {
+            "additionalProperties": false,
+            "properties": {
+                "RegionConfiguration": {
+                    "$ref": "#/definitions/AWS::SSMIncidents::ReplicationSet.RegionConfiguration"
+                },
+                "RegionName": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                                "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.Action"
+                            },
+                            "type": "array"
+                        },
+                        "ChatChannel": {
+                            "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.ChatChannel"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "Engagements": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "IncidentTemplate": {
+                            "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.IncidentTemplate"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "IncidentTemplate",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSMIncidents::ResponsePlan"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "SsmAutomation": {
+                    "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.SsmAutomation"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.ChatChannel": {
+            "additionalProperties": false,
+            "properties": {
+                "ChatbotSns": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.IncidentTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "DedupeString": {
+                    "type": "string"
+                },
+                "Impact": {
+                    "type": "number"
+                },
+                "NotificationTargets": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.NotificationTargetItem"
+                    },
+                    "type": "array"
+                },
+                "Summary": {
+                    "type": "string"
+                },
+                "Title": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Impact",
+                "Title"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.NotificationTargetItem": {
+            "additionalProperties": false,
+            "properties": {
+                "SnsTopicArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.SsmAutomation": {
+            "additionalProperties": false,
+            "properties": {
+                "DocumentName": {
+                    "type": "string"
+                },
+                "DocumentVersion": {
+                    "type": "string"
+                },
+                "Parameters": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan.SsmParameter"
+                    },
+                    "type": "array"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "TargetAccount": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DocumentName",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SSMIncidents::ResponsePlan.SsmParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Values": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Key",
+                "Values"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::Assignment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "PermissionSetArn": {
+                            "type": "string"
+                        },
+                        "PrincipalId": {
+                            "type": "string"
+                        },
+                        "PrincipalType": {
+                            "type": "string"
+                        },
+                        "TargetId": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn",
+                        "PermissionSetArn",
+                        "PrincipalId",
+                        "PrincipalType",
+                        "TargetId",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::Assignment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::InstanceAccessControlAttributeConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessControlAttributes": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttribute"
+                            },
+                            "type": "array"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SSO::InstanceAccessControlAttributeConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttribute": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "$ref": "#/definitions/AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttributeValue"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::InstanceAccessControlAttributeConfiguration.AccessControlAttributeValue": {
+            "additionalProperties": false,
+            "properties": {
+                "Source": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Source"
+            ],
+            "type": "object"
+        },
+        "AWS::SSO::PermissionSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "InlinePolicy": {
+                            "type": "object"
+                        },
+                        "InstanceArn": {
+                            "type": "string"
+                        },
+                        "ManagedPolicies": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "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::SageMaker::App": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "AppType": {
+                            "type": "string"
+                        },
+                        "DomainId": {
+                            "type": "string"
+                        },
+                        "ResourceSpec": {
+                            "$ref": "#/definitions/AWS::SageMaker::App.ResourceSpec"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserProfileName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AppName",
+                        "AppType",
+                        "DomainId",
+                        "UserProfileName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::App"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::App.ResourceSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "SageMakerImageArn": {
+                    "type": "string"
+                },
+                "SageMakerImageVersionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppImageConfigName": {
+                            "type": "string"
+                        },
+                        "KernelGatewayImageConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig.KernelGatewayImageConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AppImageConfigName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::AppImageConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::AppImageConfig.FileSystemConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultGid": {
+                    "type": "number"
+                },
+                "DefaultUid": {
+                    "type": "number"
+                },
+                "MountPath": {
+                    "type": "string"
+                }
+            },
+            "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::CodeRepository": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CodeRepositoryName": {
+                            "type": "string"
+                        },
+                        "GitConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::CodeRepository.GitConfig"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "GitConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::CodeRepository"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::CodeRepository.GitConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Branch": {
+                    "type": "string"
+                },
+                "RepositoryUrl": {
+                    "type": "string"
+                },
+                "SecretArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RepositoryUrl"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DataQualityAppSpecification": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.DataQualityAppSpecification"
+                        },
+                        "DataQualityBaselineConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.DataQualityBaselineConfig"
+                        },
+                        "DataQualityJobInput": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.DataQualityJobInput"
+                        },
+                        "DataQualityJobOutputConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.MonitoringOutputConfig"
+                        },
+                        "JobDefinitionName": {
+                            "type": "string"
+                        },
+                        "JobResources": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.MonitoringResources"
+                        },
+                        "NetworkConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.NetworkConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StoppingCondition": {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.StoppingCondition"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DataQualityAppSpecification",
+                        "DataQualityJobInput",
+                        "DataQualityJobOutputConfig",
+                        "JobResources",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::DataQualityJobDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "VolumeKmsKeyId": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.ConstraintsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.DataQualityAppSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerArguments": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEntrypoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Environment": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ImageUri": {
+                    "type": "string"
+                },
+                "PostAnalyticsProcessorSourceUri": {
+                    "type": "string"
+                },
+                "RecordPreprocessorSourceUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ImageUri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.DataQualityBaselineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseliningJobName": {
+                    "type": "string"
+                },
+                "ConstraintsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.ConstraintsResource"
+                },
+                "StatisticsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.StatisticsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.DataQualityJobInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointInput": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.EndpointInput"
+                }
+            },
+            "required": [
+                "EndpointInput"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.EndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointName": {
+                    "type": "string"
+                },
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3DataDistributionType": {
+                    "type": "string"
+                },
+                "S3InputMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointName",
+                "LocalPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.MonitoringOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Output": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.S3Output"
+                }
+            },
+            "required": [
+                "S3Output"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.MonitoringOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MonitoringOutputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.MonitoringOutput"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MonitoringOutputs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.MonitoringResources": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.ClusterConfig"
+                }
+            },
+            "required": [
+                "ClusterConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.NetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableInterContainerTrafficEncryption": {
+                    "type": "boolean"
+                },
+                "EnableNetworkIsolation": {
+                    "type": "boolean"
+                },
+                "VpcConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition.VpcConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.S3Output": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3UploadMode": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LocalPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.StatisticsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.StoppingCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRuntimeInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRuntimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DataQualityJobDefinition.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Device": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Device": {
+                            "type": "object"
+                        },
+                        "DeviceFleetName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DeviceFleetName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Device"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Device.Device": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "DeviceName": {
+                    "type": "string"
+                },
+                "IotThingName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DeviceName"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DeviceFleet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DeviceFleetName": {
+                            "type": "string"
+                        },
+                        "OutputConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::DeviceFleet.EdgeOutputConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DeviceFleetName",
+                        "OutputConfig",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::DeviceFleet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::DeviceFleet.EdgeOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "S3OutputLocation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3OutputLocation"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AppNetworkAccessType": {
+                            "type": "string"
+                        },
+                        "AuthMode": {
+                            "type": "string"
+                        },
+                        "DefaultUserSettings": {
+                            "$ref": "#/definitions/AWS::SageMaker::Domain.UserSettings"
+                        },
+                        "DomainName": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "SubnetIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthMode",
+                        "DefaultUserSettings",
+                        "DomainName",
+                        "SubnetIds",
+                        "VpcId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Domain"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.CustomImage": {
+            "additionalProperties": false,
+            "properties": {
+                "AppImageConfigName": {
+                    "type": "string"
+                },
+                "ImageName": {
+                    "type": "string"
+                },
+                "ImageVersionNumber": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AppImageConfigName",
+                "ImageName"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.JupyterServerAppSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultResourceSpec": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.ResourceSpec"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.KernelGatewayAppSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomImages": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::Domain.CustomImage"
+                    },
+                    "type": "array"
+                },
+                "DefaultResourceSpec": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.ResourceSpec"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.ResourceSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "SageMakerImageArn": {
+                    "type": "string"
+                },
+                "SageMakerImageVersionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.SharingSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NotebookOutputOption": {
+                    "type": "string"
+                },
+                "S3KmsKeyId": {
+                    "type": "string"
+                },
+                "S3OutputPath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Domain.UserSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRole": {
+                    "type": "string"
+                },
+                "JupyterServerAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.JupyterServerAppSettings"
+                },
+                "KernelGatewayAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.KernelGatewayAppSettings"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SharingSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::Domain.SharingSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DeploymentConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::Endpoint.DeploymentConfig"
+                        },
+                        "EndpointConfigName": {
+                            "type": "string"
+                        },
+                        "EndpointName": {
+                            "type": "string"
+                        },
+                        "ExcludeRetainedVariantProperties": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::Endpoint.VariantProperty"
+                            },
+                            "type": "array"
+                        },
+                        "RetainAllVariantProperties": {
+                            "type": "boolean"
+                        },
+                        "RetainDeploymentConfig": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EndpointConfigName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Endpoint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.Alarm": {
+            "additionalProperties": false,
+            "properties": {
+                "AlarmName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AlarmName"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.AutoRollbackConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Alarms": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::Endpoint.Alarm"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Alarms"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.BlueGreenUpdatePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "MaximumExecutionTimeoutInSeconds": {
+                    "type": "number"
+                },
+                "TerminationWaitInSeconds": {
+                    "type": "number"
+                },
+                "TrafficRoutingConfiguration": {
+                    "$ref": "#/definitions/AWS::SageMaker::Endpoint.TrafficRoutingConfig"
+                }
+            },
+            "required": [
+                "TrafficRoutingConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.CapacitySize": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.DeploymentConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "AutoRollbackConfiguration": {
+                    "$ref": "#/definitions/AWS::SageMaker::Endpoint.AutoRollbackConfig"
+                },
+                "BlueGreenUpdatePolicy": {
+                    "$ref": "#/definitions/AWS::SageMaker::Endpoint.BlueGreenUpdatePolicy"
+                }
+            },
+            "required": [
+                "BlueGreenUpdatePolicy"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.TrafficRoutingConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CanarySize": {
+                    "$ref": "#/definitions/AWS::SageMaker::Endpoint.CapacitySize"
+                },
+                "LinearStepSize": {
+                    "$ref": "#/definitions/AWS::SageMaker::Endpoint.CapacitySize"
+                },
+                "Type": {
+                    "type": "string"
+                },
+                "WaitIntervalInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Endpoint.VariantProperty": {
+            "additionalProperties": false,
+            "properties": {
+                "VariantPropertyType": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AsyncInferenceConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.AsyncInferenceConfig"
+                        },
+                        "DataCaptureConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.DataCaptureConfig"
+                        },
+                        "EndpointConfigName": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "ProductionVariants": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.ProductionVariant"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ProductionVariants"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::EndpointConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.AsyncInferenceClientConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConcurrentInvocationsPerInstance": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.AsyncInferenceConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.AsyncInferenceClientConfig"
+                },
+                "OutputConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.AsyncInferenceOutputConfig"
+                }
+            },
+            "required": [
+                "OutputConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.AsyncInferenceNotificationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ErrorTopic": {
+                    "type": "string"
+                },
+                "SuccessTopic": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.AsyncInferenceOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "NotificationConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.AsyncInferenceNotificationConfig"
+                },
+                "S3OutputPath": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3OutputPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.CaptureContentTypeHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "CsvContentTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "JsonContentTypes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.CaptureOption": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CaptureMode"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.DataCaptureConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CaptureContentTypeHeader": {
+                    "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.CaptureContentTypeHeader"
+                },
+                "CaptureOptions": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.CaptureOption"
+                    },
+                    "type": "array"
+                },
+                "DestinationS3Uri": {
+                    "type": "string"
+                },
+                "EnableCapture": {
+                    "type": "boolean"
+                },
+                "InitialSamplingPercentage": {
+                    "type": "number"
+                },
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CaptureOptions",
+                "DestinationS3Uri",
+                "InitialSamplingPercentage"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.ProductionVariant": {
+            "additionalProperties": false,
+            "properties": {
+                "AcceleratorType": {
+                    "type": "string"
+                },
+                "InitialInstanceCount": {
+                    "type": "number"
+                },
+                "InitialVariantWeight": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "ModelName": {
+                    "type": "string"
+                },
+                "ServerlessConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::EndpointConfig.ServerlessConfig"
+                },
+                "VariantName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "InitialVariantWeight",
+                "ModelName",
+                "VariantName"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::EndpointConfig.ServerlessConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxConcurrency": {
+                    "type": "number"
+                },
+                "MemorySizeInMB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxConcurrency",
+                "MemorySizeInMB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::FeatureGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "EventTimeFeatureName": {
+                            "type": "string"
+                        },
+                        "FeatureDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::FeatureGroup.FeatureDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "FeatureGroupName": {
+                            "type": "string"
+                        },
+                        "OfflineStoreConfig": {
+                            "type": "object"
+                        },
+                        "OnlineStoreConfig": {
+                            "type": "object"
+                        },
+                        "RecordIdentifierFeatureName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "EventTimeFeatureName",
+                        "FeatureDefinitions",
+                        "FeatureGroupName",
+                        "RecordIdentifierFeatureName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::FeatureGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::FeatureGroup.FeatureDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "FeatureName": {
+                    "type": "string"
+                },
+                "FeatureType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FeatureName",
+                "FeatureType"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Image": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ImageDescription": {
+                            "type": "string"
+                        },
+                        "ImageDisplayName": {
+                            "type": "string"
+                        },
+                        "ImageName": {
+                            "type": "string"
+                        },
+                        "ImageRoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ImageName",
+                        "ImageRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Image"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ImageVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BaseImage": {
+                            "type": "string"
+                        },
+                        "ImageName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "BaseImage",
+                        "ImageName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::ImageVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Model": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Containers": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::Model.ContainerDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "EnableNetworkIsolation": {
+                            "type": "boolean"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "InferenceExecutionConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::Model.InferenceExecutionConfig"
+                        },
+                        "ModelName": {
+                            "type": "string"
+                        },
+                        "PrimaryContainer": {
+                            "$ref": "#/definitions/AWS::SageMaker::Model.ContainerDefinition"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::Model.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "ExecutionRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Model"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.ContainerDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerHostname": {
+                    "type": "string"
+                },
+                "Environment": {
+                    "type": "object"
+                },
+                "Image": {
+                    "type": "string"
+                },
+                "ImageConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.ImageConfig"
+                },
+                "InferenceSpecificationName": {
+                    "type": "string"
+                },
+                "Mode": {
+                    "type": "string"
+                },
+                "ModelDataUrl": {
+                    "type": "string"
+                },
+                "ModelPackageName": {
+                    "type": "string"
+                },
+                "MultiModelConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.MultiModelConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.ImageConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RepositoryAccessMode": {
+                    "type": "string"
+                },
+                "RepositoryAuthConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::Model.RepositoryAuthConfig"
+                }
+            },
+            "required": [
+                "RepositoryAccessMode"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.InferenceExecutionConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Mode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Mode"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.MultiModelConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ModelCacheSetting": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.RepositoryAuthConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "RepositoryCredentialsProviderArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RepositoryCredentialsProviderArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Model.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "JobDefinitionName": {
+                            "type": "string"
+                        },
+                        "JobResources": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.MonitoringResources"
+                        },
+                        "ModelBiasAppSpecification": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.ModelBiasAppSpecification"
+                        },
+                        "ModelBiasBaselineConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.ModelBiasBaselineConfig"
+                        },
+                        "ModelBiasJobInput": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.ModelBiasJobInput"
+                        },
+                        "ModelBiasJobOutputConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutputConfig"
+                        },
+                        "NetworkConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.NetworkConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StoppingCondition": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.StoppingCondition"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "JobResources",
+                        "ModelBiasAppSpecification",
+                        "ModelBiasJobInput",
+                        "ModelBiasJobOutputConfig",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::ModelBiasJobDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "VolumeKmsKeyId": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.ConstraintsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.EndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndTimeOffset": {
+                    "type": "string"
+                },
+                "EndpointName": {
+                    "type": "string"
+                },
+                "FeaturesAttribute": {
+                    "type": "string"
+                },
+                "InferenceAttribute": {
+                    "type": "string"
+                },
+                "LocalPath": {
+                    "type": "string"
+                },
+                "ProbabilityAttribute": {
+                    "type": "string"
+                },
+                "ProbabilityThresholdAttribute": {
+                    "type": "number"
+                },
+                "S3DataDistributionType": {
+                    "type": "string"
+                },
+                "S3InputMode": {
+                    "type": "string"
+                },
+                "StartTimeOffset": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointName",
+                "LocalPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.ModelBiasAppSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfigUri": {
+                    "type": "string"
+                },
+                "Environment": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ImageUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConfigUri",
+                "ImageUri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.ModelBiasBaselineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseliningJobName": {
+                    "type": "string"
+                },
+                "ConstraintsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.ConstraintsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.ModelBiasJobInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointInput": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.EndpointInput"
+                },
+                "GroundTruthS3Input": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.MonitoringGroundTruthS3Input"
+                }
+            },
+            "required": [
+                "EndpointInput",
+                "GroundTruthS3Input"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.MonitoringGroundTruthS3Input": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Output": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.S3Output"
+                }
+            },
+            "required": [
+                "S3Output"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MonitoringOutputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.MonitoringOutput"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MonitoringOutputs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.MonitoringResources": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.ClusterConfig"
+                }
+            },
+            "required": [
+                "ClusterConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.NetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableInterContainerTrafficEncryption": {
+                    "type": "boolean"
+                },
+                "EnableNetworkIsolation": {
+                    "type": "boolean"
+                },
+                "VpcConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition.VpcConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.S3Output": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3UploadMode": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LocalPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.StoppingCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRuntimeInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRuntimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelBiasJobDefinition.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "JobDefinitionName": {
+                            "type": "string"
+                        },
+                        "JobResources": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringResources"
+                        },
+                        "ModelExplainabilityAppSpecification": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityAppSpecification"
+                        },
+                        "ModelExplainabilityBaselineConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityBaselineConfig"
+                        },
+                        "ModelExplainabilityJobInput": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityJobInput"
+                        },
+                        "ModelExplainabilityJobOutputConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutputConfig"
+                        },
+                        "NetworkConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.NetworkConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StoppingCondition": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.StoppingCondition"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "JobResources",
+                        "ModelExplainabilityAppSpecification",
+                        "ModelExplainabilityJobInput",
+                        "ModelExplainabilityJobOutputConfig",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::ModelExplainabilityJobDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "VolumeKmsKeyId": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.ConstraintsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.EndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointName": {
+                    "type": "string"
+                },
+                "FeaturesAttribute": {
+                    "type": "string"
+                },
+                "InferenceAttribute": {
+                    "type": "string"
+                },
+                "LocalPath": {
+                    "type": "string"
+                },
+                "ProbabilityAttribute": {
+                    "type": "string"
+                },
+                "S3DataDistributionType": {
+                    "type": "string"
+                },
+                "S3InputMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointName",
+                "LocalPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityAppSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ConfigUri": {
+                    "type": "string"
+                },
+                "Environment": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ImageUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ConfigUri",
+                "ImageUri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityBaselineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseliningJobName": {
+                    "type": "string"
+                },
+                "ConstraintsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.ConstraintsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.ModelExplainabilityJobInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointInput": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.EndpointInput"
+                }
+            },
+            "required": [
+                "EndpointInput"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Output": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.S3Output"
+                }
+            },
+            "required": [
+                "S3Output"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MonitoringOutputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringOutput"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MonitoringOutputs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.MonitoringResources": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.ClusterConfig"
+                }
+            },
+            "required": [
+                "ClusterConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.NetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableInterContainerTrafficEncryption": {
+                    "type": "boolean"
+                },
+                "EnableNetworkIsolation": {
+                    "type": "boolean"
+                },
+                "VpcConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition.VpcConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.S3Output": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3UploadMode": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LocalPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.StoppingCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRuntimeInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRuntimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelExplainabilityJobDefinition.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelPackageGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ModelPackageGroupDescription": {
+                            "type": "string"
+                        },
+                        "ModelPackageGroupName": {
+                            "type": "string"
+                        },
+                        "ModelPackageGroupPolicy": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ModelPackageGroupName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::ModelPackageGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "JobDefinitionName": {
+                            "type": "string"
+                        },
+                        "JobResources": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.MonitoringResources"
+                        },
+                        "ModelQualityAppSpecification": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.ModelQualityAppSpecification"
+                        },
+                        "ModelQualityBaselineConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.ModelQualityBaselineConfig"
+                        },
+                        "ModelQualityJobInput": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.ModelQualityJobInput"
+                        },
+                        "ModelQualityJobOutputConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutputConfig"
+                        },
+                        "NetworkConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.NetworkConfig"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StoppingCondition": {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.StoppingCondition"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "JobResources",
+                        "ModelQualityAppSpecification",
+                        "ModelQualityJobInput",
+                        "ModelQualityJobOutputConfig",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::ModelQualityJobDefinition"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "VolumeKmsKeyId": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.ConstraintsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.EndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndTimeOffset": {
+                    "type": "string"
+                },
+                "EndpointName": {
+                    "type": "string"
+                },
+                "InferenceAttribute": {
+                    "type": "string"
+                },
+                "LocalPath": {
+                    "type": "string"
+                },
+                "ProbabilityAttribute": {
+                    "type": "string"
+                },
+                "ProbabilityThresholdAttribute": {
+                    "type": "number"
+                },
+                "S3DataDistributionType": {
+                    "type": "string"
+                },
+                "S3InputMode": {
+                    "type": "string"
+                },
+                "StartTimeOffset": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointName",
+                "LocalPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.ModelQualityAppSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerArguments": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEntrypoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Environment": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "ImageUri": {
+                    "type": "string"
+                },
+                "PostAnalyticsProcessorSourceUri": {
+                    "type": "string"
+                },
+                "ProblemType": {
+                    "type": "string"
+                },
+                "RecordPreprocessorSourceUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ImageUri",
+                "ProblemType"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.ModelQualityBaselineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseliningJobName": {
+                    "type": "string"
+                },
+                "ConstraintsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.ConstraintsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.ModelQualityJobInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointInput": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.EndpointInput"
+                },
+                "GroundTruthS3Input": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.MonitoringGroundTruthS3Input"
+                }
+            },
+            "required": [
+                "EndpointInput",
+                "GroundTruthS3Input"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.MonitoringGroundTruthS3Input": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Output": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.S3Output"
+                }
+            },
+            "required": [
+                "S3Output"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MonitoringOutputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.MonitoringOutput"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MonitoringOutputs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.MonitoringResources": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.ClusterConfig"
+                }
+            },
+            "required": [
+                "ClusterConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.NetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableInterContainerTrafficEncryption": {
+                    "type": "boolean"
+                },
+                "EnableNetworkIsolation": {
+                    "type": "boolean"
+                },
+                "VpcConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition.VpcConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.S3Output": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3UploadMode": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LocalPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.StoppingCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRuntimeInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRuntimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::ModelQualityJobDefinition.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "EndpointName": {
+                            "type": "string"
+                        },
+                        "FailureReason": {
+                            "type": "string"
+                        },
+                        "LastMonitoringExecutionSummary": {
+                            "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringExecutionSummary"
+                        },
+                        "MonitoringScheduleConfig": {
+                            "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringScheduleConfig"
+                        },
+                        "MonitoringScheduleName": {
+                            "type": "string"
+                        },
+                        "MonitoringScheduleStatus": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MonitoringScheduleConfig",
+                        "MonitoringScheduleName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::MonitoringSchedule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.BaselineConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ConstraintsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.ConstraintsResource"
+                },
+                "StatisticsResource": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.StatisticsResource"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.ClusterConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceCount": {
+                    "type": "number"
+                },
+                "InstanceType": {
+                    "type": "string"
+                },
+                "VolumeKmsKeyId": {
+                    "type": "string"
+                },
+                "VolumeSizeInGB": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "InstanceCount",
+                "InstanceType",
+                "VolumeSizeInGB"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.ConstraintsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.EndpointInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointName": {
+                    "type": "string"
+                },
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3DataDistributionType": {
+                    "type": "string"
+                },
+                "S3InputMode": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "EndpointName",
+                "LocalPath"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringAppSpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "ContainerArguments": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ContainerEntrypoint": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ImageUri": {
+                    "type": "string"
+                },
+                "PostAnalyticsProcessorSourceUri": {
+                    "type": "string"
+                },
+                "RecordPreprocessorSourceUri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ImageUri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringExecutionSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "CreationTime": {
+                    "type": "string"
+                },
+                "EndpointName": {
+                    "type": "string"
+                },
+                "FailureReason": {
+                    "type": "string"
+                },
+                "LastModifiedTime": {
+                    "type": "string"
+                },
+                "MonitoringExecutionStatus": {
+                    "type": "string"
+                },
+                "MonitoringScheduleName": {
+                    "type": "string"
+                },
+                "ProcessingJobArn": {
+                    "type": "string"
+                },
+                "ScheduledTime": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CreationTime",
+                "LastModifiedTime",
+                "MonitoringExecutionStatus",
+                "MonitoringScheduleName",
+                "ScheduledTime"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringInput": {
+            "additionalProperties": false,
+            "properties": {
+                "EndpointInput": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.EndpointInput"
+                }
+            },
+            "required": [
+                "EndpointInput"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringJobDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "BaselineConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.BaselineConfig"
+                },
+                "Environment": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "MonitoringAppSpecification": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringAppSpecification"
+                },
+                "MonitoringInputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringInput"
+                    },
+                    "type": "array"
+                },
+                "MonitoringOutputConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringOutputConfig"
+                },
+                "MonitoringResources": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringResources"
+                },
+                "NetworkConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.NetworkConfig"
+                },
+                "RoleArn": {
+                    "type": "string"
+                },
+                "StoppingCondition": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.StoppingCondition"
+                }
+            },
+            "required": [
+                "MonitoringAppSpecification",
+                "MonitoringInputs",
+                "MonitoringOutputConfig",
+                "MonitoringResources",
+                "RoleArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringOutput": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Output": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.S3Output"
+                }
+            },
+            "required": [
+                "S3Output"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringOutputConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "MonitoringOutputs": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringOutput"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "MonitoringOutputs"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringResources": {
+            "additionalProperties": false,
+            "properties": {
+                "ClusterConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.ClusterConfig"
+                }
+            },
+            "required": [
+                "ClusterConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.MonitoringScheduleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "MonitoringJobDefinition": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.MonitoringJobDefinition"
+                },
+                "MonitoringJobDefinitionName": {
+                    "type": "string"
+                },
+                "MonitoringType": {
+                    "type": "string"
+                },
+                "ScheduleConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.ScheduleConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.NetworkConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "EnableInterContainerTrafficEncryption": {
+                    "type": "boolean"
+                },
+                "EnableNetworkIsolation": {
+                    "type": "boolean"
+                },
+                "VpcConfig": {
+                    "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule.VpcConfig"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.S3Output": {
+            "additionalProperties": false,
+            "properties": {
+                "LocalPath": {
+                    "type": "string"
+                },
+                "S3UploadMode": {
+                    "type": "string"
+                },
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LocalPath",
+                "S3Uri"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.ScheduleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.StatisticsResource": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Uri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.StoppingCondition": {
+            "additionalProperties": false,
+            "properties": {
+                "MaxRuntimeInSeconds": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "MaxRuntimeInSeconds"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::MonitoringSchedule.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Subnets": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "Subnets"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::NotebookInstance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceleratorTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AdditionalCodeRepositories": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "DefaultCodeRepository": {
+                            "type": "string"
+                        },
+                        "DirectInternetAccess": {
+                            "type": "string"
+                        },
+                        "InstanceType": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "LifecycleConfigName": {
+                            "type": "string"
+                        },
+                        "NotebookInstanceName": {
+                            "type": "string"
+                        },
+                        "PlatformIdentifier": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "RootAccess": {
+                            "type": "string"
+                        },
+                        "SecurityGroupIds": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "SubnetId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VolumeSizeInGB": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "InstanceType",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::NotebookInstance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::NotebookInstanceLifecycleConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "NotebookInstanceLifecycleConfigName": {
+                            "type": "string"
+                        },
+                        "OnCreate": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::NotebookInstanceLifecycleConfig.NotebookInstanceLifecycleHook"
+                            },
+                            "type": "array"
+                        },
+                        "OnStart": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::NotebookInstanceLifecycleConfig.NotebookInstanceLifecycleHook"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::NotebookInstanceLifecycleConfig"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::NotebookInstanceLifecycleConfig.NotebookInstanceLifecycleHook": {
+            "additionalProperties": false,
+            "properties": {
+                "Content": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Pipeline": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PipelineDefinition": {
+                            "type": "object"
+                        },
+                        "PipelineDescription": {
+                            "type": "string"
+                        },
+                        "PipelineDisplayName": {
+                            "type": "string"
+                        },
+                        "PipelineName": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PipelineDefinition",
+                        "PipelineName",
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Pipeline"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Project": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ProjectDescription": {
+                            "type": "string"
+                        },
+                        "ProjectName": {
+                            "type": "string"
+                        },
+                        "ServiceCatalogProvisioningDetails": {
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ProjectName",
+                        "ServiceCatalogProvisioningDetails"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Project"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DomainId": {
+                            "type": "string"
+                        },
+                        "SingleSignOnUserIdentifier": {
+                            "type": "string"
+                        },
+                        "SingleSignOnUserValue": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserProfileName": {
+                            "type": "string"
+                        },
+                        "UserSettings": {
+                            "$ref": "#/definitions/AWS::SageMaker::UserProfile.UserSettings"
+                        }
+                    },
+                    "required": [
+                        "DomainId",
+                        "UserProfileName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::UserProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.CustomImage": {
+            "additionalProperties": false,
+            "properties": {
+                "AppImageConfigName": {
+                    "type": "string"
+                },
+                "ImageName": {
+                    "type": "string"
+                },
+                "ImageVersionNumber": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "AppImageConfigName",
+                "ImageName"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.JupyterServerAppSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "DefaultResourceSpec": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.ResourceSpec"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.KernelGatewayAppSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomImages": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::SageMaker::UserProfile.CustomImage"
+                    },
+                    "type": "array"
+                },
+                "DefaultResourceSpec": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.ResourceSpec"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.ResourceSpec": {
+            "additionalProperties": false,
+            "properties": {
+                "InstanceType": {
+                    "type": "string"
+                },
+                "SageMakerImageArn": {
+                    "type": "string"
+                },
+                "SageMakerImageVersionArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.SharingSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "NotebookOutputOption": {
+                    "type": "string"
+                },
+                "S3KmsKeyId": {
+                    "type": "string"
+                },
+                "S3OutputPath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::UserProfile.UserSettings": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRole": {
+                    "type": "string"
+                },
+                "JupyterServerAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.JupyterServerAppSettings"
+                },
+                "KernelGatewayAppSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.KernelGatewayAppSettings"
+                },
+                "SecurityGroups": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SharingSettings": {
+                    "$ref": "#/definitions/AWS::SageMaker::UserProfile.SharingSettings"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SageMaker::Workteam": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "MemberDefinitions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SageMaker::Workteam.MemberDefinition"
+                            },
+                            "type": "array"
+                        },
+                        "NotificationConfiguration": {
+                            "$ref": "#/definitions/AWS::SageMaker::Workteam.NotificationConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkteamName": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SageMaker::Workteam"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Workteam.CognitoMemberDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "CognitoClientId": {
+                    "type": "string"
+                },
+                "CognitoUserGroup": {
+                    "type": "string"
+                },
+                "CognitoUserPool": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CognitoClientId",
+                "CognitoUserGroup",
+                "CognitoUserPool"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Workteam.MemberDefinition": {
+            "additionalProperties": false,
+            "properties": {
+                "CognitoMemberDefinition": {
+                    "$ref": "#/definitions/AWS::SageMaker::Workteam.CognitoMemberDefinition"
+                }
+            },
+            "required": [
+                "CognitoMemberDefinition"
+            ],
+            "type": "object"
+        },
+        "AWS::SageMaker::Workteam.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "NotificationTopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "NotificationTopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::ResourcePolicy": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BlockPublicPolicy": {
+                            "type": "boolean"
+                        },
+                        "ResourcePolicy": {
+                            "type": "object"
+                        },
+                        "SecretId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourcePolicy",
+                        "SecretId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecretsManager::ResourcePolicy"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::RotationSchedule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HostedRotationLambda": {
+                            "$ref": "#/definitions/AWS::SecretsManager::RotationSchedule.HostedRotationLambda"
+                        },
+                        "RotationLambdaARN": {
+                            "type": "string"
+                        },
+                        "RotationRules": {
+                            "$ref": "#/definitions/AWS::SecretsManager::RotationSchedule.RotationRules"
+                        },
+                        "SecretId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SecretId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecretsManager::RotationSchedule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::RotationSchedule.HostedRotationLambda": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyArn": {
+                    "type": "string"
+                },
+                "MasterSecretArn": {
+                    "type": "string"
+                },
+                "MasterSecretKmsKeyArn": {
+                    "type": "string"
+                },
+                "RotationLambdaName": {
+                    "type": "string"
+                },
+                "RotationType": {
+                    "type": "string"
+                },
+                "SuperuserSecretArn": {
+                    "type": "string"
+                },
+                "SuperuserSecretKmsKeyArn": {
+                    "type": "string"
+                },
+                "VpcSecurityGroupIds": {
+                    "type": "string"
+                },
+                "VpcSubnetIds": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "RotationType"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::RotationSchedule.RotationRules": {
+            "additionalProperties": false,
+            "properties": {
+                "AutomaticallyAfterDays": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecretsManager::Secret": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "GenerateSecretString": {
+                            "$ref": "#/definitions/AWS::SecretsManager::Secret.GenerateSecretString"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "ReplicaRegions": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::SecretsManager::Secret.ReplicaRegion"
+                            },
+                            "type": "array"
+                        },
+                        "SecretString": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecretsManager::Secret"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::Secret.GenerateSecretString": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludeCharacters": {
+                    "type": "string"
+                },
+                "ExcludeLowercase": {
+                    "type": "boolean"
+                },
+                "ExcludeNumbers": {
+                    "type": "boolean"
+                },
+                "ExcludePunctuation": {
+                    "type": "boolean"
+                },
+                "ExcludeUppercase": {
+                    "type": "boolean"
+                },
+                "GenerateStringKey": {
+                    "type": "string"
+                },
+                "IncludeSpace": {
+                    "type": "boolean"
+                },
+                "PasswordLength": {
+                    "type": "number"
+                },
+                "RequireEachIncludedType": {
+                    "type": "boolean"
+                },
+                "SecretStringTemplate": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::SecretsManager::Secret.ReplicaRegion": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                },
+                "Region": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Region"
+            ],
+            "type": "object"
+        },
+        "AWS::SecretsManager::SecretTargetAttachment": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "SecretId": {
+                            "type": "string"
+                        },
+                        "TargetId": {
+                            "type": "string"
+                        },
+                        "TargetType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "SecretId",
+                        "TargetId",
+                        "TargetType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecretsManager::SecretTargetAttachment"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::SecurityHub::Hub": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Tags": {
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::SecurityHub::Hub"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Api": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AccessLogSetting": {
+                            "$ref": "#/definitions/AWS::Serverless::Api.AccessLogSetting"
+                        },
+                        "Auth": {
+                            "$ref": "#/definitions/AWS::Serverless::Api.Auth"
+                        },
+                        "BinaryMediaTypes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "CacheClusterEnabled": {
+                            "type": "boolean"
+                        },
+                        "CacheClusterSize": {
+                            "type": "string"
+                        },
+                        "Cors": {
+                            "anyOf": [
+                                {
+                                    "type": [
+                                        "string"
+                                    ]
+                                },
+                                {
+                                    "$ref": "#/definitions/AWS::Serverless::Api.CorsConfiguration"
+                                }
+                            ]
+                        },
+                        "DefinitionBody": {
+                            "type": "object"
+                        },
+                        "DefinitionUri": {
+                            "anyOf": [
+                                {
+                                    "type": [
+                                        "string"
+                                    ]
+                                },
+                                {
+                                    "$ref": "#/definitions/AWS::Serverless::Api.S3Location"
+                                }
+                            ]
+                        },
+                        "EndpointConfiguration": {
+                            "type": "string"
+                        },
+                        "MethodSettings": {
+                            "items": {
+                                "type": "object"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "OpenApiVersion": {
+                            "type": "string"
+                        },
+                        "StageName": {
+                            "type": "string"
+                        },
+                        "TracingEnabled": {
+                            "type": "boolean"
+                        },
+                        "Variables": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "StageName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Serverless::Api"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Api.AccessLogSetting": {
+            "additionalProperties": false,
+            "properties": {
+                "DestinationArn": {
+                    "type": "string"
+                },
+                "Format": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Serverless::Api.Auth": {
+            "additionalProperties": false,
+            "properties": {
+                "Authorizers": {
+                    "type": "object"
+                },
+                "DefaultAuthorizer": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Serverless::Api.CorsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowCredentials": {
+                    "type": "boolean"
+                },
+                "AllowHeaders": {
+                    "type": "string"
+                },
+                "AllowMethods": {
+                    "type": "string"
+                },
+                "AllowOrigin": {
+                    "type": "string"
+                },
+                "MaxAge": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "AllowOrigin"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Api.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key",
+                "Version"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Location": {
+                            "anyOf": [
+                                {
+                                    "type": [
+                                        "string"
+                                    ]
+                                },
+                                {
+                                    "$ref": "#/definitions/AWS::Serverless::Application.ApplicationLocation"
+                                }
+                            ]
+                        },
+                        "NotificationArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Parameters": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "TimeoutInMinutes": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "Location"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Serverless::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Application.ApplicationLocation": {
+            "additionalProperties": false,
+            "properties": {
+                "ApplicationId": {
+                    "type": "string"
+                },
+                "SemanticVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ApplicationId",
+                "SemanticVersion"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AutoPublishAlias": {
+                            "type": "string"
+                        },
+                        "CodeUri": {
+                            "anyOf": [
+                                {
+                                    "type": [
+                                        "string"
+                                    ]
+                                },
+                                {
+                                    "$ref": "#/definitions/AWS::Serverless::Function.S3Location"
+                                }
+                            ]
+                        },
+                        "DeadLetterQueue": {
+                            "$ref": "#/definitions/AWS::Serverless::Function.DeadLetterQueue"
+                        },
+                        "DeploymentPreference": {
+                            "$ref": "#/definitions/AWS::Serverless::Function.DeploymentPreference"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Environment": {
+                            "$ref": "#/definitions/AWS::Serverless::Function.FunctionEnvironment"
+                        },
+                        "Events": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::Serverless::Function.EventSource"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "FileSystemConfigs": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Serverless::Function.FileSystemConfig"
+                            },
+                            "type": "array"
+                        },
+                        "FunctionName": {
+                            "type": "string"
+                        },
+                        "Handler": {
+                            "type": "string"
+                        },
+                        "KmsKeyArn": {
+                            "type": "string"
+                        },
+                        "Layers": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "MemorySize": {
+                            "type": "number"
+                        },
+                        "PermissionsBoundary": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "anyOf": [
+                                {
+                                    "type": [
+                                        "string"
+                                    ]
+                                },
+                                {
+                                    "items": {
+                                        "type": "string"
+                                    },
+                                    "type": "array"
+                                },
+                                {
+                                    "$ref": "#/definitions/AWS::Serverless::Function.IAMPolicyDocument"
+                                },
+                                {
+                                    "items": {
+                                        "$ref": "#/definitions/AWS::Serverless::Function.IAMPolicyDocument"
+                                    },
+                                    "type": "array"
+                                },
+                                {
+                                    "items": {
+                                        "$ref": "#/definitions/AWS::Serverless::Function.SAMPolicyTemplate"
+                                    },
+                                    "type": "array"
+                                }
+                            ]
+                        },
+                        "ReservedConcurrentExecutions": {
+                            "type": "number"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "Runtime": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Timeout": {
+                            "type": "number"
+                        },
+                        "Tracing": {
+                            "type": "string"
+                        },
+                        "VpcConfig": {
+                            "$ref": "#/definitions/AWS::Serverless::Function.VpcConfig"
+                        }
+                    },
+                    "required": [
+                        "CodeUri",
+                        "Handler",
+                        "Runtime"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Serverless::Function"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.AlexaSkillEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "Variables": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Serverless::Function.ApiEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "Method": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "RestApiId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Method",
+                "Path"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.BucketSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.CloudWatchEventEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "type": "string"
+                },
+                "InputPath": {
+                    "type": "string"
+                },
+                "Pattern": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "Pattern"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.CloudWatchLogsEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "FilterPattern": {
+                    "type": "string"
+                },
+                "LogGroupName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FilterPattern",
+                "LogGroupName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.CollectionSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "CollectionId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "CollectionId"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.DeadLetterQueue": {
+            "additionalProperties": false,
+            "properties": {
+                "TargetArn": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TargetArn",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.DeploymentPreference": {
+            "additionalProperties": false,
+            "properties": {
+                "Alarms": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Hooks": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Role": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Serverless::Function.DestinationConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "OnFailure": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.OnFailure"
+                }
+            },
+            "required": [
+                "OnFailure"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.DomainSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "DomainName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DomainName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.DynamoDBEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchSize": {
+                    "type": "number"
+                },
+                "BisectBatchOnFunctionError": {
+                    "type": "boolean"
+                },
+                "DestinationConfig": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.DestinationConfig"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "MaximumBatchingWindowInSeconds": {
+                    "type": "number"
+                },
+                "MaximumRecordAgeInSeconds": {
+                    "type": "number"
+                },
+                "MaximumRetryAttempts": {
+                    "type": "number"
+                },
+                "ParallelizationFactor": {
+                    "type": "number"
+                },
+                "StartingPosition": {
+                    "type": "string"
+                },
+                "Stream": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StartingPosition",
+                "Stream"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.EmptySAMPT": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::Serverless::Function.EventBridgeRuleEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBusName": {
+                    "type": "string"
+                },
+                "Input": {
+                    "type": "string"
+                },
+                "InputPath": {
+                    "type": "string"
+                },
+                "Pattern": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "Pattern"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.EventSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Properties": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.S3Event"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.SNSEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.SQSEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.KinesisEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.DynamoDBEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.ApiEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.ScheduleEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.CloudWatchEventEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.CloudWatchLogsEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.IoTRuleEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.AlexaSkillEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function.EventBridgeRuleEvent"
+                        }
+                    ]
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Properties",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.FileSystemConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "LocalMountPath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Serverless::Function.FunctionEnvironment": {
+            "additionalProperties": false,
+            "properties": {
+                "Variables": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                }
+            },
+            "required": [
+                "Variables"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.FunctionSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FunctionName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.IAMPolicyDocument": {
+            "additionalProperties": false,
+            "properties": {
+                "Statement": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "Statement"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.IdentitySAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "IdentityName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "IdentityName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.IoTRuleEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "AwsIotSqlVersion": {
+                    "type": "string"
+                },
+                "Sql": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Sql"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.KeySAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "KeyId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KeyId"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.KinesisEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchSize": {
+                    "type": "number"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "StartingPosition": {
+                    "type": "string"
+                },
+                "Stream": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StartingPosition",
+                "Stream"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.LogGroupSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogGroupName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.OnFailure": {
+            "additionalProperties": false,
+            "properties": {
+                "Destination": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destination"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.QueueSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "QueueName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "QueueName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.S3Event": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Events": {
+                    "anyOf": [
+                        {
+                            "type": [
+                                "string"
+                            ]
+                        },
+                        {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Filter": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.S3NotificationFilter"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Events"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.S3KeyFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "Rules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Serverless::Function.S3KeyFilterRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Rules"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.S3KeyFilterRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.S3NotificationFilter": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Key": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.S3KeyFilter"
+                }
+            },
+            "required": [
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.SAMPolicyTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "AMIDescribePolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.EmptySAMPT"
+                },
+                "CloudFormationDescribeStacksPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.EmptySAMPT"
+                },
+                "CloudWatchPutMetricPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.EmptySAMPT"
+                },
+                "DynamoDBCrudPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.TableSAMPT"
+                },
+                "DynamoDBReadPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.TableSAMPT"
+                },
+                "DynamoDBStreamReadPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.TableStreamSAMPT"
+                },
+                "EC2DescribePolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.EmptySAMPT"
+                },
+                "ElasticsearchHttpPostPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.DomainSAMPT"
+                },
+                "FilterLogEventsPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.LogGroupSAMPT"
+                },
+                "KMSDecryptPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.KeySAMPT"
+                },
+                "KinesisCrudPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.StreamSAMPT"
+                },
+                "KinesisStreamReadPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.StreamSAMPT"
+                },
+                "LambdaInvokePolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.FunctionSAMPT"
+                },
+                "RekognitionDetectOnlyPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.EmptySAMPT"
+                },
+                "RekognitionLabelsPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.EmptySAMPT"
+                },
+                "RekognitionNoDataAccessPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.CollectionSAMPT"
+                },
+                "RekognitionReadPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.CollectionSAMPT"
+                },
+                "RekognitionWriteOnlyAccessPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.CollectionSAMPT"
+                },
+                "S3CrudPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.BucketSAMPT"
+                },
+                "S3ReadPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.BucketSAMPT"
+                },
+                "SESBulkTemplatedCrudPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.IdentitySAMPT"
+                },
+                "SESCrudPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.IdentitySAMPT"
+                },
+                "SESEmailTemplateCrudPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.EmptySAMPT"
+                },
+                "SESSendBouncePolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.IdentitySAMPT"
+                },
+                "SNSCrudPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.TopicSAMPT"
+                },
+                "SNSPublishMessagePolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.TopicSAMPT"
+                },
+                "SQSPollerPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.QueueSAMPT"
+                },
+                "SQSSendMessagePolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.QueueSAMPT"
+                },
+                "StepFunctionsExecutionPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.StateMachineSAMPT"
+                },
+                "VPCAccessPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::Function.EmptySAMPT"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Serverless::Function.SNSEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "Topic": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Topic"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.SQSEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "BatchSize": {
+                    "type": "number"
+                },
+                "Enabled": {
+                    "type": "boolean"
+                },
+                "Queue": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Queue"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.ScheduleEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "type": "string"
+                },
+                "Schedule": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Schedule"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.StateMachineSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "StateMachineName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StateMachineName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.StreamSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StreamName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.TableSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.TableStreamSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "StreamName": {
+                    "type": "string"
+                },
+                "TableName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StreamName",
+                "TableName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.TopicSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "TopicName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TopicName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::Function.VpcConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::LayerVersion": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CompatibleRuntimes": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "ContentUri": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LayerName": {
+                            "type": "string"
+                        },
+                        "LicenseInfo": {
+                            "type": "string"
+                        },
+                        "RetentionPolicy": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Serverless::LayerVersion"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::SimpleTable": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PrimaryKey": {
+                            "$ref": "#/definitions/AWS::Serverless::SimpleTable.PrimaryKey"
+                        },
+                        "ProvisionedThroughput": {
+                            "$ref": "#/definitions/AWS::Serverless::SimpleTable.ProvisionedThroughput"
+                        },
+                        "SSESpecification": {
+                            "$ref": "#/definitions/AWS::Serverless::SimpleTable.SSESpecification"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Serverless::SimpleTable"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::SimpleTable.PrimaryKey": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::SimpleTable.ProvisionedThroughput": {
+            "additionalProperties": false,
+            "properties": {
+                "ReadCapacityUnits": {
+                    "type": "number"
+                },
+                "WriteCapacityUnits": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "WriteCapacityUnits"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::SimpleTable.SSESpecification": {
+            "additionalProperties": false,
+            "properties": {
+                "SSEEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Definition": {
+                            "type": "object"
+                        },
+                        "DefinitionSubstitutions": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "DefinitionUri": {
+                            "anyOf": [
+                                {
+                                    "type": [
+                                        "string"
+                                    ]
+                                },
+                                {
+                                    "$ref": "#/definitions/AWS::Serverless::StateMachine.S3Location"
+                                }
+                            ]
+                        },
+                        "Events": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::Serverless::StateMachine.EventSource"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Logging": {
+                            "$ref": "#/definitions/AWS::Serverless::StateMachine.LoggingConfiguration"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Policies": {
+                            "anyOf": [
+                                {
+                                    "type": [
+                                        "string"
+                                    ]
+                                },
+                                {
+                                    "items": {
+                                        "type": "string"
+                                    },
+                                    "type": "array"
+                                },
+                                {
+                                    "$ref": "#/definitions/AWS::Serverless::StateMachine.IAMPolicyDocument"
+                                },
+                                {
+                                    "items": {
+                                        "$ref": "#/definitions/AWS::Serverless::StateMachine.IAMPolicyDocument"
+                                    },
+                                    "type": "array"
+                                },
+                                {
+                                    "items": {
+                                        "$ref": "#/definitions/AWS::Serverless::StateMachine.SAMPolicyTemplate"
+                                    },
+                                    "type": "array"
+                                }
+                            ]
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Serverless::StateMachine"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.ApiEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "Method": {
+                    "type": "string"
+                },
+                "Path": {
+                    "type": "string"
+                },
+                "RestApiId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Method",
+                "Path"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.CloudWatchEventEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBusName": {
+                    "type": "string"
+                },
+                "Input": {
+                    "type": "string"
+                },
+                "InputPath": {
+                    "type": "string"
+                },
+                "Pattern": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "Pattern"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.CloudWatchLogsLogGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "LogGroupArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.EventBridgeRuleEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "EventBusName": {
+                    "type": "string"
+                },
+                "Input": {
+                    "type": "string"
+                },
+                "InputPath": {
+                    "type": "string"
+                },
+                "Pattern": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "Pattern"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.EventSource": {
+            "additionalProperties": false,
+            "properties": {
+                "Properties": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::StateMachine.CloudWatchEventEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::StateMachine.EventBridgeRuleEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::StateMachine.ScheduleEvent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::StateMachine.ApiEvent"
+                        }
+                    ]
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Properties",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.FunctionSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "FunctionName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FunctionName"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.IAMPolicyDocument": {
+            "additionalProperties": false,
+            "properties": {
+                "Statement": {
+                    "type": "object"
+                }
+            },
+            "required": [
+                "Statement"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.LogDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsLogGroup": {
+                    "$ref": "#/definitions/AWS::Serverless::StateMachine.CloudWatchLogsLogGroup"
+                }
+            },
+            "required": [
+                "CloudWatchLogsLogGroup"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Destinations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Serverless::StateMachine.LogDestination"
+                    },
+                    "type": "array"
+                },
+                "IncludeExecutionData": {
+                    "type": "boolean"
+                },
+                "Level": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Destinations",
+                "IncludeExecutionData",
+                "Level"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.SAMPolicyTemplate": {
+            "additionalProperties": false,
+            "properties": {
+                "LambdaInvokePolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::StateMachine.FunctionSAMPT"
+                },
+                "StepFunctionsExecutionPolicy": {
+                    "$ref": "#/definitions/AWS::Serverless::StateMachine.StateMachineSAMPT"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.ScheduleEvent": {
+            "additionalProperties": false,
+            "properties": {
+                "Input": {
+                    "type": "string"
+                },
+                "Schedule": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Schedule"
+            ],
+            "type": "object"
+        },
+        "AWS::Serverless::StateMachine.StateMachineSAMPT": {
+            "additionalProperties": false,
+            "properties": {
+                "StateMachineName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "StateMachineName"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::AcceptedPortfolioShare": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::AcceptedPortfolioShare"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::CloudFormationProduct": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Distributor": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Owner": {
+                            "type": "string"
+                        },
+                        "ProvisioningArtifactParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ServiceCatalog::CloudFormationProduct.ProvisioningArtifactProperties"
+                            },
+                            "type": "array"
+                        },
+                        "ReplaceProvisioningArtifacts": {
+                            "type": "boolean"
+                        },
+                        "SupportDescription": {
+                            "type": "string"
+                        },
+                        "SupportEmail": {
+                            "type": "string"
+                        },
+                        "SupportUrl": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Owner",
+                        "ProvisioningArtifactParameters"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::CloudFormationProduct"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::CloudFormationProduct.ProvisioningArtifactProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "Description": {
+                    "type": "string"
+                },
+                "DisableTemplateValidation": {
+                    "type": "boolean"
+                },
+                "Info": {
+                    "type": "object"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Info"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::CloudFormationProvisionedProduct": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "NotificationArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PathId": {
+                            "type": "string"
+                        },
+                        "PathName": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "ProductName": {
+                            "type": "string"
+                        },
+                        "ProvisionedProductName": {
+                            "type": "string"
+                        },
+                        "ProvisioningArtifactId": {
+                            "type": "string"
+                        },
+                        "ProvisioningArtifactName": {
+                            "type": "string"
+                        },
+                        "ProvisioningParameters": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningParameter"
+                            },
+                            "type": "array"
+                        },
+                        "ProvisioningPreferences": {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningPreferences"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::CloudFormationProvisionedProduct"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::CloudFormationProvisionedProduct.ProvisioningPreferences": {
+            "additionalProperties": false,
+            "properties": {
+                "StackSetAccounts": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "StackSetFailureToleranceCount": {
+                    "type": "number"
+                },
+                "StackSetFailureTolerancePercentage": {
+                    "type": "number"
+                },
+                "StackSetMaxConcurrencyCount": {
+                    "type": "number"
+                },
+                "StackSetMaxConcurrencyPercentage": {
+                    "type": "number"
+                },
+                "StackSetOperationType": {
+                    "type": "string"
+                },
+                "StackSetRegions": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::LaunchNotificationConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "NotificationArns": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "NotificationArns",
+                        "PortfolioId",
+                        "ProductId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::LaunchNotificationConstraint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::LaunchRoleConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "LocalRoleName": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId",
+                        "ProductId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::LaunchRoleConstraint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::LaunchTemplateConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId",
+                        "ProductId",
+                        "Rules"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::LaunchTemplateConstraint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::Portfolio": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "DisplayName": {
+                            "type": "string"
+                        },
+                        "ProviderName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DisplayName",
+                        "ProviderName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::Portfolio"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::PortfolioPrincipalAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "PrincipalARN": {
+                            "type": "string"
+                        },
+                        "PrincipalType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId",
+                        "PrincipalARN",
+                        "PrincipalType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::PortfolioPrincipalAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::PortfolioProductAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "SourcePortfolioId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId",
+                        "ProductId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::PortfolioProductAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::PortfolioShare": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "AccountId": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ShareTagOptions": {
+                            "type": "boolean"
+                        }
+                    },
+                    "required": [
+                        "AccountId",
+                        "PortfolioId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::PortfolioShare"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::ResourceUpdateConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "TagUpdateOnProvisionedProduct": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "PortfolioId",
+                        "ProductId",
+                        "TagUpdateOnProvisionedProduct"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::ResourceUpdateConstraint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::ServiceAction": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "Definition": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::ServiceCatalog::ServiceAction.DefinitionParameter"
+                            },
+                            "type": "array"
+                        },
+                        "DefinitionType": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Definition",
+                        "DefinitionType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::ServiceAction"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::ServiceAction.DefinitionParameter": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::ServiceActionAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "ProvisioningArtifactId": {
+                            "type": "string"
+                        },
+                        "ServiceActionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ProductId",
+                        "ProvisioningArtifactId",
+                        "ServiceActionId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::ServiceActionAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::StackSetConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AcceptLanguage": {
+                            "type": "string"
+                        },
+                        "AccountList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "AdminRole": {
+                            "type": "string"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "ExecutionRole": {
+                            "type": "string"
+                        },
+                        "PortfolioId": {
+                            "type": "string"
+                        },
+                        "ProductId": {
+                            "type": "string"
+                        },
+                        "RegionList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "StackInstanceControl": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AccountList",
+                        "AdminRole",
+                        "Description",
+                        "ExecutionRole",
+                        "PortfolioId",
+                        "ProductId",
+                        "RegionList",
+                        "StackInstanceControl"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::StackSetConstraint"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::TagOption": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Active": {
+                            "type": "boolean"
+                        },
+                        "Key": {
+                            "type": "string"
+                        },
+                        "Value": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Key",
+                        "Value"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::TagOption"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalog::TagOptionAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ResourceId": {
+                            "type": "string"
+                        },
+                        "TagOptionId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourceId",
+                        "TagOptionId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalog::TagOptionAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalogAppRegistry::Application": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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::ServiceCatalogAppRegistry::Application"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalogAppRegistry::AttributeGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Attributes": {
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "required": [
+                        "Attributes",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalogAppRegistry::AttributeGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Application": {
+                            "type": "string"
+                        },
+                        "AttributeGroup": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Application",
+                        "AttributeGroup"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceCatalogAppRegistry::ResourceAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Application": {
+                            "type": "string"
+                        },
+                        "Resource": {
+                            "type": "string"
+                        },
+                        "ResourceType": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Application",
+                        "Resource",
+                        "ResourceType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceCatalogAppRegistry::ResourceAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::HttpNamespace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceDiscovery::HttpNamespace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Instance": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "InstanceAttributes": {
+                            "type": "object"
+                        },
+                        "InstanceId": {
+                            "type": "string"
+                        },
+                        "ServiceId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "InstanceAttributes",
+                        "ServiceId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceDiscovery::Instance"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PrivateDnsNamespace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Properties": {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::PrivateDnsNamespace.Properties"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Vpc": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Vpc"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceDiscovery::PrivateDnsNamespace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PrivateDnsNamespace.PrivateDnsPropertiesMutable": {
+            "additionalProperties": false,
+            "properties": {
+                "SOA": {
+                    "$ref": "#/definitions/AWS::ServiceDiscovery::PrivateDnsNamespace.SOA"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PrivateDnsNamespace.Properties": {
+            "additionalProperties": false,
+            "properties": {
+                "DnsProperties": {
+                    "$ref": "#/definitions/AWS::ServiceDiscovery::PrivateDnsNamespace.PrivateDnsPropertiesMutable"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PrivateDnsNamespace.SOA": {
+            "additionalProperties": false,
+            "properties": {
+                "TTL": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PublicDnsNamespace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "Properties": {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::PublicDnsNamespace.Properties"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceDiscovery::PublicDnsNamespace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PublicDnsNamespace.Properties": {
+            "additionalProperties": false,
+            "properties": {
+                "DnsProperties": {
+                    "$ref": "#/definitions/AWS::ServiceDiscovery::PublicDnsNamespace.PublicDnsPropertiesMutable"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PublicDnsNamespace.PublicDnsPropertiesMutable": {
+            "additionalProperties": false,
+            "properties": {
+                "SOA": {
+                    "$ref": "#/definitions/AWS::ServiceDiscovery::PublicDnsNamespace.SOA"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::PublicDnsNamespace.SOA": {
+            "additionalProperties": false,
+            "properties": {
+                "TTL": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Service": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "DnsConfig": {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::Service.DnsConfig"
+                        },
+                        "HealthCheckConfig": {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::Service.HealthCheckConfig"
+                        },
+                        "HealthCheckCustomConfig": {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::Service.HealthCheckCustomConfig"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "NamespaceId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::ServiceDiscovery::Service"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Service.DnsConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "DnsRecords": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::ServiceDiscovery::Service.DnsRecord"
+                    },
+                    "type": "array"
+                },
+                "NamespaceId": {
+                    "type": "string"
+                },
+                "RoutingPolicy": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DnsRecords"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Service.DnsRecord": {
+            "additionalProperties": false,
+            "properties": {
+                "TTL": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TTL",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Service.HealthCheckConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FailureThreshold": {
+                    "type": "number"
+                },
+                "ResourcePath": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::ServiceDiscovery::Service.HealthCheckCustomConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "FailureThreshold": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Signer::ProfilePermission": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Action": {
+                            "type": "string"
+                        },
+                        "Principal": {
+                            "type": "string"
+                        },
+                        "ProfileName": {
+                            "type": "string"
+                        },
+                        "ProfileVersion": {
+                            "type": "string"
+                        },
+                        "StatementId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Action",
+                        "Principal",
+                        "ProfileName",
+                        "StatementId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Signer::ProfilePermission"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Signer::SigningProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "PlatformId": {
+                            "type": "string"
+                        },
+                        "SignatureValidityPeriod": {
+                            "$ref": "#/definitions/AWS::Signer::SigningProfile.SignatureValidityPeriod"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "PlatformId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Signer::SigningProfile"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Signer::SigningProfile.SignatureValidityPeriod": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::StepFunctions::Activity": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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/AWS::StepFunctions::Activity.TagsEntry"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::StepFunctions::Activity"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::StepFunctions::Activity.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Definition": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.Definition"
+                        },
+                        "DefinitionS3Location": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.S3Location"
+                        },
+                        "DefinitionString": {
+                            "type": "string"
+                        },
+                        "DefinitionSubstitutions": {
+                            "additionalProperties": true,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "LoggingConfiguration": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.LoggingConfiguration"
+                        },
+                        "RoleArn": {
+                            "type": "string"
+                        },
+                        "StateMachineName": {
+                            "type": "string"
+                        },
+                        "StateMachineType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::StepFunctions::StateMachine.TagsEntry"
+                            },
+                            "type": "array"
+                        },
+                        "TracingConfiguration": {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine.TracingConfiguration"
+                        }
+                    },
+                    "required": [
+                        "RoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::StepFunctions::StateMachine"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.CloudWatchLogsLogGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "LogGroupArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.Definition": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.LogDestination": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchLogsLogGroup": {
+                    "$ref": "#/definitions/AWS::StepFunctions::StateMachine.CloudWatchLogsLogGroup"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Destinations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::StepFunctions::StateMachine.LogDestination"
+                    },
+                    "type": "array"
+                },
+                "IncludeExecutionData": {
+                    "type": "boolean"
+                },
+                "Level": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.S3Location": {
+            "additionalProperties": false,
+            "properties": {
+                "Bucket": {
+                    "type": "string"
+                },
+                "Key": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Bucket",
+                "Key"
+            ],
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.TagsEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::StepFunctions::StateMachine.TracingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "Enabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ArtifactConfig": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.ArtifactConfig"
+                        },
+                        "ArtifactS3Location": {
+                            "type": "string"
+                        },
+                        "Code": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.Code"
+                        },
+                        "ExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "FailureRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RunConfig": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.RunConfig"
+                        },
+                        "RuntimeVersion": {
+                            "type": "string"
+                        },
+                        "Schedule": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.Schedule"
+                        },
+                        "StartCanaryAfterCreation": {
+                            "type": "boolean"
+                        },
+                        "SuccessRetentionPeriod": {
+                            "type": "number"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VPCConfig": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.VPCConfig"
+                        },
+                        "VisualReference": {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary.VisualReference"
+                        }
+                    },
+                    "required": [
+                        "ArtifactS3Location",
+                        "Code",
+                        "ExecutionRoleArn",
+                        "Name",
+                        "RuntimeVersion",
+                        "Schedule",
+                        "StartCanaryAfterCreation"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Synthetics::Canary"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.ArtifactConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Encryption": {
+                    "$ref": "#/definitions/AWS::Synthetics::Canary.S3Encryption"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.BaseScreenshot": {
+            "additionalProperties": false,
+            "properties": {
+                "IgnoreCoordinates": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ScreenshotName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScreenshotName"
+            ],
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.Code": {
+            "additionalProperties": false,
+            "properties": {
+                "Handler": {
+                    "type": "string"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                },
+                "S3ObjectVersion": {
+                    "type": "string"
+                },
+                "Script": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Handler"
+            ],
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.RunConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "ActiveTracing": {
+                    "type": "boolean"
+                },
+                "EnvironmentVariables": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "MemoryInMB": {
+                    "type": "number"
+                },
+                "TimeoutInSeconds": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.S3Encryption": {
+            "additionalProperties": false,
+            "properties": {
+                "EncryptionMode": {
+                    "type": "string"
+                },
+                "KmsKeyArn": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.Schedule": {
+            "additionalProperties": false,
+            "properties": {
+                "DurationInSeconds": {
+                    "type": "string"
+                },
+                "Expression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Expression"
+            ],
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.VPCConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "SecurityGroupIds",
+                "SubnetIds"
+            ],
+            "type": "object"
+        },
+        "AWS::Synthetics::Canary.VisualReference": {
+            "additionalProperties": false,
+            "properties": {
+                "BaseCanaryRunId": {
+                    "type": "string"
+                },
+                "BaseScreenshots": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Synthetics::Canary.BaseScreenshot"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "BaseCanaryRunId"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::Database": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Timestream::Database"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ClientToken": {
+                            "type": "string"
+                        },
+                        "ErrorReportConfiguration": {
+                            "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.ErrorReportConfiguration"
+                        },
+                        "KmsKeyId": {
+                            "type": "string"
+                        },
+                        "NotificationConfiguration": {
+                            "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.NotificationConfiguration"
+                        },
+                        "QueryString": {
+                            "type": "string"
+                        },
+                        "ScheduleConfiguration": {
+                            "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.ScheduleConfiguration"
+                        },
+                        "ScheduledQueryExecutionRoleArn": {
+                            "type": "string"
+                        },
+                        "ScheduledQueryName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "TargetConfiguration": {
+                            "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.TargetConfiguration"
+                        }
+                    },
+                    "required": [
+                        "ErrorReportConfiguration",
+                        "NotificationConfiguration",
+                        "QueryString",
+                        "ScheduleConfiguration",
+                        "ScheduledQueryExecutionRoleArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Timestream::ScheduledQuery"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.DimensionMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "DimensionValueType": {
+                    "type": "string"
+                },
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DimensionValueType",
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.ErrorReportConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "S3Configuration": {
+                    "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.S3Configuration"
+                }
+            },
+            "required": [
+                "S3Configuration"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.MixedMeasureMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MeasureName": {
+                    "type": "string"
+                },
+                "MeasureValueType": {
+                    "type": "string"
+                },
+                "MultiMeasureAttributeMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.MultiMeasureAttributeMapping"
+                    },
+                    "type": "array"
+                },
+                "SourceColumn": {
+                    "type": "string"
+                },
+                "TargetMeasureName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MeasureValueType"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.MultiMeasureAttributeMapping": {
+            "additionalProperties": false,
+            "properties": {
+                "MeasureValueType": {
+                    "type": "string"
+                },
+                "SourceColumn": {
+                    "type": "string"
+                },
+                "TargetMultiMeasureAttributeName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MeasureValueType",
+                "SourceColumn"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.MultiMeasureMappings": {
+            "additionalProperties": false,
+            "properties": {
+                "MultiMeasureAttributeMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.MultiMeasureAttributeMapping"
+                    },
+                    "type": "array"
+                },
+                "TargetMultiMeasureName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MultiMeasureAttributeMappings"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.NotificationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "SnsConfiguration": {
+                    "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.SnsConfiguration"
+                }
+            },
+            "required": [
+                "SnsConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.S3Configuration": {
+            "additionalProperties": false,
+            "properties": {
+                "BucketName": {
+                    "type": "string"
+                },
+                "EncryptionOption": {
+                    "type": "string"
+                },
+                "ObjectKeyPrefix": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "BucketName"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.ScheduleConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ScheduleExpression": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ScheduleExpression"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.SnsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "TopicArn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "TopicArn"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.TargetConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "TimestreamConfiguration": {
+                    "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.TimestreamConfiguration"
+                }
+            },
+            "required": [
+                "TimestreamConfiguration"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::ScheduledQuery.TimestreamConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DatabaseName": {
+                    "type": "string"
+                },
+                "DimensionMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.DimensionMapping"
+                    },
+                    "type": "array"
+                },
+                "MeasureNameColumn": {
+                    "type": "string"
+                },
+                "MixedMeasureMappings": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.MixedMeasureMapping"
+                    },
+                    "type": "array"
+                },
+                "MultiMeasureMappings": {
+                    "$ref": "#/definitions/AWS::Timestream::ScheduledQuery.MultiMeasureMappings"
+                },
+                "TableName": {
+                    "type": "string"
+                },
+                "TimeColumn": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DatabaseName",
+                "DimensionMappings",
+                "TableName",
+                "TimeColumn"
+            ],
+            "type": "object"
+        },
+        "AWS::Timestream::Table": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "DatabaseName": {
+                            "type": "string"
+                        },
+                        "RetentionProperties": {
+                            "type": "object"
+                        },
+                        "TableName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DatabaseName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Timestream::Table"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Server": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Certificate": {
+                            "type": "string"
+                        },
+                        "Domain": {
+                            "type": "string"
+                        },
+                        "EndpointDetails": {
+                            "$ref": "#/definitions/AWS::Transfer::Server.EndpointDetails"
+                        },
+                        "EndpointType": {
+                            "type": "string"
+                        },
+                        "IdentityProviderDetails": {
+                            "$ref": "#/definitions/AWS::Transfer::Server.IdentityProviderDetails"
+                        },
+                        "IdentityProviderType": {
+                            "type": "string"
+                        },
+                        "LoggingRole": {
+                            "type": "string"
+                        },
+                        "ProtocolDetails": {
+                            "$ref": "#/definitions/AWS::Transfer::Server.ProtocolDetails"
+                        },
+                        "Protocols": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Server.Protocol"
+                            },
+                            "type": "array"
+                        },
+                        "SecurityPolicyName": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "WorkflowDetails": {
+                            "$ref": "#/definitions/AWS::Transfer::Server.WorkflowDetails"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Transfer::Server"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Server.EndpointDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "AddressAllocationIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SecurityGroupIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "SubnetIds": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "VpcEndpointId": {
+                    "type": "string"
+                },
+                "VpcId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Server.IdentityProviderDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "DirectoryId": {
+                    "type": "string"
+                },
+                "Function": {
+                    "type": "string"
+                },
+                "InvocationRole": {
+                    "type": "string"
+                },
+                "Url": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Server.Protocol": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::Transfer::Server.ProtocolDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "PassiveIp": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Transfer::Server.WorkflowDetail": {
+            "additionalProperties": false,
+            "properties": {
+                "ExecutionRole": {
+                    "type": "string"
+                },
+                "WorkflowId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ExecutionRole",
+                "WorkflowId"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Server.WorkflowDetails": {
+            "additionalProperties": false,
+            "properties": {
+                "OnUpload": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::Transfer::Server.WorkflowDetail"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "OnUpload"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::User": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "HomeDirectory": {
+                            "type": "string"
+                        },
+                        "HomeDirectoryMappings": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::User.HomeDirectoryMapEntry"
+                            },
+                            "type": "array"
+                        },
+                        "HomeDirectoryType": {
+                            "type": "string"
+                        },
+                        "Policy": {
+                            "type": "string"
+                        },
+                        "PosixProfile": {
+                            "$ref": "#/definitions/AWS::Transfer::User.PosixProfile"
+                        },
+                        "Role": {
+                            "type": "string"
+                        },
+                        "ServerId": {
+                            "type": "string"
+                        },
+                        "SshPublicKeys": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::User.SshPublicKey"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Role",
+                        "ServerId",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Transfer::User"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::User.HomeDirectoryMapEntry": {
+            "additionalProperties": false,
+            "properties": {
+                "Entry": {
+                    "type": "string"
+                },
+                "Target": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Entry",
+                "Target"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::User.PosixProfile": {
+            "additionalProperties": false,
+            "properties": {
+                "Gid": {
+                    "type": "number"
+                },
+                "SecondaryGids": {
+                    "items": {
+                        "type": "number"
+                    },
+                    "type": "array"
+                },
+                "Uid": {
+                    "type": "number"
+                }
+            },
+            "required": [
+                "Gid",
+                "Uid"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::User.SshPublicKey": {
+            "additionalProperties": false,
+            "properties": {},
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "OnExceptionSteps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
+                            },
+                            "type": "array"
+                        },
+                        "Steps": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::Transfer::Workflow.WorkflowStep"
+                            },
+                            "type": "array"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Steps"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Transfer::Workflow"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Transfer::Workflow.WorkflowStep": {
+            "additionalProperties": false,
+            "properties": {
+                "CopyStepDetails": {
+                    "type": "object"
+                },
+                "CustomStepDetails": {
+                    "type": "object"
+                },
+                "DeleteStepDetails": {
+                    "type": "object"
+                },
+                "TagStepDetails": {
+                    "type": "object"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAF::ByteMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ByteMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::ByteMatchSet.ByteMatchTuple"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::ByteMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::ByteMatchSet.ByteMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAF::ByteMatchSet.FieldToMatch"
+                },
+                "PositionalConstraint": {
+                    "type": "string"
+                },
+                "TargetString": {
+                    "type": "string"
+                },
+                "TargetStringBase64": {
+                    "type": "string"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "PositionalConstraint",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::ByteMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::IPSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "IPSetDescriptors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::IPSet.IPSetDescriptor"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::IPSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::IPSet.IPSetDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Predicates": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::Rule.Predicate"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MetricName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::Rule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::Rule.Predicate": {
+            "additionalProperties": false,
+            "properties": {
+                "DataId": {
+                    "type": "string"
+                },
+                "Negated": {
+                    "type": "boolean"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataId",
+                "Negated",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SizeConstraintSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SizeConstraints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::SizeConstraintSet.SizeConstraint"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "SizeConstraints"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::SizeConstraintSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SizeConstraintSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SizeConstraintSet.SizeConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAF::SizeConstraintSet.FieldToMatch"
+                },
+                "Size": {
+                    "type": "number"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "FieldToMatch",
+                "Size",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SqlInjectionMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SqlInjectionMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::SqlInjectionMatchSet.SqlInjectionMatchTuple"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::SqlInjectionMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SqlInjectionMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::SqlInjectionMatchSet.SqlInjectionMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAF::SqlInjectionMatchSet.FieldToMatch"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::WebACL": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "$ref": "#/definitions/AWS::WAF::WebACL.WafAction"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::WebACL.ActivatedRule"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DefaultAction",
+                        "MetricName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::WebACL"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::WebACL.ActivatedRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::WAF::WebACL.WafAction"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "RuleId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Priority",
+                "RuleId"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::WebACL.WafAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::XssMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "XssMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAF::XssMatchSet.XssMatchTuple"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "XssMatchTuples"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAF::XssMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::XssMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAF::XssMatchSet.XssMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAF::XssMatchSet.FieldToMatch"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::ByteMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ByteMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::ByteMatchSet.ByteMatchTuple"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::ByteMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::ByteMatchSet.ByteMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFRegional::ByteMatchSet.FieldToMatch"
+                },
+                "PositionalConstraint": {
+                    "type": "string"
+                },
+                "TargetString": {
+                    "type": "string"
+                },
+                "TargetStringBase64": {
+                    "type": "string"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "PositionalConstraint",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::ByteMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::GeoMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "GeoMatchConstraints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::GeoMatchSet.GeoMatchConstraint"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::GeoMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::GeoMatchSet.GeoMatchConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::IPSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "IPSetDescriptors": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::IPSet.IPSetDescriptor"
+                            },
+                            "type": "array"
+                        },
+                        "Name": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::IPSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::IPSet.IPSetDescriptor": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::RateBasedRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MatchPredicates": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::RateBasedRule.Predicate"
+                            },
+                            "type": "array"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RateKey": {
+                            "type": "string"
+                        },
+                        "RateLimit": {
+                            "type": "number"
+                        }
+                    },
+                    "required": [
+                        "MetricName",
+                        "Name",
+                        "RateKey",
+                        "RateLimit"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::RateBasedRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::RateBasedRule.Predicate": {
+            "additionalProperties": false,
+            "properties": {
+                "DataId": {
+                    "type": "string"
+                },
+                "Negated": {
+                    "type": "boolean"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataId",
+                "Negated",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::RegexPatternSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RegexPatternStrings": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "RegexPatternStrings"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::RegexPatternSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Predicates": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::Rule.Predicate"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "MetricName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::Rule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::Rule.Predicate": {
+            "additionalProperties": false,
+            "properties": {
+                "DataId": {
+                    "type": "string"
+                },
+                "Negated": {
+                    "type": "boolean"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "DataId",
+                "Negated",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SizeConstraintSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SizeConstraints": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::SizeConstraintSet.SizeConstraint"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::SizeConstraintSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SizeConstraintSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SizeConstraintSet.SizeConstraint": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFRegional::SizeConstraintSet.FieldToMatch"
+                },
+                "Size": {
+                    "type": "number"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "FieldToMatch",
+                "Size",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SqlInjectionMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "SqlInjectionMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::SqlInjectionMatchSet.SqlInjectionMatchTuple"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::SqlInjectionMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SqlInjectionMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::SqlInjectionMatchSet.SqlInjectionMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFRegional::SqlInjectionMatchSet.FieldToMatch"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::WebACL": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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": {
+                            "$ref": "#/definitions/AWS::WAFRegional::WebACL.Action"
+                        },
+                        "MetricName": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::WebACL.Rule"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "DefaultAction",
+                        "MetricName",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::WebACL"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::WebACL.Action": {
+            "additionalProperties": false,
+            "properties": {
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::WebACL.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::WAFRegional::WebACL.Action"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "RuleId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Action",
+                "Priority",
+                "RuleId"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::WebACLAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "WebACLId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourceArn",
+                        "WebACLId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::WebACLAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::XssMatchSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "XssMatchTuples": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFRegional::XssMatchSet.XssMatchTuple"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFRegional::XssMatchSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::XssMatchSet.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "Data": {
+                    "type": "string"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFRegional::XssMatchSet.XssMatchTuple": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFRegional::XssMatchSet.FieldToMatch"
+                },
+                "TextTransformation": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformation"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::IPSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Addresses": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "IPAddressVersion": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Scope": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "Addresses",
+                        "IPAddressVersion",
+                        "Scope"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::IPSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::LoggingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "LogDestinationConfigs": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "LoggingFilter": {
+                            "type": "object"
+                        },
+                        "RedactedFields": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFv2::LoggingConfiguration.FieldToMatch"
+                            },
+                            "type": "array"
+                        },
+                        "ResourceArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "LogDestinationConfigs",
+                        "ResourceArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::LoggingConfiguration"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::LoggingConfiguration.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "JsonBody": {
+                    "type": "object"
+                },
+                "Method": {
+                    "type": "object"
+                },
+                "QueryString": {
+                    "type": "object"
+                },
+                "SingleHeader": {
+                    "type": "object"
+                },
+                "UriPath": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RegexPatternSet": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "RegularExpressionList": {
+                            "items": {
+                                "type": "string"
+                            },
+                            "type": "array"
+                        },
+                        "Scope": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "RegularExpressionList",
+                        "Scope"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::RegexPatternSet"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "Capacity": {
+                            "type": "number"
+                        },
+                        "CustomResponseBodies": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.CustomResponseBody"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Scope": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VisibilityConfig": {
+                            "$ref": "#/definitions/AWS::WAFv2::RuleGroup.VisibilityConfig"
+                        }
+                    },
+                    "required": [
+                        "Capacity",
+                        "Scope",
+                        "VisibilityConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::RuleGroup"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.AndStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Statement"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Statements"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.ByteMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.FieldToMatch"
+                },
+                "PositionalConstraint": {
+                    "type": "string"
+                },
+                "SearchString": {
+                    "type": "string"
+                },
+                "SearchStringBase64": {
+                    "type": "string"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "PositionalConstraint",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.CustomResponseBody": {
+            "additionalProperties": false,
+            "properties": {
+                "Content": {
+                    "type": "string"
+                },
+                "ContentType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Content",
+                "ContentType"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "AllQueryArguments": {
+                    "type": "object"
+                },
+                "Body": {
+                    "type": "object"
+                },
+                "JsonBody": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.JsonBody"
+                },
+                "Method": {
+                    "type": "object"
+                },
+                "QueryString": {
+                    "type": "object"
+                },
+                "SingleHeader": {
+                    "type": "object"
+                },
+                "SingleQueryArgument": {
+                    "type": "object"
+                },
+                "UriPath": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.ForwardedIPConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FallbackBehavior": {
+                    "type": "string"
+                },
+                "HeaderName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FallbackBehavior",
+                "HeaderName"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.GeoMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "CountryCodes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.ForwardedIPConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.IPSetForwardedIPConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FallbackBehavior": {
+                    "type": "string"
+                },
+                "HeaderName": {
+                    "type": "string"
+                },
+                "Position": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FallbackBehavior",
+                "HeaderName",
+                "Position"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.IPSetReferenceStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "IPSetForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.IPSetForwardedIPConfiguration"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.JsonBody": {
+            "additionalProperties": false,
+            "properties": {
+                "InvalidFallbackBehavior": {
+                    "type": "string"
+                },
+                "MatchPattern": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.JsonMatchPattern"
+                },
+                "MatchScope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchPattern",
+                "MatchScope"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.JsonMatchPattern": {
+            "additionalProperties": false,
+            "properties": {
+                "All": {
+                    "type": "object"
+                },
+                "IncludedPaths": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.Label": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.LabelMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Scope"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.LabelSummary": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.NotStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Statement"
+                }
+            },
+            "required": [
+                "Statement"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.OrStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Statement"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Statements"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.RateBasedStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregateKeyType": {
+                    "type": "string"
+                },
+                "ForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.ForwardedIPConfiguration"
+                },
+                "Limit": {
+                    "type": "number"
+                },
+                "ScopeDownStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Statement"
+                }
+            },
+            "required": [
+                "AggregateKeyType",
+                "Limit"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.RegexPatternSetReferenceStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn",
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.RuleAction"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "RuleLabels": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Label"
+                    },
+                    "type": "array"
+                },
+                "Statement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.Statement"
+                },
+                "VisibilityConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.VisibilityConfig"
+                }
+            },
+            "required": [
+                "Name",
+                "Priority",
+                "Statement",
+                "VisibilityConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.RuleAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Allow": {
+                    "type": "object"
+                },
+                "Block": {
+                    "type": "object"
+                },
+                "Count": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.SizeConstraintStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.FieldToMatch"
+                },
+                "Size": {
+                    "type": "number"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "FieldToMatch",
+                "Size",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.SqliMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.Statement": {
+            "additionalProperties": false,
+            "properties": {
+                "AndStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.AndStatement"
+                },
+                "ByteMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.ByteMatchStatement"
+                },
+                "GeoMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.GeoMatchStatement"
+                },
+                "IPSetReferenceStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.IPSetReferenceStatement"
+                },
+                "LabelMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.LabelMatchStatement"
+                },
+                "NotStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.NotStatement"
+                },
+                "OrStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.OrStatement"
+                },
+                "RateBasedStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.RateBasedStatement"
+                },
+                "RegexPatternSetReferenceStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.RegexPatternSetReferenceStatement"
+                },
+                "SizeConstraintStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.SizeConstraintStatement"
+                },
+                "SqliMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.SqliMatchStatement"
+                },
+                "XssMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.XssMatchStatement"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.TextTransformation": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Priority",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.VisibilityConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "SampledRequestsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "CloudWatchMetricsEnabled",
+                "MetricName",
+                "SampledRequestsEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::RuleGroup.XssMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::RuleGroup.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::RuleGroup.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "CustomResponseBodies": {
+                            "additionalProperties": false,
+                            "patternProperties": {
+                                "^[a-zA-Z0-9]+$": {
+                                    "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomResponseBody"
+                                }
+                            },
+                            "type": "object"
+                        },
+                        "DefaultAction": {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL.DefaultAction"
+                        },
+                        "Description": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "Rules": {
+                            "items": {
+                                "$ref": "#/definitions/AWS::WAFv2::WebACL.Rule"
+                            },
+                            "type": "array"
+                        },
+                        "Scope": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "VisibilityConfig": {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL.VisibilityConfig"
+                        }
+                    },
+                    "required": [
+                        "DefaultAction",
+                        "Scope",
+                        "VisibilityConfig"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::WebACL"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.AllowAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomRequestHandling": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomRequestHandling"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.AndStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Statements"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.BlockAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomResponse": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomResponse"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.ByteMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.FieldToMatch"
+                },
+                "PositionalConstraint": {
+                    "type": "string"
+                },
+                "SearchString": {
+                    "type": "string"
+                },
+                "SearchStringBase64": {
+                    "type": "string"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "PositionalConstraint",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.CountAction": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomRequestHandling": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomRequestHandling"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.CustomHTTPHeader": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "Value"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.CustomRequestHandling": {
+            "additionalProperties": false,
+            "properties": {
+                "InsertHeaders": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomHTTPHeader"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "InsertHeaders"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.CustomResponse": {
+            "additionalProperties": false,
+            "properties": {
+                "CustomResponseBodyKey": {
+                    "type": "string"
+                },
+                "ResponseCode": {
+                    "type": "number"
+                },
+                "ResponseHeaders": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.CustomHTTPHeader"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ResponseCode"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.CustomResponseBody": {
+            "additionalProperties": false,
+            "properties": {
+                "Content": {
+                    "type": "string"
+                },
+                "ContentType": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Content",
+                "ContentType"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.DefaultAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Allow": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.AllowAction"
+                },
+                "Block": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.BlockAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.ExcludedRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.FieldToMatch": {
+            "additionalProperties": false,
+            "properties": {
+                "AllQueryArguments": {
+                    "type": "object"
+                },
+                "Body": {
+                    "type": "object"
+                },
+                "JsonBody": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.JsonBody"
+                },
+                "Method": {
+                    "type": "object"
+                },
+                "QueryString": {
+                    "type": "object"
+                },
+                "SingleHeader": {
+                    "type": "object"
+                },
+                "SingleQueryArgument": {
+                    "type": "object"
+                },
+                "UriPath": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.ForwardedIPConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FallbackBehavior": {
+                    "type": "string"
+                },
+                "HeaderName": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FallbackBehavior",
+                "HeaderName"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.GeoMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "CountryCodes": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                },
+                "ForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.ForwardedIPConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.IPSetForwardedIPConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "FallbackBehavior": {
+                    "type": "string"
+                },
+                "HeaderName": {
+                    "type": "string"
+                },
+                "Position": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "FallbackBehavior",
+                "HeaderName",
+                "Position"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.IPSetReferenceStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "IPSetForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.IPSetForwardedIPConfiguration"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.JsonBody": {
+            "additionalProperties": false,
+            "properties": {
+                "InvalidFallbackBehavior": {
+                    "type": "string"
+                },
+                "MatchPattern": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.JsonMatchPattern"
+                },
+                "MatchScope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "MatchPattern",
+                "MatchScope"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.JsonMatchPattern": {
+            "additionalProperties": false,
+            "properties": {
+                "All": {
+                    "type": "object"
+                },
+                "IncludedPaths": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.Label": {
+            "additionalProperties": false,
+            "properties": {
+                "Name": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.LabelMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Scope": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Scope"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.ManagedRuleGroupStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "ExcludedRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.ExcludedRule"
+                    },
+                    "type": "array"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "ScopeDownStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                },
+                "VendorName": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Name",
+                "VendorName"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.NotStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                }
+            },
+            "required": [
+                "Statement"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.OrStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Statements": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Statements"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.OverrideAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Count": {
+                    "type": "object"
+                },
+                "None": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.RateBasedStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "AggregateKeyType": {
+                    "type": "string"
+                },
+                "ForwardedIPConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.ForwardedIPConfiguration"
+                },
+                "Limit": {
+                    "type": "number"
+                },
+                "ScopeDownStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                }
+            },
+            "required": [
+                "AggregateKeyType",
+                "Limit"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.RegexPatternSetReferenceStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn",
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.Rule": {
+            "additionalProperties": false,
+            "properties": {
+                "Action": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.RuleAction"
+                },
+                "Name": {
+                    "type": "string"
+                },
+                "OverrideAction": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.OverrideAction"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "RuleLabels": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.Label"
+                    },
+                    "type": "array"
+                },
+                "Statement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.Statement"
+                },
+                "VisibilityConfig": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.VisibilityConfig"
+                }
+            },
+            "required": [
+                "Name",
+                "Priority",
+                "Statement",
+                "VisibilityConfig"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.RuleAction": {
+            "additionalProperties": false,
+            "properties": {
+                "Allow": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.AllowAction"
+                },
+                "Block": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.BlockAction"
+                },
+                "Count": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.CountAction"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.RuleGroupReferenceStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "Arn": {
+                    "type": "string"
+                },
+                "ExcludedRules": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.ExcludedRule"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "Arn"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.SizeConstraintStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "ComparisonOperator": {
+                    "type": "string"
+                },
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.FieldToMatch"
+                },
+                "Size": {
+                    "type": "number"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "ComparisonOperator",
+                "FieldToMatch",
+                "Size",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.SqliMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.Statement": {
+            "additionalProperties": false,
+            "properties": {
+                "AndStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.AndStatement"
+                },
+                "ByteMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.ByteMatchStatement"
+                },
+                "GeoMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.GeoMatchStatement"
+                },
+                "IPSetReferenceStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.IPSetReferenceStatement"
+                },
+                "LabelMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.LabelMatchStatement"
+                },
+                "ManagedRuleGroupStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.ManagedRuleGroupStatement"
+                },
+                "NotStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.NotStatement"
+                },
+                "OrStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.OrStatement"
+                },
+                "RateBasedStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.RateBasedStatement"
+                },
+                "RegexPatternSetReferenceStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.RegexPatternSetReferenceStatement"
+                },
+                "RuleGroupReferenceStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.RuleGroupReferenceStatement"
+                },
+                "SizeConstraintStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.SizeConstraintStatement"
+                },
+                "SqliMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.SqliMatchStatement"
+                },
+                "XssMatchStatement": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.XssMatchStatement"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.TextTransformation": {
+            "additionalProperties": false,
+            "properties": {
+                "Priority": {
+                    "type": "number"
+                },
+                "Type": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Priority",
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.VisibilityConfig": {
+            "additionalProperties": false,
+            "properties": {
+                "CloudWatchMetricsEnabled": {
+                    "type": "boolean"
+                },
+                "MetricName": {
+                    "type": "string"
+                },
+                "SampledRequestsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "required": [
+                "CloudWatchMetricsEnabled",
+                "MetricName",
+                "SampledRequestsEnabled"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACL.XssMatchStatement": {
+            "additionalProperties": false,
+            "properties": {
+                "FieldToMatch": {
+                    "$ref": "#/definitions/AWS::WAFv2::WebACL.FieldToMatch"
+                },
+                "TextTransformations": {
+                    "items": {
+                        "$ref": "#/definitions/AWS::WAFv2::WebACL.TextTransformation"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "FieldToMatch",
+                "TextTransformations"
+            ],
+            "type": "object"
+        },
+        "AWS::WAFv2::WebACLAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "WebACLArn": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "ResourceArn",
+                        "WebACLArn"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WAFv2::WebACLAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::Assistant": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "ServerSideEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Wisdom::Assistant.ServerSideEncryptionConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "Type": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "Name",
+                        "Type"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Wisdom::Assistant"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::Assistant.ServerSideEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Wisdom::AssistantAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AssistantId": {
+                            "type": "string"
+                        },
+                        "Association": {
+                            "$ref": "#/definitions/AWS::Wisdom::AssistantAssociation.AssociationData"
+                        },
+                        "AssociationType": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "AssistantId",
+                        "Association",
+                        "AssociationType"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Wisdom::AssistantAssociation"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::AssistantAssociation.AssociationData": {
+            "additionalProperties": false,
+            "properties": {
+                "KnowledgeBaseId": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "KnowledgeBaseId"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::KnowledgeBase": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "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"
+                        },
+                        "KnowledgeBaseType": {
+                            "type": "string"
+                        },
+                        "Name": {
+                            "type": "string"
+                        },
+                        "RenderingConfiguration": {
+                            "$ref": "#/definitions/AWS::Wisdom::KnowledgeBase.RenderingConfiguration"
+                        },
+                        "ServerSideEncryptionConfiguration": {
+                            "$ref": "#/definitions/AWS::Wisdom::KnowledgeBase.ServerSideEncryptionConfiguration"
+                        },
+                        "SourceConfiguration": {
+                            "$ref": "#/definitions/AWS::Wisdom::KnowledgeBase.SourceConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "KnowledgeBaseType",
+                        "Name"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::Wisdom::KnowledgeBase"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::KnowledgeBase.AppIntegrationsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AppIntegrationArn": {
+                    "type": "string"
+                },
+                "ObjectFields": {
+                    "items": {
+                        "type": "string"
+                    },
+                    "type": "array"
+                }
+            },
+            "required": [
+                "AppIntegrationArn",
+                "ObjectFields"
+            ],
+            "type": "object"
+        },
+        "AWS::Wisdom::KnowledgeBase.RenderingConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "TemplateUri": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Wisdom::KnowledgeBase.ServerSideEncryptionConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "KmsKeyId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::Wisdom::KnowledgeBase.SourceConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "AppIntegrations": {
+                    "$ref": "#/definitions/AWS::Wisdom::KnowledgeBase.AppIntegrationsConfiguration"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WorkSpaces::ConnectionAlias": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "ConnectionString": {
+                            "type": "string"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "required": [
+                        "ConnectionString"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WorkSpaces::ConnectionAlias"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::ConnectionAlias.ConnectionAliasAssociation": {
+            "additionalProperties": false,
+            "properties": {
+                "AssociatedAccountId": {
+                    "type": "string"
+                },
+                "AssociationStatus": {
+                    "type": "string"
+                },
+                "ConnectionIdentifier": {
+                    "type": "string"
+                },
+                "ResourceId": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::WorkSpaces::Workspace": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "BundleId": {
+                            "type": "string"
+                        },
+                        "DirectoryId": {
+                            "type": "string"
+                        },
+                        "RootVolumeEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "Tags": {
+                            "items": {
+                                "$ref": "#/definitions/Tag"
+                            },
+                            "type": "array"
+                        },
+                        "UserName": {
+                            "type": "string"
+                        },
+                        "UserVolumeEncryptionEnabled": {
+                            "type": "boolean"
+                        },
+                        "VolumeEncryptionKey": {
+                            "type": "string"
+                        },
+                        "WorkspaceProperties": {
+                            "$ref": "#/definitions/AWS::WorkSpaces::Workspace.WorkspaceProperties"
+                        }
+                    },
+                    "required": [
+                        "BundleId",
+                        "DirectoryId",
+                        "UserName"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::WorkSpaces::Workspace"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "AWS::WorkSpaces::Workspace.WorkspaceProperties": {
+            "additionalProperties": false,
+            "properties": {
+                "ComputeTypeName": {
+                    "type": "string"
+                },
+                "RootVolumeSizeGib": {
+                    "type": "number"
+                },
+                "RunningMode": {
+                    "type": "string"
+                },
+                "RunningModeAutoStopTimeoutInMinutes": {
+                    "type": "number"
+                },
+                "UserVolumeSizeGib": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::XRay::Group": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "FilterExpression": {
+                            "type": "string"
+                        },
+                        "GroupName": {
+                            "type": "string"
+                        },
+                        "InsightsConfiguration": {
+                            "$ref": "#/definitions/AWS::XRay::Group.InsightsConfiguration"
+                        },
+                        "Tags": {
+                            "items": {
+                                "type": "object"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::XRay::Group"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::XRay::Group.InsightsConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "InsightsEnabled": {
+                    "type": "boolean"
+                },
+                "NotificationsEnabled": {
+                    "type": "boolean"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::XRay::SamplingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "RuleName": {
+                            "type": "string"
+                        },
+                        "SamplingRule": {
+                            "$ref": "#/definitions/AWS::XRay::SamplingRule.SamplingRule"
+                        },
+                        "SamplingRuleRecord": {
+                            "$ref": "#/definitions/AWS::XRay::SamplingRule.SamplingRuleRecord"
+                        },
+                        "SamplingRuleUpdate": {
+                            "$ref": "#/definitions/AWS::XRay::SamplingRule.SamplingRuleUpdate"
+                        },
+                        "Tags": {
+                            "items": {
+                                "type": "object"
+                            },
+                            "type": "array"
+                        }
+                    },
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "AWS::XRay::SamplingRule"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "AWS::XRay::SamplingRule.SamplingRule": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "FixedRate": {
+                    "type": "number"
+                },
+                "HTTPMethod": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "ReservoirSize": {
+                    "type": "number"
+                },
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RuleARN": {
+                    "type": "string"
+                },
+                "RuleName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                },
+                "ServiceType": {
+                    "type": "string"
+                },
+                "URLPath": {
+                    "type": "string"
+                },
+                "Version": {
+                    "type": "number"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::XRay::SamplingRule.SamplingRuleRecord": {
+            "additionalProperties": false,
+            "properties": {
+                "CreatedAt": {
+                    "type": "string"
+                },
+                "ModifiedAt": {
+                    "type": "string"
+                },
+                "SamplingRule": {
+                    "$ref": "#/definitions/AWS::XRay::SamplingRule.SamplingRule"
+                }
+            },
+            "type": "object"
+        },
+        "AWS::XRay::SamplingRule.SamplingRuleUpdate": {
+            "additionalProperties": false,
+            "properties": {
+                "Attributes": {
+                    "additionalProperties": true,
+                    "patternProperties": {
+                        "^[a-zA-Z0-9]+$": {
+                            "type": "string"
+                        }
+                    },
+                    "type": "object"
+                },
+                "FixedRate": {
+                    "type": "number"
+                },
+                "HTTPMethod": {
+                    "type": "string"
+                },
+                "Host": {
+                    "type": "string"
+                },
+                "Priority": {
+                    "type": "number"
+                },
+                "ReservoirSize": {
+                    "type": "number"
+                },
+                "ResourceARN": {
+                    "type": "string"
+                },
+                "RuleARN": {
+                    "type": "string"
+                },
+                "RuleName": {
+                    "type": "string"
+                },
+                "ServiceName": {
+                    "type": "string"
+                },
+                "ServiceType": {
+                    "type": "string"
+                },
+                "URLPath": {
+                    "type": "string"
+                }
+            },
+            "type": "object"
+        },
+        "Alexa::ASK::Skill": {
+            "additionalProperties": false,
+            "properties": {
+                "DeletionPolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                },
+                "DependsOn": {
+                    "anyOf": [
+                        {
+                            "pattern": "^[a-zA-Z0-9]+$",
+                            "type": "string"
+                        },
+                        {
+                            "items": {
+                                "pattern": "^[a-zA-Z0-9]+$",
+                                "type": "string"
+                            },
+                            "type": "array"
+                        }
+                    ]
+                },
+                "Metadata": {
+                    "type": "object"
+                },
+                "Properties": {
+                    "additionalProperties": false,
+                    "properties": {
+                        "AuthenticationConfiguration": {
+                            "$ref": "#/definitions/Alexa::ASK::Skill.AuthenticationConfiguration"
+                        },
+                        "SkillPackage": {
+                            "$ref": "#/definitions/Alexa::ASK::Skill.SkillPackage"
+                        },
+                        "VendorId": {
+                            "type": "string"
+                        }
+                    },
+                    "required": [
+                        "AuthenticationConfiguration",
+                        "SkillPackage",
+                        "VendorId"
+                    ],
+                    "type": "object"
+                },
+                "Type": {
+                    "enum": [
+                        "Alexa::ASK::Skill"
+                    ],
+                    "type": "string"
+                },
+                "UpdateReplacePolicy": {
+                    "enum": [
+                        "Delete",
+                        "Retain",
+                        "Snapshot"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type",
+                "Properties"
+            ],
+            "type": "object"
+        },
+        "Alexa::ASK::Skill.AuthenticationConfiguration": {
+            "additionalProperties": false,
+            "properties": {
+                "ClientId": {
+                    "type": "string"
+                },
+                "ClientSecret": {
+                    "type": "string"
+                },
+                "RefreshToken": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "ClientId",
+                "ClientSecret",
+                "RefreshToken"
+            ],
+            "type": "object"
+        },
+        "Alexa::ASK::Skill.Overrides": {
+            "additionalProperties": false,
+            "properties": {
+                "Manifest": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "Alexa::ASK::Skill.SkillPackage": {
+            "additionalProperties": false,
+            "properties": {
+                "Overrides": {
+                    "$ref": "#/definitions/Alexa::ASK::Skill.Overrides"
+                },
+                "S3Bucket": {
+                    "type": "string"
+                },
+                "S3BucketRole": {
+                    "type": "string"
+                },
+                "S3Key": {
+                    "type": "string"
+                },
+                "S3ObjectVersion": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "S3Bucket",
+                "S3Key"
+            ],
+            "type": "object"
+        },
+        "Parameter": {
+            "additionalProperties": false,
+            "properties": {
+                "AllowedPattern": {
+                    "type": "string"
+                },
+                "AllowedValues": {
+                    "type": "array"
+                },
+                "ConstraintDescription": {
+                    "type": "string"
+                },
+                "Default": {
+                    "type": "string"
+                },
+                "Description": {
+                    "type": "string"
+                },
+                "MaxLength": {
+                    "type": "string"
+                },
+                "MaxValue": {
+                    "type": "string"
+                },
+                "MinLength": {
+                    "type": "string"
+                },
+                "MinValue": {
+                    "type": "string"
+                },
+                "NoEcho": {
+                    "type": [
+                        "string",
+                        "boolean"
+                    ]
+                },
+                "Type": {
+                    "enum": [
+                        "String",
+                        "Number",
+                        "List\u003cNumber\u003e",
+                        "CommaDelimitedList",
+                        "AWS::EC2::AvailabilityZone::Name",
+                        "AWS::EC2::Image::Id",
+                        "AWS::EC2::Instance::Id",
+                        "AWS::EC2::KeyPair::KeyName",
+                        "AWS::EC2::SecurityGroup::GroupName",
+                        "AWS::EC2::SecurityGroup::Id",
+                        "AWS::EC2::Subnet::Id",
+                        "AWS::EC2::Volume::Id",
+                        "AWS::EC2::VPC::Id",
+                        "AWS::Route53::HostedZone::Id",
+                        "List\u003cAWS::EC2::AvailabilityZone::Name\u003e",
+                        "List\u003cAWS::EC2::Image::Id\u003e",
+                        "List\u003cAWS::EC2::Instance::Id\u003e",
+                        "List\u003cAWS::EC2::SecurityGroup::GroupName\u003e",
+                        "List\u003cAWS::EC2::SecurityGroup::Id\u003e",
+                        "List\u003cAWS::EC2::Subnet::Id\u003e",
+                        "List\u003cAWS::EC2::Volume::Id\u003e",
+                        "List\u003cAWS::EC2::VPC::Id\u003e",
+                        "List\u003cAWS::Route53::HostedZone::Id\u003e",
+                        "List\u003cString\u003e",
+                        "AWS::SSM::Parameter::Name",
+                        "AWS::SSM::Parameter::Value\u003cString\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cString\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cCommaDelimitedList\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::AvailabilityZone::Name\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::Image::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::Instance::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::SecurityGroup::GroupName\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::SecurityGroup::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::Subnet::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::Volume::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::EC2::VPC::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cAWS::Route53::HostedZone::Id\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::AvailabilityZone::Name\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::Image::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::Instance::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::SecurityGroup::GroupName\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::SecurityGroup::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::Subnet::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::Volume::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::EC2::VPC::Id\u003e\u003e",
+                        "AWS::SSM::Parameter::Value\u003cList\u003cAWS::Route53::HostedZone::Id\u003e\u003e"
+                    ],
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Type"
+            ],
+            "type": "object"
+        },
+        "Tag": {
+            "additionalProperties": false,
+            "properties": {
+                "Key": {
+                    "type": "string"
+                },
+                "Value": {
+                    "type": "string"
+                }
+            },
+            "required": [
+                "Key",
+                "Value"
+            ],
+            "type": "object"
+        }
+    },
+    "properties": {
+        "AWSTemplateFormatVersion": {
+            "enum": [
+                "2010-09-09"
+            ],
+            "type": "string"
+        },
+        "Conditions": {
+            "additionalProperties": false,
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "Description": {
+            "description": "Template description",
+            "maxLength": 1024,
+            "type": "string"
+        },
+        "Mappings": {
+            "additionalProperties": false,
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "Metadata": {
+            "type": "object"
+        },
+        "Outputs": {
+            "additionalProperties": false,
+            "maxProperties": 60,
+            "minProperties": 1,
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "type": "object"
+                }
+            },
+            "type": "object"
+        },
+        "Parameters": {
+            "additionalProperties": false,
+            "maxProperties": 50,
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "$ref": "#/definitions/Parameter"
+                }
+            },
+            "type": "object"
+        },
+        "Resources": {
+            "additionalProperties": false,
+            "patternProperties": {
+                "^[a-zA-Z0-9]+$": {
+                    "anyOf": [
+                        {
+                            "$ref": "#/definitions/AWS::ACMPCA::Certificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthority"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ACMPCA::CertificateAuthorityActivation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ACMPCA::Permission"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::APS::RuleGroupsNamespace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::APS::Workspace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AccessAnalyzer::Analyzer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Broker"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AmazonMQ::Configuration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AmazonMQ::ConfigurationAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Amplify::App"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Amplify::Branch"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Amplify::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AmplifyUIBuilder::Component"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AmplifyUIBuilder::Theme"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Account"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::ApiKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Authorizer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::BasePathMapping"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::ClientCertificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Deployment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::DocumentationPart"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::DocumentationVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::DomainName"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::GatewayResponse"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Method"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Model"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::RequestValidator"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Resource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::RestApi"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::Stage"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::UsagePlan"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::UsagePlanKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGateway::VpcLink"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Api"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::ApiGatewayManagedOverrides"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::ApiMapping"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Authorizer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Deployment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::DomainName"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Integration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::IntegrationResponse"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Model"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Route"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::RouteResponse"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::Stage"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApiGatewayV2::VpcLink"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::ConfigurationProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::Deployment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::DeploymentStrategy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::Environment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppConfig::HostedConfigurationVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppFlow::ConnectorProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppFlow::Flow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppIntegrations::EventIntegration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::GatewayRoute"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::Mesh"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::Route"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualNode"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualRouter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppMesh::VirtualService"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppRunner::Service"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::AppBlock"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::ApplicationFleetAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::DirectoryConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::Fleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::ImageBuilder"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::Stack"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::StackFleetAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::StackUserAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppStream::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::ApiCache"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::ApiKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::DataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::FunctionConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLApi"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::GraphQLSchema"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AppSync::Resolver"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalableTarget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApplicationAutoScaling::ScalingPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ApplicationInsights::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Athena::DataCatalog"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Athena::NamedQuery"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Athena::PreparedStatement"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Athena::WorkGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AuditManager::Assessment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::AutoScalingGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::LaunchConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::LifecycleHook"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::ScalingPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::ScheduledAction"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScaling::WarmPool"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::AutoScalingPlans::ScalingPlan"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Backup::BackupPlan"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Backup::BackupSelection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Backup::BackupVault"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Backup::Framework"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Backup::ReportPlan"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Batch::ComputeEnvironment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Batch::JobDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Batch::JobQueue"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Batch::SchedulingPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Budgets::Budget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Budgets::BudgetsAction"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CE::AnomalyMonitor"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CE::AnomalySubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CE::CostCategory"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CUR::ReportDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cassandra::Keyspace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cassandra::Table"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CertificateManager::Account"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CertificateManager::Certificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Chatbot::SlackChannelConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cloud9::EnvironmentEC2"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::CustomResource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::Macro"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::ModuleDefaultVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::ModuleVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::PublicTypeVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::Publisher"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::ResourceDefaultVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::ResourceVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::Stack"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::StackSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::TypeActivation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::WaitCondition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFormation::WaitConditionHandle"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::CachePolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::CloudFrontOriginAccessIdentity"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::Distribution"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::Function"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::KeyGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::OriginRequestPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::PublicKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::RealtimeLogConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::ResponseHeadersPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudFront::StreamingDistribution"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudTrail::Trail"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::Alarm"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::AnomalyDetector"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::CompositeAlarm"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::Dashboard"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::InsightRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CloudWatch::MetricStream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeArtifact::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeArtifact::Repository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeBuild::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeBuild::ReportGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeBuild::SourceCredential"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeCommit::Repository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeDeploy::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeDeploy::DeploymentGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeGuruProfiler::ProfilingGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeGuruReviewer::RepositoryAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodePipeline::CustomActionType"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodePipeline::Pipeline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodePipeline::Webhook"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeStar::GitHubRepository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeStarConnections::Connection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CodeStarNotifications::NotificationRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::IdentityPool"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::IdentityPoolRoleAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPool"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolClient"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolDomain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolIdentityProvider"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolResourceServer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolRiskConfigurationAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolUICustomizationAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolUser"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Cognito::UserPoolUserToGroupAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::AggregationAuthorization"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::ConfigRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::ConfigurationAggregator"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::ConfigurationRecorder"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::ConformancePack"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::DeliveryChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::OrganizationConfigRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::OrganizationConformancePack"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::RemediationConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Config::StoredQuery"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::ContactFlow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::ContactFlowModule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::HoursOfOperation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::QuickConnect"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Connect::UserHierarchyGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CustomerProfiles::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CustomerProfiles::Integration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::CustomerProfiles::ObjectType"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DAX::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DAX::ParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DAX::SubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DLM::LifecyclePolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::Certificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::Endpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::EventSubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::ReplicationInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::ReplicationSubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DMS::ReplicationTask"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Dataset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Job"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Recipe"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Ruleset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataBrew::Schedule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataPipeline::Pipeline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::Agent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationEFS"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationFSxWindows"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationHDFS"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationNFS"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationObjectStorage"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationS3"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::LocationSMB"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DataSync::Task"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Detective::Graph"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Detective::MemberInvitation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DevOpsGuru::NotificationChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DevOpsGuru::ResourceCollection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DirectoryService::MicrosoftAD"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DirectoryService::SimpleAD"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DocDB::DBCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DocDB::DBClusterParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DocDB::DBInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DocDB::DBSubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DynamoDB::GlobalTable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::DynamoDB::Table"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::CapacityReservation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::CapacityReservationFleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::CarrierGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnAuthorizationRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnRoute"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::ClientVpnTargetNetworkAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::CustomerGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::DHCPOptions"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::EC2Fleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::EIP"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::EIPAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::EgressOnlyInternetGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::EnclaveCertificateIamRoleAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::FlowLog"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::GatewayRouteTableAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::Host"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::IPAM"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::IPAMAllocation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::IPAMPool"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::IPAMScope"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::Instance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::InternetGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::LaunchTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::LocalGatewayRoute"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::LocalGatewayRouteTableVPCAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NatGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkAcl"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkAclEntry"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkInsightsAnalysis"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkInsightsPath"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkInterface"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkInterfaceAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::NetworkInterfacePermission"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::PlacementGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::PrefixList"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::Route"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::RouteTable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SecurityGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SecurityGroupEgress"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SecurityGroupIngress"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SpotFleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::Subnet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SubnetCidrBlock"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SubnetNetworkAclAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::SubnetRouteTableAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorFilterRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorSession"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TrafficMirrorTarget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayConnect"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayMulticastDomain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayMulticastDomainAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayMulticastGroupMember"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayMulticastGroupSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayPeeringAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayRoute"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayRouteTable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayRouteTableAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayRouteTablePropagation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::TransitGatewayVpcAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPC"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCCidrBlock"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCDHCPOptionsAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCEndpointConnectionNotification"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCEndpointService"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCEndpointServicePermissions"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCGatewayAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPCPeeringConnection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPNConnection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPNConnectionRoute"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPNGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VPNGatewayRoutePropagation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::Volume"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EC2::VolumeAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECR::PublicRepository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECR::RegistryPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECR::ReplicationConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECR::Repository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::CapacityProvider"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::ClusterCapacityProviderAssociations"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::PrimaryTaskSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::Service"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::TaskDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ECS::TaskSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EFS::AccessPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EFS::FileSystem"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EFS::MountTarget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EKS::Addon"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EKS::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EKS::FargateProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EKS::Nodegroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::InstanceFleetConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::InstanceGroupConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::SecurityConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::Step"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::Studio"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMR::StudioSessionMapping"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EMRContainers::VirtualCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::CacheCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::GlobalReplicationGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::ParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::ReplicationGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::SecurityGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::SecurityGroupIngress"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::SubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElastiCache::UserGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::ApplicationVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::ConfigurationTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticBeanstalk::Environment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancing::LoadBalancer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::Listener"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerCertificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::ListenerRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::LoadBalancer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ElasticLoadBalancingV2::TargetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Elasticsearch::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EventSchemas::Discoverer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EventSchemas::Registry"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EventSchemas::RegistryPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::EventSchemas::Schema"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::ApiDestination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::Archive"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::Connection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::EventBus"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::EventBusPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Events::Rule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Evidently::Experiment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Evidently::Feature"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Evidently::Launch"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Evidently::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FIS::ExperimentTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FMS::NotificationChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FMS::Policy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FSx::FileSystem"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FinSpace::Environment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::Detector"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::EntityType"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::EventType"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::Label"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::Outcome"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::FraudDetector::Variable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::Alias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::Build"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::Fleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::GameServerGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::GameSessionQueue"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::MatchmakingConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::MatchmakingRuleSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GameLift::Script"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GlobalAccelerator::Accelerator"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GlobalAccelerator::EndpointGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GlobalAccelerator::Listener"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Classifier"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Connection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Crawler"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::DataCatalogEncryptionSettings"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Database"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::DevEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Job"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::MLTransform"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Partition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Registry"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Schema"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::SchemaVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::SchemaVersionMetadata"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::SecurityConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Table"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Trigger"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Glue::Workflow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::ConnectorDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::ConnectorDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::CoreDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::CoreDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::DeviceDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::DeviceDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::FunctionDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::FunctionDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::Group"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::GroupVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::LoggerDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::LoggerDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::ResourceDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::ResourceDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::SubscriptionDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Greengrass::SubscriptionDefinitionVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GreengrassV2::ComponentVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GroundStation::Config"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GroundStation::DataflowEndpointGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GroundStation::MissionProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::Detector"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::Filter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::IPSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::Master"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::Member"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::GuardDuty::ThreatIntelSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::HealthLake::FHIRDatastore"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::AccessKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::Group"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::InstanceProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::ManagedPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::OIDCProvider"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::Policy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::Role"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::SAMLProvider"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::ServerCertificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::ServiceLinkedRole"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::UserToGroupAddition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IAM::VirtualMFADevice"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::Channel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::PlaybackKeyPair"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::RecordingConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IVS::StreamKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::Component"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ContainerRecipe"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::DistributionConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::Image"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ImagePipeline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::ImageRecipe"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ImageBuilder::InfrastructureConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Inspector::AssessmentTarget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Inspector::AssessmentTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Inspector::ResourceGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT1Click::Device"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT1Click::Placement"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT1Click::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::AccountAuditConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Authorizer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Certificate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::CustomMetric"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Dimension"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::DomainConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::FleetMetric"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::JobTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Logging"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::MitigationAction"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Policy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::PolicyPrincipalAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::ProvisioningTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::ResourceSpecificLogging"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::ScheduledAudit"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::SecurityProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::Thing"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::ThingPrincipalAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::TopicRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoT::TopicRuleDestination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Channel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Dataset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Datastore"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTAnalytics::Pipeline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTCoreDeviceAdvisor::SuiteDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTEvents::DetectorModel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTEvents::Input"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTFleetHub::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::AccessPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Asset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::AssetModel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Dashboard"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Gateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Portal"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTSiteWise::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTThingsGraph::FlowTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::Destination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::DeviceProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::FuotaTask"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::MulticastGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::PartnerAccount"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::ServiceProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::TaskDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::WirelessDevice"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::IoTWireless::WirelessGateway"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KMS::Alias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KMS::Key"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KMS::ReplicaKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Kendra::DataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Kendra::Faq"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Kendra::Index"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Kinesis::Stream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Kinesis::StreamConsumer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalytics::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationOutput"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalytics::ApplicationReferenceDataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationCloudWatchLoggingOption"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationOutput"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisAnalyticsV2::ApplicationReferenceDataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::KinesisFirehose::DeliveryStream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LakeFormation::DataLakeSettings"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LakeFormation::Permissions"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LakeFormation::Resource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::Alias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::CodeSigningConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::EventInvokeConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::EventSourceMapping"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::Function"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::LayerVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::LayerVersionPermission"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::Permission"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lambda::Version"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LicenseManager::Grant"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LicenseManager::License"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lightsail::Database"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lightsail::Disk"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lightsail::Instance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Lightsail::StaticIp"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::GeofenceCollection"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::Map"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::PlaceIndex"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::RouteCalculator"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::Tracker"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Location::TrackerConsumer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::Destination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::LogGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::LogStream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::MetricFilter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::QueryDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::ResourcePolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Logs::SubscriptionFilter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LookoutEquipment::InferenceScheduler"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LookoutMetrics::Alert"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LookoutMetrics::AnomalyDetector"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::LookoutVision::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MSK::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MWAA::Environment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Macie::CustomDataIdentifier"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Macie::FindingsFilter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Macie::Session"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ManagedBlockchain::Member"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ManagedBlockchain::Node"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConnect::Flow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowEntitlement"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowOutput"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConnect::FlowVpcInterface"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConvert::JobTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConvert::Preset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaConvert::Queue"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::Channel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::Input"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaLive::InputSecurityGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaPackage::Asset"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaPackage::Channel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaPackage::OriginEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaPackage::PackagingGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MediaStore::Container"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MemoryDB::ACL"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MemoryDB::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MemoryDB::ParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MemoryDB::SubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::MemoryDB::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::DBCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::DBClusterParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::DBInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::DBParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Neptune::DBSubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::Firewall"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::FirewallPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::LoggingConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkFirewall::RuleGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::CustomerGatewayAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::Device"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::GlobalNetwork"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::Link"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::LinkAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::Site"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NetworkManager::TransitGatewayRegistration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NimbleStudio::LaunchProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NimbleStudio::StreamingImage"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NimbleStudio::Studio"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::NimbleStudio::StudioComponent"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpenSearchService::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::App"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::ElasticLoadBalancerAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::Instance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::Layer"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::Stack"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::UserProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorks::Volume"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::OpsWorksCM::Server"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Panorama::ApplicationInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Panorama::Package"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Panorama::PackageVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::ADMChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::APNSChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::APNSSandboxChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::APNSVoipChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::APNSVoipSandboxChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::App"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::ApplicationSettings"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::BaiduChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::Campaign"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::EmailChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::EmailTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::EventStream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::GCMChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::InAppTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::PushTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::SMSChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::Segment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::SmsTemplate"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Pinpoint::VoiceChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PinpointEmail::ConfigurationSetEventDestination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PinpointEmail::DedicatedIpPool"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::PinpointEmail::Identity"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QLDB::Ledger"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QLDB::Stream"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Analysis"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Dashboard"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::DataSource"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Template"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::QuickSight::Theme"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RAM::ResourceShare"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBClusterParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBProxy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBProxyEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBProxyTargetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBSecurityGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBSecurityGroupIngress"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::DBSubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::EventSubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::GlobalCluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RDS::OptionGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RUM::AppMonitor"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::ClusterParameterGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::ClusterSecurityGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::ClusterSecurityGroupIngress"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::ClusterSubnetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::EndpointAccess"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::EndpointAuthorization"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::EventSubscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Redshift::ScheduledAction"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Environment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Route"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RefactorSpaces::Service"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Rekognition::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ResilienceHub::App"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ResilienceHub::ResiliencyPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ResourceGroups::Group"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::Fleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::Robot"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::RobotApplication"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::RobotApplicationVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::SimulationApplication"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::RoboMaker::SimulationApplicationVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::DNSSEC"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::HealthCheck"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::HostedZone"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::KeySigningKey"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::RecordSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53::RecordSetGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::Cluster"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::ControlPanel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::RoutingControl"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryControl::SafetyRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryReadiness::Cell"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ReadinessCheck"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryReadiness::RecoveryGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53RecoveryReadiness::ResourceSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::FirewallDomainList"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::FirewallRuleGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::FirewallRuleGroupAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverDNSSECConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverEndpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverQueryLoggingConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverQueryLoggingConfigAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Route53Resolver::ResolverRuleAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::AccessPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::Bucket"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::BucketPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::MultiRegionAccessPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::MultiRegionAccessPointPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3::StorageLens"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3ObjectLambda::AccessPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3ObjectLambda::AccessPointPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3Outposts::AccessPoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3Outposts::Bucket"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3Outposts::BucketPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::S3Outposts::Endpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SDB::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ConfigurationSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ConfigurationSetEventDestination"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ContactList"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ReceiptFilter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ReceiptRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::ReceiptRuleSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SES::Template"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SNS::Subscription"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SNS::Topic"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SNS::TopicPolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SQS::Queue"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SQS::QueuePolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::Association"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::Document"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::MaintenanceWindow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTarget"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::MaintenanceWindowTask"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::Parameter"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::PatchBaseline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSM::ResourceDataSync"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSMContacts::Contact"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSMContacts::ContactChannel"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSMIncidents::ReplicationSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSMIncidents::ResponsePlan"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::Assignment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::InstanceAccessControlAttributeConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SSO::PermissionSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::App"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::AppImageConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::CodeRepository"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::DataQualityJobDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Device"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::DeviceFleet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Domain"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Endpoint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::EndpointConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::FeatureGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Image"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::ImageVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Model"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelBiasJobDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelExplainabilityJobDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelPackageGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::ModelQualityJobDefinition"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::MonitoringSchedule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::NotebookInstance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::NotebookInstanceLifecycleConfig"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Pipeline"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Project"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::UserProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SageMaker::Workteam"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecretsManager::ResourcePolicy"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecretsManager::RotationSchedule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecretsManager::Secret"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecretsManager::SecretTargetAttachment"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::SecurityHub::Hub"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Api"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::Function"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::LayerVersion"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::SimpleTable"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Serverless::StateMachine"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::AcceptedPortfolioShare"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::CloudFormationProduct"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::CloudFormationProvisionedProduct"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::LaunchNotificationConstraint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::LaunchRoleConstraint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::LaunchTemplateConstraint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::Portfolio"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::PortfolioPrincipalAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::PortfolioProductAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::PortfolioShare"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::ResourceUpdateConstraint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::ServiceAction"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::ServiceActionAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::StackSetConstraint"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::TagOption"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalog::TagOptionAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalogAppRegistry::Application"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalogAppRegistry::AttributeGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalogAppRegistry::AttributeGroupAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceCatalogAppRegistry::ResourceAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::HttpNamespace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::Instance"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::PrivateDnsNamespace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::PublicDnsNamespace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::ServiceDiscovery::Service"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Signer::ProfilePermission"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Signer::SigningProfile"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::StepFunctions::Activity"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::StepFunctions::StateMachine"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Synthetics::Canary"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Timestream::Database"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Timestream::ScheduledQuery"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Timestream::Table"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Transfer::Server"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Transfer::User"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Transfer::Workflow"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::ByteMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::IPSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::Rule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::SizeConstraintSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::SqlInjectionMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::WebACL"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAF::XssMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::ByteMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::GeoMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::IPSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::RateBasedRule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::RegexPatternSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::Rule"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::SizeConstraintSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::SqlInjectionMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::WebACL"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::WebACLAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFRegional::XssMatchSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::IPSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::LoggingConfiguration"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::RegexPatternSet"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::RuleGroup"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACL"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WAFv2::WebACLAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Wisdom::Assistant"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Wisdom::AssistantAssociation"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::Wisdom::KnowledgeBase"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WorkSpaces::ConnectionAlias"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::WorkSpaces::Workspace"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::XRay::Group"
+                        },
+                        {
+                            "$ref": "#/definitions/AWS::XRay::SamplingRule"
+                        },
+                        {
+                            "$ref": "#/definitions/Alexa::ASK::Skill"
+                        }
+                    ]
+                }
+            },
+            "type": "object"
+        },
+        "Transform": {
+            "enum": [
+                "AWS::Serverless-2016-10-31"
+            ],
+            "type": "string"
+        }
+    },
+    "required": [
+        "Transform",
+        "Resources"
+    ],
+    "type": "object"
+}
\ No newline at end of file
diff --git a/goformation/static/logo.png b/goformation/static/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..5d518b7b592ce4488483709f5dbf023579f5a519
GIT binary patch
literal 195275
zcmd?Q^;?wP7dI*@QVI;+F?4q~3?Lxg4MTT#DLJ%sODK(Wr*yY;Hwe<5XRPP_p6fc-
z`wtv`81A`e=h`bjYwb`4ImtJOc!<xQJ$obd7Nqp-*(>2^&z?Vne+7LrkDoOQ{fFx;
zuHmd~XX@-`=xFjx#MlmOLLy~jXl9~hVrcB)&~L*3?AeQ33l$A#4cT|RMs_xghQHb{
zy4%=8dp~=|FXV1-Xk=yLOaeABv#=Ea9yPTANi2*7fa)Bw%(C`kCgv7zJsnMyJ>^u4
zJgtm)jDbReB>e8Y&;e{roDE6bZLDpbc-;knzsKc;KL2{n1SI+0#Mw#!_-9cXvI-<(
zc8(?_9E_X{Ml9?cBwRd<ESzlYJUsLytjsLjOw8O&ENl!coV@JJysWGwfB%5c*&K~c
zd6hsCf9HaJ69Ae!JKOUzF}b<9F}kra+BuprvGDNlFfp?-v9dBiTQE3z*g6}!GuS$j
z{Tl&f;$-A#Vef2VXG`*HL_@Hhi?aX_y3#*eu(6kw{cm7fr@w@Pl8njS(4L8fk(tTH
z=GVS{w{~(?GWkEt`2TF}q~c+3!lY#4War{&1U(N^vVWbSwEMqL^sk|@(SPmiT^y}{
z@6*_b$;8^k#>Cdy3A!kj-z$QyoLAn_0(yXk)*w40mtVh1fdqgqE*8eT93WO^ZXQ;4
z9yU=4kSGfa4-2~pHwO<hh>eAVnOlte*JQs2_}`AuH;l&6zG7_9M(iS@%pBqzEG*)p
zq8yy;V&d!~JmTUaATCyse|@EFotzDAjZA(``m3+S|LH68f9=aF=4fK*Z0D$AXJ`G7
zRivz~U7Va9f4wFV6C+_|V`L$rmNhi8uywX`GN<`<o_|+t;%MP&Vl3fkXG8M)KzJ?w
zXC1#c&%(jY&S}KM%D`&MWy)a4&ThnD$PMOVFl6E2VCP`wH0Cj81ODx7{6CcYM*wzK
zunE|Rhl7EKm4}moozwW&69+p3*x1m-ki`Vd!OF}AWP+~9*ofEJ!r9v7FT09ZJO6#M
zw)n*|yw--cW>DHN7@L?Hx>!2{1<mYC?Hp|kf3YJ!(=UFswt)8d{q(0Z)Bg<l`}O}Y
z@V}N&srdEypEyFl{3p;RwooZ{go^8zDY(mL&o9lSKq4yc^9LDl?=h$59y1$k?igFh
zWMM>LK^U+q3haopGWXz!_S8|PP#Q`+BQW?p6NjS~M<#+}92AEGD|>*43Ba&^4>{L!
zGaOu6*!IiIOyP05Vgv+S-^b3hxE&6qu(6pjHtnQb`LOHGh`^HuqKf|aQAq{ZpdtC+
zH==!?UcvrPi(hRI92B1Yzq*O`5yAcctr599;$O1yN$G&N0B{f-h8(rP*6_>R&{@)T
zS-?@4IaUmo;;PACdKP3o`%7q=AWOiK_-m|+GKeBDI1Gn6XVPpIMeKN%8k`291Vp;x
z9M#QMU?yrP*|n{_mSMK2NHTNhLHJGbxwCO+-5t%pV{+r5NVxzixahNu{M<z)nE;rX
zRU0gis}?~No;afYlo~k@(x?*5iuuO|i7r|VaK9_S0~z+uG6Yxto#H0aZQXkaGVrzo
zjXPop`E&e~Fdy&izIP0>v?Xo|c`zy%0wfOCpa&O1D1e;b(3JmfJTpYdlluK1=BVs7
zGPc3dBfR^D#+zP(yy1hQp-1$ETjH{h6%Y;@!aVsv7_1PxvG<2>jIRQo{~g2&nMK2w
z;K2ZaAb5<0K#iwZu-u!!FF$0B3TzxY1UM;z%mEVvwyOR#pJVt(#l9VMv7ucCFg$%l
zCyhP_d?I}8D$VT>OT_dF_DK#Tr92RTSBn07tEc+@|7L6AN+=&t!PO)P{#McUFi)*N
zr3~VcAGZxX2}x80?jr#FFi$?UMEu#)DXs|2A6fXg1P7gr37iZ)Fo}-S17=o%BG;WL
zE)EWG?<HZ=Aqw`J-PsCsB@>g(-u+a}lST*}h@S$C6vF#wzfDAle^2cGiWxfp^IiZD
zIfTOfyw^5;N|734?E5TaYcOeJBU-5E?x-b1JRA#rvfe#gZxNTUktKz{o9LdsP}b=e
z6PT2?zrS|z>J83&m=|z4m6d3Oe6FCQWuLKJD|K=-2bFmBtj4@oON}mKJB+%h(cK^4
zQ7Y;wesK4$J9XD*T0a6llC0Y>)BW9+?tii^sI3I-2}`D3H`kaWYBJFhb5cg<w3!bK
zLc&V+?`=97=?%lAD|g<bnr-$#s<m5*^1t>1=2_&;qDB{6OA?58-87M9MZHYiTldp4
z7YMiJ4A2oIR#FC6B-1$J_!JZr2#b60psl-@m;|M8Otg5RR5TOR)YR<GlnHrW?HRQm
zEq~>^MZqz!RaVuF1g*2x$o7Z2%XWzYA7M;`{vJo6*uUc#4Tb@ZU^rmWcb+Z<zoQHY
z4)*k}G)7P>)d;;>@ms;*!D7^bMB;OS_ou)18MBRbJ%LZSmHNrS74`0fY)L^uua|~a
znY&&eksYyRe#;i|WO}k$Z%&$LUnxxLT+Y;EzSMnx;uZzC@m{7%-F1}+BTdHXkkr-9
zpou^KF@^tddnH*{y2NaKZSQ=v{O0a}4M(@pSwvPg^81sne+=d+7a%$;`3+wFU;Zl;
z{<m=5aK-5#d_XyX;={@T<fN%>ZK}fdCojErEe3J(6ATu;#`|a?y$Dr0b;JE>26IbW
z&Y8(-9Hqi|8VsCl3txxMzWYAx*B`Rq`)jCudPf3?&L&B$**<+sx&F30a_DvOV?s^q
zMOBuU4UT_MLy3aIeGS^si;7&dVKmX9%+{Gi{^wqr-!DsrjSji&E_sp$L;D){bCsl=
zcgJ8dcwIU^l8TjIWwo$uuLiKV_Zhq<;O?WZt3hIx>j)`-H%W|L@r*u3{I?|b$^Ca2
zx}73GUy^llK>w)cjzmMjSMA!=t>Q!m{otFkZNr;W%)HqOar&~dmF+O(P|yVZ6Gn9J
zkfTzRLe>H}h{hS>g4B2+<w5)5$0-Kylv<9qE{~^MVfTT!RfVPUi^lJ2tA6=WtbS@q
zREnP>Qf!Q!fTyrrjuM+7h-+0tvwMbQv3n+qSe@_o*?N^fZi)`_*ExPx&3&_Z4I#Qj
zv#%FgY+w&cy7}7MRCJ+89~@kga#*y0WYhSeiJ?l}U<2^OOJj#F0oN+R@epgQMxW9M
z>yJbNo(8k!hB!WBA~<}P3K6`=!pihF@fMgTSS3TKpFz{C%SwMFs2b&;V0$-4V4VnP
z;1V}2E|6so8umsJUT?<9mxH?<i@m3)WGdWGBsJQ61vu@NBb?`xWoBd@$Wo+%L^88m
z#X~{}B@>E{5+S;Bv<YvMff757(&q;np{=@><7L`!Jl#qqqLC8{3g6}wy(=N})w}7P
zyY9sgA8(R*bJ%u{<6I=20u0v88W^6ie>a{Hfp(PtR1bW52iV7bsD6pOgrN{2h%dx8
z$Dhgu3s^Vf4cMNhcV#zIV9Lp+3BS$5`p%WteOKb1DG{g9i>7*N$|UOmawfNhC$D{r
zw%8EE0yYjeX4O1%(bUAfz5E#-AVD1XnTj~_a}+P0&)vmcHPaa~fGOPlT~`&5^O%$D
zH)X!q{Id+Fd(6+(dV2R}VR4BiI7O9}(WguFA~EUIS3iq~m%E>U=^uB=CX*ML>Flhn
z*#~)W&o1+5JUXalw&Kewzr$_J_)&c((=QK<1_7hORGw#8(vB@*@!q->i)1o#<Q<P!
zG`{B8LQuwG)~W!(En!GUaK4V&yc%Wtmch0nt}Dx9+hh*BJk&EnB$30V)#YU5!gePj
zp#=CP;rLt$R_Y3;%jTk~JL1xd^^LuT>D0hF<H`U$*s@fKpPHMG7))NWb8@g7{j4=D
zS(t}hXs4BXcp?2ro7naY@@_{HUk_$Rb7GTRB-(>Djx32+lQI6W+``urNgO>X$44kh
z=z_uPa(Hin5;P3_1UNARly#s<{xy6>ZB+k}h}aOGIH_~s`mGP%8@#s9T;FHXfW7`f
zNGFH)9vV=^mgswmz-hN+>1%2%fP;P*YK$gT<*mBNsBiL^dW7fi1rD+`<%rLZEhwfH
zyFymooveBF06L(^QO}olE~Sx_^*}2OoQjGA#BvRa@bqlBN`#QVQ%RsYKIbd8A114M
z_hB{f45c@@r74>tt!{c|>nDMT=vmv93Yxk>dGp)!nfFv#=EqpCbOhON_=87EDB>ZV
zY+W(Q8GDBCd~*8?Dg3Dun#wquRW$%QE>7@V@T-#LMaY{ASyKrq$|Npvtj;rX!@9Ne
z&OT(ReC?suD`MtnlX-HT>LZVc$OJwg<+*R-HAumf^emgQWBeI^)cw;69ER{;t50)@
z?vMgu1I0h(N7`t#5jpLQw3ldBF&|~P4IM<i!RG=lO@PC&B`8BkUAv4Nn!FRJXt{&e
z^LE7B2Tqya^+iso=<=yR$w7O*uVrTHg0ofJ=vE+XV}iKVU;mZQ9hcPfhECg>c?&il
zlu*UBl8G{n-}&re2~+zd!%I(sH?31uUl2oC;wWf)I=%W+Oky@2eG7*a1_C0{<HI%A
z<a4?k0e=1u66&RNN6J`=;Mxk$MJ%oe*NC%;#nj&E9(FYw+b*ho{Ns~(Px_U5Li}2e
zY?cfbHu2XYUED`3P1EX>X&hzxs;ZdC0_O_pF4LOHt{tIGK)Nn&2#SG65I-rn6~b?)
z_{W_Q5BcZL{4`>wkB)XaCPpNtQ!n{;HYyO}_qd;#%w~o>U8Wmi&1jWaDow#)<R}|1
zrOi!ILLYbJ|5N&tbdRF8W-yV&O;KqL&TI?vL*rDAU6Q495u;d*ZtFlY<tUG+WcvUj
z%M&$o*YjeJYgm{iEVM5}NH<4tcRs9u&fr^i#>b`b+4>qlQaUr<jvRrtsnSa}_D!Sl
zgLjz1BMdQVSF9o=Wm}J92hv)N>PmxqYy=hJNQ7}U--|LaAHAr{QJPSqgx+?rhs_L~
z%_NT)>iV!Hmaaqv71yl?V5U`A`vmL>fz#u@==u&(>raE>HG}wHy}=7am*)rMXF5<K
z^B)U$b@67h2LCvZg7k{>Q>>FwW0L<Skm#lNKgm+Udtu<=4Yl1{Bb?y)x1JXXNe)jw
zS8GAodf$TI;AeG%shQ~NU{TIyoSk%+Mt<0XkU9f$fS8iKsnX}{mAs8ph6Zk*163KI
zIv5mE#Hx~4Qi425y?A+BKA<lCDD`YkyYv3;8<q3ht>SdwcDfLg`x(@i6Fh`Ti#M!T
zC9{w+IlQQ&40gmwhLmr<#^(xL>`P42eO|70<JI=GVH>5TcXvf0msAU_aCK+XXQ6`G
zPFp2Lp=1(?Z&``h7A!|L%bmr@O#P~fo*wPrB$h1Emg*Ck^apzUEGhZ;S}S$ZRIP8e
zB4o9Ca`fBxLgleyw@h6Y(@CId_;ol07pQj1N%>nH>y!USk#t{RE8V&dpoVV&Lh8+b
zQrEUt*VaO4*Lst8)0&er!A?@=$5A(^vDIy+_Da;m15tOM_MP(S2Z0~VSxs9r<6leB
zY7(TrL?~&1TbgNN-)a(O$I4$4rQbXj2qCA3`pF{UCwW=5Qzd^ZvNkd1_kMbuIr-s5
z=djrBwXtJH7%^?lSe~)?X%hx$X7yH&<k5z`|F-i;a$TAYfJ>N)H3Sq%yE{qhMf8dc
ze2LR(Bz|AbDg>U58Ch$=)IL6FPH=Y`*Ro!Ukw`g7*((E^1%1)}h`o^|8BLVTZ1`MG
za0}zzC-2w1u0N{jdMXSPA9+jAH08rJy0z1OtCfSje^C!eRvxf|<&X`D;#+u28P^^`
zmDy!ew-m;;?B0oi`+BXj|D4&EnCo558<@|)1ke%V)NGv{)$5gFw#&Ua7y&-DoKn^x
z&?2LuNm?wQ9<i^8i26+I^LWiSYiP=+o+9lXb-4-phGkaGbWAd<^SvwWD|*_Hio45p
z*-0wMh5sBC?f8oiqXFx|i%f5QCdfsol4WylUQZ!49wsp@Zr4DH^lIV1@b$uXH<Sy=
zt~S&UE+0trmz=6B>a<!Lk$p;QLt|=gdQQh>%M}z`X}l=-#Ot_zi{G;+q5R?&<(r};
zVGz0;e?NwJQBkp5_pB}INhPE$++D8=Z~5>yOBl-s{!=5quPZkE3`2=^-D+cWIK%VJ
zM!JT%o?ex;T;hQ%aA@fw2Q)9gxQR$wQHGpWk_Vsf1y+c88lGpBnkGuhicjbavT%%I
z8ds3;c9JE3U46GbsE1!9^|bpAuK%vn8=o<Jt3+S*(>L8wMyO5RF*ILctUtq#`zYN*
z4g;z~=Vzxu5|7?>GI$bR#o4q4A#p5o0zOfmHdb0RuBYG1Sk@>~%1qj{xmmRp22zfQ
zKTmV3Uatw-KQ60F+JLHxp?y1e(%>>kRpvWNt1#03FF4p@!3G2Ih1_dh=(24ejcIG>
zdYVXsn}O?PKs}6#RQ*5BxUu|)fBVPk`Ftr++v^58s3sK?%<P?HGhOY$x9cj=bnFQc
zXwMi7r_Pe>wIrzU(<k7_VG6!1Vrvnol%S#0KL6-z5@L4nMwzgjl{)<Z$&1irJ4Cu1
zo<0^6j)pDA9e?ezXdv$TE=|VaXQtU_$$Y%UlgQBB@oa**^dCo&y9dY&Dm}E;VB4>s
znYmDmeXj>JZW>F_V#uF9uGS8q=>T#f&ZG=<13>hqh(ur4Z~f{m@%7y8Fqd_zk*(?u
zn5$F<&>gxW-w{)>QBQ_BH)19vU~;d%f5B`s&z|l+(Ld|9VmQ8h`h<G{G!1oE>S_bg
zZ_GUZ9hBbi|MTFz$7#?VIOzk<+JCErq4X0B+m<aXwvEo@?9zgQ@*pHas85Xuo8=eH
zOTg7A6h$<S-NL7uO1YI{-F|wg@HD{Kf^14;j@T}|ta291y;$hk`$DYF<=HTUBqlu@
z=8z+GB84G5cNyd2dt!lOTH1lw`iqWGoQdLTe%l219NM<r0nw8?hrrQrI(Ci7!qM>U
zghI!tg(EItIJJG1^kP!fc<5pLqY}j`DCr0h9RE$4Vm;5}K9A61NV^fYj6oydMuy8!
z*(YvJcjL@`2u%#J5r^#SSMy=xu?jIb0_QOis5wP2b$$B;^TKt?XB=MsbqYe*Zz_;(
zI>G;iu1>|fna#OHx>SJ@Kds4vQ!dU%1;f*98v#sh_mw;>w(*UQT>;LVX01fiWpsIw
zxRB0}3sC-#c$(M7XFW&jv3vDrGL58CyS_$;wUkpnarcb0b|~MHWY^+dV}oF*K`=(L
znJd9Uu<d=;8uh05tsXlvecPw?Yt5YweS%Blu?RTXd^rJD)r|Pj`(c%8B1X=I41o{g
z9XloU%m79cO!HpM7>q}nM%$!@)3p3z0XcTf=t?#ZcIB5e*gGS$wm)mJhIA_dP(x9p
z3AEBSqKgRp7=O)gN+%F(Fr6w#mNb~HU1yso-zP<tVSO9yygzQFzC;&{bLtO)6X%B;
zRQTg~eO&qnR&0j%fdE42ENem*n_EeG9dFuNiAIH<o;$Y~AQ7`Ti7q8y%aem~c*^1A
zc&t&82^R?y3hNvA^_goE0|URkY+Hfw*XxyI|6r9PB^8?w$+L*{aCgWi(Lt83(65kV
z%`+4eLt<>)5VtP1>rpi$3@e1Y5OcCpyD)?ICjx#NSrsD6e1Ld=^6v;_!URp}PkBs!
zr>OHzAr158HR%)G>Oj>J@?4oPob``}qR{YC5(w1^X=%(}C$E}o4H&RW=OYM*zrO7;
zdW)Ar<~kYW(Kwzd=yPkZ{zZy=D_+_D8X%cfTWhPn#5ZV&K<bBD;jd5eM=`nu|5Xe(
zKo&e`=)w-D$gtV0@q5DOT0XYozdNYv+jcA{Dq#(J{#iwlH;(H~84B(^dVa(b{%1HB
z7OK+8;A2DlSnak@F&krBV~JhQac>l}34R?ST3$NQkgB6vR;h!hKA$ra6OzT?T}Vvf
z*lcPqg<ER`g;ni(8dX%!4AmP6BN=45JOuBDsj&FE)2o#givIi;@b12EpGUV85s_|F
zi&Hj<jhHo-!8NXsiCcu`kbT?+)FXTDqKSv<_6Mp`4jv<EwmQI>GH69}VSVlHwW`hL
z$zX|`j2z7n<LEJL%!RGcc>Mwnx$BEmoc%;UmC@ogLLPG+(k${I_k$YX>}KkZGvzAz
z*LC>F^!$am4&yq3#wTLF?gPy#`!hS=09^S|_CZutHC58Q?srefVyo2h6!yEVE%pP3
zcLpj?BinJed)CXDhO24MqEYE1E{sxvNFsWw%BD1ZIsTLn>McS~z5>~#Mb3!>*9&Lo
z%<BtR&0##mU%S<#e|b*aXnYfz<^Z3uPA|L9WwDA4Ev=KW17%&j360u`w9fpk=dtCz
zp;e_`LwP|EEHtC|eC6ofHu^*mPW>HIRd9U9%{YC}?7GXF<Qj8AsMaJJoSsSBU`&9d
z%t^=zRi(V10DI>t(Yz+&$B`r!z*Wwd>n1ho%~_ws7Sn>VMcb>t;8SJVKP>Q|-x=-1
z29Ok1urw#J>~|!v=)Cd9{r;pkMy@Vr096qD=~yvQ+Ti|JklSWakULACiY=hC?<I>M
zmrI0#+Iy@M-s^?N%{ahm&X}}2Vd{otd3;=TRi7^?Ept%Ys(@N%bwH>!)NJ|orE>3K
z<bE3`a*ECfCLO!B;dpk_Pu!kk384rlRq9>S8!EyNKh(<EcyvTWS?xl!s1flR@1odf
z?<7dy-pDr{NaeKpek$~iuLo%8dty!tclfY$MSXz~?hy!T=|<0Bm3AIPPaAIayqfgt
z?n7h|bSw3soV1LZJ3VE6O~{L(e>;(6e}AHEzq&h~S&IYy&g-So#RQ_?Qb+l%Ip+xf
zL9v&hSl|fu2^ql0wKj%=*w5P2`+kebul@2TpMtJ#kUPDt+;p9BCAAC%i>(H6I*YFz
z!B|-p56_CFsrU6xvsen|Wl7@>)f&^vW?DVUP?#4kj-tQ#39I^PVAFuH&Q|)`xfGUc
zgfGq~ObJs_{=AfqAWC1ot80G#%K^AqJ7G8Ptv;Xev3O1&Vb-~H9uYh1Oh|8xG=&1`
zh`y>g8e#FkSVJB`O@hhx{y-%+8p|;M=$sBrgJ?U3<mO|t&zpqeQ!@y+6wae^0dEKJ
zk#bp1=FH*)J?{-H`q4dXrK|Ub*qlW{AXX<6Ib*4am=hL~nho27=(cw=Q8Cv~VZlr;
zAuef?l$<y{VJpgj>1j2U_#~rDpUd{m{y3JOf#^^;jfI-2?7I3;;4^!oBG&%QrPUwV
zdbIlIje6lphStk<K`rpNq69ko!C|hA>=5Ff#9{5B2o$4<R)e%Od?MnIH~W!n5fRak
z8AF8@n%B(7^1j6&Wck+)`Lzl1Pj@=ht7oJ3>StbB+_>oDraR+71>Q^)`bb8KL)5+T
z5u~NvLlb)Vc&Qc653b(LuK0qQ>d{kabw*P?udMAXEv|T?!_Ty}RSgkITN=NE4WfAu
zCX2}~59eT7cvU|)@*5ImlI9q{!S<Moeu2n@@{&9ftVa`j72@`DQ?(Nur%g0S73jWS
zKlrm!v(cGom@dZ(9=`(4TXB=sEH&;YP~Xm~Y~3+Ag*X_sCYL4PO5M8M3Tb-vCk1}F
zuT|V!Elpw<6kY2qrnCwt-KxcL>;g!x)^9}hW^W+hRlok81gRJ8+PIen{#MdY4F9x}
zK+p)V6w?95bz;?fGB2|JZluY6X2}hF@uQ}IGcek?Bbfynzz1N3uYDvHaM%tc<u+GP
zXT$D91*uRJ_<zEfmQ0PeCN*;rK1~?INO@kA`N-M)pjFlxcNX><Wq2fhOqB?T)sya#
z!qPw#ZD?gghxK(in1|Tz8=uVdT3n6x_-wk`eF9*v<#?a-Ek)e!Ldy#Y<bx=dyYp|4
z4^3H;A&6Dg8dj8crXkmOZ`@08I>hMBeHkx?8OmVW+CoonrFMjN19Kj&kffPVGc`>7
z4m?x(7@C^G8U41gTe~WHpfuTd=m}<D)~v-X^Qp%>VqAa>zhO|@ehV~Bv}e=)j?^~`
zhOFU&aSG(qxe+GwWIL}B(BEaIJ$>v2dFyvc`-%g8aofjHyuVnbvHYqApbeeHz>L$@
z(z3(nYB^lnt_4;`P&2G(K>CZ4loOc8#>|zV-VG()r3;myQl6{JXM6j{+@t**#TB}I
z*hc|DfBC0kR{R63FeW%@x@grd<Hh4tNUuWTI|DD?aJM9zcBG@yZwEoe6|QHl7#vTw
zNQB)#W&HPF6%?0t6|{J*7sNa;yV|2T7t?XEiE3r+ubpYrY&BxA1<zpWMk~2}&$!gJ
zvsfx8pXymL5%&h=^kgaK4E4>jaBA0mg|+i(hAH!{$0DX*3H&K*!A8~vb#scC6F<iG
zYrXo>Z;W<_Oc<st$Af9+dozf`Z`|kS=x2*|qN_pl$L9<5HvK1enPy7B(hnDb9!*t(
zj&t;n_d7xxJ@~$nSIb_b^l<Ug3GK;mM~u(<u$&KO+UQ#O4dIcAm(dIBgA?B^GuUi0
zwQoL#F<4+Ua={Rx%5>z$p`r?>o9Gpi1x5^hDCl<^eL<#UIruXQJh5~d2{GErleo89
zcI3YsVWrosn#;sOqfh~PG{H5^PG2ezDM3mJtsFLC9+*vrgrR{Z`g-c2E^%R1V}_=p
zj?V`_&GLH{V<B=B%*?E<C;Ee>9M+r=a0JOB@zzCRvo3p^ijhHlFYD{?POt{ud4$Oq
z<DQdj#wS0%noFDMoH^IMO(G4Ref0y1^LPD<4v`p};nAsN9jhc={e?oWYazq;KmN#8
zChT9}t#2ox6?ho1bu(`Jcym5k|9GpvRx_g~28?0vMhUPMjDE)$Eh50T7I6~baNZ|a
zz$lZ|z>yD4{|O{BC1}NtyG#wWNuMjc8{ng}xMXi6Yc{7|Ctl~`QZGVHJ#2LejD{_)
zTPrJL>T$AT>W<pRx>1<Y5}^Tkc@!_$nmNh<W4@6><7Hg*VDQ1}q3O05FZvMtNjRF;
zacVtK62Ru1&ycUXcOP8lwyMKdmatXw<?2&tgkuTm4^O%}r!L|r7MwW&8iy8bt+Q)$
z8-d3bgEvrbC}ayC@8cjQ`I$3Pr$S3Z146$FB06P6@6+QEMKY^Ps>iaMf3$cy)%wak
z;vX!#>7U?ip7oIeiQ47jn>}}a)}1_+Hes=u4hd%~2%DHB@VKQjY4{Qe@J+2&I|Q(}
zyz_G|lFM%3pqq}P%)cmblzOEIegUkdxo~q}P`D`yd>yQSp31Iy#9_#PVHe-1Rh>tK
z(pvs(w596hoHgU3O8jj0XB*NlkXOpp_Xz{1Uo`Oj74Ob_8se^c>wUcN{0@?FNe%5j
zX7z@|Cy;u0fo|Vlm%_{+#GBfEzBHmyQyN^c+bX<FgTxDdI*@(ihb_ijWH++@3q(1+
zD`qh}@w6_ns}z*)$wkwIW#{5bYvR2>?mP(~zJC@M&BICl7%yB583Zl%l(GJ{Rh4wv
zfAiOZcInUQ&OX-);4|pA613g=&8)>p5{W1)vlSH=4~H&!XB!|A6I#+TU#yC7Ka`8?
z&Q)}zbC2!}_dbvc`4Fq-3_O0%cs>0&5RFErt4+u4P1P1>2CLMeadR0)?10X~e)wYR
zR4`Ye9f6ms2bxt~&FTki!7g+=deKIX4cA`D_&&w3Yk;`(R{pvskk*Fgi;x9QoxYIH
zc`g8FysgT^$H_zfo@RDua(I(@q=7N105LxERIdC&?<(!1_HDqeR^XtH#fQgWlmUFP
z_JG&PQ+JI!T#jy9HJ3+B#T03!d_VEF_qKvP8n3;@e2`3;mLW;Y+Cf)Ib{$cPYHU{I
zDUha(UR2SDyu5cQ{>8qh$`J${mSz&|#Gw032$t{HKiXCo=3iLp0d9mef#P+%%%HjA
z>z_aC)@v7RJ8$3ME9k05y7Sx0t>d9@Y?(+A2vib}q%z|Kczy@Q4X5PIBlp-1vbdpX
zDxx9i@laUl%I?7cZpC%b*qc@TDVLYOZ~`AhbavpJ7Is&TS|0JympmN!pOPOC4n0f-
zIj4?}%kpwGuq5p>3NGdcZq2RQimX2ZKLLYd9`?|K*Y+h*BzIC-*>kJ1&j_&+o6mk+
z2k%bQd_TCnD2Nij4s!PlCl{X8BOH6^NbzdPt;ijcuwV-<=<+oBfT$a+4~fBz1zfdL
z;n!}g5SMlr6PLD6xLklUo)0J?$e07l@bU2#m6Zd|Mumuln(q;v4<~Y4uFmOzBUn%X
z#_qQX-<<p}&T6**0BKsNY9C~3h0v8=lbW`1V5=r1Kw&v%QxEMb4<|(TgR$l7A6?lv
zb8S^A2w-|QKSg8+(sW=Am*!WvX2E8c+;{$CFI_Z*L(^AlsRov4+__*W#-gfG^fO;j
z?vHFwZAsDV&Ai8d<ixJRE`hI6tfW??Cj(_vkNM_Qifq=_aMog<|C|P_@N5~pn{VTq
zz?E60E#!-GXeM_LlrifEC&dvyuQ|>|t?QtY#N%t7@;8|^UT_-rOMT%=QaSog<L&qt
zm*+n%6CFHRi6q5ju%I>yAV2c>@`zs3E-{EszI)hb=alEb+`8k~@NOM@MlT#)p0}Yz
z-7^#d&7Gy`JN>1}KTz(5-yoUtsr7rpo6c>kvW8c6i;hT@4FpBB#Y0;S-b8!WM4gvE
z!kj4Ibgp%JCeINj$_I*QQ<QkON%OTS(hXGsP=)T%x7(%83r@Adf<-fLWa!0<Vf*VL
z#?S!rk;V3|SBIVV)sA9r{=D{S(JW`~LH=7xNkzrn<PeDWt7;rMK5y<;9vAYW0d#YV
z;l>5cxz{!sUaG+%+uEuOrs6teHC_Vqj_*+tK+3t(FInT_x0=28;e;lh3$h8*zfysm
z#4+q9Kb%P1pKOUI*BJ+Jlnza3tP5INump8EwOw-PTs`^DEn9!I0geDz0`%SfZvS7U
z#@rH*OjiJP#lchuEYfjgI8#^glP_Tn#}uS{o!QhaO`9Pzx(b;%Oc|LF@}u&l7ON(P
z^A+y(w}5N8+aOC(yyF2?ngMMon;>rjfAkeWwva4kH-i~clo)Ds=j%juh!MxTQoHMY
z0{*jU@ROymGpp#wT2L5xp{7Qz;-T85K+#9py2-B1_8JOB8@9FZ=CEWWu+z3B8<;5V
z>g}<a(VN4Y8C>5BV(?v9;H)WW|B%5xzkwXbBj|mDZ=v6XRcg*CK(`8|!7Sv~a)RaO
z^Wz|LH-u5MvlKSboVYK^!XB!0x;x~<s9SdBqa<`u@j7%7OSmO6kCOYH@)D%@=iV-*
z6apWCIXUqOX8afAtqv#M&@6Jmo{YiADjDra{AsuqZd<?ChpJ|R51CBv+uP%&lM3({
ztdAy@MuAmd&oEjS6V(x<u2L1l@I@lUQ@KN`OXUk<d@a@bi^Z*eoWzCbb*`)8w?tum
zj-OEa$zY*MuPm0(uQ>EtplGQ!kl^lYz6eprVcU?~)>()>zbcQWu_>m^Ibq&mX>b++
zKQoOiD|t4X^drmWN|JYrNv7+K=N%jG7r{HF(EB;ysl8$bhFx3gZAV{j9Xp|eGQ1R6
z*9YnG`2P7&`dMg$D=mOa-NM3_Q)WchV=LkM(L_j?KgN92{3ZcHC%$=u`Sv$89?}1!
zMnWj?6RM*2z<}Gb16=FX!%+%)E9TbL_NX&u^uQ^39&wY99G^34gwDt6pJxEM<zspO
zLCV=f#}&^JrNJ{XRbIN?PQY?fQ%;+XS|449P}9*$(m*GSX;~4SlKV}k%k`dES(dM)
zQ`(Zb*ovZCezJk0bg+cir80dS`43ic)1a>7w#lB=d!yiNjySQ>tj6Uct4LR4Q);>D
z(ZHpKWk=l7V~z7rbGbHeJ(70cz+M@ZJQ;hO#$xJTbB)(hsYIkK&Bu>gi<jT|t!Jkp
z1C@bu&T@-Zk+QPf8|RY_cXoc^jJi#=JCA<vx|{)#_q61{1%nUiuQjRUV}(h)9xsef
z@VlJMT*Yp?hNY#YjbYAYpBYacF)&{#tv}ct=g#uW{}%UnSk|d9oF4M2-0dZDg+fvn
zf?tnhb-us43Qcl5X_@|)9_26kpf0AH93Qd!>xB}E`or;=nBndDr15N89?Wz$yCyBA
zU1m`mEAd3wyL?L|YSSb|rKy6+s96*t?ky4wMA*$!*nMdWJxOClQBHi6qeVBE=j#wk
zo3g_!yCGOsp0K8N$*AWSp@=tLyRmue37e-^sv`#Dq8-sEnyQ-5>FU@w^8AK6_lZkI
zO=v$P8xjDgt;}bmV#rXwy+9ERe7F?K5?Fa*_l;Fjzq<_d#}8rq=ejrHZ-DM~K~mA-
z`i}vF_MLCIvKr@4@0dZzpSz}5KEtg~pi5*atKy~-cJ8mfYkpvFy^%xXzt5XGwHr<C
z(3qb?e)Q>!zL9hfa?i|$)CKY)wLjVjD%>LG6*jH)9*@xxujRFk`0G(uuPioywbcI!
z;F_<>%s4?5>Eg`24Tf)ZJ~p`DED-}>BUR?X1HW49CuLQ5e3zQ|xj(&qflT<UW8I%+
z*|}*-;ngc|ib?PFpqw&29tO=m$jGU=_QAM!ueHJ_2pLsv+fk6X`*kktw#K{ejqROC
z*~s1T7QVyAJ6i&``}j+5V)~%17w1@Qc)v>k-+KLX#9XP60}^f&W3L@*Vs0FUIr6Rn
z(cQ9bC`Qlk4x~CA);0~dL3Wh+wSeQK{0Sc{#AV(n%C*d7WLZw_HjT8=>*4`Q(%r3R
z)OrP(=jsX5VfS0h?r3fNp?CTkfoV^iNQaXT!u^zMKRJ1rYL?_bM}pT8$6PszfF?DR
z#MLOij|rWqY@m<+j5o!BJ{-;a06}4%6v@lg<9&cHG~94%tyJ@L#tL75mhhm2R|?0L
z(R|V2pJp0vo&AB5Ft}~l{hgQxZD{_AW@uWbJANbs?unq`VNPx?Y(MCETf-LCJE5cd
zOK&D?bcb3<{tc$oZ&ffacK@TeZ2NBkWYde_on9f3Go#5CzMqePuj7=e?Y1OiCKoJ3
zMxG$DOr9WYT4$Njg4}Qf?T#wq;V6J@U&}z-OtZckP`zF?6~z{U#mb9vAco{BhIGzQ
z?Y~fy8iw(BJpf)jzs5ffC2ki}78qjU!p9H@Gcm4C*vtMA5VhM{SUZEUFNr|c9i<sA
zSet8A2Oh3vrz9#*N@-BAXCv+4o2s5rQmM{?+e^uVV*=S*-+E??M<_C|(+(-=X>E#6
zV)$p?8aLg&UJ_cyVVkLd#n{kWv@4T?Vp&{6`mG3Q_^C1Px?<jv4=WkT^PjwQTz}+0
z?IV*BNWuh;pjIe$E!-FV(F?hvFu(Of-~sYG^b>3Vp|s{r>B<9glCCQ*R4;slPz@od
zGhlUY<rDkIq3lKHO{epGAWTQSY(X9-qoXXy=r`axBbiTFpi=4sOPMF~9E-+HC$T+a
zm*o*DwJ0jJEGT@p7CI;6utfGG@%A3RjPWOaH*9omv)HCfPNjG?@Ml3KZx{ko`^D!j
zRF9SdM-9gn5Hz%fT}Z9sc6@53#;|Tng1k7DU9_6OQOX5K(OJZRBez2lCvc{!vq*A^
zgAi9-&RK=o>*QhDJCmX?tQUm17dbaea0J%Db5|miX_6}=Q#f2DT!MOSgmj#o$)<ZJ
z^%Q~pPm4|(way4pJlh)N%7w9yu9z%Sf&=Q;34ho``j#U0`EQ1SzhN@^e&weDQl+62
zy8ia!`m(My)E)Q%#A*>n+!J_!X%^8PKkk)HlTkH*oMPqG5$NYQC;HIU^yD=B)dB;R
zquQQ<GGAa=cl64_08Q@_(ZQQ+G5CwpTX=Z#We4u9I!oGEcbm0WIv1;S+i@2Z_zBqP
z6k$G$RAuI2CZ}Era}Ab$-9tl)UouZUwPJp9bn_z0#|6=Gk|w@g8_O0Lmb%}KcujNH
zemMxSP~>Rbe2r|k^LUbf*Ng1j#?tuX8;3YnsDK0kX(!%gI}(=5xG0x!SJqgrHEMqn
zxjhT(`tpH>W-uAbZU95%SB-K@B(#cTizq!cwO}5n?e(v9rW<{sk~yWNrQeT`$drfr
z(7fb8AM`VSGtC#A^S^c6PqM9~>#l$bCAG)1&(W*Rdy~WcODeQMI;GEy!fq>-dsjCD
z?u;bE4PA*iHcDL=T?65k>Y@g|>!1v?z3_cPNsxCL`!dhcH~qmp&Q^+?WdLW-Q-QwX
zYkv0=oe~25$|5A(_5qu7=19Rzuz-3hjck_cYoKe`Tq@`;q;4q_91pB6h(Zc$4aJ`E
z^+C%c_&$1G{*kG``r&7rx8+p-3Cu~R<kvopv&2D7N|C3i+NTMmvTeL-?KeQ`p=$ww
zbF_uaHv``ir;9=Sl)xyjPulO{^sk?VCYv&{O)s~$z;p(`>Fo5oCqu?zsT5GZX94Vl
znQzZf|3-sCfj!E9>Wm&`?nS!@%|oso9zAwE)+JjFQdRXm*FSLgQ~7@LI9OU%@>N>a
zES1?_ue=6)+vx|K8;<FG5KD^quInu9+UiPK9+}yA=iJ(1ME;R9XFqBba+P9B=+6_n
z7~j7^h0<agN_?7^%fCY|)Kx|{kN-u3Q$j^aq?}0+m$c}06p3fdOi?TB0*dYD?D|U*
zJ)NuFeRscZHI+n)W=f8H9<#2#8O0E3W2BTYI5!;HDvFx{?u|*nP_rUj4NutjsM4T&
zj>QvGM2F=TK<n`b_G|-6h|;;^NJNwY0_TR_@TOz^_3Ya9+FnSqNjYmnvj@GzcCTbO
z_68JV?VMyYtKPZWa0d9HEB2Nt{kF7du>T@hO(PsUA(Hh0B`)_(dA}~$olLut3cPj6
z<zxj+hyL#|+&{-e%;jX(Lp~7so(m-39GDsvm_AalbTE*9*^liF5UBX-#dct;eVJZ;
z7)II1Zb5h$;8)ik|FX=^bG1d$mL>tRkw~?()@ice36{`a54P)t569{5LeQ;{vwv*+
z%BtfTbEOFK2*N<OS1{HDWET`tL|PI1ym-UFqih~qR)@vStqV=T$0Kffnp5)@6l0Pu
zVak_OU?Samf{3c8gy@|57>jdx0DZ$BZ#S80avL_r=T*C;Vh3&d^*BqtqPBh2s3A`C
zsT|z{`y;r~$Wxf+Bb!5c#l=PCHVd5T9zD4AJEeRJXS$9hkhV_R&_6Y>Z{a=vRKI^5
zja@Du8j)vo2?!zfM#a{5j)7+J>4Utp-%snnU=wjY*B5YP*3xo1B(IGBOj?sg%k{-I
z=h8!97QHUjSQ=RuWi-X=aR_zJNyLq6P_<|F68$k-eyR{vZQ)aqqH0W6L<8ONg5S_3
zaWEFQv1~<&1_JHZ$Vu$2&!kt`k!UKxZZc2+s{Yf~wx>sDFRb`H&Ge3eUrrQFk-k>f
zN%-vISYXdIKP4g5Ky{<?lEM&2tWuxr+6lPF_|Fkn?jQjf2|6-n*yGo=%3$SU56xY)
z&fO<pm{i_BC}r?lX#2G=Cq>k|!Ce$|@A^Ow3{$(@P@60^v>x*E)DuQt-~!`ZlqiJQ
z!I(OL!XF0M6Y7pgAM%Gp{%tc8FaB64ZwUh6x;*ezVq^P~+j6K3(*x)F$xEfeFFXiK
zse>E-Mv|+|pF>jDCEHJCKc3Rl-%DVmrZtcb4>Z2o>AuI=ywY1pwXr<Jq6)jMncum~
z(o?MJM%$0%RTi$brIzU_x79`(X}ZC+Moes_4W56MYg6Ua(sh|Fm;l9tKcn!YO3HtV
z5JMKk@wvSehZg4o!n<WrATCxj;N|-p_e=e!4*V+9?1qMhY9q_RE3qlRmJFLPt{HuM
z_9)zO?8v={`6p4AIkMM7TN757sFjs5L)irlTZJW~CS<s>bBS@uUly2}10ydVGxBkc
zVvizcj;Jw*&l)PCWROe}xF6UPRl@E(HZIwHPm=16rzNcvRX?$7v%MT4<imri8>r_`
z=mxoKE&2Y!U9u|_sCHJI_`6=IzHLhBuaeG$nG|0H<}`kPQ~I>U<S->)DymuZy5G3t
z5>U=6G?Kyo(n9&3dTLkHO`p^fJdZ`1o`3DLJ#{GUsvVU@ngDnDDOvrB)Eb#^3#ar)
z(>88qC$pgZddSri{%BhZx#vXNSCe*KvK&5}P%`mLO+~#APNM?Y*gE!t5)n8bH29ad
zr*3yYi`QRW`F&fuT8s=1e&wPc=05d;+P0t--E^;|(e<0p3J)?NZCu|rqVV@?_$W+)
zA6ms_6{AW5%%3*pFUBCTRZ5$t<YF!uY}O&*wq@SbAGYIPSRET}5SgwtC;e%okEkQ+
zwxA(1E9~NNw8!;MdM-2}nw;Aj!HHLE*DFQ!>Ale6(=%S@U4<VrJ)(eoh(=eL&Tnl6
ze$<lw=L?Azf$pWdC~|ETs4?ufFq5E&z8y$hoB}Ph-o*XWjKj$Z+3^(FE3yoSE|hLi
zb>69}f{)tJjIeK*u6h{0S_<*oxWx%a3+&dHs4HFUs21_rb8iBtLvFs@SDmSEgtYmU
znxhL!_isYb#8l1>6q-@IIX%zK?+>H+n4y*POC}c!KTZz4j==q~6dG-|E%np9jm|$K
zL|(vwH~V6Cr(2qu4%edvJFb|ThUh~v=E_#BKqbl@G)(ig*Ed_x*at<P4_;QJ4Yv^B
zcN(R&c^a)QyF|77Sh4v@Uw}lxeLqFJVg1FIA<DozyuO1mm@N%ul+=mC7Z<)TH}4}J
zDbZQFz<7uEGa=U-GDwP)%e_X^t$28~M(bT<C##((pViBjbA5wKFdT{?4fnTyiXQ$U
z{-w}6E<)dEeN@r*60yAZwO6{1{QQ_Ktt?T)yFU)@46~{yz2ieQi(J7U{;IhWSj+{3
zpKk1`MoYo*jmeRE@S#usyeT)h1AV+5!QQSz+axdhQ&u7(*h5BKtf$M~DewIrmr%gg
ze(g2N=daetQ+x2GpLun=(NuwYnVtiM^+%6)3S_0(?F&vj>xWH8?L+xy;Net`0jrf<
z8EgWtgQQ<jP*45I#^P4n?N-_GXF5M)L?eoXRsZ$tFq4lMX&Xt)RA>l`H^UpumcnL}
z&DzT8Dps?*dDmHV^48qiZ)r;BB0W5V8E<lBYR0})5RJS=*!G^KSa8;5nPBfWKR1iV
zuv<C${8=)TruA&!2MhbkLzDJ{q`tO4pXm^rx=a^C8Q?Q$zCaOfy`q;`5?W9s-SVSn
z*dY&sea-Rim&bY9{SVfh!%Syde+6*KwJmq(e3j1iu%CQ$&Q?(Tl|yFD*wMqh0;kn)
zK!p2b^%0t(Ip|-u$EC}xd)_hqeYpcnk>6Z<{_Uj`a~#O&t5BFpEVo_9owXJ52&<9Q
zkl=D^82RDt3|#$2f89Kzw(2`n1V%}a_D^wZuYrE5jTlK{aoPk?=oOyQ`gO#`lcp8Y
zq(Rt`=-YGroSD7+%&0WmW<ZOlw)}(8{g_y?pbu}Q9KP1wEe4Hub&YJ6UkLJ1h&E%o
z`DN#mnMxNo&H93(inwEoFoqFm5_68QXQy$=7J%8SJ}r&3LR^FdjyBR4XW9b=u_}qS
z@&c%q)v*RG+luHv>?~^s=nDwK4X^7l$@C15;^Vs+9Iv)t@2@;Yk&1;RdTwchbja69
zeF=YGl<{`>7ugERdWO|&cH#b<Gj9(eUQe%T^S?Q24WFOaa&qL%7|zb24;_>jdKo8q
z&MAYk7j~+8dbXc>AK&op1l|F=KL?~uQ5cr0Tb#Llwe4Or2CAqe)UH0MltSecsauey
z0Bfv#>}lW{?wStnF&BzJ<7c?{1H{{Zm_J3WU>VS8x$Z#Poh?NFbyI_Flpmd`^%`t(
zhfqCbSJra88i2BXOcuqwvT_w7w0eIwT35O^0^!PyAD~sk8r;4`q6|Nom5k_3*Or#9
zqIwW`5J~F!@V%f6Q6=zM4s3AjA}rHXXI-%EopV7?GHYfZfa74Q^Wg-Ue-i<SguQ<K
zRXL0MgKN**q2*B4CR+1(#%1*+DrU2OQ=PNjv{{7}<J4UIG$@MP^$q65aZ)c)FASMP
z{OuID`rZgIb5fl0%V=zdOGV`W@l3p>(;30Y^EAHvXXo#{_hyZbAK{3zN=M$}unh2<
zj2G5EpZUbLj3%U2IWhV3F;r{#6I-pc;of#v5xN?H@UE>@a`tm2XZk4n9gXW7n?j`4
zols{FLvB6_@|@kZT;C_O;fybwpMw1kYNGj1#C{aDiA~6>uCVXr7ioKDy}{6w&uMNZ
zs9SMOqw)PRX_5YrP$h8k0+7#dDdZ2m0Ro<{wg7wc+q6F2p6^}HjrtxQ88Isu6XQwm
zhv#u)Pc(S$2BD0_4r`;|HM;dXuUOP@Dezn8(eaT)vhh^Ct*hkSTqBn<otRGL8eu=m
zKf;p%r#TUGUxnwvcH=DR>7H4=A8EIg)8`1fUTdkj+=3TN)t;8|g_loqBUxq-^Loe<
z(Y5dN2r*I^jWVwd8cqFSNv~V`IzQbTZP}yA*bC(|(o9&rHVC#Y=Qs4y>dySvnYqtD
z4^ln+5pikjekRMcR#fb3eanY~zS~olCy`S80h$y2@x=2|%ySA_bA@z6b3F);c`{+%
ziA}m_`fae&yJN{0tb1E#>9vBEOXE_pGLY>k?Y2U-!D78Q9_D15{J~}+O?vdye2}_X
zB@BUqbEV;2Y4JR5CAp00?(xc@Gm<NDI)oYp&8r~>!0xm?iDP%|4>{v;nO8aUVNL0R
z0LaQ$eDAXJ^02fy?RxIrc8u0K#KAS9cY}JE`|7Liem-l)1T}ud>~-5DNhOw6I)O=&
z(UMc#i2{5bR2<B~8S*w29ZkB`!buB^FR<}eDw)yvHDlWw>q?16f)PCSuCKIXqz&S5
z&eVli@$H!OLVkpOxzU7X02^JQDG*J3Awy9wi4&P$*`7rGx!?YuKEXc>H{(%PsS6fZ
z3K;(?fY14TW`i%ucY)qPMN>1#nDv9Gh@`R=797f65Zx$F08!1BIqPs<hAu9KjFf%i
zV9zf6wXgfSgoe`?CR_n*n9a@AhSlhD^kJI8^i=RnjQ?Br(*^I_7S<rXPrk%%qv^`2
z1%QNMg`#I;iBj$cOP>V1z$4mr*>0JF$rnBJ1P+^kKGUk7M^=Gjtmb1R&8Me>rgzZW
zCEbx+%Mh9FYh1Q%gGsh7(#iR-8GS#(nfrBY_r2VtoI3)S<|1EGZ^oY2Kf@Q81Q8p&
zM+V=+>llspHLDnsGnaaIz;s}Xp<(!QZl@Y&9b&(JNW1lRRG}oEV9g&&GW$|WGn251
z#l6)4zBKa`ZdF_!RJy6JG=AqzwRy7N))rv4q8VIN`K5jtPfJS+T16G$b<~1ADaT(S
zpf4a}7)nxgeIfhD+K~8OOsSvI|MnI?URFj!i#fg3L8@My=~p9s*QY6Ft5A*4l6e^2
zyU~Y@XsVfw-g6j0oXPUa1ykxvw^!S>Vaw%!6zTcA7o9wL6P^3^1gZYZ!oZJZ67goj
zHZ{cQjR^vh9c)8UY@yn|ZzsL)ke=f2jLiJV!O;6rtGB(TMv_jv%~~I+?S9sFp-wfP
zcKOB7hn4C!u74YcOC@@<@_1QSZm=fmB6I-^!A~e4)3aM>e6vt@^bLV3{k>j`=UVlo
zoEWq;bLea?Rqk_kHcTk!d0{2%Yg8X@XsP9Ry$_#h%T1o=)0!b>ULS>4lLs6!(FDGi
zOQ8s(K70hy)5WwX-^2?eHC0Q7ALNC-McSv*Gz_4c{ZJgO)t45PE0SF<6aH6UN(I|n
zy||r;Z{U)*Y1yU)%+eQFSsqb{m$kixFpdu=A|c@@vCxZ_{`@ChE8|s?DA2TS(f6{<
zsB+dRPCR|_dpxRNj68Ri4fh9FvS89jHyolTURi$Q=Qp~<eVJ^;Y`4rmdDNMFJY@Ve
zf0rr6lcbdULYRC5Ppitqg04+5@Jj#5x^d%f4OeOby({%RuywNx6^lJR|H7rt`r~Av
zVe{7)ACz?L1u*U@-Z%FzW%V|0809oP#F@oSL2G;-PI_`&G^!f(E?B(t#VD9D2AdUb
z%nA~V^<)Nr-M6$*&Np1~30c!06~t~SD=<+^$obMLbUhZ3%-4J7t5M@f(Rwj#XZZBu
z68mlm`?Ex3M}oSZMPdgls0QEf3_tyBs_b?F<<mO#(Z>Q1nfkK{7N<j2x;v2SgS1<Z
zvO+LYlx84X1VJ{k@1(t3g%eyKA4eCbfID-PkYrYR;=SD2A)LN^brw%#RgT+e-@~Od
z%WzAX3iwM^S^@3LM(5AmSJIUF%rj3T)qwizYsJ28mrX~H_@tzi+%v}3YvAJX{{F%l
zhl-ImW@tU(IqYwEW^Tg}f&RCLuS6@6*ZUQiSLfCliO;!uw{pk$c-}`=KwTzGo4`)R
z5gDs4z&pKKsVrgCQBIV%BH4Zfe|SHSs474?tR5w)M?B$rc`AGvLYc62qIUHOk|ZGE
zo$J4<vWLKbQCcWl7XHM^NGw+_U^UtgB3Nm>qiDWaLwq7F98+u*>hpVGiUB@^p?WYj
z9*Zt|%;;*=+rvZ&`64DV=@V($KyQmCpL~a2LbNAQ`>GYhV$@?0fa6Eu6@#&#_FbZP
zo|gamp>S7CIoP^Y!T7Z_{@^1{@LTBp*8rtwj{gr?-xwb0x-~tqor&#aV%xT@nb@{%
zYhq`TiS1-!+v(W0`Ssps?{nVk`ubP*-{<Ljt*Tn9>K;tOSnj?^EpQx)+AH2pv9TI^
zg`9bmE=5wxA=>sTY<ZL_17q^G!!5Z@*_YzwGJ~-7{6Sxrjt88y?>TbKVeTc$&@=g%
zMW4mH8bY@oMm~ibT>f2hy(s=c^^(-^foeA=H4nC&yCakiD@gQxI|ETlIx1H3MK}t!
z9A=JKJPjOOZnIQp3&l7<V1KAFF9;VobglLyhz{#0K*}h0r9K&<Amk1Ejb(3A<cT}*
zRQzsAPv9x5b9H+4Br^?W>#{s#JK*a2<(%^|6nogX{<rOm8&Jsd3v*xZ^m2RK8`8*^
zS)w04ydAZA$n`9dXf(sCPRPE#BK!=e9B47GXI0x`>3i~id%Auy9zm_pZIt%O3Zzyk
zF&vD>J~*}e*yI2X$LttJ#)|fCt(*q5(CiOde5QX+h7P3@JX~Id=31-LfBijMRC|mF
z-#yaW(OKPhVJQ^A=+5Zr&Qok4x%_j@O=W~q6e%;K{G!_44;}HIUxA?eFe3k}8qf*3
zT7b~<z)-K$T?p~jMC$gnpDMu>xD>q&Bq2gTC;ci5Z*ydeYQM-^#y?fy-{sfUA4Nc4
z&CzB~47=TGaIT&Y+ePQ&<H75VWBIDA6}wp~BKPUAkHbY#zT^Pg$YtLL`2tg7Y7X}j
zS%451u8obwC%nRwc2YI$C)fmsnRVK81f%Bz7oi}HUr`2K+S2^H>9L?>sRJM$6#}R<
zx4f<(T?3UM`jejRLWJBWIED^nw{@2#KNmsl&|@PczWJ<{RC%Q<^e}mZ$ma+s{?Etq
z>K|{xFi(dppZyL)gqVE1$V|qOFvRSCfqVdchIy*>+}9r=ETNUB_+6486|mq<F~i07
zEaH(SS>WTdKIIVo9A-9r=6UqlcUN+#Z5j)p;!k&F%&NS*?ki7xFD<{vlAa9J_^N#O
z<SJH|{ectBXA6-&*Jv(t)(gKYA^3GSO|P(hJ`#GCjBO46zs~e<j!57?_!NDc2!%z=
z*=kB$f&UtuzWXgq^DZIbUdafSAT&<gi970pk9!M18QuHj(_UE27Pe>&A|wO9{(c-m
z*mfE5Qp(H|d4|-knnJ*AvFP(!N7(gfVjgU^(fO$E)bnc<Wrp%n^DZ3KpzYRxGD?)y
z8cU$N%dqiey1=0gH^+lLEoFr~ux^F+U?MY4mI960ZSyPE3We7t-!Ll^0|SEuNseGi
zJhk3id|YLVKuhandD9nW?<dB;-17JL_m+gHbT7Kk-je8PkDVsCHI_1Ho-U>SCOV{C
zMn@N4@8u43lHMP%U@c%l{E*x_WHS6WQiHtn>V>xZFtGQaww>=&w{ew;WjT98zCl9r
zFL@7DirkkGG~mtL7Yvyjufbo=fpl|S+N*$j*d2?jYLF={<s)8(Gx?0~jkFv-KJF|t
z_>}R9+<~I(it1ABxcJ`x&7#h*{~eGj;nD680_E&l(|b$Z=fZDSM}=`D7*T~HdfBZV
z3+&ti*EK%&J$u_n>Kd_wsk%oao}Y8uj-lc$S@9un!EJzWRy!+!fJ@(s44X$gLR7uL
za~>TYw6->i&gMmjSdk=(CcgC&N%4qzSD+;{QjVv_e8F^+EAltqo(P5zXbh%xQi_dE
z^ADgyX1T#*&Wt_Jw&Pmd`>}nKjYZ&X<6FRP6v=Peuf0QU7D+A}FBgrN`o6~|Z|@P^
zy8%!H{Wtq#y@xO-?2#mk7MAix8<d&TerI2dZ(C~=#IHQVMunxYNitaZv#lxh+{TQb
zdCiS`diWqemlxM}v_H<^T}r~76>SevNY2TrY+DLK=~H}enRATe@b!pwL+kRh;Az2c
zB-Uy#OuAW{OlRtiAgTo1c&og;>Ggg5iqo-`Ra9c=beeV=R1|vHmUM$;x?ejV;FU;i
z_Q+AX(H$zU7Y6(w|Hc9QoBjVp!Gs5nkmR7w6wV`jJOODnqc1Ok=hOFO4b{AYj<xX@
zb6K<Lb}PCnu2)7~hZA$>Qt5nZn<uTK?@WTXzv$hQ8fqv_iOXRLW{avyNaJVnzLg)F
z-x$~OMSQc{y{D$~J-T48qGsC*+dF4g&$y6RJnb=+3lQVq*kU@B95DLX?2I;htj>T&
zOy${NLZ(j}Bs9mLG>(++POHBfsr0cv(1y!72?2*G*eqimgT)1^Vc^4dFy%EwJEpFt
zwl8p=(T1>Ke^trw^L<8}!%G55|0v!rl!d)h+*#+y|H4Ibj?E(3GBN%~j09JZh)NFY
zidO%%!F6@PX-@!2oQa3-iI_qYTP)j1Rlk);*k+t4zwhD31330$bnvB^#PED4lhrWU
zu`D9nSD3dqKg6E0-B6;mrHRX|x;o}sefYlymL<7f^f=LHxwBG{Ez<pCB!gGEpnrA#
z_$iKm8(F-JVFV$$iLdo~9mJtRZmiSPI}W?`vVYqucYpMaTzXczjr~h-e#`Do1m}zY
z#zC+NyV*RfBZbg*SLoTycZDKtY`lOv;kpFzEel7p*#!po;RE6}9ycB6ifurzkFo*M
z`4B*`K6e=@l8)P%Pje8i%XMwUaGl51Zg%aJ$!^4R|01QdA2~&%sUe4e_7xo+G%_Uv
z7E=1j+ALP6QI}y>z-y%*=o_0Ul-Tv!e5coU|L~}v*U$??d>T>ki#*KrLi9RsO!L!G
zTVd35um$ybwI2{?Wi>&GvN%DsYGO3AJ2ZAFJ+-w^UifAaJyu4L_!&lCC#6Mv195{6
z@tOn8>0o{%behOGw-}NjALOO8GE`JfA5GD@uwH?-X=A-f`CS10`QYJ#!S3tCok1B*
zl+g}|5AAlpK0|_JURxXFqrladSUy+g4KFueuWqQJ$fxG;axvAb+`nUi;-@J8dDP(|
z3@C9CEqbC_)VSlh97qy!8Q}tJZn<15n)>RYf%=T~{E+t-!KYI^cxga?bK^eDnWPzC
z_m@X%2Oc<K6Up-q=R;Mt0bwXPnp)E8s^=WWG(c)2rbnnwlA}oAtGyrRzPooiNhDpQ
z?8m9C2N9p)N?vBtF+j&rv%zv~Qg0;BOx(dM@#wZ1Q%j!~xT_8gOJHNtjBYiw;R{sk
zTaG!pduEb=uB8@-lB@5ASTzE-cXLN`zv5O|`F}d7?0HwN*MWWGxD+HIP;pfbqJa4!
z^lHb)NVMR~T;g9aV$<91cQ*A-KH#i%suCx|cVcXH-lCa7wtSrM7^Txnv-PX+8&o{&
zFrJdQ1_fi!h%*zjzz6#&+I78u2WLRZlciY<mdVpWC(G0wgvZs#D}aY4=CUWZ_XeCR
z`cw38GUok}_YYHGlJ1fXW1Cs3pN}!+eMZu??|EKss@%AJ8OH7+V9IjYvzHaHG?-T>
zn_0_nfqngBurYW$>R;7<F#ci5+w*G+Y%CD1_h#?+DS4ihKG=<Moi#fGM<%JcHoh{L
zH`-9!505W$4zxXL)=n0`)|8kD`hHLF)R>Mv2;zp{bzHe<m>gA}<#u20f8EFOTjnfM
zre3PiE*8PU<`0c{IkoEuI5;?Hf{19Ej-s_XbqDnFf3!LsW|S-ow7-}=U8@NU)@=7V
zJnFf9KWVTip_D2D@ly56mM!omh+4Al3-`^AANfiK(np|B^(%CVc!I#LO?RE9CVNv6
z|ARL256Eb9XoA|FF++$CukoD2lplB-0V?u&!103&KcpMWWq8pUoSi|AMEHSe#1Sm1
z%RNG&2acrT7l&1JrPS!}GZ~Qe=;;X#u4_U;iW(`sx%&D<^s%w3v%}zJ;wmah&p!8q
zxYfI9O9pX>_}ooq=rMu&2#$QTcJZvAD}QG$J$wI?zOxtg-oAy7qEV3Dc=7qNY+%3P
zaY&prk>LwF=v_kWe0QW8W0z}BL~*e+#>#IuxwkgU`5|Qpvx&C%uvdzKOq3O|93Rng
zE81zQ@phdldumHfciO4DFX5&;dd|&HEMj_Wv}yGV={L--zvhm-FVvd|FYBiI<l(g@
zybOo61Vs`;6^<_<I%I+D%(;tC6M8^JDscL<s}RQ<SOr}9;(~1AU^Uz;1*^4QnYH&b
zu0}1sDExX}Sm&(H6hI<P1e;|ka@2A{sgVzyEROkJfdQ9;t~n30ob0=kuochNzH$u_
zR<4*@$a)gtiaat4?!}(8ag;N_Imdp%#5o{_5KLnJR`lBUE(wQK)OSgW$}KK8N|R8}
z<IEu<P2ad5ZDo)Yd5U`{3IoeAje@G)@jj;YqsM7S&zSVq^kB_od1gKmabcfxe_CkS
zt~wTLv6<!KCl}!u$9&;$+6ZH2lhlE>!<^0C^XARL%I5W05hN=OWeMs2I5Amdhpuq)
zx4&^SvGHRVdClK_v&$W;K1@ZdgJK7!K?S&eW<WS}cRZIcu}@og8))L}JH3_Da^4&9
zv%x@tHR4g63rCV-sA|hlK7UmqtbIMfueTi5xSgY2t#01-z?Pig^H<xHcAt&nqc`w<
zWko|ZgJt-wE&?DE6L+2{B_S6l&9v=Nm#qMHSon(M&gI~Xb@%rla|P1U39*FAP6KuH
zta3Baw8F=pQoDIXnYvIuTqFl8DNuQf!36>m{k2e2K^P8I;2NK2X6|ku?FXk(3~kU3
zh2Cn^<eenHdFgbz5mq{Y!7Q;j1<ZG@gCz%3I<v*6gz9JWCvgO<I%$JV7^+HldDEr_
zBKTd<+3v5JtRn?$>+P8qJKbMCX6*uA0biA!Ki~5q-W|#O@Ju%SjY(pGcGj!W*Yb(S
zF!=MB06xpw%CfH#@R*wtm<s(cVHZJ*x&+uLgIv|+<pW-q-Eq6Iuc&{G1{20i0k7{K
z!SCxH@SoKGVbSm3|ASVBF{4Por?hc9nz8$Cb-iBseY!<(y_-Mz?A<~X)q7-d`$Bhd
z?SCoS!NHlk2`>1&wr|Brx<&V}$Jk&YdVHI_H?$x+j&S-!d)PqR&!;vzjBwecZS0lB
zhfeNsd^ncDzfNhofgzvWHm`%;Nv2E`NNZl`NECPuj5Wb+dR55(U7@CEt>~eSjz$6s
zu-T}?9wK-pCrgAmj_?a<BIZt?I;^!_=MJW~mMSh{-5)FP5#@<3*TmgvRBAc}uFVfz
z0%fqUX#6N9BgDZ>yDsdD@{>23hi+RdQk)EyQfh^8D-C-Vp)a3BT^Ly3s*YQYuFl!*
zFzs&1aV(V6X`jLLeA>Q}?{>USP~&UJ(#?5yE(TF5FOgn2O^gBenXnFX9@YU}MjB^)
zdl3a8lLlJMv1W(W{ev$Q*FMSp4NPFVdNWT1CyELEUw_38_5eLz*$UlZY?;l4b+q42
zEBBqabR7o1x_^WmI^0e)|0JJT6>>vSh<qvu_j;Ow{hRz;{Ikj#&j9%@_NLqa86Mv3
zW>n}r-Pqj%xuoYthZ;eqJW`ato$&3b#eGyV%V`hU*vX^8^!5QG!|p~?CE0V9XdyY#
zRM^Ep4*&Vs@mE&zLFU?mOLu(!SV8cVpxz@z$$A|R$c&iVt$2s8Wo%eLXBSI4?(*bH
z%+%Q`lSlK0q>UG@`K$wH(gDy2X~n_O@{2jxQklO6Pf>pPRE$}QIUW9BB6sOyrkJKV
zSWuwfY{Yo>g_H~>jhQG9gH;tYP8wd>BnRAuPOLk}ZySP@l{K%b3ejkY-~@(9v0*8+
zroK2I20^Z}v>g3WOo)$u{YG7Wfo&ZH4jCDgwamkhn$8N#lAlk0BTWGi#p;(Z<bB0$
z5x}g~mNv7;f|C$d<7{^t0B1&6WBV=9Q&9D89Wdzd)CE=4#JU2#ev-5;Qg0%G19Zyt
z>OT8_=rR2eG^@YMnX_DcibZAe5GDM}J9XiG;KM6m$A!v-Fe2JJ4(V|`kY+z$6!A0@
z=NlaL`H1Qko$CKR-nTj2w#NHEF_^=)&@zU9yEo2Ouzn1YlWd?|tDOZu)%w1Bdhd@J
z3@!+C;*=Sull$($4xe&&In4?^y%gmi6dBPI{v=;?nfjxdmMfi>gV?MNj}-+FXs|yf
zTtDnY$$~)Qgn!~+<V$kmV?;TX1-CkRkVO%>Xnu9}a|hL0>cd!=^zD0ZKqzq0`)yd1
ziPjF#sXN%KYL}uG$evS{rv62wMBd0MMzq61w0gMi`w3j)`^jYlnUljc$4tN=o=h0_
z8$M-mu$Jn#WTj3w;<r==4g(~Dj=1K^6ZeLl!%nuOzQNE2kMleUmqC=fyJ^iifOL?*
z>XmfbP)Tp$Al+C=+hp5Gv0HrGne=XikNjesTlc8Z^09JqooV%P7Ul#71ly-!Vo3iq
zgiEZ}&2gFJ!1ZX@X^poL7!YTdL}Q27iPCy2^o~LvYpaCj`aT=J9gWu>DXM%=J!auA
zudEa@G9sn#yyN-FzVF`gx#4yG9{Cm$UjD3r@Sh_A^Pf$lc)qkAlANy&?Z8Zyxj)gr
za{5ui6#f{+352e;Y0rJ@aW81g1KZ^BfS=^FCIUuI%|Z2xcoyhnRNUv#BDsT@qtri0
z*Mi53flo9~<voT<BPX1)N)-p=b%WEHo90tfB)UA!$?WAUr_*J0R3gfy<9t^Dg^Crx
zsE6N2F!*}x{97#IiaKIamFmGmRi}+aaj(AA#)iOs%U3p=9YLVw%@L@#+3_`W)9th0
zIHGIO4>y=98rVHo%&TgYPo<yWQHy=Wzn8P<H|o(gj8w%kNDU#t$_uE7$@|`^+BMqV
z462XA4|W5cB0X2+h1At`^jiqEBW=&oxhpnQjrnmBI)+K_q)K{Xu8(qq-!61|em-Mp
zoJ&TI*hX;*5x4{SODh%$rLUb$gE3?kn3d3Xj;YYwpYT32n;{}@ZDj0&wL%1(RgzE;
zc!2x*yjRED<Z^^7sb9f<B#HdhaqC|Hv9KFY?O6fiKz=r`;4&CA!OwO3(ob@}J6CA8
zj?$v-nS+O>UvZQ~_m>$#{ZvrrS$Gy<8H}CWe$$vkb|%;G`r?k(c`<jye=X{Xx_&J#
zXwSUBqMho)*`OF1cwi@B+)(lQhSysvhWs?1AB0F1u<IPFcH4_An4zQHCs*!DnAN8a
z17)LS+k&)gB}s<bPP-%CziWEtjQd09@M#C-wEst~{R+(hUVAG+-sB%e^7GP~B`b65
zT4upO%0>Lb8-)Co)iiZ)Dk(eNa%Vd8c!IX@*)G!gqImybudh3%hEi_%x;Qeoo_pn=
zB{!rq`<Riq`e~!q5Yl!Q`CfokD-Y(_)?DlU-jvJ%PbNGsL%+F8QiJIrvp&CHfDIx(
z?&RIWPbX+!_ZMQIR~7j&lYCH3W9g^K7EqjW#B)1idb$ciTD@)b$PT}KQux~nKYRhf
z_n!^I2U;4@H@}B2u<@$$4%ckJ;pBKWe}+=EdVQqHNGe@gi$Arzuq+b=40|w!J8?kA
z9~uAnjw^p~$$U--qonxh%-SBuzEn8dL=&Bf6FnTcOQ%=g!_8mkP8VE<8z{@rPfL$B
z6Kg7uEBk9R-4ET1hj%waW==O-f4+R|3Vh%jyzF2W_pm{LQ%hPyg#Wq`>$tu#aUc5{
z#gy<(^(RNWE`P8YUF*A6J!TybliI}B<i<Cc;BQ}Oc;OE4MNFzO!+d1oM%rrXxxw+s
zN!V1x5I}hXekgsPN6f^!zPROxvnLDbK+%%BR?WjvM)tA(eKh&|`nKl^fVtHPk{b-x
zy}Qb@dL8rm%nkfx!N)j3A3Ni?ZN3}54TOCNFFro}WqZ3nO_(q}cMvRp{=A#|kgYm!
zYm5kc{atM*XlC~7&Bxpv>*`dzn?1x&Ao|FM;>~vNe!!pY;Ej8ZhiRUcS_X9T<^?$t
zJ+tQBIIAD_kl;jDiEx}jM!E%>@H<*oufn3V4J=>}kAJ*mDXt$N?t71%!;L*v+8rb4
zLEy&cB<hJcVLi2#vEXF<AQAr_(>(e713S6mwk-<Na3T<K?Ir2(dU<kJvcF(<mnvz*
za4c2gD$=UDN8o)9=nKxY{p}L2+_cWrxi)1W1`iq3W5|eg2>J8NcSfwgem&jy$aZ?`
zF=)s?_Rl1sc;CnJ*q>G!^nScU#mg_{Q_qnF<rv!%M2RWVz>J?;_X4W4VukaIz>oA|
zha($Ocusp8weeCZ!)lV)!SOiE^GB7nkT2p(6hYf9?Ux!f)GgJu6#BC8u2z{!g#|OL
z_B)+iNHNMGQ`k5aNX8|mX;%B*dFA5)*Dj2L0a_#(G%I+2ih1|ch+zZOU#nD^LtIW5
z^NSnrv+(y=`ROWjJ^0ltbhR90b#!!|L{4p*jIT*(HCq&IS8JUlY&afi_^97PQpC29
z5%o3P8DMts3w?>b;<7UN1hTAQ>_UT7)Xd_cm3;i6x6^a=SzI@r>EzPCNt;I0kTua3
zx}h+uvl)OcWEhz6lnoFeB}HJl;uH2R`us9UsnX|zV$qpnt`{kHcq(5Zst3$I?Gfq*
z67nvD04_HJ60T`yM_TS6vGMT-ChXot&H&v=gs-P@OU%N`o~?2W8b|w7e&kGlKXSvj
zn;vlJzh4CWU^Ud@(LR9DTflN~eh=NY`~BO~EM~WV=j+4B7tRqq6v>mw=*dGD_Ch~r
z)T9+WdQDcaN(2~L<At*?<Ta;}mpb`+Y#lnSiMsCZs1>v@C^gz^yy7Yd#UVAj^}@tP
zx^9jp8Jq!Tluc*8kX|93bXt4t<*qWIS~vU|b$TtlxHLY5tdzw4XjqdTo$!I)d=2q7
zAgGF6Oy*9z%gb1{?dR;qcT9>jDKxg1gdbIJofz|;Rc#FEvOCAWa+)4}UICkf4~I=M
zD<tJeMl)21c${0W-ZZvt#}w&w!jQ{xyf^0dUau=UPnv4Rw_*UdKH_0kp3C9M>8oKu
z7?+QqV8U~%KV(xz9Fr(}cVP;I%75ymh~y^@IGEXL4uwyHluo<Zd)&LDre!%ZET?OH
z#FUQvxib&5O29`k7x{MFLl06qnOjP3x4GOFF(@gfsbx~IE*)iX*lGu}!L43Rx!DfY
zLwS<HB+8N%kFRdNO>A!6m8m?XP5FUbix#X-=ai@U&5hlAQeSJJ{qsf`FlGJ!b2bd$
zPIgf{y%iYN8*>DE1_;-mMZ8ava{F0ynn_Y*N28HI(_s}3qJFL{h6{9fLa0xk{(<U#
zLzaGdaGrg+t!1t-m*HxaM4Y&0#FSqQy<H*oF@bPmOW|d#r|rPTq{pW-foLx=4xsXd
zTXfR7M~$2cw|}nV=@&I2h@dn)8=<NN^gj65*U1LU1)Ep-GRC?E9;iwez@{MgW2q)t
z!5U#Z$5TIr@xN^w#3)rSJrnZZA~iN9P;z&9-dlFO@?9nnUaogwzdoG15FS!~!`QpE
zx%dWW_aMB_B+S;OL0(uf!!YjvDz+$n-|27=ZTaJZ>W|h6#_!-%HjU(4^k=T^^4H?&
z)C?;_o^-uP^6(nwX5C5r3@dqP%!E>pqP^f#ZTeQu+m#(AgrOJ8tD~x<!6>_DTH0gV
z#66X1R_HO<T3_W&CHCQ+DtP|ahcSntAg`-RIxodpBuUZ2VOI8?&5w5h;D+A50?Fj>
zEj7<)e|`Qj1BHKzRJSf8NH4Hh0e@bX$HaKH$}re8=GZ??6MNs0`h{HjKDLL80%b_%
z8uiMgJ7pi5Slnve01ksL@Y_{f<3CIUr1j<j)?Gyv+>csTRi?Zx%7|;_%kS&p!BMLA
zuNb9u0+W}v$J9xpU$Pd?C=!&@O}0_iQ8KK^eT!$~PS*3OGgarnClb2r-g82JP~eXX
zlqPBmU$?rdEewgQyLq&?5%P0<?dpa!sMpR2&25`=E^6(al`es+eBm>7b=!>v*rlb*
zx9TG1K98HNPyO!6<t;1IH>F5qBRFP7Aw&6P4CevOy$$;o_GA*C7fqm0f?~}-K%o+R
zxqOv$eDf0a<T2NRE7ej3RhmP|9#YnttAYQCh`m>33>3>c0dWO(?x1DHcuRJg(3eU=
z51b#J`v>(UcaJ)<ev}{8OBKBZRTOW#NX;afbi=Q+UN;XsU6Iau_+3}UI#$>*Md@Pt
zL{qm*=>Pudk^ax0{s&lzlrOLo0Ip}^yup8YdG7r-m17By(aq2MjNTeuaJpVBPc<6I
z!q|f&kCs13h?Y>qj2kulUZp9#vNW$1vdQnl*Mc_f0-Ah5{+MAmz2d_+!G!G~rLeNC
zxUKcu&R~p0oaP;ihES?l(^|dohf90?dIGcZerxc(YymT}tv~|meXKa?1qA|Z@2d&r
zlThYh>8$0`*|qEAxh+FFiDgGF^fH6+$&Opr)H^+(0mk6tCau=`+3`93pjSmfVBa9k
z(&nJmmvtxA)-hzCO(QblP=gIH5=W~PJ^eL;gM)lqgqmiB{DQk@UqSg;W9L$BCu4|)
zi@Jk=BBhGrYs_yo*8*hUF4D=hNO6)Q!inv!bBX<p1vu_nQ{PNF%wO39aPxMYDR-D_
z#!dc9x}2E!>D+JU965ismXkjaqw~4u!gW6H4Q3YBW8%E;j27rO^U@TK_M4x}BmZi@
z@Q}M{VbB~P|F!_K)T4bKPmAjPt)2kij`!5e>q)l`w7x!4<qK(Px|FfdyRiy(@14rb
zE4S`$l*0+@L;!4Y9lY=&c|j@Z@i!2uNFt);la%)BS^P-{=|ONBDOkW*P#uXbStyS#
zH7$v70y1+!Ee+qcUgd?mlP2WEMHJ2BOvks|l<=+;y&qDZ7AN(sL47G&<gsrF2L0KH
zGJ}OZ*~fZ2`V+`}$^KVZLE$tI&{0u5_gARw2OmHU0|Gd}#r*h~^NZ7DJ@7N=rU_kO
zIO0SDrgPzP=m%B<eXa!VS3;R@Pj|ogBY-<{PCe(kazDmdXjQI%(rv5HP^I#xV5G{E
z&`c>E#Efl<w<bZCb|CwLiI$gkUnxL198^<}LGDiqm!?hg;#ZE_R65!MoR*T_cX*J4
zcYBg%H${*xc|&$PNoNoD8!_obNz|#?FfMeJagT6}R3Iu0)&dkZys=kVER5mAL>r)S
zPEM~Qx?g#`FWWaO_m%g+Zp1&@e*6P~_5)Z1|I?QleeVTL@jr{xJR0#joQB}sUjZAT
zm4F;EmBEphpW|O=))d2Z^lNcAtaZZ&+ptRRY)o3f!i<sE6w{J>maOylh8MoXey?wv
zUN-^1*i#tZ>||D@mm&(8uZdF({BzLVt6>LYN~@-If1x`MU6g^1l`+MZ#fwxw7`YVS
zfPGqDqN-JYY7G_sjhUx|gy)3)(0-vKgCAG_n~<XjNN(TOL!8E{suTX)^t6BG#+&JU
z@hQ=0<Edf-Wp4th#ML|D+n)vUs?GZ`J?9xQVDQOlt^Eh6_gS^T!EYTiGs=y-K@K9+
zh_>;ADM)8uGSr?#a+w;7If@GXddQhlAsPgD_^m#|55}&Wlxo$*M&<<Kj+hi5gtDJE
zE9-6-*L&BKGjC)iYes-<{QTISFI;rn4<KcCe*!MuU6xc@_yih8+n_fGuaL3q(f4TD
z7tZH)f9L9P$aMu#IFi4)pMFoicW5<sg=42XO}s3Or@zjIY?R05jt$>ZbJDrKZq^O#
zewi9#OrIb{i7U{I-kK740y!qH-|M*jtrsclLZ!kmW}x>^YhV!gAAVf`gPFFg*#85(
zg8<Xc3jmk~0HO{k`t~|BX^0JIcO%tquc}Vfe>k{_ClaH1mO(GTN#@4Cs0xcC)jtOs
z0ojkrm$mYd_ud%WO9Z);2uBmg(nBxu5LQA6>hDQ}Ra-Td1U6`-smUoWJQEyS7l_h4
zOAUL0tjma#5Bz{fAvP(uG90Z(RQeU-l%xFjbXD0=!<4(O8-#w1q^=ujMTjCe_aw87
z%*^X!1wWih8=E<T<T&1r0b;?e&GQiNjVCQy&U32`uZy+Tzfg$~DkcMjxP<uCgq<&1
z?%Vt?`@18hPgginK2b@Y)8Y96n?(8giGloR8;;|ztBU-&dLQ`ov$DfnWvzp)0IPoN
z4_Kj{v@a&8!HX>}@FSgjG4?V0mPi!A3ShrYFTUQ&wL~i_M_@Ib@rPi>J&Me2N-R}o
z#!+;34%LO!tGnIGClHZ0!n_k;(pwH0bbJT<c<}Ru%t$O#g{6$m{qy;J6?Wa3$8@<R
z+__eo_PJM0{~tmToksY-{$aVTaDS7kjrjJ!(H-E{d73?Z7-ep49S<T-!mW)v=RQ=f
zzTLbul_b=4T_$|wG7QLL`kFK(Z*uDh(FCzM4kef3?l>k<R=!S$>!h^Zn(vF=ML^U$
zWWE0IMJce-w$PC(L4IJUPdlK>`fH9^?WM-|yYorIfJdd|kf)4R@C`fiPHh9rjW$)h
zdl#wbScOnPg=*A?<s3kd7JX)OlYxaBcA#KxnH~vFtZ8^HP5#%60OOXy5ROpj-n);F
zB!vo9icHFq(rNzUn3}*Xp-NLk)#Do+!&boS<&eTfE7VXNVRe}v=)3sV=1{P#NVW(f
zjf-joC<jxC$6W^NK)Nn5&elW@at>dKY|1JhXjL?cTS+*xL5NouY+6}cBJ3^+`+KxG
z&0|@&*6p;Mv-`W!8zAsRZJu&KPk~T8U$M6$7QRZ0Psh~nX{B$T`>eq~*LPj+a@gwL
zi-5Bc)NQR9?EdA=dffP`kZ?Vs+WT4HO5)O6qY=<)z_2+jlhfV%PdU@q|33&SDC+KJ
z1o%>3{QMC9!cHcF^;PubQc)2=w-;S@gur_?Tul*AP=xhNYSs+}OewJ(i6HZF%UgC}
z?6WfVbtwf{hOHg^KIoOCh(`p3S9y1B>vx<g2uWfO&=Cq%E&6Yg47x&26KKC&WDsC-
zfjPUl<#1+d-E_AQOV_C<@nc}%vDj@_$P}*a=CSB0XGopZvm=~1r>Kx1JHF1pJikMa
z7$c|XnG{xcBWdV5h#6vtPt$l<zFO03xafw$=ybL`id6tdP9;tq-yXlA{uu8f#Ks<&
zpI5a(0?lo@mqGF0ti{pBRi;WAt*P^ZkHUP!!ni^;v@8fxrk0z~oTVYF&|SD5Rfmat
z%cN`{K4&1&y<OP%Ga8w($N=C%U5%S;XTB4Ahoh!w7Im69#lkEINP4(UZ;!Zx^TZ;2
z2L!M<9;%fe7POPov9Qcn!R>%sWit!yPIyL2y}v&L@z8cipU<*y4b-tH-nA&`U!d=b
zr~8%L+1WKz&lMkDApY`p3G1JZKL$tf-<HEB2;XmZpIGI(h2(by)^Qm3xeQG}fkuTf
zHaq=RvZ)O`K{wuHyBVxc<WCUr-_%7<mqv<In5lBUB_}M%1iqnzx_EbhXb3z><iz};
z<W1B(&>uJyY?)l}zA#aS%}_t)*=ef;I0@CmAl}zVdob{*R<vpiz4BMqac^cO6lCb=
zlpK-!h#1ktHp$}4KOnry7?j1Kq1QaRhM@uwPf!!rxaR;~4~6p#*n)7Ueo!IaAV5T@
zpRs~g(XS400L?eOaVZ1m&Q$i?<f7DeRHM(u#W64;Hp#M{f}1!8*_G<M!Uy!0U<Mlh
zVkKW0krsgUbI05+okY?YlosrR>6X{n1dFxKV%)C;=OtjZJWp;Vh!MTsHA6J|K|{$G
zrSG!Miym1VpP*_}q&9_hoykv5LV<?T@w!lc-NS%1+L|a`Qsegtvi4HUu(Rv;>Q^4q
z+Z+gk{BK>tN3jL{=eq%nw<1HD2G0?Yy7sqk-peOPib?tINl{Rs_T+BXfcQNCtdM8G
zOKys%t=vVj$WB!Z(&E#JR)kTwIz=1upuOxlm2Y{5%ra#*q*pGr9rU*ac2f3HQylrf
zs@<}T_{Xg&n2eckoPt9>hX@})1JHo(mki;L=?zWQzKVyE<Cyp>8VyGQ`y|~egp6NL
zE_Ta~ULc#C?HH`14e_U5r~dIq4gR+!EUM+t)vsAg8>(@#+!2ngXLDOAH!A8sLdSAN
zsNyW7-JdmvMLsQhkVqaaPMFl3=U4^UCo<Vk7a4_~u`ILM6m(#711!De`&scW@cRne
z<%g%zXmdjbSeR$~N*9k6E8!abw@;gMH?qqQ8+Tr!Fps-2_kronuCM3KyTRnu7}2M9
zb%EWZ|9=s2xG+l4|L9m18j8d3qibHHHSrrR;xM2kMv2=lwA%<@GH6qjHk_e3$XjOY
zVStx%P#BdY0wvR+8Y!Tj6}ZSH7(RpAwT;C~adgwE8kK|OOo4X%blvRhCMX~=FNZ*(
zIcV+Wz`{jkWUuGIiy)#a>av{*lZJDykGT`J=`<9lXfYDb=yUTE410Z<Z09E2E*fMV
z0Y%Zi#;GpOUOx_?I1n0AXZfkoG-YWeNRjP7;Abx6)HhHMllGRP=*@k0U51Rg=*q!F
z;$2sP4mv$rT6amu>m*)2OK`9@|8`3TA1J0$Rjme3^@=sY6yP@H*FDHY_JDd#b>Z=V
z1vylrm=?bKf&j;>?9yYT4R@^GO-$!)T61-5>sh^FKSCnq`Betg;T_*=r(eqZ-S6Yq
zDzxnJzRR1-;6E((CXl@5pQk$M^A@7d-HVtfcnBqM1#;%&KnTPLMQ2~7hTaxpFn2Q+
z>WlW&ev&A~HwRs}3p(+k5TO8rOUgPK_(&S+UX5=x(=xjKztx;FJF4%L&>O(I1daLq
z!3}Wh9q+v-)86kKC$u~#K^chGbBM>-P<O<och{C3w#EYNt?rZW3~R#-Ol!69VrH4m
zvr-btr-Mhe>Co_qR4Qmngkl?qZ`~HmP-$ytfYrmAzs{>-7#SHoaLLJGlO;)M5aq;X
z{`@&TW-Rz-0FET6up_ip|H5ZLH&iwRDdigRXGC$OiyOnWnWRJ^qJ!LwTsEKG$yyUY
zb5XX&QD7QmzL9^LnleYjYxOorv2|ZK)1f7Kg&LUQl*~pM%oVC9(e5L0CW|5AHpX%&
zX5u4!$X+z1xG9N<WGz54rPW!3W_8dk1<HQK7jADW3&*KWw1z0YZZN%B>9mS#f4}PS
z^pLt9F19OKocQ#z^a<tnw(%(Kbcg&FtIr>DGEe-U0t~r}2|oF+0?OI!00Mvhr0D&T
z`w6r8`SEDNm=Smg(fKxVsq1g0F*Vq7{3ryCx&Sk#lc#oWJe)1tUz9dHExMsATjhyc
zdg!sF(8olk(Y(@)Q{LC<9bzZuL*yNuBQ~IIS031VIGbSu$-ryX$A-jHXpxeFDh&ra
zAk&}7?YN+z+LT%xX6z+?M3oGVF>WrZM}xigedGK)3>BMrC=WOH)iP<^kI%06<xVR%
zF)r6TEdG~-xEA^Mp{aMYSUmn6?u(;@!lyz3Pl*X1&Bl%I*o^w1h1#jo%UeiRq;`@1
zj@c&lI$5=pc&(H&lM@7S!tT){A!giELmtPF`Lhy2wCb7??O7sQmuK{A`ef3DmR$&R
zYc7vC`5LMc?j;2oKKqllQUitV=7&;QM}%UuI0IH3w8=%1TB`gGif;LX`Mc|vzZy#P
z<Hj$l+YPIdA;}^HNxnRutpvSZwpXV<K1+XS8~ul6xj+B;ujJVp^LSEBf9B8E?zXFv
z`_V98@Jn&sxGH!_&ym1(xdnN5rGuAZd~ZqEkVpx-2-QJLQrOD9!0^?2*^v)@V!neP
zPZ}i$y1rnHbX>AF!(j){Dnwnat+y@ohrX>Rg?Z{;>ecP>G$?`clRF`JbI7~5YsfbS
z%U5};f*<YDuw^bz8KOxbi`a4&;}%n@>eS{DZOuWQD24)nuTv2~28*Aa4ZOrk+)F}2
zOsYhA*ceCeu%W3jU!KtG#G$N>o0Xl$rCO2q#=YvvqS_-Of^qjo`{_&f=?j}kqb%wa
zX*~GsPWl8@>gXi2+PGSlt?NM$pZvo4Mg{ytW#7J}1lN*%v&p_;UIod-ZJu~&*wUx?
zEtkRVu$jdqyGt0xG~;B^b;|gya>C^NbP@QPW>Yw!9UraSZrZrzK=D{xJo$5HUMu#r
z-YV;cSEFfMJp5wf1w};`AlAF*$c-fDvg0;vVdD^{vm>#4@!t~8UjvTu5A<k_D)wwG
zTNU!Vz3vwGGZ0{w!`{0QqfK9rbnEz0oE%vj{l}_S_DaWDL7*7MlP1)eB=SdDaP0^+
z0DL`h!Xe>{I@w&Jt1=&bg@4UAw1PSUX327Q2&}_WRJGK+I0q&H;3HRSAl*0WOMEMX
zp43rR>-FH*h}LL{S>-bW9F9&5-XjP=wP-A4F69w5w!W>G{r)KIq7VIgyIOlGYTzyb
z@^K>vqAYVE)B0-YZj43vF&##hzs-Kf9xq8&<MZme)b#oE=+~DTMkt)Gs2CfyJ0n3@
zZcb2{8t^LwewvXG$*xI~uEKyV7=`qpt2JBh=h6(-h>(?jatL?E_%+R%Xr`jFKy-c;
z^@?z;L8u~2FzYV2ylVvaQZf|BPzJX=o2Hab?=P))Ew*O4SgucN82U$E*b-FLm2cal
z#<d5zNo+=Mz|13e`$Ot8KK?Ispt{Yr1Q{ngSW_6f>&h`})0W<c3y!f?+Az%KafZ8f
z>F%bR7KM{#=mcJ8On3JW(x^<})w5#)H%qwxqCv3#qQObMwTiTt8nBDbLxQ&>2?1dv
zqab|e?){7u;BC2*)ri7$ZI3h^rz291CB)bwB6@fQ@OLrBCjJ^u5Y`h;XItGvSIdb0
zP#zvF8o4_B5R3PF3e|ux8R4N@aEvjM-=~x?DAS;>iYtfQ1k8OD*5JB1aK9T;0L?uS
z2XKd?uN&h2I)>{z^lw+!d<)4jG!a3_%tFD&%F%H#yG;PQY8&T_r7p8uQ?1_EGBN|v
zt6JYF%q9akPWrR@+)IhZQwT#LH{8e<GV0W^aB<RbF%ro^lJHfh9x~cdNG9df?zH<{
z#E2t!lL-RX*q01t;%)36dXibbx6a_4C})+u8c{LRWC5##Cl7N(2<lUutN_&Iv{5`%
zVU-Q?!G>=~=N?OQVT!b=jOB$e8r3<Z^#X69(pZ%0=X#WuSn5KTa-*PH-7RS8&Zy7A
zDA(?Il=3<Kq;b|gr<+%UHN^G$47YcV$=y5uo(j+ZvLgrEz`G#fLh}aUPp911inlTg
z6yUT%x26Ryt@3ElxN7V4(3|}M8J#9ZqR`y7Gzsb<#>C{$k`K9=OAA1A#fQ9)b_Kp$
zyNj@Q*WZT0&@H+!1lr-E3i|P6sVVUHR|Qyuok16bi8%CYJS!7x&8R1lpgmy=xCIp5
zTNbGrC92dK*Y8lw2o^xHs?J}BF`b|vJL2SF!+k8c0kWg9u3g2UH+HyX9C$LGy~!?s
zU2!}wCX&b0-{kY_dU47|oCaIMhbBLbler8_8%JfhNX5KLA+M2`*pCvmmb#KKEt;4h
zO1gjyqqa^w+CiQS#v~~@Bon^Du9T6C#PAI|#2%f!tW<Kem26gZ6NjPps64aez_FEC
zk~J<Z4Edrtp3g+}lTbrEMG&Yw-%3E%zW>2)J<ecrnpx1Lgwa#l=R3&8X>>GOh`lG(
zl)Q;%_M6OHk2HJCWhVobAzy3vaAE@uhBu;zLL>TDzk&O&e#6P((5R0QhF|lXle+~x
z%1oUC(JlwoTHRkpeuiEbd~z-HTfV9KN;ZbFKI`BrJN9iIp-b=A9a>LZw=4QEZ;9xe
zo93yuut<!WfY24Jq}T@*({ODk030iYHI5NU1<TdqDJN-M&6GMkZT3glSPaC#Tdd*a
zEDC7`Q8I3%lokpOOPXRtNtF4eR5}D<#R9M=?lt+F!4%H<wUh8v#3(hik{OU4<+?$X
zC!)wo5iLQ5+2-rK1!%SLUAvZW#o)@k5XcloFWVD0@<n#FlJ7mfqhOiD-QnGrlkuV|
z%?}tQl3Dy#$S>v(Xo~)*XNq|kBwM}TtUO0}VS;(jQq39+-Or`pdmkn(q5U#MI8;E!
z%7rjiRY5i(Vrfo5>WWZhVcMK9tJyn_UTYe~$FT-BKq9c_1Rz!mp2izPYqwdyjm$}@
z6QBUDTd~e>tDPQ5F*BC7Z?o_;;%wLm^>rMaq4-EBUuH(7x$dTShQec{=L=i|=Y9Ct
zLM3I?*2zimi+;CDc>mNQ8KnQ!BDs#TRS>r|U!F)Y($}C4t~PC)8ea#fx@ToMW{oc6
zup6G_sRrpz(xl`WS=fhIvnXYZa<WnRKPm_rtBzb(x+8K_=8*}U5J{C^cVo@`C8~#0
z2OKTW-!95J$87&xts+NWN@$f@EpI#7FnAOg$NwD4)L?H#Q_4>y@0`8=V3I_X8zm89
zQGY$W?;<_U`nU!ar?|yRAI`U9jq;@-O*$eR8$Fj$Kx*ef;LpZDKYMiL>?N<^jnf98
zK3k?^N@rV2ca)YCp{xI@5yDqDxV#s&d7LFdSxI9hDfKI>*4ucHCRJ=dycN?59W1f0
za1%B4)I_y&%o!kIPRgT45uwNyv@+73<RR$=hJH-1D^oT%vXRBh4<^jV6}D1Kr8%yU
zN!+z*isoKL>kNz)2Ff_2c$G9{N}INXi-1%og^RI!vSj1I@F-EE{AwK$Bk@MOkKHx%
zk{_-7i;soq#rz!o3f4{*om);mHlYx$FweObRRXUbw4osiye!56kKY?>O5hQXzWZjh
zM#(otfAxNL%E0B{BSiPVBlIYU*p@$2ugBxIvmHht%&i9nyP(AAb03J<8kiLr;tLIj
z0lFO^3aj13u|!G`HJtZWsxLYEOLfs(3iL@zvQ<5_{hjGd?U<k%bfI)Da=p#i4}I5u
zVw-6TkxvJZGF>u_4rU+rgxvcrY2T($I-P+;-JHimARY?5(vY%O<Pz0FRG{i{=#Qp6
zg9;}bYe?6&)E%ONWSx<{HEJOmm+S%X(ik{qxIq#PDpE3>h3Ii)lCV({POw64v+^m$
zn2=I(wEig(Qrcb7tO45T$(^5!6C8d64TdbwHK!Sx)9bOu%*5n};p3ynKAN+y*>8g3
z;f%~|!P(~`HVW?+_jD#9=Jp+qrH@fBF5<9|QjSk|@nljJ(NRD7yG{}vSQiIoQp<*-
z4_Hl`*$ho}_)L$BNmarYL&=mQO3B27(_@4k<sO!QA0a1&Gn%ZknshBYNuf=4pz|XX
zJex>!;S*J~R+^^$T%kVcAUC?6m?Bs>6vMFS)T{0`&u6;Wp88zafhdqOGS~2u0Onx<
zTzn-+Q-NR&4r=P?oS;vYJ?izcyBi0DS%o3<&XLk@{huv>js`=};D5$JYkiPdAa#O&
z%_n-ct{5|zL&squG#I$60ZWLzz0P}vTU>EJ;#o3IkmJM|nNmbHhsh4ySpR70*<NF2
zeExQPF2|vEV`yxix`ipwp5?zvL?gI0rEC{*N+PG<1=(HgO)h5M>CzssbcL?2ZC}wB
zwKYfSFUWuwpKB79k_<Zdn8ACID6#)xk2mx>Xm4o`+L=6(4;-n1sCecJHY~uZi-#w0
z2|98s0m$@!&g!B!P&6{VQ@yK{)oFFs9#|$Snu&-$CE%wp+4|iWaX-RqI~qiRbZlPw
zo~x8ch)#<t<`kD#!sPl*El5%pGM`4iuxn8LVAkjj)*r0*kTpiAvp25u--a2zN$<UK
zmp4_E`}sN|+pb7ks7nLbogkVa3AIigLDuYR5!4cSCYgknGaUN<UBH!uAgN!{$_T$r
z=ai|LH0U`Sd)$^K9QB4IzfJtkC_**=1!K%~Fw|ZXdfP+a>&+_CEzYe9E)FX0X5@kR
zdeR0&ELMK_+1ZpV3aW`P<#mbntpCKLa`>yvS3O0zh<r8d&_*%^wR;KR!1~yx&B21B
z>5{{w1{H?)X$$OWc}RdhW=7-+=f5!GIx*<K!jltH_t&QS_$i~?g9*ugv>TRZhX#|A
z8cW~Iaquz|@;m4AuT+MsRhvQ4IYX4UN7$32e>!<5*>N#bZq$1n_80?85Mc_a`-4c6
zcGmz*j-fJbqmzG-Z8Q40TS%NlS}u#F-=Wj2{L#$W>GJobeMoqyu;g&53XPn9`)_Ph
z<DC-rC9o9Um`!bgLyG@mWKT&O(k%Z_JN}mVnE&;{6#-oKm}KZqTavmae7r$QNwA$i
z0;5w@ad6Rx61|KG{PZVC{@Ak5GqfFs#7`Ix<hNmzt+NPB*<G%_H_5<oq+mQs(1&kB
zx}C24rj3bQZYU$p{dhdoQu?Cf)<_eq9W_Py<{kTRCbGvyWI9wobO~j^cDbni#5cHo
zL<?f%j=L3pxEJKb{lcTTV-ib;Bx@!cA14}xE~pg?E;98Tn(n%$7Lh*xQzj&(JzGnb
zw2&qLLtKXMz=i#XkOmrtvngYFC5R1zlvJc5oynr~3fa0WvvPKlFq4U!8464$QA1Hj
zmMf}!9h5G$_NXpeNv=3L(m8Kn5|~l=vD1DdE(THlRHtxl9qw<0v>LaZO*536u8P5K
z6pzO5Qj{O%^uz%A1WCiki}mH}UN}v+?U3(k<hhhT5{90?#r<<)i^2YjW)2CepaHF3
zQ?_R-^%6K2I5!&PwAt&CRR`RAaK*njrhLB@mP0^A7+X{+6i{a;&+<}2irc_YH}}*z
zr6zgjQ!8^oZf{XCnV49aN4kYMWhG&6&yU)8RjG=5Aj@ejTv$LT{K*7e+UpTiR(Cca
zVV1mzV&+23!S3ss6X9It37ret#iCgGt*bwJJ6%i0fu7Q1F8K-Bh+zDhGCG_VdE<U#
zK_nb9jC|t&+?2^DO%gVfDLm_|I$&MRoIM&Rn^8=QFMm1iwR=B{bGS10YuOBGR(Y=@
z2@HI_($&aoB7cO&(wq}xa|#pWu$(`5RiZ-!ze?-9u?W+o4b?Dc5u9vRUYV<rHcdQL
zA7z`3pu$O1TDgpB!!c1$NakXZVj7*yqfIFDRx*tRaup^<ZsLfct{JH;Y@D<@OHwo~
zY7Y%647nRwmLc_ditoWxGG&cj2{62FH4^H<4;;t0t?i8<aHhsJE$w0q*wnwsS;T&z
zXd#iP7Ar(N%Qj6xWkpk|Ny|?l*B+Mk8e8_BA{pyOJPk0td-&De*JP0%PS^|#7V9Na
zf%c+#2BNxK)>fCXqg&NxQYT9%Dry%sZ(kJp0I%G_!p81VAoR||0jbkuNITm1{TTgM
zyEy(o+C>P2rxu3mpWQhA(AruiV`l8<bh5-nhIC?$phI-fBK6Bd?K4EGL75!FWDCc=
zamLt(m_kG82lwg%YAvkT%TO^>&K&#{w_quCPE=LfMA7TBD`RJO%u7Hc%0@DzTteL}
zaulvU%pH|cD`@Op^!A@)lrsUgU=co2&J_WQcWBAgaC))w3u@BfI@a05BYWVDnGuoX
z+I$9y-+Ic3C40kTt!%5(uvuBOaTx2_=*S}_Q%hNrgpKq-5nLR!;=&J*<>#xJMMN3y
zU)c2Bj+MPHc-|XPP=#K7p7KY<Z*_OArJ!=XpeO>vaW1s>wSEh$8I-&FBDWgv)T!Op
zSj)pXzWglv$#hbka|%7@C!Ucq7n-P+U#B9Llqo|=VlGL+R7f52wLbH_mUv=5%7nU{
zojrXhJ%Jhs2zL7a1Sjj02FAXb4pKP1w9tthfklL)kUX5AI+%;s!46V5VlBpbZBJu!
zaiG2Enp;)$WyQh+xkTVsC+%8u@g#nEmBe|{h^oNki9ortk>}qY%6_WCsxI1TLoXa0
zCOqq(Z!l*(OjHp>Bx%eqSwDv{gu{#)i7zR`)Xwp#N|?Ya-Hd{$gYJ9t^~rVxvvLkU
zUaz|a?zSxpZ(RP@i^(DWcd{|mPsq_+|D@6(k)lS7Zkk-tW&g=|##fFk#+awM+*xG^
zhCi9Gw)s>4GNkfu^m7~&CC)r_Eh({V+l-*fGgU`funOp)f;gu1coR;x5l*RAzO>WN
zovbAbIx_1bW8}=~tL<Vs<Kv3%q=Y2jb})4phSVD?pw*a_F>-o$ADvf>h!vjEd{&sk
ziNTpwpNO$&U?l^xF1rk6j=XX)h6!rpSt;!4;@3G#w>HI*)ULn|ef?6pi`ZF(17OTu
z+w;?)Nc&wAA>xH%x9j8CQXuH7Z^GuWu^+fewCs?5$pHwAAIq)fAp{EHg7dDf1tiXf
z^NRA=O7B|bN`J_?Ng-EoxEyQ-#jfyEJ!9|9;PfMkkg#Y3#gG;@&9%gmmF(bjQCwLo
zK7wO3syT1M=kSrSylG4p7FORjixKB6Pv9IFS|V2dwH{3hp0X$*0L2L>F&ft-jkobJ
z`ED;Sx_SjahSSd$SAD{6DDlG7nZ4K;5@rI7<j3fX!qBj8`A<NVHN!T(xp*op$~QLw
zCoHi}{dz#=mCoUmFuMUfo^7Kr&)B0r+s8ByYv~7Ws`GX?;VS7S{)jQ`6n{H@yW4qh
zWXiX`-|jK`C-=-f20s6SXN3QO=jIw>>%*&QWY_c65K$7_lc}_tnsx}Fnrw_*g)x$<
z{Vvb}A~LG@Q-G8dECb9)>n?7e@z?)j>KYs>U$^#5oF-3AwrxzFYG-4zYiHX{wr$&X
zO}1^@c76NYbI!fr`zP%Ed)K?xvmVqVJmtuahPA8WS4kyUFx%M$<_D2di6ZeaLy<>O
zQDq1(mIylX9BzC8^=rU>;VBYsgiOr7aeeSb4|k+MH{nS>PSRSgLuauF0C9m|JinxD
zRHD*U;x5&5&@H9$SRRmVpzL0FbZ*5%Nu9VweVU1jELM6j{slFvz-*Z$@KrToS~wor
zd4kiikE?H4<iOD&=CNH$;wqmj^XoaupAB?D#dj*dOY%}c{Ddyj)<V{wR{B?imhLuD
zAE>I7J@2UdOEW&j=EPtLrSZP!zVzwGRlL~wPj$2mt0d{N86&hS`^n+*VA6|#AUiXu
zC(S_)B@+3(Q{D}XfhZEl@F7^VhM{(rcacFW0RDx@%Ye=0ECWIsUIHfZTW+kpa46UV
zqXh2=iQ-_M$3iqOx6@@931As(Muoc;(+u5FXYAFHGE=A*Z>~{i2&ii7)SVIwW;w+1
zK#+YJX@rQl+1%59eKTivpet;L+h6N%f`b3caK5hcdqG}-Peyv)D4GMi?gXPCl$o(H
z5+b*?7b}=S@zc0hQs?u(*v|i&G8@aS?W*)ZMEw4t*g}vaAh0PG?6~xxF_-XrEOqM}
zTDjm8PQg108h0EK5765M7ZZ~p|NB1q^8jOKIvPD!GI>C9bBSwiN+Pwy?%dC+lrdfU
z?1fDR67jd$Q1wFUfU)YNEvugx88n-HvA&Bg_DJ+NXNmoj9>fZR=po{4q7ZjOO=aYe
zR`4=`HMcTZ@mJ~P;Y_i<VYvrRh766l$mvoJ)8vHT*}?jNecUNZrw7-hkz1}9f?GGO
zBP43IVz}47&TIXBO*g?FKc=`8-4gr@d&+yhUHzD^&<yS9;O*V69_~Wkjh72Yf+4^m
zBQIpAZC&x&bQ$`>M~{%@$ZU7<=6kFywLfCVL;J07Y@s4Xm0OzKB*Z5*8FJ6H$`nh_
za$aQdCf~N{g+1h@BnCa3hO}v{{{%(OfD^kquN9_Jg9jGUqb=glZg+H&1mQkR=VFNP
zbYbM`o$-iP-~x?^$2bG&N(5uBk+1oH#IxZALO%G1;n9um-77+w_G~byc$3)h+l7Al
zOc`A`YB3fQTB}N=YdB!sbaEt^G`v5xtP-ePnM&;uUPAhvP={?U##%A7M4k4a#6VAw
zDgyq%L3cn`5Q-Wre5=FlqVEO7!7tIguK#}p`~S6K2x_-AM5n*cRx(-N_^`tH_H*Pk
zs)}YV(|(?LcdEVpoIUHa#kAwZ%42+(e2mlJ_uLDi)9)lxEcPO{MqISz8|NKEnY#ld
zQzs6mw$9nHsM`j5Mmh1*pvAwFlS7kNojf8n;2-y$=Ymfo>QZS(`9T4FdvmeAO*OTl
zLOP2X2AX38jT%S4Lx<b?zigiy(xgR48;B@y64r_q@y<f!$MD-vI&7&PRjPK2HjqUX
z3R(D?ldqcYS2?S#5ZKSo7=Pyjdbi!B{CeDF$Ad{QzSeJvdqYi%_bspg{;=k?L4UwU
z=!%<WP5=~1LJ!_JAn3Q^tWp1B%#{hqJDI2N4j@fWBDz47T8vSNk4O1Mr^P`=)x;we
zKU~rlnYu8|4M=1TD0@<7Votd(P|OetNn1#d#v@*^N+PdS6Xgv360JD^UH!87DdIjt
zPbKq$)T5(UADIM&QJv}JF&P<$lQjsRry1WOnI&Pu1XMUQRa&!f?YNHf559~s69I-3
zpo6UU*`wp3U4^e|c?u2E=`<N7GM&QZug5CgK6!~3qp2sFuAN&pA4L<|bMqVsNf>UP
zAY%KOQpNW+7&UGUZuKN}>hLcDwQ>_9k4Q(fz5lJ)T^~G6F#j%3F{6}*)2hH5_+H9z
z9dduGi`ZdF7_p6fpYbf(-aBpG<fFJ0`Rq&tVOW<3>NkTu3IpU=h7d01{4b%bdB~>7
z<d7IA9LftSi<+&IlV`r#U9V=HhE|&+zeFJFzijcEb6G<{-*Uo78Ud?Vb;Z@@$WdzW
z09poiq{)@?iD9~iZp3JgtRq=x)2absDrWlM#D)p7ck;JtqbyRXll=THA<{MBi?P!G
zu&JXv>KkW#s&Ac}{nWH@&^rv4Jox=G<?hC2LE)u(XYy#cV7kQVIa?6g>j>QAqN9Bf
z{rcUZY_5#ZxV31DQ`c7a^FvXk#8!gYL?Yn#WmBpd-uw6wU;c$A`mE&iWc2vA5bii6
zer82n>hUz$A*QYCVY&TGs8stHF_i*jH?hoKj$|9%D2iQG=0cwEQl&8fo3`-9A?kfP
zPXCR_bJfY=r--|7Jv}O`L5m|hf2RCHjbSVo`vV*EB^wRbb(&+#{^vgCDoZ(XGzVaw
zHq4lWNuFg#MUZUs!BTFFj@Ze~ZT$&479e=ZeD2GNS^%K@p3aCkG2a#_4^`R<1AFT<
z{Eh<7WLD5wiT|+Sg}?q(;S{JDAbJ6Ncm2Z)lIib1^mY4xdWdFUDP6A6KB5K?^0i&v
z^eXAyn_s&Ea>64_q<_xXLFa`J#SVl-${&?r3V32pseV!6LwJDGw<n5h0YK#2?!o(i
zVY08X#Y43-Q2#!_B&RflNbqfrgpofFdg#8*+8#;f{G@CC%?O0|LBuxu+)_k;Uh*Sc
z&=*z1#Kfzcb{CcaA5We0xjCo@5uBC8oLLG{Vq~NH_d$GHOBvLW`0@gzZz<F&XZLJK
zDf<oCNT&8&y($7@B*jrYw&OFU!S+lc4_ciF7a&>Jn;m7_jl0jg)5qh$VwES4+RE}P
z4~J*QX)sllWLu`2W$Q;4oKnEo&c+8dPrr~%qF+(s@iIK`o6B=5Y^9hWBI^S`-gWnp
zMCrvFwnWhqKT*-lEMrj^^HxRO$$i3X+(Sx%SA<|f(T;rWfLXRd6sl4|Jm{S@-1=^2
zsIQS}H1OPCy)*c!0r#{obO3sioyi0xf+SQ(nF>|hdCQu<0sk<1#n8#1%8<X61OU3w
z{Dtr1;{8N_L3q%aTx4c;-W^tRZAu2Pq{hojoq#tcPAa37+Y017h(fK@<*aCfsswx8
zhbdmM-%(bRkry4USf2$R`COmy+u=@tKk12Gj}}Id#_6j4|DKtBb^pi9v4c+ZJL9&$
zB)Gp=2?P)k@+tfY_X$CLoJbycggh<*`Rpo4UcXC2Ktw}7ScYznPC`V$hw1N~8patA
ztTWO5mZ%s$5kJGor)J=T&1br$PKJp^>>32%P2isQ?6^tmuXy8uR@Slmd#LuLPo)8I
z$$R`YO3#kNG$tktaH$}mCyJL6mJ|EVLJYv#!<DatcY=T#sM=RrdK0hjN6NZ8W_Z=0
zRn?)8Po+||1UUq5p}`4W+36110aEb-$(4qZvK*INELP~f>H?22AfqvLalVznJ)4eZ
zUM8cGC5)weZ*<xg6OI`a-aDVj`a&fpQ|^x6Ut#$}r%_XJEv87sU(0yHWAws7p0Wie
z2t>n;hh8&}eUKIy%%9L}2CYZaIO5~?D!jN}u4eP5;bF`~(uxtqeEB3rpEvGwI|}Nx
zaQ+~AHQ<AiBxy2N0;rY7`=>hOZV@6STv`??v<XO$zxHXb$_m6gWo|G`n{qE$VIvoz
zr?Z1^xEe&BRv1wE8)bO5pkbDsjOoePVF12F6Nuc^$k4MaWzLLzuG08tTP!^GzgIS2
zFjdPi1=yiwc$hCnU+!u$FQG<H*$x=nSqRWHKbbdT;N}i{es&e}jB<G>aXH&JwE)+J
zJ?g39^4T8Nvh@q{1=^|Qm(2p`=;8YpM$O{ivAaq8P|{)u{Iv6yI5G@uDD?HIw7U`B
zo+HmV{K>Vr!}Z&9r}NTwEAu$)hA*!N6U9NKIMH6Qc`DyuHzxTmg>enXrWLW&V`9T0
zB&IdZIU+=ZC+%4-riSw}&QgS{w1@j1K19dE<T43?Nc<=BZ*Kl=66<frbBiq>EC`v$
zl@&KTYh)$%u8Ra;xe$J}bYi^*1SkQK%x2oiz%uAJRd=p_@H+QEd5jKdtfR(5?O7&<
zgh&#;Ac;&%-rToaD^Jq;E2;8>e3-M2+iI!d<NXw&v-hLNN={{me-0mg?0yBhgwF>+
zRA{j((AP4sME7K%^f=pIm?S4V<X9<o(1$&lkD9cMUjon~Pk$67?o8{X4-Wr=HQWq|
zX9nIwo8n{`G1t{mUGUkUEy#OKoJ_c_j~f0Z!i&z(eHv}|Xm{R?rk(qOL_cjvDAo%b
zcgFGw<Uxut8hCddrFDO!O#AmzN0{Ni)6QexZ;heEV_>`1{2{PjYyUX^1pSVEfmw!6
zUmOh+6Arc&i?K47AL;|9%W<gdi`o$lSVaEI_=zz<*^K8tb98ITx7~TBKq!K=wvXab
zOv@ytQW4SHC(FQ4x-bJHsTXwhwzhD|ueO6foBWXatZ1T_!2}mDl<3PXHaMa`G^(W0
z<P60|lk81en=%z6jgj)|s{TFiv)$0ckm8JEJ*U#<vZhq7!`f#Pb~qP8R&T)@*T&S2
zCBsh|ter|sUsrWaSegGs3*;DCS%_{=SS|kMds}#U%`YpE5O*eS@$5h5mpCb{Hs^o%
z`KP|kp{Ng<gv3{Wxi{GMoVHSfc&vP&;96D;X3I>Yf}_NUf1-ecOGp%@sh@1t&Eyw|
z$rZ+fSWNEZ)-E>tGDn65G|-q*p&4pF0>CBGob?s}nL+>Iz_`Azv-<<3Igd3|;q$<5
zUu-aiUi25e;2<eLf)rnjFHi3DL=nv}SvJ;t9=`^rta^buZ8Dyxyo%Z&>+o}r!SVL=
zmkjrxL7%2r1ffpK**C63pFdt)44cL16<l59={IIZG+jCRwfp|*d@?$({B*?R{^2mz
z_L{eA<R>m10&}(Yw@%S10tG)(&xWb#24-aV!dqJEMmw6ert=>s;ZGPcXeFuV-)<`M
zq{(+4y*8FYxH1<*E9Qk?U)(DB-4v$D^j^nOJU&o`Xi5mbN9qx2_u2(QSzp)<T;8tF
zOdF)<wFjXF8zZ~G6R})B^9<U%$T`8%X)T9`PNaJGtzoj{ZBGvnYg43>4V&68pJac^
zoY0y;bWTEU%7FRg^AU!|Yq2>){VOrutpc2#QK0MoSrP1`;|cP0MRNke$&?lfYW>-`
zXf5p394h{ci)VR&>jII-cSS2?+p>fA#Im$NFZY38t{?F_%X-fJl9P+p_sJ1B()W-^
zo8-PFZ<;4bwPI1f3v5x?*IQavW=bmQ8PR`(gy0Yfp1JRgMB*=(Gw9MfFI{+Wkw&D9
zKa&X!E8uMVa^5)tsFf%Bu<10z_G(i}lcP#wkaOmK%rb-%YD)BLV8{nkWN=JIBCd4^
zb@Yhm6aB^9U)<sAS#`P58otP7#2^_gcYVTK<oaiIBk1#A^+-V=8iv}L)%3_714+4-
zEe@9>+{?p7;yb>8>6J*8qg)_dT>uB7q5>V5sV&`QZ#v}s(Zl=I3^a*c^~ocF))eOo
z!A}-imY?SQP(OE&Z{dK|zy;*hms8}wFfC?D3TtscC~u}81z%m>7BN5!yT8aKP4=pd
zw}b>RRXJiIVKRFbPqc2|Th$P`9#1j&Lw~dGj1xaL<{`1>$s1R!aAM*(?!da;dF02%
z$c&U~L{uH~dlI;;+MbD@a<KiToxm?Ct7z=eJc8r}|5ViB&RgVGIt293r<lVUn-_qp
z(4KjM-_C;BTv}h7_v>_@5e5*W20b)nUsfipm5+a_dV<e%ExlH{7NsqsPOIK_B|&$Q
z2Q@8OT|VxnRBy}WW{M5%GR%w6al<LRY!cU5{RWa)McS>dY#>}%cVs-)`SNM!$1F3+
z44-^(k~_Za{=mKwf~ZT`i1K(pHXCi%Fh}`4j>sQ|@`4zpF+@tqBdJndEN6ZPO;EE`
zyMmn$hk?vhD3jUWgUELqIt&H_1|;kdqPLnKL2GwcqJQ`u{0}L(bL+paS}t2!WnyC&
z0k2`_D!bQyav|f79~8BG#z1>BLEMBf)94N~DiHmC{zBLB%W*^2BHLTuC;TV#I`+9-
zBWp=40_|4AhKae=7*5nSQp!?e5+7e9;j35+k*k@5$gSJWrsy-|P%LlRx2J+@A(!>h
z2B_pCo2TJqCXAF~3DFoocRq?6q4M&UlJ(}sR`D3$svu}SJ$}1VXAUuf6bTdwQs31V
z?gs@?j4|%<Ip`EypMq75yP(S`G%8(z47lo`KO&Z^L9uW8Kdfse)|U9?wyVbPu?fCl
z(&&PhFSB+ZGieH@n)-<**(X958-U?|_>M5PmgAw^|6r!4ks4r~c>F!nNN8&^>!heR
z{Q_pYYWD1&RhBO=mNad)b!E!I!n*VPTrAHk{p~y0H79UOBd|Y^bb-_zYm#<JNmZE;
zY!Es7mt!_?@VtSGKRU0*R;bxS+Kp%3bBt*f#E0c>|A0GRa)kid^LE8`WHNOPst1Mj
zvRiS5i8!VAvYH)i^^YXz=qf`s3&=G@Z!jcR>`Btvde>_$xJin6d9lusS6N=c;c)WM
zz;7J|xm_&1%A*jV-O3R%qZF?eCPwx|4gIU(3WxYFX1moSOYc>YxNt&xHB!<WE5q%r
z2ZCFJ`~_e_TT(&bbhtpXVy(QKiVCYJaF9Mh3IgCHfpsupCNi-}k-@hb*;S2$B`=5h
zTH3~D@-bjA>AVn3xcW3pX!4tzo6+BZn`|r}2CyI1D5B393_Fn;UaCCN1)91KM`x2e
zJ^{mwZmJS9bD2cV_<SpE>I|VQ*Ot&L`m3c%dhVkAKE^iVacg2eAG)58BA3@>d{3r6
z->kEU%w}Lig_t<9n4eGT-FV*uKE|qFfQT*tpb?Y-haU+dgpq|}ZP1q%LyXTTWD>v3
z0=^1V;O-NGf|!gSH>{c<uqRG>7Ztml$eP`?;&`V<`GI#RcZe=py}1A-V~XP&eIn)V
z<Sm#m$z7W|FC6_?j-%u$W|rU~4gSmxA(ymhk1aeA0A4?dT+u|TA`UIQSY6(ZE%wtE
z%R=GpQ%szyBA`ar5z<8->8fbx2HwXf2qL9akwjO13ma_V6)DFy&5dhSC?N?xFXrbh
zD0A}q`Gp#D<}zfi)@JUhwrb~);N1Ng32(&#Y{yl7_Q=6fG$v0I#)-EYG4h<-dqJ}X
z!)mb(!{QD`@*4-$YvAA#658Coa_r>w-rTL@T2q~R<;Q0Z1o>i;4Cia3Lyk4yit~!Z
zo6?<l*Jd^PkCMdBxsgv^`ON<rCLg81-TswtKl;LreF)QA{h@c6`tsK9IQLz7v$!ym
z>6Nd>r458Hf*@?Vhcap9ak-Dp7oi0adVtz$`yIvmMq|cLns0sNRvmE4Wry7c6^Bf2
z(qf2+@DupBy-s)=k(p<_-eT?JsJnT;8Qv(xsaq){fm%k)6>2=t%H=8kLYkO>yPF#S
z82aMv**qq!3kXe~qi<R=NXoz21{;aX9DG?aeB|j_60=?Rm?3!7X?dvf%okB!#y2NE
zc0NlY%b^0u{Dho8OQy=rm>y=B9?WeMew%Ik>A-xemT;4L(Ei{=-`!flg})OE87ZkY
z2p?blJ$^|N8IX&7q&vmTO$y(En1<EO+n$D*0=T#&sd*y0&aYvqB0nbiHf4_4cxn2T
z9DMM$wVFvFugiJ%a-Q%g-=4{P-yX-I7z69%grTt<uRNU6zHwe(NuqsJ(O8=Nwgt<H
z1hZAI+1wxkVjSG-0%c1oFq@O|o7y<zICmB&imG7mcqn<`l`lEscGp1!7C@AVZsT*G
zEsVm`H#B?Joqe<M0qXhDn1x)Y9{ZYQ*`6rj$J6qb@Skroh8IscfABrtKjZK)lQ6FY
zEk3VpylHBHM2w;&+r}m)U2RXWlk4jdMIC(QohvKL%SfRE+9j1S#I7!xTAtn77k_t3
zp0WR3(*<DX<-QZPyZ@xWI}q?kz~}UnO0?|l?Ij_KrVxMLu*!5Bu+lwyWm_S6-208S
zn>)AXyTj3TFb{20<ArL~qQ}Ae>UIK>B983DR8#0xe{saY?ry|qR<emLizne_A+}B(
zON<H{sB-0p)~faV%$C6pGG!1;h7?%G_q^smw>XysN#u3=bhe_Su05z8HOSi_spyaN
zt<M$k7wnoMihoSm`ddRse2)C^;euO{P5c8sk@-iY;~DAt$;WQ!x9R-s)?7|!Jwi&=
zK6D8-qoRaViQ|Upz)90yi^F5=hE}L~1;K#vFUNthKp|J8V8$OA104!I&i6m*9dXVE
zs@LVhB=-&W6&0C-5QwN)n6Z6Hmcn*nwr<Svcp5)3<4X*SQ!KG}$Mw{ZR{KR?@k1+U
zQgY?hS0iYSIjAhIh52hrspNc|nu?8-A-9kr6G0LIg36H8bP9qtG;R|Yt}if_V;F*?
z+6#qmo%%hwZ(kXAZy6=;^33)_g~UcRI!qDPpN4O$o2ZFl7Op3rK9({Ebkcu9(6=KF
z&89CqiF(oFaWaRb4?tbU8X@F*Icvn|+V=$q!=T<CWL<p=7tSwK;Kobz6Xn#593Phk
zIdzE=85~UmlQ?RzsVB7k{bA8_-1a3?30^pUYB0O_x=Yf#ytf$rhiHD4`su#}HXMzD
zMEWD(9sPCA?Sm4?h#SPVW@L@;8;TuZ{J~K4!5gesP4NIL7l1~%ltK|Rgo=fY&6ryX
zTWdJc5B{(g_|W+wvwJV!95%iW^3r;%1W@5I27&nvL=@`3{Em8Cw>UDu$$UL$bN{$P
zuQr$FdOvGd&gMmq_ipcL&wbp_eX;qt&rKTKm)s^MI+5vxhCF63Px3#ZSNqL+vl0~~
z>|VpuO}s{j9}!Y0JXd%FJK19X0}Li<a~297&+hKib)N^VS?c~hocD1p0cvxlHF$V`
zOVh3L)5?b@04ho_wXZVREV}2bncAbH^4({sOnwcE&Yupx_olu}ZR_|Nt!Q5NT<D@;
z6&gw+N|TQ$K?AwZi{W|(Op&;tUw-j?CgzbqJJmhg*iau3ei~uwD>=iRrZV|4lLiOt
z_ogj9=Y$d;DN{J@&azuI?21b)TBvtuY4Qg|Zl69d0*U`eEv#k_TDHan-}&M(RV}v}
z%GAC`!YLXoO}d2#t)B(HT-68OZx*A=ct3&<=VaN5k(IH=_R}t8L@sEy{kbKj@<*sW
zy7v6(%oZ%<EE^e(K6T}7bIQpUgpTl_dl5{ShKaXupd}Z>4mehnMp(>?yW#?_VJ!Uw
z##-lW1ZxzRmI|7gQ76!8hTMUy^{+?h2ZYcy!{!?rG7rp-wAw*LYUbDaiNEFc3%LK4
zr()QYe}D@Tza32DXJ^d~#gbQ<9niHk86h@Utb`~ON^kWBqhR3S@n=Vg(210GNg(aj
zpnUQ*wKT`@k3|({N{;%>NUbGKoi!x0qt9;9>mSN#P~cxJpISo(=rcV$N&zoDPz)t3
z{3d74wHW!~v4YlobFtwFnJ{kJ|B(43=z^yM(N|wVH1+eJ91`A;L6E|CF2x13;qg~t
zt5t=1rwGlbF;yMcKB;+M&RE6`b4X2IVKm*FMhy!ywjM$?8UCEW5)Jf|;-gfdY5OI#
z7jT?Re#xkg=y~675B6Ze7ZB-nhAauR>l#xkAM&ncR{iA33ub^7^Q*#bjw*JqIbig)
z$+KLyPAXQCql-(rsPgz*KsBqF`kVcLnE8?mj>tsVu#0FioK47LDIk!8tgXsty(TU^
zvmq}&S$8|9jV9J!!jc-RUIOrqHeewzopU$w7g&?Q@vJ?`NLag0M=F*)$R}u2XRKTL
zXrR_z304j3+x3s@8-_uoOelo0mJ(i_A~ljs<>}UKZ*=KRKKxbx9-f~57m^Y&qJTC4
zoi?lT{Yu-ts~F(5?V>}igJLkyLx(2Rqfq#Ab&L0ucRq5*BUe5m>Rw?3g+IrHKRhC;
zOVy=qbbD$*h&MBlNiB|+$?04}!{d(Cc_(!pRQN4ob{|!B*x{^7(Vt{K{XIu_&VMW!
z{lmWNxB8)Wd;Purb$v-o$JF%e1os{4dFux+_xqy$VyhE<KtMnqL^N_5$<B6?#+<py
zU2DALsyCAZWYb+CRyjdqM7@&P#Kox2)F|3tw4Z$DR8W)sS?Z{XJAp}1w4+}JuK=q{
z&MYjo1aS8_i5sbV(lK*rY7zIq#mqwI`-kL4aDR`)V@@Tpo0={u5}QudPiQS1Bx7X?
zI=aN`W{h|23tju%z03^*#{1Gw?0>Qhu#MuDl1xz&*)4J6^jo&GFChTmB>@6fYK4eX
z`$B9K{>-biTS632p5#~4k-=9LPnh8TfD8-WFL|jcI)(XAX_kppgk?B+!5%^}utI#l
zj-bWBOD*EARJw>zGiUg{9298^UX@}aSbnvG)h-=m?*4J18J1e9RS`MkLxSPUgkjtk
zJN3hb3-pBtwq|mK6+UDnknOV_>8=U*o_XkMhV5Hq%SJ&yw}FE1<<EoK2spX8Ca0#n
z$1$1nUgh)!iKp*OKvJ@|WhfXmn(xsQdyE_$-d9&PaBy(jqsh#NCnthd+VlZ|0gRk%
zAvwIlFjoMLVQQhf2WbqL9j=5?;j9np>BYitkwW=SgDpbLRVGi8Who0G3D0>r69B!C
zEJ^YocCGRqV{3$ttuTdSGp?x*k$aaLh!=f`o(<ZS5@O@5V9^M->rdJX+P}>fMq@~*
zF$ZPXPrz9bR8v+Io|t&8SBMww%4FsvmxVg$S>WG~6uZD@ZyaxMc5ny#WsYO@stIag
zcCIky%d~t`t(q~}-`?@Fnwwo(A|0n+&)ot(Q2){VoqYZGJ$fb6&(`Y5PrRGqiGB}Q
z?y$h_xLLc<x#3Bz_WIy8s8vm_=WjWeYyOrBmh<jq=0elB6@K{)eUbK7ciAFqPm()b
z{KJrC0feHVrSWy*ju<uSIJ)`9C43W@t=sHKI5VXUrZ5&Kw>jBQZ+crl$VZJ@#beD#
z^@$#GhEpz24#lSDLX<FK6}u)-rdUz7!%isenzEjO@j?V6jqN5!I3iVIi9OBw!wSh3
zJWCMc%kmm|A1;=AtpB$2gPGg=s+b$9|2k=Kit03m#PRS^eyRAg<_M8L1%+Cscvd+h
z;a-Pf1Dj67I{w<V5f4a+{rsL(hE*@tMO3O0UzV5G#-w41Svj2lUgzUAF+}LTTN=4}
zdE}k7g(i*R+)8}PEC3~`(l}3~`%92aWbDd_!zku)gx#w94trmp$;{bPWr+t5NR@oW
z-wTZ_zVWj3ncJyI`5qf`8@Rc0pyfl7`xUa;HWMLx^R~_9rb_SWYne(j7`1X)Z(6e*
zquD%7^M(0XB_#$gC(~a=e*5uiXR+3e-SJ}GSF_b=YcQHv-ZHYE8kzFevc`jC_O^hk
z_e;9qnL=DIP%M*KZuH2ww;#xCvj-Yy%#~_+7vN_e^u!i#Mq26$IJ#bjQ=K^{Gb+2|
z+<i$f<eyu2i{IKGrz10aKx-G-Ocr<XAW_m)=RMoDx8=Q{lURmAs}~oPs8>(&S#tfR
zyNvY5N@%Cyr@aFxl8t7d;Br(@WzFa%qd^5tO^=ihtopiitnfV}c`f<&1CL(41?G~5
zbVM~!B5}L@!UNyZ<z+=qn~(OT1h4(ILMvmR@1Hg4E9ZaLEuF;#nUVN^2>4B*AXCoQ
z+z~BbK!!QM5wx)IaN=ZfqG-_+>fdkg4JBbziMZt?4>l>fo@b)e!BLqALD1Qo22-~X
z#WH<U(@Fg=UN2x8Ep;<&5)ZJ4E@l`ItQ``cw}LfbwB4NP&)xMpS?=q>GB}R1KWWs}
zVS72>*_NqK(t&#|32<zde2%tC{+{!U`#1;n1yQ+WCAtZ-SueH5;8qwLV`NKq;>&#o
zPIu@)pmmuSoJS7|h)$K)8&NQ*g$WUOw3jug!!L(bb1t=JHVA|Hrt2(j%%t!eL>~iy
z#tYrORV6W{u`^?UAQc&SA?jqk&)`h0(Y+DFU}-)`F3|bXkK*ip5WPuOT5r}ZX;gyv
zW-S2m>sX!^B`?A4IEgtI((C3WQ4F*Bs@P{Bu)7(?<p)y6@<M2()l%pg^u%Bg@6e=4
z#b=$2;z&DJk*HA+qbX*84rF!{Hd5L2?S#E-fsZ~$6;~JW`28apZF*3xh|;lIHVR_!
z{%qyykXZe4H&#aPqQfHz17CzY`X^O#Oqb)rW_?B>lprF}nQ_I;qZ(r)Ze^1W9UJY1
zfKh>T3<(sY+){<*MkK>P_%H(5w7zrAZ~Bc!SUz{XOqO_Ze6$qpIQSZqJ)GA*_>;*s
zjl#~%5Y||nFBmPJf*EkTk#{ni?Tx$?%-uQ2V-8Bi29KQ4PSBXCAfDXh@_a-?gHrOE
zpeG(Ye7LQ<tf5Y`M$GQhV=n}#=uX=0!%1gy`p*=)F)&QhhtKSJpomd=<u@})rMVf|
zsqWTrm@k6V@(;l>o8K$l_v|~CBTn`>+fTRn;Q!g@ws`-`gYFDg$xUp%V``m8q4@2!
z0P?Y&@VIAozAi2_kgcLiSAw%V<EzYy!O7PX!%Cl_vKTlZCd!x4lg}X2gJy(JPK~*R
zq5MwU-ObPwA$+%^FGrb6>hNx%0Q^A02Ws0lvTlZ6G-Hh&HJu5`(WYrx@bmqOAB@Kp
z3A~hX;tfp?bjt_817#<93T%aF4lTRJ7RvtAn;8<9bVUUVI85w+t@TaGy^UvOI|rtT
zln$UU3VMc(mLT4TZ9et9Id6&bA!Oin|5=P9;mW&>UvHQy+RDxHhXR5)(C%uJWMX0Q
zTYWYBwz9Z0#Sn&#?0O(KMh$zdL=vH8?AV&}8h@hUJ=5G7`pm&}O=9@GJD$e1Mii&j
zR!vu_**q_$(nR5U%WE#WFeI3gg{5a7iYD7LqSrladSN4lZzxMSR{4WH-h+{A1A$kW
zd~3b~j<|{Z_nfgvHt;MM20gp8d81V-)$SZxcO}YOEz0d!pxE2bSXkK9RH`dpU8Xh_
z51CU`Vn&@P1qGlES9;a!<Lz;Xhp!8ikW21+;!w;9a<HDDt=}v|ioeQbENGM%9~CCn
zyC`9`yF7NdsVbr--tdmUR>>LW{_555Jeo8CYA(GeHtKP~b7QY@0R-O+*24^6=ThnV
zm!HbNcM#M!IM(Y5%Nu7t&MU3njPfUY81bNld-J{e^7XoHJn(X$sj08rzFYkix7vAR
zVRE-^E{kK~a=oQ+JYV!C&vXZqIojX?#iRk~QsWnhnR=~!B&DUrbM7@SJQ3e7$a%db
z$rMg3oDTQC>*(A6)5RJ73*`1&VI>^z;kDBg-T574u0%w7+!8lEtiO=B@Kd|Jp=+7N
zoDS~U#ry%u!VeEm|EzM{ROxiNn`m&^&C}RB+UHQl@|V#0J987lz(0qUQNT~%F#Trz
z!Q!Vi{cyqK8(Szd^1bV}*~=PfM_*t5BYjt<h)$kUWQZ)=E7<<=P%3eg^<;mU|Bu?v
z+PXe1iDYrn1+UGQ#*Ies9R&_%f-<oWKSiPl(9Xf9QKK34FaO5<kcMo#rb2&|w%p0`
zvkmjJyEi-5N6JGDBIcNBfNGW#Nhq!e^yO^_-YNHTWGwiOEB^PrS`Zh<r40DvtR<WJ
z1TZE5GZO-4s)rIMsF(>!q|>5?UFA6hr{VH$UY4;DAW2nGR`d|vbv^%+d1XqF1xZ<?
z^bUW;1MA~*jojvSG^&-(6a3RJsDUMGMO`%LFN=X7M;bzAKa$FIyEoUir|X;D)#6cE
z2I(vs-|Qjojt(Hc=Vh;_q~xAlVi<M7Ji_On$#^UqMkhDVEhiN{*c*>z8m>!Z&DYxP
zhL;$^qQ1~PI_2;=TAFrJB?7#W7Ap-~(0q@0=g(7XKdd)D<y04e-U8L0FWr_R)F>k<
zUsK{hQoO_^E0!k7U>YJprXvzMRbJT6MjJw<F|*j(Wg>w&N&-bhJgd;6U<z5Dm2ju8
zVsd8}m_2;%R@51M_QKz4?KK)?|6)3OT|I|dj~%N%yA|nZ7cO7Uo1T)oHvUEaz;8R#
zJv!58Jp-w7U>C}Jz!BdSy*d|E+pUImVP>zrtdboHkao~O2253V$wt;7YxAuPH%}j5
zXhbohbSAMjl)%ATxi>dGkSA=@S;I<|=~#+d=lNmlm4oZhP3G5sfGEv>fvB(z68qyl
zUJOivU;KuBAJ-EfellLi3LvU^bPcJrtoY*A!8fraNvWZ%<1kDRm&%cr&0^Uvl&%G1
zB!PaR(SZmn^h4u2ePT#bT3UB<23{Jc$5(Rcv_E3)?l-9$e?r|J2$7wXz-9KnHW@ET
zzV^^2V#cU+TU7CCTDUJKNcaA=uS7rh#7k|&6<{)a)QIYxG3WppV{%;$RI1YMRfwV$
zWF_f~f&sKd7gfJI64ZngH!pne8#?_dBqg>U!Y%TJr$@p0UWXoU!%i&*ue}E)08wC+
z!6=bm3wf0&!I2Lr4)RbT*6(g9?2dPq{6Y1~K_tf{+EDkJYdve`?%L(P=yR(|F?@sO
z(70LhtJY@hm?LRniQpt|Br#p5%EL@fj*sv)80#x)Z1HX9`>xCC(<2@xjRUI@EhbjI
zsO($}^0x$06ydtrZd{51jV60G-piJ|A6{D6WHl}dF{38*$3L!p2!m^ATcvk4*f0Kc
zDG1u;d(GbKSidrf))dLo=<E&0+xC5gv$tc`8coRcNB(rsq|<rcwp$l2O32@RGSAR^
zM8PCj%IETW6m-8UbsD4rPnkKgUyd87!5?JRJ$f4F^UA-ads;$~(J^oaWC$A2j5#L5
zC(w(_-^KvfoOgf{*4~w<8M3BD{+t9)(FP=a>>1SCH%{%pTQhkHcvOu&QFKL@9lUJc
zINP?Sg=*-gcYs(u47V8Y*P7SamAny!THL^IUBY{VS?`@4_pEJC1&yKt?$0P$*BF#t
z=;6x)2)7S^<?<l>Wz4p@bhfhhvJtH`6W1b{Ra=Xz-El_kd}pSmezGuDcz2!ndI0vH
zt$&y{`oFrQ9d^iGq}Ad?<po>oiKCgvorgATr}slTmf1q&P*o=KVJcIF`-0|Tm_%()
z4$G!3C=G`@)+8RI2I@awbdxq(^6tm}bYjWY@>Ef8=L$2deG%n+;In;XsBqh(wmzPv
zRM+wcYqeiJSie$NVXhR4L8)&Mg|M&^?W?|dM0$UBo6w<8MjVNs$Etb08PI2ZeYYzA
zqh7&{cmx13uwsr45R@n9Zzqc2MoXO#L(9O||IlNSDiFjBCPfExH{c%k2-2rTX~6?r
zk&Npd^A(d{*86e@d6XzHK97L>EK^caCzqzY&y$&_*5<-NaAEOA<`7GEe*V(EC!s;D
z0u!~7fip&rD<&46fQ(EeZ-lFL%K^*t^D`qSXAXX1?61g^onR7k(dE%b=ux&hCO$Rn
z6YHgrrN{J8biKJ%v}Wy!B6Lritz%a?5@LYC)Q+3$r9Zw!-@1N#1|#~iM*M)ZcK&Fm
zo3}NPQ4y0fqu<!9WB|YY80@bN*wKrCx3yIRQazy<1-#Vm<(`|<&UqoCxNB^GIQy{_
zfPCx)mR=+9q5Z;ZD`24$?+zYbnAPvkQftQxs~&BQSv^sbeYL3O*ZGgzLd5OR%nvY-
zt>Wk8zJ!WOCwz;cJGlmV8Xs({He@U39_%WYoA$@~#t#1-@(AK&NkWiAtzfV{fohu{
z?|g*{D>S>NC!W%{Nwg}FzaFKIWslQu)ntS9+-*6j7=P`R8bs~p2bbn>cTTt-NAJc?
z+jtfca!R_u$C9%*^!tiD#+%6qg~yW*Psxbyp*8t%9TN2I5D)8Kd^x*Ua#S)q5%u1K
zNT!G_3ymF5@b34_nO&ju=R&@`Xz)3JMGuJ!(qYu*yLqp-kJEN&=T${4R(As#o5r2n
zAJP}_@?ym8(4xO51p@P(R2)@Rbexuex`{Q}H0_N)snSUa({BZ^j@E+DPzTmBFeeTd
z+(^ej1B*%b!`p=K)A<%Mb8d7+#d&*6M%zKh!RByjrS$DLh5F7!uz$`Sp3f&_r2m{p
zFUY!*yU1XiCX*g05J(hHla+T|nChEUcimdhg7x(DMDxjc@0W76NMy#;_Zb5}8tiav
z9C!FIKhayHrTz;J@fcB>+RYZTivB=+&q1*3=c#yBehsEFSiGcV>^Yd@jTL`WF%jOr
zi!PrrNN3M?*SKHvL}Ld)eyN!Fqo@U>2Q6zhD0}nn-HPthj4@TLt83*3vl%I6cB6n^
zXshDlp<Hje<`)%8Gz$)&y_LxA$txzb-CGmtE`5VAj!BHE(GuTm0`4I^VSD?-MQ<0j
z+tVc!TrNj}6E=%U26kn5Fo{kYS+RxUl9Jxw9rC1%kMVS_WW*ksR4=_6!9sCym8@iL
zj91=F;j|%}WYW5vj69FS3}{D7Zxcbz9PO9>Q@3lkXq3T|E#QhQQll{C!wu`p)w&Pu
z4=s5-K0{q*PnQ>zYA0*1NGDwO59ARWN^v)7+-b;#u;TzU_~|5e2>Sc-5ufrkJFp3_
zj?XV~)c^?X7(%mPtO$}^Q&ZE$#iomn7waKlA`vUAl$+Kb1l3tWeU}SWP9SG~`{I%d
z7c%{3Ms92ai__a>j{r9)O;@GP7&#_3<`)OKz6Z-uL&)&gFkEIRtM)fG*pAMZaW3bJ
z_J=Bm6D71)axdg|%u-*%d<&1H#Y*@B#FMbLfFtvWkimI#oF;@Xc6fM6X}DsE9<5hj
zGLjqdSnK)k%O=wRfUWr4mYw-4o}>Z!AKPijiHB8EdQ3Whc&uppDu~H{bxXD?4<n_p
zTj7yOru4pMMpfayB#$w3BHJGC!f?OMDma7UjN?0H93-)(L<LZqB~&dcJMK9vTAot?
zA?uaqzJ#woA^tv|;7AZbzyEXoe84uTEE$s9ZpQS5+T8t827wYNgM*^%Kx$cr)|!%U
zAX6_;YW8|is$~m|%TxKHlPyV^Nt=4ND&ri^-9RFLFjUYDB^y3EZSN~CBwFX&zL{j}
z<91Qt7hKV4vF2nG=cfia<Fq}IB0AyjwBXzC?GFrIVFvDX_U!AAmar&=g!0}duYp8K
zla;jRX{)gC%&$c`zwT_g^O0lg7&l_&x`&OG@VI8wYB8b(0`^gj%gV}ome=|o9eW7P
z7nS`&jz6u)P<L6Jf-Y<#H>?k8kd%zbLWL#+D3lrwpBLxt`A$$vOJcrZ^*;Dz?6d#|
zvI4mt0i^qO7cG8yzEf$jr&Ov`4cBaSWK3p`hr7b&Cf6gC=P?y<xTJdE$WzCwz?jE0
zsy8XBa6}X_=a$%ZOT7y>y#6_@yK7_9R)=P%eAbnQ@3g&p^flFshoHJFTss61gcJye
z+&S&I^V~2HPu!AYr-k4nu3oH#Up<PIj*?4*0VDS4{AAhIs>3xRnw8Zo#uNehbd+or
z(t6$k+qmw?RZ~;Tq2E1D`!1=u3y%Wr#)FcGhaJ<KV!BV%1swg7%w@!u;d-38SmQ!{
z!+K@>%}!ns45_H7=x3=?`PF#q#pbGRPqK1fTeIEevRS3>+cW&7GfU=Iu`$`)u&9D&
z%qCL<^t6pi_>uXdY)MvqG#s7#s%pg*DnJpRDL@N!Z*XMXTc8TXOOpX;(Wrn)t%|T<
zF0wm=iLcQFmcwR_8<^^mH9Pwi>ych#S|i+Ix3$#N)Ye^buncbF++>+XA6Ax6=-i@L
zh~6TpjcD#4e5-B`Ym4nhh)m4PQt+Y%^uX@1v?oe3X=zb}6DeS;*sJ^Bl@Y1v;(wo}
z6)tW3nF!Eq&vCORU&3an&V&M#EvlwgLK*6v7fNJ{F;kfoA%gFQW3gO<cf32MOUgcr
z$S}Zs=fN;Q3`~WCq_)Y)%-FrEI*pym71rD7my&eS?nElL?YzkO++;55X6SxyaP(=!
zsefYE|L0a$V#j*e61Ag{!yP5Kw`7l1hCLe{?rMfhrr+^s3X7bN$h0cn(00M7Z~JIG
z9_k&1gZLHcj)4m;ngvft<^1_Tg^vQwr<Coxs=3A0x!G^YBe9CA@UL3<uD75h;8=3q
z>Aa!CwL&MwZYnjDmAO~z#S1bszb02zW^u6k`o$()@Q$Z_Z1<P7#>EZ~t`XU68t_PR
zEwWH#!cph-!0Psu&Ex3wsRpqEN)+;Hyh!gnzo1VPH053FCkUINbFDT-MI;?&X)TwM
z+l@@)qhLMDVNkmU1^VWh4Ncb8<o07Dy8M<{m1IXGJ<LMhSJTHx8R?xcu<W=7cnCvc
z-{9yr%)j&TY|PLl2asnxaxFKQSz!=c#@FbF{AM2E*bF;r>H%r-JXNva>l_uB1*oWo
zuU=~>w))Vue<m}r8|E1$X$&3F0tfQ)9ziM2a2g(G4ySF)DW>lCM@G(D{+N$Pg=1k5
zSJ5m9*SOJAB))T<3U;fU)#$MfrC<G!f`2rI&Y=V;TM>~u;?eeG@@WL;k`Jo}AU=IW
zac|s4uVKIlOxr4b>m7RTub49)MZ$D@p$?T(l<(RXxp(4kjkfA|L-P%UlllX@`_avJ
zO3EO{a~<%!2G6e3)eWfzrC)Ym@2$4WX8gOd;~mQA;XHjXmR))YEhH29-}f2wfA4eo
z4(R(icbt57Fth1;0wn-L#UL^oQcjw#C(x>IHy>mU%)-*^xjAeTi<@KQ7)^~LrZ(l7
z@HaGU9Dj6a3XV(G^EkgR8C`DrBBty%i$WE<o%B1u7wF1m!fT~1Nd*Otj)6NMb91<X
zdoJ4l9vYU_XcAYie;WvW(HBiDNXd&@Nipe(hXcr%SJLU|S0e8Ndjp~U3rnx=0t6pT
z$9PfGsEquAHe%rlb?AX^vrs<9Q*D^zTo>Gbg=k^?u#TcS$i)YKHT<ZVTe#xcpG27d
z^^PNuS5Saurc~Kq$jsN5sO=G~Kk!vmNi>9y^t=RhG5`Br+>_nXC0&z&wOhlt^dO{{
zXJ2jQ^2j2KU?hrC7~Q=Hf&JiWPvy^GT}V#cD{N9k?nqXha1R)~f0!~k8%@K+-Z*t;
zRi6e&r1Y2Yyk!?P67~dKf4>G#%<IYU!@S^>#){MZic8D|*=Ic-D9CK(gchpyhs5c4
zsXKjaFbFiZGGZGJ9<QcPIx{3@qY$dIee~|9gVyXsJUl%DquxV)a)vV?k9BnJ+smG*
zw|H^&j*oXY=l7=%oeytt#>}rV(+c~vDf$(7Yw(GPXIZC-aW-gM<B$bz>_^RFHe)dv
z+g)8Kznpj9@T)tk0L=k1@#hK^PG?DYO%Co(WZ~bVfdkpegHZ)#vFzxlf3P>+P_ZS3
z<p6owPHXkfH)l>rY)E^-JBcoSvYm>`zqaPpExQNsy?jPT%Z%AD+m#d*bDS<}uikw8
z2giqOs4eqr!n4l5^O64Z<{nc+d?q6J&$(2G!fYP5;|dz>C6~g9e0xD;=!DkS2@fj`
zgv0b<-*Cmo<#LeEuOMRLb03PXjgj=kx22i1K%c0)0h=0(Y<F|i-wi^hprzICZ+NzG
z5KqtO@WdED%6qmUp>hJQiX`Lhu@b&o?5mYMH-Ew`Hf4w$jHoEb-kBPK%JP_zY}j6+
zu*sjFGTnqfm%<#|D8FW{!6{7-ba8i<(@^SprR-2^#2=9U)qNqQcP(R>>tH81J^ZFa
z;dj2)vXxR=*`J@NIsVG6cXn*3WYHF^-J<p(85w@Y978CAfZt!Hnz`ls!1pJiTs;{g
z`n*)fFXbvLMyFBw(BC^fl_<--A{2{ZfTaIVv~Da1FI-(qdOtwL#cR`<L+SiSz~0K&
zs<%y>Stu}=SBV`s%eC_#uoTwo4K8#6_9FvTc(haXKm_?WJYm<UU3HE9xNLQhB?ePL
z;)jM`p<%g@m=OHUPsT4b)t`7Vm$fUxk_+GO=<5bYn8PsBwiMzA$4F!3V=1@{*gYrw
zf@?b2u@V7P<Ie9K!f?^ej;?Ac&p2kWsF2T;f@h%k^8T5RclKC~oQBw#7@Je$&lzs#
z9Bps+>P01GhD`Ry9LR>!d{q*#t6Y2Lb!IXC!#@WZ0)GsSf}rWJ8G#Z$Ovu8Ls{=$O
zy@{!B!gYSYIh5Uo8`qtbt#sA-q2z8gSR#|qIG5vwL@(L>;j9EPz&AbQy!-;4p&H=f
zbbYA=+8{kE;2=|k<O?ur?X?yAstX#Qh>L541x<Wp*!pISolzzV!rHf{o!C?Q%im{K
znPlcG?&rUc_Xfdq{Fxxo?ATtG0qM^#W$A$yhm#~jPT2WsE0VbQ`07#b<V??iwgg($
z`M~>MESLS?lcGm={XNt2a4j_BaN{RyP>oxl#KuTSx3UA@e*;Gnn1kuwbeKr+HyUXR
z5HCh+KCgBgzm7&4G;DudMJnr$jpq)E-c`Sm<g@0fOT507bQx#F4jUMZe&2)K%rnLo
zPYH|Hlp+a@LljfZ&v%ylh25Vv_i}lgcBj&|#}HdaxRhfsX1uNuw%kH;At2A)?t0&?
z9ly~OSIumCi?LhvYrLlCtGRxZ3ezegz4Ix+S|!p+|I?|@Qgs=sS~idIrH+Qf+^@sM
zZ14yij?vNCAqm13Fl~AGWDjwCw9JZbL~*xx<-o~Y2SEc+^267WYMY_<1gaZD60Jj8
z7jnNOZ7`RS$K<2uM_vnt5+`;0VJp9|I#l6^$s~eIU%#z91mN3%xGhu4zG1f009q1L
z6Rc&%EcQa=k@ptQ_2dsOf5-_j@nF=z9Fi2nSz6Usm1zZ@N7FZ5?x!QQ{BeHas=mAx
z5=CWYVp3Mf57%cC?qc&~RaG=GmKAcm^JIdy>aAC}tAVK9YZAMDD~<c$t0sVClm3hG
zC_JVsT>yoCOikR^2sDOHES^+KF>#-P6a5ahzCIxgK2NZlxnfwT=(ViR{gjzQc19cP
z?Thtp?93_;R2#8~gI(K9G;5A<QrHGr5?T@b!(*IA7`s=Wz~Rj--H1N0D0dux7Va-r
zeLzUZ{i3`{3&bp_T+#IFA9iqU7@y<TOUncaD`2Sg^W+SvzKWMrpKZe2<9wqKJhDGB
zA%kagTzxE}NqE88okf?fb%C>|tz0OrdvH!@uC)M_`nUJPE8a}RlZ8rsJKzDG<|^H^
z^wPTTAlN^{a8V%=Cc!^%aOW@XBJ&ShuEVXs_n^XzcXZpD+AzN8r09#?8?v3;NIrgH
zL$dCKxz=;x=9Z>dgJ)^JpEbQLWi_e=1ZfFx{7{YP(&=9#2S$9HA--PA5j^Lsi{#{!
zecs(CwxG>4sHC{rnZU2;E@&4LmAR_^WA&X_X?ZI<^o6PCkRTS#7V%aseEq3Y0QtZ}
z00J6v)@xDY_XGM{7|(!sQZ>iOV^uo}6DnfO+~HcQL*E<XD_)|eXY+nI82XLwP{YHi
zayt37Ceb>gtq)ILdNE{`nVBhr-M%FE!)fheiwD=Vyn<@hjEX}{AJI@v#Z$QTMjY?q
zLI?85c69g|a=D?qV}!z&q=@YA7pPTaA=v_$>;uxux?Z}N_h<>*I#VX7RGAXPrE;n$
z2D~`Y))>;c-ZkJ9#%T%L{Jx_sEF;o_o-;W1#u>i%W7q_pHc(i3FPn1x+(4J8B`)Nj
zuZ(?WT))1V%n!dMF?tcZIdTsLFtCYf{Zh=*FN|;oWo|M!4<hv}+RW_4;5@%crmd!1
zlPzIM?+jU%wLJCp9<)w5b8BgYah*5e+8vAv87dV_R}4+nv8!VG0)cx?@5^SF!zY!s
zzuhz$@}3o)J;IzlkNVIrXBA|!>%!cHX3e9Jh-(crm<zZn@Yf*48N>W`)^f!lM|73Q
zI2wsTr83YdVP`OyX&**l;fg~4Jh(JaPxOGSsHog74$5!DoIhE<H6niNd;yK|nlN}M
zU}$(%F)#q$uG+mXa?omyil078I|crm7ag*akdQwHpCb)utv<%>f4jUeJD;N;7@^W)
zj)}Fq-}2qPwx*rXQ|aHDDe?sj@bf=svoVNlxZ!ij=N4Kt&kvAsema;;jmTV{QD?;O
z;gGLzI6shX_&&gz;jx*ndy?jK!@cZ!GL$Oyz=w3NUl{17L541Ij$-#D%ty&K`oj8m
zDfOZ<5|J4is@T0}u`ip;a_P<e2f~*ESpZMjs@G^lW!;{0f%sS1_tG*L-Q!K^$G6$_
zQ&CMViec43v?1!G@bNRTsK-rC$l13J1M_9CZ&viH5%sMR)sl#r?8zH{mRX6nzEDw7
zPn7^AR_!i$ny&gcgjmm>y3F(uNr|i+pzz37FSe}50KR+s9-PSXN@^hsS{~n-wUWHM
zyNL`84XfY?caC;p1tF&4_1*NItE9`MX6Mc=Eun=g(IQY4XyPI4#jfG9dGlJ3>G^Gi
z<AMRZq9(thkWK1G@rk;_3Xc@G@hLt@z0;X^;@8Zy4azqtb|$(ckw_f3coIDxvvm7@
zRHBhnGRKDzYX?LoUi61*o9h{1JxO9@YF?XSusg!7JKy{tU2nk@XPdPFCc#2N@F2mV
zac|rq5Znpw?(QBWxHj$@TpJIr4Kxzm-95O&_SDQf^KI4cKcI`d&U4PCjP)bqO>t)7
zUarli*Xt-ZElSA_9>3$eZsoV|QH^_in6BM*X@Vgn-q_>(j|@=wb98)a$VF6`WXCS-
z%{>s<*T|yrX7m08Q-n>g)H}kRcAg0)&xiv)m<B8EA`RU|A59^4cGjR#RKM%yo#Or;
zeUc?RIqFJPS|{*r=WdG+>X=_25zPk*vyMxPFt;ZRaFb(8bR^i7V_RO`X~0Rk-<K$_
z^|%xf2k%QLQf&ym-YY!8zK7iKgRjU7@pxhInlS#eNXJ2t!en}cwZS&b=K;DEyT$6R
z8Wugwsj=|xKbI|fi8(r^#y^AZ8-K2iN+zm7K#O&ixRPTn-9|ncddW9EJz~KOfeZvu
z3au__kU^Y|QXbZ4wGDu(A5xLP#2IA_OANNEBT&Y`vbrApkd&ftR6aE%%&j%2h)1No
zyBR>+t~%w+^P)ph(Ieln4S?^#cyis<QiWv<3YA%lHd{!V^RqN?X%Fe*Cf_5RZ+q$(
zd+xrWL*P<SM>=10Ut-ycjFv?V4NNMVPV!}G`CXLWumA&pel)H65nxfveU+Auh%9Z%
z(n(T!k#@6SJ@WkVJnSzYI*?>}YlR%4mBwyLL2*ka8fr9*fV)0DlrRrA{g{vk95(Vy
z<OFOQ?8Fps`;>iXU*Zx`D;xil<F*~Aq$dfsq+qO*@{}n=gpMe3UI^sc(-ct9kA|A@
z&<@%s!u}m~6Sdz^d3QJr2-=H%uXO7WO9$0rD8V6Pl~cp{st-{twI;tLF{?>j@tH5x
z*^A7pmqT$o?!x2QvjJK4QzK*abPkn3w6@39M~mrZR)Vwh+oNf<wk?yCVwQLmvQ}_~
zv9ufhQl_<7nojY<#ru@IBTPqruMs?UyLt4FI1GvdYBng!`ghN?8m(rG5g$IXT3(pk
z5SdEG#VP|Z#r2>*vKgG8L`+w88=O8{`&UDtz$iCD+V0t2%Kf!keCQkSm}u=wBXHQU
zjtNR`Srt_$@7bc!_>4y(WYLzSida*y&K`1W6aIbIogyP!=cQz?2|K!a8k-r%mdOC*
z0^;15I*RWNb-3SAC)G{sG*;HID@-E5q);f4TdKE=RAlLT2zwCoZ!CTFTkViblPF>V
zue}{jvdsdYU<xt+bAAx~pYubM!qi)J0i1>UaNC(Z0Ld8<GZQy+Awk%tp^+|6f*m2l
zgJ=aqTpyd$q{Ht~2C2x!lm)HxjLVBdMFIxpe+=N6P(1qpEjxF1Gg3=!ot#GQG7}9?
zGZxXZF2S&9-*LB^5X+&G6d<f<w+<uHk2g#<Xyg8V&!sO2_h36z$!~xu^(^@l2AWp5
z!rQ_ArI?NCoQm!XTZwhm!)@b%Q{^_Yh}j?5+r<^Je!dUuC+@2QS?(*N{DLF+Bx?Q$
zKV*!=%IO#CK^*(^JoP_S9_Qo9YNki2f`q}HcD*6d4io)Tf7-3NDzsa1et!G*_r7hy
zvD7O_k>wtn^O!Fn+xAPIXApbvp~*bbz42T!pxB#>TS2C_v8XukchF!8?_v+|qi`s@
zG6gm&n?B})?AipYn2T7xCccx8w<8H)D36FT`TqQ*=p8?sc@}Ur4`iiPn<((TG^zmB
zH}!_O;|kNqPl&ppYZPvvvU8=d7LyEe{4ikWvxvbNat7eLkOzC}t^b)V!&dElf%{Wy
zOzm?yI`@7WF&}K>k|;!p0K@RUx~hI2h{?&luF>KgDww$4qLLMUbhE9sI5!fPjyJ(E
z{XxW|6m#vZkZT`GWs#X>71s-ff@@QV3eIPXq^Q#O%nTPA-*JjtcJO$Wy`!dkhd05-
zEKPnHhQ?PWxu#&;{LPNnkJmw&wvLcES+&IL`d>Cd7&-oJ&F>inJ`CQylaw0ZhibZf
zb+UvO>8BCg8;VAITWMB;{?=)8oA$;gDu<=J5^r)moz~CjpARY5|M`%HSSQ*3o_g!;
zerC9MUH^e6jl4jMw6v}5o%^aM^=Zeg-rz<Jk9M!HU*Au*hMkKTs$D9JzVLq8l|vO-
zJp@o<aOle&5`$(Nw&ejUEG`iL%PJcQSJc7qDmD0YS%Z19-~armGPTpnJ@JVYnQ`}?
zwUYTGVmW=)3K0K}Or-cRzakb?_9pw$2TSkKjg8Lgoh(os>@1Tq%~@4iWfssD`tld4
z?R+<5f4b%4cV}lkw~&TYLb$``^^Pn{7oQM#e}QK0H;Yy3ezdiiP@nz9N&;95Gmwy(
zspsJnL7dnEs?r&DI6^|Cg1XVctg*!u0}@e&IYHnMr=f0DvAE6g7d9Zku5~dU+YO}p
zFz@)`IDJVk!rJ}XIRrSMcE%Ia=?hL5*aI|uzLq2lr!-{{xVba-*d%#n8Kmt#MRqUw
zIF_qV8G75+)vm1;zU?5;3O)u(7Y0KJ&NL3eb}Ox06?I-4<;<O5<>Wp=xBukmb}Dd)
zQ}=8vZ&1|B5?CP9Vl-a!wsMKb5C(jvS6knoC>W{F06fH`s2N_Lk|%d#Q=S1XbtoLq
z=>3)vj(YYN!2!x>Bx<Mp!(j$qoNh$4N{9RXKjh^!Zj{IsxX~5Jita)9wQVle0Zy+&
z6I&J|pK(8Ll$BSRZO3`GEkqZ*dS7U`_zuTe&(_nLjXp%(OCH2(f+q(aZ%=ybWs1o7
z_#maJYQvoB3-S>;`2Qeo$p1s!7y~AeUdnA4Gf^KdDPn632=Psi$ch#hwOn9{Sod$x
zCxqWp*rBi0D+HQw#EZ+~e9VlBwMauGL1=$}<mEUysNcNq&HwbbSN1|uC`E0gxcK3`
zSmvQXBqXPjpHmOc0kyTb*yDUCqTR#18>jGoS{N^$M6`7ehKW4X&0JXRhW6>QR}H%^
zNPUxPq!R)NiCw5c-LW@nW7P~ttBj+<Ce)>uOymDpIg%Iub~%Vb6TExFwS33d_?4eZ
zy^n%8voOS<s=D+#8XuQ%5^$Pr+Kd!e`Iw1P!t<CP9L0u_6rUFUk@@#~#&nKeSmT+Z
zrs~k5)NA%T@Js-DvJI_p!7=-l#Y)_D9m7KP*AxJcA4~6r!QgrnZ;(mS&*QBbUC<pq
zP+VCFm_%0ldnofp@|x1v-;t8|-hi^qD)28TC2BS#>Zzo3U<=myEhKc)?B%*3*E6E0
zHRN~96U~!dpOI;RFRuyL#%k$qFAsEd6AOhet{^zfKqcbKgQb|?9YUFtcsRPAB3;Nh
zhJ!WQJXkNZck|qHIvBRb-ajk@J3o&Jz4AZRA5b4JHblmgilt{(p%`3OeZ4yQgCggw
ztjQ?>>n_3HrKI&Ew1)gi6>8O`$Siwrc+`#c*PB1;{esUrJns(I*Cnd7_g34vDyum5
z^$Edhdc7zW%bLNU2rIc^v?vE|r)`#hq2;G5-WIpn?^_(H;KTR~CtIA&lWA`*V~B>A
zbESnqXTz`%t+=J!w;`WMPF;9ecMyhe3hqkD{*A6F=EMQg|Gm%)uX6>*56{jW{K(?-
z8-N94#>K~v3Cg7Fph?kVOb83UiLW_)B!gzoSGndj|0Ip8SY7h+nNP$gPcw1@+t7+m
zMvYrrpWjkv8w@l^N!7j^T=p97Lfr?Y^!f;Qm8R>i#|*}r3gK=x*mL$)>jVKngAUCS
z8B`wIlP`a%sY|=R>GtYzv2!kWT9K`<N0UN}9`nwgRsny0AEtCHgb1~_5=tl}v-u-R
zrLci2K9$;SNaB6o`P_UwDN}1PVH8Ekp>@eu>lPfX;-wQQiJS@HTRXsOIu2k<;swJ4
zDbrNe?vD0tou(L@Heqdu-}dCQ(z@MkNQXx<f)=la#%I^3K6}R(MTG)<WxotZISOMg
z0fsabDv6cs`nZ2=1zqyW!G1duwU+x)`v4O&en=7noID_aOY`eDTcYgD22|?dGF5#H
z-C3IaVLgGXKcXJn6Oei!MKY$zm^qgtPciR8_!5uqR8{pa_<=H&*=Pc(z3=J^W;Pkm
z2K$%6;R$&0vKP|q?gtQ1Cdo<b>&s)U(Sou^TSxPk>7Rj7@M&!BOhtO!2&OxxHab{J
zS}wmoz{;m6P;)9w0Ju%MCIp)jF{2uNxC!GUSqa|x3Zc7E*jF{4%u%l+Yd^4d8e}=g
z!tZLZVks85F6z?$G*yaE?q~BJ;`v`jbK%{KbjXk0Q7({-6*5!kCVDOV-U`URgL2={
z@@-Fzn*r?^aAo^n*Q!qbGmGB6rjWfy{|7n4WOC+PkDk+)kdg}D{goF2mP9r03&UvM
zo`mLCgwpC*+@TjU*yF~Auo_suCmBZk8jNfG?Kr=><Kja?kd%UgsB8~qpqiYM!%!S*
z$)}$!bkA-Z)7bhz*d@P})^eoD5*6szkjGnZkr)nP5<=p!)Z3-Zuj2$KwXh<JY-ti{
z%!wV{W}n_}YDj$|_VDI`^5&snb<P=ARhBwVV+ID0e$7LFx!+E>^VpSTw_KcFzc#e-
z&^wLH>I3N>N&aAX?J<P3hG4ajFS&H+u2jrz#tZQ({Q`;Zp%8{4e8e%@3`VA*XI2-$
zWmgLV+FA5JUS4vp_x@^4bF8};jM|#D;<xo7trtwDlvf=!G}3G|Mz3t5?_cRym|wk1
z@+4GT*<UsDX~ADY%{EvNhiTs0@(JCSJ&|5+`qmn}qkf!KZU7YejD=Ui*o#@?!q!kQ
z3Dq6!v?VN=TlYi-gK7!bDssFwetMku<0`7-8f}9G^E`Y7zpJWl6=m4<<OLyZN}+>R
zVR%+nLJ*qZ)BCAn{Qxj92|mxJfdT?O-w!Q!$mj1GWPIEO$=X*oP?3BgS9)=9Bw-(x
zl2A;OQAy-EFmR;RdoiO=Slptm?boq8)=rZ=U^U+<u(S*57L_XX*P_c9Phr#?9_A8K
z2X#-c@D>kt8Zd48OW-R~NW>20iUg&~rU{-(=G)v>t-!`%{1O5pjW)@-is-*bORk`Z
zqyh53SDz=fKZ*<4s*Mb-a4|U8>$jc$KPsiw+J%hXZoNL4Bl5Z(_Q`ri$8k5JpKo#?
zD!eOqugfE}1_foUuv8`rx~#vk>)0_14kT-|(h`c0jO80Uie5eWQhO`!bv5vuZ6d`Z
z7zh#6iVphrOY+=P6P>01tbeWQOJJ4fLJ4Z{)?yTid;&waNOo{MytLMkq$-;{@%>+k
zV*#yvpPRI0f)Vw}CB?6<uAjhQ;5m#V+APYjpH)+oSZ8|dEpJJjcXtfge^SdmCto18
zW|$gEc#C??7EQ?QoiV@jFgQ3e((@B$Xj7q%G2R(g{rk{1A&bV*MQ=D0V=SF>H&N_s
zyo*fUKZA=nj;4DZVXjQPW(G<uG2}jDGO^SCaw%PbMi5=eQ+~VE{&Ok5${g1cs4MnP
z7kGl%_ON(#>>0tu-$aHqZzx~11(wl&#Z05%l45FQEyVJy*^h4V41aS<Od77U#$f3-
zyU?x~vJiOI89IIzX%-#NuvFXg^?0QYX)00h+#~7bJpnijz@Z(mT|JiJBZx{oAM1KF
zC$UrWL58ljy7?W2_fDNBBYBSDrIoEPv4mWm$^?KKF0zT((6tDqR2QN6PlX7TSEJqF
z`@Oq-fP{Hc7_iZa?U`GTxJ%(NLX$IGuo~k)82(Sa43pt_?qf3HC=TnmKk!%z_{b`;
zl|2A!E_~dKWM&WNZy1FOc%zLc4D@2E^i*6>3(Fz=XWv2i-@a41?qk~8eeeTK$b*DU
z=sD5Te_w?BLp>S^Cra$=b#-BU0kK8>Ud<h^48N1;$1qLYv-BVn@M(y_%jAU~m*8t}
zP$vZZ3o7eMS$DZgl)iZr-p=slZr7-SjD?(>W^40jb)&)1t|$XHq0(v6yB}ye^CT4B
z^}?#QM6w;9PzCYMYiI6QND-)fiP4}ecek0>B~_ou`p;NRH2<o1Ot}uV=9}sfAC;eD
zQQ-mKWJ;nKYq~KS?lrxcf8_6zQI^6ajFC&cdUN;IwV0F-lLqP|h|i=TXb=3_O`6Q0
zH}Wp?;n4XDE_SY7LpgeM-PA<6oG5&c;U!0d>Va90FdCfp$ONTzM)!6+mbV(<(wPE3
z2ldhwkfpJaJ_#8hmjaydt3^-?=|VfqS3iQaiid|kWIB(%@p(F@mK+~+z*8Vpq8N%E
z<i_G49eUx7fqb#oZM^Gt7$`9j7^6|3b_6#pn_;X9;@fqQPT%a&IUjBGhSr#kekm*}
zw8~;+0~#+ip4f~L@mQfiWovLmVH8W0Y$^)|pWkZ0Xa-kr4yZ>KiiVxE>Eeps`+Kj}
z*)#|(+>u{;;MS4W7s&SgEHfo&G98_Q{%WK?=c6=Bvo*2Pq_0veWwG9#K*OiH$r=kN
zMlu2jKv{a34~guRKrP5`lTBMoF@P1Urm~rHnvJLTj|}aNXN0~!pYc^_bPx*JFNJ_q
zic{UC<>fiO-Bign<PG>2Nkqr}vw@v{RXRsk2g=a~)Z?WlncRMv@obu!3wA;GzUK-5
z%%hGjivMjrfl~7N%6}}zj(Prixg3<^Rkhskit`3@oS_*vhA?RNJOce^s%e)2mtTM4
zeCZ>-Hc|8oOiUb!8W(!lH#RXb5v%^n$_=dTF#GO)Cm>aVI!lQS`c)?tc(@cD%Id#k
zw|g&4x)w_>?$Uezyp&tUX~Hu_qiKTjq|z8=q80%%4v^4HV9x(MZZiE+?Mc9T3t5r%
zirlu6B*_U(Pu#$?m5mGsB9!yF?ElcLGs}}0*CPzFau&$)Wi_xwF8(~#mdkQhml0n7
z>$n+8MLuNep3`=AasvUBS=hX84f&H(2*AY(yx=J-tE8Q?UYbhgzo2ZTc^<`QokGHh
z85K3LfNOz$)^HjqgOqGdl#qeebDf3EUc=@e*uP|>Ztao{6AJV`3~Wf~AW1c~U+tJB
zs?U@e>rlM0vbLUR^JHr~A0V)Z%YbTri)GvQE`DibLv6aL&4PsKihl@QUN@uGtfE|)
zmI4u(ec+Cg!@u$4@)32nvi{;dE^y1ApiYh%yvyD$GsQM}{&YFc1~M6$cN}@`<&Ck_
zx6=Bu>h)*~Bj1dMK)(iuhmG{a^{ZAxVHg*yuZD!_2;!%$Z=B<X6Rf@G*>9!PW;O;`
zS8A@;rH%!iFiQoQV{)qc%GYfBv8IsdiX~)?nc@jih6xYm89u_b)^`PddMvnP!dM2J
z+`?e@TG@CD_iy3iVn?HZmBbdXVXrv%QH5Uf)ufCg3?YdtT^4$-bW($rCZ!x69{y>T
z!umA|*-TQ`3pWe+vo>H1i7{N5{FUmrqbmRNR;|&;l#krc?Vnp8={?$im!)^Wq!XQD
zIL->~&`$)jY<22HfcuGGGUl>^XZ$w{l3x3cu17}x+LPTEKPN=B)(o-FS=0EetHn@Y
zy{TLF{?GIu9r|51DW~DT;!V_jMs%?l0g6QJ;TwKZDDp^f{Of_BcW=hVFNFz8JMet}
z%-7JxxYb&~i5HPplW|CL_DlwKo8+qPqBuBAnG62=7pa`pyI;QWmq+THB+GZmVu=bw
zUM<IZe_P_4DJ9$K3v5V#+78wJJFkJ(DvQp=?J3BO;EP4Gmi*)ZeOh0sPDpFuxTM7C
zn;ngLy&9zOxEP{V(p9a*Cof;~PG$89#xHpF*=C=78rnUA%Aa8P3uI8g^|=UTrl8Wi
z)hss}R3s0ypN)O2@l%LbcDKJG1>KVk?+A^L3pbq#=nS$q)sl6m{fW~Vb_JOvV9~%T
zS3>q^H`!?@Zyl*Fx98TK^l`Afe~s3G>(1BI^+XE9KViH_ELcV{g#lKFf4iP<>qg+R
zX?c_IKOm-34=$ax1y$*`=9c}AFlCxpzFBP2uCW_;6c58YqZE{p3876IS5z1dhDu*=
zR$Y!6?XF)jpc~e@Kn;Cfr!ZV)v)&rjS43SR)&HE^V~zjJUX6v3n3UE(NVo{oX(jol
z9VZpOUis3}mcn#by*)oaI`)3zGP){>*Ldnho3KHD6by!Xyrq&)9|77#jU&VZg`U<A
z;Xogg;QvGIp_kzPA2ruofyBzJskdv-XWHMtf4A~Fv|2CWMDM!C)#(bf#t^+h3b5z0
zG57$u)GMb8_ajDV4V#xFKOoylYA;qlsq2U}{YK-l)A`yzoJ1d=oQ(QxgdGPRlkA5H
z>}uX5WgH1#g=QBXZgoD5;xy)`U7ZBE8nO?|_dcsUcBL?+ZR_SEc7g(OS%(JtVv+z`
z-q#$_X<6!9xAx4Ch?CIxv|V%8T-7_j99*=Qm)pNy0`JAty&yg+Wo2c5YJI&&()dC>
zYx|JOJ-dCWhiI(N&cWOsk6S^fH%Dy&eL!v-FR4bosWI%O(aemLUk0Ovic)b%uYV<;
zcFsFlNZwKL6`E4qgA$bVK6kB|RT&~qv8zS(XFOYH!v6picqLm_NQP9v8}q2Sqxn94
zTcTnbqyGk>GQ~MzVt_zo+*t4#U=;;QngOk6zX@>ld|1tWnwLd&a(EirBWqhv&iN<D
zDq|_R6MTW@nV0WD@F;7PdN>hTk3Vg+NxYK1ua3j1bDpTb4%d-P<k$i^736vwVTQnM
zp_i&_-zPTFM;a_Zr>b?^_3YB%(3m(Wx=Ei^7BEME%b!AC4SrotK2Y9i5Y`2QR~Lpd
zUhgQYBCeC;7VU6QGp6O1l}>a$)?>@9r&f@3^5R0!Nx^odXZvO2*iCN1d(T{LH%6%p
z7A9O+Tuh<ea>l6LXaLjddz`Jfr@ABoD3uBPMv*ev-q<eHD?I?P+q2j9AR*UBimI9i
zYJ)82b^rai348qb&**u=VbNU};3fL2zQZ*>Q2^0+ll}7@1yK9s@s|1}Ci(t;cu$hu
z!R)WRSy)<*3?fJv82qrgV=bwW)%aWS{Zf-%zx$eBP>Zt}{gRH)<@Fp)0g60Zts9xs
zWZ&D-?hSK6`@s}zvQ)^Tl;sN~RxODzk-#6O)cK~*(3cwLs+!Yr$#bLC^yfR51JvC|
z7#<$yl!K--O#;WqVJITxZS-atWc*h8($mrp?FKhxEB36SE8Do31IsFD-eS3#)od&?
zJPTHlRHs=NpPc@oK;aEO9GC4PHp~~&IP~;p`I$8nWx&<hVqx9ipvB%;TAuyy*he)!
zT{y{Q`mdYQ{X<$j@ljY@Y_1LMp|N-|lORk6{SHFEPG;UN+FTu%-<aQiHQ>$A3#kR#
z9Dm~T$4fmT{KUUBBui<qSs@UNnG&XaB;x94_d<2d?-XGQzdu)1RyEM&Jl36I-)^e0
zW7jO`&Y+P4H&m1!eh218-jPC1gp?N~prNjxsv1=WX}d*k>p_~qjJ}olU={tWl~%5s
z)79wfBd(G(k3~blYBT~)8{yZN=RbMI)MDhW%a6Ggl;k4mG?zoT`aWZlrsPx+GUZB2
zqWDgpB?X>3jpI-2H;IKZZf|ujoon6B95Wfp)dmufsHMx%#W6$NYy%Xzdu%m}<1@>m
zq{!)#Z3GA@EH(#zUf<We9;+@!04h43cL`u9H4;oRH5)b}mWP!OgnnIs1>JJmEtibI
z(H^cb?wq0C2g;_iBQsuHWPTu@-PS#y`sZZ{3WH2F>jVESh8FgP_?TuG-BMzph$5mH
z1-PyJO#)+%@g6ZSX#S4EzYtHoXCvEHS;x+v+4L%6zB;2Rr%==m(#-J<X<GBkNV`o=
zQ5RF+sOxpj|0Zqp`>zWX!rkCiCRp@pa!|NQ#Eed_-549j%P*K)>w35Xa^j4OtsNfe
zg>v&@ISSMTV9v0Qh;DtoQx8CL${V&n^3a^it%;i7T0%?${Xtn0(7zCO_1rrb1Sou-
zJ>4*LqCf%-mQ;Y--`|f1!|%06M+S*(k^O1#j0&gQS}s|ft}JABLsf+TEQ*4A9ovjo
z1PR6xc08ilme&2rfogVpf5o+po_o2<8V6-)jbj3f)b%-tNc=Bo!F6>gp@YNR$Qw69
z?T%ZiRVAeUcnh}mQs#Hf!yy5Hv|oERXJj36mYJ3FN@1aij(fKN(Mtgd4bS8Qp4Y>p
zYF3z*Ao46!G)s0XbS?xWvvOB{H(sJk2&vT85Aye2DBDRX$w9Um-u897RVBmRh9z#x
z4ulU{_($jye88kDFLN0C@p9+a{f?6)wBWMV^(8*;_<Zw}@2m^T{F-9=?av9qVb9%>
zY7lFYdiJhmqNG3M*7)~Y&<<bZ-@o3_4OK+!jMzcQcF_iRxhqpykl_+_>Kp-pN77Hy
zz3n$V(g&H;fY!Pv4I^6_<?!vKdW&<+-93@Q!8E}HcHGX_(^eRjP7oKLR=T4)bZq|_
z<J^74Id<wmBI$&|l#kNS@1I$;NCv3+hhXEAq%TXEdRwku`E}@EO6ej99VLXtXj}45
zMOmXpZq8<oVOUOCL!8IQ81!R;zE9FmaR5>nj^%jbI>*XGPp3cQM%{jE)2Q@EbH;Pr
z;DYMlz;gJJL4~OFJ4n98Lz0>uDrHO`=eYslE;o`&TJ^H-cFUwIH`|s_q%C%xB3$P0
z;QQ*jQDQD38!<T02XA&yPH*{j8!|2-eGYL?F1T~~CGAI}pOlnjJYTbM2g?@8g9*A|
z_Ec}h;(AfpK-sTiEhHfQwDTN%#EV`U5z`T$nu?LwR_~^ybG5%F#T5_&l^@5l`KF;x
zp7bxCdtJW>jk7$!n(}*n)r-Y$Md#-i{`&oY$bytKl?*|}<g}&kxOR}=zSQx%GMu{l
zU@sa;!X7CnYl77F-)}|NtP8^^KGCvTHheLa^{??zumAEe4`5D%$xDLbNor-`7xLuo
zw$l=p@fDngPYCt22cK$jsrPoj`#U`7Ql9}bymyk$07wH+4F__yk)r+kO0A9YSi#}K
zn*1k}`(~QUwPDrr^M|8qQEBPMEa<i4MHB4n;P?EP_qzyDY6z1eUjNaJUOsWoDh)@C
zg8Fjaq|T=e9|Iaeu=opKJZB}{bd{2RTuS&}`+OBmhyq*56yc;RBcMmxmrX?gX6uLs
z`a^3{_MN{zIhK}M&c9ruw!yU9s2uUS(1WQaW+x{nQi*WaaE$Qnl%03dXqMFfeKXTY
z|E0-tI|>A*4WbxltF)nkC%iNvyO*A<PTMrTu{U&SqPZZl8ae_7f+$SQkP_T@l5#&C
zn2MarU;(@{I5upAPXv24*IGcXK|GRas?M03QD+CePR^2<!s_F`_^6yIA7X~b7IYZ<
z+E-Xg?gS48Y|VzZ|KX;mq}m~ua$KdHP~NP+*g`7=yOYrO_MW|lZJDYbvmwwxp-@)O
zO?cQ~K^oPr?_wK&A~@o*F|oz?BuNKR%6)(-BYPU=^zB<Zh>6_)GR5&gs7)Bg_?Rc2
z+rU^u+#6ZO%V+gQOQ#-94?HOf&td`NTx&j9o}P?K+5}<539?1kuCA%)_u`3j)7=RS
zY1u@+$NSHNX9Png--$o=WtdKzj8gPy=u3Gw=PQI`E40N)UFS0*%zOQ9rt|&fI}U91
zy6*G6U9&H#-ey4oa1$iTI8d!(5|N+^l7X~e&-DzQqo&S5&~va%i=C4m;sI0WZ+%z}
zPb!NcIbGVgSVfldlV97_W+V+AznO7ZRiFui^B4B6PMFv%!GVGVefSNpPa6se(}L+B
zn5AZZLOZTtOCD%Kg6|!|pHhXt@VP}(j5jpN%d^JKoecIp8XoKxyZ95uC=9p>%VwNt
zGvuWo_sw39rZ~Ebk52~$DhR&dng064kkRW&9Of^7&|*DTMWoeaSIK{tw;xX&i`(jU
z!fEnt@hkd2BDm{!|AmQ4&MeAp8Yh4sE^HQ?!-p6S-iIFjskdai+MmesorMDzDdv)a
zOfTR!7zT=PfviF`{v=f`yI-(B6G^D4QBjMPA=aU6m>A0$exjNEX)4Rt#P-GHE;TA5
z1LkRROaav9a#U&*c~iF(qze<lUOgfVB2x4fx*`Zyk=#VGED$m2jaDJ8S^v&KArv96
zUJ@WO{6tgTg|L?st6=6Au^jSAlXFCdxg)r~{ySE+NXV5j3_2Cc_5m&`P=yRl<a7-s
zrt^JZsBU}X;3L$3wxydvtzt^ex(#rL3%&5vr2NrJ9X!Qh+DP8%oKgkz2;k1gy_e`w
zIzzn>y1V}?g`;@mEr2>|HG)!0@x|zidM#dkJa+iFSDc(1krTVIlx`jqYg!eL(5a#L
zjF;{{a-R3yRBvoeEiUslOc)TJK!{!48E|(DpuXqit0v;vcyXfE%Z!O9Iz_HYnF3+i
zFmDB0`jfEl78U~dALfl=t|tkN6g%aI;k{eKwU=j)>m+qu>SqVt_q`G^eT+@ZJt(cE
z<>5b`okj(1cr*gBlUq#oQ}!JquhngaS%v(?H0te>!#^Uqi`hyhwdMP>`-5$$>EOuZ
zz<=(gIEh6rJt8x|M;*^Zm~QgO7z`obG{NVLhpx1`8&BkuV0xTxNhyK4Wn>g2n(S8a
zN(=R4-^Wo%pwcg4G}-M_{r}95(5aN4keFJ77|792Vh@y%uls-U1kyRItI~6zA%B07
z$pbDo(?js`h!bYujADgu@NQ0oy54z5`K%)%pA_1R;C=``{8Q;_93?<6G<LV_6;dlk
zPTrx>O2UVhV<I99%CgE#h#`QunZJ;MXB4&M0W|i4BWH30rNgAeF9wt`nKZFOdPyn9
z!w7p@L9v2jW@<QmH$&8~0bA7aT}S8Q&`-gE7K`=BFKot$Y-_3lU$(gy7$3bB5EfSk
z;iw0Z{mh%n*1n*)m*I}p#K@Pwj(<<4)oZjEo-X~DLr+mt)08*o3Eix6KAI6pfp%*+
zuD?$TCk!J5SZq~mJ>Z7Vv1=lunHhy8+FC@n<+afG^_Y&vkp6YX1Pgg)W(JSP2~Z@L
zvHOQJT=M&Zz+bfs(U4XW8FG-8o3gUQzWb3Maj7|V4&_27Jzv!4j-04=7u;&pTHpg3
z-Vge!)R?kEIu#{L%L9+StR~0(uD1{dblnd}c|wB0b}PU08yiF74aIIcnmj_O5G?Gt
zq$bC=Qn~Qalobh3wtAcw^IQ`MgAd80;0t-KALS%8LUi-ll45d!w=ri^h?)nq>6R@V
z1Pt-A9M0{fWr@$=^~W>aJ^R&LUJ*(7FdG9xTDU0ioqU#4!|fohkkCJC2HbyjJc?@*
ziwDsBd~%#YrFM?#Tut2)Q~~dsuOM*jd-MVtRUd=7-@W;NMXRNTG+MnlI_@?<nwXl+
zr$$oK^%r);4q`G9Eh6L74uy$rThPi=Cfq#Nf~-a~YY7CaAJ~}DBi1iAbpQNz<V~0c
zrce+B2Afr*O(mh=Qt=cTWJPuQ|Hk2q%`{OKbLqrpArP`7T=jm1+co{F0VCo^GG2Lr
zKw!S<gnzg28wLJz_}{K)cEAw#6nAh!68Q4nM%EtbH<QH_Qb(f?PdOqiE3>WL9{TcW
z@9b{Ra7sA8Yj@|oKGBGy5DchI9nmUC4J8U-_hqcvi|UF+M1RI_w6!2on6Q>UcM=_V
z;T*=00*$sSXC+pu;ZNmMFBI#^@P!8s>s8~zSbC)EmY5iNF3dhg8HhtvABE^KIKktY
zdg+S9fLW6=h}mN=+0lf$&Yj96qSj|<<4btGeZ}cRrZmuWG@Vnm4z0fNmmmWTcLZ!t
znsePOzH}nsF!GfblwnsWdJxd4t3ww$rGeD~o)brHhdMGyJ4&lyLKk6vM+mzqDr$&o
z;Ovo9&$6nwqSj{<lgMLW0p6O*u0*JrCU>#SN7JWS%6TODG>fptx!KC4M4krDF(JCz
zd(?mF|Glcnpmez-6GHZDr?Uu^edB2VAtxW+i2QR4PrKJUJ~+YLjtr^BI-g|m31Bux
zRUt9Cu6sk1El*is|GI?1w)n2UV9pS4sUL~jU$uxO1U<^ehi3C7D()t4=V|ym-edl<
zA3(O<iq+7bsU(<^t5D~6gIzE!+@jUaen6K7E!c)LV|J%XwqZ)16waWU8lSD>37Os<
zo0Os-5>sAL(X}oT^tU_oU*3d_p~c`p5ttWsYUG%Ek!tw9@X;T(DsBv{J&zSJ9=8GC
z*u7CeEGDG>Di#=h9^SCWc+ILeqUdIm+jX3^iT!?0mqJM&&008}ngDUW`XY3PU-bh$
z2jeFNfoFD#awD*qaM>F42@S`N$skQ|7U&{HCIzgj;qoJC&9tG|qm*K0M)zfqrWzAT
zVFfMVt<}E*8i{zjSC0ykfXD+e_(2oHW<rvgixToRD_4FBeRcivWuu3;6g>PZZXK-h
zAnowu1Y5~gG0K*x>qM-INY4tl{dtUk<q<%aS;sg^OH1$WwqhOIn(>H1`UxjTq!K+a
zc+@3|kmubD$4q)(dQ=+Jja&nl^?p=i&uMFUe0xDwm#jcMEtL9dOd=HL6Q1X>%5I0R
zgu>QiP7G=Po?~H!jTy1*=^P@l_#d8zx(3}7DaDHyZojtF=aYB<7ce6B=}B!Qhn5^7
z=|G+sk>sTNC#sCpFYtf&$A3BN2b2#T^)9@*x$Ex}kmKvS2oSP;1ci9rPb-KG!am|}
z8BR2TDX~i*{r0Vdl`$EGAOoKW7Oa-p66nFm7xb-6_>0J;t0uujf&K$*maZ28Tc7W|
zP6S6|ML%)rbAaiA%KYyoj(3ube8RAw0nR-h2ef*ykX77EwG+cLT1D{ynEHU1^`gLW
zYv4Ts+z8rE<hT$7^h+jnpiK|nbd`PBHjMh^1+9|Vg%(dQZrrZFjWVoCg3)w~hyT(*
z9<n(6rn~5Dd8FS|#$b7jMZ3E0m_=_HsFc|zQt|eCv9OiR8V?-OCd`8KO;xo)>LlWQ
zZ)`FwAmme}Pg4|;0MW2;nG{H#P&#?OAx{Bil>{u}Ek7#=+1^7D3+EK?T=GEQa1g5l
z$73iBU`SQ0xGkM%dAbz_PO%+qL*LBfD?v!?Q=%yrt}xDgTF(vUa@t17sr?BS%p$;<
z6x2ZClaW==@yPfeim|N+yBQPBQpTn+F{a<*n)*9@A6bs-6m(x(qyrvIex04Qp7|yB
z3-1)sT<-3|LC&|v$f;6r*q(RY>jYm$tZXnd*y^Tyn=Kq9f_n~eS51)h>6~pe8x9f3
zTShR&<8lTUYzgutmZ+jK-NxS4k+`e%R|%627NV{|H?S%{ePK7~GY4SC5KGu%CiK-I
z{JOdCAO8o4*XR4+ry(c4)J9VtDeftWl}b*T$3$_p-csd;2d5^2Ctadf`GL;m*+0{R
z2me9syIO9|Up#(d-N3#vlAgOX5|dw~nz6Idtc5acjqesdw7SkFrm@=32xeB51W<>A
zB@bD0oj;-+&1N2KLYNGZ17&6}?&+aZD*PG^<#^S8k60gBlsP4BNq;OOws^cg-%d2@
z@+Du#XC8~>HX^c_jTqQc9CSO1Cx72+T(bKXn=KHZ>R7*$MX&@DlaJY28>27UCJCaA
zbugZ<y^TSfS0*ovoNDjQTMhU4*f%^I9`P@crFo7o4$Q}&zm_mQkX=A|=eA`irzRN_
zo20$D3m!>OVXF_YAqw*13_Dj`xFW<Ha^E(goIRyej$UZUw<@z{F&RXUBI05S@Rlp=
z^z8QGu5VJA1*wJ%S226eIe*axU0$y97I^^jezwIO0}YQ0dyf~pv)>;t|DrFFZ%3aI
zXGY)oZPNFAV4lPJm178Sf*mWV`+kc$3Nl}7yg*oh+0q4@`4}I{HAz9*%CSkZ(=mB1
z&Mwu-S~!yMf~LzSd~RQ4nus_gZ74at6+?dN<M$>!Hbk3g1181gv5}tzWE5mn4|n7o
zRwJqnVSM1Fo>IG1y-nvffRNFFLqs7!`kx8#{;BMLvXzG@LQ@%cUIUo<hsxGPizhoN
zD_T7IOYOK)DUmHgjhR2XwvQc_dNN8Rtgqb3*4FkrDvet%&mgh$MGe$Rai_Eh#VQtC
zAM+!K2Vwf^%qQ_#Nhbgy1GP4nkkZ?ueW=+;!+bZ*;6vjO_?z0GPBu2=MpE|SS4lnM
z_}Eex*pgpL%BG){===iu`VA&+O`ZPy=vZ2R{d9j>YjsTr^R|hf(JK-NH!<ltK(gEq
zW?*sYyv)|U;j)2p-a#r<uyHvyy<F-;O<_yTjNYpH?3Rr!KQJqAyMbep(rh|)=n1U$
zzf(XHO&ORRH-15)zuk0EMbF+Y^ynnyp{k_9&!HbmSL$l%#M3tN+;!1pbq!U(pAv$(
z3PBNH%%&?+qym<#tJ{+??5wg*eAGQeUd0}l7_q1^4ruVlb`RtiggJ=`lLgmfago5X
zyQalmhQtXr1HTiyTx?Ih+kel|`le)OSB<GG5*{i@br(fv)L6~XnaVq=X&MnrDP!7o
zKD&v3O{h*-+v?tZhSWN~N{P=8KeXXysYHu~5>iS55)!kbYLwOF)6o(hn?y_GM;CJ`
zU|!2ujA_ue-`c<`RiL-zoEc0^8j3-8?kwdaB(r>zl<)7Y)nFHtiO8dc7)qdN{*t{&
z$-zieT1p!t%b<DR8Xr7432f3Xh&d0>A^XQ&;PyX^K`;m?tZdtvWSW?qY(<Q1g%=U{
z>ywjHT%}E}fhEIvFG~4Kk`i!@Jm?#I<l5QR{%_|9mq8QKg5?;`Pb~G;AK?QHm*Vm{
zuw~%;=Z?^F3-i<Cu{gSUQI03yJuh;Zz2&lw8{L0vv|`_m6mh2X*nT%-Mo7c-GiSRY
z@wJSu{BN<)GcvA1Mo~H*^ssE>_iuDP?-PzL14X&&0E0K~E52M`xGarWO62<#7h(z>
zpoAMl8Il8t+<TW=t7A(dPW!Y?vZ&S$nbg`zlH#EWnF;Vs2G8{}%>B)^Ti<CJqDKv0
zkbY8Xv|X3rD8@viUC*=)>ygM5Z2=aFY>$H;#F^t34d9_oBtg_XZfM<#=qF1}kl=7E
z+lT2D`1G}6wHDeYRtidoPeW$>d>EYa#@~TWrG2gXxKflu(Xzq4soNONPVY`^{Djss
zonfHl+me~O7!y^u%A!UbXR~ofrmyAV0G&`65^KE91DAAZg?BC!+|PA{rX~4dhy^0`
z1&RC{q>KR)ivVOSW{7JO*DU!ck$O84(_38QxQ4u=DalJg7d@E1j3P9UxuR8?gQdC0
zjyCWRXMzAL3mq%Oqrl(^5K05>C=`zDx?f<%M`yEa!(k$~eio<y7>x8!h)4DRvSmuf
zNiTZc5a=ptI0<rPY?5qX(th@J<E9XvLtX>TIBVqvbH|eRlT&PeN*u8gP+Kz{a)~Cs
z!1rQA9jzcPl<G}?GwJ0zH$U27(TdhrR2~Hj(XbF15>pe)5=<hS^*SG2Z-&R*l?{y?
zZAH2w)jCXx%-o7DXzS?(L^A(I_kX!82&1_roOu5U)Twp%{H{VrYJtR3i_$ciXsTR7
zLALWk`qcMQePF45Z$*Y&EaKYBfky#cN?{W<SE&ym*Y4*-t>NO`yZ4)4!D3$OuWa9@
z;c;E_z3o1`ECX|cPyOS9ndeR=R7pnwf9CNKfr@Ah8OWTy+{r|zN}O{-S`@ZiraUL~
zbdb}6;-p*ReN4Fqj)rD~VFU|Fd|fb+rkT0=$&HO9GT~8U;94~LM$-6^y>-sgNhs8{
z(sU_4h}GEpLsfZ(iN{Vu1VK37EB};7!AKSqrnDY4h%=6IiCByMDa0T)RGMJZ;daQI
z9?Gvr0)>yDxul`|q{O+rsQZ(FZ){JhQPz!RbcXdEvmSW`6GMTe8{NM^MT}t=!qICn
zUTB=oig5+$YizuLHaRt0|N7`Q=XigUInDP_v(b!=Nhp(?fes&vh^8(cDLz}Z3CG7i
zgzsr#cliGp$gM+3|H*PWWD9$$iM~@5R->lOpIyb)kddo}@18cusmQ|mB!X{T4;CSY
z#w`m6PynA#7k_=!j<!Z!U##4YewCfnff+&#G-CO2NS(0`Cae_-Aw8oKiax(V@nnh5
z6P?D+S9VK^(3iNaHaq~W-mEz1mmCZI3F*Bc2>ssyckNVoOoVo8E31i86$$>^Wq*xz
zkZjn@dY;!Lj7%Cb(Tplop~34JZCVbjs9=EcyW{9uPR$2mvV}Wrgo0ohl5>-413bQP
zNj#nzMvPupzRf^)xv}Te!S{T1$9Kl!(fC2(Sk!sH%Xrf@g)zUwuFam`?T|DvZ68&@
zm_*QYx{2r;sq+&<Tl_EnM>jYHWt@X*x8>t{crfI=`EO6;Rq;|$WfZM8YSGp52x2xM
zLziSeO^e#d;><+R{)7bCXMt|$7k`(aHw7oxzF4Rq3P$R;pFg>^6n|hrV$1RMzq~aS
zT(uj)pMw1{eouYK78ChDtwO5gz_7~_>4v21UvBEYq$A_<WB%8`%ZXZJBzQOxPW>b`
zgc_GeB~G`31)}6y$?G{^>*I%1u++fyn1q|x2WUMhTKctjL``RNVDzY%83~V;8hqs!
z^IZ4GqI7(({7X>F+R)i{x^<OE>kW}C)rC1WisE8YTc(vYT!^6ht9()Mua+!%+)w|X
z<9?m%SzA1&FO%zPJqA)<Nj3Y<2qY4#H>rMQ<wP@(nq_&?juK?@fyL&|VKk*{th#4m
zG{{74>|mLY(RnJ(v0D3m!cDxatfedZM^0iB`pi<M@1eAN^>C`+(Do0iAN<YI=!do`
zs@7UNE*`I6ZF`5nbY@`USvBO>$F)~+zazExh;S3i{CdoOFwjTnspfsDC95jffF&%3
zh<6<fWvZ(Wk7kbrWEn1X|B-Gp=s0$elg9_^?gpRNWsM|qyg5reH-u$6jU!~Bz%5YW
zom$k7T^59!1}ytQh+syZ5OYZ*F!vhm7UNh=ri$*0JDGII5b#xRXWn~gyPZ)Y)VxG~
zpvV`J<VZvx8MwUCdMljM;mdt%>fEYxPwNe5CCFoBE7Xpb`DAG_)|_Z72p0~mZkZXE
zM;zft+6N#aOg7mq1kUMseuiPzb#(L`4(JbP+!70jHFF|Cp$0v7=glw~^Z5{jWb1F9
z=%V6O82S(uy?EdWTUN>(CM<r$u={S`CJVqCUe_Oq)6ZqTd_|VWg!k31S3H&96G&l;
z7Y<@DJeYm=eKweVlR+?&Ui_uZep7ZT&up*3I{oKMRyvyz4-YM}scM5peqyD03IMeA
ztMiryDSN5?X8;YS(2~=#Ml#B^%vV*_&t5q*AJLv(L_*6cL%@^DW?yp>u?gs}GMh%m
z-T724O}_uXp2(>DKL7%X`u(SDsmko&+)&p_a)8+ev6MP|_)q}>4#tsA&%RQ@M3Ec;
zp@0{*U=Ay5zW|?z8P(Jf-b8_EVx}bEN@0Nn>d(~kl0PMT`cn<d-FgM@nU7uEmc^z_
zh^=%NVf<I>M)gFYz{*)~AS1%vMzN^mrS}3?(&wb+qbfef7X+1gI)|g4=YJ``>MKwd
zG&LunabgqomQ$%>@o65l+6UQ#ei~jVoVKGM-|(eYNEpYpZDnoO0+uka{YgM_D{ni-
zzmlJHl{XRO^(6EIQv|H0X;6rO@G{9v-_jeuWU6)8&#MFnQPahzWEA0xTE9JNh9?fE
z=q|$2Wr5E!zQyGeRHGiYq2t$$7J$h2W)LO-$(?Ms2Qh{(cjpFX)8Yi|w#bxPIE<C#
z)5tL~6Uc%_HNdkfZY7<)cuk4b=5~phy#3j0XhKi#2{`S9qfa3i8Ilc_Vgs-O-G!=G
z-&X<e(b3WVunh`_t!OTT<N4aZ;CqGL8_L)=L!gGV0F`X&kA*t3j6wdKxzHVG3jL)d
z$CGr6SkI!u%^@_AR^@yVW~4smPglRiO)`3npW0vQAiIp;xTc4`V>S6P==9WF*okfI
z-PAK#8M?p&fHwMgzlC9WN}kLMUJieEFNAgBVTo12;+mE;<yEGuazzggrf+8aNMjQ!
zDp1;<hRbdAIL!UIpZnKitq&g~E<TLX%g~GRu!s79GnFcBI5y4yyH^mA!~Mq`oh#U@
zbQ|<lz)CH|Fb6<}{Xx8wi+qe=Iqp-wjDA1SyO|$NN(ofW+aMW5U6qf`A2bdqOMXqy
zeEaj;lGCextRY@(<0*`S=pk&RP3Y=EQo&ETvr+Oq9yjcKz$9`za^q#wKD`oLJOXmZ
zu`{2GPrXw8^xOR?1VZesLl30l7JGOqme1~k-4b!2&Dd3~W~L~Z`P;Go>HziD{{5ff
zH~MAB$c?`eyBueUQ%*YF0K^sLx6ylp$g80$oKY*T(Q7i9PMLrhkF@ug?rp=1sVz5)
zN3wmN1r&ZIy{))wLHAQoe!8UKTeJU;Bf|;r&L~H!sdlJ>?tNRU47+@z&3-6m!Ssf#
zZp+Q^kkA!Dy+-+bu(Deku2bN%85a&^il5tWPJ5dR%Jwjq+`Weu^Bj@0)po}t+a|;Q
zSbB7npLpQ}D^Gqm(xC4X<BQ@Z5|)~@yJH!VLwi}F&Y_=r=k)z6uU$cMS#O9%xLx*J
zEb>PR0OiFBvfp2_VX74SGeOCrQ|nt3Q>Ig)Tp_RP!=J*ojPyJuBck-~ICRF;3pZ&X
z(-&_Fn#%%(R&k3ZhR~$a1o{lL?C;q>x7i+hKgZ-sxzYWuw<<}?gR4@uW=Dg?P%u&=
zz)*HUMAR=XA(QG)o;&N^K_wMs>{lrjBL_nkll9@+0sYf$|MxxokD3}MZR}PH%2ca=
zcpjM9IFw#HJhU3D2c=?}Ppb1stR1CcBpaKS8zls4+qHbQ)o%Jqs#s29s={_@W$~dX
zzFt}_JtZwwyIZ^IR7QSawa3Y3QGG;hM@6{uTY)Uf$>Oqbz6RWw*K7n~d5F}D^e6G+
zhxXJ?FCjPF#ICc;68ie2v)7B1&YI7Vyj*$G17!{=4X_F8&GAC7n&r`=A+`<?rw!ik
z+x_kqibz6`jjQTzJY1XV_HRhA4QqGuW>f>#rPF%+yV=~jEJBRxxr$qZ6pTJ<@=fTr
zDJsC|hpoBWsC5wD7~iXp%jvWx{#5tAXSNA4y&sdXEsfDwO$3wjoPc4JrOG0iqaeDL
z9*BV;A*tSZnyb&#Mo1@LkRV-5jRyNG!Hy>1<MArf?I;^)ui=-9HudCM8!J5ptN)iF
z!_4_nc(8Hj!mU8Q_%3}iGo(dy+!QD+@!>=Mwm6uTKm<&y?!5}&B<4Tn2X$-LnSB~l
z9~hZY*B$i{HS!a+17QED@`b6pW>oO4S@9XDI8?QU!OEC#J!$WsXj9o8$q6V9b<%=i
z%Z8F37W_)O$)E;s%(&<VRN*~DLpUgZy}4}1h-WFXhUM9Av!rBKl&7MA-X`7d)nr{U
zde0v?xGcD{vjbauc+C86@Tur+N5b;;Nj*)8n1!C}X%BbA9!mvZu!X#?j$vvok#ns7
zP72}wahdp^9YE`G0CtN%T>!bSg@Xr^%G0y6HC^p)sSjm2X6U5xfEem9?1b*gTNNBh
zzoXf^OXFBFy!UvLxaL!ayit-NB3T&}gvmsr&Eg)ZPs2*zr{Pl<nB$3iy|xP+)jk~d
z3|v&wKaNrkBVJQ4wn<?o5TrkE*%f-s+>};S^uVU6!#QONX+;_~G`Z_$FULO*VSA)|
z?PIZCi7xfK4u-@Tk{`J2$=%ds3~$}aQ4&pXkN58D0n#>ao@Q>tGmW1a_@*P9gxnZc
z3clUyhPBTLw$2Vof9)r*o|+#T8|p5UN{|(?OpaGl41Dh2kwqMg6UQb}nRPTDL#Z9o
z2siuOf0{DjCdU#*Bq86O0I&@IikZ+!enBDO*^!lly>;h!X%<g3CKp`jK(2oLkRgh=
zC<*GHlW?PfTi*MIHr;vG^AV5Dje!D3!wm@|MO;p(06$WmDZNc+Gd8ay9}G%JINy*U
z0qPfWl&eE_6_*|$1JEBYaMKlta8fd9w%VNbwf^<ncMMF!D8qvzCP0nEQALM*!pF#A
ze8-Ad)|G;gqb3n!CE#2dhW+p|Z=v?b!r}+jd|{Xo<CK2j{31P7D7rTcIEJ%*J<TYT
zGK8BRE^^78TdSw07UL-G|9tlNQ@S(S*cJe_0}vDL0Uop^Kfax<(uF?AB8{F$f8qS9
z7l~u%?~fLi^Iv}Z?f)4fG(RJetsya4vOqHIeIDO3ct~VyFO6eAsiV`!sKU^GA$2sM
z1Tshxes0Zy!tb^<Ls3od?d8PNG2HO-pml2a7$aCycw~W2z|2oiji~1$Cl>sM9ieAZ
zxgBq&{Fkyg_v-7SOQX^e<qP*PRa%qPzj$nL7a2mYlN0#7SV&-`Bi7=}lb2+IiQ|V@
zqW*}_(0CB&oqz?d@|bnn943WC^!9QSk!KfLAEcKoY|PfVYbB*yi@CT0gPMoF^%5%}
zi!iyvNI=|S|50*xZ@M&L*n?@HG=Z8u|Le(j3RX;iW;>7qt85zYXV_I@wPqb~I=o2A
zc`PtCh#rBhjoT&Dh|m8csd>`)2-HAgT4NngsBI|qOKL3UaI)H8=$d6gT4zB@RH|nD
z9XR3R)^+PjOWQf%xkpgq|Do%f0_*O+U}M|1lg9RGjK;Rz*tTspNrN`FZKJVm+qmcZ
zf4KMMKArRa+k5S`W@gQR9rC7N=b{$M5D3_B`ZT}(@LFP%&cHYOE|e7IW0PxgM$>1$
zEBH>FK1v`X3S$}^Lo5WEJC$1%BcX?%ap}~}1HP0^HpY^R6Q{HRjE6|~K<Aq6tz|+h
z5qZ2=|5M~dZT54L;_a);QvD~ym|krxixZz^R!OGPohz+&l~0|G^N8K=WJ0qK_JPr*
zHSeutRyQiXhjN$Hf|f4RJ_PnjIT79Lrij9~bvQQpBC43It)eu&{x_yh;jmc3Ph^uS
zh5-LUii5*i(=oM)Cg}=YNz1a>QI||k>kG9ftp86fF;$R4(Pp<=lZ=WhF{I`I-(!!(
zBns-pR`Q0KmGs2H7L-XGA%jpvcafqLhM9Ul6iVma2g_!p-<=yK$U_VzKbmi3sh#n*
zDXP1s;ah~A$=dWSgb0h2$)II7^>d!G3zz#+i&`Ef3Z7PbFvpldZ$mTj7E7TCv^=`H
zZ+#y($m#rDS~_^Ys2f-3^=LMDn5wLqA(O@^0sw&W>*?3m&@c-*A1UlLj5q0oG-<6*
zM)k_AM5MVGB3STB>0CeXm`YQ8Eu}C}n*1^qLy=H_O>McsK?+oM!2Y#3=<BwN2(&~Y
z0Oqbm`@X*v$ZvKYm9-<`vE%Fx#SQ7YZA8QgzMzC55e8li89bPP{K|R0KN2zk@q9Rn
z5N1X>*H5I<>S{`l;WFOw*NY`^(@*uC8I5T4w;@c(TuY^fm5^86b~Y8}h%_^sXC+^q
z6g;&Fdq_fCyA*Zi$ymM}j8ztoo8{&d1a}>3^B7(lp#~KfiuJl|37e4LTNTkRzc%ee
z4Yis09q7S2w=o7)E9xh|C#~s$TdeOv+4*ro&yC+zcIbROBQ~}Ybwukft95#{-N)^6
zlAKwx^%D(S@nCMQ-Wh1g3f5x~K0j5ET({pX#kq<1NhJEkBDz!3Mp(O+ryc>(^V>a@
zq2%Jhc#u?Dv{uJyx^<Pd1hOfW*)NYjrBa+p7py-}V}lbCGGbpZyRc=_n1;T)t(DxR
zJtB-CH(i4>=+)x@EwO59x`$6uLJ@Fx)MzYs&QXN`|MBPiKVkp<&q71yC%W9aLO9(Z
zqmCu4yz9bBE=)&H|5qpt0$w?khl$KvVhG2*4T@$`OwE&z=<YcbJe-u$zKGK7%+-b0
zCHZscDU109Kaf|iJsr%0nxv7Ht)=x@;R3KHLBN)?$&(?67Qlp(T@_Q1mg~H&5q(M6
zQM`!3J<0UJH8HMcDSbwp?O7~RdFwRsZretQl%Y>ZI1!=2`FeXW;qaQ{W_50Y^z*o^
z2Aff57|cByjuirFD28}SV2Vhsgv_VOCVrTeXoysnV&k!P?7n>HTJ3YS!|i6lK8e{e
zbfXg*nV=ge<6?2!@U~fRg=}bOSO8zHnVY2B2K5FKGw#RxX$e_bQ3>P{J1?h|#_xc#
zQ<rDrLw_$>s3^6tI6^M0vW0Shl{DR|e1?QqY>wKXG)JaM5wm69QBYqOe!;uzxc*RV
z^~@lxsXqaaW=Un^qt}uqMMLT;Gxqn@h6azXCVgM7SgX%sns>uXnnfwf_)`dv4G1M%
z#rIu}#cFAxkrsFTil(%u_-_%++ONQ}kdw-B3B`MZ(oB22LJ<q0ACL2Db|2ZMicTxL
zh~Sf1q(n;zhEVz|mw$>8-P{6&p+FnTR4FrDk|FtQVFyJPJWeZ{0s}MCUjd2*;yVLr
zdM3Nk;q~AHrrerD!nUEvF0vK!YUa8l<vUnO1&KR)$AqRQ_oveknwGvr+0{1;6vnp!
z=-jHP!k&>s6fG9#Jl6BHL50ASy7DEg)ghC%WG~;(cjWXnOj3s(5xK2Wmgh3fIzeMx
zKE)w=Q~lPPN9(&I7F+BU<o`?2qlY8>OVGW<b^zD1;@R2A$?4Wb^FS6?=B<Ii1qyj&
zDDAy}dU<GjblGf$gRm4Q)Z5%+LMyL{srg@~XM+N6n<1s8(!pPQnuY1+O90})Mt<D1
zxHVjLfRkS?7`7sGv-(#$WInAm1s5A4I4_4to*dUe$^>RDlry5s^aw27qo~K1&Q*JV
z({z;K{x_hB<5!^U?C0QNC|g2uIUYupZk>3Nf?`!4*jx)Di^X)_l8a$^SXO^re+!Uq
zqX_8;#?WUR^UR)y4_4<o72uJPT;BaOzT^Yhqp7Ud|Mp{<AelT;5)2lC${1xt5T7|6
zp|J;ab!pHXVG#NeA3t~s^eV$XeG7c`P#6s-NtT@?06-=Qk)IthQ^|QLSJ|cSQhHHx
z@?-yMy~dN+_Hx|W&BaC4W#Y)^zEl2N`Vua&1)0yXX<82`G!cxtjt3=!W-SgJrE=qN
zU4EDd|3$jS7{2rogGRM*dIquES<Mx2?<y!86-9^okt31jSY_tMk%djz^%0@F^pTI0
zD2j#%NsOf9t8N5s)d+<#RK4m_ec7tWPeZDir<z^SYMs?I1orm}Vm^kePF=JR^*>$n
z(P??q?RZ8E47<Uv?RMj@-X|l}+mZB@C_T2wxMibP@pXW=58@Bwed9MxiUk&KBw#@7
z7Cp8e%=)1F-LQtoEE9wWzv(Cj+v@nX4es3|a`($UXezp|&(~eZ#4iQnv1m$4+<L2R
z&<1^zwh6~(M7`NmyRtw(ZwhpxFim;%(D|OZKiqcsrV_YkM@J!;+I*0>N)s^lS+RZ1
zhWB3=6o|l|vK#8_(|6y&rSu@<$O*vVu{&X+u)fqveyej`_Qo=s%!Gs{bd+2QN!{AM
zyA2X1L4kqjl>im>2mXQu2tWNcHl3aX3QYU@BfMarNq~AxFg=fZ%%i1sq=esJzzdK9
zS`C$|99nYjw`Cfc!7bIOV4yxe-UqX`V)-tEGgq|AkS<^)J!SEhVaV}j;1Jz8rk%Ds
zCJ3*5z2Y?Hqv>}aGp6B;v)B|E=uA@hUFN(n@=z~(-I^i{*r4iJKzOX?B%80w^pzKa
zV0mh2%5`eM7VMTlu0_|D!&+ax<Z~IrlX^%cZKcgIDpn3ZWgD~vhr97G_J8M%Ty60l
zGp=*2wJ!H;Z@xb?1wJ)zhvGv-7@`B6(47^&M9y%!6J_djHQVPicXmE$V~g0y$GKEg
zZ*{iVJ)H3{`>wff;~N%e>|9L_y3*${R`ECKsmFf@_*^`ccoU2woS)!<EDsiH(DgpS
zqRZ~uR-iUdVvFBv9e$$DZSvxBu5+6ZZ}Gt3+il}gNIJW?x^@E{QmMd>Sx8Cuxqcr8
zkgqsJ>myHpMAOEE5s>ga0%gg4Kp>;2ui4H!-DzuYB&mGS^?(o^;s%)hS!&Ch?f0k8
z2*`N^cr%)t+9n(9FCYOlerKssjzD+5a@rA2Od)6UevOu=dgC4KMW;qH3_4Mzs2*yZ
z)6kQ<Ac&th$m{TV6xxHI{b6j|b<PQJjIu!~3w_oBmE*mppjT!<iJO&227Yqj2_VKq
z0sZ>dNdVg}h&2W9u{`m)U3`$y*ntP}oi0=abpiKNcRC27(YK{9QkWBvN)i6N%Ff`r
zfp-)cjj)J!-3xv6DP`7Bmg3}{y^dc`kfjgOcZ|@JAWX-6)zfXzji(;}X^OP&Rml9P
zI=50$Sgf*YOr}lKlVn$pok8+s_}LAT?Riqd40P1udKE$K(FPii+&w<x-bZr3Ch+qd
zZ3U6yMLq9T1!7$Hjer6vXvVzbSAX@oNMek|>G>&Qh_s+?LrrR5c?>p<nErnCt`}AA
z&p`OC_wTFyPcHY*LfqAHH4JZFV}5I3)Y(_C8g-s2LkhZ^Tp$x)zA&3l5)8{2gAT2Y
zej$vff0`)ikdNTyyr4u{`!)6*druY0k#ecEO<odmdFba*&=<b}fi>*eyQbJHm=n8@
zUkHnLZc7@;Q`@|~R9ggJ07blAiS5si`fq&gx08Hosj04LC{v~JO2*^nw|#Ts$E*%N
zZ{ZRi3?D|SY}*hw+}~ZM%{M`0f3Oa$QL~Jvt2Tar<-BZY{#jPxxjaPhR1*g)gs5F?
zz5ZZJ>NfyZH;OU!n+X;Qar`ltA3+IrwwiG0P#fPBpbwNwMnNW16)><qDaA`s2B(E*
zfSPVx0wWi`p4|8N&lpV!-Xied43jG;E5kRwk)cHa-JF8hCVAP)!*vHA$lmY%cK`ye
z6hTo*{wf6|D1s;MQ%jA|g!XF=L-4Q|_&9rgAhR8QtwSDD40ZNw42NkJEc!3l0KT@0
zTUplN7897}!6RtjGZG6c8;r#UX>?qIy1^!Q_Fd4s)7Ap<{ElTX2Hhs~9TqBzdOU08
z>d!*M;^!6>kTQ*wi9)a2$|v!WvVCn{gXdz`Ydr9A8hqCckK9|%Lh3=w)R+wRadM$P
zvD99m0WL*Op@!l)?R1s)rO?KwmboZnieVCp&dN~WUTvV>sU!|kijwqvBK^kWQt0{l
zcl#B~Up+Z)8?@ed^`NJplW~5#Ji=sqmsM}N@g#O#_o;F1zsrAhuo6psQI?*J<|YTN
zE$V<?@v5bAI1pMLWv+P_Zw?K2@|vS}3uTfSynm_lXo^ieATV>0!oIOuR=sQTlMTtp
zb9x3OBJGnJi*0uOXtf$@EG1CmX$0rGu>7phZtOmHTf=2Eq!gIN<VZBFeq&X4)PH@{
zt~#%cA3i-jMc1RaxTjkM6%gLJPCwQ)`Bu$syXw~9aYCDW;#0rQ1wEc)%`YJpR=Ct$
z2k!`(QkV>^zRxYmRYU7qk!KyK_sqpba`B|;98DuMUZ)p&VbPUTm(WsiD=J_oGq9&#
z-S-=obr<S9j6x*U$d1blI((m2!}~Xh1b9K68-f5&`7BO>^7Jm;)z`b(e;)<N|L0No
zRntM}+^u*U8wzxF{|bQU97j>(%?YK>^+Z$ad?c!toI{vYqj_|nWlcZfXpU;laVKzN
z6FEa$sMG{MZ&UOg(3#M$eG_`XQ)H5LF+EyvGLHYg9&5W4&8qt6H;F)TtYzpQ8b8Xk
zZ3gy7Ph9uDsSCOjjp&|RJG%gzP7;I#XsDO%UE)t}0?#GGVyvzci9+V2%Yet|2Xsf;
z#yf;W)^9P@mx8Z!7bGx%L>0gff{$IF#anmoEB~9muc^GdP72BBu6}wYgb39S&Tf6U
zzj8r=a>9BN8h$~<PmnDRh1N4*Dq`q7y}I-dl9$(PJ~zg~asyUhvsZtc%cCHTey>iZ
zu<j9drAFG@ScxHfyj4o=;E(LKQlgf0cLu16RG~n<+H$Q3HeG$_j9+6zM-L*y?us3U
zr1!?EYhg{}e?>aDo-I{U&Aw$2K9~%e5~EJ|j2v3E3#oLMS9kH>z_bJ7Lson(t*o$a
z*_hgJ*|@QIdHH~1*5x%@O`u*1!x)mXX8bxcNOzsbxSjR8<{FpGO7YR!N)WzU1!<Ch
z#;$h%Tg+~q8wt}MY=Xrf#qS?_B4CA#m_aYHYa<{vc0HZ?@9rgLL@8|p{GXwxl|evH
zb-=f8gFHn0e=?&zUVqwo*JU2>>b)!j{&@)?$b|pb6ObT4@)OoOJzb&N&nXgPdmg&R
zqeg`5wykUdmq5^lm}MRYvi21%cgBm{Nt7wD!b#GS{S7WXpZC*9R)x08BPBkAulr8(
z8w4pO!SP#}dC2f$x@+&hGsn}Xv(lO(IZ-2HYvSveRvYM!#V|Rcrkg1#%(AOa_0iKe
zW<YhOdXH<G|1ezud|xBkv*EN`K>(sz0U8V!>;!031rl+g5nku}-?{g#KM6&;9Sjel
zAbzzla#y6T?s$?1`&*BIQyg(K^>i~F=fg9#qkKHP-3F#V<$~#1_YKBeJ>O1MvHwzA
z1J6`0U~w8DTeT<HmVRnj^`c`HZa&-ZNv9UCjBH`k*WPB)Ff;cfg1VtRCSX*n;c8+p
zdu=7d|EYCMg2~eZ{zDq+BpOYqrkHF*<x;cTrNy%xYIqD*lh3%*%b*AB3c(8VnA9z}
zma*MY50);DKGyA^`u8wc%Vz+z_xJM+HxUs5iX_^&IZQNX@OSW;dvMRWR=pOLU>4({
zUSI}zw1XDP2f_L~4`5|m=j7aRo$b7;z&qD8y>5~Dum#|`xBl&Xr6t=slR!Y~gpIar
zc?}^xHZ~UdN(DMzUVK&PxgY&%HurNpvD5LjW$`G9$>&(6`toeq5Zirm=|^5J!9Vq0
znglHP?~YIb1dSvl4}4PakU&zy^PH+#1N2q@^IpH&aloq=VI3A)sz+_;YR%i)uUu#2
zG?;(ipb8U5yeisaoTFMC%w+UPTyl`?Llp5G&zpTkx6wBZW^bFP#00_Ya-ObMD4k-T
zoW7r#DoZ-+4mwS3t>F3MW`dBc41%(SS;p+`>DqqWVJMK(z$T^3a#sB4<T$k!vzgoP
zW{);r`WN^cl1kZui`l#(8lV*cHKPPhD}d>HB9tGcv-nA;uzSc<NGIsIph&^3*Jaxj
z>-|SAWFkpb=L?<A2XN=ySf6Qv9Y_`82$<EgAi+;|6i_TIJlKv%NUWsa8Av`(`uGxF
z6zu6GX&)>ud!xb)B=Ye#OX)4lFP6RXveS!*#RsDj(2@CvL?-~AqAh&vOo$O60|o=x
z<ffh9*7wIkvhgI(533c|)RBz!1cW|aOf2bNtMqTA1*!dUJnsHTkmgQFWk_tfm(R`5
zi?C9nlBlKBw%CZFvs8}VfhGU~r{;hhXr9HmOfjk_Zleo=aDS`Bh0tQ+SCts#WqLS$
z>}VeEmvr&pV-%3Mgj@$bs@i;_3rfK(MbjCjLsv_!vb{;5fll6DS@JhBQCDYF6o`r!
z7x<galJ$^@qz~@BA)su<@@xnGekEq3&8tgLN7T^&>j8t~(857T|2G9NV_c=ybl^I7
zI}GK5gb_G~r$8D(B{Mr24#g5)-R8c_wwsT;3|E6!&lnkpt$`>Efn<;g#@=YHHho7A
zkkkx?0@s-p=L!(?K7_2)*qF}=X;|eYv27QhF;;Oxl*Q9Cm$u;P;TiEyYrFZviv&6n
zrLJbnHA)lV&kuzgCwO9kBjAaELGVmpS-y8NUlsyrE#Hp=y{7H$U-C;OfLUzG{yjbc
zZTzHdsECXS#W<>#s*LVT|M?E8xc*{GsJO$_*S;}RB(n_^Pp}M16-Ejl3PItJbnV9S
zZAA<bsjoF@>+>VM<H{1_*HtK}S?pHo4P$#ydi1`Z|D?j_zHP`C-6DM^Wi3q4k_+is
z%ao1z>BFNUQRpz?e(Uw;sPGR)t))(1q}p6WShVIQN4<$o{CJwj%ulhX;JYM-Uup?=
zTco1yA=#MF3i7r{nm<QqVB-gRw_bsU1%~&f^P|PWGi0c7>NsTuvPpFK16f5>=3(hf
z4;x-~G)_*jqPZ~>=K@3pj-M@+kF9BqS7sLJ;ztFUtiT6etz8_<WA#FBY2y!5EpH&n
zBF?E&QZ(O;W3yqdAry?KWQaU`&xgoUd%0c%+9cm2!C%I^g|oE3piJ4rx%57tsD%O+
z4EuT+>*tqz<%PKZuI}D*!VoZjAAx+3xjju3XAr3MPTxObYF7)0=?e=BJpzww;BowK
z%+)~Fu%~&77p#yu9V2_blFfW$YQy93`_jk9Yq1JOW#%CP>j;i4k>=(71xUv`XCl$5
zt203R(SJH!V#fF--7H@u4%CQ?dq{Uigi#7keASc;);O!Q;0+TS>HwAdxG?GL;Cg-(
z-+Qguq2TLzXixG;(!5)LpxWLT;svtkm;z)=Sv;SSuMuUp3U{(o!U;oGIsIu7ZI9No
z;Af_F-mhOncZ$!OFVFxAvcM|!_bWQmti8(7G_dVd)R#S}BtlpQFN6k{dq9nj((vH(
zLO0ttD2T&I&W4oKX37LeH7YD@le~E5o4Fdi-srGL^DX7yC)S@&rGw8s`gZe&03L7@
z_qYdKyY`m)T3^}SL)2+jTjFP?eRA2rO46JlCkH#bDi)^Bf_As;phU;U9|Mx7drx%X
zBAeRDyHP{vay&loJQF(o0)p~}A0kKKO4j4M$`V`=9%~PvJs!M7F~O50j<@D$idje)
z_<~8gy1MahFb6&0QzAFU$60p0=5m6X@p3@??nmX>$#KY~_aUGCXi08G@i2bOcj))E
zfBSdvfBW}PI0cnXwj+OKA+Jp4$BWZbXpf>VP{Ey_?_-9i3tvzo2C~x|{mz@h)Z>km
zbXY4@LHDa_m5N16`VHNU5u<I!VU95f`OAXIWhGVf5mGzsa$zg-uVwx65OKKaV^}1c
z49$^kzCP2B)6rrWjHk2M9~p-6svpuV6Q3f#_=y$@6JtdMyhV6@OTOst%G7fS^QEQr
zI}cKCExS}JO-?2GV`2pXMc~q-wk`m26nHu%@XGM^yd5ThCPqvLg~~mk`dHQR!OOpO
zZRQ{OipyhFNKFz2*!&R?ScB;!NEBIWfti>t;X0W@YHT#n+2^kTj`MDwzDe-|ItE-Q
zqj(Gr_NB~|*99VEQsgUd+UwZ#$ahHG0_!*VXji<W%dixBb&WU>^;buWcHU-NKhvRz
z=&G+ZFat_bCiE(1CjO};nhjPdFT}qGb;8V!FYd?FSYFxW@k5QPIvxV+DN903FV7|c
zof>La90+eeHRx^vo>z=tmZ&V-Qw{GICL?d%hmA9(#5<<KSUTI<+A0{@t$dQ!rfMqU
zEj*8UAnj)&azkBC7oLZap>%cE?MFwbd*UiH^uMt&ay9ZDnM3_kmC63A$|}{9OCM;!
z+j;o8iCh`zPG&3Rmo8bP1QZ}!Jxw-seUSt~=rpVzk7x-L#O+1$cCa@NTKiS;d4O;C
zRdlA6DRqq5P!xQwc-PEdJ&>_J#B7$Hvk83Ar{+zT6?Arx9hM1|&)+6gD1!@M6zRf&
z%9O!ATmqM2a}Md9XO@IJZK`kW{jhgfv7n+GUmdD}r8(@p$!U>MMsFxldD|4#L}b>Z
zspc&Mi<c}gq~2eykp^O%_zsD+0x6LWOks@jm{s-e(EwWF^H%5*4Rls=kN7SrTb+s6
zY!SAoT6USxk9lKF$gy8C!Ka6^D)1tJzy9%n1nbYUk^S%Jh+F>?mN+rUG?(Kmzx3-p
zY9xA!EfqAi#{9U%6$k-`BDRJ_ffhqn3)zaaUw1f$k*vTbOx7S&Oj|pPa`!OmZj3@K
zkF=G^YfQr1z!fY}kvtSRY%mmxR8cja4QtN{Bd5c+&vV}?+J%knzEF_sL#AkEOIoL<
zG|5;iGb^Nq*KAbmk9Gky{ef~-J*K<zTX~ue=_>UiR$V?--0!gDl$yY)zSi@cVg|!*
zhJ#~=-B0G-5HS-Y7O)PV_g?1C#Na<(WZOD{dlGKy*xsKvmpzA*e8{es7buAitSs~M
z>yTlDt~75im2IRMvTC!@i(8g=Z2!(-sQ=DkIMU7QOVR-7alQkb=B+^ZytZG9FZ~E2
z^Ye>6K!-#K^|vTXs2K6FN!zP0caH;Gra@+!f<!?<x;cc^-p_5l{_7mEQ0c6tiV)F3
z3lXc`yRMJ>2D_EEv!8u52JRwwgN<|HDT|Jc;$o7?PNvU+{miZ%btUW1<vMhI+hN2+
zO89KtT+>1zIfES;Jzk5S1&zf}TH4zCa8Ffd^!iPKdM<*<PdbN}D2<6i!v+GwWumIZ
zu^_+s{bq~5UCpt{^VM2^V*6*%FahDDtD7;VSE#lq!@jVLsZb1|sl%xFF>LmpJ7#dN
zcrc)Ec?iJJ3^lqDzyUR63dYvlg}ED36YmK*r^-VFjF`?SE*mvMu`NeZjRv6OoH1cU
zGLl<=?(1yQW4^MR8o%PNVs~D7xKHBr$pEtsu)1F0-j3t^{NEo|k#AbEt4h&e$zl?0
zIDcj1E09(1#oJ%3Wy<}USd0#H3qdT%E-p5+u(3hAA7rg-X(zG9g-GcG7{zs<cR1&r
z56r1#p)Gr-OEtN;5j)>!6*^8IC3-QV#(A(RUag%8cg6R>5t%P!6R_-8UTJ!q{gK#8
z_mJoV(uGWteiYn$<5&#0@j=L;z~+=#3z%Y;fp@{u=yiMu`Okf)`|rLd`zNf1^&(~Z
zoi|i(`Z^WPH<-mYR8}I{wqJ{<``yQh<}vOd%dyFzMV<y7`zGBrSTA%hRA_(sL}qgi
zF>6VZ;8gkI7eas0RDTcf0zSe+61e5p<R|%ZCh^>u;O1g=?jt#`H&$io60jXFHlPbO
zrx=BBiP#(*9QIeFVJd1M?MfPwo_EfV;i?CY4`8W(rk6mzO-#(_Lg0RbHq{jF?qrTb
z^h;M1>wRK_U|-zk1)~ZlQOq!BlaK#A{`DiUQMZlcBH{j7|068mPZ|!z$Ep5j>34ku
ziXnzBoY(L~2jgXL*!Js<(KGmirXWyN&y=RPf^q7&0a@d_fPnJP9)x4N=dVHMm&`XJ
zJ^~lWztxjR*cX*z^a){q;)dxc$|IsGUSo`A;QP{2@8U`r-=F$^usxmI`BB5nZj*=h
zJzei^m)A`NnE&vFJDA|pG6{3X%O?|%<A}*5#()<aHg($I#cN|8>nGG|FQo-PEPQ$4
z#o;VhjpuY{jwR-~jb%}l*=oMMmx7cU8d$2DqA+ll$ss9V=`(S26FNJ=vuFMJRU%Fi
z%9Gin-A!T821vqswt^pWCAXmUhdEr_`gtJ<dYzbW-Ob8}xur3MK^1h6CH!Xpv_CpK
z2?RPcBN2HYO)-0pr&|?=#0<Lf0O5%Lwcl5YQ2)K)c$I98I@6%dWKTd(R4m7D&+WAL
zCiqjuY`Ez{eu6qa^T^{2NUP`&Hcrl5Tfem=FOWkzKVD7)Eo#)kjkhWobNsLStR_?^
zGkHhFc1w2}R@+F@m?Eur;4H^Uq+n>to?F|0l9d`{S-MUdoL=}YEiW^{U?K3v;<DiZ
zSElJ8zwE!b7c91TV>z~DWAfKiRL6r@S_GSrk*<eCnoL)?FD9V2ro8)p9Z)|m4M$4}
zXmKVgOAeS>{NwkH=@0oBYRA(~)TcRdUPu%c&;330=In8D%TFCLIE7d%H+=vvkuYYq
zoAH97`2K-Mwsz=Y<3-l}8>!Un>g?{h_5qXIRVQr9jEW%oW8`%|_+So&fU2V0^fT`c
zCBrTRzfVX8o6+Q-CvWbmFD1YN;yZ;x>jhDCJ;}d|@N`j>_O-D~e*F6rE*g=K!20ys
z3>cS=Uk6E&B3ju`*<~TB-ei|c;v=q!t|GJTeYAQc{NhezB2fzbN9-6}C*LGmE_2x(
z@Mp9;lc<IJ7UeI%C<g4rfboo16<h%`Bq=%~j)PlXfQ7LuL1KXRiq}9pVrE8<Pys~@
zE1A-=2GV4eB&%0j98X~wt;;+t@|qv9_dy~0b|JcaFi^~hpfq@!Ay*{usKkJkH{@>C
z>E82f{}~8v*gu>wFAF)0<1@CzIXeaS4?J)BFFbGf+pwl)ozQg}Re}hXYt0^f&rvgf
z*ETT9z?w>#yjHZ+<BwRctOm}_3wD{4U3N9unXQjML^#1+zjcg7dBDO;{r={52<y0|
zj>);};wE84CT#&81nN$Afj%)&d7Kz-`{o9`54cAHVjy7rc(%B&dYgQ$+f+Ck4?Ni&
z$+#0C{>5{#TO)%dA0DLar2JM?q2qzLD(P#fnQ9lEvDm$y3v#LN71R`b2tR{v<Jsq4
zU(mrAy;`|H5CNrmEO=98-{G(s9JmvB_sDft5>5@_D1LwM5ls!}s?L!bBxPikJ2Og$
zIdFA8Q@hKRqpHvfHogA+q9NfM62q259plHT*pU{cWUiE7sKlGXvZ^`xcGZP^b##?Y
ze!mQfoy~Nz_v9?;GrPG+ZBot5R><(`PE)CzG(vNU`c7ZFTyE(+weG;<4OG47A##BO
zjMScZ4b8;zAq2o7SuRJGc}t@)>`t|uVUpNF$CHMTtK49OlLuDX%YOaT<F!JpvNrQ~
zM>mTcNMxCu@Ytl{kAD-sxg0pm4ZHNa^s?_qmFR9c`~fd7_*}RYS14$#*IV4wBrj=b
z=(_8-@s1CWQ;jH#K39B^`WIk}#o++`yXup|u-m*R*Tf+69tAS_z;0|dVphKNsFK;6
zjD;AiAqI&yt-JD->vh1{zR!PWHa%glfx}gA<1_pYMO0_T(;Z@(ANmT^(2x+t@kn6A
z+=hU9vO<AB8@V6NK9OkC^o5@524(|B$}*k72J7b{g|pOui19{fLmfn`{vO!UM);`k
z?2?geCSgwJF+PyJ&Qv%25#vjmKGD0U<S^jN0GFZ;pL7jN4p0$4DYYIRf`$|;BN5^+
zn-2n8rTa;%v0}a2_`TZa^+7tK0U1|Pa+&IM9<RdKzrp9xcB%6_Uo<XX<4+%lwQ5Pq
zKk-bdz|GaN-IvG@qnW3>S+S>bb`!LCInn$!e<E^JK%zmTlD1b{aaYjzkgAVz%v$nY
zbPY)&rH!{b>GEL94s*;9;%r)wrY(&OW%Qs=2KJBZ3eN?OLYUa1)>bVX0W0=oIIAga
z04t91_jVk<&KvK2xh&3a%knvdIq?%n+=8;)yG9^>h1m^xt<>{Lwz@JV{`Rx#g$gu)
zN(H6#D3R{E@=+5<0hz(3g~)PVuW%dNQ_M|FL-MiCE)xbLRMrcQ7RAknMov<`&`okX
z+|{3HSUvPr?O>-1m6#MjXMVJqkaD9+j(}x$3)hb^{SBDci5$N4<6R`<SFRV@zdyYp
zjX&$Z*s7QfTO)lL&()~kJE)Gwe#-RhDm>+oMn=Rq)SQCf$20a;vvF*|=I2EdS#8KN
zBC5n{P8p^XgR2Qp98&GDD~{S;*AwEc8bni&IsJubaXBrBkVe(Co$;ELeUZx0-AC&N
z<+=jw@I(F`pqkXbyz%GMJ9-iIMm;Ey>nRHGa8YUNw%-J8SS$2_b!8T%GH4kj8B4<Y
zHH~A3oGaZHvy;GL&Li=t9d~@!^<oLOjn7s6n=}HJq**>HM`~OrY>kC%`=cb9r9WWX
zC?Djq!d<?!Nu4u-cBR8chIaXJs^five`B|i8YXS9nBL1YPV?-xRRw`{Bz>5*2GNx{
zKBklRMNsXYW6>Ln9ZPed!<xtyhLZ;wZ@1H7%-L95)z3vd1;{n?Pf6>AmVB0;OxS2v
zgflZ<US0-Cvb&$Tu5Ms{oS~0=vzRHA8hu!qUx3m~UW{s<5*)3J!RL~j#oqp1QsK}{
zX^5iFkYTJuC&x)zl`L}W8M<`1qn{n79sSImBn>kIet3LNC=kz-B2s3#nvn;AWxU}l
z_lwPbY=Wx~)afzII4%QP|9LcR8wh!aHdrry9e<K5sj9+u4AT3B+Vn#*-utW@d^<sc
z7@y&}rhAF8I2ZMAOf?klzkW{T8v6HFICzJN2BA>v%1$ka2L-*MVBGSuiVF0yiLSdM
zraqux9PzT_6{%WM#XX35Y-t54c)2?0o?g8&80Zj_l?X7%SRXX*1?f1u{hY2Kj1wcP
zuCoSdeW|4aRoY>$Z9!r!Nv8;)gcSAxm`TKq>0Kcn(0z33pmH|c!xZS1tFvYV0=a#4
zHDUDbzB9;i$Ap-U1oo5Tb6A-A)4c+22y>e!**f}BgwlGsN;tYzxmA2X@j1x$GL>F$
zp+UWTi3XBJz(-F&t;w+p9OL^1<yG(I2NZA~#$(WGp2pb}3S3CV0t7=e)oK26rS9w1
zmN;8ADuF4*K(73bZ#K~N4pcKdF}OSLcXJ3}>v8-E$JI!M!SeoL57{no&>O+5O2Ws$
z77R^*uJYsa>8ghCqr1l6p-AX+S_C--NmbHtq@3(=RKOv`2D7g4=7;-@6bp1|yd;Ie
z(8KxF$qwblh=Ngfe4e$9P4F_%+40ipJaax!vicGt&W<&fn8Rug+LzJF+A61YYwdKH
zX!ILdLs`~Q0aa6W<4$pvvWzZ}DsuqLi4A1ugaqio?hHP0bod3{2F*l-OC-t+v*0<M
zop4x3UnZ#b8W7fDoJL=gQwWeT{PcLxaYT5pIGD(ScDcU~vMlYwS;db2A}>Vx4}J0<
zyKYFct7PoemI?lO53LS6LXYqp3E|FbFAgoDFdo-qD*$@ys30!%(`_HK+Gq6@1t0{m
zjof=SF!3XO?=P2c)^4rks9-UlZ)k%J3p^jhrOd@|L~Lvda+K;ck-~Up{?Xq{0!+rK
zh*fZ5Ip2yq7k=RkGo<E~anaX8*jVDT1JYvER3?3b0wzU)*ul8Qjik7yfI!DrS25(S
zdevzww-k@o6K*VfTMi;}KqtjKj<xzO{Z6O&XR?*aAQU`-bu-;tr`Ki3sofJKf%h;e
zv+bJ3lHbM0RZy8PjGxaAEYMvmu-O-fdAg$1D_;X;(a^Pe!76bWn#8Hu%0{YGc2FVA
znIEno%Q`Q7#ctsc2WO+6c05hfoPsD>GylYn5cMY+u`>m3mC+hRf)mP%O&M?yfrh6Q
zic=5EzTQsiW(B{m{GG#B5|Hw2EV#?H>CDz%Z$UaYw*X+kbD0#mJ#S`F-?)m>2g+(r
z2MF@P%)%!!IpC>YVb$S*J34pK$OLu;;xVDA3s}aLbgGNzf?GPKo4iU>y5NwT=T6Am
zir4Pap$|GU0{ueVRp!w*S*L79jADL8x`Z89{rLDH-lRVw3nf{Jf>u-rtfCR?GG_)u
zGl*%fL(kO@Qg$IuW0skyA}Z6ij3aA8On1EbVYYq-)J0e1`tts*uECKeK}PwzrxU>?
zG^jN5Sy|HRL;AQ;XAB00nRJWkf8v#EHE2O3<@l3`=*N5F;0*W5`@JYX0l7~IeeO^A
zs{tloR4UoEF$RAp)V#W&9+|XG%jd}EgXV%v>--`{+BZayyKN18_xFnP4x^MBON<Ev
zS(zLz?&EBr#>wOW;wigp;aak^{&6p#OPg6LMF}-CE9*<aR;?<N=0TK4_WCu>IIAR8
zVr3p8TTp=oUL31NOw2b0Tzj?CIr<2MsS^GzZ^CC(B9aAj&tYHW*4w}nP?Wt_e^BqI
zt0W;&1KgN|&tv7>K;Hsln_2V8Z@tE!Elx2tujt%|*-kk=yzbFIibfyq?qI+uv7%&#
zejdBllUa<PUGGNo=h8ZdK!&)z?X&<f<UjGKCNNEMU!QYhvN(HV&sPolhZXbghwV3R
z{RI*5kmtRz_RtIPgBbQSe%IQf*b_prnNJ3TM+^FWgkX=e96nAcn1=Y<t?`LVtXaNJ
zRx)z$j@NAsEl!3h%L}NQP;F)VC;D-{y>|6gG<`@D9P%uxUzGgHCZlL*PDVAEWHZ%h
za7;O+>>rO#0Ir`3v!;Y9k?Qlf@*KH9ynpYP1uN*FhDP-hQbT~fAWR#5KUk9MC!1Ev
zs^w3Kc8wI@ilt8N74g%DMC6eAEk&6xNEj9>OMrLEI&I;-U}8gK9xgf@n6?;s2~8nN
zHw3j9joTD!mKf)u6WlU&1=L}e<_P-Q+Nf`_e-*<2r-*R;-x<KTq{e4p>4KxtWT{7D
zDhnEzh?pIZqE&4W5FhHO&gv9CV5FeG2?Esc1X~|Yh3S93EZXn<5<)c3c7P)AeA<p5
znF}XxYvbMSc-%mzcRwe=gleXWvk6uqg9C3d5Q5^{3sL%#4r=rg%M7TDww)B_vFB*J
zpM(ov&LC^_;j0wiSkDUaEkIH%2=^{AK_x-#U0Xxa$}+Es)L_WG`B@HU+j~iFi_VAu
zRSQ17zOHM!2;pwYybkB}=~MbMmmsj<=ZpiUXc(aY!YI!5qC}+xHz}F~aR##H2b}sy
zQ)6RqhItOHUK_yZ(M~Wo2t8H^v{)_&tZcD-zH(ZkaK_RUzv<G7ZIr160)}fyQiSSw
zg3A6kOVpdeTB2c+>=aL0I45RFcW~kK)3%G!*Hl`>dh0_*AQw_5=Kp&z(T?9TXoPfk
zmQ8R^@Zr%Vo<FNpPxVg7T<$?*-=mY2fHkP)yLJ2L+Mysd3`!jy+^o|pe-w^^@50>Y
ziZEG5Fd?5SOz)HVqAqmOV<v;_*rsl$j(6;ygy<yu_F4&g>^F7_q5Wj#<nOIsZqPPM
z)jjUwJ96*#vCD3`KI;Yhyil&jMSd|pW8lv}tG=7wOq{dHC(#Zg6D&3h*~%7H+)K@t
z4SF6ZSQ$!45ZhQ^Vm|5}*mf<|YFulm)MJkB7=}td=~zmo;D(S!#P)NWLGEP#kQy9#
z6wNny&dQrJ)K?uLNT+><e<}GNlM80}JCLIK?=y4;>%O$q3HPD`f;<>a2>-a|CbZ^p
zSe4(<0QvIb=|jKsO$u`yrN`#46C<?!mmZ=Zju)=7<G>1d8A3>efV#8;ZQ3b=m-OOD
zVgud;%65}ZjZi|u4l>D5G+H3L8_JP42S+1)EiJ8Der0}fNK+Ehdh^wDfTp~t2r{uG
znVO~o9BQ2zys)L@&!}t-zc`sJ&gH`r)bI-C6@VV7w3_;uBFTeP&4o4rWyVqv8o18C
z|C5!wnoIsiMOm4C<-HFKDncR#54Pe<MWSd*lb(A=W@dCeI#>)uS_he5t+B%SmtPeX
z-%NN$rof?ewXJr46z#SLE*YUcZ#RZ1JxR4v#Cjxq_X*edWM5Sup9VFhez|RE>*@-6
z3AKJ1eq;!_!I(Gya32eeKMq$VUTQ-0#n{jBSkPoPzQip)%gBz%Kk_SPWd+M64!_5a
zFreU_&fU4DCJH<Jc;H%Uu}&kIC#x;sc4Na3{lquE8V3SDBg)18k<nUpW*oo`&~+N2
zlWc6RgO!XrvlD13OrPE1Nrw>{J=&f_4xz(r`qd3f`pImEH64BBKc<Si+~cv*ltzJh
zzzQP!Toz30hgnmZfbw`Mo$tU5i_Wewg)I|5ft}Bkg}w1jY?qHTMYg*i716$5aChs?
z_%Xy!;8mgdU3;i6BsZHp7JD&PTnuWsyIWX8<V!*B-zNekl$8ejAIkqn;HGAm&joX%
z1qZdxRS{E<12qA%{^yGN_Of|ykn^Y><|WkqcyzocDd_Fw>Sgz7RR<E+x-&Y^_(};P
z`+OV`!7+bsBv}zL_AP~Qw;nbuoba|@4Z7e>-drD**VCyNgs@66NfuTrB@yNabh)sb
zQMMir!|M@HXqZe`1&M@sj~HY<Aqf$ROuYSP4;z;R9DI6Vfw3XU>b}DkvYjrSKOLmb
zYM|=`uT>U_hXyY`;O97;fBdWC7`~7pe>5%|lv=s_R5H~Iv%%c2wl)bAg=5)4iOMBo
z5-=WPKXdc2MjZaC#!4hAo)3hL#^slf*VKUej#A?OrRX6tD}8i_(~D8Bwo2b!r<RO8
zBW7zj0pUz5<>~n}O!{>|e1NID({a|7SaqGWGb^BVob;0$;U-Km2c4>{IB9>z<KZYA
z6-z;Vooyh82U<Y5^Zh((8z`yioA~kD-KIHHp&C}%k1Bi*Ju!T!;m{+NLl67L!@|}o
zREDW-oR5fNi(qASmHOm+>`)@N`9Zm6kRMec)$#c`%b})qYz*^2bM+7<^!^gGJzF{*
zx@B{GgJURXB3?u~cNtLd!*4T6d0}Gq+h+dUu|Sbc2HCX!#7b#8U8?tL5D#Zo34Awn
z9@o#>&{<iWADyEFr$0TzF61$IleFQOV($i$rODa(EVOe&PtuFEm5w>pm*}5vW%NHe
z$dBN*XhiadCJ{_Wjqn=dp`Ix}UjYK2xgpZDF%fpFLp$cF7Z*dYY-v1gILBxHa&7Z0
zkgOpLX;U1bcF^KzTa2CxQ3L`h44r+wdbJm$L5Z5-5C%-6+e#wptEir>R^Zz>!xGj0
z+ZMAv?5$eP@^sQuO=J~Rf)P@mkd{GTX93AME|(cluHae)5tzPQ>ydO9QTn44q(ROM
z#ydC6G)8#X8l*!7Yms1=KKB?VhXibBJ&e_o&3qgMVmK^>`^Cs+4Th=xDp2EIp8<>C
zrB_gdZGTZ;n@sI|NF~7ftjh?sST>V^AA8Spb=Pd{V8RS#9ZyBagmNHcC_n_B7u4R~
zG^AP9(ViB+pD4FdJsjWskZiW3gcH_S>ol*!3&cqAcFCO|)UNY7bl4SuR_n-L9p8yS
zCKTAtSIYA%^ATVyU_o#^nEm0~<+vSU{|S!V?KCAoy;qivbnoR4A!V{$Rndj1lFQ^J
zD%NPwrR#a@W_VI>X;nMky+au#&=in?ul$$`haTNhtV4%%ksr^vxwvYM+mdChZj#RZ
z?O6Jvg)K>jVD)jAI^`VQhWB>~73la2lQvEFT1mlHuKWfv=fxSz!7Av|`Yf{UJLJ(=
zO21B=6XlO6@tbr+rL1VU-1wK3dJ^T(dCL5JD%0_2*xxJ<+ioCe1nznz{R3-RW7wqD
zpM4uow$ix!dBjqjcBnJU414e))u~p6xlsQMyR82XyVbw8n+6vwZMp*Jz=bR>bYVM^
z5ur+dM!*dBDDHiO8$esTIbtO>PW+NAdPS$t0Oyh9-9sT1PeU6SqwN<ZCyN`ASlk*N
z4~|CvmSd5le@av?nS=l4YV|#3K5K%nc*fngxVU&nE!$-jPv{^5ohp3((~%jgPKwiZ
z1!LwX?+)4UX?NGlM%Rjv1&5DDXz1l&^3aVx@9zt#FFD3uAOue1{O(uz&_eZq@6cIQ
z8A8Od+&eHpO;GgkAWM~bA|p8XyZ!zAqA+8c6Zke9f#(tF!iV%%i@wnN)cnS0+!tha
zGqh=~G<G%-9A);pc|AG*^{kp6A3+A&>~#uJs~whf!A95(jXFYIcTr7AMzVxD&w1%|
z7N^vopL@lJnbCx*pXvpPzwqFF`)t--RQjWA#~~8P%S#X8>jvXVTDM<Lx6_T|LSkc)
zd^S&60dHrthjPW4=3RH0&l>6!tg&pBe#?)H%8igjo12T!GFVKm?UwfP`3nBvNZcSh
z5fm8k&&Y2&XBSIfYOieqv0<U7=0-BuCnSxP=gV*K$Ecu+Ku%*0K_W11QK^<5cD1bx
zWSzuK%)@!wZ6<e#K8A4UErw&!0#U7h94<H%4?$yh5_!--PHFWL53w6G<-UIH1Ob1~
zN7J~!tMmUyF$U$~|99P3LJ#;savS|!j03vs<HefH{%92QSS@_)3JR?tf#&SwEC@16
ztvjizA_RML1tdz{CcxC%t$TFhyxLHL+Gcef{9M;(dOa=V!$uC`a}V;qc?Wx6VaF9K
z5=KK!4?cOBR8JmJn|dRaKw1i*NQ4E^=qjHj_zgmNzaW7@tIajXLkud@H4zq($dNRM
zT`@&`=7&=$qW$SB%bSzxIvr)Y;C+caKv}tN*x;$!-{<--Cu=F{TnMHwS`_08Y#GtR
zZyKF%y4<(pY}+Njau=YwzyCY~;`Yv=Y0;CDa!c)|WyubP(7wt*&~l=jf>tIk5aN&N
zm*uiE`p`OD3yE5wOyW!NTgolJSYAOLI96w~!k-60A>`r{F13Lr_)(ah%)=-d+^?+;
z!{C)gW2rltw<LEwy~1z4ub0S8Yu<J4m(e^z0i<2($NbN6swl+W?L>HiZ^Qe48IRbn
zo;Qh*CDadUn(}qNKLB%H)_D^qOw6@K3s?Y0J|y-YXRffY+;0dHsEMvfEaU4D@vlQP
zkCTA%pItpH@$ytgWUsxG*=(>Ewahw~6IglXc_8mCfh6sJf<~5aC>><GTx9hdX*Lew
zC;{QS?fU2CA)+#CWNuf!ifDF258n-cam>nt{X4?`OH3~**UT-&vNuBaBI&%Hlo8z?
z1n@(ZFsG+rgI0X#puXIiO~XC5fL10h#oN%pjG!ZpG~-gph!&6~fvcaA<)ikMC&1L1
z$fY+JEpe{8u<>M`qV?kUYXYijbq!o~Cnn~yAE842fau1~O8mT-`l?1*^VhaU{**qN
zqwYZivwMr{IUcGz{ABx;%+v3^s6Z)#%fpY|^4BVu*4O=}z&tqFQ?Ns|9QSEBKWwjW
znGm0MBl0k}H^}IcKrVGK%l?g85Oj#hjUf9o<aT>D_l2Fnp+DgYh{Zsf`Q}OVt+hBA
zZqy9XtbiJ<zG@pD#uBCi8kRY^i-(ZQ(CJU!htzMN*YNS77u#0#N~YewN0u$gm@aua
zCtdL~ze|*}SZCkfvB_&1>rsmpdsUE?I2S@$yx<FG5ve*5<{UR(Xt7@BUw<gv(0UqO
zt=&!romRcJ;5Y^JXH8w{w8&Fum|oV!irpALU2WR~7xwyqn<7Ov^`l;%2N~vhznT^^
zqN-!bqn(hs4Jtpb5du}6muY_Wje^v?rznU|Gxm3UqngN=vC+r}J36J_6(LADZsz&5
z`c1i;L2xW84A8*C_p<AbS%-->?LaRAp9@Rzr>(WEw>XCCh3B6Mf+py{31Y;8tx-GX
z{4OtOp<I)`R_F}!;`Tr`*zn#GhXx}=MHSSCZ?xE1btJKxE}W#GA+X70G~J*YXSb>O
zXNQSY))t(ncbp?NWz9+xgNahJX=D_HRDT2}tHp1rvY^<l${%iSV+XT(JcP*_CDPv{
z98ejMJIMZ;Re)}Bs8~#TU@Y``;me@fjWz)>r;B}exNL>!ebG7lyn#QB0D7dLhpf6X
z4wr~5G05T6NdQWxeZIJ3lbW?Hx~9M+{nwSnt<Kj=?Dwiv%~u2AL~zP5J@0F=?oSlO
z0{y^Y<hJ6?<|8u6q8aJ9P_9iKxOIVb;I72!8egRg@v4^fD7*uR>R{~I<F*uDJW?I3
zfSqg(JT8N`nmBv0;Ym7`M*EFVxcGQYs%)`A1k1z5W~-{CuPWvDfu1z89daCgOB&w9
zO6e+`{cF0wz>w%K6Nf}U$)0$sixwF>&b*Aubsst|BUp^azNy9&((RH|dU5u&ZSrD|
z5u1;rKCZhFd!OY6iBd%x4YCe}T_f<np4AP$p}N_kb|fE+XCUql$+I711$rS4mi}lG
zEmn|#K3i*$G1<-+)$dOqGfpod6?%{zRWP#kazKKc5qCM&iT5Yto8r~;rp9R^FdaXv
zP+5jU2(&c%oKIoLHfv(O<?B;R5pito>Jlo?I63+S@{dFi;a^qw*>O5XeO*TdB2aSx
ze=Vxh54?y^&&FoGXRzPmCotDhsNJOC87n5m0}C`<N8%E{`G!|8B#^8vt5>%RUunVX
z>5=c%Dh=K{40!oaY0}ObE%vZxaqh-7axh62hGR(I(w?g1L>LT&u~@``-t*KQ0#iS_
zY`hb(+Wt^<78IbTe$l2vB>@!A0L&&k;jN3p_8fx>V^o46o&vi%6)3=`y<&qysDj4l
zK?Qy16zv~0&3i6Cufl{KcY;7*`P6H_5QON+xqr#_+GvUNVmXagvbTi_#hr^0!;vLi
z-y0dXUzxjpRnS!=JbE0=%pm`R701eLaU%KjdQ&lo?}VNB{j%#*kpK2>_9_IP5$4#=
zat(T<q$clL`CB@#MKpAbHI{<kRgCt$6Pj&pEChs^o9@lJjA3tZ$JQyf525S%3T16$
zx-`<*g@`KjiXLuaM(Z~`5}wF_$3A2s0^i%L&2FG=1^*8wy01qSO{qP#MKZdyf-KaS
z+rj99+sV4m<!S+v7_M&4FwdN~9?TJu&a4;Xi*kG(D$g2_2@H#A9teLXo;gwD(w999
z%+_F!>9QnY37@ygtXnr8#<|DG$?ECjZk<WjAOysO!2bc6OyeQ2{{GGagcSh3Ka#D#
zeo4fm;*5XINXj(9@O-)bdP8Sz2RS=TP*fT0;juh^&`p9bt(||SN`)Kn;*5}KwZmL4
z2uhAW%iKr{zN>9*uyduA&RPpv9A_KsL&e^=CRJfST)(}=NW*!5csk=Sp=DI{rv?05
zJ99?3mr*A;IM3AeeCZ@HaL+^SA&`DC2+#zyUY2qS-JB&^qA$>j!)#D&)d@ZEiBF4)
zW4Jc?^JLuHdR1KMy9RsoaTO+nfd**S`tXCtDIY{g$o<%(j+Zm{UM5ykXj8#h#_G-O
z0ZViRf^s;ETJ(~FS%l~{w{VG*)V2d}=aez<gY>Nk9T-U2yaXpPrzz(Kt?_J;-9gBV
z)uSpQAuffQ>A1YN(U>lN&<VBxCG`(psF*b7490oE`G)goLZ>sIhx(~V^Si<%IW$nm
z<kH^5g$ksqGlu0&ksHsNI8ijrF{xj(SA9URTwdrtS=9IF#3uC-$ZY`B-I|hML!8W&
zmC=C-x-~sPO_7#xQa>&j>ue~pPn8@Jdcu~y^tzBQ;p1qsW(#FKeLL73zDnY1EfXOy
zC}o`{!-?eMceJ8X0&{3Udnt^5s3#^xR)N3Z{#U?Z{(+snc(npu8=IO$TuI<ju}}jR
zfs`<ijKd6eQQUr<Fl91iGf;D76>6r<QDtQlVBQ4>Z*MV@vY|>)3XSdLxA}hQ0;YxI
zB?=~%YGU}KJG%-D1T%ow3(}hkH%-oXT4=he1sAgL>10UIH4jE56To@f=gtpR)qWER
zbJDhf;5#FNxu!azGlH!;0ukcD>~F5><^nM7l4@fJ8d!6!`b{nj+0yIsf7m*w@XETa
zTPKxNY}-yMwpBsJPAax-+qUhj*k;9c#kTF_ti8Xz|NlJCIpZo<xmk1eIePD{z3r@X
zvOAsGnMTWZ!+E#Wq3vCO|GCbk)!=JRir#-OMqsmLcyN`?Qg3h!J;f-&JyzmA+PW$*
zUdH@pRhDg6R(_o@$u%6z^`R5p>d{Hk_-oIR*<Kxg0&k1N%lX_J%SyNLm^_|Oo-0L=
z$w&F{aN=!-<~4!|gfG4z!30op5a?x9!DNOw7BYwIZv)~xmQ;RyB=Chz(E8=WxgRI;
zhjZlUHUO#ai0;amHhL<)Oz;Yej9;-F&FixBZu=lrCxB4<gH*zlW|Y-;2zCmwi;wTR
zRw34i<RmF~+(duM=dJI)>j@*BXthKibkf+n*`(=2GH6+tzX0RtTJ#SOhex~crRyQZ
zcl+vd4$qi@3D|p(x=2<Q!HT<2kV)xbNcU=O)7W)l#A00u^niaZ-*Nw=7<zPK1;1Et
zw#GGb)R4Lj5}`oH<i2W8o6}Q$typ+9mVEV!7pc~(?i~i3_2Racv>%0G%ZszHR~uj<
zp5FaKSA}IOLb0R#7eP2foMk!bH)>l0m<1MNHmf`HL<XA_xS%x|illm-1356QblugI
zu83{F=M(+C9sPrwSu~~fTQo;##gj7aNxDhTsaJ9*2IBe4wC@hA-3d^RGYiA}CHJkk
zh7opq)v~7PwYjqMNljN9uEX^zq>NFJLjWieUwXzclpZS5tCw96@4gy~`gVzxe>Pem
z8r7%p7R5FyPD_LzE}CE1fJ&fsEhy;w?fApQ%P>Ucj+MpR*K+w>Es<?E7upFMAMW1d
zs^WHW*kRTOne*a)UVo=Q`1;RYEbKSK_13z6KP@C&jJEhx-L=dcevIh;td)kHG1_WB
z@<_}9-;d9y+L{|3$vmoDQ@_$&ADon)ryN=^%6g1nK+!Ix5E%}D3<4lo8PBiT;*-s!
zDrKS?!ekQ4v4mwveR$~p_mhx)bZ{e9>pSCRl$@s4428In4%CsEjq%y&Cvjzj4nl@Z
zK(_!*w+L46c2u_CKN1k|ek6#h$A1K1wWXvpAi$RtGNPE|&mJ`LjPS>E8R?5MbT*Hl
zjdtsj3P{sl^qFW-e$|UE9ZsMd-R{U=komP;huk3eCu5R4xYSDAE#TZ;!`_!XyT!z*
zc48b!j_lvNMNA#HStn5a5;>TZr*+5azVnYqCA1N+OC9vb`Cw>gll@Nzu!2JWw}6<3
z<>=4_nQU@BPjD^Q4d<CUPmXoxrwt^QRo4E`8zxCO148>}WV<JA*KnUot*R>&bGgrl
znr@!`ekJ`WodHo3rE9atmKx_MioV|Y2w4*NK&yPXP-#MF(hQ6I23JAwtvaNMZ*5PT
zZ`+!fzPKUqgw<4~8FfWvx$Gj6u2%9qwSMi&Qd1|wn?l2o0t_y>g}Gyt{4bJqJDgre
z*{*t{3FNirKy1=SpxCa&FCs}Mj|H=|)@9K&erp;$yIy}r?^mbL&TAC?KBFkUW}m0E
zt=1yiBZKar8m+*M+I%4HOt($LxUcPt!#E~b5cpE-5{|?W)_&xs{nQ0$X&s-va*uM(
z^?IlH&ALOP1g)bZE}at#NzerUbCvQEuegd<!heeENWlLV*KZHg!FbZ?JlI5OAO78V
z2lWDYcz8pI4Kj~cEMLsDc_!7r#HcINXx@U-i-J}gG09#ipR8#JoN2<yV1Ie*3*rT?
zCeLx?h2eI%UWcRdg90U9f$HV>;c0z6X$qf)u>ufZUZbu-a)DM@cvc?(=nwnD#QfWq
zl&_|qWEFo46`~a#_$jvKxq}NkK#abFL^A0hnGlKH8?b5QP7e5bUaX1Y50A*Z7x?y9
zF3s8j=<Dqx{JMrTGq<iv`UOl$|ESUg5_)t4l$j4CJo1CqYD3^Au-3p|3`U{Z9c^l2
zTbBFY>JxZx)!QitICQctQ}mUUAY#(EAPCeOQBD<+XZOS1@POPW*ryFo2Cuu_NFg~S
z@Ob4#{^EA~g7NbiWIRw|@#f8J6mI6KRX8;HDPD&XVI@ZvyqBBU$VqIL;)HZ2g9&s_
z)x{$<%d?B6hvHz^ot2{;R0j<gi#5S7kgVJE>E8WvrF><&AVjmT1^q5@lIGG5Sk-E+
z6Sw8Oq@Cv-c=`GxQfjc#`<&SqsF%!o#R|mXmb9<Ny{h(2J(YEOvu@3?^`sKVcPUYx
zpoH?D|JPUYf7+ZAs3>Mf;vN!r8?zW(X(ZZ_*T0*gOn}dC9AM59I!y42CVoY}gAahC
zbkm=WRU<)wr}z=3QH1xkm6emUuFMB{aAR~q>`E{MUL@e<9E>ZeuU=Kqu=c%aStrm~
zD)r@e@OR8IOQtH;cpY|X#@4A1+Bsu$im#)JxWa<r^vhT7K<6i{^H6nOgqC#=+V@>d
z4ngL4q@ab+E>>LQ$hi0CQ?(u%FU*N3XaaTdiGAQeH1gWTevCRrZ!3I2&&?3$7dfrC
zWWu-IoaQ7kG^LS7rn}cD`!i@meg>N-Jm3&%9~3nxG<t7fKoGq3s{M@q`0S$T+r1A;
z9As3F#ZWPc-*mu`Xd19R&!TO?Ue1~ZU|k8}C{%!SSshLW!)3I!F{?_9{4`_=eP?`X
z8&)~;-d*aWKYCoV1^!!>E3CU8D84{Cf3st@yxBre8dHt+-&$mL+ZB?bP)3?qas9b#
zkNK?i3`o2cs?bhDJt-ZgLlb}-`f6H1v5JwpT~pwCR9?j9{XM~^><XD+@0giTe<=(J
zo7DeaRR3oiDkr{us)k`7SdIlko6@GZ6cpOIj9=4WA(lqbzK$>qeLJ8viM#Jl{GFw3
zne>lOY?3Sua-jM|QgGik>92JsXXoEfXCZkT53i?-cWE+yx01Q9rE)^u+to{Awjop1
zHqYa_1gZ;i<fP!;dqmq<8+Gjyus>g1t}{Xx#TTVMErT}XX1Ff-=Y0bQ$Wy&AKOfH<
z>}G@@p<@xqetdRp5)B#%A<-BPM<HtvrdcPHm*2z_en!FHT>+zQ7|XKYVzRh?BRL-i
zxE(%tw_MGlW*-m;2TFnGu<*0-nSsI2n8sKK#meA9Yp{y6$O?j8wru*0x3+8nq^{#&
zgmUPG95kfwCd!8jr+h^|qYw>LXQI8o*xY-cmC}pGpQsZ>Z9d+O#Ea$NsKyS6ogw}e
zX0;tJP7s{2ieuVK9L{YzWyR^S$-8|pw++!20PC?Ay&Q~3IAt%9)3j8oCv6!miQ-3l
zbmWO5BS{wuQm+dJe%qhr9(D|MM{#>Cq^$dtjiL&X5D=_5ihW7-5j-sh)qZ07|7jIR
zATLDS@yWioqO%NxSe0wBlb7Z(Cz+8-yHTzqWO0eLyHHmX*G$Rv{^qNpTZhjjHlI~b
z43Z|H_+~<7IlnOvW^H`|>TIBc667u!uO!R$J*25IEDGsgcoG8OaMoO<yJD*S4J(Q+
z9w<vTwt24Zb9$ITBGo$jSpdD_XuGAHvj@+;CbS%g$cLumw)4I9E`~?%s_TgzzTA;Z
zDWU2YJvbk()xc><3B~j0LF#~|6vhA-P|VqUpQ7V2QAzqrsmC{CI*<ZKgR^I9<oE-R
zu?^kfr4PJ3-ITX{sQM22&Vh1HiD=X3v6h-7a`dJdSy3Gt7$2Fb=jz$Py4m`O^E!ce
zGJ2SYZOP3XNnKq`LID!M$F01Fl!xPZH?~LQ263CINtMfjzfx*pNWckk-rcqna+Y6H
zBWIMi@-TvV`)}n3Gh36v`=@K&^P*bt4VNlF?|s8k6bv|vP6;A*{ZjgMZ*F2iSl3s%
zz)dHP)vWnOqB^9b&My%sfCkP_p3JHWT-SbDZ4%o7C&a8AEkSHbkRNdW+&LJNg#POS
z<ipn%;=#qi2@VQ_>J-Dehu_bar{jqbZ)clfb~<bMc%z-VE8pGrA$}WB1^_W{X4evk
z>2GPMPD9&-8F|Y^1~JgC^r^woxa<-Sd+6v-uzo973X0}Kl^S;Eb;H8GUw%r$%;`a{
zTiOV*e6M9svTYSA70DOznlxeRATzkKfNx*zXKyk3?VGCFsg?!6H4orP>l{<7?IRhM
zA&9)D8^-r};OgJ|X`tMUYTpr|4!JS^9ML5HeXZvMYt!w*`T1np2ZB^A#zC#&Y=lhG
z1-{|u3?T(hG<Qe*J*U+W)()s5T`GD@$!OHIGvpnX!MJrVt*oiyyy4-ne`08x2GLUA
zs4~i?X5F{T)(`ecw;5uhg$XBqVi;zb7qquw1^KDeYOk57wLJSuZrQ!_$+S;o`Dtk+
z*-dcNY~VErnu%e7Q$vEY`j*l77VY2n&zbJ^?llobavnyInx0Q?G8FrHkd3q_6B#pq
zH#!ny*773|4dPfP)85~T8r!7O>u0Hd?)12}MM?4+wxArKD@q`fzG^vWmQ!hA68K4^
z|BlCv8tDOjlKQ2WdAXqfUB8TgXaCa><iu<U@c<!Vi0MvZ5)FEO<(@>4K$UZu<WSx|
zH@?}AW|f^uB7ce}7K9t9yA)HYdOKertv=ETzDGII&|xA-!I=ajuw)gkv!_Guorn%C
zqSk(1tUPBTLc_A(v9tc1A<LJa_x>nUT5+(t<K|y!kRdG7{A<6HwOk6rRxv=!WJ##P
z#1f`lCr0xl&O(xkt>H?jStd?()G#;|MVg$Q?JnDn!mWXDnd{XA^6N3$n%=`nO+Da#
zWoBa@zSsdeA)G7<hYg1U%g_Y~=dt^%AKG8({b)Y|+cn!}TlCvV!&4J?-E+&kBq#<Q
zTr3teNsdRq=SH@+<u--&V)(!_(V|bQ(9u@m^2MPSTX(O)?J<6Sr%8o}E}ipE3+{Q-
z>+T28JXzYm$zt-`T0Oc|e&%^jF)43458AT^Cy@E2DC6gQx=bFI36kNe9IpxzePzT=
zMLVTRmynS!92{J4Y)zM{gd$V8{Dg6XT{lxG&_94MD7+~(r3}VJJAicuP_6b`1S|{k
z<{+ubQSLFC?lMwgj1zm4d489C<4U|7;z>zQMpmnb8@Xvv|C2yhnJ^ALh6X+MTI;{u
ze^uf&n_+mPAwv#`@3jE3D*pTX{_lFN@Q0bHwl+S{-8*6e`KMy{(+b(e1->`!5DtwE
z=0`i*x)1mY^WK?JR2yv=HtGstYs3oNV@j7=(%#1^QabsXaZ=z4ArL6luX*N*)dN*X
zg4AYlFxDHwd=R?eszigXzuD<-w+#x}zq_0QH3t<xRkSl0%+L=z{RJPx?U8de_3`5n
zG3^ak4jn?ds`F`sM@d@*Q&hDJkyOX3jqDIs2QUT=%c#~IDHEhe7>&&$W|hlzfL6Kz
z`x0PoLKrO!bizR4bmYJb71pBs>#|s>(E)K9ZQ5H+V4~$^bxQTu)T=?=oPeMio)oMT
zV;$XkuyciIqTYJ+Fp>mzzs!5MZ{D_=W5`kXTyV4<pU1Vo>8>Vt>+2?#Wc#wq7h;SK
zTCP?beL`(L(=jFnE54=__pb7mYsn))u-CaCt`+i(cpz}Nz1c=fiR0<Rx@8lFq3fNQ
zb%BEuKLY$Ni8^s-T=xYAE`kXv%_!IB75n(~5@V0UR(c6loV|Zv;UTUjZiyMzAsikG
zFIVefB2PfMoX)8EJRdohIV|7Hp!cJe#*^C&qtU-ePtAA9jXp9i>}Q@jUH?ctX?|Tf
zb>+y@|Mi(n=q360<_y^PF+R`F&5?YY!jkUSvuKtNg6HY@sV6l=v_x$Qrk-;R`0$N!
zK*F3;k?;#cf1OCR?e9W>JtTY?_+=Y+Gk}{lV0c4SsnZ~qX3P?7BZc%r+;}BrEKxjf
z2Taw(sk!Lo#5^2m(;~2WKZrgors>3Xs_G@%6+S3NBGXWjIfHzmJSOwK5808e<!5x$
zjvoF-b*lds=w~Eq9imb=n`ZXpL;)6VG<Q!@`@};r<>0Mh#<TPH^zt-d?W%QyOxf$n
zXRa@ih@hdKIc<}&&pV$3+_cx5pSpW_UG7kVw9hPZnvezmltr@ccJr~g8~_OZSBlf+
z%RC{Qp@{xc71^rW^<M)ax#pg%KBMm{IPr+G6*6kBC2_g19@^1#+G(Aso`lcm48BMB
zJ0Je(+_yVaYQYY+1L9Fg2_E%unkuN}?}%Egyc~yhJ-{Mtm^JjrJ`LTzHwjrjSL_S%
zYIK66j#Fui2W;`Vak{BGe3{CgDy22?C582HK|M*Rsf6zx?9%b~O4*;77@zo^07vIK
z^#GvS0h+oWWZS6A-v{FV6-LCcAtCAhDp6!~K2_G|hfmpGyp_3-Z(e#(#chOffVd_!
z9QsKA>81|&V#-sYfi9<s{gX^2LT65N=(SHTof=?!$wdL2bvc3kDNq1HM+bLn^#>sS
z)>(J#xs#|Zi1<9y*o^;88Yk!ch+@&};d0a?%5+8;TQJ%lEzJo!%JE)ueR|Xekooir
z`z(4<v{c6MLOWPPld=Yo)vKdF%q^mN`La1*BjeNW^a09pdwz7jNF0CMEUnp!(4;$z
z^`6IK@BQAn?h+4&gX4JVJG;^My>uYu-tFyS&jG9nKI+Huiq!JYi*xj!gvtei7V_KN
zNE;1kIWHpW0sRLkC#p9|LUtJOQ@&t=G8W*)WM*CpG^YnWz8i3TtVhRTun3FB`Nt;I
zCD^$_)1{ttkDybCU$+cfnAqG@QpTi~6X*@5SFpODbE(lH<AJ_b?_a&qL%?if<LlQm
z+pui`eiR8YJbuF@b4B`S7BwGunsAtv`jG)f&m(0M`=%FRU~@pXcPCAwFKPJQ7xDNv
zJX)a?2g_=%wau0D{%0*v-{|R~?wAj`ME`$vdH>t4Hw%WrEv>gfLiK|n$BKc2&aI?|
zngs>Z?5{zw2tN@TntJ;+%@Kl`w~pZ(hraW#XGtX}=s_H~{S2=+heTEUu@|~1<f#2?
z9T$bT!{sty(Na}yDdkOgG2^dwxq1K)hWC8B+<k~7M)ZzD(!c$T$*~UN!l;aYoE&)F
zzPSI0O(S9k;_au3J^`_1IydQFj}p)+7BGV98w!}Z@h-uaXb16#%l+BpoXpPzv3%Lg
z-g=OdS#^$xnda^Ex}%iGj*ec#_4ELLl(Xj4hNYwMa|oor0nUm!n3mUiVh_UMC+E@L
zyxvvaWPjEM1WGE<p%OX{lpEnV(zR~T4u!<<!g%2CqZeXfqMNKrEA@b2)02lIZ)Xpn
zO+zD+ZuAco`NDY$G(gYc`o2iH?S@kZRp#+Y62JJZIH&r4Iha|P`y1qQx;4>%C-}U}
z&F|>IC5fj(i*h%=Eu%=|svb?Sc3g}0%yINp#aEL<?zZ9{{<G04TX*i^mv;mOhVhJc
zE99jH&PSc*uSk`me>Y_l#;jBVE7`l!U>eG{2w}J;_Wx`5hFuIbfhZ~=NJ2QEQ<Xvi
zDY6&HZ&B}d=O8njjW8TovRSKnn1ZDj<&1F`DfM<wz6mQ}t$tarfQG2mJX2)!QSTxW
zv2xs9*72NdZ`Q3SYbRf6J$-h}edEP@uM5oEqMGK1U%LWs{sTNe?<r3%1#eb!%kvS2
zn5W%oY~i(WRni;wo(#4F*@V>AQ2~$b?T@pgk}qp?5}UAS*47WT&VOY%Ho(WXG(oAw
zxkF)3TD&O{LfspH7vE~AMeNA44-%S8B{tP`v^-T^*kOBX8VKF51-vjZQUrzYGC)n}
z8)2(1_~zs;R++Xd#NMB6N<3xn8jm^jpokGGXcB3430+7e{4s7z34xN1D~q61<qn$S
zMvNa?P<J)yi01bY3H8e!o}Sx@x$k6I&P!bK^ymPkI@s+zM$anmWqS46ZK3)1H4=!!
zNdnWT#MWyC2SE8aK(E^h@scx$v*n2NamE+;Von~j84${+KAQLiMNWU8rWYbbtBEao
zFVW^h8aT>R4j3Au080Ns^#}J{b;JMP!uSnzdonNE@o`OVMDO6vT`D4Cz|qzkdZ7%_
z!B_r!pK`vm)*`Nc^K}X~96O7kmCQ#T%6sm3#^YhcD^P{pK+zcXhRoDs2Cn0NpmK+0
ziO!_vLH3tiO$W6>kQwMt9wko&VMxthoOR>2xcj;<6$q}Lk{ul=O4z@K7*_d#jfS${
z_ha1I8g18g8;Jxb!5^|}7m*q2Nt?1!;NXLIpO+^ySj0{&T64;CJaxdjWdkBz8mAMm
z56UlKYb!BaD6dM9P<9p1<OwD@Mk4|9>yB3v)V!4U?Cw(w6d{}cn=Fq(hTCN2ue~j4
zZZLt@+1PEMbLR%UZh%i$*}9VX(d5+Ss51hah>mPZNM?y~u%VaD@E6CK-C!34pFq3I
z^|D9>F2_;)Q;SWot<N29fL`?A-jvP#D-fI)@N#z~LWa|{UtZzoyP3$Mt`1J{IX+P9
zu=q=YYzDUk{0F=_r^zGMNWS#%!S(VRxt(Op#NlkKOnMz`RA*m$M0Z*d#N7CyjMfnp
zxQ^sLBgE4`Z@YC+m20!`9qkZNmSRy?6#+NdY~LwlGSHSXB2Uh8|LGazA^&STh60HU
za4FEg3a8A5YSWVK945M!8gJ=ez1WBg%hVvMKq3=#*0*}|`ie24`*tF#%v=wFHIkZj
z4#`nH$!Zj}pAM3oFRR7Zv!ydYgdCZ{{Sr<_r`?X`a>?i|m`1nVzZet>Q*3}N%k$yH
zx$}&gSJN_GE=7|Z(z5A+>jSJM>A8%_=je(1@ybH0d4g3I-@CVbg%M^d>e&L|iowii
zF~rQvzb%8jPM||rgp;adp6qvemEZ|sv#Eagx&c2;YMPn2Wk8PyROmDwr1%t`v4^#p
zjY=~4pC9R@HZQYwQ^lkza|RQM4@MAx$-DF#=@)*-U=pvJH0;_doq_zVM=&Os2;3)s
z0#u+P;H=hX<99BhguE|cm45_rXjz=@cs(y&h|;pSPzEsS1v7?LPJt<tVtQxVblfQs
z7a0aM_nf)a3bpBdq&@$<ekrjhr|V0o^)E@^)aRQ>T^wQ#k+YtSrg$_LZSHvghU>=n
zx-xU07=9-43l;<*gh4QWKfyl>lH6H?Ec|{Gf1r9FJv9e+qWAcCQl!oZCvNZUaCHGP
z^9>TT<H1l&v!~qwcYl_2td+g_4OtwIdX)_Pzrq}>+y6>9fiI-7;Taq^Fu-og|L~B4
zDmj8AF(2Rxg3;Oe+bw{|DPLjo)$X8<nQ<iKkEo^hP=Ym6;4nJqF$}+8Pr>HoAR}z=
z;@JE!YyU_Ij(#mc<gng&$|SIPTP^~r)@2_0Op?;Kx+E5thkymM{TF(ttbA0k{G6sT
z4{Zq;n*Pn#_l3Otdq6;={LgU+WbC{)gw*U^;xr;CW`X6VMtUB>&6*AYZBOv@43Uwt
zx$hktPd#57SKED|pKw6pO?8b_8=P}Gnb$#(hRt>AcwxBbL_xZ0|M(ik`b|i!lE{7?
z1GZe?S>nz^lYK*h9ia)+B3Yr`N;zcM>uR4(C4-57rDh8OJ?EF#@%iyJvTgfk^-{Lb
zVs86Q5w5sU^AZv>LVwKigKLwb?yb1~Coes*=`{LQ$9>0jY7g(XhX;5?cC5ghO#<NK
zy0?>Xr315`LC6VLFsc$NR&d=5RC6YfOA%$u3biSRtU95{@|z_PQ7C_B-hiWK-d1<3
zv1>7RaWVc;5Cn@|F|?W_o&Zn8+atC-FVrAMH>Rg1hk?=E@jbzQ-ijc1XWHknL0_hM
z<!{RTvcP{t7YP3qT_Az5W3NRDL7wv&Qe=7En&!1kPnbzi?p`n8p6x_CTgORe0Ia@v
zLXLf)pevyQfrf8%QI_ek!^q21ca4;C;kiLizUnY-1G|nkcIXC5_&~2Zx&R+DozFk0
zv5?Ct?rLu=Ql}EtVAaR`&v7EaCg_v-o?C+mub{3huD|VkZalBFLz6hTxI1(VV*!~^
zX!z|)oZPf{tO7*-jp=zy?W_-}*+Q4HrHF=f#9Hk0Z|;w6f>;e?;MK#Q@O}GBs2^+D
zff*LX#uT3m-z3Hwjh~2JqYrPcUz6d9IYBpo<yYrZn7@I*v}*c@a+l*b6Y)vL)0d0H
zCrrZ*D`VVkXA8@-e?<s{)L`u~Sw;zPpaum;VQZVn&Y(_KlnKBdYYMpc1G0pi_K3)6
ze`Ve%Ua;(R<!m$yyxcU|omKS&yoPwlK^jtQgdvk|hv>e4Lm4e1N(N+OI`>93ZRQX>
zA29e*Ls{TibGppF0f|)*BbZ~`)5_(Yq$chzcGNt7Fo=|=0}}!f&d<;7H%UR~ey5^o
zxU{FJJqZ7mP+D2sbDb@eV((39w%Kb}I6k`y{TJo|fqOr$)<mRhVB`Kl?%&fk{j$LS
zUP8f9pMvr2fLhMLoq^x^>U4sCp3#%XQ@7P(83KXE&0U3bBze+_i(bNY;g{$5Xme9G
zUWkMGw$28WHQHc?<m!8omXyW2Uo4jcPXs@zgWnQH(RlC98)lj<Q%9g?Rc07M2fZ_x
zAIE8{TTx7={^HiJfR-8@Bj4TvCoaHkgr#a~@b~LL2a^g7YQpA>9vpLqYN|xUU9Yzc
zAJj7oH~{E^zr(dVI=F-Z(*xCj9-9XP5pfeRt^_&GWwbefkze3##2iR+Y|nvwWZc83
zJLI5A4IzF~UX+UX`(XpXVuB!O<4_TcI{(PGDDAcamF2bjmgRX5H(#mEygnrO4xGn=
zWBQ(D3YSDPsSc_ujq;wn3bbDK>5#V9m9sR~kd0^!JlA&m*G6G(Ne{LeyqBL@wVe2_
zJFsYZKP>KQq#6&;WOV?U%s{>hB#Y^Vp`>ozwoREyu6=aJ)vKJ_T{K6~g3fH2BhWNC
z#pzW+G|+0AQ&%6#diOI}4Ngfub7C^6-@tK@8EEqkEW3dSZ&`Kvmca-n%C3!=7VO0S
zRDmt%GsY5*Rk^+j{nXw1ErIF&h+2e%Ak<dd%bpE&j`Y6iKfkFQ$p3skDHt#GMP@)*
zOr`=N89v$X?;j$c%t$^TU$gDr60d~6@v)Fm6JZO*z%$bbzh#LyiilO7Ha$Haz*Ix<
zL5`LNwk61Fk++g-Yrtd_y7qr2{?-SQN8*r$r-Rrmm-_oLb(NpVkIyW8X;4Xny$FD-
zQ+nw#CdSZA{1pJ8Dmc@o9T{WYx2Gmq`A69;_Dp7(+CsuxEW9T2)m4{}n}Bi_;50Pv
zZO*u_EUKi>bP6Hk3?QC^kM#K>=L-YOGh+mj3Ax@F&9bEb?5t5<KsJq1p^XEvl}8a;
zzB2KHMtCv%L>?;(MY}^7sMt!agN6$Ff1_}#)8xnvrkEb>j{^hWF50;r)W`BV+XzQ9
zVCB-j4_^o%d(^wjrAUg1fUP?(Z`j>%^iT)f*gzyyOsjy0(iq{36_veeva!_C3}xuR
zOpYHZ8`f0uZ2H)=veuO4uspc6U#PY8Khbwc$CWE&b&$=W7uV3gObHACw}X(y2A~jJ
zeN>P3VS}i(E|WN|pRc&!Fa8g`Om=fZiTba{9)>ZrmaEfJqA)A82>j)2Ew2Rb9G8!L
zF*p2%SzTM3r2A#pD?%@{WI|&=#)XAPenu80%N;39$J_07!}l5?HC<I+Iq$A6;NYCH
zfA%g0x?=(3j3@TL8(>l~nScKDCz{c>>S1dpgur(KzSE(Yx>``cSc68W5|adb^;$FX
zD4S}3$Ji{Gt`*@j!5D;3B(AYiIDniGodLul<IGYnE$G<F8sMO9i<kI50vJrt3Gu55
zkKGV%{b|=zK2a8HFlh&ve(tX%$0Gy&J-*eBEVi`;Zw)p`V?R`vrbL~p7uz)F`!w$d
z-1^O#F0QpI!)Z7(oBEI|{R_fG78|U|L>6_mriNNFuN+%~;9MI`=!>8~b}|{}@;yqB
zSGCPkUp8&-FuJk*3@!i+JYFPL;IVAv&**~D1W5Bw#yqbX4!JDak-AO)fRY>=?X&~x
zSYx6c|2}n5-Daqc_WIhYLc->&%Rqc>u$fsNkPUB*k;8F$s>~ww1*~=INHX&>N!&et
zc+$+Msyc`ewxT@ZM8>fw!SX-(@-*T0XDEz{-f1uEd0y*Ja+#J|w6M07oAg6X+Hw=%
zZ68xSKPmcuw0y##ga_H4tB8n#Kh#~aA!7ShbVE#9W`nlN@<;dOS+`)DRTn-%w!aMF
z?%ZDK+T5#XjVRhj^7XpsHvmv&c`h0lzgB%wFDA#|drCdOQ=yv0Gyr_>N&mJx1JV*5
zgHfVzRS`{ny)qbup5$WLXLqh}rvjx9X){-I0u9CRo1GtpJ*WNBmSKk2X4Rm>2eO<#
zEGiEJO`zW#S=DP~2KAIQ2`73?ndr7!rQ(7I4UkXI&VUgCHI*eNpGH>J|G#QMf63Zh
zgR@4p0ZN5@4_LDa^nKl@)cbgam)Fz;3s(oX@$@Q(63%wGCac3y$6SMjF?@>^e@RMN
zB`Zp_A31;}*<Q;0;o)?E-Ed&*MeY$L0Mh91S}4y7#cwmk`8*D=6qRSr9_<Cr=fR}5
zyucpUe5*(HYY|%{5!U`>*i)3#sifFK;?#5>;;6TpAy;a5EKv#kh><H!03tnHo^MmT
zp<?+TIaym8)&0$MK{Cce4jiPotF{v#VaBfYs*4c8W=xHqAGr{=c=ISf;?9c4F`#Ia
zOfRSK>xHy2AiW>M4t#q_u7Me9xm{N=sRf-K0*)=~U0wG6QeC~pu1E?eR1^l`IH-ks
z-;>EsEjKw_3YlocP=DU7ddi?FTa~GUnE$e!^JGXJukw7d$=>qnVd>yu;bH06|M)=9
z*)v^dzDO^<IPlE5;=;XN+xo<aS4ZQoVNifeh{xHeA+5&Sz@Pk~pQbi)HX8G68cQ2F
zEW}7+=qrQDej(rw?`cuHXNMoN#GcQDBu0hDl)~O8BT2FK9X;tKe(x?%6dNpi9Co(L
z8~W9SM&v1iBnkaF=|jF6`zL1wDMRBYR*Y!;ne)!H8r*QUEnQ#A$8h}FokQQr3bi~?
z2w#)m#^raU>lNRiYosxi$A2+GK{<`3jz_!J7@f@#roHwX-;&1H;9Wf$9)L|X?}=qx
zL*R2Q#Cv}|F!K1Kd@JIr1+151QJj%SvMs}b5>#e5Y9*ed344qtUswlh;|D{TH9axu
zET#^)b6JwuSj*Y-m{qV1>2b1?X~Mq*l8pCcCbr0b3#uMzkx1=2(i<~eaB58(2K#_X
zC{`N+zEM0>9)3ABByD)M%QcIWt8}Y3Au>#F_>lq;S&+%#JzKHmO19fvJn*NDTipNT
zhJyMleWOnxL;CO0W2M3UfiAFil9!Nx0<;3cIP!nN0Wk<8CFuKgSU!Kfu=sN^1KX1V
zh1HlMgP&Z89Xs$K#=4$uHhfsWFZk&T*|7WY7deuUiu71$Fl$jiAe5tUS(q0vyGQRE
zY~<|yRom!w(7D&*TH$|x@4Q2bEC-}LU=yg8^p;~2oq8tV(9qC}Jzc6iZx0~0RxiLI
zktB8gt#ibDyjTg0Wa!4CPhC^yA4ThIVoFMxV6*ZPBjqAni6i%`T4^=vj=5~`->)Sq
zu+r3Swn99s#~LTs$k<$4p~DS)6a~TK@j&Zodv~zfXoh!pZwn{lk}POqVE8kTI4#Ow
zMH9OMIY8Z=nJB}oN>9Ppt<^;c48(%Ao!$zvT{`be0b?t(hGXm#+l10-iEQ9R$s8ZN
zwIRb51^?xc8_A&}D<Nj+h~yc&WVjepnAWocVvG9(?8DJS6m-~s-Ff5Tm29{87z<=;
zCY|-w5?I%HEZgG&?f~i3887W}CtI{?Revf}Xzd=kj`H&IW=x8HFV=v2CXCsLf<1=p
z3BEpj9lni>gsCT1zNR`Q900jmqCRou@4g!zusLqKlEn-MeZ>=mHz9c+GBPs98vsgR
zFi5b=1y5Nwp~oI3z_XYdW0J+jmL1634mzvpLFkhYYmk*7u{-yhYP~V_o<WKDt)<JM
z`%9KXVK{KsTGG}%hd1Z-TwLJ1pS`$8>5GK_QmxRVz%>*l1wE-~|2^}%w$4IB@&~H1
z8<M;5asgA~#i(NUcz<{a5r#Eyl<86B@WfBe*#ch6W;Jqw5s4h1)Ew_i_Y{2TK+L3z
z+}$G`!GE7^W&i)lyata_2UwvdS5?gmS<})m8jZ+%@xGA;2@|(&&?ChD*ziJXn$(9o
zUCl85W#-(jt-gBMKwxCmp*H}E2e3TM!;%DI-is0f4eTB77yK%W7`sx)LV3)kvb_m7
zw47=lAl3WB0#<<mIR=UaDgcK?2BDfrTVmJbXRDnZX|i9j1boQQ!8Z>aTm8c(Yc$6n
z6^j4`UDt0%*&GV6(yQY?R^E(`5u3)(Yhm>UoU8%d4NRpeSy2`EW9FW8%*RaWNQC82
z6t{ujfRUSr4pSr4RCE#}5<d-?5Zd`!Pw4KgbSIeARf`ZF20E>ZZHJBCYcH^La^6sD
z#J+q!`0>ggSdil<`!qQcvCw9c$vSduFoWb!_$(MXBLn*uzCQdJUGORf`*RWWa^`ef
z2yOI8imfH-W4YM7mcCt!b|)R0vOw2|NW`JaTzjmCn>@aF{jGPW?S4I#%CaBAE;C!6
zGUzNK#o3;5NpEc1cyb7_wtmtW%M;MpAk|(;*dNXhgk(AyqrLuoW8nf&M9w)h-e6J+
zRJ1z}h7$S&Rb2A1&fmf9#AzKodd#Zp#?mHx+OD+2w{f*)VJqllg+f+iO?@Q3I+|R7
zMzV7}dX7?bM1`#%%A?tOwLr^E5+`@cpXS*bb4|zn*ug>#PEaLet?^(biDNEVm%cZ?
zaXz+DHcD^<DEWvyssh)k7M~#lX-!5vo9{NH-Rf<y;&RXN7tYws((j)pTK0psb{k35
zCj?EuS4xB@zajspc5#vu0rk@VIZ<Yc&1=aQ<4(S`(F80Ih<x`*HeC;@`v*r2MzPbR
zI|Dy8>&$iGZQeC};jU&g!1~D+3sVPwnRZPMQ$ZrnDySxnFJDV&(2<MM`bRqQg^4*4
zV1~DLQ79Cr+S=P~B{#Bs+kp~$tQM?^G44#@THEW(9|*lUZ<yW=r!-a1qFm9QAWAMi
zLJbpbJKFTD1JX#no@cEl5k>iGYV$yVcSyPjn8@qYP{JKS@43{z(P<Dnb`VHrwXK!}
z^7@XF=yUnqGwCi&BTiGFG=W??jlxu^abToNuQO0_*0$vZSn}<(PHIOGH+UW}F4b3m
zTFSTz4c{(^Lac$5>4WOlsKd;qTMPg3W{DI%q@F=JebiL$$<qT<+T7qH`<fzw-ZDP0
z#lhaP4M^_b+$-|zK+&@EP?N@5fd0;ph{|adK@d?OVop!c;X-!l`vhsVt`yygC%2pN
zJvjJpvo#Mzjw^vFlNOhI{SfRB-l^JDo<N^|qiM>Cp>NE5SA3syWv7$$Q%h3mFB4g>
z9zA{^9&4Ot+pWG$TuE!z2b$>U=;PT!9#fzD^9{}9t^_BDGsO&hY7M!FBz<8GBOn|N
z7lT1#>?wxE`lsXm4@?B%VbvG9y_8KT{+CX%uh@kNLXGAM9%!KYpc$`hpl>f)+K6#B
z|J?JjVNu#<pK4F|q4}mhNk3+J(vkaxTS1`YZ0-uEuNO(G6ZUQ{=PHZpLCQ$BUn=m5
zNianjpJ;pbg07h59_=*tT(3aOzSZr%#Z3auQE2AdHT|DL6)*zw-zQCCklwfu>Lkqx
zGGX(zAQ-j|$fI!M#QLsN?$bCG>wflhN29~+WTTV-n=3wv5}y989h^t_4<M_-XBygS
zU32n^T2KtI($Pq-=Z<dq7jmOm)J~^GE>iRGjn}S?YR^bO0IZ8LJRJxsaTtOft(3rS
z$B@Eke`}=K+IuiqC{uU_W)0atUlSjsvpQPn99#{#-W}bYmCY79rxTs1E=frwPt^Y&
z#eWj@8=WSdmxibOLh%01lb*1KoxHZOHfq@4=pZmi`?Ke_KxA=*O&0g}tI4cnvRu~Z
zKxAp0HOS@MjmRxr&tja)V!gBe=+K+LkhC|mbJk_%P>eT1v?~o{)Yd#FOY@{G&=iuX
z=0@4sf^&k61v#n%YRhbfHzk4Ub$eL9U>#<vtm7@3s}^951JI7#nd;>{tppTfH^vSZ
zqgGEG77#PRemp<##o8B?K$vDbV|Z#voUE=j;~&7qwwz+R=#ZgQjxzCR(DEQ+7rj&x
zii;J543VW<3q0&6K5tz4gaQK;E&ZSNwMgoY#Q9#Iu0qp)>7H$r+A2PdaUydK7${CC
z9+KUDJl}oz_J0Axa!j*lKEkeB9kgt<nCc_K1Et}%$f>hW+LBBV;<m?K_7V>|Y8}?}
zr|1;l02xi9drWBI1#RR3t0f>(wfMZ7eqG|YwQpv8E(F!X^p}y&e|0zf2H0dcb+#t<
zLr*P9Et%Ct(~Rta&l<9VM$*-QIp6Bdm5`$p6mhW+P!jJS$<X$vTud|R0>c=9EO7Jf
zpHqqg4oX7w&(Vv%O17@8e{kXsE0Used!0Q;+<8!B)P;{z=uP{ku8Fu%8#-L_(G)g{
z;)#KF=(cm$o`^!xY4I1!Dl+sc?EbHFBf)qJ!J(fuBg)TI_Cc)QDpRz6^HK~N+KVtn
zqzr}iGQ_HvWhQ$TbE!1|fVj5x5BiS-1{IBbX^i|*w;0NU`Y=&ydiuWWol-+!=CaxC
z+s+bMIF*Fl;i&F(_PGBAFf1l5Ajt(qz5Zje3JP+xy7tDB$2}&k$1wrBp2Wb)CfR}D
ze7fOnQ*0>oba88c*m+qy(zol2KSJX1mn$MnYYs~*N{cRcQXqh71&gy3{cOL5X>Z=y
zZ6~s+tlZXQ&sgW?Qeqt|SEN23)8Ujip{g{pj$mN|iA~+Baw+y|=}KJ05xi8TN#Ql=
z&z!I*R)XkK>nFZlC2^R{TZ|>(u>mFhyXfl=twyA~p3Klsu-8KG&=?GVhf-Nv@zs?F
zu+mRUSM8OOoNOpeqs`b#UIsF@4*lh+>@;p;m>lm%jba_X5ff@24UQ#$AVMXIfDfm^
zWKuZQMun2nvzQQ5@l;D{e>jTrGe$t*ndsKxj`M743#C7dAKz}cSR{!(rsQ5%(gDw|
zeRxV*O!mqjHEM(oRBdgcVDe?V5}t&{j6Yha_(m&(HRaSjvDgEc0{zg@ik9*x!Joz)
zQ*nrN^2N!<T%R7o)iQ8g{Gq?`4q|(~FPqVH(1sN}ATIf+y38z;mQu!{LW5=sFy<ot
z-U$o!@00Zl3H(3t?tXr3RAUdx_0g)$F|v>tn3#KAz8|puf{`YdKN<-5sv=6!Z$&}Q
zxqin63tSApKfKksxWXgkn1$r-%NSJjfI{}7l(f)W8+S!UmjQ5v(^`B82}OpcxK?zc
z2xo*~?=^z&6PCKfa`gepPov43_k`b@BX7N)Z7%p*wNMhd&z5V%zq-9=OKk;?=#Z$R
zIl>-uifXx?&ciNMHg0atSH{>1@!U*gynoML+3#iAc8B!TK_5w{>7n|$z<~2q?Kh88
z)v=Vywj^wMNmKA6nOwy=b)#UX^_F&0un5Eu)(j>0wBhA?y{5;%%j;0N@ivNo|8zLO
z#_MG>L6?;F!Lx<i-E8sg4RH2U4+v#;Iv*tf&;?8D9gP|+9=a4Ic?cko(Go77^G0ke
z%3!T@;G>d~v5D@5<~U0CJdUY58#Xz>MNe~LQ^!YTGvK~GUJQF)eZc<kH-W=-;qF{n
z;U+}wV7I%y7KHfdw~0DEo1^a-E&u8*@l}6VS+JaajvO>_dpJn7yJ%Y0d&pp;qNCck
zirUvlDTt@S$;4rDza{H@c;un7-GGRfhr*_aUQvsOd&D5V-6NEn?A>tPinh{4NQ7SS
z?Qo?U1a>BZ)ysoLLce?PskL3grUHlji%87@O&zg@hXvNsMt?L<&V`aWyG%VBsYgYC
zy;pq~LC#wELLOJ<FRX*7F#v^sF$xV(kQJas_#5-6utJ+D<iRR5e4w5Agvs5CL5r~x
z#hWKNk7#(ZhnSFV1tGl}Jra03R!#F-R9V%sc+<0`T?4(jqyMKs+0h6k7;7v9`2FYb
zt<tWU$~Oqn%`W^6W0~f}2iCdZ;j<k*i&z9>x(3IB{Pe)zq9*c0OgNFZ6*{k|QQgzi
zqhk8ikc0002r2RIwlQkS5BVRB{V#S^gi;*%`yg~xG!$}im_8f?KgZl({hXPtN?-hr
zzmDfsO*OlYSayvf#8%fomJroz^$Euf*dV_hFBU>}XL1l$jg2ECoTxgLCa!QWXf1bn
z@alBl_usW1ENP~j<)c5(bV^al|6TYCY=1g1<i4(0M#jhId9kw!${lWhI<&WS+m$%7
zJi^+y_Uv#o&%tJ|Y^<HQmDU5^%73)ju7v<<GNO#f)$$lGU-Iz@pn_+c3ee<av4d5=
z^Mel{S2>nJ#-GbZ&Z%8_I6|x13QTw}e!5@atXl}o;Td+vcxz%AHz}^=F(Lh#mOBf1
z^YO;<O#ahoO3Lz}RfDTry%Ou|)ehkt{o{N#j#XE!IOqM70uG-W?MdJoWU6Od*t+u1
zRpOMXn2XuGw3o2neCYXWwNek*`9VV^`Q7fHy;Bw1o8AvZz037BX>em&!^L;okrcf+
zuxFqth~u*J%*L3m0|`15KO`*c+|oQGYy7~(;Iytsb{GutU8BvH-84esi@adlb~##j
znf>MbAt8P%qKLiVG&`R*B8yx17d77xF8f33kAqo6)tyAbmb*7W#;92^?wvYIF}n|>
z9ieohPx&NW&7=>RKB~mMzFL||F;S?8pCs~LIdoI<W8^hR#^d8IH&47*N@8Km7^8?m
zQ+Mv`>P-L$*UnGA5&kY9P--9qevfN)?_pJiTqch+=|cRb;eVgIw7maRIw;P)y!sE7
zmCY6&zW_(HqDaWDTW_6p-xs^aAX4BM0+epW3#kKPxlYwH3og8d(-t~p+ZMV$+(ue;
z(&dEv)eiT2fq4^?e?7B=l+Rh;@2K;Q6ms3&84MI!+ahI8Lk-*K%ubKFcQsVpxdK0>
z>5FmN<G_3<2QM!5uX(Ze6S=3I7fc<a9t5ruQd|%bE5`Wm2B~KGU1B8q>zo%YWwvI(
zw|FCZy;I9sg{$g0g$xZ1ZF_NftG7=i^k2Hz0`E`+3GGh9cxPgb??Lm%K}PM;+OI&-
zBG1Tz)7tr6LA97Jqb~uFkQTAw`B=6u-nl`pQc_yb2!bfXk7^y^u#Fg^(nrnJ_Q<Ds
z;y69I5th7$SjZ^kQv@-w*A4j?a+FZFqcnE8?+zOIcB*!)*<^UD^TMSwq1}Z0L94l=
zX6kHQ12rYA_*&CL9uO|VoiBAJ{BHe7WA#@%nm1P*)@K~=4+9-t|LX(pHDH_`=z`D+
z;JNHX1%rfNiY8ZYRNy9&nyRfTPCPbD80caim6%;D7xTj7tpye^H<*9HLvb^X4vr{K
zDW;HSu%n~lj}=$G1H;+S5=E1CipO*$5eAc(ahPplF?Z~+o;K}yay(AW_xJZ1UxXYj
zC4CS+3+}fnn!m66Dy`}M;+3O$p*5cd)#f?%NVKw{zGzS2mYd7+${UI;9$UY31gu!H
zGRWfn9)-BrFGQtGz3bE%nRX$j70_gpOf?#xK>7UGjzW5H^{dzT3o9y{eH6w@tQ#-S
z8G%=mVLalzcf+YdiA+R%llb2!t%6ue+5bP~P4Ksq>#8JeHkdyMWN|?qmSt07l5%Lh
zmUQ|I?3d@B`b4WfUdg)^(W|RD7-1C#!q3?S6ccY(vlXJoid3=?2X6v|Ker`#QrOsa
zK%ZHabgaQjb78n(3r^a+jtsaz+Lo<b(=A*a>J=5|CcvACBKj;)P@U}$J=MsO;Bm)Q
z=fLXM4U18cC=BW-CiFDYox#g9esXAp7)k3#43AKKrH?PmxIQ^qCmHn5;NUc#CrfG0
zBP%-XdUaT$UnP;N*g=_3EAdc=h7+0Yy6tBtPduYSqqVx(44PWQzYNCI5pT91V5j*)
zb%B1QzrNcbFt9N9?C|T|#=i)?_fL_Jmr6h;abDs(0dO^xu$qWVhEw&~>yT9}1PPzG
z<;K8hKj;+tLZNzdFzP^;g+vdOP8;Z}AM5?ygsfA$_(_3J{zw%xFieJHX747_wo_9D
zc@E5|5F?|LKV6z*;k$-oaYHkGpLnd++Sz8smAow`rfpRCOCQ;nL-%JWckFUhbejY?
zF7FhSlmdqdywOO-qk0qN_(#(jUw#oXdlrNW6HobcoTv8u>3q3Mdk+)qryEW(!k9yw
z*XKljvG07vqR_p;<-PfnI5Ih|#3B%YjCS;PT|4Is=|p2(PkgYeNRzJbQzNUG5KY`+
z<y`)U%}n;wWy42#`6WH6q%!96Vw|y6lk0cC!Ud<s_^teh>8=mKk9@4@ufr;Gygg}T
z?i3$!BM~Jj2rdy1zTcR7=FHzFGn2AYhiXD-#u$92zW+0ckY$7VCi>5?OOS|<g7ad%
z#g-5fUeYtW=+|lr66mf$dSZ!SkVw@BPx5w%<D1^lf&!iH!}dOM>*;wnXM-!Gla*2s
zuZ}(gG0OZm;|%Fv>hlq$QSq%_h{kbrTP|2^(LW?fAO66Yc+0P%*(GOnVc+Moz(nZs
z*Ta-PSq)!FMnsZTd_E6<^{ui2G)#WZVQZGoP}M64Yzd|u3xam4vj)6f_7M8Mj0Z}S
zDfFu7P8Adg17Q=mM{>M`UvIIcDoV~2zURyw=Mvx@rBkBS)GzGm!3Gp0=Xy;v0!q|B
z0H(~4b9;TWbPGA0{^iTMv6;4Q>461YTy3L^S7W|6$#?TL1pfT^5nQCgSD2`fl2>%k
zCqz;b<=)cu?hw6Pfns7F!o8>I^YK#YZk8kAH^SJeksSDQyzWuU#KI$I3D=>K5ZgO|
zDdC?Qptu9WDCQuir=J1+!aB)c{gDiM3nR$S7cv|Mlc$To#9T>niITI(!`DQXN*+p5
z=Z<dUAGXEQk72f<2n2ubLkWk{2SWEYJ+B6D_SmRs=vDd1_eCv`Vpl?5xf^Y?W7Krq
zvA^DzJ&*sEvzU4p8JQUyxEFZJ9VN!1#1oFEeuU*_d(!j2n>8!OkmLlK(OYO|go@V?
zgbO7XOOsG`X*7->Cs#0I>(+PYNIMtXkA-_8X;j?@@5u;xwK-ru{czrl(cd*srn+uR
z@2ovtOW0X*7)wjBT2*GwNy91~J_UpB4}3g4+%I~=FFcPGyK(%V!XzZ22mQ}wABwZE
zs{X-|Tkqj?v8<*>Tu6wx#^-XT!mmMSS6Ee4t5Lp0oO7%X;8N^<td$cB4aQ?9*pyE`
z0lFM=$awletRo~1%I5sg4*R{0fc@F~xXYMRUVHkJ2(kjV&S047-Ai8lIk0}S9rQG^
zIb}=IJ1mY<VJ`SY+1evv<8|O?p#5E>vljo{XKCK?LOF-tR2G-neDja~e7#+~Nq1q&
z@S=|BaJYCUv2}}H#t6@=H&h2l$CdrGcYgJ89a2082S+3Xal19^7X6dCVz>93VXot`
z<-}|#FhlC7xB2wUOaUng8c$<kx8rE=Ib(434W(xKz?01zqT~K6OuG-DvmmB{pDb`C
zGUG)d;cDRCQcO?qNHN8axiNc5<CvFZ%V$+{KvCdv1x9uS;jlhq{Kp!9taG+HGN`IC
zqm({5bYJpX>@H@hD^pXv2RsQuVIS1cqh%;RzSPYrN9Oh5m^PiMXpy9sodQyhQQhy~
z0d6nJYB#{aD3g9axO4_D^idXze*>Cg(IE=*y%Slcw&y_Ihf+Az5gc+;PuVg#v*E*7
zvKtWba&t4>Q0Myv`t0CEMMpCyfw<T7?j!Jqr|r4X)GCKvldRp&>@RsIm~jpkx|5)X
zm1Jq^D7Mis%^Ms_-~j~>A5En=Cd}6er1Y*O@A}h*I4;R%b<R^eq<8X8=&D=Zl1qYb
zkXdlcF%Tb*yX@?td)7Xg@tK|kld>LR>c9ITK!p^9xcnNk9SwO=*|J?UbZRKkZygom
zss@K9FKpke*=saTN=hmMoOl>pVhEi4cOrrFzY~e=D1@;?ER76-D;}~=B(m^P_~!h$
zJ)C=PnU~gP9!jpVAc^YXU@u#Q)#Uy9r=N<ulE0q)<5-ut0=ahv8J7D*Om@avbgNba
z8z39yn6BBtpA`-AUx}KH;1qDHMQHa5k2kBKT68$U5xZK@X48V+-+3#4ci||N%J#jn
znBG+E$#WVJaTdXKF}8L$au-;A|84&j`t?bel$yGCm}x5}Mbz8=c&=1%?%1JCHz*=>
zWGp~GQ0V(XOW*VEpyO^!CUnk>?su<2>;OUD0?VoiehhDNet4$oePyI<-KoYKC&MfX
z+=*kE@UnsR>4gDvS$~oS9xe@@j=lI~OQp}ud6FJOGp3Bfh}(De)foF0rDoNWbY-2%
zu`i})$8#{7k&fo$FBnR`TKGDHB?{h4Fwsh~AMlU_N8ItYzSR?Bt+e3ld|H4t6L9wJ
z#TLcvLMp0?>g$67zrHzqp6vWD`>6M4%b1uSy9Ox)XKOWt<80&*sw8pV3Dn57cMX!M
z2S#LW6Z?O<yF70$IJUL}5lxu#|1RvCme>3ry51_F&2C#8ZE-73ad(PS+$ru-+zG*o
zyVD}Y-MwgW3GStMa3{FCyYuHed#%0J#Xgt0erM(w^U=S5|C$5$?WNLnCv|WOq+|a2
z-K|7AS?2b%X;xztCXk0OEm;a2aD6HfDPqQNv|S8tJL^Qv^?PmMY}%$`V~Y)XQIdZX
zE?4ncekz|<)rzZ(Cm*s*0s4``rbwm-7h=SmJ{A5BKh=Shv6PU@ft!&w3yPM~!{}7|
zS08?RNO|R{5Nez1c!l#lRP{bd<!b_o5BN^>W&&XI2yBS-?(e8#ayq<!6MM=~a*F*6
zlUEi;LT3IK?fBmE+VL@yabh_NYR5q~st$$yTCdk`sQbQ}K?Qk6ulGIUoD}5aM#%_B
zyAWQ5lWnvcsSCs-^bi6kk;Yzv1CG2*6Qk^k;}(oDJ2@rV=|DZ84X)6d7$$Nux&0WX
zuQz;-_&1HO9;b?6Ix{H7Rp`OlS7Z-WvF!pOrTkKd@J#*|7>_;ATjg0idt3kLbE&Dl
z1+CnYlv+YDdS69WAScZDruO~qe3Cj%$P1elx@Ro30_%n%yII9@h@R_L9g=}2HywQ<
z5aq?em_gYy^7zkXDk&VS?|JTq**M%stc0!ysh`uMwm&HJ(I#-A<^jAoUfo};u8+R{
z^^@zUa=S&CrM}@<On{5g^rIPO?mlc*45#;@l2>l|O{!*gy4K&R_+#_uE+$cs8t%5I
z&gL-shHO-LoLa}?X1X=NX}b5v@zNK-kHlmeMyE*T9RW$O+U^w8a(BKS6wu#X3ve8}
zcS?I5?9r*UB^<}P;8BoQ26k(?4}pv-4risoF=vUuxF)K=cwcCr)&tPM{h;WdfIP=7
z=p0>bfAF;f-=FUz6Gy`$eMX#Em<js<i?~_IyVjd(?AN!A=;hZtgmEOnr{q1fRI{8s
zAGs^`E+F8UBTD=5<ci-#RY!I3N}hqlbS-LV>v6qWJ2zxghz+K@r1VYhBY=ayi_SiS
z%B`r}V<jy<t`K(giU7+rmvt>#SmtoU&C<#EK-DM=Rk_^UnWX`H$_rVJt__#}<vCpn
zPL{yUUo$7>7W>CnEv<~xrelIIH~fFIKYbMcd(hyrHmts{E-a*-zx_h{`AovL`0)WV
zx_UEN5p?F11~>&7Z5guV75J;b$qi_E@mZ=`J|8_P4c>WS#YmoaCy)|MH3(4_V0Sh9
zyLIWpO9u$PI5C=9+i8A=zb$^LAV;6Qzc^_XW>7s<Dqmakzso(}*<Nqi%L!fDQiILE
zNS-N<!VNl3CIod7nFl8yWpSCpbY?u^**9+>FzdAkD=pN0j)mu;ytU{#x-h#vj;*zt
zq*Bb}`Ox$_ACOm3ftQfL?SxFFV{Vp)j4X&u@3IBKB9zr~kDy5;RlHNVCd9!isw~`l
zoIW(UDppDpdBO5M??z+>Bn>{YuZ)o+<*DpB3-KMGxiSp{#^ILsk`wIWw%nY^1*x9m
zSF3wtOh7^WfL^8`NqLbv;8}fZ(~XlWo?gY;#B!j|s$NtsMrm(}$cd_2!f>w`J2ux4
zed+u)Vh_o7j<dT%)X6;A8S_Hm+1$w&c7h+{M{{1qC3hpY51x^X^9GH+{7~K|;-5mK
zl~(t@iM-#Y_k=wh=7X57M_PTWMBa={ZQcScXNgE~8MPkcWVSk8Im0059h9PR+y3xH
zJv!3CnQYmgk^!?yAHVv8?<v+2^W?o8+7IXq+#$fhVK$SNa#;qrtf<9g<xM6dU#2f9
z!<91uaOC5!NU<+B)&B(9So*29l!#((ES53gHyQ9D?V%t3k#uBWrr-N4+j`W)xiw}3
zN~R$Wq!BSb3diR6VjaRd<(~`2NVT7rwG6Kl_2<tQ)Wf%ikpFBkm>S*D5{0=4*Ophz
zOrSeRrZJE53znna3Ah0_+uPc2@W+R3JwN+?b+1yK$A0P?Z~32x<DXKbAw4eLe=YrD
zVm-FNwgvmWguY0})$xF__rl=E{kbaKf1Z%db-&UXh=ZITY2YF1w}T>Sirou--2Tt6
zEnZg0A^eyhWBSh*+zOm5#^<ci5ApB%gZy?)epO+nT<Xl--L=wwh6gln-Sp`+JuzJR
zk);${TiNy|9aZ(zjSCNSuQ?8SYc^BAPq@TqYM$6eoKQ86Z98j4W$U`+T(-w}iW{Ws
z3YDcn3vhYY;q5xW(zF^elvu4UjAlX;uRerY{;qYksYh8)&Ld|-r!D!p#!h3;J2q4@
zvAkEVbsu7x(|zR79<#;GO>$q@X-PM~-@*v^VIFk)HtLu(0rtA3uSuPbcx$7eUyAM*
zgPTtBm)_m5X_TbPAyt;XN>3Y6KzBRoC0m@YY*~Zv!II49Tuj<E{kn$E=ix|yeX2Ur
zKgW`%Gj+clY^(C|DWGE2jpU4VArPpK;j)B-1>>?CpJh&1s{93<h7|JExkk*o+Wmw{
zRZ}wrI$4>jSJWUysEhU1(NhWPbkYo&!JG;eO0(Use3P=cEZr1`Hs93BZ3n)^0LD*O
z+U-_aKP-9J4s^pJs_APF)5OXU3K{{AYx2Cn!G)Z0d5&qoy)au6erMcb#q2<6(t{8k
z|Bg;lwTt@7qFF%J{jVby9d>fAoU9)Xoex?k9_E`$5Se%eOTVbEi+d@k2>Bo(@>i4K
zql72MxODYwsrNL<2>E<KqZvc(0Op%KgIr>aaf6WY)RXmxYN-PS&6DBtSmJ>{N9tS;
z3C#IBUF~kc5uN(_H*Tms-Yje(?de*l72Vm@e&fzMl2i>gvnazU)nZ;pbIN#5nIK^n
z|Ed4u?fHic0&bLtJT8)+p9-F>XOvg(Mj@fF$C6GUW2g{SwKpYvaSAj%A4WoHe|br4
zNNaKAvNVgsm49QkV+R~sO~rw(d1^YfGdKwYJr9XdZpj?1x&yjeF$K|QLGRh&qvVPY
zLB>WA+R%DNDXBiizy&O_i!&gpIDjGHK!-}0!Rql;&|&Me?X>?#5TcrD3D^Bx<t}<7
z92OeFWVM6wvg@=`v-2elbRngyrW2fPz#}x%rzG^H*IgbyB{}+b2)o|qanh^6))@?q
z%s>rACl@!ex1R$1oe5>24t`wgv%KlG!~YOGKud`m^EW<C%^lcg2(D#47G4eB>stOU
zMSNR|u%7->_cz}G_&7rEVpq<SfaW*c@-hRUo@98++P3gvZ!TjQ6RkuYJBCO<97|9T
z)RM?x&#ZHu=!13`R*mcNzIl);U{cD>(lhpbq4xK%$wbQh8Ora-5)YR&6*H3q4-e1$
zTdH`?tHlcnE{6<kDb;huGbEAXA=TF~YeK`|p1M>&W^}daLhyHw+CT=(<WhUI$QT;J
zHht8{g5cXhaKc2xH*EvQZusU)@Fxz(bCVrGe9NF-v&qB^fr@qKmIqx%1>4tlFV9<u
z<;7^z8WS+)+(llG4i<~lPX5yIgx}9;qeec5F>qr+ZY10Bn7VYY(1*dz*r<_Mp^>a-
z#evxj6g7bzz8POGZD#Q1j{N2J`c8?<&z#+Ij|uo-b0hM+(?K3re%+Rm@)3=I?;Yw#
zW^)kueV10F?xv;Tzco8SaeuJ?HFj%cLO^cr0wyOJ+!Kg7f{jcwgwu<NUFxF)l~9&n
zde*#|xUb04y{GBh-7kL3%|AzrhB6!;qap^J?UBlxgLL;Jymc4|be`~#<1UIi+>eAW
zBJQKI%NPAr$9x8n?Y3+_fl%Ru44?ZkGzjA5gX_UuG;G5KGybO_SL8We29SM2T_Mmz
zmBM{$yPVzko-peJ=hGI1WW6XVvCy<8>iF1pwee(OES*B-ZOi)kalWg6R@*R|tizk|
ztEc+>yQ0KDARA#p7%BPbO|9I-6H?J!t>w4-9t_WyoB8tx%iImC8>j8vU7fTn`XvF}
z@EYc^O8gIf$pvjLKUKqE2jyVIrgX_<i7v#u4@MCW&mSTT@BMrHXSm@ZXB1qV3^>l?
zz6Py>)sVHG10lm=MLnud))6_?Lvt_95ARa!_`^i9^)^zey-gI?P`14d6{&_=U;A<h
zz#cQw1yA+egu;4Tp_MZ1--ggD*8CI?$~mg)g0tI`1oFd2t}MKCJ6YtC2D5HdHC$k3
z<%y?-B<^->adlJa>EtqmLzyajA-IdX8jl@pONbqn%4KLt&McS2D52>LG~wmYRuVvO
z7*_K=K0Y);&57X?oAwi#moEd*xxPX!$g>eK?^g1I$ji1y`@?SLy%Quht6L(S^|KMg
zT$sQ@<05jb<S+M@PaZ&5#D}8K_8K-Cnkoo;mE_M<B>P5Kx0M9~(eQ{=e~Vd%z5`vB
zWWihy`Vs`9CD;YYof7^^rF)Rkoz|9*i(i?46DyRyyvZ7VUrG?8(b8-xbKOR))miFO
zY5m`6D*pXnzz5Po5U1#6HafJ0PTwq<8y;6Mc~5_kzR1FD{~>1E%xTE{g_*EjP^Xv<
zTWX#MzIpxH-t%ZFH|`9)iT4Vf9#M7P4N^{3p)V3q95%x5O;KoVwiSd32*%M<lrD9h
zsEYY<rJ#RIA@>u8<*QqDTVd6nbc&FW5S?~UWPktF@r!3vHk0T3I<F8PW}@k;R2m+%
z33H20PL+h1taxr~I=vrc=zXfQ9fGU5{5WUrS3G3?_gJ=TwXhFfE$yua#yTi)8e;c<
ze!xPvHnnzWmnH$PI|=L4Y;}@zv`qP>Gs}0ITfJH?Dc<><sB0S8GXDUkLdlgwsJ=wm
z_o0u3E;)tGc<j?PqmIE>9h3I@oIX{fO#Q#@-mkH#=vx&2E(*OA2e=MB_u4e2(ja9~
zs2~<1dfW?Djr}1<;w+UWqqwCzRi@k3>R)xvxG-@u<PU09kcpCAMzjtQg0D*VJ-6WU
z`p8BdpDd}Tnr*wNA06!z3ox0VYql|P_(vuMTpir&HVCERl?i_bcxvoP2RG~2b`a&V
zE`{SQ#W=37?m4-vFPqgIlrga8O4IzTkWWvK<<89^`P}c#enY9to2dF7dNTHBQ@6hC
zfyem#77m~tQ!xE8q(Sba0ybL|Kdt!8M``)Q=P_;y5rIC?;(Ii5#+UnP716%Nlcn^L
zk&B18oy4?dt4X9HQ{knJvf2*zdi_shW7amv-D0?DzU-UMI_hT6^0LV-Q(lxqrR~)f
ziMa`dGiRGqj!E!0f3=Cds;G^#!Z?2?<Lz!j@zzVfD4GcKefrY7IuldcA+haZc_+D_
z!Bl^1AH@Qhi#X%pw1{RHm(>145im*o2Z>wQiUr^Dwq-Xo&^zv)Z}54ZQz&px8fymR
za()bAQkeK#e#*ri^0WK9z(q)rdq;1ujGYTXmybVL*|(ST<~qKst@#3<t=KLCb1+OT
zih%+h8+O`hymvs4b{xNz!3sg|%h~hyS;1IGlQ<aX(NX_<Uy<jBABc`ec1;}od8xeu
zjBJ>so9_)1?wndy_`J8-bMBvTJa=ZbRkgKap=gRZ78Wq?Ohw!=;X{5klb}ccz0;P{
zYHv8-R@4Sm6uA0mk5KTwJc{tdrz+nyL2u})!k3hRy#w&%&TQ0<WIU1{L=HW{GO?r@
zk4cf*ZUduhCp0c$+Z4z-T;2^mC#g9<!Oon5v45EALdAY~QSmpD+yC)FZ35ML{E`}_
zbEXYEA9CSmCyTa*AYgOOpAOMb_k`=z3b3wt4Bb+Nmw-Un&{UWVE>d(-p<ujE+9q$W
zFUxF0E)oe*z@!F6dhfXlSU~_dxU<AIdwe^==;Lr!cXELoz;4+%l1=NhZ!;QE)o=}s
z4J(OETOFjdM&K?d-fz|ZC7Gc53xHQ1TYrQ7Z#=st(u598K>TWl&(;Xn_&=E)999z)
zxXDR0r{Y^%Z<h`dRNsr3li`X-;_a3iH<lbay9dYvqGrpr3-W5i<uEQOex$%-(S(cb
z_`QLh4MbWIrEl#~Q!mraht!J>vEQ6$4?ksp{k8gurjCDMke7CR=&q&K>Pl_-YL_Yw
z4;{;bX8I;HQl-a1S~HIk6O>c_;bial%v8$vw@84{F!DLm%Rv=ys>#7_kPt>9+y-=a
zkIXE7nLEImXIydwqDJJp{SRpJL*ql>|7y@`1_Z%8L-u=6P~T|`V(IcO^REt+=4(HH
zs+(+`_-$d@`?fv>(bPehyFm>&`I?}ZLn6sHqSuNO@Z=a`AxjoiVX!__3gBo~NS8~2
zX9R{D%XBUBg}jp+tkXd}wF1_Q67+46SN@$ZcdwIU$HJwlohGsBr|oJc2ng6jc0E{}
zjr-sXV)qs-0Xq6DE7DaMH=#obKx}f~do0BED?aL8ctNVb!WJlgN-|hoQu62fE36L8
zeiYZZ*qMmmM6nXF{*`rk0^uUZ7gg!MKVG0RloP#_W-7T~Ec%V>z2SOA$GXfXJMJwS
zXYtr)^Z~&oOjtZsyj7%Ykwdk=#?E?3Jm}xPXY^yP>erJ(FQAym;*Z<rKA#~x0LucA
z+2!StA4gMDoHO(Dl)sX)m0D@rj#Csz#wu?uZ4z>fq@xNmpGW--oG<#)UiXbB3oOTb
zJE>)2Ovd(dH%^*X|6T%zF|}ffL=uyCIIr=E5R--`%NQ``mG(o8(W=cQesI>9fMcd&
zD{aALYK!M$N?e_5o|sp2Cj*T^^hy5sI~SYoK!~Wf&?m-t!i3KZDl=6Tji^HfeNCS3
z3hs^geSNf0?3~*B_Bcd52*K<Z$n9+P%fZo!&aPsIv?5_7*0bOn8jTrcyi-wLY3+Mr
z-sj+lHMTz<YyOdL;4~pM{o(#28YjGQTT18RkfZMC?v=&$1g<ty&sZJ<%d%x1I>4un
z3qO#&-L0T`;Qmq&XQ53-VDm#CJfGh5;Ep}YPj-+4y<*p)V#DdQv-80&QX);tNnKg4
z^=kfx-*Ds_V19$BC<;t+d<VE4AO~zd;PY{>q=I?Wo(uo2IEwf$#gTBQcH^YGplBL5
zs<x36yd}A+Nj=C8Ij6;%8MK0pUF$y_a<o`x%+H7l9Qpelp3w~LS&bs9u>AF@L29Aq
zh@l#;n8HkyQ!<w`V#h0=qs~BssT3<!yB2ky&a9Rl0dLD3Io)FVDYXj{?6K>x`J}EI
zGX|}N6dQ;ky@0xP*AKr{ZTw-ZRJMc=&?jE=F#;IMXN^H7iB^9><N<%K#zkYtMW3>Q
zs`>dldpmo<PT5ZHR_KYsYid8soyM7K9bL}tFSl@cU+@1o6>cp6xzIATeFen}$oa<0
zx!Kzr>2(Itv=I?!PAsU#{``qRBH~Nnb9>x<YS>n5x1@Ev(2}^*a%gjesTM;kM@K~%
zCd4VL56SpEOyXJe&QG&Vec5}1B1M#%9NylgBRHne=FM|?8@T@W`2*qwc=^METVc#o
z)F%Z_x3A%_ZITq*dpjG@EZ4ppjpBTjwa$eu2e#LX>*;%Ffmd_1v$Hcx&MFfXiGyxh
z7&E<uWPmWTJ4CVnTVPOk62xiG&|~9P@YI~zQS<gwKb+VzI4SuWsw&!;)i&y%Hx3x(
z1bBh3=!A7X2f$ydhW9$&uFEfbcT?0eU4!JjnJDqb1yr9hLc^Hpkf?RK?%+P!@_pY~
zidmPn!$}SG)h;=uMddC}Dx2`br{|A|h*Z_m`U!0j%m4C(UQ%%!RaSPoKamG(+2%P!
zPOtVk9T{U*1J3%%!9Xv9tBiT@PsX7Qlvu<m*RK3~x$~*Ud(`F_(vf+zS`<%q(WwX!
z#*JZmF-VRUsMCfYBi0LlpFN!PDvPZ{6mGJAH{?8+;_R@yVJfwq@uYIOD946g_*HuO
zBt({&3Ix?C%P{LSr6OBqY(-xB-47^jP1G{0&=TRe@S|OoTFdf}?fi636EYZq&?KFB
zR8+xF=VXQ!i^T=-hqY(&28bYhAUmF^VEeQby-EMS&z#`@SQ9GLDr~=Pm;}D=Umx60
z``zW$)O?5a>hZ4cTdN`uccdwXm)QC_o$;<isW{Xe>r9DZiJ-7Hs#_poMYp33A;9;>
zhZ~a)SnK}kFiswIG<I5)Xc=xyP-7hJfQ2{e$j!xKGk)RC?s4Kja_@<!{F#TEcd4ga
z4BYsuA`*41>m7#By(Jo%P;hQY7$z69TzoK5oUo}xw|oKxH55ZbcWA#r5XpJrxIJF!
zfl$!ECh2TABx-(n?@T4ZkQvJ5ZN`Z>&bY4l!--0CQ{Tv*4AHB@2xHS6v+^%JX9!4;
zC^JJRrMR{>UhdcK?mNrA2^3G1GVi3LR$($Fd+?)I_RKH6zh#osQa$DDZW6{xc%B=)
zaz+P&8p@5t4NBte_p>T#b!PPB;@w_X(TobAfeS@NMa}#9k&e?20imWnKM9ZYtwSN?
ze!*SBuLRI&*CA(f8izuQ(FLiq#A;CYX!m6<y<>uXT`S_S7UPYwUj)dDEd7;1I*Me-
zr_|6yjmw+U{2+lgOX{=b7ztefLyuH|D3SN83Bk%@^5&{>ZcHa>q^>jbX-7VBA>)lo
zIwu6oNBj3u#}8HOtfGHvG_=OvgS+e~;{g}NM#Cb^oad0|2Htxtq7g3(!r?lIc}>jz
zZl%@j%My=WoUv+J#^QOvJ2~Ci`PsbUVua9GlJ1xjL8y6-$9Az^&TD0?&`2XOcUZQQ
z$tae71Nfz{XoM&O(NBKuXtEOy@aWdN-+7Y8M?po$>Q<C`TbI%fN^Fy-MOQy$<p}Mk
z*KAw0pm96+0G#c(9JOe_-qG`Cb4dr>PvcpdZN@1Jq>E4AC{6`xx%h2*vFvH@DPrYL
zrD~lB#Vi>=<<Rz6Rh5-kMFKx*v8x@uOK|a(c&_-rE@W;2#w8W7mWjuo8>nHRY0W<~
zXp@HDZG&*dX&m^a-lYDOjrD|kXPng%*6wKi*F|!mi;6Gk;~CrX$XNkNvxjN_2f$=C
zpq4HqIsAPCKLN7gyQ$4sSr-!($ffi0f>$Ayif=o@a8udiHSPi}wROVpe9a?XsAlP{
z^#lXDSfX=2;7L-aL*&e_Q|&mZgM}nS-h9z5Ml-^J!zp=Hoj<}6jj~UturQPl6>J?V
z<k1hBnlEZAj4P{Na)TC*lk@B)oiX`;@ftSGKB@qc#YISx{3hBoJ}tYhzKhzQ{i&TN
z!?(h~t*SU9mNOpN;A3-sANr|wYaMy}QAn1?&uT!O_&)R5YPy(2+lU{Tci9z3fx$_w
zULXuV9Oe;szc?x!dK|-2jeLL9y$gG$?7{|HaG*SzXIz*{x&LYG+$RRF=Q*o-Az%;%
zudVr_vUY8v*l(q+o{-*3NG9A0L5HzlXeiku>PJ?C!SRHX8zN44m^^mNcgr3RgiulG
zhYXnbsD907VXtb;3&~U=J@P*)J}M>;w*@*~zllP>Wh~$ag<*rq@<eQAfoWD-%w+_Y
zy4%~kze;M5XleVbR$95i^24fHt0;DQO{QikgCvXX;ARtkrkz%-l#7I99#m=qTk&7C
ze@=|`^&<;pV)I%v8f{1fwW4tv=qDB?ev#mBJ1OcKkX45ciKmE9)4^nT{FN7_Nr-JX
z7iePrdmy~T<W~>Vv53#5OKh$#=}yu$Wa&2c9C%E_k{o^(+EH&T9)rJDAsB}E)`GhY
zP}xcw+%}Fr4S8$vj7xbBhdRW{*mLJzeLIeo>u}|3?^|O||N1(KveSVG6(x=F?~#l=
zTn@X|ZS{d~!|!$f#nJHLQ6gdfoB#WUrq&1q?=}jq=cBUzS#B|=WMd<LO~I^sgNQAA
z+MnUV(9Ax;N|)kZkz3Um38O`x4PNDO5cILIjSO@GZb(dM87n%ohdH)>a-5rsqsC>j
ztydI~izdZ7(%73I$*P|xYWcr?yFhQ}a=;m`SLH!MJRi#JK9flWL&1D^oT@H=6fk&r
z_Bhh9mlKu-=juAi53G+efqj7)9$b6zJNNu%xjMNqBl3oL?yAh)n-2xWN63D(K+M@+
z`sFSmiPCz@)%J0A^};gG7B``diE*%dr@(s?gr&)F?sYHN#;NX@arknT>~k?gU%t?r
zsTF(liLrP_5KANJ!fAH9{Jd@Ljclc?%+n!DOcojATP*JQuU~)eH>FTHzU?xPWZscN
z0h)pGDPe;qvRR6ygy%^QvbM8CPHja=#+S5_4!O>V#i;Gv!I`J|)Hej2G2v7$w-VoL
z1NT~2L8nT-+Arf*hr?{p26Hk~Yzon}!GHubY-nw7H6JSAQ7et}Jtx;P9VVd!8IJ3?
zKmbx(EVo%t&X!KKZCmVIL9593I8M5f(`DT<gOBml3HE3%9lc+tD5d==B**%~1&Yua
zsH4V*)X%=;=G{G*I;&_You)5n9Q}~R2B+mWx>!r*6b`eRUNX{gQOZndxuRixF<km+
z>Nr0~uvkf=i6^xz!&n|c(`zO`ow4n@aU2^zGWPxCUXjvnl=G|d8)k~S92yZ<CdQnT
zmZ64A*oOgYd-9n|n1D8Wxbdd=5?hA0Ss^<=48hVWzW0Z5N`-D;FV7#Aj=9r1%s(Zj
zCjs53>#aR^A$wV54Qdbsh9$E95|T<_Qv6Hj05iv@4cT2hDNNp@9v4U)Ew=`8!xx-2
zAG;bjOY>@y(O=AewDrrpiQt~gxaoJfeqU!Er?Q*;Cz6M>TiAi+r=Y?IGi+p+zGjj8
zYSc%UbK>x&#mb5%ogxP$Exl(-#vwg1gX&TY^f`43r=Ct6&x_#?I*m8%KB}GuWo%*$
zCGt`?#}HVJsxGp`s@4dl3}hOBWcSi`fuOk!Unz}sbymoR7C&=>=VB}H6SOKRm{uXh
z>|~Lfq=vo=y_KFYHnBwj-k*Q}TXJ$<>JA6Hq;+A%wLiR8w*hK?a8b4d)|dgmj|sg2
zcNK5h;>Sym_%z#i%EG|FRr7`Cx#vnx;HkG!->C)Qew)MGLfI19P*~Lbl;bnmWGwnB
zQVjIfxxp?Uh(w%4mLy;{Y$rhdI5JR{{HgZao&7C<68W=@`dEaMHH0IhNpfn7BHd2H
z4h!SB4nM?M$g41}7lY6jgM<&0S|%F$+Af%=)%Y!$zUi!uPCevq{Oqz^<1^hK-F%ah
znQW>1htMct3^iyw8!BB_?6QFS>GsJoH@3Gft-q09O*}#4C~<MPe8>b#SM><PY^_$>
zmR~h8TjsD<9}+XmTfl*7#+iu3K?KM$l&nrj%2K#CPn1GXd={Lo?)8mGa*nA0LLKQ6
z=7`xcgiN##B43ks3bdcpuTKmj$ng3~7=|<-4L{x~UA}}B$%@ieXC)1D#?T8R{t5^V
zUetN!3-ub(dHV>`tD&O|TPU+f+Uznm4D*vY(iMo|tdK`_fifcmuB_vhrC-{fhP+oK
zB8`gAjuK+RB5>Nn-8oKFMuM@MN8j!rsVY|egNH0K+Mr<%{9}vGVhx~p@j>zbpL5x)
z2(f^i*p^fe9P}vnK<SbVCm*bszViu9YW8B45IVskncYu4*;+V9x|lCamaUwX2>yq4
zZuj%gN`vDU(78#He1Tu2XnE&Q{qW=6SUP&?j^Yk!g_cfc;JIF5thvKq4npIq#n7f*
zyWUs82a>Pm$V|GUWL9d8RfbGZ7pPp?XKQTl+tbn1b-a_wl2de$vL2&w1*i12xorCf
zkCVl4w{P>Nql?^7izyd$=Nu-a`VbwB%!b(-rJx>k$86cRJ1aMi;G)!9R5xSNnH4um
zHAHnwtyV=na6BEb;P8DrF3BfrwGJk6;P&rCnX{48c>gfMk^`VC&!lyH>u;nB??$u(
z@43(HH_72*RdlL=gx8lRkaqtAzCp>Hhhn3Z^@}JG8V?VnU+`;g^32?3tDxulJNMJ&
zAJN3TX4UG|*AMp>TkSU4eri-3aMt35I1jRM1{(hUA`uZ06Rk?bU%!6+^(8cBA5uq8
z?AugnHJ~f#)Qe2)GVb_@AF~4E<6=yia5}d17Pgn;lQUc-|GQKMu?MT33EZQ>8znvf
zGPtcDWZ)XqLS{~%T#pzwVXRKF6(cm<CRaCHiz1aFa;j)Ve){%YQuR#&KoJF1-C0KV
z*70p709{$e_QMj1)oplG+R*`^tdY~nu{{68+{EZj1GdC>$(5)Rotl)b+PHc7pYbbE
zK>SGL)7#Z)S+&&nwtED`?h8{ma4BT+F)k&Qr4hAgl49@@9LqOz>J<<t0xyUWo$r3L
zOcmjfvx_7X{r!iBw;qF>cr>j`ff@3QFKWw|n|ELXz4GVNX1<_ryCb^I_frbfczfKy
zOe+7me{+UX|Iw@dA<|}AYI7GnI<#?GoXCUXiwwgoYRxYfM*}9Zsp>qX%J?(trc=A|
zT)K7kC&^+70(oIkqU|8e%v&ukN^Ikf=WFO1S*uBgIGbIK(ZgMNr;sAYQiCi2!c80>
z{Zwwr0{Nlhzx*TP(IOdXNWBhGc8UShO1vDzshH-7PN&p~0vL!9w>J_o4&vmMePs~0
z*&iJyEv(IYL;0C<5T6v1{{+pp**MSZ;d9-`yggeA{St~%yKz-pFt9+KH*_ZBQb*1r
z?=>X&MP&-pAj4I)k&XDl%L^*|lrGn*ycY(3I9YDN5%f4QbMYK9*CU+{!$7IWsI-ZM
zny>zxlT~_!i2AWDHAbV9jgiC>SNpc5bBTt12TzR*X?p#}q>9J1Z?z_ReO@<KRoAmg
zzqmO2vmh949!B=n*c^$RH!~K8BFS&dxy_S#a@V=V_Kf=IS@@Xb<GZ8nPnnaJUIs$M
z+h?(&Kc7z9RIXy3Xk+p#swr2NHqYjxw_Tuea}#H=jXP}Hu=nK&I#IlrjZUS`T2;(S
zWuGcCqIer6Ri`mc0unNcF=OW7Cl*M|b7L)v#<R{t`M!yd4u+LV;^UC0Q(XnOd&^&f
z;xkV+NAmK8$OV#i@+k&_BzF9~#CgbNo=TG9)8ySH0nX}w<#Jc!4zf}k;j?!OMvmCB
zuPH{eKf{puIuPzwu9Rowd|J~WU2~pPHQ*>iQTkC+#gd&%?dQ{zH?SD=6ZgWlslEQ4
zAV#iOBd1ZAqVM_-(Jg2<-?(|2NVzR<WUl-Fg<$s60DT7REe%<)D84Lw*7>m9dfvqw
zEz`sU&kO({CDEE06q6vF5PS(^z33hy&=&kmDO{8z`D277^zdShjZKV#z+#9|6yCag
zakKW@&Ew6*Rl}#^4rBE_5whj!wI%-|7f$`)Z9fL$AMNNO&!&jGRf|Eb#qXZfdxOB+
zSW_fc7DK;9{2tez!}qoVQQ3Nbi3i1<T$O6qvn!`=B?y2T$itHBzqY@+#t!O|va$?Q
z->8|hIFf4_QD>22qJ%EA(X58Kb{yN1UtV6t<))4g*sip~L%Ul|A(bD9{r_%Ihw}5W
z$jP;ShuM>KgkqB%6*Bq;&KA6A<u*MhQsr+NZ$>J#e`!XqwpPxXHX!5kHCZZwL8`ah
zPni&gry+XF^$5Ad`)^~4wIy_1ZmBUuE{DQD)xQ-((&Jd10wP`ShG<-E@0bVImz(E@
zrnxNE#{|z*xjeB8(?`fCx`YGRtBBVWyvQXaCI%@&lBy&V#?JnVbB)ieUZ7#zB2Ee^
zZu)<kxm7!?!_vKio4k4P3<&j($#BZ=obta_n;iT=HOPk(xJJJho#ci3(I5ZOOI`(&
z!2Hh$k*Q-%P_2XAK+A|~2q@2RnN?H%xSG7O-%`}x@-j$l%YOOKn5X9yp%4!M^x|vg
zd)sUo?}yP)ML(UUEC*2Q%8$wveRCn~)UDGeJTt0?)1Ub5;V_cf^)5t8D*d@ixYYKI
z+JE)m7ZUA%Ur1eQjRBC83VP&<>7UNUVkyI;-Fx^BB8YYozRbeO;q~D=<d&_oJ+~J7
z?hpzw=p&{s^`swAm%_Cn)-8iFV&travFvq#$&zL{CR7W0SA)W%SLr-Qp4e|-_^|H=
z>^^cg-HS)?ZMVhm)NjHcIDBr;NT)H}EMB9D#X||vLAPH2{+=M<7D6CuPlCX3rT_*f
z&{DzfS<O%|x~c0@x?95(pYb)5q+)H(Ug@Ts$oE2nh>jKz0nomxg&I>><*X7Qq{6m3
zm9}|v8><rhyHnjLDJb4g&}4H${`$-S+<i=QL8%Ll>qGr`M(icR+o{t*KE3vaWzV8P
z(V6QDQ&!fxG1|1+Uo)+uLXef|lVGUb(7^T3<n3v(N<!~r_nYLM&b2v3odLW=3Z2L8
zAE@{FT82zq#4FJ1DNJ=lt^c*Ii!^qu@)9$ucj}sp`ho5@?u;B23J=1XH(U731012y
z@2tNq`~3pST99E8{Sl`u+QB(bi}1;yffy^Lj;7LOZ#R+bv>f^8=JT1oBX*aKkK4dD
zoI8qxPMK=L@c52J&Tv~LRDnB&Ao{2+1F|&-uvXqw22-5k#GV~rm}o~wFjxD2$<LqO
z%Wr>R!MA&gq3h(yC&(8#Z2vMDmWln>j-FOx>vHUlkdeu;S;1B7cBIuTY=paOvDLSh
z8$A_hiypBE%?{XBgU(o+2^F5A;QiH%Dr@xD$p!`-^M1>t^Vh)9V?>ENYW^&JHlm0j
zKx<t(v_bhuwN6tv8Ys_9JKx4^`PDvQ=EB?H7|8B%BjVfPjd4p-z9lnmaX`oYU8Q_J
z94+rSGK++qNl<&Uep<N)nl%UwC&6?*nZqk80!qtxiE&NF(8&=+HagPC*H_oMu992S
z!@)4eHUI|DEA-nw4yU|?xgGJEy#07#c9P2Z2!R;w_-a#u6^)Q7IVW$Mp>afvnVGQ%
z^XR0*mtIA}L#Kn*g~3sgJwUo7XdH&q73$SQMSbN!WdfJeWr1;5XWC77=)RU_vKg+u
z+izF%zi(2k3S;L)2L{B-x2*>`94j~B=lPwkI}WS^6}ok*Uv-iOZ72dS{%))|omDG;
zp&$s%!lF#eS(F>atr=^SM`xp_8_xp5=m4?O&ny{2e-Ox}z5r)k-qGtRs3_}<v$(T(
zUtXFe-H31PrnB*^=U(x0)MAe3<Z)~c->#=yZ|MrKj})eG=b>Ib6Qsg$rR|!}9TnBX
z)ib%sti4<`^yzeLAzdapt4otKtn9h$nrxR$rlWnCI%$)IbYhBL{abhr^B>{4N%S<-
z00?w}kUDNW>}^3KYksoPhjNJ-wLXy4vyN?iPcMuNA8Op#nxV*71BiIFzo3|<RUwYO
z3j<@H`ui}Z*oh2+Sg}&-;~n3UE!VStkbc&1{RF||x-flf%4c;&q4omgYUP19C~B{>
zwM=j})aG$}W0zt#j<|hl?dLgWp7a;)z6U0S&t94zlcBp<AmOoziej8FE#{S#p>%lP
zNSujusLfUq3%DOfZRS&@1W#t>ya|Re-2FpK`1!$RdM2jdK`HARyCt6E#RgQUk=W7!
zlgc`bA&(h@*V3zGmH0YshWu|lgMyEnt>&NpT}f}K=q;k%HuZ21Gdlf{1446Hm-!?E
z(sSvs7y9f%yUV<mSKq*^Htyd=zLNBKe_c1O0WG<8Y}Z&FA8IDbIu>bz%?^RQMt{qd
zY#CX@K?XUj8D(+#3t9R@;oe@@UFILWc0$m%Aj1h^&yc4n0W!jpID$-&V~>CN$6#@~
zF<o4=n5*Q)uDFpY*(f^}XxG=fG}fZa_q%9xk<9oyib|l-t8dd#_jK3QjCcMBhE28Q
zZpDDln#1lzVp1WjPo}CCMgu+YCa%ylA=SNVs}MgTXF@I+lrY-JSVPxdAx%DnV83V_
zD%##Imaa|p%uM4n5A{O%KFk`_+fUOa+IPu7q#2=hV~u~^1n0TvO(ih@28<L)v>U&J
zc9uw0p_HNyGx*1+ODCk@g8sO)tkpmW$wH!AI=Qzl6Tj2wc1x+a>Wy&U5tMs6?X)F$
zJ(uUYC9T~0PA11H{JJ5ZgnQ3ks6hD4V!HA$^e20^%%z9R`V~P7#C7rOH)MSYlX+GX
z6(}4G%VF*VI<Nad>gfJ<dyE6}oTg-6@kLs~n04kiWR;_pY=^XCF`T!1tce^iG~l>&
z-UljWyEr?m#u<MHX#pA79HO<r-^xK+44*y$4)S4u!xumoEd;OFno<{<{6}xNAghvU
znJ)m?M52LMav5lHli4>LTeDHW%ky6*eDGu|WU=aG7@0W(LBo?Jmx`0@PY9|V9(MXs
z;wySvQ8{?~OL=g#4@Pu_CBhkj@xjWmniWfmKM7ltDiFT#o>uqW9o<pRAIa5AvE!;g
zS~9MBURA<9P!j7eE%+#wS%tTO$2jHbzX+MP8ySN{WZtqL^bXL*vQJNr>l1xd+!jhT
zESJ6J4byn+GNiu`E}s!)1l?Plh+K;Vyu;C(>-Hms$R*f-<ov<w8m1Yr*iW>f>OGj>
zRV-5Fik<9^HRKXl_!~8B)UVJu63HGdxm-0Nt?ED*!kZ7Q#826$!RC<7ElKTuNsCBk
z!c}5q;s&Tycs6vmRAqiMs865!5_V!*qAahY!kfS7BZhQ(6`vEOF4S6LM=Kb0vfV*L
z?Nw0D#o0hU(SobtKS%y{Z;oeKx4pAtw$gf&#<}C&&g()44QQD9Fdz@itg_XP%=P})
z4*KRAhV~yAGU?M20<g|d*=P7HAQW1s`2OJmp2XzoX{L66tyHH8ChKjPGaE=7uw&9`
zf>U45r9GdBos<lE5F@n@u%jf((ARMf7ZL+UUY*~&6{yZOVvgc|7iBEXQ55Ofg=oa`
zR(lseQg|_6!djzC*IvmAYuSoMBtu;b19^Hg5BdvdL5j21kv@jK<G))A#kd~=C6l6I
z-<;|kPDFHd<+$u0MZL^a-NQxPhhoTe%fvySlv5ba>ONDS-8YyWi|5PhPj+<3lQuDp
zh&M%;LBp|#V43vu%GJk1`0YhvwyX1NKVOQc6pxn{;ty>!*BLY)ofPS`Uc77K%`HkQ
zZD}E7>%7OV>Ue!j8o^jM&q8DN$tm#ED^^Cne5)n7=RHNvBty>ht_8#7jbzjUqybwh
zqTPGL8wCtK&?tUNqx%)epw=TBRzBmD`vm;a4UJd?a%6JoPhFevS4w)_rz}}58ZjHC
z67lD^T)@&j+E5hEi>`P2r)TnALPM>vppAC_D6Ap*9KqOeqae1FGm{5~4AieMpR=qK
zh;mqg_Fn4g<4>*(Q%Ed@Y`HYL=2_-xyg;w27j7$*f|lLxyHvm_*idgb^-#%eLkfR0
z+v9EMRgUm`Az2r$=-t1@%G(eo;eRkcE7isVM+z|kZFjkf`wvn8D=T#CRXlGqSaxZF
z8*#bcv&$Cbn2^FrwxT#{kTsAep4d<D<JRhM=vJpkieuc|p4*mArSU^ME)<Q#6-e2!
zp+PdKbYUw}8>*eSY(nx~BxNHWiJldph6(3+?9_guf-ZG|Ljdn}RXeVKvWgys2WoHr
zAd^&BOLmA3>e4)iR!Zxb16y?ThQF0Us=r~t0%&x7@!1MSXppN>Vr}4l77|4#-YJy-
zHE=Cwkhr_0mG@FmgQif>dO_p~Y0#S!;IuR-5*AN+ZirGBYf*k3xd!v?Ka7V6e!irB
zu=InfPXF;j(TSQbu=Y2N6ta^8X8&4TQv1c$gl3l{9;>34b1EF1=F*|t-9=eorbC@o
zq0nq$7>`w_(2t+BA9JSGZnb%#9-A$KwXSSV{NN9Su>F=C@NK|o=9<BGi7fi!oU`$)
zkz#8dw0^~sHdRr!@iG9Kox%~lIU5q|EoshC@={%ZJHJo@K!50aNS6we9iC_~TF+4u
zkJoijvQ9HJ#{otiqNk^)s-qKz%GQoaKKhEJHugxN%S9M(H4><oVkeNC&77VcoHlD<
zpIVnBU}l9v6<e^xN)qfhKve7Y=0xWj5rJ|s^gDN>zf|LVPVfvwVobFB+jfmXU-EhT
zU;Nnf@BhYrk(l%wrr(nax|>%cMqFUEs7|kI*P)`RbI^78c$aexBm;jt)(#o)zLIIt
zMDmN3`LE4jcZaRoIX$t3nm#@a^OeYe<ep;ZwsM+M)+fJ7=ljXA!sLay7aKuU^v|-E
zVXQ?NpO>tbGJ&AYPc1hb(<U@>Kffkz|I#S;eYSO!p|gwOg{wL9#Q7&qsPhovSoCy{
z#|kZY1LG$@s$}j-7E*%^Az7Hh+MrxI#}H;*vR9wzLmck5cl_SfFC{0DMaG?ds7;0y
z3K&%}lkbFxu>2~M-;<;&oAhG0E#r1s(XsHR>GMSEcI;5ZddR(RzjxB-Hp*!ugPayB
zDSaj~Jt%KGYe^Lys1u#SLeqi^#6vdmsKEJ=pNb-X0)I>M)AnlhkW6_T-@!!?UDBDr
z4>bBRmgy-%_H<;-|9uQ1t|vXIU~H%QX!X9efn{BUXqLOV`$>E*7UPH`u{|&8aG3h{
z-8s9F23sjUJvvRO%Lp8a`gX&0aJcU2r;R1R7~Ev%-f=Rn9~-r<$u+9HKO6m_BIp`{
zqe(w!JX(0xU+8+3({|Z~S=?VW<*S++*6Pci=wyovt;nMl4^FnE*)(5q1?v_G@RoJ5
zsoXX*1ZFxbfud~F&B`91IMEvrpcX!xZ-8;y_U!t6F?;6JUX_k~nvgHie)p>Ada{Uz
zp%U<U<!o6Oe2WTvQvJUV$!&?-qOOkWyV!wjq+rrAJ8_%lxn?Q>w`4auQ{5r+;wp@|
z%$<7m@w<PlX3aQ6nLVD5iOFDI-7JopD^-?Lzi-IJ#=<Zs@-CQ2((&<pWpdt;YX_%x
z{vy;viF)J~AgMX3vi@(FLo`>?6gj1Ka_9n$;GU9IJN{$2_m&Cw0;>d)ZePT_a@b>L
z;8mv=0(ZrbHmu;{OQOUWz=VR52(?LCS|6Q-Bwb}mM#jc&f3edO<I%Q|n2g+bO&0Uv
z!;A1D61cSMB2NWBi&23y%|AwW8qV%1U6Rl-(m?7T4UMbmzQmc6$}hVwq0a*zM}Ssp
zIq`*~_1qUEGaZj*<^PZY=(}`B0^I(jdmG0LEPpb5W$C?=r><yeIMrwta2US3DSx-+
zQsiW5>O2I7sug!d8yZQFn6nx~eHhSeYscI?t}uorpL+DB&iZ$W{WtwmJxs}s&Q1Xu
zPm#0D4YxP(N)Th4nl*4xkN7Uwgu;Gv(bn1G8Zd9eD(7u18}4MyjZYXRQ>TurC_>K2
zQe6%EP5VCB_~(Y}i%a<xWqitT6M0WToz}XnQo$u;c#oThC*Ngn%=75P!*N&Fa%25R
z5V-k{iUj@QfkQW$TVbR!PVt3N&WP`m{L;wTW3AobyLeM6u8g|v%_r;5qd7Wq3}u1H
zy-O%e<O}vyjmwQCgyJd{SkxRB&sWo<`(2^`s|k4x`Y$%q=h$fxQtD#4jlWI3fGv@7
z`QWJZB_cO8c|540H>yKg1<Xx@T&hrT0urAoV4&W-#9CQcxN8~L{^D#|YYx5*;%>f*
z?(@9Pz}nYI3Eedzuy%W6@s-1VuL{8(t_#T)!oz+gaR!f>e^2hU-YyZ5Elr@pbv(^T
zj6KDJpRiQkhYtyZqeM=>w{bv8Vw%kxN_~$|79JBhbbRo~h!XrwLt*3+a=ab1S>Caw
zOAlH#Tpp4ALj{obFz6hQt_(eLI@1?j*RjL#Mc#7ZUJ6oNm3w3|^5jB}XGkx79Q`&r
z4K&yvACkOe!nu?L5#n74aHLL`+A;!DZDV*12MrLlVAN+Y2H$0m?4+_8qvwvN@<j}m
zAOxW1WOTr+RW5~=;ygmNY0gHKDu8jXc73-p^R75xn<-GmpJ0!;oSw7M*M{Ag$MqL3
z&Q(1?@J0-xE&!f^bv6G*LnxQehh<I?qi9Z!l_@DZst3XuAJ>gE;rmO*?|RnSiU7^Y
zfjfJ>GTvV;K+OG;L(Y`Wa`j@xJh_|@M^{I<HaBaMIuDmwLG;_mjsrE5^XK3vYgHg4
zS*uMjCmXZ02F2hw85+FPnXm_7yF`uoYUg{cDwlXlM6U0@*F{P5aHfC9<JR;U{mzDp
zM5Ro{DG`Td9}gYvxSqR_GBwKMSg0aEL^Hv3eT9*##CUlmR8h!M%z%4cPI%`;#ByzF
zXTW6|lVT=cSW(fSV32IwO6WJIr*DxpFOI_1X^ohefywV{FO+w~S~+0<9#STZv*~7t
z$THr==h4HN^J{8_7k&$bT8hjkt{(NN+PNEo)8O)NDZR>?#RWQkQe&mO`(}eo-+1qp
zrHLH_B2oUFf+lgaOcHhZH9^F;YDrO(VTq?UWd8eY7Cb*$#ex%wM|&qhXbdmGAV#aF
zf&%83pJ;t?d0)5=r221@G<q5j!afWw&(w@D)CwRDj;JrSvt@gETYQ{qt?4oks9*{G
zE$n!7={(%lVraA5T`WA?{Bm=~;Wx)bQt2S>A0v}EIGy}i&9s=P>F|!EGgYHMkA`-@
z%Z!Y}XJtWM-+M|NM0mDq`<dVEIdhk_XCZl-yJB)#c&E~|Gf`<PXJuV8Ut+cq&=o7j
z_ftkxCxqUzS{3*vWG}fxaCk_}?zHK3Z#$L+_aJ_5;S-;kIBZV;!zc)x71ti?#hTi%
zH)BLQ^f}j3B=t)I+BkkLu?AaSIc`T=EL=|APj{A{Hv`Tj1*u>=du8;w>b39MM&8JT
zXgkBb;~jtA0B3^h$7SG?`A$3UA(})ZI#TQ@B<?^8!yFhD=3ik*hZ;4PP58_@HTn13
z!cv&bI%4mOB4;MlDL6uK)#=ld(iJ<nT%I0s9da90I&k2O(|jY>EG$kBo_u}AxAmX&
zBfCx538FSo=)?%n5Q3mT{?_u^0Lt<us+xaG3RLo)?h~p;O(08f5dBOvnF+3Zu>Weu
zS6(e8raqyUTyZ$5KTB5ZR%_;YY?y9)fI+B<5d?u@^_ylkcu0|&`qlO;K*um$@|zEa
zh|iHawBz7MYgrQY@-{WF!smmFMa>{-0DSN#YeYA^rr(k4vbW9A+nUo>zsZm7XDd2Y
z6PsfSqmr=H$E>eK4em_6+$e&hINPQ~ny%`eviXsLIu3)KIY+v_XG`(#>cn<WHSv&_
z>ud!(9hWqU=K@HK9DYbp#%ibtYl?`{iUke6-|$LwKa(!G4u)7Q4ahJ)OZrxK=KTWf
z+(<YNAX3lcxt{z2tjE@~d#n5{eHIh*73(Z$_Foqsx9it@yJC24z6Q2*FyVRJHkP>t
z^Y%x-A%Aceiu^uBs^o{ft21Fx{3%1`mMJ(HX~tQdW-0ipU+VjI^89lDDI$3+wouG0
zBB-heUZ)r}wx#99_u9okH11h=uF-u%gIAdHDLX9Ioa$%02+!lRweNL-_C}20TOc&v
zu$5I`Uq2L!I^(*f-D+)3taICoj#lp&jA`oQ%y;F5*-{i^cb}%ew?$FPrOBs~9Wc@|
z)^6d=9y`6K^2cjnJnl-!PnzR#IMZH2+tRXS&COE7>ayDR|NGPgJy?q0+5hLe2N!5M
z6xBpa`q$ShCWl*62|psZOu0~zT}2{?i$OD*W*b_XKGJL#(2ZAaX8=B)(xW`rV24Tu
zs%rN5sAPx4<_6T8-s&^Rd!@yk`ulFo6?t0Cvbr>Qk0dYPuEN=biPxNbplA<P{z@Bu
z^E}Dcn^LHj(5j5Bb5$9SPZs;3E2a~Htvl~yM)MhIjt5bkqSjh`a(kmo())vJu|zLR
zA2+5S25LRAr@GNcr=DajzVGpd()Ns^UW?85E(XZY1Qm2PjU}JaBr(bLuAL6|)GUt9
z?|$a`B9%-a-ShRj4Xh!S^++tV<ilr?Y&-M6iB?G}z6nKkcZ*+HQZue4ll8{Ff?%}Q
zo^ewg4#eDm5&^MJ^dB46^%yN}eL7sf7C5;v^C{*a%?j1YN{n8OFzFsu)v3MMz|b~J
z%6^F54R_n<#Hc20$1z?_V0<A9&cwz76VrpjW8Q86nT|JXxqtc%5zV_a`aV2tPBi8|
zZzC+9Prpe6lXIa8^E$QBQHGDCa>5BIm%}f}^9EJkF89*e#Sa9c?`PxslpJ*m)g}z8
zLf{IOQZl+wtylwMMVeyC)IOCj4bGcS?~dLd8J{uUwb{q4emws_zpawPi<)2*F|QWg
zC<CIDx|~nzBak~xyJDa`$E><!4h-Q8^{uj&2Zpo?^PN<datcTWnqM~W7ZTn-3&zSQ
zcCA(TpP8R$5A8UeoaOe}#o8qyFPaM#ukw%_&^HByV7|AuR0&bQe3l-_Id0u+`Fl5?
zgp&EE&Z`uE=i7Jj;DJGiU!l#r50XXG+{udJaqZZwEmQz*K{=z!rP*ke*GswQgP~N_
z_^_i|JdBDg#*e539A<D9qdBAx%cc(0RwrHaF_5DHN-#<Jbye*5cVKOEw2)?TNms8k
zaf+;(N$|4DL?bMsfT1=8W5Z-Yrqk6ZFJLHvcK_r=iYGI9DdEwlyi{>LSO0FKu1V-e
z^_wYw<B5twe*800g%8pumZal~5|ZwIB@F8AQBC4)nQx{y0!!2@$^mz!fkQ^F^+r7Y
zsi@h5?|nzKtbNp@qlP|)$V++AJ!DNQUo6<3iE(^>WhJOo<NvYs6<kqoZQr6uiKMjj
zfP^$icMshl-3<cLCEYc2cMaX$-AL!qUD6Hjoco+R)_R|BFl+vM?<;;)xM_O}38IAt
zwha#Psl@yoV*rHhC8S+U?4)od!neVr^SF!2oaKya5%F+++(yEuWSw0v6{UMf(*Z4q
z47MMYcOdWFu2MhIX8!dmBlrJ+#U%OrRmR=epVM@oLBXVyX6(S6B5@yhsjcQxk7H8$
z@eN5X2N~x3D~j@#F1ct4<;KkHiqKuf7a6Z>ZK!#6tMR#!$MdR`yi$C(9z8>Bm2&4r
zjk|8Iqqi4Kvd~bRree8e22i`>n4HVsjaQEU4kIvQ_Mlw*6Y58bgT11`Mzy3z7u@V7
zqq>#lRk3$np82jezl)gA$+B!nws}8f^84;yevnsli50<k_Bb*mI4@2m8j#{%-m!3M
zHt~4^!ol<CU<7W@{-tusDIW5coml<=JbaXhjGmZrFc;?d#<BFg=f~eo#`NhmTH*sz
z*^_69y()buEjCO4LnLAF0Okz@8bV{(AKoQ;=7mb+v9JI1gwr7)CH2A0%`JMq;kO1@
z5m5u{V*P^dZXfFGdi2_iZ@ucr9HJW&{2n)fpq;s!pR4=2>-Z3XZe7NmifWAic90iV
z2-1u{4HHj%nDo=J=vT)$V81=hRmz2CbY{zp038^&-EpvSeb>uCG%!5oel?*8`b9ZZ
z(%!Dq`rQ5De2|~0k3fz(bGf3V%mJ@9HYobBE9YuqMMqlbU`-D+_)M>*LQKX1@&g~F
zsqM8|g5PplcZu*8C_eD$g0L7yGIRsWH0$Gzd@26#Z|z6whZU+(6UE57eEn*ce^MT)
zqsbyw!zL5=ZZxmexvnPN4cWc}s{l2)t#BUcdt>dMHjOk4p0Q;-i>Hh!630%FUE^tW
zEK_+g%5!pS+#j-oeD{o1|A{9HYNy)56WG@I-#u=WQY{e2Wgk3;G0~MGIa|*&1daFc
z_OPzDoiRQNC5qcP8<!eYaz%)bd;v7XdF|+9C%JlGvb0V1Wqqe<&up)2q^d{0n44JT
zc@=s=CdItIPOO`HyDLz#P@Bt2+}@HVORp2GHDZ6E*YNG?3U|mfGSgM^Q)Ygj<q<Cu
z{kwrynYF_}^Cz9$&-@|zVAQkcU^Pa)x@gPC{#4w}=iqfdOIzE4dTY(=+YQ{`u{iRV
z`@b(9jc5XB`Thug_1x9ax}3F?*VUyBi8iPLAff?hVux;siM%Br{GRS?ORCz)>DqLH
z-_&^eOY<YlOQ4Sn2fvYXbmaRnQv06CKQu~KAZQV?N!D1nLR^CAEq*xk#bGaZ;z>Eh
za+C@~4i>B|MX}{#B}2e>6ZYlL2)r73;>6K&0xRXo&&;^m=9h<~^C13b#4T$O7yed%
z#PmRngYCQI(hiHSzs?ZLC*()kTl3<vf54q-m7i`ZpCWEV+J9^h!EF*kR1$}dws&Hl
zFH}R|s>nzbp4*k0on}4C1$h6zZ$0CGZ~gBD;<~D;>@Epki|BaF$7c9En6miJPlCt7
zlR&+&PY58DY7bhWlbo_=D7w2mEA8~>#VDiY2N2Wi%15bEZwdFFWtER&Yu;)(D(d-(
ziKh{aHH(EPjzQb$zmRC88jS6DU5%i%QA*wZPM;nHnCZsb`|g2Fy?eMNbXB_kf#!$r
z^qCiR;hVKUMt*EH^RP>=h}mPw?NExRC+Ov9gsjoBpUge->zA5L;7m?Whbci^kY3LB
z4eyTk_@kCm@cSxAgbcoB;k+XoRddaDePADD5eaM5K|{p65gSGaK-!6ymXRWJvY!1s
zBt!<kLEY0@fAPBCki`TqyT@Ejbq9RV-lNc{uJAfJ`inqmH>;usY-)l)i0)4}tCC6$
zBv6g)9u1G|b|RvH=B36A4I}G$x0$s&SFMK2A==mD9%nsAavP+pGlx{S!d%R@f;3Jy
z3xNYeLU&}6q$Ii9FEcdo`nwl&7}Ff(%*I#qDe2mG-4&UAiQYAzG?%z`7P0~SDvLjF
zuhzF?W%~`I_#>k{H)E^6n-)PSX`#FWQ;v^t_EZTx&PA?6OIb}T%TbUf^|+AlXOGw~
zw{${cb@%OH+RY?x*H1_kTQEQh8C9P+!7vEruYY}MIKw0#M6|zKv2e52&vkZ(Gv;Py
zW+KH#09NitxZjy$<hyrz<XNx)d7Gic861W3_ub?lumHgAMcsGZbA!{oa%SLuX9o9o
z<D5=h4=nG^qh)vZJ)bo^wr))Sw6&<}lc<42f)Qkl-KS>?3<C=+p2PH#ap=C%onYHc
z#Q_X|EX^;&ll@6c8K`V+)eNKw!fKVl6ud3_3U`aU7~85Y$_)LqulHMxJK3|$F*+(S
zpj&Z147NJ9#+QM4sJkaoZ?|aJcDC}#23f$>g4Atc%*dVxFNQ`FdRAku`G)O`+Q*!D
zEDfZew0{V5@5xzu4=5PB%R))eZ`|UluyC6)!rt@xg+krM(C)RyODh>wPYOYjU$q*k
zDpLz<Yu5u`U+|!DB8bpz%lr!tw+3u<Ma^Uo+%0OwO6UaS0>I}rjoJ8IoLJT1F0UFe
znMB_4L8Nuyf{kmq7K1}a<m$lFA>z;DQ;`Za7*;0>K<oi`LgQ>UhN%oAdN~=m+6E$N
ze!z*+KUh*dP!KT;DwmsOtE-#6>q2dhdc3w{wteY(bXA*I9&*-SDHK@K69j=0pqH9C
z@ow)T3*lqR2o}By>?ljNgKO_&eF2N-X$EJz;47~Yn%TLFR!VjvjEZ;omhS!E6+Dmt
zW99un#XM#KyRORI2=nmJB1ZO>G$T0InI!C;r$%^D8Dsc2fG-&Kt*l7}*a>tY)M!aO
zgVkxIT-t>44HT6^BW!3B%dDLeTY2e5FnJ?g9t<`@*7e$BN@8wCY2d9^P05YDcar2^
zXOLpoTa85VxT5>;V<p_g{6UARd7=;!<_I&^fbktRi88D+Q*@Bif1p(Z0o?%UL}!8_
zFD;2od~5csp_p)5v+tNOSE^?a!?`Z9ga3)Y5Q7PD?WMi86tKqA4kK4)9nT%Zib0q;
zwtJP(1+^LqJJY(=9!=(+cYGSvsL4wMJ&SwtMBdz>9IrK?USD7H=@T-z>KB>^@C!YI
zL{B}n0KN#AO!l{t56QPW$4SVzbP$VhswlL1&YX*Wm_2(*ZR(0ecV1w$v$NyIMi8->
zsBwU2flv(cq`2YvW?xL~(9`=5b|YmC8{iVY(9D;s!bWHo_wW47ist6;!>KA#<Tf7}
z4z{eu>YbiWt1P~z@WI*gSny!ih6_1(=JUwO61!YI&`pW^Ia`I1#_)DMav1^%4ZWHu
zEmxXoQ>+#_T0(oJxVqWe>weuzz%s`Wh;)}jeus4Mc3{bsuLfM{%~ARzYzGO?doM53
z_p+C_VT*ru-KNdh7mu(=nDzL{w<+kx!bwdUAO5ZnK}Ry(Hb6XZLW%fY{G-Yq>+RFJ
zXQGYmC+Z`dAG}gc;e6zBS#~mYMKg~fd5cu_PBv?i85uT`3*veykc>^;$A1nGX3`t|
zzo)feG0mC&hd?-Uf5_5Os0cGPqMzrgABTa^JNs<$_kd5<tDX(X<tgqzDSB8{e)Sbc
zXBp)RTW}0Kf->kWKMX{X$q~JOKvhe#0~ADAccPws54kz@N>0k(ei~`vK2O%n=v|ge
ziI9>_j_5xGz*PtQB2W!MY3OgGEh{q;2#DHe%v89fU&A?VNBiNLbvM0R`KUIXvs1^q
z#?3rIxaqUb3%PcB7aVP*l|>fcdGl<(azARa(&3SMg-`PO7D%a7U0qRu8v8{q0fK(k
za{N4{*&ikuOPMUT-~ZmAii3+ARqq<ClEmad+3I{G!y2R{D=chgPuO*|q7BkWd7br7
zXE`SF+(T|^s7%Sp=JA%#L??3lBWML_MPy^EyQ#OL^b-|l=w7fB))eTtTQIacs_>3T
zoU0g+>A2&3dD`PQoG)K>v&xfK(4dZe#d^S!Bsz-0Y1kw#sUPvb=|0G{+dQ^Q;%-9B
zC7{W-l@=tfVYQK>@V=J)IpLb2>(XlB@inmnMSQv&k~Pq&bvJ~1)+#dpWvD`#IS}H*
zld-rE_^4*p6Ds2#Gqj^Xu}9LgN1i%HmK&AY7lyMzJMV#I%X{|Z?V6JbMY2mvhj*c5
z$7q_h>U&==xe(@eox(R%mvOfA?085r!i(sIH;Im|M=Y09LXB8&%-hK}&5W$ygRfl!
zB*?*U4h~O6yqh~d!!QSW@38!9lE<~td;51I0Y{Fnd6h7$DY{Oq6axE~fpfl8;&9xj
zWYx2i!=UIXa#2(9GbnHzYr9cuFwZ(a@v^P&GW<;%+~-&o4Ey<@FBWyM*kM2)cv*bc
zrOlvsU+`^48IT9VL~-DK8CB<UlmE?QKkc5wbzJ>k<D0I~B+WS^2d4^q$VT}oS_Yr*
z>pkyRKLm_@#mD*PNPCf_-~?=!ar+5VD>d6N8or`BBHT{i3ENK3k%p`q=gzoW$sxms
z$4B(2fj>T|TBM%jIisn2W2sTi&2H3fVz41v*V<G=p}rs1&QZ8&@wbQ2MTPu%wbg4~
z8v=qWnshR8Hyv|5xJ35d@s}>+F7XhTWM_%vTsqGCGbOu+*i5e4`Ocm`pt#v{+K+#J
z+8^NWGUa>ZTyfnaY<zZZFq{SB<ey2YsKhH^VaN?X9`55of0$1HyO9P1Wns3+v>E?^
z>3%&(9Hq2Pxu~|W;td@-SwIfu+0c$Sd0b9mr75aG@z=17Ulvj8!|>j)MJj-9mN|-p
zm|*gXwafbFHWv$R0wT@nP&)VKZAsc|K9Y<0=rLm^j-;;RWR~-x68?Z&od-S*-b;(D
z@^aZ5SIXF!vqU497Wj*z3fXLR8nIE)jH0O(yK=sg0z^5-IK}gzb-qyLE_+vhj!eaK
zQrE%gD5Wz2F$^vd+!#DJJSCT#e_jiw<4#zFzczcg$YQKqS92i<)>l=A150buIZxW@
z&tl)Ds4!$wTDk=g^e@p~fFHfzu5us%?*o50d@RpPbtrX2)u*kD$eaPB#+FK(UL<i;
z<FC2D68sn;XV{pKVjn(I+JSM!K3<rQV0eC@PHX>xM9+I7F^a1hC0&k25=NmFHW=^+
zfbs5UaP2R)hjLRi9Xz@|s)bYm*tk%f{3Y_Q`bP)CciVNJUa<nyt0s!CJVnVUB_pgK
zryHH`zwtbEJ838gLx`Oe*;8XcYElVl!ItIsG~*mcrPYF*p8Y>-Yisp-`ac$x7RBL|
zfy=w0wu!&4kLLBq)0&uJ=(~w0u92P;&}V8kV8v%RzlN{@yHV<fd&ywfWC*5S1S$6*
zG%;Bf?UsSOx%a-_H*5TT&>%y<<|VhsU@iI}yy-$H6_?(nFLt!?eCxa_%KI(x)1>#t
z&=;bC%$K__Pg}%MgJ87msD|NTAhkn6aN)L!JCtZzSAZqA9|0!oXP-5g^QRn5Uhz-f
zB4Elc7Na~>aywS|EKfT~gFdFji;dPnBUlp7QfDDZA-r;-4>?5HK;n4dS1AKrn`XNL
zVj1*J#rbtsmLg4cmi!!{b9D{HwVhIO`0}Qf2oUWas?LJ4oBfD;jT765q52j#l`jwd
z{bJOHVgNy&jL8Z$5jC!`;#^CGO2o-ugXrB9{5uuRm<V6xbML-A&L=R{>{5@BzwX7D
zISit2R8vmH-3p#7mQ65i!(&MGGBGm#O4RkjyTlQB$d%syZ!7cPN(2`}%#AMii=%%)
z4CG~Nir<$rERcjKE;prfX>klYsCQ3GsO;$?!x=NeCLA-$?DgkphL-u;ADwx!ul}Wn
zMY4T%r<>G`Q1_jwtYx4*2$6~KW-_!)z1|%4<+4|!@lUTgu8OWtmle8b6j79}$-vTj
z!os;)Wv85w84Nw9N&lpZMoto2N#@;{A6AVM!(#UPR)Vo~dNtc1n)ftUe7U&l9VH)b
z>DTC=KQuqU<<-WBdPM8ruXmFCrTr|aXvaTuf8CMDR}@A9f^@k~YNspRt}SBUpiA^(
z?(cK_vej{?vw3|cHZn#~*;T*A>E#xc<QG+u@mH~o#&b7w4DiBi@*oQE5KQr&2D{Dn
z1Q@v$DX3t%GEJHa`72Q}ClgnG(yenk=WD1C0%-ZjB7WTBBWgV3^EgUf6Hzh7Qf@ZV
zWAu}vcV$Qsi+oD_LO{kf&h_|t@#bVT44&BKjq{o(PKNi3Yi&cr$Z$23RRFl=11bY{
zJSVv!?G*$J4UQWxJDPdQ$_~P8lx*{cOX_VA=AFF?bq}U0MHRqdyVPJjmABPEk=Ft<
z5Wqstyvta5x8;*hm2FH}_va%KCo~wUAqGJR1;x*Tnuq5bgRw~2Qpj9n;_c6D?(~>#
zCKX?GX0<D=cYb~sPnWxd0k^tdoRG^5DaM@QgLo$fl}j1KNA@2w)^r8Z<}rq$4;-nq
zS#72Q9Tf^0_uP8)^S;z<LABS)tL7;sQiR=F0@qd;?M<KQ73ItBr{jQJV`)Ky?|QkM
zv*iVB<>Z?9@FzMh@cz~BAhR>VbpQ2e!TF(o942WvJh`hR><=fT#hj0G$?;!%$q>w|
zd9Mucm!@Bmf9Bbqu*eS*gl#POyiO{S2Ah`h>!)l5o}x_3{j6n%rHw=6ELy7xQ7Avc
zHqw>14L^x-6?8BQ)OY(vdn=t!V<hCw7&|bATGqd&yAs)u$@*dMYf5;3N}L9|qHpY1
z6~(g)*OmTF8(%V@y%?Rl-C6GY(=Y4HNvO=mI1pL2oAY*p2^v=n9`cY95wghfc4Q*m
z`M@BZ1s@g7+au4|*eQK61GT|W7~pZebaFVV_cr<6WYEip2y(H{KlOBep7%8#6zDE6
ztNSl4eP3}MAmlJPXKH+y&P?$42MCJ%V26t#{H~tZb9RG<$;4ijGvIFOjN^0$iI_|0
zuH4z7Gqbep$>6mHr5&7{#P`qE=J01uq?W9cVm=ldDL&{btEr6anORtXXfIMzQ<=QF
zU8K#;yY_c~+qbf@vPx6~f~%-BOb}DnwpSAiP#F1xo~^`Ykv1avU(nUGuhFT=MTYE3
zoSBmaKfCr?-4p3rPdc=pJ)b3(Iqu2w-0bHzzP>zGS}ig!76M}9ffPHqfK8HkMhFt`
zYsNTVZT+p@!FL%xVPjE6;wUWKS$V%IaxhbSF<dTzC1ZIN(#JZiq7q<sHjPi77g0(N
zh8=H$AqwZ=;Gg>=Bmc$Ua0mLXAhW5Wwl;>KcWr(Pi!uE-p1cdyh49?hk2w<(^zy2H
zXb1W!Dbr5^p3;hj*Vm35dui-j7b6S<8m5^MU^RM2Q77rOndP(Vn^uSrUflWCz%uMR
zUdJOJuP^k<inHwEB}UOo?%SCRZ{MQIie^pc;-^{goKZQdg%&B$mL5&<UtMn~#E0kR
zaXNUbIXgGC=S&sEEt>u_%=Nte4~P;s&|efWT_~4W0y1~BP8%(9hmRo|%?4*rY2}x@
zNth8apxxf4R4@wOwFQxTe5-w<K~?cNUiVb2O;zARci>^}9b;pbzw|mo8b7h8r+KMn
z2T@%en<8_dQPqvp&BjAZ!j|oXb(ePr2WH_|W^h4s9Ba@74sbVFhJ3vfa`ge{9xSHi
z#`2@3xdg=X{S6+5(J%e8<1ga=l2c|dXMq?afLUQgEoNWc=_NW^-VB|!z_}Y8SDv!^
z2Gv?j^SCi1CPxdXw)_c6%c~Dd_}dstH`4%77|R3?CiERbg(eN3JeGmM{fQkH#!aX(
zB()e?*M3xcLFja@6w;TD?>?<9*W2`jF_g!tAX(0p{`Q8@82e8h)RtaVg5Pc`-cao-
zJ0Ylzfh4si=P_y(5&J;rvrCy^p<rCnYO_{|EghZGbrt)^8WUntPZvt*v|uRyh1)A3
zuoG;uQc3vOEsTU1@TaoUe45hZ)qSn+%<GZ6catgL2@T{zgZ-iLCUvd1Xm@uW8nDjl
z%1qyO%)D5{Y;<33>~b;m<s9l@V$c&9v446BI`icb1`Wjl7?m$=4mHULZ=7!p$G(jL
zTu9d7?<Xbv&O<p4!L-+^KF!0hhv2K1a`0pW9)v&MElsKP%Vz&$boKX#qyliHbbD5m
z50Bde%f77X@5M}EwX<I@4k(@vT1j-DkbTv0w}H(1cV4&^c}7639r@zhvouceO*&go
zTF6cP2PU~p(;V=xz+Zb;H<Gx$@bSPCQCJve?~S)L7-EC3-*0d6Ny+^;N4CojgYnsr
z5F_?E<s9xS;(Tl~*u7iSZ;SA-NK}d&$%3e^s+#gwl8?sbx;k$Dc{_3b^L8o_rRIG5
z#`-O%Dw}9kTbub{A#+IITMo{UphP~}ohpPuZEiMp)|pnY2?w9{`=5Fp4?Pus$D%_=
zbb$31RzB)YZ<hZLE~U=hRc#50EmN8D@s~g1<-Jhl<F5+Olajk@>xS&YLU=YdHVFz0
zH@_?R`!3ytjY!jP8)IRbKOUYWr{w%WwIYFW$~mGO+kVTzcsHI+$N{|m(Xr9U<Wg^q
zdS)=y5hd34ybc(p3W8M2Z%xA%X6C|-Q*VK<zGK$fxP!a$=uuKps6dw~2NY!FVUhb7
z@y{W*I&Q_%21+?Evz<8Ye?)n177VLX$YL0Sv2&S)rW-topn|&Y`Suq_=~TYeQxOI{
zjD%_|lR{TXA1LP6de{BIW%~?ut2ke(%4?PDGsllN0S3SS6i*tGl(T=YVh~#8Y_%h3
z=hBIg1EZKNw-InVANNibW`5%}H<&_jheapf8Zf-rrhd4T?Fm0%*`7zlqy*-K+*HvR
zcSkdPs<bqvRV`PKgevK9Q2Fk%01gsFAz<w^_1}}riT$rF4;HN_-3^KEGOQn0@*6PE
zX<WX_8xLxZbIW~mI}_nRC$09lXTEQ5uv!c)FMn5EvF{p^1~BjsZ`%s32=sL5!*H9%
z`+2KyEs+`i(HzSFLv0RMsgS{WY86jyPCehI;3daS=v*lsC?qo#i;Rz63>XoCJxt?t
z_;Eq77TnN&UB<D|OHmP6#mQ8^Hn%)+mB7Y7(pj{dis>{tlYlMRZT4LfgSU*(bAJL$
zppT7$$|1S}d)RVDUuN9~gX;$?tShps@!K|&eLfbqTSqFstq1NRO2n@kUAaRRj35PC
zKe&G%Kf@$J<XQFTzqg%RjQ!MZ?mQMjmyio=o~udWqT=Fyz4Bm7dOmb$x%Gefy2HmS
zNptBf=pEREaVOYhKtMW+o^i5+-bOscb+Rw91%7q?)Ra~gnrh@s1U3B{<+aFIF@0{X
zyBlxlh-f)&*94KX&9XV=BpcaCAekx~ew0mNK{x%H<lhu4E}@GKMi`1^atOZnl~G5S
zohKg!b3JiBd4iiDqH#D}ykg8YxXII=PWcWC)eSfdR@PA9=dse!7Uu!}l34@jX$%N`
zj}*`f;47+#<UUpRSbs;{?cIK2%^dS$vE@Fm9W>#&@xiRLB34mRe%s+;$`hB{1ew15
zZq?<H8{%_+xkp?Zho)k8Y;M^Dm0;x|Pv=Ixyd(H#CGgt$>neu?u>jgRTx<va2#Ic5
z%Pm0DhOpWtnT9ynfXS#1t3(j5eM`SlNgmXPh5}i?v1T>7vQo;V1VgjA_4`Nhs&jHg
zLS7*{KOG%61;pX&t=A%<_>$h^jrBrDhjvEn1C73#B8TLQ&2yu(?iKyY&Cwc3jC8_L
zcj48ISerufV9@oAV4I8^9VJckp6BC@e$T^oHNGiyC_b-#kuKwQlDH=)s~8*z0=pP&
zH(`WHb`Ps0V@d=CAm#+1tL?gzGK)qLgN|rEeW;!&0n_ByF1ET}{+Js2vL#d4E{X3@
zXyiE75uO9_Dr~6e{9|*m`RMlebD^unsczGMD>Bhe&=Ult_^}mVXm~M*uW_)MZs|Xd
zQ6!DSnL*giP8={Hno{Bhuozdn{R_r@=qT?e&UBGf&Az@xT~Di-=;pnJsFlBBA6nDB
zE}8zTWn|Lo#QHaMx>F@%n`f>}T;Jo5xFyqLPTFyLdaP!z)qP@#ZUjqYGL_X?toP^9
z8}|6*6aQVgak^ZR7s=@*H{v(pauWwl)CV|wMOlj2p`qEO8dG9@Vs_J0g}bpcn*j&t
zph*1kCupjXGkrX(pk55PD=!5_ByL#<&O1Ztk~qC!A&kysvPo>%N&_?5s`!BfMiNzd
zi?kCbrnA1Z!oEY%jJ~}~$FkX){l{>Nq{y#+>e60vh!aH5O`51z2Evv&bEn5p=0N(w
za=aLyZ7JFpYT|*~CMwL)xMM<go6peGWzf0@lBzTsA_xQly!-A(_xQf#r`WvAR!pkv
z+EP|U+^XxUF~l~_>%NjdZSK8>;jx%*7P*S+?}lsO@|v)Uu|*}o!k|0Puqi7{&dySl
z5Dhj!jWkadT3s=rMp}WMkGHv5wqH63Ku`p#T9Za&qk@8z%opSIzO@Qky3xU4a2yc%
zONPV!SNp}%EA)^dAgIwgoIZpQoe0|X3+&|q;ae_-SS6uQ{B&k90W^(q;Q1D+!L!5L
zodi@-&=LW~C?tIWc^Hx!W1nhuG9QA1GhZJj;m>0;R~Tn*ALuS=={h=~33ju~0d6fo
z+c2Fm^(@n@h1{EhX*u>&9q(^$iM0>jTY(=RZrv;Od!!bcYOvC^(?Kg_P0ZlIK@$gP
z@+>~3on&|~Pwyv>v+sW7x~eqzA~5K*@hb6VR#qZVAlYOz$tO2TC;WXFw!uy5qT5r1
zYh6$`xm$~v?S$BI4e22)X1`pgv}bs9Ew1Fy@79L=GJ<Kbd1~0;KXTMC&zm_f$HT}1
z*MEN82l+FTbX)W1ydT}MC*DXU$5ccaPd<Z(W7&C#P8zj%iJ$n_NMp$HU*P9re`?uF
z1dRk>yPah4&N}_z7cjDt2L1?Y30+AMVxYo<Fg>;6j50mBLYtmHc-1&M*_Qu>2#<c`
zvvyf+)}!XylDV4sw!Ow@?<YH-5M5At)7ChJi`#+HT_%BT?>kf;lKd*F7>SpUMhUV*
zyC2KoE1lfoy>8W!So+xveqa4oXRO1U?w`pmt``C!iI8Cd@k2$&ZUTR((5Fsp@-+P5
znsLE3EV-yMwxGjYXWD!8^(t!xa3k&S6LyYAdYLagU1ZoCudIdLKm?IZE~oaj+`J}-
z{{YE-<U%f`o#Y>IX69!%pk8tPu6vnLmlGXtVhg43)wXQpZM`R#7u^Vm>oIwI<h*ZK
zl0Dk5=a%I)mB?c!RC%Uux6#QSy?Wp@@boC2j46IS;j`S(<K+dE7Exgt6Hm1i0HeUe
zG{ImCivBe98UX+ry1>1VPKMvM|6p$#Xc+1g-3y|S`cnu+X`$U~B0wlyO$BtpGw->_
zT{Qjp0}9%LewbTZ_d#tqDM$^`rLKtR6#XTT!J}0){wscCPtx)Me$hriQBkBre2*^{
ztuG&Sl3D#`qzm1da?D}dpHFNz42fSwvL+<n*i0`AXG{!+JeagSf48-rS~hljj4Ha{
z(S=dz4$ov1tbhLjr@0>e;IE7U$zPM|`AA8Tkxr8S>HziT3c0BB@MG_>I5`JS&0dlc
zBN|%Te4MGcA*IQMg<sGP*x&|TTn`$uoWx-cq8__R(JO|u7dE&nKm@i#aV=D<*4sn%
zH@e@u05f~QgYr7wXACw+of=`3xmtB;jCiIp=_90Ca2MaIO5XRTQNC@|GHsa@+3#7L
z|LF=sST+r4FRZd(7l41bcGfPyD2w^e8d>%~Yvf#>2R&t<QG{jvhj6@pusw4o)?0U!
zycoJT9u<NF|HxZ+6;s_0Gk)`LF>T4TeEY6uD~Di4EP5KFGdU1A*zdKY({NOH0S5hT
z3OP@An6lx=rR-@xtF0{OOS{H8TA^RZf&II4JunKof>8xvx=kC+4y2r%xY&*G-7oI<
zTSyZw2Wvo=XTr9aVsm;%))W@BvDHgL<znoQ0}>~ep{T*D<W9O%PGG8R%8*bGbkF3s
zaLleh3s@GGd4q3GVUB+<L&jN`+~Iz&X2vX2pG$7PQR$Qym5>qb_6mY#)gc;y;fhL1
z`f^0W{>9Puy<~_+G*Rd`H3+`rM#dwC;(#fTcKkY)7{rd&d+es+mlkNX|Jf|3%7hD2
z|0S9i15geiW80<}J8n3;aC_s6fXY=*wG#ogIgsSI9*9f89_74{`0RQ0+rIBL#$i_i
z6{X~G>wYgYc9sOYsDc(mo#r{tIW@T=1SN=yySJ3`ELQIrTdmd0JZMIXsAw(|B^R9?
z9K`2o#Tcb;GR1yk0*i+azd!4gpPmw&*z*uO7sg@`X-5lj-UzTAP%CeO6CX=upK)$f
zvDFP<$e3U5F(I!%PB+N~N8fcA8su6K#TRkg4T0uI(xe%}^ZLAC{qCqx&N)&BoDZz+
z7f=c_9w=8_wjwUv$#`Cy+JseoRrc3##%TD(O~ykA$Jo3?I$OW4CuU+B@7nKt9~SR^
zS%p#S%SddMT7pGz{nbnHn~jlCKJra5{NG#We#W=|p)m>f%oRn@DHY~qXA>n$i&2g(
zyR+;QjOMn}_y{pcBn-*%xHuTvOrMgp95QmK5Z$;r8yho|sbZAOXVHZ4uKF#^{-(_g
zLHNL&QqX%NFA%bM<Zb`1{ceY0s{$HTyY~8Wt6pUgpk;0|M5RKxWmHXS>+F5|W(nnL
zV~CBLVnb0|#Rr`Y3wKdIV)wx!ymZ>TyhKDs6eAuBF^}puAr5GTWZHyT?F)!Jm4PI7
z3<}EzL8OTe1RwbPATOm?MtGAA#`aM42^0|qK127uZFq3Ih$VY@d2;lb!m|8<U@@@>
z{18l84w%ABJGgP4OQ>@e|5|CIi%O-mt?vBt^ROxZ%<?^B?Y*!dY!6Pym9eYbyvNSS
z)aP^rB<8pTX2qLFN3x!nZ;D&A9J@soMvg%coH&H?$u-il(@Z|kW`Iv5=dSu94l8yM
zNI0N$pZb##|Ln}n!#Hsmr-)v$d^DmFs0N>1-`DB`4xN3USu+D2Vsw4|H}ki$Smdef
zwh6oY?l-3~1;+<JJFX0}@3Ib~hKFg^IAWO91H&3hS!sZ%F*&Tlg-3EJ9O!?Ap#SAG
z_u1jt4*rrTWTjEj)>?SQ8y?vk3AjJq(=KegcVK;k2LHU_Tgv&(W^x&mO80!@y~<_V
zFNC+-{+M#T3sr`{7iaV3WDsjl&$^^qn*Rc$k#~Vzmvk%6Ip(KLGuj6@FI*$b4i9^_
z{Q8^6z`TfSypK%ayX<pKxVq0K{~z{=i$5n~oyKg8Bo_IZ+VNVFxrm!Lxcnzv#H<+E
zf;OU%yixJji4T{CnJeudRkpOXeUKmV<sEmkL!Zs+YgMB|Y$i=ZM5OV(Zu4qDpKwQw
zn7m(j4#@2oN!}gO^4*cPzFyE)TFla{xSy^4`6G;K2(`GH%JczUiUiBs^Wd@5&}|<+
z3c<LyT!20?NuX@)emtNl$@E_(rjS}3iQBJwh{y20upH&A@7BSymK4RyI>PnB5;K0M
zf-y7C4$Z^mRBye5vVbxMqs*rZJC@ExB{e|j_cait3~ObdD?408pvsQy&ttoR4ag&L
zC%LybZo{e@EfKV~AG`{XP&0#jW2O{_!49@W$q&)3B*@+543FjY_1G*X(uqWjVc3Kb
z0oyx_j|kF99KS{1Xbc3ZB+fLeW~K_#`n$@7rlGdUmu)LrWA3(;mX*wE5<;bwJs|e9
z?N<KhW_T_XsNc2cLY-wIK+NfQCB%4wHwtQkeP@&uoJ2~D_Rv}YMuL{jL@z#(eQ39V
z$nnyP$!MW`N$Z-K>8tx-L6rpz#DYFEnSE~D;<mPP%N}k4K?hGQgn^$|Y_IBHbb02t
z+*(Miwvwt0?N-hQwlZ4I#H#C2IC)=)HETY68O0}LRC}NenQ2<dNIa1z#=l3GPBP0l
zNg=!6<4@oV9q>OAlSql&t!FNJ`+q$xBMJo6c-*cRMo{0Ak3-5B$yzYh+V7G$%ZZwN
zHA9D6JmznnD*2EUcYGd_hYgCRs9|8knpUSy+3Pt5G?*13MyagtahOWi7R`s-d-DP4
z6al)$3H*4P#BDBBR=RhaiGL<$OU@T^qc(@WWOn{F#H|TK>7{{laq@`~pv`k!|0wjS
zxYyKKWcf_NOV7GySr+3`B)8l{6yTha<A<`lFVw{$m|uWGVW9QPJ%-Ml+^B>+xr;g`
z=EBgZqiZLe@Yxf6lBP_#qZ3nMPU^PYnhDn$D*)m3one##G@DSp<n|Kk@teoQ<?4|K
zqF$>4+>2BRhP;|j7Yu<TbFbUgD}SIDOe94H!ZnEgQdvbuxos&)2t2}Xr5tBcDwp!_
z?Rc(=W2J2l0&&(#+<;w2aTj;TQ*DVKk6Gllj%&teDhOD1LSUgNtlfDZ&IU{7eQD`k
z77*_OoK^8kR*rY*PV>&b)N9E~8B0V=xN!f3wT&>hL9)kVoT4I5Tpx{Cgz~x_xR+n0
zEaE?kJG6)nBZMxdVlh#=7NK28<n#Mu{1n4rvKnszVK-ga`;EHq7peh`d&TQbE1`B$
z&GHV~^HomOMp*Hj?3AB11TLzxIV+TD=J}~#9RL5eIok&z+N*8W|3qMDQ=G^Z_U$aQ
zWPM2+s!+Jnjr^Ex8`s5LVK;+$4*e$EYsG_eT&(K3tEU-hW(hX}=}z8U15xyad@U^=
zl$O#%pc6k1VAelp8W_AenDA0{<NezugO{O1L}J`*B7;|vKFmmys!R4g%+w$cQLOGN
z7V_y{yci@!-@uA4t^k%h=JQW$GOoe2mf~VbZ`<j7=l<|y7DihLkH&ielko~ts(WCF
zHt5{-jqoi4iJ>oI@J;+5A3!mEs@r?|mM5g-H~GT|Ad8mENbVmeb!!6o5F8T=tVJ#C
zGq-u}bBGi}57ak<(dNk|sx?uN$UNl+iD;Rl|Ib?m<A!h%>y_rnT@Slf?a|D-H`(+7
zdmxaBGTY`t&)_9US<Tuy9l(qHRxUPgK;rqbN%-~(cle!`pzWIHM}t7z0ydLJ+cvh&
zA_PtiTcZ^woWN40V@JLTqRC|kH}V^wyz(U-KTGvzTpH@zU5API%lmTe7Gp<z*Y~R(
z_V6!9$DD2}pT=DKx$hBh$iJWg%y-g*L_4(znHk){kDtA%T)YZ9GYGbrZV{Eqc;4Fm
zO<&PNCja+>$d8G&HkB^!O|qxI;kxutVLIV~JRXSy!y4yXB_;57yc-d152Z*alHo?X
z^g@W|K#Dh@-*91`H#q&oa|$5|V^4-WHSqY=t`c{4C0q$|MY)I&-~sd3UZK+m<>08&
zbHE81#bmPGy8|Hh@HnlQQf#Jb7kA}e*!wN!GeA?c<W92L;%fi5nVD6z7Z#MLlr+Vx
zLfK<!0jBs(+D6mcF=mi0ZtHw_vgfAxf;4eX(e@kTl%WIUSBx~k+@{m&Qgz@BqiGTf
zxpduoExckUjjK3yd0)AuL5SJ?EmD=Df;Hd{lXOc&X=d9ucDysVAKh#wm7+<E#BU$E
zplMAxyAgJKobF&s$Y3V$slAa%w1z=OjmaI$99W-}HH#(fqr~+h@(vR8I(Cn!kbL=y
zO6L2<9G?>d2ReV;jXRgKJcWYnR$7jYTX&MEaaGiOJed4N<afV^bt>&FYsGsFGkI+;
zKXMDlOC#TVZh{u3w(kwd!u9^)5pj6@hZ@j7DR4m>S7eE}3|$Q*+t=|>#G8vgo<{0y
zhfz?R8<($Pktv_8>Wtb*WiPl>a|<t0SrPT9fBd>q{U-%Go11}W<RJYSWamTY?moH7
zP8I7d!UyH?A<)s$y=L$$#v*Do30OlfnAoXhnHlzG^i^m<s%Cz}TDL^xnH$#lJ=P@;
z|D5IyEw7|Paby)OlZZ4()IS@YSg@C<drJoX9<6aLlT<q&Sc165KD?84w@rmbn$Vgo
zO<7_n<t<Bg)*o)(59JE$FPimkA=cKN2-2sDf^#-?U5VumPiWf8p83OT_*lk^R!zLb
zjHLmwq9O=YHA?zP;3y`|o{oE>kjCX)c7t@)?munW70TL)uk33hgp7b4p;umy19yhL
zv5qGSI5@cN*7k}LVsBR)T0XZ^g@;z1Uxy{z{v{@1=hQR-PRGp>XqJ%Kb+Y>OCf)Rr
zfF8VNxIlZD2`$+*N~5~??^yN{<1zoBMinO=bWI=r*4{7%hFdET6w0QC2KI{?!Ldm6
z!rnN2%rYejdKd;E0p~^x*-ywgtrAh<YtgVnHe^q~4{(Fjy(G)@%$&%im2fs`5xIa8
z6^js3Pi7hrlZLh3DAPb(NkSID<V*PWVaLZHGez45$m#U*2_w&EogHQ*4bf^@+t&}m
zFZ)@7_VSSo;pg6Dr{EIQ{&yPw{pt%&4X{xrI`c9Qh;mKhBx442q3pa?{um#=ks3sX
zsq^?S<qkAIq3&zI!#z;^zC=QdZe!domq_{QjL@%FxTxyRSBS%-YP)^PM+8?ag|bGj
zFHsu7benC#ZeLo#syWj^SZp}dL;2A!JiCH$H*FEzFy^*w_OjxNaP={ULF(GcVgaQl
ziU;GYX&d9|Zh&7**pnB^@#m@ZpoO?ef9PjdAy=cKmK7079^rMU=1g4nuieqeLyYo>
z$9xsMbi-Yw5)n{{cU=Uvr~)HV(P_DLu{-}pl9|H)=fGD%177?QF_|p3C5{)Wlpdsi
z=EGNYn4*zeC{o4oRI7aRm&5N%+@6}*PNE4=)KQf3qG^>hwKe$Y1UIJcSStA%<;czb
z5z`)*4{3nVS*z(KTV$`;ja$i<`1i5_avP5xhh7Kd1txcD%MO=vyn=$t$2|waSJ5Cx
zB9uXgpq-vhWllkhv_tcgIjh1x`Imcaxp3JX!mM^Iv!+D|{0Y{VTz7N_T}nV+!0ik)
zf;xp;r8F<&FZ9;j$@WB02f)j_y3k=u{JlViJE@#}bBhvJ=kud(kR2C-U+@C<`NgIQ
zPfRU#45`R3G$|vzM!;BPz7eM*4Z48Ql58)$%E)zUCh>417CJ1##xQL~_nB=6A#^Gz
zeR}}i?0C{PYz?zd#KH!%*rihLwilsh=GFyQZI^#Vhq-KWkRjf%#$-_5dG8LG^twVm
zSJx1&{rU?2XZM<hwnhK<|J{YlTrXx_YHQYcbuevQ2TM`O+(h=B`yn5C-@vL#8d~{C
zJ@H$L%uV%H*jn68PPf3W622oL*wl2|JqMe<J5IbPL%I1kPRD2Qun6~7;m|a}-(fh3
zN15K;B!V_RF-iRI#qzr$`uM0bHMP~x-d9e1;lOa`9>yQ1FYK%D%Id%9MvI#0-hRC9
z%zzMS@Mf3mL{V%Ofx#%K<!UeiLcinTz8NqUC|{V>lcmyp#QDihuR>x>jALwgDgc{b
zplkr`U@}Oysaasr%mudRu-v$Tw)5-Pl3vJc<sl0snK9ZX;j!j-NNse}%a@FU4TWQ8
zLlc36`rtnc*8O@1j(^geyQ0~U`>ya<{y=Wq)l`wtB~bpvsBlwMr3a^C7XDGRK5bH0
zcW9E&RcYL_th?W}AIrZl7^Z$p>fpWp<9D<)0D!0nXa1t{e>6aT7#=Z0*$306S?a8x
zL?moXm)nV0x+q4Cl2V!#F%43huyq`m4d_|WXp?uNDTU&F*qyI|@OVuuYzHO>xn@qM
zvePSjB-584TUvfkXU1&H&?gQ+yB6rmDct_~GW>$q@hu*!H?CNBQZNiS+@<YH#PXF>
z2ZXP%fr2qSu3~0cS6|}gNmsvSao)&R2JWB)J%NIaNdQCLg7wfR8d#8b;J|?rh=vGJ
zyPPo{#En4gJtm_Lz(wXv7mb#e)u5`fBra6nQO}I}ya=F`VGZ~>v}3P`REkU$88t(|
z*@M~S{Hw5A9|o*^zh=+v3FSD6I5@B%J+x-bY?)5@@bR?iGtk7^QGA`1R8Ah*xN}Be
z*|qjsq7~lPzw~cXpz8YSaV?YbeAF$|g@B5eGqff?%f?m&rlGZ)AIScPfB!#g*la`M
z;Ux8mbnXFZD?BeG&D)zS`5CJaBAJ*kc6tZBn!Q0FM5T6@=TX1#nRH8zy*acjygd2}
zXNs<f6U+L#)C-A}QZr7AQw6lDYHuz+!V6A{aPNu+=dL1<3js1>_B97<8|GJe6A$Pn
z0a@7O(CG5zRoHfI8ro+OaP*!g8%4Cg&wZers-cV>>LjG5$WxR=h1raX@e6uf5Q5k;
zp<zbCCiFcvA@FWQx^hEirOaNcvb}ihx2eoM%0ZsWt22r8E$iu<&hT>HJs2In`rSmK
z$u%ZhX%6FE>z%)ldy|MbUe)U`7lo(=+U3(n=ne$O?sfblsK(UlK6Qq`Dsv;MoDVxP
zTzM)q@!fMq;Lm>b1P7v>{hQ?gcl>WU4%5$QWR$X6eln{d=nN~Bj9%P8gb7{D1hseZ
zfEDdn@I>Vi5yb<6vmOoe_il($(LA;6h^DSw93#8W^Q=ENRu4FUr`M(z3zZ}1uUXcY
zyJNKT?A-cj_&WkB7|zKN%qKNhPT>&Q$>rZO0dAJv9rN7&5L!HzGv-VmiKx2WmV#dA
zQ%BsA?@b-oHBF^Qt4dVS&L7#}iQo(*h)5uw-N<R_3%Nk@<xVX`mH72anj)*q%QvYp
zMcf3O_IcE=Tc1TrHZ?V!6OKlH2Q#zjw`K?`I`aFI8sdb8(R;DKKr0TOilQ><yxW`Q
zn``~0B(9zhu&4GsGG)D$d{|^0Ph-}6WE4N8spqGZ+t^=mM|Q(*uw|mIA0D_wE$GpH
z3NQq{|JQgLz5)9mSv3kuOv?Fmfy_W~LCpTqkuVRDxcJ1IC3kox$Df3u6l@BV$FJ^c
zr{GDCybxeg5h6pws7kO<>no<*W`so4+`DJ9BWZH<up!H6qhYA#V)*()3>^HCyI^nk
z_nK9tT&`r$n22v}CrL{Gfprd~|FDcGl9UB{bZa!E%Bfw|m^Fz4lPiqJrK{;{tD9D>
z0DYp{aIV<V;)s%(*9Lchrh~Jm&>}*l`<#*Fz_&hN{y=&ktX*XynS@WFr$}f`I4U^B
zuG-vu)^*<|8W|f9#oy9OFiB-BugI^-Gh{{p4$~|!Kb|};k6iCSuOXc413|)F8HCRV
z!Qe5XuvJ0zwoJ2uC_Wxb0@b9->e6d8V^R-;q@E-m)02<0`^VcA?cq;6YL5|fZ37S9
z;%Ld%grW|v!otE$?O9;<{}5SA|69Df^kruHp|aU2%dEmef)J6<?-qH!b5A94%1Xv1
zZwD}jAn6a~Q0>-#?*zNXm;Q($wpZIICOZd_1BJ#K5>};S4l<{KPw6M-S09b?`#qub
zGpI2UrEHpdxvpv(lBX15?Yz~5OZ{(cC5&cS+u7Y)Ww0JPN!)Mxq&*Tce~Bo;OIq{!
z?H?{>>kWh1f5z$KwM@3ZlfYo8oTF#tIldk*Hf+z9FdHo2h#)kE${4wL+QuoBhy-)>
zf1OdD&uT6};$3YE?n_I5d>q+z4{<4ZgGthZ_32HA4=Eu|Fc@r+=6S>EveAd5prKJb
z5&M?GYB4BGHY3|VkF&5v-Fkx(@7=EbZ6o?O=grKKvNfcXOR1jLghaT8^7-Y=D*n84
zKGX3udrv`t-IpNPf1kyF|Bqc993l@iGjnqWbES(@?0y*XeFlijH@D6CrLDT2Q>tEz
zG#zuTul_c2XwKDRUl?tP!A+wsLk<4n%Viev9__!Vl?wE#A;WstmMdpJr{jJV3`d+W
z(#QsflWp#Zww1A-`S6kBm6W+H=Qhye#*+l4dZ4Qe19F{kaX<g)laxgL1?4eH{xbV6
zkan*lj@CM**6oaPvHC|<sP7Zv*K3IpcG9B$UQ>PY6+<Ax#)W**?*Ymfk`z^Y?Pc7O
zm@KdD0K*=FZG{=kx*qew%t)Z8hrBc;rd{jGT)<6+VDDDsN)|R3YnsF-1n`~1#NJDj
zj{cMMg)mkB-rS-JUXzDH>}*i~X+ICYzK{l4OPdz|KT~Nd<bTeW53&P!eg+g`H^V>>
zn<}p3{rI48=kcLinwM1$qV6y{z2Q-3uaE7^iQ=fydJ)lPq^|xUey52FvAw2k0wQfM
zI9)hFRY)Lbx-gh+Cjs464CZ+{t0e-6X0nQlibQ~vu2ROb#L7ENte>PrC#w26LW+q<
zhE-UN?OIc}FSWEC_-Z0+f?{5Ttz{wrR8sjMdlVm^F6kys+2rRT+;$R!$Cx5QXxaxA
z?ZyR^ln~l7jc2twA7sR{8!3s-nAmbCva%e&$q+Vppc3<KrnE}$MMoYkoFZ9**!c4O
z@fjX#9<mfZ`1&r>vG>^ixiVeY=U*kU|Hr%k?CRm+LGX)&bv+8=V>Pi&fcWad8q{PD
z1<Bn&+@<gQ-!CYMqEJa!s?~i0$b~o)4Q%M*j0c?BrOn1QMy-ufTA-RNp#JYY<*sVI
zE?;|3q35ay;jL&PqxT3Dz@ftaKi!OPbCj8%bQFiS1r_n(_tYxh<3c3J`g_dGOg0yg
z+?RE}E6r@O1}G~Jp<b7dG6_zos;L#Ck)(L7ax5+1Cbk%ZI>1}e_&1FV7KYP<F-g$a
zB>SecxaMJ;P$+|lVhAlvd2W5Q<{LpyHTI3xsfWq24bZg9vq)+W3Ak>V!o84=k9N;i
zo|#p`Ps>}hd7cCy6leWra5z)E^Poo<1oO|mf%~5~yjIJ@as~y8Uy#K}42m$IlcXPf
zePHef>+4fE>U*$dan9BAsS0a6mlO}Y0c+M;hn5ST^ZrO6=N>>3w;vhL#>*V=7yR|}
z`ewvE|5>pZU^1SfQ7%{S=eUK+CZhW5(}(xSC@4a`EB2O9C4!)vCF$g_)dz?URS_16
zSX$pFRJ0wZG!KTaQK+bkIhBMd*!Ig;u9C!t=NyMehgz`6eXeq9IKV!G89&AM5_CZ`
zl>^gMTbI>l8$zi9xh|{i74zk+_LziXj7aPsOx64vdD3`#hKRgK9h#0T*U>N~dJWCE
zC!-)fX`eOkwNRi$#(^Xz!;$MQN|bm17)E^j57+TCk51&$0uLAuO8sJ15F0AI62N};
z6C(q%&~hu|pbSvWpCzuxXCNu%C=Q{IHAL;cK;q*tZ-(8PJ0M*=4>j*Eb)+sh3uH2N
z%K2Z0NbLr*X%1~YFE$2us!j4iG1mEcU-5W|d3>uY>%+v?>vE&62i06Rb?R!Xz=Et}
z+5%+0HsbI@Z;D}qgZmhh@I**c-jK4~<D(SoqmtF@hA!!Mb&EPVevVmgLCxFoFjw0%
zx9Jv&C;K@<j5MKjs(exm$iU{B^FIo6Z^gT<ca>wWZfb31CnMY&PuD!X|KO%MqW|~M
zXxR8)tlm$2n`SY=T#3nkTY{Qcbf^$2z#D%_qmIuJiea+z+#O7I;YAgSn4I16<U{Os
zl$A0bN&kg;@j{jSWvAJ{O3@oSXhI`aS2|{h!(TB)+*IRgG3@CtZOP}LsIO2Y0y$^*
zCL@p7keV2q#1}3`?5I>PK*}rC4zm!V-Po1PAGeL7+(Gw8fM0%jd*N#=V)NmL3*bX6
z(^mnXCN7I0=);@^m8g%Oh%o=mXW1`2<l8{QC1XV5#qxl0XlkID<lcR9a1}UCUD6Qs
zyp-bRw)TzPy}^{zQartP-nahpf1P<E_ndDat51@M8nk0!6dyhPTziixPTu;2d2d|9
zDPU-~`)dTxML8Q+8D!X~#NsLn>KHn1g)V9dS}ac!D&{mpJsqJm=eVONw$B(rpK}n=
zcqzlKGPKLblwmNOl7fR<7|nbJ29eM<j>*@{e@>0kP~bhE>aUA5$#3FCKE(rrVO6Al
zUz(@v;$w<jneR|^fIce*y;l{rPUA4gz{kfAKWtY=_I#&t6+No_)g%fNig$|&yrC5q
z3SMWTP<|y?{v^I?Gq#h0(E`U}Hbif;v>ISUMmewy%>nrV#UK*hZ?4^rcF_LW53Kx8
z3CQKOFl0^^@+71f3I`&Q37ExKqLGm#8kavhmO=Yh8#WwCgZ*b0oEM~#;Q24vIm1;h
zvDQMIK?3x;0@?D_yrSTel9B88@#sH)NPM;ro~xeHQ|0C8g=;$lgYC~+(l(l~n=3>m
zqF3VnoYFoK!Czp0%npzp#~Et~6Ak9LR_@O@cUf`v23&uGorvWKn$h>sRv=I+{$yck
zxw8;6EBv6fxM~YpE^k^1AD5W=?jVIjBP{4J_9zsh$ADKpy0&{;EP|YRd!=XV+!1#)
zY*M3MsRsjv2NX^hGk53zJy81oM}h1IkLQKzZ=DCQoF1g)?vl0_#+x!g9o$A*_U?M<
z6t(P(f38z&`#{lP@}kQ^;lt{0Hd3<ZpQ~}Um_ZvC?q6v>BSl1FEbtt?8_lteHe_@K
zl>-kM#bNDs0|daME>k)i#-fW8t$|x9T6H!+J#(0iil$P`x5uLX-up#`=MnI?jZ?Lx
zvvmk4#XWCZs6~3d%_*ymfH|n4rj0%n9}mJQY>UQsED%AMwcYHAC3Xj+I|(YW6C#9O
z<>M(MY|F3Yfjg-;c<~-a|BtPAiq5oKx<EVb*tTukwrzH7t7F?{$L`p+I<{>)Id6aa
z+y5SCoOAhHK2>Ygs+u)xmVXZY_U}1)?6C&^-kSffmIg$uFGezaerbhW9Fs7p6xk7U
z@V9Z$;rDedkn^c}OS&=wi;Q+8k&Q#H+}BoeJ1epdReaEgt_adIC#OMgBE@QYicH;Y
zz)vcmH`Y~DKnDf}h7ImMzWs{B0N#0k+7Tg>l;iw)6u(&i%sVLwx`tTR8WNCg+%!4O
z`b6bPx-NV*$cSdhKvJ4Pi`=FPUkRwVu|DM(%1b5K6rRc4{2D_Q0dp+V2d)c=#E>P)
zk(ygNbR^-+nWM&ohn*5b#<!nXSf>s{nC2;7m#`Fje*cb1+<1ch@9l<{dKPaZBQKhl
z^M7m~NADfm?bAc7Y~_I7(LT8BSv}N+s{tD+wD=qsj^C(<M;((gGuGxyrCvh6&x3>u
z7lvz8#GX50aeQrm@I;tjT)^8m{msN*QD-qg?15xa&G;?7C0cWpKO=J)K@bOTJ?J}d
zh-}ZU$4B~I&MCPpSxsoq&m@i_IA{~akQrGL0Iw9WH*WL@6;gOGcSt#!JRFK}oBR{!
zR;0lam{mT?i&(|U=67?#`$CAW?s8X+I1<5%H8?an&EN6zG2SO-Pwf5wzXK~?u)d`T
zR{pH8|4T_lGT#GMAn2n(dQs%g2SlH3a<h76=yZy+--k~}+)A&(0=BHBRvmxt2m}P=
z;59%B{FH+Pj#GpQGrd=EANrDr%yVnOlvhB3tZ7Uc@(=cKV+|R#qKM2hG*i&qXJzTr
zrEvwECjN^_RTQnr`}b*%gg@E^=RQY&|1wD-<UE41j>vpFft!eRQrf^GM<7_q`zXHm
zHaMRxsP1TD$;AJ2ppEV1K!hK8$8GcFh??voza>_m_unMrfBIW+cu6{Pq8Br3YsPBI
z-_sc?BuI5an!)Fx5GNmX6>My5u$|`a*RwsDpCDP-;RCkvwB{<$u#$;U%Se#ITP9=T
zWRx%wFb6<K@-YkZM-Ck+GVp-pfK??DkB(a)UuCEpYOqDuKtyD5th!V$VzlB8S0}YZ
z>_&|=Rh6rSdH-lEKC#dR*F)tt%`y*<lZP?mD8Z2TiS7erEKm)!jNiQ6sq?d1*ZE^`
z>bcy#bhZ{ZGkY888}o@UQ}-%cJy1UPXzeJUB=)`PleTF7e}2yRK@GL3PJ?1wKs*${
zGuWpkRj;5{mf8tT_)cs@EU+=~k$p&yr-*DHAGx$(lCDHrkfy&jY9N5bD&jx$<h;ep
z+lg^ZuMNhOF1#BjOhTzTa#ZXco19ksHAi)$B8mV+L}WDHt_vzw|LVjz0;-EoUFSX#
zBRomEKxSRg-zeL{I~y#O;GQe6l{RiRn;$D}%-X?7SBh2K)rB`|!c^XV9OA`U1efWD
zFaC+WQu=Hkb|S)K22r&1TPJ(m=dR;0dpsM73{fH8BpN8R$7%Y2#f`uF2mdOU=K(LG
zhtD5La>K()&4Zj5-%i|Z_5TLhub;#J0-_uoGU2Of<43c^)B;ibjYtkZe`O^7V1P6B
zXln-Um$8IQt!rJ=Skfmnx+ph`B%D5w>u!y;x5i)B`%YRFbgBZJ3>nxWNrJT8?iOop
z$`JY23a0ZzLUk5M1hvM}BT~f?ggJV79qX#su7Tei@N3AtgOMKfl$}cZiFcW(42>uT
z24_6Bzrh{LA|<Nvqd=wc6pL=*yi5}red7lFIP}c7uzQv<bST#jB^Q0BbbDz%NJNB&
zKHdDHU=`K$0~sn#BXytela<c56HkZBlc-Ye&x5!TZZSQg=(;>f=3SBc-2b{A=6{JZ
z-ms|6db>G17k7Jc%})|kDrJlE3X!t?WI9D$#|7qR9XOp_N=~+~R+<%pw+4WwWHmGt
zce?nKx_YvJ3)lv`iBe0q-?xp8je}QXuFwI(P>Jv+qq^;c5T>HlJ}Ln{U3Y*r7j9Be
zTg}FGT9ax}3Z1q_X4W0>#WDbsb8Dbs3M91|Vk{}`rbGg5fB%xDmq0KeA7bLu$LnC7
zuHtQ%QKdMcDJqZY1zh%AIBhGCnjhv+*geeZ2pS+#wXzcIXS-J8mn%S)IS5!`7tWsR
zW!rkRk=IQA()jP#_0<3I<@UC}e6?^I`%`GOXI4A}$c9T#jZJh>vC5SJQ&wPdkl^!0
zsrD}z6r1>TiB86uhs;uLNcNXhNbDU*w2Q6BTq2$-#k&@j6)7fRad-qE8r`<Kt$dsj
zU)4PO3aE{B4GqeESETHQ2*{<CFjP3RLVJ|%-N!b;LW%$-<f9vRAtc-KiDU#qa}~a&
zATNy8{aPL+4QzH>5kJ3fqMxP%ALqm|6icaZ4=IOnTr>i=Avd+rAg|sQaTY_);=lG5
zP$lPBH*^R0X>S=09btQ!94;++thAqXE>qTsTKfP)Z80)z^c70==`?gL+x&{k+S->M
zUzN?iz8C*;b>8^5|1*ZdfFV3A(kW^tqp#5l{Njx#G@w9ZnKrKzxjIG?q2xG1Ep1BH
zaUPV;J!_iD)4u(nqwugDJj@T&bypS&&8%!qYalm-jG?Pf8jh_+s!x+rYkU;r=)*L4
zjy{whcv>1w0%5A6q2Yp_p|gM|;~(bVB0S)0xE6JhE(0#Kl6pyuhRoz})|P<QA-DOd
zqkQhH5{uB%-7Ht{`9MYKQ7kp4s#3%N*qiL=)2eEx`8Vk(EMz-$^eB3JB?%WZCc}))
zuOll{c?$n_E6jYfoHrI*+luqqiqq@lL50{K^T<b|+l-xD7F2nO#aa$|<-OEC#%m>J
z=eMms_0MHDZVCKfZq+~QSrNNxcrb=e@*<d59;>-0?vDnucGyT)Ap9}$x)QL)u|)56
zkUa00tL9!q%JbG!r76Efw%Ze=*w|DAjag8mQ&+E(8})7609T3tK2U-=wyWzmwQta`
z(IQ(0pxaabqLRn+l|aD4F@j`Anc<VR&dyFi_`eUtt;lfW&|o}UA>+{_6#CG^I3k~W
zD#`I2Gj)|S837b{4CYhoj?G=c!l$*pQKiu$IKL*Th^jy-?KISrSt{O=I2Rz;IdM5s
z#h=$_uHaIg^O;gh?m1t3(X}1&+yvADU|?XjC++yqoeoo?&-{*UXuBQ%trl_rS1sbC
zh}fK;T@0=^TE$5fN1^tGbC^Y0B~b_A);L*_*7BbmB)9)T5$d<es_=+$!p>czx+xEe
z`1OL0<0U7$1W-58s~#aAK!!YD?!pE6FjZATv$w!uqBv8a3u-SHZXhNbv*9_vyG7DW
z8GV-J|KilrcFPb6a-c2m(`dHE{d{chZo8D#m9#^|rs_p}?nxQTqMkB#|9m;B1CYHw
zw2~hYTXoRHaa~ZvVlkDg`SrKsxUB6>=7#{<ss$x$*KSm&y(=2p;g-C<tX__8RIfqI
z`TYm5NNlNAi|e#JH&*9Y@3wifmgku>M<<V6FrS~ht|uTu^{%5PP*+}CrotYJ`gdn$
z{~%2c9RB}17s4b!w|}J1>a3RNNRS{UJrx41$Bw!7BSYSk6*clnavKqH;qu)BXTB;y
zGp{{EDUj6c6NWRgm6e(M`fkK)ksWP2JrcSy{^&$X{WynCFWp>eLtbmPqhF#IcLW${
zq@UpuZZIeuc|I)h6F)E=hRtquKYA#R8I<uy1ZTr5e2j)nwanMnS1aPy$E6FPGuC80
z6`^UF`}{n7v;FZzC`NWbbjU0SV7#-$`s>7%XT2;GfZ4Skm<@jQFH7i=l;rw~wRVxD
z=c)cJ%SPDE)#l;6Rv!t-4`2yNVZ|2^fsj%^C96F&8@-sM<5lc30A!yq>0G3OQ4?t-
z(911Y5|4*tem6sPuh^tLES!n$W#ic1(UL5sOU=>ucRt^P{{$5{h<_O)Lubgpy)#H`
zch^zB)Z%!?`bu%tDm8wPX@T7i5|PDL50}15&3y%KCs#Qp4E5=pRJ6J(nnY}K&Ku`d
zXo`eUo7?2*Ynq%N>SQH<IbR4V_O~D|yz;8&=WRL348+Nm+}w_5jz3Ha!Nm$gWdoY>
zO){+INi2bB4NB#1n;xMzu|dn!FXjQ=0YPB`TuZUO*FHKQW%81kG+Mk@U>nl%^7M3V
z$3*Mbd-&rTzfOsz*+!~Aub1PWk1=<yBX4c*&v;))h+6<W9|dJ)<Jj~7KDNwE@xSZU
zX`d7_Cx$RSF>0Dqj$eFQKX?(>_rw>+s9?;e;L^ugCkxoJUNoSwxcgWeyp9~tkev0H
z46ZOI_BKtm<5`BOU;K1@Ur-&_lY8xY50Cz}8uI^H4WwwzF=i705BD>uk<`p$13H}Z
zYv_g~d0=h}RuSySRb-Z-#nQP<iNiuzdH9SDBvgrviOvdYuizfoEi4r{j>1m3d1?-&
zkw252-pZx=`h=8YSi6*zYVxUqQ|h8AP^2AA`7pn#0o#CdwiG0LCE((P!Q-bMpwVdi
z2Er5LrjIV3^mTQk0a{NO&0mkr5Q6>|Kn`Xq$cjiQMRR<gvlZ7b(|&qt$fQW4{!SQ>
z`v8m>(=YeaPkk@oZmK_$T7AqCfk;R~X#5~Ik5j!_XqoJ3!V!_n_UQ2fa8~)ra+Q6^
zh$y#S7w;I17b_j%pE;r;u!gROc`#H7@|WvPBPF*n>o))Bn5%9401%gfB27YQ9g3$8
z2v=>p91$Q?%RqB<mO>_NvL#6O08=Aryk2Z{?rUpfyymH!wns~o|Ah2Cd!T<yES%Tw
zimi%fQ%^4eyWIJ;bkEGf=5$Z(qGsraM_LS%kw8!G$o31?{u4!Pc%0*&F;wcf^3u2p
zALJX3!{(?YNnJbFahnH1gy(GgD~t4Pu6q8%Q}@XRF1^`sbfE`xg>p%hc#j8-y)Ljr
z8OwT8T>!gqu|`|H+RozP9_3%#0v5Dz+)XeuFr+E&3XF^uPy0MFyML}6k^DqVS`X$=
zNX7^x;oQ9eRin|5`Qmt*Y`Gc2Hhlo|`Bk7nLzp_*%2#N$IKQ~l3xVH<X`U4W@3RfX
z^ENTZ<RB9yMw7#UH1lYaUf72N!ua9m@bSv%vz2<E<}=K_83Uk~7nYBWTA@RE{B6mT
z^Sy-U-|uzeNQJ@@`9zI;^8v6#B_urrU{Oaw0jdO;3qC?gxWwh%iM@fPPOXBgnobVe
zCrPbYG#TKIVDAqvw6FM(L-Y|cWQD_T+%q#X3YVN;1<f|^ZU4z5aO5OW|MQ}Rl4U$R
znq!C+--Xojo1%xmyGz)0&#qBi_Nk*jcyd!(hN{wcQGD<xgcp(Uip{GU9kzhaef9ez
z#H_0*=&h7Q6i^NXOK*)4GP5vyn7v(Nsn=5=klvWR`hPbKuBV(UK#PupA3294j*}XQ
z9&qAe1VFA_FEDV4!r;?qHVl@b@ZQ(L7S^Sy^_($;9$;K>IDoXb6Iq_`rX{HoD<CVT
zvYKEw@Nr{qF{H-(B$DIkyy1F+c^Ux933_^#GOqD65KK;&02rFieyb_F_2uFKET>p}
zn6~*{ihp{=y}`FS_v0SC^5e+TqyaPV`)rMAJT4liP=b0kF7ERcwr@bggRxqbR`hCy
z7HL<oZzquVb3gu&;@x4YS7oE8SA_6MZEu|-cG;`(*QYBdnUtr%!h(uHA7G}A5+W8t
z8G*%=F4e^+qgiMme$p|sC=)bd7gux>f7)&{_JNzL=*1&np$9<Dz0Q%|)V{?0k@u0H
z&-$Niz8@0u68Ik{z)8+ndNNV?6n8<T9$$cBED%pSxOGu+$k{0uy1KvL3<E$PQzXt@
zdc&b-L<`%}Ki%|wH!Ig^7$O3sR9P<1<!T-3WaET_EREOwPL#5d9py5|(YT7yZKqK8
z@MiHcWVL`bWq+S}Wi71&xSUZ##}R*-m@+7mq~F>t7KnV0b+J3xTkmLMEc0u1f=U{1
zPglcWfYG9_rxW?TziMDZh{QznYE-Cowij6MpO0$}?VA8LGi3#zrKP3r&$Q_y1_p+(
zM0q|)z_<WB!&7PD^=w7;fKBrU765dYP%WAms3oJ01x&l=Crh~lsJ=I`;`qrGYvz*~
z!Gq%X(VR|4Mt}B46AUnMFya_r`=F^0IM&--r~wG>0k6hhh(sDdysP76Uitc<Mu$0x
z?;RBe*?H(%yl|5Uvo2LnD;6+0GGxLg?_@%YWkods#ZNwlsK7#M4T0dsn#-sOy_7R`
zlmn@wI7)TA)N#~GOYwt58DnW!h5zrg-$a_GE0k~27ukQxNr(T#rr~(wS~*pH-Yb6n
z`HhuZF34Bf%<s_rIqq&XFQ!%3eqUBn!~^xSoB~Z2J6eS(L?_?ia(}<kBx77u%{@`C
zJf`FD2FPJwh2??d@J7qOl}<HhId_dcAIxF`n$l-MBU?z<6xinjbHLc){_(M(q@+X#
zKl*@yvq%8dBwkheFFCr_`vvOnRBw|rT$OE2X=ze2q5j*cy2IO*FZl<P9PfjQ%#U;;
z$!I{^!#F^qE}2?=JG~^g7rH`Ez|9RFz{{9b(7%dMk5HDvi?y^J`m3pi|1y$X%3@k(
z`?64_QEvj-_4!a!SY-nb(9M(01#@cjrU^N<?Ds6upfP$lUHE76!$!X1CYWIe$fl5(
zikj-)X}<TY7l5S%633)P>#yHSzpWxJ!#+xKWZ5Tel8Ii_dapQY>@$z*$>J)<o~rz9
zBd;gBTuc8JOuygR6i>!yDZl;pBzLGbS;|l*GgRkj1)*lUNp0E^23l5G*+-fRkZwQf
z2>-uZ^56c5!|~1?#U85zLLSZj)xB7{tekg;qe9btR4MLam2PCCr!+ux1h}=0DLhy?
zQ;{Mm3bo5@HiYPjF24+ux#m1PTLd~z>Ze<#y|hW0*lhJjQXp&hPMeE7K=s-i{53~y
z>gbl!+1WYitOOh`Ss2Q1e(eZBPzDjv{;tNhca5&)+jt6XDoGf_p8rTNKtM}V^Cl4g
z{TutbePCCoo|>A14j^gI1BkG_cneDDtE#ExbyaU7E5~hu1{>iW<@)h;ePo|8SUp-l
z$$tL{?|s~Dzj|W6ow?)-;`e#?Wq!r;t+2F>?Om>kbOl97NL=VjG{QfOA}=h=p8_h3
zAkW{w^CJKjJM48upf0ZzMbJ|bfl><MM?U*WXR%F!P5M_3x3(F(DKe?QW6l+K{Ys~@
z>sV*Q(fVD^iG*xpuVwW70_^OfxRUm7AEvLy3vF41PXQt@{?o;(z#sgw;>qP;N|xBf
z=P3F@OE8mnZ!;&(Mu7iiNSEn4D>r-D%|Vjg>}ja}nk4li4(-Y>2i56!-YS!t>e7L(
zJa+nqI-&Q5o<)Z)gO*5Mcxv_=1uej)@9?(lbIlhyark@aaQ({+157`|!~*=%H$#jN
z!?X(MKQ-><-+f#BC@b;tH@jhf^e;`-^d@Zi_76sm{`qn4Y+5KZilIV>3mdvt#rnNc
z@RC@8dGm}$8F*jL(fd-@(Egn$l_0dhso;gZn5dL+y8?ArGs0{sH28(jrG1^lhpUL6
zBY-}+A|kPGD8y3bmyG5_8Y?!S_~;!>LZLJ-4h`^RWSmu6jSj#AG^mDy@6ZjJ*A6C}
z5<nxOqT+fXzeKAgN*wAn^oylX869>>WO6yF&98;U52#eHCxfnPomU+1Pag;-jJ$q(
zo0<KRGn0U9^ZV^ZVSWL2VW-7LON;un;YRPP`;KinU#S_l*MzF|EvVJiB7Q40>EyTH
zm#+hTS|bc)1EQ+b@R&?@&ntd!Be#nF&25h~OKpm>!Yw{<L&<h~N$KYBR3Un;*^)z$
zR|D)I#-06E7n3p-s0wxz>4p$8ePwcO3GcL=bdb$YGy$nwjLuC^+46g0L!aOUAbAGU
ze~gWUmxmc*h;evY0M9~uTVRmIkkL2IEC4;dk&pHMdRD{qET{kro6sEr#on7Dnke$2
zMXt9%S)&tS_gKUJocC(}1x`8cwR&O(3jxaV{u7S2Uqqdegrk)t_LcZEeWcv^d?mZu
zKM!&gFIeC}`k*`z=Y=<TVXQ`RrQVd$Y6_?0b&MM0>E+12mC2MAp;LK@n$wg4l-m<T
zp4&7?A+N|eUFmP($ao)4uF&Cr1AJw_N5*c@_rz~-mBY(~ZL-<nv0Uc^p``T3fCbBd
zE!}k1iS~MDtLwD&QrGAWC5!NMsfPS4&G~8*#4zWL85HFszcSsq%eflUV!|d(KM;^z
z?YzI-g+<i&QNBJU3=%2w>3L<l>0fs8Cgs^KQA;0BpMO6;dq~Hh+3?c>M=|v?33C{v
z8bWWIs!*@_8G|bfr^xaszoVQ@9^S_Vbw*H$2t{|aEU@(exkhP?_j_V(!&~D&7WM}r
z0337}rw4%yI$a@FE{|PM-wZa?68YQ|u%N593Sy&3R0=bpInnMAvYN(dc(<SVyC5%~
zsc<;U^pW(5pa`RRX;ES<ReGz)4A)$d4}<*9o>xeu3Q*&3Qu?5}vm|QoOw<wj{CcVY
zKYac9UP+oD&3d2bid8=GE+OYeL^~JGFsL238uq7nJcvt;r~UbqSaX?q#*FHSTQtkk
z%lo<;es*UH&iyFct=95^szsNMlHHUg!vr_I=WNIcw<2z-Z6k-&)MG4}HdHVcwr{&v
zSfR}Epu2M~iB^bJD#z#2!+N70b3BD^@N}W#Z<W3B1t7(ml6h<lJ4b8vO;V^=(_pb$
z26?r)ibBlti;0S&nl%vTFUT2H<5INO82Q33hMi5V<tqEPE0t-WL^Ad7I73M39~_Sd
z24a3sm=F@suP$%>{d7O8B5!$hWAa}2fk8AO_Trne5d-1Hs}X1ZtsKNPO5P>LyqY_R
zm!vYg_Smn5&vVFfyUsj#66KMO-;VKbut^U6uP+p!3C(_7t+k^+IiEz~w!2EFN~8%f
zXPxbR!1KkuzJTR{{+2<o%o+{t5Kuro!FplUcwIxv;`Ne~0^-!Q)lnxxV;x5i>_3=H
z`<}q8IIokW^j@!Cep)k#m=|13!RfpY0#yvL^!j}<ZaQBW|JeDCPPidzy2ylR&@7Zt
zCjP8ZLxw`JK%~?-c_MXObyUdE4$`ZUAbM@nm)q8614}xUrng8kvDR}z3WwhT*fmsG
zN|7?>EM(rV6rL$VCX5;_^p|Yr?xmbtp?33|;xFqJ>83jpZfD^+vp-?bN7H-HH+#=#
zJwQ0Tt|)S$%4WZ2*Z{{i1}YpC0bTw5%G$E27SX#^C(*|{M`7D|Z%CFQJu0VLb)G^W
zhiq1URkgW>{?Tn)%0Rse-j(9@TXO-lV`-Z&$5YojN%c+Z*_V)3h_0C*M>ZTugjJ{A
zR@`aI@5HT}ACHI-wA8i?LK51aAQEu5f`(5*i6fraS*k;SW4$^Iod17fzOYYFT0XD$
zGXv&(SY)wKe+Ii3AmSc7KW$)eI-=nD-HrxWhyI=_n|ZbJ9)TX{%*UF@;T<RUJFst^
zZPAiMY0!#`Ke+#`08(5Lz|82(9Ojf<e!DmhOIMI7T}w<}-tAvqzOTVo8}@r~(d2u7
zbs>7(4>zJdqoDDV9v8q|@$JEQC>IJ(|MO|^rJL07v1;5938Tv!uA4-me}DBxd)#jq
zYC64+FlYIlyX6+6S~0N#wMnf~%?dOmWNLuAc*J`oN^ESZT8;0AbnEI?@B`Z6uJl1h
zp{y@H9-lJ;VDD@EPmc5*bEbktm%*K>Da>uSIQoe~dhuEjwU|%tBVLgee2D2H!;?kg
z@9b8wkSgyT;!inXkZek@kq_P(rXj-uhWB|YpG-E)>vtUsn{(avY~KMfq+bV!<6GZ9
zw#0Lk;=6ot$RZbq!%twYE37IS*-y>|A|kF*`gM3xlG~TwV19F`ZHH=-ISrW!QWZv?
z$ewg-ukH)$db#`)7Mo2XonVsFOkiBg)Tt_UXDMju^JeMn+Qbr+Bm`8_$Rjd?+A|#W
z3gQ!s__YaWocM`o_SLoA92L%uZSj(m()>x8x_#s488%yz+!2EHk@R7?nLopyz*D8P
z;Ny-hXJzRhUy5kZXLK~t^zl}3<qvUoAF(c0OFQeWcS=%|w68<Ev+<=mRAP%?*AIKw
zPY0jAye+YCINyQa97*%&;V0mLWQG_fbo~&}=a?GL;Zu=|$CJdiK0lytarwK4rWq&Y
z2+}Kd`pWh4eOmB73C_H`E&vZ3#^Ei}P^kakgrXXwZf0MN4cbdeqbq~9jPghA3R5vp
zd=Sn;wKXU7f(4V*(FC_$cQm_LhhChGIFwhoyr2ZdbNto)s%Rt{;BkOv!00Oyt~46e
znD3&KlQQ&>Lk4D|4R|;3Bu`fx7ht9}CgHdcK4MVrh-uElBIep~2YUrx^za5EwLh#I
zwCKs%8<pU4M>9+8Z8it&9E5SHR0_V>1sE#C<VqsN^i;K;-`xJ7A%qO-jOrX%A8&~S
z<((p3KXA)W|8jiYsZCXd3N`Tg*q-t6)r#ii%~7*Lax3+$==(>YfZjt|z!0>>3jXla
zTCMvXp@vCrB|(46&m3OQJj(^k{H`rAiwD1IRV?T?+2!UI$6k1Pl1^4#4fg*UsSgMN
zV62c<rgbRUgaDQoW2pL`>J9Gr^mNKdr9>y*Iu)7_XKT<xLK!q8Qb;nWfR2a5%xBxa
zW-v`sN$!ol5+Z%i!zV&hkBMw%Y_bN)PuZhlk1EHoa0bCloXS@ymN$jKr37YW;R=uf
z&&{!Zk6++iqrc65_QI()>(Sa59KIu2Zb#NKfH5!O#NDbJN@3L3pO-4PvvF;1P|nw_
zQl1m&GpX}p=A3!%qi({NHw%jLo<d>=kK_C2S;ywjn1wX3eKn3xzWAi2$NzjdV|Rab
zSC!)^_0i>-7|Q!(Uz*Z|7J36AzJ8jH(1T-?$WWNAiHyj_uC<>-%#v&hzuElOycYZ%
z<bLnBKO5lPUB|+r8+f!pbnaqU!85I`KIf~*o8szy_Rp(v5J+14pR;urRQnX14%IMI
zUp&6;*k1G$!~{DwpgG%ZBTJGJ)t9Nf*q3q=$NV^H2Ce7*>7nE2Bh1qB`TDLVX`3>f
zH_F7o`NJOpsG!km(O~bF?Dys%Vr^AKOk1&vRnr3+L%-W#Jxi+RMyzduz^geOGl(Ok
zc7=O6mW`%)9N_!j6%tFjRA7W3jJwky=5@~FhC!LpOzwO3%Qpjw@<eQGZ1Xp-$@J-d
zuqZj$WY*cW^1-@pn9bRsvJqnRAa@Do{IB27s4KM)uli}G*`BV8?I-7`y5XNLHv+ri
zK1qkv63^9T#Xv08Dd?c{A;4=Md|JD|7ME;qpO$(ZLj`^6PHkv>D?@{KthLa5H=H%h
zju6?j!9DMfDbFs0{7+?NI>DzYQQ7e6D_{6E!#8Y)<Ap>2F2cs)^8ViBjGd53-)F%>
zSnZBesYY$NR2>Z%?afy?`4g<kiYif}NmX@%w5J{S_u@w2{rgND9GDu~p}FSMX0jU}
z0`!-*83g5$+QK16>^WxZ&3?f6<zeb&w_wq^vC*J0)9JK?8TRY-b-X~oCup_`BgwP&
z#PqBm6Ha952WswSnJim}g@=o#^aq2hA}MrQSJDK<<QX0P%(&Fc1}M)G7TBR{P!GH{
z^CgOO(}}7pup6wrlc+gU5^b7Bfs5+M+j@VTxz>HriDbyunwsPR#(~|hd*fUh%IxoP
zx=cP@W;hE8zMB>(ZWDHVZx)T|f)AEONJ$<)BF{4|_9i-aHGC4LmeV~&ve|;GS{xRi
zi4bCzLA7YayfyiFeUOlrMfLHHQu`t%16Gyt0yKE)?^H;i{6oqQk0T#gvpRfQYpxzs
zoc?_N9JKB!s2aAvw~l~OFgI^U#Kw;P83>NL|K<ZkyLYCA-OP`yc78>ZML5)vOs%$k
z1a?<v_JD=?E+s7=I(L$EL@vX=snk@oVl5VqM7qzh(r^^ma&{TRkUjynqM|wd^5g0x
z^Y38~p%l^pj{NHnI((Jmj+x$A<`Q}1k?rBQtSp$qS&BfM{h%L;4J<fQ)<vdV4$>D)
z?$1qawcHzjT7{G}y6LonMv=)ww0KcPx<ch;;Up^Fe!gQB{VLi%%0=%%s(y)*g#S!w
zTOwRX`Q>DPLgjs2&(r}$-u2SYH=4NJ6H=a7t>nE*=^2{7^xNjS`7Cup2}E}G<3yVu
z!H`Yrq=FV=Dr||YWx={N=IgEdOW0jRq;yYo1wZq-{zctUYT3Y|p}4HSR(JQo4v|ek
zgV=B{&I_P4V3WIFC-JL-j-{-NK7Z1TzLGh0_3PxsE%SRjHqN`jdmLycYd3f|z5ZpU
z$hLh&sSX$1%`9TqD?SjX59g~+m1wmOXOjP?9;{N=ZS^#1Q!CF&X-x_W=kZ!oCoC*B
zE7ZdVocraG6&RO@9du??H{v^o_c4N4ELM1?_GZvjHuuh){IJ2@BCUk1Z1CDa!XINa
zMmnXQz<TS+-Nu5T-W~hh`7-4+Rx7m2?rv<Z-*&MNXN#!L4b4zqA$G$5xW$tLB<LTv
zz>^f;`x>HaH9C^w;d6nmxt$9*t0Xxmm@H=>FP4)bNsIKR93*wW+3a?{X{!yM>XO%9
zZ2t&~#6JS4z2^FTa<)Ak0~J#0H_}4+cSLrea8}E5eXju2M*6-lm~T(`aZDI2%pCa|
zBwF)S#DNNYD5S@wo+RboeqNEsryyipm=)X32n*cCX<0vdG4XyfN2{t{SwLH&&GW6B
z^i=PSrv0`iCmOI?t)!*J&E|F!E1?66i1isto#@V~nmIL8L373b-2*b(qY2fD*H&AK
z1_L%I;Ty{G{ACLp;M8a48Rgrof~2Obfom8(Q!i}9`zE0&QPw91%?(3qP%pf!KSR=u
zLDuZRDNmQhAIr~fn*?WfN?mrSoDFqTPr<q1b?Z{nWl-Oh`}DM?r7!yvK^GhBQ%k-z
z8rleRY>eA;DnwU&TG~Tebuy)~3o0&NJPI+zF*-{;V#Y5TfwkSy7*J?F-zUZbh+{BW
zd_H1wO!?N*iK7(E+~ukjF`f^n1&#+}6uNCNG>C`_gDwWr^24o8=5=;ozUhqh;+3Jm
zMBQJX+?N(^+?zgbEZ`_K(nnzOUqhNLe~UroAp39scrgMm!|;_qC{FoLgV_U>H`^og
zL^d}BTqww_8trp@&Oy(Es&wHJEvtdsGwuZo_JSp(u>8&Eb-#JBGO5tJ!q)E}#AtNy
zq$)sGj*baw&vJaKe6PWl45O*Kg#_a#B5S9pie2s`Oy_jZ0dPR396T}AI6#Q1=;Vq4
zrU!_}GRn@uPEOVY!=8;U)LcJMvxg!|ct_n^2HtXMC4?d-=}gtK<j?{2Y5(;OJ^H@J
z2az?9KGPQ_g#m-sGQ^CfgTkQ*U~7ONigVcGy{R+M?4TUjfV_Lk8XWCjz-Q-tI?3-U
zAH2-rlJJ+%8P+Vj=&+(95*&U{6f(OH_(Vh(<j8RW2?8y@Q)qjN*DjqKcnF}6)&gkX
zeKmZj`sbG^V|2jg*7_BKT(EMLvH<P1-;fU*F#_X3EofmSI~vQl!J5a%@x;%79x9{9
zElF0lJrG(07`QM-1Zw19H2Y>494^=P5E^Y<oPyBe$8x6^`{U(CBw#1P2o?=m1Lnb4
zs(8EW#Y~MIzx7&9(BG}-*k9`uIg>aTT+ZK>l$5UDBk4m{QODF?_$`nC>#G5YHwq%o
zf8eTu(5#bas6TN<$YR~xP?2b~LV&frm5UT2A|gcC<r9ykdUSX-JToYYJK)RN8Q`rc
zBzXjLJ3@1oq>9{ipsqMvAd#crQpcmq_&+hIz6s4~OF{*K5MZ$jR`AA=OKLY89gHP2
zjflw6P(=X%Di^MFYSL0X2%ZId*7sZwW&vld+Xz3kx~`GdCl@^zK1b{6RLO$VrYpB5
z4}H;$=x5s(yvj8n;6?kwcbW~e{%i7Ff&QUrVO;8rl`k@Y3neM~+SZJbUC>oqN~ZIc
z;4Bi<Z25F1x}#2K>cekME;3k05ccdVS71`tqJxgVtI(l>lu&b*Zm9ylI-G`4UgON9
z3Zqx6CFNl$MqD}#E~R~LI?-U3i`zy<II`Pq;?w~)Ds^Flflldw9M!heVt$VwEgU9{
z*;&%}34YqdjwTk5A>tvz38`fm7)BRgs@9z?G?!PY(8CRd#~%U!Gj-2P`gK-Eawg#i
zef`7;n3#khhMJnLMa9LvX42vS?WUO;KR>{-Jve6biGfi3PkGz31ND$X?-$2oL@wi!
z$l9fR)9Sz38;mmOf3F&vqiN9lgEX_$mdBZFl<yU9*$u8~w2-qi%m~=7ecSeg+H9LI
zQO@Nb1kwW9k$F=;ck}p!SQ4uBu*HWl<FlW0wP`3ffg1q}73zEItxggW5+io#7G&qm
z-fbj==0-{il%%ApTm|R5?<(}U{@}^G2WQ_PsXtWXD&{4pc3Y(Uqfi|?)SM{GGmX8z
z!{i)mfpyetMJ;<D<8-~*K=e(5udp#QgFKuq0Mzk$_2Z018={u3Nu4GIQe}S)V;pYD
zNC%CK>9o5>SAGa6%-)TeM&!FEiN=h!KJ>oAZ7s<|kbr=jgO_(1gkgE7hJTqvx@5Jb
z(KXz6_;^QSu?qRnCv?8PVsZGPyys~NvZFiyyjW}60kjAD01|G44T>C5Vjz|A@yD$8
z-(DZi=&ed-_Y-&eLjiGcL+SSPR|+ko`?Y~em6ocMQT#rsq;BgvohHQjc5h%Bn+?{c
z=NYX`76;;16n-oKWf*YHNg+Q^H_s95e1%nL*6VzCtx7w>jQS7!qAc=%E=h<k%hU&H
zUW*<cfWNL8@(WC(pf=+93Ew^rmP(DCEH#`zT*c~OUU;?-Z#i~9BFzSXh6)`P62j`V
zwu}0*#fasyIKr#6*$OXgnva^XAD&etONRuO-m$Xy-QWOvJ>nuFEj*VhNnN`AP)unC
ziMQ%)kX@d^$n=6rDw`R2T?H*%C29DbbZWf{PF2Ud`Z><$(`z`-fYmc5E4cNxFkrhQ
zD{PkY?O~CT(2e2HGZ9lvF#YdqEtK8x^4TbRhl?Z{G@GyZ0@(vd448ceZm;dithrr0
zEoV!y3!H6_IJ~Sj%E7eE<LWxuuZQIe<)N>7O+v6JUvd^~!!#CxmB2R(==$3SsiAul
zt#@H))0!k!i<gh>H^+q_`<!pjg|T%OvqB=`;`!34UIQ2$P%dZlf<dfOS%ub`-?MWT
zir&*X2+?l3(~d1vDpeqD1{xN61VI=LdIX$L*D)i}=mz2lg|B<RK0_PKr$;ZQa+ulY
z>C_Ii6aGoGV;J~A|G6SX3h|pG?^scItV-bg5rZP*eFwHTAepBUfD$yc<f;|O7~d*d
zj-90MKxxPRN4<K6A8E@W$Tre=3bn1MQJDtioFE)#$=pwV_IFH6{vTRDH2HLoX=(JQ
zzs@xq?6-S>(u!#!A`%8GEmTXg)ZTS+i+7|~X8N#xJ{QY7f>R}B0U?XVA1RfWyHB<6
zzQr~#ieG!G97Erns#|`aTfCcHpIr7j?||_|AUU}iA&xEZ355gWR4clxi=_u(te>U|
zTH;mjSk}w6cqMY#NutAL{3S&DjWv;pdrkuA*z>8>y>-#+uWr-VRSyT{mo|R-bp0d|
z1*Un=L#S1;a6r*}<3SrQ_`Gf^cY!7~P$=&b^78%Lf`JU~*T%bzux{(V*nPBU>&qRS
z8IWEt$*Hr&(&XoB&FFwt5CDzVikrs~MT_~;cpk|n=Y-aJNl2Ou6``YCU_ukP5@oY<
zrOc3MEaT624+_<K5<LKaglDD`Vl0)KzQI0~R+p+lUZ@9I`7c!b>-)~nlz$wP;!Tdt
zfh#AI&87NIz%H!`_Ud2*%f46Fe!4v+79Q4!6@Oqq{)(@)Ee!c+`WC4J;+Rs-y6&HG
z5NW)oPZDS<qM?D2kkAyeDxZ*;7cfj-z2hYMGnVhA2>~J_;ujWAJq3w}i*oiDg*p$?
z$t})-UJ{Sn3-Z1Nwg&dV7GG^wXo+nYyF!6QL$IpPPlT76gd;X08Zz&fGdY?~cLc>9
zvX^*TUR?I|8Bn_})x09O+e7cZX7+xDFQKvT6<PWqRAv{>T&A#eW4Dp9;R3}8vpKK$
zFXQ?io<};xaGkopv2bu_2L)B+VG+lk!(tnyC~0h-M*-R*l3*{sOOToL=e&l**IV(G
z#AT(qL5)-r#$&r4E%Ny9ZSIUl#zrQ!yE$HMM2w7x$YkE+XYP%b3sPq0zb##$Wz3lC
znHv2=u7Kot_-9QZ0%yOcw%{FSj4VR*^2|JImOE>9yc}j8uQk`ebj(+&qYua6Ca1St
z>ilDNj6*7ivA^INjPmceb;J)2xH}na((Iez%Qn1DZS~NVQUcyN(gql3XaU7rx9+%_
zBDEI|3cL;b#L+0-cGpq-eZrPS)7mz{#GbLlE#Eg-tEKAX!Rb*-R9nV;-TnxsJ27F%
zXLZF6=73}z^G)fVsGaq3FVM~!&}w1T_eMUI4`9#taS_op2J;U>?`C&yA{wn(r_c>T
zToHg=fT+wdaQi@H-=AkVGmJz1@1}?%M@t58F&BScs-nkj0XH>rcXr4AsGL>;q~SDv
z;Loczs+7S|HK^<4Cr?+8jNAfsFvaRDf?lCcmK|ooUV$~RV-xzd8{fm6-*>Bfd=7Kx
zE{f;bHiBsQ^R3tzH<zB>!AM1!s2`g!V}C1xC+7<&0A@0b?}y`bL@$upWV7SQWwIT(
zS#l?5+`%f<F2ZKB8g@k{(*w}7H4(GXo7VpwlhJ5Ns6*p*vnwhR;n&$q6MV(_5AIa(
z?*mXxvO8S2R>e838vDfc$0%T9Cxn|@eCPX@(a(w*R^<bk{sAP$u%ZmOaw=$_93BUx
z68UVnMs{|ce)E8!O^6W7`v-M>sTJt4MZ(bv@MP%%xnK_2PpVWWRE|0Is~06l&cxR2
znY^dK00JpIJ=E^sQrm3>#1k6z4;*|Mor+@y!Qof&*%v8t+3<Yt2(lS$v?Fx|!0p}F
zlj95%-6#p+fH8&MoaA6*@y7JGdW=?#NGm;c9JARUhnm`ws*Y63<sKc6(T{@tVm(#~
z9nOW4jY?tBP^r@(DBmQdq!RWN2rY=LgKG_Q94@!QRF_c<n^B8yayHs$Tjw_FL!|4B
z>bi_=>w?B1VFvdi3S~3dG}@dg>zSD1lFLX(6bzlMRH7!XHJV*<Lq4`5TUt$}?~gY@
zpwa0>mb@<G2d9XMh(U%;V=-mTaQIzi<SfFY!v_IRw&~&bD*8-jfqy`&i2q`J0co^o
zNfhybr1K)NOQY+8f+ap0M@yaXl*fXe(zwW32Xxn{k5{w`w#EHMNRXxUOkhr|8|@?v
zp}|DbGsrAaOiaXcT^)*xrTV**h5>G@P9Rc*`7inp{e`82nX{pauBW7RbtIgNTa<NJ
z9X<N+U*ueUK?mG&yB9ys_8-jdE!Ikki}!-jzu@5?E|uf<oCTK0y^ok+?&!$~yWz{G
zhE^KPO=Rg#rG6j*nHrf?{7m=ybpK7ajmts@F>n3n;f8bAb^%}Drs$n>P(!cP1Vw9+
zGE^p1S_(HI@iW_Pvv+l&0{YHp)L4Esq#M%e+0IJ_iA``>7wm^jZ>(3l>)@u37a}t9
z1txLhp5&k8qv_mK!8qTKH{*v@7mY?wR3f4(g}%O8(>t>c#$A_n$Gb_3xnHb+SuQ}g
zkK5>S-NXHI<;b8>%b_2ZeV?gG7+jPha34@*2vlg>_JZ9^G#U@fF-~D2A|lc~l7?Jy
z{d3R*{+sEf#A%^|fWsxMZh|hHYjmD*JmyHmi>iZM%d*U)cP!$ZZFY~Y2+3h(oai^X
zC(YB9OzYUPCkR=EDihw{E**Pd;gt8X?+p`kl8SOEX3?>iCq?&1vq}+<pFmMKUM34b
zQYckZhh3_N!oxT|n=l3J;Rw2j0;{O<_*sk+ZZ4HyuFkwOqr7WmIpYwM)%@Jp30Sd+
zJCl`@6$Qu<{?jP9=intiXW3c=<TsI!(^tZ&Yha=MWnhU7s_Ds^<!P!hC9l4l=;sO`
z)VY9Kky>{NzI$KQAa6|@L3be<f72n5Nd&*67<|{5Xa`}hWz-}AC<6ljJX{u=9qrLe
zdFNWSFJx~k9##k<;E(PlwS=+$wec06h^XkevE)iR3eRm0(Aa4@yB(d@)+&~Z<x<}=
zqw)0u`kp<YMzioWhQ`#P(kw^uP2)fWbh5;jysie*7;_6e?#wLKTNv9S9?U(N#J1y`
z>&1q*0nM)#`QICz=I}Z0?+#IK?@kV|D?TpbRO)3&mQTvhO(uYwkya4+Z#McH2g#MD
z8=R%TR<TfQSKK8fNls$A)_8FhL@WP7r-3gi54fC*6IR|o=rmM?P8DVa&m7A1Cy5QD
z=67DGFW9Q<KF82nwinjFP>-2RE?kB9Yv0b;5N<RT(V`{z%Ye%MJg?%;L)=09B;vgi
zS9j8Op2U<2oDVO;mJ0$3!d({&R-Z}l-H!_R?MX_jZRa)vMl6%Kb0aA#yvq-SA>U6?
z!Pq$oL#LM%K;Y+(KE+o(=|(fg0BDTmz##Z6>Rx`dpUOTf#~A}wegxe<9<Z354Lg6d
zT^LoCDN%t3URo1C*CwK%EtGIL>;}2Jwm>(SPtu$>M<R$J+9eEH`X=Xw#|EQPusUpQ
zcIIpk>jBcuapCkG`vSv-KgYgSxGlWHsV22-cAHU>iR6;$<(f{1Mm>4M_7YJy08$>u
zU#?v4uW13JU=g0D^9GB>N=!1jj39J<Z^YafOyUM|)!2R1D(XL2!L3eag$t8afF?7R
zH@6|M@8^LzWsNANi0OFBP{ZGnr=~X9j^`hgi|gM$m*}{tMLn{I5EwJQ$G+lC|0<<l
zo_JccM%w|yBc8li%PhkFzM78`mTx+V-I)Jrrm2*l8nyO>I&_~kqw(6KO^f@EQ0YhK
z4Hl2MurO;HlPOaSK0i?5EQvW#Dvg<FrsshPTkzJ`0jGGEW@qcd&h?mz$5httD1@R*
zq?g<e1F|rzB3gVE{GmOGIcY=5PS2aelDov~oe6%ySq5Y<{(<(BlOM-V_I6Qkx6+)2
zE#GET_F|u1|2oQ_xf?#20W74}fOW+G^nmLJsh$2Mybgt>f`-VAc-2QjC;;+cPkCEB
zsv$LP;GV6MB=T&k4urYMuuKpU(~8eX2!QZ<9FV5(@`uT+svY+Kos}XCZ7r@Fd=yr%
zf=4eQOyw@Og06K<EQR;yo(3XAjXqMbQ#;RYEh8*8CeD~0m7}CG!>~U@QgeK<`FCH-
z^w8M$AazYw2mk>IGhPK@-&#kKPNnN@07&fff35pBZ(>45uE3PcK?Y)IQ=aVwS-dUx
z03EL%;CXcUzB@oQ*{%e9`CRi;s+u*M8xDlAD>iC1D(D-=);@S^1Ii)>nc3d|^pz+*
zhajB}mbQOhZYZ|9+L)M{hT|VY{b4$P{;|M!BfQ3+xs@rK2k-cd%kWyTTAoF!Ri_e_
zbQu>s11omZ|4HI{v5sk}pQ&qnbm(gFz<;~n_j33A*?v_d92irzane`yK%HlOBT+UB
z*SViGMShst2bIJ-n@g>#3LH`NW(Hg_V;W20k#&_NI@Nir9*;&$w~FKLv8yGc)dXUu
zoYs*dVHpk81&7Imve*3~H)TLeu-{7vF-c}PmnUh+D#jNa1jxs$mFNzi3`N|7CWuC+
z7A>7Pb*TO{tTRwVkazZP!Be+c^Vs26oxVA~r0~_oGrJ?<U_8-X;ggpVv_Z!<)&y3w
zFT?>v|6SQ8%pze7y18F@*H^kaox9MH5_(_x4OJA19#oxuJ%z`WAV+(<KZTm#E(fP{
zxp{lxRl)f)ROkbjJXrz<P5f1(LYLI(fI^wI@usaA;l#v6cgE?v`_?_~X4+)2WwKw1
zwYEH=FHio6qS1d{_ru>D4Mn@3T>zS^tr3-1g2OygdgxSLI8U5foAXF}16-G#CD22D
z%y@T4)5F-rVqteiVp?sm!r<_N-QswZBTLV6Y0-Al|L;pU&1KkdYlVP|94L<GgW}pQ
z{7Ks&(1h2!D2$F^%XW-I(W=rsrO2Zl&x|`hAWFo?25j3*6-Wi>53$*;;8^NgK~vx1
z^W*Q|6Nd6l(tQxB?1l5c6PTxH(U_e)heiC}t|mj}^}Ob^@&J`mI&c^QhRUz_Bsx)e
zcM*2X(ubF_9sKj*sI7=dcFvU&P}2PgLfwQfsL}#yD3#_sG+TL?c8sATBNyM>BqV^U
zgPe~#b3t|vVra#?^oU?c`od-o$d~&Z3|Bl{UF+&fRmu{QV2Z2}GBHx+^=e1czuICj
zwCshp#LqzHU!qrfbAR}>y6Hxg>+5;RCSqAkcr@KT954K;uCx+t>@1b1N5c+mv|8G3
zYO=W=9mWr5+|pg%Q<PseGR%dF?Cd)V0cPBTaz={92kc;Q6aLd=W27?&m9ti#)zT$J
z*)iMDnnc^+W$D~ls;ZVFeTCSlL9<+I$O|5JRJ~YbHyDOUtdK7RHj&N@QK42dWGoy)
z#MYDs<IRBsCn6>`CW*j5og1sI)!5fF3|?q9iIv9dMCSQ)Ld-1H^?EBkO9ota!ghc5
z#IOlC3IX2H{e4}B{}%gb|Lv;n+$q4m-g{sG_BTG5{0t(TyBrueX#YsS<hrou|7o<h
z*_8Bvh-@fi6po?4qxO2!ZF|wC&>p|-5b};r0FdH4oJU-gTxKxj7aBJr=)8~*N*=QV
zQ|WQ;b3@*bk|P>F5xdJURqV8;IiETwNT>FB4ZXZS238SlqxkfDNKoT^H~s7hWA7<G
zsX9iVGb2*2HJ1DX$;15#kHh7n_->Pu8!tR@Vn3oe$v9j0C;aZ+Y5EM9(GPm;GcSYD
zIOxKkEwT}F>lDC+ILJax$<YtgYP5{>og-y_F1_sk)jc(WrQ5})33=M@a|N;F0OgIl
zYz~1c{Zy$u8GlmJxfnoT3v;4?KJD5G1YQWFS>MwPT)_(E+KxNT^TE>Q+=kumcJa!+
zM>;B~^h^JZ+F6eZ`VCDhJK<e^dxg2>tIMm-W6o?~XkcW|yrF$258%>;3NRyLS;wef
z#=@-ar({Eg&NmdXFeyMMCnwLl<MaT^u45LDhgMYRwBh5r$FcpA?rn#{HnBF&S=fk#
zh*p(GrzI*^#5ABE8WI!)N|VM9f7SWLm-5x6!_)qdvcgW5s5zzw>vi(Qa2Z)+()$2>
zU47*FH-q^L7<~H=Ed(zGQaeE(B*TTv{aS%@ZAKf~WO8axqwx)eXwa(Wh@__*i6MTT
zy0D0q6%%Ei2LFgU$d)a=*5{4wWFEfvz}{#sM?2pXZXRV3IAgB3p|-m364|w;magwI
zK&>cil_mI>?&ka*d*{~dTvJVLYEX1A+1ziW4C9<r^$Ensrdo(R(^e4_6Y>)I%n$&f
zax^{nHVrHK*j?CkOK=HT?v+5r0P$A9$L%?h*D<SS9ax)hDa}r^l?|1z6V+}KUN{Xn
zvPF!nW;qlwaj7Tehj@!-#f2af-7KS`d#RgU=?Y2gVM>E(iCj*An|P;J*%Ue0l&4n=
zr>ZJ_Z!-^oSwxux<VesB-rQtMdr(XvA;Tm^?S?aaGB3kf{n~c0{(762R$rdjt@I#^
z3ThflP}-z?IpYmp&g=3et9pIeU!~Ax0%NTS*P5$RNJT~ln2M(p$y{vSZKyNeacqV1
zvMz_#{zi*kv~0>lUNp>sr}fLQtB8cWP(2n8F!`44ZhH&LU!PT~UPiKcz5qN}h4OCy
z7E#x-P9-%ER47=CRA1VWRF5*PIhn!MKi&Nv5D|`g4PXHGT{sdc^WbB`f@>5O7&2hi
zISxYIyKnnCU#zN{xlQDDe>3KP(*aMrY`@ZrdbwBTIEPE`)Xwj7N#ikv+VnLy5e&q?
z*Lg<Wiuns#IALbNf7u`6|7}w+fQ90`+}&9T@OO<m)Op;YX%G{~A2{c0wYqyVZKI{Z
zWZV(6WSEonS@)dsmfZXaO8)ah_yNBZZRE=D{U_JMt?VrUWt3~`a-AYjhH-E`qor3C
z&Ott>1`)4K5^$w-&4nSwSfVMQ=T!yBECBUU(H`;Kj>w*+>9ucn%809ZKX&MMA3A>>
z(|X5vLCE*DyPSY^RTZAJXhWtE*2h$vw8vrFph)OJghTksW$TmU`7&hR3`XRdj(4ab
zpT~6P1XFW!VrFLKtF9-!SDy7FCH$_9KD?k5o4-HWD3}fofAm0zirQT^7`@zJUUU3K
z%hbNTvvz7E5$Y*1X}`azeiRk~`fw3JN0&3)l6}NcK+!h&!=|ihFnyjTN;57<pB*<y
zGzv_Na;~`N#ChcNBj)kq=JO3dPwisW?+D`pnGGSMu&eYXx3)x>wE&U`o_86UUpDur
zQC;1whKUKMVug`ply@l@lF`J7V~bN%y9&D1&7!fp&mYSdYmwj?$wf;5<%Gd(0z)Q~
z3srKhsZhv>C<ccs41lG8A(P7u<oAaHN*itlgKdE%3Qgd<!->HqeZT09cDMdaUCnA8
z&HJk@d|`Y);2TItu#YbEpvC|;$-uwxU>ecTHGrafr)co^V;qDNSxYF<V+1wBK}+d<
z<nyHDha)&4Cv!}$e4@+$L(^FWRJC<cSVcg(yHmQmySqCj1f-->`q16o-QC>{(jeX4
z4gdDu|Gx3S1Dvz>nsbgh#<#v&7pXzRdwv$V<QCeX4nLzDDKYPF947}$AjOMk!UFa$
zc?J17lCe0pp1pyOr)Dg5%b4Dc6kko$6?{%0dEnvP7F`4}U6*W7<^?oF4g0gf`DG|H
zF8sdCYDP1;{ib+%*p95yDxU#Dw`!LUYYVwj#h4sA);kUkl$<+qpXxVmcM3idJTxQI
z<i{9uYb7XH6u{WXuKWT&zVEeQ9Co931B^eI3<e)kSZyLwZLG=g*tr{i2#bjLuMV7d
zzDIC59%V_zQzc$qL}P#~0sxYNVaF|2VDm_pU4><aarIJIT--Mrt((%Z4|!QvfGt{K
zyTwI?uABh4C=v7I^!n%BZpI}c;lSqM=xwgQnV={XJ`SorY+oV{#oM`q3CX|99U`Ln
zkRL%4M6|O+z-3rK?878IRF~U1#Lg<@Vdd9=Y|4-~j37^)09*KB+}b`}&QHNfXadwc
zV42V71GVmX4(0U$%L&6mMWSoy5AC-EaR5fOV3+u<->C2B@0vX0A=FU?-o%}q&?2pR
zsuWhsKuMtc$)_s}HLEnsaD@QwYf40c{NwiggXPCE>d*bL?hC_SMo}J=G)_-3(^ZvX
zB`kUVR~9}zZggkoBN{NOfGh$!d4u4;&jM!EXY{`>ypA;=^jwzmKApMue!7HwqvX9r
z(=e#m`=r}P`MZ5!;llf7qB=leyyCS9eQ&C%jYh<a=!>bIQQR^C7LD0XKHrLuP_NwM
zQRcyx%d|==t4Fq{2)}Zec!|8F${}+KibZ;<L+~G9D&L7;Ywb?um||t_wY-C#p(u7Y
zUGWaaMl@*_a1Ina-)}8?N(J}lJK>+geDTC5S1w)}sW07U3^m_{r-yAH8wlTID6+?;
zSc5GOdn5V9X7|RUGZM(btW|J!ioa&|&6jJ_-x}t9Sg<m5zW6c8Fs2G2skEo<o~_^c
zR;1aUQZ_0I|Fdv3Tyb{Zc)$9aMz3r~hmK-fyYrb+;BWnB6^u`Tu&Vd`?^)SyT-NK0
z8=m@e;b0lwMIGS7ylc+JCLTOltUz;3!c4rnq(w-`#RZXU^sWzhwH%tZ;a{2!g$*N7
zzH>&`?buB1P|>r-;XQc?Vt3r1QFz=f?SsOD6TD}ebc!7qDcx0pRf$eFnTE$;@=;-2
z7@T-HG*rh1nk<thgEybW?;@X)EuKhhUTh#V(W@-a8(ujWDPDgxcR8_gzEJ^>cX793
zW4w^jUIQ-!1o<v52MG-4j#x48uBZXGw1;6QGu|Y@Bl<r=#V91?zf#_n(DE{Wkj2eW
zX(bUk8@61cw5gAd#CX?3KX;yRAA2lI<EOF?Z?r=iqSGs`;C|i-#3ABz?FK6`(>=0c
zFeR-;;i)u$SSK4uPN@VZN+YitCzH$r1qKNl6|fU7=0}r)Z45W~i~Fc2t0*Id>W^@`
zIvj$xCp>H7&-??kr>8CKZe)tL<bEG-FrXE;;`R7A8KLi!9yHl=MCo+4=9EP(2Swq8
zkD(5m8G+~57lLNOn*_SB)#35R7luUWuHGJ`zuhDau1)Sa+tJPh5+9)09`xOXERo?D
zm)qNgO?%Gl5XRp$1AffIhnRP3QdXRRqX3Cq{{3ijW~$|Cm8HVB9@g*4O;^yNNKiI=
z=W>|<GkYwODnIv9Z#@Ci-kBt+ufudXy(V089wNA(fLbkU?X+?8lzm+!kT$n!FtkSf
zyOHp{v<JS#6V<oRhIeCFE~oVi2K8dZG&HbIg)sSBISgCf=oI=q$jKSOP$k$dR&AP`
zH+&|SER~AO>=#ObV|(MNc6wpnv|6kFL$)x0-8~d&qc@}9UKuy0KPK^ca>=D}(bjVR
zb?y`^7aI1L%wazD#Y#|IHcIKXlUt##d;L?YUH@y`ybcC!I+T#ZvDwl2J0OYI3W^m(
zwPZ9JZW+*Rc<J=_MTT$5=3I-^iS)RxhVcZL-w^P)!u%i+0+$C<?Oh{%u}!kk$O{c1
z!FfA^)SB8BJ74o~x!q8O@p1gUUY{h>?LwDm9DCAxAl4muE#j#IX{gFd?qv>ZczjKy
zUwjZ$6C;sad{tCC+1g(u&-N4eLL(Udw&QIVrvx01MB~o9QRuFLuvV0UD}cuZ@gS;H
zr5Jf20_Urx&*G_5@?nkhy*1WnNqPDE`dr5h&Yuu~^*K@N0a&Xf)@H*%nY_y&&->eW
z0>d<M2f|#Idt`>ajD(!5A33*q&(b#>y_Bj?-X}b?euN>&ItwI)JVq1uNQ>%_CV?)4
zK^u%j6mj@fY?{wPG`|ZS;XJsi;H--j(Hm$IF?;LmsJW=5?hY&4o~W!XSFlTk%={pP
zH9eL6J&DKcp(4EH4etXj>KsSWVexr1Ad)F8{g^n)kkH%ab2&>AgA<rEniup01qA#D
zx{r3ZcKQ(A_-V#|{r;^&qu&9m+u{&?PW$kPq51yTNN>xLPN7`D0)c=H%9l<we4FIY
zm0qY|vb|!@ioJ-dVt;5b{-+QlU<jK1{eimIxyNmP;g>1k537%N;8RAj4jK)Ju~Wq4
zE`r<29aDPhc{kR-T#%T9I~DWug*k+W#cusf*+9by#>7eshvJ<CI^%WUYkZV3w9G;~
z%7csE`#h`@f6pQKhN6Qw=+YZ_o5bu64?K!~%7t>h*l1+O`B7F$Yr6x#?%<~G8&Z_m
zc`hEFjw^OtQlL{#j(OQX(qXT;4OQosy!|ZZuhctOjo#iHjDKc4+ox5i{cdWLq|?kh
z3SYbA59xl3yl&FKGkAk%{uuWg)#GZo5R=KlJmS35p!*XnK7&F<?>Cl^hT^7oA4rCa
z>cMZ-3#^uEqg{yL03aI4Sj5AF=ZMw(7dN+qz)Hgp6Q7MwHOd;6hGq{yqIi$WkVt6g
zMp5v_z4ecuXeZs>Tn6D+9urNTrDh~9_VUlIy<{d|!63I@q_n~3!=cscU?px;uBj@{
z@O*BNgRwVFNp!5ye$Es0-Ag-f>D0(VjJ7WYHNfHk_Rm0AtPsOqeK8=fXBfEx4P>40
z9#RL}<ErYXj(m0{Q!r!Cth^!TE7u9{7^UQ-5cOdy@7j<W7wCg-XbR0<V5v9=M4C8d
z!h#{fG^^m0z1D+mV+9)=IZlccbIGmSsyP8}Eom+BA)=ygS;iLDA<!ub1cacyAF?_L
zE#^`P+|mEjc8h}j|EL~OSi9clr|T4}H60U(#9!kDFYWD%^n~PMtqe>&v!uDL$e$G+
zKg68Im}0|%b=hoH)#!ZY=ou&H+_pQIB6>K8m9I?pJ9TQ_x&PB>LjX^}7bc7IE}}HU
zcCyww$Ue(VOsoX)@c?s1Mr$Mm%f$@L!A4WmqRg!Hi-X#(H2wsArn)qooA7XM_+1dJ
z185<Wel>z1@jS2}bq~t+1DiG%GBWZ-f1*Cn`W2Y377@+N%o?zm!{a~wArTAfx=_~}
zc9b9V<b$v5d@6~1$T}X_wI3F0Zn$x<gO#bVmguS;n+WW+PW*wb<IS7lcBi>&C*JCt
z5%PTs`VXK4>cA;n7#kLenaO1ifZaRyo_m*FfC~Z(4V|3Svp*%|PwQ$pn>qRg)xzV<
z57FvXE7y%V58HT8hP|<dTazqM_{=wxAKxZ>P)G1tw>FX;D6^Zbj*%Xl`?p^Tt)f__
zC)wLKA=>WWo|~FgOMCFSV~~#3qqY-aRPMKdTgNh7JSYaju#P$RsH~hYAV7AH(JL0i
z8$std$F-D>#uRfWSzVKWx9oD<hP&En0qRmF@AHs?Y49Zt2{Vl1yhL5wA$juUPxZl8
zBudL)uf`IeuD%<JKdAllmQ(*%j7J2urYeIhemBb7ya2MBQg7<Ok5+2!2`?+}S4Td`
zUw;m>IVE4<?}}_m$Z1wWC--dvRof;|`EQ0dtG_+kbLPHVbnQCyP==AV-duj9q(v(r
zl!1zESvNHFx|Oq_mK{%!%N`q(N#l1%$Dr4X6V;Ez<qLa-yxSf-WCpBk7;@=c0RTO8
z6f2`Ht=k|@6J=-T9)hiCh!$_%Vt0#irvk!UF*h!5A?wEhex^g^^~mBEIt79UuPhSk
zPDdfGxtSB|u#9FTX*PnGi8O}DKu!}Yo%O7b9nWv>z-F94JQ7#%+Eg|_EWSG{-cV9n
zx)+d%Lltw^N3S0`xsP<i9v_U8Xib}4OT2|fXF0RCMQ6S{oD>_htQKB;!Ia(78kus~
zfrP{IHKa$l|Ew!?l~XnC@yrbSGoV>-F{sCyR$@C8gKp^3W#R=K6dsWvXx@m4V;*L%
zQO^S5Toefre9824ijtY-dQxgg5uG&gZGD}tk_M5i?@Fu7@9BJZMSdf-f2I0-5nLoG
zyrzmfI@&PywmZZ9OtbA_hGDuh2xAX3rfznWLPs~$ZHh_eI-FrFgB4|s;DGKv=x#k>
zS70SDo*_qE+0~==r%1@B$igK|^7phFBLZ@|wct8fZsK0qj5MsFWja8`L`L44K0Ir^
z9Qx&BzFel+^*P473*N9&2<D$W6YxL%SI#+e{LAk+z^-=sF1O9+j!e@y>^>nS*dFRo
zDvpK7LpF#FV}{B>OGmCl3Bljwkqo;$m73H%s5>=iPu%I(Td-28m%C|p+Dh5ijP-DM
zy<o;PSob&o-2Z0a+ks=k#DP2U%MH!YFofol4NG#KpBO<^b{TxoSKF<eu7I_On>rRv
zNIwe~7cf#Kb{!h|30G*h2R{leAN%C#4bH%Ycu@b^I90CltQ3&bAnrYzu#>sv#Id-z
zoFC_bd*Ml>N&lt(X8I?&Y{#!!D~!WoKCrQ%LVTus76iQzayG*$BP%WbSEV+~j1=||
z^3_S(DWUiflafNttnmf<7c4f*m&}M)n#pS>_d6>d#&1PD9ftV(2<f2~tR=bPk@ytK
z6=|^O>0GYR+WoHD9S+5?4ZxaX*DGdcUfA<#!|(l7KBE?Ks=ENII@1=Ti(w2cC$WmL
z#|Wl2ikBLuvi*sQ@9n{O>0Z%^{57K>OeXYz<lI^fjaOS$Jh|x$qZdd2LyR_?#D+!;
zGjz@lcftPiHlO*Ar;})jTBKntIT`(Sf?4%bQG2ZdbOnT2ruUhdA5Ee>mL6QDG)MEL
z>WkZ)f`D!ODmnY1`{&E`&Q5Twxu+#HE)YmV+Pqoa7CPKw#ALoeM@>Y|DzUB!+Sfh~
zsh+y$ijN7nH~Y~yaw?urn#3qm+AOp_XIh(WwZ!CdkR9~brl?Y`_Nt_-uAPnMlu1Y9
zXT$tgTyN&u_`i0iS(NoqrVvgppW@%)Ng$RN*Q1mNE0PKk?2>E7oLo<6CPZ~HZgnG+
z%fneW+|7Sbo6q6Jh9+j5^qb{t`>{0wYC1L&uQBe+F}>At9n$eaxv-KFGT?kA1;dZa
zjy`o7Wiy2EgO!WwOWbo`Fq3xKhAJsEXeyzHI-}$}8~0H3&?J7tO7n7b(8}<ow#LF#
z++`#gF5O~8Dst4dTh%GVO;M!}@HY>QW3)Sl34(l7Z)+{y%e_5Yx3|94w5Q9pk!MyP
z7X$NJw?ifvU-OUMuQ%HNJ#gkQ6qdZ7;f-GziAlt)(U!*H1q+03g|GTibw7~eA>5z(
zRd&3QFI?AspEc!KY;SENhuv~fm;y}%&F+c}E9GCl_5~NImYQ}knN4Q&K2&xNByJB3
ze~4SklPqoLuu592+=q4xhDE$XbN&ca95IV8B(H-j@5552lWCO9<iH0&b8I%1B<yJx
z*h>a>$ZJy`%#EWORZm{`r1(_ToP#5+BHJ#d>LD!jD=pTV1{QN$6)=9cTdCO!I?2~$
z*?6i*ht%-jrOR~Rk2)Dr4jUDFX_npGuxRdo-x*SLY0~fP!AFnjaYNKPt!gv>O#9rM
zwjT1=h;KaTMV?=Iz}bB`F@S?mFLK;sVnQw<@PSf*UB-uX)gMos{;wtCVj(#6%EmQs
z&WaOXX+Zp(&y(TX!M22qOq<FAnrd9(uVpLjf=9N0icTra|Hb=wvzV%kY;4{q3GXn1
zcepJhV?iNB($>o{UfBzQ(GrPChdo=5huZ<w!w)X*Phw-*welV0Uj@$pAQ-+hqR<^;
z5J~0%--6-NjEP2v2bR;xB2j2_tQr?M&X6X3Eo_hPC)5Bp+~H*RY>R0mtlvX-5YjxA
z#hi13*}sJ9=6quqkth-o{rY02i_{7*sS+auhZk)RF>|yC=$xH4oIIvOb?!u<XiU%a
z;a!IkcCO3K`FVXJbN8*1t_JnS^gH#r<_>r*1ngDjha@<ko7B(wIOpw-b|mYXs<D7@
z#QA6f5hu;a*27s)Fy}INI^F6*J@tIKCP`>#tRHBn+#D;kpV&_|lK+wP57whx#dF)Y
zVI^2R9*ubzB2G-MKgtDiqM@l;s5{iNCyOgtoV`Fd9+EOK<y%2U*FOTNl!1kr9-nGW
zClg+4x|N-S$;mkSIP5*+m0X%+e*gh%rMqn>voip;o(y}1(eluVtRhX?Sxw3ThSW@h
z(!?_tP5ga0zExgQvusU#f@HN!RxHa(iVFU1C^ypRck8*-<G4_j;Noi!{O%>E?88CK
zI<yzYB)qfp$wBIr01Dq(TQ;;_dnXiA@ttPIBuvRzj85x0&7Y(i2#nbpM8o+BNj0?s
zo`L&6?(}-Dr>vR}FUV2gv<JdIktS0$IDZ|2fz8nWRT@_+q1Ya(SpD4DLb**~7gYuD
z11Jqe<<MhRA8fnIi&WXrli{5+Mq^M6<}zko4p-1p=o(5Sg=N!NB+;K=zDA|>C5)#s
z{2Y*>(P~2cdta%eSdq2=l2u^0dDKtV;pFY{F5A}r&XR<2L9U%0o<bQkTDx8XM8&yP
zV}y{w1(MzJzAMvMMF=Q!Q)*5-BjRyTXoQGI9r^`@A`NnWs3;-bh_BHWb8#?TLcV8q
za(>*Y;H1c(Uy5FGU)!yM_nMSG)v$jWCgB!od?$~2K;A=rw!d(|Mz`Vg)qmpw)ef_X
zxEy&-JxWQ+3a2l#GQOokDHZatPh@b0qq8?e`M}s*+C!T<96J$^%O<DfzRJ%Q7$0m5
zBBG%MI6#NodSddr^Mdqv-L{6Zg^P3>={k}bJ~|%#p16LQ1a$RC-lrm-bxlppBK1zb
zg2@z0Gf|9R{QmVm1tgPz{Z9oJnN3Y&F<*x=93u|y{_4VTXlU%_x8Tgvi%gL6-D%@*
zd6DyZRz=;gS*IZBFi!B-*K}noMqAX8e6=r#QQwQg+nX!3qrrRNBqr^Rk4j#XYCIAj
z;NdyXTn2GtR9>!1D`BXEMZr4>u5QlVB(RST6<``|7T|$xJkqvOT^bJ(+V^g=$a>MG
zCeSJwKkqiBq*%qOBX*^{CdmMCkPF`o6SgFBObzBb9`6$Y|G7($mN}E2KFmsg<G*U)
z>wo?_cnM1*k0LQ?FYPe8^i~%OW6Ws4*x?j_{Gk7yx*H~!s0}xRw(yp7w^QVObj)A%
zI)z19D8h>0(@X2J75w!=;2yt7t6WPU`tpTP{JtTNlt%A`+DorWU_@Kd>5~bZ!c;G{
zpeU6Rs)22D(Ls|hrX`2efLM->2P%+@RHUN&#2CE^ieMPd@?TPpi}xi#rLi+H8$I8-
zwlC6}>OO$N)(8uMbx{a}l;qR&pI%4Z$?p0{mJ&6bCEf5<m~@3c80|zvkS|8<qbyn{
zOQN%3<q^6`4Cc2@CsBOJ{zSwa*YD;86dOY8)U3TeC>TE$9dC%)PPhZ`05O-0MA`!(
z_rWVguNlA>Sf)FizkL8?OahaUgz=x9e?vnF?DbJChbpyxSsx@8D(<%izt7s&b;`GO
zy6sA7lH>!zYZ9|}$8S;nb~jdZ`X{t@e77&EC2CNvys!jpu=)|tpQ;%dm7pzwVQph>
zL67>NUY^Tpwh6`nvjCLk&}^eP<<KTn;{cpdE;~qo&OTJeMR|Hq%pP5CIywwhtp)>3
zgCW-Js-ne7Unt}A=UT5K*_-Firvj5V1SG6A1K+&cw{7Ht#aPX|t|K*(&`Dz8GY7x^
zY$QC)x(gFHpM4OF(ID`8K*B$m&SeM+s3GaVX!xL&9v_qq-g<4a7j}3+*?@wCMA<3s
zmH_s;JlC6b=NO%FC@|rswd@=b!eHD#q3q&$WpQb>9TQ6|k--SW4?LfE!lKV3gn)G5
z`(g2)EmyhR%OluzwZF2}^|{Y~`~(JJjRl49KQ6DVZ2<5L6cHTF|2kWn*3@VM*Jdj(
zOc|OF@%z(l<aIO)xBdP1HWov0nVmd#iW(OVaJr#xL9NALH0m6w_!1zKDRkMi1)@d&
ziub7L#66M0>$ek%VFEF7w$^HQu_2gOxMIMBV_5C~9AY->ghwYUMa9$;CPikf*r^2d
zTQW>Mex@1}37^Q!YGO+)Gb?*<>NZ3Jd+s2oo2~J=nWv3j<zcr1WHo77DL<4s_wk);
zPQXk-U|zgJFe<GQE&W~6)E2XMr{NTyJ%$;#$$Ye@-+?>kha8Y;%&SY7-9;Xp4u%zH
zQ({i%NKEmm9mZ;k$_S9T<ikT4F=BM_RZtn?1-4YI7Ak|(m2JLfyad1J*oM=8$DyvS
z){y-rcz`K>=Bxs?7-5IZW)O9}wi_SLEW8V0O`~HEmiG0#VCXw88tGPdcD}97HpAS7
z91B^ipX?(5&>WM|R3HO2*>kqF0%)bg8~BF&#3JLtoq(RKJzeUKkXKO9g^UlMN{iPJ
z<}h8jY*;TgvaH5ptuU3klS&l_61~^9$nwk;5lQL&W=opo737RK2g&KXJ}N3kz3<-g
z3-lF?*?<N%BtT&eDTT+Nw)L_<=QOF_jQ}8XeMJXWjf@$s7bmro8}$ofT~^ho!@>5U
zKUU`pSk)>uVJ!1hO}$Y=L;B48R<cCuG)L1ERdk!a@C8r8Jx^}N6R35QM{t{XeKT3w
zB@K?w{nNjZE&M)gt;idxAK-cTxX|5*`d2S`dH$~n=2by&kkU9*kn^QW=h{rvM+XAU
zVzcPZCdP|k<I~l4Icbc^3nJ>!z8>{1Upw@Y{3U9;b2TeM99wqBRPF7Xbgi2?4*lFM
z9nHb}YV&J-NK0kNYvXukn8Z{LU%r}w4=ZcPh^bI2!?Mp)1p(}iEc;?}4O$3!B4yfA
z;qgFvf#^;v6+==1`=8JOT9BX2rXl7|he|7;O_CJmC0o`4dd+65u7|)+_`HyU<O?^f
zqyo`zvamWjwoWr{U6?fLd{3dnn6&%!>(V3a5_n<cf>45k(Wc&`#eoa~Vjmj4UKR|<
zSF^F9MRQ)S+9gee?NaY}{zsMVbk47azfK$y&u1bgVj*kirxQ){nY`ik4wqv5p<V=D
zQp<LQt}?mwmLyIyww&BtA=(t0vX3lFsDRKY-A~)I2Ng;e5>LSGg}c_e7TGD0Fk>Ma
zI39@2YPoqDZL_^%(*b})P<AmTJ*)588<oSNS>)!+RX(+^{2q{H?YE_e=%X<!x<UfS
zqV^kL-NC)Hmy4KURjFeP9=PB<M%avP#xY?72S+`?A|j*J<#AsPuk65&^hYM6d%R4$
zoRvRVstt;J$YW##C^K)T$Hoe+%l0`z4ew8c5md~oP6YA;*XtDm_FCjU{T(r=SZMO^
zZZ8ks#IBBdfEjw*|8zt9pEcIo+J6O$PJ;dUSs@%~-$71|>k-D{kwnD44%NCKSoZC0
zaU0QkCPsU;?*h8ek+r|l&UTtIUk3R+I=?~AFqt>xeH4TKM)AiZwCxiF_Dw}&0^~5q
z^m-mvh6WP^9Cc!kY`s+OyrUhc1~dN!jnhNLW=m8LS=rS_u2I#~c+#B{Iu5d&n?o)}
zm`-GUtdlr1R<u)9v@~BxNy}X>&!9hITch(H6+Tnahjx^5e^H4+ctk(Ib*J*v9lI?-
zy-d87rf>jh1;qs_nu%y{Ae`O%E5b&H^_oJBO0keG4_zV553O~8*!70GAlkGFZ{qxS
z+b5k!AJlDdQ~!E3T6r-dO;5zbgG(lr&^H;1p8ajud+)c~?XLR8<KiSD4i2@M2>;t}
zWtZJKb?6$3LzDLIM*d!gM9^`-t1lu7^c!8=>td@qeVJCZkg2iK<^|>@y-5eF#czd%
zWOiq|Kv*wW3_6_~No2QS`<7kI=^8oL8*614$C1JB$-ZYNU0tnaC-6=$7<%K>=3}Fb
zABh+)=tG0gdHnztptl({wX9M!voJ3&%WhjNiDy@wGS#)113<VeH@4!5N8m<d<-;>3
z#7ly@7X=%M$$Ro*dv1icFQc#7c;3gM(>M~TGKDE}s{wvo5|<;kR)fW@vy%ybUDhC}
zVc`Rt(O=#C9peAl%F;-vDVEV|lj$D)snd?<ygmpM`)_VXJ|0u=rXoo_S2T4}N~)xe
z)yIpXe+ePpXWX>4=n^@S7BR|qLGpo8ei;}CBq`%k%p#KZ#6)b!Xwv;T)&VZRJ1RJ+
z;zI--{1v4<Inu0`^g`tiEL~jmC|finih|+^fx>`G2Kkl+^5WG0MPlANQ;gbHk!1i&
zi)_s_wB0O+TiSg5*0TpzXgKO15eyew_y>fc+1f`Nk-tJ4nW}Bt_6<_vr=t5vR(5iC
zzEq-E_|e>SPQR?VySBE@dKFTb*f#K54+Yl&j-bEF2L@4)!di>t<=}`a)8gjtb|l{b
zw@o`#?Qj^?T#4ZueJ9}v_G2X7YUuFr!E!P4-Psa}i4sNa&a-5!?I<k~o}!9M0#z%)
z&fogrE#YVg6QD|U@QIYOiS|1Vkj3!#^L{1Uh3pl1&p^!l#RUYG?Y7B*<zkt0T(@#0
zzt3=vO>T=gYF~lZ+ckZs$Y6wzg;(6%RH3|0GAmY*K@m8M`D(!vnlpQ;FQk^5_+gVR
zrAczSnGgt@Fres&l?V)i0sJFawvE6TNhs+c>1S04K_@)<Zp+yDje{jrk%uFx{A{Is
zsU#Lxrj*sG8-h$4oVntbLYM?PT`E5bmcV6Q>#zey6zfuTc(zuQZXfJgmx1P}y)GCO
zHKX(D>#Jn{qm*PBF`0BWxW>lT+^W`UNUdn6ktd05ZP4G<_nY>AX9gd#|0`XYQ&C{9
zczB<5Zy*slm)H}#1bL2eZ3(86J_@HFllHjwm2XHyY}#D&ZyH>_*g%r~89O#kJd7Xk
z$$~=6iclqXNZ;9VlIHv$G^nNefx+%lg0xR$XlpkwM)a1i$g@HHoH9}<Uyt@`)vR)l
zy_A(elZK2?3FQLMM<=iRDoqfl3C^BLGtBUBhTyVG^QFp)o$ZvH3{MwT0Q!1Zt=N|1
zWX1>Gl%We7iHMn9ij<U)iVM1b8)fG)m=-;h!ZOaGL{v-!=!vL`l**|_5@>^(nwq4Y
zE>~A>@yAlR<xOMFMSq_bkvG%=_GyjW7kicM0Z*TWK!n7WTY!zzO%H=X%t!P_VB-y>
zV-IFa6JbY|C?AwM`Ao-BR1qo57<=&d|9MhAh*DBKC{_}NQ%*5@KEcXla3Hlhoy1}N
ztZ_m$5gqC3gw8z}m5QSw1N-e42s_Zm`IFIYM`F5AbX3tV4^q7CksJaZJIVN!g|4op
znJlJ(oQP-DceSqgn<ru`%&v6bM)!QZtywPg7xsYR6rz$8^#P*`jiMdqh&?qCUUMOV
zh!4T@37=rR)8z&)2-G&GibJck#%hAcO;L=s+i=CX9M4`F<<W-&Z%=0-nN24IWMs-#
zt=$Sx(zR83rSDl22EjW9p=sk)N(s;dH&GT0`WteYeu?z&)%G>Nyj<HItaN%CI{EmX
z=LUGvjSVy+{L^T#|2H?M*9GqNL1{MCJ6A$7+Rc0`c9q@c;*`bzzWyO{RSyPBQx5BM
zv|q<QzuOYbQzdyQ8hL0=>})3P(-M9msF95GS#mizO)%vpK4B@Ud{1$ZWS!8j1Ib?U
zaH#dcrQ>+G7c0(eb72)fENhM<djrvP5Ko+Lt8ni5QhWx9W6iplzQSdvl%h&NEaDX~
zF6Qoz(@x(678EJgk^^6P=!3t1l;~)vul4;}C}-`y%O}F9S|b#c%HEXvV<Z%uV@r1T
zc`I0t8^z*Ay7vrr3^;6-Cer7Nk<m(n)x~P2gV>mu5F+8Aty^|6e=Qnm4QWH1$G@95
z8-eJZ#~v-zJUc)e)N{Lhukt$8N*XuS=%Lku$dn%4$bC!w1{O}9`;zKQR^1;mJh=%K
z6Gi&FOVID)Zpis+RjxCLU;qKIt$>ktAjym;_@KnNUzxse>T2PYL#RsSte-kgm1$9O
zo^jmV3ZhnKe50_R?}Ntu^s_iQK1jwSum2aI0=XOp%{?4Hh>8T_m~{1Jm|(mYxg6$i
zx@^9`$(ypG2lfWR8+PSJ8VtvfF<tvLnAf%{w0rRIxz(YSndaIM2YL~dqmvYrKfw@;
z>Co4zw9V*%LBe;LZFf+N(Y;Wda2gIi&i_3blHS?G{!O<2RIQQ0M3Z-6R{_i>cz(dI
z8vvCV6cUjj_hjR}7FhHJrKPd#2+G&Rzvy=tp>GLAhCv{Xt=kJs^Jn_2P#g-bW*XJG
z0DSx3`xh1Zf>FpIIt2g?cl|>b?%HE#jlQ3sTBVWLhCytu5?3(vXv#E(s$&_?fo39q
zxq5d)@&(xAvz>8=%d`qhd1JznH+yLp$a+l!@#@^4`*a6W*<ir3RKa{-UNIZ3Vqt;#
zqYhnTT<(l=t(xqi1F@N2AT5~p%iACs%rBn%m!BH-_GnJ$%fUrO6fzHY+I8)(POBb2
zM_<rMJSz-)&UXL4-9pGjR>aVlFAuj1{VqqBgLa!Qu6=#zezS%_w7kNm-SM>Q@K8`t
zN_-apXN1G+B<bY2cs^)$(_e@+qc15sJ~@Eye${V5=(BTiX8x}rXP(>+4mGP<Aj$am
zVylT@PZ0WR-mrO8OvnmCMnBAYnLw);+H|2TtxlrB?U2!K8tMkj<FV1Z1wO0LZ=C_7
z^QP1Bshf$oiweJ#sfN)(ZN{g~1eYIIT2{};EM-Whl$#R$)B5hGsx*&381=kvRqMXH
zYY!RA$EdH%KA;0@gMna_uO@qt;mdKZDTtQ+(reZNWiDRXot~4V8LuoM{1XMHhRY$m
zRiJIrDc2I^LUggVM>WC9_-}^t!m&7iVV9VD*uVatg`>hR3>Zgrk}nG6Zm<!5=3d_H
z34p1Y0FzW|u2F^UICi_SQpMARFLXFN#v|_tr|9O|dK^|bbRK{2*m|}xaJRV&Ad-n)
z&0(vvsiS9_{rvVseACz{7g(}lR53}_qJ<r@&#i#ii!;UG1|4m=E`Mp#=~BzCa_Ikw
z3776KCWng?>{-6RU=YB{x!&-+WwzJ;imf^7d0=kFqgkVk@daHVA^ZCOierhPB3f%_
z@%^QQ3?v$qLh7WPo$1m?YjkUCnXlJ=t}mH5FRdlh3Qer9+c}&4X*y454}4zznKAg5
zU89Wqt(dxg)lftv54W!baGU{*reJv-Hvin%Sxe`cx*u!M#{lHDw3KOO(VT_Y{jQ9|
zX^XV2EhDjsDRgqPRxI2WkYqJmsJ-7lJ#1Hw52Y<p>n>Nj-&;FatP5JFGMPxlQTW`Z
zvUT_NuFaR+ikxhWW*TC0XQ$rK6ECmSUI6*ei}0qPS<hgI%kKgm2H8RfQ`IEEj^*oF
zz@t$u(<eV)yTdKfv2<RX=liqxKVqMu230<VFzsLMk0zeHJ>9%PT<?$9Cb%fgljWZE
z21QEn!yzNSp{_8d(#(hP>}pCZAucgD=LnB)nQLSd;?_}>Qe5biRrRGpMOC#WP$lm>
z8TB{CxSy5g9l8i4A<eR-^=15Y{`Osl3P_vz2LuU!eJTSEUvr8K>UgSG1OQ1IyNh?|
zB5B^@eva?-{!9<-nNa9L`0`IMAR#@=FhUYjnaLfB!fL>oNLCHP65Fwu>3jPXLvMp@
zjGkJIx18Hoor@k`66mx8@9;XR_P0A}bMisk9!r0nxMM3|X8&Rjk6~VCI}1TE3NpH}
zdEbhaG+t)qA6~8}O~&o0_CF>uI$wW(2oTviZXw$&`bZqU_t_5*-7?%xLmV@Px;*;E
zRx<1XNnM8Mqfq6vK&k3zSqNBS=0+c!{;DT7tZ*D-g9kbkl4&Vn_7}ns2I58>Wh3g0
z+{f$n?*xowE#|m^5XLN2$O0eQ<)}$a)o7tesY>-FRqCJ&ksv+?i4!r<Kof03JYtUv
z&4uoM&-!Y50UF6r$W(jC;t7nz3>M4uG{w7dCDTC{%>6+p>D4?-MJ7lyFUZ7Y8XFw8
zxb1DdBRW$i3WLjQ|JhnjuF2^ZdT$~*y!y|d!<i|-@|dH%P?5y%Ovl5+V+*jnUO2q@
z0^tZuE$2E6J^~<|=VUPM{zxE%6xOls0jBIw=OG7};j=_X6OuT-6SuYLp?dT3t|}JD
ze1F6RmG;Nd4=L;GpDZ_{0R6M{W3MjH1u<MSg<2cO{L3Bp+fqFY;Hm5F7KYrU2>1xu
z#C3#(iS2XFmeJL@f3`i^lCRKVi+=eMrY0q<sUqRg<2w?u-?00b7r>#Jc}W_ZWUoDc
zFX>_DJY(ds5~7jN3s&l^A47(Ycgxkp(K=*y+u7=Dys+*)+9~;RadU$>nQ8v;3`xkq
zAYp15g%OgP+PaDoKLZ;YHqh$IY%DU0aA|Fg@aWuTT*WhK&j>naXq{Y7#7h0_Nf%G0
zDm1EAetLM9s_^;l*kkzL2L}AV2L@pdj+h@2LmP(f{m~52FYC*+D;AEw6~j^KD;B%p
z-~7-)52$S&?v$<GjZ(225Z7Z72!HJ{NDnTCjp);)>u$+|IbgNm<Uqy73b%~(tvc@k
z!)<dQxPKM;=3ck;+GJAu>mgN2BZh~Q2Ffd#F);km%{X}5B&KS~K_<jDrv{pGGRVt(
zfXc)};Yxhzek2E2<C?D((597nVO4%eDVGu}7Z=4vkLE50Z*@{T8mGo0MAv+yid831
z<8jnVa154qarvCWV&M-UNu`+`kR`n|n?KE!ddJa)!$ZT1)lQ~t9PN%ynb+6g&hM3L
zD;6nq@2J5b3D!4RU*=CTguw-NMJPr04Zz_rX6f@M_3=h~@JhTql(;*~ByljZ88Z+m
zijlN99){p;b%>Hx4Z-+BT&Aa`?fmrhh-b4|^Zf)4P1?NvfJHdMo6NL%cd{1LBO202
zCyqr)t^N}7ecdbcc)_Nte@=8*q}o)11H{H&qVoB)v@`SsA6`nc%mty*-*hjScUE=M
zQb=nnAx-96gby_RQz4j=hwY4|-A)TV`Z))^v{Szfmx89H-7u_ttz^hKld!VKSA|m6
z>T_ju^KU9FX}C8JH@!j!O0A!H(lZm=rD$+e>7DEc>0x>I-@$+^B0uv;mS&3s*0Q%D
z^YeBxh>KY6n(QAxkqv>x*{8pYAJ<dP5B){6<oXUr{(vE1SV@*8Nyu?T7uS))ZTF)a
z{bIQ4bH(V4h6<MuN^F1D@8po$_@w1^s$+uy)fa{Su*AO1WUN?L!F)=J)SZ{L4`b_2
z`0F&Q;cubN#<v-vF1UzPwN&PvD$vrE%F^48<zmD0S;(3-9`Pf@jfDlx#Z0fgxUmp1
z=0)YBC8{G?us@`!BSImhie&5Pu~~AuvA;r=--r|OBRol-E8-Mk<b+Ry!omb>Z9z1J
zf><!)DeV2rteuAE9j^zg^(&=_{22n2$5&8sEqBKv{$LDW8<EE?8c4^k8MXB;J`km)
zr!!dXNF00{K!m#!HSB4!vo~Piy|8s2%<A^*Z_Wi7b#%yAJx=ofC>I-%)$BOI3al1%
zMKV6sytrRq$o5|En5p&ci&U_SJpNPrm0UI>F7H7w4CgrfhjxPm;N490Up3A2rmOuR
znMN2H72jD=)%@<?p%N^pNub+TYx>^p_ZI+#OCe0gp<${v^)ocX)$(31dUBrj>v_oQ
z?6qvTzu5ldyBgC6<AC=jQ|wDqgg)=L*|)7nQ%xGX1m(Wasv!yw4N~fk^E;%#`WM9h
zD-+Q=QP*^TxLB6p1qmCPaJ8=;+(jmLCjQ+N((arfGu!lg7^8W0R)#7`%_a`>Ef7IX
z^;N6D>YXzAe*E*>7pTaXSXv6^SgAzThZ|*gIiHUPm;ZzT{%AG*>i}=VqCr%|mXa*{
zb~sa>O2c~zkP$|(9_Z*QY@MctndH}PxPtKt&$C2#bBeTxzw)Ht+AH*!-|kjL@C?mh
zgpgnHnDii<xlzD1PZ{_}yx`@?Htpj0_Nr%Ybmc=fy>;os+ebBJ&03T>wh%#Xgo}Z}
z22yYq34)QJvVcfy8Oz8@j7)=P!lrk!?xudli9Q7-?ToD^X%;%j)O9Y#XwB&N;ZDl?
z--%~q{1{4Mg|Xio3a;55$pLVsMS8h`EIppXQB9j*WTSpk0;hpYmaKFtIHXj~;ZuZK
zJ<082#&Nh8xhW@5#j2&`T#kofk3aW%dS_AgC(^pdu$UR=-K|=1Ro2`bFW(?{?Y0&f
zH8U*VJ3J3oDl5z9-o6@<=-<Kil73v<DF9U!%T(&tqWeL@M`?Q9v=R9<s-OS4z~4_l
zaRV?^gEeH*eayc_Lq3p3AP{gOgY`9NH9X)#_O*wdH3G1(o~~}cymvMG@Or-HtyhV#
zGR<1UtKT-$4L`WU@Oh!N8?B=?(<36}Y#mj$qxHX#mvM&i?h|Ake<d?nDv}Up$r-1|
z&f=e3RN<Yx$XYk9<=Vo|9(?4US6q8S3{J!|iau6`fR@!WSE?pFiW?6Kbq2HD8bHx;
z$0YQu>md%mY6U-yBqwVMJ;!maZO)bPDSOD0U_%`_BX2|_YRCoAsp+GX&LeNr-MzRL
zAV0g9vc@fhoFhjA*7?92qv~z~;)MTB7J8b0yOPvi0i=Er4=c;=g7MT`fo@-=&zyDu
z!=WfHP>gz1Ubpid7G>cfTL4~Og*q8B{?B-@(9-J0Sy}8G79%qcTJ6QdZqC8iM@N4#
zk?r|jgS3v_AQE-_t&w&!C4*@#Q3Ul;PRbvCBLPtdn|pgy;Z@XXWgtKn$^~5COkjeQ
zv%>jmpAnKNvs6DL_Ky;OH(!~a7JHmE4@+<ykVMSRLMBl{WuzvCO74Ar<`;I+Xi^H4
zE)?Ax(~M#^lUoXGbG;_AY_MVzO;iz3)}l-&{uJV3Sn~$!8?$LgAf<Z+LtG(9`HY%A
zb{AGf^oxU&lDvhHMD2ItH-G#T88z|uk6=|c=X^S?_TY3C6&f`z)i)Op6nIjG(L*Yy
zxskRH8-mHAKSu{4z2sk`$Sf0f)JkcE%y{*H8Pne(P-%ujQ>|PlAlnau`b}Z$Q6zBR
z^XaztfHC*S*{=~TR*O~4&T?HaK+vP-a!%NSywr@Hta6^j*W|i5OXqI#I^~i|r2JtV
zN=ePDTOxyHwRi)`W~~uvx7}v<_9EKU(gfU+lP((migC7aGXB+EuO3rNmG%?DB`iW?
z2-Ku=u~e0Jd_Czmo!p!K^Y*EU&rZbErJ9Y>!2vr<f|4w|FlJ)?IhsglKg5!{K^tF4
zV8voRAQT~rf@0w(;I%F}ixA253T2}AeZ!Aji$`2^3p~DN)1)I-w@W*}?(V?svcg#`
z6#pp2k)%x?NQC)YkJ{F%{>4w*z(*@Uc)lSi{+{pI{o_s0`t}B?OfKI8j8jO+$TYl|
zMWm>3_&hGyVY}Y?T{h2^go%mN(0dmG-BxEq$xGm86A`xamU&r7KWYeP%!SNFP(8qU
zZLcL6fEY{Ps~HiHSP@G}r_OIM3JDO$2?v3~qOkDK+wbxJV&wl%j<xSP;2$$a3KB^}
zw3~loH?i{<M4~eiLBw8UFEn~)V-`4Ij^IyKClk%OxVRu)xV*XXzkdMCwGHVnsj$9-
z?(W8~1>rTg8d{WUWteqaI$1td3eypVlUC4#DwzC<Aa0K(X4u#ZHc0Lfp|_S7byxx}
z73dX}D@K`B_a}JFUq~e4i}fg1(@%yIR;ZL(DyHGE_*|rS?KQi967R)~RpMOcMYjgR
zah$#o+9@nGCpDR|S^oJ1z={Uame!5WR-2Wk3ZHpQoUp^DHEOnL?)2Lt>FTAoa$`92
ziv)UviE%=W!I5KiKa$?8fG%HrZ_5|wXe3$mOrrHjqig)*CF#zKlta%EBdSdr$Kry&
zD|Se0<ZPYE-?n{E`232p4?aTJ>_Gp)*~4$=9y!-VY<DOc@4Zx~Uk&37fZYD$CUFfl
z{M&p78vda<3(itJ`ax_p@0k@Nrd%j19y+OQG_o_i*!+{5m;`R7OSN!r#0m~OuIZfx
zvoZ7YmQAfFJnHlZFesc60g&j#RT%nvu8#wD5g|Y1)w!)*RwXhcvmn|}4W_{HbZ&OO
z%30(e%XNacN32G?<ZroA4E4&N(R|-A=o8AN<gHA9H8oT3?L$k!IX<nLN6~SXs8`ZS
z8`37R6P)3naY*M^b)@>(p$rr@Pk%$D8Ta`3T>#evR8tR~U;Pan2Do0KO+pu`KURAq
zF*DJ)Zz`K<g<k9hlfk9xW?lkHW!~Z<s++z|&IF~HC84vMFw<4u)AMvu>l6DW>PGS~
zO75Uru50Kdqtl7G)!Wb7v7|gRP7|F!Zm7SeJMl$snI5MOx3^rrCI*dFWkJD$v?r(v
z$g0T-em(dGin_V>|ETC!i>1A6BpOxLLe1wt)7whemTLOAT)3J}RdILO)_K4^m;rNd
zQcQn^1A{SHi@;w7T6MizJZkBDu>bq%V+P7j{rx`n#<!b5Yzk7;OZ|{&R0gjD;fwXh
z1P%um;HztENVvE(X7x%95W#rgQ02fVRZ4_P)ih-l;=5r=u4PS2clI|=vJz_<C2<v*
zV0sWSQAyt`)J{oWnhZWh;PLyANhfAIrOUsKZb62hm!T;t_L&iTi4TMjT%q`c*C-@2
zxwbDV)M6<@_>G4nVDo%7`9n?3H~Z!L)AMzW32+atehLmA;s!k=6x8=sX+E-s$l0+(
zu3m=VDT-$H#1ON|i)`V(TJf*a`q2-J4i6Wop#;M@N@Puj`67!|d2Wp=TvzvwI8}Fz
z>xyNI+*eDMVQf8$Je`NlFO!Gb52oGLG>cwH*@5PlG7BSD@lf~QgBdX+c{4aV`#7=&
zrD3Z{|5&TG#mCQWb5>I41d=sOB6B;H-Ur>bH~GT+2z}|pe*!p#kF8toAf<ws5p6b$
z)u9Ztn{|)ozXKI)FV;Uda9o?#NQ?YL>I}Z9bIzBFrygzcKF?sWetkaI<#4<r1&*s<
zRaFxC_>HW+Bm-eQrcr&wX1*!A0&I`wQ_p&O$$5q1>0FKg&CoNBN)`I(=6>1*k0{n&
zD%=GvpEX7{lh8+y$h1ll90rO|Y{d!t?93XI)d`lX!IJ)+{5;Cec)(zGk3Zi$L90Tq
zgZNdeh!i{CdN_f$v|Lpv+a(Y9Gy4Ki|B!lCslBv($_+#a(yL5#?ivC~gyHgHdp_Ms
zE{O5C-^nDP#d)c2C5vY$-9>9ah>SdzNuvBNQ$_jd_3*J4$PO}hn$4Jv&PgH&$012O
zXY`)^be?Vyv-7yp)8jZ+1%a6QsUyvUl^3K;6#J3vw(1!5PD@3We@I>giQe`|gBlyC
zx<^Ntsn|%!eAuC0B~7^BIo!}XJ{s2iHdRqU4MC+0ljr|oUYa_jeN3$Xm-+$Q`(II@
zBlVs7(q)0<s$64~(dIhcERBKHEhyOJa7kRD+ZqUiF|nEKorNl4KF<foqVS#CcjN~L
zH@CF$qQ~P^_6sDMLWK?|DxH$ZM2#m5A<6YA@m|Pcc%96)EY2_$7S&v+SOcj>|2Koh
z9AL9{aAl%CmdXoheTLs;`^IA`Q>dh|tu&{x49pnM*|Uf7KBYOLn*c)GlJ!asYC}5B
zFzIt#mbiwIO&XUYwDDkA^zPjOpE(02gZ-Gf$Lw>egH7MktQjI{M!Jgch$IijVTWld
zNAFug9Y5b{|EufH0i*e!9PoiioFL%(*O3Ka%-lRG>ILgWlzBX*Xh?4gxMK~?o#9@}
zpKH3=tTJ`(i%YE`MdUOZQ6!_Wxm_*orApHnAB|r?VN@(6Q&BVA0XGr3T{R$W0FI8$
zqS=k7ZNe8|q8zg)>LDS%?8m^1<_wjc{@z-?|Nl`C^1p^{To9>Vqzv`a(1K0i4VE#P
zh;eEIHhzF9Idc*--w?1=5i=h*eo^wK3tc2Niod;Am#x7fBo*VO7c{Ddm(e^y7XW#^
zLK>`Rcs6-FBJ1erR$C3r7wOePSj?4tUwBfl(1|yxfJUeJ)%mvU%UmeeGu^G2pz~bh
z=IG8QxFyb^{|D%$3Du40#ZrMW-0M?MA8+89=BA+`CL@<|AA-?!ruWD*4ewVNR4V@*
zCn&;dd5xkOA{f#@=g`Ei5?0IV-OA35Q(g!l&YuvAhI_+x(BJ+JG&oHzg9!1`J7T3J
z=Ns+5$@wAKUx@6$gZ2+If=!Gy)<bGfeySscl2y}0C(%UgKZ7pOlu;3+%MQg)EbZo1
zOI2&|LL2l21k6cwa4DX9fBAx6{mp4Lv;;^|SZ|C5{BzVk+I;)}K)v1kQS@_irXEh5
zW8<wG2NxG5vyLc7hzm>~f)W(IKr$znjtCjju4vf6F_9PIa7(f!ix#JCoNa@h40$B4
zi%V0ldyk8zSRf$+(m6n?+6g`_Q5j977k`!K6AUeotu`4|dttCl7{g~06DKjN&;c-2
z)qqQPdo;x`Nkl^B`(m>(Bs>8ZX@4Ye7h|2p3VQqV%|sN$OZB1r$yzPs#8xsU7FMtp
zfj2A$hM9Xt*`#;LOs8%pn-!?t{oeTL=6g+=p@Biv*xOI1DM|gx_WiS*_bpz`=B+Ps
z4-bN+iqesY<zn$5LSxCcL;7#dq%7?61v=<ksi}kLy>5ap3Rw;1%idtm^s9cMerj~m
zue`QXggZmYvue%?344qkI{y?VqW{Cj-*Ehc55P?}yb3_Xm9FlYAsm!j&~e??RLX)R
zH>3hd<=%sM--Dmoiy2Bd)=lc>7Y@EQTXJjpc`a!Bi4~@mby}9MkPs0KVLNAkk#sKO
z_tV?%kXHLJJ$yxP!C7##+S&i9meM3+Ypz69biYEE@ji%PWAiZhSiK@=P<`!kdn;fl
zgH}7|7|2r~3q!&M>J|E}EAv;ss56oDcXuNR`g}ZKH~4V1Gj2S2c7H)O&LBff%60X+
zU%+p`l>DtgyF#a#!S*5xcIgpF@NM!s)v=%#mc`O&*8W9_4p-!=^^b9eT}#wfenRIB
zT8;9R44t5(!z4WGmQ7_H1U4nWMLbl8s#{xIQ~`)?=qH@+kU?~R#EU;^DmHq2RPp%A
zUDM1>g|KWs9kj<W9y<I`)i*f-q6|RW#z|;W2a$DOL4|G8N|p+o$#K1Sp84D`5pDlW
zi9<rgrFk7_aXvScSAXeCg#JhJ0Wq6*{jFMK-a+HU@Sv<|0%Q>$z1#+HAx4CE-9Ehw
zn)lx^Wgmo0Mo{Gw9%?O=mF>K`x_mgCZYbn%xgpq{opFIHXvR}n`a#jT3We5qlns4k
zKq6x(_A7#ir>6<Gxvk9nR%BS0IIG3RG5*@=nxpkw5>}w3KZe-&E7&L7r{CX!w_ya<
zXF2n?;2$2>8P7rWN*&RKiS)~zOO#|ZEL2S3{CLhapWfNW0d~|~R+4px4TRfdRIVI?
zA_Z|}8dVBJG&*&d`W~0y1Fr7I_Ze$jUge3Ns3iVrm#$&TeDYDfqi6)E!+{~^J0h1n
z$x;2iNbp+q9_C5?_T;t5N)kawt}}r=q^c*qWCIAK^NTw9QVLAe)sdI|VMtf>oF3yC
z%HI6s0q*H?Bz)>%fRx~KZaVf$E4SM5p)fnH{2w?<pyFHjnC?Fx<vZsPzhNGzpBMsU
z9*GK{kw+5eWGmJOP0=&x`Q|bsQ}YS*NATU3k{3=WzYmNQf}LG`ESVeQbfw;J^7dHi
zbF=3$ddJBOxXC(w5MZp@T610x2nvGy<oC($b=mP?D^4=^BST8O?6GVb4;J0T#NAoS
zg!ah%;Wz=nM78@O{m_%H-FW$X0RuZ+Osw95Apcp8Ua!snuhZ@9bfsoY&A@;Vo5c!b
zb3$1gZ~jQp3PP+F=u<<A6|ED3Rt1`kQp1&q^oJkg*fJSBP#E;Ofw8$HxP3o`7}3<b
z`6*yiBUiiTjoCMM&-`DOcoh^xe5|a8qKCnkc+#SV=RN|%9>=H^tjP*_tZ0Hb%P?}N
zUBp>)yhNLsLRu$cC2rD-HqxkWy2GOPAtQMipYO#G1;;^MjYrNBYPe=?hd2<%IOROC
z`N8}3->ISXAITmtV6?8HPY-foPGN^2DnZZ>f`xgom_zJYAc<$kH5knVfp-3o*4iNp
zY$bH%bd#l&r(r{*(fP-hs^?C!uWwv*3)jrI&kKgu7RqlwOdBg${#LqSzz&yccQrFh
z#uC~!EW$%I%+A*6w8oPP!%C0Qjdib%1f4&Um|+f#r2EtJ++O>2BSN+N`Q6Ztq_W$z
zoL#IwULP!1qu{T0()UMZWf2}eGn&1%x%k@H=gnM^nAU3(FM~9Qjaoo8luKWNg?=p8
z3%^3ZRaq@5(dgBE0puS)vDHFJ*y)h_dZyAI->3_Tv<@Vn*aiIIFocng{}J`oQB}R)
z(;`ZDcgLlqOS-$er9qJHl<w~ClI{lSZUI5MyF1^5e!jog<y!KW>t3F7p1t?X>=^*^
zT|YSrrag%q%pCgI+_n@=SzCLzjLyl-+0~<gXv$+uKuum9K4p@^Xb@>FlCV~_5k|Bn
zv{5``(6g?UTzij}8%{yx75$w6ncx#MpJtt<`NaAQ-3EJy^xw-i1omx|0c5tTLA}A)
zBqm{Z{JljaU-^-RmZr@K<M##pSlor5jGwUwb+U-bxN2vI7O*uVFic=Q$%fydj+Mbf
z!%JKvzygJPwzIr1>T<`h?_%5K>MV!Wc6;lHtWm~2M}RGC!58EQ7GuKPR%0aKVpfc2
zlxMs<mKgy6S-Gvx##O;FbDI$<*Z45xVZq#5#r~-wa*%<pr7p2&ABU~NuuY2|qh*u4
zUVC}$cW7H2j{FCr2qe8DvVRhJXcw_z(CU6bbarlS%&Vi1B#Hhk;tz346Gns@zD`n;
zZ)7|noigeDW=;JI8+Wd90Enr#+31D-00|lLSO<aNCbr-mS)CdwiOdpC!3_`BWB7`c
z-o9Tdj+y&Rrrz{<KW4TE+qI@C$3_+rZG7G5X<;d5b{YB8XV%dx>0q`#li*&}(NHCv
zFeWKMl8EHSYq&YWHtMkjiKpxdR$6YjHxJ!aujgaVUK?c6=$6o^zrE{I(Eny&g2B7T
zDps>Q@~mJxdEppm5j3P2DSueBp0oVI2Apg-VLmilm0nv=2dVM_b$TmjkA&*G9Jfo&
z3=9Y%w2jD`fS`Z^^P&oaR=*%P(MN>iYCtG=w9pR8J6|ECPu_pnGdl(kBugdK=Haq^
z^|vmP?K?=ISwA^J5Tm4&#^D3wwBPPF&0=kEZe;m+Yv?;KzCdhyoEmIM;uOLGRd9vd
z!(fdNA0cjnZ<H%w;K6`qdzo_WY~TGSI#{26DNS3)VB|$aM1&Xw;<#xCT8g`S9-)_~
z`z;=7a)6A1(cy9mtUN{KkT@qray*#p^A&;J=Aql}9dZ+YM&dDkH;z^<+e-#YAx@3A
zB#KMIZ1K7$Z*e#d1+0+1{F$QzOm?E4p7&>pn9`yiBui(gG8L&=S-vK)N|B96sN;bf
zhkx)FUc1oYJIW77E{7oa6gikR23`PTB-$*fp+MV6$<(}OtO{l9q+aF)`Wyj+;6^9A
zeAUy|Ill2kr`N=Bkd5-lgp-$_HPQ=>%3#?m?vD8F$Mxf1cPj>IZuNhm3yr8azD<S^
zSheyf+-BcHM4j5o_%g~?G0hx8O#aM(K99BC1~5V4_vzeE1BXM5><dvr0w2gh$cluF
z9P^25B88dK?dB+ifXD6U>MG%cFjii8%~g1k8U?a$HF!i^k!)9ctF!IdPcY6eW^5@8
z4rgDs24ld{X}ppbDT>Q?P020fQ`k{9+4zyAKAlr_GgQ*0h$z?Vw$2L2H}F~*K-KbU
zooHmqVP+?5Dh29eB5$KwG00_dZ@g^yoSiY)(uZ~f+>Ly}SM;T(bw8iyM_`wCW<!?+
z{dlplwl!uT3O^}ucjD=3?P!a3M0fU^JRvN`C;!q?3u;83p;Y-2AOBng5-(rHof?Bs
ztvuB{hZH72*oqxW8AZ4`-518;co6^O`rPlx?REv#)zt+B4=YqRg+=2Ox0a83>wzMI
zw_&uT-s_!%3}Ig7b@3onHvKh*rj~{mlnOp8wJliklmd)2w6A0g?=76Py9;~f^^qo!
zE?%?01%;WSCn#uFeIagfI5at3k4EB6pr?OBF7#3SKK_jo(>KV5i+N|Uw0`39O+wXS
zx|mgdpp-c`)=><AkM<X#aEgc1Icvl7v&&*!`Cft>%C$Cu$DfIdoD2lj?soNaan)N4
zP-9G&a>h3cXA-k$HeiJ6pRw|)VC~fVF!8vB+;zLPQv`&u+6f^`Xlhs+73RMjr*`s#
zq0uVK!{93q@2`5l#H5(4<cV&c#|=yu86NFTxd4!%{0|4JG<Y7nEl`W&N%%W&Zw^jQ
ziSx}FQTXllaPDYD$IkHEH1gR(qL3=J56vCUD2#KWs}#`CIKNEM2<J;k^_Yc4NjS(p
z$YpVNm1{K`HLSL`-mY!hgCi31_SPTH7u<70lYO{m4k5v*ri;)e<@+>z<8np&;V|oi
z!Q~XL3wtG|<kpDqWH2cG{Jihkw997Ne7$&n$O{_HQ>W>R0Ihl*R6TFSH|xv&$Km<8
z)3@Fa_)Guu{lABQG)<(Y1CttkBi^kVp+SQ-IMR#NP^j5%yZ5NseyYOJ;=_jz;!&}W
z&ZjxfmAdNHUlT@gB*gGU9MGmdNV+By{?w3!yZo_FYk;G;r-6Likhs*TW&ZPdbFtp`
zXb`!{-DT}pNF0aTU9fgo4J(L-j01!P=F?ERh0p7NwcO$$@a4;wvb(7!3DnUPcFghd
z5_CT05Iory!P_Pgk{5qPk|QbPar5P3zdX_!MWeA$l!6Udv3O_{6g)UWLc(+&cL*^A
z!hYc5u-)v3*YK6jQ;<?}qs|dAu6EF@M-%$AeBN`fCAZCXwZV!B+3sPYuuxuAWy4~5
zMP)LPNh3nXMQl%lGHZ2i{5L{UTCunp_HVJ&UjfCcFc}QTfz%E3+!NxdlyLY)Q%Fsr
zX84mz(`X_IxdOqSAHq8Gm<^H$<RP@3LqVfO08q#@81F`<NbmJqWJHxNhF#AqIiI*i
z<bg;*gZCmP+vn+YcU%C#Xk(ZAeZV1&7HClT@cKTJd9i$(dT+lwAy<EgoCSBg<3*cG
z7;mTUZM+q^mm+AO)O@=tRy3|t^<~Q7h|fm87i<*sdA8Wr(CFquP~EJUMT1>fWN6cQ
z(tPbGJFb7%$jOQ+&4^FQdm^0^6_?FYGUQGGF{*;(=6_$)?mtKc?$RX2k`DL~EI1K(
zAC%>XR!2>0%a0$zIARncDz0sT%nc?D7$S-|2{&KMg(pfNX(}PcQw2X%;DOR(kzrJ-
z=wrNe8Qd-q{VJK5CP@ytOErkpF2COWyUmeivEf_X(Suf_WnWT8>tL4~PIysx%!F2b
zcY3q^+SXQbVS|S59ZgRF(uIsUS#C!#Dg9wjVR#e@xzu{;$#S*TGXx&59h${lg-9cy
zawqcky1$oiE?YxF?jmMV@*iepvz~h2dV3@Qq&DVEE$U?ZG7(EW-DS}K-GA1%?E06g
z_l7>dLGDh%bGX%l_k;jkzD|-FmL1c*E?)zhPH;M2Tt8WMPiFP}ytK3=+_bq{AQi(U
zM{srWEF*fY=7gLke1&$-oW%=wshGX!gv#tjIW;wv%xaIZGoDE|!nE(`2KW?^qskT}
zVnemQ0%QsSKtYfWz#al?UGP#~56~8Bm5GO392|oJ4|CuCeCaRKn3S>(t;><zsf06W
z4ff6sCf@24^sU-4K2CoU28_yxNkI%qfD?T;-~(!NIVW>}k4CMGh0a_2{dPD(#yru0
z46U;$!6W5w{){2wKimd*_B4bkZYhkt&8Wc1R9~wSyJ~pOL`gl#Dm-Wm@Z-BiF!rB4
zZST(XT`ukzRX@F=6A+x(HC+Fah>NCC`@~|sLYwz6D$$DqG8jZ`c!<_dRu)2szzN2p
z%T*UW*<0@s!{RjpHCQdb$Hc_cFql9xkH!Iq?r^Yny*Wx@;n!n$6^nQ8#0$lsgHdyK
z=5~KTOQP57e}lZR(4a6)O_Td%;%ZPnI~)a@&lC+E7r_1y)~#x*oA8sQu&RPc8IBX1
zE+V<;7>#@5U0H!QBt~>_u)r^v&ZFet_xz7geEXhcX<&lygJmnDl-|>*-0=^6xYrf-
z1~CU`%pAU>kV^><LL~Syak5;4h5@gNK*;og({77DfjU7?Jrjb_TD#N7{q~d;*oK+A
zq3p^RpUO4JIJ!AWgfJ-*WHh44Ta)piW|VGG6zctetitRj_IQi`GusE;W@JEYMJRYJ
zn+T0w17?#ld;s8Hs@?ivQs8$FHhjOo^R`@VLD%X9h)}2&E<l9!LPVD79}pnXW%N53
z8H=dlaY>A--Ia>GDt0576^JDc4elrT8Vb4!42RW5pHl6m>iG5d<^l3O{xYZkzGyo?
zxEC3cx)F@{=r2Q+uR%+Zp=R*L-^((C7fDu7W5oP<>mm6AyX|+zgwj;YZSFTjnwnaM
z!3I~_-Sn>)>p`kV_zN#Qt+!vs4rT$z2acyqUXl2&AJ4&lQwNS`!|B+7Id<PJfPLsb
zKTPf)J$#j_on{vta=`8{LhZ><K_O|&iJz=3!4nq2UI&U2yVVjuKYz9dU0hJm)gef+
zE|^v*0nMcL<7HpFVSn9zFq5bRsTH*!`ll1ZEY@$K5=w<cS`B5zH&bH8y6vAaKB<4d
zG@a-MB@%b}Ng65ClecsxkD6$Zgnfu!bmSE{?eLT@QS5`;&rarUQv-SRl8g7MTF5&s
zaghv%6%*yg2X~Xytdl2>)PSRubz-cKBmr$JP|c_U{_7Hw*<lsIHh$oqXCEQfYx)I?
zgTq1imH82VV;fnW`6+{ZS-ws|lEliLlRSkHWZ-0Z`(5MaXo2B$;NEQJ2W#fTL-){-
zgh>G0-XF|OO4;t*0NAtnoiRI`nW-)TlLih>t{y>M3e~vHwV(V)i`C#<B7pe<ykWm<
zp7j3o4V!*({W0l%yg{<E0574R$Q8!=SBrH>L_&k(1J>Woo?KQdZ6VRoYfY*mHja)$
zKE5B%B$ivuW(!#XWg@1vr`~E27ONc@+qd6DBFZhM@}kM2r9B{PYmZBr%HN~#^_l^N
zW2w1beh(ZDdq}{#Mp)SH1Staus?aR1N$wz;PKzxbkl)txzNkNW$gR*Q2}qllXb;il
zOKvsJ`$Hj{mRJ8;<fjLbIO`wEQ70wn31c8PmsfIj_TIRL-O2i=&~yH6xfK0|4XSPE
z|1}D2obnL;&}7Up#sdxCnml(A1bzK%FAEWY^~oTdS&J`g(ZoaFZmWZ9NHX(lbPRLg
zlnbDSFZLFjnR6pVsaAjv7#O@6ghhwJWK#?9kqHpWWhqU+a&fg1F)_W*(bs3dfvd5E
zZx>^3E*XEiN@1RCvfYel$)Re(!|2IJYq2s32ANq1P}|-fUg$Ae^h+;wddtD2I+PEz
ziS<HZ_7{Vw=1eAHz<E0FA@rPIHAA!FKeAQnd24q#NSJsc<p7wVUKP<>$il%aUrp&0
zM71Z1%JoKOjA&GpJP6x}3`hHWEO`<rPc-u9){xTLeop*BXe67&YaWmLZH`S0$<T3L
zQ81xi?L>w@;twwI+*?QzYOO5X1?De$lp+p|yr=)V1x5IOn!2}_);~B{^2A+x`Qcir
zc9{WG`%P(t1DPdto|l|vwparkU_awh2u<RkH8WIAT;&@eLr5yDD$EvI>eJD60TDC@
z7iZ6x;NJE}#Hz<E?<(6KQErdBcNG;CilF`3cF0U_FJJo32PX347d2sqEKN8=RGhs`
z=)SNnibm_z{yl}f0+3X95b$So5ejpj8av9}%}tQ}CC?HGg_ZSd#MKqixf5VJ^~P!p
z14h7wGAYz^&~YS`#y0+efw{VV56PcBaqM=7jh#2~uiUWBjgp`g<0gV_>gubgWvRMf
z->s8aX&9DXvkt=%Bl}B|%^@pLL~Oz-=Y~n5d1dvRqWpa$!!PK<|EZ#Z0t_;{I^l>H
zD7-R4L=#%7<5#ME6{MDqF7o7pU!6!M4nXuZ@!h3~ChP>5sQ_3?&Ssn_0-kPQQmcNs
zT{Z59@@y<Pis=A{__BAVe}lkTfpq>+H}3s2+-0hwTJL-0k4G9VW2yDYOtvHhVHWYj
zTG)9J0Mc`J))RVHW{w(9uScL!V-oY;XSLRp!~TKg<!KWU05PFHmt)`{$82a8(jsd>
zOguDd7Id?FKIXoDe=#515T|k$2}iEx9&h*MW{Dkpht2$z49Fe8;{)$q#&^GIkHIEt
z$VSX3LnHS0$QxAarTh5Y+V2**yfG5-Hn${S`TpP6rv*K3BIb9#tKq?KKxVdQ?|Tn5
z2G!VG4O7@9JG_;Ry*30*#A(0N+jf81%M`%qd7x~bEiE`0zCVMEh4md8m2#0;TvCI^
zi{#;QzmFkAa66Nt8zGAjg`6@x>pT46+>oMDg_RYPA*tBS5!Ppe51RE>@DUV1NOQ$f
zvpk?_^_V(`wOnq2Ck;dp`NE$~YfE_wO`X8<dE!&WZ3!S!Y`H$@7&Yvq-Y`WD6TYLo
z@T&Q2ksB!U<MqhZz&{pSNT37XwR{4cI!UA(>OQRZuFqfNv~`QGMz5FGhJxVlabv&x
zhb;jh0s*XugO7oD8Uc3z(<K`ZD0LdWLZ>}Yg+}!!0Hp%~ic^JV`^fwSc7cF<)2qr$
z77MLxBp5g(k^Rmn7LOg7^wgA%vwcsjNEiTVBCbx{gIQIu@uWTqP@Q%c?!jH+DH37y
zj88jxKi7X;G3;LhAWj>5`y>rQVq#*zZUKx!I`un{@b_m)G`@?dmTV*RL;Sr$wIcZw
zgYzdKm_2RIkVM9JR4f+7-t5Z@M7)42N*W@`zM?eaA4wGIg#y~_(9St;!q1Y!2kOS~
zf)TsMJtSTIJAbF9wh#Y+0zfZ$=|W@>9Xz{V*Iq($l0VZRS?CZ@uGK(9MD)(e%F4#U
zCZ1xT(Rw+4+m2eTl)@AID95lUaxk4dj75sV&q&kyk}&OTbQKX6lTH*UK$hPOKA<5R
zp=24r`IX5J_jnpu2zYyYOJ}lZz@*^R<5-=XK*7QXsO^lN5%3XYe0C0H{VW$cImr-y
zdD9=d-T70XGQKT0)+zp3pnsdwZbuUF+%K7a0}@bPZTTzq50jA~4S#?3w7@$4jRC(V
zM&8KZ@pQkIJxj#FAs*UBT~9st^i0=l**@@(aBXAxwe<1doM=rJUp)oR2C;hd{h)k8
zdcdi`#sA``4|vTE-`K^cXI<>4nhQ1MAKKX878?h;`@)PgXxz<zpDEEk8)MfPjf7U6
z*-#bYeYQb5Uaac^n9ZYw4+;1CqeYmPi9#m3Y5GBT=ck>mQ~3&pPc@b)v>GDaBH}hs
zKa@)Y9n;uyrRG1e^+n;bdrTf&PMnWS7ueX@1*%&1e7Szj7Jk2Ya^n5!6E!h*)nt8x
zZi^qPhYV;{Fc{@}B|#d5TYUO;_U;a^*K$@qm7OP%Jz`P%z)B2AF~5of5B3*MJ(`nc
z_QuTLOlT~M<Nuq8b_6#>;6db?iZBU;*dP1M*m-QFhq~pmc>CVQ^C22)ooj&r7|_i)
z*Y7HG(w)%^a5=78z70TghF+#w3lRW=9-BgRa&ppSbHcsY@HGOJQf{#p8V9NT=i8Ug
z4KldWVQdZ%6cl2#Dq{!Od&DeU-ZPt9eqrGcEI9C@k=PNeozH<NePMs<g{adUZ2;dD
zbrgZFuDh(J$j%I29ZNZyKHqn*?*J)08Qnm=valFvfnYyG&d&PBudng$ub$GWOz4mZ
z_}%BIl;=PfJeWqGRemgbUNZQ%qQ^P?-!ojx2`BQQ<b7Y~1|~9>Fdn9@NUsobjy%Nk
z-Yz-vY8VKy;MWXIxhNqZ_7H(#9Sg)zsNx6Pmin<+fjupuSYrfTcK_@gUwKCC+smuH
ztbM-r;^|;EgYo+G992F$#NZF-(X35-$;O1m#>DrQpN%1traykPFnLfn$+g#4j~9G9
zk~DCN%a(23*#Y#PogTbp>Ix>2{y{;cB;4<pJ04(YRLh0q3T2|XoUJt8hgqp4ebSYl
z{RSb~psi*UUVK*B4jW4^d5%JUHqO;2{JLjJ=anTV^0$deuIqU%els_EdslO&x`gI}
zVT}!&wEPa1l#U&7l$niew2u0X6e$ejV1#lZ;qwbIT`zaKE)qI(<tnYK>>r&tTLB9j
zdLY*+T%&ffPGe?E^;NugUS4t&Sh;v#U<oH_<pTtr<Vp?5z715|JUqy6uzS-3BHkN)
z)z#NW-p6&kP>N}_+7bZ%h!}hf_ZDhqusRaQP6+UYB&UcSa#@8AGh6!t2II4EN40!8
zMm}h=1K%D(I3|in|6Z%oi~pg=SUa6k`K%s#8@x(&^rm8z8cacUJfjq-@87?lsb@@S
zZ>w?{LV+XTK<cd2fmLH?7sid)n=e94PtTCA)NS8VE%Nzt0q4?RgmRhq^e4KehdWMl
z4VZfOUbg4YuCEj36~)D&R_Ju!#}!J80wk$or(rq7jEM)NU)MWK(_NR-{cE@VGy!Y_
z1qCYEH6pOBuMoFd-=VCLI}112oI_oH7Lon;dDl_Y|6Lr?ZgzC!u<ph~;g$=vq^V2-
z%GBvx?w^)%w~mhdIWKo}Oix#!5MljPi{iXUfy&ea(9W@1_1}Z%o?@7+!SV%S#YAfg
zD*N4|dNTer0;bpEHVkjppEBN7l5uy)eyVw{0#8-yv`|oINehG+wHgoi`ADxxzr1OL
zrDck~DHN{2@sj@~l=P<|G5#7Hzg6WeWl0PtM_U1abV4!?_RaGHM>txA<m2nSdYvv+
z>~c?Mce_4`sH$QBILeKecK180MF*|Y2Eg5Ql;PDlFk~-!>Am;q1Flx%(?@o8cK?9D
z9L?*4JKL_PK>#BPWIZ_F9BA6#Bo&dWT?hxtP>};_qn-gF0_K#SusTj7Geg0x!ruoJ
ziz3Av)(-Pum(8$0C;;j|bW&>6<uP}W^-F(i<%ZE|n9G3nFOq*uvmOb90KpU!)ACOX
z`h4Z8xD`567<~^R5PMRHgtmEUq)}@EFI{LxCG6trs=tvhVIvz|9kX)ur&TVLNSPwa
zLv%QaK5JTL$!*9}g1ncS{~STGB!qMJ_JGC!EGzckiS0xFuZByz3GU-+Db{ok)boj+
zqx2zTBSTYCQoe0e1tAa&NB8g7X<i+!5+WcV)Rf77;eXd){U>pWdTUrWi%)fjPg)9j
zsL&SZT9E+uCLk{l6;PZ^?$!3YG~TshFBSvj0j<VU9BqVgc&H#S1Ob|ADhz(vHs6;v
z+6`P}a*;Z80rupr8bR^9-=A_*gBLtL|0_%R{|5mu?8Cc4Cm-n~AH3Y+PZCl9YY`|h
z$jEyO?Oc&~ys^X)k5wB%E|r#?=1pZ&U;Dfe{%8h#jBZ4vcHaRBUSi-K4m4l@vLTer
z`+EV>3b}S!`q~Dj)Doq_jiZ#A8f_gTBeK*+GcafN#&}C#xPZvcZZCL@YE5Bq<N}d8
zWJb;24;JC*QwqKAbH<V9#smK@)|da4ke+<@eC;xsAsCrd7J(r84t^VXq$>o3GXN98
z?^^{l+)}UfKfkgLd!K=Yi;_Bg#<yC2n+v12RC7?&UGEH^CxjMw$3&iBjMtvX;^BN9
zNj`_zydn}@KFUk7k&ggj=Sbg}x{R1erRK_9iqxy&ERc>(({DLwHQKO%Ie}?2-(@Iv
zZ@S(>lKnais>fn_LOIkTA~=MkU)``Rc$=gmxaw^CzYoo5_CLTg8E#DrIYRh1kFk6A
zmIM?WOn3kF;rjZz&si12)!hM&bP5|hki8)>-@iScp(J}wc^Y$e_BJy}*zb~^`ESJ8
zyu$A}*VmV`lyYZ5;m4zJ&1YlL@a-ruE36<_tM`h9w5ef)G6;&Uw~HL*DuHAPgTgrI
zH+-QsaUDj>vt3kNerry?E->#u>sKeQZykM5W1ojJN4h@`$7Y3jeR*aFltlXBk%`*}
z{c_1ra&l4emek_CgdUpA{~q7}p(YI2U<p|%2*!!EIvk%lzMQnV+RfdDZjY=}c%_b-
zz#Z_t^YW6LDw4}`ut*mzC%*1^NcxBoHU|B>K={Z#;xP?jhZ*^o#H*iT2Nm%P30rV7
z*#=uyZgupXK&~h+?uf!-&*|J{c1`f8?MfbMFjH1w*zd<w!b-njDw2mkp5Fjz18R5$
zcHEG^nV~}qTkxk&^v;*ik~qpRi)Fdcn3zEEYA)7}=M%19#Tq;XY5A70guM0t?kTKK
zK7If010ysgk*Bm+bUeJPWJY_62Y9US!NE`|IqTW;`qOvN07?*#=OKeg!0SdPf(XOp
z<Ya5xP(KWZtfM#M^@(VM9vN5Um+;00<T`mSZv2I8#Qjyguc#bod+}nS8KHn!-b88V
zLuDK<fA`EPNrziRRC91}hPcn2z}9dE<ktvMx9{?7ZyRvj?mJQIJ%NURouB#FN#KH>
zs<$_VLz(w56Awn?_v@QD;<Pi^r|--*9+^;TlK>SI{+oue0{=JrB*Xa)gIyz4YYBgH
zS5qui!Q%Xye}$90cTC5_rLC=9W%J_k0RqBc@yguB$w^kJM>dNWK0`IkED!nq0yCPt
z(UL#6TaKhAEcprNni0Nb=AG9HT3MV(uQf?(=<geh%p|h+E@5V1<hUg5ubv{t1)#^Z
ztofrRi7QPIiI}9CN0GXM>zD#ItzXyoEC7n#oyh2^CKbzeo*W5}z{qM8xAkKyTm3G9
zO0fpq^)~2#vJV+)S>PhlSh{}Ot_-G8s?2eLpPR&&{_7<4b>F9hb^munWLrD}8juQ9
zI_HO#o!w=e_FJQu!0I%>czikjp>kJa!Or=}O}^CT3Om!05ebAaY<33#9NLEe6-IDm
zq-X#lO}>$mGVfPjH0ua88CPU)65|aqIF>U$HQ~9&Babq~0%a90GEy)3o2mLzHDolj
z_*Bnms0(~F`owv#uM;1T)1qO{{Xn|8AArJ*Cu)m-aOGB}+l-R*Nt=I%R^tn!R+Y<o
zF50)#eI>rD{bfji1^a%Asz(L<hmg=ztDbzYe029z^&61J8PDU5I{y_Vi2o~<;ej=9
z9l&cHO`=(67D>+c3MVHg#|b(n_BsI;Bfn`i_5&Bu@nZibrQBq>6lORf7X<!dL(kwk
zX@0ig<WGxdh-;-q+TpJn^xe<sH|A`}oq|I<;&d$huVY#c1hLkT#vMkoR>XNz!I{hM
z*(N{{t@8p0#FNylk0hH{%#{MKv7uEWy&#Zri(-IkUKgd~p`?=CV2y3$Bo~LcK=0HL
zbopXkgS!@&^O0~KM3y9SpF~;dTrn~VUie~`hp&v*iy&YZulQ$_b#C*YWJf<){eR7`
zzAnT_4wgevGO(z-F|R@sL$AlnDFq0j@lEBjL;)z(h%IOgpZ*aWU`<8F)0@xs)`il!
zZSfG?AgPKcvn@&#3lwK)FMNIzlf2R#$PEiqW&Xwmwgq1npD^Fd!e#Nf^n1^cfh7z#
z#XmVyJMmDQ%I;+tXow-!Iq~3!<hdleQDw>b*_KhKB29~$XJ_lAzdOF+I(+8&l+H!z
zwVJtS2L=X)wabI>cuOe$RmqBECm8EIH1Zx5IjD?prWaUS@8hi3Fp=rw_u`IE5Sceg
zs?f2tA|+x#0vrg$l4LW0Q3cT!U(7#9iqZHfU*hh5ejB9NWb-vm{DnQEM8l)>@A7(}
z{zmtIOd#B4O?Ir5pHi&>!2VU)jo|>fF^c0DMWYc~?AEzDX>-4;J;iDc=PHySMZ!A3
z^B7??Gi0eejY9)X3#EZoC_T-{A{4Z&AUpbILW%F<zoMT3(qM18Iu6h1#dcg97y{po
zc)w^|DQVs7l1v8MyK>z~7{?dKFF+qMPM|Rg_u3rpN*Wj32p|XQis6Kc*UV|Ct8+X(
zgKwQeie#na<`vw+WtgH<w>9B}5RwMM2i<a5<NfYjo$Dxh`ZYj*zv^<;Y$<XuoY!Y~
zPd_qMXe_01Az3-oV^BRPU!u$ucd)cz4+Re|<%H|*bSeNWhkhB#6*0j5yyu|#A>{C`
zM>3(xYE#tVbV|qVB0rWK(DDRtY0>`eYvJOM&^=xM`-LSZ4Z0xbDb?myR#wu=)d34P
zoPJA4=;V+FLoCgPMY15BmiTl90wI2WqDTUsP-{xLz^EuhhtK2^#3o3MI*$lgn>-k9
zo~f~znF2%kzhlOq(KfFLGS{v<g*{Sj^!YkX&E{JoMs0|*0xN-l#%uv_+shr9UzL~8
z5Ab;YT|yA#4Otx|CIk0r5R)0g!eI=-XDH{eXvkdzJ6es{&o~+OM$#+H>tVdP)*WeV
z_>__OV)?`<1Ox<%Utlo=b`wPN1d^<D002<`o~zw!f7<x1spOrn9D&O%;G-9sD`P8H
zb|T)FhC8sJmP7YZjt`M~mmsPI*LTJ(^8qsG%TY3;dcDC%Jbb)9&H^C-WO?kPt-vo=
zrNNciP^flZ6^S#E0iqjKwgxkWt`cy%h;ul+U%1&`&mnJ4R^a0n;3#ds1qKB52s|Av
z7twd@FVpC%O29z-kQ9H~(xU$F_l@>{<-GDebruU5D@|ZvpuyUAANAKi)^>rsW4{m)
zVdMOM1i)a5MjkC}!(CRLK`phq%O(EF>6Adr2Gfokf)k?@qxwGi#n~?q{`@(8VQ_0d
zC2^BD=ewi;orGa$8%?fX@N3ARx#w{;)Q{RL)OZwGBgq`OCWENTR>O=vRGeb##kP-L
z+IM*#Jf9c+KNHT2np8@wH`)prJmxd0lI9rI)nT6VqGiE-rudN|!iz#!c*Y@aL-Yzu
z4StOrZ>OXDl}5hzBd8!nP;cX2RD-5|qXX#Na?Xq3tG!Qke-&Rd)))=F_kK04IYL(s
z)d|#~-8?;|e~=%7%CQd?j#Vs>$}_Juxog|roo?ciPWK*&BoMp7TTsXqKF=RV9Igu~
zSx_BZod3n%oE<FNA<ty48q9%ds#EWn!acW2m9R^oi<bN&^bT86RW21cgZB_Or%{05
zddMPNII3!rVQVx2RjE)W4&r>KP&S~?GLe8tArJ&GJ^4kD(9w0=_W}MP771QO#-j!r
zi~Wy;@dN%6KsIR*`t)>f>D=KK$ExJN#wB^{Kgk|2Y^zA4GqSMKh>Bn{TI@&zadUd1
zgtFt~@}(*aq4Ps&-#a#@f0n8iB{0wC<wXQTMa7fXF_{j9_dp_cYm^C%OqRU>s}qJN
zPp;FZWD(KP44mkP`{jqz;Z8+li8){w7V;1+n|~pr4jEk6G8Upv^Gg#nI!)mYQ#LL6
z)3}xm9@YjcxnC2$Ol*SXkE#VTrc$3SN6xgL#0TM#YqO1Lu*xgVfg5yWK!C7_j!WcM
z$RmX@NA#3y42ek9&h6@!&ni%|;f3|E;bNFtivfCgZ>a#**VixqT`akj>efgWA#gp$
zd!v#?dMwnZT@4c18l6uU6l>Iq8XOZBoz>5IQPiH~x2YBLi4)~Zmr%$vsflyj)^^BU
z7Xop7`p1S3X}$3xL+M;jwN7K2E>YNiKfk{Nbgtb-Y!Xw|lCwXO87&G&1Bn~L?9GSs
zhnhV0V_769l^j|!4PHDYI+b`~6Vk%M!~KhjC_DCkK|ep-V(u1OXr_t}6BtMHY-)l2
zy+MYs|5wS?Bz}zOBbx%dtWU0&)z%ZbobFi=)hg8W=|AOG?ak*nL*Bby>;SLr*qP&P
zWr6Kww18i=-Mt;aBnsxu5s|S7n?%uSw_zC%$IBiv#t>gtlH3GCRT;YC6jR3Csg^A3
zKQ<hn-&SNeOq$Jf@R)e=(cH90M<aPC7f^>{(nqRT%#$^IPSDM5(WgS;1Jw$bD+rZK
z#+lUU_EI2cg@DXFk9p&n^g0Eo?3Ga^C5oKOPFJfsI&mlZP<=nd56>A7C6Sk2Cuge9
zdkQSK*!DmId<m09Fj4I(U@<&mA5`<XUnV)2fTxwx{T*OIC*1zoF+WH|ULI+&&LYT_
zZ(Pn&VG*fB(eG#v6U7JgSP0656$-IMl60j*L75@*@)r~SvT+BkelvrjaUy9wmYgdc
zX{F~C5R)g?HO1)FOpPMSW(BM|@Kk7b&_-poIVoRdH6iF|r^nDZTm33lfjtJ&NU9A^
z^9w@a&!-_n|E(|rLy1$@|5er>Ig0A5g~s53lA*skPt5kb`y;o@*}FnB)bw<Gg=~4^
zc+W~&YUL*+-4v$2Pjai@J2RNj`9{;JOe^Bp#a&#mn2ayF0r{yyt?Jkn$0uqfVUzVz
z;kyt9N|!9rIP)Fegiz|V#SHBZ50OMWCQ*^0g@+Nfitr>K{_Swy3SIp6$D6*rYQt#{
zc`~@sJ1gKK_(Lg0;CL|oaV(W}EcnuQSVUnC7GK(c8n!t~$?1c!ko<jxImwR#<Dgb&
zAm#Pu*jUuB>&s8Mkwk!igcz#0yxLd#RjGx@UZE3b@F%}yb>r|vkGuf{&Bd9GHQcGH
z-RXr7{%}1IBNVi@v-7F8WY2y)o|BnEHq-L*vY@OK=xWvqqoR%wAJS^LFShBw3kJY;
z&GwO(%UoejN%Wd@==_`c8K?wC{;8}1YR$lGE!E^<Lg1oyIW8XvjA1&G$<3a+((ef(
z1}p+=mJs2c0A_Iz`v?eEqlkKM-+HrUf#8S}NkbpcB)6IE@>#x_5=F?2!kr349`=$n
zH_qj@6>R4G4i7)$4PuN3bPy|#Z`M6V`C#a;x1A36RsF6}J>7)6J+rg$DNM%QYC5gM
zFBUU}j&50)<mEAFWKNUc?<VA>=a~x}gM56zYVs3A%L8k}XzX@}EbQ@_`1R^d-~mV?
z9I%SWmYk)QpiA9#Y`c2_R&hn6@Ss;IJ8JwfvC|<xLgsY`5pJ}mFvnf6gh1YpZ%t&$
zi9%FChKjqySSS3OaHS;`?EeQCRe~wc1=bMj7BaE{j%NOZm~^pTM9Ayw(?1uCLi^Xi
zz!@Ab;^k`>(h0oKwyya*@H_d>Es5x1sI}tDNNgX+@s~P02X^`=GC4^{;ISh_fell%
z%uIsn)BF2-{n=1-kV+v7kY{eGW+?Hl$?5nr0iV}XxBHu<Bhc}1ZEr0Y0-mq$K_+eO
z;DCB;UJv=BunQ@EFCqzuADJH{6g<r1>gu|n9W-2)!RIV%!pqUxB+f`gzSQcB$ZoyT
zJ2E~>sSqxydwsNm54O=%f|ks<2;y=4>~s)b-}!2lbQdEaZyMd@3VC?ly#e`OOF;eq
zdw0yiY+nd2>(0@Pxk^1m8r4csV9YNl@{uhH^2^I}>%ZFn^!#`e#()La@34elkYMSf
z2ty^&k#)_(`$PMq3bjh?c44e9#9^g&Gqn_biVOuBy#mR~<A}FLq!cE-<m*TGVWgN~
zCbOSJ%B9-av!%*FPmR0LE=Pd9MI}f<L#R^equp#LaSj?rA|IQJGq^#lo!XlTR6pB%
zPleT1fd!{<L0KQ;kMBO((rEoBva-doXA2s2vd-2JkIQN4<e5&V25q)fRcJdjVU1^w
zYp5e<;yy~o+hBHB1qud6_R@Bx*&g!vPXp@i0xid0-~GuNk(4ec2ZzDV5#ibL=;`!V
z<xI_D>E9^GvpILo(Npd$t2qCa;$Q#2o&Rhr{9zVp@q)=&Gp8F;xqna_unIj}Tl-Qx
z`?aaH)k3vgeSNw>X}9?M_n%~9#}X_}Zr3>D>6|pC(|^AIu-=c=S_8(CWNup$YSkb9
z6f$WBPrs{yI9bQs5yiy*XLsiUutv!`&Xe$GK)Pl)j>xyxZnr(z@(s83K_B>Lz`8p!
zV8j^^TOgIAc1yrPV9L)oxvFPEE&sYTnu2<Jy4nL^3`P?%IuD{`qQH(q;>#5(0zSug
zWT7B~k;HNdT1>JBdL)TkdzReXqnX@2W@3GDFA5(Yrz}XL53<on>nH0}%)XXy`(F8`
z!N3rrSPX#K^%i<SpiOK+5m0)3*uMSI@2@jgZ~CI2J5r(732<k1Vo{YH-PvH^s5*g6
z@`63xmM6{wkr`%-cg#ntjcSQ)B#dE_ogwywo#lE#fY($<=;2En)FNZX&*kj9)~d6v
zfAfDn_W#w_`G_Er)ZjhJjj54E^B9tV+0wZ(1yAMYys9spBf1}*5fNuA@VT@*%;sf1
zZ&%te=Q!Q2K$@N_DDa2#1E#=(wTZ*ZXuaZ*Uze=#-TR$trLG@xPmp16bPiKmURP0;
z!T6IaNVkTpBa0O^Cx;%vYPHp!kB!uiTl!*4i5siCr-#w*Hx&1!dms?{*~k3dTOarK
z#PB?~59@a)-;T#?`_;ACd<VE!GP4*AzP-srqz;={g|>W{XP1EwF%t>^>Bgpjze@G%
z`7;TDdH}x~6_X#_68Uv=nLO?ar*U#;=Iw4xF6Vt;#gt*n97hrXsZ4^5&-&SVkJ&=o
zM;ul&BEGoA4d$FtRCh_~m?Y>S4vboC*>Ty)gV@<0#kgnUcu}HwNdb{cm12ps8nN1$
zyrqtZbB4bL6|jC+W*zlJ9scSnBQ#m}R{8PeWvTgsS!xj9_DQoGAu}@*@Q~Ys75pQ|
zN7p5$@*~%x=u>c2C<ip7sF>kH-TqyTz3D;_K)5o5%y$b4P5qF;eQL162doYsYbviT
zNLs>*LB7fz@*U5AHDo;u`_O6G|KWv|q%4n*kRWoKmf$_Vq%R~HJnn2o+cc`ex2J#T
zjd~ug$E_+VaDc-DURk*ERPV@-VVLXfx5I<RK!P*wa_0k#J~6Q(2w47)H~3j4;J3D&
z0L^OgtG8sPNWN7Te=iPOyoffytNn3pBLFs-MR<5xs%|2tCum4f1YlTtHbh`;FM6Ss
zD;0QFTG&0U2EnWWh#eW&{h(|0$Os>HKK>mjtJ9JLAo~(0?w46<jCQ?H+#YA|6d=I4
zxp@k}T>i|JGnfq`JyqHn<8j;YKPYdFrD484>X93bWa7UGC^}zX!T|9hiQdao@vFHX
z*{y(E$OYd+j&EG8ecLS{94BYS1u6M|2u@iY`x$F2Ww=VYUIegT!dy2!Mojucu?1M4
z9w-<azAXo4>N$%U8Tl_^;v<G22tgtyzTg?5c+U(#vRcdv1D&(3`l^v4isvBI($JK|
zjfkCmp+x?kH%b8Q249A5)TnMqn9Nq`G~gbb&g&>yA@t0Doc408%<c6Al~AhOb<1q>
z1weSsrt2iy982^-J^e;(q*94xHQyM^bRKa<;c+SY3V1e{IX(6mzItlYtUMt0?Xo&d
zB3Z6Bs3Z!`gc%QA_6wx5qXJ70NqSE1Df0~iy$Ya$in%bT%|H16)ei+5h<}o2xXaH%
zGwVfRAWDP$V0Y|xAyZS+<EH@F^oOfMObiSHt4KDSZOePEM(dn!rK%iNukV1}?O=iD
z#~vhPun54lMEcvGdQ`0j>z-C}$+cGNq8y3MezWBbd%zl*X~>hu<4*oT3~0rm-P#ep
z{b@|X24iv2D>x8SZ~Nkd*XCqr*MEPBsjL3#qn^ctTWl0(N+AdA0pN#W()T|#+so$|
zh)5^15D$40a(W0O4DwxG#=V!U<n@$4S~jqg&m1O}$>7#VoP&Xf?y4`H-}>x&u_Z7t
zp0WMHR-qRK7+UALPh?KRl2MsypnM|RXu5LqJaSidGe7(3b4ChoYihbM0c^(h&J=l7
zk9hFeV<6yj6EQ0RU@YK9(j|N=B)UQ7fEA&j7)^ca<$CnHUdn^wk3yZ9!v54$fuR^2
zJ`2=XDoa3A)CBAwhLkduB;l+B{42Hz^sqiR%Z(<G#Q=@HiHobTmp&(;V7TYZ;&qjT
zLC<2f2o;UMA*QC5gdr^TdPZmWuu@!LrHUr=m$aYa6!1*plrrJ?OjXcaJUagy&@fp?
z<lVuQ@IXf$0w9vvY}-dC%RkhOm2+lBotU2#Ka|c_xMFXJ)m^tN!;zOBdLpw5(?W(3
z{?{i#^!#7rO~FsP5ho)5AVPzjPrZbqKOCH4{_E>8;GvRHB%5XewB-sh5Gexu-~&9Z
z&I3t0ts4uqrgm!!eX}2xI-W5;!fYjJd}PV?e4L}>cDs|WxIE>1C2J<U@Mv<~3`F|~
z6XLi#nnvTv4YJUG>OEI)G|w9)%1PA(^l_g0K!rRV?((8GR?g-petN#;v*QOg?D3L$
z4Jm3&#!~mZN@!=pPdnlkNR>}YOv*KrnH)p4<%(wX7cREdA4VpM<x66(R?a*hSe%wK
z+uhzIny;p(yxFBc5_!MNxmD()plHGn=ZK3{E2*Rsg`Rm#y!S0W^PmQ`L#v|gv$FVn
zC{aX%g@U0b`aoRw4mt<xJu&+9$^Fe}b94TZKhl}!#MZ0**!yuF$1F0~TLyQddx{S0
zmDj)rPYn)%9);h;y}9D0(dJpwd8>#=N%_c>5VUl(`>8ma_7V~ou9ipop_+B#C@dGc
zWo3I`zy83<nx-MQ&2uEM*KHW?n@w18_on_hi;x?Q<VAT*Hq|rW?&3C0UcZ_$QzVtq
zlRG$Os}~gt($)+^B~H(`wY8_Kp8)ih`!<$k%KJ9x!=oCtB`Sw=@hK@1))82;xQ&*D
z6*^hb&KfNDO2MV9F7G(ONIbd1o76@V&}0cX_il4evL-Z+aK+lWWb4jRj69;A>Sx<c
z<w7+Y6Ez#HJlQ*RI#j1b`jF5GFH7YaW&6IMx2v$IO^J)JPnWhtqAcG~+rE4Ili>RS
z>h0gB3>&dSGxTSPEah({zFZ!iIR;Gos8vcTZ8C03+uxjR=ni-FTvoo`v;o`uM`WI?
zO;l{`5_}$eNDF@!X08txV&Tjd>q7R4WZ}-pxFO}tic-wG$55x@DBHzo66xZG9+uLz
z59ZoiX%o<~u*h~fJRicZ=GHpkmbAGj*^7R2HbsG}N&UvEbbRqZiEz8sS-1sUW((QA
z4QDRxbP({J{00)rx%Xdx&B%>7>F$J<YE=~G%L9;i!G>QciCrie2M6}~#O^CO^Kb6`
z@dT16?yD*?A{U9`SQib3%%6?X+xaXtHNQ|{gMMMz*<VFR%i}x^BWbKi^ouTgyJ@CA
zc|DkBDVUf*uv*V*W-+SW4v&bPqo|2waM}lUthA_5+}~?1@fFyVF!i5?JUXDMDgb~%
zOqTcl5A+kc?%SaWV-=qdP--@Vwb&CQQdtSwCr1N>&QnVo_W3OVs3Q1WjwEVom@sfK
zv4*l493sFVn#WeIH8ic|dfzt?job5TdsjvFheJc<_k{6rl7;z9e}u#8^Q}_Pptwf2
zwBENe7v_iluXqG*clyJF;z<*t5!gbP7^9SWgjucU&v(fCA@DD}X$2cH=t3&tYK%cw
z<P`=g`Rihse-GE2|NV!zA6_b4?$cLQ$`l!8`asi^Usj1d7ig`1jE<pUtPF{?aL=VA
zmTODYfBiUYC$EkD#lln!VvLA~FmrElwvJw|_qE2kl1x(Cd%d9!<Ty@s+Ac=uebzxn
z<D$4Yz7l!TddhoGTcbc)Q(vDa)cN|!yCc&x0|xG6%`a8rOb+kI@<ytcUsUF8V-nHK
z=jS!j^U1cG#k+AlBOaM|cQbWgR=AtRWP4p69~3Wl#<ptRf#1<lne=BIOiJ(Z(ZP7p
zRW=cd>t@0AXDTIQ&VuMk`TaQCPs9ST^sqbhAjft(t%hL~`2gsE?(?^e1sz%0!d*R&
z7{MMv<M&ynXU&L^r?yvn3X666ek_ouD|xMCyfCQn0qvh*zNvQ#qy}BK+vI*nC1PJ4
z(s<4&cJ7C{fE^qdNb~i5AC|GXH57N%<Gec5q+G|XKT{}EbA>_4bJy_|0?k^fXO_7Q
zPgB&Sg_}>UdC9_K;%Rg#YI9QHna9-FSV?vq-rPy|m&-LT=Q@Q{P>IhuB2@HomN%PD
zA_$kmEZPI#?!y1Hbq~dmmTI3HpW7umJwwOrC0FF?VRHUj^u{@GMA@yxMM~t87aACF
zhCg4a$@t$6Gn;y|2HMJw;apaBx<<ra6CIVVo!4an)E{@gl>V8Ob+&Fbd_POcz#z9|
zSm34mn?_qKkkK7z^5Z!@J)Jy7@yiju0?@nNb91+W%_2f4n*64{x2sWBb#Ym;ta#q1
z%$ioiWgA4%3P`}xjyO9w6xs)JdFU=Vn?j9y&(<9{?`z0dn-)p3O=K<@+2pJjevosv
zHceJ!aBWZQPS_tp$TXniu-fH&@E)yNPo}%t8((D5$R8aYfnK&k4CbYz<dUc{Gw+fZ
zmGn(b<!o&S%q|OM(B`tiu00#*x3_mNu<3b*s%>80YmAq?+P@Of)6<tAt?zFAz!@PK
z8*=3=bF`S3oQUN1%G3mNkgIi<&XRk*QZm07A2_?dyu2*7YIlqMN%eL7h%-JmmgLlb
zwY<by0vm{G-Ooeh{S^nj^g(A?D*~tQ(ObAuSElo5ne;R@D`Zuz-OX{k7O=%qbP@h=
zyihClGAiW`e4LoPp0TY308=!-pC%W<8PJN(%HpHbYe>I&exRv8{T%~r;EDl~Ef!YG
z-5;5`iNYdNQ+zMkMUOWHH^+qSxPZk%=^E|0=9A0YA%1^#6#xEqi2RNWqJ1<Dkgu8<
zlod&z^kj43apbM6BBi6<XU}riqQBgG?2c#D0U=8JT<Zrr)Tk@d(tqa09U_6T(R_4J
zfeCvx*O5lUD&%%k@*SpOtPc&+XQv|&d_Si`w9QQ!8TC^{ME`ubju@eIhU5w_??dN}
z+WcC+bkQdrv!kYJ;}vfc6O8tk#lx%Pc|EB<Xt_mu#jb_El(O>j@Co&(#g#vaKub)G
zdJz(`OV+%8yiK0fSy|C)IfQbsm<I{(W*n{k=ZkhrXjX}A`$J#F{dOw-esA?=;Q=hq
z$J{9x*2twezoZpAXJ`5b2MoT~k~^2h7GqcuVPWxFn~KFrb46nPZ}zn~CZ#R&o3^&G
z-`6kw0|Qb}kXOB5+uPzaeFU~n)`=(5Dp%4vJN2p`xq-}|@?Ek}964E#?Rzrz#wYp&
zsyIre?iA+Ocd<o^h6;6jVs;nC5*=u&6MItD&9P~WF@2kT3Dn-b{nOT+FBG#}&CRY`
zo28U_O~8Ka`Q~gp#30*?+orv-v8lqZjXtB@FLLzoctk2h*!$)e^}V;pnq(RY@$tf?
z9e08qPP)Ko*m~~Cq9g)|PI*T9@$C#>5Tf7xJ=6mOwtbnD85;NZdU}LEbXwWAceh7k
zrR5w>MS-BeqVQ4aR1Pm+W!k61draVJ5u+$`Wm@i6&3d=HLfo_J5f(d6uGpB#V}3?c
zImpQoLKHVI@&o7L`jq}P)*CSHyxJVk00d>yF%cx@6PfK-r}IIQ(;H)rK_mV=^q##^
z<{~U#mCKlNivbm;VrPe^d0$O|V&BDYR2>=ACsp!D*Y&=nz3zZZ7N=iWpDzaVFK%y>
zLgN7%Kb6Uxi4_X52nYjIzmefiB2!@qKMhDarH;?c6p+H8r=X#cQp&Tbm=5N0N^h`Q
zk*<FaUNSM`Y1C>yL?y#F0ib028+~C{F7uSqQhY-L2ll!bBXgp9J0Uc@iF6^c+XXI|
zemIw(9S>9c-7k726t6F)N5D%=_`kbZyT+28ozrE$yLVVDa-d^Pz`3|EWOEZFmBKfj
z9HkGeH|T>2)o4%c#%0SFJxIo5O>8TQ1K@45xo~U;VB!5>p)@H|oe?Xaso2bMa%O^C
z$m^>IrA)H;p9U*ZcXzI@E4cwI-h|vX*=>2YsFZ{AsGWu<ofp>)-=<Oh(~9{n21yU@
zYqkz!tiQ+cXZ9PRr|~%xWGJ4#l<<0jXlbuxJDl&_cR10tb>kxl$=^=<%o!;3Z$Btg
zrYSop$EYu$+8Fp!_H#ZxU4>kk6M9PXovz44IUVr>Y(-w#sPxQBzzAOiHcz0}VtW`4
zySZQ-g<P&?{rh~k?=*}qvAkR~BM#E)ehh9Fy*7(4W9*918+jGAU$?0bfZ&NM@Dv{F
zPs{GB?XfmgMiu7l-n^Ta*uR=RAs?(BoerihB{XZD=p0?k!mgIqw$qquYfARGUk#)9
zM4w;I@ygXZ;$u-JBmy8PQ34TM69C_Exv)fG1^i7r9f{p>iP?{o1a0l@CHg%!Gp>pB
zTB6mEh>F5Sq@JU25E7rtUN59HD9V&}KcS(ZkUU~+?Z%j_2}cL8zyN(8k*kY~;w^z2
zJu15zX0w`X{_o%FY5nnW5RYDeDB;KNk?%6jI*#%X`C^@?bCf9E_6sntzoN^sX+(1?
z<)DwKO%}o*mc+Qx8}>(%!_vS?#OCWZ3$oW#CgIHFiEWwz!XKlOe)prh^ItV87BlLL
z*fcs`FZ-scJQf%{cauU_2a`F4!?B~`4w7=63y9oA*%T2jw>pae=6d|J4q0-rP~*zX
zv(Vm3W>e^SlhPJdXJP(uS<3h%<H>VY>G^m)^BN?(90V9%;H<vi_ulwgCb)h;>;<`G
z`CQ-we!Arzm=<5BR1L?+`*zf8rx4IcZ$A`Uc`2L+hdw88Ht7rdOY_^;_s!C%nLoE&
zvlu=&?9-gD#FuRC?FqZyyDEx&$%%O?eI{3s%2(`~pOB-dcMU20`I86+3M$&(micUR
zAPT*8JX%e!00Ey%!AiD5x}QEGG&guqJoLp5-f?eI;6cSEAtazWr#@qOte^o<74tLm
zWl13Noe{M^@1)gym|pq_Yqo!3ytS?3Cn)G!00|+NNl8W~uQ=UoFi!x)SOu_$NB;n~
zx)>V~cRXE)GngwcD3nP}zG-#3{vq9FkK&J;YhUnw^99S^bRv;F3!;r%K5>e~FwV*f
z?R0NV{P|^S)qz0wAq16+$%NX@&c1m0`MB6z=~+{o91yLMgkW^+c9U0O&})MvVzL+O
zBhWDt;}bIl4u5f_@Yqw#A|e!?$59N|XnMV{Mo5`!h<E$j2K4{BEsU-Qyf#Tr+HZ9)
z&TkTgp`%V`ElT?O1L9D)Guvnv!oVSlZ)bcCg7!wd&OOo4wnk0|!U^a)Bk@>60pzQ=
z5XZa2`6L9znWf@4=j-)TXTBtvSo>~xIGkqTiah|XmII*_FQ5gDh4{3j(p&8H>Y<^S
z6=ELugCXJ*#EqSkPkON0-;|n`e%HzI#;j0!X1a>5IFr*Uo=1oF+*QBb<?p=3{#T&U
zDsyW?t*vf<iv4M%WOqi~Z?B?oV}-}z;7|4U=Cw$qWsXltkhuQ{ky5pziwle-abCzz
zm6w!qDT3vH>Jl%TnmA^JqPQj5t+vG9`_LeVeg;4m{HN!4u5)Mkz<%gV!}03mLj-Oy
zAUM3>RFgzwJJ<=a)|EX328fbJ*OU{BnZW)CY#H5^mAe1e-E;r5-9=6NJXVdTG}TtE
z+Chz)wQIDYgh-@9=}@DwS8Zz4gQ`)bh&^l8EUi)0imHkk5=HEyH5xnKukpN}&-*XD
z`RV4HPrmoubI-Zw+%qM?kxdlOPw@N;<QzH{mI5G04zjT}qn9Kscr$;r=Gp2fWK9UF
zs}|j^mxz0&6p&e%rzcz&(D-Q2W%hYkSl;H4?f1;*_9VzIJ*jgbg4DT~Y?G0<H&&DL
z6Te#o!4M{G9Ei2iKCk5RH=JG76T4xLtz&iOO$HC^=kI2Wlw4Mq9aOl}di$U=8aq;A
zs;Sg;n0`e^CYMEx5^BG)oSQ9Z?IFX&B^jhVsFb4e?7A%DNHHu$#vyyv7;5-i!MSxR
zI;%}smBP<-Rr&4BXRG`}yae^MB<!?R=i>H2zV9SD#>=-3j&omHzZA`NL#OtGJzkgf
zA3tY81)I#HZMt2%k?W8`XJhZ3l*R8FMOq5<)jmT{2jU-yUBCV+0O+3v1cBRPX}P~A
zIyGhWj@RPaVwCMamQe^dxtixGJ5X28;nXy@*0zxm<OH=)Tiuv-+l%OGIl&iKLgjOl
zXqk$>ZqX+3tvx3w@N=qNKca(4r>MjAXmy@{=>9tMTpd2}9$8`dNgpsQ_dng)K{v@Z
zR5QnTekZSt+w6)-tzm`>ABLJJWhR<58{8MabAW2=y}!3S(5IU=zqvSo(h6}d&5tQJ
z>G@&lyP@Xvw3)JAe36ZlZya6cYbzy%{yNdt!IUZ!=waTNIfiN+^Qflb%}NQ6Djt?B
zc`j!?XuC4mqKOL7&`9q4y+U@H^$K8a>Wfj`zoYa%uvre>A%^Edsofhdr<kV$>C|>j
z785BkSHgjGD{O7|>xlu(GH12t)<i*GK>-?QT!L~Y`k>N2^VCDRsw77IOqZ2^`0u4%
z%v{YW^SP+z#9jK61hoZRWbNe3`|CWtz1^nh!>*jM{<_Dg)WlMmXEyAYMdg6FhtmA=
zW`bTPnRBR-TiA0yj_>yDE@f$7qVae3aFs7h@5GpnZxPaI1!&bG|7-Tsui2eO6|^ni
z1Q+i(3|3})*1``$4qSLnTeAU~k4p0${hpN)6_Rt6RFdw$J>C}OAFwtpP};82JB!~|
z3}@uZULjT?8{48$J=VQL6$WF|+EHI$t%aRquNI7pp8feQzdXZSO@%LKRCPdg2fpF%
zF>q^XXhcvSQzDDT!QI?EhZ7|%vk<LDAo1T-)Xz`0)(CVaB<R0gwjKL2p3EzEiBY<x
z>2W8s_>CJ?qc%d&bX==uTlLMFGx}_lUoX81zPdROKk5UKO^&N6#W}A-LrP2erH9LZ
z7|yv!_4mj7O#&r(GHX9hZ1&}&?d<G80k4v8SYtz#Eyvs49h4vzfCuI<u`@%}Ux!sd
zHQfTWRYt6y-~E%Mr9Pk&UGpPQO?c1zqdVl>Ip+Qbf{LuX4SVT0+x;2>q2bZIqPwt(
z;8vrGvVdtdkjnuZ0VH2JK{Q5G=q+aDYW2f%7SS~Wa`CguszD_Y8PBixfbG*}6*2H6
zqkdU5*39&X<dHcP9%RnVEr>lH-%4&8Q;ANsB@frezn%IE2|<=yym8xF*{H5{@5aHp
zIckB9C8b7Mq5NR;p+AaO?d=5=tFtj$?KNmSRL`9F4AJZ3$0S{@iqKH4Qiv6wYzNow
z&QKG8qz}^FF%odE>3M2^dybeWyC_t<e;s|qT0u|k-$z0bqZ8c_$~K7(@Q>b4G{VkW
zTx3zc(_<ngWJX#yo^yV@vVbTS;hhr0<Hvhg5m2%Z%ts^P$q>8c_wOSXNwXik?D8-K
zb5w(S#3pS$Cs0>BJDNidH#^g_Wd3ci!P{-Aze>p4s}8xa-5!-=yB<oP;Pa<Q=22js
zzi*19OSTxTiLL(EE2#QMf8&)#2bB138(CRtRk;1GG%zl>o2R0-l27JT>IZs4r;3S-
z>)uCCG<f62Nj_wt@=p$JbgE=J5F7^HFKHl*2JdVvcE#}xE~oqE#(7P_VA}WVU9~M&
zm&R8T;?gy0&V&p$_2DLw7IAq!U{O`obd!JzSmN-ss$f=Dmh^B-%by;V)dHd#q;0E9
zCvFp-p=#Y}JyJ&8oEm(WkRGQ&92#vP@1paq*Fdq^!6Ta~n!8}@BTP~u&am<v59C#{
z9@R5^z@|@r_z{q!+UTR#_u^}b*cEa|-~uu37vT@b{U-OzjZ*e+Wp2zj_q+8)@|HL1
zkUC=a%2~$V85h96826@7E}TEl8xh;A`*cYb+uJL^&Fy4-cDp&a<v}dX@8o1tc!2>Y
zaHZSJIGh$Y+_D#zjE&Y0W8-E=l)$C*wON}EjwEPiQANkG&P4UrFE2YM(iT)B>K4rO
zQ_k>PG{?;3g7BNmuU;_+_NHB#rzq~UL{Rzq`rh2$`}Jg{m)Hy~qN@)%q^)yoz&!3|
z2@VMnpm2au$*u*!7967c+&|oV2V^&NJ_OxHU<@me?OdRD+qJa7tU*OsR?TBf7=A4W
zbD30Zc(RyROrJwlJ5%F1lAct)uiozwTz0UxpV`M)O+`il60|>pt#gr}SaleyW~OZe
z%7CxC%ELF2Ys^i`6xW@Oy74BXev|eaxf0K6!eaN2ULFKyKG6q*aNi0Sa;NoiN%SA{
z_-?<#<*tzgcput5<Yn5bqt#@RkZ}9NUf5Olnxnd+VyHYPz)4s*Q_f+`(8Sur6v0yl
zPAR-p_UI~c;x8p6lk?-a8gTyW38CpgqwGj4&<Gr3vX&Rw1g<riymyuuAU%l&{d!ji
z@0j0%zl6Jx<-T<{Dx@RVUPLySEt?rW_h)daB-w#Xw})wtU|jm^1V*Y2SGZqEc3fl<
z!k(`&KKsHdL~1?l*@CVv!_YZqDUY~0ETg=96^KU}KcU&q2txMMhbw@p?pOvCU81F>
zt&|~;b#?b<0Va{y4>9s96OErr+=x#59u1M6V7Y`p%DK=oZulC*BI2wz6gxhVZwAfZ
zP~qm?c)h8tH6GoU0qa=9c=_nHqrqhfZkz!xARSwSgO{Qan<f=lg>M)`1+#CLSYYSh
zJ$k-|?`hkTg=-^mY*)iZt`toBlSY*vTqSM2BvI-kduA~=G}>vwtGtc0z4IMz_PMwS
zX)b6PY+9Gu0LLjj-;fmjcr<PE%Q4ld*8~eL91{YFRPd-dGDSe`t&+|41DjDvp9VDY
z>DK47G9Ebo%Brf@s+=71PWfG3UGd@0HD{onma^#|k|XIr-*Ta!H~4++<9@pQpee`}
z+MWvM+%#{d;C}D=c*==euxeYDm_s1*@wR)<ex#taC^?a|diKS|*@}ye8q1Ij^ZD*=
z&0HZGY_TLAV(rZ0>)+3Fw`itvJH0_la4|&7tT2YhwzM^4^P7NqUdw@yLQA|8VFIRI
z$6%o(_Ik7E^^XN>*MB=FAt08^zwlTEo&CE~U<1VDLH(r++1Bm73#3cj`P1}*0qo}D
zE%bDjINyA$OPwL2B62W1Bz4`3-Mf!qlvZp&k+D!q#Fo)bSCp1#(=0-S0@Q>StwAxn
zw_fv~`{Be1s_oct{Tn;dv35i^RE3Er<_xOBw}*w>g)<#rzG(SOS9C78x=K5YRfYlA
z*i=C%M(Y(b^UU0;!FX+;CWS%~U?I^vr87zte)c$f2YT^>ncmMN%YeKBUp4KE7q#$s
ze6{Nz@Ghy#X!im3!q}gUKG=EK8DyICn=d<`l&@oWCi$6#Z0oLsB!yy&ul>TX31AHG
zl;7$*Hd`AyJfIgl0xigl)O|obrwW8P@TLK^0n(R;Qh|VdUeKkI&xY!&TwF6tOV+EB
z7Ab|9!6S1^p<iM0Gc#Hy!(j-nl+CO41$M^RuU~W9!dX(4VrUn8G>H!85uaK7&D#}=
zP!VU!uywcY1RTvnwJ**~edcK3jE*U!6Rlq()Voy+3chIY_gk2439%Zlsg|)ba0E`i
z@J~vLii#;pmaPuvsl{Mj@tB$E>AP~n!#MXerKg0tIL(JltzG!;WFQI+Ib5GIi8y|*
zy2q&%;d7~qog*pbt*kqF({5=n@0_e7;a+WCe!i~TI$(M(x?kXEI<Mr<G18=AedXS#
zy1Lk?V$sWtH2wt~Bi)^y;ZOhm8<!PA+jEosR00?}@SK2dsJeRAsM1?uc5V(gSKf3D
zD2?Ys#@jqG^EA0AVA;UW)TJnO9<KDh#7%HwP9-;yFuA;Z3y4C9w|yw@>N-0zrctxF
z`OY}OM|Ozd{dCIX|H7@la}6;lQZFS(mOOCTmekhKfsOl)V{1j<y>k~|xnhb!#n(hL
z{T&{f=<$v8!J8!ytYh!s(AC@fhJlgBf;!68ai)t5B;&)dZ$uOP6!8S_U_ecHb2>@T
ziHSvhrxkH8flvp8o$Ko9<#=xWfRf4NN^ziFjR;_q^7M3f&fNX8l&r)pKh)%$x)p2X
zn3G|tk7J~%xA62#v_Dsfhyns(43e%N*scDv+O_%;$#Ar*R72FK*qSYNaD2R+rD^44
z1KlD9HrtJdZLsrGw<0bFP$(BJU9eg;w4f|`vhj$_$<fgK9j`GUsxB>k<4I}~k_lVy
z5)v<QU;5d<oQseXQ5OVeITZ}+J4u90JFV{S?wQq9orez}=C9DxM=aflUSD4qF3~t^
znvH##17-v;Bh>3K!@wr0hu%4uRr?dk0`0qE<=~)iipS3}Po;6L=^o!lGjE>ya5DW2
z1mtJfXN*0`9_yRy*Pu|A0Wzs`+DZ|usX<+1J5*G%aR7_(ofLSF({+4lPk0NYE6=8g
zi1@_)o7SjedJh#J7KYz&uDC;OA##iiIPJ+*mnuQx!wik6sAy$PMVzI$c&U|{g@tOG
zvP-;JsaQ9@Jq##v^?23Xe5ay-b?Y;IEDXT|s4OBfVlNpO7#4v1&q{GVas47gKR>@7
zpG27k*zwy7PpzX=!av$!ff2Ruc`Vf|KVmR<N6PZBwV|PZ-E<=}US?n%l)M&vjgKQ)
zX@nk^^!ej`jKWU+p#MD-3~=}7vfOFKSGh02mD5z+UJ!@`;akLz%a=n>sDuj6_P-05
zAas~GjCEBSS5#E2&vOS7AR{p2JnCIz=oT*;E$SA2ka_J>{8mLfp`*z^Bkw)Ul)E;u
zXCaPH<Z1skp9V8|h9ZYr>OCn?w^!aV_=cSSu~U<#Rlc3~yg^za;M}ja?}mNcw2{^>
zM~V0L)vsqG%O{?sp^2P?PDhZ7fV_|QP-dUax7^>qUsTT)mv^<by#`!%_lFe&KL0#E
z(}I>-gGXqO58NPWe9>t6waOXV0ku>EAgDpm$%*@;k8Bv=r?Kmg7xvlgzulV_-q&xU
zJ;6!nF$1egZnb0tQXrkvuZ(g!qN8N3C4xnvsMuuw6Y5q+oMPs4X*5zQe@2J$X%pz|
zBjV#BQ}0{XFRJ;%5O6B=-0bWD&k?8m>*6QQ@n^GkenU$AQ_gz4>Y{V}>c<1e(pQm|
z2(Q#VNqPCCl9CdBth0Li0epwTtzCnxNZ!OIMBYR<1h85h+eWG2><j;$n>L8M;y*Rb
z%*NN_xp%-X28fV=_fC-VnXd9l$~!Pc`}Cw$mkl}P_4d2Q=Zzys9r5Yab*YJk3q{u`
z7xy?#TF|a5Uw)oFf+lE*M(@EfH^4DDk$GSrgmd63hxD361NSq~A-vyATX?bO5z)})
zZaaHNS1bDTPjsg&IsUlx(Z7-B!TZ=zo94(ka1%v>$cFUvjZLTOHgeGqqb@%|U(t=z
z#e+NbwB<oD#dPqv;%g@DH*rZAZ2LdQ08s58YMl5~kI_U$RdiKG<46HL{RDw&PqnX;
n2ZgSuLiOb9|EHfR&>(86HxNJXgy+!Iqvb)g4YbN`JqZ3EXNG0R

literal 0
HcmV?d00001

diff --git a/goformation/test.go b/goformation/test.go
new file mode 100644
index 0000000000..1f2eb8e7d5
--- /dev/null
+++ b/goformation/test.go
@@ -0,0 +1 @@
+package goformation
diff --git a/goformation/test/json/invalid-sam-template-no-transform.json b/goformation/test/json/invalid-sam-template-no-transform.json
new file mode 100644
index 0000000000..ab39f0b511
--- /dev/null
+++ b/goformation/test/json/invalid-sam-template-no-transform.json
@@ -0,0 +1,14 @@
+{
+  "AWSTemplateFormatVersion" : "2010-09-09",
+  "Description" : "Template has a Serverless resource, but no transform",
+  "Resources" : {
+    "MyServerlessFunctionLogicalID": {
+      "Type": "AWS::Serverless::Function",
+      "Properties": {
+        "Handler": "index.handler",
+        "CodeUri": "s3://testBucket/mySourceCode.zip",
+        "Runtime": "nodejs4.3"
+      }
+    }
+  }
+}
diff --git a/goformation/test/json/invalid-sam-template-wrong-transform.json b/goformation/test/json/invalid-sam-template-wrong-transform.json
new file mode 100644
index 0000000000..6b711c6ca0
--- /dev/null
+++ b/goformation/test/json/invalid-sam-template-wrong-transform.json
@@ -0,0 +1,15 @@
+{
+  "AWSTemplateFormatVersion" : "2010-09-09",
+  "Description" : "Template has a Serverless resource, but wrong transform",
+  "Transform" : "HelloWorld",
+  "Resources" : {
+    "MyServerlessFunctionLogicalID": {
+      "Type": "AWS::Serverless::Function",
+      "Properties": {
+        "Handler": "index.handler",
+        "CodeUri": "s3://testBucket/mySourceCode.zip",
+        "Runtime": "nodejs10.x"
+      }
+    }
+  }
+}
diff --git a/goformation/test/json/invalid-template-additional-property.json b/goformation/test/json/invalid-template-additional-property.json
new file mode 100644
index 0000000000..800e8b7cd2
--- /dev/null
+++ b/goformation/test/json/invalid-template-additional-property.json
@@ -0,0 +1,26 @@
+{
+  "Hello" : "World",
+  "AWSTemplateFormatVersion" : "2010-09-09",
+  "Description" : "Has invalid root property 'Hello'",
+  "Resources" : {
+    "MyRoute53HostedZone" : {
+      "Type" : "AWS::Route53::HostedZone",
+      "Properties" : {
+        "Name" :  "example.com"
+      }
+    },
+    "MySNSTopic" : {
+      "Type" : "AWS::SNS::Topic",
+      "Properties" : {
+        "DisplayName" : "test-sns-topic-display-name",
+        "Subscription" : [
+          {
+            "Endpoint" : "test-sns-topic-subscription-endpoint",
+            "Protocol" : "test-sns-topic-subscription-protocol"
+          }
+        ],
+        "TopicName" : "test-sns-topic-name"
+      }
+    }
+  }
+}
diff --git a/goformation/test/json/invalid-template-additional-resource-property.json b/goformation/test/json/invalid-template-additional-resource-property.json
new file mode 100644
index 0000000000..681d7f5567
--- /dev/null
+++ b/goformation/test/json/invalid-template-additional-resource-property.json
@@ -0,0 +1,26 @@
+{
+  "AWSTemplateFormatVersion" : "2010-09-09",
+  "Description" : "Has invalid 'Hello' property for AWS::Route53::HostedZone",
+  "Resources" : {
+    "MyRoute53HostedZone" : {
+      "Type" : "AWS::Route53::HostedZone",
+      "Properties" : {
+        "Name" :  "example.com",
+        "Hello" : "World"
+      }
+    },
+    "MySNSTopic" : {
+      "Type" : "AWS::SNS::Topic",
+      "Properties" : {
+        "DisplayName" : "test-sns-topic-display-name",
+        "Subscription" : [
+          {
+            "Endpoint" : "test-sns-topic-subscription-endpoint",
+            "Protocol" : "test-sns-topic-subscription-protocol"
+          }
+        ],
+        "TopicName" : "test-sns-topic-name"
+      }
+    }
+  }
+}
diff --git a/goformation/test/json/invalid-template-empty-resource-properties.json b/goformation/test/json/invalid-template-empty-resource-properties.json
new file mode 100644
index 0000000000..e1facac77d
--- /dev/null
+++ b/goformation/test/json/invalid-template-empty-resource-properties.json
@@ -0,0 +1,23 @@
+{
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Description": "Has empty properties for AWS::IoT::Policy (PolicyDocument is required)",
+  "Resources": {
+    "MyRoute53HostedZone": {
+      "Type": "AWS::IoT::Policy",
+      "Properties": {}
+    },
+    "MySNSTopic": {
+      "Type": "AWS::SNS::Topic",
+      "Properties": {
+        "DisplayName": "test-sns-topic-display-name",
+        "Subscription": [
+          {
+            "Endpoint": "test-sns-topic-subscription-endpoint",
+            "Protocol": "test-sns-topic-subscription-protocol"
+          }
+        ],
+        "TopicName": "test-sns-topic-name"
+      }
+    }
+  }
+}
diff --git a/goformation/test/json/invalid-template-invalid-resource-name.json b/goformation/test/json/invalid-template-invalid-resource-name.json
new file mode 100644
index 0000000000..6ee740033b
--- /dev/null
+++ b/goformation/test/json/invalid-template-invalid-resource-name.json
@@ -0,0 +1,12 @@
+{
+  "AWSTemplateFormatVersion" : "2010-09-09",
+  "Description" : "Has non-alphanumeric resource name",
+  "Resources" : {
+    "My_Route_53_Hosted_Zone" : {
+      "Type" : "AWS::Route53::HostedZone",
+      "Properties" : {
+        "Name" :  "example.com"
+      }
+    }
+  }
+}
diff --git a/goformation/test/json/invalid-template-invalid-resource-subproperty.json b/goformation/test/json/invalid-template-invalid-resource-subproperty.json
new file mode 100644
index 0000000000..af0d40a447
--- /dev/null
+++ b/goformation/test/json/invalid-template-invalid-resource-subproperty.json
@@ -0,0 +1,20 @@
+{
+  "AWSTemplateFormatVersion" : "2010-09-09",
+  "Description" : "Has wrong type for AWS::SNS::Topic.Subscription",
+  "Resources" : {
+    "MyRoute53HostedZone" : {
+      "Type" : "AWS::Route53::HostedZone",
+      "Properties" : {
+        "Name" :  "example.com"
+      }
+    },
+    "MySNSTopic" : {
+      "Type" : "AWS::SNS::Topic",
+      "Properties" : {
+        "DisplayName" : "test-sns-topic-display-name",
+        "Subscription" : "HelloWorld",
+        "TopicName" : "test-sns-topic-name"
+      }
+    }
+  }
+}
diff --git a/goformation/test/json/invalid-template-missing-resource-properties.json b/goformation/test/json/invalid-template-missing-resource-properties.json
new file mode 100644
index 0000000000..8c7265c202
--- /dev/null
+++ b/goformation/test/json/invalid-template-missing-resource-properties.json
@@ -0,0 +1,22 @@
+{
+  "AWSTemplateFormatVersion": "2010-09-09",
+  "Description": "Missing Properties for AWS::IoT::Policy (PolicyDocument is required)",
+  "Resources": {
+    "MyIoTPolicy": {
+      "Type": "AWS::IoT::Policy"
+    },
+    "MySNSTopic": {
+      "Type": "AWS::SNS::Topic",
+      "Properties": {
+        "DisplayName": "test-sns-topic-display-name",
+        "Subscription": [
+          {
+            "Endpoint": "test-sns-topic-subscription-endpoint",
+            "Protocol": "test-sns-topic-subscription-protocol"
+          }
+        ],
+        "TopicName": "test-sns-topic-name"
+      }
+    }
+  }
+}
diff --git a/goformation/test/json/invalid-template-missing-resource-type.json b/goformation/test/json/invalid-template-missing-resource-type.json
new file mode 100644
index 0000000000..aefd348e11
--- /dev/null
+++ b/goformation/test/json/invalid-template-missing-resource-type.json
@@ -0,0 +1,24 @@
+{
+  "AWSTemplateFormatVersion" : "2010-09-09",
+  "Description" : "Missing Type for resource",
+  "Resources" : {
+    "MyRoute53HostedZone" : {
+      "Properties" : {
+        "Name" :  "example.com"
+      }
+    },
+    "MySNSTopic" : {
+      "Type" : "AWS::SNS::Topic",
+      "Properties" : {
+        "DisplayName" : "test-sns-topic-display-name",
+        "Subscription" : [
+          {
+            "Endpoint" : "test-sns-topic-subscription-endpoint",
+            "Protocol" : "test-sns-topic-subscription-protocol"
+          }
+        ],
+        "TopicName" : "test-sns-topic-name"
+      }
+    }
+  }
+}
diff --git a/goformation/test/json/invalid-template-missing-resources.json b/goformation/test/json/invalid-template-missing-resources.json
new file mode 100644
index 0000000000..d600fb8427
--- /dev/null
+++ b/goformation/test/json/invalid-template-missing-resources.json
@@ -0,0 +1,4 @@
+{
+  "AWSTemplateFormatVersion" : "2010-09-09",
+  "Description" : "No Resources section"
+}
diff --git a/goformation/test/json/invalid-template-subproperty-missing-property.json b/goformation/test/json/invalid-template-subproperty-missing-property.json
new file mode 100644
index 0000000000..be6e8806aa
--- /dev/null
+++ b/goformation/test/json/invalid-template-subproperty-missing-property.json
@@ -0,0 +1,24 @@
+{
+  "AWSTemplateFormatVersion" : "2010-09-09",
+  "Description" : "Missing Protocol property for AWS::SNS::Topic.Subscription",
+  "Resources" : {
+    "MyRoute53HostedZone" : {
+      "Type" : "AWS::Route53::HostedZone",
+      "Properties" : {
+        "Name" :  "example.com"
+      }
+    },
+    "MySNSTopic" : {
+      "Type" : "AWS::SNS::Topic",
+      "Properties" : {
+        "DisplayName" : "test-sns-topic-display-name",
+        "Subscription" : [
+          {
+            "Endpoint" : "test-sns-topic-subscription-endpoint"
+          }
+        ],
+        "TopicName" : "test-sns-topic-name"
+      }
+    }
+  }
+}
diff --git a/goformation/test/json/invalid-template-unknown-resource-type.json b/goformation/test/json/invalid-template-unknown-resource-type.json
new file mode 100644
index 0000000000..0142cadfb8
--- /dev/null
+++ b/goformation/test/json/invalid-template-unknown-resource-type.json
@@ -0,0 +1,25 @@
+{
+  "AWSTemplateFormatVersion" : "2010-09-09",
+  "Description" : "Resource with an unrecognized resource type 'NewResourceType'",
+  "Resources" : {
+    "MyNewResource" : {
+      "Type" : "AWS::NewService::NewResourceType",
+      "Properties" : {
+        "Name" :  "HelloWorld"
+      }
+    },
+    "MySNSTopic" : {
+      "Type" : "AWS::SNS::Topic",
+      "Properties" : {
+        "DisplayName" : "test-sns-topic-display-name",
+        "Subscription" : [
+          {
+            "Endpoint" : "test-sns-topic-subscription-endpoint",
+            "Protocol" : "test-sns-topic-subscription-protocol"
+          }
+        ],
+        "TopicName" : "test-sns-topic-name"
+      }
+    }
+  }
+}
diff --git a/goformation/test/json/invalid-template-unknown-subproperty-property.json b/goformation/test/json/invalid-template-unknown-subproperty-property.json
new file mode 100644
index 0000000000..a1c98b2277
--- /dev/null
+++ b/goformation/test/json/invalid-template-unknown-subproperty-property.json
@@ -0,0 +1,26 @@
+{
+  "AWSTemplateFormatVersion" : "2010-09-09",
+  "Description" : "Unrecognized 'Hello' property for AWS::SNS::Topic.Subscription",
+  "Resources" : {
+    "MyRoute53HostedZone" : {
+      "Type" : "AWS::Route53::HostedZone",
+      "Properties" : {
+        "Name" :  "example.com"
+      }
+    },
+    "MySNSTopic" : {
+      "Type" : "AWS::SNS::Topic",
+      "Properties" : {
+        "DisplayName" : "test-sns-topic-display-name",
+        "Subscription" : [
+          {
+            "Endpoint" : "test-sns-topic-subscription-endpoint",
+            "Protocol" : "test-sns-topic-subscription-protocol",
+            "Hello"    : "World"
+          }
+        ],
+        "TopicName" : "test-sns-topic-name"
+      }
+    }
+  }
+}
diff --git a/goformation/test/json/resource-with-tags.json b/goformation/test/json/resource-with-tags.json
new file mode 100644
index 0000000000..95548230c1
--- /dev/null
+++ b/goformation/test/json/resource-with-tags.json
@@ -0,0 +1,32 @@
+{
+    "AWSTemplateFormatVersion": "2010-09-09",
+    "Description": "Valid CloudFormation template",
+    "Resources": {
+        "EcsClusterDefaultAutoScalingGroupASGC1A785DB": {
+            "Type": "AWS::AutoScaling::AutoScalingGroup",
+            "Properties": {
+                "MaxSize": "1",
+                "MinSize": "1",
+                "DesiredCapacity": "1",
+                "LaunchConfigurationName": {
+                    "Ref": "EcsClusterDefaultAutoScalingGroupLaunchConfigB7E376C1"
+                },
+                "Tags": [
+                    {
+                        "Key": "Name",
+                        "PropagateAtLaunch": true,
+                        "Value": "aws-ecs-integ-ecs/EcsCluster/DefaultAutoScalingGroup"
+                    }
+                ],
+                "VPCZoneIdentifier": [
+                    {
+                        "Ref": "VpcPrivateSubnet1Subnet536B997A"
+                    },
+                    {
+                        "Ref": "VpcPrivateSubnet2Subnet3788AAA1"
+                    }
+                ]
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/goformation/test/json/valid-sam-template.json b/goformation/test/json/valid-sam-template.json
new file mode 100644
index 0000000000..03f25d0c70
--- /dev/null
+++ b/goformation/test/json/valid-sam-template.json
@@ -0,0 +1,28 @@
+{
+  "AWSTemplateFormatVersion" : "2010-09-09",
+  "Description" : "Valid Serverless template",
+  "Transform" : "AWS::Serverless-2016-10-31",
+  "Resources" : {
+    "MyServerlessFunctionLogicalID": {
+      "Type": "AWS::Serverless::Function",
+      "Properties": {
+        "Handler": "index.handler",
+        "CodeUri": "s3://testBucket/mySourceCode.zip",
+        "Runtime": "nodejs10.x"
+      }
+    },
+    "MySNSTopic" : {
+      "Type" : "AWS::SNS::Topic",
+      "Properties" : {
+        "DisplayName" : "test-sns-topic-display-name",
+        "Subscription" : [
+          {
+            "Endpoint" : "test-sns-topic-subscription-endpoint",
+            "Protocol" : "test-sns-topic-subscription-protocol"
+          }
+        ],
+        "TopicName" : "test-sns-topic-name"
+      }
+    }
+  }
+}
diff --git a/goformation/test/json/valid-template-resource-attributes.json b/goformation/test/json/valid-template-resource-attributes.json
new file mode 100644
index 0000000000..cca663a5b2
--- /dev/null
+++ b/goformation/test/json/valid-template-resource-attributes.json
@@ -0,0 +1,54 @@
+{
+  "AWSTemplateFormatVersion" : "2010-09-09",
+  "Description" : "Valid CloudFormation template",
+  "Resources" : {
+    "MyRoute53HostedZone" : {
+      "Type" : "AWS::Route53::HostedZone",
+      "Properties" : {
+        "Name" :  "example.com"
+      },
+      "DependsOn" : "MySNSTopic",
+      "DeletionPolicy" : "Retain"
+    },
+    "MySNSTopic" : {
+      "Type" : "AWS::SNS::Topic",
+      "Properties" : {
+        "DisplayName" : "test-sns-topic-display-name",
+        "Subscription" : [
+          {
+            "Endpoint" : "test-sns-topic-subscription-endpoint",
+            "Protocol" : "test-sns-topic-subscription-protocol"
+          }
+        ],
+        "TopicName" : "test-sns-topic-name"
+      }
+    },
+    "MyAutoScalingGroup": {
+      "Type": "AWS::AutoScaling::AutoScalingGroup",
+      "DependsOn": ["MySNSTopic", "MyRoute53HostedZone"],
+      "Properties": {
+        "LaunchConfigurationName": "MyLaunchConfig",
+        "DesiredCapacity": "3",
+        "MinSize": "1",
+        "MaxSize": "4"
+      },
+      "CreationPolicy": {
+        "ResourceSignal": {
+          "Count": "3",
+          "Timeout": "PT15M"
+        }
+      },
+      "UpdatePolicy" : {
+        "AutoScalingScheduledAction" : {
+          "IgnoreUnmodifiedGroupSizeProperties" : "true"
+        },
+        "AutoScalingRollingUpdate" : {
+          "MinInstancesInService" : "1",
+          "MaxBatchSize" : "2",
+          "PauseTime" : "PT1M",
+          "WaitOnResourceSignals" : "true"
+        }
+      }
+    }
+  }
+}
diff --git a/goformation/test/json/valid-template-with-fns.json b/goformation/test/json/valid-template-with-fns.json
new file mode 100644
index 0000000000..2a4c879af7
--- /dev/null
+++ b/goformation/test/json/valid-template-with-fns.json
@@ -0,0 +1,36 @@
+{
+  "AWSTemplateFormatVersion" : "2010-09-09",
+  "Description" : "Valid template with an intrinsic function",
+  "Resources" : {
+    "MyServerlessFunctionLogicalID": {
+      "Type": "AWS::Lambda::Function",
+      "Properties": {
+        "Handler": "index.handler",
+        "Code": {
+          "S3Bucket": "testBucket",
+          "S3Key": "mySourceCode.zip"
+        },
+        "Role": {
+          "Fn::GetAtt": ["FunctionNameRole", "Arn"]
+        },
+        "Runtime": "nodejs10.x"
+      }
+    },
+    "FunctionNameRole": {
+      "Type": "AWS::IAM::Role",
+      "Properties": {
+        "ManagedPolicyArns": ["arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"],
+        "AssumeRolePolicyDocument": {
+          "Version": "2012-10-17",
+          "Statement": [{
+            "Action": ["sts:AssumeRole"],
+            "Effect": "Allow",
+            "Principal": {
+              "Service": ["lambda.amazonaws.com"]
+            }
+          }]
+        }
+      }
+    }
+  }
+}
diff --git a/goformation/test/json/valid-template.json b/goformation/test/json/valid-template.json
new file mode 100644
index 0000000000..6aa78d9f9e
--- /dev/null
+++ b/goformation/test/json/valid-template.json
@@ -0,0 +1,25 @@
+{
+  "AWSTemplateFormatVersion" : "2010-09-09",
+  "Description" : "Valid CloudFormation template",
+  "Resources" : {
+    "MyRoute53HostedZone" : {
+      "Type" : "AWS::Route53::HostedZone",
+      "Properties" : {
+        "Name" :  "example.com"
+      }
+    },
+    "MySNSTopic" : {
+      "Type" : "AWS::SNS::Topic",
+      "Properties" : {
+        "DisplayName" : "test-sns-topic-display-name",
+        "Subscription" : [
+          {
+            "Endpoint" : "test-sns-topic-subscription-endpoint",
+            "Protocol" : "test-sns-topic-subscription-protocol"
+          }
+        ],
+        "TopicName" : "test-sns-topic-name"
+      }
+    }
+  }
+}
diff --git a/goformation/test/yaml/api-swagger-plain.yaml b/goformation/test/yaml/api-swagger-plain.yaml
new file mode 100644
index 0000000000..cc7f499ce4
--- /dev/null
+++ b/goformation/test/yaml/api-swagger-plain.yaml
@@ -0,0 +1,1111 @@
+AWSTemplateFormatVersion: "2010-09-09"
+Description: "Swagger demo for Integration Requests"
+Outputs: 
+  NotifyUrl: 
+    Description: "Notify Workflow URL"
+    Value: "https://${StepFunctionsAPI}.execute-api.${AWS::Region}.amazonaws.com/dev/notify"
+  StepFunctionsStateMachine: 
+    Description: "Step Functions State Machine ARN"
+    Value: StepFunctionStateMachine
+Parameters: 
+  NotificationEmail: 
+    Description: "Email address to subscribe to SNS topic and receive notifications from Notifier Workflow"
+    Type: String
+  SlackToken: 
+    Default: None
+    Description: "Legacy Slack Token (xoxp-ywz) to send messages on channel"
+    Type: String
+Resources: 
+  AnotherRandomAPI: 
+    Properties: 
+      DefinitionBody: 
+        basePath: /v2
+        definitions: 
+          ApiResponse: 
+            properties: 
+              code: 
+                format: int32
+                type: integer
+              message: 
+                type: string
+              type: 
+                type: string
+            xml: 
+              name: "##default"
+          Category: 
+            properties: 
+              id: 
+                format: int64
+                type: integer
+              name: 
+                type: string
+            xml: 
+              name: Category
+          Order: 
+            properties: 
+              complete: 
+                type: boolean
+              id: 
+                format: int64
+                type: integer
+              petId: 
+                format: int64
+                type: integer
+              quantity: 
+                format: int32
+                type: integer
+              shipDate: 
+                format: date-time
+                type: string
+              status: 
+                description: "Order Status"
+                enum: 
+                  - placed
+                  - approved
+                  - delivered
+                type: string
+            xml: 
+              name: Order
+          Pet: 
+            properties: 
+              category: 
+                $ref: "#/definitions/Category"
+              id: 
+                format: int64
+                type: integer
+              name: 
+                example: doggie
+                type: string
+              photoUrls: 
+                items: 
+                  type: string
+                type: array
+                xml: 
+                  name: photoUrl
+                  wrapped: true
+              status: 
+                description: "pet status in the store"
+                enum: 
+                  - available
+                  - pending
+                  - sold
+                type: string
+              tags: 
+                items: 
+                  $ref: "#/definitions/Tag"
+                type: array
+                xml: 
+                  name: tag
+                  wrapped: true
+            required: 
+              - name
+              - photoUrls
+            xml: 
+              name: Pet
+          Tag: 
+            properties: 
+              id: 
+                format: int64
+                type: integer
+              name: 
+                type: string
+            xml: 
+              name: Tag
+          User: 
+            properties: 
+              email: 
+                type: string
+              firstName: 
+                type: string
+              id: 
+                format: int64
+                type: integer
+              lastName: 
+                type: string
+              password: 
+                type: string
+              phone: 
+                type: string
+              userStatus: 
+                description: "User Status"
+                format: int32
+                type: integer
+              username: 
+                type: string
+            xml: 
+              name: User
+        externalDocs: 
+          description: "Find out more about Swagger"
+          url: "http://swagger.io"
+        info: 
+          contact: 
+            email: apiteam@swagger.io
+          description: "This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters"
+          license: 
+            name: "Apache 2.0"
+            url: "http://www.apache.org/licenses/LICENSE-2.0.html"
+          termsOfService: "http://swagger.io/terms/"
+          title: "Swagger Petstore YAML"
+          version: "1.0.0"
+        paths: 
+          /pet: 
+            post: 
+              consumes: 
+                - application/json
+                - application/xml
+              description: ""
+              operationId: addPet
+              parameters: 
+                - 
+                  description: "Pet object that needs to be added to the store"
+                  in: body
+                  name: body
+                  required: false
+                  schema: 
+                    $ref: "#/definitions/Pet"
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "405": 
+                  description: "Invalid input"
+              security: 
+                - 
+                  petstore_auth: 
+                    - "write:pets"
+                    - "read:pets"
+              summary: "Add a new pet to the store"
+              tags: 
+                - pet
+              x-swagger-router-controller: SampleController
+            put: 
+              consumes: 
+                - application/json
+                - application/xml
+              description: ""
+              operationId: updatePet
+              parameters: 
+                - 
+                  description: "Pet object that needs to be added to the store"
+                  in: body
+                  name: body
+                  required: false
+                  schema: 
+                    $ref: "#/definitions/Pet"
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "400": 
+                  description: "Invalid ID supplied"
+                "404": 
+                  description: "Pet not found"
+                "405": 
+                  description: "Validation exception"
+              security: 
+                - 
+                  petstore_auth: 
+                    - "write:pets"
+                    - "read:pets"
+              summary: "Update an existing pet"
+              tags: 
+                - pet
+          /pet/findByStatus: 
+            get: 
+              consumes: 
+                - application/xml
+                - application/json
+                - multipart/form-data
+                - application/x-www-form-urlencoded
+              description: "Multiple status values can be provided with comma seperated strings"
+              operationId: findPetsByStatus
+              parameters: 
+                - 
+                  collectionFormat: multi
+                  default: available
+                  description: "Status values that need to be considered for filter"
+                  enum: 
+                    - available
+                    - pending
+                    - sold
+                  in: query
+                  items: 
+                    type: string
+                  name: status
+                  required: false
+                  type: array
+                - 
+                  collectionFormat: multi
+                  default: available
+                  description: "Status values that need to be considered for filter"
+                  enum: 
+                    - 1234567890123456
+                    - 345
+                    - 678
+                  in: query
+                  items: 
+                    type: long
+                  name: testlong
+                  required: false
+                  type: array
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "200": 
+                  description: "successful operation"
+                  schema: 
+                    items: 
+                      $ref: "#/definitions/Pet"
+                    type: array
+                "400": 
+                  description: "Invalid status value"
+              security: 
+                - 
+                  petstore_auth: 
+                    - "write:pets"
+                    - "read:pets"
+              summary: "Finds Pets by status"
+              tags: 
+                - pet
+          /pet/findByTags: 
+            get: 
+              description: "Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing."
+              operationId: findPetsByTags
+              parameters: 
+                - 
+                  collectionFormat: multi
+                  description: "Tags to filter by"
+                  in: query
+                  items: 
+                    type: string
+                  name: tags
+                  required: false
+                  type: array
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "200": 
+                  description: "successful operation"
+                  schema: 
+                    items: 
+                      $ref: "#/definitions/Pet"
+                    type: array
+                "400": 
+                  description: "Invalid tag value"
+              security: 
+                - 
+                  petstore_auth: 
+                    - "write:pets"
+                    - "read:pets"
+              summary: "Finds Pets by tags"
+              tags: 
+                - pet
+          ? "/pet/{petId}"
+          : 
+            delete: 
+              consumes: 
+                - multipart/form-data
+                - application/x-www-form-urlencoded
+              description: ""
+              operationId: deletePet
+              parameters: 
+                - 
+                  description: ""
+                  in: header
+                  name: api_key
+                  required: false
+                  type: string
+                - 
+                  description: "Pet id to delete"
+                  format: int64
+                  in: path
+                  name: petId
+                  required: true
+                  type: integer
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "400": 
+                  description: "Invalid pet value"
+              security: 
+                - 
+                  petstore_auth: 
+                    - "write:pets"
+                    - "read:pets"
+              summary: "Deletes a pet"
+              tags: 
+                - pet
+            get: 
+              consumes: 
+                - application/x-www-form-urlencoded
+              description: "Returns a single pet"
+              operationId: getPetById
+              parameters: 
+                - 
+                  description: "ID of pet to return"
+                  format: int64
+                  in: path
+                  name: petId
+                  required: true
+                  type: integer
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "200": 
+                  description: "successful operation"
+                  schema: 
+                    $ref: "#/definitions/Pet"
+                "400": 
+                  description: "Invalid ID supplied"
+                "404": 
+                  description: "Pet not found"
+              security: 
+                - 
+                  api_key: []
+                - 
+                  petstore_auth: 
+                    - "write:pets"
+                    - "read:pets"
+              summary: "Find pet by ID"
+              tags: 
+                - pet
+            post: 
+              consumes: 
+                - application/x-www-form-urlencoded
+              description: ""
+              operationId: updatePetWithForm
+              parameters: 
+                - 
+                  description: "ID of pet that needs to be updated"
+                  in: path
+                  name: petId
+                  required: true
+                  type: string
+                - 
+                  description: "Updated name of the pet"
+                  in: formData
+                  name: name
+                  required: false
+                  type: string
+                - 
+                  description: "Updated status of the pet"
+                  in: formData
+                  name: status
+                  required: false
+                  type: string
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "405": 
+                  description: "Invalid input"
+              security: 
+                - 
+                  petstore_auth: 
+                    - "write:pets"
+                    - "read:pets"
+              summary: "Updates a pet in the store with form data"
+              tags: 
+                - pet
+          ? "/pet/{petId}/uploadImage"
+          : 
+            post: 
+              consumes: 
+                - multipart/form-data
+              description: ""
+              operationId: uploadFile
+              parameters: 
+                - 
+                  description: "ID of pet to update"
+                  format: int64
+                  in: path
+                  name: petId
+                  required: true
+                  type: integer
+                - 
+                  description: "Additional data to pass to server"
+                  in: formData
+                  name: additionalMetadata
+                  required: false
+                  type: string
+                - 
+                  description: "file to upload"
+                  in: formData
+                  name: file
+                  required: false
+                  type: file
+              produces: 
+                - application/json
+              responses: 
+                "200": 
+                  description: "successful operation"
+                  schema: 
+                    $ref: "#/definitions/ApiResponse"
+              security: 
+                - 
+                  petstore_auth: 
+                    - "write:pets"
+                    - "read:pets"
+              summary: "uploads an image"
+              tags: 
+                - pet
+              x-swagger-router-controller: SampleController
+          /store/inventory: 
+            get: 
+              description: "Returns a map of status codes to quantities"
+              operationId: getInventory
+              parameters: []
+              produces: 
+                - application/json
+              responses: 
+                "200": 
+                  description: "successful operation"
+                  schema: 
+                    additionalProperties: 
+                      format: int32
+                      type: integer
+                    type: object
+              security: 
+                - 
+                  api_key: []
+              summary: "Returns pet inventories by status"
+              tags: 
+                - store
+          /store/order: 
+            post: 
+              description: ""
+              operationId: placeOrder
+              parameters: 
+                - 
+                  description: "order placed for purchasing the pet"
+                  in: body
+                  name: body
+                  required: false
+                  schema: 
+                    $ref: "#/definitions/Order"
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "200": 
+                  description: "successful operation"
+                  schema: 
+                    $ref: "#/definitions/Order"
+                "400": 
+                  description: "Invalid Order"
+              summary: "Place an order for a pet"
+              tags: 
+                - store
+          ? "/store/order/{orderId}"
+          : 
+            delete: 
+              description: "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors"
+              operationId: deleteOrder
+              parameters: 
+                - 
+                  description: "ID of the order that needs to be deleted"
+                  in: path
+                  name: orderId
+                  required: true
+                  type: string
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "400": 
+                  description: "Invalid ID supplied"
+                "404": 
+                  description: "Order not found"
+              summary: "Delete purchase order by ID"
+              tags: 
+                - store
+            get: 
+              description: "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions"
+              operationId: getOrderById
+              parameters: 
+                - 
+                  description: "ID of pet that needs to be fetched"
+                  in: path
+                  name: orderId
+                  required: true
+                  type: string
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "200": 
+                  description: "successful operation"
+                  schema: 
+                    $ref: "#/definitions/Order"
+                "400": 
+                  description: "Invalid ID supplied"
+                "404": 
+                  description: "Order not found"
+              summary: "Find purchase order by ID"
+              tags: 
+                - store
+          /user: 
+            post: 
+              description: "This can only be done by the logged in user."
+              operationId: createUser
+              parameters: 
+                - 
+                  description: "Created user object"
+                  in: body
+                  name: body
+                  required: false
+                  schema: 
+                    $ref: "#/definitions/User"
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                default: 
+                  description: "successful operation"
+              summary: "Create user"
+              tags: 
+                - user
+          /user/createWithArray: 
+            post: 
+              description: ""
+              operationId: createUsersWithArrayInput
+              parameters: 
+                - 
+                  description: "List of user object"
+                  in: body
+                  name: body
+                  required: false
+                  schema: 
+                    items: 
+                      $ref: "#/definitions/User"
+                    type: array
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                default: 
+                  description: "successful operation"
+              summary: "Creates list of users with given input array"
+              tags: 
+                - user
+          /user/createWithList: 
+            post: 
+              description: ""
+              operationId: createUsersWithListInput
+              parameters: 
+                - 
+                  description: "List of user object"
+                  in: body
+                  name: body
+                  required: false
+                  schema: 
+                    items: 
+                      $ref: "#/definitions/User"
+                    type: array
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                default: 
+                  description: "successful operation"
+              summary: "Creates list of users with given input array"
+              tags: 
+                - user
+          /user/login: 
+            get: 
+              description: ""
+              operationId: loginUser
+              parameters: 
+                - 
+                  description: "The user name for login"
+                  in: query
+                  name: username
+                  required: false
+                  type: string
+                - 
+                  description: "The password for login in clear text"
+                  in: query
+                  name: password
+                  required: false
+                  type: string
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "200": 
+                  description: "successful operation"
+                  headers: 
+                    X-Expires-After: 
+                      description: "date in UTC when toekn expires"
+                      format: date-time
+                      type: string
+                    X-Rate-Limit: 
+                      description: "calls per hour allowed by the user"
+                      format: int32
+                      type: integer
+                  schema: 
+                    type: string
+                "400": 
+                  description: "Invalid username/password supplied"
+              summary: "Logs user into the system"
+              tags: 
+                - user
+          /user/logout: 
+            get: 
+              description: ""
+              operationId: logoutUser
+              parameters: []
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                default: 
+                  description: "successful operation"
+              summary: "Logs out current logged in user session"
+              tags: 
+                - user
+          ? "/user/{username}"
+          : 
+            delete: 
+              description: "This can only be done by the logged in user."
+              operationId: deleteUser
+              parameters: 
+                - 
+                  description: "The name that needs to be deleted"
+                  in: path
+                  name: username
+                  required: true
+                  type: string
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "400": 
+                  description: "Invalid username supplied"
+                "404": 
+                  description: "User not found"
+              summary: "Delete user"
+              tags: 
+                - user
+            get: 
+              description: ""
+              operationId: getUserByName
+              parameters: 
+                - 
+                  description: "The name that needs to be fetched. Use user1 for testing. "
+                  in: path
+                  name: username
+                  required: true
+                  type: string
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "200": 
+                  description: "successful operation"
+                  schema: 
+                    $ref: "#/definitions/User"
+                "400": 
+                  description: "Invalid username supplied"
+                "404": 
+                  description: "User not found"
+              summary: "Get user by user name"
+              tags: 
+                - user
+            put: 
+              description: "This can only be done by the logged in user."
+              operationId: updateUser
+              parameters: 
+                - 
+                  description: "name that need to be deleted"
+                  in: path
+                  name: username
+                  required: true
+                  type: string
+                - 
+                  description: "Updated user object"
+                  in: body
+                  name: body
+                  required: false
+                  schema: 
+                    $ref: "#/definitions/User"
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "400": 
+                  description: "Invalid user supplied"
+                "404": 
+                  description: "User not found"
+              summary: "Updated user"
+              tags: 
+                - user
+        schemes: 
+          - http
+        securityDefinitions: 
+          api_key: 
+            in: header
+            name: api_key
+            type: apiKey
+          petstore_auth: 
+            authorizationUrl: "http://petstore.swagger.io/api/oauth/dialog"
+            flow: implicit
+            scopes: 
+              ? "read:pets"
+              : "read your pets"
+              ? "write:pets"
+              : "modify pets in your account"
+            type: oauth2
+        swagger: "2.0"
+        tags: 
+          - 
+            description: "Everything about your Pets"
+            externalDocs: 
+              description: "Find out more"
+              url: "http://swagger.io"
+            name: pet
+          - 
+            description: "Operations about user"
+            name: store
+          - 
+            description: "Access to Petstore orders"
+            externalDocs: 
+              description: "Find out more about our store"
+              url: "http://swagger.io"
+            name: user
+      StageName: prod
+    Type: "AWS::Serverless::Api"
+  ApiGatewayStepFunctionsRole: 
+    Properties: 
+      AssumeRolePolicyDocument: 
+        Statement: 
+          - 
+            Action: 
+              - "sts:AssumeRole"
+            Effect: Allow
+            Principal: 
+              Service: 
+                - apigateway.amazonaws.com
+            Sid: AllowApiGatewayServiceToAssumeRole
+        Version: "2012-10-17"
+      Path: /
+      Policies: 
+        - 
+          PolicyDocument: 
+            Statement: 
+              - 
+                Action: 
+                  - "states:StartExecution"
+                Effect: Allow
+                Resource: 
+                  - StepFunctionStateMachine
+            Version: "2012-10-17"
+          PolicyName: CallStepFunctions
+    Type: "AWS::IAM::Role"
+  EmailNotifierServiceFunction: 
+    Properties: 
+      CodeUri: ../code/email/
+      Environment: 
+        Variables: 
+          NOTIFIER_TOPIC: NotifierSNSTopic
+      Handler: email_sns.lambda_handler
+      Role: SnsNotifierServiceRole.Arn
+      Runtime: python2.7
+    Type: "AWS::Serverless::Function"
+  NotifierSNSTopic: 
+    Properties: 
+      Subscription: 
+        - 
+          Endpoint: NotificationEmail
+          Protocol: email
+    Type: "AWS::SNS::Topic"
+  SlackNotifierServiceFunction: 
+    Properties: 
+      CodeUri: ../code/slack.zip
+      Environment: 
+        Variables: 
+          SLACK_TOKEN: SlackToken
+      Handler: slack.lambda_handler
+      Runtime: python2.7
+    Type: "AWS::Serverless::Function"
+  SmsNotifierServiceFunction: 
+    Properties: 
+      CodeUri: ../code/sms/
+      Environment: 
+        Variables: 
+          NOTIFIER_TOPIC: NotifierSNSTopic
+      Handler: sms_sns.lambda_handler
+      Role: SnsNotifierServiceRole.Arn
+      Runtime: python2.7
+    Type: "AWS::Serverless::Function"
+  SnsNotifierServiceRole: 
+    Properties: 
+      AssumeRolePolicyDocument: 
+        Statement: 
+          - 
+            Action: 
+              - "sts:AssumeRole"
+            Effect: Allow
+            Principal: 
+              Service: 
+                - lambda.amazonaws.com
+            Sid: AllowLambdaServiceToAssumeRole
+        Version: "2012-10-17"
+      ManagedPolicyArns: 
+        - "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+      Path: /
+      Policies: 
+        - 
+          PolicyDocument: 
+            Statement: 
+              - 
+                Action: 
+                  - "sns:Publish"
+                Effect: Allow
+                Resource: 
+                  - NotifierSNSTopic
+                  - "*"
+            Version: "2012-10-17"
+          PolicyName: PublishSnsTopic
+    Type: "AWS::IAM::Role"
+  StepFunctionStateMachine: 
+    Properties: 
+      DefinitionString: |
+          {
+              "Comment": "Demo for API GW->SFN",
+              "StartAt": "NotifierState",
+              "States": {
+                "NotifierState": {
+                  "Type" : "Choice",
+                  "Choices": [
+                    {
+                      "Variable": "$.notifier",
+                      "StringEquals": "Email",
+                      "Next": "EmailNotifier"
+                    },
+                    {
+                      "Variable": "$.notifier",
+                      "StringEquals": "Sms",
+                      "Next": "SmsNotifier"
+                    },
+                    {
+                      "Variable": "$.notifier",
+                      "StringEquals": "Slack",
+                      "Next": "SlackNotifier"
+                    },
+                    {
+                      "Variable": "$.notify",
+                      "StringEquals": "Twilio",
+                      "Next": "NotImplementedYet"
+                    }
+                  ],
+                  "Default": "IgnoreNotification"
+                },
+                "IgnoreNotification": {
+                  "Type": "Pass",
+                  "Next": "SayHi"
+                },
+                "NotImplementedYet": {
+                  "Type": "Fail",
+                  "Cause": "Feature not implemented yet!"
+                },
+                "EmailNotifier": {
+                  "Type": "Task",
+                  "Resource": "${EmailNotifierServiceFunction.Arn}",
+                  "Next": "SayHi"
+                },
+                "SlackNotifier": {
+                  "Type": "Task",
+                  "Resource": "${SlackNotifierServiceFunction.Arn}",
+                  "Next": "SayHi"
+                },
+                "SmsNotifier": {
+                  "Type": "Task",
+                  "Resource": "${SmsNotifierServiceFunction.Arn}",
+                  "Next": "SayHi"
+                },
+                "SayHi": {
+                  "Type": "Pass",
+                  "Result": "Hi!",
+                  "End": true
+                }
+              }
+          }
+      RoleArn: StepFunctionsServiceRole.Arn
+    Type: "AWS::StepFunctions::StateMachine"
+  StepFunctionsAPI: 
+    Properties: 
+      DefinitionBody: 
+        basePath: /prod
+        definitions: 
+          Empty: 
+            title: "Empty Schema"
+            type: object
+        info: 
+          title: AwsSamExample
+        paths: 
+          /: 
+            options: 
+              consumes: 
+                - application/json
+              produces: 
+                - application/json
+              responses: 
+                200: 
+                  description: "200 response"
+                  headers: 
+                    Access-Control-Allow-Headers: 
+                      type: string
+                    Access-Control-Allow-Methods: 
+                      type: string
+                    Access-Control-Allow-Origin: 
+                      type: string
+                  schema: 
+                    $ref: "#/definitions/Empty"
+              x-amazon-apigateway-integration: 
+                cacheKeyParameters: []
+                cacheNamespace: "cache namespace"
+                credentials: "arn:aws:iam::012345678901:role/apigateway-invoke-lambda-exec-role"
+                httpMethod: POST
+                requestParameters: 
+                  integration.request.path.stage: method.request.querystring.version
+                  integration.request.querystring.provider: method.request.querystring.vendor
+                requestTemplates: 
+                  application/json: "#set ($root=$input.path('$')) { \"stage\": \"$root.name\", \"user-id\": \"$root.key\" }"
+                  application/xml: "#set ($root=$input.path('$')) <stage>$root.name</stage> "
+                responses: 
+                  "2\\d{2}": 
+                    responseParameters: 
+                      method.response.header.requestId: integration.response.header.cid
+                    responseTemplates: 
+                      application/json: "#set ($root=$input.path('$')) { \"stage\": \"$root.name\", \"user-id\": \"$root.key\" }"
+                      application/xml: "#set ($root=$input.path('$')) <stage>$root.name</stage> "
+                    statusCode: "200"
+                  "302": 
+                    responseParameters: 
+                      method.response.header.Location: integration.response.body.redirect.url
+                    statusCode: "302"
+                  default: 
+                    responseParameters: 
+                      method.response.header.test-method-response-header: "'static value'"
+                    statusCode: "400"
+                type: aws
+                uri: "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:012345678901:function:HelloWorld/invocations"
+            x-amazon-apigateway-any-method: 
+              produces: 
+                - application/json
+              responses: 
+                200: 
+                  description: "200 response"
+                  schema: 
+                    $ref: "#/definitions/Empty"
+              security: 
+                - 
+                  test-authorizer: []
+              x-amazon-apigateway-integration: 
+                httpMethod: POST
+                passthroughBehavior: when_no_match
+                responses: 
+                  default: 
+                    statusCode: 200
+                type: aws_proxy
+                uri: EmailNotifierServiceFunction.Arn
+          "/{proxy+}":
+            options: 
+              consumes: 
+                - application/json
+              produces: 
+                - application/json
+              responses: 
+                200: 
+                  description: "200 response"
+                  headers: 
+                    Access-Control-Allow-Headers: 
+                      type: string
+                    Access-Control-Allow-Methods: 
+                      type: string
+                    Access-Control-Allow-Origin: 
+                      type: string
+                  schema: 
+                    $ref: "#/definitions/Empty"
+              x-amazon-apigateway-integration: 
+                passthroughBehavior: when_no_match
+                requestTemplates: 
+                  application/json: "{\"statusCode\": 200}"
+                responses: 
+                  default: 
+                    responseParameters: 
+                      method.response.header.Access-Control-Allow-Headers: "'Content-Type,Authorization,X-Amz-Date,X-Api-Key,X-Amz-Security-Token'"
+                      method.response.header.Access-Control-Allow-Methods: "'DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT'"
+                      method.response.header.Access-Control-Allow-Origin: "'*'"
+                    statusCode: 200
+                type: mock
+            x-amazon-apigateway-any-method: 
+              parameters: 
+                - 
+                  in: path
+                  name: proxy
+                  required: true
+                  type: string
+              produces: 
+                - application/json
+              responses: {}
+              x-amazon-apigateway-auth: 
+                type: aws_iam
+              x-amazon-apigateway-integration: 
+                httpMethod: POST
+                type: aws_proxy
+                uri: "arn:aws:apigateway:<<region>>:lambda:path/2015-03-31/functions/arn:aws:lambda:<<region>>:<<accountId>>:function:${stageVariables.LambdaFunctionName}/invocations"
+        schemes: 
+          - https
+        securityDefinitions: 
+          test-authorizer: 
+            in: header
+            name: Authorization
+            type: apiKey
+            x-amazon-apigateway-authorizer: 
+              authorizerCredentials: "arn:aws:iam::account-id:role"
+              authorizerResultTtlInSeconds: 60
+              authorizerUri: "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:account-id:function:function-name/invocations"
+              identityValidationExpression: "^x-[a-z]+"
+              type: token
+            x-amazon-apigateway-authtype: oauth2
+        swagger: "2.0"
+      StageName: dev
+    Type: "AWS::Serverless::Api"
+  StepFunctionsServiceRole: 
+    Properties: 
+      AssumeRolePolicyDocument: 
+        Statement: 
+          - 
+            Action: 
+              - "sts:AssumeRole"
+            Effect: Allow
+            Principal: 
+              Service: 
+                - "states.${AWS::Region}.amazonaws.com"
+            Sid: AllowStepFunctionsServiceToAssumeRole
+        Version: "2012-10-17"
+      ManagedPolicyArns: 
+        - "arn:aws:iam::aws:policy/AWSStepFunctionsFullAccess"
+      Path: /
+      Policies: 
+        - 
+          PolicyDocument: 
+            Statement: 
+              - 
+                Action: 
+                  - "lambda:InvokeFunction"
+                Effect: Allow
+                Resource: 
+                  - "${SlackNotifierServiceFunction.Arn}"
+                  - "${EmailNotifierServiceFunction.Arn}"
+                  - "${SmsNotifierServiceFunction.Arn}"
+            Version: "2012-10-17"
+          PolicyName: CallLambdaFunctions
+    Type: "AWS::IAM::Role"
+Transform: "AWS::Serverless-2016-10-31"
diff --git a/goformation/test/yaml/aws-serverless-api-string-or-cors-configuration.yaml b/goformation/test/yaml/aws-serverless-api-string-or-cors-configuration.yaml
new file mode 100644
index 0000000000..4ac4c4b7a6
--- /dev/null
+++ b/goformation/test/yaml/aws-serverless-api-string-or-cors-configuration.yaml
@@ -0,0 +1,38 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: SAM template for testing AWS::Serverless::Api.Cors with both string and Cors Configuration object
+Resources:
+
+  RestApiWithCorsConfiguration:
+    Type: AWS::Serverless::Api
+    Properties:
+      Name: !Sub "${AWS::StackName}-rest-api"
+      StageName: Prod
+      TracingEnabled: false
+      EndpointConfiguration: EDGE
+      MethodSettings:
+        - DataTraceEnabled: false
+          HttpMethod: "*"
+          LoggingLevel: ERROR
+          MetricsEnabled: true
+          ResourcePath: /*
+      Cors:
+        AllowHeaders: "'Authorization,authorization'"
+        AllowOrigin: "'*'"
+
+  RestApiWithCorsString:
+    Type: AWS::Serverless::Api
+    Properties:
+      Name: !Sub "${AWS::StackName}-rest-api"
+      StageName: Prod
+      TracingEnabled: false
+      EndpointConfiguration: EDGE
+      MethodSettings:
+        - DataTraceEnabled: false
+          HttpMethod: "*"
+          LoggingLevel: ERROR
+          MetricsEnabled: true
+          ResourcePath: /*
+      Cors: "'www.example.com'"
+
+    
\ No newline at end of file
diff --git a/goformation/test/yaml/aws-serverless-api-swagger.yaml b/goformation/test/yaml/aws-serverless-api-swagger.yaml
new file mode 100644
index 0000000000..429cb977e8
--- /dev/null
+++ b/goformation/test/yaml/aws-serverless-api-swagger.yaml
@@ -0,0 +1,1038 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: Swagger demo for Integration Requests
+
+Parameters:
+
+  NotificationEmail:
+    Type: String
+    Description: Email address to subscribe to SNS topic and receive notifications from Notifier Workflow
+
+  SlackToken:
+    Type: String
+    Description: Legacy Slack Token (xoxp-ywz) to send messages on channel
+    Default: None
+
+Resources:
+
+
+  SnsNotifierServiceRole:
+    Type: "AWS::IAM::Role"
+    Properties:
+      Path: "/"
+      ManagedPolicyArns:
+          - "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+      AssumeRolePolicyDocument:
+        Version: "2012-10-17"
+        Statement:
+          -
+            Sid: "AllowLambdaServiceToAssumeRole"
+            Effect: "Allow"
+            Action: 
+              - "sts:AssumeRole"
+            Principal:
+              Service:
+                - "lambda.amazonaws.com"
+      Policies:
+        -
+          PolicyName: "PublishSnsTopic"
+          PolicyDocument:
+            Version: '2012-10-17'
+            Statement:
+              -
+                Effect: "Allow"
+                Action:
+                  - "sns:Publish"
+                Resource: 
+                  - !Ref NotifierSNSTopic
+                  - "*" # can't restrict on SMS number yet, so *
+
+
+  EmailNotifierServiceFunction:
+    Type: 'AWS::Serverless::Function'
+    Properties:
+      Handler: email_sns.lambda_handler
+      Runtime: python2.7
+      CodeUri: ../code/email/
+      Role: !GetAtt SnsNotifierServiceRole.Arn
+      Environment:
+        Variables:
+          NOTIFIER_TOPIC: !Ref NotifierSNSTopic
+
+
+  SmsNotifierServiceFunction:
+    Type: 'AWS::Serverless::Function'
+    Properties:
+      Handler: sms_sns.lambda_handler
+      Runtime: python2.7
+      CodeUri: ../code/sms/
+      Role: !GetAtt SnsNotifierServiceRole.Arn
+      Environment:
+        Variables:
+          NOTIFIER_TOPIC: !Ref NotifierSNSTopic
+
+  # No need for extra permissions other than Basic Execution
+  # SAM takes care of creating basic IAM Role if none is provided
+  SlackNotifierServiceFunction:
+    Type: 'AWS::Serverless::Function'
+    Properties:
+      Handler: slack.lambda_handler
+      Runtime: python2.7
+      CodeUri: ../code/slack.zip    # Slack contains 3rd party libraries
+      Environment:
+        Variables:
+          SLACK_TOKEN: !Ref SlackToken
+  # IAM Role API Gateway will assume in order to call StepFunctions StartExecution API
+  ApiGatewayStepFunctionsRole:
+    Type: "AWS::IAM::Role"
+    Properties:
+        Path: "/"
+        AssumeRolePolicyDocument:
+          Version: "2012-10-17"
+          Statement:
+            -
+              Sid: "AllowApiGatewayServiceToAssumeRole"
+              Effect: "Allow"
+              Action: 
+                - "sts:AssumeRole"
+              Principal:
+                Service:
+                  - "apigateway.amazonaws.com"
+        Policies:
+          -
+            PolicyName: "CallStepFunctions"
+            PolicyDocument:
+              Version: '2012-10-17'
+              Statement:
+                -
+                  Effect: "Allow"
+                  Action:
+                    - "states:StartExecution"
+                  Resource: 
+                    - !Ref StepFunctionStateMachine
+
+  AnotherRandomAPI:
+    Type: AWS::Serverless::Api
+    Properties:
+      StageName: prod
+      DefinitionBody:
+        swagger: "2.0"
+        info:
+          description: "This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters"
+          version: 1.0.0
+          title: Swagger Petstore YAML
+          termsOfService: "http://swagger.io/terms/"
+          contact:
+            email: "apiteam@swagger.io"
+          license:
+            name: Apache 2.0
+            url: "http://www.apache.org/licenses/LICENSE-2.0.html"
+        basePath: /v2
+        tags:
+          - name: pet
+            description: Everything about your Pets
+            externalDocs:
+              description: Find out more
+              url: "http://swagger.io"
+          - name: store
+            description: Operations about user
+          - name: user
+            description: Access to Petstore orders
+            externalDocs:
+              description: Find out more about our store
+              url: "http://swagger.io"
+        schemes:
+          - http
+        paths:
+          /pet:
+            post:
+              tags:
+                - pet
+              summary: Add a new pet to the store
+              x-swagger-router-controller: SampleController
+              description: ""
+              operationId: addPet
+              consumes:
+                - application/json
+                - application/xml
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - in: body
+                  name: body
+                  description: Pet object that needs to be added to the store
+                  required: false
+                  schema:
+                    $ref: "#/definitions/Pet"
+              responses:
+                "405":
+                  description: Invalid input
+              security:
+                - petstore_auth:
+                    - "write:pets"
+                    - "read:pets"
+            put:
+              tags:
+                - pet
+              summary: Update an existing pet
+              description: ""
+              operationId: updatePet
+              consumes:
+                - application/json
+                - application/xml
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - in: body
+                  name: body
+                  description: Pet object that needs to be added to the store
+                  required: false
+                  schema:
+                    $ref: "#/definitions/Pet"
+              responses:
+                "400":
+                  description: Invalid ID supplied
+                "404":
+                  description: Pet not found
+                "405":
+                  description: Validation exception
+              security:
+                - petstore_auth:
+                    - "write:pets"
+                    - "read:pets"
+          /pet/findByStatus:
+            get:
+              tags:
+                - pet
+              summary: Finds Pets by status
+              description: Multiple status values can be provided with comma seperated strings
+              operationId: findPetsByStatus
+              consumes:
+                - application/xml
+                - application/json
+                - multipart/form-data
+                - application/x-www-form-urlencoded
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: status
+                  in: query
+                  description: Status values that need to be considered for filter
+                  required: false
+                  type: array
+                  items:
+                    type: string
+                  collectionFormat: multi
+                  default: available
+                  enum:
+                    - available
+                    - pending
+                    - sold
+                - name: testlong
+                  in: query
+                  description: Status values that need to be considered for filter
+                  required: false
+                  type: array
+                  items:
+                    type: long
+                  collectionFormat: multi
+                  default: available
+                  enum:
+                    - 1234567890123456
+                    - 345
+                    - 678
+              responses:
+                "200":
+                  description: successful operation
+                  schema:
+                    type: array
+                    items:
+                      $ref: "#/definitions/Pet"
+                "400":
+                  description: Invalid status value
+              security:
+                - petstore_auth:
+                    - "write:pets"
+                    - "read:pets"
+          /pet/findByTags:
+            get:
+              tags:
+                - pet
+              summary: Finds Pets by tags
+              description: "Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing."
+              operationId: findPetsByTags
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: tags
+                  in: query
+                  description: Tags to filter by
+                  required: false
+                  type: array
+                  items:
+                    type: string
+                  collectionFormat: multi
+              responses:
+                "200":
+                  description: successful operation
+                  schema:
+                    type: array
+                    items:
+                      $ref: "#/definitions/Pet"
+                "400":
+                  description: Invalid tag value
+              security:
+                - petstore_auth:
+                    - "write:pets"
+                    - "read:pets"
+          "/pet/{petId}":
+            get:
+              tags:
+                - pet
+              summary: Find pet by ID
+              description: Returns a single pet
+              operationId: getPetById
+              consumes:
+                - application/x-www-form-urlencoded
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: petId
+                  in: path
+                  description: ID of pet to return
+                  required: true
+                  type: integer
+                  format: int64
+              responses:
+                "200":
+                  description: successful operation
+                  schema:
+                    $ref: "#/definitions/Pet"
+                "400":
+                  description: Invalid ID supplied
+                "404":
+                  description: Pet not found
+              security:
+                - api_key: []
+                - petstore_auth:
+                    - "write:pets"
+                    - "read:pets"
+            post:
+              tags:
+                - pet
+              summary: Updates a pet in the store with form data
+              description: ""
+              operationId: updatePetWithForm
+              consumes:
+                - application/x-www-form-urlencoded
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: petId
+                  in: path
+                  description: ID of pet that needs to be updated
+                  required: true
+                  type: string
+                - name: name
+                  in: formData
+                  description: Updated name of the pet
+                  required: false
+                  type: string
+                - name: status
+                  in: formData
+                  description: Updated status of the pet
+                  required: false
+                  type: string
+              responses:
+                "405":
+                  description: Invalid input
+              security:
+                - petstore_auth:
+                    - "write:pets"
+                    - "read:pets"
+            delete:
+              tags:
+                - pet
+              summary: Deletes a pet
+              description: ""
+              operationId: deletePet
+              consumes:
+                - multipart/form-data
+                - application/x-www-form-urlencoded
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: api_key
+                  in: header
+                  description: ""
+                  required: false
+                  type: string
+                - name: petId
+                  in: path
+                  description: Pet id to delete
+                  required: true
+                  type: integer
+                  format: int64
+              responses:
+                "400":
+                  description: Invalid pet value
+              security:
+                - petstore_auth:
+                    - "write:pets"
+                    - "read:pets"
+          "/pet/{petId}/uploadImage":
+            post:
+              tags:
+                - pet
+              summary: uploads an image
+              x-swagger-router-controller: SampleController
+              description: ""
+              operationId: uploadFile
+              consumes:
+                - multipart/form-data
+              produces:
+                - application/json
+              parameters:
+                - name: petId
+                  in: path
+                  description: ID of pet to update
+                  required: true
+                  type: integer
+                  format: int64
+                - name: additionalMetadata
+                  in: formData
+                  description: Additional data to pass to server
+                  required: false
+                  type: string
+                - name: file
+                  in: formData
+                  description: file to upload
+                  required: false
+                  type: file
+              responses:
+                "200":
+                  description: successful operation
+                  schema:
+                    $ref: "#/definitions/ApiResponse"
+              security:
+                - petstore_auth:
+                    - "write:pets"
+                    - "read:pets"
+          /store/inventory:
+            get:
+              tags:
+                - store
+              summary: Returns pet inventories by status
+              description: Returns a map of status codes to quantities
+              operationId: getInventory
+              produces:
+                - application/json
+              parameters: []
+              responses:
+                "200":
+                  description: successful operation
+                  schema:
+                    type: object
+                    additionalProperties:
+                      type: integer
+                      format: int32
+              security:
+                - api_key: []
+          /store/order:
+            post:
+              tags:
+                - store
+              summary: Place an order for a pet
+              description: ""
+              operationId: placeOrder
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - in: body
+                  name: body
+                  description: order placed for purchasing the pet
+                  required: false
+                  schema:
+                    $ref: "#/definitions/Order"
+              responses:
+                "200":
+                  description: successful operation
+                  schema:
+                    $ref: "#/definitions/Order"
+                "400":
+                  description: Invalid Order
+          "/store/order/{orderId}":
+            get:
+              tags:
+                - store
+              summary: Find purchase order by ID
+              description: "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions"
+              operationId: getOrderById
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: orderId
+                  in: path
+                  description: ID of pet that needs to be fetched
+                  required: true
+                  type: string
+              responses:
+                "200":
+                  description: successful operation
+                  schema:
+                    $ref: "#/definitions/Order"
+                "400":
+                  description: Invalid ID supplied
+                "404":
+                  description: Order not found
+            delete:
+              tags:
+                - store
+              summary: Delete purchase order by ID
+              description: For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+              operationId: deleteOrder
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: orderId
+                  in: path
+                  description: ID of the order that needs to be deleted
+                  required: true
+                  type: string
+              responses:
+                "400":
+                  description: Invalid ID supplied
+                "404":
+                  description: Order not found
+          /user:
+            post:
+              tags:
+                - user
+              summary: Create user
+              description: This can only be done by the logged in user.
+              operationId: createUser
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - in: body
+                  name: body
+                  description: Created user object
+                  required: false
+                  schema:
+                    $ref: "#/definitions/User"
+              responses:
+                default:
+                  description: successful operation
+          /user/createWithArray:
+            post:
+              tags:
+                - user
+              summary: Creates list of users with given input array
+              description: ""
+              operationId: createUsersWithArrayInput
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - in: body
+                  name: body
+                  description: List of user object
+                  required: false
+                  schema:
+                    type: array
+                    items:
+                      $ref: "#/definitions/User"
+              responses:
+                default:
+                  description: successful operation
+          /user/createWithList:
+            post:
+              tags:
+                - user
+              summary: Creates list of users with given input array
+              description: ""
+              operationId: createUsersWithListInput
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - in: body
+                  name: body
+                  description: List of user object
+                  required: false
+                  schema:
+                    type: array
+                    items:
+                      $ref: "#/definitions/User"
+              responses:
+                default:
+                  description: successful operation
+          /user/login:
+            get:
+              tags:
+                - user
+              summary: Logs user into the system
+              description: ""
+              operationId: loginUser
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: username
+                  in: query
+                  description: The user name for login
+                  required: false
+                  type: string
+                - name: password
+                  in: query
+                  description: The password for login in clear text
+                  required: false
+                  type: string
+              responses:
+                "200":
+                  description: successful operation
+                  schema:
+                    type: string
+                  headers:
+                    X-Rate-Limit:
+                      type: integer
+                      format: int32
+                      description: calls per hour allowed by the user
+                    X-Expires-After:
+                      type: string
+                      format: date-time
+                      description: date in UTC when toekn expires
+                "400":
+                  description: Invalid username/password supplied
+              x-amazon-apigateway-integration:
+                uri: 
+                  Fn::GetAtt: [ "SmsNotifierServiceFunction", "Arn" ]
+                httpMethod: POST
+          /user/logout:
+            get:
+              tags:
+                - user
+              summary: Logs out current logged in user session
+              description: ""
+              operationId: logoutUser
+              produces:
+                - application/xml
+                - application/json
+              parameters: []
+              responses:
+                default:
+                  description: successful operation
+              x-amazon-apigateway-integration:
+                uri: 
+                  Fn::Sub: 
+                    - "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:${FunctionName}/invocations"
+                    - {"FunctionName": !Ref EmailNotifierServiceFunction }
+                httpMethod: POST
+          "/user/{username}":
+            get:
+              tags:
+                - user
+              summary: Get user by user name
+              description: ""
+              operationId: getUserByName
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: username
+                  in: path
+                  description: "The name that needs to be fetched. Use user1 for testing. "
+                  required: true
+                  type: string
+              responses:
+                "200":
+                  description: successful operation
+                  schema:
+                    $ref: "#/definitions/User"
+                "400":
+                  description: Invalid username supplied
+                "404":
+                  description: User not found
+            put:
+              tags:
+                - user
+              summary: Updated user
+              description: This can only be done by the logged in user.
+              operationId: updateUser
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: username
+                  in: path
+                  description: name that need to be deleted
+                  required: true
+                  type: string
+                - in: body
+                  name: body
+                  description: Updated user object
+                  required: false
+                  schema:
+                    $ref: "#/definitions/User"
+              responses:
+                "400":
+                  description: Invalid user supplied
+                "404":
+                  description: User not found
+            delete:
+              tags:
+                - user
+              summary: Delete user
+              description: This can only be done by the logged in user.
+              operationId: deleteUser
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: username
+                  in: path
+                  description: The name that needs to be deleted
+                  required: true
+                  type: string
+              responses:
+                "400":
+                  description: Invalid username supplied
+                "404":
+                  description: User not found
+        securityDefinitions:
+          petstore_auth:
+            type: oauth2
+            authorizationUrl: "http://petstore.swagger.io/api/oauth/dialog"
+            flow: implicit
+            scopes:
+              "write:pets": modify pets in your account
+              "read:pets": read your pets
+          api_key:
+            type: apiKey
+            name: api_key
+            in: header
+        definitions:
+          Order:
+            properties:
+              id:
+                type: integer
+                format: int64
+              petId:
+                type: integer
+                format: int64
+              quantity:
+                type: integer
+                format: int32
+              shipDate:
+                type: string
+                format: date-time
+              status:
+                type: string
+                description: Order Status
+                enum:
+                  - placed
+                  - approved
+                  - delivered
+              complete:
+                type: boolean
+            xml:
+              name: Order
+          Category:
+            properties:
+              id:
+                type: integer
+                format: int64
+              name:
+                type: string
+            xml:
+              name: Category
+          User:
+            properties:
+              id:
+                type: integer
+                format: int64
+              username:
+                type: string
+              firstName:
+                type: string
+              lastName:
+                type: string
+              email:
+                type: string
+              password:
+                type: string
+              phone:
+                type: string
+              userStatus:
+                type: integer
+                format: int32
+                description: User Status
+            xml:
+              name: User
+          Tag:
+            properties:
+              id:
+                type: integer
+                format: int64
+              name:
+                type: string
+            xml:
+              name: Tag
+          Pet:
+            required:
+              - name
+              - photoUrls
+            properties:
+              id:
+                type: integer
+                format: int64
+              category:
+                $ref: "#/definitions/Category"
+              name:
+                type: string
+                example: doggie
+              photoUrls:
+                type: array
+                xml:
+                  name: photoUrl
+                  wrapped: true
+                items:
+                  type: string
+              tags:
+                type: array
+                xml:
+                  name: tag
+                  wrapped: true
+                items:
+                  $ref: "#/definitions/Tag"
+              status:
+                type: string
+                description: pet status in the store
+                enum:
+                  - available
+                  - pending
+                  - sold
+            xml:
+              name: Pet
+          ApiResponse:
+            properties:
+              code:
+                type: integer
+                format: int32
+              type:
+                type: string
+              message:
+                type: string
+            xml:
+              name: "##default"
+        externalDocs:
+          description: Find out more about Swagger
+          url: "http://swagger.io"
+  StepFunctionsAPI:
+    Type: AWS::Serverless::Api
+    Properties:
+        StageName: dev
+        DefinitionBody:
+            swagger: "2.0"
+            basePath: /prod
+            info:
+              title: AwsSamExample
+            schemes:
+            - https
+            paths:
+              /:
+                x-amazon-apigateway-any-method:
+                  security:
+                  - test-authorizer: []
+                  produces:
+                  - application/json
+                  responses:
+                    200:
+                      description: 200 response
+                      schema:
+                        $ref: "#/definitions/Empty"
+                  x-amazon-apigateway-integration:
+                    responses:
+                      default:
+                        statusCode: 200
+                    # NOTE: Replace <<region>> and <<account>> fields
+                    uri: arn:aws:apigateway:<<region>>:lambda:path/2015-03-31/functions/arn:aws:lambda:<<region>>:<<accountId>>:function:${stageVariables.LambdaFunctionName}/invocations
+
+                    passthroughBehavior: when_no_match
+                    httpMethod: POST
+                    type: aws_proxy
+                options:
+                  consumes:
+                  - application/json
+                  produces:
+                  - application/json
+                  responses:
+                    200:
+                      description: 200 response
+                      schema:
+                        $ref: "#/definitions/Empty"
+                      headers:
+                        Access-Control-Allow-Origin:
+                          type: string
+                        Access-Control-Allow-Methods:
+                          type: string
+                        Access-Control-Allow-Headers:
+                          type: string
+                  x-amazon-apigateway-integration:
+                    type: aws
+                    uri: arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:012345678901:function:HelloWorld/invocations
+                    httpMethod: POST
+                    credentials: arn:aws:iam::012345678901:role/apigateway-invoke-lambda-exec-role
+                    requestTemplates:
+                      application/json: '#set ($root=$input.path(''$'')) { "stage": "$root.name", "user-id":
+                        "$root.key" }'
+                      application/xml: "#set ($root=$input.path('$')) <stage>$root.name</stage> "
+                    requestParameters:
+                      integration.request.path.stage: method.request.querystring.version
+                      integration.request.querystring.provider: method.request.querystring.vendor
+                    cacheNamespace: cache namespace
+                    cacheKeyParameters: []
+                    responses:
+                      '302':
+                        statusCode: '302'
+                        responseParameters:
+                          method.response.header.Location: integration.response.body.redirect.url
+                      2\d{2}:
+                        statusCode: '200'
+                        responseParameters:
+                          method.response.header.requestId: integration.response.header.cid
+                        responseTemplates:
+                          application/json: '#set ($root=$input.path(''$'')) { "stage": "$root.name",
+                            "user-id": "$root.key" }'
+                          application/xml: "#set ($root=$input.path('$')) <stage>$root.name</stage> "
+                      default:
+                        statusCode: '400'
+                        responseParameters:
+                          method.response.header.test-method-response-header: "'static value'"
+                      x-amazon-apigateway-integration:
+                        uri: !Sub 
+                          - "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:${EmailNotifierServiceFunction}${Test}/invocations"
+                          - { "Test": "ABCD", "OtherTest": !Ref something }
+                        httpMethod: POST
+  StepFunctionsServiceRole:
+      Type: "AWS::IAM::Role"
+      Properties:
+          Path: "/"
+          ManagedPolicyArns:
+            - "arn:aws:iam::aws:policy/AWSStepFunctionsFullAccess"
+          AssumeRolePolicyDocument:
+            Version: "2012-10-17"
+            Statement:
+              -
+                Sid: "AllowStepFunctionsServiceToAssumeRole"
+                Effect: "Allow"
+                Action: 
+                  - "sts:AssumeRole"
+                Principal:
+                  Service:
+                    - !Sub "states.${AWS::Region}.amazonaws.com"
+          Policies:
+            -
+              PolicyName: "CallLambdaFunctions"
+              PolicyDocument:
+                Version: '2012-10-17'
+                Statement:
+                  -
+                    Effect: "Allow"
+                    Action:
+                      - "lambda:InvokeFunction"
+                    Resource: 
+                      - !Sub "${SlackNotifierServiceFunction.Arn}"
+                      - !Sub "${EmailNotifierServiceFunction.Arn}"
+                      - !Sub "${SmsNotifierServiceFunction.Arn}"
+
+  StepFunctionStateMachine:
+    Type: "AWS::StepFunctions::StateMachine"
+    Properties:
+      DefinitionString: !Sub |
+        {
+          "Comment": "Demo for API GW->SFN",
+          "StartAt": "NotifierState",
+          "States": {
+            "NotifierState": {
+              "Type" : "Choice",
+              "Choices": [
+                {
+                  "Variable": "$.notifier",
+                  "StringEquals": "Email",
+                  "Next": "EmailNotifier"
+                },
+                {
+                  "Variable": "$.notifier",
+                  "StringEquals": "Sms",
+                  "Next": "SmsNotifier"
+                },
+                {
+                  "Variable": "$.notifier",
+                  "StringEquals": "Slack",
+                  "Next": "SlackNotifier"
+                },
+                {
+                  "Variable": "$.notify",
+                  "StringEquals": "Twilio",
+                  "Next": "NotImplementedYet"
+                }
+              ],
+              "Default": "IgnoreNotification"
+            },
+            "IgnoreNotification": {
+              "Type": "Pass",
+              "Next": "SayHi"
+            },
+            "NotImplementedYet": {
+              "Type": "Fail",
+              "Cause": "Feature not implemented yet!"
+            },
+            "EmailNotifier": {
+              "Type": "Task",
+              "Resource": "${EmailNotifierServiceFunction.Arn}",
+              "Next": "SayHi"
+            },
+            "SlackNotifier": {
+              "Type": "Task",
+              "Resource": "${SlackNotifierServiceFunction.Arn}",
+              "Next": "SayHi"
+            },
+            "SmsNotifier": {
+              "Type": "Task",
+              "Resource": "${SmsNotifierServiceFunction.Arn}",
+              "Next": "SayHi"
+            },
+            "SayHi": {
+              "Type": "Pass",
+              "Result": "Hi!",
+              "End": true
+            }
+          }
+        }
+      RoleArn: !GetAtt StepFunctionsServiceRole.Arn
+  NotifierSNSTopic:
+    Type: AWS::SNS::Topic
+    Properties:
+      Subscription:
+      - Endpoint: !Ref NotificationEmail
+        Protocol: email
+Outputs:
+  NotifyUrl:
+    Description: Notify Workflow URL 
+    Value: !Sub "https://${StepFunctionsAPI}.execute-api.${AWS::Region}.amazonaws.com/dev/notify"
+
+  StepFunctionsStateMachine:
+    Description: Step Functions State Machine ARN
+    Value: !Ref StepFunctionStateMachine
\ No newline at end of file
diff --git a/goformation/test/yaml/aws-serverless-api.yaml b/goformation/test/yaml/aws-serverless-api.yaml
new file mode 100644
index 0000000000..9574294e7a
--- /dev/null
+++ b/goformation/test/yaml/aws-serverless-api.yaml
@@ -0,0 +1,75 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: A template for testing AWS::Serverless::Api resources
+Resources:
+
+  ServerlessApiWithDefinitionUriAsString:
+    Type: AWS::Serverless::Api
+    Properties:
+      Name: test-name
+      StageName: test-stage-name
+      DefinitionUri: test-definition-uri
+      CacheClusterEnabled: true
+      CacheClusterSize: test-cache-cluster-size
+      Variables:
+        NAME: VALUE
+
+  ServerlessApiWithDefinitionUriAsS3Location:
+    Type: AWS::Serverless::Api
+    Properties:
+      Name: test-name
+      StageName: test-stage-name
+      DefinitionUri:
+        Bucket: test-bucket
+        Key: test-key
+        Version: 1
+      CacheClusterEnabled: true
+      CacheClusterSize: test-cache-cluster-size
+      Variables:
+        NAME: VALUE
+
+  ServerlessApiWithDefinitionBodyAsJSON:
+    Type: AWS::Serverless::Api
+    Properties:
+      Name: test-name
+      StageName: test-stage-name
+      DefinitionBody: |
+        {
+          "DefinitionKey": "test-definition-value"
+        }
+      CacheClusterEnabled: true
+      CacheClusterSize: test-cache-cluster-size
+      Variables:
+        NAME: VALUE
+
+  ServerlessApiWithDefinitionBodyAsYAML:
+    Type: AWS::Serverless::Api
+    Properties:
+      Name: test-name
+      StageName: test-stage-name
+      DefinitionBody:
+        DefinitionKey: test-definition-value
+      CacheClusterEnabled: true
+      CacheClusterSize: test-cache-cluster-size
+      Variables:
+        NAME: VALUE
+
+  ServerlessApiWithMethodSettingsAsYAML:
+    Type: AWS::Serverless::Api
+    Properties:
+      Name: test-name
+      StageName: test-stage-name
+      MethodSettings:
+      - LoggingLevel: ERROR
+        MetricsEnabled: true
+      CacheClusterEnabled: true
+      CacheClusterSize: test-cache-cluster-size
+      Variables:
+        NAME: VALUE
+
+  ServerlessApiWithAccessLogSettingAsYAML:
+    Type: AWS::Serverless::Api
+    Properties:
+      AccessLogSetting:
+        DestinationArn: "arn:test"
+        Format: "{customKey: $context.Key}"
diff --git a/goformation/test/yaml/aws-serverless-function-2016-10-31.yaml b/goformation/test/yaml/aws-serverless-function-2016-10-31.yaml
new file mode 100644
index 0000000000..61fc3ed45e
--- /dev/null
+++ b/goformation/test/yaml/aws-serverless-function-2016-10-31.yaml
@@ -0,0 +1,40 @@
+Transform: AWS::Serverless-2016-10-31
+Resources:
+  Function20161031:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: file.method
+      Runtime: nodejs
+      CodeUri: s3://bucket/path/key
+      FunctionName: functionname
+      Description: description
+      MemorySize: 128
+      Timeout: 30
+      Role: aws::arn::123456789012::some/role
+      Policies:
+      - DynamoDBCrudPolicy:
+          TableName: table_arn
+      Environment:
+        Variables:
+          NAME: VALUE
+      VpcConfig:
+        SecurityGroupIds:
+          - String
+        SubnetIds:
+          - String
+      Events:
+        TestApi:
+          Type: Api
+          Properties:
+            Path: /testing
+            Method: any
+        TestS3:
+          Type: S3
+          Properties:
+            Bucket: my-photo-bucket # bucket must be created in the same template
+            Events: s3:ObjectCreated:*
+            Filter:
+              S3Key:
+                Rules:
+                  - Name: prefix|suffix
+                    Value: my-prefix|my-suffix
\ No newline at end of file
diff --git a/goformation/test/yaml/aws-serverless-function-api-event.yaml b/goformation/test/yaml/aws-serverless-function-api-event.yaml
new file mode 100644
index 0000000000..f398c11c93
--- /dev/null
+++ b/goformation/test/yaml/aws-serverless-function-api-event.yaml
@@ -0,0 +1,53 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: Simple CRUD webservice. State is stored in a SimpleTable (DynamoDB) resource.
+Resources:
+  GetFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: index.get
+      Runtime: nodejs
+      CodeUri: s3://<bucket>/api_backend.zip
+      Policies: AmazonDynamoDBReadOnlyAccess
+      Environment:
+        Variables:
+          TABLE_NAME: !Ref Table1
+      Events:
+        GetResource:
+          Type: Api
+          Properties:
+            Path: /resource/{resourceId}
+            Method: get
+  PutFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: index.put
+      Runtime: nodejs10.x
+      CodeUri: s3://<bucket>/api_backend.zip
+      Policies: AmazonDynamoDBFullAccess
+      Environment:
+        Variables:
+          TABLE_NAME: !Ref Table2
+      Events:
+        PutResource:
+          Type: Api
+          Properties:
+            Path: /resource/{resourceId}
+            Method: put
+
+  DeleteFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: index.delete
+      Runtime: nodejs10.x
+      CodeUri: s3://<bucket>/api_backend.zip
+      Policies: AmazonDynamoDBFullAccess
+      Environment:
+        Variables:
+          TABLE_NAME: !Ref Table3
+      Events:
+        DeleteResource:
+          Type: Api
+          Properties:
+            Path: /resource/{resourceId}
+            Method: delete
\ No newline at end of file
diff --git a/goformation/test/yaml/aws-serverless-function-env-vars.yaml b/goformation/test/yaml/aws-serverless-function-env-vars.yaml
new file mode 100644
index 0000000000..b8f1a05696
--- /dev/null
+++ b/goformation/test/yaml/aws-serverless-function-env-vars.yaml
@@ -0,0 +1,104 @@
+AWSTemplateFormatVersion : '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+
+Description: |
+  Use this section to describe your Serverless project
+
+Parameters:
+  # Optional: Use parameters to pass in runtime configuration (such as a database connection string) 
+  # See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/parameters-section-structure.html
+
+  ExampleParameter:
+    Description: This is just an example parameter, used to show how to pass in environment variables to Lambda
+    Type: String
+    Default: SomeValue
+
+Resources:
+  # Place your project resources here (AWS Lambda functions, API Gateway) etc
+
+  EnvironmentVariableTestFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Runtime: nodejs10.x
+      Handler: filename.method
+      Environment:
+        Variables:
+          STRING_ENV_VAR: test123
+      Events:
+        GetRequest:
+          Type: Api
+          Properties:
+            Path: /
+            Method: get
+
+  NoValueEnvironmentVariableTestFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Runtime: nodejs10.x
+      Handler: filename.method
+      Environment:
+        Variables:
+          EMPTY_ENV_VAR: ""
+      Events:
+        GetRequest:
+          Type: Api
+          Properties:
+            Path: /
+            Method: get
+
+  SubEnvironmentVariableTestFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      FunctionName: sub
+      Runtime: nodejs10.x
+      Handler: filename.method
+      Environment:
+        Variables:
+          SUB_ENV_VAR: !Sub Hello
+      Events:
+        GetRequest:
+          Type: Api
+          Properties:
+            Path: /
+            Method: get
+
+  NonExistSubEnvironmentVariableTestFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      FunctionName: sub
+      Runtime: nodejs10.x
+      Handler: filename.method
+      Environment:
+        Variables:
+          SUB_REF_ENV_VAR: !Sub Hello-${ThisReferenceDoesntExist}
+      Events:
+        GetRequest:
+          Type: Api
+          Properties:
+            Path: /
+            Method: get
+
+  IntrinsicEnvironmentVariableTestFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Runtime: nodejs10.x
+      Handler: filename.method
+      Environment:
+        Variables:
+          REF_ENV_VAR: !Ref ExampleParameter
+      Events:
+        GetRequest:
+          Type: Api
+          Properties:
+            Path: /
+            Method: get
+
+Outputs:
+  # Optional: The optional Outputs section declares output values that you can import into other stacks
+  # (to create cross-stack references), return in response (to describe stack calls), or view on the
+  # AWS CloudFormation console.
+  # See: http://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/outputs-section-structure.html
+
+  ExampleOutput:
+    Description: This is an example output, used to show how to return the ARN of the created Lambda function
+    Value: !Ref ExampleFunction
diff --git a/goformation/test/yaml/aws-serverless-function-string-or-s3-location.yaml b/goformation/test/yaml/aws-serverless-function-string-or-s3-location.yaml
new file mode 100644
index 0000000000..32f0a089be
--- /dev/null
+++ b/goformation/test/yaml/aws-serverless-function-string-or-s3-location.yaml
@@ -0,0 +1,25 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: SAM template for testing CodeUri property parsing
+Resources:
+
+  CodeUriWithS3LocationSpecifiedAsString:
+    Type: AWS::Serverless::Function
+    Properties:
+      Runtime: nodejs
+      CodeUri: s3://testbucket/testkey.zip
+
+  CodeUriWithS3LocationSpecifiedAsObject:
+    Type: AWS::Serverless::Function
+    Properties:
+      Runtime: nodejs
+      CodeUri: 
+        Bucket: testbucket
+        Key: testkey.zip
+        Version: 5.5
+
+  CodeUriWithString:
+    Type: AWS::Serverless::Function
+    Properties:
+      Runtime: nodejs
+      CodeUri: ./testfolder
diff --git a/goformation/test/yaml/aws-serverless-simpletable.yaml b/goformation/test/yaml/aws-serverless-simpletable.yaml
new file mode 100644
index 0000000000..47a64b1a00
--- /dev/null
+++ b/goformation/test/yaml/aws-serverless-simpletable.yaml
@@ -0,0 +1,16 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: A template for testing AWS::Serverless::SimpleTable resources
+Resources:
+  TestSimpleTable:
+    Type: AWS::Serverless::SimpleTable
+    DeletionPolicy: Retain
+    Properties:
+      PrimaryKey:
+        Name: test-primary-key-name
+        Type: test-primary-key-type
+      ProvisionedThroughput:
+        ReadCapacityUnits: 100
+        WriteCapacityUnits: 200
+  TestSimpleTableNoProperties:
+    Type: AWS::Serverless::SimpleTable
\ No newline at end of file
diff --git a/goformation/test/yaml/codestar/java.yml b/goformation/test/yaml/codestar/java.yml
new file mode 100644
index 0000000000..98d1966c8e
--- /dev/null
+++ b/goformation/test/yaml/codestar/java.yml
@@ -0,0 +1,41 @@
+AWSTemplateFormatVersion: 2010-09-09
+Transform:
+- AWS::Serverless-2016-10-31
+- AWS::CodeStar
+
+Parameters:
+  ProjectId:
+    Type: String
+    Description: AWS CodeStar projectID used to associate new resources to team members
+
+Resources:
+  GetHelloWorld:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: com.aws.codestar.projecttemplates.handler.HelloWorldHandler
+      CodeUri: target/
+      Runtime: java8
+      Role:
+        Fn::ImportValue:
+          !Join ['-', [!Ref 'ProjectId', !Ref 'AWS::Region', 'LambdaTrustRole']]
+      Events:
+        GetEvent:
+          Type: Api
+          Properties:
+            Path: /
+            Method: get
+
+  PostHelloWorld:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: com.aws.codestar.projecttemplates.handler.HelloWorldHandler
+      Runtime: java8
+      Role:
+        Fn::ImportValue:
+          !Join ['-', [!Ref 'ProjectId', !Ref 'AWS::Region', 'LambdaTrustRole']]
+      Events:
+        PostEvent:
+          Type: Api
+          Properties:
+            Path: /
+            Method: post
diff --git a/goformation/test/yaml/codestar/nodejs.yml b/goformation/test/yaml/codestar/nodejs.yml
new file mode 100644
index 0000000000..4dd83f3561
--- /dev/null
+++ b/goformation/test/yaml/codestar/nodejs.yml
@@ -0,0 +1,25 @@
+AWSTemplateFormatVersion: 2010-09-09
+Transform:
+- AWS::Serverless-2016-10-31
+- AWS::CodeStar
+
+Parameters:
+  ProjectId:
+    Type: String
+    Description: AWS CodeStar projectID used to associate new resources to team members
+
+Resources:
+  GetHelloWorld:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: index.get
+      Runtime: nodejs10.x
+      Role:
+        Fn::ImportValue:
+          !Join ['-', [!Ref 'ProjectId', !Ref 'AWS::Region', 'LambdaTrustRole']]
+      Events:
+        GetEvent:
+          Type: Api
+          Properties:
+            Path: /
+            Method: get
\ No newline at end of file
diff --git a/goformation/test/yaml/codestar/python.yml b/goformation/test/yaml/codestar/python.yml
new file mode 100644
index 0000000000..97ae2a910d
--- /dev/null
+++ b/goformation/test/yaml/codestar/python.yml
@@ -0,0 +1,30 @@
+AWSTemplateFormatVersion: 2010-09-09
+Transform:
+- AWS::Serverless-2016-10-31
+- AWS::CodeStar
+
+Parameters:
+  ProjectId:
+    Type: String
+    Description: CodeStar projectId used to associate new resources to team members
+
+Resources:
+  HelloWorld:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: index.handler
+      Runtime: python2.7
+      Role:
+        Fn::ImportValue:
+          !Join ['-', [!Ref 'ProjectId', !Ref 'AWS::Region', 'LambdaTrustRole']]
+      Events:
+        GetEvent:
+          Type: Api
+          Properties:
+            Path: /
+            Method: get
+        PostEvent:
+          Type: Api
+          Properties:
+            Path: /
+            Method: post
diff --git a/goformation/test/yaml/custom-resource.yaml b/goformation/test/yaml/custom-resource.yaml
new file mode 100644
index 0000000000..551a6b2f0a
--- /dev/null
+++ b/goformation/test/yaml/custom-resource.yaml
@@ -0,0 +1,8 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Description: "Custom Resource Test"
+Resources:
+  MyCustomResource:
+    Type: Custom::MyResource
+    Properties:
+      ServiceToken: lambda.arn
+      CustomProperty: property_value
\ No newline at end of file
diff --git a/goformation/test/yaml/output_section.yaml b/goformation/test/yaml/output_section.yaml
new file mode 100644
index 0000000000..91cb5cf105
--- /dev/null
+++ b/goformation/test/yaml/output_section.yaml
@@ -0,0 +1,14 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: Simple CRUD webservice. State is stored in a SimpleTable (DynamoDB) resource.
+Resources:
+  MyApi:
+    Type: AWS::Serverless::Api
+    Properties:
+      DefinitionUri: s3://bucket/key
+      StageName: prod
+
+Outputs:
+  ApiUrl:
+    Description: URL of API endpoint
+    Value: !Join ['', ['https://', !Ref "MyApi", '.execute-api.', !Ref 'AWS::Region', '.amazonaws.com/Prod']]
\ No newline at end of file
diff --git a/goformation/test/yaml/sam-official-samples/alexa_skill/index.js b/goformation/test/yaml/sam-official-samples/alexa_skill/index.js
new file mode 100644
index 0000000000..2b0de8b136
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/alexa_skill/index.js
@@ -0,0 +1,33 @@
+'use strict';
+console.log('Loading hello world function');
+
+exports.handler = function(event, context) {
+    var name = "World";
+    var responseCode = 200;
+    console.log("request: " + JSON.stringify(event));
+    if (event.queryStringParameters !== null && event.queryStringParameters !== undefined) {
+        if (event.queryStringParameters.name !== undefined && event.queryStringParameters.name !== null && event.queryStringParameters.name !== "") {
+            console.log("Received name: " + event.queryStringParameters.name);
+            name = event.queryStringParameters.name;
+        }
+
+        if (event.queryStringParameters.httpStatus !== undefined && event.queryStringParameters.httpStatus !== null && event.queryStringParameters.httpStatus !== "") {
+            console.log("Received http status: " + event.queryStringParameters.httpStatus);
+            responseCode = event.queryStringParameters.httpStatus;
+        }
+    }
+
+    var responseBody = {
+        message: "Hello " + name + "!",
+        input: event
+    };
+    var response = {
+        statusCode: responseCode,
+        headers: {
+            "x-custom-header" : "my custom header value"
+        },
+        body: JSON.stringify(responseBody)
+    };
+    console.log("response: " + JSON.stringify(response))
+    context.succeed(response);
+};
diff --git a/goformation/test/yaml/sam-official-samples/alexa_skill/template.yaml b/goformation/test/yaml/sam-official-samples/alexa_skill/template.yaml
new file mode 100644
index 0000000000..f0eb3b2fed
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/alexa_skill/template.yaml
@@ -0,0 +1,15 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: Alexa Skill https://developer.amazon.com/alexa-skills-kit
+Resources:
+  AlexaSkillFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      CodeUri: s3://<bucket>/alexa_skill.zip
+      Handler: index.handler
+      Runtime: nodejs10.x
+      Events:
+        AlexaSkillEvent:
+          Type: AlexaSkill
+          Properties:
+            Whatever: whatever
diff --git a/goformation/test/yaml/sam-official-samples/api-swagger-intrinsic.yaml b/goformation/test/yaml/sam-official-samples/api-swagger-intrinsic.yaml
new file mode 100644
index 0000000000..429cb977e8
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/api-swagger-intrinsic.yaml
@@ -0,0 +1,1038 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: Swagger demo for Integration Requests
+
+Parameters:
+
+  NotificationEmail:
+    Type: String
+    Description: Email address to subscribe to SNS topic and receive notifications from Notifier Workflow
+
+  SlackToken:
+    Type: String
+    Description: Legacy Slack Token (xoxp-ywz) to send messages on channel
+    Default: None
+
+Resources:
+
+
+  SnsNotifierServiceRole:
+    Type: "AWS::IAM::Role"
+    Properties:
+      Path: "/"
+      ManagedPolicyArns:
+          - "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+      AssumeRolePolicyDocument:
+        Version: "2012-10-17"
+        Statement:
+          -
+            Sid: "AllowLambdaServiceToAssumeRole"
+            Effect: "Allow"
+            Action: 
+              - "sts:AssumeRole"
+            Principal:
+              Service:
+                - "lambda.amazonaws.com"
+      Policies:
+        -
+          PolicyName: "PublishSnsTopic"
+          PolicyDocument:
+            Version: '2012-10-17'
+            Statement:
+              -
+                Effect: "Allow"
+                Action:
+                  - "sns:Publish"
+                Resource: 
+                  - !Ref NotifierSNSTopic
+                  - "*" # can't restrict on SMS number yet, so *
+
+
+  EmailNotifierServiceFunction:
+    Type: 'AWS::Serverless::Function'
+    Properties:
+      Handler: email_sns.lambda_handler
+      Runtime: python2.7
+      CodeUri: ../code/email/
+      Role: !GetAtt SnsNotifierServiceRole.Arn
+      Environment:
+        Variables:
+          NOTIFIER_TOPIC: !Ref NotifierSNSTopic
+
+
+  SmsNotifierServiceFunction:
+    Type: 'AWS::Serverless::Function'
+    Properties:
+      Handler: sms_sns.lambda_handler
+      Runtime: python2.7
+      CodeUri: ../code/sms/
+      Role: !GetAtt SnsNotifierServiceRole.Arn
+      Environment:
+        Variables:
+          NOTIFIER_TOPIC: !Ref NotifierSNSTopic
+
+  # No need for extra permissions other than Basic Execution
+  # SAM takes care of creating basic IAM Role if none is provided
+  SlackNotifierServiceFunction:
+    Type: 'AWS::Serverless::Function'
+    Properties:
+      Handler: slack.lambda_handler
+      Runtime: python2.7
+      CodeUri: ../code/slack.zip    # Slack contains 3rd party libraries
+      Environment:
+        Variables:
+          SLACK_TOKEN: !Ref SlackToken
+  # IAM Role API Gateway will assume in order to call StepFunctions StartExecution API
+  ApiGatewayStepFunctionsRole:
+    Type: "AWS::IAM::Role"
+    Properties:
+        Path: "/"
+        AssumeRolePolicyDocument:
+          Version: "2012-10-17"
+          Statement:
+            -
+              Sid: "AllowApiGatewayServiceToAssumeRole"
+              Effect: "Allow"
+              Action: 
+                - "sts:AssumeRole"
+              Principal:
+                Service:
+                  - "apigateway.amazonaws.com"
+        Policies:
+          -
+            PolicyName: "CallStepFunctions"
+            PolicyDocument:
+              Version: '2012-10-17'
+              Statement:
+                -
+                  Effect: "Allow"
+                  Action:
+                    - "states:StartExecution"
+                  Resource: 
+                    - !Ref StepFunctionStateMachine
+
+  AnotherRandomAPI:
+    Type: AWS::Serverless::Api
+    Properties:
+      StageName: prod
+      DefinitionBody:
+        swagger: "2.0"
+        info:
+          description: "This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters"
+          version: 1.0.0
+          title: Swagger Petstore YAML
+          termsOfService: "http://swagger.io/terms/"
+          contact:
+            email: "apiteam@swagger.io"
+          license:
+            name: Apache 2.0
+            url: "http://www.apache.org/licenses/LICENSE-2.0.html"
+        basePath: /v2
+        tags:
+          - name: pet
+            description: Everything about your Pets
+            externalDocs:
+              description: Find out more
+              url: "http://swagger.io"
+          - name: store
+            description: Operations about user
+          - name: user
+            description: Access to Petstore orders
+            externalDocs:
+              description: Find out more about our store
+              url: "http://swagger.io"
+        schemes:
+          - http
+        paths:
+          /pet:
+            post:
+              tags:
+                - pet
+              summary: Add a new pet to the store
+              x-swagger-router-controller: SampleController
+              description: ""
+              operationId: addPet
+              consumes:
+                - application/json
+                - application/xml
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - in: body
+                  name: body
+                  description: Pet object that needs to be added to the store
+                  required: false
+                  schema:
+                    $ref: "#/definitions/Pet"
+              responses:
+                "405":
+                  description: Invalid input
+              security:
+                - petstore_auth:
+                    - "write:pets"
+                    - "read:pets"
+            put:
+              tags:
+                - pet
+              summary: Update an existing pet
+              description: ""
+              operationId: updatePet
+              consumes:
+                - application/json
+                - application/xml
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - in: body
+                  name: body
+                  description: Pet object that needs to be added to the store
+                  required: false
+                  schema:
+                    $ref: "#/definitions/Pet"
+              responses:
+                "400":
+                  description: Invalid ID supplied
+                "404":
+                  description: Pet not found
+                "405":
+                  description: Validation exception
+              security:
+                - petstore_auth:
+                    - "write:pets"
+                    - "read:pets"
+          /pet/findByStatus:
+            get:
+              tags:
+                - pet
+              summary: Finds Pets by status
+              description: Multiple status values can be provided with comma seperated strings
+              operationId: findPetsByStatus
+              consumes:
+                - application/xml
+                - application/json
+                - multipart/form-data
+                - application/x-www-form-urlencoded
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: status
+                  in: query
+                  description: Status values that need to be considered for filter
+                  required: false
+                  type: array
+                  items:
+                    type: string
+                  collectionFormat: multi
+                  default: available
+                  enum:
+                    - available
+                    - pending
+                    - sold
+                - name: testlong
+                  in: query
+                  description: Status values that need to be considered for filter
+                  required: false
+                  type: array
+                  items:
+                    type: long
+                  collectionFormat: multi
+                  default: available
+                  enum:
+                    - 1234567890123456
+                    - 345
+                    - 678
+              responses:
+                "200":
+                  description: successful operation
+                  schema:
+                    type: array
+                    items:
+                      $ref: "#/definitions/Pet"
+                "400":
+                  description: Invalid status value
+              security:
+                - petstore_auth:
+                    - "write:pets"
+                    - "read:pets"
+          /pet/findByTags:
+            get:
+              tags:
+                - pet
+              summary: Finds Pets by tags
+              description: "Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing."
+              operationId: findPetsByTags
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: tags
+                  in: query
+                  description: Tags to filter by
+                  required: false
+                  type: array
+                  items:
+                    type: string
+                  collectionFormat: multi
+              responses:
+                "200":
+                  description: successful operation
+                  schema:
+                    type: array
+                    items:
+                      $ref: "#/definitions/Pet"
+                "400":
+                  description: Invalid tag value
+              security:
+                - petstore_auth:
+                    - "write:pets"
+                    - "read:pets"
+          "/pet/{petId}":
+            get:
+              tags:
+                - pet
+              summary: Find pet by ID
+              description: Returns a single pet
+              operationId: getPetById
+              consumes:
+                - application/x-www-form-urlencoded
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: petId
+                  in: path
+                  description: ID of pet to return
+                  required: true
+                  type: integer
+                  format: int64
+              responses:
+                "200":
+                  description: successful operation
+                  schema:
+                    $ref: "#/definitions/Pet"
+                "400":
+                  description: Invalid ID supplied
+                "404":
+                  description: Pet not found
+              security:
+                - api_key: []
+                - petstore_auth:
+                    - "write:pets"
+                    - "read:pets"
+            post:
+              tags:
+                - pet
+              summary: Updates a pet in the store with form data
+              description: ""
+              operationId: updatePetWithForm
+              consumes:
+                - application/x-www-form-urlencoded
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: petId
+                  in: path
+                  description: ID of pet that needs to be updated
+                  required: true
+                  type: string
+                - name: name
+                  in: formData
+                  description: Updated name of the pet
+                  required: false
+                  type: string
+                - name: status
+                  in: formData
+                  description: Updated status of the pet
+                  required: false
+                  type: string
+              responses:
+                "405":
+                  description: Invalid input
+              security:
+                - petstore_auth:
+                    - "write:pets"
+                    - "read:pets"
+            delete:
+              tags:
+                - pet
+              summary: Deletes a pet
+              description: ""
+              operationId: deletePet
+              consumes:
+                - multipart/form-data
+                - application/x-www-form-urlencoded
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: api_key
+                  in: header
+                  description: ""
+                  required: false
+                  type: string
+                - name: petId
+                  in: path
+                  description: Pet id to delete
+                  required: true
+                  type: integer
+                  format: int64
+              responses:
+                "400":
+                  description: Invalid pet value
+              security:
+                - petstore_auth:
+                    - "write:pets"
+                    - "read:pets"
+          "/pet/{petId}/uploadImage":
+            post:
+              tags:
+                - pet
+              summary: uploads an image
+              x-swagger-router-controller: SampleController
+              description: ""
+              operationId: uploadFile
+              consumes:
+                - multipart/form-data
+              produces:
+                - application/json
+              parameters:
+                - name: petId
+                  in: path
+                  description: ID of pet to update
+                  required: true
+                  type: integer
+                  format: int64
+                - name: additionalMetadata
+                  in: formData
+                  description: Additional data to pass to server
+                  required: false
+                  type: string
+                - name: file
+                  in: formData
+                  description: file to upload
+                  required: false
+                  type: file
+              responses:
+                "200":
+                  description: successful operation
+                  schema:
+                    $ref: "#/definitions/ApiResponse"
+              security:
+                - petstore_auth:
+                    - "write:pets"
+                    - "read:pets"
+          /store/inventory:
+            get:
+              tags:
+                - store
+              summary: Returns pet inventories by status
+              description: Returns a map of status codes to quantities
+              operationId: getInventory
+              produces:
+                - application/json
+              parameters: []
+              responses:
+                "200":
+                  description: successful operation
+                  schema:
+                    type: object
+                    additionalProperties:
+                      type: integer
+                      format: int32
+              security:
+                - api_key: []
+          /store/order:
+            post:
+              tags:
+                - store
+              summary: Place an order for a pet
+              description: ""
+              operationId: placeOrder
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - in: body
+                  name: body
+                  description: order placed for purchasing the pet
+                  required: false
+                  schema:
+                    $ref: "#/definitions/Order"
+              responses:
+                "200":
+                  description: successful operation
+                  schema:
+                    $ref: "#/definitions/Order"
+                "400":
+                  description: Invalid Order
+          "/store/order/{orderId}":
+            get:
+              tags:
+                - store
+              summary: Find purchase order by ID
+              description: "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions"
+              operationId: getOrderById
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: orderId
+                  in: path
+                  description: ID of pet that needs to be fetched
+                  required: true
+                  type: string
+              responses:
+                "200":
+                  description: successful operation
+                  schema:
+                    $ref: "#/definitions/Order"
+                "400":
+                  description: Invalid ID supplied
+                "404":
+                  description: Order not found
+            delete:
+              tags:
+                - store
+              summary: Delete purchase order by ID
+              description: For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+              operationId: deleteOrder
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: orderId
+                  in: path
+                  description: ID of the order that needs to be deleted
+                  required: true
+                  type: string
+              responses:
+                "400":
+                  description: Invalid ID supplied
+                "404":
+                  description: Order not found
+          /user:
+            post:
+              tags:
+                - user
+              summary: Create user
+              description: This can only be done by the logged in user.
+              operationId: createUser
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - in: body
+                  name: body
+                  description: Created user object
+                  required: false
+                  schema:
+                    $ref: "#/definitions/User"
+              responses:
+                default:
+                  description: successful operation
+          /user/createWithArray:
+            post:
+              tags:
+                - user
+              summary: Creates list of users with given input array
+              description: ""
+              operationId: createUsersWithArrayInput
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - in: body
+                  name: body
+                  description: List of user object
+                  required: false
+                  schema:
+                    type: array
+                    items:
+                      $ref: "#/definitions/User"
+              responses:
+                default:
+                  description: successful operation
+          /user/createWithList:
+            post:
+              tags:
+                - user
+              summary: Creates list of users with given input array
+              description: ""
+              operationId: createUsersWithListInput
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - in: body
+                  name: body
+                  description: List of user object
+                  required: false
+                  schema:
+                    type: array
+                    items:
+                      $ref: "#/definitions/User"
+              responses:
+                default:
+                  description: successful operation
+          /user/login:
+            get:
+              tags:
+                - user
+              summary: Logs user into the system
+              description: ""
+              operationId: loginUser
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: username
+                  in: query
+                  description: The user name for login
+                  required: false
+                  type: string
+                - name: password
+                  in: query
+                  description: The password for login in clear text
+                  required: false
+                  type: string
+              responses:
+                "200":
+                  description: successful operation
+                  schema:
+                    type: string
+                  headers:
+                    X-Rate-Limit:
+                      type: integer
+                      format: int32
+                      description: calls per hour allowed by the user
+                    X-Expires-After:
+                      type: string
+                      format: date-time
+                      description: date in UTC when toekn expires
+                "400":
+                  description: Invalid username/password supplied
+              x-amazon-apigateway-integration:
+                uri: 
+                  Fn::GetAtt: [ "SmsNotifierServiceFunction", "Arn" ]
+                httpMethod: POST
+          /user/logout:
+            get:
+              tags:
+                - user
+              summary: Logs out current logged in user session
+              description: ""
+              operationId: logoutUser
+              produces:
+                - application/xml
+                - application/json
+              parameters: []
+              responses:
+                default:
+                  description: successful operation
+              x-amazon-apigateway-integration:
+                uri: 
+                  Fn::Sub: 
+                    - "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:${FunctionName}/invocations"
+                    - {"FunctionName": !Ref EmailNotifierServiceFunction }
+                httpMethod: POST
+          "/user/{username}":
+            get:
+              tags:
+                - user
+              summary: Get user by user name
+              description: ""
+              operationId: getUserByName
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: username
+                  in: path
+                  description: "The name that needs to be fetched. Use user1 for testing. "
+                  required: true
+                  type: string
+              responses:
+                "200":
+                  description: successful operation
+                  schema:
+                    $ref: "#/definitions/User"
+                "400":
+                  description: Invalid username supplied
+                "404":
+                  description: User not found
+            put:
+              tags:
+                - user
+              summary: Updated user
+              description: This can only be done by the logged in user.
+              operationId: updateUser
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: username
+                  in: path
+                  description: name that need to be deleted
+                  required: true
+                  type: string
+                - in: body
+                  name: body
+                  description: Updated user object
+                  required: false
+                  schema:
+                    $ref: "#/definitions/User"
+              responses:
+                "400":
+                  description: Invalid user supplied
+                "404":
+                  description: User not found
+            delete:
+              tags:
+                - user
+              summary: Delete user
+              description: This can only be done by the logged in user.
+              operationId: deleteUser
+              produces:
+                - application/xml
+                - application/json
+              parameters:
+                - name: username
+                  in: path
+                  description: The name that needs to be deleted
+                  required: true
+                  type: string
+              responses:
+                "400":
+                  description: Invalid username supplied
+                "404":
+                  description: User not found
+        securityDefinitions:
+          petstore_auth:
+            type: oauth2
+            authorizationUrl: "http://petstore.swagger.io/api/oauth/dialog"
+            flow: implicit
+            scopes:
+              "write:pets": modify pets in your account
+              "read:pets": read your pets
+          api_key:
+            type: apiKey
+            name: api_key
+            in: header
+        definitions:
+          Order:
+            properties:
+              id:
+                type: integer
+                format: int64
+              petId:
+                type: integer
+                format: int64
+              quantity:
+                type: integer
+                format: int32
+              shipDate:
+                type: string
+                format: date-time
+              status:
+                type: string
+                description: Order Status
+                enum:
+                  - placed
+                  - approved
+                  - delivered
+              complete:
+                type: boolean
+            xml:
+              name: Order
+          Category:
+            properties:
+              id:
+                type: integer
+                format: int64
+              name:
+                type: string
+            xml:
+              name: Category
+          User:
+            properties:
+              id:
+                type: integer
+                format: int64
+              username:
+                type: string
+              firstName:
+                type: string
+              lastName:
+                type: string
+              email:
+                type: string
+              password:
+                type: string
+              phone:
+                type: string
+              userStatus:
+                type: integer
+                format: int32
+                description: User Status
+            xml:
+              name: User
+          Tag:
+            properties:
+              id:
+                type: integer
+                format: int64
+              name:
+                type: string
+            xml:
+              name: Tag
+          Pet:
+            required:
+              - name
+              - photoUrls
+            properties:
+              id:
+                type: integer
+                format: int64
+              category:
+                $ref: "#/definitions/Category"
+              name:
+                type: string
+                example: doggie
+              photoUrls:
+                type: array
+                xml:
+                  name: photoUrl
+                  wrapped: true
+                items:
+                  type: string
+              tags:
+                type: array
+                xml:
+                  name: tag
+                  wrapped: true
+                items:
+                  $ref: "#/definitions/Tag"
+              status:
+                type: string
+                description: pet status in the store
+                enum:
+                  - available
+                  - pending
+                  - sold
+            xml:
+              name: Pet
+          ApiResponse:
+            properties:
+              code:
+                type: integer
+                format: int32
+              type:
+                type: string
+              message:
+                type: string
+            xml:
+              name: "##default"
+        externalDocs:
+          description: Find out more about Swagger
+          url: "http://swagger.io"
+  StepFunctionsAPI:
+    Type: AWS::Serverless::Api
+    Properties:
+        StageName: dev
+        DefinitionBody:
+            swagger: "2.0"
+            basePath: /prod
+            info:
+              title: AwsSamExample
+            schemes:
+            - https
+            paths:
+              /:
+                x-amazon-apigateway-any-method:
+                  security:
+                  - test-authorizer: []
+                  produces:
+                  - application/json
+                  responses:
+                    200:
+                      description: 200 response
+                      schema:
+                        $ref: "#/definitions/Empty"
+                  x-amazon-apigateway-integration:
+                    responses:
+                      default:
+                        statusCode: 200
+                    # NOTE: Replace <<region>> and <<account>> fields
+                    uri: arn:aws:apigateway:<<region>>:lambda:path/2015-03-31/functions/arn:aws:lambda:<<region>>:<<accountId>>:function:${stageVariables.LambdaFunctionName}/invocations
+
+                    passthroughBehavior: when_no_match
+                    httpMethod: POST
+                    type: aws_proxy
+                options:
+                  consumes:
+                  - application/json
+                  produces:
+                  - application/json
+                  responses:
+                    200:
+                      description: 200 response
+                      schema:
+                        $ref: "#/definitions/Empty"
+                      headers:
+                        Access-Control-Allow-Origin:
+                          type: string
+                        Access-Control-Allow-Methods:
+                          type: string
+                        Access-Control-Allow-Headers:
+                          type: string
+                  x-amazon-apigateway-integration:
+                    type: aws
+                    uri: arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:012345678901:function:HelloWorld/invocations
+                    httpMethod: POST
+                    credentials: arn:aws:iam::012345678901:role/apigateway-invoke-lambda-exec-role
+                    requestTemplates:
+                      application/json: '#set ($root=$input.path(''$'')) { "stage": "$root.name", "user-id":
+                        "$root.key" }'
+                      application/xml: "#set ($root=$input.path('$')) <stage>$root.name</stage> "
+                    requestParameters:
+                      integration.request.path.stage: method.request.querystring.version
+                      integration.request.querystring.provider: method.request.querystring.vendor
+                    cacheNamespace: cache namespace
+                    cacheKeyParameters: []
+                    responses:
+                      '302':
+                        statusCode: '302'
+                        responseParameters:
+                          method.response.header.Location: integration.response.body.redirect.url
+                      2\d{2}:
+                        statusCode: '200'
+                        responseParameters:
+                          method.response.header.requestId: integration.response.header.cid
+                        responseTemplates:
+                          application/json: '#set ($root=$input.path(''$'')) { "stage": "$root.name",
+                            "user-id": "$root.key" }'
+                          application/xml: "#set ($root=$input.path('$')) <stage>$root.name</stage> "
+                      default:
+                        statusCode: '400'
+                        responseParameters:
+                          method.response.header.test-method-response-header: "'static value'"
+                      x-amazon-apigateway-integration:
+                        uri: !Sub 
+                          - "arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/arn:aws:lambda:${AWS::Region}:${AWS::AccountId}:function:${EmailNotifierServiceFunction}${Test}/invocations"
+                          - { "Test": "ABCD", "OtherTest": !Ref something }
+                        httpMethod: POST
+  StepFunctionsServiceRole:
+      Type: "AWS::IAM::Role"
+      Properties:
+          Path: "/"
+          ManagedPolicyArns:
+            - "arn:aws:iam::aws:policy/AWSStepFunctionsFullAccess"
+          AssumeRolePolicyDocument:
+            Version: "2012-10-17"
+            Statement:
+              -
+                Sid: "AllowStepFunctionsServiceToAssumeRole"
+                Effect: "Allow"
+                Action: 
+                  - "sts:AssumeRole"
+                Principal:
+                  Service:
+                    - !Sub "states.${AWS::Region}.amazonaws.com"
+          Policies:
+            -
+              PolicyName: "CallLambdaFunctions"
+              PolicyDocument:
+                Version: '2012-10-17'
+                Statement:
+                  -
+                    Effect: "Allow"
+                    Action:
+                      - "lambda:InvokeFunction"
+                    Resource: 
+                      - !Sub "${SlackNotifierServiceFunction.Arn}"
+                      - !Sub "${EmailNotifierServiceFunction.Arn}"
+                      - !Sub "${SmsNotifierServiceFunction.Arn}"
+
+  StepFunctionStateMachine:
+    Type: "AWS::StepFunctions::StateMachine"
+    Properties:
+      DefinitionString: !Sub |
+        {
+          "Comment": "Demo for API GW->SFN",
+          "StartAt": "NotifierState",
+          "States": {
+            "NotifierState": {
+              "Type" : "Choice",
+              "Choices": [
+                {
+                  "Variable": "$.notifier",
+                  "StringEquals": "Email",
+                  "Next": "EmailNotifier"
+                },
+                {
+                  "Variable": "$.notifier",
+                  "StringEquals": "Sms",
+                  "Next": "SmsNotifier"
+                },
+                {
+                  "Variable": "$.notifier",
+                  "StringEquals": "Slack",
+                  "Next": "SlackNotifier"
+                },
+                {
+                  "Variable": "$.notify",
+                  "StringEquals": "Twilio",
+                  "Next": "NotImplementedYet"
+                }
+              ],
+              "Default": "IgnoreNotification"
+            },
+            "IgnoreNotification": {
+              "Type": "Pass",
+              "Next": "SayHi"
+            },
+            "NotImplementedYet": {
+              "Type": "Fail",
+              "Cause": "Feature not implemented yet!"
+            },
+            "EmailNotifier": {
+              "Type": "Task",
+              "Resource": "${EmailNotifierServiceFunction.Arn}",
+              "Next": "SayHi"
+            },
+            "SlackNotifier": {
+              "Type": "Task",
+              "Resource": "${SlackNotifierServiceFunction.Arn}",
+              "Next": "SayHi"
+            },
+            "SmsNotifier": {
+              "Type": "Task",
+              "Resource": "${SmsNotifierServiceFunction.Arn}",
+              "Next": "SayHi"
+            },
+            "SayHi": {
+              "Type": "Pass",
+              "Result": "Hi!",
+              "End": true
+            }
+          }
+        }
+      RoleArn: !GetAtt StepFunctionsServiceRole.Arn
+  NotifierSNSTopic:
+    Type: AWS::SNS::Topic
+    Properties:
+      Subscription:
+      - Endpoint: !Ref NotificationEmail
+        Protocol: email
+Outputs:
+  NotifyUrl:
+    Description: Notify Workflow URL 
+    Value: !Sub "https://${StepFunctionsAPI}.execute-api.${AWS::Region}.amazonaws.com/dev/notify"
+
+  StepFunctionsStateMachine:
+    Description: Step Functions State Machine ARN
+    Value: !Ref StepFunctionStateMachine
\ No newline at end of file
diff --git a/goformation/test/yaml/sam-official-samples/api-swagger-plain.yaml b/goformation/test/yaml/sam-official-samples/api-swagger-plain.yaml
new file mode 100644
index 0000000000..cc7f499ce4
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/api-swagger-plain.yaml
@@ -0,0 +1,1111 @@
+AWSTemplateFormatVersion: "2010-09-09"
+Description: "Swagger demo for Integration Requests"
+Outputs: 
+  NotifyUrl: 
+    Description: "Notify Workflow URL"
+    Value: "https://${StepFunctionsAPI}.execute-api.${AWS::Region}.amazonaws.com/dev/notify"
+  StepFunctionsStateMachine: 
+    Description: "Step Functions State Machine ARN"
+    Value: StepFunctionStateMachine
+Parameters: 
+  NotificationEmail: 
+    Description: "Email address to subscribe to SNS topic and receive notifications from Notifier Workflow"
+    Type: String
+  SlackToken: 
+    Default: None
+    Description: "Legacy Slack Token (xoxp-ywz) to send messages on channel"
+    Type: String
+Resources: 
+  AnotherRandomAPI: 
+    Properties: 
+      DefinitionBody: 
+        basePath: /v2
+        definitions: 
+          ApiResponse: 
+            properties: 
+              code: 
+                format: int32
+                type: integer
+              message: 
+                type: string
+              type: 
+                type: string
+            xml: 
+              name: "##default"
+          Category: 
+            properties: 
+              id: 
+                format: int64
+                type: integer
+              name: 
+                type: string
+            xml: 
+              name: Category
+          Order: 
+            properties: 
+              complete: 
+                type: boolean
+              id: 
+                format: int64
+                type: integer
+              petId: 
+                format: int64
+                type: integer
+              quantity: 
+                format: int32
+                type: integer
+              shipDate: 
+                format: date-time
+                type: string
+              status: 
+                description: "Order Status"
+                enum: 
+                  - placed
+                  - approved
+                  - delivered
+                type: string
+            xml: 
+              name: Order
+          Pet: 
+            properties: 
+              category: 
+                $ref: "#/definitions/Category"
+              id: 
+                format: int64
+                type: integer
+              name: 
+                example: doggie
+                type: string
+              photoUrls: 
+                items: 
+                  type: string
+                type: array
+                xml: 
+                  name: photoUrl
+                  wrapped: true
+              status: 
+                description: "pet status in the store"
+                enum: 
+                  - available
+                  - pending
+                  - sold
+                type: string
+              tags: 
+                items: 
+                  $ref: "#/definitions/Tag"
+                type: array
+                xml: 
+                  name: tag
+                  wrapped: true
+            required: 
+              - name
+              - photoUrls
+            xml: 
+              name: Pet
+          Tag: 
+            properties: 
+              id: 
+                format: int64
+                type: integer
+              name: 
+                type: string
+            xml: 
+              name: Tag
+          User: 
+            properties: 
+              email: 
+                type: string
+              firstName: 
+                type: string
+              id: 
+                format: int64
+                type: integer
+              lastName: 
+                type: string
+              password: 
+                type: string
+              phone: 
+                type: string
+              userStatus: 
+                description: "User Status"
+                format: int32
+                type: integer
+              username: 
+                type: string
+            xml: 
+              name: User
+        externalDocs: 
+          description: "Find out more about Swagger"
+          url: "http://swagger.io"
+        info: 
+          contact: 
+            email: apiteam@swagger.io
+          description: "This is a sample server Petstore server.  You can find out more about Swagger at <a href=\"http://swagger.io\">http://swagger.io</a> or on irc.freenode.net, #swagger.  For this sample, you can use the api key \"special-key\" to test the authorization filters"
+          license: 
+            name: "Apache 2.0"
+            url: "http://www.apache.org/licenses/LICENSE-2.0.html"
+          termsOfService: "http://swagger.io/terms/"
+          title: "Swagger Petstore YAML"
+          version: "1.0.0"
+        paths: 
+          /pet: 
+            post: 
+              consumes: 
+                - application/json
+                - application/xml
+              description: ""
+              operationId: addPet
+              parameters: 
+                - 
+                  description: "Pet object that needs to be added to the store"
+                  in: body
+                  name: body
+                  required: false
+                  schema: 
+                    $ref: "#/definitions/Pet"
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "405": 
+                  description: "Invalid input"
+              security: 
+                - 
+                  petstore_auth: 
+                    - "write:pets"
+                    - "read:pets"
+              summary: "Add a new pet to the store"
+              tags: 
+                - pet
+              x-swagger-router-controller: SampleController
+            put: 
+              consumes: 
+                - application/json
+                - application/xml
+              description: ""
+              operationId: updatePet
+              parameters: 
+                - 
+                  description: "Pet object that needs to be added to the store"
+                  in: body
+                  name: body
+                  required: false
+                  schema: 
+                    $ref: "#/definitions/Pet"
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "400": 
+                  description: "Invalid ID supplied"
+                "404": 
+                  description: "Pet not found"
+                "405": 
+                  description: "Validation exception"
+              security: 
+                - 
+                  petstore_auth: 
+                    - "write:pets"
+                    - "read:pets"
+              summary: "Update an existing pet"
+              tags: 
+                - pet
+          /pet/findByStatus: 
+            get: 
+              consumes: 
+                - application/xml
+                - application/json
+                - multipart/form-data
+                - application/x-www-form-urlencoded
+              description: "Multiple status values can be provided with comma seperated strings"
+              operationId: findPetsByStatus
+              parameters: 
+                - 
+                  collectionFormat: multi
+                  default: available
+                  description: "Status values that need to be considered for filter"
+                  enum: 
+                    - available
+                    - pending
+                    - sold
+                  in: query
+                  items: 
+                    type: string
+                  name: status
+                  required: false
+                  type: array
+                - 
+                  collectionFormat: multi
+                  default: available
+                  description: "Status values that need to be considered for filter"
+                  enum: 
+                    - 1234567890123456
+                    - 345
+                    - 678
+                  in: query
+                  items: 
+                    type: long
+                  name: testlong
+                  required: false
+                  type: array
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "200": 
+                  description: "successful operation"
+                  schema: 
+                    items: 
+                      $ref: "#/definitions/Pet"
+                    type: array
+                "400": 
+                  description: "Invalid status value"
+              security: 
+                - 
+                  petstore_auth: 
+                    - "write:pets"
+                    - "read:pets"
+              summary: "Finds Pets by status"
+              tags: 
+                - pet
+          /pet/findByTags: 
+            get: 
+              description: "Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing."
+              operationId: findPetsByTags
+              parameters: 
+                - 
+                  collectionFormat: multi
+                  description: "Tags to filter by"
+                  in: query
+                  items: 
+                    type: string
+                  name: tags
+                  required: false
+                  type: array
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "200": 
+                  description: "successful operation"
+                  schema: 
+                    items: 
+                      $ref: "#/definitions/Pet"
+                    type: array
+                "400": 
+                  description: "Invalid tag value"
+              security: 
+                - 
+                  petstore_auth: 
+                    - "write:pets"
+                    - "read:pets"
+              summary: "Finds Pets by tags"
+              tags: 
+                - pet
+          ? "/pet/{petId}"
+          : 
+            delete: 
+              consumes: 
+                - multipart/form-data
+                - application/x-www-form-urlencoded
+              description: ""
+              operationId: deletePet
+              parameters: 
+                - 
+                  description: ""
+                  in: header
+                  name: api_key
+                  required: false
+                  type: string
+                - 
+                  description: "Pet id to delete"
+                  format: int64
+                  in: path
+                  name: petId
+                  required: true
+                  type: integer
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "400": 
+                  description: "Invalid pet value"
+              security: 
+                - 
+                  petstore_auth: 
+                    - "write:pets"
+                    - "read:pets"
+              summary: "Deletes a pet"
+              tags: 
+                - pet
+            get: 
+              consumes: 
+                - application/x-www-form-urlencoded
+              description: "Returns a single pet"
+              operationId: getPetById
+              parameters: 
+                - 
+                  description: "ID of pet to return"
+                  format: int64
+                  in: path
+                  name: petId
+                  required: true
+                  type: integer
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "200": 
+                  description: "successful operation"
+                  schema: 
+                    $ref: "#/definitions/Pet"
+                "400": 
+                  description: "Invalid ID supplied"
+                "404": 
+                  description: "Pet not found"
+              security: 
+                - 
+                  api_key: []
+                - 
+                  petstore_auth: 
+                    - "write:pets"
+                    - "read:pets"
+              summary: "Find pet by ID"
+              tags: 
+                - pet
+            post: 
+              consumes: 
+                - application/x-www-form-urlencoded
+              description: ""
+              operationId: updatePetWithForm
+              parameters: 
+                - 
+                  description: "ID of pet that needs to be updated"
+                  in: path
+                  name: petId
+                  required: true
+                  type: string
+                - 
+                  description: "Updated name of the pet"
+                  in: formData
+                  name: name
+                  required: false
+                  type: string
+                - 
+                  description: "Updated status of the pet"
+                  in: formData
+                  name: status
+                  required: false
+                  type: string
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "405": 
+                  description: "Invalid input"
+              security: 
+                - 
+                  petstore_auth: 
+                    - "write:pets"
+                    - "read:pets"
+              summary: "Updates a pet in the store with form data"
+              tags: 
+                - pet
+          ? "/pet/{petId}/uploadImage"
+          : 
+            post: 
+              consumes: 
+                - multipart/form-data
+              description: ""
+              operationId: uploadFile
+              parameters: 
+                - 
+                  description: "ID of pet to update"
+                  format: int64
+                  in: path
+                  name: petId
+                  required: true
+                  type: integer
+                - 
+                  description: "Additional data to pass to server"
+                  in: formData
+                  name: additionalMetadata
+                  required: false
+                  type: string
+                - 
+                  description: "file to upload"
+                  in: formData
+                  name: file
+                  required: false
+                  type: file
+              produces: 
+                - application/json
+              responses: 
+                "200": 
+                  description: "successful operation"
+                  schema: 
+                    $ref: "#/definitions/ApiResponse"
+              security: 
+                - 
+                  petstore_auth: 
+                    - "write:pets"
+                    - "read:pets"
+              summary: "uploads an image"
+              tags: 
+                - pet
+              x-swagger-router-controller: SampleController
+          /store/inventory: 
+            get: 
+              description: "Returns a map of status codes to quantities"
+              operationId: getInventory
+              parameters: []
+              produces: 
+                - application/json
+              responses: 
+                "200": 
+                  description: "successful operation"
+                  schema: 
+                    additionalProperties: 
+                      format: int32
+                      type: integer
+                    type: object
+              security: 
+                - 
+                  api_key: []
+              summary: "Returns pet inventories by status"
+              tags: 
+                - store
+          /store/order: 
+            post: 
+              description: ""
+              operationId: placeOrder
+              parameters: 
+                - 
+                  description: "order placed for purchasing the pet"
+                  in: body
+                  name: body
+                  required: false
+                  schema: 
+                    $ref: "#/definitions/Order"
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "200": 
+                  description: "successful operation"
+                  schema: 
+                    $ref: "#/definitions/Order"
+                "400": 
+                  description: "Invalid Order"
+              summary: "Place an order for a pet"
+              tags: 
+                - store
+          ? "/store/order/{orderId}"
+          : 
+            delete: 
+              description: "For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors"
+              operationId: deleteOrder
+              parameters: 
+                - 
+                  description: "ID of the order that needs to be deleted"
+                  in: path
+                  name: orderId
+                  required: true
+                  type: string
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "400": 
+                  description: "Invalid ID supplied"
+                "404": 
+                  description: "Order not found"
+              summary: "Delete purchase order by ID"
+              tags: 
+                - store
+            get: 
+              description: "For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions"
+              operationId: getOrderById
+              parameters: 
+                - 
+                  description: "ID of pet that needs to be fetched"
+                  in: path
+                  name: orderId
+                  required: true
+                  type: string
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "200": 
+                  description: "successful operation"
+                  schema: 
+                    $ref: "#/definitions/Order"
+                "400": 
+                  description: "Invalid ID supplied"
+                "404": 
+                  description: "Order not found"
+              summary: "Find purchase order by ID"
+              tags: 
+                - store
+          /user: 
+            post: 
+              description: "This can only be done by the logged in user."
+              operationId: createUser
+              parameters: 
+                - 
+                  description: "Created user object"
+                  in: body
+                  name: body
+                  required: false
+                  schema: 
+                    $ref: "#/definitions/User"
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                default: 
+                  description: "successful operation"
+              summary: "Create user"
+              tags: 
+                - user
+          /user/createWithArray: 
+            post: 
+              description: ""
+              operationId: createUsersWithArrayInput
+              parameters: 
+                - 
+                  description: "List of user object"
+                  in: body
+                  name: body
+                  required: false
+                  schema: 
+                    items: 
+                      $ref: "#/definitions/User"
+                    type: array
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                default: 
+                  description: "successful operation"
+              summary: "Creates list of users with given input array"
+              tags: 
+                - user
+          /user/createWithList: 
+            post: 
+              description: ""
+              operationId: createUsersWithListInput
+              parameters: 
+                - 
+                  description: "List of user object"
+                  in: body
+                  name: body
+                  required: false
+                  schema: 
+                    items: 
+                      $ref: "#/definitions/User"
+                    type: array
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                default: 
+                  description: "successful operation"
+              summary: "Creates list of users with given input array"
+              tags: 
+                - user
+          /user/login: 
+            get: 
+              description: ""
+              operationId: loginUser
+              parameters: 
+                - 
+                  description: "The user name for login"
+                  in: query
+                  name: username
+                  required: false
+                  type: string
+                - 
+                  description: "The password for login in clear text"
+                  in: query
+                  name: password
+                  required: false
+                  type: string
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "200": 
+                  description: "successful operation"
+                  headers: 
+                    X-Expires-After: 
+                      description: "date in UTC when toekn expires"
+                      format: date-time
+                      type: string
+                    X-Rate-Limit: 
+                      description: "calls per hour allowed by the user"
+                      format: int32
+                      type: integer
+                  schema: 
+                    type: string
+                "400": 
+                  description: "Invalid username/password supplied"
+              summary: "Logs user into the system"
+              tags: 
+                - user
+          /user/logout: 
+            get: 
+              description: ""
+              operationId: logoutUser
+              parameters: []
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                default: 
+                  description: "successful operation"
+              summary: "Logs out current logged in user session"
+              tags: 
+                - user
+          ? "/user/{username}"
+          : 
+            delete: 
+              description: "This can only be done by the logged in user."
+              operationId: deleteUser
+              parameters: 
+                - 
+                  description: "The name that needs to be deleted"
+                  in: path
+                  name: username
+                  required: true
+                  type: string
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "400": 
+                  description: "Invalid username supplied"
+                "404": 
+                  description: "User not found"
+              summary: "Delete user"
+              tags: 
+                - user
+            get: 
+              description: ""
+              operationId: getUserByName
+              parameters: 
+                - 
+                  description: "The name that needs to be fetched. Use user1 for testing. "
+                  in: path
+                  name: username
+                  required: true
+                  type: string
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "200": 
+                  description: "successful operation"
+                  schema: 
+                    $ref: "#/definitions/User"
+                "400": 
+                  description: "Invalid username supplied"
+                "404": 
+                  description: "User not found"
+              summary: "Get user by user name"
+              tags: 
+                - user
+            put: 
+              description: "This can only be done by the logged in user."
+              operationId: updateUser
+              parameters: 
+                - 
+                  description: "name that need to be deleted"
+                  in: path
+                  name: username
+                  required: true
+                  type: string
+                - 
+                  description: "Updated user object"
+                  in: body
+                  name: body
+                  required: false
+                  schema: 
+                    $ref: "#/definitions/User"
+              produces: 
+                - application/xml
+                - application/json
+              responses: 
+                "400": 
+                  description: "Invalid user supplied"
+                "404": 
+                  description: "User not found"
+              summary: "Updated user"
+              tags: 
+                - user
+        schemes: 
+          - http
+        securityDefinitions: 
+          api_key: 
+            in: header
+            name: api_key
+            type: apiKey
+          petstore_auth: 
+            authorizationUrl: "http://petstore.swagger.io/api/oauth/dialog"
+            flow: implicit
+            scopes: 
+              ? "read:pets"
+              : "read your pets"
+              ? "write:pets"
+              : "modify pets in your account"
+            type: oauth2
+        swagger: "2.0"
+        tags: 
+          - 
+            description: "Everything about your Pets"
+            externalDocs: 
+              description: "Find out more"
+              url: "http://swagger.io"
+            name: pet
+          - 
+            description: "Operations about user"
+            name: store
+          - 
+            description: "Access to Petstore orders"
+            externalDocs: 
+              description: "Find out more about our store"
+              url: "http://swagger.io"
+            name: user
+      StageName: prod
+    Type: "AWS::Serverless::Api"
+  ApiGatewayStepFunctionsRole: 
+    Properties: 
+      AssumeRolePolicyDocument: 
+        Statement: 
+          - 
+            Action: 
+              - "sts:AssumeRole"
+            Effect: Allow
+            Principal: 
+              Service: 
+                - apigateway.amazonaws.com
+            Sid: AllowApiGatewayServiceToAssumeRole
+        Version: "2012-10-17"
+      Path: /
+      Policies: 
+        - 
+          PolicyDocument: 
+            Statement: 
+              - 
+                Action: 
+                  - "states:StartExecution"
+                Effect: Allow
+                Resource: 
+                  - StepFunctionStateMachine
+            Version: "2012-10-17"
+          PolicyName: CallStepFunctions
+    Type: "AWS::IAM::Role"
+  EmailNotifierServiceFunction: 
+    Properties: 
+      CodeUri: ../code/email/
+      Environment: 
+        Variables: 
+          NOTIFIER_TOPIC: NotifierSNSTopic
+      Handler: email_sns.lambda_handler
+      Role: SnsNotifierServiceRole.Arn
+      Runtime: python2.7
+    Type: "AWS::Serverless::Function"
+  NotifierSNSTopic: 
+    Properties: 
+      Subscription: 
+        - 
+          Endpoint: NotificationEmail
+          Protocol: email
+    Type: "AWS::SNS::Topic"
+  SlackNotifierServiceFunction: 
+    Properties: 
+      CodeUri: ../code/slack.zip
+      Environment: 
+        Variables: 
+          SLACK_TOKEN: SlackToken
+      Handler: slack.lambda_handler
+      Runtime: python2.7
+    Type: "AWS::Serverless::Function"
+  SmsNotifierServiceFunction: 
+    Properties: 
+      CodeUri: ../code/sms/
+      Environment: 
+        Variables: 
+          NOTIFIER_TOPIC: NotifierSNSTopic
+      Handler: sms_sns.lambda_handler
+      Role: SnsNotifierServiceRole.Arn
+      Runtime: python2.7
+    Type: "AWS::Serverless::Function"
+  SnsNotifierServiceRole: 
+    Properties: 
+      AssumeRolePolicyDocument: 
+        Statement: 
+          - 
+            Action: 
+              - "sts:AssumeRole"
+            Effect: Allow
+            Principal: 
+              Service: 
+                - lambda.amazonaws.com
+            Sid: AllowLambdaServiceToAssumeRole
+        Version: "2012-10-17"
+      ManagedPolicyArns: 
+        - "arn:aws:iam::aws:policy/service-role/AWSLambdaBasicExecutionRole"
+      Path: /
+      Policies: 
+        - 
+          PolicyDocument: 
+            Statement: 
+              - 
+                Action: 
+                  - "sns:Publish"
+                Effect: Allow
+                Resource: 
+                  - NotifierSNSTopic
+                  - "*"
+            Version: "2012-10-17"
+          PolicyName: PublishSnsTopic
+    Type: "AWS::IAM::Role"
+  StepFunctionStateMachine: 
+    Properties: 
+      DefinitionString: |
+          {
+              "Comment": "Demo for API GW->SFN",
+              "StartAt": "NotifierState",
+              "States": {
+                "NotifierState": {
+                  "Type" : "Choice",
+                  "Choices": [
+                    {
+                      "Variable": "$.notifier",
+                      "StringEquals": "Email",
+                      "Next": "EmailNotifier"
+                    },
+                    {
+                      "Variable": "$.notifier",
+                      "StringEquals": "Sms",
+                      "Next": "SmsNotifier"
+                    },
+                    {
+                      "Variable": "$.notifier",
+                      "StringEquals": "Slack",
+                      "Next": "SlackNotifier"
+                    },
+                    {
+                      "Variable": "$.notify",
+                      "StringEquals": "Twilio",
+                      "Next": "NotImplementedYet"
+                    }
+                  ],
+                  "Default": "IgnoreNotification"
+                },
+                "IgnoreNotification": {
+                  "Type": "Pass",
+                  "Next": "SayHi"
+                },
+                "NotImplementedYet": {
+                  "Type": "Fail",
+                  "Cause": "Feature not implemented yet!"
+                },
+                "EmailNotifier": {
+                  "Type": "Task",
+                  "Resource": "${EmailNotifierServiceFunction.Arn}",
+                  "Next": "SayHi"
+                },
+                "SlackNotifier": {
+                  "Type": "Task",
+                  "Resource": "${SlackNotifierServiceFunction.Arn}",
+                  "Next": "SayHi"
+                },
+                "SmsNotifier": {
+                  "Type": "Task",
+                  "Resource": "${SmsNotifierServiceFunction.Arn}",
+                  "Next": "SayHi"
+                },
+                "SayHi": {
+                  "Type": "Pass",
+                  "Result": "Hi!",
+                  "End": true
+                }
+              }
+          }
+      RoleArn: StepFunctionsServiceRole.Arn
+    Type: "AWS::StepFunctions::StateMachine"
+  StepFunctionsAPI: 
+    Properties: 
+      DefinitionBody: 
+        basePath: /prod
+        definitions: 
+          Empty: 
+            title: "Empty Schema"
+            type: object
+        info: 
+          title: AwsSamExample
+        paths: 
+          /: 
+            options: 
+              consumes: 
+                - application/json
+              produces: 
+                - application/json
+              responses: 
+                200: 
+                  description: "200 response"
+                  headers: 
+                    Access-Control-Allow-Headers: 
+                      type: string
+                    Access-Control-Allow-Methods: 
+                      type: string
+                    Access-Control-Allow-Origin: 
+                      type: string
+                  schema: 
+                    $ref: "#/definitions/Empty"
+              x-amazon-apigateway-integration: 
+                cacheKeyParameters: []
+                cacheNamespace: "cache namespace"
+                credentials: "arn:aws:iam::012345678901:role/apigateway-invoke-lambda-exec-role"
+                httpMethod: POST
+                requestParameters: 
+                  integration.request.path.stage: method.request.querystring.version
+                  integration.request.querystring.provider: method.request.querystring.vendor
+                requestTemplates: 
+                  application/json: "#set ($root=$input.path('$')) { \"stage\": \"$root.name\", \"user-id\": \"$root.key\" }"
+                  application/xml: "#set ($root=$input.path('$')) <stage>$root.name</stage> "
+                responses: 
+                  "2\\d{2}": 
+                    responseParameters: 
+                      method.response.header.requestId: integration.response.header.cid
+                    responseTemplates: 
+                      application/json: "#set ($root=$input.path('$')) { \"stage\": \"$root.name\", \"user-id\": \"$root.key\" }"
+                      application/xml: "#set ($root=$input.path('$')) <stage>$root.name</stage> "
+                    statusCode: "200"
+                  "302": 
+                    responseParameters: 
+                      method.response.header.Location: integration.response.body.redirect.url
+                    statusCode: "302"
+                  default: 
+                    responseParameters: 
+                      method.response.header.test-method-response-header: "'static value'"
+                    statusCode: "400"
+                type: aws
+                uri: "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:012345678901:function:HelloWorld/invocations"
+            x-amazon-apigateway-any-method: 
+              produces: 
+                - application/json
+              responses: 
+                200: 
+                  description: "200 response"
+                  schema: 
+                    $ref: "#/definitions/Empty"
+              security: 
+                - 
+                  test-authorizer: []
+              x-amazon-apigateway-integration: 
+                httpMethod: POST
+                passthroughBehavior: when_no_match
+                responses: 
+                  default: 
+                    statusCode: 200
+                type: aws_proxy
+                uri: EmailNotifierServiceFunction.Arn
+          "/{proxy+}":
+            options: 
+              consumes: 
+                - application/json
+              produces: 
+                - application/json
+              responses: 
+                200: 
+                  description: "200 response"
+                  headers: 
+                    Access-Control-Allow-Headers: 
+                      type: string
+                    Access-Control-Allow-Methods: 
+                      type: string
+                    Access-Control-Allow-Origin: 
+                      type: string
+                  schema: 
+                    $ref: "#/definitions/Empty"
+              x-amazon-apigateway-integration: 
+                passthroughBehavior: when_no_match
+                requestTemplates: 
+                  application/json: "{\"statusCode\": 200}"
+                responses: 
+                  default: 
+                    responseParameters: 
+                      method.response.header.Access-Control-Allow-Headers: "'Content-Type,Authorization,X-Amz-Date,X-Api-Key,X-Amz-Security-Token'"
+                      method.response.header.Access-Control-Allow-Methods: "'DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT'"
+                      method.response.header.Access-Control-Allow-Origin: "'*'"
+                    statusCode: 200
+                type: mock
+            x-amazon-apigateway-any-method: 
+              parameters: 
+                - 
+                  in: path
+                  name: proxy
+                  required: true
+                  type: string
+              produces: 
+                - application/json
+              responses: {}
+              x-amazon-apigateway-auth: 
+                type: aws_iam
+              x-amazon-apigateway-integration: 
+                httpMethod: POST
+                type: aws_proxy
+                uri: "arn:aws:apigateway:<<region>>:lambda:path/2015-03-31/functions/arn:aws:lambda:<<region>>:<<accountId>>:function:${stageVariables.LambdaFunctionName}/invocations"
+        schemes: 
+          - https
+        securityDefinitions: 
+          test-authorizer: 
+            in: header
+            name: Authorization
+            type: apiKey
+            x-amazon-apigateway-authorizer: 
+              authorizerCredentials: "arn:aws:iam::account-id:role"
+              authorizerResultTtlInSeconds: 60
+              authorizerUri: "arn:aws:apigateway:us-east-1:lambda:path/2015-03-31/functions/arn:aws:lambda:us-east-1:account-id:function:function-name/invocations"
+              identityValidationExpression: "^x-[a-z]+"
+              type: token
+            x-amazon-apigateway-authtype: oauth2
+        swagger: "2.0"
+      StageName: dev
+    Type: "AWS::Serverless::Api"
+  StepFunctionsServiceRole: 
+    Properties: 
+      AssumeRolePolicyDocument: 
+        Statement: 
+          - 
+            Action: 
+              - "sts:AssumeRole"
+            Effect: Allow
+            Principal: 
+              Service: 
+                - "states.${AWS::Region}.amazonaws.com"
+            Sid: AllowStepFunctionsServiceToAssumeRole
+        Version: "2012-10-17"
+      ManagedPolicyArns: 
+        - "arn:aws:iam::aws:policy/AWSStepFunctionsFullAccess"
+      Path: /
+      Policies: 
+        - 
+          PolicyDocument: 
+            Statement: 
+              - 
+                Action: 
+                  - "lambda:InvokeFunction"
+                Effect: Allow
+                Resource: 
+                  - "${SlackNotifierServiceFunction.Arn}"
+                  - "${EmailNotifierServiceFunction.Arn}"
+                  - "${SmsNotifierServiceFunction.Arn}"
+            Version: "2012-10-17"
+          PolicyName: CallLambdaFunctions
+    Type: "AWS::IAM::Role"
+Transform: "AWS::Serverless-2016-10-31"
diff --git a/goformation/test/yaml/sam-official-samples/api_backend/index.js b/goformation/test/yaml/sam-official-samples/api_backend/index.js
new file mode 100644
index 0000000000..5420b07b56
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/api_backend/index.js
@@ -0,0 +1,87 @@
+'use strict';
+
+
+const AWS = require('aws-sdk');
+const dynamo = new AWS.DynamoDB.DocumentClient();
+
+const tableName = process.env.TABLE_NAME;
+
+const createResponse = (statusCode, body) => {
+    
+    return {
+        statusCode: statusCode,
+        body: body
+    }
+};
+
+exports.get = (event, context, callback) => {
+    
+    let params = {
+        TableName: tableName,
+        Key: {
+            id: event.pathParameters.resourceId
+        }
+    };
+    
+    let dbGet = (params) => { return dynamo.get(params).promise() };
+    
+    dbGet(params).then( (data) => {
+        if (!data.Item) {
+            callback(null, createResponse(404, "ITEM NOT FOUND"));
+            return;
+        }
+        console.log(`RETRIEVED ITEM SUCCESSFULLY WITH doc = ${data.Item.doc}`);
+        callback(null, createResponse(200, data.Item.doc));
+    }).catch( (err) => { 
+        console.log(`GET ITEM FAILED FOR doc = ${data.Item.doc}, WITH ERROR: ${err}`);
+        callback(null, createResponse(500, err));
+    });
+};
+
+exports.put = (event, context, callback) => {
+    
+    let item = {
+        id: event.pathParameters.resourceId,
+        doc: event.body
+    };
+
+    let params = {
+        TableName: tableName,
+        Item: item
+    };
+    
+    let dbPut = (params) => { return dynamo.put(params).promise() };
+    
+    dbPut(params).then( (data) => {
+        console.log(`PUT ITEM SUCCEEDED WITH doc = ${item.doc}`);
+        callback(null, createResponse(200, null));
+    }).catch( (err) => { 
+        console.log(`PUT ITEM FAILED FOR doc = ${item.doc}, WITH ERROR: ${err}`);
+        callback(null, createResponse(500, err)); 
+    });
+};
+
+exports.delete = (event, context, callback) => {
+    
+    let params = {
+        TableName: tableName,
+        Key: {
+            id: event.pathParameters.resourceId
+        },
+        ReturnValues: 'ALL_OLD'
+    };
+    
+    let dbDelete = (params) => { return dynamo.delete(params).promise() };
+    
+    dbDelete(params).then( (data) => {
+        if (!data.Attributes) {
+            callback(null, createResponse(404, "ITEM NOT FOUND FOR DELETION"));
+            return;
+        }
+        console.log(`DELETED ITEM SUCCESSFULLY WITH id = ${event.pathParameters.resourceId}`);
+        callback(null, createResponse(200, null));
+    }).catch( (err) => { 
+        console.log(`DELETE ITEM FAILED FOR id = ${event.pathParameters.resourceId}, WITH ERROR: ${err}`);
+        callback(null, createResponse(500, err));
+    });
+};
diff --git a/goformation/test/yaml/sam-official-samples/api_backend/template.yaml b/goformation/test/yaml/sam-official-samples/api_backend/template.yaml
new file mode 100644
index 0000000000..4ad1158352
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/api_backend/template.yaml
@@ -0,0 +1,54 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: Simple CRUD webservice. State is stored in a SimpleTable (DynamoDB) resource.
+Resources:
+  GetFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: index.get
+      Runtime: nodejs10.x
+      CodeUri: s3://<bucket>/api_backend.zip
+      Policies: AmazonDynamoDBReadOnlyAccess
+      Environment:
+        Variables:
+          TABLE_NAME: !Ref Table
+      Events:
+        GetResource:
+          Type: Api
+          Properties:
+            Path: /resource/{resourceId}
+            Method: get
+
+  PutFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: index.put
+      Runtime: nodejs10.x
+      CodeUri: s3://<bucket>/api_backend.zip
+      Policies: AmazonDynamoDBFullAccess
+      Environment:
+        Variables:
+          TABLE_NAME: !Ref Table
+      Events:
+        PutResource:
+          Type: Api
+          Properties:
+            Path: /resource/{resourceId}
+            Method: put
+
+  DeleteFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: index.delete
+      Runtime: nodejs10.x
+      CodeUri: s3://<bucket>/api_backend.zip
+      Policies: AmazonDynamoDBFullAccess
+      Environment:
+        Variables:
+          TABLE_NAME: !Ref Table
+      Events:
+        DeleteResource:
+          Type: Api
+          Properties:
+            Path: /resource/{resourceId}
+            Method: delete
\ No newline at end of file
diff --git a/goformation/test/yaml/sam-official-samples/api_swagger_cors/index.js b/goformation/test/yaml/sam-official-samples/api_swagger_cors/index.js
new file mode 100644
index 0000000000..03d56b3116
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/api_swagger_cors/index.js
@@ -0,0 +1,8 @@
+exports.handler = function(event, context, callback) {
+
+    callback(null, {
+        statusCode: '200',
+        body: "Hello world"
+    });
+
+}
diff --git a/goformation/test/yaml/sam-official-samples/api_swagger_cors/swagger.yaml b/goformation/test/yaml/sam-official-samples/api_swagger_cors/swagger.yaml
new file mode 100644
index 0000000000..70546630a9
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/api_swagger_cors/swagger.yaml
@@ -0,0 +1,105 @@
+---
+swagger: 2.0
+basePath: /prod
+info:
+  title: AwsSamExample
+schemes:
+- https
+paths:
+  /:
+    x-amazon-apigateway-any-method:
+      produces:
+      - application/json
+      responses:
+        200:
+          description: 200 response
+          schema:
+            $ref: "#/definitions/Empty"
+      x-amazon-apigateway-integration:
+        responses:
+          default:
+            statusCode: 200
+        # NOTE: Replace <<region>> and <<account>> fields
+        uri: arn:aws:apigateway:<<region>>:lambda:path/2015-03-31/functions/arn:aws:lambda:<<region>>:<<accountId>>:function:${stageVariables.LambdaFunctionName}/invocations
+
+        passthroughBehavior: when_no_match
+        httpMethod: POST
+        type: aws_proxy
+    options:
+      consumes:
+      - application/json
+      produces:
+      - application/json
+      responses:
+        200:
+          description: 200 response
+          schema:
+            $ref: "#/definitions/Empty"
+          headers:
+            Access-Control-Allow-Origin:
+              type: string
+            Access-Control-Allow-Methods:
+              type: string
+            Access-Control-Allow-Headers:
+              type: string
+      x-amazon-apigateway-integration:
+        responses:
+          default:
+            statusCode: 200
+            responseParameters:
+              method.response.header.Access-Control-Allow-Methods: "'DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT'"
+              method.response.header.Access-Control-Allow-Headers: "'Content-Type,Authorization,X-Amz-Date,X-Api-Key,X-Amz-Security-Token'"
+              method.response.header.Access-Control-Allow-Origin: "'*'"
+        passthroughBehavior: when_no_match
+        requestTemplates:
+          application/json: "{\"statusCode\": 200}"
+        type: mock
+  /{proxy+}:
+    x-amazon-apigateway-any-method:
+      x-amazon-apigateway-auth:
+        type: aws_iam
+      produces:
+      - application/json
+      parameters:
+      - name: proxy
+        in: path
+        required: true
+        type: string
+      responses: {}
+      x-amazon-apigateway-integration:
+        uri: arn:aws:apigateway:<<region>>:lambda:path/2015-03-31/functions/arn:aws:lambda:<<region>>:<<accountId>>:function:${stageVariables.LambdaFunctionName}/invocations
+        httpMethod: POST
+        type: aws_proxy
+    options:
+      consumes:
+      - application/json
+      produces:
+      - application/json
+      responses:
+        200:
+          description: 200 response
+          schema:
+            $ref: "#/definitions/Empty"
+          headers:
+            Access-Control-Allow-Origin:
+              type: string
+            Access-Control-Allow-Methods:
+              type: string
+            Access-Control-Allow-Headers:
+              type: string
+      x-amazon-apigateway-integration:
+        responses:
+          default:
+            statusCode: 200
+            responseParameters:
+              method.response.header.Access-Control-Allow-Methods: "'DELETE,GET,HEAD,OPTIONS,PATCH,POST,PUT'"
+              method.response.header.Access-Control-Allow-Headers: "'Content-Type,Authorization,X-Amz-Date,X-Api-Key,X-Amz-Security-Token'"
+              method.response.header.Access-Control-Allow-Origin: "'*'"
+        passthroughBehavior: when_no_match
+        requestTemplates:
+          application/json: "{\"statusCode\": 200}"
+        type: mock
+definitions:
+  Empty:
+    type: object
+    title: Empty Schema
diff --git a/goformation/test/yaml/sam-official-samples/api_swagger_cors/template.yaml b/goformation/test/yaml/sam-official-samples/api_swagger_cors/template.yaml
new file mode 100644
index 0000000000..33614d8824
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/api_swagger_cors/template.yaml
@@ -0,0 +1,46 @@
+---
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: AWS SAM template with API defined in an external Swagger file along with Lambda integrations and CORS configurations
+Resources:
+  ApiGatewayApi:
+    Type: AWS::Serverless::Api
+    Properties:
+      DefinitionUri: s3://<bucket>/swagger.yaml
+      StageName: Prod
+      Variables:
+        # NOTE: Before using this template, replace the <<region>> and <<account>> fields
+        #       in Lambda integration URI in the swagger file to region and accountId 
+        #       you are deploying to
+        LambdaFunctionName: !Ref LambdaFunction
+
+  LambdaFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      CodeUri: s3://<bucket>/api_swagger_cors.zip
+      Handler: index.handler
+      Runtime: nodejs10.x
+      Events:
+        ProxyApiRoot:
+          Type: Api
+          Properties:
+            RestApiId: !Ref ApiGatewayApi
+            Path: /
+            Method: ANY
+        ProxyApiGreedy:
+          Type: Api
+          Properties:
+            RestApiId: !Ref ApiGatewayApi
+            Path: /{proxy+}
+            Method: ANY
+
+Outputs:
+  ApiUrl:
+    Description: URL of your API endpoint
+    Value: !Join
+      - ''
+      - - https://
+        - !Ref ApiGatewayApi
+        - '.execute-api.'
+        - !Ref 'AWS::Region'
+        - '.amazonaws.com/Prod'
diff --git a/goformation/test/yaml/sam-official-samples/codestar-node4.3.yaml b/goformation/test/yaml/sam-official-samples/codestar-node4.3.yaml
new file mode 100644
index 0000000000..4dd83f3561
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/codestar-node4.3.yaml
@@ -0,0 +1,25 @@
+AWSTemplateFormatVersion: 2010-09-09
+Transform:
+- AWS::Serverless-2016-10-31
+- AWS::CodeStar
+
+Parameters:
+  ProjectId:
+    Type: String
+    Description: AWS CodeStar projectID used to associate new resources to team members
+
+Resources:
+  GetHelloWorld:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: index.get
+      Runtime: nodejs10.x
+      Role:
+        Fn::ImportValue:
+          !Join ['-', [!Ref 'ProjectId', !Ref 'AWS::Region', 'LambdaTrustRole']]
+      Events:
+        GetEvent:
+          Type: Api
+          Properties:
+            Path: /
+            Method: get
\ No newline at end of file
diff --git a/goformation/test/yaml/sam-official-samples/encryption_proxy/README.MD b/goformation/test/yaml/sam-official-samples/encryption_proxy/README.MD
new file mode 100644
index 0000000000..f439e69bd6
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/encryption_proxy/README.MD
@@ -0,0 +1,48 @@
+### Encryption/Decryption Proxy
+
+This template creates the following resources:
+
+* 2 Lambda functions (Encryption, Decryption)
+    - SAM takes care of creating 2 stages API Gateway {Stage,Prod} that sits on top
+* IAM Role for each function
+* KMS Key and KMS Decrypt/Encrypt permissions for each IAM Role separately
+    - KMS Key ID is then passed to Encryption Lambda via Env vars
+
+
+#### Encrypt Action
+
+* Consumes up to 4KB of data (string, json blob, etc.)
+* Returns encrypted data via JSON blob as follows
+
+```javascript
+{
+    "data": "base64_encrypted_blob"
+}
+```
+
+**Encrypting data via cURL**
+
+```bash
+encryptURL=$(aws cloudformation describe-stacks --stack-name encryption-proxy --query 'Stacks[].Outputs[?OutputKey==`EncryptURL`].OutputValue' --output text)
+
+curl -H 'Content-Type: application/json' -X POST -d 'Here it is my super secret data...' ${encryptURL}
+```
+
+#### Decrypt Action
+
+* Consumes JSON blob received out of Encryption Action
+* Returns decrypted data via JSON blob as follows
+
+```javascript
+{
+    "data": "decrypted_data"
+}
+```
+
+**Decrypting data via cURL**
+
+```bash
+decryptURL=$(aws cloudformation describe-stacks --stack-name encryption-proxy --query 'Stacks[].Outputs[?OutputKey==`DecryptURL`].OutputValue' --output text)
+
+curl -H 'Content-Type: application/json' -X POST -d '{ "data": "AQECAHjgf/RDFTAO0+ief3VXaJRnnKbyaaEsVhkmYxTcbiNhcgAAAHIwcAYJKoZIhvcNAQcGoGMw\nYQIBADBcBgkqhkiG9w0BBwEwHgYJYIZIAWUDBAEuMBEEDBX7iv8CwG1gr2Hc4wIBEIAvS1cXraMW\n3PU96z4AACGj7Wuo007HwWjtK/quSi3FKyYFvkJ10YhDOEvzxOD7Ntw=\n" }' ${decryptURL}
+```
diff --git a/goformation/test/yaml/sam-official-samples/encryption_proxy/decryption.py b/goformation/test/yaml/sam-official-samples/encryption_proxy/decryption.py
new file mode 100644
index 0000000000..ac04a86fa5
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/encryption_proxy/decryption.py
@@ -0,0 +1,49 @@
+import boto3
+import json
+import base64
+
+kms = boto3.client('kms')
+bad_request = {
+    'statusCode': 400,
+    'headers': {
+        'Content-Type': 'application/json'
+    },
+    'body': json.dumps({'error': 'Invalid argument'})
+}
+
+
+def decrypt(message):
+    '''decrypt leverages KMS decrypt and base64-encode decrypted blob
+
+        More info on KMS decrypt API:
+        https://docs.aws.amazon.com/kms/latest/APIReference/API_decrypt.html
+    '''
+    try:
+        ret = kms.decrypt(
+            CiphertextBlob=base64.decodestring(message))
+        decrypted_data = ret.get('Plaintext')
+    except Exception as e:
+        # returns http 500 back to user and log error details in Cloudwatch Logs
+        raise Exception("Unable to decrypt data: ", e)
+
+    return decrypted_data
+
+
+def post(event, context):
+
+    try:
+        payload = json.loads(event['body'])
+        message = payload['data']
+    except (KeyError, TypeError, ValueError):
+        return bad_request
+
+    decrypted_message = decrypt(message)
+    response = {'data': decrypted_message}
+
+    return {
+        'statusCode': 200,
+        'headers': {
+            'Content-Type': 'application/json'
+        },
+        'body': json.dumps(response)
+    }
diff --git a/goformation/test/yaml/sam-official-samples/encryption_proxy/encryption.py b/goformation/test/yaml/sam-official-samples/encryption_proxy/encryption.py
new file mode 100644
index 0000000000..72598f3c47
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/encryption_proxy/encryption.py
@@ -0,0 +1,53 @@
+import boto3
+import json
+import base64
+import os
+
+kms = boto3.client('kms')
+bad_request = {
+    'statusCode': 400,
+    'headers': {
+        'Content-Type': 'application/json'
+    },
+    'body': json.dumps({'error': 'Invalid argument'})
+}
+
+
+def encrypt(key, message):
+    '''encrypt leverages KMS encrypt and base64-encode encrypted blob
+
+        More info on KMS encrypt API:
+        https://docs.aws.amazon.com/kms/latest/APIReference/API_encrypt.html
+    '''
+    try:
+        ret = kms.encrypt(KeyId=key, Plaintext=message)
+        encrypted_data = base64.encodestring(ret.get('CiphertextBlob'))
+    except Exception as e:
+        # returns http 500 back to user and log error details in Cloudwatch Logs
+        raise Exception("Unable to encrypt data: ", e)
+
+    return encrypted_data
+
+
+def post(event, context):
+
+    try:
+        key_id = os.environ['keyId']
+        message = event['body']
+        if message is None:
+            raise ValueError
+    except KeyError:
+        raise Exception("KMS Key ID not found.")
+    except ValueError:
+        return bad_request
+
+    encrypted_message = encrypt(key_id, message)
+    response = {'data': encrypted_message}
+
+    return {
+        'statusCode': 200,
+        'headers': {
+            'Content-Type': 'application/json'
+        },
+        'body': json.dumps(response)
+    }
diff --git a/goformation/test/yaml/sam-official-samples/encryption_proxy/template.yaml b/goformation/test/yaml/sam-official-samples/encryption_proxy/template.yaml
new file mode 100644
index 0000000000..f0f584e8d8
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/encryption_proxy/template.yaml
@@ -0,0 +1,104 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: 'AWS::Serverless-2016-10-31'
+Description: >
+
+    This SAM example creates the following resources:
+
+      Encryption Proxy: Comprised of Encryption and Decryption Lambda functions + IAM Roles
+      KMS Key: KMS Key and encrypt/decrypt permission for each IAM Role separately
+
+    Last Modified: March 22nd November 2018
+    Author: Heitor Lessa <lessa@amazon.com>
+
+Outputs:
+
+    EncryptURL:
+      Description: "Encrypt endpoint URL for Stage environment"
+      Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Stage/encrypt"
+
+    DecryptURL:
+      Description: "Decrypt endpoint URL for Stage environment"
+      Value: !Sub "https://${ServerlessRestApi}.execute-api.${AWS::Region}.amazonaws.com/Stage/decrypt"
+
+    EncryptFunction:
+      Description: "Encryption Lambda Function ARN"
+      Value: !GetAtt EncryptionFunction.Arn
+
+    DecryptFunction:
+      Description: "Decryption Lambda Function ARN"
+      Value: !GetAtt DecryptionFunction.Arn
+
+Resources:
+    EncryptionDecryptionKey:
+      Type: AWS::KMS::Key
+      Properties:
+        Description: "Encryption and Decryption key for Lambda"
+        KeyPolicy:
+          Id: "LambdaEncDec"
+          Version: "2012-10-17"
+          Statement:
+            -
+              Sid: "Allow administration of the key"
+              Effect: "Allow"
+              Action:
+                - "kms:Create*"
+                - "kms:Describe*"
+                - "kms:Enable*"
+                - "kms:List*"
+                - "kms:Put*"
+                - "kms:Update*"
+                - "kms:Revoke*"
+                - "kms:Disable*"
+                - "kms:Get*"
+                - "kms:Delete*"
+                - "kms:ScheduleKeyDeletion"
+                - "kms:CancelKeyDeletion"
+              Principal:
+                AWS: !Ref AWS::AccountId
+              Resource: '*'
+            -
+              Sid: "Allow Encryption Service to use this key"
+              Effect: "Allow"
+              Action:
+                - "kms:Encrypt"
+              Principal:
+                AWS: !GetAtt EncryptionFunctionRole.Arn
+              Resource: '*'
+            -
+              Sid: "Allow Decryption Service to use this key"
+              Effect: "Allow"
+              Action:
+                - "kms:Decrypt"
+              Principal:
+                AWS: !GetAtt DecryptionFunctionRole.Arn
+              Resource: '*'
+
+
+    EncryptionFunction:
+      Type: 'AWS::Serverless::Function'
+      Properties:
+        Handler: encryption.post
+        Runtime: python2.7
+        CodeUri: src/
+        Events:
+          encryptAction:
+            Type: Api
+            Properties:
+              Path: /encrypt
+              Method: post
+        Environment:
+          Variables:
+            keyId: !Ref EncryptionDecryptionKey
+
+    DecryptionFunction:
+      Type: 'AWS::Serverless::Function'
+      Properties:
+        Handler: decryption.post
+        Runtime: python2.7
+        CodeUri: src/
+        Events:
+          decryptAction:
+            Type: Api
+            Properties:
+              Path: /decrypt
+              Method: post
\ No newline at end of file
diff --git a/goformation/test/yaml/sam-official-samples/function.yaml b/goformation/test/yaml/sam-official-samples/function.yaml
new file mode 100644
index 0000000000..0b89c7a52e
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/function.yaml
@@ -0,0 +1,29 @@
+Transform: AWS::Serverless-2016-10-31
+Resources:
+  TestFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: file.method
+      Runtime: nodejs
+      CodeUri: s3://bucket/path/key
+      FunctionName: functionname
+      Description: description
+      MemorySize: 128
+      Timeout: 30
+      Role: aws::arn::123456789012::some/role
+      Policies: 
+        - AmazonDynamoDBFullAccess
+      Environment:
+        Variables:
+          NAME: VALUE
+      VpcConfig:
+        SecurityGroupIds:
+          - String
+        SubnetIds:
+          - String
+      Events:
+        TestApi:
+          Type: Api
+          Properties:
+            Path: /testing
+            Method: any
\ No newline at end of file
diff --git a/goformation/test/yaml/sam-official-samples/hello_world/index.js b/goformation/test/yaml/sam-official-samples/hello_world/index.js
new file mode 100644
index 0000000000..300dd0e6d0
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/hello_world/index.js
@@ -0,0 +1,6 @@
+'use strict';
+console.log('Loading function');
+
+exports.handler = (event, context, callback) => {
+    callback(null, 'Hello World!');
+};
\ No newline at end of file
diff --git a/goformation/test/yaml/sam-official-samples/hello_world/template.yaml b/goformation/test/yaml/sam-official-samples/hello_world/template.yaml
new file mode 100644
index 0000000000..d0f01b66f5
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/hello_world/template.yaml
@@ -0,0 +1,17 @@
+AWSTemplateFormatVersion : '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: A hello world application.
+Parameters:
+  Bucket:
+    Type: String
+  CodeZipKey:
+    Type: String
+Resources:
+  HelloWorldFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: index.handler
+      Runtime: nodejs4.3
+      CodeUri: 
+        Bucket: !Bucket
+        Key: !CodeZipKey
diff --git a/goformation/test/yaml/sam-official-samples/inline_swagger/index.js b/goformation/test/yaml/sam-official-samples/inline_swagger/index.js
new file mode 100644
index 0000000000..7f7a6018dd
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/inline_swagger/index.js
@@ -0,0 +1,6 @@
+exports.handler = function(event, context, callback) {
+    callback(null, {
+        "statusCode": 200,
+        "body": "hello world" 
+    });
+}
diff --git a/goformation/test/yaml/sam-official-samples/inline_swagger/template.yaml b/goformation/test/yaml/sam-official-samples/inline_swagger/template.yaml
new file mode 100644
index 0000000000..ca29ec3acf
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/inline_swagger/template.yaml
@@ -0,0 +1,41 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: Simple API Endpoint configured using Swagger specified inline and backed by a Lambda function
+Resources:
+  MyApi:
+    Type: AWS::Serverless::Api
+    Properties:
+      StageName: prod
+      DefinitionBody:
+        swagger: 2.0
+        info:
+          title:
+            Ref: AWS::StackName
+        paths:
+          "/get":
+            get:
+              x-amazon-apigateway-integration:
+                httpMethod: POST
+                type: aws_proxy
+                uri:
+                  Fn::Sub: arn:aws:apigateway:${AWS::Region}:lambda:path/2015-03-31/functions/${MyLambdaFunction.Arn}/invocations
+              responses: {}
+        swagger: '2.0'
+
+
+            
+  MyLambdaFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: index.handler
+      Runtime: nodejs10.x
+      CodeUri: s3://<bucket>/inline_swagger.zip
+      Events:
+        GetApi:
+          Type: Api
+          Properties:
+            Path: /get
+            Method: GET
+            RestApiId: 
+              Ref: MyApi
+
diff --git a/goformation/test/yaml/sam-official-samples/iot_backend/index.js b/goformation/test/yaml/sam-official-samples/iot_backend/index.js
new file mode 100644
index 0000000000..b18f84d411
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/iot_backend/index.js
@@ -0,0 +1,30 @@
+console.log('Loading function');
+
+var AWS = require('aws-sdk');
+var dynamo = new AWS.DynamoDB.DocumentClient();
+var table = process.env.TABLE_NAME;
+
+exports.handler = function(event, context, callback) {
+    //console.log('Received event:', JSON.stringify(event, null, 2));
+
+   var params = {
+    TableName:table,
+    Item:{
+        "id": event.id,
+        "thing": event.thing
+        }
+    };
+       
+    console.log("Adding a new IoT device...");
+    dynamo.put(params, function(err, data) {
+    if (err) {
+        console.error("Unable to add device. Error JSON:", JSON.stringify(err, null, 2));
+        callback(err);
+    } else {
+        console.log("Added device:", JSON.stringify(data, null, 2));
+        callback(null,'DynamoDB updated');
+    }
+    });
+
+    
+}
diff --git a/goformation/test/yaml/sam-official-samples/iot_backend/template.yaml b/goformation/test/yaml/sam-official-samples/iot_backend/template.yaml
new file mode 100644
index 0000000000..121364350c
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/iot_backend/template.yaml
@@ -0,0 +1,29 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: IoT -> Lambda -> DynamoDB
+Resources:
+  IoTFunction: 
+    Type: AWS::Serverless::Function
+    Properties: 
+      Handler: index.handler
+      Runtime: nodejs10.x
+      CodeUri: s3://<bucket>/iot_backend.zip
+      Policies: AmazonDynamoDBFullAccess
+      Environment: 
+        Variables: 
+          TABLE_NAME: 
+            Ref: Table
+      Events: 
+        IoT: 
+          Type: IoTRule
+          Properties: 
+            AwsIotSqlVersion: 2016-03-23
+            Sql: "SELECT * FROM 'iot2ddb'"
+  Table:
+    Type: AWS::Serverless::SimpleTable
+    Properties:
+      PrimaryKey:
+        Name: id
+        Type: String
+
+
diff --git a/goformation/test/yaml/sam-official-samples/s3_processor/index.js b/goformation/test/yaml/sam-official-samples/s3_processor/index.js
new file mode 100644
index 0000000000..ad412345b2
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/s3_processor/index.js
@@ -0,0 +1,26 @@
+'use strict';
+console.log('Loading function');
+
+let aws = require('aws-sdk');
+let s3 = new aws.S3({ apiVersion: '2006-03-01' });
+
+exports.handler = (event, context, callback) => {
+    // Get the object from the event and show its content type
+    const bucket = event.Records[0].s3.bucket.name;
+    const key = decodeURIComponent(event.Records[0].s3.object.key.replace(/\+/g, ' '));
+    const params = {
+        Bucket: bucket,
+        Key: key
+    };
+    s3.getObject(params, (err, data) => {
+        if (err) {
+            console.log(err);
+            const message = `Error getting object ${key} from bucket ${bucket}. Make sure they exist and your bucket is in the same region as this function.`;
+            console.log(message);
+            callback(message);
+        } else {
+            console.log('CONTENT TYPE:', data.ContentType);
+            callback(null, data.ContentType);
+        }
+    });
+};
\ No newline at end of file
diff --git a/goformation/test/yaml/sam-official-samples/s3_processor/template.yaml b/goformation/test/yaml/sam-official-samples/s3_processor/template.yaml
new file mode 100644
index 0000000000..56c75e4832
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/s3_processor/template.yaml
@@ -0,0 +1,24 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: A function is triggered off an upload to a bucket. It logs the content type of the uploaded object.
+Resources:
+  ProcessorFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: index.handler
+      Runtime: nodejs10.x
+      CodeUri: src/
+      Policies: AmazonS3ReadOnlyAccess
+      Events:
+        PhotoUpload:
+          Type: S3
+          Properties:
+            Bucket: !Ref Bucket
+            Events: s3:ObjectCreated:*
+  Bucket:
+    Type: AWS::S3::Bucket
+
+Outputs:
+    S3Bucket:
+      Description: "S3 Bucket name that will trigger a Lambda function upon new objects insertion"
+      Value: !Ref Bucket
\ No newline at end of file
diff --git a/goformation/test/yaml/sam-official-samples/schedule/index.js b/goformation/test/yaml/sam-official-samples/schedule/index.js
new file mode 100644
index 0000000000..d77afb94bb
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/schedule/index.js
@@ -0,0 +1,7 @@
+'use strict';
+console.log('Loading function');
+
+exports.handler = (event, context, callback) => {
+    console.log("Invocation with event =", event);
+    callback(null, 'Everything is ok!');
+};
\ No newline at end of file
diff --git a/goformation/test/yaml/sam-official-samples/schedule/template.yaml b/goformation/test/yaml/sam-official-samples/schedule/template.yaml
new file mode 100644
index 0000000000..abfcb6d772
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/schedule/template.yaml
@@ -0,0 +1,15 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: A function triggered on a timer.
+Resources:
+  ScheduledFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: index.handler
+      Runtime: nodejs10.x
+      CodeUri: s3://<bucket>/schedule.zip
+      Events:
+        Timer:
+          Type: Schedule
+          Properties:
+            Schedule: rate(5 minutes)
\ No newline at end of file
diff --git a/goformation/test/yaml/sam-official-samples/stream_processor/index.js b/goformation/test/yaml/sam-official-samples/stream_processor/index.js
new file mode 100644
index 0000000000..ea051babc8
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/stream_processor/index.js
@@ -0,0 +1,11 @@
+'use strict';
+console.log('Loading function');
+
+exports.handler = (event, context, callback) => {
+    event.Records.forEach((record) => {
+        // Kinesis data is base64 encoded so decode here
+        const payload = new Buffer(record.kinesis.data, 'base64').toString('ascii');
+        console.log('Decoded payload:', payload);
+    });
+    callback(null, `Successfully processed ${event.Records.length} records.`);
+};
\ No newline at end of file
diff --git a/goformation/test/yaml/sam-official-samples/stream_processor/template.yaml b/goformation/test/yaml/sam-official-samples/stream_processor/template.yaml
new file mode 100644
index 0000000000..bb44d4ae92
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/stream_processor/template.yaml
@@ -0,0 +1,21 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: A function that processes data from a Kinesis stream.
+Resources:
+  StreamProcessor:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: index.handler
+      Runtime: nodejs10.x
+      CodeUri: s3://<bucket>/stream_processor.zip
+      Events:
+        Stream:
+          Type: Kinesis
+          Properties:
+            Stream: !GetAtt Stream.Arn
+            StartingPosition: TRIM_HORIZON
+
+  Stream:
+    Type: AWS::Kinesis::Stream
+    Properties:
+      ShardCount: 1
diff --git a/goformation/test/yaml/sam-official-samples/templates/basic.yaml b/goformation/test/yaml/sam-official-samples/templates/basic.yaml
new file mode 100644
index 0000000000..5ffbcd8bf0
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/templates/basic.yaml
@@ -0,0 +1,13 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: Alexa Skill https://developer.amazon.com/alexa-skills-kit
+Resources:
+  AlexaSkillFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      CodeUri: s3://<bucket>/alexa_skill.zip
+      Handler: index.handler
+      Runtime: nodejs10.x
+      Events:
+        AlexaSkillEvent:
+          Type: AlexaSkill
\ No newline at end of file
diff --git a/goformation/test/yaml/sam-official-samples/templates/intrinsic.yaml b/goformation/test/yaml/sam-official-samples/templates/intrinsic.yaml
new file mode 100644
index 0000000000..caf18af6d6
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/templates/intrinsic.yaml
@@ -0,0 +1,29 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: Alexa Skill https://developer.amazon.com/alexa-skills-kit
+Resources:
+  AlexaSkillFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      CodeUri: s3://<bucket>/alexa_skill.zip
+      Handler: index.handler
+      Runtime: !Ref InlineParameter
+      Environment: 
+        Variables:
+          BASE_64_SIMPLE: !Base64 "123456"
+          # TODO More Base64
+          # TODO Conditionals
+          # TODO FindInMap
+          GET_ATT: 
+            "Fn::GetAtt": [ "SomeResource", "AndParameter" ]
+          # TODO ImportValue
+          # TODO Join
+          # TODO Select
+          # TODO Split
+          SUB_SIMPLE: !Sub "Building with ${AWS::Region} parameters and ${SomeCustom} ones"
+          SUB_FULL: 
+            "Fn::Sub":
+              - "Some full text with ${AWS::Region} parameters and ${CustomParams}"
+              - { "CustomParams": "${SomeOtherResource}" }
+
+
diff --git a/goformation/test/yaml/sam-official-samples/templates/wrong.yaml b/goformation/test/yaml/sam-official-samples/templates/wrong.yaml
new file mode 100644
index 0000000000..09bd9b9cc9
--- /dev/null
+++ b/goformation/test/yaml/sam-official-samples/templates/wrong.yaml
@@ -0,0 +1,12 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: Alexa Skill https://developer.amazon.com/alexa-skills-kit
+Resources:
+  AlexaSkillFunction:
+    Type: AWS::Serverless::Function
+    Properties:
+      Handler: index.handler
+      Runtime: nodejs10.x
+      Events:
+        AlexaSkillEvent:
+          Type: AlexaSkill
\ No newline at end of file
diff --git a/goformation/test/yaml/transform-multiple.yaml b/goformation/test/yaml/transform-multiple.yaml
new file mode 100644
index 0000000000..479b8d627d
--- /dev/null
+++ b/goformation/test/yaml/transform-multiple.yaml
@@ -0,0 +1,11 @@
+AWSTemplateFormatVersion: 2010-09-09
+
+Resources:
+  ExampleTopic:
+    Type: AWS::SNS::Topic
+    Properties:
+      TopicName: example
+
+Transform:
+  - FirstMacro
+  - SecondMacro
diff --git a/goformation/test/yaml/transform-single.yaml b/goformation/test/yaml/transform-single.yaml
new file mode 100644
index 0000000000..33d280d3df
--- /dev/null
+++ b/goformation/test/yaml/transform-single.yaml
@@ -0,0 +1,9 @@
+AWSTemplateFormatVersion: 2010-09-09
+
+Resources:
+  ExampleTopic:
+    Type: AWS::SNS::Topic
+    Properties:
+      TopicName: example
+
+Transform: MyTranformMacro
diff --git a/goformation/test/yaml/validation-errors/no-resources-section.yaml b/goformation/test/yaml/validation-errors/no-resources-section.yaml
new file mode 100644
index 0000000000..ee4bec3f97
--- /dev/null
+++ b/goformation/test/yaml/validation-errors/no-resources-section.yaml
@@ -0,0 +1,2 @@
+AWSTemplateFormatVersion: 2010-09-09
+Transform: AWS::Serverless-2016-10-31
\ No newline at end of file
diff --git a/goformation/test/yaml/yaml-intrinsic-tags.yaml b/goformation/test/yaml/yaml-intrinsic-tags.yaml
new file mode 100644
index 0000000000..a2cf75a06a
--- /dev/null
+++ b/goformation/test/yaml/yaml-intrinsic-tags.yaml
@@ -0,0 +1,15 @@
+AWSTemplateFormatVersion: '2010-09-09'
+Transform: AWS::Serverless-2016-10-31
+Description: SAM template for testing intrinsic functions with YAML tags
+Parameters:
+  TimeoutParam:
+    Type: Number
+    Default: 10
+Resources:
+  IntrinsicFunctionTest:
+    Type: AWS::Serverless::Function
+    Properties:
+      Runtime: !Sub "${ParamNotExists}4.3"
+      Timeout: !Ref TimeoutParam
+      FunctionName: !Base64
+        Ref: AWS::Region
diff --git a/pkg/actions/nodegroup/upgrade.go b/pkg/actions/nodegroup/upgrade.go
index b36b34a04b..9b55a9d380 100644
--- a/pkg/actions/nodegroup/upgrade.go
+++ b/pkg/actions/nodegroup/upgrade.go
@@ -18,11 +18,11 @@ import (
 	"github.com/kris-nova/logger"
 	"github.com/pkg/errors"
 
-	"github.com/weaveworks/goformation/v4"
-	"github.com/weaveworks/goformation/v4/cloudformation"
-	gfnec2 "github.com/weaveworks/goformation/v4/cloudformation/ec2"
-	gfneks "github.com/weaveworks/goformation/v4/cloudformation/eks"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
+	"goformation/v4"
+	"goformation/v4/cloudformation"
+	gfnec2 "goformation/v4/cloudformation/ec2"
+	gfneks "goformation/v4/cloudformation/eks"
+	gfnt "goformation/v4/cloudformation/types"
 
 	"github.com/weaveworks/eksctl/pkg/ami"
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
diff --git a/pkg/automode/cluster_role_manager.go b/pkg/automode/cluster_role_manager.go
index 08020d654a..e12996e2f0 100644
--- a/pkg/automode/cluster_role_manager.go
+++ b/pkg/automode/cluster_role_manager.go
@@ -11,7 +11,7 @@ import (
 
 	"github.com/kris-nova/logger"
 
-	"github.com/weaveworks/goformation/v4"
+	"goformation/v4"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/awsapi"
diff --git a/pkg/cfn/builder/access_entry.go b/pkg/cfn/builder/access_entry.go
index 05e58113bb..c75c0d65c9 100644
--- a/pkg/cfn/builder/access_entry.go
+++ b/pkg/cfn/builder/access_entry.go
@@ -1,8 +1,8 @@
 package builder
 
 import (
-	gfneks "github.com/weaveworks/goformation/v4/cloudformation/eks"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
+	gfneks "goformation/v4/cloudformation/eks"
+	gfnt "goformation/v4/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 )
diff --git a/pkg/cfn/builder/api.go b/pkg/cfn/builder/api.go
index f2874d1e50..ad0446308c 100644
--- a/pkg/cfn/builder/api.go
+++ b/pkg/cfn/builder/api.go
@@ -4,10 +4,11 @@ import (
 	"fmt"
 	"reflect"
 
+	gfn "goformation/v4/cloudformation"
+	gfncfn "goformation/v4/cloudformation/cloudformation"
+	gfnt "goformation/v4/cloudformation/types"
+
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
-	gfn "github.com/weaveworks/goformation/v4/cloudformation"
-	gfncfn "github.com/weaveworks/goformation/v4/cloudformation/cloudformation"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
 
 	"github.com/weaveworks/eksctl/pkg/cfn/outputs"
 )
diff --git a/pkg/cfn/builder/auto_mode.go b/pkg/cfn/builder/auto_mode.go
index 23a0cdb583..be85945631 100644
--- a/pkg/cfn/builder/auto_mode.go
+++ b/pkg/cfn/builder/auto_mode.go
@@ -6,10 +6,11 @@ import (
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 
+	"goformation/v4"
+	gfn "goformation/v4/cloudformation"
+	gfnt "goformation/v4/cloudformation/types"
+
 	cfntypes "github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
-	"github.com/weaveworks/goformation/v4"
-	gfn "github.com/weaveworks/goformation/v4/cloudformation"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
 )
 
 const (
diff --git a/pkg/cfn/builder/block_device_mapping.go b/pkg/cfn/builder/block_device_mapping.go
index 897c4ce185..c065e16c4f 100644
--- a/pkg/cfn/builder/block_device_mapping.go
+++ b/pkg/cfn/builder/block_device_mapping.go
@@ -1,8 +1,8 @@
 package builder
 
 import (
-	gfnec2 "github.com/weaveworks/goformation/v4/cloudformation/ec2"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
+	gfnec2 "goformation/v4/cloudformation/ec2"
+	gfnt "goformation/v4/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 )
diff --git a/pkg/cfn/builder/builder_suite_test.go b/pkg/cfn/builder/builder_suite_test.go
index e5fa447700..a31adecaca 100644
--- a/pkg/cfn/builder/builder_suite_test.go
+++ b/pkg/cfn/builder/builder_suite_test.go
@@ -6,10 +6,11 @@ import (
 
 	. "github.com/onsi/gomega"
 
+	gfnt "goformation/v4/cloudformation/types"
+
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/testutils"
 	"github.com/weaveworks/eksctl/pkg/utils/ipnet"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
 )
 
 func TestCfnBuilder(t *testing.T) {
diff --git a/pkg/cfn/builder/cloudwatch_logging.go b/pkg/cfn/builder/cloudwatch_logging.go
index de48c2d3ae..3ac990014f 100644
--- a/pkg/cfn/builder/cloudwatch_logging.go
+++ b/pkg/cfn/builder/cloudwatch_logging.go
@@ -1,8 +1,8 @@
 package builder
 
 import (
-	gfneks "github.com/weaveworks/goformation/v4/cloudformation/eks"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
+	gfneks "goformation/v4/cloudformation/eks"
+	gfnt "goformation/v4/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 )
diff --git a/pkg/cfn/builder/cluster.go b/pkg/cfn/builder/cluster.go
index 848355f4e0..3b9a0af7f8 100644
--- a/pkg/cfn/builder/cluster.go
+++ b/pkg/cfn/builder/cluster.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/tidwall/gjson"
 
-	gfn "github.com/weaveworks/goformation/v4/cloudformation"
-	gfncfn "github.com/weaveworks/goformation/v4/cloudformation/cloudformation"
-	gfnec2 "github.com/weaveworks/goformation/v4/cloudformation/ec2"
-	gfneks "github.com/weaveworks/goformation/v4/cloudformation/eks"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
+	gfn "goformation/v4/cloudformation"
+	gfncfn "goformation/v4/cloudformation/cloudformation"
+	gfnec2 "goformation/v4/cloudformation/ec2"
+	gfneks "goformation/v4/cloudformation/eks"
+	gfnt "goformation/v4/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/awsapi"
diff --git a/pkg/cfn/builder/export_test.go b/pkg/cfn/builder/export_test.go
index 919a562c76..d43e8ddcaa 100644
--- a/pkg/cfn/builder/export_test.go
+++ b/pkg/cfn/builder/export_test.go
@@ -1,7 +1,7 @@
 package builder
 
 import (
-	gfn "github.com/weaveworks/goformation/v4/cloudformation"
+	gfn "goformation/v4/cloudformation"
 )
 
 func NewRS() *resourceSet {
diff --git a/pkg/cfn/builder/fargate.go b/pkg/cfn/builder/fargate.go
index 0b77704008..865fb9a6d7 100644
--- a/pkg/cfn/builder/fargate.go
+++ b/pkg/cfn/builder/fargate.go
@@ -3,10 +3,11 @@ package builder
 import (
 	"fmt"
 
+	gfniam "goformation/v4/cloudformation/iam"
+	gfnt "goformation/v4/cloudformation/types"
+
 	"github.com/aws/aws-sdk-go-v2/aws/arn"
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
-	gfniam "github.com/weaveworks/goformation/v4/cloudformation/iam"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/cfn/outputs"
diff --git a/pkg/cfn/builder/iam.go b/pkg/cfn/builder/iam.go
index 41f5ceb8f7..3752e951d1 100644
--- a/pkg/cfn/builder/iam.go
+++ b/pkg/cfn/builder/iam.go
@@ -8,9 +8,9 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
 	"github.com/kris-nova/logger"
 
-	gfniam "github.com/weaveworks/goformation/v4/cloudformation/iam"
-	gfnrolesanywhere "github.com/weaveworks/goformation/v4/cloudformation/rolesanywhere"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
+	gfniam "goformation/v4/cloudformation/iam"
+	gfnrolesanywhere "goformation/v4/cloudformation/rolesanywhere"
+	gfnt "goformation/v4/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/cfn/outputs"
diff --git a/pkg/cfn/builder/iam_helper.go b/pkg/cfn/builder/iam_helper.go
index 761c7e22a2..3b21a457e8 100644
--- a/pkg/cfn/builder/iam_helper.go
+++ b/pkg/cfn/builder/iam_helper.go
@@ -4,12 +4,13 @@ import (
 	"fmt"
 	"strings"
 
+	gfn "goformation/v4/cloudformation"
+	gfniam "goformation/v4/cloudformation/iam"
+	gfnt "goformation/v4/cloudformation/types"
+
 	"github.com/aws/aws-sdk-go-v2/aws/arn"
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	cft "github.com/weaveworks/eksctl/pkg/cfn/template"
-	gfn "github.com/weaveworks/goformation/v4/cloudformation"
-	gfniam "github.com/weaveworks/goformation/v4/cloudformation/iam"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
 	"k8s.io/apimachinery/pkg/util/sets"
 )
 
diff --git a/pkg/cfn/builder/karpenter.go b/pkg/cfn/builder/karpenter.go
index 5a42218aba..4207238703 100644
--- a/pkg/cfn/builder/karpenter.go
+++ b/pkg/cfn/builder/karpenter.go
@@ -3,12 +3,13 @@ package builder
 import (
 	"fmt"
 
+	gfn "goformation/v4/cloudformation"
+	gfnevents "goformation/v4/cloudformation/events"
+	gfniam "goformation/v4/cloudformation/iam"
+	gfnsqs "goformation/v4/cloudformation/sqs"
+	gfnt "goformation/v4/cloudformation/types"
+
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
-	gfn "github.com/weaveworks/goformation/v4/cloudformation"
-	gfnevents "github.com/weaveworks/goformation/v4/cloudformation/events"
-	gfniam "github.com/weaveworks/goformation/v4/cloudformation/iam"
-	gfnsqs "github.com/weaveworks/goformation/v4/cloudformation/sqs"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
 	"k8s.io/apimachinery/pkg/util/sets"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
diff --git a/pkg/cfn/builder/managed_launch_template.go b/pkg/cfn/builder/managed_launch_template.go
index de2d972b77..2f1f4017e0 100644
--- a/pkg/cfn/builder/managed_launch_template.go
+++ b/pkg/cfn/builder/managed_launch_template.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/weaveworks/goformation/v4/cloudformation/cloudformation"
-	gfnec2 "github.com/weaveworks/goformation/v4/cloudformation/ec2"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
+	"goformation/v4/cloudformation/cloudformation"
+	gfnec2 "goformation/v4/cloudformation/ec2"
+	gfnt "goformation/v4/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 )
diff --git a/pkg/cfn/builder/managed_launch_template_test.go b/pkg/cfn/builder/managed_launch_template_test.go
index a81453829a..da496486b4 100644
--- a/pkg/cfn/builder/managed_launch_template_test.go
+++ b/pkg/cfn/builder/managed_launch_template_test.go
@@ -20,8 +20,8 @@ import (
 
 	"github.com/weaveworks/eksctl/pkg/cfn/builder"
 
-	"github.com/weaveworks/goformation/v4"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
+	"goformation/v4"
+	gfnt "goformation/v4/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/nodebootstrap/fakes"
diff --git a/pkg/cfn/builder/managed_nodegroup.go b/pkg/cfn/builder/managed_nodegroup.go
index 094cfa0893..3bbd438246 100644
--- a/pkg/cfn/builder/managed_nodegroup.go
+++ b/pkg/cfn/builder/managed_nodegroup.go
@@ -5,11 +5,12 @@ import (
 	"errors"
 	"fmt"
 
+	gfnec2 "goformation/v4/cloudformation/ec2"
+	gfneks "goformation/v4/cloudformation/eks"
+	gfnt "goformation/v4/cloudformation/types"
+
 	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 	ekstypes "github.com/aws/aws-sdk-go-v2/service/eks/types"
-	gfnec2 "github.com/weaveworks/goformation/v4/cloudformation/ec2"
-	gfneks "github.com/weaveworks/goformation/v4/cloudformation/eks"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
 	corev1 "k8s.io/api/core/v1"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
diff --git a/pkg/cfn/builder/managed_nodegroup_ami_type_test.go b/pkg/cfn/builder/managed_nodegroup_ami_type_test.go
index 3839b44939..926f7f28fb 100644
--- a/pkg/cfn/builder/managed_nodegroup_ami_type_test.go
+++ b/pkg/cfn/builder/managed_nodegroup_ami_type_test.go
@@ -14,8 +14,8 @@ import (
 
 	"github.com/weaveworks/eksctl/pkg/cfn/builder"
 
-	"github.com/weaveworks/goformation/v4"
-	gfneks "github.com/weaveworks/goformation/v4/cloudformation/eks"
+	"goformation/v4"
+	gfneks "goformation/v4/cloudformation/eks"
 )
 
 type amiTypeEntry struct {
diff --git a/pkg/cfn/builder/managed_nodegroup_test.go b/pkg/cfn/builder/managed_nodegroup_test.go
index b0eefe8340..c43c54ed62 100644
--- a/pkg/cfn/builder/managed_nodegroup_test.go
+++ b/pkg/cfn/builder/managed_nodegroup_test.go
@@ -6,6 +6,10 @@ import (
 	"fmt"
 	"testing"
 
+	"goformation/v4"
+	gfneks "goformation/v4/cloudformation/eks"
+	gfnt "goformation/v4/cloudformation/types"
+
 	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 	"github.com/stretchr/testify/require"
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
@@ -15,9 +19,6 @@ import (
 	"github.com/weaveworks/eksctl/pkg/nodebootstrap/fakes"
 	"github.com/weaveworks/eksctl/pkg/testutils/mockprovider"
 	vpcfakes "github.com/weaveworks/eksctl/pkg/vpc/fakes"
-	"github.com/weaveworks/goformation/v4"
-	gfneks "github.com/weaveworks/goformation/v4/cloudformation/eks"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
 )
 
 func TestManagedPolicyResources(t *testing.T) {
diff --git a/pkg/cfn/builder/network_interfaces.go b/pkg/cfn/builder/network_interfaces.go
index 4836bffa50..383519c321 100644
--- a/pkg/cfn/builder/network_interfaces.go
+++ b/pkg/cfn/builder/network_interfaces.go
@@ -9,8 +9,8 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 
-	gfnec2 "github.com/weaveworks/goformation/v4/cloudformation/ec2"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
+	gfnec2 "goformation/v4/cloudformation/ec2"
+	gfnt "goformation/v4/cloudformation/types"
 
 	"github.com/weaveworks/eksctl/pkg/awsapi"
 )
diff --git a/pkg/cfn/builder/nodegroup.go b/pkg/cfn/builder/nodegroup.go
index 892e513ba0..916ada4de1 100644
--- a/pkg/cfn/builder/nodegroup.go
+++ b/pkg/cfn/builder/nodegroup.go
@@ -10,11 +10,11 @@ import (
 
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
 
-	gfn "github.com/weaveworks/goformation/v4/cloudformation"
-	gfncfn "github.com/weaveworks/goformation/v4/cloudformation/cloudformation"
-	gfnec2 "github.com/weaveworks/goformation/v4/cloudformation/ec2"
-	gfneks "github.com/weaveworks/goformation/v4/cloudformation/eks"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
+	gfn "goformation/v4/cloudformation"
+	gfncfn "goformation/v4/cloudformation/cloudformation"
+	gfnec2 "goformation/v4/cloudformation/ec2"
+	gfneks "goformation/v4/cloudformation/eks"
+	gfnt "goformation/v4/cloudformation/types"
 
 	"github.com/kris-nova/logger"
 
diff --git a/pkg/cfn/builder/nodegroup_subnets_test.go b/pkg/cfn/builder/nodegroup_subnets_test.go
index 75b13a1a6a..a174695544 100644
--- a/pkg/cfn/builder/nodegroup_subnets_test.go
+++ b/pkg/cfn/builder/nodegroup_subnets_test.go
@@ -17,7 +17,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
+	gfnt "goformation/v4/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/cfn/builder"
diff --git a/pkg/cfn/builder/nodegroup_test.go b/pkg/cfn/builder/nodegroup_test.go
index 42f8df1155..7ab2913ff6 100644
--- a/pkg/cfn/builder/nodegroup_test.go
+++ b/pkg/cfn/builder/nodegroup_test.go
@@ -14,9 +14,10 @@ import (
 
 	"github.com/weaveworks/eksctl/pkg/testutils/mockprovider"
 
+	gfnt "goformation/v4/cloudformation/types"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/cfn/builder"
diff --git a/pkg/cfn/builder/outputs.go b/pkg/cfn/builder/outputs.go
index 12db73f638..51798285a8 100644
--- a/pkg/cfn/builder/outputs.go
+++ b/pkg/cfn/builder/outputs.go
@@ -1,10 +1,11 @@
 package builder
 
 import (
+	gfnt "goformation/v4/cloudformation/types"
+
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
 	"github.com/kris-nova/logger"
 	"github.com/weaveworks/eksctl/pkg/cfn/outputs"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
 )
 
 func (r *resourceSet) defineOutput(name string, value interface{}, export bool, fn outputs.Collector) {
diff --git a/pkg/cfn/builder/partition.go b/pkg/cfn/builder/partition.go
index 3a650557ea..83bbe3bea3 100644
--- a/pkg/cfn/builder/partition.go
+++ b/pkg/cfn/builder/partition.go
@@ -3,7 +3,7 @@ package builder
 import (
 	"fmt"
 
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
+	gfnt "goformation/v4/cloudformation/types"
 )
 
 const servicePrincipalPartitionMapName = "ServicePrincipalPartitionMap"
diff --git a/pkg/cfn/builder/statement.go b/pkg/cfn/builder/statement.go
index ad01b49c83..417a08c7f1 100644
--- a/pkg/cfn/builder/statement.go
+++ b/pkg/cfn/builder/statement.go
@@ -1,7 +1,7 @@
 package builder
 
 import (
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
+	gfnt "goformation/v4/cloudformation/types"
 
 	cft "github.com/weaveworks/eksctl/pkg/cfn/template"
 )
diff --git a/pkg/cfn/builder/vpc.go b/pkg/cfn/builder/vpc.go
index 05f4268fe4..bea7c84ee8 100644
--- a/pkg/cfn/builder/vpc.go
+++ b/pkg/cfn/builder/vpc.go
@@ -5,9 +5,9 @@ import (
 	"math"
 	"strings"
 
-	gfncfn "github.com/weaveworks/goformation/v4/cloudformation/cloudformation"
-	gfnec2 "github.com/weaveworks/goformation/v4/cloudformation/ec2"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
+	gfncfn "goformation/v4/cloudformation/cloudformation"
+	gfnec2 "goformation/v4/cloudformation/ec2"
+	gfnt "goformation/v4/cloudformation/types"
 
 	"github.com/weaveworks/eksctl/pkg/utils/ipnet"
 )
diff --git a/pkg/cfn/builder/vpc_endpoint.go b/pkg/cfn/builder/vpc_endpoint.go
index 3563474c22..b5739f24bb 100644
--- a/pkg/cfn/builder/vpc_endpoint.go
+++ b/pkg/cfn/builder/vpc_endpoint.go
@@ -15,8 +15,8 @@ import (
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/awsapi"
 
-	gfnec2 "github.com/weaveworks/goformation/v4/cloudformation/ec2"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
+	gfnec2 "goformation/v4/cloudformation/ec2"
+	gfnt "goformation/v4/cloudformation/types"
 )
 
 // A VPCEndpointResourceSet holds the resources required for VPC endpoints.
diff --git a/pkg/cfn/builder/vpc_endpoint_test.go b/pkg/cfn/builder/vpc_endpoint_test.go
index 4d222b89f1..4aa5aa9e0b 100644
--- a/pkg/cfn/builder/vpc_endpoint_test.go
+++ b/pkg/cfn/builder/vpc_endpoint_test.go
@@ -18,8 +18,8 @@ import (
 	. "github.com/onsi/gomega"
 	"github.com/stretchr/testify/mock"
 
-	gfnec2 "github.com/weaveworks/goformation/v4/cloudformation/ec2"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
+	gfnec2 "goformation/v4/cloudformation/ec2"
+	gfnt "goformation/v4/cloudformation/types"
 
 	"github.com/weaveworks/eksctl/pkg/cfn/builder"
 
diff --git a/pkg/cfn/builder/vpc_existing.go b/pkg/cfn/builder/vpc_existing.go
index 0e6d315078..2d2bf4f317 100644
--- a/pkg/cfn/builder/vpc_existing.go
+++ b/pkg/cfn/builder/vpc_existing.go
@@ -9,8 +9,9 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 
+	gfnt "goformation/v4/cloudformation/types"
+
 	"github.com/aws/aws-sdk-go-v2/aws"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/awsapi"
diff --git a/pkg/cfn/builder/vpc_existing_test.go b/pkg/cfn/builder/vpc_existing_test.go
index 180bf4cbc8..02284e40be 100644
--- a/pkg/cfn/builder/vpc_existing_test.go
+++ b/pkg/cfn/builder/vpc_existing_test.go
@@ -9,10 +9,11 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 
+	gfnt "goformation/v4/cloudformation/types"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/stretchr/testify/mock"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/cfn/builder"
diff --git a/pkg/cfn/builder/vpc_ipv4.go b/pkg/cfn/builder/vpc_ipv4.go
index 99fbb14e38..a5ff2cf528 100644
--- a/pkg/cfn/builder/vpc_ipv4.go
+++ b/pkg/cfn/builder/vpc_ipv4.go
@@ -8,9 +8,9 @@ import (
 
 	"github.com/weaveworks/eksctl/pkg/awsapi"
 
-	gfncfn "github.com/weaveworks/goformation/v4/cloudformation/cloudformation"
-	gfnec2 "github.com/weaveworks/goformation/v4/cloudformation/ec2"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
+	gfncfn "goformation/v4/cloudformation/cloudformation"
+	gfnec2 "goformation/v4/cloudformation/ec2"
+	gfnt "goformation/v4/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/cfn/outputs"
diff --git a/pkg/cfn/builder/vpc_ipv4_test.go b/pkg/cfn/builder/vpc_ipv4_test.go
index caf25aaf1b..7af54633e4 100644
--- a/pkg/cfn/builder/vpc_ipv4_test.go
+++ b/pkg/cfn/builder/vpc_ipv4_test.go
@@ -8,9 +8,10 @@ import (
 	"github.com/aws/aws-sdk-go-v2/service/ec2"
 	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 
+	gfnt "goformation/v4/cloudformation/types"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/cfn/builder"
diff --git a/pkg/cfn/builder/vpc_ipv6.go b/pkg/cfn/builder/vpc_ipv6.go
index b1606a73df..fd6918d765 100644
--- a/pkg/cfn/builder/vpc_ipv6.go
+++ b/pkg/cfn/builder/vpc_ipv6.go
@@ -6,9 +6,9 @@ import (
 
 	"github.com/weaveworks/eksctl/pkg/awsapi"
 
-	"github.com/weaveworks/goformation/v4/cloudformation/cloudformation"
-	gfnec2 "github.com/weaveworks/goformation/v4/cloudformation/ec2"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
+	"goformation/v4/cloudformation/cloudformation"
+	gfnec2 "goformation/v4/cloudformation/ec2"
+	gfnt "goformation/v4/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/cfn/outputs"
diff --git a/pkg/cfn/manager/compat.go b/pkg/cfn/manager/compat.go
index 40339edaac..7beb2217c8 100644
--- a/pkg/cfn/manager/compat.go
+++ b/pkg/cfn/manager/compat.go
@@ -4,10 +4,11 @@ import (
 	"context"
 	"fmt"
 
+	gfnt "goformation/v4/cloudformation/types"
+
 	"github.com/kris-nova/logger"
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/sjson"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
 
 	"github.com/weaveworks/eksctl/pkg/cfn/builder"
 	"github.com/weaveworks/eksctl/pkg/cfn/outputs"
diff --git a/pkg/cfn/manager/template.go b/pkg/cfn/manager/template.go
index 0ffd544d46..6f6adff9d4 100644
--- a/pkg/cfn/manager/template.go
+++ b/pkg/cfn/manager/template.go
@@ -4,9 +4,10 @@ import (
 	"context"
 	"fmt"
 
+	"goformation/v4"
+
 	"github.com/aws/aws-sdk-go-v2/aws"
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation"
-	"github.com/weaveworks/goformation/v4"
 )
 
 // GetStackTemplate gets the Cloudformation template for a stack
diff --git a/pkg/cfn/outputs/api.go b/pkg/cfn/outputs/api.go
index 6b65f0b950..377bc67be1 100644
--- a/pkg/cfn/outputs/api.go
+++ b/pkg/cfn/outputs/api.go
@@ -3,9 +3,10 @@ package outputs
 import (
 	"fmt"
 
+	gfn "goformation/v4/cloudformation"
+	gfnt "goformation/v4/cloudformation/types"
+
 	"github.com/aws/aws-sdk-go-v2/service/cloudformation/types"
-	gfn "github.com/weaveworks/goformation/v4/cloudformation"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 )
diff --git a/pkg/cfn/template/iam_helpers.go b/pkg/cfn/template/iam_helpers.go
index 6ca76e0f4c..8be3fc5cdd 100644
--- a/pkg/cfn/template/iam_helpers.go
+++ b/pkg/cfn/template/iam_helpers.go
@@ -1,8 +1,9 @@
 package template
 
 import (
+	gfn "goformation/v4/cloudformation/types"
+
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
-	gfn "github.com/weaveworks/goformation/v4/cloudformation/types"
 )
 
 // AttachPolicy attaches the specified policy document
diff --git a/pkg/vpc/fakes/fake_vpc_importer.go b/pkg/vpc/fakes/fake_vpc_importer.go
index 5ca7bdb309..ca98d525e9 100644
--- a/pkg/vpc/fakes/fake_vpc_importer.go
+++ b/pkg/vpc/fakes/fake_vpc_importer.go
@@ -2,10 +2,10 @@
 package fakes
 
 import (
+	"goformation/v4/cloudformation/types"
 	"sync"
 
 	"github.com/weaveworks/eksctl/pkg/vpc"
-	"github.com/weaveworks/goformation/v4/cloudformation/types"
 )
 
 type FakeImporter struct {
diff --git a/pkg/vpc/importer.go b/pkg/vpc/importer.go
index eb12ff3bd1..c8040facdb 100644
--- a/pkg/vpc/importer.go
+++ b/pkg/vpc/importer.go
@@ -3,7 +3,7 @@ package vpc
 import (
 	"fmt"
 
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
+	gfnt "goformation/v4/cloudformation/types"
 
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/cfn/outputs"
diff --git a/pkg/vpc/importer_test.go b/pkg/vpc/importer_test.go
index 0e5bce95ad..446ed9af47 100644
--- a/pkg/vpc/importer_test.go
+++ b/pkg/vpc/importer_test.go
@@ -1,11 +1,12 @@
 package vpc
 
 import (
+	gfnt "goformation/v4/cloudformation/types"
+
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	api "github.com/weaveworks/eksctl/pkg/apis/eksctl.io/v1alpha5"
 	"github.com/weaveworks/eksctl/pkg/utils/ipnet"
-	gfnt "github.com/weaveworks/goformation/v4/cloudformation/types"
 )
 
 var _ = Describe("SpecConfigImporter", func() {